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.120 by root, Sun May 11 19:17:09 2008 UTC vs.
Revision 1.138 by root, Tue Apr 21 20:06:05 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);
… …
293 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 312 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
294 PUSHs (sv_2mortal (newSViv (req->result))); 313 PUSHs (sv_2mortal (newSViv (req->result)));
295 break; 314 break;
296 315
297 case EIO_READ: 316 case EIO_READ:
317 {
298 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));
299 *SvEND (req->sv2) = 0; 319 *SvEND (req->sv2) = 0;
320 SvPOK_only (req->sv2);
321 SvSETMAGIC (req->sv2);
300 PUSHs (sv_2mortal (newSViv (req->result))); 322 PUSHs (sv_2mortal (newSViv (req->result)));
323 }
301 break; 324 break;
302 325
303 case EIO_DUP2: 326 case EIO_DUP2:
304 if (req->result > 0) 327 if (req->result > 0)
305 req->result = 0; 328 req->result = 0;
… …
410 X_UNLOCK (reslock); 433 X_UNLOCK (reslock);
411 434
412 if (size) 435 if (size)
413 return; 436 return;
414 437
415 maybe_start_thread (); 438 etp_maybe_start_thread ();
416 439
417 FD_ZERO (&rfd); 440 FD_ZERO (&rfd);
418 FD_SET (respipe [0], &rfd); 441 FD_SET (respipe [0], &rfd);
419 442
420 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0); 443 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
421 } 444 }
422} 445}
423 446
424static int poll_cb (void) 447static int poll_cb (void)
425{ 448{
426 int res; 449 for (;;)
427
428 do
429 { 450 {
430 res = eio_poll (); 451 int res = eio_poll ();
431 452
432 if (res > 0) 453 if (res > 0)
433 croak (0); 454 croak (0);
455
456 if (!max_outstanding || max_outstanding > eio_nreqs ())
457 return res;
458
459 poll_wait ();
434 } 460 }
435 while (max_outstanding && max_outstanding <= eio_nreqs ());
436
437 return res;
438} 461}
439 462
440static void atfork_child (void) 463static void atfork_child (void)
441{ 464{
442 create_respipe (); 465 create_respipe ();
443} 466}
444 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
445#define dREQ \ 486#define dREQ \
487 SV *cb_cv; \
446 aio_req req; \ 488 aio_req req; \
447 int req_pri = next_pri; \ 489 int req_pri = next_pri; \
448 next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; \ 490 next_pri = EIO_PRI_DEFAULT; \
449 \ 491 \
450 if (SvOK (callback) && !SvROK (callback)) \ 492 cb_cv = get_cb (callback); \
451 croak ("callback must be undef or of reference type"); \
452 \ 493 \
453 Newz (0, req, 1, eio_req); \ 494 Newz (0, req, 1, eio_req); \
454 if (!req) \ 495 if (!req) \
455 croak ("out of memory during eio_req allocation"); \ 496 croak ("out of memory during eio_req allocation"); \
456 \ 497 \
457 req->callback = newSVsv (callback); \ 498 req->callback = SvREFCNT_inc (cb_cv); \
458 req->pri = req_pri 499 req->pri = req_pri
459 500
460#define REQ_SEND \ 501#define REQ_SEND \
502 PUTBACK; \
461 req_submit (req); \ 503 req_submit (req); \
504 SPAGAIN; \
462 \ 505 \
463 if (GIMME_V != G_VOID) \ 506 if (GIMME_V != G_VOID) \
464 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 507 XPUSHs (req_sv (req, AIO_REQ_KLASS));
465 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
466MODULE = IO::AIO PACKAGE = IO::AIO 520MODULE = IO::AIO PACKAGE = IO::AIO
467 521
468PROTOTYPES: ENABLE 522PROTOTYPES: ENABLE
469 523
470BOOT: 524BOOT:
… …
474 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 528 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
475 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 529 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
476 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 530 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
477 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 531 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
478 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 532 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
479#ifdef _WIN32 533#ifndef _WIN32
480 X_MUTEX_CHECK (wrklock);
481 X_MUTEX_CHECK (reslock);
482 X_MUTEX_CHECK (reqlock);
483 X_MUTEX_CHECK (reqwait);
484 X_MUTEX_CHECK (preadwritelock);
485 X_MUTEX_CHECK (readdirlock);
486
487 X_COND_CHECK (reqwait);
488#else
489 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 534 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
490#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));
491 540
492 create_respipe (); 541 create_respipe ();
493 542
494 if (eio_init (want_poll, done_poll) < 0) 543 if (eio_init (want_poll, done_poll) < 0)
495 croak ("IO::AIO: unable to initialise eio library"); 544 croak ("IO::AIO: unable to initialise eio library");
… …
556 ALIAS: 605 ALIAS:
557 aio_fsync = EIO_FSYNC 606 aio_fsync = EIO_FSYNC
558 aio_fdatasync = EIO_FDATASYNC 607 aio_fdatasync = EIO_FDATASYNC
559 PPCODE: 608 PPCODE:
560{ 609{
610 int fd = extract_fd (fh, 0);
561 dREQ; 611 dREQ;
562 612
563 req->type = ix; 613 req->type = ix;
564 req->sv1 = newSVsv (fh); 614 req->sv1 = newSVsv (fh);
565 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;
566 634
567 REQ_SEND (req); 635 REQ_SEND (req);
568} 636}
569 637
570void 638void
571aio_close (SV *fh, SV *callback=&PL_sv_undef) 639aio_close (SV *fh, SV *callback=&PL_sv_undef)
572 PROTOTYPE: $;$ 640 PROTOTYPE: $;$
573 PPCODE: 641 PPCODE:
574{ 642{
575 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);
576 dREQ; 645 dREQ;
577 646
578 if (close_pipe < 0) 647 if (close_pipe < 0)
579 { 648 {
580 int pipefd [2]; 649 int pipefd [2];
… …
588 } 657 }
589 658
590 req->type = EIO_DUP2; 659 req->type = EIO_DUP2;
591 req->int1 = close_pipe; 660 req->int1 = close_pipe;
592 req->sv2 = newSVsv (fh); 661 req->sv2 = newSVsv (fh);
593 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 662 req->int2 = fd;
594 663
595 REQ_SEND (req); 664 REQ_SEND (req);
596} 665}
597 666
598void 667void
… …
602 aio_write = EIO_WRITE 671 aio_write = EIO_WRITE
603 PROTOTYPE: $$$$$;$ 672 PROTOTYPE: $$$$$;$
604 PPCODE: 673 PPCODE:
605{ 674{
606 STRLEN svlen; 675 STRLEN svlen;
676 int fd = extract_fd (fh, ix == EIO_WRITE);
607 char *svptr = SvPVbyte (data, svlen); 677 char *svptr = SvPVbyte (data, svlen);
608 UV len = SvUV (length); 678 UV len = SvUV (length);
609
610 SvUPGRADE (data, SVt_PV);
611 SvPOK_on (data);
612 679
613 if (dataoffset < 0) 680 if (dataoffset < 0)
614 dataoffset += svlen; 681 dataoffset += svlen;
615 682
616 if (dataoffset < 0 || dataoffset > svlen) 683 if (dataoffset < 0 || dataoffset > svlen)
… …
622 if (!SvOK (length) || len + dataoffset > svlen) 689 if (!SvOK (length) || len + dataoffset > svlen)
623 len = svlen - dataoffset; 690 len = svlen - dataoffset;
624 } 691 }
625 else 692 else
626 { 693 {
627 /* read: grow scalar as necessary */ 694 /* read: check type and grow scalar as necessary */
695 SvUPGRADE (data, SVt_PV);
628 svptr = SvGROW (data, len + dataoffset + 1); 696 svptr = SvGROW (data, len + dataoffset + 1);
629 } 697 }
630 698
631 if (len < 0) 699 if (len < 0)
632 croak ("length must not be negative"); 700 croak ("length must not be negative");
… …
634 { 702 {
635 dREQ; 703 dREQ;
636 704
637 req->type = ix; 705 req->type = ix;
638 req->sv1 = newSVsv (fh); 706 req->sv1 = newSVsv (fh);
639 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 707 req->int1 = fd;
640 : IoOFP (sv_2io (fh)));
641 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 708 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
642 req->size = len; 709 req->size = len;
643 req->sv2 = SvREFCNT_inc (data); 710 req->sv2 = SvREFCNT_inc (data);
644 req->ptr2 = (char *)svptr + dataoffset; 711 req->ptr2 = (char *)svptr + dataoffset;
645 req->stroffset = dataoffset; 712 req->stroffset = dataoffset;
… …
672void 739void
673aio_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)
674 PROTOTYPE: $$$$;$ 741 PROTOTYPE: $$$$;$
675 PPCODE: 742 PPCODE:
676{ 743{
744 int ifd = extract_fd (in_fh , 0);
745 int ofd = extract_fd (out_fh, 0);
677 dREQ; 746 dREQ;
678 747
679 req->type = EIO_SENDFILE; 748 req->type = EIO_SENDFILE;
680 req->sv1 = newSVsv (out_fh); 749 req->sv1 = newSVsv (out_fh);
681 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 750 req->int1 = ofd;
682 req->sv2 = newSVsv (in_fh); 751 req->sv2 = newSVsv (in_fh);
683 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 752 req->int2 = ifd;
684 req->offs = SvVAL64 (in_offset); 753 req->offs = SvVAL64 (in_offset);
685 req->size = length; 754 req->size = length;
686 755
687 REQ_SEND; 756 REQ_SEND;
688} 757}
… …
690void 759void
691aio_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)
692 PROTOTYPE: $$$;$ 761 PROTOTYPE: $$$;$
693 PPCODE: 762 PPCODE:
694{ 763{
764 int fd = extract_fd (fh, 0);
695 dREQ; 765 dREQ;
696 766
697 req->type = EIO_READAHEAD; 767 req->type = EIO_READAHEAD;
698 req->sv1 = newSVsv (fh); 768 req->sv1 = newSVsv (fh);
699 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 769 req->int1 = fd;
700 req->offs = SvVAL64 (offset); 770 req->offs = SvVAL64 (offset);
701 req->size = length; 771 req->size = length;
702 772
703 REQ_SEND; 773 REQ_SEND;
704} 774}
… …
895{ 965{
896 dREQ; 966 dREQ;
897 967
898 req->type = EIO_GROUP; 968 req->type = EIO_GROUP;
899 969
900 eio_submit (req); 970 req_submit (req);
901 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 971 XPUSHs (req_sv (req, AIO_GRP_KLASS));
902} 972}
903 973
904void 974void
905aio_nop (SV *callback=&PL_sv_undef) 975aio_nop (SV *callback=&PL_sv_undef)
… …
917 987
918int 988int
919aioreq_pri (int pri = 0) 989aioreq_pri (int pri = 0)
920 PROTOTYPE: ;$ 990 PROTOTYPE: ;$
921 CODE: 991 CODE:
922 RETVAL = next_pri - EIO_PRI_BIAS; 992 RETVAL = next_pri;
923 if (items > 0) 993 if (items > 0)
924 { 994 {
925 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN; 995 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
926 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX; 996 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
927 next_pri = pri + EIO_PRI_BIAS; 997 next_pri = pri;
928 } 998 }
929 OUTPUT: 999 OUTPUT:
930 RETVAL 1000 RETVAL
931 1001
932void 1002void
933aioreq_nice (int nice = 0) 1003aioreq_nice (int nice = 0)
934 CODE: 1004 CODE:
935 nice = next_pri - nice; 1005 nice = next_pri - nice;
936 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN; 1006 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
937 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX; 1007 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
938 next_pri = nice + EIO_PRI_BIAS; 1008 next_pri = nice;
939 1009
940void 1010void
941flush () 1011flush ()
942 PROTOTYPE: 1012 PROTOTYPE:
943 CODE: 1013 CODE:
… …
1004 1074
1005int 1075int
1006nthreads() 1076nthreads()
1007 PROTOTYPE: 1077 PROTOTYPE:
1008 CODE: 1078 CODE:
1009 if (WORDACCESS_UNSAFE) X_LOCK (wrklock); 1079 RETVAL = eio_nthreads ();
1010 RETVAL = started;
1011 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1012 OUTPUT: 1080 OUTPUT:
1013 RETVAL 1081 RETVAL
1014 1082
1015void _on_next_submit (SV *cb) 1083void _on_next_submit (SV *cb)
1016 CODE: 1084 CODE:
… …
1026 CODE: 1094 CODE:
1027 eio_cancel (req); 1095 eio_cancel (req);
1028 1096
1029void 1097void
1030cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1098cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1031 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
1032 SvREFCNT_dec (req->callback); 1108 SvREFCNT_dec (req->callback);
1033 req->callback = newSVsv (callback); 1109 req->callback = SvREFCNT_inc (cb_cv);
1110 }
1111}
1034 1112
1035MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1113MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1036 1114
1037void 1115void
1038add (aio_req grp, ...) 1116add (aio_req grp, ...)
… …
1093void 1171void
1094feed (aio_req grp, SV *callback=&PL_sv_undef) 1172feed (aio_req grp, SV *callback=&PL_sv_undef)
1095 CODE: 1173 CODE:
1096{ 1174{
1097 SvREFCNT_dec (grp->sv2); 1175 SvREFCNT_dec (grp->sv2);
1098 grp->sv2 = newSVsv (callback); 1176 grp->sv2 = newSVsv (callback);
1177 grp->feed = aio_grp_feed;
1099 1178
1100 if (grp->int2 <= 0) 1179 if (grp->int2 <= 0)
1101 grp->int2 = 2; 1180 grp->int2 = 2;
1102 1181
1103 eio_grp_limit (grp, grp->int2); 1182 eio_grp_limit (grp, grp->int2);

Diff Legend

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