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.120 by root, Sun May 11 19:17:09 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_COMMON \ 112#define EIO_REQ_MEMBERS \
86 SV *callback; \ 113 SV *callback; \
87 SV *sv1, *sv2; \ 114 SV *sv1, *sv2; \
88 STRLEN stroffset; \ 115 STRLEN stroffset; \
89 SV *self 116 SV *self;
117
118#define EIO_NO_WRAPPERS 1
90 119
91#include "libeio/eio.h" 120#include "libeio/eio.h"
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
92 146
93static int req_invoke (eio_req *req); 147static int req_invoke (eio_req *req);
94#define EIO_FINISH(req) req_invoke (req) 148#define EIO_FINISH(req) req_invoke (req)
95static void aio_grp_feed (eio_req *grp);
96#define EIO_FEED(req) aio_grp_feed (req)
97static void req_destroy (eio_req *grp); 149static void req_destroy (eio_req *grp);
98#define EIO_DESTROY(req) req_destroy (req) 150#define EIO_DESTROY(req) req_destroy (req)
99 151
100enum { 152enum {
101 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ 153 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
105 157
106typedef eio_req *aio_req; 158typedef eio_req *aio_req;
107typedef eio_req *aio_req_ornot; 159typedef eio_req *aio_req_ornot;
108 160
109static SV *on_next_submit; 161static SV *on_next_submit;
110static int next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; 162static int next_pri = EIO_PRI_DEFAULT;
111static int max_outstanding; 163static int max_outstanding;
112 164
113static int respipe_osf [2], respipe [2] = { -1, -1 }; 165static int respipe_osf [2], respipe [2] = { -1, -1 };
114 166
115static void req_destroy (aio_req req); 167static void req_destroy (aio_req req);
173 225
174static void req_submit (eio_req *req) 226static void req_submit (eio_req *req)
175{ 227{
176 eio_submit (req); 228 eio_submit (req);
177 229
178 if (on_next_submit) 230 if (expect_false (on_next_submit))
179 { 231 {
180 dSP; 232 dSP;
181 SV *cb = sv_2mortal (on_next_submit); 233 SV *cb = sv_2mortal (on_next_submit);
182 234
183 on_next_submit = 0; 235 on_next_submit = 0;
193 dSP; 245 dSP;
194 246
195 if (req->flags & FLAG_SV2_RO_OFF) 247 if (req->flags & FLAG_SV2_RO_OFF)
196 SvREADONLY_off (req->sv2); 248 SvREADONLY_off (req->sv2);
197 249
198 if (!EIO_CANCELLED (req) && SvOK (req->callback)) 250 if (!EIO_CANCELLED (req) && req->callback)
199 { 251 {
200 ENTER; 252 ENTER;
201 SAVETMPS; 253 SAVETMPS;
202 PUSHMARK (SP); 254 PUSHMARK (SP);
203 EXTEND (SP, 1); 255 EXTEND (SP, 1);
209 SV *rv = &PL_sv_undef; 261 SV *rv = &PL_sv_undef;
210 262
211 if (req->result >= 0) 263 if (req->result >= 0)
212 { 264 {
213 int i; 265 int i;
214 char *buf = req->ptr2; 266 char *names = (char *)req->ptr2;
267 eio_dirent *ent = (eio_dirent *)req->ptr1; /* might be 0 */
215 AV *av = newAV (); 268 AV *av = newAV ();
216 269
217 av_extend (av, req->result - 1); 270 av_extend (av, req->result - 1);
218 271
219 for (i = 0; i < req->result; ++i) 272 for (i = 0; i < req->result; ++i)
220 { 273 {
221 SV *sv = newSVpv (buf, 0); 274 if (req->int1 & EIO_READDIR_DENTS)
275 {
276 SV *namesv = newSVpvn (names + ent->nameofs, ent->namelen);
222 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
223 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);
224 buf += SvCUR (sv) + 1; 306 names += SvCUR (name) + 1;
307 }
225 } 308 }
226 309
227 rv = sv_2mortal (newRV_noinc ((SV *)av)); 310 rv = sv_2mortal (newRV_noinc ((SV *)av));
228 } 311 }
229 312
230 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))));
231 } 317 }
232 break; 318 break;
233 319
234 case EIO_OPEN: 320 case EIO_OPEN:
235 { 321 {
241 GV *gv = (GV *)sv_newmortal (); 327 GV *gv = (GV *)sv_newmortal ();
242 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR); 328 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
243 char sym [64]; 329 char sym [64];
244 int symlen; 330 int symlen;
245 331
246 symlen = snprintf (sym, sizeof (sym), "fd#%d", req->result); 332 symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
247 gv_init (gv, stash, sym, symlen, 0); 333 gv_init (gv, stash, sym, symlen, 0);
248 334
249 symlen = snprintf ( 335 symlen = snprintf (
250 sym, 336 sym,
251 sizeof (sym), 337 sizeof (sym),
252 "%s&=%d", 338 "%s&=%d",
253 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<", 339 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
254 req->result 340 (int)req->result
255 ); 341 );
256 342
257 if (do_open (gv, sym, symlen, 0, 0, 0, 0)) 343 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
258 fh = (SV *)gv; 344 fh = (SV *)gv;
259 } 345 }
293 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 379 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
294 PUSHs (sv_2mortal (newSViv (req->result))); 380 PUSHs (sv_2mortal (newSViv (req->result)));
295 break; 381 break;
296 382
297 case EIO_READ: 383 case EIO_READ:
384 {
298 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));
299 *SvEND (req->sv2) = 0; 386 *SvEND (req->sv2) = 0;
387 SvPOK_only (req->sv2);
388 SvSETMAGIC (req->sv2);
300 PUSHs (sv_2mortal (newSViv (req->result))); 389 PUSHs (sv_2mortal (newSViv (req->result)));
390 }
301 break; 391 break;
302 392
303 case EIO_DUP2: 393 case EIO_DUP2:
304 if (req->result > 0) 394 if (req->result > 0)
305 req->result = 0; 395 req->result = 0;
410 X_UNLOCK (reslock); 500 X_UNLOCK (reslock);
411 501
412 if (size) 502 if (size)
413 return; 503 return;
414 504
415 maybe_start_thread (); 505 etp_maybe_start_thread ();
416 506
417 FD_ZERO (&rfd); 507 FD_ZERO (&rfd);
418 FD_SET (respipe [0], &rfd); 508 FD_SET (respipe [0], &rfd);
419 509
420 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0); 510 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
421 } 511 }
422} 512}
423 513
424static int poll_cb (void) 514static int poll_cb (void)
425{ 515{
426 int res; 516 for (;;)
427
428 do
429 { 517 {
430 res = eio_poll (); 518 int res = eio_poll ();
431 519
432 if (res > 0) 520 if (res > 0)
433 croak (0); 521 croak (0);
522
523 if (!max_outstanding || max_outstanding > eio_nreqs ())
524 return res;
525
526 poll_wait ();
434 } 527 }
435 while (max_outstanding && max_outstanding <= eio_nreqs ());
436
437 return res;
438} 528}
439 529
440static void atfork_child (void) 530static void atfork_child (void)
441{ 531{
442 create_respipe (); 532 create_respipe ();
443} 533}
444 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
445#define dREQ \ 553#define dREQ \
554 SV *cb_cv; \
446 aio_req req; \ 555 aio_req req; \
447 int req_pri = next_pri; \ 556 int req_pri = next_pri; \
448 next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; \ 557 next_pri = EIO_PRI_DEFAULT; \
449 \ 558 \
450 if (SvOK (callback) && !SvROK (callback)) \ 559 cb_cv = get_cb (callback); \
451 croak ("callback must be undef or of reference type"); \
452 \ 560 \
453 Newz (0, req, 1, eio_req); \ 561 Newz (0, req, 1, eio_req); \
454 if (!req) \ 562 if (!req) \
455 croak ("out of memory during eio_req allocation"); \ 563 croak ("out of memory during eio_req allocation"); \
456 \ 564 \
457 req->callback = newSVsv (callback); \ 565 req->callback = SvREFCNT_inc (cb_cv); \
458 req->pri = req_pri 566 req->pri = req_pri
459 567
460#define REQ_SEND \ 568#define REQ_SEND \
569 PUTBACK; \
461 req_submit (req); \ 570 req_submit (req); \
571 SPAGAIN; \
462 \ 572 \
463 if (GIMME_V != G_VOID) \ 573 if (GIMME_V != G_VOID) \
464 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 574 XPUSHs (req_sv (req, AIO_REQ_KLASS));
465 575
466MODULE = IO::AIO PACKAGE = IO::AIO 576MODULE = IO::AIO PACKAGE = IO::AIO
467 577
468PROTOTYPES: ENABLE 578PROTOTYPES: ENABLE
469 579
470BOOT: 580BOOT:
471{ 581{
472 stash = gv_stashpv ("IO::AIO", 1); 582 static const struct {
473 583 const char *name;
474 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 584 IV iv;
475 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 585 } *civ, const_iv[] = {
476 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 586# define const_iv(name, value) { # name, (IV) value },
477 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 587# define const_eio(name) { # name, (IV) EIO_ ## name },
478 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)
479#ifdef _WIN32 594#ifndef _WIN32
480 X_MUTEX_CHECK (wrklock); 595 const_iv (S_IFIFO , S_IFIFO)
481 X_MUTEX_CHECK (reslock);
482 X_MUTEX_CHECK (reqlock);
483 X_MUTEX_CHECK (reqwait);
484 X_MUTEX_CHECK (preadwritelock);
485 X_MUTEX_CHECK (readdirlock);
486
487 X_COND_CHECK (reqwait);
488#else
489 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
490#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)
491 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
492 create_respipe (); 629 create_respipe ();
493 630
494 if (eio_init (want_poll, done_poll) < 0) 631 if (eio_init (want_poll, done_poll) < 0)
495 croak ("IO::AIO: unable to initialise eio library"); 632 croak ("IO::AIO: unable to initialise eio library");
496 633
497 /* atfork child called in fifo order, so before eio's handler */ 634 /* atfork child called in fifo order, so before eio's handler */
498 X_THREAD_ATFORK (0, 0, atfork_child); 635 X_THREAD_ATFORK (0, 0, atfork_child);
499} 636}
500 637
501void 638void
502max_poll_reqs (int nreqs) 639max_poll_reqs (int nreqs)
503 PROTOTYPE: $ 640 PROTOTYPE: $
556 ALIAS: 693 ALIAS:
557 aio_fsync = EIO_FSYNC 694 aio_fsync = EIO_FSYNC
558 aio_fdatasync = EIO_FDATASYNC 695 aio_fdatasync = EIO_FDATASYNC
559 PPCODE: 696 PPCODE:
560{ 697{
698 int fd = s_fileno_croak (fh, 0);
561 dREQ; 699 dREQ;
562 700
563 req->type = ix; 701 req->type = ix;
564 req->sv1 = newSVsv (fh); 702 req->sv1 = newSVsv (fh);
565 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;
566 722
567 REQ_SEND (req); 723 REQ_SEND (req);
568} 724}
569 725
570void 726void
571aio_close (SV *fh, SV *callback=&PL_sv_undef) 727aio_close (SV *fh, SV *callback=&PL_sv_undef)
572 PROTOTYPE: $;$ 728 PROTOTYPE: $;$
573 PPCODE: 729 PPCODE:
574{ 730{
575 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);
576 dREQ; 733 dREQ;
577 734
578 if (close_pipe < 0) 735 if (close_pipe < 0)
579 { 736 {
580 int pipefd [2]; 737 int pipefd [2];
588 } 745 }
589 746
590 req->type = EIO_DUP2; 747 req->type = EIO_DUP2;
591 req->int1 = close_pipe; 748 req->int1 = close_pipe;
592 req->sv2 = newSVsv (fh); 749 req->sv2 = newSVsv (fh);
593 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 750 req->int2 = fd;
594 751
595 REQ_SEND (req); 752 REQ_SEND (req);
596} 753}
597 754
598void 755void
602 aio_write = EIO_WRITE 759 aio_write = EIO_WRITE
603 PROTOTYPE: $$$$$;$ 760 PROTOTYPE: $$$$$;$
604 PPCODE: 761 PPCODE:
605{ 762{
606 STRLEN svlen; 763 STRLEN svlen;
764 int fd = s_fileno_croak (fh, ix == EIO_WRITE);
607 char *svptr = SvPVbyte (data, svlen); 765 char *svptr = SvPVbyte (data, svlen);
608 UV len = SvUV (length); 766 UV len = SvUV (length);
609
610 SvUPGRADE (data, SVt_PV);
611 SvPOK_on (data);
612 767
613 if (dataoffset < 0) 768 if (dataoffset < 0)
614 dataoffset += svlen; 769 dataoffset += svlen;
615 770
616 if (dataoffset < 0 || dataoffset > svlen) 771 if (dataoffset < 0 || dataoffset > svlen)
622 if (!SvOK (length) || len + dataoffset > svlen) 777 if (!SvOK (length) || len + dataoffset > svlen)
623 len = svlen - dataoffset; 778 len = svlen - dataoffset;
624 } 779 }
625 else 780 else
626 { 781 {
627 /* read: grow scalar as necessary */ 782 /* read: check type and grow scalar as necessary */
783 SvUPGRADE (data, SVt_PV);
628 svptr = SvGROW (data, len + dataoffset + 1); 784 svptr = SvGROW (data, len + dataoffset + 1);
629 } 785 }
630
631 if (len < 0)
632 croak ("length must not be negative");
633 786
634 { 787 {
635 dREQ; 788 dREQ;
636 789
637 req->type = ix; 790 req->type = ix;
638 req->sv1 = newSVsv (fh); 791 req->sv1 = newSVsv (fh);
639 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 792 req->int1 = fd;
640 : IoOFP (sv_2io (fh)));
641 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 793 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
642 req->size = len; 794 req->size = len;
643 req->sv2 = SvREFCNT_inc (data); 795 req->sv2 = SvREFCNT_inc (data);
644 req->ptr2 = (char *)svptr + dataoffset; 796 req->ptr2 = (char *)svptr + dataoffset;
645 req->stroffset = dataoffset; 797 req->stroffset = dataoffset;
668 820
669 REQ_SEND; 821 REQ_SEND;
670} 822}
671 823
672void 824void
673aio_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)
674 PROTOTYPE: $$$$;$ 826 PROTOTYPE: $$$$;$
675 PPCODE: 827 PPCODE:
676{ 828{
829 int ifd = s_fileno_croak (in_fh , 0);
830 int ofd = s_fileno_croak (out_fh, 1);
677 dREQ; 831 dREQ;
678 832
679 req->type = EIO_SENDFILE; 833 req->type = EIO_SENDFILE;
680 req->sv1 = newSVsv (out_fh); 834 req->sv1 = newSVsv (out_fh);
681 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 835 req->int1 = ofd;
682 req->sv2 = newSVsv (in_fh); 836 req->sv2 = newSVsv (in_fh);
683 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 837 req->int2 = ifd;
684 req->offs = SvVAL64 (in_offset); 838 req->offs = in_offset;
685 req->size = length; 839 req->size = length;
686 840
687 REQ_SEND; 841 REQ_SEND;
688} 842}
689 843
690void 844void
691aio_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)
692 PROTOTYPE: $$$;$ 846 PROTOTYPE: $$$;$
693 PPCODE: 847 PPCODE:
694{ 848{
849 int fd = s_fileno_croak (fh, 0);
695 dREQ; 850 dREQ;
696 851
697 req->type = EIO_READAHEAD; 852 req->type = EIO_READAHEAD;
698 req->sv1 = newSVsv (fh); 853 req->sv1 = newSVsv (fh);
699 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 854 req->int1 = fd;
700 req->offs = SvVAL64 (offset); 855 req->offs = offset;
701 req->size = length; 856 req->size = length;
702 857
703 REQ_SEND; 858 REQ_SEND;
704} 859}
705 860
821 req->type = EIO_FCHOWN; 976 req->type = EIO_FCHOWN;
822 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 977 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
823 } 978 }
824 979
825 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;
826} 998}
827 999
828void 1000void
829aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 1001aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
830 ALIAS: 1002 ALIAS:
895{ 1067{
896 dREQ; 1068 dREQ;
897 1069
898 req->type = EIO_GROUP; 1070 req->type = EIO_GROUP;
899 1071
900 eio_submit (req); 1072 req_submit (req);
901 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1073 XPUSHs (req_sv (req, AIO_GRP_KLASS));
902} 1074}
903 1075
904void 1076void
905aio_nop (SV *callback=&PL_sv_undef) 1077aio_nop (SV *callback=&PL_sv_undef)
917 1089
918int 1090int
919aioreq_pri (int pri = 0) 1091aioreq_pri (int pri = 0)
920 PROTOTYPE: ;$ 1092 PROTOTYPE: ;$
921 CODE: 1093 CODE:
922 RETVAL = next_pri - EIO_PRI_BIAS; 1094 RETVAL = next_pri;
923 if (items > 0) 1095 if (items > 0)
924 { 1096 {
925 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN; 1097 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
926 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX; 1098 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
927 next_pri = pri + EIO_PRI_BIAS; 1099 next_pri = pri;
928 } 1100 }
929 OUTPUT: 1101 OUTPUT:
930 RETVAL 1102 RETVAL
931 1103
932void 1104void
933aioreq_nice (int nice = 0) 1105aioreq_nice (int nice = 0)
934 CODE: 1106 CODE:
935 nice = next_pri - nice; 1107 nice = next_pri - nice;
936 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN; 1108 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
937 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX; 1109 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
938 next_pri = nice + EIO_PRI_BIAS; 1110 next_pri = nice;
939 1111
940void 1112void
941flush () 1113flush ()
942 PROTOTYPE: 1114 PROTOTYPE:
943 CODE: 1115 CODE:
1004 1176
1005int 1177int
1006nthreads() 1178nthreads()
1007 PROTOTYPE: 1179 PROTOTYPE:
1008 CODE: 1180 CODE:
1009 if (WORDACCESS_UNSAFE) X_LOCK (wrklock); 1181 RETVAL = eio_nthreads ();
1010 RETVAL = started;
1011 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1012 OUTPUT: 1182 OUTPUT:
1013 RETVAL 1183 RETVAL
1014 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
1015void _on_next_submit (SV *cb) 1203void _on_next_submit (SV *cb)
1016 CODE: 1204 CODE:
1017 SvREFCNT_dec (on_next_submit); 1205 SvREFCNT_dec (on_next_submit);
1018 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1206 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1019 1207
1026 CODE: 1214 CODE:
1027 eio_cancel (req); 1215 eio_cancel (req);
1028 1216
1029void 1217void
1030cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1218cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1031 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
1032 SvREFCNT_dec (req->callback); 1228 SvREFCNT_dec (req->callback);
1033 req->callback = newSVsv (callback); 1229 req->callback = SvREFCNT_inc (cb_cv);
1230 }
1231}
1034 1232
1035MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1233MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1036 1234
1037void 1235void
1038add (aio_req grp, ...) 1236add (aio_req grp, ...)
1070 AV *av; 1268 AV *av;
1071 1269
1072 grp->errorno = errno; 1270 grp->errorno = errno;
1073 1271
1074 av = newAV (); 1272 av = newAV ();
1273 av_extend (av, items - 1);
1075 1274
1076 for (i = 1; i < items; ++i ) 1275 for (i = 1; i < items; ++i )
1077 av_push (av, newSVsv (ST (i))); 1276 av_push (av, newSVsv (ST (i)));
1078 1277
1079 SvREFCNT_dec (grp->sv1); 1278 SvREFCNT_dec (grp->sv1);
1093void 1292void
1094feed (aio_req grp, SV *callback=&PL_sv_undef) 1293feed (aio_req grp, SV *callback=&PL_sv_undef)
1095 CODE: 1294 CODE:
1096{ 1295{
1097 SvREFCNT_dec (grp->sv2); 1296 SvREFCNT_dec (grp->sv2);
1098 grp->sv2 = newSVsv (callback); 1297 grp->sv2 = newSVsv (callback);
1298 grp->feed = aio_grp_feed;
1099 1299
1100 if (grp->int2 <= 0) 1300 if (grp->int2 <= 0)
1101 grp->int2 = 2; 1301 grp->int2 = 2;
1102 1302
1103 eio_grp_limit (grp, grp->int2); 1303 eio_grp_limit (grp, grp->int2);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines