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

added more time measurements in RsMutex, so as to measure locking time and waiting time. Only enabled with RSMUTEX_DEBUG

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7646 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-10-28 20:37:48 +00:00
parent a5db669883
commit eefac5e4df
2 changed files with 50 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -33,6 +33,7 @@
#ifdef RSMUTEX_DEBUG #ifdef RSMUTEX_DEBUG
#include <stdio.h> #include <stdio.h>
#include <sys/time.h>
#endif #endif
/******* /*******
@ -176,10 +177,32 @@ void RsQueueThread::run()
} }
} }
void RsMutex::unlock()
{
#ifdef RSTHREAD_SELF_LOCKING_GUARD
if(--_cnt == 0)
{
#endif
#ifndef WIN32
_thread_id = 0 ;
#endif
#ifdef RSMUTEX_DEBUG
double ts = getCurrentTS() ;
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;
#endif
pthread_mutex_unlock(&realMutex);
#ifdef RSTHREAD_SELF_LOCKING_GUARD
}
#endif
}
void RsMutex::lock() void RsMutex::lock()
{ {
#ifdef RSMUTEX_DEBUG #ifdef RSMUTEX_DEBUG
clock_t t1 = clock(); _time_stamp = getCurrentTS() ;
#endif #endif
int retval = 0; int retval = 0;
@ -189,6 +212,12 @@ void RsMutex::lock()
#endif #endif
retval = pthread_mutex_lock(&realMutex); retval = pthread_mutex_lock(&realMutex);
#ifdef RSMUTEX_DEBUG
double ts = getCurrentTS() ;
if(ts - _time_stamp > 1.0)
std::cerr << "Mutex " << (void*)this << " waited for " << ts - _time_stamp << " seconds in thread " << pthread_self() << std::endl;
#endif
switch(retval) switch(retval)
{ {
case 0: case 0:
@ -246,13 +275,22 @@ void RsMutex::lock()
#ifdef RSTHREAD_SELF_LOCKING_GUARD #ifdef RSTHREAD_SELF_LOCKING_GUARD
++_cnt ; ++_cnt ;
#endif #endif
}
#ifdef RSMUTEX_DEBUG #ifdef RSMUTEX_DEBUG
clock_t t2 = clock(); double RsMutex::getCurrentTS()
double duration = (double) (t2 - t1) / CLOCKS_PER_SEC; {
if (duration * 1000 > RSMUTEX_DEBUG) {
fprintf(stderr, "RsMutex::lock() %s --> %.3fs\n", name.c_str(), duration); #ifndef WINDOWS_SYS
fflush(stderr); struct timeval cts_tmp;
} gettimeofday(&cts_tmp, NULL);
double cts = (cts_tmp.tv_sec) + ((double) cts_tmp.tv_usec) / 1000000.0;
#else
struct _timeb timebuf;
_ftime( &timebuf);
double cts = (timebuf.time) + ((double) timebuf.millitm) / 1000.0;
#endif #endif
return cts;
} }
#endif

19
libretroshare/src/util/rsthreads.h
View file

@ -35,6 +35,7 @@
#undef RSTHREAD_SELF_LOCKING_GUARD #undef RSTHREAD_SELF_LOCKING_GUARD
//#define RSMUTEX_DEBUG 300 // Milliseconds for print in the stderr //#define RSMUTEX_DEBUG 300 // Milliseconds for print in the stderr
//#define RSMUTEX_DEBUG
class RsMutex class RsMutex
{ {
@ -67,20 +68,7 @@ class RsMutex
#endif #endif
void lock(); void lock();
void unlock() void unlock();
{
#ifdef RSTHREAD_SELF_LOCKING_GUARD
if(--_cnt == 0)
{
#endif
#ifndef WIN32
_thread_id = 0 ;
#endif
pthread_mutex_unlock(&realMutex);
#ifdef RSTHREAD_SELF_LOCKING_GUARD
}
#endif
}
bool trylock() { return (0 == pthread_mutex_trylock(&realMutex)); } bool trylock() { return (0 == pthread_mutex_trylock(&realMutex)); }
private: private:
@ -90,7 +78,10 @@ class RsMutex
uint32_t _cnt ; uint32_t _cnt ;
#endif #endif
#ifdef RSMUTEX_DEBUG #ifdef RSMUTEX_DEBUG
static double getCurrentTS() ;
std::string name; std::string name;
double _time_stamp ;
#endif #endif
}; };