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

Comparing libev/ev_select.c (file contents):
Revision 1.7 by root, Thu Nov 1 13:11:12 2007 UTC vs.
Revision 1.13 by root, Sun Nov 4 23:14:11 2007 UTC

… …
33#include <sys/time.h> 33#include <sys/time.h>
34#include <sys/types.h> 34#include <sys/types.h>
35#include <unistd.h> 35#include <unistd.h>
36 36
37/* for unix systems */ 37/* for unix systems */
38#ifndef WIN32
38#include <sys/select.h> 39# include <sys/select.h>
40#endif
39 41
40#include <string.h> 42#include <string.h>
41#include <inttypes.h> 43#include <inttypes.h>
42 44
43static unsigned char *vec_ri, *vec_ro, *vec_wi, *vec_wo;
44static int vec_max;
45
46static void 45static void
47select_modify (int fd, int oev, int nev) 46select_modify (EV_P_ int fd, int oev, int nev)
48{ 47{
49 int offs = fd >> 3; 48 int offs = fd >> 3;
50 int mask = 1 << (fd & 7); 49 int mask = 1 << (fd & 7);
50
51 if (oev == nev)
52 return;
51 53
52 if (vec_max < (fd >> 5) + 1) 54 if (vec_max < (fd >> 5) + 1)
53 { 55 {
54 int new_max = (fd >> 5) + 1; 56 int new_max = (fd >> 5) + 1;
55 57
… …
71 if (!(nev & EV_WRITE)) 73 if (!(nev & EV_WRITE))
72 vec_wi [offs] &= ~mask; 74 vec_wi [offs] &= ~mask;
73} 75}
74 76
75static void 77static void
76select_poll (ev_tstamp timeout) 78select_poll (EV_P_ ev_tstamp timeout)
77{ 79{
78 struct timeval tv; 80 struct timeval tv;
79 int res; 81 int res;
80 82
81 memcpy (vec_ro, vec_ri, vec_max * 4); 83 memcpy (vec_ro, vec_ri, vec_max * 4);
… …
106 int events = 0; 108 int events = 0;
107 events |= byte_r & (1 << bit) ? EV_READ : 0; 109 events |= byte_r & (1 << bit) ? EV_READ : 0;
108 events |= byte_w & (1 << bit) ? EV_WRITE : 0; 110 events |= byte_w & (1 << bit) ? EV_WRITE : 0;
109 111
110 if (events) 112 if (events)
111 fd_event (idx * 8 + bit, events); 113 fd_event (EV_A_ idx * 8 + bit, events);
112 } 114 }
113 } 115 }
114 } 116 }
115 } 117 }
116 else if (res < 0) 118 else if (res < 0)
117 { 119 {
118 if (errno == EBADF) 120 if (errno == EBADF)
119 fd_recheck (); 121 fd_ebadf (EV_A);
122 else if (errno == ENOMEM)
123 fd_enomem (EV_A);
120 } 124 }
121} 125}
122 126
123static void 127static int
124select_init (int flags) 128select_init (EV_P_ int flags)
125{ 129{
126 ev_method = EVMETHOD_SELECT;
127 method_fudge = 1e-2; /* needed to compensate for select returning early, very conservative */ 130 method_fudge = 1e-2; /* needed to compensate for select returning early, very conservative */
128 method_modify = select_modify; 131 method_modify = select_modify;
129 method_poll = select_poll; 132 method_poll = select_poll;
133
134 vec_max = 0;
135 vec_ri = 0;
136 vec_ri = 0;
137 vec_wo = 0;
138 vec_wo = 0;
139
140 return EVMETHOD_SELECT;
130} 141}
131 142
143static void
144select_destroy (EV_P)
145{
146 free (vec_ri);
147 free (vec_ro);
148 free (vec_wi);
149 free (vec_wo);
150}
151
152

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines