kernel - kqueue - move kq_kev out of struct kqueue

* Move kqueue->kq_kev from the kqueue structure to the stack.

diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c
index 4b2f5c1..b40beba 100644 (file)
--- a/sys/kern/kern_event.c
+++ b/sys/kern/kern_event.c
@@ -422,6 +422,8 @@ sys_kevent(struct kevent_args *uap)
        struct file *fp = NULL;
        struct timespec ts;
        int i, n, nerrors, error;
+       struct kevent kev[KQ_NEVENTS];
+
 
        fp = holdfp(p->p_fd, uap->fd, -1);
        if (fp == NULL)
@@ -444,12 +446,11 @@ sys_kevent(struct kevent_args *uap)
        get_mplock();
        while (uap->nchanges > 0) {
                n = uap->nchanges > KQ_NEVENTS ? KQ_NEVENTS : uap->nchanges;
-               error = copyin(uap->changelist, kq->kq_kev,
-                              n * sizeof(struct kevent));
+               error = copyin(uap->changelist, kev, n * sizeof(struct kevent));
                if (error)
                        goto done;
                for (i = 0; i < n; i++) {
-                       kevp = &kq->kq_kev[i];
+                       kevp = &kev[i];
                        kevp->flags &= ~EV_SYSFLAGS;
                        error = kqueue_register(kq, kevp, td);
                        if (error) {
@@ -616,13 +617,14 @@ done:
 
 static int
 kqueue_scan(struct file *fp, int maxevents, struct kevent *ulistp,
-       const struct timespec *tsp, struct thread *td, int *res)
+           const struct timespec *tsp, struct thread *td, int *res)
 {
        struct kqueue *kq = (struct kqueue *)fp->f_data;
        struct kevent *kevp;
        struct timeval atv, rtv, ttv;
        struct knote *kn, marker;
        int count, timeout, nkev = 0, error = 0;
+       struct kevent kev[KQ_NEVENTS];
 
        count = maxevents;
        if (count == 0)
@@ -660,7 +662,7 @@ retry:
        }
 
 start:
-       kevp = kq->kq_kev;
+       kevp = &kev[0];
        crit_enter();
        if (kq->kq_count == 0) {
                if (timeout < 0) { 
@@ -722,11 +724,11 @@ start:
                count--;
                if (nkev == KQ_NEVENTS) {
                        crit_exit();
-                       error = copyout((caddr_t)&kq->kq_kev, (caddr_t)ulistp,
-                           sizeof(struct kevent) * nkev);
+                       error = copyout(kev, ulistp,
+                                       sizeof(struct kevent) * nkev);
                        ulistp += nkev;
                        nkev = 0;
-                       kevp = kq->kq_kev;
+                       kevp = &kev[0];
                        crit_enter();
                        if (error)
                                break;
@@ -736,8 +738,7 @@ start:
        crit_exit();
 done:
        if (nkev != 0)
-               error = copyout((caddr_t)&kq->kq_kev, (caddr_t)ulistp,
-                   sizeof(struct kevent) * nkev);
+               error = copyout(kev, ulistp, sizeof(struct kevent) * nkev);
         *res = maxevents - count;
        return (error);
 }

diff --git a/sys/sys/eventvar.h b/sys/sys/eventvar.h
index 61d712f..7c5c627 100644 (file)
--- a/sys/sys/eventvar.h
+++ b/sys/sys/eventvar.h
@@ -60,11 +60,11 @@ struct kqueue {
        struct          selinfo kq_sel; 
        struct          filedesc *kq_fdp;
        int             kq_state;
+};
+
 #define KQ_SEL         0x01
 #define KQ_SLEEP       0x02
 #define KQ_ASYNC       0x04
-       struct          kevent kq_kev[KQ_NEVENTS];
-};
 
 #endif /* _KERNEL */
 #endif /* !_SYS_EVENTVAR_H_ */