Changeset 483ffbb2a71b31651cb48c74c7436508890169f4

Timestamp:

06/05/08 03:10:39 (5 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[f920aec8f7779dc67b4ea347d8da0384b27627b4]

git-author:

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

Message:

implement write and fix up read... luaL_Buffer is crap -- avoid it. show our accomplishment with a short, simple Varnish stat query check, refs #28

Files:

• src/modules-lua/varnish.lua (added)
• src/modules/lua.c (modified) (1 diff)
• src/modules/lua_noit.c (modified) (11 diffs)

src/modules/lua.c

@@ -460 +460 @@
-  check->flags &= ~NP_RUNNING;
-
+  lua_getglobal(ci->lmc->lua_state, "noit_coros");
+  luaL_unref(ci->lmc->lua_state, -1, ci->coro_state_ref);
+  lua_pop(ci->lmc->lua_state, 2);
+
- done:
-  lua_gc(ci->lmc->lua_state, LUA_GCCOLLECT, 0);

src/modules/lua_noit.c

@@ -22 +22 @@
-
-struct nl_slcl {
+  int send_size;
-  struct timeval start;
-
-
-
+
+
+
+
+
-  const char *read_terminator;
-  const char *outbuff;
-in
-in
+size_
+size_
-  eventer_t *eptr;
-  lua_State *L;
-};
+
+static void
+inbuff_addlstring(struct nl_slcl *cl, const char *b, int l) {
+  int newsize = 0;
+  char *newbuf;
+  if(cl->inbuff_len + l > cl->inbuff_allocd)
+    newsize = cl->inbuff_len + l;
+  if(newsize) {
+    newbuf = cl->inbuff_allocd ? realloc(cl->inbuff, newsize) : malloc(newsize);
+    assert(newbuf);
+    cl->inbuff = newbuf;
+    cl->inbuff_allocd = newsize;
+  }
+  memcpy(cl->inbuff + cl->inbuff_len, b, l);
+  cl->inbuff_len += l;
+}
-
-static int
@@ -147 +166 @@
-      int remaining = cl->read_goal - cl->read_sofar;
-      /* copy up to the goal into the inbuff */
-luaL_addlstring(&cl->inbuff
+inbuff_addlstring(cl
-      cl->read_sofar += len;
-      if(cl->read_sofar >= cl->read_goal) { /* We're done */
-
+
+
-        cl->read_sofar -= cl->read_goal;
-
-
-
-
-
+
+
+
-        }
-        args = 1;
-        break;
-      }
@@ -167 +184 @@
-      cp = strnstr(buff, cl->read_terminator, len);
-      if(cp) remaining = cp - buff + strlen(cl->read_terminator);
-luaL_addlstring(&cl->inbuff
+inbuff_addlstring(cl
-      cl->read_sofar += len;
-      if(cp) {
-
+
+
-        cl->read_sofar = len - remaining;
-        if(cl->read_sofar > 0) { /* We have to buffer this for next read */
-luaL_buffinit(cl->L, &cl->inbuff)
-luaL_addlstring(&cl->inbuff
+cl->inbuff_len = 0
+inbuff_addlstring(cl
-        }
-        args = 1;
-        break;
-      }
@@ -185 +202 @@
-  }
-  else if(len == -1 && errno == EAGAIN) {
-EVENTER_READ
+mask
-  }
-  else {
@@ -212 +229 @@
-  e = *eptr;
-  cl = e->closure;
-  if(cl->read_sofar == 0) luaL_buffinit(L, &cl->inbuff);
-  cl->read_goal = 0;
-  cl->read_terminator = NULL;
-  fprintf(stderr, "initiating read... (%d bytes buffered)\n", cl->read_sofar);
-
-  if(lua_isnumber(L, 1)) {
-    cl->read_goal = lua_tointeger(L, 1);
-    fprintf(stderr, " read wants %d bytes\n", cl->read_goal);
-    if(cl->read_goal <= cl->read_sofar) {
-      const char *current_buff;
-      int base;
-      size_t len;
-     i_know_better:
-      base = lua_gettop(L);
-      /* We have enough, we can service this right here */
-
-
-
-
-
+
-      cl->read_sofar -= cl->read_goal;
-      if(cl->read_sofar) {
-
-
-
+
+
-      }
-      return 1;
@@ -243 +250 @@
-  else {
-    cl->read_terminator = lua_tostring(L, 1);
-    fprintf(stderr, " read wants up to [%s]\n", cl->read_terminator);
-    if(cl->read_sofar) {
-      const char *cp;
-      /* Ugh... inernalism */
-.buffer
+
-      if(cp) {
-        /* Here we matched... and we _know_ that someone actually wants:
@@ -253 +259 @@
-         * give it to them.
-         */
-.buffer
+
-        cl->read_terminator = NULL;
-        assert(cl->read_goal <= cl->read_sofar);
@@ -265 +271 @@
-  eventer_add(e);
-  return noit_lua_yield(ci, 0);
+}
+static int
+noit_lua_socket_write_complete(eventer_t e, int mask, void *vcl,
+                               struct timeval *now) {
+  noit_lua_check_info_t *ci;
+  struct nl_slcl *cl = vcl;
+  int rv;
+  int args = 0;
+
+  ci = get_ci(cl->L);
+  assert(ci);
+
+  if(mask & EVENTER_EXCEPTION) {
+    lua_pushinteger(cl->L, -1);
+    args = 1;
+    goto alldone;
+  }
+  while((rv = e->opset->write(e->fd,
+                              cl->outbuff + cl->write_sofar,
+                              MIN(cl->send_size, cl->write_goal),
+                              &mask, e)) > 0) {
+    cl->write_sofar += rv;
+    assert(cl->write_sofar <= cl->write_goal);
+    if(cl->write_sofar == cl->write_goal) break;
+  }
+  if(rv > 0) {
+    lua_pushinteger(cl->L, cl->write_goal);
+    args = 1;
+  }
+  else if(rv == -1 && errno == EAGAIN) {
+    return mask | EVENTER_EXCEPTION;
+  }
+  else {
+    lua_pushinteger(cl->L, -1);
+    args = 1;
+    if(rv == -1) {
+      lua_pushstring(cl->L, strerror(errno));
+      args++;
+    }
+  }
+
+ alldone:
+  noit_lua_check_deregister_event(ci, e, 0);
+  *(cl->eptr) = eventer_alloc();
+  memcpy(*cl->eptr, e, sizeof(*e));
+  noit_lua_check_register_event(ci, *cl->eptr);
+  noit_lua_resume(ci, args);
+  return 0;
+}
+static int
+noit_lua_socket_write(lua_State *L) {
+  int rv, mask;
+  struct nl_slcl *cl;
+  noit_lua_check_info_t *ci;
+  eventer_t e, *eptr;
+
+  ci = get_ci(L);
+  assert(ci);
+
+  eptr = lua_touserdata(L, lua_upvalueindex(1));
+  e = *eptr;
+  cl = e->closure;
+  cl->write_sofar = 0;
+  cl->outbuff = lua_tolstring(L, 1, &cl->write_goal);
+
+  while((rv = e->opset->write(e->fd,
+                              cl->outbuff + cl->write_sofar,
+                              MIN(cl->send_size, cl->write_goal),
+                              &mask, e)) > 0) {
+    cl->write_sofar += rv;
+    assert(cl->write_sofar <= cl->write_goal);
+    if(cl->write_sofar == cl->write_goal) break;
+  }
+  if(rv > 0) {
+    lua_pushinteger(L, cl->write_goal);
+    return 1;
+  }
+  if(rv == -1 && errno == EAGAIN) {
+    e->callback = noit_lua_socket_write_complete;
+    e->mask = mask | EVENTER_EXCEPTION;
+    eventer_add(e);
+    return noit_lua_yield(ci, 0);
+  }
+  lua_pushinteger(L, -1);
+  return 1;
-}
-static int
@@ -297 +388 @@
-     }
-     break;
+    case 'w':
+     if(!strcmp(k, "write")) {
+       lua_pushlightuserdata(L, udata);
+       lua_pushcclosure(L, noit_lua_socket_write, 1);
+       return 1;
+     }
+     break;
-    default:
-      break;
@@ -369 +467 @@
-  struct nl_slcl *cl;
-  noit_lua_check_info_t *ci;
-
+, optlen
-  int fd;
-  eventer_t e;
@@ -390 +488 @@
-  cl = calloc(1, sizeof(*cl));
-  cl->L = L;
+
+  optlen = sizeof(cl->send_size);
+  if(getsockopt(fd, SOL_SOCKET, SO_SNDBUF, &cl->send_size, &optlen) != 0)
+    cl->send_size = 4096;
-
-  e = eventer_alloc();