|
From: <sv...@va...> - 2008-03-11 20:38:58
|
Author: bart
Date: 2008-03-11 20:39:01 +0000 (Tue, 11 Mar 2008)
New Revision: 7644
Log:
Reverted last commit.
Modified:
trunk/exp-drd/drd_pthread_intercepts.c
trunk/exp-drd/tests/tc18_semabuse.stderr.exp
trunk/exp-drd/tests/tc20_verifywrap.stderr.exp
trunk/exp-drd/tests/tc20_verifywrap2.stderr.exp
Modified: trunk/exp-drd/drd_pthread_intercepts.c
===================================================================
--- trunk/exp-drd/drd_pthread_intercepts.c 2008-03-11 20:28:51 UTC (rev 7643)
+++ trunk/exp-drd/drd_pthread_intercepts.c 2008-03-11 20:39:01 UTC (rev 7644)
@@ -656,7 +656,7 @@
return ret;
}
-PTH_FUNC(int, semZuinitZAZAZa, // sem_init@@*
+PTH_FUNC(int, semZuinitZa, // sem_init*
sem_t *sem,
int pshared,
unsigned int value)
@@ -721,7 +721,7 @@
}
// sem_wait
-PTH_FUNC(int, semZuwaitZAZAZa, // sem_wait@@*
+PTH_FUNC(int, semZuwaitZa, // sem_wait*
sem_t *sem)
{
int ret;
@@ -800,7 +800,7 @@
}
// sem_post
-PTH_FUNC(int, semZupostZAZAZa, // sem_post@@*
+PTH_FUNC(int, semZupostZa, // sem_post*
sem_t *sem)
{
int ret;
Modified: trunk/exp-drd/tests/tc18_semabuse.stderr.exp
===================================================================
--- trunk/exp-drd/tests/tc18_semabuse.stderr.exp 2008-03-11 20:28:51 UTC (rev 7643)
+++ trunk/exp-drd/tests/tc18_semabuse.stderr.exp 2008-03-11 20:39:01 UTC (rev 7644)
@@ -1,6 +1,6 @@
Invalid semaphore: semaphore 0x........
- at 0x........: sem_wait@@* (drd_pthread_intercepts.c:?)
+ at 0x........: sem_wait* (drd_pthread_intercepts.c:?)
by 0x........: main (tc18_semabuse.c:34)
ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)
Modified: trunk/exp-drd/tests/tc20_verifywrap.stderr.exp
===================================================================
--- trunk/exp-drd/tests/tc20_verifywrap.stderr.exp 2008-03-11 20:28:51 UTC (rev 7643)
+++ trunk/exp-drd/tests/tc20_verifywrap.stderr.exp 2008-03-11 20:39:01 UTC (rev 7644)
@@ -92,7 +92,7 @@
Invalid semaphore: semaphore 0x........
- at 0x........: sem_wait@@* (drd_pthread_intercepts.c:?)
+ at 0x........: sem_wait* (drd_pthread_intercepts.c:?)
by 0x........: main (tc20_verifywrap.c:242)
FIXME: can't figure out how to verify wrap of sem_post
Modified: trunk/exp-drd/tests/tc20_verifywrap2.stderr.exp
===================================================================
--- trunk/exp-drd/tests/tc20_verifywrap2.stderr.exp 2008-03-11 20:28:51 UTC (rev 7643)
+++ trunk/exp-drd/tests/tc20_verifywrap2.stderr.exp 2008-03-11 20:39:01 UTC (rev 7644)
@@ -120,7 +120,7 @@
[1/1] semaphore_post_wait 0x........
Invalid semaphore: semaphore 0x........
- at 0x........: sem_wait@@* (drd_pthread_intercepts.c:?)
+ at 0x........: sem_wait* (drd_pthread_intercepts.c:?)
by 0x........: main (tc20_verifywrap.c:242)
[1/1] semaphore_post 0x........
|