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.202 by root, Thu Sep 29 10:01:35 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 ((long)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)
375 || (SvSTASH (SvRV (sv)) != aio_grp_stash 385 || (SvSTASH (SvRV (sv)) != aio_grp_stash
… …
380 mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 390 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
381 391
382 return mg ? (aio_req)mg->mg_ptr : 0; 392 return mg ? (aio_req)mg->mg_ptr : 0;
383} 393}
384 394
385static aio_wd SvAIO_WD (SV *sv) 395static aio_wd
396SvAIO_WD (SV *sv)
386{ 397{
387 if (!SvROK (sv) 398 if (!SvROK (sv)
388 || SvSTASH (SvRV (sv)) != aio_wd_stash 399 || SvSTASH (SvRV (sv)) != aio_wd_stash
389 || SvTYPE (SvRV (sv)) != SVt_PVMG) 400 || SvTYPE (SvRV (sv)) != SVt_PVMG)
390 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");
391 402
392 return (aio_wd)(long)SvIVX (SvRV (sv)); 403 return (aio_wd)(long)SvIVX (SvRV (sv));
393} 404}
394 405
406static void
395static void aio_grp_feed (aio_req grp) 407aio_grp_feed (aio_req grp)
396{ 408{
397 if (grp->sv2 && SvOK (grp->sv2)) 409 if (grp->sv2 && SvOK (grp->sv2))
398 { 410 {
399 dSP; 411 dSP;
400 412
… …
408 FREETMPS; 420 FREETMPS;
409 LEAVE; 421 LEAVE;
410 } 422 }
411} 423}
412 424
425static void
413static void req_submit (eio_req *req) 426req_submit (eio_req *req)
414{ 427{
415 eio_submit (req); 428 eio_submit (req);
416 429
417 if (expect_false (on_next_submit)) 430 if (expect_false (on_next_submit))
418 { 431 {
… …
425 PUTBACK; 438 PUTBACK;
426 call_sv (cb, G_DISCARD | G_EVAL); 439 call_sv (cb, G_DISCARD | G_EVAL);
427 } 440 }
428} 441}
429 442
443static int
430static int req_invoke (eio_req *req) 444req_invoke (eio_req *req)
431{ 445{
432 if (req->flags & FLAG_SV2_RO_OFF) 446 if (req->flags & FLAG_SV2_RO_OFF)
433 SvREADONLY_off (req->sv2); 447 SvREADONLY_off (req->sv2);
434 448
435 if (!EIO_CANCELLED (req) && req->callback) 449 if (!EIO_CANCELLED (req) && req->callback)
… …
457 } 471 }
458 472
459 switch (req->type) 473 switch (req->type)
460 { 474 {
461 case EIO_WD_OPEN: 475 case EIO_WD_OPEN:
462 PUSHs (sv_2mortal (sv_bless (newRV_noinc (newSViv (((long)req->wd))), aio_wd_stash))); 476 PUSHs (sv_2mortal (newSVaio_wd (req->wd)));
463 break; 477 break;
464 478
465 case EIO_READDIR: 479 case EIO_READDIR:
466 { 480 {
467 SV *rv = &PL_sv_undef; 481 SV *rv = &PL_sv_undef;
… …
611 break; 625 break;
612 626
613 case EIO_STAT: 627 case EIO_STAT:
614 case EIO_LSTAT: 628 case EIO_LSTAT:
615 case EIO_FSTAT: 629 case EIO_FSTAT:
616 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT; 630 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT;
631
617 PL_laststatval = req->result; 632 if (!(PL_laststatval = req->result))
618 /* 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 */
619 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 634 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
635
620 PUSHs (sv_result); 636 PUSHs (sv_result);
621 break; 637 break;
622 638
623 case EIO_READ: 639 case EIO_READ:
624 { 640 {
… …
658 } 674 }
659 675
660 return !!SvTRUE (ERRSV); 676 return !!SvTRUE (ERRSV);
661} 677}
662 678
679static void
663static void req_destroy (aio_req req) 680req_destroy (aio_req req)
664{ 681{
665 if (req->self) 682 if (req->self)
666 { 683 {
667 sv_unmagic (req->self, PERL_MAGIC_ext); 684 sv_unmagic (req->self, PERL_MAGIC_ext);
668 SvREFCNT_dec (req->self); 685 SvREFCNT_dec (req->self);
… …
675 SvREFCNT_dec (req->callback); 692 SvREFCNT_dec (req->callback);
676 693
677 Safefree (req); 694 Safefree (req);
678} 695}
679 696
697static void
680static void req_cancel_subs (aio_req grp) 698req_cancel_subs (aio_req grp)
681{ 699{
682 if (grp->type != EIO_GROUP) 700 if (grp->type != EIO_GROUP)
683 return; 701 return;
684 702
685 SvREFCNT_dec (grp->sv2); 703 SvREFCNT_dec (grp->sv2);
686 grp->sv2 = 0; 704 grp->sv2 = 0;
687 705
688 eio_grp_cancel (grp); 706 eio_grp_cancel (grp);
689} 707}
690 708
709static void ecb_cold
691static void create_respipe (void) 710create_respipe (void)
692{ 711{
693 if (s_epipe_renew (&respipe)) 712 if (s_epipe_renew (&respipe))
694 croak ("IO::AIO: unable to initialize result pipe"); 713 croak ("IO::AIO: unable to initialize result pipe");
695} 714}
696 715
697static void poll_wait (void) 716static void
717poll_wait (void)
698{ 718{
699 while (eio_nreqs ()) 719 while (eio_nreqs ())
700 { 720 {
701 int size; 721 int size;
702 722
… …
711 731
712 s_epipe_wait (&respipe); 732 s_epipe_wait (&respipe);
713 } 733 }
714} 734}
715 735
716static int poll_cb (void) 736static int
737poll_cb (void)
717{ 738{
718 for (;;) 739 for (;;)
719 { 740 {
720 int res = eio_poll (); 741 int res = eio_poll ();
721 742
… …
754# define MAP_FIXED 0 775# define MAP_FIXED 0
755#endif 776#endif
756 777
757#define MMAP_MAGIC PERL_MAGIC_ext 778#define MMAP_MAGIC PERL_MAGIC_ext
758 779
780static int ecb_cold
759static int mmap_free (pTHX_ SV *sv, MAGIC *mg) 781mmap_free (pTHX_ SV *sv, MAGIC *mg)
760{ 782{
761 int old_errno = errno; 783 int old_errno = errno;
762 munmap (mg->mg_ptr, (size_t)mg->mg_obj); 784 munmap (mg->mg_ptr, (size_t)mg->mg_obj);
763 errno = old_errno; 785 errno = old_errno;
764 786
… …
780 0, 0, 0, 0, mmap_free 802 0, 0, 0, 0, mmap_free
781}; 803};
782 804
783/*****************************************************************************/ 805/*****************************************************************************/
784 806
807static SV *
785static SV * get_cb (SV *cb_sv) 808get_cb (SV *cb_sv)
786{ 809{
787 SvGETMAGIC (cb_sv); 810 SvGETMAGIC (cb_sv);
788 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0; 811 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
789} 812}
790 813
… …
809 SPAGAIN; \ 832 SPAGAIN; \
810 \ 833 \
811 if (GIMME_V != G_VOID) \ 834 if (GIMME_V != G_VOID) \
812 XPUSHs (req_sv (req, aio_req_stash)); 835 XPUSHs (req_sv (req, aio_req_stash));
813 836
814static void 837ecb_inline void
815req_set_path (aio_req req, SV *path, SV **wdsv, SV **pathsv, eio_wd *wd, void **ptr) 838req_set_path (aio_req req, SV *path, SV **wdsv, SV **pathsv, eio_wd *wd, void **ptr)
816{ 839{
817 if (SvROK (path)) 840 if (expect_false (SvROK (path)))
818 { 841 {
819 AV *av = (AV *)SvRV (path); 842 AV *av = (AV *)SvRV (path);
820 SV *wdob; 843 SV *wdob;
821 844
822 if (SvTYPE (av) != SVt_PVAV || AvFILLp (av) != 1) 845 if (SvTYPE (av) != SVt_PVAV || AvFILLp (av) != 1)
823 croak ("IO::AIO: pathname arguments must be specified as strings or [wd, path] arrayrefs"); 846 croak ("IO::AIO: pathname arguments must be specified as strings or [wd, path] arrayrefs");
824 847
825 path = AvARRAY (av)[1]; 848 path = AvARRAY (av)[1];
826 wdob = AvARRAY (av)[0]; 849 wdob = AvARRAY (av)[0];
827 850
851 if (SvOK (wdob))
852 {
828 *wd = SvAIO_WD (wdob); 853 *wd = SvAIO_WD (wdob);
829 *wdsv = SvREFCNT_inc_NN (SvRV (wdob)); 854 *wdsv = SvREFCNT_inc_NN (SvRV (wdob));
855 }
856 else
857 *wd = EIO_INVALID_WD;
830 } 858 }
831 859
832 *pathsv = newSVsv (path); 860 *pathsv = newSVsv (path);
833 *ptr = SvPVbyte_nolen (*pathsv); 861 *ptr = SvPVbyte_nolen (*pathsv);
834} 862}
835 863
836static void 864static void ecb_noinline
837req_set_path1 (aio_req req, SV *path) 865req_set_path1 (aio_req req, SV *path)
838{ 866{
839 req_set_path (req, path, &req->sv1, &req->sv3, &req->wd, &req->ptr1); 867 req_set_path (req, path, &req->sv1, &req->sv3, &req->wd, &req->ptr1);
840} 868}
841 869
842static void 870static void ecb_noinline
843req_set_fh_or_path (aio_req req, int type_path, int type_fh, SV *fh_or_path) 871req_set_fh_or_path (aio_req req, int type_path, int type_fh, SV *fh_or_path)
844{ 872{
845 SV *rv = SvROK (fh_or_path) ? SvRV (fh_or_path) : fh_or_path; 873 SV *rv = SvROK (fh_or_path) ? SvRV (fh_or_path) : fh_or_path;
846 874
847 switch (SvTYPE (rv)) 875 switch (SvTYPE (rv))
… …
857 default: 885 default:
858 req->type = type_path; 886 req->type = type_path;
859 req_set_path1 (req, fh_or_path); 887 req_set_path1 (req, fh_or_path);
860 break; 888 break;
861 } 889 }
862
863} 890}
891
892XS(boot_IO__AIO) ecb_cold;
864 893
865MODULE = IO::AIO PACKAGE = IO::AIO 894MODULE = IO::AIO PACKAGE = IO::AIO
866 895
867PROTOTYPES: ENABLE 896PROTOTYPES: ENABLE
868 897
… …
1315 REQ_SEND; 1344 REQ_SEND;
1316} 1345}
1317 1346
1318void 1347void
1319aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef) 1348aio_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: 1349 PPCODE:
1324{ 1350{
1325 dREQ; 1351 dREQ;
1326 1352
1327 req->int2 = mode; 1353 req->int2 = mode;
… …
1348 PPCODE: 1374 PPCODE:
1349{ 1375{
1350 dREQ; 1376 dREQ;
1351 1377
1352 req->type = EIO_READDIR; 1378 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; 1379 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
1356 1380
1357 if (flags & EIO_READDIR_DENTS) 1381 if (flags & EIO_READDIR_DENTS)
1358 req->int1 |= EIO_READDIR_CUSTOM2; 1382 req->int1 |= EIO_READDIR_CUSTOM2;
1359 1383
1384 req_set_path1 (req, pathname);
1385
1360 REQ_SEND; 1386 REQ_SEND;
1387}
1388
1389void
1390aio_mkdir (SV8 *pathname, int mode, SV *callback=&PL_sv_undef)
1391 PPCODE:
1392{
1393 dREQ;
1394
1395 req->type = EIO_MKDIR;
1396 req->int2 = mode;
1397 req_set_path1 (req, pathname);
1398
1399 REQ_SEND;
1361} 1400}
1362 1401
1363void 1402void
1364aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 1403aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
1365 ALIAS: 1404 ALIAS:
… …
1383 aio_symlink = EIO_SYMLINK 1422 aio_symlink = EIO_SYMLINK
1384 aio_rename = EIO_RENAME 1423 aio_rename = EIO_RENAME
1385 PPCODE: 1424 PPCODE:
1386{ 1425{
1387 dREQ; 1426 dREQ;
1388 eio_wd wd2; 1427 eio_wd wd2 = 0;
1389 1428
1390 req->type = ix; 1429 req->type = ix;
1391 req_set_path1 (req, oldpath); 1430 req_set_path1 (req, oldpath);
1392 req_set_path (req, newpath, &req->sv2, &req->sv4, &wd2, &req->ptr2); 1431 req_set_path (req, newpath, &req->sv2, &req->sv4, &wd2, &req->ptr2);
1393 req->int3 = (long)wd2; 1432 req->int3 = (long)wd2;
… …
1736 1775
1737PROTOTYPES: DISABLE 1776PROTOTYPES: DISABLE
1738 1777
1739MODULE = IO::AIO PACKAGE = IO::AIO::WD 1778MODULE = IO::AIO PACKAGE = IO::AIO::WD
1740 1779
1780BOOT:
1781{
1782 newCONSTSUB (aio_stash, "CWD" , newSVaio_wd (EIO_CWD ));
1783 newCONSTSUB (aio_stash, "INVALID_WD", newSVaio_wd (EIO_INVALID_WD));
1784}
1785
1741void 1786void
1742DESTROY (SV *self) 1787DESTROY (SV *self)
1743 CODE: 1788 CODE:
1744{ 1789{
1745 aio_wd wd = SvAIO_WD (self); 1790 aio_wd wd = SvAIO_WD (self);

Diff Legend

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