filter_lua: clean lua_pushcdata and add mode CDATA types (#677)

* filter_lua: clean lua_pushcdata, support structs and add mode CDATA types. * filter_lua: TODO: check if sz == CTSIZE_INVALID * filter_lua: change msgpack_pack_uint32 by msgpack_pack_uint64 * filter_lua: swap lua_pushuint64 and lua_pushint64 * filter_lua: fix spaces Signed-off-by: Manuel Luis Sanmartín Rozada <[email protected]>
fluent · Jul 10, 2018 · 44dabec · 44dabec
1 parent 018d403
commit 44dabec
Show file tree

Hide file tree

Showing 2 changed files with 90 additions and 30 deletions.
diff --git a/include/fluent-bit/flb_luajit.h b/include/fluent-bit/flb_luajit.h
@@ -30,6 +30,8 @@
 #include <lj_cdata.h>
 #include <lj_cconv.h>
 #include <lj_state.h>
+#include <lj_tab.h>
+#include <lj_meta.h>
 
 /* Lua Context */
 struct flb_luajit {

diff --git a/plugins/filter_lua/lua.c b/plugins/filter_lua/lua.c
@@ -29,8 +29,8 @@
 #include <msgpack.h>
 
 /*
- * This function validate if a msgpack formed from a Lua script JSON
- * content is a valid Map
+ * This function validate if a msgpack formed from a Lua script
+ * is a valid Map
  */
 int is_valid_map(char *data, size_t bytes)
 {
@@ -61,25 +61,54 @@ int is_valid_map(char *data, size_t bytes)
 }
 
 /*
- * https://gist.github.com/rtsisyk/6103290
+ * Based on ffi_new (luajit/src/lib_ffi.c)
  */
-static void lua_pushcdata(lua_State *l, CTypeID ctypeid, uint32_t size, void *value)
+static void *lua_pushcdata(lua_State *l, CTypeID ctypeid)
 {
  CTSize sz;
- void **data;
-
+ /* Get ctype info */
  CTState *cts = ctype_cts(l);
- CType *ct = ctype_raw(cts, ctypeid);
- lj_ctype_info(cts, ctypeid, &sz);
- GCcdata *cd = lj_cdata_new(cts, ctypeid, size);
- TValue *o = l->top;
+ CTInfo info = lj_ctype_info(cts, ctypeid, &sz);
+ /* TODO: check if sz == CTSIZE_INVALID */
+
+ /* Allocate C data object. */
+ GCcdata *cd = lj_cdata_new(cts, ctypeid, sz);
 
+ /* Put cdata in the stack */
+ TValue *o = l->top;
  setcdataV(l, o, cd);
- lj_cconv_ct_init(cts, ct, sz, (uint8_t *) cdataptr(cd), o, 0);
  incr_top(l);
 
- data = cdataptr(cd);
- *data = value;
+ if (ctype_isstruct(info)) {
+ /* Initialize cdata. */
+ CType *ct = ctype_raw(cts, ctypeid);
+ lj_cconv_ct_init(cts, ct, sz, cdataptr(cd), o, (MSize)(l->top - o));
+
+ /* Handle ctype __gc metamethod. Use the fast lookup here. */
+ cTValue *tv = lj_tab_getinth(cts->miscmap, -(int32_t)ctypeid);
+ if (tv && tvistab(tv) && (tv = lj_meta_fast(l, tabV(tv), MM_gc))) {
+ GCtab *t = cts->finalizer;
+ if (gcref(t->metatable)) {
+ /* Add to finalizer table, if still enabled. */
+ copyTV(l, lj_tab_set(l, t, o-1), tv);
+ lj_gc_anybarriert(l, t);
+ cd->marked |= LJ_GC_CDATA_FIN;
+ }
+ }
+ }
+
+ lj_gc_check(l);
+ return cdataptr(cd);
+}
+
+static void lua_pushuint64(lua_State *l, uint64_t value)
+{
+ *(uint64_t *) lua_pushcdata(l, CTID_UINT64) = value;
+}
+
+static void lua_pushint64(lua_State *l, int64_t value)
+{
+ *(int64_t *) lua_pushcdata(l, CTID_INT64) = value;
 }
 
 static void lua_pushmsgpack(lua_State *l, msgpack_object *o)
@@ -99,11 +128,11 @@ static void lua_pushmsgpack(lua_State *l, msgpack_object *o)
  break;
 
  case MSGPACK_OBJECT_POSITIVE_INTEGER:
- lua_pushcdata(l, CTID_UINT64, sizeof(uint64_t), (void *)o->via.u64);
+ lua_pushuint64(l, o->via.u64);
  break;
 
  case MSGPACK_OBJECT_NEGATIVE_INTEGER:
- lua_pushcdata(l, CTID_INT64, sizeof(int64_t), (void *)o->via.i64);
+ lua_pushint64(l, o->via.i64);
  break;
 
  case MSGPACK_OBJECT_FLOAT32:
@@ -236,35 +265,64 @@ static void lua_tomsgpack(lua_State *l, msgpack_packer *pck, int index)
  case LUA_TNIL:
  msgpack_pack_nil(pck);
  break;
-
- case LUA_TLIGHTUSERDATA:
- if (lua_touserdata(l, -1 + index) == NULL) {
- msgpack_pack_nil(pck);
- break;
- }
- case LUA_TFUNCTION:
- case LUA_TUSERDATA:
- case LUA_TTHREAD:
- /* cannot serialize */
- break;
-
  case LUA_TCDATA:
  {
- int idx = lua_gettop(l) - 1 + index + 1;
+ int idx = lua_gettop(l) + index;
  GCcdata *cd = cdataV(l->base + idx - 1);
+ void *cdata = cdataptr(cd);
  switch (cd->ctypeid) {
+ case CTID_BOOL:
+ if (*(bool*)cdata)
+ msgpack_pack_true(pck);
+ else
+ msgpack_pack_false(pck);
+ break;
+ case CTID_CCHAR:
+ case CTID_INT8:
+ msgpack_pack_int64(pck, *(int8_t *)cdata);
+ break;
+ case CTID_INT16:
+ msgpack_pack_int64(pck, *(int16_t *)cdata);
+ break;
+ case CTID_INT32:
+ msgpack_pack_int64(pck, *(int32_t *)cdata);
+ break;
  case CTID_INT64:
- msgpack_pack_int64(pck, *(int64_t *)cdataptr(cd));
+ msgpack_pack_int64(pck, *(int64_t *)cdata);
+ break;
+ case CTID_UINT8:
+ msgpack_pack_uint64(pck, *(uint8_t *)cdata);
+ break;
+ case CTID_UINT16:
+ msgpack_pack_uint64(pck, *(uint16_t *)cdata);
+ break;
+ case CTID_UINT32:
+ msgpack_pack_uint64(pck, *(uint32_t *)cdata);
  break;
  case CTID_UINT64:
- msgpack_pack_uint64(pck, *(uint64_t *)cdataptr(cd));
+ msgpack_pack_uint64(pck, *(uint64_t *)cdata);
+ break;
+ case CTID_FLOAT:
+ msgpack_pack_double(pck, *(float *)cdata);
+ break;
+ case CTID_DOUBLE:
+ msgpack_pack_double(pck, *(double *)cdata);
  break;
  default:
  msgpack_pack_nil(pck);
  break;
  }
  }
  break;
+ case LUA_TLIGHTUSERDATA:
+ case LUA_TFUNCTION:
+ case LUA_TUSERDATA:
+ case LUA_TTHREAD:
+ default:
+ /* cannot serialize */
+ msgpack_pack_nil(pck);
+ break;
+
  }
 }