From: Julian Seward <jseward@acm.org>
Date: Mon, 12 Feb 2007 08:39:54 +0000 (+0000)
Subject: Get rid of the unused --model-pthreads flag.
X-Git-Tag: svn/VALGRIND_3_3_0~380
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04fc4caed2e4497e54a0a413fdfc4239aff9a6c2;p=thirdparty%2Fvalgrind.git

Get rid of the unused --model-pthreads flag.


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

diff --git a/coregrind/m_main.c b/coregrind/m_main.c
index 203545bdea..8e38b9b286 100644
--- a/coregrind/m_main.c
+++ b/coregrind/m_main.c
@@ -357,7 +357,6 @@ static Bool process_cmd_line_options( UInt* client_auxv, const char* toolname )
       else VG_BOOL_CLO(arg, "--trace-syscalls",   VG_(clo_trace_syscalls))
       else VG_BOOL_CLO(arg, "--trace-pthreads",   VG_(clo_trace_pthreads))
       else VG_BOOL_CLO(arg, "--wait-for-gdb",     VG_(clo_wait_for_gdb))
-      else VG_BOOL_CLO(arg, "--model-pthreads",   VG_(clo_model_pthreads))
 
       else VG_STR_CLO (arg, "--db-command",       VG_(clo_db_command))
       else VG_STR_CLO (arg, "--sim-hints",        VG_(clo_sim_hints))
@@ -1778,13 +1777,6 @@ Int valgrind_main ( Int argc, HChar **argv, HChar **envp )
    VG_(debugLog)(1, "main", "Finalise initial image\n");
    VG_(ii_finalise_image)( the_iifii );
 
-   //--------------------------------------------------------------
-   // Initialise the pthread model
-   //   p: ?
-   //--------------------------------------------------------------
-   //if (VG_(clo_model_pthreads))
-   //   VG_(pthread_init)();
-
    //--------------------------------------------------------------
    // Initialise the signal handling subsystem
    //   p: n/a
@@ -1892,8 +1884,6 @@ void shutdown_actions_NORETURN( ThreadId tid,
       // jrs: Huh?  but they surely are already gone
       VG_(reap_threads)(tid);
 
-      VG_(clo_model_pthreads) = False;
-
       // Clean the client up before the final report
       // this causes the libc_freeres function to run
       final_tidyup(tid);
@@ -1910,8 +1900,6 @@ void shutdown_actions_NORETURN( ThreadId tid,
       // that none of the other threads ever run again.
       vg_assert( VG_(count_living_threads)() >= 1 );
 
-      VG_(clo_model_pthreads) = False;
-
       // Clean the client up before the final report
       // this causes the libc_freeres function to run
       // perhaps this is unsafe, as per comment above
diff --git a/coregrind/m_options.c b/coregrind/m_options.c
index 0056ec2602..3ec68d59a0 100644
--- a/coregrind/m_options.c
+++ b/coregrind/m_options.c
@@ -74,7 +74,6 @@ Bool   VG_(clo_sym_offsets)    = False;
 Bool   VG_(clo_run_libc_freeres) = True;
 Bool   VG_(clo_track_fds)      = False;
 Bool   VG_(clo_show_below_main)= False;
-Bool   VG_(clo_model_pthreads) = False;
 Bool   VG_(clo_show_emwarns)   = False;
 Int    VG_(clo_max_stackframe) = 2000000;
 Bool   VG_(clo_wait_for_gdb)   = False;
diff --git a/coregrind/m_scheduler/scheduler.c b/coregrind/m_scheduler/scheduler.c
index 87605fc8bc..c8e41ae964 100644
--- a/coregrind/m_scheduler/scheduler.c
+++ b/coregrind/m_scheduler/scheduler.c
@@ -1121,9 +1121,6 @@ VgSchedReturnCode VG_(scheduler) ( ThreadId tid )
 
    vg_assert(VG_(is_exiting)(tid));
 
-   //if (VG_(clo_model_pthreads))
-   //   VG_(tm_thread_exit)(tid);
-   
    return tst->exitreason;
 }
 
diff --git a/coregrind/pub_core_options.h b/coregrind/pub_core_options.h
index 662d9e16ef..60bd58cdab 100644
--- a/coregrind/pub_core_options.h
+++ b/coregrind/pub_core_options.h
@@ -141,8 +141,6 @@ extern Bool  VG_(clo_track_fds);
 extern Bool  VG_(clo_run_libc_freeres);
 /* Continue stack traces below main()?  Default: NO */
 extern Bool VG_(clo_show_below_main);
-/* Model the pthread library */
-extern Bool VG_(clo_model_pthreads);
 
 /* Should we show VEX emulation warnings?  Default: NO */
 extern Bool VG_(clo_show_emwarns);