branch merge
authorCraig Dowell <craigdo@ee.washington.edu>
Thu Oct 30 10:01:27 2008 -0700 (15 months ago)
changeset 3832a457408d0bb6
parent 3831 16c2970a0344
parent 3822 9a246859e808
child 3833 65517a42bcb8
branch merge
     1.1 --- a/samples/main-test-sync.cc	Thu Oct 30 10:00:41 2008 -0700
     1.2 +++ b/samples/main-test-sync.cc	Thu Oct 30 10:01:27 2008 -0700
     1.3 @@ -61,7 +61,7 @@
     1.4  {
     1.5    NS_LOG_FUNCTION_NOARGS ();
     1.6    sleep (1);
     1.7 -  for (uint32_t i = 0.001; i < 10000; ++i)
     1.8 +  for (uint32_t i = 0; i < 10000; ++i)
     1.9      {
    1.10        //
    1.11        // Exercise the realtime relative now path
    1.12 @@ -76,7 +76,7 @@
    1.13  {
    1.14    NS_LOG_FUNCTION_NOARGS ();
    1.15    sleep (1);
    1.16 -  for (uint32_t i = 0.001; i < 10000; ++i)
    1.17 +  for (uint32_t i = 0; i < 10000; ++i)
    1.18      {
    1.19        //
    1.20        // Exercise the realtime relative schedule path
    1.21 @@ -100,7 +100,7 @@
    1.22    DynamicCast<RealtimeSimulatorImpl> (Simulator::GetImplementation ())->ScheduleRealtimeNow(MakeEvent (&first_function));
    1.23  
    1.24    // 
    1.25 -  // drive the progression of m_currentTs at a ten millisecond rate
    1.26 +  // drive the progression of m_currentTs at a ten millisecond rate from the main thread
    1.27    //
    1.28    for (double d = 0.; d < 14.999; d += 0.01)
    1.29      {