Module Name: src
Committed By: pooka
Date: Wed Apr 28 00:33:45 UTC 2010
Modified Files:
src/lib/librumpuser: rumpuser.c
src/sys/rump/include/rump: rumpuser.h
Log Message:
Add rumpuser interface to fetch number of host cpus.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/lib/librumpuser/rumpuser.c
cvs rdiff -u -r1.39 -r1.40 src/sys/rump/include/rump/rumpuser.h
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/rumpuser.c
diff -u src/lib/librumpuser/rumpuser.c:1.3 src/lib/librumpuser/rumpuser.c:1.4
--- src/lib/librumpuser/rumpuser.c:1.3 Wed Apr 21 11:16:41 2010
+++ src/lib/librumpuser/rumpuser.c Wed Apr 28 00:33:45 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser.c,v 1.3 2010/04/21 11:16:41 pooka Exp $ */
+/* $NetBSD: rumpuser.c,v 1.4 2010/04/28 00:33:45 pooka Exp $ */
/*
* Copyright (c) 2007-2010 Antti Kantee. All Rights Reserved.
@@ -27,7 +27,7 @@
#include <sys/cdefs.h>
#if !defined(lint)
-__RCSID("$NetBSD: rumpuser.c,v 1.3 2010/04/21 11:16:41 pooka Exp $");
+__RCSID("$NetBSD: rumpuser.c,v 1.4 2010/04/28 00:33:45 pooka Exp $");
#endif /* !lint */
/* thank the maker for this */
@@ -46,6 +46,7 @@
#ifdef __NetBSD__
#include <sys/disklabel.h>
+#include <sys/sysctl.h>
#endif
#include <assert.h>
@@ -589,3 +590,18 @@
return -1;
#endif
}
+
+int
+rumpuser_getnhostcpu(void)
+{
+ int ncpu;
+ size_t sz = sizeof(ncpu);
+
+#ifdef __NetBSD__
+ if (sysctlbyname("hw.ncpu", &ncpu, &sz, NULL, 0) == -1)
+ return 1;
+ return ncpu;
+#else
+ return 1;
+#endif
+}
Index: src/sys/rump/include/rump/rumpuser.h
diff -u src/sys/rump/include/rump/rumpuser.h:1.39 src/sys/rump/include/rump/rumpuser.h:1.40
--- src/sys/rump/include/rump/rumpuser.h:1.39 Wed Apr 21 11:13:29 2010
+++ src/sys/rump/include/rump/rumpuser.h Wed Apr 28 00:33:45 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser.h,v 1.39 2010/04/21 11:13:29 pooka Exp $ */
+/* $NetBSD: rumpuser.h,v 1.40 2010/04/28 00:33:45 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -109,6 +109,8 @@
int rumpuser_dprintf(const char *, ...);
+int rumpuser_getnhostcpu(void);
+
/* rumpuser_pth */
void rumpuser_thrinit(kernel_lockfn, kernel_unlockfn, int);
void rumpuser_biothread(void *);