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.117 by root, Sat May 10 20:02:09 2008 UTC vs.
Revision 1.151 by root, Tue Jul 14 00:13:36 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>
13#include <sys/stat.h> 15#include <sys/stat.h>
14#include <limits.h> 16#include <limits.h>
15#include <fcntl.h> 17#include <fcntl.h>
16#include <sched.h> 18#include <sched.h>
19
20/* perl namespace pollution */
21#undef VERSION
17 22
18#ifdef _WIN32 23#ifdef _WIN32
19 24
20# define EIO_STRUCT_DIRENT Direntry_t 25# define EIO_STRUCT_DIRENT Direntry_t
21# undef malloc 26# undef malloc
62# include <signal.h> 67# include <signal.h>
63# define EIO_STRUCT_DIRENT struct dirent 68# define EIO_STRUCT_DIRENT struct dirent
64 69
65#endif 70#endif
66 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
67#define EIO_STRUCT_STAT Stat_t 78#define EIO_STRUCT_STAT Stat_t
68 79
69/* use NV for 32 bit perls as it allows larger offsets */ 80/* use NV for 32 bit perls as it allows larger offsets */
70#if IVSIZE >= 8 81#if IVSIZE >= 8
82# define VAL64 IV
71# define SvVAL64 SvIV 83# define SvVAL64 SvIV
84# define newSVval64 newSViv
72#else 85#else
86# define VAL64 NV
73# define SvVAL64 SvNV 87# define SvVAL64 SvNV
88# define newSVval64 newSVnv
74#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/*****************************************************************************/
75 103
76static HV *stash; 104static HV *stash;
77typedef 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 */
78 108
79#define AIO_REQ_KLASS "IO::AIO::REQ" 109#define AIO_REQ_KLASS "IO::AIO::REQ"
80#define AIO_GRP_KLASS "IO::AIO::GRP" 110#define AIO_GRP_KLASS "IO::AIO::GRP"
81 111
82#define EIO_COMMON \ 112#define EIO_REQ_MEMBERS \
83 SV *callback; \ 113 SV *callback; \
84 SV *sv1, *sv2; \ 114 SV *sv1, *sv2; \
85 STRLEN stroffset; \ 115 STRLEN stroffset; \
86 SV *self 116 SV *self;
117
118#define EIO_NO_WRAPPERS 1
87 119
88#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
89 146
90static int req_invoke (eio_req *req); 147static int req_invoke (eio_req *req);
91#define EIO_FINISH(req) req_invoke (req) 148#define EIO_FINISH(req) req_invoke (req)
92static void aio_grp_feed (eio_req *grp);
93#define EIO_FEED(req) aio_grp_feed (req)
94static void req_destroy (eio_req *grp); 149static void req_destroy (eio_req *grp);
95#define EIO_DESTROY(req) req_destroy (req) 150#define EIO_DESTROY(req) req_destroy (req)
96 151
97enum { 152enum {
98 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ 153 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
102 157
103typedef eio_req *aio_req; 158typedef eio_req *aio_req;
104typedef eio_req *aio_req_ornot; 159typedef eio_req *aio_req_ornot;
105 160
106static SV *on_next_submit; 161static SV *on_next_submit;
107static int next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; 162static int next_pri = EIO_PRI_DEFAULT;
108static int max_outstanding; 163static int max_outstanding;
109 164
110static int respipe_osf [2], respipe [2] = { -1, -1 }; 165static int respipe_osf [2], respipe [2] = { -1, -1 };
111 166
112static void req_destroy (aio_req req); 167static void req_destroy (aio_req req);
170 225
171static void req_submit (eio_req *req) 226static void req_submit (eio_req *req)
172{ 227{
173 eio_submit (req); 228 eio_submit (req);
174 229
175 if (on_next_submit) 230 if (expect_false (on_next_submit))
176 { 231 {
177 dSP; 232 dSP;
178 SV *cb = sv_2mortal (on_next_submit); 233 SV *cb = sv_2mortal (on_next_submit);
179 234
180 on_next_submit = 0; 235 on_next_submit = 0;
190 dSP; 245 dSP;
191 246
192 if (req->flags & FLAG_SV2_RO_OFF) 247 if (req->flags & FLAG_SV2_RO_OFF)
193 SvREADONLY_off (req->sv2); 248 SvREADONLY_off (req->sv2);
194 249
195 if (!EIO_CANCELLED (req) && SvOK (req->callback)) 250 if (!EIO_CANCELLED (req) && req->callback)
196 { 251 {
197 ENTER; 252 ENTER;
198 SAVETMPS; 253 SAVETMPS;
199 PUSHMARK (SP); 254 PUSHMARK (SP);
200 EXTEND (SP, 1); 255 EXTEND (SP, 1);
206 SV *rv = &PL_sv_undef; 261 SV *rv = &PL_sv_undef;
207 262
208 if (req->result >= 0) 263 if (req->result >= 0)
209 { 264 {
210 int i; 265 int i;
211 char *buf = req->ptr2; 266 char *names = (char *)req->ptr2;
267 eio_dirent *ent = (eio_dirent *)req->ptr1; /* might be 0 */
212 AV *av = newAV (); 268 AV *av = newAV ();
213 269
214 av_extend (av, req->result - 1); 270 av_extend (av, req->result - 1);
215 271
216 for (i = 0; i < req->result; ++i) 272 for (i = 0; i < req->result; ++i)
217 { 273 {
218 SV *sv = newSVpv (buf, 0); 274 if (req->int1 & EIO_READDIR_DENTS)
275 {
276 SV *namesv = newSVpvn (names + ent->nameofs, ent->namelen);
219 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
220 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);
221 buf += SvCUR (sv) + 1; 306 names += SvCUR (name) + 1;
307 }
222 } 308 }
223 309
224 rv = sv_2mortal (newRV_noinc ((SV *)av)); 310 rv = sv_2mortal (newRV_noinc ((SV *)av));
225 } 311 }
226 312
227 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))));
228 } 317 }
229 break; 318 break;
230 319
231 case EIO_OPEN: 320 case EIO_OPEN:
232 { 321 {
238 GV *gv = (GV *)sv_newmortal (); 327 GV *gv = (GV *)sv_newmortal ();
239 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR); 328 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
240 char sym [64]; 329 char sym [64];
241 int symlen; 330 int symlen;
242 331
243 symlen = snprintf (sym, sizeof (sym), "fd#%d", req->result); 332 symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
244 gv_init (gv, stash, sym, symlen, 0); 333 gv_init (gv, stash, sym, symlen, 0);
245 334
246 symlen = snprintf ( 335 symlen = snprintf (
247 sym, 336 sym,
248 sizeof (sym), 337 sizeof (sym),
249 "%s&=%d", 338 "%s&=%d",
250 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<", 339 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
251 req->result 340 (int)req->result
252 ); 341 );
253 342
254 if (do_open (gv, sym, symlen, 0, 0, 0, 0)) 343 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
255 fh = (SV *)gv; 344 fh = (SV *)gv;
256 } 345 }
277 case EIO_BUSY: 366 case EIO_BUSY:
278 break; 367 break;
279 368
280 case EIO_READLINK: 369 case EIO_READLINK:
281 if (req->result > 0) 370 if (req->result > 0)
282 { 371 PUSHs (sv_2mortal (newSVpvn (req->ptr2, req->result)));
283 SvCUR_set (req->sv2, req->result);
284 *SvEND (req->sv2) = 0;
285 PUSHs (req->sv2);
286 }
287 break; 372 break;
288 373
289 case EIO_STAT: 374 case EIO_STAT:
290 case EIO_LSTAT: 375 case EIO_LSTAT:
291 case EIO_FSTAT: 376 case EIO_FSTAT:
294 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 379 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
295 PUSHs (sv_2mortal (newSViv (req->result))); 380 PUSHs (sv_2mortal (newSViv (req->result)));
296 break; 381 break;
297 382
298 case EIO_READ: 383 case EIO_READ:
384 {
299 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));
300 *SvEND (req->sv2) = 0; 386 *SvEND (req->sv2) = 0;
387 SvPOK_only (req->sv2);
388 SvSETMAGIC (req->sv2);
301 PUSHs (sv_2mortal (newSViv (req->result))); 389 PUSHs (sv_2mortal (newSViv (req->result)));
390 }
302 break; 391 break;
303 392
304 case EIO_DUP2: 393 case EIO_DUP2:
305 if (req->result > 0) 394 if (req->result > 0)
306 req->result = 0; 395 req->result = 0;
411 X_UNLOCK (reslock); 500 X_UNLOCK (reslock);
412 501
413 if (size) 502 if (size)
414 return; 503 return;
415 504
416 maybe_start_thread (); 505 etp_maybe_start_thread ();
417 506
418 FD_ZERO (&rfd); 507 FD_ZERO (&rfd);
419 FD_SET (respipe [0], &rfd); 508 FD_SET (respipe [0], &rfd);
420 509
421 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0); 510 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
422 } 511 }
423} 512}
424 513
425static int poll_cb (void) 514static int poll_cb (void)
426{ 515{
427 int res; 516 for (;;)
428
429 do
430 { 517 {
431 res = eio_poll (); 518 int res = eio_poll ();
432 519
433 if (res > 0) 520 if (res > 0)
434 croak (0); 521 croak (0);
522
523 if (!max_outstanding || max_outstanding > eio_nreqs ())
524 return res;
525
526 poll_wait ();
435 } 527 }
436 while (max_outstanding && max_outstanding <= eio_nreqs ());
437
438 return res;
439} 528}
440 529
441static void atfork_child (void) 530static void atfork_child (void)
442{ 531{
443 create_respipe (); 532 create_respipe ();
444} 533}
445 534
535static SV *
536get_cb (SV *cb_sv)
537{
538 HV *st;
539 GV *gvp;
540 CV *cv;
541
542 if (!SvOK (cb_sv))
543 return 0;
544
545 cv = sv_2cv (cb_sv, &st, &gvp, 0);
546
547 if (!cv)
548 croak ("IO::AIO callback must be undef or a CODE reference");
549
550 return (SV *)cv;
551}
552
446#define dREQ \ 553#define dREQ \
554 SV *cb_cv; \
447 aio_req req; \ 555 aio_req req; \
448 int req_pri = next_pri; \ 556 int req_pri = next_pri; \
449 next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; \ 557 next_pri = EIO_PRI_DEFAULT; \
450 \ 558 \
451 if (SvOK (callback) && !SvROK (callback)) \ 559 cb_cv = get_cb (callback); \
452 croak ("callback must be undef or of reference type"); \
453 \ 560 \
454 Newz (0, req, 1, eio_req); \ 561 Newz (0, req, 1, eio_req); \
455 if (!req) \ 562 if (!req) \
456 croak ("out of memory during eio_req allocation"); \ 563 croak ("out of memory during eio_req allocation"); \
457 \ 564 \
458 req->callback = newSVsv (callback); \ 565 req->callback = SvREFCNT_inc (cb_cv); \
459 req->pri = req_pri 566 req->pri = req_pri
460 567
461#define REQ_SEND \ 568#define REQ_SEND \
569 PUTBACK; \
462 req_submit (req); \ 570 req_submit (req); \
571 SPAGAIN; \
463 \ 572 \
464 if (GIMME_V != G_VOID) \ 573 if (GIMME_V != G_VOID) \
465 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 574 XPUSHs (req_sv (req, AIO_REQ_KLASS));
466 575
467MODULE = IO::AIO PACKAGE = IO::AIO 576MODULE = IO::AIO PACKAGE = IO::AIO
468 577
469PROTOTYPES: ENABLE 578PROTOTYPES: ENABLE
470 579
471BOOT: 580BOOT:
472{ 581{
473 stash = gv_stashpv ("IO::AIO", 1); 582 static const struct {
474 583 const char *name;
475 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 584 IV iv;
476 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 585 } *civ, const_iv[] = {
477 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 586# define const_iv(name, value) { # name, (IV) value },
478 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 587# define const_eio(name) { # name, (IV) EIO_ ## name },
479 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 588 const_iv (EXDEV , EXDEV)
589 const_iv (ENOSYS , ENOSYS)
590 const_iv (O_RDONLY, O_RDONLY)
591 const_iv (O_WRONLY, O_WRONLY)
592 const_iv (O_CREAT , O_CREAT)
593 const_iv (O_TRUNC , O_TRUNC)
480#ifdef _WIN32 594#ifndef _WIN32
481 X_MUTEX_CHECK (wrklock); 595 const_iv (S_IFIFO , S_IFIFO)
482 X_MUTEX_CHECK (reslock);
483 X_MUTEX_CHECK (reqlock);
484 X_MUTEX_CHECK (reqwait);
485 X_MUTEX_CHECK (preadwritelock);
486 X_MUTEX_CHECK (readdirlock);
487
488 X_COND_CHECK (reqwait);
489#else
490 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
491#endif 596#endif
597 const_iv (FADV_NORMAL , POSIX_FADV_NORMAL)
598 const_iv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL)
599 const_iv (FADV_RANDOM , POSIX_FADV_RANDOM)
600 const_iv (FADV_NOREUSE , POSIX_FADV_NOREUSE)
601 const_iv (FADV_WILLNEED , POSIX_FADV_WILLNEED)
602 const_iv (FADV_DONTNEED , POSIX_FADV_DONTNEED)
492 603
604 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
605 const_eio (SYNC_FILE_RANGE_WRITE)
606 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
607
608 const_eio (READDIR_DENTS)
609 const_eio (READDIR_DIRS_FIRST)
610 const_eio (READDIR_STAT_ORDER)
611 const_eio (READDIR_FOUND_UNKNOWN)
612
613 const_eio (DT_UNKNOWN)
614 const_eio (DT_FIFO)
615 const_eio (DT_CHR)
616 const_eio (DT_DIR)
617 const_eio (DT_BLK)
618 const_eio (DT_REG)
619 const_eio (DT_LNK)
620 const_eio (DT_SOCK)
621 const_eio (DT_WHT)
622 };
623
624 stash = gv_stashpv ("IO::AIO", 1);
625
626 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
627 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
628
493 create_respipe (); 629 create_respipe ();
494 630
495 if (eio_init (want_poll, done_poll) < 0) 631 if (eio_init (want_poll, done_poll) < 0)
496 croak ("IO::AIO: unable to initialise eio library"); 632 croak ("IO::AIO: unable to initialise eio library");
497 633
498 /* atfork child called in fifo order, so before eio's handler */ 634 /* atfork child called in fifo order, so before eio's handler */
499 X_THREAD_ATFORK (0, 0, atfork_child); 635 X_THREAD_ATFORK (0, 0, atfork_child);
500} 636}
501 637
502void 638void
503max_poll_reqs (int nreqs) 639max_poll_reqs (int nreqs)
504 PROTOTYPE: $ 640 PROTOTYPE: $
557 ALIAS: 693 ALIAS:
558 aio_fsync = EIO_FSYNC 694 aio_fsync = EIO_FSYNC
559 aio_fdatasync = EIO_FDATASYNC 695 aio_fdatasync = EIO_FDATASYNC
560 PPCODE: 696 PPCODE:
561{ 697{
698 int fd = s_fileno_croak (fh, 0);
562 dREQ; 699 dREQ;
563 700
564 req->type = ix; 701 req->type = ix;
565 req->sv1 = newSVsv (fh); 702 req->sv1 = newSVsv (fh);
566 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 703 req->int1 = fd;
704
705 REQ_SEND (req);
706}
707
708void
709aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef)
710 PROTOTYPE: $$$$;$
711 PPCODE:
712{
713 int fd = s_fileno_croak (fh, 0);
714 dREQ;
715
716 req->type = EIO_SYNC_FILE_RANGE;
717 req->sv1 = newSVsv (fh);
718 req->int1 = fd;
719 req->offs = offset;
720 req->size = nbytes;
721 req->int2 = flags;
567 722
568 REQ_SEND (req); 723 REQ_SEND (req);
569} 724}
570 725
571void 726void
572aio_close (SV *fh, SV *callback=&PL_sv_undef) 727aio_close (SV *fh, SV *callback=&PL_sv_undef)
573 PROTOTYPE: $;$ 728 PROTOTYPE: $;$
574 PPCODE: 729 PPCODE:
575{ 730{
576 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 731 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
732 int fd = s_fileno_croak (fh, 0);
577 dREQ; 733 dREQ;
578 734
579 if (close_pipe < 0) 735 if (close_pipe < 0)
580 { 736 {
581 int pipefd [2]; 737 int pipefd [2];
589 } 745 }
590 746
591 req->type = EIO_DUP2; 747 req->type = EIO_DUP2;
592 req->int1 = close_pipe; 748 req->int1 = close_pipe;
593 req->sv2 = newSVsv (fh); 749 req->sv2 = newSVsv (fh);
594 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 750 req->int2 = fd;
595 751
596 REQ_SEND (req); 752 REQ_SEND (req);
597} 753}
598 754
599void 755void
603 aio_write = EIO_WRITE 759 aio_write = EIO_WRITE
604 PROTOTYPE: $$$$$;$ 760 PROTOTYPE: $$$$$;$
605 PPCODE: 761 PPCODE:
606{ 762{
607 STRLEN svlen; 763 STRLEN svlen;
764 int fd = s_fileno_croak (fh, ix == EIO_WRITE);
608 char *svptr = SvPVbyte (data, svlen); 765 char *svptr = SvPVbyte (data, svlen);
609 UV len = SvUV (length); 766 UV len = SvUV (length);
610
611 SvUPGRADE (data, SVt_PV);
612 SvPOK_on (data);
613 767
614 if (dataoffset < 0) 768 if (dataoffset < 0)
615 dataoffset += svlen; 769 dataoffset += svlen;
616 770
617 if (dataoffset < 0 || dataoffset > svlen) 771 if (dataoffset < 0 || dataoffset > svlen)
623 if (!SvOK (length) || len + dataoffset > svlen) 777 if (!SvOK (length) || len + dataoffset > svlen)
624 len = svlen - dataoffset; 778 len = svlen - dataoffset;
625 } 779 }
626 else 780 else
627 { 781 {
628 /* read: grow scalar as necessary */ 782 /* read: check type and grow scalar as necessary */
783 SvUPGRADE (data, SVt_PV);
629 svptr = SvGROW (data, len + dataoffset + 1); 784 svptr = SvGROW (data, len + dataoffset + 1);
630 } 785 }
631
632 if (len < 0)
633 croak ("length must not be negative");
634 786
635 { 787 {
636 dREQ; 788 dREQ;
637 789
638 req->type = ix; 790 req->type = ix;
639 req->sv1 = newSVsv (fh); 791 req->sv1 = newSVsv (fh);
640 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 792 req->int1 = fd;
641 : IoOFP (sv_2io (fh)));
642 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 793 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
643 req->size = len; 794 req->size = len;
644 req->sv2 = SvREFCNT_inc (data); 795 req->sv2 = SvREFCNT_inc (data);
645 req->ptr2 = (char *)svptr + dataoffset; 796 req->ptr2 = (char *)svptr + dataoffset;
646 req->stroffset = dataoffset; 797 req->stroffset = dataoffset;
661 PPCODE: 812 PPCODE:
662{ 813{
663 SV *data; 814 SV *data;
664 dREQ; 815 dREQ;
665 816
666 data = newSV (NAME_MAX);
667 SvPOK_on (data);
668
669 req->type = EIO_READLINK; 817 req->type = EIO_READLINK;
670 req->sv1 = newSVsv (path); 818 req->sv1 = newSVsv (path);
671 req->ptr1 = SvPVbyte_nolen (req->sv1); 819 req->ptr1 = SvPVbyte_nolen (req->sv1);
672 req->sv2 = data;
673 req->ptr2 = SvPVbyte_nolen (data);
674 820
675 REQ_SEND; 821 REQ_SEND;
676} 822}
677 823
678void 824void
679aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef) 825aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef)
680 PROTOTYPE: $$$$;$ 826 PROTOTYPE: $$$$;$
681 PPCODE: 827 PPCODE:
682{ 828{
829 int ifd = s_fileno_croak (in_fh , 0);
830 int ofd = s_fileno_croak (out_fh, 1);
683 dREQ; 831 dREQ;
684 832
685 req->type = EIO_SENDFILE; 833 req->type = EIO_SENDFILE;
686 req->sv1 = newSVsv (out_fh); 834 req->sv1 = newSVsv (out_fh);
687 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 835 req->int1 = ofd;
688 req->sv2 = newSVsv (in_fh); 836 req->sv2 = newSVsv (in_fh);
689 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 837 req->int2 = ifd;
690 req->offs = SvVAL64 (in_offset); 838 req->offs = in_offset;
691 req->size = length; 839 req->size = length;
692 840
693 REQ_SEND; 841 REQ_SEND;
694} 842}
695 843
696void 844void
697aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef) 845aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef)
698 PROTOTYPE: $$$;$ 846 PROTOTYPE: $$$;$
699 PPCODE: 847 PPCODE:
700{ 848{
849 int fd = s_fileno_croak (fh, 0);
701 dREQ; 850 dREQ;
702 851
703 req->type = EIO_READAHEAD; 852 req->type = EIO_READAHEAD;
704 req->sv1 = newSVsv (fh); 853 req->sv1 = newSVsv (fh);
705 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 854 req->int1 = fd;
706 req->offs = SvVAL64 (offset); 855 req->offs = offset;
707 req->size = length; 856 req->size = length;
708 857
709 REQ_SEND; 858 REQ_SEND;
710} 859}
711 860
716 aio_lstat = EIO_LSTAT 865 aio_lstat = EIO_LSTAT
717 PPCODE: 866 PPCODE:
718{ 867{
719 dREQ; 868 dREQ;
720 869
721 req->ptr2 = malloc (sizeof (EIO_STRUCT_STAT));
722 if (!req->ptr2)
723 {
724 req_destroy (req);
725 croak ("out of memory during aio_stat statdata allocation");
726 }
727
728 req->flags |= EIO_FLAG_PTR2_FREE;
729 req->sv1 = newSVsv (fh_or_path); 870 req->sv1 = newSVsv (fh_or_path);
730 871
731 if (SvPOK (fh_or_path)) 872 if (SvPOK (req->sv1))
732 { 873 {
733 req->type = ix; 874 req->type = ix;
734 req->ptr1 = SvPVbyte_nolen (req->sv1); 875 req->ptr1 = SvPVbyte_nolen (req->sv1);
735 } 876 }
736 else 877 else
750 891
751 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 892 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
752 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; 893 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
753 req->sv1 = newSVsv (fh_or_path); 894 req->sv1 = newSVsv (fh_or_path);
754 895
755 if (SvPOK (fh_or_path)) 896 if (SvPOK (req->sv1))
756 { 897 {
757 req->type = EIO_UTIME; 898 req->type = EIO_UTIME;
758 req->ptr1 = SvPVbyte_nolen (req->sv1); 899 req->ptr1 = SvPVbyte_nolen (req->sv1);
759 } 900 }
760 else 901 else
773 dREQ; 914 dREQ;
774 915
775 req->sv1 = newSVsv (fh_or_path); 916 req->sv1 = newSVsv (fh_or_path);
776 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 917 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
777 918
778 if (SvPOK (fh_or_path)) 919 if (SvPOK (req->sv1))
779 { 920 {
780 req->type = EIO_TRUNCATE; 921 req->type = EIO_TRUNCATE;
781 req->ptr1 = SvPVbyte_nolen (req->sv1); 922 req->ptr1 = SvPVbyte_nolen (req->sv1);
782 } 923 }
783 else 924 else
791 932
792void 933void
793aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef) 934aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
794 ALIAS: 935 ALIAS:
795 aio_chmod = EIO_CHMOD 936 aio_chmod = EIO_CHMOD
796 aio_fchmod = EIO_FCHMOD
797 aio_mkdir = EIO_MKDIR 937 aio_mkdir = EIO_MKDIR
798 PPCODE: 938 PPCODE:
799{ 939{
800 dREQ; 940 dREQ;
801 941
802 req->type = ix;
803 req->int2 = mode; 942 req->int2 = mode;
804 req->sv1 = newSVsv (fh_or_path); 943 req->sv1 = newSVsv (fh_or_path);
805 944
806 if (ix == EIO_FCHMOD) 945 if (SvPOK (req->sv1))
807 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 946 {
947 req->type = ix;
948 req->ptr1 = SvPVbyte_nolen (req->sv1);
949 }
808 else 950 else
809 req->ptr1 = SvPVbyte_nolen (req->sv1); 951 {
952 req->type = EIO_FCHMOD;
953 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
954 }
810 955
811 REQ_SEND; 956 REQ_SEND;
812} 957}
813 958
814void 959void
819 964
820 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 965 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
821 req->int3 = SvOK (gid) ? SvIV (gid) : -1; 966 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
822 req->sv1 = newSVsv (fh_or_path); 967 req->sv1 = newSVsv (fh_or_path);
823 968
824 if (SvPOK (fh_or_path)) 969 if (SvPOK (req->sv1))
825 { 970 {
826 req->type = EIO_CHOWN; 971 req->type = EIO_CHOWN;
827 req->ptr1 = SvPVbyte_nolen (req->sv1); 972 req->ptr1 = SvPVbyte_nolen (req->sv1);
828 } 973 }
829 else 974 else
831 req->type = EIO_FCHOWN; 976 req->type = EIO_FCHOWN;
832 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 977 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
833 } 978 }
834 979
835 REQ_SEND; 980 REQ_SEND;
981}
982
983void
984aio_readdirx (SV8 *pathname, IV flags, SV *callback=&PL_sv_undef)
985 PPCODE:
986{
987 dREQ;
988
989 req->type = EIO_READDIR;
990 req->sv1 = newSVsv (pathname);
991 req->ptr1 = SvPVbyte_nolen (req->sv1);
992 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
993
994 if (flags & EIO_READDIR_DENTS)
995 req->int1 |= EIO_READDIR_CUSTOM2;
996
997 REQ_SEND;
836} 998}
837 999
838void 1000void
839aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 1001aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
840 ALIAS: 1002 ALIAS:
905{ 1067{
906 dREQ; 1068 dREQ;
907 1069
908 req->type = EIO_GROUP; 1070 req->type = EIO_GROUP;
909 1071
910 eio_submit (req); 1072 req_submit (req);
911 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1073 XPUSHs (req_sv (req, AIO_GRP_KLASS));
912} 1074}
913 1075
914void 1076void
915aio_nop (SV *callback=&PL_sv_undef) 1077aio_nop (SV *callback=&PL_sv_undef)
927 1089
928int 1090int
929aioreq_pri (int pri = 0) 1091aioreq_pri (int pri = 0)
930 PROTOTYPE: ;$ 1092 PROTOTYPE: ;$
931 CODE: 1093 CODE:
932 RETVAL = next_pri - EIO_PRI_BIAS; 1094 RETVAL = next_pri;
933 if (items > 0) 1095 if (items > 0)
934 { 1096 {
935 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN; 1097 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
936 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX; 1098 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
937 next_pri = pri + EIO_PRI_BIAS; 1099 next_pri = pri;
938 } 1100 }
939 OUTPUT: 1101 OUTPUT:
940 RETVAL 1102 RETVAL
941 1103
942void 1104void
943aioreq_nice (int nice = 0) 1105aioreq_nice (int nice = 0)
944 CODE: 1106 CODE:
945 nice = next_pri - nice; 1107 nice = next_pri - nice;
946 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN; 1108 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
947 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX; 1109 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
948 next_pri = nice + EIO_PRI_BIAS; 1110 next_pri = nice;
949 1111
950void 1112void
951flush () 1113flush ()
952 PROTOTYPE: 1114 PROTOTYPE:
953 CODE: 1115 CODE:
1014 1176
1015int 1177int
1016nthreads() 1178nthreads()
1017 PROTOTYPE: 1179 PROTOTYPE:
1018 CODE: 1180 CODE:
1019 if (WORDACCESS_UNSAFE) X_LOCK (wrklock); 1181 RETVAL = eio_nthreads ();
1020 RETVAL = started;
1021 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1022 OUTPUT: 1182 OUTPUT:
1023 RETVAL 1183 RETVAL
1024 1184
1185int
1186fadvise (aio_rfd fh, off_t offset, off_t length, IV advice)
1187 PROTOTYPE: $$$$
1188 CODE:
1189#if _XOPEN_SOURCE >= 600 && !NO_FADVISE
1190 RETVAL = posix_fadvise (fh, offset, length, advice);
1191#else
1192 RETVAL = errno = ENOSYS;
1193#endif
1194 OUTPUT:
1195 RETVAL
1196
1197ssize_t
1198sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
1199 PROTOTYPE: $$$$
1200 CODE:
1201 eio_sendfile_sync (ofh, ifh, offset, count);
1202
1025void _on_next_submit (SV *cb) 1203void _on_next_submit (SV *cb)
1026 CODE: 1204 CODE:
1027 SvREFCNT_dec (on_next_submit); 1205 SvREFCNT_dec (on_next_submit);
1028 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1206 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1029 1207
1036 CODE: 1214 CODE:
1037 eio_cancel (req); 1215 eio_cancel (req);
1038 1216
1039void 1217void
1040cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1218cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1041 CODE: 1219 PPCODE:
1220{
1221 if (GIMME_V != G_VOID)
1222 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1223
1224 if (items > 1)
1225 {
1226 SV *cb_cv = get_cb (callback);
1227
1042 SvREFCNT_dec (req->callback); 1228 SvREFCNT_dec (req->callback);
1043 req->callback = newSVsv (callback); 1229 req->callback = SvREFCNT_inc (cb_cv);
1230 }
1231}
1044 1232
1045MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1233MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1046 1234
1047void 1235void
1048add (aio_req grp, ...) 1236add (aio_req grp, ...)
1080 AV *av; 1268 AV *av;
1081 1269
1082 grp->errorno = errno; 1270 grp->errorno = errno;
1083 1271
1084 av = newAV (); 1272 av = newAV ();
1273 av_extend (av, items - 1);
1085 1274
1086 for (i = 1; i < items; ++i ) 1275 for (i = 1; i < items; ++i )
1087 av_push (av, newSVsv (ST (i))); 1276 av_push (av, newSVsv (ST (i)));
1088 1277
1089 SvREFCNT_dec (grp->sv1); 1278 SvREFCNT_dec (grp->sv1);
1103void 1292void
1104feed (aio_req grp, SV *callback=&PL_sv_undef) 1293feed (aio_req grp, SV *callback=&PL_sv_undef)
1105 CODE: 1294 CODE:
1106{ 1295{
1107 SvREFCNT_dec (grp->sv2); 1296 SvREFCNT_dec (grp->sv2);
1108 grp->sv2 = newSVsv (callback); 1297 grp->sv2 = newSVsv (callback);
1298 grp->feed = aio_grp_feed;
1109 1299
1110 if (grp->int2 <= 0) 1300 if (grp->int2 <= 0)
1111 grp->int2 = 2; 1301 grp->int2 = 2;
1112 1302
1113 eio_grp_limit (grp, grp->int2); 1303 eio_grp_limit (grp, grp->int2);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines