ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libcoro/coro.c
(Generate patch)

Comparing libcoro/coro.c (file contents):
Revision 1.27 by root, Wed May 2 05:53:26 2007 UTC vs.
Revision 1.44 by root, Wed Nov 19 02:56:16 2008 UTC

1/* 1/*
2 * Copyright (c) 2001-2006 Marc Alexander Lehmann <schmorp@schmorp.de> 2 * Copyright (c) 2001-2008 Marc Alexander Lehmann <schmorp@schmorp.de>
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without modifica- 4 * Redistribution and use in source and binary forms, with or without modifica-
5 * tion, are permitted provided that the following conditions are met: 5 * tion, are permitted provided that the following conditions are met:
6 * 6 *
7 * 1. Redistributions of source code must retain the above copyright notice, 7 * 1. Redistributions of source code must retain the above copyright notice,
8 * this list of conditions and the following disclaimer. 8 * this list of conditions and the following disclaimer.
9 * 9 *
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the 11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution. 12 * documentation and/or other materials provided with the distribution.
13 *
14 * 3. The name of the author may not be used to endorse or promote products
15 * derived from this software without specific prior written permission.
16 * 13 *
17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 14 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER- 15 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO 16 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE- 17 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
23 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 20 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
24 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH- 21 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
25 * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 22 * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
26 * OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THE POSSIBILITY OF SUCH DAMAGE.
27 * 24 *
25 * Alternatively, the contents of this file may be used under the terms of
26 * the GNU General Public License ("GPL") version 2 or any later version,
27 * in which case the provisions of the GPL are applicable instead of
28 * the above. If you wish to allow the use of your version of this file
29 * only under the terms of the GPL and not to allow others to use your
30 * version of this file under the BSD license, indicate your decision
31 * by deleting the provisions above and replace them with the notice
32 * and other provisions required by the GPL. If you do not delete the
33 * provisions above, a recipient may use your version of this file under
34 * either the BSD or the GPL.
35 *
28 * This library is modelled strictly after Ralf S. Engelschalls article at 36 * This library is modelled strictly after Ralf S. Engelschalls article at
29 * http://www.gnu.org/software/pth/rse-pmt.ps. So most of the credit must 37 * http://www.gnu.org/software/pth/rse-pmt.ps. So most of the credit must
30 * go to Ralf S. Engelschall <rse@engelschall.com>. 38 * go to Ralf S. Engelschall <rse@engelschall.com>.
31 */ 39 */
32 40
33#include "coro.h" 41#include "coro.h"
34 42
43#include <string.h>
44
45/*****************************************************************************/
46/* ucontext/setjmp/asm backends */
47/*****************************************************************************/
48#if CORO_UCONTEXT || CORO_SJLJ || CORO_LOSER || CORO_LINUX || CORO_IRIX || CORO_ASM
49
50# if CORO_UCONTEXT
51# include <stddef.h>
52# endif
53
35#if !defined(STACK_ADJUST_PTR) 54# if !defined(STACK_ADJUST_PTR)
55# if __sgi
36/* IRIX is decidedly NON-unix */ 56/* IRIX is decidedly NON-unix */
37# if __sgi
38# define STACK_ADJUST_PTR(sp,ss) ((char *)(sp) + (ss) - 8) 57# define STACK_ADJUST_PTR(sp,ss) ((char *)(sp) + (ss) - 8)
39# define STACK_ADJUST_SIZE(sp,ss) ((ss) - 8) 58# define STACK_ADJUST_SIZE(sp,ss) ((ss) - 8)
40# elif __i386__ && CORO_LINUX 59# elif (__i386__ && CORO_LINUX) || (_M_IX86 && CORO_LOSER)
41# define STACK_ADJUST_PTR(sp,ss) ((char *)(sp) + (ss)) 60# define STACK_ADJUST_PTR(sp,ss) ((char *)(sp) + (ss))
42# define STACK_ADJUST_SIZE(sp,ss) (ss) 61# define STACK_ADJUST_SIZE(sp,ss) (ss)
43# elif __amd64__ && CORO_LINUX 62# elif (__amd64__ && CORO_LINUX) || ((_M_AMD64 || _M_IA64) && CORO_LOSER)
44# define STACK_ADJUST_PTR(sp,ss) ((char *)(sp) + (ss) - 8) 63# define STACK_ADJUST_PTR(sp,ss) ((char *)(sp) + (ss) - 8)
45# define STACK_ADJUST_SIZE(sp,ss) (ss) 64# define STACK_ADJUST_SIZE(sp,ss) (ss)
46# else 65# else
47# define STACK_ADJUST_PTR(sp,ss) (sp) 66# define STACK_ADJUST_PTR(sp,ss) (sp)
48# define STACK_ADJUST_SIZE(sp,ss) (ss) 67# define STACK_ADJUST_SIZE(sp,ss) (ss)
49# endif 68# endif
50#endif 69# endif
51 70
52#if CORO_UCONTEXT
53# include <stddef.h>
54#endif
55
56#if CORO_SJLJ || CORO_LOSER || CORO_LINUX || CORO_IRIX || CORO_ASM
57
58#include <stdlib.h> 71# include <stdlib.h>
59 72
60#if CORO_SJLJ 73# if CORO_SJLJ
61# include <stdio.h> 74# include <stdio.h>
62# include <signal.h> 75# include <signal.h>
63# include <unistd.h> 76# include <unistd.h>
64#endif 77# endif
65 78
66static volatile coro_func coro_init_func; 79static coro_func coro_init_func;
67static volatile void *coro_init_arg; 80static void *coro_init_arg;
68static volatile coro_context *new_coro, *create_coro; 81static coro_context *new_coro, *create_coro;
69
70/* what we really want to detect here is wether we use a new-enough version of GAS */
71/* instead, check for gcc 3 and ELF and hope for the best */
72#if __GNUC__ >= 3 && __ELF__
73# define HAVE_CFI 1
74#endif
75 82
76static void 83static void
77coro_init (void) 84coro_init (void)
78{ 85{
79 volatile coro_func func = coro_init_func; 86 volatile coro_func func = coro_init_func;
80 volatile void *arg = coro_init_arg; 87 volatile void *arg = coro_init_arg;
81 88
82 coro_transfer ((coro_context *)new_coro, (coro_context *)create_coro); 89 coro_transfer (new_coro, create_coro);
83 90
84 func ((void *)arg); 91 func ((void *)arg);
85 92
86 /* the new coro returned. bad. just abort() for now */ 93 /* the new coro returned. bad. just abort() for now */
87 abort (); 94 abort ();
88} 95}
89 96
90# if CORO_SJLJ 97# if CORO_SJLJ
91 98
92static volatile int trampoline_count; 99static volatile int trampoline_done;
93 100
94/* trampoline signal handler */ 101/* trampoline signal handler */
95static void 102static void
96trampoline (int sig) 103trampoline (int sig)
97{ 104{
98 if (setjmp (((coro_context *)new_coro)->env)) 105 if (coro_setjmp (new_coro->env))
99 {
100#if HAVE_CFI
101 asm (".cfi_startproc");
102#endif
103 coro_init (); /* start it */ 106 coro_init (); /* start it */
104#if HAVE_CFI
105 asm (".cfi_endproc");
106#endif
107 }
108 else 107 else
109 trampoline_count++; 108 trampoline_done = 1;
110} 109}
111 110
112# endif
113
114#endif 111# endif
115 112
116#if CORO_ASM 113# if CORO_ASM
117void __attribute__((__noinline__, __fastcall__)) 114
118coro_transfer (struct coro_context *prev, struct coro_context *next) 115 asm (
119{ 116 ".text\n"
120 asm volatile ( 117 ".globl coro_transfer\n"
118 ".type coro_transfer, @function\n"
119 "coro_transfer:\n"
121#if __amd64 120 #if __amd64
122# define NUM_CLOBBERED 5 121 #define NUM_SAVED 6
122 "\tpush %rbp\n"
123 "push %%rbx\n\t" 123 "\tpush %rbx\n"
124 "push %%r12\n\t" 124 "\tpush %r12\n"
125 "push %%r13\n\t" 125 "\tpush %r13\n"
126 "push %%r14\n\t" 126 "\tpush %r14\n"
127 "push %%r15\n\t" 127 "\tpush %r15\n"
128 "mov %%rsp, %0\n\t" 128 "\tmov %rsp, (%rdi)\n"
129 "mov %1, %%rsp\n\t" 129 "\tmov (%rsi), %rsp\n"
130 "pop %%r15\n\t" 130 "\tpop %r15\n"
131 "pop %%r14\n\t" 131 "\tpop %r14\n"
132 "pop %%r13\n\t" 132 "\tpop %r13\n"
133 "pop %%r12\n\t" 133 "\tpop %r12\n"
134 "pop %%rbx\n\t" 134 "\tpop %rbx\n"
135 "\tpop %rbp\n"
135#elif __i386 136 #elif __i386
136# define NUM_CLOBBERED 4 137 #define NUM_SAVED 4
137 "push %%ebx\n\t"
138 "push %%esi\n\t"
139 "push %%edi\n\t"
140 "push %%ebp\n\t" 138 "\tpush %ebp\n"
141 "mov %%esp, %0\n\t" 139 "\tpush %ebx\n"
142 "mov %1, %%esp\n\t" 140 "\tpush %esi\n"
143 "pop %%ebp\n\t" 141 "\tpush %edi\n"
142 "\tmov %esp, (%eax)\n"
143 "\tmov (%edx), %esp\n"
144 "pop %%edi\n\t" 144 "\tpop %edi\n"
145 "pop %%esi\n\t" 145 "\tpop %esi\n"
146 "pop %%ebx\n\t" 146 "\tpop %ebx\n"
147#else 147 "\tpop %ebp\n"
148 #else
148# error unsupported architecture 149 #error unsupported architecture
149#endif 150 #endif
150 : "=m" (prev->sp) 151 "\tret\n"
151 : "m" (next->sp)
152 ); 152 );
153} 153
154#endif 154# endif
155 155
156/* initialize a machine state */ 156void
157void coro_create (coro_context *ctx, 157coro_create (coro_context *ctx, coro_func coro, void *arg, void *sptr, long ssize)
158 coro_func coro, void *arg,
159 void *sptr, long ssize)
160{ 158{
161#if CORO_UCONTEXT 159 coro_context nctx;
162
163 getcontext (&(ctx->uc));
164
165 ctx->uc.uc_link = 0;
166 ctx->uc.uc_stack.ss_sp = STACK_ADJUST_PTR (sptr,ssize);
167 ctx->uc.uc_stack.ss_size = (size_t) STACK_ADJUST_SIZE (sptr,ssize);
168 ctx->uc.uc_stack.ss_flags = 0;
169
170 makecontext (&(ctx->uc), (void (*)()) coro, 1, arg);
171
172#elif CORO_SJLJ || CORO_LOSER || CORO_LINUX || CORO_IRIX || CORO_ASM
173
174# if CORO_SJLJ 160# if CORO_SJLJ
175 stack_t ostk, nstk; 161 stack_t ostk, nstk;
176 struct sigaction osa, nsa; 162 struct sigaction osa, nsa;
177 sigset_t nsig, osig; 163 sigset_t nsig, osig;
178# endif 164# endif
179 coro_context nctx; 165
166 if (!coro)
167 return;
180 168
181 coro_init_func = coro; 169 coro_init_func = coro;
182 coro_init_arg = arg; 170 coro_init_arg = arg;
183 171
184 new_coro = ctx; 172 new_coro = ctx;
210 { 198 {
211 perror ("sigaltstack"); 199 perror ("sigaltstack");
212 abort (); 200 abort ();
213 } 201 }
214 202
215 trampoline_count = 0; 203 trampoline_done = 0;
216 kill (getpid (), SIGUSR2); 204 kill (getpid (), SIGUSR2);
217 sigfillset (&nsig); sigdelset (&nsig, SIGUSR2); 205 sigfillset (&nsig); sigdelset (&nsig, SIGUSR2);
218 206
219 while (!trampoline_count) 207 while (!trampoline_done)
220 sigsuspend (&nsig); 208 sigsuspend (&nsig);
221 209
222 sigaltstack (0, &nstk); 210 sigaltstack (0, &nstk);
223 nstk.ss_flags = SS_DISABLE; 211 nstk.ss_flags = SS_DISABLE;
224 if (sigaltstack (&nstk, 0) < 0) 212 if (sigaltstack (&nstk, 0) < 0)
230 218
231 if (~ostk.ss_flags & SS_DISABLE) 219 if (~ostk.ss_flags & SS_DISABLE)
232 sigaltstack (&ostk, 0); 220 sigaltstack (&ostk, 0);
233 221
234 sigaction (SIGUSR2, &osa, 0); 222 sigaction (SIGUSR2, &osa, 0);
235
236 sigprocmask (SIG_SETMASK, &osig, 0); 223 sigprocmask (SIG_SETMASK, &osig, 0);
237 224
238# elif CORO_LOSER 225# elif CORO_LOSER
239 226
240 setjmp (ctx->env); 227 coro_setjmp (ctx->env);
241#if __CYGWIN__ 228 #if __CYGWIN__
242 ctx->env[7] = (long)((char *)sptr + ssize); 229 ctx->env[7] = (long)((char *)sptr + ssize) - sizeof (long);
243 ctx->env[8] = (long)coro_init; 230 ctx->env[8] = (long)coro_init;
244#elif defined(_M_IX86) 231 #elif defined(_M_IX86)
245 ((_JUMP_BUFFER *)&ctx->env)->Eip = (long)coro_init; 232 ((_JUMP_BUFFER *)&ctx->env)->Eip = (long)coro_init;
246 ((_JUMP_BUFFER *)&ctx->env)->Esp = (long)STACK_ADJUST_PTR (sptr,ssize); 233 ((_JUMP_BUFFER *)&ctx->env)->Esp = (long)STACK_ADJUST_PTR (sptr, ssize) - sizeof (long);
247#elif defined(_M_AMD64) 234 #elif defined(_M_AMD64)
248 ((_JUMP_BUFFER *)&ctx->env)->Rip = (__int64)coro_init; 235 ((_JUMP_BUFFER *)&ctx->env)->Rip = (__int64)coro_init;
249 ((_JUMP_BUFFER *)&ctx->env)->Rsp = (__int64)STACK_ADJUST_PTR (sptr,ssize); 236 ((_JUMP_BUFFER *)&ctx->env)->Rsp = (__int64)STACK_ADJUST_PTR (sptr, ssize) - sizeof (long);
250#elif defined(_M_IA64) 237 #elif defined(_M_IA64)
251 ((_JUMP_BUFFER *)&ctx->env)->StIIP = (__int64)coro_init; 238 ((_JUMP_BUFFER *)&ctx->env)->StIIP = (__int64)coro_init;
252 ((_JUMP_BUFFER *)&ctx->env)->IntSp = (__int64)STACK_ADJUST_PTR (sptr,ssize); 239 ((_JUMP_BUFFER *)&ctx->env)->IntSp = (__int64)STACK_ADJUST_PTR (sptr, ssize) - sizeof (long);
240 #else
241 #error "microsoft libc or architecture not supported"
242 #endif
243
244# elif CORO_LINUX
245
246 coro_setjmp (ctx->env);
247 #if __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 0 && defined (JB_PC) && defined (JB_SP)
248 ctx->env[0].__jmpbuf[JB_PC] = (long)coro_init;
249 ctx->env[0].__jmpbuf[JB_SP] = (long)STACK_ADJUST_PTR (sptr, ssize) - sizeof (long);
250 #elif __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 0 && defined (__mc68000__)
251 ctx->env[0].__jmpbuf[0].__aregs[0] = (long int)coro_init;
252 ctx->env[0].__jmpbuf[0].__sp = (int *)((char *)sptr + ssize) - sizeof (long);
253 #elif defined (__GNU_LIBRARY__) && defined (__i386__)
254 ctx->env[0].__jmpbuf[0].__pc = (char *)coro_init;
255 ctx->env[0].__jmpbuf[0].__sp = (void *)((char *)sptr + ssize) - sizeof (long);
256 #elif defined (__GNU_LIBRARY__) && defined (__amd64__)
257 ctx->env[0].__jmpbuf[JB_PC] = (long)coro_init;
258 ctx->env[0].__jmpbuf[0].__sp = (void *)((char *)sptr + ssize) - sizeof (long);
259 #else
260 #error "linux libc or architecture not supported"
261 #endif
262
263# elif CORO_IRIX
264
265 coro_setjmp (ctx->env, 0);
266 ctx->env[JB_PC] = (__uint64_t)coro_init;
267 ctx->env[JB_SP] = (__uint64_t)STACK_ADJUST_PTR (sptr, ssize) - sizeof (long);
268
269# elif CORO_ASM
270
271 ctx->sp = (void **)(ssize + (char *)sptr);
272 *--ctx->sp = (void *)abort; /* needed for alignment only */
273 *--ctx->sp = (void *)coro_init;
274 ctx->sp -= NUM_SAVED;
275
276# elif CORO_UCONTEXT
277
278 getcontext (&(ctx->uc));
279
280 ctx->uc.uc_link = 0;
281 ctx->uc.uc_stack.ss_sp = sptr;
282 ctx->uc.uc_stack.ss_size = (size_t)ssize;
283 ctx->uc.uc_stack.ss_flags = 0;
284
285 makecontext (&(ctx->uc), (void (*)())coro_init, 0);
286
287# endif
288
289 coro_transfer (create_coro, new_coro);
290}
291
292/*****************************************************************************/
293/* pthread backend */
294/*****************************************************************************/
295#elif CORO_PTHREAD
296
297/* this mutex will be locked by the running coroutine */
298pthread_mutex_t coro_mutex = PTHREAD_MUTEX_INITIALIZER;
299
300struct coro_init_args
301{
302 coro_func func;
303 void *arg;
304 coro_context *self, *main;
305};
306
307static pthread_t null_tid;
308
309/* I'd so love to cast pthread_mutex_unlock to void (*)(void *)... */
310static void
311mutex_unlock_wrapper (void *arg)
312{
313 pthread_mutex_unlock ((pthread_mutex_t *)arg);
314}
315
316static void *
317coro_init (void *args_)
318{
319 struct coro_init_args *args = (struct coro_init_args *)args_;
320 coro_func func = args->func;
321 void *arg = args->arg;
322
323 pthread_mutex_lock (&coro_mutex);
324
325 /* we try to be good citizens and use deferred cancellation and cleanup handlers */
326 pthread_cleanup_push (mutex_unlock_wrapper, &coro_mutex);
327 coro_transfer (args->self, args->main);
328 func (arg);
329 pthread_cleanup_pop (1);
330
331 return 0;
332}
333
334void
335coro_transfer (coro_context *prev, coro_context *next)
336{
337 pthread_cond_signal (&next->cv);
338 pthread_cond_wait (&prev->cv, &coro_mutex);
339#if __FreeBSD__ /* freebsd is of course broken and needs manual testcancel calls... yay... */
340 pthread_testcancel ();
341#endif
342}
343
344void
345coro_create (coro_context *ctx, coro_func coro, void *arg, void *sptr, long ssize)
346{
347 static coro_context nctx;
348 static int once;
349
350 if (!once)
351 {
352 once = 1;
353
354 pthread_mutex_lock (&coro_mutex);
355 pthread_cond_init (&nctx.cv, 0);
356 null_tid = pthread_self ();
357 }
358
359 pthread_cond_init (&ctx->cv, 0);
360
361 if (coro)
362 {
363 pthread_attr_t attr;
364 struct coro_init_args args;
365
366 args.func = coro;
367 args.arg = arg;
368 args.self = ctx;
369 args.main = &nctx;
370
371 pthread_attr_init (&attr);
372 pthread_attr_setstack (&attr, sptr, (size_t)ssize);
373 pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS);
374 pthread_create (&ctx->id, &attr, coro_init, &args);
375
376 coro_transfer (args.main, args.self);
377 }
378 else
379 ctx->id = null_tid;
380}
381
382void
383coro_destroy (coro_context *ctx)
384{
385 if (!pthread_equal (ctx->id, null_tid))
386 {
387 pthread_cancel (ctx->id);
388 pthread_mutex_unlock (&coro_mutex);
389 pthread_join (ctx->id, 0);
390 pthread_mutex_lock (&coro_mutex);
391 }
392
393 pthread_cond_destroy (&ctx->cv);
394}
395
253#else 396#else
254#error "microsoft libc or architecture not supported" 397# error unsupported backend
255#endif 398#endif
256 399
257# elif CORO_LINUX
258
259 _setjmp (ctx->env);
260#if __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 0 && defined (JB_PC) && defined (JB_SP)
261 ctx->env[0].__jmpbuf[JB_PC] = (long)coro_init;
262 ctx->env[0].__jmpbuf[JB_SP] = (long)STACK_ADJUST_PTR (sptr, ssize);
263#elif __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 0 && defined (__mc68000__)
264 ctx->env[0].__jmpbuf[0].__aregs[0] = (long int)coro_init;
265 ctx->env[0].__jmpbuf[0].__sp = (int *)((char *)sptr + ssize);
266#elif defined (__GNU_LIBRARY__) && defined (__i386__)
267 ctx->env[0].__jmpbuf[0].__pc = (char *)coro_init;
268 ctx->env[0].__jmpbuf[0].__sp = (void *)((char *)sptr + ssize);
269#elif defined (__GNU_LIBRARY__) && defined (__amd64__)
270 ctx->env[0].__jmpbuf[JB_PC] = (long)coro_init;
271 ctx->env[0].__jmpbuf[JB_RSP] = (long)STACK_ADJUST_PTR (sptr, ssize);
272#else
273# error "linux libc or architecture not supported"
274#endif
275
276# elif CORO_IRIX
277
278 setjmp (ctx->env);
279 ctx->env[JB_PC] = (__uint64_t)coro_init;
280 ctx->env[JB_SP] = (__uint64_t)STACK_ADJUST_PTR (sptr, ssize);
281
282# elif CORO_ASM
283
284 ctx->sp = (volatile void **)(ssize + (char *)sptr);
285 *--ctx->sp = (void *)coro_init;
286 *--ctx->sp = (void *)coro_init; // this is needed when the prologue saves ebp
287 ctx->sp -= NUM_CLOBBERED;
288
289# endif
290
291 coro_transfer ((coro_context *)create_coro, (coro_context *)new_coro);
292
293#else
294# error unsupported architecture
295#endif
296}
297

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines