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.166 by root, Sun May 9 20:43:28 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:
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 SvCUR_set (sv, 0);
626 SvLEN_set (sv, 0);
627 SvPVX (sv) = 0;
628 SvOK_off (sv);
629
630 return 0;
631}
632
633static MGVTBL mmap_vtbl = {
634 0, 0, 0, 0, mmap_free
635};
636
637/*****************************************************************************/
638
639static SV *
640get_cb (SV *cb_sv)
641{
642 SvGETMAGIC (cb_sv);
643 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
644}
645
447#define dREQ \ 646#define dREQ \
647 SV *cb_cv; \
448 aio_req req; \ 648 aio_req req; \
449 int req_pri = next_pri; \ 649 int req_pri = next_pri; \
450 next_pri = EIO_PRI_DEFAULT; \ 650 next_pri = EIO_PRI_DEFAULT; \
451 \ 651 \
452 if (SvOK (callback) && !SvROK (callback)) \ 652 cb_cv = get_cb (callback); \
453 croak ("callback must be undef or of reference type"); \
454 \ 653 \
455 Newz (0, req, 1, eio_req); \ 654 Newz (0, req, 1, eio_req); \
456 if (!req) \ 655 if (!req) \
457 croak ("out of memory during eio_req allocation"); \ 656 croak ("out of memory during eio_req allocation"); \
458 \ 657 \
459 req->callback = newSVsv (callback); \ 658 req->callback = SvREFCNT_inc (cb_cv); \
460 req->pri = req_pri 659 req->pri = req_pri
461 660
462#define REQ_SEND \ 661#define REQ_SEND \
662 PUTBACK; \
463 req_submit (req); \ 663 req_submit (req); \
664 SPAGAIN; \
464 \ 665 \
465 if (GIMME_V != G_VOID) \ 666 if (GIMME_V != G_VOID) \
466 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 667 XPUSHs (req_sv (req, aio_req_stash));
467 668
468MODULE = IO::AIO PACKAGE = IO::AIO 669MODULE = IO::AIO PACKAGE = IO::AIO
469 670
470PROTOTYPES: ENABLE 671PROTOTYPES: ENABLE
471 672
472BOOT: 673BOOT:
473{ 674{
474 stash = gv_stashpv ("IO::AIO", 1); 675 static const struct {
475 676 const char *name;
476 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 677 IV iv;
477 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 678 } *civ, const_iv[] = {
478 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 679# define const_niv(name, value) { # name, (IV) value },
479 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 680# define const_iv(name) { # name, (IV) name },
480 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 681# define const_eio(name) { # name, (IV) EIO_ ## name },
682 const_iv (EXDEV)
683 const_iv (ENOSYS)
684 const_iv (O_RDONLY)
685 const_iv (O_WRONLY)
686 const_iv (O_RDWR)
687 const_iv (O_CREAT)
688 const_iv (O_TRUNC)
689 const_iv (O_EXCL)
690 const_iv (O_APPEND)
481#ifndef _WIN32 691#ifndef _WIN32
482 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 692 const_iv (S_IFIFO)
483#endif 693#endif
694 const_niv (FADV_NORMAL , POSIX_FADV_NORMAL)
695 const_niv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL)
696 const_niv (FADV_RANDOM , POSIX_FADV_RANDOM)
697 const_niv (FADV_NOREUSE , POSIX_FADV_NOREUSE)
698 const_niv (FADV_WILLNEED , POSIX_FADV_WILLNEED)
699 const_niv (FADV_DONTNEED , POSIX_FADV_DONTNEED)
484 700
701 const_iv (ST_RDONLY)
702 const_iv (ST_NOSUID)
703 const_iv (ST_NODEV)
704 const_iv (ST_NOEXEC)
705 const_iv (ST_SYNCHRONOUS)
706 const_iv (ST_MANDLOCK)
707 const_iv (ST_WRITE)
708 const_iv (ST_APPEND)
709 const_iv (ST_IMMUTABLE)
710 const_iv (ST_NOATIME)
711 const_iv (ST_NODIRATIME)
712 const_iv (ST_RELATIME)
713
714 const_iv (PROT_EXEC)
715 const_iv (PROT_NONE)
716 const_iv (PROT_READ)
717 const_iv (PROT_WRITE)
718
719 /*const_iv (MAP_FIXED)*/
720 const_iv (MAP_PRIVATE)
721 const_iv (MAP_SHARED)
722 const_iv (MAP_ANONYMOUS)
723
724 /* linuxish */
725 const_iv (MAP_HUGETLB)
726 const_iv (MAP_LOCKED)
727 const_iv (MAP_NORESERVE)
728 const_iv (MAP_POPULATE)
729 const_iv (MAP_NONBLOCK)
730
731 const_iv (MCL_FUTURE)
732 const_iv (MCL_CURRENT)
733
734 const_eio (MS_ASYNC)
735 const_eio (MS_INVALIDATE)
736 const_eio (MS_SYNC)
737
738 const_eio (MT_MODIFY)
739
740 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
741 const_eio (SYNC_FILE_RANGE_WRITE)
742 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
743
744 const_eio (READDIR_DENTS)
745 const_eio (READDIR_DIRS_FIRST)
746 const_eio (READDIR_STAT_ORDER)
747 const_eio (READDIR_FOUND_UNKNOWN)
748
749 const_eio (DT_UNKNOWN)
750 const_eio (DT_FIFO)
751 const_eio (DT_CHR)
752 const_eio (DT_DIR)
753 const_eio (DT_BLK)
754 const_eio (DT_REG)
755 const_eio (DT_LNK)
756 const_eio (DT_SOCK)
757 const_eio (DT_WHT)
758 };
759
760 aio_stash = gv_stashpv ("IO::AIO" , 1);
761 aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1);
762 aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1);
763
764 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
765 newCONSTSUB (aio_stash, (char *)civ->name, newSViv (civ->iv));
766
767 newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE));
768
485 create_respipe (); 769 create_respipe ();
486 770
487 if (eio_init (want_poll, done_poll) < 0) 771 if (eio_init (want_poll, done_poll) < 0)
488 croak ("IO::AIO: unable to initialise eio library"); 772 croak ("IO::AIO: unable to initialise eio library");
489 773
490 /* atfork child called in fifo order, so before eio's handler */ 774 /* atfork child called in fifo order, so before eio's handler */
491 X_THREAD_ATFORK (0, 0, atfork_child); 775 X_THREAD_ATFORK (0, 0, atfork_child);
492} 776}
493 777
494void 778void
495max_poll_reqs (int nreqs) 779max_poll_reqs (int nreqs)
496 PROTOTYPE: $ 780 PROTOTYPE: $
549 ALIAS: 833 ALIAS:
550 aio_fsync = EIO_FSYNC 834 aio_fsync = EIO_FSYNC
551 aio_fdatasync = EIO_FDATASYNC 835 aio_fdatasync = EIO_FDATASYNC
552 PPCODE: 836 PPCODE:
553{ 837{
838 int fd = s_fileno_croak (fh, 0);
554 dREQ; 839 dREQ;
555 840
556 req->type = ix; 841 req->type = ix;
557 req->sv1 = newSVsv (fh); 842 req->sv1 = newSVsv (fh);
558 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 843 req->int1 = fd;
844
845 REQ_SEND (req);
846}
847
848void
849aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef)
850 PROTOTYPE: $$$$;$
851 PPCODE:
852{
853 int fd = s_fileno_croak (fh, 0);
854 dREQ;
855
856 req->type = EIO_SYNC_FILE_RANGE;
857 req->sv1 = newSVsv (fh);
858 req->int1 = fd;
859 req->offs = offset;
860 req->size = nbytes;
861 req->int2 = flags;
559 862
560 REQ_SEND (req); 863 REQ_SEND (req);
561} 864}
562 865
563void 866void
564aio_close (SV *fh, SV *callback=&PL_sv_undef) 867aio_close (SV *fh, SV *callback=&PL_sv_undef)
565 PROTOTYPE: $;$ 868 PROTOTYPE: $;$
566 PPCODE: 869 PPCODE:
567{ 870{
568 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 871 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
872 int fd = s_fileno_croak (fh, 0);
569 dREQ; 873 dREQ;
570 874
571 if (close_pipe < 0) 875 if (close_pipe < 0)
572 { 876 {
573 int pipefd [2]; 877 int pipefd [2];
581 } 885 }
582 886
583 req->type = EIO_DUP2; 887 req->type = EIO_DUP2;
584 req->int1 = close_pipe; 888 req->int1 = close_pipe;
585 req->sv2 = newSVsv (fh); 889 req->sv2 = newSVsv (fh);
586 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 890 req->int2 = fd;
587 891
588 REQ_SEND (req); 892 REQ_SEND (req);
589} 893}
590 894
591void 895void
595 aio_write = EIO_WRITE 899 aio_write = EIO_WRITE
596 PROTOTYPE: $$$$$;$ 900 PROTOTYPE: $$$$$;$
597 PPCODE: 901 PPCODE:
598{ 902{
599 STRLEN svlen; 903 STRLEN svlen;
904 int fd = s_fileno_croak (fh, ix == EIO_WRITE);
600 char *svptr = SvPVbyte (data, svlen); 905 char *svptr = SvPVbyte (data, svlen);
601 UV len = SvUV (length); 906 UV len = SvUV (length);
602
603 SvUPGRADE (data, SVt_PV);
604 SvPOK_on (data);
605 907
606 if (dataoffset < 0) 908 if (dataoffset < 0)
607 dataoffset += svlen; 909 dataoffset += svlen;
608 910
609 if (dataoffset < 0 || dataoffset > svlen) 911 if (dataoffset < 0 || dataoffset > svlen)
615 if (!SvOK (length) || len + dataoffset > svlen) 917 if (!SvOK (length) || len + dataoffset > svlen)
616 len = svlen - dataoffset; 918 len = svlen - dataoffset;
617 } 919 }
618 else 920 else
619 { 921 {
620 /* read: grow scalar as necessary */ 922 /* read: check type and grow scalar as necessary */
923 SvUPGRADE (data, SVt_PV);
621 svptr = SvGROW (data, len + dataoffset + 1); 924 svptr = SvGROW (data, len + dataoffset + 1);
622 } 925 }
623 926
624 if (len < 0)
625 croak ("length must not be negative");
626
627 { 927 {
628 dREQ; 928 dREQ;
629 929
630 req->type = ix; 930 req->type = ix;
631 req->sv1 = newSVsv (fh); 931 req->sv1 = newSVsv (fh);
632 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 932 req->int1 = fd;
633 : IoOFP (sv_2io (fh)));
634 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 933 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
635 req->size = len; 934 req->size = len;
636 req->sv2 = SvREFCNT_inc (data); 935 req->sv2 = SvREFCNT_inc (data);
637 req->ptr2 = (char *)svptr + dataoffset; 936 req->ptr2 = (char *)svptr + dataoffset;
638 req->stroffset = dataoffset; 937 req->stroffset = dataoffset;
661 960
662 REQ_SEND; 961 REQ_SEND;
663} 962}
664 963
665void 964void
666aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef) 965aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef)
667 PROTOTYPE: $$$$;$ 966 PROTOTYPE: $$$$;$
668 PPCODE: 967 PPCODE:
669{ 968{
969 int ifd = s_fileno_croak (in_fh , 0);
970 int ofd = s_fileno_croak (out_fh, 1);
670 dREQ; 971 dREQ;
671 972
672 req->type = EIO_SENDFILE; 973 req->type = EIO_SENDFILE;
673 req->sv1 = newSVsv (out_fh); 974 req->sv1 = newSVsv (out_fh);
674 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 975 req->int1 = ofd;
675 req->sv2 = newSVsv (in_fh); 976 req->sv2 = newSVsv (in_fh);
676 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 977 req->int2 = ifd;
677 req->offs = SvVAL64 (in_offset); 978 req->offs = in_offset;
678 req->size = length; 979 req->size = length;
679 980
680 REQ_SEND; 981 REQ_SEND;
681} 982}
682 983
683void 984void
684aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef) 985aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef)
685 PROTOTYPE: $$$;$ 986 PROTOTYPE: $$$;$
686 PPCODE: 987 PPCODE:
687{ 988{
989 int fd = s_fileno_croak (fh, 0);
688 dREQ; 990 dREQ;
689 991
690 req->type = EIO_READAHEAD; 992 req->type = EIO_READAHEAD;
691 req->sv1 = newSVsv (fh); 993 req->sv1 = newSVsv (fh);
692 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 994 req->int1 = fd;
693 req->offs = SvVAL64 (offset); 995 req->offs = offset;
694 req->size = length; 996 req->size = length;
695 997
696 REQ_SEND; 998 REQ_SEND;
697} 999}
698 1000
699void 1001void
700aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef) 1002aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef)
701 ALIAS: 1003 ALIAS:
702 aio_stat = EIO_STAT 1004 aio_stat = EIO_STAT
703 aio_lstat = EIO_LSTAT 1005 aio_lstat = EIO_LSTAT
1006 aio_statvfs = EIO_STATVFS
704 PPCODE: 1007 PPCODE:
705{ 1008{
706 dREQ; 1009 dREQ;
707 1010
708 req->sv1 = newSVsv (fh_or_path); 1011 req->sv1 = newSVsv (fh_or_path);
712 req->type = ix; 1015 req->type = ix;
713 req->ptr1 = SvPVbyte_nolen (req->sv1); 1016 req->ptr1 = SvPVbyte_nolen (req->sv1);
714 } 1017 }
715 else 1018 else
716 { 1019 {
717 req->type = EIO_FSTAT; 1020 req->type = ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT;
718 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1021 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
719 } 1022 }
720 1023
721 REQ_SEND; 1024 REQ_SEND;
722} 1025}
817 1120
818 REQ_SEND; 1121 REQ_SEND;
819} 1122}
820 1123
821void 1124void
1125aio_readdirx (SV8 *pathname, IV flags, SV *callback=&PL_sv_undef)
1126 PPCODE:
1127{
1128 dREQ;
1129
1130 req->type = EIO_READDIR;
1131 req->sv1 = newSVsv (pathname);
1132 req->ptr1 = SvPVbyte_nolen (req->sv1);
1133 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
1134
1135 if (flags & EIO_READDIR_DENTS)
1136 req->int1 |= EIO_READDIR_CUSTOM2;
1137
1138 REQ_SEND;
1139}
1140
1141void
822aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 1142aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
823 ALIAS: 1143 ALIAS:
824 aio_unlink = EIO_UNLINK 1144 aio_unlink = EIO_UNLINK
825 aio_rmdir = EIO_RMDIR 1145 aio_rmdir = EIO_RMDIR
826 aio_readdir = EIO_READDIR 1146 aio_readdir = EIO_READDIR
868 1188
869 REQ_SEND; 1189 REQ_SEND;
870} 1190}
871 1191
872void 1192void
1193aio_mtouch (SV8 *data, IV offset = 0, SV *length = &PL_sv_undef, int flags = 0, SV *callback=&PL_sv_undef)
1194 ALIAS:
1195 aio_mtouch = EIO_MTOUCH
1196 aio_msync = EIO_MSYNC
1197 PROTOTYPE: $$$$;$
1198 PPCODE:
1199{
1200 STRLEN svlen;
1201 UV len = SvUV (length);
1202 char *svptr = SvPVbyte (data, svlen);
1203
1204 if (offset < 0)
1205 offset += svlen;
1206
1207 if (offset < 0 || offset > svlen)
1208 croak ("offset outside of scalar");
1209
1210 if (!SvOK (length) || len + offset > svlen)
1211 len = svlen - offset;
1212
1213 {
1214 dREQ;
1215
1216 req->type = ix;
1217 req->size = len;
1218 req->sv2 = SvREFCNT_inc (data);
1219 req->ptr2 = (char *)svptr + offset;
1220 req->int1 = flags;
1221
1222 REQ_SEND;
1223 }
1224}
1225
1226void
873aio_busy (double delay, SV *callback=&PL_sv_undef) 1227aio_busy (double delay, SV *callback=&PL_sv_undef)
874 PPCODE: 1228 PPCODE:
875{ 1229{
876 dREQ; 1230 dREQ;
877 1231
888{ 1242{
889 dREQ; 1243 dREQ;
890 1244
891 req->type = EIO_GROUP; 1245 req->type = EIO_GROUP;
892 1246
893 eio_submit (req); 1247 req_submit (req);
894 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1248 XPUSHs (req_sv (req, aio_grp_stash));
895} 1249}
896 1250
897void 1251void
898aio_nop (SV *callback=&PL_sv_undef) 1252aio_nop (SV *callback=&PL_sv_undef)
899 ALIAS: 1253 ALIAS:
951 1305
952int 1306int
953poll_fileno() 1307poll_fileno()
954 PROTOTYPE: 1308 PROTOTYPE:
955 CODE: 1309 CODE:
956 RETVAL = respipe [0]; 1310 RETVAL = s_epipe_fd (&respipe);
957 OUTPUT: 1311 OUTPUT:
958 RETVAL 1312 RETVAL
959 1313
960int 1314int
961poll_cb(...) 1315poll_cb(...)
1001 CODE: 1355 CODE:
1002 RETVAL = eio_nthreads (); 1356 RETVAL = eio_nthreads ();
1003 OUTPUT: 1357 OUTPUT:
1004 RETVAL 1358 RETVAL
1005 1359
1360int
1361fadvise (aio_rfd fh, off_t offset, off_t length, IV advice)
1362 PROTOTYPE: $$$$
1363 CODE:
1364#if _XOPEN_SOURCE >= 600 && !NO_FADVISE
1365 RETVAL = posix_fadvise (fh, offset, length, advice);
1366#else
1367 RETVAL = errno = ENOSYS; /* yes, this is actually correct */
1368#endif
1369 OUTPUT:
1370 RETVAL
1371
1372ssize_t
1373sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
1374 PROTOTYPE: $$$$
1375 CODE:
1376 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count);
1377 OUTPUT:
1378 RETVAL
1379
1380void
1381mmap (SV *scalar, size_t length, int prot, int flags, SV *fh, off_t offset = 0)
1382 PROTOTYPE: $$$$$;$
1383 PPCODE:
1384 sv_unmagic (scalar, MMAP_MAGIC);
1385{
1386 int fd = SvOK (fh) ? s_fileno_croak (fh, flags & PROT_WRITE) : -1;
1387 void *addr = (void *)mmap (0, length, prot, flags, fd, offset);
1388 if (addr == (void *)-1)
1389 XSRETURN_NO;
1390
1391 /* we store the length in mg_obj, as namlen is I32 :/ */
1392 sv_magicext (scalar, 0, MMAP_MAGIC, &mmap_vtbl, (char *)addr, 0)
1393 ->mg_obj = (SV *)length;
1394
1395 SvUPGRADE (scalar, SVt_PV); /* nop... */
1396 if (!(prot & PROT_WRITE))
1397 SvREADONLY_on (scalar);
1398
1399 SvPVX (scalar) = (char *)addr;
1400 SvCUR_set (scalar, length);
1401 SvLEN_set (scalar, 0);
1402 SvPOK_only (scalar);
1403
1404 XSRETURN_YES;
1405}
1406
1407void
1408munmap (SV *scalar)
1409 PROTOTYPE: $
1410 CODE:
1411 sv_unmagic (scalar, MMAP_MAGIC);
1412
1413int
1414mlockall (int flags)
1415 PROTOTYPE: $
1416 CODE:
1417#if _POSIX_MEMLOCK
1418#if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
1419 extern int mallopt (int, int);
1420 mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
1421#endif
1422 mlockall (flags);
1423#else
1424 RETVAL = -1;
1425 errno = ENOSYS;
1426#endif
1427 OUTPUT:
1428 RETVAL
1429
1430int
1431munlockall ()
1432 PROTOTYPE:
1433 CODE:
1434#if _POSIX_MEMLOCK
1435 munlockall ();
1436#else
1437 RETVAL = -1;
1438 errno = ENOSYS;
1439#endif
1440 OUTPUT:
1441 RETVAL
1442
1006void _on_next_submit (SV *cb) 1443void _on_next_submit (SV *cb)
1007 CODE: 1444 CODE:
1008 SvREFCNT_dec (on_next_submit); 1445 SvREFCNT_dec (on_next_submit);
1009 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1446 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1010 1447
1017 CODE: 1454 CODE:
1018 eio_cancel (req); 1455 eio_cancel (req);
1019 1456
1020void 1457void
1021cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1458cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1022 CODE: 1459 PPCODE:
1460{
1461 if (GIMME_V != G_VOID)
1462 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1463
1464 if (items > 1)
1465 {
1466 SV *cb_cv =get_cb (callback);
1467
1023 SvREFCNT_dec (req->callback); 1468 SvREFCNT_dec (req->callback);
1024 req->callback = newSVsv (callback); 1469 req->callback = SvREFCNT_inc (cb_cv);
1470 }
1471}
1025 1472
1026MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1473MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1027 1474
1028void 1475void
1029add (aio_req grp, ...) 1476add (aio_req grp, ...)
1061 AV *av; 1508 AV *av;
1062 1509
1063 grp->errorno = errno; 1510 grp->errorno = errno;
1064 1511
1065 av = newAV (); 1512 av = newAV ();
1513 av_extend (av, items - 1);
1066 1514
1067 for (i = 1; i < items; ++i ) 1515 for (i = 1; i < items; ++i )
1068 av_push (av, newSVsv (ST (i))); 1516 av_push (av, newSVsv (ST (i)));
1069 1517
1070 SvREFCNT_dec (grp->sv1); 1518 SvREFCNT_dec (grp->sv1);
1084void 1532void
1085feed (aio_req grp, SV *callback=&PL_sv_undef) 1533feed (aio_req grp, SV *callback=&PL_sv_undef)
1086 CODE: 1534 CODE:
1087{ 1535{
1088 SvREFCNT_dec (grp->sv2); 1536 SvREFCNT_dec (grp->sv2);
1089 grp->sv2 = newSVsv (callback); 1537 grp->sv2 = newSVsv (callback);
1538 grp->feed = aio_grp_feed;
1090 1539
1091 if (grp->int2 <= 0) 1540 if (grp->int2 <= 0)
1092 grp->int2 = 2; 1541 grp->int2 = 2;
1093 1542
1094 eio_grp_limit (grp, grp->int2); 1543 eio_grp_limit (grp, grp->int2);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines