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.2 by root, Sun Jul 10 18:16:49 2005 UTC vs.
Revision 1.49 by root, Sun Oct 22 13:33:28 2006 UTC

1#define PERL_NO_GET_CONTEXT 1#define _REENTRANT 1
2#include <errno.h>
2 3
3#include "EXTERN.h" 4#include "EXTERN.h"
4#include "perl.h" 5#include "perl.h"
5#include "XSUB.h" 6#include "XSUB.h"
6 7
8#include "autoconf/config.h"
9
10#include <pthread.h>
11
12#include <stddef.h>
13#include <errno.h>
14#include <sys/time.h>
15#include <sys/select.h>
7#include <sys/types.h> 16#include <sys/types.h>
8#include <sys/stat.h> 17#include <sys/stat.h>
18#include <limits.h>
9#include <unistd.h> 19#include <unistd.h>
10#include <fcntl.h> 20#include <fcntl.h>
11#include <signal.h> 21#include <signal.h>
12#include <sched.h> 22#include <sched.h>
13#include <endian.h>
14 23
15#include <pthread.h> 24#if HAVE_SENDFILE
25# if __linux
26# include <sys/sendfile.h>
27# elif __freebsd
16#include <sys/syscall.h> 28# include <sys/socket.h>
29# include <sys/uio.h>
30# elif __hpux
31# include <sys/socket.h>
32# elif __solaris /* not yet */
33# include <sys/sendfile.h>
34# else
35# error sendfile support requested but not available
36# endif
37#endif
17 38
18typedef void *InputStream; /* hack, but 5.6.1 is simply toooo old ;) */ 39/* used for struct dirent, AIX doesn't provide it */
19typedef void *OutputStream; /* hack, but 5.6.1 is simply toooo old ;) */ 40#ifndef NAME_MAX
20typedef void *InOutStream; /* hack, but 5.6.1 is simply toooo old ;) */ 41# define NAME_MAX 4096
42#endif
21 43
22#if __i386 || __amd64
23# define STACKSIZE ( 256 * sizeof (long))
24#elif __ia64 44#if __ia64
25# define STACKSIZE (8192 * sizeof (long)) 45# define STACKSIZE 65536
26#else 46#else
27# define STACKSIZE ( 512 * sizeof (long)) 47# define STACKSIZE 8192
28#endif 48#endif
29 49
30enum { 50enum {
31 REQ_QUIT, 51 REQ_QUIT,
32 REQ_OPEN, REQ_CLOSE, 52 REQ_OPEN, REQ_CLOSE,
33 REQ_READ, REQ_WRITE, REQ_READAHEAD, 53 REQ_READ, REQ_WRITE, REQ_READAHEAD,
54 REQ_SENDFILE,
34 REQ_STAT, REQ_LSTAT, REQ_FSTAT, REQ_UNLINK, 55 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
35 REQ_FSYNC, REQ_FDATASYNC, 56 REQ_FSYNC, REQ_FDATASYNC,
57 REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
58 REQ_READDIR,
59 REQ_LINK, REQ_SYMLINK,
60 REQ_SLEEP,
61 REQ_GROUP,
36}; 62};
37 63
64#define AIO_REQ_KLASS "IO::AIO::REQ"
65#define AIO_GRP_KLASS "IO::AIO::GRP"
66
38typedef struct aio_cb { 67typedef struct aio_cb
68{
39 struct aio_cb *next; 69 struct aio_cb *volatile next;
40 70
41 int type; 71 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
42 72
43 int fd; 73 SV *self; /* the perl counterpart of this request, if any */
74
75 SV *data, *callback;
76 SV *fh, *fh2;
77 void *dataptr, *data2ptr;
78 Stat_t *statdata;
44 off_t offset; 79 off_t offset;
45 size_t length; 80 size_t length;
46 ssize_t result; 81 ssize_t result;
82
83 int type;
84 int fd, fd2;
85 int errorno;
86 STRLEN dataoffset;
47 mode_t mode; /* open */ 87 mode_t mode; /* open */
48 int errorno; 88 unsigned char cancelled;
49 SV *data, *callback;
50 void *dataptr;
51 STRLEN dataoffset;
52
53 Stat_t *statdata;
54} aio_cb; 89} aio_cb;
55 90
56typedef aio_cb *aio_req; 91typedef aio_cb *aio_req;
92typedef aio_cb *aio_req_ornot;
57 93
58static int started; 94static int started, wanted;
59static int nreqs; 95static volatile int nreqs;
96static int max_outstanding = 1<<30;
60static int reqpipe[2], respipe[2]; 97static int respipe [2];
61 98
99static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER;
100static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER;
101static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
102
62static aio_req qs, qe; /* queue start, queue end */ 103static volatile aio_req reqs, reqe; /* queue start, queue end */
104static volatile aio_req ress, rese; /* queue start, queue end */
63 105
64static void *aio_proc(void *arg); 106static void req_free (aio_req req);
65 107
66static void 108/* must be called at most once */
67start_thread (void) 109static SV *req_sv (aio_req req, const char *klass)
68{ 110{
69 sigset_t fullsigset, oldsigset; 111 if (!req->self)
70 pthread_t tid;
71 pthread_attr_t attr;
72
73 pthread_attr_init (&attr);
74 pthread_attr_setstacksize (&attr, STACKSIZE);
75 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
76
77 sigfillset (&fullsigset);
78 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
79
80 if (pthread_create (&tid, &attr, aio_proc, 0) == 0)
81 started++;
82
83 sigprocmask (SIG_SETMASK, &oldsigset, 0);
84}
85
86static void
87send_reqs (void)
88{
89 /* this write is atomic */
90 while (qs && write (reqpipe[1], &qs, sizeof qs) == sizeof qs)
91 { 112 {
92 qs = qs->next; 113 req->self = (SV *)newHV ();
93 if (!qs) qe = 0; 114 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
94 } 115 }
95}
96 116
97static void 117 return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1)));
98send_req (aio_req req) 118}
99{
100 nreqs++;
101 req->next = 0;
102 119
103 if (qe) 120static aio_req SvAIO_REQ (SV *sv)
104 { 121{
105 qe->next = req; 122 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv))
106 qe = req; 123 croak ("object of class " AIO_REQ_KLASS " expected");
124
125 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
126
127 return mg ? (aio_req)mg->mg_ptr : 0;
128}
129
130static void aio_grp_feed (aio_req grp)
131{
132 while (grp->length < grp->fd2)
107 } 133 {
108 else 134 int old_len = grp->length;
109 qe = qs = req;
110 135
111 send_reqs (); 136 if (grp->fh2 && SvOK (grp->fh2))
112} 137 {
138 dSP;
113 139
114static void 140 ENTER;
115end_thread (void) 141 SAVETMPS;
116{ 142 PUSHMARK (SP);
117 aio_req req; 143 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
118 New (0, req, 1, aio_cb); 144 PUTBACK;
119 req->type = REQ_QUIT; 145 call_sv (grp->fh2, G_VOID | G_EVAL);
146 SPAGAIN;
147 FREETMPS;
148 LEAVE;
149 }
120 150
121 send_req (req); 151 /* stop if no progress has been made */
122} 152 if (old_len == grp->length)
123 153 {
124static void 154 SvREFCNT_dec (grp->fh2);
125read_write (pTHX_ 155 grp->fh2 = 0;
126 int dowrite, int fd, off_t offset, size_t length, 156 break;
127 SV *data, STRLEN dataoffset, SV *callback) 157 }
128{
129 aio_req req;
130 STRLEN svlen;
131 char *svptr = SvPV (data, svlen);
132
133 SvUPGRADE (data, SVt_PV);
134 SvPOK_on (data);
135
136 if (dataoffset < 0)
137 dataoffset += svlen;
138
139 if (dataoffset < 0 || dataoffset > svlen)
140 croak ("data offset outside of string");
141
142 if (dowrite)
143 { 158 }
144 /* write: check length and adjust. */ 159}
145 if (length < 0 || length + dataoffset > svlen) 160
146 length = svlen - dataoffset; 161static void poll_wait ()
162{
163 if (nreqs && !ress)
147 } 164 {
148 else
149 {
150 /* read: grow scalar as necessary */
151 svptr = SvGROW (data, length + dataoffset);
152 }
153
154 if (length < 0)
155 croak ("length must not be negative");
156
157 Newz (0, req, 1, aio_cb);
158
159 if (!req)
160 croak ("out of memory during aio_req allocation");
161
162 req->type = dowrite ? REQ_WRITE : REQ_READ;
163 req->fd = fd;
164 req->offset = offset;
165 req->length = length;
166 req->data = SvREFCNT_inc (data);
167 req->dataptr = (char *)svptr + dataoffset;
168 req->callback = SvREFCNT_inc (callback);
169
170 send_req (req);
171}
172
173static void
174poll_wait ()
175{
176 fd_set rfd; 165 fd_set rfd;
177 FD_ZERO(&rfd); 166 FD_ZERO(&rfd);
178 FD_SET(respipe[0], &rfd); 167 FD_SET(respipe [0], &rfd);
179 168
180 select (respipe[0] + 1, &rfd, 0, 0, 0); 169 select (respipe [0] + 1, &rfd, 0, 0, 0);
170 }
181} 171}
182 172
183static int 173static void req_invoke (aio_req req)
184poll_cb (pTHX) 174{
175 dSP;
176 int errorno = errno;
177
178 if (req->cancelled || !SvOK (req->callback))
179 return;
180
181 errno = req->errorno;
182
183 ENTER;
184 SAVETMPS;
185 PUSHMARK (SP);
186 EXTEND (SP, 1);
187
188 switch (req->type)
189 {
190 case REQ_READDIR:
191 {
192 SV *rv = &PL_sv_undef;
193
194 if (req->result >= 0)
195 {
196 char *buf = req->data2ptr;
197 AV *av = newAV ();
198
199 while (req->result)
200 {
201 SV *sv = newSVpv (buf, 0);
202
203 av_push (av, sv);
204 buf += SvCUR (sv) + 1;
205 req->result--;
206 }
207
208 rv = sv_2mortal (newRV_noinc ((SV *)av));
209 }
210
211 PUSHs (rv);
212 }
213 break;
214
215 case REQ_OPEN:
216 {
217 /* convert fd to fh */
218 SV *fh;
219
220 PUSHs (sv_2mortal (newSViv (req->result)));
221 PUTBACK;
222 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
223 SPAGAIN;
224
225 fh = SvREFCNT_inc (POPs);
226
227 PUSHMARK (SP);
228 XPUSHs (sv_2mortal (fh));
229 }
230 break;
231
232 case REQ_GROUP:
233 req->fd = 2; /* mark group as finished */
234
235 if (req->data)
236 {
237 int i;
238 AV *av = (AV *)req->data;
239
240 EXTEND (SP, AvFILL (av) + 1);
241 for (i = 0; i <= AvFILL (av); ++i)
242 PUSHs (*av_fetch (av, i, 0));
243 }
244 break;
245
246 case REQ_SLEEP:
247 break;
248
249 default:
250 PUSHs (sv_2mortal (newSViv (req->result)));
251 break;
252 }
253
254
255 PUTBACK;
256 call_sv (req->callback, G_VOID | G_EVAL);
257 SPAGAIN;
258
259 if (SvTRUE (ERRSV))
260 {
261 req_free (req);
262 croak (0);
263 }
264
265 FREETMPS;
266 LEAVE;
267
268 errno = errorno;
269}
270
271static void req_free (aio_req req)
272{
273 if (req->grp)
274 {
275 aio_req grp = req->grp;
276
277 /* unlink request */
278 if (req->grp_next) req->grp_next->grp_prev = req->grp_prev;
279 if (req->grp_prev) req->grp_prev->grp_next = req->grp_next;
280
281 if (grp->grp_first == req)
282 grp->grp_first = req->grp_next;
283
284 --grp->length;
285
286 /* call feeder, if applicable */
287 aio_grp_feed (grp);
288
289 /* finish, if done */
290 if (!grp->length && grp->fd)
291 {
292 req_invoke (grp);
293 req_free (grp);
294 }
295 }
296
297 if (req->self)
298 {
299 sv_unmagic (req->self, PERL_MAGIC_ext);
300 SvREFCNT_dec (req->self);
301 }
302
303 SvREFCNT_dec (req->data);
304 SvREFCNT_dec (req->fh);
305 SvREFCNT_dec (req->fh2);
306 SvREFCNT_dec (req->callback);
307 Safefree (req->statdata);
308
309 if (req->type == REQ_READDIR && req->result >= 0)
310 free (req->data2ptr);
311
312 Safefree (req);
313}
314
315static void req_cancel (aio_req req)
316{
317 req->cancelled = 1;
318
319 if (req->type == REQ_GROUP)
320 {
321 aio_req sub;
322
323 for (sub = req->grp_first; sub; sub = sub->grp_next)
324 req_cancel (sub);
325 }
326}
327
328static int poll_cb ()
185{ 329{
186 dSP; 330 dSP;
187 int count = 0; 331 int count = 0;
332 int do_croak = 0;
188 aio_req req; 333 aio_req req;
189 334
190 while (read (respipe[0], (void *)&req, sizeof (req)) == sizeof (req)) 335 for (;;)
191 { 336 {
337 pthread_mutex_lock (&reslock);
338 req = ress;
339
340 if (req)
341 {
342 ress = req->next;
343
344 if (!ress)
345 {
346 /* read any signals sent by the worker threads */
347 char buf [32];
348 while (read (respipe [0], buf, 32) == 32)
349 ;
350
351 rese = 0;
352 }
353 }
354
355 pthread_mutex_unlock (&reslock);
356
357 if (!req)
358 break;
359
192 nreqs--; 360 nreqs--;
193 361
194 if (req->type == REQ_QUIT) 362 if (req->type == REQ_QUIT)
195 started--; 363 started--;
364 else if (req->type == REQ_GROUP && req->length)
365 {
366 req->fd = 1; /* mark request as delayed */
367 continue;
368 }
196 else 369 else
197 { 370 {
198 int errorno = errno;
199 errno = req->errorno;
200
201 if (req->type == REQ_READ) 371 if (req->type == REQ_READ)
202 SvCUR_set (req->data, req->dataoffset 372 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
203 + req->result > 0 ? req->result : 0);
204 373
374 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
375 SvREADONLY_off (req->data);
376
205 if (req->data) 377 if (req->statdata)
206 SvREFCNT_dec (req->data);
207
208 if (req->type == REQ_STAT || req->type == REQ_LSTAT || req->type == REQ_FSTAT)
209 { 378 {
210 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; 379 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
211 PL_laststatval = req->result; 380 PL_laststatval = req->result;
212 PL_statcache = *(req->statdata); 381 PL_statcache = *(req->statdata);
213
214 Safefree (req->statdata);
215 } 382 }
216 383
217 PUSHMARK (SP); 384 req_invoke (req);
218 XPUSHs (sv_2mortal (newSViv (req->result)));
219 385
220 if (req->type == REQ_OPEN)
221 {
222 /* convert fd to fh */
223 SV *fh;
224
225 PUTBACK;
226 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
227 SPAGAIN;
228
229 fh = POPs;
230
231 PUSHMARK (SP);
232 XPUSHs (fh);
233 }
234
235 PUTBACK;
236 call_sv (req->callback, G_VOID | G_EVAL);
237 SPAGAIN;
238
239 if (req->callback)
240 SvREFCNT_dec (req->callback);
241
242 errno = errorno;
243 count++; 386 count++;
244 } 387 }
245 388
246 Safefree (req); 389 req_free (req);
247 } 390 }
248
249 if (qs)
250 send_reqs ();
251 391
252 return count; 392 return count;
253} 393}
254 394
255static void * 395static void *aio_proc(void *arg);
256aio_proc (void *thr_arg) 396
397static void start_thread (void)
398{
399 sigset_t fullsigset, oldsigset;
400 pthread_t tid;
401 pthread_attr_t attr;
402
403 pthread_attr_init (&attr);
404 pthread_attr_setstacksize (&attr, STACKSIZE);
405 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
406
407 sigfillset (&fullsigset);
408 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
409
410 if (pthread_create (&tid, &attr, aio_proc, 0) == 0)
411 started++;
412
413 sigprocmask (SIG_SETMASK, &oldsigset, 0);
414}
415
416static void req_send (aio_req req)
417{
418 while (started < wanted && nreqs >= started)
419 start_thread ();
420
421 nreqs++;
422
423 pthread_mutex_lock (&reqlock);
424
425 req->next = 0;
426
427 if (reqe)
428 {
429 reqe->next = req;
430 reqe = req;
431 }
432 else
433 reqe = reqs = req;
434
435 pthread_cond_signal (&reqwait);
436 pthread_mutex_unlock (&reqlock);
437
438 if (nreqs > max_outstanding)
439 for (;;)
440 {
441 poll_cb ();
442
443 if (nreqs <= max_outstanding)
444 break;
445
446 poll_wait ();
447 }
448}
449
450static void end_thread (void)
257{ 451{
258 aio_req req; 452 aio_req req;
453 Newz (0, req, 1, aio_cb);
454 req->type = REQ_QUIT;
259 455
260 /* then loop */ 456 req_send (req);
261 while (read (reqpipe[0], (void *)&req, sizeof (req)) == sizeof (req)) 457}
458
459static void min_parallel (int nthreads)
460{
461 if (wanted < nthreads)
462 wanted = nthreads;
463}
464
465static void max_parallel (int nthreads)
466{
467 int cur = started;
468
469 if (wanted > nthreads)
470 wanted = nthreads;
471
472 while (cur > wanted)
473 {
474 end_thread ();
475 cur--;
262 { 476 }
477
478 while (started > wanted)
479 {
480 poll_wait ();
481 poll_cb ();
482 }
483}
484
485static void create_pipe ()
486{
487 if (pipe (respipe))
488 croak ("unable to initialize result pipe");
489
490 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK))
491 croak ("cannot set result pipe to nonblocking mode");
492
493 if (fcntl (respipe [1], F_SETFL, O_NONBLOCK))
494 croak ("cannot set result pipe to nonblocking mode");
495}
496
497/*****************************************************************************/
498/* work around various missing functions */
499
500#if !HAVE_PREADWRITE
501# define pread aio_pread
502# define pwrite aio_pwrite
503
504/*
505 * make our pread/pwrite safe against themselves, but not against
506 * normal read/write by using a mutex. slows down execution a lot,
507 * but that's your problem, not mine.
508 */
509static pthread_mutex_t preadwritelock = PTHREAD_MUTEX_INITIALIZER;
510
511static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
512{
513 ssize_t res;
514 off_t ooffset;
515
516 pthread_mutex_lock (&preadwritelock);
517 ooffset = lseek (fd, 0, SEEK_CUR);
518 lseek (fd, offset, SEEK_SET);
519 res = read (fd, buf, count);
520 lseek (fd, ooffset, SEEK_SET);
521 pthread_mutex_unlock (&preadwritelock);
522
523 return res;
524}
525
526static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)
527{
528 ssize_t res;
529 off_t ooffset;
530
531 pthread_mutex_lock (&preadwritelock);
532 ooffset = lseek (fd, 0, SEEK_CUR);
533 lseek (fd, offset, SEEK_SET);
534 res = write (fd, buf, count);
535 lseek (fd, offset, SEEK_SET);
536 pthread_mutex_unlock (&preadwritelock);
537
538 return res;
539}
540#endif
541
542#if !HAVE_FDATASYNC
543# define fdatasync fsync
544#endif
545
546#if !HAVE_READAHEAD
547# define readahead aio_readahead
548
549static ssize_t readahead (int fd, off_t offset, size_t count)
550{
551 char readahead_buf[4096];
552
553 while (count > 0)
554 {
555 size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf);
556
557 pread (fd, readahead_buf, len, offset);
558 offset += len;
559 count -= len;
560 }
561
562 errno = 0;
563}
564#endif
565
566#if !HAVE_READDIR_R
567# define readdir_r aio_readdir_r
568
569static pthread_mutex_t readdirlock = PTHREAD_MUTEX_INITIALIZER;
570
571static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
572{
573 struct dirent *e;
574 int errorno;
575
576 pthread_mutex_lock (&readdirlock);
577
578 e = readdir (dirp);
579 errorno = errno;
580
581 if (e)
582 {
583 *res = ent;
584 strcpy (ent->d_name, e->d_name);
585 }
586 else
587 *res = 0;
588
589 pthread_mutex_unlock (&readdirlock);
590
591 errno = errorno;
592 return e ? 0 : -1;
593}
594#endif
595
596/* sendfile always needs emulation */
597static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count)
598{
599 ssize_t res;
600
601 if (!count)
602 return 0;
603
604#if HAVE_SENDFILE
605# if __linux
606 res = sendfile (ofd, ifd, &offset, count);
607
608# elif __freebsd
609 /*
610 * Of course, the freebsd sendfile is a dire hack with no thoughts
611 * wasted on making it similar to other I/O functions.
612 */
613 {
614 off_t sbytes;
615 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
616
617 if (res < 0 && sbytes)
618 /* maybe only on EAGAIN only: as usual, the manpage leaves you guessing */
619 res = sbytes;
620 }
621
622# elif __hpux
623 res = sendfile (ofd, ifd, offset, count, 0, 0);
624
625# elif __solaris
626 {
627 struct sendfilevec vec;
628 size_t sbytes;
629
630 vec.sfv_fd = ifd;
631 vec.sfv_flag = 0;
632 vec.sfv_off = offset;
633 vec.sfv_len = count;
634
635 res = sendfilev (ofd, &vec, 1, &sbytes);
636
637 if (res < 0 && sbytes)
638 res = sbytes;
639 }
640
641# endif
642#else
643 res = -1;
644 errno = ENOSYS;
645#endif
646
647 if (res < 0
648 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
649#if __solaris
650 || errno == EAFNOSUPPORT || errno == EPROTOTYPE
651#endif
652 )
653 )
654 {
655 /* emulate sendfile. this is a major pain in the ass */
656 char buf[4096];
657 res = 0;
658
659 while (count)
660 {
661 ssize_t cnt;
662
663 cnt = pread (ifd, buf, count > 4096 ? 4096 : count, offset);
664
665 if (cnt <= 0)
666 {
667 if (cnt && !res) res = -1;
668 break;
669 }
670
671 cnt = write (ofd, buf, cnt);
672
673 if (cnt <= 0)
674 {
675 if (cnt && !res) res = -1;
676 break;
677 }
678
679 offset += cnt;
680 res += cnt;
681 count -= cnt;
682 }
683 }
684
685 return res;
686}
687
688/* read a full directory */
689static int scandir_ (const char *path, void **namesp)
690{
691 DIR *dirp = opendir (path);
692 union
693 {
694 struct dirent d;
695 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1];
696 } u;
697 struct dirent *entp;
698 char *name, *names;
699 int memlen = 4096;
700 int memofs = 0;
701 int res = 0;
702 int errorno;
703
704 if (!dirp)
705 return -1;
706
707 names = malloc (memlen);
708
709 for (;;)
710 {
711 errno = 0, readdir_r (dirp, &u.d, &entp);
712
713 if (!entp)
714 break;
715
716 name = entp->d_name;
717
718 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
719 {
720 int len = strlen (name) + 1;
721
722 res++;
723
724 while (memofs + len > memlen)
725 {
726 memlen *= 2;
727 names = realloc (names, memlen);
728 if (!names)
729 break;
730 }
731
732 memcpy (names + memofs, name, len);
733 memofs += len;
734 }
735 }
736
737 errorno = errno;
738 closedir (dirp);
739
740 if (errorno)
741 {
742 free (names);
743 errno = errorno;
744 res = -1;
745 }
746
747 *namesp = (void *)names;
748 return res;
749}
750
751/*****************************************************************************/
752
753static void *aio_proc (void *thr_arg)
754{
755 aio_req req;
756 int type;
757
758 do
759 {
760 pthread_mutex_lock (&reqlock);
761
762 for (;;)
763 {
764 req = reqs;
765
766 if (reqs)
767 {
768 reqs = reqs->next;
769 if (!reqs) reqe = 0;
770 }
771
772 if (req)
773 break;
774
775 pthread_cond_wait (&reqwait, &reqlock);
776 }
777
778 pthread_mutex_unlock (&reqlock);
779
263 errno = 0; /* strictly unnecessary */ 780 errno = 0; /* strictly unnecessary */
264 781
782 if (!req->cancelled)
265 switch (req->type) 783 switch (req->type)
784 {
785 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;
786 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
787
788 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
789 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length); break;
790
791 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
792 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
793 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
794
795 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break;
796 case REQ_CLOSE: req->result = close (req->fd); break;
797 case REQ_UNLINK: req->result = unlink (req->dataptr); break;
798 case REQ_RMDIR: req->result = rmdir (req->dataptr); break;
799 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break;
800 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;
801 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
802
803 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
804 case REQ_FSYNC: req->result = fsync (req->fd); break;
805 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break;
806
807 case REQ_SLEEP:
808 {
809 struct timeval tv;
810
811 tv.tv_sec = req->fd;
812 tv.tv_usec = req->fd2;
813
814 req->result = select (0, 0, 0, 0, &tv);
815 }
816
817 case REQ_QUIT:
818 break;
819
820 default:
821 req->result = ENOSYS;
822 break;
823 }
824
825 req->errorno = errno;
826
827 pthread_mutex_lock (&reslock);
828
829 req->next = 0;
830
831 if (rese)
266 { 832 {
267 case REQ_READ: req->result = pread64 (req->fd, req->dataptr, req->length, req->offset); break; 833 rese->next = req;
268 case REQ_WRITE: req->result = pwrite64 (req->fd, req->dataptr, req->length, req->offset); break; 834 rese = req;
269#if SYS_readahead 835 }
270 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 836 else
271#else 837 {
272 case REQ_READAHEAD: req->result = -1; errno = ENOSYS; break; 838 rese = ress = req;
839
840 /* write a dummy byte to the pipe so fh becomes ready */
841 write (respipe [1], &respipe, 1);
842 }
843
844 pthread_mutex_unlock (&reslock);
845 }
846 while (type != REQ_QUIT);
847
848 return 0;
849}
850
851/*****************************************************************************/
852
853static void atfork_prepare (void)
854{
855 pthread_mutex_lock (&reqlock);
856 pthread_mutex_lock (&reslock);
857#if !HAVE_PREADWRITE
858 pthread_mutex_lock (&preadwritelock);
273#endif 859#endif
860#if !HAVE_READDIR_R
861 pthread_mutex_lock (&readdirlock);
862#endif
863}
274 864
275 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 865static void atfork_parent (void)
276 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 866{
277 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 867#if !HAVE_READDIR_R
868 pthread_mutex_unlock (&readdirlock);
869#endif
870#if !HAVE_PREADWRITE
871 pthread_mutex_unlock (&preadwritelock);
872#endif
873 pthread_mutex_unlock (&reslock);
874 pthread_mutex_unlock (&reqlock);
875}
278 876
279 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 877static void atfork_child (void)
280 case REQ_CLOSE: req->result = close (req->fd); break; 878{
281 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 879 aio_req prv;
282 880
283 case REQ_FSYNC: req->result = fsync (req->fd); break; 881 started = 0;
284 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
285 882
286 case REQ_QUIT: 883 while (reqs)
287 write (respipe[1], (void *)&req, sizeof (req));
288 return 0;
289
290 default:
291 req->result = ENOSYS;
292 break;
293 }
294
295 req->errorno = errno;
296 write (respipe[1], (void *)&req, sizeof (req));
297 } 884 {
885 prv = reqs;
886 reqs = prv->next;
887 req_free (prv);
888 }
298 889
299 return 0; 890 reqs = reqe = 0;
300} 891
892 while (ress)
893 {
894 prv = ress;
895 ress = prv->next;
896 req_free (prv);
897 }
898
899 ress = rese = 0;
301 900
901 close (respipe [0]);
902 close (respipe [1]);
903 create_pipe ();
904
905 atfork_parent ();
906}
907
908#define dREQ \
909 aio_req req; \
910 \
911 if (SvOK (callback) && !SvROK (callback)) \
912 croak ("callback must be undef or of reference type"); \
913 \
914 Newz (0, req, 1, aio_cb); \
915 if (!req) \
916 croak ("out of memory during aio_req allocation"); \
917 \
918 req->callback = newSVsv (callback)
919
920#define REQ_SEND \
921 req_send (req); \
922 \
923 if (GIMME_V != G_VOID) \
924 XPUSHs (req_sv (req, AIO_REQ_KLASS));
925
302MODULE = IO::AIO PACKAGE = IO::AIO 926MODULE = IO::AIO PACKAGE = IO::AIO
303 927
928PROTOTYPES: ENABLE
929
304BOOT: 930BOOT:
305{ 931{
306 if (pipe (reqpipe) || pipe (respipe)) 932 HV *stash = gv_stashpv ("IO::AIO", 1);
307 croak ("unable to initialize request or result pipe"); 933 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
934 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
935 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
308 936
309 if (fcntl (reqpipe[1], F_SETFL, O_NONBLOCK)) 937 create_pipe ();
310 croak ("cannot set result pipe to nonblocking mode"); 938 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
311
312 if (fcntl (respipe[0], F_SETFL, O_NONBLOCK))
313 croak ("cannot set result pipe to nonblocking mode");
314} 939}
315 940
316void 941void
317min_parallel(nthreads) 942min_parallel (nthreads)
318 int nthreads 943 int nthreads
319 PROTOTYPE: $ 944 PROTOTYPE: $
320 CODE:
321 while (nthreads > started)
322 start_thread ();
323 945
324void 946void
325max_parallel(nthreads) 947max_parallel (nthreads)
326 int nthreads 948 int nthreads
327 PROTOTYPE: $ 949 PROTOTYPE: $
950
951int
952max_outstanding (nreqs)
953 int nreqs
954 PROTOTYPE: $
328 CODE: 955 CODE:
329{ 956 RETVAL = max_outstanding;
330 int cur = started; 957 max_outstanding = nreqs;
331 while (cur > nthreads)
332 {
333 end_thread ();
334 cur--;
335 }
336 958
337 while (started > nthreads)
338 {
339 poll_wait ();
340 poll_cb (aTHX);
341 }
342}
343
344void 959void
345aio_open(pathname,flags,mode,callback) 960aio_open (pathname,flags,mode,callback=&PL_sv_undef)
346 SV * pathname 961 SV * pathname
347 int flags 962 int flags
348 int mode 963 int mode
349 SV * callback 964 SV * callback
350 PROTOTYPE: $$$$ 965 PROTOTYPE: $$$;$
351 CODE: 966 PPCODE:
352{ 967{
353 aio_req req; 968 dREQ;
354
355 Newz (0, req, 1, aio_cb);
356
357 if (!req)
358 croak ("out of memory during aio_req allocation");
359 969
360 req->type = REQ_OPEN; 970 req->type = REQ_OPEN;
361 req->data = newSVsv (pathname); 971 req->data = newSVsv (pathname);
362 req->dataptr = SvPV_nolen (req->data); 972 req->dataptr = SvPVbyte_nolen (req->data);
363 req->fd = flags; 973 req->fd = flags;
364 req->mode = mode; 974 req->mode = mode;
365 req->callback = SvREFCNT_inc (callback);
366 975
367 send_req (req); 976 REQ_SEND;
368} 977}
369 978
370void 979void
371aio_close(fh,callback) 980aio_close (fh,callback=&PL_sv_undef)
372 InputStream fh 981 SV * fh
373 SV * callback 982 SV * callback
374 PROTOTYPE: $$ 983 PROTOTYPE: $;$
375 ALIAS: 984 ALIAS:
376 aio_close = REQ_CLOSE 985 aio_close = REQ_CLOSE
377 aio_fsync = REQ_FSYNC 986 aio_fsync = REQ_FSYNC
378 aio_fdatasync = REQ_FDATASYNC 987 aio_fdatasync = REQ_FDATASYNC
379 CODE: 988 PPCODE:
989{
990 dREQ;
991
992 req->type = ix;
993 req->fh = newSVsv (fh);
994 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
995
996 REQ_SEND (req);
997}
998
999void
1000aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
1001 SV * fh
1002 UV offset
1003 UV length
1004 SV * data
1005 UV dataoffset
1006 SV * callback
1007 ALIAS:
1008 aio_read = REQ_READ
1009 aio_write = REQ_WRITE
1010 PROTOTYPE: $$$$$;$
1011 PPCODE:
380{ 1012{
381 aio_req req; 1013 aio_req req;
1014 STRLEN svlen;
1015 char *svptr = SvPVbyte (data, svlen);
382 1016
383 Newz (0, req, 1, aio_cb); 1017 SvUPGRADE (data, SVt_PV);
1018 SvPOK_on (data);
384 1019
385 if (!req) 1020 if (dataoffset < 0)
386 croak ("out of memory during aio_req allocation"); 1021 dataoffset += svlen;
387 1022
388 req->type = ix; 1023 if (dataoffset < 0 || dataoffset > svlen)
389 req->fd = PerlIO_fileno (fh); 1024 croak ("data offset outside of string");
390 req->callback = SvREFCNT_inc (callback);
391 1025
392 send_req (req); 1026 if (ix == REQ_WRITE)
393} 1027 {
394 1028 /* write: check length and adjust. */
395void 1029 if (length < 0 || length + dataoffset > svlen)
396aio_read(fh,offset,length,data,dataoffset,callback) 1030 length = svlen - dataoffset;
397 InputStream fh 1031 }
398 UV offset 1032 else
399 IV length 1033 {
400 SV * data 1034 /* read: grow scalar as necessary */
401 IV dataoffset 1035 svptr = SvGROW (data, length + dataoffset);
402 SV * callback 1036 }
403 PROTOTYPE: $$$$$$
404 CODE:
405 read_write (aTHX_ 0, PerlIO_fileno (fh), offset, length, data, dataoffset, callback);
406
407void
408aio_write(fh,offset,length,data,dataoffset,callback)
409 OutputStream fh
410 UV offset
411 IV length
412 SV * data
413 IV dataoffset
414 SV * callback
415 PROTOTYPE: $$$$$$
416 CODE:
417 read_write (aTHX_ 1, PerlIO_fileno (fh), offset, length, data, dataoffset, callback);
418
419void
420aio_readahead(fh,offset,length,callback)
421 InputStream fh
422 UV offset
423 IV length
424 SV * callback
425 PROTOTYPE: $$$$
426 CODE:
427{
428 aio_req req;
429 1037
430 if (length < 0) 1038 if (length < 0)
431 croak ("length must not be negative"); 1039 croak ("length must not be negative");
432 1040
433 Newz (0, req, 1, aio_cb); 1041 {
1042 dREQ;
434 1043
435 if (!req) 1044 req->type = ix;
436 croak ("out of memory during aio_req allocation"); 1045 req->fh = newSVsv (fh);
1046 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1047 : IoOFP (sv_2io (fh)));
1048 req->offset = offset;
1049 req->length = length;
1050 req->data = SvREFCNT_inc (data);
1051 req->dataptr = (char *)svptr + dataoffset;
1052
1053 if (!SvREADONLY (data))
1054 {
1055 SvREADONLY_on (data);
1056 req->data2ptr = (void *)data;
1057 }
1058
1059 REQ_SEND;
1060 }
1061}
1062
1063void
1064aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef)
1065 SV * out_fh
1066 SV * in_fh
1067 UV in_offset
1068 UV length
1069 SV * callback
1070 PROTOTYPE: $$$$;$
1071 PPCODE:
1072{
1073 dREQ;
1074
1075 req->type = REQ_SENDFILE;
1076 req->fh = newSVsv (out_fh);
1077 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1078 req->fh2 = newSVsv (in_fh);
1079 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1080 req->offset = in_offset;
1081 req->length = length;
1082
1083 REQ_SEND;
1084}
1085
1086void
1087aio_readahead (fh,offset,length,callback=&PL_sv_undef)
1088 SV * fh
1089 UV offset
1090 IV length
1091 SV * callback
1092 PROTOTYPE: $$$;$
1093 PPCODE:
1094{
1095 dREQ;
437 1096
438 req->type = REQ_READAHEAD; 1097 req->type = REQ_READAHEAD;
1098 req->fh = newSVsv (fh);
439 req->fd = PerlIO_fileno (fh); 1099 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
440 req->offset = offset; 1100 req->offset = offset;
441 req->length = length; 1101 req->length = length;
442 req->callback = SvREFCNT_inc (callback);
443 1102
444 send_req (req); 1103 REQ_SEND;
445} 1104}
446 1105
447void 1106void
448aio_stat(fh_or_path,callback) 1107aio_stat (fh_or_path,callback=&PL_sv_undef)
449 SV * fh_or_path 1108 SV * fh_or_path
450 SV * callback 1109 SV * callback
451 PROTOTYPE: $$
452 ALIAS: 1110 ALIAS:
1111 aio_stat = REQ_STAT
453 aio_lstat = 1 1112 aio_lstat = REQ_LSTAT
454 CODE: 1113 PPCODE:
455{ 1114{
456 aio_req req; 1115 dREQ;
457
458 Newz (0, req, 1, aio_cb);
459
460 if (!req)
461 croak ("out of memory during aio_req allocation");
462 1116
463 New (0, req->statdata, 1, Stat_t); 1117 New (0, req->statdata, 1, Stat_t);
464
465 if (!req->statdata) 1118 if (!req->statdata)
1119 {
1120 req_free (req);
466 croak ("out of memory during aio_req->statdata allocation"); 1121 croak ("out of memory during aio_req->statdata allocation");
1122 }
467 1123
468 if (SvPOK (fh_or_path)) 1124 if (SvPOK (fh_or_path))
469 { 1125 {
470 req->type = ix ? REQ_LSTAT : REQ_STAT; 1126 req->type = ix;
471 req->data = newSVsv (fh_or_path); 1127 req->data = newSVsv (fh_or_path);
472 req->dataptr = SvPV_nolen (req->data); 1128 req->dataptr = SvPVbyte_nolen (req->data);
473 } 1129 }
474 else 1130 else
475 { 1131 {
476 req->type = REQ_FSTAT; 1132 req->type = REQ_FSTAT;
1133 req->fh = newSVsv (fh_or_path);
477 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1134 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
478 } 1135 }
479 1136
480 req->callback = SvREFCNT_inc (callback); 1137 REQ_SEND;
481
482 send_req (req);
483} 1138}
484 1139
485void 1140void
486aio_unlink(pathname,callback) 1141aio_unlink (pathname,callback=&PL_sv_undef)
487 SV * pathname 1142 SV * pathname
488 SV * callback 1143 SV * callback
1144 ALIAS:
1145 aio_unlink = REQ_UNLINK
1146 aio_rmdir = REQ_RMDIR
1147 aio_readdir = REQ_READDIR
1148 PPCODE:
1149{
1150 dREQ;
1151
1152 req->type = ix;
1153 req->data = newSVsv (pathname);
1154 req->dataptr = SvPVbyte_nolen (req->data);
1155
1156 REQ_SEND;
1157}
1158
1159void
1160aio_link (oldpath,newpath,callback=&PL_sv_undef)
1161 SV * oldpath
1162 SV * newpath
1163 SV * callback
1164 ALIAS:
1165 aio_link = REQ_LINK
1166 aio_symlink = REQ_SYMLINK
1167 aio_rename = REQ_RENAME
1168 PPCODE:
1169{
1170 dREQ;
1171
1172 req->type = ix;
1173 req->fh = newSVsv (oldpath);
1174 req->data2ptr = SvPVbyte_nolen (req->fh);
1175 req->data = newSVsv (newpath);
1176 req->dataptr = SvPVbyte_nolen (req->data);
1177
1178 REQ_SEND;
1179}
1180
1181void
1182aio_sleep (delay,callback=&PL_sv_undef)
1183 double delay
1184 SV * callback
1185 PPCODE:
1186{
1187 dREQ;
1188
1189 req->type = REQ_SLEEP;
1190 req->fd = delay < 0. ? 0 : delay;
1191 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1192
1193 REQ_SEND;
1194}
1195
1196void
1197aio_group (callback=&PL_sv_undef)
1198 SV * callback
489 PROTOTYPE: $$ 1199 PROTOTYPE: ;$
1200 PPCODE:
1201{
1202 dREQ;
1203 req->type = REQ_GROUP;
1204 req_send (req);
1205 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1206}
1207
1208void
1209flush ()
1210 PROTOTYPE:
490 CODE: 1211 CODE:
491{ 1212 while (nreqs)
492 aio_req req; 1213 {
493 1214 poll_wait ();
494 Newz (0, req, 1, aio_cb); 1215 poll_cb ();
495 1216 }
496 if (!req) 1217
497 croak ("out of memory during aio_req allocation"); 1218void
498 1219poll()
499 req->type = REQ_UNLINK; 1220 PROTOTYPE:
500 req->data = newSVsv (pathname); 1221 CODE:
501 req->dataptr = SvPV_nolen (req->data); 1222 if (nreqs)
502 req->callback = SvREFCNT_inc (callback); 1223 {
503 1224 poll_wait ();
504 send_req (req); 1225 poll_cb ();
505} 1226 }
506 1227
507int 1228int
508poll_fileno() 1229poll_fileno()
509 PROTOTYPE: 1230 PROTOTYPE:
510 CODE: 1231 CODE:
511 RETVAL = respipe[0]; 1232 RETVAL = respipe [0];
512 OUTPUT: 1233 OUTPUT:
513 RETVAL 1234 RETVAL
514 1235
515int 1236int
516poll_cb(...) 1237poll_cb(...)
517 PROTOTYPE: 1238 PROTOTYPE:
518 CODE: 1239 CODE:
519 RETVAL = poll_cb (aTHX); 1240 RETVAL = poll_cb ();
520 OUTPUT: 1241 OUTPUT:
521 RETVAL 1242 RETVAL
522 1243
523void 1244void
524poll_wait() 1245poll_wait()
525 PROTOTYPE: 1246 PROTOTYPE:
526 CODE: 1247 CODE:
1248 if (nreqs)
527 poll_wait (); 1249 poll_wait ();
528 1250
529int 1251int
530nreqs() 1252nreqs()
531 PROTOTYPE: 1253 PROTOTYPE:
532 CODE: 1254 CODE:
533 RETVAL = nreqs; 1255 RETVAL = nreqs;
534 OUTPUT: 1256 OUTPUT:
535 RETVAL 1257 RETVAL
536 1258
1259PROTOTYPES: DISABLE
1260
1261MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1262
1263void
1264cancel (aio_req_ornot req)
1265 PROTOTYPE:
1266 CODE:
1267 req_cancel (req);
1268
1269MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1270
1271void
1272add (aio_req grp, ...)
1273 PPCODE:
1274{
1275 int i;
1276
1277 if (grp->fd == 2)
1278 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1279
1280 for (i = 1; i < items; ++i )
1281 {
1282 if (GIMME_V != G_VOID)
1283 XPUSHs (sv_2mortal (newSVsv (ST (i))));
1284
1285 aio_req req = SvAIO_REQ (ST (i));
1286
1287 if (req)
1288 {
1289 ++grp->length;
1290 req->grp = grp;
1291
1292 req->grp_prev = 0;
1293 req->grp_next = grp->grp_first;
1294
1295 if (grp->grp_first)
1296 grp->grp_first->grp_prev = req;
1297
1298 grp->grp_first = req;
1299 }
1300 }
1301}
1302
1303void
1304result (aio_req grp, ...)
1305 CODE:
1306{
1307 int i;
1308 AV *av = newAV ();
1309
1310 for (i = 1; i < items; ++i )
1311 av_push (av, newSVsv (ST (i)));
1312
1313 SvREFCNT_dec (grp->data);
1314 grp->data = (SV *)av;
1315}
1316
1317void
1318feeder_limit (aio_req grp, int limit)
1319 CODE:
1320 grp->fd2 = limit;
1321 aio_grp_feed (grp);
1322
1323void
1324set_feeder (aio_req grp, SV *callback=&PL_sv_undef)
1325 CODE:
1326{
1327 SvREFCNT_dec (grp->fh2);
1328 grp->fh2 = newSVsv (callback);
1329
1330 if (grp->fd2 <= 0)
1331 grp->fd2 = 2;
1332
1333 aio_grp_feed (grp);
1334}
1335

Diff Legend

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