Changeset 20204
- Timestamp:
- 05/11/07 14:05:36 (2 years ago)
- Files:
-
- juggler/trunk/modules/gadgeteer/gadget/NetworkManager.cpp (modified) (2 diffs)
- juggler/trunk/modules/gadgeteer/gadget/Reactor.cpp (modified) (2 diffs)
- juggler/trunk/modules/gadgeteer/gadget/Reactor.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
juggler/trunk/modules/gadgeteer/gadget/NetworkManager.cpp
r20203 r20204 384 384 while ( completed_nodes != numNodes ) 385 385 { 386 std::vector<gadget::NodePtr> ready_nodes; 386 387 try 387 388 { 388 std::vector<gadget::NodePtr> ready_nodes = 389 mReactor.getReadyNodes(node_timeout); 389 mReactor.getReadyNodes(ready_nodes, node_timeout); 390 390 //reactor.getReadyNodes(vpr::Interval::NoWait); 391 391 //mReactor.getReadyNodes(vpr::Interval::NoTimeout); … … 395 395 vprDEBUG( gadgetDBG_NET_MGR, vprDBG_CONFIG_LVL ) 396 396 << clrOutBOLD(clrBLUE,"[NetworkManager]") 397 << " " << (int)((int)numNodes - ready_nodes.size())397 << " " << (int)((int)numNodes - completed_nodes) - ready_nodes.size() 398 398 << " still waiting after timeout." 399 399 << std::endl << vprDEBUG_FLUSH; juggler/trunk/modules/gadgeteer/gadget/Reactor.cpp
r20067 r20204 66 66 } 67 67 68 std::vector<gadget::NodePtr> Reactor::getReadyNodes(const vpr::Interval& timeout)68 void Reactor::getReadyNodes(std::vector<gadget::NodePtr> readyList, const vpr::Interval& timeout) 69 69 { 70 70 vpr::Uint16 num_events(0); 71 71 mSelector.select(num_events, timeout); 72 72 73 std::vector<gadget::NodePtr> ready_nodes;74 73 75 74 if ( num_events > 0 ) 76 75 { 77 ready _nodes.reserve(num_events);76 readyList.reserve(num_events); 78 77 79 78 for ( vpr::Uint16 i = 0; i < mSelector.getNumHandles(); ++i ) … … 84 83 if ( 0 != event_mask ) 85 84 { 86 ready _nodes.push_back(mDemuxTable[h]);85 readyList.push_back(mDemuxTable[h]); 87 86 } 88 87 } 89 88 } 90 91 return ready_nodes;92 89 } 93 90 juggler/trunk/modules/gadgeteer/gadget/Reactor.h
r20067 r20204 53 53 void removeNode(gadget::NodePtr node); 54 54 55 std::vector<gadget::NodePtr> getReadyNodes(const vpr::Interval& timeout);55 void getReadyNodes(std::vector<gadget::NodePtr> readyList, const vpr::Interval& timeout); 56 56 57 57 vpr::Uint16 getNumHandles() const
