X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/806a8ef96de0bc6fbb75cadb0fbd8f3ef824d0b8..912a9ae1e7d165713255d17b216500188057ecea:/src/gras/Virtu/sg_process.c

diff --git a/src/gras/Virtu/sg_process.c b/src/gras/Virtu/sg_process.c
index ce1c279b04..4f78a4932d 100644
--- a/src/gras/Virtu/sg_process.c
+++ b/src/gras/Virtu/sg_process.c
@@ -7,7 +7,10 @@
 /* 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. */
 
+#include "gras_modinter.h" /* module initialization interface */
 #include "gras/Virtu/virtu_sg.h"
+#include "gras/Msg/msg_interface.h" /* For some checks at simulation end */
+#include "gras/Transport/transport_interface.h" /* For some checks at simulation end */
 
 XBT_LOG_EXTERNAL_CATEGORY(process);
 XBT_LOG_DEFAULT_CATEGORY(process);
@@ -16,17 +19,18 @@ xbt_error_t
 gras_process_init() {
   xbt_error_t errcode;
   gras_hostdata_t *hd=(gras_hostdata_t *)MSG_host_get_data(MSG_host_self());
-  gras_procdata_t *pd;
+  gras_procdata_t *pd=xbt_new(gras_procdata_t,1);
+  gras_trp_procdata_t trp_pd;
   gras_sg_portrec_t prraw,pr;
   int i;
   
-  pd=xbt_new(gras_procdata_t,1);
-
   if (MSG_process_set_data(MSG_process_self(),(void*)pd) != MSG_OK)
     return unknown_error;
+   
   gras_procdata_init();
 
   if (!hd) {
+    /* First process on this host */
     hd=xbt_new(gras_hostdata_t,1);
     hd->ports = xbt_dynar_new(sizeof(gras_sg_portrec_t),NULL);
 
@@ -37,13 +41,14 @@ gras_process_init() {
   }
   
   /* take a free channel for this process */
+  trp_pd = (gras_trp_procdata_t)gras_libdata_get("gras_trp");
   for (i=0; i<XBT_MAX_CHANNEL && hd->proc[i]; i++);
   if (i == XBT_MAX_CHANNEL) 
     RAISE2(system_error,
 	   "GRAS: Can't add a new process on %s, because all channel are already in use. Please increase MAX CHANNEL (which is %d for now) and recompile GRAS\n.",
 	    MSG_host_get_name(MSG_host_self()),XBT_MAX_CHANNEL);
 
-  pd->chan = i;
+  trp_pd->chan = i;
   hd->proc[ i ] = MSG_process_self_PID();
 
   /* regiter it to the ports structure */
@@ -59,11 +64,11 @@ gras_process_init() {
 	   "GRAS: Can't add a new process on %s, because all channel are already in use. Please increase MAX CHANNEL (which is %d for now) and recompile GRAS\n.",
 	    MSG_host_get_name(MSG_host_self()),XBT_MAX_CHANNEL);
   }
-  pd->rawChan = i;
+  trp_pd->rawChan = i;
 
   hd->proc[ i ] = MSG_process_self_PID();
 
-  /* regiter it to the ports structure */
+  /* register it to the ports structure */
   prraw.port = -1;
   prraw.tochan = i;
   prraw.raw = 1;
@@ -78,17 +83,18 @@ gras_process_init() {
 xbt_error_t
 gras_process_exit() {
   gras_hostdata_t *hd=(gras_hostdata_t *)MSG_host_get_data(MSG_host_self());
-  gras_procdata_t *pd=gras_procdata_get();
+  gras_msg_procdata_t msg_pd=(gras_msg_procdata_t)gras_libdata_get("gras_msg");
+  gras_trp_procdata_t trp_pd=(gras_trp_procdata_t)gras_libdata_get("gras_trp");
   int myPID=MSG_process_self_PID();
   int cpt;
   gras_sg_portrec_t pr;
 
-  xbt_assert0(hd && pd,"Run gras_process_init!!");
+  xbt_assert0(hd,"Run gras_process_init (ie, gras_init)!!");
 
   INFO2("GRAS: Finalizing process '%s' (%d)",
 	MSG_process_get_name(MSG_process_self()),MSG_process_self_PID());
 
-  if (xbt_dynar_length(pd->msg_queue))
+  if (xbt_dynar_length(msg_pd->msg_queue))
     WARN1("process %d terminated, but some messages are still queued",
 	  MSG_process_self_PID());
 
@@ -97,7 +103,7 @@ gras_process_exit() {
       hd->proc[cpt] = 0;
 
   xbt_dynar_foreach(hd->ports, cpt, pr) {
-    if (pr.port == pd->chan || pr.port == pd->rawChan) {
+    if (pr.port == trp_pd->chan || pr.port == trp_pd->rawChan) {
       xbt_dynar_cursor_rm(hd->ports, &cpt);
     }
   }
@@ -113,8 +119,26 @@ gras_procdata_t *gras_procdata_get(void) {
   gras_procdata_t *pd=
     (gras_procdata_t *)MSG_process_get_data(MSG_process_self());
 
-  xbt_assert0(pd,"Run gras_process_init!");
+  xbt_assert0(pd,"Run gras_process_init! (ie, gras_init)");
 
   return pd;
 }
 
+const char* xbt_procname(void) {
+  const char *res = NULL;
+  m_process_t process = MSG_process_self();
+  if ((process != NULL) && (process->simdata))
+    res = MSG_process_get_name(process);
+  if (res) 
+    return res;
+  else
+    return "";
+}
+
+int gras_process_getpid(void) {
+  m_process_t process = MSG_process_self();
+  if ((process != NULL) && (process->simdata))
+    return MSG_process_get_PID(MSG_process_self());
+  else
+    return 0;
+}