Various cleanups; SG almost work

[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 243093b..fad11a9 100644 (file)
--- a/src/gras/Virtu/sg_process.c
+++ b/src/gras/Virtu/sg_process.c
@@ -14,36 +14,26 @@ GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(process,GRAS);
 
 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_process_data_t *pd;
+  gras_procdata_t *pd;
   int i;
   
-  if (!(pd=(gras_process_data_t *)malloc(sizeof(gras_process_data_t)))) 
+  if (!(pd=(gras_procdata_t *)malloc(sizeof(gras_procdata_t)))) 
     RAISE_MALLOC;
 
-  WARNING0("Implement msg queue");
-  /*
-  pd->grasMsgQueueLen=0;
-  pd->grasMsgQueue = NULL;
-
-  pd->grasCblListLen = 0;
-  pd->grasCblList = NULL;
-  */
-
   if (MSG_process_set_data(MSG_process_self(),(void*)pd) != MSG_OK) {
     return unknown_error;
   }
+  TRY(gras_procdata_init());
 
   if (!hd) {
     if (!(hd=(gras_hostdata_t *)malloc(sizeof(gras_hostdata_t)))) 
       RAISE_MALLOC;
 
-    hd->portLen = 0;
-    hd->port=NULL;
-    hd->port2chan=NULL;
-    for (i=0; i<GRAS_MAX_CHANNEL; i++) {
-      hd->proc[i]=0;
-    }
+    TRY(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) {
       return unknown_error;
@@ -58,6 +48,7 @@ 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();
 
   /* take a free RAW channel for this process */
@@ -68,6 +59,7 @@ 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();
 
   VERB2("Creating process '%s' (%d)",
@@ -79,32 +71,27 @@ gras_process_init() {
 gras_error_t
 gras_process_exit() {
   gras_hostdata_t *hd=(gras_hostdata_t *)MSG_host_get_data(MSG_host_self());
-  gras_process_data_t *pd=(gras_process_data_t *)MSG_process_get_data(MSG_process_self());
+  gras_procdata_t *pd=gras_procdata_get();
   int myPID=MSG_process_self_PID();
-  int i;
+  int cpt;
+  gras_sg_portrec_t pr;
 
   gras_assert0(hd && pd,"Run gras_process_init!!\n");
 
   INFO2("GRAS: Finalizing process '%s' (%d)",
        MSG_process_get_name(MSG_process_self()),MSG_process_self_PID());
 
-  WARNING0("Implement msg queue");
-  /*
-  if (pd->grasMsgQueueLen) {
-    fprintf(stderr,"GRAS: Warning: process %d terminated, but some queued messages where not handled\n",MSG_process_self_PID());
-  }
-  */
-
-  for (i=0; i< GRAS_MAX_CHANNEL; i++)
-    if (myPID == hd->proc[i])
-      hd->proc[i] = 0;
-
-  for (i=0; i<hd->portLen; i++) {
-    if (hd->port2chan[ i ] == pd->chan) {
-      memmove(&(hd->port[i]),      &(hd->port[i+1]),      (hd->portLen -i -1) * sizeof(int));
-      memmove(&(hd->port2chan[i]), &(hd->port2chan[i+1]), (hd->portLen -i -1) * sizeof(int));
-      hd->portLen--;
-      i--; /* counter the effect of the i++ at the end of the iteration */
+  if (gras_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++)
+    if (myPID == hd->proc[cpt])
+      hd->proc[cpt] = 0;
+
+  gras_dynar_foreach(hd->ports, cpt, pr) {
+    if (pr.port == pd->chan || pr.port == pd->rawChan) {
+      gras_dynar_cursor_rm(hd->ports, &cpt);
     }
   }
 
@@ -115,20 +102,12 @@ gras_process_exit() {
  * Process data
  * **************************************************************************/
 
-void *gras_userdata_get(void) {
-  gras_process_data_t *pd=(gras_process_data_t *)MSG_process_get_data(MSG_process_self());
+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!");
 
-  return pd->userdata;
+  return pd;
 }
 
-void *gras_userdata_set(void *ud) {
-  gras_process_data_t *pd=(gras_process_data_t *)MSG_process_get_data(MSG_process_self());
-
-  gras_assert0(pd,"Run gras_process_init!");
-
-  pd->userdata = ud;
-
-  return pd->userdata;
-}