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.135 by root, Sun Apr 19 13:06:15 2009 UTC vs.
Revision 1.169 by root, Wed Aug 4 16:06:54 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#ifndef POSIX_MADV_NORMAL
146# define POSIX_MADV_NORMAL 0
147# define NO_MADVISE 1
148#endif
149#ifndef POSIX_MADV_SEQUENTIAL
150# define POSIX_MADV_SEQUENTIAL 0
151#endif
152#ifndef POSIX_MADV_RANDOM
153# define POSIX_MADV_RANDOM 0
154#endif
155#ifndef POSIX_MADV_WILLNEED
156# define POSIX_MADV_WILLNEED 0
157#endif
158#ifndef POSIX_MADV_DONTNEED
159# define POSIX_MADV_DONTNEED 0
160#endif
161
162#ifndef ST_NODEV
163# define ST_NODEV 0
164#endif
165#ifndef ST_NOEXEC
166# define ST_NOEXEC 0
167#endif
168#ifndef ST_SYNCHRONOUS
169# define ST_SYNCHRONOUS 0
170#endif
171#ifndef ST_MANDLOCK
172# define ST_MANDLOCK 0
173#endif
174#ifndef ST_WRITE
175# define ST_WRITE 0
176#endif
177#ifndef ST_APPEND
178# define ST_APPEND 0
179#endif
180#ifndef ST_IMMUTABLE
181# define ST_IMMUTABLE 0
182#endif
183#ifndef ST_NOATIME
184# define ST_NOATIME 0
185#endif
186#ifndef ST_NODIRATIME
187# define ST_NODIRATIME 0
188#endif
189#ifndef ST_RELATIME
190# define ST_RELATIME 0
191#endif
192
193#ifndef MCL_CURRENT
194# define MCL_CURRENT 0
195#endif
196#ifndef MCL_FUTURE
197# define MCL_FUTURE 0
198#endif
199
200#ifndef MAP_ANONYMOUS
201# ifdef MAP_ANON
202# define MAP_ANONYMOUS MAP_ANON
203# else
204# define MAP_ANONYMOUS MAP_FIXED /* and hope this fails */
205# endif
206#endif
207#ifndef MAP_HUGETLB
208# define MAP_HUGETLB 0
209#endif
210#ifndef MAP_LOCKED
211# define MAP_LOCKED 0
212#endif
213#ifndef MAP_NORESERVE
214# define MAP_NORESERVE 0
215#endif
216#ifndef MAP_POPULATE
217# define MAP_POPULATE 0
218#endif
219#ifndef MAP_NONBLOCK
220# define MAP_NONBLOCK 0
221#endif
222
223#ifndef PAGESIZE
224# define PAGESIZE sysconf (_SC_PAGESIZE)
225#endif
226
114static int req_invoke (eio_req *req); 227static int req_invoke (eio_req *req);
115#define EIO_FINISH(req) req_invoke (req) 228#define EIO_FINISH(req) req_invoke (req)
116static void req_destroy (eio_req *grp); 229static void req_destroy (eio_req *grp);
117#define EIO_DESTROY(req) req_destroy (req) 230#define EIO_DESTROY(req) req_destroy (req)
118 231
127 240
128static SV *on_next_submit; 241static SV *on_next_submit;
129static int next_pri = EIO_PRI_DEFAULT; 242static int next_pri = EIO_PRI_DEFAULT;
130static int max_outstanding; 243static int max_outstanding;
131 244
132static int respipe_osf [2], respipe [2] = { -1, -1 }; 245static s_epipe respipe;
133 246
134static void req_destroy (aio_req req); 247static void req_destroy (aio_req req);
135static void req_cancel (aio_req req); 248static void req_cancel (aio_req req);
136 249
137static void want_poll (void) 250static void want_poll (void)
138{ 251{
139 /* write a dummy byte to the pipe so fh becomes ready */ 252 /* write a dummy byte to the pipe so fh becomes ready */
140 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1); 253 s_epipe_signal (&respipe);
141} 254}
142 255
143static void done_poll (void) 256static void done_poll (void)
144{ 257{
145 /* read any signals sent by the worker threads */ 258 /* read any signals sent by the worker threads */
146 char buf [4]; 259 s_epipe_drain (&respipe);
147 while (respipe_read (respipe [0], buf, 4) == 4)
148 ;
149} 260}
150 261
151/* must be called at most once */ 262/* must be called at most once */
152static SV *req_sv (aio_req req, const char *klass) 263static SV *req_sv (aio_req req, HV *stash)
153{ 264{
154 if (!req->self) 265 if (!req->self)
155 { 266 {
156 req->self = (SV *)newHV (); 267 req->self = (SV *)newHV ();
157 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0); 268 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
158 } 269 }
159 270
160 return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1))); 271 return sv_2mortal (sv_bless (newRV_inc (req->self), stash));
161} 272}
162 273
163static aio_req SvAIO_REQ (SV *sv) 274static aio_req SvAIO_REQ (SV *sv)
164{ 275{
165 MAGIC *mg; 276 MAGIC *mg;
166 277
167 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv)) 278 if (!SvROK (sv)
279 || (SvSTASH (SvRV (sv)) != aio_grp_stash
280 && SvSTASH (SvRV (sv)) != aio_req_stash
281 && !sv_derived_from (sv, "IO::AIO::REQ")))
168 croak ("object of class " AIO_REQ_KLASS " expected"); 282 croak ("object of class IO::AIO::REQ expected");
169 283
170 mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 284 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
171 285
172 return mg ? (aio_req)mg->mg_ptr : 0; 286 return mg ? (aio_req)mg->mg_ptr : 0;
173} 287}
179 dSP; 293 dSP;
180 294
181 ENTER; 295 ENTER;
182 SAVETMPS; 296 SAVETMPS;
183 PUSHMARK (SP); 297 PUSHMARK (SP);
184 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 298 XPUSHs (req_sv (grp, aio_grp_stash));
185 PUTBACK; 299 PUTBACK;
186 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR); 300 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
187 SPAGAIN; 301 SPAGAIN;
188 FREETMPS; 302 FREETMPS;
189 LEAVE; 303 LEAVE;
207 } 321 }
208} 322}
209 323
210static int req_invoke (eio_req *req) 324static int req_invoke (eio_req *req)
211{ 325{
212 dSP;
213
214 if (req->flags & FLAG_SV2_RO_OFF) 326 if (req->flags & FLAG_SV2_RO_OFF)
215 SvREADONLY_off (req->sv2); 327 SvREADONLY_off (req->sv2);
216 328
217 if (!EIO_CANCELLED (req) && req->callback) 329 if (!EIO_CANCELLED (req) && req->callback)
218 { 330 {
331 dSP;
332 static SV *sv_result_cache; /* caches the result integer SV */
333 SV *sv_result;
334
219 ENTER; 335 ENTER;
220 SAVETMPS; 336 SAVETMPS;
221 PUSHMARK (SP); 337 PUSHMARK (SP);
222 EXTEND (SP, 1); 338 EXTEND (SP, 1);
339
340 /* do not recreate the result IV from scratch each time */
341 if (expect_true (sv_result_cache))
342 {
343 sv_result = sv_result_cache; sv_result_cache = 0;
344 SvIV_set (sv_result, req->result);
345 }
346 else
347 {
348 sv_result = newSViv (req->result);
349 SvREADONLY_on (sv_result);
350 }
223 351
224 switch (req->type) 352 switch (req->type)
225 { 353 {
226 case EIO_READDIR: 354 case EIO_READDIR:
227 { 355 {
228 SV *rv = &PL_sv_undef; 356 SV *rv = &PL_sv_undef;
229 357
230 if (req->result >= 0) 358 if (req->result >= 0)
231 { 359 {
232 int i; 360 int i;
233 char *buf = req->ptr2; 361 char *names = (char *)req->ptr2;
362 eio_dirent *ent = (eio_dirent *)req->ptr1; /* might be 0 */
234 AV *av = newAV (); 363 AV *av = newAV ();
235 364
236 av_extend (av, req->result - 1); 365 av_extend (av, req->result - 1);
237 366
238 for (i = 0; i < req->result; ++i) 367 for (i = 0; i < req->result; ++i)
239 { 368 {
240 SV *sv = newSVpv (buf, 0); 369 if (req->int1 & EIO_READDIR_DENTS)
370 {
371 SV *namesv = newSVpvn (names + ent->nameofs, ent->namelen);
241 372
373 if (req->int1 & EIO_READDIR_CUSTOM2)
374 {
375 static SV *sv_type [EIO_DT_MAX + 1]; /* type sv cache */
376 AV *avent = newAV ();
377
378 av_extend (avent, 2);
379
380 if (!sv_type [ent->type])
381 {
382 sv_type [ent->type] = newSViv (ent->type);
383 SvREADONLY_on (sv_type [ent->type]);
384 }
385
386 av_store (avent, 0, namesv);
387 av_store (avent, 1, SvREFCNT_inc (sv_type [ent->type]));
388 av_store (avent, 2, IVSIZE >= 8 ? newSVuv (ent->inode) : newSVnv (ent->inode));
389
390 av_store (av, i, newRV_noinc ((SV *)avent));
391 }
392 else
242 av_store (av, i, sv); 393 av_store (av, i, namesv);
394
395 ++ent;
396 }
397 else
398 {
399 SV *name = newSVpv (names, 0);
400 av_store (av, i, name);
243 buf += SvCUR (sv) + 1; 401 names += SvCUR (name) + 1;
402 }
244 } 403 }
245 404
246 rv = sv_2mortal (newRV_noinc ((SV *)av)); 405 rv = sv_2mortal (newRV_noinc ((SV *)av));
247 } 406 }
248 407
249 PUSHs (rv); 408 PUSHs (rv);
409
410 if (req->int1 & EIO_READDIR_CUSTOM1)
411 XPUSHs (sv_2mortal (newSViv (req->int1 & ~(EIO_READDIR_CUSTOM1 | EIO_READDIR_CUSTOM2))));
250 } 412 }
251 break; 413 break;
252 414
253 case EIO_OPEN: 415 case EIO_OPEN:
254 { 416 {
260 GV *gv = (GV *)sv_newmortal (); 422 GV *gv = (GV *)sv_newmortal ();
261 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR); 423 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
262 char sym [64]; 424 char sym [64];
263 int symlen; 425 int symlen;
264 426
265 symlen = snprintf (sym, sizeof (sym), "fd#%d", req->result); 427 symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
266 gv_init (gv, stash, sym, symlen, 0); 428 gv_init (gv, aio_stash, sym, symlen, 0);
267 429
268 symlen = snprintf ( 430 symlen = snprintf (
269 sym, 431 sym,
270 sizeof (sym), 432 sizeof (sym),
271 "%s&=%d", 433 "%s&=%d",
272 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<", 434 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
273 req->result 435 (int)req->result
274 ); 436 );
275 437
276 if (do_open (gv, sym, symlen, 0, 0, 0, 0)) 438 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
277 fh = (SV *)gv; 439 fh = (SV *)gv;
278 } 440 }
279 441
280 PUSHs (fh); 442 PUSHs (fh);
281 } 443 }
444 break;
445
446 case EIO_STATVFS:
447 case EIO_FSTATVFS:
448 {
449 SV *rv = &PL_sv_undef;
450
451 if (req->result >= 0)
452 {
453 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req);
454 HV *hv = newHV ();
455
456 rv = sv_2mortal (newRV_noinc ((SV *)hv));
457
458 hv_store (hv, "bsize" , sizeof ("bsize" ) - 1, newSVval64 (f->f_bsize ), 0);
459 hv_store (hv, "frsize" , sizeof ("frsize" ) - 1, newSVval64 (f->f_frsize ), 0);
460 hv_store (hv, "blocks" , sizeof ("blocks" ) - 1, newSVval64 (f->f_blocks ), 0);
461 hv_store (hv, "bfree" , sizeof ("bfree" ) - 1, newSVval64 (f->f_bfree ), 0);
462 hv_store (hv, "bavail" , sizeof ("bavail" ) - 1, newSVval64 (f->f_bavail ), 0);
463 hv_store (hv, "files" , sizeof ("files" ) - 1, newSVval64 (f->f_files ), 0);
464 hv_store (hv, "ffree" , sizeof ("ffree" ) - 1, newSVval64 (f->f_ffree ), 0);
465 hv_store (hv, "favail" , sizeof ("favail" ) - 1, newSVval64 (f->f_favail ), 0);
466 hv_store (hv, "fsid" , sizeof ("fsid" ) - 1, newSVval64 (f->f_fsid ), 0);
467 hv_store (hv, "flag" , sizeof ("flag" ) - 1, newSVval64 (f->f_flag ), 0);
468 hv_store (hv, "namemax", sizeof ("namemax") - 1, newSVval64 (f->f_namemax), 0);
469 }
470
471 PUSHs (rv);
472 }
473
282 break; 474 break;
283 475
284 case EIO_GROUP: 476 case EIO_GROUP:
285 req->int1 = 2; /* mark group as finished */ 477 req->int1 = 2; /* mark group as finished */
286 478
308 case EIO_LSTAT: 500 case EIO_LSTAT:
309 case EIO_FSTAT: 501 case EIO_FSTAT:
310 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT; 502 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT;
311 PL_laststatval = req->result; 503 PL_laststatval = req->result;
312 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 504 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
313 PUSHs (sv_2mortal (newSViv (req->result))); 505 PUSHs (sv_result);
314 break; 506 break;
315 507
316 case EIO_READ: 508 case EIO_READ:
509 {
317 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0)); 510 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
318 *SvEND (req->sv2) = 0; 511 *SvEND (req->sv2) = 0;
319 PUSHs (sv_2mortal (newSViv (req->result))); 512 SvPOK_only (req->sv2);
513 SvSETMAGIC (req->sv2);
514 PUSHs (sv_result);
515 }
320 break; 516 break;
321 517
322 case EIO_DUP2: 518 case EIO_DUP2: /* EIO_DUP2 actually means aio_close(), su fudge result value */
323 if (req->result > 0) 519 if (req->result > 0)
324 req->result = 0; 520 SvIV_set (sv_result, 0);
325 /* FALLTHROUGH */ 521 /* FALLTHROUGH */
326 522
327 default: 523 default:
328 PUSHs (sv_2mortal (newSViv (req->result))); 524 PUSHs (sv_result);
329 break; 525 break;
330 } 526 }
331 527
332 errno = req->errorno; 528 errno = req->errorno;
333 529
334 PUTBACK; 530 PUTBACK;
335 call_sv (req->callback, G_VOID | G_EVAL | G_DISCARD); 531 call_sv (req->callback, G_VOID | G_EVAL | G_DISCARD);
336 SPAGAIN; 532 SPAGAIN;
533
534 if (expect_false (SvREFCNT (sv_result) != 1 || sv_result_cache))
535 SvREFCNT_dec (sv_result);
536 else
537 sv_result_cache = sv_result;
337 538
338 FREETMPS; 539 FREETMPS;
339 LEAVE; 540 LEAVE;
340 541
341 PUTBACK; 542 PUTBACK;
370 grp->sv2 = 0; 571 grp->sv2 = 0;
371 572
372 eio_grp_cancel (grp); 573 eio_grp_cancel (grp);
373} 574}
374 575
375#ifdef USE_SOCKETS_AS_HANDLES
376# define TO_SOCKET(x) (win32_get_osfhandle (x))
377#else
378# define TO_SOCKET(x) (x)
379#endif
380
381static void 576static void
382create_respipe (void) 577create_respipe (void)
383{ 578{
384 int old_readfd = respipe [0];
385
386 if (respipe [1] >= 0)
387 respipe_close (TO_SOCKET (respipe [1]));
388
389#ifdef _WIN32
390 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe))
391#else
392 if (pipe (respipe)) 579 if (s_epipe_renew (&respipe))
393#endif
394 croak ("unable to initialize result pipe"); 580 croak ("IO::AIO: unable to initialize result pipe");
395
396 if (old_readfd >= 0)
397 {
398 if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0)
399 croak ("unable to initialize result pipe(2)");
400
401 respipe_close (respipe [0]);
402 respipe [0] = old_readfd;
403 }
404
405#ifdef _WIN32
406 int arg = 1;
407 if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg)
408 || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg))
409#else
410 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
411 || fcntl (respipe [1], F_SETFL, O_NONBLOCK))
412#endif
413 croak ("unable to initialize result pipe(3)");
414
415 respipe_osf [0] = TO_SOCKET (respipe [0]);
416 respipe_osf [1] = TO_SOCKET (respipe [1]);
417} 581}
418 582
419static void poll_wait (void) 583static void poll_wait (void)
420{ 584{
421 fd_set rfd;
422
423 while (eio_nreqs ()) 585 while (eio_nreqs ())
424 { 586 {
425 int size; 587 int size;
426 588
427 X_LOCK (reslock); 589 X_LOCK (reslock);
431 if (size) 593 if (size)
432 return; 594 return;
433 595
434 etp_maybe_start_thread (); 596 etp_maybe_start_thread ();
435 597
436 FD_ZERO (&rfd); 598 s_epipe_wait (&respipe);
437 FD_SET (respipe [0], &rfd);
438
439 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
440 } 599 }
441} 600}
442 601
443static int poll_cb (void) 602static int poll_cb (void)
444{ 603{
459static void atfork_child (void) 618static void atfork_child (void)
460{ 619{
461 create_respipe (); 620 create_respipe ();
462} 621}
463 622
623/*****************************************************************************/
624
625#if !_POSIX_MAPPED_FILES
626# define mmap(addr,length,prot,flags,fd,offs) (errno = ENOSYS, -1)
627# define munmap(addr,length) (errno = ENOSYS, -1)
628#endif
629
630#define MMAP_MAGIC PERL_MAGIC_ext
631
632static int
633mmap_free (pTHX_ SV *sv, MAGIC *mg)
634{
635 int old_errno = errno;
636 munmap (mg->mg_ptr, (size_t)mg->mg_obj);
637 errno = old_errno;
638
639 mg->mg_obj = 0; /* just in case */
640
641 SvREADONLY_off (sv);
642
643 if (SvPVX (sv) != mg->mg_ptr)
644 croak ("ERROR: IO::AIO::mmap-mapped scalar changed location, detected");
645
646 SvCUR_set (sv, 0);
647 SvPVX (sv) = 0;
648 SvOK_off (sv);
649
650 return 0;
651}
652
653static MGVTBL mmap_vtbl = {
654 0, 0, 0, 0, mmap_free
655};
656
657/*****************************************************************************/
658
464static SV * 659static SV *
465get_cb (SV *cb_sv) 660get_cb (SV *cb_sv)
466{ 661{
467 HV *st; 662 SvGETMAGIC (cb_sv);
468 GV *gvp; 663 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
469 CV *cv;
470
471 if (!SvOK (cb_sv))
472 return 0;
473
474 cv = sv_2cv (cb_sv, &st, &gvp, 0);
475
476 if (!cv)
477 croak ("IO::AIO callback must be undef or a CODE reference");
478
479 return (SV *)cv;
480} 664}
481 665
482#define dREQ \ 666#define dREQ \
483 SV *cb_cv; \ 667 SV *cb_cv; \
484 aio_req req; \ 668 aio_req req; \
498 PUTBACK; \ 682 PUTBACK; \
499 req_submit (req); \ 683 req_submit (req); \
500 SPAGAIN; \ 684 SPAGAIN; \
501 \ 685 \
502 if (GIMME_V != G_VOID) \ 686 if (GIMME_V != G_VOID) \
503 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 687 XPUSHs (req_sv (req, aio_req_stash));
504 688
505MODULE = IO::AIO PACKAGE = IO::AIO 689MODULE = IO::AIO PACKAGE = IO::AIO
506 690
507PROTOTYPES: ENABLE 691PROTOTYPES: ENABLE
508 692
509BOOT: 693BOOT:
510{ 694{
511 stash = gv_stashpv ("IO::AIO", 1); 695 static const struct {
512 696 const char *name;
513 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 697 IV iv;
514 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 698 } *civ, const_iv[] = {
515 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 699# define const_niv(name, value) { # name, (IV) value },
516 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 700# define const_iv(name) { # name, (IV) name },
517 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 701# define const_eio(name) { # name, (IV) EIO_ ## name },
702 const_iv (EXDEV)
703 const_iv (ENOSYS)
704 const_iv (O_RDONLY)
705 const_iv (O_WRONLY)
706 const_iv (O_RDWR)
707 const_iv (O_CREAT)
708 const_iv (O_TRUNC)
709 const_iv (O_EXCL)
710 const_iv (O_APPEND)
518#ifndef _WIN32 711#ifndef _WIN32
519 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 712 const_iv (S_IFIFO)
520#endif 713#endif
521 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 714 const_niv (FADV_NORMAL , POSIX_FADV_NORMAL)
522 newCONSTSUB (stash, "SYNC_FILE_RANGE_WAIT_BEFORE", newSViv (EIO_SYNC_FILE_RANGE_WAIT_BEFORE)); 715 const_niv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL)
523 newCONSTSUB (stash, "SYNC_FILE_RANGE_WRITE" , newSViv (EIO_SYNC_FILE_RANGE_WRITE)); 716 const_niv (FADV_RANDOM , POSIX_FADV_RANDOM)
524 newCONSTSUB (stash, "SYNC_FILE_RANGE_WAIT_AFTER" , newSViv (EIO_SYNC_FILE_RANGE_WAIT_AFTER)); 717 const_niv (FADV_NOREUSE , POSIX_FADV_NOREUSE)
718 const_niv (FADV_WILLNEED , POSIX_FADV_WILLNEED)
719 const_niv (FADV_DONTNEED , POSIX_FADV_DONTNEED)
525 720
721 const_niv (MADV_NORMAL , POSIX_MADV_NORMAL)
722 const_niv (MADV_SEQUENTIAL, POSIX_MADV_SEQUENTIAL)
723 const_niv (MADV_RANDOM , POSIX_MADV_RANDOM)
724 const_niv (MADV_WILLNEED , POSIX_MADV_WILLNEED)
725 const_niv (MADV_DONTNEED , POSIX_MADV_DONTNEED)
726
727 const_iv (ST_RDONLY)
728 const_iv (ST_NOSUID)
729 const_iv (ST_NODEV)
730 const_iv (ST_NOEXEC)
731 const_iv (ST_SYNCHRONOUS)
732 const_iv (ST_MANDLOCK)
733 const_iv (ST_WRITE)
734 const_iv (ST_APPEND)
735 const_iv (ST_IMMUTABLE)
736 const_iv (ST_NOATIME)
737 const_iv (ST_NODIRATIME)
738 const_iv (ST_RELATIME)
739
740 const_iv (PROT_EXEC)
741 const_iv (PROT_NONE)
742 const_iv (PROT_READ)
743 const_iv (PROT_WRITE)
744
745 /*const_iv (MAP_FIXED)*/
746 const_iv (MAP_PRIVATE)
747 const_iv (MAP_SHARED)
748 const_iv (MAP_ANONYMOUS)
749
750 /* linuxish */
751 const_iv (MAP_HUGETLB)
752 const_iv (MAP_LOCKED)
753 const_iv (MAP_NORESERVE)
754 const_iv (MAP_POPULATE)
755 const_iv (MAP_NONBLOCK)
756
757 const_iv (MCL_FUTURE)
758 const_iv (MCL_CURRENT)
759
760 const_eio (MS_ASYNC)
761 const_eio (MS_INVALIDATE)
762 const_eio (MS_SYNC)
763
764 const_eio (MT_MODIFY)
765
766 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
767 const_eio (SYNC_FILE_RANGE_WRITE)
768 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
769
770 const_eio (READDIR_DENTS)
771 const_eio (READDIR_DIRS_FIRST)
772 const_eio (READDIR_STAT_ORDER)
773 const_eio (READDIR_FOUND_UNKNOWN)
774
775 const_eio (DT_UNKNOWN)
776 const_eio (DT_FIFO)
777 const_eio (DT_CHR)
778 const_eio (DT_DIR)
779 const_eio (DT_BLK)
780 const_eio (DT_REG)
781 const_eio (DT_LNK)
782 const_eio (DT_SOCK)
783 const_eio (DT_WHT)
784 };
785
786 aio_stash = gv_stashpv ("IO::AIO" , 1);
787 aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1);
788 aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1);
789
790 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
791 newCONSTSUB (aio_stash, (char *)civ->name, newSViv (civ->iv));
792
793 newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE));
794
526 create_respipe (); 795 create_respipe ();
527 796
528 if (eio_init (want_poll, done_poll) < 0) 797 if (eio_init (want_poll, done_poll) < 0)
529 croak ("IO::AIO: unable to initialise eio library"); 798 croak ("IO::AIO: unable to initialise eio library");
530 799
531 /* atfork child called in fifo order, so before eio's handler */ 800 /* atfork child called in fifo order, so before eio's handler */
532 X_THREAD_ATFORK (0, 0, atfork_child); 801 X_THREAD_ATFORK (0, 0, atfork_child);
533} 802}
534 803
535void 804void
536max_poll_reqs (int nreqs) 805max_poll_reqs (int nreqs)
537 PROTOTYPE: $ 806 PROTOTYPE: $
590 ALIAS: 859 ALIAS:
591 aio_fsync = EIO_FSYNC 860 aio_fsync = EIO_FSYNC
592 aio_fdatasync = EIO_FDATASYNC 861 aio_fdatasync = EIO_FDATASYNC
593 PPCODE: 862 PPCODE:
594{ 863{
864 int fd = s_fileno_croak (fh, 0);
595 dREQ; 865 dREQ;
596 866
597 req->type = ix; 867 req->type = ix;
598 req->sv1 = newSVsv (fh); 868 req->sv1 = newSVsv (fh);
599 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 869 req->int1 = fd;
600 870
601 REQ_SEND (req); 871 REQ_SEND (req);
602} 872}
603 873
604void 874void
605aio_sync_file_range (SV *fh, SV *offset, SV *nbytes, IV flags, SV *callback=&PL_sv_undef) 875aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef)
606 PROTOTYPE: $$$$;$ 876 PROTOTYPE: $$$$;$
607 PPCODE: 877 PPCODE:
608{ 878{
879 int fd = s_fileno_croak (fh, 0);
609 dREQ; 880 dREQ;
610 881
611 req->type = EIO_SYNC_FILE_RANGE; 882 req->type = EIO_SYNC_FILE_RANGE;
612 req->sv1 = newSVsv (fh); 883 req->sv1 = newSVsv (fh);
613 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 884 req->int1 = fd;
614 req->offs = SvVAL64 (offset); 885 req->offs = offset;
615 req->size = SvVAL64 (nbytes); 886 req->size = nbytes;
616 req->int2 = flags; 887 req->int2 = flags;
617 888
618 REQ_SEND (req); 889 REQ_SEND (req);
619} 890}
620 891
622aio_close (SV *fh, SV *callback=&PL_sv_undef) 893aio_close (SV *fh, SV *callback=&PL_sv_undef)
623 PROTOTYPE: $;$ 894 PROTOTYPE: $;$
624 PPCODE: 895 PPCODE:
625{ 896{
626 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 897 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
898 int fd = s_fileno_croak (fh, 0);
627 dREQ; 899 dREQ;
628 900
629 if (close_pipe < 0) 901 if (close_pipe < 0)
630 { 902 {
631 int pipefd [2]; 903 int pipefd [2];
639 } 911 }
640 912
641 req->type = EIO_DUP2; 913 req->type = EIO_DUP2;
642 req->int1 = close_pipe; 914 req->int1 = close_pipe;
643 req->sv2 = newSVsv (fh); 915 req->sv2 = newSVsv (fh);
644 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 916 req->int2 = fd;
645 917
646 REQ_SEND (req); 918 REQ_SEND (req);
647} 919}
648 920
649void 921void
653 aio_write = EIO_WRITE 925 aio_write = EIO_WRITE
654 PROTOTYPE: $$$$$;$ 926 PROTOTYPE: $$$$$;$
655 PPCODE: 927 PPCODE:
656{ 928{
657 STRLEN svlen; 929 STRLEN svlen;
930 int fd = s_fileno_croak (fh, ix == EIO_WRITE);
658 char *svptr = SvPVbyte (data, svlen); 931 char *svptr = SvPVbyte (data, svlen);
659 UV len = SvUV (length); 932 UV len = SvUV (length);
660 int fd;
661
662 if (SvTYPE (data) > SVt_PVMG)
663 croak ("illegal data argument '%s', must be plain scalar string", SvPV_nolen (data));
664
665 SvUPGRADE (data, SVt_PV);
666 SvPOK_only (data);
667 933
668 if (dataoffset < 0) 934 if (dataoffset < 0)
669 dataoffset += svlen; 935 dataoffset += svlen;
670 936
671 if (dataoffset < 0 || dataoffset > svlen) 937 if (dataoffset < 0 || dataoffset > svlen)
677 if (!SvOK (length) || len + dataoffset > svlen) 943 if (!SvOK (length) || len + dataoffset > svlen)
678 len = svlen - dataoffset; 944 len = svlen - dataoffset;
679 } 945 }
680 else 946 else
681 { 947 {
682 /* read: grow scalar as necessary */ 948 /* read: check type and grow scalar as necessary */
949 SvUPGRADE (data, SVt_PV);
683 svptr = SvGROW (data, len + dataoffset + 1); 950 svptr = SvGROW (data, len + dataoffset + 1);
684 } 951 }
685
686 if (len < 0)
687 croak ("length must not be negative");
688
689 fd = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh))
690 : IoOFP (sv_2io (fh)));
691
692 if (fd < 0)
693 croak ("illegal fh argument, either not an OS file or read/write mode mismatch");
694 952
695 { 953 {
696 dREQ; 954 dREQ;
697 955
698 req->type = ix; 956 req->type = ix;
728 986
729 REQ_SEND; 987 REQ_SEND;
730} 988}
731 989
732void 990void
733aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef) 991aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef)
734 PROTOTYPE: $$$$;$ 992 PROTOTYPE: $$$$;$
735 PPCODE: 993 PPCODE:
736{ 994{
995 int ifd = s_fileno_croak (in_fh , 0);
996 int ofd = s_fileno_croak (out_fh, 1);
737 dREQ; 997 dREQ;
738 998
739 req->type = EIO_SENDFILE; 999 req->type = EIO_SENDFILE;
740 req->sv1 = newSVsv (out_fh); 1000 req->sv1 = newSVsv (out_fh);
741 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1001 req->int1 = ofd;
742 req->sv2 = newSVsv (in_fh); 1002 req->sv2 = newSVsv (in_fh);
743 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1003 req->int2 = ifd;
744 req->offs = SvVAL64 (in_offset); 1004 req->offs = in_offset;
745 req->size = length; 1005 req->size = length;
746 1006
747 REQ_SEND; 1007 REQ_SEND;
748} 1008}
749 1009
750void 1010void
751aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef) 1011aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef)
752 PROTOTYPE: $$$;$ 1012 PROTOTYPE: $$$;$
753 PPCODE: 1013 PPCODE:
754{ 1014{
1015 int fd = s_fileno_croak (fh, 0);
755 dREQ; 1016 dREQ;
756 1017
757 req->type = EIO_READAHEAD; 1018 req->type = EIO_READAHEAD;
758 req->sv1 = newSVsv (fh); 1019 req->sv1 = newSVsv (fh);
759 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 1020 req->int1 = fd;
760 req->offs = SvVAL64 (offset); 1021 req->offs = offset;
761 req->size = length; 1022 req->size = length;
762 1023
763 REQ_SEND; 1024 REQ_SEND;
764} 1025}
765 1026
766void 1027void
767aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef) 1028aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef)
768 ALIAS: 1029 ALIAS:
769 aio_stat = EIO_STAT 1030 aio_stat = EIO_STAT
770 aio_lstat = EIO_LSTAT 1031 aio_lstat = EIO_LSTAT
1032 aio_statvfs = EIO_STATVFS
771 PPCODE: 1033 PPCODE:
772{ 1034{
773 dREQ; 1035 dREQ;
774 1036
775 req->sv1 = newSVsv (fh_or_path); 1037 req->sv1 = newSVsv (fh_or_path);
779 req->type = ix; 1041 req->type = ix;
780 req->ptr1 = SvPVbyte_nolen (req->sv1); 1042 req->ptr1 = SvPVbyte_nolen (req->sv1);
781 } 1043 }
782 else 1044 else
783 { 1045 {
784 req->type = EIO_FSTAT; 1046 req->type = ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT;
785 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1047 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
786 } 1048 }
787 1049
788 REQ_SEND; 1050 REQ_SEND;
789} 1051}
884 1146
885 REQ_SEND; 1147 REQ_SEND;
886} 1148}
887 1149
888void 1150void
1151aio_readdirx (SV8 *pathname, IV flags, SV *callback=&PL_sv_undef)
1152 PPCODE:
1153{
1154 dREQ;
1155
1156 req->type = EIO_READDIR;
1157 req->sv1 = newSVsv (pathname);
1158 req->ptr1 = SvPVbyte_nolen (req->sv1);
1159 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
1160
1161 if (flags & EIO_READDIR_DENTS)
1162 req->int1 |= EIO_READDIR_CUSTOM2;
1163
1164 REQ_SEND;
1165}
1166
1167void
889aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 1168aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
890 ALIAS: 1169 ALIAS:
891 aio_unlink = EIO_UNLINK 1170 aio_unlink = EIO_UNLINK
892 aio_rmdir = EIO_RMDIR 1171 aio_rmdir = EIO_RMDIR
893 aio_readdir = EIO_READDIR 1172 aio_readdir = EIO_READDIR
935 1214
936 REQ_SEND; 1215 REQ_SEND;
937} 1216}
938 1217
939void 1218void
1219aio_mtouch (SV8 *data, IV offset = 0, SV *length = &PL_sv_undef, int flags = 0, SV *callback=&PL_sv_undef)
1220 ALIAS:
1221 aio_mtouch = EIO_MTOUCH
1222 aio_msync = EIO_MSYNC
1223 PROTOTYPE: $$$$;$
1224 PPCODE:
1225{
1226 STRLEN svlen;
1227 UV len = SvUV (length);
1228 char *svptr = SvPVbyte (data, svlen);
1229
1230 if (offset < 0)
1231 offset += svlen;
1232
1233 if (offset < 0 || offset > svlen)
1234 croak ("offset outside of scalar");
1235
1236 if (!SvOK (length) || len + offset > svlen)
1237 len = svlen - offset;
1238
1239 {
1240 dREQ;
1241
1242 req->type = ix;
1243 req->size = len;
1244 req->sv2 = SvREFCNT_inc (data);
1245 req->ptr2 = (char *)svptr + offset;
1246 req->int1 = flags;
1247
1248 REQ_SEND;
1249 }
1250}
1251
1252void
940aio_busy (double delay, SV *callback=&PL_sv_undef) 1253aio_busy (double delay, SV *callback=&PL_sv_undef)
941 PPCODE: 1254 PPCODE:
942{ 1255{
943 dREQ; 1256 dREQ;
944 1257
956 dREQ; 1269 dREQ;
957 1270
958 req->type = EIO_GROUP; 1271 req->type = EIO_GROUP;
959 1272
960 req_submit (req); 1273 req_submit (req);
961 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1274 XPUSHs (req_sv (req, aio_grp_stash));
962} 1275}
963 1276
964void 1277void
965aio_nop (SV *callback=&PL_sv_undef) 1278aio_nop (SV *callback=&PL_sv_undef)
966 ALIAS: 1279 ALIAS:
1018 1331
1019int 1332int
1020poll_fileno() 1333poll_fileno()
1021 PROTOTYPE: 1334 PROTOTYPE:
1022 CODE: 1335 CODE:
1023 RETVAL = respipe [0]; 1336 RETVAL = s_epipe_fd (&respipe);
1024 OUTPUT: 1337 OUTPUT:
1025 RETVAL 1338 RETVAL
1026 1339
1027int 1340int
1028poll_cb(...) 1341poll_cb(...)
1068 CODE: 1381 CODE:
1069 RETVAL = eio_nthreads (); 1382 RETVAL = eio_nthreads ();
1070 OUTPUT: 1383 OUTPUT:
1071 RETVAL 1384 RETVAL
1072 1385
1386int
1387fadvise (aio_rfd fh, off_t offset, off_t length, IV advice)
1388 PROTOTYPE: $$$$
1389 CODE:
1390#if _XOPEN_SOURCE >= 600 && !NO_FADVISE
1391 RETVAL = posix_fadvise (fh, offset, length, advice);
1392#else
1393 RETVAL = errno = ENOSYS; /* yes, this is actually correct */
1394#endif
1395 OUTPUT:
1396 RETVAL
1397
1398ssize_t
1399sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
1400 PROTOTYPE: $$$$
1401 CODE:
1402 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count);
1403 OUTPUT:
1404 RETVAL
1405
1406void
1407mmap (SV *scalar, size_t length, int prot, int flags, SV *fh, off_t offset = 0)
1408 PROTOTYPE: $$$$$;$
1409 PPCODE:
1410 sv_unmagic (scalar, MMAP_MAGIC);
1411{
1412 int fd = SvOK (fh) ? s_fileno_croak (fh, flags & PROT_WRITE) : -1;
1413 void *addr = (void *)mmap (0, length, prot, flags, fd, offset);
1414 if (addr == (void *)-1)
1415 XSRETURN_NO;
1416
1417 sv_force_normal (scalar);
1418
1419 /* we store the length in mg_obj, as namlen is I32 :/ */
1420 sv_magicext (scalar, 0, MMAP_MAGIC, &mmap_vtbl, (char *)addr, 0)
1421 ->mg_obj = (SV *)length;
1422
1423 SvUPGRADE (scalar, SVt_PV); /* nop... */
1424
1425 if (!(prot & PROT_WRITE))
1426 SvREADONLY_on (scalar);
1427
1428 if (SvLEN (scalar))
1429 Safefree (SvPVX (scalar));
1430
1431 SvPVX (scalar) = (char *)addr;
1432 SvCUR_set (scalar, length);
1433 SvLEN_set (scalar, 0);
1434 SvPOK_only (scalar);
1435
1436 XSRETURN_YES;
1437}
1438
1439void
1440munmap (SV *scalar)
1441 PROTOTYPE: $
1442 CODE:
1443 sv_unmagic (scalar, MMAP_MAGIC);
1444
1445int
1446madvise (SV *scalar, off_t offset, off_t length, IV advice)
1447 PROTOTYPE: $$$$
1448 CODE:
1449{
1450 char *addr = SvPV_nolen (scalar) + offset;
1451
1452 if (!SvOK (ST (2)))
1453 length = SvCUR (scalar) - offset;
1454
1455 if (addr >= SvEND (scalar) || length <= 0)
1456 XSRETURN_EMPTY;
1457
1458 #if _XOPEN_SOURCE >= 600 && !NO_MADVISE
1459 RETVAL = posix_madvise (addr, length, advice);
1460 #else
1461 RETVAL = errno = ENOSYS; /* yes, this is actually correct */
1462 #endif
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
1073void _on_next_submit (SV *cb) 1497void _on_next_submit (SV *cb)
1074 CODE: 1498 CODE:
1075 SvREFCNT_dec (on_next_submit); 1499 SvREFCNT_dec (on_next_submit);
1076 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1500 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1077 1501
1091 if (GIMME_V != G_VOID) 1515 if (GIMME_V != G_VOID)
1092 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);
1093 1517
1094 if (items > 1) 1518 if (items > 1)
1095 { 1519 {
1096 SV *cb_cv = get_cb (callback); 1520 SV *cb_cv =get_cb (callback);
1097 1521
1098 SvREFCNT_dec (req->callback); 1522 SvREFCNT_dec (req->callback);
1099 req->callback = SvREFCNT_inc (cb_cv); 1523 req->callback = SvREFCNT_inc (cb_cv);
1100 } 1524 }
1101} 1525}
1138 AV *av; 1562 AV *av;
1139 1563
1140 grp->errorno = errno; 1564 grp->errorno = errno;
1141 1565
1142 av = newAV (); 1566 av = newAV ();
1567 av_extend (av, items - 1);
1143 1568
1144 for (i = 1; i < items; ++i ) 1569 for (i = 1; i < items; ++i )
1145 av_push (av, newSVsv (ST (i))); 1570 av_push (av, newSVsv (ST (i)));
1146 1571
1147 SvREFCNT_dec (grp->sv1); 1572 SvREFCNT_dec (grp->sv1);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines