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.121 by root, Tue May 13 18:50:27 2008 UTC vs.
Revision 1.165 by root, Sun May 9 20:42:55 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; \
89 SV *self; 119 SV *self;
90 120
121#define EIO_NO_WRAPPERS 1
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 */
108 223
109static SV *on_next_submit; 224static SV *on_next_submit;
110static int next_pri = EIO_PRI_DEFAULT; 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 {
316 static SV *sv_result_cache; /* caches the result integer SV */
317 SV *sv_result;
318
200 ENTER; 319 ENTER;
201 SAVETMPS; 320 SAVETMPS;
202 PUSHMARK (SP); 321 PUSHMARK (SP);
203 EXTEND (SP, 1); 322 EXTEND (SP, 1);
323
324 /* do not recreate the result IV from scratch each time */
325 if (expect_true (sv_result_cache))
326 {
327 sv_result = sv_result_cache; sv_result_cache = 0;
328 SvIV_set (sv_result, req->result);
329 }
330 else
331 {
332 sv_result = newSViv (req->result);
333 SvREADONLY_on (sv_result);
334 }
204 335
205 switch (req->type) 336 switch (req->type)
206 { 337 {
207 case EIO_READDIR: 338 case EIO_READDIR:
208 { 339 {
209 SV *rv = &PL_sv_undef; 340 SV *rv = &PL_sv_undef;
210 341
211 if (req->result >= 0) 342 if (req->result >= 0)
212 { 343 {
213 int i; 344 int i;
214 char *buf = req->ptr2; 345 char *names = (char *)req->ptr2;
346 eio_dirent *ent = (eio_dirent *)req->ptr1; /* might be 0 */
215 AV *av = newAV (); 347 AV *av = newAV ();
216 348
217 av_extend (av, req->result - 1); 349 av_extend (av, req->result - 1);
218 350
219 for (i = 0; i < req->result; ++i) 351 for (i = 0; i < req->result; ++i)
220 { 352 {
221 SV *sv = newSVpv (buf, 0); 353 if (req->int1 & EIO_READDIR_DENTS)
354 {
355 SV *namesv = newSVpvn (names + ent->nameofs, ent->namelen);
222 356
357 if (req->int1 & EIO_READDIR_CUSTOM2)
358 {
359 static SV *sv_type [EIO_DT_MAX + 1]; /* type sv cache */
360 AV *avent = newAV ();
361
362 av_extend (avent, 2);
363
364 if (!sv_type [ent->type])
365 {
366 sv_type [ent->type] = newSViv (ent->type);
367 SvREADONLY_on (sv_type [ent->type]);
368 }
369
370 av_store (avent, 0, namesv);
371 av_store (avent, 1, SvREFCNT_inc (sv_type [ent->type]));
372 av_store (avent, 2, IVSIZE >= 8 ? newSVuv (ent->inode) : newSVnv (ent->inode));
373
374 av_store (av, i, newRV_noinc ((SV *)avent));
375 }
376 else
223 av_store (av, i, sv); 377 av_store (av, i, namesv);
378
379 ++ent;
380 }
381 else
382 {
383 SV *name = newSVpv (names, 0);
384 av_store (av, i, name);
224 buf += SvCUR (sv) + 1; 385 names += SvCUR (name) + 1;
386 }
225 } 387 }
226 388
227 rv = sv_2mortal (newRV_noinc ((SV *)av)); 389 rv = sv_2mortal (newRV_noinc ((SV *)av));
228 } 390 }
229 391
230 PUSHs (rv); 392 PUSHs (rv);
393
394 if (req->int1 & EIO_READDIR_CUSTOM1)
395 XPUSHs (sv_2mortal (newSViv (req->int1 & ~(EIO_READDIR_CUSTOM1 | EIO_READDIR_CUSTOM2))));
231 } 396 }
232 break; 397 break;
233 398
234 case EIO_OPEN: 399 case EIO_OPEN:
235 { 400 {
241 GV *gv = (GV *)sv_newmortal (); 406 GV *gv = (GV *)sv_newmortal ();
242 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR); 407 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
243 char sym [64]; 408 char sym [64];
244 int symlen; 409 int symlen;
245 410
246 symlen = snprintf (sym, sizeof (sym), "fd#%d", req->result); 411 symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
247 gv_init (gv, stash, sym, symlen, 0); 412 gv_init (gv, aio_stash, sym, symlen, 0);
248 413
249 symlen = snprintf ( 414 symlen = snprintf (
250 sym, 415 sym,
251 sizeof (sym), 416 sizeof (sym),
252 "%s&=%d", 417 "%s&=%d",
253 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<", 418 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
254 req->result 419 (int)req->result
255 ); 420 );
256 421
257 if (do_open (gv, sym, symlen, 0, 0, 0, 0)) 422 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
258 fh = (SV *)gv; 423 fh = (SV *)gv;
259 } 424 }
260 425
261 PUSHs (fh); 426 PUSHs (fh);
262 } 427 }
428 break;
429
430 case EIO_STATVFS:
431 case EIO_FSTATVFS:
432 {
433 SV *rv = &PL_sv_undef;
434
435 if (req->result >= 0)
436 {
437 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req);
438 HV *hv = newHV ();
439
440 rv = sv_2mortal (newRV_noinc ((SV *)hv));
441
442 hv_store (hv, "bsize" , sizeof ("bsize" ) - 1, newSVval64 (f->f_bsize ), 0);
443 hv_store (hv, "frsize" , sizeof ("frsize" ) - 1, newSVval64 (f->f_frsize ), 0);
444 hv_store (hv, "blocks" , sizeof ("blocks" ) - 1, newSVval64 (f->f_blocks ), 0);
445 hv_store (hv, "bfree" , sizeof ("bfree" ) - 1, newSVval64 (f->f_bfree ), 0);
446 hv_store (hv, "bavail" , sizeof ("bavail" ) - 1, newSVval64 (f->f_bavail ), 0);
447 hv_store (hv, "files" , sizeof ("files" ) - 1, newSVval64 (f->f_files ), 0);
448 hv_store (hv, "ffree" , sizeof ("ffree" ) - 1, newSVval64 (f->f_ffree ), 0);
449 hv_store (hv, "favail" , sizeof ("favail" ) - 1, newSVval64 (f->f_favail ), 0);
450 hv_store (hv, "fsid" , sizeof ("fsid" ) - 1, newSVval64 (f->f_fsid ), 0);
451 hv_store (hv, "flag" , sizeof ("flag" ) - 1, newSVval64 (f->f_flag ), 0);
452 hv_store (hv, "namemax", sizeof ("namemax") - 1, newSVval64 (f->f_namemax), 0);
453 }
454
455 PUSHs (rv);
456 }
457
263 break; 458 break;
264 459
265 case EIO_GROUP: 460 case EIO_GROUP:
266 req->int1 = 2; /* mark group as finished */ 461 req->int1 = 2; /* mark group as finished */
267 462
289 case EIO_LSTAT: 484 case EIO_LSTAT:
290 case EIO_FSTAT: 485 case EIO_FSTAT:
291 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT; 486 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT;
292 PL_laststatval = req->result; 487 PL_laststatval = req->result;
293 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 488 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
294 PUSHs (sv_2mortal (newSViv (req->result))); 489 PUSHs (sv_result);
295 break; 490 break;
296 491
297 case EIO_READ: 492 case EIO_READ:
493 {
298 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0)); 494 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
299 *SvEND (req->sv2) = 0; 495 *SvEND (req->sv2) = 0;
300 PUSHs (sv_2mortal (newSViv (req->result))); 496 SvPOK_only (req->sv2);
497 SvSETMAGIC (req->sv2);
498 PUSHs (sv_result);
499 }
301 break; 500 break;
302 501
303 case EIO_DUP2: 502 case EIO_DUP2:
304 if (req->result > 0) 503 if (req->result > 0)
305 req->result = 0; 504 SvIV_set (sv_result, 0);
306 /* FALLTHROUGH */ 505 /* FALLTHROUGH */
307 506
308 default: 507 default:
309 PUSHs (sv_2mortal (newSViv (req->result))); 508 PUSHs (sv_result);
310 break; 509 break;
311 } 510 }
312 511
313 errno = req->errorno; 512 errno = req->errorno;
314 513
315 PUTBACK; 514 PUTBACK;
316 call_sv (req->callback, G_VOID | G_EVAL | G_DISCARD); 515 call_sv (req->callback, G_VOID | G_EVAL | G_DISCARD);
317 SPAGAIN; 516 SPAGAIN;
517
518 if (expect_false (SvREFCNT (sv_result) != 1 || sv_result_cache))
519 SvREFCNT_dec (sv_result);
520 else
521 sv_result_cache = sv_result;
318 522
319 FREETMPS; 523 FREETMPS;
320 LEAVE; 524 LEAVE;
321 525
322 PUTBACK; 526 PUTBACK;
351 grp->sv2 = 0; 555 grp->sv2 = 0;
352 556
353 eio_grp_cancel (grp); 557 eio_grp_cancel (grp);
354} 558}
355 559
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 560static void
363create_respipe (void) 561create_respipe (void)
364{ 562{
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)) 563 if (s_epipe_renew (&respipe))
374#endif
375 croak ("unable to initialize result pipe"); 564 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} 565}
399 566
400static void poll_wait (void) 567static void poll_wait (void)
401{ 568{
402 fd_set rfd;
403
404 while (eio_nreqs ()) 569 while (eio_nreqs ())
405 { 570 {
406 int size; 571 int size;
407 572
408 X_LOCK (reslock); 573 X_LOCK (reslock);
410 X_UNLOCK (reslock); 575 X_UNLOCK (reslock);
411 576
412 if (size) 577 if (size)
413 return; 578 return;
414 579
415 maybe_start_thread (); 580 etp_maybe_start_thread ();
416 581
417 FD_ZERO (&rfd); 582 s_epipe_wait (&respipe);
418 FD_SET (respipe [0], &rfd);
419
420 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
421 } 583 }
422} 584}
423 585
424static int poll_cb (void) 586static int poll_cb (void)
425{ 587{
426 int res; 588 for (;;)
427
428 do
429 { 589 {
430 res = eio_poll (); 590 int res = eio_poll ();
431 591
432 if (res > 0) 592 if (res > 0)
433 croak (0); 593 croak (0);
594
595 if (!max_outstanding || max_outstanding > eio_nreqs ())
596 return res;
597
598 poll_wait ();
434 } 599 }
435 while (max_outstanding && max_outstanding <= eio_nreqs ());
436
437 return res;
438} 600}
439 601
440static void atfork_child (void) 602static void atfork_child (void)
441{ 603{
442 create_respipe (); 604 create_respipe ();
443} 605}
444 606
607/*****************************************************************************/
608
609#if !_POSIX_MAPPED_FILES
610# define mmap(addr,length,prot,flags,fd,offs) (errno = ENOSYS, -1)
611# define munmap(addr,length) (errno = ENOSYS, -1)
612#endif
613
614#define MMAP_MAGIC PERL_MAGIC_ext
615
616static int
617mmap_free (pTHX_ SV *sv, MAGIC *mg)
618{
619 int old_errno = errno;
620 munmap (mg->mg_ptr, (size_t)mg->mg_obj);
621 errno = old_errno;
622
623 mg->mg_obj = 0; /* just in case */
624
625 SvREADONLY_off (sv);
626 SvCUR_set (sv, 0);
627 SvLEN_set (sv, 0);
628 SvPVX (sv) = 0;
629 SvOK_off (sv);
630
631 return 0;
632}
633
634static MGVTBL mmap_vtbl = {
635 0, 0, 0, 0, mmap_free
636};
637
638/*****************************************************************************/
639
640static SV *
641get_cb (SV *cb_sv)
642{
643 SvGETMAGIC (cb_sv);
644 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
645}
646
445#define dREQ \ 647#define dREQ \
648 SV *cb_cv; \
446 aio_req req; \ 649 aio_req req; \
447 int req_pri = next_pri; \ 650 int req_pri = next_pri; \
448 next_pri = EIO_PRI_DEFAULT; \ 651 next_pri = EIO_PRI_DEFAULT; \
449 \ 652 \
450 if (SvOK (callback) && !SvROK (callback)) \ 653 cb_cv = get_cb (callback); \
451 croak ("callback must be undef or of reference type"); \
452 \ 654 \
453 Newz (0, req, 1, eio_req); \ 655 Newz (0, req, 1, eio_req); \
454 if (!req) \ 656 if (!req) \
455 croak ("out of memory during eio_req allocation"); \ 657 croak ("out of memory during eio_req allocation"); \
456 \ 658 \
457 req->callback = newSVsv (callback); \ 659 req->callback = SvREFCNT_inc (cb_cv); \
458 req->pri = req_pri 660 req->pri = req_pri
459 661
460#define REQ_SEND \ 662#define REQ_SEND \
663 PUTBACK; \
461 req_submit (req); \ 664 req_submit (req); \
665 SPAGAIN; \
462 \ 666 \
463 if (GIMME_V != G_VOID) \ 667 if (GIMME_V != G_VOID) \
464 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 668 XPUSHs (req_sv (req, aio_req_stash));
465 669
466MODULE = IO::AIO PACKAGE = IO::AIO 670MODULE = IO::AIO PACKAGE = IO::AIO
467 671
468PROTOTYPES: ENABLE 672PROTOTYPES: ENABLE
469 673
470BOOT: 674BOOT:
471{ 675{
472 stash = gv_stashpv ("IO::AIO", 1); 676 static const struct {
473 677 const char *name;
474 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 678 IV iv;
475 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 679 } *civ, const_iv[] = {
476 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 680# define const_niv(name, value) { # name, (IV) value },
477 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 681# define const_iv(name) { # name, (IV) name },
478 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 682# define const_eio(name) { # name, (IV) EIO_ ## name },
683 const_iv (EXDEV)
684 const_iv (ENOSYS)
685 const_iv (O_RDONLY)
686 const_iv (O_WRONLY)
687 const_iv (O_RDWR)
688 const_iv (O_CREAT)
689 const_iv (O_TRUNC)
690 const_iv (O_EXCL)
691 const_iv (O_APPEND)
479#ifdef _WIN32 692#ifndef _WIN32
480 X_MUTEX_CHECK (wrklock); 693 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 694#endif
695 const_niv (FADV_NORMAL , POSIX_FADV_NORMAL)
696 const_niv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL)
697 const_niv (FADV_RANDOM , POSIX_FADV_RANDOM)
698 const_niv (FADV_NOREUSE , POSIX_FADV_NOREUSE)
699 const_niv (FADV_WILLNEED , POSIX_FADV_WILLNEED)
700 const_niv (FADV_DONTNEED , POSIX_FADV_DONTNEED)
491 701
702 const_iv (ST_RDONLY)
703 const_iv (ST_NOSUID)
704 const_iv (ST_NODEV)
705 const_iv (ST_NOEXEC)
706 const_iv (ST_SYNCHRONOUS)
707 const_iv (ST_MANDLOCK)
708 const_iv (ST_WRITE)
709 const_iv (ST_APPEND)
710 const_iv (ST_IMMUTABLE)
711 const_iv (ST_NOATIME)
712 const_iv (ST_NODIRATIME)
713 const_iv (ST_RELATIME)
714
715 const_iv (PROT_EXEC)
716 const_iv (PROT_NONE)
717 const_iv (PROT_READ)
718 const_iv (PROT_WRITE)
719
720 /*const_iv (MAP_FIXED)*/
721 const_iv (MAP_PRIVATE)
722 const_iv (MAP_SHARED)
723 const_iv (MAP_ANONYMOUS)
724
725 /* linuxish */
726 const_iv (MAP_HUGETLB)
727 const_iv (MAP_LOCKED)
728 const_iv (MAP_NORESERVE)
729 const_iv (MAP_POPULATE)
730 const_iv (MAP_NONBLOCK)
731
732 const_iv (MCL_FUTURE)
733 const_iv (MCL_CURRENT)
734
735 const_eio (MS_ASYNC)
736 const_eio (MS_INVALIDATE)
737 const_eio (MS_SYNC)
738
739 const_eio (MT_MODIFY)
740
741 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
742 const_eio (SYNC_FILE_RANGE_WRITE)
743 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
744
745 const_eio (READDIR_DENTS)
746 const_eio (READDIR_DIRS_FIRST)
747 const_eio (READDIR_STAT_ORDER)
748 const_eio (READDIR_FOUND_UNKNOWN)
749
750 const_eio (DT_UNKNOWN)
751 const_eio (DT_FIFO)
752 const_eio (DT_CHR)
753 const_eio (DT_DIR)
754 const_eio (DT_BLK)
755 const_eio (DT_REG)
756 const_eio (DT_LNK)
757 const_eio (DT_SOCK)
758 const_eio (DT_WHT)
759 };
760
761 aio_stash = gv_stashpv ("IO::AIO" , 1);
762 aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1);
763 aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1);
764
765 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
766 newCONSTSUB (aio_stash, (char *)civ->name, newSViv (civ->iv));
767
768 newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE));
769
492 create_respipe (); 770 create_respipe ();
493 771
494 if (eio_init (want_poll, done_poll) < 0) 772 if (eio_init (want_poll, done_poll) < 0)
495 croak ("IO::AIO: unable to initialise eio library"); 773 croak ("IO::AIO: unable to initialise eio library");
496 774
497 /* atfork child called in fifo order, so before eio's handler */ 775 /* atfork child called in fifo order, so before eio's handler */
498 X_THREAD_ATFORK (0, 0, atfork_child); 776 X_THREAD_ATFORK (0, 0, atfork_child);
499} 777}
500 778
501void 779void
502max_poll_reqs (int nreqs) 780max_poll_reqs (int nreqs)
503 PROTOTYPE: $ 781 PROTOTYPE: $
556 ALIAS: 834 ALIAS:
557 aio_fsync = EIO_FSYNC 835 aio_fsync = EIO_FSYNC
558 aio_fdatasync = EIO_FDATASYNC 836 aio_fdatasync = EIO_FDATASYNC
559 PPCODE: 837 PPCODE:
560{ 838{
839 int fd = s_fileno_croak (fh, 0);
561 dREQ; 840 dREQ;
562 841
563 req->type = ix; 842 req->type = ix;
564 req->sv1 = newSVsv (fh); 843 req->sv1 = newSVsv (fh);
565 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 844 req->int1 = fd;
845
846 REQ_SEND (req);
847}
848
849void
850aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef)
851 PROTOTYPE: $$$$;$
852 PPCODE:
853{
854 int fd = s_fileno_croak (fh, 0);
855 dREQ;
856
857 req->type = EIO_SYNC_FILE_RANGE;
858 req->sv1 = newSVsv (fh);
859 req->int1 = fd;
860 req->offs = offset;
861 req->size = nbytes;
862 req->int2 = flags;
566 863
567 REQ_SEND (req); 864 REQ_SEND (req);
568} 865}
569 866
570void 867void
571aio_close (SV *fh, SV *callback=&PL_sv_undef) 868aio_close (SV *fh, SV *callback=&PL_sv_undef)
572 PROTOTYPE: $;$ 869 PROTOTYPE: $;$
573 PPCODE: 870 PPCODE:
574{ 871{
575 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 872 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
873 int fd = s_fileno_croak (fh, 0);
576 dREQ; 874 dREQ;
577 875
578 if (close_pipe < 0) 876 if (close_pipe < 0)
579 { 877 {
580 int pipefd [2]; 878 int pipefd [2];
588 } 886 }
589 887
590 req->type = EIO_DUP2; 888 req->type = EIO_DUP2;
591 req->int1 = close_pipe; 889 req->int1 = close_pipe;
592 req->sv2 = newSVsv (fh); 890 req->sv2 = newSVsv (fh);
593 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 891 req->int2 = fd;
594 892
595 REQ_SEND (req); 893 REQ_SEND (req);
596} 894}
597 895
598void 896void
602 aio_write = EIO_WRITE 900 aio_write = EIO_WRITE
603 PROTOTYPE: $$$$$;$ 901 PROTOTYPE: $$$$$;$
604 PPCODE: 902 PPCODE:
605{ 903{
606 STRLEN svlen; 904 STRLEN svlen;
905 int fd = s_fileno_croak (fh, ix == EIO_WRITE);
607 char *svptr = SvPVbyte (data, svlen); 906 char *svptr = SvPVbyte (data, svlen);
608 UV len = SvUV (length); 907 UV len = SvUV (length);
609
610 SvUPGRADE (data, SVt_PV);
611 SvPOK_on (data);
612 908
613 if (dataoffset < 0) 909 if (dataoffset < 0)
614 dataoffset += svlen; 910 dataoffset += svlen;
615 911
616 if (dataoffset < 0 || dataoffset > svlen) 912 if (dataoffset < 0 || dataoffset > svlen)
622 if (!SvOK (length) || len + dataoffset > svlen) 918 if (!SvOK (length) || len + dataoffset > svlen)
623 len = svlen - dataoffset; 919 len = svlen - dataoffset;
624 } 920 }
625 else 921 else
626 { 922 {
627 /* read: grow scalar as necessary */ 923 /* read: check type and grow scalar as necessary */
924 SvUPGRADE (data, SVt_PV);
628 svptr = SvGROW (data, len + dataoffset + 1); 925 svptr = SvGROW (data, len + dataoffset + 1);
629 } 926 }
630 927
631 if (len < 0)
632 croak ("length must not be negative");
633
634 { 928 {
635 dREQ; 929 dREQ;
636 930
637 req->type = ix; 931 req->type = ix;
638 req->sv1 = newSVsv (fh); 932 req->sv1 = newSVsv (fh);
639 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 933 req->int1 = fd;
640 : IoOFP (sv_2io (fh)));
641 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 934 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
642 req->size = len; 935 req->size = len;
643 req->sv2 = SvREFCNT_inc (data); 936 req->sv2 = SvREFCNT_inc (data);
644 req->ptr2 = (char *)svptr + dataoffset; 937 req->ptr2 = (char *)svptr + dataoffset;
645 req->stroffset = dataoffset; 938 req->stroffset = dataoffset;
668 961
669 REQ_SEND; 962 REQ_SEND;
670} 963}
671 964
672void 965void
673aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef) 966aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef)
674 PROTOTYPE: $$$$;$ 967 PROTOTYPE: $$$$;$
675 PPCODE: 968 PPCODE:
676{ 969{
970 int ifd = s_fileno_croak (in_fh , 0);
971 int ofd = s_fileno_croak (out_fh, 1);
677 dREQ; 972 dREQ;
678 973
679 req->type = EIO_SENDFILE; 974 req->type = EIO_SENDFILE;
680 req->sv1 = newSVsv (out_fh); 975 req->sv1 = newSVsv (out_fh);
681 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 976 req->int1 = ofd;
682 req->sv2 = newSVsv (in_fh); 977 req->sv2 = newSVsv (in_fh);
683 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 978 req->int2 = ifd;
684 req->offs = SvVAL64 (in_offset); 979 req->offs = in_offset;
685 req->size = length; 980 req->size = length;
686 981
687 REQ_SEND; 982 REQ_SEND;
688} 983}
689 984
690void 985void
691aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef) 986aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef)
692 PROTOTYPE: $$$;$ 987 PROTOTYPE: $$$;$
693 PPCODE: 988 PPCODE:
694{ 989{
990 int fd = s_fileno_croak (fh, 0);
695 dREQ; 991 dREQ;
696 992
697 req->type = EIO_READAHEAD; 993 req->type = EIO_READAHEAD;
698 req->sv1 = newSVsv (fh); 994 req->sv1 = newSVsv (fh);
699 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 995 req->int1 = fd;
700 req->offs = SvVAL64 (offset); 996 req->offs = offset;
701 req->size = length; 997 req->size = length;
702 998
703 REQ_SEND; 999 REQ_SEND;
704} 1000}
705 1001
706void 1002void
707aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef) 1003aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef)
708 ALIAS: 1004 ALIAS:
709 aio_stat = EIO_STAT 1005 aio_stat = EIO_STAT
710 aio_lstat = EIO_LSTAT 1006 aio_lstat = EIO_LSTAT
1007 aio_statvfs = EIO_STATVFS
711 PPCODE: 1008 PPCODE:
712{ 1009{
713 dREQ; 1010 dREQ;
714 1011
715 req->sv1 = newSVsv (fh_or_path); 1012 req->sv1 = newSVsv (fh_or_path);
719 req->type = ix; 1016 req->type = ix;
720 req->ptr1 = SvPVbyte_nolen (req->sv1); 1017 req->ptr1 = SvPVbyte_nolen (req->sv1);
721 } 1018 }
722 else 1019 else
723 { 1020 {
724 req->type = EIO_FSTAT; 1021 req->type = ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT;
725 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1022 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
726 } 1023 }
727 1024
728 REQ_SEND; 1025 REQ_SEND;
729} 1026}
824 1121
825 REQ_SEND; 1122 REQ_SEND;
826} 1123}
827 1124
828void 1125void
1126aio_readdirx (SV8 *pathname, IV flags, SV *callback=&PL_sv_undef)
1127 PPCODE:
1128{
1129 dREQ;
1130
1131 req->type = EIO_READDIR;
1132 req->sv1 = newSVsv (pathname);
1133 req->ptr1 = SvPVbyte_nolen (req->sv1);
1134 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
1135
1136 if (flags & EIO_READDIR_DENTS)
1137 req->int1 |= EIO_READDIR_CUSTOM2;
1138
1139 REQ_SEND;
1140}
1141
1142void
829aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 1143aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
830 ALIAS: 1144 ALIAS:
831 aio_unlink = EIO_UNLINK 1145 aio_unlink = EIO_UNLINK
832 aio_rmdir = EIO_RMDIR 1146 aio_rmdir = EIO_RMDIR
833 aio_readdir = EIO_READDIR 1147 aio_readdir = EIO_READDIR
875 1189
876 REQ_SEND; 1190 REQ_SEND;
877} 1191}
878 1192
879void 1193void
1194aio_mtouch (SV8 *data, IV offset = 0, SV *length = &PL_sv_undef, int flags = 0, SV *callback=&PL_sv_undef)
1195 ALIAS:
1196 aio_mtouch = EIO_MTOUCH
1197 aio_msync = EIO_MSYNC
1198 PROTOTYPE: $$$$;$
1199 PPCODE:
1200{
1201 STRLEN svlen;
1202 UV len = SvUV (length);
1203 char *svptr = SvPVbyte (data, svlen);
1204
1205 if (offset < 0)
1206 offset += svlen;
1207
1208 if (offset < 0 || offset > svlen)
1209 croak ("offset outside of scalar");
1210
1211 if (!SvOK (length) || len + offset > svlen)
1212 len = svlen - offset;
1213
1214 {
1215 dREQ;
1216
1217 req->type = ix;
1218 req->size = len;
1219 req->sv2 = SvREFCNT_inc (data);
1220 req->ptr2 = (char *)svptr + offset;
1221 req->int1 = flags;
1222
1223 REQ_SEND;
1224 }
1225}
1226
1227void
880aio_busy (double delay, SV *callback=&PL_sv_undef) 1228aio_busy (double delay, SV *callback=&PL_sv_undef)
881 PPCODE: 1229 PPCODE:
882{ 1230{
883 dREQ; 1231 dREQ;
884 1232
895{ 1243{
896 dREQ; 1244 dREQ;
897 1245
898 req->type = EIO_GROUP; 1246 req->type = EIO_GROUP;
899 1247
900 eio_submit (req); 1248 req_submit (req);
901 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1249 XPUSHs (req_sv (req, aio_grp_stash));
902} 1250}
903 1251
904void 1252void
905aio_nop (SV *callback=&PL_sv_undef) 1253aio_nop (SV *callback=&PL_sv_undef)
906 ALIAS: 1254 ALIAS:
958 1306
959int 1307int
960poll_fileno() 1308poll_fileno()
961 PROTOTYPE: 1309 PROTOTYPE:
962 CODE: 1310 CODE:
963 RETVAL = respipe [0]; 1311 RETVAL = s_epipe_fd (&respipe);
964 OUTPUT: 1312 OUTPUT:
965 RETVAL 1313 RETVAL
966 1314
967int 1315int
968poll_cb(...) 1316poll_cb(...)
1004 1352
1005int 1353int
1006nthreads() 1354nthreads()
1007 PROTOTYPE: 1355 PROTOTYPE:
1008 CODE: 1356 CODE:
1009 if (WORDACCESS_UNSAFE) X_LOCK (wrklock); 1357 RETVAL = eio_nthreads ();
1010 RETVAL = started;
1011 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1012 OUTPUT: 1358 OUTPUT:
1013 RETVAL 1359 RETVAL
1014 1360
1361int
1362fadvise (aio_rfd fh, off_t offset, off_t length, IV advice)
1363 PROTOTYPE: $$$$
1364 CODE:
1365#if _XOPEN_SOURCE >= 600 && !NO_FADVISE
1366 RETVAL = posix_fadvise (fh, offset, length, advice);
1367#else
1368 RETVAL = errno = ENOSYS; /* yes, this is actually correct */
1369#endif
1370 OUTPUT:
1371 RETVAL
1372
1373ssize_t
1374sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
1375 PROTOTYPE: $$$$
1376 CODE:
1377 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count);
1378 OUTPUT:
1379 RETVAL
1380
1381void
1382mmap (SV *scalar, size_t length, int prot, int flags, SV *fh, off_t offset = 0)
1383 PROTOTYPE: $$$$$;$
1384 PPCODE:
1385 sv_unmagic (scalar, MMAP_MAGIC);
1386{
1387 int fd = SvOK (fh) ? s_fileno_croak (fh, flags & PROT_WRITE) : -1;
1388 void *addr = (void *)mmap (0, length, prot, flags, fd, offset);
1389 if (addr == (void *)-1)
1390 XSRETURN_NO;
1391
1392 /* we store the length in mg_obj, as namlen is I32 :/ */
1393 sv_magicext (scalar, 0, MMAP_MAGIC, &mmap_vtbl, (char *)addr, 0)
1394 ->mg_obj = (SV *)length;
1395
1396 SvUPGRADE (scalar, SVt_PV); /* nop... */
1397 if (!(prot & PROT_WRITE))
1398 SvREADONLY_on (scalar);
1399
1400 SvPVX (scalar) = (char *)addr;
1401 SvCUR_set (scalar, length);
1402 SvLEN_set (scalar, 0);
1403 SvPOK_only (scalar);
1404
1405 XSRETURN_YES;
1406}
1407
1408void
1409munmap (SV *scalar)
1410 PROTOTYPE: $
1411 CODE:
1412 sv_unmagic (scalar, MMAP_MAGIC);
1413
1414int
1415mlockall (int flags)
1416 PROTOTYPE: $
1417 CODE:
1418#if _POSIX_MEMLOCK
1419#if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
1420 extern int mallopt (int, int);
1421 mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
1422#endif
1423 mlockall (flags);
1424#else
1425 RETVAL = -1;
1426 errno = ENOSYS;
1427#endif
1428 OUTPUT:
1429 RETVAL
1430
1431int
1432munlockall ()
1433 PROTOTYPE:
1434 CODE:
1435#if _POSIX_MEMLOCK
1436 munlockall ();
1437#else
1438 RETVAL = -1;
1439 errno = ENOSYS;
1440#endif
1441 OUTPUT:
1442 RETVAL
1443
1015void _on_next_submit (SV *cb) 1444void _on_next_submit (SV *cb)
1016 CODE: 1445 CODE:
1017 SvREFCNT_dec (on_next_submit); 1446 SvREFCNT_dec (on_next_submit);
1018 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1447 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1019 1448
1026 CODE: 1455 CODE:
1027 eio_cancel (req); 1456 eio_cancel (req);
1028 1457
1029void 1458void
1030cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1459cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1031 CODE: 1460 PPCODE:
1461{
1462 if (GIMME_V != G_VOID)
1463 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1464
1465 if (items > 1)
1466 {
1467 SV *cb_cv =get_cb (callback);
1468
1032 SvREFCNT_dec (req->callback); 1469 SvREFCNT_dec (req->callback);
1033 req->callback = newSVsv (callback); 1470 req->callback = SvREFCNT_inc (cb_cv);
1471 }
1472}
1034 1473
1035MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1474MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1036 1475
1037void 1476void
1038add (aio_req grp, ...) 1477add (aio_req grp, ...)
1070 AV *av; 1509 AV *av;
1071 1510
1072 grp->errorno = errno; 1511 grp->errorno = errno;
1073 1512
1074 av = newAV (); 1513 av = newAV ();
1514 av_extend (av, items - 1);
1075 1515
1076 for (i = 1; i < items; ++i ) 1516 for (i = 1; i < items; ++i )
1077 av_push (av, newSVsv (ST (i))); 1517 av_push (av, newSVsv (ST (i)));
1078 1518
1079 SvREFCNT_dec (grp->sv1); 1519 SvREFCNT_dec (grp->sv1);
1093void 1533void
1094feed (aio_req grp, SV *callback=&PL_sv_undef) 1534feed (aio_req grp, SV *callback=&PL_sv_undef)
1095 CODE: 1535 CODE:
1096{ 1536{
1097 SvREFCNT_dec (grp->sv2); 1537 SvREFCNT_dec (grp->sv2);
1098 grp->sv2 = newSVsv (callback); 1538 grp->sv2 = newSVsv (callback);
1539 grp->feed = aio_grp_feed;
1099 1540
1100 if (grp->int2 <= 0) 1541 if (grp->int2 <= 0)
1101 grp->int2 = 2; 1542 grp->int2 = 2;
1102 1543
1103 eio_grp_limit (grp, grp->int2); 1544 eio_grp_limit (grp, grp->int2);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines