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.172 by root, Sun Sep 12 03:36:27 2010 UTC vs.
Revision 1.196 by root, Tue Sep 27 00:41:51 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
108 102
109typedef SV SV8; /* byte-sv, used for argument-checking */ 103typedef SV SV8; /* byte-sv, used for argument-checking */
110typedef int aio_rfd; /* read file desriptor */ 104typedef int aio_rfd; /* read file desriptor */
111typedef int aio_wfd; /* write file descriptor */ 105typedef int aio_wfd; /* write file descriptor */
112 106
113static HV *aio_stash, *aio_req_stash, *aio_grp_stash; 107static HV *aio_stash, *aio_req_stash, *aio_grp_stash, *aio_wd_stash;
114 108
115#define EIO_REQ_MEMBERS \ 109#define EIO_REQ_MEMBERS \
116 SV *callback; \ 110 SV *callback; \
117 SV *sv1, *sv2; \ 111 SV *sv1, *sv2; \
112 SV *sv3, *sv4; \
118 STRLEN stroffset; \ 113 STRLEN stroffset; \
119 SV *self; 114 SV *self;
120 115
121#define EIO_NO_WRAPPERS 1 116#define EIO_NO_WRAPPERS 1
122 117
118#include "libeio/config.h"
123#include "libeio/eio.h" 119#include "libeio/eio.h"
120
121static int req_invoke (eio_req *req);
122#define EIO_FINISH(req) req_invoke (req)
123static void req_destroy (eio_req *grp);
124#define EIO_DESTROY(req) req_destroy (req)
125
126#include "libeio/eio.c"
127
128/* Linux/others */
129#ifndef O_ASYNC
130# define O_ASYNC 0
131#endif
132#ifndef O_DIRECT
133# define O_DIRECT 0
134#endif
135#ifndef O_NOATIME
136# define O_NOATIME 0
137#endif
138
139/* POSIX */
140#ifndef O_CLOEXEC
141# define O_CLOEXEC 0
142#endif
143#ifndef O_NOFOLLOW
144# define O_NOFOLLOW 0
145#endif
146#ifndef O_NOCTTY
147# define O_NOCTTY 0
148#endif
149#ifndef O_NONBLOCK
150# define O_NONBLOCK 0
151#endif
152#ifndef O_EXEC
153# define O_EXEC 0
154#endif
155#ifndef O_SEARCH
156# define O_SEARCH 0
157#endif
158#ifndef O_DIRECTORY
159# define O_DIRECTORY 0
160#endif
161#ifndef O_DSYNC
162# define O_DSYNC 0
163#endif
164#ifndef O_RSYNC
165# define O_RSYNC 0
166#endif
167#ifndef O_SYNC
168# define O_SYNC 0
169#endif
170#ifndef O_TTY_INIT
171# define O_TTY_INIT 0
172#endif
124 173
125#ifndef POSIX_FADV_NORMAL 174#ifndef POSIX_FADV_NORMAL
126# define POSIX_FADV_NORMAL 0 175# define POSIX_FADV_NORMAL 0
127# define NO_FADVISE 1
128#endif 176#endif
129#ifndef POSIX_FADV_SEQUENTIAL 177#ifndef POSIX_FADV_SEQUENTIAL
130# define POSIX_FADV_SEQUENTIAL 0 178# define POSIX_FADV_SEQUENTIAL 0
131#endif 179#endif
132#ifndef POSIX_FADV_RANDOM 180#ifndef POSIX_FADV_RANDOM
140#endif 188#endif
141#ifndef POSIX_FADV_DONTNEED 189#ifndef POSIX_FADV_DONTNEED
142# define POSIX_FADV_DONTNEED 0 190# define POSIX_FADV_DONTNEED 0
143#endif 191#endif
144 192
145#if _XOPEN_SOURCE < 600 || NO_FADVISE 193#if !HAVE_POSIX_FADVISE
146# define posix_fadvise(a,b,c,d) errno = ENOSYS /* also return ENOSYS */ 194# define posix_fadvise(a,b,c,d) errno = ENOSYS /* also return ENOSYS */
147#endif 195#endif
148 196
149#ifndef POSIX_MADV_NORMAL 197#ifndef POSIX_MADV_NORMAL
150# define POSIX_MADV_NORMAL 0 198# define POSIX_MADV_NORMAL 0
151# define NO_MADVISE 1
152#endif 199#endif
153#ifndef POSIX_MADV_SEQUENTIAL 200#ifndef POSIX_MADV_SEQUENTIAL
154# define POSIX_MADV_SEQUENTIAL 0 201# define POSIX_MADV_SEQUENTIAL 0
155#endif 202#endif
156#ifndef POSIX_MADV_RANDOM 203#ifndef POSIX_MADV_RANDOM
161#endif 208#endif
162#ifndef POSIX_MADV_DONTNEED 209#ifndef POSIX_MADV_DONTNEED
163# define POSIX_MADV_DONTNEED 0 210# define POSIX_MADV_DONTNEED 0
164#endif 211#endif
165 212
166#if _XOPEN_SOURCE < 600 || NO_MADVISE 213#if !HAVE_POSIX_MADVISE
167# define posix_madvise(a,b,c) errno = ENOSYS /* also return ENOSYS */ 214# define posix_madvise(a,b,c) errno = ENOSYS /* also return ENOSYS */
168#endif 215#endif
169 216
170#ifndef PROT_NONE 217#ifndef PROT_NONE
171# define PROT_NONE 0 218# define PROT_NONE 0
178#endif 225#endif
179#ifndef PROT_EXEC 226#ifndef PROT_EXEC
180# define PROT_EXEC 0 227# define PROT_EXEC 0
181#endif 228#endif
182 229
230#ifndef ST_RDONLY
231# define ST_RDONLY 0
232#endif
233#ifndef ST_NOSUID
234# define ST_NOSUID 0
235#endif
183#ifndef ST_NODEV 236#ifndef ST_NODEV
184# define ST_NODEV 0 237# define ST_NODEV 0
185#endif 238#endif
186#ifndef ST_NOEXEC 239#ifndef ST_NOEXEC
187# define ST_NOEXEC 0 240# define ST_NOEXEC 0
207#ifndef ST_NODIRATIME 260#ifndef ST_NODIRATIME
208# define ST_NODIRATIME 0 261# define ST_NODIRATIME 0
209#endif 262#endif
210#ifndef ST_RELATIME 263#ifndef ST_RELATIME
211# define ST_RELATIME 0 264# define ST_RELATIME 0
265#endif
266
267#ifndef S_IFIFO
268# define S_IFIFO 0
269#endif
270#ifndef S_IFCHR
271# define S_IFCHR 0
272#endif
273#ifndef S_IFBLK
274# define S_IFBLK 0
275#endif
276#ifndef S_IFLNK
277# define S_IFLNK 0
278#endif
279#ifndef S_IFREG
280# define S_IFREG 0
281#endif
282#ifndef S_IFDIR
283# define S_IFDIR 0
284#endif
285#ifndef S_IFWHT
286# define S_IFWHT 0
287#endif
288#ifndef S_IFSOCK
289# define S_IFSOCK 0
212#endif 290#endif
213 291
214#ifndef MAP_ANONYMOUS 292#ifndef MAP_ANONYMOUS
215# ifdef MAP_ANON 293# ifdef MAP_ANON
216# define MAP_ANONYMOUS MAP_ANON 294# define MAP_ANONYMOUS MAP_ANON
232#endif 310#endif
233#ifndef MAP_NONBLOCK 311#ifndef MAP_NONBLOCK
234# define MAP_NONBLOCK 0 312# define MAP_NONBLOCK 0
235#endif 313#endif
236 314
315#ifndef makedev
316# define makedev(maj,min) (((maj) << 8) | (min))
317#endif
318#ifndef major
319# define major(dev) ((dev) >> 8)
320#endif
321#ifndef minor
322# define minor(dev) ((dev) & 0xff)
323#endif
324
237#ifndef PAGESIZE 325#ifndef PAGESIZE
238# define PAGESIZE sysconf (_SC_PAGESIZE) 326# define PAGESIZE sysconf (_SC_PAGESIZE)
239#endif 327#endif
240
241static int req_invoke (eio_req *req);
242#define EIO_FINISH(req) req_invoke (req)
243static void req_destroy (eio_req *grp);
244#define EIO_DESTROY(req) req_destroy (req)
245 328
246enum { 329enum {
247 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ 330 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
248}; 331};
249 332
250#include "libeio/eio.c"
251
252typedef eio_req *aio_req; 333typedef eio_req *aio_req;
253typedef eio_req *aio_req_ornot; 334typedef eio_req *aio_req_ornot;
335typedef eio_wd aio_wd;
254 336
255static SV *on_next_submit; 337static SV *on_next_submit;
256static int next_pri = EIO_PRI_DEFAULT; 338static int next_pri = EIO_PRI_DEFAULT;
257static int max_outstanding; 339static int max_outstanding;
258 340
283 } 365 }
284 366
285 return sv_2mortal (sv_bless (newRV_inc (req->self), stash)); 367 return sv_2mortal (sv_bless (newRV_inc (req->self), stash));
286} 368}
287 369
370static SV *
371newSVaio_wd (aio_wd wd)
372{
373 return sv_bless (newRV_noinc (newSViv ((long)wd)), aio_wd_stash);
374}
375
288static aio_req SvAIO_REQ (SV *sv) 376static aio_req SvAIO_REQ (SV *sv)
289{ 377{
290 MAGIC *mg; 378 MAGIC *mg;
291 379
292 if (!SvROK (sv) 380 if (!SvROK (sv)
296 croak ("object of class IO::AIO::REQ expected"); 384 croak ("object of class IO::AIO::REQ expected");
297 385
298 mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 386 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
299 387
300 return mg ? (aio_req)mg->mg_ptr : 0; 388 return mg ? (aio_req)mg->mg_ptr : 0;
389}
390
391static aio_wd SvAIO_WD (SV *sv)
392{
393 if (!SvROK (sv)
394 || SvSTASH (SvRV (sv)) != aio_wd_stash
395 || SvTYPE (SvRV (sv)) != SVt_PVMG)
396 croak ("IO::AIO: expected a working directory object as returned by aio_wd");
397
398 return (aio_wd)(long)SvIVX (SvRV (sv));
301} 399}
302 400
303static void aio_grp_feed (aio_req grp) 401static void aio_grp_feed (aio_req grp)
304{ 402{
305 if (grp->sv2 && SvOK (grp->sv2)) 403 if (grp->sv2 && SvOK (grp->sv2))
354 /* do not recreate the result IV from scratch each time */ 452 /* do not recreate the result IV from scratch each time */
355 if (expect_true (sv_result_cache)) 453 if (expect_true (sv_result_cache))
356 { 454 {
357 sv_result = sv_result_cache; sv_result_cache = 0; 455 sv_result = sv_result_cache; sv_result_cache = 0;
358 SvIV_set (sv_result, req->result); 456 SvIV_set (sv_result, req->result);
457 SvIOK_only (sv_result);
359 } 458 }
360 else 459 else
361 { 460 {
362 sv_result = newSViv (req->result); 461 sv_result = newSViv (req->result);
363 SvREADONLY_on (sv_result); 462 SvREADONLY_on (sv_result);
364 } 463 }
365 464
366 switch (req->type) 465 switch (req->type)
367 { 466 {
467 case EIO_WD_OPEN:
468 PUSHs (sv_2mortal (newSVaio_wd (req->wd)));
469 break;
470
368 case EIO_READDIR: 471 case EIO_READDIR:
369 { 472 {
370 SV *rv = &PL_sv_undef; 473 SV *rv = &PL_sv_undef;
371 474
372 if (req->result >= 0) 475 if (req->result >= 0)
460 case EIO_STATVFS: 563 case EIO_STATVFS:
461 case EIO_FSTATVFS: 564 case EIO_FSTATVFS:
462 { 565 {
463 SV *rv = &PL_sv_undef; 566 SV *rv = &PL_sv_undef;
464 567
568#ifndef _WIN32
465 if (req->result >= 0) 569 if (req->result >= 0)
466 { 570 {
467 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req); 571 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req);
468 HV *hv = newHV (); 572 HV *hv = newHV ();
469 573
479 hv_store (hv, "favail" , sizeof ("favail" ) - 1, newSVval64 (f->f_favail ), 0); 583 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); 584 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); 585 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); 586 hv_store (hv, "namemax", sizeof ("namemax") - 1, newSVval64 (f->f_namemax), 0);
483 } 587 }
588#endif
484 589
485 PUSHs (rv); 590 PUSHs (rv);
486 } 591 }
487 592
488 break; 593 break;
504 case EIO_NOP: 609 case EIO_NOP:
505 case EIO_BUSY: 610 case EIO_BUSY:
506 break; 611 break;
507 612
508 case EIO_READLINK: 613 case EIO_READLINK:
614 case EIO_REALPATH:
509 if (req->result > 0) 615 if (req->result > 0)
510 PUSHs (sv_2mortal (newSVpvn (req->ptr2, req->result))); 616 PUSHs (sv_2mortal (newSVpvn (req->ptr2, req->result)));
511 break; 617 break;
512 618
513 case EIO_STAT: 619 case EIO_STAT:
514 case EIO_LSTAT: 620 case EIO_LSTAT:
515 case EIO_FSTAT: 621 case EIO_FSTAT:
516 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT; 622 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT;
517 PL_laststatval = req->result; 623 PL_laststatval = req->result;
624 /* if compilation fails here then perl's Stat_t is not struct _stati64 */
518 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 625 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
519 PUSHs (sv_result); 626 PUSHs (sv_result);
520 break; 627 break;
521 628
522 case EIO_READ: 629 case EIO_READ:
527 SvSETMAGIC (req->sv2); 634 SvSETMAGIC (req->sv2);
528 PUSHs (sv_result); 635 PUSHs (sv_result);
529 } 636 }
530 break; 637 break;
531 638
532 case EIO_DUP2: /* EIO_DUP2 actually means aio_close(), su fudge result value */ 639 case EIO_DUP2: /* EIO_DUP2 actually means aio_close(), so fudge result value */
533 if (req->result > 0) 640 if (req->result > 0)
534 SvIV_set (sv_result, 0); 641 SvIV_set (sv_result, 0);
535 /* FALLTHROUGH */ 642 /* FALLTHROUGH */
536 643
537 default: 644 default:
567 SvREFCNT_dec (req->self); 674 SvREFCNT_dec (req->self);
568 } 675 }
569 676
570 SvREFCNT_dec (req->sv1); 677 SvREFCNT_dec (req->sv1);
571 SvREFCNT_dec (req->sv2); 678 SvREFCNT_dec (req->sv2);
679 SvREFCNT_dec (req->sv3);
680 SvREFCNT_dec (req->sv4);
572 SvREFCNT_dec (req->callback); 681 SvREFCNT_dec (req->callback);
573 682
574 Safefree (req); 683 Safefree (req);
575} 684}
576 685
577static void req_cancel_subs (aio_req grp) 686static void req_cancel_subs (aio_req grp)
578{ 687{
579 aio_req sub;
580
581 if (grp->type != EIO_GROUP) 688 if (grp->type != EIO_GROUP)
582 return; 689 return;
583 690
584 SvREFCNT_dec (grp->sv2); 691 SvREFCNT_dec (grp->sv2);
585 grp->sv2 = 0; 692 grp->sv2 = 0;
586 693
587 eio_grp_cancel (grp); 694 eio_grp_cancel (grp);
588} 695}
589 696
590static void
591create_respipe (void) 697static void create_respipe (void)
592{ 698{
593 if (s_epipe_renew (&respipe)) 699 if (s_epipe_renew (&respipe))
594 croak ("IO::AIO: unable to initialize result pipe"); 700 croak ("IO::AIO: unable to initialize result pipe");
595} 701}
596 702
627 733
628 poll_wait (); 734 poll_wait ();
629 } 735 }
630} 736}
631 737
632static void atfork_child (void) 738static void ecb_cold
739reinit (void)
633{ 740{
634 create_respipe (); 741 create_respipe ();
742
743 if (eio_init (want_poll, done_poll) < 0)
744 croak ("IO::AIO: unable to initialise eio library");
635} 745}
636 746
637/*****************************************************************************/ 747/*****************************************************************************/
638 748
639#if !_POSIX_MAPPED_FILES 749#if !_POSIX_MAPPED_FILES
640# define mmap(addr,length,prot,flags,fd,offs) (errno = ENOSYS, -1) 750# define mmap(addr,length,prot,flags,fd,offs) (errno = ENOSYS, -1)
641# define munmap(addr,length) (errno = ENOSYS, -1) 751# define munmap(addr,length) (errno = ENOSYS, -1)
752#endif
753
754#if !_POSIX_MEMORY_PROTECTION
642# define mprotect(addr,len,prot) (errno = ENOSYS, -1) 755# define mprotect(addr,len,prot) (errno = ENOSYS, -1)
756# define PROT_NONE 0
757# define PROT_WRITE 0
758# define MAP_PRIVATE 0
759# define MAP_SHARED 0
760# define MAP_FIXED 0
643#endif 761#endif
644 762
645#define MMAP_MAGIC PERL_MAGIC_ext 763#define MMAP_MAGIC PERL_MAGIC_ext
646 764
647static int
648mmap_free (pTHX_ SV *sv, MAGIC *mg) 765static int mmap_free (pTHX_ SV *sv, MAGIC *mg)
649{ 766{
650 int old_errno = errno; 767 int old_errno = errno;
651 munmap (mg->mg_ptr, (size_t)mg->mg_obj); 768 munmap (mg->mg_ptr, (size_t)mg->mg_obj);
652 errno = old_errno; 769 errno = old_errno;
653 770
669 0, 0, 0, 0, mmap_free 786 0, 0, 0, 0, mmap_free
670}; 787};
671 788
672/*****************************************************************************/ 789/*****************************************************************************/
673 790
674static SV *
675get_cb (SV *cb_sv) 791static SV * get_cb (SV *cb_sv)
676{ 792{
677 SvGETMAGIC (cb_sv); 793 SvGETMAGIC (cb_sv);
678 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0; 794 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
679} 795}
680 796
698 req_submit (req); \ 814 req_submit (req); \
699 SPAGAIN; \ 815 SPAGAIN; \
700 \ 816 \
701 if (GIMME_V != G_VOID) \ 817 if (GIMME_V != G_VOID) \
702 XPUSHs (req_sv (req, aio_req_stash)); 818 XPUSHs (req_sv (req, aio_req_stash));
819
820static void
821req_set_path (aio_req req, SV *path, SV **wdsv, SV **pathsv, eio_wd *wd, void **ptr)
822{
823 if (SvROK (path))
824 {
825 AV *av = (AV *)SvRV (path);
826 SV *wdob;
827
828 if (SvTYPE (av) != SVt_PVAV || AvFILLp (av) != 1)
829 croak ("IO::AIO: pathname arguments must be specified as strings or [wd, path] arrayrefs");
830
831 path = AvARRAY (av)[1];
832 wdob = AvARRAY (av)[0];
833
834 if (SvOK (wdob))
835 {
836 *wd = SvAIO_WD (wdob);
837 *wdsv = SvREFCNT_inc_NN (SvRV (wdob));
838 }
839 else
840 *wd = EIO_INVALID_WD;
841 }
842
843 *pathsv = newSVsv (path);
844 *ptr = SvPVbyte_nolen (*pathsv);
845}
846
847static void
848req_set_path1 (aio_req req, SV *path)
849{
850 req_set_path (req, path, &req->sv1, &req->sv3, &req->wd, &req->ptr1);
851}
852
853static void
854req_set_fh_or_path (aio_req req, int type_path, int type_fh, SV *fh_or_path)
855{
856 SV *rv = SvROK (fh_or_path) ? SvRV (fh_or_path) : fh_or_path;
857
858 switch (SvTYPE (rv))
859 {
860 case SVt_PVIO:
861 case SVt_PVLV:
862 case SVt_PVGV:
863 req->type = type_fh;
864 req->sv1 = newSVsv (fh_or_path);
865 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
866 break;
867
868 default:
869 req->type = type_path;
870 req_set_path1 (req, fh_or_path);
871 break;
872 }
873
874}
703 875
704MODULE = IO::AIO PACKAGE = IO::AIO 876MODULE = IO::AIO PACKAGE = IO::AIO
705 877
706PROTOTYPES: ENABLE 878PROTOTYPES: ENABLE
707 879
721 const_iv (O_RDWR) 893 const_iv (O_RDWR)
722 const_iv (O_CREAT) 894 const_iv (O_CREAT)
723 const_iv (O_TRUNC) 895 const_iv (O_TRUNC)
724 const_iv (O_EXCL) 896 const_iv (O_EXCL)
725 const_iv (O_APPEND) 897 const_iv (O_APPEND)
726#ifndef _WIN32 898
899 const_iv (O_ASYNC)
900 const_iv (O_DIRECT)
901 const_iv (O_NOATIME)
902
903 const_iv (O_CLOEXEC)
904 const_iv (O_NOCTTY)
905 const_iv (O_NOFOLLOW)
906 const_iv (O_NONBLOCK)
907 const_iv (O_EXEC)
908 const_iv (O_SEARCH)
909 const_iv (O_DIRECTORY)
910 const_iv (O_DSYNC)
911 const_iv (O_RSYNC)
912 const_iv (O_SYNC)
913 const_iv (O_TTY_INIT)
914
727 const_iv (S_IFIFO) 915 const_iv (S_IFIFO)
728#endif 916 const_iv (S_IFCHR)
917 const_iv (S_IFBLK)
918 const_iv (S_IFLNK)
919 const_iv (S_IFREG)
920 const_iv (S_IFDIR)
921 const_iv (S_IFWHT)
922 const_iv (S_IFSOCK)
923 const_iv (S_IFMT)
924
729 const_niv (FADV_NORMAL , POSIX_FADV_NORMAL) 925 const_niv (FADV_NORMAL , POSIX_FADV_NORMAL)
730 const_niv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL) 926 const_niv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL)
731 const_niv (FADV_RANDOM , POSIX_FADV_RANDOM) 927 const_niv (FADV_RANDOM , POSIX_FADV_RANDOM)
732 const_niv (FADV_NOREUSE , POSIX_FADV_NOREUSE) 928 const_niv (FADV_NOREUSE , POSIX_FADV_NOREUSE)
733 const_niv (FADV_WILLNEED , POSIX_FADV_WILLNEED) 929 const_niv (FADV_WILLNEED , POSIX_FADV_WILLNEED)
780 976
781 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE) 977 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
782 const_eio (SYNC_FILE_RANGE_WRITE) 978 const_eio (SYNC_FILE_RANGE_WRITE)
783 const_eio (SYNC_FILE_RANGE_WAIT_AFTER) 979 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
784 980
981 const_eio (FALLOC_FL_KEEP_SIZE)
982
785 const_eio (READDIR_DENTS) 983 const_eio (READDIR_DENTS)
786 const_eio (READDIR_DIRS_FIRST) 984 const_eio (READDIR_DIRS_FIRST)
787 const_eio (READDIR_STAT_ORDER) 985 const_eio (READDIR_STAT_ORDER)
788 const_eio (READDIR_FOUND_UNKNOWN) 986 const_eio (READDIR_FOUND_UNKNOWN)
789 987
799 }; 997 };
800 998
801 aio_stash = gv_stashpv ("IO::AIO" , 1); 999 aio_stash = gv_stashpv ("IO::AIO" , 1);
802 aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1); 1000 aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1);
803 aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1); 1001 aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1);
1002 aio_wd_stash = gv_stashpv ("IO::AIO::WD" , 1);
804 1003
805 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1004 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
806 newCONSTSUB (aio_stash, (char *)civ->name, newSViv (civ->iv)); 1005 newCONSTSUB (aio_stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
807 1006
808 newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE)); 1007 newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE));
809 1008
810 create_respipe (); 1009 reinit ();
811
812 if (eio_init (want_poll, done_poll) < 0)
813 croak ("IO::AIO: unable to initialise eio library");
814
815 /* atfork child called in fifo order, so before eio's handler */
816 X_THREAD_ATFORK (0, 0, atfork_child);
817} 1010}
818 1011
819void 1012void
1013reinit ()
1014 PROTOTYPE:
1015
1016void
820max_poll_reqs (int nreqs) 1017max_poll_reqs (unsigned int nreqs)
821 PROTOTYPE: $ 1018 PROTOTYPE: $
822 CODE: 1019 CODE:
823 eio_set_max_poll_reqs (nreqs); 1020 eio_set_max_poll_reqs (nreqs);
824 1021
825void 1022void
827 PROTOTYPE: $ 1024 PROTOTYPE: $
828 CODE: 1025 CODE:
829 eio_set_max_poll_time (nseconds); 1026 eio_set_max_poll_time (nseconds);
830 1027
831void 1028void
832min_parallel (int nthreads) 1029min_parallel (unsigned int nthreads)
833 PROTOTYPE: $ 1030 PROTOTYPE: $
834 CODE: 1031 CODE:
835 eio_set_min_parallel (nthreads); 1032 eio_set_min_parallel (nthreads);
836 1033
837void 1034void
838max_parallel (int nthreads) 1035max_parallel (unsigned int nthreads)
839 PROTOTYPE: $ 1036 PROTOTYPE: $
840 CODE: 1037 CODE:
841 eio_set_max_parallel (nthreads); 1038 eio_set_max_parallel (nthreads);
842 1039
843void 1040void
844max_idle (int nthreads) 1041max_idle (unsigned int nthreads)
845 PROTOTYPE: $ 1042 PROTOTYPE: $
846 CODE: 1043 CODE:
847 eio_set_max_idle (nthreads); 1044 eio_set_max_idle (nthreads);
848 1045
849void 1046void
1047idle_timeout (unsigned int seconds)
1048 PROTOTYPE: $
1049 CODE:
1050 eio_set_idle_timeout (seconds);
1051
1052void
850max_outstanding (int maxreqs) 1053max_outstanding (unsigned int maxreqs)
851 PROTOTYPE: $ 1054 PROTOTYPE: $
852 CODE: 1055 CODE:
853 max_outstanding = maxreqs; 1056 max_outstanding = maxreqs;
854 1057
855void 1058void
1059aio_wd (SV8 *pathname, SV *callback=&PL_sv_undef)
1060 PPCODE:
1061{
1062 dREQ;
1063
1064 req->type = EIO_WD_OPEN;
1065 req_set_path1 (req, pathname);
1066
1067 REQ_SEND;
1068}
1069
1070void
856aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef) 1071aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef)
857 PPCODE: 1072 PPCODE:
858{ 1073{
859 dREQ; 1074 dREQ;
860 1075
861 req->type = EIO_OPEN; 1076 req->type = EIO_OPEN;
862 req->sv1 = newSVsv (pathname); 1077 req_set_path1 (req, pathname);
863 req->ptr1 = SvPVbyte_nolen (req->sv1);
864 req->int1 = flags; 1078 req->int1 = flags;
865 req->int2 = mode; 1079 req->int2 = mode;
866 1080
867 REQ_SEND; 1081 REQ_SEND;
868} 1082}
870void 1084void
871aio_fsync (SV *fh, SV *callback=&PL_sv_undef) 1085aio_fsync (SV *fh, SV *callback=&PL_sv_undef)
872 ALIAS: 1086 ALIAS:
873 aio_fsync = EIO_FSYNC 1087 aio_fsync = EIO_FSYNC
874 aio_fdatasync = EIO_FDATASYNC 1088 aio_fdatasync = EIO_FDATASYNC
1089 aio_syncfs = EIO_SYNCFS
875 PPCODE: 1090 PPCODE:
876{ 1091{
877 int fd = s_fileno_croak (fh, 0); 1092 int fd = s_fileno_croak (fh, 0);
878 dREQ; 1093 dREQ;
879 1094
900 1115
901 REQ_SEND (req); 1116 REQ_SEND (req);
902} 1117}
903 1118
904void 1119void
1120aio_fallocate (SV *fh, int mode, off_t offset, size_t len, SV *callback=&PL_sv_undef)
1121 PPCODE:
1122{
1123 int fd = s_fileno_croak (fh, 0);
1124 dREQ;
1125
1126 req->type = EIO_FALLOCATE;
1127 req->sv1 = newSVsv (fh);
1128 req->int1 = fd;
1129 req->int2 = mode;
1130 req->offs = offset;
1131 req->size = len;
1132
1133 REQ_SEND (req);
1134}
1135
1136void
905aio_close (SV *fh, SV *callback=&PL_sv_undef) 1137aio_close (SV *fh, SV *callback=&PL_sv_undef)
906 PPCODE: 1138 PPCODE:
907{ 1139{
908 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 1140 static int close_fd = -1; /* dummy fd to close fds via dup2 */
909 int fd = s_fileno_croak (fh, 0); 1141 int fd = s_fileno_croak (fh, 0);
910 dREQ; 1142 dREQ;
911 1143
912 if (close_pipe < 0) 1144 if (expect_false (close_fd < 0))
913 { 1145 {
914 int pipefd [2]; 1146 int pipefd [2];
915 1147
1148 if (
1149#ifdef _WIN32
1150 _pipe (pipefd, 1, _O_BINARY) < 0
1151#else
916 if (pipe (pipefd) < 0 1152 pipe (pipefd) < 0
917 || close (pipefd [1]) < 0
918 || fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0) 1153 || fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0
1154#endif
1155 || close (pipefd [1]) < 0
1156 )
919 abort (); /*D*/ 1157 abort (); /*D*/
920 1158
921 close_pipe = pipefd [0]; 1159 close_fd = pipefd [0];
922 } 1160 }
923 1161
924 req->type = EIO_DUP2; 1162 req->type = EIO_DUP2;
925 req->int1 = close_pipe; 1163 req->int1 = close_fd;
926 req->sv2 = newSVsv (fh); 1164 req->sv2 = newSVsv (fh);
927 req->int2 = fd; 1165 req->int2 = fd;
928 1166
929 REQ_SEND (req); 1167 REQ_SEND (req);
930} 1168}
981 REQ_SEND; 1219 REQ_SEND;
982 } 1220 }
983} 1221}
984 1222
985void 1223void
986aio_readlink (SV8 *path, SV *callback=&PL_sv_undef) 1224aio_readlink (SV8 *pathname, SV *callback=&PL_sv_undef)
1225 ALIAS:
1226 aio_readlink = EIO_READLINK
1227 aio_realpath = EIO_REALPATH
987 PPCODE: 1228 PPCODE:
988{ 1229{
989 SV *data;
990 dREQ; 1230 dREQ;
991 1231
992 req->type = EIO_READLINK; 1232 req->type = ix;
993 req->sv1 = newSVsv (path); 1233 req_set_path1 (req, pathname);
994 req->ptr1 = SvPVbyte_nolen (req->sv1);
995 1234
996 REQ_SEND; 1235 REQ_SEND;
997} 1236}
998 1237
999void 1238void
1040 PPCODE: 1279 PPCODE:
1041{ 1280{
1042 dREQ; 1281 dREQ;
1043 1282
1044 req->sv1 = newSVsv (fh_or_path); 1283 req->sv1 = newSVsv (fh_or_path);
1045 1284 req_set_fh_or_path (req, ix, ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT, fh_or_path);
1046 if (SvPOK (req->sv1))
1047 {
1048 req->type = ix;
1049 req->ptr1 = SvPVbyte_nolen (req->sv1);
1050 }
1051 else
1052 {
1053 req->type = ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT;
1054 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1055 }
1056
1057 REQ_SEND; 1285 REQ_SEND;
1058} 1286}
1287
1288UV
1289major (UV dev)
1290 ALIAS:
1291 minor = 1
1292 CODE:
1293 RETVAL = ix ? major (dev) : minor (dev);
1294 OUTPUT:
1295 RETVAL
1296
1297UV
1298makedev (UV maj, UV min)
1299 CODE:
1300 RETVAL = makedev (maj, min);
1301 OUTPUT:
1302 RETVAL
1059 1303
1060void 1304void
1061aio_utime (SV8 *fh_or_path, SV *atime, SV *mtime, SV *callback=&PL_sv_undef) 1305aio_utime (SV8 *fh_or_path, SV *atime, SV *mtime, SV *callback=&PL_sv_undef)
1062 PPCODE: 1306 PPCODE:
1063{ 1307{
1064 dREQ; 1308 dREQ;
1065 1309
1066 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 1310 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
1067 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; 1311 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
1068 req->sv1 = newSVsv (fh_or_path); 1312 req_set_fh_or_path (req, EIO_UTIME, EIO_FUTIME, fh_or_path);
1069
1070 if (SvPOK (req->sv1))
1071 {
1072 req->type = EIO_UTIME;
1073 req->ptr1 = SvPVbyte_nolen (req->sv1);
1074 }
1075 else
1076 {
1077 req->type = EIO_FUTIME;
1078 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1079 }
1080 1313
1081 REQ_SEND; 1314 REQ_SEND;
1082} 1315}
1083 1316
1084void 1317void
1085aio_truncate (SV8 *fh_or_path, SV *offset, SV *callback=&PL_sv_undef) 1318aio_truncate (SV8 *fh_or_path, SV *offset, SV *callback=&PL_sv_undef)
1086 PPCODE: 1319 PPCODE:
1087{ 1320{
1088 dREQ; 1321 dREQ;
1089 1322
1090 req->sv1 = newSVsv (fh_or_path);
1091 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 1323 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
1092 1324 req_set_fh_or_path (req, EIO_TRUNCATE, EIO_FTRUNCATE, fh_or_path);
1093 if (SvPOK (req->sv1))
1094 {
1095 req->type = EIO_TRUNCATE;
1096 req->ptr1 = SvPVbyte_nolen (req->sv1);
1097 }
1098 else
1099 {
1100 req->type = EIO_FTRUNCATE;
1101 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1102 }
1103 1325
1104 REQ_SEND; 1326 REQ_SEND;
1105} 1327}
1106 1328
1107void 1329void
1112 PPCODE: 1334 PPCODE:
1113{ 1335{
1114 dREQ; 1336 dREQ;
1115 1337
1116 req->int2 = mode; 1338 req->int2 = mode;
1117 req->sv1 = newSVsv (fh_or_path); 1339 req_set_fh_or_path (req, EIO_CHMOD, EIO_FCHMOD, fh_or_path);
1118
1119 if (SvPOK (req->sv1))
1120 {
1121 req->type = ix;
1122 req->ptr1 = SvPVbyte_nolen (req->sv1);
1123 }
1124 else
1125 {
1126 req->type = EIO_FCHMOD;
1127 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1128 }
1129 1340
1130 REQ_SEND; 1341 REQ_SEND;
1131} 1342}
1132 1343
1133void 1344void
1136{ 1347{
1137 dREQ; 1348 dREQ;
1138 1349
1139 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 1350 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
1140 req->int3 = SvOK (gid) ? SvIV (gid) : -1; 1351 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
1141 req->sv1 = newSVsv (fh_or_path); 1352 req_set_fh_or_path (req, EIO_CHOWN, EIO_FCHOWN, fh_or_path);
1142
1143 if (SvPOK (req->sv1))
1144 {
1145 req->type = EIO_CHOWN;
1146 req->ptr1 = SvPVbyte_nolen (req->sv1);
1147 }
1148 else
1149 {
1150 req->type = EIO_FCHOWN;
1151 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1152 }
1153 1353
1154 REQ_SEND; 1354 REQ_SEND;
1155} 1355}
1156 1356
1157void 1357void
1180 PPCODE: 1380 PPCODE:
1181{ 1381{
1182 dREQ; 1382 dREQ;
1183 1383
1184 req->type = ix; 1384 req->type = ix;
1185 req->sv1 = newSVsv (pathname); 1385 req_set_path1 (req, pathname);
1186 req->ptr1 = SvPVbyte_nolen (req->sv1);
1187 1386
1188 REQ_SEND; 1387 REQ_SEND;
1189} 1388}
1190 1389
1191void 1390void
1195 aio_symlink = EIO_SYMLINK 1394 aio_symlink = EIO_SYMLINK
1196 aio_rename = EIO_RENAME 1395 aio_rename = EIO_RENAME
1197 PPCODE: 1396 PPCODE:
1198{ 1397{
1199 dREQ; 1398 dREQ;
1399 eio_wd wd2;
1200 1400
1201 req->type = ix; 1401 req->type = ix;
1202 req->sv1 = newSVsv (oldpath); 1402 req_set_path1 (req, oldpath);
1203 req->ptr1 = SvPVbyte_nolen (req->sv1); 1403 req_set_path (req, newpath, &req->sv2, &req->sv4, &wd2, &req->ptr2);
1204 req->sv2 = newSVsv (newpath); 1404 req->int3 = (long)wd2;
1205 req->ptr2 = SvPVbyte_nolen (req->sv2);
1206 1405
1207 REQ_SEND; 1406 REQ_SEND;
1208} 1407}
1209 1408
1210void 1409void
1212 PPCODE: 1411 PPCODE:
1213{ 1412{
1214 dREQ; 1413 dREQ;
1215 1414
1216 req->type = EIO_MKNOD; 1415 req->type = EIO_MKNOD;
1217 req->sv1 = newSVsv (pathname);
1218 req->ptr1 = SvPVbyte_nolen (req->sv1);
1219 req->int2 = (mode_t)mode; 1416 req->int2 = (mode_t)mode;
1220 req->offs = dev; 1417 req->offs = dev;
1418 req_set_path1 (req, pathname);
1221 1419
1222 REQ_SEND; 1420 REQ_SEND;
1223} 1421}
1224 1422
1225void 1423void
1257 1455
1258void 1456void
1259aio_mlock (SV8 *data, IV offset = 0, SV *length = &PL_sv_undef, SV *callback=&PL_sv_undef) 1457aio_mlock (SV8 *data, IV offset = 0, SV *length = &PL_sv_undef, SV *callback=&PL_sv_undef)
1260 PPCODE: 1458 PPCODE:
1261{ 1459{
1262
1263 STRLEN svlen; 1460 STRLEN svlen;
1264 char *svptr = SvPVbyte (data, svlen); 1461 char *svptr = SvPVbyte (data, svlen);
1265 UV len = SvUV (length); 1462 UV len = SvUV (length);
1266 1463
1267 if (offset < 0) 1464 if (offset < 0)
1426 CODE: 1623 CODE:
1427 RETVAL = posix_fadvise (fh, offset, length, advice); 1624 RETVAL = posix_fadvise (fh, offset, length, advice);
1428 OUTPUT: 1625 OUTPUT:
1429 RETVAL 1626 RETVAL
1430 1627
1431ssize_t 1628IV
1432sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count) 1629sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
1433 CODE: 1630 CODE:
1434 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count); 1631 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count);
1435 OUTPUT: 1632 OUTPUT:
1436 RETVAL 1633 RETVAL
1520 if (!SvOK (length) || len + offset > svlen) 1717 if (!SvOK (length) || len + offset > svlen)
1521 len = svlen - offset; 1718 len = svlen - offset;
1522 1719
1523 addr = (void *)(((intptr_t)addr) + offset); 1720 addr = (void *)(((intptr_t)addr) + offset);
1524 eio_page_align (&addr, &len); 1721 eio_page_align (&addr, &len);
1525#if _POSIX_MEMLOCK 1722#if _POSIX_MEMLOCK_RANGE
1526 RETVAL = munlock (addr, len); 1723 RETVAL = munlock (addr, len);
1527#else 1724#else
1528 RETVAL = ((errno = ENOSYS), -1); 1725 RETVAL = ((errno = ENOSYS), -1);
1529#endif 1726#endif
1530} 1727}
1548 SvREFCNT_dec (on_next_submit); 1745 SvREFCNT_dec (on_next_submit);
1549 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1746 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1550 1747
1551PROTOTYPES: DISABLE 1748PROTOTYPES: DISABLE
1552 1749
1750MODULE = IO::AIO PACKAGE = IO::AIO::WD
1751
1752BOOT:
1753{
1754 newCONSTSUB (aio_stash, "CWD" , newSVaio_wd (EIO_CWD ));
1755 newCONSTSUB (aio_stash, "INVALID_WD", newSVaio_wd (EIO_INVALID_WD));
1756}
1757
1758void
1759DESTROY (SV *self)
1760 CODE:
1761{
1762 aio_wd wd = SvAIO_WD (self);
1763#if HAVE_AT
1764 SV *callback = &PL_sv_undef;
1765 dREQ; /* clobbers next_pri :/ */
1766 req->type = EIO_WD_CLOSE;
1767 req->wd = wd;
1768 REQ_SEND;
1769#else
1770 eio_wd_close_sync (wd);
1771#endif
1772}
1773
1553MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1774MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1554 1775
1555void 1776void
1556cancel (aio_req_ornot req) 1777cancel (aio_req_ornot req)
1557 CODE: 1778 CODE:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines