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.264 by root, Tue Aug 14 11:44:52 2018 UTC vs.
Revision 1.295 by root, Mon Sep 5 00:03:32 2022 UTC

… …
3#include <errno.h> 3#include <errno.h>
4 4
5#include "EXTERN.h" 5#include "EXTERN.h"
6#include "perl.h" 6#include "perl.h"
7#include "XSUB.h" 7#include "XSUB.h"
8#include "perliol.h"
8 9
9#if !defined mg_findext 10#if !defined mg_findext
10# define mg_findext(sv,type,vtbl) mg_find (sv, type) 11# define mg_findext(sv,type,vtbl) mg_find (sv, type)
11#endif 12#endif
12 13
… …
17#include <sys/socket.h> 18#include <sys/socket.h>
18#include <sys/stat.h> 19#include <sys/stat.h>
19#include <limits.h> 20#include <limits.h>
20#include <fcntl.h> 21#include <fcntl.h>
21#include <sched.h> 22#include <sched.h>
22
23#if HAVE_SYS_SYSMACROS_H
24# include <sys/sysmacros.h>
25#endif
26
27#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
28# include <sys/mman.h>
29#endif
30 23
31/* the incompetent fool that created musl keeps __linux__, refuses 24/* the incompetent fool that created musl keeps __linux__, refuses
32 * to implement any linux standard apis, and also has no way to test 25 * to implement any linux standard apis, and also has no way to test
33 * for his broken iplementation. don't complain to me if this fails 26 * for his broken iplementation. don't complain to me if this fails
34 * for you. 27 * for you.
… …
82 #undef fchmod 75 #undef fchmod
83 #undef dup 76 #undef dup
84 #undef dup2 77 #undef dup2
85 #undef abort 78 #undef abort
86 #undef pipe 79 #undef pipe
80 #undef utime
87 81
88 #define EIO_STRUCT_STAT struct _stati64 82 #define EIO_STRUCT_STAT struct _stati64
89 #define EIO_STRUCT_STATI64 83 #define EIO_STRUCT_STATI64
90 84
91#else 85#else
92 86
93 #include <sys/time.h> 87 #include <sys/time.h>
94 #include <sys/select.h> 88 #include <sys/select.h>
89 #include <sys/wait.h>
95 #include <unistd.h> 90 #include <unistd.h>
96 #include <utime.h> 91 #include <utime.h>
97 #include <signal.h> 92 #include <signal.h>
98 93
99 #define EIO_STRUCT_STAT Stat_t 94 #define EIO_STRUCT_STAT Stat_t
… …
112#define expect_true(expr) expect ((expr) != 0, 1) 107#define expect_true(expr) expect ((expr) != 0, 1)
113 108
114/*****************************************************************************/ 109/*****************************************************************************/
115 110
116#include "config.h" 111#include "config.h"
112
113#if HAVE_SYS_MKDEV_H
114# include <sys/mkdev.h>
115#elif HAVE_SYS_SYSMACROS_H
116# include <sys/sysmacros.h>
117#endif
118
119#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
120# include <sys/mman.h>
121#endif
122
123#if HAVE_SYS_UIO_H
124# include <sys/uio.h>
125#endif
117 126
118#if HAVE_ST_XTIMENSEC 127#if HAVE_ST_XTIMENSEC
119# define ATIMENSEC PL_statcache.st_atimensec 128# define ATIMENSEC PL_statcache.st_atimensec
120# define MTIMENSEC PL_statcache.st_mtimensec 129# define MTIMENSEC PL_statcache.st_mtimensec
121# define CTIMENSEC PL_statcache.st_ctimensec 130# define CTIMENSEC PL_statcache.st_ctimensec
… …
127# define ATIMENSEC 0 136# define ATIMENSEC 0
128# define MTIMENSEC 0 137# define MTIMENSEC 0
129# define CTIMENSEC 0 138# define CTIMENSEC 0
130#endif 139#endif
131 140
141#if HAVE_ST_BIRTHTIMENSEC
142# define BTIMESEC PL_statcache.st_birthtime
143# define BTIMENSEC PL_statcache.st_birthtimensec
144#elif HAVE_ST_BIRTHTIMESPEC
145# define BTIMESEC PL_statcache.st_birthtim.tv_sec
146# define BTIMENSEC PL_statcache.st_birthtim.tv_nsec
147#else
148# define BTIMESEC 0
149# define BTIMENSEC 0
150#endif
151
152#if HAVE_ST_GEN
153# define ST_GEN PL_statcache.st_gen
154#else
155# define ST_GEN 0
156#endif
157
132#include "schmorp.h" 158#include "schmorp.h"
133 159
134#if HAVE_EVENTFD 160#if HAVE_EVENTFD
135# include <sys/eventfd.h> 161# include <sys/eventfd.h>
136#endif 162#endif
… …
192#endif 218#endif
193#ifndef minor 219#ifndef minor
194# define minor(dev) ((dev) & 0xff) 220# define minor(dev) ((dev) & 0xff)
195#endif 221#endif
196 222
223/* solaris has a non-posix/unix compliant PAGESIZE that breaks compilation */
224#ifdef __sun
225# undef PAGESIZE
226#endif
227
197#if PAGESIZE <= 0 228#if PAGESIZE <= 0
198# define PAGESIZE sysconf (_SC_PAGESIZE) 229# define PAGESIZE sysconf (_SC_PAGESIZE)
230#endif
231
232/* solaris perl seems to declare a wrong syscall function that clashes with system includes */
233#ifdef __sun
234# undef HAVE_SYSCALL
235#endif
236
237#if HAVE_SYSCALL
238#include <sys/syscall.h>
239#else
240# define syscall(nr,...) (errno = ENOSYS, -1)
199#endif 241#endif
200 242
201/*****************************************************************************/ 243/*****************************************************************************/
202 244
203#if !_POSIX_MAPPED_FILES 245#if !_POSIX_MAPPED_FILES
… …
263}; 305};
264 306
265/*****************************************************************************/ 307/*****************************************************************************/
266 308
267/* helper: set scalar to foreign ptr with custom free */ 309/* helper: set scalar to foreign ptr with custom free */
310ecb_noinline
268static void 311static void
269sv_set_foreign (SV *sv, const MGVTBL *const vtbl, void *addr, IV length) 312sv_set_foreign (SV *sv, const MGVTBL *const vtbl, void *addr, IV length)
270{ 313{
271 sv_force_normal (sv); 314 sv_force_normal (sv);
272 315
… …
313 int count = req->int3; 356 int count = req->int3;
314 357
315 req->flags |= EIO_FLAG_PTR1_FREE; 358 req->flags |= EIO_FLAG_PTR1_FREE;
316 359
317 /* heuristic: start with 512 bytes (8 extents), and if that isn't enough, */ 360 /* heuristic: start with 512 bytes (8 extents), and if that isn't enough, */
318 /* increase in 3.5kb steps */ 361 /* increase in fixed steps */
319 if (count < 0) 362 if (count < 0)
320 count = 8; 363 count = 8;
321 364
322 fiemap = malloc (sizeof (*fiemap) + sizeof (struct fiemap_extent) * count); 365 fiemap = malloc (sizeof (*fiemap) + sizeof (struct fiemap_extent) * count);
323 errno = ENOMEM; 366 errno = ENOMEM;
… …
376 419
377 for (count = 0; count < incmap->fm_mapped_extents; ++count) 420 for (count = 0; count < incmap->fm_mapped_extents; ++count)
378 { 421 {
379 struct fiemap_extent *e = incmap->fm_extents + count; 422 struct fiemap_extent *e = incmap->fm_extents + count;
380 423
424 fiemap->fm_extents [fiemap->fm_mapped_extents++] = *e;
425
381 if (e->fe_logical + e->fe_length >= end_offset) 426 if (e->fe_logical >= end_offset)
382 goto done; 427 goto done;
383
384 fiemap->fm_extents [fiemap->fm_mapped_extents++] = *e;
385 428
386 if (e->fe_flags & FIEMAP_EXTENT_LAST) 429 if (e->fe_flags & FIEMAP_EXTENT_LAST)
387 goto done; 430 goto done;
388 431
389 } 432 }
… …
396 errno = ENOSYS; 439 errno = ENOSYS;
397#endif 440#endif
398} 441}
399 442
400/*****************************************************************************/ 443/*****************************************************************************/
444
445static int close_fd; /* dummy fd to close fds via dup2 */
446
447#if HAVE_STATX
448static struct statx stx;
449#define statx_offsetof(member) offsetof (struct statx, member)
450#define eio__statx statx
451#else
452#define statx_offsetof(member) 0
453#define eio__statx(dir,path,flags,mask,stx) EIO_ENOSYS()
454#endif
401 455
402enum { 456enum {
403 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ 457 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
404}; 458};
405 459
… …
429 /* read any signals sent by the worker threads */ 483 /* read any signals sent by the worker threads */
430 s_epipe_drain (&respipe); 484 s_epipe_drain (&respipe);
431} 485}
432 486
433/* must be called at most once */ 487/* must be called at most once */
488ecb_noinline
434static SV * 489static SV *
435req_sv (aio_req req, HV *stash) 490req_sv (aio_req req, HV *stash)
436{ 491{
437 if (!req->self) 492 if (!req->self)
438 { 493 {
… …
447newSVaio_wd (aio_wd wd) 502newSVaio_wd (aio_wd wd)
448{ 503{
449 return sv_bless (newRV_noinc (newSViv ((intptr_t)wd)), aio_wd_stash); 504 return sv_bless (newRV_noinc (newSViv ((intptr_t)wd)), aio_wd_stash);
450} 505}
451 506
507ecb_noinline
452static aio_req 508static aio_req
453SvAIO_REQ (SV *sv) 509SvAIO_REQ (SV *sv)
454{ 510{
455 MAGIC *mg; 511 MAGIC *mg;
456 512
… …
519 FREETMPS; 575 FREETMPS;
520 LEAVE; 576 LEAVE;
521 } 577 }
522} 578}
523 579
580ecb_noinline
524static void 581static void
525req_submit (eio_req *req) 582req_submit (eio_req *req)
526{ 583{
527 eio_submit (req); 584 eio_submit (req);
528 585
… …
789 } 846 }
790 else 847 else
791 PUSHs (sv_result); 848 PUSHs (sv_result);
792 break; 849 break;
793 850
851#if 0
852 case EIO_CLOSE:
853 PerlIOUnix_refcnt_dec (req->int1);
854 break;
855#endif
856
794 case EIO_DUP2: /* EIO_DUP2 actually means aio_close(), so fudge result value */ 857 case EIO_DUP2: /* EIO_DUP2 actually means aio_close(), so fudge result value */
795 if (req->result > 0) 858 if (req->result > 0)
796 SvIV_set (sv_result, 0); 859 SvIV_set (sv_result, 0);
797 /* FALLTHROUGH */ 860 /* FALLTHROUGH */
798 861
… …
849 grp->sv2 = 0; 912 grp->sv2 = 0;
850 913
851 eio_grp_cancel (grp); 914 eio_grp_cancel (grp);
852} 915}
853 916
854static void ecb_cold 917ecb_cold
918static void
855create_respipe (void) 919create_respipe (void)
856{ 920{
857 if (s_epipe_renew (&respipe)) 921 if (s_epipe_renew (&respipe))
858 croak ("IO::AIO: unable to initialize result pipe"); 922 croak ("IO::AIO: unable to initialize result pipe");
859} 923}
… …
893 957
894 poll_wait (); 958 poll_wait ();
895 } 959 }
896} 960}
897 961
898static void ecb_cold 962ecb_cold
963static void
899reinit (void) 964reinit (void)
900{ 965{
901 create_respipe (); 966 create_respipe ();
902 967
903 if (eio_init (want_poll, done_poll) < 0) 968 if (eio_init (want_poll, done_poll) < 0)
… …
911{ 976{
912 SvGETMAGIC (cb_sv); 977 SvGETMAGIC (cb_sv);
913 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0; 978 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
914} 979}
915 980
981ecb_noinline
916static aio_req ecb_noinline 982static aio_req ecb_noinline
917dreq (SV *callback) 983dreq (SV *callback)
918{ 984{
919 SV *cb_cv; 985 SV *cb_cv;
920 aio_req req; 986 aio_req req;
… …
942 SPAGAIN; \ 1008 SPAGAIN; \
943 \ 1009 \
944 if (GIMME_V != G_VOID) \ 1010 if (GIMME_V != G_VOID) \
945 XPUSHs (req_sv (req, aio_req_stash)); 1011 XPUSHs (req_sv (req, aio_req_stash));
946 1012
1013/* *wdsv, *pathsv, *wd and *ptr must be 0-initialized */
947ecb_inline void 1014ecb_inline
1015void
948req_set_path (aio_req req, SV *path, SV **wdsv, SV **pathsv, eio_wd *wd, void **ptr) 1016req_set_path (SV *path, SV **wdsv, SV **pathsv, eio_wd *wd, void **ptr)
949{ 1017{
950 if (expect_false (SvROK (path))) 1018 if (expect_false (SvROK (path)))
951 { 1019 {
952 SV *rv = SvRV (path); 1020 SV *rv = SvRV (path);
953 SV *wdob; 1021 SV *wdob;
… …
978 1046
979 *pathsv = newSVsv (path); 1047 *pathsv = newSVsv (path);
980 *ptr = SvPVbyte_nolen (*pathsv); 1048 *ptr = SvPVbyte_nolen (*pathsv);
981} 1049}
982 1050
983static void ecb_noinline 1051ecb_noinline
1052static void
984req_set_path1 (aio_req req, SV *path) 1053req_set_path1 (aio_req req, SV *path)
985{ 1054{
986 req_set_path (req, path, &req->sv1, &req->sv3, &req->wd, &req->ptr1); 1055 req_set_path (path, &req->sv1, &req->sv3, &req->wd, &req->ptr1);
987} 1056}
988 1057
989static void ecb_noinline 1058ecb_noinline
1059static void
990req_set_fh_or_path (aio_req req, int type_path, int type_fh, SV *fh_or_path) 1060req_set_fh_or_path (aio_req req, int type_path, int type_fh, SV *fh_or_path)
991{ 1061{
992 SV *rv = SvROK (fh_or_path) ? SvRV (fh_or_path) : fh_or_path; 1062 SV *rv = SvROK (fh_or_path) ? SvRV (fh_or_path) : fh_or_path;
993 1063
994 switch (SvTYPE (rv)) 1064 switch (SvTYPE (rv))
… …
1019 1089
1020static NV 1090static NV
1021ts_get (const struct timespec *ts) 1091ts_get (const struct timespec *ts)
1022{ 1092{
1023 return ts->tv_sec + ts->tv_nsec * 1e-9; 1093 return ts->tv_sec + ts->tv_nsec * 1e-9;
1094}
1095
1096/*****************************************************************************/
1097
1098/* extract a ref-to-array of strings into a temporary c style string vector */
1099static char **
1100extract_stringvec (SV *sv, const char *croakmsg)
1101{
1102 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
1103 croak (croakmsg);
1104
1105 AV *av = (AV *)SvRV (sv);
1106 int i, nelem = av_len (av) + 1;
1107 char **vecp = (char **)SvPVX (sv_2mortal (newSV (sizeof (char *) * (nelem + 1))));
1108
1109 for (i = 0; i < nelem; ++i)
1110 {
1111 SV **e = av_fetch (av, i, 0);
1112
1113 if (e && *e)
1114 vecp[i] = SvPVbyte_nolen (*e);
1115 else
1116 vecp[i] = "";
1117 }
1118
1119 vecp[nelem] = 0;
1120
1121 return vecp;
1024} 1122}
1025 1123
1026/*****************************************************************************/ 1124/*****************************************************************************/
1027 1125
1028XS(boot_IO__AIO) ecb_cold; 1126XS(boot_IO__AIO) ecb_cold;
… …
1133 const_iv (MAP_NONBLOCK) 1231 const_iv (MAP_NONBLOCK)
1134 const_iv (MAP_GROWSDOWN) 1232 const_iv (MAP_GROWSDOWN)
1135 const_iv (MAP_32BIT) 1233 const_iv (MAP_32BIT)
1136 const_iv (MAP_HUGETLB) 1234 const_iv (MAP_HUGETLB)
1137 const_iv (MAP_STACK) 1235 const_iv (MAP_STACK)
1236 const_iv (MAP_FIXED_NOREPLACE)
1237 const_iv (MAP_SHARED_VALIDATE)
1238 const_iv (MAP_SYNC)
1239 const_iv (MAP_UNINITIALIZED)
1138 1240
1139 const_iv (MREMAP_MAYMOVE) 1241 const_iv (MREMAP_MAYMOVE)
1140 const_iv (MREMAP_FIXED) 1242 const_iv (MREMAP_FIXED)
1141 1243
1142 const_iv (F_DUPFD_CLOEXEC)
1143
1144 const_iv (MSG_CMSG_CLOEXEC) 1244 const_iv (MSG_CMSG_CLOEXEC)
1145 const_iv (SOCK_CLOEXEC) 1245 const_iv (SOCK_CLOEXEC)
1246
1247 const_iv (F_DUPFD_CLOEXEC)
1248
1249 const_iv (F_ADD_SEALS)
1250 const_iv (F_GET_SEALS)
1251 const_iv (F_SEAL_SEAL)
1252 const_iv (F_SEAL_SHRINK)
1253 const_iv (F_SEAL_GROW)
1254 const_iv (F_SEAL_WRITE)
1146 1255
1147 const_iv (F_OFD_GETLK) 1256 const_iv (F_OFD_GETLK)
1148 const_iv (F_OFD_SETLK) 1257 const_iv (F_OFD_SETLK)
1149 const_iv (F_OFD_GETLKW) 1258 const_iv (F_OFD_GETLKW)
1150 1259
… …
1227 1336
1228 const_iv (EFD_CLOEXEC) 1337 const_iv (EFD_CLOEXEC)
1229 const_iv (EFD_NONBLOCK) 1338 const_iv (EFD_NONBLOCK)
1230 const_iv (EFD_SEMAPHORE) 1339 const_iv (EFD_SEMAPHORE)
1231 1340
1341 const_iv (MFD_CLOEXEC)
1342 const_iv (MFD_ALLOW_SEALING)
1343 const_iv (MFD_HUGETLB)
1344 const_iv (MFD_HUGETLB_2MB)
1345 const_iv (MFD_HUGETLB_1GB)
1346
1232 const_iv (CLOCK_REALTIME) 1347 const_iv (CLOCK_REALTIME)
1233 const_iv (CLOCK_MONOTONIC) 1348 const_iv (CLOCK_MONOTONIC)
1234 const_iv (CLOCK_BOOTTIME) 1349 const_iv (CLOCK_BOOTTIME)
1235 const_iv (CLOCK_REALTIME_ALARM) 1350 const_iv (CLOCK_REALTIME_ALARM)
1236 const_iv (CLOCK_BOOTTIME_ALARM) 1351 const_iv (CLOCK_BOOTTIME_ALARM)
… …
1239 const_iv (TFD_CLOEXEC) 1354 const_iv (TFD_CLOEXEC)
1240 1355
1241 const_iv (TFD_TIMER_ABSTIME) 1356 const_iv (TFD_TIMER_ABSTIME)
1242 const_iv (TFD_TIMER_CANCEL_ON_SET) 1357 const_iv (TFD_TIMER_CANCEL_ON_SET)
1243 1358
1359 const_iv (STATX_TYPE)
1360 const_iv (STATX_MODE)
1361 const_iv (STATX_NLINK)
1362 const_iv (STATX_UID)
1363 const_iv (STATX_GID)
1364 const_iv (STATX_ATIME)
1365 const_iv (STATX_MTIME)
1366 const_iv (STATX_CTIME)
1367 const_iv (STATX_INO)
1368 const_iv (STATX_SIZE)
1369 const_iv (STATX_BLOCKS)
1370 const_iv (STATX_BASIC_STATS)
1371 const_iv (STATX_ALL)
1372 const_iv (STATX_BTIME)
1373 const_iv (STATX_ATTR_COMPRESSED)
1374 const_iv (STATX_ATTR_IMMUTABLE)
1375 const_iv (STATX_ATTR_APPEND)
1376 const_iv (STATX_ATTR_NODUMP)
1377 const_iv (STATX_ATTR_ENCRYPTED)
1378 const_iv (STATX_ATTR_AUTOMOUNT)
1379
1380 const_iv (AT_FDCWD)
1381 const_iv (AT_SYMLINK_NOFOLLOW)
1382 const_iv (AT_EACCESS)
1383 const_iv (AT_REMOVEDIR)
1384 const_iv (AT_SYMLINK_FOLLOW)
1385 const_iv (AT_NO_AUTOMOUNT)
1386 const_iv (AT_EMPTY_PATH)
1387 const_iv (AT_STATX_SYNC_TYPE)
1388 const_iv (AT_STATX_AS_STAT)
1389 const_iv (AT_STATX_FORCE_SYNC)
1390 const_iv (AT_STATX_DONT_SYNC)
1391 const_iv (AT_RECURSIVE)
1392
1393 const_iv (OPEN_TREE_CLONE)
1394
1395 const_iv (FSOPEN_CLOEXEC)
1396
1397 const_iv (FSPICK_CLOEXEC)
1398 const_iv (FSPICK_SYMLINK_NOFOLLOW)
1399 const_iv (FSPICK_NO_AUTOMOUNT)
1400 const_iv (FSPICK_EMPTY_PATH)
1401
1402 const_iv (MOVE_MOUNT_F_SYMLINKS)
1403 const_iv (MOVE_MOUNT_F_AUTOMOUNTS)
1404 const_iv (MOVE_MOUNT_F_EMPTY_PATH)
1405 const_iv (MOVE_MOUNT_T_SYMLINKS)
1406 const_iv (MOVE_MOUNT_T_AUTOMOUNTS)
1407 const_iv (MOVE_MOUNT_T_EMPTY_PATH)
1408
1409 /* waitid */
1410 const_iv (P_PID)
1411 const_iv (P_PIDFD)
1412 const_iv (P_PGID)
1413 const_iv (P_ALL)
1414
1415 const_iv (FSCONFIG_SET_FLAG)
1416 const_iv (FSCONFIG_SET_STRING)
1417 const_iv (FSCONFIG_SET_BINARY)
1418 const_iv (FSCONFIG_SET_PATH)
1419 const_iv (FSCONFIG_SET_PATH_EMPTY)
1420 const_iv (FSCONFIG_SET_FD)
1421 const_iv (FSCONFIG_CMD_CREATE)
1422 const_iv (FSCONFIG_CMD_RECONFIGURE)
1423
1424 const_iv (MOUNT_ATTR_RDONLY)
1425 const_iv (MOUNT_ATTR_NOSUID)
1426 const_iv (MOUNT_ATTR_NODEV)
1427 const_iv (MOUNT_ATTR_NOEXEC)
1428 const_iv (MOUNT_ATTR__ATIME)
1429 const_iv (MOUNT_ATTR_RELATIME)
1430 const_iv (MOUNT_ATTR_NOATIME)
1431 const_iv (MOUNT_ATTR_STRICTATIME)
1432 const_iv (MOUNT_ATTR_NODIRATIME)
1433
1244 /* these are libeio constants, and are independent of gendef0 */ 1434 /* these are libeio constants, and are independent of gendef0 */
1245 const_eio (SEEK_SET) 1435 const_eio (SEEK_SET)
1246 const_eio (SEEK_CUR) 1436 const_eio (SEEK_CUR)
1247 const_eio (SEEK_END) 1437 const_eio (SEEK_END)
1248 1438
1249 const_eio (MCL_FUTURE) 1439 const_eio (MCL_FUTURE)
1250 const_eio (MCL_CURRENT) 1440 const_eio (MCL_CURRENT)
1441 const_eio (MCL_ONFAULT)
1251 1442
1252 const_eio (MS_ASYNC) 1443 const_eio (MS_ASYNC)
1253 const_eio (MS_INVALIDATE) 1444 const_eio (MS_INVALIDATE)
1254 const_eio (MS_SYNC) 1445 const_eio (MS_SYNC)
1255 1446
… …
1294 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--) 1485 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
1295 newCONSTSUB (aio_stash, (char *)civ[-1].name, newSViv (civ[-1].iv)); 1486 newCONSTSUB (aio_stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
1296 1487
1297 newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE)); 1488 newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE));
1298 1489
1490 /* allocate dummy pipe fd for aio_close */
1491 {
1492 int pipefd [2];
1493
1494 if (
1495#ifdef _WIN32
1496 _pipe (pipefd, 1, _O_BINARY) < 0
1497#else
1498 pipe (pipefd) < 0
1499 || fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0
1500#endif
1501 || close (pipefd [1]) < 0
1502 )
1503 croak ("IO::AIO: unable to create dummy pipe for aio_close");
1504
1505 close_fd = pipefd [0];
1506 }
1507
1299 reinit (); 1508 reinit ();
1300} 1509}
1301 1510
1302void 1511void
1303reinit () 1512reinit ()
… …
1425 1634
1426void 1635void
1427aio_close (SV *fh, SV *callback = &PL_sv_undef) 1636aio_close (SV *fh, SV *callback = &PL_sv_undef)
1428 PPCODE: 1637 PPCODE:
1429{ 1638{
1430 static int close_fd = -1; /* dummy fd to close fds via dup2 */
1431 int fd = s_fileno_croak (fh, 0); 1639 int fd = s_fileno_croak (fh, 0);
1432 dREQ; 1640 dREQ;
1641#if 0
1642 /* partially duplicate logic in s_fileno */
1643 SvGETMAGIC (fh);
1433 1644
1434 if (expect_false (close_fd < 0)) 1645 if (SvROK (fh))
1646 {
1647 fh = SvRV (fh);
1648 SvGETMAGIC (fh);
1649 }
1650
1651 if (SvTYPE (fh) == SVt_PVGV)
1435 { 1652 {
1436 int pipefd [2]; 1653 /* perl filehandle */
1654 PerlIOUnix_refcnt_inc (fd);
1655 do_close ((GV *)fh, 1);
1437 1656
1438 if ( 1657 req->type = EIO_CLOSE;
1439#ifdef _WIN32 1658 req->int1 = fd;
1440 _pipe (pipefd, 1, _O_BINARY) < 0 1659 /*req->sv2 = newSVsv (fh);*/ /* since we stole the fd, no need to keep the fh */
1441#else
1442 pipe (pipefd) < 0
1443 || fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0
1444#endif
1445 || close (pipefd [1]) < 0
1446 )
1447 abort (); /*D*/
1448
1449 close_fd = pipefd [0];
1450 } 1660 }
1451 1661 else
1662#endif
1663 {
1664 /* fd number */
1452 req->type = EIO_DUP2; 1665 req->type = EIO_DUP2;
1453 req->int1 = close_fd; 1666 req->int1 = close_fd;
1454 req->sv2 = newSVsv (fh); 1667 req->sv2 = newSVsv (fh);
1455 req->int2 = fd; 1668 req->int2 = fd;
1669 }
1456 1670
1457 REQ_SEND; 1671 REQ_SEND;
1458} 1672}
1459 1673
1460void 1674void
… …
1634} 1848}
1635 1849
1636void 1850void
1637st_xtime () 1851st_xtime ()
1638 ALIAS: 1852 ALIAS:
1639 st_atime = 1 1853 st_atime = 0x01
1640 st_mtime = 2 1854 st_mtime = 0x02
1641 st_ctime = 4 1855 st_ctime = 0x04
1856 st_btime = 0x08
1642 st_xtime = 7 1857 st_xtime = 0x0f
1643 PPCODE: 1858 PPCODE:
1644 EXTEND (SP, 3); 1859 EXTEND (SP, 4);
1645 if (ix & 1) PUSHs (newSVnv (PL_statcache.st_atime + 1e-9 * ATIMENSEC)); 1860 if (ix & 0x01) PUSHs (newSVnv (PL_statcache.st_atime + 1e-9 * ATIMENSEC));
1646 if (ix & 2) PUSHs (newSVnv (PL_statcache.st_mtime + 1e-9 * MTIMENSEC)); 1861 if (ix & 0x02) PUSHs (newSVnv (PL_statcache.st_mtime + 1e-9 * MTIMENSEC));
1647 if (ix & 4) PUSHs (newSVnv (PL_statcache.st_ctime + 1e-9 * CTIMENSEC)); 1862 if (ix & 0x04) PUSHs (newSVnv (PL_statcache.st_ctime + 1e-9 * CTIMENSEC));
1863 if (ix & 0x08) PUSHs (newSVnv (BTIMESEC + 1e-9 * BTIMENSEC));
1648 1864
1649void 1865void
1650st_xtimensec () 1866st_xtimensec ()
1651 ALIAS: 1867 ALIAS:
1652 st_atimensec = 1 1868 st_atimensec = 0x01
1653 st_mtimensec = 2 1869 st_mtimensec = 0x02
1654 st_ctimensec = 4 1870 st_ctimensec = 0x04
1871 st_btimensec = 0x08
1655 st_xtimensec = 7 1872 st_xtimensec = 0x0f
1873 st_btimesec = 0x10
1874 st_gen = 0x20
1656 PPCODE: 1875 PPCODE:
1657 EXTEND (SP, 3); 1876 EXTEND (SP, 4);
1658 if (ix & 1) PUSHs (newSViv (ATIMENSEC)); 1877 if (ix & 0x01) PUSHs (newSViv (ATIMENSEC));
1659 if (ix & 2) PUSHs (newSViv (MTIMENSEC)); 1878 if (ix & 0x02) PUSHs (newSViv (MTIMENSEC));
1660 if (ix & 4) PUSHs (newSViv (CTIMENSEC)); 1879 if (ix & 0x04) PUSHs (newSViv (CTIMENSEC));
1880 if (ix & 0x08) PUSHs (newSViv (BTIMENSEC));
1881 if (ix & 0x10) PUSHs (newSVuv (BTIMESEC));
1882 if (ix & 0x20) PUSHs (newSVuv (ST_GEN));
1661 1883
1662UV 1884UV
1663major (UV dev) 1885major (UV dev)
1664 ALIAS: 1886 ALIAS:
1665 minor = 1 1887 minor = 1
… …
1782 eio_wd wd2 = 0; 2004 eio_wd wd2 = 0;
1783 dREQ; 2005 dREQ;
1784 2006
1785 req->type = ix; 2007 req->type = ix;
1786 req_set_path1 (req, oldpath); 2008 req_set_path1 (req, oldpath);
1787 req_set_path (req, newpath, &req->sv2, &req->sv4, &wd2, &req->ptr2); 2009 req_set_path (newpath, &req->sv2, &req->sv4, &wd2, &req->ptr2);
1788 req->int3 = (long)wd2; 2010 req->int3 = (long)wd2;
1789 2011
1790 REQ_SEND; 2012 REQ_SEND;
1791} 2013}
1792 2014
… …
1797 eio_wd wd2 = 0; 2019 eio_wd wd2 = 0;
1798 dREQ; 2020 dREQ;
1799 2021
1800 req->type = EIO_RENAME; 2022 req->type = EIO_RENAME;
1801 req_set_path1 (req, oldpath); 2023 req_set_path1 (req, oldpath);
1802 req_set_path (req, newpath, &req->sv2, &req->sv4, &wd2, &req->ptr2); 2024 req_set_path (newpath, &req->sv2, &req->sv4, &wd2, &req->ptr2);
1803 req->int2 = flags; 2025 req->int2 = flags;
1804 req->int3 = (long)wd2; 2026 req->int3 = (long)wd2;
1805 2027
1806 REQ_SEND; 2028 REQ_SEND;
1807} 2029}
… …
2151} 2373}
2152 OUTPUT: 2374 OUTPUT:
2153 RETVAL 2375 RETVAL
2154 2376
2155int 2377int
2156madvise (SV *scalar, STRLEN offset = 0, SV *length = &PL_sv_undef, IV advice_or_prot) 2378madvise (SV *scalar, IV offset = 0, SV *length = &PL_sv_undef, IV advice_or_prot)
2157 ALIAS: 2379 ALIAS:
2158 mprotect = 1 2380 mprotect = 1
2159 CODE: 2381 CODE:
2160{ 2382{
2161 STRLEN svlen; 2383 STRLEN svlen;
… …
2182} 2404}
2183 OUTPUT: 2405 OUTPUT:
2184 RETVAL 2406 RETVAL
2185 2407
2186int 2408int
2187munlock (SV *scalar, STRLEN offset = 0, SV *length = &PL_sv_undef) 2409munlock (SV *scalar, IV offset = 0, SV *length = &PL_sv_undef)
2188 CODE: 2410 CODE:
2189{ 2411{
2190 STRLEN svlen; 2412 STRLEN svlen;
2191 void *addr = SvPVbyte (scalar, svlen); 2413 void *addr = SvPVbyte (scalar, svlen);
2192 size_t len = SvUV (length); 2414 size_t len = SvUV (length);
… …
2207#else 2429#else
2208 RETVAL = EIO_ENOSYS (); 2430 RETVAL = EIO_ENOSYS ();
2209#endif 2431#endif
2210} 2432}
2211 OUTPUT: 2433 OUTPUT:
2434 RETVAL
2435
2436int
2437mlockall (int flags)
2438 PROTOTYPE: $;
2439 CODE:
2440 RETVAL = eio_mlockall_sync (flags);
2441 OUTPUT:
2212 RETVAL 2442 RETVAL
2213 2443
2214int 2444int
2215munlockall () 2445munlockall ()
2216 CODE: 2446 CODE:
… …
2221#endif 2451#endif
2222 OUTPUT: 2452 OUTPUT:
2223 RETVAL 2453 RETVAL
2224 2454
2225int 2455int
2456statx (SV8 *pathname, int flags, UV mask)
2457 CODE:
2458{
2459 /* undocumented, and might go away, and anyway, should use eio_statx */
2460 SV *wdsv = 0;
2461 SV *pathsv = 0;
2462 eio_wd wd = EIO_CWD;
2463 void *ptr;
2464 int res;
2465
2466 req_set_path (pathname, &wdsv, &pathsv, &wd, &ptr);
2467 RETVAL = eio__statx (!wd || wd->fd == EIO_CWD ? AT_FDCWD : wd->fd, ptr, flags, mask & STATX_ALL, &stx);
2468
2469 SvREFCNT_dec (pathsv);
2470 SvREFCNT_dec (wdsv);
2471}
2472 OUTPUT:
2473 RETVAL
2474
2475U32
2476stx_mode ()
2477 PROTOTYPE:
2478 CODE:
2479#if HAVE_STATX
2480 RETVAL = stx.stx_mode;
2481#else
2482 XSRETURN_UNDEF;
2483#endif
2484 OUTPUT:
2485 RETVAL
2486
2487#define STATX_OFFSET_mask statx_offsetof (stx_mask)
2488#define STATX_OFFSET_blksize statx_offsetof (stx_blksize)
2489#define STATX_OFFSET_nlink statx_offsetof (stx_nlink)
2490#define STATX_OFFSET_uid statx_offsetof (stx_uid)
2491#define STATX_OFFSET_gid statx_offsetof (stx_gid)
2492#define STATX_OFFSET_rdev_major statx_offsetof (stx_rdev_major)
2493#define STATX_OFFSET_rdev_minor statx_offsetof (stx_rdev_minor)
2494#define STATX_OFFSET_dev_major statx_offsetof (stx_dev_major)
2495#define STATX_OFFSET_dev_minor statx_offsetof (stx_dev_minor)
2496#define STATX_OFFSET_attributes statx_offsetof (stx_attributes)
2497#define STATX_OFFSET_ino statx_offsetof (stx_ino)
2498#define STATX_OFFSET_size statx_offsetof (stx_size)
2499#define STATX_OFFSET_blocks statx_offsetof (stx_blocks)
2500#define STATX_OFFSET_attributes_mask statx_offsetof (stx_attributes_mask)
2501#define STATX_OFFSET_atime statx_offsetof (stx_atime)
2502#define STATX_OFFSET_btime statx_offsetof (stx_btime)
2503#define STATX_OFFSET_ctime statx_offsetof (stx_ctime)
2504#define STATX_OFFSET_mtime statx_offsetof (stx_mtime)
2505
2506U32
2507stx_mask ()
2508 PROTOTYPE:
2509 ALIAS:
2510 stx_mask = STATX_OFFSET_mask
2511 stx_blksize = STATX_OFFSET_blksize
2512 stx_nlink = STATX_OFFSET_nlink
2513 stx_uid = STATX_OFFSET_uid
2514 stx_gid = STATX_OFFSET_gid
2515 stx_rdev_major = STATX_OFFSET_rdev_major
2516 stx_rdev_minor = STATX_OFFSET_rdev_minor
2517 stx_dev_major = STATX_OFFSET_dev_major
2518 stx_dev_minor = STATX_OFFSET_dev_minor
2519 CODE:
2520#if HAVE_STATX
2521 RETVAL = *(__u32 *)((char *)&stx + ix);
2522#else
2523 XSRETURN_UNDEF;
2524#endif
2525 OUTPUT:
2526 RETVAL
2527
2528VAL64
2529stx_attributes ()
2530 PROTOTYPE:
2531 ALIAS:
2532 stx_attributes = STATX_OFFSET_attributes
2533 stx_ino = STATX_OFFSET_ino
2534 stx_size = STATX_OFFSET_size
2535 stx_blocks = STATX_OFFSET_blocks
2536 stx_attributes_mask = STATX_OFFSET_attributes_mask
2537 CODE:
2538#if HAVE_STATX
2539 RETVAL = *(__u64 *)((char *)&stx + ix);
2540#else
2541 XSRETURN_UNDEF;
2542#endif
2543 OUTPUT:
2544 RETVAL
2545
2546NV
2547stx_atime ()
2548 PROTOTYPE:
2549 ALIAS:
2550 stx_atime = STATX_OFFSET_atime
2551 stx_btime = STATX_OFFSET_btime
2552 stx_ctime = STATX_OFFSET_ctime
2553 stx_mtime = STATX_OFFSET_mtime
2554 CODE:
2555#if HAVE_STATX
2556 struct statx_timestamp *ts = (struct statx_timestamp *)((char *)&stx + ix);
2557 RETVAL = ts->tv_sec + ts->tv_nsec * 1e-9;
2558#else
2559 XSRETURN_UNDEF;
2560#endif
2561 OUTPUT:
2562 RETVAL
2563
2564VAL64
2565stx_atimesec ()
2566 PROTOTYPE:
2567 ALIAS:
2568 stx_atimesec = STATX_OFFSET_atime
2569 stx_btimesec = STATX_OFFSET_btime
2570 stx_ctimesec = STATX_OFFSET_ctime
2571 stx_mtimesec = STATX_OFFSET_mtime
2572 CODE:
2573#if HAVE_STATX
2574 struct statx_timestamp *ts = (struct statx_timestamp *)((char *)&stx + ix);
2575 RETVAL = ts->tv_sec;
2576#else
2577 XSRETURN_UNDEF;
2578#endif
2579 OUTPUT:
2580 RETVAL
2581
2582U32
2583stx_atimensec ()
2584 PROTOTYPE:
2585 ALIAS:
2586 stx_atimensec = STATX_OFFSET_atime
2587 stx_btimensec = STATX_OFFSET_btime
2588 stx_ctimensec = STATX_OFFSET_ctime
2589 stx_mtimensec = STATX_OFFSET_mtime
2590 CODE:
2591#if HAVE_STATX
2592 struct statx_timestamp *ts = (struct statx_timestamp *)((char *)&stx + ix);
2593 RETVAL = ts->tv_nsec;
2594#else
2595 RETVAL = 0;
2596#endif
2597 OUTPUT:
2598 RETVAL
2599
2600void
2601accept4 (aio_rfd rfh, SV *sockaddr, int salen, int flags)
2602 PPCODE:
2603{
2604 SV *retval;
2605#if HAVE_ACCEPT4
2606 socklen_t salen_ = salen ? salen + 1 : 0;
2607
2608 if (salen)
2609 {
2610 sv_upgrade (sockaddr, SVt_PV);
2611 sv_grow (sockaddr, salen_);
2612 }
2613
2614 int res = accept4 (rfh, salen ? (struct sockaddr *)SvPVX (sockaddr) : 0, salen ? &salen_ : 0, flags);
2615
2616 retval = newmortalFH (res, O_RDWR);
2617
2618 if (res >= 0 && salen > 0)
2619 {
2620 if (salen_ > salen + 1)
2621 salen_ = salen + 1;
2622
2623 SvPOK_only (sockaddr);
2624 SvCUR_set (sockaddr, salen_);
2625 }
2626#else
2627 errno = ENOSYS;
2628 retval = &PL_sv_undef;
2629#endif
2630 XPUSHs (retval);
2631}
2632
2633ssize_t
2226splice (aio_rfd rfh, SV *off_in, aio_wfd wfh, SV *off_out, size_t length, unsigned int flags) 2634splice (aio_rfd rfh, SV *off_in, aio_wfd wfh, SV *off_out, size_t length, unsigned int flags)
2227 CODE: 2635 CODE:
2228{ 2636{
2229#if HAVE_LINUX_SPLICE 2637#if HAVE_LINUX_SPLICE
2230 loff_t off_in_, off_out_; 2638 loff_t off_in_, off_out_;
… …
2238#endif 2646#endif
2239} 2647}
2240 OUTPUT: 2648 OUTPUT:
2241 RETVAL 2649 RETVAL
2242 2650
2243int 2651ssize_t
2244tee (aio_rfd rfh, aio_wfd wfh, size_t length, unsigned int flags) 2652tee (aio_rfd rfh, aio_wfd wfh, size_t length, unsigned int flags)
2245 CODE: 2653 CODE:
2246#if HAVE_LINUX_SPLICE 2654#if HAVE_LINUX_SPLICE
2247 RETVAL = tee (rfh, wfh, length, flags); 2655 RETVAL = tee (rfh, wfh, length, flags);
2248#else 2656#else
… …
2291 PUSHs (newmortalFH (fd[1], O_WRONLY)); 2699 PUSHs (newmortalFH (fd[1], O_WRONLY));
2292 } 2700 }
2293} 2701}
2294 2702
2295void 2703void
2704pidfd_open (int pid, unsigned int flags = 0)
2705 PPCODE:
2706{
2707 /*GENDEF0_SYSCALL(pidfd_open,434)*/
2708 int fd = syscall (SYS_pidfd_open, pid, flags);
2709 XPUSHs (newmortalFH (fd, O_RDWR));
2710}
2711
2712int
2713pidfd_send_signal (SV *pidfh, int sig, SV *siginfo = &PL_sv_undef, unsigned int flags = 0)
2714 PPCODE:
2715{
2716 int res;
2717#if HAVE_SIGINFO_T
2718 siginfo_t si = { 0 };
2719
2720 if (SvOK (siginfo))
2721 {
2722 HV *hv;
2723 SV **svp;
2724
2725 if (!SvROK (siginfo) || SvTYPE (SvRV (siginfo)) != SVt_PVHV)
2726 croak ("siginfo argument must be a hashref with 'code', 'pid', 'uid' and 'value_int' or 'value_ptr' members, caught");
2727
2728 hv = (HV *)SvRV (siginfo);
2729
2730 if ((svp = hv_fetchs (hv, "code" , 0))) si.si_code = SvIV (*svp);
2731 if ((svp = hv_fetchs (hv, "pid" , 0))) si.si_pid = SvIV (*svp);
2732 if ((svp = hv_fetchs (hv, "uid" , 0))) si.si_uid = SvIV (*svp);
2733 if ((svp = hv_fetchs (hv, "value_int", 0))) si.si_value.sival_int = SvIV (*svp);
2734 if ((svp = hv_fetchs (hv, "value_ptr", 0))) si.si_value.sival_ptr = (void *)SvIV (*svp);
2735 }
2736
2737 /*GENDEF0_SYSCALL(pidfd_send_signal,424)*/
2738 res = syscall (SYS_pidfd_send_signal, s_fileno_croak (pidfh, 0), sig, SvOK (siginfo) ? &si : 0, flags);
2739#else
2740 res = (errno = ENOSYS, -1);
2741#endif
2742
2743 XPUSHs (sv_2mortal (newSViv (res)));
2744}
2745
2746void
2747pidfd_getfd (SV *pidfh, int targetfd, unsigned int flags = 0)
2748 PPCODE:
2749{
2750 /*GENDEF0_SYSCALL(pidfd_getfd,438)*/
2751 int fd = syscall (SYS_pidfd_getfd, s_fileno_croak (pidfh, 0), targetfd, flags);
2752 XPUSHs (newmortalFH (fd, O_RDWR));
2753}
2754
2755void
2296eventfd (unsigned int initval = 0, int flags = 0) 2756eventfd (unsigned int initval = 0, int flags = 0)
2297 PPCODE: 2757 PPCODE:
2298{ 2758{
2299 int fd; 2759 int fd;
2300#if HAVE_EVENTFD 2760#if HAVE_EVENTFD
… …
2363#else 2823#else
2364 errno = ENOSYS; 2824 errno = ENOSYS;
2365#endif 2825#endif
2366} 2826}
2367 2827
2828void
2829memfd_create (SV8 *pathname, int flags = 0)
2830 PPCODE:
2831{
2832 int fd;
2833#if HAVE_MEMFD_CREATE
2834 fd = memfd_create (SvPVbyte_nolen (pathname), flags);
2835#else
2836 fd = (errno = ENOSYS, -1);
2837#endif
2838
2839 XPUSHs (newmortalFH (fd, O_RDWR));
2840}
2841
2842int
2843fexecve (SV *fh, SV *args, SV *envs = &PL_sv_undef)
2844 CODE:
2845{
2846 int fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
2847 char **envp, **argv;
2848 argv = extract_stringvec (args, "IO::AIO::fexecve: args must be an array of strings");
2849 if (!SvOK (envs))
2850 {
2851 extern char **environ;
2852 envp = environ;
2853 }
2854 else
2855 envp = extract_stringvec (envs, "IO::AIO::fexecve: envs must be an array of strings");
2856#if _POSIX_VERSION >= 200809L
2857 RETVAL = fexecve (fd, argv, envp);
2858#else
2859 RETVAL = (errno = ENOSYS, -1);
2860#endif
2861}
2862 OUTPUT: RETVAL
2863
2368UV 2864UV
2369get_fdlimit () 2865get_fdlimit ()
2370 CODE: 2866 CODE:
2371#if HAVE_RLIMITS 2867#if HAVE_RLIMITS
2372 struct rlimit rl; 2868 struct rlimit rl;
… …
2405 if (0 == setrlimit (RLIMIT_NOFILE, &rl)) 2901 if (0 == setrlimit (RLIMIT_NOFILE, &rl))
2406 XSRETURN_YES; 2902 XSRETURN_YES;
2407 2903
2408 if (errno == EPERM) 2904 if (errno == EPERM)
2409 { 2905 {
2410 /* setlimit failed with EPERM - maybe we can't raise the hardlimit, or maybe */ 2906 /* setrlimit failed with EPERM - maybe we can't raise the hardlimit, or maybe */
2411 /* our limit overflows a system-wide limit */ 2907 /* our limit overflows a system-wide limit */
2412 /* try an adaptive algorithm, but do not lower the hardlimit */ 2908 /* try an adaptive algorithm, but do not lower the hardlimit */
2413 rl.rlim_max = 0; 2909 rl.rlim_max = 0;
2414 for (bit = 0x40000000U; bit; bit >>= 1) 2910 for (bit = 0x40000000U; bit; bit >>= 1)
2415 { 2911 {
2416 rl.rlim_max |= bit; 2912 rl.rlim_max |= bit;
2417 rl.rlim_cur = rl.rlim_max; 2913 rl.rlim_cur = rl.rlim_max;
2418 2914
2419 /* nevr decrease the hard limit */ 2915 /* never decrease the hard limit */
2420 if (rl.rlim_max < orig_rlim_max) 2916 if (rl.rlim_max < orig_rlim_max)
2421 break; 2917 break;
2422 2918
2423 if (0 != setrlimit (RLIMIT_NOFILE, &rl)) 2919 if (0 != setrlimit (RLIMIT_NOFILE, &rl))
2424 rl.rlim_max &= ~bit; /* too high, remove bit again */ 2920 rl.rlim_max &= ~bit; /* too high, remove bit again */

Diff Legend

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