X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fstatsd.c;h=28ee337cfb089154c18948ef4f5a482ed8fa8405;hb=b9b5e5d573d0011c4f3276e9b84b73ba4dd2e870;hp=34ce586390ad65e8c49d1e0a8ccafe58191013fc;hpb=61a4ed99b1a5b6d371bb745933d0efc5dff9505c;p=collectd.git diff --git a/src/statsd.c b/src/statsd.c index 34ce5863..28ee337c 100644 --- a/src/statsd.c +++ b/src/statsd.c @@ -61,29 +61,29 @@ struct statsd_metric_s { }; typedef struct statsd_metric_s statsd_metric_t; -static c_avl_tree_t *metrics_tree = NULL; +static c_avl_tree_t *metrics_tree; static pthread_mutex_t metrics_lock = PTHREAD_MUTEX_INITIALIZER; static pthread_t network_thread; -static bool network_thread_running = 0; -static bool network_thread_shutdown = 0; +static bool network_thread_running; +static bool network_thread_shutdown; -static char *conf_node = NULL; -static char *conf_service = NULL; +static char *conf_node; +static char *conf_service; -static bool conf_delete_counters = 0; -static bool conf_delete_timers = 0; -static bool conf_delete_gauges = 0; -static bool conf_delete_sets = 0; +static bool conf_delete_counters; +static bool conf_delete_timers; +static bool conf_delete_gauges; +static bool conf_delete_sets; -static double *conf_timer_percentile = NULL; -static size_t conf_timer_percentile_num = 0; +static double *conf_timer_percentile; +static size_t conf_timer_percentile_num; -static bool conf_counter_sum = 0; -static bool conf_timer_lower = 0; -static bool conf_timer_upper = 0; -static bool conf_timer_sum = 0; -static bool conf_timer_count = 0; +static bool conf_counter_sum; +static bool conf_timer_lower; +static bool conf_timer_upper; +static bool conf_timer_sum; +static bool conf_timer_count; /* Must hold metrics_lock when calling this function. */ static statsd_metric_t *statsd_metric_lookup_unsafe(char const *name, /* {{{ */ @@ -666,7 +666,7 @@ static int statsd_init(void) /* {{{ */ return status; } } - network_thread_running = 1; + network_thread_running = true; pthread_mutex_unlock(&metrics_lock); @@ -876,11 +876,11 @@ static int statsd_shutdown(void) /* {{{ */ void *value; if (network_thread_running) { - network_thread_shutdown = 1; + network_thread_shutdown = true; pthread_kill(network_thread, SIGTERM); pthread_join(network_thread, /* retval = */ NULL); } - network_thread_running = 0; + network_thread_running = false; pthread_mutex_lock(&metrics_lock);