X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fruntime%2Fruntime.c;h=6900e50396f6da6fe54d42e93480da76020dfa33;hb=0051cc0532da9f68a0ba5db5c07ebee1c91ee4d8;hp=e3e11bc0c00d18e017818ba8652f1f01fc174248;hpb=e365f2f7a9c66d307b48fee70778f4eaa84bdcc0;p=sbcl.git

diff --git a/src/runtime/runtime.c b/src/runtime/runtime.c
index e3e11bc..6900e50 100644
--- a/src/runtime/runtime.c
+++ b/src/runtime/runtime.c
@@ -384,7 +384,6 @@ static void parent_do_garbage_collect(void)
 
     for_each_thread(th) {
 	if(ptrace(PTRACE_ATTACH,th->pid,0,0)) {
-	    fprintf(stderr,"attaching to %d ...",th->pid); 
 	    perror("PTRACE_ATTACH");
 	}
 	else waiting_threads++;
@@ -419,9 +418,11 @@ static void parent_do_garbage_collect(void)
 		 * finished being pseudo_atomic.  once there it will
 		 * signal itself SIGSTOP, which will give us another 
 		 * event to wait for */
+#if 0
 		fprintf(stderr, "%d was pseudo-atomic, letting it resume \n",
 			th->pid);
-		SetTlSymbolValue(PSEUDO_ATOMIC_INTERRUPTED,1,th) ;
+#endif
+		SetTlSymbolValue(PSEUDO_ATOMIC_INTERRUPTED,make_fixnum(1),th);
 		if(ptrace(PTRACE_CONT,th->pid,0,0))
 		    perror("PTRACE_CONT");
 		waiting_threads++;
@@ -432,7 +433,6 @@ static void parent_do_garbage_collect(void)
     collect_garbage(maybe_gc_pending-1);
     maybe_gc_pending=0;
     stop_the_world=0;
-    /*    fprintf(stderr, "gc done\n"); */
     for_each_thread(th) 
 	if(ptrace(PTRACE_DETACH,th->pid,0,0))
 	    perror("PTRACE_DETACH");
@@ -443,6 +443,7 @@ static void /* noreturn */ parent_loop(void)
     struct sigaction sa;
     sigset_t sigset;
     int status;
+    pid_t pid=0;
 
     sigemptyset(&sigset);
 
@@ -461,29 +462,30 @@ static void /* noreturn */ parent_loop(void)
     sa.sa_flags=0;
     sigaction(SIGINT, &sa, 0);
 
-    while(all_threads) {
-	pid_t pid=0;
-	while(pid=waitpid(-1,&status,__WALL|WUNTRACED)) {
-	    struct thread *th;
-	    fprintf(stderr,"waitpid pid %d\n",pid);
-	    if(pid==-1) {
-		if(errno == EINTR) {
-		    if(maybe_gc_pending) parent_do_garbage_collect();
-		    continue;
-		}
-		if(errno == ECHILD) break;
-		fprintf(stderr,"waitpid: %s\n",strerror(errno));
+    while(!all_threads) {
+	sched_yield();
+    }
+    maybe_gc_pending=0;
+    while(all_threads && (pid=waitpid(-1,&status,__WALL|WUNTRACED))) {
+	struct thread *th;
+	int real_errno=errno;
+	while(maybe_gc_pending) parent_do_garbage_collect();
+	if(pid==-1) {
+	    if(real_errno == EINTR) {
 		continue;
 	    }
-	    th=find_thread_by_pid(pid);
-	    if(!th) continue;
-	    if(WIFEXITED(status) || WIFSIGNALED(status)) {
-		fprintf(stderr,"waitpid : child %d %x exited \n", pid,th);
-		destroy_thread(th);		
-		/* FIXME arrange to call or fake (free-mutex *session-lock*)
-		 * if necessary */
-		if(!all_threads) break;
-	    }
+	    if(real_errno == ECHILD) break;
+	    fprintf(stderr,"waitpid: %s\n",strerror(real_errno));
+	    continue;
+	}
+	th=find_thread_by_pid(pid);
+	if(!th) continue;
+	if(WIFEXITED(status) || WIFSIGNALED(status)) {
+	    fprintf(stderr,"waitpid : child %d %x exited \n", pid,th);
+	    destroy_thread(th);		
+	    /* FIXME arrange to call or fake (free-mutex *session-lock*)
+	     * if necessary */
+	    if(!all_threads) break;
 	}
     }
     exit(WEXITSTATUS(status));