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.121 by root, Tue May 13 18:50:27 2008 UTC vs.
Revision 1.148 by root, Wed Jun 17 01:14:48 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_REQ_MEMBERS \ 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;
90 115
116#define EIO_NO_WRAPPERS 1
117
91#include "libeio/eio.h" 118#include "libeio/eio.h"
119
120#ifndef POSIX_FADV_NORMAL
121# define POSIX_FADV_NORMAL 0
122#endif
123
124#ifndef POSIX_FADV_SEQUENTIAL
125# define POSIX_FADV_SEQUENTIAL 0
126#endif
127
128#ifndef POSIX_FADV_RANDOM
129# define POSIX_FADV_RANDOM 0
130#endif
131
132#ifndef POSIX_FADV_NOREUSE
133# define POSIX_FADV_NOREUSE 0
134#endif
135
136#ifndef POSIX_FADV_WILLNEED
137# define POSIX_FADV_WILLNEED 0
138#endif
139
140#ifndef POSIX_FADV_DONTNEED
141# define POSIX_FADV_DONTNEED 0
142#endif
92 143
93static int req_invoke (eio_req *req); 144static int req_invoke (eio_req *req);
94#define EIO_FINISH(req) req_invoke (req) 145#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); 146static void req_destroy (eio_req *grp);
98#define EIO_DESTROY(req) req_destroy (req) 147#define EIO_DESTROY(req) req_destroy (req)
99 148
100enum { 149enum {
101 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ 150 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
… …
173 222
174static void req_submit (eio_req *req) 223static void req_submit (eio_req *req)
175{ 224{
176 eio_submit (req); 225 eio_submit (req);
177 226
178 if (on_next_submit) 227 if (expect_false (on_next_submit))
179 { 228 {
180 dSP; 229 dSP;
181 SV *cb = sv_2mortal (on_next_submit); 230 SV *cb = sv_2mortal (on_next_submit);
182 231
183 on_next_submit = 0; 232 on_next_submit = 0;
… …
193 dSP; 242 dSP;
194 243
195 if (req->flags & FLAG_SV2_RO_OFF) 244 if (req->flags & FLAG_SV2_RO_OFF)
196 SvREADONLY_off (req->sv2); 245 SvREADONLY_off (req->sv2);
197 246
198 if (!EIO_CANCELLED (req) && SvOK (req->callback)) 247 if (!EIO_CANCELLED (req) && req->callback)
199 { 248 {
200 ENTER; 249 ENTER;
201 SAVETMPS; 250 SAVETMPS;
202 PUSHMARK (SP); 251 PUSHMARK (SP);
203 EXTEND (SP, 1); 252 EXTEND (SP, 1);
… …
209 SV *rv = &PL_sv_undef; 258 SV *rv = &PL_sv_undef;
210 259
211 if (req->result >= 0) 260 if (req->result >= 0)
212 { 261 {
213 int i; 262 int i;
214 char *buf = req->ptr2; 263 char *names = (char *)req->ptr2;
264 eio_dirent *ent = (eio_dirent *)req->ptr1; /* might be 0 */
215 AV *av = newAV (); 265 AV *av = newAV ();
216 266
217 av_extend (av, req->result - 1); 267 av_extend (av, req->result - 1);
218 268
219 for (i = 0; i < req->result; ++i) 269 for (i = 0; i < req->result; ++i)
220 { 270 {
221 SV *sv = newSVpv (buf, 0); 271 if (req->int1 & EIO_READDIR_DENTS)
272 {
273 SV *namesv = newSVpvn (names + ent->nameofs, ent->namelen);
222 274
275 if (req->int1 & EIO_READDIR_CUSTOM2)
276 {
277 static SV *sv_type [EIO_DT_MAX + 1]; /* type sv cache */
278 AV *avent = newAV ();
279
280 av_extend (avent, 2);
281
282 if (!sv_type [ent->type])
283 {
284 sv_type [ent->type] = newSViv (ent->type);
285 SvREADONLY_on (sv_type [ent->type]);
286 }
287
288 av_store (avent, 0, namesv);
289 av_store (avent, 1, SvREFCNT_inc (sv_type [ent->type]));
290 av_store (avent, 2, IVSIZE >= 8 ? newSVuv (ent->inode) : newSVnv (ent->inode));
291
292 av_store (av, i, newRV_noinc ((SV *)avent));
293 }
294 else
223 av_store (av, i, sv); 295 av_store (av, i, namesv);
296
297 ++ent;
298 }
299 else
300 {
301 SV *name = newSVpv (names, 0);
302 av_store (av, i, name);
224 buf += SvCUR (sv) + 1; 303 names += SvCUR (name) + 1;
304 }
225 } 305 }
226 306
227 rv = sv_2mortal (newRV_noinc ((SV *)av)); 307 rv = sv_2mortal (newRV_noinc ((SV *)av));
228 } 308 }
229 309
230 PUSHs (rv); 310 PUSHs (rv);
311
312 if (req->int1 & EIO_READDIR_CUSTOM1)
313 XPUSHs (sv_2mortal (newSViv (req->int1 & ~(EIO_READDIR_CUSTOM1 | EIO_READDIR_CUSTOM2))));
231 } 314 }
232 break; 315 break;
233 316
234 case EIO_OPEN: 317 case EIO_OPEN:
235 { 318 {
… …
241 GV *gv = (GV *)sv_newmortal (); 324 GV *gv = (GV *)sv_newmortal ();
242 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR); 325 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
243 char sym [64]; 326 char sym [64];
244 int symlen; 327 int symlen;
245 328
246 symlen = snprintf (sym, sizeof (sym), "fd#%d", req->result); 329 symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
247 gv_init (gv, stash, sym, symlen, 0); 330 gv_init (gv, stash, sym, symlen, 0);
248 331
249 symlen = snprintf ( 332 symlen = snprintf (
250 sym, 333 sym,
251 sizeof (sym), 334 sizeof (sym),
252 "%s&=%d", 335 "%s&=%d",
253 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<", 336 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
254 req->result 337 (int)req->result
255 ); 338 );
256 339
257 if (do_open (gv, sym, symlen, 0, 0, 0, 0)) 340 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
258 fh = (SV *)gv; 341 fh = (SV *)gv;
259 } 342 }
… …
293 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 376 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
294 PUSHs (sv_2mortal (newSViv (req->result))); 377 PUSHs (sv_2mortal (newSViv (req->result)));
295 break; 378 break;
296 379
297 case EIO_READ: 380 case EIO_READ:
381 {
298 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0)); 382 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
299 *SvEND (req->sv2) = 0; 383 *SvEND (req->sv2) = 0;
384 SvPOK_only (req->sv2);
385 SvSETMAGIC (req->sv2);
300 PUSHs (sv_2mortal (newSViv (req->result))); 386 PUSHs (sv_2mortal (newSViv (req->result)));
387 }
301 break; 388 break;
302 389
303 case EIO_DUP2: 390 case EIO_DUP2:
304 if (req->result > 0) 391 if (req->result > 0)
305 req->result = 0; 392 req->result = 0;
… …
410 X_UNLOCK (reslock); 497 X_UNLOCK (reslock);
411 498
412 if (size) 499 if (size)
413 return; 500 return;
414 501
415 maybe_start_thread (); 502 etp_maybe_start_thread ();
416 503
417 FD_ZERO (&rfd); 504 FD_ZERO (&rfd);
418 FD_SET (respipe [0], &rfd); 505 FD_SET (respipe [0], &rfd);
419 506
420 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0); 507 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
421 } 508 }
422} 509}
423 510
424static int poll_cb (void) 511static int poll_cb (void)
425{ 512{
426 int res; 513 for (;;)
427
428 do
429 { 514 {
430 res = eio_poll (); 515 int res = eio_poll ();
431 516
432 if (res > 0) 517 if (res > 0)
433 croak (0); 518 croak (0);
519
520 if (!max_outstanding || max_outstanding > eio_nreqs ())
521 return res;
522
523 poll_wait ();
434 } 524 }
435 while (max_outstanding && max_outstanding <= eio_nreqs ());
436
437 return res;
438} 525}
439 526
440static void atfork_child (void) 527static void atfork_child (void)
441{ 528{
442 create_respipe (); 529 create_respipe ();
443} 530}
444 531
532static SV *
533get_cb (SV *cb_sv)
534{
535 HV *st;
536 GV *gvp;
537 CV *cv;
538
539 if (!SvOK (cb_sv))
540 return 0;
541
542 cv = sv_2cv (cb_sv, &st, &gvp, 0);
543
544 if (!cv)
545 croak ("IO::AIO callback must be undef or a CODE reference");
546
547 return (SV *)cv;
548}
549
445#define dREQ \ 550#define dREQ \
551 SV *cb_cv; \
446 aio_req req; \ 552 aio_req req; \
447 int req_pri = next_pri; \ 553 int req_pri = next_pri; \
448 next_pri = EIO_PRI_DEFAULT; \ 554 next_pri = EIO_PRI_DEFAULT; \
449 \ 555 \
450 if (SvOK (callback) && !SvROK (callback)) \ 556 cb_cv = get_cb (callback); \
451 croak ("callback must be undef or of reference type"); \
452 \ 557 \
453 Newz (0, req, 1, eio_req); \ 558 Newz (0, req, 1, eio_req); \
454 if (!req) \ 559 if (!req) \
455 croak ("out of memory during eio_req allocation"); \ 560 croak ("out of memory during eio_req allocation"); \
456 \ 561 \
457 req->callback = newSVsv (callback); \ 562 req->callback = SvREFCNT_inc (cb_cv); \
458 req->pri = req_pri 563 req->pri = req_pri
459 564
460#define REQ_SEND \ 565#define REQ_SEND \
566 PUTBACK; \
461 req_submit (req); \ 567 req_submit (req); \
568 SPAGAIN; \
462 \ 569 \
463 if (GIMME_V != G_VOID) \ 570 if (GIMME_V != G_VOID) \
464 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 571 XPUSHs (req_sv (req, AIO_REQ_KLASS));
465 572
573static int
574extract_fd (SV *fh, int wr)
575{
576 int fd = PerlIO_fileno (wr ? IoOFP (sv_2io (fh)) : IoIFP (sv_2io (fh)));
577
578 if (fd < 0)
579 croak ("illegal fh argument, either not an OS file or read/write mode mismatch");
580
581 return fd;
582}
583
466MODULE = IO::AIO PACKAGE = IO::AIO 584MODULE = IO::AIO PACKAGE = IO::AIO
467 585
468PROTOTYPES: ENABLE 586PROTOTYPES: ENABLE
469 587
470BOOT: 588BOOT:
471{ 589{
472 stash = gv_stashpv ("IO::AIO", 1); 590 static const struct {
473 591 const char *name;
474 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 592 IV iv;
475 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 593 } *civ, const_iv[] = {
476 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 594# define const_iv(name, value) { # name, (IV) value },
477 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 595# define const_eio(name) { # name, (IV) EIO_ ## name },
478 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 596 const_iv (EXDEV , EXDEV)
597 const_iv (ENOSYS , ENOSYS)
598 const_iv (O_RDONLY, O_RDONLY)
599 const_iv (O_WRONLY, O_WRONLY)
600 const_iv (O_CREAT , O_CREAT)
601 const_iv (O_TRUNC , O_TRUNC)
479#ifdef _WIN32 602#ifndef _WIN32
480 X_MUTEX_CHECK (wrklock); 603 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 604#endif
605 const_iv (FADV_NORMAL , POSIX_FADV_NORMAL)
606 const_iv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL)
607 const_iv (FADV_RANDOM , POSIX_FADV_RANDOM)
608 const_iv (FADV_NOREUSE , POSIX_FADV_NOREUSE)
609 const_iv (FADV_WILLNEED , POSIX_FADV_WILLNEED)
610 const_iv (FADV_DONTNEED , POSIX_FADV_DONTNEED)
491 611
612 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
613 const_eio (SYNC_FILE_RANGE_WRITE)
614 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
615
616 const_eio (READDIR_DENTS)
617 const_eio (READDIR_DIRS_FIRST)
618 const_eio (READDIR_STAT_ORDER)
619 const_eio (READDIR_FOUND_UNKNOWN)
620
621 const_eio (DT_UNKNOWN)
622 const_eio (DT_FIFO)
623 const_eio (DT_CHR)
624 const_eio (DT_DIR)
625 const_eio (DT_BLK)
626 const_eio (DT_REG)
627 const_eio (DT_LNK)
628 const_eio (DT_SOCK)
629 const_eio (DT_WHT)
630 };
631
632 stash = gv_stashpv ("IO::AIO", 1);
633
634 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
635 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
636
492 create_respipe (); 637 create_respipe ();
493 638
494 if (eio_init (want_poll, done_poll) < 0) 639 if (eio_init (want_poll, done_poll) < 0)
495 croak ("IO::AIO: unable to initialise eio library"); 640 croak ("IO::AIO: unable to initialise eio library");
496 641
497 /* atfork child called in fifo order, so before eio's handler */ 642 /* atfork child called in fifo order, so before eio's handler */
498 X_THREAD_ATFORK (0, 0, atfork_child); 643 X_THREAD_ATFORK (0, 0, atfork_child);
499} 644}
500 645
501void 646void
502max_poll_reqs (int nreqs) 647max_poll_reqs (int nreqs)
503 PROTOTYPE: $ 648 PROTOTYPE: $
… …
556 ALIAS: 701 ALIAS:
557 aio_fsync = EIO_FSYNC 702 aio_fsync = EIO_FSYNC
558 aio_fdatasync = EIO_FDATASYNC 703 aio_fdatasync = EIO_FDATASYNC
559 PPCODE: 704 PPCODE:
560{ 705{
706 int fd = extract_fd (fh, 0);
561 dREQ; 707 dREQ;
562 708
563 req->type = ix; 709 req->type = ix;
564 req->sv1 = newSVsv (fh); 710 req->sv1 = newSVsv (fh);
565 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 711 req->int1 = fd;
712
713 REQ_SEND (req);
714}
715
716void
717aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef)
718 PROTOTYPE: $$$$;$
719 PPCODE:
720{
721 int fd = extract_fd (fh, 0);
722 dREQ;
723
724 req->type = EIO_SYNC_FILE_RANGE;
725 req->sv1 = newSVsv (fh);
726 req->int1 = fd;
727 req->offs = offset;
728 req->size = nbytes;
729 req->int2 = flags;
566 730
567 REQ_SEND (req); 731 REQ_SEND (req);
568} 732}
569 733
570void 734void
571aio_close (SV *fh, SV *callback=&PL_sv_undef) 735aio_close (SV *fh, SV *callback=&PL_sv_undef)
572 PROTOTYPE: $;$ 736 PROTOTYPE: $;$
573 PPCODE: 737 PPCODE:
574{ 738{
575 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 739 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
740 int fd = extract_fd (fh, 0);
576 dREQ; 741 dREQ;
577 742
578 if (close_pipe < 0) 743 if (close_pipe < 0)
579 { 744 {
580 int pipefd [2]; 745 int pipefd [2];
… …
588 } 753 }
589 754
590 req->type = EIO_DUP2; 755 req->type = EIO_DUP2;
591 req->int1 = close_pipe; 756 req->int1 = close_pipe;
592 req->sv2 = newSVsv (fh); 757 req->sv2 = newSVsv (fh);
593 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 758 req->int2 = fd;
594 759
595 REQ_SEND (req); 760 REQ_SEND (req);
596} 761}
597 762
598void 763void
… …
602 aio_write = EIO_WRITE 767 aio_write = EIO_WRITE
603 PROTOTYPE: $$$$$;$ 768 PROTOTYPE: $$$$$;$
604 PPCODE: 769 PPCODE:
605{ 770{
606 STRLEN svlen; 771 STRLEN svlen;
772 int fd = extract_fd (fh, ix == EIO_WRITE);
607 char *svptr = SvPVbyte (data, svlen); 773 char *svptr = SvPVbyte (data, svlen);
608 UV len = SvUV (length); 774 UV len = SvUV (length);
609
610 SvUPGRADE (data, SVt_PV);
611 SvPOK_on (data);
612 775
613 if (dataoffset < 0) 776 if (dataoffset < 0)
614 dataoffset += svlen; 777 dataoffset += svlen;
615 778
616 if (dataoffset < 0 || dataoffset > svlen) 779 if (dataoffset < 0 || dataoffset > svlen)
… …
622 if (!SvOK (length) || len + dataoffset > svlen) 785 if (!SvOK (length) || len + dataoffset > svlen)
623 len = svlen - dataoffset; 786 len = svlen - dataoffset;
624 } 787 }
625 else 788 else
626 { 789 {
627 /* read: grow scalar as necessary */ 790 /* read: check type and grow scalar as necessary */
791 SvUPGRADE (data, SVt_PV);
628 svptr = SvGROW (data, len + dataoffset + 1); 792 svptr = SvGROW (data, len + dataoffset + 1);
629 } 793 }
630
631 if (len < 0)
632 croak ("length must not be negative");
633 794
634 { 795 {
635 dREQ; 796 dREQ;
636 797
637 req->type = ix; 798 req->type = ix;
638 req->sv1 = newSVsv (fh); 799 req->sv1 = newSVsv (fh);
639 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 800 req->int1 = fd;
640 : IoOFP (sv_2io (fh)));
641 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 801 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
642 req->size = len; 802 req->size = len;
643 req->sv2 = SvREFCNT_inc (data); 803 req->sv2 = SvREFCNT_inc (data);
644 req->ptr2 = (char *)svptr + dataoffset; 804 req->ptr2 = (char *)svptr + dataoffset;
645 req->stroffset = dataoffset; 805 req->stroffset = dataoffset;
… …
668 828
669 REQ_SEND; 829 REQ_SEND;
670} 830}
671 831
672void 832void
673aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef) 833aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef)
674 PROTOTYPE: $$$$;$ 834 PROTOTYPE: $$$$;$
675 PPCODE: 835 PPCODE:
676{ 836{
837 int ifd = extract_fd (in_fh , 0);
838 int ofd = extract_fd (out_fh, 0);
677 dREQ; 839 dREQ;
678 840
679 req->type = EIO_SENDFILE; 841 req->type = EIO_SENDFILE;
680 req->sv1 = newSVsv (out_fh); 842 req->sv1 = newSVsv (out_fh);
681 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 843 req->int1 = ofd;
682 req->sv2 = newSVsv (in_fh); 844 req->sv2 = newSVsv (in_fh);
683 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 845 req->int2 = ifd;
684 req->offs = SvVAL64 (in_offset); 846 req->offs = in_offset;
685 req->size = length; 847 req->size = length;
686 848
687 REQ_SEND; 849 REQ_SEND;
688} 850}
689 851
690void 852void
691aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef) 853aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef)
692 PROTOTYPE: $$$;$ 854 PROTOTYPE: $$$;$
693 PPCODE: 855 PPCODE:
694{ 856{
857 int fd = extract_fd (fh, 0);
695 dREQ; 858 dREQ;
696 859
697 req->type = EIO_READAHEAD; 860 req->type = EIO_READAHEAD;
698 req->sv1 = newSVsv (fh); 861 req->sv1 = newSVsv (fh);
699 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 862 req->int1 = fd;
700 req->offs = SvVAL64 (offset); 863 req->offs = offset;
701 req->size = length; 864 req->size = length;
702 865
703 REQ_SEND; 866 REQ_SEND;
704} 867}
705 868
… …
821 req->type = EIO_FCHOWN; 984 req->type = EIO_FCHOWN;
822 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 985 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
823 } 986 }
824 987
825 REQ_SEND; 988 REQ_SEND;
989}
990
991void
992aio_readdirx (SV8 *pathname, IV flags, SV *callback=&PL_sv_undef)
993 PPCODE:
994{
995 dREQ;
996
997 req->type = EIO_READDIR;
998 req->sv1 = newSVsv (pathname);
999 req->ptr1 = SvPVbyte_nolen (req->sv1);
1000 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
1001
1002 if (flags & EIO_READDIR_DENTS)
1003 req->int1 |= EIO_READDIR_CUSTOM2;
1004
1005 REQ_SEND;
826} 1006}
827 1007
828void 1008void
829aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 1009aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
830 ALIAS: 1010 ALIAS:
… …
895{ 1075{
896 dREQ; 1076 dREQ;
897 1077
898 req->type = EIO_GROUP; 1078 req->type = EIO_GROUP;
899 1079
900 eio_submit (req); 1080 req_submit (req);
901 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1081 XPUSHs (req_sv (req, AIO_GRP_KLASS));
902} 1082}
903 1083
904void 1084void
905aio_nop (SV *callback=&PL_sv_undef) 1085aio_nop (SV *callback=&PL_sv_undef)
… …
1004 1184
1005int 1185int
1006nthreads() 1186nthreads()
1007 PROTOTYPE: 1187 PROTOTYPE:
1008 CODE: 1188 CODE:
1009 if (WORDACCESS_UNSAFE) X_LOCK (wrklock); 1189 RETVAL = eio_nthreads ();
1010 RETVAL = started;
1011 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1012 OUTPUT: 1190 OUTPUT:
1013 RETVAL 1191 RETVAL
1014 1192
1193int
1194fadvise (aio_rfd fh, off_t offset, off_t length, IV advice)
1195 PROTOTYPE: $$$$
1196 CODE:
1197{
1198 #if _XOPEN_SOURCE >= 600
1199 RETVAL = posix_fadvise (fh, offset, length, advice);
1200 #else
1201 RETVAL = errno = ENOSYS;
1202 #endif
1203}
1204 OUTPUT:
1205 RETVAL
1206
1207ssize_t
1208sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
1209 PROTOTYPE: $$$$
1210 CODE:
1211 eio_sendfile_sync (ofh, ifh, offset, count);
1212
1015void _on_next_submit (SV *cb) 1213void _on_next_submit (SV *cb)
1016 CODE: 1214 CODE:
1017 SvREFCNT_dec (on_next_submit); 1215 SvREFCNT_dec (on_next_submit);
1018 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1216 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1019 1217
… …
1026 CODE: 1224 CODE:
1027 eio_cancel (req); 1225 eio_cancel (req);
1028 1226
1029void 1227void
1030cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1228cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1031 CODE: 1229 PPCODE:
1230{
1231 if (GIMME_V != G_VOID)
1232 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1233
1234 if (items > 1)
1235 {
1236 SV *cb_cv = get_cb (callback);
1237
1032 SvREFCNT_dec (req->callback); 1238 SvREFCNT_dec (req->callback);
1033 req->callback = newSVsv (callback); 1239 req->callback = SvREFCNT_inc (cb_cv);
1240 }
1241}
1034 1242
1035MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1243MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1036 1244
1037void 1245void
1038add (aio_req grp, ...) 1246add (aio_req grp, ...)
… …
1070 AV *av; 1278 AV *av;
1071 1279
1072 grp->errorno = errno; 1280 grp->errorno = errno;
1073 1281
1074 av = newAV (); 1282 av = newAV ();
1283 av_extend (av, items - 1);
1075 1284
1076 for (i = 1; i < items; ++i ) 1285 for (i = 1; i < items; ++i )
1077 av_push (av, newSVsv (ST (i))); 1286 av_push (av, newSVsv (ST (i)));
1078 1287
1079 SvREFCNT_dec (grp->sv1); 1288 SvREFCNT_dec (grp->sv1);
… …
1093void 1302void
1094feed (aio_req grp, SV *callback=&PL_sv_undef) 1303feed (aio_req grp, SV *callback=&PL_sv_undef)
1095 CODE: 1304 CODE:
1096{ 1305{
1097 SvREFCNT_dec (grp->sv2); 1306 SvREFCNT_dec (grp->sv2);
1098 grp->sv2 = newSVsv (callback); 1307 grp->sv2 = newSVsv (callback);
1308 grp->feed = aio_grp_feed;
1099 1309
1100 if (grp->int2 <= 0) 1310 if (grp->int2 <= 0)
1101 grp->int2 = 2; 1311 grp->int2 = 2;
1102 1312
1103 eio_grp_limit (grp, grp->int2); 1313 eio_grp_limit (grp, grp->int2);

Diff Legend

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