Skip to content
Snippets Groups Projects
Commit 82950d54 authored by Matthieu Schaller's avatar Matthieu Schaller
Browse files

Add room for 4-digits number of nodes in messages

parent 769c0ddd
Branches
Tags
2 merge requests!136Master,!107Code timing and verbosity
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
extern int engine_rank; extern int engine_rank;
#define error(s, ...) \ #define error(s, ...) \
{ \ { \
fprintf(stderr, "[%03i] %s:%s():%i: " s "\n", engine_rank, __FILE__, \ fprintf(stderr, "[%04i] %s:%s():%i: " s "\n", engine_rank, __FILE__, \
__FUNCTION__, __LINE__, ##__VA_ARGS__); \ __FUNCTION__, __LINE__, ##__VA_ARGS__); \
MPI_Abort(MPI_COMM_WORLD, -1); \ MPI_Abort(MPI_COMM_WORLD, -1); \
} }
...@@ -58,7 +58,7 @@ extern int engine_rank; ...@@ -58,7 +58,7 @@ extern int engine_rank;
*/ */
#define mpi_error(res, s, ...) \ #define mpi_error(res, s, ...) \
{ \ { \
fprintf(stderr, "[%03i] %s:%s():%i: " s "\n", engine_rank, __FILE__, \ fprintf(stderr, "[%04i] %s:%s():%i: " s "\n", engine_rank, __FILE__, \
__FUNCTION__, __LINE__, ##__VA_ARGS__); \ __FUNCTION__, __LINE__, ##__VA_ARGS__); \
int len = 1024; \ int len = 1024; \
char buf[len]; \ char buf[len]; \
...@@ -69,7 +69,7 @@ extern int engine_rank; ...@@ -69,7 +69,7 @@ extern int engine_rank;
#define mpi_error_string(res, s, ...) \ #define mpi_error_string(res, s, ...) \
{ \ { \
fprintf(stderr, "[%03i] %s:%s():%i: " s "\n", engine_rank, __FILE__, \ fprintf(stderr, "[%04i] %s:%s():%i: " s "\n", engine_rank, __FILE__, \
__FUNCTION__, __LINE__, ##__VA_ARGS__); \ __FUNCTION__, __LINE__, ##__VA_ARGS__); \
int len = 1024; \ int len = 1024; \
char buf[len]; \ char buf[len]; \
...@@ -85,7 +85,7 @@ extern int engine_rank; ...@@ -85,7 +85,7 @@ extern int engine_rank;
#ifdef WITH_MPI #ifdef WITH_MPI
extern int engine_rank; extern int engine_rank;
#define message(s, ...) \ #define message(s, ...) \
printf("[%03i] %s: " s "\n", engine_rank, __FUNCTION__, ##__VA_ARGS__) printf("[%04i] %s: " s "\n", engine_rank, __FUNCTION__, ##__VA_ARGS__)
#else #else
#define message(s, ...) printf("%s: " s "\n", __FUNCTION__, ##__VA_ARGS__) #define message(s, ...) printf("%s: " s "\n", __FUNCTION__, ##__VA_ARGS__)
#endif #endif
...@@ -99,7 +99,7 @@ extern int engine_rank; ...@@ -99,7 +99,7 @@ extern int engine_rank;
#define assert(expr) \ #define assert(expr) \
{ \ { \
if (!(expr)) { \ if (!(expr)) { \
fprintf(stderr, "[%03i] %s:%s():%i: FAILED ASSERTION: " #expr " \n", \ fprintf(stderr, "[%04i] %s:%s():%i: FAILED ASSERTION: " #expr " \n", \
engine_rank, __FILE__, __FUNCTION__, __LINE__); \ engine_rank, __FILE__, __FUNCTION__, __LINE__); \
fflush(stderr); \ fflush(stderr); \
MPI_Abort(MPI_COMM_WORLD, -1); \ MPI_Abort(MPI_COMM_WORLD, -1); \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment