[Valgrind-developers] valgrind: r8401 - in branches/DRDDEV: coregrind/m_replacemalloc exp-drd memcheck/tests

[<sv...@va...>]

Author: bart
Date: 2008-07-08 16:57:49 +0100 (Tue, 08 Jul 2008)
New Revision: 8401

Log:
Removed some changes such that DRDDEV branch is now identical to trunk r7782.

Modified:
   branches/DRDDEV/coregrind/m_replacemalloc/vg_replace_malloc.c
   branches/DRDDEV/exp-drd/Testing.txt
   branches/DRDDEV/memcheck/tests/oset_test.c


Modified: branches/DRDDEV/coregrind/m_replacemalloc/vg_replace_malloc.c
===================================================================
--- branches/DRDDEV/coregrind/m_replacemalloc/vg_replace_malloc.c	2008-07-08 11:41:29 UTC (rev 8400)
+++ branches/DRDDEV/coregrind/m_replacemalloc/vg_replace_malloc.c	2008-07-08 15:57:49 UTC (rev 8401)
@@ -68,10 +68,6 @@
 #  error "Unknown platform"
 #endif
 
-/* --- Soname of libjemalloc. --- */
-
-#define m_jemalloc_soname libjemallocZdsoZa /* libjemalloc.so* */
-
 /* --- Soname of the GNU C++ library. --- */
 
 #define  m_libstdcxx_soname  libstdcZpZpZa           // libstdc++*
@@ -207,7 +203,6 @@
 //     (from_so, from_fn,  v's replacement)
 
 // malloc
-ALLOC_or_NULL(m_jemalloc_soname,  malloc,      malloc);
 ALLOC_or_NULL(m_libstdcxx_soname, malloc,      malloc);
 ALLOC_or_NULL(m_libc_soname,      malloc,      malloc);
 #if defined(VGP_ppc32_aix5) || defined(VGP_ppc64_aix5)
@@ -324,7 +319,6 @@
    }
 
 // free
-FREE(m_jemalloc_soname,   free,                 free );
 FREE(m_libstdcxx_soname,  free,                 free );
 FREE(m_libc_soname,       free,                 free );
 #if defined(VGP_ppc32_aix5) || defined(VGP_ppc64_aix5)
@@ -400,7 +394,6 @@
       return v; \
    }
 
-CALLOC(m_jemalloc_soname, calloc);
 CALLOC(m_libc_soname, calloc);
 #if defined(VGP_ppc32_aix5) || defined(VGP_ppc64_aix5)
 CALLOC(m_libc_soname, calloc_common);
@@ -433,7 +426,6 @@
       return v; \
    }
 
-REALLOC(m_jemalloc_soname, realloc);
 REALLOC(m_libc_soname, realloc);
 #if defined(VGP_ppc32_aix5) || defined(VGP_ppc64_aix5)
 REALLOC(m_libc_soname, realloc_common);
@@ -465,7 +457,6 @@
       return v; \
    }
 
-MEMALIGN(m_jemalloc_soname, memalign);
 MEMALIGN(m_libc_soname, memalign);
 
 
@@ -492,7 +483,6 @@
                 ((SizeT)pszB, size); \
    }
 
-VALLOC(m_jemalloc_soname, valloc);
 VALLOC(m_libc_soname, valloc);
 
 
@@ -576,7 +566,6 @@
       return VKI_ENOMEM; \
    }
 
-POSIX_MEMALIGN(m_jemalloc_soname, posix_memalign);
 POSIX_MEMALIGN(m_libc_soname, posix_memalign);
 #if defined(VGP_ppc32_aix5) || defined(VGP_ppc64_aix5)
 /* 27 Nov 07: it appears that xlc links into executables, a
@@ -607,7 +596,6 @@
       return pszB; \
    }
 
-MALLOC_USABLE_SIZE(m_jemalloc_soname, malloc_usable_size);
 MALLOC_USABLE_SIZE(m_libc_soname, malloc_usable_size);
 
 

Modified: branches/DRDDEV/exp-drd/Testing.txt
===================================================================
--- branches/DRDDEV/exp-drd/Testing.txt	2008-07-08 11:41:29 UTC (rev 8400)
+++ branches/DRDDEV/exp-drd/Testing.txt	2008-07-08 15:57:49 UTC (rev 8401)
@@ -3,19 +3,28 @@
 
 1. Run the regression tests. After having compiled DRD, run the following
    command:
-   perl tests/vg_regtest exp-drd
-2. Test whether DRD works with standard KDE applications and whether it does
+     perl tests/vg_regtest exp-drd
+2. Test the slowdown for matinv for various matrix sizes (must be less
+   than 100):
+     time exp-drd/tests/matinv 200
+     for ((i=1;i<=10;i++))
+     do
+       echo "==== $i ===="
+       time ./vg-in-place --tool=exp-drd exp-drd/tests/matinv 200 -t$i
+     done
+3. Test whether DRD works with standard KDE applications and whether it does
    not print any error messages:
-   ./vg-in-place --tool=exp-drd kate
-   ./vg-in-place --trace-children=yes --tool=exp-drd knode
-3. Test DRD with Firefox. First of all, build and install Firefox 3. Next,
+     ./vg-in-place --tool=exp-drd kate
+     ./vg-in-place --trace-children=yes --tool=exp-drd knode
+4. Test DRD with Firefox. First of all, build and install Firefox 3. Next,
    run the following command:
-   LD_LIBRARY_PATH=$HOME/firefox3: ./vg-in-place --tool=exp-drd \
-     $HOME/firefox3/firefox-bin
+     LD_LIBRARY_PATH=$HOME/software/mozilla-build/dist/lib: ./vg-in-place --tool=exp-drd $HOME/software/mozilla-build/dist/bin/firefox-bin
 
 
 
 
+
+
 The Firefox source code can be obtained here:
 ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source
 
@@ -30,6 +39,7 @@
 BUILD=${SRC}-build
 PREFIX=$HOME/firefox3
 MOZCONFIG=$BUILD/mozconfig-firefox
+export MOZCONFIG
 
 rm -rf   ${BUILD}   || exit $?
 rm -rf   ${PREFIX}  || exit $?
@@ -47,7 +57,6 @@
 ac_add_options --prefix $PREFIX
 EOF
 
-export MOZCONFIG
 export CFLAGS=-pipe
 
 ${SRC}/configure

Modified: branches/DRDDEV/memcheck/tests/oset_test.c
===================================================================
--- branches/DRDDEV/memcheck/tests/oset_test.c	2008-07-08 11:41:29 UTC (rev 8400)
+++ branches/DRDDEV/memcheck/tests/oset_test.c	2008-07-08 15:57:49 UTC (rev 8401)
@@ -28,9 +28,6 @@
 #define vgPlain_memset                 memset
 #define vgPlain_memcpy                 memcpy
 
-static void* VG_(malloc)( SizeT nbytes ) { return malloc(nbytes); }
-static void  VG_(free)  ( void* p )      { return free(p); }
-
 #include "coregrind/m_oset.c"
 
 #define NN  1000       // Size of OSets being created