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.133 by root, Sun Aug 9 13:30:41 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
… …
389 perl_get_sv ("EV::API", TRUE); /* silence 5.10 warning */ 419 perl_get_sv ("EV::API", TRUE); /* silence 5.10 warning */
390 420
391 /* the poor man's shared library emulator */ 421 /* the poor man's shared library emulator */
392 evapi.ver = EV_API_VERSION; 422 evapi.ver = EV_API_VERSION;
393 evapi.rev = EV_API_REVISION; 423 evapi.rev = EV_API_REVISION;
394 evapi.sv_fileno = s_fileno; 424 evapi.sv_fileno = sv_fileno;
395 evapi.sv_signum = s_signum; 425 evapi.sv_signum = s_signum;
396 evapi.supported_backends = ev_supported_backends (); 426 evapi.supported_backends = ev_supported_backends ();
397 evapi.recommended_backends = ev_recommended_backends (); 427 evapi.recommended_backends = ev_recommended_backends ();
398 evapi.embeddable_backends = ev_embeddable_backends (); 428 evapi.embeddable_backends = ev_embeddable_backends ();
399 evapi.time_ = ev_time; 429 evapi.time_ = ev_time;
… …
410 evapi.suspend = ev_suspend; 440 evapi.suspend = ev_suspend;
411 evapi.resume = ev_resume; 441 evapi.resume = ev_resume;
412 evapi.backend = ev_backend; 442 evapi.backend = ev_backend;
413 evapi.unloop = ev_unloop; 443 evapi.unloop = ev_unloop;
414 evapi.invoke_pending = ev_invoke_pending; 444 evapi.invoke_pending = ev_invoke_pending;
445 evapi.pending_count = ev_pending_count;
415 evapi.set_loop_release_cb = ev_set_loop_release_cb; 446 evapi.set_loop_release_cb = ev_set_loop_release_cb;
416 evapi.set_invoke_pending_cb= ev_set_invoke_pending_cb; 447 evapi.set_invoke_pending_cb= ev_set_invoke_pending_cb;
417 evapi.ref = ev_ref; 448 evapi.ref = ev_ref;
418 evapi.unref = ev_unref; 449 evapi.unref = ev_unref;
419 evapi.loop = ev_loop; 450 evapi.loop = ev_loop;
… …
421 evapi.io_start = ev_io_start; 452 evapi.io_start = ev_io_start;
422 evapi.io_stop = ev_io_stop; 453 evapi.io_stop = ev_io_stop;
423 evapi.timer_start = ev_timer_start; 454 evapi.timer_start = ev_timer_start;
424 evapi.timer_stop = ev_timer_stop; 455 evapi.timer_stop = ev_timer_stop;
425 evapi.timer_again = ev_timer_again; 456 evapi.timer_again = ev_timer_again;
457 evapi.timer_remaining = ev_timer_remaining;
426 evapi.periodic_start = ev_periodic_start; 458 evapi.periodic_start = ev_periodic_start;
427 evapi.periodic_stop = ev_periodic_stop; 459 evapi.periodic_stop = ev_periodic_stop;
428 evapi.signal_start = ev_signal_start; 460 evapi.signal_start = ev_signal_start;
429 evapi.signal_stop = ev_signal_stop; 461 evapi.signal_stop = ev_signal_stop;
430 evapi.idle_start = ev_idle_start; 462 evapi.idle_start = ev_idle_start;
… …
537 CHECK_SIG (signal, signum); 569 CHECK_SIG (signal, signum);
538 570
539 ev_feed_signal_event (evapi.default_loop, signum); 571 ev_feed_signal_event (evapi.default_loop, signum);
540} 572}
541 573
574unsigned int ev_pending_count ()
575 C_ARGS: evapi.default_loop
576
577void ev_invoke_pending ()
578 C_ARGS: evapi.default_loop
579
542ev_io *io (SV *fh, int events, SV *cb) 580ev_io *io (SV *fh, int events, SV *cb)
543 ALIAS: 581 ALIAS:
544 io_ns = 1 582 io_ns = 1
583 _ae_io = 2
545 CODE: 584 CODE:
546{ 585{
547 int fd = s_fileno (fh, events & EV_WRITE); 586 int fd = s_fileno (fh, events & EV_WRITE);
548 CHECK_FD (fh, fd); 587 CHECK_FD (fh, fd);
588
589 if (ix == 2)
590 {
591 ix = 0;
592 events = events ? EV_WRITE : EV_READ;
593 }
549 594
550 RETVAL = e_new (sizeof (ev_io), cb, default_loop_sv); 595 RETVAL = e_new (sizeof (ev_io), cb, default_loop_sv);
551 RETVAL->fh = newSVsv (fh); 596 RETVAL->fh = newSVsv (fh);
552 ev_io_set (RETVAL, fd, events); 597 ev_io_set (RETVAL, fd, events);
553 if (!ix) START (io, RETVAL); 598 if (!ix) START (io, RETVAL);
… …
592 Signal signum = s_signum (signal); 637 Signal signum = s_signum (signal);
593 CHECK_SIG (signal, signum); 638 CHECK_SIG (signal, signum);
594 639
595 RETVAL = e_new (sizeof (ev_signal), cb, default_loop_sv); 640 RETVAL = e_new (sizeof (ev_signal), cb, default_loop_sv);
596 ev_signal_set (RETVAL, signum); 641 ev_signal_set (RETVAL, signum);
597 if (!ix) START (signal, RETVAL); 642 if (!ix) START_SIGNAL (RETVAL);
598} 643}
599 OUTPUT: 644 OUTPUT:
600 RETVAL 645 RETVAL
601 646
602ev_idle *idle (SV *cb) 647ev_idle *idle (SV *cb)
… …
853 898
854MODULE = EV PACKAGE = EV::Signal PREFIX = ev_signal_ 899MODULE = EV PACKAGE = EV::Signal PREFIX = ev_signal_
855 900
856void ev_signal_start (ev_signal *w) 901void ev_signal_start (ev_signal *w)
857 CODE: 902 CODE:
858 START (signal, w); 903 START_SIGNAL (w);
859 904
860void ev_signal_stop (ev_signal *w) 905void ev_signal_stop (ev_signal *w)
861 CODE: 906 CODE:
862 STOP (signal, w); 907 STOP (signal, w);
863 908
… …
870 CODE: 915 CODE:
871{ 916{
872 Signal signum = s_signum (signal); 917 Signal signum = s_signum (signal);
873 CHECK_SIG (signal, signum); 918 CHECK_SIG (signal, signum);
874 919
875 RESET (signal, w, (w, signum)); 920 RESET_SIGNAL (w, (w, signum));
876} 921}
877 922
878int signal (ev_signal *w, SV *new_signal = 0) 923int signal (ev_signal *w, SV *new_signal = 0)
879 CODE: 924 CODE:
880{ 925{
… …
883 if (items > 1) 928 if (items > 1)
884 { 929 {
885 Signal signum = s_signum (new_signal); 930 Signal signum = s_signum (new_signal);
886 CHECK_SIG (new_signal, signum); 931 CHECK_SIG (new_signal, signum);
887 932
888 RESET (signal, w, (w, signum)); 933 RESET_SIGNAL (w, (w, signum));
889 } 934 }
890} 935}
891 OUTPUT: 936 OUTPUT:
892 RETVAL 937 RETVAL
893 938
… …
907 INIT: 952 INIT:
908 CHECK_REPEAT (w->repeat); 953 CHECK_REPEAT (w->repeat);
909 CODE: 954 CODE:
910 ev_timer_again (e_loop (w), w); 955 ev_timer_again (e_loop (w), w);
911 UNREF (w); 956 UNREF (w);
957
958NV ev_timer_remaining (ev_timer *w)
959 C_ARGS: e_loop (w), w
912 960
913void DESTROY (ev_timer *w) 961void DESTROY (ev_timer *w)
914 CODE: 962 CODE:
915 STOP (timer, w); 963 STOP (timer, w);
916 e_destroy (w); 964 e_destroy (w);
… …
1245 1293
1246void ev_unloop (struct ev_loop *loop, int how = 1) 1294void ev_unloop (struct ev_loop *loop, int how = 1)
1247 1295
1248void ev_feed_fd_event (struct ev_loop *loop, int fd, int revents = EV_NONE) 1296void ev_feed_fd_event (struct ev_loop *loop, int fd, int revents = EV_NONE)
1249 1297
1298unsigned int ev_pending_count (struct ev_loop *loop)
1299
1300void ev_invoke_pending (struct ev_loop *loop)
1301
1250#if 0 1302#if 0
1251 1303
1252void ev_feed_signal_event (struct ev_loop *loop, SV *signal) 1304void ev_feed_signal_event (struct ev_loop *loop, SV *signal)
1253 CODE: 1305 CODE:
1254{ 1306{
… …
1303 if (!ix) START (periodic, w); 1355 if (!ix) START (periodic, w);
1304} 1356}
1305 OUTPUT: 1357 OUTPUT:
1306 RETVAL 1358 RETVAL
1307 1359
1308#if 0
1309
1310ev_signal *signal (struct ev_loop *loop, SV *signal, SV *cb) 1360ev_signal *signal (struct ev_loop *loop, SV *signal, SV *cb)
1311 ALIAS: 1361 ALIAS:
1312 signal_ns = 1 1362 signal_ns = 1
1313 CODE: 1363 CODE:
1314{ 1364{
1315 Signal signum = s_signum (signal); 1365 Signal signum = s_signum (signal);
1316 CHECK_SIG (signal, signum); 1366 CHECK_SIG (signal, signum);
1317 1367
1318 RETVAL = e_new (sizeof (ev_signal), cb, ST (0)); 1368 RETVAL = e_new (sizeof (ev_signal), cb, ST (0));
1319 ev_signal_set (RETVAL, signum); 1369 ev_signal_set (RETVAL, signum);
1320 if (!ix) START (signal, RETVAL); 1370 if (!ix) START_SIGNAL (RETVAL);
1321} 1371}
1322 OUTPUT: 1372 OUTPUT:
1323 RETVAL 1373 RETVAL
1324
1325#endif
1326 1374
1327ev_idle *idle (struct ev_loop *loop, SV *cb) 1375ev_idle *idle (struct ev_loop *loop, SV *cb)
1328 ALIAS: 1376 ALIAS:
1329 idle_ns = 1 1377 idle_ns = 1
1330 CODE: 1378 CODE:

Diff Legend

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