Logging and command line support, and some other cleanups.

icculus · Dec 10, 2006 · 3fd2327 · 3fd2327
1 parent 00f6dfd
commit 3fd2327
Show file tree

Hide file tree

Showing 8 changed files with 376 additions and 54 deletions.
diff --git a/gui.c b/gui.c
@@ -33,18 +33,17 @@ static const MojoGuiEntryPoint staticGui[] =
 
 static MojoGuiPluginPriority calcGuiPriority(const MojoGui *gui)
 {
-    static char *envr = NULL;
     MojoGuiPluginPriority retval;
 
-    if (envr == NULL)
-        envr = getenv("MOJOSETUP_GUI");
-
     retval = gui->priority();
 
     // If the plugin isn't saying "don't try me at all" then see if the
     //  user explicitly wants this one.
     if (retval != MOJOGUI_PRIORITY_NEVER_TRY)
     {
+        static const char *envr = NULL;
+        if (envr == NULL)
+            envr = cmdlinestr("ui", "MOJOSETUP_UI", NULL);
         if ((envr != NULL) && (strcasecmp(envr, gui->name()) == 0))
             retval = MOJOGUI_PRIORITY_USER_REQUESTED;
     } // if

diff --git a/lua/mojosetup_init.lua b/lua/mojosetup_init.lua
@@ -14,7 +14,7 @@
 function MojoSetup.dumptable(tabname, tab, depth)
     if depth == nil then depth = 1 end
     if tabname ~= nil then
-        print(tabname .. " = {")
+        MojoSetup.logdebug(tabname .. " = {")
     end
 
     local depthstr = ""
@@ -24,16 +24,16 @@ function MojoSetup.dumptable(tabname, tab, depth)
 
     for k,v in pairs(tab) do
         if type(v) == "table" then
-            print(depthstr .. k .. " = {")
+            MojoSetup.logdebug(depthstr .. k .. " = {")
             MojoSetup.dumptable(nil, v, depth + 1)
-            print(depthstr .. "}")
+            MojoSetup.logdebug(depthstr .. "}")
         else
-            print(depthstr .. k .. " = " .. tostring(v))
+            MojoSetup.logdebug(depthstr .. k .. " = " .. tostring(v))
         end
     end
 
     if tabname ~= nil then
-        print("}")
+        MojoSetup.logdebug("}")
     end
 end
 
@@ -72,18 +72,14 @@ if MojoSetup.localization ~= nil then
     MojoSetup.localization = nil
 end
 
+MojoSetup.loginfo("Build string: " .. MojoSetup.buildver)
 
--- !!! FIXME: Most of these print()s should become logging statements...
-
-print("Build string: " .. MojoSetup.buildver)
-
-print("command line:");
-for i,v in ipairs(MojoSetup.commandLine) do
-    print("  " .. i .. ": " .. v)
+MojoSetup.loginfo("command line:");
+for i,v in ipairs(MojoSetup.argv) do
+    MojoSetup.loginfo("  " .. i .. ": " .. v)
 end
 
-print("lua license:")
-print(MojoSetup.lualicense)
+--MojoSetup.loginfo(MojoSetup.lualicense)
 
 -- Our namespace for this API...this is filled in with the rest of this file.
 MojoSetup.schema = {}
@@ -156,7 +152,7 @@ function MojoSetup.schema.sanitize(fnname, tab, elems)
         local child = elem[1]
         local defval = elem[2]
 
-        -- print(child .. " isa " .. type(tab[child]) .. " equals " .. tostring(tab[child]));
+        MojoSetup.logdebug(child .. " isa " .. type(tab[child]) .. " equals " .. tostring(tab[child]));
         if tab[child] == nil then tab[child] = defval end
         local j = 3
         while elem[j] do

diff --git a/lua_glue.c b/lua_glue.c
@@ -40,63 +40,81 @@ static const char *MojoLua_reader(lua_State *L, void *data, size_t *size)
 } // MojoLua_reader
 
 
