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.414 by root, Thu Apr 10 09:10:45 2008 UTC vs.
Revision 1.519 by root, Fri Apr 16 02:32:25 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
25use 5.10.0;
24use utf8; 26use utf8;
25use strict; 27use strict qw(vars subs);
26 28
27use Symbol; 29use Symbol;
28use List::Util; 30use List::Util;
29use Socket; 31use Socket;
30use EV 3.2; 32use EV;
31use Opcode; 33use Opcode;
32use Safe; 34use Safe;
33use Safe::Hole; 35use Safe::Hole;
34use Storable (); 36use Storable ();
37use Carp ();
35 38
39use Guard ();
36use Coro 4.50 (); 40use Coro ();
37use Coro::State; 41use Coro::State;
38use Coro::Handle; 42use Coro::Handle;
39use Coro::EV; 43use Coro::EV;
44use Coro::AnyEvent;
40use Coro::Timer; 45use Coro::Timer;
41use Coro::Signal; 46use Coro::Signal;
42use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
43use Coro::AIO; 50use Coro::AIO;
44use Coro::BDB; 51use Coro::BDB 1.6;
45use Coro::Storable; 52use Coro::Storable;
46use Coro::Util (); 53use Coro::Util ();
47 54
48use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
49use BDB (); 56use BDB ();
50use Data::Dumper; 57use Data::Dumper;
51use Digest::MD5;
52use Fcntl; 58use Fcntl;
53use YAML (); 59use YAML::XS ();
54use IO::AIO 2.51 (); 60use IO::AIO ();
55use Time::HiRes; 61use Time::HiRes;
56use Compress::LZF; 62use Compress::LZF;
57use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
58 66
59# configure various modules to our taste 67# configure various modules to our taste
60# 68#
61$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 70Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
71
72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
73
74# make sure c-lzf reinitialises itself
75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
64 77
65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
66 80
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
68 82
69our %COMMAND = (); 83our %COMMAND = ();
70our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
73our %EXTCMD = (); 87our %EXTCMD = ();
74our %EXTICMD = (); 88our %EXTICMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
76our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
77 91
78our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
79our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
80 96
81our $CONFDIR = confdir; 97our $CONFDIR = confdir;
82our $DATADIR = datadir; 98our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
86our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
92our %RESOURCE; 111our %RESOURCE;
93 112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
115
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 118our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 119our $USE_FSYNC = 1; # use fsync to write maps - default on
99 120
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 124our $DB_ENV;
105 125
126our @EXTRA_MODULES = qw(pod match mapscript);
127
106our %CFG; 128our %CFG;
107 129
108our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
109our $RUNTIME; 131our $RUNTIME;
110our $NOW; 132our $NOW;
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 141our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 143our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
123 145
146our @POST_INIT;
147
148our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149our $REALLY_UNLOOP; # never set to true, please :)
150
124binmode STDOUT; 151binmode STDOUT;
125binmode STDERR; 152binmode STDERR;
126 153
127# read virtual server time, if available 154# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 155unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 156 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 157 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 158 $RUNTIME = <$fh> + 0.;
132} 159}
160
161eval "sub TICK() { $TICK } 1" or die;
133 162
134mkdir $_ 163mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 164 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136 165
137our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
138 167
139sub cf::map::normalise; 168sub cf::map::normalise;
169
170#############################################################################
171
172%REFLECT = ();
173for (@REFLECT) {
174 my $reflect = JSON::XS::decode_json $_;
175 $REFLECT{$reflect->{class}} = $reflect;
176}
177
178# this is decidedly evil
179$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
140 180
141############################################################################# 181#############################################################################
142 182
143=head2 GLOBAL VARIABLES 183=head2 GLOBAL VARIABLES
144 184
191returns directly I<after> the tick processing (and consequently, can only wake one process 231returns directly I<after> the tick processing (and consequently, can only wake one process
192per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 232per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
193 233
194=item @cf::INVOKE_RESULTS 234=item @cf::INVOKE_RESULTS
195 235
196This array contains the results of the last C<invoke ()> call. When 236This array contains the results of the last C<invoke ()> call. When
197C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 237C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
198that call. 238that call.
199 239
240=item %cf::REFLECT
241
242Contains, for each (C++) class name, a hash reference with information
243about object members (methods, scalars, arrays and flags) and other
244metadata, which is useful for introspection.
245
200=back 246=back
201 247
202=cut 248=cut
203 249
204BEGIN { 250$Coro::State::WARNHOOK = sub {
205 *CORE::GLOBAL::warn = sub {
206 my $msg = join "", @_; 251 my $msg = join "", @_;
207 252
208 $msg .= "\n" 253 $msg .= "\n"
209 unless $msg =~ /\n$/; 254 unless $msg =~ /\n$/;
210 255
211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 256 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
212 257
213 LOG llevError, $msg; 258 LOG llevError, $msg;
214 }; 259};
215}
216 260
217$Coro::State::DIEHOOK = sub { 261$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "==" 262 return unless $^S eq 0; # "eq", not "=="
263
264 warn Carp::longmess $_[0];
219 265
220 if ($Coro::current == $Coro::main) {#d# 266 if ($Coro::current == $Coro::main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d# 267 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d# 268 return;#d#
223 }#d# 269 }#d#
224 270
225 # kill coroutine otherwise 271 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate 272 Coro::terminate
228}; 273};
229
230$SIG{__DIE__} = sub { }; #d#?
231 274
232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 275@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 276@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 277@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 278@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
242for my $pkg (qw( 285for my $pkg (qw(
243 cf::global cf::attachable 286 cf::global cf::attachable
244 cf::object cf::object::player 287 cf::object cf::object::player
245 cf::client cf::player 288 cf::client cf::player
246 cf::arch cf::living 289 cf::arch cf::living
290 cf::map cf::mapspace
247 cf::map cf::party cf::region 291 cf::party cf::region
248)) { 292)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 293 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 294}
252 295
253$EV::DIED = sub { 296$EV::DIED = sub {
254 warn "error in event callback: @_"; 297 Carp::cluck "error in event callback: @_";
255}; 298};
256 299
257############################################################################# 300#############################################################################
258 301
259=head2 UTILITY FUNCTIONS 302=head2 UTILITY FUNCTIONS
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 339our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297 340
298sub encode_json($) { $json_coder->encode ($_[0]) } 341sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 342sub decode_json($) { $json_coder->decode ($_[0]) }
300 343
344=item cf::post_init { BLOCK }
345
346Execute the given codeblock, I<after> all extensions have been (re-)loaded,
347but I<before> the server starts ticking again.
348
349The cdoeblock will have a single boolean argument to indicate whether this
350is a reload or not.
351
352=cut
353
354sub post_init(&) {
355 push @POST_INIT, shift;
356}
357
301=item cf::lock_wait $string 358=item cf::lock_wait $string
302 359
303Wait until the given lock is available. See cf::lock_acquire. 360Wait until the given lock is available. See cf::lock_acquire.
304 361
305=item my $lock = cf::lock_acquire $string 362=item my $lock = cf::lock_acquire $string
306 363
307Wait until the given lock is available and then acquires it and returns 364Wait until the given lock is available and then acquires it and returns
308a Coro::guard object. If the guard object gets destroyed (goes out of scope, 365a L<Guard> object. If the guard object gets destroyed (goes out of scope,
309for example when the coroutine gets canceled), the lock is automatically 366for example when the coroutine gets canceled), the lock is automatically
310returned. 367returned.
311 368
312Locks are *not* recursive, locking from the same coro twice results in a 369Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro. 370deadlocked coro.
319 376
320Return true if the lock is currently active, i.e. somebody has locked it. 377Return true if the lock is currently active, i.e. somebody has locked it.
321 378
322=cut 379=cut
323 380
324our %LOCK; 381our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 382
327sub lock_wait($) { 383sub lock_wait($) {
328 my ($key) = @_; 384 $LOCKS->wait ($_[0]);
329
330 if ($LOCKER{$key} == $Coro::current) {#d#
331 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332 return;#d#
333 }#d#
334
335 # wait for lock, if any
336 while ($LOCK{$key}) {
337 push @{ $LOCK{$key} }, $Coro::current;
338 Coro::schedule;
339 }
340} 385}
341 386
342sub lock_acquire($) { 387sub lock_acquire($) {
343 my ($key) = @_; 388 $LOCKS->guard ($_[0])
344
345 # wait, to be sure we are not locked
346 lock_wait $key;
347
348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
350
351 Coro::guard {
352 delete $LOCKER{$key};#d#
353 # wake up all waiters, to be on the safe side
354 $_->ready for @{ delete $LOCK{$key} };
355 }
356} 389}
357 390
358sub lock_active($) { 391sub lock_active($) {
359 my ($key) = @_; 392 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 393}
363 394
364sub freeze_mainloop { 395sub freeze_mainloop {
365 tick_inhibit_inc; 396 tick_inhibit_inc;
366 397
367 Coro::guard \&tick_inhibit_dec; 398 &Guard::guard (\&tick_inhibit_dec);
368} 399}
369 400
370=item cf::periodic $interval, $cb 401=item cf::periodic $interval, $cb
371 402
372Like EV::periodic, but randomly selects a starting point so that the actions 403Like EV::periodic, but randomly selects a starting point so that the actions
373get spread over timer. 404get spread over time.
374 405
375=cut 406=cut
376 407
377sub periodic($$) { 408sub periodic($$) {
378 my ($interval, $cb) = @_; 409 my ($interval, $cb) = @_;
395 426
396=cut 427=cut
397 428
398our @SLOT_QUEUE; 429our @SLOT_QUEUE;
399our $SLOT_QUEUE; 430our $SLOT_QUEUE;
431our $SLOT_DECAY = 0.9;
400 432
401$SLOT_QUEUE->cancel if $SLOT_QUEUE; 433$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async { 434$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager"); 435 $Coro::current->desc ("timeslot manager");
404 436
405 my $signal = new Coro::Signal; 437 my $signal = new Coro::Signal;
438 my $busy;
406 439
407 while () { 440 while () {
408 next_job: 441 next_job:
442
409 my $avail = cf::till_tick; 443 my $avail = cf::till_tick;
410 if ($avail > 0.01) { 444
411 for (0 .. $#SLOT_QUEUE) { 445 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) { 446 if ($SLOT_QUEUE[$_][0] <= $avail) {
447 $busy = 0;
413 my $job = splice @SLOT_QUEUE, $_, 1, (); 448 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send; 449 $job->[2]->send;
415 Coro::cede; 450 Coro::cede;
416 goto next_job; 451 goto next_job;
417 } 452 } else {
453 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
418 } 454 }
419 } 455 }
420 456
421 if (@SLOT_QUEUE) { 457 if (@SLOT_QUEUE) {
422 # we do not use wait_for_tick() as it returns immediately when tick is inactive 458 # we do not use wait_for_tick() as it returns immediately when tick is inactive
423 push @cf::WAIT_FOR_TICK, $signal; 459 push @cf::WAIT_FOR_TICK, $signal;
424 $signal->wait; 460 $signal->wait;
425 } else { 461 } else {
462 $busy = 0;
426 Coro::schedule; 463 Coro::schedule;
427 } 464 }
428 } 465 }
429}; 466};
430 467
431sub get_slot($;$$) { 468sub get_slot($;$$) {
469 return if tick_inhibit || $Coro::current == $Coro::main;
470
432 my ($time, $pri, $name) = @_; 471 my ($time, $pri, $name) = @_;
433 472
434 $time = $TICK * .6 if $time > $TICK * .6; 473 $time = clamp $time, 0.01, $TICK * .6;
474
435 my $sig = new Coro::Signal; 475 my $sig = new Coro::Signal;
436 476
437 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 477 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
438 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 478 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
439 $SLOT_QUEUE->ready; 479 $SLOT_QUEUE->ready;
466 506
467sub sync_job(&) { 507sub sync_job(&) {
468 my ($job) = @_; 508 my ($job) = @_;
469 509
470 if ($Coro::current == $Coro::main) { 510 if ($Coro::current == $Coro::main) {
471 my $time = EV::time; 511 my $time = AE::time;
472 512
473 # this is the main coro, too bad, we have to block 513 # this is the main coro, too bad, we have to block
474 # till the operation succeeds, freezing the server :/ 514 # till the operation succeeds, freezing the server :/
475 515
476 LOG llevError, Carp::longmess "sync job";#d# 516 LOG llevError, Carp::longmess "sync job";#d#
493 } else { 533 } else {
494 EV::loop EV::LOOP_ONESHOT; 534 EV::loop EV::LOOP_ONESHOT;
495 } 535 }
496 } 536 }
497 537
498 my $time = EV::time - $time; 538 my $time = AE::time - $time;
499 539
500 $TICK_START += $time; # do not account sync jobs to server load 540 $TICK_START += $time; # do not account sync jobs to server load
501 541
502 wantarray ? @res : $res[0] 542 wantarray ? @res : $res[0]
503 } else { 543 } else {
547 reset_signals; 587 reset_signals;
548 &$cb 588 &$cb
549 }, @args; 589 }, @args;
550 590
551 wantarray ? @res : $res[-1] 591 wantarray ? @res : $res[-1]
592}
593
594sub objinfo {
595 (
596 "counter value" => cf::object::object_count,
597 "objects created" => cf::object::create_count,
598 "objects destroyed" => cf::object::destroy_count,
599 "freelist size" => cf::object::free_count,
600 "allocated objects" => cf::object::objects_size,
601 "active objects" => cf::object::actives_size,
602 )
603}
604
605=item $coin = coin_from_name $name
606
607=cut
608
609our %coin_alias = (
610 "silver" => "silvercoin",
611 "silvercoin" => "silvercoin",
612 "silvercoins" => "silvercoin",
613 "gold" => "goldcoin",
614 "goldcoin" => "goldcoin",
615 "goldcoins" => "goldcoin",
616 "platinum" => "platinacoin",
617 "platinumcoin" => "platinacoin",
618 "platinumcoins" => "platinacoin",
619 "platina" => "platinacoin",
620 "platinacoin" => "platinacoin",
621 "platinacoins" => "platinacoin",
622 "royalty" => "royalty",
623 "royalties" => "royalty",
624);
625
626sub coin_from_name($) {
627 $coin_alias{$_[0]}
628 ? cf::arch::find $coin_alias{$_[0]}
629 : undef
552} 630}
553 631
554=item $value = cf::db_get $family => $key 632=item $value = cf::db_get $family => $key
555 633
556Returns a single value from the environment database. 634Returns a single value from the environment database.
695 773
696############################################################################# 774#############################################################################
697 775
698=head2 ATTACHABLE OBJECTS 776=head2 ATTACHABLE OBJECTS
699 777
700Many objects in crossfire are so-called attachable objects. That means you can 778Many objects in deliantra are so-called attachable objects. That means you can
701attach callbacks/event handlers (a collection of which is called an "attachment") 779attach callbacks/event handlers (a collection of which is called an "attachment")
702to it. All such attachable objects support the following methods. 780to it. All such attachable objects support the following methods.
703 781
704In the following description, CLASS can be any of C<global>, C<object> 782In the following description, CLASS can be any of C<global>, C<object>
705C<player>, C<client> or C<map> (i.e. the attachable objects in 783C<player>, C<client> or C<map> (i.e. the attachable objects in
755=item cf::CLASS::attachment $name, ... 833=item cf::CLASS::attachment $name, ...
756 834
757Register an attachment by C<$name> through which attachable objects of the 835Register an attachment by C<$name> through which attachable objects of the
758given CLASS can refer to this attachment. 836given CLASS can refer to this attachment.
759 837
760Some classes such as crossfire maps and objects can specify attachments 838Some classes such as deliantra maps and objects can specify attachments
761that are attached at load/instantiate time, thus the need for a name. 839that are attached at load/instantiate time, thus the need for a name.
762 840
763These calls expect any number of the following handler/hook descriptions: 841These calls expect any number of the following handler/hook descriptions:
764 842
765=over 4 843=over 4
1056 1134
1057sub reattach { 1135sub reattach {
1058 # basically do the same as instantiate, without calling instantiate 1136 # basically do the same as instantiate, without calling instantiate
1059 my ($obj) = @_; 1137 my ($obj) = @_;
1060 1138
1139 # no longer needed after getting rid of delete_package?
1061 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1140 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1062 1141
1063 my $registry = $obj->registry; 1142 my $registry = $obj->registry;
1064 1143
1065 @$registry = (); 1144 @$registry = ();
1066 1145
1112 utf8::decode (my $decname = $filename); 1191 utf8::decode (my $decname = $filename);
1113 warn sprintf "saving %s (%d,%d)\n", 1192 warn sprintf "saving %s (%d,%d)\n",
1114 $decname, length $$rdata, scalar @$objs; 1193 $decname, length $$rdata, scalar @$objs;
1115 1194
1116 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1195 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1117 chmod SAVE_MODE, $fh; 1196 aio_chmod $fh, SAVE_MODE;
1118 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1197 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1119 aio_fsync $fh if $cf::USE_FSYNC; 1198 if ($cf::USE_FSYNC) {
1199 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1200 aio_fsync $fh;
1201 }
1120 close $fh; 1202 aio_close $fh;
1121 1203
1122 if (@$objs) { 1204 if (@$objs) {
1123 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1205 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1124 chmod SAVE_MODE, $fh; 1206 aio_chmod $fh, SAVE_MODE;
1125 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1207 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1126 aio_write $fh, 0, (length $data), $data, 0; 1208 aio_write $fh, 0, (length $data), $data, 0;
1127 aio_fsync $fh if $cf::USE_FSYNC; 1209 if ($cf::USE_FSYNC) {
1210 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1211 aio_fsync $fh;
1212 }
1128 close $fh; 1213 aio_close $fh;
1129 aio_rename "$filename.pst~", "$filename.pst"; 1214 aio_rename "$filename.pst~", "$filename.pst";
1130 } 1215 }
1131 } else { 1216 } else {
1132 aio_unlink "$filename.pst"; 1217 aio_unlink "$filename.pst";
1133 } 1218 }
1134 1219
1135 aio_rename "$filename~", $filename; 1220 aio_rename "$filename~", $filename;
1221
1222 $filename =~ s%/[^/]+$%%;
1223 aio_pathsync $filename if $cf::USE_FSYNC;
1136 } else { 1224 } else {
1137 warn "FATAL: $filename~: $!\n"; 1225 warn "unable to save objects: $filename~: $!\n";
1138 } 1226 }
1139 } else { 1227 } else {
1140 aio_unlink $filename; 1228 aio_unlink $filename;
1141 aio_unlink "$filename.pst"; 1229 aio_unlink "$filename.pst";
1142 } 1230 }
1233 my ($name, $cb) = @_; 1321 my ($name, $cb) = @_;
1234 1322
1235 $EXTICMD{$name} = $cb; 1323 $EXTICMD{$name} = $cb;
1236} 1324}
1237 1325
1326use File::Glob ();
1327
1238cf::player->attach ( 1328cf::player->attach (
1239 on_command => sub { 1329 on_unknown_command => sub {
1240 my ($pl, $name, $params) = @_; 1330 my ($pl, $name, $params) = @_;
1241 1331
1242 my $cb = $COMMAND{$name} 1332 my $cb = $COMMAND{$name}
1243 or return; 1333 or return;
1244 1334
1274 1364
1275 cf::override; 1365 cf::override;
1276 }, 1366 },
1277); 1367);
1278 1368
1369# "readahead" all extensions
1370sub cache_extensions {
1371 my $grp = IO::AIO::aio_group;
1372
1373 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1374 for (grep /\.ext$/, @{$_[0]}) {
1375 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1376 }
1377 };
1378
1379 $grp
1380}
1381
1279sub load_extensions { 1382sub load_extensions {
1280 cf::sync_job { 1383 cf::sync_job {
1281 my %todo; 1384 my %todo;
1282 1385
1283 for my $path (<$LIBDIR/*.ext>) { 1386 for my $path (<$LIBDIR/*.ext>) {
1302 1405
1303 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1406 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1304 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1407 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1305 1408
1306 $ext{source} = 1409 $ext{source} =
1307 "package $pkg; use strict; use utf8;\n" 1410 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1308 . "#line 1 \"$path\"\n{\n" 1411 . "#line 1 \"$path\"\n{\n"
1309 . $source 1412 . $source
1310 . "\n};\n1"; 1413 . "\n};\n1";
1311 1414
1312 $todo{$base} = \%ext; 1415 $todo{$base} = \%ext;
1313 } 1416 }
1314 1417
1418 my $pass = 0;
1315 my %done; 1419 my %done;
1316 while (%todo) { 1420 while (%todo) {
1317 my $progress; 1421 my $progress;
1318 1422
1423 ++$pass;
1424
1425 ext:
1319 while (my ($k, $v) = each %todo) { 1426 while (my ($k, $v) = each %todo) {
1320 for (split /,\s*/, $v->{meta}{depends}) { 1427 for (split /,\s*/, $v->{meta}{depends}) {
1321 goto skip 1428 next ext
1322 unless exists $done{$_}; 1429 unless exists $done{$_};
1323 } 1430 }
1324 1431
1325 warn "... loading '$k' into '$v->{pkg}'\n"; 1432 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1326 1433
1327 unless (eval $v->{source}) { 1434 my $active = eval $v->{source};
1435
1436 if (length $@) {
1328 my $msg = $@ ? "$v->{path}: $@\n" 1437 warn "$v->{path}: $@\n";
1329 : "$v->{base}: extension inactive.\n";
1330 1438
1331 if (exists $v->{meta}{mandatory}) {
1332 warn $msg;
1333 cf::cleanup "mandatory extension failed to load, exiting."; 1439 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1334 } 1440 if exists $v->{meta}{mandatory};
1335 1441 } else {
1336 warn $msg; 1442 $done{$k} = delete $todo{$k};
1443 push @EXTS, $v->{pkg};
1444 $progress = 1;
1445
1446 warn "$v->{base}: extension inactive.\n"
1447 unless $active;
1337 } 1448 }
1338
1339 $done{$k} = delete $todo{$k};
1340 push @EXTS, $v->{pkg};
1341 $progress = 1;
1342 } 1449 }
1343 1450
1344 skip: 1451 unless ($progress) {
1345 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1452 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1346 unless $progress; 1453
1454 while (my ($k, $v) = each %todo) {
1455 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1456 if exists $v->{meta}{mandatory};
1457 }
1458 }
1347 } 1459 }
1348 }; 1460 };
1349} 1461}
1350 1462
1351############################################################################# 1463#############################################################################
1352 1464
1353=back 1465=back
1354 1466
1355=head2 CORE EXTENSIONS 1467=head2 CORE EXTENSIONS
1356 1468
1357Functions and methods that extend core crossfire objects. 1469Functions and methods that extend core deliantra objects.
1358 1470
1359=cut 1471=cut
1360 1472
1361package cf::player; 1473package cf::player;
1362 1474
1405 1517
1406sub exists($) { 1518sub exists($) {
1407 my ($login) = @_; 1519 my ($login) = @_;
1408 1520
1409 $cf::PLAYER{$login} 1521 $cf::PLAYER{$login}
1410 or cf::sync_job { !aio_stat path $login } 1522 or !aio_stat path $login
1411} 1523}
1412 1524
1413sub find($) { 1525sub find($) {
1414 return $cf::PLAYER{$_[0]} || do { 1526 return $cf::PLAYER{$_[0]} || do {
1415 my $login = $_[0]; 1527 my $login = $_[0];
1427 my $f = new_from_file cf::object::thawer path $login 1539 my $f = new_from_file cf::object::thawer path $login
1428 or return; 1540 or return;
1429 1541
1430 my $pl = cf::player::load_pl $f 1542 my $pl = cf::player::load_pl $f
1431 or return; 1543 or return;
1544
1432 local $cf::PLAYER_LOADING{$login} = $pl; 1545 local $cf::PLAYER_LOADING{$login} = $pl;
1433 $f->resolve_delayed_derefs; 1546 $f->resolve_delayed_derefs;
1434 $cf::PLAYER{$login} = $pl 1547 $cf::PLAYER{$login} = $pl
1435 } 1548 }
1436 } 1549 }
1437} 1550}
1438 1551
1552cf::player->attach (
1553 on_load => sub {
1554 my ($pl, $path) = @_;
1555
1556 # restore slots saved in save, below
1557 my $slots = delete $pl->{_slots};
1558
1559 $pl->ob->current_weapon ($slots->[0]);
1560 $pl->combat_ob ($slots->[1]);
1561 $pl->ranged_ob ($slots->[2]);
1562 },
1563);
1564
1439sub save($) { 1565sub save($) {
1440 my ($pl) = @_; 1566 my ($pl) = @_;
1441 1567
1442 return if $pl->{deny_save}; 1568 return if $pl->{deny_save};
1443 1569
1446 1572
1447 return if $pl->{deny_save}; 1573 return if $pl->{deny_save};
1448 1574
1449 aio_mkdir playerdir $pl, 0770; 1575 aio_mkdir playerdir $pl, 0770;
1450 $pl->{last_save} = $cf::RUNTIME; 1576 $pl->{last_save} = $cf::RUNTIME;
1577
1578 cf::get_slot 0.01;
1579
1580 # save slots, to be restored later
1581 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1451 1582
1452 $pl->save_pl ($path); 1583 $pl->save_pl ($path);
1453 cf::cede_to_tick; 1584 cf::cede_to_tick;
1454} 1585}
1455 1586
1487 my ($pl) = @_; 1618 my ($pl) = @_;
1488 1619
1489 my $name = $pl->ob->name; 1620 my $name = $pl->ob->name;
1490 1621
1491 $pl->{deny_save} = 1; 1622 $pl->{deny_save} = 1;
1492 $pl->password ("*"); # this should lock out the player until we nuked the dir 1623 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1493 1624
1494 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1625 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1495 $pl->deactivate; 1626 $pl->deactivate;
1627 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1628 $pl->ob->check_score;
1496 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1629 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1497 $pl->ns->destroy if $pl->ns; 1630 $pl->ns->destroy if $pl->ns;
1498 1631
1499 my $path = playerdir $pl; 1632 my $path = playerdir $pl;
1500 my $temp = "$path~$cf::RUNTIME~deleting~"; 1633 my $temp = "$path~$cf::RUNTIME~deleting~";
1539 1672
1540 for my $login (@$dirs) { 1673 for my $login (@$dirs) {
1541 my $path = path $login; 1674 my $path = path $login;
1542 1675
1543 # a .pst is a dead give-away for a valid player 1676 # a .pst is a dead give-away for a valid player
1544 unless (-e "$path.pst") { 1677 # if no pst file found, open and chekc for blocked users
1678 if (aio_stat "$path.pst") {
1545 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1679 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1546 aio_read $fh, 0, 512, my $buf, 0 or next; 1680 aio_read $fh, 0, 512, my $buf, 0 or next;
1547 $buf !~ /^password -------------$/m or next; # official not-valid tag 1681 $buf !~ /^password -------------$/m or next; # official not-valid tag
1548 } 1682 }
1549 1683
1580 } 1714 }
1581 1715
1582 \@paths 1716 \@paths
1583} 1717}
1584 1718
1585=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1719=item $protocol_xml = $player->expand_cfpod ($cfpod)
1586 1720
1587Expand crossfire pod fragments into protocol xml. 1721Expand deliantra pod fragments into protocol xml.
1588
1589=cut
1590
1591use re 'eval';
1592
1593my $group;
1594my $interior; $interior = qr{
1595 # match a pod interior sequence sans C<< >>
1596 (?:
1597 \ (.*?)\ (?{ $group = $^N })
1598 | < (??{$interior}) >
1599 )
1600}x;
1601
1602sub expand_cfpod {
1603 my ($self, $pod) = @_;
1604
1605 my $xml;
1606
1607 while () {
1608 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1609 $group = $1;
1610
1611 $group =~ s/&/&amp;/g;
1612 $group =~ s/</&lt;/g;
1613
1614 $xml .= $group;
1615 } elsif ($pod =~ m%\G
1616 ([BCGHITU])
1617 <
1618 (?:
1619 ([^<>]*) (?{ $group = $^N })
1620 | < $interior >
1621 )
1622 >
1623 %gcsx
1624 ) {
1625 my ($code, $data) = ($1, $group);
1626
1627 if ($code eq "B") {
1628 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1629 } elsif ($code eq "I") {
1630 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1631 } elsif ($code eq "U") {
1632 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1633 } elsif ($code eq "C") {
1634 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1635 } elsif ($code eq "T") {
1636 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1637 } elsif ($code eq "G") {
1638 my ($male, $female) = split /\|/, $data;
1639 $data = $self->gender ? $female : $male;
1640 $xml .= expand_cfpod ($self, $data);
1641 } elsif ($code eq "H") {
1642 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1643 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1644 "")
1645 [$self->{hintmode}];
1646 } else {
1647 $xml .= "error processing '$code($data)' directive";
1648 }
1649 } else {
1650 if ($pod =~ /\G(.+)/) {
1651 warn "parse error while expanding $pod (at $1)";
1652 }
1653 last;
1654 }
1655 }
1656
1657 for ($xml) {
1658 # create single paragraphs (very hackish)
1659 s/(?<=\S)\n(?=\w)/ /g;
1660
1661 # compress some whitespace
1662 s/\s+\n/\n/g; # ws line-ends
1663 s/\n\n+/\n/g; # double lines
1664 s/^\n+//; # beginning lines
1665 s/\n+$//; # ending lines
1666 }
1667
1668 $xml
1669}
1670
1671no re 'eval';
1672
1673sub hintmode {
1674 $_[0]{hintmode} = $_[1] if @_ > 1;
1675 $_[0]{hintmode}
1676}
1677 1722
1678=item $player->ext_reply ($msgid, @msg) 1723=item $player->ext_reply ($msgid, @msg)
1679 1724
1680Sends an ext reply to the player. 1725Sends an ext reply to the player.
1681 1726
1748our $MAX_RESET = 3600; 1793our $MAX_RESET = 3600;
1749our $DEFAULT_RESET = 3000; 1794our $DEFAULT_RESET = 3000;
1750 1795
1751sub generate_random_map { 1796sub generate_random_map {
1752 my ($self, $rmp) = @_; 1797 my ($self, $rmp) = @_;
1798
1799 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1800
1753 # mit "rum" bekleckern, nicht 1801 # mit "rum" bekleckern, nicht
1754 $self->_create_random_map ( 1802 $self->_create_random_map (
1755 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1803 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1756 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1804 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1757 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1805 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1758 $rmp->{exit_on_final_map}, 1806 $rmp->{exit_on_final_map},
1759 $rmp->{xsize}, $rmp->{ysize}, 1807 $rmp->{xsize}, $rmp->{ysize},
1760 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1808 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1761 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1809 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1879 1927
1880# the temporary/swap location 1928# the temporary/swap location
1881sub save_path { 1929sub save_path {
1882 my ($self) = @_; 1930 my ($self) = @_;
1883 1931
1884 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1932 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1885 "$TMPDIR/$path.map" 1933 "$TMPDIR/$path.map"
1886} 1934}
1887 1935
1888# the unique path, undef == no special unique path 1936# the unique path, undef == no special unique path
1889sub uniq_path { 1937sub uniq_path {
1890 my ($self) = @_; 1938 my ($self) = @_;
1891 1939
1892 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1940 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1893 "$UNIQUEDIR/$path" 1941 "$UNIQUEDIR/$path"
1894}
1895
1896# and all this just because we cannot iterate over
1897# all maps in C++...
1898sub change_all_map_light {
1899 my ($change) = @_;
1900
1901 $_->change_map_light ($change)
1902 for grep $_->outdoor, values %cf::MAP;
1903} 1942}
1904 1943
1905sub decay_objects { 1944sub decay_objects {
1906 my ($self) = @_; 1945 my ($self) = @_;
1907 1946
1991sub find { 2030sub find {
1992 my ($path, $origin) = @_; 2031 my ($path, $origin) = @_;
1993 2032
1994 $path = normalise $path, $origin && $origin->path; 2033 $path = normalise $path, $origin && $origin->path;
1995 2034
1996 cf::lock_wait "map_data:$path";#d#remove 2035 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1997 cf::lock_wait "map_find:$path"; 2036 my $guard2 = cf::lock_acquire "map_find:$path";
1998 2037
1999 $cf::MAP{$path} || do { 2038 $cf::MAP{$path} || do {
2000 my $guard1 = cf::lock_acquire "map_find:$path";
2001 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2002
2003 my $map = new_from_path cf::map $path 2039 my $map = new_from_path cf::map $path
2004 or return; 2040 or return;
2005 2041
2006 $map->{last_save} = $cf::RUNTIME; 2042 $map->{last_save} = $cf::RUNTIME;
2007 2043
2009 or return; 2045 or return;
2010 2046
2011 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2047 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2012 # doing this can freeze the server in a sync job, obviously 2048 # doing this can freeze the server in a sync job, obviously
2013 #$cf::WAIT_FOR_TICK->wait; 2049 #$cf::WAIT_FOR_TICK->wait;
2050 undef $guard2;
2014 undef $guard1; 2051 undef $guard1;
2015 undef $guard2;
2016 $map->reset; 2052 $map->reset;
2017 return find $path; 2053 return find $path;
2018 } 2054 }
2019 2055
2020 $cf::MAP{$path} = $map 2056 $cf::MAP{$path} = $map
2021 } 2057 }
2022} 2058}
2023 2059
2024sub pre_load { } 2060sub pre_load { }
2025sub post_load { } 2061#sub post_load { } # XS
2026 2062
2027sub load { 2063sub load {
2028 my ($self) = @_; 2064 my ($self) = @_;
2029 2065
2030 local $self->{deny_reset} = 1; # loading can take a long time 2066 local $self->{deny_reset} = 1; # loading can take a long time
2047 my $f = new_from_file cf::object::thawer $self->{load_path}; 2083 my $f = new_from_file cf::object::thawer $self->{load_path};
2048 $f->skip_block; 2084 $f->skip_block;
2049 $self->_load_objects ($f) 2085 $self->_load_objects ($f)
2050 or return; 2086 or return;
2051 2087
2052 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2088 $self->post_load_original
2053 if delete $self->{load_original}; 2089 if delete $self->{load_original};
2054 2090
2055 if (my $uniq = $self->uniq_path) { 2091 if (my $uniq = $self->uniq_path) {
2056 utf8::encode $uniq; 2092 utf8::encode $uniq;
2057 unless (aio_stat $uniq) { 2093 unless (aio_stat $uniq) {
2075 unless ($self->{deny_activate}) { 2111 unless ($self->{deny_activate}) {
2076 $self->decay_objects; 2112 $self->decay_objects;
2077 $self->fix_auto_apply; 2113 $self->fix_auto_apply;
2078 $self->update_buttons; 2114 $self->update_buttons;
2079 cf::cede_to_tick; 2115 cf::cede_to_tick;
2080 $self->set_darkness_map;
2081 cf::cede_to_tick;
2082 $self->activate; 2116 $self->activate;
2083 } 2117 }
2084 2118
2085 $self->{last_save} = $cf::RUNTIME; 2119 $self->{last_save} = $cf::RUNTIME;
2086 $self->last_access ($cf::RUNTIME); 2120 $self->last_access ($cf::RUNTIME);
2087 2121
2088 $self->in_memory (cf::MAP_IN_MEMORY); 2122 $self->in_memory (cf::MAP_ACTIVE);
2089 } 2123 }
2090 2124
2091 $self->post_load; 2125 $self->post_load;
2092} 2126}
2093 2127
2128# customize the map for a given player, i.e.
2129# return the _real_ map. used by e.g. per-player
2130# maps to change the path to ~playername/mappath
2094sub customise_for { 2131sub customise_for {
2095 my ($self, $ob) = @_; 2132 my ($self, $ob) = @_;
2096 2133
2097 return find "~" . $ob->name . "/" . $self->{path} 2134 return find "~" . $ob->name . "/" . $self->{path}
2098 if $self->per_player; 2135 if $self->per_player;
2151 my ($path, $origin, $load) = @_; 2188 my ($path, $origin, $load) = @_;
2152 2189
2153 $path = normalise $path, $origin && $origin->{path}; 2190 $path = normalise $path, $origin && $origin->{path};
2154 2191
2155 if (my $map = $cf::MAP{$path}) { 2192 if (my $map = $cf::MAP{$path}) {
2156 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2193 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2157 } 2194 }
2158 2195
2159 $MAP_PREFETCH{$path} |= $load; 2196 $MAP_PREFETCH{$path} |= $load;
2160 2197
2161 $MAP_PREFETCHER ||= cf::async { 2198 $MAP_PREFETCHER ||= cf::async {
2175 $MAP_PREFETCHER->prio (6); 2212 $MAP_PREFETCHER->prio (6);
2176 2213
2177 () 2214 ()
2178} 2215}
2179 2216
2217# common code, used by both ->save and ->swapout
2180sub save { 2218sub _save {
2181 my ($self) = @_; 2219 my ($self) = @_;
2182
2183 my $lock = cf::lock_acquire "map_data:$self->{path}";
2184 2220
2185 $self->{last_save} = $cf::RUNTIME; 2221 $self->{last_save} = $cf::RUNTIME;
2186 2222
2187 return unless $self->dirty; 2223 return unless $self->dirty;
2188 2224
2197 2233
2198 cf::async { 2234 cf::async {
2199 $Coro::current->{desc} = "map player save"; 2235 $Coro::current->{desc} = "map player save";
2200 $_->contr->save for $self->players; 2236 $_->contr->save for $self->players;
2201 }; 2237 };
2238
2239 cf::get_slot 0.02;
2202 2240
2203 if ($uniq) { 2241 if ($uniq) {
2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2242 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2205 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2243 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2206 } else { 2244 } else {
2207 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2208 } 2246 }
2209} 2247}
2210 2248
2249sub save {
2250 my ($self) = @_;
2251
2252 my $lock = cf::lock_acquire "map_data:$self->{path}";
2253
2254 $self->_save;
2255}
2256
2211sub swap_out { 2257sub swap_out {
2212 my ($self) = @_; 2258 my ($self) = @_;
2213 2259
2214 # save first because save cedes
2215 $self->save;
2216
2217 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2218 2261
2262 return if $self->in_memory != cf::MAP_ACTIVE;
2263 return if $self->{deny_save};
2219 return if $self->players; 2264 return if $self->players;
2220 return if $self->in_memory != cf::MAP_IN_MEMORY;
2221 return if $self->{deny_save};
2222 2265
2223 $self->in_memory (cf::MAP_SWAPPED); 2266 # first deactivate the map and "unlink" it from the core
2224
2225 $self->deactivate; 2267 $self->deactivate;
2226 $_->clear_links_to ($self) for values %cf::MAP; 2268 $_->clear_links_to ($self) for values %cf::MAP;
2269 $self->in_memory (cf::MAP_SWAPPED);
2270
2271 # then atomically save
2272 $self->_save;
2273
2274 # then free the map
2227 $self->clear; 2275 $self->clear;
2228} 2276}
2229 2277
2230sub reset_at { 2278sub reset_at {
2231 my ($self) = @_; 2279 my ($self) = @_;
2250 2298
2251 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2299 my $lock = cf::lock_acquire "map_data:$self->{path}";
2252 2300
2253 return if $self->players; 2301 return if $self->players;
2254 2302
2255 warn "resetting map ", $self->path; 2303 warn "resetting map ", $self->path, "\n";
2256 2304
2257 $self->in_memory (cf::MAP_SWAPPED); 2305 $self->in_memory (cf::MAP_SWAPPED);
2258 2306
2259 # need to save uniques path 2307 # need to save uniques path
2260 unless ($self->{deny_save}) { 2308 unless ($self->{deny_save}) {
2343 2391
2344sub unique_maps() { 2392sub unique_maps() {
2345 [ 2393 [
2346 map { 2394 map {
2347 utf8::decode $_; 2395 utf8::decode $_;
2348 /\.map$/ 2396 s/\.map$//; # TODO future compatibility hack
2397 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2398 ? ()
2349 ? normalise $_ 2399 : normalise $_
2350 : ()
2351 } @{ aio_readdir $UNIQUEDIR or [] } 2400 } @{ aio_readdir $UNIQUEDIR or [] }
2352 ] 2401 ]
2353} 2402}
2354 2403
2355package cf; 2404=item cf::map::static_maps
2405
2406Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2407file in the shared directory excluding F</styles> and F</editor>). May
2408block.
2409
2410=cut
2411
2412sub static_maps() {
2413 my @dirs = "";
2414 my @maps;
2415
2416 while (@dirs) {
2417 my $dir = shift @dirs;
2418
2419 next if $dir eq "/styles" || $dir eq "/editor";
2420
2421 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2422 or return;
2423
2424 for (@$files) {
2425 s/\.map$// or next;
2426 utf8::decode $_;
2427 push @maps, "$dir/$_";
2428 }
2429
2430 push @dirs, map "$dir/$_", @$dirs;
2431 }
2432
2433 \@maps
2434}
2356 2435
2357=back 2436=back
2358 2437
2359=head3 cf::object 2438=head3 cf::object
2360 2439
2364 2443
2365=over 4 2444=over 4
2366 2445
2367=item $ob->inv_recursive 2446=item $ob->inv_recursive
2368 2447
2369Returns the inventory of the object _and_ their inventories, recursively. 2448Returns the inventory of the object I<and> their inventories, recursively,
2449but I<not> the object itself.
2370 2450
2371=cut 2451=cut
2372 2452
2373sub inv_recursive_; 2453sub inv_recursive_;
2374sub inv_recursive_ { 2454sub inv_recursive_ {
2379 inv_recursive_ inv $_[0] 2459 inv_recursive_ inv $_[0]
2380} 2460}
2381 2461
2382=item $ref = $ob->ref 2462=item $ref = $ob->ref
2383 2463
2384creates and returns a persistent reference to an objetc that can be stored as a string. 2464Creates and returns a persistent reference to an object that can be stored as a string.
2385 2465
2386=item $ob = cf::object::deref ($refstring) 2466=item $ob = cf::object::deref ($refstring)
2387 2467
2388returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2468returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2389even if the object actually exists. May block. 2469even if the object actually exists. May block.
2421can be C<undef>. Does the right thing when the player is currently in a 2501can be C<undef>. Does the right thing when the player is currently in a
2422dialogue with the given NPC character. 2502dialogue with the given NPC character.
2423 2503
2424=cut 2504=cut
2425 2505
2506our $SAY_CHANNEL = {
2507 id => "say",
2508 title => "Map",
2509 reply => "say ",
2510 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2511};
2512
2513our $CHAT_CHANNEL = {
2514 id => "chat",
2515 title => "Chat",
2516 reply => "chat ",
2517 tooltip => "Player chat and shouts, global to the server.",
2518};
2519
2426# rough implementation of a future "reply" method that works 2520# rough implementation of a future "reply" method that works
2427# with dialog boxes. 2521# with dialog boxes.
2428#TODO: the first argument must go, split into a $npc->reply_to ( method 2522#TODO: the first argument must go, split into a $npc->reply_to ( method
2429sub cf::object::player::reply($$$;$) { 2523sub cf::object::player::reply($$$;$) {
2430 my ($self, $npc, $msg, $flags) = @_; 2524 my ($self, $npc, $msg, $flags) = @_;
2441 my $dialog = $pl->{npc_dialog}; 2535 my $dialog = $pl->{npc_dialog};
2442 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2536 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2443 2537
2444 } else { 2538 } else {
2445 $msg = $npc->name . " says: $msg" if $npc; 2539 $msg = $npc->name . " says: $msg" if $npc;
2446 $self->message ($msg, $flags); 2540 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2447 } 2541 }
2448 } 2542 }
2449} 2543}
2450 2544
2451=item $object->send_msg ($channel, $msg, $color, [extra...]) 2545=item $object->send_msg ($channel, $msg, $color, [extra...])
2476 2570
2477=item $player_object->enter_link 2571=item $player_object->enter_link
2478 2572
2479Freezes the player and moves him/her to a special map (C<{link}>). 2573Freezes the player and moves him/her to a special map (C<{link}>).
2480 2574
2481The player should be reasonably safe there for short amounts of time. You 2575The player should be reasonably safe there for short amounts of time (e.g.
2482I<MUST> call C<leave_link> as soon as possible, though. 2576for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2577though, as the palyer cannot control the character while it is on the link
2578map.
2483 2579
2484Will never block. 2580Will never block.
2485 2581
2486=item $player_object->leave_link ($map, $x, $y) 2582=item $player_object->leave_link ($map, $x, $y)
2487 2583
2512 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2608 return if UNIVERSAL::isa $self->map, "ext::map_link";
2513 2609
2514 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2610 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2515 if $self->map && $self->map->{path} ne "{link}"; 2611 if $self->map && $self->map->{path} ne "{link}";
2516 2612
2517 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2613 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2518} 2614}
2519 2615
2520sub cf::object::player::leave_link { 2616sub cf::object::player::leave_link {
2521 my ($self, $map, $x, $y) = @_; 2617 my ($self, $map, $x, $y) = @_;
2522 2618
2539 ($x, $y) = (-1, -1) 2635 ($x, $y) = (-1, -1)
2540 unless (defined $x) && (defined $y); 2636 unless (defined $x) && (defined $y);
2541 2637
2542 # use -1 or undef as default coordinates, not 0, 0 2638 # use -1 or undef as default coordinates, not 0, 0
2543 ($x, $y) = ($map->enter_x, $map->enter_y) 2639 ($x, $y) = ($map->enter_x, $map->enter_y)
2544 if $x <=0 && $y <= 0; 2640 if $x <= 0 && $y <= 0;
2545 2641
2546 $map->load; 2642 $map->load;
2547 $map->load_neighbours; 2643 $map->load_neighbours;
2548 2644
2549 return unless $self->contr->active; 2645 return unless $self->contr->active;
2550 $self->activate_recursive;
2551 2646
2552 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2647 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2553 $self->enter_map ($map, $x, $y); 2648 $self->enter_map ($map, $x, $y);
2649
2650 # only activate afterwards, to support waiting in hooks
2651 $self->activate_recursive;
2554} 2652}
2555 2653
2556=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2654=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2557 2655
2558Moves the player to the given map-path and coordinates by first freezing 2656Moves the player to the given map-path and coordinates by first freezing
2559her, loading and preparing them map, calling the provided $check callback 2657her, loading and preparing them map, calling the provided $check callback
2560that has to return the map if sucecssful, and then unfreezes the player on 2658that has to return the map if sucecssful, and then unfreezes the player on
2561the new (success) or old (failed) map position. In either case, $done will 2659the new (success) or old (failed) map position. In either case, $done will
2562be called at the end of this process. 2660be called at the end of this process.
2661
2662Note that $check will be called with a potentially non-loaded map, so if
2663it needs a loaded map it has to call C<< ->load >>.
2563 2664
2564=cut 2665=cut
2565 2666
2566our $GOTOGEN; 2667our $GOTOGEN;
2567 2668
2646} 2747}
2647 2748
2648sub prepare_random_map { 2749sub prepare_random_map {
2649 my ($exit) = @_; 2750 my ($exit) = @_;
2650 2751
2651 my $guard = cf::lock_acquire "exit_prepare:$exit";
2652
2653 # all this does is basically replace the /! path by 2752 # all this does is basically replace the /! path by
2654 # a new random map path (?random/...) with a seed 2753 # a new random map path (?random/...) with a seed
2655 # that depends on the exit object 2754 # that depends on the exit object
2656 2755
2657 my $rmp = parse_random_map_params $exit->msg; 2756 my $rmp = parse_random_map_params $exit->msg;
2659 if ($exit->map) { 2758 if ($exit->map) {
2660 $rmp->{region} = $exit->region->name; 2759 $rmp->{region} = $exit->region->name;
2661 $rmp->{origin_map} = $exit->map->path; 2760 $rmp->{origin_map} = $exit->map->path;
2662 $rmp->{origin_x} = $exit->x; 2761 $rmp->{origin_x} = $exit->x;
2663 $rmp->{origin_y} = $exit->y; 2762 $rmp->{origin_y} = $exit->y;
2763
2764 $exit->map->touch;
2664 } 2765 }
2665 2766
2666 $rmp->{random_seed} ||= $exit->random_seed; 2767 $rmp->{random_seed} ||= $exit->random_seed;
2667 2768
2668 my $data = cf::encode_json $rmp; 2769 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2669 my $md5 = Digest::MD5::md5_hex $data; 2770 my $md5 = Digest::MD5::md5_hex $data;
2670 my $meta = "$RANDOMDIR/$md5.meta"; 2771 my $meta = "$RANDOMDIR/$md5.meta";
2671 2772
2672 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2773 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2673 aio_write $fh, 0, (length $data), $data, 0; 2774 aio_write $fh, 0, (length $data), $data, 0;
2674 undef $fh; 2775 undef $fh;
2675 aio_rename "$meta~", $meta; 2776 aio_rename "$meta~", $meta;
2676 2777
2778 my $slaying = "?random/$md5";
2779
2780 if ($exit->valid) {
2677 $exit->slaying ("?random/$md5"); 2781 $exit->slaying ("?random/$md5");
2678 $exit->msg (undef); 2782 $exit->msg (undef);
2783 }
2679 } 2784 }
2680} 2785}
2681 2786
2682sub cf::object::player::enter_exit { 2787sub cf::object::player::enter_exit {
2683 my ($self, $exit) = @_; 2788 my ($self, $exit) = @_;
2684 2789
2685 return unless $self->type == cf::PLAYER; 2790 return unless $self->type == cf::PLAYER;
2686 2791
2687 if ($exit->slaying eq "/!") {
2688 #TODO: this should de-fi-ni-te-ly not be a sync-job
2689 # the problem is that $exit might not survive long enough
2690 # so it needs to be done right now, right here
2691 cf::sync_job { prepare_random_map $exit };
2692 }
2693
2694 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2695 my $hp = $exit->stats->hp;
2696 my $sp = $exit->stats->sp;
2697
2698 $self->enter_link; 2792 $self->enter_link;
2699 2793
2700 # if exit is damned, update players death & WoR home-position
2701 $self->contr->savebed ($slaying, $hp, $sp)
2702 if $exit->flag (FLAG_DAMNED);
2703
2704 (async { 2794 (async {
2705 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2795 $Coro::current->{desc} = "enter_exit";
2706 2796
2707 $self->deactivate_recursive; # just to be sure
2708 unless (eval { 2797 unless (eval {
2798 $self->deactivate_recursive; # just to be sure
2799
2800 # random map handling
2801 {
2802 my $guard = cf::lock_acquire "exit_prepare:$exit";
2803
2804 prepare_random_map $exit
2805 if $exit->slaying eq "/!";
2806 }
2807
2808 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2809 my $x = $exit->stats->hp;
2810 my $y = $exit->stats->sp;
2811
2709 $self->goto ($slaying, $hp, $sp); 2812 $self->goto ($map, $x, $y);
2710 2813
2814 # if exit is damned, update players death & WoR home-position
2815 $self->contr->savebed ($map, $x, $y)
2816 if $exit->flag (cf::FLAG_DAMNED);
2817
2711 1; 2818 1
2712 }) { 2819 }) {
2713 $self->message ("Something went wrong deep within the crossfire server. " 2820 $self->message ("Something went wrong deep within the deliantra server. "
2714 . "I'll try to bring you back to the map you were before. " 2821 . "I'll try to bring you back to the map you were before. "
2715 . "Please report this to the dungeon master!", 2822 . "Please report this to the dungeon master!",
2716 cf::NDI_UNIQUE | cf::NDI_RED); 2823 cf::NDI_UNIQUE | cf::NDI_RED);
2717 2824
2718 warn "ERROR in enter_exit: $@"; 2825 warn "ERROR in enter_exit: $@";
2735sub cf::client::send_drawinfo { 2842sub cf::client::send_drawinfo {
2736 my ($self, $text, $flags) = @_; 2843 my ($self, $text, $flags) = @_;
2737 2844
2738 utf8::encode $text; 2845 utf8::encode $text;
2739 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2846 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2847}
2848
2849=item $client->send_big_packet ($pkt)
2850
2851Like C<send_packet>, but tries to compress large packets, and fragments
2852them as required.
2853
2854=cut
2855
2856our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2857
2858sub cf::client::send_big_packet {
2859 my ($self, $pkt) = @_;
2860
2861 # try lzf for large packets
2862 $pkt = "lzf " . Compress::LZF::compress $pkt
2863 if 1024 <= length $pkt and $self->{can_lzf};
2864
2865 # split very large packets
2866 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2867 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2868 $pkt = "frag";
2869 }
2870
2871 $self->send_packet ($pkt);
2740} 2872}
2741 2873
2742=item $client->send_msg ($channel, $msg, $color, [extra...]) 2874=item $client->send_msg ($channel, $msg, $color, [extra...])
2743 2875
2744Send a drawinfo or msg packet to the client, formatting the msg for the 2876Send a drawinfo or msg packet to the client, formatting the msg for the
2748 2880
2749=cut 2881=cut
2750 2882
2751# non-persistent channels (usually the info channel) 2883# non-persistent channels (usually the info channel)
2752our %CHANNEL = ( 2884our %CHANNEL = (
2885 "c/motd" => {
2886 id => "infobox",
2887 title => "MOTD",
2888 reply => undef,
2889 tooltip => "The message of the day",
2890 },
2753 "c/identify" => { 2891 "c/identify" => {
2754 id => "infobox", 2892 id => "infobox",
2755 title => "Identify", 2893 title => "Identify",
2756 reply => undef, 2894 reply => undef,
2757 tooltip => "Items recently identified", 2895 tooltip => "Items recently identified",
2759 "c/examine" => { 2897 "c/examine" => {
2760 id => "infobox", 2898 id => "infobox",
2761 title => "Examine", 2899 title => "Examine",
2762 reply => undef, 2900 reply => undef,
2763 tooltip => "Signs and other items you examined", 2901 tooltip => "Signs and other items you examined",
2902 },
2903 "c/shopinfo" => {
2904 id => "infobox",
2905 title => "Shop Info",
2906 reply => undef,
2907 tooltip => "What your bargaining skill tells you about the shop",
2764 }, 2908 },
2765 "c/book" => { 2909 "c/book" => {
2766 id => "infobox", 2910 id => "infobox",
2767 title => "Book", 2911 title => "Book",
2768 reply => undef, 2912 reply => undef,
2784 id => "infobox", 2928 id => "infobox",
2785 title => "Body Parts", 2929 title => "Body Parts",
2786 reply => undef, 2930 reply => undef,
2787 tooltip => "Shows which body parts you posess and are available", 2931 tooltip => "Shows which body parts you posess and are available",
2788 }, 2932 },
2933 "c/statistics" => {
2934 id => "infobox",
2935 title => "Statistics",
2936 reply => undef,
2937 tooltip => "Shows your primary statistics",
2938 },
2939 "c/skills" => {
2940 id => "infobox",
2941 title => "Skills",
2942 reply => undef,
2943 tooltip => "Shows your experience per skill and item power",
2944 },
2945 "c/shopitems" => {
2946 id => "infobox",
2947 title => "Shop Items",
2948 reply => undef,
2949 tooltip => "Shows the items currently for sale in this shop",
2950 },
2951 "c/resistances" => {
2952 id => "infobox",
2953 title => "Resistances",
2954 reply => undef,
2955 tooltip => "Shows your resistances",
2956 },
2957 "c/pets" => {
2958 id => "infobox",
2959 title => "Pets",
2960 reply => undef,
2961 tooltip => "Shows information abotu your pets/a specific pet",
2962 },
2963 "c/perceiveself" => {
2964 id => "infobox",
2965 title => "Perceive Self",
2966 reply => undef,
2967 tooltip => "You gained detailed knowledge about yourself",
2968 },
2789 "c/uptime" => { 2969 "c/uptime" => {
2790 id => "infobox", 2970 id => "infobox",
2791 title => "Uptime", 2971 title => "Uptime",
2792 reply => undef, 2972 reply => undef,
2793 tooltip => "How long the server has been running since last restart", 2973 tooltip => "How long the server has been running since last restart",
2796 id => "infobox", 2976 id => "infobox",
2797 title => "Map Info", 2977 title => "Map Info",
2798 reply => undef, 2978 reply => undef,
2799 tooltip => "Information related to the maps", 2979 tooltip => "Information related to the maps",
2800 }, 2980 },
2981 "c/party" => {
2982 id => "party",
2983 title => "Party",
2984 reply => "gsay ",
2985 tooltip => "Messages and chat related to your party",
2986 },
2987 "c/death" => {
2988 id => "death",
2989 title => "Death",
2990 reply => undef,
2991 tooltip => "Reason for and more info about your most recent death",
2992 },
2993 "c/say" => $SAY_CHANNEL,
2994 "c/chat" => $CHAT_CHANNEL,
2801); 2995);
2802 2996
2803sub cf::client::send_msg { 2997sub cf::client::send_msg {
2804 my ($self, $channel, $msg, $color, @extra) = @_; 2998 my ($self, $channel, $msg, $color, @extra) = @_;
2805 2999
2806 $msg = $self->pl->expand_cfpod ($msg); 3000 $msg = $self->pl->expand_cfpod ($msg)
3001 unless $color & cf::NDI_VERBATIM;
2807 3002
2808 $color &= cf::NDI_CLIENT_MASK; # just in case... 3003 $color &= cf::NDI_CLIENT_MASK; # just in case...
2809 3004
2810 # check predefined channels, for the benefit of C 3005 # check predefined channels, for the benefit of C
2811 if ($CHANNEL{$channel}) { 3006 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel}; 3007 $channel = $CHANNEL{$channel};
2813 3008
2814 $self->ext_msg (channel_info => $channel) 3009 $self->ext_msg (channel_info => $channel);
2815 if $self->can_msg;
2816
2817 $channel = $channel->{id}; 3010 $channel = $channel->{id};
2818 3011
2819 } elsif (ref $channel) { 3012 } elsif (ref $channel) {
2820 # send meta info to client, if not yet sent 3013 # send meta info to client, if not yet sent
2821 unless (exists $self->{channel}{$channel->{id}}) { 3014 unless (exists $self->{channel}{$channel->{id}}) {
2822 $self->{channel}{$channel->{id}} = $channel; 3015 $self->{channel}{$channel->{id}} = $channel;
2823 $self->ext_msg (channel_info => $channel) 3016 $self->ext_msg (channel_info => $channel);
2824 if $self->can_msg;
2825 } 3017 }
2826 3018
2827 $channel = $channel->{id}; 3019 $channel = $channel->{id};
2828 } 3020 }
2829 3021
2830 return unless @extra || length $msg; 3022 return unless @extra || length $msg;
2831 3023
2832 if ($self->can_msg) {
2833 # default colour, mask it out 3024 # default colour, mask it out
2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3025 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2835 if $color & cf::NDI_DEF; 3026 if $color & cf::NDI_DEF;
2836 3027
2837 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3028 my $pkt = "msg "
3029 . $self->{json_coder}->encode (
2838 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3030 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2839 } else { 3031 );
2840 if ($color >= 0) {
2841 # replace some tags by gcfclient-compatible ones
2842 for ($msg) {
2843 1 while
2844 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2845 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2846 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2847 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2848 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2849 }
2850 3032
2851 $color &= cf::NDI_COLOR_MASK; 3033 $self->send_big_packet ($pkt);
2852
2853 utf8::encode $msg;
2854
2855 if (0 && $msg =~ /\[/) {
2856 # COMMAND/INFO
2857 $self->send_packet ("drawextinfo $color 10 8 $msg")
2858 } else {
2859 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2860 $self->send_packet ("drawinfo $color $msg")
2861 }
2862 }
2863 }
2864} 3034}
2865 3035
2866=item $client->ext_msg ($type, @msg) 3036=item $client->ext_msg ($type, @msg)
2867 3037
2868Sends an ext event to the client. 3038Sends an ext event to the client.
2871 3041
2872sub cf::client::ext_msg($$@) { 3042sub cf::client::ext_msg($$@) {
2873 my ($self, $type, @msg) = @_; 3043 my ($self, $type, @msg) = @_;
2874 3044
2875 if ($self->extcmd == 2) { 3045 if ($self->extcmd == 2) {
2876 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3046 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2877 } elsif ($self->extcmd == 1) { # TODO: remove 3047 } elsif ($self->extcmd == 1) { # TODO: remove
2878 push @msg, msgtype => "event_$type"; 3048 push @msg, msgtype => "event_$type";
2879 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3049 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2880 } 3050 }
2881} 3051}
2882 3052
2883=item $client->ext_reply ($msgid, @msg) 3053=item $client->ext_reply ($msgid, @msg)
2884 3054
2888 3058
2889sub cf::client::ext_reply($$@) { 3059sub cf::client::ext_reply($$@) {
2890 my ($self, $id, @msg) = @_; 3060 my ($self, $id, @msg) = @_;
2891 3061
2892 if ($self->extcmd == 2) { 3062 if ($self->extcmd == 2) {
2893 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3063 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2894 } elsif ($self->extcmd == 1) { 3064 } elsif ($self->extcmd == 1) {
2895 #TODO: version 1, remove 3065 #TODO: version 1, remove
2896 unshift @msg, msgtype => "reply", msgid => $id; 3066 unshift @msg, msgtype => "reply", msgid => $id;
2897 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3067 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2898 } 3068 }
2899} 3069}
2900 3070
2901=item $success = $client->query ($flags, "text", \&cb) 3071=item $success = $client->query ($flags, "text", \&cb)
2902 3072
3003 3173
3004 $coro 3174 $coro
3005} 3175}
3006 3176
3007cf::client->attach ( 3177cf::client->attach (
3008 on_destroy => sub { 3178 on_client_destroy => sub {
3009 my ($ns) = @_; 3179 my ($ns) = @_;
3010 3180
3011 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3181 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3012 }, 3182 },
3013); 3183);
3029our $safe_hole = new Safe::Hole; 3199our $safe_hole = new Safe::Hole;
3030 3200
3031$SIG{FPE} = 'IGNORE'; 3201$SIG{FPE} = 'IGNORE';
3032 3202
3033$safe->permit_only (Opcode::opset qw( 3203$safe->permit_only (Opcode::opset qw(
3034 :base_core :base_mem :base_orig :base_math 3204 :base_core :base_mem :base_orig :base_math :base_loop
3035 grepstart grepwhile mapstart mapwhile 3205 grepstart grepwhile mapstart mapwhile
3036 sort time 3206 sort time
3037)); 3207));
3038 3208
3039# here we export the classes and methods available to script code 3209# here we export the classes and methods available to script code
3042 3212
3043The following functions and methods are available within a safe environment: 3213The following functions and methods are available within a safe environment:
3044 3214
3045 cf::object 3215 cf::object
3046 contr pay_amount pay_player map x y force_find force_add destroy 3216 contr pay_amount pay_player map x y force_find force_add destroy
3047 insert remove name archname title slaying race decrease_ob_nr 3217 insert remove name archname title slaying race decrease split
3218 value
3048 3219
3049 cf::object::player 3220 cf::object::player
3050 player 3221 player
3051 3222
3052 cf::player 3223 cf::player
3057 3228
3058=cut 3229=cut
3059 3230
3060for ( 3231for (
3061 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3232 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3062 insert remove inv name archname title slaying race 3233 insert remove inv nrof name archname title slaying race
3063 decrease_ob_nr destroy)], 3234 decrease split destroy change_exp value msg lore send_msg)],
3064 ["cf::object::player" => qw(player)], 3235 ["cf::object::player" => qw(player)],
3065 ["cf::player" => qw(peaceful)], 3236 ["cf::player" => qw(peaceful send_msg)],
3066 ["cf::map" => qw(trigger)], 3237 ["cf::map" => qw(trigger)],
3067) { 3238) {
3068 no strict 'refs'; 3239 no strict 'refs';
3069 my ($pkg, @funs) = @$_; 3240 my ($pkg, @funs) = @$_;
3070 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3241 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3088 3259
3089 my $qcode = $code; 3260 my $qcode = $code;
3090 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3261 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3091 $qcode =~ s/\n/\\n/g; 3262 $qcode =~ s/\n/\\n/g;
3092 3263
3264 %vars = (_dummy => 0) unless %vars;
3265
3266 my @res;
3093 local $_; 3267 local $_;
3094 local @safe::cf::_safe_eval_args = values %vars;
3095 3268
3096 my $eval = 3269 my $eval =
3097 "do {\n" 3270 "do {\n"
3098 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3271 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3099 . "#line 0 \"{$qcode}\"\n" 3272 . "#line 0 \"{$qcode}\"\n"
3100 . $code 3273 . $code
3101 . "\n}" 3274 . "\n}"
3102 ; 3275 ;
3103 3276
3277 if ($CFG{safe_eval}) {
3104 sub_generation_inc; 3278 sub_generation_inc;
3279 local @safe::cf::_safe_eval_args = values %vars;
3105 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3280 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3106 sub_generation_inc; 3281 sub_generation_inc;
3282 } else {
3283 local @cf::_safe_eval_args = values %vars;
3284 @res = wantarray ? eval eval : scalar eval $eval;
3285 }
3107 3286
3108 if ($@) { 3287 if ($@) {
3109 warn "$@"; 3288 warn "$@";
3110 warn "while executing safe code '$code'\n"; 3289 warn "while executing safe code '$code'\n";
3111 warn "with arguments " . (join " ", %vars) . "\n"; 3290 warn "with arguments " . (join " ", %vars) . "\n";
3130=cut 3309=cut
3131 3310
3132sub register_script_function { 3311sub register_script_function {
3133 my ($fun, $cb) = @_; 3312 my ($fun, $cb) = @_;
3134 3313
3135 no strict 'refs'; 3314 $fun = "safe::$fun" if $CFG{safe_eval};
3136 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3315 *$fun = $safe_hole->wrap ($cb);
3137} 3316}
3138 3317
3139=back 3318=back
3140 3319
3141=cut 3320=cut
3162 3341
3163 $facedata->{version} == 2 3342 $facedata->{version} == 2
3164 or cf::cleanup "$path: version mismatch, cannot proceed."; 3343 or cf::cleanup "$path: version mismatch, cannot proceed.";
3165 3344
3166 # patch in the exptable 3345 # patch in the exptable
3346 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3167 $facedata->{resource}{"res/exp_table"} = { 3347 $facedata->{resource}{"res/exp_table"} = {
3168 type => FT_RSRC, 3348 type => FT_RSRC,
3169 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3349 data => $exp_table,
3350 hash => (Digest::MD5::md5 $exp_table),
3170 }; 3351 };
3171 cf::cede_to_tick; 3352 cf::cede_to_tick;
3172 3353
3173 { 3354 {
3174 my $faces = $facedata->{faceinfo}; 3355 my $faces = $facedata->{faceinfo};
3176 while (my ($face, $info) = each %$faces) { 3357 while (my ($face, $info) = each %$faces) {
3177 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3358 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3178 3359
3179 cf::face::set_visibility $idx, $info->{visibility}; 3360 cf::face::set_visibility $idx, $info->{visibility};
3180 cf::face::set_magicmap $idx, $info->{magicmap}; 3361 cf::face::set_magicmap $idx, $info->{magicmap};
3181 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3362 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3182 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3363 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3183 3364
3184 cf::cede_to_tick; 3365 cf::cede_to_tick;
3185 } 3366 }
3186 3367
3187 while (my ($face, $info) = each %$faces) { 3368 while (my ($face, $info) = each %$faces) {
3211 3392
3212 cf::anim::invalidate_all; # d'oh 3393 cf::anim::invalidate_all; # d'oh
3213 } 3394 }
3214 3395
3215 { 3396 {
3216 # TODO: for gcfclient pleasure, we should give resources
3217 # that gcfclient doesn't grok a >10000 face index.
3218 my $res = $facedata->{resource}; 3397 my $res = $facedata->{resource};
3219 3398
3220 while (my ($name, $info) = each %$res) { 3399 while (my ($name, $info) = each %$res) {
3221 if (defined $info->{type}) { 3400 if (defined $info->{type}) {
3222 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3401 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3223 my $data;
3224 3402
3225 if ($info->{type} & 1) { 3403 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3226 # prepend meta info
3227
3228 my $meta = $enc->encode ({
3229 name => $name,
3230 %{ $info->{meta} || {} },
3231 });
3232
3233 $data = pack "(w/a*)*", $meta, $info->{data};
3234 } else {
3235 $data = $info->{data};
3236 }
3237
3238 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3239 cf::face::set_type $idx, $info->{type}; 3404 cf::face::set_type $idx, $info->{type};
3240 } else { 3405 } else {
3241 $RESOURCE{$name} = $info; 3406 $RESOURCE{$name} = $info;
3242 } 3407 }
3243 3408
3276 while (my ($k, $v) = each %$want) { 3441 while (my ($k, $v) = each %$want) {
3277 $ns->fx_want ($k, $v); 3442 $ns->fx_want ($k, $v);
3278 } 3443 }
3279}; 3444};
3280 3445
3446sub load_resource_file($) {
3447 my $guard = lock_acquire "load_resource_file";
3448
3449 my $status = load_resource_file_ $_[0];
3450 get_slot 0.1, 100;
3451 cf::arch::commit_load;
3452
3453 $status
3454}
3455
3281sub reload_regions { 3456sub reload_regions {
3282 # HACK to clear player env face cache, we need some signal framework 3457 # HACK to clear player env face cache, we need some signal framework
3283 # for this (global event?) 3458 # for this (global event?)
3284 %ext::player_env::MUSIC_FACE_CACHE = (); 3459 %ext::player_env::MUSIC_FACE_CACHE = ();
3285 3460
3298} 3473}
3299 3474
3300sub reload_archetypes { 3475sub reload_archetypes {
3301 load_resource_file "$DATADIR/archetypes" 3476 load_resource_file "$DATADIR/archetypes"
3302 or die "unable to load archetypes\n"; 3477 or die "unable to load archetypes\n";
3303 #d# NEED to laod twice to resolve forward references
3304 # this really needs to be done in an extra post-pass
3305 # (which needs to be synchronous, so solve it differently)
3306 load_resource_file "$DATADIR/archetypes"
3307 or die "unable to load archetypes\n";
3308} 3478}
3309 3479
3310sub reload_treasures { 3480sub reload_treasures {
3311 load_resource_file "$DATADIR/treasures" 3481 load_resource_file "$DATADIR/treasures"
3312 or die "unable to load treasurelists\n"; 3482 or die "unable to load treasurelists\n";
3313} 3483}
3314 3484
3315sub reload_resources { 3485sub reload_resources {
3316 warn "reloading resource files...\n"; 3486 warn "reloading resource files...\n";
3317 3487
3488 reload_facedata;
3489 reload_archetypes;
3318 reload_regions; 3490 reload_regions;
3319 reload_facedata;
3320 #reload_archetypes;#d#
3321 reload_archetypes;
3322 reload_treasures; 3491 reload_treasures;
3323 3492
3324 warn "finished reloading resource files\n"; 3493 warn "finished reloading resource files\n";
3325} 3494}
3326 3495
3327sub init {
3328 reload_resources;
3329}
3330
3331sub reload_config { 3496sub reload_config {
3497 warn "reloading config file...\n";
3498
3332 open my $fh, "<:utf8", "$CONFDIR/config" 3499 open my $fh, "<:utf8", "$CONFDIR/config"
3333 or return; 3500 or return;
3334 3501
3335 local $/; 3502 local $/;
3336 *CFG = YAML::Load <$fh>; 3503 *CFG = YAML::XS::Load scalar <$fh>;
3337 3504
3338 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3505 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3339 3506
3340 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3507 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3341 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3508 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3345 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3512 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3346 and die "WARNING: m(un)lockall failed: $!\n"; 3513 and die "WARNING: m(un)lockall failed: $!\n";
3347 }; 3514 };
3348 warn $@ if $@; 3515 warn $@ if $@;
3349 } 3516 }
3517
3518 warn "finished reloading resource files\n";
3519}
3520
3521sub pidfile() {
3522 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3523 or die "$PIDFILE: $!";
3524 flock $fh, &Fcntl::LOCK_EX
3525 or die "$PIDFILE: flock: $!";
3526 $fh
3527}
3528
3529# make sure only one server instance is running at any one time
3530sub atomic {
3531 my $fh = pidfile;
3532
3533 my $pid = <$fh>;
3534 kill 9, $pid if $pid > 0;
3535
3536 seek $fh, 0, 0;
3537 print $fh $$;
3538}
3539
3540sub main_loop {
3541 warn "EV::loop starting\n";
3542 if (1) {
3543 EV::loop;
3544 }
3545 warn "EV::loop returned\n";
3546 goto &main_loop unless $REALLY_UNLOOP;
3350} 3547}
3351 3548
3352sub main { 3549sub main {
3550 cf::init_globals; # initialise logging
3551
3552 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3553 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3554 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3555 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3556
3557 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3558
3353 # we must not ever block the main coroutine 3559 # we must not ever block the main coroutine
3354 local $Coro::idle = sub { 3560 local $Coro::idle = sub {
3355 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3561 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3356 (async { 3562 (async {
3357 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3563 $Coro::current->{desc} = "IDLE BUG HANDLER";
3358 EV::loop EV::LOOP_ONESHOT; 3564 EV::loop EV::LOOP_ONESHOT;
3359 })->prio (Coro::PRIO_MAX); 3565 })->prio (Coro::PRIO_MAX);
3360 }; 3566 };
3361 3567
3362 reload_config;
3363 db_init;
3364 load_extensions;
3365
3366 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3367 evthread_start IO::AIO::poll_fileno; 3568 evthread_start IO::AIO::poll_fileno;
3368 EV::loop; 3569
3570 cf::sync_job {
3571 cf::init_experience;
3572 cf::init_anim;
3573 cf::init_attackmess;
3574 cf::init_dynamic;
3575
3576 cf::load_settings;
3577 cf::load_materials;
3578
3579 reload_resources;
3580 reload_config;
3581 db_init;
3582
3583 cf::init_uuid;
3584 cf::init_signals;
3585 cf::init_skills;
3586
3587 cf::init_beforeplay;
3588
3589 atomic;
3590
3591 load_extensions;
3592
3593 utime time, time, $RUNTIMEFILE;
3594
3595 # no (long-running) fork's whatsoever before this point(!)
3596 use POSIX ();
3597 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3598
3599 (pop @POST_INIT)->(0) while @POST_INIT;
3600 };
3601
3602 cf::object::thawer::errors_are_fatal 0;
3603 warn "parse errors in files are no longer fatal from this point on.\n";
3604
3605 main_loop;
3369} 3606}
3370 3607
3371############################################################################# 3608#############################################################################
3372# initialisation and cleanup 3609# initialisation and cleanup
3373 3610
3374# install some emergency cleanup handlers 3611# install some emergency cleanup handlers
3375BEGIN { 3612BEGIN {
3376 our %SIGWATCHER = (); 3613 our %SIGWATCHER = ();
3377 for my $signal (qw(INT HUP TERM)) { 3614 for my $signal (qw(INT HUP TERM)) {
3378 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3615 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3379 cf::cleanup "SIG$signal"; 3616 cf::cleanup "SIG$signal";
3380 }; 3617 };
3381 } 3618 }
3382} 3619}
3383 3620
3384sub write_runtime { 3621sub write_runtime_sync {
3385 my $runtime = "$LOCALDIR/runtime"; 3622 my $t0 = AE::time;
3386 3623
3387 # first touch the runtime file to show we are still running: 3624 # first touch the runtime file to show we are still running:
3388 # the fsync below can take a very very long time. 3625 # the fsync below can take a very very long time.
3389 3626
3390 IO::AIO::aio_utime $runtime, undef, undef; 3627 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3391 3628
3392 my $guard = cf::lock_acquire "write_runtime"; 3629 my $guard = cf::lock_acquire "write_runtime";
3393 3630
3394 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3631 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3395 or return; 3632 or return;
3396 3633
3397 my $value = $cf::RUNTIME + 90 + 10; 3634 my $value = $cf::RUNTIME + 90 + 10;
3398 # 10 is the runtime save interval, for a monotonic clock 3635 # 10 is the runtime save interval, for a monotonic clock
3399 # 60 allows for the watchdog to kill the server. 3636 # 60 allows for the watchdog to kill the server.
3409 aio_utime $fh, undef, undef; 3646 aio_utime $fh, undef, undef;
3410 3647
3411 close $fh 3648 close $fh
3412 or return; 3649 or return;
3413 3650
3414 aio_rename "$runtime~", $runtime 3651 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3415 and return; 3652 and return;
3416 3653
3417 warn "runtime file written.\n"; 3654 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3418 3655
3419 1 3656 1
3657}
3658
3659our $uuid_lock;
3660our $uuid_skip;
3661
3662sub write_uuid_sync($) {
3663 $uuid_skip ||= $_[0];
3664
3665 return if $uuid_lock;
3666 local $uuid_lock = 1;
3667
3668 my $uuid = "$LOCALDIR/uuid";
3669
3670 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3671 or return;
3672
3673 my $value = uuid_seq uuid_cur;
3674
3675 unless ($value) {
3676 warn "cowardly refusing to write zero uuid value!\n";
3677 return;
3678 }
3679
3680 my $value = uuid_str $value + $uuid_skip;
3681 $uuid_skip = 0;
3682
3683 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3684 and return;
3685
3686 # always fsync - this file is important
3687 aio_fsync $fh
3688 and return;
3689
3690 close $fh
3691 or return;
3692
3693 aio_rename "$uuid~", $uuid
3694 and return;
3695
3696 warn "uuid file written ($value).\n";
3697
3698 1
3699
3700}
3701
3702sub write_uuid($$) {
3703 my ($skip, $sync) = @_;
3704
3705 $sync ? write_uuid_sync $skip
3706 : async { write_uuid_sync $skip };
3420} 3707}
3421 3708
3422sub emergency_save() { 3709sub emergency_save() {
3423 my $freeze_guard = cf::freeze_mainloop; 3710 my $freeze_guard = cf::freeze_mainloop;
3424 3711
3425 warn "enter emergency perl save\n"; 3712 warn "emergency_perl_save: enter\n";
3426 3713
3427 cf::sync_job { 3714 cf::sync_job {
3715 # this is a trade-off: we want to be very quick here, so
3716 # save all maps without fsync, and later call a global sync
3717 # (which in turn might be very very slow)
3718 local $USE_FSYNC = 0;
3719
3428 # use a peculiar iteration method to avoid tripping on perl 3720 # use a peculiar iteration method to avoid tripping on perl
3429 # refcount bugs in for. also avoids problems with players 3721 # refcount bugs in for. also avoids problems with players
3430 # and maps saved/destroyed asynchronously. 3722 # and maps saved/destroyed asynchronously.
3431 warn "begin emergency player save\n"; 3723 warn "emergency_perl_save: begin player save\n";
3432 for my $login (keys %cf::PLAYER) { 3724 for my $login (keys %cf::PLAYER) {
3433 my $pl = $cf::PLAYER{$login} or next; 3725 my $pl = $cf::PLAYER{$login} or next;
3434 $pl->valid or next; 3726 $pl->valid or next;
3435 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3727 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3436 $pl->save; 3728 $pl->save;
3437 } 3729 }
3438 warn "end emergency player save\n"; 3730 warn "emergency_perl_save: end player save\n";
3439 3731
3440 warn "begin emergency map save\n"; 3732 warn "emergency_perl_save: begin map save\n";
3441 for my $path (keys %cf::MAP) { 3733 for my $path (keys %cf::MAP) {
3442 my $map = $cf::MAP{$path} or next; 3734 my $map = $cf::MAP{$path} or next;
3443 $map->valid or next; 3735 $map->valid or next;
3444 $map->save; 3736 $map->save;
3445 } 3737 }
3446 warn "end emergency map save\n"; 3738 warn "emergency_perl_save: end map save\n";
3447 3739
3448 warn "begin emergency database checkpoint\n"; 3740 warn "emergency_perl_save: begin database checkpoint\n";
3449 BDB::db_env_txn_checkpoint $DB_ENV; 3741 BDB::db_env_txn_checkpoint $DB_ENV;
3450 warn "end emergency database checkpoint\n"; 3742 warn "emergency_perl_save: end database checkpoint\n";
3743
3744 warn "emergency_perl_save: begin write uuid\n";
3745 write_uuid_sync 1;
3746 warn "emergency_perl_save: end write uuid\n";
3451 }; 3747 };
3452 3748
3749 warn "emergency_perl_save: starting sync()\n";
3750 IO::AIO::aio_sync sub {
3751 warn "emergency_perl_save: finished sync()\n";
3752 };
3753
3453 warn "leave emergency perl save\n"; 3754 warn "emergency_perl_save: leave\n";
3454} 3755}
3455 3756
3456sub post_cleanup { 3757sub post_cleanup {
3457 my ($make_core) = @_; 3758 my ($make_core) = @_;
3458 3759
3459 warn Carp::longmess "post_cleanup backtrace" 3760 warn Carp::longmess "post_cleanup backtrace"
3460 if $make_core; 3761 if $make_core;
3762
3763 my $fh = pidfile;
3764 unlink $PIDFILE if <$fh> == $$;
3765}
3766
3767# a safer delete_package, copied from Symbol
3768sub clear_package($) {
3769 my $pkg = shift;
3770
3771 # expand to full symbol table name if needed
3772 unless ($pkg =~ /^main::.*::$/) {
3773 $pkg = "main$pkg" if $pkg =~ /^::/;
3774 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3775 $pkg .= '::' unless $pkg =~ /::$/;
3776 }
3777
3778 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3779 my $stem_symtab = *{$stem}{HASH};
3780
3781 defined $stem_symtab and exists $stem_symtab->{$leaf}
3782 or return;
3783
3784 # clear all symbols
3785 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3786 for my $name (keys %$leaf_symtab) {
3787 _gv_clear *{"$pkg$name"};
3788# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3789 }
3790 warn "cleared package $pkg\n";#d#
3461} 3791}
3462 3792
3463sub do_reload_perl() { 3793sub do_reload_perl() {
3464 # can/must only be called in main 3794 # can/must only be called in main
3465 if ($Coro::current != $Coro::main) { 3795 if ($Coro::current != $Coro::main) {
3466 warn "can only reload from main coroutine"; 3796 warn "can only reload from main coroutine";
3467 return; 3797 return;
3468 } 3798 }
3469 3799
3800 return if $RELOAD++;
3801
3802 my $t1 = AE::time;
3803
3804 while ($RELOAD) {
3470 warn "reloading..."; 3805 warn "reloading...";
3471 3806
3472 warn "entering sync_job"; 3807 warn "entering sync_job";
3473 3808
3474 cf::sync_job { 3809 cf::sync_job {
3475 cf::write_runtime; # external watchdog should not bark 3810 cf::write_runtime_sync; # external watchdog should not bark
3476 cf::emergency_save; 3811 cf::emergency_save;
3477 cf::write_runtime; # external watchdog should not bark 3812 cf::write_runtime_sync; # external watchdog should not bark
3478 3813
3479 warn "syncing database to disk"; 3814 warn "syncing database to disk";
3480 BDB::db_env_txn_checkpoint $DB_ENV; 3815 BDB::db_env_txn_checkpoint $DB_ENV;
3481 3816
3482 # if anything goes wrong in here, we should simply crash as we already saved 3817 # if anything goes wrong in here, we should simply crash as we already saved
3483 3818
3484 warn "flushing outstanding aio requests"; 3819 warn "flushing outstanding aio requests";
3485 for (;;) {
3486 BDB::flush;
3487 IO::AIO::flush;
3488 Coro::cede_notself;
3489 last unless IO::AIO::nreqs || BDB::nreqs; 3820 while (IO::AIO::nreqs || BDB::nreqs) {
3490 warn "iterate..."; 3821 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3491 }
3492
3493 ++$RELOAD;
3494
3495 warn "cancelling all extension coros";
3496 $_->cancel for values %EXT_CORO;
3497 %EXT_CORO = ();
3498
3499 warn "removing commands";
3500 %COMMAND = ();
3501
3502 warn "removing ext/exti commands";
3503 %EXTCMD = ();
3504 %EXTICMD = ();
3505
3506 warn "unloading/nuking all extensions";
3507 for my $pkg (@EXTS) {
3508 warn "... unloading $pkg";
3509
3510 if (my $cb = $pkg->can ("unload")) {
3511 eval {
3512 $cb->($pkg);
3513 1
3514 } or warn "$pkg unloaded, but with errors: $@";
3515 } 3822 }
3516 3823
3517 warn "... nuking $pkg"; 3824 warn "cancelling all extension coros";
3518 Symbol::delete_package $pkg; 3825 $_->cancel for values %EXT_CORO;
3519 } 3826 %EXT_CORO = ();
3520 3827
3521 warn "unloading all perl modules loaded from $LIBDIR"; 3828 warn "removing commands";
3522 while (my ($k, $v) = each %INC) { 3829 %COMMAND = ();
3523 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3524 3830
3831 warn "removing ext/exti commands";
3832 %EXTCMD = ();
3833 %EXTICMD = ();
3834
3835 warn "unloading/nuking all extensions";
3836 for my $pkg (@EXTS) {
3525 warn "... unloading $k"; 3837 warn "... unloading $pkg";
3526 delete $INC{$k};
3527 3838
3528 $k =~ s/\.pm$//;
3529 $k =~ s/\//::/g;
3530
3531 if (my $cb = $k->can ("unload_module")) { 3839 if (my $cb = $pkg->can ("unload")) {
3840 eval {
3532 $cb->(); 3841 $cb->($pkg);
3842 1
3843 } or warn "$pkg unloaded, but with errors: $@";
3844 }
3845
3846 warn "... clearing $pkg";
3847 clear_package $pkg;
3533 } 3848 }
3534 3849
3535 Symbol::delete_package $k; 3850 warn "unloading all perl modules loaded from $LIBDIR";
3851 while (my ($k, $v) = each %INC) {
3852 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3853
3854 warn "... unloading $k";
3855 delete $INC{$k};
3856
3857 $k =~ s/\.pm$//;
3858 $k =~ s/\//::/g;
3859
3860 if (my $cb = $k->can ("unload_module")) {
3861 $cb->();
3862 }
3863
3864 clear_package $k;
3536 } 3865 }
3537 3866
3538 warn "getting rid of safe::, as good as possible"; 3867 warn "getting rid of safe::, as good as possible";
3539 Symbol::delete_package "safe::$_" 3868 clear_package "safe::$_"
3540 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3869 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3541 3870
3542 warn "unloading cf.pm \"a bit\""; 3871 warn "unloading cf.pm \"a bit\"";
3543 delete $INC{"cf.pm"}; 3872 delete $INC{"cf.pm"};
3544 delete $INC{"cf/pod.pm"}; 3873 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3545 3874
3546 # don't, removes xs symbols, too, 3875 # don't, removes xs symbols, too,
3547 # and global variables created in xs 3876 # and global variables created in xs
3548 #Symbol::delete_package __PACKAGE__; 3877 #clear_package __PACKAGE__;
3549 3878
3550 warn "unload completed, starting to reload now"; 3879 warn "unload completed, starting to reload now";
3551 3880
3552 warn "reloading cf.pm"; 3881 warn "reloading cf.pm";
3553 require cf; 3882 require cf;
3554 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3883 cf::_connect_to_perl_1;
3555 3884
3556 warn "loading config and database again"; 3885 warn "loading config and database again";
3557 cf::reload_config; 3886 cf::reload_config;
3558 3887
3559 warn "loading extensions"; 3888 warn "loading extensions";
3560 cf::load_extensions; 3889 cf::load_extensions;
3561 3890
3891 if ($REATTACH_ON_RELOAD) {
3562 warn "reattaching attachments to objects/players"; 3892 warn "reattaching attachments to objects/players";
3563 _global_reattach; # objects, sockets 3893 _global_reattach; # objects, sockets
3564 warn "reattaching attachments to maps"; 3894 warn "reattaching attachments to maps";
3565 reattach $_ for values %MAP; 3895 reattach $_ for values %MAP;
3566 warn "reattaching attachments to players"; 3896 warn "reattaching attachments to players";
3567 reattach $_ for values %PLAYER; 3897 reattach $_ for values %PLAYER;
3898 }
3568 3899
3900 warn "running post_init jobs";
3901 (pop @POST_INIT)->(1) while @POST_INIT;
3902
3569 warn "leaving sync_job"; 3903 warn "leaving sync_job";
3570 3904
3571 1 3905 1
3572 } or do { 3906 } or do {
3573 warn $@; 3907 warn $@;
3574 cf::cleanup "error while reloading, exiting."; 3908 cf::cleanup "error while reloading, exiting.";
3575 }; 3909 };
3576 3910
3577 warn "reloaded"; 3911 warn "reloaded";
3912 --$RELOAD;
3913 }
3914
3915 $t1 = AE::time - $t1;
3916 warn "reload completed in ${t1}s\n";
3578}; 3917};
3579 3918
3580our $RELOAD_WATCHER; # used only during reload 3919our $RELOAD_WATCHER; # used only during reload
3581 3920
3582sub reload_perl() { 3921sub reload_perl() {
3583 # doing reload synchronously and two reloads happen back-to-back, 3922 # doing reload synchronously and two reloads happen back-to-back,
3584 # coro crashes during coro_state_free->destroy here. 3923 # coro crashes during coro_state_free->destroy here.
3585 3924
3925 $RELOAD_WATCHER ||= cf::async {
3926 Coro::AIO::aio_wait cache_extensions;
3927
3586 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3928 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3587 do_reload_perl; 3929 do_reload_perl;
3588 undef $RELOAD_WATCHER; 3930 undef $RELOAD_WATCHER;
3931 };
3589 }; 3932 };
3590} 3933}
3591 3934
3592register_command "reload" => sub { 3935register_command "reload" => sub {
3593 my ($who, $arg) = @_; 3936 my ($who, $arg) = @_;
3607 3950
3608our @WAIT_FOR_TICK; 3951our @WAIT_FOR_TICK;
3609our @WAIT_FOR_TICK_BEGIN; 3952our @WAIT_FOR_TICK_BEGIN;
3610 3953
3611sub wait_for_tick { 3954sub wait_for_tick {
3612 return if tick_inhibit;
3613 return if $Coro::current == $Coro::main; 3955 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3614 3956
3615 my $signal = new Coro::Signal; 3957 my $signal = new Coro::Signal;
3616 push @WAIT_FOR_TICK, $signal; 3958 push @WAIT_FOR_TICK, $signal;
3617 $signal->wait; 3959 $signal->wait;
3618} 3960}
3619 3961
3620sub wait_for_tick_begin { 3962sub wait_for_tick_begin {
3621 return if tick_inhibit;
3622 return if $Coro::current == $Coro::main; 3963 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3623 3964
3624 my $signal = new Coro::Signal; 3965 my $signal = new Coro::Signal;
3625 push @WAIT_FOR_TICK_BEGIN, $signal; 3966 push @WAIT_FOR_TICK_BEGIN, $signal;
3626 $signal->wait; 3967 $signal->wait;
3627} 3968}
3633 return; 3974 return;
3634 } 3975 }
3635 3976
3636 cf::server_tick; # one server iteration 3977 cf::server_tick; # one server iteration
3637 3978
3979 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3980
3638 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3981 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3639 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3982 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3640 Coro::async_pool { 3983 Coro::async_pool {
3641 $Coro::current->{desc} = "runtime saver"; 3984 $Coro::current->{desc} = "runtime saver";
3642 write_runtime 3985 write_runtime_sync
3643 or warn "ERROR: unable to write runtime file: $!"; 3986 or warn "ERROR: unable to write runtime file: $!";
3644 }; 3987 };
3645 } 3988 }
3646 3989
3647 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3990 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3664} 4007}
3665 4008
3666{ 4009{
3667 # configure BDB 4010 # configure BDB
3668 4011
3669 BDB::min_parallel 8; 4012 BDB::min_parallel 16;
3670 BDB::max_poll_reqs $TICK * 0.1; 4013 BDB::max_poll_reqs $TICK * 0.1;
3671 $Coro::BDB::WATCHER->priority (1); 4014 $AnyEvent::BDB::WATCHER->priority (1);
3672 4015
3673 unless ($DB_ENV) { 4016 unless ($DB_ENV) {
3674 $DB_ENV = BDB::db_env_create; 4017 $DB_ENV = BDB::db_env_create;
3675 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4018 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3676 | BDB::LOG_AUTOREMOVE, 1); 4019 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4020 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3677 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4021 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3678 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4022 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3679 4023
3680 cf::sync_job { 4024 cf::sync_job {
3681 eval { 4025 eval {
3707{ 4051{
3708 # configure IO::AIO 4052 # configure IO::AIO
3709 4053
3710 IO::AIO::min_parallel 8; 4054 IO::AIO::min_parallel 8;
3711 IO::AIO::max_poll_time $TICK * 0.1; 4055 IO::AIO::max_poll_time $TICK * 0.1;
3712 $Coro::AIO::WATCHER->priority (1); 4056 undef $AnyEvent::AIO::WATCHER;
3713} 4057}
3714 4058
3715my $_log_backtrace; 4059my $_log_backtrace;
3716 4060
3717sub _log_backtrace { 4061sub _log_backtrace {
3720 $msg =~ s/\n//; 4064 $msg =~ s/\n//;
3721 4065
3722 # limit the # of concurrent backtraces 4066 # limit the # of concurrent backtraces
3723 if ($_log_backtrace < 2) { 4067 if ($_log_backtrace < 2) {
3724 ++$_log_backtrace; 4068 ++$_log_backtrace;
4069 my $perl_bt = Carp::longmess $msg;
3725 async { 4070 async {
3726 $Coro::current->{desc} = "abt $msg"; 4071 $Coro::current->{desc} = "abt $msg";
3727 4072
3728 my @bt = fork_call { 4073 my @bt = fork_call {
3729 @addr = map { sprintf "%x", $_ } @addr; 4074 @addr = map { sprintf "%x", $_ } @addr;
3740 } 4085 }
3741 4086
3742 @funcs 4087 @funcs
3743 }; 4088 };
3744 4089
3745 LOG llevInfo, "[ABT] $msg\n"; 4090 LOG llevInfo, "[ABT] $perl_bt\n";
4091 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3746 LOG llevInfo, "[ABT] $_\n" for @bt; 4092 LOG llevInfo, "[ABT] $_\n" for @bt;
3747 --$_log_backtrace; 4093 --$_log_backtrace;
3748 }; 4094 };
3749 } else { 4095 } else {
3750 LOG llevInfo, "[ABT] $msg\n"; 4096 LOG llevInfo, "[ABT] $msg\n";
3751 LOG llevInfo, "[ABT] [suppressed]\n"; 4097 LOG llevInfo, "[ABT] [suppressed]\n";
3752 } 4098 }
3753} 4099}
3754 4100
3755# load additional modules 4101# load additional modules
3756use cf::pod; 4102require "cf/$_.pm" for @EXTRA_MODULES;
4103cf::_connect_to_perl_2;
3757 4104
3758END { cf::emergency_save } 4105END { cf::emergency_save }
3759 4106
37601 41071
3761 4108

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines