From 3caa9d19a3735916b2e39d3787be943ebbe1c620 Mon Sep 17 00:00:00 2001
From: Loris Lucido <loris.lucido@atos.net>
Date: Thu, 8 Jun 2023 14:20:56 +0200
Subject: [PATCH] add missing newline on _STARPU_MSG and _STARPU_DISP

---
 mpi/src/mpi/starpu_mpi_mpi.c                        |  2 +-
 mpi/src/starpu_mpi_init.c                           | 10 +++++-----
 src/common/utils.c                                  |  4 ++--
 src/core/disk.c                                     | 10 +++++-----
 src/core/sched_policy.c                             |  2 +-
 src/core/topology.c                                 |  2 +-
 src/core/workers.c                                  |  4 ++--
 src/datawizard/malloc.c                             |  2 +-
 src/datawizard/reduction.c                          |  2 +-
 src/drivers/cuda/driver_cuda.c                      |  2 +-
 src/parallel_worker/starpu_parallel_worker_create.c |  2 +-
 11 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/mpi/src/mpi/starpu_mpi_mpi.c b/mpi/src/mpi/starpu_mpi_mpi.c
index 226a562c56..c30c9813b3 100644
--- a/mpi/src/mpi/starpu_mpi_mpi.c
+++ b/mpi/src/mpi/starpu_mpi_mpi.c
@@ -1724,7 +1724,7 @@ void _starpu_mpi_driver_init(struct starpu_conf *conf)
 	if (driver_env > 0)
 	{
 #ifdef STARPU_SIMGRID
-		_STARPU_DISP("Warning: MPI driver is not supported with simgrid, this will be disabled");
+		_STARPU_DISP("Warning: MPI driver is not supported with simgrid, this will be disabled\n");
 		return;
 #endif
 		mpi_driver_call_freq = driver_env;
diff --git a/mpi/src/starpu_mpi_init.c b/mpi/src/starpu_mpi_init.c
index 4d6ecd83dd..3d989f6eeb 100644
--- a/mpi/src/starpu_mpi_init.c
+++ b/mpi/src/starpu_mpi_init.c
@@ -113,7 +113,7 @@ void _starpu_mpi_do_initialize(struct _starpu_mpi_argc_argv *argc_argv)
 	if (MPIX_Query_cuda_support())
 		_starpu_mpi_has_cuda = 1;
 	else if (_starpu_mpi_gpudirect > 0)
-		_STARPU_DISP("Warning: MPI GPUDirect requested, but MPIX_Query_cuda_support reports that it is not supported.");
+		_STARPU_DISP("Warning: MPI GPUDirect requested, but MPIX_Query_cuda_support reports that it is not supported.\n");
 	_STARPU_DEBUG("MPI has CUDA: %d\n", _starpu_mpi_has_cuda);
 	if (!_starpu_mpi_gpudirect)
 	{
@@ -129,14 +129,14 @@ void _starpu_mpi_do_initialize(struct _starpu_mpi_argc_argv *argc_argv)
 			int cuda_worker = starpu_worker_get_by_type(STARPU_CUDA_WORKER, 0);
 			_starpu_mpi_cuda_devid = starpu_worker_get_devid(cuda_worker);
 
-			_STARPU_DISP("Warning: MPI GPUDirect is enabled using the PSM2 driver, but StarPU will be driving several CUDA GPUs.");
-			_STARPU_DISP("Since the PSM2 driver only supports one CUDA GPU at a time for GPU Direct (at least as of its version 11.2.185), StarPU-MPI will use GPU Direct only for CUDA%d.", _starpu_mpi_cuda_devid);
-			_STARPU_DISP("To get GPU Direct working with all CUDA GPUs with the PSM2 driver, you will unfortunately have to run one MPI rank per GPU.");
+			_STARPU_DISP("Warning: MPI GPUDirect is enabled using the PSM2 driver, but StarPU will be driving several CUDA GPUs.\n");
+			_STARPU_DISP("Since the PSM2 driver only supports one CUDA GPU at a time for GPU Direct (at least as of its version 11.2.185), StarPU-MPI will use GPU Direct only for CUDA%d.\n", _starpu_mpi_cuda_devid);
+			_STARPU_DISP("To get GPU Direct working with all CUDA GPUs with the PSM2 driver, you will unfortunately have to run one MPI rank per GPU.\n");
 		}
 	}
 #else
 	if (_starpu_mpi_gpudirect > 0)
-		_STARPU_DISP("Warning: MPI GPUDirect requested, but the MPIX_Query_cuda_support function is not provided by the MPI Implementation, did you compile it with CUDA support and the Cuda MPI extension?");
+		_STARPU_DISP("Warning: MPI GPUDirect requested, but the MPIX_Query_cuda_support function is not provided by the MPI Implementation, did you compile it with CUDA support and the Cuda MPI extension?\n");
 	_STARPU_DEBUG("No CUDA support in MPI\n");
 #endif
 #endif
diff --git a/src/common/utils.c b/src/common/utils.c
index 40fd525c76..0bc8ada0a9 100644
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -533,7 +533,7 @@ void _starpu_gethostname(char *hostname, size_t size)
 		int rank;
 
 #ifdef STARPU_HAVE_DARWIN
-		_STARPU_DISP("Detection of MPI rank disabled on darwin, assuming rank is 0");
+		_STARPU_DISP("Detection of MPI rank disabled on darwin, assuming rank is 0\n");
 		rank = 0;
 #else
 		if (starpu_mpi_world_rank)
@@ -542,7 +542,7 @@ void _starpu_gethostname(char *hostname, size_t size)
 		}
 		else
 		{
-			_STARPU_DISP("StarPU-MPI unavailable, the rank of this process is 0");
+			_STARPU_DISP("StarPU-MPI unavailable, the rank of this process is 0\n");
 			rank = 0;
 		}
 #endif
diff --git a/src/core/disk.c b/src/core/disk.c
index 3b44c15325..4efac5cb7f 100644
--- a/src/core/disk.c
+++ b/src/core/disk.c
@@ -506,7 +506,7 @@ void _starpu_swap_init(void)
 #ifdef STARPU_LINUX_SYS
 		ops = &starpu_disk_unistd_o_direct_ops;
 #else
-		_STARPU_DISP("Warning: o_direct support is not compiled in, could not enable disk swap");
+		_STARPU_DISP("Warning: o_direct support is not compiled in, could not enable disk swap\n");
 		return;
 #endif
 
@@ -516,7 +516,7 @@ void _starpu_swap_init(void)
 #ifdef STARPU_HAVE_LEVELDB
 		ops = &starpu_disk_leveldb_ops;
 #else
-		_STARPU_DISP("Warning: leveldb support is not compiled in, could not enable disk swap");
+		_STARPU_DISP("Warning: leveldb support is not compiled in, could not enable disk swap\n");
 		return;
 #endif
 	}
@@ -525,13 +525,13 @@ void _starpu_swap_init(void)
 #ifdef STARPU_HAVE_HDF5
 		ops = &starpu_disk_hdf5_ops;
 #else
-		_STARPU_DISP("Warning: hdf5 support is not compiled in, could not enable disk swap");
+		_STARPU_DISP("Warning: hdf5 support is not compiled in, could not enable disk swap\n");
 		return;
 #endif
 	}
 	else
 	{
-		_STARPU_DISP("Warning: unknown disk swap backend %s, could not enable disk swap", backend);
+		_STARPU_DISP("Warning: unknown disk swap backend %s, could not enable disk swap\n", backend);
 		return;
 	}
 
@@ -540,7 +540,7 @@ void _starpu_swap_init(void)
 	starpu_disk_swap_node = starpu_disk_register(ops, path, ((size_t) size) << 20);
 	if (starpu_disk_swap_node < 0)
 	{
-		_STARPU_DISP("Warning: could not enable disk swap %s on %s with size %ld, could not enable disk swap", backend, path, (long) size);
+		_STARPU_DISP("Warning: could not enable disk swap %s on %s with size %ld, could not enable disk swap\n", backend, path, (long) size);
 		return;
 	}
 }
