ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/include/cfperl.h
(Generate patch)

Comparing deliantra/server/include/cfperl.h (file contents):
Revision 1.75 by root, Sun Jun 3 11:22:02 2007 UTC vs.
Revision 1.123 by root, Sat Jun 26 22:10:18 2010 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 5 *
8 * Crossfire TRT is free software; you can redistribute it and/or modify it 6 * Deliantra is free software: you can redistribute it and/or modify it under
9 * under the terms of the GNU General Public License as published by the Free 7 * the terms of the Affero GNU General Public License as published by the
10 * Software Foundation; either version 2 of the License, or (at your option) 8 * Free Software Foundation, either version 3 of the License, or (at your
11 * any later version. 9 * option) any later version.
12 * 10 *
13 * This program is distributed in the hope that it will be useful, but 11 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * for more details. 14 * GNU General Public License for more details.
17 * 15 *
18 * You should have received a copy of the GNU General Public License along 16 * You should have received a copy of the Affero GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 17 * and the GNU General Public License along with this program. If not, see
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 18 * <http://www.gnu.org/licenses/>.
21 * 19 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 20 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 21 */
24 22
25// 23//
26// cfperl.h perl interface 24// cfperl.h perl interface
27// 25//
28#ifndef CFPERL_H__ 26#ifndef CFPERL_H__
29#define CFPERL_H__ 27#define CFPERL_H__
30 28
31#include <cstdarg>
32#include <cstdio>
33#include <bitset>
34
35using namespace std; 29using namespace std;
36 30
37#include <EXTERN.h> 31#include <EXTERN.h>
38#include <perl.h> 32#include <perl.h>
39#include <XSUB.h> 33#include <XSUB.h>
40 34
41#include <EventAPI.h> 35#include <EVAPI.h>
42#include <CoroAPI.h> 36#include <CoroAPI.h>
43 37
44#include "util.h" 38#include "util.h"
45#include "keyword.h" 39#include "keyword.h"
46#include "dynbuf.h" 40#include "dynbuf.h"
… …
51// optimisations/workaround for functions requiring my_perl in scope (anti-bloat) 45// optimisations/workaround for functions requiring my_perl in scope (anti-bloat)
52#undef localtime 46#undef localtime
53#undef srand48 47#undef srand48
54#undef drand48 48#undef drand48
55#undef srandom 49#undef srandom
50#undef opendir
56#undef readdir 51#undef readdir
52#undef closedir
57#undef getprotobyname 53#undef getprotobyname
58#undef gethostbyname 54#undef gethostbyname
59#undef ctime 55#undef ctime
60#undef strerror 56#undef strerror
57#undef _
61 58
62// same here, massive symbol spamming 59// same here, massive symbol spamming
63#undef do_open 60#undef do_open
64#undef do_close 61#undef do_close
65#undef ref 62#undef ref
… …
70#undef random 67#undef random
71#undef crypt 68#undef crypt
72 69
73////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 70//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
74 71
72#define _(msg) (msg)
73#define N_(msg) (msg)
74
75//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
76
75// some macros to simplify perl in-calls 77// some macros to simplify perl in-calls
76 78
77#define CHECK_ERROR \ 79#define CHECK_ERROR \
78 if (SvTRUE (ERRSV)) \ 80 if (SvTRUE (ERRSV)) \
79 LOG (llevError, "runtime error in %s: %s\n", __func__, SvPVutf8_nolen (ERRSV)); 81 LOG (llevError, "runtime error in %s: %s", __func__, SvPVutf8_nolen (ERRSV));
80 82
83inline int call_pvsv (const char *ob, I32 flags) { return call_pv (ob, flags); }
84inline int call_pvsv (SV *ob, I32 flags) { return call_sv (ob, flags); }
85
86// TODO: temporarily enabled pushstack/popstack for all calls from the core, to maybe fix object memleak?
87#define CALL_PUSH PUSHSTACKi (PERLSI_UNKNOWN)
88#define CALL_POP PUTBACK; POPSTACK; SPAGAIN
81#define CALL_BEGIN(args) dSP; ENTER; SAVETMPS; PUSHMARK (SP); EXTEND (SP, args) 89#define CALL_BEGIN(args) dSP; CALL_PUSH; ENTER; SAVETMPS; PUSHMARK (SP); EXTEND (SP, args)
82#define CALL_ARG_SV(sv) PUSHs (sv_2mortal (sv)) // separate because no refcount inc 90#define CALL_ARG_SV(sv) PUSHs (sv_2mortal (sv)) // separate because no refcount inc
83#define CALL_ARG(expr) PUSHs (sv_2mortal (to_sv (expr))) 91#define CALL_ARG(expr) PUSHs (sv_2mortal (to_sv (expr)))
84#define CALL_CALL(name, flags) PUTBACK; int count = call_pv (name, (flags) | G_EVAL); SPAGAIN; 92#define CALL_CALL(name, flags) PUTBACK; int count = call_pvsv (name, (flags) | G_EVAL); SPAGAIN;
85#define CALL_END CHECK_ERROR; FREETMPS; LEAVE 93#define CALL_END PUTBACK; CHECK_ERROR; FREETMPS; LEAVE; CALL_POP
86 94
87////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 95//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
88 96
89void cfperl_init (); 97void cfperl_init ();
90void cfperl_main (); 98void cfperl_main ();
99void cfperl_tick ();
91void cfperl_emergency_save (); 100void cfperl_emergency_save ();
92void cfperl_cleanup (int make_core); 101void cfperl_cleanup (int make_core);
93void cfperl_make_book (object *book, int level); 102void cfperl_make_book (object *book, int level);
103void cfperl_send_msg (client *ns, int color, const_utf8_string type, const_utf8_string msg);
104int cfperl_can_merge (object *ob1, object *ob2);
105void cfperl_mapscript_activate (object *ob, int state, object *activator, object *originator = 0);
94 106
95////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 107bool is_match_expr (const_utf8_string expr);
108// applies the match expression and returns true if it matches
109bool match (const_utf8_string expr, object *ob, object *self = 0, object *source = 0, object *originator = 0);
110// same as above, but returns the first object found, or 0
111object *match_one (const_utf8_string expr, object *ob, object *self = 0, object *source = 0, object *originator = 0);
96 112
113//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
114
115#if IVSIZE >= 8
116 typedef IV val64;
117 typedef IV uval64;
118# define newSVval64 newSViv
119# define SvVAL64 SvIV
120# define newSVuval64 newSVuv
121# define SvUVAL64 SvUV
122#else
123 typedef double val64;
124 typedef double uval64;
125# define newSVval64 newSVnv
126# define SvVAL64 SvNV
127# define newSVuval64 newSVnv
128# define SvUVAL64 SvNV
129#endif
130
97// virtual server time, excluding time jumps and lag 131extern tstamp runtime; // virtual server time, excluding time jumps and lag
98extern double runtime; 132extern tstamp NOW; // real time of current server tick
133
134noinline utf8_string cfSvPVutf8_nolen (SV *sv);
99 135
100enum event_klass 136enum event_klass
101{ 137{
102 KLASS_NONE, 138 KLASS_NONE,
103 KLASS_GLOBAL, 139 KLASS_GLOBAL,
… …
153int cfperl_result_INT (int idx); 189int cfperl_result_INT (int idx);
154 190
155////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 191//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
156 192
157INTERFACE_CLASS (attachable) 193INTERFACE_CLASS (attachable)
158struct attachable 194struct attachable : refcnt_base
159{ 195{
160 static MGVTBL vtbl; 196 static MGVTBL vtbl;
161
162 static unordered_vector<attachable *> mortals;
163 MTH static void check_mortals ();
164 197
165 enum { 198 enum {
166 F_DESTROYED = 0x01, 199 F_DESTROYED = 0x01,
167 F_DEBUG_TRACE = 0x02, 200 F_DEBUG_TRACE = 0x02,
168 }; 201 };
202 uint8 ACC (RW, attachable_flags);
203
204 static unordered_vector<attachable *> mortals;
205 MTH static void check_mortals ();
169 206
170 // object is delete'd after the refcount reaches 0 207 // object is delete'd after the refcount reaches 0
171 int ACC (RW, flags);
172 mutable int ACC (RW, refcnt);
173
174 MTH void refcnt_inc () const { ++refcnt; }
175 MTH void refcnt_dec () const { --refcnt; }
176
177 MTH int refcnt_cnt () const; 208 MTH int refcnt_cnt () const;
178 // check wether the object has died and destroy 209 // check wether the object has died and destroy
179 MTH void refcnt_chk () { if (expect_false (refcnt <= 0)) do_check (); } 210 MTH void refcnt_chk () { if (expect_false (refcnt <= 0)) do_check (); }
180 211
181 // destroy the object unless it was already destroyed 212 // destroy the object unless it was already destroyed
182 // this politely asks everybody interested the reduce 213 // this politely asks everybody interested the reduce
183 // the refcount to 0 as soon as possible. 214 // the refcount to 0 as soon as possible.
184 MTH void destroy (); 215 MTH void destroy ();
185 216
186 // return wether an object was destroyed already 217 // return wether an object was destroyed already
187 MTH bool destroyed () const { return flags & F_DESTROYED; } 218 MTH bool destroyed () const { return attachable_flags & F_DESTROYED; }
219
220 // destruct and free the memory for this object
221 virtual void do_delete ();
188 222
189 virtual void gather_callbacks (AV *&callbacks, event_type event) const; 223 virtual void gather_callbacks (AV *&callbacks, event_type event) const;
190 224
191#if 0 225#if 0
192private: 226private:
… …
200 234
201 void sever_self (); // sever this object from its self, if it has one. 235 void sever_self (); // sever this object from its self, if it has one.
202 void optimise (); // possibly save some memory by destroying unneeded data 236 void optimise (); // possibly save some memory by destroying unneeded data
203 237
204 attachable () 238 attachable ()
205 : flags (0), refcnt (0), self (0), cb (0), attach (0) 239 : attachable_flags (0), self (0), cb (0), attach (0)
206 { 240 {
207 } 241 }
208 242
209 attachable (const attachable &src) 243 attachable (const attachable &src)
210 : flags (0), refcnt (0), self (0), cb (0), attach (src.attach) 244 : attachable_flags (0), self (0), cb (0), attach (src.attach)
211 { 245 {
212 } 246 }
213 247
214 virtual ~attachable (); 248 // set a custom key to the given value, or delete it if value = 0
249 void set_key (const_utf8_string key, const_utf8_string value = 0, bool is_utf8 = 0);
250
251 void set_key_text (const_utf8_string key, const_utf8_string value = 0)
252 {
253 set_key (key, value, 1);
254 }
255
256 void set_key_data (const_utf8_string key, const_utf8_string value = 0)
257 {
258 set_key (key, value, 0);
259 }
215 260
216 attachable &operator =(const attachable &src); 261 attachable &operator =(const attachable &src);
217 262
218 // used to _quickly_ device wether to shortcut the evaluation 263 // used to _quickly_ decide wether to shortcut the evaluation
219 bool should_invoke (event_type event) 264 bool should_invoke (event_type event)
220 { 265 {
221 return ev_want_event [event] || cb; 266 return ev_want_event [event] || cb;
222 } 267 }
223 268
… …
230 // do the real refcount checking work 275 // do the real refcount checking work
231 void do_check (); 276 void do_check ();
232 277
233 // the method that does the real destroy work 278 // the method that does the real destroy work
234 virtual void do_destroy (); 279 virtual void do_destroy ();
280
281 // destructor is protected, should not be called by anybody
282 virtual ~attachable ();
235}; 283};
236 284
237// the global object is a pseudo object that cares for the global events 285// the global object is a pseudo object that cares for the global events
238struct global : attachable 286struct global : attachable
239{ 287{
… …
242 290
243extern struct global gbl_ev; 291extern struct global gbl_ev;
244 292
245////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 293//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
246 294
247struct object_freezer : dynbuf_text 295#include "freezethaw.h"
248{
249 AV *av;
250
251 object_freezer ();
252 ~object_freezer ();
253
254 void put (attachable *ext);
255
256 // used only for user-defined key-value pairs
257 void put (const shstr &k, const shstr &v)
258 {
259 add (k);
260
261 if (expect_true (v))
262 add (' '), add (v);
263
264 add ('\n');
265 }
266
267 template<typename T>
268 void put_string (keyword k, const T &v)
269 {
270 int klen = keyword_len [k];
271 int vlen = v ? strlen (v) + 1 : 0;
272
273 char *p = (char *)alloc (klen + vlen + 1);
274
275 memcpy (p, keyword_str [k], klen); p += klen;
276
277 if (expect_true (v))
278 {
279 *p++ = ' '; vlen--;
280 memcpy (p, v, vlen); p += vlen;
281 }
282
283 *p = '\n';
284 }
285
286 void put (keyword k, const char *v = 0)
287 {
288 put_string (k, v);
289 }
290
291 void put (keyword k, const shstr &v)
292 {
293 put_string (k, v);
294 }
295
296 void put (keyword k, double v)
297 {
298 force (MAX_KEYWORD_LEN + 2 + 32);
299 fadd (keyword_str [k], keyword_len [k]);
300 fadd (' ');
301 falloc (sprintf (ptr, "%.7g", v));
302 fadd ('\n');
303 }
304
305 void put_(keyword k, sint64 v)
306 {
307 force (MAX_KEYWORD_LEN + 2 + sint64_digits);
308 fadd (keyword_str [k], keyword_len [k]);
309 fadd (' ');
310 add (v);
311 fadd ('\n');
312 }
313
314 void put_(keyword k, sint32 v)
315 {
316 force (MAX_KEYWORD_LEN + 2 + sint32_digits);
317 fadd (keyword_str [k], keyword_len [k]);
318 fadd (' ');
319 add (v);
320 fadd ('\n');
321 }
322
323 void put (keyword k, float v) { put (k, (double)v); }
324 void put (keyword k, signed char v) { put_(k, (sint32)v); }
325 void put (keyword k, unsigned char v) { put_(k, (sint32)v); }
326 void put (keyword k, signed short v) { put_(k, (sint32)v); }
327 void put (keyword k, unsigned short v) { put_(k, (sint32)v); }
328 void put (keyword k, signed int v) { put_(k, (sint32)v); }
329 void put (keyword k, unsigned int v) { put_(k, (sint64)v); }
330 void put (keyword k, signed long v) { put_(k, (sint64)v); }
331 void put (keyword k, unsigned long v) { put_(k, (sint64)v); }
332 void put (keyword k, signed long long v) { put_(k, (sint64)v); }
333 void put (keyword k, unsigned long long v) { put_(k, (sint64)v); }
334
335 void put (keyword kbeg, keyword kend, const shstr &v)
336 {
337 force (MAX_KEYWORD_LEN + 1);
338 fadd (keyword_str [kbeg], keyword_len [kbeg]); fadd ('\n');
339
340 if (expect_true (v))
341 {
342 add (v);
343 add ('\n');
344 }
345
346 force (MAX_KEYWORD_LEN + 1);
347 fadd (keyword_str [kend], keyword_len [kend]); fadd ('\n');
348 }
349
350 template<typename T>
351 void put (keyword k, const T *v)
352 {
353 if (v)
354 put (k, v->name);
355 else
356 put (k, (const char *)0);
357 }
358
359 template<typename T>
360 void put (keyword k, const refptr<T> &v)
361 {
362 put (k, (T *)v);
363 }
364
365 bool save (const char *path);
366 char *as_string (); // like strdup
367
368 operator bool () { return !!av; }
369};
370
371struct object_thawer
372{
373 char *line; // current beginning of line
374 SV *text; // text part
375 AV *av; // perl part
376 int linenum;
377 keyword kw;
378 char *kw_str; // the keyword parsed, as string
379 char *value; // the value, or 0 if no value
380 char *value_nn; // the value, or the empty string if no value
381 const char *name;
382
383 operator bool () { return !!text; }
384
385 object_thawer (const char *path = 0);
386 object_thawer (const char *data, AV *perlav);
387 ~object_thawer ();
388
389 void get (attachable *obj, int oid);
390
391 // parse next line
392 void next ();
393 // skip the current key-value (usually fetch next line, for
394 // multiline-fields, skips till the corresponding end-kw
395 void skip ();
396
397 char *get_str () { return value; } // may be 0
398 void get_ml (keyword kend, shstr &sh);
399
400 void get_ornull (shstr &sh) const { sh = value; }
401 void get (shstr &sh) const { sh = value; } // might want to check for non-null here
402
403 bool get_bool () const { return *value_nn == '1'; }
404 sint32 get_sint32 () const;
405 sint64 get_sint64 () const { return strtoll (value_nn, 0, 10); }
406 double get_double () const { return strtod (value_nn, 0); }
407
408 void get (float &v) { v = get_double (); }
409 void get (double &v) { v = get_double (); }
410
411 void get (bool &i) { i = get_bool (); }
412 void get (sint8 &i) { i = get_sint32 (); }
413 void get (uint8 &i) { i = get_sint32 (); }
414 void get (sint16 &i) { i = get_sint32 (); }
415 void get (uint16 &i) { i = get_sint32 (); }
416 void get (sint32 &i) { i = get_sint32 (); }
417
418 void get (uint32 &i) { i = get_sint64 (); }
419 void get (sint64 &i) { i = get_sint64 (); }
420
421 bool parse_error (const char *type = 0, const char *name = 0, bool skip = true);
422};
423
424//TODO: remove
425char *fgets (char *s, int n, object_thawer &thawer);
426 296
427////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 297//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
428 298
429struct coroapi { 299struct coroapi {
430 static struct CoroAPI *GCoroAPI; 300 static struct CoroAPI *GCoroAPI;
431 301
302 static EV_ATOMIC_T cede_pending;
303
432 static int nready () { return CORO_NREADY; } 304 static int nready () { return CORO_NREADY; }
433 static int cede () { return CORO_CEDE ; } 305 static int cede () { cede_pending = 0; return CORO_CEDE ; }
434 306
435 static double (*time)();
436 static double next_cede;
437 static int cede_counter;
438
439 static void do_cede_every ();
440 static void do_cede_to_tick (); 307 static void do_cede_to_tick ();
441 static void do_cede_to_tick_every ();
442 308
443 static void cede_every (int count) 309 // actually cede's far more often
444 {
445 if (expect_false (++cede_counter >= count))
446 do_cede_every ();
447 }
448
449 static void cede_to_tick () 310 static bool cede_to_tick ()
450 { 311 {
451 if (expect_false (time () >= next_cede)) 312 if (expect_true (!cede_pending))
313 return false;
314
452 do_cede_to_tick (); 315 do_cede_to_tick ();
453 } 316 return true;
454
455 static void cede_to_tick_every (int count)
456 {
457 if (expect_false (++cede_counter >= count))
458 cede_to_tick ();
459 } 317 }
460 318
461 static void wait_for_tick (); 319 static void wait_for_tick ();
462 static void wait_for_tick_begin (); 320 static void wait_for_tick_begin ();
463}; 321};
464 322
465struct watcher_base 323struct evapi
466{ 324{
467 static struct EventAPI *GEventAPI; 325 static struct EVAPI *GEVAPI;
468}; 326};
469 327
470template<class base>
471struct watcher : watcher_base
472{
473 base *pe;
474
475 void start (bool repeat = false) { GEventAPI->start ((pe_watcher *)pe, repeat); }
476 void stop (bool cancel_events = false) { GEventAPI->stop ((pe_watcher *)pe, cancel_events); }
477 void now () { GEventAPI->now ((pe_watcher *)pe); }
478 void suspend () { GEventAPI->suspend ((pe_watcher *)pe); }
479 void resume () { GEventAPI->resume ((pe_watcher *)pe); }
480
481 void prio (int new_prio) { ((pe_watcher *)pe)->prio = new_prio; }
482
483 ~watcher ()
484 {
485 cancel ();
486 }
487
488private:
489 void cancel () { GEventAPI->cancel ((pe_watcher *)pe); } // private
490};
491
492struct iw : watcher<pe_idle>, callback<void (iw &)>
493{
494 template<class O, class M>
495 iw (O object, M method)
496 : callback<void (iw &)> (object, method)
497 {
498 alloc ();
499 }
500
501private:
502 void alloc ();
503};
504
505struct iow : watcher<pe_io>, callback<void (iow &, int)> 328struct iow : ev_io, evapi, callback<void (iow &, int)>
506{ 329{
330 static void thunk (EV_P_ struct ev_io *w_, int revents)
331 {
332 iow &w = *static_cast<iow *>(w_);
333
334 w (w, revents);
335 }
336
507 template<class O, class M> 337 template<class O, class M>
508 iow (O object, M method) 338 iow (O object, M method)
509 : callback<void (iow &, int)> (object, method) 339 : callback<void (iow &, int)> (object, method)
510 { 340 {
511 alloc (); 341 ev_init ((ev_io *)this, thunk);
512 } 342 }
513 343
514 void fd (int fd); 344 void prio (int prio)
515 int poll (); 345 {
346 ev_set_priority ((ev_io *)this, prio);
347 }
348
349 void set (int fd, int events)
350 {
351 ev_io_set ((ev_io *)this, fd, events);
352 }
353
354 int poll () const { return events; }
355
516 void poll (int events); 356 void poll (int events);
517 357
518private: 358 void start ()
519 void alloc (); 359 {
360 ev_io_start (EV_DEFAULT, (ev_io *)this);
361 }
362
363 void stop ()
364 {
365 ev_io_stop (EV_DEFAULT, (ev_io *)this);
366 }
367
368 ~iow ()
369 {
370 stop ();
371 }
372};
373
374struct asyncw : ev_async, evapi, callback<void (ev_async &, int)>
375{
376 static void thunk (EV_P_ struct ev_async *w_, int revents)
377 {
378 asyncw &w = *static_cast<asyncw *>(w_);
379
380 w (w, revents);
381 }
382
383 template<class O, class M>
384 asyncw (O object, M method)
385 : callback<void (asyncw &, int)> (object, method)
386 {
387 ev_init ((ev_async *)this, thunk);
388 }
389
390 void start ()
391 {
392 ev_async_start (EV_DEFAULT, (ev_async *)this);
393 }
394
395 void stop ()
396 {
397 ev_async_stop (EV_DEFAULT, (ev_async *)this);
398 }
399
400 ~asyncw ()
401 {
402 stop ();
403 }
520}; 404};
521 405
522#endif 406#endif
523 407

Diff Legend

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