Ansi C declaration of the variables (at the beginning of the blocks)

[simgrid.git] / src / simix / smx_process.c

diff --git a/src/simix/smx_process.c b/src/simix/smx_process.c
index f539ee8..548c9c6 100644 (file)
--- a/src/simix/smx_process.c
+++ b/src/simix/smx_process.c
@@ -8,6 +8,7 @@
 #include "private.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
+#include "xbt/dict.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_process, simix,
                                "Logging specific to SIMIX (process)");
@@ -54,7 +55,7 @@ void SIMIX_process_cleanup(void *arg)
 smx_process_t SIMIX_process_create(const char *name,
                                   xbt_main_func_t code, void *data,
                                   const char *hostname, int argc,
-                                  char **argv)
+                                  char **argv, xbt_dict_t properties)
 {
   smx_simdata_process_t simdata = xbt_new0(s_smx_simdata_process_t, 1);
   smx_process_t process = xbt_new0(s_smx_process_t, 1);
@@ -79,6 +80,9 @@ smx_process_t SIMIX_process_create(const char *name,
   process->simdata = simdata;
   process->data = data;
 
+  /* Add properties*/
+  simdata->properties = properties;
+
   xbt_swag_insert(process, host->simdata->process_list);
 
   /* fix current_process, about which xbt_context_start mocks around */
@@ -92,7 +96,6 @@ smx_process_t SIMIX_process_create(const char *name,
 
   return process;
 }
-
 /** 
  * \brief Creates and runs a new #smx_process_t hosting a JAVA thread
  *
@@ -132,23 +135,24 @@ void SIMIX_jprocess_create(const char *name, smx_host_t host,
   simdata->argc = 0;
   simdata->argv = NULL;
 
-  simdata->context = xbt_context_new(name,NULL, NULL, NULL,
+ 
+  simdata->context = xbt_context_new(name,NULL, NULL, jprocess,
                                     simix_global->
                                     cleanup_process_function, process,
                                     /* argc/argv */ 0, NULL);
-
+       
   /* Process structure */
   process->name = xbt_strdup(name);
   process->simdata = simdata;
   process->data = data;
-  SIMIX_process_set_jprocess(process, jprocess);
-  SIMIX_process_set_jenv(process, jenv);
 
   xbt_swag_insert(process, host->simdata->process_list);
 
   /* fix current_process, about which xbt_context_start mocks around */
   self = simix_global->current_process;
+ 
   xbt_context_start(process->simdata->context);
+ 
   simix_global->current_process = self;
 
   xbt_swag_insert(process, simix_global->process_list);
@@ -250,6 +254,16 @@ const char *SIMIX_process_get_name(smx_process_t process)
   return (process->name);
 }
 
+/** \ingroup m_process_management
+ * \brief Return the properties
+ *
+ * This functions returns the properties associated with this process
+ */
+xbt_dict_t SIMIX_process_get_properties(smx_process_t process)
+{
+  return process->simdata->properties;
+}
+
 /**
  * \brief Return the current agent.
  *
@@ -375,45 +389,3 @@ int SIMIX_process_is_suspended(smx_process_t process)
 }
 
 
-/* Helper functions for jMSG: manipulate the context data without breaking the module separation */
-#include "xbt/context.h"       /* to pass java objects from MSG to the context */
-
-void SIMIX_process_set_jprocess(smx_process_t process, void *jp)
-{
-  xbt_context_set_jprocess(process->simdata->context, jp);
-}
-
-void *SIMIX_process_get_jprocess(smx_process_t process)
-{
-  return xbt_context_get_jprocess(process->simdata->context);
-}
-
-void SIMIX_process_set_jmutex(smx_process_t process, void *jm)
-{
-  xbt_context_set_jmutex(process->simdata->context, jm);
-}
-
-void *SIMIX_process_get_jmutex(smx_process_t process)
-{
-  return xbt_context_get_jmutex(process->simdata->context);
-}
-
-void SIMIX_process_set_jcond(smx_process_t process, void *jc)
-{
-  xbt_context_set_jcond(process->simdata->context, jc);
-}
-
-void *SIMIX_process_get_jcond(smx_process_t process)
-{
-  return xbt_context_get_jcond(process->simdata->context);
-}
-
-void SIMIX_process_set_jenv(smx_process_t process, void *je)
-{
-  xbt_context_set_jenv(process->simdata->context, je);
-}
-
-void *SIMIX_process_get_jenv(smx_process_t process)
-{
-  return xbt_context_get_jenv(process->simdata->context);
-}