X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=src%2Fappconfig.c;h=ae92ad0454a16444aeff44443913e6d79c5a5dfa;hb=909e26f825bc1f6f907231761412c885331fec7e;hp=50e4c31fbdcb017d81874c5af7efabc258365f69;hpb=78e548c50a24e6195c687d0422e5ac095204c57e;p=netdata.git diff --git a/src/appconfig.c b/src/appconfig.c index 50e4c31f..ae92ad04 100644 --- a/src/appconfig.c +++ b/src/appconfig.c @@ -36,7 +36,7 @@ struct section { struct config_option *values; avl_tree_lock values_index; - pthread_mutex_t mutex; // this locks only the writers, to ensure atomic updates + netdata_mutex_t mutex; // this locks only the writers, to ensure atomic updates // readers are protected using the rwlock in avl_tree_lock }; @@ -44,7 +44,7 @@ static int appconfig_section_compare(void *a, void *b); struct config netdata_config = { .sections = NULL, - .mutex = PTHREAD_MUTEX_INITIALIZER, + .mutex = NETDATA_MUTEX_INITIALIZER, .index = { { NULL, appconfig_section_compare }, AVL_LOCK_INITIALIZER @@ -53,7 +53,7 @@ struct config netdata_config = { struct config stream_config = { .sections = NULL, - .mutex = PTHREAD_MUTEX_INITIALIZER, + .mutex = NETDATA_MUTEX_INITIALIZER, .index = { { NULL, appconfig_section_compare }, AVL_LOCK_INITIALIZER @@ -64,19 +64,19 @@ struct config stream_config = { // locking static inline void appconfig_wrlock(struct config *root) { - pthread_mutex_lock(&root->mutex); + netdata_mutex_lock(&root->mutex); } static inline void appconfig_unlock(struct config *root) { - pthread_mutex_unlock(&root->mutex); + netdata_mutex_unlock(&root->mutex); } static inline void config_section_wrlock(struct section *co) { - pthread_mutex_lock(&co->mutex); + netdata_mutex_lock(&co->mutex); } static inline void config_section_unlock(struct section *co) { - pthread_mutex_unlock(&co->mutex); + netdata_mutex_unlock(&co->mutex); } @@ -337,7 +337,7 @@ const char *appconfig_set_default(struct config *root, const char *section, cons { struct config_option *cv; - debug(D_CONFIG, "request to set config in section '%s', name '%s', value '%s'", section, name, value); + debug(D_CONFIG, "request to set default config in section '%s', name '%s', value '%s'", section, name, value); struct section *co = appconfig_section_find(root, section); if(!co) return appconfig_set(root, section, name, value); @@ -558,7 +558,7 @@ void appconfig_generate(struct config *root, BUFFER *wb, int only_changed) if(only_changed && !changed) continue; if(!used) { - buffer_sprintf(wb, "\n# node '%s' is not used.", co->name); + buffer_sprintf(wb, "\n# section '%s' is not used.", co->name); } buffer_sprintf(wb, "\n[%s]\n", co->name);