Rename the <bmk-base> header namespace to <rumprun-base>

This change indicates that the headers are for "userspace" level
consumers, and it also makes the header namespace match the name of
the library.

diff --git a/include/bmk-base/README.txt b/include/bmk-base/README.txt
deleted file mode 100644 (file)
index 73bee27..0000000
--- a/include/bmk-base/README.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-the name of this directory is suspect.
-
-it is only for internal consumption and may change when the lords
-of nomenclature bless us with a more pleasing term.

diff --git a/include/bmk-base/netbsd_initfini.h b/include/bmk-base/netbsd_initfini.h
deleted file mode 100644 (file)
index 56f8ae6..0000000
--- a/include/bmk-base/netbsd_initfini.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*-
- * Copyright (c) 2014 Antti Kantee.  All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _BMK_BASE_NETBSD_INITFINI_H_
-#define _BMK_BASE_NETBSD_INITFINI_H_
-
-void _netbsd_init(void);
-void __dead _netbsd_fini(void);
-void rumprun_lwp_init(void);
-
-#endif /* _BMK_BASE_NETBSD_INITFINI_H_ */

diff --git a/include/bmk-base/rumprun_config.h b/include/bmk-base/rumprun_config.h
deleted file mode 100644 (file)
index a0892c5..0000000
--- a/include/bmk-base/rumprun_config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2014 Martin Lucina.  All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _BMKCOMMON_RUMPRUN_CONFIG_H_
-#define _BMKCOMMON_RUMPRUN_CONFIG_H_
-
-void _rumprun_config(void);
-void _rumprun_deconfig(void);
-
-#endif /* _BMKCOMMON_RUMPRUN_CONFIG_H_ */

diff --git a/include/bmk-base/rumprun_makelwp.h b/include/bmk-base/rumprun_makelwp.h
deleted file mode 100644 (file)
index fd6a731..0000000
--- a/include/bmk-base/rumprun_makelwp.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*-
- * Copyright (c) 2014 Antti Kantee.  All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _BMK_BASE_RUMPRUN_MAKELWP_H_
-#define _BMK_BASE_RUMPRUN_MAKELWP_H_
-
-int rumprun_makelwp(void (*)(void *), void *,
-       void *, void *, size_t, unsigned long, lwpid_t *);
-
-#endif /* _BMK_BASE_RUMPRUN_MAKELWP_H_ */

diff --git a/include/rumprun-base/README.txt b/include/rumprun-base/README.txt
new file mode 100644 (file)
index 0000000..73bee27
--- /dev/null
+++ b/include/rumprun-base/README.txt
@@ -0,0 +1,4 @@
+the name of this directory is suspect.
+
+it is only for internal consumption and may change when the lords
+of nomenclature bless us with a more pleasing term.

diff --git a/include/rumprun-base/config.h b/include/rumprun-base/config.h
new file mode 100644 (file)
index 0000000..a0892c5
--- /dev/null
+++ b/include/rumprun-base/config.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2014 Martin Lucina.  All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef _BMKCOMMON_RUMPRUN_CONFIG_H_
+#define _BMKCOMMON_RUMPRUN_CONFIG_H_
+
+void _rumprun_config(void);
+void _rumprun_deconfig(void);
+
+#endif /* _BMKCOMMON_RUMPRUN_CONFIG_H_ */

diff --git a/include/rumprun-base/makelwp.h b/include/rumprun-base/makelwp.h
new file mode 100644 (file)
index 0000000..fd6a731
--- /dev/null
+++ b/include/rumprun-base/makelwp.h
@@ -0,0 +1,32 @@
+/*-
+ * Copyright (c) 2014 Antti Kantee.  All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef _BMK_BASE_RUMPRUN_MAKELWP_H_
+#define _BMK_BASE_RUMPRUN_MAKELWP_H_
+
+int rumprun_makelwp(void (*)(void *), void *,
+       void *, void *, size_t, unsigned long, lwpid_t *);
+
+#endif /* _BMK_BASE_RUMPRUN_MAKELWP_H_ */

diff --git a/include/rumprun-base/netbsd_initfini.h b/include/rumprun-base/netbsd_initfini.h
new file mode 100644 (file)
index 0000000..56f8ae6
--- /dev/null
+++ b/include/rumprun-base/netbsd_initfini.h
@@ -0,0 +1,33 @@
+/*-
+ * Copyright (c) 2014 Antti Kantee.  All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef _BMK_BASE_NETBSD_INITFINI_H_
+#define _BMK_BASE_NETBSD_INITFINI_H_
+
+void _netbsd_init(void);
+void __dead _netbsd_fini(void);
+void rumprun_lwp_init(void);
+
+#endif /* _BMK_BASE_NETBSD_INITFINI_H_ */

