Remove misc debug printing.

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

diff --git a/coregrind/amd64/state.c b/coregrind/amd64/state.c
index 3dc1805ed10941cbfae4467dd6d6c1ca4dab18cb..209e28b25443d4c64d0077564a8d69f8e24381ed 100644 (file)
--- a/coregrind/amd64/state.c
+++ b/coregrind/amd64/state.c
@@ -73,7 +73,7 @@ void VGA_(init_thread1state) ( Addr client_rip,
    VG_(memset)(&arch->vex_shadow, 0, sizeof(VexGuestAMD64State));
 
    /* Put essential stuff into the new state. */
-
+   VG_(printf)("startup rsp 0x%llx  rip 0x%llx\n", rsp_at_startup, client_rip);
    arch->vex.guest_RSP = rsp_at_startup;
    arch->vex.guest_RIP = client_rip;
 

diff --git a/coregrind/vg_proxylwp.c b/coregrind/vg_proxylwp.c
index ac274d9156344766b3a1372707ebc986d3da3f56..419879bb7e06e2acb9f3643a20b124906588f5c2 100644 (file)
--- a/coregrind/vg_proxylwp.c
+++ b/coregrind/vg_proxylwp.c
@@ -869,10 +869,9 @@ static Bool proxy_wait(ProxyLWP *proxy, Bool block, Int *status)
       if (block) {
         Int lwp = proxy->lwp;
 
-VG_(printf)("OINK 503\n");
         if(proxy->lwp != 0)
+            /* JEREMY: amd64 hangs here at exit */
            do_futex(&proxy->lwp, VKI_FUTEX_WAIT, lwp, NULL, NULL);
-VG_(printf)("OINK 504\n");
         if (status)
            *status = proxy->exitcode;
         ret = True;
@@ -885,7 +884,6 @@ VG_(printf)("OINK 504\n");
    } else {
       Int flags = __VKI_WCLONE;
       Int res;
-VG_(printf)("OINK 506\n");
       if (!block)
         flags |= VKI_WNOHANG;
       res = VG_(waitpid)(proxy->lwp, status, flags);
@@ -962,14 +960,11 @@ void VG_(proxy_delete)(ThreadId tid, Bool force)
    vg_assert(proxy->tid == tid);
    if (proxy->terminating)
       return;          /* already going away */
-VG_(printf)("OINK 401\n");
+
    proxy->terminating = True;
-VG_(printf)("OINK 402\n");
    VG_(close)(proxy->topx);
    proxy->topx = -1;
-VG_(printf)("OINK 403\n");
    /* proxy thread will close proxy->frommain itself */
-VG_(printf)("OINK 404\n");
    if (force && lwp != 0) {
       /* wouldn't need to force it if it were already dead */
       vg_assert(tst->status != VgTs_Empty);
@@ -980,21 +975,16 @@ VG_(printf)("OINK 404\n");
 
    status = -1;
    res = False;
-VG_(printf)("OINK 405\n");
    /* We need to wait for the PX_Exiting message before doing the
       proxy_wait, because if we don't read the results pipe, the proxy
       may be blocked writing to it, causing a deadlock with us as we
       wait for it to exit. */
    sys_wait_results(True, tid, PX_Exiting, True);
-VG_(printf)("OINK 405a\n");
    res = proxy_wait(proxy, True, &status);
-VG_(printf)("OINK 406\n");
    if ((!res || status != 0) && VG_(clo_verbosity) > 1)
       VG_(printf)("proxy %d for tid %d exited status %d, res %d\n",
                  lwp, tid, status, res);
-VG_(printf)("OINK 407\n");
    LWP_free(proxy);
-VG_(printf)("OINK 408\n");
    tst->proxy = NULL;
 }
 

diff --git a/coregrind/vg_scheduler.c b/coregrind/vg_scheduler.c
index c1abbef5d344f3da387dff5254571ffaaeffae98..2a0cf6cb3cc9c0003a2a54926d5912b86c864818 100644 (file)
--- a/coregrind/vg_scheduler.c
+++ b/coregrind/vg_scheduler.c
@@ -1432,7 +1432,10 @@ void maybe_rendezvous_joiners_and_joinees ( void )
 void VG_(nuke_all_threads_except) ( ThreadId me )
 {
    ThreadId tid;
-   VG_(printf)("HACK HACK HACK: nuke_all_threads_except\n"); return;
+   if (0) {
+      VG_(printf)("HACK HACK HACK: nuke_all_threads_except\n"); 
+      return;
+   }
 
    for (tid = 1; tid < VG_N_THREADS; tid++) {
       if (tid == me
@@ -1441,18 +1444,14 @@ void VG_(nuke_all_threads_except) ( ThreadId me )
       if (1)
          VG_(printf)(
             "VG_(nuke_all_threads_except): nuking tid %d\n", tid);
-VG_(printf)("OINK 49\n");
       VG_(proxy_delete)(tid, True);
-VG_(printf)("OINK 49a\n");
       VG_(threads)[tid].status = VgTs_Empty;
       VG_(threads)[tid].associated_mx = NULL;
       VG_(threads)[tid].associated_cv = NULL;
       VG_(threads)[tid].stack_base = (Addr)NULL;
       VG_(threads)[tid].stack_size = 0;
       cleanup_after_thread_exited( tid, True );
-VG_(printf)("OINK 4\n");
    }
-VG_(printf)("OINK 5\n");
 }