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

diff --git a/src/gras/Virtu/sg_process.c b/src/gras/Virtu/sg_process.c
index fad11a9d5e..017d860f09 100644
--- a/src/gras/Virtu/sg_process.c
+++ b/src/gras/Virtu/sg_process.c
@@ -2,100 +2,98 @@
 
 /* process_sg - GRAS process handling on simulator                          */
 
-/* Authors: Martin Quinson                                                  */
-/* Copyright (C) 2003,2004 da GRAS posse.                                   */
+/* Copyright (c) 2003, 2004 Martin Quinson. All rights reserved.            */
 
 /* 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. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "Virtu/virtu_sg.h"
+#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 */
 
-GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(process,GRAS);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(gras_virtu_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;
-  int i;
-  
-  if (!(pd=(gras_procdata_t *)malloc(sizeof(gras_procdata_t)))) 
-    RAISE_MALLOC;
+static long int PID = 1;
 
-  if (MSG_process_set_data(MSG_process_self(),(void*)pd) != MSG_OK) {
-    return unknown_error;
-  }
-  TRY(gras_procdata_init());
+void
+gras_process_init() {
+  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;
 
-  if (!hd) {
-    if (!(hd=(gras_hostdata_t *)malloc(sizeof(gras_hostdata_t)))) 
-      RAISE_MALLOC;
+  SIMIX_process_set_data(SIMIX_process_self(),(void*)pd);
 
-    TRY(gras_dynar_new(&(hd->ports),sizeof(gras_sg_portrec_t),NULL));
 
-    memset(hd->proc, 0, sizeof(hd->proc[0]) * GRAS_MAX_CHANNEL); 
+  gras_procdata_init();
 
-    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) 
-    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);
-
-  pd->chan = i;
-  pd->sock = NULL;
-  hd->proc[ i ] = MSG_process_self_PID();
-
-  /* take a free RAW channel for this process */
-  for (i=0; i<GRAS_MAX_CHANNEL && hd->proc[i]; i++);
-  if (i == GRAS_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);
+  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);
+		SIMIX_host_set_data(SIMIX_host_self(),(void*)hd);
+  } else {
+    hd->refcount++;
   }
-  pd->rawChan = i;
-  pd->rawSock = NULL;
-  hd->proc[ i ] = MSG_process_self_PID();
-
-  VERB2("Creating process '%s' (%d)",
-	   MSG_process_get_name(MSG_process_self()),
-	   MSG_process_self_PID());
-  return no_error;
-}
-
-gras_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();
-  int myPID=MSG_process_self_PID();
-  int cpt;
-  gras_sg_portrec_t pr;
 
-  gras_assert0(hd && pd,"Run gras_process_init!!\n");
+	trp_pd = (gras_trp_procdata_t)gras_libdata_by_name("gras_trp");
+	pd->pid = PID++;
 
-  INFO2("GRAS: Finalizing process '%s' (%d)",
-	MSG_process_get_name(MSG_process_self()),MSG_process_self_PID());
+	if (SIMIX_process_self() != NULL ) {
+		pd->ppid = gras_os_getpid();
+	}
+	else pd->ppid = -1; 
 
-  if (gras_dynar_length(pd->msg_queue))
-    WARN1("process %d terminated, but some messages are still queued",
-	  MSG_process_self_PID());
+	trp_pd->mutex = SIMIX_mutex_init();
+	trp_pd->cond = SIMIX_cond_init();
+	trp_pd->active_socket = xbt_fifo_new();
 
-  for (cpt=0; cpt< GRAS_MAX_CHANNEL; cpt++)
-    if (myPID == hd->proc[cpt])
-      hd->proc[cpt] = 0;
+  VERB2("Creating process '%s' (%ld)",
+	   SIMIX_process_get_name(SIMIX_process_self()),
+	   gras_os_getpid());
+}
 
-  gras_dynar_foreach(hd->ports, cpt, pr) {
-    if (pr.port == pd->chan || pr.port == pd->rawChan) {
-      gras_dynar_cursor_rm(hd->ports, &cpt);
-    }
+void
+gras_process_exit() {
+	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");
+
+	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' (%ld)",
+	SIMIX_process_get_name(SIMIX_process_self()),gras_os_getpid());
+
+  if (xbt_dynar_length(msg_pd->msg_queue))
+    WARN1("process %ld terminated, but some messages are still queued",
+	  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);
   }
-
-  return no_error;
+  gras_procdata_exit();
+  free(pd);
 }
 
 /* **************************************************************************
@@ -104,10 +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());
 
-  gras_assert0(pd,"Run gras_process_init!");
+  xbt_assert0(pd,"Run gras_process_init! (ie, gras_init)");
 
   return pd;
 }
+void *
+gras_libdata_by_name_from_remote(const char *name, smx_process_t p) {
+  gras_procdata_t *pd=
+    (gras_procdata_t *)SIMIX_process_get_data(p);
+
+  xbt_assert2(pd,"process '%s' on '%s' didn't run gras_process_init! (ie, gras_init)", 
+	      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;
+  smx_process_t process = SIMIX_process_self();
+  if ((process != NULL) && (process->simdata))
+    res = SIMIX_process_get_name(process);
+  if (res) 
+    return res;
+  else
+    return "";
+}
 
+long 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 0;
+}