Changeset a2b666a8ab8d7131bde0c3d600c5f4b8d7fa2709

Timestamp:

06/06/08 03:32:29 (5 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1212723149 +0000

git-parent:

[fc9516a2d8a7585aaaffbaab77009199ca907c90]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1212723149 +0000

Message:

make modules actually be lua modules

Files:

• src/modules-lua/noit/module/varnish.lua (added)
• src/modules-lua/varnish.lua (deleted)
• src/modules/lua.c (modified) (14 diffs)
• src/modules/lua_noit.h (modified) (1 diff)

src/modules/lua.c

@@ -83 +83 @@
-}
-
+static void
+noit_lua_pushmodule(lua_State *L, const char *m) {
+  int stack_pos = LUA_GLOBALSINDEX;
+  char *copy, *part, *brkt;
+  copy = alloca(strlen(m)+1);
+  assert(copy);
+  memcpy(copy,m,strlen(m)+1);
+
+  for(part = strtok_r(copy, ".", &brkt);
+      part;
+      part = strtok_r(NULL, ".", &brkt)) {
+    lua_getfield(L, stack_pos, part);
+    if(stack_pos == -1) lua_remove(L, -2);
+    else stack_pos = -1;
+  }
+}
-static void
-noit_lua_hash_to_table(lua_State *L,
@@ -314 +330 @@
-static int
-noit_lua_module_onload(noit_image_t *i) {
+  int rv;
-  lua_State *L;
-  lua_module_closure_t *lmc;
+
-  lmc = noit_image_get_userdata(i);
-  L = lmc->lua_state;
-
+
+
+
+
-    int i;
-    noitL(nlerr, "lua: %s.onload failed\n", lmc->object);
@@ -330 +351 @@
-      }
-    }
+    lua_pop(L,i);
-    return -1;
-  }
-
-
+
+
+
-  if(lua_isnil(L, -1)) {
-    lua_pop(L, 1);
@@ -366 +389 @@
-  L = lmc->lua_state
-#define SETUP_CALL(L, func, failure) do { \
-lua_getfield(L, LUA_GLOBALSINDEX
+noit_lua_pushmodule(L
-  lua_getfield(L, -1, func); \
-  lua_remove(L, -2); \
@@ -375 +398 @@
-} while(0)
-#define RETURN_INT(L, func) do { \
+  int base = lua_gettop(L); \
+  assert(base == 1); \
-  if(lua_isnumber(L, -1)) { \
-    int rv; \
@@ -463 +488 @@
-       * to wake up the coro...
-       */
-      lua_gc(ci->lmc->lua_state, LUA_GCCOLLECT, 0);
-      goto done;
-    default: /* Errors */
@@ -486 +510 @@
-  lua_getglobal(ci->lmc->lua_state, "noit_coros");
-  luaL_unref(ci->lmc->lua_state, -1, ci->coro_state_ref);
-2
+1
-
- done:
@@ -507 +531 @@
-    lua_getglobal(ci->lmc->lua_state, "noit_coros");
-    luaL_unref(ci->lmc->lua_state, -1, ci->coro_state_ref);
-2
+1
-    lua_gc(ci->lmc->lua_state, LUA_GCCOLLECT, 0);
-    assert(2 == noit_lua_resume(ci, 0));
@@ -549 +573 @@
-  eventer_add(e);
-
+  noitL(nlerr, "initiate gettop => %d\n", lua_gettop(L));
-  ci->lmc = lmc;
-  lua_getglobal(L, "noit_coros");
-  ci->coro_state = lua_newthread(L);
+  ci->coro_state_ref = luaL_ref(L, -2);
+  lua_pop(L, 1); /* pops noit_coros */
-  noit_hash_store(&noit_coros,
-                  (const char *)&ci->coro_state, sizeof(ci->coro_state),
-                  ci);
-  ci->coro_state_ref = luaL_ref(L, -2);
-  lua_pop(L, 1); /* pops noit_coros */
-
-  SETUP_CALL(ci->coro_state, "initiate", goto fail);
@@ -586 +611 @@
-  lua_State *L;
-  lua_module_closure_t *lmc;
-  char *script;
-  char *object;
-  char scriptfile[MAXPATHLEN];
-  
-  noitL(nldeb, "Loading lua module: %s\n", module_name);
@@ -595 +618 @@
-    return NULL;
-  }
-  if(noit_conf_get_string(section, "@script", &script) == 0) {
-    noitL(nlerr, "Lua module %s require script attribute.\n", module_name);
-    free(object);
-    return NULL;
-  }
-  snprintf(scriptfile, sizeof(scriptfile), "%s/%s",
-           noit_lua_loader_get_directory(loader), script);
-  free(script);
-
-  m = noit_blank_module();
@@ -612 +627 @@
-  lmc = calloc(1, sizeof(*lmc));
-  lmc->object = object;
-  lmc->script = strdup(scriptfile);
-
-  L = lmc->lua_state = lua_open();
+
+
-  lua_gc(L, LUA_GCSTOP, 0);  /* stop collector during initialization */
-  luaL_openlibs(L);  /* open libraries */
@@ -620 +636 @@
-  lua_newtable(L);
-  lua_setglobal(L, "noit_coros");
+
+  lua_getfield(L, LUA_GLOBALSINDEX, "package");
+  lua_pushfstring(L, "%s", noit_lua_loader_get_directory(loader));
+  lua_setfield(L, -2, "path");
+  lua_pop(L, 1);
+
-  lua_gc(L, LUA_GCRESTART, 0);
-
@@ -627 +649 @@
-    free(m->hdr.description);
-    free(lmc->object);
-    free(lmc->script);
-    free(lmc);
-    /* FIXME: We leak the opaque_handler in the module here... */

src/modules/lua_noit.h

@@ -23 +23 @@
-typedef struct lua_module_closure {
-  char *object;
-  char *script;
-  lua_State *lua_state;
+  int object_ref;
-} lua_module_closure_t;
-