Module Name: src
Committed By: pooka
Date: Sat Apr 27 15:13:12 UTC 2013
Modified Files:
src/sys/rump/include/rump: rump.h
src/sys/rump/librump/rumpkern: rump.c
Log Message:
Get rid of the rump__init() macro. it was never useful and just makes
debugging less obvious.
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/rump/include/rump/rump.h
cvs rdiff -u -r1.258 -r1.259 src/sys/rump/librump/rumpkern/rump.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/include/rump/rump.h
diff -u src/sys/rump/include/rump/rump.h:1.55 src/sys/rump/include/rump/rump.h:1.56
--- src/sys/rump/include/rump/rump.h:1.55 Wed Nov 21 17:41:27 2012
+++ src/sys/rump/include/rump/rump.h Sat Apr 27 15:13:11 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.h,v 1.55 2012/11/21 17:41:27 pooka Exp $ */
+/* $NetBSD: rump.h,v 1.56 2013/04/27 15:13:11 pooka Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -91,13 +91,6 @@ enum rump_etfs_type {
RUMP_ETFS_DIR_SUBDIRS /* dir + subdirectories (recursive) */
};
-/*
- * Something like rump capabilities would be nicer, but let's
- * do this for a start.
- */
-#define RUMP_VERSION 01
-#define rump_init() rump__init(RUMP_VERSION)
-
/* um, what's the point ?-) */
#ifdef _BEGIN_DECLS
_BEGIN_DECLS
@@ -113,7 +106,7 @@ void rump_unschedule(void);
void rump_printevcnts(void);
int rump_daemonize_begin(void);
-int rump__init(int);
+int rump_init(void);
int rump_init_server(const char *);
int rump_daemonize_done(int);
#define RUMP_DAEMONIZE_SUCCESS 0
Index: src/sys/rump/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.258 src/sys/rump/librump/rumpkern/rump.c:1.259
--- src/sys/rump/librump/rumpkern/rump.c:1.258 Sat Apr 27 14:59:09 2013
+++ src/sys/rump/librump/rumpkern/rump.c Sat Apr 27 15:13:11 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.c,v 1.258 2013/04/27 14:59:09 pooka Exp $ */
+/* $NetBSD: rump.c,v 1.259 2013/04/27 15:13:11 pooka Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.258 2013/04/27 14:59:09 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.259 2013/04/27 15:13:11 pooka Exp $");
#include <sys/systm.h>
#define ELFSIZE ARCH_ELFSIZE
@@ -229,7 +229,7 @@ RUMP_COMPONENT(RUMP_COMPONENT_POSTINIT)
}
int
-rump__init(int rump_version)
+rump_init(void)
{
char buf[256];
struct timespec ts;
@@ -281,12 +281,6 @@ rump__init(int rump_version)
initmsgbuf(rump_msgbuf, sizeof(rump_msgbuf));
aprint_verbose("%s%s", copyright, version);
- if (rump_version != RUMP_VERSION) {
- printf("rump version mismatch, %d vs. %d\n",
- rump_version, RUMP_VERSION);
- return EPROGMISMATCH;
- }
-
rump_intr_init(numcpu);
rump_tsleep_init();
@@ -534,6 +528,8 @@ rump__init(int rump_version)
return 0;
}
+/* historic compat */
+__strong_alias(rump__init,rump_init);
int
rump_init_server(const char *url)
