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.195 by root, Mon Sep 26 20:19:08 2011 UTC vs.
Revision 1.205 by root, Sat Oct 1 10:53:47 2011 UTC

… …
330 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ 330 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
331}; 331};
332 332
333typedef eio_req *aio_req; 333typedef eio_req *aio_req;
334typedef eio_req *aio_req_ornot; 334typedef eio_req *aio_req_ornot;
335typedef eio_wd *aio_wd; 335typedef eio_wd aio_wd;
336 336
337static SV *on_next_submit; 337static SV *on_next_submit;
338static int next_pri = EIO_PRI_DEFAULT; 338static int next_pri = EIO_PRI_DEFAULT;
339static int max_outstanding; 339static int max_outstanding;
340 340
341static s_epipe respipe; 341static s_epipe respipe;
342 342
343static void req_destroy (aio_req req); 343static void req_destroy (aio_req req);
344static void req_cancel (aio_req req); 344static void req_cancel (aio_req req);
345 345
346static void want_poll (void) 346static void
347want_poll (void)
347{ 348{
348 /* write a dummy byte to the pipe so fh becomes ready */ 349 /* write a dummy byte to the pipe so fh becomes ready */
349 s_epipe_signal (&respipe); 350 s_epipe_signal (&respipe);
350} 351}
351 352
352static void done_poll (void) 353static void
354done_poll (void)
353{ 355{
354 /* read any signals sent by the worker threads */ 356 /* read any signals sent by the worker threads */
355 s_epipe_drain (&respipe); 357 s_epipe_drain (&respipe);
356} 358}
357 359
358/* must be called at most once */ 360/* must be called at most once */
361static SV *
359static SV *req_sv (aio_req req, HV *stash) 362req_sv (aio_req req, HV *stash)
360{ 363{
361 if (!req->self) 364 if (!req->self)
362 { 365 {
363 req->self = (SV *)newHV (); 366 req->self = (SV *)newHV ();
364 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0); 367 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
365 } 368 }
366 369
367 return sv_2mortal (sv_bless (newRV_inc (req->self), stash)); 370 return sv_2mortal (sv_bless (newRV_inc (req->self), stash));
368} 371}
369 372
370static aio_req SvAIO_REQ (SV *sv) 373static SV *
374newSVaio_wd (aio_wd wd)
375{
376 return sv_bless (newRV_noinc (newSViv ((IV)wd)), aio_wd_stash);
377}
378
379static aio_req
380SvAIO_REQ (SV *sv)
371{ 381{
372 MAGIC *mg; 382 MAGIC *mg;
373 383
374 if (!SvROK (sv) 384 if (!SvROK (sv)
385 /* for speed reasons, we do not verify that SvROK actually has a stash ptr */
375 || (SvSTASH (SvRV (sv)) != aio_grp_stash 386 || (SvSTASH (SvRV (sv)) != aio_grp_stash
376 && SvSTASH (SvRV (sv)) != aio_req_stash 387 && SvSTASH (SvRV (sv)) != aio_req_stash
377 && !sv_derived_from (sv, "IO::AIO::REQ"))) 388 && !sv_derived_from (sv, "IO::AIO::REQ")))
378 croak ("object of class IO::AIO::REQ expected"); 389 croak ("object of class IO::AIO::REQ expected");
379 390
380 mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 391 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
381 392
382 return mg ? (aio_req)mg->mg_ptr : 0; 393 return mg ? (aio_req)mg->mg_ptr : 0;
383} 394}
384 395
385static aio_wd SvAIO_WD (SV *sv) 396static aio_wd
397SvAIO_WD (SV *sv)
386{ 398{
387 if (!SvROK (sv) 399 if (!SvROK (sv)
400 || SvTYPE (SvRV (sv)) != SVt_PVMG
388 || SvSTASH (SvRV (sv)) != aio_wd_stash 401 || SvSTASH (SvRV (sv)) != aio_wd_stash)
389 || SvTYPE (SvRV (sv)) != SVt_PVMG)
390 croak ("IO::AIO: expected a working directory object as returned by aio_wd"); 402 croak ("IO::AIO: expected a working directory object as returned by aio_wd");
391 403
392 return (aio_wd)(long)SvIVX (SvRV (sv)); 404 return (aio_wd)(long)SvIVX (SvRV (sv));
393} 405}
394 406
407static void
395static void aio_grp_feed (aio_req grp) 408aio_grp_feed (aio_req grp)
396{ 409{
397 if (grp->sv2 && SvOK (grp->sv2)) 410 if (grp->sv2 && SvOK (grp->sv2))
398 { 411 {
399 dSP; 412 dSP;
400 413
… …
408 FREETMPS; 421 FREETMPS;
409 LEAVE; 422 LEAVE;
410 } 423 }
411} 424}
412 425
426static void
413static void req_submit (eio_req *req) 427req_submit (eio_req *req)
414{ 428{
415 eio_submit (req); 429 eio_submit (req);
416 430
417 if (expect_false (on_next_submit)) 431 if (expect_false (on_next_submit))
418 { 432 {
… …
425 PUTBACK; 439 PUTBACK;
426 call_sv (cb, G_DISCARD | G_EVAL); 440 call_sv (cb, G_DISCARD | G_EVAL);
427 } 441 }
428} 442}
429 443
444static int
430static int req_invoke (eio_req *req) 445req_invoke (eio_req *req)
431{ 446{
432 if (req->flags & FLAG_SV2_RO_OFF) 447 if (req->flags & FLAG_SV2_RO_OFF)
433 SvREADONLY_off (req->sv2); 448 SvREADONLY_off (req->sv2);
434 449
435 if (!EIO_CANCELLED (req) && req->callback) 450 if (!EIO_CANCELLED (req) && req->callback)
… …
457 } 472 }
458 473
459 switch (req->type) 474 switch (req->type)
460 { 475 {
461 case EIO_WD_OPEN: 476 case EIO_WD_OPEN:
462 PUSHs (sv_2mortal (sv_bless (newRV_noinc (newSViv (((long)req->wd))), aio_wd_stash))); 477 PUSHs (req->result ? &PL_sv_undef : sv_2mortal (newSVaio_wd (req->wd)));
463 break; 478 break;
464 479
465 case EIO_READDIR: 480 case EIO_READDIR:
466 { 481 {
467 SV *rv = &PL_sv_undef; 482 SV *rv = &PL_sv_undef;
… …
611 break; 626 break;
612 627
613 case EIO_STAT: 628 case EIO_STAT:
614 case EIO_LSTAT: 629 case EIO_LSTAT:
615 case EIO_FSTAT: 630 case EIO_FSTAT:
616 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT; 631 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT;
632
617 PL_laststatval = req->result; 633 if (!(PL_laststatval = req->result))
618 /* if compilation fails here then perl's Stat_t is not struct _stati64 */ 634 /* if compilation fails here then perl's Stat_t is not struct _stati64 */
619 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 635 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
636
620 PUSHs (sv_result); 637 PUSHs (sv_result);
621 break; 638 break;
622 639
623 case EIO_READ: 640 case EIO_READ:
624 { 641 {
… …
658 } 675 }
659 676
660 return !!SvTRUE (ERRSV); 677 return !!SvTRUE (ERRSV);
661} 678}
662 679
680static void
663static void req_destroy (aio_req req) 681req_destroy (aio_req req)
664{ 682{
665 if (req->self) 683 if (req->self)
666 { 684 {
667 sv_unmagic (req->self, PERL_MAGIC_ext); 685 sv_unmagic (req->self, PERL_MAGIC_ext);
668 SvREFCNT_dec (req->self); 686 SvREFCNT_dec (req->self);
… …
672 SvREFCNT_dec (req->sv2); 690 SvREFCNT_dec (req->sv2);
673 SvREFCNT_dec (req->sv3); 691 SvREFCNT_dec (req->sv3);
674 SvREFCNT_dec (req->sv4); 692 SvREFCNT_dec (req->sv4);
675 SvREFCNT_dec (req->callback); 693 SvREFCNT_dec (req->callback);
676 694
677 Safefree (req); 695 free (req);
678} 696}
679 697
698static void
680static void req_cancel_subs (aio_req grp) 699req_cancel_subs (aio_req grp)
681{ 700{
682 if (grp->type != EIO_GROUP) 701 if (grp->type != EIO_GROUP)
683 return; 702 return;
684 703
685 SvREFCNT_dec (grp->sv2); 704 SvREFCNT_dec (grp->sv2);
686 grp->sv2 = 0; 705 grp->sv2 = 0;
687 706
688 eio_grp_cancel (grp); 707 eio_grp_cancel (grp);
689} 708}
690 709
710static void ecb_cold
691static void create_respipe (void) 711create_respipe (void)
692{ 712{
693 if (s_epipe_renew (&respipe)) 713 if (s_epipe_renew (&respipe))
694 croak ("IO::AIO: unable to initialize result pipe"); 714 croak ("IO::AIO: unable to initialize result pipe");
695} 715}
696 716
697static void poll_wait (void) 717static void
718poll_wait (void)
698{ 719{
699 while (eio_nreqs ()) 720 while (eio_nreqs ())
700 { 721 {
701 int size; 722 int size;
702 723
… …
711 732
712 s_epipe_wait (&respipe); 733 s_epipe_wait (&respipe);
713 } 734 }
714} 735}
715 736
716static int poll_cb (void) 737static int
738poll_cb (void)
717{ 739{
718 for (;;) 740 for (;;)
719 { 741 {
720 int res = eio_poll (); 742 int res = eio_poll ();
721 743
… …
754# define MAP_FIXED 0 776# define MAP_FIXED 0
755#endif 777#endif
756 778
757#define MMAP_MAGIC PERL_MAGIC_ext 779#define MMAP_MAGIC PERL_MAGIC_ext
758 780
781static int ecb_cold
759static int mmap_free (pTHX_ SV *sv, MAGIC *mg) 782mmap_free (pTHX_ SV *sv, MAGIC *mg)
760{ 783{
761 int old_errno = errno; 784 int old_errno = errno;
762 munmap (mg->mg_ptr, (size_t)mg->mg_obj); 785 munmap (mg->mg_ptr, (size_t)mg->mg_obj);
763 errno = old_errno; 786 errno = old_errno;
764 787
… …
780 0, 0, 0, 0, mmap_free 803 0, 0, 0, 0, mmap_free
781}; 804};
782 805
783/*****************************************************************************/ 806/*****************************************************************************/
784 807
808static SV *
785static SV * get_cb (SV *cb_sv) 809get_cb (SV *cb_sv)
786{ 810{
787 SvGETMAGIC (cb_sv); 811 SvGETMAGIC (cb_sv);
788 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0; 812 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
789} 813}
790 814
815static aio_req ecb_noinline
816dreq (SV *callback)
817{
818 SV *cb_cv;
819 aio_req req;
820 int req_pri = next_pri;
821 next_pri = EIO_PRI_DEFAULT;
822
823 cb_cv = get_cb (callback);
824
825 req = calloc (sizeof (*req), 1);
826 if (!req)
827 croak ("out of memory during eio_req allocation");
828
829 req->callback = SvREFCNT_inc (cb_cv);
830 req->pri = req_pri;
831
832 return req;
833}
834
791#define dREQ \ 835#define dREQ \
792 SV *cb_cv; \ 836 aio_req req = dreq (callback); \
793 aio_req req; \
794 int req_pri = next_pri; \
795 next_pri = EIO_PRI_DEFAULT; \
796 \
797 cb_cv = get_cb (callback); \
798 \
799 Newz (0, req, 1, eio_req); \
800 if (!req) \
801 croak ("out of memory during eio_req allocation"); \
802 \
803 req->callback = SvREFCNT_inc (cb_cv); \
804 req->pri = req_pri
805 837
806#define REQ_SEND \ 838#define REQ_SEND \
807 PUTBACK; \ 839 PUTBACK; \
808 req_submit (req); \ 840 req_submit (req); \
809 SPAGAIN; \ 841 SPAGAIN; \
810 \ 842 \
811 if (GIMME_V != G_VOID) \ 843 if (GIMME_V != G_VOID) \
812 XPUSHs (req_sv (req, aio_req_stash)); 844 XPUSHs (req_sv (req, aio_req_stash));
813 845
814static void 846ecb_inline void
815req_set_path (aio_req req, SV *path, SV **wdsv, SV **pathsv, eio_wd *wd, void **ptr) 847req_set_path (aio_req req, SV *path, SV **wdsv, SV **pathsv, eio_wd *wd, void **ptr)
816{ 848{
817 if (SvROK (path)) 849 if (expect_false (SvROK (path)))
818 { 850 {
819 AV *av = (AV *)SvRV (path); 851 SV *rv = SvRV (path);
820 SV *wdob; 852 SV *wdob;
821 853
822 if (SvTYPE (av) != SVt_PVAV || AvFILLp (av) != 1) 854 if (SvTYPE (rv) == SVt_PVAV && AvFILLp (rv) == 1)
823 croak ("IO::AIO: pathname arguments must be specified as strings or [wd, path] arrayrefs"); 855 {
824
825 path = AvARRAY (av)[1]; 856 path = AvARRAY (rv)[1];
826 wdob = AvARRAY (av)[0]; 857 wdob = AvARRAY (rv)[0];
827 858
859 if (SvOK (wdob))
860 {
828 *wd = SvAIO_WD (wdob); 861 *wd = SvAIO_WD (wdob);
829 *wdsv = SvREFCNT_inc_NN (SvRV (wdob)); 862 *wdsv = SvREFCNT_inc_NN (SvRV (wdob));
863 }
864 else
865 *wd = EIO_INVALID_WD;
866 }
867 else if (SvTYPE (rv) == SVt_PVMG && SvSTASH (rv) == aio_wd_stash)
868 {
869 *wd = SvIVX (rv);
870 *wdsv = SvREFCNT_inc_NN (rv);
871 *ptr = ".";
872 return; /* path set to "." */
873 }
874 else
875 croak ("IO::AIO: pathname arguments must be specified as a string, an IO::AIO::WD object or a [IO::AIO::WD, path] pair");
830 } 876 }
831 877
832 *pathsv = newSVsv (path); 878 *pathsv = newSVsv (path);
833 *ptr = SvPVbyte_nolen (*pathsv); 879 *ptr = SvPVbyte_nolen (*pathsv);
834} 880}
835 881
836static void 882static void ecb_noinline
837req_set_path1 (aio_req req, SV *path) 883req_set_path1 (aio_req req, SV *path)
838{ 884{
839 req_set_path (req, path, &req->sv1, &req->sv3, &req->wd, &req->ptr1); 885 req_set_path (req, path, &req->sv1, &req->sv3, &req->wd, &req->ptr1);
840} 886}
841 887
842static void 888static void ecb_noinline
843req_set_fh_or_path (aio_req req, int type_path, int type_fh, SV *fh_or_path) 889req_set_fh_or_path (aio_req req, int type_path, int type_fh, SV *fh_or_path)
844{ 890{
845 SV *rv = SvROK (fh_or_path) ? SvRV (fh_or_path) : fh_or_path; 891 SV *rv = SvROK (fh_or_path) ? SvRV (fh_or_path) : fh_or_path;
846 892
847 switch (SvTYPE (rv)) 893 switch (SvTYPE (rv))
… …
857 default: 903 default:
858 req->type = type_path; 904 req->type = type_path;
859 req_set_path1 (req, fh_or_path); 905 req_set_path1 (req, fh_or_path);
860 break; 906 break;
861 } 907 }
862
863} 908}
909
910XS(boot_IO__AIO) ecb_cold;
864 911
865MODULE = IO::AIO PACKAGE = IO::AIO 912MODULE = IO::AIO PACKAGE = IO::AIO
866 913
867PROTOTYPES: ENABLE 914PROTOTYPES: ENABLE
868 915
… …
1267 aio_statvfs = EIO_STATVFS 1314 aio_statvfs = EIO_STATVFS
1268 PPCODE: 1315 PPCODE:
1269{ 1316{
1270 dREQ; 1317 dREQ;
1271 1318
1272 req->sv1 = newSVsv (fh_or_path);
1273 req_set_fh_or_path (req, ix, ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT, fh_or_path); 1319 req_set_fh_or_path (req, ix, ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT, fh_or_path);
1320
1274 REQ_SEND; 1321 REQ_SEND;
1275} 1322}
1276 1323
1277UV 1324UV
1278major (UV dev) 1325major (UV dev)
… …
1315 REQ_SEND; 1362 REQ_SEND;
1316} 1363}
1317 1364
1318void 1365void
1319aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef) 1366aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
1320 ALIAS:
1321 aio_chmod = EIO_CHMOD
1322 aio_mkdir = EIO_MKDIR
1323 PPCODE: 1367 PPCODE:
1324{ 1368{
1325 dREQ; 1369 dREQ;
1326 1370
1327 req->int2 = mode; 1371 req->int2 = mode;
… …
1348 PPCODE: 1392 PPCODE:
1349{ 1393{
1350 dREQ; 1394 dREQ;
1351 1395
1352 req->type = EIO_READDIR; 1396 req->type = EIO_READDIR;
1353 req->sv1 = newSVsv (pathname);
1354 req->ptr1 = SvPVbyte_nolen (req->sv1);
1355 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1; 1397 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
1356 1398
1357 if (flags & EIO_READDIR_DENTS) 1399 if (flags & EIO_READDIR_DENTS)
1358 req->int1 |= EIO_READDIR_CUSTOM2; 1400 req->int1 |= EIO_READDIR_CUSTOM2;
1359 1401
1402 req_set_path1 (req, pathname);
1403
1360 REQ_SEND; 1404 REQ_SEND;
1405}
1406
1407void
1408aio_mkdir (SV8 *pathname, int mode, SV *callback=&PL_sv_undef)
1409 PPCODE:
1410{
1411 dREQ;
1412
1413 req->type = EIO_MKDIR;
1414 req->int2 = mode;
1415 req_set_path1 (req, pathname);
1416
1417 REQ_SEND;
1361} 1418}
1362 1419
1363void 1420void
1364aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 1421aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
1365 ALIAS: 1422 ALIAS:
… …
1383 aio_symlink = EIO_SYMLINK 1440 aio_symlink = EIO_SYMLINK
1384 aio_rename = EIO_RENAME 1441 aio_rename = EIO_RENAME
1385 PPCODE: 1442 PPCODE:
1386{ 1443{
1387 dREQ; 1444 dREQ;
1388 eio_wd wd2; 1445 eio_wd wd2 = 0;
1389 1446
1390 req->type = ix; 1447 req->type = ix;
1391 req_set_path1 (req, oldpath); 1448 req_set_path1 (req, oldpath);
1392 req_set_path (req, newpath, &req->sv2, &req->sv4, &wd2, &req->ptr2); 1449 req_set_path (req, newpath, &req->sv2, &req->sv4, &wd2, &req->ptr2);
1393 req->int3 = (long)wd2; 1450 req->int3 = (long)wd2;
… …
1736 1793
1737PROTOTYPES: DISABLE 1794PROTOTYPES: DISABLE
1738 1795
1739MODULE = IO::AIO PACKAGE = IO::AIO::WD 1796MODULE = IO::AIO PACKAGE = IO::AIO::WD
1740 1797
1798BOOT:
1799{
1800 newCONSTSUB (aio_stash, "CWD" , newSVaio_wd (EIO_CWD ));
1801 newCONSTSUB (aio_stash, "INVALID_WD", newSVaio_wd (EIO_INVALID_WD));
1802}
1803
1741void 1804void
1742DESTROY (SV *self) 1805DESTROY (SV *self)
1743 CODE: 1806 CODE:
1744{ 1807{
1745 aio_wd wd = SvAIO_WD (self); 1808 aio_wd wd = SvAIO_WD (self);
1746#if HAVE_AT 1809#if HAVE_AT
1810 {
1747 SV *callback = &PL_sv_undef; 1811 SV *callback = &PL_sv_undef;
1748 dREQ; /* clobbers next_pri :/ */ 1812 dREQ; /* clobbers next_pri :/ */
1813 next_pri = req->pri; /* restore next_pri */
1814 req->pri = EIO_PRI_MAX; /* better use max. priority to conserve fds */
1749 req->type = EIO_WD_CLOSE; 1815 req->type = EIO_WD_CLOSE;
1750 req->wd = wd; 1816 req->wd = wd;
1751 REQ_SEND; 1817 REQ_SEND;
1818 }
1752#else 1819#else
1753 eio_wd_close_sync (wd); 1820 eio_wd_close_sync (wd);
1754#endif 1821#endif
1755} 1822}
1756 1823

Diff Legend

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