ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.204 by root, Fri Feb 2 19:59:22 2007 UTC vs.
Revision 1.216 by root, Thu Feb 15 14:30:21 2007 UTC

… …
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
19 19
20use BDB ();
20use Data::Dumper; 21use Data::Dumper;
21use Digest::MD5; 22use Digest::MD5;
22use Fcntl; 23use Fcntl;
23use IO::AIO 2.32 (); 24use IO::AIO 2.32 ();
24use YAML::Syck (); 25use YAML::Syck ();
25use Time::HiRes; 26use Time::HiRes;
27use Compress::LZF;
28
29Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
26 30
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 31use Event; $Event::Eval = 1; # no idea why this is required, but it is
28 32
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 34
… …
45our $LIBDIR = datadir . "/ext"; 49our $LIBDIR = datadir . "/ext";
46 50
47our $TICK = MAX_TIME * 1e-6; 51our $TICK = MAX_TIME * 1e-6;
48our $TICK_WATCHER; 52our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 53our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 54our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
51our $NEXT_TICK; 55our $NEXT_TICK;
52our $NOW; 56our $NOW;
53our $USE_FSYNC; # use fsync to write maps - default off 57our $USE_FSYNC = 1; # use fsync to write maps - default off
58
59our $BDB_POLL_WATCHER;
60our $DB_ENV;
54 61
55our %CFG; 62our %CFG;
56 63
57our $UPTIME; $UPTIME ||= time; 64our $UPTIME; $UPTIME ||= time;
58our $RUNTIME; 65our $RUNTIME;
59 66
60our %PLAYER; # all users 67our %PLAYER; # all users
61our %MAP; # all maps 68our %MAP; # all maps
62our $LINK_MAP; # the special {link} map, which is always available 69our $LINK_MAP; # the special {link} map, which is always available
63our $RANDOM_MAPS = cf::localdir . "/random"; 70our $RANDOM_MAPS = cf::localdir . "/random";
71our $BDB_ENV_DIR = cf::localdir . "/db";
64 72
65our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 73our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
66our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; 74our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
67 75
68# used to convert map paths into valid unix filenames by replacing / by ∕ 76# used to convert map paths into valid unix filenames by replacing / by ∕
… …
81mkdir cf::localdir; 89mkdir cf::localdir;
82mkdir cf::localdir . "/" . cf::playerdir; 90mkdir cf::localdir . "/" . cf::playerdir;
83mkdir cf::localdir . "/" . cf::tmpdir; 91mkdir cf::localdir . "/" . cf::tmpdir;
84mkdir cf::localdir . "/" . cf::uniquedir; 92mkdir cf::localdir . "/" . cf::uniquedir;
85mkdir $RANDOM_MAPS; 93mkdir $RANDOM_MAPS;
94mkdir $BDB_ENV_DIR;
86 95
87our $EMERGENCY_POSITION; 96our $EMERGENCY_POSITION;
88 97
89sub cf::map::normalise; 98sub cf::map::normalise;
90 99
… …
264sub freeze_mainloop { 273sub freeze_mainloop {
265 return unless $TICK_WATCHER->is_active; 274 return unless $TICK_WATCHER->is_active;
266 275
267 my $guard = Coro::guard { 276 my $guard = Coro::guard {
268 $TICK_WATCHER->start; 277 $TICK_WATCHER->start;
269 $WRITE_RUNTIME_WATCHER->start;
270 }; 278 };
271 $WRITE_RUNTIME_WATCHER->stop;
272 $TICK_WATCHER->stop; 279 $TICK_WATCHER->stop;
273 $guard 280 $guard
274} 281}
275 282
276=item cf::async { BLOCK } 283=item cf::async { BLOCK }
… …
778 } 785 }
779 } else { 786 } else {
780 aio_unlink $filename; 787 aio_unlink $filename;
781 aio_unlink "$filename.pst"; 788 aio_unlink "$filename.pst";
782 } 789 }
783
784 #d##TODO# nuke non .map-files if exist
785 if ($filename =~ s/\.map$//) {
786 aio_unlink $filename;
787 aio_unlink "$filename.pst";
788 }
789 } 790 }
790} 791}
791 792
792sub object_freezer_as_string { 793sub object_freezer_as_string {
793 my ($rdata, $objs) = @_; 794 my ($rdata, $objs) = @_;
… …
799 800
800sub object_thawer_load { 801sub object_thawer_load {
801 my ($filename) = @_; 802 my ($filename) = @_;
802 803
803 my ($data, $av); 804 my ($data, $av);
804
805 #d#TODO remove .map if file does not exist
806 aio_stat $filename and $filename =~ s/\.map$//;
807 805
808 (aio_load $filename, $data) >= 0 806 (aio_load $filename, $data) >= 0
809 or return; 807 or return;
810 808
811 unless (aio_stat "$filename.pst") { 809 unless (aio_stat "$filename.pst") {
… …
1298 my ($self) = @_; 1296 my ($self) = @_;
1299 1297
1300 utf8::encode (my $save = $self->save_path); 1298 utf8::encode (my $save = $self->save_path);
1301 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1299 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1302 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1300 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1303
1304 #d#TODO remove .map and also nuke
1305 $save =~ s/\.map// or return;#d#
1306 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1307 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1308} 1301}
1309 1302
1310sub load_header_from($) { 1303sub load_header_from($) {
1311 my ($self, $path) = @_; 1304 my ($self, $path) = @_;
1312 1305
… …
1600 return if $self->players; 1593 return if $self->players;
1601 return if $self->isa ("ext::map_per_player");#d# 1594 return if $self->isa ("ext::map_per_player");#d#
1602 1595
1603 warn "resetting map ", $self->path;#d# 1596 warn "resetting map ", $self->path;#d#
1604 1597
1598 $self->in_memory (cf::MAP_SWAPPED);
1599
1600 # need to save uniques path
1601 unless ($self->{deny_save}) {
1602 my $uniq = $self->uniq_path; utf8::encode $uniq;
1603
1604 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1605 if $uniq;
1606 }
1607
1605 delete $cf::MAP{$self->path}; 1608 delete $cf::MAP{$self->path};
1606 1609
1607 $self->in_memory (cf::MAP_SWAPPED);
1608 $self->clear; 1610 $self->clear;
1609 1611
1610 $_->clear_links_to ($self) for values %cf::MAP; 1612 $_->clear_links_to ($self) for values %cf::MAP;
1611 1613
1612 $self->unlink_save; 1614 $self->unlink_save;
… …
1802 $map->load; 1804 $map->load;
1803 $map->load_diag; 1805 $map->load_diag;
1804 1806
1805 return unless $self->contr->active; 1807 return unless $self->contr->active;
1806 $self->activate_recursive; 1808 $self->activate_recursive;
1809
1810 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1807 $self->enter_map ($map, $x, $y); 1811 $self->enter_map ($map, $x, $y);
1808} 1812}
1809 1813
1810cf::player->attach ( 1814cf::player->attach (
1811 on_logout => sub { 1815 on_logout => sub {
… …
1824 # try to abort aborted map switching on player login :) 1828 # try to abort aborted map switching on player login :)
1825 # should happen only on crashes 1829 # should happen only on crashes
1826 if ($pl->ob->{_link_pos}) { 1830 if ($pl->ob->{_link_pos}) {
1827 $pl->ob->enter_link; 1831 $pl->ob->enter_link;
1828 (async { 1832 (async {
1829 # we need this sleep as the login has a concurrent enter_exit running
1830 # and this sleep increases chances of the player not ending up in scorn
1831 $pl->ob->reply (undef, 1833 $pl->ob->reply (undef,
1832 "There was an internal problem at your last logout, " 1834 "There was an internal problem at your last logout, "
1833 . "the server will try to bring you to your intended destination in a second.", 1835 . "the server will try to bring you to your intended destination in a second.",
1834 cf::NDI_RED); 1836 cf::NDI_RED);
1837 # we need this sleep as the login has a concurrent enter_exit running
1838 # and this sleep increases chances of the player not ending up in scorn
1835 Coro::Timer::sleep 1; 1839 Coro::Timer::sleep 1;
1836 $pl->ob->leave_link; 1840 $pl->ob->leave_link;
1837 })->prio (2); 1841 })->prio (2);
1838 } 1842 }
1839 }, 1843 },
… …
2176The parameter C<$family> should best start with the name of the extension 2180The parameter C<$family> should best start with the name of the extension
2177using it, it should be unique. 2181using it, it should be unique.
2178 2182
2179=over 4 2183=over 4
2180 2184
2181=item $hashref = cf::db_get $family
2182
2183Return a hashref for use by the extension C<$family>, which can be
2184modified. After modifications, you have to call C<cf::db_dirty> or
2185C<cf::db_sync>.
2186
2187=item $value = cf::db_get $family => $key 2185=item $value = cf::db_get $family => $key
2188 2186
2189Returns a single value from the database 2187Returns a single value from the database.
2190
2191=item cf::db_put $family => $hashref
2192
2193Stores the given family hashref into the database. Updates are delayed, if
2194you want the data to be synced to disk immediately, use C<cf::db_sync>.
2195 2188
2196=item cf::db_put $family => $key => $value 2189=item cf::db_put $family => $key => $value
2197 2190
2198Stores the given C<$value> in the family hash. Updates are delayed, if you 2191Stores the given C<$value> in the family.
2199want the data to be synced to disk immediately, use C<cf::db_sync>.
2200
2201=item cf::db_dirty
2202
2203Marks the database as dirty, to be updated at a later time.
2204
2205=item cf::db_sync
2206
2207Immediately write the database to disk I<if it is dirty>.
2208 2192
2209=cut 2193=cut
2210 2194
2211our $DB; 2195our $DB;
2212 2196
2213{ 2197sub db_init {
2198 unless ($DB) {
2199 $DB = BDB::db_create $DB_ENV;
2200
2201 cf::sync_job {
2202 eval {
2203 $DB->set_flags (BDB::CHKSUM);
2204
2205 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2206 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2207 cf::cleanup "db_open(db): $!" if $!;
2208 };
2209 cf::cleanup "db_open(db): $@" if $@;
2210 };
2211
2214 my $path = cf::localdir . "/database.pst"; 2212 my $path = cf::localdir . "/database.pst";
2213 if (stat $path) {
2214 cf::sync_job {
2215 my $pst = Storable::retrieve $path;
2215 2216
2216 sub db_load() { 2217 cf::db_put (board => data => $pst->{board});
2217 $DB = stat $path ? Storable::retrieve $path : { }; 2218 cf::db_put (guildrules => data => $pst->{guildrules});
2218 } 2219 cf::db_put (rent => balance => $pst->{rent}{balance});
2220 BDB::db_env_txn_checkpoint $DB_ENV;
2219 2221
2220 my $pid; 2222 unlink $path;
2221
2222 sub db_save() {
2223 waitpid $pid, 0 if $pid;
2224 if (0 == ($pid = fork)) {
2225 $DB->{_meta}{version} = 1;
2226 Storable::nstore $DB, "$path~";
2227 rename "$path~", $path;
2228 cf::_exit 0 if defined $pid;
2229 } 2223 };
2230 }
2231
2232 my $dirty;
2233
2234 sub db_sync() {
2235 db_save if $dirty;
2236 undef $dirty;
2237 }
2238
2239 my $idle = Event->idle (
2240 reentrant => 0,
2241 min => 10,
2242 max => 20,
2243 repeat => 0,
2244 data => WF_AUTOCANCEL,
2245 cb => \&db_sync,
2246 );
2247
2248 sub db_dirty() {
2249 $dirty = 1;
2250 $idle->start;
2251 }
2252
2253 sub db_get($;$) {
2254 @_ >= 2
2255 ? $DB->{$_[0]}{$_[1]}
2256 : ($DB->{$_[0]} ||= { })
2257 }
2258
2259 sub db_put($$;$) {
2260 if (@_ >= 3) {
2261 $DB->{$_[0]}{$_[1]} = $_[2];
2262 } else {
2263 $DB->{$_[0]} = $_[1];
2264 }
2265 db_dirty;
2266 }
2267
2268 cf::global->attach (
2269 prio => 10000,
2270 on_cleanup => sub {
2271 db_sync;
2272 }, 2224 }
2273 ); 2225 }
2226}
2227
2228sub db_get($$) {
2229 my $key = "$_[0]/$_[1]";
2230
2231 cf::sync_job {
2232 BDB::db_get $DB, undef, $key, my $data;
2233
2234 $! ? ()
2235 : Compress::LZF::sthaw $data
2236 }
2237}
2238
2239sub db_put($$$) {
2240 BDB::dbreq_pri 4;
2241 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2274} 2242}
2275 2243
2276############################################################################# 2244#############################################################################
2277# the server's init and main functions 2245# the server's init and main functions
2278 2246
… …
2314 Event::one_event; 2282 Event::one_event;
2315 })->prio (Coro::PRIO_MAX); 2283 })->prio (Coro::PRIO_MAX);
2316 }; 2284 };
2317 2285
2318 cfg_load; 2286 cfg_load;
2319 db_load; 2287 db_init;
2320 load_extensions; 2288 load_extensions;
2321 2289
2322 $TICK_WATCHER->start; 2290 $TICK_WATCHER->start;
2323 Event::loop; 2291 Event::loop;
2324} 2292}
… …
2363 my $map = $cf::MAP{$path} or next; 2331 my $map = $cf::MAP{$path} or next;
2364 $map->valid or next; 2332 $map->valid or next;
2365 $map->save; 2333 $map->save;
2366 } 2334 }
2367 warn "end emergency map save\n"; 2335 warn "end emergency map save\n";
2336
2337 warn "begin emergency database checkpoint\n";
2338 BDB::db_env_txn_checkpoint $DB_ENV;
2339 warn "end emergency database checkpoint\n";
2368 }; 2340 };
2369 2341
2370 warn "leave emergency perl save\n"; 2342 warn "leave emergency perl save\n";
2343}
2344
2345sub post_cleanup {
2346 my ($make_core) = @_;
2347
2348 warn Carp::longmess "post_cleanup backtrace"
2349 if $make_core;
2371} 2350}
2372 2351
2373sub reload() { 2352sub reload() {
2374 # can/must only be called in main 2353 # can/must only be called in main
2375 if ($Coro::current != $Coro::main) { 2354 if ($Coro::current != $Coro::main) {
… …
2377 return; 2356 return;
2378 } 2357 }
2379 2358
2380 warn "reloading..."; 2359 warn "reloading...";
2381 2360
2382 warn "cancelling server ticker"; 2361 warn "entering sync_job";
2383 $TICK_WATCHER->cancel;
2384 2362
2363 cf::sync_job {
2364 cf::write_runtime; # external watchdog should not bark
2385 cf::emergency_save; 2365 cf::emergency_save;
2366 cf::write_runtime; # external watchdog should not bark
2386 2367
2387 eval { 2368 warn "syncing database to disk";
2369 BDB::db_env_txn_checkpoint $DB_ENV;
2370
2388 # if anything goes wrong in here, we should simply crash as we already saved 2371 # if anything goes wrong in here, we should simply crash as we already saved
2389
2390 warn "syncing database to disk";
2391 cf::db_sync;
2392 2372
2393 warn "cancelling all WF_AUTOCANCEL watchers"; 2373 warn "cancelling all WF_AUTOCANCEL watchers";
2394 for (Event::all_watchers) { 2374 for (Event::all_watchers) {
2395 $_->cancel if $_->data & WF_AUTOCANCEL; 2375 $_->cancel if $_->data & WF_AUTOCANCEL;
2396 } 2376 }
2397 2377
2398 warn "flushing outstanding aio requests"; 2378 warn "flushing outstanding aio requests";
2399 for (;;) { 2379 for (;;) {
2380 BDB::flush;
2400 IO::AIO::flush; 2381 IO::AIO::flush;
2401 Coro::cede; 2382 Coro::cede;
2402 last unless IO::AIO::nreqs; 2383 last unless IO::AIO::nreqs || BDB::nreqs;
2403 warn "iterate..."; 2384 warn "iterate...";
2404 } 2385 }
2405 2386
2406 warn "cancelling all extension coros"; 2387 warn "cancelling all extension coros";
2407 $_->cancel for values %EXT_CORO; 2388 $_->cancel for values %EXT_CORO;
… …
2462 require cf; 2443 require cf;
2463 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2444 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2464 2445
2465 warn "loading config and database again"; 2446 warn "loading config and database again";
2466 cf::cfg_load; 2447 cf::cfg_load;
2467 cf::db_load;
2468 2448
2469 warn "loading extensions"; 2449 warn "loading extensions";
2470 cf::load_extensions; 2450 cf::load_extensions;
2471 2451
2472 warn "reattaching attachments to objects/players"; 2452 warn "reattaching attachments to objects/players";
… …
2475 reattach $_ for values %MAP; 2455 reattach $_ for values %MAP;
2476 2456
2477 warn "loading reloadable resources"; 2457 warn "loading reloadable resources";
2478 load_resources; 2458 load_resources;
2479 2459
2480 warn "restarting server ticker"; 2460 warn "leaving sync_job";
2481 2461
2482 $TICK_WATCHER->start; 2462 1
2483 }; 2463 } or do {
2484
2485 if ($@) {
2486 warn $@; 2464 warn $@;
2487 warn "error while reloading, exiting."; 2465 warn "error while reloading, exiting.";
2488 exit 1; 2466 exit 1;
2489 } 2467 };
2490 2468
2491 warn "reloaded"; 2469 warn "reloaded";
2492}; 2470};
2493 2471
2494our $RELOAD_WATCHER; # used only during reload 2472our $RELOAD_WATCHER; # used only during reload
… …
2535 2513
2536 cf::server_tick; # one server iteration 2514 cf::server_tick; # one server iteration
2537 $RUNTIME += $TICK; 2515 $RUNTIME += $TICK;
2538 $NEXT_TICK += $TICK; 2516 $NEXT_TICK += $TICK;
2539 2517
2518 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2519 $NEXT_RUNTIME_WRITE = $NOW + 10;
2520 Coro::async_pool {
2521 write_runtime
2522 or warn "ERROR: unable to write runtime file: $!";
2523 };
2524 }
2525
2526
2540 $WAIT_FOR_TICK->broadcast; 2527 $WAIT_FOR_TICK->broadcast;
2541 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2528 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2542 2529
2543 Event::sweep;
2544 Coro::cede_notself;
2545
2546# my $AFTER = Event::time; 2530# my $AFTER = Event::time;
2547# warn $AFTER - $NOW;#d# 2531# warn $AFTER - $NOW;#d#
2548 2532
2549 # if we are delayed by four ticks or more, skip them all 2533 # if we are delayed by four ticks or more, skip them all
2550 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2534 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
… …
2552 $TICK_WATCHER->at ($NEXT_TICK); 2536 $TICK_WATCHER->at ($NEXT_TICK);
2553 $TICK_WATCHER->start; 2537 $TICK_WATCHER->start;
2554 }, 2538 },
2555); 2539);
2556 2540
2541{
2542 BDB::max_poll_time $TICK * 0.1;
2543 $BDB_POLL_WATCHER = Event->io (
2544 reentrant => 0,
2545 fd => BDB::poll_fileno,
2546 poll => 'r',
2547 prio => 0,
2548 data => WF_AUTOCANCEL,
2549 cb => \&BDB::poll_cb,
2550 );
2551 BDB::min_parallel 8;
2552
2553 BDB::set_sync_prepare {
2554 my $status;
2555 my $current = $Coro::current;
2556 (
2557 sub {
2558 $status = $!;
2559 $current->ready; undef $current;
2560 },
2561 sub {
2562 Coro::schedule while defined $current;
2563 $! = $status;
2564 },
2565 )
2566 };
2567
2568 unless ($DB_ENV) {
2569 $DB_ENV = BDB::db_env_create;
2570
2571 cf::sync_job {
2572 eval {
2573 BDB::db_env_open
2574 $DB_ENV,
2575 $BDB_ENV_DIR,
2576 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2577 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2578 0666;
2579
2580 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2581
2582 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2583 $DB_ENV->set_lk_detect;
2584 };
2585
2586 cf::cleanup "db_env_open(db): $@" if $@;
2587 };
2588 }
2589}
2590
2591{
2592 IO::AIO::min_parallel 8;
2593
2594 undef $Coro::AIO::WATCHER;
2557IO::AIO::max_poll_time $TICK * 0.1; 2595 IO::AIO::max_poll_time $TICK * 0.1;
2558
2559undef $Coro::AIO::WATCHER;
2560$AIO_POLL_WATCHER = Event->io ( 2596 $AIO_POLL_WATCHER = Event->io (
2561 reentrant => 0, 2597 reentrant => 0,
2598 data => WF_AUTOCANCEL,
2562 fd => IO::AIO::poll_fileno, 2599 fd => IO::AIO::poll_fileno,
2563 poll => 'r', 2600 poll => 'r',
2564 prio => 6, 2601 prio => 6,
2565 data => WF_AUTOCANCEL,
2566 cb => \&IO::AIO::poll_cb, 2602 cb => \&IO::AIO::poll_cb,
2567); 2603 );
2568 2604}
2569$WRITE_RUNTIME_WATCHER = Event->timer (
2570 reentrant => 0,
2571 data => WF_AUTOCANCEL,
2572 after => 1,
2573 interval => 10,
2574 prio => 6, # keep it lowest so it acts like a watchdog
2575 cb => Coro::unblock_sub {
2576 write_runtime
2577 or warn "ERROR: unable to write runtime file: $!";
2578 },
2579);
2580 2605
2581END { cf::emergency_save } 2606END { cf::emergency_save }
2582 2607
25831 26081
2584 2609

Diff Legend

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