ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libev/ev_epoll.c
(Generate patch)

Comparing libev/ev_epoll.c (file contents):
Revision 1.2 by root, Tue Oct 30 23:54:38 2007 UTC vs.
Revision 1.5 by root, Wed Oct 31 14:44:15 2007 UTC

1/*
2 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are
7 * met:
8 *
9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer.
11 *
12 * * Redistributions in binary form must reproduce the above
13 * copyright notice, this list of conditions and the following
14 * disclaimer in the documentation and/or other materials provided
15 * with the distribution.
16 *
17 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
18 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
19 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
20 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
21 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
22 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
23 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
24 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
25 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
27 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 */
29
1#include <sys/epoll.h> 30#include <sys/epoll.h>
2 31
3static int epoll_fd = -1; 32static int epoll_fd = -1;
4 33
5static void 34static void
11 ev.data.fd = fd; 40 ev.data.fd = fd;
12 ev.events = 41 ev.events =
13 (nev & EV_READ ? EPOLLIN : 0) 42 (nev & EV_READ ? EPOLLIN : 0)
14 | (nev & EV_WRITE ? EPOLLOUT : 0); 43 | (nev & EV_WRITE ? EPOLLOUT : 0);
15 44
16 fprintf (stderr, "reify %d,%d,%d m%d (r=%d)\n", fd, oev, nev, mode,//D
17 epoll_ctl (epoll_fd, mode, fd, &ev) 45 epoll_ctl (epoll_fd, mode, fd, &ev);
18 );//D
19} 46}
20 47
21void epoll_postfork_child (void) 48void epoll_postfork_child (void)
22{ 49{
23 int fd; 50 int fd;
24 51
25 epoll_fd = epoll_create (256); 52 epoll_fd = epoll_create (256);
53 fcntl (epoll_fd, F_SETFD, FD_CLOEXEC);
26 54
27 /* re-register interest in fds */ 55 /* re-register interest in fds */
28 for (fd = 0; fd < anfdmax; ++fd) 56 for (fd = 0; fd < anfdmax; ++fd)
29 if (anfds [fd].wev) 57 if (anfds [fd].wev)
30 epoll_modify (fd, EV_NONE, anfds [fd].wev); 58 epoll_modify (fd, EV_NONE, anfds [fd].wev);
55 eventmax += eventmax >> 1; 83 eventmax += eventmax >> 1;
56 events = malloc (sizeof (struct epoll_event) * eventmax); 84 events = malloc (sizeof (struct epoll_event) * eventmax);
57 } 85 }
58} 86}
59 87
60int epoll_init (int flags) 88void epoll_init (int flags)
61{ 89{
62 epoll_fd = epoll_create (256); 90 epoll_fd = epoll_create (256);
63 91
64 if (epoll_fd < 0) 92 if (epoll_fd < 0)
65 return 0; 93 return;
66 94
95 fcntl (epoll_fd, F_SETFD, FD_CLOEXEC);
96
67 ev_method = EVMETHOD_EPOLL; 97 ev_method = EVMETHOD_EPOLL;
68 method_fudge = 1e-3; /* needed to compensate for epoll returning early */ 98 method_fudge = 1e-3; /* needed to compensate for epoll returning early */
69 method_modify = epoll_modify; 99 method_modify = epoll_modify;
70 method_poll = epoll_poll; 100 method_poll = epoll_poll;
71 101
72 eventmax = 64; /* intiial number of events receivable per poll */ 102 eventmax = 64; /* intiial number of events receivable per poll */
73 events = malloc (sizeof (struct epoll_event) * eventmax); 103 events = malloc (sizeof (struct epoll_event) * eventmax);
74
75 return 1;
76} 104}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines