no swplo

[unix-history] / usr / src / sys / kern / kern_clock.c

diff --git a/usr/src/sys/kern/kern_clock.c b/usr/src/sys/kern/kern_clock.c
index e01550e..158a9a8 100644 (file)
--- a/usr/src/sys/kern/kern_clock.c
+++ b/usr/src/sys/kern/kern_clock.c
@@ -1,4 +1,4 @@
-/*     kern_clock.c    3.5     %H%     */
+/*     %H%     3.12    kern_clock.c    */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -37,7 +37,7 @@ unsigned short kcount[20000];
  * We handle regular calls to the dh and dz silo input processors
  * without using timeouts to save a little time.
  */
  * We handle regular calls to the dh and dz silo input processors
  * without using timeouts to save a little time.
  */

-int    rintvl = 4;             /* every 1/15'th of sec check receivers */
+int    rintvl = 0;             /* every 1/60'th of sec check receivers */

 int    rcnt;
 
 clock(pc, ps)
 int    rcnt;
 
 clock(pc, ps)


@@ -46,7 +46,7 @@ caddr_t pc;
        register struct callo *p1, *p2;
        register struct proc *pp;
        register int s;
        register struct callo *p1, *p2;
        register struct proc *pp;
        register int s;

-       int a;
+       int a, cpstate;

 
        /*
         * reprime clock
 
        /*
         * reprime clock


@@ -89,18 +89,30 @@ caddr_t pc;
                        p2++;
                }
        }
                        p2++;
                }
        }

-       if (rcnt >= rintvl) {
-               dhtimer();
-               dztimer();
-               rcnt = -1;
-       }

 
        /*
         * lightning bolt time-out
         * and time of day
         */
 out:
 
        /*
         * lightning bolt time-out
         * and time of day
         */
 out:

-       ++rcnt;
+
+       /*
+        * In order to not take input character interrupts to use
+        * the input silo on DZ's we have to guarantee to echo
+        * characters regularly.  This means that we have to
+        * call the timer routines predictably.  Since blocking
+        * in these routines is at spl5(), we have to make spl5()
+        * really spl6() blocking off the clock to put this code
+        * here.  Note also that it is critical that we run spl5()
+        * (i.e. really spl6()) in the receiver interrupt routines
+        * so we can't enter them recursively and transpose characters.
+        */
+       if (rcnt >= rintvl) {
+               dhtimer();
+               dztimer();
+               rcnt = 0;
+       } else
+               rcnt++;

        if (!noproc) {
                s = u.u_procp->p_rssize;
                u.u_vm.vm_idsrss += s;
        if (!noproc) {
                s = u.u_procp->p_rssize;
                u.u_vm.vm_idsrss += s;


@@ -113,19 +125,20 @@ out:
                if (s > u.u_vm.vm_maxrss)
                        u.u_vm.vm_maxrss = s;
        }
                if (s > u.u_vm.vm_maxrss)
                        u.u_vm.vm_maxrss = s;
        }

-       a = dk_busy&07;

        if (USERMODE(ps)) {
                u.u_vm.vm_utime++;
                if(u.u_procp->p_nice > NZERO)
        if (USERMODE(ps)) {
                u.u_vm.vm_utime++;
                if(u.u_procp->p_nice > NZERO)

-                       a += 8;
+                       cpstate = CP_NICE;
+               else
+                       cpstate = CP_USER;

        } else {
        } else {

-               a += 16;
+               cpstate = CP_SYS;

                if (noproc)
                if (noproc)

-                       a += 8;
+                       cpstate = CP_IDLE;

                else
                        u.u_vm.vm_stime++;
        }
                else
                        u.u_vm.vm_stime++;
        }

-       dk_time[a]++;
+       dk_time[cpstate][dk_busy&(DK_NSTATES-1)]++;

        if (!noproc) {
                pp = u.u_procp;
                if(++pp->p_cpu == 0)
        if (!noproc) {
                pp = u.u_procp;
                if(++pp->p_cpu == 0)


@@ -157,12 +170,20 @@ out:
                                if(--pp->p_clktim == 0)
                                        if (pp->p_flag & STIMO) {
                                                s = spl6();
                                if(--pp->p_clktim == 0)
                                        if (pp->p_flag & STIMO) {
                                                s = spl6();

-                                               if (pp->p_stat == SSLEEP)
+                                               switch (pp->p_stat) {
+
+                                               case SSLEEP:

                                                        setrun(pp);
                                                        setrun(pp);

+                                                       break;
+
+                                               case SSTOP:
+                                                       unsleep(pp);
+                                                       break;
+                                               }

                                                pp->p_flag &= ~STIMO;
                                                splx(s);
                                        } else
                                                pp->p_flag &= ~STIMO;
                                                splx(s);
                                        } else

-                                               psignal(pp, SIGCLK);
+                                               psignal(pp, SIGALRM);

                        if(pp->p_stat==SSLEEP||pp->p_stat==SSTOP)
                                if (pp->p_slptime != 127)
                                        pp->p_slptime++;
                        if(pp->p_stat==SSLEEP||pp->p_stat==SSTOP)
                                if (pp->p_slptime != 127)
                                        pp->p_slptime++;


@@ -216,6 +237,8 @@ out:
                }
 #endif
        }
                }
 #endif
        }

+       if (!BASEPRI(ps))
+               unhang();

        if (USERMODE(ps)) {
                /*
                 * We do this last since it
        if (USERMODE(ps)) {
                /*
                 * We do this last since it