From fe4f027809999f6353fc25f25c76405e7ae5d123 Mon Sep 17 00:00:00 2001
From: Loris Lucido <loris.lucido@atos.net>
Date: Wed, 2 Nov 2022 10:55:59 +0100
Subject: [PATCH] context: simplify the definition of the environment variables
---
control/auxiliary.h | 15 ++++++++-------
control/context.c | 14 +++++++-------
2 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/control/auxiliary.h b/control/auxiliary.h
index 6e4d5b2ae..f95fbb8be 100644
--- a/control/auxiliary.h
+++ b/control/auxiliary.h
@@ -93,13 +93,14 @@ chameleon_env_is_set_to(char * str, char * value) {
}
static inline int
-chameleon_env_is_on(char * str) {
- return chameleon_env_is_set_to(str, "1");
-}
-
-static inline int
-chameleon_env_is_off(char * str) {
- return chameleon_env_is_set_to(str, "0");
+chameleon_env_on_off( char * str, int default_value ) {
+ if ( chameleon_env_is_set_to(str, "1") ) {
+ return CHAMELEON_TRUE;
+ }
+ if ( chameleon_env_is_set_to(str, "0") ) {
+ return CHAMELEON_FALSE;
+ }
+ return default_value;
}
static inline int
diff --git a/control/context.c b/control/context.c
index dc444168b..52aae6088 100644
--- a/control/context.c
+++ b/control/context.c
@@ -131,13 +131,13 @@ CHAM_context_t *chameleon_context_create()
chamctxt->ncudas = 0;
chamctxt->nthreads_per_worker= 1;
- chamctxt->warnings_enabled = chameleon_env_is_off( "CHAMELEON_WARNINGS" );
- chamctxt->autotuning_enabled = chameleon_env_is_on( "CHAMELEON_AUTOTUNING" );
- chamctxt->parallel_enabled = chameleon_env_is_on( "CHAMELEON_PARALLEL_KERNEL" );
- chamctxt->statistics_enabled = chameleon_env_is_on( "CHAMELEON_GENERATE_STATS" );
- chamctxt->progress_enabled = chameleon_env_is_on( "CHAMELEON_PROGRESS" );
- chamctxt->generic_enabled = chameleon_env_is_on( "CHAMELEON_GENERIC" );
- chamctxt->autominmax_enabled = chameleon_env_is_on( "CHAMELEON_AUTOMINMAX" );
+ chamctxt->warnings_enabled = chameleon_env_on_off( "CHAMELEON_WARNINGS", CHAMELEON_TRUE );
+ chamctxt->autotuning_enabled = chameleon_env_on_off( "CHAMELEON_AUTOTUNING", CHAMELEON_FALSE );
+ chamctxt->parallel_enabled = chameleon_env_on_off( "CHAMELEON_PARALLEL_KERNEL", CHAMELEON_FALSE );
+ chamctxt->statistics_enabled = chameleon_env_on_off( "CHAMELEON_GENERATE_STATS", CHAMELEON_FALSE );
+ chamctxt->progress_enabled = chameleon_env_on_off( "CHAMELEON_PROGRESS", CHAMELEON_FALSE );
+ chamctxt->generic_enabled = chameleon_env_on_off( "CHAMELEON_GENERIC", CHAMELEON_FALSE );
+ chamctxt->autominmax_enabled = chameleon_env_on_off( "CHAMELEON_AUTOMINMAX", CHAMELEON_TRUE );
chamctxt->runtime_paused = CHAMELEON_FALSE;
--
GitLab