performance hacks

SCCS-vsn: usr.sbin/sendmail/src/queue.c 5.6

diff --git a/usr/src/usr.sbin/sendmail/src/queue.c b/usr/src/usr.sbin/sendmail/src/queue.c
index 5833d30..51d1498 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/queue.c
+++ b/usr/src/usr.sbin/sendmail/src/queue.c
@@ -17,12 +17,12 @@
 
 # ifndef QUEUE
 # ifndef lint
 
 # ifndef QUEUE
 # ifndef lint

-static char    SccsId[] = "@(#)queue.c 5.5 (Berkeley) %G%      (no queueing)";
+static char    SccsId[] = "@(#)queue.c 5.6 (Berkeley) %G%      (no queueing)";

 # endif not lint
 # else QUEUE
 
 # ifndef lint
 # endif not lint
 # else QUEUE
 
 # ifndef lint

-static char    SccsId[] = "@(#)queue.c 5.5 (Berkeley) %G%";
+static char    SccsId[] = "@(#)queue.c 5.6 (Berkeley) %G%";

 # endif not lint
 
 /*
 # endif not lint
 
 /*


@@ -257,6 +257,23 @@ queueup(e, queueall, announce)
 runqueue(forkflag)
        bool forkflag;
 {
 runqueue(forkflag)
        bool forkflag;
 {

+       extern bool shouldqueue();
+
+       /*
+       **  If no work will ever be selected, don't even bother reading
+       **  the queue.
+       */
+
+       if (shouldqueue(-100000000L))
+       {
+               if (Verbose)
+                       printf("Skipping queue run -- load average too high\n");
+
+               if (forkflag)
+                       return;
+               finis();
+       }
+

        /*
        **  See if we want to go off and do other useful work.
        */
        /*
        **  See if we want to go off and do other useful work.
        */


@@ -428,6 +445,12 @@ orderq(doall)
                        }
                }
                (void) fclose(cf);
                        }
                }
                (void) fclose(cf);

+
+               if (!doall && shouldqueue(wlist[wn].w_pri))
+               {
+                       /* don't even bother sorting this job in */
+                       wn--;
+               }

        }
        (void) closedir(f);
        wn++;
        }
        (void) closedir(f);
        wn++;