some of the action checking code didn't work right, so I removed it.

[simgrid.git] / src / smpi / smpi_global.c

diff --git a/src/smpi/smpi_global.c b/src/smpi/smpi_global.c
index af72607..d9da589 100644 (file)
--- 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;
 
@@ -165,8 +167,10 @@ void smpi_global_init()
        smpi_global->timer                               = xbt_os_timer_new();
        smpi_global->timer_mutex                         = SIMIX_mutex_init();
        smpi_global->timer_cond                          = SIMIX_cond_init();
-       smpi_global->times_max                           = 0;
-       smpi_global->times_mutex                         = SIMIX_mutex_init();
+
+       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();
@@ -177,10 +181,6 @@ void smpi_global_init()
                smpi_global->received_message_queues_mutexes[i]     = SIMIX_mutex_init();
        }
 
-       for (i = 0; i < SMPI_MAX_TIMES; i++) {
-               smpi_global->times[i] = -1.0;
-       }
-
 }
 
 void smpi_global_destroy()
@@ -189,6 +189,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);
@@ -207,7 +209,14 @@ void smpi_global_destroy()
        xbt_os_timer_free(smpi_global->timer);
        SIMIX_mutex_destroy(smpi_global->timer_mutex);
        SIMIX_cond_destroy(smpi_global->timer_cond);
-       SIMIX_mutex_destroy(smpi_global->times_mutex);
+
+       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]);
@@ -234,15 +243,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();
@@ -250,7 +270,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);
@@ -273,15 +293,15 @@ int smpi_run_simulation(int argc, char **argv)
        fflush(stderr);
 
        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);
                        }
                }