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.29 by root, Tue May 20 19:26:45 2008 UTC vs.
Revision 1.33 by root, Mon May 26 04:14:32 2008 UTC

1/* 1/*
2 * libev select fd activity backend 2 * libev select fd activity backend
3 * 3 *
4 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
52#endif 52#endif
53 53
54#if EV_SELECT_IS_WINSOCKET 54#if EV_SELECT_IS_WINSOCKET
55# undef EV_SELECT_USE_FD_SET 55# undef EV_SELECT_USE_FD_SET
56# define EV_SELECT_USE_FD_SET 1 56# define EV_SELECT_USE_FD_SET 1
57# undef EINTR
58# define EINTR WSAEINTR
59# undef EBADF
60# define EBADF WSAENOTSOCK
61# undef ENOMEM
62# define ENOMEM (errno + 1)
63#endif 57#endif
64 58
65#if !EV_SELECT_USE_FD_SET 59#if !EV_SELECT_USE_FD_SET
66# define NFDBYTES (NFDBITS / 8) 60# define NFDBYTES (NFDBITS / 8)
67#endif 61#endif
… …
104 98
105 vec_ri = ev_realloc (vec_ri, new_max * NFDBYTES); 99 vec_ri = ev_realloc (vec_ri, new_max * NFDBYTES);
106 vec_ro = ev_realloc (vec_ro, new_max * NFDBYTES); /* could free/malloc */ 100 vec_ro = ev_realloc (vec_ro, new_max * NFDBYTES); /* could free/malloc */
107 vec_wi = ev_realloc (vec_wi, new_max * NFDBYTES); 101 vec_wi = ev_realloc (vec_wi, new_max * NFDBYTES);
108 vec_wo = ev_realloc (vec_wo, new_max * NFDBYTES); /* could free/malloc */ 102 vec_wo = ev_realloc (vec_wo, new_max * NFDBYTES); /* could free/malloc */
103 #ifdef _WIN32
104 vec_eo = ev_realloc (vec_eo, new_max * NFDBYTES); /* could free/malloc */
105 #endif
109 106
110 for (; vec_max < new_max; ++vec_max) 107 for (; vec_max < new_max; ++vec_max)
111 ((fd_mask *)vec_ri) [vec_max] = 108 ((fd_mask *)vec_ri) [vec_max] =
112 ((fd_mask *)vec_wi) [vec_max] = 0; 109 ((fd_mask *)vec_wi) [vec_max] = 0;
113 } 110 }
… …
126static void 123static void
127select_poll (EV_P_ ev_tstamp timeout) 124select_poll (EV_P_ ev_tstamp timeout)
128{ 125{
129 struct timeval tv; 126 struct timeval tv;
130 int res; 127 int res;
131 128 int fd_setsize;
132#if EV_SELECT_USE_FD_SET
133 memcpy (vec_ro, vec_ri, sizeof (fd_set));
134 memcpy (vec_wo, vec_wi, sizeof (fd_set));
135#else
136 memcpy (vec_ro, vec_ri, vec_max * NFDBYTES);
137 memcpy (vec_wo, vec_wi, vec_max * NFDBYTES);
138#endif
139 129
140 tv.tv_sec = (long)timeout; 130 tv.tv_sec = (long)timeout;
141 tv.tv_usec = (long)((timeout - (ev_tstamp)tv.tv_sec) * 1e6); 131 tv.tv_usec = (long)((timeout - (ev_tstamp)tv.tv_sec) * 1e6);
142 132
133#if EV_SELECT_USE_FD_SET
134 fd_setsize = sizeof (fd_set);
135#else
136 fd_setsize = vec_max * NFDBYTES;
137#endif
138
139 memcpy (vec_ro, vec_ri, fd_setsize);
140 memcpy (vec_wo, vec_wi, fd_setsize);
141
142#ifdef _WIN32
143 /* pass in the write set as except set.
144 * the idea behind this is to work around a windows bug that causes
145 * errors to be reported as an exception and not by setting
146 * the writable bit. this is so uncontrollably lame.
147 */
148 memcpy (vec_eo, vec_wi, fd_setsize);
149 res = select (vec_max * NFDBITS, (fd_set *)vec_ro, (fd_set *)vec_wo, (fd_set *)vec_eo, &tv);
150#else
143 res = select (vec_max * NFDBITS, (fd_set *)vec_ro, (fd_set *)vec_wo, 0, &tv); 151 res = select (vec_max * NFDBITS, (fd_set *)vec_ro, (fd_set *)vec_wo, 0, &tv);
152#endif
144 153
145 if (expect_false (res < 0)) 154 if (expect_false (res < 0))
146 { 155 {
147 #if EV_SELECT_IS_WINSOCKET 156 #if EV_SELECT_IS_WINSOCKET
148 errno = WSAGetLastError (); 157 errno = WSAGetLastError ();
… …
196 int handle = fd; 205 int handle = fd;
197 #endif 206 #endif
198 207
199 if (FD_ISSET (handle, (fd_set *)vec_ro)) events |= EV_READ; 208 if (FD_ISSET (handle, (fd_set *)vec_ro)) events |= EV_READ;
200 if (FD_ISSET (handle, (fd_set *)vec_wo)) events |= EV_WRITE; 209 if (FD_ISSET (handle, (fd_set *)vec_wo)) events |= EV_WRITE;
210 #ifdef _WIN32
211 if (FD_ISSET (handle, (fd_set *)vec_eo)) events |= EV_WRITE;
212 #endif
201 213
202 if (expect_true (events)) 214 if (expect_true (events))
203 fd_event (EV_A_ fd, events); 215 fd_event (EV_A_ fd, events);
204 } 216 }
205 } 217 }
… …
210 int word, bit; 222 int word, bit;
211 for (word = vec_max; word--; ) 223 for (word = vec_max; word--; )
212 { 224 {
213 fd_mask word_r = ((fd_mask *)vec_ro) [word]; 225 fd_mask word_r = ((fd_mask *)vec_ro) [word];
214 fd_mask word_w = ((fd_mask *)vec_wo) [word]; 226 fd_mask word_w = ((fd_mask *)vec_wo) [word];
227 #ifdef _WIN32
228 word_w |= ((fd_mask *)vec_eo) [word];
229 #endif
215 230
216 if (word_r || word_w) 231 if (word_r || word_w)
217 for (bit = NFDBITS; bit--; ) 232 for (bit = NFDBITS; bit--; )
218 { 233 {
219 fd_mask mask = 1UL << bit; 234 fd_mask mask = 1UL << bit;
… …
242 vec_max = FD_SETSIZE / 32; 257 vec_max = FD_SETSIZE / 32;
243 vec_ri = ev_malloc (sizeof (fd_set)); FD_ZERO ((fd_set *)vec_ri); 258 vec_ri = ev_malloc (sizeof (fd_set)); FD_ZERO ((fd_set *)vec_ri);
244 vec_ro = ev_malloc (sizeof (fd_set)); 259 vec_ro = ev_malloc (sizeof (fd_set));
245 vec_wi = ev_malloc (sizeof (fd_set)); FD_ZERO ((fd_set *)vec_wi); 260 vec_wi = ev_malloc (sizeof (fd_set)); FD_ZERO ((fd_set *)vec_wi);
246 vec_wo = ev_malloc (sizeof (fd_set)); 261 vec_wo = ev_malloc (sizeof (fd_set));
262 #ifdef _WIN32
263 vec_eo = ev_malloc (sizeof (fd_set));
264 #endif
247#else 265#else
248 vec_max = 0; 266 vec_max = 0;
249 vec_ri = 0; 267 vec_ri = 0;
250 vec_ri = 0; 268 vec_ri = 0;
251 vec_wo = 0; 269 vec_wo = 0;

Diff Legend

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