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.140 by root, Wed Jun 3 12:24:49 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);
… …
280 case EIO_BUSY: 299 case EIO_BUSY:
281 break; 300 break;
282 301
283 case EIO_READLINK: 302 case EIO_READLINK:
284 if (req->result > 0) 303 if (req->result > 0)
285 { 304 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; 305 break;
291 306
292 case EIO_STAT: 307 case EIO_STAT:
293 case EIO_LSTAT: 308 case EIO_LSTAT:
294 case EIO_FSTAT: 309 case EIO_FSTAT:
… …
297 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 312 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
298 PUSHs (sv_2mortal (newSViv (req->result))); 313 PUSHs (sv_2mortal (newSViv (req->result)));
299 break; 314 break;
300 315
301 case EIO_READ: 316 case EIO_READ:
317 {
302 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0)); 318 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
303 *SvEND (req->sv2) = 0; 319 *SvEND (req->sv2) = 0;
320 SvPOK_only (req->sv2);
321 SvSETMAGIC (req->sv2);
304 PUSHs (sv_2mortal (newSViv (req->result))); 322 PUSHs (sv_2mortal (newSViv (req->result)));
323 }
305 break; 324 break;
306 325
307 case EIO_DUP2: 326 case EIO_DUP2:
308 if (req->result > 0) 327 if (req->result > 0)
309 req->result = 0; 328 req->result = 0;
… …
414 X_UNLOCK (reslock); 433 X_UNLOCK (reslock);
415 434
416 if (size) 435 if (size)
417 return; 436 return;
418 437
419 maybe_start_thread (); 438 etp_maybe_start_thread ();
420 439
421 FD_ZERO (&rfd); 440 FD_ZERO (&rfd);
422 FD_SET (respipe [0], &rfd); 441 FD_SET (respipe [0], &rfd);
423 442
424 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0); 443 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
425 } 444 }
426} 445}
427 446
428static int poll_cb (void) 447static int poll_cb (void)
429{ 448{
430 int res; 449 for (;;)
431
432 do
433 { 450 {
434 res = eio_poll (); 451 int res = eio_poll ();
435 452
436 if (res > 0) 453 if (res > 0)
437 croak (0); 454 croak (0);
455
456 if (!max_outstanding || max_outstanding > eio_nreqs ())
457 return res;
458
459 poll_wait ();
438 } 460 }
439 while (max_outstanding && max_outstanding <= eio_nreqs ());
440
441 return res;
442} 461}
443 462
444static void atfork_child (void) 463static void atfork_child (void)
445{ 464{
446 create_respipe (); 465 create_respipe ();
447} 466}
448 467
468static SV *
469get_cb (SV *cb_sv)
470{
471 HV *st;
472 GV *gvp;
473 CV *cv;
474
475 if (!SvOK (cb_sv))
476 return 0;
477
478 cv = sv_2cv (cb_sv, &st, &gvp, 0);
479
480 if (!cv)
481 croak ("IO::AIO callback must be undef or a CODE reference");
482
483 return (SV *)cv;
484}
485
449#define dREQ \ 486#define dREQ \
487 SV *cb_cv; \
450 aio_req req; \ 488 aio_req req; \
451 int req_pri = next_pri; \ 489 int req_pri = next_pri; \
452 next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; \ 490 next_pri = EIO_PRI_DEFAULT; \
453 \ 491 \
454 if (SvOK (callback) && !SvROK (callback)) \ 492 cb_cv = get_cb (callback); \
455 croak ("callback must be undef or of reference type"); \
456 \ 493 \
457 Newz (0, req, 1, eio_req); \ 494 Newz (0, req, 1, eio_req); \
458 if (!req) \ 495 if (!req) \
459 croak ("out of memory during eio_req allocation"); \ 496 croak ("out of memory during eio_req allocation"); \
460 \ 497 \
461 req->callback = newSVsv (callback); \ 498 req->callback = SvREFCNT_inc (cb_cv); \
462 req->pri = req_pri 499 req->pri = req_pri
463 500
464#define REQ_SEND \ 501#define REQ_SEND \
502 PUTBACK; \
465 req_submit (req); \ 503 req_submit (req); \
504 SPAGAIN; \
466 \ 505 \
467 if (GIMME_V != G_VOID) \ 506 if (GIMME_V != G_VOID) \
468 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 507 XPUSHs (req_sv (req, AIO_REQ_KLASS));
469 508
509static int
510extract_fd (SV *fh, int wr)
511{
512 int fd = PerlIO_fileno (wr ? IoOFP (sv_2io (fh)) : IoIFP (sv_2io (fh)));
513
514 if (fd < 0)
515 croak ("illegal fh argument, either not an OS file or read/write mode mismatch");
516
517 return fd;
518}
519
470MODULE = IO::AIO PACKAGE = IO::AIO 520MODULE = IO::AIO PACKAGE = IO::AIO
471 521
472PROTOTYPES: ENABLE 522PROTOTYPES: ENABLE
473 523
474BOOT: 524BOOT:
475{ 525{
476 stash = gv_stashpv ("IO::AIO", 1); 526 stash = gv_stashpv ("IO::AIO", 1);
477 527
478 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 528 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
529 newCONSTSUB (stash, "ENOSYS", newSViv (ENOSYS));
479 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 530 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
480 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 531 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
481 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 532 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
482 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 533 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
483#ifdef _WIN32 534#ifndef _WIN32
484 X_MUTEX_CHECK (wrklock);
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)); 535 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
494#endif 536#endif
537 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
538 newCONSTSUB (stash, "SYNC_FILE_RANGE_WAIT_BEFORE", newSViv (EIO_SYNC_FILE_RANGE_WAIT_BEFORE));
539 newCONSTSUB (stash, "SYNC_FILE_RANGE_WRITE" , newSViv (EIO_SYNC_FILE_RANGE_WRITE));
540 newCONSTSUB (stash, "SYNC_FILE_RANGE_WAIT_AFTER" , newSViv (EIO_SYNC_FILE_RANGE_WAIT_AFTER));
495 541
496 create_respipe (); 542 create_respipe ();
497 543
498 if (eio_init (want_poll, done_poll) < 0) 544 if (eio_init (want_poll, done_poll) < 0)
499 croak ("IO::AIO: unable to initialise eio library"); 545 croak ("IO::AIO: unable to initialise eio library");
… …
560 ALIAS: 606 ALIAS:
561 aio_fsync = EIO_FSYNC 607 aio_fsync = EIO_FSYNC
562 aio_fdatasync = EIO_FDATASYNC 608 aio_fdatasync = EIO_FDATASYNC
563 PPCODE: 609 PPCODE:
564{ 610{
611 int fd = extract_fd (fh, 0);
565 dREQ; 612 dREQ;
566 613
567 req->type = ix; 614 req->type = ix;
568 req->sv1 = newSVsv (fh); 615 req->sv1 = newSVsv (fh);
569 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 616 req->int1 = fd;
617
618 REQ_SEND (req);
619}
620
621void
622aio_sync_file_range (SV *fh, SV *offset, SV *nbytes, IV flags, SV *callback=&PL_sv_undef)
623 PROTOTYPE: $$$$;$
624 PPCODE:
625{
626 int fd = extract_fd (fh, 0);
627 dREQ;
628
629 req->type = EIO_SYNC_FILE_RANGE;
630 req->sv1 = newSVsv (fh);
631 req->int1 = fd;
632 req->offs = SvVAL64 (offset);
633 req->size = SvVAL64 (nbytes);
634 req->int2 = flags;
570 635
571 REQ_SEND (req); 636 REQ_SEND (req);
572} 637}
573 638
574void 639void
575aio_close (SV *fh, SV *callback=&PL_sv_undef) 640aio_close (SV *fh, SV *callback=&PL_sv_undef)
576 PROTOTYPE: $;$ 641 PROTOTYPE: $;$
577 PPCODE: 642 PPCODE:
578{ 643{
579 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 644 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
645 int fd = extract_fd (fh, 0);
580 dREQ; 646 dREQ;
581 647
582 if (close_pipe < 0) 648 if (close_pipe < 0)
583 { 649 {
584 int pipefd [2]; 650 int pipefd [2];
… …
592 } 658 }
593 659
594 req->type = EIO_DUP2; 660 req->type = EIO_DUP2;
595 req->int1 = close_pipe; 661 req->int1 = close_pipe;
596 req->sv2 = newSVsv (fh); 662 req->sv2 = newSVsv (fh);
597 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 663 req->int2 = fd;
598 664
599 REQ_SEND (req); 665 REQ_SEND (req);
600} 666}
601 667
602void 668void
… …
606 aio_write = EIO_WRITE 672 aio_write = EIO_WRITE
607 PROTOTYPE: $$$$$;$ 673 PROTOTYPE: $$$$$;$
608 PPCODE: 674 PPCODE:
609{ 675{
610 STRLEN svlen; 676 STRLEN svlen;
677 int fd = extract_fd (fh, ix == EIO_WRITE);
611 char *svptr = SvPVbyte (data, svlen); 678 char *svptr = SvPVbyte (data, svlen);
612 UV len = SvUV (length); 679 UV len = SvUV (length);
613
614 SvUPGRADE (data, SVt_PV);
615 SvPOK_on (data);
616 680
617 if (dataoffset < 0) 681 if (dataoffset < 0)
618 dataoffset += svlen; 682 dataoffset += svlen;
619 683
620 if (dataoffset < 0 || dataoffset > svlen) 684 if (dataoffset < 0 || dataoffset > svlen)
… …
626 if (!SvOK (length) || len + dataoffset > svlen) 690 if (!SvOK (length) || len + dataoffset > svlen)
627 len = svlen - dataoffset; 691 len = svlen - dataoffset;
628 } 692 }
629 else 693 else
630 { 694 {
631 /* read: grow scalar as necessary */ 695 /* read: check type and grow scalar as necessary */
696 SvUPGRADE (data, SVt_PV);
632 svptr = SvGROW (data, len + dataoffset + 1); 697 svptr = SvGROW (data, len + dataoffset + 1);
633 } 698 }
634
635 if (len < 0)
636 croak ("length must not be negative");
637 699
638 { 700 {
639 dREQ; 701 dREQ;
640 702
641 req->type = ix; 703 req->type = ix;
642 req->sv1 = newSVsv (fh); 704 req->sv1 = newSVsv (fh);
643 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 705 req->int1 = fd;
644 : IoOFP (sv_2io (fh)));
645 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 706 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
646 req->size = len; 707 req->size = len;
647 req->sv2 = SvREFCNT_inc (data); 708 req->sv2 = SvREFCNT_inc (data);
648 req->ptr2 = (char *)svptr + dataoffset; 709 req->ptr2 = (char *)svptr + dataoffset;
649 req->stroffset = dataoffset; 710 req->stroffset = dataoffset;
… …
664 PPCODE: 725 PPCODE:
665{ 726{
666 SV *data; 727 SV *data;
667 dREQ; 728 dREQ;
668 729
669 data = newSV (NAME_MAX);
670 SvPOK_on (data);
671
672 req->type = EIO_READLINK; 730 req->type = EIO_READLINK;
673 req->sv1 = newSVsv (path); 731 req->sv1 = newSVsv (path);
674 req->ptr1 = SvPVbyte_nolen (req->sv1); 732 req->ptr1 = SvPVbyte_nolen (req->sv1);
675 req->sv2 = data;
676 req->ptr2 = SvPVbyte_nolen (data);
677 733
678 REQ_SEND; 734 REQ_SEND;
679} 735}
680 736
681void 737void
682aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef) 738aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef)
683 PROTOTYPE: $$$$;$ 739 PROTOTYPE: $$$$;$
684 PPCODE: 740 PPCODE:
685{ 741{
742 int ifd = extract_fd (in_fh , 0);
743 int ofd = extract_fd (out_fh, 0);
686 dREQ; 744 dREQ;
687 745
688 req->type = EIO_SENDFILE; 746 req->type = EIO_SENDFILE;
689 req->sv1 = newSVsv (out_fh); 747 req->sv1 = newSVsv (out_fh);
690 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 748 req->int1 = ofd;
691 req->sv2 = newSVsv (in_fh); 749 req->sv2 = newSVsv (in_fh);
692 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 750 req->int2 = ifd;
693 req->offs = SvVAL64 (in_offset); 751 req->offs = SvVAL64 (in_offset);
694 req->size = length; 752 req->size = length;
695 753
696 REQ_SEND; 754 REQ_SEND;
697} 755}
… …
699void 757void
700aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef) 758aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef)
701 PROTOTYPE: $$$;$ 759 PROTOTYPE: $$$;$
702 PPCODE: 760 PPCODE:
703{ 761{
762 int fd = extract_fd (fh, 0);
704 dREQ; 763 dREQ;
705 764
706 req->type = EIO_READAHEAD; 765 req->type = EIO_READAHEAD;
707 req->sv1 = newSVsv (fh); 766 req->sv1 = newSVsv (fh);
708 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 767 req->int1 = fd;
709 req->offs = SvVAL64 (offset); 768 req->offs = SvVAL64 (offset);
710 req->size = length; 769 req->size = length;
711 770
712 REQ_SEND; 771 REQ_SEND;
713} 772}
… …
719 aio_lstat = EIO_LSTAT 778 aio_lstat = EIO_LSTAT
720 PPCODE: 779 PPCODE:
721{ 780{
722 dREQ; 781 dREQ;
723 782
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); 783 req->sv1 = newSVsv (fh_or_path);
733 784
734 if (SvPOK (fh_or_path)) 785 if (SvPOK (req->sv1))
735 { 786 {
736 req->type = ix; 787 req->type = ix;
737 req->ptr1 = SvPVbyte_nolen (req->sv1); 788 req->ptr1 = SvPVbyte_nolen (req->sv1);
738 } 789 }
739 else 790 else
… …
753 804
754 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 805 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
755 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; 806 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
756 req->sv1 = newSVsv (fh_or_path); 807 req->sv1 = newSVsv (fh_or_path);
757 808
758 if (SvPOK (fh_or_path)) 809 if (SvPOK (req->sv1))
759 { 810 {
760 req->type = EIO_UTIME; 811 req->type = EIO_UTIME;
761 req->ptr1 = SvPVbyte_nolen (req->sv1); 812 req->ptr1 = SvPVbyte_nolen (req->sv1);
762 } 813 }
763 else 814 else
… …
776 dREQ; 827 dREQ;
777 828
778 req->sv1 = newSVsv (fh_or_path); 829 req->sv1 = newSVsv (fh_or_path);
779 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 830 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
780 831
781 if (SvPOK (fh_or_path)) 832 if (SvPOK (req->sv1))
782 { 833 {
783 req->type = EIO_TRUNCATE; 834 req->type = EIO_TRUNCATE;
784 req->ptr1 = SvPVbyte_nolen (req->sv1); 835 req->ptr1 = SvPVbyte_nolen (req->sv1);
785 } 836 }
786 else 837 else
… …
794 845
795void 846void
796aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef) 847aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
797 ALIAS: 848 ALIAS:
798 aio_chmod = EIO_CHMOD 849 aio_chmod = EIO_CHMOD
799 aio_fchmod = EIO_FCHMOD
800 aio_mkdir = EIO_MKDIR 850 aio_mkdir = EIO_MKDIR
801 PPCODE: 851 PPCODE:
802{ 852{
803 dREQ; 853 dREQ;
804 854
805 req->type = ix;
806 req->int2 = mode; 855 req->int2 = mode;
807 req->sv1 = newSVsv (fh_or_path); 856 req->sv1 = newSVsv (fh_or_path);
808 857
809 if (ix == EIO_FCHMOD) 858 if (SvPOK (req->sv1))
810 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 859 {
860 req->type = ix;
861 req->ptr1 = SvPVbyte_nolen (req->sv1);
862 }
811 else 863 else
812 req->ptr1 = SvPVbyte_nolen (req->sv1); 864 {
865 req->type = EIO_FCHMOD;
866 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
867 }
813 868
814 REQ_SEND; 869 REQ_SEND;
815} 870}
816 871
817void 872void
… …
822 877
823 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 878 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
824 req->int3 = SvOK (gid) ? SvIV (gid) : -1; 879 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
825 req->sv1 = newSVsv (fh_or_path); 880 req->sv1 = newSVsv (fh_or_path);
826 881
827 if (SvPOK (fh_or_path)) 882 if (SvPOK (req->sv1))
828 { 883 {
829 req->type = EIO_CHOWN; 884 req->type = EIO_CHOWN;
830 req->ptr1 = SvPVbyte_nolen (req->sv1); 885 req->ptr1 = SvPVbyte_nolen (req->sv1);
831 } 886 }
832 else 887 else
… …
908{ 963{
909 dREQ; 964 dREQ;
910 965
911 req->type = EIO_GROUP; 966 req->type = EIO_GROUP;
912 967
913 eio_submit (req); 968 req_submit (req);
914 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 969 XPUSHs (req_sv (req, AIO_GRP_KLASS));
915} 970}
916 971
917void 972void
918aio_nop (SV *callback=&PL_sv_undef) 973aio_nop (SV *callback=&PL_sv_undef)
… …
930 985
931int 986int
932aioreq_pri (int pri = 0) 987aioreq_pri (int pri = 0)
933 PROTOTYPE: ;$ 988 PROTOTYPE: ;$
934 CODE: 989 CODE:
935 RETVAL = next_pri - EIO_PRI_BIAS; 990 RETVAL = next_pri;
936 if (items > 0) 991 if (items > 0)
937 { 992 {
938 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN; 993 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
939 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX; 994 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
940 next_pri = pri + EIO_PRI_BIAS; 995 next_pri = pri;
941 } 996 }
942 OUTPUT: 997 OUTPUT:
943 RETVAL 998 RETVAL
944 999
945void 1000void
946aioreq_nice (int nice = 0) 1001aioreq_nice (int nice = 0)
947 CODE: 1002 CODE:
948 nice = next_pri - nice; 1003 nice = next_pri - nice;
949 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN; 1004 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
950 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX; 1005 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
951 next_pri = nice + EIO_PRI_BIAS; 1006 next_pri = nice;
952 1007
953void 1008void
954flush () 1009flush ()
955 PROTOTYPE: 1010 PROTOTYPE:
956 CODE: 1011 CODE:
… …
1017 1072
1018int 1073int
1019nthreads() 1074nthreads()
1020 PROTOTYPE: 1075 PROTOTYPE:
1021 CODE: 1076 CODE:
1022 if (WORDACCESS_UNSAFE) X_LOCK (wrklock); 1077 RETVAL = eio_nthreads ();
1023 RETVAL = started;
1024 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1025 OUTPUT: 1078 OUTPUT:
1026 RETVAL 1079 RETVAL
1027 1080
1028void _on_next_submit (SV *cb) 1081void _on_next_submit (SV *cb)
1029 CODE: 1082 CODE:
… …
1039 CODE: 1092 CODE:
1040 eio_cancel (req); 1093 eio_cancel (req);
1041 1094
1042void 1095void
1043cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1096cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1044 CODE: 1097 PPCODE:
1098{
1099 if (GIMME_V != G_VOID)
1100 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1101
1102 if (items > 1)
1103 {
1104 SV *cb_cv = get_cb (callback);
1105
1045 SvREFCNT_dec (req->callback); 1106 SvREFCNT_dec (req->callback);
1046 req->callback = newSVsv (callback); 1107 req->callback = SvREFCNT_inc (cb_cv);
1108 }
1109}
1047 1110
1048MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1111MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1049 1112
1050void 1113void
1051add (aio_req grp, ...) 1114add (aio_req grp, ...)
… …
1106void 1169void
1107feed (aio_req grp, SV *callback=&PL_sv_undef) 1170feed (aio_req grp, SV *callback=&PL_sv_undef)
1108 CODE: 1171 CODE:
1109{ 1172{
1110 SvREFCNT_dec (grp->sv2); 1173 SvREFCNT_dec (grp->sv2);
1111 grp->sv2 = newSVsv (callback); 1174 grp->sv2 = newSVsv (callback);
1175 grp->feed = aio_grp_feed;
1112 1176
1113 if (grp->int2 <= 0) 1177 if (grp->int2 <= 0)
1114 grp->int2 = 2; 1178 grp->int2 = 2;
1115 1179
1116 eio_grp_limit (grp, grp->int2); 1180 eio_grp_limit (grp, grp->int2);

Diff Legend

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