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.180 by root, Fri Jan 19 00:38:02 2007 UTC vs.
Revision 1.192 by root, Wed Jan 24 01:43:01 2007 UTC

349 my $runtime = cf::localdir . "/runtime"; 349 my $runtime = cf::localdir . "/runtime";
350 350
351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
352 or return; 352 or return;
353 353
354 my $value = $cf::RUNTIME + 90 + 10;
354 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 355 # 10 is the runtime save interval, for a monotonic clock
356 # 60 allows for the watchdog to kill the server.
357
355 (aio_write $fh, 0, (length $value), $value, 0) <= 0 358 (aio_write $fh, 0, (length $value), $value, 0) <= 0
356 and return; 359 and return;
357 360
358 aio_fsync $fh 361 aio_fsync $fh
359 and return; 362 and return;
1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1140 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1138 (cf::region::find $rmp->{region}), $rmp->{custom} 1141 (cf::region::find $rmp->{region}), $rmp->{custom}
1139 ) 1142 )
1140} 1143}
1141 1144
1145=item cf::map->register ($regex, $prio)
1146
1147Register a handler for the map path matching the given regex at the
1148givne priority (higher is better, built-in handlers have priority 0, the
1149default).
1150
1151=cut
1152
1142sub register { 1153sub register {
1143 my (undef, $regex) = @_; 1154 my (undef, $regex, $prio) = @_;
1144 my $pkg = caller; 1155 my $pkg = caller;
1145 1156
1146 no strict; 1157 no strict;
1147 push @{"$pkg\::ISA"}, __PACKAGE__; 1158 push @{"$pkg\::ISA"}, __PACKAGE__;
1148 1159
1149 $EXT_MAP{$pkg} = qr<$regex>; 1160 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1150} 1161}
1151 1162
1152# also paths starting with '/' 1163# also paths starting with '/'
1153$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1164$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1154 1165
1155sub thawer_merge { 1166sub thawer_merge {
1156 my ($self, $merge) = @_; 1167 my ($self, $merge) = @_;
1157 1168
1158 # we have to keep some variables in memory intact 1169 # we have to keep some variables in memory intact
1164 $self->SUPER::thawer_merge ($merge); 1175 $self->SUPER::thawer_merge ($merge);
1165} 1176}
1166 1177
1167sub normalise { 1178sub normalise {
1168 my ($path, $base) = @_; 1179 my ($path, $base) = @_;
1180
1181 $path = "$path"; # make sure its a string
1169 1182
1170 # map plan: 1183 # map plan:
1171 # 1184 #
1172 # /! non-realised random map exit (special hack!) 1185 # /! non-realised random map exit (special hack!)
1173 # {... are special paths that are not being touched 1186 # {... are special paths that are not being touched
1201 1214
1202 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1215 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1203 1216
1204 $path = normalise $path, $base; 1217 $path = normalise $path, $base;
1205 1218
1206 for my $pkg (keys %EXT_MAP) { 1219 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1207 if ($path =~ $EXT_MAP{$pkg}) { 1220 if ($path =~ $EXT_MAP{$pkg}[1]) {
1208 my $self = bless cf::map::new, $pkg; 1221 my $self = bless cf::map::new, $pkg;
1209 $self->{path} = $path; $self->path ($path); 1222 $self->{path} = $path; $self->path ($path);
1210 $self->init; # pass $1 etc. 1223 $self->init; # pass $1 etc.
1211 return $self; 1224 return $self;
1212 } 1225 }
1213 } 1226 }
1214 1227
1215 Carp::carp "unable to resolve path '$path'."; 1228 Carp::carp "unable to resolve path '$path' (base '$base').";
1216 () 1229 ()
1217} 1230}
1218 1231
1219sub init { 1232sub init {
1220 my ($self) = @_; 1233 my ($self) = @_;
1286 $self->{load_path} = $path; 1299 $self->{load_path} = $path;
1287 1300
1288 1 1301 1
1289} 1302}
1290 1303
1291sub load_orig { 1304sub load_header_orig {
1292 my ($self) = @_; 1305 my ($self) = @_;
1293 1306
1294 $self->load_header_from ($self->load_path) 1307 $self->load_header_from ($self->load_path)
1295} 1308}
1296 1309
1297sub load_temp { 1310sub load_header_temp {
1298 my ($self) = @_; 1311 my ($self) = @_;
1299 1312
1300 $self->load_header_from ($self->save_path) 1313 $self->load_header_from ($self->save_path)
1314}
1315
1316sub prepare_temp {
1317 my ($self) = @_;
1318
1319 $self->last_access ((delete $self->{last_access})
1320 || $cf::RUNTIME); #d#
1321 # safety
1322 $self->{instantiate_time} = $cf::RUNTIME
1323 if $self->{instantiate_time} > $cf::RUNTIME;
1324}
1325
1326sub prepare_orig {
1327 my ($self) = @_;
1328
1329 $self->{load_original} = 1;
1330 $self->{instantiate_time} = $cf::RUNTIME;
1331 $self->last_access ($cf::RUNTIME);
1332 $self->instantiate;
1301} 1333}
1302 1334
1303sub load_header { 1335sub load_header {
1304 my ($self) = @_; 1336 my ($self) = @_;
1305 1337
1306 if ($self->load_temp) { 1338 if ($self->load_header_temp) {
1307 $self->last_access ((delete $self->{last_access}) 1339 $self->prepare_temp;
1308 || $cf::RUNTIME); #d#
1309 # safety
1310 $self->{instantiate_time} = $cf::RUNTIME
1311 if $self->{instantiate_time} > $cf::RUNTIME;
1312 } else { 1340 } else {
1313 $self->load_orig 1341 $self->load_header_orig
1314 or return; 1342 or return;
1315 1343 $self->prepare_orig;
1316 $self->{load_original} = 1;
1317 $self->{instantiate_time} = $cf::RUNTIME;
1318 $self->last_access ($cf::RUNTIME);
1319 $self->instantiate;
1320 } 1344 }
1321 1345
1322 1 1346 1
1323} 1347}
1324 1348
1339 1363
1340 $map->load_header 1364 $map->load_header
1341 or return; 1365 or return;
1342 1366
1343 if ($map->should_reset) { 1367 if ($map->should_reset) {
1368 # doing this can freeze the server in a sync job, obviously
1344 $cf::WAIT_FOR_TICK->wait; 1369 #$cf::WAIT_FOR_TICK->wait;
1345 $map->reset; 1370 $map->reset;
1346 undef $guard; 1371 undef $guard;
1347 $map = find $path 1372 return find $path;
1348 or return;
1349 } 1373 }
1350 1374
1351 $cf::MAP{$path} = $map 1375 $cf::MAP{$path} = $map
1352 } 1376 }
1353} 1377}
1378
1379sub pre_load { }
1380sub post_load { }
1354 1381
1355sub load { 1382sub load {
1356 my ($self) = @_; 1383 my ($self) = @_;
1357 1384
1358 my $path = $self->{path}; 1385 my $path = $self->{path};
1361 return if $self->in_memory != cf::MAP_SWAPPED; 1388 return if $self->in_memory != cf::MAP_SWAPPED;
1362 1389
1363 $self->in_memory (cf::MAP_LOADING); 1390 $self->in_memory (cf::MAP_LOADING);
1364 1391
1365 $self->alloc; 1392 $self->alloc;
1393
1394 $self->pre_load;
1395
1366 $self->_load_objects ($self->{load_path}, 1) 1396 $self->_load_objects ($self->{load_path}, 1)
1367 or return; 1397 or return;
1368 1398
1369 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1399 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1370 if delete $self->{load_original}; 1400 if delete $self->{load_original};
1392 unless $self->difficulty; 1422 unless $self->difficulty;
1393 Coro::cede; 1423 Coro::cede;
1394 $self->activate; 1424 $self->activate;
1395 } 1425 }
1396 1426
1427 $self->post_load;
1428
1397 $self->in_memory (cf::MAP_IN_MEMORY); 1429 $self->in_memory (cf::MAP_IN_MEMORY);
1398} 1430}
1399 1431
1400sub customise_for { 1432sub customise_for {
1401 my ($self, $ob) = @_; 1433 my ($self, $ob) = @_;
1441 1473
1442 cf::sync_job { $map->load }; 1474 cf::sync_job { $map->load };
1443} 1475}
1444 1476
1445our %MAP_PREFETCH; 1477our %MAP_PREFETCH;
1446our $MAP_PREFETCHER = Coro::async { 1478our $MAP_PREFETCHER = undef;
1447 while () {
1448 for my $path (keys %MAP_PREFETCH) {
1449 my $map = find $path
1450 or next;
1451 $map->load;
1452
1453 delete $MAP_PREFETCH{$path};
1454 }
1455 Coro::schedule;
1456 }
1457};
1458 1479
1459sub find_async { 1480sub find_async {
1460 my ($path, $origin) = @_; 1481 my ($path, $origin) = @_;
1461 1482
1462 $path = normalise $path, $origin && $origin->{path}; 1483 $path = normalise $path, $origin && $origin->{path};
1463 1484
1464 if (my $map = $cf::MAP{$path}) { 1485 if (my $map = $cf::MAP{$path}) {
1465 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1486 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1466 } 1487 }
1467 1488
1468 $MAP_PREFETCH{$path} = 0; 1489 undef $MAP_PREFETCH{$path};
1490 $MAP_PREFETCHER ||= cf::async {
1491 while (%MAP_PREFETCH) {
1492 for my $path (keys %MAP_PREFETCH) {
1493 my $map = find $path
1494 or next;
1495 $map->load;
1496
1497 delete $MAP_PREFETCH{$path};
1498 }
1499 }
1500 undef $MAP_PREFETCHER;
1501 };
1469 $MAP_PREFETCHER->ready; 1502 $MAP_PREFETCHER->prio (6);
1470 1503
1471 () 1504 ()
1472} 1505}
1473 1506
1474sub save { 1507sub save {
1812 1845
1813sub parse_random_map_params { 1846sub parse_random_map_params {
1814 my ($spec) = @_; 1847 my ($spec) = @_;
1815 1848
1816 my $rmp = { # defaults 1849 my $rmp = { # defaults
1817 xsize => -1, 1850 xsize => (cf::rndm 15, 40),
1818 ysize => -1, 1851 ysize => (cf::rndm 15, 40),
1852 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1853 #layout => string,
1819 }; 1854 };
1820 1855
1821 for (split /\n/, $spec) { 1856 for (split /\n/, $spec) {
1822 my ($k, $v) = split /\s+/, $_, 2; 1857 my ($k, $v) = split /\s+/, $_, 2;
1823 1858
2172 sub db_sync() { 2207 sub db_sync() {
2173 db_save if $dirty; 2208 db_save if $dirty;
2174 undef $dirty; 2209 undef $dirty;
2175 } 2210 }
2176 2211
2177 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2212 my $idle = Event->idle (
2178 db_sync; 2213 reentrant => 0,
2214 min => 10,
2215 max => 20,
2216 repeat => 0,
2217 data => WF_AUTOCANCEL,
2218 cb => \&db_sync,
2179 }); 2219 );
2180 2220
2181 sub db_dirty() { 2221 sub db_dirty() {
2182 $dirty = 1; 2222 $dirty = 1;
2183 $idle->start; 2223 $idle->start;
2184 } 2224 }
2240 }; 2280 };
2241 2281
2242 cfg_load; 2282 cfg_load;
2243 db_load; 2283 db_load;
2244 load_extensions; 2284 load_extensions;
2285
2286 $TICK_WATCHER->start;
2245 Event::loop; 2287 Event::loop;
2246} 2288}
2247 2289
2248############################################################################# 2290#############################################################################
2249# initialisation and cleanup 2291# initialisation and cleanup
2250 2292
2251# install some emergency cleanup handlers 2293# install some emergency cleanup handlers
2252BEGIN { 2294BEGIN {
2253 for my $signal (qw(INT HUP TERM)) { 2295 for my $signal (qw(INT HUP TERM)) {
2254 Event->signal ( 2296 Event->signal (
2297 reentrant => 0,
2255 data => WF_AUTOCANCEL, 2298 data => WF_AUTOCANCEL,
2256 signal => $signal, 2299 signal => $signal,
2300 prio => 0,
2257 cb => sub { 2301 cb => sub {
2258 cf::cleanup "SIG$signal"; 2302 cf::cleanup "SIG$signal";
2259 }, 2303 },
2260 ); 2304 );
2261 } 2305 }
2262} 2306}
2291} 2335}
2292 2336
2293sub reload() { 2337sub reload() {
2294 # can/must only be called in main 2338 # can/must only be called in main
2295 if ($Coro::current != $Coro::main) { 2339 if ($Coro::current != $Coro::main) {
2296 warn "can only reload from main coroutine\n"; 2340 warn "can only reload from main coroutine";
2297 return; 2341 return;
2298 } 2342 }
2299 2343
2300 warn "reloading..."; 2344 warn "reloading...";
2301 2345
2302 warn "freezing server"; 2346 warn "cancelling server ticker";
2303 my $guard = freeze_mainloop; 2347 $TICK_WATCHER->cancel;
2348
2304 cf::emergency_save; 2349 cf::emergency_save;
2305
2306 warn "sync database to disk";
2307 cf::db_sync;
2308 IO::AIO::flush;
2309 2350
2310 eval { 2351 eval {
2311 # if anything goes wrong in here, we should simply crash as we already saved 2352 # if anything goes wrong in here, we should simply crash as we already saved
2312 2353
2354 warn "syncing database to disk";
2355 cf::db_sync;
2356
2313 warn "cancel all watchers"; 2357 warn "cancelling all WF_AUTOCANCEL watchers";
2314 for (Event::all_watchers) { 2358 for (Event::all_watchers) {
2315 $_->cancel if $_->data & WF_AUTOCANCEL; 2359 $_->cancel if $_->data & WF_AUTOCANCEL;
2316 } 2360 }
2317 2361
2362 warn "flushing outstanding aio requests";
2363 for (;;) {
2364 IO::AIO::flush;
2365 Coro::cede;
2366 last unless IO::AIO::nreqs;
2367 warn "iterate...";
2368 }
2369
2318 warn "cancel all extension coros"; 2370 warn "cancelling all extension coros";
2319 $_->cancel for values %EXT_CORO; 2371 $_->cancel for values %EXT_CORO;
2320 %EXT_CORO = (); 2372 %EXT_CORO = ();
2321 2373
2322 warn "remove commands"; 2374 warn "removing commands";
2323 %COMMAND = (); 2375 %COMMAND = ();
2324 2376
2325 warn "remove ext commands"; 2377 warn "removing ext commands";
2326 %EXTCMD = (); 2378 %EXTCMD = ();
2327 2379
2328 warn "unload/nuke all extensions"; 2380 warn "unloading/nuking all extensions";
2329 for my $pkg (@EXTS) { 2381 for my $pkg (@EXTS) {
2330 warn "... unloading $pkg"; 2382 warn "... unloading $pkg";
2331 2383
2332 if (my $cb = $pkg->can ("unload")) { 2384 if (my $cb = $pkg->can ("unload")) {
2333 eval { 2385 eval {
2338 2390
2339 warn "... nuking $pkg"; 2391 warn "... nuking $pkg";
2340 Symbol::delete_package $pkg; 2392 Symbol::delete_package $pkg;
2341 } 2393 }
2342 2394
2343 warn "unload all perl modules loaded from $LIBDIR"; 2395 warn "unloading all perl modules loaded from $LIBDIR";
2344 while (my ($k, $v) = each %INC) { 2396 while (my ($k, $v) = each %INC) {
2345 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2397 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2346 2398
2347 warn "removing <$k>"; 2399 warn "... unloading $k";
2348 delete $INC{$k}; 2400 delete $INC{$k};
2349 2401
2350 $k =~ s/\.pm$//; 2402 $k =~ s/\.pm$//;
2351 $k =~ s/\//::/g; 2403 $k =~ s/\//::/g;
2352 2404
2355 } 2407 }
2356 2408
2357 Symbol::delete_package $k; 2409 Symbol::delete_package $k;
2358 } 2410 }
2359 2411
2360 warn "get rid of safe::, as good as possible"; 2412 warn "getting rid of safe::, as good as possible";
2361 Symbol::delete_package "safe::$_" 2413 Symbol::delete_package "safe::$_"
2362 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2414 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2363 2415
2364 warn "unload cf.pm \"a bit\""; 2416 warn "unloading cf.pm \"a bit\"";
2365 delete $INC{"cf.pm"}; 2417 delete $INC{"cf.pm"};
2366 2418
2367 # don't, removes xs symbols, too, 2419 # don't, removes xs symbols, too,
2368 # and global variables created in xs 2420 # and global variables created in xs
2369 #Symbol::delete_package __PACKAGE__; 2421 #Symbol::delete_package __PACKAGE__;
2370 2422
2423 warn "unload completed, starting to reload now";
2424
2371 warn "reloading cf.pm"; 2425 warn "reloading cf.pm";
2372 require cf; 2426 require cf;
2373 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2427 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2374 2428
2375 warn "load config and database again"; 2429 warn "loading config and database again";
2376 cf::cfg_load; 2430 cf::cfg_load;
2377 cf::db_load; 2431 cf::db_load;
2378 2432
2379 warn "load extensions"; 2433 warn "loading extensions";
2380 cf::load_extensions; 2434 cf::load_extensions;
2381 2435
2382 warn "reattach attachments to objects/players"; 2436 warn "reattaching attachments to objects/players";
2383 _global_reattach; 2437 _global_reattach;
2384 warn "reattach attachments to maps"; 2438 warn "reattaching attachments to maps";
2385 reattach $_ for values %MAP; 2439 reattach $_ for values %MAP;
2440
2441 warn "restarting server ticker";
2442
2443 $TICK_WATCHER->start;
2386 }; 2444 };
2387 2445
2388 if ($@) { 2446 if ($@) {
2389 warn $@; 2447 warn $@;
2390 warn "error while reloading, exiting."; 2448 warn "error while reloading, exiting.";
2403 $who->message ("reloading server."); 2461 $who->message ("reloading server.");
2404 2462
2405 # doing reload synchronously and two reloads happen back-to-back, 2463 # doing reload synchronously and two reloads happen back-to-back,
2406 # coro crashes during coro_state_free->destroy here. 2464 # coro crashes during coro_state_free->destroy here.
2407 2465
2408 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub { 2466 $RELOAD_WATCHER ||= Event->timer (
2467 reentrant => 0,
2468 after => 0,
2469 data => WF_AUTOCANCEL,
2470 cb => sub {
2409 reload; 2471 reload;
2410 undef $RELOAD_WATCHER; 2472 undef $RELOAD_WATCHER;
2473 },
2411 }); 2474 );
2412 } 2475 }
2413}; 2476};
2414 2477
2415unshift @INC, $LIBDIR; 2478unshift @INC, $LIBDIR;
2479
2480my $bug_warning = 0;
2416 2481
2417$TICK_WATCHER = Event->timer ( 2482$TICK_WATCHER = Event->timer (
2418 reentrant => 0, 2483 reentrant => 0,
2484 parked => 1,
2419 prio => 0, 2485 prio => 0,
2420 at => $NEXT_TICK || $TICK, 2486 at => $NEXT_TICK || $TICK,
2421 data => WF_AUTOCANCEL, 2487 data => WF_AUTOCANCEL,
2422 cb => sub { 2488 cb => sub {
2489 if ($Coro::current != $Coro::main) {
2490 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2491 unless ++$bug_warning > 10;
2492 return;
2493 }
2494
2423 $NOW = Event::time; 2495 $NOW = Event::time;
2424 2496
2425 cf::server_tick; # one server iteration 2497 cf::server_tick; # one server iteration
2426 $RUNTIME += $TICK; 2498 $RUNTIME += $TICK;
2427 $NEXT_TICK += $TICK; 2499 $NEXT_TICK += $TICK;
2428 2500
2429 $WAIT_FOR_TICK->broadcast; 2501 $WAIT_FOR_TICK->broadcast;
2430 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2502 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2503
2504 Event::sweep;
2505 Coro::cede_notself;
2506
2507# my $AFTER = Event::time;
2508# warn $AFTER - $NOW;#d#
2431 2509
2432 # if we are delayed by four ticks or more, skip them all 2510 # if we are delayed by four ticks or more, skip them all
2433 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2511 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2434 2512
2435 $TICK_WATCHER->at ($NEXT_TICK); 2513 $TICK_WATCHER->at ($NEXT_TICK);
2436 $TICK_WATCHER->start; 2514 $TICK_WATCHER->start;
2437 }, 2515 },
2438); 2516);
2439 2517
2440IO::AIO::max_poll_time $TICK * 0.2; 2518IO::AIO::max_poll_time $TICK * 0.1;
2441 2519
2520undef $Coro::AIO::WATCHER;
2442$AIO_POLL_WATCHER = Event->io ( 2521$AIO_POLL_WATCHER = Event->io (
2522 reentrant => 0,
2443 fd => IO::AIO::poll_fileno, 2523 fd => IO::AIO::poll_fileno,
2444 poll => 'r', 2524 poll => 'r',
2445 prio => 5, 2525 prio => 6,
2446 data => WF_AUTOCANCEL, 2526 data => WF_AUTOCANCEL,
2447 cb => \&IO::AIO::poll_cb, 2527 cb => \&IO::AIO::poll_cb,
2448); 2528);
2449 2529
2450$WRITE_RUNTIME_WATCHER = Event->timer ( 2530$WRITE_RUNTIME_WATCHER = Event->timer (
2531 reentrant => 0,
2451 data => WF_AUTOCANCEL, 2532 data => WF_AUTOCANCEL,
2452 after => 0, 2533 after => 1,
2453 interval => 10, 2534 interval => 10,
2454 cb => sub { 2535 prio => 6, # keep it lowest so it acts like a watchdog
2455 (Coro::unblock_sub { 2536 cb => Coro::unblock_sub {
2456 write_runtime 2537 write_runtime
2457 or warn "ERROR: unable to write runtime file: $!"; 2538 or warn "ERROR: unable to write runtime file: $!";
2458 })->();
2459 }, 2539 },
2460); 2540);
2461 2541
2462END { cf::emergency_save } 2542END { cf::emergency_save }
2463 2543

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines