From 31904a7e115f103fc2c2d124d7edded36367dc80 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Thu, 31 Oct 2013 23:19:13 +0100 Subject: [PATCH] Reindent. --- src/smpi/smpi_global.c | 258 +++++++++++++++++++++++------------------ 1 file changed, 143 insertions(+), 115 deletions(-) diff --git a/src/smpi/smpi_global.c b/src/smpi/smpi_global.c index 79c1f02caa..842b659dbd 100644 --- a/src/smpi/smpi_global.c +++ b/src/smpi/smpi_global.c @@ -11,7 +11,7 @@ #include "simix/smx_private.h" #include "simgrid/sg_config.h" -#include // DBL_MAX +#include /* DBL_MAX */ #include #include #include @@ -21,13 +21,13 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_kernel, smpi, typedef struct s_smpi_process_data { double simulated; - int* argc; - char*** argv; + int *argc; + char ***argv; smx_rdv_t mailbox; smx_rdv_t mailbox_small; xbt_os_timer_t timer; MPI_Comm comm_self; - void *data; /* user data */ + void *data; /* user data */ int index; int initialized; } s_smpi_process_data_t; @@ -38,19 +38,23 @@ static int process_count = 0; MPI_Comm MPI_COMM_WORLD = MPI_COMM_NULL; int MPI_UNIVERSE_SIZE; -MPI_Errhandler* MPI_ERRORS_RETURN = NULL; -MPI_Errhandler* MPI_ERRORS_ARE_FATAL = NULL; -MPI_Errhandler* MPI_ERRHANDLER_NULL = NULL; +MPI_Errhandler *MPI_ERRORS_RETURN = NULL; +MPI_Errhandler *MPI_ERRORS_ARE_FATAL = NULL; +MPI_Errhandler *MPI_ERRHANDLER_NULL = NULL; #define MAILBOX_NAME_MAXLEN (5 + sizeof(int) * 2 + 1) -static char* get_mailbox_name(char* str, int index) { - snprintf(str, MAILBOX_NAME_MAXLEN, "SMPI-%0*x", (int)(sizeof(int) * 2), index); +static char *get_mailbox_name(char *str, int index) +{ + snprintf(str, MAILBOX_NAME_MAXLEN, "SMPI-%0*x", (int) (sizeof(int) * 2), + index); return str; } -static char* get_mailbox_name_small(char* str, int index) { - snprintf(str, MAILBOX_NAME_MAXLEN, "small%0*x", (int)(sizeof(int) * 2), index); +static char *get_mailbox_name_small(char *str, int index) +{ + snprintf(str, MAILBOX_NAME_MAXLEN, "small%0*x", (int) (sizeof(int) * 2), + index); return str; } @@ -60,7 +64,7 @@ void smpi_process_init(int *argc, char ***argv) smpi_process_data_t data; smx_process_t proc; - if(argc && argv) { + if (argc && argv) { proc = SIMIX_process_self(); index = atoi((*argv)[1]); data = smpi_process_remote_data(index); @@ -73,7 +77,8 @@ void smpi_process_init(int *argc, char ***argv) (*argc)--; data->argc = argc; data->argv = argv; - simcall_rdv_set_receiver(data->mailbox_small, proc);// set the process attached to the mailbox + // set the process attached to the mailbox + simcall_rdv_set_receiver(data->mailbox_small, proc); XBT_DEBUG("<%d> New process in the game: %p", index, proc); } } @@ -81,7 +86,7 @@ void smpi_process_init(int *argc, char ***argv) void smpi_process_destroy(void) { int index = smpi_process_index(); - process_data[index]->index=-100; + process_data[index]->index = -100; XBT_DEBUG("<%d> Process left the game", index); } @@ -101,7 +106,7 @@ void smpi_process_finalize(void) */ int smpi_process_finalized() { - return (smpi_process_index()==-100); + return (smpi_process_index() == -100); // If finalized, this value has been set to -100; } @@ -111,7 +116,8 @@ int smpi_process_finalized() int smpi_process_initialized(void) { int index = smpi_process_index(); - return((index != -100) && (index!=MPI_UNDEFINED) && (process_data[index]->initialized)); + return ((index != -100) && (index != MPI_UNDEFINED) + && (process_data[index]->initialized)); } /** @@ -120,44 +126,47 @@ int smpi_process_initialized(void) void smpi_process_mark_as_initialized(void) { int index = smpi_process_index(); - if((index != -100)&& (index!=MPI_UNDEFINED))process_data[index]->initialized=1; + if ((index != -100) && (index != MPI_UNDEFINED)) + process_data[index]->initialized = 1; } #ifdef SMPI_F2C -int smpi_process_argc(void) { +int smpi_process_argc(void) +{ smpi_process_data_t data = smpi_process_data(); - return data->argc ? *(data->argc) - 1 : 0; } -int smpi_process_getarg(integer* index, char* dst, ftnlen len) { +int smpi_process_getarg(integer * index, char *dst, ftnlen len) +{ smpi_process_data_t data = smpi_process_data(); - char* arg; + char *arg; ftnlen i; - if(!data->argc || !data->argv - || *index < 1 || *index >= *(data->argc)) { + if (!data->argc || !data->argv || *index < 1 || *index >= *(data->argc)) { return -1; } arg = (*data->argv)[*index]; - for(i = 0; i < len && arg[i] != '\0'; i++) { + for (i = 0; i < len && arg[i] != '\0'; i++) { dst[i] = arg[i]; } - for(; i < len; i++) { + for (; i < len; i++) { dst[i] = ' '; } return 0; } -int smpi_global_size(void) { - char* value = getenv("SMPI_GLOBAL_SIZE"); +int smpi_global_size(void) +{ + char *value = getenv("SMPI_GLOBAL_SIZE"); - if(!value) { - fprintf(stderr, "Please set env var SMPI_GLOBAL_SIZE to expected number of processes.\n"); - xbt_abort(); - } - return atoi(value); + if (!value) { + fprintf(stderr, + "Please set env var SMPI_GLOBAL_SIZE to expected number of processes.\n"); + xbt_abort(); + } + return atoi(value); } #endif @@ -177,7 +186,8 @@ void smpi_process_set_user_data(void *data) process_data->data = data; } -void* smpi_process_get_user_data(){ +void *smpi_process_get_user_data() +{ smpi_process_data_t process_data = smpi_process_data(); return process_data->data; } @@ -191,70 +201,74 @@ int smpi_process_index(void) { smpi_process_data_t data = smpi_process_data(); //return -1 if not initialized - return data? data->index : MPI_UNDEFINED; + return data ? data->index : MPI_UNDEFINED; } -smx_rdv_t smpi_process_mailbox(void) { +smx_rdv_t smpi_process_mailbox(void) +{ smpi_process_data_t data = smpi_process_data(); - return data->mailbox; } -smx_rdv_t smpi_process_mailbox_small(void) { +smx_rdv_t smpi_process_mailbox_small(void) +{ smpi_process_data_t data = smpi_process_data(); - return data->mailbox_small; } -smx_rdv_t smpi_process_remote_mailbox(int index) { +smx_rdv_t smpi_process_remote_mailbox(int index) +{ smpi_process_data_t data = smpi_process_remote_data(index); - return data->mailbox; } -smx_rdv_t smpi_process_remote_mailbox_small(int index) { +smx_rdv_t smpi_process_remote_mailbox_small(int index) +{ smpi_process_data_t data = smpi_process_remote_data(index); - return data->mailbox_small; } xbt_os_timer_t smpi_process_timer(void) { smpi_process_data_t data = smpi_process_data(); - return data->timer; } -void smpi_process_simulated_start(void) { +void smpi_process_simulated_start(void) +{ smpi_process_data_t data = smpi_process_data(); - data->simulated = SIMIX_get_clock(); } -double smpi_process_simulated_elapsed(void) { +double smpi_process_simulated_elapsed(void) +{ smpi_process_data_t data = smpi_process_data(); - return SIMIX_get_clock() - data->simulated; } -MPI_Comm smpi_process_comm_self(void) { +MPI_Comm smpi_process_comm_self(void) +{ smpi_process_data_t data = smpi_process_data(); - return data->comm_self; } -void print_request(const char *message, MPI_Request request) { - XBT_DEBUG("%s request %p [buf = %p, size = %zu, src = %d, dst = %d, tag = %d, flags = %x]", - message, request, request->buf, request->size, - request->src, request->dst, request->tag, request->flags); +void print_request(const char *message, MPI_Request request) +{ + XBT_DEBUG + ("%s request %p [buf = %p, size = %zu, src = %d, dst = %d, tag = %d, flags = %x]", + message, request, request->buf, request->size, request->src, + request->dst, request->tag, request->flags); } -static void SMPI_comm_copy_buffer_callback(smx_action_t comm, void* buff, size_t buff_size) +static void SMPI_comm_copy_buffer_callback(smx_action_t comm, + void *buff, size_t buff_size) { XBT_DEBUG("Copy the data over"); memcpy(comm->comm.dst_buff, buff, buff_size); - if (comm->comm.detached) { // if this is a detached send, the source buffer was duplicated by SMPI sender to make the original buffer available to the application ASAP + if (comm->comm.detached) { + // if this is a detached send, the source buffer was duplicated by SMPI + // sender to make the original buffer available to the application ASAP xbt_free(buff); //It seems that the request is used after the call there this should //be free somewhereelse but where??? @@ -279,13 +293,14 @@ void smpi_global_init(void) process_data[i]->argc = NULL; process_data[i]->argv = NULL; process_data[i]->mailbox = simcall_rdv_create(get_mailbox_name(name, i)); - process_data[i]->mailbox_small = simcall_rdv_create(get_mailbox_name_small(name, i)); + process_data[i]->mailbox_small = + simcall_rdv_create(get_mailbox_name_small(name, i)); process_data[i]->timer = xbt_os_timer_new(); - if(MC_is_active()) + if (MC_is_active()) MC_ignore_heap(process_data[i]->timer, xbt_os_timer_size()); group = smpi_group_new(1); process_data[i]->comm_self = smpi_comm_new(group); - process_data[i]->initialized =0; + process_data[i]->initialized = 0; smpi_group_set_mapping(group, i, 0); } @@ -298,7 +313,8 @@ void smpi_global_init(void) //check correctness of MPI parameters - xbt_assert(sg_cfg_get_int("smpi/async_small_thres")<=sg_cfg_get_int("smpi/send_is_detached_thres")); + xbt_assert(sg_cfg_get_int("smpi/async_small_thres") <= + sg_cfg_get_int("smpi/send_is_detached_thres")); } void smpi_global_destroy(void) @@ -307,7 +323,7 @@ void smpi_global_destroy(void) int i; smpi_bench_destroy(); - while(smpi_group_unuse(smpi_comm_group(MPI_COMM_WORLD))>0); + while (smpi_group_unuse(smpi_comm_group(MPI_COMM_WORLD)) > 0); xbt_free(MPI_COMM_WORLD); MPI_COMM_WORLD = MPI_COMM_NULL; for (i = 0; i < count; i++) { @@ -327,44 +343,50 @@ void smpi_global_destroy(void) /* Fortran specific stuff */ /* With smpicc, the following weak symbols are used */ /* With smpiff, the following weak symbols are replaced by those in libf2c */ -int __attribute__((weak)) xargc; -char** __attribute__((weak)) xargv; +int __attribute__ ((weak)) xargc; +char ** __attribute__ ((weak)) xargv; #ifndef WIN32 -void __attribute__((weak)) user_main_(){ +void __attribute__ ((weak)) user_main_() +{ xbt_die("Should not be in this smpi_simulated_main"); return; } -int __attribute__((weak)) smpi_simulated_main_(int argc, char** argv) { + +int __attribute__ ((weak)) smpi_simulated_main_(int argc, char **argv) +{ smpi_process_init(&argc, &argv); user_main_(); //xbt_die("Should not be in this smpi_simulated_main"); return 0; } -int __attribute__((weak)) main(int argc, char** argv) { - return smpi_main(smpi_simulated_main_,argc,argv); +int __attribute__ ((weak)) main(int argc, char **argv) +{ + return smpi_main(smpi_simulated_main_, argc, argv); } -int __attribute__((weak)) MAIN__(){ - return smpi_main(smpi_simulated_main_,xargc, xargv); +int __attribute__ ((weak)) MAIN__() +{ + return smpi_main(smpi_simulated_main_, xargc, xargv); }; #endif -int smpi_main(int (*realmain) (int argc, char *argv[]),int argc, char *argv[]) +int smpi_main(int (*realmain) (int argc, char *argv[]), int argc, char *argv[]) { srand(SMPI_RAND_SEED); - - if(getenv("SMPI_PRETEND_CC") != NULL) { - /* Hack to ensure that smpicc can pretend to be a simple compiler. Particularly handy to pass it to the configuration tools */ + + if (getenv("SMPI_PRETEND_CC") != NULL) { + /* Hack to ensure that smpicc can pretend to be a simple + * compiler. Particularly handy to pass it to the configuration tools */ return 0; } /* Connect log categories. See xbt/log.c */ - XBT_LOG_CONNECT(smpi); /* Keep this line as soon as possible in this - function: xbt_log_appender_file.c depends on it - DO NOT connect this in XBT or so, or it will be - useless to xbt_log_appender_file.c */ + XBT_LOG_CONNECT(smpi); /* Keep this line as soon as possible in this + function: xbt_log_appender_file.c depends on it + DO NOT connect this in XBT or so, or it will be + useless to xbt_log_appender_file.c */ #ifdef HAVE_TRACING XBT_LOG_CONNECT(instr_smpi); #endif @@ -400,70 +422,76 @@ int smpi_main(int (*realmain) (int argc, char *argv[]),int argc, char *argv[]) SIMIX_launch_application(argv[2]); int gather_id = find_coll_description(mpi_coll_gather_description, - sg_cfg_get_string("smpi/gather")); + sg_cfg_get_string("smpi/gather")); mpi_coll_gather_fun = (int (*)(void *, int, MPI_Datatype, - void*, int, MPI_Datatype, int, MPI_Comm)) - mpi_coll_gather_description[gather_id].coll; + void *, int, MPI_Datatype, int, MPI_Comm)) + mpi_coll_gather_description[gather_id].coll; int allgather_id = find_coll_description(mpi_coll_allgather_description, sg_cfg_get_string("smpi/allgather")); mpi_coll_allgather_fun = (int (*)(void *, int, MPI_Datatype, - void*, int, MPI_Datatype, MPI_Comm)) - mpi_coll_allgather_description[allgather_id].coll; + void *, int, MPI_Datatype, MPI_Comm)) + mpi_coll_allgather_description[allgather_id].coll; int allgatherv_id = find_coll_description(mpi_coll_allgatherv_description, - sg_cfg_get_string("smpi/allgatherv")); - mpi_coll_allgatherv_fun = (int (*)(void *, int, MPI_Datatype, - void*, int*, int*, MPI_Datatype, MPI_Comm)) - mpi_coll_allgatherv_description[allgatherv_id].coll; + sg_cfg_get_string("smpi/allgatherv")); + mpi_coll_allgatherv_fun = (int (*)(void *, int, MPI_Datatype, void *, int *, + int *, MPI_Datatype, MPI_Comm)) + mpi_coll_allgatherv_description[allgatherv_id].coll; int allreduce_id = find_coll_description(mpi_coll_allreduce_description, sg_cfg_get_string("smpi/allreduce")); - mpi_coll_allreduce_fun = (int (*)(void *sbuf, void *rbuf, int rcount, \ - MPI_Datatype dtype, MPI_Op op, MPI_Comm comm)) - mpi_coll_allreduce_description[allreduce_id].coll; + mpi_coll_allreduce_fun = (int (*)(void *sbuf, void *rbuf, int rcount, + MPI_Datatype dtype, MPI_Op op, + MPI_Comm comm)) + mpi_coll_allreduce_description[allreduce_id].coll; int alltoall_id = find_coll_description(mpi_coll_alltoall_description, sg_cfg_get_string("smpi/alltoall")); mpi_coll_alltoall_fun = (int (*)(void *, int, MPI_Datatype, - void*, int, MPI_Datatype, MPI_Comm)) - mpi_coll_alltoall_description[alltoall_id].coll; + void *, int, MPI_Datatype, MPI_Comm)) + mpi_coll_alltoall_description[alltoall_id].coll; int alltoallv_id = find_coll_description(mpi_coll_alltoallv_description, - sg_cfg_get_string("smpi/alltoallv")); - mpi_coll_alltoallv_fun = (int (*)(void *, int*, int*, MPI_Datatype, - void*, int*, int*, MPI_Datatype, MPI_Comm)) - mpi_coll_alltoallv_description[alltoallv_id].coll; + sg_cfg_get_string("smpi/alltoallv")); + mpi_coll_alltoallv_fun = (int (*)(void *, int *, int *, MPI_Datatype, + void *, int *, int *, MPI_Datatype, + MPI_Comm)) + mpi_coll_alltoallv_description[alltoallv_id].coll; int bcast_id = find_coll_description(mpi_coll_bcast_description, - sg_cfg_get_string("smpi/bcast")); - mpi_coll_bcast_fun = (int (*)(void *buf, int count, MPI_Datatype datatype, \ - int root, MPI_Comm com)) - mpi_coll_bcast_description[bcast_id].coll; + sg_cfg_get_string("smpi/bcast")); + mpi_coll_bcast_fun = (int (*)(void *buf, int count, MPI_Datatype datatype, + int root, MPI_Comm com)) + mpi_coll_bcast_description[bcast_id].coll; int reduce_id = find_coll_description(mpi_coll_reduce_description, - sg_cfg_get_string("smpi/reduce")); - mpi_coll_reduce_fun = (int (*)(void *buf, void *rbuf, int count, MPI_Datatype datatype, \ - MPI_Op op, int root, MPI_Comm comm)) - mpi_coll_reduce_description[reduce_id].coll; - - int reduce_scatter_id = find_coll_description(mpi_coll_reduce_scatter_description, - sg_cfg_get_string("smpi/reduce_scatter")); - mpi_coll_reduce_scatter_fun = (int (*)(void *sbuf, void *rbuf, int *rcounts,\ - MPI_Datatype dtype,MPI_Op op,MPI_Comm comm)) - mpi_coll_reduce_scatter_description[reduce_scatter_id].coll; + sg_cfg_get_string("smpi/reduce")); + mpi_coll_reduce_fun = (int (*)(void *buf, void *rbuf, int count, + MPI_Datatype datatype, MPI_Op op, + int root, MPI_Comm comm)) + mpi_coll_reduce_description[reduce_id].coll; + + int reduce_scatter_id = + find_coll_description(mpi_coll_reduce_scatter_description, + sg_cfg_get_string("smpi/reduce_scatter")); + mpi_coll_reduce_scatter_fun = (int (*)(void *sbuf, void *rbuf, int *rcounts, + MPI_Datatype dtype, MPI_Op op, + MPI_Comm comm)) + mpi_coll_reduce_scatter_description[reduce_scatter_id].coll; int scatter_id = find_coll_description(mpi_coll_scatter_description, - sg_cfg_get_string("smpi/scatter")); - mpi_coll_scatter_fun = (int (*)(void *sendbuf, int sendcount, MPI_Datatype sendtype,\ - void *recvbuf, int recvcount, MPI_Datatype recvtype,\ - int root, MPI_Comm comm)) - mpi_coll_scatter_description[scatter_id].coll; + sg_cfg_get_string("smpi/scatter")); + mpi_coll_scatter_fun = (int (*)(void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + int root, MPI_Comm comm)) + mpi_coll_scatter_description[scatter_id].coll; int barrier_id = find_coll_description(mpi_coll_barrier_description, - sg_cfg_get_string("smpi/barrier")); + sg_cfg_get_string("smpi/barrier")); mpi_coll_barrier_fun = (int (*)(MPI_Comm comm)) - mpi_coll_barrier_description[barrier_id].coll; + mpi_coll_barrier_description[barrier_id].coll; smpi_cpu_threshold = sg_cfg_get_double("smpi/cpu_threshold"); smpi_running_power = sg_cfg_get_double("smpi/running_power"); -- 2.20.1