X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d80e7348ea40daf2c7447e23d959fb167cffeb36..6d17036094433f0304c29b6f57922cee32b0c67c:/src/include/simix/simix.h

diff --git a/src/include/simix/simix.h b/src/include/simix/simix.h
index 04a8816bd4..4fefabbe8c 100644
--- a/src/include/simix/simix.h
+++ b/src/include/simix/simix.h
@@ -11,7 +11,9 @@
 
 #include "xbt/misc.h"
 #include "xbt/fifo.h"
+#include "xbt/function_types.h"
 #include "simix/datatypes.h"
+#include "surf/surf.h"
 
 SG_BEGIN_DECL()
 
@@ -19,10 +21,9 @@ 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);
+XBT_PUBLIC(void) SIMIX_function_register(const char *name, xbt_main_func_t code);
+XBT_PUBLIC(xbt_main_func_t) SIMIX_get_registered_function(const char *name);
 
 XBT_PUBLIC(void) SIMIX_launch_application(const char *file);
 
@@ -35,6 +36,18 @@ XBT_PUBLIC(int) SIMIX_timer_get(void **function, void **arg);
 
 /* only for tests */
 XBT_PUBLIC(void) __SIMIX_main(void);
+
+/* User create and kill process, the function must accept the folling parameters:
+ * const char *name: a name for the object. It is for user-level information and can be NULL
+ * xbt_main_func_t code: is a function describing the behavior of the agent
+ * void *data: data a pointer to any data one may want to attach to the new object.
+ * smx_host_t host: the location where the new agent is executed
+ * int argc, char **argv: parameters passed to code
+ *
+ * */
+XBT_PUBLIC(void) SIMIX_function_register_process_create(void * function);
+XBT_PUBLIC(void) SIMIX_function_register_process_kill(void * function);
+
 /************************** Host handling ***********************************/
 
 XBT_PUBLIC(void) SIMIX_host_set_data(smx_host_t host, void *data);
@@ -56,12 +69,19 @@ 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,
-			       smx_host_t host);
-XBT_PUBLIC(smx_process_t) SIMIX_process_create_with_arguments(const char *name,
-					      smx_process_code_t code, void *data,
-					      smx_host_t host, int argc, char **argv);
+					       xbt_main_func_t code, void *data,
+					       const char * hostname, int argc, char **argv,
+					       void * clean_process_function);
+
+XBT_PUBLIC(void) SIMIX_jprocess_create(const char *name, 
+				       smx_host_t host,
+				       void *data,
+				       void *jprocess, void *jenv,
+				       void * clean_process_function,
+				       smx_process_t* res);
+
 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);
 
 //above layer
@@ -94,6 +114,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 ************************************/
@@ -105,14 +126,30 @@ XBT_PUBLIC(void) SIMIX_action_cancel(smx_action_t action);
 XBT_PUBLIC(void) SIMIX_action_set_priority(smx_action_t action, double priority);
 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);
+
+void SIMIX_display_process_status(void);
+
+/* 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()