ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/EV/EV.xs
(Generate patch)

Comparing EV/EV.xs (file contents):
Revision 1.126 by root, Tue Jul 14 00:09:59 2009 UTC vs.
Revision 1.134 by root, Fri Sep 18 21:28:33 2009 UTC

… …
5/* fix perl api breakage */ 5/* fix perl api breakage */
6#undef signal 6#undef signal
7#undef sigaction 7#undef sigaction
8 8
9#include "schmorp.h" 9#include "schmorp.h"
10
11/* old API compatibility */
12static int
13sv_fileno (SV *fh)
14{
15 return s_fileno (fh, 0);
16}
10 17
11#define EV_PROTOTYPES 1 18#define EV_PROTOTYPES 1
12#define EV_USE_NANOSLEEP EV_USE_MONOTONIC 19#define EV_USE_NANOSLEEP EV_USE_MONOTONIC
13#define EV_H <ev.h> 20#define EV_H <ev.h>
14#include "EV/EVAPI.h" 21#include "EV/EVAPI.h"
… …
57 REF (w); \ 64 REF (w); \
58 ev_ ## type ## _stop (e_loop (w), w); \ 65 ev_ ## type ## _stop (e_loop (w), w); \
59 } while (0) 66 } while (0)
60 67
61#define RESET(type,w,seta) \ 68#define RESET(type,w,seta) \
62 do { \ 69 do { \
63 int active = ev_is_active (w); \ 70 int active = ev_is_active (w); \
64 if (active) STOP (type, w); \ 71 if (active) STOP (type, w); \
65 ev_ ## type ## _set seta; \ 72 ev_ ## type ## _set seta; \
66 if (active) START (type, w); \ 73 if (active) START (type, w); \
67 } while (0) 74 } while (0)
68 75
69typedef int Signal; 76typedef int Signal;
77
78/* horrible... */
79#define CHECK_SIGNAL_CAN_START(w) \
80 do { \
81 /* dive into the internals of libev to avoid aborting in libev */ \
82 if (signals [(w)->signum - 1].loop \
83 && signals [(w)->signum - 1].loop != e_loop (w)) \
84 croak ("unable to start signal watcher, signal %d already registered in another loop", w->signum); \
85 } while (0)
86
87#define START_SIGNAL(w) \
88 do { \
89 CHECK_SIGNAL_CAN_START (w); \
90 START (signal, w); \
91 } while (0) \
92
93#define RESET_SIGNAL(w,seta) \
94 do { \
95 int active = ev_is_active (w); \
96 if (active) STOP (signal, w); \
97 ev_ ## signal ## _set seta; \
98 if (active) START_SIGNAL (w); \
99 } while (0)
70 100
71static SV *default_loop_sv; 101static SV *default_loop_sv;
72 102
73static struct EVAPI evapi; 103static struct EVAPI evapi;
74 104
… …
356 const_iv (EV, BACKEND_POLL) 386 const_iv (EV, BACKEND_POLL)
357 const_iv (EV, BACKEND_EPOLL) 387 const_iv (EV, BACKEND_EPOLL)
358 const_iv (EV, BACKEND_KQUEUE) 388 const_iv (EV, BACKEND_KQUEUE)
359 const_iv (EV, BACKEND_DEVPOLL) 389 const_iv (EV, BACKEND_DEVPOLL)
360 const_iv (EV, BACKEND_PORT) 390 const_iv (EV, BACKEND_PORT)
391 const_iv (EV, BACKEND_ALL)
361 const_iv (EV, FLAG_AUTO) 392 const_iv (EV, FLAG_AUTO)
393 const_iv (EV, FLAG_FORKCHECK)
362 const_iv (EV, FLAG_NOENV) 394 const_iv (EV, FLAG_NOENV)
363 const_iv (EV, FLAG_FORKCHECK) 395 const_iv (EV, FLAG_NOSIGFD)
396 const_iv (EV, FLAG_NOINOTIFY)
364 397
365 const_iv (EV_, VERSION_MAJOR) 398 const_iv (EV_, VERSION_MAJOR)
366 const_iv (EV_, VERSION_MINOR) 399 const_iv (EV_, VERSION_MINOR)
367 }; 400 };
368 401
… …
389 perl_get_sv ("EV::API", TRUE); /* silence 5.10 warning */ 422 perl_get_sv ("EV::API", TRUE); /* silence 5.10 warning */
390 423
391 /* the poor man's shared library emulator */ 424 /* the poor man's shared library emulator */
392 evapi.ver = EV_API_VERSION; 425 evapi.ver = EV_API_VERSION;
393 evapi.rev = EV_API_REVISION; 426 evapi.rev = EV_API_REVISION;
394 evapi.sv_fileno = s_fileno; 427 evapi.sv_fileno = sv_fileno;
395 evapi.sv_signum = s_signum; 428 evapi.sv_signum = s_signum;
396 evapi.supported_backends = ev_supported_backends (); 429 evapi.supported_backends = ev_supported_backends ();
397 evapi.recommended_backends = ev_recommended_backends (); 430 evapi.recommended_backends = ev_recommended_backends ();
398 evapi.embeddable_backends = ev_embeddable_backends (); 431 evapi.embeddable_backends = ev_embeddable_backends ();
399 evapi.time_ = ev_time; 432 evapi.time_ = ev_time;
… …
410 evapi.suspend = ev_suspend; 443 evapi.suspend = ev_suspend;
411 evapi.resume = ev_resume; 444 evapi.resume = ev_resume;
412 evapi.backend = ev_backend; 445 evapi.backend = ev_backend;
413 evapi.unloop = ev_unloop; 446 evapi.unloop = ev_unloop;
414 evapi.invoke_pending = ev_invoke_pending; 447 evapi.invoke_pending = ev_invoke_pending;
448 evapi.pending_count = ev_pending_count;
415 evapi.set_loop_release_cb = ev_set_loop_release_cb; 449 evapi.set_loop_release_cb = ev_set_loop_release_cb;
416 evapi.set_invoke_pending_cb= ev_set_invoke_pending_cb; 450 evapi.set_invoke_pending_cb= ev_set_invoke_pending_cb;
417 evapi.ref = ev_ref; 451 evapi.ref = ev_ref;
418 evapi.unref = ev_unref; 452 evapi.unref = ev_unref;
419 evapi.loop = ev_loop; 453 evapi.loop = ev_loop;
… …
421 evapi.io_start = ev_io_start; 455 evapi.io_start = ev_io_start;
422 evapi.io_stop = ev_io_stop; 456 evapi.io_stop = ev_io_stop;
423 evapi.timer_start = ev_timer_start; 457 evapi.timer_start = ev_timer_start;
424 evapi.timer_stop = ev_timer_stop; 458 evapi.timer_stop = ev_timer_stop;
425 evapi.timer_again = ev_timer_again; 459 evapi.timer_again = ev_timer_again;
460 evapi.timer_remaining = ev_timer_remaining;
426 evapi.periodic_start = ev_periodic_start; 461 evapi.periodic_start = ev_periodic_start;
427 evapi.periodic_stop = ev_periodic_stop; 462 evapi.periodic_stop = ev_periodic_stop;
428 evapi.signal_start = ev_signal_start; 463 evapi.signal_start = ev_signal_start;
429 evapi.signal_stop = ev_signal_stop; 464 evapi.signal_stop = ev_signal_stop;
430 evapi.idle_start = ev_idle_start; 465 evapi.idle_start = ev_idle_start;
… …
537 CHECK_SIG (signal, signum); 572 CHECK_SIG (signal, signum);
538 573
539 ev_feed_signal_event (evapi.default_loop, signum); 574 ev_feed_signal_event (evapi.default_loop, signum);
540} 575}
541 576
577unsigned int ev_pending_count ()
578 C_ARGS: evapi.default_loop
579
580void ev_invoke_pending ()
581 C_ARGS: evapi.default_loop
582
542ev_io *io (SV *fh, int events, SV *cb) 583ev_io *io (SV *fh, int events, SV *cb)
543 ALIAS: 584 ALIAS:
544 io_ns = 1 585 io_ns = 1
586 _ae_io = 2
545 CODE: 587 CODE:
546{ 588{
547 int fd = s_fileno (fh, events & EV_WRITE); 589 int fd = s_fileno (fh, events & EV_WRITE);
548 CHECK_FD (fh, fd); 590 CHECK_FD (fh, fd);
591
592 if (ix == 2)
593 {
594 ix = 0;
595 events = events ? EV_WRITE : EV_READ;
596 }
549 597
550 RETVAL = e_new (sizeof (ev_io), cb, default_loop_sv); 598 RETVAL = e_new (sizeof (ev_io), cb, default_loop_sv);
551 RETVAL->fh = newSVsv (fh); 599 RETVAL->fh = newSVsv (fh);
552 ev_io_set (RETVAL, fd, events); 600 ev_io_set (RETVAL, fd, events);
553 if (!ix) START (io, RETVAL); 601 if (!ix) START (io, RETVAL);
… …
592 Signal signum = s_signum (signal); 640 Signal signum = s_signum (signal);
593 CHECK_SIG (signal, signum); 641 CHECK_SIG (signal, signum);
594 642
595 RETVAL = e_new (sizeof (ev_signal), cb, default_loop_sv); 643 RETVAL = e_new (sizeof (ev_signal), cb, default_loop_sv);
596 ev_signal_set (RETVAL, signum); 644 ev_signal_set (RETVAL, signum);
597 if (!ix) START (signal, RETVAL); 645 if (!ix) START_SIGNAL (RETVAL);
598} 646}
599 OUTPUT: 647 OUTPUT:
600 RETVAL 648 RETVAL
601 649
602ev_idle *idle (SV *cb) 650ev_idle *idle (SV *cb)
… …
853 901
854MODULE = EV PACKAGE = EV::Signal PREFIX = ev_signal_ 902MODULE = EV PACKAGE = EV::Signal PREFIX = ev_signal_
855 903
856void ev_signal_start (ev_signal *w) 904void ev_signal_start (ev_signal *w)
857 CODE: 905 CODE:
858 START (signal, w); 906 START_SIGNAL (w);
859 907
860void ev_signal_stop (ev_signal *w) 908void ev_signal_stop (ev_signal *w)
861 CODE: 909 CODE:
862 STOP (signal, w); 910 STOP (signal, w);
863 911
… …
870 CODE: 918 CODE:
871{ 919{
872 Signal signum = s_signum (signal); 920 Signal signum = s_signum (signal);
873 CHECK_SIG (signal, signum); 921 CHECK_SIG (signal, signum);
874 922
875 RESET (signal, w, (w, signum)); 923 RESET_SIGNAL (w, (w, signum));
876} 924}
877 925
878int signal (ev_signal *w, SV *new_signal = 0) 926int signal (ev_signal *w, SV *new_signal = 0)
879 CODE: 927 CODE:
880{ 928{
… …
883 if (items > 1) 931 if (items > 1)
884 { 932 {
885 Signal signum = s_signum (new_signal); 933 Signal signum = s_signum (new_signal);
886 CHECK_SIG (new_signal, signum); 934 CHECK_SIG (new_signal, signum);
887 935
888 RESET (signal, w, (w, signum)); 936 RESET_SIGNAL (w, (w, signum));
889 } 937 }
890} 938}
891 OUTPUT: 939 OUTPUT:
892 RETVAL 940 RETVAL
893 941
… …
907 INIT: 955 INIT:
908 CHECK_REPEAT (w->repeat); 956 CHECK_REPEAT (w->repeat);
909 CODE: 957 CODE:
910 ev_timer_again (e_loop (w), w); 958 ev_timer_again (e_loop (w), w);
911 UNREF (w); 959 UNREF (w);
960
961NV ev_timer_remaining (ev_timer *w)
962 C_ARGS: e_loop (w), w
912 963
913void DESTROY (ev_timer *w) 964void DESTROY (ev_timer *w)
914 CODE: 965 CODE:
915 STOP (timer, w); 966 STOP (timer, w);
916 e_destroy (w); 967 e_destroy (w);
… …
1245 1296
1246void ev_unloop (struct ev_loop *loop, int how = 1) 1297void ev_unloop (struct ev_loop *loop, int how = 1)
1247 1298
1248void ev_feed_fd_event (struct ev_loop *loop, int fd, int revents = EV_NONE) 1299void ev_feed_fd_event (struct ev_loop *loop, int fd, int revents = EV_NONE)
1249 1300
1301unsigned int ev_pending_count (struct ev_loop *loop)
1302
1303void ev_invoke_pending (struct ev_loop *loop)
1304
1250#if 0 1305#if 0
1251 1306
1252void ev_feed_signal_event (struct ev_loop *loop, SV *signal) 1307void ev_feed_signal_event (struct ev_loop *loop, SV *signal)
1253 CODE: 1308 CODE:
1254{ 1309{
… …
1303 if (!ix) START (periodic, w); 1358 if (!ix) START (periodic, w);
1304} 1359}
1305 OUTPUT: 1360 OUTPUT:
1306 RETVAL 1361 RETVAL
1307 1362
1308#if 0
1309
1310ev_signal *signal (struct ev_loop *loop, SV *signal, SV *cb) 1363ev_signal *signal (struct ev_loop *loop, SV *signal, SV *cb)
1311 ALIAS: 1364 ALIAS:
1312 signal_ns = 1 1365 signal_ns = 1
1313 CODE: 1366 CODE:
1314{ 1367{
1315 Signal signum = s_signum (signal); 1368 Signal signum = s_signum (signal);
1316 CHECK_SIG (signal, signum); 1369 CHECK_SIG (signal, signum);
1317 1370
1318 RETVAL = e_new (sizeof (ev_signal), cb, ST (0)); 1371 RETVAL = e_new (sizeof (ev_signal), cb, ST (0));
1319 ev_signal_set (RETVAL, signum); 1372 ev_signal_set (RETVAL, signum);
1320 if (!ix) START (signal, RETVAL); 1373 if (!ix) START_SIGNAL (RETVAL);
1321} 1374}
1322 OUTPUT: 1375 OUTPUT:
1323 RETVAL 1376 RETVAL
1324
1325#endif
1326 1377
1327ev_idle *idle (struct ev_loop *loop, SV *cb) 1378ev_idle *idle (struct ev_loop *loop, SV *cb)
1328 ALIAS: 1379 ALIAS:
1329 idle_ns = 1 1380 idle_ns = 1
1330 CODE: 1381 CODE:

Diff Legend

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