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.131 by root, Sun Oct 12 22:30:33 2008 UTC vs.
Revision 1.157 by root, Sat Jan 2 12:58:37 2010 UTC

3#include <errno.h> 3#include <errno.h>
4 4
5#include "EXTERN.h" 5#include "EXTERN.h"
6#include "perl.h" 6#include "perl.h"
7#include "XSUB.h" 7#include "XSUB.h"
8
9#include "schmorp.h"
8 10
9#include <stddef.h> 11#include <stddef.h>
10#include <stdlib.h> 12#include <stdlib.h>
11#include <errno.h> 13#include <errno.h>
12#include <sys/types.h> 14#include <sys/types.h>
75 77
76#define EIO_STRUCT_STAT Stat_t 78#define EIO_STRUCT_STAT Stat_t
77 79
78/* use NV for 32 bit perls as it allows larger offsets */ 80/* use NV for 32 bit perls as it allows larger offsets */
79#if IVSIZE >= 8 81#if IVSIZE >= 8
82# define VAL64 IV
80# define SvVAL64 SvIV 83# define SvVAL64 SvIV
84# define newSVval64 newSViv
81#else 85#else
86# define VAL64 NV
82# define SvVAL64 SvNV 87# define SvVAL64 SvNV
88# define newSVval64 newSVnv
83#endif 89#endif
84 90
85/*****************************************************************************/ 91/*****************************************************************************/
86 92
87#if __GNUC__ >= 3 93#if __GNUC__ >= 3
93#define expect_false(expr) expect ((expr) != 0, 0) 99#define expect_false(expr) expect ((expr) != 0, 0)
94#define expect_true(expr) expect ((expr) != 0, 1) 100#define expect_true(expr) expect ((expr) != 0, 1)
95 101
96/*****************************************************************************/ 102/*****************************************************************************/
97 103
98static HV *stash;
99typedef SV SV8; /* byte-sv, used for argument-checking */ 104typedef SV SV8; /* byte-sv, used for argument-checking */
105typedef int aio_rfd; /* read file desriptor */
106typedef int aio_wfd; /* write file descriptor */
100 107
101#define AIO_REQ_KLASS "IO::AIO::REQ" 108static HV *aio_stash, *aio_req_stash, *aio_grp_stash;
102#define AIO_GRP_KLASS "IO::AIO::GRP"
103 109
104#define EIO_REQ_MEMBERS \ 110#define EIO_REQ_MEMBERS \
105 SV *callback; \ 111 SV *callback; \
106 SV *sv1, *sv2; \ 112 SV *sv1, *sv2; \
107 STRLEN stroffset; \ 113 STRLEN stroffset; \
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"
113 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
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)
118 149
127 158
128static SV *on_next_submit; 159static SV *on_next_submit;
129static int next_pri = EIO_PRI_DEFAULT; 160static int next_pri = EIO_PRI_DEFAULT;
130static int max_outstanding; 161static int max_outstanding;
131 162
132static int respipe_osf [2], respipe [2] = { -1, -1 }; 163static s_epipe respipe;
133 164
134static void req_destroy (aio_req req); 165static void req_destroy (aio_req req);
135static void req_cancel (aio_req req); 166static void req_cancel (aio_req req);
136 167
137static void want_poll (void) 168static void want_poll (void)
138{ 169{
139 /* write a dummy byte to the pipe so fh becomes ready */ 170 /* write a dummy byte to the pipe so fh becomes ready */
140 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1); 171 s_epipe_signal (&respipe);
141} 172}
142 173
143static void done_poll (void) 174static void done_poll (void)
144{ 175{
145 /* read any signals sent by the worker threads */ 176 /* read any signals sent by the worker threads */
146 char buf [4]; 177 s_epipe_drain (&respipe);
147 while (respipe_read (respipe [0], buf, 4) == 4)
148 ;
149} 178}
150 179
151/* must be called at most once */ 180/* must be called at most once */
152static SV *req_sv (aio_req req, const char *klass) 181static SV *req_sv (aio_req req, HV *stash)
153{ 182{
154 if (!req->self) 183 if (!req->self)
155 { 184 {
156 req->self = (SV *)newHV (); 185 req->self = (SV *)newHV ();
157 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0); 186 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
158 } 187 }
159 188
160 return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1))); 189 return sv_2mortal (sv_bless (newRV_inc (req->self), stash));
161} 190}
162 191
163static aio_req SvAIO_REQ (SV *sv) 192static aio_req SvAIO_REQ (SV *sv)
164{ 193{
165 MAGIC *mg; 194 MAGIC *mg;
166 195
167 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv)) 196 if (!SvROK (sv)
197 || (SvSTASH (SvRV (sv)) != aio_grp_stash
198 && SvSTASH (SvRV (sv)) != aio_req_stash
199 && !sv_derived_from (sv, "IO::AIO::REQ")))
168 croak ("object of class " AIO_REQ_KLASS " expected"); 200 croak ("object of class IO::AIO::REQ expected");
169 201
170 mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 202 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
171 203
172 return mg ? (aio_req)mg->mg_ptr : 0; 204 return mg ? (aio_req)mg->mg_ptr : 0;
173} 205}
179 dSP; 211 dSP;
180 212
181 ENTER; 213 ENTER;
182 SAVETMPS; 214 SAVETMPS;
183 PUSHMARK (SP); 215 PUSHMARK (SP);
184 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 216 XPUSHs (req_sv (grp, aio_grp_stash));
185 PUTBACK; 217 PUTBACK;
186 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR); 218 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
187 SPAGAIN; 219 SPAGAIN;
188 FREETMPS; 220 FREETMPS;
189 LEAVE; 221 LEAVE;
228 SV *rv = &PL_sv_undef; 260 SV *rv = &PL_sv_undef;
229 261
230 if (req->result >= 0) 262 if (req->result >= 0)
231 { 263 {
232 int i; 264 int i;
233 char *buf = req->ptr2; 265 char *names = (char *)req->ptr2;
266 eio_dirent *ent = (eio_dirent *)req->ptr1; /* might be 0 */
234 AV *av = newAV (); 267 AV *av = newAV ();
235 268
236 av_extend (av, req->result - 1); 269 av_extend (av, req->result - 1);
237 270
238 for (i = 0; i < req->result; ++i) 271 for (i = 0; i < req->result; ++i)
239 { 272 {
240 SV *sv = newSVpv (buf, 0); 273 if (req->int1 & EIO_READDIR_DENTS)
274 {
275 SV *namesv = newSVpvn (names + ent->nameofs, ent->namelen);
241 276
277 if (req->int1 & EIO_READDIR_CUSTOM2)
278 {
279 static SV *sv_type [EIO_DT_MAX + 1]; /* type sv cache */
280 AV *avent = newAV ();
281
282 av_extend (avent, 2);
283
284 if (!sv_type [ent->type])
285 {
286 sv_type [ent->type] = newSViv (ent->type);
287 SvREADONLY_on (sv_type [ent->type]);
288 }
289
290 av_store (avent, 0, namesv);
291 av_store (avent, 1, SvREFCNT_inc (sv_type [ent->type]));
292 av_store (avent, 2, IVSIZE >= 8 ? newSVuv (ent->inode) : newSVnv (ent->inode));
293
294 av_store (av, i, newRV_noinc ((SV *)avent));
295 }
296 else
242 av_store (av, i, sv); 297 av_store (av, i, namesv);
298
299 ++ent;
300 }
301 else
302 {
303 SV *name = newSVpv (names, 0);
304 av_store (av, i, name);
243 buf += SvCUR (sv) + 1; 305 names += SvCUR (name) + 1;
306 }
244 } 307 }
245 308
246 rv = sv_2mortal (newRV_noinc ((SV *)av)); 309 rv = sv_2mortal (newRV_noinc ((SV *)av));
247 } 310 }
248 311
249 PUSHs (rv); 312 PUSHs (rv);
313
314 if (req->int1 & EIO_READDIR_CUSTOM1)
315 XPUSHs (sv_2mortal (newSViv (req->int1 & ~(EIO_READDIR_CUSTOM1 | EIO_READDIR_CUSTOM2))));
250 } 316 }
251 break; 317 break;
252 318
253 case EIO_OPEN: 319 case EIO_OPEN:
254 { 320 {
260 GV *gv = (GV *)sv_newmortal (); 326 GV *gv = (GV *)sv_newmortal ();
261 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR); 327 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
262 char sym [64]; 328 char sym [64];
263 int symlen; 329 int symlen;
264 330
265 symlen = snprintf (sym, sizeof (sym), "fd#%d", req->result); 331 symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
266 gv_init (gv, stash, sym, symlen, 0); 332 gv_init (gv, aio_stash, sym, symlen, 0);
267 333
268 symlen = snprintf ( 334 symlen = snprintf (
269 sym, 335 sym,
270 sizeof (sym), 336 sizeof (sym),
271 "%s&=%d", 337 "%s&=%d",
272 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<", 338 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
273 req->result 339 (int)req->result
274 ); 340 );
275 341
276 if (do_open (gv, sym, symlen, 0, 0, 0, 0)) 342 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
277 fh = (SV *)gv; 343 fh = (SV *)gv;
278 } 344 }
312 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 378 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
313 PUSHs (sv_2mortal (newSViv (req->result))); 379 PUSHs (sv_2mortal (newSViv (req->result)));
314 break; 380 break;
315 381
316 case EIO_READ: 382 case EIO_READ:
383 {
317 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0)); 384 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
318 *SvEND (req->sv2) = 0; 385 *SvEND (req->sv2) = 0;
386 SvPOK_only (req->sv2);
387 SvSETMAGIC (req->sv2);
319 PUSHs (sv_2mortal (newSViv (req->result))); 388 PUSHs (sv_2mortal (newSViv (req->result)));
389 }
320 break; 390 break;
321 391
322 case EIO_DUP2: 392 case EIO_DUP2:
323 if (req->result > 0) 393 if (req->result > 0)
324 req->result = 0; 394 req->result = 0;
370 grp->sv2 = 0; 440 grp->sv2 = 0;
371 441
372 eio_grp_cancel (grp); 442 eio_grp_cancel (grp);
373} 443}
374 444
375#ifdef USE_SOCKETS_AS_HANDLES
376# define TO_SOCKET(x) (win32_get_osfhandle (x))
377#else
378# define TO_SOCKET(x) (x)
379#endif
380
381static void 445static void
382create_respipe (void) 446create_respipe (void)
383{ 447{
384 int old_readfd = respipe [0];
385
386 if (respipe [1] >= 0)
387 respipe_close (TO_SOCKET (respipe [1]));
388
389#ifdef _WIN32
390 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe))
391#else
392 if (pipe (respipe)) 448 if (s_epipe_renew (&respipe))
393#endif
394 croak ("unable to initialize result pipe"); 449 croak ("IO::AIO: unable to initialize result pipe");
395
396 if (old_readfd >= 0)
397 {
398 if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0)
399 croak ("unable to initialize result pipe(2)");
400
401 respipe_close (respipe [0]);
402 respipe [0] = old_readfd;
403 }
404
405#ifdef _WIN32
406 int arg = 1;
407 if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg)
408 || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg))
409#else
410 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
411 || fcntl (respipe [1], F_SETFL, O_NONBLOCK))
412#endif
413 croak ("unable to initialize result pipe(3)");
414
415 respipe_osf [0] = TO_SOCKET (respipe [0]);
416 respipe_osf [1] = TO_SOCKET (respipe [1]);
417} 450}
418 451
419static void poll_wait (void) 452static void poll_wait (void)
420{ 453{
421 fd_set rfd;
422
423 while (eio_nreqs ()) 454 while (eio_nreqs ())
424 { 455 {
425 int size; 456 int size;
426 457
427 X_LOCK (reslock); 458 X_LOCK (reslock);
431 if (size) 462 if (size)
432 return; 463 return;
433 464
434 etp_maybe_start_thread (); 465 etp_maybe_start_thread ();
435 466
436 FD_ZERO (&rfd); 467 s_epipe_wait (&respipe);
437 FD_SET (respipe [0], &rfd);
438
439 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
440 } 468 }
441} 469}
442 470
443static int poll_cb (void) 471static int poll_cb (void)
444{ 472{
462} 490}
463 491
464static SV * 492static SV *
465get_cb (SV *cb_sv) 493get_cb (SV *cb_sv)
466{ 494{
467 HV *st; 495 SvGETMAGIC (cb_sv);
468 GV *gvp; 496 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
469 CV *cv;
470
471 if (!SvOK (cb_sv))
472 return 0;
473
474 cv = sv_2cv (cb_sv, &st, &gvp, 0);
475
476 if (!cv)
477 croak ("IO::AIO callback must be undef or a CODE reference");
478
479 return (SV *)cv;
480} 497}
481 498
482#define dREQ \ 499#define dREQ \
483 SV *cb_cv; \ 500 SV *cb_cv; \
484 aio_req req; \ 501 aio_req req; \
498 PUTBACK; \ 515 PUTBACK; \
499 req_submit (req); \ 516 req_submit (req); \
500 SPAGAIN; \ 517 SPAGAIN; \
501 \ 518 \
502 if (GIMME_V != G_VOID) \ 519 if (GIMME_V != G_VOID) \
503 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 520 XPUSHs (req_sv (req, aio_req_stash));
504 521
505MODULE = IO::AIO PACKAGE = IO::AIO 522MODULE = IO::AIO PACKAGE = IO::AIO
506 523
507PROTOTYPES: ENABLE 524PROTOTYPES: ENABLE
508 525
509BOOT: 526BOOT:
510{ 527{
511 stash = gv_stashpv ("IO::AIO", 1); 528 static const struct {
512 529 const char *name;
513 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 530 IV iv;
514 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 531 } *civ, const_iv[] = {
515 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 532# define const_iv(name, value) { # name, (IV) value },
516 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 533# define const_eio(name) { # name, (IV) EIO_ ## name },
517 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 534 const_iv (EXDEV , EXDEV)
535 const_iv (ENOSYS , ENOSYS)
536 const_iv (O_RDONLY, O_RDONLY)
537 const_iv (O_WRONLY, O_WRONLY)
538 const_iv (O_CREAT , O_CREAT)
539 const_iv (O_TRUNC , O_TRUNC)
518#ifndef _WIN32 540#ifndef _WIN32
519 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 541 const_iv (S_IFIFO , S_IFIFO)
520#endif 542#endif
543 const_iv (FADV_NORMAL , POSIX_FADV_NORMAL)
544 const_iv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL)
545 const_iv (FADV_RANDOM , POSIX_FADV_RANDOM)
546 const_iv (FADV_NOREUSE , POSIX_FADV_NOREUSE)
547 const_iv (FADV_WILLNEED , POSIX_FADV_WILLNEED)
548 const_iv (FADV_DONTNEED , POSIX_FADV_DONTNEED)
521 549
550 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
551 const_eio (SYNC_FILE_RANGE_WRITE)
552 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
553
554 const_eio (READDIR_DENTS)
555 const_eio (READDIR_DIRS_FIRST)
556 const_eio (READDIR_STAT_ORDER)
557 const_eio (READDIR_FOUND_UNKNOWN)
558
559 const_eio (DT_UNKNOWN)
560 const_eio (DT_FIFO)
561 const_eio (DT_CHR)
562 const_eio (DT_DIR)
563 const_eio (DT_BLK)
564 const_eio (DT_REG)
565 const_eio (DT_LNK)
566 const_eio (DT_SOCK)
567 const_eio (DT_WHT)
568 };
569
570 aio_stash = gv_stashpv ("IO::AIO" , 1);
571 aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1);
572 aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1);
573
574 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
575 newCONSTSUB (aio_stash, (char *)civ->name, newSViv (civ->iv));
576
522 create_respipe (); 577 create_respipe ();
523 578
524 if (eio_init (want_poll, done_poll) < 0) 579 if (eio_init (want_poll, done_poll) < 0)
525 croak ("IO::AIO: unable to initialise eio library"); 580 croak ("IO::AIO: unable to initialise eio library");
526 581
527 /* atfork child called in fifo order, so before eio's handler */ 582 /* atfork child called in fifo order, so before eio's handler */
528 X_THREAD_ATFORK (0, 0, atfork_child); 583 X_THREAD_ATFORK (0, 0, atfork_child);
529} 584}
530 585
531void 586void
532max_poll_reqs (int nreqs) 587max_poll_reqs (int nreqs)
533 PROTOTYPE: $ 588 PROTOTYPE: $
586 ALIAS: 641 ALIAS:
587 aio_fsync = EIO_FSYNC 642 aio_fsync = EIO_FSYNC
588 aio_fdatasync = EIO_FDATASYNC 643 aio_fdatasync = EIO_FDATASYNC
589 PPCODE: 644 PPCODE:
590{ 645{
646 int fd = s_fileno_croak (fh, 0);
591 dREQ; 647 dREQ;
592 648
593 req->type = ix; 649 req->type = ix;
594 req->sv1 = newSVsv (fh); 650 req->sv1 = newSVsv (fh);
595 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 651 req->int1 = fd;
652
653 REQ_SEND (req);
654}
655
656void
657aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef)
658 PROTOTYPE: $$$$;$
659 PPCODE:
660{
661 int fd = s_fileno_croak (fh, 0);
662 dREQ;
663
664 req->type = EIO_SYNC_FILE_RANGE;
665 req->sv1 = newSVsv (fh);
666 req->int1 = fd;
667 req->offs = offset;
668 req->size = nbytes;
669 req->int2 = flags;
596 670
597 REQ_SEND (req); 671 REQ_SEND (req);
598} 672}
599 673
600void 674void
601aio_close (SV *fh, SV *callback=&PL_sv_undef) 675aio_close (SV *fh, SV *callback=&PL_sv_undef)
602 PROTOTYPE: $;$ 676 PROTOTYPE: $;$
603 PPCODE: 677 PPCODE:
604{ 678{
605 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 679 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
680 int fd = s_fileno_croak (fh, 0);
606 dREQ; 681 dREQ;
607 682
608 if (close_pipe < 0) 683 if (close_pipe < 0)
609 { 684 {
610 int pipefd [2]; 685 int pipefd [2];
618 } 693 }
619 694
620 req->type = EIO_DUP2; 695 req->type = EIO_DUP2;
621 req->int1 = close_pipe; 696 req->int1 = close_pipe;
622 req->sv2 = newSVsv (fh); 697 req->sv2 = newSVsv (fh);
623 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 698 req->int2 = fd;
624 699
625 REQ_SEND (req); 700 REQ_SEND (req);
626} 701}
627 702
628void 703void
632 aio_write = EIO_WRITE 707 aio_write = EIO_WRITE
633 PROTOTYPE: $$$$$;$ 708 PROTOTYPE: $$$$$;$
634 PPCODE: 709 PPCODE:
635{ 710{
636 STRLEN svlen; 711 STRLEN svlen;
712 int fd = s_fileno_croak (fh, ix == EIO_WRITE);
637 char *svptr = SvPVbyte (data, svlen); 713 char *svptr = SvPVbyte (data, svlen);
638 UV len = SvUV (length); 714 UV len = SvUV (length);
639
640 SvUPGRADE (data, SVt_PV);
641 SvPOK_on (data);
642 715
643 if (dataoffset < 0) 716 if (dataoffset < 0)
644 dataoffset += svlen; 717 dataoffset += svlen;
645 718
646 if (dataoffset < 0 || dataoffset > svlen) 719 if (dataoffset < 0 || dataoffset > svlen)
652 if (!SvOK (length) || len + dataoffset > svlen) 725 if (!SvOK (length) || len + dataoffset > svlen)
653 len = svlen - dataoffset; 726 len = svlen - dataoffset;
654 } 727 }
655 else 728 else
656 { 729 {
657 /* read: grow scalar as necessary */ 730 /* read: check type and grow scalar as necessary */
731 SvUPGRADE (data, SVt_PV);
658 svptr = SvGROW (data, len + dataoffset + 1); 732 svptr = SvGROW (data, len + dataoffset + 1);
659 } 733 }
660
661 if (len < 0)
662 croak ("length must not be negative");
663 734
664 { 735 {
665 dREQ; 736 dREQ;
666 737
667 req->type = ix; 738 req->type = ix;
668 req->sv1 = newSVsv (fh); 739 req->sv1 = newSVsv (fh);
669 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 740 req->int1 = fd;
670 : IoOFP (sv_2io (fh)));
671 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 741 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
672 req->size = len; 742 req->size = len;
673 req->sv2 = SvREFCNT_inc_NN (data); 743 req->sv2 = SvREFCNT_inc (data);
674 req->ptr2 = (char *)svptr + dataoffset; 744 req->ptr2 = (char *)svptr + dataoffset;
675 req->stroffset = dataoffset; 745 req->stroffset = dataoffset;
676 746
677 if (!SvREADONLY (data)) 747 if (!SvREADONLY (data))
678 { 748 {
698 768
699 REQ_SEND; 769 REQ_SEND;
700} 770}
701 771
702void 772void
703aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef) 773aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef)
704 PROTOTYPE: $$$$;$ 774 PROTOTYPE: $$$$;$
705 PPCODE: 775 PPCODE:
706{ 776{
777 int ifd = s_fileno_croak (in_fh , 0);
778 int ofd = s_fileno_croak (out_fh, 1);
707 dREQ; 779 dREQ;
708 780
709 req->type = EIO_SENDFILE; 781 req->type = EIO_SENDFILE;
710 req->sv1 = newSVsv (out_fh); 782 req->sv1 = newSVsv (out_fh);
711 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 783 req->int1 = ofd;
712 req->sv2 = newSVsv (in_fh); 784 req->sv2 = newSVsv (in_fh);
713 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 785 req->int2 = ifd;
714 req->offs = SvVAL64 (in_offset); 786 req->offs = in_offset;
715 req->size = length; 787 req->size = length;
716 788
717 REQ_SEND; 789 REQ_SEND;
718} 790}
719 791
720void 792void
721aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef) 793aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef)
722 PROTOTYPE: $$$;$ 794 PROTOTYPE: $$$;$
723 PPCODE: 795 PPCODE:
724{ 796{
797 int fd = s_fileno_croak (fh, 0);
725 dREQ; 798 dREQ;
726 799
727 req->type = EIO_READAHEAD; 800 req->type = EIO_READAHEAD;
728 req->sv1 = newSVsv (fh); 801 req->sv1 = newSVsv (fh);
729 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 802 req->int1 = fd;
730 req->offs = SvVAL64 (offset); 803 req->offs = offset;
731 req->size = length; 804 req->size = length;
732 805
733 REQ_SEND; 806 REQ_SEND;
734} 807}
735 808
851 req->type = EIO_FCHOWN; 924 req->type = EIO_FCHOWN;
852 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 925 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
853 } 926 }
854 927
855 REQ_SEND; 928 REQ_SEND;
929}
930
931void
932aio_readdirx (SV8 *pathname, IV flags, SV *callback=&PL_sv_undef)
933 PPCODE:
934{
935 dREQ;
936
937 req->type = EIO_READDIR;
938 req->sv1 = newSVsv (pathname);
939 req->ptr1 = SvPVbyte_nolen (req->sv1);
940 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
941
942 if (flags & EIO_READDIR_DENTS)
943 req->int1 |= EIO_READDIR_CUSTOM2;
944
945 REQ_SEND;
856} 946}
857 947
858void 948void
859aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 949aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
860 ALIAS: 950 ALIAS:
926 dREQ; 1016 dREQ;
927 1017
928 req->type = EIO_GROUP; 1018 req->type = EIO_GROUP;
929 1019
930 req_submit (req); 1020 req_submit (req);
931 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1021 XPUSHs (req_sv (req, aio_grp_stash));
932} 1022}
933 1023
934void 1024void
935aio_nop (SV *callback=&PL_sv_undef) 1025aio_nop (SV *callback=&PL_sv_undef)
936 ALIAS: 1026 ALIAS:
988 1078
989int 1079int
990poll_fileno() 1080poll_fileno()
991 PROTOTYPE: 1081 PROTOTYPE:
992 CODE: 1082 CODE:
993 RETVAL = respipe [0]; 1083 RETVAL = s_epipe_fd (&respipe);
994 OUTPUT: 1084 OUTPUT:
995 RETVAL 1085 RETVAL
996 1086
997int 1087int
998poll_cb(...) 1088poll_cb(...)
1038 CODE: 1128 CODE:
1039 RETVAL = eio_nthreads (); 1129 RETVAL = eio_nthreads ();
1040 OUTPUT: 1130 OUTPUT:
1041 RETVAL 1131 RETVAL
1042 1132
1133int
1134fadvise (aio_rfd fh, off_t offset, off_t length, IV advice)
1135 PROTOTYPE: $$$$
1136 CODE:
1137#if _XOPEN_SOURCE >= 600 && !NO_FADVISE
1138 RETVAL = posix_fadvise (fh, offset, length, advice);
1139#else
1140 RETVAL = errno = ENOSYS;
1141#endif
1142 OUTPUT:
1143 RETVAL
1144
1145ssize_t
1146sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
1147 PROTOTYPE: $$$$
1148 CODE:
1149 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count);
1150 OUTPUT:
1151 RETVAL
1152
1043void _on_next_submit (SV *cb) 1153void _on_next_submit (SV *cb)
1044 CODE: 1154 CODE:
1045 SvREFCNT_dec (on_next_submit); 1155 SvREFCNT_dec (on_next_submit);
1046 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1156 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1047 1157
1061 if (GIMME_V != G_VOID) 1171 if (GIMME_V != G_VOID)
1062 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef); 1172 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1063 1173
1064 if (items > 1) 1174 if (items > 1)
1065 { 1175 {
1066 SV *cb_cv = get_cb (callback); 1176 SV *cb_cv =get_cb (callback);
1067 1177
1068 SvREFCNT_dec (req->callback); 1178 SvREFCNT_dec (req->callback);
1069 req->callback = SvREFCNT_inc (cb_cv); 1179 req->callback = SvREFCNT_inc (cb_cv);
1070 } 1180 }
1071} 1181}
1108 AV *av; 1218 AV *av;
1109 1219
1110 grp->errorno = errno; 1220 grp->errorno = errno;
1111 1221
1112 av = newAV (); 1222 av = newAV ();
1223 av_extend (av, items - 1);
1113 1224
1114 for (i = 1; i < items; ++i ) 1225 for (i = 1; i < items; ++i )
1115 av_push (av, newSVsv (ST (i))); 1226 av_push (av, newSVsv (ST (i)));
1116 1227
1117 SvREFCNT_dec (grp->sv1); 1228 SvREFCNT_dec (grp->sv1);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines