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.124 by root, Thu May 29 03:20:40 2008 UTC vs.
Revision 1.168 by root, Wed Aug 4 14:02:58 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
65# include <signal.h> 72# include <signal.h>
66# define EIO_STRUCT_DIRENT struct dirent 73# define EIO_STRUCT_DIRENT struct dirent
67 74
68#endif 75#endif
69 76
77/* perl stupidly overrides readdir and maybe others */
78/* with thread-unsafe versions, imagine that :( */
79#undef readdir
80#undef opendir
81#undef closedir
82
70#define EIO_STRUCT_STAT Stat_t 83#define EIO_STRUCT_STAT Stat_t
71 84
72/* use NV for 32 bit perls as it allows larger offsets */ 85/* use NV for 32 bit perls as it allows larger offsets */
73#if IVSIZE >= 8 86#if IVSIZE >= 8
87# define VAL64 IV
74# define SvVAL64 SvIV 88# define SvVAL64 SvIV
89# define newSVval64 newSViv
75#else 90#else
91# define VAL64 NV
76# define SvVAL64 SvNV 92# define SvVAL64 SvNV
93# define newSVval64 newSVnv
77#endif 94#endif
78 95
79static HV *stash; 96/*****************************************************************************/
97
98#if __GNUC__ >= 3
99# define expect(expr,value) __builtin_expect ((expr),(value))
100#else
101# define expect(expr,value) (expr)
102#endif
103
104#define expect_false(expr) expect ((expr) != 0, 0)
105#define expect_true(expr) expect ((expr) != 0, 1)
106
107/*****************************************************************************/
108
80typedef 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 */
81 112
82#define AIO_REQ_KLASS "IO::AIO::REQ" 113static HV *aio_stash, *aio_req_stash, *aio_grp_stash;
83#define AIO_GRP_KLASS "IO::AIO::GRP"
84 114
85#define EIO_REQ_MEMBERS \ 115#define EIO_REQ_MEMBERS \
86 SV *callback; \ 116 SV *callback; \
87 SV *sv1, *sv2; \ 117 SV *sv1, *sv2; \
88 STRLEN stroffset; \ 118 STRLEN stroffset; \
90 120
91#define EIO_NO_WRAPPERS 1 121#define EIO_NO_WRAPPERS 1
92 122
93#include "libeio/eio.h" 123#include "libeio/eio.h"
94 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 ST_NODEV
146# define ST_NODEV 0
147#endif
148#ifndef ST_NOEXEC
149# define ST_NOEXEC 0
150#endif
151#ifndef ST_SYNCHRONOUS
152# define ST_SYNCHRONOUS 0
153#endif
154#ifndef ST_MANDLOCK
155# define ST_MANDLOCK 0
156#endif
157#ifndef ST_WRITE
158# define ST_WRITE 0
159#endif
160#ifndef ST_APPEND
161# define ST_APPEND 0
162#endif
163#ifndef ST_IMMUTABLE
164# define ST_IMMUTABLE 0
165#endif
166#ifndef ST_NOATIME
167# define ST_NOATIME 0
168#endif
169#ifndef ST_NODIRATIME
170# define ST_NODIRATIME 0
171#endif
172#ifndef ST_RELATIME
173# define ST_RELATIME 0
174#endif
175
176#ifndef MCL_CURRENT
177# define MCL_CURRENT 0
178#endif
179#ifndef MCL_FUTURE
180# define MCL_FUTURE 0
181#endif
182
183#ifndef MAP_ANONYMOUS
184# ifdef MAP_ANON
185# define MAP_ANONYMOUS MAP_ANON
186# else
187# define MAP_ANONYMOUS MAP_FIXED /* and hope this fails */
188# endif
189#endif
190#ifndef MAP_HUGETLB
191# define MAP_HUGETLB 0
192#endif
193#ifndef MAP_LOCKED
194# define MAP_LOCKED 0
195#endif
196#ifndef MAP_NORESERVE
197# define MAP_NORESERVE 0
198#endif
199#ifndef MAP_POPULATE
200# define MAP_POPULATE 0
201#endif
202#ifndef MAP_NONBLOCK
203# define MAP_NONBLOCK 0
204#endif
205
206#ifndef PAGESIZE
207# define PAGESIZE sysconf (_SC_PAGESIZE)
208#endif
209
95static int req_invoke (eio_req *req); 210static int req_invoke (eio_req *req);
96#define EIO_FINISH(req) req_invoke (req) 211#define EIO_FINISH(req) req_invoke (req)
97static void aio_grp_feed (eio_req *grp);
98#define EIO_FEED(req) aio_grp_feed (req)
99static void req_destroy (eio_req *grp); 212static void req_destroy (eio_req *grp);
100#define EIO_DESTROY(req) req_destroy (req) 213#define EIO_DESTROY(req) req_destroy (req)
101 214
102enum { 215enum {
103 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ 216 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
110 223
111static SV *on_next_submit; 224static SV *on_next_submit;
112static int next_pri = EIO_PRI_DEFAULT; 225static int next_pri = EIO_PRI_DEFAULT;
113static int max_outstanding; 226static int max_outstanding;
114 227
115static int respipe_osf [2], respipe [2] = { -1, -1 }; 228static s_epipe respipe;
116 229
117static void req_destroy (aio_req req); 230static void req_destroy (aio_req req);
118static void req_cancel (aio_req req); 231static void req_cancel (aio_req req);
119 232
120static void want_poll (void) 233static void want_poll (void)
121{ 234{
122 /* write a dummy byte to the pipe so fh becomes ready */ 235 /* write a dummy byte to the pipe so fh becomes ready */
123 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1); 236 s_epipe_signal (&respipe);
124} 237}
125 238
126static void done_poll (void) 239static void done_poll (void)
127{ 240{
128 /* read any signals sent by the worker threads */ 241 /* read any signals sent by the worker threads */
129 char buf [4]; 242 s_epipe_drain (&respipe);
130 while (respipe_read (respipe [0], buf, 4) == 4)
131 ;
132} 243}
133 244
134/* must be called at most once */ 245/* must be called at most once */
135static SV *req_sv (aio_req req, const char *klass) 246static SV *req_sv (aio_req req, HV *stash)
136{ 247{
137 if (!req->self) 248 if (!req->self)
138 { 249 {
139 req->self = (SV *)newHV (); 250 req->self = (SV *)newHV ();
140 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0); 251 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
141 } 252 }
142 253
143 return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1))); 254 return sv_2mortal (sv_bless (newRV_inc (req->self), stash));
144} 255}
145 256
146static aio_req SvAIO_REQ (SV *sv) 257static aio_req SvAIO_REQ (SV *sv)
147{ 258{
148 MAGIC *mg; 259 MAGIC *mg;
149 260
150 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv)) 261 if (!SvROK (sv)
262 || (SvSTASH (SvRV (sv)) != aio_grp_stash
263 && SvSTASH (SvRV (sv)) != aio_req_stash
264 && !sv_derived_from (sv, "IO::AIO::REQ")))
151 croak ("object of class " AIO_REQ_KLASS " expected"); 265 croak ("object of class IO::AIO::REQ expected");
152 266
153 mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 267 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
154 268
155 return mg ? (aio_req)mg->mg_ptr : 0; 269 return mg ? (aio_req)mg->mg_ptr : 0;
156} 270}
162 dSP; 276 dSP;
163 277
164 ENTER; 278 ENTER;
165 SAVETMPS; 279 SAVETMPS;
166 PUSHMARK (SP); 280 PUSHMARK (SP);
167 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 281 XPUSHs (req_sv (grp, aio_grp_stash));
168 PUTBACK; 282 PUTBACK;
169 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR); 283 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
170 SPAGAIN; 284 SPAGAIN;
171 FREETMPS; 285 FREETMPS;
172 LEAVE; 286 LEAVE;
175 289
176static void req_submit (eio_req *req) 290static void req_submit (eio_req *req)
177{ 291{
178 eio_submit (req); 292 eio_submit (req);
179 293
180 if (on_next_submit) 294 if (expect_false (on_next_submit))
181 { 295 {
182 dSP; 296 dSP;
183 SV *cb = sv_2mortal (on_next_submit); 297 SV *cb = sv_2mortal (on_next_submit);
184 298
185 on_next_submit = 0; 299 on_next_submit = 0;
190 } 304 }
191} 305}
192 306
193static int req_invoke (eio_req *req) 307static int req_invoke (eio_req *req)
194{ 308{
195 dSP;
196
197 if (req->flags & FLAG_SV2_RO_OFF) 309 if (req->flags & FLAG_SV2_RO_OFF)
198 SvREADONLY_off (req->sv2); 310 SvREADONLY_off (req->sv2);
199 311
200 if (!EIO_CANCELLED (req) && SvOK (req->callback)) 312 if (!EIO_CANCELLED (req) && req->callback)
201 { 313 {
314 dSP;
315 static SV *sv_result_cache; /* caches the result integer SV */
316 SV *sv_result;
317
202 ENTER; 318 ENTER;
203 SAVETMPS; 319 SAVETMPS;
204 PUSHMARK (SP); 320 PUSHMARK (SP);
205 EXTEND (SP, 1); 321 EXTEND (SP, 1);
322
323 /* do not recreate the result IV from scratch each time */
324 if (expect_true (sv_result_cache))
325 {
326 sv_result = sv_result_cache; sv_result_cache = 0;
327 SvIV_set (sv_result, req->result);
328 }
329 else
330 {
331 sv_result = newSViv (req->result);
332 SvREADONLY_on (sv_result);
333 }
206 334
207 switch (req->type) 335 switch (req->type)
208 { 336 {
209 case EIO_READDIR: 337 case EIO_READDIR:
210 { 338 {
211 SV *rv = &PL_sv_undef; 339 SV *rv = &PL_sv_undef;
212 340
213 if (req->result >= 0) 341 if (req->result >= 0)
214 { 342 {
215 int i; 343 int i;
216 char *buf = req->ptr2; 344 char *names = (char *)req->ptr2;
345 eio_dirent *ent = (eio_dirent *)req->ptr1; /* might be 0 */
217 AV *av = newAV (); 346 AV *av = newAV ();
218 347
219 av_extend (av, req->result - 1); 348 av_extend (av, req->result - 1);
220 349
221 for (i = 0; i < req->result; ++i) 350 for (i = 0; i < req->result; ++i)
222 { 351 {
223 SV *sv = newSVpv (buf, 0); 352 if (req->int1 & EIO_READDIR_DENTS)
353 {
354 SV *namesv = newSVpvn (names + ent->nameofs, ent->namelen);
224 355
356 if (req->int1 & EIO_READDIR_CUSTOM2)
357 {
358 static SV *sv_type [EIO_DT_MAX + 1]; /* type sv cache */
359 AV *avent = newAV ();
360
361 av_extend (avent, 2);
362
363 if (!sv_type [ent->type])
364 {
365 sv_type [ent->type] = newSViv (ent->type);
366 SvREADONLY_on (sv_type [ent->type]);
367 }
368
369 av_store (avent, 0, namesv);
370 av_store (avent, 1, SvREFCNT_inc (sv_type [ent->type]));
371 av_store (avent, 2, IVSIZE >= 8 ? newSVuv (ent->inode) : newSVnv (ent->inode));
372
373 av_store (av, i, newRV_noinc ((SV *)avent));
374 }
375 else
225 av_store (av, i, sv); 376 av_store (av, i, namesv);
377
378 ++ent;
379 }
380 else
381 {
382 SV *name = newSVpv (names, 0);
383 av_store (av, i, name);
226 buf += SvCUR (sv) + 1; 384 names += SvCUR (name) + 1;
385 }
227 } 386 }
228 387
229 rv = sv_2mortal (newRV_noinc ((SV *)av)); 388 rv = sv_2mortal (newRV_noinc ((SV *)av));
230 } 389 }
231 390
232 PUSHs (rv); 391 PUSHs (rv);
392
393 if (req->int1 & EIO_READDIR_CUSTOM1)
394 XPUSHs (sv_2mortal (newSViv (req->int1 & ~(EIO_READDIR_CUSTOM1 | EIO_READDIR_CUSTOM2))));
233 } 395 }
234 break; 396 break;
235 397
236 case EIO_OPEN: 398 case EIO_OPEN:
237 { 399 {
243 GV *gv = (GV *)sv_newmortal (); 405 GV *gv = (GV *)sv_newmortal ();
244 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR); 406 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
245 char sym [64]; 407 char sym [64];
246 int symlen; 408 int symlen;
247 409
248 symlen = snprintf (sym, sizeof (sym), "fd#%d", req->result); 410 symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
249 gv_init (gv, stash, sym, symlen, 0); 411 gv_init (gv, aio_stash, sym, symlen, 0);
250 412
251 symlen = snprintf ( 413 symlen = snprintf (
252 sym, 414 sym,
253 sizeof (sym), 415 sizeof (sym),
254 "%s&=%d", 416 "%s&=%d",
255 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<", 417 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
256 req->result 418 (int)req->result
257 ); 419 );
258 420
259 if (do_open (gv, sym, symlen, 0, 0, 0, 0)) 421 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
260 fh = (SV *)gv; 422 fh = (SV *)gv;
261 } 423 }
262 424
263 PUSHs (fh); 425 PUSHs (fh);
264 } 426 }
427 break;
428
429 case EIO_STATVFS:
430 case EIO_FSTATVFS:
431 {
432 SV *rv = &PL_sv_undef;
433
434 if (req->result >= 0)
435 {
436 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req);
437 HV *hv = newHV ();
438
439 rv = sv_2mortal (newRV_noinc ((SV *)hv));
440
441 hv_store (hv, "bsize" , sizeof ("bsize" ) - 1, newSVval64 (f->f_bsize ), 0);
442 hv_store (hv, "frsize" , sizeof ("frsize" ) - 1, newSVval64 (f->f_frsize ), 0);
443 hv_store (hv, "blocks" , sizeof ("blocks" ) - 1, newSVval64 (f->f_blocks ), 0);
444 hv_store (hv, "bfree" , sizeof ("bfree" ) - 1, newSVval64 (f->f_bfree ), 0);
445 hv_store (hv, "bavail" , sizeof ("bavail" ) - 1, newSVval64 (f->f_bavail ), 0);
446 hv_store (hv, "files" , sizeof ("files" ) - 1, newSVval64 (f->f_files ), 0);
447 hv_store (hv, "ffree" , sizeof ("ffree" ) - 1, newSVval64 (f->f_ffree ), 0);
448 hv_store (hv, "favail" , sizeof ("favail" ) - 1, newSVval64 (f->f_favail ), 0);
449 hv_store (hv, "fsid" , sizeof ("fsid" ) - 1, newSVval64 (f->f_fsid ), 0);
450 hv_store (hv, "flag" , sizeof ("flag" ) - 1, newSVval64 (f->f_flag ), 0);
451 hv_store (hv, "namemax", sizeof ("namemax") - 1, newSVval64 (f->f_namemax), 0);
452 }
453
454 PUSHs (rv);
455 }
456
265 break; 457 break;
266 458
267 case EIO_GROUP: 459 case EIO_GROUP:
268 req->int1 = 2; /* mark group as finished */ 460 req->int1 = 2; /* mark group as finished */
269 461
291 case EIO_LSTAT: 483 case EIO_LSTAT:
292 case EIO_FSTAT: 484 case EIO_FSTAT:
293 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT; 485 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT;
294 PL_laststatval = req->result; 486 PL_laststatval = req->result;
295 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 487 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
296 PUSHs (sv_2mortal (newSViv (req->result))); 488 PUSHs (sv_result);
297 break; 489 break;
298 490
299 case EIO_READ: 491 case EIO_READ:
492 {
300 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0)); 493 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
301 *SvEND (req->sv2) = 0; 494 *SvEND (req->sv2) = 0;
302 PUSHs (sv_2mortal (newSViv (req->result))); 495 SvPOK_only (req->sv2);
496 SvSETMAGIC (req->sv2);
497 PUSHs (sv_result);
498 }
303 break; 499 break;
304 500
305 case EIO_DUP2: 501 case EIO_DUP2: /* EIO_DUP2 actually means aio_close(), su fudge result value */
306 if (req->result > 0) 502 if (req->result > 0)
307 req->result = 0; 503 SvIV_set (sv_result, 0);
308 /* FALLTHROUGH */ 504 /* FALLTHROUGH */
309 505
310 default: 506 default:
311 PUSHs (sv_2mortal (newSViv (req->result))); 507 PUSHs (sv_result);
312 break; 508 break;
313 } 509 }
314 510
315 errno = req->errorno; 511 errno = req->errorno;
316 512
317 PUTBACK; 513 PUTBACK;
318 call_sv (req->callback, G_VOID | G_EVAL | G_DISCARD); 514 call_sv (req->callback, G_VOID | G_EVAL | G_DISCARD);
319 SPAGAIN; 515 SPAGAIN;
516
517 if (expect_false (SvREFCNT (sv_result) != 1 || sv_result_cache))
518 SvREFCNT_dec (sv_result);
519 else
520 sv_result_cache = sv_result;
320 521
321 FREETMPS; 522 FREETMPS;
322 LEAVE; 523 LEAVE;
323 524
324 PUTBACK; 525 PUTBACK;
353 grp->sv2 = 0; 554 grp->sv2 = 0;
354 555
355 eio_grp_cancel (grp); 556 eio_grp_cancel (grp);
356} 557}
357 558
358#ifdef USE_SOCKETS_AS_HANDLES
359# define TO_SOCKET(x) (win32_get_osfhandle (x))
360#else
361# define TO_SOCKET(x) (x)
362#endif
363
364static void 559static void
365create_respipe (void) 560create_respipe (void)
366{ 561{
367 int old_readfd = respipe [0];
368
369 if (respipe [1] >= 0)
370 respipe_close (TO_SOCKET (respipe [1]));
371
372#ifdef _WIN32
373 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe))
374#else
375 if (pipe (respipe)) 562 if (s_epipe_renew (&respipe))
376#endif
377 croak ("unable to initialize result pipe"); 563 croak ("IO::AIO: unable to initialize result pipe");
378
379 if (old_readfd >= 0)
380 {
381 if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0)
382 croak ("unable to initialize result pipe(2)");
383
384 respipe_close (respipe [0]);
385 respipe [0] = old_readfd;
386 }
387
388#ifdef _WIN32
389 int arg = 1;
390 if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg)
391 || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg))
392#else
393 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
394 || fcntl (respipe [1], F_SETFL, O_NONBLOCK))
395#endif
396 croak ("unable to initialize result pipe(3)");
397
398 respipe_osf [0] = TO_SOCKET (respipe [0]);
399 respipe_osf [1] = TO_SOCKET (respipe [1]);
400} 564}
401 565
402static void poll_wait (void) 566static void poll_wait (void)
403{ 567{
404 fd_set rfd;
405
406 while (eio_nreqs ()) 568 while (eio_nreqs ())
407 { 569 {
408 int size; 570 int size;
409 571
410 X_LOCK (reslock); 572 X_LOCK (reslock);
414 if (size) 576 if (size)
415 return; 577 return;
416 578
417 etp_maybe_start_thread (); 579 etp_maybe_start_thread ();
418 580
419 FD_ZERO (&rfd); 581 s_epipe_wait (&respipe);
420 FD_SET (respipe [0], &rfd);
421
422 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
423 } 582 }
424} 583}
425 584
426static int poll_cb (void) 585static int poll_cb (void)
427{ 586{
442static void atfork_child (void) 601static void atfork_child (void)
443{ 602{
444 create_respipe (); 603 create_respipe ();
445} 604}
446 605
606/*****************************************************************************/
607
608#if !_POSIX_MAPPED_FILES
609# define mmap(addr,length,prot,flags,fd,offs) (errno = ENOSYS, -1)
610# define munmap(addr,length) (errno = ENOSYS, -1)
611#endif
612
613#define MMAP_MAGIC PERL_MAGIC_ext
614
615static int
616mmap_free (pTHX_ SV *sv, MAGIC *mg)
617{
618 int old_errno = errno;
619 munmap (mg->mg_ptr, (size_t)mg->mg_obj);
620 errno = old_errno;
621
622 mg->mg_obj = 0; /* just in case */
623
624 SvREADONLY_off (sv);
625
626 if (SvPVX (sv) != mg->mg_ptr)
627 croak ("ERROR: IO::AIO::mmap-mapped scalar changed location, detected");
628
629 SvCUR_set (sv, 0);
630 SvPVX (sv) = 0;
631 SvOK_off (sv);
632
633 return 0;
634}
635
636static MGVTBL mmap_vtbl = {
637 0, 0, 0, 0, mmap_free
638};
639
640/*****************************************************************************/
641
642static SV *
643get_cb (SV *cb_sv)
644{
645 SvGETMAGIC (cb_sv);
646 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
647}
648
447#define dREQ \ 649#define dREQ \
650 SV *cb_cv; \
448 aio_req req; \ 651 aio_req req; \
449 int req_pri = next_pri; \ 652 int req_pri = next_pri; \
450 next_pri = EIO_PRI_DEFAULT; \ 653 next_pri = EIO_PRI_DEFAULT; \
451 \ 654 \
452 if (SvOK (callback) && !SvROK (callback)) \ 655 cb_cv = get_cb (callback); \
453 croak ("callback must be undef or of reference type"); \
454 \ 656 \
455 Newz (0, req, 1, eio_req); \ 657 Newz (0, req, 1, eio_req); \
456 if (!req) \ 658 if (!req) \
457 croak ("out of memory during eio_req allocation"); \ 659 croak ("out of memory during eio_req allocation"); \
458 \ 660 \
459 req->callback = newSVsv (callback); \ 661 req->callback = SvREFCNT_inc (cb_cv); \
460 req->pri = req_pri 662 req->pri = req_pri
461 663
462#define REQ_SEND \ 664#define REQ_SEND \
665 PUTBACK; \
463 req_submit (req); \ 666 req_submit (req); \
667 SPAGAIN; \
464 \ 668 \
465 if (GIMME_V != G_VOID) \ 669 if (GIMME_V != G_VOID) \
466 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 670 XPUSHs (req_sv (req, aio_req_stash));
467 671
468MODULE = IO::AIO PACKAGE = IO::AIO 672MODULE = IO::AIO PACKAGE = IO::AIO
469 673
470PROTOTYPES: ENABLE 674PROTOTYPES: ENABLE
471 675
472BOOT: 676BOOT:
473{ 677{
474 stash = gv_stashpv ("IO::AIO", 1); 678 static const struct {
475 679 const char *name;
476 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 680 IV iv;
477 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 681 } *civ, const_iv[] = {
478 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 682# define const_niv(name, value) { # name, (IV) value },
479 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 683# define const_iv(name) { # name, (IV) name },
480 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 684# define const_eio(name) { # name, (IV) EIO_ ## name },
685 const_iv (EXDEV)
686 const_iv (ENOSYS)
687 const_iv (O_RDONLY)
688 const_iv (O_WRONLY)
689 const_iv (O_RDWR)
690 const_iv (O_CREAT)
691 const_iv (O_TRUNC)
692 const_iv (O_EXCL)
693 const_iv (O_APPEND)
481#ifndef _WIN32 694#ifndef _WIN32
482 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 695 const_iv (S_IFIFO)
483#endif 696#endif
697 const_niv (FADV_NORMAL , POSIX_FADV_NORMAL)
698 const_niv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL)
699 const_niv (FADV_RANDOM , POSIX_FADV_RANDOM)
700 const_niv (FADV_NOREUSE , POSIX_FADV_NOREUSE)
701 const_niv (FADV_WILLNEED , POSIX_FADV_WILLNEED)
702 const_niv (FADV_DONTNEED , POSIX_FADV_DONTNEED)
484 703
704 const_iv (ST_RDONLY)
705 const_iv (ST_NOSUID)
706 const_iv (ST_NODEV)
707 const_iv (ST_NOEXEC)
708 const_iv (ST_SYNCHRONOUS)
709 const_iv (ST_MANDLOCK)
710 const_iv (ST_WRITE)
711 const_iv (ST_APPEND)
712 const_iv (ST_IMMUTABLE)
713 const_iv (ST_NOATIME)
714 const_iv (ST_NODIRATIME)
715 const_iv (ST_RELATIME)
716
717 const_iv (PROT_EXEC)
718 const_iv (PROT_NONE)
719 const_iv (PROT_READ)
720 const_iv (PROT_WRITE)
721
722 /*const_iv (MAP_FIXED)*/
723 const_iv (MAP_PRIVATE)
724 const_iv (MAP_SHARED)
725 const_iv (MAP_ANONYMOUS)
726
727 /* linuxish */
728 const_iv (MAP_HUGETLB)
729 const_iv (MAP_LOCKED)
730 const_iv (MAP_NORESERVE)
731 const_iv (MAP_POPULATE)
732 const_iv (MAP_NONBLOCK)
733
734 const_iv (MCL_FUTURE)
735 const_iv (MCL_CURRENT)
736
737 const_eio (MS_ASYNC)
738 const_eio (MS_INVALIDATE)
739 const_eio (MS_SYNC)
740
741 const_eio (MT_MODIFY)
742
743 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
744 const_eio (SYNC_FILE_RANGE_WRITE)
745 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
746
747 const_eio (READDIR_DENTS)
748 const_eio (READDIR_DIRS_FIRST)
749 const_eio (READDIR_STAT_ORDER)
750 const_eio (READDIR_FOUND_UNKNOWN)
751
752 const_eio (DT_UNKNOWN)
753 const_eio (DT_FIFO)
754 const_eio (DT_CHR)
755 const_eio (DT_DIR)
756 const_eio (DT_BLK)
757 const_eio (DT_REG)
758 const_eio (DT_LNK)
759 const_eio (DT_SOCK)
760 const_eio (DT_WHT)
761 };
762
763 aio_stash = gv_stashpv ("IO::AIO" , 1);
764 aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1);
765 aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1);
766
767 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
768 newCONSTSUB (aio_stash, (char *)civ->name, newSViv (civ->iv));
769
770 newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE));
771
485 create_respipe (); 772 create_respipe ();
486 773
487 if (eio_init (want_poll, done_poll) < 0) 774 if (eio_init (want_poll, done_poll) < 0)
488 croak ("IO::AIO: unable to initialise eio library"); 775 croak ("IO::AIO: unable to initialise eio library");
489 776
490 /* atfork child called in fifo order, so before eio's handler */ 777 /* atfork child called in fifo order, so before eio's handler */
491 X_THREAD_ATFORK (0, 0, atfork_child); 778 X_THREAD_ATFORK (0, 0, atfork_child);
492} 779}
493 780
494void 781void
495max_poll_reqs (int nreqs) 782max_poll_reqs (int nreqs)
496 PROTOTYPE: $ 783 PROTOTYPE: $
549 ALIAS: 836 ALIAS:
550 aio_fsync = EIO_FSYNC 837 aio_fsync = EIO_FSYNC
551 aio_fdatasync = EIO_FDATASYNC 838 aio_fdatasync = EIO_FDATASYNC
552 PPCODE: 839 PPCODE:
553{ 840{
841 int fd = s_fileno_croak (fh, 0);
554 dREQ; 842 dREQ;
555 843
556 req->type = ix; 844 req->type = ix;
557 req->sv1 = newSVsv (fh); 845 req->sv1 = newSVsv (fh);
558 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 846 req->int1 = fd;
847
848 REQ_SEND (req);
849}
850
851void
852aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef)
853 PROTOTYPE: $$$$;$
854 PPCODE:
855{
856 int fd = s_fileno_croak (fh, 0);
857 dREQ;
858
859 req->type = EIO_SYNC_FILE_RANGE;
860 req->sv1 = newSVsv (fh);
861 req->int1 = fd;
862 req->offs = offset;
863 req->size = nbytes;
864 req->int2 = flags;
559 865
560 REQ_SEND (req); 866 REQ_SEND (req);
561} 867}
562 868
563void 869void
564aio_close (SV *fh, SV *callback=&PL_sv_undef) 870aio_close (SV *fh, SV *callback=&PL_sv_undef)
565 PROTOTYPE: $;$ 871 PROTOTYPE: $;$
566 PPCODE: 872 PPCODE:
567{ 873{
568 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 874 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
875 int fd = s_fileno_croak (fh, 0);
569 dREQ; 876 dREQ;
570 877
571 if (close_pipe < 0) 878 if (close_pipe < 0)
572 { 879 {
573 int pipefd [2]; 880 int pipefd [2];
581 } 888 }
582 889
583 req->type = EIO_DUP2; 890 req->type = EIO_DUP2;
584 req->int1 = close_pipe; 891 req->int1 = close_pipe;
585 req->sv2 = newSVsv (fh); 892 req->sv2 = newSVsv (fh);
586 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 893 req->int2 = fd;
587 894
588 REQ_SEND (req); 895 REQ_SEND (req);
589} 896}
590 897
591void 898void
595 aio_write = EIO_WRITE 902 aio_write = EIO_WRITE
596 PROTOTYPE: $$$$$;$ 903 PROTOTYPE: $$$$$;$
597 PPCODE: 904 PPCODE:
598{ 905{
599 STRLEN svlen; 906 STRLEN svlen;
907 int fd = s_fileno_croak (fh, ix == EIO_WRITE);
600 char *svptr = SvPVbyte (data, svlen); 908 char *svptr = SvPVbyte (data, svlen);
601 UV len = SvUV (length); 909 UV len = SvUV (length);
602
603 SvUPGRADE (data, SVt_PV);
604 SvPOK_on (data);
605 910
606 if (dataoffset < 0) 911 if (dataoffset < 0)
607 dataoffset += svlen; 912 dataoffset += svlen;
608 913
609 if (dataoffset < 0 || dataoffset > svlen) 914 if (dataoffset < 0 || dataoffset > svlen)
615 if (!SvOK (length) || len + dataoffset > svlen) 920 if (!SvOK (length) || len + dataoffset > svlen)
616 len = svlen - dataoffset; 921 len = svlen - dataoffset;
617 } 922 }
618 else 923 else
619 { 924 {
620 /* read: grow scalar as necessary */ 925 /* read: check type and grow scalar as necessary */
926 SvUPGRADE (data, SVt_PV);
621 svptr = SvGROW (data, len + dataoffset + 1); 927 svptr = SvGROW (data, len + dataoffset + 1);
622 } 928 }
623 929
624 if (len < 0)
625 croak ("length must not be negative");
626
627 { 930 {
628 dREQ; 931 dREQ;
629 932
630 req->type = ix; 933 req->type = ix;
631 req->sv1 = newSVsv (fh); 934 req->sv1 = newSVsv (fh);
632 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 935 req->int1 = fd;
633 : IoOFP (sv_2io (fh)));
634 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 936 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
635 req->size = len; 937 req->size = len;
636 req->sv2 = SvREFCNT_inc (data); 938 req->sv2 = SvREFCNT_inc (data);
637 req->ptr2 = (char *)svptr + dataoffset; 939 req->ptr2 = (char *)svptr + dataoffset;
638 req->stroffset = dataoffset; 940 req->stroffset = dataoffset;
661 963
662 REQ_SEND; 964 REQ_SEND;
663} 965}
664 966
665void 967void
666aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef) 968aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef)
667 PROTOTYPE: $$$$;$ 969 PROTOTYPE: $$$$;$
668 PPCODE: 970 PPCODE:
669{ 971{
972 int ifd = s_fileno_croak (in_fh , 0);
973 int ofd = s_fileno_croak (out_fh, 1);
670 dREQ; 974 dREQ;
671 975
672 req->type = EIO_SENDFILE; 976 req->type = EIO_SENDFILE;
673 req->sv1 = newSVsv (out_fh); 977 req->sv1 = newSVsv (out_fh);
674 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 978 req->int1 = ofd;
675 req->sv2 = newSVsv (in_fh); 979 req->sv2 = newSVsv (in_fh);
676 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 980 req->int2 = ifd;
677 req->offs = SvVAL64 (in_offset); 981 req->offs = in_offset;
678 req->size = length; 982 req->size = length;
679 983
680 REQ_SEND; 984 REQ_SEND;
681} 985}
682 986
683void 987void
684aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef) 988aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef)
685 PROTOTYPE: $$$;$ 989 PROTOTYPE: $$$;$
686 PPCODE: 990 PPCODE:
687{ 991{
992 int fd = s_fileno_croak (fh, 0);
688 dREQ; 993 dREQ;
689 994
690 req->type = EIO_READAHEAD; 995 req->type = EIO_READAHEAD;
691 req->sv1 = newSVsv (fh); 996 req->sv1 = newSVsv (fh);
692 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 997 req->int1 = fd;
693 req->offs = SvVAL64 (offset); 998 req->offs = offset;
694 req->size = length; 999 req->size = length;
695 1000
696 REQ_SEND; 1001 REQ_SEND;
697} 1002}
698 1003
699void 1004void
700aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef) 1005aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef)
701 ALIAS: 1006 ALIAS:
702 aio_stat = EIO_STAT 1007 aio_stat = EIO_STAT
703 aio_lstat = EIO_LSTAT 1008 aio_lstat = EIO_LSTAT
1009 aio_statvfs = EIO_STATVFS
704 PPCODE: 1010 PPCODE:
705{ 1011{
706 dREQ; 1012 dREQ;
707 1013
708 req->sv1 = newSVsv (fh_or_path); 1014 req->sv1 = newSVsv (fh_or_path);
712 req->type = ix; 1018 req->type = ix;
713 req->ptr1 = SvPVbyte_nolen (req->sv1); 1019 req->ptr1 = SvPVbyte_nolen (req->sv1);
714 } 1020 }
715 else 1021 else
716 { 1022 {
717 req->type = EIO_FSTAT; 1023 req->type = ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT;
718 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1024 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
719 } 1025 }
720 1026
721 REQ_SEND; 1027 REQ_SEND;
722} 1028}
817 1123
818 REQ_SEND; 1124 REQ_SEND;
819} 1125}
820 1126
821void 1127void
1128aio_readdirx (SV8 *pathname, IV flags, SV *callback=&PL_sv_undef)
1129 PPCODE:
1130{
1131 dREQ;
1132
1133 req->type = EIO_READDIR;
1134 req->sv1 = newSVsv (pathname);
1135 req->ptr1 = SvPVbyte_nolen (req->sv1);
1136 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
1137
1138 if (flags & EIO_READDIR_DENTS)
1139 req->int1 |= EIO_READDIR_CUSTOM2;
1140
1141 REQ_SEND;
1142}
1143
1144void
822aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 1145aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
823 ALIAS: 1146 ALIAS:
824 aio_unlink = EIO_UNLINK 1147 aio_unlink = EIO_UNLINK
825 aio_rmdir = EIO_RMDIR 1148 aio_rmdir = EIO_RMDIR
826 aio_readdir = EIO_READDIR 1149 aio_readdir = EIO_READDIR
868 1191
869 REQ_SEND; 1192 REQ_SEND;
870} 1193}
871 1194
872void 1195void
1196aio_mtouch (SV8 *data, IV offset = 0, SV *length = &PL_sv_undef, int flags = 0, SV *callback=&PL_sv_undef)
1197 ALIAS:
1198 aio_mtouch = EIO_MTOUCH
1199 aio_msync = EIO_MSYNC
1200 PROTOTYPE: $$$$;$
1201 PPCODE:
1202{
1203 STRLEN svlen;
1204 UV len = SvUV (length);
1205 char *svptr = SvPVbyte (data, svlen);
1206
1207 if (offset < 0)
1208 offset += svlen;
1209
1210 if (offset < 0 || offset > svlen)
1211 croak ("offset outside of scalar");
1212
1213 if (!SvOK (length) || len + offset > svlen)
1214 len = svlen - offset;
1215
1216 {
1217 dREQ;
1218
1219 req->type = ix;
1220 req->size = len;
1221 req->sv2 = SvREFCNT_inc (data);
1222 req->ptr2 = (char *)svptr + offset;
1223 req->int1 = flags;
1224
1225 REQ_SEND;
1226 }
1227}
1228
1229void
873aio_busy (double delay, SV *callback=&PL_sv_undef) 1230aio_busy (double delay, SV *callback=&PL_sv_undef)
874 PPCODE: 1231 PPCODE:
875{ 1232{
876 dREQ; 1233 dREQ;
877 1234
888{ 1245{
889 dREQ; 1246 dREQ;
890 1247
891 req->type = EIO_GROUP; 1248 req->type = EIO_GROUP;
892 1249
893 eio_submit (req); 1250 req_submit (req);
894 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1251 XPUSHs (req_sv (req, aio_grp_stash));
895} 1252}
896 1253
897void 1254void
898aio_nop (SV *callback=&PL_sv_undef) 1255aio_nop (SV *callback=&PL_sv_undef)
899 ALIAS: 1256 ALIAS:
951 1308
952int 1309int
953poll_fileno() 1310poll_fileno()
954 PROTOTYPE: 1311 PROTOTYPE:
955 CODE: 1312 CODE:
956 RETVAL = respipe [0]; 1313 RETVAL = s_epipe_fd (&respipe);
957 OUTPUT: 1314 OUTPUT:
958 RETVAL 1315 RETVAL
959 1316
960int 1317int
961poll_cb(...) 1318poll_cb(...)
1001 CODE: 1358 CODE:
1002 RETVAL = eio_nthreads (); 1359 RETVAL = eio_nthreads ();
1003 OUTPUT: 1360 OUTPUT:
1004 RETVAL 1361 RETVAL
1005 1362
1363int
1364fadvise (aio_rfd fh, off_t offset, off_t length, IV advice)
1365 PROTOTYPE: $$$$
1366 CODE:
1367#if _XOPEN_SOURCE >= 600 && !NO_FADVISE
1368 RETVAL = posix_fadvise (fh, offset, length, advice);
1369#else
1370 RETVAL = errno = ENOSYS; /* yes, this is actually correct */
1371#endif
1372 OUTPUT:
1373 RETVAL
1374
1375ssize_t
1376sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
1377 PROTOTYPE: $$$$
1378 CODE:
1379 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count);
1380 OUTPUT:
1381 RETVAL
1382
1383void
1384mmap (SV *scalar, size_t length, int prot, int flags, SV *fh, off_t offset = 0)
1385 PROTOTYPE: $$$$$;$
1386 PPCODE:
1387 sv_unmagic (scalar, MMAP_MAGIC);
1388{
1389 int fd = SvOK (fh) ? s_fileno_croak (fh, flags & PROT_WRITE) : -1;
1390 void *addr = (void *)mmap (0, length, prot, flags, fd, offset);
1391 if (addr == (void *)-1)
1392 XSRETURN_NO;
1393
1394 sv_force_normal (scalar);
1395
1396 /* we store the length in mg_obj, as namlen is I32 :/ */
1397 sv_magicext (scalar, 0, MMAP_MAGIC, &mmap_vtbl, (char *)addr, 0)
1398 ->mg_obj = (SV *)length;
1399
1400 SvUPGRADE (scalar, SVt_PV); /* nop... */
1401
1402 if (!(prot & PROT_WRITE))
1403 SvREADONLY_on (scalar);
1404
1405 if (SvLEN (scalar))
1406 Safefree (SvPVX (scalar));
1407
1408 SvPVX (scalar) = (char *)addr;
1409 SvCUR_set (scalar, length);
1410 SvLEN_set (scalar, 0);
1411 SvPOK_only (scalar);
1412
1413 XSRETURN_YES;
1414}
1415
1416void
1417munmap (SV *scalar)
1418 PROTOTYPE: $
1419 CODE:
1420 sv_unmagic (scalar, MMAP_MAGIC);
1421
1422int
1423mlockall (int flags)
1424 PROTOTYPE: $
1425 CODE:
1426#if _POSIX_MEMLOCK
1427#if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
1428 extern int mallopt (int, int);
1429 mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
1430#endif
1431 mlockall (flags);
1432#else
1433 RETVAL = -1;
1434 errno = ENOSYS;
1435#endif
1436 OUTPUT:
1437 RETVAL
1438
1439int
1440munlockall ()
1441 PROTOTYPE:
1442 CODE:
1443#if _POSIX_MEMLOCK
1444 munlockall ();
1445#else
1446 RETVAL = -1;
1447 errno = ENOSYS;
1448#endif
1449 OUTPUT:
1450 RETVAL
1451
1006void _on_next_submit (SV *cb) 1452void _on_next_submit (SV *cb)
1007 CODE: 1453 CODE:
1008 SvREFCNT_dec (on_next_submit); 1454 SvREFCNT_dec (on_next_submit);
1009 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1455 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1010 1456
1017 CODE: 1463 CODE:
1018 eio_cancel (req); 1464 eio_cancel (req);
1019 1465
1020void 1466void
1021cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1467cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1022 CODE: 1468 PPCODE:
1469{
1470 if (GIMME_V != G_VOID)
1471 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1472
1473 if (items > 1)
1474 {
1475 SV *cb_cv =get_cb (callback);
1476
1023 SvREFCNT_dec (req->callback); 1477 SvREFCNT_dec (req->callback);
1024 req->callback = newSVsv (callback); 1478 req->callback = SvREFCNT_inc (cb_cv);
1479 }
1480}
1025 1481
1026MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1482MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1027 1483
1028void 1484void
1029add (aio_req grp, ...) 1485add (aio_req grp, ...)
1061 AV *av; 1517 AV *av;
1062 1518
1063 grp->errorno = errno; 1519 grp->errorno = errno;
1064 1520
1065 av = newAV (); 1521 av = newAV ();
1522 av_extend (av, items - 1);
1066 1523
1067 for (i = 1; i < items; ++i ) 1524 for (i = 1; i < items; ++i )
1068 av_push (av, newSVsv (ST (i))); 1525 av_push (av, newSVsv (ST (i)));
1069 1526
1070 SvREFCNT_dec (grp->sv1); 1527 SvREFCNT_dec (grp->sv1);
1084void 1541void
1085feed (aio_req grp, SV *callback=&PL_sv_undef) 1542feed (aio_req grp, SV *callback=&PL_sv_undef)
1086 CODE: 1543 CODE:
1087{ 1544{
1088 SvREFCNT_dec (grp->sv2); 1545 SvREFCNT_dec (grp->sv2);
1089 grp->sv2 = newSVsv (callback); 1546 grp->sv2 = newSVsv (callback);
1547 grp->feed = aio_grp_feed;
1090 1548
1091 if (grp->int2 <= 0) 1549 if (grp->int2 <= 0)
1092 grp->int2 = 2; 1550 grp->int2 = 2;
1093 1551
1094 eio_grp_limit (grp, grp->int2); 1552 eio_grp_limit (grp, grp->int2);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines