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.187 by root, Sat Jul 16 16:46:10 2011 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>
17 19
20#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
21# include <sys/mman.h>
22#endif
23
24/* perl namespace pollution */
25#undef VERSION
26
27/* perl stupidly overrides readdir and maybe others */
28/* with thread-unsafe versions, imagine that :( */
29#undef readdir
30#undef opendir
31#undef closedir
32
18#ifdef _WIN32 33#ifdef _WIN32
19 34
20# define EIO_STRUCT_DIRENT Direntry_t 35# define EIO_STRUCT_DIRENT Direntry_t
21# undef malloc 36# undef malloc
22# undef free 37# undef free
25# undef open 40# undef open
26# undef read 41# undef read
27# undef write 42# undef write
28# undef send 43# undef send
29# undef recv 44# undef recv
30# undef stat 45# undef lstat
31# undef fstat
32# define lstat stat
33# undef truncate 46# undef truncate
34# undef ftruncate 47# undef ftruncate
35# undef open 48# undef open
49# undef link
36# undef close 50# undef close
37# undef unlink 51# undef unlink
52# undef mkdir
38# undef rmdir 53# undef rmdir
39# undef rename 54# undef rename
40# undef lseek 55# undef lseek
56# undef opendir
57# undef readdir
58# undef closedir
59# undef chmod
60# undef fchmod
41 61
42# define chown(a,b,c) (errno = ENOSYS, -1)
43# define fchown(a,b,c) (errno = ENOSYS, -1)
44# define fchmod(a,b) (errno = ENOSYS, -1)
45# define symlink(a,b) (errno = ENOSYS, -1)
46# define readlink(a,b,c) (errno = ENOSYS, -1)
47# define mknod(a,b,c) (errno = ENOSYS, -1)
48# define truncate(a,b) (errno = ENOSYS, -1)
49# define ftruncate(fd,o) chsize ((fd), (o))
50# define fsync(fd) _commit (fd)
51# define opendir(fd) (errno = ENOSYS, 0) 62# define opendir(fd) EIO_ERRNO (ENOSYS, 0)
52# define readdir(fd) (errno = ENOSYS, -1) 63# define readdir(fd) EIO_ENOSYS ()
53# define closedir(fd) (errno = ENOSYS, -1) 64# define closedir(fd) EIO_ENOSYS ()
54# define mkdir(a,b) mkdir (a)
55 65
56#else 66#else
57 67
58# include <sys/time.h> 68# include <sys/time.h>
59# include <sys/select.h> 69# include <sys/select.h>
60# include <unistd.h> 70# include <unistd.h>
61# include <utime.h> 71# include <utime.h>
62# include <signal.h> 72# include <signal.h>
63# define EIO_STRUCT_DIRENT struct dirent
64 73
65#endif 74#endif
66 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
75 88
76static HV *stash; 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/*****************************************************************************/
101
77typedef SV SV8; /* byte-sv, used for argument-checking */ 102typedef SV SV8; /* byte-sv, used for argument-checking */
103typedef int aio_rfd; /* read file desriptor */
104typedef int aio_wfd; /* write file descriptor */
78 105
79#define AIO_REQ_KLASS "IO::AIO::REQ" 106static HV *aio_stash, *aio_req_stash, *aio_grp_stash;
80#define AIO_GRP_KLASS "IO::AIO::GRP"
81 107
82#define EIO_COMMON \ 108#define EIO_REQ_MEMBERS \
83 SV *callback; \ 109 SV *callback; \
84 SV *sv1, *sv2; \ 110 SV *sv1, *sv2; \
85 STRLEN stroffset; \ 111 STRLEN stroffset; \
86 SV *self 112 SV *self;
87 113
114#define EIO_NO_WRAPPERS 1
115
116#include "libeio/config.h"
88#include "libeio/eio.h" 117#include "libeio/eio.h"
118
119/* Linux/others */
120#ifndef O_ASYNC
121# define O_ASYNC 0
122#endif
123#ifndef O_DIRECT
124# define O_DIRECT 0
125#endif
126#ifndef O_NOATIME
127# define O_NOATIME 0
128#endif
129
130/* POSIX */
131#ifndef O_CLOEXEC
132# define O_CLOEXEC 0
133#endif
134#ifndef O_NOFOLLOW
135# define O_NOFOLLOW 0
136#endif
137#ifndef O_NOCTTY
138# define O_NOCTTY 0
139#endif
140#ifndef O_NONBLOCK
141# define O_NONBLOCK 0
142#endif
143#ifndef O_EXEC
144# define O_EXEC 0
145#endif
146#ifndef O_SEARCH
147# define O_SEARCH 0
148#endif
149#ifndef O_DIRECTORY
150# define O_DIRECTORY 0
151#endif
152#ifndef O_DSYNC
153# define O_DSYNC 0
154#endif
155#ifndef O_RSYNC
156# define O_RSYNC 0
157#endif
158#ifndef O_SYNC
159# define O_SYNC 0
160#endif
161#ifndef O_TTY_INIT
162# define O_TTY_INIT 0
163#endif
164
165#ifndef POSIX_FADV_NORMAL
166# define POSIX_FADV_NORMAL 0
167#endif
168#ifndef POSIX_FADV_SEQUENTIAL
169# define POSIX_FADV_SEQUENTIAL 0
170#endif
171#ifndef POSIX_FADV_RANDOM
172# define POSIX_FADV_RANDOM 0
173#endif
174#ifndef POSIX_FADV_NOREUSE
175# define POSIX_FADV_NOREUSE 0
176#endif
177#ifndef POSIX_FADV_WILLNEED
178# define POSIX_FADV_WILLNEED 0
179#endif
180#ifndef POSIX_FADV_DONTNEED
181# define POSIX_FADV_DONTNEED 0
182#endif
183
184#if !HAVE_POSIX_FADVISE
185# define posix_fadvise(a,b,c,d) errno = ENOSYS /* also return ENOSYS */
186#endif
187
188#ifndef POSIX_MADV_NORMAL
189# define POSIX_MADV_NORMAL 0
190#endif
191#ifndef POSIX_MADV_SEQUENTIAL
192# define POSIX_MADV_SEQUENTIAL 0
193#endif
194#ifndef POSIX_MADV_RANDOM
195# define POSIX_MADV_RANDOM 0
196#endif
197#ifndef POSIX_MADV_WILLNEED
198# define POSIX_MADV_WILLNEED 0
199#endif
200#ifndef POSIX_MADV_DONTNEED
201# define POSIX_MADV_DONTNEED 0
202#endif
203
204#if !HAVE_POSIX_MADVISE
205# define posix_madvise(a,b,c) errno = ENOSYS /* also return ENOSYS */
206#endif
207
208#ifndef PROT_NONE
209# define PROT_NONE 0
210#endif
211#ifndef PROT_READ
212# define PROT_READ 0
213#endif
214#ifndef PROT_WRITE
215# define PROT_READ 0
216#endif
217#ifndef PROT_EXEC
218# define PROT_EXEC 0
219#endif
220
221#ifndef ST_RDONLY
222# define ST_RDONLY 0
223#endif
224#ifndef ST_NOSUID
225# define ST_NOSUID 0
226#endif
227#ifndef ST_NODEV
228# define ST_NODEV 0
229#endif
230#ifndef ST_NOEXEC
231# define ST_NOEXEC 0
232#endif
233#ifndef ST_SYNCHRONOUS
234# define ST_SYNCHRONOUS 0
235#endif
236#ifndef ST_MANDLOCK
237# define ST_MANDLOCK 0
238#endif
239#ifndef ST_WRITE
240# define ST_WRITE 0
241#endif
242#ifndef ST_APPEND
243# define ST_APPEND 0
244#endif
245#ifndef ST_IMMUTABLE
246# define ST_IMMUTABLE 0
247#endif
248#ifndef ST_NOATIME
249# define ST_NOATIME 0
250#endif
251#ifndef ST_NODIRATIME
252# define ST_NODIRATIME 0
253#endif
254#ifndef ST_RELATIME
255# define ST_RELATIME 0
256#endif
257
258#ifndef S_IFIFO
259# define S_IFIFO 0
260#endif
261#ifndef S_IFCHR
262# define S_IFCHR 0
263#endif
264#ifndef S_IFBLK
265# define S_IFBLK 0
266#endif
267#ifndef S_IFLNK
268# define S_IFLNK 0
269#endif
270#ifndef S_IFREG
271# define S_IFREG 0
272#endif
273#ifndef S_IFDIR
274# define S_IFDIR 0
275#endif
276#ifndef S_IFWHT
277# define S_IFWHT 0
278#endif
279#ifndef S_IFSOCK
280# define S_IFSOCK 0
281#endif
282
283#ifndef MAP_ANONYMOUS
284# ifdef MAP_ANON
285# define MAP_ANONYMOUS MAP_ANON
286# else
287# define MAP_ANONYMOUS MAP_FIXED /* and hope this fails */
288# endif
289#endif
290#ifndef MAP_HUGETLB
291# define MAP_HUGETLB 0
292#endif
293#ifndef MAP_LOCKED
294# define MAP_LOCKED 0
295#endif
296#ifndef MAP_NORESERVE
297# define MAP_NORESERVE 0
298#endif
299#ifndef MAP_POPULATE
300# define MAP_POPULATE 0
301#endif
302#ifndef MAP_NONBLOCK
303# define MAP_NONBLOCK 0
304#endif
305
306#ifndef makedev
307# define makedev(maj,min) (((maj) << 8) | (min))
308#endif
309#ifndef major
310# define major(dev) ((dev) >> 8)
311#endif
312#ifndef minor
313# define minor(dev) ((dev) & 0xff)
314#endif
315
316#ifndef PAGESIZE
317# define PAGESIZE sysconf (_SC_PAGESIZE)
318#endif
89 319
90static int req_invoke (eio_req *req); 320static int req_invoke (eio_req *req);
91#define EIO_FINISH(req) req_invoke (req) 321#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); 322static void req_destroy (eio_req *grp);
95#define EIO_DESTROY(req) req_destroy (req) 323#define EIO_DESTROY(req) req_destroy (req)
96 324
97enum { 325enum {
98 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ 326 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
101#include "libeio/eio.c" 329#include "libeio/eio.c"
102 330
103typedef eio_req *aio_req; 331typedef eio_req *aio_req;
104typedef eio_req *aio_req_ornot; 332typedef eio_req *aio_req_ornot;
105 333
106static unsigned int max_outstanding = 0x7fffffff; 334static SV *on_next_submit;
335static int next_pri = EIO_PRI_DEFAULT;
336static int max_outstanding;
107 337
108static int next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; 338static s_epipe respipe;
109
110static int respipe_osf [2], respipe [2] = { -1, -1 };
111 339
112static void req_destroy (aio_req req); 340static void req_destroy (aio_req req);
113static void req_cancel (aio_req req); 341static void req_cancel (aio_req req);
114 342
115static void want_poll (void) 343static void want_poll (void)
116{ 344{
117 /* write a dummy byte to the pipe so fh becomes ready */ 345 /* write a dummy byte to the pipe so fh becomes ready */
118 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1); 346 s_epipe_signal (&respipe);
119} 347}
120 348
121static void done_poll (void) 349static void done_poll (void)
122{ 350{
123 /* read any signals sent by the worker threads */ 351 /* read any signals sent by the worker threads */
124 char buf [4]; 352 s_epipe_drain (&respipe);
125 while (respipe_read (respipe [0], buf, 4) == 4)
126 ;
127} 353}
128 354
129/* must be called at most once */ 355/* must be called at most once */
130static SV *req_sv (aio_req req, const char *klass) 356static SV *req_sv (aio_req req, HV *stash)
131{ 357{
132 if (!req->self) 358 if (!req->self)
133 { 359 {
134 req->self = (SV *)newHV (); 360 req->self = (SV *)newHV ();
135 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0); 361 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
136 } 362 }
137 363
138 return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1))); 364 return sv_2mortal (sv_bless (newRV_inc (req->self), stash));
139} 365}
140 366
141static aio_req SvAIO_REQ (SV *sv) 367static aio_req SvAIO_REQ (SV *sv)
142{ 368{
143 MAGIC *mg; 369 MAGIC *mg;
144 370
145 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv)) 371 if (!SvROK (sv)
372 || (SvSTASH (SvRV (sv)) != aio_grp_stash
373 && SvSTASH (SvRV (sv)) != aio_req_stash
374 && !sv_derived_from (sv, "IO::AIO::REQ")))
146 croak ("object of class " AIO_REQ_KLASS " expected"); 375 croak ("object of class IO::AIO::REQ expected");
147 376
148 mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 377 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
149 378
150 return mg ? (aio_req)mg->mg_ptr : 0; 379 return mg ? (aio_req)mg->mg_ptr : 0;
151} 380}
157 dSP; 386 dSP;
158 387
159 ENTER; 388 ENTER;
160 SAVETMPS; 389 SAVETMPS;
161 PUSHMARK (SP); 390 PUSHMARK (SP);
162 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 391 XPUSHs (req_sv (grp, aio_grp_stash));
163 PUTBACK; 392 PUTBACK;
164 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR); 393 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
165 SPAGAIN; 394 SPAGAIN;
166 FREETMPS; 395 FREETMPS;
167 LEAVE; 396 LEAVE;
168 } 397 }
169} 398}
170 399
400static void req_submit (eio_req *req)
401{
402 eio_submit (req);
403
404 if (expect_false (on_next_submit))
405 {
406 dSP;
407 SV *cb = sv_2mortal (on_next_submit);
408
409 on_next_submit = 0;
410
411 PUSHMARK (SP);
412 PUTBACK;
413 call_sv (cb, G_DISCARD | G_EVAL);
414 }
415}
416
171static int req_invoke (eio_req *req) 417static int req_invoke (eio_req *req)
172{ 418{
173 dSP;
174
175 if (req->flags & FLAG_SV2_RO_OFF) 419 if (req->flags & FLAG_SV2_RO_OFF)
176 SvREADONLY_off (req->sv2); 420 SvREADONLY_off (req->sv2);
177 421
178 if (!EIO_CANCELLED (req) && SvOK (req->callback)) 422 if (!EIO_CANCELLED (req) && req->callback)
179 { 423 {
424 dSP;
425 static SV *sv_result_cache; /* caches the result integer SV */
426 SV *sv_result;
427
180 ENTER; 428 ENTER;
181 SAVETMPS; 429 SAVETMPS;
182 PUSHMARK (SP); 430 PUSHMARK (SP);
183 EXTEND (SP, 1); 431 EXTEND (SP, 1);
432
433 /* do not recreate the result IV from scratch each time */
434 if (expect_true (sv_result_cache))
435 {
436 sv_result = sv_result_cache; sv_result_cache = 0;
437 SvIV_set (sv_result, req->result);
438 SvIOK_only (sv_result);
439 }
440 else
441 {
442 sv_result = newSViv (req->result);
443 SvREADONLY_on (sv_result);
444 }
184 445
185 switch (req->type) 446 switch (req->type)
186 { 447 {
187 case EIO_READDIR: 448 case EIO_READDIR:
188 { 449 {
189 SV *rv = &PL_sv_undef; 450 SV *rv = &PL_sv_undef;
190 451
191 if (req->result >= 0) 452 if (req->result >= 0)
192 { 453 {
193 int i; 454 int i;
194 char *buf = req->ptr2; 455 char *names = (char *)req->ptr2;
456 eio_dirent *ent = (eio_dirent *)req->ptr1; /* might be 0 */
195 AV *av = newAV (); 457 AV *av = newAV ();
196 458
197 av_extend (av, req->result - 1); 459 av_extend (av, req->result - 1);
198 460
199 for (i = 0; i < req->result; ++i) 461 for (i = 0; i < req->result; ++i)
200 { 462 {
201 SV *sv = newSVpv (buf, 0); 463 if (req->int1 & EIO_READDIR_DENTS)
464 {
465 SV *namesv = newSVpvn (names + ent->nameofs, ent->namelen);
202 466
467 if (req->int1 & EIO_READDIR_CUSTOM2)
468 {
469 static SV *sv_type [EIO_DT_MAX + 1]; /* type sv cache */
470 AV *avent = newAV ();
471
472 av_extend (avent, 2);
473
474 if (!sv_type [ent->type])
475 {
476 sv_type [ent->type] = newSViv (ent->type);
477 SvREADONLY_on (sv_type [ent->type]);
478 }
479
480 av_store (avent, 0, namesv);
481 av_store (avent, 1, SvREFCNT_inc (sv_type [ent->type]));
482 av_store (avent, 2, IVSIZE >= 8 ? newSVuv (ent->inode) : newSVnv (ent->inode));
483
484 av_store (av, i, newRV_noinc ((SV *)avent));
485 }
486 else
203 av_store (av, i, sv); 487 av_store (av, i, namesv);
488
489 ++ent;
490 }
491 else
492 {
493 SV *name = newSVpv (names, 0);
494 av_store (av, i, name);
204 buf += SvCUR (sv) + 1; 495 names += SvCUR (name) + 1;
496 }
205 } 497 }
206 498
207 rv = sv_2mortal (newRV_noinc ((SV *)av)); 499 rv = sv_2mortal (newRV_noinc ((SV *)av));
208 } 500 }
209 501
210 PUSHs (rv); 502 PUSHs (rv);
503
504 if (req->int1 & EIO_READDIR_CUSTOM1)
505 XPUSHs (sv_2mortal (newSViv (req->int1 & ~(EIO_READDIR_CUSTOM1 | EIO_READDIR_CUSTOM2))));
211 } 506 }
212 break; 507 break;
213 508
214 case EIO_OPEN: 509 case EIO_OPEN:
215 { 510 {
221 GV *gv = (GV *)sv_newmortal (); 516 GV *gv = (GV *)sv_newmortal ();
222 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR); 517 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
223 char sym [64]; 518 char sym [64];
224 int symlen; 519 int symlen;
225 520
226 symlen = snprintf (sym, sizeof (sym), "fd#%d", req->result); 521 symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
227 gv_init (gv, stash, sym, symlen, 0); 522 gv_init (gv, aio_stash, sym, symlen, 0);
228 523
229 symlen = snprintf ( 524 symlen = snprintf (
230 sym, 525 sym,
231 sizeof (sym), 526 sizeof (sym),
232 "%s&=%d", 527 "%s&=%d",
233 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<", 528 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
234 req->result 529 (int)req->result
235 ); 530 );
236 531
237 if (do_open (gv, sym, symlen, 0, 0, 0, 0)) 532 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
238 fh = (SV *)gv; 533 fh = (SV *)gv;
239 } 534 }
240 535
241 PUSHs (fh); 536 PUSHs (fh);
242 } 537 }
538 break;
539
540 case EIO_STATVFS:
541 case EIO_FSTATVFS:
542 {
543 SV *rv = &PL_sv_undef;
544
545#ifndef _WIN32
546 if (req->result >= 0)
547 {
548 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req);
549 HV *hv = newHV ();
550
551 rv = sv_2mortal (newRV_noinc ((SV *)hv));
552
553 hv_store (hv, "bsize" , sizeof ("bsize" ) - 1, newSVval64 (f->f_bsize ), 0);
554 hv_store (hv, "frsize" , sizeof ("frsize" ) - 1, newSVval64 (f->f_frsize ), 0);
555 hv_store (hv, "blocks" , sizeof ("blocks" ) - 1, newSVval64 (f->f_blocks ), 0);
556 hv_store (hv, "bfree" , sizeof ("bfree" ) - 1, newSVval64 (f->f_bfree ), 0);
557 hv_store (hv, "bavail" , sizeof ("bavail" ) - 1, newSVval64 (f->f_bavail ), 0);
558 hv_store (hv, "files" , sizeof ("files" ) - 1, newSVval64 (f->f_files ), 0);
559 hv_store (hv, "ffree" , sizeof ("ffree" ) - 1, newSVval64 (f->f_ffree ), 0);
560 hv_store (hv, "favail" , sizeof ("favail" ) - 1, newSVval64 (f->f_favail ), 0);
561 hv_store (hv, "fsid" , sizeof ("fsid" ) - 1, newSVval64 (f->f_fsid ), 0);
562 hv_store (hv, "flag" , sizeof ("flag" ) - 1, newSVval64 (f->f_flag ), 0);
563 hv_store (hv, "namemax", sizeof ("namemax") - 1, newSVval64 (f->f_namemax), 0);
564 }
565#endif
566
567 PUSHs (rv);
568 }
569
243 break; 570 break;
244 571
245 case EIO_GROUP: 572 case EIO_GROUP:
246 req->int1 = 2; /* mark group as finished */ 573 req->int1 = 2; /* mark group as finished */
247 574
259 case EIO_NOP: 586 case EIO_NOP:
260 case EIO_BUSY: 587 case EIO_BUSY:
261 break; 588 break;
262 589
263 case EIO_READLINK: 590 case EIO_READLINK:
591 case EIO_REALPATH:
264 if (req->result > 0) 592 if (req->result > 0)
265 { 593 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; 594 break;
271 595
272 case EIO_STAT: 596 case EIO_STAT:
273 case EIO_LSTAT: 597 case EIO_LSTAT:
274 case EIO_FSTAT: 598 case EIO_FSTAT:
275 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT; 599 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT;
276 PL_laststatval = req->result; 600 PL_laststatval = req->result;
277 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 601 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
278 PUSHs (sv_2mortal (newSViv (req->result))); 602 PUSHs (sv_result);
279 break; 603 break;
280 604
281 case EIO_READ: 605 case EIO_READ:
606 {
282 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0)); 607 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
283 *SvEND (req->sv2) = 0; 608 *SvEND (req->sv2) = 0;
284 PUSHs (sv_2mortal (newSViv (req->result))); 609 SvPOK_only (req->sv2);
610 SvSETMAGIC (req->sv2);
611 PUSHs (sv_result);
612 }
285 break; 613 break;
286 614
287 case EIO_DUP2: 615 case EIO_DUP2: /* EIO_DUP2 actually means aio_close(), so fudge result value */
288 if (req->result > 0) 616 if (req->result > 0)
289 req->result = 0; 617 SvIV_set (sv_result, 0);
290 /* FALLTHROUGH */ 618 /* FALLTHROUGH */
291 619
292 default: 620 default:
293 PUSHs (sv_2mortal (newSViv (req->result))); 621 PUSHs (sv_result);
294 break; 622 break;
295 } 623 }
296 624
297 errno = req->errorno; 625 errno = req->errorno;
298 626
299 PUTBACK; 627 PUTBACK;
300 call_sv (req->callback, G_VOID | G_EVAL | G_DISCARD); 628 call_sv (req->callback, G_VOID | G_EVAL | G_DISCARD);
301 SPAGAIN; 629 SPAGAIN;
630
631 if (expect_false (SvREFCNT (sv_result) != 1 || sv_result_cache))
632 SvREFCNT_dec (sv_result);
633 else
634 sv_result_cache = sv_result;
302 635
303 FREETMPS; 636 FREETMPS;
304 LEAVE; 637 LEAVE;
305 638
306 PUTBACK; 639 PUTBACK;
335 grp->sv2 = 0; 668 grp->sv2 = 0;
336 669
337 eio_grp_cancel (grp); 670 eio_grp_cancel (grp);
338} 671}
339 672
340#ifdef USE_SOCKETS_AS_HANDLES
341# define TO_SOCKET(x) (win32_get_osfhandle (x))
342#else
343# define TO_SOCKET(x) (x)
344#endif
345
346static void
347create_respipe (void) 673static void create_respipe (void)
348{ 674{
349 int old_readfd = respipe [0];
350
351 if (respipe [1] >= 0)
352 respipe_close (TO_SOCKET (respipe [1]));
353
354#ifdef _WIN32
355 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe))
356#else
357 if (pipe (respipe)) 675 if (s_epipe_renew (&respipe))
358#endif
359 croak ("unable to initialize result pipe"); 676 croak ("IO::AIO: unable to initialize result pipe");
360
361 if (old_readfd >= 0)
362 {
363 if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0)
364 croak ("unable to initialize result pipe(2)");
365
366 respipe_close (respipe [0]);
367 respipe [0] = old_readfd;
368 }
369
370#ifdef _WIN32
371 int arg = 1;
372 if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg)
373 || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg))
374#else
375 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
376 || fcntl (respipe [1], F_SETFL, O_NONBLOCK))
377#endif
378 croak ("unable to initialize result pipe(3)");
379
380 respipe_osf [0] = TO_SOCKET (respipe [0]);
381 respipe_osf [1] = TO_SOCKET (respipe [1]);
382} 677}
383 678
384static void poll_wait (void) 679static void poll_wait (void)
385{ 680{
386 fd_set rfd;
387
388 while (eio_nreqs ()) 681 while (eio_nreqs ())
389 { 682 {
390 int size; 683 int size;
391 684
392 X_LOCK (reslock); 685 X_LOCK (reslock);
394 X_UNLOCK (reslock); 687 X_UNLOCK (reslock);
395 688
396 if (size) 689 if (size)
397 return; 690 return;
398 691
399 maybe_start_thread (); 692 etp_maybe_start_thread ();
400 693
401 FD_ZERO (&rfd); 694 s_epipe_wait (&respipe);
402 FD_SET (respipe [0], &rfd);
403
404 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
405 } 695 }
406} 696}
407 697
408static int poll_cb (void) 698static int poll_cb (void)
409{ 699{
700 for (;;)
701 {
410 int res = eio_poll (); 702 int res = eio_poll ();
411 703
412 if (res > 0) 704 if (res > 0)
413 croak (0); 705 croak (0);
414 706
707 if (!max_outstanding || max_outstanding > eio_nreqs ())
708 return res;
709
710 poll_wait ();
711 }
712}
713
714static void atfork_child (void)
715{
716 create_respipe ();
717}
718
719/*****************************************************************************/
720
721#if !_POSIX_MAPPED_FILES
722# define mmap(addr,length,prot,flags,fd,offs) (errno = ENOSYS, -1)
723# define munmap(addr,length) (errno = ENOSYS, -1)
724#endif
725
726#if !_POSIX_MEMORY_PROTECTION
727# define mprotect(addr,len,prot) (errno = ENOSYS, -1)
728# define PROT_NONE 0
729# define PROT_WRITE 0
730# define MAP_PRIVATE 0
731# define MAP_SHARED 0
732# define MAP_FIXED 0
733#endif
734
735#define MMAP_MAGIC PERL_MAGIC_ext
736
737static int mmap_free (pTHX_ SV *sv, MAGIC *mg)
738{
739 int old_errno = errno;
740 munmap (mg->mg_ptr, (size_t)mg->mg_obj);
741 errno = old_errno;
742
743 mg->mg_obj = 0; /* just in case */
744
745 SvREADONLY_off (sv);
746
747 if (SvPVX (sv) != mg->mg_ptr)
748 croak ("ERROR: IO::AIO::mmap-mapped scalar changed location, detected");
749
750 SvCUR_set (sv, 0);
751 SvPVX (sv) = 0;
752 SvOK_off (sv);
753
415 return res; 754 return 0;
755}
756
757static MGVTBL mmap_vtbl = {
758 0, 0, 0, 0, mmap_free
759};
760
761/*****************************************************************************/
762
763static SV * get_cb (SV *cb_sv)
764{
765 SvGETMAGIC (cb_sv);
766 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
416} 767}
417 768
418#define dREQ \ 769#define dREQ \
770 SV *cb_cv; \
419 aio_req req; \ 771 aio_req req; \
420 int req_pri = next_pri; \ 772 int req_pri = next_pri; \
421 next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; \ 773 next_pri = EIO_PRI_DEFAULT; \
422 \ 774 \
423 if (SvOK (callback) && !SvROK (callback)) \ 775 cb_cv = get_cb (callback); \
424 croak ("callback must be undef or of reference type"); \
425 \ 776 \
426 Newz (0, req, 1, eio_req); \ 777 Newz (0, req, 1, eio_req); \
427 if (!req) \ 778 if (!req) \
428 croak ("out of memory during eio_req allocation"); \ 779 croak ("out of memory during eio_req allocation"); \
429 \ 780 \
430 req->callback = newSVsv (callback); \ 781 req->callback = SvREFCNT_inc (cb_cv); \
431 req->pri = req_pri 782 req->pri = req_pri
432 783
433#define REQ_SEND \ 784#define REQ_SEND \
785 PUTBACK; \
434 eio_submit (req); \ 786 req_submit (req); \
787 SPAGAIN; \
435 \ 788 \
436 if (GIMME_V != G_VOID) \ 789 if (GIMME_V != G_VOID) \
437 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 790 XPUSHs (req_sv (req, aio_req_stash));
438 791
439MODULE = IO::AIO PACKAGE = IO::AIO 792MODULE = IO::AIO PACKAGE = IO::AIO
440 793
441PROTOTYPES: ENABLE 794PROTOTYPES: ENABLE
442 795
443BOOT: 796BOOT:
444{ 797{
798 static const struct {
799 const char *name;
800 IV iv;
801 } *civ, const_iv[] = {
802# define const_niv(name, value) { # name, (IV) value },
803# define const_iv(name) { # name, (IV) name },
804# define const_eio(name) { # name, (IV) EIO_ ## name },
805 const_iv (EXDEV)
806 const_iv (ENOSYS)
807 const_iv (O_RDONLY)
808 const_iv (O_WRONLY)
809 const_iv (O_RDWR)
810 const_iv (O_CREAT)
811 const_iv (O_TRUNC)
812 const_iv (O_EXCL)
813 const_iv (O_APPEND)
814
815 const_iv (O_ASYNC)
816 const_iv (O_DIRECT)
817 const_iv (O_NOATIME)
818
819 const_iv (O_CLOEXEC)
820 const_iv (O_NOCTTY)
821 const_iv (O_NOFOLLOW)
822 const_iv (O_NONBLOCK)
823 const_iv (O_EXEC)
824 const_iv (O_SEARCH)
825 const_iv (O_DIRECTORY)
826 const_iv (O_DSYNC)
827 const_iv (O_RSYNC)
828 const_iv (O_SYNC)
829 const_iv (O_TTY_INIT)
830
831 const_iv (S_IFIFO)
832 const_iv (S_IFCHR)
833 const_iv (S_IFBLK)
834 const_iv (S_IFLNK)
835 const_iv (S_IFREG)
836 const_iv (S_IFDIR)
837 const_iv (S_IFWHT)
838 const_iv (S_IFSOCK)
839 const_iv (S_IFMT)
840
841 const_niv (FADV_NORMAL , POSIX_FADV_NORMAL)
842 const_niv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL)
843 const_niv (FADV_RANDOM , POSIX_FADV_RANDOM)
844 const_niv (FADV_NOREUSE , POSIX_FADV_NOREUSE)
845 const_niv (FADV_WILLNEED , POSIX_FADV_WILLNEED)
846 const_niv (FADV_DONTNEED , POSIX_FADV_DONTNEED)
847
848 const_niv (MADV_NORMAL , POSIX_MADV_NORMAL)
849 const_niv (MADV_SEQUENTIAL, POSIX_MADV_SEQUENTIAL)
850 const_niv (MADV_RANDOM , POSIX_MADV_RANDOM)
851 const_niv (MADV_WILLNEED , POSIX_MADV_WILLNEED)
852 const_niv (MADV_DONTNEED , POSIX_MADV_DONTNEED)
853
854 const_iv (ST_RDONLY)
855 const_iv (ST_NOSUID)
856 const_iv (ST_NODEV)
857 const_iv (ST_NOEXEC)
858 const_iv (ST_SYNCHRONOUS)
859 const_iv (ST_MANDLOCK)
860 const_iv (ST_WRITE)
861 const_iv (ST_APPEND)
862 const_iv (ST_IMMUTABLE)
863 const_iv (ST_NOATIME)
864 const_iv (ST_NODIRATIME)
865 const_iv (ST_RELATIME)
866
867 const_iv (PROT_NONE)
868 const_iv (PROT_EXEC)
869 const_iv (PROT_READ)
870 const_iv (PROT_WRITE)
871
872 /*const_iv (MAP_FIXED)*/
873 const_iv (MAP_PRIVATE)
874 const_iv (MAP_SHARED)
875 const_iv (MAP_ANONYMOUS)
876
877 /* linuxish */
878 const_iv (MAP_HUGETLB)
879 const_iv (MAP_LOCKED)
880 const_iv (MAP_NORESERVE)
881 const_iv (MAP_POPULATE)
882 const_iv (MAP_NONBLOCK)
883
884 const_eio (MCL_FUTURE)
885 const_eio (MCL_CURRENT)
886
887 const_eio (MS_ASYNC)
888 const_eio (MS_INVALIDATE)
889 const_eio (MS_SYNC)
890
891 const_eio (MT_MODIFY)
892
893 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
894 const_eio (SYNC_FILE_RANGE_WRITE)
895 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
896
897 const_eio (FALLOC_FL_KEEP_SIZE)
898
899 const_eio (READDIR_DENTS)
900 const_eio (READDIR_DIRS_FIRST)
901 const_eio (READDIR_STAT_ORDER)
902 const_eio (READDIR_FOUND_UNKNOWN)
903
904 const_eio (DT_UNKNOWN)
905 const_eio (DT_FIFO)
906 const_eio (DT_CHR)
907 const_eio (DT_DIR)
908 const_eio (DT_BLK)
909 const_eio (DT_REG)
910 const_eio (DT_LNK)
911 const_eio (DT_SOCK)
912 const_eio (DT_WHT)
913 };
914
445 stash = gv_stashpv ("IO::AIO", 1); 915 aio_stash = gv_stashpv ("IO::AIO" , 1);
916 aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1);
917 aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1);
446 918
447 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 919 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
448 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 920 newCONSTSUB (aio_stash, (char *)civ->name, newSViv (civ->iv));
449 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
450 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
451 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
452#ifdef _WIN32
453 X_MUTEX_CHECK (wrklock);
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 921
460 X_COND_CHECK (reqwait); 922 newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE));
461#else
462 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
463#endif
464 923
465 create_respipe (); 924 create_respipe ();
466 925
467 if (eio_init (want_poll, done_poll) < 0) 926 if (eio_init (want_poll, done_poll) < 0)
468 croak ("IO::AIO: unable to initialise eio library"); 927 croak ("IO::AIO: unable to initialise eio library");
469}
470 928
929 /* atfork child called in fifo order, so before eio's handler */
930 X_THREAD_ATFORK (0, 0, atfork_child);
931}
932
471void 933void
472max_poll_reqs (int nreqs) 934max_poll_reqs (unsigned int nreqs)
473 PROTOTYPE: $ 935 PROTOTYPE: $
474 CODE: 936 CODE:
475 eio_set_max_poll_reqs (nreqs); 937 eio_set_max_poll_reqs (nreqs);
476 938
477void 939void
479 PROTOTYPE: $ 941 PROTOTYPE: $
480 CODE: 942 CODE:
481 eio_set_max_poll_time (nseconds); 943 eio_set_max_poll_time (nseconds);
482 944
483void 945void
484min_parallel (int nthreads) 946min_parallel (unsigned int nthreads)
485 PROTOTYPE: $ 947 PROTOTYPE: $
486 CODE: 948 CODE:
487 eio_set_min_parallel (nthreads); 949 eio_set_min_parallel (nthreads);
488 950
489void 951void
490max_parallel (int nthreads) 952max_parallel (unsigned int nthreads)
491 PROTOTYPE: $ 953 PROTOTYPE: $
492 CODE: 954 CODE:
493 eio_set_max_parallel (nthreads); 955 eio_set_max_parallel (nthreads);
494 956
495void 957void
496max_idle (int nthreads) 958max_idle (unsigned int nthreads)
497 PROTOTYPE: $ 959 PROTOTYPE: $
498 CODE: 960 CODE:
499 eio_set_max_idle (nthreads); 961 eio_set_max_idle (nthreads);
500 962
501void 963void
964idle_timeout (unsigned int seconds)
965 PROTOTYPE: $
966 CODE:
967 eio_set_idle_timeout (seconds);
968
969void
502max_outstanding (int maxreqs) 970max_outstanding (unsigned int maxreqs)
503 PROTOTYPE: $ 971 PROTOTYPE: $
504 CODE: 972 CODE:
505 max_outstanding = maxreqs; 973 max_outstanding = maxreqs;
506 974
507void 975void
508aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef) 976aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef)
509 PROTOTYPE: $$$;$
510 PPCODE: 977 PPCODE:
511{ 978{
512 dREQ; 979 dREQ;
513 980
514 req->type = EIO_OPEN; 981 req->type = EIO_OPEN;
520 REQ_SEND; 987 REQ_SEND;
521} 988}
522 989
523void 990void
524aio_fsync (SV *fh, SV *callback=&PL_sv_undef) 991aio_fsync (SV *fh, SV *callback=&PL_sv_undef)
525 PROTOTYPE: $;$
526 ALIAS: 992 ALIAS:
527 aio_fsync = EIO_FSYNC 993 aio_fsync = EIO_FSYNC
528 aio_fdatasync = EIO_FDATASYNC 994 aio_fdatasync = EIO_FDATASYNC
529 PPCODE: 995 PPCODE:
530{ 996{
997 int fd = s_fileno_croak (fh, 0);
531 dREQ; 998 dREQ;
532 999
533 req->type = ix; 1000 req->type = ix;
534 req->sv1 = newSVsv (fh); 1001 req->sv1 = newSVsv (fh);
535 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 1002 req->int1 = fd;
536 1003
537 REQ_SEND (req); 1004 REQ_SEND (req);
538} 1005}
539 1006
540void 1007void
1008aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef)
1009 PPCODE:
1010{
1011 int fd = s_fileno_croak (fh, 0);
1012 dREQ;
1013
1014 req->type = EIO_SYNC_FILE_RANGE;
1015 req->sv1 = newSVsv (fh);
1016 req->int1 = fd;
1017 req->offs = offset;
1018 req->size = nbytes;
1019 req->int2 = flags;
1020
1021 REQ_SEND (req);
1022}
1023
1024void
1025aio_fallocate (SV *fh, int mode, off_t offset, size_t len, SV *callback=&PL_sv_undef)
1026 PPCODE:
1027{
1028 int fd = s_fileno_croak (fh, 0);
1029 dREQ;
1030
1031 req->type = EIO_FALLOCATE;
1032 req->sv1 = newSVsv (fh);
1033 req->int1 = fd;
1034 req->int2 = mode;
1035 req->offs = offset;
1036 req->size = len;
1037
1038 REQ_SEND (req);
1039}
1040
1041void
541aio_close (SV *fh, SV *callback=&PL_sv_undef) 1042aio_close (SV *fh, SV *callback=&PL_sv_undef)
542 PROTOTYPE: $;$
543 PPCODE: 1043 PPCODE:
544{ 1044{
545 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 1045 static int close_fd = -1; /* dummy fd to close fds via dup2 */
1046 int fd = s_fileno_croak (fh, 0);
546 dREQ; 1047 dREQ;
547 1048
548 if (close_pipe < 0) 1049 if (expect_false (close_fd < 0))
549 { 1050 {
1051#ifdef _WIN32
1052 close_fd = _open_osfhandle (socket (AF_INET, SOCK_STREAM, 0), 0);
1053#else
550 int pipefd [2]; 1054 int pipefd [2];
551 1055
552 if (pipe (pipefd) < 0 1056 if (pipe (pipefd) < 0
553 || close (pipefd [1]) < 0 1057 || close (pipefd [1]) < 0
554 || fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0) 1058 || fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0)
555 abort (); /*D*/ 1059 abort (); /*D*/
556 1060
557 close_pipe = pipefd [0]; 1061 close_fd = pipefd [0];
1062#endif
558 } 1063 }
559 1064
560 req->type = EIO_DUP2; 1065 req->type = EIO_DUP2;
561 req->int1 = close_pipe; 1066 req->int1 = close_fd;
562 req->sv2 = newSVsv (fh); 1067 req->sv2 = newSVsv (fh);
563 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 1068 req->int2 = fd;
564 1069
565 REQ_SEND (req); 1070 REQ_SEND (req);
566} 1071}
567 1072
568void 1073void
569aio_read (SV *fh, SV *offset, SV *length, SV8 *data, IV dataoffset, SV *callback=&PL_sv_undef) 1074aio_read (SV *fh, SV *offset, SV *length, SV8 *data, IV dataoffset, SV *callback=&PL_sv_undef)
570 ALIAS: 1075 ALIAS:
571 aio_read = EIO_READ 1076 aio_read = EIO_READ
572 aio_write = EIO_WRITE 1077 aio_write = EIO_WRITE
573 PROTOTYPE: $$$$$;$
574 PPCODE: 1078 PPCODE:
575{ 1079{
576 STRLEN svlen; 1080 STRLEN svlen;
1081 int fd = s_fileno_croak (fh, ix == EIO_WRITE);
577 char *svptr = SvPVbyte (data, svlen); 1082 char *svptr = SvPVbyte (data, svlen);
578 UV len = SvUV (length); 1083 UV len = SvUV (length);
579
580 SvUPGRADE (data, SVt_PV);
581 SvPOK_on (data);
582 1084
583 if (dataoffset < 0) 1085 if (dataoffset < 0)
584 dataoffset += svlen; 1086 dataoffset += svlen;
585 1087
586 if (dataoffset < 0 || dataoffset > svlen) 1088 if (dataoffset < 0 || dataoffset > svlen)
592 if (!SvOK (length) || len + dataoffset > svlen) 1094 if (!SvOK (length) || len + dataoffset > svlen)
593 len = svlen - dataoffset; 1095 len = svlen - dataoffset;
594 } 1096 }
595 else 1097 else
596 { 1098 {
597 /* read: grow scalar as necessary */ 1099 /* read: check type and grow scalar as necessary */
1100 SvUPGRADE (data, SVt_PV);
598 svptr = SvGROW (data, len + dataoffset + 1); 1101 svptr = SvGROW (data, len + dataoffset + 1);
599 } 1102 }
600 1103
601 if (len < 0)
602 croak ("length must not be negative");
603
604 { 1104 {
605 dREQ; 1105 dREQ;
606 1106
607 req->type = ix; 1107 req->type = ix;
608 req->sv1 = newSVsv (fh); 1108 req->sv1 = newSVsv (fh);
609 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 1109 req->int1 = fd;
610 : IoOFP (sv_2io (fh)));
611 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 1110 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
612 req->size = len; 1111 req->size = len;
613 req->sv2 = SvREFCNT_inc (data); 1112 req->sv2 = SvREFCNT_inc (data);
614 req->ptr2 = (char *)svptr + dataoffset; 1113 req->ptr2 = (char *)svptr + dataoffset;
615 req->stroffset = dataoffset; 1114 req->stroffset = dataoffset;
624 } 1123 }
625} 1124}
626 1125
627void 1126void
628aio_readlink (SV8 *path, SV *callback=&PL_sv_undef) 1127aio_readlink (SV8 *path, SV *callback=&PL_sv_undef)
629 PROTOTYPE: $$;$ 1128 ALIAS:
1129 aio_readlink = EIO_READLINK
1130 aio_realpath = EIO_REALPATH
630 PPCODE: 1131 PPCODE:
631{ 1132{
632 SV *data; 1133 SV *data;
633 dREQ; 1134 dREQ;
634 1135
635 data = newSV (NAME_MAX);
636 SvPOK_on (data);
637
638 req->type = EIO_READLINK; 1136 req->type = ix;
639 req->sv1 = newSVsv (path); 1137 req->sv1 = newSVsv (path);
640 req->ptr1 = SvPVbyte_nolen (req->sv1); 1138 req->ptr1 = SvPVbyte_nolen (req->sv1);
641 req->sv2 = data;
642 req->ptr2 = SvPVbyte_nolen (data);
643 1139
644 REQ_SEND; 1140 REQ_SEND;
645} 1141}
646 1142
647void 1143void
648aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef) 1144aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef)
649 PROTOTYPE: $$$$;$
650 PPCODE: 1145 PPCODE:
651{ 1146{
1147 int ifd = s_fileno_croak (in_fh , 0);
1148 int ofd = s_fileno_croak (out_fh, 1);
652 dREQ; 1149 dREQ;
653 1150
654 req->type = EIO_SENDFILE; 1151 req->type = EIO_SENDFILE;
655 req->sv1 = newSVsv (out_fh); 1152 req->sv1 = newSVsv (out_fh);
656 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1153 req->int1 = ofd;
657 req->sv2 = newSVsv (in_fh); 1154 req->sv2 = newSVsv (in_fh);
658 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1155 req->int2 = ifd;
659 req->offs = SvVAL64 (in_offset); 1156 req->offs = in_offset;
660 req->size = length; 1157 req->size = length;
661 1158
662 REQ_SEND; 1159 REQ_SEND;
663} 1160}
664 1161
665void 1162void
666aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef) 1163aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef)
667 PROTOTYPE: $$$;$
668 PPCODE: 1164 PPCODE:
669{ 1165{
1166 int fd = s_fileno_croak (fh, 0);
670 dREQ; 1167 dREQ;
671 1168
672 req->type = EIO_READAHEAD; 1169 req->type = EIO_READAHEAD;
673 req->sv1 = newSVsv (fh); 1170 req->sv1 = newSVsv (fh);
674 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 1171 req->int1 = fd;
675 req->offs = SvVAL64 (offset); 1172 req->offs = offset;
676 req->size = length; 1173 req->size = length;
677 1174
678 REQ_SEND; 1175 REQ_SEND;
679} 1176}
680 1177
681void 1178void
682aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef) 1179aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef)
683 ALIAS: 1180 ALIAS:
684 aio_stat = EIO_STAT 1181 aio_stat = EIO_STAT
685 aio_lstat = EIO_LSTAT 1182 aio_lstat = EIO_LSTAT
1183 aio_statvfs = EIO_STATVFS
686 PPCODE: 1184 PPCODE:
687{ 1185{
688 dREQ; 1186 dREQ;
689 1187
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); 1188 req->sv1 = newSVsv (fh_or_path);
699 1189
700 if (SvPOK (fh_or_path)) 1190 if (SvPOK (req->sv1))
701 { 1191 {
702 req->type = ix; 1192 req->type = ix;
703 req->ptr1 = SvPVbyte_nolen (req->sv1); 1193 req->ptr1 = SvPVbyte_nolen (req->sv1);
704 } 1194 }
705 else 1195 else
706 { 1196 {
707 req->type = EIO_FSTAT; 1197 req->type = ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT;
708 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1198 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
709 } 1199 }
710 1200
711 REQ_SEND; 1201 REQ_SEND;
712} 1202}
1203
1204UV
1205major (UV dev)
1206 ALIAS:
1207 minor = 1
1208 CODE:
1209 RETVAL = ix ? major (dev) : minor (dev);
1210 OUTPUT:
1211 RETVAL
1212
1213UV
1214makedev (UV maj, UV min)
1215 CODE:
1216 RETVAL = makedev (maj, min);
1217 OUTPUT:
1218 RETVAL
713 1219
714void 1220void
715aio_utime (SV8 *fh_or_path, SV *atime, SV *mtime, SV *callback=&PL_sv_undef) 1221aio_utime (SV8 *fh_or_path, SV *atime, SV *mtime, SV *callback=&PL_sv_undef)
716 PPCODE: 1222 PPCODE:
717{ 1223{
719 1225
720 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 1226 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
721 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; 1227 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
722 req->sv1 = newSVsv (fh_or_path); 1228 req->sv1 = newSVsv (fh_or_path);
723 1229
724 if (SvPOK (fh_or_path)) 1230 if (SvPOK (req->sv1))
725 { 1231 {
726 req->type = EIO_UTIME; 1232 req->type = EIO_UTIME;
727 req->ptr1 = SvPVbyte_nolen (req->sv1); 1233 req->ptr1 = SvPVbyte_nolen (req->sv1);
728 } 1234 }
729 else 1235 else
742 dREQ; 1248 dREQ;
743 1249
744 req->sv1 = newSVsv (fh_or_path); 1250 req->sv1 = newSVsv (fh_or_path);
745 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 1251 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
746 1252
747 if (SvPOK (fh_or_path)) 1253 if (SvPOK (req->sv1))
748 { 1254 {
749 req->type = EIO_TRUNCATE; 1255 req->type = EIO_TRUNCATE;
750 req->ptr1 = SvPVbyte_nolen (req->sv1); 1256 req->ptr1 = SvPVbyte_nolen (req->sv1);
751 } 1257 }
752 else 1258 else
760 1266
761void 1267void
762aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef) 1268aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
763 ALIAS: 1269 ALIAS:
764 aio_chmod = EIO_CHMOD 1270 aio_chmod = EIO_CHMOD
765 aio_fchmod = EIO_FCHMOD
766 aio_mkdir = EIO_MKDIR 1271 aio_mkdir = EIO_MKDIR
767 PPCODE: 1272 PPCODE:
768{ 1273{
769 dREQ; 1274 dREQ;
770 1275
771 req->type = ix;
772 req->int2 = mode; 1276 req->int2 = mode;
773 req->sv1 = newSVsv (fh_or_path); 1277 req->sv1 = newSVsv (fh_or_path);
774 1278
775 if (ix == EIO_FCHMOD) 1279 if (SvPOK (req->sv1))
776 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1280 {
1281 req->type = ix;
1282 req->ptr1 = SvPVbyte_nolen (req->sv1);
1283 }
777 else 1284 else
778 req->ptr1 = SvPVbyte_nolen (req->sv1); 1285 {
1286 req->type = EIO_FCHMOD;
1287 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1288 }
779 1289
780 REQ_SEND; 1290 REQ_SEND;
781} 1291}
782 1292
783void 1293void
788 1298
789 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 1299 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
790 req->int3 = SvOK (gid) ? SvIV (gid) : -1; 1300 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
791 req->sv1 = newSVsv (fh_or_path); 1301 req->sv1 = newSVsv (fh_or_path);
792 1302
793 if (SvPOK (fh_or_path)) 1303 if (SvPOK (req->sv1))
794 { 1304 {
795 req->type = EIO_CHOWN; 1305 req->type = EIO_CHOWN;
796 req->ptr1 = SvPVbyte_nolen (req->sv1); 1306 req->ptr1 = SvPVbyte_nolen (req->sv1);
797 } 1307 }
798 else 1308 else
803 1313
804 REQ_SEND; 1314 REQ_SEND;
805} 1315}
806 1316
807void 1317void
1318aio_readdirx (SV8 *pathname, IV flags, SV *callback=&PL_sv_undef)
1319 PPCODE:
1320{
1321 dREQ;
1322
1323 req->type = EIO_READDIR;
1324 req->sv1 = newSVsv (pathname);
1325 req->ptr1 = SvPVbyte_nolen (req->sv1);
1326 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
1327
1328 if (flags & EIO_READDIR_DENTS)
1329 req->int1 |= EIO_READDIR_CUSTOM2;
1330
1331 REQ_SEND;
1332}
1333
1334void
808aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 1335aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
809 ALIAS: 1336 ALIAS:
810 aio_unlink = EIO_UNLINK 1337 aio_unlink = EIO_UNLINK
811 aio_rmdir = EIO_RMDIR 1338 aio_rmdir = EIO_RMDIR
812 aio_readdir = EIO_READDIR 1339 aio_readdir = EIO_READDIR
854 1381
855 REQ_SEND; 1382 REQ_SEND;
856} 1383}
857 1384
858void 1385void
1386aio_mtouch (SV8 *data, IV offset = 0, SV *length = &PL_sv_undef, int flags = 0, SV *callback=&PL_sv_undef)
1387 ALIAS:
1388 aio_mtouch = EIO_MTOUCH
1389 aio_msync = EIO_MSYNC
1390 PPCODE:
1391{
1392 STRLEN svlen;
1393 char *svptr = SvPVbyte (data, svlen);
1394 UV len = SvUV (length);
1395
1396 if (offset < 0)
1397 offset += svlen;
1398
1399 if (offset < 0 || offset > svlen)
1400 croak ("offset outside of scalar");
1401
1402 if (!SvOK (length) || len + offset > svlen)
1403 len = svlen - offset;
1404
1405 {
1406 dREQ;
1407
1408 req->type = ix;
1409 req->sv2 = SvREFCNT_inc (data);
1410 req->ptr2 = (char *)svptr + offset;
1411 req->size = len;
1412 req->int1 = flags;
1413
1414 REQ_SEND;
1415 }
1416}
1417
1418void
1419aio_mlock (SV8 *data, IV offset = 0, SV *length = &PL_sv_undef, SV *callback=&PL_sv_undef)
1420 PPCODE:
1421{
1422 STRLEN svlen;
1423 char *svptr = SvPVbyte (data, svlen);
1424 UV len = SvUV (length);
1425
1426 if (offset < 0)
1427 offset += svlen;
1428
1429 if (offset < 0 || offset > svlen)
1430 croak ("offset outside of scalar");
1431
1432 if (!SvOK (length) || len + offset > svlen)
1433 len = svlen - offset;
1434
1435 {
1436 dREQ;
1437
1438 req->type = EIO_MLOCK;
1439 req->sv2 = SvREFCNT_inc (data);
1440 req->ptr2 = (char *)svptr + offset;
1441 req->size = len;
1442
1443 REQ_SEND;
1444 }
1445}
1446
1447void
1448aio_mlockall (IV flags, SV *callback=&PL_sv_undef)
1449 PPCODE:
1450{
1451 dREQ;
1452
1453 req->type = EIO_MLOCKALL;
1454 req->int1 = flags;
1455
1456 REQ_SEND;
1457}
1458
1459void
859aio_busy (double delay, SV *callback=&PL_sv_undef) 1460aio_busy (double delay, SV *callback=&PL_sv_undef)
860 PPCODE: 1461 PPCODE:
861{ 1462{
862 dREQ; 1463 dREQ;
863 1464
867 REQ_SEND; 1468 REQ_SEND;
868} 1469}
869 1470
870void 1471void
871aio_group (SV *callback=&PL_sv_undef) 1472aio_group (SV *callback=&PL_sv_undef)
872 PROTOTYPE: ;$
873 PPCODE: 1473 PPCODE:
874{ 1474{
875 dREQ; 1475 dREQ;
876 1476
877 req->type = EIO_GROUP; 1477 req->type = EIO_GROUP;
878 1478
879 eio_submit (req); 1479 req_submit (req);
880 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1480 XPUSHs (req_sv (req, aio_grp_stash));
881} 1481}
882 1482
883void 1483void
884aio_nop (SV *callback=&PL_sv_undef) 1484aio_nop (SV *callback=&PL_sv_undef)
885 ALIAS: 1485 ALIAS:
894 REQ_SEND; 1494 REQ_SEND;
895} 1495}
896 1496
897int 1497int
898aioreq_pri (int pri = 0) 1498aioreq_pri (int pri = 0)
899 PROTOTYPE: ;$
900 CODE: 1499 CODE:
901 RETVAL = next_pri - EIO_PRI_BIAS; 1500 RETVAL = next_pri;
902 if (items > 0) 1501 if (items > 0)
903 { 1502 {
904 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN; 1503 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
905 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX; 1504 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
906 next_pri = pri + EIO_PRI_BIAS; 1505 next_pri = pri;
907 } 1506 }
908 OUTPUT: 1507 OUTPUT:
909 RETVAL 1508 RETVAL
910 1509
911void 1510void
912aioreq_nice (int nice = 0) 1511aioreq_nice (int nice = 0)
913 CODE: 1512 CODE:
914 nice = next_pri - nice; 1513 nice = next_pri - nice;
915 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN; 1514 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
916 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX; 1515 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
917 next_pri = nice + EIO_PRI_BIAS; 1516 next_pri = nice;
918 1517
919void 1518void
920flush () 1519flush ()
921 PROTOTYPE:
922 CODE: 1520 CODE:
923 while (nreqs) 1521 while (eio_nreqs ())
924 { 1522 {
925 poll_wait (); 1523 poll_wait ();
926 poll_cb (); 1524 poll_cb ();
927 } 1525 }
928 1526
929int 1527int
930poll() 1528poll ()
931 PROTOTYPE:
932 CODE: 1529 CODE:
933 poll_wait (); 1530 poll_wait ();
934 RETVAL = poll_cb (); 1531 RETVAL = poll_cb ();
935 OUTPUT: 1532 OUTPUT:
936 RETVAL 1533 RETVAL
937 1534
938int 1535int
939poll_fileno() 1536poll_fileno ()
940 PROTOTYPE:
941 CODE: 1537 CODE:
942 RETVAL = respipe [0]; 1538 RETVAL = s_epipe_fd (&respipe);
943 OUTPUT: 1539 OUTPUT:
944 RETVAL 1540 RETVAL
945 1541
946int 1542int
947poll_cb(...) 1543poll_cb (...)
948 PROTOTYPE: 1544 PROTOTYPE:
949 CODE: 1545 CODE:
950 RETVAL = poll_cb (); 1546 RETVAL = poll_cb ();
951 OUTPUT: 1547 OUTPUT:
952 RETVAL 1548 RETVAL
953 1549
954void 1550void
955poll_wait() 1551poll_wait ()
956 PROTOTYPE:
957 CODE: 1552 CODE:
958 poll_wait (); 1553 poll_wait ();
959 1554
960int 1555int
961nreqs() 1556nreqs ()
962 PROTOTYPE:
963 CODE: 1557 CODE:
964 RETVAL = eio_nreqs (); 1558 RETVAL = eio_nreqs ();
965 OUTPUT: 1559 OUTPUT:
966 RETVAL 1560 RETVAL
967 1561
968int 1562int
969nready() 1563nready ()
970 PROTOTYPE:
971 CODE: 1564 CODE:
972 RETVAL = eio_nready (); 1565 RETVAL = eio_nready ();
973 OUTPUT: 1566 OUTPUT:
974 RETVAL 1567 RETVAL
975 1568
976int 1569int
977npending() 1570npending ()
978 PROTOTYPE:
979 CODE: 1571 CODE:
980 RETVAL = eio_npending (); 1572 RETVAL = eio_npending ();
981 OUTPUT: 1573 OUTPUT:
982 RETVAL 1574 RETVAL
983 1575
984int 1576int
985nthreads() 1577nthreads ()
986 PROTOTYPE:
987 CODE: 1578 CODE:
988 if (WORDACCESS_UNSAFE) X_LOCK (wrklock); 1579 RETVAL = eio_nthreads ();
989 RETVAL = started;
990 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
991 OUTPUT: 1580 OUTPUT:
992 RETVAL 1581 RETVAL
1582
1583int
1584fadvise (aio_rfd fh, off_t offset, off_t length, IV advice)
1585 CODE:
1586 RETVAL = posix_fadvise (fh, offset, length, advice);
1587 OUTPUT:
1588 RETVAL
1589
1590ssize_t
1591sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
1592 CODE:
1593 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count);
1594 OUTPUT:
1595 RETVAL
1596
1597void
1598mmap (SV *scalar, size_t length, int prot, int flags, SV *fh, off_t offset = 0)
1599 PPCODE:
1600 sv_unmagic (scalar, MMAP_MAGIC);
1601{
1602 int fd = SvOK (fh) ? s_fileno_croak (fh, flags & PROT_WRITE) : -1;
1603 void *addr = (void *)mmap (0, length, prot, flags, fd, offset);
1604 if (addr == (void *)-1)
1605 XSRETURN_NO;
1606
1607 sv_force_normal (scalar);
1608
1609 /* we store the length in mg_obj, as namlen is I32 :/ */
1610 sv_magicext (scalar, 0, MMAP_MAGIC, &mmap_vtbl, (char *)addr, 0)
1611 ->mg_obj = (SV *)length;
1612
1613 SvUPGRADE (scalar, SVt_PV); /* nop... */
1614
1615 if (!(prot & PROT_WRITE))
1616 SvREADONLY_on (scalar);
1617
1618 if (SvLEN (scalar))
1619 Safefree (SvPVX (scalar));
1620
1621 SvPVX (scalar) = (char *)addr;
1622 SvCUR_set (scalar, length);
1623 SvLEN_set (scalar, 0);
1624 SvPOK_only (scalar);
1625
1626 XSRETURN_YES;
1627}
1628
1629void
1630munmap (SV *scalar)
1631 CODE:
1632 sv_unmagic (scalar, MMAP_MAGIC);
1633
1634int
1635madvise (SV *scalar, off_t offset = 0, SV *length = &PL_sv_undef, IV advice_or_prot)
1636 ALIAS:
1637 mprotect = 1
1638 CODE:
1639{
1640 STRLEN svlen;
1641 void *addr = SvPVbyte (scalar, svlen);
1642 size_t len = SvUV (length);
1643
1644 if (offset < 0)
1645 offset += svlen;
1646
1647 if (offset < 0 || offset > svlen)
1648 croak ("offset outside of scalar");
1649
1650 if (!SvOK (length) || len + offset > svlen)
1651 len = svlen - offset;
1652
1653 addr = (void *)(((intptr_t)addr) + offset);
1654 eio_page_align (&addr, &len);
1655
1656 switch (ix)
1657 {
1658 case 0: RETVAL = posix_madvise (addr, len, advice_or_prot); break;
1659 case 1: RETVAL = mprotect (addr, len, advice_or_prot); break;
1660 }
1661}
1662 OUTPUT:
1663 RETVAL
1664
1665int
1666munlock (SV *scalar, off_t offset = 0, SV *length = &PL_sv_undef)
1667 CODE:
1668{
1669 STRLEN svlen;
1670 void *addr = SvPVbyte (scalar, svlen);
1671 size_t len = SvUV (length);
1672
1673 if (offset < 0)
1674 offset += svlen;
1675
1676 if (offset < 0 || offset > svlen)
1677 croak ("offset outside of scalar");
1678
1679 if (!SvOK (length) || len + offset > svlen)
1680 len = svlen - offset;
1681
1682 addr = (void *)(((intptr_t)addr) + offset);
1683 eio_page_align (&addr, &len);
1684#if _POSIX_MEMLOCK_RANGE
1685 RETVAL = munlock (addr, len);
1686#else
1687 RETVAL = ((errno = ENOSYS), -1);
1688#endif
1689}
1690 OUTPUT:
1691 RETVAL
1692
1693int
1694munlockall ()
1695 CODE:
1696#if _POSIX_MEMLOCK
1697 munlockall ();
1698#else
1699 RETVAL = -1;
1700 errno = ENOSYS;
1701#endif
1702 OUTPUT:
1703 RETVAL
1704
1705void _on_next_submit (SV *cb)
1706 CODE:
1707 SvREFCNT_dec (on_next_submit);
1708 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
993 1709
994PROTOTYPES: DISABLE 1710PROTOTYPES: DISABLE
995 1711
996MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1712MODULE = IO::AIO PACKAGE = IO::AIO::REQ
997 1713
1000 CODE: 1716 CODE:
1001 eio_cancel (req); 1717 eio_cancel (req);
1002 1718
1003void 1719void
1004cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1720cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1005 CODE: 1721 PPCODE:
1722{
1723 if (GIMME_V != G_VOID)
1724 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1725
1726 if (items > 1)
1727 {
1728 SV *cb_cv =get_cb (callback);
1729
1006 SvREFCNT_dec (req->callback); 1730 SvREFCNT_dec (req->callback);
1007 req->callback = newSVsv (callback); 1731 req->callback = SvREFCNT_inc (cb_cv);
1732 }
1733}
1008 1734
1009MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1735MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1010 1736
1011void 1737void
1012add (aio_req grp, ...) 1738add (aio_req grp, ...)
1044 AV *av; 1770 AV *av;
1045 1771
1046 grp->errorno = errno; 1772 grp->errorno = errno;
1047 1773
1048 av = newAV (); 1774 av = newAV ();
1775 av_extend (av, items - 1);
1049 1776
1050 for (i = 1; i < items; ++i ) 1777 for (i = 1; i < items; ++i )
1051 av_push (av, newSVsv (ST (i))); 1778 av_push (av, newSVsv (ST (i)));
1052 1779
1053 SvREFCNT_dec (grp->sv1); 1780 SvREFCNT_dec (grp->sv1);
1067void 1794void
1068feed (aio_req grp, SV *callback=&PL_sv_undef) 1795feed (aio_req grp, SV *callback=&PL_sv_undef)
1069 CODE: 1796 CODE:
1070{ 1797{
1071 SvREFCNT_dec (grp->sv2); 1798 SvREFCNT_dec (grp->sv2);
1072 grp->sv2 = newSVsv (callback); 1799 grp->sv2 = newSVsv (callback);
1800 grp->feed = aio_grp_feed;
1073 1801
1074 if (grp->int2 <= 0) 1802 if (grp->int2 <= 0)
1075 grp->int2 = 2; 1803 grp->int2 = 2;
1076 1804
1077 eio_grp_limit (grp, grp->int2); 1805 eio_grp_limit (grp, grp->int2);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines