xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix thread mutex unlock and mem free

This commit is contained in:
xiao77 2024-09-05 11:12:50 +08:00
parent 8a8ba407ba
commit e4f8485697
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/dnode/mgmt/mgmt_vnode/src/vmHandle.c
View File

@ -143,8 +143,8 @@ void vmCleanExpriedSamples(SVnodeMgmt *pMgmt) {
} }
} }
(void)taosThreadRwlockUnlock(&pMgmt->lock); (void)taosThreadRwlockUnlock(&pMgmt->lock);
taosMemoryFree(vgroup_ids); if (vgroup_ids) taosMemoryFree(vgroup_ids);
taosMemoryFree(keys); if (keys) taosMemoryFree(keys);
return; return;
} }

12
source/libs/monitorfw/src/taos_counter.c
View File

@ -76,15 +76,21 @@ int taos_counter_get_vgroup_ids(taos_counter_t *self, char ***keys, int32_t **vg
return 1; return 1;
} }
if (self->samples == NULL) return 1; if (self->samples == NULL) return 1;
pthread_rwlock_rdlock(self->rwlock);
taos_linked_list_t *key_list = self->samples->keys; taos_linked_list_t *key_list = self->samples->keys;
*list_size = key_list->size; *list_size = key_list->size;
int r = 0; int r = 0;
*vgroup_ids = (int32_t *)taos_malloc(*list_size * sizeof(int32_t)); *vgroup_ids = (int32_t *)taos_malloc(*list_size * sizeof(int32_t));
if (vgroup_ids == NULL) return 1; if (vgroup_ids == NULL) {
pthread_rwlock_unlock(self->rwlock);
return 1;
}
*keys = (char **)taos_malloc(*list_size * sizeof(char *)); *keys = (char **)taos_malloc(*list_size * sizeof(char *));
if (keys == NULL) return 1; if (keys == NULL) {
pthread_rwlock_unlock(self->rwlock);
return 1;
}
int index = 0; int index = 0;
pthread_rwlock_rdlock(self->rwlock);
for (taos_linked_list_node_t *current_key = key_list->head; current_key != NULL; current_key = current_key->next) { for (taos_linked_list_node_t *current_key = key_list->head; current_key != NULL; current_key = current_key->next) {
char *key = (char *)current_key->item; char *key = (char *)current_key->item;
int32_t vgroup_id = taos_metric_formatter_get_vgroup_id(key); int32_t vgroup_id = taos_metric_formatter_get_vgroup_id(key);