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

diff --git a/src/gras/Virtu/sg_process.c b/src/gras/Virtu/sg_process.c
index 4f78a4932d..e736fa33bd 100644
--- a/src/gras/Virtu/sg_process.c
+++ b/src/gras/Virtu/sg_process.c
@@ -7,45 +7,47 @@
 /* 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 "xbt/ex.h"
 #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);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(gras_virtu_process);
 
-xbt_error_t
+void
 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=xbt_new(gras_procdata_t,1);
   gras_trp_procdata_t trp_pd;
-  gras_sg_portrec_t prraw,pr;
+  gras_sg_portrec_t prmeas,pr;
   int i;
   
   if (MSG_process_set_data(MSG_process_self(),(void*)pd) != MSG_OK)
-    return unknown_error;
+    THROW0(system_error,0,"Error in MSG_process_set_data()");
    
   gras_procdata_init();
 
   if (!hd) {
     /* First process on this host */
     hd=xbt_new(gras_hostdata_t,1);
+    hd->refcount = 1;
     hd->ports = xbt_dynar_new(sizeof(gras_sg_portrec_t),NULL);
 
     memset(hd->proc, 0, sizeof(hd->proc[0]) * XBT_MAX_CHANNEL); 
 
     if (MSG_host_set_data(MSG_host_self(),(void*)hd) != MSG_OK)
-      return unknown_error;
+      THROW0(system_error,0,"Error in MSG_host_set_data()");
+  } else {
+    hd->refcount++;
   }
   
   /* take a free channel for this process */
-  trp_pd = (gras_trp_procdata_t)gras_libdata_get("gras_trp");
+  trp_pd = (gras_trp_procdata_t)gras_libdata_by_name("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.",
+    THROW2(system_error,0,
+	   "Can't add a new process on %s, because all channels are already in use. Please increase MAX CHANNEL (which is %d for now) and recompile GRAS.",
 	    MSG_host_get_name(MSG_host_self()),XBT_MAX_CHANNEL);
 
   trp_pd->chan = i;
@@ -54,44 +56,45 @@ gras_process_init() {
   /* regiter it to the ports structure */
   pr.port = -1;
   pr.tochan = i;
-  pr.raw = 0;
+  pr.meas = 0;
   xbt_dynar_push(hd->ports,&pr);
 
-  /* take a free RAW channel for this process */
+  /* take a free meas channel for this process */
   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.",
+    THROW2(system_error,0,
+	   "Can't add a new process on %s, because all channels are already in use. Please increase MAX CHANNEL (which is %d for now) and recompile GRAS.",
 	    MSG_host_get_name(MSG_host_self()),XBT_MAX_CHANNEL);
   }
-  trp_pd->rawChan = i;
+  trp_pd->measChan = i;
 
   hd->proc[ i ] = MSG_process_self_PID();
 
   /* register it to the ports structure */
-  prraw.port = -1;
-  prraw.tochan = i;
-  prraw.raw = 1;
-  xbt_dynar_push(hd->ports,&prraw);
+  prmeas.port = -1;
+  prmeas.tochan = i;
+  prmeas.meas = 1;
+  xbt_dynar_push(hd->ports,&prmeas);
 
   VERB2("Creating process '%s' (%d)",
 	   MSG_process_get_name(MSG_process_self()),
 	   MSG_process_self_PID());
-  return no_error;
 }
 
-xbt_error_t
+void
 gras_process_exit() {
   gras_hostdata_t *hd=(gras_hostdata_t *)MSG_host_get_data(MSG_host_self());
-  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");
+  gras_procdata_t *pd=(gras_procdata_t*)MSG_process_get_data(MSG_process_self());
+
+  gras_msg_procdata_t msg_pd=(gras_msg_procdata_t)gras_libdata_by_name("gras_msg");
+  gras_trp_procdata_t trp_pd=(gras_trp_procdata_t)gras_libdata_by_name("gras_trp");
   int myPID=MSG_process_self_PID();
   int cpt;
   gras_sg_portrec_t pr;
 
   xbt_assert0(hd,"Run gras_process_init (ie, gras_init)!!");
 
-  INFO2("GRAS: Finalizing process '%s' (%d)",
+  VERB2("GRAS: Finalizing process '%s' (%d)",
 	MSG_process_get_name(MSG_process_self()),MSG_process_self_PID());
 
   if (xbt_dynar_length(msg_pd->msg_queue))
@@ -103,12 +106,17 @@ gras_process_exit() {
       hd->proc[cpt] = 0;
 
   xbt_dynar_foreach(hd->ports, cpt, pr) {
-    if (pr.port == trp_pd->chan || pr.port == trp_pd->rawChan) {
+    if (pr.port == trp_pd->chan || pr.port == trp_pd->measChan) {
       xbt_dynar_cursor_rm(hd->ports, &cpt);
     }
   }
 
-  return no_error;
+  if ( ! --(hd->refcount)) {
+    xbt_dynar_free(&hd->ports);
+    free(hd);
+  }
+  gras_procdata_exit();
+  free(pd);
 }
 
 /* **************************************************************************
@@ -135,10 +143,10 @@ const char* xbt_procname(void) {
     return "";
 }
 
-int gras_process_getpid(void) {
+long int gras_os_getpid(void) {
   m_process_t process = MSG_process_self();
   if ((process != NULL) && (process->simdata))
-    return MSG_process_get_PID(MSG_process_self());
+    return (long int)MSG_process_get_PID(MSG_process_self());
   else
-    return 0;
+    return (long int)0;
 }