diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-11-25 17:33:56 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-11-25 17:34:10 +0000 |
| commit | 83ba6762cc43d9db581b979bb5e3445669e46cc2 (patch) | |
| tree | 2e69833b43f791ed253a7a20318b767ebe56cdb8 /src/database/rrdset.c | |
| parent | Releasing debian version 1.47.5-1. (diff) | |
| download | netdata-83ba6762cc43d9db581b979bb5e3445669e46cc2.tar.xz netdata-83ba6762cc43d9db581b979bb5e3445669e46cc2.zip | |
Merging upstream version 2.0.3+dfsg (Closes: #923993, #1042533, #1045145).
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/database/rrdset.c')
| -rw-r--r-- | src/database/rrdset.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/src/database/rrdset.c b/src/database/rrdset.c index e5273532f..396f66835 100644 --- a/src/database/rrdset.c +++ b/src/database/rrdset.c @@ -597,21 +597,6 @@ void rrdset_acquired_release(RRDSET_ACQUIRED *rsa) { // ---------------------------------------------------------------------------- // RRDSET - rename charts -char *rrdset_strncpyz_name(char *to, const char *from, size_t length) { - char c, *p = to; - - while (length-- && (c = *from++)) { - if(c != '.' && c != '-' && !isalnum(c)) - c = '_'; - - *p++ = c; - } - - *p = '\0'; - - return to; -} - int rrdset_reset_name(RRDSET *st, const char *name) { if(unlikely(!strcmp(rrdset_name(st), name))) return 1; @@ -747,6 +732,8 @@ void rrdset_get_retention_of_tier_for_collected_chart(RRDSET *st, time_t *first_ } inline void rrdset_is_obsolete___safe_from_collector_thread(RRDSET *st) { + if(!st) return; + rrdset_pluginsd_receive_unslot(st); if(unlikely(!(rrdset_flag_check(st, RRDSET_FLAG_OBSOLETE)))) { |