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.118 by root, Sun May 11 00:01:03 2008 UTC vs.
Revision 1.127 by root, Tue Sep 30 13:17:32 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)
… …
105 126
106typedef eio_req *aio_req; 127typedef eio_req *aio_req;
107typedef eio_req *aio_req_ornot; 128typedef eio_req *aio_req_ornot;
108 129
109static SV *on_next_submit; 130static SV *on_next_submit;
110static int next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; 131static int next_pri = EIO_PRI_DEFAULT;
111static int max_outstanding; 132static int max_outstanding;
112 133
113static int respipe_osf [2], respipe [2] = { -1, -1 }; 134static int respipe_osf [2], respipe [2] = { -1, -1 };
114 135
115static void req_destroy (aio_req req); 136static void req_destroy (aio_req req);
… …
173 194
174static void req_submit (eio_req *req) 195static void req_submit (eio_req *req)
175{ 196{
176 eio_submit (req); 197 eio_submit (req);
177 198
178 if (on_next_submit) 199 if (expect_false (on_next_submit))
179 { 200 {
180 dSP; 201 dSP;
181 SV *cb = sv_2mortal (on_next_submit); 202 SV *cb = sv_2mortal (on_next_submit);
182 203
183 on_next_submit = 0; 204 on_next_submit = 0;
… …
280 case EIO_BUSY: 301 case EIO_BUSY:
281 break; 302 break;
282 303
283 case EIO_READLINK: 304 case EIO_READLINK:
284 if (req->result > 0) 305 if (req->result > 0)
285 { 306 PUSHs (sv_2mortal (newSVpvn (req->ptr2, req->result)));
286 SvCUR_set (req->sv2, req->result);
287 *SvEND (req->sv2) = 0;
288 PUSHs (req->sv2);
289 }
290 break; 307 break;
291 308
292 case EIO_STAT: 309 case EIO_STAT:
293 case EIO_LSTAT: 310 case EIO_LSTAT:
294 case EIO_FSTAT: 311 case EIO_FSTAT:
… …
414 X_UNLOCK (reslock); 431 X_UNLOCK (reslock);
415 432
416 if (size) 433 if (size)
417 return; 434 return;
418 435
419 maybe_start_thread (); 436 etp_maybe_start_thread ();
420 437
421 FD_ZERO (&rfd); 438 FD_ZERO (&rfd);
422 FD_SET (respipe [0], &rfd); 439 FD_SET (respipe [0], &rfd);
423 440
424 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0); 441 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
425 } 442 }
426} 443}
427 444
428static int poll_cb (void) 445static int poll_cb (void)
429{ 446{
430 int res; 447 for (;;)
431
432 do
433 { 448 {
434 res = eio_poll (); 449 int res = eio_poll ();
435 450
436 if (res > 0) 451 if (res > 0)
437 croak (0); 452 croak (0);
453
454 if (!max_outstanding || max_outstanding > eio_nreqs ())
455 return res;
456
457 poll_wait ();
438 } 458 }
439 while (max_outstanding && max_outstanding <= eio_nreqs ());
440
441 return res;
442} 459}
443 460
444static void atfork_child (void) 461static void atfork_child (void)
445{ 462{
446 create_respipe (); 463 create_respipe ();
447} 464}
448 465
449#define dREQ \ 466#define dREQ \
450 aio_req req; \ 467 aio_req req; \
451 int req_pri = next_pri; \ 468 int req_pri = next_pri; \
452 next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; \ 469 next_pri = EIO_PRI_DEFAULT; \
453 \ 470 \
454 if (SvOK (callback) && !SvROK (callback)) \ 471 if (SvOK (callback) && !SvROK (callback)) \
455 croak ("callback must be undef or of reference type"); \ 472 croak ("callback must be undef or of reference type"); \
456 \ 473 \
457 Newz (0, req, 1, eio_req); \ 474 Newz (0, req, 1, eio_req); \
… …
460 \ 477 \
461 req->callback = newSVsv (callback); \ 478 req->callback = newSVsv (callback); \
462 req->pri = req_pri 479 req->pri = req_pri
463 480
464#define REQ_SEND \ 481#define REQ_SEND \
482 PUTBACK; \
465 req_submit (req); \ 483 req_submit (req); \
484 SPAGAIN; \
466 \ 485 \
467 if (GIMME_V != G_VOID) \ 486 if (GIMME_V != G_VOID) \
468 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 487 XPUSHs (req_sv (req, AIO_REQ_KLASS));
469 488
470MODULE = IO::AIO PACKAGE = IO::AIO 489MODULE = IO::AIO PACKAGE = IO::AIO
… …
478 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 497 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
479 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 498 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
480 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 499 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
481 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 500 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
482 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 501 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
483#ifdef _WIN32 502#ifndef _WIN32
484 X_MUTEX_CHECK (wrklock);
485 X_MUTEX_CHECK (reslock);
486 X_MUTEX_CHECK (reqlock);
487 X_MUTEX_CHECK (reqwait);
488 X_MUTEX_CHECK (preadwritelock);
489 X_MUTEX_CHECK (readdirlock);
490
491 X_COND_CHECK (reqwait);
492#else
493 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 503 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
494#endif 504#endif
495 505
496 create_respipe (); 506 create_respipe ();
497 507
… …
664 PPCODE: 674 PPCODE:
665{ 675{
666 SV *data; 676 SV *data;
667 dREQ; 677 dREQ;
668 678
669 data = newSV (NAME_MAX);
670 SvPOK_on (data);
671
672 req->type = EIO_READLINK; 679 req->type = EIO_READLINK;
673 req->sv1 = newSVsv (path); 680 req->sv1 = newSVsv (path);
674 req->ptr1 = SvPVbyte_nolen (req->sv1); 681 req->ptr1 = SvPVbyte_nolen (req->sv1);
675 req->sv2 = data;
676 req->ptr2 = SvPVbyte_nolen (data);
677 682
678 REQ_SEND; 683 REQ_SEND;
679} 684}
680 685
681void 686void
… …
719 aio_lstat = EIO_LSTAT 724 aio_lstat = EIO_LSTAT
720 PPCODE: 725 PPCODE:
721{ 726{
722 dREQ; 727 dREQ;
723 728
724 req->ptr2 = malloc (sizeof (EIO_STRUCT_STAT));
725 if (!req->ptr2)
726 {
727 req_destroy (req);
728 croak ("out of memory during aio_stat statdata allocation");
729 }
730
731 req->flags |= EIO_FLAG_PTR2_FREE;
732 req->sv1 = newSVsv (fh_or_path); 729 req->sv1 = newSVsv (fh_or_path);
733 730
734 if (SvPOK (fh_or_path)) 731 if (SvPOK (req->sv1))
735 { 732 {
736 req->type = ix; 733 req->type = ix;
737 req->ptr1 = SvPVbyte_nolen (req->sv1); 734 req->ptr1 = SvPVbyte_nolen (req->sv1);
738 } 735 }
739 else 736 else
… …
753 750
754 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 751 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
755 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; 752 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
756 req->sv1 = newSVsv (fh_or_path); 753 req->sv1 = newSVsv (fh_or_path);
757 754
758 if (SvPOK (fh_or_path)) 755 if (SvPOK (req->sv1))
759 { 756 {
760 req->type = EIO_UTIME; 757 req->type = EIO_UTIME;
761 req->ptr1 = SvPVbyte_nolen (req->sv1); 758 req->ptr1 = SvPVbyte_nolen (req->sv1);
762 } 759 }
763 else 760 else
… …
776 dREQ; 773 dREQ;
777 774
778 req->sv1 = newSVsv (fh_or_path); 775 req->sv1 = newSVsv (fh_or_path);
779 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 776 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
780 777
781 if (SvPOK (fh_or_path)) 778 if (SvPOK (req->sv1))
782 { 779 {
783 req->type = EIO_TRUNCATE; 780 req->type = EIO_TRUNCATE;
784 req->ptr1 = SvPVbyte_nolen (req->sv1); 781 req->ptr1 = SvPVbyte_nolen (req->sv1);
785 } 782 }
786 else 783 else
… …
794 791
795void 792void
796aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef) 793aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
797 ALIAS: 794 ALIAS:
798 aio_chmod = EIO_CHMOD 795 aio_chmod = EIO_CHMOD
799 aio_fchmod = EIO_FCHMOD
800 aio_mkdir = EIO_MKDIR 796 aio_mkdir = EIO_MKDIR
801 PPCODE: 797 PPCODE:
802{ 798{
803 dREQ; 799 dREQ;
804 800
805 req->type = ix;
806 req->int2 = mode; 801 req->int2 = mode;
807 req->sv1 = newSVsv (fh_or_path); 802 req->sv1 = newSVsv (fh_or_path);
808 803
809 if (ix == EIO_FCHMOD) 804 if (SvPOK (req->sv1))
810 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 805 {
806 req->type = ix;
807 req->ptr1 = SvPVbyte_nolen (req->sv1);
808 }
811 else 809 else
812 req->ptr1 = SvPVbyte_nolen (req->sv1); 810 {
811 req->type = EIO_FCHMOD;
812 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
813 }
813 814
814 REQ_SEND; 815 REQ_SEND;
815} 816}
816 817
817void 818void
… …
822 823
823 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 824 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
824 req->int3 = SvOK (gid) ? SvIV (gid) : -1; 825 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
825 req->sv1 = newSVsv (fh_or_path); 826 req->sv1 = newSVsv (fh_or_path);
826 827
827 if (SvPOK (fh_or_path)) 828 if (SvPOK (req->sv1))
828 { 829 {
829 req->type = EIO_CHOWN; 830 req->type = EIO_CHOWN;
830 req->ptr1 = SvPVbyte_nolen (req->sv1); 831 req->ptr1 = SvPVbyte_nolen (req->sv1);
831 } 832 }
832 else 833 else
… …
908{ 909{
909 dREQ; 910 dREQ;
910 911
911 req->type = EIO_GROUP; 912 req->type = EIO_GROUP;
912 913
913 eio_submit (req); 914 req_submit (req);
914 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 915 XPUSHs (req_sv (req, AIO_GRP_KLASS));
915} 916}
916 917
917void 918void
918aio_nop (SV *callback=&PL_sv_undef) 919aio_nop (SV *callback=&PL_sv_undef)
… …
930 931
931int 932int
932aioreq_pri (int pri = 0) 933aioreq_pri (int pri = 0)
933 PROTOTYPE: ;$ 934 PROTOTYPE: ;$
934 CODE: 935 CODE:
935 RETVAL = next_pri - EIO_PRI_BIAS; 936 RETVAL = next_pri;
936 if (items > 0) 937 if (items > 0)
937 { 938 {
938 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN; 939 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
939 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX; 940 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
940 next_pri = pri + EIO_PRI_BIAS; 941 next_pri = pri;
941 } 942 }
942 OUTPUT: 943 OUTPUT:
943 RETVAL 944 RETVAL
944 945
945void 946void
946aioreq_nice (int nice = 0) 947aioreq_nice (int nice = 0)
947 CODE: 948 CODE:
948 nice = next_pri - nice; 949 nice = next_pri - nice;
949 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN; 950 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
950 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX; 951 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
951 next_pri = nice + EIO_PRI_BIAS; 952 next_pri = nice;
952 953
953void 954void
954flush () 955flush ()
955 PROTOTYPE: 956 PROTOTYPE:
956 CODE: 957 CODE:
… …
1017 1018
1018int 1019int
1019nthreads() 1020nthreads()
1020 PROTOTYPE: 1021 PROTOTYPE:
1021 CODE: 1022 CODE:
1022 if (WORDACCESS_UNSAFE) X_LOCK (wrklock); 1023 RETVAL = eio_nthreads ();
1023 RETVAL = started;
1024 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1025 OUTPUT: 1024 OUTPUT:
1026 RETVAL 1025 RETVAL
1027 1026
1028void _on_next_submit (SV *cb) 1027void _on_next_submit (SV *cb)
1029 CODE: 1028 CODE:

Diff Legend

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