projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gps plugin: Fix double unlock.
[collectd.git]
/
src
/
lua.c
diff --git
a/src/lua.c
b/src/lua.c
index
79f288b
..
2bd56a1
100644
(file)
--- a/
src/lua.c
+++ b/
src/lua.c
@@
-32,15
+32,15
@@
* GCC will complain about the macro definition. */
#define DONT_POISON_SPRINTF_YET
* GCC will complain about the macro definition. */
#define DONT_POISON_SPRINTF_YET
-#include "collectd.h"
#include "common.h"
#include "plugin.h"
#include "common.h"
#include "plugin.h"
+#include "collectd.h"
/* Include the Lua API header files. */
/* Include the Lua API header files. */
-#include "utils_lua.h"
#include <lauxlib.h>
#include <lua.h>
#include <lualib.h>
#include <lauxlib.h>
#include <lua.h>
#include <lualib.h>
+#include "utils_lua.h"
#include <pthread.h>
#include <pthread.h>
@@
-303,15
+303,12
@@
static int lua_cb_register_read(lua_State *L) /* {{{ */
cb->lua_function_name = strdup(function_name);
pthread_mutex_init(&cb->lock, NULL);
cb->lua_function_name = strdup(function_name);
pthread_mutex_init(&cb->lock, NULL);
- user_data_t ud = {
- .data = cb
- };
-
int status = plugin_register_complex_read(/* group = */ "lua",
/* name = */ function_name,
/* callback = */ clua_read,
int status = plugin_register_complex_read(/* group = */ "lua",
/* name = */ function_name,
/* callback = */ clua_read,
- /* interval = */ 0,
- /* user_data = */ &ud);
+ /* interval = */ 0, &(user_data_t){
+ .data = cb,
+ });
if (status != 0)
return luaL_error(L, "%s", "plugin_register_complex_read failed");
if (status != 0)
return luaL_error(L, "%s", "plugin_register_complex_read failed");
@@
-349,20
+346,18
@@
static int lua_cb_register_write(lua_State *L) /* {{{ */
cb->lua_function_name = strdup(function_name);
pthread_mutex_init(&cb->lock, NULL);
cb->lua_function_name = strdup(function_name);
pthread_mutex_init(&cb->lock, NULL);
- user_data_t ud = {
- .data = cb
- };
-
- int status = plugin_register_write(/* name = */ function_name,
- /* callback = */ clua_write,
- /* user_data = */ &ud);
+ int status =
+ plugin_register_write(/* name = */ function_name,
+ /* callback = */ clua_write, &(user_data_t){
+ .data = cb,
+ });
if (status != 0)
return luaL_error(L, "%s", "plugin_register_write failed");
return 0;
} /* }}} int lua_cb_register_write */
if (status != 0)
return luaL_error(L, "%s", "plugin_register_write failed");
return 0;
} /* }}} int lua_cb_register_write */
-static luaL_Reg collectdlib[] = {
+static
const
luaL_Reg collectdlib[] = {
{"log_debug", lua_cb_log_debug},
{"log_error", lua_cb_log_error},
{"log_info", lua_cb_log_info},
{"log_debug", lua_cb_log_debug},
{"log_error", lua_cb_log_error},
{"log_info", lua_cb_log_info},
@@
-370,7
+365,8
@@
static luaL_Reg collectdlib[] = {
{"log_warning", lua_cb_log_warning},
{"dispatch_values", lua_cb_dispatch_values},
{"register_read", lua_cb_register_read},
{"log_warning", lua_cb_log_warning},
{"dispatch_values", lua_cb_dispatch_values},
{"register_read", lua_cb_register_read},
- {"register_write", lua_cb_register_write}};
+ {"register_write", lua_cb_register_write},
+ {NULL, NULL}};
static int open_collectd(lua_State *L) /* {{{ */
{
static int open_collectd(lua_State *L) /* {{{ */
{
@@
-414,7
+410,7
@@
static int lua_script_init(lua_script_t *script) /* {{{ */
/* Open up all the standard Lua libraries. */
luaL_openlibs(script->lua_state);
/* Open up all the standard Lua libraries. */
luaL_openlibs(script->lua_state);
-
/* Load the 'collectd' library */
+/* Load the 'collectd' library */
#if LUA_VERSION_NUM < 502
lua_pushcfunction(script->lua_state, open_collectd);
lua_pushstring(script->lua_state, "collectd");
#if LUA_VERSION_NUM < 502
lua_pushcfunction(script->lua_state, open_collectd);
lua_pushstring(script->lua_state, "collectd");
@@
-545,7
+541,7
@@
static int lua_config_script(const oconfig_item_t *ci) /* {{{ */
if (status != 0)
return (status);
if (status != 0)
return (status);
- INFO("Lua plugin: File \"%s\" loaded succesfully", abs_path);
+ INFO("Lua plugin: File \"%s\" loaded succes
s
fully", abs_path);
return 0;
} /* }}} int lua_config_script */
return 0;
} /* }}} int lua_config_script */
@@
-583,7
+579,7
@@
static int lua_shutdown(void) /* {{{ */
return (0);
} /* }}} int lua_shutdown */
return (0);
} /* }}} int lua_shutdown */
-void module_register() {
+void module_register(
void
) {
plugin_register_complex_config("lua", lua_config);
plugin_register_shutdown("lua", lua_shutdown);
}
plugin_register_complex_config("lua", lua_config);
plugin_register_shutdown("lua", lua_shutdown);
}