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.416 by root, Fri Apr 11 13:59:06 2008 UTC vs.
Revision 1.456 by root, Tue Sep 30 04:00:35 2008 UTC

… …
19# The authors can be reached via e-mail to <support@deliantra.net> 19# The authors can be reached via e-mail to <support@deliantra.net>
20# 20#
21 21
22package cf; 22package cf;
23 23
24use 5.10.0;
24use utf8; 25use utf8;
25use strict; 26use strict "vars", "subs";
26 27
27use Symbol; 28use Symbol;
28use List::Util; 29use List::Util;
29use Socket; 30use Socket;
30use EV 3.2; 31use EV;
31use Opcode; 32use Opcode;
32use Safe; 33use Safe;
33use Safe::Hole; 34use Safe::Hole;
34use Storable (); 35use Storable ();
35 36
36use Coro 4.50 (); 37use Coro ();
37use Coro::State; 38use Coro::State;
38use Coro::Handle; 39use Coro::Handle;
39use Coro::EV; 40use Coro::EV;
41use Coro::AnyEvent;
40use Coro::Timer; 42use Coro::Timer;
41use Coro::Signal; 43use Coro::Signal;
42use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
43use Coro::AIO; 46use Coro::AIO;
44use Coro::BDB; 47use Coro::BDB 1.6;
45use Coro::Storable; 48use Coro::Storable;
46use Coro::Util (); 49use Coro::Util ();
47 50
48use JSON::XS 2.01 (); 51use JSON::XS 2.01 ();
49use BDB (); 52use BDB ();
50use Data::Dumper; 53use Data::Dumper;
51use Digest::MD5; 54use Digest::MD5;
52use Fcntl; 55use Fcntl;
53use YAML (); 56use YAML ();
54use IO::AIO 2.51 (); 57use IO::AIO ();
55use Time::HiRes; 58use Time::HiRes;
56use Compress::LZF; 59use Compress::LZF;
57use Digest::MD5 (); 60use Digest::MD5 ();
61
62AnyEvent::detect;
58 63
59# configure various modules to our taste 64# configure various modules to our taste
60# 65#
61$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
68
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70
71# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 73Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
64
65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
66 74
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
68 76
69our %COMMAND = (); 77our %COMMAND = ();
70our %COMMAND_TIME = (); 78our %COMMAND_TIME = ();
… …
73our %EXTCMD = (); 81our %EXTCMD = ();
74our %EXTICMD = (); 82our %EXTICMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 83our %EXT_CORO = (); # coroutines bound to extensions
76our %EXT_MAP = (); # pluggable maps 84our %EXT_MAP = (); # pluggable maps
77 85
78our $RELOAD; # number of reloads so far 86our $RELOAD; # number of reloads so far, non-zero while in reload
79our @EVENT; 87our @EVENT;
80 88
81our $CONFDIR = confdir; 89our $CONFDIR = confdir;
82our $DATADIR = datadir; 90our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 91our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 92our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 93our $MAPDIR = "$DATADIR/" . mapdir;
86our $LOCALDIR = localdir; 94our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 95our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 96our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 97our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 98our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 99our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime";
102
92our %RESOURCE; 103our %RESOURCE;
93 104
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 107our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 108our $USE_FSYNC = 1; # use fsync to write maps - default off
99 109
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 110our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 111our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 112our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 113our $DB_ENV;
105 114
… …
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 128our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 129our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 130our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 131our $TICK_START; # for load detecting purposes
123 132
133our @POST_INIT;
134
124binmode STDOUT; 135binmode STDOUT;
125binmode STDERR; 136binmode STDERR;
126 137
127# read virtual server time, if available 138# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 139unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 140 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 141 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 142 $RUNTIME = <$fh> + 0.;
132} 143}
133 144
134mkdir $_ 145mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 146 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
… …
242for my $pkg (qw( 253for my $pkg (qw(
243 cf::global cf::attachable 254 cf::global cf::attachable
244 cf::object cf::object::player 255 cf::object cf::object::player
245 cf::client cf::player 256 cf::client cf::player
246 cf::arch cf::living 257 cf::arch cf::living
258 cf::map cf::mapspace
247 cf::map cf::party cf::region 259 cf::party cf::region
248)) { 260)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 261 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 262}
252 263
253$EV::DIED = sub { 264$EV::DIED = sub {
254 warn "error in event callback: @_"; 265 warn "error in event callback: @_";
… …
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 307our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297 308
298sub encode_json($) { $json_coder->encode ($_[0]) } 309sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 310sub decode_json($) { $json_coder->decode ($_[0]) }
300 311
312=item cf::post_init { BLOCK }
313
314Execute the given codeblock, I<after> all extensions have been (re-)loaded,
315but I<before> the server starts ticking again.
316
317The cdoeblock will have a single boolean argument to indicate whether this
318is a reload or not.
319
320=cut
321
322sub post_init(&) {
323 push @POST_INIT, shift;
324}
325
301=item cf::lock_wait $string 326=item cf::lock_wait $string
302 327
303Wait until the given lock is available. See cf::lock_acquire. 328Wait until the given lock is available. See cf::lock_acquire.
304 329
305=item my $lock = cf::lock_acquire $string 330=item my $lock = cf::lock_acquire $string
… …
332 return;#d# 357 return;#d#
333 }#d# 358 }#d#
334 359
335 # wait for lock, if any 360 # wait for lock, if any
336 while ($LOCK{$key}) { 361 while ($LOCK{$key}) {
362 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
337 push @{ $LOCK{$key} }, $Coro::current; 363 push @{ $LOCK{$key} }, $Coro::current;
338 Coro::schedule; 364 Coro::schedule;
339 } 365 }
340} 366}
341 367
… …
427 } 453 }
428 } 454 }
429}; 455};
430 456
431sub get_slot($;$$) { 457sub get_slot($;$$) {
458 return if tick_inhibit || $Coro::current == $Coro::main;
459
432 my ($time, $pri, $name) = @_; 460 my ($time, $pri, $name) = @_;
433 461
434 $time = $TICK * .6 if $time > $TICK * .6; 462 $time = $TICK * .6 if $time > $TICK * .6;
435 my $sig = new Coro::Signal; 463 my $sig = new Coro::Signal;
436 464
… …
722 750
723############################################################################# 751#############################################################################
724 752
725=head2 ATTACHABLE OBJECTS 753=head2 ATTACHABLE OBJECTS
726 754
727Many objects in crossfire are so-called attachable objects. That means you can 755Many objects in deliantra are so-called attachable objects. That means you can
728attach callbacks/event handlers (a collection of which is called an "attachment") 756attach callbacks/event handlers (a collection of which is called an "attachment")
729to it. All such attachable objects support the following methods. 757to it. All such attachable objects support the following methods.
730 758
731In the following description, CLASS can be any of C<global>, C<object> 759In the following description, CLASS can be any of C<global>, C<object>
732C<player>, C<client> or C<map> (i.e. the attachable objects in 760C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
782=item cf::CLASS::attachment $name, ... 810=item cf::CLASS::attachment $name, ...
783 811
784Register an attachment by C<$name> through which attachable objects of the 812Register an attachment by C<$name> through which attachable objects of the
785given CLASS can refer to this attachment. 813given CLASS can refer to this attachment.
786 814
787Some classes such as crossfire maps and objects can specify attachments 815Some classes such as deliantra maps and objects can specify attachments
788that are attached at load/instantiate time, thus the need for a name. 816that are attached at load/instantiate time, thus the need for a name.
789 817
790These calls expect any number of the following handler/hook descriptions: 818These calls expect any number of the following handler/hook descriptions:
791 819
792=over 4 820=over 4
… …
1083 1111
1084sub reattach { 1112sub reattach {
1085 # basically do the same as instantiate, without calling instantiate 1113 # basically do the same as instantiate, without calling instantiate
1086 my ($obj) = @_; 1114 my ($obj) = @_;
1087 1115
1116 # no longer needed after getting rid of delete_package?
1088 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1117 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1089 1118
1090 my $registry = $obj->registry; 1119 my $registry = $obj->registry;
1091 1120
1092 @$registry = (); 1121 @$registry = ();
1093 1122
… …
1139 utf8::decode (my $decname = $filename); 1168 utf8::decode (my $decname = $filename);
1140 warn sprintf "saving %s (%d,%d)\n", 1169 warn sprintf "saving %s (%d,%d)\n",
1141 $decname, length $$rdata, scalar @$objs; 1170 $decname, length $$rdata, scalar @$objs;
1142 1171
1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1144 chmod SAVE_MODE, $fh; 1173 aio_chmod $fh, SAVE_MODE;
1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1146 aio_fsync $fh if $cf::USE_FSYNC; 1175 aio_fsync $fh if $cf::USE_FSYNC;
1147 close $fh; 1176 aio_close $fh;
1148 1177
1149 if (@$objs) { 1178 if (@$objs) {
1150 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1179 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1151 chmod SAVE_MODE, $fh; 1180 aio_chmod $fh, SAVE_MODE;
1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1153 aio_write $fh, 0, (length $data), $data, 0; 1182 aio_write $fh, 0, (length $data), $data, 0;
1154 aio_fsync $fh if $cf::USE_FSYNC; 1183 aio_fsync $fh if $cf::USE_FSYNC;
1155 close $fh; 1184 aio_close $fh;
1156 aio_rename "$filename.pst~", "$filename.pst"; 1185 aio_rename "$filename.pst~", "$filename.pst";
1157 } 1186 }
1158 } else { 1187 } else {
1159 aio_unlink "$filename.pst"; 1188 aio_unlink "$filename.pst";
1160 } 1189 }
1161 1190
1162 aio_rename "$filename~", $filename; 1191 aio_rename "$filename~", $filename;
1192
1193 $filename =~ s%/[^/]+$%%;
1194 aio_pathsync $filename;
1163 } else { 1195 } else {
1164 warn "FATAL: $filename~: $!\n"; 1196 warn "FATAL: $filename~: $!\n";
1165 } 1197 }
1166 } else { 1198 } else {
1167 aio_unlink $filename; 1199 aio_unlink $filename;
… …
1329 1361
1330 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1362 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1331 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1363 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1332 1364
1333 $ext{source} = 1365 $ext{source} =
1334 "package $pkg; use strict; use utf8;\n" 1366 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1335 . "#line 1 \"$path\"\n{\n" 1367 . "#line 1 \"$path\"\n{\n"
1336 . $source 1368 . $source
1337 . "\n};\n1"; 1369 . "\n};\n1";
1338 1370
1339 $todo{$base} = \%ext; 1371 $todo{$base} = \%ext;
… …
1379 1411
1380=back 1412=back
1381 1413
1382=head2 CORE EXTENSIONS 1414=head2 CORE EXTENSIONS
1383 1415
1384Functions and methods that extend core crossfire objects. 1416Functions and methods that extend core deliantra objects.
1385 1417
1386=cut 1418=cut
1387 1419
1388package cf::player; 1420package cf::player;
1389 1421
… …
1432 1464
1433sub exists($) { 1465sub exists($) {
1434 my ($login) = @_; 1466 my ($login) = @_;
1435 1467
1436 $cf::PLAYER{$login} 1468 $cf::PLAYER{$login}
1437 or cf::sync_job { !aio_stat path $login } 1469 or !aio_stat path $login
1438} 1470}
1439 1471
1440sub find($) { 1472sub find($) {
1441 return $cf::PLAYER{$_[0]} || do { 1473 return $cf::PLAYER{$_[0]} || do {
1442 my $login = $_[0]; 1474 my $login = $_[0];
… …
1454 my $f = new_from_file cf::object::thawer path $login 1486 my $f = new_from_file cf::object::thawer path $login
1455 or return; 1487 or return;
1456 1488
1457 my $pl = cf::player::load_pl $f 1489 my $pl = cf::player::load_pl $f
1458 or return; 1490 or return;
1491
1459 local $cf::PLAYER_LOADING{$login} = $pl; 1492 local $cf::PLAYER_LOADING{$login} = $pl;
1460 $f->resolve_delayed_derefs; 1493 $f->resolve_delayed_derefs;
1461 $cf::PLAYER{$login} = $pl 1494 $cf::PLAYER{$login} = $pl
1462 } 1495 }
1463 } 1496 }
… …
1473 1506
1474 return if $pl->{deny_save}; 1507 return if $pl->{deny_save};
1475 1508
1476 aio_mkdir playerdir $pl, 0770; 1509 aio_mkdir playerdir $pl, 0770;
1477 $pl->{last_save} = $cf::RUNTIME; 1510 $pl->{last_save} = $cf::RUNTIME;
1511
1512 cf::get_slot 0.01;
1478 1513
1479 $pl->save_pl ($path); 1514 $pl->save_pl ($path);
1480 cf::cede_to_tick; 1515 cf::cede_to_tick;
1481} 1516}
1482 1517
… …
1514 my ($pl) = @_; 1549 my ($pl) = @_;
1515 1550
1516 my $name = $pl->ob->name; 1551 my $name = $pl->ob->name;
1517 1552
1518 $pl->{deny_save} = 1; 1553 $pl->{deny_save} = 1;
1519 $pl->password ("*"); # this should lock out the player until we nuked the dir 1554 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1520 1555
1521 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1556 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1522 $pl->deactivate; 1557 $pl->deactivate;
1558 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1559 $pl->ob->check_score;
1523 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1560 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1524 $pl->ns->destroy if $pl->ns; 1561 $pl->ns->destroy if $pl->ns;
1525 1562
1526 my $path = playerdir $pl; 1563 my $path = playerdir $pl;
1527 my $temp = "$path~$cf::RUNTIME~deleting~"; 1564 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1566 1603
1567 for my $login (@$dirs) { 1604 for my $login (@$dirs) {
1568 my $path = path $login; 1605 my $path = path $login;
1569 1606
1570 # a .pst is a dead give-away for a valid player 1607 # a .pst is a dead give-away for a valid player
1571 unless (-e "$path.pst") { 1608 # if no pst file found, open and chekc for blocked users
1609 if (aio_stat "$path.pst") {
1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1610 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1573 aio_read $fh, 0, 512, my $buf, 0 or next; 1611 aio_read $fh, 0, 512, my $buf, 0 or next;
1574 $buf !~ /^password -------------$/m or next; # official not-valid tag 1612 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 } 1613 }
1576 1614
… …
1607 } 1645 }
1608 1646
1609 \@paths 1647 \@paths
1610} 1648}
1611 1649
1612=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1650=item $protocol_xml = $player->expand_cfpod ($cfpod)
1613 1651
1614Expand crossfire pod fragments into protocol xml. 1652Expand deliantra pod fragments into protocol xml.
1615
1616=cut
1617
1618use re 'eval';
1619
1620my $group;
1621my $interior; $interior = qr{
1622 # match a pod interior sequence sans C<< >>
1623 (?:
1624 \ (.*?)\ (?{ $group = $^N })
1625 | < (??{$interior}) >
1626 )
1627}x;
1628
1629sub expand_cfpod {
1630 my ($self, $pod) = @_;
1631
1632 my $xml;
1633
1634 while () {
1635 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1636 $group = $1;
1637
1638 $group =~ s/&/&amp;/g;
1639 $group =~ s/</&lt;/g;
1640
1641 $xml .= $group;
1642 } elsif ($pod =~ m%\G
1643 ([BCGHITU])
1644 <
1645 (?:
1646 ([^<>]*) (?{ $group = $^N })
1647 | < $interior >
1648 )
1649 >
1650 %gcsx
1651 ) {
1652 my ($code, $data) = ($1, $group);
1653
1654 if ($code eq "B") {
1655 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1656 } elsif ($code eq "I") {
1657 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1658 } elsif ($code eq "U") {
1659 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1660 } elsif ($code eq "C") {
1661 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1662 } elsif ($code eq "T") {
1663 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1664 } elsif ($code eq "G") {
1665 my ($male, $female) = split /\|/, $data;
1666 $data = $self->gender ? $female : $male;
1667 $xml .= expand_cfpod ($self, $data);
1668 } elsif ($code eq "H") {
1669 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1670 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1671 "")
1672 [$self->{hintmode}];
1673 } else {
1674 $xml .= "error processing '$code($data)' directive";
1675 }
1676 } else {
1677 if ($pod =~ /\G(.+)/) {
1678 warn "parse error while expanding $pod (at $1)";
1679 }
1680 last;
1681 }
1682 }
1683
1684 for ($xml) {
1685 # create single paragraphs (very hackish)
1686 s/(?<=\S)\n(?=\w)/ /g;
1687
1688 # compress some whitespace
1689 s/\s+\n/\n/g; # ws line-ends
1690 s/\n\n+/\n/g; # double lines
1691 s/^\n+//; # beginning lines
1692 s/\n+$//; # ending lines
1693 }
1694
1695 $xml
1696}
1697
1698no re 'eval';
1699
1700sub hintmode {
1701 $_[0]{hintmode} = $_[1] if @_ > 1;
1702 $_[0]{hintmode}
1703}
1704 1653
1705=item $player->ext_reply ($msgid, @msg) 1654=item $player->ext_reply ($msgid, @msg)
1706 1655
1707Sends an ext reply to the player. 1656Sends an ext reply to the player.
1708 1657
… …
1775our $MAX_RESET = 3600; 1724our $MAX_RESET = 3600;
1776our $DEFAULT_RESET = 3000; 1725our $DEFAULT_RESET = 3000;
1777 1726
1778sub generate_random_map { 1727sub generate_random_map {
1779 my ($self, $rmp) = @_; 1728 my ($self, $rmp) = @_;
1729
1730 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1731
1780 # mit "rum" bekleckern, nicht 1732 # mit "rum" bekleckern, nicht
1781 $self->_create_random_map ( 1733 $self->_create_random_map (
1782 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1734 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1783 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1735 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1784 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1736 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1906 1858
1907# the temporary/swap location 1859# the temporary/swap location
1908sub save_path { 1860sub save_path {
1909 my ($self) = @_; 1861 my ($self) = @_;
1910 1862
1911 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1912 "$TMPDIR/$path.map" 1864 "$TMPDIR/$path.map"
1913} 1865}
1914 1866
1915# the unique path, undef == no special unique path 1867# the unique path, undef == no special unique path
1916sub uniq_path { 1868sub uniq_path {
1917 my ($self) = @_; 1869 my ($self) = @_;
1918 1870
1919 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1871 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1920 "$UNIQUEDIR/$path" 1872 "$UNIQUEDIR/$path"
1921} 1873}
1922 1874
1923# and all this just because we cannot iterate over 1875# and all this just because we cannot iterate over
1924# all maps in C++... 1876# all maps in C++...
… …
2022 1974
2023 cf::lock_wait "map_data:$path";#d#remove 1975 cf::lock_wait "map_data:$path";#d#remove
2024 cf::lock_wait "map_find:$path"; 1976 cf::lock_wait "map_find:$path";
2025 1977
2026 $cf::MAP{$path} || do { 1978 $cf::MAP{$path} || do {
2027 my $guard1 = cf::lock_acquire "map_find:$path";
2028 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 1979 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1980 my $guard2 = cf::lock_acquire "map_find:$path";
2029 1981
2030 my $map = new_from_path cf::map $path 1982 my $map = new_from_path cf::map $path
2031 or return; 1983 or return;
2032 1984
2033 $map->{last_save} = $cf::RUNTIME; 1985 $map->{last_save} = $cf::RUNTIME;
… …
2036 or return; 1988 or return;
2037 1989
2038 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1990 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2039 # doing this can freeze the server in a sync job, obviously 1991 # doing this can freeze the server in a sync job, obviously
2040 #$cf::WAIT_FOR_TICK->wait; 1992 #$cf::WAIT_FOR_TICK->wait;
1993 undef $guard2;
2041 undef $guard1; 1994 undef $guard1;
2042 undef $guard2;
2043 $map->reset; 1995 $map->reset;
2044 return find $path; 1996 return find $path;
2045 } 1997 }
2046 1998
2047 $cf::MAP{$path} = $map 1999 $cf::MAP{$path} = $map
… …
2074 my $f = new_from_file cf::object::thawer $self->{load_path}; 2026 my $f = new_from_file cf::object::thawer $self->{load_path};
2075 $f->skip_block; 2027 $f->skip_block;
2076 $self->_load_objects ($f) 2028 $self->_load_objects ($f)
2077 or return; 2029 or return;
2078 2030
2079 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2031 $self->post_load_original
2080 if delete $self->{load_original}; 2032 if delete $self->{load_original};
2081 2033
2082 if (my $uniq = $self->uniq_path) { 2034 if (my $uniq = $self->uniq_path) {
2083 utf8::encode $uniq; 2035 utf8::encode $uniq;
2084 unless (aio_stat $uniq) { 2036 unless (aio_stat $uniq) {
… …
2110 } 2062 }
2111 2063
2112 $self->{last_save} = $cf::RUNTIME; 2064 $self->{last_save} = $cf::RUNTIME;
2113 $self->last_access ($cf::RUNTIME); 2065 $self->last_access ($cf::RUNTIME);
2114 2066
2115 $self->in_memory (cf::MAP_IN_MEMORY); 2067 $self->in_memory (cf::MAP_ACTIVE);
2116 } 2068 }
2117 2069
2118 $self->post_load; 2070 $self->post_load;
2119} 2071}
2120 2072
… …
2178 my ($path, $origin, $load) = @_; 2130 my ($path, $origin, $load) = @_;
2179 2131
2180 $path = normalise $path, $origin && $origin->{path}; 2132 $path = normalise $path, $origin && $origin->{path};
2181 2133
2182 if (my $map = $cf::MAP{$path}) { 2134 if (my $map = $cf::MAP{$path}) {
2183 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2135 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2184 } 2136 }
2185 2137
2186 $MAP_PREFETCH{$path} |= $load; 2138 $MAP_PREFETCH{$path} |= $load;
2187 2139
2188 $MAP_PREFETCHER ||= cf::async { 2140 $MAP_PREFETCHER ||= cf::async {
… …
2225 cf::async { 2177 cf::async {
2226 $Coro::current->{desc} = "map player save"; 2178 $Coro::current->{desc} = "map player save";
2227 $_->contr->save for $self->players; 2179 $_->contr->save for $self->players;
2228 }; 2180 };
2229 2181
2182 cf::get_slot 0.02;
2183
2230 if ($uniq) { 2184 if ($uniq) {
2231 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2185 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2232 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2186 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2233 } else { 2187 } else {
2234 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2188 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
2242 $self->save; 2196 $self->save;
2243 2197
2244 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2198 my $lock = cf::lock_acquire "map_data:$self->{path}";
2245 2199
2246 return if $self->players; 2200 return if $self->players;
2247 return if $self->in_memory != cf::MAP_IN_MEMORY; 2201 return if $self->in_memory != cf::MAP_ACTIVE;
2248 return if $self->{deny_save}; 2202 return if $self->{deny_save};
2249 2203
2250 $self->in_memory (cf::MAP_SWAPPED); 2204 $self->in_memory (cf::MAP_SWAPPED);
2251 2205
2252 $self->deactivate; 2206 $self->deactivate;
… …
2370 2324
2371sub unique_maps() { 2325sub unique_maps() {
2372 [ 2326 [
2373 map { 2327 map {
2374 utf8::decode $_; 2328 utf8::decode $_;
2375 /\.map$/ 2329 s/\.map$//; # TODO future compatibility hack
2330 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2331 ? ()
2376 ? normalise $_ 2332 : normalise $_
2377 : ()
2378 } @{ aio_readdir $UNIQUEDIR or [] } 2333 } @{ aio_readdir $UNIQUEDIR or [] }
2379 ] 2334 ]
2380} 2335}
2381 2336
2382=back 2337=back
… …
2389 2344
2390=over 4 2345=over 4
2391 2346
2392=item $ob->inv_recursive 2347=item $ob->inv_recursive
2393 2348
2394Returns the inventory of the object _and_ their inventories, recursively. 2349Returns the inventory of the object I<and> their inventories, recursively,
2350but I<not> the object itself.
2395 2351
2396=cut 2352=cut
2397 2353
2398sub inv_recursive_; 2354sub inv_recursive_;
2399sub inv_recursive_ { 2355sub inv_recursive_ {
… …
2404 inv_recursive_ inv $_[0] 2360 inv_recursive_ inv $_[0]
2405} 2361}
2406 2362
2407=item $ref = $ob->ref 2363=item $ref = $ob->ref
2408 2364
2409creates and returns a persistent reference to an objetc that can be stored as a string. 2365Creates and returns a persistent reference to an object that can be stored as a string.
2410 2366
2411=item $ob = cf::object::deref ($refstring) 2367=item $ob = cf::object::deref ($refstring)
2412 2368
2413returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2369returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2414even if the object actually exists. May block. 2370even if the object actually exists. May block.
… …
2446can be C<undef>. Does the right thing when the player is currently in a 2402can be C<undef>. Does the right thing when the player is currently in a
2447dialogue with the given NPC character. 2403dialogue with the given NPC character.
2448 2404
2449=cut 2405=cut
2450 2406
2407our $SAY_CHANNEL = {
2408 id => "say",
2409 title => "Map",
2410 reply => "say ",
2411 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2412};
2413
2414our $CHAT_CHANNEL = {
2415 id => "chat",
2416 title => "Chat",
2417 reply => "chat ",
2418 tooltip => "Player chat and shouts, global to the server.",
2419};
2420
2451# rough implementation of a future "reply" method that works 2421# rough implementation of a future "reply" method that works
2452# with dialog boxes. 2422# with dialog boxes.
2453#TODO: the first argument must go, split into a $npc->reply_to ( method 2423#TODO: the first argument must go, split into a $npc->reply_to ( method
2454sub cf::object::player::reply($$$;$) { 2424sub cf::object::player::reply($$$;$) {
2455 my ($self, $npc, $msg, $flags) = @_; 2425 my ($self, $npc, $msg, $flags) = @_;
… …
2466 my $dialog = $pl->{npc_dialog}; 2436 my $dialog = $pl->{npc_dialog};
2467 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2437 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2468 2438
2469 } else { 2439 } else {
2470 $msg = $npc->name . " says: $msg" if $npc; 2440 $msg = $npc->name . " says: $msg" if $npc;
2471 $self->message ($msg, $flags); 2441 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2472 } 2442 }
2473 } 2443 }
2474} 2444}
2475 2445
2476=item $object->send_msg ($channel, $msg, $color, [extra...]) 2446=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2501 2471
2502=item $player_object->enter_link 2472=item $player_object->enter_link
2503 2473
2504Freezes the player and moves him/her to a special map (C<{link}>). 2474Freezes the player and moves him/her to a special map (C<{link}>).
2505 2475
2506The player should be reasonably safe there for short amounts of time. You 2476The player should be reasonably safe there for short amounts of time (e.g.
2507I<MUST> call C<leave_link> as soon as possible, though. 2477for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2478though, as the palyer cannot control the character while it is on the link
2479map.
2508 2480
2509Will never block. 2481Will never block.
2510 2482
2511=item $player_object->leave_link ($map, $x, $y) 2483=item $player_object->leave_link ($map, $x, $y)
2512 2484
… …
2570 2542
2571 $map->load; 2543 $map->load;
2572 $map->load_neighbours; 2544 $map->load_neighbours;
2573 2545
2574 return unless $self->contr->active; 2546 return unless $self->contr->active;
2547 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2575 $self->activate_recursive; 2548 $self->activate_recursive;
2576 2549
2577 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2550 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2578 $self->enter_map ($map, $x, $y); 2551 $self->enter_map ($map, $x, $y);
2579} 2552}
… …
2583Moves the player to the given map-path and coordinates by first freezing 2556Moves the player to the given map-path and coordinates by first freezing
2584her, loading and preparing them map, calling the provided $check callback 2557her, loading and preparing them map, calling the provided $check callback
2585that has to return the map if sucecssful, and then unfreezes the player on 2558that has to return the map if sucecssful, and then unfreezes the player on
2586the new (success) or old (failed) map position. In either case, $done will 2559the new (success) or old (failed) map position. In either case, $done will
2587be called at the end of this process. 2560be called at the end of this process.
2561
2562Note that $check will be called with a potentially non-loaded map, so if
2563it needs a loaded map it has to call C<< ->load >>.
2588 2564
2589=cut 2565=cut
2590 2566
2591our $GOTOGEN; 2567our $GOTOGEN;
2592 2568
… …
2671} 2647}
2672 2648
2673sub prepare_random_map { 2649sub prepare_random_map {
2674 my ($exit) = @_; 2650 my ($exit) = @_;
2675 2651
2676 my $guard = cf::lock_acquire "exit_prepare:$exit";
2677
2678 # all this does is basically replace the /! path by 2652 # all this does is basically replace the /! path by
2679 # a new random map path (?random/...) with a seed 2653 # a new random map path (?random/...) with a seed
2680 # that depends on the exit object 2654 # that depends on the exit object
2681 2655
2682 my $rmp = parse_random_map_params $exit->msg; 2656 my $rmp = parse_random_map_params $exit->msg;
… …
2684 if ($exit->map) { 2658 if ($exit->map) {
2685 $rmp->{region} = $exit->region->name; 2659 $rmp->{region} = $exit->region->name;
2686 $rmp->{origin_map} = $exit->map->path; 2660 $rmp->{origin_map} = $exit->map->path;
2687 $rmp->{origin_x} = $exit->x; 2661 $rmp->{origin_x} = $exit->x;
2688 $rmp->{origin_y} = $exit->y; 2662 $rmp->{origin_y} = $exit->y;
2663
2664 $exit->map->touch;
2689 } 2665 }
2690 2666
2691 $rmp->{random_seed} ||= $exit->random_seed; 2667 $rmp->{random_seed} ||= $exit->random_seed;
2692 2668
2693 my $data = cf::encode_json $rmp; 2669 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2694 my $md5 = Digest::MD5::md5_hex $data; 2670 my $md5 = Digest::MD5::md5_hex $data;
2695 my $meta = "$RANDOMDIR/$md5.meta"; 2671 my $meta = "$RANDOMDIR/$md5.meta";
2696 2672
2697 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2673 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2698 aio_write $fh, 0, (length $data), $data, 0; 2674 aio_write $fh, 0, (length $data), $data, 0;
2699 undef $fh; 2675 undef $fh;
2700 aio_rename "$meta~", $meta; 2676 aio_rename "$meta~", $meta;
2701 2677
2678 my $slaying = "?random/$md5";
2679
2680 if ($exit->valid) {
2702 $exit->slaying ("?random/$md5"); 2681 $exit->slaying ("?random/$md5");
2703 $exit->msg (undef); 2682 $exit->msg (undef);
2683 }
2704 } 2684 }
2705} 2685}
2706 2686
2707sub cf::object::player::enter_exit { 2687sub cf::object::player::enter_exit {
2708 my ($self, $exit) = @_; 2688 my ($self, $exit) = @_;
2709 2689
2710 return unless $self->type == cf::PLAYER; 2690 return unless $self->type == cf::PLAYER;
2711 2691
2712 if ($exit->slaying eq "/!") {
2713 #TODO: this should de-fi-ni-te-ly not be a sync-job
2714 # the problem is that $exit might not survive long enough
2715 # so it needs to be done right now, right here
2716 cf::sync_job { prepare_random_map $exit };
2717 }
2718
2719 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2720 my $hp = $exit->stats->hp;
2721 my $sp = $exit->stats->sp;
2722
2723 $self->enter_link; 2692 $self->enter_link;
2724 2693
2725 # if exit is damned, update players death & WoR home-position
2726 $self->contr->savebed ($slaying, $hp, $sp)
2727 if $exit->flag (FLAG_DAMNED);
2728
2729 (async { 2694 (async {
2730 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2695 $Coro::current->{desc} = "enter_exit";
2731 2696
2732 $self->deactivate_recursive; # just to be sure
2733 unless (eval { 2697 unless (eval {
2698 $self->deactivate_recursive; # just to be sure
2699
2700 # random map handling
2701 {
2702 my $guard = cf::lock_acquire "exit_prepare:$exit";
2703
2704 prepare_random_map $exit
2705 if $exit->slaying eq "/!";
2706 }
2707
2708 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2709 my $x = $exit->stats->hp;
2710 my $y = $exit->stats->sp;
2711
2734 $self->goto ($slaying, $hp, $sp); 2712 $self->goto ($map, $x, $y);
2735 2713
2714 # if exit is damned, update players death & WoR home-position
2715 $self->contr->savebed ($map, $x, $y)
2716 if $exit->flag (cf::FLAG_DAMNED);
2717
2736 1; 2718 1
2737 }) { 2719 }) {
2738 $self->message ("Something went wrong deep within the crossfire server. " 2720 $self->message ("Something went wrong deep within the deliantra server. "
2739 . "I'll try to bring you back to the map you were before. " 2721 . "I'll try to bring you back to the map you were before. "
2740 . "Please report this to the dungeon master!", 2722 . "Please report this to the dungeon master!",
2741 cf::NDI_UNIQUE | cf::NDI_RED); 2723 cf::NDI_UNIQUE | cf::NDI_RED);
2742 2724
2743 warn "ERROR in enter_exit: $@"; 2725 warn "ERROR in enter_exit: $@";
… …
2809 id => "infobox", 2791 id => "infobox",
2810 title => "Body Parts", 2792 title => "Body Parts",
2811 reply => undef, 2793 reply => undef,
2812 tooltip => "Shows which body parts you posess and are available", 2794 tooltip => "Shows which body parts you posess and are available",
2813 }, 2795 },
2796 "c/skills" => {
2797 id => "infobox",
2798 title => "Skills",
2799 reply => undef,
2800 tooltip => "Shows your experience per skill and item power",
2801 },
2814 "c/uptime" => { 2802 "c/uptime" => {
2815 id => "infobox", 2803 id => "infobox",
2816 title => "Uptime", 2804 title => "Uptime",
2817 reply => undef, 2805 reply => undef,
2818 tooltip => "How long the server has been running since last restart", 2806 tooltip => "How long the server has been running since last restart",
… …
2821 id => "infobox", 2809 id => "infobox",
2822 title => "Map Info", 2810 title => "Map Info",
2823 reply => undef, 2811 reply => undef,
2824 tooltip => "Information related to the maps", 2812 tooltip => "Information related to the maps",
2825 }, 2813 },
2814 "c/party" => {
2815 id => "party",
2816 title => "Party",
2817 reply => "gsay ",
2818 tooltip => "Messages and chat related to your party",
2819 },
2826); 2820);
2827 2821
2828sub cf::client::send_msg { 2822sub cf::client::send_msg {
2829 my ($self, $channel, $msg, $color, @extra) = @_; 2823 my ($self, $channel, $msg, $color, @extra) = @_;
2830 2824
2831 $msg = $self->pl->expand_cfpod ($msg); 2825 $msg = $self->pl->expand_cfpod ($msg)
2826 unless $color & cf::NDI_VERBATIM;
2832 2827
2833 $color &= cf::NDI_CLIENT_MASK; # just in case... 2828 $color &= cf::NDI_CLIENT_MASK; # just in case...
2834 2829
2835 # check predefined channels, for the benefit of C 2830 # check predefined channels, for the benefit of C
2836 if ($CHANNEL{$channel}) { 2831 if ($CHANNEL{$channel}) {
… …
2857 if ($self->can_msg) { 2852 if ($self->can_msg) {
2858 # default colour, mask it out 2853 # default colour, mask it out
2859 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2854 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2860 if $color & cf::NDI_DEF; 2855 if $color & cf::NDI_DEF;
2861 2856
2862 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2857 my $pkt = "msg "
2858 . $self->{json_coder}->encode (
2863 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2859 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2860 );
2861
2862 # try lzf for large packets
2863 $pkt = "lzf " . Compress::LZF::compress $pkt
2864 if 1024 <= length $pkt and $self->{can_lzf};
2865
2866 # split very large packets
2867 if (8192 < length $pkt and $self->{can_lzf}) {
2868 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2869 $pkt = "frag";
2870 }
2871
2872 $self->send_packet ($pkt);
2864 } else { 2873 } else {
2865 if ($color >= 0) { 2874 if ($color >= 0) {
2866 # replace some tags by gcfclient-compatible ones 2875 # replace some tags by gcfclient-compatible ones
2867 for ($msg) { 2876 for ($msg) {
2868 1 while 2877 1 while
… …
3067 3076
3068The following functions and methods are available within a safe environment: 3077The following functions and methods are available within a safe environment:
3069 3078
3070 cf::object 3079 cf::object
3071 contr pay_amount pay_player map x y force_find force_add destroy 3080 contr pay_amount pay_player map x y force_find force_add destroy
3072 insert remove name archname title slaying race decrease_ob_nr 3081 insert remove name archname title slaying race decrease split
3073 3082
3074 cf::object::player 3083 cf::object::player
3075 player 3084 player
3076 3085
3077 cf::player 3086 cf::player
… …
3082 3091
3083=cut 3092=cut
3084 3093
3085for ( 3094for (
3086 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3095 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3087 insert remove inv name archname title slaying race 3096 insert remove inv nrof name archname title slaying race
3088 decrease_ob_nr destroy)], 3097 decrease split destroy change_exp)],
3089 ["cf::object::player" => qw(player)], 3098 ["cf::object::player" => qw(player)],
3090 ["cf::player" => qw(peaceful)], 3099 ["cf::player" => qw(peaceful)],
3091 ["cf::map" => qw(trigger)], 3100 ["cf::map" => qw(trigger)],
3092) { 3101) {
3093 no strict 'refs'; 3102 no strict 'refs';
… …
3301 while (my ($k, $v) = each %$want) { 3310 while (my ($k, $v) = each %$want) {
3302 $ns->fx_want ($k, $v); 3311 $ns->fx_want ($k, $v);
3303 } 3312 }
3304}; 3313};
3305 3314
3315sub load_resource_file($) {
3316 my $guard = lock_acquire "load_resource_file";
3317
3318 my $status = load_resource_file_ $_[0];
3319 get_slot 0.1, 100;
3320 cf::arch::commit_load;
3321
3322 $status
3323}
3324
3306sub reload_regions { 3325sub reload_regions {
3307 # HACK to clear player env face cache, we need some signal framework 3326 # HACK to clear player env face cache, we need some signal framework
3308 # for this (global event?) 3327 # for this (global event?)
3309 %ext::player_env::MUSIC_FACE_CACHE = (); 3328 %ext::player_env::MUSIC_FACE_CACHE = ();
3310 3329
… …
3323} 3342}
3324 3343
3325sub reload_archetypes { 3344sub reload_archetypes {
3326 load_resource_file "$DATADIR/archetypes" 3345 load_resource_file "$DATADIR/archetypes"
3327 or die "unable to load archetypes\n"; 3346 or die "unable to load archetypes\n";
3328 #d# NEED to laod twice to resolve forward references
3329 # this really needs to be done in an extra post-pass
3330 # (which needs to be synchronous, so solve it differently)
3331 load_resource_file "$DATADIR/archetypes"
3332 or die "unable to load archetypes\n";
3333} 3347}
3334 3348
3335sub reload_treasures { 3349sub reload_treasures {
3336 load_resource_file "$DATADIR/treasures" 3350 load_resource_file "$DATADIR/treasures"
3337 or die "unable to load treasurelists\n"; 3351 or die "unable to load treasurelists\n";
3338} 3352}
3339 3353
3340sub reload_resources { 3354sub reload_resources {
3341 warn "reloading resource files...\n"; 3355 warn "reloading resource files...\n";
3342 3356
3357 reload_facedata;
3358 reload_archetypes;
3343 reload_regions; 3359 reload_regions;
3344 reload_facedata;
3345 #reload_archetypes;#d#
3346 reload_archetypes;
3347 reload_treasures; 3360 reload_treasures;
3348 3361
3349 warn "finished reloading resource files\n"; 3362 warn "finished reloading resource files\n";
3350}
3351
3352sub init {
3353 reload_resources;
3354} 3363}
3355 3364
3356sub reload_config { 3365sub reload_config {
3357 open my $fh, "<:utf8", "$CONFDIR/config" 3366 open my $fh, "<:utf8", "$CONFDIR/config"
3358 or return; 3367 or return;
… …
3372 }; 3381 };
3373 warn $@ if $@; 3382 warn $@ if $@;
3374 } 3383 }
3375} 3384}
3376 3385
3386sub pidfile() {
3387 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3388 or die "$PIDFILE: $!";
3389 flock $fh, &Fcntl::LOCK_EX
3390 or die "$PIDFILE: flock: $!";
3391 $fh
3392}
3393
3394# make sure only one server instance is running at any one time
3395sub atomic {
3396 my $fh = pidfile;
3397
3398 my $pid = <$fh>;
3399 kill 9, $pid if $pid > 0;
3400
3401 seek $fh, 0, 0;
3402 print $fh $$;
3403}
3404
3377sub main { 3405sub main {
3406 cf::init_globals; # initialise logging
3407
3408 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3409 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3410 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3411 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3412
3413 cf::init_experience;
3414 cf::init_anim;
3415 cf::init_attackmess;
3416 cf::init_dynamic;
3417 cf::init_block;
3418
3419 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3420
3378 # we must not ever block the main coroutine 3421 # we must not ever block the main coroutine
3379 local $Coro::idle = sub { 3422 local $Coro::idle = sub {
3380 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3423 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3381 (async { 3424 (async {
3382 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3425 $Coro::current->{desc} = "IDLE BUG HANDLER";
3383 EV::loop EV::LOOP_ONESHOT; 3426 EV::loop EV::LOOP_ONESHOT;
3384 })->prio (Coro::PRIO_MAX); 3427 })->prio (Coro::PRIO_MAX);
3385 }; 3428 };
3386 3429
3387 reload_config;
3388 db_init;
3389 load_extensions;
3390
3391 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3392 evthread_start IO::AIO::poll_fileno; 3430 evthread_start IO::AIO::poll_fileno;
3431
3432 cf::sync_job {
3433 reload_resources;
3434 reload_config;
3435 db_init;
3436
3437 cf::load_settings;
3438 cf::load_materials;
3439 cf::init_uuid;
3440 cf::init_signals;
3441 cf::init_commands;
3442 cf::init_skills;
3443
3444 cf::init_beforeplay;
3445
3446 atomic;
3447
3448 load_extensions;
3449
3450 utime time, time, $RUNTIMEFILE;
3451
3452 # no (long-running) fork's whatsoever before this point(!)
3453 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3454
3455 (pop @POST_INIT)->(0) while @POST_INIT;
3456 };
3457
3393 EV::loop; 3458 EV::loop;
3394} 3459}
3395 3460
3396############################################################################# 3461#############################################################################
3397# initialisation and cleanup 3462# initialisation and cleanup
… …
3404 cf::cleanup "SIG$signal"; 3469 cf::cleanup "SIG$signal";
3405 }; 3470 };
3406 } 3471 }
3407} 3472}
3408 3473
3409sub write_runtime { 3474sub write_runtime_sync {
3410 my $runtime = "$LOCALDIR/runtime";
3411
3412 # first touch the runtime file to show we are still running: 3475 # first touch the runtime file to show we are still running:
3413 # the fsync below can take a very very long time. 3476 # the fsync below can take a very very long time.
3414 3477
3415 IO::AIO::aio_utime $runtime, undef, undef; 3478 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3416 3479
3417 my $guard = cf::lock_acquire "write_runtime"; 3480 my $guard = cf::lock_acquire "write_runtime";
3418 3481
3419 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3482 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3420 or return; 3483 or return;
3421 3484
3422 my $value = $cf::RUNTIME + 90 + 10; 3485 my $value = $cf::RUNTIME + 90 + 10;
3423 # 10 is the runtime save interval, for a monotonic clock 3486 # 10 is the runtime save interval, for a monotonic clock
3424 # 60 allows for the watchdog to kill the server. 3487 # 60 allows for the watchdog to kill the server.
… …
3434 aio_utime $fh, undef, undef; 3497 aio_utime $fh, undef, undef;
3435 3498
3436 close $fh 3499 close $fh
3437 or return; 3500 or return;
3438 3501
3439 aio_rename "$runtime~", $runtime 3502 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3440 and return; 3503 and return;
3441 3504
3442 warn "runtime file written.\n"; 3505 warn "runtime file written.\n";
3443 3506
3444 1 3507 1
… …
3456 my $uuid = "$LOCALDIR/uuid"; 3519 my $uuid = "$LOCALDIR/uuid";
3457 3520
3458 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3521 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3459 or return; 3522 or return;
3460 3523
3461 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3524 my $value = uuid_seq uuid_cur;
3525
3526 unless ($value) {
3527 warn "cowardly refusing to write zero uuid value!\n";
3528 return;
3529 }
3530
3531 my $value = uuid_str $value + $uuid_skip;
3462 $uuid_skip = 0; 3532 $uuid_skip = 0;
3463 3533
3464 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3534 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3465 and return; 3535 and return;
3466 3536
… …
3528sub post_cleanup { 3598sub post_cleanup {
3529 my ($make_core) = @_; 3599 my ($make_core) = @_;
3530 3600
3531 warn Carp::longmess "post_cleanup backtrace" 3601 warn Carp::longmess "post_cleanup backtrace"
3532 if $make_core; 3602 if $make_core;
3603
3604 my $fh = pidfile;
3605 unlink $PIDFILE if <$fh> == $$;
3606}
3607
3608# a safer delete_package, copied from Symbol
3609sub clear_package($) {
3610 my $pkg = shift;
3611
3612 # expand to full symbol table name if needed
3613 unless ($pkg =~ /^main::.*::$/) {
3614 $pkg = "main$pkg" if $pkg =~ /^::/;
3615 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3616 $pkg .= '::' unless $pkg =~ /::$/;
3617 }
3618
3619 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3620 my $stem_symtab = *{$stem}{HASH};
3621
3622 defined $stem_symtab and exists $stem_symtab->{$leaf}
3623 or return;
3624
3625 # clear all symbols
3626 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3627 for my $name (keys %$leaf_symtab) {
3628 _gv_clear *{"$pkg$name"};
3629# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3630 }
3631 warn "cleared package $pkg\n";#d#
3533} 3632}
3534 3633
3535sub do_reload_perl() { 3634sub do_reload_perl() {
3536 # can/must only be called in main 3635 # can/must only be called in main
3537 if ($Coro::current != $Coro::main) { 3636 if ($Coro::current != $Coro::main) {
3538 warn "can only reload from main coroutine"; 3637 warn "can only reload from main coroutine";
3539 return; 3638 return;
3540 } 3639 }
3541 3640
3641 return if $RELOAD++;
3642
3643 while ($RELOAD) {
3542 warn "reloading..."; 3644 warn "reloading...";
3543 3645
3544 warn "entering sync_job"; 3646 warn "entering sync_job";
3545 3647
3546 cf::sync_job { 3648 cf::sync_job {
3547 cf::write_runtime; # external watchdog should not bark 3649 cf::write_runtime_sync; # external watchdog should not bark
3548 cf::emergency_save; 3650 cf::emergency_save;
3549 cf::write_runtime; # external watchdog should not bark 3651 cf::write_runtime_sync; # external watchdog should not bark
3550 3652
3551 warn "syncing database to disk"; 3653 warn "syncing database to disk";
3552 BDB::db_env_txn_checkpoint $DB_ENV; 3654 BDB::db_env_txn_checkpoint $DB_ENV;
3553 3655
3554 # if anything goes wrong in here, we should simply crash as we already saved 3656 # if anything goes wrong in here, we should simply crash as we already saved
3555 3657
3556 warn "flushing outstanding aio requests"; 3658 warn "flushing outstanding aio requests";
3557 for (;;) {
3558 BDB::flush;
3559 IO::AIO::flush;
3560 Coro::cede_notself;
3561 last unless IO::AIO::nreqs || BDB::nreqs; 3659 while (IO::AIO::nreqs || BDB::nreqs) {
3562 warn "iterate..."; 3660 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3563 }
3564
3565 ++$RELOAD;
3566
3567 warn "cancelling all extension coros";
3568 $_->cancel for values %EXT_CORO;
3569 %EXT_CORO = ();
3570
3571 warn "removing commands";
3572 %COMMAND = ();
3573
3574 warn "removing ext/exti commands";
3575 %EXTCMD = ();
3576 %EXTICMD = ();
3577
3578 warn "unloading/nuking all extensions";
3579 for my $pkg (@EXTS) {
3580 warn "... unloading $pkg";
3581
3582 if (my $cb = $pkg->can ("unload")) {
3583 eval {
3584 $cb->($pkg);
3585 1
3586 } or warn "$pkg unloaded, but with errors: $@";
3587 } 3661 }
3588 3662
3589 warn "... nuking $pkg"; 3663 warn "cancelling all extension coros";
3590 Symbol::delete_package $pkg; 3664 $_->cancel for values %EXT_CORO;
3591 } 3665 %EXT_CORO = ();
3592 3666
3593 warn "unloading all perl modules loaded from $LIBDIR"; 3667 warn "removing commands";
3594 while (my ($k, $v) = each %INC) { 3668 %COMMAND = ();
3595 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3596 3669
3670 warn "removing ext/exti commands";
3671 %EXTCMD = ();
3672 %EXTICMD = ();
3673
3674 warn "unloading/nuking all extensions";
3675 for my $pkg (@EXTS) {
3597 warn "... unloading $k"; 3676 warn "... unloading $pkg";
3598 delete $INC{$k};
3599 3677
3600 $k =~ s/\.pm$//;
3601 $k =~ s/\//::/g;
3602
3603 if (my $cb = $k->can ("unload_module")) { 3678 if (my $cb = $pkg->can ("unload")) {
3679 eval {
3604 $cb->(); 3680 $cb->($pkg);
3681 1
3682 } or warn "$pkg unloaded, but with errors: $@";
3683 }
3684
3685 warn "... clearing $pkg";
3686 clear_package $pkg;
3605 } 3687 }
3606 3688
3607 Symbol::delete_package $k; 3689 warn "unloading all perl modules loaded from $LIBDIR";
3690 while (my ($k, $v) = each %INC) {
3691 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3692
3693 warn "... unloading $k";
3694 delete $INC{$k};
3695
3696 $k =~ s/\.pm$//;
3697 $k =~ s/\//::/g;
3698
3699 if (my $cb = $k->can ("unload_module")) {
3700 $cb->();
3701 }
3702
3703 clear_package $k;
3608 } 3704 }
3609 3705
3610 warn "getting rid of safe::, as good as possible"; 3706 warn "getting rid of safe::, as good as possible";
3611 Symbol::delete_package "safe::$_" 3707 clear_package "safe::$_"
3612 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3708 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3613 3709
3614 warn "unloading cf.pm \"a bit\""; 3710 warn "unloading cf.pm \"a bit\"";
3615 delete $INC{"cf.pm"}; 3711 delete $INC{"cf.pm"};
3616 delete $INC{"cf/pod.pm"}; 3712 delete $INC{"cf/pod.pm"};
3617 3713
3618 # don't, removes xs symbols, too, 3714 # don't, removes xs symbols, too,
3619 # and global variables created in xs 3715 # and global variables created in xs
3620 #Symbol::delete_package __PACKAGE__; 3716 #clear_package __PACKAGE__;
3621 3717
3622 warn "unload completed, starting to reload now"; 3718 warn "unload completed, starting to reload now";
3623 3719
3624 warn "reloading cf.pm"; 3720 warn "reloading cf.pm";
3625 require cf; 3721 require cf;
3626 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3722 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3627 3723
3628 warn "loading config and database again"; 3724 warn "loading config and database again";
3629 cf::reload_config; 3725 cf::reload_config;
3630 3726
3631 warn "loading extensions"; 3727 warn "loading extensions";
3632 cf::load_extensions; 3728 cf::load_extensions;
3633 3729
3634 warn "reattaching attachments to objects/players"; 3730 warn "reattaching attachments to objects/players";
3635 _global_reattach; # objects, sockets 3731 _global_reattach; # objects, sockets
3636 warn "reattaching attachments to maps"; 3732 warn "reattaching attachments to maps";
3637 reattach $_ for values %MAP; 3733 reattach $_ for values %MAP;
3638 warn "reattaching attachments to players"; 3734 warn "reattaching attachments to players";
3639 reattach $_ for values %PLAYER; 3735 reattach $_ for values %PLAYER;
3640 3736
3737 warn "running post_load";
3738 (pop @POST_INIT)->(1) while @POST_INIT;
3739
3641 warn "leaving sync_job"; 3740 warn "leaving sync_job";
3642 3741
3643 1 3742 1
3644 } or do { 3743 } or do {
3645 warn $@; 3744 warn $@;
3646 cf::cleanup "error while reloading, exiting."; 3745 cf::cleanup "error while reloading, exiting.";
3647 }; 3746 };
3648 3747
3649 warn "reloaded"; 3748 warn "reloaded";
3749 --$RELOAD;
3750 }
3650}; 3751};
3651 3752
3652our $RELOAD_WATCHER; # used only during reload 3753our $RELOAD_WATCHER; # used only during reload
3653 3754
3654sub reload_perl() { 3755sub reload_perl() {
3655 # doing reload synchronously and two reloads happen back-to-back, 3756 # doing reload synchronously and two reloads happen back-to-back,
3656 # coro crashes during coro_state_free->destroy here. 3757 # coro crashes during coro_state_free->destroy here.
3657 3758
3658 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3759 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub {
3659 do_reload_perl; 3760 do_reload_perl;
3660 undef $RELOAD_WATCHER; 3761 undef $RELOAD_WATCHER;
3661 }; 3762 };
3662} 3763}
3663 3764
… …
3679 3780
3680our @WAIT_FOR_TICK; 3781our @WAIT_FOR_TICK;
3681our @WAIT_FOR_TICK_BEGIN; 3782our @WAIT_FOR_TICK_BEGIN;
3682 3783
3683sub wait_for_tick { 3784sub wait_for_tick {
3684 return if tick_inhibit;
3685 return if $Coro::current == $Coro::main; 3785 return if tick_inhibit || $Coro::current == $Coro::main;
3686 3786
3687 my $signal = new Coro::Signal; 3787 my $signal = new Coro::Signal;
3688 push @WAIT_FOR_TICK, $signal; 3788 push @WAIT_FOR_TICK, $signal;
3689 $signal->wait; 3789 $signal->wait;
3690} 3790}
3691 3791
3692sub wait_for_tick_begin { 3792sub wait_for_tick_begin {
3693 return if tick_inhibit;
3694 return if $Coro::current == $Coro::main; 3793 return if tick_inhibit || $Coro::current == $Coro::main;
3695 3794
3696 my $signal = new Coro::Signal; 3795 my $signal = new Coro::Signal;
3697 push @WAIT_FOR_TICK_BEGIN, $signal; 3796 push @WAIT_FOR_TICK_BEGIN, $signal;
3698 $signal->wait; 3797 $signal->wait;
3699} 3798}
… …
3709 3808
3710 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3809 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3711 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3810 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3712 Coro::async_pool { 3811 Coro::async_pool {
3713 $Coro::current->{desc} = "runtime saver"; 3812 $Coro::current->{desc} = "runtime saver";
3714 write_runtime 3813 write_runtime_sync
3715 or warn "ERROR: unable to write runtime file: $!"; 3814 or warn "ERROR: unable to write runtime file: $!";
3716 }; 3815 };
3717 } 3816 }
3718 3817
3719 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3818 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3738{ 3837{
3739 # configure BDB 3838 # configure BDB
3740 3839
3741 BDB::min_parallel 8; 3840 BDB::min_parallel 8;
3742 BDB::max_poll_reqs $TICK * 0.1; 3841 BDB::max_poll_reqs $TICK * 0.1;
3743 $Coro::BDB::WATCHER->priority (1); 3842 $AnyEvent::BDB::WATCHER->priority (1);
3744 3843
3745 unless ($DB_ENV) { 3844 unless ($DB_ENV) {
3746 $DB_ENV = BDB::db_env_create; 3845 $DB_ENV = BDB::db_env_create;
3747 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3846 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3748 | BDB::LOG_AUTOREMOVE, 1); 3847 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3848 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3749 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3849 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3750 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3850 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3751 3851
3752 cf::sync_job { 3852 cf::sync_job {
3753 eval { 3853 eval {
… …
3779{ 3879{
3780 # configure IO::AIO 3880 # configure IO::AIO
3781 3881
3782 IO::AIO::min_parallel 8; 3882 IO::AIO::min_parallel 8;
3783 IO::AIO::max_poll_time $TICK * 0.1; 3883 IO::AIO::max_poll_time $TICK * 0.1;
3784 $Coro::AIO::WATCHER->priority (1); 3884 undef $AnyEvent::AIO::WATCHER;
3785} 3885}
3786 3886
3787my $_log_backtrace; 3887my $_log_backtrace;
3788 3888
3789sub _log_backtrace { 3889sub _log_backtrace {
… …
3792 $msg =~ s/\n//; 3892 $msg =~ s/\n//;
3793 3893
3794 # limit the # of concurrent backtraces 3894 # limit the # of concurrent backtraces
3795 if ($_log_backtrace < 2) { 3895 if ($_log_backtrace < 2) {
3796 ++$_log_backtrace; 3896 ++$_log_backtrace;
3897 my $perl_bt = Carp::longmess $msg;
3797 async { 3898 async {
3798 $Coro::current->{desc} = "abt $msg"; 3899 $Coro::current->{desc} = "abt $msg";
3799 3900
3800 my @bt = fork_call { 3901 my @bt = fork_call {
3801 @addr = map { sprintf "%x", $_ } @addr; 3902 @addr = map { sprintf "%x", $_ } @addr;
… …
3812 } 3913 }
3813 3914
3814 @funcs 3915 @funcs
3815 }; 3916 };
3816 3917
3817 LOG llevInfo, "[ABT] $msg\n"; 3918 LOG llevInfo, "[ABT] $perl_bt\n";
3919 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3818 LOG llevInfo, "[ABT] $_\n" for @bt; 3920 LOG llevInfo, "[ABT] $_\n" for @bt;
3819 --$_log_backtrace; 3921 --$_log_backtrace;
3820 }; 3922 };
3821 } else { 3923 } else {
3822 LOG llevInfo, "[ABT] $msg\n"; 3924 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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