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

suppressed --probably-- harmless data race

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4021 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2011-02-08 19:37:01 +00:00
parent bad3e81077
commit c448e82987
1 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

20
libretroshare/src/turtle/p3turtle.cc
View file

@ -94,35 +94,49 @@ int p3turtle::tick()
time_t now = time(NULL) ; time_t now = time(NULL) ;
bool should_manage_tunnels,should_autowash,should_estimatespeed ;
{
RsStackMutex stack(mTurtleMtx); /********** STACK LOCKED MTX ******/
should_manage_tunnels = now > TUNNEL_MANAGEMENT_LAPS_TIME+_last_tunnel_management_time || _force_digg_new_tunnels ;
should_autowash = now > 10+_last_clean_time ;
should_estimatespeed = now >= TUNNEL_SPEED_ESTIMATE_LAPSE + _last_tunnel_speed_estimate_time ;
}
// Tunnel management: // Tunnel management:
// - we digg new tunnels at least every 5 min (300 sec). // - we digg new tunnels at least every 5 min (300 sec).
// - we digg new tunnels each time a new peer connects // - we digg new tunnels each time a new peer connects
// - we digg new tunnels each time a new hash is asked for // - we digg new tunnels each time a new hash is asked for
// //
if(now > TUNNEL_MANAGEMENT_LAPS_TIME+_last_tunnel_management_time || _force_digg_new_tunnels) if(should_manage_tunnels)
{ {
#ifdef P3TURTLE_DEBUG #ifdef P3TURTLE_DEBUG
std::cerr << "Calling tunnel management." << std::endl ; std::cerr << "Calling tunnel management." << std::endl ;
#endif #endif
manageTunnels() ; manageTunnels() ;
RsStackMutex stack(mTurtleMtx); /********** STACK LOCKED MTX ******/
_last_tunnel_management_time = now ; _last_tunnel_management_time = now ;
} }
// Clean every 10 sec. // Clean every 10 sec.
// //
if(now > 10+_last_clean_time) if(should_autowash)
{ {
#ifdef P3TURTLE_DEBUG #ifdef P3TURTLE_DEBUG
std::cerr << "Calling autowash." << std::endl ; std::cerr << "Calling autowash." << std::endl ;
#endif #endif
autoWash() ; // clean old/unused tunnels and file hashes, as well as search and tunnel requests. autoWash() ; // clean old/unused tunnels and file hashes, as well as search and tunnel requests.
RsStackMutex stack(mTurtleMtx); /********** STACK LOCKED MTX ******/
_last_clean_time = now ; _last_clean_time = now ;
} }
if(now >= TUNNEL_SPEED_ESTIMATE_LAPSE + _last_tunnel_speed_estimate_time) if(should_estimatespeed)
{ {
estimateTunnelSpeeds() ; estimateTunnelSpeeds() ;
RsStackMutex stack(mTurtleMtx); /********** STACK LOCKED MTX ******/
_last_tunnel_speed_estimate_time = now ; _last_tunnel_speed_estimate_time = now ;
} }