|
From: <sv...@va...> - 2009-07-10 09:26:39
|
Author: bart
Date: 2009-07-10 10:26:29 +0100 (Fri, 10 Jul 2009)
New Revision: 10425
Log:
Modified recursive_mutex regression test: improved portability by removing usage of alarm() / all output is now sent to stderr / full output is now compared instead of only a summary.
Removed:
trunk/drd/tests/recursive_mutex.stdout.exp
Modified:
trunk/drd/tests/recursive_mutex.c
trunk/drd/tests/recursive_mutex.stderr.exp
trunk/drd/tests/recursive_mutex.vgtest
Modified: trunk/drd/tests/recursive_mutex.c
===================================================================
--- trunk/drd/tests/recursive_mutex.c 2009-07-10 09:24:27 UTC (rev 10424)
+++ trunk/drd/tests/recursive_mutex.c 2009-07-10 09:26:29 UTC (rev 10425)
@@ -10,26 +10,25 @@
#include "../../config.h"
-#if !defined(VGO_darwin)
static void lock_twice(pthread_mutex_t* const p)
{
- pthread_mutex_lock(p);
- pthread_mutex_lock(p);
- pthread_mutex_unlock(p);
- pthread_mutex_unlock(p);
+ if (pthread_mutex_trylock(p) != 0)
+ fprintf(stderr, "first lock call failed !\n");
+ if (pthread_mutex_trylock(p) != 0)
+ fprintf(stderr, "second lock call failed !\n");
+ if (pthread_mutex_unlock(p) != 0)
+ fprintf(stderr, "first unlock call failed !\n");
+ if (pthread_mutex_unlock(p) != 0)
+ fprintf(stderr, "second unlock call failed !\n");
}
-#endif
int main(int argc, char** argv)
{
- /* Let the program abort after 3 seconds instead of leaving it deadlocked. */
- alarm(3);
-
#if defined(HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP)
{
pthread_mutex_t m = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
- printf("Recursive mutex (statically initialized).\n");
+ fprintf(stderr, "Recursive mutex (statically initialized).\n");
lock_twice(&m);
pthread_mutex_destroy(&m);
}
@@ -39,7 +38,7 @@
pthread_mutex_t m;
pthread_mutexattr_t attr;
- printf("Recursive mutex (initialized via mutex attributes).\n");
+ fprintf(stderr, "\nRecursive mutex (initialized via mutex attributes).\n");
pthread_mutexattr_init(&attr);
pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP);
pthread_mutex_init(&m, &attr);
@@ -53,7 +52,7 @@
pthread_mutex_t m;
pthread_mutexattr_t attr;
- printf("Error checking mutex.\n");
+ fprintf(stderr, "\nError checking mutex.\n");
pthread_mutexattr_init(&attr);
pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK_NP);
pthread_mutex_init(&m, &attr);
@@ -63,17 +62,14 @@
}
#endif
-// DDD: Darwin doesn't support signals yet, so the alarm() call doesn't kick
-// in, which causes it to hang.
-#if !defined(VGO_darwin)
{
pthread_mutex_t m = PTHREAD_MUTEX_INITIALIZER;
- printf("Non-recursive mutex.\n");
- fflush(stdout);
+ fprintf(stderr, "\nNon-recursive mutex.\n");
lock_twice(&m);
}
- printf("Done.\n");
-#endif
+
+ fprintf(stderr, "\nDone.\n");
+
return 0;
}
Modified: trunk/drd/tests/recursive_mutex.stderr.exp
===================================================================
--- trunk/drd/tests/recursive_mutex.stderr.exp 2009-07-10 09:24:27 UTC (rev 10424)
+++ trunk/drd/tests/recursive_mutex.stderr.exp 2009-07-10 09:26:29 UTC (rev 10425)
@@ -1 +1,31 @@
-ERROR SUMMARY: 4 errors from 4 contexts
+
+Recursive mutex (statically initialized).
+
+Recursive mutex (initialized via mutex attributes).
+
+Error checking mutex.
+second lock call failed !
+Mutex not locked by calling thread: mutex 0x........, recursion count 0, owner 1.
+ at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
+ by 0x........: lock_twice (recursive_mutex.c:?)
+ by 0x........: main (recursive_mutex.c:?)
+mutex 0x........ was first observed at:
+ at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
+ by 0x........: main (recursive_mutex.c:?)
+second unlock call failed !
+
+Non-recursive mutex.
+second lock call failed !
+
+Mutex not locked by calling thread: mutex 0x........, recursion count 0, owner 1.
+ at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
+ by 0x........: lock_twice (recursive_mutex.c:?)
+ by 0x........: main (recursive_mutex.c:?)
+mutex 0x........ was first observed at:
+ at 0x........: pthread_mutex_trylock (drd_pthread_intercepts.c:?)
+ by 0x........: lock_twice (recursive_mutex.c:?)
+ by 0x........: main (recursive_mutex.c:?)
+
+Done.
+
+ERROR SUMMARY: 2 errors from 2 contexts (suppressed: 0 from 0)
Deleted: trunk/drd/tests/recursive_mutex.stdout.exp
===================================================================
--- trunk/drd/tests/recursive_mutex.stdout.exp 2009-07-10 09:24:27 UTC (rev 10424)
+++ trunk/drd/tests/recursive_mutex.stdout.exp 2009-07-10 09:26:29 UTC (rev 10425)
@@ -1,4 +0,0 @@
-Recursive mutex (statically initialized).
-Recursive mutex (initialized via mutex attributes).
-Error checking mutex.
-Non-recursive mutex.
Modified: trunk/drd/tests/recursive_mutex.vgtest
===================================================================
--- trunk/drd/tests/recursive_mutex.vgtest 2009-07-10 09:24:27 UTC (rev 10424)
+++ trunk/drd/tests/recursive_mutex.vgtest 2009-07-10 09:26:29 UTC (rev 10425)
@@ -1,4 +1,4 @@
prereq: ./supported_libpthread
-vgopts: --check-stack-var=yes
+vgopts: --check-stack-var=yes --var-info=yes
prog: recursive_mutex
-stderr_filter: filter_error_summary
+stderr_filter: filter_stderr_and_thread_no
|