Merge branch 'master' into nomerge2

This commit is contained in:
Ivan Skytte Jørgensen
2016-09-20 15:56:08 +02:00
2 changed files with 6 additions and 15 deletions

@ -357,15 +357,7 @@ void heartbeatWrapper(int /*fd*/, void * /*state*/) {
// . this is a sign things are jammed up
int64_t elapsed = now - s_last;
if ( elapsed > 200 ) {
// now we print the # of elapsed alarms. that way we will
// know if the alarms were going off or not...
// this happens if the rt sig queue is overflowed.
// check the "cat /proc/<pid>/status | grep SigQ" output
// to see if its overflowed. hopefully i will fix this by
// queue the signals myself in Loop.cpp.
log( LOG_WARN, "db: missed calling niceness 0 heartbeatWrapper "
"function by %" PRId64" ms. Either you need a quickpoll "
"somewhere or a niceness 0 function is taking too long. ", elapsed - 100 );
log( LOG_WARN, "heartbeatWrapper: elapsed=%" PRId64 "ms - is main thread slow?", elapsed);
}
s_last = now;

@ -198,12 +198,6 @@
harmless_drd_conflict
drd:ConflictingAccess
fun:_ZL23updateDiskReadCompletedv
fun:_ZL11readwrite_rP9FileState
fun:_ZL18readwriteWrapper_rPv
fun:job_pool_thread_function
obj:/usr/lib64/valgrind/vgpreload_drd-amd64-linux.so
fun:start_thread
fun:clone
}
{
harmless_drd_conflict2
@ -242,3 +236,8 @@
fun:_Z15getCloseCount_ri
fun:_ZL18readwriteWrapper_rPv
}
{
<insert_a_suppression_name_here>
drd:ConflictingAccess
fun:_ZL14updatePingTimeP4HostPii
}