Interface revolution: do not try to survive to malloc failure

[simgrid.git] / src / gras / Virtu / sg_process.c

diff --git a/src/gras/Virtu/sg_process.c b/src/gras/Virtu/sg_process.c
index fad11a9..ea7627c 100644 (file)
--- a/src/gras/Virtu/sg_process.c
+++ b/src/gras/Virtu/sg_process.c
@@ -8,36 +8,33 @@
 /* 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 "Virtu/virtu_sg.h"
+#include "gras/Virtu/virtu_sg.h"
 
-GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(process,GRAS);
+GRAS_LOG_EXTERNAL_CATEGORY(process);
+GRAS_LOG_DEFAULT_CATEGORY(process);
 
 gras_error_t
 gras_process_init() {
   gras_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;
   
-  if (!(pd=(gras_procdata_t *)malloc(sizeof(gras_procdata_t)))) 
-    RAISE_MALLOC;
+  pd=gras_new(gras_procdata_t,1);
 
-  if (MSG_process_set_data(MSG_process_self(),(void*)pd) != MSG_OK) {
+  if (MSG_process_set_data(MSG_process_self(),(void*)pd) != MSG_OK)
     return unknown_error;
-  }
-  TRY(gras_procdata_init());
+  gras_procdata_init();
 
   if (!hd) {
-    if (!(hd=(gras_hostdata_t *)malloc(sizeof(gras_hostdata_t)))) 
-      RAISE_MALLOC;
-
-    TRY(gras_dynar_new(&(hd->ports),sizeof(gras_sg_portrec_t),NULL));
+    hd=gras_new(gras_hostdata_t,1);
+    gras_dynar_new(&(hd->ports),sizeof(gras_sg_portrec_t),NULL);
 
     memset(hd->proc, 0, sizeof(hd->proc[0]) * GRAS_MAX_CHANNEL); 
 
-    if (MSG_host_set_data(MSG_host_self(),(void*)hd) != MSG_OK) {
+    if (MSG_host_set_data(MSG_host_self(),(void*)hd) != MSG_OK)
       return unknown_error;
-    }
   }
   
   /* take a free channel for this process */
@@ -48,9 +45,14 @@ gras_process_init() {
            MSG_host_get_name(MSG_host_self()),GRAS_MAX_CHANNEL);
 
   pd->chan = i;
-  pd->sock = NULL;
   hd->proc[ i ] = MSG_process_self_PID();
 
+  /* regiter it to the ports structure */
+  pr.port = -1;
+  pr.tochan = i;
+  pr.raw = 0;
+  gras_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) {
@@ -59,9 +61,15 @@ gras_process_init() {
            MSG_host_get_name(MSG_host_self()),GRAS_MAX_CHANNEL);
   }
   pd->rawChan = i;
-  pd->rawSock = NULL;
+
   hd->proc[ i ] = MSG_process_self_PID();
 
+  /* regiter it to the ports structure */
+  prraw.port = -1;
+  prraw.tochan = i;
+  prraw.raw = 1;
+  gras_dynar_push(hd->ports,&prraw);
+
   VERB2("Creating process '%s' (%d)",
           MSG_process_get_name(MSG_process_self()),
           MSG_process_self_PID());
@@ -76,7 +84,7 @@ gras_process_exit() {
   int cpt;
   gras_sg_portrec_t pr;
 
-  gras_assert0(hd && pd,"Run gras_process_init!!\n");
+  gras_assert0(hd && pd,"Run gras_process_init!!");
 
   INFO2("GRAS: Finalizing process '%s' (%d)",
        MSG_process_get_name(MSG_process_self()),MSG_process_self_PID());