cleaning up and refactoring some of the code to create execution actions.

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

diff --git a/src/smpi/private.h b/src/smpi/private.h
index 1a8c584..3a5c8fa 100644 (file)
--- a/src/smpi/private.h
+++ b/src/smpi/private.h
@@ -11,6 +11,9 @@
 #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 {
@@ -100,8 +103,18 @@ typedef struct smpi_global_t {
        int               running_hosts_count;
        smx_mutex_t       running_hosts_count_mutex;
 
-       xbt_os_timer_t   *timers;
-       smx_mutex_t      *timers_mutexes;
+       // 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;
 
 } s_smpi_global_t;
 typedef struct smpi_global_t *smpi_global_t;
@@ -122,13 +135,15 @@ int smpi_mpi_isend(smpi_mpi_request_t request);
 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_bench_begin(void);
-void smpi_bench_end(void);
+double smpi_bench_end(void);
+void smpi_bench_skip(void);
 
 void smpi_global_init(void);
 void smpi_global_destroy(void);
 int smpi_host_index(void);
-int smpi_run_simulation(int argc, char **argv);
+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);