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.201 by root, Thu Sep 29 09:57:12 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
… …
371} 374}
372 375
373static SV * 376static SV *
374newSVaio_wd (aio_wd wd) 377newSVaio_wd (aio_wd wd)
375{ 378{
376 return sv_bless (newRV_noinc (newSViv ((long)wd)), aio_wd_stash); 379 return sv_bless (newRV_noinc (newSViv ((IV)wd)), aio_wd_stash);
377} 380}
378 381
379static aio_req 382static aio_req
380SvAIO_REQ (SV *sv) 383SvAIO_REQ (SV *sv)
381{ 384{
382 MAGIC *mg; 385 MAGIC *mg;
383 386
384 if (!SvROK (sv) 387 if (!SvROK (sv)
388 /* for speed reasons, we do not verify that SvROK actually has a stash ptr */
385 || (SvSTASH (SvRV (sv)) != aio_grp_stash 389 || (SvSTASH (SvRV (sv)) != aio_grp_stash
386 && SvSTASH (SvRV (sv)) != aio_req_stash 390 && SvSTASH (SvRV (sv)) != aio_req_stash
387 && !sv_derived_from (sv, "IO::AIO::REQ"))) 391 && !sv_derived_from (sv, "IO::AIO::REQ")))
388 croak ("object of class IO::AIO::REQ expected"); 392 croak ("object of class IO::AIO::REQ expected");
389 393
… …
394 398
395static aio_wd 399static aio_wd
396SvAIO_WD (SV *sv) 400SvAIO_WD (SV *sv)
397{ 401{
398 if (!SvROK (sv) 402 if (!SvROK (sv)
403 || SvTYPE (SvRV (sv)) != SVt_PVMG
399 || SvSTASH (SvRV (sv)) != aio_wd_stash 404 || SvSTASH (SvRV (sv)) != aio_wd_stash)
400 || SvTYPE (SvRV (sv)) != SVt_PVMG)
401 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");
402 406
403 return (aio_wd)(long)SvIVX (SvRV (sv)); 407 return (aio_wd)(long)SvIVX (SvRV (sv));
404} 408}
405 409
… …
471 } 475 }
472 476
473 switch (req->type) 477 switch (req->type)
474 { 478 {
475 case EIO_WD_OPEN: 479 case EIO_WD_OPEN:
476 PUSHs (sv_2mortal (newSVaio_wd (req->wd))); 480 PUSHs (req->result ? &PL_sv_undef : sv_2mortal (newSVaio_wd (req->wd)));
477 break; 481 break;
478 482
479 case EIO_READDIR: 483 case EIO_READDIR:
480 { 484 {
481 SV *rv = &PL_sv_undef; 485 SV *rv = &PL_sv_undef;
… …
689 SvREFCNT_dec (req->sv2); 693 SvREFCNT_dec (req->sv2);
690 SvREFCNT_dec (req->sv3); 694 SvREFCNT_dec (req->sv3);
691 SvREFCNT_dec (req->sv4); 695 SvREFCNT_dec (req->sv4);
692 SvREFCNT_dec (req->callback); 696 SvREFCNT_dec (req->callback);
693 697
694 Safefree (req); 698 free (req);
695} 699}
696 700
697static void 701static void
698req_cancel_subs (aio_req grp) 702req_cancel_subs (aio_req grp)
699{ 703{
… …
809{ 813{
810 SvGETMAGIC (cb_sv); 814 SvGETMAGIC (cb_sv);
811 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0; 815 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
812} 816}
813 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
814#define dREQ \ 838#define dREQ \
815 SV *cb_cv; \ 839 aio_req req = dreq (callback); \
816 aio_req req; \
817 int req_pri = next_pri; \
818 next_pri = EIO_PRI_DEFAULT; \
819 \
820 cb_cv = get_cb (callback); \
821 \
822 Newz (0, req, 1, eio_req); \
823 if (!req) \
824 croak ("out of memory during eio_req allocation"); \
825 \
826 req->callback = SvREFCNT_inc (cb_cv); \
827 req->pri = req_pri
828 840
829#define REQ_SEND \ 841#define REQ_SEND \
830 PUTBACK; \ 842 PUTBACK; \
831 req_submit (req); \ 843 req_submit (req); \
832 SPAGAIN; \ 844 SPAGAIN; \
… …
837ecb_inline void 849ecb_inline void
838req_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)
839{ 851{
840 if (expect_false (SvROK (path))) 852 if (expect_false (SvROK (path)))
841 { 853 {
842 AV *av = (AV *)SvRV (path); 854 SV *rv = SvRV (path);
843 SV *wdob; 855 SV *wdob;
844 856
845 if (SvTYPE (av) != SVt_PVAV || AvFILLp (av) != 1) 857 if (SvTYPE (rv) == SVt_PVAV && AvFILLp (rv) == 1)
846 croak ("IO::AIO: pathname arguments must be specified as strings or [wd, path] arrayrefs");
847
848 path = AvARRAY (av)[1];
849 wdob = AvARRAY (av)[0];
850
851 if (SvOK (wdob))
852 { 858 {
859 path = AvARRAY (rv)[1];
860 wdob = AvARRAY (rv)[0];
861
862 if (SvOK (wdob))
863 {
853 *wd = SvAIO_WD (wdob); 864 *wd = SvAIO_WD (wdob);
854 *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 "." */
855 } 876 }
856 else 877 else
857 *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");
858 } 879 }
859 880
860 *pathsv = newSVsv (path); 881 *pathsv = newSVsv (path);
861 *ptr = SvPVbyte_nolen (*pathsv); 882 *ptr = SvPVbyte_nolen (*pathsv);
862} 883}
… …
886 req->type = type_path; 907 req->type = type_path;
887 req_set_path1 (req, fh_or_path); 908 req_set_path1 (req, fh_or_path);
888 break; 909 break;
889 } 910 }
890} 911}
912
913XS(boot_IO__AIO) ecb_cold;
891 914
892MODULE = IO::AIO PACKAGE = IO::AIO 915MODULE = IO::AIO PACKAGE = IO::AIO
893 916
894PROTOTYPES: ENABLE 917PROTOTYPES: ENABLE
895 918
… …
1294 aio_statvfs = EIO_STATVFS 1317 aio_statvfs = EIO_STATVFS
1295 PPCODE: 1318 PPCODE:
1296{ 1319{
1297 dREQ; 1320 dREQ;
1298 1321
1299 req->sv1 = newSVsv (fh_or_path);
1300 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
1301 REQ_SEND; 1324 REQ_SEND;
1302} 1325}
1303 1326
1304UV 1327UV
1305major (UV dev) 1328major (UV dev)
… …
1419 aio_link = EIO_LINK 1442 aio_link = EIO_LINK
1420 aio_symlink = EIO_SYMLINK 1443 aio_symlink = EIO_SYMLINK
1421 aio_rename = EIO_RENAME 1444 aio_rename = EIO_RENAME
1422 PPCODE: 1445 PPCODE:
1423{ 1446{
1447 eio_wd wd2 = 0;
1424 dREQ; 1448 dREQ;
1425 eio_wd wd2 = 0;
1426 1449
1427 req->type = ix; 1450 req->type = ix;
1428 req_set_path1 (req, oldpath); 1451 req_set_path1 (req, oldpath);
1429 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);
1430 req->int3 = (long)wd2; 1453 req->int3 = (long)wd2;
… …
1785DESTROY (SV *self) 1808DESTROY (SV *self)
1786 CODE: 1809 CODE:
1787{ 1810{
1788 aio_wd wd = SvAIO_WD (self); 1811 aio_wd wd = SvAIO_WD (self);
1789#if HAVE_AT 1812#if HAVE_AT
1813 {
1790 SV *callback = &PL_sv_undef; 1814 SV *callback = &PL_sv_undef;
1791 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 */
1792 req->type = EIO_WD_CLOSE; 1818 req->type = EIO_WD_CLOSE;
1793 req->wd = wd; 1819 req->wd = wd;
1794 REQ_SEND; 1820 REQ_SEND;
1821 }
1795#else 1822#else
1796 eio_wd_close_sync (wd); 1823 eio_wd_close_sync (wd);
1797#endif 1824#endif
1798} 1825}
1799 1826

Diff Legend

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