F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug 472: fix build with gcc 3.4.6

Browse Source
This commit is contained in:
Mathieu Lacage
2009-01-18 12:14:32 +01:00
parent b4f451047b
commit c7222e4a09
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/simulator/ns2-calendar-scheduler.cc
View File

@@ -58,7 +58,7 @@ Ns2CalendarScheduler::Ns2CalendarScheduler ()
round_num_ = 0;
time_to_newwidth_ = adjust_new_width_interval_;
cal_clock_ = Scheduler::EventKey ();
reinit(4, 1.0, cal_clock_);
reinit(4, 1, cal_clock_);
}
Ns2CalendarScheduler::~Ns2CalendarScheduler ()
{
@@ -358,12 +358,12 @@ Ns2CalendarScheduler::reinit(int nbuck, uint64_t bwidth, Scheduler::EventKey sta
void
Ns2CalendarScheduler::resize(int newsize, Scheduler::EventKey start)
{
double bwidth;
uint64_t bwidth;
if (newsize == nbuckets_) {
/* we resize for bwidth*/
if (head_search_) bwidth = head_search_; else bwidth = 1;
if (insert_search_) bwidth = bwidth / insert_search_;
bwidth = sqrt (bwidth) * width_;
bwidth = static_cast<uint64_t> (sqrt (bwidth) * width_);
if (bwidth < min_bin_width_) {
if (time_to_newwidth_>0) {
time_to_newwidth_ --;
@@ -469,7 +469,7 @@ Ns2CalendarScheduler::newwidth(int newsize)
{
if (adjust_new_width_interval_) {
time_to_newwidth_ = adjust_new_width_interval_;
if (avg_gap_ > 0) return avg_gap_*4.0;
if (avg_gap_ > 0) return avg_gap_*4;
}
int i;
int max_bucket = 0; // index of the fullest bucket
@@ -481,11 +481,10 @@ Ns2CalendarScheduler::newwidth(int newsize)
if (nsamples <= 4) return width_;
uint64_t nw = buckets_[max_bucket].list_->prev_->event.key.m_ts
- buckets_[max_bucket].list_->event.key.m_ts;
uint64_t nw = (buckets_[max_bucket].list_->prev_->event.key.m_ts
- buckets_[max_bucket].list_->event.key.m_ts) * 4;
nw /= ((newsize < nsamples) ? newsize : nsamples); // min (newsize, nsamples)
nw *= 4.0;
nw = std::max (nw, min_bin_width_);

2
src/simulator/ns2-calendar-scheduler.h
View File

@@ -80,7 +80,7 @@ private:
int round_num_;
long int gap_num_; //the number of gap samples in this window (in process of calculation)
uint64_t last_time_; //the departure time of first event in this window
double avg_gap_; //the average gap in last window (finished calculation)
int64_t avg_gap_; //the average gap in last window (finished calculation)
uint64_t width_;
uint64_t diff0_, diff1_, diff2_; /* wrap-around checks */