X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/39997124732a66cfd24f1b50cf816bfb7ed43b3b..b3d9680ac65d8bdd8e267aed69fc32a5abab12d7:/src/simix/private.h?ds=sidebyside

diff --git a/src/simix/private.h b/src/simix/private.h
index e797a2193f..b130cf9337 100644
--- a/src/simix/private.h
+++ b/src/simix/private.h
@@ -9,7 +9,6 @@
 #ifndef SIMIX_PRIVATE_H
 #define SIMIX_PRIVATE_H
 
-#include <stdio.h>
 #include "simix/simix.h"
 #include "surf/surf.h"
 #include "xbt/fifo.h"
@@ -143,20 +142,22 @@ typedef struct s_smx_comm {
 
   smx_comm_type_t type;   /* Type of the communication (comm_send,comm_recv) */
   smx_rdv_t rdv;          /* Rendez-vous where the comm is queued */
-  smx_cond_t cond;        /* Condition associated to the surf simulation */
+  smx_sem_t sem;        /* Semaphore associated to the surf simulation */
   int refcount;           /* Number of processes involved in the cond */
 
   /* Surf action data */
   smx_process_t src_proc;
   smx_process_t dst_proc;
+  smx_action_t src_timeout;
+  smx_action_t dst_timeout;
   smx_action_t act;
   double rate;
   double task_size;
 
   /* Data to be transfered */
   void *src_buff;
-  size_t src_buff_size;
   void *dst_buff;
+  size_t src_buff_size;
   size_t *dst_buff_size;
   void *data;             /* User data associated to communication */
 } s_smx_comm_t;
@@ -293,6 +294,9 @@ void SIMIX_context_init_factory_by_name(smx_context_factory_t * factory, const c
 void SIMIX_ctx_thread_factory_init(smx_context_factory_t * factory);
 
 void SIMIX_ctx_sysv_factory_init(smx_context_factory_t * factory);
+void SIMIX_ctx_lua_factory_init(smx_context_factory_t * factory);
+void SIMIX_ctx_lua_factory_loadfile(const char *file);
+
 
 void SIMIX_ctx_java_factory_init(smx_context_factory_t * factory);