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.136 by root, Sun Apr 19 13:15:55 2009 UTC vs.
Revision 1.150 by root, Wed Jul 1 08:11:24 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 \
… …
108 SV *self; 114 SV *self;
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"
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
113 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 req_destroy (eio_req *grp); 147static void req_destroy (eio_req *grp);
117#define EIO_DESTROY(req) req_destroy (req) 148#define EIO_DESTROY(req) req_destroy (req)
… …
228 SV *rv = &PL_sv_undef; 259 SV *rv = &PL_sv_undef;
229 260
230 if (req->result >= 0) 261 if (req->result >= 0)
231 { 262 {
232 int i; 263 int i;
233 char *buf = req->ptr2; 264 char *names = (char *)req->ptr2;
265 eio_dirent *ent = (eio_dirent *)req->ptr1; /* might be 0 */
234 AV *av = newAV (); 266 AV *av = newAV ();
235 267
236 av_extend (av, req->result - 1); 268 av_extend (av, req->result - 1);
237 269
238 for (i = 0; i < req->result; ++i) 270 for (i = 0; i < req->result; ++i)
239 { 271 {
240 SV *sv = newSVpv (buf, 0); 272 if (req->int1 & EIO_READDIR_DENTS)
273 {
274 SV *namesv = newSVpvn (names + ent->nameofs, ent->namelen);
241 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
242 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);
243 buf += SvCUR (sv) + 1; 304 names += SvCUR (name) + 1;
305 }
244 } 306 }
245 307
246 rv = sv_2mortal (newRV_noinc ((SV *)av)); 308 rv = sv_2mortal (newRV_noinc ((SV *)av));
247 } 309 }
248 310
249 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))));
250 } 315 }
251 break; 316 break;
252 317
253 case EIO_OPEN: 318 case EIO_OPEN:
254 { 319 {
… …
260 GV *gv = (GV *)sv_newmortal (); 325 GV *gv = (GV *)sv_newmortal ();
261 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR); 326 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
262 char sym [64]; 327 char sym [64];
263 int symlen; 328 int symlen;
264 329
265 symlen = snprintf (sym, sizeof (sym), "fd#%d", req->result); 330 symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
266 gv_init (gv, stash, sym, symlen, 0); 331 gv_init (gv, stash, sym, symlen, 0);
267 332
268 symlen = snprintf ( 333 symlen = snprintf (
269 sym, 334 sym,
270 sizeof (sym), 335 sizeof (sym),
271 "%s&=%d", 336 "%s&=%d",
272 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<", 337 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
273 req->result 338 (int)req->result
274 ); 339 );
275 340
276 if (do_open (gv, sym, symlen, 0, 0, 0, 0)) 341 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
277 fh = (SV *)gv; 342 fh = (SV *)gv;
278 } 343 }
… …
312 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 377 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
313 PUSHs (sv_2mortal (newSViv (req->result))); 378 PUSHs (sv_2mortal (newSViv (req->result)));
314 break; 379 break;
315 380
316 case EIO_READ: 381 case EIO_READ:
382 {
317 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));
318 *SvEND (req->sv2) = 0; 384 *SvEND (req->sv2) = 0;
385 SvPOK_only (req->sv2);
386 SvSETMAGIC (req->sv2);
319 PUSHs (sv_2mortal (newSViv (req->result))); 387 PUSHs (sv_2mortal (newSViv (req->result)));
388 }
320 break; 389 break;
321 390
322 case EIO_DUP2: 391 case EIO_DUP2:
323 if (req->result > 0) 392 if (req->result > 0)
324 req->result = 0; 393 req->result = 0;
… …
517 586
518PROTOTYPES: ENABLE 587PROTOTYPES: ENABLE
519 588
520BOOT: 589BOOT:
521{ 590{
522 stash = gv_stashpv ("IO::AIO", 1); 591 static const struct {
523 592 const char *name;
524 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 593 IV iv;
525 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 594 } *civ, const_iv[] = {
526 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 595# define const_iv(name, value) { # name, (IV) value },
527 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 596# define const_eio(name) { # name, (IV) EIO_ ## name },
528 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)
529#ifndef _WIN32 603#ifndef _WIN32
530 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 604 const_iv (S_IFIFO , S_IFIFO)
531#endif 605#endif
532 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 606 const_iv (FADV_NORMAL , POSIX_FADV_NORMAL)
533 newCONSTSUB (stash, "SYNC_FILE_RANGE_WAIT_BEFORE", newSViv (EIO_SYNC_FILE_RANGE_WAIT_BEFORE)); 607 const_iv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL)
534 newCONSTSUB (stash, "SYNC_FILE_RANGE_WRITE" , newSViv (EIO_SYNC_FILE_RANGE_WRITE)); 608 const_iv (FADV_RANDOM , POSIX_FADV_RANDOM)
535 newCONSTSUB (stash, "SYNC_FILE_RANGE_WAIT_AFTER" , newSViv (EIO_SYNC_FILE_RANGE_WAIT_AFTER)); 609 const_iv (FADV_NOREUSE , POSIX_FADV_NOREUSE)
610 const_iv (FADV_WILLNEED , POSIX_FADV_WILLNEED)
611 const_iv (FADV_DONTNEED , POSIX_FADV_DONTNEED)
536 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
537 create_respipe (); 638 create_respipe ();
538 639
539 if (eio_init (want_poll, done_poll) < 0) 640 if (eio_init (want_poll, done_poll) < 0)
540 croak ("IO::AIO: unable to initialise eio library"); 641 croak ("IO::AIO: unable to initialise eio library");
541 642
542 /* atfork child called in fifo order, so before eio's handler */ 643 /* atfork child called in fifo order, so before eio's handler */
543 X_THREAD_ATFORK (0, 0, atfork_child); 644 X_THREAD_ATFORK (0, 0, atfork_child);
544} 645}
545 646
546void 647void
547max_poll_reqs (int nreqs) 648max_poll_reqs (int nreqs)
548 PROTOTYPE: $ 649 PROTOTYPE: $
… …
612 713
613 REQ_SEND (req); 714 REQ_SEND (req);
614} 715}
615 716
616void 717void
617aio_sync_file_range (SV *fh, SV *offset, SV *nbytes, IV flags, SV *callback=&PL_sv_undef) 718aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef)
618 PROTOTYPE: $$$$;$ 719 PROTOTYPE: $$$$;$
619 PPCODE: 720 PPCODE:
620{ 721{
621 int fd = extract_fd (fh, 0); 722 int fd = extract_fd (fh, 0);
622 dREQ; 723 dREQ;
623 724
624 req->type = EIO_SYNC_FILE_RANGE; 725 req->type = EIO_SYNC_FILE_RANGE;
625 req->sv1 = newSVsv (fh); 726 req->sv1 = newSVsv (fh);
626 req->int1 = fd; 727 req->int1 = fd;
627 req->offs = SvVAL64 (offset); 728 req->offs = offset;
628 req->size = SvVAL64 (nbytes); 729 req->size = nbytes;
629 req->int2 = flags; 730 req->int2 = flags;
630 731
631 REQ_SEND (req); 732 REQ_SEND (req);
632} 733}
633 734
… …
667 aio_write = EIO_WRITE 768 aio_write = EIO_WRITE
668 PROTOTYPE: $$$$$;$ 769 PROTOTYPE: $$$$$;$
669 PPCODE: 770 PPCODE:
670{ 771{
671 STRLEN svlen; 772 STRLEN svlen;
773 int fd = extract_fd (fh, ix == EIO_WRITE);
672 char *svptr = SvPVbyte (data, svlen); 774 char *svptr = SvPVbyte (data, svlen);
673 UV len = SvUV (length); 775 UV len = SvUV (length);
674 int fd;
675
676 if (SvTYPE (data) > SVt_PVMG)
677 croak ("illegal data argument '%s', must be plain scalar string", SvPV_nolen (data));
678
679 SvUPGRADE (data, SVt_PV);
680 SvPOK_only (data);
681 776
682 if (dataoffset < 0) 777 if (dataoffset < 0)
683 dataoffset += svlen; 778 dataoffset += svlen;
684 779
685 if (dataoffset < 0 || dataoffset > svlen) 780 if (dataoffset < 0 || dataoffset > svlen)
… …
691 if (!SvOK (length) || len + dataoffset > svlen) 786 if (!SvOK (length) || len + dataoffset > svlen)
692 len = svlen - dataoffset; 787 len = svlen - dataoffset;
693 } 788 }
694 else 789 else
695 { 790 {
696 /* read: grow scalar as necessary */ 791 /* read: check type and grow scalar as necessary */
792 SvUPGRADE (data, SVt_PV);
697 svptr = SvGROW (data, len + dataoffset + 1); 793 svptr = SvGROW (data, len + dataoffset + 1);
698 } 794 }
699
700 if (len < 0)
701 croak ("length must not be negative");
702
703 fd = extract_fd (fh, ix == EIO_WRITE);
704 795
705 { 796 {
706 dREQ; 797 dREQ;
707 798
708 req->type = ix; 799 req->type = ix;
… …
738 829
739 REQ_SEND; 830 REQ_SEND;
740} 831}
741 832
742void 833void
743aio_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)
744 PROTOTYPE: $$$$;$ 835 PROTOTYPE: $$$$;$
745 PPCODE: 836 PPCODE:
746{ 837{
747 int ifd = extract_fd (in_fh , 0); 838 int ifd = extract_fd (in_fh , 0);
748 int ofd = extract_fd (out_fh, 0); 839 int ofd = extract_fd (out_fh, 0);
… …
751 req->type = EIO_SENDFILE; 842 req->type = EIO_SENDFILE;
752 req->sv1 = newSVsv (out_fh); 843 req->sv1 = newSVsv (out_fh);
753 req->int1 = ofd; 844 req->int1 = ofd;
754 req->sv2 = newSVsv (in_fh); 845 req->sv2 = newSVsv (in_fh);
755 req->int2 = ifd; 846 req->int2 = ifd;
756 req->offs = SvVAL64 (in_offset); 847 req->offs = in_offset;
757 req->size = length; 848 req->size = length;
758 849
759 REQ_SEND; 850 REQ_SEND;
760} 851}
761 852
762void 853void
763aio_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)
764 PROTOTYPE: $$$;$ 855 PROTOTYPE: $$$;$
765 PPCODE: 856 PPCODE:
766{ 857{
767 int fd = extract_fd (fh, 0); 858 int fd = extract_fd (fh, 0);
768 dREQ; 859 dREQ;
769 860
770 req->type = EIO_READAHEAD; 861 req->type = EIO_READAHEAD;
771 req->sv1 = newSVsv (fh); 862 req->sv1 = newSVsv (fh);
772 req->int1 = fd; 863 req->int1 = fd;
773 req->offs = SvVAL64 (offset); 864 req->offs = offset;
774 req->size = length; 865 req->size = length;
775 866
776 REQ_SEND; 867 REQ_SEND;
777} 868}
778 869
… …
894 req->type = EIO_FCHOWN; 985 req->type = EIO_FCHOWN;
895 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 986 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
896 } 987 }
897 988
898 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;
899} 1007}
900 1008
901void 1009void
902aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 1010aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
903 ALIAS: 1011 ALIAS:
… …
1081 CODE: 1189 CODE:
1082 RETVAL = eio_nthreads (); 1190 RETVAL = eio_nthreads ();
1083 OUTPUT: 1191 OUTPUT:
1084 RETVAL 1192 RETVAL
1085 1193
1194int
1195fadvise (aio_rfd fh, off_t offset, off_t length, IV advice)
1196 PROTOTYPE: $$$$
1197 CODE:
1198#if _XOPEN_SOURCE >= 600 && !NO_FADVISE
1199 RETVAL = posix_fadvise (fh, offset, length, advice);
1200#else
1201 RETVAL = errno = ENOSYS;
1202#endif
1203 OUTPUT:
1204 RETVAL
1205
1206ssize_t
1207sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
1208 PROTOTYPE: $$$$
1209 CODE:
1210 eio_sendfile_sync (ofh, ifh, offset, count);
1211
1086void _on_next_submit (SV *cb) 1212void _on_next_submit (SV *cb)
1087 CODE: 1213 CODE:
1088 SvREFCNT_dec (on_next_submit); 1214 SvREFCNT_dec (on_next_submit);
1089 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1215 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1090 1216
… …
1151 AV *av; 1277 AV *av;
1152 1278
1153 grp->errorno = errno; 1279 grp->errorno = errno;
1154 1280
1155 av = newAV (); 1281 av = newAV ();
1282 av_extend (av, items - 1);
1156 1283
1157 for (i = 1; i < items; ++i ) 1284 for (i = 1; i < items; ++i )
1158 av_push (av, newSVsv (ST (i))); 1285 av_push (av, newSVsv (ST (i)));
1159 1286
1160 SvREFCNT_dec (grp->sv1); 1287 SvREFCNT_dec (grp->sv1);

Diff Legend

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