projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
intel_pmu plugin: fix for compatibility issue with collectd 5.8
[collectd.git]
/
src
/
lua.c
diff --git
a/src/lua.c
b/src/lua.c
index
9eda7d5
..
8cfb704
100644
(file)
--- a/
src/lua.c
+++ b/
src/lua.c
@@
-79,10
+79,10
@@
static int clua_load_callback(lua_State *L, int callback_ref) /* {{{ */
if (!lua_isfunction(L, -1)) {
lua_pop(L, 1);
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
} /* }}} int clua_load_callback */
/* Store the threads in a global variable so they are not cleaned up by the
@@
-96,12
+96,12
@@
static int clua_store_thread(lua_State *L, int idx) /* {{{ */
lua_pushvalue(L, idx); /* +1 = 3 */
if (!lua_isthread(L, -1)) {
lua_pop(L, 3); /* -3 = 0 */
lua_pushvalue(L, idx); /* +1 = 3 */
if (!lua_isthread(L, -1)) {
lua_pop(L, 3); /* -3 = 0 */
- return
(-1)
;
+ return
-1
;
}
luaL_ref(L, LUA_REGISTRYINDEX);
lua_pop(L, 1); /* -1 = 0 */
}
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) /* {{{ */
} /* }}} int clua_store_thread */
static int clua_read(user_data_t *ud) /* {{{ */
@@
-117,7
+117,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);
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 */
}
/* +1 = 1 */
@@
-131,7
+131,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);
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)) {
}
if (!lua_isnumber(L, -1)) {
@@
-147,7
+147,7
@@
static int clua_read(user_data_t *ud) /* {{{ */
lua_pop(L, 1); /* -1 = 0 */
pthread_mutex_unlock(&cb->lock);
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, /* {{{ */
} /* }}} int clua_read */
static int clua_write(const data_set_t *ds, const value_list_t *vl, /* {{{ */
@@
-163,7
+163,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);
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 */
}
/* +1 = 1 */
@@
-172,7
+172,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.");
lua_pop(L, 1); /* -1 = 0 */
pthread_mutex_unlock(&cb->lock);
ERROR("Lua plugin: luaC_pushvaluelist failed.");
- return
(-1)
;
+ return
-1
;
}
/* +1 = 2 */
}
/* +1 = 2 */
@@
-186,7
+186,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);
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)) {
}
if (!lua_isnumber(L, -1)) {
@@
-200,7
+200,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);
lua_pop(L, 1); /* -1 = 0 */
pthread_mutex_unlock(&cb->lock);
- return
(status)
;
+ return
status
;
} /* }}} int clua_write */
/*
} /* }}} int clua_write */
/*
@@
-282,7
+282,7
@@
static int lua_cb_register_read(lua_State *L) /* {{{ */
luaL_checktype(L, 1, LUA_TFUNCTION);
char function_name[DATA_MAX_NAME_LEN];
luaL_checktype(L, 1, LUA_TFUNCTION);
char function_name[DATA_MAX_NAME_LEN];
- s
s
nprintf(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)
int callback_id = clua_store_callback(L, 1);
if (callback_id < 0)
@@
-306,9
+306,10
@@
static int lua_cb_register_read(lua_State *L) /* {{{ */
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_t){
- .data = cb,
- });
+ /* 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");
@@
-325,7
+326,7
@@
static int lua_cb_register_write(lua_State *L) /* {{{ */
luaL_checktype(L, 1, LUA_TFUNCTION);
char function_name[DATA_MAX_NAME_LEN] = "";
luaL_checktype(L, 1, LUA_TFUNCTION);
char function_name[DATA_MAX_NAME_LEN] = "";
- s
s
nprintf(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)
int callback_id = clua_store_callback(L, 1);
if (callback_id < 0)
@@
-346,11
+347,11
@@
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);
- int status =
-
plugin_register_write(/* name = */ function_nam
e,
-
/* callback = */ clua_write,
&(user_data_t){
-
.data = cb,
-
});
+ int status =
plugin_register_write(/* name = */ function_name,
+
/* callback = */ clua_writ
e,
+
&(user_data_t){
+ .data = cb,
+ });
if (status != 0)
return luaL_error(L, "%s", "plugin_register_write failed");
if (status != 0)
return luaL_error(L, "%s", "plugin_register_write failed");
@@
-404,7
+405,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.");
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. */
}
/* Open up all the standard Lua libraries. */
@@
-437,7
+438,7
@@
static int lua_script_init(lua_script_t *script) /* {{{ */
lua_pop(script->lua_state, 1);
}
lua_pop(script->lua_state, 1);
}
- return
(0)
;
+ return
0
;
} /* }}} int lua_script_init */
static int lua_script_load(const char *script_path) /* {{{ */
} /* }}} int lua_script_init */
static int lua_script_load(const char *script_path) /* {{{ */
@@
-445,20
+446,20
@@
static int lua_script_load(const char *script_path) /* {{{ */
lua_script_t *script = malloc(sizeof(*script));
if (script == NULL) {
ERROR("Lua plugin: malloc failed.");
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);
}
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);
}
script->script_path = strdup(script_path);
if (script->script_path == NULL) {
ERROR("Lua plugin: strdup failed.");
lua_script_free(script);
- return
(-1)
;
+ return
-1
;
}
status = luaL_loadfile(script->lua_state, script->script_path);
}
status = luaL_loadfile(script->lua_state, script->script_path);
@@
-467,7
+468,7
@@
static int lua_script_load(const char *script_path) /* {{{ */
lua_tostring(script->lua_state, -1));
lua_pop(script->lua_state, 1);
lua_script_free(script);
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,
}
status = lua_pcall(script->lua_state,
@@
-486,7
+487,7
@@
static int lua_script_load(const char *script_path) /* {{{ */
script->script_path, errmsg);
lua_script_free(script);
script->script_path, errmsg);
lua_script_free(script);
- return
(-1)
;
+ return
-1
;
}
/* Append this script to the global list of scripts. */
}
/* Append this script to the global list of scripts. */
@@
-500,14
+501,14
@@
static int lua_script_load(const char *script_path) /* {{{ */
scripts = script;
}
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)
} /* }}} 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] == '/')) {
size_t len = strlen(base_path);
while ((len > 0) && (base_path[len - 1] == '/')) {
@@
-517,7
+518,7
@@
static int lua_config_base_path(const oconfig_item_t *ci) /* {{{ */
DEBUG("Lua plugin: base_path = \"%s\";", base_path);
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) /* {{{ */
} /* }}} int lua_config_base_path */
static int lua_config_script(const oconfig_item_t *ci) /* {{{ */
@@
-526,20
+527,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)
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
char abs_path[PATH_MAX];
if (base_path[0] == '\0')
sstrncpy(abs_path, rel_path, sizeof(abs_path));
else
- s
s
nprintf(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)
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);
INFO("Lua plugin: File \"%s\" loaded successfully", abs_path);
@@
-576,7
+577,7
@@
static int lua_shutdown(void) /* {{{ */
{
lua_script_free(scripts);
{
lua_script_free(scripts);
- return
(0)
;
+ return
0
;
} /* }}} int lua_shutdown */
void module_register(void) {
} /* }}} int lua_shutdown */
void module_register(void) {