+static inline int snprintfcat(char **ptr, size_t *len, const char *fmt, ...)
+{
+    int bw = 0;
+    va_list ap;
+    va_start(ap, fmt);
+    bw = vsnprintf(*ptr, *len, fmt, ap);
+    va_end(ap);
+    *ptr += bw;
+    *len -= bw;
+    return bw;
+} // snprintfcat
+
+
 static int luahook_stackwalk(lua_State *L)
 {
     const char *errstr = lua_tostring(L, 1);
     lua_Debug ldbg;
     int i = 0;
 
-    STUBBED("log this stuff");
-
     if (errstr != NULL)
-        printf("%s\n", errstr);
+        logDebug("%s\n", errstr);
 
-    printf("Lua stack backtrace:\n");
+    logDebug("Lua stack backtrace:");
 
     // start at 1 to skip this function.
     for (i = 1; lua_getstack(L, i, &ldbg); i++)
     {
-        int bw = printf("#%d", i-1);
+        char *ptr = (char *) scratchbuf_128k;
+        size_t len = sizeof (scratchbuf_128k);
+        int bw = snprintfcat(&ptr, &len, "#%d", i-1);
         const int maxspacing = 4;
         int spacing = maxspacing - bw;
         while (spacing-- > 0)
-            printf(" ");
+            snprintfcat(&ptr, &len, " ");
 
         if (!lua_getinfo(L, "nSl", &ldbg))
         {
-            printf("???\n");
+            snprintfcat(&ptr, &len, "???\n");
+            logDebug((const char *) scratchbuf_128k);
             continue;
         } // if
 
         if (ldbg.namewhat[0])
-            printf("%s ", ldbg.namewhat);
+            snprintfcat(&ptr, &len, "%s ", ldbg.namewhat);
 
         if ((ldbg.name) && (ldbg.name[0]))
-            printf("function %s ()\n", ldbg.name);
+            snprintfcat(&ptr, &len, "function %s ()", ldbg.name);
         else
         {
             if (strcmp(ldbg.what, "main") == 0)
-                printf("mainline of chunk\n");
+                snprintfcat(&ptr, &len, "mainline of chunk");
             else if (strcmp(ldbg.what, "tail") == 0)
-                printf("tail call\n");
+                snprintfcat(&ptr, &len, "tail call");
             else
-                printf("unidentifiable function\n");
+                snprintfcat(&ptr, &len, "unidentifiable function");
         } // if
 
+        logDebug((const char *) scratchbuf_128k);
+        ptr = (char *) scratchbuf_128k;
+        len = sizeof (scratchbuf_128k);
+
         for (spacing = 0; spacing < maxspacing; spacing++)
-            printf(" ");
+            snprintfcat(&ptr, &len, " ");
 
         if (strcmp(ldbg.what, "C") == 0)
-            printf("in native code");
+            snprintfcat(&ptr, &len, "in native code");
         else if (strcmp(ldbg.what, "tail") == 0)
-            printf("in Lua code");
+            snprintfcat(&ptr, &len, "in Lua code");
         else
         {
-            printf("in Lua code at %s", ldbg.source);
+            snprintfcat(&ptr, &len, "in Lua code at %s", ldbg.source);
             if (ldbg.currentline != -1)
-                printf(":%d", ldbg.currentline);
+                snprintfcat(&ptr, &len, ":%d", ldbg.currentline);
         } // else
-        printf("\n");
+        logDebug((const char *) scratchbuf_128k);
     } // for
 
     lua_pushstring(L, errstr ? errstr : "");
@@ -169,18 +187,25 @@ void MojoLua_collectGarbage(void)
     int pre = 0;
     int post = 0;
 
-    STUBBED("logging!");
     pre = (lua_gc(L, LUA_GCCOUNT, 0) * 1024) + lua_gc(L, LUA_GCCOUNTB, 0);
-    printf("Collecting garbage (currently using %d bytes).\n", pre);
+    logDebug("Collecting garbage (currently using %d bytes).", pre);
     ticks = MojoPlatform_ticks();
     lua_gc (L, LUA_GCCOLLECT, 0);
-    ticks = MojoPlatform_ticks() - ticks;
-    printf("Collection finished (took %d milliseconds).\n", (int) ticks);
+    profile("Garbage collection", ticks);
     post = (lua_gc(L, LUA_GCCOUNT, 0) * 1024) + lua_gc(L, LUA_GCCOUNTB, 0);
-    printf("Now using %d bytes (%d bytes savings).\n", post, pre - post);
+    logDebug("Now using %d bytes (%d bytes savings).\n", post, pre - post);
 } // MojoLua_collectGarbage
 
 
