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.417 by root, Fri Apr 11 14:09:57 2008 UTC vs.
Revision 1.541 by root, Tue May 4 23:33:16 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
24use utf8; 25use common::sense;
25use strict;
26 26
27use Symbol; 27use Symbol;
28use List::Util; 28use List::Util;
29use Socket; 29use Socket;
30use EV 3.2; 30use EV;
31use Opcode; 31use Opcode;
32use Safe; 32use Safe;
33use Safe::Hole; 33use Safe::Hole;
34use Storable (); 34use Storable ();
35use Carp ();
35 36
37use Guard ();
36use Coro 4.50 (); 38use Coro ();
37use Coro::State; 39use Coro::State;
38use Coro::Handle; 40use Coro::Handle;
39use Coro::EV; 41use Coro::EV;
42use Coro::AnyEvent;
40use Coro::Timer; 43use Coro::Timer;
41use Coro::Signal; 44use Coro::Signal;
42use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
43use Coro::AIO; 48use Coro::AIO;
44use Coro::BDB; 49use Coro::BDB 1.6;
45use Coro::Storable; 50use Coro::Storable;
46use Coro::Util (); 51use Coro::Util ();
47 52
48use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
49use BDB (); 54use BDB ();
50use Data::Dumper; 55use Data::Dumper;
51use Digest::MD5;
52use Fcntl; 56use Fcntl;
53use YAML (); 57use YAML::XS ();
54use IO::AIO 2.51 (); 58use IO::AIO ();
55use Time::HiRes; 59use Time::HiRes;
56use Compress::LZF; 60use Compress::LZF;
57use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
58 64
59# configure various modules to our taste 65# configure various modules to our taste
60# 66#
61$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
64 75
65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
66 78
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
68 82
69our %COMMAND = (); 83our %COMMAND = ();
70our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
71 85
72our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
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; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
93 118
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 121our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
99 123
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 127our $DB_ENV;
105 128
129our @EXTRA_MODULES = qw(pod match mapscript);
130
106our %CFG; 131our %CFG;
107 132
108our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
109our $RUNTIME; 134our $RUNTIME;
110our $NOW; 135our $NOW;
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 146our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
123 148
149our @POST_INIT;
150
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
153
124binmode STDOUT; 154binmode STDOUT;
125binmode STDERR; 155binmode STDERR;
126 156
127# read virtual server time, if available 157# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
132} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
133 165
134mkdir $_ 166mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136 168
137our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
138 170
139sub cf::map::normalise; 171sub cf::map::normalise;
172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
140 187
141############################################################################# 188#############################################################################
142 189
143=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
144 191
191returns directly I<after> the tick processing (and consequently, can only wake one process 238returns 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. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
193 240
194=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
195 242
196This array contains the results of the last C<invoke ()> call. When 243This 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 244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
198that call. 245that call.
199 246
247=item %cf::REFLECT
248
249Contains, for each (C++) class name, a hash reference with information
250about object members (methods, scalars, arrays and flags) and other
251metadata, which is useful for introspection.
252
200=back 253=back
201 254
202=cut 255=cut
203 256
204BEGIN { 257sub error(@) { LOG llevError, join "", @_ }
205 *CORE::GLOBAL::warn = sub { 258sub warn (@) { LOG llevWarn , join "", @_ }
259sub info (@) { LOG llevInfo , join "", @_ }
260sub debug(@) { LOG llevDebug, join "", @_ }
261sub trace(@) { LOG llevTrace, join "", @_ }
262
263$Coro::State::WARNHOOK = sub {
206 my $msg = join "", @_; 264 my $msg = join "", @_;
207 265
208 $msg .= "\n" 266 $msg .= "\n"
209 unless $msg =~ /\n$/; 267 unless $msg =~ /\n$/;
210 268
211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 269 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
212 270
213 LOG llevError, $msg; 271 LOG llevWarn, $msg;
214 }; 272};
215}
216 273
217$Coro::State::DIEHOOK = sub { 274$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "==" 275 return unless $^S eq 0; # "eq", not "=="
219 276
220 if ($Coro::current == $Coro::main) {#d# 277 error Carp::longmess $_[0];
278
279 if (in_main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d# 280 error "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d# 281 return;#d#
223 }#d# 282 }#d#
224 283
225 # kill coroutine otherwise 284 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate 285 Coro::terminate
228}; 286};
229
230$SIG{__DIE__} = sub { }; #d#?
231 287
232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 288@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 289@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 290@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 291@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
242for my $pkg (qw( 298for my $pkg (qw(
243 cf::global cf::attachable 299 cf::global cf::attachable
244 cf::object cf::object::player 300 cf::object cf::object::player
245 cf::client cf::player 301 cf::client cf::player
246 cf::arch cf::living 302 cf::arch cf::living
303 cf::map cf::mapspace
247 cf::map cf::party cf::region 304 cf::party cf::region
248)) { 305)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 306 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 307}
252 308
253$EV::DIED = sub { 309$EV::DIED = sub {
254 warn "error in event callback: @_"; 310 Carp::cluck "error in event callback: @_";
255}; 311};
256 312
257############################################################################# 313#############################################################################
258 314
259=head2 UTILITY FUNCTIONS 315=head2 UTILITY FUNCTIONS
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 352our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297 353
298sub encode_json($) { $json_coder->encode ($_[0]) } 354sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 355sub decode_json($) { $json_coder->decode ($_[0]) }
300 356
357=item cf::post_init { BLOCK }
358
359Execute the given codeblock, I<after> all extensions have been (re-)loaded,
360but I<before> the server starts ticking again.
361
362The cdoeblock will have a single boolean argument to indicate whether this
363is a reload or not.
364
365=cut
366
367sub post_init(&) {
368 push @POST_INIT, shift;
369}
370
301=item cf::lock_wait $string 371=item cf::lock_wait $string
302 372
303Wait until the given lock is available. See cf::lock_acquire. 373Wait until the given lock is available. See cf::lock_acquire.
304 374
305=item my $lock = cf::lock_acquire $string 375=item my $lock = cf::lock_acquire $string
306 376
307Wait until the given lock is available and then acquires it and returns 377Wait 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, 378a L<Guard> object. If the guard object gets destroyed (goes out of scope,
309for example when the coroutine gets canceled), the lock is automatically 379for example when the coroutine gets canceled), the lock is automatically
310returned. 380returned.
311 381
312Locks are *not* recursive, locking from the same coro twice results in a 382Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro. 383deadlocked coro.
319 389
320Return true if the lock is currently active, i.e. somebody has locked it. 390Return true if the lock is currently active, i.e. somebody has locked it.
321 391
322=cut 392=cut
323 393
324our %LOCK; 394our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 395
327sub lock_wait($) { 396sub lock_wait($) {
328 my ($key) = @_; 397 $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} 398}
341 399
342sub lock_acquire($) { 400sub lock_acquire($) {
343 my ($key) = @_; 401 $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} 402}
357 403
358sub lock_active($) { 404sub lock_active($) {
359 my ($key) = @_; 405 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 406}
363 407
364sub freeze_mainloop { 408sub freeze_mainloop {
365 tick_inhibit_inc; 409 tick_inhibit_inc;
366 410
367 Coro::guard \&tick_inhibit_dec; 411 &Guard::guard (\&tick_inhibit_dec);
368} 412}
369 413
370=item cf::periodic $interval, $cb 414=item cf::periodic $interval, $cb
371 415
372Like EV::periodic, but randomly selects a starting point so that the actions 416Like EV::periodic, but randomly selects a starting point so that the actions
373get spread over timer. 417get spread over time.
374 418
375=cut 419=cut
376 420
377sub periodic($$) { 421sub periodic($$) {
378 my ($interval, $cb) = @_; 422 my ($interval, $cb) = @_;
395 439
396=cut 440=cut
397 441
398our @SLOT_QUEUE; 442our @SLOT_QUEUE;
399our $SLOT_QUEUE; 443our $SLOT_QUEUE;
444our $SLOT_DECAY = 0.9;
400 445
401$SLOT_QUEUE->cancel if $SLOT_QUEUE; 446$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async { 447$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager"); 448 $Coro::current->desc ("timeslot manager");
404 449
405 my $signal = new Coro::Signal; 450 my $signal = new Coro::Signal;
451 my $busy;
406 452
407 while () { 453 while () {
408 next_job: 454 next_job:
455
409 my $avail = cf::till_tick; 456 my $avail = cf::till_tick;
410 if ($avail > 0.01) { 457
411 for (0 .. $#SLOT_QUEUE) { 458 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) { 459 if ($SLOT_QUEUE[$_][0] <= $avail) {
460 $busy = 0;
413 my $job = splice @SLOT_QUEUE, $_, 1, (); 461 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send; 462 $job->[2]->send;
415 Coro::cede; 463 Coro::cede;
416 goto next_job; 464 goto next_job;
417 } 465 } else {
466 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
418 } 467 }
419 } 468 }
420 469
421 if (@SLOT_QUEUE) { 470 if (@SLOT_QUEUE) {
422 # we do not use wait_for_tick() as it returns immediately when tick is inactive 471 # we do not use wait_for_tick() as it returns immediately when tick is inactive
423 push @cf::WAIT_FOR_TICK, $signal; 472 push @cf::WAIT_FOR_TICK, $signal;
424 $signal->wait; 473 $signal->wait;
425 } else { 474 } else {
475 $busy = 0;
426 Coro::schedule; 476 Coro::schedule;
427 } 477 }
428 } 478 }
429}; 479};
430 480
431sub get_slot($;$$) { 481sub get_slot($;$$) {
482 return if tick_inhibit || $Coro::current == $Coro::main;
483
432 my ($time, $pri, $name) = @_; 484 my ($time, $pri, $name) = @_;
433 485
434 $time = $TICK * .6 if $time > $TICK * .6; 486 $time = clamp $time, 0.01, $TICK * .6;
487
435 my $sig = new Coro::Signal; 488 my $sig = new Coro::Signal;
436 489
437 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 490 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
438 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 491 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
439 $SLOT_QUEUE->ready; 492 $SLOT_QUEUE->ready;
465=cut 518=cut
466 519
467sub sync_job(&) { 520sub sync_job(&) {
468 my ($job) = @_; 521 my ($job) = @_;
469 522
470 if ($Coro::current == $Coro::main) { 523 if (in_main) {
471 my $time = EV::time; 524 my $time = AE::time;
472 525
473 # this is the main coro, too bad, we have to block 526 # this is the main coro, too bad, we have to block
474 # till the operation succeeds, freezing the server :/ 527 # till the operation succeeds, freezing the server :/
475 528
476 LOG llevError, Carp::longmess "sync job";#d# 529 #LOG llevError, Carp::longmess "sync job";#d#
477 530
478 my $freeze_guard = freeze_mainloop; 531 my $freeze_guard = freeze_mainloop;
479 532
480 my $busy = 1; 533 my $busy = 1;
481 my @res; 534 my @res;
482 535
483 (async { 536 (async {
484 $Coro::current->desc ("sync job coro"); 537 $Coro::current->desc ("sync job coro");
485 @res = eval { $job->() }; 538 @res = eval { $job->() };
486 warn $@ if $@; 539 error $@ if $@;
487 undef $busy; 540 undef $busy;
488 })->prio (Coro::PRIO_MAX); 541 })->prio (Coro::PRIO_MAX);
489 542
490 while ($busy) { 543 while ($busy) {
491 if (Coro::nready) { 544 if (Coro::nready) {
493 } else { 546 } else {
494 EV::loop EV::LOOP_ONESHOT; 547 EV::loop EV::LOOP_ONESHOT;
495 } 548 }
496 } 549 }
497 550
498 my $time = EV::time - $time; 551 my $time = AE::time - $time;
499 552
500 $TICK_START += $time; # do not account sync jobs to server load 553 $TICK_START += $time; # do not account sync jobs to server load
501 554
502 wantarray ? @res : $res[0] 555 wantarray ? @res : $res[0]
503 } else { 556 } else {
547 reset_signals; 600 reset_signals;
548 &$cb 601 &$cb
549 }, @args; 602 }, @args;
550 603
551 wantarray ? @res : $res[-1] 604 wantarray ? @res : $res[-1]
605}
606
607sub objinfo {
608 (
609 "counter value" => cf::object::object_count,
610 "objects created" => cf::object::create_count,
611 "objects destroyed" => cf::object::destroy_count,
612 "freelist size" => cf::object::free_count,
613 "allocated objects" => cf::object::objects_size,
614 "active objects" => cf::object::actives_size,
615 )
552} 616}
553 617
554=item $coin = coin_from_name $name 618=item $coin = coin_from_name $name
555 619
556=cut 620=cut
593within each server. 657within each server.
594 658
595=cut 659=cut
596 660
597sub db_table($) { 661sub db_table($) {
662 cf::error "db_get called from main context"
663 if $Coro::current == $Coro::main;
664
598 my ($name) = @_; 665 my ($name) = @_;
599 my $db = BDB::db_create $DB_ENV; 666 my $db = BDB::db_create $DB_ENV;
600 667
601 eval { 668 eval {
602 $db->set_flags (BDB::CHKSUM); 669 $db->set_flags (BDB::CHKSUM);
612} 679}
613 680
614our $DB; 681our $DB;
615 682
616sub db_init { 683sub db_init {
617 cf::sync_job {
618 $DB ||= db_table "db"; 684 $DB ||= db_table "db";
619 };
620} 685}
621 686
622sub db_get($$) { 687sub db_get($$) {
623 my $key = "$_[0]/$_[1]"; 688 my $key = "$_[0]/$_[1]";
624 689
625 cf::sync_job { 690 cf::error "db_get called from main context"
691 if $Coro::current == $Coro::main;
692
626 BDB::db_get $DB, undef, $key, my $data; 693 BDB::db_get $DB, undef, $key, my $data;
627 694
628 $! ? () 695 $! ? ()
629 : $data 696 : $data
630 }
631} 697}
632 698
633sub db_put($$$) { 699sub db_put($$$) {
634 BDB::dbreq_pri 4; 700 BDB::dbreq_pri 4;
635 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 701 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
691 757
692 my $t1 = Time::HiRes::time; 758 my $t1 = Time::HiRes::time;
693 my $data = $process->(\@data); 759 my $data = $process->(\@data);
694 my $t2 = Time::HiRes::time; 760 my $t2 = Time::HiRes::time;
695 761
696 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 762 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
697 763
698 db_put cache => "$id/data", $data; 764 db_put cache => "$id/data", $data;
699 db_put cache => "$id/md5" , $md5; 765 db_put cache => "$id/md5" , $md5;
700 db_put cache => "$id/meta", $meta; 766 db_put cache => "$id/meta", $meta;
701 767
711 777
712=cut 778=cut
713 779
714sub datalog($@) { 780sub datalog($@) {
715 my ($type, %kv) = @_; 781 my ($type, %kv) = @_;
716 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 782 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
717} 783}
718 784
719=back 785=back
720 786
721=cut 787=cut
722 788
723############################################################################# 789#############################################################################
724 790
725=head2 ATTACHABLE OBJECTS 791=head2 ATTACHABLE OBJECTS
726 792
727Many objects in crossfire are so-called attachable objects. That means you can 793Many objects in deliantra are so-called attachable objects. That means you can
728attach callbacks/event handlers (a collection of which is called an "attachment") 794attach callbacks/event handlers (a collection of which is called an "attachment")
729to it. All such attachable objects support the following methods. 795to it. All such attachable objects support the following methods.
730 796
731In the following description, CLASS can be any of C<global>, C<object> 797In the following description, CLASS can be any of C<global>, C<object>
732C<player>, C<client> or C<map> (i.e. the attachable objects in 798C<player>, C<client> or C<map> (i.e. the attachable objects in
782=item cf::CLASS::attachment $name, ... 848=item cf::CLASS::attachment $name, ...
783 849
784Register an attachment by C<$name> through which attachable objects of the 850Register an attachment by C<$name> through which attachable objects of the
785given CLASS can refer to this attachment. 851given CLASS can refer to this attachment.
786 852
787Some classes such as crossfire maps and objects can specify attachments 853Some classes such as deliantra maps and objects can specify attachments
788that are attached at load/instantiate time, thus the need for a name. 854that are attached at load/instantiate time, thus the need for a name.
789 855
790These calls expect any number of the following handler/hook descriptions: 856These calls expect any number of the following handler/hook descriptions:
791 857
792=over 4 858=over 4
916 982
917 } elsif (exists $cb_id{$type}) { 983 } elsif (exists $cb_id{$type}) {
918 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 984 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
919 985
920 } elsif (ref $type) { 986 } elsif (ref $type) {
921 warn "attaching objects not supported, ignoring.\n"; 987 error "attaching objects not supported, ignoring.\n";
922 988
923 } else { 989 } else {
924 shift @arg; 990 shift @arg;
925 warn "attach argument '$type' not supported, ignoring.\n"; 991 error "attach argument '$type' not supported, ignoring.\n";
926 } 992 }
927 } 993 }
928} 994}
929 995
930sub _object_attach { 996sub _object_attach {
940 _attach $registry, $klass, @attach; 1006 _attach $registry, $klass, @attach;
941 } 1007 }
942 1008
943 $obj->{$name} = \%arg; 1009 $obj->{$name} = \%arg;
944 } else { 1010 } else {
945 warn "object uses attachment '$name' which is not available, postponing.\n"; 1011 info "object uses attachment '$name' which is not available, postponing.\n";
946 } 1012 }
947 1013
948 $obj->{_attachment}{$name} = undef; 1014 $obj->{_attachment}{$name} = undef;
949} 1015}
950 1016
1009 1075
1010 for (@$callbacks) { 1076 for (@$callbacks) {
1011 eval { &{$_->[1]} }; 1077 eval { &{$_->[1]} };
1012 1078
1013 if ($@) { 1079 if ($@) {
1014 warn "$@";
1015 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1080 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1016 override; 1081 override;
1017 } 1082 }
1018 1083
1019 return 1 if $override; 1084 return 1 if $override;
1020 } 1085 }
1083 1148
1084sub reattach { 1149sub reattach {
1085 # basically do the same as instantiate, without calling instantiate 1150 # basically do the same as instantiate, without calling instantiate
1086 my ($obj) = @_; 1151 my ($obj) = @_;
1087 1152
1153 # no longer needed after getting rid of delete_package?
1088 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1154 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1089 1155
1090 my $registry = $obj->registry; 1156 my $registry = $obj->registry;
1091 1157
1092 @$registry = (); 1158 @$registry = ();
1093 1159
1098 for (@$attach) { 1164 for (@$attach) {
1099 my ($klass, @attach) = @$_; 1165 my ($klass, @attach) = @$_;
1100 _attach $registry, $klass, @attach; 1166 _attach $registry, $klass, @attach;
1101 } 1167 }
1102 } else { 1168 } else {
1103 warn "object uses attachment '$name' that is not available, postponing.\n"; 1169 info "object uses attachment '$name' that is not available, postponing.\n";
1104 } 1170 }
1105 } 1171 }
1106} 1172}
1107 1173
1108cf::attachable->attach ( 1174cf::attachable->attach (
1135 my ($filename, $rdata, $objs) = @_; 1201 my ($filename, $rdata, $objs) = @_;
1136 1202
1137 sync_job { 1203 sync_job {
1138 if (length $$rdata) { 1204 if (length $$rdata) {
1139 utf8::decode (my $decname = $filename); 1205 utf8::decode (my $decname = $filename);
1140 warn sprintf "saving %s (%d,%d)\n", 1206 trace sprintf "saving %s (%d,%d)\n",
1141 $decname, length $$rdata, scalar @$objs; 1207 $decname, length $$rdata, scalar @$objs
1208 if $VERBOSE_IO;
1142 1209
1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1210 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1144 chmod SAVE_MODE, $fh; 1211 aio_chmod $fh, SAVE_MODE;
1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1212 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1146 aio_fsync $fh if $cf::USE_FSYNC; 1213 if ($cf::USE_FSYNC) {
1214 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;
1215 aio_fsync $fh;
1216 }
1147 close $fh; 1217 aio_close $fh;
1148 1218
1149 if (@$objs) { 1219 if (@$objs) {
1150 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1220 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1151 chmod SAVE_MODE, $fh; 1221 aio_chmod $fh, SAVE_MODE;
1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1222 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1153 aio_write $fh, 0, (length $data), $data, 0; 1223 aio_write $fh, 0, (length $data), $data, 0;
1154 aio_fsync $fh if $cf::USE_FSYNC; 1224 if ($cf::USE_FSYNC) {
1225 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;
1226 aio_fsync $fh;
1227 }
1155 close $fh; 1228 aio_close $fh;
1156 aio_rename "$filename.pst~", "$filename.pst"; 1229 aio_rename "$filename.pst~", "$filename.pst";
1157 } 1230 }
1158 } else { 1231 } else {
1159 aio_unlink "$filename.pst"; 1232 aio_unlink "$filename.pst";
1160 } 1233 }
1161 1234
1162 aio_rename "$filename~", $filename; 1235 aio_rename "$filename~", $filename;
1236
1237 $filename =~ s%/[^/]+$%%;
1238 aio_pathsync $filename if $cf::USE_FSYNC;
1163 } else { 1239 } else {
1164 warn "FATAL: $filename~: $!\n"; 1240 error "unable to save objects: $filename~: $!\n";
1165 } 1241 }
1166 } else { 1242 } else {
1167 aio_unlink $filename; 1243 aio_unlink $filename;
1168 aio_unlink "$filename.pst"; 1244 aio_unlink "$filename.pst";
1169 } 1245 }
1193 my $st = eval { Coro::Storable::thaw $av }; 1269 my $st = eval { Coro::Storable::thaw $av };
1194 $av = $st->{objs}; 1270 $av = $st->{objs};
1195 } 1271 }
1196 1272
1197 utf8::decode (my $decname = $filename); 1273 utf8::decode (my $decname = $filename);
1198 warn sprintf "loading %s (%d,%d)\n", 1274 trace sprintf "loading %s (%d,%d)\n",
1199 $decname, length $data, scalar @{$av || []}; 1275 $decname, length $data, scalar @{$av || []}
1276 if $VERBOSE_IO;
1200 1277
1201 ($data, $av) 1278 ($data, $av)
1202} 1279}
1203 1280
1204=head2 COMMAND CALLBACKS 1281=head2 COMMAND CALLBACKS
1260 my ($name, $cb) = @_; 1337 my ($name, $cb) = @_;
1261 1338
1262 $EXTICMD{$name} = $cb; 1339 $EXTICMD{$name} = $cb;
1263} 1340}
1264 1341
1342use File::Glob ();
1343
1265cf::player->attach ( 1344cf::player->attach (
1266 on_command => sub { 1345 on_unknown_command => sub {
1267 my ($pl, $name, $params) = @_; 1346 my ($pl, $name, $params) = @_;
1268 1347
1269 my $cb = $COMMAND{$name} 1348 my $cb = $COMMAND{$name}
1270 or return; 1349 or return;
1271 1350
1294 1373
1295 $pl->ext_reply ($reply, @reply) 1374 $pl->ext_reply ($reply, @reply)
1296 if $reply; 1375 if $reply;
1297 1376
1298 } else { 1377 } else {
1299 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1378 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1300 } 1379 }
1301 1380
1302 cf::override; 1381 cf::override;
1303 }, 1382 },
1304); 1383);
1305 1384
1385# "readahead" all extensions
1386sub cache_extensions {
1387 my $grp = IO::AIO::aio_group;
1388
1389 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1390 for (grep /\.ext$/, @{$_[0]}) {
1391 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1392 }
1393 };
1394
1395 $grp
1396}
1397
1306sub load_extensions { 1398sub load_extensions {
1399 info "loading extensions...";
1400
1307 cf::sync_job { 1401 cf::sync_job {
1308 my %todo; 1402 my %todo;
1309 1403
1310 for my $path (<$LIBDIR/*.ext>) { 1404 for my $path (<$LIBDIR/*.ext>) {
1311 next unless -r $path; 1405 next unless -r $path;
1329 1423
1330 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1424 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1331 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1425 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1332 1426
1333 $ext{source} = 1427 $ext{source} =
1334 "package $pkg; use strict; use utf8;\n" 1428 "package $pkg; use common::sense;\n"
1335 . "#line 1 \"$path\"\n{\n" 1429 . "#line 1 \"$path\"\n{\n"
1336 . $source 1430 . $source
1337 . "\n};\n1"; 1431 . "\n};\n1";
1338 1432
1339 $todo{$base} = \%ext; 1433 $todo{$base} = \%ext;
1340 } 1434 }
1341 1435
1436 my $pass = 0;
1342 my %done; 1437 my %done;
1343 while (%todo) { 1438 while (%todo) {
1344 my $progress; 1439 my $progress;
1345 1440
1441 ++$pass;
1442
1443 ext:
1346 while (my ($k, $v) = each %todo) { 1444 while (my ($k, $v) = each %todo) {
1347 for (split /,\s*/, $v->{meta}{depends}) { 1445 for (split /,\s*/, $v->{meta}{depends}) {
1348 goto skip 1446 next ext
1349 unless exists $done{$_}; 1447 unless exists $done{$_};
1350 } 1448 }
1351 1449
1352 warn "... loading '$k' into '$v->{pkg}'\n"; 1450 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1353 1451
1354 unless (eval $v->{source}) { 1452 my $active = eval $v->{source};
1453
1454 if (length $@) {
1355 my $msg = $@ ? "$v->{path}: $@\n" 1455 error "$v->{path}: $@\n";
1356 : "$v->{base}: extension inactive.\n"; 1456 undef $@; # work around perl 5.10.0 utf-8 caching bug
1357 1457
1358 if (exists $v->{meta}{mandatory}) {
1359 warn $msg;
1360 cf::cleanup "mandatory extension failed to load, exiting."; 1458 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1361 } 1459 if exists $v->{meta}{mandatory};
1362 1460
1363 warn $msg; 1461 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1462 delete $todo{$k};
1463 } else {
1464 $done{$k} = delete $todo{$k};
1465 push @EXTS, $v->{pkg};
1466 $progress = 1;
1467
1468 info "$v->{base}: extension inactive.\n"
1469 unless $active;
1364 } 1470 }
1365
1366 $done{$k} = delete $todo{$k};
1367 push @EXTS, $v->{pkg};
1368 $progress = 1;
1369 } 1471 }
1370 1472
1371 skip: 1473 unless ($progress) {
1372 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1474 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1373 unless $progress; 1475
1476 while (my ($k, $v) = each %todo) {
1477 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1478 if exists $v->{meta}{mandatory};
1479 }
1480 }
1374 } 1481 }
1375 }; 1482 };
1376} 1483}
1377 1484
1378############################################################################# 1485#############################################################################
1379 1486
1380=back 1487=back
1381 1488
1382=head2 CORE EXTENSIONS 1489=head2 CORE EXTENSIONS
1383 1490
1384Functions and methods that extend core crossfire objects. 1491Functions and methods that extend core deliantra objects.
1385 1492
1386=cut 1493=cut
1387 1494
1388package cf::player; 1495package cf::player;
1389 1496
1432 1539
1433sub exists($) { 1540sub exists($) {
1434 my ($login) = @_; 1541 my ($login) = @_;
1435 1542
1436 $cf::PLAYER{$login} 1543 $cf::PLAYER{$login}
1437 or cf::sync_job { !aio_stat path $login } 1544 or !aio_stat path $login
1438} 1545}
1439 1546
1440sub find($) { 1547sub find($) {
1441 return $cf::PLAYER{$_[0]} || do { 1548 return $cf::PLAYER{$_[0]} || do {
1442 my $login = $_[0]; 1549 my $login = $_[0];
1454 my $f = new_from_file cf::object::thawer path $login 1561 my $f = new_from_file cf::object::thawer path $login
1455 or return; 1562 or return;
1456 1563
1457 my $pl = cf::player::load_pl $f 1564 my $pl = cf::player::load_pl $f
1458 or return; 1565 or return;
1566
1459 local $cf::PLAYER_LOADING{$login} = $pl; 1567 local $cf::PLAYER_LOADING{$login} = $pl;
1460 $f->resolve_delayed_derefs; 1568 $f->resolve_delayed_derefs;
1461 $cf::PLAYER{$login} = $pl 1569 $cf::PLAYER{$login} = $pl
1462 } 1570 }
1463 } 1571 }
1464} 1572}
1465 1573
1574cf::player->attach (
1575 on_load => sub {
1576 my ($pl, $path) = @_;
1577
1578 # restore slots saved in save, below
1579 my $slots = delete $pl->{_slots};
1580
1581 $pl->ob->current_weapon ($slots->[0]);
1582 $pl->combat_ob ($slots->[1]);
1583 $pl->ranged_ob ($slots->[2]);
1584 },
1585);
1586
1466sub save($) { 1587sub save($) {
1467 my ($pl) = @_; 1588 my ($pl) = @_;
1468 1589
1469 return if $pl->{deny_save}; 1590 return if $pl->{deny_save};
1470 1591
1473 1594
1474 return if $pl->{deny_save}; 1595 return if $pl->{deny_save};
1475 1596
1476 aio_mkdir playerdir $pl, 0770; 1597 aio_mkdir playerdir $pl, 0770;
1477 $pl->{last_save} = $cf::RUNTIME; 1598 $pl->{last_save} = $cf::RUNTIME;
1599
1600 cf::get_slot 0.01;
1601
1602 # save slots, to be restored later
1603 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1478 1604
1479 $pl->save_pl ($path); 1605 $pl->save_pl ($path);
1480 cf::cede_to_tick; 1606 cf::cede_to_tick;
1481} 1607}
1482 1608
1514 my ($pl) = @_; 1640 my ($pl) = @_;
1515 1641
1516 my $name = $pl->ob->name; 1642 my $name = $pl->ob->name;
1517 1643
1518 $pl->{deny_save} = 1; 1644 $pl->{deny_save} = 1;
1519 $pl->password ("*"); # this should lock out the player until we nuked the dir 1645 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1520 1646
1521 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1647 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1522 $pl->deactivate; 1648 $pl->deactivate;
1649 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1523 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1650 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1524 $pl->ns->destroy if $pl->ns; 1651 $pl->ns->destroy if $pl->ns;
1525 1652
1526 my $path = playerdir $pl; 1653 my $path = playerdir $pl;
1527 my $temp = "$path~$cf::RUNTIME~deleting~"; 1654 my $temp = "$path~$cf::RUNTIME~deleting~";
1566 1693
1567 for my $login (@$dirs) { 1694 for my $login (@$dirs) {
1568 my $path = path $login; 1695 my $path = path $login;
1569 1696
1570 # a .pst is a dead give-away for a valid player 1697 # a .pst is a dead give-away for a valid player
1571 unless (-e "$path.pst") { 1698 # if no pst file found, open and chekc for blocked users
1699 if (aio_stat "$path.pst") {
1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1700 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1573 aio_read $fh, 0, 512, my $buf, 0 or next; 1701 aio_read $fh, 0, 512, my $buf, 0 or next;
1574 $buf !~ /^password -------------$/m or next; # official not-valid tag 1702 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 } 1703 }
1576 1704
1580 1708
1581 \@logins 1709 \@logins
1582} 1710}
1583 1711
1584=item $player->maps 1712=item $player->maps
1713
1714=item cf::player::maps $login
1585 1715
1586Returns an arrayref of map paths that are private for this 1716Returns an arrayref of map paths that are private for this
1587player. May block. 1717player. May block.
1588 1718
1589=cut 1719=cut
1607 } 1737 }
1608 1738
1609 \@paths 1739 \@paths
1610} 1740}
1611 1741
1612=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1742=item $protocol_xml = $player->expand_cfpod ($cfpod)
1613 1743
1614Expand crossfire pod fragments into protocol xml. 1744Expand deliantra pod fragments into protocol xml.
1615
1616=cut
1617
1618use re 'eval';
1619
1620my $group;
1621my $interior; $interior = qr{
1622 # match a pod interior sequence sans C<< >>
1623 (?:
1624 \ (.*?)\ (?{ $group = $^N })
1625 | < (??{$interior}) >
1626 )
1627}x;
1628
1629sub expand_cfpod {
1630 my ($self, $pod) = @_;
1631
1632 my $xml;
1633
1634 while () {
1635 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1636 $group = $1;
1637
1638 $group =~ s/&/&amp;/g;
1639 $group =~ s/</&lt;/g;
1640
1641 $xml .= $group;
1642 } elsif ($pod =~ m%\G
1643 ([BCGHITU])
1644 <
1645 (?:
1646 ([^<>]*) (?{ $group = $^N })
1647 | < $interior >
1648 )
1649 >
1650 %gcsx
1651 ) {
1652 my ($code, $data) = ($1, $group);
1653
1654 if ($code eq "B") {
1655 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1656 } elsif ($code eq "I") {
1657 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1658 } elsif ($code eq "U") {
1659 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1660 } elsif ($code eq "C") {
1661 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1662 } elsif ($code eq "T") {
1663 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1664 } elsif ($code eq "G") {
1665 my ($male, $female) = split /\|/, $data;
1666 $data = $self->gender ? $female : $male;
1667 $xml .= expand_cfpod ($self, $data);
1668 } elsif ($code eq "H") {
1669 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1670 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1671 "")
1672 [$self->{hintmode}];
1673 } else {
1674 $xml .= "error processing '$code($data)' directive";
1675 }
1676 } else {
1677 if ($pod =~ /\G(.+)/) {
1678 warn "parse error while expanding $pod (at $1)";
1679 }
1680 last;
1681 }
1682 }
1683
1684 for ($xml) {
1685 # create single paragraphs (very hackish)
1686 s/(?<=\S)\n(?=\w)/ /g;
1687
1688 # compress some whitespace
1689 s/\s+\n/\n/g; # ws line-ends
1690 s/\n\n+/\n/g; # double lines
1691 s/^\n+//; # beginning lines
1692 s/\n+$//; # ending lines
1693 }
1694
1695 $xml
1696}
1697
1698no re 'eval';
1699
1700sub hintmode {
1701 $_[0]{hintmode} = $_[1] if @_ > 1;
1702 $_[0]{hintmode}
1703}
1704 1745
1705=item $player->ext_reply ($msgid, @msg) 1746=item $player->ext_reply ($msgid, @msg)
1706 1747
1707Sends an ext reply to the player. 1748Sends an ext reply to the player.
1708 1749
1740 1781
1741=cut 1782=cut
1742 1783
1743sub find_by_path($) { 1784sub find_by_path($) {
1744 my ($path) = @_; 1785 my ($path) = @_;
1786
1787 $path =~ s/^~[^\/]*//; # skip ~login
1745 1788
1746 my ($match, $specificity); 1789 my ($match, $specificity);
1747 1790
1748 for my $region (list) { 1791 for my $region (list) {
1749 if ($region->{match} && $path =~ $region->{match}) { 1792 if ($region->{match} && $path =~ $region->{match}) {
1775our $MAX_RESET = 3600; 1818our $MAX_RESET = 3600;
1776our $DEFAULT_RESET = 3000; 1819our $DEFAULT_RESET = 3000;
1777 1820
1778sub generate_random_map { 1821sub generate_random_map {
1779 my ($self, $rmp) = @_; 1822 my ($self, $rmp) = @_;
1823
1824 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1825
1780 # mit "rum" bekleckern, nicht 1826 # mit "rum" bekleckern, nicht
1781 $self->_create_random_map ( 1827 $self->_create_random_map (
1782 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1828 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1783 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1829 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1784 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1830 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1785 $rmp->{exit_on_final_map}, 1831 $rmp->{exit_on_final_map},
1786 $rmp->{xsize}, $rmp->{ysize}, 1832 $rmp->{xsize}, $rmp->{ysize},
1787 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1833 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1788 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1834 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1803 1849
1804sub register { 1850sub register {
1805 my (undef, $regex, $prio) = @_; 1851 my (undef, $regex, $prio) = @_;
1806 my $pkg = caller; 1852 my $pkg = caller;
1807 1853
1808 no strict;
1809 push @{"$pkg\::ISA"}, __PACKAGE__; 1854 push @{"$pkg\::ISA"}, __PACKAGE__;
1810 1855
1811 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1856 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1812} 1857}
1813 1858
1814# also paths starting with '/' 1859# also paths starting with '/'
1815$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1860$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1816 1861
1817sub thawer_merge { 1862sub thawer_merge {
1818 my ($self, $merge) = @_; 1863 my ($self, $merge) = @_;
1819 1864
1820 # we have to keep some variables in memory intact 1865 # we have to keep some variables in memory intact
1906 1951
1907# the temporary/swap location 1952# the temporary/swap location
1908sub save_path { 1953sub save_path {
1909 my ($self) = @_; 1954 my ($self) = @_;
1910 1955
1911 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1956 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1912 "$TMPDIR/$path.map" 1957 "$TMPDIR/$path.map"
1913} 1958}
1914 1959
1915# the unique path, undef == no special unique path 1960# the unique path, undef == no special unique path
1916sub uniq_path { 1961sub uniq_path {
1917 my ($self) = @_; 1962 my ($self) = @_;
1918 1963
1919 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1964 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1920 "$UNIQUEDIR/$path" 1965 "$UNIQUEDIR/$path"
1921}
1922
1923# and all this just because we cannot iterate over
1924# all maps in C++...
1925sub change_all_map_light {
1926 my ($change) = @_;
1927
1928 $_->change_map_light ($change)
1929 for grep $_->outdoor, values %cf::MAP;
1930} 1966}
1931 1967
1932sub decay_objects { 1968sub decay_objects {
1933 my ($self) = @_; 1969 my ($self) = @_;
1934 1970
2018sub find { 2054sub find {
2019 my ($path, $origin) = @_; 2055 my ($path, $origin) = @_;
2020 2056
2021 $path = normalise $path, $origin && $origin->path; 2057 $path = normalise $path, $origin && $origin->path;
2022 2058
2023 cf::lock_wait "map_data:$path";#d#remove 2059 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2024 cf::lock_wait "map_find:$path"; 2060 my $guard2 = cf::lock_acquire "map_find:$path";
2025 2061
2026 $cf::MAP{$path} || do { 2062 $cf::MAP{$path} || do {
2027 my $guard1 = cf::lock_acquire "map_find:$path";
2028 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2029
2030 my $map = new_from_path cf::map $path 2063 my $map = new_from_path cf::map $path
2031 or return; 2064 or return;
2032 2065
2033 $map->{last_save} = $cf::RUNTIME; 2066 $map->{last_save} = $cf::RUNTIME;
2034 2067
2036 or return; 2069 or return;
2037 2070
2038 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2071 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2039 # doing this can freeze the server in a sync job, obviously 2072 # doing this can freeze the server in a sync job, obviously
2040 #$cf::WAIT_FOR_TICK->wait; 2073 #$cf::WAIT_FOR_TICK->wait;
2074 undef $guard2;
2041 undef $guard1; 2075 undef $guard1;
2042 undef $guard2;
2043 $map->reset; 2076 $map->reset;
2044 return find $path; 2077 return find $path;
2045 } 2078 }
2046 2079
2047 $cf::MAP{$path} = $map 2080 $cf::MAP{$path} = $map
2048 } 2081 }
2049} 2082}
2050 2083
2051sub pre_load { } 2084sub pre_load { }
2052sub post_load { } 2085#sub post_load { } # XS
2053 2086
2054sub load { 2087sub load {
2055 my ($self) = @_; 2088 my ($self) = @_;
2056 2089
2057 local $self->{deny_reset} = 1; # loading can take a long time 2090 local $self->{deny_reset} = 1; # loading can take a long time
2074 my $f = new_from_file cf::object::thawer $self->{load_path}; 2107 my $f = new_from_file cf::object::thawer $self->{load_path};
2075 $f->skip_block; 2108 $f->skip_block;
2076 $self->_load_objects ($f) 2109 $self->_load_objects ($f)
2077 or return; 2110 or return;
2078 2111
2079 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2112 $self->post_load_original
2080 if delete $self->{load_original}; 2113 if delete $self->{load_original};
2081 2114
2082 if (my $uniq = $self->uniq_path) { 2115 if (my $uniq = $self->uniq_path) {
2083 utf8::encode $uniq; 2116 utf8::encode $uniq;
2084 unless (aio_stat $uniq) { 2117 unless (aio_stat $uniq) {
2102 unless ($self->{deny_activate}) { 2135 unless ($self->{deny_activate}) {
2103 $self->decay_objects; 2136 $self->decay_objects;
2104 $self->fix_auto_apply; 2137 $self->fix_auto_apply;
2105 $self->update_buttons; 2138 $self->update_buttons;
2106 cf::cede_to_tick; 2139 cf::cede_to_tick;
2107 $self->set_darkness_map;
2108 cf::cede_to_tick;
2109 $self->activate; 2140 $self->activate;
2110 } 2141 }
2111 2142
2112 $self->{last_save} = $cf::RUNTIME; 2143 $self->{last_save} = $cf::RUNTIME;
2113 $self->last_access ($cf::RUNTIME); 2144 $self->last_access ($cf::RUNTIME);
2114 2145
2115 $self->in_memory (cf::MAP_IN_MEMORY); 2146 $self->in_memory (cf::MAP_ACTIVE);
2116 } 2147 }
2117 2148
2118 $self->post_load; 2149 $self->post_load;
2119} 2150}
2120 2151
2152# customize the map for a given player, i.e.
2153# return the _real_ map. used by e.g. per-player
2154# maps to change the path to ~playername/mappath
2121sub customise_for { 2155sub customise_for {
2122 my ($self, $ob) = @_; 2156 my ($self, $ob) = @_;
2123 2157
2124 return find "~" . $ob->name . "/" . $self->{path} 2158 return find "~" . $ob->name . "/" . $self->{path}
2125 if $self->per_player; 2159 if $self->per_player;
2141 or next; 2175 or next;
2142 $neigh = find $neigh, $map 2176 $neigh = find $neigh, $map
2143 or next; 2177 or next;
2144 $neigh->load; 2178 $neigh->load;
2145 2179
2180 # now find the diagonal neighbours
2146 push @neigh, 2181 push @neigh,
2147 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2182 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2148 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2183 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2149 } 2184 }
2150 2185
2157} 2192}
2158 2193
2159sub find_sync { 2194sub find_sync {
2160 my ($path, $origin) = @_; 2195 my ($path, $origin) = @_;
2161 2196
2162 cf::sync_job { find $path, $origin } 2197 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2198 if $Coro::current == $Coro::main;
2199
2200 find $path, $origin
2163} 2201}
2164 2202
2165sub do_load_sync { 2203sub do_load_sync {
2166 my ($map) = @_; 2204 my ($map) = @_;
2167 2205
2168 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2206 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2169 if $Coro::current == $Coro::main; 2207 if $Coro::current == $Coro::main;
2170 2208
2171 cf::sync_job { $map->load }; 2209 $map->load;
2172} 2210}
2173 2211
2174our %MAP_PREFETCH; 2212our %MAP_PREFETCH;
2175our $MAP_PREFETCHER = undef; 2213our $MAP_PREFETCHER = undef;
2176 2214
2178 my ($path, $origin, $load) = @_; 2216 my ($path, $origin, $load) = @_;
2179 2217
2180 $path = normalise $path, $origin && $origin->{path}; 2218 $path = normalise $path, $origin && $origin->{path};
2181 2219
2182 if (my $map = $cf::MAP{$path}) { 2220 if (my $map = $cf::MAP{$path}) {
2183 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2221 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2184 } 2222 }
2185 2223
2186 $MAP_PREFETCH{$path} |= $load; 2224 $MAP_PREFETCH{$path} |= $load;
2187 2225
2188 $MAP_PREFETCHER ||= cf::async { 2226 $MAP_PREFETCHER ||= cf::async {
2202 $MAP_PREFETCHER->prio (6); 2240 $MAP_PREFETCHER->prio (6);
2203 2241
2204 () 2242 ()
2205} 2243}
2206 2244
2245# common code, used by both ->save and ->swapout
2207sub save { 2246sub _save {
2208 my ($self) = @_; 2247 my ($self) = @_;
2209
2210 my $lock = cf::lock_acquire "map_data:$self->{path}";
2211 2248
2212 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2213 2250
2214 return unless $self->dirty; 2251 return unless $self->dirty;
2215 2252
2224 2261
2225 cf::async { 2262 cf::async {
2226 $Coro::current->{desc} = "map player save"; 2263 $Coro::current->{desc} = "map player save";
2227 $_->contr->save for $self->players; 2264 $_->contr->save for $self->players;
2228 }; 2265 };
2266
2267 cf::get_slot 0.02;
2229 2268
2230 if ($uniq) { 2269 if ($uniq) {
2231 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2270 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2232 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2271 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2233 } else { 2272 } else {
2234 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2273 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2235 } 2274 }
2236} 2275}
2237 2276
2277sub save {
2278 my ($self) = @_;
2279
2280 my $lock = cf::lock_acquire "map_data:$self->{path}";
2281
2282 $self->_save;
2283}
2284
2238sub swap_out { 2285sub swap_out {
2239 my ($self) = @_; 2286 my ($self) = @_;
2240 2287
2241 # save first because save cedes
2242 $self->save;
2243
2244 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2288 my $lock = cf::lock_acquire "map_data:$self->{path}";
2245 2289
2290 return if $self->in_memory != cf::MAP_ACTIVE;
2291 return if $self->{deny_save};
2246 return if $self->players; 2292 return if $self->players;
2247 return if $self->in_memory != cf::MAP_IN_MEMORY;
2248 return if $self->{deny_save};
2249 2293
2294 # first deactivate the map and "unlink" it from the core
2295 $self->deactivate;
2296 $_->clear_links_to ($self) for values %cf::MAP;
2250 $self->in_memory (cf::MAP_SWAPPED); 2297 $self->in_memory (cf::MAP_SWAPPED);
2298
2299 # then atomically save
2300 $self->_save;
2301
2302 # then free the map
2303 $self->clear;
2304}
2305
2306sub reset_at {
2307 my ($self) = @_;
2308
2309 # TODO: safety, remove and allow resettable per-player maps
2310 return 1e99 if $self->{deny_reset};
2311
2312 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2313 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2314
2315 $time + $to
2316}
2317
2318sub should_reset {
2319 my ($self) = @_;
2320
2321 $self->reset_at <= $cf::RUNTIME
2322}
2323
2324sub reset {
2325 my ($self) = @_;
2326
2327 my $lock = cf::lock_acquire "map_data:$self->{path}";
2328
2329 return if $self->players;
2330
2331 cf::trace "resetting map ", $self->path, "\n";
2332
2333 $self->in_memory (cf::MAP_SWAPPED);
2334
2335 # need to save uniques path
2336 unless ($self->{deny_save}) {
2337 my $uniq = $self->uniq_path; utf8::encode $uniq;
2338
2339 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2340 if $uniq;
2341 }
2342
2343 delete $cf::MAP{$self->path};
2251 2344
2252 $self->deactivate; 2345 $self->deactivate;
2253 $_->clear_links_to ($self) for values %cf::MAP; 2346 $_->clear_links_to ($self) for values %cf::MAP;
2254 $self->clear; 2347 $self->clear;
2255}
2256
2257sub reset_at {
2258 my ($self) = @_;
2259
2260 # TODO: safety, remove and allow resettable per-player maps
2261 return 1e99 if $self->{deny_reset};
2262
2263 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2264 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2265
2266 $time + $to
2267}
2268
2269sub should_reset {
2270 my ($self) = @_;
2271
2272 $self->reset_at <= $cf::RUNTIME
2273}
2274
2275sub reset {
2276 my ($self) = @_;
2277
2278 my $lock = cf::lock_acquire "map_data:$self->{path}";
2279
2280 return if $self->players;
2281
2282 warn "resetting map ", $self->path;
2283
2284 $self->in_memory (cf::MAP_SWAPPED);
2285
2286 # need to save uniques path
2287 unless ($self->{deny_save}) {
2288 my $uniq = $self->uniq_path; utf8::encode $uniq;
2289
2290 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2291 if $uniq;
2292 }
2293
2294 delete $cf::MAP{$self->path};
2295
2296 $self->deactivate;
2297 $_->clear_links_to ($self) for values %cf::MAP;
2298 $self->clear;
2299 2348
2300 $self->unlink_save; 2349 $self->unlink_save;
2301 $self->destroy; 2350 $self->destroy;
2302} 2351}
2303 2352
2311 2360
2312 delete $cf::MAP{$self->path}; 2361 delete $cf::MAP{$self->path};
2313 2362
2314 $self->unlink_save; 2363 $self->unlink_save;
2315 2364
2316 bless $self, "cf::map"; 2365 bless $self, "cf::map::wrap";
2317 delete $self->{deny_reset}; 2366 delete $self->{deny_reset};
2318 $self->{deny_save} = 1; 2367 $self->{deny_save} = 1;
2319 $self->reset_timeout (1); 2368 $self->reset_timeout (1);
2320 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2369 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2321 2370
2370 2419
2371sub unique_maps() { 2420sub unique_maps() {
2372 [ 2421 [
2373 map { 2422 map {
2374 utf8::decode $_; 2423 utf8::decode $_;
2375 /\.map$/ 2424 s/\.map$//; # TODO future compatibility hack
2425 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2426 ? ()
2376 ? normalise $_ 2427 : normalise $_
2377 : ()
2378 } @{ aio_readdir $UNIQUEDIR or [] } 2428 } @{ aio_readdir $UNIQUEDIR or [] }
2379 ] 2429 ]
2380} 2430}
2381 2431
2432=item cf::map::static_maps
2433
2434Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2435file in the shared directory excluding F</styles> and F</editor>). May
2436block.
2437
2438=cut
2439
2440sub static_maps() {
2441 my @dirs = "";
2442 my @maps;
2443
2444 while (@dirs) {
2445 my $dir = shift @dirs;
2446
2447 next if $dir eq "/styles" || $dir eq "/editor";
2448
2449 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2450 or return;
2451
2452 for (@$files) {
2453 s/\.map$// or next;
2454 utf8::decode $_;
2455 push @maps, "$dir/$_";
2456 }
2457
2458 push @dirs, map "$dir/$_", @$dirs;
2459 }
2460
2461 \@maps
2462}
2463
2382=back 2464=back
2383 2465
2384=head3 cf::object 2466=head3 cf::object
2385 2467
2386=cut 2468=cut
2389 2471
2390=over 4 2472=over 4
2391 2473
2392=item $ob->inv_recursive 2474=item $ob->inv_recursive
2393 2475
2394Returns the inventory of the object _and_ their inventories, recursively. 2476Returns the inventory of the object I<and> their inventories, recursively,
2477but I<not> the object itself.
2395 2478
2396=cut 2479=cut
2397 2480
2398sub inv_recursive_; 2481sub inv_recursive_;
2399sub inv_recursive_ { 2482sub inv_recursive_ {
2404 inv_recursive_ inv $_[0] 2487 inv_recursive_ inv $_[0]
2405} 2488}
2406 2489
2407=item $ref = $ob->ref 2490=item $ref = $ob->ref
2408 2491
2409creates and returns a persistent reference to an objetc that can be stored as a string. 2492Creates and returns a persistent reference to an object that can be stored as a string.
2410 2493
2411=item $ob = cf::object::deref ($refstring) 2494=item $ob = cf::object::deref ($refstring)
2412 2495
2413returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2496returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2414even if the object actually exists. May block. 2497even if the object actually exists. May block.
2446can be C<undef>. Does the right thing when the player is currently in a 2529can be C<undef>. Does the right thing when the player is currently in a
2447dialogue with the given NPC character. 2530dialogue with the given NPC character.
2448 2531
2449=cut 2532=cut
2450 2533
2534our $SAY_CHANNEL = {
2535 id => "say",
2536 title => "Map",
2537 reply => "say ",
2538 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2539};
2540
2541our $CHAT_CHANNEL = {
2542 id => "chat",
2543 title => "Chat",
2544 reply => "chat ",
2545 tooltip => "Player chat and shouts, global to the server.",
2546};
2547
2451# rough implementation of a future "reply" method that works 2548# rough implementation of a future "reply" method that works
2452# with dialog boxes. 2549# with dialog boxes.
2453#TODO: the first argument must go, split into a $npc->reply_to ( method 2550#TODO: the first argument must go, split into a $npc->reply_to ( method
2454sub cf::object::player::reply($$$;$) { 2551sub cf::object::player::reply($$$;$) {
2455 my ($self, $npc, $msg, $flags) = @_; 2552 my ($self, $npc, $msg, $flags) = @_;
2466 my $dialog = $pl->{npc_dialog}; 2563 my $dialog = $pl->{npc_dialog};
2467 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2564 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2468 2565
2469 } else { 2566 } else {
2470 $msg = $npc->name . " says: $msg" if $npc; 2567 $msg = $npc->name . " says: $msg" if $npc;
2471 $self->message ($msg, $flags); 2568 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2472 } 2569 }
2473 } 2570 }
2474} 2571}
2475 2572
2476=item $object->send_msg ($channel, $msg, $color, [extra...]) 2573=item $object->send_msg ($channel, $msg, $color, [extra...])
2501 2598
2502=item $player_object->enter_link 2599=item $player_object->enter_link
2503 2600
2504Freezes the player and moves him/her to a special map (C<{link}>). 2601Freezes the player and moves him/her to a special map (C<{link}>).
2505 2602
2506The player should be reasonably safe there for short amounts of time. You 2603The player should be reasonably safe there for short amounts of time (e.g.
2507I<MUST> call C<leave_link> as soon as possible, though. 2604for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2605though, as the player cannot control the character while it is on the link
2606map.
2508 2607
2509Will never block. 2608Will never block.
2510 2609
2511=item $player_object->leave_link ($map, $x, $y) 2610=item $player_object->leave_link ($map, $x, $y)
2512 2611
2532sub cf::object::player::enter_link { 2631sub cf::object::player::enter_link {
2533 my ($self) = @_; 2632 my ($self) = @_;
2534 2633
2535 $self->deactivate_recursive; 2634 $self->deactivate_recursive;
2536 2635
2636 ++$self->{_link_recursion};
2637
2537 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2638 return if UNIVERSAL::isa $self->map, "ext::map_link";
2538 2639
2539 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2640 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2540 if $self->map && $self->map->{path} ne "{link}"; 2641 if $self->map && $self->map->{path} ne "{link}";
2541 2642
2542 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2643 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2543} 2644}
2544 2645
2545sub cf::object::player::leave_link { 2646sub cf::object::player::leave_link {
2546 my ($self, $map, $x, $y) = @_; 2647 my ($self, $map, $x, $y) = @_;
2547 2648
2564 ($x, $y) = (-1, -1) 2665 ($x, $y) = (-1, -1)
2565 unless (defined $x) && (defined $y); 2666 unless (defined $x) && (defined $y);
2566 2667
2567 # use -1 or undef as default coordinates, not 0, 0 2668 # use -1 or undef as default coordinates, not 0, 0
2568 ($x, $y) = ($map->enter_x, $map->enter_y) 2669 ($x, $y) = ($map->enter_x, $map->enter_y)
2569 if $x <=0 && $y <= 0; 2670 if $x <= 0 && $y <= 0;
2570 2671
2571 $map->load; 2672 $map->load;
2572 $map->load_neighbours; 2673 $map->load_neighbours;
2573 2674
2574 return unless $self->contr->active; 2675 return unless $self->contr->active;
2575 $self->activate_recursive;
2576 2676
2577 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2677 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2578 $self->enter_map ($map, $x, $y); 2678 if ($self->enter_map ($map, $x, $y)) {
2579} 2679 # entering was successful
2680 delete $self->{_link_recursion};
2681 # only activate afterwards, to support waiting in hooks
2682 $self->activate_recursive;
2683 }
2580 2684
2685}
2686
2581=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2687=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2582 2688
2583Moves the player to the given map-path and coordinates by first freezing 2689Moves the player to the given map-path and coordinates by first freezing
2584her, loading and preparing them map, calling the provided $check callback 2690her, loading and preparing them map, calling the provided $check callback
2585that has to return the map if sucecssful, and then unfreezes the player on 2691that has to return the map if sucecssful, and then unfreezes the player on
2586the new (success) or old (failed) map position. In either case, $done will 2692the new (success) or old (failed) map position. In either case, $done will
2587be called at the end of this process. 2693be called at the end of this process.
2588 2694
2695Note that $check will be called with a potentially non-loaded map, so if
2696it needs a loaded map it has to call C<< ->load >>.
2697
2589=cut 2698=cut
2590 2699
2591our $GOTOGEN; 2700our $GOTOGEN;
2592 2701
2593sub cf::object::player::goto { 2702sub cf::object::player::goto {
2594 my ($self, $path, $x, $y, $check, $done) = @_; 2703 my ($self, $path, $x, $y, $check, $done) = @_;
2704
2705 if ($self->{_link_recursion} >= $MAX_LINKS) {
2706 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2707 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2708 ($path, $x, $y) = @$EMERGENCY_POSITION;
2709 }
2595 2710
2596 # do generation counting so two concurrent goto's will be executed in-order 2711 # do generation counting so two concurrent goto's will be executed in-order
2597 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2712 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2598 2713
2599 $self->enter_link; 2714 $self->enter_link;
2623 my $map = eval { 2738 my $map = eval {
2624 my $map = defined $path ? cf::map::find $path : undef; 2739 my $map = defined $path ? cf::map::find $path : undef;
2625 2740
2626 if ($map) { 2741 if ($map) {
2627 $map = $map->customise_for ($self); 2742 $map = $map->customise_for ($self);
2628 $map = $check->($map) if $check && $map; 2743 $map = $check->($map, $x, $y, $self) if $check && $map;
2629 } else { 2744 } else {
2630 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2745 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2631 } 2746 }
2632 2747
2633 $map 2748 $map
2641 if ($gen == $self->{_goto_generation}) { 2756 if ($gen == $self->{_goto_generation}) {
2642 delete $self->{_goto_generation}; 2757 delete $self->{_goto_generation};
2643 $self->leave_link ($map, $x, $y); 2758 $self->leave_link ($map, $x, $y);
2644 } 2759 }
2645 2760
2646 $done->() if $done; 2761 $done->($self) if $done;
2647 })->prio (1); 2762 })->prio (1);
2648} 2763}
2649 2764
2650=item $player_object->enter_exit ($exit_object) 2765=item $player_object->enter_exit ($exit_object)
2651 2766
2671} 2786}
2672 2787
2673sub prepare_random_map { 2788sub prepare_random_map {
2674 my ($exit) = @_; 2789 my ($exit) = @_;
2675 2790
2676 my $guard = cf::lock_acquire "exit_prepare:$exit";
2677
2678 # all this does is basically replace the /! path by 2791 # all this does is basically replace the /! path by
2679 # a new random map path (?random/...) with a seed 2792 # a new random map path (?random/...) with a seed
2680 # that depends on the exit object 2793 # that depends on the exit object
2681 2794
2682 my $rmp = parse_random_map_params $exit->msg; 2795 my $rmp = parse_random_map_params $exit->msg;
2684 if ($exit->map) { 2797 if ($exit->map) {
2685 $rmp->{region} = $exit->region->name; 2798 $rmp->{region} = $exit->region->name;
2686 $rmp->{origin_map} = $exit->map->path; 2799 $rmp->{origin_map} = $exit->map->path;
2687 $rmp->{origin_x} = $exit->x; 2800 $rmp->{origin_x} = $exit->x;
2688 $rmp->{origin_y} = $exit->y; 2801 $rmp->{origin_y} = $exit->y;
2802
2803 $exit->map->touch;
2689 } 2804 }
2690 2805
2691 $rmp->{random_seed} ||= $exit->random_seed; 2806 $rmp->{random_seed} ||= $exit->random_seed;
2692 2807
2693 my $data = cf::encode_json $rmp; 2808 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2694 my $md5 = Digest::MD5::md5_hex $data; 2809 my $md5 = Digest::MD5::md5_hex $data;
2695 my $meta = "$RANDOMDIR/$md5.meta"; 2810 my $meta = "$RANDOMDIR/$md5.meta";
2696 2811
2697 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2812 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2698 aio_write $fh, 0, (length $data), $data, 0; 2813 aio_write $fh, 0, (length $data), $data, 0;
2699 undef $fh; 2814 undef $fh;
2700 aio_rename "$meta~", $meta; 2815 aio_rename "$meta~", $meta;
2701 2816
2817 my $slaying = "?random/$md5";
2818
2819 if ($exit->valid) {
2702 $exit->slaying ("?random/$md5"); 2820 $exit->slaying ("?random/$md5");
2703 $exit->msg (undef); 2821 $exit->msg (undef);
2822 }
2704 } 2823 }
2705} 2824}
2706 2825
2707sub cf::object::player::enter_exit { 2826sub cf::object::player::enter_exit {
2708 my ($self, $exit) = @_; 2827 my ($self, $exit) = @_;
2709 2828
2710 return unless $self->type == cf::PLAYER; 2829 return unless $self->type == cf::PLAYER;
2711 2830
2712 if ($exit->slaying eq "/!") {
2713 #TODO: this should de-fi-ni-te-ly not be a sync-job
2714 # the problem is that $exit might not survive long enough
2715 # so it needs to be done right now, right here
2716 cf::sync_job { prepare_random_map $exit };
2717 }
2718
2719 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2720 my $hp = $exit->stats->hp;
2721 my $sp = $exit->stats->sp;
2722
2723 $self->enter_link; 2831 $self->enter_link;
2724 2832
2725 # if exit is damned, update players death & WoR home-position
2726 $self->contr->savebed ($slaying, $hp, $sp)
2727 if $exit->flag (FLAG_DAMNED);
2728
2729 (async { 2833 (async {
2730 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2834 $Coro::current->{desc} = "enter_exit";
2731 2835
2732 $self->deactivate_recursive; # just to be sure
2733 unless (eval { 2836 unless (eval {
2837 $self->deactivate_recursive; # just to be sure
2838
2839 # random map handling
2840 {
2841 my $guard = cf::lock_acquire "exit_prepare:$exit";
2842
2843 prepare_random_map $exit
2844 if $exit->slaying eq "/!";
2845 }
2846
2847 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2848 my $x = $exit->stats->hp;
2849 my $y = $exit->stats->sp;
2850
2734 $self->goto ($slaying, $hp, $sp); 2851 $self->goto ($map, $x, $y);
2735 2852
2853 # if exit is damned, update players death & WoR home-position
2854 $self->contr->savebed ($map, $x, $y)
2855 if $exit->flag (cf::FLAG_DAMNED);
2856
2736 1; 2857 1
2737 }) { 2858 }) {
2738 $self->message ("Something went wrong deep within the crossfire server. " 2859 $self->message ("Something went wrong deep within the deliantra server. "
2739 . "I'll try to bring you back to the map you were before. " 2860 . "I'll try to bring you back to the map you were before. "
2740 . "Please report this to the dungeon master!", 2861 . "Please report this to the dungeon master!",
2741 cf::NDI_UNIQUE | cf::NDI_RED); 2862 cf::NDI_UNIQUE | cf::NDI_RED);
2742 2863
2743 warn "ERROR in enter_exit: $@"; 2864 error "ERROR in enter_exit: $@";
2744 $self->leave_link; 2865 $self->leave_link;
2745 } 2866 }
2746 })->prio (1); 2867 })->prio (1);
2747} 2868}
2748 2869
2760sub cf::client::send_drawinfo { 2881sub cf::client::send_drawinfo {
2761 my ($self, $text, $flags) = @_; 2882 my ($self, $text, $flags) = @_;
2762 2883
2763 utf8::encode $text; 2884 utf8::encode $text;
2764 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2885 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2886}
2887
2888=item $client->send_big_packet ($pkt)
2889
2890Like C<send_packet>, but tries to compress large packets, and fragments
2891them as required.
2892
2893=cut
2894
2895our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2896
2897sub cf::client::send_big_packet {
2898 my ($self, $pkt) = @_;
2899
2900 # try lzf for large packets
2901 $pkt = "lzf " . Compress::LZF::compress $pkt
2902 if 1024 <= length $pkt and $self->{can_lzf};
2903
2904 # split very large packets
2905 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2906 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2907 $pkt = "frag";
2908 }
2909
2910 $self->send_packet ($pkt);
2765} 2911}
2766 2912
2767=item $client->send_msg ($channel, $msg, $color, [extra...]) 2913=item $client->send_msg ($channel, $msg, $color, [extra...])
2768 2914
2769Send a drawinfo or msg packet to the client, formatting the msg for the 2915Send a drawinfo or msg packet to the client, formatting the msg for the
2773 2919
2774=cut 2920=cut
2775 2921
2776# non-persistent channels (usually the info channel) 2922# non-persistent channels (usually the info channel)
2777our %CHANNEL = ( 2923our %CHANNEL = (
2924 "c/motd" => {
2925 id => "infobox",
2926 title => "MOTD",
2927 reply => undef,
2928 tooltip => "The message of the day",
2929 },
2778 "c/identify" => { 2930 "c/identify" => {
2779 id => "infobox", 2931 id => "infobox",
2780 title => "Identify", 2932 title => "Identify",
2781 reply => undef, 2933 reply => undef,
2782 tooltip => "Items recently identified", 2934 tooltip => "Items recently identified",
2784 "c/examine" => { 2936 "c/examine" => {
2785 id => "infobox", 2937 id => "infobox",
2786 title => "Examine", 2938 title => "Examine",
2787 reply => undef, 2939 reply => undef,
2788 tooltip => "Signs and other items you examined", 2940 tooltip => "Signs and other items you examined",
2941 },
2942 "c/shopinfo" => {
2943 id => "infobox",
2944 title => "Shop Info",
2945 reply => undef,
2946 tooltip => "What your bargaining skill tells you about the shop",
2789 }, 2947 },
2790 "c/book" => { 2948 "c/book" => {
2791 id => "infobox", 2949 id => "infobox",
2792 title => "Book", 2950 title => "Book",
2793 reply => undef, 2951 reply => undef,
2809 id => "infobox", 2967 id => "infobox",
2810 title => "Body Parts", 2968 title => "Body Parts",
2811 reply => undef, 2969 reply => undef,
2812 tooltip => "Shows which body parts you posess and are available", 2970 tooltip => "Shows which body parts you posess and are available",
2813 }, 2971 },
2972 "c/statistics" => {
2973 id => "infobox",
2974 title => "Statistics",
2975 reply => undef,
2976 tooltip => "Shows your primary statistics",
2977 },
2978 "c/skills" => {
2979 id => "infobox",
2980 title => "Skills",
2981 reply => undef,
2982 tooltip => "Shows your experience per skill and item power",
2983 },
2984 "c/shopitems" => {
2985 id => "infobox",
2986 title => "Shop Items",
2987 reply => undef,
2988 tooltip => "Shows the items currently for sale in this shop",
2989 },
2990 "c/resistances" => {
2991 id => "infobox",
2992 title => "Resistances",
2993 reply => undef,
2994 tooltip => "Shows your resistances",
2995 },
2996 "c/pets" => {
2997 id => "infobox",
2998 title => "Pets",
2999 reply => undef,
3000 tooltip => "Shows information abotu your pets/a specific pet",
3001 },
3002 "c/perceiveself" => {
3003 id => "infobox",
3004 title => "Perceive Self",
3005 reply => undef,
3006 tooltip => "You gained detailed knowledge about yourself",
3007 },
2814 "c/uptime" => { 3008 "c/uptime" => {
2815 id => "infobox", 3009 id => "infobox",
2816 title => "Uptime", 3010 title => "Uptime",
2817 reply => undef, 3011 reply => undef,
2818 tooltip => "How long the server has been running since last restart", 3012 tooltip => "How long the server has been running since last restart",
2821 id => "infobox", 3015 id => "infobox",
2822 title => "Map Info", 3016 title => "Map Info",
2823 reply => undef, 3017 reply => undef,
2824 tooltip => "Information related to the maps", 3018 tooltip => "Information related to the maps",
2825 }, 3019 },
3020 "c/party" => {
3021 id => "party",
3022 title => "Party",
3023 reply => "gsay ",
3024 tooltip => "Messages and chat related to your party",
3025 },
3026 "c/death" => {
3027 id => "death",
3028 title => "Death",
3029 reply => undef,
3030 tooltip => "Reason for and more info about your most recent death",
3031 },
3032 "c/say" => $SAY_CHANNEL,
3033 "c/chat" => $CHAT_CHANNEL,
2826); 3034);
2827 3035
2828sub cf::client::send_msg { 3036sub cf::client::send_msg {
2829 my ($self, $channel, $msg, $color, @extra) = @_; 3037 my ($self, $channel, $msg, $color, @extra) = @_;
2830 3038
2831 $msg = $self->pl->expand_cfpod ($msg); 3039 $msg = $self->pl->expand_cfpod ($msg)
3040 unless $color & cf::NDI_VERBATIM;
2832 3041
2833 $color &= cf::NDI_CLIENT_MASK; # just in case... 3042 $color &= cf::NDI_CLIENT_MASK; # just in case...
2834 3043
2835 # check predefined channels, for the benefit of C 3044 # check predefined channels, for the benefit of C
2836 if ($CHANNEL{$channel}) { 3045 if ($CHANNEL{$channel}) {
2837 $channel = $CHANNEL{$channel}; 3046 $channel = $CHANNEL{$channel};
2838 3047
2839 $self->ext_msg (channel_info => $channel) 3048 $self->ext_msg (channel_info => $channel);
2840 if $self->can_msg;
2841
2842 $channel = $channel->{id}; 3049 $channel = $channel->{id};
2843 3050
2844 } elsif (ref $channel) { 3051 } elsif (ref $channel) {
2845 # send meta info to client, if not yet sent 3052 # send meta info to client, if not yet sent
2846 unless (exists $self->{channel}{$channel->{id}}) { 3053 unless (exists $self->{channel}{$channel->{id}}) {
2847 $self->{channel}{$channel->{id}} = $channel; 3054 $self->{channel}{$channel->{id}} = $channel;
2848 $self->ext_msg (channel_info => $channel) 3055 $self->ext_msg (channel_info => $channel);
2849 if $self->can_msg;
2850 } 3056 }
2851 3057
2852 $channel = $channel->{id}; 3058 $channel = $channel->{id};
2853 } 3059 }
2854 3060
2855 return unless @extra || length $msg; 3061 return unless @extra || length $msg;
2856 3062
2857 if ($self->can_msg) {
2858 # default colour, mask it out 3063 # default colour, mask it out
2859 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3064 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2860 if $color & cf::NDI_DEF; 3065 if $color & cf::NDI_DEF;
2861 3066
2862 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3067 my $pkt = "msg "
3068 . $self->{json_coder}->encode (
2863 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3069 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2864 } else { 3070 );
2865 if ($color >= 0) {
2866 # replace some tags by gcfclient-compatible ones
2867 for ($msg) {
2868 1 while
2869 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2870 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2871 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2872 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2873 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2874 }
2875 3071
2876 $color &= cf::NDI_COLOR_MASK; 3072 $self->send_big_packet ($pkt);
2877
2878 utf8::encode $msg;
2879
2880 if (0 && $msg =~ /\[/) {
2881 # COMMAND/INFO
2882 $self->send_packet ("drawextinfo $color 10 8 $msg")
2883 } else {
2884 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2885 $self->send_packet ("drawinfo $color $msg")
2886 }
2887 }
2888 }
2889} 3073}
2890 3074
2891=item $client->ext_msg ($type, @msg) 3075=item $client->ext_msg ($type, @msg)
2892 3076
2893Sends an ext event to the client. 3077Sends an ext event to the client.
2896 3080
2897sub cf::client::ext_msg($$@) { 3081sub cf::client::ext_msg($$@) {
2898 my ($self, $type, @msg) = @_; 3082 my ($self, $type, @msg) = @_;
2899 3083
2900 if ($self->extcmd == 2) { 3084 if ($self->extcmd == 2) {
2901 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3085 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2902 } elsif ($self->extcmd == 1) { # TODO: remove 3086 } elsif ($self->extcmd == 1) { # TODO: remove
2903 push @msg, msgtype => "event_$type"; 3087 push @msg, msgtype => "event_$type";
2904 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3088 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2905 } 3089 }
2906} 3090}
2907 3091
2908=item $client->ext_reply ($msgid, @msg) 3092=item $client->ext_reply ($msgid, @msg)
2909 3093
2913 3097
2914sub cf::client::ext_reply($$@) { 3098sub cf::client::ext_reply($$@) {
2915 my ($self, $id, @msg) = @_; 3099 my ($self, $id, @msg) = @_;
2916 3100
2917 if ($self->extcmd == 2) { 3101 if ($self->extcmd == 2) {
2918 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3102 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2919 } elsif ($self->extcmd == 1) { 3103 } elsif ($self->extcmd == 1) {
2920 #TODO: version 1, remove 3104 #TODO: version 1, remove
2921 unshift @msg, msgtype => "reply", msgid => $id; 3105 unshift @msg, msgtype => "reply", msgid => $id;
2922 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3106 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2923 } 3107 }
2924} 3108}
2925 3109
2926=item $success = $client->query ($flags, "text", \&cb) 3110=item $success = $client->query ($flags, "text", \&cb)
2927 3111
2998 3182
2999 $ns->ext_reply ($reply, @reply) 3183 $ns->ext_reply ($reply, @reply)
3000 if $reply; 3184 if $reply;
3001 3185
3002 } else { 3186 } else {
3003 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3187 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3004 } 3188 }
3005 3189
3006 cf::override; 3190 cf::override;
3007 }, 3191 },
3008); 3192);
3028 3212
3029 $coro 3213 $coro
3030} 3214}
3031 3215
3032cf::client->attach ( 3216cf::client->attach (
3033 on_destroy => sub { 3217 on_client_destroy => sub {
3034 my ($ns) = @_; 3218 my ($ns) = @_;
3035 3219
3036 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3220 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3037 }, 3221 },
3038); 3222);
3054our $safe_hole = new Safe::Hole; 3238our $safe_hole = new Safe::Hole;
3055 3239
3056$SIG{FPE} = 'IGNORE'; 3240$SIG{FPE} = 'IGNORE';
3057 3241
3058$safe->permit_only (Opcode::opset qw( 3242$safe->permit_only (Opcode::opset qw(
3059 :base_core :base_mem :base_orig :base_math 3243 :base_core :base_mem :base_orig :base_math :base_loop
3060 grepstart grepwhile mapstart mapwhile 3244 grepstart grepwhile mapstart mapwhile
3061 sort time 3245 sort time
3062)); 3246));
3063 3247
3064# here we export the classes and methods available to script code 3248# here we export the classes and methods available to script code
3067 3251
3068The following functions and methods are available within a safe environment: 3252The following functions and methods are available within a safe environment:
3069 3253
3070 cf::object 3254 cf::object
3071 contr pay_amount pay_player map x y force_find force_add destroy 3255 contr pay_amount pay_player map x y force_find force_add destroy
3072 insert remove name archname title slaying race decrease_ob_nr 3256 insert remove name archname title slaying race decrease split
3257 value
3073 3258
3074 cf::object::player 3259 cf::object::player
3075 player 3260 player
3076 3261
3077 cf::player 3262 cf::player
3082 3267
3083=cut 3268=cut
3084 3269
3085for ( 3270for (
3086 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3271 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3087 insert remove inv name archname title slaying race 3272 insert remove inv nrof name archname title slaying race
3088 decrease_ob_nr destroy)], 3273 decrease split destroy change_exp value msg lore send_msg)],
3089 ["cf::object::player" => qw(player)], 3274 ["cf::object::player" => qw(player)],
3090 ["cf::player" => qw(peaceful)], 3275 ["cf::player" => qw(peaceful send_msg)],
3091 ["cf::map" => qw(trigger)], 3276 ["cf::map" => qw(trigger)],
3092) { 3277) {
3093 no strict 'refs';
3094 my ($pkg, @funs) = @$_; 3278 my ($pkg, @funs) = @$_;
3095 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3279 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3096 for @funs; 3280 for @funs;
3097} 3281}
3098 3282
3113 3297
3114 my $qcode = $code; 3298 my $qcode = $code;
3115 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3299 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3116 $qcode =~ s/\n/\\n/g; 3300 $qcode =~ s/\n/\\n/g;
3117 3301
3302 %vars = (_dummy => 0) unless %vars;
3303
3304 my @res;
3118 local $_; 3305 local $_;
3119 local @safe::cf::_safe_eval_args = values %vars;
3120 3306
3121 my $eval = 3307 my $eval =
3122 "do {\n" 3308 "do {\n"
3123 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3309 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3124 . "#line 0 \"{$qcode}\"\n" 3310 . "#line 0 \"{$qcode}\"\n"
3125 . $code 3311 . $code
3126 . "\n}" 3312 . "\n}"
3127 ; 3313 ;
3128 3314
3315 if ($CFG{safe_eval}) {
3129 sub_generation_inc; 3316 sub_generation_inc;
3317 local @safe::cf::_safe_eval_args = values %vars;
3130 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3318 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3131 sub_generation_inc; 3319 sub_generation_inc;
3320 } else {
3321 local @cf::_safe_eval_args = values %vars;
3322 @res = wantarray ? eval eval : scalar eval $eval;
3323 }
3132 3324
3133 if ($@) { 3325 if ($@) {
3134 warn "$@"; 3326 warn "$@",
3135 warn "while executing safe code '$code'\n"; 3327 "while executing safe code '$code'\n",
3136 warn "with arguments " . (join " ", %vars) . "\n"; 3328 "with arguments " . (join " ", %vars) . "\n";
3137 } 3329 }
3138 3330
3139 wantarray ? @res : $res[0] 3331 wantarray ? @res : $res[0]
3140} 3332}
3141 3333
3155=cut 3347=cut
3156 3348
3157sub register_script_function { 3349sub register_script_function {
3158 my ($fun, $cb) = @_; 3350 my ($fun, $cb) = @_;
3159 3351
3160 no strict 'refs'; 3352 $fun = "safe::$fun" if $CFG{safe_eval};
3161 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3353 *$fun = $safe_hole->wrap ($cb);
3162} 3354}
3163 3355
3164=back 3356=back
3165 3357
3166=cut 3358=cut
3167 3359
3168############################################################################# 3360#############################################################################
3169# the server's init and main functions 3361# the server's init and main functions
3362
3363# async inc loader. yay.
3364sub inc_loader {
3365 my $mod = $_[1];
3366
3367 if (in_main && !tick_inhibit) {
3368 Carp::cluck "ERROR: attempted synchronous perl module load ($mod)";
3369 } else {
3370 debug "loading perl module $mod\n";
3371 }
3372
3373 # 1. find real file
3374 for my $dir (@ORIG_INC) {
3375 ref $dir and next;
3376 0 <= Coro::AIO::aio_load "$dir/$mod", my $data
3377 or next;
3378
3379 $data = "#line 1 $dir/$mod\n$data";
3380
3381 open my $fh, "<", \$data or die;
3382
3383 return $fh;
3384 }
3385
3386 ()
3387}
3388
3389sub init_inc {
3390 # save original @INC
3391 @ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC;
3392
3393 # make sure we can do scalar-opens
3394 open my $dummy, "<", \my $dummy2;
3395
3396 # execute some stuff so perl load's some of the core modules
3397 /Ü/ =~ /ü/i;
3398 eval { &Storable::nstore_fd };
3399
3400 @INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc.
3401
3402 debug "module loading will be asynchronous from this point on.";
3403}
3170 3404
3171sub load_facedata($) { 3405sub load_facedata($) {
3172 my ($path) = @_; 3406 my ($path) = @_;
3173 3407
3174 # HACK to clear player env face cache, we need some signal framework 3408 # HACK to clear player env face cache, we need some signal framework
3175 # for this (global event?) 3409 # for this (global event?)
3176 %ext::player_env::MUSIC_FACE_CACHE = (); 3410 %ext::player_env::MUSIC_FACE_CACHE = ();
3177 3411
3178 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3412 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3179 3413
3180 warn "loading facedata from $path\n"; 3414 trace "loading facedata from $path\n";
3181 3415
3182 my $facedata; 3416 my $facedata;
3183 0 < aio_load $path, $facedata 3417 0 < aio_load $path, $facedata
3184 or die "$path: $!"; 3418 or die "$path: $!";
3185 3419
3187 3421
3188 $facedata->{version} == 2 3422 $facedata->{version} == 2
3189 or cf::cleanup "$path: version mismatch, cannot proceed."; 3423 or cf::cleanup "$path: version mismatch, cannot proceed.";
3190 3424
3191 # patch in the exptable 3425 # patch in the exptable
3426 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3192 $facedata->{resource}{"res/exp_table"} = { 3427 $facedata->{resource}{"res/exp_table"} = {
3193 type => FT_RSRC, 3428 type => FT_RSRC,
3194 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3429 data => $exp_table,
3430 hash => (Digest::MD5::md5 $exp_table),
3195 }; 3431 };
3196 cf::cede_to_tick; 3432 cf::cede_to_tick;
3197 3433
3198 { 3434 {
3199 my $faces = $facedata->{faceinfo}; 3435 my $faces = $facedata->{faceinfo};
3201 while (my ($face, $info) = each %$faces) { 3437 while (my ($face, $info) = each %$faces) {
3202 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3438 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3203 3439
3204 cf::face::set_visibility $idx, $info->{visibility}; 3440 cf::face::set_visibility $idx, $info->{visibility};
3205 cf::face::set_magicmap $idx, $info->{magicmap}; 3441 cf::face::set_magicmap $idx, $info->{magicmap};
3206 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3442 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3207 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3443 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3208 3444
3209 cf::cede_to_tick; 3445 cf::cede_to_tick;
3210 } 3446 }
3211 3447
3212 while (my ($face, $info) = each %$faces) { 3448 while (my ($face, $info) = each %$faces) {
3217 3453
3218 if (my $smooth = cf::face::find $info->{smooth}) { 3454 if (my $smooth = cf::face::find $info->{smooth}) {
3219 cf::face::set_smooth $idx, $smooth; 3455 cf::face::set_smooth $idx, $smooth;
3220 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3456 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3221 } else { 3457 } else {
3222 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3458 error "smooth face '$info->{smooth}' not found for face '$face'";
3223 } 3459 }
3224 3460
3225 cf::cede_to_tick; 3461 cf::cede_to_tick;
3226 } 3462 }
3227 } 3463 }
3236 3472
3237 cf::anim::invalidate_all; # d'oh 3473 cf::anim::invalidate_all; # d'oh
3238 } 3474 }
3239 3475
3240 { 3476 {
3241 # TODO: for gcfclient pleasure, we should give resources
3242 # that gcfclient doesn't grok a >10000 face index.
3243 my $res = $facedata->{resource}; 3477 my $res = $facedata->{resource};
3244 3478
3245 while (my ($name, $info) = each %$res) { 3479 while (my ($name, $info) = each %$res) {
3246 if (defined $info->{type}) { 3480 if (defined $info->{type}) {
3247 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3481 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3248 my $data;
3249 3482
3250 if ($info->{type} & 1) { 3483 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3251 # prepend meta info
3252
3253 my $meta = $enc->encode ({
3254 name => $name,
3255 %{ $info->{meta} || {} },
3256 });
3257
3258 $data = pack "(w/a*)*", $meta, $info->{data};
3259 } else {
3260 $data = $info->{data};
3261 }
3262
3263 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3264 cf::face::set_type $idx, $info->{type}; 3484 cf::face::set_type $idx, $info->{type};
3265 } else { 3485 } else {
3266 $RESOURCE{$name} = $info; 3486 $RESOURCE{$name} = $info; # unused
3267 } 3487 }
3268 3488
3269 cf::cede_to_tick; 3489 cf::cede_to_tick;
3270 } 3490 }
3271 } 3491 }
3272 3492
3273 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3493 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3274 3494
3275 1 3495 1
3276} 3496}
3277
3278cf::global->attach (on_resource_update => sub {
3279 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3280 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3281
3282 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3283 my $sound = $soundconf->{compat}[$_]
3284 or next;
3285
3286 my $face = cf::face::find "sound/$sound->[1]";
3287 cf::sound::set $sound->[0] => $face;
3288 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3289 }
3290
3291 while (my ($k, $v) = each %{$soundconf->{event}}) {
3292 my $face = cf::face::find "sound/$v";
3293 cf::sound::set $k => $face;
3294 }
3295 }
3296});
3297 3497
3298register_exticmd fx_want => sub { 3498register_exticmd fx_want => sub {
3299 my ($ns, $want) = @_; 3499 my ($ns, $want) = @_;
3300 3500
3301 while (my ($k, $v) = each %$want) { 3501 while (my ($k, $v) = each %$want) {
3302 $ns->fx_want ($k, $v); 3502 $ns->fx_want ($k, $v);
3303 } 3503 }
3304}; 3504};
3505
3506sub load_resource_file($) {
3507 my $guard = lock_acquire "load_resource_file";
3508
3509 my $status = load_resource_file_ $_[0];
3510 get_slot 0.1, 100;
3511 cf::arch::commit_load;
3512
3513 $status
3514}
3305 3515
3306sub reload_regions { 3516sub reload_regions {
3307 # HACK to clear player env face cache, we need some signal framework 3517 # HACK to clear player env face cache, we need some signal framework
3308 # for this (global event?) 3518 # for this (global event?)
3309 %ext::player_env::MUSIC_FACE_CACHE = (); 3519 %ext::player_env::MUSIC_FACE_CACHE = ();
3323} 3533}
3324 3534
3325sub reload_archetypes { 3535sub reload_archetypes {
3326 load_resource_file "$DATADIR/archetypes" 3536 load_resource_file "$DATADIR/archetypes"
3327 or die "unable to load archetypes\n"; 3537 or die "unable to load archetypes\n";
3328 #d# NEED to laod twice to resolve forward references
3329 # this really needs to be done in an extra post-pass
3330 # (which needs to be synchronous, so solve it differently)
3331 load_resource_file "$DATADIR/archetypes"
3332 or die "unable to load archetypes\n";
3333} 3538}
3334 3539
3335sub reload_treasures { 3540sub reload_treasures {
3336 load_resource_file "$DATADIR/treasures" 3541 load_resource_file "$DATADIR/treasures"
3337 or die "unable to load treasurelists\n"; 3542 or die "unable to load treasurelists\n";
3338} 3543}
3339 3544
3545sub reload_sound {
3546 trace "loading sound config from $DATADIR/sound\n";
3547
3548 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3549 or die "$DATADIR/sound $!";
3550
3551 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3552
3553 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3554 my $sound = $soundconf->{compat}[$_]
3555 or next;
3556
3557 my $face = cf::face::find "sound/$sound->[1]";
3558 cf::sound::set $sound->[0] => $face;
3559 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3560 }
3561
3562 while (my ($k, $v) = each %{$soundconf->{event}}) {
3563 my $face = cf::face::find "sound/$v";
3564 cf::sound::set $k => $face;
3565 }
3566}
3567
3340sub reload_resources { 3568sub reload_resources {
3341 warn "reloading resource files...\n"; 3569 trace "reloading resource files...\n";
3342 3570
3571 reload_facedata;
3572 reload_sound;
3573 reload_archetypes;
3343 reload_regions; 3574 reload_regions;
3344 reload_facedata;
3345 #reload_archetypes;#d#
3346 reload_archetypes;
3347 reload_treasures; 3575 reload_treasures;
3348 3576
3349 warn "finished reloading resource files\n"; 3577 trace "finished reloading resource files\n";
3350}
3351
3352sub init {
3353 reload_resources;
3354} 3578}
3355 3579
3356sub reload_config { 3580sub reload_config {
3581 trace "reloading config file...\n";
3582
3357 open my $fh, "<:utf8", "$CONFDIR/config" 3583 open my $fh, "<:utf8", "$CONFDIR/config"
3358 or return; 3584 or return;
3359 3585
3360 local $/; 3586 local $/;
3361 *CFG = YAML::Load <$fh>; 3587 *CFG = YAML::XS::Load scalar <$fh>;
3362 3588
3363 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3589 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3364 3590
3365 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3591 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3366 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3592 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3367 3593
3368 if (exists $CFG{mlockall}) { 3594 if (exists $CFG{mlockall}) {
3370 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3596 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3371 and die "WARNING: m(un)lockall failed: $!\n"; 3597 and die "WARNING: m(un)lockall failed: $!\n";
3372 }; 3598 };
3373 warn $@ if $@; 3599 warn $@ if $@;
3374 } 3600 }
3601
3602 trace "finished reloading resource files\n";
3603}
3604
3605sub pidfile() {
3606 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3607 or die "$PIDFILE: $!";
3608 flock $fh, &Fcntl::LOCK_EX
3609 or die "$PIDFILE: flock: $!";
3610 $fh
3611}
3612
3613# make sure only one server instance is running at any one time
3614sub atomic {
3615 my $fh = pidfile;
3616
3617 my $pid = <$fh>;
3618 kill 9, $pid if $pid > 0;
3619
3620 seek $fh, 0, 0;
3621 print $fh $$;
3622}
3623
3624sub main_loop {
3625 trace "EV::loop starting\n";
3626 if (1) {
3627 EV::loop;
3628 }
3629 trace "EV::loop returned\n";
3630 goto &main_loop unless $REALLY_UNLOOP;
3375} 3631}
3376 3632
3377sub main { 3633sub main {
3634 cf::init_globals; # initialise logging
3635
3636 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3637 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3638 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3639 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3640
3641 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3642
3378 # we must not ever block the main coroutine 3643 # we must not ever block the main coroutine
3379 local $Coro::idle = sub { 3644 local $Coro::idle = sub {
3380 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3645 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3381 (async { 3646 (async {
3382 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3647 $Coro::current->{desc} = "IDLE BUG HANDLER";
3383 EV::loop EV::LOOP_ONESHOT; 3648 EV::loop EV::LOOP_ONESHOT;
3384 })->prio (Coro::PRIO_MAX); 3649 })->prio (Coro::PRIO_MAX);
3385 }; 3650 };
3386 3651
3387 reload_config;
3388 db_init;
3389 load_extensions;
3390
3391 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3392 evthread_start IO::AIO::poll_fileno; 3652 evthread_start IO::AIO::poll_fileno;
3393 EV::loop; 3653
3654 cf::sync_job {
3655 init_inc;
3656
3657 cf::init_experience;
3658 cf::init_anim;
3659 cf::init_attackmess;
3660 cf::init_dynamic;
3661
3662 cf::load_settings;
3663 cf::load_materials;
3664
3665 reload_resources;
3666 reload_config;
3667 db_init;
3668
3669 cf::init_uuid;
3670 cf::init_signals;
3671 cf::init_skills;
3672
3673 cf::init_beforeplay;
3674
3675 atomic;
3676
3677 load_extensions;
3678
3679 utime time, time, $RUNTIMEFILE;
3680
3681 # no (long-running) fork's whatsoever before this point(!)
3682 use POSIX ();
3683 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3684
3685 (pop @POST_INIT)->(0) while @POST_INIT;
3686 };
3687
3688 cf::object::thawer::errors_are_fatal 0;
3689 info "parse errors in files are no longer fatal from this point on.\n";
3690
3691 my $free_main; $free_main = EV::idle sub {
3692 undef $free_main;
3693 undef &main; # free gobs of memory :)
3694 };
3695
3696 goto &main_loop;
3394} 3697}
3395 3698
3396############################################################################# 3699#############################################################################
3397# initialisation and cleanup 3700# initialisation and cleanup
3398 3701
3399# install some emergency cleanup handlers 3702# install some emergency cleanup handlers
3400BEGIN { 3703BEGIN {
3401 our %SIGWATCHER = (); 3704 our %SIGWATCHER = ();
3402 for my $signal (qw(INT HUP TERM)) { 3705 for my $signal (qw(INT HUP TERM)) {
3403 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3706 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3404 cf::cleanup "SIG$signal"; 3707 cf::cleanup "SIG$signal";
3405 }; 3708 };
3406 } 3709 }
3407} 3710}
3408 3711
3409sub write_runtime_sync { 3712sub write_runtime_sync {
3410 my $runtime = "$LOCALDIR/runtime"; 3713 my $t0 = AE::time;
3411 3714
3412 # first touch the runtime file to show we are still running: 3715 # first touch the runtime file to show we are still running:
3413 # the fsync below can take a very very long time. 3716 # the fsync below can take a very very long time.
3414 3717
3415 IO::AIO::aio_utime $runtime, undef, undef; 3718 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3416 3719
3417 my $guard = cf::lock_acquire "write_runtime"; 3720 my $guard = cf::lock_acquire "write_runtime";
3418 3721
3419 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3722 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3420 or return; 3723 or return;
3421 3724
3422 my $value = $cf::RUNTIME + 90 + 10; 3725 my $value = $cf::RUNTIME + 90 + 10;
3423 # 10 is the runtime save interval, for a monotonic clock 3726 # 10 is the runtime save interval, for a monotonic clock
3424 # 60 allows for the watchdog to kill the server. 3727 # 60 allows for the watchdog to kill the server.
3434 aio_utime $fh, undef, undef; 3737 aio_utime $fh, undef, undef;
3435 3738
3436 close $fh 3739 close $fh
3437 or return; 3740 or return;
3438 3741
3439 aio_rename "$runtime~", $runtime 3742 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3440 and return; 3743 and return;
3441 3744
3442 warn "runtime file written.\n"; 3745 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3443 3746
3444 1 3747 1
3445} 3748}
3446 3749
3447our $uuid_lock; 3750our $uuid_lock;
3456 my $uuid = "$LOCALDIR/uuid"; 3759 my $uuid = "$LOCALDIR/uuid";
3457 3760
3458 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3761 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3459 or return; 3762 or return;
3460 3763
3461 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3764 my $value = uuid_seq uuid_cur;
3765
3766 unless ($value) {
3767 info "cowardly refusing to write zero uuid value!\n";
3768 return;
3769 }
3770
3771 my $value = uuid_str $value + $uuid_skip;
3462 $uuid_skip = 0; 3772 $uuid_skip = 0;
3463 3773
3464 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3774 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3465 and return; 3775 and return;
3466 3776
3472 or return; 3782 or return;
3473 3783
3474 aio_rename "$uuid~", $uuid 3784 aio_rename "$uuid~", $uuid
3475 and return; 3785 and return;
3476 3786
3477 warn "uuid file written ($value).\n"; 3787 trace "uuid file written ($value).\n";
3478 3788
3479 1 3789 1
3480 3790
3481} 3791}
3482 3792
3488} 3798}
3489 3799
3490sub emergency_save() { 3800sub emergency_save() {
3491 my $freeze_guard = cf::freeze_mainloop; 3801 my $freeze_guard = cf::freeze_mainloop;
3492 3802
3493 warn "enter emergency perl save\n"; 3803 info "emergency_perl_save: enter\n";
3804
3805 # this is a trade-off: we want to be very quick here, so
3806 # save all maps without fsync, and later call a global sync
3807 # (which in turn might be very very slow)
3808 local $USE_FSYNC = 0;
3494 3809
3495 cf::sync_job { 3810 cf::sync_job {
3811 cf::write_runtime_sync; # external watchdog should not bark
3812
3496 # use a peculiar iteration method to avoid tripping on perl 3813 # use a peculiar iteration method to avoid tripping on perl
3497 # refcount bugs in for. also avoids problems with players 3814 # refcount bugs in for. also avoids problems with players
3498 # and maps saved/destroyed asynchronously. 3815 # and maps saved/destroyed asynchronously.
3499 warn "begin emergency player save\n"; 3816 info "emergency_perl_save: begin player save\n";
3500 for my $login (keys %cf::PLAYER) { 3817 for my $login (keys %cf::PLAYER) {
3501 my $pl = $cf::PLAYER{$login} or next; 3818 my $pl = $cf::PLAYER{$login} or next;
3502 $pl->valid or next; 3819 $pl->valid or next;
3503 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3820 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3504 $pl->save; 3821 $pl->save;
3505 } 3822 }
3506 warn "end emergency player save\n"; 3823 info "emergency_perl_save: end player save\n";
3507 3824
3508 warn "begin emergency map save\n"; 3825 cf::write_runtime_sync; # external watchdog should not bark
3826
3827 info "emergency_perl_save: begin map save\n";
3509 for my $path (keys %cf::MAP) { 3828 for my $path (keys %cf::MAP) {
3510 my $map = $cf::MAP{$path} or next; 3829 my $map = $cf::MAP{$path} or next;
3511 $map->valid or next; 3830 $map->valid or next;
3512 $map->save; 3831 $map->save;
3513 } 3832 }
3514 warn "end emergency map save\n"; 3833 info "emergency_perl_save: end map save\n";
3515 3834
3516 warn "begin emergency database checkpoint\n"; 3835 cf::write_runtime_sync; # external watchdog should not bark
3836
3837 info "emergency_perl_save: begin database checkpoint\n";
3517 BDB::db_env_txn_checkpoint $DB_ENV; 3838 BDB::db_env_txn_checkpoint $DB_ENV;
3518 warn "end emergency database checkpoint\n"; 3839 info "emergency_perl_save: end database checkpoint\n";
3519 3840
3520 warn "begin write uuid\n"; 3841 info "emergency_perl_save: begin write uuid\n";
3521 write_uuid_sync 1; 3842 write_uuid_sync 1;
3522 warn "end write uuid\n"; 3843 info "emergency_perl_save: end write uuid\n";
3844
3845 cf::write_runtime_sync; # external watchdog should not bark
3846
3847 trace "emergency_perl_save: syncing database to disk";
3848 BDB::db_env_txn_checkpoint $DB_ENV;
3849
3850 info "emergency_perl_save: starting sync\n";
3851 IO::AIO::aio_sync sub {
3852 info "emergency_perl_save: finished sync\n";
3853 };
3854
3855 cf::write_runtime_sync; # external watchdog should not bark
3856
3857 trace "emergency_perl_save: flushing outstanding aio requests";
3858 while (IO::AIO::nreqs || BDB::nreqs) {
3859 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3860 }
3861
3862 cf::write_runtime_sync; # external watchdog should not bark
3523 }; 3863 };
3524 3864
3525 warn "leave emergency perl save\n"; 3865 info "emergency_perl_save: leave\n";
3526} 3866}
3527 3867
3528sub post_cleanup { 3868sub post_cleanup {
3529 my ($make_core) = @_; 3869 my ($make_core) = @_;
3530 3870
3871 IO::AIO::flush;
3872
3531 warn Carp::longmess "post_cleanup backtrace" 3873 error Carp::longmess "post_cleanup backtrace"
3532 if $make_core; 3874 if $make_core;
3875
3876 my $fh = pidfile;
3877 unlink $PIDFILE if <$fh> == $$;
3878}
3879
3880# a safer delete_package, copied from Symbol
3881sub clear_package($) {
3882 my $pkg = shift;
3883
3884 # expand to full symbol table name if needed
3885 unless ($pkg =~ /^main::.*::$/) {
3886 $pkg = "main$pkg" if $pkg =~ /^::/;
3887 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3888 $pkg .= '::' unless $pkg =~ /::$/;
3889 }
3890
3891 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3892 my $stem_symtab = *{$stem}{HASH};
3893
3894 defined $stem_symtab and exists $stem_symtab->{$leaf}
3895 or return;
3896
3897 # clear all symbols
3898 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3899 for my $name (keys %$leaf_symtab) {
3900 _gv_clear *{"$pkg$name"};
3901# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3902 }
3533} 3903}
3534 3904
3535sub do_reload_perl() { 3905sub do_reload_perl() {
3536 # can/must only be called in main 3906 # can/must only be called in main
3537 if ($Coro::current != $Coro::main) { 3907 if (in_main) {
3538 warn "can only reload from main coroutine"; 3908 error "can only reload from main coroutine";
3539 return; 3909 return;
3540 } 3910 }
3541 3911
3912 return if $RELOAD++;
3913
3914 my $t1 = AE::time;
3915
3916 while ($RELOAD) {
3542 warn "reloading..."; 3917 info "reloading...";
3543 3918
3544 warn "entering sync_job"; 3919 trace "entering sync_job";
3545 3920
3546 cf::sync_job { 3921 cf::sync_job {
3547 cf::write_runtime_sync; # external watchdog should not bark
3548 cf::emergency_save; 3922 cf::emergency_save;
3549 cf::write_runtime_sync; # external watchdog should not bark
3550 3923
3551 warn "syncing database to disk";
3552 BDB::db_env_txn_checkpoint $DB_ENV;
3553
3554 # if anything goes wrong in here, we should simply crash as we already saved
3555
3556 warn "flushing outstanding aio requests";
3557 for (;;) {
3558 BDB::flush;
3559 IO::AIO::flush;
3560 Coro::cede_notself;
3561 last unless IO::AIO::nreqs || BDB::nreqs;
3562 warn "iterate...";
3563 }
3564
3565 ++$RELOAD;
3566
3567 warn "cancelling all extension coros"; 3924 trace "cancelling all extension coros";
3568 $_->cancel for values %EXT_CORO; 3925 $_->cancel for values %EXT_CORO;
3569 %EXT_CORO = (); 3926 %EXT_CORO = ();
3570 3927
3571 warn "removing commands"; 3928 trace "removing commands";
3572 %COMMAND = (); 3929 %COMMAND = ();
3573 3930
3574 warn "removing ext/exti commands"; 3931 trace "removing ext/exti commands";
3575 %EXTCMD = (); 3932 %EXTCMD = ();
3576 %EXTICMD = (); 3933 %EXTICMD = ();
3577 3934
3578 warn "unloading/nuking all extensions"; 3935 trace "unloading/nuking all extensions";
3579 for my $pkg (@EXTS) { 3936 for my $pkg (@EXTS) {
3580 warn "... unloading $pkg"; 3937 trace "... unloading $pkg";
3581 3938
3582 if (my $cb = $pkg->can ("unload")) { 3939 if (my $cb = $pkg->can ("unload")) {
3583 eval { 3940 eval {
3584 $cb->($pkg); 3941 $cb->($pkg);
3585 1 3942 1
3586 } or warn "$pkg unloaded, but with errors: $@"; 3943 } or error "$pkg unloaded, but with errors: $@";
3944 }
3945
3946 trace "... clearing $pkg";
3947 clear_package $pkg;
3587 } 3948 }
3588 3949
3589 warn "... nuking $pkg";
3590 Symbol::delete_package $pkg;
3591 }
3592
3593 warn "unloading all perl modules loaded from $LIBDIR"; 3950 trace "unloading all perl modules loaded from $LIBDIR";
3594 while (my ($k, $v) = each %INC) { 3951 while (my ($k, $v) = each %INC) {
3595 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3952 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3596 3953
3597 warn "... unloading $k"; 3954 trace "... unloading $k";
3598 delete $INC{$k}; 3955 delete $INC{$k};
3599 3956
3600 $k =~ s/\.pm$//; 3957 $k =~ s/\.pm$//;
3601 $k =~ s/\//::/g; 3958 $k =~ s/\//::/g;
3602 3959
3603 if (my $cb = $k->can ("unload_module")) { 3960 if (my $cb = $k->can ("unload_module")) {
3604 $cb->(); 3961 $cb->();
3962 }
3963
3964 clear_package $k;
3605 } 3965 }
3606 3966
3607 Symbol::delete_package $k;
3608 }
3609
3610 warn "getting rid of safe::, as good as possible"; 3967 trace "getting rid of safe::, as good as possible";
3611 Symbol::delete_package "safe::$_" 3968 clear_package "safe::$_"
3612 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3969 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3613 3970
3614 warn "unloading cf.pm \"a bit\""; 3971 trace "unloading cf.pm \"a bit\"";
3615 delete $INC{"cf.pm"}; 3972 delete $INC{"cf.pm"};
3616 delete $INC{"cf/pod.pm"}; 3973 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3617 3974
3618 # don't, removes xs symbols, too, 3975 # don't, removes xs symbols, too,
3619 # and global variables created in xs 3976 # and global variables created in xs
3620 #Symbol::delete_package __PACKAGE__; 3977 #clear_package __PACKAGE__;
3621 3978
3622 warn "unload completed, starting to reload now"; 3979 info "unload completed, starting to reload now";
3623 3980
3624 warn "reloading cf.pm"; 3981 trace "reloading cf.pm";
3625 require cf; 3982 require cf;
3626 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3983 cf::_connect_to_perl_1;
3627 3984
3628 warn "loading config and database again"; 3985 trace "loading config and database again";
3629 cf::reload_config; 3986 cf::reload_config;
3630 3987
3631 warn "loading extensions"; 3988 trace "loading extensions";
3632 cf::load_extensions; 3989 cf::load_extensions;
3633 3990
3991 if ($REATTACH_ON_RELOAD) {
3634 warn "reattaching attachments to objects/players"; 3992 trace "reattaching attachments to objects/players";
3635 _global_reattach; # objects, sockets 3993 _global_reattach; # objects, sockets
3636 warn "reattaching attachments to maps"; 3994 trace "reattaching attachments to maps";
3637 reattach $_ for values %MAP; 3995 reattach $_ for values %MAP;
3638 warn "reattaching attachments to players"; 3996 trace "reattaching attachments to players";
3639 reattach $_ for values %PLAYER; 3997 reattach $_ for values %PLAYER;
3998 }
3640 3999
4000 trace "running post_init jobs";
4001 (pop @POST_INIT)->(1) while @POST_INIT;
4002
3641 warn "leaving sync_job"; 4003 trace "leaving sync_job";
3642 4004
3643 1 4005 1
3644 } or do { 4006 } or do {
3645 warn $@; 4007 error $@;
3646 cf::cleanup "error while reloading, exiting."; 4008 cf::cleanup "error while reloading, exiting.";
4009 };
4010
4011 info "reloaded";
4012 --$RELOAD;
3647 }; 4013 }
3648 4014
3649 warn "reloaded"; 4015 $t1 = AE::time - $t1;
4016 info "reload completed in ${t1}s\n";
3650}; 4017};
3651 4018
3652our $RELOAD_WATCHER; # used only during reload 4019our $RELOAD_WATCHER; # used only during reload
3653 4020
3654sub reload_perl() { 4021sub reload_perl() {
3655 # doing reload synchronously and two reloads happen back-to-back, 4022 # doing reload synchronously and two reloads happen back-to-back,
3656 # coro crashes during coro_state_free->destroy here. 4023 # coro crashes during coro_state_free->destroy here.
3657 4024
4025 $RELOAD_WATCHER ||= cf::async {
4026 Coro::AIO::aio_wait cache_extensions;
4027
3658 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4028 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3659 do_reload_perl; 4029 do_reload_perl;
3660 undef $RELOAD_WATCHER; 4030 undef $RELOAD_WATCHER;
4031 };
3661 }; 4032 };
3662} 4033}
3663 4034
3664register_command "reload" => sub { 4035register_command "reload" => sub {
3665 my ($who, $arg) = @_; 4036 my ($who, $arg) = @_;
3671 reload_perl; 4042 reload_perl;
3672 }; 4043 };
3673 } 4044 }
3674}; 4045};
3675 4046
3676unshift @INC, $LIBDIR; 4047#############################################################################
3677 4048
3678my $bug_warning = 0; 4049my $bug_warning = 0;
3679 4050
3680our @WAIT_FOR_TICK; 4051our @WAIT_FOR_TICK;
3681our @WAIT_FOR_TICK_BEGIN; 4052our @WAIT_FOR_TICK_BEGIN;
3682 4053
3683sub wait_for_tick { 4054sub wait_for_tick {
3684 return if tick_inhibit;
3685 return if $Coro::current == $Coro::main; 4055 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3686 4056
3687 my $signal = new Coro::Signal; 4057 my $signal = new Coro::Signal;
3688 push @WAIT_FOR_TICK, $signal; 4058 push @WAIT_FOR_TICK, $signal;
3689 $signal->wait; 4059 $signal->wait;
3690} 4060}
3691 4061
3692sub wait_for_tick_begin { 4062sub wait_for_tick_begin {
3693 return if tick_inhibit;
3694 return if $Coro::current == $Coro::main; 4063 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3695 4064
3696 my $signal = new Coro::Signal; 4065 my $signal = new Coro::Signal;
3697 push @WAIT_FOR_TICK_BEGIN, $signal; 4066 push @WAIT_FOR_TICK_BEGIN, $signal;
3698 $signal->wait; 4067 $signal->wait;
3699} 4068}
3705 return; 4074 return;
3706 } 4075 }
3707 4076
3708 cf::server_tick; # one server iteration 4077 cf::server_tick; # one server iteration
3709 4078
4079 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4080
3710 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4081 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3711 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4082 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3712 Coro::async_pool { 4083 Coro::async_pool {
3713 $Coro::current->{desc} = "runtime saver"; 4084 $Coro::current->{desc} = "runtime saver";
3714 write_runtime_sync 4085 write_runtime_sync
3715 or warn "ERROR: unable to write runtime file: $!"; 4086 or error "ERROR: unable to write runtime file: $!";
3716 }; 4087 };
3717 } 4088 }
3718 4089
3719 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4090 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3720 $sig->send; 4091 $sig->send;
3728 4099
3729 if (0) { 4100 if (0) {
3730 if ($NEXT_TICK) { 4101 if ($NEXT_TICK) {
3731 my $jitter = $TICK_START - $NEXT_TICK; 4102 my $jitter = $TICK_START - $NEXT_TICK;
3732 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4103 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3733 warn "jitter $JITTER\n";#d# 4104 debug "jitter $JITTER\n";#d#
3734 } 4105 }
3735 } 4106 }
3736} 4107}
3737 4108
3738{ 4109{
3739 # configure BDB 4110 # configure BDB
3740 4111
3741 BDB::min_parallel 8; 4112 BDB::min_parallel 16;
3742 BDB::max_poll_reqs $TICK * 0.1; 4113 BDB::max_poll_reqs $TICK * 0.1;
3743 $Coro::BDB::WATCHER->priority (1); 4114 $AnyEvent::BDB::WATCHER->priority (1);
3744 4115
3745 unless ($DB_ENV) { 4116 unless ($DB_ENV) {
3746 $DB_ENV = BDB::db_env_create; 4117 $DB_ENV = BDB::db_env_create;
3747 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4118 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3748 | BDB::LOG_AUTOREMOVE, 1); 4119 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4120 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3749 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4121 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3750 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4122 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3751 4123
3752 cf::sync_job { 4124 cf::sync_job {
3753 eval { 4125 eval {
3779{ 4151{
3780 # configure IO::AIO 4152 # configure IO::AIO
3781 4153
3782 IO::AIO::min_parallel 8; 4154 IO::AIO::min_parallel 8;
3783 IO::AIO::max_poll_time $TICK * 0.1; 4155 IO::AIO::max_poll_time $TICK * 0.1;
3784 $Coro::AIO::WATCHER->priority (1); 4156 undef $AnyEvent::AIO::WATCHER;
3785} 4157}
3786 4158
3787my $_log_backtrace; 4159my $_log_backtrace;
3788 4160
3789sub _log_backtrace { 4161sub _log_backtrace {
3792 $msg =~ s/\n//; 4164 $msg =~ s/\n//;
3793 4165
3794 # limit the # of concurrent backtraces 4166 # limit the # of concurrent backtraces
3795 if ($_log_backtrace < 2) { 4167 if ($_log_backtrace < 2) {
3796 ++$_log_backtrace; 4168 ++$_log_backtrace;
4169 my $perl_bt = Carp::longmess $msg;
3797 async { 4170 async {
3798 $Coro::current->{desc} = "abt $msg"; 4171 $Coro::current->{desc} = "abt $msg";
3799 4172
3800 my @bt = fork_call { 4173 my @bt = fork_call {
3801 @addr = map { sprintf "%x", $_ } @addr; 4174 @addr = map { sprintf "%x", $_ } @addr;
3812 } 4185 }
3813 4186
3814 @funcs 4187 @funcs
3815 }; 4188 };
3816 4189
3817 LOG llevInfo, "[ABT] $msg\n"; 4190 LOG llevInfo, "[ABT] $perl_bt\n";
4191 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3818 LOG llevInfo, "[ABT] $_\n" for @bt; 4192 LOG llevInfo, "[ABT] $_\n" for @bt;
3819 --$_log_backtrace; 4193 --$_log_backtrace;
3820 }; 4194 };
3821 } else { 4195 } else {
3822 LOG llevInfo, "[ABT] $msg\n"; 4196 LOG llevInfo, "[ABT] $msg\n";
3823 LOG llevInfo, "[ABT] [suppressed]\n"; 4197 LOG llevInfo, "[ABT] [suppressed]\n";
3824 } 4198 }
3825} 4199}
3826 4200
3827# load additional modules 4201# load additional modules
3828use cf::pod; 4202require "cf/$_.pm" for @EXTRA_MODULES;
4203cf::_connect_to_perl_2;
3829 4204
3830END { cf::emergency_save } 4205END { cf::emergency_save }
3831 4206
38321 42071
3833 4208

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines