* @{
*/
/* @brief heap datatype */
+#ifdef __cplusplus
+extern "C" {
+#endif
typedef struct xbt_heap *xbt_heap_t;
XBT_PUBLIC(xbt_heap_t) xbt_heap_new(int init_size,
*,
int));
XBT_PUBLIC(void *) xbt_heap_remove(xbt_heap_t H, int i);
-
+#ifdef __cplusplus
+}
+#endif
/* @} */
#endif /* _XBT_HEAP_H */
#include "surf/datatypes.h"
#include "simgrid/platf_interface.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/* Creation functions */
XBT_PUBLIC(tmgr_history_t) tmgr_history_new(void);
XBT_PUBLIC(void) tmgr_history_free(tmgr_history_t history);
XBT_PUBLIC(void) tmgr_finalize(void);
+#ifdef __cplusplus
+}
+#endif
+
#endif /* _SURF_TMGR_H */
} s_smx_host_priv_t;
static inline smx_host_priv_t SIMIX_host_priv(smx_host_t host){
- return xbt_lib_get_level(host, SIMIX_HOST_LEVEL);
+ return (smx_host_priv_t) xbt_lib_get_level(host, SIMIX_HOST_LEVEL);
}
#define TULONG(n) (n, unsigned long, ul)
#define TFLOAT(n) (n, float, f)
#define TDOUBLE(n) (n, double, d)
-#define TPTR(n) (n, void*, p)
+#define TDPTR(n) (n, void*, dp, void*)
+#define TFPTR(n) (n, FPtr, fp, FPtr)
#define TCPTR(n) (n, const void*, cp)
#define TSIZE(n) (n, size_t, si)
#define TVOID(n) (n, void)
-#define TSPEC(n,t) (n, t, p)
+#define TDSPEC(n,t) (n, t, dp, void*)
+#define TFSPEC(n,t) (n, t, fp, FPtr)
/* use comma or nothing to separate elements*/
#define SIMCALL_SEP_COMMA ,
#define SIMCALL_SEP_NOTHING
/* get the name of the parameter */
-#define SIMCALL_NAME_(name, type, field) name
+#define SIMCALL_NAME_(name, type, field, ...) name
#define SIMCALL_NAME(i, v) SIMCALL_NAME_ v
+/* get the cast of the parameter */
+#define SIMCALL_CASTTYPE_(name, type, field, cast) (cast)
+#define SIMCALL_NOCASTTYPE_(name, type, field)
+#define SIMCALL_CASTTYPE(...) MAYBE5(,##__VA_ARGS__, SIMCALL_CASTTYPE_, SIMCALL_NOCASTTYPE_) (__VA_ARGS__)
+
+/* get the uncast of the parameter */
+#define SIMCALL_UNCASTTYPE_(name, type, field, cast) (type)
+#define SIMCALL_NOUNCASTTYPE_(name, type, field)
+#define SIMCALL_UNCASTTYPE(...) MAYBE5(,##__VA_ARGS__, SIMCALL_UNCASTTYPE_, SIMCALL_NOUNCASTTYPE_) (__VA_ARGS__)
+
/* get the %s format code of the parameter */
-#define SIMCALL_FORMAT_(name, type, field) %field
+#define SIMCALL_FORMAT_(name, type, field, ...) %field
#define SIMCALL_FORMAT(i, v) SIMCALL_FORMAT_ v
/* get the field of the parameter */
-#define SIMCALL_FIELD_(name, type, field) field
+#define SIMCALL_FIELD_(name, type, field, ...) field
#define SIMCALL_FIELD(i, v) SIMCALL_FIELD_ v
/* get the parameter declaration */
-#define SIMCALL_ARG_(name, type, field) type name
+#define SIMCALL_ARG_(name, type, field, ...) type name
#define SIMCALL_ARG(i, v) SIMCALL_ARG_ v
/* get the parameter initialisation field */
-#define SIMCALL_INIT_FIELD_(name, type, field) .field = name
+#define SIMCALL_INIT_FIELD_(name, type, field, ...) .field = SIMCALL_CASTTYPE(name, type, field,##__VA_ARGS__) name
#define SIMCALL_INIT_FIELD(i, d, v) self->simcall.args[i]SIMCALL_INIT_FIELD_ v;
/* get the case of the parameter */
-#define SIMCALL_CASE_PARAM_(name, type, field) field
-#define SIMCALL_CASE_PARAM(i, v) simcall->args[i].SIMCALL_CASE_PARAM_ v
+#define SIMCALL_CASE_PARAM_(name, type, field, ...) field
+#define SIMCALL_CASE_PARAM(i, v) SIMCALL_UNCASTTYPE v simcall->args[i].SIMCALL_CASE_PARAM_ v
/* generate some code for SIMCALL_CASE if the simcall has an answer */
+#define MAYBE5(_0, _1, _2, _3, _4, func, ...) func
+#define MAYBE3(_0, _1, _2, func, ...) func
#define MAYBE2(_0, _1, func, ...) func
-#define SIMCALL_WITH_RESULT_BEGIN(name, type, field) simcall->result.field =
+#define SIMCALL_WITH_RESULT_BEGIN(name, type, field, ...) simcall->result.field =
#define SIMCALL_WITHOUT_RESULT_BEGIN(name, type, field)
#define SIMCALL_RESULT_BEGIN_(name, type, ...)\
- MAYBE2(,##__VA_ARGS__, SIMCALL_WITH_RESULT_BEGIN, SIMCALL_WITHOUT_RESULT_BEGIN)\
+ MAYBE3(,##__VA_ARGS__, SIMCALL_WITH_RESULT_BEGIN, SIMCALL_WITHOUT_RESULT_BEGIN, SIMCALL_WITHOUT_RESULT_BEGIN)\
(name, type, __VA_ARGS__)
#define SIMCALL_RESULT_BEGIN(answer, res) answer(SIMCALL_RESULT_BEGIN_ res)
#define SIMCALL_WITH_FUNC_SIMCALL(name, type, field) smx_simcall_t simcall =
#define SIMCALL_WITHOUT_FUNC_SIMCALL(name, type, field)
#define SIMCALL_FUNC_SIMCALL_(name, type, ...)\
- MAYBE2(,##__VA_ARGS__, SIMCALL_WITH_FUNC_SIMCALL, SIMCALL_WITHOUT_FUNC_SIMCALL)\
+ MAYBE3(,##__VA_ARGS__, SIMCALL_WITH_FUNC_SIMCALL, SIMCALL_WITHOUT_FUNC_SIMCALL, SIMCALL_WITHOUT_FUNC_SIMCALL)\
(name, type, __VA_ARGS__)
#define SIMCALL_FUNC_SIMCALL(res) SIMCALL_FUNC_SIMCALL_ res
-#define SIMCALL_WITH_FUNC_RETURN(name, type, field) return self->simcall.result.field;
+#define SIMCALL_WITH_FUNC_RETURN(name, type, field, cast) return self->simcall.result.field;
#define SIMCALL_WITHOUT_FUNC_RETURN(name, type, field)
#define SIMCALL_FUNC_RETURN_(name, type, ...)\
- MAYBE2(,##__VA_ARGS__, SIMCALL_WITH_FUNC_RETURN, SIMCALL_WITHOUT_FUNC_RETURN)\
+ MAYBE3(,##__VA_ARGS__, SIMCALL_WITH_FUNC_RETURN, SIMCALL_WITHOUT_FUNC_RETURN, SIMCALL_WITHOUT_FUNC_RETURN)\
(name, type, __VA_ARGS__)
#define SIMCALL_FUNC_RETURN(res) SIMCALL_FUNC_RETURN_ res
/* generate the simcalls args getter/setter */
#define SIMCALL_ARG_GETSET_(i, name, v) \
static inline SIMCALL_FUNC_RETURN_TYPE(v) SIMCALL_GS_FUNC(SIMCALL_GS_SC_NAME(name), get, SIMCALL_GS_ARG_NAME(v))(smx_simcall_t simcall){\
- return simcall->args[i].SIMCALL_FIELD_ v ;\
+ return (SIMCALL_FUNC_RETURN_TYPE(v)) simcall->args[i].SIMCALL_FIELD_ v ;\
}\
static inline void SIMCALL_GS_FUNC(SIMCALL_GS_SC_NAME(name), set, SIMCALL_GS_ARG_NAME(v))(smx_simcall_t simcall, SIMCALL_ARG_ v){\
- simcall->args[i].SIMCALL_FIELD_ v = SIMCALL_NAME_ v ;\
+ simcall->args[i].SIMCALL_FIELD_ v = SIMCALL_CASTTYPE v SIMCALL_NAME_ v ;\
}
#define SIMCALL_ARG_GETSET(type, name, answer, res, ...)\
/* generate the simcalls result getter/setter */
#define SIMCALL_WITH_RES_GETSET(name, v) \
static inline SIMCALL_FUNC_RETURN_TYPE(v) SIMCALL_GS_FUNC(SIMCALL_GS_SC_NAME((name)), get, SIMCALL_GS_ARG_NAME(v))(smx_simcall_t simcall){\
- return simcall->result.SIMCALL_FIELD_ v ;\
+ return (SIMCALL_FUNC_RETURN_TYPE(v)) simcall->result.SIMCALL_FIELD_ v ;\
}\
static inline void SIMCALL_GS_FUNC(SIMCALL_GS_SC_NAME((name)), set, SIMCALL_GS_ARG_NAME(v))(smx_simcall_t simcall, SIMCALL_ARG_ v){\
simcall->result.SIMCALL_FIELD_ v = SIMCALL_NAME_ v ;\
}
#define SIMCALL_WITHOUT_RES_GETSET(name, v)
#define SIMCALL_RES_GETSET__(name, type, ...)\
- MAYBE2(,##__VA_ARGS__, SIMCALL_WITH_RES_GETSET, SIMCALL_WITHOUT_RES_GETSET)
+ MAYBE3(,##__VA_ARGS__, SIMCALL_WITH_RES_GETSET, SIMCALL_WITH_RES_GETSET, SIMCALL_WITHOUT_RES_GETSET)
#define SIMCALL_RES_GETSET_(scname, v)\
SIMCALL_RES_GETSET__ v (scname, v)
#define SIMCALL_RES_GETSET(type, name, answer, res, ...)\
inline void SIMCALL_GS_FUNC(SIMCALL_GS_SC_NAME((name)), set, SIMCALL_GS_ARG_NAME(v))(smx_simcall_t simcall, SIMCALL_ARG_ v);
#define SIMCALL_WITHOUT_RES_GETSET_PROTO(name, v)
#define SIMCALL_RES_GETSET_PROTO__(name, type, ...)\
- MAYBE2(,##__VA_ARGS__, SIMCALL_WITH_RES_GETSET_PROTO, SIMCALL_WITHOUT_RES_GETSET_PROTO)
+ MAYBE3(,##__VA_ARGS__, SIMCALL_WITH_RES_GETSET_PROTO, SIMCALL_WITHOUT_RES_GETSET_PROTO, SIMCALL_WITHOUT_RES_GETSET_PROTO)
#define SIMCALL_RES_GETSET_PROTO_(scname, v)\
SIMCALL_RES_GETSET_PROTO__ v (scname, v)
#define SIMCALL_RES_GETSET_PROTO(type, name, answer, res, ...)\
/* the list of simcalls definitions */
#define SIMCALL_LIST1(ACTION, sep) \
-ACTION(SIMCALL_HOST_GET_BY_NAME, host_get_by_name, WITH_ANSWER, TSPEC(result, smx_host_t), TSTRING(name)) sep \
-ACTION(SIMCALL_HOST_GET_NAME, host_get_name, WITH_ANSWER, TSTRING(result), TSPEC(host, smx_host_t)) sep \
-ACTION(SIMCALL_HOST_GET_PROPERTIES, host_get_properties, WITH_ANSWER, TSPEC(result, xbt_dict_t), TSPEC(host, smx_host_t)) sep \
-ACTION(SIMCALL_HOST_GET_CORE, host_get_core, WITH_ANSWER, TINT(result), TSPEC(host, smx_host_t)) sep \
-ACTION(SIMCALL_HOST_GET_SPEED, host_get_speed, WITH_ANSWER, TDOUBLE(result), TSPEC(host, smx_host_t)) sep \
-ACTION(SIMCALL_HOST_GET_AVAILABLE_SPEED, host_get_available_speed, WITH_ANSWER, TDOUBLE(result), TSPEC(host, smx_host_t)) sep \
-ACTION(SIMCALL_HOST_GET_STATE, host_get_state, WITH_ANSWER, TINT(result), TSPEC(host, smx_host_t)) sep \
-ACTION(SIMCALL_HOST_GET_DATA, host_get_data, WITH_ANSWER, TPTR(result), TSPEC(host, smx_host_t)) sep \
-ACTION(SIMCALL_HOST_SET_DATA, host_set_data, WITH_ANSWER, TVOID(result), TSPEC(host, smx_host_t), TPTR(data)) sep \
-ACTION(SIMCALL_HOST_EXECUTE, host_execute, WITH_ANSWER, TSPEC(result, smx_action_t), TSTRING(name), TSPEC(host, smx_host_t), TDOUBLE(computation_amount), TDOUBLE(priority)) sep \
-ACTION(SIMCALL_HOST_PARALLEL_EXECUTE, host_parallel_execute, WITH_ANSWER, TSPEC(result, smx_action_t), TSTRING(name), TINT(host_nb), TSPEC(host_list, smx_host_t*), TSPEC(computation_amount, double*), TSPEC(communication_amount, double*), TDOUBLE(amount), TDOUBLE(rate)) sep \
-ACTION(SIMCALL_HOST_EXECUTION_DESTROY, host_execution_destroy, WITH_ANSWER, TVOID(result), TSPEC(execution, smx_action_t)) sep \
-ACTION(SIMCALL_HOST_EXECUTION_CANCEL, host_execution_cancel, WITH_ANSWER, TVOID(result), TSPEC(execution, smx_action_t)) sep \
-ACTION(SIMCALL_HOST_EXECUTION_GET_REMAINS, host_execution_get_remains, WITH_ANSWER, TDOUBLE(result), TSPEC(execution, smx_action_t)) sep \
-ACTION(SIMCALL_HOST_EXECUTION_GET_STATE, host_execution_get_state, WITH_ANSWER, TINT(result), TSPEC(execution, smx_action_t)) sep \
-ACTION(SIMCALL_HOST_EXECUTION_SET_PRIORITY, host_execution_set_priority, WITH_ANSWER, TVOID(result), TSPEC(execution, smx_action_t), TDOUBLE(priority)) sep \
-ACTION(SIMCALL_HOST_EXECUTION_WAIT, host_execution_wait, WITHOUT_ANSWER, TINT(result), TSPEC(execution, smx_action_t)) sep \
-ACTION(SIMCALL_PROCESS_CREATE, process_create, WITH_ANSWER, TVOID(result), TSPEC(process, smx_process_t*), TSTRING(name), TSPEC(code, xbt_main_func_t), TPTR(data), TSTRING(hostname), TDOUBLE(kill_time), TINT(argc), TSPEC(argv, char**), TSPEC(properties, xbt_dict_t), TINT(auto_restart)) sep \
-ACTION(SIMCALL_PROCESS_KILL, process_kill, WITH_ANSWER, TVOID(result), TSPEC(process, smx_process_t)) sep \
+ACTION(SIMCALL_HOST_GET_BY_NAME, host_get_by_name, WITH_ANSWER, TDSPEC(result, smx_host_t), TSTRING(name)) sep \
+ACTION(SIMCALL_HOST_GET_NAME, host_get_name, WITH_ANSWER, TSTRING(result), TDSPEC(host, smx_host_t)) sep \
+ACTION(SIMCALL_HOST_GET_PROPERTIES, host_get_properties, WITH_ANSWER, TDSPEC(result, xbt_dict_t), TDSPEC(host, smx_host_t)) sep \
+ACTION(SIMCALL_HOST_GET_CORE, host_get_core, WITH_ANSWER, TINT(result), TDSPEC(host, smx_host_t)) sep \
+ACTION(SIMCALL_HOST_GET_SPEED, host_get_speed, WITH_ANSWER, TDOUBLE(result), TDSPEC(host, smx_host_t)) sep \
+ACTION(SIMCALL_HOST_GET_AVAILABLE_SPEED, host_get_available_speed, WITH_ANSWER, TDOUBLE(result), TDSPEC(host, smx_host_t)) sep \
+ACTION(SIMCALL_HOST_GET_STATE, host_get_state, WITH_ANSWER, TINT(result), TDSPEC(host, smx_host_t)) sep \
+ACTION(SIMCALL_HOST_GET_DATA, host_get_data, WITH_ANSWER, TDPTR(result), TDSPEC(host, smx_host_t)) sep \
+ACTION(SIMCALL_HOST_SET_DATA, host_set_data, WITH_ANSWER, TVOID(result), TDSPEC(host, smx_host_t), TDPTR(data)) sep \
+ACTION(SIMCALL_HOST_EXECUTE, host_execute, WITH_ANSWER, TDSPEC(result, smx_action_t), TSTRING(name), TDSPEC(host, smx_host_t), TDOUBLE(computation_amount), TDOUBLE(priority)) sep \
+ACTION(SIMCALL_HOST_PARALLEL_EXECUTE, host_parallel_execute, WITH_ANSWER, TDSPEC(result, smx_action_t), TSTRING(name), TINT(host_nb), TDSPEC(host_list, smx_host_t*), TDSPEC(computation_amount, double*), TDSPEC(communication_amount, double*), TDOUBLE(amount), TDOUBLE(rate)) sep \
+ACTION(SIMCALL_HOST_EXECUTION_DESTROY, host_execution_destroy, WITH_ANSWER, TVOID(result), TDSPEC(execution, smx_action_t)) sep \
+ACTION(SIMCALL_HOST_EXECUTION_CANCEL, host_execution_cancel, WITH_ANSWER, TVOID(result), TDSPEC(execution, smx_action_t)) sep \
+ACTION(SIMCALL_HOST_EXECUTION_GET_REMAINS, host_execution_get_remains, WITH_ANSWER, TDOUBLE(result), TDSPEC(execution, smx_action_t)) sep \
+ACTION(SIMCALL_HOST_EXECUTION_GET_STATE, host_execution_get_state, WITH_ANSWER, TINT(result), TDSPEC(execution, smx_action_t)) sep \
+ACTION(SIMCALL_HOST_EXECUTION_SET_PRIORITY, host_execution_set_priority, WITH_ANSWER, TVOID(result), TDSPEC(execution, smx_action_t), TDOUBLE(priority)) sep \
+ACTION(SIMCALL_HOST_EXECUTION_WAIT, host_execution_wait, WITHOUT_ANSWER, TINT(result), TDSPEC(execution, smx_action_t)) sep \
+ACTION(SIMCALL_PROCESS_CREATE, process_create, WITH_ANSWER, TVOID(result), TDSPEC(process, smx_process_t*), TSTRING(name), TFSPEC(code, xbt_main_func_t), TDPTR(data), TSTRING(hostname), TDOUBLE(kill_time), TINT(argc), TDSPEC(argv, char**), TDSPEC(properties, xbt_dict_t), TINT(auto_restart)) sep \
+ACTION(SIMCALL_PROCESS_KILL, process_kill, WITH_ANSWER, TVOID(result), TDSPEC(process, smx_process_t)) sep \
ACTION(SIMCALL_PROCESS_KILLALL, process_killall, WITH_ANSWER, TVOID(result), TINT(reset_pid)) sep \
-ACTION(SIMCALL_PROCESS_CLEANUP, process_cleanup, WITH_ANSWER, TVOID(result), TSPEC(process, smx_process_t)) sep \
-ACTION(SIMCALL_PROCESS_CHANGE_HOST, process_change_host, WITH_ANSWER, TVOID(result), TSPEC(process, smx_process_t), TSPEC(dest, smx_host_t)) sep \
-ACTION(SIMCALL_PROCESS_SUSPEND, process_suspend, WITHOUT_ANSWER, TVOID(result), TSPEC(process, smx_process_t)) sep \
-ACTION(SIMCALL_PROCESS_RESUME, process_resume, WITH_ANSWER, TVOID(result), TSPEC(process, smx_process_t)) sep \
+ACTION(SIMCALL_PROCESS_CLEANUP, process_cleanup, WITH_ANSWER, TVOID(result), TDSPEC(process, smx_process_t)) sep \
+ACTION(SIMCALL_PROCESS_CHANGE_HOST, process_change_host, WITH_ANSWER, TVOID(result), TDSPEC(process, smx_process_t), TDSPEC(dest, smx_host_t)) sep \
+ACTION(SIMCALL_PROCESS_SUSPEND, process_suspend, WITHOUT_ANSWER, TVOID(result), TDSPEC(process, smx_process_t)) sep \
+ACTION(SIMCALL_PROCESS_RESUME, process_resume, WITH_ANSWER, TVOID(result), TDSPEC(process, smx_process_t)) sep \
ACTION(SIMCALL_PROCESS_COUNT, process_count, WITH_ANSWER, TINT(result)) sep \
-ACTION(SIMCALL_PROCESS_GET_PID, process_get_PID, WITH_ANSWER, TINT(result), TSPEC(process, smx_process_t)) sep \
-ACTION(SIMCALL_PROCESS_GET_PPID, process_get_PPID, WITH_ANSWER, TINT(result), TSPEC(process, smx_process_t)) sep \
-ACTION(SIMCALL_PROCESS_GET_DATA, process_get_data, WITH_ANSWER, TPTR(result), TSPEC(process, smx_process_t)) sep \
-ACTION(SIMCALL_PROCESS_SET_DATA, process_set_data, WITH_ANSWER, TVOID(result), TSPEC(process, smx_process_t), TPTR(data)) sep \
-ACTION(SIMCALL_PROCESS_GET_HOST, process_get_host, WITH_ANSWER, TSPEC(result, smx_host_t), TSPEC(process, smx_process_t)) sep \
-ACTION(SIMCALL_PROCESS_GET_NAME, process_get_name, WITH_ANSWER, TSTRING(result), TSPEC(process, smx_process_t)) sep \
-ACTION(SIMCALL_PROCESS_IS_SUSPENDED, process_is_suspended, WITH_ANSWER, TINT(result), TSPEC(process, smx_process_t)) sep \
-ACTION(SIMCALL_PROCESS_GET_PROPERTIES, process_get_properties, WITH_ANSWER, TSPEC(result, xbt_dict_t), TSPEC(process, smx_process_t)) sep \
+ACTION(SIMCALL_PROCESS_GET_PID, process_get_PID, WITH_ANSWER, TINT(result), TDSPEC(process, smx_process_t)) sep \
+ACTION(SIMCALL_PROCESS_GET_PPID, process_get_PPID, WITH_ANSWER, TINT(result), TDSPEC(process, smx_process_t)) sep \
+ACTION(SIMCALL_PROCESS_GET_DATA, process_get_data, WITH_ANSWER, TDPTR(result), TDSPEC(process, smx_process_t)) sep \
+ACTION(SIMCALL_PROCESS_SET_DATA, process_set_data, WITH_ANSWER, TVOID(result), TDSPEC(process, smx_process_t), TDPTR(data)) sep \
+ACTION(SIMCALL_PROCESS_GET_HOST, process_get_host, WITH_ANSWER, TDSPEC(result, smx_host_t), TDSPEC(process, smx_process_t)) sep \
+ACTION(SIMCALL_PROCESS_GET_NAME, process_get_name, WITH_ANSWER, TSTRING(result), TDSPEC(process, smx_process_t)) sep \
+ACTION(SIMCALL_PROCESS_IS_SUSPENDED, process_is_suspended, WITH_ANSWER, TINT(result), TDSPEC(process, smx_process_t)) sep \
+ACTION(SIMCALL_PROCESS_GET_PROPERTIES, process_get_properties, WITH_ANSWER, TDSPEC(result, xbt_dict_t), TDSPEC(process, smx_process_t)) sep \
ACTION(SIMCALL_PROCESS_SLEEP, process_sleep, WITHOUT_ANSWER, TINT(result), TDOUBLE(duration)) sep \
-ACTION(SIMCALL_PROCESS_ON_EXIT, process_on_exit, WITH_ANSWER, TVOID(result), TSPEC(process, smx_process_t), TSPEC(fun, int_f_pvoid_t), TPTR(data)) sep \
-ACTION(SIMCALL_PROCESS_AUTO_RESTART_SET, process_auto_restart_set, WITH_ANSWER, TVOID(result), TSPEC(process, smx_process_t), TINT(auto_restart)) sep \
-ACTION(SIMCALL_PROCESS_RESTART, process_restart, WITH_ANSWER, TSPEC(result, smx_process_t), TSPEC(process, smx_process_t)) sep \
-ACTION(SIMCALL_RDV_CREATE, rdv_create, WITH_ANSWER, TSPEC(result, smx_rdv_t), TSTRING(name)) sep \
-ACTION(SIMCALL_RDV_DESTROY, rdv_destroy, WITH_ANSWER, TVOID(result), TSPEC(rdv, smx_rdv_t)) sep \
-ACTION(SIMCALL_RDV_GET_BY_NAME, rdv_get_by_name, WITH_ANSWER, TSPEC(result, smx_host_t), TSTRING(name)) sep \
-ACTION(SIMCALL_RDV_COMM_COUNT_BY_HOST, rdv_comm_count_by_host, WITH_ANSWER, TUINT(result), TSPEC(rdv, smx_rdv_t), TSPEC(host, smx_host_t)) sep \
-ACTION(SIMCALL_RDV_GET_HEAD, rdv_get_head, WITH_ANSWER, TSPEC(result, smx_action_t), TSPEC(rdv, smx_rdv_t)) sep \
-ACTION(SIMCALL_RDV_SET_RECV, rdv_set_receiver, WITH_ANSWER, TVOID(result), TSPEC(rdv, smx_rdv_t), TSPEC(receiver, smx_process_t)) sep \
-ACTION(SIMCALL_RDV_GET_RECV, rdv_get_receiver, WITH_ANSWER, TSPEC(result, smx_process_t), TSPEC(rdv, smx_rdv_t)) sep \
-ACTION(SIMCALL_COMM_IPROBE, comm_iprobe, WITH_ANSWER, TSPEC(result, smx_action_t), TSPEC(rdv, smx_rdv_t), TINT(src), TINT(tag), TSPEC(match_fun, simix_match_func_t), TPTR(data)) sep \
-ACTION(SIMCALL_COMM_SEND, comm_send, WITHOUT_ANSWER, TVOID(result), TSPEC(rdv, smx_rdv_t), TDOUBLE(task_size), TDOUBLE(rate), TPTR(src_buff), TSIZE(src_buff_size), TSPEC(match_fun, simix_match_func_t), TPTR(data), TDOUBLE(timeout)) sep \
-ACTION(SIMCALL_COMM_ISEND, comm_isend, WITH_ANSWER, TSPEC(result, smx_action_t), TSPEC(rdv, smx_rdv_t), TDOUBLE(task_size), TDOUBLE(rate), TPTR(src_buff), TSIZE(src_buff_size), TSPEC(match_fun, simix_match_func_t), TSPEC(clean_fun, simix_clean_func_t), TPTR(data), TINT(detached)) sep \
-ACTION(SIMCALL_COMM_RECV, comm_recv, WITHOUT_ANSWER, TVOID(result), TSPEC(rdv, smx_rdv_t), TPTR(dst_buff), TSPEC(dst_buff_size, size_t*), TSPEC(match_fun, simix_match_func_t), TPTR(data), TDOUBLE(timeout)) sep \
-ACTION(SIMCALL_COMM_IRECV, comm_irecv, WITH_ANSWER, TSPEC(result, smx_action_t), TSPEC(rdv, smx_rdv_t), TPTR(dst_buff), TSPEC(dst_buff_size, size_t*), TSPEC(match_fun, simix_match_func_t), TPTR(data)) sep \
-ACTION(SIMCALL_COMM_RECV_BOUNDED, comm_recv_bounded, WITHOUT_ANSWER, TVOID(result), TSPEC(rdv, smx_rdv_t), TPTR(dst_buff), TSPEC(dst_buff_size, size_t*), TSPEC(match_fun, simix_match_func_t), TPTR(data), TDOUBLE(timeout), TDOUBLE(rate)) sep \
-ACTION(SIMCALL_COMM_IRECV_BOUNDED, comm_irecv_bounded, WITH_ANSWER, TSPEC(result, smx_action_t), TSPEC(rdv, smx_rdv_t), TPTR(dst_buff), TSPEC(dst_buff_size, size_t*), TSPEC(match_fun, simix_match_func_t), TPTR(data), TDOUBLE(rate)) sep \
-ACTION(SIMCALL_COMM_DESTROY, comm_destroy, WITH_ANSWER, TVOID(result), TSPEC(comm, smx_action_t)) sep \
-ACTION(SIMCALL_COMM_CANCEL, comm_cancel, WITH_ANSWER, TVOID(result), TSPEC(comm, smx_action_t)) sep \
-ACTION(SIMCALL_COMM_WAITANY, comm_waitany, WITHOUT_ANSWER, TINT(result), TSPEC(comms, xbt_dynar_t)) sep \
-ACTION(SIMCALL_COMM_WAIT, comm_wait, WITHOUT_ANSWER, TVOID(result), TSPEC(comm, smx_action_t), TDOUBLE(timeout)) sep \
-ACTION(SIMCALL_COMM_TEST, comm_test, WITHOUT_ANSWER, TINT(result), TSPEC(comm, smx_action_t)) sep \
-ACTION(SIMCALL_COMM_TESTANY, comm_testany, WITHOUT_ANSWER, TINT(result), TSPEC(comms, xbt_dynar_t)) sep \
-ACTION(SIMCALL_COMM_GET_REMAINS, comm_get_remains, WITH_ANSWER, TDOUBLE(result), TSPEC(comm, smx_action_t)) sep \
-ACTION(SIMCALL_COMM_GET_STATE, comm_get_state, WITH_ANSWER, TINT(result), TSPEC(comm, smx_action_t)) sep \
-ACTION(SIMCALL_COMM_GET_SRC_DATA, comm_get_src_data, WITH_ANSWER, TPTR(result), TSPEC(comm, smx_action_t)) sep \
-ACTION(SIMCALL_COMM_GET_DST_DATA, comm_get_dst_data, WITH_ANSWER, TPTR(result), TSPEC(comm, smx_action_t)) sep \
-ACTION(SIMCALL_COMM_GET_SRC_PROC, comm_get_src_proc, WITH_ANSWER, TSPEC(result, smx_process_t), TSPEC(comm, smx_action_t)) sep \
-ACTION(SIMCALL_COMM_GET_DST_PROC, comm_get_dst_proc, WITH_ANSWER, TSPEC(result, smx_process_t), TSPEC(comm, smx_action_t)) sep \
-ACTION(SIMCALL_MUTEX_INIT, mutex_init, WITH_ANSWER, TSPEC(result, smx_mutex_t)) sep \
-ACTION(SIMCALL_MUTEX_DESTROY, mutex_destroy, WITH_ANSWER, TVOID(result), TSPEC(mutex, smx_mutex_t)) sep \
-ACTION(SIMCALL_MUTEX_LOCK, mutex_lock, WITHOUT_ANSWER, TVOID(result), TSPEC(mutex, smx_mutex_t)) sep \
-ACTION(SIMCALL_MUTEX_TRYLOCK, mutex_trylock, WITH_ANSWER, TINT(result), TSPEC(mutex, smx_mutex_t)) sep \
-ACTION(SIMCALL_MUTEX_UNLOCK, mutex_unlock, WITH_ANSWER, TVOID(result), TSPEC(mutex, smx_mutex_t)) sep \
-ACTION(SIMCALL_COND_INIT, cond_init, WITH_ANSWER, TSPEC(result, smx_cond_t)) sep \
-ACTION(SIMCALL_COND_DESTROY, cond_destroy, WITH_ANSWER, TVOID(result), TSPEC(cond, smx_cond_t)) sep \
-ACTION(SIMCALL_COND_SIGNAL, cond_signal, WITH_ANSWER, TVOID(result), TSPEC(cond, smx_cond_t)) sep \
-ACTION(SIMCALL_COND_WAIT, cond_wait, WITHOUT_ANSWER, TVOID(result), TSPEC(cond, smx_cond_t), TSPEC(mutex, smx_mutex_t)) sep \
-ACTION(SIMCALL_COND_WAIT_TIMEOUT, cond_wait_timeout, WITHOUT_ANSWER, TVOID(result), TSPEC(cond, smx_cond_t), TSPEC(mutex, smx_mutex_t), TDOUBLE(timeout)) sep \
-ACTION(SIMCALL_COND_BROADCAST, cond_broadcast, WITH_ANSWER, TVOID(result), TSPEC(cond, smx_cond_t)) sep \
-ACTION(SIMCALL_SEM_INIT, sem_init, WITH_ANSWER, TSPEC(result, smx_sem_t), TINT(capacity)) sep \
-ACTION(SIMCALL_SEM_DESTROY, sem_destroy, WITH_ANSWER, TVOID(result), TSPEC(sem, smx_sem_t)) sep \
-ACTION(SIMCALL_SEM_RELEASE, sem_release, WITH_ANSWER, TVOID(result), TSPEC(sem, smx_sem_t)) sep \
-ACTION(SIMCALL_SEM_WOULD_BLOCK, sem_would_block, WITH_ANSWER, TINT(result), TSPEC(sem, smx_sem_t)) sep \
-ACTION(SIMCALL_SEM_ACQUIRE, sem_acquire, WITHOUT_ANSWER, TVOID(result), TSPEC(sem, smx_sem_t)) sep \
-ACTION(SIMCALL_SEM_ACQUIRE_TIMEOUT, sem_acquire_timeout, WITHOUT_ANSWER, TVOID(result), TSPEC(sem, smx_sem_t), TDOUBLE(timeout)) sep \
-ACTION(SIMCALL_SEM_GET_CAPACITY, sem_get_capacity, WITH_ANSWER, TINT(result), TSPEC(sem, smx_sem_t)) sep \
-ACTION(SIMCALL_FILE_READ, file_read, WITHOUT_ANSWER, TSIZE(result), TPTR(ptr), TSIZE(size), TSPEC(fd, smx_file_t)) sep \
-ACTION(SIMCALL_FILE_WRITE, file_write, WITHOUT_ANSWER, TSIZE(result), TCPTR(ptr), TSIZE(size), TSPEC(fd, smx_file_t)) sep \
-ACTION(SIMCALL_FILE_OPEN, file_open, WITHOUT_ANSWER, TSPEC(result, smx_file_t), TSTRING(mount), TSTRING(path)) sep \
-ACTION(SIMCALL_FILE_CLOSE, file_close, WITHOUT_ANSWER, TINT(result), TSPEC(fd, smx_file_t)) sep \
-ACTION(SIMCALL_FILE_UNLINK, file_unlink, WITH_ANSWER, TINT(result), TSPEC(fd, smx_file_t)) sep \
-ACTION(SIMCALL_FILE_LS, file_ls, WITHOUT_ANSWER, TSPEC(result, xbt_dict_t), TSTRING(mount), TSTRING(path)) sep \
-ACTION(SIMCALL_FILE_GET_SIZE, file_get_size, WITH_ANSWER, TSIZE(result), TSPEC(fd, smx_file_t)) sep \
-ACTION(SIMCALL_ASR_GET_PROPERTIES, asr_get_properties, WITH_ANSWER, TSPEC(result, xbt_dict_t), TSTRING(name)) sep
+ACTION(SIMCALL_PROCESS_ON_EXIT, process_on_exit, WITH_ANSWER, TVOID(result), TDSPEC(process, smx_process_t), TFSPEC(fun, int_f_pvoid_t), TDPTR(data)) sep \
+ACTION(SIMCALL_PROCESS_AUTO_RESTART_SET, process_auto_restart_set, WITH_ANSWER, TVOID(result), TDSPEC(process, smx_process_t), TINT(auto_restart)) sep \
+ACTION(SIMCALL_PROCESS_RESTART, process_restart, WITH_ANSWER, TDSPEC(result, smx_process_t), TDSPEC(process, smx_process_t)) sep \
+ACTION(SIMCALL_RDV_CREATE, rdv_create, WITH_ANSWER, TDSPEC(result, smx_rdv_t), TSTRING(name)) sep \
+ACTION(SIMCALL_RDV_DESTROY, rdv_destroy, WITH_ANSWER, TVOID(result), TDSPEC(rdv, smx_rdv_t)) sep \
+ACTION(SIMCALL_RDV_GET_BY_NAME, rdv_get_by_name, WITH_ANSWER, TDSPEC(result, smx_host_t), TSTRING(name)) sep \
+ACTION(SIMCALL_RDV_COMM_COUNT_BY_HOST, rdv_comm_count_by_host, WITH_ANSWER, TUINT(result), TDSPEC(rdv, smx_rdv_t), TDSPEC(host, smx_host_t)) sep \
+ACTION(SIMCALL_RDV_GET_HEAD, rdv_get_head, WITH_ANSWER, TDSPEC(result, smx_action_t), TDSPEC(rdv, smx_rdv_t)) sep \
+ACTION(SIMCALL_RDV_SET_RECV, rdv_set_receiver, WITH_ANSWER, TVOID(result), TDSPEC(rdv, smx_rdv_t), TDSPEC(receiver, smx_process_t)) sep \
+ACTION(SIMCALL_RDV_GET_RECV, rdv_get_receiver, WITH_ANSWER, TDSPEC(result, smx_process_t), TDSPEC(rdv, smx_rdv_t)) sep \
+ACTION(SIMCALL_COMM_IPROBE, comm_iprobe, WITH_ANSWER, TDSPEC(result, smx_action_t), TDSPEC(rdv, smx_rdv_t), TINT(src), TINT(tag), TFSPEC(match_fun, simix_match_func_t), TDPTR(data)) sep \
+ACTION(SIMCALL_COMM_SEND, comm_send, WITHOUT_ANSWER, TVOID(result), TDSPEC(rdv, smx_rdv_t), TDOUBLE(task_size), TDOUBLE(rate), TDPTR(src_buff), TSIZE(src_buff_size), TFSPEC(match_fun, simix_match_func_t), TDPTR(data), TDOUBLE(timeout)) sep \
+ACTION(SIMCALL_COMM_ISEND, comm_isend, WITH_ANSWER, TDSPEC(result, smx_action_t), TDSPEC(rdv, smx_rdv_t), TDOUBLE(task_size), TDOUBLE(rate), TDPTR(src_buff), TSIZE(src_buff_size), TFSPEC(match_fun, simix_match_func_t), TFSPEC(clean_fun, simix_clean_func_t), TDPTR(data), TINT(detached)) sep \
+ACTION(SIMCALL_COMM_RECV, comm_recv, WITHOUT_ANSWER, TVOID(result), TDSPEC(rdv, smx_rdv_t), TDPTR(dst_buff), TDSPEC(dst_buff_size, size_t*), TFSPEC(match_fun, simix_match_func_t), TDPTR(data), TDOUBLE(timeout)) sep \
+ACTION(SIMCALL_COMM_IRECV, comm_irecv, WITH_ANSWER, TDSPEC(result, smx_action_t), TDSPEC(rdv, smx_rdv_t), TDPTR(dst_buff), TDSPEC(dst_buff_size, size_t*), TFSPEC(match_fun, simix_match_func_t), TDPTR(data)) sep \
+ACTION(SIMCALL_COMM_RECV_BOUNDED, comm_recv_bounded, WITHOUT_ANSWER, TVOID(result), TDSPEC(rdv, smx_rdv_t), TDPTR(dst_buff), TDSPEC(dst_buff_size, size_t*), TFSPEC(match_fun, simix_match_func_t), TDPTR(data), TDOUBLE(timeout), TDOUBLE(rate)) sep \
+ACTION(SIMCALL_COMM_IRECV_BOUNDED, comm_irecv_bounded, WITH_ANSWER, TDSPEC(result, smx_action_t), TDSPEC(rdv, smx_rdv_t), TDPTR(dst_buff), TDSPEC(dst_buff_size, size_t*), TFSPEC(match_fun, simix_match_func_t), TDPTR(data), TDOUBLE(rate)) sep \
+ACTION(SIMCALL_COMM_DESTROY, comm_destroy, WITH_ANSWER, TVOID(result), TDSPEC(comm, smx_action_t)) sep \
+ACTION(SIMCALL_COMM_CANCEL, comm_cancel, WITH_ANSWER, TVOID(result), TDSPEC(comm, smx_action_t)) sep \
+ACTION(SIMCALL_COMM_WAITANY, comm_waitany, WITHOUT_ANSWER, TINT(result), TDSPEC(comms, xbt_dynar_t)) sep \
+ACTION(SIMCALL_COMM_WAIT, comm_wait, WITHOUT_ANSWER, TVOID(result), TDSPEC(comm, smx_action_t), TDOUBLE(timeout)) sep \
+ACTION(SIMCALL_COMM_TEST, comm_test, WITHOUT_ANSWER, TINT(result), TDSPEC(comm, smx_action_t)) sep \
+ACTION(SIMCALL_COMM_TESTANY, comm_testany, WITHOUT_ANSWER, TINT(result), TDSPEC(comms, xbt_dynar_t)) sep \
+ACTION(SIMCALL_COMM_GET_REMAINS, comm_get_remains, WITH_ANSWER, TDOUBLE(result), TDSPEC(comm, smx_action_t)) sep \
+ACTION(SIMCALL_COMM_GET_STATE, comm_get_state, WITH_ANSWER, TINT(result), TDSPEC(comm, smx_action_t)) sep \
+ACTION(SIMCALL_COMM_GET_SRC_DATA, comm_get_src_data, WITH_ANSWER, TDPTR(result), TDSPEC(comm, smx_action_t)) sep \
+ACTION(SIMCALL_COMM_GET_DST_DATA, comm_get_dst_data, WITH_ANSWER, TDPTR(result), TDSPEC(comm, smx_action_t)) sep \
+ACTION(SIMCALL_COMM_GET_SRC_PROC, comm_get_src_proc, WITH_ANSWER, TDSPEC(result, smx_process_t), TDSPEC(comm, smx_action_t)) sep \
+ACTION(SIMCALL_COMM_GET_DST_PROC, comm_get_dst_proc, WITH_ANSWER, TDSPEC(result, smx_process_t), TDSPEC(comm, smx_action_t)) sep \
+ACTION(SIMCALL_MUTEX_INIT, mutex_init, WITH_ANSWER, TDSPEC(result, smx_mutex_t)) sep \
+ACTION(SIMCALL_MUTEX_DESTROY, mutex_destroy, WITH_ANSWER, TVOID(result), TDSPEC(mutex, smx_mutex_t)) sep \
+ACTION(SIMCALL_MUTEX_LOCK, mutex_lock, WITHOUT_ANSWER, TVOID(result), TDSPEC(mutex, smx_mutex_t)) sep \
+ACTION(SIMCALL_MUTEX_TRYLOCK, mutex_trylock, WITH_ANSWER, TINT(result), TDSPEC(mutex, smx_mutex_t)) sep \
+ACTION(SIMCALL_MUTEX_UNLOCK, mutex_unlock, WITH_ANSWER, TVOID(result), TDSPEC(mutex, smx_mutex_t)) sep \
+ACTION(SIMCALL_COND_INIT, cond_init, WITH_ANSWER, TDSPEC(result, smx_cond_t)) sep \
+ACTION(SIMCALL_COND_DESTROY, cond_destroy, WITH_ANSWER, TVOID(result), TDSPEC(cond, smx_cond_t)) sep \
+ACTION(SIMCALL_COND_SIGNAL, cond_signal, WITH_ANSWER, TVOID(result), TDSPEC(cond, smx_cond_t)) sep \
+ACTION(SIMCALL_COND_WAIT, cond_wait, WITHOUT_ANSWER, TVOID(result), TDSPEC(cond, smx_cond_t), TDSPEC(mutex, smx_mutex_t)) sep \
+ACTION(SIMCALL_COND_WAIT_TIMEOUT, cond_wait_timeout, WITHOUT_ANSWER, TVOID(result), TDSPEC(cond, smx_cond_t), TDSPEC(mutex, smx_mutex_t), TDOUBLE(timeout)) sep \
+ACTION(SIMCALL_COND_BROADCAST, cond_broadcast, WITH_ANSWER, TVOID(result), TDSPEC(cond, smx_cond_t)) sep \
+ACTION(SIMCALL_SEM_INIT, sem_init, WITH_ANSWER, TDSPEC(result, smx_sem_t), TINT(capacity)) sep \
+ACTION(SIMCALL_SEM_DESTROY, sem_destroy, WITH_ANSWER, TVOID(result), TDSPEC(sem, smx_sem_t)) sep \
+ACTION(SIMCALL_SEM_RELEASE, sem_release, WITH_ANSWER, TVOID(result), TDSPEC(sem, smx_sem_t)) sep \
+ACTION(SIMCALL_SEM_WOULD_BLOCK, sem_would_block, WITH_ANSWER, TINT(result), TDSPEC(sem, smx_sem_t)) sep \
+ACTION(SIMCALL_SEM_ACQUIRE, sem_acquire, WITHOUT_ANSWER, TVOID(result), TDSPEC(sem, smx_sem_t)) sep \
+ACTION(SIMCALL_SEM_ACQUIRE_TIMEOUT, sem_acquire_timeout, WITHOUT_ANSWER, TVOID(result), TDSPEC(sem, smx_sem_t), TDOUBLE(timeout)) sep \
+ACTION(SIMCALL_SEM_GET_CAPACITY, sem_get_capacity, WITH_ANSWER, TINT(result), TDSPEC(sem, smx_sem_t)) sep \
+ACTION(SIMCALL_FILE_READ, file_read, WITHOUT_ANSWER, TSIZE(result), TDPTR(ptr), TSIZE(size), TDSPEC(fd, smx_file_t)) sep \
+ACTION(SIMCALL_FILE_WRITE, file_write, WITHOUT_ANSWER, TSIZE(result), TCPTR(ptr), TSIZE(size), TDSPEC(fd, smx_file_t)) sep \
+ACTION(SIMCALL_FILE_OPEN, file_open, WITHOUT_ANSWER, TDSPEC(result, smx_file_t), TSTRING(mount), TSTRING(path)) sep \
+ACTION(SIMCALL_FILE_CLOSE, file_close, WITHOUT_ANSWER, TINT(result), TDSPEC(fd, smx_file_t)) sep \
+ACTION(SIMCALL_FILE_UNLINK, file_unlink, WITH_ANSWER, TINT(result), TDSPEC(fd, smx_file_t)) sep \
+ACTION(SIMCALL_FILE_LS, file_ls, WITHOUT_ANSWER, TDSPEC(result, xbt_dict_t), TSTRING(mount), TSTRING(path)) sep \
+ACTION(SIMCALL_FILE_GET_SIZE, file_get_size, WITH_ANSWER, TSIZE(result), TDSPEC(fd, smx_file_t)) sep \
+ACTION(SIMCALL_ASR_GET_PROPERTIES, asr_get_properties, WITH_ANSWER, TDSPEC(result, xbt_dict_t), TSTRING(name)) sep
/* SIMCALL_COMM_IS_LATENCY_BOUNDED and SIMCALL_SET_CATEGORY make things complicated
* because they are not always present */
#ifdef HAVE_LATENCY_BOUND_TRACKING
#define SIMCALL_LIST2(ACTION, sep) \
-ACTION(SIMCALL_COMM_IS_LATENCY_BOUNDED, comm_is_latency_bounded, WITH_ANSWER, TINT(result), TSPEC(comm, smx_action_t)) sep
+ACTION(SIMCALL_COMM_IS_LATENCY_BOUNDED, comm_is_latency_bounded, WITH_ANSWER, TINT(result), TDSPEC(comm, smx_action_t)) sep
#else
#define SIMCALL_LIST2(ACTION, sep)
#endif
#ifdef HAVE_TRACING
#define SIMCALL_LIST3(ACTION, sep) \
-ACTION(SIMCALL_SET_CATEGORY, set_category, WITH_ANSWER, TVOID(result), TSPEC(action, smx_action_t), TSTRING(category)) sep
+ACTION(SIMCALL_SET_CATEGORY, set_category, WITH_ANSWER, TVOID(result), TDSPEC(action, smx_action_t), TSTRING(category)) sep
#else
#define SIMCALL_LIST3(ACTION, sep)
#endif
#ifdef HAVE_MC
#define SIMCALL_LIST4(ACTION, sep) \
-ACTION(SIMCALL_MC_SNAPSHOT, mc_snapshot, WITH_ANSWER, TPTR(result)) sep \
-ACTION(SIMCALL_MC_COMPARE_SNAPSHOTS, mc_compare_snapshots, WITH_ANSWER, TINT(result), TPTR(s1), TPTR(s2)) sep \
+ACTION(SIMCALL_MC_SNAPSHOT, mc_snapshot, WITH_ANSWER, TDPTR(result)) sep \
+ACTION(SIMCALL_MC_COMPARE_SNAPSHOTS, mc_compare_snapshots, WITH_ANSWER, TINT(result), TDPTR(s1), TDPTR(s2)) sep \
ACTION(SIMCALL_MC_RANDOM, mc_random, WITH_ANSWER, TINT(result)) sep
#else
#define SIMCALL_LIST4(ACTION, sep)
typedef int (*simix_match_func_t)(void *, void *, smx_action_t);
typedef void (*simix_clean_func_t)(void *);
+typedef void (*FPtr)(void); // Hide the ugliness
/* Pack all possible scalar types in an union */
union u_smx_scalar {
float f;
double d;
size_t si;
- void* p;
+ void* dp;
+ FPtr fp;
const void* cp;
};
};
} s_smx_simcall_t, *smx_simcall_t;
+#ifdef __cplusplus
+extern "C" {
+#endif
SIMCALL_LIST(SIMCALL_RES_GETSET, SIMCALL_SEP_NOTHING)
SIMCALL_LIST(SIMCALL_ARG_GETSET, SIMCALL_SEP_NOTHING)
+#ifdef __cplusplus
+}
+#endif
/******************************** General *************************************/
************/
class Cpu : public Resource {
public:
- Cpu(CpuModelPtr model, string name, xbt_dict_t properties) : Resource(model, name, properties) {};
+ Cpu(CpuModelPtr model, const char* name, xbt_dict_t properties) : Resource(model, name, properties) {};
CpuActionPtr execute(double size);
CpuActionPtr sleep(double duration);
e_surf_resource_state_t getState();
#include "cpu_ti.hpp"
-#include "solver.hpp"
+//#include "solver.hpp"
+#include "trace_mgr_private.h"
+#include "xbt/heap.h"
#ifndef SURF_MODEL_CPUTI_H_
#define SURF_MODEL_CPUTI_H_
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_tii, surf,
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surfpp_cpu_tii, surfpp,
"Logging specific to the SURF CPU TRACE INTEGRATION module");
-static std::vector<CpuTiActionPtr>
- cpu_ti_running_action_set_that_does_not_need_being_checked;
-static std::vector<CpuTiPtr> cpu_ti_modified_cpu;
-static std::vector<CpuTiActionPtr> cpu_ti_action_heap;
+static xbt_swag_t cpu_ti_running_action_set_that_does_not_need_being_checked;
+static xbt_swag_t cpu_ti_modified_cpu;
+static xbt_heap_t cpu_ti_action_heap;
+
+static CpuTiModelPtr surf_cpu_model = NULL;
+
+static void cpu_ti_action_update_index_heap(void *action, int i);
/*********
* Trace *
*********/
-static double surf_cpu_ti_integrate_trace(surf_cpu_ti_tgmr_t trace,
- double a, double b);
-
-
-static double surf_cpu_ti_solve_trace(surf_cpu_ti_tgmr_t trace, double a,
- double amount);
-static double surf_cpu_ti_solve_trace_somewhat_simple(surf_cpu_ti_tgmr_t
- trace, double a,
- double amount);
-
-static void surf_cpu_ti_free_tmgr(surf_cpu_ti_tgmr_t trace);
-static double surf_cpu_ti_integrate_trace_simple(surf_cpu_ti_trace_t trace,
- double a, double b);
-static double surf_cpu_ti_integrate_trace_simple_point(surf_cpu_ti_trace_t
- trace, double a);
-static double surf_cpu_ti_solve_trace_simple(surf_cpu_ti_trace_t trace,
- double a, double amount);
-static int surf_cpu_ti_binary_search(double *array, double a, int low,
- int high);
-
-static void surf_cpu_ti_free_trace(surf_cpu_ti_trace_t trace)
+CpuTiTrace::CpuTiTrace(tmgr_trace_t power_trace)
{
- xbt_free(trace->time_points);
- xbt_free(trace->integral);
- xbt_free(trace);
-}
-
-static void surf_cpu_ti_free_tmgr(surf_cpu_ti_tgmr_t trace)
-{
- if (trace->trace)
- surf_cpu_ti_free_trace(trace->trace);
- xbt_free(trace);
-}
-
-static surf_cpu_ti_trace_t surf_cpu_ti_trace_new(tmgr_trace_t power_trace)
-{
- surf_cpu_ti_trace_t trace;
s_tmgr_event_t val;
unsigned int cpt;
double integral = 0;
double time = 0;
int i = 0;
- trace = xbt_new0(s_surf_cpu_ti_trace_t, 1);
- trace->time_points = (double*) xbt_malloc0(sizeof(double) *
+ p_timePoints = (double*) xbt_malloc0(sizeof(double) *
(xbt_dynar_length(power_trace->s_list.event_list) + 1));
- trace->integral = (double*) xbt_malloc0(sizeof(double) *
+ p_integral = (double*) xbt_malloc0(sizeof(double) *
(xbt_dynar_length(power_trace->s_list.event_list) + 1));
- trace->nb_points = xbt_dynar_length(power_trace->s_list.event_list);
+ m_nbPoints = xbt_dynar_length(power_trace->s_list.event_list);
xbt_dynar_foreach(power_trace->s_list.event_list, cpt, val) {
- trace->time_points[i] = time;
- trace->integral[i] = integral;
+ p_timePoints[i] = time;
+ p_integral[i] = integral;
integral += val.delta * val.value;
time += val.delta;
i++;
}
- trace->time_points[i] = time;
- trace->integral[i] = integral;
- return trace;
+ p_timePoints[i] = time;
+ p_integral[i] = integral;
+}
+
+CpuTiTrace::~CpuTiTrace()
+{
+ xbt_free(p_timePoints);
+ xbt_free(p_integral);
+}
+
+CpuTiTgmr::~CpuTiTgmr()
+{
+ if (p_trace)
+ delete p_trace;
}
/**
* \param b End of interval
* \return the integrate value. -1 if an error occurs.
*/
-static double surf_cpu_ti_integrate_trace(surf_cpu_ti_tgmr_t trace,
- double a, double b)
+double CpuTiTgmr::integrate(double a, double b)
{
double first_chunk;
double middle_chunk;
if (a == b)
return 0.0;
- if (trace->type == TRACE_FIXED) {
- return ((b - a) * trace->value);
+ if (m_type == TRACE_FIXED) {
+ return ((b - a) * m_value);
}
- if (ceil(a / trace->last_time) == a / trace->last_time)
- a_index = 1 + (int) (ceil(a / trace->last_time));
+ if (ceil(a / m_lastTime) == a / m_lastTime)
+ a_index = 1 + (int) (ceil(a / m_lastTime));
else
- a_index = (int) (ceil(a / trace->last_time));
+ a_index = (int) (ceil(a / m_lastTime));
- b_index = (int) (floor(b / trace->last_time));
+ b_index = (int) (floor(b / m_lastTime));
if (a_index > b_index) { /* Same chunk */
- return surf_cpu_ti_integrate_trace_simple(trace->trace,
- a - (a_index -
- 1) * trace->last_time,
- b -
- (b_index) *
- trace->last_time);
+ return p_trace->integrateSimple(a - (a_index -
+ 1) * m_lastTime,
+ b -
+ (b_index) *
+ m_lastTime);
}
- first_chunk = surf_cpu_ti_integrate_trace_simple(trace->trace,
- a - (a_index -
- 1) *
- trace->last_time,
- trace->last_time);
- middle_chunk = (b_index - a_index) * trace->total;
- last_chunk = surf_cpu_ti_integrate_trace_simple(trace->trace,
- 0.0,
- b -
- (b_index) *
- trace->last_time);
+ first_chunk = p_trace->integrateSimple(a - (a_index -
+ 1) *
+ m_lastTime,
+ m_lastTime);
+ middle_chunk = (b_index - a_index) * m_total;
+ last_chunk = p_trace->integrateSimple(0.0,
+ b -
+ (b_index) *
+ m_lastTime);
XBT_DEBUG("first_chunk=%.2f middle_chunk=%.2f last_chunk=%.2f\n",
first_chunk, middle_chunk, last_chunk);
* \param b Final point
* \return Integral
*/
-static double surf_cpu_ti_integrate_trace_simple(surf_cpu_ti_trace_t trace,
- double a, double b)
+double CpuTiTrace::integrateSimple(double a, double b)
{
- return surf_cpu_ti_integrate_trace_simple_point(trace,
- b) -
- surf_cpu_ti_integrate_trace_simple_point(trace, a);
+ return integrateSimplePoint(b) - integrateSimplePoint(a);
}
/**
* \param a point
* \return Integral
*/
-static double surf_cpu_ti_integrate_trace_simple_point(surf_cpu_ti_trace_t
- trace, double a)
+double CpuTiTrace::integrateSimplePoint(double a)
{
double integral = 0;
int ind;
double a_aux = a;
- ind =
- surf_cpu_ti_binary_search(trace->time_points, a, 0,
- trace->nb_points - 1);
- integral += trace->integral[ind];
+ ind = binarySearch(p_timePoints, a, 0, m_nbPoints - 1);
+ integral += p_integral[ind];
XBT_DEBUG
("a %lf ind %d integral %lf ind + 1 %lf ind %lf time +1 %lf time %lf",
- a, ind, integral, trace->integral[ind + 1], trace->integral[ind],
- trace->time_points[ind + 1], trace->time_points[ind]);
- double_update(&a_aux, trace->time_points[ind]);
+ a, ind, integral, p_integral[ind + 1], p_integral[ind],
+ p_timePoints[ind + 1], p_timePoints[ind]);
+ double_update(&a_aux, p_timePoints[ind]);
if (a_aux > 0)
integral +=
- ((trace->integral[ind + 1] -
- trace->integral[ind]) / (trace->time_points[ind + 1] -
- trace->time_points[ind])) * (a -
- trace->
- time_points
- [ind]);
+ ((p_integral[ind + 1] -
+ p_integral[ind]) / (p_timePoints[ind + 1] -
+ p_timePoints[ind])) * (a - p_timePoints[ind]);
XBT_DEBUG("Integral a %lf = %lf", a, integral);
return integral;
* \param amount Amount to be executed
* \return End time
*/
-static double surf_cpu_ti_solve_trace(surf_cpu_ti_tgmr_t trace, double a,
- double amount)
+double CpuTiTgmr::solve(double a, double amount)
{
int quotient;
double reduced_b;
return a;
/* Is the trace fixed ? */
- if (trace->type == TRACE_FIXED) {
- return (a + (amount / trace->value));
+ if (m_type == TRACE_FIXED) {
+ return (a + (amount / m_value));
}
- XBT_DEBUG("amount %lf total %lf", amount, trace->total);
+ XBT_DEBUG("amount %lf total %lf", amount, m_total);
/* Reduce the problem to one where amount <= trace_total */
- quotient = (int) (floor(amount / trace->total));
- reduced_amount = (trace->total) * ((amount / trace->total) -
- floor(amount / trace->total));
- reduced_a = a - (trace->last_time) * (int) (floor(a / trace->last_time));
+ quotient = (int) (floor(amount / m_total));
+ reduced_amount = (m_total) * ((amount / m_total) -
+ floor(amount / m_total));
+ reduced_a = a - (m_lastTime) * (int) (floor(a / m_lastTime));
XBT_DEBUG("Quotient: %d reduced_amount: %lf reduced_a: %lf", quotient,
reduced_amount, reduced_a);
fprintf(stderr,"reduced_a = %.2f\n",reduced_a);
fprintf(stderr,"reduced_amount = %.2f\n",reduced_amount);
*/
- reduced_b =
- surf_cpu_ti_solve_trace_somewhat_simple(trace, reduced_a,
- reduced_amount);
+ reduced_b = solveSomewhatSimple(reduced_a, reduced_amount);
/* Re-map to the original b and amount */
- b = (trace->last_time) * (int) (floor(a / trace->last_time)) +
- (quotient * trace->last_time) + reduced_b;
+ b = (m_lastTime) * (int) (floor(a / m_lastTime)) +
+ (quotient * m_lastTime) + reduced_b;
return b;
}
* and a <=trace->last_time
*
*/
-static double surf_cpu_ti_solve_trace_somewhat_simple(surf_cpu_ti_tgmr_t
- trace, double a,
- double amount)
+double CpuTiTgmr::solveSomewhatSimple(double a, double amount)
{
double amount_till_end;
double b;
XBT_DEBUG("Solve integral: [%.2f, amount=%.2f]", a, amount);
- amount_till_end =
- surf_cpu_ti_integrate_trace(trace, a, trace->last_time);
+ amount_till_end = integrate(a, m_lastTime);
/*
fprintf(stderr,"amount_till_end=%.2f\n",amount_till_end);
*/
if (amount_till_end > amount) {
- b = surf_cpu_ti_solve_trace_simple(trace->trace, a, amount);
+ b = p_trace->solveSimple(a, amount);
} else {
- b = trace->last_time +
- surf_cpu_ti_solve_trace_simple(trace->trace, 0.0,
- amount - amount_till_end);
+ b = m_lastTime + p_trace->solveSimple(0.0, amount - amount_till_end);
}
return b;
}
* \param amount Amount of flops
* \return The date when amount is available.
*/
-static double surf_cpu_ti_solve_trace_simple(surf_cpu_ti_trace_t trace,
- double a, double amount)
+double CpuTiTrace::solveSimple(double a, double amount)
{
double integral_a;
int ind;
double time;
- integral_a = surf_cpu_ti_integrate_trace_simple_point(trace, a);
- ind =
- surf_cpu_ti_binary_search(trace->integral, integral_a + amount, 0,
- trace->nb_points - 1);
- time = trace->time_points[ind];
+ integral_a = integrateSimplePoint(a);
+ ind = binarySearch(p_integral, integral_a + amount, 0, m_nbPoints - 1);
+ time = p_timePoints[ind];
time +=
(integral_a + amount -
- trace->integral[ind]) / ((trace->integral[ind + 1] -
- trace->integral[ind]) /
- (trace->time_points[ind + 1] -
- trace->time_points[ind]));
+ p_integral[ind]) / ((p_integral[ind + 1] -
+ p_integral[ind]) /
+ (p_timePoints[ind + 1] -
+ p_timePoints[ind]));
return time;
}
+/**
+* \brief Auxiliary function to update the CPU power scale.
+*
+* This function uses the trace structure to return the power scale at the determined time a.
+* \param trace Trace structure to search the updated power scale
+* \param a Time
+* \return CPU power scale
+*/
+double CpuTiTgmr::getPowerScale(double a)
+{
+ double reduced_a;
+ int point;
+ s_tmgr_event_t val;
+
+ reduced_a = a - floor(a / m_lastTime) * m_lastTime;
+ point = p_trace->binarySearch(p_trace->p_timePoints, reduced_a, 0,
+ p_trace->m_nbPoints - 1);
+ xbt_dynar_get_cpy(p_powerTrace->s_list.event_list, point, &val);
+ return val.value;
+}
+
/**
* \brief Creates a new integration trace from a tmgr_trace_t
*
* \param spacing Initial spacing
* \return Integration trace structure
*/
-static surf_cpu_ti_tgmr_t cpu_ti_parse_trace(tmgr_trace_t power_trace,
- double value)
+CpuTiTgmr::CpuTiTgmr(tmgr_trace_t power_trace, double value)
{
- surf_cpu_ti_tgmr_t trace;
double total_time = 0.0;
s_tmgr_event_t val;
unsigned int cpt;
- trace = xbt_new0(s_surf_cpu_ti_tgmr_t, 1);
/* no availability file, fixed trace */
if (!power_trace) {
- trace->type = TRACE_FIXED;
- trace->value = value;
+ m_type = TRACE_FIXED;
+ m_value = value;
XBT_DEBUG("No availabily trace. Constant value = %lf", value);
- return trace;
+ return;
}
/* only one point available, fixed trace */
if (xbt_dynar_length(power_trace->s_list.event_list) == 1) {
xbt_dynar_get_cpy(power_trace->s_list.event_list, 0, &val);
- trace->type = TRACE_FIXED;
- trace->value = val.value;
- return trace;
+ m_type = TRACE_FIXED;
+ m_value = val.value;
+ return;
}
- trace->type = TRACE_DYNAMIC;
- trace->power_trace = power_trace;
+ m_type = TRACE_DYNAMIC;
+ p_powerTrace = power_trace;
/* count the total time of trace file */
xbt_dynar_foreach(power_trace->s_list.event_list, cpt, val) {
total_time += val.delta;
}
- trace->trace = surf_cpu_ti_trace_new(power_trace);
- trace->last_time = total_time;
- trace->total =
- surf_cpu_ti_integrate_trace_simple(trace->trace, 0, total_time);
+ p_trace = new CpuTiTrace(power_trace);
+ m_lastTime = total_time;
+ m_total = p_trace->integrateSimple(0, total_time);
XBT_DEBUG("Total integral %lf, last_time %lf ",
- trace->total, trace->last_time);
-
- return trace;
+ m_total, m_lastTime);
}
/**
* \param high Upper bound to search in array
* \return Index of point
*/
-static int surf_cpu_ti_binary_search(double *array, double a, int low,
- int high)
+int CpuTiTrace::binarySearch(double *array, double a, int low, int high)
{
xbt_assert(low < high, "Wrong parameters: low (%d) should be smaller than"
" high (%d)", low, high);
CpuTiModel::CpuTiModel() : CpuModel("cpu_ti")
{
-
+ xbt_assert(!surf_cpu_model,"CPU model already initialized. This should not happen.");
+ surf_cpu_model = this;
+ cpu_ti_action_heap = xbt_heap_new(8, NULL);
+ xbt_heap_set_update_callback(cpu_ti_action_heap,
+ cpu_ti_action_update_index_heap);
+
+ /* Define callbacks */
+ //TODO sg_platf_host_add_cb(parse_cpu_ti_init);
+ //TODO sg_platf_postparse_add_cb(add_traces_cpu_ti);
+
+ xbt_dynar_push(model_list, &surf_cpu_model);
+}
+
+CpuTiModel::~CpuTiModel()
+{
+ void **cpu;
+ xbt_lib_cursor_t cursor;
+ char *key;
+
+ xbt_lib_foreach(host_lib, cursor, key, cpu){
+ if(cpu[SURF_CPU_LEVEL])
+ {
+ CpuTiPtr CPU = (CpuTiPtr) cpu[SURF_CPU_LEVEL];
+ xbt_swag_free(CPU->p_actionSet);
+ delete CPU->p_availTrace;
+ }
+ }
+
+ delete surf_cpu_model;
+ surf_cpu_model = NULL;
+
+ xbt_swag_free
+ (cpu_ti_running_action_set_that_does_not_need_being_checked);
+ xbt_swag_free(cpu_ti_modified_cpu);
+ cpu_ti_running_action_set_that_does_not_need_being_checked = NULL;
+ xbt_heap_free(cpu_ti_action_heap);
+}
+
+void CpuTiModel::parseInit(sg_platf_host_cbarg_t host)
+{
+ createResource(host->id,
+ host->power_peak,
+ host->power_scale,
+ host->power_trace,
+ host->core_amount,
+ host->initial_state,
+ host->state_trace,
+ host->properties);
}
-CpuTiPtr CpuTiModel::createResource(string name,
+CpuTiPtr CpuTiModel::createResource(const char *name,
double powerPeak,
double powerScale,
tmgr_trace_t powerTrace,
s_tmgr_event_t val;
CpuTiActionPtr cpuAction;
xbt_assert(core==1,"Multi-core not handled with this model yet");
- /*TOREPAIR: xbt_assert(!surf_cpu_resource_priv(surf_cpu_resource_by_name(name)),
+ xbt_assert(!surf_cpu_resource_priv(surf_cpu_resource_by_name(name)),
"Host '%s' declared several times in the platform file",
- name);*/
+ name);
CpuTiPtr cpu = new CpuTi(this, name, powerPeak, powerScale, powerTrace,
core, stateInitial, stateTrace, cpuProperties);
- xbt_lib_set(host_lib, name.c_str(), SURF_CPU_LEVEL, cpu);
- return (CpuTiPtr) xbt_lib_get_elm_or_null(host_lib, name.c_str());
+ xbt_lib_set(host_lib, name, SURF_CPU_LEVEL, cpu);
+ return (CpuTiPtr) xbt_lib_get_elm_or_null(host_lib, name);
}
CpuTiActionPtr CpuTiModel::createAction(double cost, bool failed)
return NULL;//new CpuTiAction(this, cost, failed);
}
-void CpuTi::printCpuTiModel()
+double CpuTiModel::shareResources(double now)
{
- std::cout << getModel()->getName() << "<<plop"<< std::endl;
-};
+ void *_cpu, *_cpu_next;
+ double min_action_duration = -1;
+
+/* iterates over modified cpus to update share resources */
+ xbt_swag_foreach_safe(_cpu, _cpu_next, cpu_ti_modified_cpu) {
+ ((CpuTiPtr)_cpu)->updateActionFinishDate(now);
+ }
+/* get the min next event if heap not empty */
+ if (xbt_heap_size(cpu_ti_action_heap) > 0)
+ min_action_duration = xbt_heap_maxkey(cpu_ti_action_heap) - now;
+
+ XBT_DEBUG("Share resources, min next event date: %lf", min_action_duration);
+
+ return min_action_duration;
+}
+
+void CpuTiModel::updateActionsState(double now, double delta)
+{
+ while ((xbt_heap_size(cpu_ti_action_heap) > 0)
+ && (xbt_heap_maxkey(cpu_ti_action_heap) <= now)) {
+ CpuTiActionPtr action = (CpuTiActionPtr) xbt_heap_pop(cpu_ti_action_heap);
+ XBT_DEBUG("Action %p: finish", action);
+ action->m_finish = surf_get_clock();
+ /* set the remains to 0 due to precision problems when updating the remaining amount */
+ action->m_remains = 0;
+ action->setState(SURF_ACTION_DONE);
+ /* update remaining amout of all actions */
+ action->p_cpu->updateRemainingAmount(surf_get_clock());
+ }
+}
+
/************
* Resource *
************/
-CpuTi::CpuTi(CpuTiModelPtr model, string name, double powerPeak,
+CpuTi::CpuTi(CpuTiModelPtr model, const char *name, double powerPeak,
double powerScale, tmgr_trace_t powerTrace, int core,
e_surf_resource_state_t stateInitial, tmgr_trace_t stateTrace,
xbt_dict_t properties) :
Cpu(model, name, properties), m_powerPeak(powerPeak), m_powerScale(powerScale),
- m_stateCurrent(stateInitial) {
+ p_stateCurrent(stateInitial) {
tmgr_trace_t empty_trace;
s_tmgr_event_t val;
xbt_assert(core==1,"Multi-core not handled with this model yet");
XBT_DEBUG("power scale %lf", powerScale);
- m_availTrace = cpu_ti_parse_trace(powerTrace, powerScale);
+ p_availTrace = new CpuTiTgmr(powerTrace, powerScale);
if (stateTrace)
- /*TOREPAIR:m_stateEvent = tmgr_history_add_trace(history, stateTrace, 0.0, 0, this);*/
+ p_stateEvent = tmgr_history_add_trace(history, stateTrace, 0.0, 0, this);
if (powerTrace && xbt_dynar_length(powerTrace->s_list.event_list) > 1) {
// add a fake trace event if periodicity == 0
xbt_dynar_get_cpy(powerTrace->s_list.event_list,
xbt_dynar_length(powerTrace->s_list.event_list) - 1, &val);
- /*TOREPAIR:if (val.delta == 0) {
+ if (val.delta == 0) {
empty_trace = tmgr_empty_trace_new();
- m_powerEvent =
+ p_powerEvent =
tmgr_history_add_trace(history, empty_trace,
- m_availTrace->last_time, 0, this);
- }*/
+ p_availTrace->m_lastTime, 0, this);
+ }
}
};
-CpuTiModelPtr CpuTi::getModel() {
+void CpuTi::updateState(tmgr_trace_event_t event_type,
+ double value, double date)
+{
+ void *_action;
+ CpuTiActionPtr action;
+
+ surf_watched_hosts();
+
+ if (event_type == p_powerEvent) {
+ tmgr_trace_t power_trace;
+ CpuTiTgmrPtr trace;
+ s_tmgr_event_t val;
+
+ XBT_DEBUG("Finish trace date: %lf value %lf date %lf", surf_get_clock(),
+ value, date);
+ /* update remaining of actions and put in modified cpu swag */
+ updateRemainingAmount(date);
+ xbt_swag_insert(this, cpu_ti_modified_cpu);
+
+ power_trace = p_availTrace->p_powerTrace;
+ xbt_dynar_get_cpy(power_trace->s_list.event_list,
+ xbt_dynar_length(power_trace->s_list.event_list) - 1, &val);
+ /* free old trace */
+ delete p_availTrace;
+ m_powerScale = val.value;
+
+ trace = new CpuTiTgmr(TRACE_FIXED, val.value);
+ XBT_DEBUG("value %lf", val.value);
+
+ p_availTrace = trace;
+
+ if (tmgr_trace_event_free(event_type))
+ p_powerEvent = NULL;
+
+ } else if (event_type == p_stateEvent) {
+ if (value > 0)
+ p_stateCurrent = SURF_RESOURCE_ON;
+ else {
+ p_stateCurrent = SURF_RESOURCE_OFF;
+
+ /* put all action running on cpu to failed */
+ xbt_swag_foreach(_action, p_actionSet) {
+ action = (CpuTiActionPtr) _action;
+ if (action->getState() == SURF_ACTION_RUNNING
+ || action->getState() == SURF_ACTION_READY
+ || action->getState() == SURF_ACTION_NOT_IN_THE_SYSTEM) {
+ action->m_finish = date;
+ action->setState(SURF_ACTION_FAILED);
+ if (action->m_indexHeap >= 0) {
+ CpuTiActionPtr heap_act = (CpuTiActionPtr)
+ xbt_heap_remove(cpu_ti_action_heap, action->m_indexHeap);
+ if (heap_act != action)
+ DIE_IMPOSSIBLE;
+ }
+ }
+ }
+ }
+ if (tmgr_trace_event_free(event_type))
+ p_stateEvent = NULL;
+ } else {
+ XBT_CRITICAL("Unknown event ! \n");
+ xbt_abort();
+ }
+
+ return;
+}
+
+void CpuTi::updateActionFinishDate(double now)
+{
+ void *_action;
+ CpuTiActionPtr action;
+ double sum_priority = 0.0, total_area, min_finish = -1;
+
+/* update remaning amount of actions */
+updateRemainingAmount(now);
+
+ xbt_swag_foreach(_action, p_actionSet) {
+ action = (CpuTiActionPtr) _action;
+ /* action not running, skip it */
+ if (action->p_stateSet !=
+ surf_cpu_model->p_runningActionSet)
+ continue;
+
+ /* bogus priority, skip it */
+ if (action->m_priority <= 0)
+ continue;
+
+ /* action suspended, skip it */
+ if (action->m_suspended != 0)
+ continue;
+
+ sum_priority += 1.0 / action->m_priority;
+ }
+ m_sumPriority = sum_priority;
+
+ xbt_swag_foreach(_action, p_actionSet) {
+ action = (CpuTiActionPtr) _action;
+ min_finish = -1;
+ /* action not running, skip it */
+ if (action->p_stateSet !=
+ surf_cpu_model->p_runningActionSet)
+ continue;
+
+ /* verify if the action is really running on cpu */
+ if (action->m_suspended == 0 && action->m_priority > 0) {
+ /* total area needed to finish the action. Used in trace integration */
+ total_area =
+ (action->m_remains) * sum_priority *
+ action->m_priority;
+
+ total_area /= m_powerPeak;
+
+ action->m_finish = p_availTrace->solve(now, total_area);
+ /* verify which event will happen before (max_duration or finish time) */
+ if (action->m_maxDuration != NO_MAX_DURATION &&
+ action->m_start + action->m_maxDuration < action->m_finish)
+ min_finish = action->m_start + action->m_maxDuration;
+ else
+ min_finish = action->m_finish;
+ } else {
+ /* put the max duration time on heap */
+ if (action->m_maxDuration != NO_MAX_DURATION)
+ min_finish = action->m_start + action->m_maxDuration;
+ }
+ /* add in action heap */
+ XBT_DEBUG("action(%p) index %d", action, action->m_indexHeap);
+ if (action->m_indexHeap >= 0) {
+ CpuTiActionPtr heap_act = (CpuTiActionPtr)
+ xbt_heap_remove(cpu_ti_action_heap, action->m_indexHeap);
+ if (heap_act != action)
+ DIE_IMPOSSIBLE;
+ }
+ if (min_finish != NO_MAX_DURATION)
+ xbt_heap_push(cpu_ti_action_heap, action, min_finish);
+
+ XBT_DEBUG
+ ("Update finish time: Cpu(%s) Action: %p, Start Time: %lf Finish Time: %lf Max duration %lf",
+ m_name, action, action->m_start,
+ action->m_finish,
+ action->m_maxDuration);
+ }
+/* remove from modified cpu */
+ xbt_swag_remove(this, cpu_ti_modified_cpu);
+}
+
+CpuTiModelPtr CpuTi::getModel()
+{
return static_cast<CpuTiModelPtr>(p_model);
};
+bool CpuTi::isUsed()
+{
+ return xbt_swag_size(p_actionSet);
+}
+
+e_surf_resource_state_t CpuTi::getState()
+{
+ return m_stateCurrent;
+}
+
double CpuTi::getSpeed(double load)
{
return load * m_powerPeak;
double CpuTi::getAvailableSpeed()
{
- return 0;
+ m_powerScale = p_availTrace->getPowerScale(surf_get_clock());
+/* number between 0 and 1 */
+ return m_powerScale;
+}
+
+void CpuTi::addTraces()
+{
+ xbt_dict_cursor_t cursor = NULL;
+ char *trace_name, *elm;
+
+ static int called = 0;
+
+ if (called)
+ return;
+ called = 1;
+
+/* connect all traces relative to hosts */
+ xbt_dict_foreach(trace_connect_list_host_avail, cursor, trace_name, elm) {
+ tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name);
+ CpuTiPtr cpu = (CpuTiPtr) surf_cpu_resource_priv(surf_cpu_resource_by_name(elm));
+
+ xbt_assert(cpu, "Host %s undefined", elm);
+ xbt_assert(trace, "Trace %s undefined", trace_name);
+
+ if (cpu->p_stateEvent) {
+ XBT_DEBUG("Trace already configured for this CPU(%s), ignoring it",
+ elm);
+ continue;
+ }
+ XBT_DEBUG("Add state trace: %s to CPU(%s)", trace_name, elm);
+ cpu->p_stateEvent = tmgr_history_add_trace(history, trace, 0.0, 0, cpu);
+ }
+
+ xbt_dict_foreach(trace_connect_list_power, cursor, trace_name, elm) {
+ tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name);
+ CpuTiPtr cpu = (CpuTiPtr) surf_cpu_resource_priv(surf_cpu_resource_by_name(elm));
+
+ xbt_assert(cpu, "Host %s undefined", elm);
+ xbt_assert(trace, "Trace %s undefined", trace_name);
+
+ XBT_DEBUG("Add power trace: %s to CPU(%s)", trace_name, elm);
+ if (cpu->p_availTrace)
+ delete cpu->p_availTrace;
+
+ cpu->p_availTrace = new CpuTiTgmr(trace, cpu->m_powerScale);
+
+ /* add a fake trace event if periodicity == 0 */
+ if (trace && xbt_dynar_length(trace->s_list.event_list) > 1) {
+ s_tmgr_event_t val;
+ xbt_dynar_get_cpy(trace->s_list.event_list,
+ xbt_dynar_length(trace->s_list.event_list) - 1, &val);
+ if (val.delta == 0) {
+ tmgr_trace_t empty_trace;
+ empty_trace = tmgr_empty_trace_new();
+ cpu->p_powerEvent =
+ tmgr_history_add_trace(history, empty_trace,
+ cpu->p_availTrace->m_lastTime, 0, cpu);
+ }
+ }
+ }
}
+/**
+* \brief Update the remaining amount of actions
+*
+* \param now Current time
+*/
+void CpuTi::updateRemainingAmount(double now)
+{
+ double area_total;
+ void* _action;
+ CpuTiActionPtr action;
+
+ /* already updated */
+ if (m_lastUpdate >= now)
+ return;
+
+/* calcule the surface */
+ area_total = p_availTrace->integrate(m_lastUpdate, now) * m_powerPeak;
+ XBT_DEBUG("Flops total: %lf, Last update %lf", area_total,
+ m_lastUpdate);
+
+ xbt_swag_foreach(_action, p_actionSet) {
+ action = (CpuTiActionPtr) _action;
+ /* action not running, skip it */
+ if (action->p_stateSet !=
+ getModel()->p_runningActionSet)
+ continue;
+
+ /* bogus priority, skip it */
+ if (action->m_priority <= 0)
+ continue;
+
+ /* action suspended, skip it */
+ if (action->m_suspended != 0)
+ continue;
+
+ /* action don't need update */
+ if (action->m_start >= now)
+ continue;
+
+ /* skip action that are finishing now */
+ if (action->m_finish >= 0
+ && action->m_finish <= now)
+ continue;
+
+ /* update remaining */
+ double_update(&(action->m_remains),
+ area_total / (m_sumPriority *
+ action->m_priority));
+ XBT_DEBUG("Update remaining action(%p) remaining %lf", action,
+ action->m_remains);
+ }
+ m_lastUpdate = now;
+}
+
+CpuActionPtr CpuTi::execute(double size)
+{
+ XBT_IN("(%s,%g)", m_name, size);
+ CpuTiActionPtr action = new CpuTiAction(surf_cpu_model, size, p_stateCurrent != SURF_RESOURCE_ON);
+
+ action->p_cpu = this;
+ action->m_indexHeap = -1;
+
+ xbt_swag_insert(this, cpu_ti_modified_cpu);
+
+ xbt_swag_insert(action, p_actionSet);
+
+ action->m_suspended = 0; /* Should be useless because of the
+ calloc but it seems to help valgrind... */
+
+ XBT_OUT();
+ return action;
+}
+
+
+CpuActionPtr CpuTi::sleep(double duration)
+{
+ if (duration > 0)
+ duration = MAX(duration, MAXMIN_PRECISION);
+
+ XBT_IN("(%s,%g)", m_name, duration);
+ CpuActionPtr action = execute(1.0);
+ action->m_maxDuration = duration;
+ action->m_suspended = 2;
+ if (duration == NO_MAX_DURATION) {
+ /* Move to the *end* of the corresponding action set. This convention
+ is used to speed up update_resource_state */
+ xbt_swag_remove(action, action->p_stateSet);
+ action->p_stateSet = cpu_ti_running_action_set_that_does_not_need_being_checked;
+ xbt_swag_insert(action, action->p_stateSet);
+ }
+ XBT_OUT();
+ return action;
+}
+
+void CpuTi::printCpuTiModel()
+{
+ std::cout << getModel()->getName() << "<<plop"<< std::endl;
+};
+
/**********
* Action *
**********/
+static void cpu_ti_action_update_index_heap(void *action, int i)
+{
+ ((CpuTiActionPtr)action)->updateIndexHeap(i);
+}
+void CpuTiAction::updateIndexHeap(int i)
+{
+ m_indexHeap = i;
+}
-double CpuTiAction::getRemains()
+void CpuTiAction::setState(e_surf_action_state_t state)
{
- return 0;
+ Action::setState(state);
+ xbt_swag_insert(surf_cpu_resource_priv(p_cpu), cpu_ti_modified_cpu);
}
-double CpuTiAction::getStartTime()
+int CpuTiAction::unref()
{
+ m_refcount--;
+ if (!m_refcount) {
+ xbt_swag_remove(this, p_stateSet);
+ /* remove from action_set */
+ xbt_swag_remove(this, ((CpuTiPtr)surf_cpu_resource_priv(p_cpu))->p_actionSet);
+ /* remove from heap */
+ xbt_heap_remove(cpu_ti_action_heap, this->m_indexHeap);
+ xbt_swag_insert(surf_cpu_resource_priv(p_cpu), cpu_ti_modified_cpu);
+ delete this;
+ return 1;
+ }
return 0;
}
-double CpuTiAction::getFinishTime()
+void CpuTiAction::cancel()
{
- return 0;
+ this->setState(SURF_ACTION_FAILED);
+ xbt_heap_remove(cpu_ti_action_heap, this->m_indexHeap);
+ xbt_swag_insert(surf_cpu_resource_priv(p_cpu), cpu_ti_modified_cpu);
+ return;
+}
+
+void CpuTiAction::recycle()
+{
+ DIE_IMPOSSIBLE;
+}
+
+void CpuTiAction::suspend()
+{
+ XBT_IN("(%p)", this);
+ if (m_suspended != 2) {
+ m_suspended = 1;
+ xbt_heap_remove(cpu_ti_action_heap, m_indexHeap);
+ xbt_swag_insert(surf_cpu_resource_priv(p_cpu), cpu_ti_modified_cpu);
+ }
+ XBT_OUT();
+}
+
+void CpuTiAction::resume()
+{
+ XBT_IN("(%p)", this);
+ if (m_suspended != 2) {
+ m_suspended = 0;
+ xbt_swag_insert(surf_cpu_resource_priv(p_cpu), cpu_ti_modified_cpu);
+ }
+ XBT_OUT();
+}
+
+bool CpuTiAction::isSuspended()
+{
+ return m_suspended == 1;
+}
+
+void CpuTiAction::setMaxDuration(double duration)
+{
+ double min_finish;
+
+ XBT_IN("(%p,%g)", this, duration);
+
+ m_maxDuration = duration;
+
+ if (duration >= 0)
+ min_finish = (m_start + m_maxDuration) < m_finish ?
+ (m_start + m_maxDuration) : m_finish;
+ else
+ min_finish = m_finish;
+
+/* add in action heap */
+ if (m_indexHeap >= 0) {
+ CpuTiActionPtr heap_act = (CpuTiActionPtr)
+ xbt_heap_remove(cpu_ti_action_heap, m_indexHeap);
+ if (heap_act != this)
+ DIE_IMPOSSIBLE;
+ }
+ xbt_heap_push(cpu_ti_action_heap, this, min_finish);
+
+ XBT_OUT();
+}
+
+void CpuTiAction::setPriority(double priority)
+{
+ XBT_IN("(%p,%g)", this, priority);
+ m_priority = priority;
+ xbt_swag_insert(surf_cpu_resource_priv(p_cpu), cpu_ti_modified_cpu);
+ XBT_OUT();
+}
+
+double CpuTiAction::getRemains()
+{
+ XBT_IN("(%p)", this);
+ ((CpuTiPtr)p_cpu)->updateRemainingAmount(surf_get_clock());
+ XBT_OUT();
+ return m_remains;
+}
+
+static void check() {
+ CpuTiActionPtr cupAction = new CpuTiAction(NULL, 0, true);
}
#endif /* SURF_MODEL_CPUTI_H_ */
/***********
* Classes *
***********/
+class CpuTiTrace;
+typedef CpuTiTrace *CpuTiTracePtr;
+
+class CpuTiTgmr;
+typedef CpuTiTgmr *CpuTiTgmrPtr;
+
class CpuTiModel;
typedef CpuTiModel *CpuTiModelPtr;
/*********
* Trace *
*********/
-typedef struct surf_cpu_ti_trace {
- double *time_points;
- double *integral;
- int nb_points;
-} s_surf_cpu_ti_trace_t, *surf_cpu_ti_trace_t;
+class CpuTiTrace {
+public:
+ CpuTiTrace(tmgr_trace_t powerTrace);
+ ~CpuTiTrace();
+
+ double integrateSimple(double a, double b);
+ double integrateSimplePoint(double a);
+ double solveSimple(double a, double amount);
-enum trace_type {
+ double *p_timePoints;
+ double *p_integral;
+ int m_nbPoints;
+ int binarySearch(double *array, double a, int low, int high);
+
+private:
+};
+
+enum trace_type {
+
TRACE_FIXED, /*< Trace fixed, no availability file */
TRACE_DYNAMIC /*< Dynamic, availability file disponible */
};
-typedef struct surf_cpu_ti_tgmr {
- trace_type type;
- double value; /*< Percentage of cpu power disponible. Value fixed between 0 and 1 */
+class CpuTiTgmr {
+public:
+ CpuTiTgmr(trace_type type, double value): m_type(type), m_value(value){};
+ CpuTiTgmr(tmgr_trace_t power_trace, double value);
+ ~CpuTiTgmr();
- /* Dynamic */
- double last_time; /*< Integral interval last point (discret time) */
- double total; /*< Integral total between 0 and last_pointn */
+ double integrate(double a, double b);
+ double solve(double a, double amount);
+ double solveSomewhatSimple(double a, double amount);
+ double getPowerScale(double a);
- surf_cpu_ti_trace_t trace;
- tmgr_trace_t power_trace;
+ trace_type m_type;
+ double m_value; /*< Percentage of cpu power disponible. Value fixed between 0 and 1 */
-} s_surf_cpu_ti_tgmr_t, *surf_cpu_ti_tgmr_t;
+ /* Dynamic */
+ double m_lastTime; /*< Integral interval last point (discret time) */
+ double m_total; /*< Integral total between 0 and last_pointn */
+
+ CpuTiTracePtr p_trace;
+ tmgr_trace_t p_powerTrace;
+};
/*********
class CpuTiModel : public CpuModel {
public:
CpuTiModel();
- ~CpuTiModel() {}
+ ~CpuTiModel();
- CpuTiPtr createResource(string name, double power_peak, double power_scale,
+ void parseInit(sg_platf_host_cbarg_t host);
+ CpuTiPtr createResource(const char *name, double power_peak, double power_scale,
tmgr_trace_t power_trace, int core,
e_surf_resource_state_t state_initial,
tmgr_trace_t state_trace,
xbt_dict_t cpu_properties);
CpuTiActionPtr createAction(double cost, bool failed);
+ double shareResources(double now);
+ void updateActionsState(double now, double delta);
protected:
void NotifyResourceTurnedOn(ResourcePtr r){};
************/
class CpuTi : public Cpu {
public:
- CpuTi(CpuTiModelPtr model, string name, double powerPeak,
+ CpuTi(CpuTiModelPtr model, const char *name, double powerPeak,
double powerScale, tmgr_trace_t powerTrace, int core,
e_surf_resource_state_t stateInitial, tmgr_trace_t stateTrace,
xbt_dict_t properties) ;
~CpuTi() {};
- virtual double getSpeed (double load);
- virtual double getAvailableSpeed ();
+
+ void updateState(tmgr_trace_event_t event_type, double value, double date);
+ void updateActionFinishDate(double now);
+ bool isUsed();
+ double getSpeed (double load);
+ double getAvailableSpeed ();
+ void addTraces();
void printCpuTiModel();
CpuTiModelPtr getModel();
+ CpuActionPtr execute(double size);
+ CpuActionPtr sleep(double duration);
+ e_surf_resource_state_t getState();
double m_powerPeak; /*< CPU power peak */
double m_powerScale; /*< Percentage of CPU disponible */
- surf_cpu_ti_tgmr_t m_availTrace; /*< Structure with data needed to integrate trace file */
- e_surf_resource_state_t m_stateCurrent; /*< CPU current state (ON or OFF) */
- tmgr_trace_event_t m_stateEvent; /*< trace file with states events (ON or OFF) */
- tmgr_trace_event_t m_powerEvent; /*< trace file with availabitly events */
- std::vector<CpuTiActionPtr> m_actionSet; /*< set with all actions running on cpu */
- s_xbt_swag_hookup_t m_modifiedCpuHookup; /*< hookup to swag that indicacates whether share resources must be recalculated or not */
+ CpuTiTgmrPtr p_availTrace; /*< Structure with data needed to integrate trace file */
+ e_surf_resource_state_t p_stateCurrent; /*< CPU current state (ON or OFF) */
+ tmgr_trace_event_t p_stateEvent; /*< trace file with states events (ON or OFF) */
+ tmgr_trace_event_t p_powerEvent; /*< trace file with availabitly events */
+ xbt_swag_t p_actionSet; /*< set with all actions running on cpu */
+ s_xbt_swag_hookup_t p_modifiedCpuHookup; /*< hookup to swag that indicacates whether share resources must be recalculated or not */
double m_sumPriority; /*< the sum of actions' priority that are running on cpu */
double m_lastUpdate; /*< last update of actions' remaining amount done */
-
+ void updateRemainingAmount(double now);
};
/**********
public:
CpuTiAction(CpuTiModelPtr model, double cost, bool failed): CpuAction(model, cost, failed) {};
- virtual double getRemains();
- virtual double getStartTime();
- virtual double getFinishTime();
+ void setState(e_surf_action_state_t state);
+ int unref();
+ void cancel();
+ void recycle();
+ void updateIndexHeap(int i);
+ void suspend();
+ void resume();
+ bool isSuspended();
+ void setMaxDuration(double duration);
+ void setPriority(double priority);
+ double getRemains();
+ CpuTiPtr p_cpu;
+ int m_indexHeap;
+
+private:
};
#include "surf.hpp"
+#include "simix/smx_host_private.h"
+
+XBT_LOG_NEW_CATEGORY(surfpp, "All SURF categories");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surfpp_kernel, surfpp,
+ "Logging specific to SURF (kernel)");
+
+/*********
+ * Utils *
+ *********/
+
+//TODO:RENAME NOW
+double NOWW = 0;
+
+XBT_INLINE double surf_get_clock(void)
+{
+ return NOWW;
+}
+
+/* This function is a pimple that we ought to fix. But it won't be easy.
+ *
+ * The surf_solve() function does properly return the set of actions that changed.
+ * Instead, each model change a global data, and then the caller of surf_solve must
+ * pick into these sets of action_failed and action_done.
+ *
+ * This was not clean but ok as long as we didn't had to restart the processes when the resource comes back up.
+ * We worked by putting sentinel actions on every resources we are interested in,
+ * so that surf informs us if/when the corresponding resource fails.
+ *
+ * But this does not work to get Simix informed of when a resource comes back up, and this is where this pimple comes.
+ * We have a set of resources that are currently down and for which simix needs to know when it comes back up.
+ * And the current function is called *at every simulation step* to sweep over that set, searching for a resource
+ * that was turned back up in the meanwhile. This is UGLY and slow.
+ *
+ * The proper solution would be to not rely on globals for the action_failed and action_done swags.
+ * They must be passed as parameter by the caller (the handling of these actions in simix may let you
+ * think that these two sets can be merged, but their handling in SimDag induce the contrary unless this
+ * simdag code can check by itself whether the action is done of failed -- seems very doable, but yet more
+ * cleanup to do).
+ *
+ * Once surf_solve() is passed the set of actions that changed, you want to add a new set of resources back up
+ * as parameter to this function. You also want to add a boolean field "restart_watched" to each resource, and
+ * make sure that whenever a resource with this field enabled comes back up, it's added to that set so that Simix
+ * sees it and react accordingly. This would kill that need for surf to call simix.
+ *
+ */
+
+static void remove_watched_host(void *key)
+{
+ xbt_dict_remove(watched_hosts_lib, *(char**)key);
+}
+
+/*TODO: keepit void surf_watched_hosts(void)
+{
+ char *key;
+ void *_host;
+ smx_host_t host;
+ xbt_dict_cursor_t cursor;
+ xbt_dynar_t hosts = xbt_dynar_new(sizeof(char*), NULL);
+
+ XBT_DEBUG("Check for host SURF_RESOURCE_ON on watched_hosts_lib");
+ xbt_dict_foreach(watched_hosts_lib,cursor,key,_host)
+ {
+ host = (smx_host_t) host;
+ if(SIMIX_host_get_state(host) == SURF_RESOURCE_ON){
+ XBT_INFO("Restart processes on host: %s",SIMIX_host_get_name(host));
+ SIMIX_host_autorestart(host);
+ xbt_dynar_push_as(hosts, char*, key);
+ }
+ else
+ XBT_DEBUG("See SURF_RESOURCE_OFF on host: %s",key);
+ }
+ xbt_dynar_map(hosts, remove_watched_host);
+ xbt_dynar_free(&hosts);
+}*/
/*********
* Model *
/**********
* Action *
**********/
+/*TODO/const char *surf_action_state_names[6] = {
+ "SURF_ACTION_READY",
+ "SURF_ACTION_RUNNING",
+ "SURF_ACTION_FAILED",
+ "SURF_ACTION_DONE",
+ "SURF_ACTION_TO_FREE",
+ "SURF_ACTION_NOT_IN_THE_SYSTEM"
+};*/
+
+e_surf_action_state_t Action::getState()
+{
+ if (p_stateSet == p_model->p_readyActionSet)
+ return SURF_ACTION_READY;
+ if (p_stateSet == p_model->p_runningActionSet)
+ return SURF_ACTION_RUNNING;
+ if (p_stateSet == p_model->p_failedActionSet)
+ return SURF_ACTION_FAILED;
+ if (p_stateSet == p_model->p_doneActionSet)
+ return SURF_ACTION_DONE;
+ return SURF_ACTION_NOT_IN_THE_SYSTEM;
+}
+
+void Action::setState(e_surf_action_state_t state)
+{
+ //surf_action_state_t action_state = &(action->model_type->states);
+ XBT_IN("(%p,%s)", this, surf_action_state_names[state]);
+ xbt_swag_remove(this, p_stateSet);
+
+ if (state == SURF_ACTION_READY)
+ p_stateSet = p_model->p_readyActionSet;
+ else if (state == SURF_ACTION_RUNNING)
+ p_stateSet = p_model->p_runningActionSet;
+ else if (state == SURF_ACTION_FAILED)
+ p_stateSet = p_model->p_failedActionSet;
+ else if (state == SURF_ACTION_DONE)
+ p_stateSet = p_model->p_doneActionSet;
+ else
+ p_stateSet = NULL;
-void Action::cancel()
+ if (p_stateSet)
+ xbt_swag_insert(this, p_stateSet);
+ XBT_OUT();
+}
+
+double Action::getStartTime()
+{
+ return m_start;
+}
+
+double Action::getFinishTime()
+{
+ return m_finish;
+}
+
+void Action::setData(void* data)
+{
+ p_data = data;
+}
+
+/*void Action::cancel()
{
p_model->notifyActionCancel(this);
}
bool Action::isSuspended()
{
return false;
-}
+}*/
#include <boost/functional/factory.hpp>
#include <boost/bind.hpp>
#include "surf/trace_mgr.h"
+#include "xbt/lib.h"
+#include "surf/surf_routing.h"
+#include "simgrid/platf_interface.h"
extern tmgr_history_t history;
+#define NO_MAX_DURATION -1.0
using namespace std;
+// TODO: put in surf_private.hpp
+extern xbt_dict_t watched_hosts_lib;
+
+/** \ingroup SURF_simulation
+ * \brief Return the current time
+ *
+ * Return the current time in millisecond.
+ */
+
+/*********
+ * Utils *
+ *********/
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+XBT_PUBLIC(double) surf_get_clock(void);
+XBT_PUBLIC(void) surf_watched_hosts(void);
+#ifdef __cplusplus
+}
+#endif
+
+XBT_PUBLIC(int) SURF_CPU_LEVEL; //Surf cpu level
+
/***********
* Classes *
***********/
typedef Action* ActionPtr;
typedef boost::function<void (ActionPtr a)> ActionCallback;
+/*********
+ * Trace *
+ *********/
+/* For the trace and trace:connect tag (store their content till the end of the parsing) */
+XBT_PUBLIC_DATA(xbt_dict_t) traces_set_list;
+XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_host_avail;
+XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_power;
+XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_link_avail;
+XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_bandwidth;
+XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_latency;
+
+
/*********
* Model *
*********/
+XBT_PUBLIC_DATA(xbt_dynar_t) model_list;
+
class Model {
public:
Model(string name) {
m_resOnCB = m_resOffCB= 0;
m_actSuspendCB = m_actCancelCB = m_actResumeCB = 0;
}
- virtual ~Model() {}
+ virtual ~Model() {
+ xbt_swag_free(p_readyActionSet);
+ xbt_swag_free(p_runningActionSet);
+ xbt_swag_free(p_failedActionSet);
+ xbt_swag_free(p_doneActionSet);
+ }
ResourcePtr createResource(string name);
ActionPtr createAction(double _cost, bool _failed);
+ double shareResources(double now);
+ void updateActionsState(double now, double delta);
string getName() {return m_name;};
void notifyActionSuspend(ActionPtr a);
xbt_swag_t p_readyActionSet; /**< Actions in state SURF_ACTION_READY */
- xbt_swag_t runningActionSet; /**< Actions in state SURF_ACTION_RUNNING */
- xbt_swag_t failedActionSet; /**< Actions in state SURF_ACTION_FAILED */
- xbt_swag_t doneActionSet; /**< Actions in state SURF_ACTION_DONE */
+ xbt_swag_t p_runningActionSet; /**< Actions in state SURF_ACTION_RUNNING */
+ xbt_swag_t p_failedActionSet; /**< Actions in state SURF_ACTION_FAILED */
+ xbt_swag_t p_doneActionSet; /**< Actions in state SURF_ACTION_DONE */
protected:
std::vector<ActionPtr> m_failedActions, m_runningActions;
************/
class Resource {
public:
- Resource(ModelPtr model, string name, xbt_dict_t properties):
+ Resource(ModelPtr model, const char *name, xbt_dict_t properties):
m_name(name),m_running(true),p_model(model),m_properties(properties) {};
virtual ~Resource() {};
+ void updateState(tmgr_trace_event_t event_type, double value, double date);
+
+ //private
+ bool isUsed();
+ //TODOupdateActionState();
+ //TODOupdateResourceState();
+ //TODOfinilize();
+
bool isOn();
void turnOn();
void turnOff();
string getName();
ModelPtr getModel() {return p_model;};
void printModel() { std::cout << p_model->getName() << "<<plop"<<std::endl;};
-
+ void *p_resource;
+ e_surf_resource_state_t m_stateCurrent;
+
protected:
ModelPtr p_model;
- string m_name;
+ const char *m_name;
xbt_dict_t m_properties;
private:
bool m_running;
};
+static inline void *surf_cpu_resource_priv(const void *host) {
+ return xbt_lib_get_level((xbt_dictelm_t)host, SURF_CPU_LEVEL);
+}
+/*static inline void *surf_workstation_resource_priv(const void *host){
+ return xbt_lib_get_level((xbt_dictelm_t)host, SURF_WKS_LEVEL);
+}
+static inline void *surf_storage_resource_priv(const void *host){
+ return xbt_lib_get_level((xbt_dictelm_t)host, SURF_STORAGE_LEVEL);
+}*/
+
+static inline void *surf_cpu_resource_by_name(const char *name) {
+ return xbt_lib_get_elm_or_null(host_lib, name);
+}
+/*static inline void *surf_workstation_resource_by_name(const char *name){
+ return xbt_lib_get_elm_or_null(host_lib, name);
+}
+static inline void *surf_storage_resource_by_name(const char *name){
+ return xbt_lib_get_elm_or_null(storage_lib, name);*/
+
/**********
* Action *
**********/
*
* \see surf_action_t, surf_action_state_t
*/
+extern const char *surf_action_state_names[6];
+
typedef enum {
SURF_ACTION_READY = 0, /**< Ready */
SURF_ACTION_RUNNING, /**< Running */
class Action {
public:
Action(ModelPtr model, double cost, bool failed):
- m_cost(cost),p_model(model),m_failed(failed)
+ m_cost(cost), p_model(model), m_failed(failed),
+ m_refcount(1), m_priority(1.0), m_maxDuration(NO_MAX_DURATION),
+ m_start(surf_get_clock()), m_finish(-1.0)
{
m_priority = m_start = m_finish = m_maxDuration = -1.0;
m_start = 10;//surf_get_clock();
};
virtual ~Action() {};
- virtual e_surf_action_state_t getState()=0; /**< Return the state of an action */
- virtual void setState(e_surf_action_state_t state)=0; /**< Change an action state*/
- virtual double getStartTime()=0; /**< Return the start time of an action */
- virtual double getFinishTime()=0; /**< Return the finish time of an action */
+ e_surf_action_state_t getState(); /**< get the state*/
+ void setState(e_surf_action_state_t state); /**< Change state*/
+ double getStartTime(); /**< Return the start time of an action */
+ double getFinishTime(); /**< Return the finish time of an action */
+ void setData(void* data);
+
virtual int unref()=0; /**< Specify that we don't use that action anymore. Returns true if the action was destroyed and false if someone still has references on it. */
virtual void cancel()=0; /**< Cancel a running action */
virtual void recycle()=0; /**< Recycle an action */
+
void suspend(); /**< Suspend an action */
void resume(); /**< Resume a suspended action */
bool isSuspended(); /**< Return whether an action is suspended */
#ifdef HAVE_LATENCY_BOUND_TRACKING
int getLatencyLimited(); /**< Return 1 if action is limited by latency, 0 otherwise */
#endif
+ xbt_swag_t p_stateSet;
-
+ double m_priority; /**< priority (1.0 by default) */
+ bool m_failed;
+ bool m_suspended;
+ double m_start; /**< start time */
+ double m_finish; /**< finish time : this is modified during the run and fluctuates until the task is completed */
+ double m_remains; /**< How much of that cost remains to be done in the currently running task */
+ #ifdef HAVE_LATENCY_BOUND_TRACKING
+ int m_latencyLimited; /**< Set to 1 if is limited by latency, 0 otherwise */
+ #endif
+ double m_maxDuration; /*< max_duration (may fluctuate until the task is completed) */
protected:
ModelPtr p_model;
int m_cost;
- bool m_failed, m_suspended;
- double m_priority;
- double m_maxDuration;
- double m_start, m_finish;
+ int m_refcount;
+ void *p_data; /**< for your convenience */
+#ifdef HAVE_TRACING
+ char *p_category; /**< tracing category for categorized resource utilization monitoring */
+#endif
private:
int resourceUsed(void *resource_id);
#include "xbt/log.h"
#include "xbt/swag.h"
-
/** Creates a new swag.
* \param offset where the hookup is located in the structure
* \see xbt_swag_offset
