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.134 by root, Sun Apr 19 13:05:06 2009 UTC vs.
Revision 1.159 by root, Thu Jan 7 18:08:21 2010 UTC

3#include <errno.h> 3#include <errno.h>
4 4
5#include "EXTERN.h" 5#include "EXTERN.h"
6#include "perl.h" 6#include "perl.h"
7#include "XSUB.h" 7#include "XSUB.h"
8
9#include "schmorp.h"
8 10
9#include <stddef.h> 11#include <stddef.h>
10#include <stdlib.h> 12#include <stdlib.h>
11#include <errno.h> 13#include <errno.h>
12#include <sys/types.h> 14#include <sys/types.h>
13#include <sys/stat.h> 15#include <sys/stat.h>
16#include <sys/statvfs.h>
14#include <limits.h> 17#include <limits.h>
15#include <fcntl.h> 18#include <fcntl.h>
16#include <sched.h> 19#include <sched.h>
17 20
18/* perl namespace pollution */ 21/* perl namespace pollution */
75 78
76#define EIO_STRUCT_STAT Stat_t 79#define EIO_STRUCT_STAT Stat_t
77 80
78/* use NV for 32 bit perls as it allows larger offsets */ 81/* use NV for 32 bit perls as it allows larger offsets */
79#if IVSIZE >= 8 82#if IVSIZE >= 8
83# define VAL64 IV
80# define SvVAL64 SvIV 84# define SvVAL64 SvIV
85# define newSVval64 newSViv
81#else 86#else
87# define VAL64 NV
82# define SvVAL64 SvNV 88# define SvVAL64 SvNV
89# define newSVval64 newSVnv
83#endif 90#endif
84 91
85/*****************************************************************************/ 92/*****************************************************************************/
86 93
87#if __GNUC__ >= 3 94#if __GNUC__ >= 3
93#define expect_false(expr) expect ((expr) != 0, 0) 100#define expect_false(expr) expect ((expr) != 0, 0)
94#define expect_true(expr) expect ((expr) != 0, 1) 101#define expect_true(expr) expect ((expr) != 0, 1)
95 102
96/*****************************************************************************/ 103/*****************************************************************************/
97 104
98static HV *stash;
99typedef SV SV8; /* byte-sv, used for argument-checking */ 105typedef SV SV8; /* byte-sv, used for argument-checking */
106typedef int aio_rfd; /* read file desriptor */
107typedef int aio_wfd; /* write file descriptor */
100 108
101#define AIO_REQ_KLASS "IO::AIO::REQ" 109static HV *aio_stash, *aio_req_stash, *aio_grp_stash;
102#define AIO_GRP_KLASS "IO::AIO::GRP"
103 110
104#define EIO_REQ_MEMBERS \ 111#define EIO_REQ_MEMBERS \
105 SV *callback; \ 112 SV *callback; \
106 SV *sv1, *sv2; \ 113 SV *sv1, *sv2; \
107 STRLEN stroffset; \ 114 STRLEN stroffset; \
109 116
110#define EIO_NO_WRAPPERS 1 117#define EIO_NO_WRAPPERS 1
111 118
112#include "libeio/eio.h" 119#include "libeio/eio.h"
113 120
121#ifndef POSIX_FADV_NORMAL
122# define POSIX_FADV_NORMAL 0
123# define NO_FADVISE 1
124#endif
125
126#ifndef POSIX_FADV_SEQUENTIAL
127# define POSIX_FADV_SEQUENTIAL 0
128#endif
129
130#ifndef POSIX_FADV_RANDOM
131# define POSIX_FADV_RANDOM 0
132#endif
133
134#ifndef POSIX_FADV_NOREUSE
135# define POSIX_FADV_NOREUSE 0
136#endif
137
138#ifndef POSIX_FADV_WILLNEED
139# define POSIX_FADV_WILLNEED 0
140#endif
141
142#ifndef POSIX_FADV_DONTNEED
143# define POSIX_FADV_DONTNEED 0
144#endif
145
146#ifndef ST_NODEV
147# define ST_NODEV 0
148#endif
149
150#ifndef ST_NOEXEC
151# define ST_NOEXEC 0
152#endif
153
154#ifndef ST_SYNCHRONOUS
155# define ST_SYNCHRONOUS 0
156#endif
157
158#ifndef ST_MANDLOCK
159# define ST_MANDLOCK 0
160#endif
161
162#ifndef ST_WRITE
163# define ST_WRITE 0
164#endif
165
166#ifndef ST_APPEND
167# define ST_APPEND 0
168#endif
169
170#ifndef ST_IMMUTABLE
171# define ST_IMMUTABLE 0
172#endif
173
174#ifndef ST_NOATIME
175# define ST_NOATIME 0
176#endif
177
178#ifndef ST_NODIRATIME
179# define ST_NODIRATIME 0
180#endif
181
182#ifndef ST_RELATIME
183# define ST_RELATIME 0
184#endif
185
114static int req_invoke (eio_req *req); 186static int req_invoke (eio_req *req);
115#define EIO_FINISH(req) req_invoke (req) 187#define EIO_FINISH(req) req_invoke (req)
116static void req_destroy (eio_req *grp); 188static void req_destroy (eio_req *grp);
117#define EIO_DESTROY(req) req_destroy (req) 189#define EIO_DESTROY(req) req_destroy (req)
118 190
127 199
128static SV *on_next_submit; 200static SV *on_next_submit;
129static int next_pri = EIO_PRI_DEFAULT; 201static int next_pri = EIO_PRI_DEFAULT;
130static int max_outstanding; 202static int max_outstanding;
131 203
132static int respipe_osf [2], respipe [2] = { -1, -1 }; 204static s_epipe respipe;
133 205
134static void req_destroy (aio_req req); 206static void req_destroy (aio_req req);
135static void req_cancel (aio_req req); 207static void req_cancel (aio_req req);
136 208
137static void want_poll (void) 209static void want_poll (void)
138{ 210{
139 /* write a dummy byte to the pipe so fh becomes ready */ 211 /* write a dummy byte to the pipe so fh becomes ready */
140 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1); 212 s_epipe_signal (&respipe);
141} 213}
142 214
143static void done_poll (void) 215static void done_poll (void)
144{ 216{
145 /* read any signals sent by the worker threads */ 217 /* read any signals sent by the worker threads */
146 char buf [4]; 218 s_epipe_drain (&respipe);
147 while (respipe_read (respipe [0], buf, 4) == 4)
148 ;
149} 219}
150 220
151/* must be called at most once */ 221/* must be called at most once */
152static SV *req_sv (aio_req req, const char *klass) 222static SV *req_sv (aio_req req, HV *stash)
153{ 223{
154 if (!req->self) 224 if (!req->self)
155 { 225 {
156 req->self = (SV *)newHV (); 226 req->self = (SV *)newHV ();
157 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0); 227 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
158 } 228 }
159 229
160 return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1))); 230 return sv_2mortal (sv_bless (newRV_inc (req->self), stash));
161} 231}
162 232
163static aio_req SvAIO_REQ (SV *sv) 233static aio_req SvAIO_REQ (SV *sv)
164{ 234{
165 MAGIC *mg; 235 MAGIC *mg;
166 236
167 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv)) 237 if (!SvROK (sv)
238 || (SvSTASH (SvRV (sv)) != aio_grp_stash
239 && SvSTASH (SvRV (sv)) != aio_req_stash
240 && !sv_derived_from (sv, "IO::AIO::REQ")))
168 croak ("object of class " AIO_REQ_KLASS " expected"); 241 croak ("object of class IO::AIO::REQ expected");
169 242
170 mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 243 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
171 244
172 return mg ? (aio_req)mg->mg_ptr : 0; 245 return mg ? (aio_req)mg->mg_ptr : 0;
173} 246}
179 dSP; 252 dSP;
180 253
181 ENTER; 254 ENTER;
182 SAVETMPS; 255 SAVETMPS;
183 PUSHMARK (SP); 256 PUSHMARK (SP);
184 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 257 XPUSHs (req_sv (grp, aio_grp_stash));
185 PUTBACK; 258 PUTBACK;
186 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR); 259 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
187 SPAGAIN; 260 SPAGAIN;
188 FREETMPS; 261 FREETMPS;
189 LEAVE; 262 LEAVE;
228 SV *rv = &PL_sv_undef; 301 SV *rv = &PL_sv_undef;
229 302
230 if (req->result >= 0) 303 if (req->result >= 0)
231 { 304 {
232 int i; 305 int i;
233 char *buf = req->ptr2; 306 char *names = (char *)req->ptr2;
307 eio_dirent *ent = (eio_dirent *)req->ptr1; /* might be 0 */
234 AV *av = newAV (); 308 AV *av = newAV ();
235 309
236 av_extend (av, req->result - 1); 310 av_extend (av, req->result - 1);
237 311
238 for (i = 0; i < req->result; ++i) 312 for (i = 0; i < req->result; ++i)
239 { 313 {
240 SV *sv = newSVpv (buf, 0); 314 if (req->int1 & EIO_READDIR_DENTS)
315 {
316 SV *namesv = newSVpvn (names + ent->nameofs, ent->namelen);
241 317
318 if (req->int1 & EIO_READDIR_CUSTOM2)
319 {
320 static SV *sv_type [EIO_DT_MAX + 1]; /* type sv cache */
321 AV *avent = newAV ();
322
323 av_extend (avent, 2);
324
325 if (!sv_type [ent->type])
326 {
327 sv_type [ent->type] = newSViv (ent->type);
328 SvREADONLY_on (sv_type [ent->type]);
329 }
330
331 av_store (avent, 0, namesv);
332 av_store (avent, 1, SvREFCNT_inc (sv_type [ent->type]));
333 av_store (avent, 2, IVSIZE >= 8 ? newSVuv (ent->inode) : newSVnv (ent->inode));
334
335 av_store (av, i, newRV_noinc ((SV *)avent));
336 }
337 else
242 av_store (av, i, sv); 338 av_store (av, i, namesv);
339
340 ++ent;
341 }
342 else
343 {
344 SV *name = newSVpv (names, 0);
345 av_store (av, i, name);
243 buf += SvCUR (sv) + 1; 346 names += SvCUR (name) + 1;
347 }
244 } 348 }
245 349
246 rv = sv_2mortal (newRV_noinc ((SV *)av)); 350 rv = sv_2mortal (newRV_noinc ((SV *)av));
247 } 351 }
248 352
249 PUSHs (rv); 353 PUSHs (rv);
354
355 if (req->int1 & EIO_READDIR_CUSTOM1)
356 XPUSHs (sv_2mortal (newSViv (req->int1 & ~(EIO_READDIR_CUSTOM1 | EIO_READDIR_CUSTOM2))));
250 } 357 }
251 break; 358 break;
252 359
253 case EIO_OPEN: 360 case EIO_OPEN:
254 { 361 {
260 GV *gv = (GV *)sv_newmortal (); 367 GV *gv = (GV *)sv_newmortal ();
261 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR); 368 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
262 char sym [64]; 369 char sym [64];
263 int symlen; 370 int symlen;
264 371
265 symlen = snprintf (sym, sizeof (sym), "fd#%d", req->result); 372 symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
266 gv_init (gv, stash, sym, symlen, 0); 373 gv_init (gv, aio_stash, sym, symlen, 0);
267 374
268 symlen = snprintf ( 375 symlen = snprintf (
269 sym, 376 sym,
270 sizeof (sym), 377 sizeof (sym),
271 "%s&=%d", 378 "%s&=%d",
272 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<", 379 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
273 req->result 380 (int)req->result
274 ); 381 );
275 382
276 if (do_open (gv, sym, symlen, 0, 0, 0, 0)) 383 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
277 fh = (SV *)gv; 384 fh = (SV *)gv;
278 } 385 }
279 386
280 PUSHs (fh); 387 PUSHs (fh);
281 } 388 }
389 break;
390
391 case EIO_STATVFS:
392 case EIO_FSTATVFS:
393 {
394 SV *rv = &PL_sv_undef;
395
396 if (req->result >= 0)
397 {
398 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req);
399 HV *hv = newHV ();
400
401 rv = sv_2mortal (newRV_noinc (hv));
402
403 hv_store (hv, "bsize" , sizeof ("bsize" ) - 1, newSVval64 (f->f_bsize ), 0);
404 hv_store (hv, "frsize" , sizeof ("frsize" ) - 1, newSVval64 (f->f_frsize ), 0);
405 hv_store (hv, "blocks" , sizeof ("blocks" ) - 1, newSVval64 (f->f_blocks ), 0);
406 hv_store (hv, "bfree" , sizeof ("bfree" ) - 1, newSVval64 (f->f_bfree ), 0);
407 hv_store (hv, "bavail" , sizeof ("bavail" ) - 1, newSVval64 (f->f_bavail ), 0);
408 hv_store (hv, "files" , sizeof ("files" ) - 1, newSVval64 (f->f_files ), 0);
409 hv_store (hv, "ffree" , sizeof ("ffree" ) - 1, newSVval64 (f->f_ffree ), 0);
410 hv_store (hv, "favail" , sizeof ("favail" ) - 1, newSVval64 (f->f_favail ), 0);
411 hv_store (hv, "fsid" , sizeof ("fsid" ) - 1, newSVval64 (f->f_fsid ), 0);
412 hv_store (hv, "flag" , sizeof ("flag" ) - 1, newSVval64 (f->f_flag ), 0);
413 hv_store (hv, "namemax", sizeof ("namemax") - 1, newSVval64 (f->f_namemax), 0);
414 }
415
416 PUSHs (rv);
417 }
418
282 break; 419 break;
283 420
284 case EIO_GROUP: 421 case EIO_GROUP:
285 req->int1 = 2; /* mark group as finished */ 422 req->int1 = 2; /* mark group as finished */
286 423
312 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 449 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
313 PUSHs (sv_2mortal (newSViv (req->result))); 450 PUSHs (sv_2mortal (newSViv (req->result)));
314 break; 451 break;
315 452
316 case EIO_READ: 453 case EIO_READ:
454 {
317 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0)); 455 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
318 *SvEND (req->sv2) = 0; 456 *SvEND (req->sv2) = 0;
457 SvPOK_only (req->sv2);
458 SvSETMAGIC (req->sv2);
319 PUSHs (sv_2mortal (newSViv (req->result))); 459 PUSHs (sv_2mortal (newSViv (req->result)));
460 }
320 break; 461 break;
321 462
322 case EIO_DUP2: 463 case EIO_DUP2:
323 if (req->result > 0) 464 if (req->result > 0)
324 req->result = 0; 465 req->result = 0;
370 grp->sv2 = 0; 511 grp->sv2 = 0;
371 512
372 eio_grp_cancel (grp); 513 eio_grp_cancel (grp);
373} 514}
374 515
375#ifdef USE_SOCKETS_AS_HANDLES
376# define TO_SOCKET(x) (win32_get_osfhandle (x))
377#else
378# define TO_SOCKET(x) (x)
379#endif
380
381static void 516static void
382create_respipe (void) 517create_respipe (void)
383{ 518{
384 int old_readfd = respipe [0];
385
386 if (respipe [1] >= 0)
387 respipe_close (TO_SOCKET (respipe [1]));
388
389#ifdef _WIN32
390 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe))
391#else
392 if (pipe (respipe)) 519 if (s_epipe_renew (&respipe))
393#endif
394 croak ("unable to initialize result pipe"); 520 croak ("IO::AIO: unable to initialize result pipe");
395
396 if (old_readfd >= 0)
397 {
398 if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0)
399 croak ("unable to initialize result pipe(2)");
400
401 respipe_close (respipe [0]);
402 respipe [0] = old_readfd;
403 }
404
405#ifdef _WIN32
406 int arg = 1;
407 if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg)
408 || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg))
409#else
410 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
411 || fcntl (respipe [1], F_SETFL, O_NONBLOCK))
412#endif
413 croak ("unable to initialize result pipe(3)");
414
415 respipe_osf [0] = TO_SOCKET (respipe [0]);
416 respipe_osf [1] = TO_SOCKET (respipe [1]);
417} 521}
418 522
419static void poll_wait (void) 523static void poll_wait (void)
420{ 524{
421 fd_set rfd;
422
423 while (eio_nreqs ()) 525 while (eio_nreqs ())
424 { 526 {
425 int size; 527 int size;
426 528
427 X_LOCK (reslock); 529 X_LOCK (reslock);
431 if (size) 533 if (size)
432 return; 534 return;
433 535
434 etp_maybe_start_thread (); 536 etp_maybe_start_thread ();
435 537
436 FD_ZERO (&rfd); 538 s_epipe_wait (&respipe);
437 FD_SET (respipe [0], &rfd);
438
439 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
440 } 539 }
441} 540}
442 541
443static int poll_cb (void) 542static int poll_cb (void)
444{ 543{
462} 561}
463 562
464static SV * 563static SV *
465get_cb (SV *cb_sv) 564get_cb (SV *cb_sv)
466{ 565{
467 HV *st; 566 SvGETMAGIC (cb_sv);
468 GV *gvp; 567 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
469 CV *cv;
470
471 if (!SvOK (cb_sv))
472 return 0;
473
474 cv = sv_2cv (cb_sv, &st, &gvp, 0);
475
476 if (!cv)
477 croak ("IO::AIO callback must be undef or a CODE reference");
478
479 return (SV *)cv;
480} 568}
481 569
482#define dREQ \ 570#define dREQ \
483 SV *cb_cv; \ 571 SV *cb_cv; \
484 aio_req req; \ 572 aio_req req; \
498 PUTBACK; \ 586 PUTBACK; \
499 req_submit (req); \ 587 req_submit (req); \
500 SPAGAIN; \ 588 SPAGAIN; \
501 \ 589 \
502 if (GIMME_V != G_VOID) \ 590 if (GIMME_V != G_VOID) \
503 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 591 XPUSHs (req_sv (req, aio_req_stash));
504 592
505MODULE = IO::AIO PACKAGE = IO::AIO 593MODULE = IO::AIO PACKAGE = IO::AIO
506 594
507PROTOTYPES: ENABLE 595PROTOTYPES: ENABLE
508 596
509BOOT: 597BOOT:
510{ 598{
511 stash = gv_stashpv ("IO::AIO", 1); 599 static const struct {
512 600 const char *name;
513 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 601 IV iv;
514 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 602 } *civ, const_iv[] = {
515 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 603# define const_iv(name, value) { # name, (IV) value },
516 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 604# define const_eio(name) { # name, (IV) EIO_ ## name },
517 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 605 const_iv (EXDEV , EXDEV)
606 const_iv (ENOSYS , ENOSYS)
607 const_iv (O_RDONLY, O_RDONLY)
608 const_iv (O_WRONLY, O_WRONLY)
609 const_iv (O_CREAT , O_CREAT)
610 const_iv (O_TRUNC , O_TRUNC)
518#ifndef _WIN32 611#ifndef _WIN32
519 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 612 const_iv (S_IFIFO , S_IFIFO)
520#endif 613#endif
521 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 614 const_iv (FADV_NORMAL , POSIX_FADV_NORMAL)
522 newCONSTSUB (stash, "SYNC_FILE_RANGE_WAIT_BEFORE", newSViv (EIO_SYNC_FILE_RANGE_WAIT_BEFORE)); 615 const_iv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL)
523 newCONSTSUB (stash, "SYNC_FILE_RANGE_WRITE" , newSViv (EIO_SYNC_FILE_RANGE_WRITE)); 616 const_iv (FADV_RANDOM , POSIX_FADV_RANDOM)
524 newCONSTSUB (stash, "SYNC_FILE_RANGE_WAIT_AFTER" , newSViv (EIO_SYNC_FILE_RANGE_WAIT_AFTER)); 617 const_iv (FADV_NOREUSE , POSIX_FADV_NOREUSE)
618 const_iv (FADV_WILLNEED , POSIX_FADV_WILLNEED)
619 const_iv (FADV_DONTNEED , POSIX_FADV_DONTNEED)
525 620
621 const_iv (ST_RDONLY , ST_RDONLY)
622 const_iv (ST_NOSUID , ST_NOSUID)
623 const_iv (ST_NODEV , ST_NODEV)
624 const_iv (ST_NOEXEC , ST_NOEXEC)
625 const_iv (ST_SYNCHRONOUS , ST_SYNCHRONOUS)
626 const_iv (ST_MANDLOCK , ST_MANDLOCK)
627 const_iv (ST_WRITE , ST_WRITE)
628 const_iv (ST_APPEND , ST_APPEND)
629 const_iv (ST_IMMUTABLE , ST_IMMUTABLE)
630 const_iv (ST_NOATIME , ST_NOATIME)
631 const_iv (ST_NODIRATIME , ST_NODIRATIME)
632 const_iv (ST_RELATIME , ST_RELATIME)
633
634 const_eio (MS_ASYNC)
635 const_eio (MS_INVALIDATE)
636 const_eio (MS_SYNC)
637
638 const_eio (MT_MODIFY)
639
640 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
641 const_eio (SYNC_FILE_RANGE_WRITE)
642 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
643
644 const_eio (READDIR_DENTS)
645 const_eio (READDIR_DIRS_FIRST)
646 const_eio (READDIR_STAT_ORDER)
647 const_eio (READDIR_FOUND_UNKNOWN)
648
649 const_eio (DT_UNKNOWN)
650 const_eio (DT_FIFO)
651 const_eio (DT_CHR)
652 const_eio (DT_DIR)
653 const_eio (DT_BLK)
654 const_eio (DT_REG)
655 const_eio (DT_LNK)
656 const_eio (DT_SOCK)
657 const_eio (DT_WHT)
658 };
659
660 aio_stash = gv_stashpv ("IO::AIO" , 1);
661 aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1);
662 aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1);
663
664 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
665 newCONSTSUB (aio_stash, (char *)civ->name, newSViv (civ->iv));
666
526 create_respipe (); 667 create_respipe ();
527 668
528 if (eio_init (want_poll, done_poll) < 0) 669 if (eio_init (want_poll, done_poll) < 0)
529 croak ("IO::AIO: unable to initialise eio library"); 670 croak ("IO::AIO: unable to initialise eio library");
530 671
531 /* atfork child called in fifo order, so before eio's handler */ 672 /* atfork child called in fifo order, so before eio's handler */
532 X_THREAD_ATFORK (0, 0, atfork_child); 673 X_THREAD_ATFORK (0, 0, atfork_child);
533} 674}
534 675
535void 676void
536max_poll_reqs (int nreqs) 677max_poll_reqs (int nreqs)
537 PROTOTYPE: $ 678 PROTOTYPE: $
590 ALIAS: 731 ALIAS:
591 aio_fsync = EIO_FSYNC 732 aio_fsync = EIO_FSYNC
592 aio_fdatasync = EIO_FDATASYNC 733 aio_fdatasync = EIO_FDATASYNC
593 PPCODE: 734 PPCODE:
594{ 735{
736 int fd = s_fileno_croak (fh, 0);
595 dREQ; 737 dREQ;
596 738
597 req->type = ix; 739 req->type = ix;
598 req->sv1 = newSVsv (fh); 740 req->sv1 = newSVsv (fh);
599 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 741 req->int1 = fd;
600 742
601 REQ_SEND (req); 743 REQ_SEND (req);
602} 744}
603 745
604void 746void
605aio_sync_file_range (SV *fh, SV *offset, SV *nbytes, IV flags, SV *callback=&PL_sv_undef) 747aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef)
606 PROTOTYPE: $$$$;$ 748 PROTOTYPE: $$$$;$
607 PPCODE: 749 PPCODE:
608{ 750{
751 int fd = s_fileno_croak (fh, 0);
609 dREQ; 752 dREQ;
610 753
611 req->type = EIO_SYNC_FILE_RANGE; 754 req->type = EIO_SYNC_FILE_RANGE;
612 req->sv1 = newSVsv (fh); 755 req->sv1 = newSVsv (fh);
613 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 756 req->int1 = fd;
614 req->offs = SvVAL64 (offset); 757 req->offs = offset;
615 req->size = SvVAL64 (nbytes); 758 req->size = nbytes;
616 req->int2 = flags; 759 req->int2 = flags;
617 760
618 REQ_SEND (req); 761 REQ_SEND (req);
619} 762}
620 763
622aio_close (SV *fh, SV *callback=&PL_sv_undef) 765aio_close (SV *fh, SV *callback=&PL_sv_undef)
623 PROTOTYPE: $;$ 766 PROTOTYPE: $;$
624 PPCODE: 767 PPCODE:
625{ 768{
626 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 769 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
770 int fd = s_fileno_croak (fh, 0);
627 dREQ; 771 dREQ;
628 772
629 if (close_pipe < 0) 773 if (close_pipe < 0)
630 { 774 {
631 int pipefd [2]; 775 int pipefd [2];
639 } 783 }
640 784
641 req->type = EIO_DUP2; 785 req->type = EIO_DUP2;
642 req->int1 = close_pipe; 786 req->int1 = close_pipe;
643 req->sv2 = newSVsv (fh); 787 req->sv2 = newSVsv (fh);
644 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 788 req->int2 = fd;
645 789
646 REQ_SEND (req); 790 REQ_SEND (req);
647} 791}
648 792
649void 793void
653 aio_write = EIO_WRITE 797 aio_write = EIO_WRITE
654 PROTOTYPE: $$$$$;$ 798 PROTOTYPE: $$$$$;$
655 PPCODE: 799 PPCODE:
656{ 800{
657 STRLEN svlen; 801 STRLEN svlen;
802 int fd = s_fileno_croak (fh, ix == EIO_WRITE);
658 char *svptr = SvPVbyte (data, svlen); 803 char *svptr = SvPVbyte (data, svlen);
659 UV len = SvUV (length); 804 UV len = SvUV (length);
660 int fd;
661
662 if (SvTYPE (data) > SVt_PVMG)
663 croak ("illegal data argument '%s', must be plain scalar string", SvPV_nolen (data));
664
665 SvUPGRADE (data, SVt_PV);
666 SvPOK_only (data);
667 805
668 if (dataoffset < 0) 806 if (dataoffset < 0)
669 dataoffset += svlen; 807 dataoffset += svlen;
670 808
671 if (dataoffset < 0 || dataoffset > svlen) 809 if (dataoffset < 0 || dataoffset > svlen)
677 if (!SvOK (length) || len + dataoffset > svlen) 815 if (!SvOK (length) || len + dataoffset > svlen)
678 len = svlen - dataoffset; 816 len = svlen - dataoffset;
679 } 817 }
680 else 818 else
681 { 819 {
682 /* read: grow scalar as necessary */ 820 /* read: check type and grow scalar as necessary */
821 SvUPGRADE (data, SVt_PV);
683 svptr = SvGROW (data, len + dataoffset + 1); 822 svptr = SvGROW (data, len + dataoffset + 1);
684 } 823 }
685
686 if (len < 0)
687 croak ("length must not be negative");
688
689 fd = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh))
690 : IoOFP (sv_2io (fh)));
691
692 if (fd < 0)
693 croak ("illegal fh argument, either not an OS file or read/write mode mismatch");
694 824
695 { 825 {
696 dREQ; 826 dREQ;
697 827
698 req->type = ix; 828 req->type = ix;
699 req->sv1 = newSVsv (fh); 829 req->sv1 = newSVsv (fh);
700 req->int1 = df; 830 req->int1 = fd;
701 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 831 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
702 req->size = len; 832 req->size = len;
703 req->sv2 = SvREFCNT_inc (data); 833 req->sv2 = SvREFCNT_inc (data);
704 req->ptr2 = (char *)svptr + dataoffset; 834 req->ptr2 = (char *)svptr + dataoffset;
705 req->stroffset = dataoffset; 835 req->stroffset = dataoffset;
728 858
729 REQ_SEND; 859 REQ_SEND;
730} 860}
731 861
732void 862void
733aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef) 863aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef)
734 PROTOTYPE: $$$$;$ 864 PROTOTYPE: $$$$;$
735 PPCODE: 865 PPCODE:
736{ 866{
867 int ifd = s_fileno_croak (in_fh , 0);
868 int ofd = s_fileno_croak (out_fh, 1);
737 dREQ; 869 dREQ;
738 870
739 req->type = EIO_SENDFILE; 871 req->type = EIO_SENDFILE;
740 req->sv1 = newSVsv (out_fh); 872 req->sv1 = newSVsv (out_fh);
741 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 873 req->int1 = ofd;
742 req->sv2 = newSVsv (in_fh); 874 req->sv2 = newSVsv (in_fh);
743 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 875 req->int2 = ifd;
744 req->offs = SvVAL64 (in_offset); 876 req->offs = in_offset;
745 req->size = length; 877 req->size = length;
746 878
747 REQ_SEND; 879 REQ_SEND;
748} 880}
749 881
750void 882void
751aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef) 883aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef)
752 PROTOTYPE: $$$;$ 884 PROTOTYPE: $$$;$
753 PPCODE: 885 PPCODE:
754{ 886{
887 int fd = s_fileno_croak (fh, 0);
755 dREQ; 888 dREQ;
756 889
757 req->type = EIO_READAHEAD; 890 req->type = EIO_READAHEAD;
758 req->sv1 = newSVsv (fh); 891 req->sv1 = newSVsv (fh);
759 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 892 req->int1 = fd;
760 req->offs = SvVAL64 (offset); 893 req->offs = offset;
761 req->size = length; 894 req->size = length;
762 895
763 REQ_SEND; 896 REQ_SEND;
764} 897}
765 898
766void 899void
767aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef) 900aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef)
768 ALIAS: 901 ALIAS:
769 aio_stat = EIO_STAT 902 aio_stat = EIO_STAT
770 aio_lstat = EIO_LSTAT 903 aio_lstat = EIO_LSTAT
904 aio_statvfs = EIO_STATVFS
771 PPCODE: 905 PPCODE:
772{ 906{
773 dREQ; 907 dREQ;
774 908
775 req->sv1 = newSVsv (fh_or_path); 909 req->sv1 = newSVsv (fh_or_path);
779 req->type = ix; 913 req->type = ix;
780 req->ptr1 = SvPVbyte_nolen (req->sv1); 914 req->ptr1 = SvPVbyte_nolen (req->sv1);
781 } 915 }
782 else 916 else
783 { 917 {
784 req->type = EIO_FSTAT; 918 req->type = ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT;
785 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 919 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
786 } 920 }
787 921
788 REQ_SEND; 922 REQ_SEND;
789} 923}
881 req->type = EIO_FCHOWN; 1015 req->type = EIO_FCHOWN;
882 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1016 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
883 } 1017 }
884 1018
885 REQ_SEND; 1019 REQ_SEND;
1020}
1021
1022void
1023aio_readdirx (SV8 *pathname, IV flags, SV *callback=&PL_sv_undef)
1024 PPCODE:
1025{
1026 dREQ;
1027
1028 req->type = EIO_READDIR;
1029 req->sv1 = newSVsv (pathname);
1030 req->ptr1 = SvPVbyte_nolen (req->sv1);
1031 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
1032
1033 if (flags & EIO_READDIR_DENTS)
1034 req->int1 |= EIO_READDIR_CUSTOM2;
1035
1036 REQ_SEND;
886} 1037}
887 1038
888void 1039void
889aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 1040aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
890 ALIAS: 1041 ALIAS:
935 1086
936 REQ_SEND; 1087 REQ_SEND;
937} 1088}
938 1089
939void 1090void
1091aio_mtouch (SV8 *data, IV offset = 0, SV *length = &PL_sv_undef, int flags = 0, SV *callback=&PL_sv_undef)
1092 ALIAS:
1093 aio_mtouch = EIO_MTOUCH
1094 aio_msync = EIO_MSYNC
1095 PROTOTYPE: $$$$;$
1096 PPCODE:
1097{
1098 STRLEN svlen;
1099 UV len = SvUV (length);
1100 char *svptr = SvPVbyte (data, svlen);
1101
1102 if (offset < 0)
1103 offset += svlen;
1104
1105 if (offset < 0 || offset > svlen)
1106 croak ("offset outside of scalar");
1107
1108 if (!SvOK (length) || len + offset > svlen)
1109 len = svlen - offset;
1110
1111 {
1112 dREQ;
1113
1114 req->type = ix;
1115 req->size = len;
1116 req->sv2 = SvREFCNT_inc (data);
1117 req->ptr2 = (char *)svptr + offset;
1118 req->int1 = flags;
1119
1120 REQ_SEND;
1121 }
1122}
1123
1124void
940aio_busy (double delay, SV *callback=&PL_sv_undef) 1125aio_busy (double delay, SV *callback=&PL_sv_undef)
941 PPCODE: 1126 PPCODE:
942{ 1127{
943 dREQ; 1128 dREQ;
944 1129
956 dREQ; 1141 dREQ;
957 1142
958 req->type = EIO_GROUP; 1143 req->type = EIO_GROUP;
959 1144
960 req_submit (req); 1145 req_submit (req);
961 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1146 XPUSHs (req_sv (req, aio_grp_stash));
962} 1147}
963 1148
964void 1149void
965aio_nop (SV *callback=&PL_sv_undef) 1150aio_nop (SV *callback=&PL_sv_undef)
966 ALIAS: 1151 ALIAS:
1018 1203
1019int 1204int
1020poll_fileno() 1205poll_fileno()
1021 PROTOTYPE: 1206 PROTOTYPE:
1022 CODE: 1207 CODE:
1023 RETVAL = respipe [0]; 1208 RETVAL = s_epipe_fd (&respipe);
1024 OUTPUT: 1209 OUTPUT:
1025 RETVAL 1210 RETVAL
1026 1211
1027int 1212int
1028poll_cb(...) 1213poll_cb(...)
1068 CODE: 1253 CODE:
1069 RETVAL = eio_nthreads (); 1254 RETVAL = eio_nthreads ();
1070 OUTPUT: 1255 OUTPUT:
1071 RETVAL 1256 RETVAL
1072 1257
1258int
1259fadvise (aio_rfd fh, off_t offset, off_t length, IV advice)
1260 PROTOTYPE: $$$$
1261 CODE:
1262#if _XOPEN_SOURCE >= 600 && !NO_FADVISE
1263 RETVAL = posix_fadvise (fh, offset, length, advice);
1264#else
1265 RETVAL = errno = ENOSYS;
1266#endif
1267 OUTPUT:
1268 RETVAL
1269
1270ssize_t
1271sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
1272 PROTOTYPE: $$$$
1273 CODE:
1274 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count);
1275 OUTPUT:
1276 RETVAL
1277
1073void _on_next_submit (SV *cb) 1278void _on_next_submit (SV *cb)
1074 CODE: 1279 CODE:
1075 SvREFCNT_dec (on_next_submit); 1280 SvREFCNT_dec (on_next_submit);
1076 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1281 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1077 1282
1091 if (GIMME_V != G_VOID) 1296 if (GIMME_V != G_VOID)
1092 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef); 1297 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1093 1298
1094 if (items > 1) 1299 if (items > 1)
1095 { 1300 {
1096 SV *cb_cv = get_cb (callback); 1301 SV *cb_cv =get_cb (callback);
1097 1302
1098 SvREFCNT_dec (req->callback); 1303 SvREFCNT_dec (req->callback);
1099 req->callback = SvREFCNT_inc (cb_cv); 1304 req->callback = SvREFCNT_inc (cb_cv);
1100 } 1305 }
1101} 1306}
1138 AV *av; 1343 AV *av;
1139 1344
1140 grp->errorno = errno; 1345 grp->errorno = errno;
1141 1346
1142 av = newAV (); 1347 av = newAV ();
1348 av_extend (av, items - 1);
1143 1349
1144 for (i = 1; i < items; ++i ) 1350 for (i = 1; i < items; ++i )
1145 av_push (av, newSVsv (ST (i))); 1351 av_push (av, newSVsv (ST (i)));
1146 1352
1147 SvREFCNT_dec (grp->sv1); 1353 SvREFCNT_dec (grp->sv1);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines