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.117 by root, Sat May 10 20:02:09 2008 UTC vs.
Revision 1.144 by root, Fri Jun 12 16:48:08 2009 UTC

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

Diff Legend

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