From 9fee19b60cb1dfef846e8dad7c8292eca044d116 Mon Sep 17 00:00:00 2001 From: erlingrj Date: Wed, 15 Jan 2025 15:50:01 +0100 Subject: [PATCH] CI --- examples/posix/hello/hello.c | 2 +- include/reactor-uc/macros.h | 42 ++++++++++++++++++------------------ 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/examples/posix/hello/hello.c b/examples/posix/hello/hello.c index 8ec71d4d..122dd145 100644 --- a/examples/posix/hello/hello.c +++ b/examples/posix/hello/hello.c @@ -4,7 +4,7 @@ LF_DEFINE_REACTION_BODY(TimerSource, r) { LF_SCOPE_SELF(TimerSource); LF_SCOPE_ENV(); - printf("TimerSource World @ %lld\n", env->get_elapsed_logical_time(env)); + printf("TimerSource World @ %"PRId64"\n", env->get_elapsed_logical_time(env)); } int main() { diff --git a/include/reactor-uc/macros.h b/include/reactor-uc/macros.h index 5163632e..1b3237f2 100644 --- a/include/reactor-uc/macros.h +++ b/include/reactor-uc/macros.h @@ -653,35 +653,35 @@ typedef struct FederatedInputConnection FederatedInputConnection; #define LF_ENTRY_POINT(MainReactorName, Timeout, KeepAlive, Fast) \ MainReactorName main_reactor; \ - Environment env; \ - void lf_exit(void) { Environment_free(&env); } \ + Environment _lf_environment; \ + void lf_exit(void) { Environment_free(&_lf_environment); } \ void lf_start() { \ - Environment_ctor(&env, (Reactor *)&main_reactor); \ - MainReactorName##_ctor(&main_reactor, NULL, &env); \ - env.scheduler->duration = Timeout; \ - env.scheduler->keep_alive = KeepAlive; \ - env.fast_mode = Fast; \ - env.assemble(&env); \ - env.start(&env); \ + Environment_ctor(&_lf_environment, (Reactor *)&main_reactor); \ + MainReactorName##_ctor(&main_reactor, NULL, &_lf_environment); \ + _lf_environment.scheduler->duration = Timeout; \ + _lf_environment.scheduler->keep_alive = KeepAlive; \ + _lf_environment.fast_mode = Fast; \ + _lf_environment.assemble(&_lf_environment); \ + _lf_environment.start(&_lf_environment); \ lf_exit(); \ } #define LF_ENTRY_POINT_FEDERATED(FederateName, Timeout, KeepAlive, HasInputs, NumBundles, IsLeader) \ FederateName main_reactor; \ - Environment env; \ - void lf_exit(void) { Environment_free(&env); } \ + Environment _lf_environment; \ + void lf_exit(void) { Environment_free(&_lf_environment); } \ void lf_start() { \ - Environment_ctor(&env, (Reactor *)&main_reactor); \ - env.scheduler->duration = Timeout; \ - env.scheduler->keep_alive = KeepAlive; \ - env.scheduler->leader = IsLeader; \ - env.has_async_events = HasInputs; \ + Environment_ctor(&_lf_environment, (Reactor *)&main_reactor); \ + _lf_environment.scheduler->duration = Timeout; \ + _lf_environment.scheduler->keep_alive = KeepAlive; \ + _lf_environment.scheduler->leader = IsLeader; \ + _lf_environment.has_async_events = HasInputs; \ \ - FederateName##_ctor(&main_reactor, NULL, &env); \ - env.net_bundles_size = NumBundles; \ - env.net_bundles = (FederatedConnectionBundle **)&main_reactor._bundles; \ - env.assemble(&env); \ - env.start(&env); \ + FederateName##_ctor(&main_reactor, NULL, &_lf_environment); \ + _lf_environment.net_bundles_size = NumBundles; \ + _lf_environment.net_bundles = (FederatedConnectionBundle **)&main_reactor._bundles; \ + _lf_environment.assemble(&_lf_environment); \ + _lf_environment.start(&_lf_environment); \ lf_exit(); \ }