+static inline void pushStringOrNil(lua_State *L, const char *str)
+{
+    if (str != NULL)
+        lua_pushstring(L, str);
+    else
+        lua_pushnil(L);
+} // pushStringOrNil
+
+
 // Since localization is kept in Lua tables, I stuck this in the Lua glue.
 const char *translate(const char *str)
 {
@@ -235,9 +260,7 @@ static int luahook_fatal(lua_State *L)
     const char *err = luaL_checkstring(L, 1);
     fatal(err);
     return 0;
-} // luahook_runfile
-
-
+} // luahook_fatal
 
 
 // Lua interface to MojoLua_runFile(). This is needed instead of Lua's
@@ -293,6 +316,53 @@ static int luahook_promptyn(lua_State *L)
 } // luahook_msgbox
 
 
+static int luahook_logwarning(lua_State *L)
+{
+    logWarning(luaL_checkstring(L, 1));
+    return 0;
+} // luahook_logwarning
+
+
+static int luahook_logerror(lua_State *L)
+{
+    logError(luaL_checkstring(L, 1));
+    return 0;
+} // luahook_logerror
+
+
+static int luahook_loginfo(lua_State *L)
+{
+    logInfo(luaL_checkstring(L, 1));
+    return 0;
+} // luahook_loginfo
+
+
+static int luahook_logdebug(lua_State *L)
+{
+    logDebug(luaL_checkstring(L, 1));
+    return 0;
+} // luahook_logdebug
+
+
+static int luahook_cmdline(lua_State *L)
+{
+    const char *arg = luaL_checkstring(L, 1);
+    lua_pushboolean(L, cmdline(arg));
+    return 1;
+} // luahook_cmdline
+
+
+static int luahook_cmdlinestr(lua_State *L)
+{
+    int argc = lua_gettop(L);
+    const char *arg = luaL_checkstring(L, 1);
+    const char *envr = (argc < 2) ? NULL : lua_tostring(L, 2);
+    const char *deflt = (argc < 3) ? NULL : lua_tostring(L, 3);
+    pushStringOrNil(L, cmdlinestr(arg, envr, deflt));
+    return 1;
+} // luahook_cmdlinestr
+
+
 // Sets t[sym]=f, where t is on the top of the Lua stack.
 static inline void set_cfunc(lua_State *L, lua_CFunction f, const char *sym)
 {
@@ -379,14 +449,20 @@ boolean MojoLua_initLua(void)
         set_cfunc(luaState, luahook_msgbox, "msgbox");
         set_cfunc(luaState, luahook_promptyn, "promptyn");
         set_cfunc(luaState, luahook_stackwalk, "stackwalk");
+        set_cfunc(luaState, luahook_logwarning, "logwarning");
+        set_cfunc(luaState, luahook_logerror, "logerror");
+        set_cfunc(luaState, luahook_loginfo, "loginfo");
+        set_cfunc(luaState, luahook_logdebug, "logdebug");
+        set_cfunc(luaState, luahook_cmdline, "cmdline");
+        set_cfunc(luaState, luahook_cmdlinestr, "cmdlinestr");
         set_string(luaState, locale, "locale");
         set_string(luaState, PLATFORM_NAME, "platform");
         set_string(luaState, PLATFORM_ARCH, "arch");
         set_string(luaState, ostype, "ostype");
         set_string(luaState, osversion, "osversion");
         set_string(luaState, GBuildVer, "buildver");
         set_string(luaState, GLuaLicense, "lualicense");
-        set_string_array(luaState, GArgc, GArgv, "commandLine");
+        set_string_array(luaState, GArgc, GArgv, "argv");
     lua_setglobal(luaState, MOJOSETUP_NAMESPACE);
 
     // Set up localization table, if possible.
@@ -427,6 +503,8 @@ void MojoLua_deinitLua(void)
 
 
 const char *GLuaLicense =
+"Lua:\n"
+"\n"
 "Copyright (C) 1994-2006 Lua.org, PUC-Rio.\n"
 "\n"
 "Permission is hereby granted, free of charge, to any person obtaining a copy\n"