[src/trunk]: src/sys/compat/common compat glue for new lwp_park()

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a682c67ccdf0
branches:  trunk
changeset: 785744:a682c67ccdf0
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Mar 29 01:02:49 2013 +0000

description:
compat glue for new lwp_park()

diffstat:

 sys/compat/common/Makefile       |   4 +-
 sys/compat/common/compat_mod.c   |   7 ++-
 sys/compat/common/kern_time_50.c |   6 +-
 sys/compat/common/kern_time_60.c |  74 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 84 insertions(+), 7 deletions(-)

diffs (151 lines):

diff -r c334c75302ea -r a682c67ccdf0 sys/compat/common/Makefile
--- a/sys/compat/common/Makefile        Thu Mar 28 22:54:25 2013 +0000
+++ b/sys/compat/common/Makefile        Fri Mar 29 01:02:49 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.50 2012/10/19 16:55:22 apb Exp $
+#      $NetBSD: Makefile,v 1.51 2013/03/29 01:02:49 christos Exp $
 
 LIB=           compat
 NOPIC=         # defined
@@ -45,7 +45,7 @@
        vfs_syscalls_50.c  uipc_syscalls_50.c
 
 # Compatibility code for NetBSD 6.0
-SRCS+= kern_sa_60.c tty_60.c
+SRCS+= kern_sa_60.c tty_60.c kern_time_60.c
 
 # really, all machines where sizeof(int) != sizeof(long) (LP64)
 .if (${MACHINE_ARCH} != "alpha" && ${MACHINE_ARCH} != "sparc64" \
diff -r c334c75302ea -r a682c67ccdf0 sys/compat/common/compat_mod.c
--- a/sys/compat/common/compat_mod.c    Thu Mar 28 22:54:25 2013 +0000
+++ b/sys/compat/common/compat_mod.c    Fri Mar 29 01:02:49 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: compat_mod.c,v 1.18 2013/02/21 14:13:01 christos Exp $ */
+/*     $NetBSD: compat_mod.c,v 1.19 2013/03/29 01:02:49 christos Exp $ */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_mod.c,v 1.18 2013/02/21 14:13:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_mod.c,v 1.19 2013/03/29 01:02:49 christos Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -243,6 +243,9 @@
        { SYS_compat_50_aio_suspend, 0, (sy_call_t *)compat_50_sys_aio_suspend },
        { SYS_compat_50_quotactl, 0, (sy_call_t *)compat_50_sys_quotactl },
 #endif
+#if defined(COMPAT_60)
+       { SYS_compat_60__lwp_park, 0, (sy_call_t *)compat_60_sys__lwp_park },
+#endif
        { 0, 0, NULL },
 };
 
diff -r c334c75302ea -r a682c67ccdf0 sys/compat/common/kern_time_50.c
--- a/sys/compat/common/kern_time_50.c  Thu Mar 28 22:54:25 2013 +0000
+++ b/sys/compat/common/kern_time_50.c  Fri Mar 29 01:02:49 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_time_50.c,v 1.25 2013/02/21 01:39:54 pgoyette Exp $       */
+/*     $NetBSD: kern_time_50.c,v 1.26 2013/03/29 01:02:49 christos Exp $       */
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_time_50.c,v 1.25 2013/02/21 01:39:54 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_time_50.c,v 1.26 2013/03/29 01:02:49 christos Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_aio.h"
@@ -379,7 +379,7 @@
                        return error;
        }
 
-       return lwp_park(tsp, SCARG(uap, hint));
+       return lwp_park(CLOCK_REALTIME, TIMER_ABSTIME, tsp, SCARG(uap, hint));
 }
 
 int
diff -r c334c75302ea -r a682c67ccdf0 sys/compat/common/kern_time_60.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/compat/common/kern_time_60.c  Fri Mar 29 01:02:49 2013 +0000
@@ -0,0 +1,74 @@
+/*     $NetBSD: kern_time_60.c,v 1.1 2013/03/29 01:02:50 christos Exp $        */
+
+/*-
+ * Copyright (c) 2013 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: kern_time_60.c,v 1.1 2013/03/29 01:02:50 christos Exp $");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/lwp.h>
+#include <sys/time.h>
+#include <sys/sysctl.h>
+#include <sys/syscallargs.h>
+
+#include <compat/common/compat_util.h>
+#include <compat/common/compat_mod.h>
+
+int
+compat_60_sys__lwp_park(struct lwp *l,
+    const struct compat_60_sys__lwp_park_args *uap, register_t *retval)
+{
+       /* {
+               syscallarg(const struct timespec *)     ts;
+               syscallarg(lwpid_t)                     unpark;
+               syscallarg(const void *)                hint;
+               syscallarg(const void *)                unparkhint;
+       } */
+
+       int error;
+       struct timespec ts, *tsp;
+
+       if (SCARG(uap, ts) == NULL)
+               tsp = NULL;
+       else {
+               error = copyin(SCARG(uap, ts), &ts, sizeof(ts));
+               if (error != 0)
+                       return error;
+               tsp = &ts;
+       }
+
+       if (SCARG(uap, unpark) != 0) {
+               error = lwp_unpark(SCARG(uap, unpark), SCARG(uap, unparkhint));
+               if (error != 0)
+                       return error;
+       }
+
+       return lwp_park(CLOCK_REALTIME, TIMER_ABSTIME, tsp, SCARG(uap, hint));
+}