GithubStar/neuron
1
0
Fork 0
mirror of https://github.com/emqx/neuron.git synced 2026-10-26 03:40:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1708 from ZhouBox/main

Browse Source 
fix:memory leak
This commit is contained in:
fengzeroz
2023-12-04 10:25:36 +08:00
committed by GitHub
parent 2afc8d94b1 a89a1b2044
commit 7e852118ff
2 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/adapter/driver/driver.c
+19
View File
@@ -244,6 +244,13 @@ static void update_im(neu_adapter_t *adapter, const char *group,
}
}
} else {
utarray_foreach(data->tags, neu_resp_tag_value_meta_t *,
tag_value)
{
if (tag_value->value.type == NEU_TYPE_PTR) {
free(tag_value->value.value.ptr.ptr);
}
}
utarray_free(data->tags);
free(data->group);
free(data->driver);
@@ -251,6 +258,12 @@ static void update_im(neu_adapter_t *adapter, const char *group,
pthread_mutex_unlock(&find->apps_mtx);
} else {
utarray_foreach(data->tags, neu_resp_tag_value_meta_t *, tag_value)
{
if (tag_value->value.type == NEU_TYPE_PTR) {
free(tag_value->value.value.ptr.ptr);
}
}
utarray_free(data->tags);
free(data->group);
free(data->driver);
@@ -1649,6 +1662,9 @@ static void read_report_group(int64_t timestamp, int64_t timeout,
if (!neu_tag_attribute_test(tag, NEU_ATTRIBUTE_STATIC) &&
(timestamp - value.timestamp) > timeout && timeout > 0) {
if (value.value.type == NEU_TYPE_PTR) {
free(value.value.value.ptr.ptr);
}
tag_value.value.type = NEU_TYPE_ERROR;
tag_value.value.value.i32 = NEU_ERR_PLUGIN_TAG_VALUE_EXPIRED;
} else {
@@ -1801,6 +1817,9 @@ static void read_group(int64_t timestamp, int64_t timeout,
if (cache_type != NEU_TAG_CACHE_TYPE_NEVER &&
!neu_tag_attribute_test(tag, NEU_ATTRIBUTE_STATIC) &&
(timestamp - value.timestamp) > timeout) {
if (value.value.type == NEU_TYPE_PTR) {
free(value.value.value.ptr.ptr);
}
tag_value.value.type = NEU_TYPE_ERROR;
tag_value.value.value.i32 = NEU_ERR_PLUGIN_TAG_VALUE_EXPIRED;
} else {
tests/ft/neuron/process.py
+5
View File
@@ -40,6 +40,7 @@ def restart_neuron(process, dir='build/'):
def stop_neuron(process):
result = process.terminate()
process.wait()
stderr = process.stderr.read().decode()
stderr = re.sub(
"(libfaketime|Please check specification).*\n?", "", stderr)
@@ -57,3 +58,7 @@ def start_simulator(args, dir='build/simulator'):
def stop_simulator(process):
assert process.poll() is None
process.terminate()
process.wait()
stderr = process.stderr.read().decode()
if stderr != '':
print("Simulator process has errors: " + stderr)