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

diff --git a/src/gras/Virtu/sg_process.c b/src/gras/Virtu/sg_process.c
index ce1c279b04..e84f1ab2d3 100644
--- a/src/gras/Virtu/sg_process.c
+++ b/src/gras/Virtu/sg_process.c
@@ -7,114 +7,241 @@
 /* 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 "xbt/ex.h"
+#include "xbt/dict.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 */
 
-XBT_LOG_EXTERNAL_CATEGORY(process);
-XBT_LOG_DEFAULT_CATEGORY(process);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(gras_virtu_process);
 
-xbt_error_t
+static long int PID = 1;
+
+
+void gras_agent_spawn(const char *name, void *data, 
+		      xbt_main_func_t code, int argc, char *argv[], xbt_dict_t properties) {
+   
+   SIMIX_process_create(name, code,
+			data,
+			gras_os_myname(), 
+			argc, argv, properties);
+}
+
+/* **************************************************************************
+ * Process constructor/destructor (semi-public interface)
+ * **************************************************************************/
+
+void
 gras_process_init() {
-  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=xbt_new(gras_procdata_t,1);
+  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;
+
+  SIMIX_process_set_data(SIMIX_process_self(),(void*)pd);
+
 
-  if (MSG_process_set_data(MSG_process_self(),(void*)pd) != MSG_OK)
-    return unknown_error;
   gras_procdata_init();
 
   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);
-
-    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;
+		SIMIX_host_set_data(SIMIX_host_self(),(void*)hd);
+  } else {
+    hd->refcount++;
   }
+
+  trp_pd = (gras_trp_procdata_t)gras_libdata_by_name("gras_trp");
+  pd->pid = PID++;
   
-  /* take a free channel for this process */
-  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()),XBT_MAX_CHANNEL);
-
-  pd->chan = i;
-  hd->proc[ i ] = MSG_process_self_PID();
-
-  /* regiter it to the ports structure */
-  pr.port = -1;
-  pr.tochan = i;
-  pr.raw = 0;
-  xbt_dynar_push(hd->ports,&pr);
-
-  /* take a free RAW channel for this process */
-  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()),XBT_MAX_CHANNEL);
+  if (SIMIX_process_self() != NULL ) {
+    pd->ppid = gras_os_getpid();
   }
-  pd->rawChan = i;
-
-  hd->proc[ i ] = MSG_process_self_PID();
-
-  /* regiter it to the ports structure */
-  prraw.port = -1;
-  prraw.tochan = i;
-  prraw.raw = 1;
-  xbt_dynar_push(hd->ports,&prraw);
-
+  else pd->ppid = -1; 
+  
+  trp_pd->msg_selectable_sockets = xbt_queue_new(0,sizeof(gras_socket_t));
+  
+  trp_pd->meas_selectable_sockets = xbt_queue_new(0,sizeof(gras_socket_t));
+  
   VERB2("Creating process '%s' (%d)",
-	   MSG_process_get_name(MSG_process_self()),
-	   MSG_process_self_PID());
-  return no_error;
+	SIMIX_process_get_name(SIMIX_process_self()),
+	gras_os_getpid());
 }
 
-xbt_error_t
+void
 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;
+	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());
 
-  xbt_assert0(hd && pd,"Run gras_process_init!!");
+  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");
 
-  INFO2("GRAS: Finalizing process '%s' (%d)",
-	MSG_process_get_name(MSG_process_self()),MSG_process_self_PID());
+  xbt_queue_free(&trp_pd->msg_selectable_sockets);
 
-  if (xbt_dynar_length(pd->msg_queue))
-    WARN1("process %d terminated, but some messages are still queued",
-	  MSG_process_self_PID());
+  xbt_queue_free(&trp_pd->meas_selectable_sockets);
 
-  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 == pd->chan || pr.port == pd->rawChan) {
-      xbt_dynar_cursor_rm(hd->ports, &cpt);
-    }
-  }
+  xbt_assert0(hd,"Run gras_process_init (ie, gras_init)!!");
+
+  VERB2("GRAS: Finalizing process '%s' (%d)",
+	SIMIX_process_get_name(SIMIX_process_self()),gras_os_getpid());
 
-  return no_error;
+  if (xbt_dynar_length(msg_pd->msg_queue))
+    WARN1("process %d 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);
+  }
+  gras_procdata_exit();
+  free(pd);
 }
 
 /* **************************************************************************
- * Process data
+ * Process data (public interface)
  * **************************************************************************/
 
 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!");
+  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);
+}   
+
+/** @brief retrieve the value of a given process property (or NULL if not defined) */
+const char* gras_process_property_value(char* name) {
+ return xbt_dict_get_or_null(SIMIX_process_get_properties(SIMIX_process_self()), name);
+}
+
+/** @brief retrieve the process properties dictionnary
+ *  @warning it's the original one, not a copy. Don't mess with it
+ */
+xbt_dict_t gras_process_properties(void)
+{
+  return SIMIX_process_get_properties(SIMIX_process_self());
+}
+
+/* **************************************************************************
+ * OS virtualization function
+ * **************************************************************************/
+
+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 "";
+}
+
+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;
+}
+
+
+/** @brief retrieve the value of a given host property (or NULL if not defined) */
+const char* gras_os_host_property_value(char* name) {
+ return xbt_dict_get_or_null(SIMIX_host_get_properties(SIMIX_process_get_host(SIMIX_process_self())), name);
+}
+
+/** @brief retrieve the host properties dictionnary
+ *  @warning it's the original one, not a copy. Don't mess with it
+ */
+xbt_dict_t gras_os_host_properties(void) {
+  return SIMIX_host_get_properties(SIMIX_process_get_host(SIMIX_process_self()));
+}
+
+/* **************************************************************************
+ * Interface with SIMIX
+ * **************************************************************************/
+
+void gras_global_init(int *argc,char **argv) {
+   SIMIX_global_init(argc,argv);
+}
+void gras_create_environment(const char *file) {
+   SIMIX_create_environment(file);
+}
+void gras_function_register(const char *name, xbt_main_func_t code) {
+   SIMIX_function_register(name, code);
+}
+
+void gras_main() {
+  smx_cond_t cond = NULL;
+  smx_action_t action;
+  xbt_fifo_t actions_done = xbt_fifo_new();
+  xbt_fifo_t actions_failed = xbt_fifo_new();
+   
+  /* Clean IO before the run */
+  fflush(stdout);
+  fflush(stderr);
+
+  while (SIMIX_solve(actions_done, actions_failed) != -1.0) {
+    while ( (action = xbt_fifo_pop(actions_failed)) ) {
+      DEBUG1("** %s failed **",action->name);
+      while ( (cond = xbt_fifo_pop(action->cond_list)) ) {
+	SIMIX_cond_broadcast(cond);
+      }
+      /* action finished, destroy it */
+      //	SIMIX_action_destroy(action);
+    }
+    
+    while ( (action = xbt_fifo_pop(actions_done)) ) {
+      DEBUG1("** %s done **",action->name);
+      while ( (cond = xbt_fifo_pop(action->cond_list)) ) {
+	SIMIX_cond_broadcast(cond);
+      }
+      /* action finished, destroy it */
+      //SIMIX_action_destroy(action);
+    }
+  }
+  xbt_fifo_free(actions_failed);
+  xbt_fifo_free(actions_done);
+  return;   
+}
+
+void gras_launch_application(const char *file) {
+   SIMIX_launch_application(file);
+}
+
+void gras_clean() {
+   SIMIX_clean();
+}
+