ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libeio/eio.c
(Generate patch)

Comparing libeio/eio.c (file contents):
Revision 1.136 by root, Thu Jun 25 17:05:07 2015 UTC vs.
Revision 1.144 by root, Tue Dec 27 09:58:44 2016 UTC

1/* 1/*
2 * libeio implementation 2 * libeio implementation
3 * 3 *
4 * Copyright (c) 2007,2008,2009,2010,2011,2012,2013 Marc Alexander Lehmann <libeio@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010,2011,2012,2013,2016 Marc Alexander Lehmann <libeio@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
42#endif 42#endif
43 43
44#include "eio.h" 44#include "eio.h"
45#include "ecb.h" 45#include "ecb.h"
46 46
47#ifdef EIO_STACKSIZE
48# define X_STACKSIZE EIO_STACKSIZE
49#endif
50#include "xthread.h"
51
52#include <errno.h> 47#include <errno.h>
53#include <stddef.h> 48#include <stddef.h>
54#include <stdlib.h> 49#include <stdlib.h>
55#include <string.h> 50#include <string.h>
56#include <errno.h> 51#include <errno.h>
… …
122 #define chmod(path,mode) _chmod (path, mode) 117 #define chmod(path,mode) _chmod (path, mode)
123 #define dup(fd) _dup (fd) 118 #define dup(fd) _dup (fd)
124 #define dup2(fd1,fd2) _dup2 (fd1, fd2) 119 #define dup2(fd1,fd2) _dup2 (fd1, fd2)
125 #define pipe(fds) _pipe (fds, 4096, O_BINARY) 120 #define pipe(fds) _pipe (fds, 4096, O_BINARY)
126 121
122 #define fcntl(fd,cmd,arg) EIO_ENOSYS ()
123 #define ioctl(fd,cmd,arg) EIO_ENOSYS ()
127 #define fchmod(fd,mode) EIO_ENOSYS () 124 #define fchmod(fd,mode) EIO_ENOSYS ()
128 #define chown(path,uid,gid) EIO_ENOSYS () 125 #define chown(path,uid,gid) EIO_ENOSYS ()
129 #define fchown(fd,uid,gid) EIO_ENOSYS () 126 #define fchown(fd,uid,gid) EIO_ENOSYS ()
130 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */ 127 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */
131 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */ 128 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */
… …
204 /* we could even stat and see if it exists */ 201 /* we could even stat and see if it exists */
205 static int 202 static int
206 symlink (const char *old, const char *neu) 203 symlink (const char *old, const char *neu)
207 { 204 {
208 #if WINVER >= 0x0600 205 #if WINVER >= 0x0600
206 int flags;
207
208 /* This tries out all combinations of SYMBOLIC_LINK_FLAG_DIRECTORY
209 * and SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE,
210 * with directory first.
211 */
212 for (flags = 3; flags >= 0; --flags)
209 if (CreateSymbolicLink (neu, old, 1)) 213 if (CreateSymbolicLink (neu, old, flags))
210 return 0; 214 return 0;
211
212 if (CreateSymbolicLink (neu, old, 0))
213 return 0;
214 #endif 215 #endif
215 216
216 return EIO_ERRNO (ENOENT, -1); 217 return EIO_ERRNO (ENOENT, -1);
217 } 218 }
218 219
… …
281# include <utime.h> 282# include <utime.h>
282#endif 283#endif
283 284
284#if HAVE_SYS_SYSCALL_H 285#if HAVE_SYS_SYSCALL_H
285# include <sys/syscall.h> 286# include <sys/syscall.h>
286#endif
287
288#if HAVE_SYS_PRCTL_H
289# include <sys/prctl.h>
290#endif 287#endif
291 288
292#if HAVE_SENDFILE 289#if HAVE_SENDFILE
293# if __linux 290# if __linux
294# include <sys/sendfile.h> 291# include <sys/sendfile.h>
… …
319# define NAME_MAX 4096 316# define NAME_MAX 4096
320#endif 317#endif
321 318
322/* used for readlink etc. */ 319/* used for readlink etc. */
323#ifndef PATH_MAX 320#ifndef PATH_MAX
324# define PATH_MAX 4096 321# define PATH_MAX 0
325#endif 322#endif
323
324#ifndef EIO_PATH_MIN
325# define EIO_PATH_MIN 8160
326#endif
327
328#define EIO_PATH_MAX (PATH_MAX <= EIO_PATH_MIN ? EIO_PATH_MIN : PATH_MAX)
326 329
327/* buffer size for various temporary buffers */ 330/* buffer size for various temporary buffers */
328#define EIO_BUFSIZE 65536 331#define EIO_BUFSIZE 65536
329 332
330#define dBUF \ 333#define dBUF \
… …
366#define ETP_PRI_MAX EIO_PRI_MAX 369#define ETP_PRI_MAX EIO_PRI_MAX
367 370
368#define ETP_TYPE_QUIT -1 371#define ETP_TYPE_QUIT -1
369#define ETP_TYPE_GROUP EIO_GROUP 372#define ETP_TYPE_GROUP EIO_GROUP
370 373
374static void eio_nop_callback (void) { }
375static void (*eio_want_poll_cb)(void) = eio_nop_callback;
376static void (*eio_done_poll_cb)(void) = eio_nop_callback;
377
378#define ETP_WANT_POLL(pool) eio_want_poll_cb ()
379#define ETP_DONE_POLL(pool) eio_done_poll_cb ()
380
371struct etp_worker; 381struct etp_worker;
372
373#define ETP_REQ eio_req 382#define ETP_REQ eio_req
374#define ETP_DESTROY(req) eio_destroy (req) 383#define ETP_DESTROY(req) eio_destroy (req)
375static int eio_finish (eio_req *req); 384static int eio_finish (eio_req *req);
376#define ETP_FINISH(req) eio_finish (req) 385#define ETP_FINISH(req) eio_finish (req)
377static void eio_execute (struct etp_worker *self, eio_req *req); 386static void eio_execute (struct etp_worker *self, eio_req *req);
378#define ETP_EXECUTE(wrk,req) eio_execute (wrk, req) 387#define ETP_EXECUTE(wrk,req) eio_execute (wrk, req)
379 388
380#include "etp.c" 389#include "etp.c"
390
391static struct etp_pool eio_pool;
392#define EIO_POOL (&eio_pool)
381 393
382/*****************************************************************************/ 394/*****************************************************************************/
383 395
384static void 396static void
385grp_try_feed (eio_req *grp) 397grp_try_feed (eio_req *grp)
… …
452} 464}
453 465
454void 466void
455eio_grp_cancel (eio_req *grp) 467eio_grp_cancel (eio_req *grp)
456{ 468{
457 etp_grp_cancel (grp); 469 etp_grp_cancel (EIO_POOL, grp);
458} 470}
459 471
460void 472void
461eio_cancel (eio_req *req) 473eio_cancel (eio_req *req)
462{ 474{
463 etp_cancel (req); 475 etp_cancel (EIO_POOL, req);
464} 476}
465 477
466void 478void
467eio_submit (eio_req *req) 479eio_submit (eio_req *req)
468{ 480{
469 etp_submit (req); 481 etp_submit (EIO_POOL, req);
470} 482}
471 483
472unsigned int 484unsigned int
473eio_nreqs (void) 485eio_nreqs (void)
474{ 486{
475 return etp_nreqs (); 487 return etp_nreqs (EIO_POOL);
476} 488}
477 489
478unsigned int 490unsigned int
479eio_nready (void) 491eio_nready (void)
480{ 492{
481 return etp_nready (); 493 return etp_nready (EIO_POOL);
482} 494}
483 495
484unsigned int 496unsigned int
485eio_npending (void) 497eio_npending (void)
486{ 498{
487 return etp_npending (); 499 return etp_npending (EIO_POOL);
488} 500}
489 501
490unsigned int ecb_cold 502unsigned int ecb_cold
491eio_nthreads (void) 503eio_nthreads (void)
492{ 504{
493 return etp_nthreads (); 505 return etp_nthreads (EIO_POOL);
494} 506}
495 507
496void ecb_cold 508void ecb_cold
497eio_set_max_poll_time (double nseconds) 509eio_set_max_poll_time (double nseconds)
498{ 510{
499 etp_set_max_poll_time (nseconds); 511 etp_set_max_poll_time (EIO_POOL, nseconds);
500} 512}
501 513
502void ecb_cold 514void ecb_cold
503eio_set_max_poll_reqs (unsigned int maxreqs) 515eio_set_max_poll_reqs (unsigned int maxreqs)
504{ 516{
505 etp_set_max_poll_reqs (maxreqs); 517 etp_set_max_poll_reqs (EIO_POOL, maxreqs);
506} 518}
507 519
508void ecb_cold 520void ecb_cold
509eio_set_max_idle (unsigned int nthreads) 521eio_set_max_idle (unsigned int nthreads)
510{ 522{
511 etp_set_max_idle (nthreads); 523 etp_set_max_idle (EIO_POOL, nthreads);
512} 524}
513 525
514void ecb_cold 526void ecb_cold
515eio_set_idle_timeout (unsigned int seconds) 527eio_set_idle_timeout (unsigned int seconds)
516{ 528{
517 etp_set_idle_timeout (seconds); 529 etp_set_idle_timeout (EIO_POOL, seconds);
518} 530}
519 531
520void ecb_cold 532void ecb_cold
521eio_set_min_parallel (unsigned int nthreads) 533eio_set_min_parallel (unsigned int nthreads)
522{ 534{
523 etp_set_min_parallel (nthreads); 535 etp_set_min_parallel (EIO_POOL, nthreads);
524} 536}
525 537
526void ecb_cold 538void ecb_cold
527eio_set_max_parallel (unsigned int nthreads) 539eio_set_max_parallel (unsigned int nthreads)
528{ 540{
529 etp_set_max_parallel (nthreads); 541 etp_set_max_parallel (EIO_POOL, nthreads);
530} 542}
531 543
532int eio_poll (void) 544int eio_poll (void)
533{ 545{
534 return etp_poll (); 546 return etp_poll (EIO_POOL);
535} 547}
536 548
537/*****************************************************************************/ 549/*****************************************************************************/
538/* work around various missing functions */ 550/* work around various missing functions */
539 551
… …
968 980
969 errno = ENOENT; 981 errno = ENOENT;
970 if (!*rel) 982 if (!*rel)
971 return -1; 983 return -1;
972 984
973 res = etp_tmpbuf_get (tmpbuf, PATH_MAX * 3); 985 res = etp_tmpbuf_get (tmpbuf, EIO_PATH_MAX * 3);
974#ifdef _WIN32 986#ifdef _WIN32
975 if (_access (rel, 4) != 0) 987 if (_access (rel, 4) != 0)
976 return -1; 988 return -1;
977 989
978 symlinks = GetFullPathName (rel, PATH_MAX * 3, res, 0); 990 symlinks = GetFullPathName (rel, EIO_PATH_MAX * 3, res, 0);
979 991
980 errno = ENAMETOOLONG; 992 errno = ENAMETOOLONG;
981 if (symlinks >= PATH_MAX * 3) 993 if (symlinks >= EIO_PATH_MAX * 3)
982 return -1; 994 return -1;
983 995
984 errno = EIO; 996 errno = EIO;
985 if (symlinks <= 0) 997 if (symlinks <= 0)
986 return -1; 998 return -1;
987 999
988 return symlinks; 1000 return symlinks;
989 1001
990#else 1002#else
991 tmp1 = res + PATH_MAX; 1003 tmp1 = res + EIO_PATH_MAX;
992 tmp2 = tmp1 + PATH_MAX; 1004 tmp2 = tmp1 + EIO_PATH_MAX;
993 1005
994#if 0 /* disabled, the musl way to do things is just too racy */ 1006#if 0 /* disabled, the musl way to do things is just too racy */
995#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME) 1007#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
996 /* on linux we may be able to ask the kernel */ 1008 /* on linux we may be able to ask the kernel */
997 { 1009 {
998 int fd = open (rel, O_RDONLY | O_NONBLOCK | O_NOCTTY | O_NOATIME); 1010 int fd = open (rel, O_RDONLY | O_NONBLOCK | O_NOCTTY | O_NOATIME);
999 1011
1000 if (fd >= 0) 1012 if (fd >= 0)
1001 { 1013 {
1002 sprintf (tmp1, "/proc/self/fd/%d", fd); 1014 sprintf (tmp1, "/proc/self/fd/%d", fd);
1003 req->result = readlink (tmp1, res, PATH_MAX); 1015 req->result = readlink (tmp1, res, EIO_PATH_MAX);
1004 /* here we should probably stat the open file and the disk file, to make sure they still match */ 1016 /* here we should probably stat the open file and the disk file, to make sure they still match */
1005 close (fd); 1017 close (fd);
1006 1018
1007 if (req->result > 0) 1019 if (req->result > 0)
1008 goto done; 1020 goto done;
… …
1021 if (wd == EIO_INVALID_WD) 1033 if (wd == EIO_INVALID_WD)
1022 return -1; 1034 return -1;
1023 1035
1024 if (wd == EIO_CWD) 1036 if (wd == EIO_CWD)
1025 { 1037 {
1026 if (!getcwd (res, PATH_MAX)) 1038 if (!getcwd (res, EIO_PATH_MAX))
1027 return -1; 1039 return -1;
1028 1040
1029 len = strlen (res); 1041 len = strlen (res);
1030 } 1042 }
1031 else 1043 else
… …
1078 1090
1079 /* zero-terminate, for readlink */ 1091 /* zero-terminate, for readlink */
1080 res [len + 1] = 0; 1092 res [len + 1] = 0;
1081 1093
1082 /* now check if it's a symlink */ 1094 /* now check if it's a symlink */
1083 linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX); 1095 linklen = readlink (tmpbuf->ptr, tmp1, EIO_PATH_MAX);
1084 1096
1085 if (linklen < 0) 1097 if (linklen < 0)
1086 { 1098 {
1087 if (errno != EINVAL) 1099 if (errno != EINVAL)
1088 return -1; 1100 return -1;
… …
1094 { 1106 {
1095 /* yay, it was a symlink - build new path in tmp2 */ 1107 /* yay, it was a symlink - build new path in tmp2 */
1096 int rellen = strlen (rel); 1108 int rellen = strlen (rel);
1097 1109
1098 errno = ENAMETOOLONG; 1110 errno = ENAMETOOLONG;
1099 if (linklen + 1 + rellen >= PATH_MAX) 1111 if (linklen + 1 + rellen >= EIO_PATH_MAX) /* also catch linklen >= EIO_PATH_MAX */
1100 return -1; 1112 return -1;
1101 1113
1102 errno = ELOOP; 1114 errno = ELOOP;
1103 if (!--symlinks) 1115 if (!--symlinks)
1104 return -1; 1116 return -1;
… …
1703/*****************************************************************************/ 1715/*****************************************************************************/
1704 1716
1705#define ALLOC(len) \ 1717#define ALLOC(len) \
1706 if (!req->ptr2) \ 1718 if (!req->ptr2) \
1707 { \ 1719 { \
1708 X_LOCK (wrklock); \ 1720 X_LOCK (EIO_POOL->wrklock); \
1709 req->flags |= EIO_FLAG_PTR2_FREE; \ 1721 req->flags |= EIO_FLAG_PTR2_FREE; \
1710 X_UNLOCK (wrklock); \ 1722 X_UNLOCK (EIO_POOL->wrklock); \
1711 req->ptr2 = malloc (len); \ 1723 req->ptr2 = malloc (len); \
1712 if (!req->ptr2) \ 1724 if (!req->ptr2) \
1713 { \ 1725 { \
1714 errno = ENOMEM; \ 1726 errno = ENOMEM; \
1715 req->result = -1; \ 1727 req->result = -1; \
… …
1720/*****************************************************************************/ 1732/*****************************************************************************/
1721 1733
1722int ecb_cold 1734int ecb_cold
1723eio_init (void (*want_poll)(void), void (*done_poll)(void)) 1735eio_init (void (*want_poll)(void), void (*done_poll)(void))
1724{ 1736{
1725 return etp_init (want_poll, done_poll); 1737 eio_want_poll_cb = want_poll;
1738 eio_done_poll_cb = done_poll;
1739
1740 return etp_init (EIO_POOL, 0, 0, 0);
1726} 1741}
1727 1742
1728ecb_inline void 1743ecb_inline void
1729eio_api_destroy (eio_req *req) 1744eio_api_destroy (eio_req *req)
1730{ 1745{
… …
1803 ? pread (req->int1, req->ptr2, req->size, req->offs) 1818 ? pread (req->int1, req->ptr2, req->size, req->offs)
1804 : read (req->int1, req->ptr2, req->size); break; 1819 : read (req->int1, req->ptr2, req->size); break;
1805 case EIO_WRITE: req->result = req->offs >= 0 1820 case EIO_WRITE: req->result = req->offs >= 0
1806 ? pwrite (req->int1, req->ptr2, req->size, req->offs) 1821 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
1807 : write (req->int1, req->ptr2, req->size); break; 1822 : write (req->int1, req->ptr2, req->size); break;
1823
1824 case EIO_FCNTL: req->result = fcntl (req->int1, (int) req->int2, req->ptr2); break;
1825 case EIO_IOCTL: req->result = ioctl (req->int1, (unsigned long)req->int2, req->ptr2); break;
1808 1826
1809 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; 1827 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1810 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break; 1828 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
1811 1829
1812#if HAVE_AT 1830#if HAVE_AT
… …
1831 ? rename (req->wd->str, req->ptr2) 1849 ? rename (req->wd->str, req->ptr2)
1832 : renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break; 1850 : renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break;
1833 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break; 1851 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break;
1834 case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break; 1852 case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
1835 case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break; 1853 case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
1836 case EIO_READLINK: ALLOC (PATH_MAX);
1837 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;
1838 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS)); 1854 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1839 req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break; 1855 req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1856 case EIO_READLINK: ALLOC (EIO_PATH_MAX);
1857 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, EIO_PATH_MAX);
1858 if (req->result == EIO_PATH_MAX)
1859 {
1860 req->result = -1;
1861 errno = ENAMETOOLONG;
1862 }
1863 break;
1840 case EIO_UTIME: 1864 case EIO_UTIME:
1841 case EIO_FUTIME: 1865 case EIO_FUTIME:
1842 { 1866 {
1843 struct timespec ts[2]; 1867 struct timespec ts[2];
1844 struct timespec *times; 1868 struct timespec *times;
… …
1877 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break; 1901 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
1878 case EIO_RENAME: req->result = rename (path , req->ptr2); break; 1902 case EIO_RENAME: req->result = rename (path , req->ptr2); break;
1879 case EIO_LINK: req->result = link (path , req->ptr2); break; 1903 case EIO_LINK: req->result = link (path , req->ptr2); break;
1880 case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break; 1904 case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break;
1881 case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break; 1905 case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break;
1882 case EIO_READLINK: ALLOC (PATH_MAX);
1883 req->result = readlink (path, req->ptr2, PATH_MAX); break;
1884 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS)); 1906 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1885 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break; 1907 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
1908 case EIO_READLINK: ALLOC (EIO_PATH_MAX);
1909 req->result = readlink (path, req->ptr2, EIO_PATH_MAX);
1910 if (req->result == EIO_PATH_MAX)
1911 {
1912 req->result = -1;
1913 errno = ENAMETOOLONG;
1914 }
1915 break;
1886 1916
1887 case EIO_UTIME: 1917 case EIO_UTIME:
1888 case EIO_FUTIME: 1918 case EIO_FUTIME:
1889 { 1919 {
1890 struct timeval tv[2]; 1920 struct timeval tv[2];
… …
2073eio_req *eio_write (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data) 2103eio_req *eio_write (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
2074{ 2104{
2075 REQ (EIO_WRITE); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND; 2105 REQ (EIO_WRITE); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;
2076} 2106}
2077 2107
2108eio_req *eio_fcntl (int fd, int cmd, void *arg, int pri, eio_cb cb, void *data)
2109{
2110 REQ (EIO_IOCTL); req->int1 = fd; req->int2 = cmd; req->ptr2 = arg; SEND;
2111}
2112
2113eio_req *eio_ioctl (int fd, unsigned long request, void *buf, int pri, eio_cb cb, void *data)
2114{
2115 REQ (EIO_IOCTL); req->int1 = fd; req->int2 = request; req->ptr2 = buf; SEND;
2116}
2117
2078eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data) 2118eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data)
2079{ 2119{
2080 REQ (EIO_FSTAT); req->int1 = fd; SEND; 2120 REQ (EIO_FSTAT); req->int1 = fd; SEND;
2081} 2121}
2082 2122

Diff Legend

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