msg_simix alpha. All functions implemented.

[simgrid.git] / src / msg_simix / msg_simix_private.h

diff --git a/src/msg_simix/msg_simix_private.h b/src/msg_simix/msg_simix_private.h
index 069086b..811c1f9 100644 (file)
--- a/src/msg_simix/msg_simix_private.h
+++ b/src/msg_simix/msg_simix_private.h
@@ -8,6 +8,7 @@
 #ifndef METASIMGRID_PRIVATE_H
 #define METASIMGRID_PRIVATE_H
 
+#include <stdio.h>
 #include "msg/msg.h"
 #include "simix/simix.h"
 #include "xbt/fifo.h"
@@ -22,9 +23,8 @@
 typedef struct simdata_host {
   smx_host_t host;                     /* SURF modeling */
   xbt_fifo_t *mbox;            /* array of FIFOs used as a mailboxes  */
-  smx_cond_t *sleeping;        /* array of process used to know whether a local process is
-                                  waiting for a communication on a channel */
-       smx_mutex_t mutex;
+  smx_cond_t *sleeping;        /* array of conditions on which the processes sleep if they are waiting for a communication on a channel */
+       smx_mutex_t mutex; /* mutex to access the host */
 } s_simdata_host_t;
 
 /********************************* Task **************************************/
@@ -34,8 +34,8 @@ typedef struct simdata_task {
   smx_action_t comm;           /* SURF modeling of communication  */
   double message_size;         /* Data size  */
   double computation_amount;   /* Computation size  */
-       smx_cond_t cond;
-       smx_mutex_t mutex;
+       smx_cond_t cond;                                        
+       smx_mutex_t mutex;                              /* Task mutex */
   m_process_t sender;
   m_host_t source;
   double priority;
@@ -55,9 +55,6 @@ typedef struct simdata_process {
        smx_process_t smx_process;
   int PID;                     /* used for debugging purposes */
   int PPID;                    /* The parent PID */
-  //m_task_t waiting_task;        
-  int blocked;
-  int suspended;
   m_host_t put_host;           /* used for debugging purposes */
   m_channel_t put_channel;     /* used for debugging purposes */
   int argc;                     /* arguments number if any */
@@ -93,22 +90,18 @@ extern MSG_Global_t msg_global;
 #define MSG_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 CHECK_HOST()  xbt_assert0(SIMIX_host_get_state(SIMIX_host_self())==1,\
                                   "Host failed, you cannot call this function.")
 
 m_host_t __MSG_host_create(smx_host_t workstation, void *data);
-void __MSG_host_destroy(m_host_t host);
-void __MSG_task_execute(m_process_t process, m_task_t task);
-MSG_error_t __MSG_wait_for_computation(m_process_t process, m_task_t task);
-MSG_error_t __MSG_task_wait_event(m_process_t process, m_task_t task);
 
-int __MSG_process_block(double max_duration, const char *info);
-MSG_error_t __MSG_process_unblock(m_process_t process);
-int __MSG_process_isBlocked(m_process_t process);
+void __MSG_host_destroy(m_host_t host);
 
 void __MSG_display_process_status(void);
 
+m_process_t __MSG_process_create_with_arguments(const char *name,
+                                             m_process_code_t code, void *data,
+                                                                                                             char * hostname, int argc, char **argv);
 
 
 #endif