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.122 by root, Tue May 13 19:35:16 2008 UTC vs.
Revision 1.154 by root, Wed Jul 15 01:39:15 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>
65# include <signal.h> 67# include <signal.h>
66# define EIO_STRUCT_DIRENT struct dirent 68# define EIO_STRUCT_DIRENT struct dirent
67 69
68#endif 70#endif
69 71
72/* perl stupidly overrides readdir and maybe others */
73/* with thread-unsafe versions, imagine that :( */
74#undef readdir
75#undef opendir
76#undef closedir
77
70#define EIO_STRUCT_STAT Stat_t 78#define EIO_STRUCT_STAT Stat_t
71 79
72/* use NV for 32 bit perls as it allows larger offsets */ 80/* use NV for 32 bit perls as it allows larger offsets */
73#if IVSIZE >= 8 81#if IVSIZE >= 8
82# define VAL64 IV
74# define SvVAL64 SvIV 83# define SvVAL64 SvIV
84# define newSVval64 newSViv
75#else 85#else
86# define VAL64 NV
76# define SvVAL64 SvNV 87# define SvVAL64 SvNV
88# define newSVval64 newSVnv
77#endif 89#endif
90
91/*****************************************************************************/
92
93#if __GNUC__ >= 3
94# define expect(expr,value) __builtin_expect ((expr),(value))
95#else
96# define expect(expr,value) (expr)
97#endif
98
99#define expect_false(expr) expect ((expr) != 0, 0)
100#define expect_true(expr) expect ((expr) != 0, 1)
101
102/*****************************************************************************/
78 103
79static HV *stash; 104static HV *stash;
80typedef 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 */
81 108
82#define AIO_REQ_KLASS "IO::AIO::REQ" 109#define AIO_REQ_KLASS "IO::AIO::REQ"
83#define AIO_GRP_KLASS "IO::AIO::GRP" 110#define AIO_GRP_KLASS "IO::AIO::GRP"
84 111
85#define EIO_REQ_MEMBERS \ 112#define EIO_REQ_MEMBERS \
90 117
91#define EIO_NO_WRAPPERS 1 118#define EIO_NO_WRAPPERS 1
92 119
93#include "libeio/eio.h" 120#include "libeio/eio.h"
94 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
95static int req_invoke (eio_req *req); 147static int req_invoke (eio_req *req);
96#define EIO_FINISH(req) req_invoke (req) 148#define EIO_FINISH(req) req_invoke (req)
97static void aio_grp_feed (eio_req *grp);
98#define EIO_FEED(req) aio_grp_feed (req)
99static void req_destroy (eio_req *grp); 149static void req_destroy (eio_req *grp);
100#define EIO_DESTROY(req) req_destroy (req) 150#define EIO_DESTROY(req) req_destroy (req)
101 151
102enum { 152enum {
103 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ 153 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
110 160
111static SV *on_next_submit; 161static SV *on_next_submit;
112static int next_pri = EIO_PRI_DEFAULT; 162static int next_pri = EIO_PRI_DEFAULT;
113static int max_outstanding; 163static int max_outstanding;
114 164
115static int respipe_osf [2], respipe [2] = { -1, -1 }; 165static s_epipe respipe;
116 166
117static void req_destroy (aio_req req); 167static void req_destroy (aio_req req);
118static void req_cancel (aio_req req); 168static void req_cancel (aio_req req);
119 169
120static void want_poll (void) 170static void want_poll (void)
121{ 171{
122 /* write a dummy byte to the pipe so fh becomes ready */ 172 /* write a dummy byte to the pipe so fh becomes ready */
123 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1); 173 s_epipe_signal (&respipe);
124} 174}
125 175
126static void done_poll (void) 176static void done_poll (void)
127{ 177{
128 /* read any signals sent by the worker threads */ 178 /* read any signals sent by the worker threads */
129 char buf [4]; 179 s_epipe_drain (&respipe);
130 while (respipe_read (respipe [0], buf, 4) == 4)
131 ;
132} 180}
133 181
134/* must be called at most once */ 182/* must be called at most once */
135static SV *req_sv (aio_req req, const char *klass) 183static SV *req_sv (aio_req req, const char *klass)
136{ 184{
175 223
176static void req_submit (eio_req *req) 224static void req_submit (eio_req *req)
177{ 225{
178 eio_submit (req); 226 eio_submit (req);
179 227
180 if (on_next_submit) 228 if (expect_false (on_next_submit))
181 { 229 {
182 dSP; 230 dSP;
183 SV *cb = sv_2mortal (on_next_submit); 231 SV *cb = sv_2mortal (on_next_submit);
184 232
185 on_next_submit = 0; 233 on_next_submit = 0;
195 dSP; 243 dSP;
196 244
197 if (req->flags & FLAG_SV2_RO_OFF) 245 if (req->flags & FLAG_SV2_RO_OFF)
198 SvREADONLY_off (req->sv2); 246 SvREADONLY_off (req->sv2);
199 247
200 if (!EIO_CANCELLED (req) && SvOK (req->callback)) 248 if (!EIO_CANCELLED (req) && req->callback)
201 { 249 {
202 ENTER; 250 ENTER;
203 SAVETMPS; 251 SAVETMPS;
204 PUSHMARK (SP); 252 PUSHMARK (SP);
205 EXTEND (SP, 1); 253 EXTEND (SP, 1);
211 SV *rv = &PL_sv_undef; 259 SV *rv = &PL_sv_undef;
212 260
213 if (req->result >= 0) 261 if (req->result >= 0)
214 { 262 {
215 int i; 263 int i;
216 char *buf = req->ptr2; 264 char *names = (char *)req->ptr2;
265 eio_dirent *ent = (eio_dirent *)req->ptr1; /* might be 0 */
217 AV *av = newAV (); 266 AV *av = newAV ();
218 267
219 av_extend (av, req->result - 1); 268 av_extend (av, req->result - 1);
220 269
221 for (i = 0; i < req->result; ++i) 270 for (i = 0; i < req->result; ++i)
222 { 271 {
223 SV *sv = newSVpv (buf, 0); 272 if (req->int1 & EIO_READDIR_DENTS)
273 {
274 SV *namesv = newSVpvn (names + ent->nameofs, ent->namelen);
224 275
276 if (req->int1 & EIO_READDIR_CUSTOM2)
277 {
278 static SV *sv_type [EIO_DT_MAX + 1]; /* type sv cache */
279 AV *avent = newAV ();
280
281 av_extend (avent, 2);
282
283 if (!sv_type [ent->type])
284 {
285 sv_type [ent->type] = newSViv (ent->type);
286 SvREADONLY_on (sv_type [ent->type]);
287 }
288
289 av_store (avent, 0, namesv);
290 av_store (avent, 1, SvREFCNT_inc (sv_type [ent->type]));
291 av_store (avent, 2, IVSIZE >= 8 ? newSVuv (ent->inode) : newSVnv (ent->inode));
292
293 av_store (av, i, newRV_noinc ((SV *)avent));
294 }
295 else
225 av_store (av, i, sv); 296 av_store (av, i, namesv);
297
298 ++ent;
299 }
300 else
301 {
302 SV *name = newSVpv (names, 0);
303 av_store (av, i, name);
226 buf += SvCUR (sv) + 1; 304 names += SvCUR (name) + 1;
305 }
227 } 306 }
228 307
229 rv = sv_2mortal (newRV_noinc ((SV *)av)); 308 rv = sv_2mortal (newRV_noinc ((SV *)av));
230 } 309 }
231 310
232 PUSHs (rv); 311 PUSHs (rv);
312
313 if (req->int1 & EIO_READDIR_CUSTOM1)
314 XPUSHs (sv_2mortal (newSViv (req->int1 & ~(EIO_READDIR_CUSTOM1 | EIO_READDIR_CUSTOM2))));
233 } 315 }
234 break; 316 break;
235 317
236 case EIO_OPEN: 318 case EIO_OPEN:
237 { 319 {
243 GV *gv = (GV *)sv_newmortal (); 325 GV *gv = (GV *)sv_newmortal ();
244 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR); 326 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
245 char sym [64]; 327 char sym [64];
246 int symlen; 328 int symlen;
247 329
248 symlen = snprintf (sym, sizeof (sym), "fd#%d", req->result); 330 symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
249 gv_init (gv, stash, sym, symlen, 0); 331 gv_init (gv, stash, sym, symlen, 0);
250 332
251 symlen = snprintf ( 333 symlen = snprintf (
252 sym, 334 sym,
253 sizeof (sym), 335 sizeof (sym),
254 "%s&=%d", 336 "%s&=%d",
255 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<", 337 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
256 req->result 338 (int)req->result
257 ); 339 );
258 340
259 if (do_open (gv, sym, symlen, 0, 0, 0, 0)) 341 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
260 fh = (SV *)gv; 342 fh = (SV *)gv;
261 } 343 }
295 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 377 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
296 PUSHs (sv_2mortal (newSViv (req->result))); 378 PUSHs (sv_2mortal (newSViv (req->result)));
297 break; 379 break;
298 380
299 case EIO_READ: 381 case EIO_READ:
382 {
300 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0)); 383 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
301 *SvEND (req->sv2) = 0; 384 *SvEND (req->sv2) = 0;
385 SvPOK_only (req->sv2);
386 SvSETMAGIC (req->sv2);
302 PUSHs (sv_2mortal (newSViv (req->result))); 387 PUSHs (sv_2mortal (newSViv (req->result)));
388 }
303 break; 389 break;
304 390
305 case EIO_DUP2: 391 case EIO_DUP2:
306 if (req->result > 0) 392 if (req->result > 0)
307 req->result = 0; 393 req->result = 0;
353 grp->sv2 = 0; 439 grp->sv2 = 0;
354 440
355 eio_grp_cancel (grp); 441 eio_grp_cancel (grp);
356} 442}
357 443
358#ifdef USE_SOCKETS_AS_HANDLES
359# define TO_SOCKET(x) (win32_get_osfhandle (x))
360#else
361# define TO_SOCKET(x) (x)
362#endif
363
364static void 444static void
365create_respipe (void) 445create_respipe (void)
366{ 446{
367 int old_readfd = respipe [0];
368
369 if (respipe [1] >= 0)
370 respipe_close (TO_SOCKET (respipe [1]));
371
372#ifdef _WIN32
373 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe))
374#else
375 if (pipe (respipe)) 447 if (s_epipe_renew (&respipe))
376#endif
377 croak ("unable to initialize result pipe"); 448 croak ("unable to initialize result pipe");
378
379 if (old_readfd >= 0)
380 {
381 if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0)
382 croak ("unable to initialize result pipe(2)");
383
384 respipe_close (respipe [0]);
385 respipe [0] = old_readfd;
386 }
387
388#ifdef _WIN32
389 int arg = 1;
390 if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg)
391 || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg))
392#else
393 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
394 || fcntl (respipe [1], F_SETFL, O_NONBLOCK))
395#endif
396 croak ("unable to initialize result pipe(3)");
397
398 respipe_osf [0] = TO_SOCKET (respipe [0]);
399 respipe_osf [1] = TO_SOCKET (respipe [1]);
400} 449}
401 450
402static void poll_wait (void) 451static void poll_wait (void)
403{ 452{
404 fd_set rfd;
405
406 while (eio_nreqs ()) 453 while (eio_nreqs ())
407 { 454 {
408 int size; 455 int size;
409 456
410 X_LOCK (reslock); 457 X_LOCK (reslock);
412 X_UNLOCK (reslock); 459 X_UNLOCK (reslock);
413 460
414 if (size) 461 if (size)
415 return; 462 return;
416 463
417 maybe_start_thread (); 464 etp_maybe_start_thread ();
418 465
419 FD_ZERO (&rfd); 466 s_epipe_wait (&respipe);
420 FD_SET (respipe [0], &rfd);
421
422 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
423 } 467 }
424} 468}
425 469
426static int poll_cb (void) 470static int poll_cb (void)
427{ 471{
428 int res; 472 for (;;)
429
430 do
431 { 473 {
432 res = eio_poll (); 474 int res = eio_poll ();
433 475
434 if (res > 0) 476 if (res > 0)
435 croak (0); 477 croak (0);
478
479 if (!max_outstanding || max_outstanding > eio_nreqs ())
480 return res;
481
482 poll_wait ();
436 } 483 }
437 while (max_outstanding && max_outstanding <= eio_nreqs ());
438
439 return res;
440} 484}
441 485
442static void atfork_child (void) 486static void atfork_child (void)
443{ 487{
444 create_respipe (); 488 create_respipe ();
445} 489}
446 490
491static SV *
492get_cb (SV *cb_sv)
493{
494 SvGETMAGIC (cb_sv);
495 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
496}
497
447#define dREQ \ 498#define dREQ \
499 SV *cb_cv; \
448 aio_req req; \ 500 aio_req req; \
449 int req_pri = next_pri; \ 501 int req_pri = next_pri; \
450 next_pri = EIO_PRI_DEFAULT; \ 502 next_pri = EIO_PRI_DEFAULT; \
451 \ 503 \
452 if (SvOK (callback) && !SvROK (callback)) \ 504 cb_cv = get_cb (callback); \
453 croak ("callback must be undef or of reference type"); \
454 \ 505 \
455 Newz (0, req, 1, eio_req); \ 506 Newz (0, req, 1, eio_req); \
456 if (!req) \ 507 if (!req) \
457 croak ("out of memory during eio_req allocation"); \ 508 croak ("out of memory during eio_req allocation"); \
458 \ 509 \
459 req->callback = newSVsv (callback); \ 510 req->callback = SvREFCNT_inc (cb_cv); \
460 req->pri = req_pri 511 req->pri = req_pri
461 512
462#define REQ_SEND \ 513#define REQ_SEND \
514 PUTBACK; \
463 req_submit (req); \ 515 req_submit (req); \
516 SPAGAIN; \
464 \ 517 \
465 if (GIMME_V != G_VOID) \ 518 if (GIMME_V != G_VOID) \
466 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 519 XPUSHs (req_sv (req, AIO_REQ_KLASS));
467 520
468MODULE = IO::AIO PACKAGE = IO::AIO 521MODULE = IO::AIO PACKAGE = IO::AIO
469 522
470PROTOTYPES: ENABLE 523PROTOTYPES: ENABLE
471 524
472BOOT: 525BOOT:
473{ 526{
474 stash = gv_stashpv ("IO::AIO", 1); 527 static const struct {
475 528 const char *name;
476 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 529 IV iv;
477 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 530 } *civ, const_iv[] = {
478 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 531# define const_iv(name, value) { # name, (IV) value },
479 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 532# define const_eio(name) { # name, (IV) EIO_ ## name },
480 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 533 const_iv (EXDEV , EXDEV)
534 const_iv (ENOSYS , ENOSYS)
535 const_iv (O_RDONLY, O_RDONLY)
536 const_iv (O_WRONLY, O_WRONLY)
537 const_iv (O_CREAT , O_CREAT)
538 const_iv (O_TRUNC , O_TRUNC)
481#ifndef _WIN32 539#ifndef _WIN32
482 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 540 const_iv (S_IFIFO , S_IFIFO)
483#endif 541#endif
542 const_iv (FADV_NORMAL , POSIX_FADV_NORMAL)
543 const_iv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL)
544 const_iv (FADV_RANDOM , POSIX_FADV_RANDOM)
545 const_iv (FADV_NOREUSE , POSIX_FADV_NOREUSE)
546 const_iv (FADV_WILLNEED , POSIX_FADV_WILLNEED)
547 const_iv (FADV_DONTNEED , POSIX_FADV_DONTNEED)
484 548
549 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
550 const_eio (SYNC_FILE_RANGE_WRITE)
551 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
552
553 const_eio (READDIR_DENTS)
554 const_eio (READDIR_DIRS_FIRST)
555 const_eio (READDIR_STAT_ORDER)
556 const_eio (READDIR_FOUND_UNKNOWN)
557
558 const_eio (DT_UNKNOWN)
559 const_eio (DT_FIFO)
560 const_eio (DT_CHR)
561 const_eio (DT_DIR)
562 const_eio (DT_BLK)
563 const_eio (DT_REG)
564 const_eio (DT_LNK)
565 const_eio (DT_SOCK)
566 const_eio (DT_WHT)
567 };
568
569 stash = gv_stashpv ("IO::AIO", 1);
570
571 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
572 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
573
485 create_respipe (); 574 create_respipe ();
486 575
487 if (eio_init (want_poll, done_poll) < 0) 576 if (eio_init (want_poll, done_poll) < 0)
488 croak ("IO::AIO: unable to initialise eio library"); 577 croak ("IO::AIO: unable to initialise eio library");
489 578
490 /* atfork child called in fifo order, so before eio's handler */ 579 /* atfork child called in fifo order, so before eio's handler */
491 X_THREAD_ATFORK (0, 0, atfork_child); 580 X_THREAD_ATFORK (0, 0, atfork_child);
492} 581}
493 582
494void 583void
495max_poll_reqs (int nreqs) 584max_poll_reqs (int nreqs)
496 PROTOTYPE: $ 585 PROTOTYPE: $
549 ALIAS: 638 ALIAS:
550 aio_fsync = EIO_FSYNC 639 aio_fsync = EIO_FSYNC
551 aio_fdatasync = EIO_FDATASYNC 640 aio_fdatasync = EIO_FDATASYNC
552 PPCODE: 641 PPCODE:
553{ 642{
643 int fd = s_fileno_croak (fh, 0);
554 dREQ; 644 dREQ;
555 645
556 req->type = ix; 646 req->type = ix;
557 req->sv1 = newSVsv (fh); 647 req->sv1 = newSVsv (fh);
558 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 648 req->int1 = fd;
649
650 REQ_SEND (req);
651}
652
653void
654aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef)
655 PROTOTYPE: $$$$;$
656 PPCODE:
657{
658 int fd = s_fileno_croak (fh, 0);
659 dREQ;
660
661 req->type = EIO_SYNC_FILE_RANGE;
662 req->sv1 = newSVsv (fh);
663 req->int1 = fd;
664 req->offs = offset;
665 req->size = nbytes;
666 req->int2 = flags;
559 667
560 REQ_SEND (req); 668 REQ_SEND (req);
561} 669}
562 670
563void 671void
564aio_close (SV *fh, SV *callback=&PL_sv_undef) 672aio_close (SV *fh, SV *callback=&PL_sv_undef)
565 PROTOTYPE: $;$ 673 PROTOTYPE: $;$
566 PPCODE: 674 PPCODE:
567{ 675{
568 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 676 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
677 int fd = s_fileno_croak (fh, 0);
569 dREQ; 678 dREQ;
570 679
571 if (close_pipe < 0) 680 if (close_pipe < 0)
572 { 681 {
573 int pipefd [2]; 682 int pipefd [2];
581 } 690 }
582 691
583 req->type = EIO_DUP2; 692 req->type = EIO_DUP2;
584 req->int1 = close_pipe; 693 req->int1 = close_pipe;
585 req->sv2 = newSVsv (fh); 694 req->sv2 = newSVsv (fh);
586 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 695 req->int2 = fd;
587 696
588 REQ_SEND (req); 697 REQ_SEND (req);
589} 698}
590 699
591void 700void
595 aio_write = EIO_WRITE 704 aio_write = EIO_WRITE
596 PROTOTYPE: $$$$$;$ 705 PROTOTYPE: $$$$$;$
597 PPCODE: 706 PPCODE:
598{ 707{
599 STRLEN svlen; 708 STRLEN svlen;
709 int fd = s_fileno_croak (fh, ix == EIO_WRITE);
600 char *svptr = SvPVbyte (data, svlen); 710 char *svptr = SvPVbyte (data, svlen);
601 UV len = SvUV (length); 711 UV len = SvUV (length);
602
603 SvUPGRADE (data, SVt_PV);
604 SvPOK_on (data);
605 712
606 if (dataoffset < 0) 713 if (dataoffset < 0)
607 dataoffset += svlen; 714 dataoffset += svlen;
608 715
609 if (dataoffset < 0 || dataoffset > svlen) 716 if (dataoffset < 0 || dataoffset > svlen)
615 if (!SvOK (length) || len + dataoffset > svlen) 722 if (!SvOK (length) || len + dataoffset > svlen)
616 len = svlen - dataoffset; 723 len = svlen - dataoffset;
617 } 724 }
618 else 725 else
619 { 726 {
620 /* read: grow scalar as necessary */ 727 /* read: check type and grow scalar as necessary */
728 SvUPGRADE (data, SVt_PV);
621 svptr = SvGROW (data, len + dataoffset + 1); 729 svptr = SvGROW (data, len + dataoffset + 1);
622 } 730 }
623
624 if (len < 0)
625 croak ("length must not be negative");
626 731
627 { 732 {
628 dREQ; 733 dREQ;
629 734
630 req->type = ix; 735 req->type = ix;
631 req->sv1 = newSVsv (fh); 736 req->sv1 = newSVsv (fh);
632 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 737 req->int1 = fd;
633 : IoOFP (sv_2io (fh)));
634 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 738 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
635 req->size = len; 739 req->size = len;
636 req->sv2 = SvREFCNT_inc (data); 740 req->sv2 = SvREFCNT_inc (data);
637 req->ptr2 = (char *)svptr + dataoffset; 741 req->ptr2 = (char *)svptr + dataoffset;
638 req->stroffset = dataoffset; 742 req->stroffset = dataoffset;
661 765
662 REQ_SEND; 766 REQ_SEND;
663} 767}
664 768
665void 769void
666aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef) 770aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef)
667 PROTOTYPE: $$$$;$ 771 PROTOTYPE: $$$$;$
668 PPCODE: 772 PPCODE:
669{ 773{
774 int ifd = s_fileno_croak (in_fh , 0);
775 int ofd = s_fileno_croak (out_fh, 1);
670 dREQ; 776 dREQ;
671 777
672 req->type = EIO_SENDFILE; 778 req->type = EIO_SENDFILE;
673 req->sv1 = newSVsv (out_fh); 779 req->sv1 = newSVsv (out_fh);
674 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 780 req->int1 = ofd;
675 req->sv2 = newSVsv (in_fh); 781 req->sv2 = newSVsv (in_fh);
676 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 782 req->int2 = ifd;
677 req->offs = SvVAL64 (in_offset); 783 req->offs = in_offset;
678 req->size = length; 784 req->size = length;
679 785
680 REQ_SEND; 786 REQ_SEND;
681} 787}
682 788
683void 789void
684aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef) 790aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef)
685 PROTOTYPE: $$$;$ 791 PROTOTYPE: $$$;$
686 PPCODE: 792 PPCODE:
687{ 793{
794 int fd = s_fileno_croak (fh, 0);
688 dREQ; 795 dREQ;
689 796
690 req->type = EIO_READAHEAD; 797 req->type = EIO_READAHEAD;
691 req->sv1 = newSVsv (fh); 798 req->sv1 = newSVsv (fh);
692 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 799 req->int1 = fd;
693 req->offs = SvVAL64 (offset); 800 req->offs = offset;
694 req->size = length; 801 req->size = length;
695 802
696 REQ_SEND; 803 REQ_SEND;
697} 804}
698 805
814 req->type = EIO_FCHOWN; 921 req->type = EIO_FCHOWN;
815 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 922 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
816 } 923 }
817 924
818 REQ_SEND; 925 REQ_SEND;
926}
927
928void
929aio_readdirx (SV8 *pathname, IV flags, SV *callback=&PL_sv_undef)
930 PPCODE:
931{
932 dREQ;
933
934 req->type = EIO_READDIR;
935 req->sv1 = newSVsv (pathname);
936 req->ptr1 = SvPVbyte_nolen (req->sv1);
937 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
938
939 if (flags & EIO_READDIR_DENTS)
940 req->int1 |= EIO_READDIR_CUSTOM2;
941
942 REQ_SEND;
819} 943}
820 944
821void 945void
822aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 946aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
823 ALIAS: 947 ALIAS:
888{ 1012{
889 dREQ; 1013 dREQ;
890 1014
891 req->type = EIO_GROUP; 1015 req->type = EIO_GROUP;
892 1016
893 eio_submit (req); 1017 req_submit (req);
894 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1018 XPUSHs (req_sv (req, AIO_GRP_KLASS));
895} 1019}
896 1020
897void 1021void
898aio_nop (SV *callback=&PL_sv_undef) 1022aio_nop (SV *callback=&PL_sv_undef)
951 1075
952int 1076int
953poll_fileno() 1077poll_fileno()
954 PROTOTYPE: 1078 PROTOTYPE:
955 CODE: 1079 CODE:
956 RETVAL = respipe [0]; 1080 RETVAL = s_epipe_fd (&respipe);
957 OUTPUT: 1081 OUTPUT:
958 RETVAL 1082 RETVAL
959 1083
960int 1084int
961poll_cb(...) 1085poll_cb(...)
1001 CODE: 1125 CODE:
1002 RETVAL = eio_nthreads (); 1126 RETVAL = eio_nthreads ();
1003 OUTPUT: 1127 OUTPUT:
1004 RETVAL 1128 RETVAL
1005 1129
1130int
1131fadvise (aio_rfd fh, off_t offset, off_t length, IV advice)
1132 PROTOTYPE: $$$$
1133 CODE:
1134#if _XOPEN_SOURCE >= 600 && !NO_FADVISE
1135 RETVAL = posix_fadvise (fh, offset, length, advice);
1136#else
1137 RETVAL = errno = ENOSYS;
1138#endif
1139 OUTPUT:
1140 RETVAL
1141
1142ssize_t
1143sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
1144 PROTOTYPE: $$$$
1145 CODE:
1146 eio_sendfile_sync (ofh, ifh, offset, count);
1147
1006void _on_next_submit (SV *cb) 1148void _on_next_submit (SV *cb)
1007 CODE: 1149 CODE:
1008 SvREFCNT_dec (on_next_submit); 1150 SvREFCNT_dec (on_next_submit);
1009 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1151 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1010 1152
1017 CODE: 1159 CODE:
1018 eio_cancel (req); 1160 eio_cancel (req);
1019 1161
1020void 1162void
1021cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1163cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1022 CODE: 1164 PPCODE:
1165{
1166 if (GIMME_V != G_VOID)
1167 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1168
1169 if (items > 1)
1170 {
1171 SV *cb_cv =get_cb (callback);
1172
1023 SvREFCNT_dec (req->callback); 1173 SvREFCNT_dec (req->callback);
1024 req->callback = newSVsv (callback); 1174 req->callback = SvREFCNT_inc (cb_cv);
1175 }
1176}
1025 1177
1026MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1178MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1027 1179
1028void 1180void
1029add (aio_req grp, ...) 1181add (aio_req grp, ...)
1061 AV *av; 1213 AV *av;
1062 1214
1063 grp->errorno = errno; 1215 grp->errorno = errno;
1064 1216
1065 av = newAV (); 1217 av = newAV ();
1218 av_extend (av, items - 1);
1066 1219
1067 for (i = 1; i < items; ++i ) 1220 for (i = 1; i < items; ++i )
1068 av_push (av, newSVsv (ST (i))); 1221 av_push (av, newSVsv (ST (i)));
1069 1222
1070 SvREFCNT_dec (grp->sv1); 1223 SvREFCNT_dec (grp->sv1);
1084void 1237void
1085feed (aio_req grp, SV *callback=&PL_sv_undef) 1238feed (aio_req grp, SV *callback=&PL_sv_undef)
1086 CODE: 1239 CODE:
1087{ 1240{
1088 SvREFCNT_dec (grp->sv2); 1241 SvREFCNT_dec (grp->sv2);
1089 grp->sv2 = newSVsv (callback); 1242 grp->sv2 = newSVsv (callback);
1243 grp->feed = aio_grp_feed;
1090 1244
1091 if (grp->int2 <= 0) 1245 if (grp->int2 <= 0)
1092 grp->int2 = 2; 1246 grp->int2 = 2;
1093 1247
1094 eio_grp_limit (grp, grp->int2); 1248 eio_grp_limit (grp, grp->int2);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines