X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/18c57b27dd71ee7839c6a90368c845886a87d638..fc727903530d55d5d3f903a8213c7cb8a3273c7a:/src/simix/smx_private.h

diff --git a/src/simix/smx_private.h b/src/simix/smx_private.h
index 2482f68c7b..b19e966584 100644
--- a/src/simix/smx_private.h
+++ b/src/simix/smx_private.h
@@ -7,7 +7,7 @@
 #ifndef _SIMIX_PRIVATE_H
 #define _SIMIX_PRIVATE_H
 
-#include "simix/simix.h"
+#include "simgrid/simix.h"
 #include "surf/surf.h"
 #include "xbt/fifo.h"
 #include "xbt/swag.h"
@@ -46,6 +46,26 @@ typedef struct s_smx_global {
 extern smx_global_t simix_global;
 extern unsigned long simix_process_maxpid;
 
+/******************************** Exceptions *********************************/
+
+#define SMX_EXCEPTION(issuer, c, v, m)                                  \
+  if (1) {                                                              \
+    smx_process_t _smx_throw_issuer = (issuer);                         \
+    THROW_PREPARE(_smx_throw_issuer->running_ctx, (c), (v), xbt_strdup(m)); \
+    _smx_throw_issuer->doexception = 1;                                 \
+  } else ((void)0)
+
+#define SMX_THROW() RETHROW
+
+/* ******************************** File ************************************ */
+typedef struct s_smx_file {
+  surf_file_t surf_file;
+} s_smx_file_t;
+
+typedef struct s_smx_stat {
+  s_file_stat_t surf_stat;
+} s_smx_stat_t;
+
 /*********************************** Time ************************************/
 
 /** @brief Timer datatype */
@@ -73,6 +93,13 @@ typedef enum {
   SIMIX_COMM_DONE
 } e_smx_comm_type_t;
 
+typedef enum {
+  SIMIX_IO_OPEN,
+  SIMIX_IO_WRITE,
+  SIMIX_IO_READ,
+  SIMIX_IO_STAT
+} e_smx_io_type_t;
+
 /** @brief Action datatype */
 typedef struct s_smx_action {
 
@@ -96,6 +123,9 @@ typedef struct s_smx_action {
       int detached;                   /* If detached or not */
 
       void (*clean_fun)(void*);       /* Function to clean the detached src_buf if something goes wrong */
+      int (*match_fun)(void*,void*,smx_action_t);  /* Filter function used by the other side. It is used when
+                                         looking if a given communication matches my needs. For that, myself must match the
+                                         expectations of the other side, too. See  */
 
       /* Surf action data */
       surf_action_t surf_comm;        /* The Surf communication action encapsulated */
@@ -161,8 +191,8 @@ static XBT_INLINE e_smx_state_t SIMIX_action_map_state(e_surf_action_state_t sta
 void SIMIX_context_mod_init(void);
 void SIMIX_context_mod_exit(void);
 
-XBT_INLINE void SIMIX_context_set_current(smx_context_t context);
-XBT_INLINE smx_context_t SIMIX_context_get_current(void);
+void SIMIX_context_set_current(smx_context_t context);
+smx_context_t SIMIX_context_get_current(void);
 
 /* All factories init */
 void SIMIX_ctx_thread_factory_init(smx_context_factory_t *factory);
@@ -242,7 +272,7 @@ static XBT_INLINE void SIMIX_context_suspend(smx_context_t context)
 /**
  \brief Executes all the processes to run (in parallel if possible).
  */
-static XBT_INLINE void SIMIX_context_runall()
+static XBT_INLINE void SIMIX_context_runall(void)
 {
   simix_global->context_factory->runall();
 }