projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'github/pr/1952'
[collectd.git]
/
src
/
daemon
/
plugin.h
diff --git
a/src/daemon/plugin.h
b/src/daemon/plugin.h
index
cba298c
..
9c1d72e
100644
(file)
--- a/
src/daemon/plugin.h
+++ b/
src/daemon/plugin.h
@@
-1,5
+1,5
@@
/**
/**
- * collectd - src/plugin.h
+ * collectd - src/
daemon/
plugin.h
* Copyright (C) 2005-2014 Florian octo Forster
*
* Permission is hereby granted, free of charge, to any person obtaining a
* Copyright (C) 2005-2014 Florian octo Forster
*
* Permission is hereby granted, free of charge, to any person obtaining a
@@
-29,17
+29,18
@@
#define PLUGIN_H
#include "collectd.h"
#define PLUGIN_H
#include "collectd.h"
+
#include "configfile.h"
#include "meta_data.h"
#include "utils_time.h"
#include "configfile.h"
#include "meta_data.h"
#include "utils_time.h"
-#if HAVE_PTHREAD_H
-# include <pthread.h>
-#endif
+#include <pthread.h>
#define PLUGIN_FLAGS_GLOBAL 0x0001
#define PLUGIN_FLAGS_GLOBAL 0x0001
-#define DATA_MAX_NAME_LEN 64
+#ifndef DATA_MAX_NAME_LEN
+# define DATA_MAX_NAME_LEN 128
+#endif
#define DS_TYPE_COUNTER 0
#define DS_TYPE_GAUGE 1
#define DS_TYPE_COUNTER 0
#define DS_TYPE_GAUGE 1
@@
-97,7
+98,7
@@
typedef union value_u value_t;
struct value_list_s
{
value_t *values;
struct value_list_s
{
value_t *values;
-
int
values_len;
+
size_t
values_len;
cdtime_t time;
cdtime_t interval;
char host[DATA_MAX_NAME_LEN];
cdtime_t time;
cdtime_t interval;
char host[DATA_MAX_NAME_LEN];
@@
-109,9
+110,7
@@
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, plugin_get_interval (), \
- "localhost", "", "", "", "", NULL }
-#define VALUE_LIST_STATIC { NULL, 0, 0, 0, "localhost", "", "", "", "", NULL }
+#define VALUE_LIST_INIT { .values = NULL, .meta = NULL }
struct data_source_s
{
struct data_source_s
{
@@
-125,7
+124,7
@@
typedef struct data_source_s data_source_t;
struct data_set_s
{
char type[DATA_MAX_NAME_LEN];
struct data_set_s
{
char type[DATA_MAX_NAME_LEN];
-
int
ds_num;
+
size_t
ds_num;
data_source_t *ds;
};
typedef struct data_set_s data_set_t;
data_source_t *ds;
};
typedef struct data_set_s data_set_t;
@@
-177,6
+176,8
@@
typedef struct user_data_s user_data_t;
struct plugin_ctx_s
{
cdtime_t interval;
struct plugin_ctx_s
{
cdtime_t interval;
+ cdtime_t flush_interval;
+ cdtime_t flush_timeout;
};
typedef struct plugin_ctx_s plugin_ctx_t;
};
typedef struct plugin_ctx_s plugin_ctx_t;
@@
-198,7
+199,6
@@
typedef void (*plugin_log_cb) (int severity, const char *message,
typedef int (*plugin_shutdown_cb) (void);
typedef int (*plugin_notification_cb) (const notification_t *,
user_data_t *);
typedef int (*plugin_shutdown_cb) (void);
typedef int (*plugin_notification_cb) (const notification_t *,
user_data_t *);
-
/*
* NAME
* plugin_set_dir
/*
* NAME
* plugin_set_dir
@@
-238,10
+238,10
@@
void plugin_set_dir (const char *dir);
*/
int plugin_load (const char *name, uint32_t flags);
*/
int plugin_load (const char *name, uint32_t flags);
-
void
plugin_init_all (void);
+
int
plugin_init_all (void);
void plugin_read_all (void);
int plugin_read_all_once (void);
void plugin_read_all (void);
int plugin_read_all_once (void);
-
void
plugin_shutdown_all (void);
+
int
plugin_shutdown_all (void);
/*
* NAME
/*
* NAME
@@
-293,7
+293,7
@@
int plugin_register_read (const char *name,
* "plugin_register_complex_read" returns an error (non-zero). */
int plugin_register_complex_read (const char *group, const char *name,
plugin_read_cb callback,
* "plugin_register_complex_read" returns an error (non-zero). */
int plugin_register_complex_read (const char *group, const char *name,
plugin_read_cb callback,
- c
onst struct timespec *
interval,
+ c
dtime_t
interval,
user_data_t *user_data);
int plugin_register_write (const char *name,
plugin_write_cb callback, user_data_t *user_data);
user_data_t *user_data);
int plugin_register_write (const char *name,
plugin_write_cb callback, user_data_t *user_data);