From bd3ee28ed4b6268db4524ae3a533096ca25306a1 Mon Sep 17 00:00:00 2001
From: Mathieu Faverge <mathieu.faverge@inria.fr>
Date: Wed, 16 Feb 2022 22:00:21 +0100
Subject: [PATCH] control: Fix warning/error outputs
---
control/async.c | 2 +-
control/control.c | 24 ++++++++++++------------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/control/async.c b/control/async.c
index 1e33237a8..2612f9e3d 100644
--- a/control/async.c
+++ b/control/async.c
@@ -70,7 +70,7 @@ int chameleon_sequence_destroy(CHAM_context_t *chamctxt, RUNTIME_sequence_t *seq
int chameleon_sequence_wait(CHAM_context_t *chamctxt, RUNTIME_sequence_t *sequence)
{
if ( chamctxt->runtime_paused ) {
- chameleon_warning("chameleon_sequence_wait()", "CHAMELEON was paused, so it is resumed and it will be paused after the wait");
+ chameleon_warning("chameleon_sequence_wait", "CHAMELEON was paused, so it is resumed and it will be paused after the wait");
RUNTIME_resume( chamctxt );
}
RUNTIME_sequence_wait( chamctxt, sequence );
diff --git a/control/control.c b/control/control.c
index 778e4f2e6..b881661fe 100644
--- a/control/control.c
+++ b/control/control.c
@@ -137,7 +137,7 @@ int __chameleon_finalize(void)
{
CHAM_context_t *chamctxt = chameleon_context_self();
if (chamctxt == NULL) {
- chameleon_error("CHAMELEON_Finalize()", "CHAMELEON not initialized");
+ chameleon_error("CHAMELEON_Finalize", "CHAMELEON not initialized");
return CHAMELEON_ERR_NOT_INITIALIZED;
}
RUNTIME_flush();
@@ -191,11 +191,11 @@ int CHAMELEON_Pause(void)
{
CHAM_context_t *chamctxt = chameleon_context_self();
if (chamctxt == NULL) {
- chameleon_error("CHAMELEON_Pause()", "CHAMELEON not initialized");
+ chameleon_error("CHAMELEON_Pause", "CHAMELEON not initialized");
return CHAMELEON_ERR_NOT_INITIALIZED;
}
if ( chamctxt->runtime_paused ) {
- chameleon_warning("CHAMELEON_Pause()", "CHAMELEON already paused");
+ chameleon_warning("CHAMELEON_Pause", "CHAMELEON already paused");
return CHAMELEON_SUCCESS;
}
chamctxt->runtime_paused = CHAMELEON_TRUE;
@@ -219,11 +219,11 @@ int CHAMELEON_Resume(void)
{
CHAM_context_t *chamctxt = chameleon_context_self();
if (chamctxt == NULL) {
- chameleon_error("CHAMELEON_Resume()", "CHAMELEON not initialized");
+ chameleon_error("CHAMELEON_Resume", "CHAMELEON not initialized");
return CHAMELEON_ERR_NOT_INITIALIZED;
}
if ( !chamctxt->runtime_paused ) {
- chameleon_warning("CHAMELEON_Resume()", "CHAMELEON was already resumed");
+ chameleon_warning("CHAMELEON_Resume", "CHAMELEON was already resumed");
return CHAMELEON_SUCCESS;
}
chamctxt->runtime_paused = CHAMELEON_FALSE;
@@ -246,10 +246,10 @@ int CHAMELEON_Distributed_start(void)
{
CHAM_context_t *chamctxt = chameleon_context_self();
if (chamctxt == NULL) {
- chameleon_error("CHAMELEON_Finalize()", "CHAMELEON not initialized");
+ chameleon_error("CHAMELEON_Finalize", "CHAMELEON not initialized");
return CHAMELEON_ERR_NOT_INITIALIZED;
}
- RUNTIME_barrier (chamctxt);
+ RUNTIME_barrier( chamctxt );
return CHAMELEON_SUCCESS;
}
@@ -268,10 +268,10 @@ int CHAMELEON_Distributed_stop(void)
{
CHAM_context_t *chamctxt = chameleon_context_self();
if (chamctxt == NULL) {
- chameleon_error("CHAMELEON_Finalize()", "CHAMELEON not initialized");
+ chameleon_error("CHAMELEON_Finalize", "CHAMELEON not initialized");
return CHAMELEON_ERR_NOT_INITIALIZED;
}
- RUNTIME_barrier (chamctxt);
+ RUNTIME_barrier( chamctxt );
return CHAMELEON_SUCCESS;
}
@@ -291,7 +291,7 @@ int CHAMELEON_Comm_size()
{
CHAM_context_t *chamctxt = chameleon_context_self();
if (chamctxt == NULL) {
- chameleon_error("CHAMELEON_Comm_size()", "CHAMELEON not initialized");
+ chameleon_error("CHAMELEON_Comm_size", "CHAMELEON not initialized");
return -1;
}
@@ -314,7 +314,7 @@ int CHAMELEON_Comm_rank()
{
CHAM_context_t *chamctxt = chameleon_context_self();
if (chamctxt == NULL) {
- chameleon_error("CHAMELEON_Comm_rank()", "CHAMELEON not initialized");
+ chameleon_error("CHAMELEON_Comm_rank", "CHAMELEON not initialized");
return -1;
}
@@ -337,7 +337,7 @@ int CHAMELEON_GetThreadNbr( )
{
CHAM_context_t *chamctxt = chameleon_context_self();
if (chamctxt == NULL) {
- chameleon_error("CHAMELEON_GetThreadNbr()", "CHAMELEON not initialized");
+ chameleon_error("CHAMELEON_GetThreadNbr", "CHAMELEON not initialized");
return -1;
}
--
GitLab