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.145 by root, Fri Jun 12 16:55:17 2009 UTC vs.
Revision 1.149 by root, Tue Jun 30 07:33:58 2009 UTC

… …
75 75
76#define EIO_STRUCT_STAT Stat_t 76#define EIO_STRUCT_STAT Stat_t
77 77
78/* use NV for 32 bit perls as it allows larger offsets */ 78/* use NV for 32 bit perls as it allows larger offsets */
79#if IVSIZE >= 8 79#if IVSIZE >= 8
80# define VAL64 IV
80# define SvVAL64 SvIV 81# define SvVAL64 SvIV
82# define newSVval64 newSViv
81#else 83#else
84# define VAL64 NV
82# define SvVAL64 SvNV 85# define SvVAL64 SvNV
86# define newSVval64 newSVnv
83#endif 87#endif
84 88
85/*****************************************************************************/ 89/*****************************************************************************/
86 90
87#if __GNUC__ >= 3 91#if __GNUC__ >= 3
… …
95 99
96/*****************************************************************************/ 100/*****************************************************************************/
97 101
98static HV *stash; 102static HV *stash;
99typedef SV SV8; /* byte-sv, used for argument-checking */ 103typedef SV SV8; /* byte-sv, used for argument-checking */
104typedef int aio_rfd; /* read file desriptor */
105typedef int aio_wfd; /* write file descriptor */
100 106
101#define AIO_REQ_KLASS "IO::AIO::REQ" 107#define AIO_REQ_KLASS "IO::AIO::REQ"
102#define AIO_GRP_KLASS "IO::AIO::GRP" 108#define AIO_GRP_KLASS "IO::AIO::GRP"
103 109
104#define EIO_REQ_MEMBERS \ 110#define EIO_REQ_MEMBERS \
… …
108 SV *self; 114 SV *self;
109 115
110#define EIO_NO_WRAPPERS 1 116#define EIO_NO_WRAPPERS 1
111 117
112#include "libeio/eio.h" 118#include "libeio/eio.h"
119
120#ifndef POSIX_FADV_NORMAL
121# define POSIX_FADV_NORMAL 0
122# define NO_FADVISE 1
123#endif
124
125#ifndef POSIX_FADV_SEQUENTIAL
126# define POSIX_FADV_SEQUENTIAL 0
127#endif
128
129#ifndef POSIX_FADV_RANDOM
130# define POSIX_FADV_RANDOM 0
131#endif
132
133#ifndef POSIX_FADV_NOREUSE
134# define POSIX_FADV_NOREUSE 0
135#endif
136
137#ifndef POSIX_FADV_WILLNEED
138# define POSIX_FADV_WILLNEED 0
139#endif
140
141#ifndef POSIX_FADV_DONTNEED
142# define POSIX_FADV_DONTNEED 0
143#endif
113 144
114static int req_invoke (eio_req *req); 145static int req_invoke (eio_req *req);
115#define EIO_FINISH(req) req_invoke (req) 146#define EIO_FINISH(req) req_invoke (req)
116static void req_destroy (eio_req *grp); 147static void req_destroy (eio_req *grp);
117#define EIO_DESTROY(req) req_destroy (req) 148#define EIO_DESTROY(req) req_destroy (req)
… …
228 SV *rv = &PL_sv_undef; 259 SV *rv = &PL_sv_undef;
229 260
230 if (req->result >= 0) 261 if (req->result >= 0)
231 { 262 {
232 int i; 263 int i;
233 char *buf = req->ptr2; 264 char *names = (char *)req->ptr2;
265 eio_dirent *ent = (eio_dirent *)req->ptr1; /* might be 0 */
234 AV *av = newAV (); 266 AV *av = newAV ();
235 267
236 av_extend (av, req->result - 1); 268 av_extend (av, req->result - 1);
237 269
238 for (i = 0; i < req->result; ++i) 270 for (i = 0; i < req->result; ++i)
239 { 271 {
240 if (req->int1 & EIO_READDIR_DENTS) 272 if (req->int1 & EIO_READDIR_DENTS)
241 { 273 {
242 eio_dirent *ent = (eio_dirent *)buf;
243 SV *namesv = newSVpvn (ent->name, ent->namelen); 274 SV *namesv = newSVpvn (names + ent->nameofs, ent->namelen);
244 275
245 if (req->int1 & EIO_READDIR_CUSTOM2) 276 if (req->int1 & EIO_READDIR_CUSTOM2)
246 { 277 {
247 static SV *sv_type [EIO_DT_MAX + 1]; /* type sv cache */ 278 static SV *sv_type [EIO_DT_MAX + 1]; /* type sv cache */
248 AV *avent = newAV (); 279 AV *avent = newAV ();
… …
262 av_store (av, i, newRV_noinc ((SV *)avent)); 293 av_store (av, i, newRV_noinc ((SV *)avent));
263 } 294 }
264 else 295 else
265 av_store (av, i, namesv); 296 av_store (av, i, namesv);
266 297
267 buf += sizeof (eio_dirent); 298 ++ent;
268 } 299 }
269 else 300 else
270 { 301 {
271 SV *name = newSVpv (buf, 0); 302 SV *name = newSVpv (names, 0);
272 av_store (av, i, name); 303 av_store (av, i, name);
273 buf += SvCUR (name) + 1; 304 names += SvCUR (name) + 1;
274 } 305 }
275 } 306 }
276 307
277 rv = sv_2mortal (newRV_noinc ((SV *)av)); 308 rv = sv_2mortal (newRV_noinc ((SV *)av));
278 } 309 }
… …
294 GV *gv = (GV *)sv_newmortal (); 325 GV *gv = (GV *)sv_newmortal ();
295 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR); 326 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
296 char sym [64]; 327 char sym [64];
297 int symlen; 328 int symlen;
298 329
299 symlen = snprintf (sym, sizeof (sym), "fd#%u", (unsigned int)req->result); 330 symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
300 gv_init (gv, stash, sym, symlen, 0); 331 gv_init (gv, stash, sym, symlen, 0);
301 332
302 symlen = snprintf ( 333 symlen = snprintf (
303 sym, 334 sym,
304 sizeof (sym), 335 sizeof (sym),
305 "%s&=%u", 336 "%s&=%d",
306 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<", 337 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
307 (unsigned int)req->result 338 (int)req->result
308 ); 339 );
309 340
310 if (do_open (gv, sym, symlen, 0, 0, 0, 0)) 341 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
311 fh = (SV *)gv; 342 fh = (SV *)gv;
312 } 343 }
… …
555 586
556PROTOTYPES: ENABLE 587PROTOTYPES: ENABLE
557 588
558BOOT: 589BOOT:
559{ 590{
560 HV *stash = gv_stashpv ("IO::AIO", 1);
561
562 static const struct { 591 static const struct {
563 const char *name; 592 const char *name;
564 IV iv; 593 IV iv;
565 } *civ, const_iv[] = { 594 } *civ, const_iv[] = {
566# define const_iv(name, value) { # name, (IV) value }, 595# define const_iv(name, value) { # name, (IV) value },
… …
572 const_iv (O_CREAT , O_CREAT) 601 const_iv (O_CREAT , O_CREAT)
573 const_iv (O_TRUNC , O_TRUNC) 602 const_iv (O_TRUNC , O_TRUNC)
574#ifndef _WIN32 603#ifndef _WIN32
575 const_iv (S_IFIFO , S_IFIFO) 604 const_iv (S_IFIFO , S_IFIFO)
576#endif 605#endif
606 const_iv (FADV_NORMAL , POSIX_FADV_NORMAL)
607 const_iv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL)
608 const_iv (FADV_RANDOM , POSIX_FADV_RANDOM)
609 const_iv (FADV_NOREUSE , POSIX_FADV_NOREUSE)
610 const_iv (FADV_WILLNEED , POSIX_FADV_WILLNEED)
611 const_iv (FADV_DONTNEED , POSIX_FADV_DONTNEED)
612
577 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE) 613 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
578 const_eio (SYNC_FILE_RANGE_WRITE) 614 const_eio (SYNC_FILE_RANGE_WRITE)
579 const_eio (SYNC_FILE_RANGE_WAIT_AFTER) 615 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
580 616
581 const_eio (READDIR_DENTS) 617 const_eio (READDIR_DENTS)
… …
592 const_eio (DT_LNK) 628 const_eio (DT_LNK)
593 const_eio (DT_SOCK) 629 const_eio (DT_SOCK)
594 const_eio (DT_WHT) 630 const_eio (DT_WHT)
595 }; 631 };
596 632
633 stash = gv_stashpv ("IO::AIO", 1);
634
597 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 635 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
598 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 636 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
599 637
600 create_respipe (); 638 create_respipe ();
601 639
… …
675 713
676 REQ_SEND (req); 714 REQ_SEND (req);
677} 715}
678 716
679void 717void
680aio_sync_file_range (SV *fh, SV *offset, SV *nbytes, IV flags, SV *callback=&PL_sv_undef) 718aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef)
681 PROTOTYPE: $$$$;$ 719 PROTOTYPE: $$$$;$
682 PPCODE: 720 PPCODE:
683{ 721{
684 int fd = extract_fd (fh, 0); 722 int fd = extract_fd (fh, 0);
685 dREQ; 723 dREQ;
686 724
687 req->type = EIO_SYNC_FILE_RANGE; 725 req->type = EIO_SYNC_FILE_RANGE;
688 req->sv1 = newSVsv (fh); 726 req->sv1 = newSVsv (fh);
689 req->int1 = fd; 727 req->int1 = fd;
690 req->offs = SvVAL64 (offset); 728 req->offs = offset;
691 req->size = SvVAL64 (nbytes); 729 req->size = nbytes;
692 req->int2 = flags; 730 req->int2 = flags;
693 731
694 REQ_SEND (req); 732 REQ_SEND (req);
695} 733}
696 734
… …
791 829
792 REQ_SEND; 830 REQ_SEND;
793} 831}
794 832
795void 833void
796aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef) 834aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef)
797 PROTOTYPE: $$$$;$ 835 PROTOTYPE: $$$$;$
798 PPCODE: 836 PPCODE:
799{ 837{
800 int ifd = extract_fd (in_fh , 0); 838 int ifd = extract_fd (in_fh , 0);
801 int ofd = extract_fd (out_fh, 0); 839 int ofd = extract_fd (out_fh, 0);
… …
804 req->type = EIO_SENDFILE; 842 req->type = EIO_SENDFILE;
805 req->sv1 = newSVsv (out_fh); 843 req->sv1 = newSVsv (out_fh);
806 req->int1 = ofd; 844 req->int1 = ofd;
807 req->sv2 = newSVsv (in_fh); 845 req->sv2 = newSVsv (in_fh);
808 req->int2 = ifd; 846 req->int2 = ifd;
809 req->offs = SvVAL64 (in_offset); 847 req->offs = in_offset;
810 req->size = length; 848 req->size = length;
811 849
812 REQ_SEND; 850 REQ_SEND;
813} 851}
814 852
815void 853void
816aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef) 854aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef)
817 PROTOTYPE: $$$;$ 855 PROTOTYPE: $$$;$
818 PPCODE: 856 PPCODE:
819{ 857{
820 int fd = extract_fd (fh, 0); 858 int fd = extract_fd (fh, 0);
821 dREQ; 859 dREQ;
822 860
823 req->type = EIO_READAHEAD; 861 req->type = EIO_READAHEAD;
824 req->sv1 = newSVsv (fh); 862 req->sv1 = newSVsv (fh);
825 req->int1 = fd; 863 req->int1 = fd;
826 req->offs = SvVAL64 (offset); 864 req->offs = offset;
827 req->size = length; 865 req->size = length;
828 866
829 REQ_SEND; 867 REQ_SEND;
830} 868}
831 869
… …
1151 CODE: 1189 CODE:
1152 RETVAL = eio_nthreads (); 1190 RETVAL = eio_nthreads ();
1153 OUTPUT: 1191 OUTPUT:
1154 RETVAL 1192 RETVAL
1155 1193
1194int
1195fadvise (aio_rfd fh, off_t offset, off_t length, IV advice)
1196 PROTOTYPE: $$$$
1197 CODE:
1198{
1199 #if _XOPEN_SOURCE >= 600 && !NO_FADVISE
1200 RETVAL = posix_fadvise (fh, offset, length, advice);
1201 #else
1202 RETVAL = errno = ENOSYS;
1203 #endif
1204}
1205 OUTPUT:
1206 RETVAL
1207
1208ssize_t
1209sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
1210 PROTOTYPE: $$$$
1211 CODE:
1212 eio_sendfile_sync (ofh, ifh, offset, count);
1213
1156void _on_next_submit (SV *cb) 1214void _on_next_submit (SV *cb)
1157 CODE: 1215 CODE:
1158 SvREFCNT_dec (on_next_submit); 1216 SvREFCNT_dec (on_next_submit);
1159 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1217 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1160 1218

Diff Legend

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