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 branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
surf
/
cpu_ti.cpp
diff --git
a/src/surf/cpu_ti.cpp
b/src/surf/cpu_ti.cpp
index
16f0c64
..
9173e1d
100644
(file)
--- a/
src/surf/cpu_ti.cpp
+++ b/
src/surf/cpu_ti.cpp
@@
-296,9
+296,8
@@
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);
{
xbt_assert(low < high, "Wrong parameters: low (%d) should be smaller than high (%d)", low, high);
- int mid;
do {
do {
- mid = low + (high - low) / 2;
+
int
mid = low + (high - low) / 2;
XBT_DEBUG("a %f low %d high %d mid %d value %f", a, low, high, mid, array[mid]);
if (array[mid] > a)
XBT_DEBUG("a %f low %d high %d mid %d value %f", a, low, high, mid, array[mid]);
if (array[mid] > a)
@@
-491,7
+490,6
@@
void CpuTi::updateActionsFinishTime(double now)
CpuTiAction *action;
double sum_priority = 0.0;
double total_area;
CpuTiAction *action;
double sum_priority = 0.0;
double total_area;
- double min_finish = -1;
/* update remaining amount of actions */
updateRemainingAmount(now);
/* update remaining amount of actions */
updateRemainingAmount(now);
@@
-516,7
+514,7
@@
void CpuTi::updateActionsFinishTime(double now)
for(ActionTiList::iterator it(actionSet_->begin()), itend(actionSet_->end()) ; it != itend ; ++it) {
action = &*it;
for(ActionTiList::iterator it(actionSet_->begin()), itend(actionSet_->end()) ; it != itend ; ++it) {
action = &*it;
- min_finish = -1;
+
double
min_finish = -1;
/* action not running, skip it */
if (action->getStateSet() != surf_cpu_model_pm->getRunningActionSet())
continue;
/* action not running, skip it */
if (action->getStateSet() != surf_cpu_model_pm->getRunningActionSet())
continue;
@@
-752,10
+750,10
@@
void CpuTiAction::setMaxDuration(double duration)
XBT_OUT();
}
XBT_OUT();
}
-void CpuTiAction::set
Priority
(double priority)
+void CpuTiAction::set
SharingWeight
(double priority)
{
XBT_IN("(%p,%g)", this, priority);
{
XBT_IN("(%p,%g)", this, priority);
-
priority
_ = priority;
+
sharingWeight
_ = priority;
cpu_->modified(true);
XBT_OUT();
}
cpu_->modified(true);
XBT_OUT();
}