diff --git a/src/core/sched_policy.c b/src/core/sched_policy.c
index 9441778325..868bbec09d 100644
--- a/src/core/sched_policy.c
+++ b/src/core/sched_policy.c
@@ -321,7 +321,7 @@ void _starpu_init_sched_policy(struct _starpu_machine_config *config, struct _st
 #ifdef STARPU_HAVE_HWLOC
 		sched_ctx->sched_policy->worker_type = STARPU_WORKER_TREE;
 #else
-		_STARPU_DISP("STARPU_WORKER_TREE ignored, please rebuild StarPU with hwloc support to enable it.");
+		_STARPU_DISP("STARPU_WORKER_TREE ignored, please rebuild StarPU with hwloc support to enable it.\n");
 #endif
 	}
 	starpu_sched_ctx_create_worker_collection(sched_ctx->id,
diff --git a/src/core/topology.c b/src/core/topology.c
index bdc5e54e1c..464f6a8b0d 100644
--- a/src/core/topology.c
+++ b/src/core/topology.c
@@ -739,7 +739,7 @@ static void _starpu_initialize_workers_bindid(struct _starpu_machine_config *con
 
 	if (topology->nhwpus % topology->nhwworker[STARPU_CPU_WORKER][0])
 	{
-		_STARPU_DISP("Warning: hwloc reported %d logical CPUs for %d cores, this is not homogeneous, will assume %d logical CPUs per core", topology->nhwpus, topology->nhwworker[STARPU_CPU_WORKER][0], nhyperthreads);
+		_STARPU_DISP("Warning: hwloc reported %d logical CPUs for %d cores, this is not homogeneous, will assume %d logical CPUs per core\n", topology->nhwpus, topology->nhwworker[STARPU_CPU_WORKER][0], nhyperthreads);
 	}
 
 	/* conf->workers_bindid indicates the successive logical PU identifier that
diff --git a/src/core/workers.c b/src/core/workers.c
index d19a501bee..6c18aea67d 100644
--- a/src/core/workers.c
+++ b/src/core/workers.c
@@ -1300,11 +1300,11 @@ void _starpu_conf_check_environment(struct starpu_conf *conf)
 #ifdef STARPU_SIMGRID
 	if (conf->calibrate == 2)
 	{
-		_STARPU_DISP("Warning: History will be cleared due to calibrate or STARPU_CALIBRATE being set to 2. This will prevent simgrid from having task simulation times!");
+		_STARPU_DISP("Warning: History will be cleared due to calibrate or STARPU_CALIBRATE being set to 2. This will prevent simgrid from having task simulation times!\n");
 	}
 	if (conf->bus_calibrate)
 	{
-		_STARPU_DISP("Warning: Bus calibration will be cleared due to bus_calibrate or STARPU_BUS_CALIBRATE being set. This will prevent simgrid from having data transfer simulation times!");
+		_STARPU_DISP("Warning: Bus calibration will be cleared due to bus_calibrate or STARPU_BUS_CALIBRATE being set. This will prevent simgrid from having data transfer simulation times!\n");
 	}
 #endif
 	_starpu_conf_set_value_against_environment("STARPU_SINGLE_COMBINED_WORKER", &conf->single_combined_worker, conf->precedence_over_environment_variables);
diff --git a/src/datawizard/malloc.c b/src/datawizard/malloc.c
index ed34e26eae..4605105bb8 100644
--- a/src/datawizard/malloc.c
+++ b/src/datawizard/malloc.c
@@ -191,7 +191,7 @@ int _starpu_malloc_flags_on_node(unsigned dst_node, void **A, size_t dim, int fl
 
 	STARPU_ASSERT_MSG(A, "starpu_malloc needs to be passed the address of the pointer to be filled");
 	if (!starpu_is_initialized())
-		_STARPU_DISP("Warning: starpu_malloc needs to be called after starpu is initialized, to be able to pin memory for CUDA");
+		_STARPU_DISP("Warning: starpu_malloc needs to be called after starpu is initialized, to be able to pin memory for CUDA\n");
 
 	if (dim == 0)
 		/* Make sure we succeed */
diff --git a/src/datawizard/reduction.c b/src/datawizard/reduction.c
index f09a55037b..f7f05fa6d8 100644
--- a/src/datawizard/reduction.c
+++ b/src/datawizard/reduction.c
@@ -46,7 +46,7 @@ void starpu_data_set_reduction_methods_with_args(starpu_data_handle_t handle, st
 			STARPU_HG_DISABLE_CHECKING(_warned);
 			if (!_warned)
 			{
-				_STARPU_DISP("Warning: The reduction method should use STARPU_COMMUTE for its first parameter");
+				_STARPU_DISP("Warning: The reduction method should use STARPU_COMMUTE for its first parameter\n");
 				_warned = 1;
 			}
 			redux_cl->modes[0] |= STARPU_COMMUTE;
diff --git a/src/drivers/cuda/driver_cuda.c b/src/drivers/cuda/driver_cuda.c
index cb3de04fe2..c149866a3d 100644
--- a/src/drivers/cuda/driver_cuda.c
+++ b/src/drivers/cuda/driver_cuda.c
@@ -599,7 +599,7 @@ void starpu_cuda_set_device(unsigned devid STARPU_ATTRIBUTE_UNUSED)
 #elif !defined(HAVE_CUDA_GL_INTEROP_H)
 	if (conf->n_cuda_opengl_interoperability)
 	{
-		_STARPU_MSG("OpenGL interoperability was requested, but cuda_gl_interop.h could not be compiled, please make sure that OpenGL headers were available before ./configure run.");
+		_STARPU_MSG("OpenGL interoperability was requested, but cuda_gl_interop.h could not be compiled, please make sure that OpenGL headers were available before ./configure run.\n");
 		STARPU_ABORT();
 	}
 #else
diff --git a/src/parallel_worker/starpu_parallel_worker_create.c b/src/parallel_worker/starpu_parallel_worker_create.c
index 8b2cd41ed0..fe0b5cc0ff 100644
--- a/src/parallel_worker/starpu_parallel_worker_create.c
+++ b/src/parallel_worker/starpu_parallel_worker_create.c
@@ -746,7 +746,7 @@ void _starpu_parallel_worker(struct _starpu_parallel_worker_group *group)
 				_STARPU_DISP("STARPU PARALLEL_WORKERS: Caution! It seems that you have"
 					     " multiple workers bound to the same PU. If you have"
 					     " multithreading on your cores it is greatly adviced"
-					     " to export STARPU_NTHREADS_PER_CORE=nb.");
+					     " to export STARPU_NTHREADS_PER_CORE=nb.\n");
 				starpu_parallel_worker_warned = 1;
 			}
 			parallel_worker->ncores += size-1;
-- 
GitLab