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

diff --git a/src/gras/Virtu/sg_process.c b/src/gras/Virtu/sg_process.c
index 32066c81a1..cb89350825 100644
--- a/src/gras/Virtu/sg_process.c
+++ b/src/gras/Virtu/sg_process.c
@@ -10,39 +10,39 @@
 
 #include "gras/Virtu/virtu_sg.h"
 
-GRAS_LOG_EXTERNAL_CATEGORY(process);
-GRAS_LOG_DEFAULT_CATEGORY(process);
+XBT_LOG_EXTERNAL_CATEGORY(process);
+XBT_LOG_DEFAULT_CATEGORY(process);
 
-gras_error_t
+xbt_error_t
 gras_process_init() {
-  gras_error_t errcode;
+  xbt_error_t errcode;
   gras_hostdata_t *hd=(gras_hostdata_t *)MSG_host_get_data(MSG_host_self());
   gras_procdata_t *pd;
   gras_sg_portrec_t prraw,pr;
   int i;
   
-  pd=gras_new(gras_procdata_t,1);
+  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) {
-    hd=gras_new(gras_hostdata_t,1);
-    hd->ports = gras_dynar_new(sizeof(gras_sg_portrec_t),NULL);
+    hd=xbt_new(gras_hostdata_t,1);
+    hd->ports = xbt_dynar_new(sizeof(gras_sg_portrec_t),NULL);
 
-    memset(hd->proc, 0, sizeof(hd->proc[0]) * GRAS_MAX_CHANNEL); 
+    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;
   }
   
   /* take a free channel for this process */
-  for (i=0; i<GRAS_MAX_CHANNEL && hd->proc[i]; i++);
-  if (i == GRAS_MAX_CHANNEL) 
+  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()),GRAS_MAX_CHANNEL);
+	    MSG_host_get_name(MSG_host_self()),XBT_MAX_CHANNEL);
 
   pd->chan = i;
   hd->proc[ i ] = MSG_process_self_PID();
@@ -51,14 +51,14 @@ gras_process_init() {
   pr.port = -1;
   pr.tochan = i;
   pr.raw = 0;
-  gras_dynar_push(hd->ports,&pr);
+  xbt_dynar_push(hd->ports,&pr);
 
   /* take a free RAW channel for this process */
-  for (i=0; i<GRAS_MAX_CHANNEL && hd->proc[i]; i++);
-  if (i == GRAS_MAX_CHANNEL) {
+  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()),GRAS_MAX_CHANNEL);
+	    MSG_host_get_name(MSG_host_self()),XBT_MAX_CHANNEL);
   }
   pd->rawChan = i;
 
@@ -68,7 +68,7 @@ gras_process_init() {
   prraw.port = -1;
   prraw.tochan = i;
   prraw.raw = 1;
-  gras_dynar_push(hd->ports,&prraw);
+  xbt_dynar_push(hd->ports,&prraw);
 
   VERB2("Creating process '%s' (%d)",
 	   MSG_process_get_name(MSG_process_self()),
@@ -76,7 +76,7 @@ gras_process_init() {
   return no_error;
 }
 
-gras_error_t
+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();
@@ -84,22 +84,22 @@ gras_process_exit() {
   int cpt;
   gras_sg_portrec_t pr;
 
-  gras_assert0(hd && pd,"Run gras_process_init!!");
+  xbt_assert0(hd && pd,"Run gras_process_init!!");
 
   INFO2("GRAS: Finalizing process '%s' (%d)",
 	MSG_process_get_name(MSG_process_self()),MSG_process_self_PID());
 
-  if (gras_dynar_length(pd->msg_queue))
+  if (xbt_dynar_length(pd->msg_queue))
     WARN1("process %d terminated, but some messages are still queued",
 	  MSG_process_self_PID());
 
-  for (cpt=0; cpt< GRAS_MAX_CHANNEL; cpt++)
+  for (cpt=0; cpt< XBT_MAX_CHANNEL; cpt++)
     if (myPID == hd->proc[cpt])
       hd->proc[cpt] = 0;
 
-  gras_dynar_foreach(hd->ports, cpt, pr) {
+  xbt_dynar_foreach(hd->ports, cpt, pr) {
     if (pr.port == pd->chan || pr.port == pd->rawChan) {
-      gras_dynar_cursor_rm(hd->ports, &cpt);
+      xbt_dynar_cursor_rm(hd->ports, &cpt);
     }
   }
 
@@ -114,7 +114,7 @@ gras_procdata_t *gras_procdata_get(void) {
   gras_procdata_t *pd=
     (gras_procdata_t *)MSG_process_get_data(MSG_process_self());
 
-  gras_assert0(pd,"Run gras_process_init!");
+  xbt_assert0(pd,"Run gras_process_init!");
 
   return pd;
 }