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.130 by root, Thu Oct 2 11:35:03 2008 UTC vs.
Revision 1.170 by root, Wed Aug 4 16:09:36 2010 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>
16#include <sys/statvfs.h>
14#include <limits.h> 17#include <limits.h>
15#include <fcntl.h> 18#include <fcntl.h>
16#include <sched.h> 19#include <sched.h>
20
21#if _POSIX_MEMLOCK || _POSIX_MAPPED_FILES
22# include <sys/mman.h>
23#endif
17 24
18/* perl namespace pollution */ 25/* perl namespace pollution */
19#undef VERSION 26#undef VERSION
20 27
21#ifdef _WIN32 28#ifdef _WIN32
75 82
76#define EIO_STRUCT_STAT Stat_t 83#define EIO_STRUCT_STAT Stat_t
77 84
78/* use NV for 32 bit perls as it allows larger offsets */ 85/* use NV for 32 bit perls as it allows larger offsets */
79#if IVSIZE >= 8 86#if IVSIZE >= 8
87# define VAL64 IV
80# define SvVAL64 SvIV 88# define SvVAL64 SvIV
89# define newSVval64 newSViv
81#else 90#else
91# define VAL64 NV
82# define SvVAL64 SvNV 92# define SvVAL64 SvNV
93# define newSVval64 newSVnv
83#endif 94#endif
84 95
85/*****************************************************************************/ 96/*****************************************************************************/
86 97
87#if __GNUC__ >= 3 98#if __GNUC__ >= 3
93#define expect_false(expr) expect ((expr) != 0, 0) 104#define expect_false(expr) expect ((expr) != 0, 0)
94#define expect_true(expr) expect ((expr) != 0, 1) 105#define expect_true(expr) expect ((expr) != 0, 1)
95 106
96/*****************************************************************************/ 107/*****************************************************************************/
97 108
98static HV *stash;
99typedef SV SV8; /* byte-sv, used for argument-checking */ 109typedef SV SV8; /* byte-sv, used for argument-checking */
110typedef int aio_rfd; /* read file desriptor */
111typedef int aio_wfd; /* write file descriptor */
100 112
101#define AIO_REQ_KLASS "IO::AIO::REQ" 113static HV *aio_stash, *aio_req_stash, *aio_grp_stash;
102#define AIO_GRP_KLASS "IO::AIO::GRP"
103 114
104#define EIO_REQ_MEMBERS \ 115#define EIO_REQ_MEMBERS \
105 SV *callback; \ 116 SV *callback; \
106 SV *sv1, *sv2; \ 117 SV *sv1, *sv2; \
107 STRLEN stroffset; \ 118 STRLEN stroffset; \
109 120
110#define EIO_NO_WRAPPERS 1 121#define EIO_NO_WRAPPERS 1
111 122
112#include "libeio/eio.h" 123#include "libeio/eio.h"
113 124
125#ifndef POSIX_FADV_NORMAL
126# define POSIX_FADV_NORMAL 0
127# define NO_FADVISE 1
128#endif
129#ifndef POSIX_FADV_SEQUENTIAL
130# define POSIX_FADV_SEQUENTIAL 0
131#endif
132#ifndef POSIX_FADV_RANDOM
133# define POSIX_FADV_RANDOM 0
134#endif
135#ifndef POSIX_FADV_NOREUSE
136# define POSIX_FADV_NOREUSE 0
137#endif
138#ifndef POSIX_FADV_WILLNEED
139# define POSIX_FADV_WILLNEED 0
140#endif
141#ifndef POSIX_FADV_DONTNEED
142# define POSIX_FADV_DONTNEED 0
143#endif
144
145#if _XOPEN_SOURCE < 600 || NO_FADVISE
146# define posix_fadvise(a,b,c,d) errno = ENOSYS /* also return ENOSYS */
147#endif
148
149#ifndef POSIX_MADV_NORMAL
150# define POSIX_MADV_NORMAL 0
151# define NO_MADVISE 1
152#endif
153#ifndef POSIX_MADV_SEQUENTIAL
154# define POSIX_MADV_SEQUENTIAL 0
155#endif
156#ifndef POSIX_MADV_RANDOM
157# define POSIX_MADV_RANDOM 0
158#endif
159#ifndef POSIX_MADV_WILLNEED
160# define POSIX_MADV_WILLNEED 0
161#endif
162#ifndef POSIX_MADV_DONTNEED
163# define POSIX_MADV_DONTNEED 0
164#endif
165
166#if _XOPEN_SOURCE < 600 || NO_MADVISE
167# define posix_madvise(a,b,c) errno = ENOSYS /* also return ENOSYS */
168#endif
169
170#ifndef ST_NODEV
171# define ST_NODEV 0
172#endif
173#ifndef ST_NOEXEC
174# define ST_NOEXEC 0
175#endif
176#ifndef ST_SYNCHRONOUS
177# define ST_SYNCHRONOUS 0
178#endif
179#ifndef ST_MANDLOCK
180# define ST_MANDLOCK 0
181#endif
182#ifndef ST_WRITE
183# define ST_WRITE 0
184#endif
185#ifndef ST_APPEND
186# define ST_APPEND 0
187#endif
188#ifndef ST_IMMUTABLE
189# define ST_IMMUTABLE 0
190#endif
191#ifndef ST_NOATIME
192# define ST_NOATIME 0
193#endif
194#ifndef ST_NODIRATIME
195# define ST_NODIRATIME 0
196#endif
197#ifndef ST_RELATIME
198# define ST_RELATIME 0
199#endif
200
201#ifndef MCL_CURRENT
202# define MCL_CURRENT 0
203#endif
204#ifndef MCL_FUTURE
205# define MCL_FUTURE 0
206#endif
207
208#ifndef MAP_ANONYMOUS
209# ifdef MAP_ANON
210# define MAP_ANONYMOUS MAP_ANON
211# else
212# define MAP_ANONYMOUS MAP_FIXED /* and hope this fails */
213# endif
214#endif
215#ifndef MAP_HUGETLB
216# define MAP_HUGETLB 0
217#endif
218#ifndef MAP_LOCKED
219# define MAP_LOCKED 0
220#endif
221#ifndef MAP_NORESERVE
222# define MAP_NORESERVE 0
223#endif
224#ifndef MAP_POPULATE
225# define MAP_POPULATE 0
226#endif
227#ifndef MAP_NONBLOCK
228# define MAP_NONBLOCK 0
229#endif
230
231#ifndef PAGESIZE
232# define PAGESIZE sysconf (_SC_PAGESIZE)
233#endif
234
114static int req_invoke (eio_req *req); 235static int req_invoke (eio_req *req);
115#define EIO_FINISH(req) req_invoke (req) 236#define EIO_FINISH(req) req_invoke (req)
116static void aio_grp_feed (eio_req *grp);
117#define EIO_FEED(req) aio_grp_feed (req)
118static void req_destroy (eio_req *grp); 237static void req_destroy (eio_req *grp);
119#define EIO_DESTROY(req) req_destroy (req) 238#define EIO_DESTROY(req) req_destroy (req)
120 239
121enum { 240enum {
122 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ 241 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
129 248
130static SV *on_next_submit; 249static SV *on_next_submit;
131static int next_pri = EIO_PRI_DEFAULT; 250static int next_pri = EIO_PRI_DEFAULT;
132static int max_outstanding; 251static int max_outstanding;
133 252
134static int respipe_osf [2], respipe [2] = { -1, -1 }; 253static s_epipe respipe;
135 254
136static void req_destroy (aio_req req); 255static void req_destroy (aio_req req);
137static void req_cancel (aio_req req); 256static void req_cancel (aio_req req);
138 257
139static void want_poll (void) 258static void want_poll (void)
140{ 259{
141 /* write a dummy byte to the pipe so fh becomes ready */ 260 /* write a dummy byte to the pipe so fh becomes ready */
142 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1); 261 s_epipe_signal (&respipe);
143} 262}
144 263
145static void done_poll (void) 264static void done_poll (void)
146{ 265{
147 /* read any signals sent by the worker threads */ 266 /* read any signals sent by the worker threads */
148 char buf [4]; 267 s_epipe_drain (&respipe);
149 while (respipe_read (respipe [0], buf, 4) == 4)
150 ;
151} 268}
152 269
153/* must be called at most once */ 270/* must be called at most once */
154static SV *req_sv (aio_req req, const char *klass) 271static SV *req_sv (aio_req req, HV *stash)
155{ 272{
156 if (!req->self) 273 if (!req->self)
157 { 274 {
158 req->self = (SV *)newHV (); 275 req->self = (SV *)newHV ();
159 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0); 276 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
160 } 277 }
161 278
162 return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1))); 279 return sv_2mortal (sv_bless (newRV_inc (req->self), stash));
163} 280}
164 281
165static aio_req SvAIO_REQ (SV *sv) 282static aio_req SvAIO_REQ (SV *sv)
166{ 283{
167 MAGIC *mg; 284 MAGIC *mg;
168 285
169 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv)) 286 if (!SvROK (sv)
287 || (SvSTASH (SvRV (sv)) != aio_grp_stash
288 && SvSTASH (SvRV (sv)) != aio_req_stash
289 && !sv_derived_from (sv, "IO::AIO::REQ")))
170 croak ("object of class " AIO_REQ_KLASS " expected"); 290 croak ("object of class IO::AIO::REQ expected");
171 291
172 mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 292 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
173 293
174 return mg ? (aio_req)mg->mg_ptr : 0; 294 return mg ? (aio_req)mg->mg_ptr : 0;
175} 295}
181 dSP; 301 dSP;
182 302
183 ENTER; 303 ENTER;
184 SAVETMPS; 304 SAVETMPS;
185 PUSHMARK (SP); 305 PUSHMARK (SP);
186 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 306 XPUSHs (req_sv (grp, aio_grp_stash));
187 PUTBACK; 307 PUTBACK;
188 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR); 308 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
189 SPAGAIN; 309 SPAGAIN;
190 FREETMPS; 310 FREETMPS;
191 LEAVE; 311 LEAVE;
209 } 329 }
210} 330}
211 331
212static int req_invoke (eio_req *req) 332static int req_invoke (eio_req *req)
213{ 333{
214 dSP;
215
216 if (req->flags & FLAG_SV2_RO_OFF) 334 if (req->flags & FLAG_SV2_RO_OFF)
217 SvREADONLY_off (req->sv2); 335 SvREADONLY_off (req->sv2);
218 336
219 if (!EIO_CANCELLED (req) && req->callback) 337 if (!EIO_CANCELLED (req) && req->callback)
220 { 338 {
339 dSP;
340 static SV *sv_result_cache; /* caches the result integer SV */
341 SV *sv_result;
342
221 ENTER; 343 ENTER;
222 SAVETMPS; 344 SAVETMPS;
223 PUSHMARK (SP); 345 PUSHMARK (SP);
224 EXTEND (SP, 1); 346 EXTEND (SP, 1);
347
348 /* do not recreate the result IV from scratch each time */
349 if (expect_true (sv_result_cache))
350 {
351 sv_result = sv_result_cache; sv_result_cache = 0;
352 SvIV_set (sv_result, req->result);
353 }
354 else
355 {
356 sv_result = newSViv (req->result);
357 SvREADONLY_on (sv_result);
358 }
225 359
226 switch (req->type) 360 switch (req->type)
227 { 361 {
228 case EIO_READDIR: 362 case EIO_READDIR:
229 { 363 {
230 SV *rv = &PL_sv_undef; 364 SV *rv = &PL_sv_undef;
231 365
232 if (req->result >= 0) 366 if (req->result >= 0)
233 { 367 {
234 int i; 368 int i;
235 char *buf = req->ptr2; 369 char *names = (char *)req->ptr2;
370 eio_dirent *ent = (eio_dirent *)req->ptr1; /* might be 0 */
236 AV *av = newAV (); 371 AV *av = newAV ();
237 372
238 av_extend (av, req->result - 1); 373 av_extend (av, req->result - 1);
239 374
240 for (i = 0; i < req->result; ++i) 375 for (i = 0; i < req->result; ++i)
241 { 376 {
242 SV *sv = newSVpv (buf, 0); 377 if (req->int1 & EIO_READDIR_DENTS)
378 {
379 SV *namesv = newSVpvn (names + ent->nameofs, ent->namelen);
243 380
381 if (req->int1 & EIO_READDIR_CUSTOM2)
382 {
383 static SV *sv_type [EIO_DT_MAX + 1]; /* type sv cache */
384 AV *avent = newAV ();
385
386 av_extend (avent, 2);
387
388 if (!sv_type [ent->type])
389 {
390 sv_type [ent->type] = newSViv (ent->type);
391 SvREADONLY_on (sv_type [ent->type]);
392 }
393
394 av_store (avent, 0, namesv);
395 av_store (avent, 1, SvREFCNT_inc (sv_type [ent->type]));
396 av_store (avent, 2, IVSIZE >= 8 ? newSVuv (ent->inode) : newSVnv (ent->inode));
397
398 av_store (av, i, newRV_noinc ((SV *)avent));
399 }
400 else
244 av_store (av, i, sv); 401 av_store (av, i, namesv);
402
403 ++ent;
404 }
405 else
406 {
407 SV *name = newSVpv (names, 0);
408 av_store (av, i, name);
245 buf += SvCUR (sv) + 1; 409 names += SvCUR (name) + 1;
410 }
246 } 411 }
247 412
248 rv = sv_2mortal (newRV_noinc ((SV *)av)); 413 rv = sv_2mortal (newRV_noinc ((SV *)av));
249 } 414 }
250 415
251 PUSHs (rv); 416 PUSHs (rv);
417
418 if (req->int1 & EIO_READDIR_CUSTOM1)
419 XPUSHs (sv_2mortal (newSViv (req->int1 & ~(EIO_READDIR_CUSTOM1 | EIO_READDIR_CUSTOM2))));
252 } 420 }
253 break; 421 break;
254 422
255 case EIO_OPEN: 423 case EIO_OPEN:
256 { 424 {
262 GV *gv = (GV *)sv_newmortal (); 430 GV *gv = (GV *)sv_newmortal ();
263 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR); 431 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
264 char sym [64]; 432 char sym [64];
265 int symlen; 433 int symlen;
266 434
267 symlen = snprintf (sym, sizeof (sym), "fd#%d", req->result); 435 symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
268 gv_init (gv, stash, sym, symlen, 0); 436 gv_init (gv, aio_stash, sym, symlen, 0);
269 437
270 symlen = snprintf ( 438 symlen = snprintf (
271 sym, 439 sym,
272 sizeof (sym), 440 sizeof (sym),
273 "%s&=%d", 441 "%s&=%d",
274 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<", 442 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
275 req->result 443 (int)req->result
276 ); 444 );
277 445
278 if (do_open (gv, sym, symlen, 0, 0, 0, 0)) 446 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
279 fh = (SV *)gv; 447 fh = (SV *)gv;
280 } 448 }
281 449
282 PUSHs (fh); 450 PUSHs (fh);
283 } 451 }
452 break;
453
454 case EIO_STATVFS:
455 case EIO_FSTATVFS:
456 {
457 SV *rv = &PL_sv_undef;
458
459 if (req->result >= 0)
460 {
461 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req);
462 HV *hv = newHV ();
463
464 rv = sv_2mortal (newRV_noinc ((SV *)hv));
465
466 hv_store (hv, "bsize" , sizeof ("bsize" ) - 1, newSVval64 (f->f_bsize ), 0);
467 hv_store (hv, "frsize" , sizeof ("frsize" ) - 1, newSVval64 (f->f_frsize ), 0);
468 hv_store (hv, "blocks" , sizeof ("blocks" ) - 1, newSVval64 (f->f_blocks ), 0);
469 hv_store (hv, "bfree" , sizeof ("bfree" ) - 1, newSVval64 (f->f_bfree ), 0);
470 hv_store (hv, "bavail" , sizeof ("bavail" ) - 1, newSVval64 (f->f_bavail ), 0);
471 hv_store (hv, "files" , sizeof ("files" ) - 1, newSVval64 (f->f_files ), 0);
472 hv_store (hv, "ffree" , sizeof ("ffree" ) - 1, newSVval64 (f->f_ffree ), 0);
473 hv_store (hv, "favail" , sizeof ("favail" ) - 1, newSVval64 (f->f_favail ), 0);
474 hv_store (hv, "fsid" , sizeof ("fsid" ) - 1, newSVval64 (f->f_fsid ), 0);
475 hv_store (hv, "flag" , sizeof ("flag" ) - 1, newSVval64 (f->f_flag ), 0);
476 hv_store (hv, "namemax", sizeof ("namemax") - 1, newSVval64 (f->f_namemax), 0);
477 }
478
479 PUSHs (rv);
480 }
481
284 break; 482 break;
285 483
286 case EIO_GROUP: 484 case EIO_GROUP:
287 req->int1 = 2; /* mark group as finished */ 485 req->int1 = 2; /* mark group as finished */
288 486
310 case EIO_LSTAT: 508 case EIO_LSTAT:
311 case EIO_FSTAT: 509 case EIO_FSTAT:
312 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT; 510 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT;
313 PL_laststatval = req->result; 511 PL_laststatval = req->result;
314 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 512 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
315 PUSHs (sv_2mortal (newSViv (req->result))); 513 PUSHs (sv_result);
316 break; 514 break;
317 515
318 case EIO_READ: 516 case EIO_READ:
517 {
319 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0)); 518 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
320 *SvEND (req->sv2) = 0; 519 *SvEND (req->sv2) = 0;
321 PUSHs (sv_2mortal (newSViv (req->result))); 520 SvPOK_only (req->sv2);
521 SvSETMAGIC (req->sv2);
522 PUSHs (sv_result);
523 }
322 break; 524 break;
323 525
324 case EIO_DUP2: 526 case EIO_DUP2: /* EIO_DUP2 actually means aio_close(), su fudge result value */
325 if (req->result > 0) 527 if (req->result > 0)
326 req->result = 0; 528 SvIV_set (sv_result, 0);
327 /* FALLTHROUGH */ 529 /* FALLTHROUGH */
328 530
329 default: 531 default:
330 PUSHs (sv_2mortal (newSViv (req->result))); 532 PUSHs (sv_result);
331 break; 533 break;
332 } 534 }
333 535
334 errno = req->errorno; 536 errno = req->errorno;
335 537
336 PUTBACK; 538 PUTBACK;
337 call_sv (req->callback, G_VOID | G_EVAL | G_DISCARD); 539 call_sv (req->callback, G_VOID | G_EVAL | G_DISCARD);
338 SPAGAIN; 540 SPAGAIN;
541
542 if (expect_false (SvREFCNT (sv_result) != 1 || sv_result_cache))
543 SvREFCNT_dec (sv_result);
544 else
545 sv_result_cache = sv_result;
339 546
340 FREETMPS; 547 FREETMPS;
341 LEAVE; 548 LEAVE;
342 549
343 PUTBACK; 550 PUTBACK;
372 grp->sv2 = 0; 579 grp->sv2 = 0;
373 580
374 eio_grp_cancel (grp); 581 eio_grp_cancel (grp);
375} 582}
376 583
377#ifdef USE_SOCKETS_AS_HANDLES
378# define TO_SOCKET(x) (win32_get_osfhandle (x))
379#else
380# define TO_SOCKET(x) (x)
381#endif
382
383static void 584static void
384create_respipe (void) 585create_respipe (void)
385{ 586{
386 int old_readfd = respipe [0];
387
388 if (respipe [1] >= 0)
389 respipe_close (TO_SOCKET (respipe [1]));
390
391#ifdef _WIN32
392 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe))
393#else
394 if (pipe (respipe)) 587 if (s_epipe_renew (&respipe))
395#endif
396 croak ("unable to initialize result pipe"); 588 croak ("IO::AIO: unable to initialize result pipe");
397
398 if (old_readfd >= 0)
399 {
400 if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0)
401 croak ("unable to initialize result pipe(2)");
402
403 respipe_close (respipe [0]);
404 respipe [0] = old_readfd;
405 }
406
407#ifdef _WIN32
408 int arg = 1;
409 if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg)
410 || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg))
411#else
412 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
413 || fcntl (respipe [1], F_SETFL, O_NONBLOCK))
414#endif
415 croak ("unable to initialize result pipe(3)");
416
417 respipe_osf [0] = TO_SOCKET (respipe [0]);
418 respipe_osf [1] = TO_SOCKET (respipe [1]);
419} 589}
420 590
421static void poll_wait (void) 591static void poll_wait (void)
422{ 592{
423 fd_set rfd;
424
425 while (eio_nreqs ()) 593 while (eio_nreqs ())
426 { 594 {
427 int size; 595 int size;
428 596
429 X_LOCK (reslock); 597 X_LOCK (reslock);
433 if (size) 601 if (size)
434 return; 602 return;
435 603
436 etp_maybe_start_thread (); 604 etp_maybe_start_thread ();
437 605
438 FD_ZERO (&rfd); 606 s_epipe_wait (&respipe);
439 FD_SET (respipe [0], &rfd);
440
441 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
442 } 607 }
443} 608}
444 609
445static int poll_cb (void) 610static int poll_cb (void)
446{ 611{
461static void atfork_child (void) 626static void atfork_child (void)
462{ 627{
463 create_respipe (); 628 create_respipe ();
464} 629}
465 630
631/*****************************************************************************/
632
633#if !_POSIX_MAPPED_FILES
634# define mmap(addr,length,prot,flags,fd,offs) (errno = ENOSYS, -1)
635# define munmap(addr,length) (errno = ENOSYS, -1)
636#endif
637
638#define MMAP_MAGIC PERL_MAGIC_ext
639
640static int
641mmap_free (pTHX_ SV *sv, MAGIC *mg)
642{
643 int old_errno = errno;
644 munmap (mg->mg_ptr, (size_t)mg->mg_obj);
645 errno = old_errno;
646
647 mg->mg_obj = 0; /* just in case */
648
649 SvREADONLY_off (sv);
650
651 if (SvPVX (sv) != mg->mg_ptr)
652 croak ("ERROR: IO::AIO::mmap-mapped scalar changed location, detected");
653
654 SvCUR_set (sv, 0);
655 SvPVX (sv) = 0;
656 SvOK_off (sv);
657
658 return 0;
659}
660
661static MGVTBL mmap_vtbl = {
662 0, 0, 0, 0, mmap_free
663};
664
665/*****************************************************************************/
666
466static SV * 667static SV *
467get_cb (SV *cb_sv) 668get_cb (SV *cb_sv)
468{ 669{
469 HV *st; 670 SvGETMAGIC (cb_sv);
470 GV *gvp; 671 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
471 CV *cv;
472
473 if (!SvOK (cb_sv))
474 return 0;
475
476 cv = sv_2cv (cb_sv, &st, &gvp, 0);
477
478 if (!cv)
479 croak ("IO::AIO callback must be undef or a CODE reference");
480
481 return (SV *)cv;
482} 672}
483 673
484#define dREQ \ 674#define dREQ \
485 SV *cb_cv; \ 675 SV *cb_cv; \
486 aio_req req; \ 676 aio_req req; \
500 PUTBACK; \ 690 PUTBACK; \
501 req_submit (req); \ 691 req_submit (req); \
502 SPAGAIN; \ 692 SPAGAIN; \
503 \ 693 \
504 if (GIMME_V != G_VOID) \ 694 if (GIMME_V != G_VOID) \
505 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 695 XPUSHs (req_sv (req, aio_req_stash));
506 696
507MODULE = IO::AIO PACKAGE = IO::AIO 697MODULE = IO::AIO PACKAGE = IO::AIO
508 698
509PROTOTYPES: ENABLE 699PROTOTYPES: ENABLE
510 700
511BOOT: 701BOOT:
512{ 702{
513 stash = gv_stashpv ("IO::AIO", 1); 703 static const struct {
514 704 const char *name;
515 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 705 IV iv;
516 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 706 } *civ, const_iv[] = {
517 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 707# define const_niv(name, value) { # name, (IV) value },
518 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 708# define const_iv(name) { # name, (IV) name },
519 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 709# define const_eio(name) { # name, (IV) EIO_ ## name },
710 const_iv (EXDEV)
711 const_iv (ENOSYS)
712 const_iv (O_RDONLY)
713 const_iv (O_WRONLY)
714 const_iv (O_RDWR)
715 const_iv (O_CREAT)
716 const_iv (O_TRUNC)
717 const_iv (O_EXCL)
718 const_iv (O_APPEND)
520#ifndef _WIN32 719#ifndef _WIN32
521 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 720 const_iv (S_IFIFO)
522#endif 721#endif
722 const_niv (FADV_NORMAL , POSIX_FADV_NORMAL)
723 const_niv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL)
724 const_niv (FADV_RANDOM , POSIX_FADV_RANDOM)
725 const_niv (FADV_NOREUSE , POSIX_FADV_NOREUSE)
726 const_niv (FADV_WILLNEED , POSIX_FADV_WILLNEED)
727 const_niv (FADV_DONTNEED , POSIX_FADV_DONTNEED)
523 728
729 const_niv (MADV_NORMAL , POSIX_MADV_NORMAL)
730 const_niv (MADV_SEQUENTIAL, POSIX_MADV_SEQUENTIAL)
731 const_niv (MADV_RANDOM , POSIX_MADV_RANDOM)
732 const_niv (MADV_WILLNEED , POSIX_MADV_WILLNEED)
733 const_niv (MADV_DONTNEED , POSIX_MADV_DONTNEED)
734
735 const_iv (ST_RDONLY)
736 const_iv (ST_NOSUID)
737 const_iv (ST_NODEV)
738 const_iv (ST_NOEXEC)
739 const_iv (ST_SYNCHRONOUS)
740 const_iv (ST_MANDLOCK)
741 const_iv (ST_WRITE)
742 const_iv (ST_APPEND)
743 const_iv (ST_IMMUTABLE)
744 const_iv (ST_NOATIME)
745 const_iv (ST_NODIRATIME)
746 const_iv (ST_RELATIME)
747
748 const_iv (PROT_EXEC)
749 const_iv (PROT_NONE)
750 const_iv (PROT_READ)
751 const_iv (PROT_WRITE)
752
753 /*const_iv (MAP_FIXED)*/
754 const_iv (MAP_PRIVATE)
755 const_iv (MAP_SHARED)
756 const_iv (MAP_ANONYMOUS)
757
758 /* linuxish */
759 const_iv (MAP_HUGETLB)
760 const_iv (MAP_LOCKED)
761 const_iv (MAP_NORESERVE)
762 const_iv (MAP_POPULATE)
763 const_iv (MAP_NONBLOCK)
764
765 const_iv (MCL_FUTURE)
766 const_iv (MCL_CURRENT)
767
768 const_eio (MS_ASYNC)
769 const_eio (MS_INVALIDATE)
770 const_eio (MS_SYNC)
771
772 const_eio (MT_MODIFY)
773
774 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
775 const_eio (SYNC_FILE_RANGE_WRITE)
776 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
777
778 const_eio (READDIR_DENTS)
779 const_eio (READDIR_DIRS_FIRST)
780 const_eio (READDIR_STAT_ORDER)
781 const_eio (READDIR_FOUND_UNKNOWN)
782
783 const_eio (DT_UNKNOWN)
784 const_eio (DT_FIFO)
785 const_eio (DT_CHR)
786 const_eio (DT_DIR)
787 const_eio (DT_BLK)
788 const_eio (DT_REG)
789 const_eio (DT_LNK)
790 const_eio (DT_SOCK)
791 const_eio (DT_WHT)
792 };
793
794 aio_stash = gv_stashpv ("IO::AIO" , 1);
795 aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1);
796 aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1);
797
798 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
799 newCONSTSUB (aio_stash, (char *)civ->name, newSViv (civ->iv));
800
801 newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE));
802
524 create_respipe (); 803 create_respipe ();
525 804
526 if (eio_init (want_poll, done_poll) < 0) 805 if (eio_init (want_poll, done_poll) < 0)
527 croak ("IO::AIO: unable to initialise eio library"); 806 croak ("IO::AIO: unable to initialise eio library");
528 807
529 /* atfork child called in fifo order, so before eio's handler */ 808 /* atfork child called in fifo order, so before eio's handler */
530 X_THREAD_ATFORK (0, 0, atfork_child); 809 X_THREAD_ATFORK (0, 0, atfork_child);
531} 810}
532 811
533void 812void
534max_poll_reqs (int nreqs) 813max_poll_reqs (int nreqs)
535 PROTOTYPE: $ 814 PROTOTYPE: $
588 ALIAS: 867 ALIAS:
589 aio_fsync = EIO_FSYNC 868 aio_fsync = EIO_FSYNC
590 aio_fdatasync = EIO_FDATASYNC 869 aio_fdatasync = EIO_FDATASYNC
591 PPCODE: 870 PPCODE:
592{ 871{
872 int fd = s_fileno_croak (fh, 0);
593 dREQ; 873 dREQ;
594 874
595 req->type = ix; 875 req->type = ix;
596 req->sv1 = newSVsv (fh); 876 req->sv1 = newSVsv (fh);
597 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 877 req->int1 = fd;
878
879 REQ_SEND (req);
880}
881
882void
883aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef)
884 PROTOTYPE: $$$$;$
885 PPCODE:
886{
887 int fd = s_fileno_croak (fh, 0);
888 dREQ;
889
890 req->type = EIO_SYNC_FILE_RANGE;
891 req->sv1 = newSVsv (fh);
892 req->int1 = fd;
893 req->offs = offset;
894 req->size = nbytes;
895 req->int2 = flags;
598 896
599 REQ_SEND (req); 897 REQ_SEND (req);
600} 898}
601 899
602void 900void
603aio_close (SV *fh, SV *callback=&PL_sv_undef) 901aio_close (SV *fh, SV *callback=&PL_sv_undef)
604 PROTOTYPE: $;$ 902 PROTOTYPE: $;$
605 PPCODE: 903 PPCODE:
606{ 904{
607 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 905 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
906 int fd = s_fileno_croak (fh, 0);
608 dREQ; 907 dREQ;
609 908
610 if (close_pipe < 0) 909 if (close_pipe < 0)
611 { 910 {
612 int pipefd [2]; 911 int pipefd [2];
620 } 919 }
621 920
622 req->type = EIO_DUP2; 921 req->type = EIO_DUP2;
623 req->int1 = close_pipe; 922 req->int1 = close_pipe;
624 req->sv2 = newSVsv (fh); 923 req->sv2 = newSVsv (fh);
625 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 924 req->int2 = fd;
626 925
627 REQ_SEND (req); 926 REQ_SEND (req);
628} 927}
629 928
630void 929void
634 aio_write = EIO_WRITE 933 aio_write = EIO_WRITE
635 PROTOTYPE: $$$$$;$ 934 PROTOTYPE: $$$$$;$
636 PPCODE: 935 PPCODE:
637{ 936{
638 STRLEN svlen; 937 STRLEN svlen;
938 int fd = s_fileno_croak (fh, ix == EIO_WRITE);
639 char *svptr = SvPVbyte (data, svlen); 939 char *svptr = SvPVbyte (data, svlen);
640 UV len = SvUV (length); 940 UV len = SvUV (length);
641
642 SvUPGRADE (data, SVt_PV);
643 SvPOK_on (data);
644 941
645 if (dataoffset < 0) 942 if (dataoffset < 0)
646 dataoffset += svlen; 943 dataoffset += svlen;
647 944
648 if (dataoffset < 0 || dataoffset > svlen) 945 if (dataoffset < 0 || dataoffset > svlen)
654 if (!SvOK (length) || len + dataoffset > svlen) 951 if (!SvOK (length) || len + dataoffset > svlen)
655 len = svlen - dataoffset; 952 len = svlen - dataoffset;
656 } 953 }
657 else 954 else
658 { 955 {
659 /* read: grow scalar as necessary */ 956 /* read: check type and grow scalar as necessary */
957 SvUPGRADE (data, SVt_PV);
660 svptr = SvGROW (data, len + dataoffset + 1); 958 svptr = SvGROW (data, len + dataoffset + 1);
661 } 959 }
662 960
663 if (len < 0)
664 croak ("length must not be negative");
665
666 { 961 {
667 dREQ; 962 dREQ;
668 963
669 req->type = ix; 964 req->type = ix;
670 req->sv1 = newSVsv (fh); 965 req->sv1 = newSVsv (fh);
671 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 966 req->int1 = fd;
672 : IoOFP (sv_2io (fh)));
673 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 967 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
674 req->size = len; 968 req->size = len;
675 req->sv2 = SvREFCNT_inc_NN (data); 969 req->sv2 = SvREFCNT_inc (data);
676 req->ptr2 = (char *)svptr + dataoffset; 970 req->ptr2 = (char *)svptr + dataoffset;
677 req->stroffset = dataoffset; 971 req->stroffset = dataoffset;
678 972
679 if (!SvREADONLY (data)) 973 if (!SvREADONLY (data))
680 { 974 {
700 994
701 REQ_SEND; 995 REQ_SEND;
702} 996}
703 997
704void 998void
705aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef) 999aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef)
706 PROTOTYPE: $$$$;$ 1000 PROTOTYPE: $$$$;$
707 PPCODE: 1001 PPCODE:
708{ 1002{
1003 int ifd = s_fileno_croak (in_fh , 0);
1004 int ofd = s_fileno_croak (out_fh, 1);
709 dREQ; 1005 dREQ;
710 1006
711 req->type = EIO_SENDFILE; 1007 req->type = EIO_SENDFILE;
712 req->sv1 = newSVsv (out_fh); 1008 req->sv1 = newSVsv (out_fh);
713 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1009 req->int1 = ofd;
714 req->sv2 = newSVsv (in_fh); 1010 req->sv2 = newSVsv (in_fh);
715 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1011 req->int2 = ifd;
716 req->offs = SvVAL64 (in_offset); 1012 req->offs = in_offset;
717 req->size = length; 1013 req->size = length;
718 1014
719 REQ_SEND; 1015 REQ_SEND;
720} 1016}
721 1017
722void 1018void
723aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef) 1019aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef)
724 PROTOTYPE: $$$;$ 1020 PROTOTYPE: $$$;$
725 PPCODE: 1021 PPCODE:
726{ 1022{
1023 int fd = s_fileno_croak (fh, 0);
727 dREQ; 1024 dREQ;
728 1025
729 req->type = EIO_READAHEAD; 1026 req->type = EIO_READAHEAD;
730 req->sv1 = newSVsv (fh); 1027 req->sv1 = newSVsv (fh);
731 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 1028 req->int1 = fd;
732 req->offs = SvVAL64 (offset); 1029 req->offs = offset;
733 req->size = length; 1030 req->size = length;
734 1031
735 REQ_SEND; 1032 REQ_SEND;
736} 1033}
737 1034
738void 1035void
739aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef) 1036aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef)
740 ALIAS: 1037 ALIAS:
741 aio_stat = EIO_STAT 1038 aio_stat = EIO_STAT
742 aio_lstat = EIO_LSTAT 1039 aio_lstat = EIO_LSTAT
1040 aio_statvfs = EIO_STATVFS
743 PPCODE: 1041 PPCODE:
744{ 1042{
745 dREQ; 1043 dREQ;
746 1044
747 req->sv1 = newSVsv (fh_or_path); 1045 req->sv1 = newSVsv (fh_or_path);
751 req->type = ix; 1049 req->type = ix;
752 req->ptr1 = SvPVbyte_nolen (req->sv1); 1050 req->ptr1 = SvPVbyte_nolen (req->sv1);
753 } 1051 }
754 else 1052 else
755 { 1053 {
756 req->type = EIO_FSTAT; 1054 req->type = ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT;
757 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1055 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
758 } 1056 }
759 1057
760 REQ_SEND; 1058 REQ_SEND;
761} 1059}
856 1154
857 REQ_SEND; 1155 REQ_SEND;
858} 1156}
859 1157
860void 1158void
1159aio_readdirx (SV8 *pathname, IV flags, SV *callback=&PL_sv_undef)
1160 PPCODE:
1161{
1162 dREQ;
1163
1164 req->type = EIO_READDIR;
1165 req->sv1 = newSVsv (pathname);
1166 req->ptr1 = SvPVbyte_nolen (req->sv1);
1167 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
1168
1169 if (flags & EIO_READDIR_DENTS)
1170 req->int1 |= EIO_READDIR_CUSTOM2;
1171
1172 REQ_SEND;
1173}
1174
1175void
861aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 1176aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
862 ALIAS: 1177 ALIAS:
863 aio_unlink = EIO_UNLINK 1178 aio_unlink = EIO_UNLINK
864 aio_rmdir = EIO_RMDIR 1179 aio_rmdir = EIO_RMDIR
865 aio_readdir = EIO_READDIR 1180 aio_readdir = EIO_READDIR
907 1222
908 REQ_SEND; 1223 REQ_SEND;
909} 1224}
910 1225
911void 1226void
1227aio_mtouch (SV8 *data, IV offset = 0, SV *length = &PL_sv_undef, int flags = 0, SV *callback=&PL_sv_undef)
1228 ALIAS:
1229 aio_mtouch = EIO_MTOUCH
1230 aio_msync = EIO_MSYNC
1231 PROTOTYPE: $$$$;$
1232 PPCODE:
1233{
1234 STRLEN svlen;
1235 UV len = SvUV (length);
1236 char *svptr = SvPVbyte (data, svlen);
1237
1238 if (offset < 0)
1239 offset += svlen;
1240
1241 if (offset < 0 || offset > svlen)
1242 croak ("offset outside of scalar");
1243
1244 if (!SvOK (length) || len + offset > svlen)
1245 len = svlen - offset;
1246
1247 {
1248 dREQ;
1249
1250 req->type = ix;
1251 req->size = len;
1252 req->sv2 = SvREFCNT_inc (data);
1253 req->ptr2 = (char *)svptr + offset;
1254 req->int1 = flags;
1255
1256 REQ_SEND;
1257 }
1258}
1259
1260void
912aio_busy (double delay, SV *callback=&PL_sv_undef) 1261aio_busy (double delay, SV *callback=&PL_sv_undef)
913 PPCODE: 1262 PPCODE:
914{ 1263{
915 dREQ; 1264 dREQ;
916 1265
928 dREQ; 1277 dREQ;
929 1278
930 req->type = EIO_GROUP; 1279 req->type = EIO_GROUP;
931 1280
932 req_submit (req); 1281 req_submit (req);
933 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1282 XPUSHs (req_sv (req, aio_grp_stash));
934} 1283}
935 1284
936void 1285void
937aio_nop (SV *callback=&PL_sv_undef) 1286aio_nop (SV *callback=&PL_sv_undef)
938 ALIAS: 1287 ALIAS:
990 1339
991int 1340int
992poll_fileno() 1341poll_fileno()
993 PROTOTYPE: 1342 PROTOTYPE:
994 CODE: 1343 CODE:
995 RETVAL = respipe [0]; 1344 RETVAL = s_epipe_fd (&respipe);
996 OUTPUT: 1345 OUTPUT:
997 RETVAL 1346 RETVAL
998 1347
999int 1348int
1000poll_cb(...) 1349poll_cb(...)
1040 CODE: 1389 CODE:
1041 RETVAL = eio_nthreads (); 1390 RETVAL = eio_nthreads ();
1042 OUTPUT: 1391 OUTPUT:
1043 RETVAL 1392 RETVAL
1044 1393
1394int
1395fadvise (aio_rfd fh, off_t offset, off_t length, IV advice)
1396 PROTOTYPE: $$$$
1397 CODE:
1398 RETVAL = posix_fadvise (fh, offset, length, advice);
1399 OUTPUT:
1400 RETVAL
1401
1402ssize_t
1403sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
1404 PROTOTYPE: $$$$
1405 CODE:
1406 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count);
1407 OUTPUT:
1408 RETVAL
1409
1410void
1411mmap (SV *scalar, size_t length, int prot, int flags, SV *fh, off_t offset = 0)
1412 PROTOTYPE: $$$$$;$
1413 PPCODE:
1414 sv_unmagic (scalar, MMAP_MAGIC);
1415{
1416 int fd = SvOK (fh) ? s_fileno_croak (fh, flags & PROT_WRITE) : -1;
1417 void *addr = (void *)mmap (0, length, prot, flags, fd, offset);
1418 if (addr == (void *)-1)
1419 XSRETURN_NO;
1420
1421 sv_force_normal (scalar);
1422
1423 /* we store the length in mg_obj, as namlen is I32 :/ */
1424 sv_magicext (scalar, 0, MMAP_MAGIC, &mmap_vtbl, (char *)addr, 0)
1425 ->mg_obj = (SV *)length;
1426
1427 SvUPGRADE (scalar, SVt_PV); /* nop... */
1428
1429 if (!(prot & PROT_WRITE))
1430 SvREADONLY_on (scalar);
1431
1432 if (SvLEN (scalar))
1433 Safefree (SvPVX (scalar));
1434
1435 SvPVX (scalar) = (char *)addr;
1436 SvCUR_set (scalar, length);
1437 SvLEN_set (scalar, 0);
1438 SvPOK_only (scalar);
1439
1440 XSRETURN_YES;
1441}
1442
1443void
1444munmap (SV *scalar)
1445 PROTOTYPE: $
1446 CODE:
1447 sv_unmagic (scalar, MMAP_MAGIC);
1448
1449int
1450madvise (SV *scalar, off_t offset, off_t length, IV advice)
1451 PROTOTYPE: $$$$
1452 CODE:
1453{
1454 char *addr = SvPV_nolen (scalar) + offset;
1455
1456 if (!SvOK (ST (2)))
1457 length = SvCUR (scalar) - offset;
1458
1459 if (addr >= SvEND (scalar) || length <= 0)
1460 XSRETURN_EMPTY;
1461
1462 RETVAL = posix_madvise (addr, length, advice);
1463}
1464 OUTPUT:
1465 RETVAL
1466
1467int
1468mlockall (int flags)
1469 PROTOTYPE: $
1470 CODE:
1471#if _POSIX_MEMLOCK
1472#if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
1473 extern int mallopt (int, int);
1474 mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
1475#endif
1476 mlockall (flags);
1477#else
1478 RETVAL = -1;
1479 errno = ENOSYS;
1480#endif
1481 OUTPUT:
1482 RETVAL
1483
1484int
1485munlockall ()
1486 PROTOTYPE:
1487 CODE:
1488#if _POSIX_MEMLOCK
1489 munlockall ();
1490#else
1491 RETVAL = -1;
1492 errno = ENOSYS;
1493#endif
1494 OUTPUT:
1495 RETVAL
1496
1045void _on_next_submit (SV *cb) 1497void _on_next_submit (SV *cb)
1046 CODE: 1498 CODE:
1047 SvREFCNT_dec (on_next_submit); 1499 SvREFCNT_dec (on_next_submit);
1048 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1500 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1049 1501
1063 if (GIMME_V != G_VOID) 1515 if (GIMME_V != G_VOID)
1064 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef); 1516 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1065 1517
1066 if (items > 1) 1518 if (items > 1)
1067 { 1519 {
1068 SV *cb_cv = get_cb (callback); 1520 SV *cb_cv =get_cb (callback);
1069 1521
1070 SvREFCNT_dec (req->callback); 1522 SvREFCNT_dec (req->callback);
1071 req->callback = SvREFCNT_inc (cb_cv); 1523 req->callback = SvREFCNT_inc (cb_cv);
1072 } 1524 }
1073} 1525}
1110 AV *av; 1562 AV *av;
1111 1563
1112 grp->errorno = errno; 1564 grp->errorno = errno;
1113 1565
1114 av = newAV (); 1566 av = newAV ();
1567 av_extend (av, items - 1);
1115 1568
1116 for (i = 1; i < items; ++i ) 1569 for (i = 1; i < items; ++i )
1117 av_push (av, newSVsv (ST (i))); 1570 av_push (av, newSVsv (ST (i)));
1118 1571
1119 SvREFCNT_dec (grp->sv1); 1572 SvREFCNT_dec (grp->sv1);
1133void 1586void
1134feed (aio_req grp, SV *callback=&PL_sv_undef) 1587feed (aio_req grp, SV *callback=&PL_sv_undef)
1135 CODE: 1588 CODE:
1136{ 1589{
1137 SvREFCNT_dec (grp->sv2); 1590 SvREFCNT_dec (grp->sv2);
1138 grp->sv2 = newSVsv (callback); 1591 grp->sv2 = newSVsv (callback);
1592 grp->feed = aio_grp_feed;
1139 1593
1140 if (grp->int2 <= 0) 1594 if (grp->int2 <= 0)
1141 grp->int2 = 2; 1595 grp->int2 = 2;
1142 1596
1143 eio_grp_limit (grp, grp->int2); 1597 eio_grp_limit (grp, grp->int2);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines