Changeset 202f85178854db96b302a656508cc591b67a143e

Timestamp:

09/16/09 04:12:39 (4 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[6492d5caf9dd0d182d061d1650520854f06e2b72]

git-author:

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

Message:

fix was small (strdup, stupid) and some other cleanup, fixes #179

Files:

• src/modules/lua.c (modified) (8 diffs)
• src/modules/lua_noit.c (modified) (1 diff)
• src/modules/lua_noit.h (modified) (1 diff)

src/modules/lua.c

@@ -452 +452 @@
-  lua_module_closure_t *lmc;
-
+  noit_lua_init();
+
-  lmc = noit_image_get_userdata(i);
-  L = lmc->lua_state;
@@ -593 +595 @@
-noit_lua_resume(noit_lua_check_info_t *ci, int nargs) {
-  int result = -1, base;
+  noit_module_t *self;
-  noit_check_t *check;
-  check = ci->check;
@@ -619 +622 @@
-          if(err) {
-            free(ci->current.status);
-(char *)err
+strdup(err)
-          }
-        }
@@ -625 +628 @@
-      break;
-  }
+
+  self = ci->self;
+  check = ci->check;
-  cancel_coro(ci);
-
-
-
+
+
-  ci = NULL; /* we freed it... explode if someone uses it before we return */
-  check->flags &= ~NP_RUNNING;
@@ -638 +643 @@
-noit_lua_check_timeout(eventer_t e, int mask, void *closure,
-                       struct timeval *now) {
+  noit_module_t *self;
-  noit_check_t *check;
-  struct nl_intcl *int_cl = closure;
@@ -645 +651 @@
-  ci->timed_out = 1;
-  noit_lua_check_deregister_event(ci, e, 0);
+
+  self = ci->self;
+  check = ci->check;
+
-  if(ci->coro_state) {
-    /* Our coro is still "in-flight". To fix this we will unreference
@@ -652 +662 @@
-  }
-
-ci->self, ci->
-ci->self, ci->
+self, 
+self, 
-  check->flags &= ~NP_RUNNING;
-
@@ -812 +822 @@
-static int
-noit_lua_loader_onload(noit_image_t *self) {
-serf
-serf
+lua
+lua
-  if(!nlerr) nlerr = noit_stderr;
-  if(!nldeb) nldeb = noit_debug;

src/modules/lua_noit.c

@@ -668 +668 @@
-  return 0;
-}
+
+void noit_lua_init() {
+  eventer_name_callback("lua/sleep", nl_sleep_complete);
+  eventer_name_callback("lua/socket_read",
+                        noit_lua_socket_read_complete);
+  eventer_name_callback("lua/socket_write",
+                        noit_lua_socket_write_complete);
+  eventer_name_callback("lua/socket_connect",
+                        noit_lua_socket_connect_complete);
+  eventer_name_callback("lua/ssl_upgrade", noit_lua_ssl_upgrade);
+}

src/modules/lua_noit.h

@@ -93 +93 @@
-};
-
+void noit_lua_init();
-int luaopen_noit(lua_State *L);
-noit_lua_check_info_t *get_ci(lua_State *L);