X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=src%2Frrdset.c;h=c847b96907de21c655707b725712a54289166886;hb=9dccc16d3763392f0b13349de18c3a838a667653;hp=30fd561a1349a47a29ed5a913aa8a3799d38898c;hpb=2065f19101bdfd8d83ec0335edf9b04a2b4c7d1f;p=netdata.git diff --git a/src/rrdset.c b/src/rrdset.c index 30fd561a..c847b969 100644 --- a/src/rrdset.c +++ b/src/rrdset.c @@ -3,18 +3,18 @@ #define RRD_DEFAULT_GAP_INTERPOLATIONS 1 -void rrdset_check_rdlock_int(RRDSET *st, const char *file, const char *function, const unsigned long line) { +void __rrdset_check_rdlock(RRDSET *st, const char *file, const char *function, const unsigned long line) { debug(D_RRD_CALLS, "Checking read lock on chart '%s'", st->id); - int ret = pthread_rwlock_trywrlock(&st->rrdset_rwlock); + int ret = netdata_rwlock_trywrlock(&st->rrdset_rwlock); if(ret == 0) fatal("RRDSET '%s' should be read-locked, but it is not, at function %s() at line %lu of file '%s'", st->id, function, line, file); } -void rrdset_check_wrlock_int(RRDSET *st, const char *file, const char *function, const unsigned long line) { +void __rrdset_check_wrlock(RRDSET *st, const char *file, const char *function, const unsigned long line) { debug(D_RRD_CALLS, "Checking write lock on chart '%s'", st->id); - int ret = pthread_rwlock_tryrdlock(&st->rrdset_rwlock); + int ret = netdata_rwlock_tryrdlock(&st->rrdset_rwlock); if(ret == 0) fatal("RRDSET '%s' should be write-locked, but it is not, at function %s() at line %lu of file '%s'", st->id, function, line, file); } @@ -274,6 +274,8 @@ void rrdset_free(RRDSET *st) { // ------------------------------------------------------------------------ // free it + netdata_rwlock_destroy(&st->rrdset_rwlock); + // free directly allocated members freez(st->config_section); @@ -421,7 +423,7 @@ RRDSET *rrdset_create( memset(&st->avlname, 0, sizeof(avl)); memset(&st->variables_root_index, 0, sizeof(avl_tree_lock)); memset(&st->dimensions_index, 0, sizeof(avl_tree_lock)); - memset(&st->rrdset_rwlock, 0, sizeof(pthread_rwlock_t)); + memset(&st->rrdset_rwlock, 0, sizeof(netdata_rwlock_t)); st->name = NULL; st->type = NULL; @@ -537,7 +539,7 @@ RRDSET *rrdset_create( avl_init_lock(&st->dimensions_index, rrddim_compare); avl_init_lock(&st->variables_root_index, rrdvar_compare); - pthread_rwlock_init(&st->rrdset_rwlock, NULL); + netdata_rwlock_init(&st->rrdset_rwlock); if(name && *name) rrdset_set_name(st, name); else rrdset_set_name(st, id);