/**
* \brief Makes the current process do a simcall to the kernel and yields
- * until completion.
+ * until completion. If the current thread is maestro, we don't yield and
+ * execute the simcall directly.
* \param self the current process
*/
void SIMIX_simcall_push(smx_process_t self)
{
if (self != simix_global->maestro_process) {
XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
- SIMIX_simcall_name(self->simcall.call), self->simcall.call);
+ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
SIMIX_process_yield(self);
} else {
SIMIX_simcall_pre(&self->simcall, 0);
void SIMIX_simcall_answer(smx_simcall_t simcall)
{
if (simcall->issuer != simix_global->maestro_process){
- XBT_DEBUG("Answer simcall %s (%d) issued by %s (%p)", SIMIX_simcall_name(simcall->call), simcall->call,
+ 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; */
}
}
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);
SIMIX_pre_file_read(simcall);
break;
+ 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_NONE:
THROWF(arg_error,0,"Asked to do the noop syscall on %s@%s",
SIMIX_process_get_name(simcall->issuer),