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.34 by root, Tue Aug 23 00:03:14 2005 UTC vs.
Revision 1.60 by root, Mon Oct 23 20:05:27 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines