devproc: make sure /proc/n/wait waits for the right process children

[plan9front.git] / sys / src / 9 / port / debugalloc.c

diff --git a/sys/src/9/port/debugalloc.c b/sys/src/9/port/debugalloc.c
old mode 100755 (executable)
new mode 100644 (file)
index e6a97e0..05a9a5c
--- a/sys/src/9/port/debugalloc.c
+++ b/sys/src/9/port/debugalloc.c
@@ -440,7 +440,10 @@ smalloc(ulong size)
 remember(getcallerpc(&size), v);
                if(v != nil)
                        break;
-               tsleep(&up->sleep, return0, 0, 100);
+               if(!waserror()){
+                       tsleep(&up->sleep, return0, 0, 100);
+                       poperror();
+               }
        }
        memset(v, 0, size);
        return v;
@@ -652,7 +655,7 @@ poolcompact(Pool *pool)
                        USED(recov);
                        if(nb > 0){
                                if(nb < pool->quanta+1)
-                                       panic("poolcompact: leftover too small\n");
+                                       panic("poolcompact: leftover too small");
                                end->size = nb;
                                pooladd(pool, end);
                        }