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.126 by root, Thu Sep 25 07:56:07 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); \
… …
460 \ 464 \
461 req->callback = newSVsv (callback); \ 465 req->callback = newSVsv (callback); \
462 req->pri = req_pri 466 req->pri = req_pri
463 467
464#define REQ_SEND \ 468#define REQ_SEND \
469 PUTBACK; \
465 req_submit (req); \ 470 req_submit (req); \
471 SPAGAIN; \
466 \ 472 \
467 if (GIMME_V != G_VOID) \ 473 if (GIMME_V != G_VOID) \
468 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 474 XPUSHs (req_sv (req, AIO_REQ_KLASS));
469 475
470MODULE = IO::AIO PACKAGE = IO::AIO 476MODULE = IO::AIO PACKAGE = IO::AIO
… …
478 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 484 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
479 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 485 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
480 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 486 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
481 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 487 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
482 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 488 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
483#ifdef _WIN32 489#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)); 490 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
494#endif 491#endif
495 492
496 create_respipe (); 493 create_respipe ();
497 494
… …
664 PPCODE: 661 PPCODE:
665{ 662{
666 SV *data; 663 SV *data;
667 dREQ; 664 dREQ;
668 665
669 data = newSV (NAME_MAX);
670 SvPOK_on (data);
671
672 req->type = EIO_READLINK; 666 req->type = EIO_READLINK;
673 req->sv1 = newSVsv (path); 667 req->sv1 = newSVsv (path);
674 req->ptr1 = SvPVbyte_nolen (req->sv1); 668 req->ptr1 = SvPVbyte_nolen (req->sv1);
675 req->sv2 = data;
676 req->ptr2 = SvPVbyte_nolen (data);
677 669
678 REQ_SEND; 670 REQ_SEND;
679} 671}
680 672
681void 673void
… …
719 aio_lstat = EIO_LSTAT 711 aio_lstat = EIO_LSTAT
720 PPCODE: 712 PPCODE:
721{ 713{
722 dREQ; 714 dREQ;
723 715
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); 716 req->sv1 = newSVsv (fh_or_path);
733 717
734 if (SvPOK (fh_or_path)) 718 if (SvPOK (req->sv1))
735 { 719 {
736 req->type = ix; 720 req->type = ix;
737 req->ptr1 = SvPVbyte_nolen (req->sv1); 721 req->ptr1 = SvPVbyte_nolen (req->sv1);
738 } 722 }
739 else 723 else
… …
753 737
754 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 738 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
755 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; 739 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
756 req->sv1 = newSVsv (fh_or_path); 740 req->sv1 = newSVsv (fh_or_path);
757 741
758 if (SvPOK (fh_or_path)) 742 if (SvPOK (req->sv1))
759 { 743 {
760 req->type = EIO_UTIME; 744 req->type = EIO_UTIME;
761 req->ptr1 = SvPVbyte_nolen (req->sv1); 745 req->ptr1 = SvPVbyte_nolen (req->sv1);
762 } 746 }
763 else 747 else
… …
776 dREQ; 760 dREQ;
777 761
778 req->sv1 = newSVsv (fh_or_path); 762 req->sv1 = newSVsv (fh_or_path);
779 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 763 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
780 764
781 if (SvPOK (fh_or_path)) 765 if (SvPOK (req->sv1))
782 { 766 {
783 req->type = EIO_TRUNCATE; 767 req->type = EIO_TRUNCATE;
784 req->ptr1 = SvPVbyte_nolen (req->sv1); 768 req->ptr1 = SvPVbyte_nolen (req->sv1);
785 } 769 }
786 else 770 else
… …
794 778
795void 779void
796aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef) 780aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
797 ALIAS: 781 ALIAS:
798 aio_chmod = EIO_CHMOD 782 aio_chmod = EIO_CHMOD
799 aio_fchmod = EIO_FCHMOD
800 aio_mkdir = EIO_MKDIR 783 aio_mkdir = EIO_MKDIR
801 PPCODE: 784 PPCODE:
802{ 785{
803 dREQ; 786 dREQ;
804 787
805 req->type = ix;
806 req->int2 = mode; 788 req->int2 = mode;
807 req->sv1 = newSVsv (fh_or_path); 789 req->sv1 = newSVsv (fh_or_path);
808 790
809 if (ix == EIO_FCHMOD) 791 if (SvPOK (req->sv1))
810 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 792 {
793 req->type = ix;
794 req->ptr1 = SvPVbyte_nolen (req->sv1);
795 }
811 else 796 else
812 req->ptr1 = SvPVbyte_nolen (req->sv1); 797 {
798 req->type = EIO_FCHMOD;
799 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
800 }
813 801
814 REQ_SEND; 802 REQ_SEND;
815} 803}
816 804
817void 805void
… …
822 810
823 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 811 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
824 req->int3 = SvOK (gid) ? SvIV (gid) : -1; 812 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
825 req->sv1 = newSVsv (fh_or_path); 813 req->sv1 = newSVsv (fh_or_path);
826 814
827 if (SvPOK (fh_or_path)) 815 if (SvPOK (req->sv1))
828 { 816 {
829 req->type = EIO_CHOWN; 817 req->type = EIO_CHOWN;
830 req->ptr1 = SvPVbyte_nolen (req->sv1); 818 req->ptr1 = SvPVbyte_nolen (req->sv1);
831 } 819 }
832 else 820 else
… …
930 918
931int 919int
932aioreq_pri (int pri = 0) 920aioreq_pri (int pri = 0)
933 PROTOTYPE: ;$ 921 PROTOTYPE: ;$
934 CODE: 922 CODE:
935 RETVAL = next_pri - EIO_PRI_BIAS; 923 RETVAL = next_pri;
936 if (items > 0) 924 if (items > 0)
937 { 925 {
938 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN; 926 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
939 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX; 927 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
940 next_pri = pri + EIO_PRI_BIAS; 928 next_pri = pri;
941 } 929 }
942 OUTPUT: 930 OUTPUT:
943 RETVAL 931 RETVAL
944 932
945void 933void
946aioreq_nice (int nice = 0) 934aioreq_nice (int nice = 0)
947 CODE: 935 CODE:
948 nice = next_pri - nice; 936 nice = next_pri - nice;
949 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN; 937 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
950 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX; 938 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
951 next_pri = nice + EIO_PRI_BIAS; 939 next_pri = nice;
952 940
953void 941void
954flush () 942flush ()
955 PROTOTYPE: 943 PROTOTYPE:
956 CODE: 944 CODE:
… …
1017 1005
1018int 1006int
1019nthreads() 1007nthreads()
1020 PROTOTYPE: 1008 PROTOTYPE:
1021 CODE: 1009 CODE:
1022 if (WORDACCESS_UNSAFE) X_LOCK (wrklock); 1010 RETVAL = eio_nthreads ();
1023 RETVAL = started;
1024 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1025 OUTPUT: 1011 OUTPUT:
1026 RETVAL 1012 RETVAL
1027 1013
1028void _on_next_submit (SV *cb) 1014void _on_next_submit (SV *cb)
1029 CODE: 1015 CODE:

Diff Legend

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