Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lua: add dump lua stack function and extract flb_lua_arraylength #7826

Merged
merged 4 commits into from
Aug 29, 2023
Merged

lua: add dump lua stack function and extract flb_lua_arraylength #7826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c66357b
tests: internal: lua: add test for flb_lua_arraylength
nokute78 Aug 12, 2023
9de5f8a
lua: add flb_lua_dump_stack
nokute78 Aug 13, 2023
9260b4e
lua: pass index to lua_arraylength
nokute78 Aug 13, 2023
3c2c500
tests: internal: lua: pass index to lua_arraylength
nokute78 Aug 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion include/fluent-bit/flb_lua.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,20 @@ struct flb_lua_l2c_config {
struct mk_list l2c_types; /* data types (lua -> C) */
};

int flb_lua_arraylength(lua_State *l);
/* convert from negative index to positive index */
static inline int flb_lua_absindex(lua_State *l , int index)
{
#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM < 520
if (index < 0) {
index = lua_gettop(l) + index + 1;
}
#else
index = lua_absindex(l, index);
#endif
return index;
}

int flb_lua_arraylength(lua_State *l, int index);
void flb_lua_pushtimetable(lua_State *l, struct flb_time *tm);
int flb_lua_is_valid_func(lua_State *l, flb_sds_t func);
int flb_lua_pushmpack(lua_State *l, mpack_reader_t *reader);
Expand All @@ -60,5 +73,6 @@ void flb_lua_tompack(lua_State *l,
mpack_writer_t *writer,
int index,
struct flb_lua_l2c_config *l2cc);
void flb_lua_dump_stack(FILE *out, lua_State *l);

