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.185 by root, Thu Jul 7 22:36:18 2011 UTC vs.
Revision 1.228 by root, Fri Jan 24 23:46:16 2014 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_MEMLOCK_RANGE || _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
24#if __linux__
25# include <linux/fs.h>
26# ifdef FS_IOC_FIEMAP
27# include <linux/types.h>
28# include <linux/fiemap.h>
29# define HAVE_FIEMAP 1
30# endif
31#endif
32
25/* perl namespace pollution */ 33/* perl namespace pollution */
26#undef VERSION 34#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 35
77/* perl stupidly overrides readdir and maybe others */ 36/* perl stupidly overrides readdir and maybe others */
78/* with thread-unsafe versions, imagine that :( */ 37/* with thread-unsafe versions, imagine that :( */
79#undef readdir 38#undef readdir
80#undef opendir 39#undef opendir
81#undef closedir 40#undef closedir
82 41
42#ifdef _WIN32
43
44 // perl overrides all those nice libc functions
45
46 #undef malloc
47 #undef free
48 #undef open
49 #undef read
50 #undef write
51 #undef send
52 #undef recv
53 #undef stat
54 #undef lstat
55 #undef fstat
56 #undef truncate
57 #undef ftruncate
58 #undef open
59 #undef link
60 #undef close
61 #undef unlink
62 #undef mkdir
63 #undef rmdir
64 #undef rename
65 #undef lseek
66 #undef opendir
67 #undef readdir
68 #undef closedir
69 #undef chmod
70 #undef fchmod
71 #undef dup
72 #undef dup2
73 #undef abort
74 #undef pipe
75
76 #define EIO_STRUCT_STAT struct _stati64
83#define EIO_STRUCT_STAT Stat_t 77 #define EIO_STRUCT_STATI64
84 78
85/* use NV for 32 bit perls as it allows larger offsets */
86#if IVSIZE >= 8
87# define VAL64 IV
88# define SvVAL64 SvIV
89# define newSVval64 newSViv
90#else 79#else
91# define VAL64 NV 80
92# define SvVAL64 SvNV 81 #include <sys/time.h>
93# define newSVval64 newSVnv 82 #include <sys/select.h>
83 #include <unistd.h>
84 #include <utime.h>
85 #include <signal.h>
86
87 #define EIO_STRUCT_STAT Stat_t
88
94#endif 89#endif
95 90
96/*****************************************************************************/ 91/*****************************************************************************/
97 92
98#if __GNUC__ >= 3 93#if __GNUC__ >= 3
108 103
109typedef SV SV8; /* byte-sv, used for argument-checking */ 104typedef SV SV8; /* byte-sv, used for argument-checking */
110typedef int aio_rfd; /* read file desriptor */ 105typedef int aio_rfd; /* read file desriptor */
111typedef int aio_wfd; /* write file descriptor */ 106typedef int aio_wfd; /* write file descriptor */
112 107
113static HV *aio_stash, *aio_req_stash, *aio_grp_stash; 108static HV *aio_stash, *aio_req_stash, *aio_grp_stash, *aio_wd_stash;
114 109
115#define EIO_REQ_MEMBERS \ 110#define EIO_REQ_MEMBERS \
116 SV *callback; \ 111 SV *callback; \
117 SV *sv1, *sv2; \ 112 SV *sv1, *sv2; \
113 SV *sv3, *sv4; \
118 STRLEN stroffset; \ 114 STRLEN stroffset; \
119 SV *self; 115 SV *self;
120 116
121#define EIO_NO_WRAPPERS 1 117#define EIO_NO_WRAPPERS 1
122 118
123#include "libeio/config.h" 119#include "libeio/config.h"
124#include "libeio/eio.h" 120#include "libeio/eio.h"
125 121
126/* Linux/others */ 122static int req_invoke (eio_req *req);
127#ifndef O_ASYNC 123#define EIO_FINISH(req) req_invoke (req)
128# define O_ASYNC 0 124static void req_destroy (eio_req *grp);
129#endif 125#define EIO_DESTROY(req) req_destroy (req)
130#ifndef O_DIRECT
131# define O_DIRECT 0
132#endif
133#ifndef O_NOATIME
134# define O_NOATIME 0
135#endif
136 126
137/* POSIX */ 127#include "libeio/eio.c"
138#ifndef O_CLOEXEC
139# define O_CLOEXEC 0
140#endif
141#ifndef O_NOFOLLOW
142# define O_NOFOLLOW 0
143#endif
144#ifndef O_NOCTTY
145# define O_NOCTTY 0
146#endif
147#ifndef O_NONBLOCK
148# define O_NONBLOCK 0
149#endif
150#ifndef O_EXEC
151# define O_EXEC 0
152#endif
153#ifndef O_SEARCH
154# define O_SEARCH 0
155#endif
156#ifndef O_DIRECTORY
157# define O_DIRECTORY 0
158#endif
159#ifndef O_DSYNC
160# define O_DSYNC 0
161#endif
162#ifndef O_RSYNC
163# define O_RSYNC 0
164#endif
165#ifndef O_SYNC
166# define O_SYNC 0
167#endif
168#ifndef O_TTY_INIT
169# define O_TTY_INIT 0
170#endif
171
172#ifndef POSIX_FADV_NORMAL
173# define POSIX_FADV_NORMAL 0
174#endif
175#ifndef POSIX_FADV_SEQUENTIAL
176# define POSIX_FADV_SEQUENTIAL 0
177#endif
178#ifndef POSIX_FADV_RANDOM
179# define POSIX_FADV_RANDOM 0
180#endif
181#ifndef POSIX_FADV_NOREUSE
182# define POSIX_FADV_NOREUSE 0
183#endif
184#ifndef POSIX_FADV_WILLNEED
185# define POSIX_FADV_WILLNEED 0
186#endif
187#ifndef POSIX_FADV_DONTNEED
188# define POSIX_FADV_DONTNEED 0
189#endif
190 128
191#if !HAVE_POSIX_FADVISE 129#if !HAVE_POSIX_FADVISE
192# define posix_fadvise(a,b,c,d) errno = ENOSYS /* also return ENOSYS */ 130# define posix_fadvise(a,b,c,d) errno = ENOSYS /* also return ENOSYS */
193#endif 131#endif
194 132
195#ifndef POSIX_MADV_NORMAL
196# define POSIX_MADV_NORMAL 0
197#endif
198#ifndef POSIX_MADV_SEQUENTIAL
199# define POSIX_MADV_SEQUENTIAL 0
200#endif
201#ifndef POSIX_MADV_RANDOM
202# define POSIX_MADV_RANDOM 0
203#endif
204#ifndef POSIX_MADV_WILLNEED
205# define POSIX_MADV_WILLNEED 0
206#endif
207#ifndef POSIX_MADV_DONTNEED
208# define POSIX_MADV_DONTNEED 0
209#endif
210
211#if !HAVE_POSIX_MADVISE 133#if !HAVE_POSIX_MADVISE
212# define posix_madvise(a,b,c) errno = ENOSYS /* also return ENOSYS */ 134# define posix_madvise(a,b,c) errno = ENOSYS /* also return ENOSYS */
213#endif
214
215#ifndef PROT_NONE
216# define PROT_NONE 0
217#endif
218#ifndef PROT_READ
219# define PROT_READ 0
220#endif
221#ifndef PROT_WRITE
222# define PROT_READ 0
223#endif
224#ifndef PROT_EXEC
225# define PROT_EXEC 0
226#endif
227
228#ifndef ST_NODEV
229# define ST_NODEV 0
230#endif
231#ifndef ST_NOEXEC
232# define ST_NOEXEC 0
233#endif
234#ifndef ST_SYNCHRONOUS
235# define ST_SYNCHRONOUS 0
236#endif
237#ifndef ST_MANDLOCK
238# define ST_MANDLOCK 0
239#endif
240#ifndef ST_WRITE
241# define ST_WRITE 0
242#endif
243#ifndef ST_APPEND
244# define ST_APPEND 0
245#endif
246#ifndef ST_IMMUTABLE
247# define ST_IMMUTABLE 0
248#endif
249#ifndef ST_NOATIME
250# define ST_NOATIME 0
251#endif
252#ifndef ST_NODIRATIME
253# define ST_NODIRATIME 0
254#endif
255#ifndef ST_RELATIME
256# define ST_RELATIME 0
257#endif
258
259#ifndef S_IFIFO
260# define S_IFIFO 0
261#endif
262#ifndef S_IFCHR
263# define S_IFCHR 0
264#endif
265#ifndef S_IFBLK
266# define S_IFBLK 0
267#endif
268#ifndef S_IFLNK
269# define S_IFLNK 0
270#endif
271#ifndef S_IFREG
272# define S_IFREG 0
273#endif
274#ifndef S_IFDIR
275# define S_IFDIR 0
276#endif
277#ifndef S_IFWHT
278# define S_IFWHT 0
279#endif
280#ifndef S_IFSOCK
281# define S_IFSOCK 0
282#endif 135#endif
283 136
284#ifndef MAP_ANONYMOUS 137#ifndef MAP_ANONYMOUS
285# ifdef MAP_ANON 138# ifdef MAP_ANON
286# define MAP_ANONYMOUS MAP_ANON 139# define MAP_ANONYMOUS MAP_ANON
287# else 140# else
288# define MAP_ANONYMOUS MAP_FIXED /* and hope this fails */ 141# define MAP_ANONYMOUS MAP_FIXED /* and hope this fails */
289# endif 142# endif
290#endif 143#endif
291#ifndef MAP_HUGETLB 144
292# define MAP_HUGETLB 0 145/* defines all sorts of constants to 0 unless they are already defined */
293#endif 146#include "def0.h"
294#ifndef MAP_LOCKED
295# define MAP_LOCKED 0
296#endif
297#ifndef MAP_NORESERVE
298# define MAP_NORESERVE 0
299#endif
300#ifndef MAP_POPULATE
301# define MAP_POPULATE 0
302#endif
303#ifndef MAP_NONBLOCK
304# define MAP_NONBLOCK 0
305#endif
306 147
307#ifndef makedev 148#ifndef makedev
308# define makedev(maj,min) (((maj) << 8) | (min)) 149# define makedev(maj,min) (((maj) << 8) | (min))
309#endif 150#endif
310#ifndef major 151#ifndef major
312#endif 153#endif
313#ifndef minor 154#ifndef minor
314# define minor(dev) ((dev) & 0xff) 155# define minor(dev) ((dev) & 0xff)
315#endif 156#endif
316 157
317#ifndef PAGESIZE 158#if PAGESIZE <= 0
318# define PAGESIZE sysconf (_SC_PAGESIZE) 159# define PAGESIZE sysconf (_SC_PAGESIZE)
319#endif 160#endif
320 161
321static int req_invoke (eio_req *req); 162/*****************************************************************************/
322#define EIO_FINISH(req) req_invoke (req) 163
323static void req_destroy (eio_req *grp); 164static void
324#define EIO_DESTROY(req) req_destroy (req) 165fiemap (eio_req *req)
166{
167 req->result = -1;
168
169#if HAVE_FIEMAP
170 /* assume some c99 */
171 struct fiemap *fiemap = 0;
172 size_t end_offset;
173 int count = req->int3;
174
175 req->flags |= EIO_FLAG_PTR1_FREE;
176
177 /* heuristic: start with 512 bytes (8 extents), and if that isn't enough, */
178 /* increase in 3.5kb steps */
179 if (count < 0)
180 count = 8;
181
182 fiemap = malloc (sizeof (*fiemap) + sizeof (struct fiemap_extent) * count);
183 errno = ENOMEM;
184 if (!fiemap)
185 return;
186
187 req->ptr1 = fiemap;
188
189 fiemap->fm_start = req->offs;
190 fiemap->fm_length = req->size;
191 fiemap->fm_flags = req->int2;
192 fiemap->fm_extent_count = count;
193
194 if (ioctl (req->int1, FS_IOC_FIEMAP, fiemap) < 0)
195 return;
196
197 if (req->int3 >= 0 /* not autosizing */
198 || !fiemap->fm_mapped_extents /* no more extents */
199 || fiemap->fm_extents [fiemap->fm_mapped_extents - 1].fe_flags & FIEMAP_EXTENT_LAST /* hit eof */)
200 goto done;
201
202 /* else we have to loop -
203 * it would be tempting (actually I tried that first) to just query the
204 * number of extents needed, but linux often feels like not returning all
205 * extents, without telling us it left any out. this complicates
206 * this quite a bit.
207 */
208
209 end_offset = fiemap->fm_length + (fiemap->fm_length == FIEMAP_MAX_OFFSET ? 0 : fiemap->fm_start);
210
211 for (;;)
212 {
213 /* we go in 54 extent steps - 3kb, in the hope that this fits nicely on the eio stack (normally 16+ kb) */
214 char scratch[3072];
215 struct fiemap *incmap = (struct fiemap *)scratch;
216
217 incmap->fm_start = fiemap->fm_extents [fiemap->fm_mapped_extents - 1].fe_logical
218 + fiemap->fm_extents [fiemap->fm_mapped_extents - 1].fe_length;
219 incmap->fm_length = fiemap->fm_length - (incmap->fm_start - fiemap->fm_start);
220 incmap->fm_flags = fiemap->fm_flags;
221 incmap->fm_extent_count = (sizeof (scratch) - sizeof (struct fiemap)) / sizeof (struct fiemap_extent);
222
223 if (ioctl (req->int1, FS_IOC_FIEMAP, incmap) < 0)
224 return;
225
226 if (!incmap->fm_mapped_extents)
227 goto done;
228
229 count = fiemap->fm_mapped_extents + incmap->fm_mapped_extents;
230 fiemap = realloc (fiemap, sizeof (*fiemap) + sizeof (struct fiemap_extent) * count);
231 errno = ENOMEM;
232 if (!fiemap)
233 return;
234
235 req->ptr1 = fiemap;
236
237 for (count = 0; count < incmap->fm_mapped_extents; ++count)
238 {
239 struct fiemap_extent *e = incmap->fm_extents + count;
240
241 if (e->fe_logical + e->fe_length >= end_offset)
242 goto done;
243
244 fiemap->fm_extents [fiemap->fm_mapped_extents++] = *e;
245
246 if (e->fe_flags & FIEMAP_EXTENT_LAST)
247 goto done;
248
249 }
250 }
251
252done:
253 req->result = 0;
254
255#else
256 errno = ENOSYS;
257#endif
258}
259
260/*****************************************************************************/
325 261
326enum { 262enum {
327 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ 263 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
328}; 264};
329 265
330#include "libeio/eio.c"
331
332typedef eio_req *aio_req; 266typedef eio_req *aio_req;
333typedef eio_req *aio_req_ornot; 267typedef eio_req *aio_req_ornot;
268typedef eio_wd aio_wd;
334 269
335static SV *on_next_submit; 270static SV *on_next_submit;
336static int next_pri = EIO_PRI_DEFAULT; 271static int next_pri = EIO_PRI_DEFAULT;
337static int max_outstanding; 272static int max_outstanding;
338 273
339static s_epipe respipe; 274static s_epipe respipe;
340 275
341static void req_destroy (aio_req req); 276static void req_destroy (aio_req req);
342static void req_cancel (aio_req req); 277static void req_cancel (aio_req req);
343 278
344static void want_poll (void) 279static void
280want_poll (void)
345{ 281{
346 /* write a dummy byte to the pipe so fh becomes ready */ 282 /* write a dummy byte to the pipe so fh becomes ready */
347 s_epipe_signal (&respipe); 283 s_epipe_signal (&respipe);
348} 284}
349 285
350static void done_poll (void) 286static void
287done_poll (void)
351{ 288{
352 /* read any signals sent by the worker threads */ 289 /* read any signals sent by the worker threads */
353 s_epipe_drain (&respipe); 290 s_epipe_drain (&respipe);
354} 291}
355 292
356/* must be called at most once */ 293/* must be called at most once */
294static SV *
357static SV *req_sv (aio_req req, HV *stash) 295req_sv (aio_req req, HV *stash)
358{ 296{
359 if (!req->self) 297 if (!req->self)
360 { 298 {
361 req->self = (SV *)newHV (); 299 req->self = (SV *)newHV ();
362 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0); 300 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
363 } 301 }
364 302
365 return sv_2mortal (sv_bless (newRV_inc (req->self), stash)); 303 return sv_2mortal (sv_bless (newRV_inc (req->self), stash));
366} 304}
367 305
368static aio_req SvAIO_REQ (SV *sv) 306static SV *
307newSVaio_wd (aio_wd wd)
308{
309 return sv_bless (newRV_noinc (newSViv ((IV)wd)), aio_wd_stash);
310}
311
312static aio_req
313SvAIO_REQ (SV *sv)
369{ 314{
370 MAGIC *mg; 315 MAGIC *mg;
371 316
372 if (!SvROK (sv) 317 if (!SvROK (sv)
318 /* for speed reasons, we do not verify that SvROK actually has a stash ptr */
373 || (SvSTASH (SvRV (sv)) != aio_grp_stash 319 || (SvSTASH (SvRV (sv)) != aio_grp_stash
374 && SvSTASH (SvRV (sv)) != aio_req_stash 320 && SvSTASH (SvRV (sv)) != aio_req_stash
375 && !sv_derived_from (sv, "IO::AIO::REQ"))) 321 && !sv_derived_from (sv, "IO::AIO::REQ")))
376 croak ("object of class IO::AIO::REQ expected"); 322 croak ("object of class IO::AIO::REQ expected");
377 323
378 mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 324 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
379 325
380 return mg ? (aio_req)mg->mg_ptr : 0; 326 return mg ? (aio_req)mg->mg_ptr : 0;
381} 327}
382 328
329static aio_wd
330SvAIO_WD (SV *sv)
331{
332 if (!SvROK (sv)
333 || SvTYPE (SvRV (sv)) != SVt_PVMG
334 || SvSTASH (SvRV (sv)) != aio_wd_stash)
335 croak ("IO::AIO: expected a working directory object as returned by aio_wd");
336
337 return (aio_wd)(long)SvIVX (SvRV (sv));
338}
339
340static void
383static void aio_grp_feed (aio_req grp) 341aio_grp_feed (aio_req grp)
384{ 342{
385 if (grp->sv2 && SvOK (grp->sv2)) 343 if (grp->sv2 && SvOK (grp->sv2))
386 { 344 {
387 dSP; 345 dSP;
388 346
396 FREETMPS; 354 FREETMPS;
397 LEAVE; 355 LEAVE;
398 } 356 }
399} 357}
400 358
359static void
401static void req_submit (eio_req *req) 360req_submit (eio_req *req)
402{ 361{
403 eio_submit (req); 362 eio_submit (req);
404 363
405 if (expect_false (on_next_submit)) 364 if (expect_false (on_next_submit))
406 { 365 {
413 PUTBACK; 372 PUTBACK;
414 call_sv (cb, G_DISCARD | G_EVAL); 373 call_sv (cb, G_DISCARD | G_EVAL);
415 } 374 }
416} 375}
417 376
377static int
418static int req_invoke (eio_req *req) 378req_invoke (eio_req *req)
419{ 379{
420 if (req->flags & FLAG_SV2_RO_OFF) 380 if (req->flags & FLAG_SV2_RO_OFF)
421 SvREADONLY_off (req->sv2); 381 SvREADONLY_off (req->sv2);
422 382
423 if (!EIO_CANCELLED (req) && req->callback) 383 if (!EIO_CANCELLED (req) && req->callback)
444 SvREADONLY_on (sv_result); 404 SvREADONLY_on (sv_result);
445 } 405 }
446 406
447 switch (req->type) 407 switch (req->type)
448 { 408 {
409 case EIO_WD_OPEN:
410 PUSHs (req->result ? &PL_sv_undef : sv_2mortal (newSVaio_wd (req->wd)));
411 break;
412
449 case EIO_READDIR: 413 case EIO_READDIR:
450 { 414 {
451 SV *rv = &PL_sv_undef; 415 SV *rv = &PL_sv_undef;
452 416
453 if (req->result >= 0) 417 if (req->result >= 0)
541 case EIO_STATVFS: 505 case EIO_STATVFS:
542 case EIO_FSTATVFS: 506 case EIO_FSTATVFS:
543 { 507 {
544 SV *rv = &PL_sv_undef; 508 SV *rv = &PL_sv_undef;
545 509
510#ifndef _WIN32
546 if (req->result >= 0) 511 if (req->result >= 0)
547 { 512 {
548 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req); 513 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req);
549 HV *hv = newHV (); 514 HV *hv = newHV ();
515 /* POSIX requires fsid to be unsigned long, but AIX in its infinite wisdom
516 * chooses to make it a struct.
517 */
518 unsigned long fsid = 0;
519 memcpy (&fsid, &f->f_fsid, sizeof (unsigned long) < sizeof (f->f_fsid) ? sizeof (unsigned long) : sizeof (f->f_fsid));
550 520
551 rv = sv_2mortal (newRV_noinc ((SV *)hv)); 521 rv = sv_2mortal (newRV_noinc ((SV *)hv));
552 522
553 hv_store (hv, "bsize" , sizeof ("bsize" ) - 1, newSVval64 (f->f_bsize ), 0); 523 hv_store (hv, "bsize" , sizeof ("bsize" ) - 1, newSVval64 (f->f_bsize ), 0);
554 hv_store (hv, "frsize" , sizeof ("frsize" ) - 1, newSVval64 (f->f_frsize ), 0); 524 hv_store (hv, "frsize" , sizeof ("frsize" ) - 1, newSVval64 (f->f_frsize ), 0);
556 hv_store (hv, "bfree" , sizeof ("bfree" ) - 1, newSVval64 (f->f_bfree ), 0); 526 hv_store (hv, "bfree" , sizeof ("bfree" ) - 1, newSVval64 (f->f_bfree ), 0);
557 hv_store (hv, "bavail" , sizeof ("bavail" ) - 1, newSVval64 (f->f_bavail ), 0); 527 hv_store (hv, "bavail" , sizeof ("bavail" ) - 1, newSVval64 (f->f_bavail ), 0);
558 hv_store (hv, "files" , sizeof ("files" ) - 1, newSVval64 (f->f_files ), 0); 528 hv_store (hv, "files" , sizeof ("files" ) - 1, newSVval64 (f->f_files ), 0);
559 hv_store (hv, "ffree" , sizeof ("ffree" ) - 1, newSVval64 (f->f_ffree ), 0); 529 hv_store (hv, "ffree" , sizeof ("ffree" ) - 1, newSVval64 (f->f_ffree ), 0);
560 hv_store (hv, "favail" , sizeof ("favail" ) - 1, newSVval64 (f->f_favail ), 0); 530 hv_store (hv, "favail" , sizeof ("favail" ) - 1, newSVval64 (f->f_favail ), 0);
561 hv_store (hv, "fsid" , sizeof ("fsid" ) - 1, newSVval64 (f->f_fsid ), 0); 531 hv_store (hv, "fsid" , sizeof ("fsid" ) - 1, newSVval64 (fsid ), 0);
562 hv_store (hv, "flag" , sizeof ("flag" ) - 1, newSVval64 (f->f_flag ), 0); 532 hv_store (hv, "flag" , sizeof ("flag" ) - 1, newSVval64 (f->f_flag ), 0);
563 hv_store (hv, "namemax", sizeof ("namemax") - 1, newSVval64 (f->f_namemax), 0); 533 hv_store (hv, "namemax", sizeof ("namemax") - 1, newSVval64 (f->f_namemax), 0);
564 } 534 }
535#endif
565 536
566 PUSHs (rv); 537 PUSHs (rv);
567 } 538 }
568 539
569 break; 540 break;
593 break; 564 break;
594 565
595 case EIO_STAT: 566 case EIO_STAT:
596 case EIO_LSTAT: 567 case EIO_LSTAT:
597 case EIO_FSTAT: 568 case EIO_FSTAT:
598 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT; 569 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT;
570
599 PL_laststatval = req->result; 571 if (!(PL_laststatval = req->result))
572 /* if compilation fails here then perl's Stat_t is not struct _stati64 */
600 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 573 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
574
601 PUSHs (sv_result); 575 PUSHs (sv_result);
576 break;
577
578 case EIO_SEEK:
579 PUSHs (req->result ? sv_result : sv_2mortal (newSVval64 (req->offs)));
602 break; 580 break;
603 581
604 case EIO_READ: 582 case EIO_READ:
605 { 583 {
606 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0)); 584 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
609 SvSETMAGIC (req->sv2); 587 SvSETMAGIC (req->sv2);
610 PUSHs (sv_result); 588 PUSHs (sv_result);
611 } 589 }
612 break; 590 break;
613 591
592 case EIO_CUSTOM:
593 if (req->feed == fiemap)
594 {
595#if HAVE_FIEMAP
596 if (!req->result)
597 {
598 struct fiemap *fiemap = (struct fiemap *)req->ptr1;
599
600 if (fiemap->fm_extent_count)
601 {
602 AV *av = newAV ();
603 int i;
604
605 while (fiemap->fm_mapped_extents)
606 {
607 struct fiemap_extent *extent = &fiemap->fm_extents [--fiemap->fm_mapped_extents];
608 AV *ext_av = newAV ();
609
610 av_store (ext_av, 3, newSVuv (extent->fe_flags));
611 av_store (ext_av, 2, newSVval64 (extent->fe_length));
612 av_store (ext_av, 1, newSVval64 (extent->fe_physical));
613 av_store (ext_av, 0, newSVval64 (extent->fe_logical));
614
615 av_store (av, fiemap->fm_mapped_extents, newRV_noinc ((SV *)ext_av));
616 }
617
618 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
619 }
620 else
621 {
622 SvIV_set (sv_result, fiemap->fm_mapped_extents);
623 PUSHs (sv_result);
624 }
625 }
626#endif
627 }
628 else
629 PUSHs (sv_result);
630 break;
631
614 case EIO_DUP2: /* EIO_DUP2 actually means aio_close(), so fudge result value */ 632 case EIO_DUP2: /* EIO_DUP2 actually means aio_close(), so fudge result value */
615 if (req->result > 0) 633 if (req->result > 0)
616 SvIV_set (sv_result, 0); 634 SvIV_set (sv_result, 0);
617 /* FALLTHROUGH */ 635 /* FALLTHROUGH */
618 636
639 } 657 }
640 658
641 return !!SvTRUE (ERRSV); 659 return !!SvTRUE (ERRSV);
642} 660}
643 661
662static void
644static void req_destroy (aio_req req) 663req_destroy (aio_req req)
645{ 664{
646 if (req->self) 665 if (req->self)
647 { 666 {
648 sv_unmagic (req->self, PERL_MAGIC_ext); 667 sv_unmagic (req->self, PERL_MAGIC_ext);
649 SvREFCNT_dec (req->self); 668 SvREFCNT_dec (req->self);
650 } 669 }
651 670
652 SvREFCNT_dec (req->sv1); 671 SvREFCNT_dec (req->sv1);
653 SvREFCNT_dec (req->sv2); 672 SvREFCNT_dec (req->sv2);
673 SvREFCNT_dec (req->sv3);
674 SvREFCNT_dec (req->sv4);
654 SvREFCNT_dec (req->callback); 675 SvREFCNT_dec (req->callback);
655 676
656 Safefree (req); 677 free (req);
657} 678}
658 679
680static void
659static void req_cancel_subs (aio_req grp) 681req_cancel_subs (aio_req grp)
660{ 682{
661 aio_req sub;
662
663 if (grp->type != EIO_GROUP) 683 if (grp->type != EIO_GROUP)
664 return; 684 return;
665 685
666 SvREFCNT_dec (grp->sv2); 686 SvREFCNT_dec (grp->sv2);
667 grp->sv2 = 0; 687 grp->sv2 = 0;
668 688
669 eio_grp_cancel (grp); 689 eio_grp_cancel (grp);
670} 690}
671 691
692static void ecb_cold
672static void create_respipe (void) 693create_respipe (void)
673{ 694{
674 if (s_epipe_renew (&respipe)) 695 if (s_epipe_renew (&respipe))
675 croak ("IO::AIO: unable to initialize result pipe"); 696 croak ("IO::AIO: unable to initialize result pipe");
676} 697}
677 698
678static void poll_wait (void) 699static void
700poll_wait (void)
679{ 701{
680 while (eio_nreqs ()) 702 while (eio_nreqs ())
681 { 703 {
682 int size; 704 int size;
683 705
692 714
693 s_epipe_wait (&respipe); 715 s_epipe_wait (&respipe);
694 } 716 }
695} 717}
696 718
697static int poll_cb (void) 719static int
720poll_cb (void)
698{ 721{
699 for (;;) 722 for (;;)
700 { 723 {
701 int res = eio_poll (); 724 int res = eio_poll ();
702 725
708 731
709 poll_wait (); 732 poll_wait ();
710 } 733 }
711} 734}
712 735
713static void atfork_child (void) 736static void ecb_cold
737reinit (void)
714{ 738{
715 create_respipe (); 739 create_respipe ();
740
741 if (eio_init (want_poll, done_poll) < 0)
742 croak ("IO::AIO: unable to initialise eio library");
716} 743}
717 744
718/*****************************************************************************/ 745/*****************************************************************************/
719 746
720#if !_POSIX_MAPPED_FILES 747#if !_POSIX_MAPPED_FILES
721# define mmap(addr,length,prot,flags,fd,offs) (errno = ENOSYS, -1) 748# define mmap(addr,length,prot,flags,fd,offs) EIO_ENOSYS ()
722# define munmap(addr,length) (errno = ENOSYS, -1) 749# define munmap(addr,length) EIO_ENOSYS ()
723#endif 750#endif
724 751
725#if !_POSIX_MEMORY_PROTECTION 752#if !_POSIX_MEMORY_PROTECTION
726# define mprotect(addr,len,prot) (errno = ENOSYS, -1) 753# define mprotect(addr,len,prot) EIO_ENOSYS ()
727# define PROT_NONE 0 754# define PROT_NONE 0
728# define PROT_WRITE 0 755# define PROT_WRITE 0
729# define MAP_PRIVATE 0 756# define MAP_PRIVATE 0
730# define MAP_SHARED 0 757# define MAP_SHARED 0
731# define MAP_FIXED 0 758# define MAP_FIXED 0
732#endif 759#endif
733 760
734#define MMAP_MAGIC PERL_MAGIC_ext 761#define MMAP_MAGIC PERL_MAGIC_ext
735 762
763static int ecb_cold
736static int mmap_free (pTHX_ SV *sv, MAGIC *mg) 764mmap_free (pTHX_ SV *sv, MAGIC *mg)
737{ 765{
738 int old_errno = errno; 766 int old_errno = errno;
739 munmap (mg->mg_ptr, (size_t)mg->mg_obj); 767 munmap (mg->mg_ptr, (size_t)mg->mg_obj);
740 errno = old_errno; 768 errno = old_errno;
741 769
757 0, 0, 0, 0, mmap_free 785 0, 0, 0, 0, mmap_free
758}; 786};
759 787
760/*****************************************************************************/ 788/*****************************************************************************/
761 789
790static SV *
762static SV * get_cb (SV *cb_sv) 791get_cb (SV *cb_sv)
763{ 792{
764 SvGETMAGIC (cb_sv); 793 SvGETMAGIC (cb_sv);
765 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0; 794 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
766} 795}
767 796
797static aio_req ecb_noinline
798dreq (SV *callback)
799{
800 SV *cb_cv;
801 aio_req req;
802 int req_pri = next_pri;
803 next_pri = EIO_PRI_DEFAULT;
804
805 cb_cv = get_cb (callback);
806
807 req = calloc (sizeof (*req), 1);
808 if (!req)
809 croak ("out of memory during eio_req allocation");
810
811 req->callback = SvREFCNT_inc (cb_cv);
812 req->pri = req_pri;
813
814 return req;
815}
816
768#define dREQ \ 817#define dREQ \
769 SV *cb_cv; \ 818 aio_req req = dreq (callback); \
770 aio_req req; \
771 int req_pri = next_pri; \
772 next_pri = EIO_PRI_DEFAULT; \
773 \
774 cb_cv = get_cb (callback); \
775 \
776 Newz (0, req, 1, eio_req); \
777 if (!req) \
778 croak ("out of memory during eio_req allocation"); \
779 \
780 req->callback = SvREFCNT_inc (cb_cv); \
781 req->pri = req_pri
782 819
783#define REQ_SEND \ 820#define REQ_SEND \
784 PUTBACK; \ 821 PUTBACK; \
785 req_submit (req); \ 822 req_submit (req); \
786 SPAGAIN; \ 823 SPAGAIN; \
787 \ 824 \
788 if (GIMME_V != G_VOID) \ 825 if (GIMME_V != G_VOID) \
789 XPUSHs (req_sv (req, aio_req_stash)); 826 XPUSHs (req_sv (req, aio_req_stash));
790 827
828ecb_inline void
829req_set_path (aio_req req, SV *path, SV **wdsv, SV **pathsv, eio_wd *wd, void **ptr)
830{
831 if (expect_false (SvROK (path)))
832 {
833 SV *rv = SvRV (path);
834 SV *wdob;
835
836 if (SvTYPE (rv) == SVt_PVAV && AvFILLp (rv) == 1)
837 {
838 path = AvARRAY (rv)[1];
839 wdob = AvARRAY (rv)[0];
840
841 if (SvOK (wdob))
842 {
843 *wd = SvAIO_WD (wdob);
844 *wdsv = SvREFCNT_inc_NN (SvRV (wdob));
845 }
846 else
847 *wd = EIO_INVALID_WD;
848 }
849 else if (SvTYPE (rv) == SVt_PVMG && SvSTASH (rv) == aio_wd_stash)
850 {
851 *wd = (aio_wd)(long)SvIVX (rv);
852 *wdsv = SvREFCNT_inc_NN (rv);
853 *ptr = ".";
854 return; /* path set to "." */
855 }
856 else
857 croak ("IO::AIO: pathname arguments must be specified as a string, an IO::AIO::WD object or a [IO::AIO::WD, path] pair");
858 }
859
860 *pathsv = newSVsv (path);
861 *ptr = SvPVbyte_nolen (*pathsv);
862}
863
864static void ecb_noinline
865req_set_path1 (aio_req req, SV *path)
866{
867 req_set_path (req, path, &req->sv1, &req->sv3, &req->wd, &req->ptr1);
868}
869
870static void ecb_noinline
871req_set_fh_or_path (aio_req req, int type_path, int type_fh, SV *fh_or_path)
872{
873 SV *rv = SvROK (fh_or_path) ? SvRV (fh_or_path) : fh_or_path;
874
875 switch (SvTYPE (rv))
876 {
877 case SVt_PVIO:
878 case SVt_PVLV:
879 case SVt_PVGV:
880 req->type = type_fh;
881 req->sv1 = newSVsv (fh_or_path);
882 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
883 break;
884
885 default:
886 req->type = type_path;
887 req_set_path1 (req, fh_or_path);
888 break;
889 }
890}
891
892XS(boot_IO__AIO) ecb_cold;
893
791MODULE = IO::AIO PACKAGE = IO::AIO 894MODULE = IO::AIO PACKAGE = IO::AIO
792 895
793PROTOTYPES: ENABLE 896PROTOTYPES: ENABLE
794 897
795BOOT: 898BOOT:
799 IV iv; 902 IV iv;
800 } *civ, const_iv[] = { 903 } *civ, const_iv[] = {
801# define const_niv(name, value) { # name, (IV) value }, 904# define const_niv(name, value) { # name, (IV) value },
802# define const_iv(name) { # name, (IV) name }, 905# define const_iv(name) { # name, (IV) name },
803# define const_eio(name) { # name, (IV) EIO_ ## name }, 906# define const_eio(name) { # name, (IV) EIO_ ## name },
907
908 /* you have to re-run ./gendef0 after adding/Removing any constants here */
909
910 const_iv (ENOSYS)
804 const_iv (EXDEV) 911 const_iv (EXDEV)
805 const_iv (ENOSYS) 912 const_iv (EBADR)
913
806 const_iv (O_RDONLY) 914 const_iv (O_RDONLY)
807 const_iv (O_WRONLY) 915 const_iv (O_WRONLY)
808 const_iv (O_RDWR) 916 const_iv (O_RDWR)
809 const_iv (O_CREAT) 917 const_iv (O_CREAT)
810 const_iv (O_TRUNC) 918 const_iv (O_TRUNC)
878 const_iv (MAP_LOCKED) 986 const_iv (MAP_LOCKED)
879 const_iv (MAP_NORESERVE) 987 const_iv (MAP_NORESERVE)
880 const_iv (MAP_POPULATE) 988 const_iv (MAP_POPULATE)
881 const_iv (MAP_NONBLOCK) 989 const_iv (MAP_NONBLOCK)
882 990
991 const_iv (FIEMAP_FLAG_SYNC)
992 const_iv (FIEMAP_FLAG_XATTR)
993 const_iv (FIEMAP_FLAGS_COMPAT)
994 const_iv (FIEMAP_EXTENT_LAST)
995 const_iv (FIEMAP_EXTENT_UNKNOWN)
996 const_iv (FIEMAP_EXTENT_DELALLOC)
997 const_iv (FIEMAP_EXTENT_ENCODED)
998 const_iv (FIEMAP_EXTENT_DATA_ENCRYPTED)
999 const_iv (FIEMAP_EXTENT_NOT_ALIGNED)
1000 const_iv (FIEMAP_EXTENT_DATA_INLINE)
1001 const_iv (FIEMAP_EXTENT_DATA_TAIL)
1002 const_iv (FIEMAP_EXTENT_UNWRITTEN)
1003 const_iv (FIEMAP_EXTENT_MERGED)
1004 const_iv (FIEMAP_EXTENT_SHARED)
1005
1006 const_iv (SPLICE_F_MOVE)
1007 const_iv (SPLICE_F_NONBLOCK)
1008 const_iv (SPLICE_F_MORE)
1009 const_iv (SPLICE_F_GIFT)
1010
1011 const_iv (SEEK_DATA)
1012 const_iv (SEEK_HOLE)
1013
1014 /* libeio constants */
1015 const_eio (SEEK_SET)
1016 const_eio (SEEK_CUR)
1017 const_eio (SEEK_END)
1018
883 const_eio (MCL_FUTURE) 1019 const_eio (MCL_FUTURE)
884 const_eio (MCL_CURRENT) 1020 const_eio (MCL_CURRENT)
885 1021
886 const_eio (MS_ASYNC) 1022 const_eio (MS_ASYNC)
887 const_eio (MS_INVALIDATE) 1023 const_eio (MS_INVALIDATE)
892 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE) 1028 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
893 const_eio (SYNC_FILE_RANGE_WRITE) 1029 const_eio (SYNC_FILE_RANGE_WRITE)
894 const_eio (SYNC_FILE_RANGE_WAIT_AFTER) 1030 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
895 1031
896 const_eio (FALLOC_FL_KEEP_SIZE) 1032 const_eio (FALLOC_FL_KEEP_SIZE)
1033 const_eio (FALLOC_FL_PUNCH_HOLE)
897 1034
898 const_eio (READDIR_DENTS) 1035 const_eio (READDIR_DENTS)
899 const_eio (READDIR_DIRS_FIRST) 1036 const_eio (READDIR_DIRS_FIRST)
900 const_eio (READDIR_STAT_ORDER) 1037 const_eio (READDIR_STAT_ORDER)
901 const_eio (READDIR_FOUND_UNKNOWN) 1038 const_eio (READDIR_FOUND_UNKNOWN)
912 }; 1049 };
913 1050
914 aio_stash = gv_stashpv ("IO::AIO" , 1); 1051 aio_stash = gv_stashpv ("IO::AIO" , 1);
915 aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1); 1052 aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1);
916 aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1); 1053 aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1);
1054 aio_wd_stash = gv_stashpv ("IO::AIO::WD" , 1);
917 1055
918 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1056 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
919 newCONSTSUB (aio_stash, (char *)civ->name, newSViv (civ->iv)); 1057 newCONSTSUB (aio_stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
920 1058
921 newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE)); 1059 newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE));
922 1060
923 create_respipe (); 1061 reinit ();
924
925 if (eio_init (want_poll, done_poll) < 0)
926 croak ("IO::AIO: unable to initialise eio library");
927
928 /* atfork child called in fifo order, so before eio's handler */
929 X_THREAD_ATFORK (0, 0, atfork_child);
930} 1062}
1063
1064void
1065reinit ()
1066 PROTOTYPE:
931 1067
932void 1068void
933max_poll_reqs (unsigned int nreqs) 1069max_poll_reqs (unsigned int nreqs)
934 PROTOTYPE: $ 1070 PROTOTYPE: $
935 CODE: 1071 CODE:
970 PROTOTYPE: $ 1106 PROTOTYPE: $
971 CODE: 1107 CODE:
972 max_outstanding = maxreqs; 1108 max_outstanding = maxreqs;
973 1109
974void 1110void
1111aio_wd (SV8 *pathname, SV *callback=&PL_sv_undef)
1112 PPCODE:
1113{
1114 dREQ;
1115
1116 req->type = EIO_WD_OPEN;
1117 req_set_path1 (req, pathname);
1118
1119 REQ_SEND;
1120}
1121
1122void
975aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef) 1123aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef)
976 PPCODE: 1124 PPCODE:
977{ 1125{
978 dREQ; 1126 dREQ;
979 1127
980 req->type = EIO_OPEN; 1128 req->type = EIO_OPEN;
981 req->sv1 = newSVsv (pathname); 1129 req_set_path1 (req, pathname);
982 req->ptr1 = SvPVbyte_nolen (req->sv1);
983 req->int1 = flags; 1130 req->int1 = flags;
984 req->int2 = mode; 1131 req->int2 = mode;
985 1132
986 REQ_SEND; 1133 REQ_SEND;
987} 1134}
989void 1136void
990aio_fsync (SV *fh, SV *callback=&PL_sv_undef) 1137aio_fsync (SV *fh, SV *callback=&PL_sv_undef)
991 ALIAS: 1138 ALIAS:
992 aio_fsync = EIO_FSYNC 1139 aio_fsync = EIO_FSYNC
993 aio_fdatasync = EIO_FDATASYNC 1140 aio_fdatasync = EIO_FDATASYNC
1141 aio_syncfs = EIO_SYNCFS
994 PPCODE: 1142 PPCODE:
995{ 1143{
996 int fd = s_fileno_croak (fh, 0); 1144 int fd = s_fileno_croak (fh, 0);
997 dREQ; 1145 dREQ;
998 1146
999 req->type = ix; 1147 req->type = ix;
1000 req->sv1 = newSVsv (fh); 1148 req->sv1 = newSVsv (fh);
1001 req->int1 = fd; 1149 req->int1 = fd;
1002 1150
1003 REQ_SEND (req); 1151 REQ_SEND;
1004} 1152}
1005 1153
1006void 1154void
1007aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef) 1155aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef)
1008 PPCODE: 1156 PPCODE:
1009{ 1157{
1010 int fd = s_fileno_croak (fh, 0); 1158 int fd = s_fileno_croak (fh, 0);
1011 dREQ; 1159 dREQ;
1012 1160
1013 req->type = EIO_SYNC_FILE_RANGE; 1161 req->type = EIO_SYNC_FILE_RANGE;
1014 req->sv1 = newSVsv (fh); 1162 req->sv1 = newSVsv (fh);
1015 req->int1 = fd; 1163 req->int1 = fd;
1016 req->offs = offset; 1164 req->offs = offset;
1017 req->size = nbytes; 1165 req->size = nbytes;
1018 req->int2 = flags; 1166 req->int2 = flags;
1019 1167
1020 REQ_SEND (req); 1168 REQ_SEND;
1021} 1169}
1022 1170
1023void 1171void
1024aio_fallocate (SV *fh, int mode, off_t offset, size_t len, SV *callback=&PL_sv_undef) 1172aio_allocate (SV *fh, int mode, off_t offset, size_t len, SV *callback=&PL_sv_undef)
1025 PPCODE: 1173 PPCODE:
1026{ 1174{
1027 int fd = s_fileno_croak (fh, 0); 1175 int fd = s_fileno_croak (fh, 0);
1028 dREQ; 1176 dREQ;
1029 1177
1030 req->type = EIO_FALLOCATE; 1178 req->type = EIO_FALLOCATE;
1031 req->sv1 = newSVsv (fh); 1179 req->sv1 = newSVsv (fh);
1032 req->int1 = fd; 1180 req->int1 = fd;
1033 req->int2 = mode; 1181 req->int2 = mode;
1034 req->offs = offset; 1182 req->offs = offset;
1035 req->size = len; 1183 req->size = len;
1036 1184
1037 REQ_SEND (req); 1185 REQ_SEND;
1038} 1186}
1039 1187
1040void 1188void
1041aio_close (SV *fh, SV *callback=&PL_sv_undef) 1189aio_close (SV *fh, SV *callback=&PL_sv_undef)
1042 PPCODE: 1190 PPCODE:
1043{ 1191{
1044 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 1192 static int close_fd = -1; /* dummy fd to close fds via dup2 */
1045 int fd = s_fileno_croak (fh, 0); 1193 int fd = s_fileno_croak (fh, 0);
1046 dREQ; 1194 dREQ;
1047 1195
1048 if (close_pipe < 0) 1196 if (expect_false (close_fd < 0))
1049 { 1197 {
1050 int pipefd [2]; 1198 int pipefd [2];
1051 1199
1200 if (
1201#ifdef _WIN32
1202 _pipe (pipefd, 1, _O_BINARY) < 0
1203#else
1052 if (pipe (pipefd) < 0 1204 pipe (pipefd) < 0
1053 || close (pipefd [1]) < 0
1054 || fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0) 1205 || fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0
1206#endif
1207 || close (pipefd [1]) < 0
1208 )
1055 abort (); /*D*/ 1209 abort (); /*D*/
1056 1210
1057 close_pipe = pipefd [0]; 1211 close_fd = pipefd [0];
1058 } 1212 }
1059 1213
1060 req->type = EIO_DUP2; 1214 req->type = EIO_DUP2;
1061 req->int1 = close_pipe; 1215 req->int1 = close_fd;
1062 req->sv2 = newSVsv (fh); 1216 req->sv2 = newSVsv (fh);
1063 req->int2 = fd; 1217 req->int2 = fd;
1064 1218
1065 REQ_SEND (req); 1219 REQ_SEND;
1220}
1221
1222void
1223aio_seek (SV *fh, SV *offset, int whence, SV *callback=&PL_sv_undef)
1224 PPCODE:
1225{
1226 int fd = s_fileno_croak (fh, 0);
1227 dREQ;
1228
1229 req->type = EIO_SEEK;
1230 req->sv1 = newSVsv (fh);
1231 req->int1 = fd;
1232 req->offs = SvVAL64 (offset);
1233 req->int2 = whence;
1234
1235 REQ_SEND;
1066} 1236}
1067 1237
1068void 1238void
1069aio_read (SV *fh, SV *offset, SV *length, SV8 *data, IV dataoffset, SV *callback=&PL_sv_undef) 1239aio_read (SV *fh, SV *offset, SV *length, SV8 *data, IV dataoffset, SV *callback=&PL_sv_undef)
1070 ALIAS: 1240 ALIAS:
1091 } 1261 }
1092 else 1262 else
1093 { 1263 {
1094 /* read: check type and grow scalar as necessary */ 1264 /* read: check type and grow scalar as necessary */
1095 SvUPGRADE (data, SVt_PV); 1265 SvUPGRADE (data, SVt_PV);
1266 if (SvLEN (data) >= SvCUR (data))
1096 svptr = SvGROW (data, len + dataoffset + 1); 1267 svptr = SvGROW (data, len + dataoffset + 1);
1268 else if (SvCUR (data) < len + dataoffset)
1269 croak ("length + dataoffset outside of scalar, and cannot grow");
1097 } 1270 }
1098 1271
1099 { 1272 {
1100 dREQ; 1273 dREQ;
1101 1274
1117 REQ_SEND; 1290 REQ_SEND;
1118 } 1291 }
1119} 1292}
1120 1293
1121void 1294void
1122aio_readlink (SV8 *path, SV *callback=&PL_sv_undef) 1295aio_readlink (SV8 *pathname, SV *callback=&PL_sv_undef)
1123 ALIAS: 1296 ALIAS:
1124 aio_readlink = EIO_READLINK 1297 aio_readlink = EIO_READLINK
1125 aio_realpath = EIO_REALPATH 1298 aio_realpath = EIO_REALPATH
1126 PPCODE: 1299 PPCODE:
1127{ 1300{
1128 SV *data;
1129 dREQ; 1301 dREQ;
1130 1302
1131 req->type = ix; 1303 req->type = ix;
1132 req->sv1 = newSVsv (path); 1304 req_set_path1 (req, pathname);
1133 req->ptr1 = SvPVbyte_nolen (req->sv1);
1134 1305
1135 REQ_SEND; 1306 REQ_SEND;
1136} 1307}
1137 1308
1138void 1309void
1139aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef) 1310aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef)
1140 PPCODE: 1311 PPCODE:
1141{ 1312{
1142 int ifd = s_fileno_croak (in_fh , 0); 1313 int ifd = s_fileno_croak (in_fh , 0);
1143 int ofd = s_fileno_croak (out_fh, 1); 1314 int ofd = s_fileno_croak (out_fh, 1);
1144 dREQ; 1315 dREQ;
1145 1316
1146 req->type = EIO_SENDFILE; 1317 req->type = EIO_SENDFILE;
1147 req->sv1 = newSVsv (out_fh); 1318 req->sv1 = newSVsv (out_fh);
1148 req->int1 = ofd; 1319 req->int1 = ofd;
1156 1327
1157void 1328void
1158aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef) 1329aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef)
1159 PPCODE: 1330 PPCODE:
1160{ 1331{
1161 int fd = s_fileno_croak (fh, 0); 1332 int fd = s_fileno_croak (fh, 0);
1162 dREQ; 1333 dREQ;
1163 1334
1164 req->type = EIO_READAHEAD; 1335 req->type = EIO_READAHEAD;
1165 req->sv1 = newSVsv (fh); 1336 req->sv1 = newSVsv (fh);
1166 req->int1 = fd; 1337 req->int1 = fd;
1178 aio_statvfs = EIO_STATVFS 1349 aio_statvfs = EIO_STATVFS
1179 PPCODE: 1350 PPCODE:
1180{ 1351{
1181 dREQ; 1352 dREQ;
1182 1353
1183 req->sv1 = newSVsv (fh_or_path); 1354 req_set_fh_or_path (req, ix, ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT, fh_or_path);
1184
1185 if (SvPOK (req->sv1))
1186 {
1187 req->type = ix;
1188 req->ptr1 = SvPVbyte_nolen (req->sv1);
1189 }
1190 else
1191 {
1192 req->type = ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT;
1193 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1194 }
1195 1355
1196 REQ_SEND; 1356 REQ_SEND;
1197} 1357}
1198 1358
1199UV 1359UV
1218{ 1378{
1219 dREQ; 1379 dREQ;
1220 1380
1221 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 1381 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
1222 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; 1382 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
1223 req->sv1 = newSVsv (fh_or_path); 1383 req_set_fh_or_path (req, EIO_UTIME, EIO_FUTIME, fh_or_path);
1224
1225 if (SvPOK (req->sv1))
1226 {
1227 req->type = EIO_UTIME;
1228 req->ptr1 = SvPVbyte_nolen (req->sv1);
1229 }
1230 else
1231 {
1232 req->type = EIO_FUTIME;
1233 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1234 }
1235 1384
1236 REQ_SEND; 1385 REQ_SEND;
1237} 1386}
1238 1387
1239void 1388void
1240aio_truncate (SV8 *fh_or_path, SV *offset, SV *callback=&PL_sv_undef) 1389aio_truncate (SV8 *fh_or_path, SV *offset, SV *callback=&PL_sv_undef)
1241 PPCODE: 1390 PPCODE:
1242{ 1391{
1243 dREQ; 1392 dREQ;
1244 1393
1245 req->sv1 = newSVsv (fh_or_path);
1246 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 1394 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
1247 1395 req_set_fh_or_path (req, EIO_TRUNCATE, EIO_FTRUNCATE, fh_or_path);
1248 if (SvPOK (req->sv1))
1249 {
1250 req->type = EIO_TRUNCATE;
1251 req->ptr1 = SvPVbyte_nolen (req->sv1);
1252 }
1253 else
1254 {
1255 req->type = EIO_FTRUNCATE;
1256 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1257 }
1258 1396
1259 REQ_SEND; 1397 REQ_SEND;
1260} 1398}
1261 1399
1262void 1400void
1263aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef) 1401aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
1264 ALIAS:
1265 aio_chmod = EIO_CHMOD
1266 aio_mkdir = EIO_MKDIR
1267 PPCODE: 1402 PPCODE:
1268{ 1403{
1269 dREQ; 1404 dREQ;
1270 1405
1271 req->int2 = mode; 1406 req->int2 = mode;
1272 req->sv1 = newSVsv (fh_or_path); 1407 req_set_fh_or_path (req, EIO_CHMOD, EIO_FCHMOD, fh_or_path);
1273
1274 if (SvPOK (req->sv1))
1275 {
1276 req->type = ix;
1277 req->ptr1 = SvPVbyte_nolen (req->sv1);
1278 }
1279 else
1280 {
1281 req->type = EIO_FCHMOD;
1282 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1283 }
1284 1408
1285 REQ_SEND; 1409 REQ_SEND;
1286} 1410}
1287 1411
1288void 1412void
1291{ 1415{
1292 dREQ; 1416 dREQ;
1293 1417
1294 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 1418 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
1295 req->int3 = SvOK (gid) ? SvIV (gid) : -1; 1419 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
1296 req->sv1 = newSVsv (fh_or_path); 1420 req_set_fh_or_path (req, EIO_CHOWN, EIO_FCHOWN, fh_or_path);
1297
1298 if (SvPOK (req->sv1))
1299 {
1300 req->type = EIO_CHOWN;
1301 req->ptr1 = SvPVbyte_nolen (req->sv1);
1302 }
1303 else
1304 {
1305 req->type = EIO_FCHOWN;
1306 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1307 }
1308 1421
1309 REQ_SEND; 1422 REQ_SEND;
1310} 1423}
1311 1424
1312void 1425void
1314 PPCODE: 1427 PPCODE:
1315{ 1428{
1316 dREQ; 1429 dREQ;
1317 1430
1318 req->type = EIO_READDIR; 1431 req->type = EIO_READDIR;
1319 req->sv1 = newSVsv (pathname);
1320 req->ptr1 = SvPVbyte_nolen (req->sv1);
1321 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1; 1432 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
1322 1433
1323 if (flags & EIO_READDIR_DENTS) 1434 if (flags & EIO_READDIR_DENTS)
1324 req->int1 |= EIO_READDIR_CUSTOM2; 1435 req->int1 |= EIO_READDIR_CUSTOM2;
1325 1436
1437 req_set_path1 (req, pathname);
1438
1326 REQ_SEND; 1439 REQ_SEND;
1440}
1441
1442void
1443aio_mkdir (SV8 *pathname, int mode, SV *callback=&PL_sv_undef)
1444 PPCODE:
1445{
1446 dREQ;
1447
1448 req->type = EIO_MKDIR;
1449 req->int2 = mode;
1450 req_set_path1 (req, pathname);
1451
1452 REQ_SEND;
1327} 1453}
1328 1454
1329void 1455void
1330aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 1456aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
1331 ALIAS: 1457 ALIAS:
1335 PPCODE: 1461 PPCODE:
1336{ 1462{
1337 dREQ; 1463 dREQ;
1338 1464
1339 req->type = ix; 1465 req->type = ix;
1340 req->sv1 = newSVsv (pathname); 1466 req_set_path1 (req, pathname);
1341 req->ptr1 = SvPVbyte_nolen (req->sv1);
1342 1467
1343 REQ_SEND; 1468 REQ_SEND;
1344} 1469}
1345 1470
1346void 1471void
1349 aio_link = EIO_LINK 1474 aio_link = EIO_LINK
1350 aio_symlink = EIO_SYMLINK 1475 aio_symlink = EIO_SYMLINK
1351 aio_rename = EIO_RENAME 1476 aio_rename = EIO_RENAME
1352 PPCODE: 1477 PPCODE:
1353{ 1478{
1479 eio_wd wd2 = 0;
1354 dREQ; 1480 dREQ;
1355 1481
1356 req->type = ix; 1482 req->type = ix;
1357 req->sv1 = newSVsv (oldpath); 1483 req_set_path1 (req, oldpath);
1358 req->ptr1 = SvPVbyte_nolen (req->sv1); 1484 req_set_path (req, newpath, &req->sv2, &req->sv4, &wd2, &req->ptr2);
1359 req->sv2 = newSVsv (newpath); 1485 req->int3 = (long)wd2;
1360 req->ptr2 = SvPVbyte_nolen (req->sv2);
1361 1486
1362 REQ_SEND; 1487 REQ_SEND;
1363} 1488}
1364 1489
1365void 1490void
1367 PPCODE: 1492 PPCODE:
1368{ 1493{
1369 dREQ; 1494 dREQ;
1370 1495
1371 req->type = EIO_MKNOD; 1496 req->type = EIO_MKNOD;
1372 req->sv1 = newSVsv (pathname);
1373 req->ptr1 = SvPVbyte_nolen (req->sv1);
1374 req->int2 = (mode_t)mode; 1497 req->int2 = (mode_t)mode;
1375 req->offs = dev; 1498 req->offs = dev;
1499 req_set_path1 (req, pathname);
1376 1500
1377 REQ_SEND; 1501 REQ_SEND;
1378} 1502}
1379 1503
1380void 1504void
1450 1574
1451 REQ_SEND; 1575 REQ_SEND;
1452} 1576}
1453 1577
1454void 1578void
1579aio_fiemap (SV *fh, off_t start, SV *length, U32 flags, SV *count, SV *callback=&PL_sv_undef)
1580 PPCODE:
1581{
1582 int fd = s_fileno_croak (fh, 0);
1583 dREQ;
1584
1585 req->type = EIO_CUSTOM;
1586 req->sv1 = newSVsv (fh);
1587 req->int1 = fd;
1588
1589 req->feed = fiemap;
1590#if HAVE_FIEMAP
1591 /* keep our fingers crossed that the next two types are 64 bit */
1592 req->offs = start;
1593 req->size = SvOK (length) ? SvVAL64 (length) : ~0ULL;
1594 req->int2 = flags;
1595 req->int3 = SvOK (count) ? SvIV (count) : -1;
1596#endif
1597
1598 REQ_SEND;
1599}
1600
1601void
1455aio_busy (double delay, SV *callback=&PL_sv_undef) 1602aio_busy (double delay, SV *callback=&PL_sv_undef)
1456 PPCODE: 1603 PPCODE:
1457{ 1604{
1458 dREQ; 1605 dREQ;
1459 1606
1469{ 1616{
1470 dREQ; 1617 dREQ;
1471 1618
1472 req->type = EIO_GROUP; 1619 req->type = EIO_GROUP;
1473 1620
1621 PUTBACK;
1474 req_submit (req); 1622 req_submit (req);
1623 SPAGAIN;
1624
1475 XPUSHs (req_sv (req, aio_grp_stash)); 1625 XPUSHs (req_sv (req, aio_grp_stash));
1476} 1626}
1477 1627
1478void 1628void
1479aio_nop (SV *callback=&PL_sv_undef) 1629aio_nop (SV *callback=&PL_sv_undef)
1580 CODE: 1730 CODE:
1581 RETVAL = posix_fadvise (fh, offset, length, advice); 1731 RETVAL = posix_fadvise (fh, offset, length, advice);
1582 OUTPUT: 1732 OUTPUT:
1583 RETVAL 1733 RETVAL
1584 1734
1585ssize_t 1735IV
1586sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count) 1736sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
1587 CODE: 1737 CODE:
1588 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count); 1738 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count);
1589 OUTPUT: 1739 OUTPUT:
1590 RETVAL 1740 RETVAL
1591 1741
1592void 1742void
1593mmap (SV *scalar, size_t length, int prot, int flags, SV *fh, off_t offset = 0) 1743mmap (SV *scalar, size_t length, int prot, int flags, SV *fh = &PL_sv_undef, off_t offset = 0)
1594 PPCODE: 1744 PPCODE:
1595 sv_unmagic (scalar, MMAP_MAGIC); 1745 sv_unmagic (scalar, MMAP_MAGIC);
1596{ 1746{
1597 int fd = SvOK (fh) ? s_fileno_croak (fh, flags & PROT_WRITE) : -1; 1747 int fd = SvOK (fh) ? s_fileno_croak (fh, flags & PROT_WRITE) : -1;
1598 void *addr = (void *)mmap (0, length, prot, flags, fd, offset); 1748 void *addr = (void *)mmap (0, length, prot, flags, fd, offset);
1631 ALIAS: 1781 ALIAS:
1632 mprotect = 1 1782 mprotect = 1
1633 CODE: 1783 CODE:
1634{ 1784{
1635 STRLEN svlen; 1785 STRLEN svlen;
1636 void *addr = SvPVbyte (scalar, svlen); 1786 void *addr = SvPVbyte (scalar, svlen);
1637 size_t len = SvUV (length); 1787 size_t len = SvUV (length);
1638 1788
1639 if (offset < 0) 1789 if (offset < 0)
1640 offset += svlen; 1790 offset += svlen;
1641 1791
1660int 1810int
1661munlock (SV *scalar, off_t offset = 0, SV *length = &PL_sv_undef) 1811munlock (SV *scalar, off_t offset = 0, SV *length = &PL_sv_undef)
1662 CODE: 1812 CODE:
1663{ 1813{
1664 STRLEN svlen; 1814 STRLEN svlen;
1665 void *addr = SvPVbyte (scalar, svlen); 1815 void *addr = SvPVbyte (scalar, svlen);
1666 size_t len = SvUV (length); 1816 size_t len = SvUV (length);
1667 1817
1668 if (offset < 0) 1818 if (offset < 0)
1669 offset += svlen; 1819 offset += svlen;
1670 1820
1677 addr = (void *)(((intptr_t)addr) + offset); 1827 addr = (void *)(((intptr_t)addr) + offset);
1678 eio_page_align (&addr, &len); 1828 eio_page_align (&addr, &len);
1679#if _POSIX_MEMLOCK_RANGE 1829#if _POSIX_MEMLOCK_RANGE
1680 RETVAL = munlock (addr, len); 1830 RETVAL = munlock (addr, len);
1681#else 1831#else
1682 RETVAL = ((errno = ENOSYS), -1); 1832 RETVAL = EIO_ENOSYS ();
1683#endif 1833#endif
1684} 1834}
1685 OUTPUT: 1835 OUTPUT:
1686 RETVAL 1836 RETVAL
1687 1837
1689munlockall () 1839munlockall ()
1690 CODE: 1840 CODE:
1691#if _POSIX_MEMLOCK 1841#if _POSIX_MEMLOCK
1692 munlockall (); 1842 munlockall ();
1693#else 1843#else
1844 RETVAL = EIO_ENOSYS ();
1845#endif
1846 OUTPUT:
1847 RETVAL
1848
1849int
1850splice (aio_rfd rfh, SV *off_in, aio_wfd wfh, SV *off_out, size_t length, unsigned int flags)
1851 CODE:
1852{
1853#if HAVE_LINUX_SPLICE
1854 loff_t off_in_, off_out_;
1855 RETVAL = splice (
1856 rfh, SvOK (off_in ) ? (off_in_ = SvVAL64 (off_in )), &off_in_ : 0,
1857 wfh, SvOK (off_out) ? (off_out_ = SvVAL64 (off_out)), &off_out_ : 0,
1858 length, flags
1859 );
1860#else
1861 RETVAL = EIO_ENOSYS ();
1862#endif
1863}
1864 OUTPUT:
1865 RETVAL
1866
1867int
1868tee (aio_rfd rfh, aio_wfd wfh, size_t length, unsigned int flags)
1869 CODE:
1870#if HAVE_LINUX_SPLICE
1871 RETVAL = tee (rfh, wfh, length, flags);
1872#else
1873 RETVAL = EIO_ENOSYS ();
1874#endif
1875 OUTPUT:
1876 RETVAL
1877
1878int
1879pipesize (aio_rfd rfh, int new_size = -1)
1880 PROTOTYPE: $;$
1881 CODE:
1882#if defined(F_SETPIPE_SZ) && defined(F_GETPIPE_SZ)
1883 if (new_size >= 0)
1884 RETVAL = fcntl (rfh, F_SETPIPE_SZ, new_size);
1885 else
1886 RETVAL = fcntl (rfh, F_GETPIPE_SZ);
1887#else
1888 errno = ENOSYS;
1694 RETVAL = -1; 1889 RETVAL = -1;
1695 errno = ENOSYS;
1696#endif 1890#endif
1697 OUTPUT: 1891 OUTPUT:
1698 RETVAL 1892 RETVAL
1699 1893
1700void _on_next_submit (SV *cb) 1894void _on_next_submit (SV *cb)
1702 SvREFCNT_dec (on_next_submit); 1896 SvREFCNT_dec (on_next_submit);
1703 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1897 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1704 1898
1705PROTOTYPES: DISABLE 1899PROTOTYPES: DISABLE
1706 1900
1901MODULE = IO::AIO PACKAGE = IO::AIO::WD
1902
1903BOOT:
1904{
1905 newCONSTSUB (aio_stash, "CWD" , newSVaio_wd (EIO_CWD ));
1906 newCONSTSUB (aio_stash, "INVALID_WD", newSVaio_wd (EIO_INVALID_WD));
1907}
1908
1909void
1910DESTROY (SV *self)
1911 CODE:
1912{
1913 aio_wd wd = SvAIO_WD (self);
1914#if HAVE_AT
1915 {
1916 SV *callback = &PL_sv_undef;
1917 dREQ; /* clobbers next_pri :/ */
1918 next_pri = req->pri; /* restore next_pri */
1919 req->pri = EIO_PRI_MAX; /* better use max. priority to conserve fds */
1920 req->type = EIO_WD_CLOSE;
1921 req->wd = wd;
1922 REQ_SEND;
1923 }
1924#else
1925 eio_wd_close_sync (wd);
1926#endif
1927}
1928
1707MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1929MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1708 1930
1709void 1931void
1710cancel (aio_req_ornot req) 1932cancel (aio_req_ornot req)
1711 CODE: 1933 CODE:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines