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

Diff Legend

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