Index: sys/modules/luasystm/luasystm.c =================================================================== RCS file: sys/modules/luasystm/luasystm.c diff -N sys/modules/luasystm/luasystm.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ sys/modules/luasystm/luasystm.c 9 Dec 2013 02:43:10 -0000 @@ -0,0 +1,229 @@ +/* $NetBSD: luacore.c,v 1.5 2013/12/02 05:06:32 lneto Exp $ */ + +/* + * Copyright (c) 2011, 2013 Marc Balmer . + * 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. + * 3. The name of the Author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 REGENTS 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. + */ + +/* Lua systm module */ + +#include +#include +#include +#ifdef _MODULE +#include +#endif +#include + +#include +#include + +#ifdef _MODULE +MODULE(MODULE_CLASS_MISC, luasystm, "lua"); + +/* Various printing functions */ +static int +print(lua_State *L) +{ + const char *s; + + s = lua_tostring(L, -1); + if (s) + printf("%s", s); + return 0; +} + +static int +print_nolog(lua_State *L) +{ + const char *s; + + s = lua_tostring(L, -1); + if (s) + printf_nolog("%s", s); + return 0; +} + +static int +uprint(lua_State *L) +{ + const char *s; + + s = lua_tostring(L, -1); + if (s) + uprintf("%s", s); + return 0; +} + +static int +systm_aprint_normal(lua_State *L) +{ + const char *s; + + s = lua_tostring(L, -1); + if (s) + aprint_normal("%s", s); + return 0; +} + +static int +systm_aprint_naive(lua_State *L) +{ + const char *s; + + s = lua_tostring(L, -1); + if (s) + aprint_naive("%s", s); + return 0; +} + +static int +systm_aprint_verbose(lua_State *L) +{ + const char *s; + + s = lua_tostring(L, -1); + if (s) + aprint_verbose("%s", s); + return 0; +} + +static int +systm_aprint_debug(lua_State *L) +{ + const char *s; + + s = lua_tostring(L, -1); + if (s) + aprint_debug("%s", s); + return 0; +} + +static int +systm_aprint_error(lua_State *L) +{ + const char *s; + + s = lua_tostring(L, -1); + if (s) + aprint_error("%s", s); + return 0; +} + +static int +systm_aprint_get_error_count(lua_State *L) +{ + lua_pushinteger(L, aprint_get_error_count()); + return 1; +} + +/* panicing */ + +static int +systm_panic(lua_State *L) +{ + const char *s; + + s = lua_tostring(L, -1); + if (s) + panic("%s", s); + return 0; +} + +/* callouts */ + +/* mutexes */ + +static int +luaopen_systm(void *ls) +{ + lua_State *L = (lua_State *)ls; + const luaL_Reg systm_lib[ ] = { + { "print", print }, + { "print_nolog", print_nolog }, + { "uprint", uprint }, + { "aprint_normal", systm_aprint_normal }, + { "aprint_naive", systm_aprint_naive }, + { "aprint_verbose", systm_aprint_verbose }, + { "aprint_debug", systm_aprint_debug }, + { "aprint_error", systm_aprint_error }, + { "aprint_get_error_count", systm_aprint_get_error_count }, + + /* panicing */ + { "panic", systm_panic }, + + /* callouts */ + + /* mutexes */ + + {NULL, NULL} + }; + + luaL_register(L, "systm", systm_lib); + + /* some string values */ + lua_pushstring(L, copyright); + lua_setfield(L, -2, "copyright"); + lua_pushstring(L, cpu_model); + lua_setfield(L, -2, "cpu_model"); + lua_pushstring(L, machine); + lua_setfield(L, -2, "machine"); + lua_pushstring(L, machine_arch); + lua_setfield(L, -2, "machine_arch"); + lua_pushstring(L, osrelease); + lua_setfield(L, -2, "osrelease"); + lua_pushstring(L, ostype); + lua_setfield(L, -2, "ostype"); + lua_pushstring(L, kernel_ident); + lua_setfield(L, -2, "kernel_ident"); + lua_pushstring(L, version); + lua_setfield(L, -2, "version"); + + /* some integer values */ + lua_pushinteger(L, ncpu); + lua_setfield(L, -2, "ncpu"); + + return 1; +} + +static int +luasystm_modcmd(modcmd_t cmd, void *opaque) +{ + int error; + + switch (cmd) { + case MODULE_CMD_INIT: + error = lua_mod_register("systm", luaopen_systm); + break; + case MODULE_CMD_FINI: + error = lua_mod_unregister("systm"); + break; + default: + error = ENOTTY; + } + return error; +} +#endif Index: sys/modules/luasystm/Makefile =================================================================== RCS file: sys/modules/luasystm/Makefile diff -N sys/modules/luasystm/Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ sys/modules/luasystm/Makefile 9 Dec 2013 02:43:10 -0000 @@ -0,0 +1,12 @@ +# $NetBSD: Makefile,v 1.1 2013/10/16 19:47:19 mbalmer Exp $ + +.include "../Makefile.inc" + +KMOD= luasystm +SRCS= luasystm.c + +CPPFLAGS+= -I${S}/../external/mit/lua/dist/src \ + -I${S}/modules/lua \ + -I${S}/sys + +.include Index: sys/modules/luasystm/test.lua =================================================================== RCS file: sys/modules/luasystm/test.lua diff -N sys/modules/luasystm/test.lua --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ sys/modules/luasystm/test.lua 9 Dec 2013 02:43:10 -0000 @@ -0,0 +1,4 @@ +require 'systm' + +systm.print("hello, kernel world!\n") + Index: share/man/man9lua/Makefile =================================================================== RCS file: /cvsroot/src/share/man/man9lua/Makefile,v retrieving revision 1.3 diff -u -d -r1.3 Makefile --- share/man/man9lua/Makefile 29 Oct 2013 09:40:44 -0000 1.3 +++ share/man/man9lua/Makefile 9 Dec 2013 02:43:10 -0000 @@ -1,6 +1,6 @@ # $NetBSD: Makefile,v 1.3 2013/10/29 09:40:44 mbalmer Exp $ -MAN= core.9lua intro.9lua pmf.9lua +MAN= systm.9lua intro.9lua pmf.9lua .include .include Index: share/man/man9lua/systm.9lua =================================================================== RCS file: share/man/man9lua/systm.9lua diff -N share/man/man9lua/systm.9lua --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ share/man/man9lua/systm.9lua 9 Dec 2013 02:43:10 -0000 @@ -0,0 +1,151 @@ +.\" $NetBSD: core.9lua,v 1.1 2013/10/29 08:34:07 mbalmer Exp $ +.\" +.\" Copyright (c) 2013 Marc Balmer . 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. +.\" 3. Neither the name of the University nor the names of its contributors +.\" may be used to endorse or promote products derived from this software +.\" without specific prior written permission. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS 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. +.\" +.\" +.Dd October 29, 2013 +.Dt SYSTM 9lua +.Os +.Sh NAME +.Nm systm +.Nd access +to general kernel functionality from Lua +.Sh SYNOPSIS +.Cd "local systm = require 'systm'" +.Pp +.Bl -tag -width XXXX -compact +.It Dv systm.print(msg) +.It Dv systm.print_nolog(msg) +.It Dv systm.uprint(msg) +.It Dv systm.aprint_normal(msg) +.It Dv systm.aprint_naive(msg) +.It Dv systm.aprint_verbose(msg) +.It Dv systm.aprint_debug(msg) +.It Dv systm.aprint_error(msg) +.It Dv count = systm.aprint_get_error_count() +.It Dv systm.panic(msg) +.El +.Sh DESCRIPTION +The +.Nm +Lua binding provides access to general kernel functionality like printing +messages on the console. +The +.Em systm.aprint +functions are meant to be using during kernel autoconfiguration. +.Pp +.Bl -tag -width XXXX -compact +.It Dv systm.print(msg) +Send +.Ar msg +to the console. +.Pp +.It Dv systm.print_nolog(msg) +The systm.print_nolog() function is identical to the systm.print() function, +except is does not send +.Ar msg +to the system log. +.Pp +.It Dv systm.uprint(msg) +Send +.Ar msg +to the current process's controlling tty. +.Pp +.It Dv systm.aprint_normal(msg) +Send +.Ar msg +to the console unless AB_QUIET is set. +Always sends to the log. +.Pp +.It Dv systm.aprint_naive(msg) +Send +.Ar msg +to the console only if AB_QUIET is set. +Never sends to the log. +.Pp +.It Dv systm.aprint_verbose(msg) +Send +.Ar msg +to the console only if AB_VERBOSE is set. +Always sends to the log. +.Pp +.It Dv systm.aprint_debug(msg) +Send +.Ar msg +to the console and the log only if AB_DEBUG is set. +.Pp +.It Dv systm.aprint_error(msg) +Like systm.aprint_normal(), but also keeps track of the number of times called. +This allows a subsystem to report the number of errors that occurred during a +quiet or silent initialization phase. +.Pp +.It Dv count = systm.aprint_get_error_count() +The systm.aprint_get_error_count() function reports the number of errors and +resets the counter to 0. +.Pp +.It Dv systm.panic(msg) +The systm.panic() function terminates the NetBSD system. +The message +.Ar msg +is printed to the console and saved in the variable +.Em panicstr +for later retrieval via core dump inspection. +A newline character is added at the end automatically. +.El +.Sh VARIABLES +Upon initialisation, the +.Nm +module sets the following variables with the values of the correspondig kernel +variable: +.Pp +.Bl -tag -width XXXX -compact +.It Dv systm.copyright +.It Dv systm.cpu_model +.It Dv systm.machine +.It Dv systm.machine_arch +.It Dv systm.osrelease +.It Dv systm.ostype +.It Dv systm.kernel_ident +.It Dv systm.version +.It Dv systm.ncpu +.El +.Sh SEE ALSO +.Xr lua 1 , +.Xr luac 1 , +.Xr intro 9lua , +.Xr lua 4 +.Sh HISTORY +An +.Nm +manual appeared in +.Nx 7.0 . +.Sh AUTHORS +.An -nosplit +The +.Nm +Lua binding was written by +.An Marc Balmer Aq Mt mbalmer@NetBSD.org . Index: share/man/man9lua/core.9lua =================================================================== RCS file: share/man/man9lua/core.9lua diff -N share/man/man9lua/core.9lua --- share/man/man9lua/core.9lua 29 Oct 2013 08:34:07 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,151 +0,0 @@ -.\" $NetBSD: core.9lua,v 1.1 2013/10/29 08:34:07 mbalmer Exp $ -.\" -.\" Copyright (c) 2013 Marc Balmer . 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. -.\" 3. Neither the name of the University nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS 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. -.\" -.\" -.Dd October 29, 2013 -.Dt CORE 9lua -.Os -.Sh NAME -.Nm core -.Nd access -to general kernel functionality from Lua -.Sh SYNOPSIS -.Cd "local core = require 'core'" -.Pp -.Bl -tag -width XXXX -compact -.It Dv core.print(msg) -.It Dv core.print_nolog(msg) -.It Dv core.uprint(msg) -.It Dv core.aprint_normal(msg) -.It Dv core.aprint_naive(msg) -.It Dv core.aprint_verbose(msg) -.It Dv core.aprint_debug(msg) -.It Dv core.aprint_error(msg) -.It Dv count = core.aprint_get_error_count() -.It Dv core.panic(msg) -.El -.Sh DESCRIPTION -The -.Nm -Lua binding provides access to general kernel functionality like printing -messages on the console. -The -.Em core.aprint -functions are meant to be using during kernel autoconfiguration. -.Pp -.Bl -tag -width XXXX -compact -.It Dv core.print(msg) -Send -.Ar msg -to the console. -.Pp -.It Dv core.print_nolog(msg) -The core.print_nolog() function is identical to the core.print() function, -except is does not send -.Ar msg -to lthe system og. -.Pp -.It Dv core.uprint(msg) -Send -.Ar msg -to the current process's controlling tty. -.Pp -.It Dv core.aprint_normal(msg) -Send -.Ar msg -to the console unless AB_QUIET is set. -Always sends to the log. -.Pp -.It Dv core.aprint_naive(msg) -Send -.Ar msg -to the console only if AB_QUIET is set. -Never sends to the log. -.Pp -.It Dv core.aprint_verbose(msg) -Send -.Ar msg -to the console only if AB_VERBOSE is set. -Always sends to the log. -.Pp -.It Dv core.aprint_debug(msg) -Send -.Ar msg -to the console and the log only if AB_DEBUG is set. -.Pp -.It Dv core.aprint_error(msg) -Like core.aprint_normal(), but also keeps track of the number of times called. -This allows a subsystem to report the number of errors that occurred during a -quiet or silent initialization phase. -.Pp -.It Dv count = core.aprint_get_error_count() -The core.aprint_get_error_count() function reports the number of errors and -resets the counter to 0. -.Pp -.It Dv core.panic(msg) -The core.panic() function terminates the NetBSD system. -The message -.Ar msg -is printed to the console and saved in the variable -.Em panicstr -for later retrieval via core dump inspection. -A newline character is added at the end automatically. -.El -.Sh VARIABLES -Upon initialisation, the -.Nm -module sets the following variables with the values of the correspondig kernel -variable: -.Pp -.Bl -tag -width XXXX -compact -.It Dv core.copyright -.It Dv core.cpu_model -.It Dv core.machine -.It Dv core.machine_arch -.It Dv core.osrelease -.It Dv core.ostype -.It Dv core.kernel_ident -.It Dv core.version -.It Dv core.ncpu -.El -.Sh SEE ALSO -.Xr lua 1 , -.Xr luac 1 , -.Xr intro 9lua , -.Xr lua 4 -.Sh HISTORY -An -.Nm -manual appeared in -.Nx 7.0 . -.Sh AUTHORS -.An -nosplit -The -.Nm -Lua binding was written by -.An Marc Balmer Aq Mt mbalmer@NetBSD.org . Index: distrib/sets/lists/modules/mi =================================================================== RCS file: /cvsroot/src/distrib/sets/lists/modules/mi,v retrieving revision 1.59 diff -u -d -r1.59 mi --- distrib/sets/lists/modules/mi 18 Nov 2013 16:23:47 -0000 1.59 +++ distrib/sets/lists/modules/mi 9 Dec 2013 02:43:10 -0000 @@ -98,10 +98,10 @@ ./@MODULEDIR@/lfs/lfs.kmod base-kernel-modules kmod ./@MODULEDIR@/lua base-kernel-modules kmod ./@MODULEDIR@/lua/lua.kmod base-kernel-modules kmod -./@MODULEDIR@/luacore base-kernel-modules kmod -./@MODULEDIR@/luacore/luacore.kmod base-kernel-modules kmod ./@MODULEDIR@/luapmf base-kernel-modules kmod ./@MODULEDIR@/luapmf/luapmf.kmod base-kernel-modules kmod +./@MODULEDIR@/luasystm base-kernel-modules kmod +./@MODULEDIR@/luasystm/luasystm.kmod base-kernel-modules kmod ./@MODULEDIR@/mfs base-kernel-modules kmod ./@MODULEDIR@/mfs/mfs.kmod base-kernel-modules kmod ./@MODULEDIR@/miiverbose base-kernel-modules kmod Index: distrib/sets/lists/modules/md.evbppc =================================================================== RCS file: /cvsroot/src/distrib/sets/lists/modules/md.evbppc,v retrieving revision 1.37 diff -u -d -r1.37 md.evbppc --- distrib/sets/lists/modules/md.evbppc 19 Nov 2013 12:07:06 -0000 1.37 +++ distrib/sets/lists/modules/md.evbppc 9 Dec 2013 02:43:10 -0000 @@ -96,10 +96,10 @@ ./stand/powerpc-4xx/@OSRELEASE@/modules/lfs/lfs.kmod base-kernel-modules kmod,compatmodules ./stand/powerpc-4xx/@OSRELEASE@/modules/lua base-kernel-modules kmod,compatmodules ./stand/powerpc-4xx/@OSRELEASE@/modules/lua/lua.kmod base-kernel-modules kmod,compatmodules -./stand/powerpc-4xx/@OSRELEASE@/modules/luacore base-kernel-modules kmod,compatmodules -./stand/powerpc-4xx/@OSRELEASE@/modules/luacore/luacore.kmod base-kernel-modules kmod,compatmodules ./stand/powerpc-4xx/@OSRELEASE@/modules/luapmf base-kernel-modules kmod,compatmodules ./stand/powerpc-4xx/@OSRELEASE@/modules/luapmf/luapmf.kmod base-kernel-modules kmod,compatmodules +./stand/powerpc-4xx/@OSRELEASE@/modules/luasystm base-kernel-modules kmod,compatmodules +./stand/powerpc-4xx/@OSRELEASE@/modules/luasystm/luasystm.kmod base-kernel-modules kmod,compatmodules ./stand/powerpc-4xx/@OSRELEASE@/modules/mfs base-kernel-modules kmod,compatmodules ./stand/powerpc-4xx/@OSRELEASE@/modules/mfs/mfs.kmod base-kernel-modules kmod,compatmodules ./stand/powerpc-4xx/@OSRELEASE@/modules/miiverbose base-kernel-modules kmod,compatmodules @@ -303,10 +303,10 @@ ./stand/powerpc-booke/@OSRELEASE@/modules/lfs/lfs.kmod base-kernel-modules kmod,compatmodules ./stand/powerpc-booke/@OSRELEASE@/modules/lua base-kernel-modules kmod,compatmodules ./stand/powerpc-booke/@OSRELEASE@/modules/lua/lua.kmod base-kernel-modules kmod,compatmodules -./stand/powerpc-booke/@OSRELEASE@/modules/luacore base-kernel-modules kmod,compatmodules -./stand/powerpc-booke/@OSRELEASE@/modules/luacore/luacore.kmod base-kernel-modules kmod,compatmodules ./stand/powerpc-booke/@OSRELEASE@/modules/luapmf base-kernel-modules kmod,compatmodules ./stand/powerpc-booke/@OSRELEASE@/modules/luapmf/luapmf.kmod base-kernel-modules kmod,compatmodules +./stand/powerpc-booke/@OSRELEASE@/modules/luasystm base-kernel-modules kmod,compatmodules +./stand/powerpc-booke/@OSRELEASE@/modules/luasystm/luasystm.kmod base-kernel-modules kmod,compatmodules ./stand/powerpc-booke/@OSRELEASE@/modules/mfs base-kernel-modules kmod,compatmodules ./stand/powerpc-booke/@OSRELEASE@/modules/mfs/mfs.kmod base-kernel-modules kmod,compatmodules ./stand/powerpc-booke/@OSRELEASE@/modules/miiverbose base-kernel-modules kmod,compatmodules Index: distrib/sets/lists/man/mi =================================================================== RCS file: /cvsroot/src/distrib/sets/lists/man/mi,v retrieving revision 1.1450 diff -u -d -r1.1450 mi --- distrib/sets/lists/man/mi 13 Nov 2013 20:55:08 -0000 1.1450 +++ distrib/sets/lists/man/mi 9 Dec 2013 02:43:17 -0000 @@ -3119,9 +3119,9 @@ ./usr/share/man/cat8/zpool.0 man-zfs-catman zfs,.cat ./usr/share/man/cat8/zzz.0 man-sysutil-catman .cat ./usr/share/man/cat9/boot.0 man-obsolete obsolete -./usr/share/man/cat9lua/core.0 man-sys-catman .cat ./usr/share/man/cat9lua/intro.0 man-sys-catman .cat ./usr/share/man/cat9lua/pmf.0 man-sys-catman .cat +./usr/share/man/cat9lua/systm.0 man-sys-catman .cat ./usr/share/man/html1/Mail.html man-mail-htmlman html ./usr/share/man/html1/[.html man-util-htmlman html ./usr/share/man/html1/agrep.html man-util-htmlman html @@ -5808,9 +5808,9 @@ ./usr/share/man/html8/zic.html man-sysutil-htmlman html ./usr/share/man/html8/zpool.html man-zfs-htmlman zfs,html ./usr/share/man/html8/zzz.html man-sysutil-htmlman html -./usr/share/man/html9lua/core.html man-sys-htmlman html ./usr/share/man/html9lua/intro.html man-sys-htmlman html ./usr/share/man/html9lua/pmf.html man-sys-htmlman html +./usr/share/man/html9lua/systm.html man-sys-htmlman html ./usr/share/man/man1/Mail.1 man-mail-man .man ./usr/share/man/man1/[.1 man-util-man .man ./usr/share/man/man1/agrep.1 man-util-man .man @@ -8886,7 +8886,7 @@ ./usr/share/man/man8/zpool.8 man-zfs-man zfs,.man ./usr/share/man/man8/zzz.8 man-sysutil-man .man ./usr/share/man/man9/boot.9 man-obsolete obsolete -./usr/share/man/man9lua/core.9lua man-sys-man .man ./usr/share/man/man9lua/intro.9lua man-sys-man .man ./usr/share/man/man9lua/pmf.9lua man-sys-man .man +./usr/share/man/man9lua/systm.9lua man-sys-man .man ./usr/share/man/style.css man-mdocml-htmlman html Index: sys/modules/Makefile =================================================================== RCS file: /cvsroot/src/sys/modules/Makefile,v retrieving revision 1.127 diff -u -d -r1.127 Makefile --- sys/modules/Makefile 18 Nov 2013 16:23:47 -0000 1.127 +++ sys/modules/Makefile 9 Dec 2013 02:43:37 -0000 @@ -40,7 +40,7 @@ SUBDIR+= layerfs SUBDIR+= lfs SUBDIR+= lua -SUBDIR+= luacore +SUBDIR+= luasystm SUBDIR+= luapmf SUBDIR+= mfs SUBDIR+= miiverbose Index: sys/modules/luacore/Makefile =================================================================== RCS file: sys/modules/luacore/Makefile diff -N sys/modules/luacore/Makefile --- sys/modules/luacore/Makefile 16 Oct 2013 19:47:19 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ -# $NetBSD: Makefile,v 1.1 2013/10/16 19:47:19 mbalmer Exp $ - -.include "../Makefile.inc" - -KMOD= luacore -SRCS= luacore.c - -CPPFLAGS+= -I${S}/../external/mit/lua/dist/src \ - -I${S}/modules/lua - -.include Index: sys/modules/luacore/luacore.c =================================================================== RCS file: sys/modules/luacore/luacore.c diff -N sys/modules/luacore/luacore.c --- sys/modules/luacore/luacore.c 2 Dec 2013 05:06:32 -0000 1.5 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,231 +0,0 @@ -/* $NetBSD: luacore.c,v 1.5 2013/12/02 05:06:32 lneto Exp $ */ - -/* - * Copyright (c) 2011, 2013 Marc Balmer . - * 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. - * 3. The name of the Author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 REGENTS 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. - */ - -/* Lua core kernel services module */ - -#include -#include -#include -#ifdef _MODULE -#include -#endif -#include - -#include -#include - -#ifdef _MODULE -MODULE(MODULE_CLASS_MISC, luacore, "lua"); - -/* Various printing functions */ -static int -print(lua_State *L) -{ - const char *s; - - s = lua_tostring(L, -1); - if (s) - printf("%s", s); - return 0; -} - -static int -print_nolog(lua_State *L) -{ - const char *s; - - s = lua_tostring(L, -1); - if (s) - printf_nolog("%s", s); - return 0; -} - -static int -uprint(lua_State *L) -{ - const char *s; - - s = lua_tostring(L, -1); - if (s) - uprintf("%s", s); - return 0; -} - -static int -core_aprint_normal(lua_State *L) -{ - const char *s; - - s = lua_tostring(L, -1); - if (s) - aprint_normal("%s", s); - return 0; -} - -static int -core_aprint_naive(lua_State *L) -{ - const char *s; - - s = lua_tostring(L, -1); - if (s) - aprint_naive("%s", s); - return 0; -} - -static int -core_aprint_verbose(lua_State *L) -{ - const char *s; - - s = lua_tostring(L, -1); - if (s) - aprint_verbose("%s", s); - return 0; -} - -static int -core_aprint_debug(lua_State *L) -{ - const char *s; - - s = lua_tostring(L, -1); - if (s) - aprint_debug("%s", s); - return 0; -} - -static int -core_aprint_error(lua_State *L) -{ - const char *s; - - s = lua_tostring(L, -1); - if (s) - aprint_error("%s", s); - return 0; -} - -static int -core_aprint_get_error_count(lua_State *L) -{ - lua_pushinteger(L, aprint_get_error_count()); - return 1; -} - -/* panicing */ - -static int -core_panic(lua_State *L) -{ - const char *s; - - s = lua_tostring(L, -1); - if (s) - panic("%s", s); - return 0; -} - -/* callouts */ - -/* mutexes */ - -static const luaL_Reg core_lib[ ] = { - { "print", print }, - { "print_nolog", print_nolog }, - { "uprint", uprint }, - { "aprint_normal", core_aprint_normal }, - { "aprint_naive", core_aprint_naive }, - { "aprint_verbose", core_aprint_verbose }, - { "aprint_debug", core_aprint_debug }, - { "aprint_error", core_aprint_error }, - { "aprint_get_error_count", core_aprint_get_error_count }, - - /* panicing */ - { "panic", core_panic }, - - /* callouts */ - - /* mutexes */ - - {NULL, NULL} -}; - - -static int -luaopen_core(void *ls) -{ - lua_State *L = (lua_State *)ls; - - luaL_register(L, "core", core_lib); - - /* some string values */ - lua_pushstring(L, copyright); - lua_setfield(L, -2, "copyright"); - lua_pushstring(L, cpu_model); - lua_setfield(L, -2, "cpu_model"); - lua_pushstring(L, machine); - lua_setfield(L, -2, "machine"); - lua_pushstring(L, machine_arch); - lua_setfield(L, -2, "machine_arch"); - lua_pushstring(L, osrelease); - lua_setfield(L, -2, "osrelease"); - lua_pushstring(L, ostype); - lua_setfield(L, -2, "ostype"); - lua_pushstring(L, kernel_ident); - lua_setfield(L, -2, "kernel_ident"); - lua_pushstring(L, version); - lua_setfield(L, -2, "version"); - - /* some integer values */ - lua_pushinteger(L, ncpu); - lua_setfield(L, -2, "ncpu"); - - return 1; -} - -static int -luacore_modcmd(modcmd_t cmd, void *opaque) -{ - int error; - - switch (cmd) { - case MODULE_CMD_INIT: - error = lua_mod_register("core", luaopen_core); - break; - case MODULE_CMD_FINI: - error = lua_mod_unregister("core"); - break; - default: - error = ENOTTY; - } - return error; -} -#endif Index: sys/modules/luacore/test.lua =================================================================== RCS file: sys/modules/luacore/test.lua diff -N sys/modules/luacore/test.lua --- sys/modules/luacore/test.lua 16 Oct 2013 19:47:19 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,4 +0,0 @@ -require 'core' - -core.print("hello, kernel world!\n") -