X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5b6830658ae00f48fbca5a43ed666c98301b163c..6760cb07d6b57be16928d95339d71e57c4e24f36:/src/smpi/smpi_global.c diff --git a/src/smpi/smpi_global.c b/src/smpi/smpi_global.c index cf49cf98e6..dc7edf4f57 100644 --- a/src/smpi/smpi_global.c +++ b/src/smpi/smpi_global.c @@ -1,3 +1,9 @@ +/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team. + * All rights reserved. */ + +/* This program is free software; you can redistribute it and/or modify it + * under the terms of the license (GNU LGPL) which comes with this package. */ + #include #include "private.h" @@ -13,7 +19,7 @@ typedef struct s_smpi_process_data { xbt_fifo_t pending_sent; xbt_fifo_t pending_recv; xbt_os_timer_t timer; - double simulated; + MPI_Comm comm_self; } s_smpi_process_data_t; static smpi_process_data_t* process_data = NULL; @@ -45,16 +51,19 @@ xbt_os_timer_t smpi_process_timer(void) { return data->timer; } -void smpi_process_simulated_reset(void) { +MPI_Comm smpi_process_comm_self(void) { smpi_process_data_t data = smpi_process_data(); - data->simulated = SIMIX_get_clock(); + return data->comm_self; } -double smpi_process_simulated_elapsed(void) { - smpi_process_data_t data = smpi_process_data(); +void print_request(const char* message, MPI_Request request) { + char* req = bprintf("[buf = %p, size = %zu, src = %d, dst = %d, tag= %d, complete = %d, flags = %u]", + request->buf, request->size, request->src, request->dst, request->tag, request->complete, request->flags); - return SIMIX_get_clock() - data->simulated; + DEBUG5("%s (request %p with rdv %p and match %p) %s", + message, request, request->rdv, request->match, req); + free(req); } void smpi_process_post_send(MPI_Comm comm, MPI_Request request) { @@ -63,23 +72,20 @@ void smpi_process_post_send(MPI_Comm comm, MPI_Request request) { xbt_fifo_item_t item; MPI_Request req; - DEBUG4("isend for request %p [src = %d, dst = %d, tag = %d]", - request, request->src, request->dst, request->tag); + print_request("Isend", request); xbt_fifo_foreach(data->pending_recv, item, req, MPI_Request) { if(req->comm == request->comm && (req->src == MPI_ANY_SOURCE || req->src == request->src) && (req->tag == MPI_ANY_TAG || req->tag == request->tag)){ - DEBUG4("find matching request %p [src = %d, dst = %d, tag = %d]", - req, req->src, req->dst, req->tag); + print_request("Match found", req); xbt_fifo_remove_item(data->pending_recv, item); /* Materialize the *_ANY_* fields from corresponding irecv request */ req->src = request->src; req->tag = request->tag; + req->match = request; request->rdv = req->rdv; + request->match = req; return; - } else { - DEBUG4("not matching request %p [src = %d, dst = %d, tag = %d]", - req, req->src, req->dst, req->tag); } } request->rdv = SIMIX_rdv_create(NULL); @@ -91,23 +97,20 @@ void smpi_process_post_recv(MPI_Request request) { xbt_fifo_item_t item; MPI_Request req; - DEBUG4("irecv for request %p [src = %d, dst = %d, tag = %d]", - request, request->src, request->dst, request->tag); + print_request("Irecv", request); xbt_fifo_foreach(data->pending_sent, item, req, MPI_Request) { if(req->comm == request->comm && (request->src == MPI_ANY_SOURCE || req->src == request->src) && (request->tag == MPI_ANY_TAG || req->tag == request->tag)){ - DEBUG4("find matching request %p [src = %d, dst = %d, tag = %d]", - req, req->src, req->dst, req->tag); + print_request("Match found", req); xbt_fifo_remove_item(data->pending_sent, item); /* Materialize the *_ANY_* fields from the irecv request */ + req->match = request; request->src = req->src; request->tag = req->tag; request->rdv = req->rdv; + request->match = req; return; - } else { - DEBUG4("not matching request %p [src = %d, dst = %d, tag = %d]", - req, req->src, req->dst, req->tag); } } request->rdv = SIMIX_rdv_create(NULL); @@ -115,7 +118,6 @@ void smpi_process_post_recv(MPI_Request request) { } void smpi_global_init(void) { - double clock = SIMIX_get_clock(); int i; MPI_Group group; @@ -128,7 +130,9 @@ void smpi_global_init(void) { process_data[i]->pending_sent = xbt_fifo_new(); process_data[i]->pending_recv = xbt_fifo_new(); process_data[i]->timer = xbt_os_timer_new(); - process_data[i]->simulated = clock; + group = smpi_group_new(1); + process_data[i]->comm_self = smpi_comm_new(group); + smpi_group_set_mapping(group, i, 0); } group = smpi_group_new(process_count); MPI_COMM_WORLD = smpi_comm_new(group); @@ -144,6 +148,7 @@ void smpi_global_destroy(void) { smpi_comm_destroy(MPI_COMM_WORLD); MPI_COMM_WORLD = MPI_COMM_NULL; for(i = 0; i < count; i++) { + smpi_comm_destroy(process_data[i]->comm_self); xbt_os_timer_free(process_data[i]->timer); xbt_fifo_free(process_data[i]->pending_recv); xbt_fifo_free(process_data[i]->pending_sent); @@ -158,20 +163,25 @@ int main(int argc, char **argv) srand(SMPI_RAND_SEED); double default_reference_speed = 20000.0; - xbt_cfg_register(&_surf_cfg_set, "reference_speed", + xbt_cfg_register(&_surf_cfg_set, "smpi/running_power", "Power of the host running the simulation (in flop/s). Used to bench the operations.", xbt_cfgelm_double, &default_reference_speed, 1, 1, NULL, NULL); int default_display_timing = 0; - xbt_cfg_register(&_surf_cfg_set, "display_timing", + xbt_cfg_register(&_surf_cfg_set, "smpi/display_timing", "Boolean indicating whether we should display the timing after simulation.", xbt_cfgelm_int, &default_display_timing, 1, 1, NULL, NULL); int default_display_smpe = 0; - xbt_cfg_register(&_surf_cfg_set, "SMPE", + xbt_cfg_register(&_surf_cfg_set, "smpi/log_events", "Boolean indicating whether we should display simulated time spent in MPI calls.", xbt_cfgelm_int, &default_display_smpe, 1, 1, NULL, NULL); + double default_threshold = 1e-6; + xbt_cfg_register(&_surf_cfg_set, "smpi/cpu_threshold", + "Minimal computation time (in seconds) not discarded.", + xbt_cfgelm_double, &default_threshold, 1, 1, NULL, NULL); + SIMIX_global_init(&argc, argv); // parse the platform file: get the host list @@ -188,12 +198,14 @@ int main(int argc, char **argv) SIMIX_init(); while (SIMIX_solve(NULL, NULL) != -1.0); - - if (xbt_cfg_get_int(_surf_cfg_set, "display_timing")) + + if (xbt_cfg_get_int(_surf_cfg_set, "smpi/display_timing")) INFO1("simulation time %g", SIMIX_get_clock()); smpi_global_destroy(); + SIMIX_message_sizes_output("toto.txt"); + SIMIX_clean(); return 0; }