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.116 by root, Sat May 10 19:25:33 2008 UTC vs.
Revision 1.130 by root, Thu Oct 2 11:35:03 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)
… …
101#include "libeio/eio.c" 125#include "libeio/eio.c"
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
130static SV *on_next_submit;
131static int next_pri = EIO_PRI_DEFAULT;
106static int max_outstanding = 0; 132static int max_outstanding;
107
108static int next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS;
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);
113static void req_cancel (aio_req req); 137static void req_cancel (aio_req req);
… …
166 FREETMPS; 190 FREETMPS;
167 LEAVE; 191 LEAVE;
168 } 192 }
169} 193}
170 194
195static void req_submit (eio_req *req)
196{
197 eio_submit (req);
198
199 if (expect_false (on_next_submit))
200 {
201 dSP;
202 SV *cb = sv_2mortal (on_next_submit);
203
204 on_next_submit = 0;
205
206 PUSHMARK (SP);
207 PUTBACK;
208 call_sv (cb, G_DISCARD | G_EVAL);
209 }
210}
211
171static int req_invoke (eio_req *req) 212static int req_invoke (eio_req *req)
172{ 213{
173 dSP; 214 dSP;
174 215
175 if (req->flags & FLAG_SV2_RO_OFF) 216 if (req->flags & FLAG_SV2_RO_OFF)
176 SvREADONLY_off (req->sv2); 217 SvREADONLY_off (req->sv2);
177 218
178 if (!EIO_CANCELLED (req) && SvOK (req->callback)) 219 if (!EIO_CANCELLED (req) && req->callback)
179 { 220 {
180 ENTER; 221 ENTER;
181 SAVETMPS; 222 SAVETMPS;
182 PUSHMARK (SP); 223 PUSHMARK (SP);
183 EXTEND (SP, 1); 224 EXTEND (SP, 1);
… …
260 case EIO_BUSY: 301 case EIO_BUSY:
261 break; 302 break;
262 303
263 case EIO_READLINK: 304 case EIO_READLINK:
264 if (req->result > 0) 305 if (req->result > 0)
265 { 306 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; 307 break;
271 308
272 case EIO_STAT: 309 case EIO_STAT:
273 case EIO_LSTAT: 310 case EIO_LSTAT:
274 case EIO_FSTAT: 311 case EIO_FSTAT:
… …
394 X_UNLOCK (reslock); 431 X_UNLOCK (reslock);
395 432
396 if (size) 433 if (size)
397 return; 434 return;
398 435
399 maybe_start_thread (); 436 etp_maybe_start_thread ();
400 437
401 FD_ZERO (&rfd); 438 FD_ZERO (&rfd);
402 FD_SET (respipe [0], &rfd); 439 FD_SET (respipe [0], &rfd);
403 440
404 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0); 441 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
405 } 442 }
406} 443}
407 444
408static int poll_cb (void) 445static int poll_cb (void)
409{ 446{
410 int res; 447 for (;;)
411
412 do
413 { 448 {
414 res = eio_poll (); 449 int res = eio_poll ();
415 450
416 if (res > 0) 451 if (res > 0)
417 croak (0); 452 croak (0);
453
454 if (!max_outstanding || max_outstanding > eio_nreqs ())
455 return res;
456
457 poll_wait ();
418 } 458 }
419 while (max_outstanding && max_outstanding <= eio_nreqs ());
420
421 return res;
422} 459}
423 460
424static void atfork_child (void) 461static void atfork_child (void)
425{ 462{
426 create_respipe (); 463 create_respipe ();
427} 464}
428 465
466static SV *
467get_cb (SV *cb_sv)
468{
469 HV *st;
470 GV *gvp;
471 CV *cv;
472
473 if (!SvOK (cb_sv))
474 return 0;
475
476 cv = sv_2cv (cb_sv, &st, &gvp, 0);
477
478 if (!cv)
479 croak ("IO::AIO callback must be undef or a CODE reference");
480
481 return (SV *)cv;
482}
483
429#define dREQ \ 484#define dREQ \
485 SV *cb_cv; \
430 aio_req req; \ 486 aio_req req; \
431 int req_pri = next_pri; \ 487 int req_pri = next_pri; \
432 next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; \ 488 next_pri = EIO_PRI_DEFAULT; \
433 \ 489 \
434 if (SvOK (callback) && !SvROK (callback)) \ 490 cb_cv = get_cb (callback); \
435 croak ("callback must be undef or of reference type"); \
436 \ 491 \
437 Newz (0, req, 1, eio_req); \ 492 Newz (0, req, 1, eio_req); \
438 if (!req) \ 493 if (!req) \
439 croak ("out of memory during eio_req allocation"); \ 494 croak ("out of memory during eio_req allocation"); \
440 \ 495 \
441 req->callback = newSVsv (callback); \ 496 req->callback = SvREFCNT_inc (cb_cv); \
442 req->pri = req_pri 497 req->pri = req_pri
443 498
444#define REQ_SEND \ 499#define REQ_SEND \
500 PUTBACK; \
445 eio_submit (req); \ 501 req_submit (req); \
502 SPAGAIN; \
446 \ 503 \
447 if (GIMME_V != G_VOID) \ 504 if (GIMME_V != G_VOID) \
448 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 505 XPUSHs (req_sv (req, AIO_REQ_KLASS));
449 506
450MODULE = IO::AIO PACKAGE = IO::AIO 507MODULE = IO::AIO PACKAGE = IO::AIO
… …
458 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 515 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
459 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 516 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
460 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 517 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
461 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 518 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
462 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 519 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
463#ifdef _WIN32 520#ifndef _WIN32
464 X_MUTEX_CHECK (wrklock);
465 X_MUTEX_CHECK (reslock);
466 X_MUTEX_CHECK (reqlock);
467 X_MUTEX_CHECK (reqwait);
468 X_MUTEX_CHECK (preadwritelock);
469 X_MUTEX_CHECK (readdirlock);
470
471 X_COND_CHECK (reqwait);
472#else
473 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 521 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
474#endif 522#endif
475 523
476 create_respipe (); 524 create_respipe ();
477 525
… …
622 req->sv1 = newSVsv (fh); 670 req->sv1 = newSVsv (fh);
623 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 671 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh))
624 : IoOFP (sv_2io (fh))); 672 : IoOFP (sv_2io (fh)));
625 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 673 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
626 req->size = len; 674 req->size = len;
627 req->sv2 = SvREFCNT_inc (data); 675 req->sv2 = SvREFCNT_inc_NN (data);
628 req->ptr2 = (char *)svptr + dataoffset; 676 req->ptr2 = (char *)svptr + dataoffset;
629 req->stroffset = dataoffset; 677 req->stroffset = dataoffset;
630 678
631 if (!SvREADONLY (data)) 679 if (!SvREADONLY (data))
632 { 680 {
… …
644 PPCODE: 692 PPCODE:
645{ 693{
646 SV *data; 694 SV *data;
647 dREQ; 695 dREQ;
648 696
649 data = newSV (NAME_MAX);
650 SvPOK_on (data);
651
652 req->type = EIO_READLINK; 697 req->type = EIO_READLINK;
653 req->sv1 = newSVsv (path); 698 req->sv1 = newSVsv (path);
654 req->ptr1 = SvPVbyte_nolen (req->sv1); 699 req->ptr1 = SvPVbyte_nolen (req->sv1);
655 req->sv2 = data;
656 req->ptr2 = SvPVbyte_nolen (data);
657 700
658 REQ_SEND; 701 REQ_SEND;
659} 702}
660 703
661void 704void
… …
699 aio_lstat = EIO_LSTAT 742 aio_lstat = EIO_LSTAT
700 PPCODE: 743 PPCODE:
701{ 744{
702 dREQ; 745 dREQ;
703 746
704 req->ptr2 = malloc (sizeof (EIO_STRUCT_STAT));
705 if (!req->ptr2)
706 {
707 req_destroy (req);
708 croak ("out of memory during aio_stat statdata allocation");
709 }
710
711 req->flags |= EIO_FLAG_PTR2_FREE;
712 req->sv1 = newSVsv (fh_or_path); 747 req->sv1 = newSVsv (fh_or_path);
713 748
714 if (SvPOK (fh_or_path)) 749 if (SvPOK (req->sv1))
715 { 750 {
716 req->type = ix; 751 req->type = ix;
717 req->ptr1 = SvPVbyte_nolen (req->sv1); 752 req->ptr1 = SvPVbyte_nolen (req->sv1);
718 } 753 }
719 else 754 else
… …
733 768
734 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 769 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
735 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; 770 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
736 req->sv1 = newSVsv (fh_or_path); 771 req->sv1 = newSVsv (fh_or_path);
737 772
738 if (SvPOK (fh_or_path)) 773 if (SvPOK (req->sv1))
739 { 774 {
740 req->type = EIO_UTIME; 775 req->type = EIO_UTIME;
741 req->ptr1 = SvPVbyte_nolen (req->sv1); 776 req->ptr1 = SvPVbyte_nolen (req->sv1);
742 } 777 }
743 else 778 else
… …
756 dREQ; 791 dREQ;
757 792
758 req->sv1 = newSVsv (fh_or_path); 793 req->sv1 = newSVsv (fh_or_path);
759 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 794 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
760 795
761 if (SvPOK (fh_or_path)) 796 if (SvPOK (req->sv1))
762 { 797 {
763 req->type = EIO_TRUNCATE; 798 req->type = EIO_TRUNCATE;
764 req->ptr1 = SvPVbyte_nolen (req->sv1); 799 req->ptr1 = SvPVbyte_nolen (req->sv1);
765 } 800 }
766 else 801 else
… …
774 809
775void 810void
776aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef) 811aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
777 ALIAS: 812 ALIAS:
778 aio_chmod = EIO_CHMOD 813 aio_chmod = EIO_CHMOD
779 aio_fchmod = EIO_FCHMOD
780 aio_mkdir = EIO_MKDIR 814 aio_mkdir = EIO_MKDIR
781 PPCODE: 815 PPCODE:
782{ 816{
783 dREQ; 817 dREQ;
784 818
785 req->type = ix;
786 req->int2 = mode; 819 req->int2 = mode;
787 req->sv1 = newSVsv (fh_or_path); 820 req->sv1 = newSVsv (fh_or_path);
788 821
789 if (ix == EIO_FCHMOD) 822 if (SvPOK (req->sv1))
790 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 823 {
824 req->type = ix;
825 req->ptr1 = SvPVbyte_nolen (req->sv1);
826 }
791 else 827 else
792 req->ptr1 = SvPVbyte_nolen (req->sv1); 828 {
829 req->type = EIO_FCHMOD;
830 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
831 }
793 832
794 REQ_SEND; 833 REQ_SEND;
795} 834}
796 835
797void 836void
… …
802 841
803 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 842 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
804 req->int3 = SvOK (gid) ? SvIV (gid) : -1; 843 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
805 req->sv1 = newSVsv (fh_or_path); 844 req->sv1 = newSVsv (fh_or_path);
806 845
807 if (SvPOK (fh_or_path)) 846 if (SvPOK (req->sv1))
808 { 847 {
809 req->type = EIO_CHOWN; 848 req->type = EIO_CHOWN;
810 req->ptr1 = SvPVbyte_nolen (req->sv1); 849 req->ptr1 = SvPVbyte_nolen (req->sv1);
811 } 850 }
812 else 851 else
… …
888{ 927{
889 dREQ; 928 dREQ;
890 929
891 req->type = EIO_GROUP; 930 req->type = EIO_GROUP;
892 931
893 eio_submit (req); 932 req_submit (req);
894 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 933 XPUSHs (req_sv (req, AIO_GRP_KLASS));
895} 934}
896 935
897void 936void
898aio_nop (SV *callback=&PL_sv_undef) 937aio_nop (SV *callback=&PL_sv_undef)
… …
910 949
911int 950int
912aioreq_pri (int pri = 0) 951aioreq_pri (int pri = 0)
913 PROTOTYPE: ;$ 952 PROTOTYPE: ;$
914 CODE: 953 CODE:
915 RETVAL = next_pri - EIO_PRI_BIAS; 954 RETVAL = next_pri;
916 if (items > 0) 955 if (items > 0)
917 { 956 {
918 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN; 957 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
919 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX; 958 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
920 next_pri = pri + EIO_PRI_BIAS; 959 next_pri = pri;
921 } 960 }
922 OUTPUT: 961 OUTPUT:
923 RETVAL 962 RETVAL
924 963
925void 964void
926aioreq_nice (int nice = 0) 965aioreq_nice (int nice = 0)
927 CODE: 966 CODE:
928 nice = next_pri - nice; 967 nice = next_pri - nice;
929 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN; 968 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
930 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX; 969 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
931 next_pri = nice + EIO_PRI_BIAS; 970 next_pri = nice;
932 971
933void 972void
934flush () 973flush ()
935 PROTOTYPE: 974 PROTOTYPE:
936 CODE: 975 CODE:
… …
997 1036
998int 1037int
999nthreads() 1038nthreads()
1000 PROTOTYPE: 1039 PROTOTYPE:
1001 CODE: 1040 CODE:
1002 if (WORDACCESS_UNSAFE) X_LOCK (wrklock); 1041 RETVAL = eio_nthreads ();
1003 RETVAL = started;
1004 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1005 OUTPUT: 1042 OUTPUT:
1006 RETVAL 1043 RETVAL
1007 1044
1045void _on_next_submit (SV *cb)
1046 CODE:
1047 SvREFCNT_dec (on_next_submit);
1048 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1049
1008PROTOTYPES: DISABLE 1050PROTOTYPES: DISABLE
1009 1051
1010MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1052MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1011 1053
1012void 1054void
… …
1014 CODE: 1056 CODE:
1015 eio_cancel (req); 1057 eio_cancel (req);
1016 1058
1017void 1059void
1018cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1060cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1019 CODE: 1061 PPCODE:
1062{
1063 if (GIMME_V != G_VOID)
1064 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1065
1066 if (items > 1)
1067 {
1068 SV *cb_cv = get_cb (callback);
1069
1020 SvREFCNT_dec (req->callback); 1070 SvREFCNT_dec (req->callback);
1021 req->callback = newSVsv (callback); 1071 req->callback = SvREFCNT_inc (cb_cv);
1072 }
1073}
1022 1074
1023MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1075MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1024 1076
1025void 1077void
1026add (aio_req grp, ...) 1078add (aio_req grp, ...)

Diff Legend

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