some code allowing the upper JAVA layer (user interface) to pass some information...

[simgrid.git] / src / include / simix / simix.h

diff --git a/src/include/simix/simix.h b/src/include/simix/simix.h
index 5ba522b..ebb2c8e 100644 (file)
--- a/src/include/simix/simix.h
+++ b/src/include/simix/simix.h
@@ -12,6 +12,7 @@
 #include "xbt/misc.h"
 #include "xbt/fifo.h"
 #include "simix/datatypes.h"
+#include "surf/surf.h"
 
 SG_BEGIN_DECL()
 
@@ -19,7 +20,6 @@ SG_BEGIN_DECL()
 /************************** Global ******************************************/
 XBT_PUBLIC(void) SIMIX_config(const char *name, va_list pa);
 XBT_PUBLIC(void) SIMIX_global_init(int *argc, char **argv);
-XBT_PUBLIC(void) SIMIX_global_init_args(int *argc, char **argv);
 XBT_PUBLIC(void) SIMIX_clean(void);
 XBT_PUBLIC(void) SIMIX_function_register(const char *name, smx_process_code_t code);
 XBT_PUBLIC(smx_process_code_t) SIMIX_get_registered_function(const char *name);
@@ -68,11 +68,14 @@ XBT_PUBLIC(int) SIMIX_host_get_state(smx_host_t host);
 
 /************************** Process handling *********************************/
 XBT_PUBLIC(smx_process_t) SIMIX_process_create(const char *name,
-                              smx_process_code_t code, void *data,
-                              const char * hostname, void * clean_process_function);
-XBT_PUBLIC(smx_process_t) SIMIX_process_create_with_arguments(const char *name,
                                              smx_process_code_t code, void *data,
                                              const char * hostname, int argc, char **argv, void * clean_process_function);
+
+XBT_PUBLIC(smx_process_t) SIMIX_jprocess_create(const char *name, 
+                                               smx_host_t host,
+                                               void *data,
+                                               void *jprocess, void *jenv);
+
 XBT_PUBLIC(void) SIMIX_process_kill(smx_process_t process);
 XBT_PUBLIC(void) SIMIX_process_cleanup(void *arg);
 XBT_PUBLIC(void) SIMIX_process_killall(void);
@@ -107,6 +110,7 @@ XBT_PUBLIC(void) SIMIX_cond_wait_timeout(smx_cond_t cond,smx_mutex_t mutex, doub
 XBT_PUBLIC(void) SIMIX_cond_broadcast(smx_cond_t cond);
 XBT_PUBLIC(void) SIMIX_cond_destroy(smx_cond_t cond);
 XBT_PUBLIC(void) SIMIX_register_condition_to_action(smx_action_t action, smx_cond_t cond);
+XBT_PUBLIC(xbt_fifo_t) SIMIX_cond_get_actions(smx_cond_t cond);
 
 
 /************************** Action handling ************************************/
@@ -120,13 +124,26 @@ XBT_PUBLIC(void) SIMIX_action_destroy(smx_action_t action);
 XBT_PUBLIC(void) SIMIX_register_action_to_condition(smx_action_t action, smx_cond_t cond);
 XBT_PUBLIC(double) SIMIX_action_get_remains(smx_action_t action);
 
+XBT_PUBLIC(e_surf_action_state_t) SIMIX_action_get_state(smx_action_t action);
+
 /*Not implemented yet */
-XBT_PUBLIC(smx_action_t) SIMIX_action_parallel_execute(int workstation_nb,      
-                                                                                                                                                                                                                       void **workstation_list,
-                                                                                                                                                                                                                       double *computation_amount,
-                                                                                                                                                                                                                       double *communication_amount,
-                                                                                                                                                                                                                       double amount,
-                                                                                                                                                                                                                       double rate);
+XBT_PUBLIC(smx_action_t) SIMIX_action_parallel_execute(char * name, 
+                                                      int workstation_nb,      
+                                                      void **workstation_list,
+                                                      double *computation_amount,
+                                                      double *communication_amount,
+                                                      double amount,
+                                                      double rate);
+
+/* Helper functions for jMSG: manipulate the context data without breaking the module separation */
+void  SIMIX_process_set_jprocess(smx_process_t process, void *jp);
+void* SIMIX_process_get_jprocess(smx_process_t process);
+void  SIMIX_process_set_jmutex(smx_process_t process, void *jm);
+void* SIMIX_process_get_jmutex(smx_process_t process);
+void  SIMIX_process_set_jcond(smx_process_t process, void *jc);
+void* SIMIX_process_get_jcond(smx_process_t process);
+void  SIMIX_process_set_jenv(smx_process_t process, void *je);
+void* SIMIX_process_get_jenv(smx_process_t process);
 
 
 SG_END_DECL()