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

Diff Legend

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