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

Comparing libev/ev.c (file contents):
Revision 1.86 by root, Sat Nov 10 03:19:21 2007 UTC vs.
Revision 1.99 by root, Sun Nov 11 02:26:47 2007 UTC

… …
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31
32#ifdef __cplusplus
33extern "C" {
34#endif
35
31#ifndef EV_STANDALONE 36#ifndef EV_STANDALONE
32# include "config.h" 37# include "config.h"
33 38
34# if HAVE_CLOCK_GETTIME 39# if HAVE_CLOCK_GETTIME
40# ifndef EV_USE_MONOTONIC
35# define EV_USE_MONOTONIC 1 41# define EV_USE_MONOTONIC 1
42# endif
43# ifndef EV_USE_REALTIME
36# define EV_USE_REALTIME 1 44# define EV_USE_REALTIME 1
45# endif
37# endif 46# endif
38 47
39# if HAVE_SELECT && HAVE_SYS_SELECT_H 48# if HAVE_SELECT && HAVE_SYS_SELECT_H && !defined (EV_USE_SELECT)
40# define EV_USE_SELECT 1 49# define EV_USE_SELECT 1
41# endif 50# endif
42 51
43# if HAVE_POLL && HAVE_POLL_H 52# if HAVE_POLL && HAVE_POLL_H && !defined (EV_USE_POLL)
44# define EV_USE_POLL 1 53# define EV_USE_POLL 1
45# endif 54# endif
46 55
47# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 56# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H && !defined (EV_USE_EPOLL)
48# define EV_USE_EPOLL 1 57# define EV_USE_EPOLL 1
49# endif 58# endif
50 59
51# if HAVE_KQUEUE && HAVE_WORKING_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 60# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE)
52# define EV_USE_KQUEUE 1 61# define EV_USE_KQUEUE 1
53# endif 62# endif
54 63
55#endif 64#endif
56 65
… …
152typedef struct ev_watcher_list *WL; 161typedef struct ev_watcher_list *WL;
153typedef struct ev_watcher_time *WT; 162typedef struct ev_watcher_time *WT;
154 163
155static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 164static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
156 165
166#ifdef WIN32
157#include "ev_win32.c" 167# include "ev_win32.c"
168#endif
158 169
159/*****************************************************************************/ 170/*****************************************************************************/
160 171
161static void (*syserr_cb)(const char *msg); 172static void (*syserr_cb)(const char *msg);
162 173
… …
222#if EV_MULTIPLICITY 233#if EV_MULTIPLICITY
223 234
224 struct ev_loop 235 struct ev_loop
225 { 236 {
226 ev_tstamp ev_rt_now; 237 ev_tstamp ev_rt_now;
238 #define ev_rt_now ((loop)->ev_rt_now)
227 #define VAR(name,decl) decl; 239 #define VAR(name,decl) decl;
228 #include "ev_vars.h" 240 #include "ev_vars.h"
229 #undef VAR 241 #undef VAR
230 }; 242 };
231 #include "ev_wrap.h" 243 #include "ev_wrap.h"
… …
244 256
245#endif 257#endif
246 258
247/*****************************************************************************/ 259/*****************************************************************************/
248 260
249inline ev_tstamp 261ev_tstamp
250ev_time (void) 262ev_time (void)
251{ 263{
252#if EV_USE_REALTIME 264#if EV_USE_REALTIME
253 struct timespec ts; 265 struct timespec ts;
254 clock_gettime (CLOCK_REALTIME, &ts); 266 clock_gettime (CLOCK_REALTIME, &ts);
… …
523 heap [k] = w; 535 heap [k] = w;
524 ((W)heap [k])->active = k + 1; 536 ((W)heap [k])->active = k + 1;
525} 537}
526 538
527inline void 539inline void
528adjustheap (WT *heap, int N, int k, ev_tstamp at) 540adjustheap (WT *heap, int N, int k)
529{ 541{
530 ev_tstamp old_at = heap [k]->at; 542 upheap (heap, k);
531 heap [k]->at = at;
532
533 if (old_at < at)
534 downheap (heap, N, k); 543 downheap (heap, N, k);
535 else
536 upheap (heap, k);
537} 544}
538 545
539/*****************************************************************************/ 546/*****************************************************************************/
540 547
541typedef struct 548typedef struct
… …
799 array_free (pending, [i]); 806 array_free (pending, [i]);
800 807
801 /* have to use the microsoft-never-gets-it-right macro */ 808 /* have to use the microsoft-never-gets-it-right macro */
802 array_free_microshit (fdchange); 809 array_free_microshit (fdchange);
803 array_free_microshit (timer); 810 array_free_microshit (timer);
811#if EV_PERIODICS
804 array_free_microshit (periodic); 812 array_free_microshit (periodic);
813#endif
805 array_free_microshit (idle); 814 array_free_microshit (idle);
806 array_free_microshit (prepare); 815 array_free_microshit (prepare);
807 array_free_microshit (check); 816 array_free_microshit (check);
808 817
809 method = 0; 818 method = 0;
… …
982 991
983 /* first reschedule or stop timer */ 992 /* first reschedule or stop timer */
984 if (w->repeat) 993 if (w->repeat)
985 { 994 {
986 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 995 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
996
987 ((WT)w)->at = mn_now + w->repeat; 997 ((WT)w)->at += w->repeat;
998 if (((WT)w)->at < mn_now)
999 ((WT)w)->at = mn_now;
1000
988 downheap ((WT *)timers, timercnt, 0); 1001 downheap ((WT *)timers, timercnt, 0);
989 } 1002 }
990 else 1003 else
991 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1004 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
992 1005
993 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1006 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
994 } 1007 }
995} 1008}
996 1009
1010#if EV_PERIODICS
997static void 1011static void
998periodics_reify (EV_P) 1012periodics_reify (EV_P)
999{ 1013{
1000 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1014 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1001 { 1015 {
… …
1042 1056
1043 /* now rebuild the heap */ 1057 /* now rebuild the heap */
1044 for (i = periodiccnt >> 1; i--; ) 1058 for (i = periodiccnt >> 1; i--; )
1045 downheap ((WT *)periodics, periodiccnt, i); 1059 downheap ((WT *)periodics, periodiccnt, i);
1046} 1060}
1061#endif
1047 1062
1048inline int 1063inline int
1049time_update_monotonic (EV_P) 1064time_update_monotonic (EV_P)
1050{ 1065{
1051 mn_now = get_clock (); 1066 mn_now = get_clock ();
… …
1085 ev_rt_now = ev_time (); 1100 ev_rt_now = ev_time ();
1086 mn_now = get_clock (); 1101 mn_now = get_clock ();
1087 now_floor = mn_now; 1102 now_floor = mn_now;
1088 } 1103 }
1089 1104
1105# if EV_PERIODICS
1090 periodics_reschedule (EV_A); 1106 periodics_reschedule (EV_A);
1107# endif
1091 /* no timer adjustment, as the monotonic clock doesn't jump */ 1108 /* no timer adjustment, as the monotonic clock doesn't jump */
1092 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1109 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1093 } 1110 }
1094 } 1111 }
1095 else 1112 else
… …
1097 { 1114 {
1098 ev_rt_now = ev_time (); 1115 ev_rt_now = ev_time ();
1099 1116
1100 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1117 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1101 { 1118 {
1119#if EV_PERIODICS
1102 periodics_reschedule (EV_A); 1120 periodics_reschedule (EV_A);
1121#endif
1103 1122
1104 /* adjust timers. this is easy, as the offset is the same for all */ 1123 /* adjust timers. this is easy, as the offset is the same for all */
1105 for (i = 0; i < timercnt; ++i) 1124 for (i = 0; i < timercnt; ++i)
1106 ((WT)timers [i])->at += ev_rt_now - mn_now; 1125 ((WT)timers [i])->at += ev_rt_now - mn_now;
1107 } 1126 }
… …
1170 { 1189 {
1171 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1190 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1172 if (block > to) block = to; 1191 if (block > to) block = to;
1173 } 1192 }
1174 1193
1194#if EV_PERIODICS
1175 if (periodiccnt) 1195 if (periodiccnt)
1176 { 1196 {
1177 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; 1197 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1178 if (block > to) block = to; 1198 if (block > to) block = to;
1179 } 1199 }
1200#endif
1180 1201
1181 if (block < 0.) block = 0.; 1202 if (block < 0.) block = 0.;
1182 } 1203 }
1183 1204
1184 method_poll (EV_A_ block); 1205 method_poll (EV_A_ block);
… …
1186 /* update ev_rt_now, do magic */ 1207 /* update ev_rt_now, do magic */
1187 time_update (EV_A); 1208 time_update (EV_A);
1188 1209
1189 /* queue pending timers and reschedule them */ 1210 /* queue pending timers and reschedule them */
1190 timers_reify (EV_A); /* relative timers called last */ 1211 timers_reify (EV_A); /* relative timers called last */
1212#if EV_PERIODICS
1191 periodics_reify (EV_A); /* absolute timers called first */ 1213 periodics_reify (EV_A); /* absolute timers called first */
1214#endif
1192 1215
1193 /* queue idle watchers unless io or timers are pending */ 1216 /* queue idle watchers unless io or timers are pending */
1194 if (idlecnt && !any_pending (EV_A)) 1217 if (idlecnt && !any_pending (EV_A))
1195 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1218 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1196 1219
… …
1287{ 1310{
1288 ev_clear_pending (EV_A_ (W)w); 1311 ev_clear_pending (EV_A_ (W)w);
1289 if (!ev_is_active (w)) 1312 if (!ev_is_active (w))
1290 return; 1313 return;
1291 1314
1315 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1316
1292 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1317 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1293 ev_stop (EV_A_ (W)w); 1318 ev_stop (EV_A_ (W)w);
1294 1319
1295 fd_change (EV_A_ w->fd); 1320 fd_change (EV_A_ w->fd);
1296} 1321}
… …
1323 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1348 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1324 1349
1325 if (((W)w)->active < timercnt--) 1350 if (((W)w)->active < timercnt--)
1326 { 1351 {
1327 timers [((W)w)->active - 1] = timers [timercnt]; 1352 timers [((W)w)->active - 1] = timers [timercnt];
1328 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1353 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1329 } 1354 }
1330 1355
1331 ((WT)w)->at = w->repeat; 1356 ((WT)w)->at -= mn_now;
1332 1357
1333 ev_stop (EV_A_ (W)w); 1358 ev_stop (EV_A_ (W)w);
1334} 1359}
1335 1360
1336void 1361void
1337ev_timer_again (EV_P_ struct ev_timer *w) 1362ev_timer_again (EV_P_ struct ev_timer *w)
1338{ 1363{
1339 if (ev_is_active (w)) 1364 if (ev_is_active (w))
1340 { 1365 {
1341 if (w->repeat) 1366 if (w->repeat)
1367 {
1368 ((WT)w)->at = mn_now + w->repeat;
1342 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1, mn_now + w->repeat); 1369 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1370 }
1343 else 1371 else
1344 ev_timer_stop (EV_A_ w); 1372 ev_timer_stop (EV_A_ w);
1345 } 1373 }
1346 else if (w->repeat) 1374 else if (w->repeat)
1347 ev_timer_start (EV_A_ w); 1375 ev_timer_start (EV_A_ w);
1348} 1376}
1349 1377
1378#if EV_PERIODICS
1350void 1379void
1351ev_periodic_start (EV_P_ struct ev_periodic *w) 1380ev_periodic_start (EV_P_ struct ev_periodic *w)
1352{ 1381{
1353 if (ev_is_active (w)) 1382 if (ev_is_active (w))
1354 return; 1383 return;
… …
1380 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1409 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1381 1410
1382 if (((W)w)->active < periodiccnt--) 1411 if (((W)w)->active < periodiccnt--)
1383 { 1412 {
1384 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1413 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1385 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1414 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1386 } 1415 }
1387 1416
1388 ev_stop (EV_A_ (W)w); 1417 ev_stop (EV_A_ (W)w);
1389} 1418}
1390 1419
… …
1393{ 1422{
1394 /* TODO: use adjustheap and recalculation */ 1423 /* TODO: use adjustheap and recalculation */
1395 ev_periodic_stop (EV_A_ w); 1424 ev_periodic_stop (EV_A_ w);
1396 ev_periodic_start (EV_A_ w); 1425 ev_periodic_start (EV_A_ w);
1397} 1426}
1427#endif
1398 1428
1399void 1429void
1400ev_idle_start (EV_P_ struct ev_idle *w) 1430ev_idle_start (EV_P_ struct ev_idle *w)
1401{ 1431{
1402 if (ev_is_active (w)) 1432 if (ev_is_active (w))
… …
1453 1483
1454void 1484void
1455ev_check_stop (EV_P_ struct ev_check *w) 1485ev_check_stop (EV_P_ struct ev_check *w)
1456{ 1486{
1457 ev_clear_pending (EV_A_ (W)w); 1487 ev_clear_pending (EV_A_ (W)w);
1458 if (ev_is_active (w)) 1488 if (!ev_is_active (w))
1459 return; 1489 return;
1460 1490
1461 checks [((W)w)->active - 1] = checks [--checkcnt]; 1491 checks [((W)w)->active - 1] = checks [--checkcnt];
1462 ev_stop (EV_A_ (W)w); 1492 ev_stop (EV_A_ (W)w);
1463} 1493}
… …
1524 1554
1525void 1555void
1526ev_child_stop (EV_P_ struct ev_child *w) 1556ev_child_stop (EV_P_ struct ev_child *w)
1527{ 1557{
1528 ev_clear_pending (EV_A_ (W)w); 1558 ev_clear_pending (EV_A_ (W)w);
1529 if (ev_is_active (w)) 1559 if (!ev_is_active (w))
1530 return; 1560 return;
1531 1561
1532 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1562 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1533 ev_stop (EV_A_ (W)w); 1563 ev_stop (EV_A_ (W)w);
1534} 1564}
… …
1594 ev_timer_start (EV_A_ &once->to); 1624 ev_timer_start (EV_A_ &once->to);
1595 } 1625 }
1596 } 1626 }
1597} 1627}
1598 1628
1629#ifdef __cplusplus
1630}
1631#endif
1632

Diff Legend

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