[src/trunk]: src/lib/librumpuser make this build/work again

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

details:   https://anonhg.NetBSD.org/src/rev/514ee6d68781
branches:  trunk
changeset: 786518:514ee6d68781
user:      pooka <pooka%NetBSD.org@localhost>
date:      Tue Apr 30 13:37:03 2013 +0000

description:
make this build/work again

diffstat:

 lib/librumpuser/rumpuser_pth_dummy.c |  66 ++++++++++++++++++------------------
 1 files changed, 33 insertions(+), 33 deletions(-)

diffs (157 lines):

diff -r 57b03ca4dc78 -r 514ee6d68781 lib/librumpuser/rumpuser_pth_dummy.c
--- a/lib/librumpuser/rumpuser_pth_dummy.c      Tue Apr 30 13:29:28 2013 +0000
+++ b/lib/librumpuser/rumpuser_pth_dummy.c      Tue Apr 30 13:37:03 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rumpuser_pth_dummy.c,v 1.11 2013/04/30 13:29:28 pooka Exp $    */
+/*     $NetBSD: rumpuser_pth_dummy.c,v 1.12 2013/04/30 13:37:03 pooka Exp $    */
 
 /*
  * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
@@ -29,7 +29,7 @@
 
 #include <sys/cdefs.h>
 #if !defined(lint)
-__RCSID("$NetBSD: rumpuser_pth_dummy.c,v 1.11 2013/04/30 13:29:28 pooka Exp $");
+__RCSID("$NetBSD: rumpuser_pth_dummy.c,v 1.12 2013/04/30 13:37:03 pooka Exp $");
 #endif /* !lint */
 
 #include <sys/time.h>
@@ -58,11 +58,6 @@
        int v;
 };
 
-struct rumpuser_mtx rumpuser_aio_mtx;
-struct rumpuser_cv rumpuser_aio_cv;
-int rumpuser_aio_head, rumpuser_aio_tail;
-struct rumpuser_aio rumpuser_aios[N_AIOS];
-
 void
 rumpuser__thrinit(void)
 {
@@ -71,15 +66,6 @@
 }
 
 /*ARGSUSED*/
-void
-rumpuser_biothread(void *arg)
-{
-
-       fprintf(stderr, "rumpuser: threads not available\n");
-       abort();
-}
-
-/*ARGSUSED*/
 int
 rumpuser_thread_create(void *(*f)(void *), void *arg, const char *thrname,
        int joinable, int pri, int cpuidx, void **tptr)
@@ -98,6 +84,13 @@
        abort();
 }
 
+int
+rumpuser_thread_join(void *p)
+{
+
+       return 0;
+}
+
 void
 rumpuser_mutex_init(struct rumpuser_mtx **mtx, int flgas)
 {
@@ -125,7 +118,7 @@
 {
 
        mtx->v++;
-       return 1;
+       return 0;
 }
 
 void
@@ -144,11 +137,11 @@
        free(mtx);
 }
 
-struct lwp *
-rumpuser_mutex_owner(struct rumpuser_mtx *mtx)
+void
+rumpuser_mutex_owner(struct rumpuser_mtx *mtx, struct lwp **lp)
 {
 
-       return mtx->o;
+       *lp = mtx->o;
 }
 
 void
@@ -176,7 +169,7 @@
 {
 
        rumpuser_rw_enter(rw, write);
-       return 1;
+       return 0;
 }
 
 void
@@ -198,25 +191,25 @@
        free(rw);
 }
 
-int
-rumpuser_rw_held(struct rumpuser_rw *rw)
+void
+rumpuser_rw_held(struct rumpuser_rw *rw, int *rvp)
 {
 
-       return rw->v != 0;
+       *rvp = rw->v != 0;
 }
 
-int
-rumpuser_rw_rdheld(struct rumpuser_rw *rw)
+void
+rumpuser_rw_rdheld(struct rumpuser_rw *rw, int *rvp)
 {
 
-       return rw->v < 0;
+       *rvp = rw->v < 0;
 }
 
-int
-rumpuser_rw_wrheld(struct rumpuser_rw *rw)
+void
+rumpuser_rw_wrheld(struct rumpuser_rw *rw, int *rvp)
 {
 
-       return rw->v > 0;
+       *rvp = rw->v > 0;
 }
 
 /*ARGSUSED*/
@@ -241,6 +234,13 @@
 }
 
 /*ARGSUSED*/
+void
+rumpuser_cv_wait_nowrap(struct rumpuser_cv *cv, struct rumpuser_mtx *mtx)
+{
+
+}
+
+/*ARGSUSED*/
 int
 rumpuser_cv_timedwait(struct rumpuser_cv *cv, struct rumpuser_mtx *mtx,
        int64_t sec, int64_t nsec)
@@ -271,11 +271,11 @@
 }
 
 /*ARGSUSED*/
-int
-rumpuser_cv_has_waiters(struct rumpuser_cv *cv)
+void
+rumpuser_cv_has_waiters(struct rumpuser_cv *cv, int *rvp)
 {
 
-       return 0;
+       *rvp = 0;
 }
 
 /*