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

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.119 by root, Sun May 11 19:11:05 2008 UTC vs.
Revision 1.132 by root, Mon Oct 13 10:38:17 2008 UTC

… …
65# include <signal.h> 65# include <signal.h>
66# define EIO_STRUCT_DIRENT struct dirent 66# define EIO_STRUCT_DIRENT struct dirent
67 67
68#endif 68#endif
69 69
70/* perl stupidly overrides readdir and maybe others */
71/* with thread-unsafe versions, imagine that :( */
72#undef readdir
73#undef opendir
74#undef closedir
75
70#define EIO_STRUCT_STAT Stat_t 76#define EIO_STRUCT_STAT Stat_t
71 77
72/* use NV for 32 bit perls as it allows larger offsets */ 78/* use NV for 32 bit perls as it allows larger offsets */
73#if IVSIZE >= 8 79#if IVSIZE >= 8
74# define SvVAL64 SvIV 80# define SvVAL64 SvIV
75#else 81#else
76# define SvVAL64 SvNV 82# define SvVAL64 SvNV
77#endif 83#endif
78 84
85/*****************************************************************************/
86
87#if __GNUC__ >= 3
88# define expect(expr,value) __builtin_expect ((expr),(value))
89#else
90# define expect(expr,value) (expr)
91#endif
92
93#define expect_false(expr) expect ((expr) != 0, 0)
94#define expect_true(expr) expect ((expr) != 0, 1)
95
96/*****************************************************************************/
97
79static HV *stash; 98static HV *stash;
80typedef SV SV8; /* byte-sv, used for argument-checking */ 99typedef SV SV8; /* byte-sv, used for argument-checking */
81 100
82#define AIO_REQ_KLASS "IO::AIO::REQ" 101#define AIO_REQ_KLASS "IO::AIO::REQ"
83#define AIO_GRP_KLASS "IO::AIO::GRP" 102#define AIO_GRP_KLASS "IO::AIO::GRP"
84 103
85#define EIO_COMMON \ 104#define EIO_REQ_MEMBERS \
86 SV *callback; \ 105 SV *callback; \
87 SV *sv1, *sv2; \ 106 SV *sv1, *sv2; \
88 STRLEN stroffset; \ 107 STRLEN stroffset; \
89 SV *self 108 SV *self;
109
110#define EIO_NO_WRAPPERS 1
90 111
91#include "libeio/eio.h" 112#include "libeio/eio.h"
92 113
93static int req_invoke (eio_req *req); 114static int req_invoke (eio_req *req);
94#define EIO_FINISH(req) req_invoke (req) 115#define EIO_FINISH(req) req_invoke (req)
95static void aio_grp_feed (eio_req *grp);
96#define EIO_FEED(req) aio_grp_feed (req)
97static void req_destroy (eio_req *grp); 116static void req_destroy (eio_req *grp);
98#define EIO_DESTROY(req) req_destroy (req) 117#define EIO_DESTROY(req) req_destroy (req)
99 118
100enum { 119enum {
101 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ 120 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
… …
105 124
106typedef eio_req *aio_req; 125typedef eio_req *aio_req;
107typedef eio_req *aio_req_ornot; 126typedef eio_req *aio_req_ornot;
108 127
109static SV *on_next_submit; 128static SV *on_next_submit;
110static int next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; 129static int next_pri = EIO_PRI_DEFAULT;
111static int max_outstanding; 130static int max_outstanding;
112 131
113static int respipe_osf [2], respipe [2] = { -1, -1 }; 132static int respipe_osf [2], respipe [2] = { -1, -1 };
114 133
115static void req_destroy (aio_req req); 134static void req_destroy (aio_req req);
… …
173 192
174static void req_submit (eio_req *req) 193static void req_submit (eio_req *req)
175{ 194{
176 eio_submit (req); 195 eio_submit (req);
177 196
178 if (on_next_submit) 197 if (expect_false (on_next_submit))
179 { 198 {
180 dSP; 199 dSP;
181 SV *cb = sv_2mortal (on_next_submit); 200 SV *cb = sv_2mortal (on_next_submit);
182 201
183 on_next_submit = 0; 202 on_next_submit = 0;
… …
193 dSP; 212 dSP;
194 213
195 if (req->flags & FLAG_SV2_RO_OFF) 214 if (req->flags & FLAG_SV2_RO_OFF)
196 SvREADONLY_off (req->sv2); 215 SvREADONLY_off (req->sv2);
197 216
198 if (!EIO_CANCELLED (req) && SvOK (req->callback)) 217 if (!EIO_CANCELLED (req) && req->callback)
199 { 218 {
200 ENTER; 219 ENTER;
201 SAVETMPS; 220 SAVETMPS;
202 PUSHMARK (SP); 221 PUSHMARK (SP);
203 EXTEND (SP, 1); 222 EXTEND (SP, 1);
… …
410 X_UNLOCK (reslock); 429 X_UNLOCK (reslock);
411 430
412 if (size) 431 if (size)
413 return; 432 return;
414 433
415 maybe_start_thread (); 434 etp_maybe_start_thread ();
416 435
417 FD_ZERO (&rfd); 436 FD_ZERO (&rfd);
418 FD_SET (respipe [0], &rfd); 437 FD_SET (respipe [0], &rfd);
419 438
420 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0); 439 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
421 } 440 }
422} 441}
423 442
424static int poll_cb (void) 443static int poll_cb (void)
425{ 444{
426 int res; 445 for (;;)
427
428 do
429 { 446 {
430 res = eio_poll (); 447 int res = eio_poll ();
431 448
432 if (res > 0) 449 if (res > 0)
433 croak (0); 450 croak (0);
451
452 if (!max_outstanding || max_outstanding > eio_nreqs ())
453 return res;
454
455 poll_wait ();
434 } 456 }
435 while (max_outstanding && max_outstanding <= eio_nreqs ());
436
437 return res;
438} 457}
439 458
440static void atfork_child (void) 459static void atfork_child (void)
441{ 460{
442 create_respipe (); 461 create_respipe ();
443} 462}
444 463
464static SV *
465get_cb (SV *cb_sv)
466{
467 HV *st;
468 GV *gvp;
469 CV *cv;
470
471 if (!SvOK (cb_sv))
472 return 0;
473
474 cv = sv_2cv (cb_sv, &st, &gvp, 0);
475
476 if (!cv)
477 croak ("IO::AIO callback must be undef or a CODE reference");
478
479 return (SV *)cv;
480}
481
445#define dREQ \ 482#define dREQ \
483 SV *cb_cv; \
446 aio_req req; \ 484 aio_req req; \
447 int req_pri = next_pri; \ 485 int req_pri = next_pri; \
448 next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; \ 486 next_pri = EIO_PRI_DEFAULT; \
449 \ 487 \
450 if (SvOK (callback) && !SvROK (callback)) \ 488 cb_cv = get_cb (callback); \
451 croak ("callback must be undef or of reference type"); \
452 \ 489 \
453 Newz (0, req, 1, eio_req); \ 490 Newz (0, req, 1, eio_req); \
454 if (!req) \ 491 if (!req) \
455 croak ("out of memory during eio_req allocation"); \ 492 croak ("out of memory during eio_req allocation"); \
456 \ 493 \
457 req->callback = newSVsv (callback); \ 494 req->callback = SvREFCNT_inc (cb_cv); \
458 req->pri = req_pri 495 req->pri = req_pri
459 496
460#define REQ_SEND \ 497#define REQ_SEND \
498 PUTBACK; \
461 req_submit (req); \ 499 req_submit (req); \
500 SPAGAIN; \
462 \ 501 \
463 if (GIMME_V != G_VOID) \ 502 if (GIMME_V != G_VOID) \
464 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 503 XPUSHs (req_sv (req, AIO_REQ_KLASS));
465 504
466MODULE = IO::AIO PACKAGE = IO::AIO 505MODULE = IO::AIO PACKAGE = IO::AIO
… …
474 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 513 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
475 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 514 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
476 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 515 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
477 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 516 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
478 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 517 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
479#ifdef _WIN32 518#ifndef _WIN32
480 X_MUTEX_CHECK (wrklock);
481 X_MUTEX_CHECK (reslock);
482 X_MUTEX_CHECK (reqlock);
483 X_MUTEX_CHECK (reqwait);
484 X_MUTEX_CHECK (preadwritelock);
485 X_MUTEX_CHECK (readdirlock);
486
487 X_COND_CHECK (reqwait);
488#else
489 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 519 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
490#endif 520#endif
491 521
492 create_respipe (); 522 create_respipe ();
493 523
… …
787 req->int2 = mode; 817 req->int2 = mode;
788 req->sv1 = newSVsv (fh_or_path); 818 req->sv1 = newSVsv (fh_or_path);
789 819
790 if (SvPOK (req->sv1)) 820 if (SvPOK (req->sv1))
791 { 821 {
822 req->type = ix;
823 req->ptr1 = SvPVbyte_nolen (req->sv1);
824 }
825 else
826 {
792 req->type = EIO_FCHMOD; 827 req->type = EIO_FCHMOD;
793 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 828 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
794 }
795 else
796 {
797 req->type = ix;
798 req->ptr1 = SvPVbyte_nolen (req->sv1);
799 } 829 }
800 830
801 REQ_SEND; 831 REQ_SEND;
802} 832}
803 833
… …
895{ 925{
896 dREQ; 926 dREQ;
897 927
898 req->type = EIO_GROUP; 928 req->type = EIO_GROUP;
899 929
900 eio_submit (req); 930 req_submit (req);
901 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 931 XPUSHs (req_sv (req, AIO_GRP_KLASS));
902} 932}
903 933
904void 934void
905aio_nop (SV *callback=&PL_sv_undef) 935aio_nop (SV *callback=&PL_sv_undef)
… …
917 947
918int 948int
919aioreq_pri (int pri = 0) 949aioreq_pri (int pri = 0)
920 PROTOTYPE: ;$ 950 PROTOTYPE: ;$
921 CODE: 951 CODE:
922 RETVAL = next_pri - EIO_PRI_BIAS; 952 RETVAL = next_pri;
923 if (items > 0) 953 if (items > 0)
924 { 954 {
925 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN; 955 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
926 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX; 956 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
927 next_pri = pri + EIO_PRI_BIAS; 957 next_pri = pri;
928 } 958 }
929 OUTPUT: 959 OUTPUT:
930 RETVAL 960 RETVAL
931 961
932void 962void
933aioreq_nice (int nice = 0) 963aioreq_nice (int nice = 0)
934 CODE: 964 CODE:
935 nice = next_pri - nice; 965 nice = next_pri - nice;
936 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN; 966 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
937 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX; 967 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
938 next_pri = nice + EIO_PRI_BIAS; 968 next_pri = nice;
939 969
940void 970void
941flush () 971flush ()
942 PROTOTYPE: 972 PROTOTYPE:
943 CODE: 973 CODE:
… …
1004 1034
1005int 1035int
1006nthreads() 1036nthreads()
1007 PROTOTYPE: 1037 PROTOTYPE:
1008 CODE: 1038 CODE:
1009 if (WORDACCESS_UNSAFE) X_LOCK (wrklock); 1039 RETVAL = eio_nthreads ();
1010 RETVAL = started;
1011 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1012 OUTPUT: 1040 OUTPUT:
1013 RETVAL 1041 RETVAL
1014 1042
1015void _on_next_submit (SV *cb) 1043void _on_next_submit (SV *cb)
1016 CODE: 1044 CODE:
… …
1026 CODE: 1054 CODE:
1027 eio_cancel (req); 1055 eio_cancel (req);
1028 1056
1029void 1057void
1030cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1058cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1031 CODE: 1059 PPCODE:
1060{
1061 if (GIMME_V != G_VOID)
1062 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1063
1064 if (items > 1)
1065 {
1066 SV *cb_cv = get_cb (callback);
1067
1032 SvREFCNT_dec (req->callback); 1068 SvREFCNT_dec (req->callback);
1033 req->callback = newSVsv (callback); 1069 req->callback = SvREFCNT_inc (cb_cv);
1070 }
1071}
1034 1072
1035MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1073MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1036 1074
1037void 1075void
1038add (aio_req grp, ...) 1076add (aio_req grp, ...)
… …
1093void 1131void
1094feed (aio_req grp, SV *callback=&PL_sv_undef) 1132feed (aio_req grp, SV *callback=&PL_sv_undef)
1095 CODE: 1133 CODE:
1096{ 1134{
1097 SvREFCNT_dec (grp->sv2); 1135 SvREFCNT_dec (grp->sv2);
1098 grp->sv2 = newSVsv (callback); 1136 grp->sv2 = newSVsv (callback);
1137 grp->feed = aio_grp_feed;
1099 1138
1100 if (grp->int2 <= 0) 1139 if (grp->int2 <= 0)
1101 grp->int2 = 2; 1140 grp->int2 = 2;
1102 1141
1103 eio_grp_limit (grp, grp->int2); 1142 eio_grp_limit (grp, grp->int2);

Diff Legend

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