From: Dirk Mueller <dmuell@gmx.net>
Date: Thu, 27 Nov 2003 09:07:47 +0000 (+0000)
Subject: reverting last commit, which broke all of valgrind.
X-Git-Tag: svn/VALGRIND_2_1_0~37
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ef4bb579c5090ba600f64d4b31d5094e50066d6a;p=thirdparty%2Fvalgrind.git

reverting last commit, which broke all of valgrind.


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

diff --git a/coregrind/vg_proxylwp.c b/coregrind/vg_proxylwp.c
index 23f81c74e0..8c4790e666 100644
--- a/coregrind/vg_proxylwp.c
+++ b/coregrind/vg_proxylwp.c
@@ -894,8 +894,6 @@ static Int proxy_clone(ProxyLWP *proxy)
 {
    Int ret = -1;
 
-   proxy->lwp = -1;
-
    if (have_settid != 0) {
       ret = VG_(clone)(proxylwp, 
 		       LWP_stack(proxy),
@@ -920,11 +918,13 @@ static Int proxy_clone(ProxyLWP *proxy)
 	    proxy->lwp = ret;
 	 }
        }
+       else 
+           have_settid = 1;
    }
 
    if (ret < 0) {
       vg_assert(have_settid == 0);
-      vg_assert(proxy->lwp == -1);
+      vg_assert(proxy->lwp == 0);
 
       ret = VG_(clone)(proxylwp, 
 		       LWP_stack(proxy),
@@ -949,6 +949,7 @@ static Bool proxy_wait(ProxyLWP *proxy, Bool block, Int *status)
       if (block) {
 	 Int lwp = proxy->lwp;
 
+
 	 if(proxy->lwp != 0)
 	    do_futex(&proxy->lwp, VKI_FUTEX_WAIT, lwp, NULL, NULL);