Changeset 20204

Show
Ignore:
Timestamp:
05/11/07 14:05:36 (2 years ago)
Author:
dshipton
Message:

Pass in vector for ready list construction.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • juggler/trunk/modules/gadgeteer/gadget/NetworkManager.cpp

    r20203 r20204  
    384384   while ( completed_nodes != numNodes ) 
    385385   { 
     386      std::vector<gadget::NodePtr> ready_nodes; 
    386387      try 
    387388      { 
    388          std::vector<gadget::NodePtr> ready_nodes = 
    389             mReactor.getReadyNodes(node_timeout); 
     389            mReactor.getReadyNodes(ready_nodes, node_timeout); 
    390390            //reactor.getReadyNodes(vpr::Interval::NoWait); 
    391391            //mReactor.getReadyNodes(vpr::Interval::NoTimeout); 
     
    395395         vprDEBUG( gadgetDBG_NET_MGR, vprDBG_CONFIG_LVL ) 
    396396            << clrOutBOLD(clrBLUE,"[NetworkManager]") 
    397             << " " << (int)((int)numNodes - ready_nodes.size()
     397            << " " << (int)((int)numNodes - completed_nodes) - ready_nodes.size(
    398398            << " still waiting after timeout." 
    399399            << std::endl << vprDEBUG_FLUSH; 
  • juggler/trunk/modules/gadgeteer/gadget/Reactor.cpp

    r20067 r20204  
    6666} 
    6767 
    68 std::vector<gadget::NodePtr> Reactor::getReadyNodes(const vpr::Interval& timeout) 
     68void Reactor::getReadyNodes(std::vector<gadget::NodePtr> readyList, const vpr::Interval& timeout) 
    6969{ 
    7070   vpr::Uint16 num_events(0); 
    7171   mSelector.select(num_events, timeout); 
    7272 
    73    std::vector<gadget::NodePtr> ready_nodes; 
    7473 
    7574   if ( num_events > 0 ) 
    7675   { 
    77       ready_nodes.reserve(num_events); 
     76      readyList.reserve(num_events); 
    7877 
    7978      for ( vpr::Uint16 i = 0; i < mSelector.getNumHandles(); ++i ) 
     
    8483         if ( 0 != event_mask ) 
    8584         { 
    86             ready_nodes.push_back(mDemuxTable[h]); 
     85            readyList.push_back(mDemuxTable[h]); 
    8786         } 
    8887      } 
    8988   } 
    90  
    91    return ready_nodes; 
    9289} 
    9390 
  • juggler/trunk/modules/gadgeteer/gadget/Reactor.h

    r20067 r20204  
    5353   void removeNode(gadget::NodePtr node); 
    5454 
    55    std::vector<gadget::NodePtr> getReadyNodes(const vpr::Interval& timeout); 
     55   void getReadyNodes(std::vector<gadget::NodePtr> readyList, const vpr::Interval& timeout); 
    5656 
    5757   vpr::Uint16 getNumHandles() const