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.3 by root, Wed Oct 31 00:24:16 2007 UTC vs.
Revision 1.6 by root, Wed Oct 31 20:46:44 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/* for broken bsd's */ 30/* for broken bsd's */
2#include <sys/time.h> 31#include <sys/time.h>
3#include <sys/types.h> 32#include <sys/types.h>
4#include <unistd.h> 33#include <unistd.h>
5 34
18 int offs = fd >> 3; 47 int offs = fd >> 3;
19 int mask = 1 << (fd & 7); 48 int mask = 1 << (fd & 7);
20 49
21 if (vec_max < (fd >> 5) + 1) 50 if (vec_max < (fd >> 5) + 1)
22 { 51 {
23 vec_max = (fd >> 5) + 1; 52 int new_max = (fd >> 5) + 1;
24 53
25 vec_ri = (unsigned char *)realloc (vec_ri, vec_max * 4); 54 vec_ri = (unsigned char *)realloc (vec_ri, new_max * 4);
26 vec_ro = (unsigned char *)realloc (vec_ro, vec_max * 4); /* could free/malloc */ 55 vec_ro = (unsigned char *)realloc (vec_ro, new_max * 4); /* could free/malloc */
27 vec_wi = (unsigned char *)realloc (vec_wi, vec_max * 4); 56 vec_wi = (unsigned char *)realloc (vec_wi, new_max * 4);
28 vec_wo = (unsigned char *)realloc (vec_wo, vec_max * 4); /* could free/malloc */ 57 vec_wo = (unsigned char *)realloc (vec_wo, new_max * 4); /* could free/malloc */
58
59 for (; vec_max < new_max; ++vec_max)
60 ((uint32_t *)vec_ri)[vec_max] =
61 ((uint32_t *)vec_wi)[vec_max] = 0;
29 } 62 }
30 63
31 vec_ri [offs] |= mask; 64 vec_ri [offs] |= mask;
32 if (!(nev & EV_READ)) 65 if (!(nev & EV_READ))
33 vec_ri [offs] &= ~mask; 66 vec_ri [offs] &= ~mask;
35 vec_wi [offs] |= mask; 68 vec_wi [offs] |= mask;
36 if (!(nev & EV_WRITE)) 69 if (!(nev & EV_WRITE))
37 vec_wi [offs] &= ~mask; 70 vec_wi [offs] &= ~mask;
38} 71}
39 72
73static void
40static void select_poll (ev_tstamp timeout) 74select_poll (ev_tstamp timeout)
41{ 75{
42 struct timeval tv; 76 struct timeval tv;
43 int res; 77 int res;
44 78
45 memcpy (vec_ro, vec_ri, vec_max * 4); 79 memcpy (vec_ro, vec_ri, vec_max * 4);
75 fd_event (idx * 8 + bit, events); 109 fd_event (idx * 8 + bit, events);
76 } 110 }
77 } 111 }
78 } 112 }
79 } 113 }
114 else if (res < 0)
115 {
116 if (errno == EBADF)
117 fd_recheck ();
118 }
80} 119}
81 120
121static void
82void select_init (int flags) 122select_init (int flags)
83{ 123{
84 ev_method = EVMETHOD_SELECT; 124 ev_method = EVMETHOD_SELECT;
85 method_fudge = 1e-2; /* needed to compensate for select returning early, very conservative */ 125 method_fudge = 1e-2; /* needed to compensate for select returning early, very conservative */
86 method_modify = select_modify; 126 method_modify = select_modify;
87 method_poll = select_poll; 127 method_poll = select_poll;
88} 128}
89 129
90

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines