#ifndef SIMIX_PRIVATE_H
#define SIMIX_PRIVATE_H
-#include <stdio.h>
#include "simix/simix.h"
#include "surf/surf.h"
#include "xbt/fifo.h"
@ingroup m_datatypes_management_details @{ */
typedef struct s_smx_process {
s_xbt_swag_hookup_t process_hookup;
- s_xbt_swag_hookup_t synchro_hookup;
+ s_xbt_swag_hookup_t synchro_hookup; /* process_to_run or mutex->sleeping and co */
s_xbt_swag_hookup_t host_proc_hookup;
s_xbt_swag_hookup_t destroy_hookup;
int iwannadie : 1;
smx_mutex_t mutex; /* mutex on which the process is blocked */
smx_cond_t cond; /* cond on which the process is blocked */
+ smx_sem_t sem; /* semaphore on which the process is blocked */
smx_action_t waiting_action;
xbt_dict_t properties;
void *data; /* kept for compatibility, it should be replaced with moddata */
void SIMIX_create_maestro_process(void);
void SIMIX_process_empty_trash(void);
void SIMIX_process_schedule(smx_process_t process);
-void SIMIX_process_yield(void);
ex_ctx_t *SIMIX_process_get_exception(void);
void SIMIX_process_exception_terminate(xbt_ex_t * e);
} s_smx_cond_t;
+typedef struct s_smx_sem {
+ /* KEEP IT IN SYNC WITH src/xbt_sg_thread.c::struct s_xbt_sem */
+ xbt_swag_t sleeping; /* list of sleeping process */
+ int capacity;
+ xbt_fifo_t actions; /* list of actions */
+ /* KEEP IT IN SYNC WITH src/xbt_sg_thread.c::struct s_xbt_sem */
+
+} s_smx_sem_t;
+
/******************************* Networking ***********************************/
/** @brief Rendez-vous point datatype */
smx_mutex_t read;
smx_mutex_t write;
xbt_fifo_t comm_fifo;
+ void *data;
} s_smx_rvpoint_t;
typedef struct s_smx_comm {
- smx_host_t src_host;
- smx_host_t dst_host;
- smx_rdv_t rdv;
- smx_cond_t cond;
+
+
+ smx_comm_type_t type; /* Type of the communication (comm_send,comm_recv) */
+ smx_rdv_t rdv; /* Rendez-vous where the comm is queued */
+ smx_sem_t sem; /* Semaphore associated to the surf simulation */
+ int refcount; /* Number of processes involved in the cond */
+
+ /* Surf action data */
+ smx_process_t src_proc;
+ smx_process_t dst_proc;
+ smx_action_t src_timeout;
+ smx_action_t dst_timeout;
smx_action_t act;
- void *data;
- size_t data_size;
- void **dest_buff;
- size_t dest_buff_size;
double rate;
- int refcount;
+ double task_size;
+
+ /* Data to be transfered */
+ void *src_buff;
+ void *dst_buff;
+ size_t src_buff_size;
+ size_t *dst_buff_size;
+ void *data; /* User data associated to communication */
} s_smx_comm_t;
+void SIMIX_network_copy_data(smx_comm_t comm);
+smx_comm_t SIMIX_communication_new(smx_comm_type_t type);
+static inline void SIMIX_communication_use(smx_comm_t comm);
+static inline void SIMIX_communication_wait_for_completion(smx_comm_t comm, double timeout);
+static inline void SIMIX_rdv_push(smx_rdv_t rdv, smx_comm_t comm);
+static inline void SIMIX_rdv_remove(smx_rdv_t rdv, smx_comm_t comm);
+
/********************************* Action *************************************/
typedef enum {ready, ongoing, done, failed} smx_action_state_t;
typedef struct s_smx_action {
char *name; /**< @brief action name if any */
xbt_fifo_t cond_list; /*< conditional variables that must be signaled when the action finish. */
+ xbt_fifo_t sem_list; /*< semaphores that must be signaled when the action finish. */
void *data; /**< @brief user data */
int refcount; /**< @brief reference counter */
surf_action_t surf_action; /* SURF modeling of computation */
typedef void (*smx_pfn_context_suspend_t) (smx_context_t context);
/* function used to resume the current context */
-typedef void (*smx_pfn_context_resume_t) (smx_context_t old_context,
- smx_context_t new_context);
+typedef void (*smx_pfn_context_resume_t) (smx_context_t new_context);
/* interface of the context factories */
typedef struct s_smx_context_factory {
smx_pfn_context_factory_create_context_t create_context;
smx_pfn_context_factory_finalize_t finalize;
smx_pfn_context_free_t free;
- smx_pfn_context_start_t start;
smx_pfn_context_stop_t stop;
smx_pfn_context_suspend_t suspend;
smx_pfn_context_resume_t resume;
void SIMIX_ctx_thread_factory_init(smx_context_factory_t * factory);
void SIMIX_ctx_sysv_factory_init(smx_context_factory_t * factory);
+void SIMIX_ctx_lua_factory_init(smx_context_factory_t * factory);
+void SIMIX_ctx_lua_factory_set_state(void *state);
+
void SIMIX_ctx_java_factory_init(smx_context_factory_t * factory);
static inline smx_context_t SIMIX_context_new(xbt_main_func_t code, int argc,
char** argv,
void_f_pvoid_t cleanup_func,
- void* cleanup_arg)
-{
+ void* cleanup_arg) {
+
return (*(simix_global->context_factory->create_context))
(code, argc, argv, cleanup_func, cleanup_arg);
}
* \param context the context to destroy
* Argument must be stopped first -- runs in maestro context
*/
-static inline void SIMIX_context_free(smx_context_t context)
-{
+static inline void SIMIX_context_free(smx_context_t context) {
(*(simix_global->context_factory->free)) (context);
}
-/**
- * \brief prepares aa context to be run
- * \param context the context to start
- * It will however run effectively only when calling #SIMIX_process_schedule
- */
-static inline void SIMIX_context_start(smx_context_t context)
-{
- (*(simix_global->context_factory->start)) (context);
-}
-
/**
* \brief stops the execution of a context
* \param context to stop
*/
-static inline void SIMIX_context_stop(smx_context_t context)
-{
+static inline void SIMIX_context_stop(smx_context_t context) {
(*(simix_global->context_factory->stop)) (context);
}
\param old_context the actual context from which is resuming
\param new_context the context to resume
*/
-static inline void SIMIX_context_resume(smx_context_t old_context,
- smx_context_t new_context)
+static inline void SIMIX_context_resume(smx_context_t new_context)
{
- (*(simix_global->context_factory->resume)) (old_context, new_context);
+ (*(simix_global->context_factory->resume)) (new_context);
}
/**
