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

Comparing libcoro/coro.c (file contents):
Revision 1.29 by root, Sun Mar 2 16:10:22 2008 UTC vs.
Revision 1.59 by root, Mon Jun 13 08:38:16 2011 UTC

1/* 1/*
2 * Copyright (c) 2001-2008 Marc Alexander Lehmann <schmorp@schmorp.de> 2 * Copyright (c) 2001-2011 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,
38 * go to Ralf S. Engelschall <rse@engelschall.com>. 38 * go to Ralf S. Engelschall <rse@engelschall.com>.
39 */ 39 */
40 40
41#include "coro.h" 41#include "coro.h"
42 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
43#if !defined(STACK_ADJUST_PTR) 54# if !defined(STACK_ADJUST_PTR)
55# if __sgi
44/* IRIX is decidedly NON-unix */ 56/* IRIX is decidedly NON-unix */
45# if __sgi
46# define STACK_ADJUST_PTR(sp,ss) ((char *)(sp) + (ss) - 8) 57# define STACK_ADJUST_PTR(sp,ss) ((char *)(sp) + (ss) - 8)
47# define STACK_ADJUST_SIZE(sp,ss) ((ss) - 8) 58# define STACK_ADJUST_SIZE(sp,ss) ((ss) - 8)
48# elif __i386__ && CORO_LINUX 59# elif (__i386__ && CORO_LINUX) || (_M_IX86 && CORO_LOSER)
49# define STACK_ADJUST_PTR(sp,ss) ((char *)(sp) + (ss)) 60# define STACK_ADJUST_PTR(sp,ss) ((char *)(sp) + (ss))
50# define STACK_ADJUST_SIZE(sp,ss) (ss) 61# define STACK_ADJUST_SIZE(sp,ss) (ss)
51# elif __amd64__ && CORO_LINUX 62# elif (__amd64__ && CORO_LINUX) || ((_M_AMD64 || _M_IA64) && CORO_LOSER)
52# define STACK_ADJUST_PTR(sp,ss) ((char *)(sp) + (ss) - 8) 63# define STACK_ADJUST_PTR(sp,ss) ((char *)(sp) + (ss) - 8)
53# define STACK_ADJUST_SIZE(sp,ss) (ss) 64# define STACK_ADJUST_SIZE(sp,ss) (ss)
54# else 65# else
55# define STACK_ADJUST_PTR(sp,ss) (sp) 66# define STACK_ADJUST_PTR(sp,ss) (sp)
56# define STACK_ADJUST_SIZE(sp,ss) (ss) 67# define STACK_ADJUST_SIZE(sp,ss) (ss)
57# endif 68# endif
58#endif 69# endif
59 70
60#if CORO_UCONTEXT
61# include <stddef.h>
62#endif
63
64#if CORO_SJLJ || CORO_LOSER || CORO_LINUX || CORO_IRIX || CORO_ASM
65
66#include <stdlib.h> 71# include <stdlib.h>
67 72
68#if CORO_SJLJ 73# if CORO_SJLJ
69# include <stdio.h> 74# include <stdio.h>
70# include <signal.h> 75# include <signal.h>
71# include <unistd.h> 76# include <unistd.h>
72#endif 77# endif
73 78
74static volatile coro_func coro_init_func; 79static coro_func coro_init_func;
75static volatile void *coro_init_arg; 80static void *coro_init_arg;
76static volatile coro_context *new_coro, *create_coro; 81static coro_context *new_coro, *create_coro;
77
78/* what we really want to detect here is wether we use a new-enough version of GAS */
79/* instead, check for gcc 3, ELF and GNU/Linux and hope for the best */
80#if __GNUC__ >= 3 && __ELF__ && __linux__
81# define HAVE_CFI 1
82#endif
83 82
84static void 83static void
85coro_init (void) 84coro_init (void)
86{ 85{
87 volatile coro_func func = coro_init_func; 86 volatile coro_func func = coro_init_func;
88 volatile void *arg = coro_init_arg; 87 volatile void *arg = coro_init_arg;
89 88
90 coro_transfer ((coro_context *)new_coro, (coro_context *)create_coro); 89 coro_transfer (new_coro, create_coro);
90
91#if __linux && __amd64
92 /* we blindly assume on any __linux with __amd64 we have a new enough gas with .cfi_undefined support */
93 asm (".cfi_undefined rip");
94#endif
91 95
92 func ((void *)arg); 96 func ((void *)arg);
93 97
94 /* the new coro returned. bad. just abort() for now */ 98 /* the new coro returned. bad. just abort() for now */
95 abort (); 99 abort ();
96} 100}
97 101
98# if CORO_SJLJ 102# if CORO_SJLJ
99 103
100static volatile int trampoline_count; 104static volatile int trampoline_done;
101 105
102/* trampoline signal handler */ 106/* trampoline signal handler */
103static void 107static void
104trampoline (int sig) 108trampoline (int sig)
105{ 109{
106 if (setjmp (((coro_context *)new_coro)->env)) 110 if (coro_setjmp (new_coro->env))
107 {
108#if HAVE_CFI
109 asm (".cfi_startproc");
110#endif
111 coro_init (); /* start it */ 111 coro_init (); /* start it */
112#if HAVE_CFI
113 asm (".cfi_endproc");
114#endif
115 }
116 else 112 else
117 trampoline_count++; 113 trampoline_done = 1;
118} 114}
119 115
120# endif
121
122#endif 116# endif
123 117
124#if CORO_ASM 118# if CORO_ASM
125void __attribute__((__noinline__, __fastcall__)) 119
126coro_transfer (struct coro_context *prev, struct coro_context *next) 120 asm (
127{ 121 ".text\n"
128 asm volatile ( 122 ".globl coro_transfer\n"
123 ".type coro_transfer, @function\n"
124 "coro_transfer:\n"
125 /* windows, of course, gives a shit on the amd64 ABI and uses different registers */
126 /* http://blogs.msdn.com/freik/archive/2005/03/17/398200.aspx */
129#if __amd64 127 #if __amd64
130# define NUM_CLOBBERED 5 128 #ifdef _WIN32
131 "push %%rbx\n\t" 129 /* TODO: xmm6..15 also would need to be saved. sigh. */
132 "push %%r12\n\t" 130 #define NUM_SAVED 8
133 "push %%r13\n\t" 131 #undef CORO_WIN_TIB
134 "push %%r14\n\t" 132 "\tpushq %rsi\n"
135 "push %%r15\n\t" 133 "\tpushq %rdi\n"
136 "mov %%rsp, %0\n\t" 134 "\tpushq %rbp\n"
137 "mov %1, %%rsp\n\t" 135 "\tpushq %rbx\n"
138 "pop %%r15\n\t" 136 "\tpushq %r12\n"
139 "pop %%r14\n\t" 137 "\tpushq %r13\n"
140 "pop %%r13\n\t" 138 "\tpushq %r14\n"
141 "pop %%r12\n\t" 139 "\tpushq %r15\n"
142 "pop %%rbx\n\t" 140 "\tmovq %rsp, (%rcx)\n"
141 "\tmovq (%rdx), %rsp\n"
142 "\tpopq %r15\n"
143 "\tpopq %r14\n"
144 "\tpopq %r13\n"
145 "\tpopq %r12\n"
146 "\tpopq %rbx\n"
147 "\tpopq %rbp\n"
148 "\tpopq %rdi\n"
149 "\tpopq %rsi\n"
150 #else
151 #define NUM_SAVED 6
152 "\tpushq %rbp\n"
153 "\tpushq %rbx\n"
154 "\tpushq %r12\n"
155 "\tpushq %r13\n"
156 "\tpushq %r14\n"
157 "\tpushq %r15\n"
158 "\tmovq %rsp, (%rdi)\n"
159 "\tmovq (%rsi), %rsp\n"
160 "\tpopq %r15\n"
161 "\tpopq %r14\n"
162 "\tpopq %r13\n"
163 "\tpopq %r12\n"
164 "\tpopq %rbx\n"
165 "\tpopq %rbp\n"
166 #endif
143#elif __i386 167 #elif __i386
144# define NUM_CLOBBERED 4 168 #define NUM_SAVED 4
145 "push %%ebx\n\t" 169 "\tpushl %ebp\n"
146 "push %%esi\n\t" 170 "\tpushl %ebx\n"
147 "push %%edi\n\t" 171 "\tpushl %esi\n"
148 "push %%ebp\n\t" 172 "\tpushl %edi\n"
149 "mov %%esp, %0\n\t" 173 #if CORO_WIN_TIB
150 "mov %1, %%esp\n\t" 174 "\tpushl %fs:0\n"
151 "pop %%ebp\n\t" 175 "\tpushl %fs:4\n"
152 "pop %%edi\n\t" 176 "\tpushl %fs:8\n"
153 "pop %%esi\n\t" 177 #endif
154 "pop %%ebx\n\t" 178 "\tmovl %esp, (%eax)\n"
155#else 179 "\tmovl (%edx), %esp\n"
180 #if CORO_WIN_TIB
181 "\tpopl %fs:8\n"
182 "\tpopl %fs:4\n"
183 "\tpopl %fs:0\n"
184 #endif
185 "\tpopl %edi\n"
186 "\tpopl %esi\n"
187 "\tpopl %ebx\n"
188 "\tpopl %ebp\n"
189 #else
156# error unsupported architecture 190 #error unsupported architecture
157#endif 191 #endif
158 : "=m" (prev->sp) 192 "\tret\n"
159 : "m" (next->sp)
160 ); 193 );
161} 194
162#endif 195# endif
163 196
164/* initialize a machine state */ 197void
165void coro_create (coro_context *ctx, 198coro_create (coro_context *ctx, coro_func coro, void *arg, void *sptr, long ssize)
166 coro_func coro, void *arg,
167 void *sptr, long ssize)
168{ 199{
169#if CORO_UCONTEXT 200 coro_context nctx;
170
171 getcontext (&(ctx->uc));
172
173 ctx->uc.uc_link = 0;
174 ctx->uc.uc_stack.ss_sp = STACK_ADJUST_PTR (sptr,ssize);
175 ctx->uc.uc_stack.ss_size = (size_t) STACK_ADJUST_SIZE (sptr,ssize);
176 ctx->uc.uc_stack.ss_flags = 0;
177
178 makecontext (&(ctx->uc), (void (*)()) coro, 1, arg);
179
180#elif CORO_SJLJ || CORO_LOSER || CORO_LINUX || CORO_IRIX || CORO_ASM
181
182# if CORO_SJLJ 201# if CORO_SJLJ
183 stack_t ostk, nstk; 202 stack_t ostk, nstk;
184 struct sigaction osa, nsa; 203 struct sigaction osa, nsa;
185 sigset_t nsig, osig; 204 sigset_t nsig, osig;
186# endif 205# endif
187 coro_context nctx; 206
207 if (!coro)
208 return;
188 209
189 coro_init_func = coro; 210 coro_init_func = coro;
190 coro_init_arg = arg; 211 coro_init_arg = arg;
191 212
192 new_coro = ctx; 213 new_coro = ctx;
208 perror ("sigaction"); 229 perror ("sigaction");
209 abort (); 230 abort ();
210 } 231 }
211 232
212 /* set the new stack */ 233 /* set the new stack */
213 nstk.ss_sp = STACK_ADJUST_PTR (sptr,ssize); /* yes, some platforms (IRIX) get this wrong. */ 234 nstk.ss_sp = STACK_ADJUST_PTR (sptr, ssize); /* yes, some platforms (IRIX) get this wrong. */
214 nstk.ss_size = STACK_ADJUST_SIZE (sptr,ssize); 235 nstk.ss_size = STACK_ADJUST_SIZE (sptr, ssize);
215 nstk.ss_flags = 0; 236 nstk.ss_flags = 0;
216 237
217 if (sigaltstack (&nstk, &ostk) < 0) 238 if (sigaltstack (&nstk, &ostk) < 0)
218 { 239 {
219 perror ("sigaltstack"); 240 perror ("sigaltstack");
220 abort (); 241 abort ();
221 } 242 }
222 243
223 trampoline_count = 0; 244 trampoline_done = 0;
224 kill (getpid (), SIGUSR2); 245 kill (getpid (), SIGUSR2);
225 sigfillset (&nsig); sigdelset (&nsig, SIGUSR2); 246 sigfillset (&nsig); sigdelset (&nsig, SIGUSR2);
226 247
227 while (!trampoline_count) 248 while (!trampoline_done)
228 sigsuspend (&nsig); 249 sigsuspend (&nsig);
229 250
230 sigaltstack (0, &nstk); 251 sigaltstack (0, &nstk);
231 nstk.ss_flags = SS_DISABLE; 252 nstk.ss_flags = SS_DISABLE;
232 if (sigaltstack (&nstk, 0) < 0) 253 if (sigaltstack (&nstk, 0) < 0)
238 259
239 if (~ostk.ss_flags & SS_DISABLE) 260 if (~ostk.ss_flags & SS_DISABLE)
240 sigaltstack (&ostk, 0); 261 sigaltstack (&ostk, 0);
241 262
242 sigaction (SIGUSR2, &osa, 0); 263 sigaction (SIGUSR2, &osa, 0);
243
244 sigprocmask (SIG_SETMASK, &osig, 0); 264 sigprocmask (SIG_SETMASK, &osig, 0);
245 265
246# elif CORO_LOSER 266# elif CORO_LOSER
247 267
248 setjmp (ctx->env); 268 coro_setjmp (ctx->env);
249#if __CYGWIN__ 269 #if __CYGWIN__ && __i386
250 ctx->env[7] = (long)((char *)sptr + ssize); 270 ctx->env[8] = (long) coro_init;
251 ctx->env[8] = (long)coro_init; 271 ctx->env[7] = (long) ((char *)sptr + ssize) - sizeof (long);
272 #elif __CYGWIN__ && __x86_64
273 ctx->env[7] = (long) coro_init;
274 ctx->env[6] = (long) ((char *)sptr + ssize) - sizeof (long);
275 #elif defined(__MINGW32__)
276 ctx->env[5] = (long) coro_init;
277 ctx->env[4] = (long) ((char *)sptr + ssize) - sizeof (long);
252#elif defined(_M_IX86) 278 #elif defined(_M_IX86)
253 ((_JUMP_BUFFER *)&ctx->env)->Eip = (long)coro_init; 279 ((_JUMP_BUFFER *)&ctx->env)->Eip = (long) coro_init;
254 ((_JUMP_BUFFER *)&ctx->env)->Esp = (long)STACK_ADJUST_PTR (sptr,ssize); 280 ((_JUMP_BUFFER *)&ctx->env)->Esp = (long) STACK_ADJUST_PTR (sptr, ssize) - sizeof (long);
255#elif defined(_M_AMD64) 281 #elif defined(_M_AMD64)
256 ((_JUMP_BUFFER *)&ctx->env)->Rip = (__int64)coro_init; 282 ((_JUMP_BUFFER *)&ctx->env)->Rip = (__int64) coro_init;
257 ((_JUMP_BUFFER *)&ctx->env)->Rsp = (__int64)STACK_ADJUST_PTR (sptr,ssize); 283 ((_JUMP_BUFFER *)&ctx->env)->Rsp = (__int64) STACK_ADJUST_PTR (sptr, ssize) - sizeof (__int64);
258#elif defined(_M_IA64) 284 #elif defined(_M_IA64)
259 ((_JUMP_BUFFER *)&ctx->env)->StIIP = (__int64)coro_init; 285 ((_JUMP_BUFFER *)&ctx->env)->StIIP = (__int64) coro_init;
260 ((_JUMP_BUFFER *)&ctx->env)->IntSp = (__int64)STACK_ADJUST_PTR (sptr,ssize); 286 ((_JUMP_BUFFER *)&ctx->env)->IntSp = (__int64) STACK_ADJUST_PTR (sptr, ssize) - sizeof (__int64);
287 #else
288 #error "microsoft libc or architecture not supported"
289 #endif
290
291# elif CORO_LINUX
292
293 coro_setjmp (ctx->env);
294 #if __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 0 && defined (JB_PC) && defined (JB_SP)
295 ctx->env[0].__jmpbuf[JB_PC] = (long) coro_init;
296 ctx->env[0].__jmpbuf[JB_SP] = (long) STACK_ADJUST_PTR (sptr, ssize) - sizeof (long);
297 #elif __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 0 && defined (__mc68000__)
298 ctx->env[0].__jmpbuf[0].__aregs[0] = (long int)coro_init;
299 ctx->env[0].__jmpbuf[0].__sp = (int *) ((char *)sptr + ssize) - sizeof (long);
300 #elif defined (__GNU_LIBRARY__) && defined (__i386__)
301 ctx->env[0].__jmpbuf[0].__pc = (char *) coro_init;
302 ctx->env[0].__jmpbuf[0].__sp = (void *) ((char *)sptr + ssize) - sizeof (long);
303 #elif defined (__GNU_LIBRARY__) && defined (__amd64__)
304 ctx->env[0].__jmpbuf[JB_PC] = (long) coro_init;
305 ctx->env[0].__jmpbuf[0].__sp = (void *) ((char *)sptr + ssize) - sizeof (long);
306 #else
307 #error "linux libc or architecture not supported"
308 #endif
309
310# elif CORO_IRIX
311
312 coro_setjmp (ctx->env, 0);
313 ctx->env[JB_PC] = (__uint64_t)coro_init;
314 ctx->env[JB_SP] = (__uint64_t)STACK_ADJUST_PTR (sptr, ssize) - sizeof (long);
315
316# elif CORO_ASM
317
318 ctx->sp = (void **)(ssize + (char *)sptr);
319 *--ctx->sp = (void *)abort; /* needed for alignment only */
320 *--ctx->sp = (void *)coro_init;
321
322 #if CORO_WIN_TIB
323 *--ctx->sp = 0; /* ExceptionList */
324 *--ctx->sp = (char *)sptr + ssize; /* StackBase */
325 *--ctx->sp = sptr; /* StackLimit */
326 #endif
327
328 ctx->sp -= NUM_SAVED;
329 memset (ctx->sp, 0, sizeof (*ctx->sp) * NUM_SAVED);
330
331# elif CORO_UCONTEXT
332
333 getcontext (&(ctx->uc));
334
335 ctx->uc.uc_link = 0;
336 ctx->uc.uc_stack.ss_sp = sptr;
337 ctx->uc.uc_stack.ss_size = (size_t)ssize;
338 ctx->uc.uc_stack.ss_flags = 0;
339
340 makecontext (&(ctx->uc), (void (*)())coro_init, 0);
341
342# endif
343
344 coro_transfer (create_coro, new_coro);
345}
346
347/*****************************************************************************/
348/* pthread backend */
349/*****************************************************************************/
350#elif CORO_PTHREAD
351
352/* this mutex will be locked by the running coroutine */
353pthread_mutex_t coro_mutex = PTHREAD_MUTEX_INITIALIZER;
354
355struct coro_init_args
356{
357 coro_func func;
358 void *arg;
359 coro_context *self, *main;
360};
361
362static pthread_t null_tid;
363
364/* I'd so love to cast pthread_mutex_unlock to void (*)(void *)... */
365static void
366mutex_unlock_wrapper (void *arg)
367{
368 pthread_mutex_unlock ((pthread_mutex_t *)arg);
369}
370
371static void *
372coro_init (void *args_)
373{
374 struct coro_init_args *args = (struct coro_init_args *)args_;
375 coro_func func = args->func;
376 void *arg = args->arg;
377
378 pthread_mutex_lock (&coro_mutex);
379
380 /* we try to be good citizens and use deferred cancellation and cleanup handlers */
381 pthread_cleanup_push (mutex_unlock_wrapper, &coro_mutex);
382 coro_transfer (args->self, args->main);
383 func (arg);
384 pthread_cleanup_pop (1);
385
386 return 0;
387}
388
389void
390coro_transfer (coro_context *prev, coro_context *next)
391{
392 pthread_cond_signal (&next->cv);
393 pthread_cond_wait (&prev->cv, &coro_mutex);
394#if __FreeBSD__ /* freebsd is of course broken and needs manual testcancel calls... yay... */
395 pthread_testcancel ();
396#endif
397}
398
399void
400coro_create (coro_context *ctx, coro_func coro, void *arg, void *sptr, long ssize)
401{
402 static coro_context nctx;
403 static int once;
404
405 if (!once)
406 {
407 once = 1;
408
409 pthread_mutex_lock (&coro_mutex);
410 pthread_cond_init (&nctx.cv, 0);
411 null_tid = pthread_self ();
412 }
413
414 pthread_cond_init (&ctx->cv, 0);
415
416 if (coro)
417 {
418 pthread_attr_t attr;
419 struct coro_init_args args;
420
421 args.func = coro;
422 args.arg = arg;
423 args.self = ctx;
424 args.main = &nctx;
425
426 pthread_attr_init (&attr);
427#if __UCLIBC__
428 /* exists, but is borked */
429 /*pthread_attr_setstacksize (&attr, (size_t)ssize);*/
261#else 430#else
262#error "microsoft libc or architecture not supported" 431 pthread_attr_setstack (&attr, sptr, (size_t)ssize);
263#endif 432#endif
433 pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS);
434 pthread_create (&ctx->id, &attr, coro_init, &args);
264 435
265# elif CORO_LINUX 436 coro_transfer (args.main, args.self);
437 }
438 else
439 ctx->id = null_tid;
440}
266 441
267 _setjmp (ctx->env); 442void
268#if __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 0 && defined (JB_PC) && defined (JB_SP) 443coro_destroy (coro_context *ctx)
269 ctx->env[0].__jmpbuf[JB_PC] = (long)coro_init; 444{
270 ctx->env[0].__jmpbuf[JB_SP] = (long)STACK_ADJUST_PTR (sptr, ssize); 445 if (!pthread_equal (ctx->id, null_tid))
271#elif __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 0 && defined (__mc68000__) 446 {
272 ctx->env[0].__jmpbuf[0].__aregs[0] = (long int)coro_init; 447 pthread_cancel (ctx->id);
273 ctx->env[0].__jmpbuf[0].__sp = (int *)((char *)sptr + ssize); 448 pthread_mutex_unlock (&coro_mutex);
274#elif defined (__GNU_LIBRARY__) && defined (__i386__) 449 pthread_join (ctx->id, 0);
275 ctx->env[0].__jmpbuf[0].__pc = (char *)coro_init; 450 pthread_mutex_lock (&coro_mutex);
276 ctx->env[0].__jmpbuf[0].__sp = (void *)((char *)sptr + ssize); 451 }
277#elif defined (__GNU_LIBRARY__) && defined (__amd64__) 452
278 ctx->env[0].__jmpbuf[JB_PC] = (long)coro_init; 453 pthread_cond_destroy (&ctx->cv);
279 ctx->env[0].__jmpbuf[JB_RSP] = (long)STACK_ADJUST_PTR (sptr, ssize); 454}
455
280#else 456#else
281# error "linux libc or architecture not supported" 457# error unsupported backend
282#endif 458#endif
283 459
284# elif CORO_IRIX
285
286 setjmp (ctx->env);
287 ctx->env[JB_PC] = (__uint64_t)coro_init;
288 ctx->env[JB_SP] = (__uint64_t)STACK_ADJUST_PTR (sptr, ssize);
289
290# elif CORO_ASM
291
292 ctx->sp = (volatile void **)(ssize + (char *)sptr);
293 *--ctx->sp = (void *)coro_init;
294 *--ctx->sp = (void *)coro_init; // this is needed when the prologue saves ebp
295 ctx->sp -= NUM_CLOBBERED;
296
297# endif
298
299 coro_transfer ((coro_context *)create_coro, (coro_context *)new_coro);
300
301#else
302# error unsupported architecture
303#endif
304}
305

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines