projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
snmp plugin: (Hopefully) fix a memory leak.
[collectd.git]
/
src
/
plugin.h
diff --git
a/src/plugin.h
b/src/plugin.h
index
f88bc48
..
7692ebd
100644
(file)
--- a/
src/plugin.h
+++ b/
src/plugin.h
@@
-1,9
+1,8
@@
#ifndef PLUGIN_H
#define PLUGIN_H
#ifndef PLUGIN_H
#define PLUGIN_H
-
/**
* collectd - src/plugin.h
/**
* collectd - src/plugin.h
- * Copyright (C) 2005
,2006
Florian octo Forster
+ * Copyright (C) 2005
-2007
Florian octo Forster
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@
-22,6
+21,9
@@
* Florian octo Forster <octo at verplant.org>
**/
* Florian octo Forster <octo at verplant.org>
**/
+#include "collectd.h"
+#include "configfile.h"
+
#define DATA_MAX_NAME_LEN 64
#define DS_TYPE_COUNTER 0
#define DATA_MAX_NAME_LEN 64
#define DS_TYPE_COUNTER 0
@@
-61,6
+63,7
@@
struct value_list_s
value_t *values;
int values_len;
time_t time;
value_t *values;
int values_len;
time_t time;
+ int interval;
char host[DATA_MAX_NAME_LEN];
char plugin[DATA_MAX_NAME_LEN];
char plugin_instance[DATA_MAX_NAME_LEN];
char host[DATA_MAX_NAME_LEN];
char plugin[DATA_MAX_NAME_LEN];
char plugin_instance[DATA_MAX_NAME_LEN];
@@
-68,7
+71,8
@@
struct value_list_s
};
typedef struct value_list_s value_list_t;
};
typedef struct value_list_s value_list_t;
-#define VALUE_LIST_INIT { NULL, 0, 0, "localhost", "", "", "" }
+#define VALUE_LIST_INIT { NULL, 0, 0, interval_g, "localhost", "", "", "" }
+#define VALUE_LIST_STATIC { NULL, 0, 0, 0, "localhost", "", "", "" }
struct data_source_s
{
struct data_source_s
{
@@
-119,7
+123,8
@@
void plugin_set_dir (const char *dir);
* functions.
*
* ARGUMENTS
* functions.
*
* ARGUMENTS
- * `type' Name of the plugin to load.
+ * `name' Name of the plugin to load.
+ * `mr' Types of functions to request from the plugin.
*
* RETURN VALUE
* Returns zero upon success, a value greater than zero if no plugin was found
*
* RETURN VALUE
* Returns zero upon success, a value greater than zero if no plugin was found
@@
-128,7
+133,7
@@
void plugin_set_dir (const char *dir);
* NOTES
* No attempt is made to re-load an already loaded module.
*/
* NOTES
* No attempt is made to re-load an already loaded module.
*/
-int
plugin_load (const char *name);
+int plugin_load (const char *name);
void plugin_init_all (void);
void plugin_read_all (const int *loop);
void plugin_init_all (void);
void plugin_read_all (const int *loop);
@@
-142,6
+147,8
@@
void plugin_shutdown_all (void);
int plugin_register_config (const char *name,
int (*callback) (const char *key, const char *val),
const char **keys, int keys_num);
int plugin_register_config (const char *name,
int (*callback) (const char *key, const char *val),
const char **keys, int keys_num);
+int plugin_register_complex_config (const char *type,
+ int (*callback) (oconfig_item_t *));
int plugin_register_init (const char *name,
int (*callback) (void));
int plugin_register_read (const char *name,
int plugin_register_init (const char *name,
int (*callback) (void));
int plugin_register_read (const char *name,
@@
-154,6
+161,8
@@
int plugin_register_data_set (const data_set_t *ds);
int plugin_register_log (char *name,
void (*callback) (int, const char *));
int plugin_register_log (char *name,
void (*callback) (int, const char *));
+int plugin_unregister_config (const char *name);
+int plugin_unregister_complex_config (const char *name);
int plugin_unregister_init (const char *name);
int plugin_unregister_read (const char *name);
int plugin_unregister_write (const char *name);
int plugin_unregister_init (const char *name);
int plugin_unregister_read (const char *name);
int plugin_unregister_write (const char *name);
@@
-161,6
+170,7
@@
int plugin_unregister_shutdown (const char *name);
int plugin_unregister_data_set (const char *name);
int plugin_unregister_log (const char *name);
int plugin_unregister_data_set (const char *name);
int plugin_unregister_log (const char *name);
+
/*
* NAME
* plugin_dispatch_values
/*
* NAME
* plugin_dispatch_values
@@
-176,14
+186,18
@@
int plugin_unregister_log (const char *name);
* `vl' Value list of the values that have been read by a `read'
* function.
*/
* `vl' Value list of the values that have been read by a `read'
* function.
*/
-int plugin_dispatch_values (const char *name,
const
value_list_t *vl);
+int plugin_dispatch_values (const char *name, value_list_t *vl);
void plugin_log (int level, const char *format, ...);
#define ERROR(...) plugin_log (LOG_ERR, __VA_ARGS__)
#define WARNING(...) plugin_log (LOG_WARNING, __VA_ARGS__)
#define NOTICE(...) plugin_log (LOG_NOTICE, __VA_ARGS__)
#define INFO(...) plugin_log (LOG_INFO, __VA_ARGS__)
void plugin_log (int level, const char *format, ...);
#define ERROR(...) plugin_log (LOG_ERR, __VA_ARGS__)
#define WARNING(...) plugin_log (LOG_WARNING, __VA_ARGS__)
#define NOTICE(...) plugin_log (LOG_NOTICE, __VA_ARGS__)
#define INFO(...) plugin_log (LOG_INFO, __VA_ARGS__)
-#define DEBUG(...) plugin_log (LOG_DEBUG, __VA_ARGS__)
+#if COLLECT_DEBUG
+# define DEBUG(...) plugin_log (LOG_DEBUG, __VA_ARGS__)
+#else /* COLLECT_DEBUG */
+# define DEBUG(...) /* noop */
+#endif /* ! COLLECT_DEBUG */
/* TODO: Move plugin_{complain,relief} into `utils_complain.[ch]'. -octo */
void plugin_complain (int level, complain_t *c, const char *format, ...);
/* TODO: Move plugin_{complain,relief} into `utils_complain.[ch]'. -octo */
void plugin_complain (int level, complain_t *c, const char *format, ...);