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.237 by root, Fri Apr 13 05:08:51 2007 UTC vs.
Revision 1.272 by root, Sun Jun 3 15:32:50 2007 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket;
8use Storable; 9use Storable;
9use Event; 10use Event;
10use Opcode; 11use Opcode;
11use Safe; 12use Safe;
12use Safe::Hole; 13use Safe::Hole;
13 14
14use Coro 3.52 (); 15use Coro 3.61 ();
15use Coro::State; 16use Coro::State;
17use Coro::Handle;
16use Coro::Event; 18use Coro::Event;
17use Coro::Timer; 19use Coro::Timer;
18use Coro::Signal; 20use Coro::Signal;
19use Coro::Semaphore; 21use Coro::Semaphore;
20use Coro::AIO; 22use Coro::AIO;
… …
52our %EXT_CORO = (); # coroutines bound to extensions 54our %EXT_CORO = (); # coroutines bound to extensions
53our %EXT_MAP = (); # pluggable maps 55our %EXT_MAP = (); # pluggable maps
54 56
55our $RELOAD; # number of reloads so far 57our $RELOAD; # number of reloads so far
56our @EVENT; 58our @EVENT;
57our $LIBDIR = datadir . "/ext";
58 59
59our $TICK = MAX_TIME * 1e-6; 60our $CONFDIR = confdir;
61our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db";
71
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
60our $TICK_WATCHER; 73our $TICK_WATCHER;
61our $AIO_POLL_WATCHER; 74our $AIO_POLL_WATCHER;
62our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
63our $NEXT_TICK; 76our $NEXT_TICK;
64our $NOW; 77our $NOW;
… …
73our $RUNTIME; 86our $RUNTIME;
74 87
75our %PLAYER; # all users 88our %PLAYER; # all users
76our %MAP; # all maps 89our %MAP; # all maps
77our $LINK_MAP; # the special {link} map, which is always available 90our $LINK_MAP; # the special {link} map, which is always available
78our $RANDOM_MAPS = cf::localdir . "/random";
79our $BDB_ENV_DIR = cf::localdir . "/db";
80
81our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
82our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
83 91
84# used to convert map paths into valid unix filenames by replacing / by ∕ 92# used to convert map paths into valid unix filenames by replacing / by ∕
85our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
86 94
95our $LOAD; # a number between 0 (idle) and 1 (too many objects)
96our $LOADAVG; # same thing, but with alpha-smoothing
97our $tick_start; # for load detecting purposes
98
87binmode STDOUT; 99binmode STDOUT;
88binmode STDERR; 100binmode STDERR;
89 101
90# read virtual server time, if available 102# read virtual server time, if available
91unless ($RUNTIME || !-e cf::localdir . "/runtime") { 103unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
92 open my $fh, "<", cf::localdir . "/runtime" 104 open my $fh, "<", "$LOCALDIR/runtime"
93 or die "unable to read runtime file: $!"; 105 or die "unable to read runtime file: $!";
94 $RUNTIME = <$fh> + 0.; 106 $RUNTIME = <$fh> + 0.;
95} 107}
96 108
97mkdir cf::localdir; 109mkdir $_
98mkdir cf::localdir . "/" . cf::playerdir; 110 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
99mkdir cf::localdir . "/" . cf::tmpdir;
100mkdir cf::localdir . "/" . cf::uniquedir;
101mkdir $RANDOM_MAPS;
102mkdir $BDB_ENV_DIR;
103 111
104our $EMERGENCY_POSITION; 112our $EMERGENCY_POSITION;
105 113
106sub cf::map::normalise; 114sub cf::map::normalise;
107 115
… …
118=item $cf::RUNTIME 126=item $cf::RUNTIME
119 127
120The time this server has run, starts at 0 and is increased by $cf::TICK on 128The time this server has run, starts at 0 and is increased by $cf::TICK on
121every server tick. 129every server tick.
122 130
123=item $cf::LIBDIR 131=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
132$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
133$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
124 134
125The perl library directory, where extensions and cf-specific modules can 135Various directories - "/etc", read-only install directory, perl-library
126be found. It will be added to C<@INC> automatically. 136directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
137unique-items directory, player file directory, random maps directory and
138database environment.
127 139
128=item $cf::NOW 140=item $cf::NOW
129 141
130The time of the last (current) server tick. 142The time of the last (current) server tick.
131 143
132=item $cf::TICK 144=item $cf::TICK
133 145
134The interval between server ticks, in seconds. 146The interval between server ticks, in seconds.
147
148=item $cf::LOADAVG
149
150The current CPU load on the server (alpha-smoothed), as a value between 0
151(none) and 1 (overloaded), indicating how much time is spent on processing
152objects per tick. Healthy values are < 0.5.
153
154=item $cf::LOAD
155
156The raw value load value from the last tick.
135 157
136=item %cf::CFG 158=item %cf::CFG
137 159
138Configuration for the server, loaded from C</etc/crossfire/config>, or 160Configuration for the server, loaded from C</etc/crossfire/config>, or
139from wherever your confdir points to. 161from wherever your confdir points to.
140 162
141=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 163=item cf::wait_for_tick, cf::wait_for_tick_begin
142 164
143These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
144or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 166returns directly I<after> the tick processing (and consequently, can only wake one process
145processing has been done. Call C<< ->wait >> on them to maximise the 167per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
146window of cpu time available, or simply to synchronise to the server tick.
147 168
148=back 169=back
149 170
150=cut 171=cut
151 172
152BEGIN { 173BEGIN {
153 *CORE::GLOBAL::warn = sub { 174 *CORE::GLOBAL::warn = sub {
154 my $msg = join "", @_; 175 my $msg = join "", @_;
155 utf8::encode $msg;
156 176
157 $msg .= "\n" 177 $msg .= "\n"
158 unless $msg =~ /\n$/; 178 unless $msg =~ /\n$/;
159 179
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181
182 utf8::encode $msg;
160 LOG llevError, $msg; 183 LOG llevError, $msg;
161 }; 184 };
162} 185}
163 186
164@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
… …
234returned. 257returned.
235 258
236Lock names should begin with a unique identifier (for example, cf::map::find 259Lock names should begin with a unique identifier (for example, cf::map::find
237uses map_find and cf::map::load uses map_load). 260uses map_find and cf::map::load uses map_load).
238 261
262=item $locked = cf::lock_active $string
263
264Return true if the lock is currently active, i.e. somebody has locked it.
265
239=cut 266=cut
240 267
241our %LOCK; 268our %LOCK;
242 269
243sub lock_wait($) { 270sub lock_wait($) {
… …
260 287
261 Coro::guard { 288 Coro::guard {
262 # wake up all waiters, to be on the safe side 289 # wake up all waiters, to be on the safe side
263 $_->ready for @{ delete $LOCK{$key} }; 290 $_->ready for @{ delete $LOCK{$key} };
264 } 291 }
292}
293
294sub lock_active($) {
295 my ($key) = @_;
296
297 ! ! $LOCK{$key}
265} 298}
266 299
267sub freeze_mainloop { 300sub freeze_mainloop {
268 return unless $TICK_WATCHER->is_active; 301 return unless $TICK_WATCHER->is_active;
269 302
… …
299 332
300sub sync_job(&) { 333sub sync_job(&) {
301 my ($job) = @_; 334 my ($job) = @_;
302 335
303 if ($Coro::current == $Coro::main) { 336 if ($Coro::current == $Coro::main) {
337 my $time = Event::time;
338
304 # this is the main coro, too bad, we have to block 339 # this is the main coro, too bad, we have to block
305 # till the operation succeeds, freezing the server :/ 340 # till the operation succeeds, freezing the server :/
306 341
307 # TODO: use suspend/resume instead 342 # TODO: use suspend/resume instead
308 # (but this is cancel-safe) 343 # (but this is cancel-safe)
… …
319 354
320 while ($busy) { 355 while ($busy) {
321 Coro::cede or Event::one_event; 356 Coro::cede or Event::one_event;
322 } 357 }
323 358
359 $time = Event::time - $time;
360
361 LOG llevError | logBacktrace, Carp::longmess "long sync job"
362 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
363
364 $tick_start += $time; # do not account sync jobs to server load
365
324 wantarray ? @res : $res[0] 366 wantarray ? @res : $res[0]
325 } else { 367 } else {
326 # we are in another coroutine, how wonderful, everything just works 368 # we are in another coroutine, how wonderful, everything just works
327 369
328 $job->() 370 $job->()
… …
348 390
349 $coro 391 $coro
350} 392}
351 393
352sub write_runtime { 394sub write_runtime {
395 my $runtime = "$LOCALDIR/runtime";
396
397 # first touch the runtime file to show we are still running:
398 # the fsync below can take a very very long time.
399
400 IO::AIO::aio_utime $runtime, undef, undef;
401
353 my $guard = cf::lock_acquire "write_runtime"; 402 my $guard = cf::lock_acquire "write_runtime";
354
355 my $runtime = cf::localdir . "/runtime";
356 403
357 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 404 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
358 or return; 405 or return;
359 406
360 my $value = $cf::RUNTIME + 90 + 10; 407 my $value = $cf::RUNTIME + 90 + 10;
… …
366 413
367 # always fsync - this file is important 414 # always fsync - this file is important
368 aio_fsync $fh 415 aio_fsync $fh
369 and return; 416 and return;
370 417
418 # touch it again to show we are up-to-date
419 aio_utime $fh, undef, undef;
420
371 close $fh 421 close $fh
372 or return; 422 or return;
373 423
374 aio_rename "$runtime~", $runtime 424 aio_rename "$runtime~", $runtime
375 and return; 425 and return;
426
427 warn "runtime file written.\n";#d#
376 428
377 1 429 1
378} 430}
379 431
380=item cf::datalog type => key => value, ... 432=item cf::datalog type => key => value, ...
… …
573 $registry = $CB_TYPE[$object_type] ||= []; 625 $registry = $CB_TYPE[$object_type] ||= [];
574 626
575 } elsif ($type eq "subtype") { 627 } elsif ($type eq "subtype") {
576 defined $object_type or Carp::croak "subtype specified without type"; 628 defined $object_type or Carp::croak "subtype specified without type";
577 my $object_subtype = shift @arg; 629 my $object_subtype = shift @arg;
578 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 630 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
579 631
580 } elsif ($type eq "package") { 632 } elsif ($type eq "package") {
581 my $pkg = shift @arg; 633 my $pkg = shift @arg;
582 634
583 while (my ($name, $id) = each %cb_id) { 635 while (my ($name, $id) = each %cb_id) {
… …
624 if (ref $_[0]) { 676 if (ref $_[0]) {
625 _object_attach @_; 677 _object_attach @_;
626 } else { 678 } else {
627 _attach shift->_attach_registry, @_; 679 _attach shift->_attach_registry, @_;
628 } 680 }
681 _recalc_want;
629}; 682};
630 683
631# all those should be optimised 684# all those should be optimised
632sub cf::attachable::detach { 685sub cf::attachable::detach {
633 my ($obj, $name) = @_; 686 my ($obj, $name) = @_;
… …
636 delete $obj->{_attachment}{$name}; 689 delete $obj->{_attachment}{$name};
637 reattach ($obj); 690 reattach ($obj);
638 } else { 691 } else {
639 Carp::croak "cannot, currently, detach class attachments"; 692 Carp::croak "cannot, currently, detach class attachments";
640 } 693 }
694 _recalc_want;
641}; 695};
642 696
643sub cf::attachable::attached { 697sub cf::attachable::attached {
644 my ($obj, $name) = @_; 698 my ($obj, $name) = @_;
645 699
… …
955Returns the given player object, loading it if necessary (might block). 1009Returns the given player object, loading it if necessary (might block).
956 1010
957=cut 1011=cut
958 1012
959sub playerdir($) { 1013sub playerdir($) {
960 cf::localdir 1014 "$PLAYERDIR/"
961 . "/"
962 . cf::playerdir
963 . "/"
964 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1015 . (ref $_[0] ? $_[0]->ob->name : $_[0])
965} 1016}
966 1017
967sub path($) { 1018sub path($) {
968 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1019 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
… …
1088while and may block, so not sync_job-capable, ever. 1139while and may block, so not sync_job-capable, ever.
1089 1140
1090=cut 1141=cut
1091 1142
1092sub list_logins { 1143sub list_logins {
1093 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1144 my $dirs = aio_readdir $PLAYERDIR
1094 or return []; 1145 or return [];
1095 1146
1096 my @logins; 1147 my @logins;
1097 1148
1098 for my $login (@$dirs) { 1149 for my $login (@$dirs) {
… …
1159 my ($self, $type, %msg) = @_; 1210 my ($self, $type, %msg) = @_;
1160 1211
1161 $self->ns->ext_event ($type, %msg); 1212 $self->ns->ext_event ($type, %msg);
1162} 1213}
1163 1214
1164package cf; 1215=head3 cf::region
1216
1217=over 4
1218
1219=cut
1220
1221package cf::region;
1222
1223=item cf::region::find_by_path $path
1224
1225Tries to decuce the probable region for a map knowing only its path.
1226
1227=cut
1228
1229sub find_by_path($) {
1230 my ($path) = @_;
1231
1232 my ($match, $specificity);
1233
1234 for my $region (list) {
1235 if ($region->match && $path =~ $region->match) {
1236 ($match, $specificity) = ($region, $region->specificity)
1237 if $region->specificity > $specificity;
1238 }
1239 }
1240
1241 $match
1242}
1165 1243
1166=back 1244=back
1167
1168 1245
1169=head3 cf::map 1246=head3 cf::map
1170 1247
1171=over 4 1248=over 4
1172 1249
… …
1310 1387
1311# the original (read-only) location 1388# the original (read-only) location
1312sub load_path { 1389sub load_path {
1313 my ($self) = @_; 1390 my ($self) = @_;
1314 1391
1315 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1392 "$MAPDIR/$self->{path}.map"
1316} 1393}
1317 1394
1318# the temporary/swap location 1395# the temporary/swap location
1319sub save_path { 1396sub save_path {
1320 my ($self) = @_; 1397 my ($self) = @_;
1321 1398
1322 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1399 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1323 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1400 "$TMPDIR/$path.map"
1324} 1401}
1325 1402
1326# the unique path, undef == no special unique path 1403# the unique path, undef == no special unique path
1327sub uniq_path { 1404sub uniq_path {
1328 my ($self) = @_; 1405 my ($self) = @_;
1329 1406
1330 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1407 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1331 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1408 "$UNIQUEDIR/$path"
1332} 1409}
1333 1410
1334# and all this just because we cannot iterate over 1411# and all this just because we cannot iterate over
1335# all maps in C++... 1412# all maps in C++...
1336sub change_all_map_light { 1413sub change_all_map_light {
… …
1403 $self->load_header_orig 1480 $self->load_header_orig
1404 or return; 1481 or return;
1405 $self->prepare_orig; 1482 $self->prepare_orig;
1406 } 1483 }
1407 1484
1485 $self->default_region (cf::region::find_by_path $self->{path})
1486 unless $self->default_region;
1487
1408 1 1488 1
1409} 1489}
1410 1490
1411sub find; 1491sub find;
1412sub find { 1492sub find {
… …
1445 my ($self) = @_; 1525 my ($self) = @_;
1446 1526
1447 local $self->{deny_reset} = 1; # loading can take a long time 1527 local $self->{deny_reset} = 1; # loading can take a long time
1448 1528
1449 my $path = $self->{path}; 1529 my $path = $self->{path};
1530
1531 {
1450 my $guard = cf::lock_acquire "map_load:$path"; 1532 my $guard = cf::lock_acquire "map_load:$path";
1451 1533
1452 return if $self->in_memory != cf::MAP_SWAPPED; 1534 return if $self->in_memory != cf::MAP_SWAPPED;
1453 1535
1454 $self->in_memory (cf::MAP_LOADING); 1536 $self->in_memory (cf::MAP_LOADING);
1455 1537
1456 $self->alloc; 1538 $self->alloc;
1457 1539
1458 $self->pre_load; 1540 $self->pre_load;
1459
1460 $self->_load_objects ($self->{load_path}, 1)
1461 or return;
1462
1463 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1464 if delete $self->{load_original};
1465
1466 if (my $uniq = $self->uniq_path) {
1467 utf8::encode $uniq;
1468 if (aio_open $uniq, O_RDONLY, 0) {
1469 $self->clear_unique_items;
1470 $self->_load_objects ($uniq, 0);
1471 }
1472 }
1473
1474 Coro::cede;
1475
1476 # now do the right thing for maps
1477 $self->link_multipart_objects;
1478
1479 unless ($self->{deny_activate}) {
1480 $self->decay_objects;
1481 $self->fix_auto_apply;
1482 $self->update_buttons;
1483 Coro::cede; 1541 Coro::cede;
1484 $self->set_darkness_map; 1542
1543 $self->_load_objects ($self->{load_path}, 1)
1544 or return;
1545
1546 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1547 if delete $self->{load_original};
1548
1549 if (my $uniq = $self->uniq_path) {
1550 utf8::encode $uniq;
1551 if (aio_open $uniq, O_RDONLY, 0) {
1552 $self->clear_unique_items;
1553 $self->_load_objects ($uniq, 0);
1554 }
1555 }
1556
1557 Coro::cede;
1558 # now do the right thing for maps
1559 $self->link_multipart_objects;
1485 $self->difficulty ($self->estimate_difficulty) 1560 $self->difficulty ($self->estimate_difficulty)
1486 unless $self->difficulty; 1561 unless $self->difficulty;
1487 Coro::cede; 1562 Coro::cede;
1563
1564 unless ($self->{deny_activate}) {
1565 $self->decay_objects;
1566 $self->fix_auto_apply;
1567 $self->update_buttons;
1568 Coro::cede;
1569 $self->set_darkness_map;
1570 Coro::cede;
1488 $self->activate; 1571 $self->activate;
1572 }
1573
1574 $self->in_memory (cf::MAP_IN_MEMORY);
1489 } 1575 }
1490 1576
1491 $self->post_load; 1577 $self->post_load;
1492
1493 $self->in_memory (cf::MAP_IN_MEMORY);
1494} 1578}
1495 1579
1496sub customise_for { 1580sub customise_for {
1497 my ($self, $ob) = @_; 1581 my ($self, $ob) = @_;
1498 1582
… …
1689instantiated unique items. May block. 1773instantiated unique items. May block.
1690 1774
1691=cut 1775=cut
1692 1776
1693sub unique_maps() { 1777sub unique_maps() {
1694 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 1778 my $files = aio_readdir $UNIQUEDIR
1695 or return; 1779 or return;
1696 1780
1697 my @paths; 1781 my @paths;
1698 1782
1699 for (@$files) { 1783 for (@$files) {
… …
1818 $self->deactivate_recursive; 1902 $self->deactivate_recursive;
1819 1903
1820 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1904 return if UNIVERSAL::isa $self->map, "ext::map_link";
1821 1905
1822 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1906 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1823 if $self->map; 1907 if $self->map && $self->map->{path} ne "{link}";
1824 1908
1825 $self->enter_map ($LINK_MAP || link_map, 10, 10); 1909 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1826} 1910}
1827 1911
1828sub cf::object::player::leave_link { 1912sub cf::object::player::leave_link {
1829 my ($self, $map, $x, $y) = @_; 1913 my ($self, $map, $x, $y) = @_;
1914
1915 return unless $self->contr->active;
1830 1916
1831 my $link_pos = delete $self->{_link_pos}; 1917 my $link_pos = delete $self->{_link_pos};
1832 1918
1833 unless ($map) { 1919 unless ($map) {
1834 # restore original map position 1920 # restore original map position
… …
1857 1943
1858 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 1944 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1859 $self->enter_map ($map, $x, $y); 1945 $self->enter_map ($map, $x, $y);
1860} 1946}
1861 1947
1862cf::player->attach (
1863 on_logout => sub {
1864 my ($pl) = @_;
1865
1866 # abort map switching before logout
1867 if ($pl->ob->{_link_pos}) {
1868 cf::sync_job {
1869 $pl->ob->leave_link
1870 };
1871 }
1872 },
1873 on_login => sub {
1874 my ($pl) = @_;
1875
1876 # try to abort aborted map switching on player login :)
1877 # should happen only on crashes
1878 if ($pl->ob->{_link_pos}) {
1879 $pl->ob->enter_link;
1880 (async {
1881 $pl->ob->reply (undef,
1882 "There was an internal problem at your last logout, "
1883 . "the server will try to bring you to your intended destination in a second.",
1884 cf::NDI_RED);
1885 # we need this sleep as the login has a concurrent enter_exit running
1886 # and this sleep increases chances of the player not ending up in scorn
1887 Coro::Timer::sleep 1;
1888 $pl->ob->leave_link;
1889 })->prio (2);
1890 }
1891 },
1892);
1893
1894=item $player_object->goto ($path, $x, $y) 1948=item $player_object->goto ($path, $x, $y[, $check->($map)])
1895 1949
1950Moves the player to the given map-path and coordinates by first freezing
1951her, loading and preparing them map, calling the provided $check callback
1952that has to return the map if sucecssful, and then unfreezes the player on
1953the new (success) or old (failed) map position.
1954
1896=cut 1955=cut
1956
1957our $GOTOGEN;
1897 1958
1898sub cf::object::player::goto { 1959sub cf::object::player::goto {
1899 my ($self, $path, $x, $y) = @_; 1960 my ($self, $path, $x, $y, $check) = @_;
1961
1962 # do generation counting so two concurrent goto's will be executed in-order
1963 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1900 1964
1901 $self->enter_link; 1965 $self->enter_link;
1902 1966
1903 (async { 1967 (async {
1904 my $map = eval { 1968 my $map = eval {
1905 my $map = cf::map::find $path; 1969 my $map = cf::map::find $path;
1970
1971 if ($map) {
1906 $map = $map->customise_for ($self) if $map; 1972 $map = $map->customise_for ($self);
1973 $map = $check->($map) if $check && $map;
1974 } else {
1975 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1976 }
1977
1907 $map 1978 $map
1979 };
1980
1981 if ($@) {
1982 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
1983 LOG llevError | logBacktrace, Carp::longmess $@;
1908 } or 1984 }
1909 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1910 1985
1986 if ($gen == $self->{_goto_generation}) {
1987 delete $self->{_goto_generation};
1911 $self->leave_link ($map, $x, $y); 1988 $self->leave_link ($map, $x, $y);
1989 }
1912 })->prio (1); 1990 })->prio (1);
1913} 1991}
1914 1992
1915=item $player_object->enter_exit ($exit_object) 1993=item $player_object->enter_exit ($exit_object)
1916 1994
… …
1955 2033
1956 $rmp->{random_seed} ||= $exit->random_seed; 2034 $rmp->{random_seed} ||= $exit->random_seed;
1957 2035
1958 my $data = cf::to_json $rmp; 2036 my $data = cf::to_json $rmp;
1959 my $md5 = Digest::MD5::md5_hex $data; 2037 my $md5 = Digest::MD5::md5_hex $data;
1960 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2038 my $meta = "$RANDOMDIR/$md5.meta";
1961 2039
1962 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2040 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1963 aio_write $fh, 0, (length $data), $data, 0; 2041 aio_write $fh, 0, (length $data), $data, 0;
1964 undef $fh; 2042 undef $fh;
1965 aio_rename "$meta~", $meta; 2043 aio_rename "$meta~", $meta;
… …
2234############################################################################# 2312#############################################################################
2235 2313
2236=head2 EXTENSION DATABASE SUPPORT 2314=head2 EXTENSION DATABASE SUPPORT
2237 2315
2238Crossfire maintains a very simple database for extension use. It can 2316Crossfire maintains a very simple database for extension use. It can
2239currently store anything that can be serialised using Storable, which 2317currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2240excludes objects. 2318convert to/from binary).
2241 2319
2242The parameter C<$family> should best start with the name of the extension 2320The parameter C<$family> should best start with the name of the extension
2243using it, it should be unique. 2321using it, it should be unique.
2244 2322
2245=over 4 2323=over 4
… …
2268 BDB::CREATE | BDB::AUTO_COMMIT, 0666; 2346 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2269 cf::cleanup "db_open(db): $!" if $!; 2347 cf::cleanup "db_open(db): $!" if $!;
2270 }; 2348 };
2271 cf::cleanup "db_open(db): $@" if $@; 2349 cf::cleanup "db_open(db): $@" if $@;
2272 }; 2350 };
2273
2274 my $path = cf::localdir . "/database.pst";
2275 if (stat $path) {
2276 cf::sync_job {
2277 my $pst = Storable::retrieve $path;
2278
2279 cf::db_put (board => data => $pst->{board});
2280 cf::db_put (guildrules => data => $pst->{guildrules});
2281 cf::db_put (rent => balance => $pst->{rent}{balance});
2282 BDB::db_env_txn_checkpoint $DB_ENV;
2283
2284 unlink $path;
2285 };
2286 }
2287 } 2351 }
2288} 2352}
2289 2353
2290sub db_get($$) { 2354sub db_get($$) {
2291 my $key = "$_[0]/$_[1]"; 2355 my $key = "$_[0]/$_[1]";
2292 2356
2293 cf::sync_job { 2357 cf::sync_job {
2294 BDB::db_get $DB, undef, $key, my $data; 2358 BDB::db_get $DB, undef, $key, my $data;
2295 2359
2296 $! ? () 2360 $! ? ()
2297 : Compress::LZF::sthaw $data 2361 : $data
2298 } 2362 }
2299} 2363}
2300 2364
2301sub db_put($$$) { 2365sub db_put($$$) {
2302 BDB::dbreq_pri 4; 2366 BDB::dbreq_pri 4;
2303 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { }; 2367 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2368}
2369
2370=item cf::cache $id => [$paths...], $processversion => $process
2371
2372Generic caching function that returns the value of the resource $id,
2373caching and regenerating as required.
2374
2375This function can block.
2376
2377=cut
2378
2379sub cache {
2380 my ($id, $src, $processversion, $process) = @_;
2381
2382 my $meta =
2383 join "\x00",
2384 $processversion,
2385 map {
2386 aio_stat $_
2387 and Carp::croak "$_: $!";
2388
2389 ($_, (stat _)[7,9])
2390 } @$src;
2391
2392 my $dbmeta = db_get cache => "$id/meta";
2393 if ($dbmeta ne $meta) {
2394 # changed, we may need to process
2395
2396 my @data;
2397 my $md5;
2398
2399 for (0 .. $#$src) {
2400 0 <= aio_load $src->[$_], $data[$_]
2401 or Carp::croak "$src->[$_]: $!";
2402 }
2403
2404 # if processing is expensive, check
2405 # checksum first
2406 if (1) {
2407 $md5 =
2408 join "\x00",
2409 $processversion,
2410 map {
2411 Coro::cede;
2412 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2413 } 0.. $#$src;
2414
2415
2416 my $dbmd5 = db_get cache => "$id/md5";
2417 if ($dbmd5 eq $md5) {
2418 db_put cache => "$id/meta", $meta;
2419
2420 return db_get cache => "$id/data";
2421 }
2422 }
2423
2424 my $t1 = Time::HiRes::time;
2425 my $data = $process->(\@data);
2426 my $t2 = Time::HiRes::time;
2427
2428 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2429
2430 db_put cache => "$id/data", $data;
2431 db_put cache => "$id/md5" , $md5;
2432 db_put cache => "$id/meta", $meta;
2433
2434 return $data;
2435 }
2436
2437 db_get cache => "$id/data"
2438}
2439
2440=item fork_call { }, $args
2441
2442Executes the given code block with the given arguments in a seperate
2443process, returning the results. Everything must be serialisable with
2444Coro::Storable. May, of course, block. Note that the executed sub may
2445never block itself or use any form of Event handling.
2446
2447=cut
2448
2449sub fork_call(&@) {
2450 my ($cb, @args) = @_;
2451
2452# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2453# or die "socketpair: $!";
2454 pipe my $fh1, my $fh2
2455 or die "pipe: $!";
2456
2457 if (my $pid = fork) {
2458 close $fh2;
2459
2460 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2461 $res = Coro::Storable::thaw $res;
2462
2463 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2464
2465 die $$res unless "ARRAY" eq ref $res;
2466
2467 return wantarray ? @$res : $res->[-1];
2468 } else {
2469 reset_signals;
2470 local $SIG{__WARN__};
2471 local $SIG{__DIE__};
2472 eval {
2473 close $fh1;
2474
2475 my @res = eval { $cb->(@args) };
2476 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2477 };
2478
2479 warn $@ if $@;
2480 _exit 0;
2481 }
2304} 2482}
2305 2483
2306############################################################################# 2484#############################################################################
2307# the server's init and main functions 2485# the server's init and main functions
2308 2486
2309sub load_facedata { 2487sub load_facedata($) {
2310 my $path = sprintf "%s/facedata", cf::datadir; 2488 my ($path) = @_;
2311 2489
2312 warn "loading facedata from $path\n"; 2490 warn "loading facedata from $path\n";
2313 2491
2314 my $facedata; 2492 my $facedata;
2315 0 < aio_load $path, $facedata 2493 0 < aio_load $path, $facedata
… …
2323 { 2501 {
2324 my $faces = $facedata->{faceinfo}; 2502 my $faces = $facedata->{faceinfo};
2325 2503
2326 while (my ($face, $info) = each %$faces) { 2504 while (my ($face, $info) = each %$faces) {
2327 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2505 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2506 warn "$face $info->{magicmap}\n" if $face =~ /obol/;#d#
2328 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2507 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2329 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2508 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2330 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2509 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2331 Coro::cede; 2510 Coro::cede;
2332 } 2511 }
… …
2356 } 2535 }
2357 2536
2358 1 2537 1
2359} 2538}
2360 2539
2540sub reload_regions {
2541 load_resource_file "$MAPDIR/regions"
2542 or die "unable to load regions file\n";
2543}
2544
2545sub reload_facedata {
2546 load_facedata "$DATADIR/facedata"
2547 or die "unable to load facedata\n";
2548}
2549
2550sub reload_archetypes {
2551 load_resource_file "$DATADIR/archetypes"
2552 or die "unable to load archetypes\n";
2553}
2554
2555sub reload_treasures {
2556 load_resource_file "$DATADIR/treasures"
2557 or die "unable to load treasurelists\n";
2558}
2559
2361sub reload_resources { 2560sub reload_resources {
2362 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2561 warn "reloading resource files...\n";
2363 or die "unable to load regions file\n";#d# 2562
2563 reload_regions;
2364 load_facedata 2564 reload_facedata;
2365 or die "unable to load facedata\n";#d# 2565 reload_archetypes;
2566 reload_treasures;
2567
2568 warn "finished reloading resource files\n";
2366} 2569}
2367 2570
2368sub init { 2571sub init {
2369 reload_resources; 2572 reload_resources;
2370} 2573}
2371 2574
2372sub cfg_load { 2575sub cfg_load {
2373 open my $fh, "<:utf8", cf::confdir . "/config" 2576 open my $fh, "<:utf8", "$CONFDIR/config"
2374 or return; 2577 or return;
2375 2578
2376 local $/; 2579 local $/;
2377 *CFG = YAML::Syck::Load <$fh>; 2580 *CFG = YAML::Syck::Load <$fh>;
2378 2581
… …
2463 2666
2464 warn Carp::longmess "post_cleanup backtrace" 2667 warn Carp::longmess "post_cleanup backtrace"
2465 if $make_core; 2668 if $make_core;
2466} 2669}
2467 2670
2468sub reload() { 2671sub do_reload_perl() {
2469 # can/must only be called in main 2672 # can/must only be called in main
2470 if ($Coro::current != $Coro::main) { 2673 if ($Coro::current != $Coro::main) {
2471 warn "can only reload from main coroutine"; 2674 warn "can only reload from main coroutine";
2472 return; 2675 return;
2473 } 2676 }
… …
2548 Symbol::delete_package "safe::$_" 2751 Symbol::delete_package "safe::$_"
2549 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2752 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2550 2753
2551 warn "unloading cf.pm \"a bit\""; 2754 warn "unloading cf.pm \"a bit\"";
2552 delete $INC{"cf.pm"}; 2755 delete $INC{"cf.pm"};
2756 delete $INC{"cf/pod.pm"};
2553 2757
2554 # don't, removes xs symbols, too, 2758 # don't, removes xs symbols, too,
2555 # and global variables created in xs 2759 # and global variables created in xs
2556 #Symbol::delete_package __PACKAGE__; 2760 #Symbol::delete_package __PACKAGE__;
2557 2761
… …
2572 warn "reattaching attachments to maps"; 2776 warn "reattaching attachments to maps";
2573 reattach $_ for values %MAP; 2777 reattach $_ for values %MAP;
2574 warn "reattaching attachments to players"; 2778 warn "reattaching attachments to players";
2575 reattach $_ for values %PLAYER; 2779 reattach $_ for values %PLAYER;
2576 2780
2577 warn "loading reloadable resources";
2578 reload_resources;
2579
2580 warn "leaving sync_job"; 2781 warn "leaving sync_job";
2581 2782
2582 1 2783 1
2583 } or do { 2784 } or do {
2584 warn $@; 2785 warn $@;
… …
2589 warn "reloaded"; 2790 warn "reloaded";
2590}; 2791};
2591 2792
2592our $RELOAD_WATCHER; # used only during reload 2793our $RELOAD_WATCHER; # used only during reload
2593 2794
2795sub reload_perl() {
2796 # doing reload synchronously and two reloads happen back-to-back,
2797 # coro crashes during coro_state_free->destroy here.
2798
2799 $RELOAD_WATCHER ||= Event->timer (
2800 reentrant => 0,
2801 after => 0,
2802 data => WF_AUTOCANCEL,
2803 cb => sub {
2804 do_reload_perl;
2805 undef $RELOAD_WATCHER;
2806 },
2807 );
2808}
2809
2594register_command "reload" => sub { 2810register_command "reload" => sub {
2595 my ($who, $arg) = @_; 2811 my ($who, $arg) = @_;
2596 2812
2597 if ($who->flag (FLAG_WIZ)) { 2813 if ($who->flag (FLAG_WIZ)) {
2598 $who->message ("reloading server."); 2814 $who->message ("reloading server.");
2599 2815 async { reload_perl };
2600 # doing reload synchronously and two reloads happen back-to-back,
2601 # coro crashes during coro_state_free->destroy here.
2602
2603 $RELOAD_WATCHER ||= Event->timer (
2604 reentrant => 0,
2605 after => 0,
2606 data => WF_AUTOCANCEL,
2607 cb => sub {
2608 reload;
2609 undef $RELOAD_WATCHER;
2610 },
2611 );
2612 } 2816 }
2613}; 2817};
2614 2818
2615unshift @INC, $LIBDIR; 2819unshift @INC, $LIBDIR;
2616 2820
2617my $bug_warning = 0; 2821my $bug_warning = 0;
2618 2822
2823our @WAIT_FOR_TICK;
2824our @WAIT_FOR_TICK_BEGIN;
2825
2826sub wait_for_tick {
2827 return unless $TICK_WATCHER->is_active;
2828 return if $Coro::current == $Coro::main;
2829
2830 my $signal = new Coro::Signal;
2831 push @WAIT_FOR_TICK, $signal;
2832 $signal->wait;
2833}
2834
2835sub wait_for_tick_begin {
2836 return unless $TICK_WATCHER->is_active;
2837 return if $Coro::current == $Coro::main;
2838
2839 my $signal = new Coro::Signal;
2840 push @WAIT_FOR_TICK_BEGIN, $signal;
2841 $signal->wait;
2842}
2843
2844 my $min = 1e6;#d#
2845 my $avg = 10;
2619$TICK_WATCHER = Event->timer ( 2846$TICK_WATCHER = Event->timer (
2620 reentrant => 0, 2847 reentrant => 0,
2621 parked => 1, 2848 parked => 1,
2622 prio => 0, 2849 prio => 0,
2623 at => $NEXT_TICK || $TICK, 2850 at => $NEXT_TICK || $TICK,
… …
2627 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 2854 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2628 unless ++$bug_warning > 10; 2855 unless ++$bug_warning > 10;
2629 return; 2856 return;
2630 } 2857 }
2631 2858
2632 $NOW = Event::time; 2859 $NOW = $tick_start = Event::time;
2633 2860
2634 cf::server_tick; # one server iteration 2861 cf::server_tick; # one server iteration
2862
2863 0 && sync_job {#d#
2864 for(1..10) {
2865 my $t = Event::time;
2866 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2867 or die;
2868
2869 $map->width (50);
2870 $map->height (50);
2871 $map->alloc;
2872 $map->_load_objects ("/tmp/x.map", 1);
2873 my $t = Event::time - $t;
2874
2875 #next unless $t < 0.0013;#d#
2876 if ($t < $min) {
2877 $min = $t;
2878 }
2879 $avg = $avg * 0.99 + $t * 0.01;
2880 }
2881 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2882 exit 0;
2883 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2884 };
2885
2635 $RUNTIME += $TICK; 2886 $RUNTIME += $TICK;
2636 $NEXT_TICK += $TICK; 2887 $NEXT_TICK += $TICK;
2637 2888
2638 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2889 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2639 $NEXT_RUNTIME_WRITE = $NOW + 10; 2890 $NEXT_RUNTIME_WRITE = $NOW + 10;
… …
2641 write_runtime 2892 write_runtime
2642 or warn "ERROR: unable to write runtime file: $!"; 2893 or warn "ERROR: unable to write runtime file: $!";
2643 }; 2894 };
2644 } 2895 }
2645 2896
2646 $WAIT_FOR_TICK->broadcast;
2647 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2648
2649# my $AFTER = Event::time; 2897# my $AFTER = Event::time;
2650# warn $AFTER - $NOW;#d# 2898# warn $AFTER - $NOW;#d#
2651 2899
2900 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2901 $sig->send;
2902 }
2903 while (my $sig = shift @WAIT_FOR_TICK) {
2904 $sig->send;
2905 }
2906
2907 $NOW = Event::time;
2908
2652 # if we are delayed by four ticks or more, skip them all 2909 # if we are delayed by four ticks or more, skip them all
2653 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2910 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2654 2911
2655 $TICK_WATCHER->at ($NEXT_TICK); 2912 $TICK_WATCHER->at ($NEXT_TICK);
2656 $TICK_WATCHER->start; 2913 $TICK_WATCHER->start;
2914
2915 $LOAD = ($NOW - $tick_start) / $TICK;
2916 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2917
2918 _post_tick;
2919
2920
2657 }, 2921 },
2658); 2922);
2659 2923
2660{ 2924{
2661 BDB::max_poll_time $TICK * 0.1; 2925 BDB::max_poll_time $TICK * 0.1;
… …
2689 2953
2690 cf::sync_job { 2954 cf::sync_job {
2691 eval { 2955 eval {
2692 BDB::db_env_open 2956 BDB::db_env_open
2693 $DB_ENV, 2957 $DB_ENV,
2694 $BDB_ENV_DIR, 2958 $BDBDIR,
2695 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 2959 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2696 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 2960 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2697 0666; 2961 0666;
2698 2962
2699 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 2963 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2700 2964
2701 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 2965 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2702 $DB_ENV->set_lk_detect; 2966 $DB_ENV->set_lk_detect;
2703 }; 2967 };
2704 2968
… …
2720 prio => 6, 2984 prio => 6,
2721 cb => \&IO::AIO::poll_cb, 2985 cb => \&IO::AIO::poll_cb,
2722 ); 2986 );
2723} 2987}
2724 2988
2989my $_log_backtrace;
2990
2991sub _log_backtrace {
2992 my ($msg, @addr) = @_;
2993
2994 $msg =~ s/\n//;
2995
2996 # limit the # of concurrent backtraces
2997 if ($_log_backtrace < 2) {
2998 ++$_log_backtrace;
2999 async {
3000 my @bt = fork_call {
3001 @addr = map { sprintf "%x", $_ } @addr;
3002 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3003 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3004 or die "addr2line: $!";
3005
3006 my @funcs;
3007 my @res = <$fh>;
3008 chomp for @res;
3009 while (@res) {
3010 my ($func, $line) = splice @res, 0, 2, ();
3011 push @funcs, "[$func] $line";
3012 }
3013
3014 @funcs
3015 };
3016
3017 LOG llevInfo, "[ABT] $msg\n";
3018 LOG llevInfo, "[ABT] $_\n" for @bt;
3019 --$_log_backtrace;
3020 };
3021 } else {
3022 LOG llevInfo, "[ABT] $msg\n";
3023 LOG llevInfo, "[ABT] [suppressed]\n";
3024 }
3025}
3026
3027# load additional modules
3028use cf::pod;
3029
2725END { cf::emergency_save } 3030END { cf::emergency_save }
2726 3031
27271 30321
2728 3033

Diff Legend

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