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.149 by root, Tue Jun 30 07:33:58 2009 UTC

65# include <signal.h> 65# include <signal.h>
66# define EIO_STRUCT_DIRENT struct dirent 66# define EIO_STRUCT_DIRENT struct dirent
67 67
68#endif 68#endif
69 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
70#define EIO_STRUCT_STAT Stat_t 76#define EIO_STRUCT_STAT Stat_t
71 77
72/* use NV for 32 bit perls as it allows larger offsets */ 78/* use NV for 32 bit perls as it allows larger offsets */
73#if IVSIZE >= 8 79#if IVSIZE >= 8
80# define VAL64 IV
74# define SvVAL64 SvIV 81# define SvVAL64 SvIV
82# define newSVval64 newSViv
75#else 83#else
84# define VAL64 NV
76# define SvVAL64 SvNV 85# define SvVAL64 SvNV
86# define newSVval64 newSVnv
77#endif 87#endif
88
89/*****************************************************************************/
90
91#if __GNUC__ >= 3
92# define expect(expr,value) __builtin_expect ((expr),(value))
93#else
94# define expect(expr,value) (expr)
95#endif
96
97#define expect_false(expr) expect ((expr) != 0, 0)
98#define expect_true(expr) expect ((expr) != 0, 1)
99
100/*****************************************************************************/
78 101
79static HV *stash; 102static HV *stash;
80typedef 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 */
81 106
82#define AIO_REQ_KLASS "IO::AIO::REQ" 107#define AIO_REQ_KLASS "IO::AIO::REQ"
83#define AIO_GRP_KLASS "IO::AIO::GRP" 108#define AIO_GRP_KLASS "IO::AIO::GRP"
84 109
85#define EIO_COMMON \ 110#define EIO_REQ_MEMBERS \
86 SV *callback; \ 111 SV *callback; \
87 SV *sv1, *sv2; \ 112 SV *sv1, *sv2; \
88 STRLEN stroffset; \ 113 STRLEN stroffset; \
89 SV *self 114 SV *self;
115
116#define EIO_NO_WRAPPERS 1
90 117
91#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
92 144
93static int req_invoke (eio_req *req); 145static int req_invoke (eio_req *req);
94#define EIO_FINISH(req) req_invoke (req) 146#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); 147static void req_destroy (eio_req *grp);
98#define EIO_DESTROY(req) req_destroy (req) 148#define EIO_DESTROY(req) req_destroy (req)
99 149
100enum { 150enum {
101 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ 151 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
105 155
106typedef eio_req *aio_req; 156typedef eio_req *aio_req;
107typedef eio_req *aio_req_ornot; 157typedef eio_req *aio_req_ornot;
108 158
109static SV *on_next_submit; 159static SV *on_next_submit;
110static int next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; 160static int next_pri = EIO_PRI_DEFAULT;
111static int max_outstanding; 161static int max_outstanding;
112 162
113static int respipe_osf [2], respipe [2] = { -1, -1 }; 163static int respipe_osf [2], respipe [2] = { -1, -1 };
114 164
115static void req_destroy (aio_req req); 165static void req_destroy (aio_req req);
173 223
174static void req_submit (eio_req *req) 224static void req_submit (eio_req *req)
175{ 225{
176 eio_submit (req); 226 eio_submit (req);
177 227
178 if (on_next_submit) 228 if (expect_false (on_next_submit))
179 { 229 {
180 dSP; 230 dSP;
181 SV *cb = sv_2mortal (on_next_submit); 231 SV *cb = sv_2mortal (on_next_submit);
182 232
183 on_next_submit = 0; 233 on_next_submit = 0;
193 dSP; 243 dSP;
194 244
195 if (req->flags & FLAG_SV2_RO_OFF) 245 if (req->flags & FLAG_SV2_RO_OFF)
196 SvREADONLY_off (req->sv2); 246 SvREADONLY_off (req->sv2);
197 247
198 if (!EIO_CANCELLED (req) && SvOK (req->callback)) 248 if (!EIO_CANCELLED (req) && req->callback)
199 { 249 {
200 ENTER; 250 ENTER;
201 SAVETMPS; 251 SAVETMPS;
202 PUSHMARK (SP); 252 PUSHMARK (SP);
203 EXTEND (SP, 1); 253 EXTEND (SP, 1);
209 SV *rv = &PL_sv_undef; 259 SV *rv = &PL_sv_undef;
210 260
211 if (req->result >= 0) 261 if (req->result >= 0)
212 { 262 {
213 int i; 263 int i;
214 char *buf = req->ptr2; 264 char *names = (char *)req->ptr2;
265 eio_dirent *ent = (eio_dirent *)req->ptr1; /* might be 0 */
215 AV *av = newAV (); 266 AV *av = newAV ();
216 267
217 av_extend (av, req->result - 1); 268 av_extend (av, req->result - 1);
218 269
219 for (i = 0; i < req->result; ++i) 270 for (i = 0; i < req->result; ++i)
220 { 271 {
221 SV *sv = newSVpv (buf, 0); 272 if (req->int1 & EIO_READDIR_DENTS)
273 {
274 SV *namesv = newSVpvn (names + ent->nameofs, ent->namelen);
222 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
223 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);
224 buf += SvCUR (sv) + 1; 304 names += SvCUR (name) + 1;
305 }
225 } 306 }
226 307
227 rv = sv_2mortal (newRV_noinc ((SV *)av)); 308 rv = sv_2mortal (newRV_noinc ((SV *)av));
228 } 309 }
229 310
230 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))));
231 } 315 }
232 break; 316 break;
233 317
234 case EIO_OPEN: 318 case EIO_OPEN:
235 { 319 {
241 GV *gv = (GV *)sv_newmortal (); 325 GV *gv = (GV *)sv_newmortal ();
242 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR); 326 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
243 char sym [64]; 327 char sym [64];
244 int symlen; 328 int symlen;
245 329
246 symlen = snprintf (sym, sizeof (sym), "fd#%d", req->result); 330 symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
247 gv_init (gv, stash, sym, symlen, 0); 331 gv_init (gv, stash, sym, symlen, 0);
248 332
249 symlen = snprintf ( 333 symlen = snprintf (
250 sym, 334 sym,
251 sizeof (sym), 335 sizeof (sym),
252 "%s&=%d", 336 "%s&=%d",
253 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<", 337 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
254 req->result 338 (int)req->result
255 ); 339 );
256 340
257 if (do_open (gv, sym, symlen, 0, 0, 0, 0)) 341 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
258 fh = (SV *)gv; 342 fh = (SV *)gv;
259 } 343 }
293 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 377 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
294 PUSHs (sv_2mortal (newSViv (req->result))); 378 PUSHs (sv_2mortal (newSViv (req->result)));
295 break; 379 break;
296 380
297 case EIO_READ: 381 case EIO_READ:
382 {
298 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));
299 *SvEND (req->sv2) = 0; 384 *SvEND (req->sv2) = 0;
385 SvPOK_only (req->sv2);
386 SvSETMAGIC (req->sv2);
300 PUSHs (sv_2mortal (newSViv (req->result))); 387 PUSHs (sv_2mortal (newSViv (req->result)));
388 }
301 break; 389 break;
302 390
303 case EIO_DUP2: 391 case EIO_DUP2:
304 if (req->result > 0) 392 if (req->result > 0)
305 req->result = 0; 393 req->result = 0;
410 X_UNLOCK (reslock); 498 X_UNLOCK (reslock);
411 499
412 if (size) 500 if (size)
413 return; 501 return;
414 502
415 maybe_start_thread (); 503 etp_maybe_start_thread ();
416 504
417 FD_ZERO (&rfd); 505 FD_ZERO (&rfd);
418 FD_SET (respipe [0], &rfd); 506 FD_SET (respipe [0], &rfd);
419 507
420 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0); 508 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
421 } 509 }
422} 510}
423 511
424static int poll_cb (void) 512static int poll_cb (void)
425{ 513{
426 int res; 514 for (;;)
427
428 do
429 { 515 {
430 res = eio_poll (); 516 int res = eio_poll ();
431 517
432 if (res > 0) 518 if (res > 0)
433 croak (0); 519 croak (0);
520
521 if (!max_outstanding || max_outstanding > eio_nreqs ())
522 return res;
523
524 poll_wait ();
434 } 525 }
435 while (max_outstanding && max_outstanding <= eio_nreqs ());
436
437 return res;
438} 526}
439 527
440static void atfork_child (void) 528static void atfork_child (void)
441{ 529{
442 create_respipe (); 530 create_respipe ();
443} 531}
444 532
533static SV *
534get_cb (SV *cb_sv)
535{
536 HV *st;
537 GV *gvp;
538 CV *cv;
539
540 if (!SvOK (cb_sv))
541 return 0;
542
543 cv = sv_2cv (cb_sv, &st, &gvp, 0);
544
545 if (!cv)
546 croak ("IO::AIO callback must be undef or a CODE reference");
547
548 return (SV *)cv;
549}
550
445#define dREQ \ 551#define dREQ \
552 SV *cb_cv; \
446 aio_req req; \ 553 aio_req req; \
447 int req_pri = next_pri; \ 554 int req_pri = next_pri; \
448 next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; \ 555 next_pri = EIO_PRI_DEFAULT; \
449 \ 556 \
450 if (SvOK (callback) && !SvROK (callback)) \ 557 cb_cv = get_cb (callback); \
451 croak ("callback must be undef or of reference type"); \
452 \ 558 \
453 Newz (0, req, 1, eio_req); \ 559 Newz (0, req, 1, eio_req); \
454 if (!req) \ 560 if (!req) \
455 croak ("out of memory during eio_req allocation"); \ 561 croak ("out of memory during eio_req allocation"); \
456 \ 562 \
457 req->callback = newSVsv (callback); \ 563 req->callback = SvREFCNT_inc (cb_cv); \
458 req->pri = req_pri 564 req->pri = req_pri
459 565
460#define REQ_SEND \ 566#define REQ_SEND \
567 PUTBACK; \
461 req_submit (req); \ 568 req_submit (req); \
569 SPAGAIN; \
462 \ 570 \
463 if (GIMME_V != G_VOID) \ 571 if (GIMME_V != G_VOID) \
464 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 572 XPUSHs (req_sv (req, AIO_REQ_KLASS));
465 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
466MODULE = IO::AIO PACKAGE = IO::AIO 585MODULE = IO::AIO PACKAGE = IO::AIO
467 586
468PROTOTYPES: ENABLE 587PROTOTYPES: ENABLE
469 588
470BOOT: 589BOOT:
471{ 590{
472 stash = gv_stashpv ("IO::AIO", 1); 591 static const struct {
473 592 const char *name;
474 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 593 IV iv;
475 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 594 } *civ, const_iv[] = {
476 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 595# define const_iv(name, value) { # name, (IV) value },
477 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 596# define const_eio(name) { # name, (IV) EIO_ ## name },
478 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)
479#ifdef _WIN32 603#ifndef _WIN32
480 X_MUTEX_CHECK (wrklock); 604 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 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)
491 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
492 create_respipe (); 638 create_respipe ();
493 639
494 if (eio_init (want_poll, done_poll) < 0) 640 if (eio_init (want_poll, done_poll) < 0)
495 croak ("IO::AIO: unable to initialise eio library"); 641 croak ("IO::AIO: unable to initialise eio library");
496 642
497 /* atfork child called in fifo order, so before eio's handler */ 643 /* atfork child called in fifo order, so before eio's handler */
498 X_THREAD_ATFORK (0, 0, atfork_child); 644 X_THREAD_ATFORK (0, 0, atfork_child);
499} 645}
500 646
501void 647void
502max_poll_reqs (int nreqs) 648max_poll_reqs (int nreqs)
503 PROTOTYPE: $ 649 PROTOTYPE: $
556 ALIAS: 702 ALIAS:
557 aio_fsync = EIO_FSYNC 703 aio_fsync = EIO_FSYNC
558 aio_fdatasync = EIO_FDATASYNC 704 aio_fdatasync = EIO_FDATASYNC
559 PPCODE: 705 PPCODE:
560{ 706{
707 int fd = extract_fd (fh, 0);
561 dREQ; 708 dREQ;
562 709
563 req->type = ix; 710 req->type = ix;
564 req->sv1 = newSVsv (fh); 711 req->sv1 = newSVsv (fh);
565 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;
566 731
567 REQ_SEND (req); 732 REQ_SEND (req);
568} 733}
569 734
570void 735void
571aio_close (SV *fh, SV *callback=&PL_sv_undef) 736aio_close (SV *fh, SV *callback=&PL_sv_undef)
572 PROTOTYPE: $;$ 737 PROTOTYPE: $;$
573 PPCODE: 738 PPCODE:
574{ 739{
575 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);
576 dREQ; 742 dREQ;
577 743
578 if (close_pipe < 0) 744 if (close_pipe < 0)
579 { 745 {
580 int pipefd [2]; 746 int pipefd [2];
588 } 754 }
589 755
590 req->type = EIO_DUP2; 756 req->type = EIO_DUP2;
591 req->int1 = close_pipe; 757 req->int1 = close_pipe;
592 req->sv2 = newSVsv (fh); 758 req->sv2 = newSVsv (fh);
593 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 759 req->int2 = fd;
594 760
595 REQ_SEND (req); 761 REQ_SEND (req);
596} 762}
597 763
598void 764void
602 aio_write = EIO_WRITE 768 aio_write = EIO_WRITE
603 PROTOTYPE: $$$$$;$ 769 PROTOTYPE: $$$$$;$
604 PPCODE: 770 PPCODE:
605{ 771{
606 STRLEN svlen; 772 STRLEN svlen;
773 int fd = extract_fd (fh, ix == EIO_WRITE);
607 char *svptr = SvPVbyte (data, svlen); 774 char *svptr = SvPVbyte (data, svlen);
608 UV len = SvUV (length); 775 UV len = SvUV (length);
609
610 SvUPGRADE (data, SVt_PV);
611 SvPOK_on (data);
612 776
613 if (dataoffset < 0) 777 if (dataoffset < 0)
614 dataoffset += svlen; 778 dataoffset += svlen;
615 779
616 if (dataoffset < 0 || dataoffset > svlen) 780 if (dataoffset < 0 || dataoffset > svlen)
622 if (!SvOK (length) || len + dataoffset > svlen) 786 if (!SvOK (length) || len + dataoffset > svlen)
623 len = svlen - dataoffset; 787 len = svlen - dataoffset;
624 } 788 }
625 else 789 else
626 { 790 {
627 /* read: grow scalar as necessary */ 791 /* read: check type and grow scalar as necessary */
792 SvUPGRADE (data, SVt_PV);
628 svptr = SvGROW (data, len + dataoffset + 1); 793 svptr = SvGROW (data, len + dataoffset + 1);
629 } 794 }
630
631 if (len < 0)
632 croak ("length must not be negative");
633 795
634 { 796 {
635 dREQ; 797 dREQ;
636 798
637 req->type = ix; 799 req->type = ix;
638 req->sv1 = newSVsv (fh); 800 req->sv1 = newSVsv (fh);
639 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 801 req->int1 = fd;
640 : IoOFP (sv_2io (fh)));
641 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 802 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
642 req->size = len; 803 req->size = len;
643 req->sv2 = SvREFCNT_inc (data); 804 req->sv2 = SvREFCNT_inc (data);
644 req->ptr2 = (char *)svptr + dataoffset; 805 req->ptr2 = (char *)svptr + dataoffset;
645 req->stroffset = dataoffset; 806 req->stroffset = dataoffset;
668 829
669 REQ_SEND; 830 REQ_SEND;
670} 831}
671 832
672void 833void
673aio_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)
674 PROTOTYPE: $$$$;$ 835 PROTOTYPE: $$$$;$
675 PPCODE: 836 PPCODE:
676{ 837{
838 int ifd = extract_fd (in_fh , 0);
839 int ofd = extract_fd (out_fh, 0);
677 dREQ; 840 dREQ;
678 841
679 req->type = EIO_SENDFILE; 842 req->type = EIO_SENDFILE;
680 req->sv1 = newSVsv (out_fh); 843 req->sv1 = newSVsv (out_fh);
681 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 844 req->int1 = ofd;
682 req->sv2 = newSVsv (in_fh); 845 req->sv2 = newSVsv (in_fh);
683 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 846 req->int2 = ifd;
684 req->offs = SvVAL64 (in_offset); 847 req->offs = in_offset;
685 req->size = length; 848 req->size = length;
686 849
687 REQ_SEND; 850 REQ_SEND;
688} 851}
689 852
690void 853void
691aio_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)
692 PROTOTYPE: $$$;$ 855 PROTOTYPE: $$$;$
693 PPCODE: 856 PPCODE:
694{ 857{
858 int fd = extract_fd (fh, 0);
695 dREQ; 859 dREQ;
696 860
697 req->type = EIO_READAHEAD; 861 req->type = EIO_READAHEAD;
698 req->sv1 = newSVsv (fh); 862 req->sv1 = newSVsv (fh);
699 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 863 req->int1 = fd;
700 req->offs = SvVAL64 (offset); 864 req->offs = offset;
701 req->size = length; 865 req->size = length;
702 866
703 REQ_SEND; 867 REQ_SEND;
704} 868}
705 869
821 req->type = EIO_FCHOWN; 985 req->type = EIO_FCHOWN;
822 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 986 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
823 } 987 }
824 988
825 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;
826} 1007}
827 1008
828void 1009void
829aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 1010aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
830 ALIAS: 1011 ALIAS:
895{ 1076{
896 dREQ; 1077 dREQ;
897 1078
898 req->type = EIO_GROUP; 1079 req->type = EIO_GROUP;
899 1080
900 eio_submit (req); 1081 req_submit (req);
901 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1082 XPUSHs (req_sv (req, AIO_GRP_KLASS));
902} 1083}
903 1084
904void 1085void
905aio_nop (SV *callback=&PL_sv_undef) 1086aio_nop (SV *callback=&PL_sv_undef)
917 1098
918int 1099int
919aioreq_pri (int pri = 0) 1100aioreq_pri (int pri = 0)
920 PROTOTYPE: ;$ 1101 PROTOTYPE: ;$
921 CODE: 1102 CODE:
922 RETVAL = next_pri - EIO_PRI_BIAS; 1103 RETVAL = next_pri;
923 if (items > 0) 1104 if (items > 0)
924 { 1105 {
925 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN; 1106 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
926 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX; 1107 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
927 next_pri = pri + EIO_PRI_BIAS; 1108 next_pri = pri;
928 } 1109 }
929 OUTPUT: 1110 OUTPUT:
930 RETVAL 1111 RETVAL
931 1112
932void 1113void
933aioreq_nice (int nice = 0) 1114aioreq_nice (int nice = 0)
934 CODE: 1115 CODE:
935 nice = next_pri - nice; 1116 nice = next_pri - nice;
936 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN; 1117 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
937 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX; 1118 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
938 next_pri = nice + EIO_PRI_BIAS; 1119 next_pri = nice;
939 1120
940void 1121void
941flush () 1122flush ()
942 PROTOTYPE: 1123 PROTOTYPE:
943 CODE: 1124 CODE:
1004 1185
1005int 1186int
1006nthreads() 1187nthreads()
1007 PROTOTYPE: 1188 PROTOTYPE:
1008 CODE: 1189 CODE:
1009 if (WORDACCESS_UNSAFE) X_LOCK (wrklock); 1190 RETVAL = eio_nthreads ();
1010 RETVAL = started;
1011 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1012 OUTPUT: 1191 OUTPUT:
1013 RETVAL 1192 RETVAL
1014 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
1015void _on_next_submit (SV *cb) 1214void _on_next_submit (SV *cb)
1016 CODE: 1215 CODE:
1017 SvREFCNT_dec (on_next_submit); 1216 SvREFCNT_dec (on_next_submit);
1018 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1217 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1019 1218
1026 CODE: 1225 CODE:
1027 eio_cancel (req); 1226 eio_cancel (req);
1028 1227
1029void 1228void
1030cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1229cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1031 CODE: 1230 PPCODE:
1231{
1232 if (GIMME_V != G_VOID)
1233 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1234
1235 if (items > 1)
1236 {
1237 SV *cb_cv = get_cb (callback);
1238
1032 SvREFCNT_dec (req->callback); 1239 SvREFCNT_dec (req->callback);
1033 req->callback = newSVsv (callback); 1240 req->callback = SvREFCNT_inc (cb_cv);
1241 }
1242}
1034 1243
1035MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1244MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1036 1245
1037void 1246void
1038add (aio_req grp, ...) 1247add (aio_req grp, ...)
1070 AV *av; 1279 AV *av;
1071 1280
1072 grp->errorno = errno; 1281 grp->errorno = errno;
1073 1282
1074 av = newAV (); 1283 av = newAV ();
1284 av_extend (av, items - 1);
1075 1285
1076 for (i = 1; i < items; ++i ) 1286 for (i = 1; i < items; ++i )
1077 av_push (av, newSVsv (ST (i))); 1287 av_push (av, newSVsv (ST (i)));
1078 1288
1079 SvREFCNT_dec (grp->sv1); 1289 SvREFCNT_dec (grp->sv1);
1093void 1303void
1094feed (aio_req grp, SV *callback=&PL_sv_undef) 1304feed (aio_req grp, SV *callback=&PL_sv_undef)
1095 CODE: 1305 CODE:
1096{ 1306{
1097 SvREFCNT_dec (grp->sv2); 1307 SvREFCNT_dec (grp->sv2);
1098 grp->sv2 = newSVsv (callback); 1308 grp->sv2 = newSVsv (callback);
1309 grp->feed = aio_grp_feed;
1099 1310
1100 if (grp->int2 <= 0) 1311 if (grp->int2 <= 0)
1101 grp->int2 = 2; 1312 grp->int2 = 2;
1102 1313
1103 eio_grp_limit (grp, grp->int2); 1314 eio_grp_limit (grp, grp->int2);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines