From: Jérémie Galarneau Date: Thu, 11 Feb 2021 16:42:10 +0000 (-0500) Subject: Fix: action-executor: address of trigger name logged instead of trigger name X-Git-Tag: v2.13.0-rc1~331 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=2516f2d887c20c21cc17ff4cd3b07b3d9ed02244;p=lttng-tools.git Fix: action-executor: address of trigger name logged instead of trigger name The "%p" was left in place when some logging statements of action executor were changed to log trigger names rather than their address. Signed-off-by: Jérémie Galarneau Change-Id: Ic66327b53dd0add46de574df6f654620e2a7e3e5 --- diff --git a/src/bin/lttng-sessiond/action-executor.c b/src/bin/lttng-sessiond/action-executor.c index 2a0aab45c..418a6de75 100644 --- a/src/bin/lttng-sessiond/action-executor.c +++ b/src/bin/lttng-sessiond/action-executor.c @@ -501,7 +501,7 @@ static int action_executor_generic_handler(struct action_executor *executor, assert(action_type != LTTNG_ACTION_TYPE_UNKNOWN); - DBG("Executing action `%s` of trigger `%p` action work item %" PRIu64, + DBG("Executing action `%s` of trigger `%s` action work item %" PRIu64, get_action_name(action), get_trigger_name(work_item->trigger), work_item->id); @@ -692,7 +692,7 @@ enum action_executor_status action_executor_enqueue( work_item = zmalloc(sizeof(*work_item)); if (!work_item) { - PERROR("Failed to allocate action executor work item on behalf of trigger `%p`", + PERROR("Failed to allocate action executor work item on behalf of trigger `%s`", get_trigger_name(trigger)); executor_status = ACTION_EXECUTOR_STATUS_ERROR; goto error_unlock; @@ -723,7 +723,7 @@ enum action_executor_status action_executor_enqueue( evaluation = NULL; cds_list_add_tail(&work_item->list_node, &executor->work.list); executor->work.pending_count++; - DBG("Enqueued action for trigger `%p` as work item %" PRIu64, + DBG("Enqueued action for trigger `%s` as work item #%" PRIu64, get_trigger_name(trigger), work_item_id); signal = true;