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.176 by root, Thu Dec 2 10:04:47 2010 UTC vs.
Revision 1.190 by root, Mon Jul 18 02:02:26 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
27
28#ifdef _WIN32
29
30# define EIO_STRUCT_DIRENT Direntry_t
31# undef malloc
32# undef free
33
34// perl overrides all those nice win32 functions
35# undef open
36# undef read
37# undef write
38# undef send
39# undef recv
40# undef stat
41# undef fstat
42# define lstat stat
43# undef truncate
44# undef ftruncate
45# undef open
46# undef close
47# undef unlink
48# undef rmdir
49# undef rename
50# undef lseek
51
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 readdir(fd) (errno = ENOSYS, -1)
63# define closedir(fd) (errno = ENOSYS, -1)
64# define mkdir(a,b) mkdir (a)
65
66#else
67
68# include <sys/time.h>
69# include <sys/select.h>
70# include <unistd.h>
71# include <utime.h>
72# include <signal.h>
73# define EIO_STRUCT_DIRENT struct dirent
74
75#endif
76 26
77/* perl stupidly overrides readdir and maybe others */ 27/* perl stupidly overrides readdir and maybe others */
78/* with thread-unsafe versions, imagine that :( */ 28/* with thread-unsafe versions, imagine that :( */
79#undef readdir 29#undef readdir
80#undef opendir 30#undef opendir
81#undef closedir 31#undef closedir
32
33#ifdef _WIN32
34
35 // perl overrides all those nice libc functions
36
37 #undef malloc
38 #undef free
39 #undef open
40 #undef read
41 #undef write
42 #undef send
43 #undef recv
44 #undef stat
45 #undef lstat
46 #undef fstat
47 #undef truncate
48 #undef ftruncate
49 #undef open
50 #undef link
51 #undef close
52 #undef unlink
53 #undef mkdir
54 #undef rmdir
55 #undef rename
56 #undef lseek
57 #undef opendir
58 #undef readdir
59 #undef closedir
60 #undef chmod
61 #undef fchmod
62 #undef dup
63 #undef dup2
64 #undef abort
65 #undef pipe
66
67#else
68
69 #include <sys/time.h>
70 #include <sys/select.h>
71 #include <unistd.h>
72 #include <utime.h>
73 #include <signal.h>
74
75#endif
82 76
83#define EIO_STRUCT_STAT Stat_t 77#define EIO_STRUCT_STAT Stat_t
84 78
85/* use NV for 32 bit perls as it allows larger offsets */ 79/* use NV for 32 bit perls as it allows larger offsets */
86#if IVSIZE >= 8 80#if IVSIZE >= 8
… …
121#define EIO_NO_WRAPPERS 1 115#define EIO_NO_WRAPPERS 1
122 116
123#include "libeio/config.h" 117#include "libeio/config.h"
124#include "libeio/eio.h" 118#include "libeio/eio.h"
125 119
120static int req_invoke (eio_req *req);
121#define EIO_FINISH(req) req_invoke (req)
122static void req_destroy (eio_req *grp);
123#define EIO_DESTROY(req) req_destroy (req)
124
125#include "libeio/eio.c"
126
127/* Linux/others */
128#ifndef O_ASYNC
129# define O_ASYNC 0
130#endif
131#ifndef O_DIRECT
132# define O_DIRECT 0
133#endif
134#ifndef O_NOATIME
135# define O_NOATIME 0
136#endif
137
138/* POSIX */
139#ifndef O_CLOEXEC
140# define O_CLOEXEC 0
141#endif
142#ifndef O_NOFOLLOW
143# define O_NOFOLLOW 0
144#endif
145#ifndef O_NOCTTY
146# define O_NOCTTY 0
147#endif
148#ifndef O_NONBLOCK
149# define O_NONBLOCK 0
150#endif
151#ifndef O_EXEC
152# define O_EXEC 0
153#endif
154#ifndef O_SEARCH
155# define O_SEARCH 0
156#endif
157#ifndef O_DIRECTORY
158# define O_DIRECTORY 0
159#endif
160#ifndef O_DSYNC
161# define O_DSYNC 0
162#endif
163#ifndef O_RSYNC
164# define O_RSYNC 0
165#endif
166#ifndef O_SYNC
167# define O_SYNC 0
168#endif
169#ifndef O_TTY_INIT
170# define O_TTY_INIT 0
171#endif
172
126#ifndef POSIX_FADV_NORMAL 173#ifndef POSIX_FADV_NORMAL
127# define POSIX_FADV_NORMAL 0 174# define POSIX_FADV_NORMAL 0
128#endif 175#endif
129#ifndef POSIX_FADV_SEQUENTIAL 176#ifndef POSIX_FADV_SEQUENTIAL
130# define POSIX_FADV_SEQUENTIAL 0 177# define POSIX_FADV_SEQUENTIAL 0
… …
177#endif 224#endif
178#ifndef PROT_EXEC 225#ifndef PROT_EXEC
179# define PROT_EXEC 0 226# define PROT_EXEC 0
180#endif 227#endif
181 228
229#ifndef ST_RDONLY
230# define ST_RDONLY 0
231#endif
232#ifndef ST_NOSUID
233# define ST_NOSUID 0
234#endif
182#ifndef ST_NODEV 235#ifndef ST_NODEV
183# define ST_NODEV 0 236# define ST_NODEV 0
184#endif 237#endif
185#ifndef ST_NOEXEC 238#ifndef ST_NOEXEC
186# define ST_NOEXEC 0 239# define ST_NOEXEC 0
… …
206#ifndef ST_NODIRATIME 259#ifndef ST_NODIRATIME
207# define ST_NODIRATIME 0 260# define ST_NODIRATIME 0
208#endif 261#endif
209#ifndef ST_RELATIME 262#ifndef ST_RELATIME
210# define ST_RELATIME 0 263# define ST_RELATIME 0
264#endif
265
266#ifndef S_IFIFO
267# define S_IFIFO 0
268#endif
269#ifndef S_IFCHR
270# define S_IFCHR 0
271#endif
272#ifndef S_IFBLK
273# define S_IFBLK 0
274#endif
275#ifndef S_IFLNK
276# define S_IFLNK 0
277#endif
278#ifndef S_IFREG
279# define S_IFREG 0
280#endif
281#ifndef S_IFDIR
282# define S_IFDIR 0
283#endif
284#ifndef S_IFWHT
285# define S_IFWHT 0
286#endif
287#ifndef S_IFSOCK
288# define S_IFSOCK 0
211#endif 289#endif
212 290
213#ifndef MAP_ANONYMOUS 291#ifndef MAP_ANONYMOUS
214# ifdef MAP_ANON 292# ifdef MAP_ANON
215# define MAP_ANONYMOUS MAP_ANON 293# define MAP_ANONYMOUS MAP_ANON
… …
231#endif 309#endif
232#ifndef MAP_NONBLOCK 310#ifndef MAP_NONBLOCK
233# define MAP_NONBLOCK 0 311# define MAP_NONBLOCK 0
234#endif 312#endif
235 313
314#ifndef makedev
315# define makedev(maj,min) (((maj) << 8) | (min))
316#endif
317#ifndef major
318# define major(dev) ((dev) >> 8)
319#endif
320#ifndef minor
321# define minor(dev) ((dev) & 0xff)
322#endif
323
236#ifndef PAGESIZE 324#ifndef PAGESIZE
237# define PAGESIZE sysconf (_SC_PAGESIZE) 325# define PAGESIZE sysconf (_SC_PAGESIZE)
238#endif 326#endif
239
240static int req_invoke (eio_req *req);
241#define EIO_FINISH(req) req_invoke (req)
242static void req_destroy (eio_req *grp);
243#define EIO_DESTROY(req) req_destroy (req)
244 327
245enum { 328enum {
246 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ 329 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
247}; 330};
248
249#include "libeio/eio.c"
250 331
251typedef eio_req *aio_req; 332typedef eio_req *aio_req;
252typedef eio_req *aio_req_ornot; 333typedef eio_req *aio_req_ornot;
253 334
254static SV *on_next_submit; 335static SV *on_next_submit;
… …
353 /* do not recreate the result IV from scratch each time */ 434 /* do not recreate the result IV from scratch each time */
354 if (expect_true (sv_result_cache)) 435 if (expect_true (sv_result_cache))
355 { 436 {
356 sv_result = sv_result_cache; sv_result_cache = 0; 437 sv_result = sv_result_cache; sv_result_cache = 0;
357 SvIV_set (sv_result, req->result); 438 SvIV_set (sv_result, req->result);
439 SvIOK_only (sv_result);
358 } 440 }
359 else 441 else
360 { 442 {
361 sv_result = newSViv (req->result); 443 sv_result = newSViv (req->result);
362 SvREADONLY_on (sv_result); 444 SvREADONLY_on (sv_result);
… …
459 case EIO_STATVFS: 541 case EIO_STATVFS:
460 case EIO_FSTATVFS: 542 case EIO_FSTATVFS:
461 { 543 {
462 SV *rv = &PL_sv_undef; 544 SV *rv = &PL_sv_undef;
463 545
546#ifndef _WIN32
464 if (req->result >= 0) 547 if (req->result >= 0)
465 { 548 {
466 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req); 549 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req);
467 HV *hv = newHV (); 550 HV *hv = newHV ();
468 551
… …
478 hv_store (hv, "favail" , sizeof ("favail" ) - 1, newSVval64 (f->f_favail ), 0); 561 hv_store (hv, "favail" , sizeof ("favail" ) - 1, newSVval64 (f->f_favail ), 0);
479 hv_store (hv, "fsid" , sizeof ("fsid" ) - 1, newSVval64 (f->f_fsid ), 0); 562 hv_store (hv, "fsid" , sizeof ("fsid" ) - 1, newSVval64 (f->f_fsid ), 0);
480 hv_store (hv, "flag" , sizeof ("flag" ) - 1, newSVval64 (f->f_flag ), 0); 563 hv_store (hv, "flag" , sizeof ("flag" ) - 1, newSVval64 (f->f_flag ), 0);
481 hv_store (hv, "namemax", sizeof ("namemax") - 1, newSVval64 (f->f_namemax), 0); 564 hv_store (hv, "namemax", sizeof ("namemax") - 1, newSVval64 (f->f_namemax), 0);
482 } 565 }
566#endif
483 567
484 PUSHs (rv); 568 PUSHs (rv);
485 } 569 }
486 570
487 break; 571 break;
… …
503 case EIO_NOP: 587 case EIO_NOP:
504 case EIO_BUSY: 588 case EIO_BUSY:
505 break; 589 break;
506 590
507 case EIO_READLINK: 591 case EIO_READLINK:
592 case EIO_REALPATH:
508 if (req->result > 0) 593 if (req->result > 0)
509 PUSHs (sv_2mortal (newSVpvn (req->ptr2, req->result))); 594 PUSHs (sv_2mortal (newSVpvn (req->ptr2, req->result)));
510 break; 595 break;
511 596
512 case EIO_STAT: 597 case EIO_STAT:
513 case EIO_LSTAT: 598 case EIO_LSTAT:
514 case EIO_FSTAT: 599 case EIO_FSTAT:
515 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT; 600 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT;
516 PL_laststatval = req->result; 601 PL_laststatval = req->result;
602 /* if compilation fails here then perl's Stat_t is not struct _stati64 */
517 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 603 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
518 PUSHs (sv_result); 604 PUSHs (sv_result);
519 break; 605 break;
520 606
521 case EIO_READ: 607 case EIO_READ:
… …
526 SvSETMAGIC (req->sv2); 612 SvSETMAGIC (req->sv2);
527 PUSHs (sv_result); 613 PUSHs (sv_result);
528 } 614 }
529 break; 615 break;
530 616
531 case EIO_DUP2: /* EIO_DUP2 actually means aio_close(), su fudge result value */ 617 case EIO_DUP2: /* EIO_DUP2 actually means aio_close(), so fudge result value */
532 if (req->result > 0) 618 if (req->result > 0)
533 SvIV_set (sv_result, 0); 619 SvIV_set (sv_result, 0);
534 /* FALLTHROUGH */ 620 /* FALLTHROUGH */
535 621
536 default: 622 default:
… …
573 Safefree (req); 659 Safefree (req);
574} 660}
575 661
576static void req_cancel_subs (aio_req grp) 662static void req_cancel_subs (aio_req grp)
577{ 663{
578 aio_req sub;
579
580 if (grp->type != EIO_GROUP) 664 if (grp->type != EIO_GROUP)
581 return; 665 return;
582 666
583 SvREFCNT_dec (grp->sv2); 667 SvREFCNT_dec (grp->sv2);
584 grp->sv2 = 0; 668 grp->sv2 = 0;
585 669
586 eio_grp_cancel (grp); 670 eio_grp_cancel (grp);
587} 671}
588 672
589static void
590create_respipe (void) 673static void create_respipe (void)
591{ 674{
592 if (s_epipe_renew (&respipe)) 675 if (s_epipe_renew (&respipe))
593 croak ("IO::AIO: unable to initialize result pipe"); 676 croak ("IO::AIO: unable to initialize result pipe");
594} 677}
595 678
… …
626 709
627 poll_wait (); 710 poll_wait ();
628 } 711 }
629} 712}
630 713
631static void atfork_child (void) 714static void ecb_cold
715reinit (void)
632{ 716{
633 create_respipe (); 717 create_respipe ();
718
719 if (eio_init (want_poll, done_poll) < 0)
720 croak ("IO::AIO: unable to initialise eio library");
634} 721}
635 722
636/*****************************************************************************/ 723/*****************************************************************************/
637 724
638#if !_POSIX_MAPPED_FILES 725#if !_POSIX_MAPPED_FILES
639# define mmap(addr,length,prot,flags,fd,offs) (errno = ENOSYS, -1) 726# define mmap(addr,length,prot,flags,fd,offs) (errno = ENOSYS, -1)
640# define munmap(addr,length) (errno = ENOSYS, -1) 727# define munmap(addr,length) (errno = ENOSYS, -1)
728#endif
729
730#if !_POSIX_MEMORY_PROTECTION
641# define mprotect(addr,len,prot) (errno = ENOSYS, -1) 731# define mprotect(addr,len,prot) (errno = ENOSYS, -1)
642# define PROT_NONE 0 732# define PROT_NONE 0
643# define PROT_WRITE 0 733# define PROT_WRITE 0
644# define MAP_PRIVATE 0 734# define MAP_PRIVATE 0
645# define MAP_SHARED 0 735# define MAP_SHARED 0
646# define MAP_FIXED 0 736# define MAP_FIXED 0
647#endif 737#endif
648 738
649#define MMAP_MAGIC PERL_MAGIC_ext 739#define MMAP_MAGIC PERL_MAGIC_ext
650 740
651static int
652mmap_free (pTHX_ SV *sv, MAGIC *mg) 741static int mmap_free (pTHX_ SV *sv, MAGIC *mg)
653{ 742{
654 int old_errno = errno; 743 int old_errno = errno;
655 munmap (mg->mg_ptr, (size_t)mg->mg_obj); 744 munmap (mg->mg_ptr, (size_t)mg->mg_obj);
656 errno = old_errno; 745 errno = old_errno;
657 746
… …
673 0, 0, 0, 0, mmap_free 762 0, 0, 0, 0, mmap_free
674}; 763};
675 764
676/*****************************************************************************/ 765/*****************************************************************************/
677 766
678static SV *
679get_cb (SV *cb_sv) 767static SV * get_cb (SV *cb_sv)
680{ 768{
681 SvGETMAGIC (cb_sv); 769 SvGETMAGIC (cb_sv);
682 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0; 770 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
683} 771}
684 772
… …
725 const_iv (O_RDWR) 813 const_iv (O_RDWR)
726 const_iv (O_CREAT) 814 const_iv (O_CREAT)
727 const_iv (O_TRUNC) 815 const_iv (O_TRUNC)
728 const_iv (O_EXCL) 816 const_iv (O_EXCL)
729 const_iv (O_APPEND) 817 const_iv (O_APPEND)
730#ifndef _WIN32 818
819 const_iv (O_ASYNC)
820 const_iv (O_DIRECT)
821 const_iv (O_NOATIME)
822
823 const_iv (O_CLOEXEC)
824 const_iv (O_NOCTTY)
825 const_iv (O_NOFOLLOW)
826 const_iv (O_NONBLOCK)
827 const_iv (O_EXEC)
828 const_iv (O_SEARCH)
829 const_iv (O_DIRECTORY)
830 const_iv (O_DSYNC)
831 const_iv (O_RSYNC)
832 const_iv (O_SYNC)
833 const_iv (O_TTY_INIT)
834
731 const_iv (S_IFIFO) 835 const_iv (S_IFIFO)
732#endif 836 const_iv (S_IFCHR)
837 const_iv (S_IFBLK)
838 const_iv (S_IFLNK)
839 const_iv (S_IFREG)
840 const_iv (S_IFDIR)
841 const_iv (S_IFWHT)
842 const_iv (S_IFSOCK)
843 const_iv (S_IFMT)
844
733 const_niv (FADV_NORMAL , POSIX_FADV_NORMAL) 845 const_niv (FADV_NORMAL , POSIX_FADV_NORMAL)
734 const_niv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL) 846 const_niv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL)
735 const_niv (FADV_RANDOM , POSIX_FADV_RANDOM) 847 const_niv (FADV_RANDOM , POSIX_FADV_RANDOM)
736 const_niv (FADV_NOREUSE , POSIX_FADV_NOREUSE) 848 const_niv (FADV_NOREUSE , POSIX_FADV_NOREUSE)
737 const_niv (FADV_WILLNEED , POSIX_FADV_WILLNEED) 849 const_niv (FADV_WILLNEED , POSIX_FADV_WILLNEED)
… …
784 896
785 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE) 897 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
786 const_eio (SYNC_FILE_RANGE_WRITE) 898 const_eio (SYNC_FILE_RANGE_WRITE)
787 const_eio (SYNC_FILE_RANGE_WAIT_AFTER) 899 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
788 900
901 const_eio (FALLOC_FL_KEEP_SIZE)
902
789 const_eio (READDIR_DENTS) 903 const_eio (READDIR_DENTS)
790 const_eio (READDIR_DIRS_FIRST) 904 const_eio (READDIR_DIRS_FIRST)
791 const_eio (READDIR_STAT_ORDER) 905 const_eio (READDIR_STAT_ORDER)
792 const_eio (READDIR_FOUND_UNKNOWN) 906 const_eio (READDIR_FOUND_UNKNOWN)
793 907
… …
809 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 923 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
810 newCONSTSUB (aio_stash, (char *)civ->name, newSViv (civ->iv)); 924 newCONSTSUB (aio_stash, (char *)civ->name, newSViv (civ->iv));
811 925
812 newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE)); 926 newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE));
813 927
814 create_respipe (); 928 reinit ();
815
816 if (eio_init (want_poll, done_poll) < 0)
817 croak ("IO::AIO: unable to initialise eio library");
818
819 /* atfork child called in fifo order, so before eio's handler */
820 X_THREAD_ATFORK (0, 0, atfork_child);
821} 929}
822 930
823void 931void
932reinit ()
933 PROTOTYPE:
934 CODE:
935 reinit ();
936
937void
824max_poll_reqs (int nreqs) 938max_poll_reqs (unsigned int nreqs)
825 PROTOTYPE: $ 939 PROTOTYPE: $
826 CODE: 940 CODE:
827 eio_set_max_poll_reqs (nreqs); 941 eio_set_max_poll_reqs (nreqs);
828 942
829void 943void
… …
831 PROTOTYPE: $ 945 PROTOTYPE: $
832 CODE: 946 CODE:
833 eio_set_max_poll_time (nseconds); 947 eio_set_max_poll_time (nseconds);
834 948
835void 949void
836min_parallel (int nthreads) 950min_parallel (unsigned int nthreads)
837 PROTOTYPE: $ 951 PROTOTYPE: $
838 CODE: 952 CODE:
839 eio_set_min_parallel (nthreads); 953 eio_set_min_parallel (nthreads);
840 954
841void 955void
842max_parallel (int nthreads) 956max_parallel (unsigned int nthreads)
843 PROTOTYPE: $ 957 PROTOTYPE: $
844 CODE: 958 CODE:
845 eio_set_max_parallel (nthreads); 959 eio_set_max_parallel (nthreads);
846 960
847void 961void
848max_idle (int nthreads) 962max_idle (unsigned int nthreads)
849 PROTOTYPE: $ 963 PROTOTYPE: $
850 CODE: 964 CODE:
851 eio_set_max_idle (nthreads); 965 eio_set_max_idle (nthreads);
852 966
853void 967void
968idle_timeout (unsigned int seconds)
969 PROTOTYPE: $
970 CODE:
971 eio_set_idle_timeout (seconds);
972
973void
854max_outstanding (int maxreqs) 974max_outstanding (unsigned int maxreqs)
855 PROTOTYPE: $ 975 PROTOTYPE: $
856 CODE: 976 CODE:
857 max_outstanding = maxreqs; 977 max_outstanding = maxreqs;
858 978
859void 979void
… …
904 1024
905 REQ_SEND (req); 1025 REQ_SEND (req);
906} 1026}
907 1027
908void 1028void
1029aio_fallocate (SV *fh, int mode, off_t offset, size_t len, SV *callback=&PL_sv_undef)
1030 PPCODE:
1031{
1032 int fd = s_fileno_croak (fh, 0);
1033 dREQ;
1034
1035 req->type = EIO_FALLOCATE;
1036 req->sv1 = newSVsv (fh);
1037 req->int1 = fd;
1038 req->int2 = mode;
1039 req->offs = offset;
1040 req->size = len;
1041
1042 REQ_SEND (req);
1043}
1044
1045void
909aio_close (SV *fh, SV *callback=&PL_sv_undef) 1046aio_close (SV *fh, SV *callback=&PL_sv_undef)
910 PPCODE: 1047 PPCODE:
911{ 1048{
912 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 1049 static int close_fd = -1; /* dummy fd to close fds via dup2 */
913 int fd = s_fileno_croak (fh, 0); 1050 int fd = s_fileno_croak (fh, 0);
914 dREQ; 1051 dREQ;
915 1052
916 if (close_pipe < 0) 1053 if (expect_false (close_fd < 0))
917 { 1054 {
918 int pipefd [2]; 1055 int pipefd [2];
919 1056
1057 if (
1058#ifdef _WIN32
1059 _pipe (pipefd, 1, _O_BINARY) < 0
1060#else
920 if (pipe (pipefd) < 0 1061 pipe (pipefd) < 0
921 || close (pipefd [1]) < 0
922 || fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0) 1062 || fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0
1063#endif
1064 || close (pipefd [1]) < 0
1065 )
923 abort (); /*D*/ 1066 abort (); /*D*/
924 1067
925 close_pipe = pipefd [0]; 1068 close_fd = pipefd [0];
926 } 1069 }
927 1070
928 req->type = EIO_DUP2; 1071 req->type = EIO_DUP2;
929 req->int1 = close_pipe; 1072 req->int1 = close_fd;
930 req->sv2 = newSVsv (fh); 1073 req->sv2 = newSVsv (fh);
931 req->int2 = fd; 1074 req->int2 = fd;
932 1075
933 REQ_SEND (req); 1076 REQ_SEND (req);
934} 1077}
… …
986 } 1129 }
987} 1130}
988 1131
989void 1132void
990aio_readlink (SV8 *path, SV *callback=&PL_sv_undef) 1133aio_readlink (SV8 *path, SV *callback=&PL_sv_undef)
1134 ALIAS:
1135 aio_readlink = EIO_READLINK
1136 aio_realpath = EIO_REALPATH
991 PPCODE: 1137 PPCODE:
992{ 1138{
993 SV *data;
994 dREQ; 1139 dREQ;
995 1140
996 req->type = EIO_READLINK; 1141 req->type = ix;
997 req->sv1 = newSVsv (path); 1142 req->sv1 = newSVsv (path);
998 req->ptr1 = SvPVbyte_nolen (req->sv1); 1143 req->ptr1 = SvPVbyte_nolen (req->sv1);
999 1144
1000 REQ_SEND; 1145 REQ_SEND;
1001} 1146}
… …
1059 } 1204 }
1060 1205
1061 REQ_SEND; 1206 REQ_SEND;
1062} 1207}
1063 1208
1209UV
1210major (UV dev)
1211 ALIAS:
1212 minor = 1
1213 CODE:
1214 RETVAL = ix ? major (dev) : minor (dev);
1215 OUTPUT:
1216 RETVAL
1217
1218UV
1219makedev (UV maj, UV min)
1220 CODE:
1221 RETVAL = makedev (maj, min);
1222 OUTPUT:
1223 RETVAL
1224
1064void 1225void
1065aio_utime (SV8 *fh_or_path, SV *atime, SV *mtime, SV *callback=&PL_sv_undef) 1226aio_utime (SV8 *fh_or_path, SV *atime, SV *mtime, SV *callback=&PL_sv_undef)
1066 PPCODE: 1227 PPCODE:
1067{ 1228{
1068 dREQ; 1229 dREQ;
… …
1523 if (!SvOK (length) || len + offset > svlen) 1684 if (!SvOK (length) || len + offset > svlen)
1524 len = svlen - offset; 1685 len = svlen - offset;
1525 1686
1526 addr = (void *)(((intptr_t)addr) + offset); 1687 addr = (void *)(((intptr_t)addr) + offset);
1527 eio_page_align (&addr, &len); 1688 eio_page_align (&addr, &len);
1528#if _POSIX_MEMLOCK 1689#if _POSIX_MEMLOCK_RANGE
1529 RETVAL = munlock (addr, len); 1690 RETVAL = munlock (addr, len);
1530#else 1691#else
1531 RETVAL = ((errno = ENOSYS), -1); 1692 RETVAL = ((errno = ENOSYS), -1);
1532#endif 1693#endif
1533} 1694}

Diff Legend

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