Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-06 13:48:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

small optimizations to grouter

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7299 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-04-23 16:16:44 +00:00
parent 8ec000220f
commit 7e517906fd
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
libretroshare/src/grouter/p3grouter.cc
View file

@ -321,7 +321,7 @@ void p3GRouter::autoWash()
{ {
it->second.status_flags = RS_GROUTER_ROUTING_STATE_PEND ; it->second.status_flags = RS_GROUTER_ROUTING_STATE_PEND ;
#ifdef GROUTER_DEBUG #ifdef GROUTER_DEBUG
grouter_debug() << " Scheduling the item " << std::hex << it->first << std::dec << " for sending again." << std::endl; grouter_debug() << " Scheduling the item " << std::hex << it->first << std::dec << " for sending again (next_time_delay=" << computeNextTimeDelay(it->second.last_sent - it->second.received_time) << ", now - last_sent = " << now - it->second.last_sent << "." << std::endl;
#endif #endif
++it ; ++it ;
} }
@ -545,8 +545,6 @@ std::set<uint32_t> p3GRouter::computeRoutingFriends(const std::vector<RsPeerId>&
// //
for(uint32_t i=0;i<N;++i) for(uint32_t i=0;i<N;++i)
{ {
int p = probas.size() ;
// randomly select one peer between 0 and p // randomly select one peer between 0 and p
float total = 0.0f ; for(uint32_t j=0;j<probas.size();++j) total += probas[j] ; // computes the partial sum of the array float total = 0.0f ; for(uint32_t j=0;j<probas.size();++j) total += probas[j] ; // computes the partial sum of the array
@ -717,21 +715,21 @@ void p3GRouter::handleRecvACKItem(RsGRouterACKItem *item)
switch(item->state) switch(item->state)
{ {
case RS_GROUTER_ACK_STATE_IRCV:
case RS_GROUTER_ACK_STATE_RCVD: case RS_GROUTER_ACK_STATE_RCVD:
if(it->second.origin == mLinkMgr->getOwnId()) if(it->second.origin == mLinkMgr->getOwnId() && it->second.status_flags != RS_GROUTER_ROUTING_STATE_ARVD)
{ {
locked_notifyClientAcknowledged(it->first,it->second.client_id) ; locked_notifyClientAcknowledged(it->first,it->second.client_id) ;
should_remove = true ; should_remove = true ;
} // no break afterwards. That is on purpose! } // no break afterwards. That is on purpose!
case RS_GROUTER_ACK_STATE_IRCV:
// Notify the origin. This is the main route and it was successful. // Notify the origin. This is the main route and it was successful.
#ifdef GROUTER_DEBUG #ifdef GROUTER_DEBUG
grouter_debug() << " updating routing matrix." << std::endl; grouter_debug() << " updating routing matrix." << std::endl;
#endif #endif
if(it->second.status_flags == RS_GROUTER_ROUTING_STATE_SENT) if(it->second.status_flags != RS_GROUTER_ROUTING_STATE_ARVD)
forward_state = RS_GROUTER_ACK_STATE_RCVD ; forward_state = RS_GROUTER_ACK_STATE_RCVD ;
next_state = RS_GROUTER_ROUTING_STATE_ARVD ; next_state = RS_GROUTER_ROUTING_STATE_ARVD ;
@ -909,7 +907,7 @@ void p3GRouter::handleRecvDataItem(RsGRouterGenericDataItem *item)
info.origin = item->PeerId() ; info.origin = item->PeerId() ;
info.received_time = time(NULL) ; info.received_time = time(NULL) ;
info.last_sent = 0 ; info.last_sent = info.received_time ;
info.destination_key = item->destination_key ; info.destination_key = item->destination_key ;
info.status_flags = RS_GROUTER_ROUTING_STATE_PEND ; info.status_flags = RS_GROUTER_ROUTING_STATE_PEND ;
info.client_id = 0 ; info.client_id = 0 ;
@ -986,7 +984,7 @@ void p3GRouter::sendData(const GRouterKeyId& destination,const GRouterServiceId&
info.status_flags = RS_GROUTER_ROUTING_STATE_PEND ; info.status_flags = RS_GROUTER_ROUTING_STATE_PEND ;
info.origin = mLinkMgr->getOwnId() ; info.origin = mLinkMgr->getOwnId() ;
info.data_item->randomized_distance = 0 ; info.data_item->randomized_distance = 0 ;
info.last_sent = 0 ; info.last_sent = now ;
info.received_time = now ; info.received_time = now ;
info.destination_key = destination ; info.destination_key = destination ;
info.client_id = client_id ; info.client_id = client_id ;