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.198 by root, Tue Sep 27 02:16:49 2011 UTC vs.
Revision 1.207 by root, Fri Dec 30 07:40:54 2011 UTC

… …
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);
… …
368} 371}
369 372
370static SV * 373static SV *
371newSVaio_wd (aio_wd wd) 374newSVaio_wd (aio_wd wd)
372{ 375{
373 return sv_bless (newRV_noinc (newSViv ((long)wd)), aio_wd_stash); 376 return sv_bless (newRV_noinc (newSViv ((IV)wd)), aio_wd_stash);
374} 377}
375 378
376static aio_req SvAIO_REQ (SV *sv) 379static aio_req
380SvAIO_REQ (SV *sv)
377{ 381{
378 MAGIC *mg; 382 MAGIC *mg;
379 383
380 if (!SvROK (sv) 384 if (!SvROK (sv)
385 /* for speed reasons, we do not verify that SvROK actually has a stash ptr */
381 || (SvSTASH (SvRV (sv)) != aio_grp_stash 386 || (SvSTASH (SvRV (sv)) != aio_grp_stash
382 && SvSTASH (SvRV (sv)) != aio_req_stash 387 && SvSTASH (SvRV (sv)) != aio_req_stash
383 && !sv_derived_from (sv, "IO::AIO::REQ"))) 388 && !sv_derived_from (sv, "IO::AIO::REQ")))
384 croak ("object of class IO::AIO::REQ expected"); 389 croak ("object of class IO::AIO::REQ expected");
385 390
386 mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 391 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
387 392
388 return mg ? (aio_req)mg->mg_ptr : 0; 393 return mg ? (aio_req)mg->mg_ptr : 0;
389} 394}
390 395
391static aio_wd SvAIO_WD (SV *sv) 396static aio_wd
397SvAIO_WD (SV *sv)
392{ 398{
393 if (!SvROK (sv) 399 if (!SvROK (sv)
400 || SvTYPE (SvRV (sv)) != SVt_PVMG
394 || SvSTASH (SvRV (sv)) != aio_wd_stash 401 || 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"); 402 croak ("IO::AIO: expected a working directory object as returned by aio_wd");
397 403
398 return (aio_wd)(long)SvIVX (SvRV (sv)); 404 return (aio_wd)(long)SvIVX (SvRV (sv));
399} 405}
400 406
407static void
401static void aio_grp_feed (aio_req grp) 408aio_grp_feed (aio_req grp)
402{ 409{
403 if (grp->sv2 && SvOK (grp->sv2)) 410 if (grp->sv2 && SvOK (grp->sv2))
404 { 411 {
405 dSP; 412 dSP;
406 413
… …
414 FREETMPS; 421 FREETMPS;
415 LEAVE; 422 LEAVE;
416 } 423 }
417} 424}
418 425
426static void
419static void req_submit (eio_req *req) 427req_submit (eio_req *req)
420{ 428{
421 eio_submit (req); 429 eio_submit (req);
422 430
423 if (expect_false (on_next_submit)) 431 if (expect_false (on_next_submit))
424 { 432 {
… …
431 PUTBACK; 439 PUTBACK;
432 call_sv (cb, G_DISCARD | G_EVAL); 440 call_sv (cb, G_DISCARD | G_EVAL);
433 } 441 }
434} 442}
435 443
444static int
436static int req_invoke (eio_req *req) 445req_invoke (eio_req *req)
437{ 446{
438 if (req->flags & FLAG_SV2_RO_OFF) 447 if (req->flags & FLAG_SV2_RO_OFF)
439 SvREADONLY_off (req->sv2); 448 SvREADONLY_off (req->sv2);
440 449
441 if (!EIO_CANCELLED (req) && req->callback) 450 if (!EIO_CANCELLED (req) && req->callback)
… …
463 } 472 }
464 473
465 switch (req->type) 474 switch (req->type)
466 { 475 {
467 case EIO_WD_OPEN: 476 case EIO_WD_OPEN:
468 PUSHs (sv_2mortal (newSVaio_wd (req->wd))); 477 PUSHs (req->result ? &PL_sv_undef : sv_2mortal (newSVaio_wd (req->wd)));
469 break; 478 break;
470 479
471 case EIO_READDIR: 480 case EIO_READDIR:
472 { 481 {
473 SV *rv = &PL_sv_undef; 482 SV *rv = &PL_sv_undef;
… …
666 } 675 }
667 676
668 return !!SvTRUE (ERRSV); 677 return !!SvTRUE (ERRSV);
669} 678}
670 679
680static void
671static void req_destroy (aio_req req) 681req_destroy (aio_req req)
672{ 682{
673 if (req->self) 683 if (req->self)
674 { 684 {
675 sv_unmagic (req->self, PERL_MAGIC_ext); 685 sv_unmagic (req->self, PERL_MAGIC_ext);
676 SvREFCNT_dec (req->self); 686 SvREFCNT_dec (req->self);
… …
680 SvREFCNT_dec (req->sv2); 690 SvREFCNT_dec (req->sv2);
681 SvREFCNT_dec (req->sv3); 691 SvREFCNT_dec (req->sv3);
682 SvREFCNT_dec (req->sv4); 692 SvREFCNT_dec (req->sv4);
683 SvREFCNT_dec (req->callback); 693 SvREFCNT_dec (req->callback);
684 694
685 Safefree (req); 695 free (req);
686} 696}
687 697
698static void
688static void req_cancel_subs (aio_req grp) 699req_cancel_subs (aio_req grp)
689{ 700{
690 if (grp->type != EIO_GROUP) 701 if (grp->type != EIO_GROUP)
691 return; 702 return;
692 703
693 SvREFCNT_dec (grp->sv2); 704 SvREFCNT_dec (grp->sv2);
694 grp->sv2 = 0; 705 grp->sv2 = 0;
695 706
696 eio_grp_cancel (grp); 707 eio_grp_cancel (grp);
697} 708}
698 709
710static void ecb_cold
699static void create_respipe (void) 711create_respipe (void)
700{ 712{
701 if (s_epipe_renew (&respipe)) 713 if (s_epipe_renew (&respipe))
702 croak ("IO::AIO: unable to initialize result pipe"); 714 croak ("IO::AIO: unable to initialize result pipe");
703} 715}
704 716
705static void poll_wait (void) 717static void
718poll_wait (void)
706{ 719{
707 while (eio_nreqs ()) 720 while (eio_nreqs ())
708 { 721 {
709 int size; 722 int size;
710 723
… …
719 732
720 s_epipe_wait (&respipe); 733 s_epipe_wait (&respipe);
721 } 734 }
722} 735}
723 736
724static int poll_cb (void) 737static int
738poll_cb (void)
725{ 739{
726 for (;;) 740 for (;;)
727 { 741 {
728 int res = eio_poll (); 742 int res = eio_poll ();
729 743
… …
762# define MAP_FIXED 0 776# define MAP_FIXED 0
763#endif 777#endif
764 778
765#define MMAP_MAGIC PERL_MAGIC_ext 779#define MMAP_MAGIC PERL_MAGIC_ext
766 780
781static int ecb_cold
767static int mmap_free (pTHX_ SV *sv, MAGIC *mg) 782mmap_free (pTHX_ SV *sv, MAGIC *mg)
768{ 783{
769 int old_errno = errno; 784 int old_errno = errno;
770 munmap (mg->mg_ptr, (size_t)mg->mg_obj); 785 munmap (mg->mg_ptr, (size_t)mg->mg_obj);
771 errno = old_errno; 786 errno = old_errno;
772 787
… …
788 0, 0, 0, 0, mmap_free 803 0, 0, 0, 0, mmap_free
789}; 804};
790 805
791/*****************************************************************************/ 806/*****************************************************************************/
792 807
808static SV *
793static SV * get_cb (SV *cb_sv) 809get_cb (SV *cb_sv)
794{ 810{
795 SvGETMAGIC (cb_sv); 811 SvGETMAGIC (cb_sv);
796 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0; 812 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
797} 813}
798 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
799#define dREQ \ 835#define dREQ \
800 SV *cb_cv; \ 836 aio_req req = dreq (callback); \
801 aio_req req; \
802 int req_pri = next_pri; \
803 next_pri = EIO_PRI_DEFAULT; \
804 \
805 cb_cv = get_cb (callback); \
806 \
807 Newz (0, req, 1, eio_req); \
808 if (!req) \
809 croak ("out of memory during eio_req allocation"); \
810 \
811 req->callback = SvREFCNT_inc (cb_cv); \
812 req->pri = req_pri
813 837
814#define REQ_SEND \ 838#define REQ_SEND \
815 PUTBACK; \ 839 PUTBACK; \
816 req_submit (req); \ 840 req_submit (req); \
817 SPAGAIN; \ 841 SPAGAIN; \
818 \ 842 \
819 if (GIMME_V != G_VOID) \ 843 if (GIMME_V != G_VOID) \
820 XPUSHs (req_sv (req, aio_req_stash)); 844 XPUSHs (req_sv (req, aio_req_stash));
821 845
822static void 846ecb_inline void
823req_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)
824{ 848{
825 if (expect_false (SvROK (path))) 849 if (expect_false (SvROK (path)))
826 { 850 {
827 AV *av = (AV *)SvRV (path); 851 SV *rv = SvRV (path);
828 SV *wdob; 852 SV *wdob;
829 853
830 if (SvTYPE (av) != SVt_PVAV || AvFILLp (av) != 1) 854 if (SvTYPE (rv) == SVt_PVAV && AvFILLp (rv) == 1)
831 croak ("IO::AIO: pathname arguments must be specified as strings or [wd, path] arrayrefs");
832
833 path = AvARRAY (av)[1];
834 wdob = AvARRAY (av)[0];
835
836 if (SvOK (wdob))
837 { 855 {
856 path = AvARRAY (rv)[1];
857 wdob = AvARRAY (rv)[0];
858
859 if (SvOK (wdob))
860 {
838 *wd = SvAIO_WD (wdob); 861 *wd = SvAIO_WD (wdob);
839 *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 = (aio_wd)(long)SvIVX (rv);
870 *wdsv = SvREFCNT_inc_NN (rv);
871 *ptr = ".";
872 return; /* path set to "." */
840 } 873 }
841 else 874 else
842 *wd = EIO_INVALID_WD; 875 croak ("IO::AIO: pathname arguments must be specified as a string, an IO::AIO::WD object or a [IO::AIO::WD, path] pair");
843 } 876 }
844 877
845 *pathsv = newSVsv (path); 878 *pathsv = newSVsv (path);
846 *ptr = SvPVbyte_nolen (*pathsv); 879 *ptr = SvPVbyte_nolen (*pathsv);
847} 880}
848 881
849static void 882static void ecb_noinline
850req_set_path1 (aio_req req, SV *path) 883req_set_path1 (aio_req req, SV *path)
851{ 884{
852 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);
853} 886}
854 887
855static void 888static void ecb_noinline
856req_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)
857{ 890{
858 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;
859 892
860 switch (SvTYPE (rv)) 893 switch (SvTYPE (rv))
… …
870 default: 903 default:
871 req->type = type_path; 904 req->type = type_path;
872 req_set_path1 (req, fh_or_path); 905 req_set_path1 (req, fh_or_path);
873 break; 906 break;
874 } 907 }
875
876} 908}
909
910XS(boot_IO__AIO) ecb_cold;
877 911
878MODULE = IO::AIO PACKAGE = IO::AIO 912MODULE = IO::AIO PACKAGE = IO::AIO
879 913
880PROTOTYPES: ENABLE 914PROTOTYPES: ENABLE
881 915
… …
1280 aio_statvfs = EIO_STATVFS 1314 aio_statvfs = EIO_STATVFS
1281 PPCODE: 1315 PPCODE:
1282{ 1316{
1283 dREQ; 1317 dREQ;
1284 1318
1285 req->sv1 = newSVsv (fh_or_path);
1286 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
1287 REQ_SEND; 1321 REQ_SEND;
1288} 1322}
1289 1323
1290UV 1324UV
1291major (UV dev) 1325major (UV dev)
… …
1328 REQ_SEND; 1362 REQ_SEND;
1329} 1363}
1330 1364
1331void 1365void
1332aio_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)
1333 ALIAS:
1334 aio_chmod = EIO_CHMOD
1335 aio_mkdir = EIO_MKDIR
1336 PPCODE: 1367 PPCODE:
1337{ 1368{
1338 dREQ; 1369 dREQ;
1339 1370
1340 req->int2 = mode; 1371 req->int2 = mode;
… …
1369 req->int1 |= EIO_READDIR_CUSTOM2; 1400 req->int1 |= EIO_READDIR_CUSTOM2;
1370 1401
1371 req_set_path1 (req, pathname); 1402 req_set_path1 (req, pathname);
1372 1403
1373 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;
1374} 1418}
1375 1419
1376void 1420void
1377aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 1421aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
1378 ALIAS: 1422 ALIAS:
… …
1395 aio_link = EIO_LINK 1439 aio_link = EIO_LINK
1396 aio_symlink = EIO_SYMLINK 1440 aio_symlink = EIO_SYMLINK
1397 aio_rename = EIO_RENAME 1441 aio_rename = EIO_RENAME
1398 PPCODE: 1442 PPCODE:
1399{ 1443{
1444 eio_wd wd2 = 0;
1400 dREQ; 1445 dREQ;
1401 eio_wd wd2;
1402 1446
1403 req->type = ix; 1447 req->type = ix;
1404 req_set_path1 (req, oldpath); 1448 req_set_path1 (req, oldpath);
1405 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);
1406 req->int3 = (long)wd2; 1450 req->int3 = (long)wd2;
… …
1761DESTROY (SV *self) 1805DESTROY (SV *self)
1762 CODE: 1806 CODE:
1763{ 1807{
1764 aio_wd wd = SvAIO_WD (self); 1808 aio_wd wd = SvAIO_WD (self);
1765#if HAVE_AT 1809#if HAVE_AT
1810 {
1766 SV *callback = &PL_sv_undef; 1811 SV *callback = &PL_sv_undef;
1767 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 */
1768 req->type = EIO_WD_CLOSE; 1815 req->type = EIO_WD_CLOSE;
1769 req->wd = wd; 1816 req->wd = wd;
1770 REQ_SEND; 1817 REQ_SEND;
1818 }
1771#else 1819#else
1772 eio_wd_close_sync (wd); 1820 eio_wd_close_sync (wd);
1773#endif 1821#endif
1774} 1822}
1775 1823

Diff Legend

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