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.56 by root, Thu Feb 18 04:48:05 2016 UTC vs.
Revision 1.57 by root, Mon Jul 1 20:47:38 2019 UTC

106#else 106#else
107 107
108 int word = fd / NFDBITS; 108 int word = fd / NFDBITS;
109 fd_mask mask = 1UL << (fd % NFDBITS); 109 fd_mask mask = 1UL << (fd % NFDBITS);
110 110
111 if (expect_false (vec_max <= word)) 111 if (ecb_expect_false (vec_max <= word))
112 { 112 {
113 int new_max = word + 1; 113 int new_max = word + 1;
114 114
115 vec_ri = ev_realloc (vec_ri, new_max * NFDBYTES); 115 vec_ri = ev_realloc (vec_ri, new_max * NFDBYTES);
116 vec_ro = ev_realloc (vec_ro, new_max * NFDBYTES); /* could free/malloc */ 116 vec_ro = ev_realloc (vec_ro, new_max * NFDBYTES); /* could free/malloc */
169#else 169#else
170 res = select (vec_max * NFDBITS, (fd_set *)vec_ro, (fd_set *)vec_wo, 0, &tv); 170 res = select (vec_max * NFDBITS, (fd_set *)vec_ro, (fd_set *)vec_wo, 0, &tv);
171#endif 171#endif
172 EV_ACQUIRE_CB; 172 EV_ACQUIRE_CB;
173 173
174 if (expect_false (res < 0)) 174 if (ecb_expect_false (res < 0))
175 { 175 {
176 #if EV_SELECT_IS_WINSOCKET 176 #if EV_SELECT_IS_WINSOCKET
177 errno = WSAGetLastError (); 177 errno = WSAGetLastError ();
178 #endif 178 #endif
179 #ifdef WSABASEERR 179 #ifdef WSABASEERR
234 if (FD_ISSET (handle, (fd_set *)vec_wo)) events |= EV_WRITE; 234 if (FD_ISSET (handle, (fd_set *)vec_wo)) events |= EV_WRITE;
235 #ifdef _WIN32 235 #ifdef _WIN32
236 if (FD_ISSET (handle, (fd_set *)vec_eo)) events |= EV_WRITE; 236 if (FD_ISSET (handle, (fd_set *)vec_eo)) events |= EV_WRITE;
237 #endif 237 #endif
238 238
239 if (expect_true (events)) 239 if (ecb_expect_true (events))
240 fd_event (EV_A_ fd, events); 240 fd_event (EV_A_ fd, events);
241 } 241 }
242 } 242 }
243 243
244#else 244#else
260 int events = 0; 260 int events = 0;
261 261
262 events |= word_r & mask ? EV_READ : 0; 262 events |= word_r & mask ? EV_READ : 0;
263 events |= word_w & mask ? EV_WRITE : 0; 263 events |= word_w & mask ? EV_WRITE : 0;
264 264
265 if (expect_true (events)) 265 if (ecb_expect_true (events))
266 fd_event (EV_A_ word * NFDBITS + bit, events); 266 fd_event (EV_A_ word * NFDBITS + bit, events);
267 } 267 }
268 } 268 }
269 } 269 }
270 270

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines