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.193 by root, Mon Jul 25 16:51:07 2011 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>
14#include <limits.h> 16#include <limits.h>
15#include <fcntl.h> 17#include <fcntl.h>
16#include <sched.h> 18#include <sched.h>
17 19
20#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
21# include <sys/mman.h>
22#endif
23
18/* perl namespace pollution */ 24/* perl namespace pollution */
19#undef VERSION 25#undef VERSION
20 26
27/* perl stupidly overrides readdir and maybe others */
28/* with thread-unsafe versions, imagine that :( */
29#undef readdir
30#undef opendir
31#undef closedir
32
21#ifdef _WIN32 33#ifdef _WIN32
22 34
23# define EIO_STRUCT_DIRENT Direntry_t
24# undef malloc
25# undef free
26
27// perl overrides all those nice win32 functions 35 // perl overrides all those nice libc functions
36
37 #undef malloc
38 #undef free
28# undef open 39 #undef open
29# undef read 40 #undef read
30# undef write 41 #undef write
31# undef send 42 #undef send
32# undef recv 43 #undef recv
33# undef stat 44 #undef stat
45 #undef lstat
34# undef fstat 46 #undef fstat
35# define lstat stat
36# undef truncate 47 #undef truncate
37# undef ftruncate 48 #undef ftruncate
38# undef open 49 #undef open
50 #undef link
39# undef close 51 #undef close
40# undef unlink 52 #undef unlink
53 #undef mkdir
41# undef rmdir 54 #undef rmdir
42# undef rename 55 #undef rename
43# undef lseek 56 #undef lseek
44 57 #undef opendir
45# define chown(a,b,c) (errno = ENOSYS, -1) 58 #undef readdir
46# define fchown(a,b,c) (errno = ENOSYS, -1) 59 #undef closedir
47# define fchmod(a,b) (errno = ENOSYS, -1) 60 #undef chmod
48# define symlink(a,b) (errno = ENOSYS, -1) 61 #undef fchmod
49# define readlink(a,b,c) (errno = ENOSYS, -1) 62 #undef dup
50# define mknod(a,b,c) (errno = ENOSYS, -1) 63 #undef dup2
51# define truncate(a,b) (errno = ENOSYS, -1) 64 #undef abort
52# define ftruncate(fd,o) chsize ((fd), (o)) 65 #undef pipe
53# define fsync(fd) _commit (fd)
54# define opendir(fd) (errno = ENOSYS, 0)
55# define readdir(fd) (errno = ENOSYS, -1)
56# define closedir(fd) (errno = ENOSYS, -1)
57# define mkdir(a,b) mkdir (a)
58 66
59#else 67#else
60 68
61# include <sys/time.h> 69 #include <sys/time.h>
62# include <sys/select.h> 70 #include <sys/select.h>
63# include <unistd.h> 71 #include <unistd.h>
64# include <utime.h> 72 #include <utime.h>
65# include <signal.h> 73 #include <signal.h>
66# define EIO_STRUCT_DIRENT struct dirent
67 74
68#endif 75#endif
69 76
70#define EIO_STRUCT_STAT Stat_t 77#define EIO_STRUCT_STAT Stat_t
71 78
72/* use NV for 32 bit perls as it allows larger offsets */ 79/* use NV for 32 bit perls as it allows larger offsets */
73#if IVSIZE >= 8 80#if IVSIZE >= 8
81# define VAL64 IV
74# define SvVAL64 SvIV 82# define SvVAL64 SvIV
83# define newSVval64 newSViv
75#else 84#else
85# define VAL64 NV
76# define SvVAL64 SvNV 86# define SvVAL64 SvNV
87# define newSVval64 newSVnv
77#endif 88#endif
78 89
79static HV *stash; 90/*****************************************************************************/
91
92#if __GNUC__ >= 3
93# define expect(expr,value) __builtin_expect ((expr),(value))
94#else
95# define expect(expr,value) (expr)
96#endif
97
98#define expect_false(expr) expect ((expr) != 0, 0)
99#define expect_true(expr) expect ((expr) != 0, 1)
100
101/*****************************************************************************/
102
80typedef SV SV8; /* byte-sv, used for argument-checking */ 103typedef SV SV8; /* byte-sv, used for argument-checking */
104typedef int aio_rfd; /* read file desriptor */
105typedef int aio_wfd; /* write file descriptor */
81 106
82#define AIO_REQ_KLASS "IO::AIO::REQ" 107static HV *aio_stash, *aio_req_stash, *aio_grp_stash;
83#define AIO_GRP_KLASS "IO::AIO::GRP"
84 108
85#define EIO_COMMON \ 109#define EIO_REQ_MEMBERS \
86 SV *callback; \ 110 SV *callback; \
87 SV *sv1, *sv2; \ 111 SV *sv1, *sv2; \
88 STRLEN stroffset; \ 112 STRLEN stroffset; \
89 SV *self 113 SV *self;
90 114
115#define EIO_NO_WRAPPERS 1
116
117#include "libeio/config.h"
91#include "libeio/eio.h" 118#include "libeio/eio.h"
92 119
93static int req_invoke (eio_req *req); 120static int req_invoke (eio_req *req);
94#define EIO_FINISH(req) req_invoke (req) 121#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); 122static void req_destroy (eio_req *grp);
98#define EIO_DESTROY(req) req_destroy (req) 123#define EIO_DESTROY(req) req_destroy (req)
124
125#include "libeio/eio.c"
126
127/* Linux/others */
128#ifndef O_ASYNC
129# define O_ASYNC 0
130#endif
131#ifndef O_DIRECT
132# define O_DIRECT 0
133#endif
134#ifndef O_NOATIME
135# define O_NOATIME 0
136#endif
137
138/* POSIX */
139#ifndef O_CLOEXEC
140# define O_CLOEXEC 0
141#endif
142#ifndef O_NOFOLLOW
143# define O_NOFOLLOW 0
144#endif
145#ifndef O_NOCTTY
146# define O_NOCTTY 0
147#endif
148#ifndef O_NONBLOCK
149# define O_NONBLOCK 0
150#endif
151#ifndef O_EXEC
152# define O_EXEC 0
153#endif
154#ifndef O_SEARCH
155# define O_SEARCH 0
156#endif
157#ifndef O_DIRECTORY
158# define O_DIRECTORY 0
159#endif
160#ifndef O_DSYNC
161# define O_DSYNC 0
162#endif
163#ifndef O_RSYNC
164# define O_RSYNC 0
165#endif
166#ifndef O_SYNC
167# define O_SYNC 0
168#endif
169#ifndef O_TTY_INIT
170# define O_TTY_INIT 0
171#endif
172
173#ifndef POSIX_FADV_NORMAL
174# define POSIX_FADV_NORMAL 0
175#endif
176#ifndef POSIX_FADV_SEQUENTIAL
177# define POSIX_FADV_SEQUENTIAL 0
178#endif
179#ifndef POSIX_FADV_RANDOM
180# define POSIX_FADV_RANDOM 0
181#endif
182#ifndef POSIX_FADV_NOREUSE
183# define POSIX_FADV_NOREUSE 0
184#endif
185#ifndef POSIX_FADV_WILLNEED
186# define POSIX_FADV_WILLNEED 0
187#endif
188#ifndef POSIX_FADV_DONTNEED
189# define POSIX_FADV_DONTNEED 0
190#endif
191
192#if !HAVE_POSIX_FADVISE
193# define posix_fadvise(a,b,c,d) errno = ENOSYS /* also return ENOSYS */
194#endif
195
196#ifndef POSIX_MADV_NORMAL
197# define POSIX_MADV_NORMAL 0
198#endif
199#ifndef POSIX_MADV_SEQUENTIAL
200# define POSIX_MADV_SEQUENTIAL 0
201#endif
202#ifndef POSIX_MADV_RANDOM
203# define POSIX_MADV_RANDOM 0
204#endif
205#ifndef POSIX_MADV_WILLNEED
206# define POSIX_MADV_WILLNEED 0
207#endif
208#ifndef POSIX_MADV_DONTNEED
209# define POSIX_MADV_DONTNEED 0
210#endif
211
212#if !HAVE_POSIX_MADVISE
213# define posix_madvise(a,b,c) errno = ENOSYS /* also return ENOSYS */
214#endif
215
216#ifndef PROT_NONE
217# define PROT_NONE 0
218#endif
219#ifndef PROT_READ
220# define PROT_READ 0
221#endif
222#ifndef PROT_WRITE
223# define PROT_READ 0
224#endif
225#ifndef PROT_EXEC
226# define PROT_EXEC 0
227#endif
228
229#ifndef ST_RDONLY
230# define ST_RDONLY 0
231#endif
232#ifndef ST_NOSUID
233# define ST_NOSUID 0
234#endif
235#ifndef ST_NODEV
236# define ST_NODEV 0
237#endif
238#ifndef ST_NOEXEC
239# define ST_NOEXEC 0
240#endif
241#ifndef ST_SYNCHRONOUS
242# define ST_SYNCHRONOUS 0
243#endif
244#ifndef ST_MANDLOCK
245# define ST_MANDLOCK 0
246#endif
247#ifndef ST_WRITE
248# define ST_WRITE 0
249#endif
250#ifndef ST_APPEND
251# define ST_APPEND 0
252#endif
253#ifndef ST_IMMUTABLE
254# define ST_IMMUTABLE 0
255#endif
256#ifndef ST_NOATIME
257# define ST_NOATIME 0
258#endif
259#ifndef ST_NODIRATIME
260# define ST_NODIRATIME 0
261#endif
262#ifndef ST_RELATIME
263# define ST_RELATIME 0
264#endif
265
266#ifndef S_IFIFO
267# define S_IFIFO 0
268#endif
269#ifndef S_IFCHR
270# define S_IFCHR 0
271#endif
272#ifndef S_IFBLK
273# define S_IFBLK 0
274#endif
275#ifndef S_IFLNK
276# define S_IFLNK 0
277#endif
278#ifndef S_IFREG
279# define S_IFREG 0
280#endif
281#ifndef S_IFDIR
282# define S_IFDIR 0
283#endif
284#ifndef S_IFWHT
285# define S_IFWHT 0
286#endif
287#ifndef S_IFSOCK
288# define S_IFSOCK 0
289#endif
290
291#ifndef MAP_ANONYMOUS
292# ifdef MAP_ANON
293# define MAP_ANONYMOUS MAP_ANON
294# else
295# define MAP_ANONYMOUS MAP_FIXED /* and hope this fails */
296# endif
297#endif
298#ifndef MAP_HUGETLB
299# define MAP_HUGETLB 0
300#endif
301#ifndef MAP_LOCKED
302# define MAP_LOCKED 0
303#endif
304#ifndef MAP_NORESERVE
305# define MAP_NORESERVE 0
306#endif
307#ifndef MAP_POPULATE
308# define MAP_POPULATE 0
309#endif
310#ifndef MAP_NONBLOCK
311# define MAP_NONBLOCK 0
312#endif
313
314#ifndef makedev
315# define makedev(maj,min) (((maj) << 8) | (min))
316#endif
317#ifndef major
318# define major(dev) ((dev) >> 8)
319#endif
320#ifndef minor
321# define minor(dev) ((dev) & 0xff)
322#endif
323
324#ifndef PAGESIZE
325# define PAGESIZE sysconf (_SC_PAGESIZE)
326#endif
99 327
100enum { 328enum {
101 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ 329 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
102}; 330};
103 331
104#include "libeio/eio.c"
105
106typedef eio_req *aio_req; 332typedef eio_req *aio_req;
107typedef eio_req *aio_req_ornot; 333typedef eio_req *aio_req_ornot;
108 334
109static SV *on_next_submit; 335static SV *on_next_submit;
110static int next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; 336static int next_pri = EIO_PRI_DEFAULT;
111static int max_outstanding; 337static int max_outstanding;
112 338
113static int respipe_osf [2], respipe [2] = { -1, -1 }; 339static s_epipe respipe;
114 340
115static void req_destroy (aio_req req); 341static void req_destroy (aio_req req);
116static void req_cancel (aio_req req); 342static void req_cancel (aio_req req);
117 343
118static void want_poll (void) 344static void want_poll (void)
119{ 345{
120 /* write a dummy byte to the pipe so fh becomes ready */ 346 /* write a dummy byte to the pipe so fh becomes ready */
121 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1); 347 s_epipe_signal (&respipe);
122} 348}
123 349
124static void done_poll (void) 350static void done_poll (void)
125{ 351{
126 /* read any signals sent by the worker threads */ 352 /* read any signals sent by the worker threads */
127 char buf [4]; 353 s_epipe_drain (&respipe);
128 while (respipe_read (respipe [0], buf, 4) == 4)
129 ;
130} 354}
131 355
132/* must be called at most once */ 356/* must be called at most once */
133static SV *req_sv (aio_req req, const char *klass) 357static SV *req_sv (aio_req req, HV *stash)
134{ 358{
135 if (!req->self) 359 if (!req->self)
136 { 360 {
137 req->self = (SV *)newHV (); 361 req->self = (SV *)newHV ();
138 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0); 362 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
139 } 363 }
140 364
141 return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1))); 365 return sv_2mortal (sv_bless (newRV_inc (req->self), stash));
142} 366}
143 367
144static aio_req SvAIO_REQ (SV *sv) 368static aio_req SvAIO_REQ (SV *sv)
145{ 369{
146 MAGIC *mg; 370 MAGIC *mg;
147 371
148 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv)) 372 if (!SvROK (sv)
373 || (SvSTASH (SvRV (sv)) != aio_grp_stash
374 && SvSTASH (SvRV (sv)) != aio_req_stash
375 && !sv_derived_from (sv, "IO::AIO::REQ")))
149 croak ("object of class " AIO_REQ_KLASS " expected"); 376 croak ("object of class IO::AIO::REQ expected");
150 377
151 mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 378 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
152 379
153 return mg ? (aio_req)mg->mg_ptr : 0; 380 return mg ? (aio_req)mg->mg_ptr : 0;
154} 381}
160 dSP; 387 dSP;
161 388
162 ENTER; 389 ENTER;
163 SAVETMPS; 390 SAVETMPS;
164 PUSHMARK (SP); 391 PUSHMARK (SP);
165 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 392 XPUSHs (req_sv (grp, aio_grp_stash));
166 PUTBACK; 393 PUTBACK;
167 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR); 394 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
168 SPAGAIN; 395 SPAGAIN;
169 FREETMPS; 396 FREETMPS;
170 LEAVE; 397 LEAVE;
173 400
174static void req_submit (eio_req *req) 401static void req_submit (eio_req *req)
175{ 402{
176 eio_submit (req); 403 eio_submit (req);
177 404
178 if (on_next_submit) 405 if (expect_false (on_next_submit))
179 { 406 {
180 dSP; 407 dSP;
181 SV *cb = sv_2mortal (on_next_submit); 408 SV *cb = sv_2mortal (on_next_submit);
182 409
183 on_next_submit = 0; 410 on_next_submit = 0;
188 } 415 }
189} 416}
190 417
191static int req_invoke (eio_req *req) 418static int req_invoke (eio_req *req)
192{ 419{
193 dSP;
194
195 if (req->flags & FLAG_SV2_RO_OFF) 420 if (req->flags & FLAG_SV2_RO_OFF)
196 SvREADONLY_off (req->sv2); 421 SvREADONLY_off (req->sv2);
197 422
198 if (!EIO_CANCELLED (req) && SvOK (req->callback)) 423 if (!EIO_CANCELLED (req) && req->callback)
199 { 424 {
425 dSP;
426 static SV *sv_result_cache; /* caches the result integer SV */
427 SV *sv_result;
428
200 ENTER; 429 ENTER;
201 SAVETMPS; 430 SAVETMPS;
202 PUSHMARK (SP); 431 PUSHMARK (SP);
203 EXTEND (SP, 1); 432 EXTEND (SP, 1);
433
434 /* do not recreate the result IV from scratch each time */
435 if (expect_true (sv_result_cache))
436 {
437 sv_result = sv_result_cache; sv_result_cache = 0;
438 SvIV_set (sv_result, req->result);
439 SvIOK_only (sv_result);
440 }
441 else
442 {
443 sv_result = newSViv (req->result);
444 SvREADONLY_on (sv_result);
445 }
204 446
205 switch (req->type) 447 switch (req->type)
206 { 448 {
207 case EIO_READDIR: 449 case EIO_READDIR:
208 { 450 {
209 SV *rv = &PL_sv_undef; 451 SV *rv = &PL_sv_undef;
210 452
211 if (req->result >= 0) 453 if (req->result >= 0)
212 { 454 {
213 int i; 455 int i;
214 char *buf = req->ptr2; 456 char *names = (char *)req->ptr2;
457 eio_dirent *ent = (eio_dirent *)req->ptr1; /* might be 0 */
215 AV *av = newAV (); 458 AV *av = newAV ();
216 459
217 av_extend (av, req->result - 1); 460 av_extend (av, req->result - 1);
218 461
219 for (i = 0; i < req->result; ++i) 462 for (i = 0; i < req->result; ++i)
220 { 463 {
221 SV *sv = newSVpv (buf, 0); 464 if (req->int1 & EIO_READDIR_DENTS)
465 {
466 SV *namesv = newSVpvn (names + ent->nameofs, ent->namelen);
222 467
468 if (req->int1 & EIO_READDIR_CUSTOM2)
469 {
470 static SV *sv_type [EIO_DT_MAX + 1]; /* type sv cache */
471 AV *avent = newAV ();
472
473 av_extend (avent, 2);
474
475 if (!sv_type [ent->type])
476 {
477 sv_type [ent->type] = newSViv (ent->type);
478 SvREADONLY_on (sv_type [ent->type]);
479 }
480
481 av_store (avent, 0, namesv);
482 av_store (avent, 1, SvREFCNT_inc (sv_type [ent->type]));
483 av_store (avent, 2, IVSIZE >= 8 ? newSVuv (ent->inode) : newSVnv (ent->inode));
484
485 av_store (av, i, newRV_noinc ((SV *)avent));
486 }
487 else
223 av_store (av, i, sv); 488 av_store (av, i, namesv);
489
490 ++ent;
491 }
492 else
493 {
494 SV *name = newSVpv (names, 0);
495 av_store (av, i, name);
224 buf += SvCUR (sv) + 1; 496 names += SvCUR (name) + 1;
497 }
225 } 498 }
226 499
227 rv = sv_2mortal (newRV_noinc ((SV *)av)); 500 rv = sv_2mortal (newRV_noinc ((SV *)av));
228 } 501 }
229 502
230 PUSHs (rv); 503 PUSHs (rv);
504
505 if (req->int1 & EIO_READDIR_CUSTOM1)
506 XPUSHs (sv_2mortal (newSViv (req->int1 & ~(EIO_READDIR_CUSTOM1 | EIO_READDIR_CUSTOM2))));
231 } 507 }
232 break; 508 break;
233 509
234 case EIO_OPEN: 510 case EIO_OPEN:
235 { 511 {
241 GV *gv = (GV *)sv_newmortal (); 517 GV *gv = (GV *)sv_newmortal ();
242 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR); 518 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
243 char sym [64]; 519 char sym [64];
244 int symlen; 520 int symlen;
245 521
246 symlen = snprintf (sym, sizeof (sym), "fd#%d", req->result); 522 symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
247 gv_init (gv, stash, sym, symlen, 0); 523 gv_init (gv, aio_stash, sym, symlen, 0);
248 524
249 symlen = snprintf ( 525 symlen = snprintf (
250 sym, 526 sym,
251 sizeof (sym), 527 sizeof (sym),
252 "%s&=%d", 528 "%s&=%d",
253 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<", 529 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
254 req->result 530 (int)req->result
255 ); 531 );
256 532
257 if (do_open (gv, sym, symlen, 0, 0, 0, 0)) 533 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
258 fh = (SV *)gv; 534 fh = (SV *)gv;
259 } 535 }
260 536
261 PUSHs (fh); 537 PUSHs (fh);
262 } 538 }
539 break;
540
541 case EIO_STATVFS:
542 case EIO_FSTATVFS:
543 {
544 SV *rv = &PL_sv_undef;
545
546#ifndef _WIN32
547 if (req->result >= 0)
548 {
549 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req);
550 HV *hv = newHV ();
551
552 rv = sv_2mortal (newRV_noinc ((SV *)hv));
553
554 hv_store (hv, "bsize" , sizeof ("bsize" ) - 1, newSVval64 (f->f_bsize ), 0);
555 hv_store (hv, "frsize" , sizeof ("frsize" ) - 1, newSVval64 (f->f_frsize ), 0);
556 hv_store (hv, "blocks" , sizeof ("blocks" ) - 1, newSVval64 (f->f_blocks ), 0);
557 hv_store (hv, "bfree" , sizeof ("bfree" ) - 1, newSVval64 (f->f_bfree ), 0);
558 hv_store (hv, "bavail" , sizeof ("bavail" ) - 1, newSVval64 (f->f_bavail ), 0);
559 hv_store (hv, "files" , sizeof ("files" ) - 1, newSVval64 (f->f_files ), 0);
560 hv_store (hv, "ffree" , sizeof ("ffree" ) - 1, newSVval64 (f->f_ffree ), 0);
561 hv_store (hv, "favail" , sizeof ("favail" ) - 1, newSVval64 (f->f_favail ), 0);
562 hv_store (hv, "fsid" , sizeof ("fsid" ) - 1, newSVval64 (f->f_fsid ), 0);
563 hv_store (hv, "flag" , sizeof ("flag" ) - 1, newSVval64 (f->f_flag ), 0);
564 hv_store (hv, "namemax", sizeof ("namemax") - 1, newSVval64 (f->f_namemax), 0);
565 }
566#endif
567
568 PUSHs (rv);
569 }
570
263 break; 571 break;
264 572
265 case EIO_GROUP: 573 case EIO_GROUP:
266 req->int1 = 2; /* mark group as finished */ 574 req->int1 = 2; /* mark group as finished */
267 575
279 case EIO_NOP: 587 case EIO_NOP:
280 case EIO_BUSY: 588 case EIO_BUSY:
281 break; 589 break;
282 590
283 case EIO_READLINK: 591 case EIO_READLINK:
592 case EIO_REALPATH:
284 if (req->result > 0) 593 if (req->result > 0)
285 { 594 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; 595 break;
291 596
292 case EIO_STAT: 597 case EIO_STAT:
293 case EIO_LSTAT: 598 case EIO_LSTAT:
294 case EIO_FSTAT: 599 case EIO_FSTAT:
295 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT; 600 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT;
296 PL_laststatval = req->result; 601 PL_laststatval = req->result;
602 /* if compilation fails here then perl's Stat_t is not struct _stati64 */
297 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 603 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
298 PUSHs (sv_2mortal (newSViv (req->result))); 604 PUSHs (sv_result);
299 break; 605 break;
300 606
301 case EIO_READ: 607 case EIO_READ:
608 {
302 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0)); 609 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
303 *SvEND (req->sv2) = 0; 610 *SvEND (req->sv2) = 0;
304 PUSHs (sv_2mortal (newSViv (req->result))); 611 SvPOK_only (req->sv2);
612 SvSETMAGIC (req->sv2);
613 PUSHs (sv_result);
614 }
305 break; 615 break;
306 616
307 case EIO_DUP2: 617 case EIO_DUP2: /* EIO_DUP2 actually means aio_close(), so fudge result value */
308 if (req->result > 0) 618 if (req->result > 0)
309 req->result = 0; 619 SvIV_set (sv_result, 0);
310 /* FALLTHROUGH */ 620 /* FALLTHROUGH */
311 621
312 default: 622 default:
313 PUSHs (sv_2mortal (newSViv (req->result))); 623 PUSHs (sv_result);
314 break; 624 break;
315 } 625 }
316 626
317 errno = req->errorno; 627 errno = req->errorno;
318 628
319 PUTBACK; 629 PUTBACK;
320 call_sv (req->callback, G_VOID | G_EVAL | G_DISCARD); 630 call_sv (req->callback, G_VOID | G_EVAL | G_DISCARD);
321 SPAGAIN; 631 SPAGAIN;
632
633 if (expect_false (SvREFCNT (sv_result) != 1 || sv_result_cache))
634 SvREFCNT_dec (sv_result);
635 else
636 sv_result_cache = sv_result;
322 637
323 FREETMPS; 638 FREETMPS;
324 LEAVE; 639 LEAVE;
325 640
326 PUTBACK; 641 PUTBACK;
344 Safefree (req); 659 Safefree (req);
345} 660}
346 661
347static void req_cancel_subs (aio_req grp) 662static void req_cancel_subs (aio_req grp)
348{ 663{
349 aio_req sub;
350
351 if (grp->type != EIO_GROUP) 664 if (grp->type != EIO_GROUP)
352 return; 665 return;
353 666
354 SvREFCNT_dec (grp->sv2); 667 SvREFCNT_dec (grp->sv2);
355 grp->sv2 = 0; 668 grp->sv2 = 0;
356 669
357 eio_grp_cancel (grp); 670 eio_grp_cancel (grp);
358} 671}
359 672
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
367create_respipe (void) 673static void create_respipe (void)
368{ 674{
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)) 675 if (s_epipe_renew (&respipe))
378#endif
379 croak ("unable to initialize result pipe"); 676 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} 677}
403 678
404static void poll_wait (void) 679static void poll_wait (void)
405{ 680{
406 fd_set rfd;
407
408 while (eio_nreqs ()) 681 while (eio_nreqs ())
409 { 682 {
410 int size; 683 int size;
411 684
412 X_LOCK (reslock); 685 X_LOCK (reslock);
414 X_UNLOCK (reslock); 687 X_UNLOCK (reslock);
415 688
416 if (size) 689 if (size)
417 return; 690 return;
418 691
419 maybe_start_thread (); 692 etp_maybe_start_thread ();
420 693
421 FD_ZERO (&rfd); 694 s_epipe_wait (&respipe);
422 FD_SET (respipe [0], &rfd);
423
424 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
425 } 695 }
426} 696}
427 697
428static int poll_cb (void) 698static int poll_cb (void)
429{ 699{
430 int res; 700 for (;;)
431
432 do
433 { 701 {
434 res = eio_poll (); 702 int res = eio_poll ();
435 703
436 if (res > 0) 704 if (res > 0)
437 croak (0); 705 croak (0);
706
707 if (!max_outstanding || max_outstanding > eio_nreqs ())
708 return res;
709
710 poll_wait ();
438 } 711 }
439 while (max_outstanding && max_outstanding <= eio_nreqs ());
440
441 return res;
442} 712}
443 713
444static void atfork_child (void) 714static void ecb_cold
715reinit (void)
445{ 716{
446 create_respipe (); 717 create_respipe ();
718
719 if (eio_init (want_poll, done_poll) < 0)
720 croak ("IO::AIO: unable to initialise eio library");
721}
722
723/*****************************************************************************/
724
725#if !_POSIX_MAPPED_FILES
726# define mmap(addr,length,prot,flags,fd,offs) (errno = ENOSYS, -1)
727# define munmap(addr,length) (errno = ENOSYS, -1)
728#endif
729
730#if !_POSIX_MEMORY_PROTECTION
731# define mprotect(addr,len,prot) (errno = ENOSYS, -1)
732# define PROT_NONE 0
733# define PROT_WRITE 0
734# define MAP_PRIVATE 0
735# define MAP_SHARED 0
736# define MAP_FIXED 0
737#endif
738
739#define MMAP_MAGIC PERL_MAGIC_ext
740
741static int mmap_free (pTHX_ SV *sv, MAGIC *mg)
742{
743 int old_errno = errno;
744 munmap (mg->mg_ptr, (size_t)mg->mg_obj);
745 errno = old_errno;
746
747 mg->mg_obj = 0; /* just in case */
748
749 SvREADONLY_off (sv);
750
751 if (SvPVX (sv) != mg->mg_ptr)
752 croak ("ERROR: IO::AIO::mmap-mapped scalar changed location, detected");
753
754 SvCUR_set (sv, 0);
755 SvPVX (sv) = 0;
756 SvOK_off (sv);
757
758 return 0;
759}
760
761static MGVTBL mmap_vtbl = {
762 0, 0, 0, 0, mmap_free
763};
764
765/*****************************************************************************/
766
767static SV * get_cb (SV *cb_sv)
768{
769 SvGETMAGIC (cb_sv);
770 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
447} 771}
448 772
449#define dREQ \ 773#define dREQ \
774 SV *cb_cv; \
450 aio_req req; \ 775 aio_req req; \
451 int req_pri = next_pri; \ 776 int req_pri = next_pri; \
452 next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; \ 777 next_pri = EIO_PRI_DEFAULT; \
453 \ 778 \
454 if (SvOK (callback) && !SvROK (callback)) \ 779 cb_cv = get_cb (callback); \
455 croak ("callback must be undef or of reference type"); \
456 \ 780 \
457 Newz (0, req, 1, eio_req); \ 781 Newz (0, req, 1, eio_req); \
458 if (!req) \ 782 if (!req) \
459 croak ("out of memory during eio_req allocation"); \ 783 croak ("out of memory during eio_req allocation"); \
460 \ 784 \
461 req->callback = newSVsv (callback); \ 785 req->callback = SvREFCNT_inc (cb_cv); \
462 req->pri = req_pri 786 req->pri = req_pri
463 787
464#define REQ_SEND \ 788#define REQ_SEND \
789 PUTBACK; \
465 req_submit (req); \ 790 req_submit (req); \
791 SPAGAIN; \
466 \ 792 \
467 if (GIMME_V != G_VOID) \ 793 if (GIMME_V != G_VOID) \
468 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 794 XPUSHs (req_sv (req, aio_req_stash));
469 795
470MODULE = IO::AIO PACKAGE = IO::AIO 796MODULE = IO::AIO PACKAGE = IO::AIO
471 797
472PROTOTYPES: ENABLE 798PROTOTYPES: ENABLE
473 799
474BOOT: 800BOOT:
475{ 801{
802 static const struct {
803 const char *name;
804 IV iv;
805 } *civ, const_iv[] = {
806# define const_niv(name, value) { # name, (IV) value },
807# define const_iv(name) { # name, (IV) name },
808# define const_eio(name) { # name, (IV) EIO_ ## name },
809 const_iv (EXDEV)
810 const_iv (ENOSYS)
811 const_iv (O_RDONLY)
812 const_iv (O_WRONLY)
813 const_iv (O_RDWR)
814 const_iv (O_CREAT)
815 const_iv (O_TRUNC)
816 const_iv (O_EXCL)
817 const_iv (O_APPEND)
818
819 const_iv (O_ASYNC)
820 const_iv (O_DIRECT)
821 const_iv (O_NOATIME)
822
823 const_iv (O_CLOEXEC)
824 const_iv (O_NOCTTY)
825 const_iv (O_NOFOLLOW)
826 const_iv (O_NONBLOCK)
827 const_iv (O_EXEC)
828 const_iv (O_SEARCH)
829 const_iv (O_DIRECTORY)
830 const_iv (O_DSYNC)
831 const_iv (O_RSYNC)
832 const_iv (O_SYNC)
833 const_iv (O_TTY_INIT)
834
835 const_iv (S_IFIFO)
836 const_iv (S_IFCHR)
837 const_iv (S_IFBLK)
838 const_iv (S_IFLNK)
839 const_iv (S_IFREG)
840 const_iv (S_IFDIR)
841 const_iv (S_IFWHT)
842 const_iv (S_IFSOCK)
843 const_iv (S_IFMT)
844
845 const_niv (FADV_NORMAL , POSIX_FADV_NORMAL)
846 const_niv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL)
847 const_niv (FADV_RANDOM , POSIX_FADV_RANDOM)
848 const_niv (FADV_NOREUSE , POSIX_FADV_NOREUSE)
849 const_niv (FADV_WILLNEED , POSIX_FADV_WILLNEED)
850 const_niv (FADV_DONTNEED , POSIX_FADV_DONTNEED)
851
852 const_niv (MADV_NORMAL , POSIX_MADV_NORMAL)
853 const_niv (MADV_SEQUENTIAL, POSIX_MADV_SEQUENTIAL)
854 const_niv (MADV_RANDOM , POSIX_MADV_RANDOM)
855 const_niv (MADV_WILLNEED , POSIX_MADV_WILLNEED)
856 const_niv (MADV_DONTNEED , POSIX_MADV_DONTNEED)
857
858 const_iv (ST_RDONLY)
859 const_iv (ST_NOSUID)
860 const_iv (ST_NODEV)
861 const_iv (ST_NOEXEC)
862 const_iv (ST_SYNCHRONOUS)
863 const_iv (ST_MANDLOCK)
864 const_iv (ST_WRITE)
865 const_iv (ST_APPEND)
866 const_iv (ST_IMMUTABLE)
867 const_iv (ST_NOATIME)
868 const_iv (ST_NODIRATIME)
869 const_iv (ST_RELATIME)
870
871 const_iv (PROT_NONE)
872 const_iv (PROT_EXEC)
873 const_iv (PROT_READ)
874 const_iv (PROT_WRITE)
875
876 /*const_iv (MAP_FIXED)*/
877 const_iv (MAP_PRIVATE)
878 const_iv (MAP_SHARED)
879 const_iv (MAP_ANONYMOUS)
880
881 /* linuxish */
882 const_iv (MAP_HUGETLB)
883 const_iv (MAP_LOCKED)
884 const_iv (MAP_NORESERVE)
885 const_iv (MAP_POPULATE)
886 const_iv (MAP_NONBLOCK)
887
888 const_eio (MCL_FUTURE)
889 const_eio (MCL_CURRENT)
890
891 const_eio (MS_ASYNC)
892 const_eio (MS_INVALIDATE)
893 const_eio (MS_SYNC)
894
895 const_eio (MT_MODIFY)
896
897 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
898 const_eio (SYNC_FILE_RANGE_WRITE)
899 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
900
901 const_eio (FALLOC_FL_KEEP_SIZE)
902
903 const_eio (READDIR_DENTS)
904 const_eio (READDIR_DIRS_FIRST)
905 const_eio (READDIR_STAT_ORDER)
906 const_eio (READDIR_FOUND_UNKNOWN)
907
908 const_eio (DT_UNKNOWN)
909 const_eio (DT_FIFO)
910 const_eio (DT_CHR)
911 const_eio (DT_DIR)
912 const_eio (DT_BLK)
913 const_eio (DT_REG)
914 const_eio (DT_LNK)
915 const_eio (DT_SOCK)
916 const_eio (DT_WHT)
917 };
918
476 stash = gv_stashpv ("IO::AIO", 1); 919 aio_stash = gv_stashpv ("IO::AIO" , 1);
920 aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1);
921 aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1);
477 922
478 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 923 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
479 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 924 newCONSTSUB (aio_stash, (char *)civ->name, newSViv (civ->iv));
480 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
481 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
482 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
483#ifdef _WIN32
484 X_MUTEX_CHECK (wrklock);
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 925
491 X_COND_CHECK (reqwait); 926 newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE));
492#else
493 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
494#endif
495 927
496 create_respipe (); 928 reinit ();
497
498 if (eio_init (want_poll, done_poll) < 0)
499 croak ("IO::AIO: unable to initialise eio library");
500
501 /* atfork child called in fifo order, so before eio's handler */
502 X_THREAD_ATFORK (0, 0, atfork_child);
503} 929}
504 930
505void 931void
932reinit ()
933 PROTOTYPE:
934
935void
506max_poll_reqs (int nreqs) 936max_poll_reqs (unsigned int nreqs)
507 PROTOTYPE: $ 937 PROTOTYPE: $
508 CODE: 938 CODE:
509 eio_set_max_poll_reqs (nreqs); 939 eio_set_max_poll_reqs (nreqs);
510 940
511void 941void
513 PROTOTYPE: $ 943 PROTOTYPE: $
514 CODE: 944 CODE:
515 eio_set_max_poll_time (nseconds); 945 eio_set_max_poll_time (nseconds);
516 946
517void 947void
518min_parallel (int nthreads) 948min_parallel (unsigned int nthreads)
519 PROTOTYPE: $ 949 PROTOTYPE: $
520 CODE: 950 CODE:
521 eio_set_min_parallel (nthreads); 951 eio_set_min_parallel (nthreads);
522 952
523void 953void
524max_parallel (int nthreads) 954max_parallel (unsigned int nthreads)
525 PROTOTYPE: $ 955 PROTOTYPE: $
526 CODE: 956 CODE:
527 eio_set_max_parallel (nthreads); 957 eio_set_max_parallel (nthreads);
528 958
529void 959void
530max_idle (int nthreads) 960max_idle (unsigned int nthreads)
531 PROTOTYPE: $ 961 PROTOTYPE: $
532 CODE: 962 CODE:
533 eio_set_max_idle (nthreads); 963 eio_set_max_idle (nthreads);
534 964
535void 965void
966idle_timeout (unsigned int seconds)
967 PROTOTYPE: $
968 CODE:
969 eio_set_idle_timeout (seconds);
970
971void
536max_outstanding (int maxreqs) 972max_outstanding (unsigned int maxreqs)
537 PROTOTYPE: $ 973 PROTOTYPE: $
538 CODE: 974 CODE:
539 max_outstanding = maxreqs; 975 max_outstanding = maxreqs;
540 976
541void 977void
542aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef) 978aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef)
543 PROTOTYPE: $$$;$
544 PPCODE: 979 PPCODE:
545{ 980{
546 dREQ; 981 dREQ;
547 982
548 req->type = EIO_OPEN; 983 req->type = EIO_OPEN;
554 REQ_SEND; 989 REQ_SEND;
555} 990}
556 991
557void 992void
558aio_fsync (SV *fh, SV *callback=&PL_sv_undef) 993aio_fsync (SV *fh, SV *callback=&PL_sv_undef)
559 PROTOTYPE: $;$
560 ALIAS: 994 ALIAS:
561 aio_fsync = EIO_FSYNC 995 aio_fsync = EIO_FSYNC
562 aio_fdatasync = EIO_FDATASYNC 996 aio_fdatasync = EIO_FDATASYNC
997 aio_syncfs = EIO_SYNCFS
563 PPCODE: 998 PPCODE:
564{ 999{
1000 int fd = s_fileno_croak (fh, 0);
565 dREQ; 1001 dREQ;
566 1002
567 req->type = ix; 1003 req->type = ix;
568 req->sv1 = newSVsv (fh); 1004 req->sv1 = newSVsv (fh);
569 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 1005 req->int1 = fd;
570 1006
571 REQ_SEND (req); 1007 REQ_SEND (req);
572} 1008}
573 1009
574void 1010void
1011aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef)
1012 PPCODE:
1013{
1014 int fd = s_fileno_croak (fh, 0);
1015 dREQ;
1016
1017 req->type = EIO_SYNC_FILE_RANGE;
1018 req->sv1 = newSVsv (fh);
1019 req->int1 = fd;
1020 req->offs = offset;
1021 req->size = nbytes;
1022 req->int2 = flags;
1023
1024 REQ_SEND (req);
1025}
1026
1027void
1028aio_fallocate (SV *fh, int mode, off_t offset, size_t len, SV *callback=&PL_sv_undef)
1029 PPCODE:
1030{
1031 int fd = s_fileno_croak (fh, 0);
1032 dREQ;
1033
1034 req->type = EIO_FALLOCATE;
1035 req->sv1 = newSVsv (fh);
1036 req->int1 = fd;
1037 req->int2 = mode;
1038 req->offs = offset;
1039 req->size = len;
1040
1041 REQ_SEND (req);
1042}
1043
1044void
575aio_close (SV *fh, SV *callback=&PL_sv_undef) 1045aio_close (SV *fh, SV *callback=&PL_sv_undef)
576 PROTOTYPE: $;$
577 PPCODE: 1046 PPCODE:
578{ 1047{
579 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 1048 static int close_fd = -1; /* dummy fd to close fds via dup2 */
1049 int fd = s_fileno_croak (fh, 0);
580 dREQ; 1050 dREQ;
581 1051
582 if (close_pipe < 0) 1052 if (expect_false (close_fd < 0))
583 { 1053 {
584 int pipefd [2]; 1054 int pipefd [2];
585 1055
1056 if (
1057#ifdef _WIN32
1058 _pipe (pipefd, 1, _O_BINARY) < 0
1059#else
586 if (pipe (pipefd) < 0 1060 pipe (pipefd) < 0
587 || close (pipefd [1]) < 0
588 || fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0) 1061 || fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0
1062#endif
1063 || close (pipefd [1]) < 0
1064 )
589 abort (); /*D*/ 1065 abort (); /*D*/
590 1066
591 close_pipe = pipefd [0]; 1067 close_fd = pipefd [0];
592 } 1068 }
593 1069
594 req->type = EIO_DUP2; 1070 req->type = EIO_DUP2;
595 req->int1 = close_pipe; 1071 req->int1 = close_fd;
596 req->sv2 = newSVsv (fh); 1072 req->sv2 = newSVsv (fh);
597 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 1073 req->int2 = fd;
598 1074
599 REQ_SEND (req); 1075 REQ_SEND (req);
600} 1076}
601 1077
602void 1078void
603aio_read (SV *fh, SV *offset, SV *length, SV8 *data, IV dataoffset, SV *callback=&PL_sv_undef) 1079aio_read (SV *fh, SV *offset, SV *length, SV8 *data, IV dataoffset, SV *callback=&PL_sv_undef)
604 ALIAS: 1080 ALIAS:
605 aio_read = EIO_READ 1081 aio_read = EIO_READ
606 aio_write = EIO_WRITE 1082 aio_write = EIO_WRITE
607 PROTOTYPE: $$$$$;$
608 PPCODE: 1083 PPCODE:
609{ 1084{
610 STRLEN svlen; 1085 STRLEN svlen;
1086 int fd = s_fileno_croak (fh, ix == EIO_WRITE);
611 char *svptr = SvPVbyte (data, svlen); 1087 char *svptr = SvPVbyte (data, svlen);
612 UV len = SvUV (length); 1088 UV len = SvUV (length);
613
614 SvUPGRADE (data, SVt_PV);
615 SvPOK_on (data);
616 1089
617 if (dataoffset < 0) 1090 if (dataoffset < 0)
618 dataoffset += svlen; 1091 dataoffset += svlen;
619 1092
620 if (dataoffset < 0 || dataoffset > svlen) 1093 if (dataoffset < 0 || dataoffset > svlen)
626 if (!SvOK (length) || len + dataoffset > svlen) 1099 if (!SvOK (length) || len + dataoffset > svlen)
627 len = svlen - dataoffset; 1100 len = svlen - dataoffset;
628 } 1101 }
629 else 1102 else
630 { 1103 {
631 /* read: grow scalar as necessary */ 1104 /* read: check type and grow scalar as necessary */
1105 SvUPGRADE (data, SVt_PV);
632 svptr = SvGROW (data, len + dataoffset + 1); 1106 svptr = SvGROW (data, len + dataoffset + 1);
633 } 1107 }
634 1108
635 if (len < 0)
636 croak ("length must not be negative");
637
638 { 1109 {
639 dREQ; 1110 dREQ;
640 1111
641 req->type = ix; 1112 req->type = ix;
642 req->sv1 = newSVsv (fh); 1113 req->sv1 = newSVsv (fh);
643 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 1114 req->int1 = fd;
644 : IoOFP (sv_2io (fh)));
645 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 1115 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
646 req->size = len; 1116 req->size = len;
647 req->sv2 = SvREFCNT_inc (data); 1117 req->sv2 = SvREFCNT_inc (data);
648 req->ptr2 = (char *)svptr + dataoffset; 1118 req->ptr2 = (char *)svptr + dataoffset;
649 req->stroffset = dataoffset; 1119 req->stroffset = dataoffset;
658 } 1128 }
659} 1129}
660 1130
661void 1131void
662aio_readlink (SV8 *path, SV *callback=&PL_sv_undef) 1132aio_readlink (SV8 *path, SV *callback=&PL_sv_undef)
663 PROTOTYPE: $$;$ 1133 ALIAS:
1134 aio_readlink = EIO_READLINK
1135 aio_realpath = EIO_REALPATH
664 PPCODE: 1136 PPCODE:
665{ 1137{
666 SV *data;
667 dREQ; 1138 dREQ;
668 1139
669 data = newSV (NAME_MAX);
670 SvPOK_on (data);
671
672 req->type = EIO_READLINK; 1140 req->type = ix;
673 req->sv1 = newSVsv (path); 1141 req->sv1 = newSVsv (path);
674 req->ptr1 = SvPVbyte_nolen (req->sv1); 1142 req->ptr1 = SvPVbyte_nolen (req->sv1);
675 req->sv2 = data;
676 req->ptr2 = SvPVbyte_nolen (data);
677 1143
678 REQ_SEND; 1144 REQ_SEND;
679} 1145}
680 1146
681void 1147void
682aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef) 1148aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef)
683 PROTOTYPE: $$$$;$
684 PPCODE: 1149 PPCODE:
685{ 1150{
1151 int ifd = s_fileno_croak (in_fh , 0);
1152 int ofd = s_fileno_croak (out_fh, 1);
686 dREQ; 1153 dREQ;
687 1154
688 req->type = EIO_SENDFILE; 1155 req->type = EIO_SENDFILE;
689 req->sv1 = newSVsv (out_fh); 1156 req->sv1 = newSVsv (out_fh);
690 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1157 req->int1 = ofd;
691 req->sv2 = newSVsv (in_fh); 1158 req->sv2 = newSVsv (in_fh);
692 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1159 req->int2 = ifd;
693 req->offs = SvVAL64 (in_offset); 1160 req->offs = in_offset;
694 req->size = length; 1161 req->size = length;
695 1162
696 REQ_SEND; 1163 REQ_SEND;
697} 1164}
698 1165
699void 1166void
700aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef) 1167aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef)
701 PROTOTYPE: $$$;$
702 PPCODE: 1168 PPCODE:
703{ 1169{
1170 int fd = s_fileno_croak (fh, 0);
704 dREQ; 1171 dREQ;
705 1172
706 req->type = EIO_READAHEAD; 1173 req->type = EIO_READAHEAD;
707 req->sv1 = newSVsv (fh); 1174 req->sv1 = newSVsv (fh);
708 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 1175 req->int1 = fd;
709 req->offs = SvVAL64 (offset); 1176 req->offs = offset;
710 req->size = length; 1177 req->size = length;
711 1178
712 REQ_SEND; 1179 REQ_SEND;
713} 1180}
714 1181
715void 1182void
716aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef) 1183aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef)
717 ALIAS: 1184 ALIAS:
718 aio_stat = EIO_STAT 1185 aio_stat = EIO_STAT
719 aio_lstat = EIO_LSTAT 1186 aio_lstat = EIO_LSTAT
1187 aio_statvfs = EIO_STATVFS
720 PPCODE: 1188 PPCODE:
721{ 1189{
722 dREQ; 1190 dREQ;
723 1191
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); 1192 req->sv1 = newSVsv (fh_or_path);
733 1193
734 if (SvPOK (fh_or_path)) 1194 if (SvPOK (req->sv1))
735 { 1195 {
736 req->type = ix; 1196 req->type = ix;
737 req->ptr1 = SvPVbyte_nolen (req->sv1); 1197 req->ptr1 = SvPVbyte_nolen (req->sv1);
738 } 1198 }
739 else 1199 else
740 { 1200 {
741 req->type = EIO_FSTAT; 1201 req->type = ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT;
742 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1202 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
743 } 1203 }
744 1204
745 REQ_SEND; 1205 REQ_SEND;
746} 1206}
1207
1208UV
1209major (UV dev)
1210 ALIAS:
1211 minor = 1
1212 CODE:
1213 RETVAL = ix ? major (dev) : minor (dev);
1214 OUTPUT:
1215 RETVAL
1216
1217UV
1218makedev (UV maj, UV min)
1219 CODE:
1220 RETVAL = makedev (maj, min);
1221 OUTPUT:
1222 RETVAL
747 1223
748void 1224void
749aio_utime (SV8 *fh_or_path, SV *atime, SV *mtime, SV *callback=&PL_sv_undef) 1225aio_utime (SV8 *fh_or_path, SV *atime, SV *mtime, SV *callback=&PL_sv_undef)
750 PPCODE: 1226 PPCODE:
751{ 1227{
753 1229
754 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 1230 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
755 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; 1231 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
756 req->sv1 = newSVsv (fh_or_path); 1232 req->sv1 = newSVsv (fh_or_path);
757 1233
758 if (SvPOK (fh_or_path)) 1234 if (SvPOK (req->sv1))
759 { 1235 {
760 req->type = EIO_UTIME; 1236 req->type = EIO_UTIME;
761 req->ptr1 = SvPVbyte_nolen (req->sv1); 1237 req->ptr1 = SvPVbyte_nolen (req->sv1);
762 } 1238 }
763 else 1239 else
776 dREQ; 1252 dREQ;
777 1253
778 req->sv1 = newSVsv (fh_or_path); 1254 req->sv1 = newSVsv (fh_or_path);
779 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 1255 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
780 1256
781 if (SvPOK (fh_or_path)) 1257 if (SvPOK (req->sv1))
782 { 1258 {
783 req->type = EIO_TRUNCATE; 1259 req->type = EIO_TRUNCATE;
784 req->ptr1 = SvPVbyte_nolen (req->sv1); 1260 req->ptr1 = SvPVbyte_nolen (req->sv1);
785 } 1261 }
786 else 1262 else
794 1270
795void 1271void
796aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef) 1272aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
797 ALIAS: 1273 ALIAS:
798 aio_chmod = EIO_CHMOD 1274 aio_chmod = EIO_CHMOD
799 aio_fchmod = EIO_FCHMOD
800 aio_mkdir = EIO_MKDIR 1275 aio_mkdir = EIO_MKDIR
801 PPCODE: 1276 PPCODE:
802{ 1277{
803 dREQ; 1278 dREQ;
804 1279
805 req->type = ix;
806 req->int2 = mode; 1280 req->int2 = mode;
807 req->sv1 = newSVsv (fh_or_path); 1281 req->sv1 = newSVsv (fh_or_path);
808 1282
809 if (ix == EIO_FCHMOD) 1283 if (SvPOK (req->sv1))
810 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1284 {
1285 req->type = ix;
1286 req->ptr1 = SvPVbyte_nolen (req->sv1);
1287 }
811 else 1288 else
812 req->ptr1 = SvPVbyte_nolen (req->sv1); 1289 {
1290 req->type = EIO_FCHMOD;
1291 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1292 }
813 1293
814 REQ_SEND; 1294 REQ_SEND;
815} 1295}
816 1296
817void 1297void
822 1302
823 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 1303 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
824 req->int3 = SvOK (gid) ? SvIV (gid) : -1; 1304 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
825 req->sv1 = newSVsv (fh_or_path); 1305 req->sv1 = newSVsv (fh_or_path);
826 1306
827 if (SvPOK (fh_or_path)) 1307 if (SvPOK (req->sv1))
828 { 1308 {
829 req->type = EIO_CHOWN; 1309 req->type = EIO_CHOWN;
830 req->ptr1 = SvPVbyte_nolen (req->sv1); 1310 req->ptr1 = SvPVbyte_nolen (req->sv1);
831 } 1311 }
832 else 1312 else
837 1317
838 REQ_SEND; 1318 REQ_SEND;
839} 1319}
840 1320
841void 1321void
1322aio_readdirx (SV8 *pathname, IV flags, SV *callback=&PL_sv_undef)
1323 PPCODE:
1324{
1325 dREQ;
1326
1327 req->type = EIO_READDIR;
1328 req->sv1 = newSVsv (pathname);
1329 req->ptr1 = SvPVbyte_nolen (req->sv1);
1330 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
1331
1332 if (flags & EIO_READDIR_DENTS)
1333 req->int1 |= EIO_READDIR_CUSTOM2;
1334
1335 REQ_SEND;
1336}
1337
1338void
842aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 1339aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
843 ALIAS: 1340 ALIAS:
844 aio_unlink = EIO_UNLINK 1341 aio_unlink = EIO_UNLINK
845 aio_rmdir = EIO_RMDIR 1342 aio_rmdir = EIO_RMDIR
846 aio_readdir = EIO_READDIR 1343 aio_readdir = EIO_READDIR
888 1385
889 REQ_SEND; 1386 REQ_SEND;
890} 1387}
891 1388
892void 1389void
1390aio_mtouch (SV8 *data, IV offset = 0, SV *length = &PL_sv_undef, int flags = 0, SV *callback=&PL_sv_undef)
1391 ALIAS:
1392 aio_mtouch = EIO_MTOUCH
1393 aio_msync = EIO_MSYNC
1394 PPCODE:
1395{
1396 STRLEN svlen;
1397 char *svptr = SvPVbyte (data, svlen);
1398 UV len = SvUV (length);
1399
1400 if (offset < 0)
1401 offset += svlen;
1402
1403 if (offset < 0 || offset > svlen)
1404 croak ("offset outside of scalar");
1405
1406 if (!SvOK (length) || len + offset > svlen)
1407 len = svlen - offset;
1408
1409 {
1410 dREQ;
1411
1412 req->type = ix;
1413 req->sv2 = SvREFCNT_inc (data);
1414 req->ptr2 = (char *)svptr + offset;
1415 req->size = len;
1416 req->int1 = flags;
1417
1418 REQ_SEND;
1419 }
1420}
1421
1422void
1423aio_mlock (SV8 *data, IV offset = 0, SV *length = &PL_sv_undef, SV *callback=&PL_sv_undef)
1424 PPCODE:
1425{
1426 STRLEN svlen;
1427 char *svptr = SvPVbyte (data, svlen);
1428 UV len = SvUV (length);
1429
1430 if (offset < 0)
1431 offset += svlen;
1432
1433 if (offset < 0 || offset > svlen)
1434 croak ("offset outside of scalar");
1435
1436 if (!SvOK (length) || len + offset > svlen)
1437 len = svlen - offset;
1438
1439 {
1440 dREQ;
1441
1442 req->type = EIO_MLOCK;
1443 req->sv2 = SvREFCNT_inc (data);
1444 req->ptr2 = (char *)svptr + offset;
1445 req->size = len;
1446
1447 REQ_SEND;
1448 }
1449}
1450
1451void
1452aio_mlockall (IV flags, SV *callback=&PL_sv_undef)
1453 PPCODE:
1454{
1455 dREQ;
1456
1457 req->type = EIO_MLOCKALL;
1458 req->int1 = flags;
1459
1460 REQ_SEND;
1461}
1462
1463void
893aio_busy (double delay, SV *callback=&PL_sv_undef) 1464aio_busy (double delay, SV *callback=&PL_sv_undef)
894 PPCODE: 1465 PPCODE:
895{ 1466{
896 dREQ; 1467 dREQ;
897 1468
901 REQ_SEND; 1472 REQ_SEND;
902} 1473}
903 1474
904void 1475void
905aio_group (SV *callback=&PL_sv_undef) 1476aio_group (SV *callback=&PL_sv_undef)
906 PROTOTYPE: ;$
907 PPCODE: 1477 PPCODE:
908{ 1478{
909 dREQ; 1479 dREQ;
910 1480
911 req->type = EIO_GROUP; 1481 req->type = EIO_GROUP;
912 1482
913 eio_submit (req); 1483 req_submit (req);
914 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1484 XPUSHs (req_sv (req, aio_grp_stash));
915} 1485}
916 1486
917void 1487void
918aio_nop (SV *callback=&PL_sv_undef) 1488aio_nop (SV *callback=&PL_sv_undef)
919 ALIAS: 1489 ALIAS:
928 REQ_SEND; 1498 REQ_SEND;
929} 1499}
930 1500
931int 1501int
932aioreq_pri (int pri = 0) 1502aioreq_pri (int pri = 0)
933 PROTOTYPE: ;$
934 CODE: 1503 CODE:
935 RETVAL = next_pri - EIO_PRI_BIAS; 1504 RETVAL = next_pri;
936 if (items > 0) 1505 if (items > 0)
937 { 1506 {
938 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN; 1507 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
939 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX; 1508 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
940 next_pri = pri + EIO_PRI_BIAS; 1509 next_pri = pri;
941 } 1510 }
942 OUTPUT: 1511 OUTPUT:
943 RETVAL 1512 RETVAL
944 1513
945void 1514void
946aioreq_nice (int nice = 0) 1515aioreq_nice (int nice = 0)
947 CODE: 1516 CODE:
948 nice = next_pri - nice; 1517 nice = next_pri - nice;
949 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN; 1518 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
950 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX; 1519 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
951 next_pri = nice + EIO_PRI_BIAS; 1520 next_pri = nice;
952 1521
953void 1522void
954flush () 1523flush ()
955 PROTOTYPE:
956 CODE: 1524 CODE:
957 while (eio_nreqs ()) 1525 while (eio_nreqs ())
958 { 1526 {
959 poll_wait (); 1527 poll_wait ();
960 poll_cb (); 1528 poll_cb ();
961 } 1529 }
962 1530
963int 1531int
964poll() 1532poll ()
965 PROTOTYPE:
966 CODE: 1533 CODE:
967 poll_wait (); 1534 poll_wait ();
968 RETVAL = poll_cb (); 1535 RETVAL = poll_cb ();
969 OUTPUT: 1536 OUTPUT:
970 RETVAL 1537 RETVAL
971 1538
972int 1539int
973poll_fileno() 1540poll_fileno ()
974 PROTOTYPE:
975 CODE: 1541 CODE:
976 RETVAL = respipe [0]; 1542 RETVAL = s_epipe_fd (&respipe);
977 OUTPUT: 1543 OUTPUT:
978 RETVAL 1544 RETVAL
979 1545
980int 1546int
981poll_cb(...) 1547poll_cb (...)
982 PROTOTYPE: 1548 PROTOTYPE:
983 CODE: 1549 CODE:
984 RETVAL = poll_cb (); 1550 RETVAL = poll_cb ();
985 OUTPUT: 1551 OUTPUT:
986 RETVAL 1552 RETVAL
987 1553
988void 1554void
989poll_wait() 1555poll_wait ()
990 PROTOTYPE:
991 CODE: 1556 CODE:
992 poll_wait (); 1557 poll_wait ();
993 1558
994int 1559int
995nreqs() 1560nreqs ()
996 PROTOTYPE:
997 CODE: 1561 CODE:
998 RETVAL = eio_nreqs (); 1562 RETVAL = eio_nreqs ();
999 OUTPUT: 1563 OUTPUT:
1000 RETVAL 1564 RETVAL
1001 1565
1002int 1566int
1003nready() 1567nready ()
1004 PROTOTYPE:
1005 CODE: 1568 CODE:
1006 RETVAL = eio_nready (); 1569 RETVAL = eio_nready ();
1007 OUTPUT: 1570 OUTPUT:
1008 RETVAL 1571 RETVAL
1009 1572
1010int 1573int
1011npending() 1574npending ()
1012 PROTOTYPE:
1013 CODE: 1575 CODE:
1014 RETVAL = eio_npending (); 1576 RETVAL = eio_npending ();
1015 OUTPUT: 1577 OUTPUT:
1016 RETVAL 1578 RETVAL
1017 1579
1018int 1580int
1019nthreads() 1581nthreads ()
1020 PROTOTYPE:
1021 CODE: 1582 CODE:
1022 if (WORDACCESS_UNSAFE) X_LOCK (wrklock); 1583 RETVAL = eio_nthreads ();
1023 RETVAL = started;
1024 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1025 OUTPUT: 1584 OUTPUT:
1026 RETVAL 1585 RETVAL
1586
1587int
1588fadvise (aio_rfd fh, off_t offset, off_t length, IV advice)
1589 CODE:
1590 RETVAL = posix_fadvise (fh, offset, length, advice);
1591 OUTPUT:
1592 RETVAL
1593
1594IV
1595sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
1596 CODE:
1597 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count);
1598 OUTPUT:
1599 RETVAL
1600
1601void
1602mmap (SV *scalar, size_t length, int prot, int flags, SV *fh, off_t offset = 0)
1603 PPCODE:
1604 sv_unmagic (scalar, MMAP_MAGIC);
1605{
1606 int fd = SvOK (fh) ? s_fileno_croak (fh, flags & PROT_WRITE) : -1;
1607 void *addr = (void *)mmap (0, length, prot, flags, fd, offset);
1608 if (addr == (void *)-1)
1609 XSRETURN_NO;
1610
1611 sv_force_normal (scalar);
1612
1613 /* we store the length in mg_obj, as namlen is I32 :/ */
1614 sv_magicext (scalar, 0, MMAP_MAGIC, &mmap_vtbl, (char *)addr, 0)
1615 ->mg_obj = (SV *)length;
1616
1617 SvUPGRADE (scalar, SVt_PV); /* nop... */
1618
1619 if (!(prot & PROT_WRITE))
1620 SvREADONLY_on (scalar);
1621
1622 if (SvLEN (scalar))
1623 Safefree (SvPVX (scalar));
1624
1625 SvPVX (scalar) = (char *)addr;
1626 SvCUR_set (scalar, length);
1627 SvLEN_set (scalar, 0);
1628 SvPOK_only (scalar);
1629
1630 XSRETURN_YES;
1631}
1632
1633void
1634munmap (SV *scalar)
1635 CODE:
1636 sv_unmagic (scalar, MMAP_MAGIC);
1637
1638int
1639madvise (SV *scalar, off_t offset = 0, SV *length = &PL_sv_undef, IV advice_or_prot)
1640 ALIAS:
1641 mprotect = 1
1642 CODE:
1643{
1644 STRLEN svlen;
1645 void *addr = SvPVbyte (scalar, svlen);
1646 size_t len = SvUV (length);
1647
1648 if (offset < 0)
1649 offset += svlen;
1650
1651 if (offset < 0 || offset > svlen)
1652 croak ("offset outside of scalar");
1653
1654 if (!SvOK (length) || len + offset > svlen)
1655 len = svlen - offset;
1656
1657 addr = (void *)(((intptr_t)addr) + offset);
1658 eio_page_align (&addr, &len);
1659
1660 switch (ix)
1661 {
1662 case 0: RETVAL = posix_madvise (addr, len, advice_or_prot); break;
1663 case 1: RETVAL = mprotect (addr, len, advice_or_prot); break;
1664 }
1665}
1666 OUTPUT:
1667 RETVAL
1668
1669int
1670munlock (SV *scalar, off_t offset = 0, SV *length = &PL_sv_undef)
1671 CODE:
1672{
1673 STRLEN svlen;
1674 void *addr = SvPVbyte (scalar, svlen);
1675 size_t len = SvUV (length);
1676
1677 if (offset < 0)
1678 offset += svlen;
1679
1680 if (offset < 0 || offset > svlen)
1681 croak ("offset outside of scalar");
1682
1683 if (!SvOK (length) || len + offset > svlen)
1684 len = svlen - offset;
1685
1686 addr = (void *)(((intptr_t)addr) + offset);
1687 eio_page_align (&addr, &len);
1688#if _POSIX_MEMLOCK_RANGE
1689 RETVAL = munlock (addr, len);
1690#else
1691 RETVAL = ((errno = ENOSYS), -1);
1692#endif
1693}
1694 OUTPUT:
1695 RETVAL
1696
1697int
1698munlockall ()
1699 CODE:
1700#if _POSIX_MEMLOCK
1701 munlockall ();
1702#else
1703 RETVAL = -1;
1704 errno = ENOSYS;
1705#endif
1706 OUTPUT:
1707 RETVAL
1027 1708
1028void _on_next_submit (SV *cb) 1709void _on_next_submit (SV *cb)
1029 CODE: 1710 CODE:
1030 SvREFCNT_dec (on_next_submit); 1711 SvREFCNT_dec (on_next_submit);
1031 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1712 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1039 CODE: 1720 CODE:
1040 eio_cancel (req); 1721 eio_cancel (req);
1041 1722
1042void 1723void
1043cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1724cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1044 CODE: 1725 PPCODE:
1726{
1727 if (GIMME_V != G_VOID)
1728 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1729
1730 if (items > 1)
1731 {
1732 SV *cb_cv =get_cb (callback);
1733
1045 SvREFCNT_dec (req->callback); 1734 SvREFCNT_dec (req->callback);
1046 req->callback = newSVsv (callback); 1735 req->callback = SvREFCNT_inc (cb_cv);
1736 }
1737}
1047 1738
1048MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1739MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1049 1740
1050void 1741void
1051add (aio_req grp, ...) 1742add (aio_req grp, ...)
1083 AV *av; 1774 AV *av;
1084 1775
1085 grp->errorno = errno; 1776 grp->errorno = errno;
1086 1777
1087 av = newAV (); 1778 av = newAV ();
1779 av_extend (av, items - 1);
1088 1780
1089 for (i = 1; i < items; ++i ) 1781 for (i = 1; i < items; ++i )
1090 av_push (av, newSVsv (ST (i))); 1782 av_push (av, newSVsv (ST (i)));
1091 1783
1092 SvREFCNT_dec (grp->sv1); 1784 SvREFCNT_dec (grp->sv1);
1106void 1798void
1107feed (aio_req grp, SV *callback=&PL_sv_undef) 1799feed (aio_req grp, SV *callback=&PL_sv_undef)
1108 CODE: 1800 CODE:
1109{ 1801{
1110 SvREFCNT_dec (grp->sv2); 1802 SvREFCNT_dec (grp->sv2);
1111 grp->sv2 = newSVsv (callback); 1803 grp->sv2 = newSVsv (callback);
1804 grp->feed = aio_grp_feed;
1112 1805
1113 if (grp->int2 <= 0) 1806 if (grp->int2 <= 0)
1114 grp->int2 = 2; 1807 grp->int2 = 2;
1115 1808
1116 eio_grp_limit (grp, grp->int2); 1809 eio_grp_limit (grp, grp->int2);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines