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.120 by root, Sun May 11 19:17:09 2008 UTC vs.
Revision 1.162 by root, Sun Jan 10 23:05:12 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
24
25#if !_POSIX_MAPPED_FILES
26# define mmap(addr,length,prot,flags,fd,offs) (errno = ENOSYS, -1)
27# define munmap(addr,length) (errno = ENOSYS, -1)
28#endif
17 29
18/* perl namespace pollution */ 30/* perl namespace pollution */
19#undef VERSION 31#undef VERSION
20 32
21#ifdef _WIN32 33#ifdef _WIN32
65# include <signal.h> 77# include <signal.h>
66# define EIO_STRUCT_DIRENT struct dirent 78# define EIO_STRUCT_DIRENT struct dirent
67 79
68#endif 80#endif
69 81
82/* perl stupidly overrides readdir and maybe others */
83/* with thread-unsafe versions, imagine that :( */
84#undef readdir
85#undef opendir
86#undef closedir
87
70#define EIO_STRUCT_STAT Stat_t 88#define EIO_STRUCT_STAT Stat_t
71 89
72/* use NV for 32 bit perls as it allows larger offsets */ 90/* use NV for 32 bit perls as it allows larger offsets */
73#if IVSIZE >= 8 91#if IVSIZE >= 8
92# define VAL64 IV
74# define SvVAL64 SvIV 93# define SvVAL64 SvIV
94# define newSVval64 newSViv
75#else 95#else
96# define VAL64 NV
76# define SvVAL64 SvNV 97# define SvVAL64 SvNV
98# define newSVval64 newSVnv
77#endif 99#endif
78 100
79static HV *stash; 101/*****************************************************************************/
102
103#if __GNUC__ >= 3
104# define expect(expr,value) __builtin_expect ((expr),(value))
105#else
106# define expect(expr,value) (expr)
107#endif
108
109#define expect_false(expr) expect ((expr) != 0, 0)
110#define expect_true(expr) expect ((expr) != 0, 1)
111
112/*****************************************************************************/
113
80typedef SV SV8; /* byte-sv, used for argument-checking */ 114typedef SV SV8; /* byte-sv, used for argument-checking */
115typedef int aio_rfd; /* read file desriptor */
116typedef int aio_wfd; /* write file descriptor */
81 117
82#define AIO_REQ_KLASS "IO::AIO::REQ" 118static HV *aio_stash, *aio_req_stash, *aio_grp_stash;
83#define AIO_GRP_KLASS "IO::AIO::GRP"
84 119
85#define EIO_COMMON \ 120#define EIO_REQ_MEMBERS \
86 SV *callback; \ 121 SV *callback; \
87 SV *sv1, *sv2; \ 122 SV *sv1, *sv2; \
88 STRLEN stroffset; \ 123 STRLEN stroffset; \
89 SV *self 124 SV *self;
125
126#define EIO_NO_WRAPPERS 1
90 127
91#include "libeio/eio.h" 128#include "libeio/eio.h"
129
130#ifndef POSIX_FADV_NORMAL
131# define POSIX_FADV_NORMAL 0
132# define NO_FADVISE 1
133#endif
134#ifndef POSIX_FADV_SEQUENTIAL
135# define POSIX_FADV_SEQUENTIAL 0
136#endif
137#ifndef POSIX_FADV_RANDOM
138# define POSIX_FADV_RANDOM 0
139#endif
140#ifndef POSIX_FADV_NOREUSE
141# define POSIX_FADV_NOREUSE 0
142#endif
143#ifndef POSIX_FADV_WILLNEED
144# define POSIX_FADV_WILLNEED 0
145#endif
146#ifndef POSIX_FADV_DONTNEED
147# define POSIX_FADV_DONTNEED 0
148#endif
149
150#ifndef ST_NODEV
151# define ST_NODEV 0
152#endif
153#ifndef ST_NOEXEC
154# define ST_NOEXEC 0
155#endif
156#ifndef ST_SYNCHRONOUS
157# define ST_SYNCHRONOUS 0
158#endif
159#ifndef ST_MANDLOCK
160# define ST_MANDLOCK 0
161#endif
162#ifndef ST_WRITE
163# define ST_WRITE 0
164#endif
165#ifndef ST_APPEND
166# define ST_APPEND 0
167#endif
168#ifndef ST_IMMUTABLE
169# define ST_IMMUTABLE 0
170#endif
171#ifndef ST_NOATIME
172# define ST_NOATIME 0
173#endif
174#ifndef ST_NODIRATIME
175# define ST_NODIRATIME 0
176#endif
177#ifndef ST_RELATIME
178# define ST_RELATIME 0
179#endif
180
181#ifndef MCL_CURRENT
182# define MCL_CURRENT 0
183#endif
184#ifndef MCL_FUTURE
185# define MCL_FUTURE 0
186#endif
187
188#ifndef MAP_ANONYMOUS
189# ifdef MAP_ANON
190# define MAP_ANONYMOUS MAP_ANON
191# else
192# define MAP_ANONYMOUS MAP_FIXED /* and hope this fails */
193# endif
194#endif
195#ifndef MAP_HUGETLB
196# define MAP_HUGETLB 0
197#endif
198#ifndef MAP_LOCKED
199# define MAP_LOCKED 0
200#endif
201#ifndef MAP_NORESERVE
202# define MAP_NORESERVE 0
203#endif
204#ifndef MAP_POPULATE
205# define MAP_POPULATE 0
206#endif
207#ifndef MAP_NONBLOCK
208# define MAP_NONBLOCK 0
209#endif
210
211#ifndef PAGESIZE
212# define PAGESIZE sysconf (_SC_PAGESIZE)
213#endif
92 214
93static int req_invoke (eio_req *req); 215static int req_invoke (eio_req *req);
94#define EIO_FINISH(req) req_invoke (req) 216#define EIO_FINISH(req) req_invoke (req)
95static void aio_grp_feed (eio_req *grp);
96#define EIO_FEED(req) aio_grp_feed (req)
97static void req_destroy (eio_req *grp); 217static void req_destroy (eio_req *grp);
98#define EIO_DESTROY(req) req_destroy (req) 218#define EIO_DESTROY(req) req_destroy (req)
99 219
100enum { 220enum {
101 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ 221 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
105 225
106typedef eio_req *aio_req; 226typedef eio_req *aio_req;
107typedef eio_req *aio_req_ornot; 227typedef eio_req *aio_req_ornot;
108 228
109static SV *on_next_submit; 229static SV *on_next_submit;
110static int next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; 230static int next_pri = EIO_PRI_DEFAULT;
111static int max_outstanding; 231static int max_outstanding;
112 232
113static int respipe_osf [2], respipe [2] = { -1, -1 }; 233static s_epipe respipe;
114 234
115static void req_destroy (aio_req req); 235static void req_destroy (aio_req req);
116static void req_cancel (aio_req req); 236static void req_cancel (aio_req req);
117 237
118static void want_poll (void) 238static void want_poll (void)
119{ 239{
120 /* write a dummy byte to the pipe so fh becomes ready */ 240 /* write a dummy byte to the pipe so fh becomes ready */
121 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1); 241 s_epipe_signal (&respipe);
122} 242}
123 243
124static void done_poll (void) 244static void done_poll (void)
125{ 245{
126 /* read any signals sent by the worker threads */ 246 /* read any signals sent by the worker threads */
127 char buf [4]; 247 s_epipe_drain (&respipe);
128 while (respipe_read (respipe [0], buf, 4) == 4)
129 ;
130} 248}
131 249
132/* must be called at most once */ 250/* must be called at most once */
133static SV *req_sv (aio_req req, const char *klass) 251static SV *req_sv (aio_req req, HV *stash)
134{ 252{
135 if (!req->self) 253 if (!req->self)
136 { 254 {
137 req->self = (SV *)newHV (); 255 req->self = (SV *)newHV ();
138 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0); 256 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
139 } 257 }
140 258
141 return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1))); 259 return sv_2mortal (sv_bless (newRV_inc (req->self), stash));
142} 260}
143 261
144static aio_req SvAIO_REQ (SV *sv) 262static aio_req SvAIO_REQ (SV *sv)
145{ 263{
146 MAGIC *mg; 264 MAGIC *mg;
147 265
148 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv)) 266 if (!SvROK (sv)
267 || (SvSTASH (SvRV (sv)) != aio_grp_stash
268 && SvSTASH (SvRV (sv)) != aio_req_stash
269 && !sv_derived_from (sv, "IO::AIO::REQ")))
149 croak ("object of class " AIO_REQ_KLASS " expected"); 270 croak ("object of class IO::AIO::REQ expected");
150 271
151 mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 272 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
152 273
153 return mg ? (aio_req)mg->mg_ptr : 0; 274 return mg ? (aio_req)mg->mg_ptr : 0;
154} 275}
160 dSP; 281 dSP;
161 282
162 ENTER; 283 ENTER;
163 SAVETMPS; 284 SAVETMPS;
164 PUSHMARK (SP); 285 PUSHMARK (SP);
165 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 286 XPUSHs (req_sv (grp, aio_grp_stash));
166 PUTBACK; 287 PUTBACK;
167 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR); 288 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
168 SPAGAIN; 289 SPAGAIN;
169 FREETMPS; 290 FREETMPS;
170 LEAVE; 291 LEAVE;
173 294
174static void req_submit (eio_req *req) 295static void req_submit (eio_req *req)
175{ 296{
176 eio_submit (req); 297 eio_submit (req);
177 298
178 if (on_next_submit) 299 if (expect_false (on_next_submit))
179 { 300 {
180 dSP; 301 dSP;
181 SV *cb = sv_2mortal (on_next_submit); 302 SV *cb = sv_2mortal (on_next_submit);
182 303
183 on_next_submit = 0; 304 on_next_submit = 0;
193 dSP; 314 dSP;
194 315
195 if (req->flags & FLAG_SV2_RO_OFF) 316 if (req->flags & FLAG_SV2_RO_OFF)
196 SvREADONLY_off (req->sv2); 317 SvREADONLY_off (req->sv2);
197 318
198 if (!EIO_CANCELLED (req) && SvOK (req->callback)) 319 if (!EIO_CANCELLED (req) && req->callback)
199 { 320 {
200 ENTER; 321 ENTER;
201 SAVETMPS; 322 SAVETMPS;
202 PUSHMARK (SP); 323 PUSHMARK (SP);
203 EXTEND (SP, 1); 324 EXTEND (SP, 1);
209 SV *rv = &PL_sv_undef; 330 SV *rv = &PL_sv_undef;
210 331
211 if (req->result >= 0) 332 if (req->result >= 0)
212 { 333 {
213 int i; 334 int i;
214 char *buf = req->ptr2; 335 char *names = (char *)req->ptr2;
336 eio_dirent *ent = (eio_dirent *)req->ptr1; /* might be 0 */
215 AV *av = newAV (); 337 AV *av = newAV ();
216 338
217 av_extend (av, req->result - 1); 339 av_extend (av, req->result - 1);
218 340
219 for (i = 0; i < req->result; ++i) 341 for (i = 0; i < req->result; ++i)
220 { 342 {
221 SV *sv = newSVpv (buf, 0); 343 if (req->int1 & EIO_READDIR_DENTS)
344 {
345 SV *namesv = newSVpvn (names + ent->nameofs, ent->namelen);
222 346
347 if (req->int1 & EIO_READDIR_CUSTOM2)
348 {
349 static SV *sv_type [EIO_DT_MAX + 1]; /* type sv cache */
350 AV *avent = newAV ();
351
352 av_extend (avent, 2);
353
354 if (!sv_type [ent->type])
355 {
356 sv_type [ent->type] = newSViv (ent->type);
357 SvREADONLY_on (sv_type [ent->type]);
358 }
359
360 av_store (avent, 0, namesv);
361 av_store (avent, 1, SvREFCNT_inc (sv_type [ent->type]));
362 av_store (avent, 2, IVSIZE >= 8 ? newSVuv (ent->inode) : newSVnv (ent->inode));
363
364 av_store (av, i, newRV_noinc ((SV *)avent));
365 }
366 else
223 av_store (av, i, sv); 367 av_store (av, i, namesv);
368
369 ++ent;
370 }
371 else
372 {
373 SV *name = newSVpv (names, 0);
374 av_store (av, i, name);
224 buf += SvCUR (sv) + 1; 375 names += SvCUR (name) + 1;
376 }
225 } 377 }
226 378
227 rv = sv_2mortal (newRV_noinc ((SV *)av)); 379 rv = sv_2mortal (newRV_noinc ((SV *)av));
228 } 380 }
229 381
230 PUSHs (rv); 382 PUSHs (rv);
383
384 if (req->int1 & EIO_READDIR_CUSTOM1)
385 XPUSHs (sv_2mortal (newSViv (req->int1 & ~(EIO_READDIR_CUSTOM1 | EIO_READDIR_CUSTOM2))));
231 } 386 }
232 break; 387 break;
233 388
234 case EIO_OPEN: 389 case EIO_OPEN:
235 { 390 {
241 GV *gv = (GV *)sv_newmortal (); 396 GV *gv = (GV *)sv_newmortal ();
242 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR); 397 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
243 char sym [64]; 398 char sym [64];
244 int symlen; 399 int symlen;
245 400
246 symlen = snprintf (sym, sizeof (sym), "fd#%d", req->result); 401 symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
247 gv_init (gv, stash, sym, symlen, 0); 402 gv_init (gv, aio_stash, sym, symlen, 0);
248 403
249 symlen = snprintf ( 404 symlen = snprintf (
250 sym, 405 sym,
251 sizeof (sym), 406 sizeof (sym),
252 "%s&=%d", 407 "%s&=%d",
253 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<", 408 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
254 req->result 409 (int)req->result
255 ); 410 );
256 411
257 if (do_open (gv, sym, symlen, 0, 0, 0, 0)) 412 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
258 fh = (SV *)gv; 413 fh = (SV *)gv;
259 } 414 }
260 415
261 PUSHs (fh); 416 PUSHs (fh);
262 } 417 }
418 break;
419
420 case EIO_STATVFS:
421 case EIO_FSTATVFS:
422 {
423 SV *rv = &PL_sv_undef;
424
425 if (req->result >= 0)
426 {
427 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req);
428 HV *hv = newHV ();
429
430 rv = sv_2mortal (newRV_noinc ((SV *)hv));
431
432 hv_store (hv, "bsize" , sizeof ("bsize" ) - 1, newSVval64 (f->f_bsize ), 0);
433 hv_store (hv, "frsize" , sizeof ("frsize" ) - 1, newSVval64 (f->f_frsize ), 0);
434 hv_store (hv, "blocks" , sizeof ("blocks" ) - 1, newSVval64 (f->f_blocks ), 0);
435 hv_store (hv, "bfree" , sizeof ("bfree" ) - 1, newSVval64 (f->f_bfree ), 0);
436 hv_store (hv, "bavail" , sizeof ("bavail" ) - 1, newSVval64 (f->f_bavail ), 0);
437 hv_store (hv, "files" , sizeof ("files" ) - 1, newSVval64 (f->f_files ), 0);
438 hv_store (hv, "ffree" , sizeof ("ffree" ) - 1, newSVval64 (f->f_ffree ), 0);
439 hv_store (hv, "favail" , sizeof ("favail" ) - 1, newSVval64 (f->f_favail ), 0);
440 hv_store (hv, "fsid" , sizeof ("fsid" ) - 1, newSVval64 (f->f_fsid ), 0);
441 hv_store (hv, "flag" , sizeof ("flag" ) - 1, newSVval64 (f->f_flag ), 0);
442 hv_store (hv, "namemax", sizeof ("namemax") - 1, newSVval64 (f->f_namemax), 0);
443 }
444
445 PUSHs (rv);
446 }
447
263 break; 448 break;
264 449
265 case EIO_GROUP: 450 case EIO_GROUP:
266 req->int1 = 2; /* mark group as finished */ 451 req->int1 = 2; /* mark group as finished */
267 452
293 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 478 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
294 PUSHs (sv_2mortal (newSViv (req->result))); 479 PUSHs (sv_2mortal (newSViv (req->result)));
295 break; 480 break;
296 481
297 case EIO_READ: 482 case EIO_READ:
483 {
298 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0)); 484 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
299 *SvEND (req->sv2) = 0; 485 *SvEND (req->sv2) = 0;
486 SvPOK_only (req->sv2);
487 SvSETMAGIC (req->sv2);
300 PUSHs (sv_2mortal (newSViv (req->result))); 488 PUSHs (sv_2mortal (newSViv (req->result)));
489 }
301 break; 490 break;
302 491
303 case EIO_DUP2: 492 case EIO_DUP2:
304 if (req->result > 0) 493 if (req->result > 0)
305 req->result = 0; 494 req->result = 0;
351 grp->sv2 = 0; 540 grp->sv2 = 0;
352 541
353 eio_grp_cancel (grp); 542 eio_grp_cancel (grp);
354} 543}
355 544
356#ifdef USE_SOCKETS_AS_HANDLES
357# define TO_SOCKET(x) (win32_get_osfhandle (x))
358#else
359# define TO_SOCKET(x) (x)
360#endif
361
362static void 545static void
363create_respipe (void) 546create_respipe (void)
364{ 547{
365 int old_readfd = respipe [0];
366
367 if (respipe [1] >= 0)
368 respipe_close (TO_SOCKET (respipe [1]));
369
370#ifdef _WIN32
371 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe))
372#else
373 if (pipe (respipe)) 548 if (s_epipe_renew (&respipe))
374#endif
375 croak ("unable to initialize result pipe"); 549 croak ("IO::AIO: unable to initialize result pipe");
376
377 if (old_readfd >= 0)
378 {
379 if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0)
380 croak ("unable to initialize result pipe(2)");
381
382 respipe_close (respipe [0]);
383 respipe [0] = old_readfd;
384 }
385
386#ifdef _WIN32
387 int arg = 1;
388 if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg)
389 || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg))
390#else
391 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
392 || fcntl (respipe [1], F_SETFL, O_NONBLOCK))
393#endif
394 croak ("unable to initialize result pipe(3)");
395
396 respipe_osf [0] = TO_SOCKET (respipe [0]);
397 respipe_osf [1] = TO_SOCKET (respipe [1]);
398} 550}
399 551
400static void poll_wait (void) 552static void poll_wait (void)
401{ 553{
402 fd_set rfd;
403
404 while (eio_nreqs ()) 554 while (eio_nreqs ())
405 { 555 {
406 int size; 556 int size;
407 557
408 X_LOCK (reslock); 558 X_LOCK (reslock);
410 X_UNLOCK (reslock); 560 X_UNLOCK (reslock);
411 561
412 if (size) 562 if (size)
413 return; 563 return;
414 564
415 maybe_start_thread (); 565 etp_maybe_start_thread ();
416 566
417 FD_ZERO (&rfd); 567 s_epipe_wait (&respipe);
418 FD_SET (respipe [0], &rfd);
419
420 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
421 } 568 }
422} 569}
423 570
424static int poll_cb (void) 571static int poll_cb (void)
425{ 572{
426 int res; 573 for (;;)
427
428 do
429 { 574 {
430 res = eio_poll (); 575 int res = eio_poll ();
431 576
432 if (res > 0) 577 if (res > 0)
433 croak (0); 578 croak (0);
579
580 if (!max_outstanding || max_outstanding > eio_nreqs ())
581 return res;
582
583 poll_wait ();
434 } 584 }
435 while (max_outstanding && max_outstanding <= eio_nreqs ());
436
437 return res;
438} 585}
439 586
440static void atfork_child (void) 587static void atfork_child (void)
441{ 588{
442 create_respipe (); 589 create_respipe ();
443} 590}
444 591
592/*****************************************************************************/
593
594#define MMAP_MAGIC PERL_MAGIC_ext
595
596static int
597mmap_free (pTHX_ SV *sv, MAGIC *mg)
598{
599 int old_errno = errno;
600 munmap (mg->mg_ptr, (size_t)mg->mg_obj);
601 errno = old_errno;
602
603 mg->mg_obj = 0; /* just in case */
604
605 SvREADONLY_off (sv);
606 SvCUR_set (sv, 0);
607 SvLEN_set (sv, 0);
608 SvPVX (sv) = 0;
609 SvOK_off (sv);
610
611 return 0;
612}
613
614static MGVTBL mmap_vtbl = {
615 0, 0, 0, 0, mmap_free
616};
617
618/*****************************************************************************/
619
620static SV *
621get_cb (SV *cb_sv)
622{
623 SvGETMAGIC (cb_sv);
624 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
625}
626
445#define dREQ \ 627#define dREQ \
628 SV *cb_cv; \
446 aio_req req; \ 629 aio_req req; \
447 int req_pri = next_pri; \ 630 int req_pri = next_pri; \
448 next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; \ 631 next_pri = EIO_PRI_DEFAULT; \
449 \ 632 \
450 if (SvOK (callback) && !SvROK (callback)) \ 633 cb_cv = get_cb (callback); \
451 croak ("callback must be undef or of reference type"); \
452 \ 634 \
453 Newz (0, req, 1, eio_req); \ 635 Newz (0, req, 1, eio_req); \
454 if (!req) \ 636 if (!req) \
455 croak ("out of memory during eio_req allocation"); \ 637 croak ("out of memory during eio_req allocation"); \
456 \ 638 \
457 req->callback = newSVsv (callback); \ 639 req->callback = SvREFCNT_inc (cb_cv); \
458 req->pri = req_pri 640 req->pri = req_pri
459 641
460#define REQ_SEND \ 642#define REQ_SEND \
643 PUTBACK; \
461 req_submit (req); \ 644 req_submit (req); \
645 SPAGAIN; \
462 \ 646 \
463 if (GIMME_V != G_VOID) \ 647 if (GIMME_V != G_VOID) \
464 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 648 XPUSHs (req_sv (req, aio_req_stash));
465 649
466MODULE = IO::AIO PACKAGE = IO::AIO 650MODULE = IO::AIO PACKAGE = IO::AIO
467 651
468PROTOTYPES: ENABLE 652PROTOTYPES: ENABLE
469 653
470BOOT: 654BOOT:
471{ 655{
472 stash = gv_stashpv ("IO::AIO", 1); 656 static const struct {
473 657 const char *name;
474 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 658 IV iv;
475 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 659 } *civ, const_iv[] = {
476 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 660# define const_niv(name, value) { # name, (IV) value },
477 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 661# define const_iv(name) { # name, (IV) name },
478 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 662# define const_eio(name) { # name, (IV) EIO_ ## name },
663 const_iv (EXDEV)
664 const_iv (ENOSYS)
665 const_iv (O_RDONLY)
666 const_iv (O_WRONLY)
667 const_iv (O_CREAT)
668 const_iv (O_TRUNC)
479#ifdef _WIN32 669#ifndef _WIN32
480 X_MUTEX_CHECK (wrklock); 670 const_iv (S_IFIFO)
481 X_MUTEX_CHECK (reslock);
482 X_MUTEX_CHECK (reqlock);
483 X_MUTEX_CHECK (reqwait);
484 X_MUTEX_CHECK (preadwritelock);
485 X_MUTEX_CHECK (readdirlock);
486
487 X_COND_CHECK (reqwait);
488#else
489 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
490#endif 671#endif
672 const_niv (FADV_NORMAL , POSIX_FADV_NORMAL)
673 const_niv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL)
674 const_niv (FADV_RANDOM , POSIX_FADV_RANDOM)
675 const_niv (FADV_NOREUSE , POSIX_FADV_NOREUSE)
676 const_niv (FADV_WILLNEED , POSIX_FADV_WILLNEED)
677 const_niv (FADV_DONTNEED , POSIX_FADV_DONTNEED)
491 678
679 const_iv (ST_RDONLY)
680 const_iv (ST_NOSUID)
681 const_iv (ST_NODEV)
682 const_iv (ST_NOEXEC)
683 const_iv (ST_SYNCHRONOUS)
684 const_iv (ST_MANDLOCK)
685 const_iv (ST_WRITE)
686 const_iv (ST_APPEND)
687 const_iv (ST_IMMUTABLE)
688 const_iv (ST_NOATIME)
689 const_iv (ST_NODIRATIME)
690 const_iv (ST_RELATIME)
691
692 const_iv (PROT_EXEC)
693 const_iv (PROT_NONE)
694 const_iv (PROT_READ)
695 const_iv (PROT_WRITE)
696
697 /*const_iv (MAP_FIXED)*/
698 const_iv (MAP_PRIVATE)
699 const_iv (MAP_SHARED)
700 const_iv (MAP_ANONYMOUS)
701
702 /* linuxish */
703 const_iv (MAP_HUGETLB)
704 const_iv (MAP_LOCKED)
705 const_iv (MAP_NORESERVE)
706 const_iv (MAP_POPULATE)
707 const_iv (MAP_NONBLOCK)
708
709 const_iv (MCL_FUTURE)
710 const_iv (MCL_CURRENT)
711
712 const_eio (MS_ASYNC)
713 const_eio (MS_INVALIDATE)
714 const_eio (MS_SYNC)
715
716 const_eio (MT_MODIFY)
717
718 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
719 const_eio (SYNC_FILE_RANGE_WRITE)
720 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
721
722 const_eio (READDIR_DENTS)
723 const_eio (READDIR_DIRS_FIRST)
724 const_eio (READDIR_STAT_ORDER)
725 const_eio (READDIR_FOUND_UNKNOWN)
726
727 const_eio (DT_UNKNOWN)
728 const_eio (DT_FIFO)
729 const_eio (DT_CHR)
730 const_eio (DT_DIR)
731 const_eio (DT_BLK)
732 const_eio (DT_REG)
733 const_eio (DT_LNK)
734 const_eio (DT_SOCK)
735 const_eio (DT_WHT)
736 };
737
738 aio_stash = gv_stashpv ("IO::AIO" , 1);
739 aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1);
740 aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1);
741
742 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
743 newCONSTSUB (aio_stash, (char *)civ->name, newSViv (civ->iv));
744
745 newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE));
746
492 create_respipe (); 747 create_respipe ();
493 748
494 if (eio_init (want_poll, done_poll) < 0) 749 if (eio_init (want_poll, done_poll) < 0)
495 croak ("IO::AIO: unable to initialise eio library"); 750 croak ("IO::AIO: unable to initialise eio library");
496 751
497 /* atfork child called in fifo order, so before eio's handler */ 752 /* atfork child called in fifo order, so before eio's handler */
498 X_THREAD_ATFORK (0, 0, atfork_child); 753 X_THREAD_ATFORK (0, 0, atfork_child);
499} 754}
500 755
501void 756void
502max_poll_reqs (int nreqs) 757max_poll_reqs (int nreqs)
503 PROTOTYPE: $ 758 PROTOTYPE: $
556 ALIAS: 811 ALIAS:
557 aio_fsync = EIO_FSYNC 812 aio_fsync = EIO_FSYNC
558 aio_fdatasync = EIO_FDATASYNC 813 aio_fdatasync = EIO_FDATASYNC
559 PPCODE: 814 PPCODE:
560{ 815{
816 int fd = s_fileno_croak (fh, 0);
561 dREQ; 817 dREQ;
562 818
563 req->type = ix; 819 req->type = ix;
564 req->sv1 = newSVsv (fh); 820 req->sv1 = newSVsv (fh);
565 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 821 req->int1 = fd;
822
823 REQ_SEND (req);
824}
825
826void
827aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef)
828 PROTOTYPE: $$$$;$
829 PPCODE:
830{
831 int fd = s_fileno_croak (fh, 0);
832 dREQ;
833
834 req->type = EIO_SYNC_FILE_RANGE;
835 req->sv1 = newSVsv (fh);
836 req->int1 = fd;
837 req->offs = offset;
838 req->size = nbytes;
839 req->int2 = flags;
566 840
567 REQ_SEND (req); 841 REQ_SEND (req);
568} 842}
569 843
570void 844void
571aio_close (SV *fh, SV *callback=&PL_sv_undef) 845aio_close (SV *fh, SV *callback=&PL_sv_undef)
572 PROTOTYPE: $;$ 846 PROTOTYPE: $;$
573 PPCODE: 847 PPCODE:
574{ 848{
575 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 849 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
850 int fd = s_fileno_croak (fh, 0);
576 dREQ; 851 dREQ;
577 852
578 if (close_pipe < 0) 853 if (close_pipe < 0)
579 { 854 {
580 int pipefd [2]; 855 int pipefd [2];
588 } 863 }
589 864
590 req->type = EIO_DUP2; 865 req->type = EIO_DUP2;
591 req->int1 = close_pipe; 866 req->int1 = close_pipe;
592 req->sv2 = newSVsv (fh); 867 req->sv2 = newSVsv (fh);
593 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 868 req->int2 = fd;
594 869
595 REQ_SEND (req); 870 REQ_SEND (req);
596} 871}
597 872
598void 873void
602 aio_write = EIO_WRITE 877 aio_write = EIO_WRITE
603 PROTOTYPE: $$$$$;$ 878 PROTOTYPE: $$$$$;$
604 PPCODE: 879 PPCODE:
605{ 880{
606 STRLEN svlen; 881 STRLEN svlen;
882 int fd = s_fileno_croak (fh, ix == EIO_WRITE);
607 char *svptr = SvPVbyte (data, svlen); 883 char *svptr = SvPVbyte (data, svlen);
608 UV len = SvUV (length); 884 UV len = SvUV (length);
609
610 SvUPGRADE (data, SVt_PV);
611 SvPOK_on (data);
612 885
613 if (dataoffset < 0) 886 if (dataoffset < 0)
614 dataoffset += svlen; 887 dataoffset += svlen;
615 888
616 if (dataoffset < 0 || dataoffset > svlen) 889 if (dataoffset < 0 || dataoffset > svlen)
622 if (!SvOK (length) || len + dataoffset > svlen) 895 if (!SvOK (length) || len + dataoffset > svlen)
623 len = svlen - dataoffset; 896 len = svlen - dataoffset;
624 } 897 }
625 else 898 else
626 { 899 {
627 /* read: grow scalar as necessary */ 900 /* read: check type and grow scalar as necessary */
901 SvUPGRADE (data, SVt_PV);
628 svptr = SvGROW (data, len + dataoffset + 1); 902 svptr = SvGROW (data, len + dataoffset + 1);
629 } 903 }
630 904
631 if (len < 0)
632 croak ("length must not be negative");
633
634 { 905 {
635 dREQ; 906 dREQ;
636 907
637 req->type = ix; 908 req->type = ix;
638 req->sv1 = newSVsv (fh); 909 req->sv1 = newSVsv (fh);
639 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 910 req->int1 = fd;
640 : IoOFP (sv_2io (fh)));
641 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 911 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
642 req->size = len; 912 req->size = len;
643 req->sv2 = SvREFCNT_inc (data); 913 req->sv2 = SvREFCNT_inc (data);
644 req->ptr2 = (char *)svptr + dataoffset; 914 req->ptr2 = (char *)svptr + dataoffset;
645 req->stroffset = dataoffset; 915 req->stroffset = dataoffset;
668 938
669 REQ_SEND; 939 REQ_SEND;
670} 940}
671 941
672void 942void
673aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef) 943aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef)
674 PROTOTYPE: $$$$;$ 944 PROTOTYPE: $$$$;$
675 PPCODE: 945 PPCODE:
676{ 946{
947 int ifd = s_fileno_croak (in_fh , 0);
948 int ofd = s_fileno_croak (out_fh, 1);
677 dREQ; 949 dREQ;
678 950
679 req->type = EIO_SENDFILE; 951 req->type = EIO_SENDFILE;
680 req->sv1 = newSVsv (out_fh); 952 req->sv1 = newSVsv (out_fh);
681 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 953 req->int1 = ofd;
682 req->sv2 = newSVsv (in_fh); 954 req->sv2 = newSVsv (in_fh);
683 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 955 req->int2 = ifd;
684 req->offs = SvVAL64 (in_offset); 956 req->offs = in_offset;
685 req->size = length; 957 req->size = length;
686 958
687 REQ_SEND; 959 REQ_SEND;
688} 960}
689 961
690void 962void
691aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef) 963aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef)
692 PROTOTYPE: $$$;$ 964 PROTOTYPE: $$$;$
693 PPCODE: 965 PPCODE:
694{ 966{
967 int fd = s_fileno_croak (fh, 0);
695 dREQ; 968 dREQ;
696 969
697 req->type = EIO_READAHEAD; 970 req->type = EIO_READAHEAD;
698 req->sv1 = newSVsv (fh); 971 req->sv1 = newSVsv (fh);
699 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 972 req->int1 = fd;
700 req->offs = SvVAL64 (offset); 973 req->offs = offset;
701 req->size = length; 974 req->size = length;
702 975
703 REQ_SEND; 976 REQ_SEND;
704} 977}
705 978
706void 979void
707aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef) 980aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef)
708 ALIAS: 981 ALIAS:
709 aio_stat = EIO_STAT 982 aio_stat = EIO_STAT
710 aio_lstat = EIO_LSTAT 983 aio_lstat = EIO_LSTAT
984 aio_statvfs = EIO_STATVFS
711 PPCODE: 985 PPCODE:
712{ 986{
713 dREQ; 987 dREQ;
714 988
715 req->sv1 = newSVsv (fh_or_path); 989 req->sv1 = newSVsv (fh_or_path);
719 req->type = ix; 993 req->type = ix;
720 req->ptr1 = SvPVbyte_nolen (req->sv1); 994 req->ptr1 = SvPVbyte_nolen (req->sv1);
721 } 995 }
722 else 996 else
723 { 997 {
724 req->type = EIO_FSTAT; 998 req->type = ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT;
725 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 999 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
726 } 1000 }
727 1001
728 REQ_SEND; 1002 REQ_SEND;
729} 1003}
824 1098
825 REQ_SEND; 1099 REQ_SEND;
826} 1100}
827 1101
828void 1102void
1103aio_readdirx (SV8 *pathname, IV flags, SV *callback=&PL_sv_undef)
1104 PPCODE:
1105{
1106 dREQ;
1107
1108 req->type = EIO_READDIR;
1109 req->sv1 = newSVsv (pathname);
1110 req->ptr1 = SvPVbyte_nolen (req->sv1);
1111 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
1112
1113 if (flags & EIO_READDIR_DENTS)
1114 req->int1 |= EIO_READDIR_CUSTOM2;
1115
1116 REQ_SEND;
1117}
1118
1119void
829aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 1120aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
830 ALIAS: 1121 ALIAS:
831 aio_unlink = EIO_UNLINK 1122 aio_unlink = EIO_UNLINK
832 aio_rmdir = EIO_RMDIR 1123 aio_rmdir = EIO_RMDIR
833 aio_readdir = EIO_READDIR 1124 aio_readdir = EIO_READDIR
875 1166
876 REQ_SEND; 1167 REQ_SEND;
877} 1168}
878 1169
879void 1170void
1171aio_mtouch (SV8 *data, IV offset = 0, SV *length = &PL_sv_undef, int flags = 0, SV *callback=&PL_sv_undef)
1172 ALIAS:
1173 aio_mtouch = EIO_MTOUCH
1174 aio_msync = EIO_MSYNC
1175 PROTOTYPE: $$$$;$
1176 PPCODE:
1177{
1178 STRLEN svlen;
1179 UV len = SvUV (length);
1180 char *svptr = SvPVbyte (data, svlen);
1181
1182 if (offset < 0)
1183 offset += svlen;
1184
1185 if (offset < 0 || offset > svlen)
1186 croak ("offset outside of scalar");
1187
1188 if (!SvOK (length) || len + offset > svlen)
1189 len = svlen - offset;
1190
1191 {
1192 dREQ;
1193
1194 req->type = ix;
1195 req->size = len;
1196 req->sv2 = SvREFCNT_inc (data);
1197 req->ptr2 = (char *)svptr + offset;
1198 req->int1 = flags;
1199
1200 REQ_SEND;
1201 }
1202}
1203
1204void
880aio_busy (double delay, SV *callback=&PL_sv_undef) 1205aio_busy (double delay, SV *callback=&PL_sv_undef)
881 PPCODE: 1206 PPCODE:
882{ 1207{
883 dREQ; 1208 dREQ;
884 1209
895{ 1220{
896 dREQ; 1221 dREQ;
897 1222
898 req->type = EIO_GROUP; 1223 req->type = EIO_GROUP;
899 1224
900 eio_submit (req); 1225 req_submit (req);
901 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1226 XPUSHs (req_sv (req, aio_grp_stash));
902} 1227}
903 1228
904void 1229void
905aio_nop (SV *callback=&PL_sv_undef) 1230aio_nop (SV *callback=&PL_sv_undef)
906 ALIAS: 1231 ALIAS:
917 1242
918int 1243int
919aioreq_pri (int pri = 0) 1244aioreq_pri (int pri = 0)
920 PROTOTYPE: ;$ 1245 PROTOTYPE: ;$
921 CODE: 1246 CODE:
922 RETVAL = next_pri - EIO_PRI_BIAS; 1247 RETVAL = next_pri;
923 if (items > 0) 1248 if (items > 0)
924 { 1249 {
925 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN; 1250 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
926 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX; 1251 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
927 next_pri = pri + EIO_PRI_BIAS; 1252 next_pri = pri;
928 } 1253 }
929 OUTPUT: 1254 OUTPUT:
930 RETVAL 1255 RETVAL
931 1256
932void 1257void
933aioreq_nice (int nice = 0) 1258aioreq_nice (int nice = 0)
934 CODE: 1259 CODE:
935 nice = next_pri - nice; 1260 nice = next_pri - nice;
936 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN; 1261 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
937 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX; 1262 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
938 next_pri = nice + EIO_PRI_BIAS; 1263 next_pri = nice;
939 1264
940void 1265void
941flush () 1266flush ()
942 PROTOTYPE: 1267 PROTOTYPE:
943 CODE: 1268 CODE:
958 1283
959int 1284int
960poll_fileno() 1285poll_fileno()
961 PROTOTYPE: 1286 PROTOTYPE:
962 CODE: 1287 CODE:
963 RETVAL = respipe [0]; 1288 RETVAL = s_epipe_fd (&respipe);
964 OUTPUT: 1289 OUTPUT:
965 RETVAL 1290 RETVAL
966 1291
967int 1292int
968poll_cb(...) 1293poll_cb(...)
1004 1329
1005int 1330int
1006nthreads() 1331nthreads()
1007 PROTOTYPE: 1332 PROTOTYPE:
1008 CODE: 1333 CODE:
1009 if (WORDACCESS_UNSAFE) X_LOCK (wrklock); 1334 RETVAL = eio_nthreads ();
1010 RETVAL = started;
1011 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1012 OUTPUT: 1335 OUTPUT:
1013 RETVAL 1336 RETVAL
1014 1337
1338int
1339fadvise (aio_rfd fh, off_t offset, off_t length, IV advice)
1340 PROTOTYPE: $$$$
1341 CODE:
1342#if _XOPEN_SOURCE >= 600 && !NO_FADVISE
1343 RETVAL = posix_fadvise (fh, offset, length, advice);
1344#else
1345 RETVAL = errno = ENOSYS; /* yes, this is actually correct */
1346#endif
1347 OUTPUT:
1348 RETVAL
1349
1350ssize_t
1351sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
1352 PROTOTYPE: $$$$
1353 CODE:
1354 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count);
1355 OUTPUT:
1356 RETVAL
1357
1358void
1359mmap (SV *scalar, size_t length, int prot, int flags, SV *fh, off_t offset = 0)
1360 PROTOTYPE: $$$$$;$
1361 PPCODE:
1362 sv_unmagic (scalar, MMAP_MAGIC);
1363{
1364 int fd = SvOK (fh) ? s_fileno_croak (fh, flags & PROT_WRITE) : -1;
1365 void *addr = (void *)mmap (0, length, prot, flags, fd, offset);
1366 if (addr == (void *)-1)
1367 XSRETURN_NO;
1368
1369 /* we store the length in mg_obj, as namlen is I32 :/ */
1370 sv_magicext (scalar, 0, MMAP_MAGIC, &mmap_vtbl, (char *)addr, 0)
1371 ->mg_obj = (SV *)length;
1372
1373 SvUPGRADE (scalar, SVt_PV); /* nop... */
1374 if (!(prot & PROT_WRITE))
1375 SvREADONLY_on (scalar);
1376
1377 SvPVX (scalar) = (char *)addr;
1378 SvCUR_set (scalar, length);
1379 SvLEN_set (scalar, 0);
1380 SvPOK_only (scalar);
1381
1382 XSRETURN_YES;
1383}
1384
1385void
1386munmap (SV *scalar)
1387 PROTOTYPE: $
1388 CODE:
1389 sv_unmagic (scalar, MMAP_MAGIC);
1390
1391int
1392mlockall (int flags)
1393 PROTOTYPE: $
1394 CODE:
1395#if _POSIX_MEMLOCK
1396#if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
1397 extern int mallopt (int, int);
1398 mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
1399#endif
1400 mlockall (flags);
1401#else
1402 RETVAL = -1;
1403 errno = ENOSYS;
1404#endif
1405 OUTPUT:
1406 RETVAL
1407
1408int
1409munlockall ()
1410 PROTOTYPE:
1411 CODE:
1412#if _POSIX_MEMLOCK
1413 munlockall ();
1414#else
1415 RETVAL = -1;
1416 errno = ENOSYS;
1417#endif
1418 OUTPUT:
1419 RETVAL
1420
1015void _on_next_submit (SV *cb) 1421void _on_next_submit (SV *cb)
1016 CODE: 1422 CODE:
1017 SvREFCNT_dec (on_next_submit); 1423 SvREFCNT_dec (on_next_submit);
1018 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1424 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1019 1425
1026 CODE: 1432 CODE:
1027 eio_cancel (req); 1433 eio_cancel (req);
1028 1434
1029void 1435void
1030cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1436cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1031 CODE: 1437 PPCODE:
1438{
1439 if (GIMME_V != G_VOID)
1440 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1441
1442 if (items > 1)
1443 {
1444 SV *cb_cv =get_cb (callback);
1445
1032 SvREFCNT_dec (req->callback); 1446 SvREFCNT_dec (req->callback);
1033 req->callback = newSVsv (callback); 1447 req->callback = SvREFCNT_inc (cb_cv);
1448 }
1449}
1034 1450
1035MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1451MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1036 1452
1037void 1453void
1038add (aio_req grp, ...) 1454add (aio_req grp, ...)
1070 AV *av; 1486 AV *av;
1071 1487
1072 grp->errorno = errno; 1488 grp->errorno = errno;
1073 1489
1074 av = newAV (); 1490 av = newAV ();
1491 av_extend (av, items - 1);
1075 1492
1076 for (i = 1; i < items; ++i ) 1493 for (i = 1; i < items; ++i )
1077 av_push (av, newSVsv (ST (i))); 1494 av_push (av, newSVsv (ST (i)));
1078 1495
1079 SvREFCNT_dec (grp->sv1); 1496 SvREFCNT_dec (grp->sv1);
1093void 1510void
1094feed (aio_req grp, SV *callback=&PL_sv_undef) 1511feed (aio_req grp, SV *callback=&PL_sv_undef)
1095 CODE: 1512 CODE:
1096{ 1513{
1097 SvREFCNT_dec (grp->sv2); 1514 SvREFCNT_dec (grp->sv2);
1098 grp->sv2 = newSVsv (callback); 1515 grp->sv2 = newSVsv (callback);
1516 grp->feed = aio_grp_feed;
1099 1517
1100 if (grp->int2 <= 0) 1518 if (grp->int2 <= 0)
1101 grp->int2 = 2; 1519 grp->int2 = 2;
1102 1520
1103 eio_grp_limit (grp, grp->int2); 1521 eio_grp_limit (grp, grp->int2);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines