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

Comparing libcoro/coro.c (file contents):
Revision 1.25 by root, Fri Apr 27 19:26:18 2007 UTC vs.
Revision 1.53 by root, Fri Dec 3 19:21:59 2010 UTC

1/* 1/*
2 * Copyright (c) 2001-2006 Marc Alexander Lehmann <schmorp@schmorp.de> 2 * Copyright (c) 2001-2009 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
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#if HAVE_CFI
85 asm (".cfi_startproc");
86#endif
87 func ((void *)arg); 91 func ((void *)arg);
88#if HAVE_CFI
89 asm (".cfi_endproc");
90#endif
91 92
92 /* the new coro returned. bad. just abort() for now */ 93 /* the new coro returned. bad. just abort() for now */
93 abort (); 94 abort ();
94} 95}
95 96
96# if CORO_SJLJ 97# if CORO_SJLJ
97 98
98static volatile int trampoline_count; 99static volatile int trampoline_done;
99 100
100/* trampoline signal handler */ 101/* trampoline signal handler */
101static void 102static void
102trampoline (int sig) 103trampoline (int sig)
103{ 104{
104 if (setjmp (((coro_context *)new_coro)->env)) 105 if (coro_setjmp (new_coro->env))
105 coro_init (); /* start it */ 106 coro_init (); /* start it */
106 else 107 else
107 trampoline_count++; 108 trampoline_done = 1;
108} 109}
109 110
110# endif
111
112#endif 111# endif
113 112
114/* initialize a machine state */ 113# if CORO_ASM
115void coro_create (coro_context *ctx,
116 coro_func coro, void *arg,
117 void *sptr, long ssize)
118{
119#if CORO_UCONTEXT
120 114
121 getcontext (&(ctx->uc)); 115 asm (
116 ".text\n"
117 ".globl coro_transfer\n"
118 ".type coro_transfer, @function\n"
119 "coro_transfer:\n"
120 /* windows, of course, gives a shit on the amd64 ABI and uses different registers */
121 /* http://blogs.msdn.com/freik/archive/2005/03/17/398200.aspx */
122 #if __amd64
123 #define NUM_SAVED 6
124 "\tpush %rbp\n"
125 "\tpush %rbx\n"
126 "\tpush %r12\n"
127 "\tpush %r13\n"
128 "\tpush %r14\n"
129 "\tpush %r15\n"
130 #if CORO_WIN_TIB
131 "\tpush %gs:0x0\n"
132 "\tpush %gs:0x8\n"
133 "\tpush %gs:0xc\n"
134 #endif
135 "\tmov %rsp, (%rdi)\n"
136 "\tmov (%rsi), %rsp\n"
137 #if CORO_WIN_TIB
138 "\tpop %gs:0xc\n"
139 "\tpop %gs:0x8\n"
140 "\tpop %gs:0x0\n"
141 #endif
142 "\tpop %r15\n"
143 "\tpop %r14\n"
144 "\tpop %r13\n"
145 "\tpop %r12\n"
146 "\tpop %rbx\n"
147 "\tpop %rbp\n"
148 #elif __i386
149 #define NUM_SAVED 4
150 "\tpush %ebp\n"
151 "\tpush %ebx\n"
152 "\tpush %esi\n"
153 "\tpush %edi\n"
154 #if CORO_WIN_TIB
155 "\tpush %fs:0\n"
156 "\tpush %fs:4\n"
157 "\tpush %fs:8\n"
158 #endif
159 "\tmov %esp, (%eax)\n"
160 "\tmov (%edx), %esp\n"
161 #if CORO_WIN_TIB
162 "\tpop %fs:8\n"
163 "\tpop %fs:4\n"
164 "\tpop %fs:0\n"
165 #endif
166 "\tpop %edi\n"
167 "\tpop %esi\n"
168 "\tpop %ebx\n"
169 "\tpop %ebp\n"
170 #else
171 #error unsupported architecture
172 #endif
173 "\tret\n"
174 );
122 175
123 ctx->uc.uc_link = 0; 176# endif
124 ctx->uc.uc_stack.ss_sp = STACK_ADJUST_PTR (sptr,ssize);
125 ctx->uc.uc_stack.ss_size = (size_t) STACK_ADJUST_SIZE (sptr,ssize);
126 ctx->uc.uc_stack.ss_flags = 0;
127 177
128 makecontext (&(ctx->uc), (void (*)()) coro, 1, arg); 178void
129 179coro_create (coro_context *ctx, coro_func coro, void *arg, void *sptr, long ssize)
130#elif CORO_SJLJ || CORO_LOSER || CORO_LINUX || CORO_IRIX 180{
131 181 coro_context nctx;
132# if CORO_SJLJ 182# if CORO_SJLJ
133 stack_t ostk, nstk; 183 stack_t ostk, nstk;
134 struct sigaction osa, nsa; 184 struct sigaction osa, nsa;
135 sigset_t nsig, osig; 185 sigset_t nsig, osig;
136# endif 186# endif
137 coro_context nctx; 187
188 if (!coro)
189 return;
138 190
139 coro_init_func = coro; 191 coro_init_func = coro;
140 coro_init_arg = arg; 192 coro_init_arg = arg;
141 193
142 new_coro = ctx; 194 new_coro = ctx;
168 { 220 {
169 perror ("sigaltstack"); 221 perror ("sigaltstack");
170 abort (); 222 abort ();
171 } 223 }
172 224
173 trampoline_count = 0; 225 trampoline_done = 0;
174 kill (getpid (), SIGUSR2); 226 kill (getpid (), SIGUSR2);
175 sigfillset (&nsig); sigdelset (&nsig, SIGUSR2); 227 sigfillset (&nsig); sigdelset (&nsig, SIGUSR2);
176 228
177 while (!trampoline_count) 229 while (!trampoline_done)
178 sigsuspend (&nsig); 230 sigsuspend (&nsig);
179 231
180 sigaltstack (0, &nstk); 232 sigaltstack (0, &nstk);
181 nstk.ss_flags = SS_DISABLE; 233 nstk.ss_flags = SS_DISABLE;
182 if (sigaltstack (&nstk, 0) < 0) 234 if (sigaltstack (&nstk, 0) < 0)
188 240
189 if (~ostk.ss_flags & SS_DISABLE) 241 if (~ostk.ss_flags & SS_DISABLE)
190 sigaltstack (&ostk, 0); 242 sigaltstack (&ostk, 0);
191 243
192 sigaction (SIGUSR2, &osa, 0); 244 sigaction (SIGUSR2, &osa, 0);
193
194 sigprocmask (SIG_SETMASK, &osig, 0); 245 sigprocmask (SIG_SETMASK, &osig, 0);
195 246
196# elif CORO_LOSER 247# elif CORO_LOSER
197 248
198 setjmp (ctx->env); 249 coro_setjmp (ctx->env);
199#if __CYGWIN__ 250 #if __CYGWIN__ && __i386
200 ctx->env[7] = (long)((char *)sptr + ssize); 251 ctx->env[8] = (long) coro_init;
201 ctx->env[8] = (long)coro_init; 252 ctx->env[7] = (long) ((char *)sptr + ssize) - sizeof (long);
253 #elif __CYGWIN__ && __x86_64
254 ctx->env[7] = (long) coro_init;
255 ctx->env[6] = (long) ((char *)sptr + ssize) - sizeof (long);
256 #elif defined(__MINGW32__)
257 ctx->env[5] = (long) coro_init;
258 ctx->env[4] = (long) ((char *)sptr + ssize) - sizeof (long);
202#elif defined(_M_IX86) 259 #elif defined(_M_IX86)
203 ((_JUMP_BUFFER *)&ctx->env)->Eip = (long)coro_init; 260 ((_JUMP_BUFFER *)&ctx->env)->Eip = (long) coro_init;
204 ((_JUMP_BUFFER *)&ctx->env)->Esp = (long)STACK_ADJUST_PTR (sptr,ssize); 261 ((_JUMP_BUFFER *)&ctx->env)->Esp = (long) STACK_ADJUST_PTR (sptr, ssize) - sizeof (long);
205#elif defined(_M_AMD64) 262 #elif defined(_M_AMD64)
206 ((_JUMP_BUFFER *)&ctx->env)->Rip = (__int64)coro_init; 263 ((_JUMP_BUFFER *)&ctx->env)->Rip = (__int64) coro_init;
207 ((_JUMP_BUFFER *)&ctx->env)->Rsp = (__int64)STACK_ADJUST_PTR (sptr,ssize); 264 ((_JUMP_BUFFER *)&ctx->env)->Rsp = (__int64) STACK_ADJUST_PTR (sptr, ssize) - sizeof (__int64);
208#elif defined(_M_IA64) 265 #elif defined(_M_IA64)
209 ((_JUMP_BUFFER *)&ctx->env)->StIIP = (__int64)coro_init; 266 ((_JUMP_BUFFER *)&ctx->env)->StIIP = (__int64) coro_init;
210 ((_JUMP_BUFFER *)&ctx->env)->IntSp = (__int64)STACK_ADJUST_PTR (sptr,ssize); 267 ((_JUMP_BUFFER *)&ctx->env)->IntSp = (__int64) STACK_ADJUST_PTR (sptr, ssize) - sizeof (__int64);
268 #else
269 #error "microsoft libc or architecture not supported"
270 #endif
271
272# elif CORO_LINUX
273
274 coro_setjmp (ctx->env);
275 #if __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 0 && defined (JB_PC) && defined (JB_SP)
276 ctx->env[0].__jmpbuf[JB_PC] = (long) coro_init;
277 ctx->env[0].__jmpbuf[JB_SP] = (long) STACK_ADJUST_PTR (sptr, ssize) - sizeof (long);
278 #elif __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 0 && defined (__mc68000__)
279 ctx->env[0].__jmpbuf[0].__aregs[0] = (long int)coro_init;
280 ctx->env[0].__jmpbuf[0].__sp = (int *) ((char *)sptr + ssize) - sizeof (long);
281 #elif defined (__GNU_LIBRARY__) && defined (__i386__)
282 ctx->env[0].__jmpbuf[0].__pc = (char *) coro_init;
283 ctx->env[0].__jmpbuf[0].__sp = (void *) ((char *)sptr + ssize) - sizeof (long);
284 #elif defined (__GNU_LIBRARY__) && defined (__amd64__)
285 ctx->env[0].__jmpbuf[JB_PC] = (long) coro_init;
286 ctx->env[0].__jmpbuf[0].__sp = (void *) ((char *)sptr + ssize) - sizeof (long);
287 #else
288 #error "linux libc or architecture not supported"
289 #endif
290
291# elif CORO_IRIX
292
293 coro_setjmp (ctx->env, 0);
294 ctx->env[JB_PC] = (__uint64_t)coro_init;
295 ctx->env[JB_SP] = (__uint64_t)STACK_ADJUST_PTR (sptr, ssize) - sizeof (long);
296
297# elif CORO_ASM
298
299 ctx->sp = (void **)(ssize + (char *)sptr);
300 *--ctx->sp = (void *)abort; /* needed for alignment only */
301 *--ctx->sp = (void *)coro_init;
302
303 #if CORO_WIN_TIB
304 *--ctx->sp = 0; /* ExceptionList */
305 *--ctx->sp = (char *)sptr + ssize; /* StackBase */
306 *--ctx->sp = sptr; /* StackLimit */
307 #endif
308
309 ctx->sp -= NUM_SAVED;
310
311# elif CORO_UCONTEXT
312
313 getcontext (&(ctx->uc));
314
315 ctx->uc.uc_link = 0;
316 ctx->uc.uc_stack.ss_sp = sptr;
317 ctx->uc.uc_stack.ss_size = (size_t)ssize;
318 ctx->uc.uc_stack.ss_flags = 0;
319
320 makecontext (&(ctx->uc), (void (*)())coro_init, 0);
321
322# endif
323
324 coro_transfer (create_coro, new_coro);
325}
326
327/*****************************************************************************/
328/* pthread backend */
329/*****************************************************************************/
330#elif CORO_PTHREAD
331
332/* this mutex will be locked by the running coroutine */
333pthread_mutex_t coro_mutex = PTHREAD_MUTEX_INITIALIZER;
334
335struct coro_init_args
336{
337 coro_func func;
338 void *arg;
339 coro_context *self, *main;
340};
341
342static pthread_t null_tid;
343
344/* I'd so love to cast pthread_mutex_unlock to void (*)(void *)... */
345static void
346mutex_unlock_wrapper (void *arg)
347{
348 pthread_mutex_unlock ((pthread_mutex_t *)arg);
349}
350
351static void *
352coro_init (void *args_)
353{
354 struct coro_init_args *args = (struct coro_init_args *)args_;
355 coro_func func = args->func;
356 void *arg = args->arg;
357
358 pthread_mutex_lock (&coro_mutex);
359
360 /* we try to be good citizens and use deferred cancellation and cleanup handlers */
361 pthread_cleanup_push (mutex_unlock_wrapper, &coro_mutex);
362 coro_transfer (args->self, args->main);
363 func (arg);
364 pthread_cleanup_pop (1);
365
366 return 0;
367}
368
369void
370coro_transfer (coro_context *prev, coro_context *next)
371{
372 pthread_cond_signal (&next->cv);
373 pthread_cond_wait (&prev->cv, &coro_mutex);
374#if __FreeBSD__ /* freebsd is of course broken and needs manual testcancel calls... yay... */
375 pthread_testcancel ();
376#endif
377}
378
379void
380coro_create (coro_context *ctx, coro_func coro, void *arg, void *sptr, long ssize)
381{
382 static coro_context nctx;
383 static int once;
384
385 if (!once)
386 {
387 once = 1;
388
389 pthread_mutex_lock (&coro_mutex);
390 pthread_cond_init (&nctx.cv, 0);
391 null_tid = pthread_self ();
392 }
393
394 pthread_cond_init (&ctx->cv, 0);
395
396 if (coro)
397 {
398 pthread_attr_t attr;
399 struct coro_init_args args;
400
401 args.func = coro;
402 args.arg = arg;
403 args.self = ctx;
404 args.main = &nctx;
405
406 pthread_attr_init (&attr);
407#if __UCLIBC__
408 pthread_attr_setstacksize (&attr, (size_t)ssize);
211#else 409#else
212#error "microsoft libc or architecture not supported" 410 pthread_attr_setstack (&attr, sptr, (size_t)ssize);
213#endif 411#endif
412 pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS);
413 pthread_create (&ctx->id, &attr, coro_init, &args);
214 414
215# elif CORO_LINUX 415 coro_transfer (args.main, args.self);
416 }
417 else
418 ctx->id = null_tid;
419}
216 420
217 _setjmp (ctx->env); 421void
218#if __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 0 && defined (JB_PC) && defined (JB_SP) 422coro_destroy (coro_context *ctx)
219 ctx->env[0].__jmpbuf[JB_PC] = (long)coro_init; 423{
220 ctx->env[0].__jmpbuf[JB_SP] = (long)STACK_ADJUST_PTR (sptr, ssize); 424 if (!pthread_equal (ctx->id, null_tid))
221#elif __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 0 && defined (__mc68000__) 425 {
222 ctx->env[0].__jmpbuf[0].__aregs[0] = (long int)coro_init; 426 pthread_cancel (ctx->id);
223 ctx->env[0].__jmpbuf[0].__sp = (int *)((char *)sptr + ssize); 427 pthread_mutex_unlock (&coro_mutex);
224#elif defined (__GNU_LIBRARY__) && defined (__i386__) 428 pthread_join (ctx->id, 0);
225 ctx->env[0].__jmpbuf[0].__pc = (char *)coro_init; 429 pthread_mutex_lock (&coro_mutex);
226 ctx->env[0].__jmpbuf[0].__sp = (void *)((char *)sptr + ssize); 430 }
227#elif defined (__GNU_LIBRARY__) && defined (__amd64__) 431
228 ctx->env[0].__jmpbuf[JB_PC] = (long)coro_init; 432 pthread_cond_destroy (&ctx->cv);
229 ctx->env[0].__jmpbuf[JB_RSP] = (long)STACK_ADJUST_PTR (sptr, ssize); 433}
434
230#else 435#else
231#error "linux libc or architecture not supported" 436# error unsupported backend
232#endif 437#endif
233 438
234# elif CORO_IRIX
235
236 setjmp (ctx->env);
237 ctx->env[JB_PC] = (__uint64_t)coro_init;
238 ctx->env[JB_SP] = (__uint64_t)STACK_ADJUST_PTR (sptr, ssize);
239
240# endif
241
242 coro_transfer ((coro_context *)create_coro, (coro_context *)new_coro);
243
244#else
245error unsupported architecture
246#endif
247}
248

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines