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.4' into collectd-5.5
[collectd.git]
/
src
/
ping.c
diff --git
a/src/ping.c
b/src/ping.c
index
216feda
..
5df82f4
100644
(file)
--- a/
src/ping.c
+++ b/
src/ping.c
@@
-241,7
+241,7
@@
static int ping_dispatch_all (pingobj_t *pingobj) /* {{{ */
static void *ping_thread (void *arg) /* {{{ */
{
static void *ping_thread (void *arg) /* {{{ */
{
-
static
pingobj_t *pingobj = NULL;
+ pingobj_t *pingobj = NULL;
struct timeval tv_begin;
struct timeval tv_end;
struct timeval tv_begin;
struct timeval tv_end;
@@
-359,7
+359,7
@@
static void *ping_thread (void *arg) /* {{{ */
* `ts_wait'. */
time_calc (&ts_wait, &ts_int, &tv_begin, &tv_end);
* `ts_wait'. */
time_calc (&ts_wait, &ts_int, &tv_begin, &tv_end);
-
status =
pthread_cond_timedwait (&ping_cond, &ping_lock, &ts_wait);
+ pthread_cond_timedwait (&ping_cond, &ping_lock, &ts_wait);
if (ping_thread_loop <= 0)
break;
} /* while (ping_thread_loop > 0) */
if (ping_thread_loop <= 0)
break;
} /* while (ping_thread_loop > 0) */
@@
-379,7
+379,7
@@
static int start_thread (void) /* {{{ */
if (ping_thread_loop != 0)
{
pthread_mutex_unlock (&ping_lock);
if (ping_thread_loop != 0)
{
pthread_mutex_unlock (&ping_lock);
- return (
-1
);
+ return (
0
);
}
ping_thread_loop = 1;
}
ping_thread_loop = 1;
@@
-393,7
+393,7
@@
static int start_thread (void) /* {{{ */
pthread_mutex_unlock (&ping_lock);
return (-1);
}
pthread_mutex_unlock (&ping_lock);
return (-1);
}
-
+
pthread_mutex_unlock (&ping_lock);
return (0);
} /* }}} int start_thread */
pthread_mutex_unlock (&ping_lock);
return (0);
} /* }}} int start_thread */
@@
-421,8
+421,10
@@
static int stop_thread (void) /* {{{ */
status = -1;
}
status = -1;
}
+ pthread_mutex_lock (&ping_lock);
memset (&ping_thread_id, 0, sizeof (ping_thread_id));
ping_thread_error = 0;
memset (&ping_thread_id, 0, sizeof (ping_thread_id));
ping_thread_error = 0;
+ pthread_mutex_unlock (&ping_lock);
return (status);
} /* }}} int stop_thread */
return (status);
} /* }}} int stop_thread */
@@
-442,10
+444,7
@@
static int ping_init (void) /* {{{ */
"Will use a timeout of %gs.", ping_timeout);
}
"Will use a timeout of %gs.", ping_timeout);
}
- if (start_thread () != 0)
- return (-1);
-
- return (0);
+ return (start_thread ());
} /* }}} int ping_init */
static int config_set_string (const char *name, /* {{{ */
} /* }}} int ping_init */
static int config_set_string (const char *name, /* {{{ */