X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b9bd3bea7e7a0ad74c2e978c2e8fcb21b370862c..e54471e47acaaa087f58c62c3ec142e911e30d40:/include/simgrid/simix.h
diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h
index 77aeb08b08..bc07ffe3ee 100644
--- a/include/simgrid/simix.h
+++ b/include/simgrid/simix.h
@@ -21,16 +21,28 @@
namespace simgrid {
namespace simix {
+
+ /** @brief Process datatype
+ @ingroup simix_process_management
+
+ A process may be defined as a code, with some private
+ data, executing in a location.
+ \see m_process_management
+ @{ */
+ class Process;
class Context;
class ContextFactory;
+
}
}
typedef simgrid::simix::Context *smx_context_t;
+typedef simgrid::simix::Process *smx_process_t;
#else
typedef struct s_smx_context *smx_context_t;
+typedef struct s_smx_process *smx_process_t;
#endif
@@ -92,45 +104,13 @@ typedef xbt_dictelm_t smx_storage_t;
typedef struct s_smx_storage_priv *smx_storage_priv_t;
/* ****************************** Process *********************************** */
-/** @brief Process datatype
- @ingroup simix_process_management
- A process may be defined as a code, with some private
- data, executing in a location.
- \see m_process_management
- @{ */
-typedef struct s_smx_process *smx_process_t;
typedef enum {
SMX_EXIT_SUCCESS = 0,
SMX_EXIT_FAILURE = 1
} smx_process_exit_status_t;
/** @} */
-
-/*
- * Type of function that creates a process.
- * The function must accept the following parameters:
- * void* process: the process created will be stored there
- * 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 process
- * void *data: data a pointer to any data one may want to attach to the new object.
- * sg_host_t host: the location where the new process is executed
- * int argc, char **argv: parameters passed to code
- * xbt_dict_t pros: properties
- */
-typedef smx_process_t (*smx_creation_func_t) (
- /* name */ const char*,
- /* code */ xbt_main_func_t,
- /* userdata */ void*,
- /* hostname */ const char*,
- /* kill_time */ double,
- /* argc */ int,
- /* argv */ char**,
- /* props */ xbt_dict_t,
- /* auto_restart */ int,
- /* parent_process */ smx_process_t);
-
-
/******************************* Networking ***********************************/
/**
* \ingroup simix_mbox_management
@@ -173,7 +153,6 @@ XBT_PUBLIC(void) SIMIX_global_init(int *argc, char **argv);
XBT_PUBLIC(void) SIMIX_set_maestro(void (*code)(void*), void* data);
XBT_PUBLIC(void) SIMIX_function_register_process_cleanup(void_pfn_smxprocess_t function);
-XBT_PUBLIC(void) SIMIX_function_register_process_create(smx_creation_func_t function);
XBT_PUBLIC(void) SIMIX_function_register_process_kill(void_pfn_smxprocess_t function);
/* Simulation execution */
@@ -244,7 +223,6 @@ XBT_PUBLIC(void) SIMIX_process_set_context(smx_process_t p,smx_context_t c);
XBT_PUBLIC(int) SIMIX_process_has_pending_comms(smx_process_t process);
XBT_PUBLIC(void) SIMIX_process_on_exit_runall(smx_process_t process);
XBT_PUBLIC(void) SIMIX_process_on_exit(smx_process_t process, int_f_pvoid_pvoid_t fun, void *data);
-XBT_PUBLIC(xbt_main_func_t) SIMIX_process_get_code(void);
/****************************** Communication *********************************/
XBT_PUBLIC(void) SIMIX_comm_set_copy_data_callback(void (*callback) (smx_synchro_t, void*, size_t));
@@ -278,7 +256,6 @@ XBT_PUBLIC(smx_synchro_t) simcall_execution_parallel_start(const char *name,
double *bytes_amount,
double amount,
double rate);
-XBT_PUBLIC(void) simcall_execution_destroy(smx_synchro_t execution);
XBT_PUBLIC(void) simcall_execution_cancel(smx_synchro_t execution);
XBT_PUBLIC(void) simcall_execution_set_priority(smx_synchro_t execution, double priority);
XBT_PUBLIC(void) simcall_execution_set_bound(smx_synchro_t execution, double bound);