diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2007-10-05 15:36:48 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2007-10-05 15:36:48 +0200 |
| commit | 367a2619a1307ca290137d865d7565cd70d5ef48 (patch) | |
| tree | 575f486016449630a84b82207cb8ee4780b3496a /cpp/test | |
| parent | Fixed Sun CC build (diff) | |
| download | ice-367a2619a1307ca290137d865d7565cd70d5ef48.tar.bz2 ice-367a2619a1307ca290137d865d7565cd70d5ef48.tar.xz ice-367a2619a1307ca290137d865d7565cd70d5ef48.zip | |
Fixed bug 2506
Diffstat (limited to 'cpp/test')
| -rw-r--r-- | cpp/test/IceUtil/timer/Client.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/cpp/test/IceUtil/timer/Client.cpp b/cpp/test/IceUtil/timer/Client.cpp index 04e7ff64b58..aadb4857728 100644 --- a/cpp/test/IceUtil/timer/Client.cpp +++ b/cpp/test/IceUtil/timer/Client.cpp @@ -33,7 +33,7 @@ public: Lock sync(*this); ++_count; _run = IceUtil::Time::now(IceUtil::Time::Monotonic); - //cerr << "run: " << _scheduledTime.toMicroSeconds() << " " << _run.toMicroSeconds() << endl; + //cerr << "run: " << _scheduledTime.toMilliSeconds() << " " << _run.toMilliSeconds() << endl; notifyAll(); } @@ -130,13 +130,12 @@ int main(int argc, char* argv[]) { vector<TestTaskPtr> tasks; IceUtil::Time start = IceUtil::Time::now(IceUtil::Time::Monotonic) + IceUtil::Time::milliSeconds(100); - for(int i = 0; i < 100; ++i) + for(int i = 0; i < 20; ++i) { - tasks.push_back(new TestTask(IceUtil::Time::milliSeconds(100 + i))); + tasks.push_back(new TestTask(IceUtil::Time::milliSeconds(100 + i * 5))); } random_shuffle(tasks.begin(), tasks.end()); - vector<TestTaskPtr>::const_iterator p; for(p = tasks.begin(); p != tasks.end(); ++p) { @@ -148,7 +147,7 @@ int main(int argc, char* argv[]) (*p)->waitForRun(); } - test(IceUtil::Time::now(IceUtil::Time::Monotonic) - start > IceUtil::Time::milliSeconds(99)); + test(IceUtil::Time::now(IceUtil::Time::Monotonic) > start); sort(tasks.begin(), tasks.end()); for(p = tasks.begin(); p + 1 != tasks.end(); ++p) |