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

Comparing libev/ev.c (file contents):
Revision 1.59 by root, Sun Nov 4 18:15:16 2007 UTC vs.
Revision 1.66 by root, Sun Nov 4 23:30:53 2007 UTC

… …
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#ifndef EV_STANDALONE 31#ifndef EV_STANDALONE
32# include "config.h" 32# include "config.h"
33
34# if HAVE_CLOCK_GETTIME
35# define EV_USE_MONOTONIC 1
36# define EV_USE_REALTIME 1
37# endif
38
39# if HAVE_SELECT && HAVE_SYS_SELECT_H
40# define EV_USE_SELECT 1
41# endif
42
43# if HAVE_POLL && HAVE_POLL_H
44# define EV_USE_POLL 1
45# endif
46
47# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
48# define EV_USE_EPOLL 1
49# endif
50
51# if HAVE_KQUEUE && HAVE_WORKING_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H
52# define EV_USE_KQUEUE 1
53# endif
54
33#endif 55#endif
34 56
35#include <math.h> 57#include <math.h>
36#include <stdlib.h> 58#include <stdlib.h>
37#include <unistd.h> 59#include <unistd.h>
… …
68# define EV_USE_EPOLL 0 90# define EV_USE_EPOLL 0
69#endif 91#endif
70 92
71#ifndef EV_USE_KQUEUE 93#ifndef EV_USE_KQUEUE
72# define EV_USE_KQUEUE 0 94# define EV_USE_KQUEUE 0
95#endif
96
97#ifndef EV_USE_WIN32
98# ifdef WIN32
99# define EV_USE_WIN32 1
100# else
101# define EV_USE_WIN32 0
102# endif
73#endif 103#endif
74 104
75#ifndef EV_USE_REALTIME 105#ifndef EV_USE_REALTIME
76# define EV_USE_REALTIME 1 106# define EV_USE_REALTIME 1
77#endif 107#endif
… …
202 base = realloc (base, sizeof (*base) * (newcnt)); \ 232 base = realloc (base, sizeof (*base) * (newcnt)); \
203 init (base + cur, newcnt - cur); \ 233 init (base + cur, newcnt - cur); \
204 cur = newcnt; \ 234 cur = newcnt; \
205 } 235 }
206 236
237#define array_free(stem, idx) \
238 free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
239
207/*****************************************************************************/ 240/*****************************************************************************/
208 241
209static void 242static void
210anfds_init (ANFD *base, int count) 243anfds_init (ANFD *base, int count)
211{ 244{
… …
276 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 309 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
277 events |= w->events; 310 events |= w->events;
278 311
279 anfd->reify = 0; 312 anfd->reify = 0;
280 313
281 if (anfd->events != events)
282 {
283 method_modify (EV_A_ fd, anfd->events, events); 314 method_modify (EV_A_ fd, anfd->events, events);
284 anfd->events = events; 315 anfd->events = events;
285 }
286 } 316 }
287 317
288 fdchangecnt = 0; 318 fdchangecnt = 0;
289} 319}
290 320
… …
327 357
328/* called on ENOMEM in select/poll to kill some fds and retry */ 358/* called on ENOMEM in select/poll to kill some fds and retry */
329static void 359static void
330fd_enomem (EV_P) 360fd_enomem (EV_P)
331{ 361{
332 int fd = anfdmax; 362 int fd;
333 363
334 while (fd--) 364 for (fd = anfdmax; fd--; )
335 if (anfds [fd].events) 365 if (anfds [fd].events)
336 { 366 {
337 close (fd); 367 close (fd);
338 fd_kill (EV_A_ fd); 368 fd_kill (EV_A_ fd);
339 return; 369 return;
… …
349 /* this should be highly optimised to not do anything but set a flag */ 379 /* this should be highly optimised to not do anything but set a flag */
350 for (fd = 0; fd < anfdmax; ++fd) 380 for (fd = 0; fd < anfdmax; ++fd)
351 if (anfds [fd].events) 381 if (anfds [fd].events)
352 { 382 {
353 anfds [fd].events = 0; 383 anfds [fd].events = 0;
354 fd_change (fd); 384 fd_change (EV_A_ fd);
355 } 385 }
356} 386}
357 387
358/*****************************************************************************/ 388/*****************************************************************************/
359 389
… …
363 WT w = heap [k]; 393 WT w = heap [k];
364 394
365 while (k && heap [k >> 1]->at > w->at) 395 while (k && heap [k >> 1]->at > w->at)
366 { 396 {
367 heap [k] = heap [k >> 1]; 397 heap [k] = heap [k >> 1];
368 heap [k]->active = k + 1; 398 ((W)heap [k])->active = k + 1;
369 k >>= 1; 399 k >>= 1;
370 } 400 }
371 401
372 heap [k] = w; 402 heap [k] = w;
373 heap [k]->active = k + 1; 403 ((W)heap [k])->active = k + 1;
374 404
375} 405}
376 406
377static void 407static void
378downheap (WT *heap, int N, int k) 408downheap (WT *heap, int N, int k)
… …
388 418
389 if (w->at <= heap [j]->at) 419 if (w->at <= heap [j]->at)
390 break; 420 break;
391 421
392 heap [k] = heap [j]; 422 heap [k] = heap [j];
393 heap [k]->active = k + 1; 423 ((W)heap [k])->active = k + 1;
394 k = j; 424 k = j;
395 } 425 }
396 426
397 heap [k] = w; 427 heap [k] = w;
398 heap [k]->active = k + 1; 428 ((W)heap [k])->active = k + 1;
399} 429}
400 430
401/*****************************************************************************/ 431/*****************************************************************************/
402 432
403typedef struct 433typedef struct
… …
492 struct ev_child *w; 522 struct ev_child *w;
493 523
494 for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next) 524 for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next)
495 if (w->pid == pid || !w->pid) 525 if (w->pid == pid || !w->pid)
496 { 526 {
497 w->priority = sw->priority; /* need to do it *now* */ 527 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
498 w->rpid = pid; 528 w->rpid = pid;
499 w->rstatus = status; 529 w->rstatus = status;
500 event (EV_A_ (W)w, EV_CHILD); 530 event (EV_A_ (W)w, EV_CHILD);
501 } 531 }
502} 532}
503 533
504static void 534static void
… …
586 methods = atoi (getenv ("LIBEV_METHODS")); 616 methods = atoi (getenv ("LIBEV_METHODS"));
587 else 617 else
588 methods = EVMETHOD_ANY; 618 methods = EVMETHOD_ANY;
589 619
590 method = 0; 620 method = 0;
621#if EV_USE_WIN32
622 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods);
623#endif
591#if EV_USE_KQUEUE 624#if EV_USE_KQUEUE
592 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 625 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods);
593#endif 626#endif
594#if EV_USE_EPOLL 627#if EV_USE_EPOLL
595 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 628 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods);
… …
604} 637}
605 638
606void 639void
607loop_destroy (EV_P) 640loop_destroy (EV_P)
608{ 641{
642 int i;
643
644#if EV_USE_WIN32
645 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A);
646#endif
609#if EV_USE_KQUEUE 647#if EV_USE_KQUEUE
610 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 648 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
611#endif 649#endif
612#if EV_USE_EPOLL 650#if EV_USE_EPOLL
613 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 651 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
… …
616 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 654 if (method == EVMETHOD_POLL ) poll_destroy (EV_A);
617#endif 655#endif
618#if EV_USE_SELECT 656#if EV_USE_SELECT
619 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 657 if (method == EVMETHOD_SELECT) select_destroy (EV_A);
620#endif 658#endif
659
660 for (i = NUMPRI; i--; )
661 array_free (pending, [i]);
662
663 array_free (fdchange, );
664 array_free (timer, );
665 array_free (periodic, );
666 array_free (idle, );
667 array_free (prepare, );
668 array_free (check, );
621 669
622 method = 0; 670 method = 0;
623 /*TODO*/ 671 /*TODO*/
624} 672}
625 673
… …
641{ 689{
642 struct ev_loop *loop = (struct ev_loop *)calloc (1, sizeof (struct ev_loop)); 690 struct ev_loop *loop = (struct ev_loop *)calloc (1, sizeof (struct ev_loop));
643 691
644 loop_init (EV_A_ methods); 692 loop_init (EV_A_ methods);
645 693
646 if (ev_methods (EV_A)) 694 if (ev_method (EV_A))
647 return loop; 695 return loop;
648 696
649 return 0; 697 return 0;
650} 698}
651 699
… …
728 776
729 loop_destroy (EV_A); 777 loop_destroy (EV_A);
730} 778}
731 779
732void 780void
733ev_default_fork (EV_P) 781ev_default_fork (void)
734{ 782{
783#if EV_MULTIPLICITY
784 struct ev_loop *loop = default_loop;
785#endif
786
735 loop_fork (EV_A); 787 loop_fork (EV_A);
736 788
737 ev_io_stop (EV_A_ &sigev); 789 ev_io_stop (EV_A_ &sigev);
738 close (sigpipe [0]); 790 close (sigpipe [0]);
739 close (sigpipe [1]); 791 close (sigpipe [1]);
… …
764} 816}
765 817
766static void 818static void
767timers_reify (EV_P) 819timers_reify (EV_P)
768{ 820{
769 while (timercnt && timers [0]->at <= mn_now) 821 while (timercnt && ((WT)timers [0])->at <= mn_now)
770 { 822 {
771 struct ev_timer *w = timers [0]; 823 struct ev_timer *w = timers [0];
824
825 assert (("inactive timer on timer heap detected", ev_is_active (w)));
772 826
773 /* first reschedule or stop timer */ 827 /* first reschedule or stop timer */
774 if (w->repeat) 828 if (w->repeat)
775 { 829 {
776 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 830 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
777 w->at = mn_now + w->repeat; 831 ((WT)w)->at = mn_now + w->repeat;
778 downheap ((WT *)timers, timercnt, 0); 832 downheap ((WT *)timers, timercnt, 0);
779 } 833 }
780 else 834 else
781 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 835 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
782 836
… …
785} 839}
786 840
787static void 841static void
788periodics_reify (EV_P) 842periodics_reify (EV_P)
789{ 843{
790 while (periodiccnt && periodics [0]->at <= rt_now) 844 while (periodiccnt && ((WT)periodics [0])->at <= rt_now)
791 { 845 {
792 struct ev_periodic *w = periodics [0]; 846 struct ev_periodic *w = periodics [0];
847
848 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
793 849
794 /* first reschedule or stop timer */ 850 /* first reschedule or stop timer */
795 if (w->interval) 851 if (w->interval)
796 { 852 {
797 w->at += floor ((rt_now - w->at) / w->interval + 1.) * w->interval; 853 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
798 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", w->at > rt_now)); 854 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now));
799 downheap ((WT *)periodics, periodiccnt, 0); 855 downheap ((WT *)periodics, periodiccnt, 0);
800 } 856 }
801 else 857 else
802 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 858 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
803 859
… …
815 { 871 {
816 struct ev_periodic *w = periodics [i]; 872 struct ev_periodic *w = periodics [i];
817 873
818 if (w->interval) 874 if (w->interval)
819 { 875 {
820 ev_tstamp diff = ceil ((rt_now - w->at) / w->interval) * w->interval; 876 ev_tstamp diff = ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;
821 877
822 if (fabs (diff) >= 1e-4) 878 if (fabs (diff) >= 1e-4)
823 { 879 {
824 ev_periodic_stop (EV_A_ w); 880 ev_periodic_stop (EV_A_ w);
825 ev_periodic_start (EV_A_ w); 881 ev_periodic_start (EV_A_ w);
… …
886 { 942 {
887 periodics_reschedule (EV_A); 943 periodics_reschedule (EV_A);
888 944
889 /* adjust timers. this is easy, as the offset is the same for all */ 945 /* adjust timers. this is easy, as the offset is the same for all */
890 for (i = 0; i < timercnt; ++i) 946 for (i = 0; i < timercnt; ++i)
891 timers [i]->at += rt_now - mn_now; 947 ((WT)timers [i])->at += rt_now - mn_now;
892 } 948 }
893 949
894 mn_now = rt_now; 950 mn_now = rt_now;
895 } 951 }
896} 952}
… …
947 { 1003 {
948 block = MAX_BLOCKTIME; 1004 block = MAX_BLOCKTIME;
949 1005
950 if (timercnt) 1006 if (timercnt)
951 { 1007 {
952 ev_tstamp to = timers [0]->at - mn_now + method_fudge; 1008 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
953 if (block > to) block = to; 1009 if (block > to) block = to;
954 } 1010 }
955 1011
956 if (periodiccnt) 1012 if (periodiccnt)
957 { 1013 {
958 ev_tstamp to = periodics [0]->at - rt_now + method_fudge; 1014 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge;
959 if (block > to) block = to; 1015 if (block > to) block = to;
960 } 1016 }
961 1017
962 if (block < 0.) block = 0.; 1018 if (block < 0.) block = 0.;
963 } 1019 }
… …
1080ev_timer_start (EV_P_ struct ev_timer *w) 1136ev_timer_start (EV_P_ struct ev_timer *w)
1081{ 1137{
1082 if (ev_is_active (w)) 1138 if (ev_is_active (w))
1083 return; 1139 return;
1084 1140
1085 w->at += mn_now; 1141 ((WT)w)->at += mn_now;
1086 1142
1087 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1143 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1088 1144
1089 ev_start (EV_A_ (W)w, ++timercnt); 1145 ev_start (EV_A_ (W)w, ++timercnt);
1090 array_needsize (timers, timermax, timercnt, ); 1146 array_needsize (timers, timermax, timercnt, );
1091 timers [timercnt - 1] = w; 1147 timers [timercnt - 1] = w;
1092 upheap ((WT *)timers, timercnt - 1); 1148 upheap ((WT *)timers, timercnt - 1);
1149
1150 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1093} 1151}
1094 1152
1095void 1153void
1096ev_timer_stop (EV_P_ struct ev_timer *w) 1154ev_timer_stop (EV_P_ struct ev_timer *w)
1097{ 1155{
1098 ev_clear_pending (EV_A_ (W)w); 1156 ev_clear_pending (EV_A_ (W)w);
1099 if (!ev_is_active (w)) 1157 if (!ev_is_active (w))
1100 return; 1158 return;
1101 1159
1160 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1161
1102 if (w->active < timercnt--) 1162 if (((W)w)->active < timercnt--)
1103 { 1163 {
1104 timers [w->active - 1] = timers [timercnt]; 1164 timers [((W)w)->active - 1] = timers [timercnt];
1105 downheap ((WT *)timers, timercnt, w->active - 1); 1165 downheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1106 } 1166 }
1107 1167
1108 w->at = w->repeat; 1168 ((WT)w)->at = w->repeat;
1109 1169
1110 ev_stop (EV_A_ (W)w); 1170 ev_stop (EV_A_ (W)w);
1111} 1171}
1112 1172
1113void 1173void
… …
1115{ 1175{
1116 if (ev_is_active (w)) 1176 if (ev_is_active (w))
1117 { 1177 {
1118 if (w->repeat) 1178 if (w->repeat)
1119 { 1179 {
1120 w->at = mn_now + w->repeat; 1180 ((WT)w)->at = mn_now + w->repeat;
1121 downheap ((WT *)timers, timercnt, w->active - 1); 1181 downheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1122 } 1182 }
1123 else 1183 else
1124 ev_timer_stop (EV_A_ w); 1184 ev_timer_stop (EV_A_ w);
1125 } 1185 }
1126 else if (w->repeat) 1186 else if (w->repeat)
… …
1135 1195
1136 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1196 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1137 1197
1138 /* this formula differs from the one in periodic_reify because we do not always round up */ 1198 /* this formula differs from the one in periodic_reify because we do not always round up */
1139 if (w->interval) 1199 if (w->interval)
1140 w->at += ceil ((rt_now - w->at) / w->interval) * w->interval; 1200 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;
1141 1201
1142 ev_start (EV_A_ (W)w, ++periodiccnt); 1202 ev_start (EV_A_ (W)w, ++periodiccnt);
1143 array_needsize (periodics, periodicmax, periodiccnt, ); 1203 array_needsize (periodics, periodicmax, periodiccnt, );
1144 periodics [periodiccnt - 1] = w; 1204 periodics [periodiccnt - 1] = w;
1145 upheap ((WT *)periodics, periodiccnt - 1); 1205 upheap ((WT *)periodics, periodiccnt - 1);
1206
1207 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1146} 1208}
1147 1209
1148void 1210void
1149ev_periodic_stop (EV_P_ struct ev_periodic *w) 1211ev_periodic_stop (EV_P_ struct ev_periodic *w)
1150{ 1212{
1151 ev_clear_pending (EV_A_ (W)w); 1213 ev_clear_pending (EV_A_ (W)w);
1152 if (!ev_is_active (w)) 1214 if (!ev_is_active (w))
1153 return; 1215 return;
1154 1216
1217 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1218
1155 if (w->active < periodiccnt--) 1219 if (((W)w)->active < periodiccnt--)
1156 { 1220 {
1157 periodics [w->active - 1] = periodics [periodiccnt]; 1221 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1158 downheap ((WT *)periodics, periodiccnt, w->active - 1); 1222 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1159 } 1223 }
1160 1224
1161 ev_stop (EV_A_ (W)w); 1225 ev_stop (EV_A_ (W)w);
1162} 1226}
1163 1227
… …
1177{ 1241{
1178 ev_clear_pending (EV_A_ (W)w); 1242 ev_clear_pending (EV_A_ (W)w);
1179 if (ev_is_active (w)) 1243 if (ev_is_active (w))
1180 return; 1244 return;
1181 1245
1182 idles [w->active - 1] = idles [--idlecnt]; 1246 idles [((W)w)->active - 1] = idles [--idlecnt];
1183 ev_stop (EV_A_ (W)w); 1247 ev_stop (EV_A_ (W)w);
1184} 1248}
1185 1249
1186void 1250void
1187ev_prepare_start (EV_P_ struct ev_prepare *w) 1251ev_prepare_start (EV_P_ struct ev_prepare *w)
… …
1199{ 1263{
1200 ev_clear_pending (EV_A_ (W)w); 1264 ev_clear_pending (EV_A_ (W)w);
1201 if (ev_is_active (w)) 1265 if (ev_is_active (w))
1202 return; 1266 return;
1203 1267
1204 prepares [w->active - 1] = prepares [--preparecnt]; 1268 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1205 ev_stop (EV_A_ (W)w); 1269 ev_stop (EV_A_ (W)w);
1206} 1270}
1207 1271
1208void 1272void
1209ev_check_start (EV_P_ struct ev_check *w) 1273ev_check_start (EV_P_ struct ev_check *w)
… …
1221{ 1285{
1222 ev_clear_pending (EV_A_ (W)w); 1286 ev_clear_pending (EV_A_ (W)w);
1223 if (ev_is_active (w)) 1287 if (ev_is_active (w))
1224 return; 1288 return;
1225 1289
1226 checks [w->active - 1] = checks [--checkcnt]; 1290 checks [((W)w)->active - 1] = checks [--checkcnt];
1227 ev_stop (EV_A_ (W)w); 1291 ev_stop (EV_A_ (W)w);
1228} 1292}
1229 1293
1230#ifndef SA_RESTART 1294#ifndef SA_RESTART
1231# define SA_RESTART 0 1295# define SA_RESTART 0
… …
1244 1308
1245 ev_start (EV_A_ (W)w, 1); 1309 ev_start (EV_A_ (W)w, 1);
1246 array_needsize (signals, signalmax, w->signum, signals_init); 1310 array_needsize (signals, signalmax, w->signum, signals_init);
1247 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1311 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1248 1312
1249 if (!w->next) 1313 if (!((WL)w)->next)
1250 { 1314 {
1251 struct sigaction sa; 1315 struct sigaction sa;
1252 sa.sa_handler = sighandler; 1316 sa.sa_handler = sighandler;
1253 sigfillset (&sa.sa_mask); 1317 sigfillset (&sa.sa_mask);
1254 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 1318 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */

Diff Legend

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