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.4 by root, Wed Oct 31 14:44:15 2007 UTC vs.
Revision 1.6 by root, Wed Oct 31 20:46:44 2007 UTC

47 int offs = fd >> 3; 47 int offs = fd >> 3;
48 int mask = 1 << (fd & 7); 48 int mask = 1 << (fd & 7);
49 49
50 if (vec_max < (fd >> 5) + 1) 50 if (vec_max < (fd >> 5) + 1)
51 { 51 {
52 vec_max = (fd >> 5) + 1; 52 int new_max = (fd >> 5) + 1;
53 53
54 vec_ri = (unsigned char *)realloc (vec_ri, vec_max * 4); 54 vec_ri = (unsigned char *)realloc (vec_ri, new_max * 4);
55 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 */
56 vec_wi = (unsigned char *)realloc (vec_wi, vec_max * 4); 56 vec_wi = (unsigned char *)realloc (vec_wi, new_max * 4);
57 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;
58 } 62 }
59 63
60 vec_ri [offs] |= mask; 64 vec_ri [offs] |= mask;
61 if (!(nev & EV_READ)) 65 if (!(nev & EV_READ))
62 vec_ri [offs] &= ~mask; 66 vec_ri [offs] &= ~mask;
64 vec_wi [offs] |= mask; 68 vec_wi [offs] |= mask;
65 if (!(nev & EV_WRITE)) 69 if (!(nev & EV_WRITE))
66 vec_wi [offs] &= ~mask; 70 vec_wi [offs] &= ~mask;
67} 71}
68 72
73static void
69static void select_poll (ev_tstamp timeout) 74select_poll (ev_tstamp timeout)
70{ 75{
71 struct timeval tv; 76 struct timeval tv;
72 int res; 77 int res;
73 78
74 memcpy (vec_ro, vec_ri, vec_max * 4); 79 memcpy (vec_ro, vec_ri, vec_max * 4);
104 fd_event (idx * 8 + bit, events); 109 fd_event (idx * 8 + bit, events);
105 } 110 }
106 } 111 }
107 } 112 }
108 } 113 }
114 else if (res < 0)
115 {
116 if (errno == EBADF)
117 fd_recheck ();
118 }
109} 119}
110 120
121static void
111void select_init (int flags) 122select_init (int flags)
112{ 123{
113 ev_method = EVMETHOD_SELECT; 124 ev_method = EVMETHOD_SELECT;
114 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 */
115 method_modify = select_modify; 126 method_modify = select_modify;
116 method_poll = select_poll; 127 method_poll = select_poll;
117} 128}
118 129
119

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines