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.118 by root, Sun May 11 00:01:03 2008 UTC vs.
Revision 1.146 by root, Fri Jun 12 17:07:00 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
74# define SvVAL64 SvIV 80# define SvVAL64 SvIV
75#else 81#else
76# define SvVAL64 SvNV 82# define SvVAL64 SvNV
77#endif 83#endif
78 84
85/*****************************************************************************/
86
87#if __GNUC__ >= 3
88# define expect(expr,value) __builtin_expect ((expr),(value))
89#else
90# define expect(expr,value) (expr)
91#endif
92
93#define expect_false(expr) expect ((expr) != 0, 0)
94#define expect_true(expr) expect ((expr) != 0, 1)
95
96/*****************************************************************************/
97
79static HV *stash; 98static HV *stash;
80typedef SV SV8; /* byte-sv, used for argument-checking */ 99typedef SV SV8; /* byte-sv, used for argument-checking */
81 100
82#define AIO_REQ_KLASS "IO::AIO::REQ" 101#define AIO_REQ_KLASS "IO::AIO::REQ"
83#define AIO_GRP_KLASS "IO::AIO::GRP" 102#define AIO_GRP_KLASS "IO::AIO::GRP"
84 103
85#define EIO_COMMON \ 104#define EIO_REQ_MEMBERS \
86 SV *callback; \ 105 SV *callback; \
87 SV *sv1, *sv2; \ 106 SV *sv1, *sv2; \
88 STRLEN stroffset; \ 107 STRLEN stroffset; \
89 SV *self 108 SV *self;
109
110#define EIO_NO_WRAPPERS 1
90 111
91#include "libeio/eio.h" 112#include "libeio/eio.h"
92 113
93static int req_invoke (eio_req *req); 114static int req_invoke (eio_req *req);
94#define EIO_FINISH(req) req_invoke (req) 115#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); 116static void req_destroy (eio_req *grp);
98#define EIO_DESTROY(req) req_destroy (req) 117#define EIO_DESTROY(req) req_destroy (req)
99 118
100enum { 119enum {
101 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ 120 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
105 124
106typedef eio_req *aio_req; 125typedef eio_req *aio_req;
107typedef eio_req *aio_req_ornot; 126typedef eio_req *aio_req_ornot;
108 127
109static SV *on_next_submit; 128static SV *on_next_submit;
110static int next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; 129static int next_pri = EIO_PRI_DEFAULT;
111static int max_outstanding; 130static int max_outstanding;
112 131
113static int respipe_osf [2], respipe [2] = { -1, -1 }; 132static int respipe_osf [2], respipe [2] = { -1, -1 };
114 133
115static void req_destroy (aio_req req); 134static void req_destroy (aio_req req);
173 192
174static void req_submit (eio_req *req) 193static void req_submit (eio_req *req)
175{ 194{
176 eio_submit (req); 195 eio_submit (req);
177 196
178 if (on_next_submit) 197 if (expect_false (on_next_submit))
179 { 198 {
180 dSP; 199 dSP;
181 SV *cb = sv_2mortal (on_next_submit); 200 SV *cb = sv_2mortal (on_next_submit);
182 201
183 on_next_submit = 0; 202 on_next_submit = 0;
193 dSP; 212 dSP;
194 213
195 if (req->flags & FLAG_SV2_RO_OFF) 214 if (req->flags & FLAG_SV2_RO_OFF)
196 SvREADONLY_off (req->sv2); 215 SvREADONLY_off (req->sv2);
197 216
198 if (!EIO_CANCELLED (req) && SvOK (req->callback)) 217 if (!EIO_CANCELLED (req) && req->callback)
199 { 218 {
200 ENTER; 219 ENTER;
201 SAVETMPS; 220 SAVETMPS;
202 PUSHMARK (SP); 221 PUSHMARK (SP);
203 EXTEND (SP, 1); 222 EXTEND (SP, 1);
216 235
217 av_extend (av, req->result - 1); 236 av_extend (av, req->result - 1);
218 237
219 for (i = 0; i < req->result; ++i) 238 for (i = 0; i < req->result; ++i)
220 { 239 {
240 if (req->int1 & EIO_READDIR_DENTS)
241 {
242 eio_dirent *ent = (eio_dirent *)buf;
243 SV *namesv = newSVpvn (ent->name, ent->namelen);
244
245 if (req->int1 & EIO_READDIR_CUSTOM2)
246 {
247 static SV *sv_type [EIO_DT_MAX + 1]; /* type sv cache */
248 AV *avent = newAV ();
249
250 av_extend (avent, 2);
251
252 if (!sv_type [ent->type])
253 {
254 sv_type [ent->type] = newSViv (ent->type);
255 SvREADONLY_on (sv_type [ent->type]);
256 }
257
258 av_store (avent, 0, namesv);
259 av_store (avent, 1, SvREFCNT_inc (sv_type [ent->type]));
260 av_store (avent, 2, IVSIZE >= 8 ? newSVuv (ent->inode) : newSVnv (ent->inode));
261
262 av_store (av, i, newRV_noinc ((SV *)avent));
263 }
264 else
265 av_store (av, i, namesv);
266
267 buf += sizeof (eio_dirent);
268 }
269 else
270 {
221 SV *sv = newSVpv (buf, 0); 271 SV *name = newSVpv (buf, 0);
222
223 av_store (av, i, sv); 272 av_store (av, i, name);
224 buf += SvCUR (sv) + 1; 273 buf += SvCUR (name) + 1;
274 }
225 } 275 }
226 276
227 rv = sv_2mortal (newRV_noinc ((SV *)av)); 277 rv = sv_2mortal (newRV_noinc ((SV *)av));
228 } 278 }
229 279
230 PUSHs (rv); 280 PUSHs (rv);
281
282 if (req->int1 & EIO_READDIR_CUSTOM1)
283 XPUSHs (sv_2mortal (newSViv (req->int1 & ~(EIO_READDIR_CUSTOM1 | EIO_READDIR_CUSTOM2))));
231 } 284 }
232 break; 285 break;
233 286
234 case EIO_OPEN: 287 case EIO_OPEN:
235 { 288 {
241 GV *gv = (GV *)sv_newmortal (); 294 GV *gv = (GV *)sv_newmortal ();
242 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR); 295 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
243 char sym [64]; 296 char sym [64];
244 int symlen; 297 int symlen;
245 298
246 symlen = snprintf (sym, sizeof (sym), "fd#%d", req->result); 299 symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
247 gv_init (gv, stash, sym, symlen, 0); 300 gv_init (gv, stash, sym, symlen, 0);
248 301
249 symlen = snprintf ( 302 symlen = snprintf (
250 sym, 303 sym,
251 sizeof (sym), 304 sizeof (sym),
252 "%s&=%d", 305 "%s&=%d",
253 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<", 306 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
254 req->result 307 (int)req->result
255 ); 308 );
256 309
257 if (do_open (gv, sym, symlen, 0, 0, 0, 0)) 310 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
258 fh = (SV *)gv; 311 fh = (SV *)gv;
259 } 312 }
280 case EIO_BUSY: 333 case EIO_BUSY:
281 break; 334 break;
282 335
283 case EIO_READLINK: 336 case EIO_READLINK:
284 if (req->result > 0) 337 if (req->result > 0)
285 { 338 PUSHs (sv_2mortal (newSVpvn (req->ptr2, req->result)));
286 SvCUR_set (req->sv2, req->result);
287 *SvEND (req->sv2) = 0;
288 PUSHs (req->sv2);
289 }
290 break; 339 break;
291 340
292 case EIO_STAT: 341 case EIO_STAT:
293 case EIO_LSTAT: 342 case EIO_LSTAT:
294 case EIO_FSTAT: 343 case EIO_FSTAT:
297 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 346 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
298 PUSHs (sv_2mortal (newSViv (req->result))); 347 PUSHs (sv_2mortal (newSViv (req->result)));
299 break; 348 break;
300 349
301 case EIO_READ: 350 case EIO_READ:
351 {
302 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0)); 352 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
303 *SvEND (req->sv2) = 0; 353 *SvEND (req->sv2) = 0;
354 SvPOK_only (req->sv2);
355 SvSETMAGIC (req->sv2);
304 PUSHs (sv_2mortal (newSViv (req->result))); 356 PUSHs (sv_2mortal (newSViv (req->result)));
357 }
305 break; 358 break;
306 359
307 case EIO_DUP2: 360 case EIO_DUP2:
308 if (req->result > 0) 361 if (req->result > 0)
309 req->result = 0; 362 req->result = 0;
414 X_UNLOCK (reslock); 467 X_UNLOCK (reslock);
415 468
416 if (size) 469 if (size)
417 return; 470 return;
418 471
419 maybe_start_thread (); 472 etp_maybe_start_thread ();
420 473
421 FD_ZERO (&rfd); 474 FD_ZERO (&rfd);
422 FD_SET (respipe [0], &rfd); 475 FD_SET (respipe [0], &rfd);
423 476
424 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0); 477 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
425 } 478 }
426} 479}
427 480
428static int poll_cb (void) 481static int poll_cb (void)
429{ 482{
430 int res; 483 for (;;)
431
432 do
433 { 484 {
434 res = eio_poll (); 485 int res = eio_poll ();
435 486
436 if (res > 0) 487 if (res > 0)
437 croak (0); 488 croak (0);
489
490 if (!max_outstanding || max_outstanding > eio_nreqs ())
491 return res;
492
493 poll_wait ();
438 } 494 }
439 while (max_outstanding && max_outstanding <= eio_nreqs ());
440
441 return res;
442} 495}
443 496
444static void atfork_child (void) 497static void atfork_child (void)
445{ 498{
446 create_respipe (); 499 create_respipe ();
447} 500}
448 501
502static SV *
503get_cb (SV *cb_sv)
504{
505 HV *st;
506 GV *gvp;
507 CV *cv;
508
509 if (!SvOK (cb_sv))
510 return 0;
511
512 cv = sv_2cv (cb_sv, &st, &gvp, 0);
513
514 if (!cv)
515 croak ("IO::AIO callback must be undef or a CODE reference");
516
517 return (SV *)cv;
518}
519
449#define dREQ \ 520#define dREQ \
521 SV *cb_cv; \
450 aio_req req; \ 522 aio_req req; \
451 int req_pri = next_pri; \ 523 int req_pri = next_pri; \
452 next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; \ 524 next_pri = EIO_PRI_DEFAULT; \
453 \ 525 \
454 if (SvOK (callback) && !SvROK (callback)) \ 526 cb_cv = get_cb (callback); \
455 croak ("callback must be undef or of reference type"); \
456 \ 527 \
457 Newz (0, req, 1, eio_req); \ 528 Newz (0, req, 1, eio_req); \
458 if (!req) \ 529 if (!req) \
459 croak ("out of memory during eio_req allocation"); \ 530 croak ("out of memory during eio_req allocation"); \
460 \ 531 \
461 req->callback = newSVsv (callback); \ 532 req->callback = SvREFCNT_inc (cb_cv); \
462 req->pri = req_pri 533 req->pri = req_pri
463 534
464#define REQ_SEND \ 535#define REQ_SEND \
536 PUTBACK; \
465 req_submit (req); \ 537 req_submit (req); \
538 SPAGAIN; \
466 \ 539 \
467 if (GIMME_V != G_VOID) \ 540 if (GIMME_V != G_VOID) \
468 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 541 XPUSHs (req_sv (req, AIO_REQ_KLASS));
469 542
543static int
544extract_fd (SV *fh, int wr)
545{
546 int fd = PerlIO_fileno (wr ? IoOFP (sv_2io (fh)) : IoIFP (sv_2io (fh)));
547
548 if (fd < 0)
549 croak ("illegal fh argument, either not an OS file or read/write mode mismatch");
550
551 return fd;
552}
553
470MODULE = IO::AIO PACKAGE = IO::AIO 554MODULE = IO::AIO PACKAGE = IO::AIO
471 555
472PROTOTYPES: ENABLE 556PROTOTYPES: ENABLE
473 557
474BOOT: 558BOOT:
475{ 559{
476 stash = gv_stashpv ("IO::AIO", 1); 560 static const struct {
477 561 const char *name;
478 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 562 IV iv;
479 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 563 } *civ, const_iv[] = {
480 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 564# define const_iv(name, value) { # name, (IV) value },
481 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 565# define const_eio(name) { # name, (IV) EIO_ ## name },
482 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 566 const_iv (EXDEV , EXDEV)
567 const_iv (ENOSYS , ENOSYS)
568 const_iv (O_RDONLY, O_RDONLY)
569 const_iv (O_WRONLY, O_WRONLY)
570 const_iv (O_CREAT , O_CREAT)
571 const_iv (O_TRUNC , O_TRUNC)
483#ifdef _WIN32 572#ifndef _WIN32
484 X_MUTEX_CHECK (wrklock); 573 const_iv (S_IFIFO , S_IFIFO)
485 X_MUTEX_CHECK (reslock);
486 X_MUTEX_CHECK (reqlock);
487 X_MUTEX_CHECK (reqwait);
488 X_MUTEX_CHECK (preadwritelock);
489 X_MUTEX_CHECK (readdirlock);
490
491 X_COND_CHECK (reqwait);
492#else
493 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
494#endif 574#endif
575 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
576 const_eio (SYNC_FILE_RANGE_WRITE)
577 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
495 578
579 const_eio (READDIR_DENTS)
580 const_eio (READDIR_DIRS_FIRST)
581 const_eio (READDIR_STAT_ORDER)
582 const_eio (READDIR_FOUND_UNKNOWN)
583
584 const_eio (DT_UNKNOWN)
585 const_eio (DT_FIFO)
586 const_eio (DT_CHR)
587 const_eio (DT_DIR)
588 const_eio (DT_BLK)
589 const_eio (DT_REG)
590 const_eio (DT_LNK)
591 const_eio (DT_SOCK)
592 const_eio (DT_WHT)
593 };
594
595 stash = gv_stashpv ("IO::AIO", 1);
596
597 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
598 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
599
496 create_respipe (); 600 create_respipe ();
497 601
498 if (eio_init (want_poll, done_poll) < 0) 602 if (eio_init (want_poll, done_poll) < 0)
499 croak ("IO::AIO: unable to initialise eio library"); 603 croak ("IO::AIO: unable to initialise eio library");
500 604
501 /* atfork child called in fifo order, so before eio's handler */ 605 /* atfork child called in fifo order, so before eio's handler */
502 X_THREAD_ATFORK (0, 0, atfork_child); 606 X_THREAD_ATFORK (0, 0, atfork_child);
503} 607}
504 608
505void 609void
506max_poll_reqs (int nreqs) 610max_poll_reqs (int nreqs)
507 PROTOTYPE: $ 611 PROTOTYPE: $
560 ALIAS: 664 ALIAS:
561 aio_fsync = EIO_FSYNC 665 aio_fsync = EIO_FSYNC
562 aio_fdatasync = EIO_FDATASYNC 666 aio_fdatasync = EIO_FDATASYNC
563 PPCODE: 667 PPCODE:
564{ 668{
669 int fd = extract_fd (fh, 0);
565 dREQ; 670 dREQ;
566 671
567 req->type = ix; 672 req->type = ix;
568 req->sv1 = newSVsv (fh); 673 req->sv1 = newSVsv (fh);
569 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 674 req->int1 = fd;
675
676 REQ_SEND (req);
677}
678
679void
680aio_sync_file_range (SV *fh, SV *offset, SV *nbytes, IV flags, SV *callback=&PL_sv_undef)
681 PROTOTYPE: $$$$;$
682 PPCODE:
683{
684 int fd = extract_fd (fh, 0);
685 dREQ;
686
687 req->type = EIO_SYNC_FILE_RANGE;
688 req->sv1 = newSVsv (fh);
689 req->int1 = fd;
690 req->offs = SvVAL64 (offset);
691 req->size = SvVAL64 (nbytes);
692 req->int2 = flags;
570 693
571 REQ_SEND (req); 694 REQ_SEND (req);
572} 695}
573 696
574void 697void
575aio_close (SV *fh, SV *callback=&PL_sv_undef) 698aio_close (SV *fh, SV *callback=&PL_sv_undef)
576 PROTOTYPE: $;$ 699 PROTOTYPE: $;$
577 PPCODE: 700 PPCODE:
578{ 701{
579 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 702 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
703 int fd = extract_fd (fh, 0);
580 dREQ; 704 dREQ;
581 705
582 if (close_pipe < 0) 706 if (close_pipe < 0)
583 { 707 {
584 int pipefd [2]; 708 int pipefd [2];
592 } 716 }
593 717
594 req->type = EIO_DUP2; 718 req->type = EIO_DUP2;
595 req->int1 = close_pipe; 719 req->int1 = close_pipe;
596 req->sv2 = newSVsv (fh); 720 req->sv2 = newSVsv (fh);
597 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 721 req->int2 = fd;
598 722
599 REQ_SEND (req); 723 REQ_SEND (req);
600} 724}
601 725
602void 726void
606 aio_write = EIO_WRITE 730 aio_write = EIO_WRITE
607 PROTOTYPE: $$$$$;$ 731 PROTOTYPE: $$$$$;$
608 PPCODE: 732 PPCODE:
609{ 733{
610 STRLEN svlen; 734 STRLEN svlen;
735 int fd = extract_fd (fh, ix == EIO_WRITE);
611 char *svptr = SvPVbyte (data, svlen); 736 char *svptr = SvPVbyte (data, svlen);
612 UV len = SvUV (length); 737 UV len = SvUV (length);
613
614 SvUPGRADE (data, SVt_PV);
615 SvPOK_on (data);
616 738
617 if (dataoffset < 0) 739 if (dataoffset < 0)
618 dataoffset += svlen; 740 dataoffset += svlen;
619 741
620 if (dataoffset < 0 || dataoffset > svlen) 742 if (dataoffset < 0 || dataoffset > svlen)
626 if (!SvOK (length) || len + dataoffset > svlen) 748 if (!SvOK (length) || len + dataoffset > svlen)
627 len = svlen - dataoffset; 749 len = svlen - dataoffset;
628 } 750 }
629 else 751 else
630 { 752 {
631 /* read: grow scalar as necessary */ 753 /* read: check type and grow scalar as necessary */
754 SvUPGRADE (data, SVt_PV);
632 svptr = SvGROW (data, len + dataoffset + 1); 755 svptr = SvGROW (data, len + dataoffset + 1);
633 } 756 }
634
635 if (len < 0)
636 croak ("length must not be negative");
637 757
638 { 758 {
639 dREQ; 759 dREQ;
640 760
641 req->type = ix; 761 req->type = ix;
642 req->sv1 = newSVsv (fh); 762 req->sv1 = newSVsv (fh);
643 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 763 req->int1 = fd;
644 : IoOFP (sv_2io (fh)));
645 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 764 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
646 req->size = len; 765 req->size = len;
647 req->sv2 = SvREFCNT_inc (data); 766 req->sv2 = SvREFCNT_inc (data);
648 req->ptr2 = (char *)svptr + dataoffset; 767 req->ptr2 = (char *)svptr + dataoffset;
649 req->stroffset = dataoffset; 768 req->stroffset = dataoffset;
664 PPCODE: 783 PPCODE:
665{ 784{
666 SV *data; 785 SV *data;
667 dREQ; 786 dREQ;
668 787
669 data = newSV (NAME_MAX);
670 SvPOK_on (data);
671
672 req->type = EIO_READLINK; 788 req->type = EIO_READLINK;
673 req->sv1 = newSVsv (path); 789 req->sv1 = newSVsv (path);
674 req->ptr1 = SvPVbyte_nolen (req->sv1); 790 req->ptr1 = SvPVbyte_nolen (req->sv1);
675 req->sv2 = data;
676 req->ptr2 = SvPVbyte_nolen (data);
677 791
678 REQ_SEND; 792 REQ_SEND;
679} 793}
680 794
681void 795void
682aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef) 796aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef)
683 PROTOTYPE: $$$$;$ 797 PROTOTYPE: $$$$;$
684 PPCODE: 798 PPCODE:
685{ 799{
800 int ifd = extract_fd (in_fh , 0);
801 int ofd = extract_fd (out_fh, 0);
686 dREQ; 802 dREQ;
687 803
688 req->type = EIO_SENDFILE; 804 req->type = EIO_SENDFILE;
689 req->sv1 = newSVsv (out_fh); 805 req->sv1 = newSVsv (out_fh);
690 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 806 req->int1 = ofd;
691 req->sv2 = newSVsv (in_fh); 807 req->sv2 = newSVsv (in_fh);
692 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 808 req->int2 = ifd;
693 req->offs = SvVAL64 (in_offset); 809 req->offs = SvVAL64 (in_offset);
694 req->size = length; 810 req->size = length;
695 811
696 REQ_SEND; 812 REQ_SEND;
697} 813}
699void 815void
700aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef) 816aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef)
701 PROTOTYPE: $$$;$ 817 PROTOTYPE: $$$;$
702 PPCODE: 818 PPCODE:
703{ 819{
820 int fd = extract_fd (fh, 0);
704 dREQ; 821 dREQ;
705 822
706 req->type = EIO_READAHEAD; 823 req->type = EIO_READAHEAD;
707 req->sv1 = newSVsv (fh); 824 req->sv1 = newSVsv (fh);
708 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 825 req->int1 = fd;
709 req->offs = SvVAL64 (offset); 826 req->offs = SvVAL64 (offset);
710 req->size = length; 827 req->size = length;
711 828
712 REQ_SEND; 829 REQ_SEND;
713} 830}
719 aio_lstat = EIO_LSTAT 836 aio_lstat = EIO_LSTAT
720 PPCODE: 837 PPCODE:
721{ 838{
722 dREQ; 839 dREQ;
723 840
724 req->ptr2 = malloc (sizeof (EIO_STRUCT_STAT));
725 if (!req->ptr2)
726 {
727 req_destroy (req);
728 croak ("out of memory during aio_stat statdata allocation");
729 }
730
731 req->flags |= EIO_FLAG_PTR2_FREE;
732 req->sv1 = newSVsv (fh_or_path); 841 req->sv1 = newSVsv (fh_or_path);
733 842
734 if (SvPOK (fh_or_path)) 843 if (SvPOK (req->sv1))
735 { 844 {
736 req->type = ix; 845 req->type = ix;
737 req->ptr1 = SvPVbyte_nolen (req->sv1); 846 req->ptr1 = SvPVbyte_nolen (req->sv1);
738 } 847 }
739 else 848 else
753 862
754 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 863 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
755 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; 864 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
756 req->sv1 = newSVsv (fh_or_path); 865 req->sv1 = newSVsv (fh_or_path);
757 866
758 if (SvPOK (fh_or_path)) 867 if (SvPOK (req->sv1))
759 { 868 {
760 req->type = EIO_UTIME; 869 req->type = EIO_UTIME;
761 req->ptr1 = SvPVbyte_nolen (req->sv1); 870 req->ptr1 = SvPVbyte_nolen (req->sv1);
762 } 871 }
763 else 872 else
776 dREQ; 885 dREQ;
777 886
778 req->sv1 = newSVsv (fh_or_path); 887 req->sv1 = newSVsv (fh_or_path);
779 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 888 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
780 889
781 if (SvPOK (fh_or_path)) 890 if (SvPOK (req->sv1))
782 { 891 {
783 req->type = EIO_TRUNCATE; 892 req->type = EIO_TRUNCATE;
784 req->ptr1 = SvPVbyte_nolen (req->sv1); 893 req->ptr1 = SvPVbyte_nolen (req->sv1);
785 } 894 }
786 else 895 else
794 903
795void 904void
796aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef) 905aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
797 ALIAS: 906 ALIAS:
798 aio_chmod = EIO_CHMOD 907 aio_chmod = EIO_CHMOD
799 aio_fchmod = EIO_FCHMOD
800 aio_mkdir = EIO_MKDIR 908 aio_mkdir = EIO_MKDIR
801 PPCODE: 909 PPCODE:
802{ 910{
803 dREQ; 911 dREQ;
804 912
805 req->type = ix;
806 req->int2 = mode; 913 req->int2 = mode;
807 req->sv1 = newSVsv (fh_or_path); 914 req->sv1 = newSVsv (fh_or_path);
808 915
809 if (ix == EIO_FCHMOD) 916 if (SvPOK (req->sv1))
810 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 917 {
918 req->type = ix;
919 req->ptr1 = SvPVbyte_nolen (req->sv1);
920 }
811 else 921 else
812 req->ptr1 = SvPVbyte_nolen (req->sv1); 922 {
923 req->type = EIO_FCHMOD;
924 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
925 }
813 926
814 REQ_SEND; 927 REQ_SEND;
815} 928}
816 929
817void 930void
822 935
823 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 936 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
824 req->int3 = SvOK (gid) ? SvIV (gid) : -1; 937 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
825 req->sv1 = newSVsv (fh_or_path); 938 req->sv1 = newSVsv (fh_or_path);
826 939
827 if (SvPOK (fh_or_path)) 940 if (SvPOK (req->sv1))
828 { 941 {
829 req->type = EIO_CHOWN; 942 req->type = EIO_CHOWN;
830 req->ptr1 = SvPVbyte_nolen (req->sv1); 943 req->ptr1 = SvPVbyte_nolen (req->sv1);
831 } 944 }
832 else 945 else
834 req->type = EIO_FCHOWN; 947 req->type = EIO_FCHOWN;
835 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 948 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
836 } 949 }
837 950
838 REQ_SEND; 951 REQ_SEND;
952}
953
954void
955aio_readdirx (SV8 *pathname, IV flags, SV *callback=&PL_sv_undef)
956 PPCODE:
957{
958 dREQ;
959
960 req->type = EIO_READDIR;
961 req->sv1 = newSVsv (pathname);
962 req->ptr1 = SvPVbyte_nolen (req->sv1);
963 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
964
965 if (flags & EIO_READDIR_DENTS)
966 req->int1 |= EIO_READDIR_CUSTOM2;
967
968 REQ_SEND;
839} 969}
840 970
841void 971void
842aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 972aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
843 ALIAS: 973 ALIAS:
908{ 1038{
909 dREQ; 1039 dREQ;
910 1040
911 req->type = EIO_GROUP; 1041 req->type = EIO_GROUP;
912 1042
913 eio_submit (req); 1043 req_submit (req);
914 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1044 XPUSHs (req_sv (req, AIO_GRP_KLASS));
915} 1045}
916 1046
917void 1047void
918aio_nop (SV *callback=&PL_sv_undef) 1048aio_nop (SV *callback=&PL_sv_undef)
930 1060
931int 1061int
932aioreq_pri (int pri = 0) 1062aioreq_pri (int pri = 0)
933 PROTOTYPE: ;$ 1063 PROTOTYPE: ;$
934 CODE: 1064 CODE:
935 RETVAL = next_pri - EIO_PRI_BIAS; 1065 RETVAL = next_pri;
936 if (items > 0) 1066 if (items > 0)
937 { 1067 {
938 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN; 1068 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
939 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX; 1069 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
940 next_pri = pri + EIO_PRI_BIAS; 1070 next_pri = pri;
941 } 1071 }
942 OUTPUT: 1072 OUTPUT:
943 RETVAL 1073 RETVAL
944 1074
945void 1075void
946aioreq_nice (int nice = 0) 1076aioreq_nice (int nice = 0)
947 CODE: 1077 CODE:
948 nice = next_pri - nice; 1078 nice = next_pri - nice;
949 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN; 1079 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
950 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX; 1080 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
951 next_pri = nice + EIO_PRI_BIAS; 1081 next_pri = nice;
952 1082
953void 1083void
954flush () 1084flush ()
955 PROTOTYPE: 1085 PROTOTYPE:
956 CODE: 1086 CODE:
1017 1147
1018int 1148int
1019nthreads() 1149nthreads()
1020 PROTOTYPE: 1150 PROTOTYPE:
1021 CODE: 1151 CODE:
1022 if (WORDACCESS_UNSAFE) X_LOCK (wrklock); 1152 RETVAL = eio_nthreads ();
1023 RETVAL = started;
1024 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1025 OUTPUT: 1153 OUTPUT:
1026 RETVAL 1154 RETVAL
1027 1155
1028void _on_next_submit (SV *cb) 1156void _on_next_submit (SV *cb)
1029 CODE: 1157 CODE:
1039 CODE: 1167 CODE:
1040 eio_cancel (req); 1168 eio_cancel (req);
1041 1169
1042void 1170void
1043cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1171cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1044 CODE: 1172 PPCODE:
1173{
1174 if (GIMME_V != G_VOID)
1175 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1176
1177 if (items > 1)
1178 {
1179 SV *cb_cv = get_cb (callback);
1180
1045 SvREFCNT_dec (req->callback); 1181 SvREFCNT_dec (req->callback);
1046 req->callback = newSVsv (callback); 1182 req->callback = SvREFCNT_inc (cb_cv);
1183 }
1184}
1047 1185
1048MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1186MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1049 1187
1050void 1188void
1051add (aio_req grp, ...) 1189add (aio_req grp, ...)
1083 AV *av; 1221 AV *av;
1084 1222
1085 grp->errorno = errno; 1223 grp->errorno = errno;
1086 1224
1087 av = newAV (); 1225 av = newAV ();
1226 av_extend (av, items - 1);
1088 1227
1089 for (i = 1; i < items; ++i ) 1228 for (i = 1; i < items; ++i )
1090 av_push (av, newSVsv (ST (i))); 1229 av_push (av, newSVsv (ST (i)));
1091 1230
1092 SvREFCNT_dec (grp->sv1); 1231 SvREFCNT_dec (grp->sv1);
1106void 1245void
1107feed (aio_req grp, SV *callback=&PL_sv_undef) 1246feed (aio_req grp, SV *callback=&PL_sv_undef)
1108 CODE: 1247 CODE:
1109{ 1248{
1110 SvREFCNT_dec (grp->sv2); 1249 SvREFCNT_dec (grp->sv2);
1111 grp->sv2 = newSVsv (callback); 1250 grp->sv2 = newSVsv (callback);
1251 grp->feed = aio_grp_feed;
1112 1252
1113 if (grp->int2 <= 0) 1253 if (grp->int2 <= 0)
1114 grp->int2 = 2; 1254 grp->int2 = 2;
1115 1255
1116 eio_grp_limit (grp, grp->int2); 1256 eio_grp_limit (grp, grp->int2);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines