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

Comparing:
ircd-hybrid-7.2/src/s_bsd_devpoll.c (file contents), Revision 908 by stu, Sun Nov 4 23:21:51 2007 UTC vs.
ircd-hybrid/trunk/src/s_bsd_devpoll.c (file contents), Revision 2916 by michael, Sat Jan 25 21:09:18 2014 UTC

# Line 1 | Line 1
1   /*
2 < *  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3 < *  s_bsd_devpoll.c: /dev/poll 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) 2002 Hybrid Development Team
4 > *  Copyright (c) 2001-2014 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 19 | Line 17
17   *  along with this program; if not, write to the Free Software
18   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
19   *  USA
20 < *
21 < *  $Id$
20 > */
21 >
22 > /*! \file s_bsd_devpoll.c
23 > * \brief /dev/poll compatible network routines.
24 > * \version $Id$
25   */
26  
27   #include "stdinc.h"
# Line 39 | Line 40
40   #include "fdlist.h"
41   #include "ircd.h"
42   #include "s_bsd.h"
43 < #include "s_log.h"
43 > #include "log.h"
44  
45   static fde_t dpfd;
46  
# Line 56 | Line 57 | init_netio(void)
57  
58    if ((fd = open("/dev/poll", O_RDWR)) < 0)
59    {
60 <    ilog(L_CRIT, "init_netio: Couldn't open /dev/poll - %d: %s",
60 >    ilog(LOG_TYPE_IRCD, "init_netio: Couldn't open /dev/poll - %d: %s",
61           errno, strerror(errno));
62      exit(115); /* Whee! */
63    }
# Line 82 | Line 83 | devpoll_write_update(int fd, int events)
83  
84    /* Write the thing to our poll fd */
85    if (write(dpfd.fd, &pfd, sizeof(pfd)) != sizeof(pfd))
86 <    ilog(L_NOTICE, "devpoll_write_update: dpfd write failed %d: %s",
86 >    ilog(LOG_TYPE_IRCD, "devpoll_write_update: dpfd write failed %d: %s",
87           errno, strerror(errno));
88   }
89  
# Line 114 | Line 115 | comm_setselect(fde_t *F, unsigned int ty
115      (F->write_handler ? POLLOUT : 0);
116  
117    if (timeout != 0)
118 +  {
119      F->timeout = CurrentTime + (timeout / 1000);
120 +    F->timeout_handler = handler;
121 +    F->timeout_data = client_data;
122 +  }
123  
124    if (new_events != F->evcache)
125    {
# Line 163 | Line 168 | comm_select(void)
168        continue;
169  
170      if ((dopoll.dp_fds[i].revents & POLLIN))
171 +    {
172        if ((hdl = F->read_handler) != NULL)
173        {
174          F->read_handler = NULL;
# Line 170 | Line 176 | comm_select(void)
176          if (!F->flags.open)
177            continue;
178        }
179 +    }
180  
181      if ((dopoll.dp_fds[i].revents & POLLOUT))
182 <      if ((hdl = F->write_handler) != NULL)
182 >    {
183 >      if ((hdl = F->write_handler) != NULL)
184        {
185          F->write_handler = NULL;
186          hdl(F, F->write_data);
187          if (!F->flags.open)
188            continue;
189        }
190 +    }
191  
192      comm_setselect(F, 0, NULL, NULL, 0);
193    }

Diff Legend

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