X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Flua.c;h=8dc78d00000d9c8e2674580f44038418782e8e70;hb=cc459b3cccf832e08d5c5bae12add775a915ae01;hp=9eda7d5b4ed0403bb056afb1ea542e83ce158f0d;hpb=1c5e82a7eefdbcce608951fa5a00c5c5a43a41e6;p=collectd.git diff --git a/src/lua.c b/src/lua.c index 9eda7d5b..8dc78d00 100644 --- a/src/lua.c +++ b/src/lua.c @@ -28,36 +28,26 @@ * Ruben Kerkhof **/ -/* defines a macro using "sprintf". Although not used here, - * GCC will complain about the macro definition. */ -#define DONT_POISON_SPRINTF_YET - -#include "common.h" -#include "plugin.h" #include "collectd.h" +#include "plugin.h" +#include "utils/common/common.h" +#include "utils_lua.h" /* Include the Lua API header files. */ #include #include #include -#include "utils_lua.h" #include -#if COLLECT_DEBUG && __GNUC__ -#undef sprintf -#pragma GCC poison sprintf -#endif - typedef struct lua_script_s { - char *script_path; lua_State *lua_state; struct lua_script_s *next; } lua_script_t; typedef struct { lua_State *lua_state; - const char *lua_function_name; + char *lua_function_name; pthread_mutex_t lock; int callback_id; } clua_callback_data_t; @@ -79,29 +69,25 @@ static int clua_load_callback(lua_State *L, int callback_ref) /* {{{ */ if (!lua_isfunction(L, -1)) { lua_pop(L, 1); - return (-1); + return -1; } - return (0); + return 0; } /* }}} int clua_load_callback */ /* Store the threads in a global variable so they are not cleaned up by the * garbage collector. */ static int clua_store_thread(lua_State *L, int idx) /* {{{ */ { - if (idx < 0) - idx += lua_gettop(L) + 1; + if (!lua_isthread(L, idx)) { + return -1; + } /* Copy the thread pointer */ - lua_pushvalue(L, idx); /* +1 = 3 */ - if (!lua_isthread(L, -1)) { - lua_pop(L, 3); /* -3 = 0 */ - return (-1); - } + lua_pushvalue(L, idx); luaL_ref(L, LUA_REGISTRYINDEX); - lua_pop(L, 1); /* -1 = 0 */ - return (0); + return 0; } /* }}} int clua_store_thread */ static int clua_read(user_data_t *ud) /* {{{ */ @@ -117,7 +103,7 @@ static int clua_read(user_data_t *ud) /* {{{ */ ERROR("Lua plugin: Unable to load callback \"%s\" (id %i).", cb->lua_function_name, cb->callback_id); pthread_mutex_unlock(&cb->lock); - return (-1); + return -1; } /* +1 = 1 */ @@ -131,7 +117,7 @@ static int clua_read(user_data_t *ud) /* {{{ */ ERROR("Lua plugin: Calling a read callback failed: %s", errmsg); lua_pop(L, 1); pthread_mutex_unlock(&cb->lock); - return (-1); + return -1; } if (!lua_isnumber(L, -1)) { @@ -147,7 +133,7 @@ static int clua_read(user_data_t *ud) /* {{{ */ lua_pop(L, 1); /* -1 = 0 */ pthread_mutex_unlock(&cb->lock); - return (status); + return status; } /* }}} int clua_read */ static int clua_write(const data_set_t *ds, const value_list_t *vl, /* {{{ */ @@ -163,7 +149,7 @@ static int clua_write(const data_set_t *ds, const value_list_t *vl, /* {{{ */ ERROR("Lua plugin: Unable to load callback \"%s\" (id %i).", cb->lua_function_name, cb->callback_id); pthread_mutex_unlock(&cb->lock); - return (-1); + return -1; } /* +1 = 1 */ @@ -172,7 +158,7 @@ static int clua_write(const data_set_t *ds, const value_list_t *vl, /* {{{ */ lua_pop(L, 1); /* -1 = 0 */ pthread_mutex_unlock(&cb->lock); ERROR("Lua plugin: luaC_pushvaluelist failed."); - return (-1); + return -1; } /* +1 = 2 */ @@ -186,7 +172,7 @@ static int clua_write(const data_set_t *ds, const value_list_t *vl, /* {{{ */ ERROR("Lua plugin: Calling the write callback failed:\n%s", errmsg); lua_pop(L, 1); /* -1 = 0 */ pthread_mutex_unlock(&cb->lock); - return (-1); + return -1; } if (!lua_isnumber(L, -1)) { @@ -200,7 +186,7 @@ static int clua_write(const data_set_t *ds, const value_list_t *vl, /* {{{ */ lua_pop(L, 1); /* -1 = 0 */ pthread_mutex_unlock(&cb->lock); - return (status); + return status; } /* }}} int clua_write */ /* @@ -272,6 +258,12 @@ static int lua_cb_dispatch_values(lua_State *L) /* {{{ */ return 0; } /* }}} lua_cb_dispatch_values */ +static void lua_cb_free(void *data) { + clua_callback_data_t *cb = data; + free(cb->lua_function_name); + free(cb); +} + static int lua_cb_register_read(lua_State *L) /* {{{ */ { int nargs = lua_gettop(L); @@ -282,7 +274,7 @@ static int lua_cb_register_read(lua_State *L) /* {{{ */ luaL_checktype(L, 1, LUA_TFUNCTION); char function_name[DATA_MAX_NAME_LEN]; - ssnprintf(function_name, sizeof(function_name), "lua/%s", lua_tostring(L, 1)); + snprintf(function_name, sizeof(function_name), "lua/%s", lua_tostring(L, 1)); int callback_id = clua_store_callback(L, 1); if (callback_id < 0) @@ -303,12 +295,14 @@ static int lua_cb_register_read(lua_State *L) /* {{{ */ cb->lua_function_name = strdup(function_name); pthread_mutex_init(&cb->lock, NULL); - int status = plugin_register_complex_read(/* group = */ "lua", - /* name = */ function_name, - /* callback = */ clua_read, - /* interval = */ 0, &(user_data_t){ - .data = cb, - }); + int status = + plugin_register_complex_read(/* group = */ "lua", + /* name = */ function_name, + /* callback = */ clua_read, + /* interval = */ 0, + &(user_data_t){ + .data = cb, .free_func = lua_cb_free, + }); if (status != 0) return luaL_error(L, "%s", "plugin_register_complex_read failed"); @@ -325,7 +319,7 @@ static int lua_cb_register_write(lua_State *L) /* {{{ */ luaL_checktype(L, 1, LUA_TFUNCTION); char function_name[DATA_MAX_NAME_LEN] = ""; - ssnprintf(function_name, sizeof(function_name), "lua/%s", lua_tostring(L, 1)); + snprintf(function_name, sizeof(function_name), "lua/%s", lua_tostring(L, 1)); int callback_id = clua_store_callback(L, 1); if (callback_id < 0) @@ -346,11 +340,11 @@ static int lua_cb_register_write(lua_State *L) /* {{{ */ cb->lua_function_name = strdup(function_name); pthread_mutex_init(&cb->lock, NULL); - int status = - plugin_register_write(/* name = */ function_name, - /* callback = */ clua_write, &(user_data_t){ - .data = cb, - }); + int status = plugin_register_write(/* name = */ function_name, + /* callback = */ clua_write, + &(user_data_t){ + .data = cb, .free_func = lua_cb_free, + }); if (status != 0) return luaL_error(L, "%s", "plugin_register_write failed"); @@ -390,7 +384,6 @@ static void lua_script_free(lua_script_t *script) /* {{{ */ script->lua_state = NULL; } - sfree(script->script_path); sfree(script); lua_script_free(next); @@ -404,7 +397,7 @@ static int lua_script_init(lua_script_t *script) /* {{{ */ script->lua_state = luaL_newstate(); if (script->lua_state == NULL) { ERROR("Lua plugin: luaL_newstate() failed."); - return (-1); + return -1; } /* Open up all the standard Lua libraries. */ @@ -437,7 +430,7 @@ static int lua_script_init(lua_script_t *script) /* {{{ */ lua_pop(script->lua_state, 1); } - return (0); + return 0; } /* }}} int lua_script_init */ static int lua_script_load(const char *script_path) /* {{{ */ @@ -445,29 +438,22 @@ static int lua_script_load(const char *script_path) /* {{{ */ lua_script_t *script = malloc(sizeof(*script)); if (script == NULL) { ERROR("Lua plugin: malloc failed."); - return (-1); + return -1; } int status = lua_script_init(script); if (status != 0) { lua_script_free(script); - return (status); + return status; } - script->script_path = strdup(script_path); - if (script->script_path == NULL) { - ERROR("Lua plugin: strdup failed."); - lua_script_free(script); - return (-1); - } - - status = luaL_loadfile(script->lua_state, script->script_path); + status = luaL_loadfile(script->lua_state, script_path); if (status != 0) { ERROR("Lua plugin: luaL_loadfile failed: %s", lua_tostring(script->lua_state, -1)); lua_pop(script->lua_state, 1); lua_script_free(script); - return (-1); + return -1; } status = lua_pcall(script->lua_state, @@ -483,10 +469,10 @@ static int lua_script_load(const char *script_path) /* {{{ */ status); else ERROR("Lua plugin: Executing script \"%s\" failed:\n%s", - script->script_path, errmsg); + script_path, errmsg); lua_script_free(script); - return (-1); + return -1; } /* Append this script to the global list of scripts. */ @@ -500,14 +486,14 @@ static int lua_script_load(const char *script_path) /* {{{ */ scripts = script; } - return (0); + return 0; } /* }}} int lua_script_load */ static int lua_config_base_path(const oconfig_item_t *ci) /* {{{ */ { int status = cf_util_get_string_buffer(ci, base_path, sizeof(base_path)); if (status != 0) - return (status); + return status; size_t len = strlen(base_path); while ((len > 0) && (base_path[len - 1] == '/')) { @@ -517,7 +503,7 @@ static int lua_config_base_path(const oconfig_item_t *ci) /* {{{ */ DEBUG("Lua plugin: base_path = \"%s\";", base_path); - return (0); + return 0; } /* }}} int lua_config_base_path */ static int lua_config_script(const oconfig_item_t *ci) /* {{{ */ @@ -526,20 +512,20 @@ static int lua_config_script(const oconfig_item_t *ci) /* {{{ */ int status = cf_util_get_string_buffer(ci, rel_path, sizeof(rel_path)); if (status != 0) - return (status); + return status; char abs_path[PATH_MAX]; if (base_path[0] == '\0') sstrncpy(abs_path, rel_path, sizeof(abs_path)); else - ssnprintf(abs_path, sizeof(abs_path), "%s/%s", base_path, rel_path); + snprintf(abs_path, sizeof(abs_path), "%s/%s", base_path, rel_path); DEBUG("Lua plugin: abs_path = \"%s\";", abs_path); status = lua_script_load(abs_path); if (status != 0) - return (status); + return status; INFO("Lua plugin: File \"%s\" loaded successfully", abs_path); @@ -576,7 +562,7 @@ static int lua_shutdown(void) /* {{{ */ { lua_script_free(scripts); - return (0); + return 0; } /* }}} int lua_shutdown */ void module_register(void) {