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.115 by root, Sat May 10 18:06:41 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)
… …
101#include "libeio/eio.c" 112#include "libeio/eio.c"
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 unsigned int max_outstanding = 0x7fffffff; 117static SV *on_next_submit;
107 118static int next_pri = EIO_PRI_DEFAULT;
108static int next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; 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);
113static void req_cancel (aio_req req); 124static void req_cancel (aio_req req);
… …
166 FREETMPS; 177 FREETMPS;
167 LEAVE; 178 LEAVE;
168 } 179 }
169} 180}
170 181
182static void req_submit (eio_req *req)
183{
184 eio_submit (req);
185
186 if (on_next_submit)
187 {
188 dSP;
189 SV *cb = sv_2mortal (on_next_submit);
190
191 on_next_submit = 0;
192
193 PUSHMARK (SP);
194 PUTBACK;
195 call_sv (cb, G_DISCARD | G_EVAL);
196 }
197}
198
171static int req_invoke (eio_req *req) 199static int req_invoke (eio_req *req)
172{ 200{
173 dSP; 201 dSP;
174 202
175 if (req->flags & FLAG_SV2_RO_OFF) 203 if (req->flags & FLAG_SV2_RO_OFF)
… …
260 case EIO_BUSY: 288 case EIO_BUSY:
261 break; 289 break;
262 290
263 case EIO_READLINK: 291 case EIO_READLINK:
264 if (req->result > 0) 292 if (req->result > 0)
265 { 293 PUSHs (sv_2mortal (newSVpvn (req->ptr2, req->result)));
266 SvCUR_set (req->sv2, req->result);
267 *SvEND (req->sv2) = 0;
268 PUSHs (req->sv2);
269 }
270 break; 294 break;
271 295
272 case EIO_STAT: 296 case EIO_STAT:
273 case EIO_LSTAT: 297 case EIO_LSTAT:
274 case EIO_FSTAT: 298 case EIO_FSTAT:
… …
394 X_UNLOCK (reslock); 418 X_UNLOCK (reslock);
395 419
396 if (size) 420 if (size)
397 return; 421 return;
398 422
399 maybe_start_thread (); 423 etp_maybe_start_thread ();
400 424
401 FD_ZERO (&rfd); 425 FD_ZERO (&rfd);
402 FD_SET (respipe [0], &rfd); 426 FD_SET (respipe [0], &rfd);
403 427
404 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0); 428 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
405 } 429 }
406} 430}
407 431
408static int poll_cb (void) 432static int poll_cb (void)
409{ 433{
434 for (;;)
435 {
410 int res = eio_poll (); 436 int res = eio_poll ();
411 437
412 if (res > 0) 438 if (res > 0)
413 croak (0); 439 croak (0);
414 440
441 if (!max_outstanding || max_outstanding > eio_nreqs ())
415 return res; 442 return res;
443
444 poll_wait ();
445 }
446}
447
448static void atfork_child (void)
449{
450 create_respipe ();
416} 451}
417 452
418#define dREQ \ 453#define dREQ \
419 aio_req req; \ 454 aio_req req; \
420 int req_pri = next_pri; \ 455 int req_pri = next_pri; \
421 next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; \ 456 next_pri = EIO_PRI_DEFAULT; \
422 \ 457 \
423 if (SvOK (callback) && !SvROK (callback)) \ 458 if (SvOK (callback) && !SvROK (callback)) \
424 croak ("callback must be undef or of reference type"); \ 459 croak ("callback must be undef or of reference type"); \
425 \ 460 \
426 Newz (0, req, 1, eio_req); \ 461 Newz (0, req, 1, eio_req); \
… …
429 \ 464 \
430 req->callback = newSVsv (callback); \ 465 req->callback = newSVsv (callback); \
431 req->pri = req_pri 466 req->pri = req_pri
432 467
433#define REQ_SEND \ 468#define REQ_SEND \
434 eio_submit (req); \ 469 req_submit (req); \
435 \ 470 \
436 if (GIMME_V != G_VOID) \ 471 if (GIMME_V != G_VOID) \
437 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 472 XPUSHs (req_sv (req, AIO_REQ_KLASS));
438 473
439MODULE = IO::AIO PACKAGE = IO::AIO 474MODULE = IO::AIO PACKAGE = IO::AIO
… …
447 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 482 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
448 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 483 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
449 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 484 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
450 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 485 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
451 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 486 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
452#ifdef _WIN32 487#ifndef _WIN32
453 X_MUTEX_CHECK (wrklock);
454 X_MUTEX_CHECK (reslock);
455 X_MUTEX_CHECK (reqlock);
456 X_MUTEX_CHECK (reqwait);
457 X_MUTEX_CHECK (preadwritelock);
458 X_MUTEX_CHECK (readdirlock);
459
460 X_COND_CHECK (reqwait);
461#else
462 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 488 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
463#endif 489#endif
464 490
465 create_respipe (); 491 create_respipe ();
466 492
467 if (eio_init (want_poll, done_poll) < 0) 493 if (eio_init (want_poll, done_poll) < 0)
468 croak ("IO::AIO: unable to initialise eio library"); 494 croak ("IO::AIO: unable to initialise eio library");
495
496 /* atfork child called in fifo order, so before eio's handler */
497 X_THREAD_ATFORK (0, 0, atfork_child);
469} 498}
470 499
471void 500void
472max_poll_reqs (int nreqs) 501max_poll_reqs (int nreqs)
473 PROTOTYPE: $ 502 PROTOTYPE: $
… …
630 PPCODE: 659 PPCODE:
631{ 660{
632 SV *data; 661 SV *data;
633 dREQ; 662 dREQ;
634 663
635 data = newSV (NAME_MAX);
636 SvPOK_on (data);
637
638 req->type = EIO_READLINK; 664 req->type = EIO_READLINK;
639 req->sv1 = newSVsv (path); 665 req->sv1 = newSVsv (path);
640 req->ptr1 = SvPVbyte_nolen (req->sv1); 666 req->ptr1 = SvPVbyte_nolen (req->sv1);
641 req->sv2 = data;
642 req->ptr2 = SvPVbyte_nolen (data);
643 667
644 REQ_SEND; 668 REQ_SEND;
645} 669}
646 670
647void 671void
… …
685 aio_lstat = EIO_LSTAT 709 aio_lstat = EIO_LSTAT
686 PPCODE: 710 PPCODE:
687{ 711{
688 dREQ; 712 dREQ;
689 713
690 req->ptr2 = malloc (sizeof (EIO_STRUCT_STAT));
691 if (!req->ptr2)
692 {
693 req_destroy (req);
694 croak ("out of memory during aio_stat statdata allocation");
695 }
696
697 req->flags |= EIO_FLAG_PTR2_FREE;
698 req->sv1 = newSVsv (fh_or_path); 714 req->sv1 = newSVsv (fh_or_path);
699 715
700 if (SvPOK (fh_or_path)) 716 if (SvPOK (req->sv1))
701 { 717 {
702 req->type = ix; 718 req->type = ix;
703 req->ptr1 = SvPVbyte_nolen (req->sv1); 719 req->ptr1 = SvPVbyte_nolen (req->sv1);
704 } 720 }
705 else 721 else
… …
719 735
720 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 736 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
721 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; 737 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
722 req->sv1 = newSVsv (fh_or_path); 738 req->sv1 = newSVsv (fh_or_path);
723 739
724 if (SvPOK (fh_or_path)) 740 if (SvPOK (req->sv1))
725 { 741 {
726 req->type = EIO_UTIME; 742 req->type = EIO_UTIME;
727 req->ptr1 = SvPVbyte_nolen (req->sv1); 743 req->ptr1 = SvPVbyte_nolen (req->sv1);
728 } 744 }
729 else 745 else
… …
742 dREQ; 758 dREQ;
743 759
744 req->sv1 = newSVsv (fh_or_path); 760 req->sv1 = newSVsv (fh_or_path);
745 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 761 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
746 762
747 if (SvPOK (fh_or_path)) 763 if (SvPOK (req->sv1))
748 { 764 {
749 req->type = EIO_TRUNCATE; 765 req->type = EIO_TRUNCATE;
750 req->ptr1 = SvPVbyte_nolen (req->sv1); 766 req->ptr1 = SvPVbyte_nolen (req->sv1);
751 } 767 }
752 else 768 else
… …
760 776
761void 777void
762aio_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)
763 ALIAS: 779 ALIAS:
764 aio_chmod = EIO_CHMOD 780 aio_chmod = EIO_CHMOD
765 aio_fchmod = EIO_FCHMOD
766 aio_mkdir = EIO_MKDIR 781 aio_mkdir = EIO_MKDIR
767 PPCODE: 782 PPCODE:
768{ 783{
769 dREQ; 784 dREQ;
770 785
771 req->type = ix;
772 req->int2 = mode; 786 req->int2 = mode;
773 req->sv1 = newSVsv (fh_or_path); 787 req->sv1 = newSVsv (fh_or_path);
774 788
775 if (ix == EIO_FCHMOD) 789 if (SvPOK (req->sv1))
776 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 790 {
791 req->type = ix;
792 req->ptr1 = SvPVbyte_nolen (req->sv1);
793 }
777 else 794 else
778 req->ptr1 = SvPVbyte_nolen (req->sv1); 795 {
796 req->type = EIO_FCHMOD;
797 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
798 }
779 799
780 REQ_SEND; 800 REQ_SEND;
781} 801}
782 802
783void 803void
… …
788 808
789 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 809 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
790 req->int3 = SvOK (gid) ? SvIV (gid) : -1; 810 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
791 req->sv1 = newSVsv (fh_or_path); 811 req->sv1 = newSVsv (fh_or_path);
792 812
793 if (SvPOK (fh_or_path)) 813 if (SvPOK (req->sv1))
794 { 814 {
795 req->type = EIO_CHOWN; 815 req->type = EIO_CHOWN;
796 req->ptr1 = SvPVbyte_nolen (req->sv1); 816 req->ptr1 = SvPVbyte_nolen (req->sv1);
797 } 817 }
798 else 818 else
… …
896 916
897int 917int
898aioreq_pri (int pri = 0) 918aioreq_pri (int pri = 0)
899 PROTOTYPE: ;$ 919 PROTOTYPE: ;$
900 CODE: 920 CODE:
901 RETVAL = next_pri - EIO_PRI_BIAS; 921 RETVAL = next_pri;
902 if (items > 0) 922 if (items > 0)
903 { 923 {
904 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN; 924 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
905 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX; 925 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
906 next_pri = pri + EIO_PRI_BIAS; 926 next_pri = pri;
907 } 927 }
908 OUTPUT: 928 OUTPUT:
909 RETVAL 929 RETVAL
910 930
911void 931void
912aioreq_nice (int nice = 0) 932aioreq_nice (int nice = 0)
913 CODE: 933 CODE:
914 nice = next_pri - nice; 934 nice = next_pri - nice;
915 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN; 935 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
916 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX; 936 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
917 next_pri = nice + EIO_PRI_BIAS; 937 next_pri = nice;
918 938
919void 939void
920flush () 940flush ()
921 PROTOTYPE: 941 PROTOTYPE:
922 CODE: 942 CODE:
923 while (nreqs) 943 while (eio_nreqs ())
924 { 944 {
925 poll_wait (); 945 poll_wait ();
926 poll_cb (); 946 poll_cb ();
927 } 947 }
928 948
… …
983 1003
984int 1004int
985nthreads() 1005nthreads()
986 PROTOTYPE: 1006 PROTOTYPE:
987 CODE: 1007 CODE:
988 if (WORDACCESS_UNSAFE) X_LOCK (wrklock); 1008 RETVAL = eio_nthreads ();
989 RETVAL = started;
990 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
991 OUTPUT: 1009 OUTPUT:
992 RETVAL 1010 RETVAL
1011
1012void _on_next_submit (SV *cb)
1013 CODE:
1014 SvREFCNT_dec (on_next_submit);
1015 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
993 1016
994PROTOTYPES: DISABLE 1017PROTOTYPES: DISABLE
995 1018
996MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1019MODULE = IO::AIO PACKAGE = IO::AIO::REQ
997 1020

Diff Legend

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