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-5.6' into collectd-5.7
[collectd.git]
/
src
/
network.c
diff --git
a/src/network.c
b/src/network.c
index
2ff09af
..
f93f49c
100644
(file)
--- a/
src/network.c
+++ b/
src/network.c
@@
-292,7
+292,7
@@
static char *send_buffer;
static char *send_buffer_ptr;
static int send_buffer_fill;
static cdtime_t send_buffer_last_update;
static char *send_buffer_ptr;
static int send_buffer_fill;
static cdtime_t send_buffer_last_update;
-static value_list_t send_buffer_vl = VALUE_LIST_
STATIC
;
+static value_list_t send_buffer_vl = VALUE_LIST_
INIT
;
static pthread_mutex_t send_buffer_lock = PTHREAD_MUTEX_INITIALIZER;
/* XXX: These counters are incremented from one place only. The spot in which
static pthread_mutex_t send_buffer_lock = PTHREAD_MUTEX_INITIALIZER;
/* XXX: These counters are incremented from one place only. The spot in which
@@
-3086,7
+3086,6
@@
static int network_stats_read(void) /* {{{ */
vl.values = values;
vl.values_len = 2;
vl.time = 0;
vl.values = values;
vl.values_len = 2;
vl.time = 0;
- sstrncpy(vl.host, hostname_g, sizeof(vl.host));
sstrncpy(vl.plugin, "network", sizeof(vl.plugin));
/* Octets received / sent */
sstrncpy(vl.plugin, "network", sizeof(vl.plugin));
/* Octets received / sent */
@@
-3167,7
+3166,8
@@
static int network_init(void) {
if (dispatch_thread_running == 0) {
int status;
status = plugin_thread_create(&dispatch_thread_id, NULL /* no attributes */,
if (dispatch_thread_running == 0) {
int status;
status = plugin_thread_create(&dispatch_thread_id, NULL /* no attributes */,
- dispatch_thread, NULL /* no argument */);
+ dispatch_thread, NULL /* no argument */,
+ "network disp");
if (status != 0) {
char errbuf[1024];
ERROR("network: pthread_create failed: %s",
if (status != 0) {
char errbuf[1024];
ERROR("network: pthread_create failed: %s",
@@
-3180,7
+3180,8
@@
static int network_init(void) {
if (receive_thread_running == 0) {
int status;
status = plugin_thread_create(&receive_thread_id, NULL /* no attributes */,
if (receive_thread_running == 0) {
int status;
status = plugin_thread_create(&receive_thread_id, NULL /* no attributes */,
- receive_thread, NULL /* no argument */);
+ receive_thread, NULL /* no argument */,
+ "network recv");
if (status != 0) {
char errbuf[1024];
ERROR("network: pthread_create failed: %s",
if (status != 0) {
char errbuf[1024];
ERROR("network: pthread_create failed: %s",