X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/42899c56484678345296504a65de123846148658..037955e458fb05c8ad1a1bdc3509bac0664f87a2:/src/gras/Virtu/sg_process.c

diff --git a/src/gras/Virtu/sg_process.c b/src/gras/Virtu/sg_process.c
index ea013670d4..ff44d661e5 100644
--- a/src/gras/Virtu/sg_process.c
+++ b/src/gras/Virtu/sg_process.c
@@ -15,19 +15,17 @@
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(gras_virtu_process);
 
-
+static long int PID = 1;
 
 void
 gras_process_init() {
-  gras_hostdata_t *hd=(gras_hostdata_t *)MSG_host_get_data(MSG_host_self());
+  gras_hostdata_t *hd=(gras_hostdata_t *)SIMIX_host_get_data(SIMIX_host_self());
   gras_procdata_t *pd=xbt_new0(gras_procdata_t,1);
   gras_trp_procdata_t trp_pd;
-  gras_sg_portrec_t prmeas,pr;
-  int i;
-  
-  if (MSG_process_set_data(MSG_process_self(),(void*)pd) != MSG_OK)
-    THROW0(system_error,0,"Error in MSG_process_set_data()");
-   
+
+  SIMIX_process_set_data(SIMIX_process_self(),(void*)pd);
+
+
   gras_procdata_init();
 
   if (!hd) {
@@ -35,84 +33,61 @@ gras_process_init() {
     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)
-      THROW0(system_error,0,"Error in MSG_host_set_data()");
+		SIMIX_host_set_data(SIMIX_host_self(),(void*)hd);
   } else {
     hd->refcount++;
   }
-  
-  /* take a free channel for this process */
-  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) 
-    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;
-  hd->proc[ i ] = MSG_process_self_PID();
-
-  /* regiter it to the ports structure */
-  pr.port = -1;
-  pr.tochan = i;
-  pr.meas = 0;
-  xbt_dynar_push(hd->ports,&pr);
-
-  /* take a free meas channel for this process */
-  for (i=0; i<XBT_MAX_CHANNEL && hd->proc[i]; i++);
-  if (i == XBT_MAX_CHANNEL) {
-    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->measChan = i;
 
-  hd->proc[ i ] = MSG_process_self_PID();
+	trp_pd = (gras_trp_procdata_t)gras_libdata_by_name("gras_trp");
+	pd->pid = PID++;
+
+	if (SIMIX_process_self() != NULL ) {
+		pd->ppid = gras_os_getpid();
+	}
+	else pd->ppid = -1; 
 
-  /* register it to the ports structure */
-  prmeas.port = -1;
-  prmeas.tochan = i;
-  prmeas.meas = 1;
-  xbt_dynar_push(hd->ports,&prmeas);
+	trp_pd->mutex = SIMIX_mutex_init();
+	trp_pd->cond = SIMIX_cond_init();
+	trp_pd->active_socket = xbt_fifo_new();
 
   VERB2("Creating process '%s' (%d)",
-	   MSG_process_get_name(MSG_process_self()),
-	   MSG_process_self_PID());
+	   SIMIX_process_get_name(SIMIX_process_self()),
+	   gras_os_getpid());
 }
 
 void
 gras_process_exit() {
-  gras_hostdata_t *hd=(gras_hostdata_t *)MSG_host_get_data(MSG_host_self());
-  gras_procdata_t *pd=(gras_procdata_t*)MSG_process_get_data(MSG_process_self());
+	xbt_dynar_t sockets = ((gras_trp_procdata_t) gras_libdata_by_name("gras_trp"))->sockets;
+  gras_socket_t sock_iter;
+  int cursor;
+  gras_hostdata_t *hd=(gras_hostdata_t *)SIMIX_host_get_data(SIMIX_host_self());
+  gras_procdata_t *pd=(gras_procdata_t*)SIMIX_process_get_data(SIMIX_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;
+
+	SIMIX_mutex_destroy(trp_pd->mutex);
+	SIMIX_cond_destroy(trp_pd->cond);
+	xbt_fifo_free(trp_pd->active_socket);
+  //int myPID=gras_os_getpid();
+  //int cpt;
+  //gras_sg_portrec_t pr;
 
   xbt_assert0(hd,"Run gras_process_init (ie, gras_init)!!");
 
   VERB2("GRAS: Finalizing process '%s' (%d)",
-	MSG_process_get_name(MSG_process_self()),MSG_process_self_PID());
+	SIMIX_process_get_name(SIMIX_process_self()),gras_os_getpid());
 
   if (xbt_dynar_length(msg_pd->msg_queue))
     WARN1("process %d terminated, but some messages are still queued",
-	  MSG_process_self_PID());
-
-  for (cpt=0; cpt< XBT_MAX_CHANNEL; cpt++)
-    if (myPID == hd->proc[cpt])
-      hd->proc[cpt] = 0;
-
-  xbt_dynar_foreach(hd->ports, cpt, pr) {
-    if (pr.port == trp_pd->chan || pr.port == trp_pd->measChan) {
-      xbt_dynar_cursor_rm(hd->ports, &cpt);
-    }
-  }
-
+	  gras_os_getpid());
+
+	/* if each process has its sockets list, we need to close them when the process finish */
+	xbt_dynar_foreach(sockets,cursor,sock_iter) {
+		VERB1("Closing the socket %p left open on exit. Maybe a socket leak?",
+				sock_iter);
+		gras_socket_close(sock_iter);
+	}
   if ( ! --(hd->refcount)) {
     xbt_dynar_free(&hd->ports);
     free(hd);
@@ -127,38 +102,40 @@ gras_process_exit() {
 
 gras_procdata_t *gras_procdata_get(void) {
   gras_procdata_t *pd=
-    (gras_procdata_t *)MSG_process_get_data(MSG_process_self());
+    (gras_procdata_t *)SIMIX_process_get_data(SIMIX_process_self());
 
   xbt_assert0(pd,"Run gras_process_init! (ie, gras_init)");
 
   return pd;
 }
 void *
-gras_libdata_by_name_from_remote(const char *name, m_process_t p) {
+gras_libdata_by_name_from_remote(const char *name, smx_process_t p) {
   gras_procdata_t *pd=
-    (gras_procdata_t *)MSG_process_get_data(p);
+    (gras_procdata_t *)SIMIX_process_get_data(p);
 
   xbt_assert2(pd,"process '%s' on '%s' didn't run gras_process_init! (ie, gras_init)", 
-	      MSG_process_get_name(p),MSG_host_get_name(MSG_process_get_host(p)));
+	      SIMIX_process_get_name(p),SIMIX_host_get_name(SIMIX_process_get_host(p)));
    
   return gras_libdata_by_name_from_procdata(name, pd);
 }   
   
 const char* xbt_procname(void) {
   const char *res = NULL;
-  m_process_t process = MSG_process_self();
+  smx_process_t process = SIMIX_process_self();
   if ((process != NULL) && (process->simdata))
-    res = MSG_process_get_name(process);
+    res = SIMIX_process_get_name(process);
   if (res) 
     return res;
   else
     return "";
 }
 
-long int gras_os_getpid(void) {
-  m_process_t process = MSG_process_self();
-  if ((process != NULL) && (process->simdata))
-    return (long int)MSG_process_get_PID(MSG_process_self());
+int gras_os_getpid(void) {
+
+  smx_process_t process = SIMIX_process_self();
+	
+  if ((process != NULL) && (process->data))
+		return ((gras_procdata_t*)process->data)->pid;
   else
-    return (long int)0;
+    return 0;
 }