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.210 by root, Fri Apr 6 11:39:25 2012 UTC vs.
Revision 1.233 by root, Thu Jun 25 13:34:28 2015 UTC

… …
19 19
20#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES 20#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
21# include <sys/mman.h> 21# include <sys/mman.h>
22#endif 22#endif
23 23
24#if __linux__ 24/* the incompetent fool that created musl keeps __linux__, refuses
25 * to implement any linux standard apis, and also has no way to test
26 * for his broken iplementation. on't complain if this fails for you.
27 */
28#if __linux__ && (defined __GLIBC__ || defined __UCLIBC__)
25# include <linux/fs.h> 29# include <linux/fs.h>
26# ifdef FS_IOC_FIEMAP 30# ifdef FS_IOC_FIEMAP
31# include <linux/types.h>
27# include <linux/fiemap.h> 32# include <linux/fiemap.h>
28# define HAVE_FIEMAP 1 33# define HAVE_FIEMAP 1
29# endif 34# endif
30#endif 35#endif
31 36
… …
152#endif 157#endif
153#ifndef minor 158#ifndef minor
154# define minor(dev) ((dev) & 0xff) 159# define minor(dev) ((dev) & 0xff)
155#endif 160#endif
156 161
157#ifndef PAGESIZE 162#if PAGESIZE <= 0
158# define PAGESIZE sysconf (_SC_PAGESIZE) 163# define PAGESIZE sysconf (_SC_PAGESIZE)
159#endif 164#endif
160 165
161/*****************************************************************************/ 166/*****************************************************************************/
162 167
… …
164fiemap (eio_req *req) 169fiemap (eio_req *req)
165{ 170{
166 req->result = -1; 171 req->result = -1;
167 172
168#if HAVE_FIEMAP 173#if HAVE_FIEMAP
174 /* assume some c99 */
175 struct fiemap *fiemap = 0;
176 size_t end_offset;
177 int count = req->int3;
178
179 req->flags |= EIO_FLAG_PTR1_FREE;
180
181 /* heuristic: start with 512 bytes (8 extents), and if that isn't enough, */
182 /* increase in 3.5kb steps */
183 if (count < 0)
184 count = 8;
185
186 fiemap = malloc (sizeof (*fiemap) + sizeof (struct fiemap_extent) * count);
187 errno = ENOMEM;
188 if (!fiemap)
189 return;
190
191 req->ptr1 = fiemap;
192
193 fiemap->fm_start = req->offs;
194 fiemap->fm_length = req->size;
195 fiemap->fm_flags = req->int2;
196 fiemap->fm_extent_count = count;
197
198 if (ioctl (req->int1, FS_IOC_FIEMAP, fiemap) < 0)
199 return;
200
201 if (req->int3 >= 0 /* not autosizing */
202 || !fiemap->fm_mapped_extents /* no more extents */
203 || fiemap->fm_extents [fiemap->fm_mapped_extents - 1].fe_flags & FIEMAP_EXTENT_LAST /* hit eof */)
204 goto done;
205
206 /* else we have to loop -
207 * it would be tempting (actually I tried that first) to just query the
208 * number of extents needed, but linux often feels like not returning all
209 * extents, without telling us it left any out. this complicates
210 * this quite a bit.
211 */
212
213 end_offset = fiemap->fm_length + (fiemap->fm_length == FIEMAP_MAX_OFFSET ? 0 : fiemap->fm_start);
214
169 for (;;) 215 for (;;)
170 { 216 {
171 int count = req->int3; 217 /* we go in 54 extent steps - 3kb, in the hope that this fits nicely on the eio stack (normally 16+ kb) */
218 char scratch[3072];
219 struct fiemap *incmap = (struct fiemap *)scratch;
172 220
173 if (count < 0) 221 incmap->fm_start = fiemap->fm_extents [fiemap->fm_mapped_extents - 1].fe_logical
174 { 222 + fiemap->fm_extents [fiemap->fm_mapped_extents - 1].fe_length;
175 struct fiemap fiemap; 223 incmap->fm_length = fiemap->fm_length - (incmap->fm_start - fiemap->fm_start);
224 incmap->fm_flags = fiemap->fm_flags;
225 incmap->fm_extent_count = (sizeof (scratch) - sizeof (struct fiemap)) / sizeof (struct fiemap_extent);
176 226
177 fiemap.fm_start = req->offs;
178 fiemap.fm_length = req->size;
179 fiemap.fm_flags = req->int2;
180 fiemap.fm_extent_count = 0;
181
182 if (ioctl (req->int1, FS_IOC_FIEMAP, &fiemap)) 227 if (ioctl (req->int1, FS_IOC_FIEMAP, incmap) < 0)
183 return; 228 return;
184 229
185 count = fiemap.fm_mapped_extents; 230 if (!incmap->fm_mapped_extents)
186 } 231 goto done;
187 232
233 count = fiemap->fm_mapped_extents + incmap->fm_mapped_extents;
188 struct fiemap *fiemap = malloc (sizeof (*fiemap) + sizeof (struct fiemap_extent) * count); 234 fiemap = realloc (fiemap, sizeof (*fiemap) + sizeof (struct fiemap_extent) * count);
189 errno = ENOMEM; 235 errno = ENOMEM;
190 if (!fiemap) 236 if (!fiemap)
191 return; 237 return;
192 238
193 req->ptr1 = fiemap; 239 req->ptr1 = fiemap;
194 req->flags |= EIO_FLAG_PTR1_FREE;
195 240
196 fiemap->fm_start = req->offs; 241 for (count = 0; count < incmap->fm_mapped_extents; ++count)
197 fiemap->fm_length = req->size; 242 {
198 fiemap->fm_flags = req->int2; 243 struct fiemap_extent *e = incmap->fm_extents + count;
199 fiemap->fm_extent_count = count;
200 244
201 if (ioctl (req->int1, FS_IOC_FIEMAP, fiemap)) 245 if (e->fe_logical + e->fe_length >= end_offset)
202 return; 246 goto done;
203 247
204 if (req->int3 >= 0) 248 fiemap->fm_extents [fiemap->fm_mapped_extents++] = *e;
205 break; /* when not autosizing we are done */
206 249
207 if (fiemap->fm_extents [fiemap->fm_mapped_extents - 1].fe_flags & FIEMAP_EXTENT_LAST) 250 if (e->fe_flags & FIEMAP_EXTENT_LAST)
208 break; /* autosizing successful, we are done */ 251 goto done;
209 252
210 free (fiemap); 253 }
211 } 254 }
212 255
256done:
213 req->result = 0; 257 req->result = 0;
214 258
215#else 259#else
216 errno = ENOSYS; 260 errno = ENOSYS;
217#endif 261#endif
… …
264} 308}
265 309
266static SV * 310static SV *
267newSVaio_wd (aio_wd wd) 311newSVaio_wd (aio_wd wd)
268{ 312{
269 return sv_bless (newRV_noinc (newSViv ((IV)wd)), aio_wd_stash); 313 return sv_bless (newRV_noinc (newSViv ((intptr_t)wd)), aio_wd_stash);
270} 314}
271 315
272static aio_req 316static aio_req
273SvAIO_REQ (SV *sv) 317SvAIO_REQ (SV *sv)
274{ 318{
… …
293 || SvTYPE (SvRV (sv)) != SVt_PVMG 337 || SvTYPE (SvRV (sv)) != SVt_PVMG
294 || SvSTASH (SvRV (sv)) != aio_wd_stash) 338 || SvSTASH (SvRV (sv)) != aio_wd_stash)
295 croak ("IO::AIO: expected a working directory object as returned by aio_wd"); 339 croak ("IO::AIO: expected a working directory object as returned by aio_wd");
296 340
297 return (aio_wd)(long)SvIVX (SvRV (sv)); 341 return (aio_wd)(long)SvIVX (SvRV (sv));
342}
343
344static SV *
345newmortalFH (int fd, int flags)
346{
347 if (fd < 0)
348 return &PL_sv_undef;
349
350 GV *gv = (GV *)sv_newmortal ();
351 char sym[64];
352 int symlen;
353
354 symlen = snprintf (sym, sizeof (sym), "fd#%d", fd);
355 gv_init (gv, aio_stash, sym, symlen, 0);
356
357 symlen = snprintf (
358 sym,
359 sizeof (sym),
360 "%s&=%d",
361 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
362 fd
363 );
364
365 return do_open (gv, sym, symlen, 0, 0, 0, 0)
366 ? (SV *)gv : &PL_sv_undef;
298} 367}
299 368
300static void 369static void
301aio_grp_feed (aio_req grp) 370aio_grp_feed (aio_req grp)
302{ 371{
… …
430 XPUSHs (sv_2mortal (newSViv (req->int1 & ~(EIO_READDIR_CUSTOM1 | EIO_READDIR_CUSTOM2)))); 499 XPUSHs (sv_2mortal (newSViv (req->int1 & ~(EIO_READDIR_CUSTOM1 | EIO_READDIR_CUSTOM2))));
431 } 500 }
432 break; 501 break;
433 502
434 case EIO_OPEN: 503 case EIO_OPEN:
435 { 504 PUSHs (newmortalFH (req->result, req->int1 & (O_RDONLY | O_WRONLY | O_RDWR)));
436 /* convert fd to fh */
437 SV *fh = &PL_sv_undef;
438
439 if (req->result >= 0)
440 {
441 GV *gv = (GV *)sv_newmortal ();
442 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
443 char sym [64];
444 int symlen;
445
446 symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
447 gv_init (gv, aio_stash, sym, symlen, 0);
448
449 symlen = snprintf (
450 sym,
451 sizeof (sym),
452 "%s&=%d",
453 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
454 (int)req->result
455 );
456
457 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
458 fh = (SV *)gv;
459 }
460
461 PUSHs (fh);
462 }
463 break; 505 break;
464 506
465 case EIO_STATVFS: 507 case EIO_STATVFS:
466 case EIO_FSTATVFS: 508 case EIO_FSTATVFS:
467 { 509 {
… …
470#ifndef _WIN32 512#ifndef _WIN32
471 if (req->result >= 0) 513 if (req->result >= 0)
472 { 514 {
473 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req); 515 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req);
474 HV *hv = newHV (); 516 HV *hv = newHV ();
517 /* POSIX requires fsid to be unsigned long, but AIX in its infinite wisdom
518 * chooses to make it a struct.
519 */
520 unsigned long fsid = 0;
521 memcpy (&fsid, &f->f_fsid, sizeof (unsigned long) < sizeof (f->f_fsid) ? sizeof (unsigned long) : sizeof (f->f_fsid));
475 522
476 rv = sv_2mortal (newRV_noinc ((SV *)hv)); 523 rv = sv_2mortal (newRV_noinc ((SV *)hv));
477 524
478 hv_store (hv, "bsize" , sizeof ("bsize" ) - 1, newSVval64 (f->f_bsize ), 0); 525 hv_store (hv, "bsize" , sizeof ("bsize" ) - 1, newSVval64 (f->f_bsize ), 0);
479 hv_store (hv, "frsize" , sizeof ("frsize" ) - 1, newSVval64 (f->f_frsize ), 0); 526 hv_store (hv, "frsize" , sizeof ("frsize" ) - 1, newSVval64 (f->f_frsize ), 0);
… …
481 hv_store (hv, "bfree" , sizeof ("bfree" ) - 1, newSVval64 (f->f_bfree ), 0); 528 hv_store (hv, "bfree" , sizeof ("bfree" ) - 1, newSVval64 (f->f_bfree ), 0);
482 hv_store (hv, "bavail" , sizeof ("bavail" ) - 1, newSVval64 (f->f_bavail ), 0); 529 hv_store (hv, "bavail" , sizeof ("bavail" ) - 1, newSVval64 (f->f_bavail ), 0);
483 hv_store (hv, "files" , sizeof ("files" ) - 1, newSVval64 (f->f_files ), 0); 530 hv_store (hv, "files" , sizeof ("files" ) - 1, newSVval64 (f->f_files ), 0);
484 hv_store (hv, "ffree" , sizeof ("ffree" ) - 1, newSVval64 (f->f_ffree ), 0); 531 hv_store (hv, "ffree" , sizeof ("ffree" ) - 1, newSVval64 (f->f_ffree ), 0);
485 hv_store (hv, "favail" , sizeof ("favail" ) - 1, newSVval64 (f->f_favail ), 0); 532 hv_store (hv, "favail" , sizeof ("favail" ) - 1, newSVval64 (f->f_favail ), 0);
486 hv_store (hv, "fsid" , sizeof ("fsid" ) - 1, newSVval64 (f->f_fsid ), 0); 533 hv_store (hv, "fsid" , sizeof ("fsid" ) - 1, newSVval64 (fsid ), 0);
487 hv_store (hv, "flag" , sizeof ("flag" ) - 1, newSVval64 (f->f_flag ), 0); 534 hv_store (hv, "flag" , sizeof ("flag" ) - 1, newSVval64 (f->f_flag ), 0);
488 hv_store (hv, "namemax", sizeof ("namemax") - 1, newSVval64 (f->f_namemax), 0); 535 hv_store (hv, "namemax", sizeof ("namemax") - 1, newSVval64 (f->f_namemax), 0);
489 } 536 }
490#endif 537#endif
491 538
… …
545 break; 592 break;
546 593
547 case EIO_CUSTOM: 594 case EIO_CUSTOM:
548 if (req->feed == fiemap) 595 if (req->feed == fiemap)
549 { 596 {
597#if HAVE_FIEMAP
550 if (!req->result) 598 if (!req->result)
551 { 599 {
552 struct fiemap *fiemap = (struct fiemap *)req->ptr1; 600 struct fiemap *fiemap = (struct fiemap *)req->ptr1;
553 601
554 if (fiemap->fm_extent_count) 602 if (fiemap->fm_extent_count)
… …
575 { 623 {
576 SvIV_set (sv_result, fiemap->fm_mapped_extents); 624 SvIV_set (sv_result, fiemap->fm_mapped_extents);
577 PUSHs (sv_result); 625 PUSHs (sv_result);
578 } 626 }
579 } 627 }
628#endif
580 } 629 }
581 else 630 else
582 PUSHs (sv_result); 631 PUSHs (sv_result);
583 break; 632 break;
584 633
… …
696} 745}
697 746
698/*****************************************************************************/ 747/*****************************************************************************/
699 748
700#if !_POSIX_MAPPED_FILES 749#if !_POSIX_MAPPED_FILES
701# define mmap(addr,length,prot,flags,fd,offs) (errno = ENOSYS, -1) 750# define mmap(addr,length,prot,flags,fd,offs) EIO_ENOSYS ()
702# define munmap(addr,length) (errno = ENOSYS, -1) 751# define munmap(addr,length) EIO_ENOSYS ()
703#endif 752#endif
704 753
705#if !_POSIX_MEMORY_PROTECTION 754#if !_POSIX_MEMORY_PROTECTION
706# define mprotect(addr,len,prot) (errno = ENOSYS, -1) 755# define mprotect(addr,len,prot) EIO_ENOSYS ()
707# define PROT_NONE 0 756# define PROT_NONE 0
708# define PROT_WRITE 0 757# define PROT_WRITE 0
709# define MAP_PRIVATE 0 758# define MAP_PRIVATE 0
710# define MAP_SHARED 0 759# define MAP_SHARED 0
711# define MAP_FIXED 0 760# define MAP_FIXED 0
… …
954 const_iv (FIEMAP_EXTENT_DATA_TAIL) 1003 const_iv (FIEMAP_EXTENT_DATA_TAIL)
955 const_iv (FIEMAP_EXTENT_UNWRITTEN) 1004 const_iv (FIEMAP_EXTENT_UNWRITTEN)
956 const_iv (FIEMAP_EXTENT_MERGED) 1005 const_iv (FIEMAP_EXTENT_MERGED)
957 const_iv (FIEMAP_EXTENT_SHARED) 1006 const_iv (FIEMAP_EXTENT_SHARED)
958 1007
1008 const_iv (SPLICE_F_MOVE)
1009 const_iv (SPLICE_F_NONBLOCK)
1010 const_iv (SPLICE_F_MORE)
1011 const_iv (SPLICE_F_GIFT)
1012
1013 const_iv (SEEK_DATA)
1014 const_iv (SEEK_HOLE)
1015
1016 /* libeio constants */
959 const_eio (SEEK_SET) 1017 const_eio (SEEK_SET)
960 const_eio (SEEK_CUR) 1018 const_eio (SEEK_CUR)
961 const_eio (SEEK_END) 1019 const_eio (SEEK_END)
962 1020
963 const_eio (MCL_FUTURE) 1021 const_eio (MCL_FUTURE)
… …
972 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE) 1030 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
973 const_eio (SYNC_FILE_RANGE_WRITE) 1031 const_eio (SYNC_FILE_RANGE_WRITE)
974 const_eio (SYNC_FILE_RANGE_WAIT_AFTER) 1032 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
975 1033
976 const_eio (FALLOC_FL_KEEP_SIZE) 1034 const_eio (FALLOC_FL_KEEP_SIZE)
1035 const_eio (FALLOC_FL_PUNCH_HOLE)
1036 const_eio (FALLOC_FL_COLLAPSE_RANGE)
1037 const_eio (FALLOC_FL_ZERO_RANGE)
977 1038
978 const_eio (READDIR_DENTS) 1039 const_eio (READDIR_DENTS)
979 const_eio (READDIR_DIRS_FIRST) 1040 const_eio (READDIR_DIRS_FIRST)
980 const_eio (READDIR_STAT_ORDER) 1041 const_eio (READDIR_STAT_ORDER)
981 const_eio (READDIR_FOUND_UNKNOWN) 1042 const_eio (READDIR_FOUND_UNKNOWN)
… …
1049 PROTOTYPE: $ 1110 PROTOTYPE: $
1050 CODE: 1111 CODE:
1051 max_outstanding = maxreqs; 1112 max_outstanding = maxreqs;
1052 1113
1053void 1114void
1054aio_wd (SV8 *pathname, SV *callback=&PL_sv_undef) 1115aio_wd (SV8 *pathname, SV *callback = &PL_sv_undef)
1055 PPCODE: 1116 PPCODE:
1056{ 1117{
1057 dREQ; 1118 dREQ;
1058 1119
1059 req->type = EIO_WD_OPEN; 1120 req->type = EIO_WD_OPEN;
… …
1061 1122
1062 REQ_SEND; 1123 REQ_SEND;
1063} 1124}
1064 1125
1065void 1126void
1066aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef) 1127aio_open (SV8 *pathname, int flags, int mode, SV *callback = &PL_sv_undef)
1067 PPCODE: 1128 PPCODE:
1068{ 1129{
1069 dREQ; 1130 dREQ;
1070 1131
1071 req->type = EIO_OPEN; 1132 req->type = EIO_OPEN;
… …
1075 1136
1076 REQ_SEND; 1137 REQ_SEND;
1077} 1138}
1078 1139
1079void 1140void
1080aio_fsync (SV *fh, SV *callback=&PL_sv_undef) 1141aio_fsync (SV *fh, SV *callback = &PL_sv_undef)
1081 ALIAS: 1142 ALIAS:
1082 aio_fsync = EIO_FSYNC 1143 aio_fsync = EIO_FSYNC
1083 aio_fdatasync = EIO_FDATASYNC 1144 aio_fdatasync = EIO_FDATASYNC
1084 aio_syncfs = EIO_SYNCFS 1145 aio_syncfs = EIO_SYNCFS
1085 PPCODE: 1146 PPCODE:
1086{ 1147{
1087 int fd = s_fileno_croak (fh, 0); 1148 int fd = s_fileno_croak (fh, 0);
1088 dREQ; 1149 dREQ;
1089 1150
1090 req->type = ix; 1151 req->type = ix;
1091 req->sv1 = newSVsv (fh); 1152 req->sv1 = newSVsv (fh);
1092 req->int1 = fd; 1153 req->int1 = fd;
1093 1154
1094 REQ_SEND; 1155 REQ_SEND;
1095} 1156}
1096 1157
1097void 1158void
1098aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef) 1159aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback = &PL_sv_undef)
1099 PPCODE: 1160 PPCODE:
1100{ 1161{
1101 int fd = s_fileno_croak (fh, 0); 1162 int fd = s_fileno_croak (fh, 0);
1102 dREQ; 1163 dREQ;
1103 1164
1104 req->type = EIO_SYNC_FILE_RANGE; 1165 req->type = EIO_SYNC_FILE_RANGE;
1105 req->sv1 = newSVsv (fh); 1166 req->sv1 = newSVsv (fh);
1106 req->int1 = fd; 1167 req->int1 = fd;
… …
1110 1171
1111 REQ_SEND; 1172 REQ_SEND;
1112} 1173}
1113 1174
1114void 1175void
1115aio_fallocate (SV *fh, int mode, off_t offset, size_t len, SV *callback=&PL_sv_undef) 1176aio_allocate (SV *fh, int mode, off_t offset, size_t len, SV *callback = &PL_sv_undef)
1116 PPCODE: 1177 PPCODE:
1117{ 1178{
1118 int fd = s_fileno_croak (fh, 0); 1179 int fd = s_fileno_croak (fh, 0);
1119 dREQ; 1180 dREQ;
1120 1181
1121 req->type = EIO_FALLOCATE; 1182 req->type = EIO_FALLOCATE;
1122 req->sv1 = newSVsv (fh); 1183 req->sv1 = newSVsv (fh);
1123 req->int1 = fd; 1184 req->int1 = fd;
… …
1127 1188
1128 REQ_SEND; 1189 REQ_SEND;
1129} 1190}
1130 1191
1131void 1192void
1132aio_close (SV *fh, SV *callback=&PL_sv_undef) 1193aio_close (SV *fh, SV *callback = &PL_sv_undef)
1133 PPCODE: 1194 PPCODE:
1134{ 1195{
1135 static int close_fd = -1; /* dummy fd to close fds via dup2 */ 1196 static int close_fd = -1; /* dummy fd to close fds via dup2 */
1136 int fd = s_fileno_croak (fh, 0); 1197 int fd = s_fileno_croak (fh, 0);
1137 dREQ; 1198 dREQ;
1138 1199
1139 if (expect_false (close_fd < 0)) 1200 if (expect_false (close_fd < 0))
1140 { 1201 {
1141 int pipefd [2]; 1202 int pipefd [2];
… …
1161 1222
1162 REQ_SEND; 1223 REQ_SEND;
1163} 1224}
1164 1225
1165void 1226void
1166aio_seek (SV *fh, SV *offset, int whence, SV *callback=&PL_sv_undef) 1227aio_seek (SV *fh, SV *offset, int whence, SV *callback = &PL_sv_undef)
1167 PPCODE: 1228 PPCODE:
1168{ 1229{
1169 STRLEN svlen;
1170 int fd = s_fileno_croak (fh, 0); 1230 int fd = s_fileno_croak (fh, 0);
1171 dREQ; 1231 dREQ;
1172 1232
1173 req->type = EIO_SEEK; 1233 req->type = EIO_SEEK;
1174 req->sv1 = newSVsv (fh); 1234 req->sv1 = newSVsv (fh);
… …
1178 1238
1179 REQ_SEND; 1239 REQ_SEND;
1180} 1240}
1181 1241
1182void 1242void
1183aio_read (SV *fh, SV *offset, SV *length, SV8 *data, IV dataoffset, SV *callback=&PL_sv_undef) 1243aio_read (SV *fh, SV *offset, SV *length, SV8 *data, IV dataoffset, SV *callback = &PL_sv_undef)
1184 ALIAS: 1244 ALIAS:
1185 aio_read = EIO_READ 1245 aio_read = EIO_READ
1186 aio_write = EIO_WRITE 1246 aio_write = EIO_WRITE
1187 PPCODE: 1247 PPCODE:
1188{ 1248{
… …
1204 len = svlen - dataoffset; 1264 len = svlen - dataoffset;
1205 } 1265 }
1206 else 1266 else
1207 { 1267 {
1208 /* read: check type and grow scalar as necessary */ 1268 /* read: check type and grow scalar as necessary */
1209 SvUPGRADE (data, SVt_PV); 1269 if (!SvPOK (data) || SvLEN (data) >= SvCUR (data))
1210 svptr = SvGROW (data, len + dataoffset + 1); 1270 svptr = sv_grow (data, len + dataoffset + 1);
1271 else if (SvCUR (data) < len + dataoffset)
1272 croak ("length + dataoffset outside of scalar, and cannot grow");
1211 } 1273 }
1212 1274
1213 { 1275 {
1214 dREQ; 1276 dREQ;
1215 1277
… …
1231 REQ_SEND; 1293 REQ_SEND;
1232 } 1294 }
1233} 1295}
1234 1296
1235void 1297void
1236aio_readlink (SV8 *pathname, SV *callback=&PL_sv_undef) 1298aio_readlink (SV8 *pathname, SV *callback = &PL_sv_undef)
1237 ALIAS: 1299 ALIAS:
1238 aio_readlink = EIO_READLINK 1300 aio_readlink = EIO_READLINK
1239 aio_realpath = EIO_REALPATH 1301 aio_realpath = EIO_REALPATH
1240 PPCODE: 1302 PPCODE:
1241{ 1303{
… …
1246 1308
1247 REQ_SEND; 1309 REQ_SEND;
1248} 1310}
1249 1311
1250void 1312void
1251aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef) 1313aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback = &PL_sv_undef)
1252 PPCODE: 1314 PPCODE:
1253{ 1315{
1254 int ifd = s_fileno_croak (in_fh , 0); 1316 int ifd = s_fileno_croak (in_fh , 0);
1255 int ofd = s_fileno_croak (out_fh, 1); 1317 int ofd = s_fileno_croak (out_fh, 1);
1256 dREQ; 1318 dREQ;
1257 1319
1258 req->type = EIO_SENDFILE; 1320 req->type = EIO_SENDFILE;
1259 req->sv1 = newSVsv (out_fh); 1321 req->sv1 = newSVsv (out_fh);
1260 req->int1 = ofd; 1322 req->int1 = ofd;
… …
1265 1327
1266 REQ_SEND; 1328 REQ_SEND;
1267} 1329}
1268 1330
1269void 1331void
1270aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef) 1332aio_readahead (SV *fh, off_t offset, size_t length, SV *callback = &PL_sv_undef)
1271 PPCODE: 1333 PPCODE:
1272{ 1334{
1273 int fd = s_fileno_croak (fh, 0); 1335 int fd = s_fileno_croak (fh, 0);
1274 dREQ; 1336 dREQ;
1275 1337
1276 req->type = EIO_READAHEAD; 1338 req->type = EIO_READAHEAD;
1277 req->sv1 = newSVsv (fh); 1339 req->sv1 = newSVsv (fh);
1278 req->int1 = fd; 1340 req->int1 = fd;
… …
1281 1343
1282 REQ_SEND; 1344 REQ_SEND;
1283} 1345}
1284 1346
1285void 1347void
1286aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef) 1348aio_stat (SV8 *fh_or_path, SV *callback = &PL_sv_undef)
1287 ALIAS: 1349 ALIAS:
1288 aio_stat = EIO_STAT 1350 aio_stat = EIO_STAT
1289 aio_lstat = EIO_LSTAT 1351 aio_lstat = EIO_LSTAT
1290 aio_statvfs = EIO_STATVFS 1352 aio_statvfs = EIO_STATVFS
1291 PPCODE: 1353 PPCODE:
… …
1312 RETVAL = makedev (maj, min); 1374 RETVAL = makedev (maj, min);
1313 OUTPUT: 1375 OUTPUT:
1314 RETVAL 1376 RETVAL
1315 1377
1316void 1378void
1317aio_utime (SV8 *fh_or_path, SV *atime, SV *mtime, SV *callback=&PL_sv_undef) 1379aio_utime (SV8 *fh_or_path, SV *atime, SV *mtime, SV *callback = &PL_sv_undef)
1318 PPCODE: 1380 PPCODE:
1319{ 1381{
1320 dREQ; 1382 dREQ;
1321 1383
1322 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 1384 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
… …
1325 1387
1326 REQ_SEND; 1388 REQ_SEND;
1327} 1389}
1328 1390
1329void 1391void
1330aio_truncate (SV8 *fh_or_path, SV *offset, SV *callback=&PL_sv_undef) 1392aio_truncate (SV8 *fh_or_path, SV *offset, SV *callback = &PL_sv_undef)
1331 PPCODE: 1393 PPCODE:
1332{ 1394{
1333 dREQ; 1395 dREQ;
1334 1396
1335 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 1397 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
… …
1337 1399
1338 REQ_SEND; 1400 REQ_SEND;
1339} 1401}
1340 1402
1341void 1403void
1342aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef) 1404aio_chmod (SV8 *fh_or_path, int mode, SV *callback = &PL_sv_undef)
1343 PPCODE: 1405 PPCODE:
1344{ 1406{
1345 dREQ; 1407 dREQ;
1346 1408
1347 req->int2 = mode; 1409 req->int2 = mode;
… …
1349 1411
1350 REQ_SEND; 1412 REQ_SEND;
1351} 1413}
1352 1414
1353void 1415void
1354aio_chown (SV8 *fh_or_path, SV *uid, SV *gid, SV *callback=&PL_sv_undef) 1416aio_chown (SV8 *fh_or_path, SV *uid, SV *gid, SV *callback = &PL_sv_undef)
1355 PPCODE: 1417 PPCODE:
1356{ 1418{
1357 dREQ; 1419 dREQ;
1358 1420
1359 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 1421 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
… …
1362 1424
1363 REQ_SEND; 1425 REQ_SEND;
1364} 1426}
1365 1427
1366void 1428void
1367aio_readdirx (SV8 *pathname, IV flags, SV *callback=&PL_sv_undef) 1429aio_readdirx (SV8 *pathname, IV flags, SV *callback = &PL_sv_undef)
1368 PPCODE: 1430 PPCODE:
1369{ 1431{
1370 dREQ; 1432 dREQ;
1371 1433
1372 req->type = EIO_READDIR; 1434 req->type = EIO_READDIR;
… …
1379 1441
1380 REQ_SEND; 1442 REQ_SEND;
1381} 1443}
1382 1444
1383void 1445void
1384aio_mkdir (SV8 *pathname, int mode, SV *callback=&PL_sv_undef) 1446aio_mkdir (SV8 *pathname, int mode, SV *callback = &PL_sv_undef)
1385 PPCODE: 1447 PPCODE:
1386{ 1448{
1387 dREQ; 1449 dREQ;
1388 1450
1389 req->type = EIO_MKDIR; 1451 req->type = EIO_MKDIR;
… …
1392 1454
1393 REQ_SEND; 1455 REQ_SEND;
1394} 1456}
1395 1457
1396void 1458void
1397aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 1459aio_unlink (SV8 *pathname, SV *callback = &PL_sv_undef)
1398 ALIAS: 1460 ALIAS:
1399 aio_unlink = EIO_UNLINK 1461 aio_unlink = EIO_UNLINK
1400 aio_rmdir = EIO_RMDIR 1462 aio_rmdir = EIO_RMDIR
1401 aio_readdir = EIO_READDIR 1463 aio_readdir = EIO_READDIR
1402 PPCODE: 1464 PPCODE:
… …
1408 1470
1409 REQ_SEND; 1471 REQ_SEND;
1410} 1472}
1411 1473
1412void 1474void
1413aio_link (SV8 *oldpath, SV8 *newpath, SV *callback=&PL_sv_undef) 1475aio_link (SV8 *oldpath, SV8 *newpath, SV *callback = &PL_sv_undef)
1414 ALIAS: 1476 ALIAS:
1415 aio_link = EIO_LINK 1477 aio_link = EIO_LINK
1416 aio_symlink = EIO_SYMLINK 1478 aio_symlink = EIO_SYMLINK
1417 aio_rename = EIO_RENAME 1479 aio_rename = EIO_RENAME
1418 PPCODE: 1480 PPCODE:
… …
1427 1489
1428 REQ_SEND; 1490 REQ_SEND;
1429} 1491}
1430 1492
1431void 1493void
1432aio_mknod (SV8 *pathname, int mode, UV dev, SV *callback=&PL_sv_undef) 1494aio_mknod (SV8 *pathname, int mode, UV dev, SV *callback = &PL_sv_undef)
1433 PPCODE: 1495 PPCODE:
1434{ 1496{
1435 dREQ; 1497 dREQ;
1436 1498
1437 req->type = EIO_MKNOD; 1499 req->type = EIO_MKNOD;
… …
1441 1503
1442 REQ_SEND; 1504 REQ_SEND;
1443} 1505}
1444 1506
1445void 1507void
1446aio_mtouch (SV8 *data, IV offset = 0, SV *length = &PL_sv_undef, int flags = 0, SV *callback=&PL_sv_undef) 1508aio_mtouch (SV8 *data, IV offset = 0, SV *length = &PL_sv_undef, int flags = 0, SV *callback = &PL_sv_undef)
1447 ALIAS: 1509 ALIAS:
1448 aio_mtouch = EIO_MTOUCH 1510 aio_mtouch = EIO_MTOUCH
1449 aio_msync = EIO_MSYNC 1511 aio_msync = EIO_MSYNC
1450 PPCODE: 1512 PPCODE:
1451{ 1513{
… …
1474 REQ_SEND; 1536 REQ_SEND;
1475 } 1537 }
1476} 1538}
1477 1539
1478void 1540void
1479aio_mlock (SV8 *data, IV offset = 0, SV *length = &PL_sv_undef, SV *callback=&PL_sv_undef) 1541aio_mlock (SV8 *data, IV offset = 0, SV *length = &PL_sv_undef, SV *callback = &PL_sv_undef)
1480 PPCODE: 1542 PPCODE:
1481{ 1543{
1482 STRLEN svlen; 1544 STRLEN svlen;
1483 char *svptr = SvPVbyte (data, svlen); 1545 char *svptr = SvPVbyte (data, svlen);
1484 UV len = SvUV (length); 1546 UV len = SvUV (length);
… …
1503 REQ_SEND; 1565 REQ_SEND;
1504 } 1566 }
1505} 1567}
1506 1568
1507void 1569void
1508aio_mlockall (IV flags, SV *callback=&PL_sv_undef) 1570aio_mlockall (IV flags, SV *callback = &PL_sv_undef)
1509 PPCODE: 1571 PPCODE:
1510{ 1572{
1511 dREQ; 1573 dREQ;
1512 1574
1513 req->type = EIO_MLOCKALL; 1575 req->type = EIO_MLOCKALL;
… …
1515 1577
1516 REQ_SEND; 1578 REQ_SEND;
1517} 1579}
1518 1580
1519void 1581void
1520aio_fiemap (SV *fh, off_t start, SV *length, U32 flags, SV *count, SV *callback=&PL_sv_undef) 1582aio_fiemap (SV *fh, off_t start, SV *length, U32 flags, SV *count, SV *callback = &PL_sv_undef)
1521 PPCODE: 1583 PPCODE:
1522{ 1584{
1523 int fd = s_fileno_croak (fh, 0); 1585 int fd = s_fileno_croak (fh, 0);
1524 dREQ; 1586 dREQ;
1525 1587
1526 req->type = EIO_CUSTOM; 1588 req->type = EIO_CUSTOM;
1527 req->sv1 = newSVsv (fh); 1589 req->sv1 = newSVsv (fh);
1528 req->int1 = fd; 1590 req->int1 = fd;
1529 1591
1530 req->feed = fiemap; 1592 req->feed = fiemap;
1593#if HAVE_FIEMAP
1531 /* keep our fingers crossed that the next two types are 64 bit */ 1594 /* keep our fingers crossed that the next two types are 64 bit */
1532 req->offs = start; 1595 req->offs = start;
1533 req->size = SvOK (length) ? SvVAL64 (length) : ~0ULL; 1596 req->size = SvOK (length) ? SvVAL64 (length) : ~0ULL;
1534 req->int2 = flags; 1597 req->int2 = flags;
1535 req->int3 = SvOK (count) ? SvIV (count) : -1; 1598 req->int3 = SvOK (count) ? SvIV (count) : -1;
1599#endif
1536 1600
1537 REQ_SEND; 1601 REQ_SEND;
1538} 1602}
1539 1603
1540void 1604void
1541aio_busy (double delay, SV *callback=&PL_sv_undef) 1605aio_busy (double delay, SV *callback = &PL_sv_undef)
1542 PPCODE: 1606 PPCODE:
1543{ 1607{
1544 dREQ; 1608 dREQ;
1545 1609
1546 req->type = EIO_BUSY; 1610 req->type = EIO_BUSY;
… …
1548 1612
1549 REQ_SEND; 1613 REQ_SEND;
1550} 1614}
1551 1615
1552void 1616void
1553aio_group (SV *callback=&PL_sv_undef) 1617aio_group (SV *callback = &PL_sv_undef)
1554 PPCODE: 1618 PPCODE:
1555{ 1619{
1556 dREQ; 1620 dREQ;
1557 1621
1558 req->type = EIO_GROUP; 1622 req->type = EIO_GROUP;
1559 1623
1624 PUTBACK;
1560 req_submit (req); 1625 req_submit (req);
1626 SPAGAIN;
1627
1561 XPUSHs (req_sv (req, aio_grp_stash)); 1628 XPUSHs (req_sv (req, aio_grp_stash));
1562} 1629}
1563 1630
1564void 1631void
1565aio_nop (SV *callback=&PL_sv_undef) 1632aio_nop (SV *callback = &PL_sv_undef)
1566 ALIAS: 1633 ALIAS:
1567 aio_nop = EIO_NOP 1634 aio_nop = EIO_NOP
1568 aio_sync = EIO_SYNC 1635 aio_sync = EIO_SYNC
1569 PPCODE: 1636 PPCODE:
1570{ 1637{
… …
1574 1641
1575 REQ_SEND; 1642 REQ_SEND;
1576} 1643}
1577 1644
1578int 1645int
1579aioreq_pri (int pri = 0) 1646aioreq_pri (int pri = NO_INIT)
1580 CODE: 1647 CODE:
1581 RETVAL = next_pri; 1648 RETVAL = next_pri;
1582 if (items > 0) 1649 if (items > 0)
1583 { 1650 {
1584 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN; 1651 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
… …
1674 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count); 1741 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count);
1675 OUTPUT: 1742 OUTPUT:
1676 RETVAL 1743 RETVAL
1677 1744
1678void 1745void
1679mmap (SV *scalar, size_t length, int prot, int flags, SV *fh, off_t offset = 0) 1746mmap (SV *scalar, STRLEN length, int prot, int flags, SV *fh = &PL_sv_undef, off_t offset = 0)
1680 PPCODE: 1747 PPCODE:
1681 sv_unmagic (scalar, MMAP_MAGIC); 1748 sv_unmagic (scalar, MMAP_MAGIC);
1682{ 1749{
1683 int fd = SvOK (fh) ? s_fileno_croak (fh, flags & PROT_WRITE) : -1; 1750 int fd = SvOK (fh) ? s_fileno_croak (fh, flags & PROT_WRITE) : -1;
1684 void *addr = (void *)mmap (0, length, prot, flags, fd, offset); 1751 void *addr = (void *)mmap (0, length, prot, flags, fd, offset);
… …
1711munmap (SV *scalar) 1778munmap (SV *scalar)
1712 CODE: 1779 CODE:
1713 sv_unmagic (scalar, MMAP_MAGIC); 1780 sv_unmagic (scalar, MMAP_MAGIC);
1714 1781
1715int 1782int
1716madvise (SV *scalar, off_t offset = 0, SV *length = &PL_sv_undef, IV advice_or_prot) 1783madvise (SV *scalar, STRLEN offset = 0, SV *length = &PL_sv_undef, IV advice_or_prot)
1717 ALIAS: 1784 ALIAS:
1718 mprotect = 1 1785 mprotect = 1
1719 CODE: 1786 CODE:
1720{ 1787{
1721 STRLEN svlen; 1788 STRLEN svlen;
1722 void *addr = SvPVbyte (scalar, svlen); 1789 void *addr = SvPVbyte (scalar, svlen);
1723 size_t len = SvUV (length); 1790 STRLEN len = SvUV (length);
1724 1791
1725 if (offset < 0) 1792 if (offset < 0)
1726 offset += svlen; 1793 offset += svlen;
1727 1794
1728 if (offset < 0 || offset > svlen) 1795 if (offset < 0 || offset > svlen)
… …
1742} 1809}
1743 OUTPUT: 1810 OUTPUT:
1744 RETVAL 1811 RETVAL
1745 1812
1746int 1813int
1747munlock (SV *scalar, off_t offset = 0, SV *length = &PL_sv_undef) 1814munlock (SV *scalar, STRLEN offset = 0, SV *length = &PL_sv_undef)
1748 CODE: 1815 CODE:
1749{ 1816{
1750 STRLEN svlen; 1817 STRLEN svlen;
1751 void *addr = SvPVbyte (scalar, svlen); 1818 void *addr = SvPVbyte (scalar, svlen);
1752 size_t len = SvUV (length); 1819 size_t len = SvUV (length);
1753 1820
1754 if (offset < 0) 1821 if (offset < 0)
1755 offset += svlen; 1822 offset += svlen;
1756 1823
… …
1763 addr = (void *)(((intptr_t)addr) + offset); 1830 addr = (void *)(((intptr_t)addr) + offset);
1764 eio_page_align (&addr, &len); 1831 eio_page_align (&addr, &len);
1765#if _POSIX_MEMLOCK_RANGE 1832#if _POSIX_MEMLOCK_RANGE
1766 RETVAL = munlock (addr, len); 1833 RETVAL = munlock (addr, len);
1767#else 1834#else
1768 RETVAL = ((errno = ENOSYS), -1); 1835 RETVAL = EIO_ENOSYS ();
1769#endif 1836#endif
1770} 1837}
1771 OUTPUT: 1838 OUTPUT:
1772 RETVAL 1839 RETVAL
1773 1840
… …
1775munlockall () 1842munlockall ()
1776 CODE: 1843 CODE:
1777#if _POSIX_MEMLOCK 1844#if _POSIX_MEMLOCK
1778 munlockall (); 1845 munlockall ();
1779#else 1846#else
1780 RETVAL = -1; 1847 RETVAL = EIO_ENOSYS ();
1781 errno = ENOSYS;
1782#endif 1848#endif
1783 OUTPUT: 1849 OUTPUT:
1784 RETVAL 1850 RETVAL
1851
1852int
1853splice (aio_rfd rfh, SV *off_in, aio_wfd wfh, SV *off_out, size_t length, unsigned int flags)
1854 CODE:
1855{
1856#if HAVE_LINUX_SPLICE
1857 loff_t off_in_, off_out_;
1858 RETVAL = splice (
1859 rfh, SvOK (off_in ) ? (off_in_ = SvVAL64 (off_in )), &off_in_ : 0,
1860 wfh, SvOK (off_out) ? (off_out_ = SvVAL64 (off_out)), &off_out_ : 0,
1861 length, flags
1862 );
1863#else
1864 RETVAL = EIO_ENOSYS ();
1865#endif
1866}
1867 OUTPUT:
1868 RETVAL
1869
1870int
1871tee (aio_rfd rfh, aio_wfd wfh, size_t length, unsigned int flags)
1872 CODE:
1873#if HAVE_LINUX_SPLICE
1874 RETVAL = tee (rfh, wfh, length, flags);
1875#else
1876 RETVAL = EIO_ENOSYS ();
1877#endif
1878 OUTPUT:
1879 RETVAL
1880
1881int
1882pipesize (aio_rfd rfh, int new_size = -1)
1883 PROTOTYPE: $;$
1884 CODE:
1885#if defined(F_SETPIPE_SZ) && defined(F_GETPIPE_SZ)
1886 if (new_size >= 0)
1887 RETVAL = fcntl (rfh, F_SETPIPE_SZ, new_size);
1888 else
1889 RETVAL = fcntl (rfh, F_GETPIPE_SZ);
1890#else
1891 errno = ENOSYS;
1892 RETVAL = -1;
1893#endif
1894 OUTPUT:
1895 RETVAL
1896
1897void
1898pipe2 (int flags = 0)
1899 PROTOTYPE: ;$
1900 PPCODE:
1901{
1902 int fd[2];
1903 int res;
1904
1905 if (flags)
1906#if HAVE_PIPE2
1907 res = pipe2 (fd, flags);
1908#else
1909 res = (errno = ENOSYS, -1);
1910#endif
1911 else
1912 res = pipe (fd);
1913
1914 if (!res)
1915 {
1916 EXTEND (SP, 2);
1917 PUSHs (newmortalFH (fd[0], O_RDONLY));
1918 PUSHs (newmortalFH (fd[1], O_WRONLY));
1919 }
1920}
1785 1921
1786void _on_next_submit (SV *cb) 1922void _on_next_submit (SV *cb)
1787 CODE: 1923 CODE:
1788 SvREFCNT_dec (on_next_submit); 1924 SvREFCNT_dec (on_next_submit);
1789 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1925 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
… …
1824cancel (aio_req_ornot req) 1960cancel (aio_req_ornot req)
1825 CODE: 1961 CODE:
1826 eio_cancel (req); 1962 eio_cancel (req);
1827 1963
1828void 1964void
1829cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1965cb (aio_req_ornot req, SV *callback = NO_INIT)
1830 PPCODE: 1966 PPCODE:
1831{ 1967{
1832 if (GIMME_V != G_VOID) 1968 if (GIMME_V != G_VOID)
1833 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef); 1969 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1834 1970
1835 if (items > 1) 1971 if (items > 1)
1836 { 1972 {
1837 SV *cb_cv =get_cb (callback); 1973 SV *cb_cv = get_cb (callback);
1838 1974
1839 SvREFCNT_dec (req->callback); 1975 SvREFCNT_dec (req->callback);
1840 req->callback = SvREFCNT_inc (cb_cv); 1976 req->callback = SvREFCNT_inc (cb_cv);
1841 } 1977 }
1842} 1978}
… …
1899limit (aio_req grp, int limit) 2035limit (aio_req grp, int limit)
1900 CODE: 2036 CODE:
1901 eio_grp_limit (grp, limit); 2037 eio_grp_limit (grp, limit);
1902 2038
1903void 2039void
1904feed (aio_req grp, SV *callback=&PL_sv_undef) 2040feed (aio_req grp, SV *callback = &PL_sv_undef)
1905 CODE: 2041 CODE:
1906{ 2042{
1907 SvREFCNT_dec (grp->sv2); 2043 SvREFCNT_dec (grp->sv2);
1908 grp->sv2 = newSVsv (callback); 2044 grp->sv2 = newSVsv (callback);
1909 grp->feed = aio_grp_feed; 2045 grp->feed = aio_grp_feed;

Diff Legend

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