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.174 by root, Mon Nov 1 22:03:43 2010 UTC vs.
Revision 1.187 by root, Sat Jul 16 16:46:10 2011 UTC

… …
11#include <stddef.h> 11#include <stddef.h>
12#include <stdlib.h> 12#include <stdlib.h>
13#include <errno.h> 13#include <errno.h>
14#include <sys/types.h> 14#include <sys/types.h>
15#include <sys/stat.h> 15#include <sys/stat.h>
16#include <sys/statvfs.h>
17#include <limits.h> 16#include <limits.h>
18#include <fcntl.h> 17#include <fcntl.h>
19#include <sched.h> 18#include <sched.h>
20 19
21#if _POSIX_MEMLOCK || _POSIX_MAPPED_FILES 20#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
22# include <sys/mman.h> 21# include <sys/mman.h>
23#endif 22#endif
24 23
25/* perl namespace pollution */ 24/* perl namespace pollution */
26#undef VERSION 25#undef VERSION
26
27/* perl stupidly overrides readdir and maybe others */
28/* with thread-unsafe versions, imagine that :( */
29#undef readdir
30#undef opendir
31#undef closedir
27 32
28#ifdef _WIN32 33#ifdef _WIN32
29 34
30# define EIO_STRUCT_DIRENT Direntry_t 35# define EIO_STRUCT_DIRENT Direntry_t
31# undef malloc 36# undef malloc
… …
35# undef open 40# undef open
36# undef read 41# undef read
37# undef write 42# undef write
38# undef send 43# undef send
39# undef recv 44# undef recv
40# undef stat 45# undef lstat
41# undef fstat
42# define lstat stat
43# undef truncate 46# undef truncate
44# undef ftruncate 47# undef ftruncate
45# undef open 48# undef open
49# undef link
46# undef close 50# undef close
47# undef unlink 51# undef unlink
52# undef mkdir
48# undef rmdir 53# undef rmdir
49# undef rename 54# undef rename
50# undef lseek 55# undef lseek
56# undef opendir
57# undef readdir
58# undef closedir
59# undef chmod
60# undef fchmod
51 61
52# define chown(a,b,c) (errno = ENOSYS, -1)
53# define fchown(a,b,c) (errno = ENOSYS, -1)
54# define fchmod(a,b) (errno = ENOSYS, -1)
55# define symlink(a,b) (errno = ENOSYS, -1)
56# define readlink(a,b,c) (errno = ENOSYS, -1)
57# define mknod(a,b,c) (errno = ENOSYS, -1)
58# define truncate(a,b) (errno = ENOSYS, -1)
59# define ftruncate(fd,o) chsize ((fd), (o))
60# define fsync(fd) _commit (fd)
61# define opendir(fd) (errno = ENOSYS, 0) 62# define opendir(fd) EIO_ERRNO (ENOSYS, 0)
62# define readdir(fd) (errno = ENOSYS, -1) 63# define readdir(fd) EIO_ENOSYS ()
63# define closedir(fd) (errno = ENOSYS, -1) 64# define closedir(fd) EIO_ENOSYS ()
64# define mkdir(a,b) mkdir (a)
65 65
66#else 66#else
67 67
68# include <sys/time.h> 68# include <sys/time.h>
69# include <sys/select.h> 69# include <sys/select.h>
70# include <unistd.h> 70# include <unistd.h>
71# include <utime.h> 71# include <utime.h>
72# include <signal.h> 72# include <signal.h>
73# define EIO_STRUCT_DIRENT struct dirent
74 73
75#endif 74#endif
76
77/* perl stupidly overrides readdir and maybe others */
78/* with thread-unsafe versions, imagine that :( */
79#undef readdir
80#undef opendir
81#undef closedir
82 75
83#define EIO_STRUCT_STAT Stat_t 76#define EIO_STRUCT_STAT Stat_t
84 77
85/* use NV for 32 bit perls as it allows larger offsets */ 78/* use NV for 32 bit perls as it allows larger offsets */
86#if IVSIZE >= 8 79#if IVSIZE >= 8
… …
118 STRLEN stroffset; \ 111 STRLEN stroffset; \
119 SV *self; 112 SV *self;
120 113
121#define EIO_NO_WRAPPERS 1 114#define EIO_NO_WRAPPERS 1
122 115
116#include "libeio/config.h"
123#include "libeio/eio.h" 117#include "libeio/eio.h"
118
119/* Linux/others */
120#ifndef O_ASYNC
121# define O_ASYNC 0
122#endif
123#ifndef O_DIRECT
124# define O_DIRECT 0
125#endif
126#ifndef O_NOATIME
127# define O_NOATIME 0
128#endif
129
130/* POSIX */
131#ifndef O_CLOEXEC
132# define O_CLOEXEC 0
133#endif
134#ifndef O_NOFOLLOW
135# define O_NOFOLLOW 0
136#endif
137#ifndef O_NOCTTY
138# define O_NOCTTY 0
139#endif
140#ifndef O_NONBLOCK
141# define O_NONBLOCK 0
142#endif
143#ifndef O_EXEC
144# define O_EXEC 0
145#endif
146#ifndef O_SEARCH
147# define O_SEARCH 0
148#endif
149#ifndef O_DIRECTORY
150# define O_DIRECTORY 0
151#endif
152#ifndef O_DSYNC
153# define O_DSYNC 0
154#endif
155#ifndef O_RSYNC
156# define O_RSYNC 0
157#endif
158#ifndef O_SYNC
159# define O_SYNC 0
160#endif
161#ifndef O_TTY_INIT
162# define O_TTY_INIT 0
163#endif
124 164
125#ifndef POSIX_FADV_NORMAL 165#ifndef POSIX_FADV_NORMAL
126# define POSIX_FADV_NORMAL 0 166# define POSIX_FADV_NORMAL 0
127# define NO_FADVISE 1
128#endif 167#endif
129#ifndef POSIX_FADV_SEQUENTIAL 168#ifndef POSIX_FADV_SEQUENTIAL
130# define POSIX_FADV_SEQUENTIAL 0 169# define POSIX_FADV_SEQUENTIAL 0
131#endif 170#endif
132#ifndef POSIX_FADV_RANDOM 171#ifndef POSIX_FADV_RANDOM
… …
140#endif 179#endif
141#ifndef POSIX_FADV_DONTNEED 180#ifndef POSIX_FADV_DONTNEED
142# define POSIX_FADV_DONTNEED 0 181# define POSIX_FADV_DONTNEED 0
143#endif 182#endif
144 183
145#if _XOPEN_SOURCE < 600 || NO_FADVISE 184#if !HAVE_POSIX_FADVISE
146# define posix_fadvise(a,b,c,d) errno = ENOSYS /* also return ENOSYS */ 185# define posix_fadvise(a,b,c,d) errno = ENOSYS /* also return ENOSYS */
147#endif 186#endif
148 187
149#ifndef POSIX_MADV_NORMAL 188#ifndef POSIX_MADV_NORMAL
150# define POSIX_MADV_NORMAL 0 189# define POSIX_MADV_NORMAL 0
151# define NO_MADVISE 1
152#endif 190#endif
153#ifndef POSIX_MADV_SEQUENTIAL 191#ifndef POSIX_MADV_SEQUENTIAL
154# define POSIX_MADV_SEQUENTIAL 0 192# define POSIX_MADV_SEQUENTIAL 0
155#endif 193#endif
156#ifndef POSIX_MADV_RANDOM 194#ifndef POSIX_MADV_RANDOM
… …
161#endif 199#endif
162#ifndef POSIX_MADV_DONTNEED 200#ifndef POSIX_MADV_DONTNEED
163# define POSIX_MADV_DONTNEED 0 201# define POSIX_MADV_DONTNEED 0
164#endif 202#endif
165 203
166#if _XOPEN_SOURCE < 600 || NO_MADVISE 204#if !HAVE_POSIX_MADVISE
167# define posix_madvise(a,b,c) errno = ENOSYS /* also return ENOSYS */ 205# define posix_madvise(a,b,c) errno = ENOSYS /* also return ENOSYS */
168#endif 206#endif
169 207
170#ifndef PROT_NONE 208#ifndef PROT_NONE
171# define PROT_NONE 0 209# define PROT_NONE 0
… …
178#endif 216#endif
179#ifndef PROT_EXEC 217#ifndef PROT_EXEC
180# define PROT_EXEC 0 218# define PROT_EXEC 0
181#endif 219#endif
182 220
221#ifndef ST_RDONLY
222# define ST_RDONLY 0
223#endif
224#ifndef ST_NOSUID
225# define ST_NOSUID 0
226#endif
183#ifndef ST_NODEV 227#ifndef ST_NODEV
184# define ST_NODEV 0 228# define ST_NODEV 0
185#endif 229#endif
186#ifndef ST_NOEXEC 230#ifndef ST_NOEXEC
187# define ST_NOEXEC 0 231# define ST_NOEXEC 0
… …
207#ifndef ST_NODIRATIME 251#ifndef ST_NODIRATIME
208# define ST_NODIRATIME 0 252# define ST_NODIRATIME 0
209#endif 253#endif
210#ifndef ST_RELATIME 254#ifndef ST_RELATIME
211# define ST_RELATIME 0 255# define ST_RELATIME 0
256#endif
257
258#ifndef S_IFIFO
259# define S_IFIFO 0
260#endif
261#ifndef S_IFCHR
262# define S_IFCHR 0
263#endif
264#ifndef S_IFBLK
265# define S_IFBLK 0
266#endif
267#ifndef S_IFLNK
268# define S_IFLNK 0
269#endif
270#ifndef S_IFREG
271# define S_IFREG 0
272#endif
273#ifndef S_IFDIR
274# define S_IFDIR 0
275#endif
276#ifndef S_IFWHT
277# define S_IFWHT 0
278#endif
279#ifndef S_IFSOCK
280# define S_IFSOCK 0
212#endif 281#endif
213 282
214#ifndef MAP_ANONYMOUS 283#ifndef MAP_ANONYMOUS
215# ifdef MAP_ANON 284# ifdef MAP_ANON
216# define MAP_ANONYMOUS MAP_ANON 285# define MAP_ANONYMOUS MAP_ANON
… …
230#ifndef MAP_POPULATE 299#ifndef MAP_POPULATE
231# define MAP_POPULATE 0 300# define MAP_POPULATE 0
232#endif 301#endif
233#ifndef MAP_NONBLOCK 302#ifndef MAP_NONBLOCK
234# define MAP_NONBLOCK 0 303# define MAP_NONBLOCK 0
304#endif
305
306#ifndef makedev
307# define makedev(maj,min) (((maj) << 8) | (min))
308#endif
309#ifndef major
310# define major(dev) ((dev) >> 8)
311#endif
312#ifndef minor
313# define minor(dev) ((dev) & 0xff)
235#endif 314#endif
236 315
237#ifndef PAGESIZE 316#ifndef PAGESIZE
238# define PAGESIZE sysconf (_SC_PAGESIZE) 317# define PAGESIZE sysconf (_SC_PAGESIZE)
239#endif 318#endif
… …
354 /* do not recreate the result IV from scratch each time */ 433 /* do not recreate the result IV from scratch each time */
355 if (expect_true (sv_result_cache)) 434 if (expect_true (sv_result_cache))
356 { 435 {
357 sv_result = sv_result_cache; sv_result_cache = 0; 436 sv_result = sv_result_cache; sv_result_cache = 0;
358 SvIV_set (sv_result, req->result); 437 SvIV_set (sv_result, req->result);
438 SvIOK_only (sv_result);
359 } 439 }
360 else 440 else
361 { 441 {
362 sv_result = newSViv (req->result); 442 sv_result = newSViv (req->result);
363 SvREADONLY_on (sv_result); 443 SvREADONLY_on (sv_result);
… …
460 case EIO_STATVFS: 540 case EIO_STATVFS:
461 case EIO_FSTATVFS: 541 case EIO_FSTATVFS:
462 { 542 {
463 SV *rv = &PL_sv_undef; 543 SV *rv = &PL_sv_undef;
464 544
545#ifndef _WIN32
465 if (req->result >= 0) 546 if (req->result >= 0)
466 { 547 {
467 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req); 548 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req);
468 HV *hv = newHV (); 549 HV *hv = newHV ();
469 550
… …
479 hv_store (hv, "favail" , sizeof ("favail" ) - 1, newSVval64 (f->f_favail ), 0); 560 hv_store (hv, "favail" , sizeof ("favail" ) - 1, newSVval64 (f->f_favail ), 0);
480 hv_store (hv, "fsid" , sizeof ("fsid" ) - 1, newSVval64 (f->f_fsid ), 0); 561 hv_store (hv, "fsid" , sizeof ("fsid" ) - 1, newSVval64 (f->f_fsid ), 0);
481 hv_store (hv, "flag" , sizeof ("flag" ) - 1, newSVval64 (f->f_flag ), 0); 562 hv_store (hv, "flag" , sizeof ("flag" ) - 1, newSVval64 (f->f_flag ), 0);
482 hv_store (hv, "namemax", sizeof ("namemax") - 1, newSVval64 (f->f_namemax), 0); 563 hv_store (hv, "namemax", sizeof ("namemax") - 1, newSVval64 (f->f_namemax), 0);
483 } 564 }
565#endif
484 566
485 PUSHs (rv); 567 PUSHs (rv);
486 } 568 }
487 569
488 break; 570 break;
… …
504 case EIO_NOP: 586 case EIO_NOP:
505 case EIO_BUSY: 587 case EIO_BUSY:
506 break; 588 break;
507 589
508 case EIO_READLINK: 590 case EIO_READLINK:
591 case EIO_REALPATH:
509 if (req->result > 0) 592 if (req->result > 0)
510 PUSHs (sv_2mortal (newSVpvn (req->ptr2, req->result))); 593 PUSHs (sv_2mortal (newSVpvn (req->ptr2, req->result)));
511 break; 594 break;
512 595
513 case EIO_STAT: 596 case EIO_STAT:
… …
527 SvSETMAGIC (req->sv2); 610 SvSETMAGIC (req->sv2);
528 PUSHs (sv_result); 611 PUSHs (sv_result);
529 } 612 }
530 break; 613 break;
531 614
532 case EIO_DUP2: /* EIO_DUP2 actually means aio_close(), su fudge result value */ 615 case EIO_DUP2: /* EIO_DUP2 actually means aio_close(), so fudge result value */
533 if (req->result > 0) 616 if (req->result > 0)
534 SvIV_set (sv_result, 0); 617 SvIV_set (sv_result, 0);
535 /* FALLTHROUGH */ 618 /* FALLTHROUGH */
536 619
537 default: 620 default:
… …
585 grp->sv2 = 0; 668 grp->sv2 = 0;
586 669
587 eio_grp_cancel (grp); 670 eio_grp_cancel (grp);
588} 671}
589 672
590static void
591create_respipe (void) 673static void create_respipe (void)
592{ 674{
593 if (s_epipe_renew (&respipe)) 675 if (s_epipe_renew (&respipe))
594 croak ("IO::AIO: unable to initialize result pipe"); 676 croak ("IO::AIO: unable to initialize result pipe");
595} 677}
596 678
… …
637/*****************************************************************************/ 719/*****************************************************************************/
638 720
639#if !_POSIX_MAPPED_FILES 721#if !_POSIX_MAPPED_FILES
640# define mmap(addr,length,prot,flags,fd,offs) (errno = ENOSYS, -1) 722# define mmap(addr,length,prot,flags,fd,offs) (errno = ENOSYS, -1)
641# define munmap(addr,length) (errno = ENOSYS, -1) 723# define munmap(addr,length) (errno = ENOSYS, -1)
724#endif
725
726#if !_POSIX_MEMORY_PROTECTION
642# define mprotect(addr,len,prot) (errno = ENOSYS, -1) 727# define mprotect(addr,len,prot) (errno = ENOSYS, -1)
643# define PROT_NONE 0 728# define PROT_NONE 0
644# define PROT_WRITE 0 729# define PROT_WRITE 0
645# define MAP_PRIVATE 0 730# define MAP_PRIVATE 0
646# define MAP_SHARED 0 731# define MAP_SHARED 0
647# define MAP_FIXED 0 732# define MAP_FIXED 0
648#endif 733#endif
649 734
650#define MMAP_MAGIC PERL_MAGIC_ext 735#define MMAP_MAGIC PERL_MAGIC_ext
651 736
652static int
653mmap_free (pTHX_ SV *sv, MAGIC *mg) 737static int mmap_free (pTHX_ SV *sv, MAGIC *mg)
654{ 738{
655 int old_errno = errno; 739 int old_errno = errno;
656 munmap (mg->mg_ptr, (size_t)mg->mg_obj); 740 munmap (mg->mg_ptr, (size_t)mg->mg_obj);
657 errno = old_errno; 741 errno = old_errno;
658 742
… …
674 0, 0, 0, 0, mmap_free 758 0, 0, 0, 0, mmap_free
675}; 759};
676 760
677/*****************************************************************************/ 761/*****************************************************************************/
678 762
679static SV *
680get_cb (SV *cb_sv) 763static SV * get_cb (SV *cb_sv)
681{ 764{
682 SvGETMAGIC (cb_sv); 765 SvGETMAGIC (cb_sv);
683 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0; 766 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
684} 767}
685 768
… …
726 const_iv (O_RDWR) 809 const_iv (O_RDWR)
727 const_iv (O_CREAT) 810 const_iv (O_CREAT)
728 const_iv (O_TRUNC) 811 const_iv (O_TRUNC)
729 const_iv (O_EXCL) 812 const_iv (O_EXCL)
730 const_iv (O_APPEND) 813 const_iv (O_APPEND)
731#ifndef _WIN32 814
815 const_iv (O_ASYNC)
816 const_iv (O_DIRECT)
817 const_iv (O_NOATIME)
818
819 const_iv (O_CLOEXEC)
820 const_iv (O_NOCTTY)
821 const_iv (O_NOFOLLOW)
822 const_iv (O_NONBLOCK)
823 const_iv (O_EXEC)
824 const_iv (O_SEARCH)
825 const_iv (O_DIRECTORY)
826 const_iv (O_DSYNC)
827 const_iv (O_RSYNC)
828 const_iv (O_SYNC)
829 const_iv (O_TTY_INIT)
830
732 const_iv (S_IFIFO) 831 const_iv (S_IFIFO)
733#endif 832 const_iv (S_IFCHR)
833 const_iv (S_IFBLK)
834 const_iv (S_IFLNK)
835 const_iv (S_IFREG)
836 const_iv (S_IFDIR)
837 const_iv (S_IFWHT)
838 const_iv (S_IFSOCK)
839 const_iv (S_IFMT)
840
734 const_niv (FADV_NORMAL , POSIX_FADV_NORMAL) 841 const_niv (FADV_NORMAL , POSIX_FADV_NORMAL)
735 const_niv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL) 842 const_niv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL)
736 const_niv (FADV_RANDOM , POSIX_FADV_RANDOM) 843 const_niv (FADV_RANDOM , POSIX_FADV_RANDOM)
737 const_niv (FADV_NOREUSE , POSIX_FADV_NOREUSE) 844 const_niv (FADV_NOREUSE , POSIX_FADV_NOREUSE)
738 const_niv (FADV_WILLNEED , POSIX_FADV_WILLNEED) 845 const_niv (FADV_WILLNEED , POSIX_FADV_WILLNEED)
… …
785 892
786 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE) 893 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
787 const_eio (SYNC_FILE_RANGE_WRITE) 894 const_eio (SYNC_FILE_RANGE_WRITE)
788 const_eio (SYNC_FILE_RANGE_WAIT_AFTER) 895 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
789 896
897 const_eio (FALLOC_FL_KEEP_SIZE)
898
790 const_eio (READDIR_DENTS) 899 const_eio (READDIR_DENTS)
791 const_eio (READDIR_DIRS_FIRST) 900 const_eio (READDIR_DIRS_FIRST)
792 const_eio (READDIR_STAT_ORDER) 901 const_eio (READDIR_STAT_ORDER)
793 const_eio (READDIR_FOUND_UNKNOWN) 902 const_eio (READDIR_FOUND_UNKNOWN)
794 903
… …
820 /* atfork child called in fifo order, so before eio's handler */ 929 /* atfork child called in fifo order, so before eio's handler */
821 X_THREAD_ATFORK (0, 0, atfork_child); 930 X_THREAD_ATFORK (0, 0, atfork_child);
822} 931}
823 932
824void 933void
825max_poll_reqs (int nreqs) 934max_poll_reqs (unsigned int nreqs)
826 PROTOTYPE: $ 935 PROTOTYPE: $
827 CODE: 936 CODE:
828 eio_set_max_poll_reqs (nreqs); 937 eio_set_max_poll_reqs (nreqs);
829 938
830void 939void
… …
832 PROTOTYPE: $ 941 PROTOTYPE: $
833 CODE: 942 CODE:
834 eio_set_max_poll_time (nseconds); 943 eio_set_max_poll_time (nseconds);
835 944
836void 945void
837min_parallel (int nthreads) 946min_parallel (unsigned int nthreads)
838 PROTOTYPE: $ 947 PROTOTYPE: $
839 CODE: 948 CODE:
840 eio_set_min_parallel (nthreads); 949 eio_set_min_parallel (nthreads);
841 950
842void 951void
843max_parallel (int nthreads) 952max_parallel (unsigned int nthreads)
844 PROTOTYPE: $ 953 PROTOTYPE: $
845 CODE: 954 CODE:
846 eio_set_max_parallel (nthreads); 955 eio_set_max_parallel (nthreads);
847 956
848void 957void
849max_idle (int nthreads) 958max_idle (unsigned int nthreads)
850 PROTOTYPE: $ 959 PROTOTYPE: $
851 CODE: 960 CODE:
852 eio_set_max_idle (nthreads); 961 eio_set_max_idle (nthreads);
853 962
854void 963void
964idle_timeout (unsigned int seconds)
965 PROTOTYPE: $
966 CODE:
967 eio_set_idle_timeout (seconds);
968
969void
855max_outstanding (int maxreqs) 970max_outstanding (unsigned int maxreqs)
856 PROTOTYPE: $ 971 PROTOTYPE: $
857 CODE: 972 CODE:
858 max_outstanding = maxreqs; 973 max_outstanding = maxreqs;
859 974
860void 975void
… …
905 1020
906 REQ_SEND (req); 1021 REQ_SEND (req);
907} 1022}
908 1023
909void 1024void
1025aio_fallocate (SV *fh, int mode, off_t offset, size_t len, SV *callback=&PL_sv_undef)
1026 PPCODE:
1027{
1028 int fd = s_fileno_croak (fh, 0);
1029 dREQ;
1030
1031 req->type = EIO_FALLOCATE;
1032 req->sv1 = newSVsv (fh);
1033 req->int1 = fd;
1034 req->int2 = mode;
1035 req->offs = offset;
1036 req->size = len;
1037
1038 REQ_SEND (req);
1039}
1040
1041void
910aio_close (SV *fh, SV *callback=&PL_sv_undef) 1042aio_close (SV *fh, SV *callback=&PL_sv_undef)
911 PPCODE: 1043 PPCODE:
912{ 1044{
913 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 1045 static int close_fd = -1; /* dummy fd to close fds via dup2 */
914 int fd = s_fileno_croak (fh, 0); 1046 int fd = s_fileno_croak (fh, 0);
915 dREQ; 1047 dREQ;
916 1048
917 if (close_pipe < 0) 1049 if (expect_false (close_fd < 0))
918 { 1050 {
1051#ifdef _WIN32
1052 close_fd = _open_osfhandle (socket (AF_INET, SOCK_STREAM, 0), 0);
1053#else
919 int pipefd [2]; 1054 int pipefd [2];
920 1055
921 if (pipe (pipefd) < 0 1056 if (pipe (pipefd) < 0
922 || close (pipefd [1]) < 0 1057 || close (pipefd [1]) < 0
923 || fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0) 1058 || fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0)
924 abort (); /*D*/ 1059 abort (); /*D*/
925 1060
926 close_pipe = pipefd [0]; 1061 close_fd = pipefd [0];
1062#endif
927 } 1063 }
928 1064
929 req->type = EIO_DUP2; 1065 req->type = EIO_DUP2;
930 req->int1 = close_pipe; 1066 req->int1 = close_fd;
931 req->sv2 = newSVsv (fh); 1067 req->sv2 = newSVsv (fh);
932 req->int2 = fd; 1068 req->int2 = fd;
933 1069
934 REQ_SEND (req); 1070 REQ_SEND (req);
935} 1071}
… …
987 } 1123 }
988} 1124}
989 1125
990void 1126void
991aio_readlink (SV8 *path, SV *callback=&PL_sv_undef) 1127aio_readlink (SV8 *path, SV *callback=&PL_sv_undef)
1128 ALIAS:
1129 aio_readlink = EIO_READLINK
1130 aio_realpath = EIO_REALPATH
992 PPCODE: 1131 PPCODE:
993{ 1132{
994 SV *data; 1133 SV *data;
995 dREQ; 1134 dREQ;
996 1135
997 req->type = EIO_READLINK; 1136 req->type = ix;
998 req->sv1 = newSVsv (path); 1137 req->sv1 = newSVsv (path);
999 req->ptr1 = SvPVbyte_nolen (req->sv1); 1138 req->ptr1 = SvPVbyte_nolen (req->sv1);
1000 1139
1001 REQ_SEND; 1140 REQ_SEND;
1002} 1141}
… …
1059 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1198 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1060 } 1199 }
1061 1200
1062 REQ_SEND; 1201 REQ_SEND;
1063} 1202}
1203
1204UV
1205major (UV dev)
1206 ALIAS:
1207 minor = 1
1208 CODE:
1209 RETVAL = ix ? major (dev) : minor (dev);
1210 OUTPUT:
1211 RETVAL
1212
1213UV
1214makedev (UV maj, UV min)
1215 CODE:
1216 RETVAL = makedev (maj, min);
1217 OUTPUT:
1218 RETVAL
1064 1219
1065void 1220void
1066aio_utime (SV8 *fh_or_path, SV *atime, SV *mtime, SV *callback=&PL_sv_undef) 1221aio_utime (SV8 *fh_or_path, SV *atime, SV *mtime, SV *callback=&PL_sv_undef)
1067 PPCODE: 1222 PPCODE:
1068{ 1223{
… …
1524 if (!SvOK (length) || len + offset > svlen) 1679 if (!SvOK (length) || len + offset > svlen)
1525 len = svlen - offset; 1680 len = svlen - offset;
1526 1681
1527 addr = (void *)(((intptr_t)addr) + offset); 1682 addr = (void *)(((intptr_t)addr) + offset);
1528 eio_page_align (&addr, &len); 1683 eio_page_align (&addr, &len);
1529#if _POSIX_MEMLOCK 1684#if _POSIX_MEMLOCK_RANGE
1530 RETVAL = munlock (addr, len); 1685 RETVAL = munlock (addr, len);
1531#else 1686#else
1532 RETVAL = ((errno = ENOSYS), -1); 1687 RETVAL = ((errno = ENOSYS), -1);
1533#endif 1688#endif
1534} 1689}

Diff Legend

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