Modified some functions and datatypes. Simix API changed too.

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

diff --git a/src/simix/private.h b/src/simix/private.h
index 6ee5adb..630a5b0 100644 (file)
--- a/src/simix/private.h
+++ b/src/simix/private.h
@@ -12,7 +12,6 @@
 #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"
@@ -34,12 +33,9 @@ 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; */
 } s_SIMIX_Global_t, *SIMIX_Global_t;
 
 extern SIMIX_Global_t simix_global;
@@ -53,12 +49,8 @@ typedef struct s_simdata_process {
   int suspended;
   smx_mutex_t mutex;           /* mutex on which the process is blocked  */
   smx_cond_t cond;             /* cond on which the process is blocked  */
-  smx_host_t put_host;         /* used for debugging purposes */
-  smx_action_t block_action;   /* action that block the process when it does a mutex_lock or cond_wait */
   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;
 
 typedef struct process_arg {
@@ -92,21 +84,8 @@ typedef struct s_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;*/
-
-  /*******  Parallel Tasks Only !!!! *******/
-  /*
-  int host_nb;
-  void * *host_list;            *//* SURF modeling */
-  /*
-  double *comp_amount;
-  double *comm_amount;
-  */
+  smx_host_t source; 
+
 } s_simdata_action_t;
 
 
@@ -121,15 +100,6 @@ 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(SIMIX_host_self()->simdata->host)==SURF_CPU_ON,\
                                   "Host failed, you cannot call this function.")
@@ -137,19 +107,9 @@ extern xbt_cfg_t _simix_cfg_set;
 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);
-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);
 
-SIMIX_error_t __SIMIX_wait_for_action(smx_process_t process, smx_action_t action);
-
-
-/*
-void __MSG_task_execute(smx_process_t process, m_task_t task);
-MSG_error_t __MSG_task_wait_event(smx_process_t process, m_task_t task);
-*/
-
 
 #endif