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.6 by root, Sat Aug 26 08:44:06 2006 UTC vs.
Revision 1.109 by root, Tue Nov 3 23:44:20 2009 UTC

1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 *
4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 *
6 * Deliantra is free software: you can redistribute it and/or modify it under
7 * the terms of the Affero GNU General Public License as published by the
8 * Free Software Foundation, either version 3 of the License, or (at your
9 * option) any later version.
10 *
11 * This program is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * GNU General Public License for more details.
15 *
16 * You should have received a copy of the Affero GNU General Public License
17 * and the GNU General Public License along with this program. If not, see
18 * <http://www.gnu.org/licenses/>.
19 *
20 * The authors can be reached via e-mail to <support@deliantra.net>
21 */
22
1// 23//
2// cfperl.h perl interface 24// cfperl.h perl interface
3// 25//
4#ifndef CFPERL_H__ 26#ifndef CFPERL_H__
5#define CFPERL_H__ 27#define CFPERL_H__
6 28
7struct pl; 29#include <cstdarg>
8struct object; 30#include <cstdio>
9struct mapstruct; 31#include <bitset>
10 32
11// could have used templates, but a more traditional C api 33using namespace std;
12// uses more explicit typing which is ok for this purpose.
13enum data_type
14{
15 DT_END, // no further arguments
16 DT_INT,
17 DT_INT64,
18 DT_DOUBLE,
19 DT_STRING, // 0-terminated string
20 DT_DATA, // string + length
21 DT_OBJECT,
22 DT_MAP,
23 DT_PLAYER,
24 DT_ARCH,
25 DT_PARTY,
26 DT_REGION,
27 34
28 // following are only for cfapi-compatibility 35#include <EXTERN.h>
29 DT_INT_PTR, 36#include <perl.h>
30 DT_INT64_PTR, 37#include <XSUB.h>
31 DT_DOUBLE_PTR, 38
32}; 39#include <EVAPI.h>
40#include <CoroAPI.h>
41
42#include "util.h"
43#include "keyword.h"
44#include "dynbuf.h"
45#include "callback.h"
46
47//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
48
49// optimisations/workaround for functions requiring my_perl in scope (anti-bloat)
50#undef localtime
51#undef srand48
52#undef drand48
53#undef srandom
54#undef opendir
55#undef readdir
56#undef closedir
57#undef getprotobyname
58#undef gethostbyname
59#undef ctime
60#undef strerror
61#undef _
62
63// same here, massive symbol spamming
64#undef do_open
65#undef do_close
66#undef ref
67#undef seed
68
69// perl bug #40256: perl does overwrite those with reentrant versions
70// but does not initialise their state structures.
71#undef random
72#undef crypt
73
74//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
75
76#define _(msg) (msg)
77#define N_(msg) (msg)
78
79//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
80
81// some macros to simplify perl in-calls
82
83#define CHECK_ERROR \
84 if (SvTRUE (ERRSV)) \
85 LOG (llevError, "runtime error in %s: %s", __func__, SvPVutf8_nolen (ERRSV));
86
87inline int call_pvsv (const char *ob, I32 flags) { return call_pv (ob, flags); }
88inline int call_pvsv (SV *ob, I32 flags) { return call_sv (ob, flags); }
89
90#define CALL_BEGIN(args) dSP; ENTER; SAVETMPS; PUSHMARK (SP); EXTEND (SP, args)
91#define CALL_ARG_SV(sv) PUSHs (sv_2mortal (sv)) // separate because no refcount inc
92#define CALL_ARG(expr) PUSHs (sv_2mortal (to_sv (expr)))
93#define CALL_CALL(name, flags) PUTBACK; int count = call_pvsv (name, (flags) | G_EVAL); SPAGAIN;
94#define CALL_END PUTBACK; CHECK_ERROR; FREETMPS; LEAVE
95
96//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
97
98void cfperl_init ();
99void cfperl_main ();
100void cfperl_tick ();
101void cfperl_emergency_save ();
102void cfperl_cleanup (int make_core);
103void cfperl_make_book (object *book, int level);
104void cfperl_send_msg (client *ns, int color, const char *type, const char *msg);
105int cfperl_can_merge (object *ob1, object *ob2);
106void cfperl_mapscript_activate (object *ob, int state, object *activator, object *originator = 0);
107
108bool is_match_expr (const char *expr);
109/* applies the match expression and returns true if it matches */
110bool match (const char *expr, object *ob, object *self = 0, object *source = 0, object *originator = 0);
111
112//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
113
114#if IVSIZE >= 8
115 typedef IV val64;
116 typedef IV uval64;
117# define newSVval64 newSViv
118# define SvVAL64 SvIV
119# define newSVuval64 newSVuv
120# define SvUVAL64 SvUV
121#else
122 typedef double val64;
123 typedef double uval64;
124# define newSVval64 newSVnv
125# define SvVAL64 SvNV
126# define newSVuval64 newSVnv
127# define SvUVAL64 SvNV
128#endif
129
130extern tstamp runtime; // virtual server time, excluding time jumps and lag
131extern tstamp NOW; // real time of current server tick
33 132
34enum event_klass 133enum event_klass
35{ 134{
135 KLASS_NONE,
36 KLASS_GLOBAL, 136 KLASS_GLOBAL,
137 KLASS_ATTACHABLE,
138 KLASS_CLIENT,
37 KLASS_PLAYER, 139 KLASS_PLAYER,
38 KLASS_OBJECT, 140 KLASS_OBJECT,
39 KLASS_MAP, 141 KLASS_MAP,
142 KLASS_COMMAND,
40}; 143};
41 144
42enum event_type 145enum event_type
43{ 146{
44# define def(klass,name) EV_ ## klass ## _ ## name, 147# define def(klass,name) EVENT_ ## klass ## _ ## name,
45# include "eventinc.h" 148# include "eventinc.h"
46# undef def 149# undef def
47 NUM_EVENT_TYPES 150 NUM_EVENT_TYPES
48}; 151};
49 152
153// in which global events or per-type events are we interested
154extern bitset<NUM_EVENT_TYPES> ev_want_event;
155extern bitset<NUM_TYPES> ev_want_type;
156
157#define ARG_AV(o) DT_AV , static_cast<AV *> (o)
50#define ARG_INT(v) DT_INT , static_cast<int> (v) 158#define ARG_INT(v) DT_INT , static_cast<int> (v)
51#define ARG_INT64(v) DT_INT64 , static_cast<sint64> (v) 159#define ARG_INT64(v) DT_INT64 , static_cast<sint64> (v)
52#define ARG_DOUBLE(v) DT_DOUBLE, static_cast<double> (v) 160#define ARG_DOUBLE(v) DT_DOUBLE, static_cast<double> (v)
53#define ARG_STRING(v) DT_STRING, static_cast<const char *> (v) 161#define ARG_STRING(v) DT_STRING, static_cast<const char *> (v)
54#define ARG_DATA(s,l) DT_DATA , static_cast<const void *> (s), (l) 162#define ARG_DATA(s,l) DT_DATA , static_cast<const void *> (s), int (l)
55#define ARG_OBJECT(o) DT_OBJECT, (void *)static_cast<struct object *> (o) 163#define ARG_OBJECT(o) DT_OBJECT, (void *)(static_cast<object *> (o))
56#define ARG_MAP(o) DT_MAP , (void *)static_cast<struct mapstruct *> (o) 164#define ARG_MAP(o) DT_MAP , (void *)(static_cast<maptile *> (o))
57#define ARG_PLAYER(o) DT_PLAYER, (void *)static_cast<struct pl *> (o) 165#define ARG_PLAYER(o) DT_PLAYER, (void *)(static_cast<player *> (o))
58#define ARG_ARCH(o) DT_ARCH , (void *)static_cast<struct archetype *> (o) 166#define ARG_ARCH(o) DT_ARCH , (void *)(static_cast<archetype *> (o))
167#define ARG_CLIENT(o) DT_CLIENT, (void *)(static_cast<client *> (o))
59#define ARG_PARTY(o) DT_PARTY , (void *)static_cast<struct party *> (o) 168#define ARG_PARTY(o) DT_PARTY , (void *)(static_cast<party *> (o))
60#define ARG_REGION(o) DT_REGION, (void *)static_cast<struct region *> (o) 169#define ARG_REGION(o) DT_REGION, (void *)(static_cast<region *> (o))
61 170
62// the ", ## __VA_ARGS" is, unfortunately, a gnu-cpp extension 171// the ", ## __VA_ARGS" is, unfortunately, a gnu-cpp extension
172#define INVOKE(obj,event, ...) (expect_false ((obj)->should_invoke (event)) ? (obj)->invoke (event, ## __VA_ARGS__, DT_END) : 0)
173#define INVOKE_GLOBAL(event, ...) INVOKE (&gbl_ev, EVENT_ ## GLOBAL ## _ ## event, ## __VA_ARGS__)
174#define INVOKE_ATTACHABLE(event, obj, ...) INVOKE (obj , EVENT_ ## ATTACHABLE ## _ ## event, ## __VA_ARGS__)
175#define INVOKE_OBJECT(event, obj, ...) INVOKE (obj , EVENT_ ## OBJECT ## _ ## event, ## __VA_ARGS__)
176#define INVOKE_CLIENT(event, obj, ...) INVOKE (obj , EVENT_ ## CLIENT ## _ ## event, ## __VA_ARGS__)
177#define INVOKE_PLAYER(event, obj, ...) INVOKE (obj , EVENT_ ## PLAYER ## _ ## event, ## __VA_ARGS__)
178#define INVOKE_MAP(event, obj, ...) INVOKE (obj , EVENT_ ## MAP ## _ ## event, ## __VA_ARGS__)
63 179
64// all these return true when the normal event processing should be skipped (if any) 180//TODO should index into @result
65#define INVOKE(klass, event, ...) cfperl_invoke (EV_ ## klass ## _ ## event, ## __VA_ARGS__, DT_END) 181#define RESULT(idx,type) cfperl_result_ ## type (idx)
182#define RESULT_DOUBLE(idx) RESULT(idx, DOUBLE)
183#define RESULT_INT(idx) RESULT(idx, INT)
66 184
67#define INVOKE_GLOBAL(event, ...) INVOKE (GLOBAL, event, ## __VA_ARGS__) 185double cfperl_result_DOUBLE (int idx);
68#define INVOKE_OBJECT(event, op, ...) INVOKE (OBJECT, event, ARG_OBJECT (op), ## __VA_ARGS__) 186int cfperl_result_INT (int idx);
69#define INVOKE_PLAYER(event, pl, ...) INVOKE (PLAYER, event, ARG_PLAYER (pl), ## __VA_ARGS__)
70#define INVOKE_MAP(event, map, ...) INVOKE (MAP , event, ARG_MAP (map) , ## __VA_ARGS__)
71 187
72struct extendable_base 188//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
73{
74 void *self, *cb; // CF+ perl self and callback
75 const char *attach; // generic extension attachment information
76 189
77 void clear (); // called when free'ing objects 190INTERFACE_CLASS (attachable)
78 void optimise (); // possibly save some memory by destroying unneeded data 191struct attachable : refcnt_base
79 void reattach (data_type type, void *self); // called after swapin
80 void instantiate (data_type type, void *self); // called on first instantiation
81 void clone (data_type type, void *self, void *dest);
82};
83
84// objects extendable from perl (or any other extension) should include or
85// derive using the curiously recurring template pattern, to avoid
86// virtual method calls etc.
87template<class subclass>
88struct extendable : extendable_base
89{ 192{
90 void clear () 193 static MGVTBL vtbl;
91 { 194
92 if (self || cb) 195 enum {
93 extendable_base::clear (); 196 F_DESTROYED = 0x01,
197 F_DEBUG_TRACE = 0x02,
94 } 198 };
95 void instantiate () 199 uint8 ACC (RW, flags);
96 {
97 if (attach)
98 extendable_base::instantiate (
99 static_cast<subclass *>(this)->get_dt (),
100 static_cast<subclass *>(this)
101 );
102 }
103 void reattach ()
104 {
105 if (attach)
106 extendable_base::reattach (
107 static_cast<subclass *>(this)->get_dt (),
108 static_cast<subclass *>(this)
109 );
110 }
111 void clone (subclass *destination)
112 {
113 if (self || cb)
114 extendable_base::clone (
115 static_cast<subclass *>(this)->get_dt (),
116 static_cast<subclass *>(this),
117 destination
118 );
119 }
120};
121 200
122bool cfperl_invoke (event_type event, ...); 201 static unordered_vector<attachable *> mortals;
123void cfperl_free_ob (struct object *op); 202 MTH static void check_mortals ();
124 203
125void cfperl_init (); 204 // object is delete'd after the refcount reaches 0
126void cfperl_main (); 205 MTH int refcnt_cnt () const;
206 // check wether the object has died and destroy
207 MTH void refcnt_chk () { if (expect_false (refcnt <= 0)) do_check (); }
127 208
209 // destroy the object unless it was already destroyed
210 // this politely asks everybody interested the reduce
211 // the refcount to 0 as soon as possible.
212 MTH void destroy ();
213
214 // return wether an object was destroyed already
215 MTH bool destroyed () const { return flags & F_DESTROYED; }
216
217 virtual void gather_callbacks (AV *&callbacks, event_type event) const;
218
219#if 0
220private:
221 static refcounted *rc_first;
222 refcounted *rc_next;
128#endif 223#endif
129 224
225 HV *self; // CF+ perl self
226 AV *cb; // CF+ callbacks
227 shstr attach; // generic extension attachment information
228
229 void sever_self (); // sever this object from its self, if it has one.
230 void optimise (); // possibly save some memory by destroying unneeded data
231
232 attachable ()
233 : flags (0), self (0), cb (0), attach (0)
234 {
235 }
236
237 attachable (const attachable &src)
238 : flags (0), self (0), cb (0), attach (src.attach)
239 {
240 }
241
242 // set a custom key to the given value, or delete it if value = 0
243 void set_key (const char *key, const char *value = 0, bool is_utf8 = 0);
244
245 void set_key_text (const char *key, const char *value = 0)
246 {
247 set_key (key, value, 1);
248 }
249
250 void set_key_data (const char *key, const char *value = 0)
251 {
252 set_key (key, value, 0);
253 }
254
255 attachable &operator =(const attachable &src);
256
257 // used to _quickly_ device wether to shortcut the evaluation
258 bool should_invoke (event_type event)
259 {
260 return ev_want_event [event] || cb;
261 }
262
263 bool invoke (event_type event, ...);
264
265 MTH void instantiate ();
266 void reattach ();
267
268protected:
269 // do the real refcount checking work
270 void do_check ();
271
272 // the method that does the real destroy work
273 virtual void do_destroy ();
274
275 // destructor is protected, should not be called by anybody
276 virtual ~attachable ();
277};
278
279// the global object is a pseudo object that cares for the global events
280struct global : attachable
281{
282 void gather_callbacks (AV *&callbacks, event_type event) const;
283};
284
285extern struct global gbl_ev;
286
287//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
288
289INTERFACE_CLASS(object_freezer)
290struct object_freezer : dynbuf_text
291{
292 AV *av;
293
294 object_freezer ();
295 ~object_freezer ();
296
297 void put (attachable *ext);
298
299 // used only for user-defined key-value pairs
300 void put (shstr_tmp k, shstr_tmp v)
301 {
302 add (k);
303
304 if (expect_true (v))
305 add (' '), add (v);
306
307 add ('\n');
308 }
309
310 template<typename T>
311 void put_kw_string (keyword k, const T &v)
312 {
313 int klen = keyword_len [k];
314 int vlen = v ? strlen (v) + 1 : 0;
315
316 char *p = (char *)alloc (klen + vlen + 1);
317
318 memcpy (p, keyword_str [k], klen); p += klen;
319
320 if (expect_true (v))
321 {
322 *p++ = ' '; vlen--;
323 memcpy (p, v, vlen); p += vlen;
324 }
325
326 *p = '\n';
327 }
328
329 void put (keyword k, const char *v = 0)
330 {
331 put_kw_string (k, v);
332 }
333
334 void put (keyword k, shstr_tmp v)
335 {
336 put_kw_string (k, v);
337 }
338
339 void put (keyword k, double v)
340 {
341 force (MAX_KEYWORD_LEN + 2 + 32);
342 fadd (keyword_str [k], keyword_len [k]);
343 fadd (' ');
344 falloc (sprintf (ptr, "%.7g", v));
345 fadd ('\n');
346 }
347
348 void put_(keyword k, sint64 v)
349 {
350 force (MAX_KEYWORD_LEN + 2 + sint64_digits);
351 fadd (keyword_str [k], keyword_len [k]);
352 fadd (' ');
353 add (v);
354 fadd ('\n');
355 }
356
357 void put_(keyword k, sint32 v)
358 {
359 force (MAX_KEYWORD_LEN + 2 + sint32_digits);
360 fadd (keyword_str [k], keyword_len [k]);
361 fadd (' ');
362 add (v);
363 fadd ('\n');
364 }
365
366 void put (keyword k, float v) { put (k, (double)v); }
367 void put (keyword k, signed char v) { put_(k, (sint32)v); }
368 void put (keyword k, unsigned char v) { put_(k, (sint32)v); }
369 void put (keyword k, signed short v) { put_(k, (sint32)v); }
370 void put (keyword k, unsigned short v) { put_(k, (sint32)v); }
371 void put (keyword k, signed int v) { put_(k, (sint32)v); }
372 void put (keyword k, unsigned int v) { put_(k, (sint64)v); }
373 void put (keyword k, signed long v) { put_(k, (sint64)v); }
374 void put (keyword k, unsigned long v) { put_(k, (sint64)v); }
375 void put (keyword k, signed long long v) { put_(k, (sint64)v); }
376 void put (keyword k, unsigned long long v) { put_(k, (sint64)v); }
377
378 void put (keyword kbeg, keyword kend, shstr_tmp v)
379 {
380 force (MAX_KEYWORD_LEN + 1);
381 fadd (keyword_str [kbeg], keyword_len [kbeg]); fadd ('\n');
382
383 if (expect_true (v))
384 {
385 add (v);
386 add ('\n');
387 }
388
389 force (MAX_KEYWORD_LEN + 1);
390 fadd (keyword_str [kend], keyword_len [kend]); fadd ('\n');
391 }
392
393 void put (keyword k, archetype *v);
394 void put (keyword k, treasurelist *v);
395 void put (keyword k, faceinfo *v);
396
397 template<typename T>
398 void put (keyword k, const refptr<T> &v)
399 {
400 put (k, (T *)v);
401 }
402
403 MTH bool save (const_octet_string path);
404 char *as_string (); // like strdup
405
406 operator bool () { return !!av; }
407};
408
409INTERFACE_CLASS(object_thawer)
410struct object_thawer
411{
412 char *line; // current beginning of line
413 SV *text; // text part
414 AV *av; // perl part
415 int linenum;
416 keyword kw;
417 char *kw_str; // the keyword parsed, as string
418 char *value; // the value, or 0 if no value
419 const char *value_nn; // the value, or the empty string if no value
420 const char *name;
421
422 operator bool () const { return !!text; }
423
424 object_thawer (const char *path = 0);
425 object_thawer (const char *data, AV *perlav);
426 ~object_thawer ();
427
428 void get (attachable *obj, int oid);
429
430 // parse next line
431 MTH void next ();
432 // skip the current key-value (usually fetch next line, for
433 // multiline-fields, skips till the corresponding end-kw
434 MTH void skip ();
435 MTH void skip_block (); // skips till and over KW_end
436
437 char *get_str () { return value; } // may be 0
438 void get_ml (keyword kend, shstr &sh);
439
440 void get_ornull (shstr &sh) const { sh = value; }
441 void get (shstr &sh) const { sh = value; } // might want to check for non-null here
442
443 bool get_bool () const { return *value_nn == '1'; }
444 sint32 get_sint32 () const;
445 sint64 get_sint64 () const { return strtoll (value_nn, 0, 10); }
446 double get_double () const { return strtod (value_nn, 0); }
447
448 void get (float &v) { v = get_double (); }
449 void get (double &v) { v = get_double (); }
450
451 void get (bool &i) { i = get_bool (); }
452 void get (sint8 &i) { i = get_sint32 (); }
453 void get (uint8 &i) { i = get_sint32 (); }
454 void get (sint16 &i) { i = get_sint32 (); }
455 void get (uint16 &i) { i = get_sint32 (); }
456 void get (sint32 &i) { i = get_sint32 (); }
457
458 void get (uint32 &i) { i = get_sint64 (); }
459 void get (sint64 &i) { i = get_sint64 (); }
460
461 MTH void parse_warn (const char *msg);
462 MTH bool parse_error (const char *type = 0, const char *name = 0, bool skip = true);
463
464 struct delayed_ref {
465 attachable *op;
466 object_ptr *ptr;
467 const char *ref;
468 };
469 std::vector<delayed_ref> delrefs;
470
471 void delayed_deref (attachable *op, object_ptr &ptr, const char *ref);
472 MTH void resolve_delayed_derefs (bool deref = true);
473};
474
475//TODO: remove
476char *fgets (char *s, int n, object_thawer &thawer);
477
478//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
479
480struct coroapi {
481 static struct CoroAPI *GCoroAPI;
482
483 static EV_ATOMIC_T cede_pending;
484
485 static int nready () { return CORO_NREADY; }
486 static int cede () { cede_pending = 0; return CORO_CEDE ; }
487
488 static void do_cede_to_tick ();
489
490 // actually cede's far more often
491 static bool cede_to_tick ()
492 {
493 if (expect_true (!cede_pending))
494 return false;
495
496 do_cede_to_tick ();
497 return true;
498 }
499
500 static void wait_for_tick ();
501 static void wait_for_tick_begin ();
502};
503
504struct evapi
505{
506 static struct EVAPI *GEVAPI;
507};
508
509struct iow : ev_io, evapi, callback<void (iow &, int)>
510{
511 static void thunk (EV_P_ struct ev_io *w_, int revents)
512 {
513 iow &w = *static_cast<iow *>(w_);
514
515 w (w, revents);
516 }
517
518 template<class O, class M>
519 iow (O object, M method)
520 : callback<void (iow &, int)> (object, method)
521 {
522 ev_init ((ev_io *)this, thunk);
523 }
524
525 void prio (int prio)
526 {
527 ev_set_priority ((ev_io *)this, prio);
528 }
529
530 void set (int fd, int events)
531 {
532 ev_io_set ((ev_io *)this, fd, events);
533 }
534
535 int poll () const { return events; }
536
537 void poll (int events);
538
539 void start ()
540 {
541 ev_io_start (EV_DEFAULT, (ev_io *)this);
542 }
543
544 void stop ()
545 {
546 ev_io_stop (EV_DEFAULT, (ev_io *)this);
547 }
548
549 ~iow ()
550 {
551 stop ();
552 }
553};
554
555struct asyncw : ev_async, evapi, callback<void (ev_async &, int)>
556{
557 static void thunk (EV_P_ struct ev_async *w_, int revents)
558 {
559 asyncw &w = *static_cast<asyncw *>(w_);
560
561 w (w, revents);
562 }
563
564 template<class O, class M>
565 asyncw (O object, M method)
566 : callback<void (asyncw &, int)> (object, method)
567 {
568 ev_init ((ev_async *)this, thunk);
569 }
570
571 void start ()
572 {
573 ev_async_start (EV_DEFAULT, (ev_async *)this);
574 }
575
576 void stop ()
577 {
578 ev_async_stop (EV_DEFAULT, (ev_async *)this);
579 }
580
581 ~asyncw ()
582 {
583 stop ();
584 }
585};
586
587#endif
588

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines