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

Diff Legend

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