diff options
Diffstat (limited to 'cpp')
| -rwxr-xr-x | cpp/src/IceUtil/Timer.cpp | 3 | ||||
| -rw-r--r-- | cpp/test/IceUtil/timer/Client.cpp | 9 |
2 files changed, 5 insertions, 7 deletions
diff --git a/cpp/src/IceUtil/Timer.cpp b/cpp/src/IceUtil/Timer.cpp index 9b6fba19a16..16d34ef0c0a 100755 --- a/cpp/src/IceUtil/Timer.cpp +++ b/cpp/src/IceUtil/Timer.cpp @@ -180,8 +180,7 @@ Timer::run() } catch(const std::exception& e) { - cerr << "IceUtil::Timer::run(): uncaught exception: "; - cerr << e.what() << endl; + cerr << "IceUtil::Timer::run(): uncaught exception:\n" << e.what() << endl; } catch(...) { 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) |