#endif
107 changes: 97 additions & 10 deletions src/flb_lua.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,18 +209,18 @@ static int lua_isinteger(lua_State *L, int index)
* If we update luajit which is based Lua 5.2+,
* this function should be removed.
*/
static int lua_table_maxn(lua_State *l)
static int lua_table_maxn(lua_State *l, int index)
{
#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM < 520
int ret = -1;
if (lua_type(l, -1) != LUA_TTABLE) {
if (lua_type(l, index) != LUA_TTABLE) {
return -1;
}

lua_getglobal(l, "table");
lua_getfield(l, -1, "maxn");
lua_remove(l, -2); /* remove table (lua_getglobal(L, "table")) */
lua_pushvalue(l, -2); /* copy record to top of stack */
lua_pushvalue(l, index); /* copy record to top of stack */
ret = lua_pcall(l, 1, 1, 0);
if (ret < 0) {
flb_error("[filter_lua] failed to exec table.maxn ret=%d", ret);
Expand All @@ -239,24 +239,26 @@ static int lua_table_maxn(lua_State *l)

return ret;
#else
return (int)lua_rawlen(l, 1);
return (int)lua_rawlen(l, index);
#endif
}

int flb_lua_arraylength(lua_State *l)
int flb_lua_arraylength(lua_State *l, int index)
{
lua_Integer n;
int count = 0;
int max = 0;
int ret = 0;

ret = lua_table_maxn(l);
index = flb_lua_absindex(l, index);

ret = lua_table_maxn(l, index);
if (ret > 0) {
return ret;
}

lua_pushnil(l);
while (lua_next(l, -2) != 0) {
while (lua_next(l, index) != 0) {
if (lua_type(l, -2) == LUA_TNUMBER) {
n = lua_tonumber(l, -2);
if (n > 0) {
Expand All @@ -269,8 +271,9 @@ int flb_lua_arraylength(lua_State *l)
lua_pop(l, 2);
return -1;
}
if (max != count)
if (max != count) {
return -1;
}
return max;
}

Expand Down Expand Up @@ -442,7 +445,7 @@ void flb_lua_tompack(lua_State *l,
mpack_write_false(writer);
break;
case LUA_TTABLE:
len = flb_lua_arraylength(l);
len = flb_lua_arraylength(l, -1 + index);
if (len > 0) {
mpack_write_tag(writer, mpack_tag_array(len));
for (i = 1; i <= len; i++) {
Expand Down Expand Up @@ -533,7 +536,7 @@ void flb_lua_tomsgpack(lua_State *l,
msgpack_pack_false(pck);
break;
case LUA_TTABLE:
len = flb_lua_arraylength(l);
len = flb_lua_arraylength(l, -1 + index);
if (len > 0) {
msgpack_pack_array(pck, len);
for (i = 1; i <= len; i++) {
Expand Down Expand Up @@ -584,3 +587,87 @@ void flb_lua_tomsgpack(lua_State *l,
break;
}
}

static void print_lua_value(FILE *out, lua_State *l, int index, int depth)
{
int i;
int i_depth;
int type;
size_t len_s;
double val_d;
int64_t val_i;
int len_t;

index = flb_lua_absindex(l, index);

type = lua_type(l, index);
fprintf(out, "%s:", lua_typename(l, type));
switch(type){
case LUA_TSTRING:
fprintf(out, " %s\n", lua_tolstring(l,index, &len_s));
break;
case LUA_TBOOLEAN:
fprintf(out, " %s\n", lua_toboolean(l, index) ? "true":"false");
break;
case LUA_TNUMBER:
val_i = lua_tointeger(l, index);
val_d = lua_tonumber(l, index);
fprintf(out, " d=%lf i=%ld\n", val_d, val_i);
break;
case LUA_TTABLE:
len_t = flb_lua_arraylength(l, index);
fprintf(out, " size=%d ", len_t);
if (len_t > 0) {
fprintf(out, "array\n");
for (i=1; i<=len_t; i++) {
for (i_depth=0; i_depth<depth; i_depth++) {
fputc(' ', stdout);
}
fprintf(out, "%03d: ", i);
lua_rawgeti(l, index, i);
print_lua_value(out, l, -1, depth+2);
lua_pop(l, 1);
}
fprintf(out, "\n");
break;
}

lua_pushnil(l);
fprintf(out, "map\n");
while (lua_next(l, index) != 0) {
for (i_depth=0; i_depth<depth; i_depth++) {
fputc(' ', stdout);
}
fprintf(out, "val: ");
print_lua_value(out, l,-1, depth+2); /* val */
for (i_depth=0; i_depth<depth; i_depth++) {
fputc(' ', stdout);
}
fprintf(out, "key: ");
print_lua_value(out, l,-2, depth+2); /* key */
lua_pop(l, 1); /* pop value */
}

break;
default:
fprintf(out, " (not supported value)\n");
}
}

void flb_lua_dump_stack(FILE *out, lua_State *l)
{
int top;
int i;

top = lua_gettop(l);
if (top == 0) {
fprintf(out, "stack is empty\n");
return;
}
fprintf(out, "top index =%d ======\n", top);
for (i=top; i>=1; i--) {
fprintf(out, "%03d: ", i);
print_lua_value(out, l, i, 2);
}
fprintf(out, "======\n");
}
110 changes: 110 additions & 0 deletions tests/internal/lua.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,12 +204,122 @@ static void test_tompack()
lua_close(l);
}


static void test_lua_arraylength()
{
lua_State *l;
int i;
int len;
int size = 10;

l = luaL_newstate();
if (!TEST_CHECK(l != NULL)) {
TEST_MSG("luaL_newstate faild");
return;
}
luaL_openlibs(l);

/* create array. */
lua_createtable(l, size, 0);

for (i=1; i<=size; i++) {
lua_pushinteger(l, i); /* set an index of array */
lua_pushinteger(l, 3+i); /* set a value */
lua_settable(l, -3); /* points created table */
}

len = flb_lua_arraylength(l, -1);
if (!TEST_CHECK(len == size)) {
TEST_MSG("size error. got=%d expect=%d", len, size);
}
lua_pop(l, 1);

lua_close(l);
}

static void test_lua_arraylength_with_index()
{
lua_State *l;
int i;
int len;
int size = 10;

l = luaL_newstate();
if (!TEST_CHECK(l != NULL)) {
TEST_MSG("luaL_newstate faild");
return;
}
luaL_openlibs(l);

/* create array. */
lua_createtable(l, size, 0);

for (i=1; i<=size; i++) {
lua_pushinteger(l, i); /* set an index of array */
lua_pushinteger(l, 3+i); /* set a value */
lua_settable(l, -3); /* points created table */
}

/* push 2 values */
lua_pushinteger(l, 100);
lua_pushinteger(l, 101);

len = flb_lua_arraylength(l, -3); /* points array. -1 points 101, -2 points 100 */
if (!TEST_CHECK(len == size)) {
TEST_MSG("size error. got=%d expect=%d", len, size);
}
lua_pop(l, 1);

lua_close(l);
}

static void test_lua_arraylength_for_array_contains_nil()
{
lua_State *l;
int i;
int len;
int size = 10;

l = luaL_newstate();
if (!TEST_CHECK(l != NULL)) {
TEST_MSG("luaL_newstate faild");
return;
}
luaL_openlibs(l);

/* create array. */
lua_createtable(l, size, 0);

for (i=1; i<=size; i++) {
lua_pushinteger(l, i); /* set an index of array */
if (i == 7) {
lua_pushnil(l);
}
else {
lua_pushinteger(l, 3+i); /* set a value */
}
lua_settable(l, -3); /* points created table */
}

len = flb_lua_arraylength(l, -1);
if (!TEST_CHECK(len == size)) {
TEST_MSG("size error. got=%d expect=%d", len, size);
}
lua_pop(l, 1);

lua_close(l);
}


TEST_LIST = {
{ "lua_is_valid_func" , test_is_valid_func},
{ "lua_pushtimetable" , test_pushtimetable},
{ "lua_pushmsgpack" , test_pushmsgpack },
{ "lua_pushmpack" , test_pushmpack },
{ "lua_tomsgpack" , test_tomsgpack },
{ "lua_tompack" , test_tompack },
{ "lua_arraylength" , test_lua_arraylength },
{ "lua_arraylength_with_index" , test_lua_arraylength_with_index },
{ "lua_arraylength_for_array_contains_nil", test_lua_arraylength_for_array_contains_nil},
{ 0 }
};