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.116 by root, Sat May 10 19:25:33 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 */
101#include "libeio/eio.c" 156#include "libeio/eio.c"
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
161static SV *on_next_submit;
162static int next_pri = EIO_PRI_DEFAULT;
106static int max_outstanding = 0; 163static int max_outstanding;
107
108static int next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS;
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);
113static void req_cancel (aio_req req); 168static void req_cancel (aio_req req);
166 FREETMPS; 221 FREETMPS;
167 LEAVE; 222 LEAVE;
168 } 223 }
169} 224}
170 225
226static void req_submit (eio_req *req)
227{
228 eio_submit (req);
229
230 if (expect_false (on_next_submit))
231 {
232 dSP;
233 SV *cb = sv_2mortal (on_next_submit);
234
235 on_next_submit = 0;
236
237 PUSHMARK (SP);
238 PUTBACK;
239 call_sv (cb, G_DISCARD | G_EVAL);
240 }
241}
242
171static int req_invoke (eio_req *req) 243static int req_invoke (eio_req *req)
172{ 244{
173 dSP; 245 dSP;
174 246
175 if (req->flags & FLAG_SV2_RO_OFF) 247 if (req->flags & FLAG_SV2_RO_OFF)
176 SvREADONLY_off (req->sv2); 248 SvREADONLY_off (req->sv2);
177 249
178 if (!EIO_CANCELLED (req) && SvOK (req->callback)) 250 if (!EIO_CANCELLED (req) && req->callback)
179 { 251 {
180 ENTER; 252 ENTER;
181 SAVETMPS; 253 SAVETMPS;
182 PUSHMARK (SP); 254 PUSHMARK (SP);
183 EXTEND (SP, 1); 255 EXTEND (SP, 1);
189 SV *rv = &PL_sv_undef; 261 SV *rv = &PL_sv_undef;
190 262
191 if (req->result >= 0) 263 if (req->result >= 0)
192 { 264 {
193 int i; 265 int i;
194 char *buf = req->ptr2; 266 char *names = (char *)req->ptr2;
267 eio_dirent *ent = (eio_dirent *)req->ptr1; /* might be 0 */
195 AV *av = newAV (); 268 AV *av = newAV ();
196 269
197 av_extend (av, req->result - 1); 270 av_extend (av, req->result - 1);
198 271
199 for (i = 0; i < req->result; ++i) 272 for (i = 0; i < req->result; ++i)
200 { 273 {
201 SV *sv = newSVpv (buf, 0); 274 if (req->int1 & EIO_READDIR_DENTS)
275 {
276 SV *namesv = newSVpvn (names + ent->nameofs, ent->namelen);
202 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
203 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);
204 buf += SvCUR (sv) + 1; 306 names += SvCUR (name) + 1;
307 }
205 } 308 }
206 309
207 rv = sv_2mortal (newRV_noinc ((SV *)av)); 310 rv = sv_2mortal (newRV_noinc ((SV *)av));
208 } 311 }
209 312
210 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))));
211 } 317 }
212 break; 318 break;
213 319
214 case EIO_OPEN: 320 case EIO_OPEN:
215 { 321 {
221 GV *gv = (GV *)sv_newmortal (); 327 GV *gv = (GV *)sv_newmortal ();
222 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR); 328 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
223 char sym [64]; 329 char sym [64];
224 int symlen; 330 int symlen;
225 331
226 symlen = snprintf (sym, sizeof (sym), "fd#%d", req->result); 332 symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
227 gv_init (gv, stash, sym, symlen, 0); 333 gv_init (gv, stash, sym, symlen, 0);
228 334
229 symlen = snprintf ( 335 symlen = snprintf (
230 sym, 336 sym,
231 sizeof (sym), 337 sizeof (sym),
232 "%s&=%d", 338 "%s&=%d",
233 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<", 339 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
234 req->result 340 (int)req->result
235 ); 341 );
236 342
237 if (do_open (gv, sym, symlen, 0, 0, 0, 0)) 343 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
238 fh = (SV *)gv; 344 fh = (SV *)gv;
239 } 345 }
260 case EIO_BUSY: 366 case EIO_BUSY:
261 break; 367 break;
262 368
263 case EIO_READLINK: 369 case EIO_READLINK:
264 if (req->result > 0) 370 if (req->result > 0)
265 { 371 PUSHs (sv_2mortal (newSVpvn (req->ptr2, req->result)));
266 SvCUR_set (req->sv2, req->result);
267 *SvEND (req->sv2) = 0;
268 PUSHs (req->sv2);
269 }
270 break; 372 break;
271 373
272 case EIO_STAT: 374 case EIO_STAT:
273 case EIO_LSTAT: 375 case EIO_LSTAT:
274 case EIO_FSTAT: 376 case EIO_FSTAT:
277 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 379 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
278 PUSHs (sv_2mortal (newSViv (req->result))); 380 PUSHs (sv_2mortal (newSViv (req->result)));
279 break; 381 break;
280 382
281 case EIO_READ: 383 case EIO_READ:
384 {
282 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));
283 *SvEND (req->sv2) = 0; 386 *SvEND (req->sv2) = 0;
387 SvPOK_only (req->sv2);
388 SvSETMAGIC (req->sv2);
284 PUSHs (sv_2mortal (newSViv (req->result))); 389 PUSHs (sv_2mortal (newSViv (req->result)));
390 }
285 break; 391 break;
286 392
287 case EIO_DUP2: 393 case EIO_DUP2:
288 if (req->result > 0) 394 if (req->result > 0)
289 req->result = 0; 395 req->result = 0;
394 X_UNLOCK (reslock); 500 X_UNLOCK (reslock);
395 501
396 if (size) 502 if (size)
397 return; 503 return;
398 504
399 maybe_start_thread (); 505 etp_maybe_start_thread ();
400 506
401 FD_ZERO (&rfd); 507 FD_ZERO (&rfd);
402 FD_SET (respipe [0], &rfd); 508 FD_SET (respipe [0], &rfd);
403 509
404 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0); 510 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
405 } 511 }
406} 512}
407 513
408static int poll_cb (void) 514static int poll_cb (void)
409{ 515{
410 int res; 516 for (;;)
411
412 do
413 { 517 {
414 res = eio_poll (); 518 int res = eio_poll ();
415 519
416 if (res > 0) 520 if (res > 0)
417 croak (0); 521 croak (0);
522
523 if (!max_outstanding || max_outstanding > eio_nreqs ())
524 return res;
525
526 poll_wait ();
418 } 527 }
419 while (max_outstanding && max_outstanding <= eio_nreqs ());
420
421 return res;
422} 528}
423 529
424static void atfork_child (void) 530static void atfork_child (void)
425{ 531{
426 create_respipe (); 532 create_respipe ();
427} 533}
428 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
429#define dREQ \ 553#define dREQ \
554 SV *cb_cv; \
430 aio_req req; \ 555 aio_req req; \
431 int req_pri = next_pri; \ 556 int req_pri = next_pri; \
432 next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; \ 557 next_pri = EIO_PRI_DEFAULT; \
433 \ 558 \
434 if (SvOK (callback) && !SvROK (callback)) \ 559 cb_cv = get_cb (callback); \
435 croak ("callback must be undef or of reference type"); \
436 \ 560 \
437 Newz (0, req, 1, eio_req); \ 561 Newz (0, req, 1, eio_req); \
438 if (!req) \ 562 if (!req) \
439 croak ("out of memory during eio_req allocation"); \ 563 croak ("out of memory during eio_req allocation"); \
440 \ 564 \
441 req->callback = newSVsv (callback); \ 565 req->callback = SvREFCNT_inc (cb_cv); \
442 req->pri = req_pri 566 req->pri = req_pri
443 567
444#define REQ_SEND \ 568#define REQ_SEND \
569 PUTBACK; \
445 eio_submit (req); \ 570 req_submit (req); \
571 SPAGAIN; \
446 \ 572 \
447 if (GIMME_V != G_VOID) \ 573 if (GIMME_V != G_VOID) \
448 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 574 XPUSHs (req_sv (req, AIO_REQ_KLASS));
449 575
450MODULE = IO::AIO PACKAGE = IO::AIO 576MODULE = IO::AIO PACKAGE = IO::AIO
451 577
452PROTOTYPES: ENABLE 578PROTOTYPES: ENABLE
453 579
454BOOT: 580BOOT:
455{ 581{
456 stash = gv_stashpv ("IO::AIO", 1); 582 static const struct {
457 583 const char *name;
458 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 584 IV iv;
459 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 585 } *civ, const_iv[] = {
460 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 586# define const_iv(name, value) { # name, (IV) value },
461 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 587# define const_eio(name) { # name, (IV) EIO_ ## name },
462 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)
463#ifdef _WIN32 594#ifndef _WIN32
464 X_MUTEX_CHECK (wrklock); 595 const_iv (S_IFIFO , S_IFIFO)
465 X_MUTEX_CHECK (reslock);
466 X_MUTEX_CHECK (reqlock);
467 X_MUTEX_CHECK (reqwait);
468 X_MUTEX_CHECK (preadwritelock);
469 X_MUTEX_CHECK (readdirlock);
470
471 X_COND_CHECK (reqwait);
472#else
473 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
474#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)
475 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
476 create_respipe (); 629 create_respipe ();
477 630
478 if (eio_init (want_poll, done_poll) < 0) 631 if (eio_init (want_poll, done_poll) < 0)
479 croak ("IO::AIO: unable to initialise eio library"); 632 croak ("IO::AIO: unable to initialise eio library");
480 633
481 /* atfork child called in fifo order, so before eio's handler */ 634 /* atfork child called in fifo order, so before eio's handler */
482 X_THREAD_ATFORK (0, 0, atfork_child); 635 X_THREAD_ATFORK (0, 0, atfork_child);
483} 636}
484 637
485void 638void
486max_poll_reqs (int nreqs) 639max_poll_reqs (int nreqs)
487 PROTOTYPE: $ 640 PROTOTYPE: $
540 ALIAS: 693 ALIAS:
541 aio_fsync = EIO_FSYNC 694 aio_fsync = EIO_FSYNC
542 aio_fdatasync = EIO_FDATASYNC 695 aio_fdatasync = EIO_FDATASYNC
543 PPCODE: 696 PPCODE:
544{ 697{
698 int fd = s_fileno_croak (fh, 0);
545 dREQ; 699 dREQ;
546 700
547 req->type = ix; 701 req->type = ix;
548 req->sv1 = newSVsv (fh); 702 req->sv1 = newSVsv (fh);
549 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;
550 722
551 REQ_SEND (req); 723 REQ_SEND (req);
552} 724}
553 725
554void 726void
555aio_close (SV *fh, SV *callback=&PL_sv_undef) 727aio_close (SV *fh, SV *callback=&PL_sv_undef)
556 PROTOTYPE: $;$ 728 PROTOTYPE: $;$
557 PPCODE: 729 PPCODE:
558{ 730{
559 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);
560 dREQ; 733 dREQ;
561 734
562 if (close_pipe < 0) 735 if (close_pipe < 0)
563 { 736 {
564 int pipefd [2]; 737 int pipefd [2];
572 } 745 }
573 746
574 req->type = EIO_DUP2; 747 req->type = EIO_DUP2;
575 req->int1 = close_pipe; 748 req->int1 = close_pipe;
576 req->sv2 = newSVsv (fh); 749 req->sv2 = newSVsv (fh);
577 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 750 req->int2 = fd;
578 751
579 REQ_SEND (req); 752 REQ_SEND (req);
580} 753}
581 754
582void 755void
586 aio_write = EIO_WRITE 759 aio_write = EIO_WRITE
587 PROTOTYPE: $$$$$;$ 760 PROTOTYPE: $$$$$;$
588 PPCODE: 761 PPCODE:
589{ 762{
590 STRLEN svlen; 763 STRLEN svlen;
764 int fd = s_fileno_croak (fh, ix == EIO_WRITE);
591 char *svptr = SvPVbyte (data, svlen); 765 char *svptr = SvPVbyte (data, svlen);
592 UV len = SvUV (length); 766 UV len = SvUV (length);
593
594 SvUPGRADE (data, SVt_PV);
595 SvPOK_on (data);
596 767
597 if (dataoffset < 0) 768 if (dataoffset < 0)
598 dataoffset += svlen; 769 dataoffset += svlen;
599 770
600 if (dataoffset < 0 || dataoffset > svlen) 771 if (dataoffset < 0 || dataoffset > svlen)
606 if (!SvOK (length) || len + dataoffset > svlen) 777 if (!SvOK (length) || len + dataoffset > svlen)
607 len = svlen - dataoffset; 778 len = svlen - dataoffset;
608 } 779 }
609 else 780 else
610 { 781 {
611 /* read: grow scalar as necessary */ 782 /* read: check type and grow scalar as necessary */
783 SvUPGRADE (data, SVt_PV);
612 svptr = SvGROW (data, len + dataoffset + 1); 784 svptr = SvGROW (data, len + dataoffset + 1);
613 } 785 }
614
615 if (len < 0)
616 croak ("length must not be negative");
617 786
618 { 787 {
619 dREQ; 788 dREQ;
620 789
621 req->type = ix; 790 req->type = ix;
622 req->sv1 = newSVsv (fh); 791 req->sv1 = newSVsv (fh);
623 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 792 req->int1 = fd;
624 : IoOFP (sv_2io (fh)));
625 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 793 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
626 req->size = len; 794 req->size = len;
627 req->sv2 = SvREFCNT_inc (data); 795 req->sv2 = SvREFCNT_inc (data);
628 req->ptr2 = (char *)svptr + dataoffset; 796 req->ptr2 = (char *)svptr + dataoffset;
629 req->stroffset = dataoffset; 797 req->stroffset = dataoffset;
644 PPCODE: 812 PPCODE:
645{ 813{
646 SV *data; 814 SV *data;
647 dREQ; 815 dREQ;
648 816
649 data = newSV (NAME_MAX);
650 SvPOK_on (data);
651
652 req->type = EIO_READLINK; 817 req->type = EIO_READLINK;
653 req->sv1 = newSVsv (path); 818 req->sv1 = newSVsv (path);
654 req->ptr1 = SvPVbyte_nolen (req->sv1); 819 req->ptr1 = SvPVbyte_nolen (req->sv1);
655 req->sv2 = data;
656 req->ptr2 = SvPVbyte_nolen (data);
657 820
658 REQ_SEND; 821 REQ_SEND;
659} 822}
660 823
661void 824void
662aio_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)
663 PROTOTYPE: $$$$;$ 826 PROTOTYPE: $$$$;$
664 PPCODE: 827 PPCODE:
665{ 828{
829 int ifd = s_fileno_croak (in_fh , 0);
830 int ofd = s_fileno_croak (out_fh, 1);
666 dREQ; 831 dREQ;
667 832
668 req->type = EIO_SENDFILE; 833 req->type = EIO_SENDFILE;
669 req->sv1 = newSVsv (out_fh); 834 req->sv1 = newSVsv (out_fh);
670 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 835 req->int1 = ofd;
671 req->sv2 = newSVsv (in_fh); 836 req->sv2 = newSVsv (in_fh);
672 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 837 req->int2 = ifd;
673 req->offs = SvVAL64 (in_offset); 838 req->offs = in_offset;
674 req->size = length; 839 req->size = length;
675 840
676 REQ_SEND; 841 REQ_SEND;
677} 842}
678 843
679void 844void
680aio_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)
681 PROTOTYPE: $$$;$ 846 PROTOTYPE: $$$;$
682 PPCODE: 847 PPCODE:
683{ 848{
849 int fd = s_fileno_croak (fh, 0);
684 dREQ; 850 dREQ;
685 851
686 req->type = EIO_READAHEAD; 852 req->type = EIO_READAHEAD;
687 req->sv1 = newSVsv (fh); 853 req->sv1 = newSVsv (fh);
688 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 854 req->int1 = fd;
689 req->offs = SvVAL64 (offset); 855 req->offs = offset;
690 req->size = length; 856 req->size = length;
691 857
692 REQ_SEND; 858 REQ_SEND;
693} 859}
694 860
699 aio_lstat = EIO_LSTAT 865 aio_lstat = EIO_LSTAT
700 PPCODE: 866 PPCODE:
701{ 867{
702 dREQ; 868 dREQ;
703 869
704 req->ptr2 = malloc (sizeof (EIO_STRUCT_STAT));
705 if (!req->ptr2)
706 {
707 req_destroy (req);
708 croak ("out of memory during aio_stat statdata allocation");
709 }
710
711 req->flags |= EIO_FLAG_PTR2_FREE;
712 req->sv1 = newSVsv (fh_or_path); 870 req->sv1 = newSVsv (fh_or_path);
713 871
714 if (SvPOK (fh_or_path)) 872 if (SvPOK (req->sv1))
715 { 873 {
716 req->type = ix; 874 req->type = ix;
717 req->ptr1 = SvPVbyte_nolen (req->sv1); 875 req->ptr1 = SvPVbyte_nolen (req->sv1);
718 } 876 }
719 else 877 else
733 891
734 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 892 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
735 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; 893 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
736 req->sv1 = newSVsv (fh_or_path); 894 req->sv1 = newSVsv (fh_or_path);
737 895
738 if (SvPOK (fh_or_path)) 896 if (SvPOK (req->sv1))
739 { 897 {
740 req->type = EIO_UTIME; 898 req->type = EIO_UTIME;
741 req->ptr1 = SvPVbyte_nolen (req->sv1); 899 req->ptr1 = SvPVbyte_nolen (req->sv1);
742 } 900 }
743 else 901 else
756 dREQ; 914 dREQ;
757 915
758 req->sv1 = newSVsv (fh_or_path); 916 req->sv1 = newSVsv (fh_or_path);
759 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 917 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
760 918
761 if (SvPOK (fh_or_path)) 919 if (SvPOK (req->sv1))
762 { 920 {
763 req->type = EIO_TRUNCATE; 921 req->type = EIO_TRUNCATE;
764 req->ptr1 = SvPVbyte_nolen (req->sv1); 922 req->ptr1 = SvPVbyte_nolen (req->sv1);
765 } 923 }
766 else 924 else
774 932
775void 933void
776aio_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)
777 ALIAS: 935 ALIAS:
778 aio_chmod = EIO_CHMOD 936 aio_chmod = EIO_CHMOD
779 aio_fchmod = EIO_FCHMOD
780 aio_mkdir = EIO_MKDIR 937 aio_mkdir = EIO_MKDIR
781 PPCODE: 938 PPCODE:
782{ 939{
783 dREQ; 940 dREQ;
784 941
785 req->type = ix;
786 req->int2 = mode; 942 req->int2 = mode;
787 req->sv1 = newSVsv (fh_or_path); 943 req->sv1 = newSVsv (fh_or_path);
788 944
789 if (ix == EIO_FCHMOD) 945 if (SvPOK (req->sv1))
790 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 946 {
947 req->type = ix;
948 req->ptr1 = SvPVbyte_nolen (req->sv1);
949 }
791 else 950 else
792 req->ptr1 = SvPVbyte_nolen (req->sv1); 951 {
952 req->type = EIO_FCHMOD;
953 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
954 }
793 955
794 REQ_SEND; 956 REQ_SEND;
795} 957}
796 958
797void 959void
802 964
803 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 965 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
804 req->int3 = SvOK (gid) ? SvIV (gid) : -1; 966 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
805 req->sv1 = newSVsv (fh_or_path); 967 req->sv1 = newSVsv (fh_or_path);
806 968
807 if (SvPOK (fh_or_path)) 969 if (SvPOK (req->sv1))
808 { 970 {
809 req->type = EIO_CHOWN; 971 req->type = EIO_CHOWN;
810 req->ptr1 = SvPVbyte_nolen (req->sv1); 972 req->ptr1 = SvPVbyte_nolen (req->sv1);
811 } 973 }
812 else 974 else
814 req->type = EIO_FCHOWN; 976 req->type = EIO_FCHOWN;
815 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 977 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
816 } 978 }
817 979
818 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;
819} 998}
820 999
821void 1000void
822aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 1001aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
823 ALIAS: 1002 ALIAS:
888{ 1067{
889 dREQ; 1068 dREQ;
890 1069
891 req->type = EIO_GROUP; 1070 req->type = EIO_GROUP;
892 1071
893 eio_submit (req); 1072 req_submit (req);
894 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1073 XPUSHs (req_sv (req, AIO_GRP_KLASS));
895} 1074}
896 1075
897void 1076void
898aio_nop (SV *callback=&PL_sv_undef) 1077aio_nop (SV *callback=&PL_sv_undef)
910 1089
911int 1090int
912aioreq_pri (int pri = 0) 1091aioreq_pri (int pri = 0)
913 PROTOTYPE: ;$ 1092 PROTOTYPE: ;$
914 CODE: 1093 CODE:
915 RETVAL = next_pri - EIO_PRI_BIAS; 1094 RETVAL = next_pri;
916 if (items > 0) 1095 if (items > 0)
917 { 1096 {
918 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN; 1097 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
919 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX; 1098 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
920 next_pri = pri + EIO_PRI_BIAS; 1099 next_pri = pri;
921 } 1100 }
922 OUTPUT: 1101 OUTPUT:
923 RETVAL 1102 RETVAL
924 1103
925void 1104void
926aioreq_nice (int nice = 0) 1105aioreq_nice (int nice = 0)
927 CODE: 1106 CODE:
928 nice = next_pri - nice; 1107 nice = next_pri - nice;
929 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN; 1108 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
930 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX; 1109 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
931 next_pri = nice + EIO_PRI_BIAS; 1110 next_pri = nice;
932 1111
933void 1112void
934flush () 1113flush ()
935 PROTOTYPE: 1114 PROTOTYPE:
936 CODE: 1115 CODE:
997 1176
998int 1177int
999nthreads() 1178nthreads()
1000 PROTOTYPE: 1179 PROTOTYPE:
1001 CODE: 1180 CODE:
1002 if (WORDACCESS_UNSAFE) X_LOCK (wrklock); 1181 RETVAL = eio_nthreads ();
1003 RETVAL = started;
1004 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1005 OUTPUT: 1182 OUTPUT:
1006 RETVAL 1183 RETVAL
1007 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
1203void _on_next_submit (SV *cb)
1204 CODE:
1205 SvREFCNT_dec (on_next_submit);
1206 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1207
1008PROTOTYPES: DISABLE 1208PROTOTYPES: DISABLE
1009 1209
1010MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1210MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1011 1211
1012void 1212void
1014 CODE: 1214 CODE:
1015 eio_cancel (req); 1215 eio_cancel (req);
1016 1216
1017void 1217void
1018cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1218cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1019 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
1020 SvREFCNT_dec (req->callback); 1228 SvREFCNT_dec (req->callback);
1021 req->callback = newSVsv (callback); 1229 req->callback = SvREFCNT_inc (cb_cv);
1230 }
1231}
1022 1232
1023MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1233MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1024 1234
1025void 1235void
1026add (aio_req grp, ...) 1236add (aio_req grp, ...)
1058 AV *av; 1268 AV *av;
1059 1269
1060 grp->errorno = errno; 1270 grp->errorno = errno;
1061 1271
1062 av = newAV (); 1272 av = newAV ();
1273 av_extend (av, items - 1);
1063 1274
1064 for (i = 1; i < items; ++i ) 1275 for (i = 1; i < items; ++i )
1065 av_push (av, newSVsv (ST (i))); 1276 av_push (av, newSVsv (ST (i)));
1066 1277
1067 SvREFCNT_dec (grp->sv1); 1278 SvREFCNT_dec (grp->sv1);
1081void 1292void
1082feed (aio_req grp, SV *callback=&PL_sv_undef) 1293feed (aio_req grp, SV *callback=&PL_sv_undef)
1083 CODE: 1294 CODE:
1084{ 1295{
1085 SvREFCNT_dec (grp->sv2); 1296 SvREFCNT_dec (grp->sv2);
1086 grp->sv2 = newSVsv (callback); 1297 grp->sv2 = newSVsv (callback);
1298 grp->feed = aio_grp_feed;
1087 1299
1088 if (grp->int2 <= 0) 1300 if (grp->int2 <= 0)
1089 grp->int2 = 2; 1301 grp->int2 = 2;
1090 1302
1091 eio_grp_limit (grp, grp->int2); 1303 eio_grp_limit (grp, grp->int2);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines