CVS commit: src/sys/modules/luasystm

2014-03-24 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon Mar 24 20:21:02 UTC 2014

Modified Files:
src/sys/modules/luasystm: luasystm.c

Log Message:
use cpu_getmodel()


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/luasystm/luasystm.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/modules/luasystm/luasystm.c
diff -u src/sys/modules/luasystm/luasystm.c:1.1 src/sys/modules/luasystm/luasystm.c:1.2
--- src/sys/modules/luasystm/luasystm.c:1.1	Mon Dec 16 19:02:22 2013
+++ src/sys/modules/luasystm/luasystm.c	Mon Mar 24 16:21:02 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: luasystm.c,v 1.1 2013/12/17 00:02:22 lneto Exp $ */
+/*	$NetBSD: luasystm.c,v 1.2 2014/03/24 20:21:02 christos Exp $ */
 
 /*
  * Copyright (c) 2011, 2013 Marc Balmer mbal...@netbsd.org.
@@ -33,6 +33,7 @@
 #include sys/param.h
 #include sys/lua.h
 #include sys/callout.h
+#include sys/cpu.h
 #ifdef _MODULE
 #include sys/module.h
 #endif
@@ -187,7 +188,7 @@ luaopen_systm(void *ls)
 	/* some string values */
 	lua_pushstring(L, copyright);
 	lua_setfield(L, -2, copyright);
-	lua_pushstring(L, cpu_model);
+	lua_pushstring(L, cpu_getmodel());
 	lua_setfield(L, -2, cpu_model);
 	lua_pushstring(L, machine);
 	lua_setfield(L, -2, machine);



CVS commit: src/sys/modules/luasystm

2013-12-16 Thread Lourival Pereira Vieira Neto
Module Name:src
Committed By:   lneto
Date:   Tue Dec 17 00:02:22 UTC 2013

Added Files:
src/sys/modules/luasystm: Makefile luasystm.c test.lua

Log Message:
added luasystm files (for some reason it wasn't done in the last commit)


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/modules/luasystm/Makefile \
src/sys/modules/luasystm/luasystm.c src/sys/modules/luasystm/test.lua

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: src/sys/modules/luasystm/Makefile
diff -u /dev/null src/sys/modules/luasystm/Makefile:1.1
--- /dev/null	Tue Dec 17 00:02:22 2013
+++ src/sys/modules/luasystm/Makefile	Tue Dec 17 00:02:22 2013
@@ -0,0 +1,12 @@
+#	$NetBSD: Makefile,v 1.1 2013/12/17 00:02:22 lneto 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 bsd.kmodule.mk
Index: src/sys/modules/luasystm/luasystm.c
diff -u /dev/null src/sys/modules/luasystm/luasystm.c:1.1
--- /dev/null	Tue Dec 17 00:02:22 2013
+++ src/sys/modules/luasystm/luasystm.c	Tue Dec 17 00:02:22 2013
@@ -0,0 +1,229 @@
+/*	$NetBSD: luasystm.c,v 1.1 2013/12/17 00:02:22 lneto Exp $ */
+
+/*
+ * Copyright (c) 2011, 2013 Marc Balmer mbal...@netbsd.org.
+ * 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 sys/param.h
+#include sys/lua.h
+#include sys/callout.h
+#ifdef _MODULE
+#include sys/module.h
+#endif
+#include sys/systm.h
+
+#include lua.h
+#include lauxlib.h
+
+#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 },
+		{