projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-4.10' into collectd-5.0
[collectd.git]
/
src
/
libcollectdclient
/
client.h
diff --git
a/src/libcollectdclient/client.h
b/src/libcollectdclient/client.h
index
e4aa759
..
9900353
100644
(file)
--- a/
src/libcollectdclient/client.h
+++ b/
src/libcollectdclient/client.h
@@
-22,30
+22,44
@@
#ifndef LIBCOLLECTD_COLLECTDCLIENT_H
#define LIBCOLLECTD_COLLECTDCLIENT_H 1
#ifndef LIBCOLLECTD_COLLECTDCLIENT_H
#define LIBCOLLECTD_COLLECTDCLIENT_H 1
+#include "lcc_features.h"
+
/*
* Includes (for data types)
*/
/*
* Includes (for data types)
*/
-#include <stdint.h>
+#if HAVE_STDINT_H
+# include <stdint.h>
+#endif
#include <inttypes.h>
#include <time.h>
/*
* Defines
*/
#include <inttypes.h>
#include <time.h>
/*
* Defines
*/
-#define LCC_VERSION 0
#define LCC_NAME_LEN 64
#define LCC_DEFAULT_PORT "25826"
/*
* Types
*/
#define LCC_NAME_LEN 64
#define LCC_DEFAULT_PORT "25826"
/*
* Types
*/
+#define LCC_TYPE_COUNTER 0
+#define LCC_TYPE_GAUGE 1
+#define LCC_TYPE_DERIVE 2
+#define LCC_TYPE_ABSOLUTE 3
+
+LCC_BEGIN_DECLS
+
typedef uint64_t counter_t;
typedef double gauge_t;
typedef uint64_t counter_t;
typedef double gauge_t;
+typedef uint64_t derive_t;
+typedef uint64_t absolute_t;
union value_u
{
counter_t counter;
gauge_t gauge;
union value_u
{
counter_t counter;
gauge_t gauge;
+ derive_t derive;
+ absolute_t absolute;
};
typedef union value_u value_t;
};
typedef union value_u value_t;
@@
-63,13
+77,14
@@
typedef struct lcc_identifier_s lcc_identifier_t;
struct lcc_value_list_s
{
value_t *values;
struct lcc_value_list_s
{
value_t *values;
+ int *values_types;
size_t values_len;
time_t time;
int interval;
lcc_identifier_t identifier;
};
typedef struct lcc_value_list_s lcc_value_list_t;
size_t values_len;
time_t time;
int interval;
lcc_identifier_t identifier;
};
typedef struct lcc_value_list_s lcc_value_list_t;
-#define LCC_VALUE_LIST_INIT { NULL, 0, 0, 0, LCC_IDENTIFIER_INIT }
+#define LCC_VALUE_LIST_INIT { NULL,
NULL,
0, 0, 0, LCC_IDENTIFIER_INIT }
struct lcc_connection_s;
typedef struct lcc_connection_s lcc_connection_t;
struct lcc_connection_s;
typedef struct lcc_connection_s lcc_connection_t;
@@
-86,7
+101,8
@@
int lcc_getval (lcc_connection_t *c, lcc_identifier_t *ident,
int lcc_putval (lcc_connection_t *c, const lcc_value_list_t *vl);
int lcc_putval (lcc_connection_t *c, const lcc_value_list_t *vl);
-int lcc_flush (lcc_connection_t *c, lcc_identifier_t *ident, int timeout);
+int lcc_flush (lcc_connection_t *c, const char *plugin,
+ lcc_identifier_t *ident, int timeout);
int lcc_listval (lcc_connection_t *c,
lcc_identifier_t **ret_ident, size_t *ret_ident_num);
int lcc_listval (lcc_connection_t *c,
lcc_identifier_t **ret_ident, size_t *ret_ident_num);
@@
-100,5
+116,7
@@
int lcc_identifier_to_string (lcc_connection_t *c,
int lcc_string_to_identifier (lcc_connection_t *c,
lcc_identifier_t *ident, const char *string);
int lcc_string_to_identifier (lcc_connection_t *c,
lcc_identifier_t *ident, const char *string);
+LCC_END_DECLS
+
/* vim: set sw=2 sts=2 et : */
#endif /* LIBCOLLECTD_COLLECTDCLIENT_H */
/* vim: set sw=2 sts=2 et : */
#endif /* LIBCOLLECTD_COLLECTDCLIENT_H */