diff --git a/lib/librumprun_base/_lwp.c b/lib/librumprun_base/_lwp.c
index 24526268c8c1f8caf563cf4171a8932dba9ea055..57be77a192ce7bee22f1572ffa1945ae32afc0b9 100644 (file)
--- a/lib/librumprun_base/_lwp.c
+++ b/lib/librumprun_base/_lwp.c
@@ -42,8 +42,8 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <bmk-base/netbsd_initfini.h>
-#include <bmk-base/rumprun_makelwp.h>
+#include <rumprun-base/netbsd_initfini.h>
+#include <rumprun-base/makelwp.h>
 
 #include <bmk-core/core.h>
 #include <bmk-core/sched.h>

diff --git a/lib/librumprun_base/netbsd_initfini.c b/lib/librumprun_base/netbsd_initfini.c
index 14315de8639f930b65e9f55f0e66b38e98f2a78a..88d48bd206f9391364bc855c101e8c1f33955df3 100644 (file)
--- a/lib/librumprun_base/netbsd_initfini.c
+++ b/lib/librumprun_base/netbsd_initfini.c
@@ -38,8 +38,8 @@
 
 #include <bmk-core/core.h>
 
-#include <bmk-base/netbsd_initfini.h>
-#include <bmk-base/rumprun_config.h>
+#include <rumprun-base/netbsd_initfini.h>
+#include <rumprun-base/config.h>
 
 static char *the_env[1] = { NULL } ;
 extern void *environ;

diff --git a/lib/librumprun_base/syscall_misc.c b/lib/librumprun_base/syscall_misc.c
index afc50a3bb7e2485def48312a5020e8f7383ca434..035f1d13fa8c1a113690837652f337199b8e055e 100644 (file)
--- a/lib/librumprun_base/syscall_misc.c
+++ b/lib/librumprun_base/syscall_misc.c
@@ -46,7 +46,7 @@
 
 #include <bmk-core/core.h>
 
-#include <bmk-base/netbsd_initfini.h>
+#include <rumprun-base/netbsd_initfini.h>
 
 #ifdef RUMPRUN_MMAP_DEBUG
 #define MMAP_PRINTF(x) printf x

diff --git a/platform/baremetal/kernel.c b/platform/baremetal/kernel.c
index 7e6f327786555e7896fbedf1dd56f5e1cbd8a12a..ef8802d33312988e5eef5c3ca02555c2e3ce9243 100644 (file)
--- a/platform/baremetal/kernel.c
+++ b/platform/baremetal/kernel.c
@@ -36,7 +36,7 @@
 #include <bmk-core/printf.h>
 #include <bmk-core/queue.h>
 
-#include <bmk-base/netbsd_initfini.h>
+#include <rumprun-base/netbsd_initfini.h>
 
 unsigned long bmk_membase;
 unsigned long bmk_memsize;

diff --git a/platform/baremetal/rumpconfig.c b/platform/baremetal/rumpconfig.c
index b6377f434fefe1528360004bb7ef7583fc64bb35..6e32bac23f05f70c214c48081cbfef1c20efd675 100644 (file)
--- a/platform/baremetal/rumpconfig.c
+++ b/platform/baremetal/rumpconfig.c
@@ -25,7 +25,7 @@
 
 /* placeholder/stubs (in case it was unguessable) */
 
-#include <bmk-base/rumprun_config.h>
+#include <rumprun-base/config.h>
 
 void
 _rumprun_config(void)

diff --git a/platform/xen/callmain.c b/platform/xen/callmain.c
index ffe0fe49a43a42f30d67c2d45b88e5410871e874..56c9db9221dcec86f4b0c459f8c9659cefc5e025 100644 (file)
--- a/platform/xen/callmain.c
+++ b/platform/xen/callmain.c
@@ -32,7 +32,7 @@
 
 #include <mini-os/os.h>
 
-#include <bmk-base/netbsd_initfini.h>
+#include <rumprun-base/netbsd_initfini.h>
 
 extern int main(int argc, char **argv);
 

diff --git a/platform/xen/rumpconfig.c b/platform/xen/rumpconfig.c
index 67e4bb7c7e486b8931e4515820b093db1e409ccd..6ee5bf5f689fead8739a159689355a8ab2927f4d 100644 (file)
--- a/platform/xen/rumpconfig.c
+++ b/platform/xen/rumpconfig.c
@@ -45,7 +45,7 @@
 #include <ufs/ufs/ufsmount.h>
 #include <isofs/cd9660/cd9660_mount.h>
 
-#include <bmk-base/rumprun_config.h>
+#include <rumprun-base/config.h>
 
 static int
 xs_read_netconfig(const char *if_index, char **type, char **method, char **addr,