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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines