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.127 by root, Tue Sep 30 13:17:32 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;
… …
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
446#define dREQ \ 466#define dREQ \
447 aio_req req; \ 467 aio_req req; \
448 int req_pri = next_pri; \ 468 int req_pri = next_pri; \
449 next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; \ 469 next_pri = EIO_PRI_DEFAULT; \
450 \ 470 \
451 if (SvOK (callback) && !SvROK (callback)) \ 471 if (SvOK (callback) && !SvROK (callback)) \
452 croak ("callback must be undef or of reference type"); \ 472 croak ("callback must be undef or of reference type"); \
453 \ 473 \
454 Newz (0, req, 1, eio_req); \ 474 Newz (0, req, 1, eio_req); \
… …
457 \ 477 \
458 req->callback = newSVsv (callback); \ 478 req->callback = newSVsv (callback); \
459 req->pri = req_pri 479 req->pri = req_pri
460 480
461#define REQ_SEND \ 481#define REQ_SEND \
482 PUTBACK; \
462 req_submit (req); \ 483 req_submit (req); \
484 SPAGAIN; \
463 \ 485 \
464 if (GIMME_V != G_VOID) \ 486 if (GIMME_V != G_VOID) \
465 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 487 XPUSHs (req_sv (req, AIO_REQ_KLASS));
466 488
467MODULE = IO::AIO PACKAGE = IO::AIO 489MODULE = IO::AIO PACKAGE = IO::AIO
… …
475 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 497 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
476 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 498 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
477 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 499 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
478 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 500 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
479 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 501 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
480#ifdef _WIN32 502#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)); 503 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
491#endif 504#endif
492 505
493 create_respipe (); 506 create_respipe ();
494 507
… …
661 PPCODE: 674 PPCODE:
662{ 675{
663 SV *data; 676 SV *data;
664 dREQ; 677 dREQ;
665 678
666 data = newSV (NAME_MAX);
667 SvPOK_on (data);
668
669 req->type = EIO_READLINK; 679 req->type = EIO_READLINK;
670 req->sv1 = newSVsv (path); 680 req->sv1 = newSVsv (path);
671 req->ptr1 = SvPVbyte_nolen (req->sv1); 681 req->ptr1 = SvPVbyte_nolen (req->sv1);
672 req->sv2 = data;
673 req->ptr2 = SvPVbyte_nolen (data);
674 682
675 REQ_SEND; 683 REQ_SEND;
676} 684}
677 685
678void 686void
… …
716 aio_lstat = EIO_LSTAT 724 aio_lstat = EIO_LSTAT
717 PPCODE: 725 PPCODE:
718{ 726{
719 dREQ; 727 dREQ;
720 728
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); 729 req->sv1 = newSVsv (fh_or_path);
730 730
731 if (SvPOK (fh_or_path)) 731 if (SvPOK (req->sv1))
732 { 732 {
733 req->type = ix; 733 req->type = ix;
734 req->ptr1 = SvPVbyte_nolen (req->sv1); 734 req->ptr1 = SvPVbyte_nolen (req->sv1);
735 } 735 }
736 else 736 else
… …
750 750
751 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 751 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
752 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; 752 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
753 req->sv1 = newSVsv (fh_or_path); 753 req->sv1 = newSVsv (fh_or_path);
754 754
755 if (SvPOK (fh_or_path)) 755 if (SvPOK (req->sv1))
756 { 756 {
757 req->type = EIO_UTIME; 757 req->type = EIO_UTIME;
758 req->ptr1 = SvPVbyte_nolen (req->sv1); 758 req->ptr1 = SvPVbyte_nolen (req->sv1);
759 } 759 }
760 else 760 else
… …
773 dREQ; 773 dREQ;
774 774
775 req->sv1 = newSVsv (fh_or_path); 775 req->sv1 = newSVsv (fh_or_path);
776 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 776 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
777 777
778 if (SvPOK (fh_or_path)) 778 if (SvPOK (req->sv1))
779 { 779 {
780 req->type = EIO_TRUNCATE; 780 req->type = EIO_TRUNCATE;
781 req->ptr1 = SvPVbyte_nolen (req->sv1); 781 req->ptr1 = SvPVbyte_nolen (req->sv1);
782 } 782 }
783 else 783 else
… …
791 791
792void 792void
793aio_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)
794 ALIAS: 794 ALIAS:
795 aio_chmod = EIO_CHMOD 795 aio_chmod = EIO_CHMOD
796 aio_fchmod = EIO_FCHMOD
797 aio_mkdir = EIO_MKDIR 796 aio_mkdir = EIO_MKDIR
798 PPCODE: 797 PPCODE:
799{ 798{
800 dREQ; 799 dREQ;
801 800
802 req->type = ix;
803 req->int2 = mode; 801 req->int2 = mode;
804 req->sv1 = newSVsv (fh_or_path); 802 req->sv1 = newSVsv (fh_or_path);
805 803
806 if (ix == EIO_FCHMOD) 804 if (SvPOK (req->sv1))
807 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 805 {
806 req->type = ix;
807 req->ptr1 = SvPVbyte_nolen (req->sv1);
808 }
808 else 809 else
809 req->ptr1 = SvPVbyte_nolen (req->sv1); 810 {
811 req->type = EIO_FCHMOD;
812 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
813 }
810 814
811 REQ_SEND; 815 REQ_SEND;
812} 816}
813 817
814void 818void
… …
819 823
820 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 824 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
821 req->int3 = SvOK (gid) ? SvIV (gid) : -1; 825 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
822 req->sv1 = newSVsv (fh_or_path); 826 req->sv1 = newSVsv (fh_or_path);
823 827
824 if (SvPOK (fh_or_path)) 828 if (SvPOK (req->sv1))
825 { 829 {
826 req->type = EIO_CHOWN; 830 req->type = EIO_CHOWN;
827 req->ptr1 = SvPVbyte_nolen (req->sv1); 831 req->ptr1 = SvPVbyte_nolen (req->sv1);
828 } 832 }
829 else 833 else
… …
905{ 909{
906 dREQ; 910 dREQ;
907 911
908 req->type = EIO_GROUP; 912 req->type = EIO_GROUP;
909 913
910 eio_submit (req); 914 req_submit (req);
911 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 915 XPUSHs (req_sv (req, AIO_GRP_KLASS));
912} 916}
913 917
914void 918void
915aio_nop (SV *callback=&PL_sv_undef) 919aio_nop (SV *callback=&PL_sv_undef)
… …
927 931
928int 932int
929aioreq_pri (int pri = 0) 933aioreq_pri (int pri = 0)
930 PROTOTYPE: ;$ 934 PROTOTYPE: ;$
931 CODE: 935 CODE:
932 RETVAL = next_pri - EIO_PRI_BIAS; 936 RETVAL = next_pri;
933 if (items > 0) 937 if (items > 0)
934 { 938 {
935 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN; 939 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
936 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX; 940 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
937 next_pri = pri + EIO_PRI_BIAS; 941 next_pri = pri;
938 } 942 }
939 OUTPUT: 943 OUTPUT:
940 RETVAL 944 RETVAL
941 945
942void 946void
943aioreq_nice (int nice = 0) 947aioreq_nice (int nice = 0)
944 CODE: 948 CODE:
945 nice = next_pri - nice; 949 nice = next_pri - nice;
946 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN; 950 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
947 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX; 951 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
948 next_pri = nice + EIO_PRI_BIAS; 952 next_pri = nice;
949 953
950void 954void
951flush () 955flush ()
952 PROTOTYPE: 956 PROTOTYPE:
953 CODE: 957 CODE:
… …
1014 1018
1015int 1019int
1016nthreads() 1020nthreads()
1017 PROTOTYPE: 1021 PROTOTYPE:
1018 CODE: 1022 CODE:
1019 if (WORDACCESS_UNSAFE) X_LOCK (wrklock); 1023 RETVAL = eio_nthreads ();
1020 RETVAL = started;
1021 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1022 OUTPUT: 1024 OUTPUT:
1023 RETVAL 1025 RETVAL
1024 1026
1025void _on_next_submit (SV *cb) 1027void _on_next_submit (SV *cb)
1026 CODE: 1028 CODE:

Diff Legend

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