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.122 by root, Tue Jan 2 17:32:24 2007 UTC vs.
Revision 1.138 by root, Fri Jan 5 17:07:17 2007 UTC

… …
8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.3; 13use Coro 3.3 ();
14use Coro::Event; 14use Coro::Event;
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
… …
49our $UPTIME; $UPTIME ||= time; 49our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 50our $RUNTIME;
51 51
52our %MAP; # all maps 52our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 53our $LINK_MAP; # the special {link} map
54our $FREEZE;
55our $RANDOM_MAPS = cf::localdir . "/random"; 54our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; 55our %EXT_CORO;
57 56
58binmode STDOUT; 57binmode STDOUT;
59binmode STDERR; 58binmode STDERR;
… …
71mkdir cf::localdir . "/" . cf::uniquedir; 70mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 71mkdir $RANDOM_MAPS;
73 72
74# a special map that is always available 73# a special map that is always available
75our $LINK_MAP; 74our $LINK_MAP;
76 75our $EMERGENCY_POSITION;
77our $EMERGENCY_POSITION = $cf::CFG{emergency_position} || ["/world/world_105_115", 5, 37];
78 76
79############################################################################# 77#############################################################################
80 78
81=head2 GLOBAL VARIABLES 79=head2 GLOBAL VARIABLES
82 80
… …
181sub to_json($) { 179sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 180 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 181 JSON::Syck::Dump $_[0]
184} 182}
185 183
186=item my $guard = cf::guard { BLOCK }
187
188Run the given callback when the guard object gets destroyed (useful for
189coroutine cancellations).
190
191You can call C<< ->cancel >> on the guard object to stop the block from
192being executed.
193
194=cut
195
196sub guard(&) {
197 bless \(my $cb = $_[0]), cf::guard::;
198}
199
200sub cf::guard::cancel {
201 ${$_[0]} = sub { };
202}
203
204sub cf::guard::DESTROY {
205 ${$_[0]}->();
206}
207
208=item cf::lock_wait $string 184=item cf::lock_wait $string
209 185
210Wait until the given lock is available. See cf::lock_acquire. 186Wait until the given lock is available. See cf::lock_acquire.
211 187
212=item my $lock = cf::lock_acquire $string 188=item my $lock = cf::lock_acquire $string
213 189
214Wait until the given lock is available and then acquires it and returns 190Wait until the given lock is available and then acquires it and returns
215a guard object. If the guard object gets destroyed (goes out of scope, 191a Coro::guard object. If the guard object gets destroyed (goes out of scope,
216for example when the coroutine gets canceled), the lock is automatically 192for example when the coroutine gets canceled), the lock is automatically
217returned. 193returned.
218 194
219Lock names should begin with a unique identifier (for example, find_map 195Lock names should begin with a unique identifier (for example, cf::map::find
220uses map_find and load_map uses map_load). 196uses map_find and cf::map::load uses map_load).
221 197
222=cut 198=cut
223 199
224our %LOCK; 200our %LOCK;
225 201
… …
239 # wait, to be sure we are not locked 215 # wait, to be sure we are not locked
240 lock_wait $key; 216 lock_wait $key;
241 217
242 $LOCK{$key} = []; 218 $LOCK{$key} = [];
243 219
244 cf::guard { 220 Coro::guard {
245 # wake up all waiters, to be on the safe side 221 # wake up all waiters, to be on the safe side
246 $_->ready for @{ delete $LOCK{$key} }; 222 $_->ready for @{ delete $LOCK{$key} };
247 } 223 }
224}
225
226sub freeze_mainloop {
227 return unless $TICK_WATCHER->is_active;
228
229 my $guard = Coro::guard { $TICK_WATCHER->start };
230 $TICK_WATCHER->stop;
231 $guard
248} 232}
249 233
250=item cf::sync_job { BLOCK } 234=item cf::sync_job { BLOCK }
251 235
252The design of crossfire+ requires that the main coro ($Coro::main) is 236The design of crossfire+ requires that the main coro ($Coro::main) is
… …
267 # this is the main coro, too bad, we have to block 251 # this is the main coro, too bad, we have to block
268 # till the operation succeeds, freezing the server :/ 252 # till the operation succeeds, freezing the server :/
269 253
270 # TODO: use suspend/resume instead 254 # TODO: use suspend/resume instead
271 # (but this is cancel-safe) 255 # (but this is cancel-safe)
272 local $FREEZE = 1; 256 my $freeze_guard = freeze_mainloop;
273 257
274 my $busy = 1; 258 my $busy = 1;
275 my @res; 259 my @res;
276 260
277 (Coro::async { 261 (Coro::async_pool {
278 @res = eval { $job->() }; 262 @res = eval { $job->() };
279 warn $@ if $@; 263 warn $@ if $@;
280 undef $busy; 264 undef $busy;
281 })->prio (Coro::PRIO_MAX); 265 })->prio (Coro::PRIO_MAX);
282 266
… …
293 } 277 }
294} 278}
295 279
296=item $coro = cf::coro { BLOCK } 280=item $coro = cf::coro { BLOCK }
297 281
298Creates and returns a new coro. This coro is automcatially being canceled 282Creates (and readies) and returns a new coro. This coro is automcatially
299when the extension calling this is being unloaded. 283being canceled when the extension calling this is being unloaded.
300 284
301=cut 285=cut
302 286
303sub coro(&) { 287sub coro(&) {
304 my $cb = shift; 288 my $cb = shift;
305 289
306 my $coro; $coro = async { 290 my $coro = &Coro::async_pool ($cb);
307 eval {
308 $cb->();
309 };
310 warn $@ if $@;
311 };
312 291
313 $coro->on_destroy (sub { 292 $coro->on_destroy (sub {
314 delete $EXT_CORO{$coro+0}; 293 delete $EXT_CORO{$coro+0};
315 }); 294 });
316 $EXT_CORO{$coro+0} = $coro; 295 $EXT_CORO{$coro+0} = $coro;
… …
1126package cf::map; 1105package cf::map;
1127 1106
1128use Fcntl; 1107use Fcntl;
1129use Coro::AIO; 1108use Coro::AIO;
1130 1109
1131our $MAX_RESET = 7200; 1110our $MAX_RESET = 3600;
1132our $DEFAULT_RESET = 3600; 1111our $DEFAULT_RESET = 3000;
1133 1112
1134sub generate_random_map { 1113sub generate_random_map {
1135 my ($path, $rmp) = @_; 1114 my ($path, $rmp) = @_;
1136 1115
1137 # mit "rum" bekleckern, nicht 1116 # mit "rum" bekleckern, nicht
… …
1167 or return; 1146 or return;
1168 1147
1169 my $map = cf::map::new 1148 my $map = cf::map::new
1170 or return; 1149 or return;
1171 1150
1151 # for better error messages only, will be overwritten
1152 $map->path ($path);
1153
1172 $map->load_header ($path) 1154 $map->load_header ($path)
1173 or return; 1155 or return;
1174 1156
1175 $map->{load_path} = $path; 1157 $map->{load_path} = $path;
1176 1158
1177 $map 1159 $map
1178} 1160}
1179 1161
1162sub find;
1180sub find_map { 1163sub find {
1181 my ($path, $origin) = @_; 1164 my ($path, $origin) = @_;
1182 1165
1183 #warn "find_map<$path,$origin>\n";#d# 1166 #warn "find<$path,$origin>\n";#d#
1184 1167
1185 $path = new cf::path $path, $origin && $origin->path; 1168 $path = new cf::path $path, $origin && $origin->path;
1186 my $key = $path->as_string; 1169 my $key = $path->as_string;
1187 1170
1188 cf::lock_wait "map_find:$key"; 1171 cf::lock_wait "map_find:$key";
… …
1191 my $guard = cf::lock_acquire "map_find:$key"; 1174 my $guard = cf::lock_acquire "map_find:$key";
1192 1175
1193 # do it the slow way 1176 # do it the slow way
1194 my $map = try_load_header $path->save_path; 1177 my $map = try_load_header $path->save_path;
1195 1178
1179 Coro::cede;
1180
1196 if ($map) { 1181 if ($map) {
1182 $map->last_access ((delete $map->{last_access})
1183 || $cf::RUNTIME); #d#
1197 # safety 1184 # safety
1198 $map->{instantiate_time} = $cf::RUNTIME 1185 $map->{instantiate_time} = $cf::RUNTIME
1199 if $map->{instantiate_time} > $cf::RUNTIME; 1186 if $map->{instantiate_time} > $cf::RUNTIME;
1200 } else { 1187 } else {
1201 if (my $rmp = $path->random_map_params) { 1188 if (my $rmp = $path->random_map_params) {
… …
1206 1193
1207 $map or return; 1194 $map or return;
1208 1195
1209 $map->{load_original} = 1; 1196 $map->{load_original} = 1;
1210 $map->{instantiate_time} = $cf::RUNTIME; 1197 $map->{instantiate_time} = $cf::RUNTIME;
1198 $map->last_access ($cf::RUNTIME);
1211 $map->instantiate; 1199 $map->instantiate;
1212 1200
1213 # per-player maps become, after loading, normal maps 1201 # per-player maps become, after loading, normal maps
1214 $map->per_player (0) if $path->{user_rel}; 1202 $map->per_player (0) if $path->{user_rel};
1215 } 1203 }
1216 1204
1217 $map->path ($key); 1205 $map->path ($key);
1218 $map->{path} = $path; 1206 $map->{path} = $path;
1219 $map->{last_save} = $cf::RUNTIME; 1207 $map->{last_save} = $cf::RUNTIME;
1220 $map->last_access ($cf::RUNTIME); 1208
1209 Coro::cede;
1221 1210
1222 if ($map->should_reset) { 1211 if ($map->should_reset) {
1223 $map->reset; 1212 $map->reset;
1213 undef $guard;
1224 $map = find_map $path; 1214 $map = find $path
1215 or return;
1225 } 1216 }
1226 1217
1227 $cf::MAP{$key} = $map 1218 $cf::MAP{$key} = $map
1228 } 1219 }
1229} 1220}
… …
1250 if (aio_open $uniq, O_RDONLY, 0) { 1241 if (aio_open $uniq, O_RDONLY, 0) {
1251 $self->clear_unique_items; 1242 $self->clear_unique_items;
1252 $self->load_objects ($uniq, 0); 1243 $self->load_objects ($uniq, 0);
1253 } 1244 }
1254 } 1245 }
1246
1247 Coro::cede;
1255 1248
1256 # now do the right thing for maps 1249 # now do the right thing for maps
1257 $self->link_multipart_objects; 1250 $self->link_multipart_objects;
1258 1251
1259 if ($self->{path}->is_style_map) { 1252 if ($self->{path}->is_style_map) {
… …
1267 $self->difficulty ($self->estimate_difficulty) 1260 $self->difficulty ($self->estimate_difficulty)
1268 unless $self->difficulty; 1261 unless $self->difficulty;
1269 $self->activate; 1262 $self->activate;
1270 } 1263 }
1271 1264
1265 Coro::cede;
1266
1272 $self->in_memory (cf::MAP_IN_MEMORY); 1267 $self->in_memory (cf::MAP_IN_MEMORY);
1273} 1268}
1274 1269
1275sub load_map_sync { 1270sub find_sync {
1276 my ($path, $origin) = @_; 1271 my ($path, $origin) = @_;
1277 1272
1278 #warn "load_map_sync<$path, $origin>\n";#d# 1273 cf::sync_job { cf::map::find $path, $origin }
1274}
1279 1275
1280 cf::sync_job { 1276sub do_load_sync {
1281 my $map = cf::map::find_map $path, $origin 1277 my ($map) = @_;
1282 or return; 1278
1283 $map->load; 1279 cf::sync_job { $map->load };
1284 $map
1285 }
1286} 1280}
1287 1281
1288sub save { 1282sub save {
1289 my ($self) = @_; 1283 my ($self) = @_;
1290 1284
1285 my $lock = cf::lock_acquire "map_data:" . $self->path;
1286
1291 $self->{last_save} = $cf::RUNTIME; 1287 $self->{last_save} = $cf::RUNTIME;
1292 1288
1293 return unless $self->dirty; 1289 return unless $self->dirty;
1294 1290
1295 my $save = $self->{path}->save_path; utf8::encode $save; 1291 my $save = $self->{path}->save_path; utf8::encode $save;
1296 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1292 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1297 1293
1298 $self->{load_path} = $save; 1294 $self->{load_path} = $save;
1299 1295
1300 return if $self->{deny_save}; 1296 return if $self->{deny_save};
1297
1298 local $self->{last_access} = $self->last_access;#d#
1301 1299
1302 if ($uniq) { 1300 if ($uniq) {
1303 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1301 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1304 $self->save_objects ($uniq, cf::IO_UNIQUES); 1302 $self->save_objects ($uniq, cf::IO_UNIQUES);
1305 } else { 1303 } else {
… …
1308} 1306}
1309 1307
1310sub swap_out { 1308sub swap_out {
1311 my ($self) = @_; 1309 my ($self) = @_;
1312 1310
1311 # save first because save cedes
1312 $self->save;
1313
1314 my $lock = cf::lock_acquire "map_data:" . $self->path;
1315
1313 return if $self->players; 1316 return if $self->players;
1314 return if $self->in_memory != cf::MAP_IN_MEMORY; 1317 return if $self->in_memory != cf::MAP_IN_MEMORY;
1315 return if $self->{deny_save}; 1318 return if $self->{deny_save};
1316 1319
1317 $self->save;
1318 $self->clear; 1320 $self->clear;
1319 $self->in_memory (cf::MAP_SWAPPED); 1321 $self->in_memory (cf::MAP_SWAPPED);
1320} 1322}
1321 1323
1322sub reset_at { 1324sub reset_at {
… …
1360} 1362}
1361 1363
1362sub reset { 1364sub reset {
1363 my ($self) = @_; 1365 my ($self) = @_;
1364 1366
1367 my $lock = cf::lock_acquire "map_data:" . $self->path;
1368
1365 return if $self->players; 1369 return if $self->players;
1366 return if $self->{path}{user_rel};#d# 1370 return if $self->{path}{user_rel};#d#
1367 1371
1368 warn "resetting map ", $self->path;#d# 1372 warn "resetting map ", $self->path;#d#
1369 1373
… …
1388 1392
1389sub customise_for { 1393sub customise_for {
1390 my ($map, $ob) = @_; 1394 my ($map, $ob) = @_;
1391 1395
1392 if ($map->per_player) { 1396 if ($map->per_player) {
1393 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1397 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1394 } 1398 }
1395 1399
1396 $map 1400 $map
1397} 1401}
1398 1402
1399sub emergency_save { 1403sub emergency_save {
1400 local $cf::FREEZE = 1; 1404 my $freeze_guard = cf::freeze_mainloop;
1401 1405
1402 warn "enter emergency map save\n"; 1406 warn "enter emergency map save\n";
1403 1407
1404 cf::sync_job { 1408 cf::sync_job {
1405 warn "begin emergency map save\n"; 1409 warn "begin emergency map save\n";
… …
1495 my $link_pos = delete $self->{_link_pos}; 1499 my $link_pos = delete $self->{_link_pos};
1496 1500
1497 unless ($map) { 1501 unless ($map) {
1498 # restore original map position 1502 # restore original map position
1499 ($map, $x, $y) = @{ $link_pos || [] }; 1503 ($map, $x, $y) = @{ $link_pos || [] };
1500 $map = cf::map::find_map $map; 1504 $map = cf::map::find $map;
1501 1505
1502 unless ($map) { 1506 unless ($map) {
1503 ($map, $x, $y) = @$EMERGENCY_POSITION; 1507 ($map, $x, $y) = @$EMERGENCY_POSITION;
1504 $map = cf::map::find_map $map 1508 $map = cf::map::find $map
1505 or die "FATAL: cannot load emergency map\n"; 1509 or die "FATAL: cannot load emergency map\n";
1506 } 1510 }
1507 } 1511 }
1508 1512
1509 ($x, $y) = (-1, -1) 1513 ($x, $y) = (-1, -1)
… …
1535 1539
1536 # try to abort aborted map switching on player login :) 1540 # try to abort aborted map switching on player login :)
1537 # should happen only on crashes 1541 # should happen only on crashes
1538 if ($pl->ob->{_link_pos}) { 1542 if ($pl->ob->{_link_pos}) {
1539 $pl->ob->enter_link; 1543 $pl->ob->enter_link;
1540 Coro::async { 1544 Coro::async_pool {
1541 # we need this sleep as the login has a concurrent enter_exit running 1545 # we need this sleep as the login has a concurrent enter_exit running
1542 # and this sleep increases chances of the player not ending up in scorn 1546 # and this sleep increases chances of the player not ending up in scorn
1543 Coro::Timer::sleep 1; 1547 Coro::Timer::sleep 1;
1544 $pl->ob->leave_link; 1548 $pl->ob->leave_link;
1545 }; 1549 };
1546 } 1550 }
1547 }, 1551 },
1548); 1552);
1549 1553
1550=item $player_object->goto_map ($path, $x, $y) 1554=item $player_object->goto ($path, $x, $y)
1551 1555
1552=cut 1556=cut
1553 1557
1554sub cf::object::player::goto_map { 1558sub cf::object::player::goto {
1555 my ($self, $path, $x, $y) = @_; 1559 my ($self, $path, $x, $y) = @_;
1556 1560
1557 $self->enter_link; 1561 $self->enter_link;
1558 1562
1559 (Coro::async { 1563 (Coro::async_pool {
1560 $path = new cf::path $path; 1564 $path = new cf::path $path;
1561 1565
1562 my $map = cf::map::find_map $path->as_string; 1566 my $map = cf::map::find $path->as_string;
1563 $map = $map->customise_for ($self) if $map; 1567 $map = $map->customise_for ($self) if $map;
1564 1568
1565# warn "entering ", $map->path, " at ($x, $y)\n" 1569# warn "entering ", $map->path, " at ($x, $y)\n"
1566# if $map; 1570# if $map;
1567 1571
… …
1626 1630
1627 return unless $self->type == cf::PLAYER; 1631 return unless $self->type == cf::PLAYER;
1628 1632
1629 $self->enter_link; 1633 $self->enter_link;
1630 1634
1631 (Coro::async { 1635 (Coro::async_pool {
1636 $self->deactivate_recursive; # just to be sure
1632 unless (eval { 1637 unless (eval {
1633
1634 prepare_random_map $exit 1638 prepare_random_map $exit
1635 if $exit->slaying eq "/!"; 1639 if $exit->slaying eq "/!";
1636 1640
1637 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1641 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1638 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1642 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1639 1643
1640 1; 1644 1;
1641 }) { 1645 }) {
1642 $self->message ("Something went wrong deep within the crossfire server. " 1646 $self->message ("Something went wrong deep within the crossfire server. "
1643 . "I'll try to bring you back to the map you were before. " 1647 . "I'll try to bring you back to the map you were before. "
… …
1700 on_reply => sub { 1704 on_reply => sub {
1701 my ($ns, $msg) = @_; 1705 my ($ns, $msg) = @_;
1702 1706
1703 # this weird shuffling is so that direct followup queries 1707 # this weird shuffling is so that direct followup queries
1704 # get handled first 1708 # get handled first
1705 my $queue = delete $ns->{query_queue}; 1709 my $queue = delete $ns->{query_queue}
1710 or return; # be conservative, not sure how that can happen, but we saw a crash here
1706 1711
1707 (shift @$queue)->[1]->($msg); 1712 (shift @$queue)->[1]->($msg);
1708 1713
1709 push @{ $ns->{query_queue} }, @$queue; 1714 push @{ $ns->{query_queue} }, @$queue;
1710 1715
… …
1727=cut 1732=cut
1728 1733
1729sub cf::client::coro { 1734sub cf::client::coro {
1730 my ($self, $cb) = @_; 1735 my ($self, $cb) = @_;
1731 1736
1732 my $coro; $coro = async { 1737 my $coro = &Coro::async_pool ($cb);
1733 eval {
1734 $cb->();
1735 };
1736 warn $@ if $@;
1737 };
1738 1738
1739 $coro->on_destroy (sub { 1739 $coro->on_destroy (sub {
1740 delete $self->{_coro}{$coro+0}; 1740 delete $self->{_coro}{$coro+0};
1741 }); 1741 });
1742 1742
… …
1977 open my $fh, "<:utf8", cf::confdir . "/config" 1977 open my $fh, "<:utf8", cf::confdir . "/config"
1978 or return; 1978 or return;
1979 1979
1980 local $/; 1980 local $/;
1981 *CFG = YAML::Syck::Load <$fh>; 1981 *CFG = YAML::Syck::Load <$fh>;
1982
1983 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
1984
1985 if (exists $CFG{mlockall}) {
1986 eval {
1987 $CFG{mlockall} ? &mlockall : &munlockall
1988 and die "WARNING: m(un)lockall failed: $!\n";
1989 };
1990 warn $@ if $@;
1991 }
1982} 1992}
1983 1993
1984sub main { 1994sub main {
1985 # we must not ever block the main coroutine 1995 # we must not ever block the main coroutine
1986 local $Coro::idle = sub { 1996 local $Coro::idle = sub {
… …
2006 return; 2016 return;
2007 } 2017 }
2008 2018
2009 warn "reloading..."; 2019 warn "reloading...";
2010 2020
2011 local $FREEZE = 1; 2021 my $guard = freeze_mainloop;
2012 cf::emergency_save; 2022 cf::emergency_save;
2013 2023
2014 eval { 2024 eval {
2015 # if anything goes wrong in here, we should simply crash as we already saved 2025 # if anything goes wrong in here, we should simply crash as we already saved
2016 2026
… …
2152 reentrant => 0, 2162 reentrant => 0,
2153 prio => 0, 2163 prio => 0,
2154 at => $NEXT_TICK || $TICK, 2164 at => $NEXT_TICK || $TICK,
2155 data => WF_AUTOCANCEL, 2165 data => WF_AUTOCANCEL,
2156 cb => sub { 2166 cb => sub {
2157 unless ($FREEZE) {
2158 cf::server_tick; # one server iteration 2167 cf::server_tick; # one server iteration
2159 $RUNTIME += $TICK; 2168 $RUNTIME += $TICK;
2160 }
2161
2162 $NEXT_TICK += $TICK; 2169 $NEXT_TICK += $TICK;
2163 2170
2164 # if we are delayed by four ticks or more, skip them all 2171 # if we are delayed by four ticks or more, skip them all
2165 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2172 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2166 2173
… …
2189 or warn "ERROR: unable to write runtime file: $!"; 2196 or warn "ERROR: unable to write runtime file: $!";
2190 })->(); 2197 })->();
2191 }, 2198 },
2192); 2199);
2193 2200
2201END { cf::emergency_save }
2202
21941 22031
2195 2204

Diff Legend

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