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.130 by root, Thu Oct 2 11:35:03 2008 UTC vs.
Revision 1.149 by root, Tue Jun 30 07:33:58 2009 UTC

… …
75 75
76#define EIO_STRUCT_STAT Stat_t 76#define EIO_STRUCT_STAT Stat_t
77 77
78/* use NV for 32 bit perls as it allows larger offsets */ 78/* use NV for 32 bit perls as it allows larger offsets */
79#if IVSIZE >= 8 79#if IVSIZE >= 8
80# define VAL64 IV
80# define SvVAL64 SvIV 81# define SvVAL64 SvIV
82# define newSVval64 newSViv
81#else 83#else
84# define VAL64 NV
82# define SvVAL64 SvNV 85# define SvVAL64 SvNV
86# define newSVval64 newSVnv
83#endif 87#endif
84 88
85/*****************************************************************************/ 89/*****************************************************************************/
86 90
87#if __GNUC__ >= 3 91#if __GNUC__ >= 3
… …
95 99
96/*****************************************************************************/ 100/*****************************************************************************/
97 101
98static HV *stash; 102static HV *stash;
99typedef SV SV8; /* byte-sv, used for argument-checking */ 103typedef SV SV8; /* byte-sv, used for argument-checking */
104typedef int aio_rfd; /* read file desriptor */
105typedef int aio_wfd; /* write file descriptor */
100 106
101#define AIO_REQ_KLASS "IO::AIO::REQ" 107#define AIO_REQ_KLASS "IO::AIO::REQ"
102#define AIO_GRP_KLASS "IO::AIO::GRP" 108#define AIO_GRP_KLASS "IO::AIO::GRP"
103 109
104#define EIO_REQ_MEMBERS \ 110#define EIO_REQ_MEMBERS \
… …
109 115
110#define EIO_NO_WRAPPERS 1 116#define EIO_NO_WRAPPERS 1
111 117
112#include "libeio/eio.h" 118#include "libeio/eio.h"
113 119
120#ifndef POSIX_FADV_NORMAL
121# define POSIX_FADV_NORMAL 0
122# define NO_FADVISE 1
123#endif
124
125#ifndef POSIX_FADV_SEQUENTIAL
126# define POSIX_FADV_SEQUENTIAL 0
127#endif
128
129#ifndef POSIX_FADV_RANDOM
130# define POSIX_FADV_RANDOM 0
131#endif
132
133#ifndef POSIX_FADV_NOREUSE
134# define POSIX_FADV_NOREUSE 0
135#endif
136
137#ifndef POSIX_FADV_WILLNEED
138# define POSIX_FADV_WILLNEED 0
139#endif
140
141#ifndef POSIX_FADV_DONTNEED
142# define POSIX_FADV_DONTNEED 0
143#endif
144
114static int req_invoke (eio_req *req); 145static int req_invoke (eio_req *req);
115#define EIO_FINISH(req) req_invoke (req) 146#define EIO_FINISH(req) req_invoke (req)
116static void aio_grp_feed (eio_req *grp);
117#define EIO_FEED(req) aio_grp_feed (req)
118static void req_destroy (eio_req *grp); 147static void req_destroy (eio_req *grp);
119#define EIO_DESTROY(req) req_destroy (req) 148#define EIO_DESTROY(req) req_destroy (req)
120 149
121enum { 150enum {
122 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ 151 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
… …
230 SV *rv = &PL_sv_undef; 259 SV *rv = &PL_sv_undef;
231 260
232 if (req->result >= 0) 261 if (req->result >= 0)
233 { 262 {
234 int i; 263 int i;
235 char *buf = req->ptr2; 264 char *names = (char *)req->ptr2;
265 eio_dirent *ent = (eio_dirent *)req->ptr1; /* might be 0 */
236 AV *av = newAV (); 266 AV *av = newAV ();
237 267
238 av_extend (av, req->result - 1); 268 av_extend (av, req->result - 1);
239 269
240 for (i = 0; i < req->result; ++i) 270 for (i = 0; i < req->result; ++i)
241 { 271 {
242 SV *sv = newSVpv (buf, 0); 272 if (req->int1 & EIO_READDIR_DENTS)
273 {
274 SV *namesv = newSVpvn (names + ent->nameofs, ent->namelen);
243 275
276 if (req->int1 & EIO_READDIR_CUSTOM2)
277 {
278 static SV *sv_type [EIO_DT_MAX + 1]; /* type sv cache */
279 AV *avent = newAV ();
280
281 av_extend (avent, 2);
282
283 if (!sv_type [ent->type])
284 {
285 sv_type [ent->type] = newSViv (ent->type);
286 SvREADONLY_on (sv_type [ent->type]);
287 }
288
289 av_store (avent, 0, namesv);
290 av_store (avent, 1, SvREFCNT_inc (sv_type [ent->type]));
291 av_store (avent, 2, IVSIZE >= 8 ? newSVuv (ent->inode) : newSVnv (ent->inode));
292
293 av_store (av, i, newRV_noinc ((SV *)avent));
294 }
295 else
244 av_store (av, i, sv); 296 av_store (av, i, namesv);
297
298 ++ent;
299 }
300 else
301 {
302 SV *name = newSVpv (names, 0);
303 av_store (av, i, name);
245 buf += SvCUR (sv) + 1; 304 names += SvCUR (name) + 1;
305 }
246 } 306 }
247 307
248 rv = sv_2mortal (newRV_noinc ((SV *)av)); 308 rv = sv_2mortal (newRV_noinc ((SV *)av));
249 } 309 }
250 310
251 PUSHs (rv); 311 PUSHs (rv);
312
313 if (req->int1 & EIO_READDIR_CUSTOM1)
314 XPUSHs (sv_2mortal (newSViv (req->int1 & ~(EIO_READDIR_CUSTOM1 | EIO_READDIR_CUSTOM2))));
252 } 315 }
253 break; 316 break;
254 317
255 case EIO_OPEN: 318 case EIO_OPEN:
256 { 319 {
… …
262 GV *gv = (GV *)sv_newmortal (); 325 GV *gv = (GV *)sv_newmortal ();
263 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR); 326 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
264 char sym [64]; 327 char sym [64];
265 int symlen; 328 int symlen;
266 329
267 symlen = snprintf (sym, sizeof (sym), "fd#%d", req->result); 330 symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
268 gv_init (gv, stash, sym, symlen, 0); 331 gv_init (gv, stash, sym, symlen, 0);
269 332
270 symlen = snprintf ( 333 symlen = snprintf (
271 sym, 334 sym,
272 sizeof (sym), 335 sizeof (sym),
273 "%s&=%d", 336 "%s&=%d",
274 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<", 337 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
275 req->result 338 (int)req->result
276 ); 339 );
277 340
278 if (do_open (gv, sym, symlen, 0, 0, 0, 0)) 341 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
279 fh = (SV *)gv; 342 fh = (SV *)gv;
280 } 343 }
… …
314 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 377 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
315 PUSHs (sv_2mortal (newSViv (req->result))); 378 PUSHs (sv_2mortal (newSViv (req->result)));
316 break; 379 break;
317 380
318 case EIO_READ: 381 case EIO_READ:
382 {
319 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0)); 383 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
320 *SvEND (req->sv2) = 0; 384 *SvEND (req->sv2) = 0;
385 SvPOK_only (req->sv2);
386 SvSETMAGIC (req->sv2);
321 PUSHs (sv_2mortal (newSViv (req->result))); 387 PUSHs (sv_2mortal (newSViv (req->result)));
388 }
322 break; 389 break;
323 390
324 case EIO_DUP2: 391 case EIO_DUP2:
325 if (req->result > 0) 392 if (req->result > 0)
326 req->result = 0; 393 req->result = 0;
… …
501 req_submit (req); \ 568 req_submit (req); \
502 SPAGAIN; \ 569 SPAGAIN; \
503 \ 570 \
504 if (GIMME_V != G_VOID) \ 571 if (GIMME_V != G_VOID) \
505 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 572 XPUSHs (req_sv (req, AIO_REQ_KLASS));
506 573
574static int
575extract_fd (SV *fh, int wr)
576{
577 int fd = PerlIO_fileno (wr ? IoOFP (sv_2io (fh)) : IoIFP (sv_2io (fh)));
578
579 if (fd < 0)
580 croak ("illegal fh argument, either not an OS file or read/write mode mismatch");
581
582 return fd;
583}
584
507MODULE = IO::AIO PACKAGE = IO::AIO 585MODULE = IO::AIO PACKAGE = IO::AIO
508 586
509PROTOTYPES: ENABLE 587PROTOTYPES: ENABLE
510 588
511BOOT: 589BOOT:
512{ 590{
513 stash = gv_stashpv ("IO::AIO", 1); 591 static const struct {
514 592 const char *name;
515 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 593 IV iv;
516 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 594 } *civ, const_iv[] = {
517 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 595# define const_iv(name, value) { # name, (IV) value },
518 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 596# define const_eio(name) { # name, (IV) EIO_ ## name },
519 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 597 const_iv (EXDEV , EXDEV)
598 const_iv (ENOSYS , ENOSYS)
599 const_iv (O_RDONLY, O_RDONLY)
600 const_iv (O_WRONLY, O_WRONLY)
601 const_iv (O_CREAT , O_CREAT)
602 const_iv (O_TRUNC , O_TRUNC)
520#ifndef _WIN32 603#ifndef _WIN32
521 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 604 const_iv (S_IFIFO , S_IFIFO)
522#endif 605#endif
606 const_iv (FADV_NORMAL , POSIX_FADV_NORMAL)
607 const_iv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL)
608 const_iv (FADV_RANDOM , POSIX_FADV_RANDOM)
609 const_iv (FADV_NOREUSE , POSIX_FADV_NOREUSE)
610 const_iv (FADV_WILLNEED , POSIX_FADV_WILLNEED)
611 const_iv (FADV_DONTNEED , POSIX_FADV_DONTNEED)
523 612
613 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
614 const_eio (SYNC_FILE_RANGE_WRITE)
615 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
616
617 const_eio (READDIR_DENTS)
618 const_eio (READDIR_DIRS_FIRST)
619 const_eio (READDIR_STAT_ORDER)
620 const_eio (READDIR_FOUND_UNKNOWN)
621
622 const_eio (DT_UNKNOWN)
623 const_eio (DT_FIFO)
624 const_eio (DT_CHR)
625 const_eio (DT_DIR)
626 const_eio (DT_BLK)
627 const_eio (DT_REG)
628 const_eio (DT_LNK)
629 const_eio (DT_SOCK)
630 const_eio (DT_WHT)
631 };
632
633 stash = gv_stashpv ("IO::AIO", 1);
634
635 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
636 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
637
524 create_respipe (); 638 create_respipe ();
525 639
526 if (eio_init (want_poll, done_poll) < 0) 640 if (eio_init (want_poll, done_poll) < 0)
527 croak ("IO::AIO: unable to initialise eio library"); 641 croak ("IO::AIO: unable to initialise eio library");
528 642
529 /* atfork child called in fifo order, so before eio's handler */ 643 /* atfork child called in fifo order, so before eio's handler */
530 X_THREAD_ATFORK (0, 0, atfork_child); 644 X_THREAD_ATFORK (0, 0, atfork_child);
531} 645}
532 646
533void 647void
534max_poll_reqs (int nreqs) 648max_poll_reqs (int nreqs)
535 PROTOTYPE: $ 649 PROTOTYPE: $
… …
588 ALIAS: 702 ALIAS:
589 aio_fsync = EIO_FSYNC 703 aio_fsync = EIO_FSYNC
590 aio_fdatasync = EIO_FDATASYNC 704 aio_fdatasync = EIO_FDATASYNC
591 PPCODE: 705 PPCODE:
592{ 706{
707 int fd = extract_fd (fh, 0);
593 dREQ; 708 dREQ;
594 709
595 req->type = ix; 710 req->type = ix;
596 req->sv1 = newSVsv (fh); 711 req->sv1 = newSVsv (fh);
597 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 712 req->int1 = fd;
713
714 REQ_SEND (req);
715}
716
717void
718aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef)
719 PROTOTYPE: $$$$;$
720 PPCODE:
721{
722 int fd = extract_fd (fh, 0);
723 dREQ;
724
725 req->type = EIO_SYNC_FILE_RANGE;
726 req->sv1 = newSVsv (fh);
727 req->int1 = fd;
728 req->offs = offset;
729 req->size = nbytes;
730 req->int2 = flags;
598 731
599 REQ_SEND (req); 732 REQ_SEND (req);
600} 733}
601 734
602void 735void
603aio_close (SV *fh, SV *callback=&PL_sv_undef) 736aio_close (SV *fh, SV *callback=&PL_sv_undef)
604 PROTOTYPE: $;$ 737 PROTOTYPE: $;$
605 PPCODE: 738 PPCODE:
606{ 739{
607 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 740 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
741 int fd = extract_fd (fh, 0);
608 dREQ; 742 dREQ;
609 743
610 if (close_pipe < 0) 744 if (close_pipe < 0)
611 { 745 {
612 int pipefd [2]; 746 int pipefd [2];
… …
620 } 754 }
621 755
622 req->type = EIO_DUP2; 756 req->type = EIO_DUP2;
623 req->int1 = close_pipe; 757 req->int1 = close_pipe;
624 req->sv2 = newSVsv (fh); 758 req->sv2 = newSVsv (fh);
625 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 759 req->int2 = fd;
626 760
627 REQ_SEND (req); 761 REQ_SEND (req);
628} 762}
629 763
630void 764void
… …
634 aio_write = EIO_WRITE 768 aio_write = EIO_WRITE
635 PROTOTYPE: $$$$$;$ 769 PROTOTYPE: $$$$$;$
636 PPCODE: 770 PPCODE:
637{ 771{
638 STRLEN svlen; 772 STRLEN svlen;
773 int fd = extract_fd (fh, ix == EIO_WRITE);
639 char *svptr = SvPVbyte (data, svlen); 774 char *svptr = SvPVbyte (data, svlen);
640 UV len = SvUV (length); 775 UV len = SvUV (length);
641
642 SvUPGRADE (data, SVt_PV);
643 SvPOK_on (data);
644 776
645 if (dataoffset < 0) 777 if (dataoffset < 0)
646 dataoffset += svlen; 778 dataoffset += svlen;
647 779
648 if (dataoffset < 0 || dataoffset > svlen) 780 if (dataoffset < 0 || dataoffset > svlen)
… …
654 if (!SvOK (length) || len + dataoffset > svlen) 786 if (!SvOK (length) || len + dataoffset > svlen)
655 len = svlen - dataoffset; 787 len = svlen - dataoffset;
656 } 788 }
657 else 789 else
658 { 790 {
659 /* read: grow scalar as necessary */ 791 /* read: check type and grow scalar as necessary */
792 SvUPGRADE (data, SVt_PV);
660 svptr = SvGROW (data, len + dataoffset + 1); 793 svptr = SvGROW (data, len + dataoffset + 1);
661 } 794 }
662
663 if (len < 0)
664 croak ("length must not be negative");
665 795
666 { 796 {
667 dREQ; 797 dREQ;
668 798
669 req->type = ix; 799 req->type = ix;
670 req->sv1 = newSVsv (fh); 800 req->sv1 = newSVsv (fh);
671 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 801 req->int1 = fd;
672 : IoOFP (sv_2io (fh)));
673 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 802 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
674 req->size = len; 803 req->size = len;
675 req->sv2 = SvREFCNT_inc_NN (data); 804 req->sv2 = SvREFCNT_inc (data);
676 req->ptr2 = (char *)svptr + dataoffset; 805 req->ptr2 = (char *)svptr + dataoffset;
677 req->stroffset = dataoffset; 806 req->stroffset = dataoffset;
678 807
679 if (!SvREADONLY (data)) 808 if (!SvREADONLY (data))
680 { 809 {
… …
700 829
701 REQ_SEND; 830 REQ_SEND;
702} 831}
703 832
704void 833void
705aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef) 834aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef)
706 PROTOTYPE: $$$$;$ 835 PROTOTYPE: $$$$;$
707 PPCODE: 836 PPCODE:
708{ 837{
838 int ifd = extract_fd (in_fh , 0);
839 int ofd = extract_fd (out_fh, 0);
709 dREQ; 840 dREQ;
710 841
711 req->type = EIO_SENDFILE; 842 req->type = EIO_SENDFILE;
712 req->sv1 = newSVsv (out_fh); 843 req->sv1 = newSVsv (out_fh);
713 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 844 req->int1 = ofd;
714 req->sv2 = newSVsv (in_fh); 845 req->sv2 = newSVsv (in_fh);
715 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 846 req->int2 = ifd;
716 req->offs = SvVAL64 (in_offset); 847 req->offs = in_offset;
717 req->size = length; 848 req->size = length;
718 849
719 REQ_SEND; 850 REQ_SEND;
720} 851}
721 852
722void 853void
723aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef) 854aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef)
724 PROTOTYPE: $$$;$ 855 PROTOTYPE: $$$;$
725 PPCODE: 856 PPCODE:
726{ 857{
858 int fd = extract_fd (fh, 0);
727 dREQ; 859 dREQ;
728 860
729 req->type = EIO_READAHEAD; 861 req->type = EIO_READAHEAD;
730 req->sv1 = newSVsv (fh); 862 req->sv1 = newSVsv (fh);
731 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 863 req->int1 = fd;
732 req->offs = SvVAL64 (offset); 864 req->offs = offset;
733 req->size = length; 865 req->size = length;
734 866
735 REQ_SEND; 867 REQ_SEND;
736} 868}
737 869
… …
853 req->type = EIO_FCHOWN; 985 req->type = EIO_FCHOWN;
854 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 986 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
855 } 987 }
856 988
857 REQ_SEND; 989 REQ_SEND;
990}
991
992void
993aio_readdirx (SV8 *pathname, IV flags, SV *callback=&PL_sv_undef)
994 PPCODE:
995{
996 dREQ;
997
998 req->type = EIO_READDIR;
999 req->sv1 = newSVsv (pathname);
1000 req->ptr1 = SvPVbyte_nolen (req->sv1);
1001 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
1002
1003 if (flags & EIO_READDIR_DENTS)
1004 req->int1 |= EIO_READDIR_CUSTOM2;
1005
1006 REQ_SEND;
858} 1007}
859 1008
860void 1009void
861aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 1010aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
862 ALIAS: 1011 ALIAS:
… …
1040 CODE: 1189 CODE:
1041 RETVAL = eio_nthreads (); 1190 RETVAL = eio_nthreads ();
1042 OUTPUT: 1191 OUTPUT:
1043 RETVAL 1192 RETVAL
1044 1193
1194int
1195fadvise (aio_rfd fh, off_t offset, off_t length, IV advice)
1196 PROTOTYPE: $$$$
1197 CODE:
1198{
1199 #if _XOPEN_SOURCE >= 600 && !NO_FADVISE
1200 RETVAL = posix_fadvise (fh, offset, length, advice);
1201 #else
1202 RETVAL = errno = ENOSYS;
1203 #endif
1204}
1205 OUTPUT:
1206 RETVAL
1207
1208ssize_t
1209sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
1210 PROTOTYPE: $$$$
1211 CODE:
1212 eio_sendfile_sync (ofh, ifh, offset, count);
1213
1045void _on_next_submit (SV *cb) 1214void _on_next_submit (SV *cb)
1046 CODE: 1215 CODE:
1047 SvREFCNT_dec (on_next_submit); 1216 SvREFCNT_dec (on_next_submit);
1048 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1217 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1049 1218
… …
1110 AV *av; 1279 AV *av;
1111 1280
1112 grp->errorno = errno; 1281 grp->errorno = errno;
1113 1282
1114 av = newAV (); 1283 av = newAV ();
1284 av_extend (av, items - 1);
1115 1285
1116 for (i = 1; i < items; ++i ) 1286 for (i = 1; i < items; ++i )
1117 av_push (av, newSVsv (ST (i))); 1287 av_push (av, newSVsv (ST (i)));
1118 1288
1119 SvREFCNT_dec (grp->sv1); 1289 SvREFCNT_dec (grp->sv1);
… …
1133void 1303void
1134feed (aio_req grp, SV *callback=&PL_sv_undef) 1304feed (aio_req grp, SV *callback=&PL_sv_undef)
1135 CODE: 1305 CODE:
1136{ 1306{
1137 SvREFCNT_dec (grp->sv2); 1307 SvREFCNT_dec (grp->sv2);
1138 grp->sv2 = newSVsv (callback); 1308 grp->sv2 = newSVsv (callback);
1309 grp->feed = aio_grp_feed;
1139 1310
1140 if (grp->int2 <= 0) 1311 if (grp->int2 <= 0)
1141 grp->int2 = 2; 1312 grp->int2 = 2;
1142 1313
1143 eio_grp_limit (grp, grp->int2); 1314 eio_grp_limit (grp, grp->int2);

Diff Legend

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