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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines