use resrcwait() when waiting for memory to become available

use resrcwait() when waiting for memory to become available. randomize
the sleep time and properly restore old process status in case tsleep()
gets interrupted.

1 files changed, 9 insertions, 3 deletions

diff --git a/sys/src/9/port/pgrp.c b/sys/src/9/port/pgrp.c
index 22fc78b56..21ac7af86 100644
--- a/sys/src/9/port/pgrp.c
+++ b/sys/src/9/port/pgrp.c
@@ -306,6 +306,10 @@ resrcwait(char *reason)
 
 	p = up->psstate;
 	if(reason) {
+		if(waserror()){
+			up->psstate = p;
+			nexterror();
+		}
 		up->psstate = reason;
 		now = seconds();
 		/* don't tie up the console with complaints */
@@ -314,7 +318,9 @@ resrcwait(char *reason)
 			print("%s\n", reason);
 		}
 	}
-
-	tsleep(&up->sleep, return0, 0, 300);
-	up->psstate = p;
+	tsleep(&up->sleep, return0, 0, 100+nrand(200));
+	if(reason) {
+		up->psstate = p;
+		poperror();
+	}
 }