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.140 by root, Wed Jun 3 12:24:49 2009 UTC vs.
Revision 1.171 by root, Wed Aug 4 17:16:19 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 PROT_NONE
171# define PROT_NONE 0
172#endif
173#ifndef PROT_READ
174# define PROT_READ 0
175#endif
176#ifndef PROT_WRITE
177# define PROT_READ 0
178#endif
179#ifndef PROT_EXEC
180# define PROT_EXEC 0
181#endif
182
183#ifndef ST_NODEV
184# define ST_NODEV 0
185#endif
186#ifndef ST_NOEXEC
187# define ST_NOEXEC 0
188#endif
189#ifndef ST_SYNCHRONOUS
190# define ST_SYNCHRONOUS 0
191#endif
192#ifndef ST_MANDLOCK
193# define ST_MANDLOCK 0
194#endif
195#ifndef ST_WRITE
196# define ST_WRITE 0
197#endif
198#ifndef ST_APPEND
199# define ST_APPEND 0
200#endif
201#ifndef ST_IMMUTABLE
202# define ST_IMMUTABLE 0
203#endif
204#ifndef ST_NOATIME
205# define ST_NOATIME 0
206#endif
207#ifndef ST_NODIRATIME
208# define ST_NODIRATIME 0
209#endif
210#ifndef ST_RELATIME
211# define ST_RELATIME 0
212#endif
213
214#ifndef MCL_CURRENT
215# define MCL_CURRENT 0
216#endif
217#ifndef MCL_FUTURE
218# define MCL_FUTURE 0
219#endif
220
221#ifndef MAP_ANONYMOUS
222# ifdef MAP_ANON
223# define MAP_ANONYMOUS MAP_ANON
224# else
225# define MAP_ANONYMOUS MAP_FIXED /* and hope this fails */
226# endif
227#endif
228#ifndef MAP_HUGETLB
229# define MAP_HUGETLB 0
230#endif
231#ifndef MAP_LOCKED
232# define MAP_LOCKED 0
233#endif
234#ifndef MAP_NORESERVE
235# define MAP_NORESERVE 0
236#endif
237#ifndef MAP_POPULATE
238# define MAP_POPULATE 0
239#endif
240#ifndef MAP_NONBLOCK
241# define MAP_NONBLOCK 0
242#endif
243
244#ifndef PAGESIZE
245# define PAGESIZE sysconf (_SC_PAGESIZE)
246#endif
247
114static int req_invoke (eio_req *req); 248static int req_invoke (eio_req *req);
115#define EIO_FINISH(req) req_invoke (req) 249#define EIO_FINISH(req) req_invoke (req)
116static void req_destroy (eio_req *grp); 250static void req_destroy (eio_req *grp);
117#define EIO_DESTROY(req) req_destroy (req) 251#define EIO_DESTROY(req) req_destroy (req)
118 252
127 261
128static SV *on_next_submit; 262static SV *on_next_submit;
129static int next_pri = EIO_PRI_DEFAULT; 263static int next_pri = EIO_PRI_DEFAULT;
130static int max_outstanding; 264static int max_outstanding;
131 265
132static int respipe_osf [2], respipe [2] = { -1, -1 }; 266static s_epipe respipe;
133 267
134static void req_destroy (aio_req req); 268static void req_destroy (aio_req req);
135static void req_cancel (aio_req req); 269static void req_cancel (aio_req req);
136 270
137static void want_poll (void) 271static void want_poll (void)
138{ 272{
139 /* write a dummy byte to the pipe so fh becomes ready */ 273 /* write a dummy byte to the pipe so fh becomes ready */
140 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1); 274 s_epipe_signal (&respipe);
141} 275}
142 276
143static void done_poll (void) 277static void done_poll (void)
144{ 278{
145 /* read any signals sent by the worker threads */ 279 /* read any signals sent by the worker threads */
146 char buf [4]; 280 s_epipe_drain (&respipe);
147 while (respipe_read (respipe [0], buf, 4) == 4)
148 ;
149} 281}
150 282
151/* must be called at most once */ 283/* must be called at most once */
152static SV *req_sv (aio_req req, const char *klass) 284static SV *req_sv (aio_req req, HV *stash)
153{ 285{
154 if (!req->self) 286 if (!req->self)
155 { 287 {
156 req->self = (SV *)newHV (); 288 req->self = (SV *)newHV ();
157 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0); 289 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
158 } 290 }
159 291
160 return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1))); 292 return sv_2mortal (sv_bless (newRV_inc (req->self), stash));
161} 293}
162 294
163static aio_req SvAIO_REQ (SV *sv) 295static aio_req SvAIO_REQ (SV *sv)
164{ 296{
165 MAGIC *mg; 297 MAGIC *mg;
166 298
167 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv)) 299 if (!SvROK (sv)
300 || (SvSTASH (SvRV (sv)) != aio_grp_stash
301 && SvSTASH (SvRV (sv)) != aio_req_stash
302 && !sv_derived_from (sv, "IO::AIO::REQ")))
168 croak ("object of class " AIO_REQ_KLASS " expected"); 303 croak ("object of class IO::AIO::REQ expected");
169 304
170 mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 305 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
171 306
172 return mg ? (aio_req)mg->mg_ptr : 0; 307 return mg ? (aio_req)mg->mg_ptr : 0;
173} 308}
179 dSP; 314 dSP;
180 315
181 ENTER; 316 ENTER;
182 SAVETMPS; 317 SAVETMPS;
183 PUSHMARK (SP); 318 PUSHMARK (SP);
184 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 319 XPUSHs (req_sv (grp, aio_grp_stash));
185 PUTBACK; 320 PUTBACK;
186 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR); 321 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
187 SPAGAIN; 322 SPAGAIN;
188 FREETMPS; 323 FREETMPS;
189 LEAVE; 324 LEAVE;
207 } 342 }
208} 343}
209 344
210static int req_invoke (eio_req *req) 345static int req_invoke (eio_req *req)
211{ 346{
212 dSP;
213
214 if (req->flags & FLAG_SV2_RO_OFF) 347 if (req->flags & FLAG_SV2_RO_OFF)
215 SvREADONLY_off (req->sv2); 348 SvREADONLY_off (req->sv2);
216 349
217 if (!EIO_CANCELLED (req) && req->callback) 350 if (!EIO_CANCELLED (req) && req->callback)
218 { 351 {
352 dSP;
353 static SV *sv_result_cache; /* caches the result integer SV */
354 SV *sv_result;
355
219 ENTER; 356 ENTER;
220 SAVETMPS; 357 SAVETMPS;
221 PUSHMARK (SP); 358 PUSHMARK (SP);
222 EXTEND (SP, 1); 359 EXTEND (SP, 1);
360
361 /* do not recreate the result IV from scratch each time */
362 if (expect_true (sv_result_cache))
363 {
364 sv_result = sv_result_cache; sv_result_cache = 0;
365 SvIV_set (sv_result, req->result);
366 }
367 else
368 {
369 sv_result = newSViv (req->result);
370 SvREADONLY_on (sv_result);
371 }
223 372
224 switch (req->type) 373 switch (req->type)
225 { 374 {
226 case EIO_READDIR: 375 case EIO_READDIR:
227 { 376 {
228 SV *rv = &PL_sv_undef; 377 SV *rv = &PL_sv_undef;
229 378
230 if (req->result >= 0) 379 if (req->result >= 0)
231 { 380 {
232 int i; 381 int i;
233 char *buf = req->ptr2; 382 char *names = (char *)req->ptr2;
383 eio_dirent *ent = (eio_dirent *)req->ptr1; /* might be 0 */
234 AV *av = newAV (); 384 AV *av = newAV ();
235 385
236 av_extend (av, req->result - 1); 386 av_extend (av, req->result - 1);
237 387
238 for (i = 0; i < req->result; ++i) 388 for (i = 0; i < req->result; ++i)
239 { 389 {
240 SV *sv = newSVpv (buf, 0); 390 if (req->int1 & EIO_READDIR_DENTS)
391 {
392 SV *namesv = newSVpvn (names + ent->nameofs, ent->namelen);
241 393
394 if (req->int1 & EIO_READDIR_CUSTOM2)
395 {
396 static SV *sv_type [EIO_DT_MAX + 1]; /* type sv cache */
397 AV *avent = newAV ();
398
399 av_extend (avent, 2);
400
401 if (!sv_type [ent->type])
402 {
403 sv_type [ent->type] = newSViv (ent->type);
404 SvREADONLY_on (sv_type [ent->type]);
405 }
406
407 av_store (avent, 0, namesv);
408 av_store (avent, 1, SvREFCNT_inc (sv_type [ent->type]));
409 av_store (avent, 2, IVSIZE >= 8 ? newSVuv (ent->inode) : newSVnv (ent->inode));
410
411 av_store (av, i, newRV_noinc ((SV *)avent));
412 }
413 else
242 av_store (av, i, sv); 414 av_store (av, i, namesv);
415
416 ++ent;
417 }
418 else
419 {
420 SV *name = newSVpv (names, 0);
421 av_store (av, i, name);
243 buf += SvCUR (sv) + 1; 422 names += SvCUR (name) + 1;
423 }
244 } 424 }
245 425
246 rv = sv_2mortal (newRV_noinc ((SV *)av)); 426 rv = sv_2mortal (newRV_noinc ((SV *)av));
247 } 427 }
248 428
249 PUSHs (rv); 429 PUSHs (rv);
430
431 if (req->int1 & EIO_READDIR_CUSTOM1)
432 XPUSHs (sv_2mortal (newSViv (req->int1 & ~(EIO_READDIR_CUSTOM1 | EIO_READDIR_CUSTOM2))));
250 } 433 }
251 break; 434 break;
252 435
253 case EIO_OPEN: 436 case EIO_OPEN:
254 { 437 {
260 GV *gv = (GV *)sv_newmortal (); 443 GV *gv = (GV *)sv_newmortal ();
261 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR); 444 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
262 char sym [64]; 445 char sym [64];
263 int symlen; 446 int symlen;
264 447
265 symlen = snprintf (sym, sizeof (sym), "fd#%d", req->result); 448 symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
266 gv_init (gv, stash, sym, symlen, 0); 449 gv_init (gv, aio_stash, sym, symlen, 0);
267 450
268 symlen = snprintf ( 451 symlen = snprintf (
269 sym, 452 sym,
270 sizeof (sym), 453 sizeof (sym),
271 "%s&=%d", 454 "%s&=%d",
272 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<", 455 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
273 req->result 456 (int)req->result
274 ); 457 );
275 458
276 if (do_open (gv, sym, symlen, 0, 0, 0, 0)) 459 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
277 fh = (SV *)gv; 460 fh = (SV *)gv;
278 } 461 }
279 462
280 PUSHs (fh); 463 PUSHs (fh);
281 } 464 }
465 break;
466
467 case EIO_STATVFS:
468 case EIO_FSTATVFS:
469 {
470 SV *rv = &PL_sv_undef;
471
472 if (req->result >= 0)
473 {
474 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req);
475 HV *hv = newHV ();
476
477 rv = sv_2mortal (newRV_noinc ((SV *)hv));
478
479 hv_store (hv, "bsize" , sizeof ("bsize" ) - 1, newSVval64 (f->f_bsize ), 0);
480 hv_store (hv, "frsize" , sizeof ("frsize" ) - 1, newSVval64 (f->f_frsize ), 0);
481 hv_store (hv, "blocks" , sizeof ("blocks" ) - 1, newSVval64 (f->f_blocks ), 0);
482 hv_store (hv, "bfree" , sizeof ("bfree" ) - 1, newSVval64 (f->f_bfree ), 0);
483 hv_store (hv, "bavail" , sizeof ("bavail" ) - 1, newSVval64 (f->f_bavail ), 0);
484 hv_store (hv, "files" , sizeof ("files" ) - 1, newSVval64 (f->f_files ), 0);
485 hv_store (hv, "ffree" , sizeof ("ffree" ) - 1, newSVval64 (f->f_ffree ), 0);
486 hv_store (hv, "favail" , sizeof ("favail" ) - 1, newSVval64 (f->f_favail ), 0);
487 hv_store (hv, "fsid" , sizeof ("fsid" ) - 1, newSVval64 (f->f_fsid ), 0);
488 hv_store (hv, "flag" , sizeof ("flag" ) - 1, newSVval64 (f->f_flag ), 0);
489 hv_store (hv, "namemax", sizeof ("namemax") - 1, newSVval64 (f->f_namemax), 0);
490 }
491
492 PUSHs (rv);
493 }
494
282 break; 495 break;
283 496
284 case EIO_GROUP: 497 case EIO_GROUP:
285 req->int1 = 2; /* mark group as finished */ 498 req->int1 = 2; /* mark group as finished */
286 499
308 case EIO_LSTAT: 521 case EIO_LSTAT:
309 case EIO_FSTAT: 522 case EIO_FSTAT:
310 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT; 523 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT;
311 PL_laststatval = req->result; 524 PL_laststatval = req->result;
312 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 525 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
313 PUSHs (sv_2mortal (newSViv (req->result))); 526 PUSHs (sv_result);
314 break; 527 break;
315 528
316 case EIO_READ: 529 case EIO_READ:
317 { 530 {
318 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0)); 531 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
319 *SvEND (req->sv2) = 0; 532 *SvEND (req->sv2) = 0;
320 SvPOK_only (req->sv2); 533 SvPOK_only (req->sv2);
321 SvSETMAGIC (req->sv2); 534 SvSETMAGIC (req->sv2);
322 PUSHs (sv_2mortal (newSViv (req->result))); 535 PUSHs (sv_result);
323 } 536 }
324 break; 537 break;
325 538
326 case EIO_DUP2: 539 case EIO_DUP2: /* EIO_DUP2 actually means aio_close(), su fudge result value */
327 if (req->result > 0) 540 if (req->result > 0)
328 req->result = 0; 541 SvIV_set (sv_result, 0);
329 /* FALLTHROUGH */ 542 /* FALLTHROUGH */
330 543
331 default: 544 default:
332 PUSHs (sv_2mortal (newSViv (req->result))); 545 PUSHs (sv_result);
333 break; 546 break;
334 } 547 }
335 548
336 errno = req->errorno; 549 errno = req->errorno;
337 550
338 PUTBACK; 551 PUTBACK;
339 call_sv (req->callback, G_VOID | G_EVAL | G_DISCARD); 552 call_sv (req->callback, G_VOID | G_EVAL | G_DISCARD);
340 SPAGAIN; 553 SPAGAIN;
554
555 if (expect_false (SvREFCNT (sv_result) != 1 || sv_result_cache))
556 SvREFCNT_dec (sv_result);
557 else
558 sv_result_cache = sv_result;
341 559
342 FREETMPS; 560 FREETMPS;
343 LEAVE; 561 LEAVE;
344 562
345 PUTBACK; 563 PUTBACK;
374 grp->sv2 = 0; 592 grp->sv2 = 0;
375 593
376 eio_grp_cancel (grp); 594 eio_grp_cancel (grp);
377} 595}
378 596
379#ifdef USE_SOCKETS_AS_HANDLES
380# define TO_SOCKET(x) (win32_get_osfhandle (x))
381#else
382# define TO_SOCKET(x) (x)
383#endif
384
385static void 597static void
386create_respipe (void) 598create_respipe (void)
387{ 599{
388 int old_readfd = respipe [0];
389
390 if (respipe [1] >= 0)
391 respipe_close (TO_SOCKET (respipe [1]));
392
393#ifdef _WIN32
394 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe))
395#else
396 if (pipe (respipe)) 600 if (s_epipe_renew (&respipe))
397#endif
398 croak ("unable to initialize result pipe"); 601 croak ("IO::AIO: unable to initialize result pipe");
399
400 if (old_readfd >= 0)
401 {
402 if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0)
403 croak ("unable to initialize result pipe(2)");
404
405 respipe_close (respipe [0]);
406 respipe [0] = old_readfd;
407 }
408
409#ifdef _WIN32
410 int arg = 1;
411 if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg)
412 || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg))
413#else
414 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
415 || fcntl (respipe [1], F_SETFL, O_NONBLOCK))
416#endif
417 croak ("unable to initialize result pipe(3)");
418
419 respipe_osf [0] = TO_SOCKET (respipe [0]);
420 respipe_osf [1] = TO_SOCKET (respipe [1]);
421} 602}
422 603
423static void poll_wait (void) 604static void poll_wait (void)
424{ 605{
425 fd_set rfd;
426
427 while (eio_nreqs ()) 606 while (eio_nreqs ())
428 { 607 {
429 int size; 608 int size;
430 609
431 X_LOCK (reslock); 610 X_LOCK (reslock);
435 if (size) 614 if (size)
436 return; 615 return;
437 616
438 etp_maybe_start_thread (); 617 etp_maybe_start_thread ();
439 618
440 FD_ZERO (&rfd); 619 s_epipe_wait (&respipe);
441 FD_SET (respipe [0], &rfd);
442
443 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
444 } 620 }
445} 621}
446 622
447static int poll_cb (void) 623static int poll_cb (void)
448{ 624{
463static void atfork_child (void) 639static void atfork_child (void)
464{ 640{
465 create_respipe (); 641 create_respipe ();
466} 642}
467 643
644/*****************************************************************************/
645
646#if !_POSIX_MAPPED_FILES
647# define mmap(addr,length,prot,flags,fd,offs) (errno = ENOSYS, -1)
648# define munmap(addr,length) (errno = ENOSYS, -1)
649# define mprotect(addr,len,prot) (errno = ENOSYS, -1)
650#endif
651
652#define MMAP_MAGIC PERL_MAGIC_ext
653
654static int
655mmap_free (pTHX_ SV *sv, MAGIC *mg)
656{
657 int old_errno = errno;
658 munmap (mg->mg_ptr, (size_t)mg->mg_obj);
659 errno = old_errno;
660
661 mg->mg_obj = 0; /* just in case */
662
663 SvREADONLY_off (sv);
664
665 if (SvPVX (sv) != mg->mg_ptr)
666 croak ("ERROR: IO::AIO::mmap-mapped scalar changed location, detected");
667
668 SvCUR_set (sv, 0);
669 SvPVX (sv) = 0;
670 SvOK_off (sv);
671
672 return 0;
673}
674
675static MGVTBL mmap_vtbl = {
676 0, 0, 0, 0, mmap_free
677};
678
679/*****************************************************************************/
680
468static SV * 681static SV *
469get_cb (SV *cb_sv) 682get_cb (SV *cb_sv)
470{ 683{
471 HV *st; 684 SvGETMAGIC (cb_sv);
472 GV *gvp; 685 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
473 CV *cv;
474
475 if (!SvOK (cb_sv))
476 return 0;
477
478 cv = sv_2cv (cb_sv, &st, &gvp, 0);
479
480 if (!cv)
481 croak ("IO::AIO callback must be undef or a CODE reference");
482
483 return (SV *)cv;
484} 686}
485 687
486#define dREQ \ 688#define dREQ \
487 SV *cb_cv; \ 689 SV *cb_cv; \
488 aio_req req; \ 690 aio_req req; \
502 PUTBACK; \ 704 PUTBACK; \
503 req_submit (req); \ 705 req_submit (req); \
504 SPAGAIN; \ 706 SPAGAIN; \
505 \ 707 \
506 if (GIMME_V != G_VOID) \ 708 if (GIMME_V != G_VOID) \
507 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 709 XPUSHs (req_sv (req, aio_req_stash));
508
509static int
510extract_fd (SV *fh, int wr)
511{
512 int fd = PerlIO_fileno (wr ? IoOFP (sv_2io (fh)) : IoIFP (sv_2io (fh)));
513
514 if (fd < 0)
515 croak ("illegal fh argument, either not an OS file or read/write mode mismatch");
516
517 return fd;
518}
519 710
520MODULE = IO::AIO PACKAGE = IO::AIO 711MODULE = IO::AIO PACKAGE = IO::AIO
521 712
522PROTOTYPES: ENABLE 713PROTOTYPES: ENABLE
523 714
524BOOT: 715BOOT:
525{ 716{
526 stash = gv_stashpv ("IO::AIO", 1); 717 static const struct {
527 718 const char *name;
528 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 719 IV iv;
529 newCONSTSUB (stash, "ENOSYS", newSViv (ENOSYS)); 720 } *civ, const_iv[] = {
530 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 721# define const_niv(name, value) { # name, (IV) value },
531 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 722# define const_iv(name) { # name, (IV) name },
532 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 723# define const_eio(name) { # name, (IV) EIO_ ## name },
533 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 724 const_iv (EXDEV)
725 const_iv (ENOSYS)
726 const_iv (O_RDONLY)
727 const_iv (O_WRONLY)
728 const_iv (O_RDWR)
729 const_iv (O_CREAT)
730 const_iv (O_TRUNC)
731 const_iv (O_EXCL)
732 const_iv (O_APPEND)
534#ifndef _WIN32 733#ifndef _WIN32
535 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 734 const_iv (S_IFIFO)
536#endif 735#endif
537 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 736 const_niv (FADV_NORMAL , POSIX_FADV_NORMAL)
538 newCONSTSUB (stash, "SYNC_FILE_RANGE_WAIT_BEFORE", newSViv (EIO_SYNC_FILE_RANGE_WAIT_BEFORE)); 737 const_niv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL)
539 newCONSTSUB (stash, "SYNC_FILE_RANGE_WRITE" , newSViv (EIO_SYNC_FILE_RANGE_WRITE)); 738 const_niv (FADV_RANDOM , POSIX_FADV_RANDOM)
540 newCONSTSUB (stash, "SYNC_FILE_RANGE_WAIT_AFTER" , newSViv (EIO_SYNC_FILE_RANGE_WAIT_AFTER)); 739 const_niv (FADV_NOREUSE , POSIX_FADV_NOREUSE)
740 const_niv (FADV_WILLNEED , POSIX_FADV_WILLNEED)
741 const_niv (FADV_DONTNEED , POSIX_FADV_DONTNEED)
541 742
743 const_niv (MADV_NORMAL , POSIX_MADV_NORMAL)
744 const_niv (MADV_SEQUENTIAL, POSIX_MADV_SEQUENTIAL)
745 const_niv (MADV_RANDOM , POSIX_MADV_RANDOM)
746 const_niv (MADV_WILLNEED , POSIX_MADV_WILLNEED)
747 const_niv (MADV_DONTNEED , POSIX_MADV_DONTNEED)
748
749 const_iv (ST_RDONLY)
750 const_iv (ST_NOSUID)
751 const_iv (ST_NODEV)
752 const_iv (ST_NOEXEC)
753 const_iv (ST_SYNCHRONOUS)
754 const_iv (ST_MANDLOCK)
755 const_iv (ST_WRITE)
756 const_iv (ST_APPEND)
757 const_iv (ST_IMMUTABLE)
758 const_iv (ST_NOATIME)
759 const_iv (ST_NODIRATIME)
760 const_iv (ST_RELATIME)
761
762 const_iv (PROT_NONE)
763 const_iv (PROT_EXEC)
764 const_iv (PROT_READ)
765 const_iv (PROT_WRITE)
766
767 /*const_iv (MAP_FIXED)*/
768 const_iv (MAP_PRIVATE)
769 const_iv (MAP_SHARED)
770 const_iv (MAP_ANONYMOUS)
771
772 /* linuxish */
773 const_iv (MAP_HUGETLB)
774 const_iv (MAP_LOCKED)
775 const_iv (MAP_NORESERVE)
776 const_iv (MAP_POPULATE)
777 const_iv (MAP_NONBLOCK)
778
779 const_iv (MCL_FUTURE)
780 const_iv (MCL_CURRENT)
781
782 const_eio (MS_ASYNC)
783 const_eio (MS_INVALIDATE)
784 const_eio (MS_SYNC)
785
786 const_eio (MT_MODIFY)
787
788 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
789 const_eio (SYNC_FILE_RANGE_WRITE)
790 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
791
792 const_eio (READDIR_DENTS)
793 const_eio (READDIR_DIRS_FIRST)
794 const_eio (READDIR_STAT_ORDER)
795 const_eio (READDIR_FOUND_UNKNOWN)
796
797 const_eio (DT_UNKNOWN)
798 const_eio (DT_FIFO)
799 const_eio (DT_CHR)
800 const_eio (DT_DIR)
801 const_eio (DT_BLK)
802 const_eio (DT_REG)
803 const_eio (DT_LNK)
804 const_eio (DT_SOCK)
805 const_eio (DT_WHT)
806 };
807
808 aio_stash = gv_stashpv ("IO::AIO" , 1);
809 aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1);
810 aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1);
811
812 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
813 newCONSTSUB (aio_stash, (char *)civ->name, newSViv (civ->iv));
814
815 newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE));
816
542 create_respipe (); 817 create_respipe ();
543 818
544 if (eio_init (want_poll, done_poll) < 0) 819 if (eio_init (want_poll, done_poll) < 0)
545 croak ("IO::AIO: unable to initialise eio library"); 820 croak ("IO::AIO: unable to initialise eio library");
546 821
547 /* atfork child called in fifo order, so before eio's handler */ 822 /* atfork child called in fifo order, so before eio's handler */
548 X_THREAD_ATFORK (0, 0, atfork_child); 823 X_THREAD_ATFORK (0, 0, atfork_child);
549} 824}
550 825
551void 826void
552max_poll_reqs (int nreqs) 827max_poll_reqs (int nreqs)
553 PROTOTYPE: $ 828 PROTOTYPE: $
606 ALIAS: 881 ALIAS:
607 aio_fsync = EIO_FSYNC 882 aio_fsync = EIO_FSYNC
608 aio_fdatasync = EIO_FDATASYNC 883 aio_fdatasync = EIO_FDATASYNC
609 PPCODE: 884 PPCODE:
610{ 885{
611 int fd = extract_fd (fh, 0); 886 int fd = s_fileno_croak (fh, 0);
612 dREQ; 887 dREQ;
613 888
614 req->type = ix; 889 req->type = ix;
615 req->sv1 = newSVsv (fh); 890 req->sv1 = newSVsv (fh);
616 req->int1 = fd; 891 req->int1 = fd;
617 892
618 REQ_SEND (req); 893 REQ_SEND (req);
619} 894}
620 895
621void 896void
622aio_sync_file_range (SV *fh, SV *offset, SV *nbytes, IV flags, SV *callback=&PL_sv_undef) 897aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef)
623 PROTOTYPE: $$$$;$ 898 PROTOTYPE: $$$$;$
624 PPCODE: 899 PPCODE:
625{ 900{
626 int fd = extract_fd (fh, 0); 901 int fd = s_fileno_croak (fh, 0);
627 dREQ; 902 dREQ;
628 903
629 req->type = EIO_SYNC_FILE_RANGE; 904 req->type = EIO_SYNC_FILE_RANGE;
630 req->sv1 = newSVsv (fh); 905 req->sv1 = newSVsv (fh);
631 req->int1 = fd; 906 req->int1 = fd;
632 req->offs = SvVAL64 (offset); 907 req->offs = offset;
633 req->size = SvVAL64 (nbytes); 908 req->size = nbytes;
634 req->int2 = flags; 909 req->int2 = flags;
635 910
636 REQ_SEND (req); 911 REQ_SEND (req);
637} 912}
638 913
640aio_close (SV *fh, SV *callback=&PL_sv_undef) 915aio_close (SV *fh, SV *callback=&PL_sv_undef)
641 PROTOTYPE: $;$ 916 PROTOTYPE: $;$
642 PPCODE: 917 PPCODE:
643{ 918{
644 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 919 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
645 int fd = extract_fd (fh, 0); 920 int fd = s_fileno_croak (fh, 0);
646 dREQ; 921 dREQ;
647 922
648 if (close_pipe < 0) 923 if (close_pipe < 0)
649 { 924 {
650 int pipefd [2]; 925 int pipefd [2];
672 aio_write = EIO_WRITE 947 aio_write = EIO_WRITE
673 PROTOTYPE: $$$$$;$ 948 PROTOTYPE: $$$$$;$
674 PPCODE: 949 PPCODE:
675{ 950{
676 STRLEN svlen; 951 STRLEN svlen;
677 int fd = extract_fd (fh, ix == EIO_WRITE); 952 int fd = s_fileno_croak (fh, ix == EIO_WRITE);
678 char *svptr = SvPVbyte (data, svlen); 953 char *svptr = SvPVbyte (data, svlen);
679 UV len = SvUV (length); 954 UV len = SvUV (length);
680 955
681 if (dataoffset < 0) 956 if (dataoffset < 0)
682 dataoffset += svlen; 957 dataoffset += svlen;
733 1008
734 REQ_SEND; 1009 REQ_SEND;
735} 1010}
736 1011
737void 1012void
738aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef) 1013aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef)
739 PROTOTYPE: $$$$;$ 1014 PROTOTYPE: $$$$;$
740 PPCODE: 1015 PPCODE:
741{ 1016{
742 int ifd = extract_fd (in_fh , 0); 1017 int ifd = s_fileno_croak (in_fh , 0);
743 int ofd = extract_fd (out_fh, 0); 1018 int ofd = s_fileno_croak (out_fh, 1);
744 dREQ; 1019 dREQ;
745 1020
746 req->type = EIO_SENDFILE; 1021 req->type = EIO_SENDFILE;
747 req->sv1 = newSVsv (out_fh); 1022 req->sv1 = newSVsv (out_fh);
748 req->int1 = ofd; 1023 req->int1 = ofd;
749 req->sv2 = newSVsv (in_fh); 1024 req->sv2 = newSVsv (in_fh);
750 req->int2 = ifd; 1025 req->int2 = ifd;
751 req->offs = SvVAL64 (in_offset); 1026 req->offs = in_offset;
752 req->size = length; 1027 req->size = length;
753 1028
754 REQ_SEND; 1029 REQ_SEND;
755} 1030}
756 1031
757void 1032void
758aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef) 1033aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef)
759 PROTOTYPE: $$$;$ 1034 PROTOTYPE: $$$;$
760 PPCODE: 1035 PPCODE:
761{ 1036{
762 int fd = extract_fd (fh, 0); 1037 int fd = s_fileno_croak (fh, 0);
763 dREQ; 1038 dREQ;
764 1039
765 req->type = EIO_READAHEAD; 1040 req->type = EIO_READAHEAD;
766 req->sv1 = newSVsv (fh); 1041 req->sv1 = newSVsv (fh);
767 req->int1 = fd; 1042 req->int1 = fd;
768 req->offs = SvVAL64 (offset); 1043 req->offs = offset;
769 req->size = length; 1044 req->size = length;
770 1045
771 REQ_SEND; 1046 REQ_SEND;
772} 1047}
773 1048
774void 1049void
775aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef) 1050aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef)
776 ALIAS: 1051 ALIAS:
777 aio_stat = EIO_STAT 1052 aio_stat = EIO_STAT
778 aio_lstat = EIO_LSTAT 1053 aio_lstat = EIO_LSTAT
1054 aio_statvfs = EIO_STATVFS
779 PPCODE: 1055 PPCODE:
780{ 1056{
781 dREQ; 1057 dREQ;
782 1058
783 req->sv1 = newSVsv (fh_or_path); 1059 req->sv1 = newSVsv (fh_or_path);
787 req->type = ix; 1063 req->type = ix;
788 req->ptr1 = SvPVbyte_nolen (req->sv1); 1064 req->ptr1 = SvPVbyte_nolen (req->sv1);
789 } 1065 }
790 else 1066 else
791 { 1067 {
792 req->type = EIO_FSTAT; 1068 req->type = ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT;
793 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1069 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
794 } 1070 }
795 1071
796 REQ_SEND; 1072 REQ_SEND;
797} 1073}
892 1168
893 REQ_SEND; 1169 REQ_SEND;
894} 1170}
895 1171
896void 1172void
1173aio_readdirx (SV8 *pathname, IV flags, SV *callback=&PL_sv_undef)
1174 PPCODE:
1175{
1176 dREQ;
1177
1178 req->type = EIO_READDIR;
1179 req->sv1 = newSVsv (pathname);
1180 req->ptr1 = SvPVbyte_nolen (req->sv1);
1181 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
1182
1183 if (flags & EIO_READDIR_DENTS)
1184 req->int1 |= EIO_READDIR_CUSTOM2;
1185
1186 REQ_SEND;
1187}
1188
1189void
897aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 1190aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
898 ALIAS: 1191 ALIAS:
899 aio_unlink = EIO_UNLINK 1192 aio_unlink = EIO_UNLINK
900 aio_rmdir = EIO_RMDIR 1193 aio_rmdir = EIO_RMDIR
901 aio_readdir = EIO_READDIR 1194 aio_readdir = EIO_READDIR
943 1236
944 REQ_SEND; 1237 REQ_SEND;
945} 1238}
946 1239
947void 1240void
1241aio_mtouch (SV8 *data, IV offset = 0, SV *length = &PL_sv_undef, int flags = 0, SV *callback=&PL_sv_undef)
1242 ALIAS:
1243 aio_mtouch = EIO_MTOUCH
1244 aio_msync = EIO_MSYNC
1245 PROTOTYPE: $$$$;$
1246 PPCODE:
1247{
1248 STRLEN svlen;
1249 UV len = SvUV (length);
1250 char *svptr = SvPVbyte (data, svlen);
1251
1252 if (offset < 0)
1253 offset += svlen;
1254
1255 if (offset < 0 || offset > svlen)
1256 croak ("offset outside of scalar");
1257
1258 if (!SvOK (length) || len + offset > svlen)
1259 len = svlen - offset;
1260
1261 {
1262 dREQ;
1263
1264 req->type = ix;
1265 req->size = len;
1266 req->sv2 = SvREFCNT_inc (data);
1267 req->ptr2 = (char *)svptr + offset;
1268 req->int1 = flags;
1269
1270 REQ_SEND;
1271 }
1272}
1273
1274void
948aio_busy (double delay, SV *callback=&PL_sv_undef) 1275aio_busy (double delay, SV *callback=&PL_sv_undef)
949 PPCODE: 1276 PPCODE:
950{ 1277{
951 dREQ; 1278 dREQ;
952 1279
964 dREQ; 1291 dREQ;
965 1292
966 req->type = EIO_GROUP; 1293 req->type = EIO_GROUP;
967 1294
968 req_submit (req); 1295 req_submit (req);
969 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1296 XPUSHs (req_sv (req, aio_grp_stash));
970} 1297}
971 1298
972void 1299void
973aio_nop (SV *callback=&PL_sv_undef) 1300aio_nop (SV *callback=&PL_sv_undef)
974 ALIAS: 1301 ALIAS:
1026 1353
1027int 1354int
1028poll_fileno() 1355poll_fileno()
1029 PROTOTYPE: 1356 PROTOTYPE:
1030 CODE: 1357 CODE:
1031 RETVAL = respipe [0]; 1358 RETVAL = s_epipe_fd (&respipe);
1032 OUTPUT: 1359 OUTPUT:
1033 RETVAL 1360 RETVAL
1034 1361
1035int 1362int
1036poll_cb(...) 1363poll_cb(...)
1076 CODE: 1403 CODE:
1077 RETVAL = eio_nthreads (); 1404 RETVAL = eio_nthreads ();
1078 OUTPUT: 1405 OUTPUT:
1079 RETVAL 1406 RETVAL
1080 1407
1408int
1409fadvise (aio_rfd fh, off_t offset, off_t length, IV advice)
1410 PROTOTYPE: $$$$
1411 CODE:
1412 RETVAL = posix_fadvise (fh, offset, length, advice);
1413 OUTPUT:
1414 RETVAL
1415
1416ssize_t
1417sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
1418 PROTOTYPE: $$$$
1419 CODE:
1420 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count);
1421 OUTPUT:
1422 RETVAL
1423
1424void
1425mmap (SV *scalar, size_t length, int prot, int flags, SV *fh, off_t offset = 0)
1426 PROTOTYPE: $$$$$;$
1427 PPCODE:
1428 sv_unmagic (scalar, MMAP_MAGIC);
1429{
1430 int fd = SvOK (fh) ? s_fileno_croak (fh, flags & PROT_WRITE) : -1;
1431 void *addr = (void *)mmap (0, length, prot, flags, fd, offset);
1432 if (addr == (void *)-1)
1433 XSRETURN_NO;
1434
1435 sv_force_normal (scalar);
1436
1437 /* we store the length in mg_obj, as namlen is I32 :/ */
1438 sv_magicext (scalar, 0, MMAP_MAGIC, &mmap_vtbl, (char *)addr, 0)
1439 ->mg_obj = (SV *)length;
1440
1441 SvUPGRADE (scalar, SVt_PV); /* nop... */
1442
1443 if (!(prot & PROT_WRITE))
1444 SvREADONLY_on (scalar);
1445
1446 if (SvLEN (scalar))
1447 Safefree (SvPVX (scalar));
1448
1449 SvPVX (scalar) = (char *)addr;
1450 SvCUR_set (scalar, length);
1451 SvLEN_set (scalar, 0);
1452 SvPOK_only (scalar);
1453
1454 XSRETURN_YES;
1455}
1456
1457void
1458munmap (SV *scalar)
1459 PROTOTYPE: $
1460 CODE:
1461 sv_unmagic (scalar, MMAP_MAGIC);
1462
1463int
1464madvise (SV *scalar, off_t offset, off_t length, IV advice_or_prot)
1465 ALIAS:
1466 mprotect = 1
1467 PROTOTYPE: $$$$
1468 CODE:
1469{
1470 STRLEN cur;
1471 char *addr = SvPVbyte (scalar, cur);
1472
1473 if (offset > cur)
1474 RETVAL = errno = EFAULT;
1475 else
1476 {
1477 if (!SvOK (ST (2)))
1478 length = cur - offset;
1479
1480 if (offset + length > cur)
1481 RETVAL = errno = EFAULT;
1482 else
1483 switch (ix)
1484 {
1485 case 0: RETVAL = posix_madvise (addr + offset, length, advice_or_prot); break;
1486 case 1: RETVAL = mprotect (addr + offset, length, advice_or_prot); break;
1487 }
1488 }
1489}
1490 OUTPUT:
1491 RETVAL
1492
1493int
1494mlockall (int flags)
1495 PROTOTYPE: $
1496 CODE:
1497#if _POSIX_MEMLOCK
1498#if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
1499 extern int mallopt (int, int);
1500 mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
1501#endif
1502 mlockall (flags);
1503#else
1504 RETVAL = -1;
1505 errno = ENOSYS;
1506#endif
1507 OUTPUT:
1508 RETVAL
1509
1510int
1511munlockall ()
1512 PROTOTYPE:
1513 CODE:
1514#if _POSIX_MEMLOCK
1515 munlockall ();
1516#else
1517 RETVAL = -1;
1518 errno = ENOSYS;
1519#endif
1520 OUTPUT:
1521 RETVAL
1522
1081void _on_next_submit (SV *cb) 1523void _on_next_submit (SV *cb)
1082 CODE: 1524 CODE:
1083 SvREFCNT_dec (on_next_submit); 1525 SvREFCNT_dec (on_next_submit);
1084 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1526 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1085 1527
1099 if (GIMME_V != G_VOID) 1541 if (GIMME_V != G_VOID)
1100 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef); 1542 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1101 1543
1102 if (items > 1) 1544 if (items > 1)
1103 { 1545 {
1104 SV *cb_cv = get_cb (callback); 1546 SV *cb_cv =get_cb (callback);
1105 1547
1106 SvREFCNT_dec (req->callback); 1548 SvREFCNT_dec (req->callback);
1107 req->callback = SvREFCNT_inc (cb_cv); 1549 req->callback = SvREFCNT_inc (cb_cv);
1108 } 1550 }
1109} 1551}
1146 AV *av; 1588 AV *av;
1147 1589
1148 grp->errorno = errno; 1590 grp->errorno = errno;
1149 1591
1150 av = newAV (); 1592 av = newAV ();
1593 av_extend (av, items - 1);
1151 1594
1152 for (i = 1; i < items; ++i ) 1595 for (i = 1; i < items; ++i )
1153 av_push (av, newSVsv (ST (i))); 1596 av_push (av, newSVsv (ST (i)));
1154 1597
1155 SvREFCNT_dec (grp->sv1); 1598 SvREFCNT_dec (grp->sv1);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines