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.118 by root, Sun May 11 00:01:03 2008 UTC vs.
Revision 1.159 by root, Thu Jan 7 18:08:21 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>
17 20
18/* perl namespace pollution */ 21/* perl namespace pollution */
65# include <signal.h> 68# include <signal.h>
66# define EIO_STRUCT_DIRENT struct dirent 69# define EIO_STRUCT_DIRENT struct dirent
67 70
68#endif 71#endif
69 72
73/* perl stupidly overrides readdir and maybe others */
74/* with thread-unsafe versions, imagine that :( */
75#undef readdir
76#undef opendir
77#undef closedir
78
70#define EIO_STRUCT_STAT Stat_t 79#define EIO_STRUCT_STAT Stat_t
71 80
72/* use NV for 32 bit perls as it allows larger offsets */ 81/* use NV for 32 bit perls as it allows larger offsets */
73#if IVSIZE >= 8 82#if IVSIZE >= 8
83# define VAL64 IV
74# define SvVAL64 SvIV 84# define SvVAL64 SvIV
85# define newSVval64 newSViv
75#else 86#else
87# define VAL64 NV
76# define SvVAL64 SvNV 88# define SvVAL64 SvNV
89# define newSVval64 newSVnv
77#endif 90#endif
78 91
79static HV *stash; 92/*****************************************************************************/
93
94#if __GNUC__ >= 3
95# define expect(expr,value) __builtin_expect ((expr),(value))
96#else
97# define expect(expr,value) (expr)
98#endif
99
100#define expect_false(expr) expect ((expr) != 0, 0)
101#define expect_true(expr) expect ((expr) != 0, 1)
102
103/*****************************************************************************/
104
80typedef SV SV8; /* byte-sv, used for argument-checking */ 105typedef SV SV8; /* byte-sv, used for argument-checking */
106typedef int aio_rfd; /* read file desriptor */
107typedef int aio_wfd; /* write file descriptor */
81 108
82#define AIO_REQ_KLASS "IO::AIO::REQ" 109static HV *aio_stash, *aio_req_stash, *aio_grp_stash;
83#define AIO_GRP_KLASS "IO::AIO::GRP"
84 110
85#define EIO_COMMON \ 111#define EIO_REQ_MEMBERS \
86 SV *callback; \ 112 SV *callback; \
87 SV *sv1, *sv2; \ 113 SV *sv1, *sv2; \
88 STRLEN stroffset; \ 114 STRLEN stroffset; \
89 SV *self 115 SV *self;
116
117#define EIO_NO_WRAPPERS 1
90 118
91#include "libeio/eio.h" 119#include "libeio/eio.h"
120
121#ifndef POSIX_FADV_NORMAL
122# define POSIX_FADV_NORMAL 0
123# define NO_FADVISE 1
124#endif
125
126#ifndef POSIX_FADV_SEQUENTIAL
127# define POSIX_FADV_SEQUENTIAL 0
128#endif
129
130#ifndef POSIX_FADV_RANDOM
131# define POSIX_FADV_RANDOM 0
132#endif
133
134#ifndef POSIX_FADV_NOREUSE
135# define POSIX_FADV_NOREUSE 0
136#endif
137
138#ifndef POSIX_FADV_WILLNEED
139# define POSIX_FADV_WILLNEED 0
140#endif
141
142#ifndef POSIX_FADV_DONTNEED
143# define POSIX_FADV_DONTNEED 0
144#endif
145
146#ifndef ST_NODEV
147# define ST_NODEV 0
148#endif
149
150#ifndef ST_NOEXEC
151# define ST_NOEXEC 0
152#endif
153
154#ifndef ST_SYNCHRONOUS
155# define ST_SYNCHRONOUS 0
156#endif
157
158#ifndef ST_MANDLOCK
159# define ST_MANDLOCK 0
160#endif
161
162#ifndef ST_WRITE
163# define ST_WRITE 0
164#endif
165
166#ifndef ST_APPEND
167# define ST_APPEND 0
168#endif
169
170#ifndef ST_IMMUTABLE
171# define ST_IMMUTABLE 0
172#endif
173
174#ifndef ST_NOATIME
175# define ST_NOATIME 0
176#endif
177
178#ifndef ST_NODIRATIME
179# define ST_NODIRATIME 0
180#endif
181
182#ifndef ST_RELATIME
183# define ST_RELATIME 0
184#endif
92 185
93static int req_invoke (eio_req *req); 186static int req_invoke (eio_req *req);
94#define EIO_FINISH(req) req_invoke (req) 187#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); 188static void req_destroy (eio_req *grp);
98#define EIO_DESTROY(req) req_destroy (req) 189#define EIO_DESTROY(req) req_destroy (req)
99 190
100enum { 191enum {
101 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ 192 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
105 196
106typedef eio_req *aio_req; 197typedef eio_req *aio_req;
107typedef eio_req *aio_req_ornot; 198typedef eio_req *aio_req_ornot;
108 199
109static SV *on_next_submit; 200static SV *on_next_submit;
110static int next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; 201static int next_pri = EIO_PRI_DEFAULT;
111static int max_outstanding; 202static int max_outstanding;
112 203
113static int respipe_osf [2], respipe [2] = { -1, -1 }; 204static s_epipe respipe;
114 205
115static void req_destroy (aio_req req); 206static void req_destroy (aio_req req);
116static void req_cancel (aio_req req); 207static void req_cancel (aio_req req);
117 208
118static void want_poll (void) 209static void want_poll (void)
119{ 210{
120 /* write a dummy byte to the pipe so fh becomes ready */ 211 /* write a dummy byte to the pipe so fh becomes ready */
121 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1); 212 s_epipe_signal (&respipe);
122} 213}
123 214
124static void done_poll (void) 215static void done_poll (void)
125{ 216{
126 /* read any signals sent by the worker threads */ 217 /* read any signals sent by the worker threads */
127 char buf [4]; 218 s_epipe_drain (&respipe);
128 while (respipe_read (respipe [0], buf, 4) == 4)
129 ;
130} 219}
131 220
132/* must be called at most once */ 221/* must be called at most once */
133static SV *req_sv (aio_req req, const char *klass) 222static SV *req_sv (aio_req req, HV *stash)
134{ 223{
135 if (!req->self) 224 if (!req->self)
136 { 225 {
137 req->self = (SV *)newHV (); 226 req->self = (SV *)newHV ();
138 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0); 227 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
139 } 228 }
140 229
141 return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1))); 230 return sv_2mortal (sv_bless (newRV_inc (req->self), stash));
142} 231}
143 232
144static aio_req SvAIO_REQ (SV *sv) 233static aio_req SvAIO_REQ (SV *sv)
145{ 234{
146 MAGIC *mg; 235 MAGIC *mg;
147 236
148 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv)) 237 if (!SvROK (sv)
238 || (SvSTASH (SvRV (sv)) != aio_grp_stash
239 && SvSTASH (SvRV (sv)) != aio_req_stash
240 && !sv_derived_from (sv, "IO::AIO::REQ")))
149 croak ("object of class " AIO_REQ_KLASS " expected"); 241 croak ("object of class IO::AIO::REQ expected");
150 242
151 mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 243 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
152 244
153 return mg ? (aio_req)mg->mg_ptr : 0; 245 return mg ? (aio_req)mg->mg_ptr : 0;
154} 246}
160 dSP; 252 dSP;
161 253
162 ENTER; 254 ENTER;
163 SAVETMPS; 255 SAVETMPS;
164 PUSHMARK (SP); 256 PUSHMARK (SP);
165 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 257 XPUSHs (req_sv (grp, aio_grp_stash));
166 PUTBACK; 258 PUTBACK;
167 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR); 259 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
168 SPAGAIN; 260 SPAGAIN;
169 FREETMPS; 261 FREETMPS;
170 LEAVE; 262 LEAVE;
173 265
174static void req_submit (eio_req *req) 266static void req_submit (eio_req *req)
175{ 267{
176 eio_submit (req); 268 eio_submit (req);
177 269
178 if (on_next_submit) 270 if (expect_false (on_next_submit))
179 { 271 {
180 dSP; 272 dSP;
181 SV *cb = sv_2mortal (on_next_submit); 273 SV *cb = sv_2mortal (on_next_submit);
182 274
183 on_next_submit = 0; 275 on_next_submit = 0;
193 dSP; 285 dSP;
194 286
195 if (req->flags & FLAG_SV2_RO_OFF) 287 if (req->flags & FLAG_SV2_RO_OFF)
196 SvREADONLY_off (req->sv2); 288 SvREADONLY_off (req->sv2);
197 289
198 if (!EIO_CANCELLED (req) && SvOK (req->callback)) 290 if (!EIO_CANCELLED (req) && req->callback)
199 { 291 {
200 ENTER; 292 ENTER;
201 SAVETMPS; 293 SAVETMPS;
202 PUSHMARK (SP); 294 PUSHMARK (SP);
203 EXTEND (SP, 1); 295 EXTEND (SP, 1);
209 SV *rv = &PL_sv_undef; 301 SV *rv = &PL_sv_undef;
210 302
211 if (req->result >= 0) 303 if (req->result >= 0)
212 { 304 {
213 int i; 305 int i;
214 char *buf = req->ptr2; 306 char *names = (char *)req->ptr2;
307 eio_dirent *ent = (eio_dirent *)req->ptr1; /* might be 0 */
215 AV *av = newAV (); 308 AV *av = newAV ();
216 309
217 av_extend (av, req->result - 1); 310 av_extend (av, req->result - 1);
218 311
219 for (i = 0; i < req->result; ++i) 312 for (i = 0; i < req->result; ++i)
220 { 313 {
221 SV *sv = newSVpv (buf, 0); 314 if (req->int1 & EIO_READDIR_DENTS)
315 {
316 SV *namesv = newSVpvn (names + ent->nameofs, ent->namelen);
222 317
318 if (req->int1 & EIO_READDIR_CUSTOM2)
319 {
320 static SV *sv_type [EIO_DT_MAX + 1]; /* type sv cache */
321 AV *avent = newAV ();
322
323 av_extend (avent, 2);
324
325 if (!sv_type [ent->type])
326 {
327 sv_type [ent->type] = newSViv (ent->type);
328 SvREADONLY_on (sv_type [ent->type]);
329 }
330
331 av_store (avent, 0, namesv);
332 av_store (avent, 1, SvREFCNT_inc (sv_type [ent->type]));
333 av_store (avent, 2, IVSIZE >= 8 ? newSVuv (ent->inode) : newSVnv (ent->inode));
334
335 av_store (av, i, newRV_noinc ((SV *)avent));
336 }
337 else
223 av_store (av, i, sv); 338 av_store (av, i, namesv);
339
340 ++ent;
341 }
342 else
343 {
344 SV *name = newSVpv (names, 0);
345 av_store (av, i, name);
224 buf += SvCUR (sv) + 1; 346 names += SvCUR (name) + 1;
347 }
225 } 348 }
226 349
227 rv = sv_2mortal (newRV_noinc ((SV *)av)); 350 rv = sv_2mortal (newRV_noinc ((SV *)av));
228 } 351 }
229 352
230 PUSHs (rv); 353 PUSHs (rv);
354
355 if (req->int1 & EIO_READDIR_CUSTOM1)
356 XPUSHs (sv_2mortal (newSViv (req->int1 & ~(EIO_READDIR_CUSTOM1 | EIO_READDIR_CUSTOM2))));
231 } 357 }
232 break; 358 break;
233 359
234 case EIO_OPEN: 360 case EIO_OPEN:
235 { 361 {
241 GV *gv = (GV *)sv_newmortal (); 367 GV *gv = (GV *)sv_newmortal ();
242 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR); 368 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
243 char sym [64]; 369 char sym [64];
244 int symlen; 370 int symlen;
245 371
246 symlen = snprintf (sym, sizeof (sym), "fd#%d", req->result); 372 symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
247 gv_init (gv, stash, sym, symlen, 0); 373 gv_init (gv, aio_stash, sym, symlen, 0);
248 374
249 symlen = snprintf ( 375 symlen = snprintf (
250 sym, 376 sym,
251 sizeof (sym), 377 sizeof (sym),
252 "%s&=%d", 378 "%s&=%d",
253 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<", 379 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
254 req->result 380 (int)req->result
255 ); 381 );
256 382
257 if (do_open (gv, sym, symlen, 0, 0, 0, 0)) 383 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
258 fh = (SV *)gv; 384 fh = (SV *)gv;
259 } 385 }
260 386
261 PUSHs (fh); 387 PUSHs (fh);
262 } 388 }
389 break;
390
391 case EIO_STATVFS:
392 case EIO_FSTATVFS:
393 {
394 SV *rv = &PL_sv_undef;
395
396 if (req->result >= 0)
397 {
398 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req);
399 HV *hv = newHV ();
400
401 rv = sv_2mortal (newRV_noinc (hv));
402
403 hv_store (hv, "bsize" , sizeof ("bsize" ) - 1, newSVval64 (f->f_bsize ), 0);
404 hv_store (hv, "frsize" , sizeof ("frsize" ) - 1, newSVval64 (f->f_frsize ), 0);
405 hv_store (hv, "blocks" , sizeof ("blocks" ) - 1, newSVval64 (f->f_blocks ), 0);
406 hv_store (hv, "bfree" , sizeof ("bfree" ) - 1, newSVval64 (f->f_bfree ), 0);
407 hv_store (hv, "bavail" , sizeof ("bavail" ) - 1, newSVval64 (f->f_bavail ), 0);
408 hv_store (hv, "files" , sizeof ("files" ) - 1, newSVval64 (f->f_files ), 0);
409 hv_store (hv, "ffree" , sizeof ("ffree" ) - 1, newSVval64 (f->f_ffree ), 0);
410 hv_store (hv, "favail" , sizeof ("favail" ) - 1, newSVval64 (f->f_favail ), 0);
411 hv_store (hv, "fsid" , sizeof ("fsid" ) - 1, newSVval64 (f->f_fsid ), 0);
412 hv_store (hv, "flag" , sizeof ("flag" ) - 1, newSVval64 (f->f_flag ), 0);
413 hv_store (hv, "namemax", sizeof ("namemax") - 1, newSVval64 (f->f_namemax), 0);
414 }
415
416 PUSHs (rv);
417 }
418
263 break; 419 break;
264 420
265 case EIO_GROUP: 421 case EIO_GROUP:
266 req->int1 = 2; /* mark group as finished */ 422 req->int1 = 2; /* mark group as finished */
267 423
280 case EIO_BUSY: 436 case EIO_BUSY:
281 break; 437 break;
282 438
283 case EIO_READLINK: 439 case EIO_READLINK:
284 if (req->result > 0) 440 if (req->result > 0)
285 { 441 PUSHs (sv_2mortal (newSVpvn (req->ptr2, req->result)));
286 SvCUR_set (req->sv2, req->result);
287 *SvEND (req->sv2) = 0;
288 PUSHs (req->sv2);
289 }
290 break; 442 break;
291 443
292 case EIO_STAT: 444 case EIO_STAT:
293 case EIO_LSTAT: 445 case EIO_LSTAT:
294 case EIO_FSTAT: 446 case EIO_FSTAT:
297 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 449 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
298 PUSHs (sv_2mortal (newSViv (req->result))); 450 PUSHs (sv_2mortal (newSViv (req->result)));
299 break; 451 break;
300 452
301 case EIO_READ: 453 case EIO_READ:
454 {
302 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0)); 455 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
303 *SvEND (req->sv2) = 0; 456 *SvEND (req->sv2) = 0;
457 SvPOK_only (req->sv2);
458 SvSETMAGIC (req->sv2);
304 PUSHs (sv_2mortal (newSViv (req->result))); 459 PUSHs (sv_2mortal (newSViv (req->result)));
460 }
305 break; 461 break;
306 462
307 case EIO_DUP2: 463 case EIO_DUP2:
308 if (req->result > 0) 464 if (req->result > 0)
309 req->result = 0; 465 req->result = 0;
355 grp->sv2 = 0; 511 grp->sv2 = 0;
356 512
357 eio_grp_cancel (grp); 513 eio_grp_cancel (grp);
358} 514}
359 515
360#ifdef USE_SOCKETS_AS_HANDLES
361# define TO_SOCKET(x) (win32_get_osfhandle (x))
362#else
363# define TO_SOCKET(x) (x)
364#endif
365
366static void 516static void
367create_respipe (void) 517create_respipe (void)
368{ 518{
369 int old_readfd = respipe [0];
370
371 if (respipe [1] >= 0)
372 respipe_close (TO_SOCKET (respipe [1]));
373
374#ifdef _WIN32
375 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe))
376#else
377 if (pipe (respipe)) 519 if (s_epipe_renew (&respipe))
378#endif
379 croak ("unable to initialize result pipe"); 520 croak ("IO::AIO: unable to initialize result pipe");
380
381 if (old_readfd >= 0)
382 {
383 if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0)
384 croak ("unable to initialize result pipe(2)");
385
386 respipe_close (respipe [0]);
387 respipe [0] = old_readfd;
388 }
389
390#ifdef _WIN32
391 int arg = 1;
392 if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg)
393 || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg))
394#else
395 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
396 || fcntl (respipe [1], F_SETFL, O_NONBLOCK))
397#endif
398 croak ("unable to initialize result pipe(3)");
399
400 respipe_osf [0] = TO_SOCKET (respipe [0]);
401 respipe_osf [1] = TO_SOCKET (respipe [1]);
402} 521}
403 522
404static void poll_wait (void) 523static void poll_wait (void)
405{ 524{
406 fd_set rfd;
407
408 while (eio_nreqs ()) 525 while (eio_nreqs ())
409 { 526 {
410 int size; 527 int size;
411 528
412 X_LOCK (reslock); 529 X_LOCK (reslock);
414 X_UNLOCK (reslock); 531 X_UNLOCK (reslock);
415 532
416 if (size) 533 if (size)
417 return; 534 return;
418 535
419 maybe_start_thread (); 536 etp_maybe_start_thread ();
420 537
421 FD_ZERO (&rfd); 538 s_epipe_wait (&respipe);
422 FD_SET (respipe [0], &rfd);
423
424 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
425 } 539 }
426} 540}
427 541
428static int poll_cb (void) 542static int poll_cb (void)
429{ 543{
430 int res; 544 for (;;)
431
432 do
433 { 545 {
434 res = eio_poll (); 546 int res = eio_poll ();
435 547
436 if (res > 0) 548 if (res > 0)
437 croak (0); 549 croak (0);
550
551 if (!max_outstanding || max_outstanding > eio_nreqs ())
552 return res;
553
554 poll_wait ();
438 } 555 }
439 while (max_outstanding && max_outstanding <= eio_nreqs ());
440
441 return res;
442} 556}
443 557
444static void atfork_child (void) 558static void atfork_child (void)
445{ 559{
446 create_respipe (); 560 create_respipe ();
447} 561}
448 562
563static SV *
564get_cb (SV *cb_sv)
565{
566 SvGETMAGIC (cb_sv);
567 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
568}
569
449#define dREQ \ 570#define dREQ \
571 SV *cb_cv; \
450 aio_req req; \ 572 aio_req req; \
451 int req_pri = next_pri; \ 573 int req_pri = next_pri; \
452 next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; \ 574 next_pri = EIO_PRI_DEFAULT; \
453 \ 575 \
454 if (SvOK (callback) && !SvROK (callback)) \ 576 cb_cv = get_cb (callback); \
455 croak ("callback must be undef or of reference type"); \
456 \ 577 \
457 Newz (0, req, 1, eio_req); \ 578 Newz (0, req, 1, eio_req); \
458 if (!req) \ 579 if (!req) \
459 croak ("out of memory during eio_req allocation"); \ 580 croak ("out of memory during eio_req allocation"); \
460 \ 581 \
461 req->callback = newSVsv (callback); \ 582 req->callback = SvREFCNT_inc (cb_cv); \
462 req->pri = req_pri 583 req->pri = req_pri
463 584
464#define REQ_SEND \ 585#define REQ_SEND \
586 PUTBACK; \
465 req_submit (req); \ 587 req_submit (req); \
588 SPAGAIN; \
466 \ 589 \
467 if (GIMME_V != G_VOID) \ 590 if (GIMME_V != G_VOID) \
468 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 591 XPUSHs (req_sv (req, aio_req_stash));
469 592
470MODULE = IO::AIO PACKAGE = IO::AIO 593MODULE = IO::AIO PACKAGE = IO::AIO
471 594
472PROTOTYPES: ENABLE 595PROTOTYPES: ENABLE
473 596
474BOOT: 597BOOT:
475{ 598{
476 stash = gv_stashpv ("IO::AIO", 1); 599 static const struct {
477 600 const char *name;
478 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 601 IV iv;
479 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 602 } *civ, const_iv[] = {
480 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 603# define const_iv(name, value) { # name, (IV) value },
481 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 604# define const_eio(name) { # name, (IV) EIO_ ## name },
482 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 605 const_iv (EXDEV , EXDEV)
606 const_iv (ENOSYS , ENOSYS)
607 const_iv (O_RDONLY, O_RDONLY)
608 const_iv (O_WRONLY, O_WRONLY)
609 const_iv (O_CREAT , O_CREAT)
610 const_iv (O_TRUNC , O_TRUNC)
483#ifdef _WIN32 611#ifndef _WIN32
484 X_MUTEX_CHECK (wrklock); 612 const_iv (S_IFIFO , S_IFIFO)
485 X_MUTEX_CHECK (reslock);
486 X_MUTEX_CHECK (reqlock);
487 X_MUTEX_CHECK (reqwait);
488 X_MUTEX_CHECK (preadwritelock);
489 X_MUTEX_CHECK (readdirlock);
490
491 X_COND_CHECK (reqwait);
492#else
493 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
494#endif 613#endif
614 const_iv (FADV_NORMAL , POSIX_FADV_NORMAL)
615 const_iv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL)
616 const_iv (FADV_RANDOM , POSIX_FADV_RANDOM)
617 const_iv (FADV_NOREUSE , POSIX_FADV_NOREUSE)
618 const_iv (FADV_WILLNEED , POSIX_FADV_WILLNEED)
619 const_iv (FADV_DONTNEED , POSIX_FADV_DONTNEED)
495 620
621 const_iv (ST_RDONLY , ST_RDONLY)
622 const_iv (ST_NOSUID , ST_NOSUID)
623 const_iv (ST_NODEV , ST_NODEV)
624 const_iv (ST_NOEXEC , ST_NOEXEC)
625 const_iv (ST_SYNCHRONOUS , ST_SYNCHRONOUS)
626 const_iv (ST_MANDLOCK , ST_MANDLOCK)
627 const_iv (ST_WRITE , ST_WRITE)
628 const_iv (ST_APPEND , ST_APPEND)
629 const_iv (ST_IMMUTABLE , ST_IMMUTABLE)
630 const_iv (ST_NOATIME , ST_NOATIME)
631 const_iv (ST_NODIRATIME , ST_NODIRATIME)
632 const_iv (ST_RELATIME , ST_RELATIME)
633
634 const_eio (MS_ASYNC)
635 const_eio (MS_INVALIDATE)
636 const_eio (MS_SYNC)
637
638 const_eio (MT_MODIFY)
639
640 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
641 const_eio (SYNC_FILE_RANGE_WRITE)
642 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
643
644 const_eio (READDIR_DENTS)
645 const_eio (READDIR_DIRS_FIRST)
646 const_eio (READDIR_STAT_ORDER)
647 const_eio (READDIR_FOUND_UNKNOWN)
648
649 const_eio (DT_UNKNOWN)
650 const_eio (DT_FIFO)
651 const_eio (DT_CHR)
652 const_eio (DT_DIR)
653 const_eio (DT_BLK)
654 const_eio (DT_REG)
655 const_eio (DT_LNK)
656 const_eio (DT_SOCK)
657 const_eio (DT_WHT)
658 };
659
660 aio_stash = gv_stashpv ("IO::AIO" , 1);
661 aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1);
662 aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1);
663
664 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
665 newCONSTSUB (aio_stash, (char *)civ->name, newSViv (civ->iv));
666
496 create_respipe (); 667 create_respipe ();
497 668
498 if (eio_init (want_poll, done_poll) < 0) 669 if (eio_init (want_poll, done_poll) < 0)
499 croak ("IO::AIO: unable to initialise eio library"); 670 croak ("IO::AIO: unable to initialise eio library");
500 671
501 /* atfork child called in fifo order, so before eio's handler */ 672 /* atfork child called in fifo order, so before eio's handler */
502 X_THREAD_ATFORK (0, 0, atfork_child); 673 X_THREAD_ATFORK (0, 0, atfork_child);
503} 674}
504 675
505void 676void
506max_poll_reqs (int nreqs) 677max_poll_reqs (int nreqs)
507 PROTOTYPE: $ 678 PROTOTYPE: $
560 ALIAS: 731 ALIAS:
561 aio_fsync = EIO_FSYNC 732 aio_fsync = EIO_FSYNC
562 aio_fdatasync = EIO_FDATASYNC 733 aio_fdatasync = EIO_FDATASYNC
563 PPCODE: 734 PPCODE:
564{ 735{
736 int fd = s_fileno_croak (fh, 0);
565 dREQ; 737 dREQ;
566 738
567 req->type = ix; 739 req->type = ix;
568 req->sv1 = newSVsv (fh); 740 req->sv1 = newSVsv (fh);
569 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 741 req->int1 = fd;
742
743 REQ_SEND (req);
744}
745
746void
747aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef)
748 PROTOTYPE: $$$$;$
749 PPCODE:
750{
751 int fd = s_fileno_croak (fh, 0);
752 dREQ;
753
754 req->type = EIO_SYNC_FILE_RANGE;
755 req->sv1 = newSVsv (fh);
756 req->int1 = fd;
757 req->offs = offset;
758 req->size = nbytes;
759 req->int2 = flags;
570 760
571 REQ_SEND (req); 761 REQ_SEND (req);
572} 762}
573 763
574void 764void
575aio_close (SV *fh, SV *callback=&PL_sv_undef) 765aio_close (SV *fh, SV *callback=&PL_sv_undef)
576 PROTOTYPE: $;$ 766 PROTOTYPE: $;$
577 PPCODE: 767 PPCODE:
578{ 768{
579 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 769 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
770 int fd = s_fileno_croak (fh, 0);
580 dREQ; 771 dREQ;
581 772
582 if (close_pipe < 0) 773 if (close_pipe < 0)
583 { 774 {
584 int pipefd [2]; 775 int pipefd [2];
592 } 783 }
593 784
594 req->type = EIO_DUP2; 785 req->type = EIO_DUP2;
595 req->int1 = close_pipe; 786 req->int1 = close_pipe;
596 req->sv2 = newSVsv (fh); 787 req->sv2 = newSVsv (fh);
597 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 788 req->int2 = fd;
598 789
599 REQ_SEND (req); 790 REQ_SEND (req);
600} 791}
601 792
602void 793void
606 aio_write = EIO_WRITE 797 aio_write = EIO_WRITE
607 PROTOTYPE: $$$$$;$ 798 PROTOTYPE: $$$$$;$
608 PPCODE: 799 PPCODE:
609{ 800{
610 STRLEN svlen; 801 STRLEN svlen;
802 int fd = s_fileno_croak (fh, ix == EIO_WRITE);
611 char *svptr = SvPVbyte (data, svlen); 803 char *svptr = SvPVbyte (data, svlen);
612 UV len = SvUV (length); 804 UV len = SvUV (length);
613
614 SvUPGRADE (data, SVt_PV);
615 SvPOK_on (data);
616 805
617 if (dataoffset < 0) 806 if (dataoffset < 0)
618 dataoffset += svlen; 807 dataoffset += svlen;
619 808
620 if (dataoffset < 0 || dataoffset > svlen) 809 if (dataoffset < 0 || dataoffset > svlen)
626 if (!SvOK (length) || len + dataoffset > svlen) 815 if (!SvOK (length) || len + dataoffset > svlen)
627 len = svlen - dataoffset; 816 len = svlen - dataoffset;
628 } 817 }
629 else 818 else
630 { 819 {
631 /* read: grow scalar as necessary */ 820 /* read: check type and grow scalar as necessary */
821 SvUPGRADE (data, SVt_PV);
632 svptr = SvGROW (data, len + dataoffset + 1); 822 svptr = SvGROW (data, len + dataoffset + 1);
633 } 823 }
634
635 if (len < 0)
636 croak ("length must not be negative");
637 824
638 { 825 {
639 dREQ; 826 dREQ;
640 827
641 req->type = ix; 828 req->type = ix;
642 req->sv1 = newSVsv (fh); 829 req->sv1 = newSVsv (fh);
643 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 830 req->int1 = fd;
644 : IoOFP (sv_2io (fh)));
645 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 831 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
646 req->size = len; 832 req->size = len;
647 req->sv2 = SvREFCNT_inc (data); 833 req->sv2 = SvREFCNT_inc (data);
648 req->ptr2 = (char *)svptr + dataoffset; 834 req->ptr2 = (char *)svptr + dataoffset;
649 req->stroffset = dataoffset; 835 req->stroffset = dataoffset;
664 PPCODE: 850 PPCODE:
665{ 851{
666 SV *data; 852 SV *data;
667 dREQ; 853 dREQ;
668 854
669 data = newSV (NAME_MAX);
670 SvPOK_on (data);
671
672 req->type = EIO_READLINK; 855 req->type = EIO_READLINK;
673 req->sv1 = newSVsv (path); 856 req->sv1 = newSVsv (path);
674 req->ptr1 = SvPVbyte_nolen (req->sv1); 857 req->ptr1 = SvPVbyte_nolen (req->sv1);
675 req->sv2 = data;
676 req->ptr2 = SvPVbyte_nolen (data);
677 858
678 REQ_SEND; 859 REQ_SEND;
679} 860}
680 861
681void 862void
682aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef) 863aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef)
683 PROTOTYPE: $$$$;$ 864 PROTOTYPE: $$$$;$
684 PPCODE: 865 PPCODE:
685{ 866{
867 int ifd = s_fileno_croak (in_fh , 0);
868 int ofd = s_fileno_croak (out_fh, 1);
686 dREQ; 869 dREQ;
687 870
688 req->type = EIO_SENDFILE; 871 req->type = EIO_SENDFILE;
689 req->sv1 = newSVsv (out_fh); 872 req->sv1 = newSVsv (out_fh);
690 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 873 req->int1 = ofd;
691 req->sv2 = newSVsv (in_fh); 874 req->sv2 = newSVsv (in_fh);
692 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 875 req->int2 = ifd;
693 req->offs = SvVAL64 (in_offset); 876 req->offs = in_offset;
694 req->size = length; 877 req->size = length;
695 878
696 REQ_SEND; 879 REQ_SEND;
697} 880}
698 881
699void 882void
700aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef) 883aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef)
701 PROTOTYPE: $$$;$ 884 PROTOTYPE: $$$;$
702 PPCODE: 885 PPCODE:
703{ 886{
887 int fd = s_fileno_croak (fh, 0);
704 dREQ; 888 dREQ;
705 889
706 req->type = EIO_READAHEAD; 890 req->type = EIO_READAHEAD;
707 req->sv1 = newSVsv (fh); 891 req->sv1 = newSVsv (fh);
708 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 892 req->int1 = fd;
709 req->offs = SvVAL64 (offset); 893 req->offs = offset;
710 req->size = length; 894 req->size = length;
711 895
712 REQ_SEND; 896 REQ_SEND;
713} 897}
714 898
715void 899void
716aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef) 900aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef)
717 ALIAS: 901 ALIAS:
718 aio_stat = EIO_STAT 902 aio_stat = EIO_STAT
719 aio_lstat = EIO_LSTAT 903 aio_lstat = EIO_LSTAT
904 aio_statvfs = EIO_STATVFS
720 PPCODE: 905 PPCODE:
721{ 906{
722 dREQ; 907 dREQ;
723 908
724 req->ptr2 = malloc (sizeof (EIO_STRUCT_STAT));
725 if (!req->ptr2)
726 {
727 req_destroy (req);
728 croak ("out of memory during aio_stat statdata allocation");
729 }
730
731 req->flags |= EIO_FLAG_PTR2_FREE;
732 req->sv1 = newSVsv (fh_or_path); 909 req->sv1 = newSVsv (fh_or_path);
733 910
734 if (SvPOK (fh_or_path)) 911 if (SvPOK (req->sv1))
735 { 912 {
736 req->type = ix; 913 req->type = ix;
737 req->ptr1 = SvPVbyte_nolen (req->sv1); 914 req->ptr1 = SvPVbyte_nolen (req->sv1);
738 } 915 }
739 else 916 else
740 { 917 {
741 req->type = EIO_FSTAT; 918 req->type = ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT;
742 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 919 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
743 } 920 }
744 921
745 REQ_SEND; 922 REQ_SEND;
746} 923}
753 930
754 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 931 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
755 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; 932 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
756 req->sv1 = newSVsv (fh_or_path); 933 req->sv1 = newSVsv (fh_or_path);
757 934
758 if (SvPOK (fh_or_path)) 935 if (SvPOK (req->sv1))
759 { 936 {
760 req->type = EIO_UTIME; 937 req->type = EIO_UTIME;
761 req->ptr1 = SvPVbyte_nolen (req->sv1); 938 req->ptr1 = SvPVbyte_nolen (req->sv1);
762 } 939 }
763 else 940 else
776 dREQ; 953 dREQ;
777 954
778 req->sv1 = newSVsv (fh_or_path); 955 req->sv1 = newSVsv (fh_or_path);
779 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 956 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
780 957
781 if (SvPOK (fh_or_path)) 958 if (SvPOK (req->sv1))
782 { 959 {
783 req->type = EIO_TRUNCATE; 960 req->type = EIO_TRUNCATE;
784 req->ptr1 = SvPVbyte_nolen (req->sv1); 961 req->ptr1 = SvPVbyte_nolen (req->sv1);
785 } 962 }
786 else 963 else
794 971
795void 972void
796aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef) 973aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
797 ALIAS: 974 ALIAS:
798 aio_chmod = EIO_CHMOD 975 aio_chmod = EIO_CHMOD
799 aio_fchmod = EIO_FCHMOD
800 aio_mkdir = EIO_MKDIR 976 aio_mkdir = EIO_MKDIR
801 PPCODE: 977 PPCODE:
802{ 978{
803 dREQ; 979 dREQ;
804 980
805 req->type = ix;
806 req->int2 = mode; 981 req->int2 = mode;
807 req->sv1 = newSVsv (fh_or_path); 982 req->sv1 = newSVsv (fh_or_path);
808 983
809 if (ix == EIO_FCHMOD) 984 if (SvPOK (req->sv1))
810 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 985 {
986 req->type = ix;
987 req->ptr1 = SvPVbyte_nolen (req->sv1);
988 }
811 else 989 else
812 req->ptr1 = SvPVbyte_nolen (req->sv1); 990 {
991 req->type = EIO_FCHMOD;
992 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
993 }
813 994
814 REQ_SEND; 995 REQ_SEND;
815} 996}
816 997
817void 998void
822 1003
823 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 1004 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
824 req->int3 = SvOK (gid) ? SvIV (gid) : -1; 1005 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
825 req->sv1 = newSVsv (fh_or_path); 1006 req->sv1 = newSVsv (fh_or_path);
826 1007
827 if (SvPOK (fh_or_path)) 1008 if (SvPOK (req->sv1))
828 { 1009 {
829 req->type = EIO_CHOWN; 1010 req->type = EIO_CHOWN;
830 req->ptr1 = SvPVbyte_nolen (req->sv1); 1011 req->ptr1 = SvPVbyte_nolen (req->sv1);
831 } 1012 }
832 else 1013 else
834 req->type = EIO_FCHOWN; 1015 req->type = EIO_FCHOWN;
835 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1016 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
836 } 1017 }
837 1018
838 REQ_SEND; 1019 REQ_SEND;
1020}
1021
1022void
1023aio_readdirx (SV8 *pathname, IV flags, SV *callback=&PL_sv_undef)
1024 PPCODE:
1025{
1026 dREQ;
1027
1028 req->type = EIO_READDIR;
1029 req->sv1 = newSVsv (pathname);
1030 req->ptr1 = SvPVbyte_nolen (req->sv1);
1031 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
1032
1033 if (flags & EIO_READDIR_DENTS)
1034 req->int1 |= EIO_READDIR_CUSTOM2;
1035
1036 REQ_SEND;
839} 1037}
840 1038
841void 1039void
842aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 1040aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
843 ALIAS: 1041 ALIAS:
888 1086
889 REQ_SEND; 1087 REQ_SEND;
890} 1088}
891 1089
892void 1090void
1091aio_mtouch (SV8 *data, IV offset = 0, SV *length = &PL_sv_undef, int flags = 0, SV *callback=&PL_sv_undef)
1092 ALIAS:
1093 aio_mtouch = EIO_MTOUCH
1094 aio_msync = EIO_MSYNC
1095 PROTOTYPE: $$$$;$
1096 PPCODE:
1097{
1098 STRLEN svlen;
1099 UV len = SvUV (length);
1100 char *svptr = SvPVbyte (data, svlen);
1101
1102 if (offset < 0)
1103 offset += svlen;
1104
1105 if (offset < 0 || offset > svlen)
1106 croak ("offset outside of scalar");
1107
1108 if (!SvOK (length) || len + offset > svlen)
1109 len = svlen - offset;
1110
1111 {
1112 dREQ;
1113
1114 req->type = ix;
1115 req->size = len;
1116 req->sv2 = SvREFCNT_inc (data);
1117 req->ptr2 = (char *)svptr + offset;
1118 req->int1 = flags;
1119
1120 REQ_SEND;
1121 }
1122}
1123
1124void
893aio_busy (double delay, SV *callback=&PL_sv_undef) 1125aio_busy (double delay, SV *callback=&PL_sv_undef)
894 PPCODE: 1126 PPCODE:
895{ 1127{
896 dREQ; 1128 dREQ;
897 1129
908{ 1140{
909 dREQ; 1141 dREQ;
910 1142
911 req->type = EIO_GROUP; 1143 req->type = EIO_GROUP;
912 1144
913 eio_submit (req); 1145 req_submit (req);
914 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1146 XPUSHs (req_sv (req, aio_grp_stash));
915} 1147}
916 1148
917void 1149void
918aio_nop (SV *callback=&PL_sv_undef) 1150aio_nop (SV *callback=&PL_sv_undef)
919 ALIAS: 1151 ALIAS:
930 1162
931int 1163int
932aioreq_pri (int pri = 0) 1164aioreq_pri (int pri = 0)
933 PROTOTYPE: ;$ 1165 PROTOTYPE: ;$
934 CODE: 1166 CODE:
935 RETVAL = next_pri - EIO_PRI_BIAS; 1167 RETVAL = next_pri;
936 if (items > 0) 1168 if (items > 0)
937 { 1169 {
938 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN; 1170 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
939 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX; 1171 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
940 next_pri = pri + EIO_PRI_BIAS; 1172 next_pri = pri;
941 } 1173 }
942 OUTPUT: 1174 OUTPUT:
943 RETVAL 1175 RETVAL
944 1176
945void 1177void
946aioreq_nice (int nice = 0) 1178aioreq_nice (int nice = 0)
947 CODE: 1179 CODE:
948 nice = next_pri - nice; 1180 nice = next_pri - nice;
949 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN; 1181 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
950 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX; 1182 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
951 next_pri = nice + EIO_PRI_BIAS; 1183 next_pri = nice;
952 1184
953void 1185void
954flush () 1186flush ()
955 PROTOTYPE: 1187 PROTOTYPE:
956 CODE: 1188 CODE:
971 1203
972int 1204int
973poll_fileno() 1205poll_fileno()
974 PROTOTYPE: 1206 PROTOTYPE:
975 CODE: 1207 CODE:
976 RETVAL = respipe [0]; 1208 RETVAL = s_epipe_fd (&respipe);
977 OUTPUT: 1209 OUTPUT:
978 RETVAL 1210 RETVAL
979 1211
980int 1212int
981poll_cb(...) 1213poll_cb(...)
1017 1249
1018int 1250int
1019nthreads() 1251nthreads()
1020 PROTOTYPE: 1252 PROTOTYPE:
1021 CODE: 1253 CODE:
1022 if (WORDACCESS_UNSAFE) X_LOCK (wrklock); 1254 RETVAL = eio_nthreads ();
1023 RETVAL = started;
1024 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1025 OUTPUT: 1255 OUTPUT:
1026 RETVAL 1256 RETVAL
1027 1257
1258int
1259fadvise (aio_rfd fh, off_t offset, off_t length, IV advice)
1260 PROTOTYPE: $$$$
1261 CODE:
1262#if _XOPEN_SOURCE >= 600 && !NO_FADVISE
1263 RETVAL = posix_fadvise (fh, offset, length, advice);
1264#else
1265 RETVAL = errno = ENOSYS;
1266#endif
1267 OUTPUT:
1268 RETVAL
1269
1270ssize_t
1271sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
1272 PROTOTYPE: $$$$
1273 CODE:
1274 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count);
1275 OUTPUT:
1276 RETVAL
1277
1028void _on_next_submit (SV *cb) 1278void _on_next_submit (SV *cb)
1029 CODE: 1279 CODE:
1030 SvREFCNT_dec (on_next_submit); 1280 SvREFCNT_dec (on_next_submit);
1031 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1281 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1032 1282
1039 CODE: 1289 CODE:
1040 eio_cancel (req); 1290 eio_cancel (req);
1041 1291
1042void 1292void
1043cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1293cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1044 CODE: 1294 PPCODE:
1295{
1296 if (GIMME_V != G_VOID)
1297 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1298
1299 if (items > 1)
1300 {
1301 SV *cb_cv =get_cb (callback);
1302
1045 SvREFCNT_dec (req->callback); 1303 SvREFCNT_dec (req->callback);
1046 req->callback = newSVsv (callback); 1304 req->callback = SvREFCNT_inc (cb_cv);
1305 }
1306}
1047 1307
1048MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1308MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1049 1309
1050void 1310void
1051add (aio_req grp, ...) 1311add (aio_req grp, ...)
1083 AV *av; 1343 AV *av;
1084 1344
1085 grp->errorno = errno; 1345 grp->errorno = errno;
1086 1346
1087 av = newAV (); 1347 av = newAV ();
1348 av_extend (av, items - 1);
1088 1349
1089 for (i = 1; i < items; ++i ) 1350 for (i = 1; i < items; ++i )
1090 av_push (av, newSVsv (ST (i))); 1351 av_push (av, newSVsv (ST (i)));
1091 1352
1092 SvREFCNT_dec (grp->sv1); 1353 SvREFCNT_dec (grp->sv1);
1106void 1367void
1107feed (aio_req grp, SV *callback=&PL_sv_undef) 1368feed (aio_req grp, SV *callback=&PL_sv_undef)
1108 CODE: 1369 CODE:
1109{ 1370{
1110 SvREFCNT_dec (grp->sv2); 1371 SvREFCNT_dec (grp->sv2);
1111 grp->sv2 = newSVsv (callback); 1372 grp->sv2 = newSVsv (callback);
1373 grp->feed = aio_grp_feed;
1112 1374
1113 if (grp->int2 <= 0) 1375 if (grp->int2 <= 0)
1114 grp->int2 = 2; 1376 grp->int2 = 2;
1115 1377
1116 eio_grp_limit (grp, grp->int2); 1378 eio_grp_limit (grp, grp->int2);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines