Make sure that DRD does not complain about mutexes being held too long on systems...

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@9521

diff --git a/drd/drd_mutex.c b/drd/drd_mutex.c
index 98de75e76f7ef9cfffa0fb1ace4640a652df552a..14977f61cb88ea4957b7e07237532f9130ea8cd9 100644 (file)
--- a/drd/drd_mutex.c
+++ b/drd/drd_mutex.c
@@ -405,7 +405,7 @@ void DRD_(mutex_unlock)(const Addr mutex, MutexT mutex_type)
    {
       if (s_mutex_lock_threshold_ms > 0)
       {
-         ULong held = VG_(read_millisecond_timer)() - p->acquiry_time_ms;
+         Long held = VG_(read_millisecond_timer)() - p->acquiry_time_ms;
          if (held > s_mutex_lock_threshold_ms)
          {
             HoldtimeErrInfo HEI

diff --git a/drd/drd_rwlock.c b/drd/drd_rwlock.c
index a2cfdaf1a0221577741fce65fff0e04fc7f58cbc..82f28acb678ecc9c063297d34e3f40f66103acd6 100644 (file)
--- a/drd/drd_rwlock.c
+++ b/drd/drd_rwlock.c
@@ -521,7 +521,7 @@ void DRD_(rwlock_pre_unlock)(const Addr rwlock)
       q->reader_nesting_count--;
       if (q->reader_nesting_count == 0 && DRD_(s_shared_threshold_ms) > 0)
       {
-         ULong held = VG_(read_millisecond_timer)() - p->acquiry_time_ms;
+         Long held = VG_(read_millisecond_timer)() - p->acquiry_time_ms;
          if (held > DRD_(s_shared_threshold_ms))
          {
             HoldtimeErrInfo HEI
@@ -539,7 +539,7 @@ void DRD_(rwlock_pre_unlock)(const Addr rwlock)
       q->writer_nesting_count--;
       if (q->writer_nesting_count == 0 && DRD_(s_exclusive_threshold_ms) > 0)
       {
-         ULong held = VG_(read_millisecond_timer)() - p->acquiry_time_ms;
+         Long held = VG_(read_millisecond_timer)() - p->acquiry_time_ms;
          if (held > DRD_(s_exclusive_threshold_ms))
          {
             HoldtimeErrInfo HEI