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.199 by root, Mon Jan 29 14:46:01 2007 UTC vs.
Revision 1.209 by root, Mon Feb 12 01:25:55 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
… …
48our $TICK_WATCHER; 52our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 53our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 54our $WRITE_RUNTIME_WATCHER;
51our $NEXT_TICK; 55our $NEXT_TICK;
52our $NOW; 56our $NOW;
57our $USE_FSYNC = 1; # use fsync to write maps - default off
58
59our $BDB_POLL_WATCHER;
60our $DB_ENV;
53 61
54our %CFG; 62our %CFG;
55 63
56our $UPTIME; $UPTIME ||= time; 64our $UPTIME; $UPTIME ||= time;
57our $RUNTIME; 65our $RUNTIME;
58 66
59our %PLAYER; # all users 67our %PLAYER; # all users
60our %MAP; # all maps 68our %MAP; # all maps
61our $LINK_MAP; # the special {link} map, which is always available 69our $LINK_MAP; # the special {link} map, which is always available
62our $RANDOM_MAPS = cf::localdir . "/random"; 70our $RANDOM_MAPS = cf::localdir . "/random";
71our $BDB_ENV_DIR = cf::localdir . "/db";
63 72
64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 73our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; 74our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66 75
67# 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 ∕
… …
80mkdir cf::localdir; 89mkdir cf::localdir;
81mkdir cf::localdir . "/" . cf::playerdir; 90mkdir cf::localdir . "/" . cf::playerdir;
82mkdir cf::localdir . "/" . cf::tmpdir; 91mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir; 92mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS; 93mkdir $RANDOM_MAPS;
94mkdir $BDB_ENV_DIR;
85 95
86our $EMERGENCY_POSITION; 96our $EMERGENCY_POSITION;
87 97
88sub cf::map::normalise; 98sub cf::map::normalise;
89 99
… …
358 # 60 allows for the watchdog to kill the server. 368 # 60 allows for the watchdog to kill the server.
359 369
360 (aio_write $fh, 0, (length $value), $value, 0) <= 0 370 (aio_write $fh, 0, (length $value), $value, 0) <= 0
361 and return; 371 and return;
362 372
373 # always fsync - this file is important
363 aio_fsync $fh 374 aio_fsync $fh
364 and return; 375 and return;
365 376
366 close $fh 377 close $fh
367 or return; 378 or return;
… …
752 $filename, length $$rdata, scalar @$objs; 763 $filename, length $$rdata, scalar @$objs;
753 764
754 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 765 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
755 chmod SAVE_MODE, $fh; 766 chmod SAVE_MODE, $fh;
756 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 767 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
757 aio_fsync $fh; 768 aio_fsync $fh if $cf::USE_FSYNC;
758 close $fh; 769 close $fh;
759 770
760 if (@$objs) { 771 if (@$objs) {
761 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 772 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
762 chmod SAVE_MODE, $fh; 773 chmod SAVE_MODE, $fh;
763 my $data = Storable::nfreeze { version => 1, objs => $objs }; 774 my $data = Storable::nfreeze { version => 1, objs => $objs };
764 aio_write $fh, 0, (length $data), $data, 0; 775 aio_write $fh, 0, (length $data), $data, 0;
765 aio_fsync $fh; 776 aio_fsync $fh if $cf::USE_FSYNC;
766 close $fh; 777 close $fh;
767 aio_rename "$filename.pst~", "$filename.pst"; 778 aio_rename "$filename.pst~", "$filename.pst";
768 } 779 }
769 } else { 780 } else {
770 aio_unlink "$filename.pst"; 781 aio_unlink "$filename.pst";
… …
776 } 787 }
777 } else { 788 } else {
778 aio_unlink $filename; 789 aio_unlink $filename;
779 aio_unlink "$filename.pst"; 790 aio_unlink "$filename.pst";
780 } 791 }
792
793 #d##TODO# nuke non .map-files if exist
794 if ($filename =~ s/\.map$//) {
795 aio_unlink $filename;
796 aio_unlink "$filename.pst";
797 }
781 } 798 }
782} 799}
783 800
784sub object_freezer_as_string { 801sub object_freezer_as_string {
785 my ($rdata, $objs) = @_; 802 my ($rdata, $objs) = @_;
… …
791 808
792sub object_thawer_load { 809sub object_thawer_load {
793 my ($filename) = @_; 810 my ($filename) = @_;
794 811
795 my ($data, $av); 812 my ($data, $av);
813
814 #d#TODO remove .map if file does not exist
815 aio_stat $filename and $filename =~ s/\.map$//;
796 816
797 (aio_load $filename, $data) >= 0 817 (aio_load $filename, $data) >= 0
798 or return; 818 or return;
799 819
800 unless (aio_stat "$filename.pst") { 820 unless (aio_stat "$filename.pst") {
… …
1070=cut 1090=cut
1071 1091
1072sub maps($) { 1092sub maps($) {
1073 my ($pl) = @_; 1093 my ($pl) = @_;
1074 1094
1095 $pl = ref $pl ? $pl->ob->name : $pl;
1096
1075 my $files = aio_readdir playerdir $pl 1097 my $files = aio_readdir playerdir $pl
1076 or return; 1098 or return;
1077 1099
1078 my @paths; 1100 my @paths;
1079 1101
1080 for (@$files) { 1102 for (@$files) {
1081 utf8::decode $_; 1103 utf8::decode $_;
1082 next if /\.(?:pl|pst)$/; 1104 next if /\.(?:pl|pst)$/;
1083 next unless /^$PATH_SEP/o; 1105 next unless /^$PATH_SEP/o;
1084 1106
1085 push @paths, cf::map::normalise "~" . $pl->ob->name . "/" . $_; 1107 push @paths, cf::map::normalise "~$pl/$_";
1086 } 1108 }
1087 1109
1088 \@paths 1110 \@paths
1089} 1111}
1090 1112
… …
1251 1273
1252# the original (read-only) location 1274# the original (read-only) location
1253sub load_path { 1275sub load_path {
1254 my ($self) = @_; 1276 my ($self) = @_;
1255 1277
1256 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1278 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1257} 1279}
1258 1280
1259# the temporary/swap location 1281# the temporary/swap location
1260sub save_path { 1282sub save_path {
1261 my ($self) = @_; 1283 my ($self) = @_;
1262 1284
1263 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1285 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1264 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1286 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1265} 1287}
1266 1288
1267# the unique path, undef == no special unique path 1289# the unique path, undef == no special unique path
1268sub uniq_path { 1290sub uniq_path {
1269 my ($self) = @_; 1291 my ($self) = @_;
… …
1285 my ($self) = @_; 1307 my ($self) = @_;
1286 1308
1287 utf8::encode (my $save = $self->save_path); 1309 utf8::encode (my $save = $self->save_path);
1288 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1310 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1289 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1311 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1312
1313 #d#TODO remove .map and also nuke
1314 $save =~ s/\.map// or return;#d#
1315 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1316 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1290} 1317}
1291 1318
1292sub load_header_from($) { 1319sub load_header_from($) {
1293 my ($self, $path) = @_; 1320 my ($self, $path) = @_;
1294 1321
1295 utf8::encode $path; 1322 utf8::encode $path;
1296 aio_open $path, O_RDONLY, 0 1323 #aio_open $path, O_RDONLY, 0
1297 or return; 1324 # or return;
1298 1325
1299 $self->_load_header ($path) 1326 $self->_load_header ($path)
1300 or return; 1327 or return;
1301 1328
1302 $self->{load_path} = $path; 1329 $self->{load_path} = $path;
… …
1987 # get handled first 2014 # get handled first
1988 my $queue = delete $ns->{query_queue} 2015 my $queue = delete $ns->{query_queue}
1989 or return; # be conservative, not sure how that can happen, but we saw a crash here 2016 or return; # be conservative, not sure how that can happen, but we saw a crash here
1990 2017
1991 (shift @$queue)->[1]->($msg); 2018 (shift @$queue)->[1]->($msg);
2019 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1992 2020
1993 push @{ $ns->{query_queue} }, @$queue; 2021 push @{ $ns->{query_queue} }, @$queue;
1994 2022
1995 if (@{ $ns->{query_queue} } == @$queue) { 2023 if (@{ $ns->{query_queue} } == @$queue) {
1996 if (@$queue) { 2024 if (@$queue) {
… …
2157The parameter C<$family> should best start with the name of the extension 2185The parameter C<$family> should best start with the name of the extension
2158using it, it should be unique. 2186using it, it should be unique.
2159 2187
2160=over 4 2188=over 4
2161 2189
2162=item $hashref = cf::db_get $family
2163
2164Return a hashref for use by the extension C<$family>, which can be
2165modified. After modifications, you have to call C<cf::db_dirty> or
2166C<cf::db_sync>.
2167
2168=item $value = cf::db_get $family => $key 2190=item $value = cf::db_get $family => $key
2169 2191
2170Returns a single value from the database 2192Returns a single value from the database.
2171
2172=item cf::db_put $family => $hashref
2173
2174Stores the given family hashref into the database. Updates are delayed, if
2175you want the data to be synced to disk immediately, use C<cf::db_sync>.
2176 2193
2177=item cf::db_put $family => $key => $value 2194=item cf::db_put $family => $key => $value
2178 2195
2179Stores the given C<$value> in the family hash. Updates are delayed, if you 2196Stores the given C<$value> in the family.
2180want the data to be synced to disk immediately, use C<cf::db_sync>.
2181
2182=item cf::db_dirty
2183
2184Marks the database as dirty, to be updated at a later time.
2185
2186=item cf::db_sync
2187
2188Immediately write the database to disk I<if it is dirty>.
2189 2197
2190=cut 2198=cut
2191 2199
2192our $DB; 2200our $DB;
2193 2201
2194{ 2202unless ($DB) {
2203 $DB = BDB::db_create $DB_ENV;
2204
2205 cf::sync_job {
2206 eval {
2207 $DB->set_flags (BDB::CHKSUM);
2208
2209 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2210 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2211 cf::cleanup "db_open(db): $!" if $!;
2212 };
2213 cf::cleanup "db_open(db): $@" if $@;
2214 };
2215
2195 my $path = cf::localdir . "/database.pst"; 2216 my $path = cf::localdir . "/database.pst";
2217 if (stat $path) {
2218 cf::sync_job {
2219 my $pst = Storable::retrieve $path;
2196 2220
2197 sub db_load() { 2221 cf::db_put (board => data => $pst->{board});
2198 $DB = stat $path ? Storable::retrieve $path : { }; 2222 cf::db_put (guildrules => data => $pst->{guildrules});
2199 } 2223 cf::db_put (rent => balance => $pst->{rent}{balance});
2224 BDB::db_env_txn_checkpoint $DB_ENV;
2200 2225
2201 my $pid; 2226 unlink $path;
2202
2203 sub db_save() {
2204 waitpid $pid, 0 if $pid;
2205 if (0 == ($pid = fork)) {
2206 $DB->{_meta}{version} = 1;
2207 Storable::nstore $DB, "$path~";
2208 rename "$path~", $path;
2209 cf::_exit 0 if defined $pid;
2210 } 2227 };
2211 } 2228 }
2229}
2212 2230
2213 my $dirty;
2214
2215 sub db_sync() {
2216 db_save if $dirty;
2217 undef $dirty;
2218 }
2219
2220 my $idle = Event->idle (
2221 reentrant => 0,
2222 min => 10,
2223 max => 20,
2224 repeat => 0,
2225 data => WF_AUTOCANCEL,
2226 cb => \&db_sync,
2227 );
2228
2229 sub db_dirty() {
2230 $dirty = 1;
2231 $idle->start;
2232 }
2233
2234 sub db_get($;$) { 2231sub db_get($$) {
2235 @_ >= 2 2232 my $key = "$_[0]/$_[1]";
2236 ? $DB->{$_[0]}{$_[1]}
2237 : ($DB->{$_[0]} ||= { })
2238 }
2239 2233
2234 cf::sync_job {
2235 BDB::db_get $DB, undef, $key, my $data;
2236
2237 $! ? ()
2238 : Compress::LZF::sthaw $data
2239 }
2240}
2241
2240 sub db_put($$;$) { 2242sub db_put($$$) {
2241 if (@_ >= 3) { 2243 BDB::dbreq_pri 4;
2242 $DB->{$_[0]}{$_[1]} = $_[2]; 2244 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2243 } else {
2244 $DB->{$_[0]} = $_[1];
2245 }
2246 db_dirty;
2247 }
2248
2249 cf::global->attach (
2250 prio => 10000,
2251 on_cleanup => sub {
2252 db_sync;
2253 },
2254 );
2255} 2245}
2256 2246
2257############################################################################# 2247#############################################################################
2258# the server's main() 2248# the server's init and main functions
2249
2250sub load_resources {
2251 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2252 or die "unable to load regions file\n";#d#
2253}
2259 2254
2260sub cfg_load { 2255sub cfg_load {
2261 open my $fh, "<:utf8", cf::confdir . "/config" 2256 open my $fh, "<:utf8", cf::confdir . "/config"
2262 or return; 2257 or return;
2263 2258
… …
2274 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2269 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2275 and die "WARNING: m(un)lockall failed: $!\n"; 2270 and die "WARNING: m(un)lockall failed: $!\n";
2276 }; 2271 };
2277 warn $@ if $@; 2272 warn $@ if $@;
2278 } 2273 }
2274}
2275
2276sub init {
2277 load_resources;
2279} 2278}
2280 2279
2281sub main { 2280sub main {
2282 # we must not ever block the main coroutine 2281 # we must not ever block the main coroutine
2283 local $Coro::idle = sub { 2282 local $Coro::idle = sub {
… …
2286 Event::one_event; 2285 Event::one_event;
2287 })->prio (Coro::PRIO_MAX); 2286 })->prio (Coro::PRIO_MAX);
2288 }; 2287 };
2289 2288
2290 cfg_load; 2289 cfg_load;
2291 db_load;
2292 load_extensions; 2290 load_extensions;
2293 2291
2294 $TICK_WATCHER->start; 2292 $TICK_WATCHER->start;
2295 Event::loop; 2293 Event::loop;
2296} 2294}
… …
2335 my $map = $cf::MAP{$path} or next; 2333 my $map = $cf::MAP{$path} or next;
2336 $map->valid or next; 2334 $map->valid or next;
2337 $map->save; 2335 $map->save;
2338 } 2336 }
2339 warn "end emergency map save\n"; 2337 warn "end emergency map save\n";
2338
2339 warn "begin emergency database checkpoint\n";
2340 BDB::db_env_txn_checkpoint $DB_ENV;
2341 warn "end emergency database checkpoint\n";
2340 }; 2342 };
2341 2343
2342 warn "leave emergency perl save\n"; 2344 warn "leave emergency perl save\n";
2343} 2345}
2344 2346
… …
2357 cf::emergency_save; 2359 cf::emergency_save;
2358 2360
2359 eval { 2361 eval {
2360 # if anything goes wrong in here, we should simply crash as we already saved 2362 # if anything goes wrong in here, we should simply crash as we already saved
2361 2363
2362 warn "syncing database to disk";
2363 cf::db_sync;
2364
2365 warn "cancelling all WF_AUTOCANCEL watchers"; 2364 warn "cancelling all WF_AUTOCANCEL watchers";
2366 for (Event::all_watchers) { 2365 for (Event::all_watchers) {
2367 $_->cancel if $_->data & WF_AUTOCANCEL; 2366 $_->cancel if $_->data & WF_AUTOCANCEL;
2368 } 2367 }
2369 2368
2369 warn "syncing database to disk";
2370 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
2371
2370 warn "flushing outstanding aio requests"; 2372 warn "flushing outstanding aio requests";
2371 for (;;) { 2373 for (;;) {
2374 BDB::flush;
2372 IO::AIO::flush; 2375 IO::AIO::flush;
2373 Coro::cede; 2376 Coro::cede;
2374 last unless IO::AIO::nreqs; 2377 last unless IO::AIO::nreqs || BDB::nreqs;
2375 warn "iterate..."; 2378 warn "iterate...";
2376 } 2379 }
2377 2380
2378 warn "cancelling all extension coros"; 2381 warn "cancelling all extension coros";
2379 $_->cancel for values %EXT_CORO; 2382 $_->cancel for values %EXT_CORO;
… …
2434 require cf; 2437 require cf;
2435 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2438 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2436 2439
2437 warn "loading config and database again"; 2440 warn "loading config and database again";
2438 cf::cfg_load; 2441 cf::cfg_load;
2439 cf::db_load;
2440 2442
2441 warn "loading extensions"; 2443 warn "loading extensions";
2442 cf::load_extensions; 2444 cf::load_extensions;
2443 2445
2444 warn "reattaching attachments to objects/players"; 2446 warn "reattaching attachments to objects/players";
2445 _global_reattach; 2447 _global_reattach;
2446 warn "reattaching attachments to maps"; 2448 warn "reattaching attachments to maps";
2447 reattach $_ for values %MAP; 2449 reattach $_ for values %MAP;
2450
2451 warn "loading reloadable resources";
2452 load_resources;
2448 2453
2449 warn "restarting server ticker"; 2454 warn "restarting server ticker";
2450 2455
2451 $TICK_WATCHER->start; 2456 $TICK_WATCHER->start;
2452 }; 2457 };
… …
2521 $TICK_WATCHER->at ($NEXT_TICK); 2526 $TICK_WATCHER->at ($NEXT_TICK);
2522 $TICK_WATCHER->start; 2527 $TICK_WATCHER->start;
2523 }, 2528 },
2524); 2529);
2525 2530
2531{
2532 BDB::max_poll_time $TICK * 0.1;
2533 $BDB_POLL_WATCHER = Event->io (
2534 reentrant => 0,
2535 fd => BDB::poll_fileno,
2536 poll => 'r',
2537 prio => 0,
2538 data => WF_AUTOCANCEL,
2539 cb => \&BDB::poll_cb,
2540 );
2541 BDB::min_parallel 8;
2542
2543 BDB::set_sync_prepare {
2544 my $status;
2545 my $current = $Coro::current;
2546 (
2547 sub {
2548 $status = $!;
2549 $current->ready; undef $current;
2550 },
2551 sub {
2552 Coro::schedule while defined $current;
2553 $! = $status;
2554 },
2555 )
2556 };
2557
2558 unless ($DB_ENV) {
2559 $DB_ENV = BDB::db_env_create;
2560
2561 cf::sync_job {
2562 eval {
2563 BDB::db_env_open
2564 $DB_ENV,
2565 $BDB_ENV_DIR,
2566 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2567 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2568 0666;
2569
2570 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2571
2572 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2573 $DB_ENV->set_lk_detect;
2574 };
2575
2576 cf::cleanup "db_env_open(db): $@" if $@;
2577 };
2578 }
2579}
2580
2581{
2582 IO::AIO::min_parallel 8;
2583
2584 undef $Coro::AIO::WATCHER;
2526IO::AIO::max_poll_time $TICK * 0.1; 2585 IO::AIO::max_poll_time $TICK * 0.1;
2527
2528undef $Coro::AIO::WATCHER;
2529$AIO_POLL_WATCHER = Event->io ( 2586 $AIO_POLL_WATCHER = Event->io (
2530 reentrant => 0, 2587 reentrant => 0,
2531 fd => IO::AIO::poll_fileno, 2588 fd => IO::AIO::poll_fileno,
2532 poll => 'r', 2589 poll => 'r',
2533 prio => 6, 2590 prio => 6,
2534 data => WF_AUTOCANCEL, 2591 data => WF_AUTOCANCEL,
2535 cb => \&IO::AIO::poll_cb, 2592 cb => \&IO::AIO::poll_cb,
2536); 2593 );
2594}
2537 2595
2538$WRITE_RUNTIME_WATCHER = Event->timer ( 2596$WRITE_RUNTIME_WATCHER = Event->timer (
2539 reentrant => 0, 2597 reentrant => 0,
2540 data => WF_AUTOCANCEL, 2598 data => WF_AUTOCANCEL,
2541 after => 1, 2599 after => 1,

Diff Legend

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