Skip to content

fix(datalayers):queue #2513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fengzeroz merged 2 commits into from
Jul 7, 2025
Merged

fix(datalayers):queue #2513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28318e7
fix cache.c
hxy7yx Jun 16, 2025
e2cf0bf
fix(datalayers):queue
hxy7yx Jun 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 17 additions & 8 deletions plugins/datalayers/datalayers_handle.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,21 +185,27 @@ void db_write_task_consumer(neu_plugin_t *plugin)
db_write_task_t *task = NULL;

while (1) {
pthread_rwlock_rdlock(&plugin->plugin_mutex);
if (plugin->consumer_thread_stop_flag) {
pthread_rwlock_unlock(&plugin->plugin_mutex);
pthread_mutex_lock(&plugin->queue_mutex);

while (plugin->task_queue.size == 0 &&
!plugin->consumer_thread_stop_flag) {
pthread_cond_wait(&plugin->queue_not_empty, &plugin->queue_mutex);
}

if (plugin->consumer_thread_stop_flag && plugin->task_queue.size == 0) {
pthread_mutex_unlock(&plugin->queue_mutex);
break;
}
pthread_rwlock_unlock(&plugin->plugin_mutex);

task = task_queue_pop(plugin, &plugin->task_queue);
pthread_mutex_unlock(&plugin->queue_mutex);

if (task) {
db_write_task_cb(task, plugin);
task_free(task);
} else {
usleep(1000);
}
}

plog_notice(plugin, "Consumer thread exiting gracefully.\n");
}

Expand Down Expand Up @@ -558,10 +564,13 @@ int handle_trans_data(neu_plugin_t * plugin,
task->bool_tags = bool_tags;
task->string_tags = string_tags;

task_queue_push(plugin, task);

pthread_rwlock_unlock(&plugin->plugin_mutex);

pthread_mutex_lock(&plugin->queue_mutex);
task_queue_push(plugin, task);
pthread_cond_signal(&plugin->queue_not_empty);
pthread_mutex_unlock(&plugin->queue_mutex);

return rv;
}

Expand Down
3 changes: 3 additions & 0 deletions plugins/datalayers/datalayers_plugin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ struct neu_plugin {
task_queue_t task_queue;
pthread_t consumer_thread;

pthread_mutex_t queue_mutex;
pthread_cond_t queue_not_empty;

pthread_rwlock_t plugin_mutex;
bool consumer_thread_stop_flag;

Expand Down
23 changes: 18 additions & 5 deletions plugins/datalayers/datalayers_plugin_intf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ extern const neu_plugin_module_t neu_plugin_module;

void create_consumer_thread(neu_plugin_t *plugin)
{
pthread_rwlock_wrlock(&plugin->plugin_mutex);
pthread_mutex_lock(&plugin->queue_mutex);
plugin->consumer_thread_stop_flag = false;
pthread_rwlock_unlock(&plugin->plugin_mutex);
pthread_mutex_unlock(&plugin->queue_mutex);

int status = pthread_create(&plugin->consumer_thread, NULL,
(void *) db_write_task_consumer, plugin);
Expand All @@ -54,9 +54,10 @@ neu_plugin_t *datalayers_plugin_open(void)

void stop_consumer_thread(pthread_t *consumer_thread, neu_plugin_t *plugin)
{
pthread_rwlock_wrlock(&plugin->plugin_mutex);
pthread_mutex_lock(&plugin->queue_mutex);
plugin->consumer_thread_stop_flag = true;
pthread_rwlock_unlock(&plugin->plugin_mutex);
pthread_cond_broadcast(&plugin->queue_not_empty);
pthread_mutex_unlock(&plugin->queue_mutex);

int join_status = pthread_join(*consumer_thread, NULL);
if (join_status != 0) {
Expand All @@ -81,11 +82,17 @@ int datalayers_plugin_init(neu_plugin_t *plugin, bool load)

pthread_rwlock_init(&plugin->plugin_mutex, NULL);

pthread_mutex_init(&plugin->queue_mutex, NULL);
pthread_cond_init(&plugin->queue_not_empty, NULL);

pthread_mutex_lock(&plugin->queue_mutex);
plugin->consumer_thread_stop_flag = false;
pthread_mutex_unlock(&plugin->queue_mutex);

task_queue_init(&plugin->task_queue);

pthread_create(&plugin->consumer_thread, NULL,
(void *) db_write_task_consumer, plugin);
pthread_detach(plugin->consumer_thread);

NEU_PLUGIN_REGISTER_CACHED_QUEUE_SIZE_METRIC(plugin);
NEU_PLUGIN_REGISTER_MAX_CACHED_QUEUE_SIZE_METRIC(plugin);
Expand All @@ -101,7 +108,11 @@ int datalayers_plugin_uninit(neu_plugin_t *plugin)
pthread_rwlock_wrlock(&plugin->plugin_mutex);

stop_consumer_thread(&plugin->consumer_thread, plugin);
pthread_mutex_lock(&plugin->queue_mutex);
tasks_free(&plugin->task_queue);
pthread_mutex_unlock(&plugin->queue_mutex);
pthread_mutex_destroy(&plugin->queue_mutex);
pthread_cond_destroy(&plugin->queue_not_empty);
datalayers_config_fini(&plugin->config);

route_tbl_free(plugin->route_tbl);
Expand Down Expand Up @@ -149,7 +160,9 @@ int datalayers_plugin_config(neu_plugin_t *plugin, const char *setting)
datalayers_config_t config = { 0 };
if (plugin->client != NULL) {
stop_consumer_thread(&plugin->consumer_thread, plugin);
pthread_mutex_lock(&plugin->queue_mutex);
tasks_free(&plugin->task_queue);
pthread_mutex_unlock(&plugin->queue_mutex);
client_destroy(plugin->client);
plugin->client = NULL;
create_consumer_thread(plugin);
Expand Down
2 changes: 1 addition & 1 deletion src/adapter/driver/cache.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,7 @@ void neu_driver_cache_update_change(neu_driver_cache_t *cache,
value.value.bytes.length) {
elem->changed = true;
} else {
if (memcpy(elem->value.value.bytes.bytes,
if (memcmp(elem->value.value.bytes.bytes,
value.value.bytes.bytes,
value.value.bytes.length) != 0) {
elem->changed = true;
Expand Down