-#include "private.h"
+#include "smx_private.h"
#include "xbt/fifo.h"
#include "xbt/xbt_os_thread.h"
+#include "../mc/mc_private.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_smurf, simix,
"Logging specific to SIMIX (SMURF)");
-XBT_INLINE smx_req_t SIMIX_req_mine()
+XBT_INLINE smx_simcall_t SIMIX_simcall_mine()
{
smx_process_t issuer = SIMIX_process_self();
- return &issuer->request;
+ return &issuer->simcall;
}
/**
- * \brief Makes the current process do a request to the kernel and yields
- * until completion.
+ * \brief Makes the current process do a simcall to the kernel and yields
+ * until completion. If the current thread is maestro, we don't yield and
+ * execute the simcall directly.
* \param self the current process
*/
-void SIMIX_request_push(smx_process_t self)
+void SIMIX_simcall_push(smx_process_t self)
{
if (self != simix_global->maestro_process) {
- XBT_DEBUG("Yield process '%s' on request of type %s (%d)", self->name,
- SIMIX_request_name(self->request.call), self->request.call);
+ XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
SIMIX_process_yield(self);
} else {
- SIMIX_request_pre(&self->request, 0);
+ XBT_DEBUG("I'm the maestro, execute the simcall directly");
+ SIMIX_simcall_pre(&self->simcall, 0);
}
}
-void SIMIX_request_answer(smx_req_t req)
+void SIMIX_simcall_answer(smx_simcall_t simcall)
{
- if (req->issuer != simix_global->maestro_process){
- XBT_DEBUG("Answer request %s (%d) issued by %s (%p)", SIMIX_request_name(req->call), req->call,
- req->issuer->name, req->issuer);
- req->issuer->request.call = REQ_NO_REQ;
- xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, req->issuer);
+ if (simcall->issuer != simix_global->maestro_process){
+ XBT_DEBUG("Answer simcall %s (%d) issued by %s (%p)", SIMIX_simcall_name(simcall->call), (int)simcall->call,
+ simcall->issuer->name, simcall->issuer);
+ simcall->issuer->simcall.call = SIMCALL_NONE;
+/* This check should be useless and slows everyone. Reactivate if you see something
+ * weird in process scheduling.
+ */
+/* if(!xbt_dynar_member(simix_global->process_to_run, &(simcall->issuer))) */
+ xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, simcall->issuer);
+/* else DIE_IMPOSSIBLE; */
}
}
-void SIMIX_request_pre(smx_req_t req, int value)
+void SIMIX_simcall_pre(smx_simcall_t simcall, int value)
{
+ XBT_DEBUG("Handling simcall %p: %s", simcall, SIMIX_simcall_name(simcall->call));
- switch (req->call) {
- case REQ_COMM_TEST:
- SIMIX_pre_comm_test(req);
+ switch (simcall->call) {
+ case SIMCALL_COMM_TEST:
+ SIMIX_pre_comm_test(simcall);
break;
- case REQ_COMM_TESTANY:
- SIMIX_pre_comm_testany(req, value);
+ case SIMCALL_COMM_TESTANY:
+ SIMIX_pre_comm_testany(simcall, value);
break;
- case REQ_COMM_WAIT:
- SIMIX_pre_comm_wait(req,
- req->comm_wait.comm,
- req->comm_wait.timeout,
+ case SIMCALL_COMM_WAIT:
+ SIMIX_pre_comm_wait(simcall,
+ simcall->comm_wait.comm,
+ simcall->comm_wait.timeout,
value);
break;
- case REQ_COMM_WAITANY:
- SIMIX_pre_comm_waitany(req, value);
+ case SIMCALL_COMM_WAITANY:
+ SIMIX_pre_comm_waitany(simcall, value);
break;
- case REQ_COMM_SEND:
+ case SIMCALL_COMM_SEND:
{
smx_action_t comm = SIMIX_comm_isend(
- req->issuer,
- req->comm_send.rdv,
- req->comm_send.task_size,
- req->comm_send.rate,
- req->comm_send.src_buff,
- req->comm_send.src_buff_size,
- req->comm_send.match_fun,
- req->comm_send.data,
+ simcall->issuer,
+ simcall->comm_send.rdv,
+ simcall->comm_send.task_size,
+ simcall->comm_send.rate,
+ simcall->comm_send.src_buff,
+ simcall->comm_send.src_buff_size,
+ simcall->comm_send.match_fun,
+ NULL, /* no clean function since it's not detached */
+ simcall->comm_send.data,
0);
- SIMIX_pre_comm_wait(req, comm, req->comm_send.timeout, 0);
+ SIMIX_pre_comm_wait(simcall, comm, simcall->comm_send.timeout, 0);
break;
}
- case REQ_COMM_ISEND:
- req->comm_isend.result = SIMIX_comm_isend(
- req->issuer,
- req->comm_isend.rdv,
- req->comm_isend.task_size,
- req->comm_isend.rate,
- req->comm_isend.src_buff,
- req->comm_isend.src_buff_size,
- req->comm_isend.match_fun,
- req->comm_isend.data,
- req->comm_isend.detached);
- SIMIX_request_answer(req);
- break;
-
- case REQ_COMM_RECV:
+ case SIMCALL_COMM_ISEND:
+ simcall->comm_isend.result = SIMIX_comm_isend(
+ simcall->issuer,
+ simcall->comm_isend.rdv,
+ simcall->comm_isend.task_size,
+ simcall->comm_isend.rate,
+ simcall->comm_isend.src_buff,
+ simcall->comm_isend.src_buff_size,
+ simcall->comm_isend.match_fun,
+ simcall->comm_isend.clean_fun,
+ simcall->comm_isend.data,
+ simcall->comm_isend.detached);
+ SIMIX_simcall_answer(simcall);
+ break;
+
+ case SIMCALL_COMM_RECV:
{
smx_action_t comm = SIMIX_comm_irecv(
- req->issuer,
- req->comm_recv.rdv,
- req->comm_recv.dst_buff,
- req->comm_recv.dst_buff_size,
- req->comm_recv.match_fun,
- req->comm_recv.data);
- SIMIX_pre_comm_wait(req, comm, req->comm_recv.timeout, 0);
+ simcall->issuer,
+ simcall->comm_recv.rdv,
+ simcall->comm_recv.dst_buff,
+ simcall->comm_recv.dst_buff_size,
+ simcall->comm_recv.match_fun,
+ simcall->comm_recv.data);
+ SIMIX_pre_comm_wait(simcall, comm, simcall->comm_recv.timeout, 0);
break;
}
- case REQ_COMM_IRECV:
- req->comm_irecv.result = SIMIX_comm_irecv(
- req->issuer,
- req->comm_irecv.rdv,
- req->comm_irecv.dst_buff,
- req->comm_irecv.dst_buff_size,
- req->comm_irecv.match_fun,
- req->comm_irecv.data);
- SIMIX_request_answer(req);
+ case SIMCALL_COMM_IRECV:
+ simcall->comm_irecv.result = SIMIX_comm_irecv(
+ simcall->issuer,
+ simcall->comm_irecv.rdv,
+ simcall->comm_irecv.dst_buff,
+ simcall->comm_irecv.dst_buff_size,
+ simcall->comm_irecv.match_fun,
+ simcall->comm_irecv.data);
+ SIMIX_simcall_answer(simcall);
+ break;
+
+ case SIMCALL_COMM_IPROBE:
+ simcall->comm_iprobe.result = SIMIX_comm_iprobe(
+ simcall->issuer,
+ simcall->comm_iprobe.rdv,
+ simcall->comm_iprobe.src,
+ simcall->comm_iprobe.tag,
+ simcall->comm_iprobe.match_fun,
+ simcall->comm_iprobe.data);
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_COMM_DESTROY:
- SIMIX_comm_destroy(req->comm_destroy.comm);
- SIMIX_request_answer(req);
+ case SIMCALL_COMM_DESTROY:
+ SIMIX_comm_destroy(simcall->comm_destroy.comm);
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_COMM_CANCEL:
- SIMIX_comm_cancel(req->comm_cancel.comm);
- SIMIX_request_answer(req);
+ case SIMCALL_COMM_CANCEL:
+ SIMIX_comm_cancel(simcall->comm_cancel.comm);
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_COMM_GET_REMAINS:
- req->comm_get_remains.result =
- SIMIX_comm_get_remains(req->comm_get_remains.comm);
- SIMIX_request_answer(req);
+ case SIMCALL_COMM_GET_REMAINS:
+ simcall->comm_get_remains.result =
+ SIMIX_comm_get_remains(simcall->comm_get_remains.comm);
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_COMM_GET_STATE:
- req->comm_get_state.result =
- SIMIX_comm_get_state(req->comm_get_state.comm);
- SIMIX_request_answer(req);
+ case SIMCALL_COMM_GET_STATE:
+ simcall->comm_get_state.result =
+ SIMIX_comm_get_state(simcall->comm_get_state.comm);
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_COMM_GET_SRC_DATA:
- req->comm_get_src_data.result = SIMIX_comm_get_src_data(req->comm_get_src_data.comm);
- SIMIX_request_answer(req);
+ case SIMCALL_COMM_GET_SRC_DATA:
+ simcall->comm_get_src_data.result = SIMIX_comm_get_src_data(simcall->comm_get_src_data.comm);
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_COMM_GET_DST_DATA:
- req->comm_get_dst_data.result = SIMIX_comm_get_dst_data(req->comm_get_dst_data.comm);
- SIMIX_request_answer(req);
+ case SIMCALL_COMM_GET_DST_DATA:
+ simcall->comm_get_dst_data.result = SIMIX_comm_get_dst_data(simcall->comm_get_dst_data.comm);
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_COMM_GET_SRC_PROC:
- req->comm_get_src_proc.result =
- SIMIX_comm_get_src_proc(req->comm_get_src_proc.comm);
- SIMIX_request_answer(req);
+ case SIMCALL_COMM_GET_SRC_PROC:
+ simcall->comm_get_src_proc.result =
+ SIMIX_comm_get_src_proc(simcall->comm_get_src_proc.comm);
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_COMM_GET_DST_PROC:
- req->comm_get_dst_proc.result =
- SIMIX_comm_get_dst_proc(req->comm_get_dst_proc.comm);
- SIMIX_request_answer(req);
+ case SIMCALL_COMM_GET_DST_PROC:
+ simcall->comm_get_dst_proc.result =
+ SIMIX_comm_get_dst_proc(simcall->comm_get_dst_proc.comm);
+ SIMIX_simcall_answer(simcall);
break;
#ifdef HAVE_LATENCY_BOUND_TRACKING
- case REQ_COMM_IS_LATENCY_BOUNDED:
- req->comm_is_latency_bounded.result =
- SIMIX_comm_is_latency_bounded(req->comm_is_latency_bounded.comm);
- SIMIX_request_answer(req);
+ case SIMCALL_COMM_IS_LATENCY_BOUNDED:
+ simcall->comm_is_latency_bounded.result =
+ SIMIX_comm_is_latency_bounded(simcall->comm_is_latency_bounded.comm);
+ SIMIX_simcall_answer(simcall);
break;
#endif
- case REQ_RDV_CREATE:
- req->rdv_create.result = SIMIX_rdv_create(req->rdv_create.name);
- SIMIX_request_answer(req);
+ case SIMCALL_RDV_CREATE:
+ simcall->rdv_create.result = SIMIX_rdv_create(simcall->rdv_create.name);
+ SIMIX_simcall_answer(simcall);
+ break;
+
+ case SIMCALL_RDV_DESTROY:
+ SIMIX_rdv_destroy(simcall->rdv_destroy.rdv);
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_RDV_DESTROY:
- SIMIX_rdv_destroy(req->rdv_destroy.rdv);
- SIMIX_request_answer(req);
+ case SIMCALL_RDV_GEY_BY_NAME:
+ simcall->rdv_get_by_name.result =
+ SIMIX_rdv_get_by_name(simcall->rdv_get_by_name.name);
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_RDV_GEY_BY_NAME:
- req->rdv_get_by_name.result =
- SIMIX_rdv_get_by_name(req->rdv_get_by_name.name);
- SIMIX_request_answer(req);
+ case SIMCALL_RDV_COMM_COUNT_BY_HOST:
+ simcall->rdv_comm_count_by_host.result = SIMIX_rdv_comm_count_by_host(
+ simcall->rdv_comm_count_by_host.rdv,
+ simcall->rdv_comm_count_by_host.host);
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_RDV_COMM_COUNT_BY_HOST:
- req->rdv_comm_count_by_host.result = SIMIX_rdv_comm_count_by_host(
- req->rdv_comm_count_by_host.rdv,
- req->rdv_comm_count_by_host.host);
- SIMIX_request_answer(req);
+ case SIMCALL_RDV_GET_HEAD:
+ simcall->rdv_get_head.result = SIMIX_rdv_get_head(simcall->rdv_get_head.rdv);
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_RDV_GET_HEAD:
- req->rdv_get_head.result = SIMIX_rdv_get_head(req->rdv_get_head.rdv);
- SIMIX_request_answer(req);
+ case SIMCALL_RDV_SET_RECV:
+ SIMIX_rdv_set_receiver(simcall->rdv_set_rcv_proc.rdv, simcall->rdv_set_rcv_proc.receiver);
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_HOST_GET_BY_NAME:
- req->host_get_by_name.result =
- SIMIX_host_get_by_name(req->host_get_by_name.name);
- SIMIX_request_answer(req);
+ case SIMCALL_RDV_GET_RECV:
+ simcall->rdv_get_rcv_proc.result = SIMIX_rdv_get_receiver(simcall->rdv_set_rcv_proc.rdv);
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_HOST_GET_NAME:
- req->host_get_name.result = SIMIX_host_get_name(req->host_get_name.host);
- SIMIX_request_answer(req);
+ case SIMCALL_HOST_GET_BY_NAME:
+ simcall->host_get_by_name.result =
+ SIMIX_host_get_by_name(simcall->host_get_by_name.name);
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_HOST_GET_PROPERTIES:
- req->host_get_properties.result =
- SIMIX_host_get_properties(req->host_get_properties.host);
- SIMIX_request_answer(req);
+ case SIMCALL_HOST_GET_NAME:
+ simcall->host_get_name.result = SIMIX_host_get_name(simcall->host_get_name.host);
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_HOST_GET_SPEED:
- req->host_get_speed.result =
- SIMIX_host_get_speed(req->host_get_speed.host);
- SIMIX_request_answer(req);
+ case SIMCALL_HOST_GET_PROPERTIES:
+ simcall->host_get_properties.result =
+ SIMIX_host_get_properties(simcall->host_get_properties.host);
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_HOST_GET_AVAILABLE_SPEED:
- req->host_get_available_speed.result =
- SIMIX_host_get_available_speed(req->host_get_available_speed.host);
- SIMIX_request_answer(req);
+ case SIMCALL_HOST_GET_SPEED:
+ simcall->host_get_speed.result =
+ SIMIX_host_get_speed(simcall->host_get_speed.host);
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_HOST_GET_STATE:
- req->host_get_state.result =
- SIMIX_host_get_state(req->host_get_state.host);
- SIMIX_request_answer(req);
+ case SIMCALL_HOST_GET_AVAILABLE_SPEED:
+ simcall->host_get_available_speed.result =
+ SIMIX_host_get_available_speed(simcall->host_get_available_speed.host);
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_HOST_GET_DATA:
- req->host_get_data.result = SIMIX_host_get_data(req->host_get_data.host);
- SIMIX_request_answer(req);
+ case SIMCALL_HOST_GET_STATE:
+ simcall->host_get_state.result =
+ SIMIX_host_get_state(simcall->host_get_state.host);
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_HOST_SET_DATA:
- SIMIX_host_set_data(req->host_set_data.host, req->host_set_data.data);
- SIMIX_request_answer(req);
+ case SIMCALL_HOST_GET_DATA:
+ simcall->host_get_data.result = SIMIX_host_get_data(simcall->host_get_data.host);
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_HOST_EXECUTE:
- req->host_execute.result = SIMIX_host_execute(
- req->host_execute.name,
- req->host_execute.host,
- req->host_execute.computation_amount,
- req->host_execute.priority);
- SIMIX_request_answer(req);
+ case SIMCALL_HOST_SET_DATA:
+ SIMIX_host_set_data(simcall->host_set_data.host, simcall->host_set_data.data);
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_HOST_PARALLEL_EXECUTE:
- req->host_parallel_execute.result = SIMIX_host_parallel_execute(
- req->host_parallel_execute.name,
- req->host_parallel_execute.host_nb,
- req->host_parallel_execute.host_list,
- req->host_parallel_execute.computation_amount,
- req->host_parallel_execute.communication_amount,
- req->host_parallel_execute.amount,
- req->host_parallel_execute.rate);
- SIMIX_request_answer(req);
+ case SIMCALL_HOST_EXECUTE:
+ simcall->host_execute.result = SIMIX_host_execute(
+ simcall->host_execute.name,
+ simcall->host_execute.host,
+ simcall->host_execute.computation_amount,
+ simcall->host_execute.priority);
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_HOST_EXECUTION_DESTROY:
- SIMIX_host_execution_destroy(req->host_execution_destroy.execution);
- SIMIX_request_answer(req);
+ case SIMCALL_HOST_PARALLEL_EXECUTE:
+ simcall->host_parallel_execute.result = SIMIX_host_parallel_execute(
+ simcall->host_parallel_execute.name,
+ simcall->host_parallel_execute.host_nb,
+ simcall->host_parallel_execute.host_list,
+ simcall->host_parallel_execute.computation_amount,
+ simcall->host_parallel_execute.communication_amount,
+ simcall->host_parallel_execute.amount,
+ simcall->host_parallel_execute.rate);
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_HOST_EXECUTION_CANCEL:
- SIMIX_host_execution_cancel(req->host_execution_cancel.execution);
- SIMIX_request_answer(req);
+ case SIMCALL_HOST_EXECUTION_DESTROY:
+ SIMIX_host_execution_destroy(simcall->host_execution_destroy.execution);
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_HOST_EXECUTION_GET_REMAINS:
- req->host_execution_get_remains.result =
- SIMIX_host_execution_get_remains(req->host_execution_get_remains.execution);
- SIMIX_request_answer(req);
+ case SIMCALL_HOST_EXECUTION_CANCEL:
+ SIMIX_host_execution_cancel(simcall->host_execution_cancel.execution);
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_HOST_EXECUTION_GET_STATE:
- req->host_execution_get_state.result =
- SIMIX_host_execution_get_state(req->host_execution_get_state.execution);
- SIMIX_request_answer(req);
+ case SIMCALL_HOST_EXECUTION_GET_REMAINS:
+ simcall->host_execution_get_remains.result =
+ SIMIX_host_execution_get_remains(simcall->host_execution_get_remains.execution);
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_HOST_EXECUTION_SET_PRIORITY:
+ case SIMCALL_HOST_EXECUTION_GET_STATE:
+ simcall->host_execution_get_state.result =
+ SIMIX_host_execution_get_state(simcall->host_execution_get_state.execution);
+ SIMIX_simcall_answer(simcall);
+ break;
+
+ case SIMCALL_HOST_EXECUTION_SET_PRIORITY:
SIMIX_host_execution_set_priority(
- req->host_execution_set_priority.execution,
- req->host_execution_set_priority.priority);
- SIMIX_request_answer(req);
+ simcall->host_execution_set_priority.execution,
+ simcall->host_execution_set_priority.priority);
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_HOST_EXECUTION_WAIT:
- SIMIX_pre_host_execution_wait(req);
+ case SIMCALL_HOST_EXECUTION_WAIT:
+ SIMIX_pre_host_execution_wait(simcall);
break;
- case REQ_PROCESS_CREATE:
+ case SIMCALL_PROCESS_CREATE:
SIMIX_process_create(
- req->process_create.process,
- req->process_create.name,
- req->process_create.code,
- req->process_create.data,
- req->process_create.hostname,
- req->process_create.argc,
- req->process_create.argv,
- req->process_create.properties);
- SIMIX_request_answer(req);
+ simcall->process_create.process,
+ simcall->process_create.name,
+ simcall->process_create.code,
+ simcall->process_create.data,
+ simcall->process_create.hostname,
+ simcall->process_create.kill_time,
+ simcall->process_create.argc,
+ simcall->process_create.argv,
+ simcall->process_create.properties,
+ simcall->process_create.auto_restart);
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_PROCESS_KILL:
- SIMIX_process_kill(req->process_kill.process);
- SIMIX_request_answer(req);
+ case SIMCALL_PROCESS_KILL:
+ SIMIX_process_kill(simcall->process_kill.process,simcall->issuer);
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_PROCESS_KILLALL:
- SIMIX_process_killall(req->issuer);
- SIMIX_request_answer(req);
+ case SIMCALL_PROCESS_KILLALL:
+ SIMIX_process_killall(simcall->issuer);
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_PROCESS_CLEANUP:
- SIMIX_process_cleanup(req->process_cleanup.process);
- SIMIX_request_answer(req);
+ case SIMCALL_PROCESS_CLEANUP:
+ SIMIX_process_cleanup(simcall->process_cleanup.process);
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_PROCESS_CHANGE_HOST:
+ case SIMCALL_PROCESS_CHANGE_HOST:
SIMIX_pre_process_change_host(
- req->process_change_host.process,
- req->process_change_host.dest);
- SIMIX_request_answer(req);
+ simcall->process_change_host.process,
+ simcall->process_change_host.dest);
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_PROCESS_SUSPEND:
- SIMIX_pre_process_suspend(req);
+ case SIMCALL_PROCESS_SUSPEND:
+ SIMIX_pre_process_suspend(simcall);
break;
- case REQ_PROCESS_RESUME:
- SIMIX_process_resume(req->process_resume.process, req->issuer);
- SIMIX_request_answer(req);
+ case SIMCALL_PROCESS_RESUME:
+ SIMIX_process_resume(simcall->process_resume.process, simcall->issuer);
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_PROCESS_COUNT:
- req->process_count.result = SIMIX_process_count();
- SIMIX_request_answer(req);
+ case SIMCALL_PROCESS_COUNT:
+ simcall->process_count.result = SIMIX_process_count();
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_PROCESS_GET_DATA:
- req->process_get_data.result =
- SIMIX_process_get_data(req->process_get_data.process);
- SIMIX_request_answer(req);
+ case SIMCALL_PROCESS_GET_DATA:
+ simcall->process_get_data.result =
+ SIMIX_process_get_data(simcall->process_get_data.process);
+ SIMIX_simcall_answer(simcall);
break;
-
- case REQ_PROCESS_SET_DATA:
+ case SIMCALL_PROCESS_ON_EXIT:
+ SIMIX_process_on_exit(simcall->process_on_exit.process,
+ simcall->process_on_exit.fun,
+ simcall->process_on_exit.data);
+ SIMIX_simcall_answer(simcall);
+ break;
+ case SIMCALL_PROCESS_RESTART:
+ simcall->process_restart.result = SIMIX_process_restart(simcall->process_restart.process, simcall->issuer);
+ SIMIX_simcall_answer(simcall);
+ break;
+ case SIMCALL_PROCESS_AUTO_RESTART_SET:
+ SIMIX_process_auto_restart_set(simcall->process_auto_restart.process,simcall->process_auto_restart.auto_restart);
+ SIMIX_simcall_answer(simcall);
+ break;
+ case SIMCALL_PROCESS_SET_DATA:
SIMIX_process_set_data(
- req->process_set_data.process,
- req->process_set_data.data);
- SIMIX_request_answer(req);
+ simcall->process_set_data.process,
+ simcall->process_set_data.data);
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_PROCESS_GET_HOST:
- req->process_get_host.result = SIMIX_process_get_host(req->process_get_host.process);
- SIMIX_request_answer(req);
+ case SIMCALL_PROCESS_GET_HOST:
+ simcall->process_get_host.result = SIMIX_process_get_host(simcall->process_get_host.process);
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_PROCESS_GET_NAME:
- req->process_get_name.result = SIMIX_process_get_name(req->process_get_name.process);
- SIMIX_request_answer(req);
+ case SIMCALL_PROCESS_GET_NAME:
+ simcall->process_get_name.result = SIMIX_process_get_name(simcall->process_get_name.process);
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_PROCESS_IS_SUSPENDED:
- req->process_is_suspended.result =
- SIMIX_process_is_suspended(req->process_is_suspended.process);
- SIMIX_request_answer(req);
+ case SIMCALL_PROCESS_IS_SUSPENDED:
+ simcall->process_is_suspended.result =
+ SIMIX_process_is_suspended(simcall->process_is_suspended.process);
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_PROCESS_GET_PROPERTIES:
- req->process_get_properties.result =
- SIMIX_process_get_properties(req->process_get_properties.process);
- SIMIX_request_answer(req);
+ case SIMCALL_PROCESS_GET_PROPERTIES:
+ simcall->process_get_properties.result =
+ SIMIX_process_get_properties(simcall->process_get_properties.process);
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_PROCESS_SLEEP:
- SIMIX_pre_process_sleep(req);
+ case SIMCALL_PROCESS_SLEEP:
+ SIMIX_pre_process_sleep(simcall);
break;
#ifdef HAVE_TRACING
- case REQ_SET_CATEGORY:
+ case SIMCALL_SET_CATEGORY:
SIMIX_set_category(
- req->set_category.action,
- req->set_category.category);
- SIMIX_request_answer(req);
+ simcall->set_category.action,
+ simcall->set_category.category);
+ SIMIX_simcall_answer(simcall);
break;
#endif
- case REQ_MUTEX_INIT:
- req->mutex_init.result = SIMIX_mutex_init();
- SIMIX_request_answer(req);
+ case SIMCALL_MUTEX_INIT:
+ simcall->mutex_init.result = SIMIX_mutex_init();
+ SIMIX_simcall_answer(simcall);
+ break;
+
+ case SIMCALL_MUTEX_DESTROY:
+ SIMIX_mutex_destroy(simcall->mutex_destroy.mutex);
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_MUTEX_DESTROY:
- SIMIX_mutex_destroy(req->mutex_destroy.mutex);
- SIMIX_request_answer(req);
+ case SIMCALL_MUTEX_LOCK:
+ SIMIX_pre_mutex_lock(simcall);
break;
- case REQ_MUTEX_LOCK:
- SIMIX_pre_mutex_lock(req);
+ case SIMCALL_MUTEX_TRYLOCK:
+ simcall->mutex_trylock.result =
+ SIMIX_mutex_trylock(simcall->mutex_trylock.mutex, simcall->issuer);
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_MUTEX_TRYLOCK:
- req->mutex_trylock.result =
- SIMIX_mutex_trylock(req->mutex_trylock.mutex, req->issuer);
- SIMIX_request_answer(req);
+ case SIMCALL_MUTEX_UNLOCK:
+ SIMIX_mutex_unlock(simcall->mutex_unlock.mutex, simcall->issuer);
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_MUTEX_UNLOCK:
- SIMIX_mutex_unlock(req->mutex_unlock.mutex, req->issuer);
- SIMIX_request_answer(req);
+ case SIMCALL_COND_INIT:
+ simcall->cond_init.result = SIMIX_cond_init();
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_COND_INIT:
- req->cond_init.result = SIMIX_cond_init();
- SIMIX_request_answer(req);
+ case SIMCALL_COND_DESTROY:
+ SIMIX_cond_destroy(simcall->cond_destroy.cond);
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_COND_DESTROY:
- SIMIX_cond_destroy(req->cond_destroy.cond);
- SIMIX_request_answer(req);
+ case SIMCALL_COND_SIGNAL:
+ SIMIX_cond_signal(simcall->cond_signal.cond);
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_COND_SIGNAL:
- SIMIX_cond_signal(req->cond_signal.cond);
- SIMIX_request_answer(req);
+ case SIMCALL_COND_WAIT:
+ SIMIX_pre_cond_wait(simcall);
break;
- case REQ_COND_WAIT:
- SIMIX_pre_cond_wait(req);
+ case SIMCALL_COND_WAIT_TIMEOUT:
+ SIMIX_pre_cond_wait_timeout(simcall);
break;
- case REQ_COND_WAIT_TIMEOUT:
- SIMIX_pre_cond_wait_timeout(req);
+ case SIMCALL_COND_BROADCAST:
+ SIMIX_cond_broadcast(simcall->cond_broadcast.cond);
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_COND_BROADCAST:
- SIMIX_cond_broadcast(req->cond_broadcast.cond);
- SIMIX_request_answer(req);
+ case SIMCALL_SEM_INIT:
+ simcall->sem_init.result = SIMIX_sem_init(simcall->sem_init.capacity);
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_SEM_INIT:
- req->sem_init.result = SIMIX_sem_init(req->sem_init.capacity);
- SIMIX_request_answer(req);
+ case SIMCALL_SEM_DESTROY:
+ SIMIX_sem_destroy(simcall->sem_destroy.sem);
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_SEM_DESTROY:
- SIMIX_sem_destroy(req->sem_destroy.sem);
- SIMIX_request_answer(req);
+ case SIMCALL_SEM_RELEASE:
+ SIMIX_sem_release(simcall->sem_release.sem);
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_SEM_RELEASE:
- SIMIX_sem_release(req->sem_release.sem);
- SIMIX_request_answer(req);
+ case SIMCALL_SEM_WOULD_BLOCK:
+ simcall->sem_would_block.result =
+ SIMIX_sem_would_block(simcall->sem_would_block.sem);
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_SEM_WOULD_BLOCK:
- req->sem_would_block.result =
- SIMIX_sem_would_block(req->sem_would_block.sem);
- SIMIX_request_answer(req);
+ case SIMCALL_SEM_ACQUIRE:
+ SIMIX_pre_sem_acquire(simcall);
break;
- case REQ_SEM_ACQUIRE:
- SIMIX_pre_sem_acquire(req);
+ case SIMCALL_SEM_ACQUIRE_TIMEOUT:
+ SIMIX_pre_sem_acquire_timeout(simcall);
break;
- case REQ_SEM_ACQUIRE_TIMEOUT:
- SIMIX_pre_sem_acquire_timeout(req);
+ case SIMCALL_SEM_GET_CAPACITY:
+ simcall->sem_get_capacity.result =
+ SIMIX_sem_get_capacity(simcall->sem_get_capacity.sem);
+ SIMIX_simcall_answer(simcall);
break;
- case REQ_SEM_GET_CAPACITY:
- req->sem_get_capacity.result =
- SIMIX_sem_get_capacity(req->sem_get_capacity.sem);
- SIMIX_request_answer(req);
+ case SIMCALL_FILE_READ:
+ SIMIX_pre_file_read(simcall);
break;
- case REQ_NO_REQ:
+ case SIMCALL_FILE_WRITE:
+ SIMIX_pre_file_write(simcall);
+ break;
+
+ case SIMCALL_FILE_OPEN:
+ SIMIX_pre_file_open(simcall);
+ break;
+
+ case SIMCALL_FILE_CLOSE:
+ SIMIX_pre_file_close(simcall);
+ break;
+
+ case SIMCALL_FILE_STAT:
+ SIMIX_pre_file_stat(simcall);
+ break;
+
+ case SIMCALL_FILE_UNLINK:
+ SIMIX_pre_file_unlink(simcall);
+ break;
+
+ case SIMCALL_FILE_LS:
+ SIMIX_pre_file_ls(simcall);
+ break;
+
+ case SIMCALL_ASR_GET_PROPERTIES:
+ simcall->asr_get_properties.result =
+ SIMIX_asr_get_properties(simcall->asr_get_properties.name);
+ SIMIX_simcall_answer(simcall);
+ break;
+
+#ifdef HAVE_MC
+ case SIMCALL_MC_SNAPSHOT:
+ simcall->mc_snapshot.s = MC_take_snapshot();
+ SIMIX_simcall_answer(simcall);
+ break;
+
+ case SIMCALL_MC_COMPARE_SNAPSHOTS:
+ simcall->mc_compare_snapshots.result =
+ snapshot_compare(simcall->mc_compare_snapshots.snapshot1, simcall->mc_compare_snapshots.snapshot2, NULL, NULL);
+ SIMIX_simcall_answer(simcall);
+ break;
+#endif /* HAVE_MC */
+
+ case SIMCALL_NONE:
THROWF(arg_error,0,"Asked to do the noop syscall on %s@%s",
- SIMIX_process_get_name(req->issuer),
- SIMIX_host_get_name(SIMIX_process_get_host(req->issuer))
+ SIMIX_process_get_name(simcall->issuer),
+ SIMIX_host_get_name(SIMIX_process_get_host(simcall->issuer))
);
break;
+ /* ****************************************************************************************** */
+ /* TUTORIAL: New API */
+ /* ****************************************************************************************** */
+ case SIMCALL_NEW_API_INIT:
+ SIMIX_pre_new_api_fct(simcall);
+ break;
}
}
-void SIMIX_request_post(smx_action_t action)
+void SIMIX_simcall_post(smx_action_t action)
{
switch (action->type) {
break;
case SIMIX_ACTION_IO:
+ SIMIX_post_io(action);
+ break;
+
+ /* ****************************************************************************************** */
+ /* TUTORIAL: New API */
+ /* ****************************************************************************************** */
+ case SIMIX_ACTION_NEW_API:
+ SIMIX_post_new_api(action);
break;
}
}
+
+/* New Simcal interface */
+
+/* FIXME: add types for every simcall */
+const char *simcall_types[NUM_SIMCALLS] = {"%d", "%d%f", "%l"};
+
+void SIMIX_simcall_typecheck(const char *fmt, ...)
+{
+ return;
+}
+
