Remove a crude hack where first call to surf_solve() finalize the initialization...

[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 3a21273..392d11e 100644 (file)
--- a/src/gras/Virtu/sg_process.c
+++ b/src/gras/Virtu/sg_process.c
@@ -8,6 +8,7 @@
  * 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 */
@@ -19,12 +20,12 @@ static long int PID = 1;
 
 
 void gras_agent_spawn(const char *name, void *data, 
-                     xbt_main_func_t code, int argc, char *argv[]) {
+                     xbt_main_func_t code, int argc, char *argv[], xbt_dict_t properties) {
    
    SIMIX_process_create(name, code,
                        data,
                        gras_os_myname(), 
-                       argc, argv);
+                       argc, argv, properties);
 }
 
 /* **************************************************************************
@@ -73,7 +74,7 @@ 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;
+  unsigned int cursor;
   gras_hostdata_t *hd=
     (gras_hostdata_t *)SIMIX_host_get_data(SIMIX_host_self());
   gras_procdata_t *pd=
@@ -136,6 +137,19 @@ gras_libdata_by_name_from_remote(const char *name, smx_process_t 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(const 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
  * **************************************************************************/
@@ -161,18 +175,37 @@ int gras_os_getpid(void) {
     return 0;
 }
 
+
+/** @brief retrieve the value of a given host property (or NULL if not defined) */
+const char* gras_os_host_property_value(const 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
+ * (these functions are called by the stuff generated by gras_stub_generator)
  * **************************************************************************/
 
+XBT_LOG_EXTERNAL_CATEGORY(gras_trp);
+XBT_LOG_EXTERNAL_CATEGORY(gras_trp_sg);
+
 void gras_global_init(int *argc,char **argv) {
-   return SIMIX_global_init(argc,argv);
+  XBT_LOG_CONNECT(gras_trp_sg, gras_trp);
+  SIMIX_global_init(argc,argv);
 }
+
 void gras_create_environment(const char *file) {
-   return SIMIX_create_environment(file);
+  SIMIX_create_environment(file);
 }
 void gras_function_register(const char *name, xbt_main_func_t code) {
-   return SIMIX_function_register(name, code);
+  SIMIX_function_register(name, code);
 }
 
 void gras_main() {
@@ -184,6 +217,7 @@ void gras_main() {
   /* Clean IO before the run */
   fflush(stdout);
   fflush(stderr);
+  SIMIX_init();
 
   while (SIMIX_solve(actions_done, actions_failed) != -1.0) {
     while ( (action = xbt_fifo_pop(actions_failed)) ) {
@@ -210,11 +244,11 @@ void gras_main() {
 }
 
 void gras_launch_application(const char *file) {
-   return SIMIX_launch_application(file);
+   SIMIX_launch_application(file);
 }
 
 void gras_clean() {
-   return SIMIX_clean();
+   SIMIX_clean();
 }