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.115 by root, Sat May 10 18:06:41 2008 UTC vs.
Revision 1.138 by root, Tue Apr 21 20:06:05 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 */
101#include "libeio/eio.c" 123#include "libeio/eio.c"
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 unsigned int max_outstanding = 0x7fffffff; 128static SV *on_next_submit;
107 129static int next_pri = EIO_PRI_DEFAULT;
108static int next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; 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);
113static void req_cancel (aio_req req); 135static void req_cancel (aio_req req);
166 FREETMPS; 188 FREETMPS;
167 LEAVE; 189 LEAVE;
168 } 190 }
169} 191}
170 192
193static void req_submit (eio_req *req)
194{
195 eio_submit (req);
196
197 if (expect_false (on_next_submit))
198 {
199 dSP;
200 SV *cb = sv_2mortal (on_next_submit);
201
202 on_next_submit = 0;
203
204 PUSHMARK (SP);
205 PUTBACK;
206 call_sv (cb, G_DISCARD | G_EVAL);
207 }
208}
209
171static int req_invoke (eio_req *req) 210static int req_invoke (eio_req *req)
172{ 211{
173 dSP; 212 dSP;
174 213
175 if (req->flags & FLAG_SV2_RO_OFF) 214 if (req->flags & FLAG_SV2_RO_OFF)
176 SvREADONLY_off (req->sv2); 215 SvREADONLY_off (req->sv2);
177 216
178 if (!EIO_CANCELLED (req) && SvOK (req->callback)) 217 if (!EIO_CANCELLED (req) && req->callback)
179 { 218 {
180 ENTER; 219 ENTER;
181 SAVETMPS; 220 SAVETMPS;
182 PUSHMARK (SP); 221 PUSHMARK (SP);
183 EXTEND (SP, 1); 222 EXTEND (SP, 1);
260 case EIO_BUSY: 299 case EIO_BUSY:
261 break; 300 break;
262 301
263 case EIO_READLINK: 302 case EIO_READLINK:
264 if (req->result > 0) 303 if (req->result > 0)
265 { 304 PUSHs (sv_2mortal (newSVpvn (req->ptr2, req->result)));
266 SvCUR_set (req->sv2, req->result);
267 *SvEND (req->sv2) = 0;
268 PUSHs (req->sv2);
269 }
270 break; 305 break;
271 306
272 case EIO_STAT: 307 case EIO_STAT:
273 case EIO_LSTAT: 308 case EIO_LSTAT:
274 case EIO_FSTAT: 309 case EIO_FSTAT:
277 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 312 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
278 PUSHs (sv_2mortal (newSViv (req->result))); 313 PUSHs (sv_2mortal (newSViv (req->result)));
279 break; 314 break;
280 315
281 case EIO_READ: 316 case EIO_READ:
317 {
282 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));
283 *SvEND (req->sv2) = 0; 319 *SvEND (req->sv2) = 0;
320 SvPOK_only (req->sv2);
321 SvSETMAGIC (req->sv2);
284 PUSHs (sv_2mortal (newSViv (req->result))); 322 PUSHs (sv_2mortal (newSViv (req->result)));
323 }
285 break; 324 break;
286 325
287 case EIO_DUP2: 326 case EIO_DUP2:
288 if (req->result > 0) 327 if (req->result > 0)
289 req->result = 0; 328 req->result = 0;
394 X_UNLOCK (reslock); 433 X_UNLOCK (reslock);
395 434
396 if (size) 435 if (size)
397 return; 436 return;
398 437
399 maybe_start_thread (); 438 etp_maybe_start_thread ();
400 439
401 FD_ZERO (&rfd); 440 FD_ZERO (&rfd);
402 FD_SET (respipe [0], &rfd); 441 FD_SET (respipe [0], &rfd);
403 442
404 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0); 443 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
405 } 444 }
406} 445}
407 446
408static int poll_cb (void) 447static int poll_cb (void)
409{ 448{
449 for (;;)
450 {
410 int res = eio_poll (); 451 int res = eio_poll ();
411 452
412 if (res > 0) 453 if (res > 0)
413 croak (0); 454 croak (0);
414 455
456 if (!max_outstanding || max_outstanding > eio_nreqs ())
415 return res; 457 return res;
458
459 poll_wait ();
460 }
461}
462
463static void atfork_child (void)
464{
465 create_respipe ();
466}
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;
416} 484}
417 485
418#define dREQ \ 486#define dREQ \
487 SV *cb_cv; \
419 aio_req req; \ 488 aio_req req; \
420 int req_pri = next_pri; \ 489 int req_pri = next_pri; \
421 next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; \ 490 next_pri = EIO_PRI_DEFAULT; \
422 \ 491 \
423 if (SvOK (callback) && !SvROK (callback)) \ 492 cb_cv = get_cb (callback); \
424 croak ("callback must be undef or of reference type"); \
425 \ 493 \
426 Newz (0, req, 1, eio_req); \ 494 Newz (0, req, 1, eio_req); \
427 if (!req) \ 495 if (!req) \
428 croak ("out of memory during eio_req allocation"); \ 496 croak ("out of memory during eio_req allocation"); \
429 \ 497 \
430 req->callback = newSVsv (callback); \ 498 req->callback = SvREFCNT_inc (cb_cv); \
431 req->pri = req_pri 499 req->pri = req_pri
432 500
433#define REQ_SEND \ 501#define REQ_SEND \
502 PUTBACK; \
434 eio_submit (req); \ 503 req_submit (req); \
504 SPAGAIN; \
435 \ 505 \
436 if (GIMME_V != G_VOID) \ 506 if (GIMME_V != G_VOID) \
437 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 507 XPUSHs (req_sv (req, AIO_REQ_KLASS));
438 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
439MODULE = IO::AIO PACKAGE = IO::AIO 520MODULE = IO::AIO PACKAGE = IO::AIO
440 521
441PROTOTYPES: ENABLE 522PROTOTYPES: ENABLE
442 523
443BOOT: 524BOOT:
447 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 528 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
448 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 529 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
449 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 530 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
450 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 531 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
451 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 532 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
452#ifdef _WIN32 533#ifndef _WIN32
453 X_MUTEX_CHECK (wrklock);
454 X_MUTEX_CHECK (reslock);
455 X_MUTEX_CHECK (reqlock);
456 X_MUTEX_CHECK (reqwait);
457 X_MUTEX_CHECK (preadwritelock);
458 X_MUTEX_CHECK (readdirlock);
459
460 X_COND_CHECK (reqwait);
461#else
462 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 534 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
463#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));
464 540
465 create_respipe (); 541 create_respipe ();
466 542
467 if (eio_init (want_poll, done_poll) < 0) 543 if (eio_init (want_poll, done_poll) < 0)
468 croak ("IO::AIO: unable to initialise eio library"); 544 croak ("IO::AIO: unable to initialise eio library");
545
546 /* atfork child called in fifo order, so before eio's handler */
547 X_THREAD_ATFORK (0, 0, atfork_child);
469} 548}
470 549
471void 550void
472max_poll_reqs (int nreqs) 551max_poll_reqs (int nreqs)
473 PROTOTYPE: $ 552 PROTOTYPE: $
526 ALIAS: 605 ALIAS:
527 aio_fsync = EIO_FSYNC 606 aio_fsync = EIO_FSYNC
528 aio_fdatasync = EIO_FDATASYNC 607 aio_fdatasync = EIO_FDATASYNC
529 PPCODE: 608 PPCODE:
530{ 609{
610 int fd = extract_fd (fh, 0);
531 dREQ; 611 dREQ;
532 612
533 req->type = ix; 613 req->type = ix;
534 req->sv1 = newSVsv (fh); 614 req->sv1 = newSVsv (fh);
535 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;
536 634
537 REQ_SEND (req); 635 REQ_SEND (req);
538} 636}
539 637
540void 638void
541aio_close (SV *fh, SV *callback=&PL_sv_undef) 639aio_close (SV *fh, SV *callback=&PL_sv_undef)
542 PROTOTYPE: $;$ 640 PROTOTYPE: $;$
543 PPCODE: 641 PPCODE:
544{ 642{
545 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);
546 dREQ; 645 dREQ;
547 646
548 if (close_pipe < 0) 647 if (close_pipe < 0)
549 { 648 {
550 int pipefd [2]; 649 int pipefd [2];
558 } 657 }
559 658
560 req->type = EIO_DUP2; 659 req->type = EIO_DUP2;
561 req->int1 = close_pipe; 660 req->int1 = close_pipe;
562 req->sv2 = newSVsv (fh); 661 req->sv2 = newSVsv (fh);
563 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 662 req->int2 = fd;
564 663
565 REQ_SEND (req); 664 REQ_SEND (req);
566} 665}
567 666
568void 667void
572 aio_write = EIO_WRITE 671 aio_write = EIO_WRITE
573 PROTOTYPE: $$$$$;$ 672 PROTOTYPE: $$$$$;$
574 PPCODE: 673 PPCODE:
575{ 674{
576 STRLEN svlen; 675 STRLEN svlen;
676 int fd = extract_fd (fh, ix == EIO_WRITE);
577 char *svptr = SvPVbyte (data, svlen); 677 char *svptr = SvPVbyte (data, svlen);
578 UV len = SvUV (length); 678 UV len = SvUV (length);
579
580 SvUPGRADE (data, SVt_PV);
581 SvPOK_on (data);
582 679
583 if (dataoffset < 0) 680 if (dataoffset < 0)
584 dataoffset += svlen; 681 dataoffset += svlen;
585 682
586 if (dataoffset < 0 || dataoffset > svlen) 683 if (dataoffset < 0 || dataoffset > svlen)
592 if (!SvOK (length) || len + dataoffset > svlen) 689 if (!SvOK (length) || len + dataoffset > svlen)
593 len = svlen - dataoffset; 690 len = svlen - dataoffset;
594 } 691 }
595 else 692 else
596 { 693 {
597 /* read: grow scalar as necessary */ 694 /* read: check type and grow scalar as necessary */
695 SvUPGRADE (data, SVt_PV);
598 svptr = SvGROW (data, len + dataoffset + 1); 696 svptr = SvGROW (data, len + dataoffset + 1);
599 } 697 }
600 698
601 if (len < 0) 699 if (len < 0)
602 croak ("length must not be negative"); 700 croak ("length must not be negative");
604 { 702 {
605 dREQ; 703 dREQ;
606 704
607 req->type = ix; 705 req->type = ix;
608 req->sv1 = newSVsv (fh); 706 req->sv1 = newSVsv (fh);
609 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 707 req->int1 = fd;
610 : IoOFP (sv_2io (fh)));
611 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 708 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
612 req->size = len; 709 req->size = len;
613 req->sv2 = SvREFCNT_inc (data); 710 req->sv2 = SvREFCNT_inc (data);
614 req->ptr2 = (char *)svptr + dataoffset; 711 req->ptr2 = (char *)svptr + dataoffset;
615 req->stroffset = dataoffset; 712 req->stroffset = dataoffset;
630 PPCODE: 727 PPCODE:
631{ 728{
632 SV *data; 729 SV *data;
633 dREQ; 730 dREQ;
634 731
635 data = newSV (NAME_MAX);
636 SvPOK_on (data);
637
638 req->type = EIO_READLINK; 732 req->type = EIO_READLINK;
639 req->sv1 = newSVsv (path); 733 req->sv1 = newSVsv (path);
640 req->ptr1 = SvPVbyte_nolen (req->sv1); 734 req->ptr1 = SvPVbyte_nolen (req->sv1);
641 req->sv2 = data;
642 req->ptr2 = SvPVbyte_nolen (data);
643 735
644 REQ_SEND; 736 REQ_SEND;
645} 737}
646 738
647void 739void
648aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef) 740aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef)
649 PROTOTYPE: $$$$;$ 741 PROTOTYPE: $$$$;$
650 PPCODE: 742 PPCODE:
651{ 743{
744 int ifd = extract_fd (in_fh , 0);
745 int ofd = extract_fd (out_fh, 0);
652 dREQ; 746 dREQ;
653 747
654 req->type = EIO_SENDFILE; 748 req->type = EIO_SENDFILE;
655 req->sv1 = newSVsv (out_fh); 749 req->sv1 = newSVsv (out_fh);
656 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 750 req->int1 = ofd;
657 req->sv2 = newSVsv (in_fh); 751 req->sv2 = newSVsv (in_fh);
658 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 752 req->int2 = ifd;
659 req->offs = SvVAL64 (in_offset); 753 req->offs = SvVAL64 (in_offset);
660 req->size = length; 754 req->size = length;
661 755
662 REQ_SEND; 756 REQ_SEND;
663} 757}
665void 759void
666aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef) 760aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef)
667 PROTOTYPE: $$$;$ 761 PROTOTYPE: $$$;$
668 PPCODE: 762 PPCODE:
669{ 763{
764 int fd = extract_fd (fh, 0);
670 dREQ; 765 dREQ;
671 766
672 req->type = EIO_READAHEAD; 767 req->type = EIO_READAHEAD;
673 req->sv1 = newSVsv (fh); 768 req->sv1 = newSVsv (fh);
674 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 769 req->int1 = fd;
675 req->offs = SvVAL64 (offset); 770 req->offs = SvVAL64 (offset);
676 req->size = length; 771 req->size = length;
677 772
678 REQ_SEND; 773 REQ_SEND;
679} 774}
685 aio_lstat = EIO_LSTAT 780 aio_lstat = EIO_LSTAT
686 PPCODE: 781 PPCODE:
687{ 782{
688 dREQ; 783 dREQ;
689 784
690 req->ptr2 = malloc (sizeof (EIO_STRUCT_STAT));
691 if (!req->ptr2)
692 {
693 req_destroy (req);
694 croak ("out of memory during aio_stat statdata allocation");
695 }
696
697 req->flags |= EIO_FLAG_PTR2_FREE;
698 req->sv1 = newSVsv (fh_or_path); 785 req->sv1 = newSVsv (fh_or_path);
699 786
700 if (SvPOK (fh_or_path)) 787 if (SvPOK (req->sv1))
701 { 788 {
702 req->type = ix; 789 req->type = ix;
703 req->ptr1 = SvPVbyte_nolen (req->sv1); 790 req->ptr1 = SvPVbyte_nolen (req->sv1);
704 } 791 }
705 else 792 else
719 806
720 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 807 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
721 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; 808 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
722 req->sv1 = newSVsv (fh_or_path); 809 req->sv1 = newSVsv (fh_or_path);
723 810
724 if (SvPOK (fh_or_path)) 811 if (SvPOK (req->sv1))
725 { 812 {
726 req->type = EIO_UTIME; 813 req->type = EIO_UTIME;
727 req->ptr1 = SvPVbyte_nolen (req->sv1); 814 req->ptr1 = SvPVbyte_nolen (req->sv1);
728 } 815 }
729 else 816 else
742 dREQ; 829 dREQ;
743 830
744 req->sv1 = newSVsv (fh_or_path); 831 req->sv1 = newSVsv (fh_or_path);
745 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 832 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
746 833
747 if (SvPOK (fh_or_path)) 834 if (SvPOK (req->sv1))
748 { 835 {
749 req->type = EIO_TRUNCATE; 836 req->type = EIO_TRUNCATE;
750 req->ptr1 = SvPVbyte_nolen (req->sv1); 837 req->ptr1 = SvPVbyte_nolen (req->sv1);
751 } 838 }
752 else 839 else
760 847
761void 848void
762aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef) 849aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
763 ALIAS: 850 ALIAS:
764 aio_chmod = EIO_CHMOD 851 aio_chmod = EIO_CHMOD
765 aio_fchmod = EIO_FCHMOD
766 aio_mkdir = EIO_MKDIR 852 aio_mkdir = EIO_MKDIR
767 PPCODE: 853 PPCODE:
768{ 854{
769 dREQ; 855 dREQ;
770 856
771 req->type = ix;
772 req->int2 = mode; 857 req->int2 = mode;
773 req->sv1 = newSVsv (fh_or_path); 858 req->sv1 = newSVsv (fh_or_path);
774 859
775 if (ix == EIO_FCHMOD) 860 if (SvPOK (req->sv1))
776 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 861 {
862 req->type = ix;
863 req->ptr1 = SvPVbyte_nolen (req->sv1);
864 }
777 else 865 else
778 req->ptr1 = SvPVbyte_nolen (req->sv1); 866 {
867 req->type = EIO_FCHMOD;
868 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
869 }
779 870
780 REQ_SEND; 871 REQ_SEND;
781} 872}
782 873
783void 874void
788 879
789 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 880 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
790 req->int3 = SvOK (gid) ? SvIV (gid) : -1; 881 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
791 req->sv1 = newSVsv (fh_or_path); 882 req->sv1 = newSVsv (fh_or_path);
792 883
793 if (SvPOK (fh_or_path)) 884 if (SvPOK (req->sv1))
794 { 885 {
795 req->type = EIO_CHOWN; 886 req->type = EIO_CHOWN;
796 req->ptr1 = SvPVbyte_nolen (req->sv1); 887 req->ptr1 = SvPVbyte_nolen (req->sv1);
797 } 888 }
798 else 889 else
874{ 965{
875 dREQ; 966 dREQ;
876 967
877 req->type = EIO_GROUP; 968 req->type = EIO_GROUP;
878 969
879 eio_submit (req); 970 req_submit (req);
880 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 971 XPUSHs (req_sv (req, AIO_GRP_KLASS));
881} 972}
882 973
883void 974void
884aio_nop (SV *callback=&PL_sv_undef) 975aio_nop (SV *callback=&PL_sv_undef)
896 987
897int 988int
898aioreq_pri (int pri = 0) 989aioreq_pri (int pri = 0)
899 PROTOTYPE: ;$ 990 PROTOTYPE: ;$
900 CODE: 991 CODE:
901 RETVAL = next_pri - EIO_PRI_BIAS; 992 RETVAL = next_pri;
902 if (items > 0) 993 if (items > 0)
903 { 994 {
904 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN; 995 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
905 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX; 996 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
906 next_pri = pri + EIO_PRI_BIAS; 997 next_pri = pri;
907 } 998 }
908 OUTPUT: 999 OUTPUT:
909 RETVAL 1000 RETVAL
910 1001
911void 1002void
912aioreq_nice (int nice = 0) 1003aioreq_nice (int nice = 0)
913 CODE: 1004 CODE:
914 nice = next_pri - nice; 1005 nice = next_pri - nice;
915 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN; 1006 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
916 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX; 1007 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
917 next_pri = nice + EIO_PRI_BIAS; 1008 next_pri = nice;
918 1009
919void 1010void
920flush () 1011flush ()
921 PROTOTYPE: 1012 PROTOTYPE:
922 CODE: 1013 CODE:
923 while (nreqs) 1014 while (eio_nreqs ())
924 { 1015 {
925 poll_wait (); 1016 poll_wait ();
926 poll_cb (); 1017 poll_cb ();
927 } 1018 }
928 1019
983 1074
984int 1075int
985nthreads() 1076nthreads()
986 PROTOTYPE: 1077 PROTOTYPE:
987 CODE: 1078 CODE:
988 if (WORDACCESS_UNSAFE) X_LOCK (wrklock); 1079 RETVAL = eio_nthreads ();
989 RETVAL = started;
990 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
991 OUTPUT: 1080 OUTPUT:
992 RETVAL 1081 RETVAL
993 1082
1083void _on_next_submit (SV *cb)
1084 CODE:
1085 SvREFCNT_dec (on_next_submit);
1086 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1087
994PROTOTYPES: DISABLE 1088PROTOTYPES: DISABLE
995 1089
996MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1090MODULE = IO::AIO PACKAGE = IO::AIO::REQ
997 1091
998void 1092void
1000 CODE: 1094 CODE:
1001 eio_cancel (req); 1095 eio_cancel (req);
1002 1096
1003void 1097void
1004cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1098cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1005 CODE: 1099 PPCODE:
1100{
1101 if (GIMME_V != G_VOID)
1102 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1103
1104 if (items > 1)
1105 {
1106 SV *cb_cv = get_cb (callback);
1107
1006 SvREFCNT_dec (req->callback); 1108 SvREFCNT_dec (req->callback);
1007 req->callback = newSVsv (callback); 1109 req->callback = SvREFCNT_inc (cb_cv);
1110 }
1111}
1008 1112
1009MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1113MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1010 1114
1011void 1115void
1012add (aio_req grp, ...) 1116add (aio_req grp, ...)
1067void 1171void
1068feed (aio_req grp, SV *callback=&PL_sv_undef) 1172feed (aio_req grp, SV *callback=&PL_sv_undef)
1069 CODE: 1173 CODE:
1070{ 1174{
1071 SvREFCNT_dec (grp->sv2); 1175 SvREFCNT_dec (grp->sv2);
1072 grp->sv2 = newSVsv (callback); 1176 grp->sv2 = newSVsv (callback);
1177 grp->feed = aio_grp_feed;
1073 1178
1074 if (grp->int2 <= 0) 1179 if (grp->int2 <= 0)
1075 grp->int2 = 2; 1180 grp->int2 = 2;
1076 1181
1077 eio_grp_limit (grp, grp->int2); 1182 eio_grp_limit (grp, grp->int2);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines