From e42c569056d5328c00a5f5e73dc1ab831957816a Mon Sep 17 00:00:00 2001 From: justin Date: Mon, 29 Dec 2014 21:50:09 +0000 Subject: [PATCH] Just abort on currently unsupported functions. --- lib/librumpuser/rumpfiber.c | 14 ++++++++++++-- lib/librumpuser/rumpfiber.h | 12 +----------- lib/librumpuser/rumpfiber_sp.c | 22 ++++++++-------------- 3 files changed, 21 insertions(+), 27 deletions(-) diff --git a/lib/librumpuser/rumpfiber.c b/lib/librumpuser/rumpfiber.c index d2ec5159a206..4a19383d874e 100644 --- a/lib/librumpuser/rumpfiber.c +++ b/lib/librumpuser/rumpfiber.c @@ -1,4 +1,4 @@ -/* $NetBSD: rumpfiber.c,v 1.8 2014/11/08 23:47:15 justin Exp $ */ +/* $NetBSD: rumpfiber.c,v 1.9 2014/12/29 21:50:09 justin Exp $ */ /* * Copyright (c) 2007-2013 Antti Kantee. All Rights Reserved. @@ -68,7 +68,7 @@ #include "rumpuser_port.h" #if !defined(lint) -__RCSID("$NetBSD: rumpfiber.c,v 1.8 2014/11/08 23:47:15 justin Exp $"); +__RCSID("$NetBSD: rumpfiber.c,v 1.9 2014/12/29 21:50:09 justin Exp $"); #endif /* !lint */ #include @@ -108,6 +108,16 @@ static struct thread *current_thread = NULL; static void (*scheduler_hook)(void *, void *); +static void printk(const char *s); + +static void +printk(const char *msg) +{ + int ret __attribute__((unused)); + + ret = write(2, msg, strlen(msg)); +} + static struct thread * get_current(void) { diff --git a/lib/librumpuser/rumpfiber.h b/lib/librumpuser/rumpfiber.h index 41a914ba00d1..aefbfac6aced 100644 --- a/lib/librumpuser/rumpfiber.h +++ b/lib/librumpuser/rumpfiber.h @@ -1,4 +1,4 @@ -/* $NetBSD: rumpfiber.h,v 1.2 2014/08/24 14:37:31 pooka Exp $ */ +/* $NetBSD: rumpfiber.h,v 1.3 2014/12/29 21:50:09 justin Exp $ */ /* * Copyright (c) 2014 Justin Cormack. All Rights Reserved. @@ -33,16 +33,6 @@ #include #include -static void printk(const char *s); - -static void -printk(const char *msg) -{ - int ret __attribute__((unused)); - - ret = write(2, msg, strlen(msg)); -} - struct thread { char *name; void *lwp; diff --git a/lib/librumpuser/rumpfiber_sp.c b/lib/librumpuser/rumpfiber_sp.c index 1a7ed39608f0..e96cbdbd5dc9 100644 --- a/lib/librumpuser/rumpfiber_sp.c +++ b/lib/librumpuser/rumpfiber_sp.c @@ -1,4 +1,4 @@ -/* $NetBSD: rumpfiber_sp.c,v 1.2 2014/08/24 14:37:31 pooka Exp $ */ +/* $NetBSD: rumpfiber_sp.c,v 1.3 2014/12/29 21:50:09 justin Exp $ */ /* * Copyright (c) 2014 Justin Cormack. All Rights Reserved. @@ -30,7 +30,7 @@ #include "rumpuser_port.h" #if !defined(lint) -__RCSID("$NetBSD: rumpfiber_sp.c,v 1.2 2014/08/24 14:37:31 pooka Exp $"); +__RCSID("$NetBSD: rumpfiber_sp.c,v 1.3 2014/12/29 21:50:09 justin Exp $"); #endif /* !lint */ #include @@ -60,8 +60,7 @@ int rumpuser_sp_raise(void *arg, int signo) { - printk("rumphyper: unimplemented rumpuser_sp_raise\n"); - exit(1); + abort(); } /*ARGSUSED*/ @@ -69,8 +68,7 @@ int rumpuser_sp_copyin(void *arg, const void *raddr, void *laddr, size_t len) { - printk("rumphyper: unimplemented rumpuser_sp_copyin\n"); - exit(1); + abort(); } /*ARGSUSED*/ @@ -78,8 +76,7 @@ int rumpuser_sp_copyinstr(void *arg, const void *raddr, void *laddr, size_t *len) { - printk("rumphyper: unimplemented rumpuser_sp_copyinstr\n"); - exit(1); + abort(); } /*ARGSUSED*/ @@ -87,8 +84,7 @@ int rumpuser_sp_copyout(void *arg, const void *laddr, void *raddr, size_t dlen) { - printk("rumphyper: unimplemented rumpuser_sp_copyout\n"); - exit(1); + abort(); } /*ARGSUSED*/ @@ -96,8 +92,7 @@ int rumpuser_sp_copyoutstr(void *arg, const void *laddr, void *raddr, size_t *dlen) { - printk("rumphyper: unimplemented rumpuser_sp_copyoutstr\n"); - exit(1); + abort(); } /*ARGSUSED*/ @@ -105,6 +100,5 @@ int rumpuser_sp_anonmmap(void *arg, size_t howmuch, void **addr) { - printk("rumphyper: unimplemented rumpuser_sp_anonmmap\n"); - exit(1); + abort(); }