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.117 by root, Sat May 10 20:02:09 2008 UTC vs.
Revision 1.128 by root, Tue Sep 30 14:07:59 2008 UTC

… …
12#include <sys/types.h> 12#include <sys/types.h>
13#include <sys/stat.h> 13#include <sys/stat.h>
14#include <limits.h> 14#include <limits.h>
15#include <fcntl.h> 15#include <fcntl.h>
16#include <sched.h> 16#include <sched.h>
17
18/* perl namespace pollution */
19#undef VERSION
17 20
18#ifdef _WIN32 21#ifdef _WIN32
19 22
20# define EIO_STRUCT_DIRENT Direntry_t 23# define EIO_STRUCT_DIRENT Direntry_t
21# undef malloc 24# undef malloc
… …
62# include <signal.h> 65# include <signal.h>
63# define EIO_STRUCT_DIRENT struct dirent 66# define EIO_STRUCT_DIRENT struct dirent
64 67
65#endif 68#endif
66 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
67#define EIO_STRUCT_STAT Stat_t 76#define EIO_STRUCT_STAT Stat_t
68 77
69/* use NV for 32 bit perls as it allows larger offsets */ 78/* use NV for 32 bit perls as it allows larger offsets */
70#if IVSIZE >= 8 79#if IVSIZE >= 8
71# define SvVAL64 SvIV 80# define SvVAL64 SvIV
72#else 81#else
73# define SvVAL64 SvNV 82# define SvVAL64 SvNV
74#endif 83#endif
75 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
76static HV *stash; 98static HV *stash;
77typedef SV SV8; /* byte-sv, used for argument-checking */ 99typedef SV SV8; /* byte-sv, used for argument-checking */
78 100
79#define AIO_REQ_KLASS "IO::AIO::REQ" 101#define AIO_REQ_KLASS "IO::AIO::REQ"
80#define AIO_GRP_KLASS "IO::AIO::GRP" 102#define AIO_GRP_KLASS "IO::AIO::GRP"
81 103
82#define EIO_COMMON \ 104#define EIO_REQ_MEMBERS \
83 SV *callback; \ 105 SV *callback; \
84 SV *sv1, *sv2; \ 106 SV *sv1, *sv2; \
85 STRLEN stroffset; \ 107 STRLEN stroffset; \
86 SV *self 108 SV *self;
109
110#define EIO_NO_WRAPPERS 1
87 111
88#include "libeio/eio.h" 112#include "libeio/eio.h"
89 113
90static int req_invoke (eio_req *req); 114static int req_invoke (eio_req *req);
91#define EIO_FINISH(req) req_invoke (req) 115#define EIO_FINISH(req) req_invoke (req)
… …
102 126
103typedef eio_req *aio_req; 127typedef eio_req *aio_req;
104typedef eio_req *aio_req_ornot; 128typedef eio_req *aio_req_ornot;
105 129
106static SV *on_next_submit; 130static SV *on_next_submit;
107static int next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; 131static int next_pri = EIO_PRI_DEFAULT;
108static int max_outstanding; 132static int max_outstanding;
109 133
110static int respipe_osf [2], respipe [2] = { -1, -1 }; 134static int respipe_osf [2], respipe [2] = { -1, -1 };
111 135
112static void req_destroy (aio_req req); 136static void req_destroy (aio_req req);
… …
170 194
171static void req_submit (eio_req *req) 195static void req_submit (eio_req *req)
172{ 196{
173 eio_submit (req); 197 eio_submit (req);
174 198
175 if (on_next_submit) 199 if (expect_false (on_next_submit))
176 { 200 {
177 dSP; 201 dSP;
178 SV *cb = sv_2mortal (on_next_submit); 202 SV *cb = sv_2mortal (on_next_submit);
179 203
180 on_next_submit = 0; 204 on_next_submit = 0;
… …
190 dSP; 214 dSP;
191 215
192 if (req->flags & FLAG_SV2_RO_OFF) 216 if (req->flags & FLAG_SV2_RO_OFF)
193 SvREADONLY_off (req->sv2); 217 SvREADONLY_off (req->sv2);
194 218
195 if (!EIO_CANCELLED (req) && SvOK (req->callback)) 219 if (!EIO_CANCELLED (req) && req->callback)
196 { 220 {
197 ENTER; 221 ENTER;
198 SAVETMPS; 222 SAVETMPS;
199 PUSHMARK (SP); 223 PUSHMARK (SP);
200 EXTEND (SP, 1); 224 EXTEND (SP, 1);
… …
277 case EIO_BUSY: 301 case EIO_BUSY:
278 break; 302 break;
279 303
280 case EIO_READLINK: 304 case EIO_READLINK:
281 if (req->result > 0) 305 if (req->result > 0)
282 { 306 PUSHs (sv_2mortal (newSVpvn (req->ptr2, req->result)));
283 SvCUR_set (req->sv2, req->result);
284 *SvEND (req->sv2) = 0;
285 PUSHs (req->sv2);
286 }
287 break; 307 break;
288 308
289 case EIO_STAT: 309 case EIO_STAT:
290 case EIO_LSTAT: 310 case EIO_LSTAT:
291 case EIO_FSTAT: 311 case EIO_FSTAT:
… …
411 X_UNLOCK (reslock); 431 X_UNLOCK (reslock);
412 432
413 if (size) 433 if (size)
414 return; 434 return;
415 435
416 maybe_start_thread (); 436 etp_maybe_start_thread ();
417 437
418 FD_ZERO (&rfd); 438 FD_ZERO (&rfd);
419 FD_SET (respipe [0], &rfd); 439 FD_SET (respipe [0], &rfd);
420 440
421 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0); 441 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
422 } 442 }
423} 443}
424 444
425static int poll_cb (void) 445static int poll_cb (void)
426{ 446{
427 int res; 447 for (;;)
428
429 do
430 { 448 {
431 res = eio_poll (); 449 int res = eio_poll ();
432 450
433 if (res > 0) 451 if (res > 0)
434 croak (0); 452 croak (0);
453
454 if (!max_outstanding || max_outstanding > eio_nreqs ())
455 return res;
456
457 poll_wait ();
435 } 458 }
436 while (max_outstanding && max_outstanding <= eio_nreqs ());
437
438 return res;
439} 459}
440 460
441static void atfork_child (void) 461static void atfork_child (void)
442{ 462{
443 create_respipe (); 463 create_respipe ();
444} 464}
445 465
466static SV *
467get_cb (SV *cb_sv)
468{
469 HV *st;
470 GV *gvp;
471 CV *cv;
472
473 if (!SvOK (cb_sv))
474 return 0;
475
476 cv = sv_2cv (cb_sv, &st, &gvp, 0);
477
478 if (!cv)
479 croak ("IO::AIO watcher callback must be undef or a CODE reference");
480
481 return (SV *)cv;
482}
483
446#define dREQ \ 484#define dREQ \
485 SV *cb_cv; \
447 aio_req req; \ 486 aio_req req; \
448 int req_pri = next_pri; \ 487 int req_pri = next_pri; \
449 next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; \ 488 next_pri = EIO_PRI_DEFAULT; \
450 \ 489 \
451 if (SvOK (callback) && !SvROK (callback)) \ 490 cb_cv = get_cb (callback); \
452 croak ("callback must be undef or of reference type"); \
453 \ 491 \
454 Newz (0, req, 1, eio_req); \ 492 Newz (0, req, 1, eio_req); \
455 if (!req) \ 493 if (!req) \
456 croak ("out of memory during eio_req allocation"); \ 494 croak ("out of memory during eio_req allocation"); \
457 \ 495 \
458 req->callback = newSVsv (callback); \ 496 req->callback = SvREFCNT_inc (cb_cv); \
459 req->pri = req_pri 497 req->pri = req_pri
460 498
461#define REQ_SEND \ 499#define REQ_SEND \
500 PUTBACK; \
462 req_submit (req); \ 501 req_submit (req); \
502 SPAGAIN; \
463 \ 503 \
464 if (GIMME_V != G_VOID) \ 504 if (GIMME_V != G_VOID) \
465 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 505 XPUSHs (req_sv (req, AIO_REQ_KLASS));
466 506
467MODULE = IO::AIO PACKAGE = IO::AIO 507MODULE = IO::AIO PACKAGE = IO::AIO
… …
475 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 515 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
476 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 516 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
477 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 517 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
478 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 518 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
479 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 519 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
480#ifdef _WIN32 520#ifndef _WIN32
481 X_MUTEX_CHECK (wrklock);
482 X_MUTEX_CHECK (reslock);
483 X_MUTEX_CHECK (reqlock);
484 X_MUTEX_CHECK (reqwait);
485 X_MUTEX_CHECK (preadwritelock);
486 X_MUTEX_CHECK (readdirlock);
487
488 X_COND_CHECK (reqwait);
489#else
490 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 521 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
491#endif 522#endif
492 523
493 create_respipe (); 524 create_respipe ();
494 525
… …
661 PPCODE: 692 PPCODE:
662{ 693{
663 SV *data; 694 SV *data;
664 dREQ; 695 dREQ;
665 696
666 data = newSV (NAME_MAX);
667 SvPOK_on (data);
668
669 req->type = EIO_READLINK; 697 req->type = EIO_READLINK;
670 req->sv1 = newSVsv (path); 698 req->sv1 = newSVsv (path);
671 req->ptr1 = SvPVbyte_nolen (req->sv1); 699 req->ptr1 = SvPVbyte_nolen (req->sv1);
672 req->sv2 = data;
673 req->ptr2 = SvPVbyte_nolen (data);
674 700
675 REQ_SEND; 701 REQ_SEND;
676} 702}
677 703
678void 704void
… …
716 aio_lstat = EIO_LSTAT 742 aio_lstat = EIO_LSTAT
717 PPCODE: 743 PPCODE:
718{ 744{
719 dREQ; 745 dREQ;
720 746
721 req->ptr2 = malloc (sizeof (EIO_STRUCT_STAT));
722 if (!req->ptr2)
723 {
724 req_destroy (req);
725 croak ("out of memory during aio_stat statdata allocation");
726 }
727
728 req->flags |= EIO_FLAG_PTR2_FREE;
729 req->sv1 = newSVsv (fh_or_path); 747 req->sv1 = newSVsv (fh_or_path);
730 748
731 if (SvPOK (fh_or_path)) 749 if (SvPOK (req->sv1))
732 { 750 {
733 req->type = ix; 751 req->type = ix;
734 req->ptr1 = SvPVbyte_nolen (req->sv1); 752 req->ptr1 = SvPVbyte_nolen (req->sv1);
735 } 753 }
736 else 754 else
… …
750 768
751 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 769 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
752 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; 770 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
753 req->sv1 = newSVsv (fh_or_path); 771 req->sv1 = newSVsv (fh_or_path);
754 772
755 if (SvPOK (fh_or_path)) 773 if (SvPOK (req->sv1))
756 { 774 {
757 req->type = EIO_UTIME; 775 req->type = EIO_UTIME;
758 req->ptr1 = SvPVbyte_nolen (req->sv1); 776 req->ptr1 = SvPVbyte_nolen (req->sv1);
759 } 777 }
760 else 778 else
… …
773 dREQ; 791 dREQ;
774 792
775 req->sv1 = newSVsv (fh_or_path); 793 req->sv1 = newSVsv (fh_or_path);
776 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 794 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
777 795
778 if (SvPOK (fh_or_path)) 796 if (SvPOK (req->sv1))
779 { 797 {
780 req->type = EIO_TRUNCATE; 798 req->type = EIO_TRUNCATE;
781 req->ptr1 = SvPVbyte_nolen (req->sv1); 799 req->ptr1 = SvPVbyte_nolen (req->sv1);
782 } 800 }
783 else 801 else
… …
791 809
792void 810void
793aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef) 811aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
794 ALIAS: 812 ALIAS:
795 aio_chmod = EIO_CHMOD 813 aio_chmod = EIO_CHMOD
796 aio_fchmod = EIO_FCHMOD
797 aio_mkdir = EIO_MKDIR 814 aio_mkdir = EIO_MKDIR
798 PPCODE: 815 PPCODE:
799{ 816{
800 dREQ; 817 dREQ;
801 818
802 req->type = ix;
803 req->int2 = mode; 819 req->int2 = mode;
804 req->sv1 = newSVsv (fh_or_path); 820 req->sv1 = newSVsv (fh_or_path);
805 821
806 if (ix == EIO_FCHMOD) 822 if (SvPOK (req->sv1))
807 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 823 {
824 req->type = ix;
825 req->ptr1 = SvPVbyte_nolen (req->sv1);
826 }
808 else 827 else
809 req->ptr1 = SvPVbyte_nolen (req->sv1); 828 {
829 req->type = EIO_FCHMOD;
830 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
831 }
810 832
811 REQ_SEND; 833 REQ_SEND;
812} 834}
813 835
814void 836void
… …
819 841
820 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 842 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
821 req->int3 = SvOK (gid) ? SvIV (gid) : -1; 843 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
822 req->sv1 = newSVsv (fh_or_path); 844 req->sv1 = newSVsv (fh_or_path);
823 845
824 if (SvPOK (fh_or_path)) 846 if (SvPOK (req->sv1))
825 { 847 {
826 req->type = EIO_CHOWN; 848 req->type = EIO_CHOWN;
827 req->ptr1 = SvPVbyte_nolen (req->sv1); 849 req->ptr1 = SvPVbyte_nolen (req->sv1);
828 } 850 }
829 else 851 else
… …
905{ 927{
906 dREQ; 928 dREQ;
907 929
908 req->type = EIO_GROUP; 930 req->type = EIO_GROUP;
909 931
910 eio_submit (req); 932 req_submit (req);
911 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 933 XPUSHs (req_sv (req, AIO_GRP_KLASS));
912} 934}
913 935
914void 936void
915aio_nop (SV *callback=&PL_sv_undef) 937aio_nop (SV *callback=&PL_sv_undef)
… …
927 949
928int 950int
929aioreq_pri (int pri = 0) 951aioreq_pri (int pri = 0)
930 PROTOTYPE: ;$ 952 PROTOTYPE: ;$
931 CODE: 953 CODE:
932 RETVAL = next_pri - EIO_PRI_BIAS; 954 RETVAL = next_pri;
933 if (items > 0) 955 if (items > 0)
934 { 956 {
935 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN; 957 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
936 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX; 958 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
937 next_pri = pri + EIO_PRI_BIAS; 959 next_pri = pri;
938 } 960 }
939 OUTPUT: 961 OUTPUT:
940 RETVAL 962 RETVAL
941 963
942void 964void
943aioreq_nice (int nice = 0) 965aioreq_nice (int nice = 0)
944 CODE: 966 CODE:
945 nice = next_pri - nice; 967 nice = next_pri - nice;
946 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN; 968 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
947 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX; 969 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
948 next_pri = nice + EIO_PRI_BIAS; 970 next_pri = nice;
949 971
950void 972void
951flush () 973flush ()
952 PROTOTYPE: 974 PROTOTYPE:
953 CODE: 975 CODE:
… …
1014 1036
1015int 1037int
1016nthreads() 1038nthreads()
1017 PROTOTYPE: 1039 PROTOTYPE:
1018 CODE: 1040 CODE:
1019 if (WORDACCESS_UNSAFE) X_LOCK (wrklock); 1041 RETVAL = eio_nthreads ();
1020 RETVAL = started;
1021 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1022 OUTPUT: 1042 OUTPUT:
1023 RETVAL 1043 RETVAL
1024 1044
1025void _on_next_submit (SV *cb) 1045void _on_next_submit (SV *cb)
1026 CODE: 1046 CODE:
… …
1036 CODE: 1056 CODE:
1037 eio_cancel (req); 1057 eio_cancel (req);
1038 1058
1039void 1059void
1040cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1060cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1041 CODE: 1061 PPCODE:
1062{
1063 if (GIMME_V != G_VOID)
1064 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1065
1066 if (items > 1)
1067 {
1068 SV *cb_cv = get_cb (callback);
1069
1042 SvREFCNT_dec (req->callback); 1070 SvREFCNT_dec (req->callback);
1043 req->callback = newSVsv (callback); 1071 req->callback = SvREFCNT_inc (cb_cv);
1072 }
1073}
1044 1074
1045MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1075MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1046 1076
1047void 1077void
1048add (aio_req grp, ...) 1078add (aio_req grp, ...)

Diff Legend

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