ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/trunk/src/s_bsd_kqueue.c
(Generate patch)

Comparing:
ircd-hybrid/src/s_bsd_kqueue.c (file contents), Revision 31 by knight, Sun Oct 2 20:34:05 2005 UTC vs.
ircd-hybrid/trunk/src/s_bsd_kqueue.c (file contents), Revision 7006 by michael, Fri Jan 1 00:07:54 2016 UTC

# Line 1 | Line 1
1   /*
2 < *  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3 < *  s_bsd_kqueue.c: FreeBSD kqueue compatible network routines.
2 > *  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3   *
4 < *  Originally by Adrian Chadd <adrian@creative.net.au>
6 < *  Copyright (C) 2005 Hybrid Development Team
4 > *  Copyright (c) 2000-2016 ircd-hybrid development team
5   *
6   *  This program is free software; you can redistribute it and/or modify
7   *  it under the terms of the GNU General Public License as published by
# Line 17 | Line 15
15   *
16   *  You should have received a copy of the GNU General Public License
17   *  along with this program; if not, write to the Free Software
18 < *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18 > *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
19   *  USA
20 < *
21 < *  $Id$
20 > */
21 >
22 > /*! \file s_bsd_kqueue.c
23 > * \brief kqueue() compatible network routines.
24 > * \version $Id$
25   */
26  
27   #include "stdinc.h"
28 + #if USE_IOPOLL_MECHANISM == __IOPOLL_MECHANISM_KQUEUE
29   #include <sys/event.h>
30   #include "fdlist.h"
31   #include "ircd.h"
30 #include "memory.h"
32   #include "s_bsd.h"
33 < #include "s_log.h"
33 > #include "log.h"
34  
35 < #define KE_LENGTH 128
35 <
36 < /* jlemon goofed up and didn't add EV_SET until fbsd 4.3 */
37 <
38 < #ifndef EV_SET
39 < #define EV_SET(kevp, a, b, c, d, e, f) do {     \
40 <        (kevp)->ident = (a);                    \
41 <        (kevp)->filter = (b);                   \
42 <        (kevp)->flags = (c);                    \
43 <        (kevp)->fflags = (d);                   \
44 <        (kevp)->data = (e);                     \
45 <        (kevp)->udata = (f);                    \
46 < } while(0)
47 < #endif
35 > enum { KE_LENGTH = 128 };
36  
37   static fde_t kqfd;
38   static struct kevent kq_fdlist[KE_LENGTH];  /* kevent buffer */
39   static int kqoff;      /* offset into the buffer */
40 < void init_netio(void);
40 >
41  
42   /*
43   * init_netio
# Line 64 | Line 52 | init_netio(void)
52  
53    if ((fd = kqueue()) < 0)
54    {
55 <    ilog(L_CRIT, "init_netio: Couldn't open kqueue fd!");
56 <    exit(115); /* Whee! */
55 >    ilog(LOG_TYPE_IRCD, "init_netio: couldn't open kqueue fd: %s", strerror(errno));
56 >    exit(EXIT_FAILURE); /* Whee! */
57    }
58  
59    fd_open(&kqfd, fd, 0, "kqueue() file descriptor");
# Line 82 | Line 70 | kq_update_events(int fd, int filter, int
70  
71    EV_SET(kep, (uintptr_t) fd, (short) filter, what, 0, 0, NULL);
72  
73 <  if (kqoff == KE_LENGTH)
73 >  if (++kqoff == KE_LENGTH)
74    {
75 <    kevent(kqfd.fd, kq_fdlist, kqoff, NULL, 0, &zero_timespec);
75 >    int i;
76 >
77 >    for (i = 0; i < kqoff; ++i)
78 >      kevent(kqfd.fd, &kq_fdlist[i], 1, NULL, 0, &zero_timespec);
79      kqoff = 0;
80    }
90  else
91    kqoff++;
81   }
82  
83   /*
# Line 98 | Line 87 | kq_update_events(int fd, int filter, int
87   * and deregister interest in a pending IO state for a given FD.
88   */
89   void
90 < comm_setselect(fde_t *F, unsigned int type, PF *handler,
90 > comm_setselect(fde_t *F, unsigned int type, void (*handler)(fde_t *, void *),
91                 void *client_data, time_t timeout)
92   {
93    int new_events, diff;
# Line 116 | Line 105 | comm_setselect(fde_t *F, unsigned int ty
105    }
106  
107    new_events = (F->read_handler ? COMM_SELECT_READ : 0) |
108 <   (F->write_handler ? COMM_SELECT_WRITE : 0);
108 >               (F->write_handler ? COMM_SELECT_WRITE : 0);
109  
110    if (timeout != 0)
111 +  {
112      F->timeout = CurrentTime + (timeout / 1000);
113 +    F->timeout_handler = handler;
114 +    F->timeout_data = client_data;
115 +  }
116  
117    diff = new_events ^ F->evcache;
118  
# Line 147 | Line 140 | comm_select(void)
140    int num, i;
141    static struct kevent ke[KE_LENGTH];
142    struct timespec poll_time;
143 <  PF *hdl;
143 >  void (*hdl)(fde_t *, void *);
144    fde_t *F;
145  
146    /*
# Line 164 | Line 157 | comm_select(void)
157  
158    if (num < 0)
159    {
160 < #ifdef HAVE_USLEEP
161 <    usleep(50000);  /* avoid 99% CPU in comm_select */
169 < #endif
160 >    const struct timespec req = { .tv_sec = 0, .tv_nsec = 50000000 };
161 >    nanosleep(&req, NULL);  /* Avoid 99% CPU in comm_select */
162      return;
163    }
164  
# Line 177 | Line 169 | comm_select(void)
169        continue;
170  
171      if (ke[i].filter == EVFILT_READ)
172 +    {
173        if ((hdl = F->read_handler) != NULL)
174        {
175          F->read_handler = NULL;
176          hdl(F, F->read_data);
177 <        if (!F->flags.open)
178 <          continue;
177 >        if (!F->flags.open)
178 >          continue;
179        }
180 +    }
181  
182      if (ke[i].filter == EVFILT_WRITE)
183 +    {
184        if ((hdl = F->write_handler) != NULL)
185        {
186          F->write_handler = NULL;
187          hdl(F, F->write_data);
188 <        if (!F->flags.open)
189 <          continue;
188 >        if (!F->flags.open)
189 >          continue;
190        }
191 +    }
192  
193      comm_setselect(F, 0, NULL, NULL, 0);
194    }
195   }
196 + #endif

Comparing:
ircd-hybrid/src/s_bsd_kqueue.c (property svn:keywords), Revision 31 by knight, Sun Oct 2 20:34:05 2005 UTC vs.
ircd-hybrid/trunk/src/s_bsd_kqueue.c (property svn:keywords), Revision 7006 by michael, Fri Jan 1 00:07:54 2016 UTC

# Line 1 | Line 1
1 < "Id Revision"
1 > Id Revision

Diff Legend

Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)