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.93 by root, Wed Nov 8 02:01:02 2006 UTC vs.
Revision 1.99 by root, Fri Jun 1 05:51:21 2007 UTC

1/* solaris */ 1#include "xthread.h"
2#define _POSIX_PTHREAD_SEMANTICS 1
3
4#if __linux && !defined(_GNU_SOURCE)
5# define _GNU_SOURCE
6#endif
7
8/* just in case */
9#define _REENTRANT 1
10 2
11#include <errno.h> 3#include <errno.h>
12 4
13#include "EXTERN.h" 5#include "EXTERN.h"
14#include "perl.h" 6#include "perl.h"
15#include "XSUB.h" 7#include "XSUB.h"
16 8
17#include "autoconf/config.h" 9#include "autoconf/config.h"
18 10
19#include <pthread.h>
20
21#include <stddef.h> 11#include <stddef.h>
12#include <stdlib.h>
22#include <errno.h> 13#include <errno.h>
23#include <sys/time.h> 14#include <sys/time.h>
24#include <sys/select.h> 15#include <sys/select.h>
25#include <sys/types.h> 16#include <sys/types.h>
26#include <sys/stat.h> 17#include <sys/stat.h>
27#include <limits.h> 18#include <limits.h>
28#include <unistd.h> 19#include <unistd.h>
29#include <fcntl.h> 20#include <fcntl.h>
30#include <signal.h> 21#include <signal.h>
31#include <sched.h> 22#include <sched.h>
23#include <utime.h>
32 24
33#if HAVE_SENDFILE 25#if HAVE_SENDFILE
34# if __linux 26# if __linux
35# include <sys/sendfile.h> 27# include <sys/sendfile.h>
36# elif __freebsd 28# elif __freebsd
51/* used for struct dirent, AIX doesn't provide it */ 43/* used for struct dirent, AIX doesn't provide it */
52#ifndef NAME_MAX 44#ifndef NAME_MAX
53# define NAME_MAX 4096 45# define NAME_MAX 4096
54#endif 46#endif
55 47
56#ifndef PTHREAD_STACK_MIN
57/* care for broken platforms, e.g. windows */
58# define PTHREAD_STACK_MIN 16384
59#endif
60
61#if __ia64
62# define STACKSIZE 65536
63#elif __i386 || __x86_64 /* 16k is unreasonably high :( */
64# define STACKSIZE PTHREAD_STACK_MIN
65#else
66# define STACKSIZE 16384
67#endif
68
69/* wether word reads are potentially non-atomic.
70 * this is conservatice, likely most arches this runs
71 * on have atomic word read/writes.
72 */
73#ifndef WORDACCESS_UNSAFE
74# if __i386 || __x86_64
75# define WORDACCESS_UNSAFE 0
76# else
77# define WORDACCESS_UNSAFE 1
78# endif
79#endif
80
81/* buffer size for various temporary buffers */ 48/* buffer size for various temporary buffers */
82#define AIO_BUFSIZE 65536 49#define AIO_BUFSIZE 65536
83 50
84#define dBUF \ 51#define dBUF \
85 char *aio_buf; \ 52 char *aio_buf; \
95 REQ_QUIT, 62 REQ_QUIT,
96 REQ_OPEN, REQ_CLOSE, 63 REQ_OPEN, REQ_CLOSE,
97 REQ_READ, REQ_WRITE, REQ_READAHEAD, 64 REQ_READ, REQ_WRITE, REQ_READAHEAD,
98 REQ_SENDFILE, 65 REQ_SENDFILE,
99 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 66 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
67 REQ_UTIME, REQ_FUTIME, /* must be consecutive */
68 REQ_CHMOD, REQ_FCHMOD, /* must be consecutive */
69 REQ_CHOWN, REQ_FCHOWN, /* must be consecutive */
100 REQ_FSYNC, REQ_FDATASYNC, 70 REQ_FSYNC, REQ_FDATASYNC,
101 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 71 REQ_UNLINK, REQ_RMDIR, REQ_MKDIR, REQ_RENAME,
102 REQ_MKNOD, REQ_READDIR, 72 REQ_MKNOD, REQ_READDIR,
103 REQ_LINK, REQ_SYMLINK, REQ_READLINK, 73 REQ_LINK, REQ_SYMLINK, REQ_READLINK,
104 REQ_GROUP, REQ_NOP, 74 REQ_GROUP, REQ_NOP,
105 REQ_BUSY, 75 REQ_BUSY,
106}; 76};
110 80
111typedef struct aio_cb 81typedef struct aio_cb
112{ 82{
113 struct aio_cb *volatile next; 83 struct aio_cb *volatile next;
114 84
115 SV *callback, *fh; 85 SV *callback;
116 SV *sv1, *sv2; 86 SV *sv1, *sv2;
117 void *ptr1, *ptr2; 87 void *ptr1, *ptr2;
118 off_t offs; 88 off_t offs;
119 size_t size; 89 size_t size;
120 ssize_t result; 90 ssize_t result;
91 double nv1, nv2;
121 92
122 STRLEN stroffset; 93 STRLEN stroffset;
123 int type; 94 int type;
124 int int1, int2; 95 int int1, int2, int3;
125 int errorno; 96 int errorno;
126 mode_t mode; /* open */ 97 mode_t mode; /* open */
127 98
128 unsigned char flags; 99 unsigned char flags;
129 unsigned char pri; 100 unsigned char pri;
160{ 131{
161 return (tv2->tv_sec - tv1->tv_sec ) * AIO_TICKS 132 return (tv2->tv_sec - tv1->tv_sec ) * AIO_TICKS
162 + ((tv2->tv_usec - tv1->tv_usec) >> 10); 133 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
163} 134}
164 135
136static thread_t main_tid;
137static int main_sig;
138static int block_sig_level;
139
140void block_sig ()
141{
142 sigset_t ss;
143
144 if (block_sig_level++)
145 return;
146
147 if (!main_sig)
148 return;
149
150 sigemptyset (&ss);
151 sigaddset (&ss, main_sig);
152 pthread_sigmask (SIG_BLOCK, &ss, 0);
153}
154
155void unblock_sig ()
156{
157 sigset_t ss;
158
159 if (--block_sig_level)
160 return;
161
162 if (!main_sig)
163 return;
164
165 sigemptyset (&ss);
166 sigaddset (&ss, main_sig);
167 pthread_sigmask (SIG_UNBLOCK, &ss, 0);
168}
169
165static int next_pri = DEFAULT_PRI + PRI_BIAS; 170static int next_pri = DEFAULT_PRI + PRI_BIAS;
166 171
167static unsigned int started, idle, wanted; 172static unsigned int started, idle, wanted;
168 173
169#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
170# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
171#else
172# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
173#endif
174
175#define LOCK(mutex) pthread_mutex_lock (&(mutex))
176#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
177
178/* worker threads management */ 174/* worker threads management */
179static pthread_mutex_t wrklock = AIO_MUTEX_INIT; 175static mutex_t wrklock = MUTEX_INIT;
180 176
181typedef struct worker { 177typedef struct worker {
182 /* locked by wrklock */ 178 /* locked by wrklock */
183 struct worker *prev, *next; 179 struct worker *prev, *next;
184 180
185 pthread_t tid; 181 thread_t tid;
186 182
187 /* locked by reslock, reqlock or wrklock */ 183 /* locked by reslock, reqlock or wrklock */
188 aio_req req; /* currently processed request */ 184 aio_req req; /* currently processed request */
189 void *dbuf; 185 void *dbuf;
190 DIR *dirp; 186 DIR *dirp;
218static volatile unsigned int nreqs, nready, npending; 214static volatile unsigned int nreqs, nready, npending;
219static volatile unsigned int max_idle = 4; 215static volatile unsigned int max_idle = 4;
220static volatile unsigned int max_outstanding = 0xffffffff; 216static volatile unsigned int max_outstanding = 0xffffffff;
221static int respipe [2]; 217static int respipe [2];
222 218
223static pthread_mutex_t reslock = AIO_MUTEX_INIT; 219static mutex_t reslock = MUTEX_INIT;
224static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 220static mutex_t reqlock = MUTEX_INIT;
225static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 221static cond_t reqwait = COND_INIT;
226 222
227#if WORDACCESS_UNSAFE 223#if WORDACCESS_UNSAFE
228 224
229static unsigned int get_nready () 225static unsigned int get_nready ()
230{ 226{
320 316
321 abort (); 317 abort ();
322} 318}
323 319
324static int poll_cb (); 320static int poll_cb ();
325static void req_invoke (aio_req req); 321static int req_invoke (aio_req req);
326static void req_free (aio_req req); 322static void req_free (aio_req req);
327static void req_cancel (aio_req req); 323static void req_cancel (aio_req req);
328 324
329/* must be called at most once */ 325/* must be called at most once */
330static SV *req_sv (aio_req req, const char *klass) 326static SV *req_sv (aio_req req, const char *klass)
350 return mg ? (aio_req)mg->mg_ptr : 0; 346 return mg ? (aio_req)mg->mg_ptr : 0;
351} 347}
352 348
353static void aio_grp_feed (aio_req grp) 349static void aio_grp_feed (aio_req grp)
354{ 350{
351 block_sig ();
352
355 while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED)) 353 while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED))
356 { 354 {
357 int old_len = grp->size; 355 int old_len = grp->size;
358 356
359 if (grp->sv2 && SvOK (grp->sv2)) 357 if (grp->sv2 && SvOK (grp->sv2))
377 SvREFCNT_dec (grp->sv2); 375 SvREFCNT_dec (grp->sv2);
378 grp->sv2 = 0; 376 grp->sv2 = 0;
379 break; 377 break;
380 } 378 }
381 } 379 }
380
381 unblock_sig ();
382} 382}
383 383
384static void aio_grp_dec (aio_req grp) 384static void aio_grp_dec (aio_req grp)
385{ 385{
386 --grp->size; 386 --grp->size;
389 aio_grp_feed (grp); 389 aio_grp_feed (grp);
390 390
391 /* finish, if done */ 391 /* finish, if done */
392 if (!grp->size && grp->int1) 392 if (!grp->size && grp->int1)
393 { 393 {
394 block_sig ();
395
394 req_invoke (grp); 396 if (!req_invoke (grp))
397 {
398 req_free (grp);
399 unblock_sig ();
400 croak (0);
401 }
402
395 req_free (grp); 403 req_free (grp);
404 unblock_sig ();
396 } 405 }
397} 406}
398 407
399static void req_invoke (aio_req req) 408static int req_invoke (aio_req req)
400{ 409{
401 dSP; 410 dSP;
402 411
403 if (req->flags & FLAG_SV1_RO_OFF) 412 if (req->flags & FLAG_SV1_RO_OFF)
404 SvREADONLY_off (req->sv1); 413 SvREADONLY_off (req->sv1);
474 break; 483 break;
475 484
476 case REQ_READLINK: 485 case REQ_READLINK:
477 if (req->result > 0) 486 if (req->result > 0)
478 { 487 {
479 SvCUR_set (req->sv1, req->result); 488 SvCUR_set (req->sv2, req->result);
480 *SvEND (req->sv1) = 0; 489 *SvEND (req->sv2) = 0;
481 PUSHs (req->sv1); 490 PUSHs (req->sv2);
482 } 491 }
483 break; 492 break;
484 493
485 case REQ_STAT: 494 case REQ_STAT:
486 case REQ_LSTAT: 495 case REQ_LSTAT:
490 PL_statcache = *(Stat_t *)(req->ptr2); 499 PL_statcache = *(Stat_t *)(req->ptr2);
491 PUSHs (sv_2mortal (newSViv (req->result))); 500 PUSHs (sv_2mortal (newSViv (req->result)));
492 break; 501 break;
493 502
494 case REQ_READ: 503 case REQ_READ:
495 SvCUR_set (req->sv1, req->stroffset + (req->result > 0 ? req->result : 0)); 504 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
496 *SvEND (req->sv1) = 0; 505 *SvEND (req->sv2) = 0;
497 PUSHs (sv_2mortal (newSViv (req->result))); 506 PUSHs (sv_2mortal (newSViv (req->result)));
498 break; 507 break;
499 508
500 default: 509 default:
501 PUSHs (sv_2mortal (newSViv (req->result))); 510 PUSHs (sv_2mortal (newSViv (req->result)));
524 grp->grp_first = req->grp_next; 533 grp->grp_first = req->grp_next;
525 534
526 aio_grp_dec (grp); 535 aio_grp_dec (grp);
527 } 536 }
528 537
529 if (SvTRUE (ERRSV)) 538 return !SvTRUE (ERRSV);
530 {
531 req_free (req);
532 croak (0);
533 }
534} 539}
535 540
536static void req_free (aio_req req) 541static void req_free (aio_req req)
537{ 542{
538 if (req->self) 543 if (req->self)
539 { 544 {
540 sv_unmagic (req->self, PERL_MAGIC_ext); 545 sv_unmagic (req->self, PERL_MAGIC_ext);
541 SvREFCNT_dec (req->self); 546 SvREFCNT_dec (req->self);
542 } 547 }
543 548
544 SvREFCNT_dec (req->fh);
545 SvREFCNT_dec (req->sv1); 549 SvREFCNT_dec (req->sv1);
546 SvREFCNT_dec (req->sv2); 550 SvREFCNT_dec (req->sv2);
547 SvREFCNT_dec (req->callback); 551 SvREFCNT_dec (req->callback);
548 552
549 if (req->flags & FLAG_PTR2_FREE) 553 if (req->flags & FLAG_PTR2_FREE)
575 579
576static void *aio_proc(void *arg); 580static void *aio_proc(void *arg);
577 581
578static void start_thread (void) 582static void start_thread (void)
579{ 583{
580 sigset_t fullsigset, oldsigset;
581 pthread_attr_t attr;
582
583 worker *wrk = calloc (1, sizeof (worker)); 584 worker *wrk = calloc (1, sizeof (worker));
584 585
585 if (!wrk) 586 if (!wrk)
586 croak ("unable to allocate worker thread data"); 587 croak ("unable to allocate worker thread data");
587 588
588 pthread_attr_init (&attr);
589 pthread_attr_setstacksize (&attr, STACKSIZE);
590 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
591#ifdef PTHREAD_SCOPE_PROCESS
592 pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS);
593#endif
594
595 sigfillset (&fullsigset);
596
597 LOCK (wrklock); 589 LOCK (wrklock);
598 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
599 590
600 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0) 591 if (thread_create (&wrk->tid, aio_proc, (void *)wrk))
601 { 592 {
602 wrk->prev = &wrk_first; 593 wrk->prev = &wrk_first;
603 wrk->next = wrk_first.next; 594 wrk->next = wrk_first.next;
604 wrk_first.next->prev = wrk; 595 wrk_first.next->prev = wrk;
605 wrk_first.next = wrk; 596 wrk_first.next = wrk;
606 ++started; 597 ++started;
607 } 598 }
608 else 599 else
609 free (wrk); 600 free (wrk);
610 601
611 sigprocmask (SIG_SETMASK, &oldsigset, 0);
612 UNLOCK (wrklock); 602 UNLOCK (wrklock);
613} 603}
614 604
615static void maybe_start_thread () 605static void maybe_start_thread ()
616{ 606{
624 start_thread (); 614 start_thread ();
625} 615}
626 616
627static void req_send (aio_req req) 617static void req_send (aio_req req)
628{ 618{
619 block_sig ();
620
629 ++nreqs; 621 ++nreqs;
630 622
631 LOCK (reqlock); 623 LOCK (reqlock);
632 ++nready; 624 ++nready;
633 reqq_push (&req_queue, req); 625 reqq_push (&req_queue, req);
634 pthread_cond_signal (&reqwait); 626 COND_SIGNAL (reqwait);
635 UNLOCK (reqlock); 627 UNLOCK (reqlock);
628
629 unblock_sig ();
636 630
637 maybe_start_thread (); 631 maybe_start_thread ();
638} 632}
639 633
640static void end_thread (void) 634static void end_thread (void)
646 req->type = REQ_QUIT; 640 req->type = REQ_QUIT;
647 req->pri = PRI_MAX + PRI_BIAS; 641 req->pri = PRI_MAX + PRI_BIAS;
648 642
649 LOCK (reqlock); 643 LOCK (reqlock);
650 reqq_push (&req_queue, req); 644 reqq_push (&req_queue, req);
651 pthread_cond_signal (&reqwait); 645 COND_SIGNAL (reqwait);
652 UNLOCK (reqlock); 646 UNLOCK (reqlock);
653 647
654 LOCK (wrklock); 648 LOCK (wrklock);
655 --started; 649 --started;
656 UNLOCK (wrklock); 650 UNLOCK (wrklock);
711 aio_req req; 705 aio_req req;
712 706
713 if (max_poll_time) 707 if (max_poll_time)
714 gettimeofday (&tv_start, 0); 708 gettimeofday (&tv_start, 0);
715 709
710 block_sig ();
711
716 for (;;) 712 for (;;)
717 { 713 {
718 for (;;) 714 for (;;)
719 { 715 {
720 maybe_start_thread (); 716 maybe_start_thread ();
727 --npending; 723 --npending;
728 724
729 if (!res_queue.size) 725 if (!res_queue.size)
730 { 726 {
731 /* read any signals sent by the worker threads */ 727 /* read any signals sent by the worker threads */
732 char buf [32]; 728 char buf [4];
733 while (read (respipe [0], buf, 32) == 32) 729 while (read (respipe [0], buf, 4) == 4)
734 ; 730 ;
735 } 731 }
736 } 732 }
737 733
738 UNLOCK (reslock); 734 UNLOCK (reslock);
747 req->int1 = 1; /* mark request as delayed */ 743 req->int1 = 1; /* mark request as delayed */
748 continue; 744 continue;
749 } 745 }
750 else 746 else
751 { 747 {
752 req_invoke (req); 748 if (!req_invoke (req))
749 {
750 req_free (req);
751 unblock_sig ();
752 croak (0);
753 }
753 754
754 count++; 755 count++;
755 } 756 }
756 757
757 req_free (req); 758 req_free (req);
774 poll_wait (); 775 poll_wait ();
775 776
776 ++maxreqs; 777 ++maxreqs;
777 } 778 }
778 779
780 unblock_sig ();
779 return count; 781 return count;
780} 782}
781 783
782static void create_pipe () 784static void create_pipe ()
783{ 785{
801/* 803/*
802 * make our pread/pwrite safe against themselves, but not against 804 * make our pread/pwrite safe against themselves, but not against
803 * normal read/write by using a mutex. slows down execution a lot, 805 * normal read/write by using a mutex. slows down execution a lot,
804 * but that's your problem, not mine. 806 * but that's your problem, not mine.
805 */ 807 */
806static pthread_mutex_t preadwritelock = PTHREAD_MUTEX_INITIALIZER; 808static mutex_t preadwritelock = MUTEX_INIT;
807 809
808static ssize_t pread (int fd, void *buf, size_t count, off_t offset) 810static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
809{ 811{
810 ssize_t res; 812 ssize_t res;
811 off_t ooffset; 813 off_t ooffset;
834 836
835 return res; 837 return res;
836} 838}
837#endif 839#endif
838 840
841#ifndef HAVE_FUTIMES
842
843# define utimes(path,times) aio_utimes (path, times)
844# define futimes(fd,times) aio_futimes (fd, times)
845
846int aio_utimes (const char *filename, const struct timeval times[2])
847{
848 if (times)
849 {
850 struct utimbuf buf;
851
852 buf.actime = times[0].tv_sec;
853 buf.modtime = times[1].tv_sec;
854
855 return utime (filename, &buf);
856 }
857 else
858 return utime (filename, 0);
859}
860
861int aio_futimes (int fd, const struct timeval tv[2])
862{
863 errno = ENOSYS;
864 return -1;
865}
866
867#endif
868
839#if !HAVE_FDATASYNC 869#if !HAVE_FDATASYNC
840# define fdatasync fsync 870# define fdatasync fsync
841#endif 871#endif
842 872
843#if !HAVE_READAHEAD 873#if !HAVE_READAHEAD
862#endif 892#endif
863 893
864#if !HAVE_READDIR_R 894#if !HAVE_READDIR_R
865# define readdir_r aio_readdir_r 895# define readdir_r aio_readdir_r
866 896
867static pthread_mutex_t readdirlock = PTHREAD_MUTEX_INITIALIZER; 897static mutex_t readdirlock = MUTEX_INIT;
868 898
869static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 899static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
870{ 900{
871 struct dirent *e; 901 struct dirent *e;
872 int errorno; 902 int errorno;
1071 if (req) 1101 if (req)
1072 break; 1102 break;
1073 1103
1074 ++idle; 1104 ++idle;
1075 1105
1076 if (pthread_cond_timedwait (&reqwait, &reqlock, &ts) 1106 if (COND_TIMEDWAIT (reqwait, reqlock, ts)
1077 == ETIMEDOUT) 1107 == ETIMEDOUT)
1078 { 1108 {
1079 if (idle > max_idle) 1109 if (idle > max_idle)
1080 { 1110 {
1081 --idle; 1111 --idle;
1085 UNLOCK (wrklock); 1115 UNLOCK (wrklock);
1086 goto quit; 1116 goto quit;
1087 } 1117 }
1088 1118
1089 /* we are allowed to idle, so do so without any timeout */ 1119 /* we are allowed to idle, so do so without any timeout */
1090 pthread_cond_wait (&reqwait, &reqlock); 1120 COND_WAIT (reqwait, reqlock);
1091 ts.tv_sec = time (0) + IDLE_TIMEOUT; 1121 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1092 } 1122 }
1093 1123
1094 --idle; 1124 --idle;
1095 } 1125 }
1111 1141
1112 case REQ_STAT: req->result = stat (req->ptr1, (Stat_t *)req->ptr2); break; 1142 case REQ_STAT: req->result = stat (req->ptr1, (Stat_t *)req->ptr2); break;
1113 case REQ_LSTAT: req->result = lstat (req->ptr1, (Stat_t *)req->ptr2); break; 1143 case REQ_LSTAT: req->result = lstat (req->ptr1, (Stat_t *)req->ptr2); break;
1114 case REQ_FSTAT: req->result = fstat (req->int1, (Stat_t *)req->ptr2); break; 1144 case REQ_FSTAT: req->result = fstat (req->int1, (Stat_t *)req->ptr2); break;
1115 1145
1146 case REQ_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
1147 case REQ_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1148 case REQ_CHMOD: req->result = chmod (req->ptr1, req->mode); break;
1149 case REQ_FCHMOD: req->result = fchmod (req->int1, req->mode); break;
1150
1116 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break; 1151 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break;
1117 case REQ_CLOSE: req->result = close (req->int1); break; 1152 case REQ_CLOSE: req->result = close (req->int1); break;
1118 case REQ_UNLINK: req->result = unlink (req->ptr1); break; 1153 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
1119 case REQ_RMDIR: req->result = rmdir (req->ptr1); break; 1154 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
1155 case REQ_MKDIR: req->result = mkdir (req->ptr1, req->mode); break;
1120 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break; 1156 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
1121 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break; 1157 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
1122 case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break; 1158 case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break;
1123 case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break; 1159 case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break;
1124 case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break; 1160 case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break;
1129 1165
1130 case REQ_BUSY: 1166 case REQ_BUSY:
1131 { 1167 {
1132 struct timeval tv; 1168 struct timeval tv;
1133 1169
1134 tv.tv_sec = req->int1; 1170 tv.tv_sec = req->nv1;
1135 tv.tv_usec = req->int2; 1171 tv.tv_usec = (req->nv1 - tv.tv_usec) * 1000000.;
1136 1172
1137 req->result = select (0, 0, 0, 0, &tv); 1173 req->result = select (0, 0, 0, 0, &tv);
1174 }
1175
1176 case REQ_UTIME:
1177 case REQ_FUTIME:
1178 {
1179 struct timeval tv[2];
1180 struct timeval *times;
1181
1182 if (req->nv1 != -1. || req->nv2 != -1.)
1183 {
1184 tv[0].tv_sec = req->nv1;
1185 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
1186 tv[1].tv_sec = req->nv2;
1187 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
1188
1189 times = tv;
1190 }
1191 else
1192 times = 0;
1193
1194
1195 req->result = req->type == REQ_FUTIME
1196 ? futimes (req->int1, times)
1197 : utimes (req->ptr1, times);
1138 } 1198 }
1139 1199
1140 case REQ_GROUP: 1200 case REQ_GROUP:
1141 case REQ_NOP: 1201 case REQ_NOP:
1142 break; 1202 break;
1143 1203
1144 case REQ_QUIT: 1204 case REQ_QUIT:
1145 goto quit; 1205 goto quit;
1146 1206
1147 default: 1207 default:
1148 req->result = ENOSYS; 1208 req->result = -1;
1149 break; 1209 break;
1150 } 1210 }
1151 1211
1152 req->errorno = errno; 1212 req->errorno = errno;
1153 1213
1154 LOCK (reslock); 1214 LOCK (reslock);
1155 1215
1156 ++npending; 1216 ++npending;
1157 1217
1158 if (!reqq_push (&res_queue, req)) 1218 if (!reqq_push (&res_queue, req))
1219 {
1159 /* write a dummy byte to the pipe so fh becomes ready */ 1220 /* write a dummy byte to the pipe so fh becomes ready */
1160 write (respipe [1], &respipe, 1); 1221 write (respipe [1], &respipe, 1);
1222
1223 /* optionally signal the main thread asynchronously */
1224 if (main_sig)
1225 pthread_kill (main_tid, main_sig);
1226 }
1161 1227
1162 self->req = 0; 1228 self->req = 0;
1163 worker_clear (self); 1229 worker_clear (self);
1164 1230
1165 UNLOCK (reslock); 1231 UNLOCK (reslock);
1268 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1334 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1269 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 1335 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
1270 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 1336 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
1271 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 1337 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
1272 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 1338 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
1339 newCONSTSUB (stash, "SIGIO", newSViv (SIGIO));
1273 1340
1274 create_pipe (); 1341 create_pipe ();
1275 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1342 ATFORK (atfork_prepare, atfork_parent, atfork_child);
1276} 1343}
1277 1344
1278void 1345void
1279max_poll_reqs (int nreqs) 1346max_poll_reqs (int nreqs)
1280 PROTOTYPE: $ 1347 PROTOTYPE: $
1309 max_outstanding = maxreqs; 1376 max_outstanding = maxreqs;
1310 OUTPUT: 1377 OUTPUT:
1311 RETVAL 1378 RETVAL
1312 1379
1313void 1380void
1314aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1381aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef)
1315 SV8 * pathname
1316 int flags
1317 int mode
1318 SV * callback
1319 PROTOTYPE: $$$;$ 1382 PROTOTYPE: $$$;$
1320 PPCODE: 1383 PPCODE:
1321{ 1384{
1322 dREQ; 1385 dREQ;
1323 1386
1329 1392
1330 REQ_SEND; 1393 REQ_SEND;
1331} 1394}
1332 1395
1333void 1396void
1334aio_close (fh,callback=&PL_sv_undef) 1397aio_close (SV *fh, SV *callback=&PL_sv_undef)
1335 SV * fh
1336 SV * callback
1337 PROTOTYPE: $;$ 1398 PROTOTYPE: $;$
1338 ALIAS: 1399 ALIAS:
1339 aio_close = REQ_CLOSE 1400 aio_close = REQ_CLOSE
1340 aio_fsync = REQ_FSYNC 1401 aio_fsync = REQ_FSYNC
1341 aio_fdatasync = REQ_FDATASYNC 1402 aio_fdatasync = REQ_FDATASYNC
1342 PPCODE: 1403 PPCODE:
1343{ 1404{
1344 dREQ; 1405 dREQ;
1345 1406
1346 req->type = ix; 1407 req->type = ix;
1347 req->fh = newSVsv (fh); 1408 req->sv1 = newSVsv (fh);
1348 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 1409 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1349 1410
1350 REQ_SEND (req); 1411 REQ_SEND (req);
1351} 1412}
1352 1413
1353void 1414void
1354aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 1415aio_read (SV *fh, UV offset, UV length, SV8 *data, UV dataoffset, SV *callback=&PL_sv_undef)
1355 SV * fh
1356 UV offset
1357 UV length
1358 SV8 * data
1359 UV dataoffset
1360 SV * callback
1361 ALIAS: 1416 ALIAS:
1362 aio_read = REQ_READ 1417 aio_read = REQ_READ
1363 aio_write = REQ_WRITE 1418 aio_write = REQ_WRITE
1364 PROTOTYPE: $$$$$;$ 1419 PROTOTYPE: $$$$$;$
1365 PPCODE: 1420 PPCODE:
1383 length = svlen - dataoffset; 1438 length = svlen - dataoffset;
1384 } 1439 }
1385 else 1440 else
1386 { 1441 {
1387 /* read: grow scalar as necessary */ 1442 /* read: grow scalar as necessary */
1388 svptr = SvGROW (data, length + dataoffset); 1443 svptr = SvGROW (data, length + dataoffset + 1);
1389 } 1444 }
1390 1445
1391 if (length < 0) 1446 if (length < 0)
1392 croak ("length must not be negative"); 1447 croak ("length must not be negative");
1393 1448
1394 { 1449 {
1395 dREQ; 1450 dREQ;
1396 1451
1397 req->type = ix; 1452 req->type = ix;
1398 req->fh = newSVsv (fh); 1453 req->sv1 = newSVsv (fh);
1399 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1454 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1400 : IoOFP (sv_2io (fh))); 1455 : IoOFP (sv_2io (fh)));
1401 req->offs = offset; 1456 req->offs = offset;
1402 req->size = length; 1457 req->size = length;
1403 req->sv1 = SvREFCNT_inc (data); 1458 req->sv2 = SvREFCNT_inc (data);
1404 req->ptr1 = (char *)svptr + dataoffset; 1459 req->ptr1 = (char *)svptr + dataoffset;
1405 req->stroffset = dataoffset; 1460 req->stroffset = dataoffset;
1406 1461
1407 if (!SvREADONLY (data)) 1462 if (!SvREADONLY (data))
1408 { 1463 {
1413 REQ_SEND; 1468 REQ_SEND;
1414 } 1469 }
1415} 1470}
1416 1471
1417void 1472void
1418aio_readlink (path,callback=&PL_sv_undef) 1473aio_readlink (SV8 *path, SV *callback=&PL_sv_undef)
1419 SV8 * path
1420 SV * callback
1421 PROTOTYPE: $$;$ 1474 PROTOTYPE: $$;$
1422 PPCODE: 1475 PPCODE:
1423{ 1476{
1424 SV *data; 1477 SV *data;
1425 dREQ; 1478 dREQ;
1426 1479
1427 data = newSV (NAME_MAX); 1480 data = newSV (NAME_MAX);
1428 SvPOK_on (data); 1481 SvPOK_on (data);
1429 1482
1430 req->type = REQ_READLINK; 1483 req->type = REQ_READLINK;
1431 req->fh = newSVsv (path); 1484 req->sv1 = newSVsv (path);
1432 req->ptr2 = SvPVbyte_nolen (req->fh); 1485 req->ptr2 = SvPVbyte_nolen (req->sv1);
1433 req->sv1 = data; 1486 req->sv2 = data;
1434 req->ptr1 = SvPVbyte_nolen (data); 1487 req->ptr1 = SvPVbyte_nolen (data);
1435 1488
1436 REQ_SEND; 1489 REQ_SEND;
1437} 1490}
1438 1491
1439void 1492void
1440aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef) 1493aio_sendfile (SV *out_fh, SV *in_fh, UV in_offset, UV length, SV *callback=&PL_sv_undef)
1441 SV * out_fh
1442 SV * in_fh
1443 UV in_offset
1444 UV length
1445 SV * callback
1446 PROTOTYPE: $$$$;$ 1494 PROTOTYPE: $$$$;$
1447 PPCODE: 1495 PPCODE:
1448{ 1496{
1449 dREQ; 1497 dREQ;
1450 1498
1451 req->type = REQ_SENDFILE; 1499 req->type = REQ_SENDFILE;
1452 req->fh = newSVsv (out_fh); 1500 req->sv1 = newSVsv (out_fh);
1453 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1501 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1454 req->sv2 = newSVsv (in_fh); 1502 req->sv2 = newSVsv (in_fh);
1455 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1503 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1456 req->offs = in_offset; 1504 req->offs = in_offset;
1457 req->size = length; 1505 req->size = length;
1458 1506
1459 REQ_SEND; 1507 REQ_SEND;
1460} 1508}
1461 1509
1462void 1510void
1463aio_readahead (fh,offset,length,callback=&PL_sv_undef) 1511aio_readahead (SV *fh, UV offset, IV length, SV *callback=&PL_sv_undef)
1464 SV * fh
1465 UV offset
1466 IV length
1467 SV * callback
1468 PROTOTYPE: $$$;$ 1512 PROTOTYPE: $$$;$
1469 PPCODE: 1513 PPCODE:
1470{ 1514{
1471 dREQ; 1515 dREQ;
1472 1516
1473 req->type = REQ_READAHEAD; 1517 req->type = REQ_READAHEAD;
1474 req->fh = newSVsv (fh); 1518 req->sv1 = newSVsv (fh);
1475 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 1519 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1476 req->offs = offset; 1520 req->offs = offset;
1477 req->size = length; 1521 req->size = length;
1478 1522
1479 REQ_SEND; 1523 REQ_SEND;
1480} 1524}
1481 1525
1482void 1526void
1483aio_stat (fh_or_path,callback=&PL_sv_undef) 1527aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef)
1484 SV8 * fh_or_path
1485 SV * callback
1486 ALIAS: 1528 ALIAS:
1487 aio_stat = REQ_STAT 1529 aio_stat = REQ_STAT
1488 aio_lstat = REQ_LSTAT 1530 aio_lstat = REQ_LSTAT
1489 PPCODE: 1531 PPCODE:
1490{ 1532{
1496 req_free (req); 1538 req_free (req);
1497 croak ("out of memory during aio_stat statdata allocation"); 1539 croak ("out of memory during aio_stat statdata allocation");
1498 } 1540 }
1499 1541
1500 req->flags |= FLAG_PTR2_FREE; 1542 req->flags |= FLAG_PTR2_FREE;
1543 req->sv1 = newSVsv (fh_or_path);
1501 1544
1502 if (SvPOK (fh_or_path)) 1545 if (SvPOK (fh_or_path))
1503 { 1546 {
1504 req->type = ix; 1547 req->type = ix;
1505 req->sv1 = newSVsv (fh_or_path);
1506 req->ptr1 = SvPVbyte_nolen (req->sv1); 1548 req->ptr1 = SvPVbyte_nolen (req->sv1);
1507 } 1549 }
1508 else 1550 else
1509 { 1551 {
1510 req->type = REQ_FSTAT; 1552 req->type = REQ_FSTAT;
1511 req->fh = newSVsv (fh_or_path);
1512 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1553 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1513 } 1554 }
1514 1555
1515 REQ_SEND; 1556 REQ_SEND;
1516} 1557}
1517 1558
1518void 1559void
1560aio_utime (SV8 *fh_or_path, SV *atime, SV *mtime, SV *callback=&PL_sv_undef)
1561 PPCODE:
1562{
1563 dREQ;
1564
1565 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
1566 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
1567 req->sv1 = newSVsv (fh_or_path);
1568
1569 if (SvPOK (fh_or_path))
1570 {
1571 req->type = REQ_UTIME;
1572 req->ptr1 = SvPVbyte_nolen (req->sv1);
1573 }
1574 else
1575 {
1576 req->type = REQ_FUTIME;
1577 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1578 }
1579
1580 REQ_SEND;
1581}
1582
1583void
1584aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
1585 PPCODE:
1586{
1587 dREQ;
1588
1589 req->mode = mode;
1590 req->sv1 = newSVsv (fh_or_path);
1591
1592 if (SvPOK (fh_or_path))
1593 {
1594 req->type = REQ_CHMOD;
1595 req->ptr1 = SvPVbyte_nolen (req->sv1);
1596 }
1597 else
1598 {
1599 req->type = REQ_FCHMOD;
1600 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1601 }
1602
1603 REQ_SEND;
1604}
1605
1606void
1607aio_chown (SV8 *fh_or_path, SV *uid, SV *gid, SV *callback=&PL_sv_undef)
1608 PPCODE:
1609{
1610 dREQ;
1611
1612 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
1613 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
1614 req->sv1 = newSVsv (fh_or_path);
1615
1616 if (SvPOK (fh_or_path))
1617 {
1618 req->type = REQ_CHOWN;
1619 req->ptr1 = SvPVbyte_nolen (req->sv1);
1620 }
1621 else
1622 {
1623 req->type = REQ_FCHOWN;
1624 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1625 }
1626
1627 REQ_SEND;
1628}
1629
1630void
1519aio_unlink (pathname,callback=&PL_sv_undef) 1631aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
1520 SV8 * pathname
1521 SV * callback
1522 ALIAS: 1632 ALIAS:
1523 aio_unlink = REQ_UNLINK 1633 aio_unlink = REQ_UNLINK
1524 aio_rmdir = REQ_RMDIR 1634 aio_rmdir = REQ_RMDIR
1525 aio_readdir = REQ_READDIR 1635 aio_readdir = REQ_READDIR
1526 PPCODE: 1636 PPCODE:
1533 1643
1534 REQ_SEND; 1644 REQ_SEND;
1535} 1645}
1536 1646
1537void 1647void
1648aio_mkdir (SV8 *pathname, int mode, SV *callback=&PL_sv_undef)
1649 PPCODE:
1650{
1651 dREQ;
1652
1653 req->type = REQ_MKDIR;
1654 req->sv1 = newSVsv (pathname);
1655 req->ptr1 = SvPVbyte_nolen (req->sv1);
1656 req->mode = mode;
1657
1658 REQ_SEND;
1659}
1660
1661void
1538aio_link (oldpath,newpath,callback=&PL_sv_undef) 1662aio_link (SV8 *oldpath, SV8 *newpath, SV *callback=&PL_sv_undef)
1539 SV8 * oldpath
1540 SV8 * newpath
1541 SV * callback
1542 ALIAS: 1663 ALIAS:
1543 aio_link = REQ_LINK 1664 aio_link = REQ_LINK
1544 aio_symlink = REQ_SYMLINK 1665 aio_symlink = REQ_SYMLINK
1545 aio_rename = REQ_RENAME 1666 aio_rename = REQ_RENAME
1546 PPCODE: 1667 PPCODE:
1547{ 1668{
1548 dREQ; 1669 dREQ;
1549 1670
1550 req->type = ix; 1671 req->type = ix;
1551 req->fh = newSVsv (oldpath); 1672 req->sv2 = newSVsv (oldpath);
1552 req->ptr2 = SvPVbyte_nolen (req->fh); 1673 req->ptr2 = SvPVbyte_nolen (req->sv2);
1553 req->sv1 = newSVsv (newpath); 1674 req->sv1 = newSVsv (newpath);
1554 req->ptr1 = SvPVbyte_nolen (req->sv1); 1675 req->ptr1 = SvPVbyte_nolen (req->sv1);
1555 1676
1556 REQ_SEND; 1677 REQ_SEND;
1557} 1678}
1558 1679
1559void 1680void
1560aio_mknod (pathname,mode,dev,callback=&PL_sv_undef) 1681aio_mknod (SV8 *pathname, int mode, UV dev, SV *callback=&PL_sv_undef)
1561 SV8 * pathname
1562 SV * callback
1563 UV mode
1564 UV dev
1565 PPCODE: 1682 PPCODE:
1566{ 1683{
1567 dREQ; 1684 dREQ;
1568 1685
1569 req->type = REQ_MKNOD; 1686 req->type = REQ_MKNOD;
1574 1691
1575 REQ_SEND; 1692 REQ_SEND;
1576} 1693}
1577 1694
1578void 1695void
1579aio_busy (delay,callback=&PL_sv_undef) 1696aio_busy (double delay, SV *callback=&PL_sv_undef)
1580 double delay
1581 SV * callback
1582 PPCODE: 1697 PPCODE:
1583{ 1698{
1584 dREQ; 1699 dREQ;
1585 1700
1586 req->type = REQ_BUSY; 1701 req->type = REQ_BUSY;
1587 req->int1 = delay < 0. ? 0 : delay; 1702 req->nv1 = delay < 0. ? 0. : delay;
1588 req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1);
1589 1703
1590 REQ_SEND; 1704 REQ_SEND;
1591} 1705}
1592 1706
1593void 1707void
1594aio_group (callback=&PL_sv_undef) 1708aio_group (SV *callback=&PL_sv_undef)
1595 SV * callback
1596 PROTOTYPE: ;$ 1709 PROTOTYPE: ;$
1597 PPCODE: 1710 PPCODE:
1598{ 1711{
1599 dREQ; 1712 dREQ;
1600 1713
1603 req_send (req); 1716 req_send (req);
1604 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1717 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1605} 1718}
1606 1719
1607void 1720void
1608aio_nop (callback=&PL_sv_undef) 1721aio_nop (SV *callback=&PL_sv_undef)
1609 SV * callback
1610 PPCODE: 1722 PPCODE:
1611{ 1723{
1612 dREQ; 1724 dREQ;
1613 1725
1614 req->type = REQ_NOP; 1726 req->type = REQ_NOP;
1677poll_wait() 1789poll_wait()
1678 PROTOTYPE: 1790 PROTOTYPE:
1679 CODE: 1791 CODE:
1680 poll_wait (); 1792 poll_wait ();
1681 1793
1794void
1795setsig (int signum = SIGIO)
1796 PROTOTYPE: ;$
1797 CODE:
1798{
1799 if (block_sig_level)
1800 croak ("cannot call IO::AIO::setsig from within aio_block/callback");
1801
1802 LOCK (reslock);
1803 main_tid = pthread_self ();
1804 main_sig = signum;
1805 UNLOCK (reslock);
1806
1807 if (main_sig && npending)
1808 pthread_kill (main_tid, main_sig);
1809}
1810
1811void
1812aio_block (SV *cb)
1813 PROTOTYPE: &
1814 PPCODE:
1815{
1816 int count;
1817
1818 block_sig ();
1819 PUSHMARK (SP);
1820 PUTBACK;
1821 count = call_sv (cb, GIMME_V | G_NOARGS | G_EVAL);
1822 SPAGAIN;
1823 unblock_sig ();
1824
1825 if (SvTRUE (ERRSV))
1826 croak (0);
1827
1828 XSRETURN (count);
1829}
1830
1682int 1831int
1683nreqs() 1832nreqs()
1684 PROTOTYPE: 1833 PROTOTYPE:
1685 CODE: 1834 CODE:
1686 RETVAL = nreqs; 1835 RETVAL = nreqs;
1735 PPCODE: 1884 PPCODE:
1736{ 1885{
1737 int i; 1886 int i;
1738 aio_req req; 1887 aio_req req;
1739 1888
1889 if (main_sig && !block_sig_level)
1890 croak ("aio_group->add called outside aio_block/callback context while IO::AIO::setsig is in use");
1891
1740 if (grp->int1 == 2) 1892 if (grp->int1 == 2)
1741 croak ("cannot add requests to IO::AIO::GRP after the group finished"); 1893 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1742 1894
1743 for (i = 1; i < items; ++i ) 1895 for (i = 1; i < items; ++i )
1744 { 1896 {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines