|
From: <sv...@va...> - 2009-04-14 01:46:18
|
Author: njn
Date: 2009-04-14 02:44:10 +0100 (Tue, 14 Apr 2009)
New Revision: 9525
Log:
Merge r9499..9522 from the trunk.
Modified:
branches/DARWIN/NEWS
branches/DARWIN/configure.in
branches/DARWIN/coregrind/m_debuginfo/readdwarf.c
branches/DARWIN/coregrind/m_syswrap/syswrap-linux.c
branches/DARWIN/drd/Testing.txt
branches/DARWIN/drd/drd_mutex.c
branches/DARWIN/drd/drd_rwlock.c
branches/DARWIN/drd/tests/
branches/DARWIN/drd/tests/pth_detached.c
branches/DARWIN/glibc-2.X-drd.supp
branches/DARWIN/include/vki/vki-amd64-linux.h
branches/DARWIN/include/vki/vki-ppc32-linux.h
branches/DARWIN/include/vki/vki-ppc64-linux.h
branches/DARWIN/include/vki/vki-x86-linux.h
branches/DARWIN/nightly/bin/nightly
Modified: branches/DARWIN/NEWS
===================================================================
--- branches/DARWIN/NEWS 2009-04-14 01:18:09 UTC (rev 9524)
+++ branches/DARWIN/NEWS 2009-04-14 01:44:10 UTC (rev 9525)
@@ -78,6 +78,7 @@
n-i-bz DRD - added new client request, VG_USERREQ__DRD_CLEAN_MEMORY.
187048 DRD - the mutex attribute PTHREAD_PROCESS_SHARED is now
interpreted correctly.
+188046 Removed a bashism from the configure script.
Modified: branches/DARWIN/configure.in
===================================================================
--- branches/DARWIN/configure.in 2009-04-14 01:18:09 UTC (rev 9524)
+++ branches/DARWIN/configure.in 2009-04-14 01:44:10 UTC (rev 9525)
@@ -68,7 +68,7 @@
# If no AR variable was specified, look up the name of the archiver. Otherwise
# do not touch the AR variable.
if test "x$AR" = "x"; then
- AC_PATH_PROGS([AR], ["${LD%ld}ar" "ar"], [ar])
+ AC_PATH_PROGS([AR], [`echo $LD | sed 's/ld$/ar/'` "ar"], [ar])
fi
AC_ARG_VAR([AR],[Archiver command])
Modified: branches/DARWIN/coregrind/m_debuginfo/readdwarf.c
===================================================================
--- branches/DARWIN/coregrind/m_debuginfo/readdwarf.c 2009-04-14 01:18:09 UTC (rev 9524)
+++ branches/DARWIN/coregrind/m_debuginfo/readdwarf.c 2009-04-14 01:44:10 UTC (rev 9525)
@@ -2901,6 +2901,17 @@
VG_(printf)(" rci:DW_CFA_undefined\n");
break;
+ case DW_CFA_same_value:
+ reg = read_leb128( &instr[i], &nleb, 0);
+ i += nleb;
+ if (reg < 0 || reg >= N_CFI_REGS)
+ return 0; /* fail */
+ ctx->reg[reg].tag = RR_Same;
+ ctx->reg[reg].arg = 0;
+ if (di->ddump_frames)
+ VG_(printf)(" rci:DW_CFA_same_value\n");
+ break;
+
case DW_CFA_GNU_args_size:
/* No idea what is supposed to happen. gdb-6.3 simply
ignores these. */
Modified: branches/DARWIN/coregrind/m_syswrap/syswrap-linux.c
===================================================================
--- branches/DARWIN/coregrind/m_syswrap/syswrap-linux.c 2009-04-14 01:18:09 UTC (rev 9524)
+++ branches/DARWIN/coregrind/m_syswrap/syswrap-linux.c 2009-04-14 01:44:10 UTC (rev 9525)
@@ -3531,6 +3531,9 @@
case VKI_SIOCGSTAMP:
PRE_MEM_WRITE( "ioctl(SIOCGSTAMP)", ARG3, sizeof(struct vki_timeval));
break;
+ case VKI_SIOCGSTAMPNS:
+ PRE_MEM_WRITE( "ioctl(SIOCGSTAMPNS)", ARG3, sizeof(struct vki_timespec));
+ break;
/* SIOCOUTQ is an ioctl that, when called on a socket, returns
the number of bytes currently in that socket's send buffer.
It writes this value as an int to the memory location
@@ -4534,6 +4537,9 @@
case VKI_SIOCGSTAMP:
POST_MEM_WRITE( ARG3, sizeof(struct vki_timeval) );
break;
+ case VKI_SIOCGSTAMPNS:
+ POST_MEM_WRITE( ARG3, sizeof(struct vki_timespec) );
+ break;
/* SIOCOUTQ is an ioctl that, when called on a socket, returns
the number of bytes currently in that socket's send buffer.
It writes this value as an int to the memory location
Modified: branches/DARWIN/drd/Testing.txt
===================================================================
--- branches/DARWIN/drd/Testing.txt 2009-04-14 01:18:09 UTC (rev 9524)
+++ branches/DARWIN/drd/Testing.txt 2009-04-14 01:44:10 UTC (rev 9525)
@@ -11,8 +11,9 @@
4. Run the regression tests as follows:
perl tests/vg_regtest drd
5. Run Konstantin's regression tests:
- svn checkout http://data-race-test.googlecode.com/svn/trunk drt
- make -C drt/unittest -s build
+ mkdir -p drt/unittest
+ svn checkout http://data-race-test.googlecode.com/svn/trunk/unittest drt/unittest
+ make -C drt/unittest -s all
./vg-in-place --tool=drd --check-stack-var=yes drt/unittest/racecheck_unittest 2>&1|less
6. Test the slowdown for matinv for various matrix sizes via the script
drd/scripts/run-matinv (must be about 24 for i == 1 and about
Modified: branches/DARWIN/drd/drd_mutex.c
===================================================================
--- branches/DARWIN/drd/drd_mutex.c 2009-04-14 01:18:09 UTC (rev 9524)
+++ branches/DARWIN/drd/drd_mutex.c 2009-04-14 01:44:10 UTC (rev 9525)
@@ -405,7 +405,7 @@
{
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
Modified: branches/DARWIN/drd/drd_rwlock.c
===================================================================
--- branches/DARWIN/drd/drd_rwlock.c 2009-04-14 01:18:09 UTC (rev 9524)
+++ branches/DARWIN/drd/drd_rwlock.c 2009-04-14 01:44:10 UTC (rev 9525)
@@ -521,7 +521,7 @@
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 @@
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
Property changes on: branches/DARWIN/drd/tests
___________________________________________________________________
Name: svn:ignore
- *.stderr.diff*
*.stderr.out
*.stdout.diff*
*.stdout.out
.deps
atomic_var
bar_bad
bar_trivial
boost_thread
circular_buffer
drd_bitmap_test
fp_race
hg01_all_ok
hg02_deadlock
hg03_inherit
hg04_race
hg05_race2
hg06_readshared
hold_lock
linuxthreads_det
Makefile
Makefile.in
matinv
memory_allocation
monitor_example
new_delete
omp_matinv
omp_prime
omp_printf
pth_barrier
pth_barrier_race
pth_barrier_reinit
pth_broadcast
pth_cancel_locked
pth_cond_race
pth_create_chain
pth_detached
pth_detached_sem
pth_inconsistent_cond_wait
pth_spinlock
qt4_mutex
qt4_rwlock
qt4_semaphore
recursive_mutex
rwlock_race
rwlock_test
sem_as_mutex
sigalrm
tc01_simple_race
tc02_simple_tls
tc03_re_excl
tc04_free_lock
tc05_simple_race
tc06_two_races
tc07_hbl1
tc08_hbl2
tc09_bad_unlock
tc10_rec_lock
tc11_XCHG
tc12_rwl_trivial
tc13_laog1
tc15_laog_lockdel
tc16_byterace
tc17_sembar
tc18_semabuse
tc19_shadowmem
tc20_verifywrap
tc21_pthonce
tc22_exit_w_lock
tc23_bogus_condwait
tc24_nonzero_sem
trylock
vg_regtest.tmp*
+ *.stderr.diff*
*.stderr.out
*.stdout.diff*
*.stdout.out
.deps
atomic_var
bar_bad
bar_trivial
boost_thread
circular_buffer
drd_bitmap_test
fp_race
hg01_all_ok
hg02_deadlock
hg03_inherit
hg04_race
hg05_race2
hg06_readshared
hold_lock
linuxthreads_det
Makefile
Makefile.in
matinv
memory_allocation
monitor_example
new_delete
omp_matinv
omp_prime
omp_printf
pth_barrier
pth_barrier_race
pth_barrier_reinit
pth_broadcast
pth_cancel_locked
pth_cond_race
pth_create_chain
pth_detached
pth_detached_sem
pth_inconsistent_cond_wait
pth_process_shared_mutex
pth_spinlock
qt4_mutex
qt4_rwlock
qt4_semaphore
recursive_mutex
rwlock_race
rwlock_test
sem_as_mutex
sigalrm
tc01_simple_race
tc02_simple_tls
tc03_re_excl
tc04_free_lock
tc05_simple_race
tc06_two_races
tc07_hbl1
tc08_hbl2
tc09_bad_unlock
tc10_rec_lock
tc11_XCHG
tc12_rwl_trivial
tc13_laog1
tc15_laog_lockdel
tc16_byterace
tc17_sembar
tc18_semabuse
tc19_shadowmem
tc20_verifywrap
tc21_pthonce
tc22_exit_w_lock
tc23_bogus_condwait
tc24_nonzero_sem
trylock
vg_regtest.tmp*
Modified: branches/DARWIN/drd/tests/pth_detached.c
===================================================================
--- branches/DARWIN/drd/tests/pth_detached.c 2009-04-14 01:18:09 UTC (rev 9524)
+++ branches/DARWIN/drd/tests/pth_detached.c 2009-04-14 01:44:10 UTC (rev 9525)
@@ -91,5 +91,7 @@
pthread_mutex_destroy(&s_mutex);
+ sleep(1);
+
return 0;
}
Modified: branches/DARWIN/glibc-2.X-drd.supp
===================================================================
--- branches/DARWIN/glibc-2.X-drd.supp 2009-04-14 01:18:09 UTC (rev 9524)
+++ branches/DARWIN/glibc-2.X-drd.supp 2009-04-14 01:44:10 UTC (rev 9525)
@@ -310,7 +310,6 @@
libglib-g_get_language_names
drd:ConflictingAccess
fun:g_slice_free_chain_with_offset
- fun:g_get_language_names
}
{
libQtCore-4.0/4.1-Q_GLOBAL_STATIC-connectionList
@@ -325,7 +324,6 @@
fun:_ZN14QReadWriteLock12lockForWriteEv
fun:_ZN14QObjectPrivate11clearGuardsEP7QObject
fun:_ZN7QObjectD2Ev
- fun:_ZN20QEventDispatcherGlibD0Ev
}
{
libQtCore-QObjectPrivate::clearGuards(QObject*)
Modified: branches/DARWIN/include/vki/vki-amd64-linux.h
===================================================================
--- branches/DARWIN/include/vki/vki-amd64-linux.h 2009-04-14 01:18:09 UTC (rev 9524)
+++ branches/DARWIN/include/vki/vki-amd64-linux.h 2009-04-14 01:44:10 UTC (rev 9525)
@@ -287,9 +287,10 @@
// From linux-2.6.9/include/asm-x86_64/sockios.h
//----------------------------------------------------------------------
-#define VKI_SIOCSPGRP 0x8902
-#define VKI_SIOCGPGRP 0x8904
-#define VKI_SIOCGSTAMP 0x8906 /* Get stamp */
+#define VKI_SIOCSPGRP 0x8902
+#define VKI_SIOCGPGRP 0x8904
+#define VKI_SIOCGSTAMP 0x8906 /* Get stamp (timeval) */
+#define VKI_SIOCGSTAMPNS 0x8907 /* Get stamp (timespec) */
//----------------------------------------------------------------------
// From linux-2.6.9/include/asm-x86_64/stat.h
Modified: branches/DARWIN/include/vki/vki-ppc32-linux.h
===================================================================
--- branches/DARWIN/include/vki/vki-ppc32-linux.h 2009-04-14 01:18:09 UTC (rev 9524)
+++ branches/DARWIN/include/vki/vki-ppc32-linux.h 2009-04-14 01:44:10 UTC (rev 9525)
@@ -352,9 +352,10 @@
#define VKI_SOL_SOCKET 1
#define VKI_SO_TYPE 3
-#define VKI_SIOCSPGRP 0x8902
-#define VKI_SIOCGPGRP 0x8904
-#define VKI_SIOCGSTAMP 0x8906 /* Get stamp */
+#define VKI_SIOCSPGRP 0x8902
+#define VKI_SIOCGPGRP 0x8904
+#define VKI_SIOCGSTAMP 0x8906 /* Get stamp (timeval) */
+#define VKI_SIOCGSTAMPNS 0x8907 /* Get stamp (timespec) */
//----------------------------------------------------------------------
// From linux-2.6.10/include/asm-ppc/stat.h
Modified: branches/DARWIN/include/vki/vki-ppc64-linux.h
===================================================================
--- branches/DARWIN/include/vki/vki-ppc64-linux.h 2009-04-14 01:18:09 UTC (rev 9524)
+++ branches/DARWIN/include/vki/vki-ppc64-linux.h 2009-04-14 01:44:10 UTC (rev 9525)
@@ -410,7 +410,8 @@
#define VKI_SIOCSPGRP 0x8902
#define VKI_SIOCGPGRP 0x8904
-#define VKI_SIOCGSTAMP 0x8906 /* Get stamp */
+#define VKI_SIOCGSTAMP 0x8906 /* Get stamp (timeval) */
+#define VKI_SIOCGSTAMPNS 0x8907 /* Get stamp (timespec) */
//----------------------------------------------------------------------
// From linux-2.6.13/include/asm-ppc64/stat.h
Modified: branches/DARWIN/include/vki/vki-x86-linux.h
===================================================================
--- branches/DARWIN/include/vki/vki-x86-linux.h 2009-04-14 01:18:09 UTC (rev 9524)
+++ branches/DARWIN/include/vki/vki-x86-linux.h 2009-04-14 01:44:10 UTC (rev 9525)
@@ -328,9 +328,10 @@
// From linux-2.6.8.1/include/asm-i386/sockios.h
//----------------------------------------------------------------------
-#define VKI_SIOCSPGRP 0x8902
-#define VKI_SIOCGPGRP 0x8904
-#define VKI_SIOCGSTAMP 0x8906 /* Get stamp */
+#define VKI_SIOCSPGRP 0x8902
+#define VKI_SIOCGPGRP 0x8904
+#define VKI_SIOCGSTAMP 0x8906 /* Get stamp (timeval) */
+#define VKI_SIOCGSTAMPNS 0x8907 /* Get stamp (timespec) */
//----------------------------------------------------------------------
// From linux-2.6.8.1/include/asm-i386/stat.h
Modified: branches/DARWIN/nightly/bin/nightly
===================================================================
--- branches/DARWIN/nightly/bin/nightly 2009-04-14 01:18:09 UTC (rev 9524)
+++ branches/DARWIN/nightly/bin/nightly 2009-04-14 01:44:10 UTC (rev 9525)
@@ -41,7 +41,7 @@
#----------------------------------------------------------------------------
# Must have at two arguments
if [ $# -ne 2 ] ; then
- echo "usage: bin/night /path/to/valgrind/nightly <tag>"
+ echo "usage: $0 /path/to/valgrind/nightly <tag>"
exit 1
fi
|