From e393070aaad23313daae844ff87043babaae69e7 Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Wed, 4 Nov 2020 21:46:11 -0500 Subject: [PATCH] Rename files for condition event-rule to on-event MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jonathan Rajotte Signed-off-by: Jérémie Galarneau Change-Id: I8bde2f15674be16c0a21c670affff4c4503ed846 --- include/Makefile.am | 4 ++-- .../{event-rule-internal.h => on-event-internal.h} | 0 include/lttng/condition/{event-rule.h => on-event.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 | 5 +++-- 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/common/Makefile.am | 2 +- src/common/conditions/condition.c | 2 +- src/common/conditions/{event-rule.c => on-event.c} | 5 ++--- src/common/evaluation.c | 2 +- src/common/trigger.c | 6 +++--- tests/regression/tools/trigger/utils/notification-client.c | 2 +- tests/unit/test_condition.c | 2 +- 19 files changed, 26 insertions(+), 26 deletions(-) rename include/lttng/condition/{event-rule-internal.h => on-event-internal.h} (100%) rename include/lttng/condition/{event-rule.h => on-event.h} (100%) rename src/common/conditions/{event-rule.c => on-event.c} (99%) diff --git a/include/Makefile.am b/include/Makefile.am index 8dae80973..751fa0ebd 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -134,7 +134,7 @@ lttngactioninclude_HEADERS= \ lttngconditioninclude_HEADERS= \ lttng/condition/condition.h \ lttng/condition/buffer-usage.h \ - lttng/condition/event-rule.h \ + lttng/condition/on-event.h \ lttng/condition/session-consumed-size.h \ lttng/condition/session-rotation.h \ lttng/condition/evaluation.h @@ -167,7 +167,7 @@ noinst_HEADERS = \ lttng/action/stop-session-internal.h \ lttng/condition/condition-internal.h \ lttng/condition/buffer-usage-internal.h \ - lttng/condition/event-rule-internal.h \ + lttng/condition/on-event-internal.h \ lttng/condition/session-consumed-size-internal.h \ lttng/condition/evaluation-internal.h \ lttng/condition/session-rotation-internal.h \ diff --git a/include/lttng/condition/event-rule-internal.h b/include/lttng/condition/on-event-internal.h similarity index 100% rename from include/lttng/condition/event-rule-internal.h rename to include/lttng/condition/on-event-internal.h diff --git a/include/lttng/condition/event-rule.h b/include/lttng/condition/on-event.h similarity index 100% rename from include/lttng/condition/event-rule.h rename to include/lttng/condition/on-event.h diff --git a/include/lttng/lttng.h b/include/lttng/lttng.h index 84032d1ec..790943edf 100644 --- a/include/lttng/lttng.h +++ b/include/lttng/lttng.h @@ -29,7 +29,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 69bf1f1d3..7c2079ae9 100644 --- a/src/bin/lttng-sessiond/action-executor.c +++ b/src/bin/lttng-sessiond/action-executor.c @@ -23,7 +23,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 f9d98ab1e..9832e5ef9 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 6732a1c3c..d3fc274c3 100644 --- a/src/bin/lttng-sessiond/cmd.c +++ b/src/bin/lttng-sessiond/cmd.c @@ -30,8 +30,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 0163a8977..07b32f86d 100644 --- a/src/bin/lttng-sessiond/condition-internal.c +++ b/src/bin/lttng-sessiond/condition-internal.c @@ -13,9 +13,10 @@ #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 17f510154..136617d77 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 4e5216edc..bad864db0 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 aadc1b0a8..816456cd8 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 de2289502..81e3bd848 100644 --- a/src/bin/lttng-sessiond/ust-app.c +++ b/src/bin/lttng-sessiond/ust-app.c @@ -26,8 +26,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 154ab0faf..9aca16b2e 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -45,7 +45,7 @@ libcommon_la_SOURCES = \ common.h \ conditions/buffer-usage.c \ conditions/condition.c \ - conditions/event-rule.c \ + conditions/on-event.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 fa45ee22b..4948dbd3f 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/event-rule.c b/src/common/conditions/on-event.c similarity index 99% rename from src/common/conditions/event-rule.c rename to src/common/conditions/on-event.c index b1219544a..a10df868a 100644 --- a/src/common/conditions/event-rule.c +++ b/src/common/conditions/on-event.c @@ -12,9 +12,8 @@ #include #include #include -#include -#include -#include +#include +#include #include #include #include diff --git a/src/common/evaluation.c b/src/common/evaluation.c index 872875a9f..2b06be614 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 0fdcf4049..ca082d139 100644 --- a/src/common/trigger.c +++ b/src/common/trigger.c @@ -7,9 +7,9 @@ #include #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 0722945f7..2c7c896d8 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 4f4818743..c5a94bb65 100644 --- a/tests/unit/test_condition.c +++ b/tests/unit/test_condition.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include -- 2.34.1