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.118 by root, Sun May 11 00:01:03 2008 UTC vs.
Revision 1.152 by root, Tue Jul 14 00:32:27 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_COMMON \ 112#define EIO_REQ_MEMBERS \
86 SV *callback; \ 113 SV *callback; \
87 SV *sv1, *sv2; \ 114 SV *sv1, *sv2; \
88 STRLEN stroffset; \ 115 STRLEN stroffset; \
89 SV *self 116 SV *self;
117
118#define EIO_NO_WRAPPERS 1
90 119
91#include "libeio/eio.h" 120#include "libeio/eio.h"
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
92 146
93static int req_invoke (eio_req *req); 147static int req_invoke (eio_req *req);
94#define EIO_FINISH(req) req_invoke (req) 148#define EIO_FINISH(req) req_invoke (req)
95static void aio_grp_feed (eio_req *grp);
96#define EIO_FEED(req) aio_grp_feed (req)
97static void req_destroy (eio_req *grp); 149static void req_destroy (eio_req *grp);
98#define EIO_DESTROY(req) req_destroy (req) 150#define EIO_DESTROY(req) req_destroy (req)
99 151
100enum { 152enum {
101 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ 153 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
105 157
106typedef eio_req *aio_req; 158typedef eio_req *aio_req;
107typedef eio_req *aio_req_ornot; 159typedef eio_req *aio_req_ornot;
108 160
109static SV *on_next_submit; 161static SV *on_next_submit;
110static int next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; 162static int next_pri = EIO_PRI_DEFAULT;
111static int max_outstanding; 163static int max_outstanding;
112 164
113static int respipe_osf [2], respipe [2] = { -1, -1 }; 165static int respipe_osf [2], respipe [2] = { -1, -1 };
114 166
115static void req_destroy (aio_req req); 167static void req_destroy (aio_req req);
173 225
174static void req_submit (eio_req *req) 226static void req_submit (eio_req *req)
175{ 227{
176 eio_submit (req); 228 eio_submit (req);
177 229
178 if (on_next_submit) 230 if (expect_false (on_next_submit))
179 { 231 {
180 dSP; 232 dSP;
181 SV *cb = sv_2mortal (on_next_submit); 233 SV *cb = sv_2mortal (on_next_submit);
182 234
183 on_next_submit = 0; 235 on_next_submit = 0;
193 dSP; 245 dSP;
194 246
195 if (req->flags & FLAG_SV2_RO_OFF) 247 if (req->flags & FLAG_SV2_RO_OFF)
196 SvREADONLY_off (req->sv2); 248 SvREADONLY_off (req->sv2);
197 249
198 if (!EIO_CANCELLED (req) && SvOK (req->callback)) 250 if (!EIO_CANCELLED (req) && req->callback)
199 { 251 {
200 ENTER; 252 ENTER;
201 SAVETMPS; 253 SAVETMPS;
202 PUSHMARK (SP); 254 PUSHMARK (SP);
203 EXTEND (SP, 1); 255 EXTEND (SP, 1);
209 SV *rv = &PL_sv_undef; 261 SV *rv = &PL_sv_undef;
210 262
211 if (req->result >= 0) 263 if (req->result >= 0)
212 { 264 {
213 int i; 265 int i;
214 char *buf = req->ptr2; 266 char *names = (char *)req->ptr2;
267 eio_dirent *ent = (eio_dirent *)req->ptr1; /* might be 0 */
215 AV *av = newAV (); 268 AV *av = newAV ();
216 269
217 av_extend (av, req->result - 1); 270 av_extend (av, req->result - 1);
218 271
219 for (i = 0; i < req->result; ++i) 272 for (i = 0; i < req->result; ++i)
220 { 273 {
221 SV *sv = newSVpv (buf, 0); 274 if (req->int1 & EIO_READDIR_DENTS)
275 {
276 SV *namesv = newSVpvn (names + ent->nameofs, ent->namelen);
222 277
278 if (req->int1 & EIO_READDIR_CUSTOM2)
279 {
280 static SV *sv_type [EIO_DT_MAX + 1]; /* type sv cache */
281 AV *avent = newAV ();
282
283 av_extend (avent, 2);
284
285 if (!sv_type [ent->type])
286 {
287 sv_type [ent->type] = newSViv (ent->type);
288 SvREADONLY_on (sv_type [ent->type]);
289 }
290
291 av_store (avent, 0, namesv);
292 av_store (avent, 1, SvREFCNT_inc (sv_type [ent->type]));
293 av_store (avent, 2, IVSIZE >= 8 ? newSVuv (ent->inode) : newSVnv (ent->inode));
294
295 av_store (av, i, newRV_noinc ((SV *)avent));
296 }
297 else
223 av_store (av, i, sv); 298 av_store (av, i, namesv);
299
300 ++ent;
301 }
302 else
303 {
304 SV *name = newSVpv (names, 0);
305 av_store (av, i, name);
224 buf += SvCUR (sv) + 1; 306 names += SvCUR (name) + 1;
307 }
225 } 308 }
226 309
227 rv = sv_2mortal (newRV_noinc ((SV *)av)); 310 rv = sv_2mortal (newRV_noinc ((SV *)av));
228 } 311 }
229 312
230 PUSHs (rv); 313 PUSHs (rv);
314
315 if (req->int1 & EIO_READDIR_CUSTOM1)
316 XPUSHs (sv_2mortal (newSViv (req->int1 & ~(EIO_READDIR_CUSTOM1 | EIO_READDIR_CUSTOM2))));
231 } 317 }
232 break; 318 break;
233 319
234 case EIO_OPEN: 320 case EIO_OPEN:
235 { 321 {
241 GV *gv = (GV *)sv_newmortal (); 327 GV *gv = (GV *)sv_newmortal ();
242 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR); 328 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
243 char sym [64]; 329 char sym [64];
244 int symlen; 330 int symlen;
245 331
246 symlen = snprintf (sym, sizeof (sym), "fd#%d", req->result); 332 symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
247 gv_init (gv, stash, sym, symlen, 0); 333 gv_init (gv, stash, sym, symlen, 0);
248 334
249 symlen = snprintf ( 335 symlen = snprintf (
250 sym, 336 sym,
251 sizeof (sym), 337 sizeof (sym),
252 "%s&=%d", 338 "%s&=%d",
253 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<", 339 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
254 req->result 340 (int)req->result
255 ); 341 );
256 342
257 if (do_open (gv, sym, symlen, 0, 0, 0, 0)) 343 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
258 fh = (SV *)gv; 344 fh = (SV *)gv;
259 } 345 }
280 case EIO_BUSY: 366 case EIO_BUSY:
281 break; 367 break;
282 368
283 case EIO_READLINK: 369 case EIO_READLINK:
284 if (req->result > 0) 370 if (req->result > 0)
285 { 371 PUSHs (sv_2mortal (newSVpvn (req->ptr2, req->result)));
286 SvCUR_set (req->sv2, req->result);
287 *SvEND (req->sv2) = 0;
288 PUSHs (req->sv2);
289 }
290 break; 372 break;
291 373
292 case EIO_STAT: 374 case EIO_STAT:
293 case EIO_LSTAT: 375 case EIO_LSTAT:
294 case EIO_FSTAT: 376 case EIO_FSTAT:
297 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 379 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
298 PUSHs (sv_2mortal (newSViv (req->result))); 380 PUSHs (sv_2mortal (newSViv (req->result)));
299 break; 381 break;
300 382
301 case EIO_READ: 383 case EIO_READ:
384 {
302 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0)); 385 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
303 *SvEND (req->sv2) = 0; 386 *SvEND (req->sv2) = 0;
387 SvPOK_only (req->sv2);
388 SvSETMAGIC (req->sv2);
304 PUSHs (sv_2mortal (newSViv (req->result))); 389 PUSHs (sv_2mortal (newSViv (req->result)));
390 }
305 break; 391 break;
306 392
307 case EIO_DUP2: 393 case EIO_DUP2:
308 if (req->result > 0) 394 if (req->result > 0)
309 req->result = 0; 395 req->result = 0;
414 X_UNLOCK (reslock); 500 X_UNLOCK (reslock);
415 501
416 if (size) 502 if (size)
417 return; 503 return;
418 504
419 maybe_start_thread (); 505 etp_maybe_start_thread ();
420 506
421 FD_ZERO (&rfd); 507 FD_ZERO (&rfd);
422 FD_SET (respipe [0], &rfd); 508 FD_SET (respipe [0], &rfd);
423 509
424 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0); 510 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
425 } 511 }
426} 512}
427 513
428static int poll_cb (void) 514static int poll_cb (void)
429{ 515{
430 int res; 516 for (;;)
431
432 do
433 { 517 {
434 res = eio_poll (); 518 int res = eio_poll ();
435 519
436 if (res > 0) 520 if (res > 0)
437 croak (0); 521 croak (0);
522
523 if (!max_outstanding || max_outstanding > eio_nreqs ())
524 return res;
525
526 poll_wait ();
438 } 527 }
439 while (max_outstanding && max_outstanding <= eio_nreqs ());
440
441 return res;
442} 528}
443 529
444static void atfork_child (void) 530static void atfork_child (void)
445{ 531{
446 create_respipe (); 532 create_respipe ();
447} 533}
448 534
535static SV *
536get_cb (SV *cb_sv)
537{
538 SvGETMAGIC (cb_sv);
539 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
540}
541
449#define dREQ \ 542#define dREQ \
543 SV *cb_cv; \
450 aio_req req; \ 544 aio_req req; \
451 int req_pri = next_pri; \ 545 int req_pri = next_pri; \
452 next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; \ 546 next_pri = EIO_PRI_DEFAULT; \
453 \ 547 \
454 if (SvOK (callback) && !SvROK (callback)) \ 548 cb_cv = get_cb (callback); \
455 croak ("callback must be undef or of reference type"); \
456 \ 549 \
457 Newz (0, req, 1, eio_req); \ 550 Newz (0, req, 1, eio_req); \
458 if (!req) \ 551 if (!req) \
459 croak ("out of memory during eio_req allocation"); \ 552 croak ("out of memory during eio_req allocation"); \
460 \ 553 \
461 req->callback = newSVsv (callback); \ 554 req->callback = SvREFCNT_inc (cb_cv); \
462 req->pri = req_pri 555 req->pri = req_pri
463 556
464#define REQ_SEND \ 557#define REQ_SEND \
558 PUTBACK; \
465 req_submit (req); \ 559 req_submit (req); \
560 SPAGAIN; \
466 \ 561 \
467 if (GIMME_V != G_VOID) \ 562 if (GIMME_V != G_VOID) \
468 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 563 XPUSHs (req_sv (req, AIO_REQ_KLASS));
469 564
470MODULE = IO::AIO PACKAGE = IO::AIO 565MODULE = IO::AIO PACKAGE = IO::AIO
471 566
472PROTOTYPES: ENABLE 567PROTOTYPES: ENABLE
473 568
474BOOT: 569BOOT:
475{ 570{
476 stash = gv_stashpv ("IO::AIO", 1); 571 static const struct {
477 572 const char *name;
478 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 573 IV iv;
479 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 574 } *civ, const_iv[] = {
480 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 575# define const_iv(name, value) { # name, (IV) value },
481 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 576# define const_eio(name) { # name, (IV) EIO_ ## name },
482 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 577 const_iv (EXDEV , EXDEV)
578 const_iv (ENOSYS , ENOSYS)
579 const_iv (O_RDONLY, O_RDONLY)
580 const_iv (O_WRONLY, O_WRONLY)
581 const_iv (O_CREAT , O_CREAT)
582 const_iv (O_TRUNC , O_TRUNC)
483#ifdef _WIN32 583#ifndef _WIN32
484 X_MUTEX_CHECK (wrklock); 584 const_iv (S_IFIFO , S_IFIFO)
485 X_MUTEX_CHECK (reslock);
486 X_MUTEX_CHECK (reqlock);
487 X_MUTEX_CHECK (reqwait);
488 X_MUTEX_CHECK (preadwritelock);
489 X_MUTEX_CHECK (readdirlock);
490
491 X_COND_CHECK (reqwait);
492#else
493 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
494#endif 585#endif
586 const_iv (FADV_NORMAL , POSIX_FADV_NORMAL)
587 const_iv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL)
588 const_iv (FADV_RANDOM , POSIX_FADV_RANDOM)
589 const_iv (FADV_NOREUSE , POSIX_FADV_NOREUSE)
590 const_iv (FADV_WILLNEED , POSIX_FADV_WILLNEED)
591 const_iv (FADV_DONTNEED , POSIX_FADV_DONTNEED)
495 592
593 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
594 const_eio (SYNC_FILE_RANGE_WRITE)
595 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
596
597 const_eio (READDIR_DENTS)
598 const_eio (READDIR_DIRS_FIRST)
599 const_eio (READDIR_STAT_ORDER)
600 const_eio (READDIR_FOUND_UNKNOWN)
601
602 const_eio (DT_UNKNOWN)
603 const_eio (DT_FIFO)
604 const_eio (DT_CHR)
605 const_eio (DT_DIR)
606 const_eio (DT_BLK)
607 const_eio (DT_REG)
608 const_eio (DT_LNK)
609 const_eio (DT_SOCK)
610 const_eio (DT_WHT)
611 };
612
613 stash = gv_stashpv ("IO::AIO", 1);
614
615 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
616 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
617
496 create_respipe (); 618 create_respipe ();
497 619
498 if (eio_init (want_poll, done_poll) < 0) 620 if (eio_init (want_poll, done_poll) < 0)
499 croak ("IO::AIO: unable to initialise eio library"); 621 croak ("IO::AIO: unable to initialise eio library");
500 622
501 /* atfork child called in fifo order, so before eio's handler */ 623 /* atfork child called in fifo order, so before eio's handler */
502 X_THREAD_ATFORK (0, 0, atfork_child); 624 X_THREAD_ATFORK (0, 0, atfork_child);
503} 625}
504 626
505void 627void
506max_poll_reqs (int nreqs) 628max_poll_reqs (int nreqs)
507 PROTOTYPE: $ 629 PROTOTYPE: $
560 ALIAS: 682 ALIAS:
561 aio_fsync = EIO_FSYNC 683 aio_fsync = EIO_FSYNC
562 aio_fdatasync = EIO_FDATASYNC 684 aio_fdatasync = EIO_FDATASYNC
563 PPCODE: 685 PPCODE:
564{ 686{
687 int fd = s_fileno_croak (fh, 0);
565 dREQ; 688 dREQ;
566 689
567 req->type = ix; 690 req->type = ix;
568 req->sv1 = newSVsv (fh); 691 req->sv1 = newSVsv (fh);
569 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 692 req->int1 = fd;
693
694 REQ_SEND (req);
695}
696
697void
698aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef)
699 PROTOTYPE: $$$$;$
700 PPCODE:
701{
702 int fd = s_fileno_croak (fh, 0);
703 dREQ;
704
705 req->type = EIO_SYNC_FILE_RANGE;
706 req->sv1 = newSVsv (fh);
707 req->int1 = fd;
708 req->offs = offset;
709 req->size = nbytes;
710 req->int2 = flags;
570 711
571 REQ_SEND (req); 712 REQ_SEND (req);
572} 713}
573 714
574void 715void
575aio_close (SV *fh, SV *callback=&PL_sv_undef) 716aio_close (SV *fh, SV *callback=&PL_sv_undef)
576 PROTOTYPE: $;$ 717 PROTOTYPE: $;$
577 PPCODE: 718 PPCODE:
578{ 719{
579 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 720 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
721 int fd = s_fileno_croak (fh, 0);
580 dREQ; 722 dREQ;
581 723
582 if (close_pipe < 0) 724 if (close_pipe < 0)
583 { 725 {
584 int pipefd [2]; 726 int pipefd [2];
592 } 734 }
593 735
594 req->type = EIO_DUP2; 736 req->type = EIO_DUP2;
595 req->int1 = close_pipe; 737 req->int1 = close_pipe;
596 req->sv2 = newSVsv (fh); 738 req->sv2 = newSVsv (fh);
597 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 739 req->int2 = fd;
598 740
599 REQ_SEND (req); 741 REQ_SEND (req);
600} 742}
601 743
602void 744void
606 aio_write = EIO_WRITE 748 aio_write = EIO_WRITE
607 PROTOTYPE: $$$$$;$ 749 PROTOTYPE: $$$$$;$
608 PPCODE: 750 PPCODE:
609{ 751{
610 STRLEN svlen; 752 STRLEN svlen;
753 int fd = s_fileno_croak (fh, ix == EIO_WRITE);
611 char *svptr = SvPVbyte (data, svlen); 754 char *svptr = SvPVbyte (data, svlen);
612 UV len = SvUV (length); 755 UV len = SvUV (length);
613
614 SvUPGRADE (data, SVt_PV);
615 SvPOK_on (data);
616 756
617 if (dataoffset < 0) 757 if (dataoffset < 0)
618 dataoffset += svlen; 758 dataoffset += svlen;
619 759
620 if (dataoffset < 0 || dataoffset > svlen) 760 if (dataoffset < 0 || dataoffset > svlen)
626 if (!SvOK (length) || len + dataoffset > svlen) 766 if (!SvOK (length) || len + dataoffset > svlen)
627 len = svlen - dataoffset; 767 len = svlen - dataoffset;
628 } 768 }
629 else 769 else
630 { 770 {
631 /* read: grow scalar as necessary */ 771 /* read: check type and grow scalar as necessary */
772 SvUPGRADE (data, SVt_PV);
632 svptr = SvGROW (data, len + dataoffset + 1); 773 svptr = SvGROW (data, len + dataoffset + 1);
633 } 774 }
634
635 if (len < 0)
636 croak ("length must not be negative");
637 775
638 { 776 {
639 dREQ; 777 dREQ;
640 778
641 req->type = ix; 779 req->type = ix;
642 req->sv1 = newSVsv (fh); 780 req->sv1 = newSVsv (fh);
643 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 781 req->int1 = fd;
644 : IoOFP (sv_2io (fh)));
645 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 782 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
646 req->size = len; 783 req->size = len;
647 req->sv2 = SvREFCNT_inc (data); 784 req->sv2 = SvREFCNT_inc (data);
648 req->ptr2 = (char *)svptr + dataoffset; 785 req->ptr2 = (char *)svptr + dataoffset;
649 req->stroffset = dataoffset; 786 req->stroffset = dataoffset;
664 PPCODE: 801 PPCODE:
665{ 802{
666 SV *data; 803 SV *data;
667 dREQ; 804 dREQ;
668 805
669 data = newSV (NAME_MAX);
670 SvPOK_on (data);
671
672 req->type = EIO_READLINK; 806 req->type = EIO_READLINK;
673 req->sv1 = newSVsv (path); 807 req->sv1 = newSVsv (path);
674 req->ptr1 = SvPVbyte_nolen (req->sv1); 808 req->ptr1 = SvPVbyte_nolen (req->sv1);
675 req->sv2 = data;
676 req->ptr2 = SvPVbyte_nolen (data);
677 809
678 REQ_SEND; 810 REQ_SEND;
679} 811}
680 812
681void 813void
682aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef) 814aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef)
683 PROTOTYPE: $$$$;$ 815 PROTOTYPE: $$$$;$
684 PPCODE: 816 PPCODE:
685{ 817{
818 int ifd = s_fileno_croak (in_fh , 0);
819 int ofd = s_fileno_croak (out_fh, 1);
686 dREQ; 820 dREQ;
687 821
688 req->type = EIO_SENDFILE; 822 req->type = EIO_SENDFILE;
689 req->sv1 = newSVsv (out_fh); 823 req->sv1 = newSVsv (out_fh);
690 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 824 req->int1 = ofd;
691 req->sv2 = newSVsv (in_fh); 825 req->sv2 = newSVsv (in_fh);
692 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 826 req->int2 = ifd;
693 req->offs = SvVAL64 (in_offset); 827 req->offs = in_offset;
694 req->size = length; 828 req->size = length;
695 829
696 REQ_SEND; 830 REQ_SEND;
697} 831}
698 832
699void 833void
700aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef) 834aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef)
701 PROTOTYPE: $$$;$ 835 PROTOTYPE: $$$;$
702 PPCODE: 836 PPCODE:
703{ 837{
838 int fd = s_fileno_croak (fh, 0);
704 dREQ; 839 dREQ;
705 840
706 req->type = EIO_READAHEAD; 841 req->type = EIO_READAHEAD;
707 req->sv1 = newSVsv (fh); 842 req->sv1 = newSVsv (fh);
708 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 843 req->int1 = fd;
709 req->offs = SvVAL64 (offset); 844 req->offs = offset;
710 req->size = length; 845 req->size = length;
711 846
712 REQ_SEND; 847 REQ_SEND;
713} 848}
714 849
719 aio_lstat = EIO_LSTAT 854 aio_lstat = EIO_LSTAT
720 PPCODE: 855 PPCODE:
721{ 856{
722 dREQ; 857 dREQ;
723 858
724 req->ptr2 = malloc (sizeof (EIO_STRUCT_STAT));
725 if (!req->ptr2)
726 {
727 req_destroy (req);
728 croak ("out of memory during aio_stat statdata allocation");
729 }
730
731 req->flags |= EIO_FLAG_PTR2_FREE;
732 req->sv1 = newSVsv (fh_or_path); 859 req->sv1 = newSVsv (fh_or_path);
733 860
734 if (SvPOK (fh_or_path)) 861 if (SvPOK (req->sv1))
735 { 862 {
736 req->type = ix; 863 req->type = ix;
737 req->ptr1 = SvPVbyte_nolen (req->sv1); 864 req->ptr1 = SvPVbyte_nolen (req->sv1);
738 } 865 }
739 else 866 else
753 880
754 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 881 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
755 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; 882 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
756 req->sv1 = newSVsv (fh_or_path); 883 req->sv1 = newSVsv (fh_or_path);
757 884
758 if (SvPOK (fh_or_path)) 885 if (SvPOK (req->sv1))
759 { 886 {
760 req->type = EIO_UTIME; 887 req->type = EIO_UTIME;
761 req->ptr1 = SvPVbyte_nolen (req->sv1); 888 req->ptr1 = SvPVbyte_nolen (req->sv1);
762 } 889 }
763 else 890 else
776 dREQ; 903 dREQ;
777 904
778 req->sv1 = newSVsv (fh_or_path); 905 req->sv1 = newSVsv (fh_or_path);
779 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 906 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
780 907
781 if (SvPOK (fh_or_path)) 908 if (SvPOK (req->sv1))
782 { 909 {
783 req->type = EIO_TRUNCATE; 910 req->type = EIO_TRUNCATE;
784 req->ptr1 = SvPVbyte_nolen (req->sv1); 911 req->ptr1 = SvPVbyte_nolen (req->sv1);
785 } 912 }
786 else 913 else
794 921
795void 922void
796aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef) 923aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
797 ALIAS: 924 ALIAS:
798 aio_chmod = EIO_CHMOD 925 aio_chmod = EIO_CHMOD
799 aio_fchmod = EIO_FCHMOD
800 aio_mkdir = EIO_MKDIR 926 aio_mkdir = EIO_MKDIR
801 PPCODE: 927 PPCODE:
802{ 928{
803 dREQ; 929 dREQ;
804 930
805 req->type = ix;
806 req->int2 = mode; 931 req->int2 = mode;
807 req->sv1 = newSVsv (fh_or_path); 932 req->sv1 = newSVsv (fh_or_path);
808 933
809 if (ix == EIO_FCHMOD) 934 if (SvPOK (req->sv1))
810 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 935 {
936 req->type = ix;
937 req->ptr1 = SvPVbyte_nolen (req->sv1);
938 }
811 else 939 else
812 req->ptr1 = SvPVbyte_nolen (req->sv1); 940 {
941 req->type = EIO_FCHMOD;
942 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
943 }
813 944
814 REQ_SEND; 945 REQ_SEND;
815} 946}
816 947
817void 948void
822 953
823 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 954 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
824 req->int3 = SvOK (gid) ? SvIV (gid) : -1; 955 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
825 req->sv1 = newSVsv (fh_or_path); 956 req->sv1 = newSVsv (fh_or_path);
826 957
827 if (SvPOK (fh_or_path)) 958 if (SvPOK (req->sv1))
828 { 959 {
829 req->type = EIO_CHOWN; 960 req->type = EIO_CHOWN;
830 req->ptr1 = SvPVbyte_nolen (req->sv1); 961 req->ptr1 = SvPVbyte_nolen (req->sv1);
831 } 962 }
832 else 963 else
834 req->type = EIO_FCHOWN; 965 req->type = EIO_FCHOWN;
835 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 966 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
836 } 967 }
837 968
838 REQ_SEND; 969 REQ_SEND;
970}
971
972void
973aio_readdirx (SV8 *pathname, IV flags, SV *callback=&PL_sv_undef)
974 PPCODE:
975{
976 dREQ;
977
978 req->type = EIO_READDIR;
979 req->sv1 = newSVsv (pathname);
980 req->ptr1 = SvPVbyte_nolen (req->sv1);
981 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
982
983 if (flags & EIO_READDIR_DENTS)
984 req->int1 |= EIO_READDIR_CUSTOM2;
985
986 REQ_SEND;
839} 987}
840 988
841void 989void
842aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 990aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
843 ALIAS: 991 ALIAS:
908{ 1056{
909 dREQ; 1057 dREQ;
910 1058
911 req->type = EIO_GROUP; 1059 req->type = EIO_GROUP;
912 1060
913 eio_submit (req); 1061 req_submit (req);
914 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1062 XPUSHs (req_sv (req, AIO_GRP_KLASS));
915} 1063}
916 1064
917void 1065void
918aio_nop (SV *callback=&PL_sv_undef) 1066aio_nop (SV *callback=&PL_sv_undef)
930 1078
931int 1079int
932aioreq_pri (int pri = 0) 1080aioreq_pri (int pri = 0)
933 PROTOTYPE: ;$ 1081 PROTOTYPE: ;$
934 CODE: 1082 CODE:
935 RETVAL = next_pri - EIO_PRI_BIAS; 1083 RETVAL = next_pri;
936 if (items > 0) 1084 if (items > 0)
937 { 1085 {
938 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN; 1086 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
939 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX; 1087 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
940 next_pri = pri + EIO_PRI_BIAS; 1088 next_pri = pri;
941 } 1089 }
942 OUTPUT: 1090 OUTPUT:
943 RETVAL 1091 RETVAL
944 1092
945void 1093void
946aioreq_nice (int nice = 0) 1094aioreq_nice (int nice = 0)
947 CODE: 1095 CODE:
948 nice = next_pri - nice; 1096 nice = next_pri - nice;
949 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN; 1097 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
950 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX; 1098 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
951 next_pri = nice + EIO_PRI_BIAS; 1099 next_pri = nice;
952 1100
953void 1101void
954flush () 1102flush ()
955 PROTOTYPE: 1103 PROTOTYPE:
956 CODE: 1104 CODE:
1017 1165
1018int 1166int
1019nthreads() 1167nthreads()
1020 PROTOTYPE: 1168 PROTOTYPE:
1021 CODE: 1169 CODE:
1022 if (WORDACCESS_UNSAFE) X_LOCK (wrklock); 1170 RETVAL = eio_nthreads ();
1023 RETVAL = started;
1024 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1025 OUTPUT: 1171 OUTPUT:
1026 RETVAL 1172 RETVAL
1027 1173
1174int
1175fadvise (aio_rfd fh, off_t offset, off_t length, IV advice)
1176 PROTOTYPE: $$$$
1177 CODE:
1178#if _XOPEN_SOURCE >= 600 && !NO_FADVISE
1179 RETVAL = posix_fadvise (fh, offset, length, advice);
1180#else
1181 RETVAL = errno = ENOSYS;
1182#endif
1183 OUTPUT:
1184 RETVAL
1185
1186ssize_t
1187sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
1188 PROTOTYPE: $$$$
1189 CODE:
1190 eio_sendfile_sync (ofh, ifh, offset, count);
1191
1028void _on_next_submit (SV *cb) 1192void _on_next_submit (SV *cb)
1029 CODE: 1193 CODE:
1030 SvREFCNT_dec (on_next_submit); 1194 SvREFCNT_dec (on_next_submit);
1031 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1195 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1032 1196
1039 CODE: 1203 CODE:
1040 eio_cancel (req); 1204 eio_cancel (req);
1041 1205
1042void 1206void
1043cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1207cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1044 CODE: 1208 PPCODE:
1209{
1210 if (GIMME_V != G_VOID)
1211 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1212
1213 if (items > 1)
1214 {
1215 SV *cb_cv =get_cb (callback);
1216
1045 SvREFCNT_dec (req->callback); 1217 SvREFCNT_dec (req->callback);
1046 req->callback = newSVsv (callback); 1218 req->callback = SvREFCNT_inc (cb_cv);
1219 }
1220}
1047 1221
1048MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1222MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1049 1223
1050void 1224void
1051add (aio_req grp, ...) 1225add (aio_req grp, ...)
1083 AV *av; 1257 AV *av;
1084 1258
1085 grp->errorno = errno; 1259 grp->errorno = errno;
1086 1260
1087 av = newAV (); 1261 av = newAV ();
1262 av_extend (av, items - 1);
1088 1263
1089 for (i = 1; i < items; ++i ) 1264 for (i = 1; i < items; ++i )
1090 av_push (av, newSVsv (ST (i))); 1265 av_push (av, newSVsv (ST (i)));
1091 1266
1092 SvREFCNT_dec (grp->sv1); 1267 SvREFCNT_dec (grp->sv1);
1106void 1281void
1107feed (aio_req grp, SV *callback=&PL_sv_undef) 1282feed (aio_req grp, SV *callback=&PL_sv_undef)
1108 CODE: 1283 CODE:
1109{ 1284{
1110 SvREFCNT_dec (grp->sv2); 1285 SvREFCNT_dec (grp->sv2);
1111 grp->sv2 = newSVsv (callback); 1286 grp->sv2 = newSVsv (callback);
1287 grp->feed = aio_grp_feed;
1112 1288
1113 if (grp->int2 <= 0) 1289 if (grp->int2 <= 0)
1114 grp->int2 = 2; 1290 grp->int2 = 2;
1115 1291
1116 eio_grp_limit (grp, grp->int2); 1292 eio_grp_limit (grp, grp->int2);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines