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.136 by root, Sun Apr 19 13:15:55 2009 UTC vs.
Revision 1.153 by root, Wed Jul 15 01:36:04 2009 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
95 101
96/*****************************************************************************/ 102/*****************************************************************************/
97 103
98static HV *stash; 104static HV *stash;
99typedef SV SV8; /* byte-sv, used for argument-checking */ 105typedef SV SV8; /* byte-sv, used for argument-checking */
106typedef int aio_rfd; /* read file desriptor */
107typedef int aio_wfd; /* write file descriptor */
100 108
101#define AIO_REQ_KLASS "IO::AIO::REQ" 109#define AIO_REQ_KLASS "IO::AIO::REQ"
102#define AIO_GRP_KLASS "IO::AIO::GRP" 110#define AIO_GRP_KLASS "IO::AIO::GRP"
103 111
104#define EIO_REQ_MEMBERS \ 112#define EIO_REQ_MEMBERS \
109 117
110#define EIO_NO_WRAPPERS 1 118#define EIO_NO_WRAPPERS 1
111 119
112#include "libeio/eio.h" 120#include "libeio/eio.h"
113 121
122#ifndef POSIX_FADV_NORMAL
123# define POSIX_FADV_NORMAL 0
124# define NO_FADVISE 1
125#endif
126
127#ifndef POSIX_FADV_SEQUENTIAL
128# define POSIX_FADV_SEQUENTIAL 0
129#endif
130
131#ifndef POSIX_FADV_RANDOM
132# define POSIX_FADV_RANDOM 0
133#endif
134
135#ifndef POSIX_FADV_NOREUSE
136# define POSIX_FADV_NOREUSE 0
137#endif
138
139#ifndef POSIX_FADV_WILLNEED
140# define POSIX_FADV_WILLNEED 0
141#endif
142
143#ifndef POSIX_FADV_DONTNEED
144# define POSIX_FADV_DONTNEED 0
145#endif
146
114static int req_invoke (eio_req *req); 147static int req_invoke (eio_req *req);
115#define EIO_FINISH(req) req_invoke (req) 148#define EIO_FINISH(req) req_invoke (req)
116static void req_destroy (eio_req *grp); 149static void req_destroy (eio_req *grp);
117#define EIO_DESTROY(req) req_destroy (req) 150#define EIO_DESTROY(req) req_destroy (req)
118 151
127 160
128static SV *on_next_submit; 161static SV *on_next_submit;
129static int next_pri = EIO_PRI_DEFAULT; 162static int next_pri = EIO_PRI_DEFAULT;
130static int max_outstanding; 163static int max_outstanding;
131 164
132static int respipe_osf [2], respipe [2] = { -1, -1 }; 165static int respipe_osf [2];
166static s_epipe respipe;
133 167
134static void req_destroy (aio_req req); 168static void req_destroy (aio_req req);
135static void req_cancel (aio_req req); 169static void req_cancel (aio_req req);
136 170
137static void want_poll (void) 171static void want_poll (void)
138{ 172{
139 /* write a dummy byte to the pipe so fh becomes ready */ 173 /* write a dummy byte to the pipe so fh becomes ready */
140 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1); 174 s_epipe_signal (&respipe);
141} 175}
142 176
143static void done_poll (void) 177static void done_poll (void)
144{ 178{
145 /* read any signals sent by the worker threads */ 179 /* read any signals sent by the worker threads */
146 char buf [4]; 180 s_epipe_drain (&respipe);
147 while (respipe_read (respipe [0], buf, 4) == 4)
148 ;
149} 181}
150 182
151/* must be called at most once */ 183/* must be called at most once */
152static SV *req_sv (aio_req req, const char *klass) 184static SV *req_sv (aio_req req, const char *klass)
153{ 185{
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, 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 ("unable to initialize result pipe");
395 450
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]); 451 respipe_osf [0] = S_TO_SOCKET (respipe.fd [0]);
416 respipe_osf [1] = TO_SOCKET (respipe [1]); 452 respipe_osf [1] = S_TO_SOCKET (respipe.fd [1]);
417} 453}
418 454
419static void poll_wait (void) 455static void poll_wait (void)
420{ 456{
421 fd_set rfd;
422
423 while (eio_nreqs ()) 457 while (eio_nreqs ())
424 { 458 {
425 int size; 459 int size;
426 460
427 X_LOCK (reslock); 461 X_LOCK (reslock);
431 if (size) 465 if (size)
432 return; 466 return;
433 467
434 etp_maybe_start_thread (); 468 etp_maybe_start_thread ();
435 469
436 FD_ZERO (&rfd); 470 s_epipe_wait (&respipe);
437 FD_SET (respipe [0], &rfd);
438
439 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
440 } 471 }
441} 472}
442 473
443static int poll_cb (void) 474static int poll_cb (void)
444{ 475{
462} 493}
463 494
464static SV * 495static SV *
465get_cb (SV *cb_sv) 496get_cb (SV *cb_sv)
466{ 497{
467 HV *st; 498 SvGETMAGIC (cb_sv);
468 GV *gvp; 499 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} 500}
481 501
482#define dREQ \ 502#define dREQ \
483 SV *cb_cv; \ 503 SV *cb_cv; \
484 aio_req req; \ 504 aio_req req; \
500 SPAGAIN; \ 520 SPAGAIN; \
501 \ 521 \
502 if (GIMME_V != G_VOID) \ 522 if (GIMME_V != G_VOID) \
503 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 523 XPUSHs (req_sv (req, AIO_REQ_KLASS));
504 524
505static int
506extract_fd (SV *fh, int wr)
507{
508 int fd = PerlIO_fileno (wr ? IoOFP (sv_2io (fh)) : IoIFP (sv_2io (fh)));
509
510 if (fd < 0)
511 croak ("illegal fh argument, either not an OS file or read/write mode mismatch");
512
513 return fd;
514}
515
516MODULE = IO::AIO PACKAGE = IO::AIO 525MODULE = IO::AIO PACKAGE = IO::AIO
517 526
518PROTOTYPES: ENABLE 527PROTOTYPES: ENABLE
519 528
520BOOT: 529BOOT:
521{ 530{
522 stash = gv_stashpv ("IO::AIO", 1); 531 static const struct {
523 532 const char *name;
524 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 533 IV iv;
525 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 534 } *civ, const_iv[] = {
526 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 535# define const_iv(name, value) { # name, (IV) value },
527 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 536# define const_eio(name) { # name, (IV) EIO_ ## name },
528 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 537 const_iv (EXDEV , EXDEV)
538 const_iv (ENOSYS , ENOSYS)
539 const_iv (O_RDONLY, O_RDONLY)
540 const_iv (O_WRONLY, O_WRONLY)
541 const_iv (O_CREAT , O_CREAT)
542 const_iv (O_TRUNC , O_TRUNC)
529#ifndef _WIN32 543#ifndef _WIN32
530 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 544 const_iv (S_IFIFO , S_IFIFO)
531#endif 545#endif
532 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 546 const_iv (FADV_NORMAL , POSIX_FADV_NORMAL)
533 newCONSTSUB (stash, "SYNC_FILE_RANGE_WAIT_BEFORE", newSViv (EIO_SYNC_FILE_RANGE_WAIT_BEFORE)); 547 const_iv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL)
534 newCONSTSUB (stash, "SYNC_FILE_RANGE_WRITE" , newSViv (EIO_SYNC_FILE_RANGE_WRITE)); 548 const_iv (FADV_RANDOM , POSIX_FADV_RANDOM)
535 newCONSTSUB (stash, "SYNC_FILE_RANGE_WAIT_AFTER" , newSViv (EIO_SYNC_FILE_RANGE_WAIT_AFTER)); 549 const_iv (FADV_NOREUSE , POSIX_FADV_NOREUSE)
550 const_iv (FADV_WILLNEED , POSIX_FADV_WILLNEED)
551 const_iv (FADV_DONTNEED , POSIX_FADV_DONTNEED)
536 552
553 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
554 const_eio (SYNC_FILE_RANGE_WRITE)
555 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
556
557 const_eio (READDIR_DENTS)
558 const_eio (READDIR_DIRS_FIRST)
559 const_eio (READDIR_STAT_ORDER)
560 const_eio (READDIR_FOUND_UNKNOWN)
561
562 const_eio (DT_UNKNOWN)
563 const_eio (DT_FIFO)
564 const_eio (DT_CHR)
565 const_eio (DT_DIR)
566 const_eio (DT_BLK)
567 const_eio (DT_REG)
568 const_eio (DT_LNK)
569 const_eio (DT_SOCK)
570 const_eio (DT_WHT)
571 };
572
573 stash = gv_stashpv ("IO::AIO", 1);
574
575 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
576 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
577
537 create_respipe (); 578 create_respipe ();
538 579
539 if (eio_init (want_poll, done_poll) < 0) 580 if (eio_init (want_poll, done_poll) < 0)
540 croak ("IO::AIO: unable to initialise eio library"); 581 croak ("IO::AIO: unable to initialise eio library");
541 582
542 /* atfork child called in fifo order, so before eio's handler */ 583 /* atfork child called in fifo order, so before eio's handler */
543 X_THREAD_ATFORK (0, 0, atfork_child); 584 X_THREAD_ATFORK (0, 0, atfork_child);
544} 585}
545 586
546void 587void
547max_poll_reqs (int nreqs) 588max_poll_reqs (int nreqs)
548 PROTOTYPE: $ 589 PROTOTYPE: $
601 ALIAS: 642 ALIAS:
602 aio_fsync = EIO_FSYNC 643 aio_fsync = EIO_FSYNC
603 aio_fdatasync = EIO_FDATASYNC 644 aio_fdatasync = EIO_FDATASYNC
604 PPCODE: 645 PPCODE:
605{ 646{
606 int fd = extract_fd (fh, 0); 647 int fd = s_fileno_croak (fh, 0);
607 dREQ; 648 dREQ;
608 649
609 req->type = ix; 650 req->type = ix;
610 req->sv1 = newSVsv (fh); 651 req->sv1 = newSVsv (fh);
611 req->int1 = fd; 652 req->int1 = fd;
612 653
613 REQ_SEND (req); 654 REQ_SEND (req);
614} 655}
615 656
616void 657void
617aio_sync_file_range (SV *fh, SV *offset, SV *nbytes, IV flags, SV *callback=&PL_sv_undef) 658aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef)
618 PROTOTYPE: $$$$;$ 659 PROTOTYPE: $$$$;$
619 PPCODE: 660 PPCODE:
620{ 661{
621 int fd = extract_fd (fh, 0); 662 int fd = s_fileno_croak (fh, 0);
622 dREQ; 663 dREQ;
623 664
624 req->type = EIO_SYNC_FILE_RANGE; 665 req->type = EIO_SYNC_FILE_RANGE;
625 req->sv1 = newSVsv (fh); 666 req->sv1 = newSVsv (fh);
626 req->int1 = fd; 667 req->int1 = fd;
627 req->offs = SvVAL64 (offset); 668 req->offs = offset;
628 req->size = SvVAL64 (nbytes); 669 req->size = nbytes;
629 req->int2 = flags; 670 req->int2 = flags;
630 671
631 REQ_SEND (req); 672 REQ_SEND (req);
632} 673}
633 674
635aio_close (SV *fh, SV *callback=&PL_sv_undef) 676aio_close (SV *fh, SV *callback=&PL_sv_undef)
636 PROTOTYPE: $;$ 677 PROTOTYPE: $;$
637 PPCODE: 678 PPCODE:
638{ 679{
639 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 680 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
640 int fd = extract_fd (fh, 0); 681 int fd = s_fileno_croak (fh, 0);
641 dREQ; 682 dREQ;
642 683
643 if (close_pipe < 0) 684 if (close_pipe < 0)
644 { 685 {
645 int pipefd [2]; 686 int pipefd [2];
667 aio_write = EIO_WRITE 708 aio_write = EIO_WRITE
668 PROTOTYPE: $$$$$;$ 709 PROTOTYPE: $$$$$;$
669 PPCODE: 710 PPCODE:
670{ 711{
671 STRLEN svlen; 712 STRLEN svlen;
713 int fd = s_fileno_croak (fh, ix == EIO_WRITE);
672 char *svptr = SvPVbyte (data, svlen); 714 char *svptr = SvPVbyte (data, svlen);
673 UV len = SvUV (length); 715 UV len = SvUV (length);
674 int fd;
675
676 if (SvTYPE (data) > SVt_PVMG)
677 croak ("illegal data argument '%s', must be plain scalar string", SvPV_nolen (data));
678
679 SvUPGRADE (data, SVt_PV);
680 SvPOK_only (data);
681 716
682 if (dataoffset < 0) 717 if (dataoffset < 0)
683 dataoffset += svlen; 718 dataoffset += svlen;
684 719
685 if (dataoffset < 0 || dataoffset > svlen) 720 if (dataoffset < 0 || dataoffset > svlen)
691 if (!SvOK (length) || len + dataoffset > svlen) 726 if (!SvOK (length) || len + dataoffset > svlen)
692 len = svlen - dataoffset; 727 len = svlen - dataoffset;
693 } 728 }
694 else 729 else
695 { 730 {
696 /* read: grow scalar as necessary */ 731 /* read: check type and grow scalar as necessary */
732 SvUPGRADE (data, SVt_PV);
697 svptr = SvGROW (data, len + dataoffset + 1); 733 svptr = SvGROW (data, len + dataoffset + 1);
698 } 734 }
699
700 if (len < 0)
701 croak ("length must not be negative");
702
703 fd = extract_fd (fh, ix == EIO_WRITE);
704 735
705 { 736 {
706 dREQ; 737 dREQ;
707 738
708 req->type = ix; 739 req->type = ix;
738 769
739 REQ_SEND; 770 REQ_SEND;
740} 771}
741 772
742void 773void
743aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef) 774aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef)
744 PROTOTYPE: $$$$;$ 775 PROTOTYPE: $$$$;$
745 PPCODE: 776 PPCODE:
746{ 777{
747 int ifd = extract_fd (in_fh , 0); 778 int ifd = s_fileno_croak (in_fh , 0);
748 int ofd = extract_fd (out_fh, 0); 779 int ofd = s_fileno_croak (out_fh, 1);
749 dREQ; 780 dREQ;
750 781
751 req->type = EIO_SENDFILE; 782 req->type = EIO_SENDFILE;
752 req->sv1 = newSVsv (out_fh); 783 req->sv1 = newSVsv (out_fh);
753 req->int1 = ofd; 784 req->int1 = ofd;
754 req->sv2 = newSVsv (in_fh); 785 req->sv2 = newSVsv (in_fh);
755 req->int2 = ifd; 786 req->int2 = ifd;
756 req->offs = SvVAL64 (in_offset); 787 req->offs = in_offset;
757 req->size = length; 788 req->size = length;
758 789
759 REQ_SEND; 790 REQ_SEND;
760} 791}
761 792
762void 793void
763aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef) 794aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef)
764 PROTOTYPE: $$$;$ 795 PROTOTYPE: $$$;$
765 PPCODE: 796 PPCODE:
766{ 797{
767 int fd = extract_fd (fh, 0); 798 int fd = s_fileno_croak (fh, 0);
768 dREQ; 799 dREQ;
769 800
770 req->type = EIO_READAHEAD; 801 req->type = EIO_READAHEAD;
771 req->sv1 = newSVsv (fh); 802 req->sv1 = newSVsv (fh);
772 req->int1 = fd; 803 req->int1 = fd;
773 req->offs = SvVAL64 (offset); 804 req->offs = offset;
774 req->size = length; 805 req->size = length;
775 806
776 REQ_SEND; 807 REQ_SEND;
777} 808}
778 809
894 req->type = EIO_FCHOWN; 925 req->type = EIO_FCHOWN;
895 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 926 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
896 } 927 }
897 928
898 REQ_SEND; 929 REQ_SEND;
930}
931
932void
933aio_readdirx (SV8 *pathname, IV flags, SV *callback=&PL_sv_undef)
934 PPCODE:
935{
936 dREQ;
937
938 req->type = EIO_READDIR;
939 req->sv1 = newSVsv (pathname);
940 req->ptr1 = SvPVbyte_nolen (req->sv1);
941 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
942
943 if (flags & EIO_READDIR_DENTS)
944 req->int1 |= EIO_READDIR_CUSTOM2;
945
946 REQ_SEND;
899} 947}
900 948
901void 949void
902aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 950aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
903 ALIAS: 951 ALIAS:
1031 1079
1032int 1080int
1033poll_fileno() 1081poll_fileno()
1034 PROTOTYPE: 1082 PROTOTYPE:
1035 CODE: 1083 CODE:
1036 RETVAL = respipe [0]; 1084 RETVAL = s_epipe_fd (&respipe);
1037 OUTPUT: 1085 OUTPUT:
1038 RETVAL 1086 RETVAL
1039 1087
1040int 1088int
1041poll_cb(...) 1089poll_cb(...)
1081 CODE: 1129 CODE:
1082 RETVAL = eio_nthreads (); 1130 RETVAL = eio_nthreads ();
1083 OUTPUT: 1131 OUTPUT:
1084 RETVAL 1132 RETVAL
1085 1133
1134int
1135fadvise (aio_rfd fh, off_t offset, off_t length, IV advice)
1136 PROTOTYPE: $$$$
1137 CODE:
1138#if _XOPEN_SOURCE >= 600 && !NO_FADVISE
1139 RETVAL = posix_fadvise (fh, offset, length, advice);
1140#else
1141 RETVAL = errno = ENOSYS;
1142#endif
1143 OUTPUT:
1144 RETVAL
1145
1146ssize_t
1147sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
1148 PROTOTYPE: $$$$
1149 CODE:
1150 eio_sendfile_sync (ofh, ifh, offset, count);
1151
1086void _on_next_submit (SV *cb) 1152void _on_next_submit (SV *cb)
1087 CODE: 1153 CODE:
1088 SvREFCNT_dec (on_next_submit); 1154 SvREFCNT_dec (on_next_submit);
1089 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1155 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1090 1156
1104 if (GIMME_V != G_VOID) 1170 if (GIMME_V != G_VOID)
1105 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef); 1171 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1106 1172
1107 if (items > 1) 1173 if (items > 1)
1108 { 1174 {
1109 SV *cb_cv = get_cb (callback); 1175 SV *cb_cv =get_cb (callback);
1110 1176
1111 SvREFCNT_dec (req->callback); 1177 SvREFCNT_dec (req->callback);
1112 req->callback = SvREFCNT_inc (cb_cv); 1178 req->callback = SvREFCNT_inc (cb_cv);
1113 } 1179 }
1114} 1180}
1151 AV *av; 1217 AV *av;
1152 1218
1153 grp->errorno = errno; 1219 grp->errorno = errno;
1154 1220
1155 av = newAV (); 1221 av = newAV ();
1222 av_extend (av, items - 1);
1156 1223
1157 for (i = 1; i < items; ++i ) 1224 for (i = 1; i < items; ++i )
1158 av_push (av, newSVsv (ST (i))); 1225 av_push (av, newSVsv (ST (i)));
1159 1226
1160 SvREFCNT_dec (grp->sv1); 1227 SvREFCNT_dec (grp->sv1);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines