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.456 by root, Tue Sep 30 04:00:35 2008 UTC vs.
Revision 1.557 by root, Tue Oct 5 21:40:05 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 5.10.0; 25use common::sense;
25use utf8;
26use strict "vars", "subs";
27 26
28use Symbol; 27use Symbol;
29use List::Util; 28use List::Util;
30use Socket; 29use Socket;
31use EV; 30use EV;
32use Opcode; 31use Opcode;
33use Safe; 32use Safe;
34use Safe::Hole; 33use Safe::Hole;
35use Storable (); 34use Storable ();
35use Carp ();
36 36
37use Guard ();
37use Coro (); 38use Coro ();
38use Coro::State; 39use Coro::State;
39use Coro::Handle; 40use Coro::Handle;
40use Coro::EV; 41use Coro::EV;
41use Coro::AnyEvent; 42use Coro::AnyEvent;
42use Coro::Timer; 43use Coro::Timer;
43use Coro::Signal; 44use Coro::Signal;
44use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
45use Coro::AnyEvent; 47use Coro::AnyEvent;
46use Coro::AIO; 48use Coro::AIO;
47use Coro::BDB 1.6; 49use Coro::BDB 1.6;
48use Coro::Storable; 50use Coro::Storable;
49use Coro::Util (); 51use Coro::Util ();
50 52
51use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
52use BDB (); 54use BDB ();
53use Data::Dumper; 55use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 56use Fcntl;
56use YAML (); 57use YAML::XS ();
57use IO::AIO (); 58use IO::AIO ();
58use Time::HiRes; 59use Time::HiRes;
59use Compress::LZF; 60use Compress::LZF;
60use Digest::MD5 (); 61use Digest::MD5 ();
61 62
70 71
71# make sure c-lzf reinitialises itself 72# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
73Compress::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
74 75
76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
78
75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
76 82
77our %COMMAND = (); 83our %COMMAND = ();
78our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
79 85
80our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
83our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
84our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
85 91
86our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
87our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
88 96
89our $CONFDIR = confdir; 97our $CONFDIR = confdir;
90our $DATADIR = datadir; 98our $DATADIR = datadir;
91our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
92our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
98our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
99our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
102 110
103our %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;
104 118
105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107our $NEXT_TICK; 121our $NEXT_TICK;
108our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
109 123
110our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
112our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
113our $DB_ENV; 127our $DB_ENV;
114 128
129our @EXTRA_MODULES = qw(pod match mapscript incloader);
130
115our %CFG; 131our %CFG;
116 132
117our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
118our $RUNTIME; 134our $RUNTIME;
119our $NOW; 135our $NOW;
129our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter 146our $JITTER; # average jitter
131our $TICK_START; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
132 148
133our @POST_INIT; 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 :)
134 153
135binmode STDOUT; 154binmode STDOUT;
136binmode STDERR; 155binmode STDERR;
137 156
138# read virtual server time, if available 157# read virtual server time, if available
140 open my $fh, "<", $RUNTIMEFILE 159 open my $fh, "<", $RUNTIMEFILE
141 or die "unable to read $RUNTIMEFILE file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
142 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
143} 162}
144 163
164eval "sub TICK() { $TICK } 1" or die;
165
145mkdir $_ 166mkdir $_
146 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
147 168
148our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
149 170
150sub 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::"} };
151 187
152############################################################################# 188#############################################################################
153 189
154=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
155 191
197from wherever your confdir points to. 233from wherever your confdir points to.
198 234
199=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
200 236
201These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
202returns 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 thread
203per 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.
204 240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
205=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
206 247
207This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
208C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 249C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
209that call. 250that call.
210 251
252=item %cf::REFLECT
253
254Contains, for each (C++) class name, a hash reference with information
255about object members (methods, scalars, arrays and flags) and other
256metadata, which is useful for introspection.
257
211=back 258=back
212 259
213=cut 260=cut
214 261
215BEGIN { 262sub error(@) { LOG llevError, join "", @_ }
216 *CORE::GLOBAL::warn = sub { 263sub warn (@) { LOG llevWarn , join "", @_ }
264sub info (@) { LOG llevInfo , join "", @_ }
265sub debug(@) { LOG llevDebug, join "", @_ }
266sub trace(@) { LOG llevTrace, join "", @_ }
267
268$Coro::State::WARNHOOK = sub {
217 my $msg = join "", @_; 269 my $msg = join "", @_;
218 270
219 $msg .= "\n" 271 $msg .= "\n"
220 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
221 273
222 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 274 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
223 275
224 LOG llevError, $msg; 276 LOG llevWarn, $msg;
225 }; 277};
226}
227 278
228$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
229 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
230 281
231 if ($Coro::current == $Coro::main) {#d# 282 error Carp::longmess $_[0];
283
284 if (in_main) {#d#
232 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
233 return;#d# 286 return;#d#
234 }#d# 287 }#d#
235 288
236 # kill coroutine otherwise 289 # kill coroutine otherwise
237 warn Carp::longmess $_[0];
238 Coro::terminate 290 Coro::terminate
239}; 291};
240
241$SIG{__DIE__} = sub { }; #d#?
242 292
243@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 293@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
244@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 294@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
245@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 295@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
246@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 296@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
260)) { 310)) {
261 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
262} 312}
263 313
264$EV::DIED = sub { 314$EV::DIED = sub {
265 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
266}; 316};
267 317
268############################################################################# 318#############################################################################
269 319
270=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
307our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 357our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
308 358
309sub encode_json($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
310sub decode_json($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
311 361
362=item $ref = cf::yaml_load $scalar
363
364Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
365
366=cut
367
368sub fork_call(&@);
369
370sub yaml_load($) {
371 fork_call { YAML::XS::Load $_[0] } @_
372}
373
312=item cf::post_init { BLOCK } 374=item cf::post_init { BLOCK }
313 375
314Execute the given codeblock, I<after> all extensions have been (re-)loaded, 376Execute the given codeblock, I<after> all extensions have been (re-)loaded,
315but I<before> the server starts ticking again. 377but I<before> the server starts ticking again.
316 378
317The cdoeblock will have a single boolean argument to indicate whether this 379The codeblock will have a single boolean argument to indicate whether this
318is a reload or not. 380is a reload or not.
319 381
320=cut 382=cut
321 383
322sub post_init(&) { 384sub post_init(&) {
323 push @POST_INIT, shift; 385 push @POST_INIT, shift;
324} 386}
325 387
388sub _post_init {
389 trace "running post_init jobs";
390
391 # run them in parallel...
392
393 my @join;
394
395 while () {
396 push @join, map &Coro::async ($_, 0), @POST_INIT;
397 @POST_INIT = ();
398
399 @join or last;
400
401 (pop @join)->join;
402 }
403}
404
326=item cf::lock_wait $string 405=item cf::lock_wait $string
327 406
328Wait until the given lock is available. See cf::lock_acquire. 407Wait until the given lock is available. See cf::lock_acquire.
329 408
330=item my $lock = cf::lock_acquire $string 409=item my $lock = cf::lock_acquire $string
331 410
332Wait until the given lock is available and then acquires it and returns 411Wait until the given lock is available and then acquires it and returns
333a Coro::guard object. If the guard object gets destroyed (goes out of scope, 412a L<Guard> object. If the guard object gets destroyed (goes out of scope,
334for example when the coroutine gets canceled), the lock is automatically 413for example when the coroutine gets canceled), the lock is automatically
335returned. 414returned.
336 415
337Locks are *not* recursive, locking from the same coro twice results in a 416Locks are *not* recursive, locking from the same coro twice results in a
338deadlocked coro. 417deadlocked coro.
344 423
345Return true if the lock is currently active, i.e. somebody has locked it. 424Return true if the lock is currently active, i.e. somebody has locked it.
346 425
347=cut 426=cut
348 427
349our %LOCK; 428our $LOCKS = new Coro::SemaphoreSet;
350our %LOCKER;#d#
351 429
352sub lock_wait($) { 430sub lock_wait($) {
353 my ($key) = @_; 431 $LOCKS->wait ($_[0]);
354
355 if ($LOCKER{$key} == $Coro::current) {#d#
356 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
357 return;#d#
358 }#d#
359
360 # wait for lock, if any
361 while ($LOCK{$key}) {
362 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
363 push @{ $LOCK{$key} }, $Coro::current;
364 Coro::schedule;
365 }
366} 432}
367 433
368sub lock_acquire($) { 434sub lock_acquire($) {
369 my ($key) = @_; 435 $LOCKS->guard ($_[0])
370
371 # wait, to be sure we are not locked
372 lock_wait $key;
373
374 $LOCK{$key} = [];
375 $LOCKER{$key} = $Coro::current;#d#
376
377 Coro::guard {
378 delete $LOCKER{$key};#d#
379 # wake up all waiters, to be on the safe side
380 $_->ready for @{ delete $LOCK{$key} };
381 }
382} 436}
383 437
384sub lock_active($) { 438sub lock_active($) {
385 my ($key) = @_; 439 $LOCKS->count ($_[0]) < 1
386
387 ! ! $LOCK{$key}
388} 440}
389 441
390sub freeze_mainloop { 442sub freeze_mainloop {
391 tick_inhibit_inc; 443 tick_inhibit_inc;
392 444
393 Coro::guard \&tick_inhibit_dec; 445 &Guard::guard (\&tick_inhibit_dec);
394} 446}
395 447
396=item cf::periodic $interval, $cb 448=item cf::periodic $interval, $cb
397 449
398Like EV::periodic, but randomly selects a starting point so that the actions 450Like EV::periodic, but randomly selects a starting point so that the actions
399get spread over timer. 451get spread over time.
400 452
401=cut 453=cut
402 454
403sub periodic($$) { 455sub periodic($$) {
404 my ($interval, $cb) = @_; 456 my ($interval, $cb) = @_;
421 473
422=cut 474=cut
423 475
424our @SLOT_QUEUE; 476our @SLOT_QUEUE;
425our $SLOT_QUEUE; 477our $SLOT_QUEUE;
478our $SLOT_DECAY = 0.9;
426 479
427$SLOT_QUEUE->cancel if $SLOT_QUEUE; 480$SLOT_QUEUE->cancel if $SLOT_QUEUE;
428$SLOT_QUEUE = Coro::async { 481$SLOT_QUEUE = Coro::async {
429 $Coro::current->desc ("timeslot manager"); 482 $Coro::current->desc ("timeslot manager");
430 483
431 my $signal = new Coro::Signal; 484 my $signal = new Coro::Signal;
485 my $busy;
432 486
433 while () { 487 while () {
434 next_job: 488 next_job:
489
435 my $avail = cf::till_tick; 490 my $avail = cf::till_tick;
436 if ($avail > 0.01) { 491
437 for (0 .. $#SLOT_QUEUE) { 492 for (0 .. $#SLOT_QUEUE) {
438 if ($SLOT_QUEUE[$_][0] < $avail) { 493 if ($SLOT_QUEUE[$_][0] <= $avail) {
494 $busy = 0;
439 my $job = splice @SLOT_QUEUE, $_, 1, (); 495 my $job = splice @SLOT_QUEUE, $_, 1, ();
440 $job->[2]->send; 496 $job->[2]->send;
441 Coro::cede; 497 Coro::cede;
442 goto next_job; 498 goto next_job;
443 } 499 } else {
500 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
444 } 501 }
445 } 502 }
446 503
447 if (@SLOT_QUEUE) { 504 if (@SLOT_QUEUE) {
448 # we do not use wait_for_tick() as it returns immediately when tick is inactive 505 # we do not use wait_for_tick() as it returns immediately when tick is inactive
449 push @cf::WAIT_FOR_TICK, $signal; 506 push @cf::WAIT_FOR_TICK, $signal;
450 $signal->wait; 507 $signal->wait;
451 } else { 508 } else {
509 $busy = 0;
452 Coro::schedule; 510 Coro::schedule;
453 } 511 }
454 } 512 }
455}; 513};
456 514
457sub get_slot($;$$) { 515sub get_slot($;$$) {
458 return if tick_inhibit || $Coro::current == $Coro::main; 516 return if tick_inhibit || $Coro::current == $Coro::main;
459 517
460 my ($time, $pri, $name) = @_; 518 my ($time, $pri, $name) = @_;
461 519
462 $time = $TICK * .6 if $time > $TICK * .6; 520 $time = clamp $time, 0.01, $TICK * .6;
521
463 my $sig = new Coro::Signal; 522 my $sig = new Coro::Signal;
464 523
465 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 524 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
466 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 525 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
467 $SLOT_QUEUE->ready; 526 $SLOT_QUEUE->ready;
493=cut 552=cut
494 553
495sub sync_job(&) { 554sub sync_job(&) {
496 my ($job) = @_; 555 my ($job) = @_;
497 556
498 if ($Coro::current == $Coro::main) { 557 if (in_main) {
499 my $time = EV::time; 558 my $time = AE::time;
500 559
501 # this is the main coro, too bad, we have to block 560 # this is the main coro, too bad, we have to block
502 # till the operation succeeds, freezing the server :/ 561 # till the operation succeeds, freezing the server :/
503 562
504 LOG llevError, Carp::longmess "sync job";#d# 563 #LOG llevError, Carp::longmess "sync job";#d#
505 564
506 my $freeze_guard = freeze_mainloop; 565 my $freeze_guard = freeze_mainloop;
507 566
508 my $busy = 1; 567 my $busy = 1;
509 my @res; 568 my @res;
510 569
511 (async { 570 (async {
512 $Coro::current->desc ("sync job coro"); 571 $Coro::current->desc ("sync job coro");
513 @res = eval { $job->() }; 572 @res = eval { $job->() };
514 warn $@ if $@; 573 error $@ if $@;
515 undef $busy; 574 undef $busy;
516 })->prio (Coro::PRIO_MAX); 575 })->prio (Coro::PRIO_MAX);
517 576
518 while ($busy) { 577 while ($busy) {
519 if (Coro::nready) { 578 if (Coro::nready) {
521 } else { 580 } else {
522 EV::loop EV::LOOP_ONESHOT; 581 EV::loop EV::LOOP_ONESHOT;
523 } 582 }
524 } 583 }
525 584
526 my $time = EV::time - $time; 585 my $time = AE::time - $time;
527 586
528 $TICK_START += $time; # do not account sync jobs to server load 587 $TICK_START += $time; # do not account sync jobs to server load
529 588
530 wantarray ? @res : $res[0] 589 wantarray ? @res : $res[0]
531 } else { 590 } else {
553 $EXT_CORO{$coro+0} = $coro; 612 $EXT_CORO{$coro+0} = $coro;
554 613
555 $coro 614 $coro
556} 615}
557 616
558=item fork_call { }, $args 617=item fork_call { }, @args
559 618
560Executes the given code block with the given arguments in a seperate 619Executes the given code block with the given arguments in a seperate
561process, returning the results. Everything must be serialisable with 620process, returning the results. Everything must be serialisable with
562Coro::Storable. May, of course, block. Note that the executed sub may 621Coro::Storable. May, of course, block. Note that the executed sub may
563never block itself or use any form of event handling. 622never block itself or use any form of event handling.
564 623
565=cut 624=cut
566 625
626sub post_fork {
627 reset_signals;
628}
629
567sub fork_call(&@) { 630sub fork_call(&@) {
568 my ($cb, @args) = @_; 631 my ($cb, @args) = @_;
569 632
570 # we seemingly have to make a local copy of the whole thing, 633 # we seemingly have to make a local copy of the whole thing,
571 # otherwise perl prematurely frees the stuff :/ 634 # otherwise perl prematurely frees the stuff :/
572 # TODO: investigate and fix (likely this will be rather laborious) 635 # TODO: investigate and fix (likely this will be rather laborious)
573 636
574 my @res = Coro::Util::fork_eval { 637 my @res = Coro::Util::fork_eval {
575 reset_signals; 638 cf::post_fork;
576 &$cb 639 &$cb
577 }, @args; 640 } @args;
578 641
579 wantarray ? @res : $res[-1] 642 wantarray ? @res : $res[-1]
643}
644
645sub objinfo {
646 (
647 "counter value" => cf::object::object_count,
648 "objects created" => cf::object::create_count,
649 "objects destroyed" => cf::object::destroy_count,
650 "freelist size" => cf::object::free_count,
651 "allocated objects" => cf::object::objects_size,
652 "active objects" => cf::object::actives_size,
653 )
580} 654}
581 655
582=item $coin = coin_from_name $name 656=item $coin = coin_from_name $name
583 657
584=cut 658=cut
621within each server. 695within each server.
622 696
623=cut 697=cut
624 698
625sub db_table($) { 699sub db_table($) {
700 cf::error "db_get called from main context"
701 if $Coro::current == $Coro::main;
702
626 my ($name) = @_; 703 my ($name) = @_;
627 my $db = BDB::db_create $DB_ENV; 704 my $db = BDB::db_create $DB_ENV;
628 705
629 eval { 706 eval {
630 $db->set_flags (BDB::CHKSUM); 707 $db->set_flags (BDB::CHKSUM);
640} 717}
641 718
642our $DB; 719our $DB;
643 720
644sub db_init { 721sub db_init {
645 cf::sync_job {
646 $DB ||= db_table "db"; 722 $DB ||= db_table "db";
647 };
648} 723}
649 724
650sub db_get($$) { 725sub db_get($$) {
651 my $key = "$_[0]/$_[1]"; 726 my $key = "$_[0]/$_[1]";
652 727
653 cf::sync_job { 728 cf::error "db_get called from main context"
729 if $Coro::current == $Coro::main;
730
654 BDB::db_get $DB, undef, $key, my $data; 731 BDB::db_get $DB, undef, $key, my $data;
655 732
656 $! ? () 733 $! ? ()
657 : $data 734 : $data
658 }
659} 735}
660 736
661sub db_put($$$) { 737sub db_put($$$) {
662 BDB::dbreq_pri 4; 738 BDB::dbreq_pri 4;
663 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 739 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
719 795
720 my $t1 = Time::HiRes::time; 796 my $t1 = Time::HiRes::time;
721 my $data = $process->(\@data); 797 my $data = $process->(\@data);
722 my $t2 = Time::HiRes::time; 798 my $t2 = Time::HiRes::time;
723 799
724 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 800 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
725 801
726 db_put cache => "$id/data", $data; 802 db_put cache => "$id/data", $data;
727 db_put cache => "$id/md5" , $md5; 803 db_put cache => "$id/md5" , $md5;
728 db_put cache => "$id/meta", $meta; 804 db_put cache => "$id/meta", $meta;
729 805
739 815
740=cut 816=cut
741 817
742sub datalog($@) { 818sub datalog($@) {
743 my ($type, %kv) = @_; 819 my ($type, %kv) = @_;
744 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 820 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
745} 821}
746 822
747=back 823=back
748 824
749=cut 825=cut
944 1020
945 } elsif (exists $cb_id{$type}) { 1021 } elsif (exists $cb_id{$type}) {
946 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1022 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
947 1023
948 } elsif (ref $type) { 1024 } elsif (ref $type) {
949 warn "attaching objects not supported, ignoring.\n"; 1025 error "attaching objects not supported, ignoring.\n";
950 1026
951 } else { 1027 } else {
952 shift @arg; 1028 shift @arg;
953 warn "attach argument '$type' not supported, ignoring.\n"; 1029 error "attach argument '$type' not supported, ignoring.\n";
954 } 1030 }
955 } 1031 }
956} 1032}
957 1033
958sub _object_attach { 1034sub _object_attach {
968 _attach $registry, $klass, @attach; 1044 _attach $registry, $klass, @attach;
969 } 1045 }
970 1046
971 $obj->{$name} = \%arg; 1047 $obj->{$name} = \%arg;
972 } else { 1048 } else {
973 warn "object uses attachment '$name' which is not available, postponing.\n"; 1049 info "object uses attachment '$name' which is not available, postponing.\n";
974 } 1050 }
975 1051
976 $obj->{_attachment}{$name} = undef; 1052 $obj->{_attachment}{$name} = undef;
977} 1053}
978 1054
1037 1113
1038 for (@$callbacks) { 1114 for (@$callbacks) {
1039 eval { &{$_->[1]} }; 1115 eval { &{$_->[1]} };
1040 1116
1041 if ($@) { 1117 if ($@) {
1042 warn "$@";
1043 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1118 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1044 override; 1119 override;
1045 } 1120 }
1046 1121
1047 return 1 if $override; 1122 return 1 if $override;
1048 } 1123 }
1127 for (@$attach) { 1202 for (@$attach) {
1128 my ($klass, @attach) = @$_; 1203 my ($klass, @attach) = @$_;
1129 _attach $registry, $klass, @attach; 1204 _attach $registry, $klass, @attach;
1130 } 1205 }
1131 } else { 1206 } else {
1132 warn "object uses attachment '$name' that is not available, postponing.\n"; 1207 info "object uses attachment '$name' that is not available, postponing.\n";
1133 } 1208 }
1134 } 1209 }
1135} 1210}
1136 1211
1137cf::attachable->attach ( 1212cf::attachable->attach (
1164 my ($filename, $rdata, $objs) = @_; 1239 my ($filename, $rdata, $objs) = @_;
1165 1240
1166 sync_job { 1241 sync_job {
1167 if (length $$rdata) { 1242 if (length $$rdata) {
1168 utf8::decode (my $decname = $filename); 1243 utf8::decode (my $decname = $filename);
1169 warn sprintf "saving %s (%d,%d)\n", 1244 trace sprintf "saving %s (%d,%d)\n",
1170 $decname, length $$rdata, scalar @$objs; 1245 $decname, length $$rdata, scalar @$objs
1246 if $VERBOSE_IO;
1171 1247
1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1248 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1173 aio_chmod $fh, SAVE_MODE; 1249 aio_chmod $fh, SAVE_MODE;
1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1250 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1175 aio_fsync $fh if $cf::USE_FSYNC; 1251 if ($cf::USE_FSYNC) {
1252 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;
1253 aio_fsync $fh;
1254 }
1176 aio_close $fh; 1255 aio_close $fh;
1177 1256
1178 if (@$objs) { 1257 if (@$objs) {
1179 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1258 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1180 aio_chmod $fh, SAVE_MODE; 1259 aio_chmod $fh, SAVE_MODE;
1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1260 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1182 aio_write $fh, 0, (length $data), $data, 0; 1261 aio_write $fh, 0, (length $data), $data, 0;
1183 aio_fsync $fh if $cf::USE_FSYNC; 1262 if ($cf::USE_FSYNC) {
1263 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;
1264 aio_fsync $fh;
1265 }
1184 aio_close $fh; 1266 aio_close $fh;
1185 aio_rename "$filename.pst~", "$filename.pst"; 1267 aio_rename "$filename.pst~", "$filename.pst";
1186 } 1268 }
1187 } else { 1269 } else {
1188 aio_unlink "$filename.pst"; 1270 aio_unlink "$filename.pst";
1189 } 1271 }
1190 1272
1191 aio_rename "$filename~", $filename; 1273 aio_rename "$filename~", $filename;
1192 1274
1193 $filename =~ s%/[^/]+$%%; 1275 $filename =~ s%/[^/]+$%%;
1194 aio_pathsync $filename; 1276 aio_pathsync $filename if $cf::USE_FSYNC;
1195 } else { 1277 } else {
1196 warn "FATAL: $filename~: $!\n"; 1278 error "unable to save objects: $filename~: $!\n";
1197 } 1279 }
1198 } else { 1280 } else {
1199 aio_unlink $filename; 1281 aio_unlink $filename;
1200 aio_unlink "$filename.pst"; 1282 aio_unlink "$filename.pst";
1201 } 1283 }
1225 my $st = eval { Coro::Storable::thaw $av }; 1307 my $st = eval { Coro::Storable::thaw $av };
1226 $av = $st->{objs}; 1308 $av = $st->{objs};
1227 } 1309 }
1228 1310
1229 utf8::decode (my $decname = $filename); 1311 utf8::decode (my $decname = $filename);
1230 warn sprintf "loading %s (%d,%d)\n", 1312 trace sprintf "loading %s (%d,%d)\n",
1231 $decname, length $data, scalar @{$av || []}; 1313 $decname, length $data, scalar @{$av || []}
1314 if $VERBOSE_IO;
1232 1315
1233 ($data, $av) 1316 ($data, $av)
1234} 1317}
1235 1318
1236=head2 COMMAND CALLBACKS 1319=head2 COMMAND CALLBACKS
1292 my ($name, $cb) = @_; 1375 my ($name, $cb) = @_;
1293 1376
1294 $EXTICMD{$name} = $cb; 1377 $EXTICMD{$name} = $cb;
1295} 1378}
1296 1379
1380use File::Glob ();
1381
1297cf::player->attach ( 1382cf::player->attach (
1298 on_command => sub { 1383 on_unknown_command => sub {
1299 my ($pl, $name, $params) = @_; 1384 my ($pl, $name, $params) = @_;
1300 1385
1301 my $cb = $COMMAND{$name} 1386 my $cb = $COMMAND{$name}
1302 or return; 1387 or return;
1303 1388
1326 1411
1327 $pl->ext_reply ($reply, @reply) 1412 $pl->ext_reply ($reply, @reply)
1328 if $reply; 1413 if $reply;
1329 1414
1330 } else { 1415 } else {
1331 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1416 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1332 } 1417 }
1333 1418
1334 cf::override; 1419 cf::override;
1335 }, 1420 },
1336); 1421);
1337 1422
1423# "readahead" all extensions
1424sub cache_extensions {
1425 my $grp = IO::AIO::aio_group;
1426
1427 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1428 for (grep /\.ext$/, @{$_[0]}) {
1429 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1430 }
1431 };
1432
1433 $grp
1434}
1435
1338sub load_extensions { 1436sub load_extensions {
1437 info "loading extensions...";
1438
1339 cf::sync_job { 1439 cf::sync_job {
1340 my %todo; 1440 my %todo;
1341 1441
1342 for my $path (<$LIBDIR/*.ext>) { 1442 for my $path (<$LIBDIR/*.ext>) {
1343 next unless -r $path; 1443 next unless -r $path;
1361 1461
1362 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1462 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1363 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1463 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1364 1464
1365 $ext{source} = 1465 $ext{source} =
1366 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1466 "package $pkg; use common::sense;\n"
1367 . "#line 1 \"$path\"\n{\n" 1467 . "#line 1 \"$path\"\n{\n"
1368 . $source 1468 . $source
1369 . "\n};\n1"; 1469 . "\n};\n1";
1370 1470
1371 $todo{$base} = \%ext; 1471 $todo{$base} = \%ext;
1372 } 1472 }
1373 1473
1474 my $pass = 0;
1374 my %done; 1475 my %done;
1375 while (%todo) { 1476 while (%todo) {
1376 my $progress; 1477 my $progress;
1377 1478
1479 ++$pass;
1480
1481 ext:
1378 while (my ($k, $v) = each %todo) { 1482 while (my ($k, $v) = each %todo) {
1379 for (split /,\s*/, $v->{meta}{depends}) { 1483 for (split /,\s*/, $v->{meta}{depends}) {
1380 goto skip 1484 next ext
1381 unless exists $done{$_}; 1485 unless exists $done{$_};
1382 } 1486 }
1383 1487
1384 warn "... loading '$k' into '$v->{pkg}'\n"; 1488 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1385 1489
1386 unless (eval $v->{source}) { 1490 my $active = eval $v->{source};
1491
1492 if (length $@) {
1387 my $msg = $@ ? "$v->{path}: $@\n" 1493 error "$v->{path}: $@\n";
1388 : "$v->{base}: extension inactive.\n";
1389 1494
1390 if (exists $v->{meta}{mandatory}) {
1391 warn $msg;
1392 cf::cleanup "mandatory extension failed to load, exiting."; 1495 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1393 } 1496 if exists $v->{meta}{mandatory};
1394 1497
1395 warn $msg; 1498 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1499 delete $todo{$k};
1500 } else {
1501 $done{$k} = delete $todo{$k};
1502 push @EXTS, $v->{pkg};
1503 $progress = 1;
1504
1505 info "$v->{base}: extension inactive.\n"
1506 unless $active;
1396 } 1507 }
1397
1398 $done{$k} = delete $todo{$k};
1399 push @EXTS, $v->{pkg};
1400 $progress = 1;
1401 } 1508 }
1402 1509
1403 skip: 1510 unless ($progress) {
1404 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1511 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1405 unless $progress; 1512
1513 while (my ($k, $v) = each %todo) {
1514 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1515 if exists $v->{meta}{mandatory};
1516 }
1517 }
1406 } 1518 }
1407 }; 1519 };
1408} 1520}
1409 1521
1410############################################################################# 1522#############################################################################
1494 $cf::PLAYER{$login} = $pl 1606 $cf::PLAYER{$login} = $pl
1495 } 1607 }
1496 } 1608 }
1497} 1609}
1498 1610
1611cf::player->attach (
1612 on_load => sub {
1613 my ($pl, $path) = @_;
1614
1615 # restore slots saved in save, below
1616 my $slots = delete $pl->{_slots};
1617
1618 $pl->ob->current_weapon ($slots->[0]);
1619 $pl->combat_ob ($slots->[1]);
1620 $pl->ranged_ob ($slots->[2]);
1621 },
1622);
1623
1499sub save($) { 1624sub save($) {
1500 my ($pl) = @_; 1625 my ($pl) = @_;
1501 1626
1502 return if $pl->{deny_save}; 1627 return if $pl->{deny_save};
1503 1628
1508 1633
1509 aio_mkdir playerdir $pl, 0770; 1634 aio_mkdir playerdir $pl, 0770;
1510 $pl->{last_save} = $cf::RUNTIME; 1635 $pl->{last_save} = $cf::RUNTIME;
1511 1636
1512 cf::get_slot 0.01; 1637 cf::get_slot 0.01;
1638
1639 # save slots, to be restored later
1640 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1513 1641
1514 $pl->save_pl ($path); 1642 $pl->save_pl ($path);
1515 cf::cede_to_tick; 1643 cf::cede_to_tick;
1516} 1644}
1517 1645
1551 my $name = $pl->ob->name; 1679 my $name = $pl->ob->name;
1552 1680
1553 $pl->{deny_save} = 1; 1681 $pl->{deny_save} = 1;
1554 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1682 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1555 1683
1556 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1684 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1557 $pl->deactivate; 1685 $pl->deactivate;
1686
1558 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1687 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1559 $pl->ob->check_score;
1560 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1688 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1689 ext::highscore::check ($pl->ob);
1690
1561 $pl->ns->destroy if $pl->ns; 1691 $pl->ns->destroy if $pl->ns;
1562 1692
1563 my $path = playerdir $pl; 1693 my $path = playerdir $pl;
1564 my $temp = "$path~$cf::RUNTIME~deleting~"; 1694 my $temp = "$path~$cf::RUNTIME~deleting~";
1565 aio_rename $path, $temp; 1695 aio_rename $path, $temp;
1619 \@logins 1749 \@logins
1620} 1750}
1621 1751
1622=item $player->maps 1752=item $player->maps
1623 1753
1754=item cf::player::maps $login
1755
1624Returns an arrayref of map paths that are private for this 1756Returns an arrayref of map paths that are private for this
1625player. May block. 1757player. May block.
1626 1758
1627=cut 1759=cut
1628 1760
1690=cut 1822=cut
1691 1823
1692sub find_by_path($) { 1824sub find_by_path($) {
1693 my ($path) = @_; 1825 my ($path) = @_;
1694 1826
1827 $path =~ s/^~[^\/]*//; # skip ~login
1828
1695 my ($match, $specificity); 1829 my ($match, $specificity);
1696 1830
1697 for my $region (list) { 1831 for my $region (list) {
1698 if ($region->{match} && $path =~ $region->{match}) { 1832 if ($region->{match} && $path =~ $region->{match}) {
1699 ($match, $specificity) = ($region, $region->specificity) 1833 ($match, $specificity) = ($region, $region->specificity)
1727sub generate_random_map { 1861sub generate_random_map {
1728 my ($self, $rmp) = @_; 1862 my ($self, $rmp) = @_;
1729 1863
1730 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1864 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1731 1865
1732 # mit "rum" bekleckern, nicht
1733 $self->_create_random_map ( 1866 $self->_create_random_map ($rmp);
1734 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1735 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1736 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1737 $rmp->{exit_on_final_map},
1738 $rmp->{xsize}, $rmp->{ysize},
1739 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1740 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1741 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1742 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1743 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1744 (cf::region::find $rmp->{region}), $rmp->{custom}
1745 )
1746} 1867}
1747 1868
1748=item cf::map->register ($regex, $prio) 1869=item cf::map->register ($regex, $prio)
1749 1870
1750Register a handler for the map path matching the given regex at the 1871Register a handler for the map path matching the given regex at the
1755 1876
1756sub register { 1877sub register {
1757 my (undef, $regex, $prio) = @_; 1878 my (undef, $regex, $prio) = @_;
1758 my $pkg = caller; 1879 my $pkg = caller;
1759 1880
1760 no strict;
1761 push @{"$pkg\::ISA"}, __PACKAGE__; 1881 push @{"$pkg\::ISA"}, __PACKAGE__;
1762 1882
1763 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1883 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1764} 1884}
1765 1885
1766# also paths starting with '/' 1886# also paths starting with '/'
1767$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1887$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1768 1888
1769sub thawer_merge { 1889sub thawer_merge {
1770 my ($self, $merge) = @_; 1890 my ($self, $merge) = @_;
1771 1891
1772 # we have to keep some variables in memory intact 1892 # we have to keep some variables in memory intact
1777} 1897}
1778 1898
1779sub normalise { 1899sub normalise {
1780 my ($path, $base) = @_; 1900 my ($path, $base) = @_;
1781 1901
1782 $path = "$path"; # make sure its a string 1902 $path = "$path"; # make sure it's a string
1783 1903
1784 $path =~ s/\.map$//; 1904 $path =~ s/\.map$//;
1785 1905
1786 # map plan: 1906 # map plan:
1787 # 1907 #
1802 $base =~ s{[^/]+/?$}{}; 1922 $base =~ s{[^/]+/?$}{};
1803 $path = "$base/$path"; 1923 $path = "$base/$path";
1804 } 1924 }
1805 1925
1806 for ($path) { 1926 for ($path) {
1807 redo if s{//}{/};
1808 redo if s{/\.?/}{/}; 1927 redo if s{/\.?/}{/};
1809 redo if s{/[^/]+/\.\./}{/}; 1928 redo if s{/[^/]+/\.\./}{/};
1810 } 1929 }
1811 1930
1812 $path 1931 $path
1826 $self->init; # pass $1 etc. 1945 $self->init; # pass $1 etc.
1827 return $self; 1946 return $self;
1828 } 1947 }
1829 } 1948 }
1830 1949
1831 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1950 Carp::cluck "unable to resolve path '$path' (base '$base')";
1832 () 1951 ()
1833} 1952}
1834 1953
1835sub init { 1954sub init {
1836 my ($self) = @_; 1955 my ($self) = @_;
1868sub uniq_path { 1987sub uniq_path {
1869 my ($self) = @_; 1988 my ($self) = @_;
1870 1989
1871 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1990 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1872 "$UNIQUEDIR/$path" 1991 "$UNIQUEDIR/$path"
1873}
1874
1875# and all this just because we cannot iterate over
1876# all maps in C++...
1877sub change_all_map_light {
1878 my ($change) = @_;
1879
1880 $_->change_map_light ($change)
1881 for grep $_->outdoor, values %cf::MAP;
1882} 1992}
1883 1993
1884sub decay_objects { 1994sub decay_objects {
1885 my ($self) = @_; 1995 my ($self) = @_;
1886 1996
1968 2078
1969sub find; 2079sub find;
1970sub find { 2080sub find {
1971 my ($path, $origin) = @_; 2081 my ($path, $origin) = @_;
1972 2082
2083 cf::cede_to_tick;
2084
1973 $path = normalise $path, $origin && $origin->path; 2085 $path = normalise $path, $origin && $origin->path;
1974 2086
1975 cf::lock_wait "map_data:$path";#d#remove 2087 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1976 cf::lock_wait "map_find:$path"; 2088 my $guard2 = cf::lock_acquire "map_find:$path";
1977 2089
1978 $cf::MAP{$path} || do { 2090 $cf::MAP{$path} || do {
1979 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1980 my $guard2 = cf::lock_acquire "map_find:$path";
1981
1982 my $map = new_from_path cf::map $path 2091 my $map = new_from_path cf::map $path
1983 or return; 2092 or return;
1984 2093
1985 $map->{last_save} = $cf::RUNTIME; 2094 $map->{last_save} = $cf::RUNTIME;
1986 2095
1998 2107
1999 $cf::MAP{$path} = $map 2108 $cf::MAP{$path} = $map
2000 } 2109 }
2001} 2110}
2002 2111
2003sub pre_load { } 2112sub pre_load { }
2004sub post_load { } 2113#sub post_load { } # XS
2005 2114
2006sub load { 2115sub load {
2007 my ($self) = @_; 2116 my ($self) = @_;
2008 2117
2009 local $self->{deny_reset} = 1; # loading can take a long time 2118 local $self->{deny_reset} = 1; # loading can take a long time
2054 unless ($self->{deny_activate}) { 2163 unless ($self->{deny_activate}) {
2055 $self->decay_objects; 2164 $self->decay_objects;
2056 $self->fix_auto_apply; 2165 $self->fix_auto_apply;
2057 $self->update_buttons; 2166 $self->update_buttons;
2058 cf::cede_to_tick; 2167 cf::cede_to_tick;
2059 $self->set_darkness_map;
2060 cf::cede_to_tick;
2061 $self->activate; 2168 $self->activate;
2062 } 2169 }
2063 2170
2064 $self->{last_save} = $cf::RUNTIME; 2171 $self->{last_save} = $cf::RUNTIME;
2065 $self->last_access ($cf::RUNTIME); 2172 $self->last_access ($cf::RUNTIME);
2066 2173
2067 $self->in_memory (cf::MAP_ACTIVE); 2174 $self->in_memory (cf::MAP_ACTIVE);
2068 } 2175 }
2069 2176
2070 $self->post_load; 2177 $self->post_load;
2071}
2072 2178
2179 1
2180}
2181
2182# customize the map for a given player, i.e.
2183# return the _real_ map. used by e.g. per-player
2184# maps to change the path to ~playername/mappath
2073sub customise_for { 2185sub customise_for {
2074 my ($self, $ob) = @_; 2186 my ($self, $ob) = @_;
2075 2187
2076 return find "~" . $ob->name . "/" . $self->{path} 2188 return find "~" . $ob->name . "/" . $self->{path}
2077 if $self->per_player; 2189 if $self->per_player;
2093 or next; 2205 or next;
2094 $neigh = find $neigh, $map 2206 $neigh = find $neigh, $map
2095 or next; 2207 or next;
2096 $neigh->load; 2208 $neigh->load;
2097 2209
2210 # now find the diagonal neighbours
2098 push @neigh, 2211 push @neigh,
2099 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2212 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2100 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2213 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2101 } 2214 }
2102 2215
2109} 2222}
2110 2223
2111sub find_sync { 2224sub find_sync {
2112 my ($path, $origin) = @_; 2225 my ($path, $origin) = @_;
2113 2226
2114 cf::sync_job { find $path, $origin } 2227 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2228 if $Coro::current == $Coro::main;
2229
2230 find $path, $origin
2115} 2231}
2116 2232
2117sub do_load_sync { 2233sub do_load_sync {
2118 my ($map) = @_; 2234 my ($map) = @_;
2119 2235
2120 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2236 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2121 if $Coro::current == $Coro::main; 2237 if $Coro::current == $Coro::main;
2122 2238
2123 cf::sync_job { $map->load }; 2239 $map->load;
2124} 2240}
2125 2241
2126our %MAP_PREFETCH; 2242our %MAP_PREFETCH;
2127our $MAP_PREFETCHER = undef; 2243our $MAP_PREFETCHER = undef;
2128 2244
2154 $MAP_PREFETCHER->prio (6); 2270 $MAP_PREFETCHER->prio (6);
2155 2271
2156 () 2272 ()
2157} 2273}
2158 2274
2275# common code, used by both ->save and ->swapout
2159sub save { 2276sub _save {
2160 my ($self) = @_; 2277 my ($self) = @_;
2161
2162 my $lock = cf::lock_acquire "map_data:$self->{path}";
2163 2278
2164 $self->{last_save} = $cf::RUNTIME; 2279 $self->{last_save} = $cf::RUNTIME;
2165 2280
2166 return unless $self->dirty; 2281 return unless $self->dirty;
2167 2282
2187 } else { 2302 } else {
2188 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2303 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2189 } 2304 }
2190} 2305}
2191 2306
2307sub save {
2308 my ($self) = @_;
2309
2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311
2312 $self->_save;
2313}
2314
2192sub swap_out { 2315sub swap_out {
2193 my ($self) = @_; 2316 my ($self) = @_;
2194 2317
2195 # save first because save cedes
2196 $self->save;
2197
2198 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2318 my $lock = cf::lock_acquire "map_data:$self->{path}";
2199 2319
2200 return if $self->players;
2201 return if $self->in_memory != cf::MAP_ACTIVE; 2320 return if $self->in_memory != cf::MAP_ACTIVE;
2202 return if $self->{deny_save}; 2321 return if $self->{deny_save};
2322 return if $self->players;
2203 2323
2324 # first deactivate the map and "unlink" it from the core
2325 $self->deactivate;
2326 $_->clear_links_to ($self) for values %cf::MAP;
2204 $self->in_memory (cf::MAP_SWAPPED); 2327 $self->in_memory (cf::MAP_SWAPPED);
2328
2329 # then atomically save
2330 $self->_save;
2331
2332 # then free the map
2333 $self->clear;
2334}
2335
2336sub reset_at {
2337 my ($self) = @_;
2338
2339 # TODO: safety, remove and allow resettable per-player maps
2340 return 1e99 if $self->{deny_reset};
2341
2342 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2343 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2344
2345 $time + $to
2346}
2347
2348sub should_reset {
2349 my ($self) = @_;
2350
2351 $self->reset_at <= $cf::RUNTIME
2352}
2353
2354sub reset {
2355 my ($self) = @_;
2356
2357 my $lock = cf::lock_acquire "map_data:$self->{path}";
2358
2359 return if $self->players;
2360
2361 cf::trace "resetting map ", $self->path, "\n";
2362
2363 $self->in_memory (cf::MAP_SWAPPED);
2364
2365 # need to save uniques path
2366 unless ($self->{deny_save}) {
2367 my $uniq = $self->uniq_path; utf8::encode $uniq;
2368
2369 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2370 if $uniq;
2371 }
2372
2373 delete $cf::MAP{$self->path};
2205 2374
2206 $self->deactivate; 2375 $self->deactivate;
2207 $_->clear_links_to ($self) for values %cf::MAP; 2376 $_->clear_links_to ($self) for values %cf::MAP;
2208 $self->clear; 2377 $self->clear;
2209}
2210
2211sub reset_at {
2212 my ($self) = @_;
2213
2214 # TODO: safety, remove and allow resettable per-player maps
2215 return 1e99 if $self->{deny_reset};
2216
2217 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2218 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2219
2220 $time + $to
2221}
2222
2223sub should_reset {
2224 my ($self) = @_;
2225
2226 $self->reset_at <= $cf::RUNTIME
2227}
2228
2229sub reset {
2230 my ($self) = @_;
2231
2232 my $lock = cf::lock_acquire "map_data:$self->{path}";
2233
2234 return if $self->players;
2235
2236 warn "resetting map ", $self->path;
2237
2238 $self->in_memory (cf::MAP_SWAPPED);
2239
2240 # need to save uniques path
2241 unless ($self->{deny_save}) {
2242 my $uniq = $self->uniq_path; utf8::encode $uniq;
2243
2244 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2245 if $uniq;
2246 }
2247
2248 delete $cf::MAP{$self->path};
2249
2250 $self->deactivate;
2251 $_->clear_links_to ($self) for values %cf::MAP;
2252 $self->clear;
2253 2378
2254 $self->unlink_save; 2379 $self->unlink_save;
2255 $self->destroy; 2380 $self->destroy;
2256} 2381}
2257 2382
2265 2390
2266 delete $cf::MAP{$self->path}; 2391 delete $cf::MAP{$self->path};
2267 2392
2268 $self->unlink_save; 2393 $self->unlink_save;
2269 2394
2270 bless $self, "cf::map"; 2395 bless $self, "cf::map::wrap";
2271 delete $self->{deny_reset}; 2396 delete $self->{deny_reset};
2272 $self->{deny_save} = 1; 2397 $self->{deny_save} = 1;
2273 $self->reset_timeout (1); 2398 $self->reset_timeout (1);
2274 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2399 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2275 2400
2332 : normalise $_ 2457 : normalise $_
2333 } @{ aio_readdir $UNIQUEDIR or [] } 2458 } @{ aio_readdir $UNIQUEDIR or [] }
2334 ] 2459 ]
2335} 2460}
2336 2461
2462=item cf::map::static_maps
2463
2464Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2465file in the shared directory excluding F</styles> and F</editor>). May
2466block.
2467
2468=cut
2469
2470sub static_maps() {
2471 my @dirs = "";
2472 my @maps;
2473
2474 while (@dirs) {
2475 my $dir = shift @dirs;
2476
2477 next if $dir eq "/styles" || $dir eq "/editor";
2478
2479 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2480 or return;
2481
2482 for (@$files) {
2483 s/\.map$// or next;
2484 utf8::decode $_;
2485 push @maps, "$dir/$_";
2486 }
2487
2488 push @dirs, map "$dir/$_", @$dirs;
2489 }
2490
2491 \@maps
2492}
2493
2337=back 2494=back
2338 2495
2339=head3 cf::object 2496=head3 cf::object
2340 2497
2341=cut 2498=cut
2406 2563
2407our $SAY_CHANNEL = { 2564our $SAY_CHANNEL = {
2408 id => "say", 2565 id => "say",
2409 title => "Map", 2566 title => "Map",
2410 reply => "say ", 2567 reply => "say ",
2411 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2568 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2412}; 2569};
2413 2570
2414our $CHAT_CHANNEL = { 2571our $CHAT_CHANNEL = {
2415 id => "chat", 2572 id => "chat",
2416 title => "Chat", 2573 title => "Chat",
2473 2630
2474Freezes the player and moves him/her to a special map (C<{link}>). 2631Freezes the player and moves him/her to a special map (C<{link}>).
2475 2632
2476The player should be reasonably safe there for short amounts of time (e.g. 2633The player should be reasonably safe there for short amounts of time (e.g.
2477for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2634for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2478though, as the palyer cannot control the character while it is on the link 2635though, as the player cannot control the character while it is on the link
2479map. 2636map.
2480 2637
2481Will never block. 2638Will never block.
2482 2639
2483=item $player_object->leave_link ($map, $x, $y) 2640=item $player_object->leave_link ($map, $x, $y)
2504sub cf::object::player::enter_link { 2661sub cf::object::player::enter_link {
2505 my ($self) = @_; 2662 my ($self) = @_;
2506 2663
2507 $self->deactivate_recursive; 2664 $self->deactivate_recursive;
2508 2665
2666 ++$self->{_link_recursion};
2667
2509 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2668 return if UNIVERSAL::isa $self->map, "ext::map_link";
2510 2669
2511 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2670 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2512 if $self->map && $self->map->{path} ne "{link}"; 2671 if $self->map && $self->map->{path} ne "{link}";
2513 2672
2514 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2673 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2515} 2674}
2516 2675
2517sub cf::object::player::leave_link { 2676sub cf::object::player::leave_link {
2518 my ($self, $map, $x, $y) = @_; 2677 my ($self, $map, $x, $y) = @_;
2519 2678
2536 ($x, $y) = (-1, -1) 2695 ($x, $y) = (-1, -1)
2537 unless (defined $x) && (defined $y); 2696 unless (defined $x) && (defined $y);
2538 2697
2539 # use -1 or undef as default coordinates, not 0, 0 2698 # use -1 or undef as default coordinates, not 0, 0
2540 ($x, $y) = ($map->enter_x, $map->enter_y) 2699 ($x, $y) = ($map->enter_x, $map->enter_y)
2541 if $x <=0 && $y <= 0; 2700 if $x <= 0 && $y <= 0;
2542 2701
2543 $map->load; 2702 $map->load;
2544 $map->load_neighbours; 2703 $map->load_neighbours;
2545 2704
2546 return unless $self->contr->active; 2705 return unless $self->contr->active;
2547 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2548 $self->activate_recursive;
2549 2706
2550 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2707 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2551 $self->enter_map ($map, $x, $y); 2708 if ($self->enter_map ($map, $x, $y)) {
2552} 2709 # entering was successful
2710 delete $self->{_link_recursion};
2711 # only activate afterwards, to support waiting in hooks
2712 $self->activate_recursive;
2713 }
2553 2714
2715}
2716
2554=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2717=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2555 2718
2556Moves the player to the given map-path and coordinates by first freezing 2719Moves the player to the given map-path and coordinates by first freezing
2557her, loading and preparing them map, calling the provided $check callback 2720her, loading and preparing them map, calling the provided $check callback
2558that has to return the map if sucecssful, and then unfreezes the player on 2721that has to return the map if sucecssful, and then unfreezes the player on
2559the new (success) or old (failed) map position. In either case, $done will 2722the new (success) or old (failed) map position. In either case, $done will
2566 2729
2567our $GOTOGEN; 2730our $GOTOGEN;
2568 2731
2569sub cf::object::player::goto { 2732sub cf::object::player::goto {
2570 my ($self, $path, $x, $y, $check, $done) = @_; 2733 my ($self, $path, $x, $y, $check, $done) = @_;
2734
2735 if ($self->{_link_recursion} >= $MAX_LINKS) {
2736 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2737 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2738 ($path, $x, $y) = @$EMERGENCY_POSITION;
2739 }
2571 2740
2572 # do generation counting so two concurrent goto's will be executed in-order 2741 # do generation counting so two concurrent goto's will be executed in-order
2573 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2742 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2574 2743
2575 $self->enter_link; 2744 $self->enter_link;
2599 my $map = eval { 2768 my $map = eval {
2600 my $map = defined $path ? cf::map::find $path : undef; 2769 my $map = defined $path ? cf::map::find $path : undef;
2601 2770
2602 if ($map) { 2771 if ($map) {
2603 $map = $map->customise_for ($self); 2772 $map = $map->customise_for ($self);
2604 $map = $check->($map) if $check && $map; 2773 $map = $check->($map, $x, $y, $self) if $check && $map;
2605 } else { 2774 } else {
2606 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2775 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2607 } 2776 }
2608 2777
2609 $map 2778 $map
2617 if ($gen == $self->{_goto_generation}) { 2786 if ($gen == $self->{_goto_generation}) {
2618 delete $self->{_goto_generation}; 2787 delete $self->{_goto_generation};
2619 $self->leave_link ($map, $x, $y); 2788 $self->leave_link ($map, $x, $y);
2620 } 2789 }
2621 2790
2622 $done->() if $done; 2791 $done->($self) if $done;
2623 })->prio (1); 2792 })->prio (1);
2624} 2793}
2625 2794
2626=item $player_object->enter_exit ($exit_object) 2795=item $player_object->enter_exit ($exit_object)
2627 2796
2720 $self->message ("Something went wrong deep within the deliantra server. " 2889 $self->message ("Something went wrong deep within the deliantra server. "
2721 . "I'll try to bring you back to the map you were before. " 2890 . "I'll try to bring you back to the map you were before. "
2722 . "Please report this to the dungeon master!", 2891 . "Please report this to the dungeon master!",
2723 cf::NDI_UNIQUE | cf::NDI_RED); 2892 cf::NDI_UNIQUE | cf::NDI_RED);
2724 2893
2725 warn "ERROR in enter_exit: $@"; 2894 error "ERROR in enter_exit: $@";
2726 $self->leave_link; 2895 $self->leave_link;
2727 } 2896 }
2728 })->prio (1); 2897 })->prio (1);
2729} 2898}
2730 2899
2742sub cf::client::send_drawinfo { 2911sub cf::client::send_drawinfo {
2743 my ($self, $text, $flags) = @_; 2912 my ($self, $text, $flags) = @_;
2744 2913
2745 utf8::encode $text; 2914 utf8::encode $text;
2746 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2915 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2916}
2917
2918=item $client->send_big_packet ($pkt)
2919
2920Like C<send_packet>, but tries to compress large packets, and fragments
2921them as required.
2922
2923=cut
2924
2925our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2926
2927sub cf::client::send_big_packet {
2928 my ($self, $pkt) = @_;
2929
2930 # try lzf for large packets
2931 $pkt = "lzf " . Compress::LZF::compress $pkt
2932 if 1024 <= length $pkt and $self->{can_lzf};
2933
2934 # split very large packets
2935 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2936 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2937 $pkt = "frag";
2938 }
2939
2940 $self->send_packet ($pkt);
2747} 2941}
2748 2942
2749=item $client->send_msg ($channel, $msg, $color, [extra...]) 2943=item $client->send_msg ($channel, $msg, $color, [extra...])
2750 2944
2751Send a drawinfo or msg packet to the client, formatting the msg for the 2945Send a drawinfo or msg packet to the client, formatting the msg for the
2755 2949
2756=cut 2950=cut
2757 2951
2758# non-persistent channels (usually the info channel) 2952# non-persistent channels (usually the info channel)
2759our %CHANNEL = ( 2953our %CHANNEL = (
2954 "c/motd" => {
2955 id => "infobox",
2956 title => "MOTD",
2957 reply => undef,
2958 tooltip => "The message of the day",
2959 },
2760 "c/identify" => { 2960 "c/identify" => {
2761 id => "infobox", 2961 id => "infobox",
2762 title => "Identify", 2962 title => "Identify",
2763 reply => undef, 2963 reply => undef,
2764 tooltip => "Items recently identified", 2964 tooltip => "Items recently identified",
2766 "c/examine" => { 2966 "c/examine" => {
2767 id => "infobox", 2967 id => "infobox",
2768 title => "Examine", 2968 title => "Examine",
2769 reply => undef, 2969 reply => undef,
2770 tooltip => "Signs and other items you examined", 2970 tooltip => "Signs and other items you examined",
2971 },
2972 "c/shopinfo" => {
2973 id => "infobox",
2974 title => "Shop Info",
2975 reply => undef,
2976 tooltip => "What your bargaining skill tells you about the shop",
2771 }, 2977 },
2772 "c/book" => { 2978 "c/book" => {
2773 id => "infobox", 2979 id => "infobox",
2774 title => "Book", 2980 title => "Book",
2775 reply => undef, 2981 reply => undef,
2791 id => "infobox", 2997 id => "infobox",
2792 title => "Body Parts", 2998 title => "Body Parts",
2793 reply => undef, 2999 reply => undef,
2794 tooltip => "Shows which body parts you posess and are available", 3000 tooltip => "Shows which body parts you posess and are available",
2795 }, 3001 },
3002 "c/statistics" => {
3003 id => "infobox",
3004 title => "Statistics",
3005 reply => undef,
3006 tooltip => "Shows your primary statistics",
3007 },
2796 "c/skills" => { 3008 "c/skills" => {
2797 id => "infobox", 3009 id => "infobox",
2798 title => "Skills", 3010 title => "Skills",
2799 reply => undef, 3011 reply => undef,
2800 tooltip => "Shows your experience per skill and item power", 3012 tooltip => "Shows your experience per skill and item power",
3013 },
3014 "c/shopitems" => {
3015 id => "infobox",
3016 title => "Shop Items",
3017 reply => undef,
3018 tooltip => "Shows the items currently for sale in this shop",
3019 },
3020 "c/resistances" => {
3021 id => "infobox",
3022 title => "Resistances",
3023 reply => undef,
3024 tooltip => "Shows your resistances",
3025 },
3026 "c/pets" => {
3027 id => "infobox",
3028 title => "Pets",
3029 reply => undef,
3030 tooltip => "Shows information abotu your pets/a specific pet",
3031 },
3032 "c/perceiveself" => {
3033 id => "infobox",
3034 title => "Perceive Self",
3035 reply => undef,
3036 tooltip => "You gained detailed knowledge about yourself",
2801 }, 3037 },
2802 "c/uptime" => { 3038 "c/uptime" => {
2803 id => "infobox", 3039 id => "infobox",
2804 title => "Uptime", 3040 title => "Uptime",
2805 reply => undef, 3041 reply => undef,
2815 id => "party", 3051 id => "party",
2816 title => "Party", 3052 title => "Party",
2817 reply => "gsay ", 3053 reply => "gsay ",
2818 tooltip => "Messages and chat related to your party", 3054 tooltip => "Messages and chat related to your party",
2819 }, 3055 },
3056 "c/death" => {
3057 id => "death",
3058 title => "Death",
3059 reply => undef,
3060 tooltip => "Reason for and more info about your most recent death",
3061 },
3062 "c/say" => $SAY_CHANNEL,
3063 "c/chat" => $CHAT_CHANNEL,
2820); 3064);
2821 3065
2822sub cf::client::send_msg { 3066sub cf::client::send_msg {
2823 my ($self, $channel, $msg, $color, @extra) = @_; 3067 my ($self, $channel, $msg, $color, @extra) = @_;
2824 3068
2829 3073
2830 # check predefined channels, for the benefit of C 3074 # check predefined channels, for the benefit of C
2831 if ($CHANNEL{$channel}) { 3075 if ($CHANNEL{$channel}) {
2832 $channel = $CHANNEL{$channel}; 3076 $channel = $CHANNEL{$channel};
2833 3077
2834 $self->ext_msg (channel_info => $channel) 3078 $self->ext_msg (channel_info => $channel);
2835 if $self->can_msg;
2836
2837 $channel = $channel->{id}; 3079 $channel = $channel->{id};
2838 3080
2839 } elsif (ref $channel) { 3081 } elsif (ref $channel) {
2840 # send meta info to client, if not yet sent 3082 # send meta info to client, if not yet sent
2841 unless (exists $self->{channel}{$channel->{id}}) { 3083 unless (exists $self->{channel}{$channel->{id}}) {
2842 $self->{channel}{$channel->{id}} = $channel; 3084 $self->{channel}{$channel->{id}} = $channel;
2843 $self->ext_msg (channel_info => $channel) 3085 $self->ext_msg (channel_info => $channel);
2844 if $self->can_msg;
2845 } 3086 }
2846 3087
2847 $channel = $channel->{id}; 3088 $channel = $channel->{id};
2848 } 3089 }
2849 3090
2850 return unless @extra || length $msg; 3091 return unless @extra || length $msg;
2851 3092
2852 if ($self->can_msg) {
2853 # default colour, mask it out 3093 # default colour, mask it out
2854 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3094 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2855 if $color & cf::NDI_DEF; 3095 if $color & cf::NDI_DEF;
2856 3096
2857 my $pkt = "msg " 3097 my $pkt = "msg "
2858 . $self->{json_coder}->encode ( 3098 . $self->{json_coder}->encode (
2859 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3099 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2860 ); 3100 );
2861 3101
2862 # try lzf for large packets
2863 $pkt = "lzf " . Compress::LZF::compress $pkt
2864 if 1024 <= length $pkt and $self->{can_lzf};
2865
2866 # split very large packets
2867 if (8192 < length $pkt and $self->{can_lzf}) {
2868 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2869 $pkt = "frag";
2870 }
2871
2872 $self->send_packet ($pkt); 3102 $self->send_big_packet ($pkt);
2873 } else {
2874 if ($color >= 0) {
2875 # replace some tags by gcfclient-compatible ones
2876 for ($msg) {
2877 1 while
2878 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2879 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2880 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2881 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2882 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2883 }
2884
2885 $color &= cf::NDI_COLOR_MASK;
2886
2887 utf8::encode $msg;
2888
2889 if (0 && $msg =~ /\[/) {
2890 # COMMAND/INFO
2891 $self->send_packet ("drawextinfo $color 10 8 $msg")
2892 } else {
2893 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2894 $self->send_packet ("drawinfo $color $msg")
2895 }
2896 }
2897 }
2898} 3103}
2899 3104
2900=item $client->ext_msg ($type, @msg) 3105=item $client->ext_msg ($type, @msg)
2901 3106
2902Sends an ext event to the client. 3107Sends an ext event to the client.
2905 3110
2906sub cf::client::ext_msg($$@) { 3111sub cf::client::ext_msg($$@) {
2907 my ($self, $type, @msg) = @_; 3112 my ($self, $type, @msg) = @_;
2908 3113
2909 if ($self->extcmd == 2) { 3114 if ($self->extcmd == 2) {
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3115 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2911 } elsif ($self->extcmd == 1) { # TODO: remove 3116 } elsif ($self->extcmd == 1) { # TODO: remove
2912 push @msg, msgtype => "event_$type"; 3117 push @msg, msgtype => "event_$type";
2913 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3118 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2914 } 3119 }
2915} 3120}
2916 3121
2917=item $client->ext_reply ($msgid, @msg) 3122=item $client->ext_reply ($msgid, @msg)
2918 3123
2922 3127
2923sub cf::client::ext_reply($$@) { 3128sub cf::client::ext_reply($$@) {
2924 my ($self, $id, @msg) = @_; 3129 my ($self, $id, @msg) = @_;
2925 3130
2926 if ($self->extcmd == 2) { 3131 if ($self->extcmd == 2) {
2927 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3132 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2928 } elsif ($self->extcmd == 1) { 3133 } elsif ($self->extcmd == 1) {
2929 #TODO: version 1, remove 3134 #TODO: version 1, remove
2930 unshift @msg, msgtype => "reply", msgid => $id; 3135 unshift @msg, msgtype => "reply", msgid => $id;
2931 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3136 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2932 } 3137 }
2933} 3138}
2934 3139
2935=item $success = $client->query ($flags, "text", \&cb) 3140=item $success = $client->query ($flags, "text", \&cb)
2936 3141
3007 3212
3008 $ns->ext_reply ($reply, @reply) 3213 $ns->ext_reply ($reply, @reply)
3009 if $reply; 3214 if $reply;
3010 3215
3011 } else { 3216 } else {
3012 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3217 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3013 } 3218 }
3014 3219
3015 cf::override; 3220 cf::override;
3016 }, 3221 },
3017); 3222);
3037 3242
3038 $coro 3243 $coro
3039} 3244}
3040 3245
3041cf::client->attach ( 3246cf::client->attach (
3042 on_destroy => sub { 3247 on_client_destroy => sub {
3043 my ($ns) = @_; 3248 my ($ns) = @_;
3044 3249
3045 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3250 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3046 }, 3251 },
3047); 3252);
3063our $safe_hole = new Safe::Hole; 3268our $safe_hole = new Safe::Hole;
3064 3269
3065$SIG{FPE} = 'IGNORE'; 3270$SIG{FPE} = 'IGNORE';
3066 3271
3067$safe->permit_only (Opcode::opset qw( 3272$safe->permit_only (Opcode::opset qw(
3068 :base_core :base_mem :base_orig :base_math 3273 :base_core :base_mem :base_orig :base_math :base_loop
3069 grepstart grepwhile mapstart mapwhile 3274 grepstart grepwhile mapstart mapwhile
3070 sort time 3275 sort time
3071)); 3276));
3072 3277
3073# here we export the classes and methods available to script code 3278# here we export the classes and methods available to script code
3077The following functions and methods are available within a safe environment: 3282The following functions and methods are available within a safe environment:
3078 3283
3079 cf::object 3284 cf::object
3080 contr pay_amount pay_player map x y force_find force_add destroy 3285 contr pay_amount pay_player map x y force_find force_add destroy
3081 insert remove name archname title slaying race decrease split 3286 insert remove name archname title slaying race decrease split
3287 value
3082 3288
3083 cf::object::player 3289 cf::object::player
3084 player 3290 player
3085 3291
3086 cf::player 3292 cf::player
3092=cut 3298=cut
3093 3299
3094for ( 3300for (
3095 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3301 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3096 insert remove inv nrof name archname title slaying race 3302 insert remove inv nrof name archname title slaying race
3097 decrease split destroy change_exp)], 3303 decrease split destroy change_exp value msg lore send_msg)],
3098 ["cf::object::player" => qw(player)], 3304 ["cf::object::player" => qw(player)],
3099 ["cf::player" => qw(peaceful)], 3305 ["cf::player" => qw(peaceful send_msg)],
3100 ["cf::map" => qw(trigger)], 3306 ["cf::map" => qw(trigger)],
3101) { 3307) {
3102 no strict 'refs';
3103 my ($pkg, @funs) = @$_; 3308 my ($pkg, @funs) = @$_;
3104 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3309 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3105 for @funs; 3310 for @funs;
3106} 3311}
3107 3312
3122 3327
3123 my $qcode = $code; 3328 my $qcode = $code;
3124 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3329 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3125 $qcode =~ s/\n/\\n/g; 3330 $qcode =~ s/\n/\\n/g;
3126 3331
3332 %vars = (_dummy => 0) unless %vars;
3333
3334 my @res;
3127 local $_; 3335 local $_;
3128 local @safe::cf::_safe_eval_args = values %vars;
3129 3336
3130 my $eval = 3337 my $eval =
3131 "do {\n" 3338 "do {\n"
3132 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3339 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3133 . "#line 0 \"{$qcode}\"\n" 3340 . "#line 0 \"{$qcode}\"\n"
3134 . $code 3341 . $code
3135 . "\n}" 3342 . "\n}"
3136 ; 3343 ;
3137 3344
3345 if ($CFG{safe_eval}) {
3138 sub_generation_inc; 3346 sub_generation_inc;
3347 local @safe::cf::_safe_eval_args = values %vars;
3139 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3348 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3140 sub_generation_inc; 3349 sub_generation_inc;
3350 } else {
3351 local @cf::_safe_eval_args = values %vars;
3352 @res = wantarray ? eval eval : scalar eval $eval;
3353 }
3141 3354
3142 if ($@) { 3355 if ($@) {
3143 warn "$@"; 3356 warn "$@",
3144 warn "while executing safe code '$code'\n"; 3357 "while executing safe code '$code'\n",
3145 warn "with arguments " . (join " ", %vars) . "\n"; 3358 "with arguments " . (join " ", %vars) . "\n";
3146 } 3359 }
3147 3360
3148 wantarray ? @res : $res[0] 3361 wantarray ? @res : $res[0]
3149} 3362}
3150 3363
3164=cut 3377=cut
3165 3378
3166sub register_script_function { 3379sub register_script_function {
3167 my ($fun, $cb) = @_; 3380 my ($fun, $cb) = @_;
3168 3381
3169 no strict 'refs'; 3382 $fun = "safe::$fun" if $CFG{safe_eval};
3170 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3383 *$fun = $safe_hole->wrap ($cb);
3171} 3384}
3172 3385
3173=back 3386=back
3174 3387
3175=cut 3388=cut
3184 # for this (global event?) 3397 # for this (global event?)
3185 %ext::player_env::MUSIC_FACE_CACHE = (); 3398 %ext::player_env::MUSIC_FACE_CACHE = ();
3186 3399
3187 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3400 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3188 3401
3189 warn "loading facedata from $path\n"; 3402 trace "loading facedata from $path\n";
3190 3403
3191 my $facedata;
3192 0 < aio_load $path, $facedata 3404 0 < aio_load $path, my $facedata
3193 or die "$path: $!"; 3405 or die "$path: $!";
3194 3406
3195 $facedata = Coro::Storable::thaw $facedata; 3407 $facedata = Coro::Storable::thaw $facedata;
3196 3408
3197 $facedata->{version} == 2 3409 $facedata->{version} == 2
3198 or cf::cleanup "$path: version mismatch, cannot proceed."; 3410 or cf::cleanup "$path: version mismatch, cannot proceed.";
3199 3411
3200 # patch in the exptable 3412 # patch in the exptable
3413 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3201 $facedata->{resource}{"res/exp_table"} = { 3414 $facedata->{resource}{"res/exp_table"} = {
3202 type => FT_RSRC, 3415 type => FT_RSRC,
3203 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3416 data => $exp_table,
3417 hash => (Digest::MD5::md5 $exp_table),
3204 }; 3418 };
3205 cf::cede_to_tick; 3419 cf::cede_to_tick;
3206 3420
3207 { 3421 {
3208 my $faces = $facedata->{faceinfo}; 3422 my $faces = $facedata->{faceinfo};
3210 while (my ($face, $info) = each %$faces) { 3424 while (my ($face, $info) = each %$faces) {
3211 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3425 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3212 3426
3213 cf::face::set_visibility $idx, $info->{visibility}; 3427 cf::face::set_visibility $idx, $info->{visibility};
3214 cf::face::set_magicmap $idx, $info->{magicmap}; 3428 cf::face::set_magicmap $idx, $info->{magicmap};
3215 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3429 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3216 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3430 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3431 cf::face::set_data $idx, 2, "-", chr $idx & 255;
3217 3432
3218 cf::cede_to_tick; 3433 cf::cede_to_tick;
3219 } 3434 }
3220 3435
3221 while (my ($face, $info) = each %$faces) { 3436 while (my ($face, $info) = each %$faces) {
3226 3441
3227 if (my $smooth = cf::face::find $info->{smooth}) { 3442 if (my $smooth = cf::face::find $info->{smooth}) {
3228 cf::face::set_smooth $idx, $smooth; 3443 cf::face::set_smooth $idx, $smooth;
3229 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3444 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3230 } else { 3445 } else {
3231 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3446 error "smooth face '$info->{smooth}' not found for face '$face'";
3232 } 3447 }
3233 3448
3234 cf::cede_to_tick; 3449 cf::cede_to_tick;
3235 } 3450 }
3236 } 3451 }
3245 3460
3246 cf::anim::invalidate_all; # d'oh 3461 cf::anim::invalidate_all; # d'oh
3247 } 3462 }
3248 3463
3249 { 3464 {
3250 # TODO: for gcfclient pleasure, we should give resources
3251 # that gcfclient doesn't grok a >10000 face index.
3252 my $res = $facedata->{resource}; 3465 my $res = $facedata->{resource};
3253 3466
3254 while (my ($name, $info) = each %$res) { 3467 while (my ($name, $info) = each %$res) {
3255 if (defined $info->{type}) { 3468 if (defined $info->{type}) {
3256 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3469 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3257 my $data;
3258 3470
3259 if ($info->{type} & 1) { 3471 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3260 # prepend meta info
3261
3262 my $meta = $enc->encode ({
3263 name => $name,
3264 %{ $info->{meta} || {} },
3265 });
3266
3267 $data = pack "(w/a*)*", $meta, $info->{data};
3268 } else {
3269 $data = $info->{data};
3270 }
3271
3272 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3273 cf::face::set_type $idx, $info->{type}; 3472 cf::face::set_type $idx, $info->{type};
3274 } else { 3473 } else {
3275 $RESOURCE{$name} = $info; 3474 $RESOURCE{$name} = $info; # unused
3276 } 3475 }
3277 3476
3278 cf::cede_to_tick; 3477 cf::cede_to_tick;
3279 } 3478 }
3280 } 3479 }
3281 3480
3282 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3481 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3283 3482
3284 1 3483 1
3285} 3484}
3286
3287cf::global->attach (on_resource_update => sub {
3288 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3289 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3290
3291 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3292 my $sound = $soundconf->{compat}[$_]
3293 or next;
3294
3295 my $face = cf::face::find "sound/$sound->[1]";
3296 cf::sound::set $sound->[0] => $face;
3297 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3298 }
3299
3300 while (my ($k, $v) = each %{$soundconf->{event}}) {
3301 my $face = cf::face::find "sound/$v";
3302 cf::sound::set $k => $face;
3303 }
3304 }
3305});
3306 3485
3307register_exticmd fx_want => sub { 3486register_exticmd fx_want => sub {
3308 my ($ns, $want) = @_; 3487 my ($ns, $want) = @_;
3309 3488
3310 while (my ($k, $v) = each %$want) { 3489 while (my ($k, $v) = each %$want) {
3349sub reload_treasures { 3528sub reload_treasures {
3350 load_resource_file "$DATADIR/treasures" 3529 load_resource_file "$DATADIR/treasures"
3351 or die "unable to load treasurelists\n"; 3530 or die "unable to load treasurelists\n";
3352} 3531}
3353 3532
3533sub reload_sound {
3534 trace "loading sound config from $DATADIR/sound\n";
3535
3536 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3537 or die "$DATADIR/sound $!";
3538
3539 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3540
3541 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3542 my $sound = $soundconf->{compat}[$_]
3543 or next;
3544
3545 my $face = cf::face::find "sound/$sound->[1]";
3546 cf::sound::set $sound->[0] => $face;
3547 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3548 }
3549
3550 while (my ($k, $v) = each %{$soundconf->{event}}) {
3551 my $face = cf::face::find "sound/$v";
3552 cf::sound::set $k => $face;
3553 }
3554}
3555
3354sub reload_resources { 3556sub reload_resources {
3355 warn "reloading resource files...\n"; 3557 trace "reloading resource files...\n";
3356 3558
3559 reload_exp_table;
3560 reload_materials;
3357 reload_facedata; 3561 reload_facedata;
3562 reload_sound;
3358 reload_archetypes; 3563 reload_archetypes;
3359 reload_regions; 3564 reload_regions;
3360 reload_treasures; 3565 reload_treasures;
3361 3566
3362 warn "finished reloading resource files\n"; 3567 trace "finished reloading resource files\n";
3363} 3568}
3364 3569
3365sub reload_config { 3570sub reload_config {
3366 open my $fh, "<:utf8", "$CONFDIR/config" 3571 trace "reloading config file...\n";
3367 or return;
3368 3572
3369 local $/; 3573 0 < aio_load "$CONFDIR/config", my $config
3370 *CFG = YAML::Load <$fh>; 3574 or die "$CONFDIR/config: $!";
3371 3575
3576 utf8::decode $config;
3577 *CFG = yaml_load $config;
3578
3372 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3579 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3373 3580
3374 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3581 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3375 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3582 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3376 3583
3377 if (exists $CFG{mlockall}) { 3584 if (exists $CFG{mlockall}) {
3400 3607
3401 seek $fh, 0, 0; 3608 seek $fh, 0, 0;
3402 print $fh $$; 3609 print $fh $$;
3403} 3610}
3404 3611
3612sub main_loop {
3613 trace "EV::loop starting\n";
3614 if (1) {
3615 EV::loop;
3616 }
3617 trace "EV::loop returned\n";
3618 goto &main_loop unless $REALLY_UNLOOP;
3619}
3620
3405sub main { 3621sub main {
3406 cf::init_globals; # initialise logging 3622 cf::init_globals; # initialise logging
3407 3623
3408 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3624 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3409 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3625 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3410 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3626 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3411 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3627 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3412
3413 cf::init_experience;
3414 cf::init_anim;
3415 cf::init_attackmess;
3416 cf::init_dynamic;
3417 cf::init_block;
3418 3628
3419 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3629 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3420 3630
3421 # we must not ever block the main coroutine 3631 # we must not ever block the main coroutine
3422 local $Coro::idle = sub { 3632 local $Coro::idle = sub {
3428 }; 3638 };
3429 3639
3430 evthread_start IO::AIO::poll_fileno; 3640 evthread_start IO::AIO::poll_fileno;
3431 3641
3432 cf::sync_job { 3642 cf::sync_job {
3643 cf::incloader::init ();
3644
3645 cf::init_anim;
3646 cf::init_attackmess;
3647 cf::init_dynamic;
3648
3649 cf::load_settings;
3650
3433 reload_resources; 3651 reload_resources;
3434 reload_config; 3652 reload_config;
3435 db_init; 3653 db_init;
3436 3654
3437 cf::load_settings;
3438 cf::load_materials;
3439 cf::init_uuid; 3655 cf::init_uuid;
3440 cf::init_signals; 3656 cf::init_signals;
3441 cf::init_commands;
3442 cf::init_skills; 3657 cf::init_skills;
3443 3658
3444 cf::init_beforeplay; 3659 cf::init_beforeplay;
3445 3660
3446 atomic; 3661 atomic;
3448 load_extensions; 3663 load_extensions;
3449 3664
3450 utime time, time, $RUNTIMEFILE; 3665 utime time, time, $RUNTIMEFILE;
3451 3666
3452 # no (long-running) fork's whatsoever before this point(!) 3667 # no (long-running) fork's whatsoever before this point(!)
3668 use POSIX ();
3453 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3669 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3454 3670
3455 (pop @POST_INIT)->(0) while @POST_INIT; 3671 cf::_post_init 0;
3456 }; 3672 };
3457 3673
3458 EV::loop; 3674 cf::object::thawer::errors_are_fatal 0;
3675 info "parse errors in files are no longer fatal from this point on.\n";
3676
3677 my $free_main; $free_main = EV::idle sub {
3678 undef $free_main;
3679 undef &main; # free gobs of memory :)
3680 };
3681
3682 goto &main_loop;
3459} 3683}
3460 3684
3461############################################################################# 3685#############################################################################
3462# initialisation and cleanup 3686# initialisation and cleanup
3463 3687
3464# install some emergency cleanup handlers 3688# install some emergency cleanup handlers
3465BEGIN { 3689BEGIN {
3466 our %SIGWATCHER = (); 3690 our %SIGWATCHER = ();
3467 for my $signal (qw(INT HUP TERM)) { 3691 for my $signal (qw(INT HUP TERM)) {
3468 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3692 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3469 cf::cleanup "SIG$signal"; 3693 cf::cleanup "SIG$signal";
3470 }; 3694 };
3471 } 3695 }
3472} 3696}
3473 3697
3474sub write_runtime_sync { 3698sub write_runtime_sync {
3699 my $t0 = AE::time;
3700
3475 # first touch the runtime file to show we are still running: 3701 # first touch the runtime file to show we are still running:
3476 # the fsync below can take a very very long time. 3702 # the fsync below can take a very very long time.
3477 3703
3478 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3704 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3479 3705
3480 my $guard = cf::lock_acquire "write_runtime"; 3706 my $guard = cf::lock_acquire "write_runtime";
3481 3707
3482 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3708 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3483 or return; 3709 or return;
3484 3710
3485 my $value = $cf::RUNTIME + 90 + 10; 3711 my $value = $cf::RUNTIME + 90 + 10;
3486 # 10 is the runtime save interval, for a monotonic clock 3712 # 10 is the runtime save interval, for a monotonic clock
3487 # 60 allows for the watchdog to kill the server. 3713 # 60 allows for the watchdog to kill the server.
3500 or return; 3726 or return;
3501 3727
3502 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3728 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3503 and return; 3729 and return;
3504 3730
3505 warn "runtime file written.\n"; 3731 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3506 3732
3507 1 3733 1
3508} 3734}
3509 3735
3510our $uuid_lock; 3736our $uuid_lock;
3522 or return; 3748 or return;
3523 3749
3524 my $value = uuid_seq uuid_cur; 3750 my $value = uuid_seq uuid_cur;
3525 3751
3526 unless ($value) { 3752 unless ($value) {
3527 warn "cowardly refusing to write zero uuid value!\n"; 3753 info "cowardly refusing to write zero uuid value!\n";
3528 return; 3754 return;
3529 } 3755 }
3530 3756
3531 my $value = uuid_str $value + $uuid_skip; 3757 my $value = uuid_str $value + $uuid_skip;
3532 $uuid_skip = 0; 3758 $uuid_skip = 0;
3542 or return; 3768 or return;
3543 3769
3544 aio_rename "$uuid~", $uuid 3770 aio_rename "$uuid~", $uuid
3545 and return; 3771 and return;
3546 3772
3547 warn "uuid file written ($value).\n"; 3773 trace "uuid file written ($value).\n";
3548 3774
3549 1 3775 1
3550 3776
3551} 3777}
3552 3778
3558} 3784}
3559 3785
3560sub emergency_save() { 3786sub emergency_save() {
3561 my $freeze_guard = cf::freeze_mainloop; 3787 my $freeze_guard = cf::freeze_mainloop;
3562 3788
3563 warn "enter emergency perl save\n"; 3789 info "emergency_perl_save: enter\n";
3790
3791 # this is a trade-off: we want to be very quick here, so
3792 # save all maps without fsync, and later call a global sync
3793 # (which in turn might be very very slow)
3794 local $USE_FSYNC = 0;
3564 3795
3565 cf::sync_job { 3796 cf::sync_job {
3797 cf::write_runtime_sync; # external watchdog should not bark
3798
3566 # use a peculiar iteration method to avoid tripping on perl 3799 # use a peculiar iteration method to avoid tripping on perl
3567 # refcount bugs in for. also avoids problems with players 3800 # refcount bugs in for. also avoids problems with players
3568 # and maps saved/destroyed asynchronously. 3801 # and maps saved/destroyed asynchronously.
3569 warn "begin emergency player save\n"; 3802 info "emergency_perl_save: begin player save\n";
3570 for my $login (keys %cf::PLAYER) { 3803 for my $login (keys %cf::PLAYER) {
3571 my $pl = $cf::PLAYER{$login} or next; 3804 my $pl = $cf::PLAYER{$login} or next;
3572 $pl->valid or next; 3805 $pl->valid or next;
3573 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3806 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3574 $pl->save; 3807 $pl->save;
3575 } 3808 }
3576 warn "end emergency player save\n"; 3809 info "emergency_perl_save: end player save\n";
3577 3810
3578 warn "begin emergency map save\n"; 3811 cf::write_runtime_sync; # external watchdog should not bark
3812
3813 info "emergency_perl_save: begin map save\n";
3579 for my $path (keys %cf::MAP) { 3814 for my $path (keys %cf::MAP) {
3580 my $map = $cf::MAP{$path} or next; 3815 my $map = $cf::MAP{$path} or next;
3581 $map->valid or next; 3816 $map->valid or next;
3582 $map->save; 3817 $map->save;
3583 } 3818 }
3584 warn "end emergency map save\n"; 3819 info "emergency_perl_save: end map save\n";
3585 3820
3586 warn "begin emergency database checkpoint\n"; 3821 cf::write_runtime_sync; # external watchdog should not bark
3822
3823 info "emergency_perl_save: begin database checkpoint\n";
3587 BDB::db_env_txn_checkpoint $DB_ENV; 3824 BDB::db_env_txn_checkpoint $DB_ENV;
3588 warn "end emergency database checkpoint\n"; 3825 info "emergency_perl_save: end database checkpoint\n";
3589 3826
3590 warn "begin write uuid\n"; 3827 info "emergency_perl_save: begin write uuid\n";
3591 write_uuid_sync 1; 3828 write_uuid_sync 1;
3592 warn "end write uuid\n"; 3829 info "emergency_perl_save: end write uuid\n";
3830
3831 cf::write_runtime_sync; # external watchdog should not bark
3832
3833 trace "emergency_perl_save: syncing database to disk";
3834 BDB::db_env_txn_checkpoint $DB_ENV;
3835
3836 info "emergency_perl_save: starting sync\n";
3837 IO::AIO::aio_sync sub {
3838 info "emergency_perl_save: finished sync\n";
3839 };
3840
3841 cf::write_runtime_sync; # external watchdog should not bark
3842
3843 trace "emergency_perl_save: flushing outstanding aio requests";
3844 while (IO::AIO::nreqs || BDB::nreqs) {
3845 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3846 }
3847
3848 cf::write_runtime_sync; # external watchdog should not bark
3593 }; 3849 };
3594 3850
3595 warn "leave emergency perl save\n"; 3851 info "emergency_perl_save: leave\n";
3596} 3852}
3597 3853
3598sub post_cleanup { 3854sub post_cleanup {
3599 my ($make_core) = @_; 3855 my ($make_core) = @_;
3600 3856
3857 IO::AIO::flush;
3858
3601 warn Carp::longmess "post_cleanup backtrace" 3859 error Carp::longmess "post_cleanup backtrace"
3602 if $make_core; 3860 if $make_core;
3603 3861
3604 my $fh = pidfile; 3862 my $fh = pidfile;
3605 unlink $PIDFILE if <$fh> == $$; 3863 unlink $PIDFILE if <$fh> == $$;
3606} 3864}
3626 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3884 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3627 for my $name (keys %$leaf_symtab) { 3885 for my $name (keys %$leaf_symtab) {
3628 _gv_clear *{"$pkg$name"}; 3886 _gv_clear *{"$pkg$name"};
3629# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3887# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3630 } 3888 }
3631 warn "cleared package $pkg\n";#d#
3632} 3889}
3633 3890
3634sub do_reload_perl() { 3891sub do_reload_perl() {
3635 # can/must only be called in main 3892 # can/must only be called in main
3636 if ($Coro::current != $Coro::main) { 3893 unless (in_main) {
3637 warn "can only reload from main coroutine"; 3894 error "can only reload from main coroutine";
3638 return; 3895 return;
3639 } 3896 }
3640 3897
3641 return if $RELOAD++; 3898 return if $RELOAD++;
3642 3899
3900 my $t1 = AE::time;
3901
3643 while ($RELOAD) { 3902 while ($RELOAD) {
3644 warn "reloading..."; 3903 cf::get_slot 0.1, -1, "reload_perl";
3904 info "perl_reload: reloading...";
3645 3905
3646 warn "entering sync_job"; 3906 trace "perl_reload: entering sync_job";
3647 3907
3648 cf::sync_job { 3908 cf::sync_job {
3649 cf::write_runtime_sync; # external watchdog should not bark
3650 cf::emergency_save; 3909 #cf::emergency_save;
3651 cf::write_runtime_sync; # external watchdog should not bark
3652 3910
3653 warn "syncing database to disk";
3654 BDB::db_env_txn_checkpoint $DB_ENV;
3655
3656 # if anything goes wrong in here, we should simply crash as we already saved
3657
3658 warn "flushing outstanding aio requests";
3659 while (IO::AIO::nreqs || BDB::nreqs) {
3660 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3661 }
3662
3663 warn "cancelling all extension coros"; 3911 trace "perl_reload: cancelling all extension coros";
3664 $_->cancel for values %EXT_CORO; 3912 $_->cancel for values %EXT_CORO;
3665 %EXT_CORO = (); 3913 %EXT_CORO = ();
3666 3914
3667 warn "removing commands"; 3915 trace "perl_reload: removing commands";
3668 %COMMAND = (); 3916 %COMMAND = ();
3669 3917
3670 warn "removing ext/exti commands"; 3918 trace "perl_reload: removing ext/exti commands";
3671 %EXTCMD = (); 3919 %EXTCMD = ();
3672 %EXTICMD = (); 3920 %EXTICMD = ();
3673 3921
3674 warn "unloading/nuking all extensions"; 3922 trace "perl_reload: unloading/nuking all extensions";
3675 for my $pkg (@EXTS) { 3923 for my $pkg (@EXTS) {
3676 warn "... unloading $pkg"; 3924 trace "... unloading $pkg";
3677 3925
3678 if (my $cb = $pkg->can ("unload")) { 3926 if (my $cb = $pkg->can ("unload")) {
3679 eval { 3927 eval {
3680 $cb->($pkg); 3928 $cb->($pkg);
3681 1 3929 1
3682 } or warn "$pkg unloaded, but with errors: $@"; 3930 } or error "$pkg unloaded, but with errors: $@";
3683 } 3931 }
3684 3932
3685 warn "... clearing $pkg"; 3933 trace "... clearing $pkg";
3686 clear_package $pkg; 3934 clear_package $pkg;
3687 } 3935 }
3688 3936
3689 warn "unloading all perl modules loaded from $LIBDIR"; 3937 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3690 while (my ($k, $v) = each %INC) { 3938 while (my ($k, $v) = each %INC) {
3691 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3939 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3692 3940
3693 warn "... unloading $k"; 3941 trace "... unloading $k";
3694 delete $INC{$k}; 3942 delete $INC{$k};
3695 3943
3696 $k =~ s/\.pm$//; 3944 $k =~ s/\.pm$//;
3697 $k =~ s/\//::/g; 3945 $k =~ s/\//::/g;
3698 3946
3701 } 3949 }
3702 3950
3703 clear_package $k; 3951 clear_package $k;
3704 } 3952 }
3705 3953
3706 warn "getting rid of safe::, as good as possible"; 3954 trace "perl_reload: getting rid of safe::, as good as possible";
3707 clear_package "safe::$_" 3955 clear_package "safe::$_"
3708 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3956 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3709 3957
3710 warn "unloading cf.pm \"a bit\""; 3958 trace "perl_reload: unloading cf.pm \"a bit\"";
3711 delete $INC{"cf.pm"}; 3959 delete $INC{"cf.pm"};
3712 delete $INC{"cf/pod.pm"}; 3960 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3713 3961
3714 # don't, removes xs symbols, too, 3962 # don't, removes xs symbols, too,
3715 # and global variables created in xs 3963 # and global variables created in xs
3716 #clear_package __PACKAGE__; 3964 #clear_package __PACKAGE__;
3717 3965
3718 warn "unload completed, starting to reload now"; 3966 info "perl_reload: unload completed, starting to reload now";
3719 3967
3720 warn "reloading cf.pm"; 3968 trace "perl_reload: reloading cf.pm";
3721 require cf; 3969 require cf;
3722 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3970 cf::_connect_to_perl_1;
3723 3971
3724 warn "loading config and database again"; 3972 trace "perl_reload: loading config and database again";
3725 cf::reload_config; 3973 cf::reload_config;
3726 3974
3727 warn "loading extensions"; 3975 trace "perl_reload: loading extensions";
3728 cf::load_extensions; 3976 cf::load_extensions;
3729 3977
3978 if ($REATTACH_ON_RELOAD) {
3730 warn "reattaching attachments to objects/players"; 3979 trace "perl_reload: reattaching attachments to objects/players";
3731 _global_reattach; # objects, sockets 3980 _global_reattach; # objects, sockets
3732 warn "reattaching attachments to maps"; 3981 trace "perl_reload: reattaching attachments to maps";
3733 reattach $_ for values %MAP; 3982 reattach $_ for values %MAP;
3734 warn "reattaching attachments to players"; 3983 trace "perl_reload: reattaching attachments to players";
3735 reattach $_ for values %PLAYER; 3984 reattach $_ for values %PLAYER;
3985 }
3736 3986
3737 warn "running post_load"; 3987 cf::_post_init 1;
3738 (pop @POST_INIT)->(1) while @POST_INIT;
3739 3988
3740 warn "leaving sync_job"; 3989 trace "perl_reload: leaving sync_job";
3741 3990
3742 1 3991 1
3743 } or do { 3992 } or do {
3744 warn $@; 3993 error $@;
3745 cf::cleanup "error while reloading, exiting."; 3994 cf::cleanup "perl_reload: error, exiting.";
3746 }; 3995 };
3747 3996
3748 warn "reloaded";
3749 --$RELOAD; 3997 --$RELOAD;
3750 } 3998 }
3999
4000 $t1 = AE::time - $t1;
4001 info "perl_reload: completed in ${t1}s\n";
3751}; 4002};
3752 4003
3753our $RELOAD_WATCHER; # used only during reload 4004our $RELOAD_WATCHER; # used only during reload
3754 4005
3755sub reload_perl() { 4006sub reload_perl() {
3756 # doing reload synchronously and two reloads happen back-to-back, 4007 # doing reload synchronously and two reloads happen back-to-back,
3757 # coro crashes during coro_state_free->destroy here. 4008 # coro crashes during coro_state_free->destroy here.
3758 4009
4010 $RELOAD_WATCHER ||= cf::async {
4011 Coro::AIO::aio_wait cache_extensions;
4012
3759 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 4013 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3760 do_reload_perl; 4014 do_reload_perl;
3761 undef $RELOAD_WATCHER; 4015 undef $RELOAD_WATCHER;
4016 };
3762 }; 4017 };
3763} 4018}
3764 4019
3765register_command "reload" => sub { 4020register_command "reload" => sub {
3766 my ($who, $arg) = @_; 4021 my ($who, $arg) = @_;
3772 reload_perl; 4027 reload_perl;
3773 }; 4028 };
3774 } 4029 }
3775}; 4030};
3776 4031
3777unshift @INC, $LIBDIR; 4032#############################################################################
3778 4033
3779my $bug_warning = 0; 4034my $bug_warning = 0;
3780 4035
3781our @WAIT_FOR_TICK; 4036our @WAIT_FOR_TICK;
3782our @WAIT_FOR_TICK_BEGIN; 4037our @WAIT_FOR_TICK_BEGIN;
3783 4038
3784sub wait_for_tick { 4039sub wait_for_tick() {
3785 return if tick_inhibit || $Coro::current == $Coro::main; 4040 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3786 4041
3787 my $signal = new Coro::Signal; 4042 my $signal = new Coro::Signal;
3788 push @WAIT_FOR_TICK, $signal; 4043 push @WAIT_FOR_TICK, $signal;
3789 $signal->wait; 4044 $signal->wait;
3790} 4045}
3791 4046
3792sub wait_for_tick_begin { 4047sub wait_for_tick_begin() {
3793 return if tick_inhibit || $Coro::current == $Coro::main; 4048 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3794 4049
3795 my $signal = new Coro::Signal; 4050 my $signal = new Coro::Signal;
3796 push @WAIT_FOR_TICK_BEGIN, $signal; 4051 push @WAIT_FOR_TICK_BEGIN, $signal;
3797 $signal->wait; 4052 $signal->wait;
3798} 4053}
3804 return; 4059 return;
3805 } 4060 }
3806 4061
3807 cf::server_tick; # one server iteration 4062 cf::server_tick; # one server iteration
3808 4063
4064 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4065
3809 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4066 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3810 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4067 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3811 Coro::async_pool { 4068 Coro::async_pool {
3812 $Coro::current->{desc} = "runtime saver"; 4069 $Coro::current->{desc} = "runtime saver";
3813 write_runtime_sync 4070 write_runtime_sync
3814 or warn "ERROR: unable to write runtime file: $!"; 4071 or error "ERROR: unable to write runtime file: $!";
3815 }; 4072 };
3816 } 4073 }
3817 4074
3818 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4075 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3819 $sig->send; 4076 $sig->send;
3827 4084
3828 if (0) { 4085 if (0) {
3829 if ($NEXT_TICK) { 4086 if ($NEXT_TICK) {
3830 my $jitter = $TICK_START - $NEXT_TICK; 4087 my $jitter = $TICK_START - $NEXT_TICK;
3831 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4088 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3832 warn "jitter $JITTER\n";#d# 4089 debug "jitter $JITTER\n";#d#
3833 } 4090 }
3834 } 4091 }
3835} 4092}
3836 4093
3837{ 4094{
3838 # configure BDB 4095 # configure BDB
3839 4096
3840 BDB::min_parallel 8; 4097 BDB::min_parallel 16;
3841 BDB::max_poll_reqs $TICK * 0.1; 4098 BDB::max_poll_reqs $TICK * 0.1;
3842 $AnyEvent::BDB::WATCHER->priority (1); 4099 $AnyEvent::BDB::WATCHER->priority (1);
3843 4100
3844 unless ($DB_ENV) { 4101 unless ($DB_ENV) {
3845 $DB_ENV = BDB::db_env_create; 4102 $DB_ENV = BDB::db_env_create;
3882 IO::AIO::min_parallel 8; 4139 IO::AIO::min_parallel 8;
3883 IO::AIO::max_poll_time $TICK * 0.1; 4140 IO::AIO::max_poll_time $TICK * 0.1;
3884 undef $AnyEvent::AIO::WATCHER; 4141 undef $AnyEvent::AIO::WATCHER;
3885} 4142}
3886 4143
3887my $_log_backtrace; 4144our $_log_backtrace;
4145our $_log_backtrace_last;
3888 4146
3889sub _log_backtrace { 4147sub _log_backtrace {
3890 my ($msg, @addr) = @_; 4148 my ($msg, @addr) = @_;
3891 4149
3892 $msg =~ s/\n//; 4150 $msg =~ s/\n$//;
3893 4151
4152 if ($_log_backtrace_last eq $msg) {
4153 LOG llevInfo, "[ABT] $msg\n";
4154 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3894 # limit the # of concurrent backtraces 4155 # limit the # of concurrent backtraces
3895 if ($_log_backtrace < 2) { 4156 } elsif ($_log_backtrace < 2) {
4157 $_log_backtrace_last = $msg;
3896 ++$_log_backtrace; 4158 ++$_log_backtrace;
3897 my $perl_bt = Carp::longmess $msg; 4159 my $perl_bt = Carp::longmess $msg;
3898 async { 4160 async {
3899 $Coro::current->{desc} = "abt $msg"; 4161 $Coro::current->{desc} = "abt $msg";
3900 4162
3920 LOG llevInfo, "[ABT] $_\n" for @bt; 4182 LOG llevInfo, "[ABT] $_\n" for @bt;
3921 --$_log_backtrace; 4183 --$_log_backtrace;
3922 }; 4184 };
3923 } else { 4185 } else {
3924 LOG llevInfo, "[ABT] $msg\n"; 4186 LOG llevInfo, "[ABT] $msg\n";
3925 LOG llevInfo, "[ABT] [suppressed]\n"; 4187 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3926 } 4188 }
3927} 4189}
3928 4190
3929# load additional modules 4191# load additional modules
3930use cf::pod; 4192require "cf/$_.pm" for @EXTRA_MODULES;
4193cf::_connect_to_perl_2;
3931 4194
3932END { cf::emergency_save } 4195END { cf::emergency_save }
3933 4196
39341 41971
3935 4198

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines