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
New functions: xbt_str_parse_int / xbt_str_parse_double
[simgrid.git]
/
src
/
surf
/
surf_interface.cpp
diff --git
a/src/surf/surf_interface.cpp
b/src/surf/surf_interface.cpp
index
a6a1831
..
5a9ccce
100644
(file)
--- a/
src/surf/surf_interface.cpp
+++ b/
src/surf/surf_interface.cpp
@@
-130,7
+130,7
@@
s_surf_model_description_t surf_storage_model_description[] = {
{NULL, NULL, NULL} /* this array must be NULL terminated */
};
-#ifdef
CONTEXT_THREAD
S
+#ifdef
HAVE_THREAD_CONTEXT
S
static xbt_parmap_t surf_parmap = NULL; /* parallel map on models */
#endif
@@
-278,18
+278,18
@@
static XBT_INLINE void surf_storage_free(void *r)
void sg_version_check(int lib_version_major,int lib_version_minor,int lib_version_patch) {
if ((lib_version_major != SIMGRID_VERSION_MAJOR) || (lib_version_minor != SIMGRID_VERSION_MINOR)) {
fprintf(stderr,
-
"FATAL ERROR: Your program was compiled with SimGrid version %d.%d.%d, "
-
"and then linked against SimGrid %d.%d.%d. Please fix this.\n",
+ "FATAL ERROR: Your program was compiled with SimGrid version %d.%d.%d, "
+ "and then linked against SimGrid %d.%d.%d. Please fix this.\n",
SIMGRID_VERSION_MAJOR,SIMGRID_VERSION_MINOR,SIMGRID_VERSION_PATCH,
-
lib_version_major,lib_version_minor,lib_version_patch);
+ lib_version_major,lib_version_minor,lib_version_patch);
abort();
}
if (lib_version_patch != SIMGRID_VERSION_PATCH) {
fprintf(stderr,
-
"Warning: Your program was compiled with SimGrid version %d.%d.%d, "
-
"and then linked against SimGrid %d.%d.%d. Proceeding anyway.\n",
+ "Warning: Your program was compiled with SimGrid version %d.%d.%d, "
+ "and then linked against SimGrid %d.%d.%d. Proceeding anyway.\n",
SIMGRID_VERSION_MAJOR,SIMGRID_VERSION_MINOR,SIMGRID_VERSION_PATCH,
-
lib_version_major,lib_version_minor,lib_version_patch);
+ lib_version_major,lib_version_minor,lib_version_patch);
}
}
@@
-373,7
+373,7
@@
void surf_exit(void)
future_evt_set = nullptr;
}
-#ifdef
CONTEXT_THREAD
S
+#ifdef
HAVE_THREAD_CONTEXT
S
xbt_parmap_destroy(surf_parmap);
#endif
@@
-537,7
+537,7
@@
double Model::shareResourcesMaxMin(ActionList *running_actions,
for (++it; it != itend; ++it) {
-
action = &*it;
+ action = &*it;
value = lmm_variable_getvalue(action->getVariable());
if (value > 0) {
if (action->getRemains() > 0)
@@
-562,11
+562,11
@@
double Model::shareResourcesMaxMin(ActionList *running_actions,
void Model::updateActionsState(double now, double delta)
{
if (p_updateMechanism == UM_FULL)
-
updateActionsStateFull(now, delta);
+ updateActionsStateFull(now, delta);
else if (p_updateMechanism == UM_LAZY)
-
updateActionsStateLazy(now, delta);
+ updateActionsStateLazy(now, delta);
else
-
xbt_die("Invalid cpu update mechanism!");
+ xbt_die("Invalid cpu update mechanism!");
}
void Model::updateActionsStateLazy(double /*now*/, double /*delta*/)