Added command line option --var-info. Reading debug info for client variables is...

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

diff --git a/exp-drd/drd_main.c b/exp-drd/drd_main.c
index 4a0734bc8510654a6c45d3fc759358d29f55e880..8c7246f6573c6c572e75755c0333a69d10cb166f 100644 (file)
--- a/exp-drd/drd_main.c
+++ b/exp-drd/drd_main.c
@@ -65,6 +65,7 @@ static Bool drd_print_stats = False;
 static Bool drd_trace_fork_join = False;
 static Bool drd_trace_mem = False;
 static Addr drd_trace_address = 0;
+static Bool s_drd_var_info = False;
 
 
 //
@@ -102,6 +103,7 @@ static Bool drd_process_cmd_line_option(Char* arg)
   else VG_BOOL_CLO(arg, "--trace-segment",     trace_segment)
   else VG_BOOL_CLO(arg, "--trace-semaphore",   trace_semaphore)
   else VG_BOOL_CLO(arg, "--trace-suppression", trace_suppression)
+  else VG_BOOL_CLO(arg, "--var-info",          s_drd_var_info)
   else VG_STR_CLO (arg, "--trace-address",     trace_address)
   else
     return VG_(replacement_malloc_process_cmd_line_option)(arg);
@@ -727,6 +729,11 @@ void drd_post_clo_init(void)
 #  else
   VG_(printf)("\nWARNING: DRD has only been tested on x86-linux and amd64-linux.\n\n");
 #  endif
+
+  if (s_drd_var_info)
+  {
+    VG_(needs_var_info)();
+  }
 }
 
 static void instrument_load(IRSB* const bb,
@@ -1038,8 +1045,6 @@ void drd_pre_clo_init(void)
   VG_(track_pre_thread_ll_exit)   (drd_thread_finished);
 
   // Other stuff.
-  VG_(needs_var_info)();
-
   drd_register_malloc_wrappers(drd_start_using_mem, drd_stop_using_mem);
 
   drd_clientreq_init();

diff --git a/exp-drd/tests/fp_race.vgtest b/exp-drd/tests/fp_race.vgtest
index 7b69785b063ed37c696a7e1cdd086ff57f5677aa..76e28014614d4d3fae0dd8307b55238fde142f52 100644 (file)
--- a/exp-drd/tests/fp_race.vgtest
+++ b/exp-drd/tests/fp_race.vgtest
@@ -1,2 +1,3 @@
 prereq: ./supported_libpthread
+vgopts: --var-info=yes
 prog: fp_race

diff --git a/exp-drd/tests/hg03_inherit.vgtest b/exp-drd/tests/hg03_inherit.vgtest
index 169d4d4807530b92bb37234bdb8de967ea62ba76..e7b2431bb29483dd80b3433a987a453f6bd10c39 100644 (file)
--- a/exp-drd/tests/hg03_inherit.vgtest
+++ b/exp-drd/tests/hg03_inherit.vgtest
@@ -1,3 +1,3 @@
 prereq: ./supported_libpthread
+vgopts: --show-confl-seg=no --var-info=yes
 prog: hg03_inherit
-vgopts: --show-confl-seg=no

diff --git a/exp-drd/tests/hg04_race.vgtest b/exp-drd/tests/hg04_race.vgtest
index 7062ac6f6a8d484636946c8c7f44b12f4d16dfa5..173c17c33aa0d18b2da198df5e658b71193f1a88 100644 (file)
--- a/exp-drd/tests/hg04_race.vgtest
+++ b/exp-drd/tests/hg04_race.vgtest
@@ -1,2 +1,3 @@
 prereq: ./supported_libpthread
+vgopts: --var-info=yes
 prog: hg04_race

diff --git a/exp-drd/tests/hg05_race2.vgtest b/exp-drd/tests/hg05_race2.vgtest
index b0f3180fe9be38298b80be1b5e355edb5d92fb79..4ad5b3dcd4cfea2744cafecc2cbad670e542cb9d 100644 (file)
--- a/exp-drd/tests/hg05_race2.vgtest
+++ b/exp-drd/tests/hg05_race2.vgtest
@@ -1,2 +1,3 @@
 prereq: ./supported_libpthread
+vgopts: --var-info=yes
 prog: hg05_race2

diff --git a/exp-drd/tests/pth_detached2.vgtest b/exp-drd/tests/pth_detached2.vgtest
index 02e2c60a89461d340893375f555fd4dd75336c5f..b34eb5c08a2c978afad40c680acf8928a8955099 100644 (file)
--- a/exp-drd/tests/pth_detached2.vgtest
+++ b/exp-drd/tests/pth_detached2.vgtest
@@ -1,3 +1,4 @@
 prereq: ./supported_libpthread
+vgopts: --var-info=yes
 prog: pth_detached
 args: 10 10

diff --git a/exp-drd/tests/rwlock_race.vgtest b/exp-drd/tests/rwlock_race.vgtest
index 531d2af217838acef56fa663141778d3cc5707de..856138b2b7e85e21ad6b585a561c7bfc9108aec7 100644 (file)
--- a/exp-drd/tests/rwlock_race.vgtest
+++ b/exp-drd/tests/rwlock_race.vgtest
@@ -1,2 +1,3 @@
 prereq: ./supported_libpthread
+vgopts: --var-info=yes
 prog: rwlock_race

diff --git a/exp-drd/tests/sem_as_mutex.vgtest b/exp-drd/tests/sem_as_mutex.vgtest
index 2fe2f76a00404029bfdbde9d932b0793a10821d9..e0131968005e5fc11c037ef1504be5836d20326b 100644 (file)
--- a/exp-drd/tests/sem_as_mutex.vgtest
+++ b/exp-drd/tests/sem_as_mutex.vgtest
@@ -1,2 +1,3 @@
 prereq: ./supported_libpthread
+vgopts: --var-info=yes
 prog: sem_as_mutex

diff --git a/exp-drd/tests/tc01_simple_race.vgtest b/exp-drd/tests/tc01_simple_race.vgtest
index 7a8abda2e8e7a2ba21fd1366bd358cf57c4e1395..bfd087921194266fddc357aa9efa10e4bf7176e1 100644 (file)
--- a/exp-drd/tests/tc01_simple_race.vgtest
+++ b/exp-drd/tests/tc01_simple_race.vgtest
@@ -1,2 +1,3 @@
 prereq: ./supported_libpthread
+vgopts: --var-info=yes
 prog: tc01_simple_race

diff --git a/exp-drd/tests/tc16_byterace.vgtest b/exp-drd/tests/tc16_byterace.vgtest
index 2308aeb50eb54528ba26e0a2aa9691e1e851bd91..b6f47e61c371a6244de0d8215e40191d6fdb5460 100644 (file)
--- a/exp-drd/tests/tc16_byterace.vgtest
+++ b/exp-drd/tests/tc16_byterace.vgtest
@@ -1,2 +1,3 @@
 prereq: ./supported_libpthread
+vgopts: --var-info=yes
 prog: tc16_byterace

diff --git a/exp-drd/tests/tc20_verifywrap.vgtest b/exp-drd/tests/tc20_verifywrap.vgtest
index 69f1436e610794435339ad589aa1a1bcfa892f24..bee185c82865ebcedba8cfc5d324bc25cf5801a2 100644 (file)
--- a/exp-drd/tests/tc20_verifywrap.vgtest
+++ b/exp-drd/tests/tc20_verifywrap.vgtest
@@ -1,2 +1,3 @@
 prereq: ./supported_libpthread
+vgopts: --var-info=yes
 prog: tc20_verifywrap

diff --git a/exp-drd/tests/tc20_verifywrap2.vgtest b/exp-drd/tests/tc20_verifywrap2.vgtest
index aa52d0367a168bd4c75540ce939dfa9b15bd531b..7a445e190181e9d7920cf9b315ae4e948d8e0595 100644 (file)
--- a/exp-drd/tests/tc20_verifywrap2.vgtest
+++ b/exp-drd/tests/tc20_verifywrap2.vgtest
@@ -1,3 +1,3 @@
 prereq: ./supported_libpthread
+vgopts: --trace-mutex=yes --trace-cond=yes --trace-semaphore=yes --var-info=yes
 prog: tc20_verifywrap
-vgopts: --trace-mutex=yes --trace-cond=yes --trace-semaphore=yes