Module Name: src
Committed By: justin
Date: Mon Dec 29 21:50:09 UTC 2014
Modified Files:
src/lib/librumpuser: rumpfiber.c rumpfiber.h rumpfiber_sp.c
Log Message:
Just abort on currently unsupported functions.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/lib/librumpuser/rumpfiber.c
cvs rdiff -u -r1.2 -r1.3 src/lib/librumpuser/rumpfiber.h \
src/lib/librumpuser/rumpfiber_sp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumpuser/rumpfiber.c
diff -u src/lib/librumpuser/rumpfiber.c:1.8 src/lib/librumpuser/rumpfiber.c:1.9
--- src/lib/librumpuser/rumpfiber.c:1.8 Sat Nov 8 23:47:15 2014
+++ src/lib/librumpuser/rumpfiber.c Mon Dec 29 21:50:09 2014
@@ -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 <sys/ioctl.h>
@@ -108,6 +108,16 @@ static struct thread *current_thread = N
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)
{
Index: src/lib/librumpuser/rumpfiber.h
diff -u src/lib/librumpuser/rumpfiber.h:1.2 src/lib/librumpuser/rumpfiber.h:1.3
--- src/lib/librumpuser/rumpfiber.h:1.2 Sun Aug 24 14:37:31 2014
+++ src/lib/librumpuser/rumpfiber.h Mon Dec 29 21:50:09 2014
@@ -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 <ucontext.h>
#include <unistd.h>
-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;
Index: src/lib/librumpuser/rumpfiber_sp.c
diff -u src/lib/librumpuser/rumpfiber_sp.c:1.2 src/lib/librumpuser/rumpfiber_sp.c:1.3
--- src/lib/librumpuser/rumpfiber_sp.c:1.2 Sun Aug 24 14:37:31 2014
+++ src/lib/librumpuser/rumpfiber_sp.c Mon Dec 29 21:50:09 2014
@@ -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 <stdlib.h>
@@ -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();
}
