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.196 by root, Tue Sep 27 00:41:51 2011 UTC vs.
Revision 1.208 by root, Sat Jan 7 18:42:43 2012 UTC

… …
62 #undef dup 62 #undef dup
63 #undef dup2 63 #undef dup2
64 #undef abort 64 #undef abort
65 #undef pipe 65 #undef pipe
66 66
67 #define EIO_STRUCT_STAT struct _stati64
68 #define EIO_STRUCT_STATI64
69
67#else 70#else
68 71
69 #include <sys/time.h> 72 #include <sys/time.h>
70 #include <sys/select.h> 73 #include <sys/select.h>
71 #include <unistd.h> 74 #include <unistd.h>
72 #include <utime.h> 75 #include <utime.h>
73 #include <signal.h> 76 #include <signal.h>
74 77
75#endif
76
77#define EIO_STRUCT_STAT Stat_t 78 #define EIO_STRUCT_STAT Stat_t
79
80#endif
78 81
79/* use NV for 32 bit perls as it allows larger offsets */ 82/* use NV for 32 bit perls as it allows larger offsets */
80#if IVSIZE >= 8 83#if IVSIZE >= 8
81# define VAL64 IV 84# define VAL64 IV
82# define SvVAL64 SvIV 85# define SvVAL64 SvIV
… …
341static s_epipe respipe; 344static s_epipe respipe;
342 345
343static void req_destroy (aio_req req); 346static void req_destroy (aio_req req);
344static void req_cancel (aio_req req); 347static void req_cancel (aio_req req);
345 348
346static void want_poll (void) 349static void
350want_poll (void)
347{ 351{
348 /* write a dummy byte to the pipe so fh becomes ready */ 352 /* write a dummy byte to the pipe so fh becomes ready */
349 s_epipe_signal (&respipe); 353 s_epipe_signal (&respipe);
350} 354}
351 355
352static void done_poll (void) 356static void
357done_poll (void)
353{ 358{
354 /* read any signals sent by the worker threads */ 359 /* read any signals sent by the worker threads */
355 s_epipe_drain (&respipe); 360 s_epipe_drain (&respipe);
356} 361}
357 362
358/* must be called at most once */ 363/* must be called at most once */
364static SV *
359static SV *req_sv (aio_req req, HV *stash) 365req_sv (aio_req req, HV *stash)
360{ 366{
361 if (!req->self) 367 if (!req->self)
362 { 368 {
363 req->self = (SV *)newHV (); 369 req->self = (SV *)newHV ();
364 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0); 370 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
… …
368} 374}
369 375
370static SV * 376static SV *
371newSVaio_wd (aio_wd wd) 377newSVaio_wd (aio_wd wd)
372{ 378{
373 return sv_bless (newRV_noinc (newSViv ((long)wd)), aio_wd_stash); 379 return sv_bless (newRV_noinc (newSViv ((IV)wd)), aio_wd_stash);
374} 380}
375 381
376static aio_req SvAIO_REQ (SV *sv) 382static aio_req
383SvAIO_REQ (SV *sv)
377{ 384{
378 MAGIC *mg; 385 MAGIC *mg;
379 386
380 if (!SvROK (sv) 387 if (!SvROK (sv)
388 /* for speed reasons, we do not verify that SvROK actually has a stash ptr */
381 || (SvSTASH (SvRV (sv)) != aio_grp_stash 389 || (SvSTASH (SvRV (sv)) != aio_grp_stash
382 && SvSTASH (SvRV (sv)) != aio_req_stash 390 && SvSTASH (SvRV (sv)) != aio_req_stash
383 && !sv_derived_from (sv, "IO::AIO::REQ"))) 391 && !sv_derived_from (sv, "IO::AIO::REQ")))
384 croak ("object of class IO::AIO::REQ expected"); 392 croak ("object of class IO::AIO::REQ expected");
385 393
386 mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 394 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
387 395
388 return mg ? (aio_req)mg->mg_ptr : 0; 396 return mg ? (aio_req)mg->mg_ptr : 0;
389} 397}
390 398
391static aio_wd SvAIO_WD (SV *sv) 399static aio_wd
400SvAIO_WD (SV *sv)
392{ 401{
393 if (!SvROK (sv) 402 if (!SvROK (sv)
403 || SvTYPE (SvRV (sv)) != SVt_PVMG
394 || SvSTASH (SvRV (sv)) != aio_wd_stash 404 || SvSTASH (SvRV (sv)) != aio_wd_stash)
395 || SvTYPE (SvRV (sv)) != SVt_PVMG)
396 croak ("IO::AIO: expected a working directory object as returned by aio_wd"); 405 croak ("IO::AIO: expected a working directory object as returned by aio_wd");
397 406
398 return (aio_wd)(long)SvIVX (SvRV (sv)); 407 return (aio_wd)(long)SvIVX (SvRV (sv));
399} 408}
400 409
410static void
401static void aio_grp_feed (aio_req grp) 411aio_grp_feed (aio_req grp)
402{ 412{
403 if (grp->sv2 && SvOK (grp->sv2)) 413 if (grp->sv2 && SvOK (grp->sv2))
404 { 414 {
405 dSP; 415 dSP;
406 416
… …
414 FREETMPS; 424 FREETMPS;
415 LEAVE; 425 LEAVE;
416 } 426 }
417} 427}
418 428
429static void
419static void req_submit (eio_req *req) 430req_submit (eio_req *req)
420{ 431{
421 eio_submit (req); 432 eio_submit (req);
422 433
423 if (expect_false (on_next_submit)) 434 if (expect_false (on_next_submit))
424 { 435 {
… …
431 PUTBACK; 442 PUTBACK;
432 call_sv (cb, G_DISCARD | G_EVAL); 443 call_sv (cb, G_DISCARD | G_EVAL);
433 } 444 }
434} 445}
435 446
447static int
436static int req_invoke (eio_req *req) 448req_invoke (eio_req *req)
437{ 449{
438 if (req->flags & FLAG_SV2_RO_OFF) 450 if (req->flags & FLAG_SV2_RO_OFF)
439 SvREADONLY_off (req->sv2); 451 SvREADONLY_off (req->sv2);
440 452
441 if (!EIO_CANCELLED (req) && req->callback) 453 if (!EIO_CANCELLED (req) && req->callback)
… …
463 } 475 }
464 476
465 switch (req->type) 477 switch (req->type)
466 { 478 {
467 case EIO_WD_OPEN: 479 case EIO_WD_OPEN:
468 PUSHs (sv_2mortal (newSVaio_wd (req->wd))); 480 PUSHs (req->result ? &PL_sv_undef : sv_2mortal (newSVaio_wd (req->wd)));
469 break; 481 break;
470 482
471 case EIO_READDIR: 483 case EIO_READDIR:
472 { 484 {
473 SV *rv = &PL_sv_undef; 485 SV *rv = &PL_sv_undef;
… …
617 break; 629 break;
618 630
619 case EIO_STAT: 631 case EIO_STAT:
620 case EIO_LSTAT: 632 case EIO_LSTAT:
621 case EIO_FSTAT: 633 case EIO_FSTAT:
622 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT; 634 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT;
635
623 PL_laststatval = req->result; 636 if (!(PL_laststatval = req->result))
624 /* if compilation fails here then perl's Stat_t is not struct _stati64 */ 637 /* if compilation fails here then perl's Stat_t is not struct _stati64 */
625 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 638 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
639
626 PUSHs (sv_result); 640 PUSHs (sv_result);
627 break; 641 break;
628 642
629 case EIO_READ: 643 case EIO_READ:
630 { 644 {
… …
664 } 678 }
665 679
666 return !!SvTRUE (ERRSV); 680 return !!SvTRUE (ERRSV);
667} 681}
668 682
683static void
669static void req_destroy (aio_req req) 684req_destroy (aio_req req)
670{ 685{
671 if (req->self) 686 if (req->self)
672 { 687 {
673 sv_unmagic (req->self, PERL_MAGIC_ext); 688 sv_unmagic (req->self, PERL_MAGIC_ext);
674 SvREFCNT_dec (req->self); 689 SvREFCNT_dec (req->self);
… …
678 SvREFCNT_dec (req->sv2); 693 SvREFCNT_dec (req->sv2);
679 SvREFCNT_dec (req->sv3); 694 SvREFCNT_dec (req->sv3);
680 SvREFCNT_dec (req->sv4); 695 SvREFCNT_dec (req->sv4);
681 SvREFCNT_dec (req->callback); 696 SvREFCNT_dec (req->callback);
682 697
683 Safefree (req); 698 free (req);
684} 699}
685 700
701static void
686static void req_cancel_subs (aio_req grp) 702req_cancel_subs (aio_req grp)
687{ 703{
688 if (grp->type != EIO_GROUP) 704 if (grp->type != EIO_GROUP)
689 return; 705 return;
690 706
691 SvREFCNT_dec (grp->sv2); 707 SvREFCNT_dec (grp->sv2);
692 grp->sv2 = 0; 708 grp->sv2 = 0;
693 709
694 eio_grp_cancel (grp); 710 eio_grp_cancel (grp);
695} 711}
696 712
713static void ecb_cold
697static void create_respipe (void) 714create_respipe (void)
698{ 715{
699 if (s_epipe_renew (&respipe)) 716 if (s_epipe_renew (&respipe))
700 croak ("IO::AIO: unable to initialize result pipe"); 717 croak ("IO::AIO: unable to initialize result pipe");
701} 718}
702 719
703static void poll_wait (void) 720static void
721poll_wait (void)
704{ 722{
705 while (eio_nreqs ()) 723 while (eio_nreqs ())
706 { 724 {
707 int size; 725 int size;
708 726
… …
717 735
718 s_epipe_wait (&respipe); 736 s_epipe_wait (&respipe);
719 } 737 }
720} 738}
721 739
722static int poll_cb (void) 740static int
741poll_cb (void)
723{ 742{
724 for (;;) 743 for (;;)
725 { 744 {
726 int res = eio_poll (); 745 int res = eio_poll ();
727 746
… …
760# define MAP_FIXED 0 779# define MAP_FIXED 0
761#endif 780#endif
762 781
763#define MMAP_MAGIC PERL_MAGIC_ext 782#define MMAP_MAGIC PERL_MAGIC_ext
764 783
784static int ecb_cold
765static int mmap_free (pTHX_ SV *sv, MAGIC *mg) 785mmap_free (pTHX_ SV *sv, MAGIC *mg)
766{ 786{
767 int old_errno = errno; 787 int old_errno = errno;
768 munmap (mg->mg_ptr, (size_t)mg->mg_obj); 788 munmap (mg->mg_ptr, (size_t)mg->mg_obj);
769 errno = old_errno; 789 errno = old_errno;
770 790
… …
786 0, 0, 0, 0, mmap_free 806 0, 0, 0, 0, mmap_free
787}; 807};
788 808
789/*****************************************************************************/ 809/*****************************************************************************/
790 810
811static SV *
791static SV * get_cb (SV *cb_sv) 812get_cb (SV *cb_sv)
792{ 813{
793 SvGETMAGIC (cb_sv); 814 SvGETMAGIC (cb_sv);
794 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0; 815 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
795} 816}
796 817
818static aio_req ecb_noinline
819dreq (SV *callback)
820{
821 SV *cb_cv;
822 aio_req req;
823 int req_pri = next_pri;
824 next_pri = EIO_PRI_DEFAULT;
825
826 cb_cv = get_cb (callback);
827
828 req = calloc (sizeof (*req), 1);
829 if (!req)
830 croak ("out of memory during eio_req allocation");
831
832 req->callback = SvREFCNT_inc (cb_cv);
833 req->pri = req_pri;
834
835 return req;
836}
837
797#define dREQ \ 838#define dREQ \
798 SV *cb_cv; \ 839 aio_req req = dreq (callback); \
799 aio_req req; \
800 int req_pri = next_pri; \
801 next_pri = EIO_PRI_DEFAULT; \
802 \
803 cb_cv = get_cb (callback); \
804 \
805 Newz (0, req, 1, eio_req); \
806 if (!req) \
807 croak ("out of memory during eio_req allocation"); \
808 \
809 req->callback = SvREFCNT_inc (cb_cv); \
810 req->pri = req_pri
811 840
812#define REQ_SEND \ 841#define REQ_SEND \
813 PUTBACK; \ 842 PUTBACK; \
814 req_submit (req); \ 843 req_submit (req); \
815 SPAGAIN; \ 844 SPAGAIN; \
816 \ 845 \
817 if (GIMME_V != G_VOID) \ 846 if (GIMME_V != G_VOID) \
818 XPUSHs (req_sv (req, aio_req_stash)); 847 XPUSHs (req_sv (req, aio_req_stash));
819 848
820static void 849ecb_inline void
821req_set_path (aio_req req, SV *path, SV **wdsv, SV **pathsv, eio_wd *wd, void **ptr) 850req_set_path (aio_req req, SV *path, SV **wdsv, SV **pathsv, eio_wd *wd, void **ptr)
822{ 851{
823 if (SvROK (path)) 852 if (expect_false (SvROK (path)))
824 { 853 {
825 AV *av = (AV *)SvRV (path); 854 SV *rv = SvRV (path);
826 SV *wdob; 855 SV *wdob;
827 856
828 if (SvTYPE (av) != SVt_PVAV || AvFILLp (av) != 1) 857 if (SvTYPE (rv) == SVt_PVAV && AvFILLp (rv) == 1)
829 croak ("IO::AIO: pathname arguments must be specified as strings or [wd, path] arrayrefs");
830
831 path = AvARRAY (av)[1];
832 wdob = AvARRAY (av)[0];
833
834 if (SvOK (wdob))
835 { 858 {
859 path = AvARRAY (rv)[1];
860 wdob = AvARRAY (rv)[0];
861
862 if (SvOK (wdob))
863 {
836 *wd = SvAIO_WD (wdob); 864 *wd = SvAIO_WD (wdob);
837 *wdsv = SvREFCNT_inc_NN (SvRV (wdob)); 865 *wdsv = SvREFCNT_inc_NN (SvRV (wdob));
866 }
867 else
868 *wd = EIO_INVALID_WD;
869 }
870 else if (SvTYPE (rv) == SVt_PVMG && SvSTASH (rv) == aio_wd_stash)
871 {
872 *wd = (aio_wd)(long)SvIVX (rv);
873 *wdsv = SvREFCNT_inc_NN (rv);
874 *ptr = ".";
875 return; /* path set to "." */
838 } 876 }
839 else 877 else
840 *wd = EIO_INVALID_WD; 878 croak ("IO::AIO: pathname arguments must be specified as a string, an IO::AIO::WD object or a [IO::AIO::WD, path] pair");
841 } 879 }
842 880
843 *pathsv = newSVsv (path); 881 *pathsv = newSVsv (path);
844 *ptr = SvPVbyte_nolen (*pathsv); 882 *ptr = SvPVbyte_nolen (*pathsv);
845} 883}
846 884
847static void 885static void ecb_noinline
848req_set_path1 (aio_req req, SV *path) 886req_set_path1 (aio_req req, SV *path)
849{ 887{
850 req_set_path (req, path, &req->sv1, &req->sv3, &req->wd, &req->ptr1); 888 req_set_path (req, path, &req->sv1, &req->sv3, &req->wd, &req->ptr1);
851} 889}
852 890
853static void 891static void ecb_noinline
854req_set_fh_or_path (aio_req req, int type_path, int type_fh, SV *fh_or_path) 892req_set_fh_or_path (aio_req req, int type_path, int type_fh, SV *fh_or_path)
855{ 893{
856 SV *rv = SvROK (fh_or_path) ? SvRV (fh_or_path) : fh_or_path; 894 SV *rv = SvROK (fh_or_path) ? SvRV (fh_or_path) : fh_or_path;
857 895
858 switch (SvTYPE (rv)) 896 switch (SvTYPE (rv))
… …
868 default: 906 default:
869 req->type = type_path; 907 req->type = type_path;
870 req_set_path1 (req, fh_or_path); 908 req_set_path1 (req, fh_or_path);
871 break; 909 break;
872 } 910 }
873
874} 911}
912
913XS(boot_IO__AIO) ecb_cold;
875 914
876MODULE = IO::AIO PACKAGE = IO::AIO 915MODULE = IO::AIO PACKAGE = IO::AIO
877 916
878PROTOTYPES: ENABLE 917PROTOTYPES: ENABLE
879 918
… …
1278 aio_statvfs = EIO_STATVFS 1317 aio_statvfs = EIO_STATVFS
1279 PPCODE: 1318 PPCODE:
1280{ 1319{
1281 dREQ; 1320 dREQ;
1282 1321
1283 req->sv1 = newSVsv (fh_or_path);
1284 req_set_fh_or_path (req, ix, ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT, fh_or_path); 1322 req_set_fh_or_path (req, ix, ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT, fh_or_path);
1323
1285 REQ_SEND; 1324 REQ_SEND;
1286} 1325}
1287 1326
1288UV 1327UV
1289major (UV dev) 1328major (UV dev)
… …
1326 REQ_SEND; 1365 REQ_SEND;
1327} 1366}
1328 1367
1329void 1368void
1330aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef) 1369aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
1331 ALIAS:
1332 aio_chmod = EIO_CHMOD
1333 aio_mkdir = EIO_MKDIR
1334 PPCODE: 1370 PPCODE:
1335{ 1371{
1336 dREQ; 1372 dREQ;
1337 1373
1338 req->int2 = mode; 1374 req->int2 = mode;
… …
1359 PPCODE: 1395 PPCODE:
1360{ 1396{
1361 dREQ; 1397 dREQ;
1362 1398
1363 req->type = EIO_READDIR; 1399 req->type = EIO_READDIR;
1364 req->sv1 = newSVsv (pathname);
1365 req->ptr1 = SvPVbyte_nolen (req->sv1);
1366 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1; 1400 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
1367 1401
1368 if (flags & EIO_READDIR_DENTS) 1402 if (flags & EIO_READDIR_DENTS)
1369 req->int1 |= EIO_READDIR_CUSTOM2; 1403 req->int1 |= EIO_READDIR_CUSTOM2;
1370 1404
1405 req_set_path1 (req, pathname);
1406
1371 REQ_SEND; 1407 REQ_SEND;
1408}
1409
1410void
1411aio_mkdir (SV8 *pathname, int mode, SV *callback=&PL_sv_undef)
1412 PPCODE:
1413{
1414 dREQ;
1415
1416 req->type = EIO_MKDIR;
1417 req->int2 = mode;
1418 req_set_path1 (req, pathname);
1419
1420 REQ_SEND;
1372} 1421}
1373 1422
1374void 1423void
1375aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 1424aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
1376 ALIAS: 1425 ALIAS:
… …
1393 aio_link = EIO_LINK 1442 aio_link = EIO_LINK
1394 aio_symlink = EIO_SYMLINK 1443 aio_symlink = EIO_SYMLINK
1395 aio_rename = EIO_RENAME 1444 aio_rename = EIO_RENAME
1396 PPCODE: 1445 PPCODE:
1397{ 1446{
1447 eio_wd wd2 = 0;
1398 dREQ; 1448 dREQ;
1399 eio_wd wd2;
1400 1449
1401 req->type = ix; 1450 req->type = ix;
1402 req_set_path1 (req, oldpath); 1451 req_set_path1 (req, oldpath);
1403 req_set_path (req, newpath, &req->sv2, &req->sv4, &wd2, &req->ptr2); 1452 req_set_path (req, newpath, &req->sv2, &req->sv4, &wd2, &req->ptr2);
1404 req->int3 = (long)wd2; 1453 req->int3 = (long)wd2;
… …
1759DESTROY (SV *self) 1808DESTROY (SV *self)
1760 CODE: 1809 CODE:
1761{ 1810{
1762 aio_wd wd = SvAIO_WD (self); 1811 aio_wd wd = SvAIO_WD (self);
1763#if HAVE_AT 1812#if HAVE_AT
1813 {
1764 SV *callback = &PL_sv_undef; 1814 SV *callback = &PL_sv_undef;
1765 dREQ; /* clobbers next_pri :/ */ 1815 dREQ; /* clobbers next_pri :/ */
1816 next_pri = req->pri; /* restore next_pri */
1817 req->pri = EIO_PRI_MAX; /* better use max. priority to conserve fds */
1766 req->type = EIO_WD_CLOSE; 1818 req->type = EIO_WD_CLOSE;
1767 req->wd = wd; 1819 req->wd = wd;
1768 REQ_SEND; 1820 REQ_SEND;
1821 }
1769#else 1822#else
1770 eio_wd_close_sync (wd); 1823 eio_wd_close_sync (wd);
1771#endif 1824#endif
1772} 1825}
1773 1826

Diff Legend

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