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.147 by root, Mon Jun 15 05:34:49 2009 UTC vs.
Revision 1.160 by root, Thu Jan 7 18:25:51 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;
… …
295 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR); 368 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
296 char sym [64]; 369 char sym [64];
297 int symlen; 370 int symlen;
298 371
299 symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result); 372 symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
300 gv_init (gv, stash, sym, symlen, 0); 373 gv_init (gv, aio_stash, sym, symlen, 0);
301 374
302 symlen = snprintf ( 375 symlen = snprintf (
303 sym, 376 sym,
304 sizeof (sym), 377 sizeof (sym),
305 "%s&=%d", 378 "%s&=%d",
… …
311 fh = (SV *)gv; 384 fh = (SV *)gv;
312 } 385 }
313 386
314 PUSHs (fh); 387 PUSHs (fh);
315 } 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 ((SV *)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
316 break; 419 break;
317 420
318 case EIO_GROUP: 421 case EIO_GROUP:
319 req->int1 = 2; /* mark group as finished */ 422 req->int1 = 2; /* mark group as finished */
320 423
… …
408 grp->sv2 = 0; 511 grp->sv2 = 0;
409 512
410 eio_grp_cancel (grp); 513 eio_grp_cancel (grp);
411} 514}
412 515
413#ifdef USE_SOCKETS_AS_HANDLES
414# define TO_SOCKET(x) (win32_get_osfhandle (x))
415#else
416# define TO_SOCKET(x) (x)
417#endif
418
419static void 516static void
420create_respipe (void) 517create_respipe (void)
421{ 518{
422 int old_readfd = respipe [0];
423
424 if (respipe [1] >= 0)
425 respipe_close (TO_SOCKET (respipe [1]));
426
427#ifdef _WIN32
428 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe))
429#else
430 if (pipe (respipe)) 519 if (s_epipe_renew (&respipe))
431#endif
432 croak ("unable to initialize result pipe"); 520 croak ("IO::AIO: unable to initialize result pipe");
433
434 if (old_readfd >= 0)
435 {
436 if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0)
437 croak ("unable to initialize result pipe(2)");
438
439 respipe_close (respipe [0]);
440 respipe [0] = old_readfd;
441 }
442
443#ifdef _WIN32
444 int arg = 1;
445 if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg)
446 || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg))
447#else
448 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
449 || fcntl (respipe [1], F_SETFL, O_NONBLOCK))
450#endif
451 croak ("unable to initialize result pipe(3)");
452
453 respipe_osf [0] = TO_SOCKET (respipe [0]);
454 respipe_osf [1] = TO_SOCKET (respipe [1]);
455} 521}
456 522
457static void poll_wait (void) 523static void poll_wait (void)
458{ 524{
459 fd_set rfd;
460
461 while (eio_nreqs ()) 525 while (eio_nreqs ())
462 { 526 {
463 int size; 527 int size;
464 528
465 X_LOCK (reslock); 529 X_LOCK (reslock);
… …
469 if (size) 533 if (size)
470 return; 534 return;
471 535
472 etp_maybe_start_thread (); 536 etp_maybe_start_thread ();
473 537
474 FD_ZERO (&rfd); 538 s_epipe_wait (&respipe);
475 FD_SET (respipe [0], &rfd);
476
477 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
478 } 539 }
479} 540}
480 541
481static int poll_cb (void) 542static int poll_cb (void)
482{ 543{
… …
500} 561}
501 562
502static SV * 563static SV *
503get_cb (SV *cb_sv) 564get_cb (SV *cb_sv)
504{ 565{
505 HV *st; 566 SvGETMAGIC (cb_sv);
506 GV *gvp; 567 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
507 CV *cv;
508
509 if (!SvOK (cb_sv))
510 return 0;
511
512 cv = sv_2cv (cb_sv, &st, &gvp, 0);
513
514 if (!cv)
515 croak ("IO::AIO callback must be undef or a CODE reference");
516
517 return (SV *)cv;
518} 568}
519 569
520#define dREQ \ 570#define dREQ \
521 SV *cb_cv; \ 571 SV *cb_cv; \
522 aio_req req; \ 572 aio_req req; \
… …
536 PUTBACK; \ 586 PUTBACK; \
537 req_submit (req); \ 587 req_submit (req); \
538 SPAGAIN; \ 588 SPAGAIN; \
539 \ 589 \
540 if (GIMME_V != G_VOID) \ 590 if (GIMME_V != G_VOID) \
541 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 591 XPUSHs (req_sv (req, aio_req_stash));
542
543static int
544extract_fd (SV *fh, int wr)
545{
546 int fd = PerlIO_fileno (wr ? IoOFP (sv_2io (fh)) : IoIFP (sv_2io (fh)));
547
548 if (fd < 0)
549 croak ("illegal fh argument, either not an OS file or read/write mode mismatch");
550
551 return fd;
552}
553 592
554MODULE = IO::AIO PACKAGE = IO::AIO 593MODULE = IO::AIO PACKAGE = IO::AIO
555 594
556PROTOTYPES: ENABLE 595PROTOTYPES: ENABLE
557 596
… …
570 const_iv (O_CREAT , O_CREAT) 609 const_iv (O_CREAT , O_CREAT)
571 const_iv (O_TRUNC , O_TRUNC) 610 const_iv (O_TRUNC , O_TRUNC)
572#ifndef _WIN32 611#ifndef _WIN32
573 const_iv (S_IFIFO , S_IFIFO) 612 const_iv (S_IFIFO , S_IFIFO)
574#endif 613#endif
614 const_iv (FADV_NORMAL , POSIX_FADV_NORMAL)
615 const_iv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL)
616 const_iv (FADV_RANDOM , POSIX_FADV_RANDOM)
617 const_iv (FADV_NOREUSE , POSIX_FADV_NOREUSE)
618 const_iv (FADV_WILLNEED , POSIX_FADV_WILLNEED)
619 const_iv (FADV_DONTNEED , POSIX_FADV_DONTNEED)
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
575 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE) 640 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
576 const_eio (SYNC_FILE_RANGE_WRITE) 641 const_eio (SYNC_FILE_RANGE_WRITE)
577 const_eio (SYNC_FILE_RANGE_WAIT_AFTER) 642 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
578 643
579 const_eio (READDIR_DENTS) 644 const_eio (READDIR_DENTS)
… …
590 const_eio (DT_LNK) 655 const_eio (DT_LNK)
591 const_eio (DT_SOCK) 656 const_eio (DT_SOCK)
592 const_eio (DT_WHT) 657 const_eio (DT_WHT)
593 }; 658 };
594 659
595 stash = gv_stashpv ("IO::AIO", 1); 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);
596 663
597 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 664 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
598 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 665 newCONSTSUB (aio_stash, (char *)civ->name, newSViv (civ->iv));
599 666
600 create_respipe (); 667 create_respipe ();
601 668
602 if (eio_init (want_poll, done_poll) < 0) 669 if (eio_init (want_poll, done_poll) < 0)
603 croak ("IO::AIO: unable to initialise eio library"); 670 croak ("IO::AIO: unable to initialise eio library");
… …
664 ALIAS: 731 ALIAS:
665 aio_fsync = EIO_FSYNC 732 aio_fsync = EIO_FSYNC
666 aio_fdatasync = EIO_FDATASYNC 733 aio_fdatasync = EIO_FDATASYNC
667 PPCODE: 734 PPCODE:
668{ 735{
669 int fd = extract_fd (fh, 0); 736 int fd = s_fileno_croak (fh, 0);
670 dREQ; 737 dREQ;
671 738
672 req->type = ix; 739 req->type = ix;
673 req->sv1 = newSVsv (fh); 740 req->sv1 = newSVsv (fh);
674 req->int1 = fd; 741 req->int1 = fd;
675 742
676 REQ_SEND (req); 743 REQ_SEND (req);
677} 744}
678 745
679void 746void
680aio_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)
681 PROTOTYPE: $$$$;$ 748 PROTOTYPE: $$$$;$
682 PPCODE: 749 PPCODE:
683{ 750{
684 int fd = extract_fd (fh, 0); 751 int fd = s_fileno_croak (fh, 0);
685 dREQ; 752 dREQ;
686 753
687 req->type = EIO_SYNC_FILE_RANGE; 754 req->type = EIO_SYNC_FILE_RANGE;
688 req->sv1 = newSVsv (fh); 755 req->sv1 = newSVsv (fh);
689 req->int1 = fd; 756 req->int1 = fd;
690 req->offs = SvVAL64 (offset); 757 req->offs = offset;
691 req->size = SvVAL64 (nbytes); 758 req->size = nbytes;
692 req->int2 = flags; 759 req->int2 = flags;
693 760
694 REQ_SEND (req); 761 REQ_SEND (req);
695} 762}
696 763
… …
698aio_close (SV *fh, SV *callback=&PL_sv_undef) 765aio_close (SV *fh, SV *callback=&PL_sv_undef)
699 PROTOTYPE: $;$ 766 PROTOTYPE: $;$
700 PPCODE: 767 PPCODE:
701{ 768{
702 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 */
703 int fd = extract_fd (fh, 0); 770 int fd = s_fileno_croak (fh, 0);
704 dREQ; 771 dREQ;
705 772
706 if (close_pipe < 0) 773 if (close_pipe < 0)
707 { 774 {
708 int pipefd [2]; 775 int pipefd [2];
… …
730 aio_write = EIO_WRITE 797 aio_write = EIO_WRITE
731 PROTOTYPE: $$$$$;$ 798 PROTOTYPE: $$$$$;$
732 PPCODE: 799 PPCODE:
733{ 800{
734 STRLEN svlen; 801 STRLEN svlen;
735 int fd = extract_fd (fh, ix == EIO_WRITE); 802 int fd = s_fileno_croak (fh, ix == EIO_WRITE);
736 char *svptr = SvPVbyte (data, svlen); 803 char *svptr = SvPVbyte (data, svlen);
737 UV len = SvUV (length); 804 UV len = SvUV (length);
738 805
739 if (dataoffset < 0) 806 if (dataoffset < 0)
740 dataoffset += svlen; 807 dataoffset += svlen;
… …
791 858
792 REQ_SEND; 859 REQ_SEND;
793} 860}
794 861
795void 862void
796aio_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)
797 PROTOTYPE: $$$$;$ 864 PROTOTYPE: $$$$;$
798 PPCODE: 865 PPCODE:
799{ 866{
800 int ifd = extract_fd (in_fh , 0); 867 int ifd = s_fileno_croak (in_fh , 0);
801 int ofd = extract_fd (out_fh, 0); 868 int ofd = s_fileno_croak (out_fh, 1);
802 dREQ; 869 dREQ;
803 870
804 req->type = EIO_SENDFILE; 871 req->type = EIO_SENDFILE;
805 req->sv1 = newSVsv (out_fh); 872 req->sv1 = newSVsv (out_fh);
806 req->int1 = ofd; 873 req->int1 = ofd;
807 req->sv2 = newSVsv (in_fh); 874 req->sv2 = newSVsv (in_fh);
808 req->int2 = ifd; 875 req->int2 = ifd;
809 req->offs = SvVAL64 (in_offset); 876 req->offs = in_offset;
810 req->size = length; 877 req->size = length;
811 878
812 REQ_SEND; 879 REQ_SEND;
813} 880}
814 881
815void 882void
816aio_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)
817 PROTOTYPE: $$$;$ 884 PROTOTYPE: $$$;$
818 PPCODE: 885 PPCODE:
819{ 886{
820 int fd = extract_fd (fh, 0); 887 int fd = s_fileno_croak (fh, 0);
821 dREQ; 888 dREQ;
822 889
823 req->type = EIO_READAHEAD; 890 req->type = EIO_READAHEAD;
824 req->sv1 = newSVsv (fh); 891 req->sv1 = newSVsv (fh);
825 req->int1 = fd; 892 req->int1 = fd;
826 req->offs = SvVAL64 (offset); 893 req->offs = offset;
827 req->size = length; 894 req->size = length;
828 895
829 REQ_SEND; 896 REQ_SEND;
830} 897}
831 898
832void 899void
833aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef) 900aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef)
834 ALIAS: 901 ALIAS:
835 aio_stat = EIO_STAT 902 aio_stat = EIO_STAT
836 aio_lstat = EIO_LSTAT 903 aio_lstat = EIO_LSTAT
904 aio_statvfs = EIO_STATVFS
837 PPCODE: 905 PPCODE:
838{ 906{
839 dREQ; 907 dREQ;
840 908
841 req->sv1 = newSVsv (fh_or_path); 909 req->sv1 = newSVsv (fh_or_path);
… …
845 req->type = ix; 913 req->type = ix;
846 req->ptr1 = SvPVbyte_nolen (req->sv1); 914 req->ptr1 = SvPVbyte_nolen (req->sv1);
847 } 915 }
848 else 916 else
849 { 917 {
850 req->type = EIO_FSTAT; 918 req->type = ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT;
851 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 919 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
852 } 920 }
853 921
854 REQ_SEND; 922 REQ_SEND;
855} 923}
… …
1018 1086
1019 REQ_SEND; 1087 REQ_SEND;
1020} 1088}
1021 1089
1022void 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
1023aio_busy (double delay, SV *callback=&PL_sv_undef) 1125aio_busy (double delay, SV *callback=&PL_sv_undef)
1024 PPCODE: 1126 PPCODE:
1025{ 1127{
1026 dREQ; 1128 dREQ;
1027 1129
… …
1039 dREQ; 1141 dREQ;
1040 1142
1041 req->type = EIO_GROUP; 1143 req->type = EIO_GROUP;
1042 1144
1043 req_submit (req); 1145 req_submit (req);
1044 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1146 XPUSHs (req_sv (req, aio_grp_stash));
1045} 1147}
1046 1148
1047void 1149void
1048aio_nop (SV *callback=&PL_sv_undef) 1150aio_nop (SV *callback=&PL_sv_undef)
1049 ALIAS: 1151 ALIAS:
… …
1101 1203
1102int 1204int
1103poll_fileno() 1205poll_fileno()
1104 PROTOTYPE: 1206 PROTOTYPE:
1105 CODE: 1207 CODE:
1106 RETVAL = respipe [0]; 1208 RETVAL = s_epipe_fd (&respipe);
1107 OUTPUT: 1209 OUTPUT:
1108 RETVAL 1210 RETVAL
1109 1211
1110int 1212int
1111poll_cb(...) 1213poll_cb(...)
… …
1151 CODE: 1253 CODE:
1152 RETVAL = eio_nthreads (); 1254 RETVAL = eio_nthreads ();
1153 OUTPUT: 1255 OUTPUT:
1154 RETVAL 1256 RETVAL
1155 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
1156void _on_next_submit (SV *cb) 1278void _on_next_submit (SV *cb)
1157 CODE: 1279 CODE:
1158 SvREFCNT_dec (on_next_submit); 1280 SvREFCNT_dec (on_next_submit);
1159 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1281 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1160 1282
… …
1174 if (GIMME_V != G_VOID) 1296 if (GIMME_V != G_VOID)
1175 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);
1176 1298
1177 if (items > 1) 1299 if (items > 1)
1178 { 1300 {
1179 SV *cb_cv = get_cb (callback); 1301 SV *cb_cv =get_cb (callback);
1180 1302
1181 SvREFCNT_dec (req->callback); 1303 SvREFCNT_dec (req->callback);
1182 req->callback = SvREFCNT_inc (cb_cv); 1304 req->callback = SvREFCNT_inc (cb_cv);
1183 } 1305 }
1184} 1306}

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines