cosmetics

[simgrid.git] / src / smpi / private.h

diff --git a/src/smpi/private.h b/src/smpi/private.h
index 3a5c8fa..69d63f5 100644 (file)
--- a/src/smpi/private.h
+++ b/src/smpi/private.h
@@ -11,9 +11,6 @@
 #define SMPI_DEFAULT_SPEED 100
 #define SMPI_REQUEST_MALLOCATOR_SIZE 100
 #define SMPI_MESSAGE_MALLOCATOR_SIZE 100
-// FIXME: should probably be dynamic datatype...
-// or could include code to dynamically expand when full
-#define SMPI_MAX_TIMES 10
 
 // smpi mpi communicator
 typedef struct smpi_mpi_communicator_t {
@@ -72,6 +69,14 @@ typedef struct smpi_received_message_t {
 } s_smpi_received_message_t;
 typedef struct smpi_received_message_t *smpi_received_message_t;
 
+typedef struct smpi_do_once_duration_node_t {
+       char *file;
+       int line;
+       double duration;
+       struct smpi_do_once_duration_node_t *next;
+} s_smpi_do_once_duration_node_t;
+typedef struct smpi_do_once_duration_node_t *smpi_do_once_duration_node_t;
+
 typedef struct smpi_global_t {
 
        // config vars
@@ -88,6 +93,7 @@ typedef struct smpi_global_t {
        xbt_mallocator_t  request_mallocator;
        xbt_mallocator_t  message_mallocator;
 
+       // FIXME: request queues should be moved to host data...
        xbt_fifo_t       *pending_send_request_queues;
        smx_mutex_t      *pending_send_request_queues_mutexes;
 
@@ -103,18 +109,14 @@ typedef struct smpi_global_t {
        int               running_hosts_count;
        smx_mutex_t       running_hosts_count_mutex;
 
-       // FIXME: maybe all code needs to lock timer?
        xbt_os_timer_t    timer;
        smx_mutex_t       timer_mutex;
        smx_cond_t        timer_cond;
 
        // keeps track of previous times
-       double            times[SMPI_MAX_TIMES];
-       int               times_max;
-       smx_mutex_t       times_mutex;
-
-       smx_mutex_t       execute_mutex;
-       smx_cond_t        execute_cond;
+       smpi_do_once_duration_node_t do_once_duration_nodes;
+       smx_mutex_t do_once_mutex;
+       double *do_once_duration;
 
 } s_smpi_global_t;
 typedef struct smpi_global_t *smpi_global_t;
@@ -122,6 +124,8 @@ extern smpi_global_t smpi_global;
 
 typedef struct smpi_host_data_t {
        int index;
+       smx_mutex_t mutex;
+       smx_cond_t cond;
 } s_smpi_host_data_t;
 typedef struct smpi_host_data_t *smpi_host_data_t;
 
@@ -136,13 +140,17 @@ int smpi_mpi_irecv(smpi_mpi_request_t request);
 int smpi_mpi_wait(smpi_mpi_request_t request, smpi_mpi_status_t *status);
 
 void smpi_execute(double duration);
+void smpi_start_timer(void);
+double smpi_stop_timer(void);
 void smpi_bench_begin(void);
-double smpi_bench_end(void);
+void smpi_bench_end(void);
 void smpi_bench_skip(void);
 
 void smpi_global_init(void);
 void smpi_global_destroy(void);
 int smpi_host_index(void);
+smx_mutex_t smpi_host_mutex(void);
+smx_cond_t smpi_host_cond(void);
 int smpi_run_simulation(int *argc, char **argv);
 int smpi_create_request(void *buf, int count, smpi_mpi_datatype_t datatype,
        int src, int dst, int tag, smpi_mpi_communicator_t comm, smpi_mpi_request_t *request);