Rename some struct fields in private datatype to explicit whether they are smx object...

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

diff --git a/src/simix/private.h b/src/simix/private.h
index 4139869..1ef1e42 100644 (file)
--- a/src/simix/private.h
+++ b/src/simix/private.h
@@ -9,21 +9,24 @@
 #ifndef SIMIX_PRIVATE_H
 #define SIMIX_PRIVATE_H
 
+#include <stdio.h>
 #include "simix/simix.h"
 #include "surf/surf.h"
 #include "xbt/fifo.h"
-#include "xbt/dynar.h"
 #include "xbt/swag.h"
 #include "xbt/dict.h"
 #include "xbt/context.h"
 #include "xbt/config.h"
 
-/**************** datatypes **********************************/
+/******************************* Datatypes **********************************/
 
-typedef struct s_simdata_host {
+
+/********************************** Host ************************************/
+
+typedef struct s_smx_simdata_host {
   void *host;                  /* SURF modeling */
   xbt_swag_t process_list;
-} s_simdata_host_t;
+} s_smx_simdata_host_t;
 
 /********************************* Simix Global ******************************/
 
@@ -31,75 +34,61 @@ typedef struct SIMIX_Global {
   xbt_fifo_t host;
   xbt_swag_t process_to_run;
   xbt_swag_t process_list;
- /* xbt_swag_t process_sleeping; */
 
   smx_process_t current_process;
   xbt_dict_t registered_functions;
-/*  FILE *paje_output;
-  int session; */
+       void* (*create_process_function) ();
+       void* (*kill_process_function)();
 } s_SIMIX_Global_t, *SIMIX_Global_t;
 
 extern SIMIX_Global_t simix_global;
 
 /******************************* Process *************************************/
 
-typedef struct s_simdata_process {
-  smx_host_t host;                /* the host on which the process is running */
+typedef struct s_smx_simdata_process {
+  smx_host_t s_host;                /* the host on which the process is running */
   xbt_context_t context;               /* the context that executes the scheduler fonction */
   int blocked;
   int suspended;
-  smx_host_t put_host;         /* used for debugging purposes */
+  smx_mutex_t mutex;           /* mutex on which the process is blocked  */
+  smx_cond_t cond;             /* cond on which the process is blocked  */
   int argc;                     /* arguments number if any */
   char **argv;                  /* arguments table if any */
-  SIMIX_error_t last_errno;       /* the last value returned by a MSG_function */
-// int paje_state;               /* the number of states stacked with Paje */
-} s_simdata_process_t;
+} s_smx_simdata_process_t;
 
-typedef struct process_arg {
+typedef struct s_smx_process_arg {
   const char *name;
   smx_process_code_t code;
   void *data;
-  smx_host_t host;
+  char *hostname;
   int argc;
   char **argv;
   double kill_time;
-} s_process_arg_t, *process_arg_t;
+} s_smx_process_arg_t, *smx_process_arg_t;
 
 /********************************* Mutex and Conditional ****************************/
 
 typedef struct s_smx_mutex {
-       xbt_swag_t sleeping;
+       xbt_swag_t sleeping;                    /* list of sleeping process */
        int using;
 
 } s_smx_mutex_t;
 
 typedef struct s_smx_cond {
-       s_smx_mutex_t * mutex;
-       xbt_swag_t sleeping; //process
+       xbt_swag_t sleeping;                    /* list of sleeping process */
+       smx_mutex_t  mutex;
+       xbt_fifo_t actions;                     /* list of actions */
+
 } s_smx_cond_t;
 
 /********************************* Action **************************************/
 
-typedef struct s_simdata_action {
+typedef struct s_smx_simdata_action {
   surf_action_t surf_action;   /* SURF modeling of computation  */
   
-  xbt_fifo_t cond_list;                /* conditional variables that must be signaled when the action finish. */
-  smx_host_t source;
-
-  double priority;
-  double rate;
-  
-  /*int using;*/
+  smx_host_t source; 
 
-  /*******  Parallel Tasks Only !!!! *******/
-  /*
-  int host_nb;
-  void * *host_list;            *//* SURF modeling */
-  /*
-  double *comp_amount;
-  double *comm_amount;
-  */
-} s_simdata_action_t;
+} s_smx_simdata_action_t;
 
 
 
@@ -113,33 +102,17 @@ extern int _simix_init_status; /* 0: beginning of time;
 extern xbt_cfg_t _simix_cfg_set;
 
 
-
-
-
-
-#define PROCESS_SET_ERRNO(val) (SIMIX_process_self()->simdata->last_errno=val)
-#define PROCESS_GET_ERRNO() (SIMIX_process_self()->simdata->last_errno)
-#define SIMIX_RETURN(val) do {PROCESS_SET_ERRNO(val);return(val);} while(0)
-/* #define CHECK_ERRNO()  ASSERT((PROCESS_GET_ERRNO()!=MSG_HOST_FAILURE),"Host failed, you cannot call this function.") */
-
-#define CHECK_HOST()  xbt_assert0(surf_workstation_resource->extension_public-> \
-                                 get_state(MSG_host_self()->simdata->host)==SURF_CPU_ON,\
+#define SIMIX_CHECK_HOST()  xbt_assert0(surf_workstation_resource->extension_public-> \
+                                 get_state(SIMIX_host_self()->simdata->host)==SURF_CPU_ON,\
                                   "Host failed, you cannot call this function.")
 
 smx_host_t __SIMIX_host_create(const char *name, void *workstation, void *data);
 void __SIMIX_host_destroy(smx_host_t host);
 
-int __SIMIX_process_block(double max_duration, const char *info);
-SIMIX_error_t __SIMIX_process_unblock(smx_process_t process);
-int __SIMIX_process_isBlocked(smx_process_t process);
+void __SIMIX_cond_wait(smx_cond_t cond);
 
 void __SIMIX_display_process_status(void);
 
-/*
-void __MSG_task_execute(smx_process_t process, m_task_t task);
-MSG_error_t __MSG_wait_for_computation(smx_process_t process, m_task_t task);
-MSG_error_t __MSG_task_wait_event(smx_process_t process, m_task_t task);
-*/
 
 
 #endif