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.125 by root, Thu Jun 19 09:05:43 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
… …
80typedef SV SV8; /* byte-sv, used for argument-checking */ 86typedef SV SV8; /* byte-sv, used for argument-checking */
81 87
82#define AIO_REQ_KLASS "IO::AIO::REQ" 88#define AIO_REQ_KLASS "IO::AIO::REQ"
83#define AIO_GRP_KLASS "IO::AIO::GRP" 89#define AIO_GRP_KLASS "IO::AIO::GRP"
84 90
85#define EIO_COMMON \ 91#define EIO_REQ_MEMBERS \
86 SV *callback; \ 92 SV *callback; \
87 SV *sv1, *sv2; \ 93 SV *sv1, *sv2; \
88 STRLEN stroffset; \ 94 STRLEN stroffset; \
89 SV *self 95 SV *self;
96
97#define EIO_NO_WRAPPERS 1
90 98
91#include "libeio/eio.h" 99#include "libeio/eio.h"
92 100
93static int req_invoke (eio_req *req); 101static int req_invoke (eio_req *req);
94#define EIO_FINISH(req) req_invoke (req) 102#define EIO_FINISH(req) req_invoke (req)
… …
105 113
106typedef eio_req *aio_req; 114typedef eio_req *aio_req;
107typedef eio_req *aio_req_ornot; 115typedef eio_req *aio_req_ornot;
108 116
109static SV *on_next_submit; 117static SV *on_next_submit;
110static int next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; 118static int next_pri = EIO_PRI_DEFAULT;
111static int max_outstanding; 119static int max_outstanding;
112 120
113static int respipe_osf [2], respipe [2] = { -1, -1 }; 121static int respipe_osf [2], respipe [2] = { -1, -1 };
114 122
115static void req_destroy (aio_req req); 123static void req_destroy (aio_req req);
… …
280 case EIO_BUSY: 288 case EIO_BUSY:
281 break; 289 break;
282 290
283 case EIO_READLINK: 291 case EIO_READLINK:
284 if (req->result > 0) 292 if (req->result > 0)
285 { 293 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; 294 break;
291 295
292 case EIO_STAT: 296 case EIO_STAT:
293 case EIO_LSTAT: 297 case EIO_LSTAT:
294 case EIO_FSTAT: 298 case EIO_FSTAT:
… …
414 X_UNLOCK (reslock); 418 X_UNLOCK (reslock);
415 419
416 if (size) 420 if (size)
417 return; 421 return;
418 422
419 maybe_start_thread (); 423 etp_maybe_start_thread ();
420 424
421 FD_ZERO (&rfd); 425 FD_ZERO (&rfd);
422 FD_SET (respipe [0], &rfd); 426 FD_SET (respipe [0], &rfd);
423 427
424 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0); 428 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
425 } 429 }
426} 430}
427 431
428static int poll_cb (void) 432static int poll_cb (void)
429{ 433{
430 int res; 434 for (;;)
431
432 do
433 { 435 {
434 res = eio_poll (); 436 int res = eio_poll ();
435 437
436 if (res > 0) 438 if (res > 0)
437 croak (0); 439 croak (0);
440
441 if (!max_outstanding || max_outstanding > eio_nreqs ())
442 return res;
443
444 poll_wait ();
438 } 445 }
439 while (max_outstanding && max_outstanding <= eio_nreqs ());
440
441 return res;
442} 446}
443 447
444static void atfork_child (void) 448static void atfork_child (void)
445{ 449{
446 create_respipe (); 450 create_respipe ();
447} 451}
448 452
449#define dREQ \ 453#define dREQ \
450 aio_req req; \ 454 aio_req req; \
451 int req_pri = next_pri; \ 455 int req_pri = next_pri; \
452 next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; \ 456 next_pri = EIO_PRI_DEFAULT; \
453 \ 457 \
454 if (SvOK (callback) && !SvROK (callback)) \ 458 if (SvOK (callback) && !SvROK (callback)) \
455 croak ("callback must be undef or of reference type"); \ 459 croak ("callback must be undef or of reference type"); \
456 \ 460 \
457 Newz (0, req, 1, eio_req); \ 461 Newz (0, req, 1, eio_req); \
… …
478 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 482 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
479 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 483 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
480 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 484 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
481 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 485 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
482 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 486 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
483#ifdef _WIN32 487#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)); 488 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
494#endif 489#endif
495 490
496 create_respipe (); 491 create_respipe ();
497 492
… …
664 PPCODE: 659 PPCODE:
665{ 660{
666 SV *data; 661 SV *data;
667 dREQ; 662 dREQ;
668 663
669 data = newSV (NAME_MAX);
670 SvPOK_on (data);
671
672 req->type = EIO_READLINK; 664 req->type = EIO_READLINK;
673 req->sv1 = newSVsv (path); 665 req->sv1 = newSVsv (path);
674 req->ptr1 = SvPVbyte_nolen (req->sv1); 666 req->ptr1 = SvPVbyte_nolen (req->sv1);
675 req->sv2 = data;
676 req->ptr2 = SvPVbyte_nolen (data);
677 667
678 REQ_SEND; 668 REQ_SEND;
679} 669}
680 670
681void 671void
… …
719 aio_lstat = EIO_LSTAT 709 aio_lstat = EIO_LSTAT
720 PPCODE: 710 PPCODE:
721{ 711{
722 dREQ; 712 dREQ;
723 713
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); 714 req->sv1 = newSVsv (fh_or_path);
733 715
734 if (SvPOK (fh_or_path)) 716 if (SvPOK (req->sv1))
735 { 717 {
736 req->type = ix; 718 req->type = ix;
737 req->ptr1 = SvPVbyte_nolen (req->sv1); 719 req->ptr1 = SvPVbyte_nolen (req->sv1);
738 } 720 }
739 else 721 else
… …
753 735
754 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 736 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
755 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; 737 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
756 req->sv1 = newSVsv (fh_or_path); 738 req->sv1 = newSVsv (fh_or_path);
757 739
758 if (SvPOK (fh_or_path)) 740 if (SvPOK (req->sv1))
759 { 741 {
760 req->type = EIO_UTIME; 742 req->type = EIO_UTIME;
761 req->ptr1 = SvPVbyte_nolen (req->sv1); 743 req->ptr1 = SvPVbyte_nolen (req->sv1);
762 } 744 }
763 else 745 else
… …
776 dREQ; 758 dREQ;
777 759
778 req->sv1 = newSVsv (fh_or_path); 760 req->sv1 = newSVsv (fh_or_path);
779 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 761 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
780 762
781 if (SvPOK (fh_or_path)) 763 if (SvPOK (req->sv1))
782 { 764 {
783 req->type = EIO_TRUNCATE; 765 req->type = EIO_TRUNCATE;
784 req->ptr1 = SvPVbyte_nolen (req->sv1); 766 req->ptr1 = SvPVbyte_nolen (req->sv1);
785 } 767 }
786 else 768 else
… …
794 776
795void 777void
796aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef) 778aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
797 ALIAS: 779 ALIAS:
798 aio_chmod = EIO_CHMOD 780 aio_chmod = EIO_CHMOD
799 aio_fchmod = EIO_FCHMOD
800 aio_mkdir = EIO_MKDIR 781 aio_mkdir = EIO_MKDIR
801 PPCODE: 782 PPCODE:
802{ 783{
803 dREQ; 784 dREQ;
804 785
805 req->type = ix;
806 req->int2 = mode; 786 req->int2 = mode;
807 req->sv1 = newSVsv (fh_or_path); 787 req->sv1 = newSVsv (fh_or_path);
808 788
809 if (ix == EIO_FCHMOD) 789 if (SvPOK (req->sv1))
810 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 790 {
791 req->type = ix;
792 req->ptr1 = SvPVbyte_nolen (req->sv1);
793 }
811 else 794 else
812 req->ptr1 = SvPVbyte_nolen (req->sv1); 795 {
796 req->type = EIO_FCHMOD;
797 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
798 }
813 799
814 REQ_SEND; 800 REQ_SEND;
815} 801}
816 802
817void 803void
… …
822 808
823 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 809 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
824 req->int3 = SvOK (gid) ? SvIV (gid) : -1; 810 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
825 req->sv1 = newSVsv (fh_or_path); 811 req->sv1 = newSVsv (fh_or_path);
826 812
827 if (SvPOK (fh_or_path)) 813 if (SvPOK (req->sv1))
828 { 814 {
829 req->type = EIO_CHOWN; 815 req->type = EIO_CHOWN;
830 req->ptr1 = SvPVbyte_nolen (req->sv1); 816 req->ptr1 = SvPVbyte_nolen (req->sv1);
831 } 817 }
832 else 818 else
… …
930 916
931int 917int
932aioreq_pri (int pri = 0) 918aioreq_pri (int pri = 0)
933 PROTOTYPE: ;$ 919 PROTOTYPE: ;$
934 CODE: 920 CODE:
935 RETVAL = next_pri - EIO_PRI_BIAS; 921 RETVAL = next_pri;
936 if (items > 0) 922 if (items > 0)
937 { 923 {
938 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN; 924 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
939 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX; 925 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
940 next_pri = pri + EIO_PRI_BIAS; 926 next_pri = pri;
941 } 927 }
942 OUTPUT: 928 OUTPUT:
943 RETVAL 929 RETVAL
944 930
945void 931void
946aioreq_nice (int nice = 0) 932aioreq_nice (int nice = 0)
947 CODE: 933 CODE:
948 nice = next_pri - nice; 934 nice = next_pri - nice;
949 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN; 935 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
950 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX; 936 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
951 next_pri = nice + EIO_PRI_BIAS; 937 next_pri = nice;
952 938
953void 939void
954flush () 940flush ()
955 PROTOTYPE: 941 PROTOTYPE:
956 CODE: 942 CODE:
… …
1017 1003
1018int 1004int
1019nthreads() 1005nthreads()
1020 PROTOTYPE: 1006 PROTOTYPE:
1021 CODE: 1007 CODE:
1022 if (WORDACCESS_UNSAFE) X_LOCK (wrklock); 1008 RETVAL = eio_nthreads ();
1023 RETVAL = started;
1024 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1025 OUTPUT: 1009 OUTPUT:
1026 RETVAL 1010 RETVAL
1027 1011
1028void _on_next_submit (SV *cb) 1012void _on_next_submit (SV *cb)
1029 CODE: 1013 CODE:

Diff Legend

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