A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #1 from mquinson/master
[simgrid.git]
/
src
/
simix
/
smx_process.cpp
diff --git
a/src/simix/smx_process.cpp
b/src/simix/smx_process.cpp
index
600de45
..
6078923
100644
(file)
--- a/
src/simix/smx_process.cpp
+++ b/
src/simix/smx_process.cpp
@@
-375,7
+375,7
@@
void SIMIX_process_kill(smx_process_t process, smx_process_t issuer) {
case SIMIX_SYNC_EXECUTE:
case SIMIX_SYNC_PARALLEL_EXECUTE:
case SIMIX_SYNC_EXECUTE:
case SIMIX_SYNC_PARALLEL_EXECUTE:
- SIMIX_
process_
execution_destroy(process->waiting_synchro);
+ SIMIX_execution_destroy(process->waiting_synchro);
break;
case SIMIX_SYNC_COMMUNICATE:
break;
case SIMIX_SYNC_COMMUNICATE:
@@
-432,7
+432,7
@@
void SIMIX_process_throw(smx_process_t process, xbt_errcat_t cat, int value, con
case SIMIX_SYNC_EXECUTE:
case SIMIX_SYNC_PARALLEL_EXECUTE:
case SIMIX_SYNC_EXECUTE:
case SIMIX_SYNC_PARALLEL_EXECUTE:
- SIMIX_
process_
execution_cancel(process->waiting_synchro);
+ SIMIX_execution_cancel(process->waiting_synchro);
break;
case SIMIX_SYNC_COMMUNICATE:
break;
case SIMIX_SYNC_COMMUNICATE:
@@
-512,7
+512,7
@@
void simcall_HANDLER_process_suspend(smx_simcall_t simcall, smx_process_t proces
} else {
xbt_fifo_push(sync_suspend->simcalls, simcall);
process->waiting_synchro = sync_suspend;
} else {
xbt_fifo_push(sync_suspend->simcalls, simcall);
process->waiting_synchro = sync_suspend;
- SIMIX_
host_
execution_suspend(process->waiting_synchro);
+ SIMIX_execution_suspend(process->waiting_synchro);
}
/* If we are suspending ourselves, then just do not finish the simcall now */
}
}
/* If we are suspending ourselves, then just do not finish the simcall now */
}
@@
-538,7
+538,7
@@
smx_synchro_t SIMIX_process_suspend(smx_process_t process, smx_process_t issuer)
case SIMIX_SYNC_EXECUTE:
case SIMIX_SYNC_PARALLEL_EXECUTE:
case SIMIX_SYNC_EXECUTE:
case SIMIX_SYNC_PARALLEL_EXECUTE:
- SIMIX_
host_
execution_suspend(process->waiting_synchro);
+ SIMIX_execution_suspend(process->waiting_synchro);
break;
case SIMIX_SYNC_COMMUNICATE:
break;
case SIMIX_SYNC_COMMUNICATE:
@@
-564,7
+564,7
@@
smx_synchro_t SIMIX_process_suspend(smx_process_t process, smx_process_t issuer)
}
} else {
/* FIXME: computation size is zero. Is it okay that bound is zero ? */
}
} else {
/* FIXME: computation size is zero. Is it okay that bound is zero ? */
- return SIMIX_
process_execute
(process, "suspend", 0.0, 1.0, 0.0, 0);
+ return SIMIX_
execution_start
(process, "suspend", 0.0, 1.0, 0.0, 0);
}
}
}
}
@@
-594,7
+594,7
@@
void SIMIX_process_resume(smx_process_t process, smx_process_t issuer)
case SIMIX_SYNC_EXECUTE:
case SIMIX_SYNC_PARALLEL_EXECUTE:
case SIMIX_SYNC_EXECUTE:
case SIMIX_SYNC_PARALLEL_EXECUTE:
- SIMIX_
host_
execution_resume(process->waiting_synchro);
+ SIMIX_execution_resume(process->waiting_synchro);
break;
case SIMIX_SYNC_COMMUNICATE:
break;
case SIMIX_SYNC_COMMUNICATE:
@@
-685,7
+685,7
@@
const char* SIMIX_process_self_get_name(void) {
smx_process_t process = SIMIX_process_self();
if (process == NULL || process == simix_global->maestro_process)
smx_process_t process = SIMIX_process_self();
if (process == NULL || process == simix_global->maestro_process)
- return "";
+ return "
maestro
";
return SIMIX_process_get_name(process);
}
return SIMIX_process_get_name(process);
}