X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/04b83ff67daf1924db99ae07054ac5d058ed4a19..36b5d5f9f78b0d496663aa3b8d3e5f82ca48a5a1:/src/smpi/smpi_global.c diff --git a/src/smpi/smpi_global.c b/src/smpi/smpi_global.c index dfac6a6124..1221b7ce8d 100644 --- a/src/smpi/smpi_global.c +++ b/src/smpi/smpi_global.c @@ -2,7 +2,9 @@ #include "private.h" -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi, XBT_LOG_ROOT_CAT, "All SMPI categories"); +XBT_LOG_NEW_CATEGORY(smpi, "All SMPI categories"); + +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_kernel, smpi, "Logging specific to SMPI (kernel)"); smpi_global_t smpi_global = NULL; @@ -12,9 +14,12 @@ void *smpi_request_new() { smpi_mpi_request_t request = xbt_new(s_smpi_mpi_request_t, 1); + request->buf = NULL; request->completed = 0; request->mutex = SIMIX_mutex_init(); request->cond = SIMIX_cond_init(); + request->data = NULL; + request->forward = 0; return request; } @@ -26,11 +31,9 @@ void smpi_request_free(void *pointer) smpi_mpi_request_t request = pointer; - if (NULL != request) { - SIMIX_cond_destroy(request->cond); - SIMIX_mutex_destroy(request->mutex); - xbt_free(request); - } + SIMIX_cond_destroy(request->cond); + SIMIX_mutex_destroy(request->mutex); + xbt_free(request); return; } @@ -41,7 +44,10 @@ void smpi_request_reset(void *pointer) { smpi_mpi_request_t request = pointer; + request->buf = NULL; request->completed = 0; + request->data = NULL; + request->forward = 0; return; } @@ -51,17 +57,16 @@ void *smpi_message_new(void); void *smpi_message_new() { - return xbt_new(s_smpi_received_message_t, 1); + smpi_received_message_t message = xbt_new(s_smpi_received_message_t, 1); + message->buf = NULL; + return message; } void smpi_message_free(void *pointer); void smpi_message_free(void *pointer) { - if (NULL != pointer) { - xbt_free(pointer); - } - + xbt_free(pointer); return; } @@ -69,6 +74,8 @@ void smpi_message_reset(void *pointer); void smpi_message_reset(void *pointer) { + smpi_received_message_t message = pointer; + message->buf = NULL; return; } @@ -79,7 +86,7 @@ int smpi_create_request(void *buf, int count, smpi_mpi_datatype_t datatype, smpi_mpi_request_t request = NULL; - // FIXME: make sure requestptr is not null + // parameter checking prob belongs in smpi_mpi, but this is less repeat code if (NULL == buf) { retval = MPI_ERR_INTERN; } else if (0 > count) { @@ -95,7 +102,7 @@ int smpi_create_request(void *buf, int count, smpi_mpi_datatype_t datatype, } else if (NULL == comm) { retval = MPI_ERR_COMM; } else if (NULL == requestptr) { - retval = MPI_ERR_INTERN; + retval = MPI_ERR_ARG; } else { request = xbt_mallocator_get(smpi_global->request_mallocator); request->comm = comm; @@ -117,8 +124,18 @@ void smpi_global_init() int size = SIMIX_host_get_number(); - smpi_global = xbt_new(s_smpi_global_t, 1); + /* Connect our log channels: that must be done manually under windows */ +#ifdef XBT_LOG_CONNECT + XBT_LOG_CONNECT(smpi_base, smpi); + XBT_LOG_CONNECT(smpi_bench, smpi); + XBT_LOG_CONNECT(smpi_kernel, smpi); + XBT_LOG_CONNECT(smpi_mpi, smpi); + XBT_LOG_CONNECT(smpi_receiver, smpi); + XBT_LOG_CONNECT(smpi_sender, smpi); + XBT_LOG_CONNECT(smpi_util, smpi); +#endif + smpi_global = xbt_new(s_smpi_global_t, 1); // config variable smpi_global->reference_speed = SMPI_DEFAULT_SPEED; @@ -157,18 +174,21 @@ void smpi_global_init() smpi_global->receiver_processes = xbt_new(smx_process_t, size); // timers - smpi_global->timers = xbt_new(xbt_os_timer_t, size); - smpi_global->timers_mutexes = xbt_new(smx_mutex_t, size); + smpi_global->timer = xbt_os_timer_new(); + smpi_global->timer_mutex = SIMIX_mutex_init(); + smpi_global->timer_cond = SIMIX_cond_init(); - for(i = 0; i < size; i++) { + smpi_global->do_once_duration_nodes = NULL; + smpi_global->do_once_duration = NULL; + smpi_global->do_once_mutex = SIMIX_mutex_init(); + + for (i = 0; i < size; i++) { smpi_global->pending_send_request_queues[i] = xbt_fifo_new(); smpi_global->pending_send_request_queues_mutexes[i] = SIMIX_mutex_init(); smpi_global->pending_recv_request_queues[i] = xbt_fifo_new(); smpi_global->pending_recv_request_queues_mutexes[i] = SIMIX_mutex_init(); smpi_global->received_message_queues[i] = xbt_fifo_new(); smpi_global->received_message_queues_mutexes[i] = SIMIX_mutex_init(); - smpi_global->timers[i] = xbt_os_timer_new(); - smpi_global->timers_mutexes[i] = SIMIX_mutex_init(); } } @@ -179,6 +199,8 @@ void smpi_global_destroy() int size = SIMIX_host_get_number(); + smpi_do_once_duration_node_t curr, next; + // start/stop SIMIX_mutex_destroy(smpi_global->start_stop_mutex); SIMIX_cond_destroy(smpi_global->start_stop_cond); @@ -194,6 +216,18 @@ void smpi_global_destroy() xbt_mallocator_free(smpi_global->request_mallocator); xbt_mallocator_free(smpi_global->message_mallocator); + xbt_os_timer_free(smpi_global->timer); + SIMIX_mutex_destroy(smpi_global->timer_mutex); + SIMIX_cond_destroy(smpi_global->timer_cond); + + for(curr = smpi_global->do_once_duration_nodes; NULL != curr; curr = next) { + next = curr->next; + xbt_free(curr->file); + xbt_free(curr); + } + + SIMIX_mutex_destroy(smpi_global->do_once_mutex); + for(i = 0; i < size; i++) { xbt_fifo_free(smpi_global->pending_send_request_queues[i]); SIMIX_mutex_destroy(smpi_global->pending_send_request_queues_mutexes[i]); @@ -201,8 +235,6 @@ void smpi_global_destroy() SIMIX_mutex_destroy(smpi_global->pending_recv_request_queues_mutexes[i]); xbt_fifo_free(smpi_global->received_message_queues[i]); SIMIX_mutex_destroy(smpi_global->received_message_queues_mutexes[i]); - xbt_os_timer_free(smpi_global->timers[i]); - SIMIX_mutex_destroy(smpi_global->timers_mutexes[i]); } xbt_free(smpi_global->pending_send_request_queues); @@ -211,8 +243,6 @@ void smpi_global_destroy() xbt_free(smpi_global->pending_recv_request_queues_mutexes); xbt_free(smpi_global->received_message_queues); xbt_free(smpi_global->received_message_queues_mutexes); - xbt_free(smpi_global->timers); - xbt_free(smpi_global->timers_mutexes); xbt_free(smpi_global); @@ -223,15 +253,26 @@ int smpi_host_index() { smx_host_t host = SIMIX_host_self(); smpi_host_data_t hdata = (smpi_host_data_t)SIMIX_host_get_data(host); - return hdata->index; } -int smpi_run_simulation(int argc, char **argv) +smx_mutex_t smpi_host_mutex() +{ + smx_host_t host = SIMIX_host_self(); + smpi_host_data_t hdata = (smpi_host_data_t)SIMIX_host_get_data(host); + return hdata->mutex; +} + +smx_cond_t smpi_host_cond() +{ + smx_host_t host = SIMIX_host_self(); + smpi_host_data_t hdata = (smpi_host_data_t)SIMIX_host_get_data(host); + return hdata->cond; +} + +int smpi_run_simulation(int *argc, char **argv) { - xbt_fifo_item_t cond_item = NULL; smx_cond_t cond = NULL; - xbt_fifo_item_t action_item = NULL; smx_action_t action = NULL; xbt_fifo_t actions_failed = xbt_fifo_new(); @@ -239,7 +280,7 @@ int smpi_run_simulation(int argc, char **argv) srand(SMPI_RAND_SEED); - SIMIX_global_init(&argc, argv); + SIMIX_global_init(argc, argv); SIMIX_function_register("smpi_simulated_main", smpi_simulated_main); SIMIX_function_register("smpi_sender", smpi_sender); @@ -260,17 +301,18 @@ int smpi_run_simulation(int argc, char **argv) /* Clean IO before the run */ fflush(stdout); fflush(stderr); + SIMIX_init(); while (SIMIX_solve(actions_done, actions_failed) != -1.0) { - xbt_fifo_foreach(actions_failed, action_item, action, smx_action_t) { + while ((action = xbt_fifo_pop(actions_failed))) { DEBUG1("** %s failed **", action->name); - xbt_fifo_foreach(action->cond_list, cond_item, cond, smx_cond_t) { + while((cond = xbt_fifo_pop(action->cond_list))) { SIMIX_cond_broadcast(cond); } } - xbt_fifo_foreach(actions_done, action_item, action, smx_action_t) { + while((action = xbt_fifo_pop(actions_done))) { DEBUG1("** %s done **",action->name); - xbt_fifo_foreach(action->cond_list, cond_item, cond, smx_cond_t) { + while((cond = xbt_fifo_pop(action->cond_list))) { SIMIX_cond_broadcast(cond); } }