X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5f7e9bf9cd6ea2c2cfb9246613c03d667d66fd79..9a7c6c8f75db930814b5ca356795f8ff2347c5d7:/src/msg/private.h

diff --git a/src/msg/private.h b/src/msg/private.h
index 562b6b0dc8..a6e91942f4 100644
--- a/src/msg/private.h
+++ b/src/msg/private.h
@@ -1,8 +1,5 @@
-/*     $Id$      */
-
-/* Copyright (c) 2002-2007 Arnaud Legrand.                                  */
-/* Copyright (c) 2007 Bruno Donassolo.                                      */
-/* All rights reserved.                                                     */
+/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -10,7 +7,6 @@
 #ifndef METASIMGRID_PRIVATE_H
 #define METASIMGRID_PRIVATE_H
 
-#include <stdio.h>
 #include "msg/msg.h"
 #include "simix/simix.h"
 #include "surf/surf.h"
@@ -18,46 +14,32 @@
 #include "xbt/dynar.h"
 #include "xbt/swag.h"
 #include "xbt/dict.h"
-#include "xbt/context.h"
 #include "xbt/config.h"
+#include "instr/instr_private.h"
 
 SG_BEGIN_DECL()
 
 /**************** datatypes **********************************/
-
-/* this structure represents a mailbox */
-typedef struct s_msg_mailbox
-{
-	char* alias;						/* the key of the mailbox in the global dictionary			*/
-	xbt_fifo_t tasks;					/* the list of the tasks in the mailbox						*/
-	smx_cond_t cond;					/* the condition on the mailbox								*/
-	char* hostname;						/* the name of the host containing the mailbox				*/
-}s_msg_mailbox_t;
-
-typedef struct simdata_host
-{
-	smx_host_t smx_host;				/* SURF modeling								*/
-	struct s_msg_mailbox** mailboxes;	/* mailboxes to store msg tasks of of the host	*/
-	smx_mutex_t mutex; 					/* mutex to access the host 					*/
-}s_simdata_host_t;
+typedef struct simdata_host {
+  smx_host_t smx_host;          /* SURF modeling                                                                */
+  msg_mailbox_t *mailboxes;     /* mailboxes to store msg tasks of of the host  */
+} s_simdata_host_t;
 
 /********************************* Task **************************************/
 
 typedef struct simdata_task {
-  smx_action_t compute;	/* SURF modeling of computation  */
-  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; 				/* Task mutex */
+  smx_action_t compute;         /* SURF modeling of computation  */
+  smx_action_t comm;            /* SIMIX communication  */
+  double message_size;          /* Data size  */
+  double computation_amount;    /* Computation size  */
   m_process_t sender;
   m_process_t receiver;
   m_host_t source;
   double priority;
   double rate;
-  int refcount ;
+  int isused;  /* Indicates whether the task is used in SIMIX currently */
+  int host_nb;                  /* ==0 if sequential task; parallel task if not */
   /*******  Parallel Tasks Only !!!! *******/
-  int host_nb;
   smx_host_t *host_list;
   double *comp_amount;
   double *comm_amount;
@@ -68,10 +50,11 @@ typedef struct simdata_task {
 typedef struct simdata_process {
   m_host_t m_host;              /* the host on which the process is running */
   smx_process_t s_process;
-  int PID;			/* used for debugging purposes */
-  int PPID;			/* The parent PID */
-  m_host_t put_host;		/* used for debugging purposes */
-  m_channel_t put_channel;	/* used for debugging purposes */
+  int PID;                      /* used for debugging purposes */
+  int PPID;                     /* The parent PID */
+  m_host_t put_host;            /* used for debugging purposes */
+  m_channel_t put_channel;      /* used for debugging purposes */
+  smx_action_t waiting_action;
   m_task_t waiting_task;
   int argc;                     /* arguments number if any */
   char **argv;                  /* arguments table if any */
@@ -95,7 +78,7 @@ typedef struct MSG_Global {
   int max_channel;
   int PID;
   int session;
-  unsigned long int sent_msg; /* Total amount of messages sent during the simulation */
+  unsigned long int sent_msg;   /* Total amount of messages sent during the simulation */
 } s_MSG_Global_t, *MSG_Global_t;
 
 /*extern MSG_Global_t msg_global;*/
@@ -109,8 +92,10 @@ XBT_PUBLIC_DATA(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_assert1(SIMIX_host_get_state(SIMIX_host_self())==1,\
-                                  "Host failed, you cannot call this function. (state=%d)",SIMIX_host_get_state(SIMIX_host_self()))
+/*#define CHECK_HOST()  xbt_assert1(SIMIX_req_host_get_state(SIMIX_host_self())==1,\
+                                  "Host failed, you cannot call this function. (state=%d)",SIMIX_req_host_get_state(SIMIX_host_self()))*/
+#define CHECK_HOST()
+
 
 m_host_t __MSG_host_create(smx_host_t workstation, void *data);
 
@@ -118,13 +103,15 @@ void __MSG_host_destroy(m_host_t host);
 
 void __MSG_display_process_status(void);
 
-void __MSG_process_cleanup(void *arg);
-void *_MSG_process_create_from_SIMIX(const char *name,
-				     xbt_main_func_t code, void *data,
-				     char * hostname, int argc, char **argv, xbt_dict_t properties);
+void __MSG_process_cleanup(smx_process_t smx_proc);
+void _MSG_process_create_from_SIMIX(void *process, const char *name,
+                                    xbt_main_func_t code, void *data,
+                                    char *hostname, int argc,
+                                    char **argv, xbt_dict_t properties);
 void _MSG_process_kill_from_SIMIX(void *p);
 
 void _MSG_action_init(void);
+void _MSG_action_exit(void);
 
 SG_END_DECL()
 #endif