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.125 by root, Thu Jun 19 09:05:43 2008 UTC vs.
Revision 1.157 by root, Sat Jan 2 12:58:37 2010 UTC

3#include <errno.h> 3#include <errno.h>
4 4
5#include "EXTERN.h" 5#include "EXTERN.h"
6#include "perl.h" 6#include "perl.h"
7#include "XSUB.h" 7#include "XSUB.h"
8
9#include "schmorp.h"
8 10
9#include <stddef.h> 11#include <stddef.h>
10#include <stdlib.h> 12#include <stdlib.h>
11#include <errno.h> 13#include <errno.h>
12#include <sys/types.h> 14#include <sys/types.h>
75 77
76#define EIO_STRUCT_STAT Stat_t 78#define EIO_STRUCT_STAT Stat_t
77 79
78/* use NV for 32 bit perls as it allows larger offsets */ 80/* use NV for 32 bit perls as it allows larger offsets */
79#if IVSIZE >= 8 81#if IVSIZE >= 8
82# define VAL64 IV
80# define SvVAL64 SvIV 83# define SvVAL64 SvIV
84# define newSVval64 newSViv
81#else 85#else
86# define VAL64 NV
82# define SvVAL64 SvNV 87# define SvVAL64 SvNV
88# define newSVval64 newSVnv
83#endif 89#endif
84 90
85static 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
86typedef 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 */
87 107
88#define AIO_REQ_KLASS "IO::AIO::REQ" 108static HV *aio_stash, *aio_req_stash, *aio_grp_stash;
89#define AIO_GRP_KLASS "IO::AIO::GRP"
90 109
91#define EIO_REQ_MEMBERS \ 110#define EIO_REQ_MEMBERS \
92 SV *callback; \ 111 SV *callback; \
93 SV *sv1, *sv2; \ 112 SV *sv1, *sv2; \
94 STRLEN stroffset; \ 113 STRLEN stroffset; \
96 115
97#define EIO_NO_WRAPPERS 1 116#define EIO_NO_WRAPPERS 1
98 117
99#include "libeio/eio.h" 118#include "libeio/eio.h"
100 119
120#ifndef POSIX_FADV_NORMAL
121# define POSIX_FADV_NORMAL 0
122# define NO_FADVISE 1
123#endif
124
125#ifndef POSIX_FADV_SEQUENTIAL
126# define POSIX_FADV_SEQUENTIAL 0
127#endif
128
129#ifndef POSIX_FADV_RANDOM
130# define POSIX_FADV_RANDOM 0
131#endif
132
133#ifndef POSIX_FADV_NOREUSE
134# define POSIX_FADV_NOREUSE 0
135#endif
136
137#ifndef POSIX_FADV_WILLNEED
138# define POSIX_FADV_WILLNEED 0
139#endif
140
141#ifndef POSIX_FADV_DONTNEED
142# define POSIX_FADV_DONTNEED 0
143#endif
144
101static int req_invoke (eio_req *req); 145static int req_invoke (eio_req *req);
102#define EIO_FINISH(req) req_invoke (req) 146#define EIO_FINISH(req) req_invoke (req)
103static void aio_grp_feed (eio_req *grp);
104#define EIO_FEED(req) aio_grp_feed (req)
105static void req_destroy (eio_req *grp); 147static void req_destroy (eio_req *grp);
106#define EIO_DESTROY(req) req_destroy (req) 148#define EIO_DESTROY(req) req_destroy (req)
107 149
108enum { 150enum {
109 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ 151 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
116 158
117static SV *on_next_submit; 159static SV *on_next_submit;
118static int next_pri = EIO_PRI_DEFAULT; 160static int next_pri = EIO_PRI_DEFAULT;
119static int max_outstanding; 161static int max_outstanding;
120 162
121static int respipe_osf [2], respipe [2] = { -1, -1 }; 163static s_epipe respipe;
122 164
123static void req_destroy (aio_req req); 165static void req_destroy (aio_req req);
124static void req_cancel (aio_req req); 166static void req_cancel (aio_req req);
125 167
126static void want_poll (void) 168static void want_poll (void)
127{ 169{
128 /* write a dummy byte to the pipe so fh becomes ready */ 170 /* write a dummy byte to the pipe so fh becomes ready */
129 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1); 171 s_epipe_signal (&respipe);
130} 172}
131 173
132static void done_poll (void) 174static void done_poll (void)
133{ 175{
134 /* read any signals sent by the worker threads */ 176 /* read any signals sent by the worker threads */
135 char buf [4]; 177 s_epipe_drain (&respipe);
136 while (respipe_read (respipe [0], buf, 4) == 4)
137 ;
138} 178}
139 179
140/* must be called at most once */ 180/* must be called at most once */
141static SV *req_sv (aio_req req, const char *klass) 181static SV *req_sv (aio_req req, HV *stash)
142{ 182{
143 if (!req->self) 183 if (!req->self)
144 { 184 {
145 req->self = (SV *)newHV (); 185 req->self = (SV *)newHV ();
146 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0); 186 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
147 } 187 }
148 188
149 return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1))); 189 return sv_2mortal (sv_bless (newRV_inc (req->self), stash));
150} 190}
151 191
152static aio_req SvAIO_REQ (SV *sv) 192static aio_req SvAIO_REQ (SV *sv)
153{ 193{
154 MAGIC *mg; 194 MAGIC *mg;
155 195
156 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv)) 196 if (!SvROK (sv)
197 || (SvSTASH (SvRV (sv)) != aio_grp_stash
198 && SvSTASH (SvRV (sv)) != aio_req_stash
199 && !sv_derived_from (sv, "IO::AIO::REQ")))
157 croak ("object of class " AIO_REQ_KLASS " expected"); 200 croak ("object of class IO::AIO::REQ expected");
158 201
159 mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 202 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
160 203
161 return mg ? (aio_req)mg->mg_ptr : 0; 204 return mg ? (aio_req)mg->mg_ptr : 0;
162} 205}
168 dSP; 211 dSP;
169 212
170 ENTER; 213 ENTER;
171 SAVETMPS; 214 SAVETMPS;
172 PUSHMARK (SP); 215 PUSHMARK (SP);
173 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 216 XPUSHs (req_sv (grp, aio_grp_stash));
174 PUTBACK; 217 PUTBACK;
175 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR); 218 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
176 SPAGAIN; 219 SPAGAIN;
177 FREETMPS; 220 FREETMPS;
178 LEAVE; 221 LEAVE;
181 224
182static void req_submit (eio_req *req) 225static void req_submit (eio_req *req)
183{ 226{
184 eio_submit (req); 227 eio_submit (req);
185 228
186 if (on_next_submit) 229 if (expect_false (on_next_submit))
187 { 230 {
188 dSP; 231 dSP;
189 SV *cb = sv_2mortal (on_next_submit); 232 SV *cb = sv_2mortal (on_next_submit);
190 233
191 on_next_submit = 0; 234 on_next_submit = 0;
201 dSP; 244 dSP;
202 245
203 if (req->flags & FLAG_SV2_RO_OFF) 246 if (req->flags & FLAG_SV2_RO_OFF)
204 SvREADONLY_off (req->sv2); 247 SvREADONLY_off (req->sv2);
205 248
206 if (!EIO_CANCELLED (req) && SvOK (req->callback)) 249 if (!EIO_CANCELLED (req) && req->callback)
207 { 250 {
208 ENTER; 251 ENTER;
209 SAVETMPS; 252 SAVETMPS;
210 PUSHMARK (SP); 253 PUSHMARK (SP);
211 EXTEND (SP, 1); 254 EXTEND (SP, 1);
217 SV *rv = &PL_sv_undef; 260 SV *rv = &PL_sv_undef;
218 261
219 if (req->result >= 0) 262 if (req->result >= 0)
220 { 263 {
221 int i; 264 int i;
222 char *buf = req->ptr2; 265 char *names = (char *)req->ptr2;
266 eio_dirent *ent = (eio_dirent *)req->ptr1; /* might be 0 */
223 AV *av = newAV (); 267 AV *av = newAV ();
224 268
225 av_extend (av, req->result - 1); 269 av_extend (av, req->result - 1);
226 270
227 for (i = 0; i < req->result; ++i) 271 for (i = 0; i < req->result; ++i)
228 { 272 {
229 SV *sv = newSVpv (buf, 0); 273 if (req->int1 & EIO_READDIR_DENTS)
274 {
275 SV *namesv = newSVpvn (names + ent->nameofs, ent->namelen);
230 276
277 if (req->int1 & EIO_READDIR_CUSTOM2)
278 {
279 static SV *sv_type [EIO_DT_MAX + 1]; /* type sv cache */
280 AV *avent = newAV ();
281
282 av_extend (avent, 2);
283
284 if (!sv_type [ent->type])
285 {
286 sv_type [ent->type] = newSViv (ent->type);
287 SvREADONLY_on (sv_type [ent->type]);
288 }
289
290 av_store (avent, 0, namesv);
291 av_store (avent, 1, SvREFCNT_inc (sv_type [ent->type]));
292 av_store (avent, 2, IVSIZE >= 8 ? newSVuv (ent->inode) : newSVnv (ent->inode));
293
294 av_store (av, i, newRV_noinc ((SV *)avent));
295 }
296 else
231 av_store (av, i, sv); 297 av_store (av, i, namesv);
298
299 ++ent;
300 }
301 else
302 {
303 SV *name = newSVpv (names, 0);
304 av_store (av, i, name);
232 buf += SvCUR (sv) + 1; 305 names += SvCUR (name) + 1;
306 }
233 } 307 }
234 308
235 rv = sv_2mortal (newRV_noinc ((SV *)av)); 309 rv = sv_2mortal (newRV_noinc ((SV *)av));
236 } 310 }
237 311
238 PUSHs (rv); 312 PUSHs (rv);
313
314 if (req->int1 & EIO_READDIR_CUSTOM1)
315 XPUSHs (sv_2mortal (newSViv (req->int1 & ~(EIO_READDIR_CUSTOM1 | EIO_READDIR_CUSTOM2))));
239 } 316 }
240 break; 317 break;
241 318
242 case EIO_OPEN: 319 case EIO_OPEN:
243 { 320 {
249 GV *gv = (GV *)sv_newmortal (); 326 GV *gv = (GV *)sv_newmortal ();
250 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR); 327 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
251 char sym [64]; 328 char sym [64];
252 int symlen; 329 int symlen;
253 330
254 symlen = snprintf (sym, sizeof (sym), "fd#%d", req->result); 331 symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
255 gv_init (gv, stash, sym, symlen, 0); 332 gv_init (gv, aio_stash, sym, symlen, 0);
256 333
257 symlen = snprintf ( 334 symlen = snprintf (
258 sym, 335 sym,
259 sizeof (sym), 336 sizeof (sym),
260 "%s&=%d", 337 "%s&=%d",
261 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<", 338 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
262 req->result 339 (int)req->result
263 ); 340 );
264 341
265 if (do_open (gv, sym, symlen, 0, 0, 0, 0)) 342 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
266 fh = (SV *)gv; 343 fh = (SV *)gv;
267 } 344 }
301 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 378 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
302 PUSHs (sv_2mortal (newSViv (req->result))); 379 PUSHs (sv_2mortal (newSViv (req->result)));
303 break; 380 break;
304 381
305 case EIO_READ: 382 case EIO_READ:
383 {
306 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0)); 384 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
307 *SvEND (req->sv2) = 0; 385 *SvEND (req->sv2) = 0;
386 SvPOK_only (req->sv2);
387 SvSETMAGIC (req->sv2);
308 PUSHs (sv_2mortal (newSViv (req->result))); 388 PUSHs (sv_2mortal (newSViv (req->result)));
389 }
309 break; 390 break;
310 391
311 case EIO_DUP2: 392 case EIO_DUP2:
312 if (req->result > 0) 393 if (req->result > 0)
313 req->result = 0; 394 req->result = 0;
359 grp->sv2 = 0; 440 grp->sv2 = 0;
360 441
361 eio_grp_cancel (grp); 442 eio_grp_cancel (grp);
362} 443}
363 444
364#ifdef USE_SOCKETS_AS_HANDLES
365# define TO_SOCKET(x) (win32_get_osfhandle (x))
366#else
367# define TO_SOCKET(x) (x)
368#endif
369
370static void 445static void
371create_respipe (void) 446create_respipe (void)
372{ 447{
373 int old_readfd = respipe [0];
374
375 if (respipe [1] >= 0)
376 respipe_close (TO_SOCKET (respipe [1]));
377
378#ifdef _WIN32
379 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe))
380#else
381 if (pipe (respipe)) 448 if (s_epipe_renew (&respipe))
382#endif
383 croak ("unable to initialize result pipe"); 449 croak ("IO::AIO: unable to initialize result pipe");
384
385 if (old_readfd >= 0)
386 {
387 if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0)
388 croak ("unable to initialize result pipe(2)");
389
390 respipe_close (respipe [0]);
391 respipe [0] = old_readfd;
392 }
393
394#ifdef _WIN32
395 int arg = 1;
396 if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg)
397 || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg))
398#else
399 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
400 || fcntl (respipe [1], F_SETFL, O_NONBLOCK))
401#endif
402 croak ("unable to initialize result pipe(3)");
403
404 respipe_osf [0] = TO_SOCKET (respipe [0]);
405 respipe_osf [1] = TO_SOCKET (respipe [1]);
406} 450}
407 451
408static void poll_wait (void) 452static void poll_wait (void)
409{ 453{
410 fd_set rfd;
411
412 while (eio_nreqs ()) 454 while (eio_nreqs ())
413 { 455 {
414 int size; 456 int size;
415 457
416 X_LOCK (reslock); 458 X_LOCK (reslock);
420 if (size) 462 if (size)
421 return; 463 return;
422 464
423 etp_maybe_start_thread (); 465 etp_maybe_start_thread ();
424 466
425 FD_ZERO (&rfd); 467 s_epipe_wait (&respipe);
426 FD_SET (respipe [0], &rfd);
427
428 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
429 } 468 }
430} 469}
431 470
432static int poll_cb (void) 471static int poll_cb (void)
433{ 472{
448static void atfork_child (void) 487static void atfork_child (void)
449{ 488{
450 create_respipe (); 489 create_respipe ();
451} 490}
452 491
492static SV *
493get_cb (SV *cb_sv)
494{
495 SvGETMAGIC (cb_sv);
496 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
497}
498
453#define dREQ \ 499#define dREQ \
500 SV *cb_cv; \
454 aio_req req; \ 501 aio_req req; \
455 int req_pri = next_pri; \ 502 int req_pri = next_pri; \
456 next_pri = EIO_PRI_DEFAULT; \ 503 next_pri = EIO_PRI_DEFAULT; \
457 \ 504 \
458 if (SvOK (callback) && !SvROK (callback)) \ 505 cb_cv = get_cb (callback); \
459 croak ("callback must be undef or of reference type"); \
460 \ 506 \
461 Newz (0, req, 1, eio_req); \ 507 Newz (0, req, 1, eio_req); \
462 if (!req) \ 508 if (!req) \
463 croak ("out of memory during eio_req allocation"); \ 509 croak ("out of memory during eio_req allocation"); \
464 \ 510 \
465 req->callback = newSVsv (callback); \ 511 req->callback = SvREFCNT_inc (cb_cv); \
466 req->pri = req_pri 512 req->pri = req_pri
467 513
468#define REQ_SEND \ 514#define REQ_SEND \
515 PUTBACK; \
469 req_submit (req); \ 516 req_submit (req); \
517 SPAGAIN; \
470 \ 518 \
471 if (GIMME_V != G_VOID) \ 519 if (GIMME_V != G_VOID) \
472 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 520 XPUSHs (req_sv (req, aio_req_stash));
473 521
474MODULE = IO::AIO PACKAGE = IO::AIO 522MODULE = IO::AIO PACKAGE = IO::AIO
475 523
476PROTOTYPES: ENABLE 524PROTOTYPES: ENABLE
477 525
478BOOT: 526BOOT:
479{ 527{
480 stash = gv_stashpv ("IO::AIO", 1); 528 static const struct {
481 529 const char *name;
482 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 530 IV iv;
483 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 531 } *civ, const_iv[] = {
484 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 532# define const_iv(name, value) { # name, (IV) value },
485 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 533# define const_eio(name) { # name, (IV) EIO_ ## name },
486 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 534 const_iv (EXDEV , EXDEV)
535 const_iv (ENOSYS , ENOSYS)
536 const_iv (O_RDONLY, O_RDONLY)
537 const_iv (O_WRONLY, O_WRONLY)
538 const_iv (O_CREAT , O_CREAT)
539 const_iv (O_TRUNC , O_TRUNC)
487#ifndef _WIN32 540#ifndef _WIN32
488 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 541 const_iv (S_IFIFO , S_IFIFO)
489#endif 542#endif
543 const_iv (FADV_NORMAL , POSIX_FADV_NORMAL)
544 const_iv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL)
545 const_iv (FADV_RANDOM , POSIX_FADV_RANDOM)
546 const_iv (FADV_NOREUSE , POSIX_FADV_NOREUSE)
547 const_iv (FADV_WILLNEED , POSIX_FADV_WILLNEED)
548 const_iv (FADV_DONTNEED , POSIX_FADV_DONTNEED)
490 549
550 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
551 const_eio (SYNC_FILE_RANGE_WRITE)
552 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
553
554 const_eio (READDIR_DENTS)
555 const_eio (READDIR_DIRS_FIRST)
556 const_eio (READDIR_STAT_ORDER)
557 const_eio (READDIR_FOUND_UNKNOWN)
558
559 const_eio (DT_UNKNOWN)
560 const_eio (DT_FIFO)
561 const_eio (DT_CHR)
562 const_eio (DT_DIR)
563 const_eio (DT_BLK)
564 const_eio (DT_REG)
565 const_eio (DT_LNK)
566 const_eio (DT_SOCK)
567 const_eio (DT_WHT)
568 };
569
570 aio_stash = gv_stashpv ("IO::AIO" , 1);
571 aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1);
572 aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1);
573
574 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
575 newCONSTSUB (aio_stash, (char *)civ->name, newSViv (civ->iv));
576
491 create_respipe (); 577 create_respipe ();
492 578
493 if (eio_init (want_poll, done_poll) < 0) 579 if (eio_init (want_poll, done_poll) < 0)
494 croak ("IO::AIO: unable to initialise eio library"); 580 croak ("IO::AIO: unable to initialise eio library");
495 581
496 /* atfork child called in fifo order, so before eio's handler */ 582 /* atfork child called in fifo order, so before eio's handler */
497 X_THREAD_ATFORK (0, 0, atfork_child); 583 X_THREAD_ATFORK (0, 0, atfork_child);
498} 584}
499 585
500void 586void
501max_poll_reqs (int nreqs) 587max_poll_reqs (int nreqs)
502 PROTOTYPE: $ 588 PROTOTYPE: $
555 ALIAS: 641 ALIAS:
556 aio_fsync = EIO_FSYNC 642 aio_fsync = EIO_FSYNC
557 aio_fdatasync = EIO_FDATASYNC 643 aio_fdatasync = EIO_FDATASYNC
558 PPCODE: 644 PPCODE:
559{ 645{
646 int fd = s_fileno_croak (fh, 0);
560 dREQ; 647 dREQ;
561 648
562 req->type = ix; 649 req->type = ix;
563 req->sv1 = newSVsv (fh); 650 req->sv1 = newSVsv (fh);
564 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 651 req->int1 = fd;
652
653 REQ_SEND (req);
654}
655
656void
657aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef)
658 PROTOTYPE: $$$$;$
659 PPCODE:
660{
661 int fd = s_fileno_croak (fh, 0);
662 dREQ;
663
664 req->type = EIO_SYNC_FILE_RANGE;
665 req->sv1 = newSVsv (fh);
666 req->int1 = fd;
667 req->offs = offset;
668 req->size = nbytes;
669 req->int2 = flags;
565 670
566 REQ_SEND (req); 671 REQ_SEND (req);
567} 672}
568 673
569void 674void
570aio_close (SV *fh, SV *callback=&PL_sv_undef) 675aio_close (SV *fh, SV *callback=&PL_sv_undef)
571 PROTOTYPE: $;$ 676 PROTOTYPE: $;$
572 PPCODE: 677 PPCODE:
573{ 678{
574 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 679 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
680 int fd = s_fileno_croak (fh, 0);
575 dREQ; 681 dREQ;
576 682
577 if (close_pipe < 0) 683 if (close_pipe < 0)
578 { 684 {
579 int pipefd [2]; 685 int pipefd [2];
587 } 693 }
588 694
589 req->type = EIO_DUP2; 695 req->type = EIO_DUP2;
590 req->int1 = close_pipe; 696 req->int1 = close_pipe;
591 req->sv2 = newSVsv (fh); 697 req->sv2 = newSVsv (fh);
592 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 698 req->int2 = fd;
593 699
594 REQ_SEND (req); 700 REQ_SEND (req);
595} 701}
596 702
597void 703void
601 aio_write = EIO_WRITE 707 aio_write = EIO_WRITE
602 PROTOTYPE: $$$$$;$ 708 PROTOTYPE: $$$$$;$
603 PPCODE: 709 PPCODE:
604{ 710{
605 STRLEN svlen; 711 STRLEN svlen;
712 int fd = s_fileno_croak (fh, ix == EIO_WRITE);
606 char *svptr = SvPVbyte (data, svlen); 713 char *svptr = SvPVbyte (data, svlen);
607 UV len = SvUV (length); 714 UV len = SvUV (length);
608
609 SvUPGRADE (data, SVt_PV);
610 SvPOK_on (data);
611 715
612 if (dataoffset < 0) 716 if (dataoffset < 0)
613 dataoffset += svlen; 717 dataoffset += svlen;
614 718
615 if (dataoffset < 0 || dataoffset > svlen) 719 if (dataoffset < 0 || dataoffset > svlen)
621 if (!SvOK (length) || len + dataoffset > svlen) 725 if (!SvOK (length) || len + dataoffset > svlen)
622 len = svlen - dataoffset; 726 len = svlen - dataoffset;
623 } 727 }
624 else 728 else
625 { 729 {
626 /* read: grow scalar as necessary */ 730 /* read: check type and grow scalar as necessary */
731 SvUPGRADE (data, SVt_PV);
627 svptr = SvGROW (data, len + dataoffset + 1); 732 svptr = SvGROW (data, len + dataoffset + 1);
628 } 733 }
629
630 if (len < 0)
631 croak ("length must not be negative");
632 734
633 { 735 {
634 dREQ; 736 dREQ;
635 737
636 req->type = ix; 738 req->type = ix;
637 req->sv1 = newSVsv (fh); 739 req->sv1 = newSVsv (fh);
638 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 740 req->int1 = fd;
639 : IoOFP (sv_2io (fh)));
640 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 741 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
641 req->size = len; 742 req->size = len;
642 req->sv2 = SvREFCNT_inc (data); 743 req->sv2 = SvREFCNT_inc (data);
643 req->ptr2 = (char *)svptr + dataoffset; 744 req->ptr2 = (char *)svptr + dataoffset;
644 req->stroffset = dataoffset; 745 req->stroffset = dataoffset;
667 768
668 REQ_SEND; 769 REQ_SEND;
669} 770}
670 771
671void 772void
672aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef) 773aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef)
673 PROTOTYPE: $$$$;$ 774 PROTOTYPE: $$$$;$
674 PPCODE: 775 PPCODE:
675{ 776{
777 int ifd = s_fileno_croak (in_fh , 0);
778 int ofd = s_fileno_croak (out_fh, 1);
676 dREQ; 779 dREQ;
677 780
678 req->type = EIO_SENDFILE; 781 req->type = EIO_SENDFILE;
679 req->sv1 = newSVsv (out_fh); 782 req->sv1 = newSVsv (out_fh);
680 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 783 req->int1 = ofd;
681 req->sv2 = newSVsv (in_fh); 784 req->sv2 = newSVsv (in_fh);
682 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 785 req->int2 = ifd;
683 req->offs = SvVAL64 (in_offset); 786 req->offs = in_offset;
684 req->size = length; 787 req->size = length;
685 788
686 REQ_SEND; 789 REQ_SEND;
687} 790}
688 791
689void 792void
690aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef) 793aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef)
691 PROTOTYPE: $$$;$ 794 PROTOTYPE: $$$;$
692 PPCODE: 795 PPCODE:
693{ 796{
797 int fd = s_fileno_croak (fh, 0);
694 dREQ; 798 dREQ;
695 799
696 req->type = EIO_READAHEAD; 800 req->type = EIO_READAHEAD;
697 req->sv1 = newSVsv (fh); 801 req->sv1 = newSVsv (fh);
698 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 802 req->int1 = fd;
699 req->offs = SvVAL64 (offset); 803 req->offs = offset;
700 req->size = length; 804 req->size = length;
701 805
702 REQ_SEND; 806 REQ_SEND;
703} 807}
704 808
820 req->type = EIO_FCHOWN; 924 req->type = EIO_FCHOWN;
821 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 925 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
822 } 926 }
823 927
824 REQ_SEND; 928 REQ_SEND;
929}
930
931void
932aio_readdirx (SV8 *pathname, IV flags, SV *callback=&PL_sv_undef)
933 PPCODE:
934{
935 dREQ;
936
937 req->type = EIO_READDIR;
938 req->sv1 = newSVsv (pathname);
939 req->ptr1 = SvPVbyte_nolen (req->sv1);
940 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
941
942 if (flags & EIO_READDIR_DENTS)
943 req->int1 |= EIO_READDIR_CUSTOM2;
944
945 REQ_SEND;
825} 946}
826 947
827void 948void
828aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 949aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
829 ALIAS: 950 ALIAS:
894{ 1015{
895 dREQ; 1016 dREQ;
896 1017
897 req->type = EIO_GROUP; 1018 req->type = EIO_GROUP;
898 1019
899 eio_submit (req); 1020 req_submit (req);
900 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1021 XPUSHs (req_sv (req, aio_grp_stash));
901} 1022}
902 1023
903void 1024void
904aio_nop (SV *callback=&PL_sv_undef) 1025aio_nop (SV *callback=&PL_sv_undef)
905 ALIAS: 1026 ALIAS:
957 1078
958int 1079int
959poll_fileno() 1080poll_fileno()
960 PROTOTYPE: 1081 PROTOTYPE:
961 CODE: 1082 CODE:
962 RETVAL = respipe [0]; 1083 RETVAL = s_epipe_fd (&respipe);
963 OUTPUT: 1084 OUTPUT:
964 RETVAL 1085 RETVAL
965 1086
966int 1087int
967poll_cb(...) 1088poll_cb(...)
1007 CODE: 1128 CODE:
1008 RETVAL = eio_nthreads (); 1129 RETVAL = eio_nthreads ();
1009 OUTPUT: 1130 OUTPUT:
1010 RETVAL 1131 RETVAL
1011 1132
1133int
1134fadvise (aio_rfd fh, off_t offset, off_t length, IV advice)
1135 PROTOTYPE: $$$$
1136 CODE:
1137#if _XOPEN_SOURCE >= 600 && !NO_FADVISE
1138 RETVAL = posix_fadvise (fh, offset, length, advice);
1139#else
1140 RETVAL = errno = ENOSYS;
1141#endif
1142 OUTPUT:
1143 RETVAL
1144
1145ssize_t
1146sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
1147 PROTOTYPE: $$$$
1148 CODE:
1149 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count);
1150 OUTPUT:
1151 RETVAL
1152
1012void _on_next_submit (SV *cb) 1153void _on_next_submit (SV *cb)
1013 CODE: 1154 CODE:
1014 SvREFCNT_dec (on_next_submit); 1155 SvREFCNT_dec (on_next_submit);
1015 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1156 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1016 1157
1023 CODE: 1164 CODE:
1024 eio_cancel (req); 1165 eio_cancel (req);
1025 1166
1026void 1167void
1027cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1168cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1028 CODE: 1169 PPCODE:
1170{
1171 if (GIMME_V != G_VOID)
1172 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1173
1174 if (items > 1)
1175 {
1176 SV *cb_cv =get_cb (callback);
1177
1029 SvREFCNT_dec (req->callback); 1178 SvREFCNT_dec (req->callback);
1030 req->callback = newSVsv (callback); 1179 req->callback = SvREFCNT_inc (cb_cv);
1180 }
1181}
1031 1182
1032MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1183MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1033 1184
1034void 1185void
1035add (aio_req grp, ...) 1186add (aio_req grp, ...)
1067 AV *av; 1218 AV *av;
1068 1219
1069 grp->errorno = errno; 1220 grp->errorno = errno;
1070 1221
1071 av = newAV (); 1222 av = newAV ();
1223 av_extend (av, items - 1);
1072 1224
1073 for (i = 1; i < items; ++i ) 1225 for (i = 1; i < items; ++i )
1074 av_push (av, newSVsv (ST (i))); 1226 av_push (av, newSVsv (ST (i)));
1075 1227
1076 SvREFCNT_dec (grp->sv1); 1228 SvREFCNT_dec (grp->sv1);
1090void 1242void
1091feed (aio_req grp, SV *callback=&PL_sv_undef) 1243feed (aio_req grp, SV *callback=&PL_sv_undef)
1092 CODE: 1244 CODE:
1093{ 1245{
1094 SvREFCNT_dec (grp->sv2); 1246 SvREFCNT_dec (grp->sv2);
1095 grp->sv2 = newSVsv (callback); 1247 grp->sv2 = newSVsv (callback);
1248 grp->feed = aio_grp_feed;
1096 1249
1097 if (grp->int2 <= 0) 1250 if (grp->int2 <= 0)
1098 grp->int2 = 2; 1251 grp->int2 = 2;
1099 1252
1100 eio_grp_limit (grp, grp->int2); 1253 eio_grp_limit (grp, grp->int2);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines