merge

diff --git a/sys/src/cmd/upas/q/runq.c b/sys/src/cmd/upas/q/runq.c
index 67cad84144b9908c602a9951cc9c07b95fa2d038..159cb1c52eac3e0046548b6b03eb0d7b220a74af 100644 (file)
--- a/sys/src/cmd/upas/q/runq.c
+++ b/sys/src/cmd/upas/q/runq.c
@@ -3,6 +3,7 @@
 
 typedef struct Job Job;
 typedef struct Wdir Wdir;
+typedef struct Wpid Wpid;
 
 struct Wdir {
        Dir     *d;
@@ -41,6 +42,8 @@ char  *root;
 int    debug;
 int    giveup = 2*24*60*60;
 int    limit;
+Wpid   *waithd;
+Wpid   *waittl;
 
 char *runqlog = "runq";
 
@@ -196,6 +199,7 @@ rundir(char *name)
        int nlive, fidx, fd, found;
        Job *hd, *j, **p;
        Waitmsg *w;
+       Mlock *l;
        Wdir wd;
 
        fd = open(".", OREAD);
@@ -203,28 +207,31 @@ rundir(char *name)
                warning("reading %s", name);
                return;
        }
+       if((l = syslock("./rundir")) == nil){
+               warning("locking %s", name);
+               close(fd);
+               return;
+       }
        fidx= 0;
        hd = nil;
        nlive = 0;
        wd.name = name;
        wd.nd = dirreadall(fd, &wd.d);
        while(nlive > 0 ||  fidx< wd.nd){
-               while(fidx< wd.nd && nlive < njob){
-                       if(strncmp(wd.d[fidx].name, "C.", 2) != 0){
-                               fidx++;
+               for(; fidx< wd.nd && nlive < njob; fidx++){
+                       if(strncmp(wd.d[fidx].name, "C.", 2) != 0)
+                               continue;
+                       if((j = dofile(&wd, &wd.d[fidx])) == nil){
+                               if(debug) fprint(2, "skipping %s: %r\n", wd.d[fidx].name);
                                continue;
                        }
-                       if((j = dofile(&wd, &wd.d[fidx])) != nil){
-                               nlive++;
-                               j->next = hd;
-                               hd = j;
-                       }
-                       fidx++;
+                       nlive++;
+                       j->next = hd;
+                       hd = j;
                }
-               if(nlive == 0){
-                       fprint(2, "nothing live\n");
+               /* nothing to do */
+               if(nlive == 0)
                        break;
-               }
 rescan:
                if((w = wait()) == nil){
                        syslog(0, "runq", "wait error: %r");
@@ -240,12 +247,15 @@ rescan:
                        }
                }
                free(w);
-               if(!found)
+               if(!found){
+                       syslog(0, runqlog, "wait: pid not in job list");
                        goto rescan;
+               }
        }
        assert(hd == nil);
        free(wd.d);
        close(fd);
+       sysunlock(l);
 }
 
 /*
@@ -257,7 +267,6 @@ remmatch(Wdir *w, char *name)
        long i;
 
        syslog(0, runqlog, "removing %s/%s", w->name, name);
-
        for(i=0; i<w->nd; i++){
                if(strcmp(&w->d[i].name[1], &name[1]) == 0)
                        remove(w->d[i].name);
@@ -286,7 +295,7 @@ keeplockalive(char *path, int fd)
        snprint(l->name, sizeof l->name, "%s", path);
 
        /* fork process to keep lock alive until sysunlock(l) */
-       switch(l->pid = rfork(RFPROC)){
+       switch(l->pid = rfork(RFPROC|RFNOWAIT)){
        default:
                break;
        case 0:
@@ -313,8 +322,7 @@ dofile(Wdir *w, Dir *dp)
        Dir *d;
        char *cp;
 
-       if(debug)
-               fprint(2, "dofile %s\n", dp->name);
+       if(debug) fprint(2, "dofile %s\n", dp->name);
        /*
         *  if no data file or empty control or data file, just clean up
         *  the empty control file must be 15 minutes old, to minimize the
@@ -344,12 +352,16 @@ dofile(Wdir *w, Dir *dp)
                free(d);
                if(etime - dtime < 60*60){
                        /* up to the first hour, try every 15 minutes */
-                       if(time(0) - etime < 15*60)
+                       if(time(0) - etime < 15*60){
+                               werrstr("early retry");
                                return nil;
+                       }
                } else {
                        /* after the first hour, try once an hour */
-                       if(time(0) - etime < 60*60)
+                       if(time(0) - etime < 60*60){
+                               werrstr("early retry");
                                return nil;
+                       }
                }
        }
 
@@ -363,18 +375,11 @@ dofile(Wdir *w, Dir *dp)
        j->dp = dp;
        j->dfd = -1;
        j->b = sysopen(file(dp->name, 'C'), "rl", 0660);
-       if(j->b == 0) {
-               if(debug)
-                       fprint(2, "can't open %s: %r\n", file(dp->name, 'C'));
-               return nil;
-       }
+       if(j->b == 0)
+               goto done;
        j->dfd = open(file(dp->name, 'D'), OREAD);
-       if(j->dfd < 0){
-               if(debug)
-                       fprint(2, "can't open %s: %r\n", file(dp->name, 'D'));
-               freejob(j);
-               return nil;
-       }
+       if(j->dfd < 0)
+               goto done;
 
        /*
         *  make arg list
@@ -431,15 +436,20 @@ dofile(Wdir *w, Dir *dp)
        }
 
        for(i = 0; i < nbad; i++){
-               if(j->ac > 3 && strcmp(j->av[3], badsys[i]) == 0)
+               if(j->ac > 3 && strcmp(j->av[3], badsys[i]) == 0){
+                       werrstr("badsys: %s", j->av[3]);
                        goto done;
+               }
        }
-
        /*
         * Ken's fs, for example, gives us 5 minutes of inactivity before
         * the lock goes stale, so we have to keep reading it.
         */
        j->l = keeplockalive(file(dp->name, 'C'), Bfildes(j->b));
+       if(j->l == nil){
+               warning("lock file", 0);
+               goto done;
+       }
 
        /*
         *  transfer
@@ -498,7 +508,6 @@ donefile(Job *j, Waitmsg *wm)
 
        if(debug)
                fprint(2, "wm->pid %d wm->msg == %s\n", wm->pid, wm->msg);
-
        if(wm->msg[0]){
                if(debug)
                        fprint(2, "[%d] wm->msg == %s\n", getpid(), wm->msg);
@@ -566,9 +575,8 @@ int
 returnmail(char **av, Wdir *w, char *name, char *msg)
 {
        char buf[256], attachment[Pathlen], *sender;
-       int i, fd, pfd[2];
+       int fd, pfd[2];
        long n;
-       Waitmsg *wm;
        String *s;
 
        if(av[1] == 0 || av[2] == 0){
@@ -589,7 +597,7 @@ returnmail(char **av, Wdir *w, char *name, char *msg)
                return -1;
        }
 
-       switch(rfork(RFFDG|RFPROC|RFENVG)){
+       switch(rfork(RFFDG|RFPROC|RFENVG|RFNOWAIT)){
        case -1:
                logit("runq - fork failed", w, name, av);
                return -1;
@@ -625,27 +633,13 @@ returnmail(char **av, Wdir *w, char *name, char *msg)
                                break;
                        if(write(pfd[1], buf, n) != n){
                                close(fd);
-                               goto out;
+                               return -1;
                        }
                }
                close(fd);
        }
        close(pfd[1]);
-out:
-       wm = wait();
-       if(wm == nil){
-               syslog(0, "runq", "wait: %r");
-               logit("wait failed", w, name, av);
-               return -1;
-       }
-       i = 0;
-       if(wm->msg[0]){
-               i = -1;
-               syslog(0, "runq", "returnmail child: %s", wm->msg);
-               logit("returnmail child failed", w, name, av);
-       }
-       free(wm);
-       return i;
+       return 0;
 }
 
 /*