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.150 by root, Wed Jul 1 08:11:24 2009 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines