Revision aeae20a1 src/sim/csimulation.cc

View differences:

src/sim/csimulation.cc
647 647
            barrierMin = threadPool->waitAtBarrier(barrierMin, &msgQueue);
648 648
        }
649 649
#endif
650
#ifdef NOBARRIER
651
        // Event is free for scheduling => Remove it from the queue.
652
        msg = msgQueue.removeFirst();
653
#else
654
        //msg = schedulerp->removeNextEvent();
655 650
        msg = schedulerp->getNextEvent();
656 651
        //Advance Simulation Time
657 652
        cThreadPool::setSimTime(msg->getArrivalTime());
658 653

  
659
#endif
660
#ifdef NOBARRIER
661
        cThreadPool::setSimTime(msg->getArrivalTime());
662
#else
654
#ifndef NOBARRIER
663 655
        // check if this is an barrier message indicating the end of an event
664 656
        cBarrierMessage* barrier = dynamic_cast<cBarrierMessage*> (msg);
665 657
        if (barrier != NULL) {

Also available in: Unified diff