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.115 by root, Sat May 10 18:06:41 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 */
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
106static unsigned int max_outstanding = 0x7fffffff; 161static SV *on_next_submit;
107 162static int next_pri = EIO_PRI_DEFAULT;
108static int next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; 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);
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{
516 for (;;)
517 {
410 int res = eio_poll (); 518 int res = eio_poll ();
411 519
412 if (res > 0) 520 if (res > 0)
413 croak (0); 521 croak (0);
414 522
523 if (!max_outstanding || max_outstanding > eio_nreqs ())
415 return res; 524 return res;
525
526 poll_wait ();
527 }
528}
529
530static void atfork_child (void)
531{
532 create_respipe ();
533}
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;
416} 540}
417 541
418#define dREQ \ 542#define dREQ \
543 SV *cb_cv; \
419 aio_req req; \ 544 aio_req req; \
420 int req_pri = next_pri; \ 545 int req_pri = next_pri; \
421 next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; \ 546 next_pri = EIO_PRI_DEFAULT; \
422 \ 547 \
423 if (SvOK (callback) && !SvROK (callback)) \ 548 cb_cv = get_cb (callback); \
424 croak ("callback must be undef or of reference type"); \
425 \ 549 \
426 Newz (0, req, 1, eio_req); \ 550 Newz (0, req, 1, eio_req); \
427 if (!req) \ 551 if (!req) \
428 croak ("out of memory during eio_req allocation"); \ 552 croak ("out of memory during eio_req allocation"); \
429 \ 553 \
430 req->callback = newSVsv (callback); \ 554 req->callback = SvREFCNT_inc (cb_cv); \
431 req->pri = req_pri 555 req->pri = req_pri
432 556
433#define REQ_SEND \ 557#define REQ_SEND \
558 PUTBACK; \
434 eio_submit (req); \ 559 req_submit (req); \
560 SPAGAIN; \
435 \ 561 \
436 if (GIMME_V != G_VOID) \ 562 if (GIMME_V != G_VOID) \
437 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 563 XPUSHs (req_sv (req, AIO_REQ_KLASS));
438 564
439MODULE = IO::AIO PACKAGE = IO::AIO 565MODULE = IO::AIO PACKAGE = IO::AIO
440 566
441PROTOTYPES: ENABLE 567PROTOTYPES: ENABLE
442 568
443BOOT: 569BOOT:
444{ 570{
445 stash = gv_stashpv ("IO::AIO", 1); 571 static const struct {
446 572 const char *name;
447 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 573 IV iv;
448 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 574 } *civ, const_iv[] = {
449 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 575# define const_iv(name, value) { # name, (IV) value },
450 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 576# define const_eio(name) { # name, (IV) EIO_ ## name },
451 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)
452#ifdef _WIN32 583#ifndef _WIN32
453 X_MUTEX_CHECK (wrklock); 584 const_iv (S_IFIFO , S_IFIFO)
454 X_MUTEX_CHECK (reslock);
455 X_MUTEX_CHECK (reqlock);
456 X_MUTEX_CHECK (reqwait);
457 X_MUTEX_CHECK (preadwritelock);
458 X_MUTEX_CHECK (readdirlock);
459
460 X_COND_CHECK (reqwait);
461#else
462 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
463#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)
464 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
465 create_respipe (); 618 create_respipe ();
466 619
467 if (eio_init (want_poll, done_poll) < 0) 620 if (eio_init (want_poll, done_poll) < 0)
468 croak ("IO::AIO: unable to initialise eio library"); 621 croak ("IO::AIO: unable to initialise eio library");
622
623 /* atfork child called in fifo order, so before eio's handler */
624 X_THREAD_ATFORK (0, 0, atfork_child);
469} 625}
470 626
471void 627void
472max_poll_reqs (int nreqs) 628max_poll_reqs (int nreqs)
473 PROTOTYPE: $ 629 PROTOTYPE: $
526 ALIAS: 682 ALIAS:
527 aio_fsync = EIO_FSYNC 683 aio_fsync = EIO_FSYNC
528 aio_fdatasync = EIO_FDATASYNC 684 aio_fdatasync = EIO_FDATASYNC
529 PPCODE: 685 PPCODE:
530{ 686{
687 int fd = s_fileno_croak (fh, 0);
531 dREQ; 688 dREQ;
532 689
533 req->type = ix; 690 req->type = ix;
534 req->sv1 = newSVsv (fh); 691 req->sv1 = newSVsv (fh);
535 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;
536 711
537 REQ_SEND (req); 712 REQ_SEND (req);
538} 713}
539 714
540void 715void
541aio_close (SV *fh, SV *callback=&PL_sv_undef) 716aio_close (SV *fh, SV *callback=&PL_sv_undef)
542 PROTOTYPE: $;$ 717 PROTOTYPE: $;$
543 PPCODE: 718 PPCODE:
544{ 719{
545 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);
546 dREQ; 722 dREQ;
547 723
548 if (close_pipe < 0) 724 if (close_pipe < 0)
549 { 725 {
550 int pipefd [2]; 726 int pipefd [2];
558 } 734 }
559 735
560 req->type = EIO_DUP2; 736 req->type = EIO_DUP2;
561 req->int1 = close_pipe; 737 req->int1 = close_pipe;
562 req->sv2 = newSVsv (fh); 738 req->sv2 = newSVsv (fh);
563 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 739 req->int2 = fd;
564 740
565 REQ_SEND (req); 741 REQ_SEND (req);
566} 742}
567 743
568void 744void
572 aio_write = EIO_WRITE 748 aio_write = EIO_WRITE
573 PROTOTYPE: $$$$$;$ 749 PROTOTYPE: $$$$$;$
574 PPCODE: 750 PPCODE:
575{ 751{
576 STRLEN svlen; 752 STRLEN svlen;
753 int fd = s_fileno_croak (fh, ix == EIO_WRITE);
577 char *svptr = SvPVbyte (data, svlen); 754 char *svptr = SvPVbyte (data, svlen);
578 UV len = SvUV (length); 755 UV len = SvUV (length);
579
580 SvUPGRADE (data, SVt_PV);
581 SvPOK_on (data);
582 756
583 if (dataoffset < 0) 757 if (dataoffset < 0)
584 dataoffset += svlen; 758 dataoffset += svlen;
585 759
586 if (dataoffset < 0 || dataoffset > svlen) 760 if (dataoffset < 0 || dataoffset > svlen)
592 if (!SvOK (length) || len + dataoffset > svlen) 766 if (!SvOK (length) || len + dataoffset > svlen)
593 len = svlen - dataoffset; 767 len = svlen - dataoffset;
594 } 768 }
595 else 769 else
596 { 770 {
597 /* read: grow scalar as necessary */ 771 /* read: check type and grow scalar as necessary */
772 SvUPGRADE (data, SVt_PV);
598 svptr = SvGROW (data, len + dataoffset + 1); 773 svptr = SvGROW (data, len + dataoffset + 1);
599 } 774 }
600
601 if (len < 0)
602 croak ("length must not be negative");
603 775
604 { 776 {
605 dREQ; 777 dREQ;
606 778
607 req->type = ix; 779 req->type = ix;
608 req->sv1 = newSVsv (fh); 780 req->sv1 = newSVsv (fh);
609 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 781 req->int1 = fd;
610 : IoOFP (sv_2io (fh)));
611 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 782 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
612 req->size = len; 783 req->size = len;
613 req->sv2 = SvREFCNT_inc (data); 784 req->sv2 = SvREFCNT_inc (data);
614 req->ptr2 = (char *)svptr + dataoffset; 785 req->ptr2 = (char *)svptr + dataoffset;
615 req->stroffset = dataoffset; 786 req->stroffset = dataoffset;
630 PPCODE: 801 PPCODE:
631{ 802{
632 SV *data; 803 SV *data;
633 dREQ; 804 dREQ;
634 805
635 data = newSV (NAME_MAX);
636 SvPOK_on (data);
637
638 req->type = EIO_READLINK; 806 req->type = EIO_READLINK;
639 req->sv1 = newSVsv (path); 807 req->sv1 = newSVsv (path);
640 req->ptr1 = SvPVbyte_nolen (req->sv1); 808 req->ptr1 = SvPVbyte_nolen (req->sv1);
641 req->sv2 = data;
642 req->ptr2 = SvPVbyte_nolen (data);
643 809
644 REQ_SEND; 810 REQ_SEND;
645} 811}
646 812
647void 813void
648aio_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)
649 PROTOTYPE: $$$$;$ 815 PROTOTYPE: $$$$;$
650 PPCODE: 816 PPCODE:
651{ 817{
818 int ifd = s_fileno_croak (in_fh , 0);
819 int ofd = s_fileno_croak (out_fh, 1);
652 dREQ; 820 dREQ;
653 821
654 req->type = EIO_SENDFILE; 822 req->type = EIO_SENDFILE;
655 req->sv1 = newSVsv (out_fh); 823 req->sv1 = newSVsv (out_fh);
656 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 824 req->int1 = ofd;
657 req->sv2 = newSVsv (in_fh); 825 req->sv2 = newSVsv (in_fh);
658 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 826 req->int2 = ifd;
659 req->offs = SvVAL64 (in_offset); 827 req->offs = in_offset;
660 req->size = length; 828 req->size = length;
661 829
662 REQ_SEND; 830 REQ_SEND;
663} 831}
664 832
665void 833void
666aio_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)
667 PROTOTYPE: $$$;$ 835 PROTOTYPE: $$$;$
668 PPCODE: 836 PPCODE:
669{ 837{
838 int fd = s_fileno_croak (fh, 0);
670 dREQ; 839 dREQ;
671 840
672 req->type = EIO_READAHEAD; 841 req->type = EIO_READAHEAD;
673 req->sv1 = newSVsv (fh); 842 req->sv1 = newSVsv (fh);
674 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 843 req->int1 = fd;
675 req->offs = SvVAL64 (offset); 844 req->offs = offset;
676 req->size = length; 845 req->size = length;
677 846
678 REQ_SEND; 847 REQ_SEND;
679} 848}
680 849
685 aio_lstat = EIO_LSTAT 854 aio_lstat = EIO_LSTAT
686 PPCODE: 855 PPCODE:
687{ 856{
688 dREQ; 857 dREQ;
689 858
690 req->ptr2 = malloc (sizeof (EIO_STRUCT_STAT));
691 if (!req->ptr2)
692 {
693 req_destroy (req);
694 croak ("out of memory during aio_stat statdata allocation");
695 }
696
697 req->flags |= EIO_FLAG_PTR2_FREE;
698 req->sv1 = newSVsv (fh_or_path); 859 req->sv1 = newSVsv (fh_or_path);
699 860
700 if (SvPOK (fh_or_path)) 861 if (SvPOK (req->sv1))
701 { 862 {
702 req->type = ix; 863 req->type = ix;
703 req->ptr1 = SvPVbyte_nolen (req->sv1); 864 req->ptr1 = SvPVbyte_nolen (req->sv1);
704 } 865 }
705 else 866 else
719 880
720 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 881 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
721 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; 882 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
722 req->sv1 = newSVsv (fh_or_path); 883 req->sv1 = newSVsv (fh_or_path);
723 884
724 if (SvPOK (fh_or_path)) 885 if (SvPOK (req->sv1))
725 { 886 {
726 req->type = EIO_UTIME; 887 req->type = EIO_UTIME;
727 req->ptr1 = SvPVbyte_nolen (req->sv1); 888 req->ptr1 = SvPVbyte_nolen (req->sv1);
728 } 889 }
729 else 890 else
742 dREQ; 903 dREQ;
743 904
744 req->sv1 = newSVsv (fh_or_path); 905 req->sv1 = newSVsv (fh_or_path);
745 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 906 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
746 907
747 if (SvPOK (fh_or_path)) 908 if (SvPOK (req->sv1))
748 { 909 {
749 req->type = EIO_TRUNCATE; 910 req->type = EIO_TRUNCATE;
750 req->ptr1 = SvPVbyte_nolen (req->sv1); 911 req->ptr1 = SvPVbyte_nolen (req->sv1);
751 } 912 }
752 else 913 else
760 921
761void 922void
762aio_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)
763 ALIAS: 924 ALIAS:
764 aio_chmod = EIO_CHMOD 925 aio_chmod = EIO_CHMOD
765 aio_fchmod = EIO_FCHMOD
766 aio_mkdir = EIO_MKDIR 926 aio_mkdir = EIO_MKDIR
767 PPCODE: 927 PPCODE:
768{ 928{
769 dREQ; 929 dREQ;
770 930
771 req->type = ix;
772 req->int2 = mode; 931 req->int2 = mode;
773 req->sv1 = newSVsv (fh_or_path); 932 req->sv1 = newSVsv (fh_or_path);
774 933
775 if (ix == EIO_FCHMOD) 934 if (SvPOK (req->sv1))
776 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 935 {
936 req->type = ix;
937 req->ptr1 = SvPVbyte_nolen (req->sv1);
938 }
777 else 939 else
778 req->ptr1 = SvPVbyte_nolen (req->sv1); 940 {
941 req->type = EIO_FCHMOD;
942 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
943 }
779 944
780 REQ_SEND; 945 REQ_SEND;
781} 946}
782 947
783void 948void
788 953
789 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 954 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
790 req->int3 = SvOK (gid) ? SvIV (gid) : -1; 955 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
791 req->sv1 = newSVsv (fh_or_path); 956 req->sv1 = newSVsv (fh_or_path);
792 957
793 if (SvPOK (fh_or_path)) 958 if (SvPOK (req->sv1))
794 { 959 {
795 req->type = EIO_CHOWN; 960 req->type = EIO_CHOWN;
796 req->ptr1 = SvPVbyte_nolen (req->sv1); 961 req->ptr1 = SvPVbyte_nolen (req->sv1);
797 } 962 }
798 else 963 else
800 req->type = EIO_FCHOWN; 965 req->type = EIO_FCHOWN;
801 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 966 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
802 } 967 }
803 968
804 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;
805} 987}
806 988
807void 989void
808aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 990aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
809 ALIAS: 991 ALIAS:
874{ 1056{
875 dREQ; 1057 dREQ;
876 1058
877 req->type = EIO_GROUP; 1059 req->type = EIO_GROUP;
878 1060
879 eio_submit (req); 1061 req_submit (req);
880 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1062 XPUSHs (req_sv (req, AIO_GRP_KLASS));
881} 1063}
882 1064
883void 1065void
884aio_nop (SV *callback=&PL_sv_undef) 1066aio_nop (SV *callback=&PL_sv_undef)
896 1078
897int 1079int
898aioreq_pri (int pri = 0) 1080aioreq_pri (int pri = 0)
899 PROTOTYPE: ;$ 1081 PROTOTYPE: ;$
900 CODE: 1082 CODE:
901 RETVAL = next_pri - EIO_PRI_BIAS; 1083 RETVAL = next_pri;
902 if (items > 0) 1084 if (items > 0)
903 { 1085 {
904 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN; 1086 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
905 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX; 1087 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
906 next_pri = pri + EIO_PRI_BIAS; 1088 next_pri = pri;
907 } 1089 }
908 OUTPUT: 1090 OUTPUT:
909 RETVAL 1091 RETVAL
910 1092
911void 1093void
912aioreq_nice (int nice = 0) 1094aioreq_nice (int nice = 0)
913 CODE: 1095 CODE:
914 nice = next_pri - nice; 1096 nice = next_pri - nice;
915 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN; 1097 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
916 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX; 1098 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
917 next_pri = nice + EIO_PRI_BIAS; 1099 next_pri = nice;
918 1100
919void 1101void
920flush () 1102flush ()
921 PROTOTYPE: 1103 PROTOTYPE:
922 CODE: 1104 CODE:
923 while (nreqs) 1105 while (eio_nreqs ())
924 { 1106 {
925 poll_wait (); 1107 poll_wait ();
926 poll_cb (); 1108 poll_cb ();
927 } 1109 }
928 1110
983 1165
984int 1166int
985nthreads() 1167nthreads()
986 PROTOTYPE: 1168 PROTOTYPE:
987 CODE: 1169 CODE:
988 if (WORDACCESS_UNSAFE) X_LOCK (wrklock); 1170 RETVAL = eio_nthreads ();
989 RETVAL = started;
990 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
991 OUTPUT: 1171 OUTPUT:
992 RETVAL 1172 RETVAL
993 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
1192void _on_next_submit (SV *cb)
1193 CODE:
1194 SvREFCNT_dec (on_next_submit);
1195 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1196
994PROTOTYPES: DISABLE 1197PROTOTYPES: DISABLE
995 1198
996MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1199MODULE = IO::AIO PACKAGE = IO::AIO::REQ
997 1200
998void 1201void
1000 CODE: 1203 CODE:
1001 eio_cancel (req); 1204 eio_cancel (req);
1002 1205
1003void 1206void
1004cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1207cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1005 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
1006 SvREFCNT_dec (req->callback); 1217 SvREFCNT_dec (req->callback);
1007 req->callback = newSVsv (callback); 1218 req->callback = SvREFCNT_inc (cb_cv);
1219 }
1220}
1008 1221
1009MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1222MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1010 1223
1011void 1224void
1012add (aio_req grp, ...) 1225add (aio_req grp, ...)
1044 AV *av; 1257 AV *av;
1045 1258
1046 grp->errorno = errno; 1259 grp->errorno = errno;
1047 1260
1048 av = newAV (); 1261 av = newAV ();
1262 av_extend (av, items - 1);
1049 1263
1050 for (i = 1; i < items; ++i ) 1264 for (i = 1; i < items; ++i )
1051 av_push (av, newSVsv (ST (i))); 1265 av_push (av, newSVsv (ST (i)));
1052 1266
1053 SvREFCNT_dec (grp->sv1); 1267 SvREFCNT_dec (grp->sv1);
1067void 1281void
1068feed (aio_req grp, SV *callback=&PL_sv_undef) 1282feed (aio_req grp, SV *callback=&PL_sv_undef)
1069 CODE: 1283 CODE:
1070{ 1284{
1071 SvREFCNT_dec (grp->sv2); 1285 SvREFCNT_dec (grp->sv2);
1072 grp->sv2 = newSVsv (callback); 1286 grp->sv2 = newSVsv (callback);
1287 grp->feed = aio_grp_feed;
1073 1288
1074 if (grp->int2 <= 0) 1289 if (grp->int2 <= 0)
1075 grp->int2 = 2; 1290 grp->int2 = 2;
1076 1291
1077 eio_grp_limit (grp, grp->int2); 1292 eio_grp_limit (grp, grp->int2);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines