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.203 by root, Thu Sep 29 23:06:24 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
… …
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
… …
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{
… …
819 int req_pri = next_pri; 823 int req_pri = next_pri;
820 next_pri = EIO_PRI_DEFAULT; 824 next_pri = EIO_PRI_DEFAULT;
821 825
822 cb_cv = get_cb (callback); 826 cb_cv = get_cb (callback);
823 827
824 Newz (0, req, 1, eio_req); 828 req = calloc (sizeof (*req), 1);
825 if (!req) 829 if (!req)
826 croak ("out of memory during eio_req allocation"); 830 croak ("out of memory during eio_req allocation");
827 831
828 req->callback = SvREFCNT_inc (cb_cv); 832 req->callback = SvREFCNT_inc (cb_cv);
829 req->pri = req_pri; 833 req->pri = req_pri;
… …
845ecb_inline void 849ecb_inline void
846req_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)
847{ 851{
848 if (expect_false (SvROK (path))) 852 if (expect_false (SvROK (path)))
849 { 853 {
850 AV *av = (AV *)SvRV (path); 854 SV *rv = SvRV (path);
851 SV *wdob; 855 SV *wdob;
852 856
853 if (SvTYPE (av) != SVt_PVAV || AvFILLp (av) != 1) 857 if (SvTYPE (rv) == SVt_PVAV && AvFILLp (rv) == 1)
854 croak ("IO::AIO: pathname arguments must be specified as strings or [wd, path] arrayrefs");
855
856 path = AvARRAY (av)[1];
857 wdob = AvARRAY (av)[0];
858
859 if (SvOK (wdob))
860 { 858 {
859 path = AvARRAY (rv)[1];
860 wdob = AvARRAY (rv)[0];
861
862 if (SvOK (wdob))
863 {
861 *wd = SvAIO_WD (wdob); 864 *wd = SvAIO_WD (wdob);
862 *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 "." */
863 } 876 }
864 else 877 else
865 *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");
866 } 879 }
867 880
868 *pathsv = newSVsv (path); 881 *pathsv = newSVsv (path);
869 *ptr = SvPVbyte_nolen (*pathsv); 882 *ptr = SvPVbyte_nolen (*pathsv);
870} 883}
… …
1429 aio_link = EIO_LINK 1442 aio_link = EIO_LINK
1430 aio_symlink = EIO_SYMLINK 1443 aio_symlink = EIO_SYMLINK
1431 aio_rename = EIO_RENAME 1444 aio_rename = EIO_RENAME
1432 PPCODE: 1445 PPCODE:
1433{ 1446{
1447 eio_wd wd2 = 0;
1434 dREQ; 1448 dREQ;
1435 eio_wd wd2 = 0;
1436 1449
1437 req->type = ix; 1450 req->type = ix;
1438 req_set_path1 (req, oldpath); 1451 req_set_path1 (req, oldpath);
1439 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);
1440 req->int3 = (long)wd2; 1453 req->int3 = (long)wd2;

Diff Legend

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