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.122 by root, Tue May 13 19:35:16 2008 UTC vs.
Revision 1.151 by root, Tue Jul 14 00:13:36 2009 UTC

3#include <errno.h> 3#include <errno.h>
4 4
5#include "EXTERN.h" 5#include "EXTERN.h"
6#include "perl.h" 6#include "perl.h"
7#include "XSUB.h" 7#include "XSUB.h"
8
9#include "schmorp.h"
8 10
9#include <stddef.h> 11#include <stddef.h>
10#include <stdlib.h> 12#include <stdlib.h>
11#include <errno.h> 13#include <errno.h>
12#include <sys/types.h> 14#include <sys/types.h>
65# include <signal.h> 67# include <signal.h>
66# define EIO_STRUCT_DIRENT struct dirent 68# define EIO_STRUCT_DIRENT struct dirent
67 69
68#endif 70#endif
69 71
72/* perl stupidly overrides readdir and maybe others */
73/* with thread-unsafe versions, imagine that :( */
74#undef readdir
75#undef opendir
76#undef closedir
77
70#define EIO_STRUCT_STAT Stat_t 78#define EIO_STRUCT_STAT Stat_t
71 79
72/* use NV for 32 bit perls as it allows larger offsets */ 80/* use NV for 32 bit perls as it allows larger offsets */
73#if IVSIZE >= 8 81#if IVSIZE >= 8
82# define VAL64 IV
74# define SvVAL64 SvIV 83# define SvVAL64 SvIV
84# define newSVval64 newSViv
75#else 85#else
86# define VAL64 NV
76# define SvVAL64 SvNV 87# define SvVAL64 SvNV
88# define newSVval64 newSVnv
77#endif 89#endif
90
91/*****************************************************************************/
92
93#if __GNUC__ >= 3
94# define expect(expr,value) __builtin_expect ((expr),(value))
95#else
96# define expect(expr,value) (expr)
97#endif
98
99#define expect_false(expr) expect ((expr) != 0, 0)
100#define expect_true(expr) expect ((expr) != 0, 1)
101
102/*****************************************************************************/
78 103
79static HV *stash; 104static HV *stash;
80typedef SV SV8; /* byte-sv, used for argument-checking */ 105typedef SV SV8; /* byte-sv, used for argument-checking */
106typedef int aio_rfd; /* read file desriptor */
107typedef int aio_wfd; /* write file descriptor */
81 108
82#define AIO_REQ_KLASS "IO::AIO::REQ" 109#define AIO_REQ_KLASS "IO::AIO::REQ"
83#define AIO_GRP_KLASS "IO::AIO::GRP" 110#define AIO_GRP_KLASS "IO::AIO::GRP"
84 111
85#define EIO_REQ_MEMBERS \ 112#define EIO_REQ_MEMBERS \
90 117
91#define EIO_NO_WRAPPERS 1 118#define EIO_NO_WRAPPERS 1
92 119
93#include "libeio/eio.h" 120#include "libeio/eio.h"
94 121
122#ifndef POSIX_FADV_NORMAL
123# define POSIX_FADV_NORMAL 0
124# define NO_FADVISE 1
125#endif
126
127#ifndef POSIX_FADV_SEQUENTIAL
128# define POSIX_FADV_SEQUENTIAL 0
129#endif
130
131#ifndef POSIX_FADV_RANDOM
132# define POSIX_FADV_RANDOM 0
133#endif
134
135#ifndef POSIX_FADV_NOREUSE
136# define POSIX_FADV_NOREUSE 0
137#endif
138
139#ifndef POSIX_FADV_WILLNEED
140# define POSIX_FADV_WILLNEED 0
141#endif
142
143#ifndef POSIX_FADV_DONTNEED
144# define POSIX_FADV_DONTNEED 0
145#endif
146
95static int req_invoke (eio_req *req); 147static int req_invoke (eio_req *req);
96#define EIO_FINISH(req) req_invoke (req) 148#define EIO_FINISH(req) req_invoke (req)
97static void aio_grp_feed (eio_req *grp);
98#define EIO_FEED(req) aio_grp_feed (req)
99static void req_destroy (eio_req *grp); 149static void req_destroy (eio_req *grp);
100#define EIO_DESTROY(req) req_destroy (req) 150#define EIO_DESTROY(req) req_destroy (req)
101 151
102enum { 152enum {
103 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ 153 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
175 225
176static void req_submit (eio_req *req) 226static void req_submit (eio_req *req)
177{ 227{
178 eio_submit (req); 228 eio_submit (req);
179 229
180 if (on_next_submit) 230 if (expect_false (on_next_submit))
181 { 231 {
182 dSP; 232 dSP;
183 SV *cb = sv_2mortal (on_next_submit); 233 SV *cb = sv_2mortal (on_next_submit);
184 234
185 on_next_submit = 0; 235 on_next_submit = 0;
195 dSP; 245 dSP;
196 246
197 if (req->flags & FLAG_SV2_RO_OFF) 247 if (req->flags & FLAG_SV2_RO_OFF)
198 SvREADONLY_off (req->sv2); 248 SvREADONLY_off (req->sv2);
199 249
200 if (!EIO_CANCELLED (req) && SvOK (req->callback)) 250 if (!EIO_CANCELLED (req) && req->callback)
201 { 251 {
202 ENTER; 252 ENTER;
203 SAVETMPS; 253 SAVETMPS;
204 PUSHMARK (SP); 254 PUSHMARK (SP);
205 EXTEND (SP, 1); 255 EXTEND (SP, 1);
211 SV *rv = &PL_sv_undef; 261 SV *rv = &PL_sv_undef;
212 262
213 if (req->result >= 0) 263 if (req->result >= 0)
214 { 264 {
215 int i; 265 int i;
216 char *buf = req->ptr2; 266 char *names = (char *)req->ptr2;
267 eio_dirent *ent = (eio_dirent *)req->ptr1; /* might be 0 */
217 AV *av = newAV (); 268 AV *av = newAV ();
218 269
219 av_extend (av, req->result - 1); 270 av_extend (av, req->result - 1);
220 271
221 for (i = 0; i < req->result; ++i) 272 for (i = 0; i < req->result; ++i)
222 { 273 {
223 SV *sv = newSVpv (buf, 0); 274 if (req->int1 & EIO_READDIR_DENTS)
275 {
276 SV *namesv = newSVpvn (names + ent->nameofs, ent->namelen);
224 277
278 if (req->int1 & EIO_READDIR_CUSTOM2)
279 {
280 static SV *sv_type [EIO_DT_MAX + 1]; /* type sv cache */
281 AV *avent = newAV ();
282
283 av_extend (avent, 2);
284
285 if (!sv_type [ent->type])
286 {
287 sv_type [ent->type] = newSViv (ent->type);
288 SvREADONLY_on (sv_type [ent->type]);
289 }
290
291 av_store (avent, 0, namesv);
292 av_store (avent, 1, SvREFCNT_inc (sv_type [ent->type]));
293 av_store (avent, 2, IVSIZE >= 8 ? newSVuv (ent->inode) : newSVnv (ent->inode));
294
295 av_store (av, i, newRV_noinc ((SV *)avent));
296 }
297 else
225 av_store (av, i, sv); 298 av_store (av, i, namesv);
299
300 ++ent;
301 }
302 else
303 {
304 SV *name = newSVpv (names, 0);
305 av_store (av, i, name);
226 buf += SvCUR (sv) + 1; 306 names += SvCUR (name) + 1;
307 }
227 } 308 }
228 309
229 rv = sv_2mortal (newRV_noinc ((SV *)av)); 310 rv = sv_2mortal (newRV_noinc ((SV *)av));
230 } 311 }
231 312
232 PUSHs (rv); 313 PUSHs (rv);
314
315 if (req->int1 & EIO_READDIR_CUSTOM1)
316 XPUSHs (sv_2mortal (newSViv (req->int1 & ~(EIO_READDIR_CUSTOM1 | EIO_READDIR_CUSTOM2))));
233 } 317 }
234 break; 318 break;
235 319
236 case EIO_OPEN: 320 case EIO_OPEN:
237 { 321 {
243 GV *gv = (GV *)sv_newmortal (); 327 GV *gv = (GV *)sv_newmortal ();
244 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR); 328 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
245 char sym [64]; 329 char sym [64];
246 int symlen; 330 int symlen;
247 331
248 symlen = snprintf (sym, sizeof (sym), "fd#%d", req->result); 332 symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
249 gv_init (gv, stash, sym, symlen, 0); 333 gv_init (gv, stash, sym, symlen, 0);
250 334
251 symlen = snprintf ( 335 symlen = snprintf (
252 sym, 336 sym,
253 sizeof (sym), 337 sizeof (sym),
254 "%s&=%d", 338 "%s&=%d",
255 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<", 339 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
256 req->result 340 (int)req->result
257 ); 341 );
258 342
259 if (do_open (gv, sym, symlen, 0, 0, 0, 0)) 343 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
260 fh = (SV *)gv; 344 fh = (SV *)gv;
261 } 345 }
295 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 379 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
296 PUSHs (sv_2mortal (newSViv (req->result))); 380 PUSHs (sv_2mortal (newSViv (req->result)));
297 break; 381 break;
298 382
299 case EIO_READ: 383 case EIO_READ:
384 {
300 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0)); 385 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
301 *SvEND (req->sv2) = 0; 386 *SvEND (req->sv2) = 0;
387 SvPOK_only (req->sv2);
388 SvSETMAGIC (req->sv2);
302 PUSHs (sv_2mortal (newSViv (req->result))); 389 PUSHs (sv_2mortal (newSViv (req->result)));
390 }
303 break; 391 break;
304 392
305 case EIO_DUP2: 393 case EIO_DUP2:
306 if (req->result > 0) 394 if (req->result > 0)
307 req->result = 0; 395 req->result = 0;
412 X_UNLOCK (reslock); 500 X_UNLOCK (reslock);
413 501
414 if (size) 502 if (size)
415 return; 503 return;
416 504
417 maybe_start_thread (); 505 etp_maybe_start_thread ();
418 506
419 FD_ZERO (&rfd); 507 FD_ZERO (&rfd);
420 FD_SET (respipe [0], &rfd); 508 FD_SET (respipe [0], &rfd);
421 509
422 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0); 510 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
423 } 511 }
424} 512}
425 513
426static int poll_cb (void) 514static int poll_cb (void)
427{ 515{
428 int res; 516 for (;;)
429
430 do
431 { 517 {
432 res = eio_poll (); 518 int res = eio_poll ();
433 519
434 if (res > 0) 520 if (res > 0)
435 croak (0); 521 croak (0);
522
523 if (!max_outstanding || max_outstanding > eio_nreqs ())
524 return res;
525
526 poll_wait ();
436 } 527 }
437 while (max_outstanding && max_outstanding <= eio_nreqs ());
438
439 return res;
440} 528}
441 529
442static void atfork_child (void) 530static void atfork_child (void)
443{ 531{
444 create_respipe (); 532 create_respipe ();
445} 533}
446 534
535static SV *
536get_cb (SV *cb_sv)
537{
538 HV *st;
539 GV *gvp;
540 CV *cv;
541
542 if (!SvOK (cb_sv))
543 return 0;
544
545 cv = sv_2cv (cb_sv, &st, &gvp, 0);
546
547 if (!cv)
548 croak ("IO::AIO callback must be undef or a CODE reference");
549
550 return (SV *)cv;
551}
552
447#define dREQ \ 553#define dREQ \
554 SV *cb_cv; \
448 aio_req req; \ 555 aio_req req; \
449 int req_pri = next_pri; \ 556 int req_pri = next_pri; \
450 next_pri = EIO_PRI_DEFAULT; \ 557 next_pri = EIO_PRI_DEFAULT; \
451 \ 558 \
452 if (SvOK (callback) && !SvROK (callback)) \ 559 cb_cv = get_cb (callback); \
453 croak ("callback must be undef or of reference type"); \
454 \ 560 \
455 Newz (0, req, 1, eio_req); \ 561 Newz (0, req, 1, eio_req); \
456 if (!req) \ 562 if (!req) \
457 croak ("out of memory during eio_req allocation"); \ 563 croak ("out of memory during eio_req allocation"); \
458 \ 564 \
459 req->callback = newSVsv (callback); \ 565 req->callback = SvREFCNT_inc (cb_cv); \
460 req->pri = req_pri 566 req->pri = req_pri
461 567
462#define REQ_SEND \ 568#define REQ_SEND \
569 PUTBACK; \
463 req_submit (req); \ 570 req_submit (req); \
571 SPAGAIN; \
464 \ 572 \
465 if (GIMME_V != G_VOID) \ 573 if (GIMME_V != G_VOID) \
466 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 574 XPUSHs (req_sv (req, AIO_REQ_KLASS));
467 575
468MODULE = IO::AIO PACKAGE = IO::AIO 576MODULE = IO::AIO PACKAGE = IO::AIO
469 577
470PROTOTYPES: ENABLE 578PROTOTYPES: ENABLE
471 579
472BOOT: 580BOOT:
473{ 581{
474 stash = gv_stashpv ("IO::AIO", 1); 582 static const struct {
475 583 const char *name;
476 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 584 IV iv;
477 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 585 } *civ, const_iv[] = {
478 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 586# define const_iv(name, value) { # name, (IV) value },
479 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 587# define const_eio(name) { # name, (IV) EIO_ ## name },
480 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 588 const_iv (EXDEV , EXDEV)
589 const_iv (ENOSYS , ENOSYS)
590 const_iv (O_RDONLY, O_RDONLY)
591 const_iv (O_WRONLY, O_WRONLY)
592 const_iv (O_CREAT , O_CREAT)
593 const_iv (O_TRUNC , O_TRUNC)
481#ifndef _WIN32 594#ifndef _WIN32
482 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 595 const_iv (S_IFIFO , S_IFIFO)
483#endif 596#endif
597 const_iv (FADV_NORMAL , POSIX_FADV_NORMAL)
598 const_iv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL)
599 const_iv (FADV_RANDOM , POSIX_FADV_RANDOM)
600 const_iv (FADV_NOREUSE , POSIX_FADV_NOREUSE)
601 const_iv (FADV_WILLNEED , POSIX_FADV_WILLNEED)
602 const_iv (FADV_DONTNEED , POSIX_FADV_DONTNEED)
484 603
604 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
605 const_eio (SYNC_FILE_RANGE_WRITE)
606 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
607
608 const_eio (READDIR_DENTS)
609 const_eio (READDIR_DIRS_FIRST)
610 const_eio (READDIR_STAT_ORDER)
611 const_eio (READDIR_FOUND_UNKNOWN)
612
613 const_eio (DT_UNKNOWN)
614 const_eio (DT_FIFO)
615 const_eio (DT_CHR)
616 const_eio (DT_DIR)
617 const_eio (DT_BLK)
618 const_eio (DT_REG)
619 const_eio (DT_LNK)
620 const_eio (DT_SOCK)
621 const_eio (DT_WHT)
622 };
623
624 stash = gv_stashpv ("IO::AIO", 1);
625
626 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
627 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
628
485 create_respipe (); 629 create_respipe ();
486 630
487 if (eio_init (want_poll, done_poll) < 0) 631 if (eio_init (want_poll, done_poll) < 0)
488 croak ("IO::AIO: unable to initialise eio library"); 632 croak ("IO::AIO: unable to initialise eio library");
489 633
490 /* atfork child called in fifo order, so before eio's handler */ 634 /* atfork child called in fifo order, so before eio's handler */
491 X_THREAD_ATFORK (0, 0, atfork_child); 635 X_THREAD_ATFORK (0, 0, atfork_child);
492} 636}
493 637
494void 638void
495max_poll_reqs (int nreqs) 639max_poll_reqs (int nreqs)
496 PROTOTYPE: $ 640 PROTOTYPE: $
549 ALIAS: 693 ALIAS:
550 aio_fsync = EIO_FSYNC 694 aio_fsync = EIO_FSYNC
551 aio_fdatasync = EIO_FDATASYNC 695 aio_fdatasync = EIO_FDATASYNC
552 PPCODE: 696 PPCODE:
553{ 697{
698 int fd = s_fileno_croak (fh, 0);
554 dREQ; 699 dREQ;
555 700
556 req->type = ix; 701 req->type = ix;
557 req->sv1 = newSVsv (fh); 702 req->sv1 = newSVsv (fh);
558 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 703 req->int1 = fd;
704
705 REQ_SEND (req);
706}
707
708void
709aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef)
710 PROTOTYPE: $$$$;$
711 PPCODE:
712{
713 int fd = s_fileno_croak (fh, 0);
714 dREQ;
715
716 req->type = EIO_SYNC_FILE_RANGE;
717 req->sv1 = newSVsv (fh);
718 req->int1 = fd;
719 req->offs = offset;
720 req->size = nbytes;
721 req->int2 = flags;
559 722
560 REQ_SEND (req); 723 REQ_SEND (req);
561} 724}
562 725
563void 726void
564aio_close (SV *fh, SV *callback=&PL_sv_undef) 727aio_close (SV *fh, SV *callback=&PL_sv_undef)
565 PROTOTYPE: $;$ 728 PROTOTYPE: $;$
566 PPCODE: 729 PPCODE:
567{ 730{
568 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 731 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
732 int fd = s_fileno_croak (fh, 0);
569 dREQ; 733 dREQ;
570 734
571 if (close_pipe < 0) 735 if (close_pipe < 0)
572 { 736 {
573 int pipefd [2]; 737 int pipefd [2];
581 } 745 }
582 746
583 req->type = EIO_DUP2; 747 req->type = EIO_DUP2;
584 req->int1 = close_pipe; 748 req->int1 = close_pipe;
585 req->sv2 = newSVsv (fh); 749 req->sv2 = newSVsv (fh);
586 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 750 req->int2 = fd;
587 751
588 REQ_SEND (req); 752 REQ_SEND (req);
589} 753}
590 754
591void 755void
595 aio_write = EIO_WRITE 759 aio_write = EIO_WRITE
596 PROTOTYPE: $$$$$;$ 760 PROTOTYPE: $$$$$;$
597 PPCODE: 761 PPCODE:
598{ 762{
599 STRLEN svlen; 763 STRLEN svlen;
764 int fd = s_fileno_croak (fh, ix == EIO_WRITE);
600 char *svptr = SvPVbyte (data, svlen); 765 char *svptr = SvPVbyte (data, svlen);
601 UV len = SvUV (length); 766 UV len = SvUV (length);
602
603 SvUPGRADE (data, SVt_PV);
604 SvPOK_on (data);
605 767
606 if (dataoffset < 0) 768 if (dataoffset < 0)
607 dataoffset += svlen; 769 dataoffset += svlen;
608 770
609 if (dataoffset < 0 || dataoffset > svlen) 771 if (dataoffset < 0 || dataoffset > svlen)
615 if (!SvOK (length) || len + dataoffset > svlen) 777 if (!SvOK (length) || len + dataoffset > svlen)
616 len = svlen - dataoffset; 778 len = svlen - dataoffset;
617 } 779 }
618 else 780 else
619 { 781 {
620 /* read: grow scalar as necessary */ 782 /* read: check type and grow scalar as necessary */
783 SvUPGRADE (data, SVt_PV);
621 svptr = SvGROW (data, len + dataoffset + 1); 784 svptr = SvGROW (data, len + dataoffset + 1);
622 } 785 }
623
624 if (len < 0)
625 croak ("length must not be negative");
626 786
627 { 787 {
628 dREQ; 788 dREQ;
629 789
630 req->type = ix; 790 req->type = ix;
631 req->sv1 = newSVsv (fh); 791 req->sv1 = newSVsv (fh);
632 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 792 req->int1 = fd;
633 : IoOFP (sv_2io (fh)));
634 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 793 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
635 req->size = len; 794 req->size = len;
636 req->sv2 = SvREFCNT_inc (data); 795 req->sv2 = SvREFCNT_inc (data);
637 req->ptr2 = (char *)svptr + dataoffset; 796 req->ptr2 = (char *)svptr + dataoffset;
638 req->stroffset = dataoffset; 797 req->stroffset = dataoffset;
661 820
662 REQ_SEND; 821 REQ_SEND;
663} 822}
664 823
665void 824void
666aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef) 825aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef)
667 PROTOTYPE: $$$$;$ 826 PROTOTYPE: $$$$;$
668 PPCODE: 827 PPCODE:
669{ 828{
829 int ifd = s_fileno_croak (in_fh , 0);
830 int ofd = s_fileno_croak (out_fh, 1);
670 dREQ; 831 dREQ;
671 832
672 req->type = EIO_SENDFILE; 833 req->type = EIO_SENDFILE;
673 req->sv1 = newSVsv (out_fh); 834 req->sv1 = newSVsv (out_fh);
674 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 835 req->int1 = ofd;
675 req->sv2 = newSVsv (in_fh); 836 req->sv2 = newSVsv (in_fh);
676 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 837 req->int2 = ifd;
677 req->offs = SvVAL64 (in_offset); 838 req->offs = in_offset;
678 req->size = length; 839 req->size = length;
679 840
680 REQ_SEND; 841 REQ_SEND;
681} 842}
682 843
683void 844void
684aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef) 845aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef)
685 PROTOTYPE: $$$;$ 846 PROTOTYPE: $$$;$
686 PPCODE: 847 PPCODE:
687{ 848{
849 int fd = s_fileno_croak (fh, 0);
688 dREQ; 850 dREQ;
689 851
690 req->type = EIO_READAHEAD; 852 req->type = EIO_READAHEAD;
691 req->sv1 = newSVsv (fh); 853 req->sv1 = newSVsv (fh);
692 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 854 req->int1 = fd;
693 req->offs = SvVAL64 (offset); 855 req->offs = offset;
694 req->size = length; 856 req->size = length;
695 857
696 REQ_SEND; 858 REQ_SEND;
697} 859}
698 860
814 req->type = EIO_FCHOWN; 976 req->type = EIO_FCHOWN;
815 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 977 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
816 } 978 }
817 979
818 REQ_SEND; 980 REQ_SEND;
981}
982
983void
984aio_readdirx (SV8 *pathname, IV flags, SV *callback=&PL_sv_undef)
985 PPCODE:
986{
987 dREQ;
988
989 req->type = EIO_READDIR;
990 req->sv1 = newSVsv (pathname);
991 req->ptr1 = SvPVbyte_nolen (req->sv1);
992 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
993
994 if (flags & EIO_READDIR_DENTS)
995 req->int1 |= EIO_READDIR_CUSTOM2;
996
997 REQ_SEND;
819} 998}
820 999
821void 1000void
822aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 1001aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
823 ALIAS: 1002 ALIAS:
888{ 1067{
889 dREQ; 1068 dREQ;
890 1069
891 req->type = EIO_GROUP; 1070 req->type = EIO_GROUP;
892 1071
893 eio_submit (req); 1072 req_submit (req);
894 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1073 XPUSHs (req_sv (req, AIO_GRP_KLASS));
895} 1074}
896 1075
897void 1076void
898aio_nop (SV *callback=&PL_sv_undef) 1077aio_nop (SV *callback=&PL_sv_undef)
1001 CODE: 1180 CODE:
1002 RETVAL = eio_nthreads (); 1181 RETVAL = eio_nthreads ();
1003 OUTPUT: 1182 OUTPUT:
1004 RETVAL 1183 RETVAL
1005 1184
1185int
1186fadvise (aio_rfd fh, off_t offset, off_t length, IV advice)
1187 PROTOTYPE: $$$$
1188 CODE:
1189#if _XOPEN_SOURCE >= 600 && !NO_FADVISE
1190 RETVAL = posix_fadvise (fh, offset, length, advice);
1191#else
1192 RETVAL = errno = ENOSYS;
1193#endif
1194 OUTPUT:
1195 RETVAL
1196
1197ssize_t
1198sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
1199 PROTOTYPE: $$$$
1200 CODE:
1201 eio_sendfile_sync (ofh, ifh, offset, count);
1202
1006void _on_next_submit (SV *cb) 1203void _on_next_submit (SV *cb)
1007 CODE: 1204 CODE:
1008 SvREFCNT_dec (on_next_submit); 1205 SvREFCNT_dec (on_next_submit);
1009 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1206 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1010 1207
1017 CODE: 1214 CODE:
1018 eio_cancel (req); 1215 eio_cancel (req);
1019 1216
1020void 1217void
1021cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1218cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1022 CODE: 1219 PPCODE:
1220{
1221 if (GIMME_V != G_VOID)
1222 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1223
1224 if (items > 1)
1225 {
1226 SV *cb_cv = get_cb (callback);
1227
1023 SvREFCNT_dec (req->callback); 1228 SvREFCNT_dec (req->callback);
1024 req->callback = newSVsv (callback); 1229 req->callback = SvREFCNT_inc (cb_cv);
1230 }
1231}
1025 1232
1026MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1233MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1027 1234
1028void 1235void
1029add (aio_req grp, ...) 1236add (aio_req grp, ...)
1061 AV *av; 1268 AV *av;
1062 1269
1063 grp->errorno = errno; 1270 grp->errorno = errno;
1064 1271
1065 av = newAV (); 1272 av = newAV ();
1273 av_extend (av, items - 1);
1066 1274
1067 for (i = 1; i < items; ++i ) 1275 for (i = 1; i < items; ++i )
1068 av_push (av, newSVsv (ST (i))); 1276 av_push (av, newSVsv (ST (i)));
1069 1277
1070 SvREFCNT_dec (grp->sv1); 1278 SvREFCNT_dec (grp->sv1);
1084void 1292void
1085feed (aio_req grp, SV *callback=&PL_sv_undef) 1293feed (aio_req grp, SV *callback=&PL_sv_undef)
1086 CODE: 1294 CODE:
1087{ 1295{
1088 SvREFCNT_dec (grp->sv2); 1296 SvREFCNT_dec (grp->sv2);
1089 grp->sv2 = newSVsv (callback); 1297 grp->sv2 = newSVsv (callback);
1298 grp->feed = aio_grp_feed;
1090 1299
1091 if (grp->int2 <= 0) 1300 if (grp->int2 <= 0)
1092 grp->int2 = 2; 1301 grp->int2 = 2;
1093 1302
1094 eio_grp_limit (grp, grp->int2); 1303 eio_grp_limit (grp, grp->int2);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines