From 670a26e4165562ab2dc5a16b9941f942e4f30996 Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Mon, 19 Apr 2021 21:03:40 -0400 Subject: [PATCH] Move on-event*.* to event-rule-matches*.* MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Code renaming follows. Signed-off-by: Jonathan Rajotte Signed-off-by: Jérémie Galarneau Change-Id: Ifb2de118546d39877e77ba30ba8720f75240eb39 --- include/Makefile.am | 4 ++-- .../{on-event-internal.h => event-rule-matches-internal.h} | 0 .../lttng/condition/{on-event.h => event-rule-matches.h} | 0 include/lttng/lttng.h | 2 +- src/bin/lttng-sessiond/action-executor.c | 2 +- src/bin/lttng-sessiond/agent.c | 2 +- src/bin/lttng-sessiond/cmd.c | 4 ++-- src/bin/lttng-sessiond/condition-internal.c | 6 +++--- src/bin/lttng-sessiond/event.c | 2 +- src/bin/lttng-sessiond/kernel.c | 4 ++-- src/bin/lttng-sessiond/notification-thread-events.c | 2 +- src/bin/lttng-sessiond/ust-app.c | 4 ++-- src/bin/lttng/commands/list_triggers.c | 4 ++-- src/common/Makefile.am | 2 +- src/common/conditions/condition.c | 2 +- src/common/conditions/{on-event.c => event-rule-matches.c} | 4 ++-- src/common/evaluation.c | 2 +- src/common/trigger.c | 4 ++-- tests/regression/tools/trigger/utils/notification-client.c | 2 +- tests/unit/test_condition.c | 4 ++-- 20 files changed, 28 insertions(+), 28 deletions(-) rename include/lttng/condition/{on-event-internal.h => event-rule-matches-internal.h} (100%) rename include/lttng/condition/{on-event.h => event-rule-matches.h} (100%) rename src/common/conditions/{on-event.c => event-rule-matches.c} (99%) diff --git a/include/Makefile.am b/include/Makefile.am index cb6209d92..1ced46c2b 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -137,7 +137,7 @@ lttngactioninclude_HEADERS= \ lttngconditioninclude_HEADERS= \ lttng/condition/condition.h \ lttng/condition/buffer-usage.h \ - lttng/condition/on-event.h \ + lttng/condition/event-rule-matches.h \ lttng/condition/session-consumed-size.h \ lttng/condition/session-rotation.h \ lttng/condition/evaluation.h @@ -169,7 +169,7 @@ noinst_HEADERS = \ lttng/condition/buffer-usage-internal.h \ lttng/condition/condition-internal.h \ lttng/condition/evaluation-internal.h \ - lttng/condition/on-event-internal.h \ + lttng/condition/event-rule-matches-internal.h \ lttng/condition/session-consumed-size-internal.h \ lttng/condition/session-rotation-internal.h \ lttng/domain-internal.h \ diff --git a/include/lttng/condition/on-event-internal.h b/include/lttng/condition/event-rule-matches-internal.h similarity index 100% rename from include/lttng/condition/on-event-internal.h rename to include/lttng/condition/event-rule-matches-internal.h diff --git a/include/lttng/condition/on-event.h b/include/lttng/condition/event-rule-matches.h similarity index 100% rename from include/lttng/condition/on-event.h rename to include/lttng/condition/event-rule-matches.h diff --git a/include/lttng/lttng.h b/include/lttng/lttng.h index 081a21e87..67267f7b7 100644 --- a/include/lttng/lttng.h +++ b/include/lttng/lttng.h @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/bin/lttng-sessiond/action-executor.c b/src/bin/lttng-sessiond/action-executor.c index 780028ecc..588948146 100644 --- a/src/bin/lttng-sessiond/action-executor.c +++ b/src/bin/lttng-sessiond/action-executor.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/bin/lttng-sessiond/agent.c b/src/bin/lttng-sessiond/agent.c index 10c2d7c85..4a09c3ec6 100644 --- a/src/bin/lttng-sessiond/agent.c +++ b/src/bin/lttng-sessiond/agent.c @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c index a020ab6e7..14c9bbd10 100644 --- a/src/bin/lttng-sessiond/cmd.c +++ b/src/bin/lttng-sessiond/cmd.c @@ -34,8 +34,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/src/bin/lttng-sessiond/condition-internal.c b/src/bin/lttng-sessiond/condition-internal.c index 50bb6cb1a..3e9d72c98 100644 --- a/src/bin/lttng-sessiond/condition-internal.c +++ b/src/bin/lttng-sessiond/condition-internal.c @@ -13,10 +13,10 @@ #include #include #include -#include -#include +#include +#include #include -#include +#include #include "condition-internal.h" static diff --git a/src/bin/lttng-sessiond/event.c b/src/bin/lttng-sessiond/event.c index 136617d77..c8047c3ec 100644 --- a/src/bin/lttng-sessiond/event.c +++ b/src/bin/lttng-sessiond/event.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/bin/lttng-sessiond/kernel.c b/src/bin/lttng-sessiond/kernel.c index 1da49a172..988ba9d67 100644 --- a/src/bin/lttng-sessiond/kernel.c +++ b/src/bin/lttng-sessiond/kernel.c @@ -28,8 +28,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/src/bin/lttng-sessiond/notification-thread-events.c b/src/bin/lttng-sessiond/notification-thread-events.c index 23614b0db..72442314b 100644 --- a/src/bin/lttng-sessiond/notification-thread-events.c +++ b/src/bin/lttng-sessiond/notification-thread-events.c @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c index 750b4b329..eb5c5a2ea 100644 --- a/src/bin/lttng-sessiond/ust-app.c +++ b/src/bin/lttng-sessiond/ust-app.c @@ -29,8 +29,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/src/bin/lttng/commands/list_triggers.c b/src/bin/lttng/commands/list_triggers.c index 8be319336..44fcf2edc 100644 --- a/src/bin/lttng/commands/list_triggers.c +++ b/src/bin/lttng/commands/list_triggers.c @@ -14,8 +14,8 @@ #include "common/mi-lttng.h" /* For lttng_condition_type_str(). */ #include "lttng/condition/condition-internal.h" -#include "lttng/condition/on-event.h" -#include "lttng/condition/on-event-internal.h" +#include "lttng/condition/event-rule-matches.h" +#include "lttng/condition/event-rule-matches-internal.h" /* For lttng_domain_type_str(). */ #include "lttng/domain-internal.h" /* For lttng_event_rule_syscall_emission_site_str() */ diff --git a/src/common/Makefile.am b/src/common/Makefile.am index a6cdfd0b5..4ea732e01 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -46,7 +46,7 @@ libcommon_la_SOURCES = \ common.h \ conditions/buffer-usage.c \ conditions/condition.c \ - conditions/on-event.c \ + conditions/event-rule-matches.c \ conditions/session-consumed-size.c \ conditions/session-rotation.c \ context.c context.h \ diff --git a/src/common/conditions/condition.c b/src/common/conditions/condition.c index 4948dbd3f..1abb2030b 100644 --- a/src/common/conditions/condition.c +++ b/src/common/conditions/condition.c @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/common/conditions/on-event.c b/src/common/conditions/event-rule-matches.c similarity index 99% rename from src/common/conditions/on-event.c rename to src/common/conditions/event-rule-matches.c index d86563b26..794c7ccc9 100644 --- a/src/common/conditions/on-event.c +++ b/src/common/conditions/event-rule-matches.c @@ -12,8 +12,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/src/common/evaluation.c b/src/common/evaluation.c index 2b06be614..eee39ead8 100644 --- a/src/common/evaluation.c +++ b/src/common/evaluation.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/common/trigger.c b/src/common/trigger.c index 215501401..9dfd74d91 100644 --- a/src/common/trigger.c +++ b/src/common/trigger.c @@ -16,8 +16,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/tests/regression/tools/trigger/utils/notification-client.c b/tests/regression/tools/trigger/utils/notification-client.c index cd1f8ea70..7e92cba61 100644 --- a/tests/regression/tools/trigger/utils/notification-client.c +++ b/tests/regression/tools/trigger/utils/notification-client.c @@ -14,7 +14,7 @@ #include #include -#include +#include #include #include "utils.h" diff --git a/tests/unit/test_condition.c b/tests/unit/test_condition.c index e2e35a3bc..1a346c292 100644 --- a/tests/unit/test_condition.c +++ b/tests/unit/test_condition.c @@ -20,8 +20,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include -- 2.34.1