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.129 by root, Tue Sep 30 17:03:53 2008 UTC vs.
Revision 1.156 by root, Thu Nov 12 00:01:52 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
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 aio_grp_feed (eio_req *grp);
117#define EIO_FEED(req) aio_grp_feed (req)
118static void req_destroy (eio_req *grp); 147static void req_destroy (eio_req *grp);
119#define EIO_DESTROY(req) req_destroy (req) 148#define EIO_DESTROY(req) req_destroy (req)
120 149
121enum { 150enum {
122 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ 151 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
129 158
130static SV *on_next_submit; 159static SV *on_next_submit;
131static int next_pri = EIO_PRI_DEFAULT; 160static int next_pri = EIO_PRI_DEFAULT;
132static int max_outstanding; 161static int max_outstanding;
133 162
134static int respipe_osf [2], respipe [2] = { -1, -1 }; 163static s_epipe respipe;
135 164
136static void req_destroy (aio_req req); 165static void req_destroy (aio_req req);
137static void req_cancel (aio_req req); 166static void req_cancel (aio_req req);
138 167
139static void want_poll (void) 168static void want_poll (void)
140{ 169{
141 /* write a dummy byte to the pipe so fh becomes ready */ 170 /* write a dummy byte to the pipe so fh becomes ready */
142 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1); 171 s_epipe_signal (&respipe);
143} 172}
144 173
145static void done_poll (void) 174static void done_poll (void)
146{ 175{
147 /* read any signals sent by the worker threads */ 176 /* read any signals sent by the worker threads */
148 char buf [4]; 177 s_epipe_drain (&respipe);
149 while (respipe_read (respipe [0], buf, 4) == 4)
150 ;
151} 178}
152 179
153/* must be called at most once */ 180/* must be called at most once */
154static SV *req_sv (aio_req req, const char *klass) 181static SV *req_sv (aio_req req, HV *stash)
155{ 182{
156 if (!req->self) 183 if (!req->self)
157 { 184 {
158 req->self = (SV *)newHV (); 185 req->self = (SV *)newHV ();
159 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0); 186 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
160 } 187 }
161 188
162 return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1))); 189 return sv_2mortal (sv_bless (newRV_inc (req->self), stash));
163} 190}
164 191
165static aio_req SvAIO_REQ (SV *sv) 192static aio_req SvAIO_REQ (SV *sv)
166{ 193{
167 MAGIC *mg; 194 MAGIC *mg;
168 195
169 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")))
170 croak ("object of class " AIO_REQ_KLASS " expected"); 200 croak ("object of class IO::AIO::REQ expected");
171 201
172 mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 202 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
173 203
174 return mg ? (aio_req)mg->mg_ptr : 0; 204 return mg ? (aio_req)mg->mg_ptr : 0;
175} 205}
181 dSP; 211 dSP;
182 212
183 ENTER; 213 ENTER;
184 SAVETMPS; 214 SAVETMPS;
185 PUSHMARK (SP); 215 PUSHMARK (SP);
186 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 216 XPUSHs (req_sv (grp, aio_grp_stash));
187 PUTBACK; 217 PUTBACK;
188 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR); 218 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
189 SPAGAIN; 219 SPAGAIN;
190 FREETMPS; 220 FREETMPS;
191 LEAVE; 221 LEAVE;
230 SV *rv = &PL_sv_undef; 260 SV *rv = &PL_sv_undef;
231 261
232 if (req->result >= 0) 262 if (req->result >= 0)
233 { 263 {
234 int i; 264 int i;
235 char *buf = req->ptr2; 265 char *names = (char *)req->ptr2;
266 eio_dirent *ent = (eio_dirent *)req->ptr1; /* might be 0 */
236 AV *av = newAV (); 267 AV *av = newAV ();
237 268
238 av_extend (av, req->result - 1); 269 av_extend (av, req->result - 1);
239 270
240 for (i = 0; i < req->result; ++i) 271 for (i = 0; i < req->result; ++i)
241 { 272 {
242 SV *sv = newSVpv (buf, 0); 273 if (req->int1 & EIO_READDIR_DENTS)
274 {
275 SV *namesv = newSVpvn (names + ent->nameofs, ent->namelen);
243 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
244 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);
245 buf += SvCUR (sv) + 1; 305 names += SvCUR (name) + 1;
306 }
246 } 307 }
247 308
248 rv = sv_2mortal (newRV_noinc ((SV *)av)); 309 rv = sv_2mortal (newRV_noinc ((SV *)av));
249 } 310 }
250 311
251 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))));
252 } 316 }
253 break; 317 break;
254 318
255 case EIO_OPEN: 319 case EIO_OPEN:
256 { 320 {
262 GV *gv = (GV *)sv_newmortal (); 326 GV *gv = (GV *)sv_newmortal ();
263 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR); 327 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
264 char sym [64]; 328 char sym [64];
265 int symlen; 329 int symlen;
266 330
267 symlen = snprintf (sym, sizeof (sym), "fd#%d", req->result); 331 symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
268 gv_init (gv, stash, sym, symlen, 0); 332 gv_init (gv, aio_stash, sym, symlen, 0);
269 333
270 symlen = snprintf ( 334 symlen = snprintf (
271 sym, 335 sym,
272 sizeof (sym), 336 sizeof (sym),
273 "%s&=%d", 337 "%s&=%d",
274 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<", 338 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
275 req->result 339 (int)req->result
276 ); 340 );
277 341
278 if (do_open (gv, sym, symlen, 0, 0, 0, 0)) 342 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
279 fh = (SV *)gv; 343 fh = (SV *)gv;
280 } 344 }
314 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 378 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
315 PUSHs (sv_2mortal (newSViv (req->result))); 379 PUSHs (sv_2mortal (newSViv (req->result)));
316 break; 380 break;
317 381
318 case EIO_READ: 382 case EIO_READ:
383 {
319 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));
320 *SvEND (req->sv2) = 0; 385 *SvEND (req->sv2) = 0;
386 SvPOK_only (req->sv2);
387 SvSETMAGIC (req->sv2);
321 PUSHs (sv_2mortal (newSViv (req->result))); 388 PUSHs (sv_2mortal (newSViv (req->result)));
389 }
322 break; 390 break;
323 391
324 case EIO_DUP2: 392 case EIO_DUP2:
325 if (req->result > 0) 393 if (req->result > 0)
326 req->result = 0; 394 req->result = 0;
372 grp->sv2 = 0; 440 grp->sv2 = 0;
373 441
374 eio_grp_cancel (grp); 442 eio_grp_cancel (grp);
375} 443}
376 444
377#ifdef USE_SOCKETS_AS_HANDLES
378# define TO_SOCKET(x) (win32_get_osfhandle (x))
379#else
380# define TO_SOCKET(x) (x)
381#endif
382
383static void 445static void
384create_respipe (void) 446create_respipe (void)
385{ 447{
386 int old_readfd = respipe [0];
387
388 if (respipe [1] >= 0)
389 respipe_close (TO_SOCKET (respipe [1]));
390
391#ifdef _WIN32
392 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe))
393#else
394 if (pipe (respipe)) 448 if (s_epipe_renew (&respipe))
395#endif
396 croak ("unable to initialize result pipe"); 449 croak ("IO::AIO: unable to initialize result pipe");
397
398 if (old_readfd >= 0)
399 {
400 if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0)
401 croak ("unable to initialize result pipe(2)");
402
403 respipe_close (respipe [0]);
404 respipe [0] = old_readfd;
405 }
406
407#ifdef _WIN32
408 int arg = 1;
409 if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg)
410 || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg))
411#else
412 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
413 || fcntl (respipe [1], F_SETFL, O_NONBLOCK))
414#endif
415 croak ("unable to initialize result pipe(3)");
416
417 respipe_osf [0] = TO_SOCKET (respipe [0]);
418 respipe_osf [1] = TO_SOCKET (respipe [1]);
419} 450}
420 451
421static void poll_wait (void) 452static void poll_wait (void)
422{ 453{
423 fd_set rfd;
424
425 while (eio_nreqs ()) 454 while (eio_nreqs ())
426 { 455 {
427 int size; 456 int size;
428 457
429 X_LOCK (reslock); 458 X_LOCK (reslock);
433 if (size) 462 if (size)
434 return; 463 return;
435 464
436 etp_maybe_start_thread (); 465 etp_maybe_start_thread ();
437 466
438 FD_ZERO (&rfd); 467 s_epipe_wait (&respipe);
439 FD_SET (respipe [0], &rfd);
440
441 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
442 } 468 }
443} 469}
444 470
445static int poll_cb (void) 471static int poll_cb (void)
446{ 472{
464} 490}
465 491
466static SV * 492static SV *
467get_cb (SV *cb_sv) 493get_cb (SV *cb_sv)
468{ 494{
469 HV *st; 495 SvGETMAGIC (cb_sv);
470 GV *gvp; 496 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
471 CV *cv;
472
473 if (!SvOK (cb_sv))
474 return 0;
475
476 cv = sv_2cv (cb_sv, &st, &gvp, 0);
477
478 if (!cv)
479 croak ("IO::AIO callback must be undef or a CODE reference");
480
481 return (SV *)cv;
482} 497}
483 498
484#define dREQ \ 499#define dREQ \
485 SV *cb_cv; \ 500 SV *cb_cv; \
486 aio_req req; \ 501 aio_req req; \
500 PUTBACK; \ 515 PUTBACK; \
501 req_submit (req); \ 516 req_submit (req); \
502 SPAGAIN; \ 517 SPAGAIN; \
503 \ 518 \
504 if (GIMME_V != G_VOID) \ 519 if (GIMME_V != G_VOID) \
505 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 520 XPUSHs (req_sv (req, aio_req_stash));
506 521
507MODULE = IO::AIO PACKAGE = IO::AIO 522MODULE = IO::AIO PACKAGE = IO::AIO
508 523
509PROTOTYPES: ENABLE 524PROTOTYPES: ENABLE
510 525
511BOOT: 526BOOT:
512{ 527{
513 stash = gv_stashpv ("IO::AIO", 1); 528 static const struct {
514 529 const char *name;
515 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 530 IV iv;
516 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 531 } *civ, const_iv[] = {
517 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 532# define const_iv(name, value) { # name, (IV) value },
518 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 533# define const_eio(name) { # name, (IV) EIO_ ## name },
519 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)
520#ifndef _WIN32 540#ifndef _WIN32
521 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 541 const_iv (S_IFIFO , S_IFIFO)
522#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)
523 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
524 create_respipe (); 577 create_respipe ();
525 578
526 if (eio_init (want_poll, done_poll) < 0) 579 if (eio_init (want_poll, done_poll) < 0)
527 croak ("IO::AIO: unable to initialise eio library"); 580 croak ("IO::AIO: unable to initialise eio library");
528 581
529 /* atfork child called in fifo order, so before eio's handler */ 582 /* atfork child called in fifo order, so before eio's handler */
530 X_THREAD_ATFORK (0, 0, atfork_child); 583 X_THREAD_ATFORK (0, 0, atfork_child);
531} 584}
532 585
533void 586void
534max_poll_reqs (int nreqs) 587max_poll_reqs (int nreqs)
535 PROTOTYPE: $ 588 PROTOTYPE: $
588 ALIAS: 641 ALIAS:
589 aio_fsync = EIO_FSYNC 642 aio_fsync = EIO_FSYNC
590 aio_fdatasync = EIO_FDATASYNC 643 aio_fdatasync = EIO_FDATASYNC
591 PPCODE: 644 PPCODE:
592{ 645{
646 int fd = s_fileno_croak (fh, 0);
593 dREQ; 647 dREQ;
594 648
595 req->type = ix; 649 req->type = ix;
596 req->sv1 = newSVsv (fh); 650 req->sv1 = newSVsv (fh);
597 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;
598 670
599 REQ_SEND (req); 671 REQ_SEND (req);
600} 672}
601 673
602void 674void
603aio_close (SV *fh, SV *callback=&PL_sv_undef) 675aio_close (SV *fh, SV *callback=&PL_sv_undef)
604 PROTOTYPE: $;$ 676 PROTOTYPE: $;$
605 PPCODE: 677 PPCODE:
606{ 678{
607 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);
608 dREQ; 681 dREQ;
609 682
610 if (close_pipe < 0) 683 if (close_pipe < 0)
611 { 684 {
612 int pipefd [2]; 685 int pipefd [2];
620 } 693 }
621 694
622 req->type = EIO_DUP2; 695 req->type = EIO_DUP2;
623 req->int1 = close_pipe; 696 req->int1 = close_pipe;
624 req->sv2 = newSVsv (fh); 697 req->sv2 = newSVsv (fh);
625 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 698 req->int2 = fd;
626 699
627 REQ_SEND (req); 700 REQ_SEND (req);
628} 701}
629 702
630void 703void
634 aio_write = EIO_WRITE 707 aio_write = EIO_WRITE
635 PROTOTYPE: $$$$$;$ 708 PROTOTYPE: $$$$$;$
636 PPCODE: 709 PPCODE:
637{ 710{
638 STRLEN svlen; 711 STRLEN svlen;
712 int fd = s_fileno_croak (fh, ix == EIO_WRITE);
639 char *svptr = SvPVbyte (data, svlen); 713 char *svptr = SvPVbyte (data, svlen);
640 UV len = SvUV (length); 714 UV len = SvUV (length);
641
642 SvUPGRADE (data, SVt_PV);
643 SvPOK_on (data);
644 715
645 if (dataoffset < 0) 716 if (dataoffset < 0)
646 dataoffset += svlen; 717 dataoffset += svlen;
647 718
648 if (dataoffset < 0 || dataoffset > svlen) 719 if (dataoffset < 0 || dataoffset > svlen)
654 if (!SvOK (length) || len + dataoffset > svlen) 725 if (!SvOK (length) || len + dataoffset > svlen)
655 len = svlen - dataoffset; 726 len = svlen - dataoffset;
656 } 727 }
657 else 728 else
658 { 729 {
659 /* read: grow scalar as necessary */ 730 /* read: check type and grow scalar as necessary */
731 SvUPGRADE (data, SVt_PV);
660 svptr = SvGROW (data, len + dataoffset + 1); 732 svptr = SvGROW (data, len + dataoffset + 1);
661 } 733 }
662
663 if (len < 0)
664 croak ("length must not be negative");
665 734
666 { 735 {
667 dREQ; 736 dREQ;
668 737
669 req->type = ix; 738 req->type = ix;
670 req->sv1 = newSVsv (fh); 739 req->sv1 = newSVsv (fh);
671 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 740 req->int1 = fd;
672 : IoOFP (sv_2io (fh)));
673 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 741 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
674 req->size = len; 742 req->size = len;
675 req->sv2 = SvREFCNT_inc (data); 743 req->sv2 = SvREFCNT_inc (data);
676 req->ptr2 = (char *)svptr + dataoffset; 744 req->ptr2 = (char *)svptr + dataoffset;
677 req->stroffset = dataoffset; 745 req->stroffset = dataoffset;
700 768
701 REQ_SEND; 769 REQ_SEND;
702} 770}
703 771
704void 772void
705aio_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)
706 PROTOTYPE: $$$$;$ 774 PROTOTYPE: $$$$;$
707 PPCODE: 775 PPCODE:
708{ 776{
777 int ifd = s_fileno_croak (in_fh , 0);
778 int ofd = s_fileno_croak (out_fh, 1);
709 dREQ; 779 dREQ;
710 780
711 req->type = EIO_SENDFILE; 781 req->type = EIO_SENDFILE;
712 req->sv1 = newSVsv (out_fh); 782 req->sv1 = newSVsv (out_fh);
713 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 783 req->int1 = ofd;
714 req->sv2 = newSVsv (in_fh); 784 req->sv2 = newSVsv (in_fh);
715 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 785 req->int2 = ifd;
716 req->offs = SvVAL64 (in_offset); 786 req->offs = in_offset;
717 req->size = length; 787 req->size = length;
718 788
719 REQ_SEND; 789 REQ_SEND;
720} 790}
721 791
722void 792void
723aio_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)
724 PROTOTYPE: $$$;$ 794 PROTOTYPE: $$$;$
725 PPCODE: 795 PPCODE:
726{ 796{
797 int fd = s_fileno_croak (fh, 0);
727 dREQ; 798 dREQ;
728 799
729 req->type = EIO_READAHEAD; 800 req->type = EIO_READAHEAD;
730 req->sv1 = newSVsv (fh); 801 req->sv1 = newSVsv (fh);
731 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 802 req->int1 = fd;
732 req->offs = SvVAL64 (offset); 803 req->offs = offset;
733 req->size = length; 804 req->size = length;
734 805
735 REQ_SEND; 806 REQ_SEND;
736} 807}
737 808
853 req->type = EIO_FCHOWN; 924 req->type = EIO_FCHOWN;
854 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 925 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
855 } 926 }
856 927
857 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;
858} 946}
859 947
860void 948void
861aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 949aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
862 ALIAS: 950 ALIAS:
928 dREQ; 1016 dREQ;
929 1017
930 req->type = EIO_GROUP; 1018 req->type = EIO_GROUP;
931 1019
932 req_submit (req); 1020 req_submit (req);
933 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1021 XPUSHs (req_sv (req, aio_grp_stash));
934} 1022}
935 1023
936void 1024void
937aio_nop (SV *callback=&PL_sv_undef) 1025aio_nop (SV *callback=&PL_sv_undef)
938 ALIAS: 1026 ALIAS:
990 1078
991int 1079int
992poll_fileno() 1080poll_fileno()
993 PROTOTYPE: 1081 PROTOTYPE:
994 CODE: 1082 CODE:
995 RETVAL = respipe [0]; 1083 RETVAL = s_epipe_fd (&respipe);
996 OUTPUT: 1084 OUTPUT:
997 RETVAL 1085 RETVAL
998 1086
999int 1087int
1000poll_cb(...) 1088poll_cb(...)
1040 CODE: 1128 CODE:
1041 RETVAL = eio_nthreads (); 1129 RETVAL = eio_nthreads ();
1042 OUTPUT: 1130 OUTPUT:
1043 RETVAL 1131 RETVAL
1044 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 eio_sendfile_sync (ofh, ifh, offset, count);
1150
1045void _on_next_submit (SV *cb) 1151void _on_next_submit (SV *cb)
1046 CODE: 1152 CODE:
1047 SvREFCNT_dec (on_next_submit); 1153 SvREFCNT_dec (on_next_submit);
1048 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1154 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1049 1155
1063 if (GIMME_V != G_VOID) 1169 if (GIMME_V != G_VOID)
1064 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef); 1170 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1065 1171
1066 if (items > 1) 1172 if (items > 1)
1067 { 1173 {
1068 SV *cb_cv = get_cb (callback); 1174 SV *cb_cv =get_cb (callback);
1069 1175
1070 SvREFCNT_dec (req->callback); 1176 SvREFCNT_dec (req->callback);
1071 req->callback = SvREFCNT_inc (cb_cv); 1177 req->callback = SvREFCNT_inc (cb_cv);
1072 } 1178 }
1073} 1179}
1110 AV *av; 1216 AV *av;
1111 1217
1112 grp->errorno = errno; 1218 grp->errorno = errno;
1113 1219
1114 av = newAV (); 1220 av = newAV ();
1221 av_extend (av, items - 1);
1115 1222
1116 for (i = 1; i < items; ++i ) 1223 for (i = 1; i < items; ++i )
1117 av_push (av, newSVsv (ST (i))); 1224 av_push (av, newSVsv (ST (i)));
1118 1225
1119 SvREFCNT_dec (grp->sv1); 1226 SvREFCNT_dec (grp->sv1);
1133void 1240void
1134feed (aio_req grp, SV *callback=&PL_sv_undef) 1241feed (aio_req grp, SV *callback=&PL_sv_undef)
1135 CODE: 1242 CODE:
1136{ 1243{
1137 SvREFCNT_dec (grp->sv2); 1244 SvREFCNT_dec (grp->sv2);
1138 grp->sv2 = newSVsv (callback); 1245 grp->sv2 = newSVsv (callback);
1246 grp->feed = aio_grp_feed;
1139 1247
1140 if (grp->int2 <= 0) 1248 if (grp->int2 <= 0)
1141 grp->int2 = 2; 1249 grp->int2 = 2;
1142 1250
1143 eio_grp_limit (grp, grp->int2); 1251 eio_grp_limit (grp, grp->int2);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines