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.139 by root, Tue Apr 21 20:12:56 2009 UTC vs.
Revision 1.161 by root, Sun Jan 10 20:28:43 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>
20
21#if _POSIX_MEMLOCK
22# include <sys/mman.h>
23#endif
17 24
18/* perl namespace pollution */ 25/* perl namespace pollution */
19#undef VERSION 26#undef VERSION
20 27
21#ifdef _WIN32 28#ifdef _WIN32
75 82
76#define EIO_STRUCT_STAT Stat_t 83#define EIO_STRUCT_STAT Stat_t
77 84
78/* use NV for 32 bit perls as it allows larger offsets */ 85/* use NV for 32 bit perls as it allows larger offsets */
79#if IVSIZE >= 8 86#if IVSIZE >= 8
87# define VAL64 IV
80# define SvVAL64 SvIV 88# define SvVAL64 SvIV
89# define newSVval64 newSViv
81#else 90#else
91# define VAL64 NV
82# define SvVAL64 SvNV 92# define SvVAL64 SvNV
93# define newSVval64 newSVnv
83#endif 94#endif
84 95
85/*****************************************************************************/ 96/*****************************************************************************/
86 97
87#if __GNUC__ >= 3 98#if __GNUC__ >= 3
93#define expect_false(expr) expect ((expr) != 0, 0) 104#define expect_false(expr) expect ((expr) != 0, 0)
94#define expect_true(expr) expect ((expr) != 0, 1) 105#define expect_true(expr) expect ((expr) != 0, 1)
95 106
96/*****************************************************************************/ 107/*****************************************************************************/
97 108
98static HV *stash;
99typedef SV SV8; /* byte-sv, used for argument-checking */ 109typedef SV SV8; /* byte-sv, used for argument-checking */
110typedef int aio_rfd; /* read file desriptor */
111typedef int aio_wfd; /* write file descriptor */
100 112
101#define AIO_REQ_KLASS "IO::AIO::REQ" 113static HV *aio_stash, *aio_req_stash, *aio_grp_stash;
102#define AIO_GRP_KLASS "IO::AIO::GRP"
103 114
104#define EIO_REQ_MEMBERS \ 115#define EIO_REQ_MEMBERS \
105 SV *callback; \ 116 SV *callback; \
106 SV *sv1, *sv2; \ 117 SV *sv1, *sv2; \
107 STRLEN stroffset; \ 118 STRLEN stroffset; \
109 120
110#define EIO_NO_WRAPPERS 1 121#define EIO_NO_WRAPPERS 1
111 122
112#include "libeio/eio.h" 123#include "libeio/eio.h"
113 124
125#ifndef POSIX_FADV_NORMAL
126# define POSIX_FADV_NORMAL 0
127# define NO_FADVISE 1
128#endif
129#ifndef POSIX_FADV_SEQUENTIAL
130# define POSIX_FADV_SEQUENTIAL 0
131#endif
132#ifndef POSIX_FADV_RANDOM
133# define POSIX_FADV_RANDOM 0
134#endif
135#ifndef POSIX_FADV_NOREUSE
136# define POSIX_FADV_NOREUSE 0
137#endif
138#ifndef POSIX_FADV_WILLNEED
139# define POSIX_FADV_WILLNEED 0
140#endif
141#ifndef POSIX_FADV_DONTNEED
142# define POSIX_FADV_DONTNEED 0
143#endif
144
145#ifndef ST_NODEV
146# define ST_NODEV 0
147#endif
148#ifndef ST_NOEXEC
149# define ST_NOEXEC 0
150#endif
151#ifndef ST_SYNCHRONOUS
152# define ST_SYNCHRONOUS 0
153#endif
154#ifndef ST_MANDLOCK
155# define ST_MANDLOCK 0
156#endif
157#ifndef ST_WRITE
158# define ST_WRITE 0
159#endif
160#ifndef ST_APPEND
161# define ST_APPEND 0
162#endif
163#ifndef ST_IMMUTABLE
164# define ST_IMMUTABLE 0
165#endif
166#ifndef ST_NOATIME
167# define ST_NOATIME 0
168#endif
169#ifndef ST_NODIRATIME
170# define ST_NODIRATIME 0
171#endif
172#ifndef ST_RELATIME
173# define ST_RELATIME 0
174#endif
175
176#ifndef MCL_CURRENT
177# define MCL_CURRENT 0
178#endif
179#ifndef MCL_FUTURE
180# define MCL_FUTURE 0
181#endif
182
114static int req_invoke (eio_req *req); 183static int req_invoke (eio_req *req);
115#define EIO_FINISH(req) req_invoke (req) 184#define EIO_FINISH(req) req_invoke (req)
116static void req_destroy (eio_req *grp); 185static void req_destroy (eio_req *grp);
117#define EIO_DESTROY(req) req_destroy (req) 186#define EIO_DESTROY(req) req_destroy (req)
118 187
127 196
128static SV *on_next_submit; 197static SV *on_next_submit;
129static int next_pri = EIO_PRI_DEFAULT; 198static int next_pri = EIO_PRI_DEFAULT;
130static int max_outstanding; 199static int max_outstanding;
131 200
132static int respipe_osf [2], respipe [2] = { -1, -1 }; 201static s_epipe respipe;
133 202
134static void req_destroy (aio_req req); 203static void req_destroy (aio_req req);
135static void req_cancel (aio_req req); 204static void req_cancel (aio_req req);
136 205
137static void want_poll (void) 206static void want_poll (void)
138{ 207{
139 /* write a dummy byte to the pipe so fh becomes ready */ 208 /* write a dummy byte to the pipe so fh becomes ready */
140 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1); 209 s_epipe_signal (&respipe);
141} 210}
142 211
143static void done_poll (void) 212static void done_poll (void)
144{ 213{
145 /* read any signals sent by the worker threads */ 214 /* read any signals sent by the worker threads */
146 char buf [4]; 215 s_epipe_drain (&respipe);
147 while (respipe_read (respipe [0], buf, 4) == 4)
148 ;
149} 216}
150 217
151/* must be called at most once */ 218/* must be called at most once */
152static SV *req_sv (aio_req req, const char *klass) 219static SV *req_sv (aio_req req, HV *stash)
153{ 220{
154 if (!req->self) 221 if (!req->self)
155 { 222 {
156 req->self = (SV *)newHV (); 223 req->self = (SV *)newHV ();
157 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0); 224 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
158 } 225 }
159 226
160 return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1))); 227 return sv_2mortal (sv_bless (newRV_inc (req->self), stash));
161} 228}
162 229
163static aio_req SvAIO_REQ (SV *sv) 230static aio_req SvAIO_REQ (SV *sv)
164{ 231{
165 MAGIC *mg; 232 MAGIC *mg;
166 233
167 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv)) 234 if (!SvROK (sv)
235 || (SvSTASH (SvRV (sv)) != aio_grp_stash
236 && SvSTASH (SvRV (sv)) != aio_req_stash
237 && !sv_derived_from (sv, "IO::AIO::REQ")))
168 croak ("object of class " AIO_REQ_KLASS " expected"); 238 croak ("object of class IO::AIO::REQ expected");
169 239
170 mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 240 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
171 241
172 return mg ? (aio_req)mg->mg_ptr : 0; 242 return mg ? (aio_req)mg->mg_ptr : 0;
173} 243}
179 dSP; 249 dSP;
180 250
181 ENTER; 251 ENTER;
182 SAVETMPS; 252 SAVETMPS;
183 PUSHMARK (SP); 253 PUSHMARK (SP);
184 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 254 XPUSHs (req_sv (grp, aio_grp_stash));
185 PUTBACK; 255 PUTBACK;
186 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR); 256 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
187 SPAGAIN; 257 SPAGAIN;
188 FREETMPS; 258 FREETMPS;
189 LEAVE; 259 LEAVE;
228 SV *rv = &PL_sv_undef; 298 SV *rv = &PL_sv_undef;
229 299
230 if (req->result >= 0) 300 if (req->result >= 0)
231 { 301 {
232 int i; 302 int i;
233 char *buf = req->ptr2; 303 char *names = (char *)req->ptr2;
304 eio_dirent *ent = (eio_dirent *)req->ptr1; /* might be 0 */
234 AV *av = newAV (); 305 AV *av = newAV ();
235 306
236 av_extend (av, req->result - 1); 307 av_extend (av, req->result - 1);
237 308
238 for (i = 0; i < req->result; ++i) 309 for (i = 0; i < req->result; ++i)
239 { 310 {
240 SV *sv = newSVpv (buf, 0); 311 if (req->int1 & EIO_READDIR_DENTS)
312 {
313 SV *namesv = newSVpvn (names + ent->nameofs, ent->namelen);
241 314
315 if (req->int1 & EIO_READDIR_CUSTOM2)
316 {
317 static SV *sv_type [EIO_DT_MAX + 1]; /* type sv cache */
318 AV *avent = newAV ();
319
320 av_extend (avent, 2);
321
322 if (!sv_type [ent->type])
323 {
324 sv_type [ent->type] = newSViv (ent->type);
325 SvREADONLY_on (sv_type [ent->type]);
326 }
327
328 av_store (avent, 0, namesv);
329 av_store (avent, 1, SvREFCNT_inc (sv_type [ent->type]));
330 av_store (avent, 2, IVSIZE >= 8 ? newSVuv (ent->inode) : newSVnv (ent->inode));
331
332 av_store (av, i, newRV_noinc ((SV *)avent));
333 }
334 else
242 av_store (av, i, sv); 335 av_store (av, i, namesv);
336
337 ++ent;
338 }
339 else
340 {
341 SV *name = newSVpv (names, 0);
342 av_store (av, i, name);
243 buf += SvCUR (sv) + 1; 343 names += SvCUR (name) + 1;
344 }
244 } 345 }
245 346
246 rv = sv_2mortal (newRV_noinc ((SV *)av)); 347 rv = sv_2mortal (newRV_noinc ((SV *)av));
247 } 348 }
248 349
249 PUSHs (rv); 350 PUSHs (rv);
351
352 if (req->int1 & EIO_READDIR_CUSTOM1)
353 XPUSHs (sv_2mortal (newSViv (req->int1 & ~(EIO_READDIR_CUSTOM1 | EIO_READDIR_CUSTOM2))));
250 } 354 }
251 break; 355 break;
252 356
253 case EIO_OPEN: 357 case EIO_OPEN:
254 { 358 {
260 GV *gv = (GV *)sv_newmortal (); 364 GV *gv = (GV *)sv_newmortal ();
261 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR); 365 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
262 char sym [64]; 366 char sym [64];
263 int symlen; 367 int symlen;
264 368
265 symlen = snprintf (sym, sizeof (sym), "fd#%d", req->result); 369 symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
266 gv_init (gv, stash, sym, symlen, 0); 370 gv_init (gv, aio_stash, sym, symlen, 0);
267 371
268 symlen = snprintf ( 372 symlen = snprintf (
269 sym, 373 sym,
270 sizeof (sym), 374 sizeof (sym),
271 "%s&=%d", 375 "%s&=%d",
272 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<", 376 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
273 req->result 377 (int)req->result
274 ); 378 );
275 379
276 if (do_open (gv, sym, symlen, 0, 0, 0, 0)) 380 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
277 fh = (SV *)gv; 381 fh = (SV *)gv;
278 } 382 }
279 383
280 PUSHs (fh); 384 PUSHs (fh);
281 } 385 }
386 break;
387
388 case EIO_STATVFS:
389 case EIO_FSTATVFS:
390 {
391 SV *rv = &PL_sv_undef;
392
393 if (req->result >= 0)
394 {
395 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req);
396 HV *hv = newHV ();
397
398 rv = sv_2mortal (newRV_noinc ((SV *)hv));
399
400 hv_store (hv, "bsize" , sizeof ("bsize" ) - 1, newSVval64 (f->f_bsize ), 0);
401 hv_store (hv, "frsize" , sizeof ("frsize" ) - 1, newSVval64 (f->f_frsize ), 0);
402 hv_store (hv, "blocks" , sizeof ("blocks" ) - 1, newSVval64 (f->f_blocks ), 0);
403 hv_store (hv, "bfree" , sizeof ("bfree" ) - 1, newSVval64 (f->f_bfree ), 0);
404 hv_store (hv, "bavail" , sizeof ("bavail" ) - 1, newSVval64 (f->f_bavail ), 0);
405 hv_store (hv, "files" , sizeof ("files" ) - 1, newSVval64 (f->f_files ), 0);
406 hv_store (hv, "ffree" , sizeof ("ffree" ) - 1, newSVval64 (f->f_ffree ), 0);
407 hv_store (hv, "favail" , sizeof ("favail" ) - 1, newSVval64 (f->f_favail ), 0);
408 hv_store (hv, "fsid" , sizeof ("fsid" ) - 1, newSVval64 (f->f_fsid ), 0);
409 hv_store (hv, "flag" , sizeof ("flag" ) - 1, newSVval64 (f->f_flag ), 0);
410 hv_store (hv, "namemax", sizeof ("namemax") - 1, newSVval64 (f->f_namemax), 0);
411 }
412
413 PUSHs (rv);
414 }
415
282 break; 416 break;
283 417
284 case EIO_GROUP: 418 case EIO_GROUP:
285 req->int1 = 2; /* mark group as finished */ 419 req->int1 = 2; /* mark group as finished */
286 420
374 grp->sv2 = 0; 508 grp->sv2 = 0;
375 509
376 eio_grp_cancel (grp); 510 eio_grp_cancel (grp);
377} 511}
378 512
379#ifdef USE_SOCKETS_AS_HANDLES
380# define TO_SOCKET(x) (win32_get_osfhandle (x))
381#else
382# define TO_SOCKET(x) (x)
383#endif
384
385static void 513static void
386create_respipe (void) 514create_respipe (void)
387{ 515{
388 int old_readfd = respipe [0];
389
390 if (respipe [1] >= 0)
391 respipe_close (TO_SOCKET (respipe [1]));
392
393#ifdef _WIN32
394 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe))
395#else
396 if (pipe (respipe)) 516 if (s_epipe_renew (&respipe))
397#endif
398 croak ("unable to initialize result pipe"); 517 croak ("IO::AIO: unable to initialize result pipe");
399
400 if (old_readfd >= 0)
401 {
402 if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0)
403 croak ("unable to initialize result pipe(2)");
404
405 respipe_close (respipe [0]);
406 respipe [0] = old_readfd;
407 }
408
409#ifdef _WIN32
410 int arg = 1;
411 if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg)
412 || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg))
413#else
414 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
415 || fcntl (respipe [1], F_SETFL, O_NONBLOCK))
416#endif
417 croak ("unable to initialize result pipe(3)");
418
419 respipe_osf [0] = TO_SOCKET (respipe [0]);
420 respipe_osf [1] = TO_SOCKET (respipe [1]);
421} 518}
422 519
423static void poll_wait (void) 520static void poll_wait (void)
424{ 521{
425 fd_set rfd;
426
427 while (eio_nreqs ()) 522 while (eio_nreqs ())
428 { 523 {
429 int size; 524 int size;
430 525
431 X_LOCK (reslock); 526 X_LOCK (reslock);
435 if (size) 530 if (size)
436 return; 531 return;
437 532
438 etp_maybe_start_thread (); 533 etp_maybe_start_thread ();
439 534
440 FD_ZERO (&rfd); 535 s_epipe_wait (&respipe);
441 FD_SET (respipe [0], &rfd);
442
443 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
444 } 536 }
445} 537}
446 538
447static int poll_cb (void) 539static int poll_cb (void)
448{ 540{
466} 558}
467 559
468static SV * 560static SV *
469get_cb (SV *cb_sv) 561get_cb (SV *cb_sv)
470{ 562{
471 HV *st; 563 SvGETMAGIC (cb_sv);
472 GV *gvp; 564 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
473 CV *cv;
474
475 if (!SvOK (cb_sv))
476 return 0;
477
478 cv = sv_2cv (cb_sv, &st, &gvp, 0);
479
480 if (!cv)
481 croak ("IO::AIO callback must be undef or a CODE reference");
482
483 return (SV *)cv;
484} 565}
485 566
486#define dREQ \ 567#define dREQ \
487 SV *cb_cv; \ 568 SV *cb_cv; \
488 aio_req req; \ 569 aio_req req; \
502 PUTBACK; \ 583 PUTBACK; \
503 req_submit (req); \ 584 req_submit (req); \
504 SPAGAIN; \ 585 SPAGAIN; \
505 \ 586 \
506 if (GIMME_V != G_VOID) \ 587 if (GIMME_V != G_VOID) \
507 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 588 XPUSHs (req_sv (req, aio_req_stash));
508
509static int
510extract_fd (SV *fh, int wr)
511{
512 int fd = PerlIO_fileno (wr ? IoOFP (sv_2io (fh)) : IoIFP (sv_2io (fh)));
513
514 if (fd < 0)
515 croak ("illegal fh argument, either not an OS file or read/write mode mismatch");
516
517 return fd;
518}
519 589
520MODULE = IO::AIO PACKAGE = IO::AIO 590MODULE = IO::AIO PACKAGE = IO::AIO
521 591
522PROTOTYPES: ENABLE 592PROTOTYPES: ENABLE
523 593
524BOOT: 594BOOT:
525{ 595{
526 stash = gv_stashpv ("IO::AIO", 1); 596 static const struct {
527 597 const char *name;
528 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 598 IV iv;
529 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 599 } *civ, const_iv[] = {
530 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 600# define const_iv(name, value) { # name, (IV) value },
531 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 601# define const_eio(name) { # name, (IV) EIO_ ## name },
532 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 602 const_iv (EXDEV , EXDEV)
603 const_iv (ENOSYS , ENOSYS)
604 const_iv (O_RDONLY, O_RDONLY)
605 const_iv (O_WRONLY, O_WRONLY)
606 const_iv (O_CREAT , O_CREAT)
607 const_iv (O_TRUNC , O_TRUNC)
533#ifndef _WIN32 608#ifndef _WIN32
534 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 609 const_iv (S_IFIFO , S_IFIFO)
535#endif 610#endif
536 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 611 const_iv (FADV_NORMAL , POSIX_FADV_NORMAL)
537 newCONSTSUB (stash, "SYNC_FILE_RANGE_WAIT_BEFORE", newSViv (EIO_SYNC_FILE_RANGE_WAIT_BEFORE)); 612 const_iv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL)
538 newCONSTSUB (stash, "SYNC_FILE_RANGE_WRITE" , newSViv (EIO_SYNC_FILE_RANGE_WRITE)); 613 const_iv (FADV_RANDOM , POSIX_FADV_RANDOM)
539 newCONSTSUB (stash, "SYNC_FILE_RANGE_WAIT_AFTER" , newSViv (EIO_SYNC_FILE_RANGE_WAIT_AFTER)); 614 const_iv (FADV_NOREUSE , POSIX_FADV_NOREUSE)
615 const_iv (FADV_WILLNEED , POSIX_FADV_WILLNEED)
616 const_iv (FADV_DONTNEED , POSIX_FADV_DONTNEED)
540 617
618 const_iv (ST_RDONLY , ST_RDONLY)
619 const_iv (ST_NOSUID , ST_NOSUID)
620 const_iv (ST_NODEV , ST_NODEV)
621 const_iv (ST_NOEXEC , ST_NOEXEC)
622 const_iv (ST_SYNCHRONOUS , ST_SYNCHRONOUS)
623 const_iv (ST_MANDLOCK , ST_MANDLOCK)
624 const_iv (ST_WRITE , ST_WRITE)
625 const_iv (ST_APPEND , ST_APPEND)
626 const_iv (ST_IMMUTABLE , ST_IMMUTABLE)
627 const_iv (ST_NOATIME , ST_NOATIME)
628 const_iv (ST_NODIRATIME , ST_NODIRATIME)
629 const_iv (ST_RELATIME , ST_RELATIME)
630
631 const_iv (MCL_FUTURE , MCL_FUTURE)
632 const_iv (MCL_CURRENT , MCL_CURRENT)
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
541 create_respipe (); 667 create_respipe ();
542 668
543 if (eio_init (want_poll, done_poll) < 0) 669 if (eio_init (want_poll, done_poll) < 0)
544 croak ("IO::AIO: unable to initialise eio library"); 670 croak ("IO::AIO: unable to initialise eio library");
545 671
546 /* atfork child called in fifo order, so before eio's handler */ 672 /* atfork child called in fifo order, so before eio's handler */
547 X_THREAD_ATFORK (0, 0, atfork_child); 673 X_THREAD_ATFORK (0, 0, atfork_child);
548} 674}
549 675
550void 676void
551max_poll_reqs (int nreqs) 677max_poll_reqs (int nreqs)
552 PROTOTYPE: $ 678 PROTOTYPE: $
605 ALIAS: 731 ALIAS:
606 aio_fsync = EIO_FSYNC 732 aio_fsync = EIO_FSYNC
607 aio_fdatasync = EIO_FDATASYNC 733 aio_fdatasync = EIO_FDATASYNC
608 PPCODE: 734 PPCODE:
609{ 735{
610 int fd = extract_fd (fh, 0); 736 int fd = s_fileno_croak (fh, 0);
611 dREQ; 737 dREQ;
612 738
613 req->type = ix; 739 req->type = ix;
614 req->sv1 = newSVsv (fh); 740 req->sv1 = newSVsv (fh);
615 req->int1 = fd; 741 req->int1 = fd;
616 742
617 REQ_SEND (req); 743 REQ_SEND (req);
618} 744}
619 745
620void 746void
621aio_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)
622 PROTOTYPE: $$$$;$ 748 PROTOTYPE: $$$$;$
623 PPCODE: 749 PPCODE:
624{ 750{
625 int fd = extract_fd (fh, 0); 751 int fd = s_fileno_croak (fh, 0);
626 dREQ; 752 dREQ;
627 753
628 req->type = EIO_SYNC_FILE_RANGE; 754 req->type = EIO_SYNC_FILE_RANGE;
629 req->sv1 = newSVsv (fh); 755 req->sv1 = newSVsv (fh);
630 req->int1 = fd; 756 req->int1 = fd;
631 req->offs = SvVAL64 (offset); 757 req->offs = offset;
632 req->size = SvVAL64 (nbytes); 758 req->size = nbytes;
633 req->int2 = flags; 759 req->int2 = flags;
634 760
635 REQ_SEND (req); 761 REQ_SEND (req);
636} 762}
637 763
639aio_close (SV *fh, SV *callback=&PL_sv_undef) 765aio_close (SV *fh, SV *callback=&PL_sv_undef)
640 PROTOTYPE: $;$ 766 PROTOTYPE: $;$
641 PPCODE: 767 PPCODE:
642{ 768{
643 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 */
644 int fd = extract_fd (fh, 0); 770 int fd = s_fileno_croak (fh, 0);
645 dREQ; 771 dREQ;
646 772
647 if (close_pipe < 0) 773 if (close_pipe < 0)
648 { 774 {
649 int pipefd [2]; 775 int pipefd [2];
671 aio_write = EIO_WRITE 797 aio_write = EIO_WRITE
672 PROTOTYPE: $$$$$;$ 798 PROTOTYPE: $$$$$;$
673 PPCODE: 799 PPCODE:
674{ 800{
675 STRLEN svlen; 801 STRLEN svlen;
676 int fd = extract_fd (fh, ix == EIO_WRITE); 802 int fd = s_fileno_croak (fh, ix == EIO_WRITE);
677 char *svptr = SvPVbyte (data, svlen); 803 char *svptr = SvPVbyte (data, svlen);
678 UV len = SvUV (length); 804 UV len = SvUV (length);
679 805
680 if (dataoffset < 0) 806 if (dataoffset < 0)
681 dataoffset += svlen; 807 dataoffset += svlen;
732 858
733 REQ_SEND; 859 REQ_SEND;
734} 860}
735 861
736void 862void
737aio_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)
738 PROTOTYPE: $$$$;$ 864 PROTOTYPE: $$$$;$
739 PPCODE: 865 PPCODE:
740{ 866{
741 int ifd = extract_fd (in_fh , 0); 867 int ifd = s_fileno_croak (in_fh , 0);
742 int ofd = extract_fd (out_fh, 0); 868 int ofd = s_fileno_croak (out_fh, 1);
743 dREQ; 869 dREQ;
744 870
745 req->type = EIO_SENDFILE; 871 req->type = EIO_SENDFILE;
746 req->sv1 = newSVsv (out_fh); 872 req->sv1 = newSVsv (out_fh);
747 req->int1 = ofd; 873 req->int1 = ofd;
748 req->sv2 = newSVsv (in_fh); 874 req->sv2 = newSVsv (in_fh);
749 req->int2 = ifd; 875 req->int2 = ifd;
750 req->offs = SvVAL64 (in_offset); 876 req->offs = in_offset;
751 req->size = length; 877 req->size = length;
752 878
753 REQ_SEND; 879 REQ_SEND;
754} 880}
755 881
756void 882void
757aio_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)
758 PROTOTYPE: $$$;$ 884 PROTOTYPE: $$$;$
759 PPCODE: 885 PPCODE:
760{ 886{
761 int fd = extract_fd (fh, 0); 887 int fd = s_fileno_croak (fh, 0);
762 dREQ; 888 dREQ;
763 889
764 req->type = EIO_READAHEAD; 890 req->type = EIO_READAHEAD;
765 req->sv1 = newSVsv (fh); 891 req->sv1 = newSVsv (fh);
766 req->int1 = fd; 892 req->int1 = fd;
767 req->offs = SvVAL64 (offset); 893 req->offs = offset;
768 req->size = length; 894 req->size = length;
769 895
770 REQ_SEND; 896 REQ_SEND;
771} 897}
772 898
773void 899void
774aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef) 900aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef)
775 ALIAS: 901 ALIAS:
776 aio_stat = EIO_STAT 902 aio_stat = EIO_STAT
777 aio_lstat = EIO_LSTAT 903 aio_lstat = EIO_LSTAT
904 aio_statvfs = EIO_STATVFS
778 PPCODE: 905 PPCODE:
779{ 906{
780 dREQ; 907 dREQ;
781 908
782 req->sv1 = newSVsv (fh_or_path); 909 req->sv1 = newSVsv (fh_or_path);
786 req->type = ix; 913 req->type = ix;
787 req->ptr1 = SvPVbyte_nolen (req->sv1); 914 req->ptr1 = SvPVbyte_nolen (req->sv1);
788 } 915 }
789 else 916 else
790 { 917 {
791 req->type = EIO_FSTAT; 918 req->type = ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT;
792 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 919 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
793 } 920 }
794 921
795 REQ_SEND; 922 REQ_SEND;
796} 923}
888 req->type = EIO_FCHOWN; 1015 req->type = EIO_FCHOWN;
889 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1016 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
890 } 1017 }
891 1018
892 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;
893} 1037}
894 1038
895void 1039void
896aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 1040aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
897 ALIAS: 1041 ALIAS:
942 1086
943 REQ_SEND; 1087 REQ_SEND;
944} 1088}
945 1089
946void 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
947aio_busy (double delay, SV *callback=&PL_sv_undef) 1125aio_busy (double delay, SV *callback=&PL_sv_undef)
948 PPCODE: 1126 PPCODE:
949{ 1127{
950 dREQ; 1128 dREQ;
951 1129
963 dREQ; 1141 dREQ;
964 1142
965 req->type = EIO_GROUP; 1143 req->type = EIO_GROUP;
966 1144
967 req_submit (req); 1145 req_submit (req);
968 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1146 XPUSHs (req_sv (req, aio_grp_stash));
969} 1147}
970 1148
971void 1149void
972aio_nop (SV *callback=&PL_sv_undef) 1150aio_nop (SV *callback=&PL_sv_undef)
973 ALIAS: 1151 ALIAS:
1025 1203
1026int 1204int
1027poll_fileno() 1205poll_fileno()
1028 PROTOTYPE: 1206 PROTOTYPE:
1029 CODE: 1207 CODE:
1030 RETVAL = respipe [0]; 1208 RETVAL = s_epipe_fd (&respipe);
1031 OUTPUT: 1209 OUTPUT:
1032 RETVAL 1210 RETVAL
1033 1211
1034int 1212int
1035poll_cb(...) 1213poll_cb(...)
1075 CODE: 1253 CODE:
1076 RETVAL = eio_nthreads (); 1254 RETVAL = eio_nthreads ();
1077 OUTPUT: 1255 OUTPUT:
1078 RETVAL 1256 RETVAL
1079 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
1278int
1279mlockall (int flags)
1280 PROTOTYPE: $
1281 CODE:
1282#if _POSIX_MEMLOCK
1283#if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
1284 extern int mallopt (int, int);
1285 mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
1286#endif
1287 mlockall (flags);
1288#else
1289 RETVAL =-1;
1290 errno = ENOSYS;
1291#endif
1292 OUTPUT:
1293 RETVAL
1294
1295int
1296munlockall ()
1297 PROTOTYPE:
1298 CODE:
1299#if _POSIX_MEMLOCK
1300 munlockall ();
1301#else
1302 RETVAL =-1;
1303 errno = ENOSYS;
1304#endif
1305 OUTPUT:
1306 RETVAL
1307
1080void _on_next_submit (SV *cb) 1308void _on_next_submit (SV *cb)
1081 CODE: 1309 CODE:
1082 SvREFCNT_dec (on_next_submit); 1310 SvREFCNT_dec (on_next_submit);
1083 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1311 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1084 1312
1098 if (GIMME_V != G_VOID) 1326 if (GIMME_V != G_VOID)
1099 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef); 1327 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1100 1328
1101 if (items > 1) 1329 if (items > 1)
1102 { 1330 {
1103 SV *cb_cv = get_cb (callback); 1331 SV *cb_cv =get_cb (callback);
1104 1332
1105 SvREFCNT_dec (req->callback); 1333 SvREFCNT_dec (req->callback);
1106 req->callback = SvREFCNT_inc (cb_cv); 1334 req->callback = SvREFCNT_inc (cb_cv);
1107 } 1335 }
1108} 1336}
1145 AV *av; 1373 AV *av;
1146 1374
1147 grp->errorno = errno; 1375 grp->errorno = errno;
1148 1376
1149 av = newAV (); 1377 av = newAV ();
1378 av_extend (av, items - 1);
1150 1379
1151 for (i = 1; i < items; ++i ) 1380 for (i = 1; i < items; ++i )
1152 av_push (av, newSVsv (ST (i))); 1381 av_push (av, newSVsv (ST (i)));
1153 1382
1154 SvREFCNT_dec (grp->sv1); 1383 SvREFCNT_dec (grp->sv1);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines