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.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>
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 SvGETMAGIC (cb_sv);
539 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
540}
541
446#define dREQ \ 542#define dREQ \
543 SV *cb_cv; \
447 aio_req req; \ 544 aio_req req; \
448 int req_pri = next_pri; \ 545 int req_pri = next_pri; \
449 next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; \ 546 next_pri = EIO_PRI_DEFAULT; \
450 \ 547 \
451 if (SvOK (callback) && !SvROK (callback)) \ 548 cb_cv = get_cb (callback); \
452 croak ("callback must be undef or of reference type"); \
453 \ 549 \
454 Newz (0, req, 1, eio_req); \ 550 Newz (0, req, 1, eio_req); \
455 if (!req) \ 551 if (!req) \
456 croak ("out of memory during eio_req allocation"); \ 552 croak ("out of memory during eio_req allocation"); \
457 \ 553 \
458 req->callback = newSVsv (callback); \ 554 req->callback = SvREFCNT_inc (cb_cv); \
459 req->pri = req_pri 555 req->pri = req_pri
460 556
461#define REQ_SEND \ 557#define REQ_SEND \
558 PUTBACK; \
462 req_submit (req); \ 559 req_submit (req); \
560 SPAGAIN; \
463 \ 561 \
464 if (GIMME_V != G_VOID) \ 562 if (GIMME_V != G_VOID) \
465 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 563 XPUSHs (req_sv (req, AIO_REQ_KLASS));
466 564
467MODULE = IO::AIO PACKAGE = IO::AIO 565MODULE = IO::AIO PACKAGE = IO::AIO
468 566
469PROTOTYPES: ENABLE 567PROTOTYPES: ENABLE
470 568
471BOOT: 569BOOT:
472{ 570{
473 stash = gv_stashpv ("IO::AIO", 1); 571 static const struct {
474 572 const char *name;
475 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 573 IV iv;
476 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 574 } *civ, const_iv[] = {
477 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 575# define const_iv(name, value) { # name, (IV) value },
478 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 576# define const_eio(name) { # name, (IV) EIO_ ## name },
479 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)
480#ifdef _WIN32 583#ifndef _WIN32
481 X_MUTEX_CHECK (wrklock); 584 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 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)
492 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
493 create_respipe (); 618 create_respipe ();
494 619
495 if (eio_init (want_poll, done_poll) < 0) 620 if (eio_init (want_poll, done_poll) < 0)
496 croak ("IO::AIO: unable to initialise eio library"); 621 croak ("IO::AIO: unable to initialise eio library");
497 622
498 /* atfork child called in fifo order, so before eio's handler */ 623 /* atfork child called in fifo order, so before eio's handler */
499 X_THREAD_ATFORK (0, 0, atfork_child); 624 X_THREAD_ATFORK (0, 0, atfork_child);
500} 625}
501 626
502void 627void
503max_poll_reqs (int nreqs) 628max_poll_reqs (int nreqs)
504 PROTOTYPE: $ 629 PROTOTYPE: $
557 ALIAS: 682 ALIAS:
558 aio_fsync = EIO_FSYNC 683 aio_fsync = EIO_FSYNC
559 aio_fdatasync = EIO_FDATASYNC 684 aio_fdatasync = EIO_FDATASYNC
560 PPCODE: 685 PPCODE:
561{ 686{
687 int fd = s_fileno_croak (fh, 0);
562 dREQ; 688 dREQ;
563 689
564 req->type = ix; 690 req->type = ix;
565 req->sv1 = newSVsv (fh); 691 req->sv1 = newSVsv (fh);
566 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;
567 711
568 REQ_SEND (req); 712 REQ_SEND (req);
569} 713}
570 714
571void 715void
572aio_close (SV *fh, SV *callback=&PL_sv_undef) 716aio_close (SV *fh, SV *callback=&PL_sv_undef)
573 PROTOTYPE: $;$ 717 PROTOTYPE: $;$
574 PPCODE: 718 PPCODE:
575{ 719{
576 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);
577 dREQ; 722 dREQ;
578 723
579 if (close_pipe < 0) 724 if (close_pipe < 0)
580 { 725 {
581 int pipefd [2]; 726 int pipefd [2];
589 } 734 }
590 735
591 req->type = EIO_DUP2; 736 req->type = EIO_DUP2;
592 req->int1 = close_pipe; 737 req->int1 = close_pipe;
593 req->sv2 = newSVsv (fh); 738 req->sv2 = newSVsv (fh);
594 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 739 req->int2 = fd;
595 740
596 REQ_SEND (req); 741 REQ_SEND (req);
597} 742}
598 743
599void 744void
603 aio_write = EIO_WRITE 748 aio_write = EIO_WRITE
604 PROTOTYPE: $$$$$;$ 749 PROTOTYPE: $$$$$;$
605 PPCODE: 750 PPCODE:
606{ 751{
607 STRLEN svlen; 752 STRLEN svlen;
753 int fd = s_fileno_croak (fh, ix == EIO_WRITE);
608 char *svptr = SvPVbyte (data, svlen); 754 char *svptr = SvPVbyte (data, svlen);
609 UV len = SvUV (length); 755 UV len = SvUV (length);
610
611 SvUPGRADE (data, SVt_PV);
612 SvPOK_on (data);
613 756
614 if (dataoffset < 0) 757 if (dataoffset < 0)
615 dataoffset += svlen; 758 dataoffset += svlen;
616 759
617 if (dataoffset < 0 || dataoffset > svlen) 760 if (dataoffset < 0 || dataoffset > svlen)
623 if (!SvOK (length) || len + dataoffset > svlen) 766 if (!SvOK (length) || len + dataoffset > svlen)
624 len = svlen - dataoffset; 767 len = svlen - dataoffset;
625 } 768 }
626 else 769 else
627 { 770 {
628 /* read: grow scalar as necessary */ 771 /* read: check type and grow scalar as necessary */
772 SvUPGRADE (data, SVt_PV);
629 svptr = SvGROW (data, len + dataoffset + 1); 773 svptr = SvGROW (data, len + dataoffset + 1);
630 } 774 }
631
632 if (len < 0)
633 croak ("length must not be negative");
634 775
635 { 776 {
636 dREQ; 777 dREQ;
637 778
638 req->type = ix; 779 req->type = ix;
639 req->sv1 = newSVsv (fh); 780 req->sv1 = newSVsv (fh);
640 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 781 req->int1 = fd;
641 : IoOFP (sv_2io (fh)));
642 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 782 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
643 req->size = len; 783 req->size = len;
644 req->sv2 = SvREFCNT_inc (data); 784 req->sv2 = SvREFCNT_inc (data);
645 req->ptr2 = (char *)svptr + dataoffset; 785 req->ptr2 = (char *)svptr + dataoffset;
646 req->stroffset = dataoffset; 786 req->stroffset = dataoffset;
661 PPCODE: 801 PPCODE:
662{ 802{
663 SV *data; 803 SV *data;
664 dREQ; 804 dREQ;
665 805
666 data = newSV (NAME_MAX);
667 SvPOK_on (data);
668
669 req->type = EIO_READLINK; 806 req->type = EIO_READLINK;
670 req->sv1 = newSVsv (path); 807 req->sv1 = newSVsv (path);
671 req->ptr1 = SvPVbyte_nolen (req->sv1); 808 req->ptr1 = SvPVbyte_nolen (req->sv1);
672 req->sv2 = data;
673 req->ptr2 = SvPVbyte_nolen (data);
674 809
675 REQ_SEND; 810 REQ_SEND;
676} 811}
677 812
678void 813void
679aio_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)
680 PROTOTYPE: $$$$;$ 815 PROTOTYPE: $$$$;$
681 PPCODE: 816 PPCODE:
682{ 817{
818 int ifd = s_fileno_croak (in_fh , 0);
819 int ofd = s_fileno_croak (out_fh, 1);
683 dREQ; 820 dREQ;
684 821
685 req->type = EIO_SENDFILE; 822 req->type = EIO_SENDFILE;
686 req->sv1 = newSVsv (out_fh); 823 req->sv1 = newSVsv (out_fh);
687 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 824 req->int1 = ofd;
688 req->sv2 = newSVsv (in_fh); 825 req->sv2 = newSVsv (in_fh);
689 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 826 req->int2 = ifd;
690 req->offs = SvVAL64 (in_offset); 827 req->offs = in_offset;
691 req->size = length; 828 req->size = length;
692 829
693 REQ_SEND; 830 REQ_SEND;
694} 831}
695 832
696void 833void
697aio_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)
698 PROTOTYPE: $$$;$ 835 PROTOTYPE: $$$;$
699 PPCODE: 836 PPCODE:
700{ 837{
838 int fd = s_fileno_croak (fh, 0);
701 dREQ; 839 dREQ;
702 840
703 req->type = EIO_READAHEAD; 841 req->type = EIO_READAHEAD;
704 req->sv1 = newSVsv (fh); 842 req->sv1 = newSVsv (fh);
705 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 843 req->int1 = fd;
706 req->offs = SvVAL64 (offset); 844 req->offs = offset;
707 req->size = length; 845 req->size = length;
708 846
709 REQ_SEND; 847 REQ_SEND;
710} 848}
711 849
716 aio_lstat = EIO_LSTAT 854 aio_lstat = EIO_LSTAT
717 PPCODE: 855 PPCODE:
718{ 856{
719 dREQ; 857 dREQ;
720 858
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); 859 req->sv1 = newSVsv (fh_or_path);
730 860
731 if (SvPOK (fh_or_path)) 861 if (SvPOK (req->sv1))
732 { 862 {
733 req->type = ix; 863 req->type = ix;
734 req->ptr1 = SvPVbyte_nolen (req->sv1); 864 req->ptr1 = SvPVbyte_nolen (req->sv1);
735 } 865 }
736 else 866 else
750 880
751 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 881 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
752 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; 882 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
753 req->sv1 = newSVsv (fh_or_path); 883 req->sv1 = newSVsv (fh_or_path);
754 884
755 if (SvPOK (fh_or_path)) 885 if (SvPOK (req->sv1))
756 { 886 {
757 req->type = EIO_UTIME; 887 req->type = EIO_UTIME;
758 req->ptr1 = SvPVbyte_nolen (req->sv1); 888 req->ptr1 = SvPVbyte_nolen (req->sv1);
759 } 889 }
760 else 890 else
773 dREQ; 903 dREQ;
774 904
775 req->sv1 = newSVsv (fh_or_path); 905 req->sv1 = newSVsv (fh_or_path);
776 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 906 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
777 907
778 if (SvPOK (fh_or_path)) 908 if (SvPOK (req->sv1))
779 { 909 {
780 req->type = EIO_TRUNCATE; 910 req->type = EIO_TRUNCATE;
781 req->ptr1 = SvPVbyte_nolen (req->sv1); 911 req->ptr1 = SvPVbyte_nolen (req->sv1);
782 } 912 }
783 else 913 else
791 921
792void 922void
793aio_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)
794 ALIAS: 924 ALIAS:
795 aio_chmod = EIO_CHMOD 925 aio_chmod = EIO_CHMOD
796 aio_fchmod = EIO_FCHMOD
797 aio_mkdir = EIO_MKDIR 926 aio_mkdir = EIO_MKDIR
798 PPCODE: 927 PPCODE:
799{ 928{
800 dREQ; 929 dREQ;
801 930
802 req->type = ix;
803 req->int2 = mode; 931 req->int2 = mode;
804 req->sv1 = newSVsv (fh_or_path); 932 req->sv1 = newSVsv (fh_or_path);
805 933
806 if (ix == EIO_FCHMOD) 934 if (SvPOK (req->sv1))
807 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 935 {
936 req->type = ix;
937 req->ptr1 = SvPVbyte_nolen (req->sv1);
938 }
808 else 939 else
809 req->ptr1 = SvPVbyte_nolen (req->sv1); 940 {
941 req->type = EIO_FCHMOD;
942 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
943 }
810 944
811 REQ_SEND; 945 REQ_SEND;
812} 946}
813 947
814void 948void
819 953
820 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 954 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
821 req->int3 = SvOK (gid) ? SvIV (gid) : -1; 955 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
822 req->sv1 = newSVsv (fh_or_path); 956 req->sv1 = newSVsv (fh_or_path);
823 957
824 if (SvPOK (fh_or_path)) 958 if (SvPOK (req->sv1))
825 { 959 {
826 req->type = EIO_CHOWN; 960 req->type = EIO_CHOWN;
827 req->ptr1 = SvPVbyte_nolen (req->sv1); 961 req->ptr1 = SvPVbyte_nolen (req->sv1);
828 } 962 }
829 else 963 else
831 req->type = EIO_FCHOWN; 965 req->type = EIO_FCHOWN;
832 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 966 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
833 } 967 }
834 968
835 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;
836} 987}
837 988
838void 989void
839aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 990aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
840 ALIAS: 991 ALIAS:
905{ 1056{
906 dREQ; 1057 dREQ;
907 1058
908 req->type = EIO_GROUP; 1059 req->type = EIO_GROUP;
909 1060
910 eio_submit (req); 1061 req_submit (req);
911 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1062 XPUSHs (req_sv (req, AIO_GRP_KLASS));
912} 1063}
913 1064
914void 1065void
915aio_nop (SV *callback=&PL_sv_undef) 1066aio_nop (SV *callback=&PL_sv_undef)
927 1078
928int 1079int
929aioreq_pri (int pri = 0) 1080aioreq_pri (int pri = 0)
930 PROTOTYPE: ;$ 1081 PROTOTYPE: ;$
931 CODE: 1082 CODE:
932 RETVAL = next_pri - EIO_PRI_BIAS; 1083 RETVAL = next_pri;
933 if (items > 0) 1084 if (items > 0)
934 { 1085 {
935 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN; 1086 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
936 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX; 1087 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
937 next_pri = pri + EIO_PRI_BIAS; 1088 next_pri = pri;
938 } 1089 }
939 OUTPUT: 1090 OUTPUT:
940 RETVAL 1091 RETVAL
941 1092
942void 1093void
943aioreq_nice (int nice = 0) 1094aioreq_nice (int nice = 0)
944 CODE: 1095 CODE:
945 nice = next_pri - nice; 1096 nice = next_pri - nice;
946 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN; 1097 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
947 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX; 1098 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
948 next_pri = nice + EIO_PRI_BIAS; 1099 next_pri = nice;
949 1100
950void 1101void
951flush () 1102flush ()
952 PROTOTYPE: 1103 PROTOTYPE:
953 CODE: 1104 CODE:
1014 1165
1015int 1166int
1016nthreads() 1167nthreads()
1017 PROTOTYPE: 1168 PROTOTYPE:
1018 CODE: 1169 CODE:
1019 if (WORDACCESS_UNSAFE) X_LOCK (wrklock); 1170 RETVAL = eio_nthreads ();
1020 RETVAL = started;
1021 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1022 OUTPUT: 1171 OUTPUT:
1023 RETVAL 1172 RETVAL
1024 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
1025void _on_next_submit (SV *cb) 1192void _on_next_submit (SV *cb)
1026 CODE: 1193 CODE:
1027 SvREFCNT_dec (on_next_submit); 1194 SvREFCNT_dec (on_next_submit);
1028 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1195 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1029 1196
1036 CODE: 1203 CODE:
1037 eio_cancel (req); 1204 eio_cancel (req);
1038 1205
1039void 1206void
1040cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1207cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1041 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
1042 SvREFCNT_dec (req->callback); 1217 SvREFCNT_dec (req->callback);
1043 req->callback = newSVsv (callback); 1218 req->callback = SvREFCNT_inc (cb_cv);
1219 }
1220}
1044 1221
1045MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1222MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1046 1223
1047void 1224void
1048add (aio_req grp, ...) 1225add (aio_req grp, ...)
1080 AV *av; 1257 AV *av;
1081 1258
1082 grp->errorno = errno; 1259 grp->errorno = errno;
1083 1260
1084 av = newAV (); 1261 av = newAV ();
1262 av_extend (av, items - 1);
1085 1263
1086 for (i = 1; i < items; ++i ) 1264 for (i = 1; i < items; ++i )
1087 av_push (av, newSVsv (ST (i))); 1265 av_push (av, newSVsv (ST (i)));
1088 1266
1089 SvREFCNT_dec (grp->sv1); 1267 SvREFCNT_dec (grp->sv1);
1103void 1281void
1104feed (aio_req grp, SV *callback=&PL_sv_undef) 1282feed (aio_req grp, SV *callback=&PL_sv_undef)
1105 CODE: 1283 CODE:
1106{ 1284{
1107 SvREFCNT_dec (grp->sv2); 1285 SvREFCNT_dec (grp->sv2);
1108 grp->sv2 = newSVsv (callback); 1286 grp->sv2 = newSVsv (callback);
1287 grp->feed = aio_grp_feed;
1109 1288
1110 if (grp->int2 <= 0) 1289 if (grp->int2 <= 0)
1111 grp->int2 = 2; 1290 grp->int2 = 2;
1112 1291
1113 eio_grp_limit (grp, grp->int2); 1292 eio_grp_limit (grp, grp->int2);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines