more work on timer stuff
authorBill Joy <root@ucbvax.Berkeley.EDU>
Tue, 7 Sep 1982 13:38:59 +0000 (05:38 -0800)
committerBill Joy <root@ucbvax.Berkeley.EDU>
Tue, 7 Sep 1982 13:38:59 +0000 (05:38 -0800)
SCCS-vsn: sys/kern/init_main.c 4.37
SCCS-vsn: sys/kern/kern_clock.c 4.38
SCCS-vsn: sys/kern/kern_descrip.c 5.7

usr/src/sys/kern/init_main.c
usr/src/sys/kern/kern_clock.c
usr/src/sys/kern/kern_descrip.c

index 57ad7ab..ab9da86 100644 (file)
@@ -1,4 +1,4 @@
-/*     init_main.c     4.36    82/09/04        */
+/*     init_main.c     4.37    82/09/06        */
 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"
@@ -102,15 +102,23 @@ main(firstaddr)
        if (fs == 0)
                panic("iinit");
        bcopy("/", fs->fs_fsmnt, 2);
        if (fs == 0)
                panic("iinit");
        bcopy("/", fs->fs_fsmnt, 2);
+
+/* initialize wall clock */
        clockinit(fs->fs_time);
        boottime = time;
 
        clockinit(fs->fs_time);
        boottime = time;
 
+/* kick off timeout driven events by calling first time */
+       roundrobin();
+       schedcpu();
+       schedpaging();
+
+/* set up the root file system */
        rootdir = iget(rootdev, fs, (ino_t)ROOTINO);
        iunlock(rootdir);
        u.u_cdir = iget(rootdev, fs, (ino_t)ROOTINO);
        iunlock(u.u_cdir);
        rootdir = iget(rootdev, fs, (ino_t)ROOTINO);
        iunlock(rootdir);
        u.u_cdir = iget(rootdev, fs, (ino_t)ROOTINO);
        iunlock(u.u_cdir);
-
        u.u_rdir = NULL;
        u.u_rdir = NULL;
+
        u.u_dmap = zdmap;
        u.u_smap = zdmap;
 
        u.u_dmap = zdmap;
        u.u_smap = zdmap;
 
index db8cb4a..012d281 100644 (file)
@@ -1,57 +1,25 @@
-/*     kern_clock.c    4.37    82/09/04        */
+/*     kern_clock.c    4.38    82/09/06        */
 
 #include "../h/param.h"
 #include "../h/systm.h"
 #include "../h/dk.h"
 #include "../h/callout.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"
 #include "../h/dk.h"
 #include "../h/callout.h"
-#include "../h/seg.h"
 #include "../h/dir.h"
 #include "../h/user.h"
 #include "../h/kernel.h"
 #include "../h/proc.h"
 #include "../h/dir.h"
 #include "../h/user.h"
 #include "../h/kernel.h"
 #include "../h/proc.h"
-#include "../h/reg.h"
 #include "../h/psl.h"
 #include "../h/vm.h"
 #include "../h/psl.h"
 #include "../h/vm.h"
-#include "../h/buf.h"
 #include "../h/text.h"
 #include "../h/text.h"
-#include "../h/mtpr.h"
-#include "../h/cpu.h"
-#include "../h/protosw.h"
-#include "../h/socket.h"
-#include "../net/if.h"
 #ifdef MUSH
 #include "../h/quota.h"
 #include "../h/share.h"
 #endif
 
 #ifdef MUSH
 #include "../h/quota.h"
 #include "../h/share.h"
 #endif
 
-#include "bk.h"
 #include "dh.h"
 #include "dz.h"
 #include "ps.h"
 
 #include "dh.h"
 #include "dz.h"
 #include "ps.h"
 
-/*
- * Hardclock is called straight from
- * the real time clock interrupt.
- * We limit the work we do at real clock interrupt time to:
- *     reloading clock
- *     decrementing time to callouts
- *     recording cpu time usage
- *     modifying priority of current process
- *     arrange for soft clock interrupt
- *     kernel pc profiling
- *
- * At software (softclock) interrupt time we:
- *     implement callouts
- *     maintain date
- *     lightning bolt wakeup (every second)
- *     alarm clock signals
- *     jab the scheduler
- *
- * On the vax softclock interrupts are implemented by
- * software interrupts.  Note that we may have multiple softclock
- * interrupts compressed into one (due to excessive interrupt load),
- * but that hardclock interrupts should never be lost.
- */
 #ifdef GPROF
 extern int profiling;
 extern char *s_lowpc;
 #ifdef GPROF
 extern int profiling;
 extern char *s_lowpc;
@@ -59,51 +27,36 @@ extern      u_long s_textsize;
 extern u_short *kcount;
 #endif
 
 extern u_short *kcount;
 #endif
 
-/*
- * Protoslow is like lbolt, but for slow protocol timeouts, counting
- * up to (hz/PR_SLOWHZ), then causing a pfslowtimo().
- * Protofast is like lbolt, but for fast protocol timeouts, counting
- * up to (hz/PR_FASTHZ), then causing a pffasttimo().
- */
-int    protoslow;
-int    protofast;
-int    ifnetslow;
+#define        bumptime(tp)    \
+       (tp)->tv_usec += tick; \
+       if ((tp)->tv_usec >= 1000000) { \
+               (tp)->tv_usec -= 1000000; \
+               (tp)->tv_sec++; \
+       }
 
 /*ARGSUSED*/
 hardclock(pc, ps)
        caddr_t pc;
 {
        register struct callout *p1;
 
 /*ARGSUSED*/
 hardclock(pc, ps)
        caddr_t pc;
 {
        register struct callout *p1;
-       register struct proc *pp;
+       register struct proc *p;
        register int s, cpstate;
        extern double avenrun[];
 
        register int s, cpstate;
        extern double avenrun[];
 
-       /*
-        * reprime clock
-        */
-
 #if NPS > 0
 #if NPS > 0
-       /*
-        * sync referesh of picture system
-        */
        psextsync(pc, ps);
 #endif
 
        psextsync(pc, ps);
 #endif
 
-       /*
-        * update callout times
-        */
+/* update callout times */
        for (p1 = calltodo.c_next; p1 && p1->c_time <= 0; p1 = p1->c_next)
                ;
        if (p1)
                p1->c_time--;
 
        for (p1 = calltodo.c_next; p1 && p1->c_time <= 0; p1 = p1->c_next)
                ;
        if (p1)
                p1->c_time--;
 
-       /*
-        * Maintain iostat and per-process cpu statistics
-        */
+/* charge process for resource usage... statistically! */
        if (!noproc) {
                s = u.u_procp->p_rssize;
        if (!noproc) {
                s = u.u_procp->p_rssize;
-               u.u_ru.ru_idrss += s;
-               u.u_ru.ru_isrss += 0;           /* XXX */
+               u.u_ru.ru_idrss += s; u.u_ru.ru_isrss += 0;     /* XXX */
                if (u.u_procp->p_textp) {
                        register int xrss = u.u_procp->p_textp->x_rssize;
 
                if (u.u_procp->p_textp) {
                        register int xrss = u.u_procp->p_textp->x_rssize;
 
@@ -119,16 +72,17 @@ hardclock(pc, ps)
                            u.u_rlimit[RLIMIT_CPU].rlim_max)
                                u.u_rlimit[RLIMIT_CPU].rlim_cur += 5;
                }
                            u.u_rlimit[RLIMIT_CPU].rlim_max)
                                u.u_rlimit[RLIMIT_CPU].rlim_cur += 5;
                }
+               if (timerisset(&u.u_timer[ITIMER_PROF].it_value) &&
+                   itimerdecr(&u.u_timer[ITIMER_PROF], tick) == 0)
+                       psignal(u.u_procp, SIGPROF);
        }
        }
-       /*
-        * Update iostat information.
-        */
+
+/* charge for cpu */
        if (USERMODE(ps)) {
        if (USERMODE(ps)) {
-               u.u_ru.ru_utime.tv_usec += 1000000/hz;
-               if (u.u_ru.ru_utime.tv_usec > 1000000) {
-                       u.u_ru.ru_utime.tv_sec++;
-                       u.u_ru.ru_utime.tv_usec -= 1000000;
-               }
+               bumptime(&u.u_ru.ru_utime);
+               if (timerisset(&u.u_timer[ITIMER_VIRTUAL].it_value) &&
+                   itimerdecr(&u.u_timer[ITIMER_VIRTUAL], tick) == 0)
+                       psignal(u.u_procp, SIGVTALRM);
                if (u.u_procp->p_nice > NZERO)
                        cpstate = CP_NICE;
                else
                if (u.u_procp->p_nice > NZERO)
                        cpstate = CP_NICE;
                else
@@ -144,134 +98,64 @@ hardclock(pc, ps)
                        if ((ps&PSL_IPL) != 0)
                                cpstate = CP_IDLE;
                } else {
                        if ((ps&PSL_IPL) != 0)
                                cpstate = CP_IDLE;
                } else {
-                       u.u_ru.ru_stime.tv_usec += 1000000/hz;
-                       if (u.u_ru.ru_stime.tv_usec > 1000000) {
-                               u.u_ru.ru_stime.tv_sec++;
-                               u.u_ru.ru_stime.tv_usec -= 1000000;
-                       }
+                       bumptime(&u.u_ru.ru_stime);
                }
        }
                }
        }
+
+/* iostat statistics */
        cp_time[cpstate]++;
        for (s = 0; s < DK_NDRIVE; s++)
                if (dk_busy&(1<<s))
                        dk_time[s]++;
        cp_time[cpstate]++;
        for (s = 0; s < DK_NDRIVE; s++)
                if (dk_busy&(1<<s))
                        dk_time[s]++;
-       /*
-        * Adjust priority of current process.
-        */
+
+/* adjust priority of current process */
        if (!noproc) {
        if (!noproc) {
-               pp = u.u_procp;
-               pp->p_cpticks++;
-               if(++pp->p_cpu == 0)
-                       pp->p_cpu--;
+               p = u.u_procp;
+               p->p_cpticks++;
+               if (++p->p_cpu == 0)
+                       p->p_cpu--;
 #ifdef MUSH
 #ifdef MUSH
-               pp->p_quota->q_cost += (pp->p_nice > NZERO ?
-                   (shconsts.sc_tic * ((2*NZERO)-pp->p_nice)) / NZERO :
+               p->p_quota->q_cost += (p->p_nice > NZERO ?
+                   (shconsts.sc_tic * ((2*NZERO)-p->p_nice)) / NZERO :
                    shconsts.sc_tic) * (((int)avenrun[0]+2)/3);
 #endif
                    shconsts.sc_tic) * (((int)avenrun[0]+2)/3);
 #endif
-               if(pp->p_cpu % 4 == 0) {
-                       (void) setpri(pp);
-                       if (pp->p_pri >= PUSER)
-                               pp->p_pri = pp->p_usrpri;
+               if (p->p_cpu % 4 == 0) {
+                       (void) setpri(p);
+                       if (p->p_pri >= PUSER)
+                               p->p_pri = p->p_usrpri;
                }
        }
                }
        }
-       /*
-        * Time moves on.
-        */
-       ++lbolt;
-
-       /*
-        * Time moves on for protocols.
-        */
-       --protoslow; --protofast; --ifnetslow;
-
-#if VAX780
-       /*
-        * On 780's, impelement a fast UBA watcher,
-        * to make sure uba's don't get stuck.
-        */
-       if (cpu == VAX_780 && panicstr == 0 && !BASEPRI(ps))
-               unhang();
-#endif
-       /*
-        * Schedule a software interrupt for the rest
-        * of clock activities.
-        */
+       bumptime(&time);
        setsoftclock();
 }
 
        setsoftclock();
 }
 
-/*
- * The digital decay cpu usage priority assignment is scaled to run in
- * time as expanded by the 1 minute load average.  Each second we
- * multiply the the previous cpu usage estimate by
- *             nrscale*avenrun[0]
- * The following relates the load average to the period over which
- * cpu usage is 90% forgotten:
- *     loadav 1         5 seconds
- *     loadav 5        24 seconds
- *     loadav 10       47 seconds
- *     loadav 20       93 seconds
- * This is a great improvement on the previous algorithm which
- * decayed the priorities by a constant, and decayed away all knowledge
- * of previous activity in about 20 seconds.  Under heavy load,
- * the previous algorithm degenerated to round-robin with poor response
- * time when there was a high load average.
- */
-#undef ave
-#define        ave(a,b) ((int)(((int)(a*b))/(b+1)))
-int    nrscale = 2;
-double avenrun[];
-
-/*
- * Constant for decay filter for cpu usage field
- * in process table (used by ps au).
- */
-double ccpu = 0.95122942450071400909;          /* exp(-1/20) */
-
-#ifdef MELB
-/*
- * Automatic niceness rate & max constants
- */
-#define        MAXNICE (8 + NZERO)     /* maximum auto nice value */
-#define        NFACT   (40 * hz)       /* nice++ every 40 secs cpu+sys time */
-#endif
-
-/*
- * Software clock interrupt.
- * This routine runs at lower priority than device interrupts.
- */
 /*ARGSUSED*/
 softclock(pc, ps)
        caddr_t pc;
 {
        register struct callout *p1;
 /*ARGSUSED*/
 softclock(pc, ps)
        caddr_t pc;
 {
        register struct callout *p1;
-       register struct proc *pp;
        register int a, s;
        caddr_t arg;
        int (*func)();
 
        register int a, s;
        caddr_t arg;
        int (*func)();
 
-       /*
-        * Perform callouts (but not after panic's!)
-        */
-       if (panicstr == 0) {
-               for (;;) {
-                       s = spl7();
-                       if ((p1 = calltodo.c_next) == 0 || p1->c_time > 0) {
-                               splx(s);
-                               break;
-                       }
-                       calltodo.c_next = p1->c_next;
-                       arg = p1->c_arg;
-                       func = p1->c_func;
-                       p1->c_next = callfree;
-                       callfree = p1;
-                       (void) splx(s);
-                       (*func)(arg);
+       if (panicstr)
+               goto nocallout;
+       for (;;) {
+               s = spl7();
+               if ((p1 = calltodo.c_next) == 0 || p1->c_time > 0) {
+                       splx(s);
+                       break;
                }
                }
+               calltodo.c_next = p1->c_next;
+               arg = p1->c_arg;
+               func = p1->c_func;
+               p1->c_next = callfree;
+               callfree = p1;
+               (void) splx(s);
+               (*func)(arg);
        }
        }
+nocallout:
 
 
-       /*
-        * Drain silos.
-        */
 #if NDH > 0
        s = spl5(); dhtimer(); splx(s);
 #endif
 #if NDH > 0
        s = spl5(); dhtimer(); splx(s);
 #endif
@@ -279,284 +163,20 @@ softclock(pc, ps)
        s = spl5(); dztimer(); splx(s);
 #endif
 
        s = spl5(); dztimer(); splx(s);
 #endif
 
-       /*
-        * If idling and processes are waiting to swap in,
-        * check on them.
-        */
+/* if nothing to do, try swapin */
        if (noproc && runin) {
                runin = 0;
                wakeup((caddr_t)&runin);
        }
        if (noproc && runin) {
                runin = 0;
                wakeup((caddr_t)&runin);
        }
-
-       /*
-        * Run paging daemon every 1/4 sec.
-        */
-       if (lbolt % (hz/4) == 0) {
-               vmpago();
-       }
-
-       /*
-        * Reschedule every 1/10 sec.
-        */
-       if (lbolt % (hz/10) == 0) {
-               runrun++;
-               aston();
-       }
-
-       /*
-        * Run network slow and fast timeouts.
-        */
-       if (protofast <= 0) {
-               protofast = hz / PR_FASTHZ;
-               pffasttimo();
-       }
-       if (protoslow <= 0) {
-               protoslow = hz / PR_SLOWHZ;
-               pfslowtimo();
-       }
-       if (ifnetslow <= 0) {
-               ifnetslow = hz / IFNET_SLOWHZ;
-               if_slowtimo();
-       }
-
-       /*
-        * Lightning bolt every second:
-        *      sleep timeouts
-        *      process priority recomputation
-        *      process %cpu averaging
-        *      virtual memory metering
-        *      kick swapper if processes want in
-        */
-       if (lbolt >= hz) {
-               /*
-                * This doesn't mean much on VAX since we run at
-                * software interrupt time... if hardclock()
-                * calls softclock() directly, it prevents
-                * this code from running when the priority
-                * was raised when the clock interrupt occurred.
-                */
-               if (BASEPRI(ps))
-                       return;
-
-               /*
-                * If we didn't run a few times because of
-                * long blockage at high ipl, we don't
-                * really want to run this code several times,
-                * so squish out all multiples of hz here.
-                */
-               s = spl6();
-               time.tv_sec += lbolt / hz; lbolt %= hz;
-               splx(s);
-
-               /*
-                * Wakeup lightning bolt sleepers.
-                * Processes sleep on lbolt to wait
-                * for short amounts of time (e.g. 1 second).
-                */
-               wakeup((caddr_t)&lbolt);
-
-               /*
-                * Recompute process priority and process
-                * sleep() system calls as well as internal
-                * sleeps with timeouts (tsleep() kernel routine).
-                */
-               for (pp = proc; pp < procNPROC; pp++)
-               if (pp->p_stat && pp->p_stat!=SZOMB) {
-#ifdef MUSH
-                       /*
-                        * Charge process for memory in use
-                        */
-                       if (pp->p_quota->q_uid)
-                               pp->p_quota->q_cost +=
-                                   shconsts.sc_click * pp->p_rssize;
-#endif
-                       /*
-                        * Increase resident time, to max of 127 seconds
-                        * (it is kept in a character.)  For
-                        * loaded processes this is time in core; for
-                        * swapped processes, this is time on drum.
-                        */
-                       if (pp->p_time != 127)
-                               pp->p_time++;
-                       /*
-                        * Time processes out of select.
-                        */
-                       if (timerisset(&pp->p_seltimer) &&
-                            --pp->p_seltimer.tv_sec <= 0) {
-                               timerclear(&pp->p_seltimer);
-                               s = spl6();
-                               switch (pp->p_stat) {
-
-                               case SSLEEP:
-                                       setrun(pp);
-                                       break;
-
-                               case SSTOP:
-                                       unsleep(pp);
-                                       break;
-                               }
-                               splx(s);
-                       }
-                       if (timerisset(&pp->p_realtimer.itimer_value) &&
-                           itimerdecr(&pp->p_realtimer, 1000000) == 0)
-                               psignal(pp, SIGALRM);
-
-                       /*
-                        * If process is blocked, increment computed
-                        * time blocked.  This is used in swap scheduling.
-                        */
-                       if (pp->p_stat==SSLEEP || pp->p_stat==SSTOP)
-                               if (pp->p_slptime != 127)
-                                       pp->p_slptime++;
-                       /*
-                        * Update digital filter estimation of process
-                        * cpu utilization for loaded processes.
-                        */
-                       if (pp->p_flag&SLOAD)
-                               pp->p_pctcpu = ccpu * pp->p_pctcpu +
-                                   (1.0 - ccpu) * (pp->p_cpticks/(float)hz);
-                       /*
-                        * Recompute process priority.  The number p_cpu
-                        * is a weighted estimate of cpu time consumed.
-                        * A process which consumes cpu time has this
-                        * increase regularly.  We here decrease it by
-                        * a fraction based on load average giving a digital
-                        * decay filter which damps out in about 5 seconds
-                        * when seconds are measured in time expanded by the
-                        * load average.
-                        *
-                        * If a process is niced, then the nice directly
-                        * affects the new priority.  The final priority
-                        * is in the range 0 to 255, to fit in a character.
-                        */
-                       pp->p_cpticks = 0;
-#ifdef MUSH
-                       a = ave((pp->p_cpu & 0377), avenrun[0]*nrscale) +
-                            pp->p_nice - NZERO + pp->p_quota->q_nice;
-#else
-                       a = ave((pp->p_cpu & 0377), avenrun[0]*nrscale) +
-                            pp->p_nice - NZERO;
-#endif
-                       if (a < 0)
-                               a = 0;
-                       if (a > 255)
-                               a = 255;
-                       pp->p_cpu = a;
-                       (void) setpri(pp);
-                       /*
-                        * Now have computed new process priority
-                        * in p->p_usrpri.  Carefully change p->p_pri.
-                        * A process is on a run queue associated with
-                        * this priority, so we must block out process
-                        * state changes during the transition.
-                        */
-                       s = spl6();
-                       if (pp->p_pri >= PUSER) {
-                               if ((pp != u.u_procp || noproc) &&
-                                   pp->p_stat == SRUN &&
-                                   (pp->p_flag & SLOAD) &&
-                                   pp->p_pri != pp->p_usrpri) {
-                                       remrq(pp);
-                                       pp->p_pri = pp->p_usrpri;
-                                       setrq(pp);
-                               } else
-                                       pp->p_pri = pp->p_usrpri;
-                       }
-                       splx(s);
-               }
-
-               /*
-                * Perform virtual memory metering.
-                */
-               vmmeter();
-
-               /*
-                * If the swap process is trying to bring
-                * a process in, have it look again to see
-                * if it is possible now.
-                */
-               if (runin!=0) {
-                       runin = 0;
-                       wakeup((caddr_t)&runin);
-               }
-
-               /*
-                * If there are pages that have been cleaned, 
-                * jolt the pageout daemon to process them.
-                * We do this here so that these pages will be
-                * freed if there is an abundance of memory and the
-                * daemon would not be awakened otherwise.
-                */
-               if (bclnlist != NULL)
-                       wakeup((caddr_t)&proc[2]);
-
-#ifdef MELB
-               /*
-                * If a process was running, see if time to make it nicer
-                */
-               if (!noproc) {
-                       pp = u.u_procp;
-                       if (pp->p_uid
-#ifdef MUSH
-                               && !(pp->p_flag & SLOGIN)
-#else
-                                    /* this is definitely not good enough */
-                               && (pp->p_pid != pp->p_pgrp || pp->p_ppid != 1)
-#endif
-                               && (u.u_ru.ru_utime + u.u_ru.ru_stime) >
-                                       (pp->p_nice-NZERO+1)*NFACT
-                               && pp->p_nice >= NZERO
-                               && pp->p_nice < MAXNICE
-                       ) {
-                               pp->p_nice++;
-                               (void) setpri(pp);
-                               pp->p_pri = pp->p_usrpri;
-                       }
-               }
-#else
-               /*
-                * If the trap occurred from usermode,
-                * then check to see if it has now been
-                * running more than 10 minutes of user time
-                * and should thus run with reduced priority
-                * to give other processes a chance.
-                */
-               if (USERMODE(ps)) {
-                       pp = u.u_procp;
-                       if (pp->p_uid && pp->p_nice == NZERO &&
-                           u.u_ru.ru_utime.tv_sec > 600)
-                               pp->p_nice = NZERO+4;
-                       (void) setpri(pp);
-                       pp->p_pri = pp->p_usrpri;
-               }
-#endif
-       }
-       /*
-        * If trapped user-mode, give it a profiling tick.
-        */
-       if (USERMODE(ps) &&
-           timerisset(&u.u_timer[ITIMER_VIRTUAL].itimer_value) &&
-           itimerdecr(&u.u_timer[ITIMER_VIRTUAL].itimer_value, 1000000/hz) == 0)
-               psignal(u.u_procp, SIGPROF);
 }
 
 /*
 }
 
 /*
- * Timeout is called to arrange that
- * fun(arg) is called in tim/hz seconds.
- * An entry is linked into the callout
- * structure.  The time in each structure
- * entry is the number of hz's more
- * than the previous entry.
- * In this way, decrementing the
- * first entry has the effect of
- * updating all entries.
- *
- * The panic is there because there is nothing
- * intelligent to be done if an entry won't fit.
+ * Arrange that (*fun)(arg) is called in tim/hz seconds.
  */
 timeout(fun, arg, tim)
        int (*fun)();
        caddr_t arg;
  */
 timeout(fun, arg, tim)
        int (*fun)();
        caddr_t arg;
+       int tim;
 {
        register struct callout *p1, *p2, *pnew;
        register int t;
 {
        register struct callout *p1, *p2, *pnew;
        register int t;
@@ -585,7 +205,7 @@ timeout(fun, arg, tim)
  * untimeout is called to remove a function timeout call
  * from the callout structure.
  */
  * untimeout is called to remove a function timeout call
  * from the callout structure.
  */
-untimeout (fun, arg)
+untimeout(fun, arg)
        int (*fun)();
        caddr_t arg;
 {
        int (*fun)();
        caddr_t arg;
 {
index 4281e30..3bb611d 100644 (file)
@@ -1,4 +1,4 @@
-/*     kern_descrip.c  5.6     82/09/04        */
+/*     kern_descrip.c  5.7     82/09/06        */
 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"
@@ -35,6 +35,37 @@ getdtablesize()
        u.u_r.r_val1 = NOFILE;
 }
 
        u.u_r.r_val1 = NOFILE;
 }
 
+getdprop()
+{
+       register struct a {
+               int     d;
+               struct  dtype *dtypeb;
+       } *uap = (struct a *)u.u_ap;
+       register struct file *fp;
+       struct dtype adtype;
+
+       fp = getf(uap->d);
+       if (fp == 0)
+               return;
+       adtype.dt_type = 0;             /* XXX */
+       adtype.dt_protocol = 0;         /* XXX */
+       if (copyout((caddr_t)&adtype, (caddr_t)uap->dtypeb,
+           sizeof (struct dtype)) < 0) {
+               u.u_error = EFAULT;
+               return;
+       }
+}
+
+getdopt()
+{
+
+}
+
+setdopt()
+{
+
+}
+
 dup()
 {
        register struct a {
 dup()
 {
        register struct a {
@@ -112,27 +143,6 @@ close()
        u.u_pofile[uap->i] = 0;
 }
 
        u.u_pofile[uap->i] = 0;
 }
 
-getdprop()
-{
-       register struct a {
-               int     d;
-               struct  dtype *dtypeb;
-       } *uap = (struct a *)u.u_ap;
-       register struct file *fp;
-       struct dtype adtype;
-
-       fp = getf(uap->d);
-       if (fp == 0)
-               return;
-       adtype.dt_type = 0;             /* XXX */
-       adtype.dt_protocol = 0;         /* XXX */
-       if (copyout((caddr_t)&adtype, (caddr_t)uap->dtypeb,
-           sizeof (struct dtype)) < 0) {
-               u.u_error = EFAULT;
-               return;
-       }
-}
-
 wrap()
 {
        register struct a {
 wrap()
 {
        register struct a {
@@ -153,20 +163,14 @@ wrap()
        /* DO WRAP */
 }
 
        /* DO WRAP */
 }
 
-select()
-{
-
-}
-
 int    nselcoll;
 /*
  * Select system call.
  */
 int    nselcoll;
 /*
  * Select system call.
  */
-oselect()
+select()
 {
        register struct uap  {
 {
        register struct uap  {
-               int     nfd;
-               fd_set  *rp, *wp;
+               fd_set  *rp, *wp, *ep;
                struct  timeval *tv;
        } *uap = (struct uap *)u.u_ap;
        fd_set rd, wr;
                struct  timeval *tv;
        } *uap = (struct uap *)u.u_ap;
        fd_set rd, wr;
@@ -174,12 +178,6 @@ oselect()
        struct timeval atv, origin, now;
        int s, tsel, ncoll, rem;
 
        struct timeval atv, origin, now;
        int s, tsel, ncoll, rem;
 
-       if (uap->nfd > NOFILE)
-               uap->nfd = NOFILE;
-       if (uap->nfd < 0) {
-               u.u_error = EBADF;
-               return;
-       }
        if (uap->tv) {
                if (copyin((caddr_t)uap->tv, (caddr_t)&atv, sizeof (atv))) {
                        u.u_error = EFAULT;
        if (uap->tv) {
                if (copyin((caddr_t)uap->tv, (caddr_t)&atv, sizeof (atv))) {
                        u.u_error = EFAULT;
@@ -196,9 +194,9 @@ retry:
        ncoll = nselcoll;
        u.u_procp->p_flag |= SSEL;
        if (uap->rp)
        ncoll = nselcoll;
        u.u_procp->p_flag |= SSEL;
        if (uap->rp)
-               readable = selscan(uap->nfd, rd, &nfds, FREAD);
+               readable = selscan(rd, &nfds, FREAD);
        if (uap->wp)
        if (uap->wp)
-               writeable = selscan(uap->nfd, wr, &nfds, FWRITE);
+               writeable = selscan(wr, &nfds, FWRITE);
        if (u.u_error)
                goto done;
        if (readable || writeable)
        if (u.u_error)
                goto done;
        if (readable || writeable)
@@ -235,8 +233,6 @@ done:
        rd.fds_bits[0] = readable;
        wr.fds_bits[0] = writeable;
        s = sizeof (fd_set);
        rd.fds_bits[0] = readable;
        wr.fds_bits[0] = writeable;
        s = sizeof (fd_set);
-       if (s * NBBY > uap->nfd)
-               s = (uap->nfd + NBBY - 1) / NBBY;
        u.u_r.r_val1 = nfds;
        if (uap->rp)
                (void) copyout((caddr_t)&rd, (caddr_t)uap->rp, sizeof(fd_set));
        u.u_r.r_val1 = nfds;
        if (uap->rp)
                (void) copyout((caddr_t)&rd, (caddr_t)uap->rp, sizeof(fd_set));
@@ -244,8 +240,7 @@ done:
                (void) copyout((caddr_t)&wr, (caddr_t)uap->wp, sizeof(fd_set));
 }
 
                (void) copyout((caddr_t)&wr, (caddr_t)uap->wp, sizeof(fd_set));
 }
 
-selscan(nfd, fds, nfdp, flag)
-       int nfd;
+selscan(fds, nfdp, flag)
        fd_set fds;
        int *nfdp, flag;
 {
        fd_set fds;
        int *nfdp, flag;
 {
@@ -256,8 +251,6 @@ selscan(nfd, fds, nfdp, flag)
                
        bits = fds.fds_bits[0];
        while (i = ffs(bits)) {
                
        bits = fds.fds_bits[0];
        while (i = ffs(bits)) {
-               if (i > nfd)
-                       break;
                bits &= ~(1<<(i-1));
                fp = u.u_ofile[i-1];
                if (fp == NULL) {
                bits &= ~(1<<(i-1));
                fp = u.u_ofile[i-1];
                if (fp == NULL) {