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

improved mutex lock debugging

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7662 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-11-05 20:07:15 +00:00
parent 5e903c364b
commit 7fca2836d6
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libretroshare/src/util/rsthreads.cc
View file

@ -190,7 +190,7 @@ void RsMutex::unlock()
double ts = getCurrentTS() ; double ts = getCurrentTS() ;
if(ts - _time_stamp > 1.0) // locked for more than 0.5 seconds => somthing fishy is happenning if(ts - _time_stamp > 1.0) // locked for more than 0.5 seconds => somthing fishy is happenning
std::cerr << "Mutex " << (void*)this << " got locked for " << ts - _time_stamp << " seconds in thread " << pthread_self() << std::endl; std::cerr << "Mutex " << (void*)this << " \"" << name << "\"" << " got locked for " << ts - _time_stamp << " seconds in thread " << pthread_self() << std::endl;
#endif #endif
pthread_mutex_unlock(&realMutex); pthread_mutex_unlock(&realMutex);
@ -203,6 +203,7 @@ void RsMutex::lock()
{ {
#ifdef RSMUTEX_DEBUG #ifdef RSMUTEX_DEBUG
_time_stamp = getCurrentTS() ; _time_stamp = getCurrentTS() ;
pthread_t owner = _thread_id ;
#endif #endif
int retval = 0; int retval = 0;
@ -216,7 +217,9 @@ void RsMutex::lock()
double ts = getCurrentTS() ; double ts = getCurrentTS() ;
if(ts - _time_stamp > 1.0) if(ts - _time_stamp > 1.0)
std::cerr << "Mutex " << (void*)this << " waited for " << ts - _time_stamp << " seconds in thread " << pthread_self() << std::endl; std::cerr << "Mutex " << (void*)this << " \"" << name << "\"" << " waited for " << ts - _time_stamp << " seconds in thread " << pthread_self() << " for locked thread " << owner << std::endl;
_time_stamp = getCurrentTS() ; // This is to re-init the locking time without accounting for how much we waited.
#endif #endif
switch(retval) switch(retval)
{ {