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.203 by root, Thu Sep 29 23:06:24 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)
381 || (SvSTASH (SvRV (sv)) != aio_grp_stash 385 || (SvSTASH (SvRV (sv)) != aio_grp_stash
… …
386 mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 390 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
387 391
388 return mg ? (aio_req)mg->mg_ptr : 0; 392 return mg ? (aio_req)mg->mg_ptr : 0;
389} 393}
390 394
391static aio_wd SvAIO_WD (SV *sv) 395static aio_wd
396SvAIO_WD (SV *sv)
392{ 397{
393 if (!SvROK (sv) 398 if (!SvROK (sv)
394 || SvSTASH (SvRV (sv)) != aio_wd_stash 399 || SvSTASH (SvRV (sv)) != aio_wd_stash
395 || SvTYPE (SvRV (sv)) != SVt_PVMG) 400 || SvTYPE (SvRV (sv)) != SVt_PVMG)
396 croak ("IO::AIO: expected a working directory object as returned by aio_wd"); 401 croak ("IO::AIO: expected a working directory object as returned by aio_wd");
397 402
398 return (aio_wd)(long)SvIVX (SvRV (sv)); 403 return (aio_wd)(long)SvIVX (SvRV (sv));
399} 404}
400 405
406static void
401static void aio_grp_feed (aio_req grp) 407aio_grp_feed (aio_req grp)
402{ 408{
403 if (grp->sv2 && SvOK (grp->sv2)) 409 if (grp->sv2 && SvOK (grp->sv2))
404 { 410 {
405 dSP; 411 dSP;
406 412
… …
414 FREETMPS; 420 FREETMPS;
415 LEAVE; 421 LEAVE;
416 } 422 }
417} 423}
418 424
425static void
419static void req_submit (eio_req *req) 426req_submit (eio_req *req)
420{ 427{
421 eio_submit (req); 428 eio_submit (req);
422 429
423 if (expect_false (on_next_submit)) 430 if (expect_false (on_next_submit))
424 { 431 {
… …
431 PUTBACK; 438 PUTBACK;
432 call_sv (cb, G_DISCARD | G_EVAL); 439 call_sv (cb, G_DISCARD | G_EVAL);
433 } 440 }
434} 441}
435 442
443static int
436static int req_invoke (eio_req *req) 444req_invoke (eio_req *req)
437{ 445{
438 if (req->flags & FLAG_SV2_RO_OFF) 446 if (req->flags & FLAG_SV2_RO_OFF)
439 SvREADONLY_off (req->sv2); 447 SvREADONLY_off (req->sv2);
440 448
441 if (!EIO_CANCELLED (req) && req->callback) 449 if (!EIO_CANCELLED (req) && req->callback)
… …
463 } 471 }
464 472
465 switch (req->type) 473 switch (req->type)
466 { 474 {
467 case EIO_WD_OPEN: 475 case EIO_WD_OPEN:
468 PUSHs (sv_2mortal (newSVaio_wd (req->wd))); 476 PUSHs (req->result ? &PL_sv_undef : sv_2mortal (newSVaio_wd (req->wd)));
469 break; 477 break;
470 478
471 case EIO_READDIR: 479 case EIO_READDIR:
472 { 480 {
473 SV *rv = &PL_sv_undef; 481 SV *rv = &PL_sv_undef;
… …
617 break; 625 break;
618 626
619 case EIO_STAT: 627 case EIO_STAT:
620 case EIO_LSTAT: 628 case EIO_LSTAT:
621 case EIO_FSTAT: 629 case EIO_FSTAT:
622 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT; 630 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT;
631
623 PL_laststatval = req->result; 632 if (!(PL_laststatval = req->result))
624 /* if compilation fails here then perl's Stat_t is not struct _stati64 */ 633 /* if compilation fails here then perl's Stat_t is not struct _stati64 */
625 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 634 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
635
626 PUSHs (sv_result); 636 PUSHs (sv_result);
627 break; 637 break;
628 638
629 case EIO_READ: 639 case EIO_READ:
630 { 640 {
… …
664 } 674 }
665 675
666 return !!SvTRUE (ERRSV); 676 return !!SvTRUE (ERRSV);
667} 677}
668 678
679static void
669static void req_destroy (aio_req req) 680req_destroy (aio_req req)
670{ 681{
671 if (req->self) 682 if (req->self)
672 { 683 {
673 sv_unmagic (req->self, PERL_MAGIC_ext); 684 sv_unmagic (req->self, PERL_MAGIC_ext);
674 SvREFCNT_dec (req->self); 685 SvREFCNT_dec (req->self);
… …
681 SvREFCNT_dec (req->callback); 692 SvREFCNT_dec (req->callback);
682 693
683 Safefree (req); 694 Safefree (req);
684} 695}
685 696
697static void
686static void req_cancel_subs (aio_req grp) 698req_cancel_subs (aio_req grp)
687{ 699{
688 if (grp->type != EIO_GROUP) 700 if (grp->type != EIO_GROUP)
689 return; 701 return;
690 702
691 SvREFCNT_dec (grp->sv2); 703 SvREFCNT_dec (grp->sv2);
692 grp->sv2 = 0; 704 grp->sv2 = 0;
693 705
694 eio_grp_cancel (grp); 706 eio_grp_cancel (grp);
695} 707}
696 708
709static void ecb_cold
697static void create_respipe (void) 710create_respipe (void)
698{ 711{
699 if (s_epipe_renew (&respipe)) 712 if (s_epipe_renew (&respipe))
700 croak ("IO::AIO: unable to initialize result pipe"); 713 croak ("IO::AIO: unable to initialize result pipe");
701} 714}
702 715
703static void poll_wait (void) 716static void
717poll_wait (void)
704{ 718{
705 while (eio_nreqs ()) 719 while (eio_nreqs ())
706 { 720 {
707 int size; 721 int size;
708 722
… …
717 731
718 s_epipe_wait (&respipe); 732 s_epipe_wait (&respipe);
719 } 733 }
720} 734}
721 735
722static int poll_cb (void) 736static int
737poll_cb (void)
723{ 738{
724 for (;;) 739 for (;;)
725 { 740 {
726 int res = eio_poll (); 741 int res = eio_poll ();
727 742
… …
760# define MAP_FIXED 0 775# define MAP_FIXED 0
761#endif 776#endif
762 777
763#define MMAP_MAGIC PERL_MAGIC_ext 778#define MMAP_MAGIC PERL_MAGIC_ext
764 779
780static int ecb_cold
765static int mmap_free (pTHX_ SV *sv, MAGIC *mg) 781mmap_free (pTHX_ SV *sv, MAGIC *mg)
766{ 782{
767 int old_errno = errno; 783 int old_errno = errno;
768 munmap (mg->mg_ptr, (size_t)mg->mg_obj); 784 munmap (mg->mg_ptr, (size_t)mg->mg_obj);
769 errno = old_errno; 785 errno = old_errno;
770 786
… …
786 0, 0, 0, 0, mmap_free 802 0, 0, 0, 0, mmap_free
787}; 803};
788 804
789/*****************************************************************************/ 805/*****************************************************************************/
790 806
807static SV *
791static SV * get_cb (SV *cb_sv) 808get_cb (SV *cb_sv)
792{ 809{
793 SvGETMAGIC (cb_sv); 810 SvGETMAGIC (cb_sv);
794 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0; 811 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
795} 812}
796 813
814static aio_req ecb_noinline
815dreq (SV *callback)
816{
817 SV *cb_cv;
818 aio_req req;
819 int req_pri = next_pri;
820 next_pri = EIO_PRI_DEFAULT;
821
822 cb_cv = get_cb (callback);
823
824 Newz (0, req, 1, eio_req);
825 if (!req)
826 croak ("out of memory during eio_req allocation");
827
828 req->callback = SvREFCNT_inc (cb_cv);
829 req->pri = req_pri;
830
831 return req;
832}
833
797#define dREQ \ 834#define dREQ \
798 SV *cb_cv; \ 835 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 836
812#define REQ_SEND \ 837#define REQ_SEND \
813 PUTBACK; \ 838 PUTBACK; \
814 req_submit (req); \ 839 req_submit (req); \
815 SPAGAIN; \ 840 SPAGAIN; \
816 \ 841 \
817 if (GIMME_V != G_VOID) \ 842 if (GIMME_V != G_VOID) \
818 XPUSHs (req_sv (req, aio_req_stash)); 843 XPUSHs (req_sv (req, aio_req_stash));
819 844
820static void 845ecb_inline void
821req_set_path (aio_req req, SV *path, SV **wdsv, SV **pathsv, eio_wd *wd, void **ptr) 846req_set_path (aio_req req, SV *path, SV **wdsv, SV **pathsv, eio_wd *wd, void **ptr)
822{ 847{
823 if (SvROK (path)) 848 if (expect_false (SvROK (path)))
824 { 849 {
825 AV *av = (AV *)SvRV (path); 850 AV *av = (AV *)SvRV (path);
826 SV *wdob; 851 SV *wdob;
827 852
828 if (SvTYPE (av) != SVt_PVAV || AvFILLp (av) != 1) 853 if (SvTYPE (av) != SVt_PVAV || AvFILLp (av) != 1)
… …
842 867
843 *pathsv = newSVsv (path); 868 *pathsv = newSVsv (path);
844 *ptr = SvPVbyte_nolen (*pathsv); 869 *ptr = SvPVbyte_nolen (*pathsv);
845} 870}
846 871
847static void 872static void ecb_noinline
848req_set_path1 (aio_req req, SV *path) 873req_set_path1 (aio_req req, SV *path)
849{ 874{
850 req_set_path (req, path, &req->sv1, &req->sv3, &req->wd, &req->ptr1); 875 req_set_path (req, path, &req->sv1, &req->sv3, &req->wd, &req->ptr1);
851} 876}
852 877
853static void 878static void ecb_noinline
854req_set_fh_or_path (aio_req req, int type_path, int type_fh, SV *fh_or_path) 879req_set_fh_or_path (aio_req req, int type_path, int type_fh, SV *fh_or_path)
855{ 880{
856 SV *rv = SvROK (fh_or_path) ? SvRV (fh_or_path) : fh_or_path; 881 SV *rv = SvROK (fh_or_path) ? SvRV (fh_or_path) : fh_or_path;
857 882
858 switch (SvTYPE (rv)) 883 switch (SvTYPE (rv))
… …
868 default: 893 default:
869 req->type = type_path; 894 req->type = type_path;
870 req_set_path1 (req, fh_or_path); 895 req_set_path1 (req, fh_or_path);
871 break; 896 break;
872 } 897 }
873
874} 898}
899
900XS(boot_IO__AIO) ecb_cold;
875 901
876MODULE = IO::AIO PACKAGE = IO::AIO 902MODULE = IO::AIO PACKAGE = IO::AIO
877 903
878PROTOTYPES: ENABLE 904PROTOTYPES: ENABLE
879 905
… …
1278 aio_statvfs = EIO_STATVFS 1304 aio_statvfs = EIO_STATVFS
1279 PPCODE: 1305 PPCODE:
1280{ 1306{
1281 dREQ; 1307 dREQ;
1282 1308
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); 1309 req_set_fh_or_path (req, ix, ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT, fh_or_path);
1310
1285 REQ_SEND; 1311 REQ_SEND;
1286} 1312}
1287 1313
1288UV 1314UV
1289major (UV dev) 1315major (UV dev)
… …
1326 REQ_SEND; 1352 REQ_SEND;
1327} 1353}
1328 1354
1329void 1355void
1330aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef) 1356aio_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: 1357 PPCODE:
1335{ 1358{
1336 dREQ; 1359 dREQ;
1337 1360
1338 req->int2 = mode; 1361 req->int2 = mode;
… …
1359 PPCODE: 1382 PPCODE:
1360{ 1383{
1361 dREQ; 1384 dREQ;
1362 1385
1363 req->type = EIO_READDIR; 1386 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; 1387 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
1367 1388
1368 if (flags & EIO_READDIR_DENTS) 1389 if (flags & EIO_READDIR_DENTS)
1369 req->int1 |= EIO_READDIR_CUSTOM2; 1390 req->int1 |= EIO_READDIR_CUSTOM2;
1370 1391
1392 req_set_path1 (req, pathname);
1393
1371 REQ_SEND; 1394 REQ_SEND;
1395}
1396
1397void
1398aio_mkdir (SV8 *pathname, int mode, SV *callback=&PL_sv_undef)
1399 PPCODE:
1400{
1401 dREQ;
1402
1403 req->type = EIO_MKDIR;
1404 req->int2 = mode;
1405 req_set_path1 (req, pathname);
1406
1407 REQ_SEND;
1372} 1408}
1373 1409
1374void 1410void
1375aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 1411aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
1376 ALIAS: 1412 ALIAS:
… …
1394 aio_symlink = EIO_SYMLINK 1430 aio_symlink = EIO_SYMLINK
1395 aio_rename = EIO_RENAME 1431 aio_rename = EIO_RENAME
1396 PPCODE: 1432 PPCODE:
1397{ 1433{
1398 dREQ; 1434 dREQ;
1399 eio_wd wd2; 1435 eio_wd wd2 = 0;
1400 1436
1401 req->type = ix; 1437 req->type = ix;
1402 req_set_path1 (req, oldpath); 1438 req_set_path1 (req, oldpath);
1403 req_set_path (req, newpath, &req->sv2, &req->sv4, &wd2, &req->ptr2); 1439 req_set_path (req, newpath, &req->sv2, &req->sv4, &wd2, &req->ptr2);
1404 req->int3 = (long)wd2; 1440 req->int3 = (long)wd2;
… …
1759DESTROY (SV *self) 1795DESTROY (SV *self)
1760 CODE: 1796 CODE:
1761{ 1797{
1762 aio_wd wd = SvAIO_WD (self); 1798 aio_wd wd = SvAIO_WD (self);
1763#if HAVE_AT 1799#if HAVE_AT
1800 {
1764 SV *callback = &PL_sv_undef; 1801 SV *callback = &PL_sv_undef;
1765 dREQ; /* clobbers next_pri :/ */ 1802 dREQ; /* clobbers next_pri :/ */
1803 next_pri = req->pri; /* restore next_pri */
1804 req->pri = EIO_PRI_MAX; /* better use max. priority to conserve fds */
1766 req->type = EIO_WD_CLOSE; 1805 req->type = EIO_WD_CLOSE;
1767 req->wd = wd; 1806 req->wd = wd;
1768 REQ_SEND; 1807 REQ_SEND;
1808 }
1769#else 1809#else
1770 eio_wd_close_sync (wd); 1810 eio_wd_close_sync (wd);
1771#endif 1811#endif
1772} 1812}
1773 1813

Diff Legend

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