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.457 by root, Wed Oct 1 05:50:19 2008 UTC vs.
Revision 1.558 by root, Tue Oct 5 22:35:30 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;
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;
134 150
135our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
136 153
137binmode STDOUT; 154binmode STDOUT;
138binmode STDERR; 155binmode STDERR;
139 156
140# read virtual server time, if available 157# read virtual server time, if available
142 open my $fh, "<", $RUNTIMEFILE 159 open my $fh, "<", $RUNTIMEFILE
143 or die "unable to read $RUNTIMEFILE file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
144 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
145} 162}
146 163
164eval "sub TICK() { $TICK } 1" or die;
165
147mkdir $_ 166mkdir $_
148 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
149 168
150our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
151 170
152sub 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::"} };
153 187
154############################################################################# 188#############################################################################
155 189
156=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
157 191
199from wherever your confdir points to. 233from wherever your confdir points to.
200 234
201=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
202 236
203These 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
204returns 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
205per 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.
206 240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
207=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
208 247
209This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
210C<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
211that call. 250that call.
212 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
213=back 258=back
214 259
215=cut 260=cut
216 261
217BEGIN { 262sub error(@) { LOG llevError, join "", @_ }
218 *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 {
219 my $msg = join "", @_; 269 my $msg = join "", @_;
220 270
221 $msg .= "\n" 271 $msg .= "\n"
222 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
223 273
224 $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;
225 275
226 LOG llevError, $msg; 276 LOG llevWarn, $msg;
227 }; 277};
228}
229 278
230$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
231 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
232 281
233 if ($Coro::current == $Coro::main) {#d# 282 error Carp::longmess $_[0];
283
284 if (in_main) {#d#
234 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
235 return;#d# 286 return;#d#
236 }#d# 287 }#d#
237 288
238 # kill coroutine otherwise 289 # kill coroutine otherwise
239 warn Carp::longmess $_[0];
240 Coro::terminate 290 Coro::terminate
241}; 291};
242
243$SIG{__DIE__} = sub { }; #d#?
244 292
245@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 293@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
246@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 294@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
247@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 295@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
248@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 296@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
262)) { 310)) {
263 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
264} 312}
265 313
266$EV::DIED = sub { 314$EV::DIED = sub {
267 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
268}; 316};
269 317
270############################################################################# 318#############################################################################
271 319
272=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
309our $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
310 358
311sub encode_json($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
312sub decode_json($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
313 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
314=item cf::post_init { BLOCK } 374=item cf::post_init { BLOCK }
315 375
316Execute the given codeblock, I<after> all extensions have been (re-)loaded, 376Execute the given codeblock, I<after> all extensions have been (re-)loaded,
317but I<before> the server starts ticking again. 377but I<before> the server starts ticking again.
318 378
319The cdoeblock will have a single boolean argument to indicate whether this 379The codeblock will have a single boolean argument to indicate whether this
320is a reload or not. 380is a reload or not.
321 381
322=cut 382=cut
323 383
324sub post_init(&) { 384sub post_init(&) {
325 push @POST_INIT, shift; 385 push @POST_INIT, shift;
326} 386}
327 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
328=item cf::lock_wait $string 405=item cf::lock_wait $string
329 406
330Wait until the given lock is available. See cf::lock_acquire. 407Wait until the given lock is available. See cf::lock_acquire.
331 408
332=item my $lock = cf::lock_acquire $string 409=item my $lock = cf::lock_acquire $string
333 410
334Wait 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
335a 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,
336for example when the coroutine gets canceled), the lock is automatically 413for example when the coroutine gets canceled), the lock is automatically
337returned. 414returned.
338 415
339Locks 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
340deadlocked coro. 417deadlocked coro.
346 423
347Return 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.
348 425
349=cut 426=cut
350 427
351our %LOCK; 428our $LOCKS = new Coro::SemaphoreSet;
352our %LOCKER;#d#
353 429
354sub lock_wait($) { 430sub lock_wait($) {
355 my ($key) = @_; 431 $LOCKS->wait ($_[0]);
356
357 if ($LOCKER{$key} == $Coro::current) {#d#
358 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
359 return;#d#
360 }#d#
361
362 # wait for lock, if any
363 while ($LOCK{$key}) {
364 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
365 push @{ $LOCK{$key} }, $Coro::current;
366 Coro::schedule;
367 }
368} 432}
369 433
370sub lock_acquire($) { 434sub lock_acquire($) {
371 my ($key) = @_; 435 $LOCKS->guard ($_[0])
372
373 # wait, to be sure we are not locked
374 lock_wait $key;
375
376 $LOCK{$key} = [];
377 $LOCKER{$key} = $Coro::current;#d#
378
379 Coro::guard {
380 delete $LOCKER{$key};#d#
381 # wake up all waiters, to be on the safe side
382 $_->ready for @{ delete $LOCK{$key} };
383 }
384} 436}
385 437
386sub lock_active($) { 438sub lock_active($) {
387 my ($key) = @_; 439 $LOCKS->count ($_[0]) < 1
388
389 ! ! $LOCK{$key}
390} 440}
391 441
392sub freeze_mainloop { 442sub freeze_mainloop {
393 tick_inhibit_inc; 443 tick_inhibit_inc;
394 444
395 Coro::guard \&tick_inhibit_dec; 445 &Guard::guard (\&tick_inhibit_dec);
396} 446}
397 447
398=item cf::periodic $interval, $cb 448=item cf::periodic $interval, $cb
399 449
400Like 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
401get spread over timer. 451get spread over time.
402 452
403=cut 453=cut
404 454
405sub periodic($$) { 455sub periodic($$) {
406 my ($interval, $cb) = @_; 456 my ($interval, $cb) = @_;
423 473
424=cut 474=cut
425 475
426our @SLOT_QUEUE; 476our @SLOT_QUEUE;
427our $SLOT_QUEUE; 477our $SLOT_QUEUE;
478our $SLOT_DECAY = 0.9;
428 479
429$SLOT_QUEUE->cancel if $SLOT_QUEUE; 480$SLOT_QUEUE->cancel if $SLOT_QUEUE;
430$SLOT_QUEUE = Coro::async { 481$SLOT_QUEUE = Coro::async {
431 $Coro::current->desc ("timeslot manager"); 482 $Coro::current->desc ("timeslot manager");
432 483
433 my $signal = new Coro::Signal; 484 my $signal = new Coro::Signal;
485 my $busy;
434 486
435 while () { 487 while () {
436 next_job: 488 next_job:
489
437 my $avail = cf::till_tick; 490 my $avail = cf::till_tick;
438 if ($avail > 0.01) { 491
439 for (0 .. $#SLOT_QUEUE) { 492 for (0 .. $#SLOT_QUEUE) {
440 if ($SLOT_QUEUE[$_][0] < $avail) { 493 if ($SLOT_QUEUE[$_][0] <= $avail) {
494 $busy = 0;
441 my $job = splice @SLOT_QUEUE, $_, 1, (); 495 my $job = splice @SLOT_QUEUE, $_, 1, ();
442 $job->[2]->send; 496 $job->[2]->send;
443 Coro::cede; 497 Coro::cede;
444 goto next_job; 498 goto next_job;
445 } 499 } else {
500 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
446 } 501 }
447 } 502 }
448 503
449 if (@SLOT_QUEUE) { 504 if (@SLOT_QUEUE) {
450 # 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
451 push @cf::WAIT_FOR_TICK, $signal; 506 push @cf::WAIT_FOR_TICK, $signal;
452 $signal->wait; 507 $signal->wait;
453 } else { 508 } else {
509 $busy = 0;
454 Coro::schedule; 510 Coro::schedule;
455 } 511 }
456 } 512 }
457}; 513};
458 514
459sub get_slot($;$$) { 515sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main; 516 return if tick_inhibit || $Coro::current == $Coro::main;
461 517
462 my ($time, $pri, $name) = @_; 518 my ($time, $pri, $name) = @_;
463 519
464 $time = $TICK * .6 if $time > $TICK * .6; 520 $time = clamp $time, 0.01, $TICK * .6;
521
465 my $sig = new Coro::Signal; 522 my $sig = new Coro::Signal;
466 523
467 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 524 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
468 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 525 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
469 $SLOT_QUEUE->ready; 526 $SLOT_QUEUE->ready;
495=cut 552=cut
496 553
497sub sync_job(&) { 554sub sync_job(&) {
498 my ($job) = @_; 555 my ($job) = @_;
499 556
500 if ($Coro::current == $Coro::main) { 557 if (in_main) {
501 my $time = EV::time; 558 my $time = AE::time;
502 559
503 # this is the main coro, too bad, we have to block 560 # this is the main coro, too bad, we have to block
504 # till the operation succeeds, freezing the server :/ 561 # till the operation succeeds, freezing the server :/
505 562
506 LOG llevError, Carp::longmess "sync job";#d# 563 #LOG llevError, Carp::longmess "sync job";#d#
507 564
508 my $freeze_guard = freeze_mainloop; 565 my $freeze_guard = freeze_mainloop;
509 566
510 my $busy = 1; 567 my $busy = 1;
511 my @res; 568 my @res;
512 569
513 (async { 570 (async {
514 $Coro::current->desc ("sync job coro"); 571 $Coro::current->desc ("sync job coro");
515 @res = eval { $job->() }; 572 @res = eval { $job->() };
516 warn $@ if $@; 573 error $@ if $@;
517 undef $busy; 574 undef $busy;
518 })->prio (Coro::PRIO_MAX); 575 })->prio (Coro::PRIO_MAX);
519 576
520 while ($busy) { 577 while ($busy) {
521 if (Coro::nready) { 578 if (Coro::nready) {
523 } else { 580 } else {
524 EV::loop EV::LOOP_ONESHOT; 581 EV::loop EV::LOOP_ONESHOT;
525 } 582 }
526 } 583 }
527 584
528 my $time = EV::time - $time; 585 my $time = AE::time - $time;
529 586
530 $TICK_START += $time; # do not account sync jobs to server load 587 $TICK_START += $time; # do not account sync jobs to server load
531 588
532 wantarray ? @res : $res[0] 589 wantarray ? @res : $res[0]
533 } else { 590 } else {
555 $EXT_CORO{$coro+0} = $coro; 612 $EXT_CORO{$coro+0} = $coro;
556 613
557 $coro 614 $coro
558} 615}
559 616
560=item fork_call { }, $args 617=item fork_call { }, @args
561 618
562Executes the given code block with the given arguments in a seperate 619Executes the given code block with the given arguments in a seperate
563process, returning the results. Everything must be serialisable with 620process, returning the results. Everything must be serialisable with
564Coro::Storable. May, of course, block. Note that the executed sub may 621Coro::Storable. May, of course, block. Note that the executed sub may
565never block itself or use any form of event handling. 622never block itself or use any form of event handling.
566 623
567=cut 624=cut
568 625
626sub post_fork {
627 reset_signals;
628}
629
569sub fork_call(&@) { 630sub fork_call(&@) {
570 my ($cb, @args) = @_; 631 my ($cb, @args) = @_;
571 632
572 # 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,
573 # otherwise perl prematurely frees the stuff :/ 634 # otherwise perl prematurely frees the stuff :/
574 # TODO: investigate and fix (likely this will be rather laborious) 635 # TODO: investigate and fix (likely this will be rather laborious)
575 636
576 my @res = Coro::Util::fork_eval { 637 my @res = Coro::Util::fork_eval {
577 reset_signals; 638 cf::post_fork;
578 &$cb 639 &$cb
579 }, @args; 640 } @args;
580 641
581 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 )
582} 654}
583 655
584=item $coin = coin_from_name $name 656=item $coin = coin_from_name $name
585 657
586=cut 658=cut
623within each server. 695within each server.
624 696
625=cut 697=cut
626 698
627sub db_table($) { 699sub db_table($) {
700 cf::error "db_get called from main context"
701 if $Coro::current == $Coro::main;
702
628 my ($name) = @_; 703 my ($name) = @_;
629 my $db = BDB::db_create $DB_ENV; 704 my $db = BDB::db_create $DB_ENV;
630 705
631 eval { 706 eval {
632 $db->set_flags (BDB::CHKSUM); 707 $db->set_flags (BDB::CHKSUM);
642} 717}
643 718
644our $DB; 719our $DB;
645 720
646sub db_init { 721sub db_init {
647 cf::sync_job {
648 $DB ||= db_table "db"; 722 $DB ||= db_table "db";
649 };
650} 723}
651 724
652sub db_get($$) { 725sub db_get($$) {
653 my $key = "$_[0]/$_[1]"; 726 my $key = "$_[0]/$_[1]";
654 727
655 cf::sync_job { 728 cf::error "db_get called from main context"
729 if $Coro::current == $Coro::main;
730
656 BDB::db_get $DB, undef, $key, my $data; 731 BDB::db_get $DB, undef, $key, my $data;
657 732
658 $! ? () 733 $! ? ()
659 : $data 734 : $data
660 }
661} 735}
662 736
663sub db_put($$$) { 737sub db_put($$$) {
664 BDB::dbreq_pri 4; 738 BDB::dbreq_pri 4;
665 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 739 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
721 795
722 my $t1 = Time::HiRes::time; 796 my $t1 = Time::HiRes::time;
723 my $data = $process->(\@data); 797 my $data = $process->(\@data);
724 my $t2 = Time::HiRes::time; 798 my $t2 = Time::HiRes::time;
725 799
726 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 800 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
727 801
728 db_put cache => "$id/data", $data; 802 db_put cache => "$id/data", $data;
729 db_put cache => "$id/md5" , $md5; 803 db_put cache => "$id/md5" , $md5;
730 db_put cache => "$id/meta", $meta; 804 db_put cache => "$id/meta", $meta;
731 805
741 815
742=cut 816=cut
743 817
744sub datalog($@) { 818sub datalog($@) {
745 my ($type, %kv) = @_; 819 my ($type, %kv) = @_;
746 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 820 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
747} 821}
748 822
749=back 823=back
750 824
751=cut 825=cut
946 1020
947 } elsif (exists $cb_id{$type}) { 1021 } elsif (exists $cb_id{$type}) {
948 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1022 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
949 1023
950 } elsif (ref $type) { 1024 } elsif (ref $type) {
951 warn "attaching objects not supported, ignoring.\n"; 1025 error "attaching objects not supported, ignoring.\n";
952 1026
953 } else { 1027 } else {
954 shift @arg; 1028 shift @arg;
955 warn "attach argument '$type' not supported, ignoring.\n"; 1029 error "attach argument '$type' not supported, ignoring.\n";
956 } 1030 }
957 } 1031 }
958} 1032}
959 1033
960sub _object_attach { 1034sub _object_attach {
970 _attach $registry, $klass, @attach; 1044 _attach $registry, $klass, @attach;
971 } 1045 }
972 1046
973 $obj->{$name} = \%arg; 1047 $obj->{$name} = \%arg;
974 } else { 1048 } else {
975 warn "object uses attachment '$name' which is not available, postponing.\n"; 1049 info "object uses attachment '$name' which is not available, postponing.\n";
976 } 1050 }
977 1051
978 $obj->{_attachment}{$name} = undef; 1052 $obj->{_attachment}{$name} = undef;
979} 1053}
980 1054
1039 1113
1040 for (@$callbacks) { 1114 for (@$callbacks) {
1041 eval { &{$_->[1]} }; 1115 eval { &{$_->[1]} };
1042 1116
1043 if ($@) { 1117 if ($@) {
1044 warn "$@";
1045 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1118 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1046 override; 1119 override;
1047 } 1120 }
1048 1121
1049 return 1 if $override; 1122 return 1 if $override;
1050 } 1123 }
1129 for (@$attach) { 1202 for (@$attach) {
1130 my ($klass, @attach) = @$_; 1203 my ($klass, @attach) = @$_;
1131 _attach $registry, $klass, @attach; 1204 _attach $registry, $klass, @attach;
1132 } 1205 }
1133 } else { 1206 } else {
1134 warn "object uses attachment '$name' that is not available, postponing.\n"; 1207 info "object uses attachment '$name' that is not available, postponing.\n";
1135 } 1208 }
1136 } 1209 }
1137} 1210}
1138 1211
1139cf::attachable->attach ( 1212cf::attachable->attach (
1166 my ($filename, $rdata, $objs) = @_; 1239 my ($filename, $rdata, $objs) = @_;
1167 1240
1168 sync_job { 1241 sync_job {
1169 if (length $$rdata) { 1242 if (length $$rdata) {
1170 utf8::decode (my $decname = $filename); 1243 utf8::decode (my $decname = $filename);
1171 warn sprintf "saving %s (%d,%d)\n", 1244 trace sprintf "saving %s (%d,%d)\n",
1172 $decname, length $$rdata, scalar @$objs; 1245 $decname, length $$rdata, scalar @$objs
1246 if $VERBOSE_IO;
1173 1247
1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1248 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1175 aio_chmod $fh, SAVE_MODE; 1249 aio_chmod $fh, SAVE_MODE;
1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1250 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1177 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 }
1178 aio_close $fh; 1255 aio_close $fh;
1179 1256
1180 if (@$objs) { 1257 if (@$objs) {
1181 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) {
1182 aio_chmod $fh, SAVE_MODE; 1259 aio_chmod $fh, SAVE_MODE;
1183 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1260 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1184 aio_write $fh, 0, (length $data), $data, 0; 1261 aio_write $fh, 0, (length $data), $data, 0;
1185 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 }
1186 aio_close $fh; 1266 aio_close $fh;
1187 aio_rename "$filename.pst~", "$filename.pst"; 1267 aio_rename "$filename.pst~", "$filename.pst";
1188 } 1268 }
1189 } else { 1269 } else {
1190 aio_unlink "$filename.pst"; 1270 aio_unlink "$filename.pst";
1193 aio_rename "$filename~", $filename; 1273 aio_rename "$filename~", $filename;
1194 1274
1195 $filename =~ s%/[^/]+$%%; 1275 $filename =~ s%/[^/]+$%%;
1196 aio_pathsync $filename if $cf::USE_FSYNC; 1276 aio_pathsync $filename if $cf::USE_FSYNC;
1197 } else { 1277 } else {
1198 warn "FATAL: $filename~: $!\n"; 1278 error "unable to save objects: $filename~: $!\n";
1199 } 1279 }
1200 } else { 1280 } else {
1201 aio_unlink $filename; 1281 aio_unlink $filename;
1202 aio_unlink "$filename.pst"; 1282 aio_unlink "$filename.pst";
1203 } 1283 }
1227 my $st = eval { Coro::Storable::thaw $av }; 1307 my $st = eval { Coro::Storable::thaw $av };
1228 $av = $st->{objs}; 1308 $av = $st->{objs};
1229 } 1309 }
1230 1310
1231 utf8::decode (my $decname = $filename); 1311 utf8::decode (my $decname = $filename);
1232 warn sprintf "loading %s (%d,%d)\n", 1312 trace sprintf "loading %s (%d,%d)\n",
1233 $decname, length $data, scalar @{$av || []}; 1313 $decname, length $data, scalar @{$av || []}
1314 if $VERBOSE_IO;
1234 1315
1235 ($data, $av) 1316 ($data, $av)
1236} 1317}
1237 1318
1238=head2 COMMAND CALLBACKS 1319=head2 COMMAND CALLBACKS
1297} 1378}
1298 1379
1299use File::Glob (); 1380use File::Glob ();
1300 1381
1301cf::player->attach ( 1382cf::player->attach (
1302 on_command => sub { 1383 on_unknown_command => sub {
1303 my ($pl, $name, $params) = @_; 1384 my ($pl, $name, $params) = @_;
1304 1385
1305 my $cb = $COMMAND{$name} 1386 my $cb = $COMMAND{$name}
1306 or return; 1387 or return;
1307 1388
1330 1411
1331 $pl->ext_reply ($reply, @reply) 1412 $pl->ext_reply ($reply, @reply)
1332 if $reply; 1413 if $reply;
1333 1414
1334 } else { 1415 } else {
1335 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1416 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1336 } 1417 }
1337 1418
1338 cf::override; 1419 cf::override;
1339 }, 1420 },
1340); 1421);
1341 1422
1342# "readahead" all extensions 1423# "readahead" all extensions
1343sub cache_extensions { 1424sub cache_extensions {
1344 my $grp = IO::AIO::aio_group; 1425 my $grp = IO::AIO::aio_group;
1345 1426
1346 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1427 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1347 for (grep /\.ext$/, @{$_[0]}) { 1428 for (grep /\.ext$/, @{$_[0]}) {
1348 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1429 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1349 } 1430 }
1350 }; 1431 };
1351 1432
1352 $grp 1433 $grp
1353} 1434}
1354 1435
1355sub load_extensions { 1436sub load_extensions {
1437 info "loading extensions...";
1438
1356 cf::sync_job { 1439 cf::sync_job {
1357 my %todo; 1440 my %todo;
1358 1441
1359 for my $path (<$LIBDIR/*.ext>) { 1442 for my $path (<$LIBDIR/*.ext>) {
1360 next unless -r $path; 1443 next unless -r $path;
1378 1461
1379 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1462 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1380 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1463 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1381 1464
1382 $ext{source} = 1465 $ext{source} =
1383 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1466 "package $pkg; use common::sense;\n"
1384 . "#line 1 \"$path\"\n{\n" 1467 . "#line 1 \"$path\"\n{\n"
1385 . $source 1468 . $source
1386 . "\n};\n1"; 1469 . "\n};\n1";
1387 1470
1388 $todo{$base} = \%ext; 1471 $todo{$base} = \%ext;
1389 } 1472 }
1390 1473
1474 my $pass = 0;
1391 my %done; 1475 my %done;
1392 while (%todo) { 1476 while (%todo) {
1393 my $progress; 1477 my $progress;
1394 1478
1479 ++$pass;
1480
1481 ext:
1395 while (my ($k, $v) = each %todo) { 1482 while (my ($k, $v) = each %todo) {
1396 for (split /,\s*/, $v->{meta}{depends}) { 1483 for (split /,\s*/, $v->{meta}{depends}) {
1397 goto skip 1484 next ext
1398 unless exists $done{$_}; 1485 unless exists $done{$_};
1399 } 1486 }
1400 1487
1401 warn "... loading '$k' into '$v->{pkg}'\n"; 1488 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1402 1489
1403 unless (eval $v->{source}) { 1490 my $active = eval $v->{source};
1491
1492 if (length $@) {
1404 my $msg = $@ ? "$v->{path}: $@\n" 1493 error "$v->{path}: $@\n";
1405 : "$v->{base}: extension inactive.\n";
1406 1494
1407 if (exists $v->{meta}{mandatory}) {
1408 warn $msg;
1409 cf::cleanup "mandatory extension failed to load, exiting."; 1495 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1410 } 1496 if exists $v->{meta}{mandatory};
1411 1497
1412 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;
1413 } 1507 }
1414
1415 $done{$k} = delete $todo{$k};
1416 push @EXTS, $v->{pkg};
1417 $progress = 1;
1418 } 1508 }
1419 1509
1420 skip: 1510 unless ($progress) {
1421 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1511 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1422 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 }
1423 } 1518 }
1424 }; 1519 };
1425} 1520}
1426 1521
1427############################################################################# 1522#############################################################################
1511 $cf::PLAYER{$login} = $pl 1606 $cf::PLAYER{$login} = $pl
1512 } 1607 }
1513 } 1608 }
1514} 1609}
1515 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
1516sub save($) { 1624sub save($) {
1517 my ($pl) = @_; 1625 my ($pl) = @_;
1518 1626
1519 return if $pl->{deny_save}; 1627 return if $pl->{deny_save};
1520 1628
1525 1633
1526 aio_mkdir playerdir $pl, 0770; 1634 aio_mkdir playerdir $pl, 0770;
1527 $pl->{last_save} = $cf::RUNTIME; 1635 $pl->{last_save} = $cf::RUNTIME;
1528 1636
1529 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];
1530 1641
1531 $pl->save_pl ($path); 1642 $pl->save_pl ($path);
1532 cf::cede_to_tick; 1643 cf::cede_to_tick;
1533} 1644}
1534 1645
1568 my $name = $pl->ob->name; 1679 my $name = $pl->ob->name;
1569 1680
1570 $pl->{deny_save} = 1; 1681 $pl->{deny_save} = 1;
1571 $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
1572 1683
1573 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1684 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1574 $pl->deactivate; 1685 $pl->deactivate;
1686
1575 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;
1576 $pl->ob->check_score;
1577 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1688 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1689 ext::highscore::check ($pl->ob);
1690
1578 $pl->ns->destroy if $pl->ns; 1691 $pl->ns->destroy if $pl->ns;
1579 1692
1580 my $path = playerdir $pl; 1693 my $path = playerdir $pl;
1581 my $temp = "$path~$cf::RUNTIME~deleting~"; 1694 my $temp = "$path~$cf::RUNTIME~deleting~";
1582 aio_rename $path, $temp; 1695 aio_rename $path, $temp;
1636 \@logins 1749 \@logins
1637} 1750}
1638 1751
1639=item $player->maps 1752=item $player->maps
1640 1753
1754=item cf::player::maps $login
1755
1641Returns an arrayref of map paths that are private for this 1756Returns an arrayref of map paths that are private for this
1642player. May block. 1757player. May block.
1643 1758
1644=cut 1759=cut
1645 1760
1707=cut 1822=cut
1708 1823
1709sub find_by_path($) { 1824sub find_by_path($) {
1710 my ($path) = @_; 1825 my ($path) = @_;
1711 1826
1827 $path =~ s/^~[^\/]*//; # skip ~login
1828
1712 my ($match, $specificity); 1829 my ($match, $specificity);
1713 1830
1714 for my $region (list) { 1831 for my $region (list) {
1715 if ($region->{match} && $path =~ $region->{match}) { 1832 if ($region->{match} && $path =~ $region->{match}) {
1716 ($match, $specificity) = ($region, $region->specificity) 1833 ($match, $specificity) = ($region, $region->specificity)
1744sub generate_random_map { 1861sub generate_random_map {
1745 my ($self, $rmp) = @_; 1862 my ($self, $rmp) = @_;
1746 1863
1747 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
1748 1865
1749 # mit "rum" bekleckern, nicht
1750 $self->_create_random_map ( 1866 $self->_create_random_map ($rmp);
1751 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1752 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1753 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1754 $rmp->{exit_on_final_map},
1755 $rmp->{xsize}, $rmp->{ysize},
1756 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1757 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1758 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1759 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1760 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1761 (cf::region::find $rmp->{region}), $rmp->{custom}
1762 )
1763} 1867}
1764 1868
1765=item cf::map->register ($regex, $prio) 1869=item cf::map->register ($regex, $prio)
1766 1870
1767Register 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
1772 1876
1773sub register { 1877sub register {
1774 my (undef, $regex, $prio) = @_; 1878 my (undef, $regex, $prio) = @_;
1775 my $pkg = caller; 1879 my $pkg = caller;
1776 1880
1777 no strict;
1778 push @{"$pkg\::ISA"}, __PACKAGE__; 1881 push @{"$pkg\::ISA"}, __PACKAGE__;
1779 1882
1780 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1883 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1781} 1884}
1782 1885
1783# also paths starting with '/' 1886# also paths starting with '/'
1784$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1887$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1785 1888
1786sub thawer_merge { 1889sub thawer_merge {
1787 my ($self, $merge) = @_; 1890 my ($self, $merge) = @_;
1788 1891
1789 # we have to keep some variables in memory intact 1892 # we have to keep some variables in memory intact
1794} 1897}
1795 1898
1796sub normalise { 1899sub normalise {
1797 my ($path, $base) = @_; 1900 my ($path, $base) = @_;
1798 1901
1799 $path = "$path"; # make sure its a string 1902 $path = "$path"; # make sure it's a string
1800 1903
1801 $path =~ s/\.map$//; 1904 $path =~ s/\.map$//;
1802 1905
1803 # map plan: 1906 # map plan:
1804 # 1907 #
1819 $base =~ s{[^/]+/?$}{}; 1922 $base =~ s{[^/]+/?$}{};
1820 $path = "$base/$path"; 1923 $path = "$base/$path";
1821 } 1924 }
1822 1925
1823 for ($path) { 1926 for ($path) {
1824 redo if s{//}{/};
1825 redo if s{/\.?/}{/}; 1927 redo if s{/\.?/}{/};
1826 redo if s{/[^/]+/\.\./}{/}; 1928 redo if s{/[^/]+/\.\./}{/};
1827 } 1929 }
1828 1930
1829 $path 1931 $path
1843 $self->init; # pass $1 etc. 1945 $self->init; # pass $1 etc.
1844 return $self; 1946 return $self;
1845 } 1947 }
1846 } 1948 }
1847 1949
1848 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1950 Carp::cluck "unable to resolve path '$path' (base '$base')";
1849 () 1951 ()
1850} 1952}
1851 1953
1852sub init { 1954sub init {
1853 my ($self) = @_; 1955 my ($self) = @_;
1885sub uniq_path { 1987sub uniq_path {
1886 my ($self) = @_; 1988 my ($self) = @_;
1887 1989
1888 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1990 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1889 "$UNIQUEDIR/$path" 1991 "$UNIQUEDIR/$path"
1890}
1891
1892# and all this just because we cannot iterate over
1893# all maps in C++...
1894sub change_all_map_light {
1895 my ($change) = @_;
1896
1897 $_->change_map_light ($change)
1898 for grep $_->outdoor, values %cf::MAP;
1899} 1992}
1900 1993
1901sub decay_objects { 1994sub decay_objects {
1902 my ($self) = @_; 1995 my ($self) = @_;
1903 1996
1985 2078
1986sub find; 2079sub find;
1987sub find { 2080sub find {
1988 my ($path, $origin) = @_; 2081 my ($path, $origin) = @_;
1989 2082
2083 cf::cede_to_tick;
2084
1990 $path = normalise $path, $origin && $origin->path; 2085 $path = normalise $path, $origin && $origin->path;
1991 2086
1992 cf::lock_wait "map_data:$path";#d#remove 2087 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1993 cf::lock_wait "map_find:$path"; 2088 my $guard2 = cf::lock_acquire "map_find:$path";
1994 2089
1995 $cf::MAP{$path} || do { 2090 $cf::MAP{$path} || do {
1996 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1997 my $guard2 = cf::lock_acquire "map_find:$path";
1998
1999 my $map = new_from_path cf::map $path 2091 my $map = new_from_path cf::map $path
2000 or return; 2092 or return;
2001 2093
2002 $map->{last_save} = $cf::RUNTIME; 2094 $map->{last_save} = $cf::RUNTIME;
2003 2095
2015 2107
2016 $cf::MAP{$path} = $map 2108 $cf::MAP{$path} = $map
2017 } 2109 }
2018} 2110}
2019 2111
2020sub pre_load { } 2112sub pre_load { }
2021sub post_load { } 2113#sub post_load { } # XS
2022 2114
2023sub load { 2115sub load {
2024 my ($self) = @_; 2116 my ($self) = @_;
2025 2117
2026 local $self->{deny_reset} = 1; # loading can take a long time 2118 local $self->{deny_reset} = 1; # loading can take a long time
2071 unless ($self->{deny_activate}) { 2163 unless ($self->{deny_activate}) {
2072 $self->decay_objects; 2164 $self->decay_objects;
2073 $self->fix_auto_apply; 2165 $self->fix_auto_apply;
2074 $self->update_buttons; 2166 $self->update_buttons;
2075 cf::cede_to_tick; 2167 cf::cede_to_tick;
2076 $self->set_darkness_map;
2077 cf::cede_to_tick;
2078 $self->activate; 2168 $self->activate;
2079 } 2169 }
2080 2170
2081 $self->{last_save} = $cf::RUNTIME; 2171 $self->{last_save} = $cf::RUNTIME;
2082 $self->last_access ($cf::RUNTIME); 2172 $self->last_access ($cf::RUNTIME);
2083 2173
2084 $self->in_memory (cf::MAP_ACTIVE); 2174 $self->in_memory (cf::MAP_ACTIVE);
2085 } 2175 }
2086 2176
2087 $self->post_load; 2177 $self->post_load;
2088}
2089 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
2090sub customise_for { 2185sub customise_for {
2091 my ($self, $ob) = @_; 2186 my ($self, $ob) = @_;
2092 2187
2093 return find "~" . $ob->name . "/" . $self->{path} 2188 return find "~" . $ob->name . "/" . $self->{path}
2094 if $self->per_player; 2189 if $self->per_player;
2110 or next; 2205 or next;
2111 $neigh = find $neigh, $map 2206 $neigh = find $neigh, $map
2112 or next; 2207 or next;
2113 $neigh->load; 2208 $neigh->load;
2114 2209
2210 # now find the diagonal neighbours
2115 push @neigh, 2211 push @neigh,
2116 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2212 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2117 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2213 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2118 } 2214 }
2119 2215
2126} 2222}
2127 2223
2128sub find_sync { 2224sub find_sync {
2129 my ($path, $origin) = @_; 2225 my ($path, $origin) = @_;
2130 2226
2131 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
2132} 2231}
2133 2232
2134sub do_load_sync { 2233sub do_load_sync {
2135 my ($map) = @_; 2234 my ($map) = @_;
2136 2235
2137 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2236 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2138 if $Coro::current == $Coro::main; 2237 if $Coro::current == $Coro::main;
2139 2238
2140 cf::sync_job { $map->load }; 2239 $map->load;
2141} 2240}
2142 2241
2143our %MAP_PREFETCH; 2242our %MAP_PREFETCH;
2144our $MAP_PREFETCHER = undef; 2243our $MAP_PREFETCHER = undef;
2145 2244
2171 $MAP_PREFETCHER->prio (6); 2270 $MAP_PREFETCHER->prio (6);
2172 2271
2173 () 2272 ()
2174} 2273}
2175 2274
2275# common code, used by both ->save and ->swapout
2176sub save { 2276sub _save {
2177 my ($self) = @_; 2277 my ($self) = @_;
2178
2179 my $lock = cf::lock_acquire "map_data:$self->{path}";
2180 2278
2181 $self->{last_save} = $cf::RUNTIME; 2279 $self->{last_save} = $cf::RUNTIME;
2182 2280
2183 return unless $self->dirty; 2281 return unless $self->dirty;
2184 2282
2204 } else { 2302 } else {
2205 $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);
2206 } 2304 }
2207} 2305}
2208 2306
2307sub save {
2308 my ($self) = @_;
2309
2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311
2312 $self->_save;
2313}
2314
2209sub swap_out { 2315sub swap_out {
2210 my ($self) = @_; 2316 my ($self) = @_;
2211 2317
2212 # save first because save cedes
2213 $self->save;
2214
2215 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2318 my $lock = cf::lock_acquire "map_data:$self->{path}";
2216 2319
2217 return if $self->players;
2218 return if $self->in_memory != cf::MAP_ACTIVE; 2320 return if $self->in_memory != cf::MAP_ACTIVE;
2219 return if $self->{deny_save}; 2321 return if $self->{deny_save};
2322 return if $self->players;
2220 2323
2324 # first deactivate the map and "unlink" it from the core
2325 $self->deactivate;
2326 $_->clear_links_to ($self) for values %cf::MAP;
2221 $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};
2222 2374
2223 $self->deactivate; 2375 $self->deactivate;
2224 $_->clear_links_to ($self) for values %cf::MAP; 2376 $_->clear_links_to ($self) for values %cf::MAP;
2225 $self->clear; 2377 $self->clear;
2226}
2227
2228sub reset_at {
2229 my ($self) = @_;
2230
2231 # TODO: safety, remove and allow resettable per-player maps
2232 return 1e99 if $self->{deny_reset};
2233
2234 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2235 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2236
2237 $time + $to
2238}
2239
2240sub should_reset {
2241 my ($self) = @_;
2242
2243 $self->reset_at <= $cf::RUNTIME
2244}
2245
2246sub reset {
2247 my ($self) = @_;
2248
2249 my $lock = cf::lock_acquire "map_data:$self->{path}";
2250
2251 return if $self->players;
2252
2253 warn "resetting map ", $self->path;
2254
2255 $self->in_memory (cf::MAP_SWAPPED);
2256
2257 # need to save uniques path
2258 unless ($self->{deny_save}) {
2259 my $uniq = $self->uniq_path; utf8::encode $uniq;
2260
2261 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2262 if $uniq;
2263 }
2264
2265 delete $cf::MAP{$self->path};
2266
2267 $self->deactivate;
2268 $_->clear_links_to ($self) for values %cf::MAP;
2269 $self->clear;
2270 2378
2271 $self->unlink_save; 2379 $self->unlink_save;
2272 $self->destroy; 2380 $self->destroy;
2273} 2381}
2274 2382
2282 2390
2283 delete $cf::MAP{$self->path}; 2391 delete $cf::MAP{$self->path};
2284 2392
2285 $self->unlink_save; 2393 $self->unlink_save;
2286 2394
2287 bless $self, "cf::map"; 2395 bless $self, "cf::map::wrap";
2288 delete $self->{deny_reset}; 2396 delete $self->{deny_reset};
2289 $self->{deny_save} = 1; 2397 $self->{deny_save} = 1;
2290 $self->reset_timeout (1); 2398 $self->reset_timeout (1);
2291 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2399 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2292 2400
2349 : normalise $_ 2457 : normalise $_
2350 } @{ aio_readdir $UNIQUEDIR or [] } 2458 } @{ aio_readdir $UNIQUEDIR or [] }
2351 ] 2459 ]
2352} 2460}
2353 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
2354=back 2494=back
2355 2495
2356=head3 cf::object 2496=head3 cf::object
2357 2497
2358=cut 2498=cut
2423 2563
2424our $SAY_CHANNEL = { 2564our $SAY_CHANNEL = {
2425 id => "say", 2565 id => "say",
2426 title => "Map", 2566 title => "Map",
2427 reply => "say ", 2567 reply => "say ",
2428 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.",
2429}; 2569};
2430 2570
2431our $CHAT_CHANNEL = { 2571our $CHAT_CHANNEL = {
2432 id => "chat", 2572 id => "chat",
2433 title => "Chat", 2573 title => "Chat",
2490 2630
2491Freezes 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}>).
2492 2632
2493The 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.
2494for 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,
2495though, 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
2496map. 2636map.
2497 2637
2498Will never block. 2638Will never block.
2499 2639
2500=item $player_object->leave_link ($map, $x, $y) 2640=item $player_object->leave_link ($map, $x, $y)
2521sub cf::object::player::enter_link { 2661sub cf::object::player::enter_link {
2522 my ($self) = @_; 2662 my ($self) = @_;
2523 2663
2524 $self->deactivate_recursive; 2664 $self->deactivate_recursive;
2525 2665
2666 ++$self->{_link_recursion};
2667
2526 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2668 return if UNIVERSAL::isa $self->map, "ext::map_link";
2527 2669
2528 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2670 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2529 if $self->map && $self->map->{path} ne "{link}"; 2671 if $self->map && $self->map->{path} ne "{link}";
2530 2672
2531 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2673 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2532} 2674}
2533 2675
2534sub cf::object::player::leave_link { 2676sub cf::object::player::leave_link {
2535 my ($self, $map, $x, $y) = @_; 2677 my ($self, $map, $x, $y) = @_;
2536 2678
2553 ($x, $y) = (-1, -1) 2695 ($x, $y) = (-1, -1)
2554 unless (defined $x) && (defined $y); 2696 unless (defined $x) && (defined $y);
2555 2697
2556 # use -1 or undef as default coordinates, not 0, 0 2698 # use -1 or undef as default coordinates, not 0, 0
2557 ($x, $y) = ($map->enter_x, $map->enter_y) 2699 ($x, $y) = ($map->enter_x, $map->enter_y)
2558 if $x <=0 && $y <= 0; 2700 if $x <= 0 && $y <= 0;
2559 2701
2560 $map->load; 2702 $map->load;
2561 $map->load_neighbours; 2703 $map->load_neighbours;
2562 2704
2563 return unless $self->contr->active; 2705 return unless $self->contr->active;
2564 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2565 $self->activate_recursive;
2566 2706
2567 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2707 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2568 $self->enter_map ($map, $x, $y); 2708 if ($self->enter_map ($map, $x, $y)) {
2569} 2709 # entering was successful
2710 delete $self->{_link_recursion};
2711 # only activate afterwards, to support waiting in hooks
2712 $self->activate_recursive;
2713 }
2570 2714
2715}
2716
2571=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)]])
2572 2718
2573Moves 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
2574her, loading and preparing them map, calling the provided $check callback 2720her, loading and preparing them map, calling the provided $check callback
2575that 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
2576the 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
2583 2729
2584our $GOTOGEN; 2730our $GOTOGEN;
2585 2731
2586sub cf::object::player::goto { 2732sub cf::object::player::goto {
2587 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 }
2588 2740
2589 # 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
2590 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2742 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2591 2743
2592 $self->enter_link; 2744 $self->enter_link;
2616 my $map = eval { 2768 my $map = eval {
2617 my $map = defined $path ? cf::map::find $path : undef; 2769 my $map = defined $path ? cf::map::find $path : undef;
2618 2770
2619 if ($map) { 2771 if ($map) {
2620 $map = $map->customise_for ($self); 2772 $map = $map->customise_for ($self);
2621 $map = $check->($map) if $check && $map; 2773 $map = $check->($map, $x, $y, $self) if $check && $map;
2622 } else { 2774 } else {
2623 $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);
2624 } 2776 }
2625 2777
2626 $map 2778 $map
2634 if ($gen == $self->{_goto_generation}) { 2786 if ($gen == $self->{_goto_generation}) {
2635 delete $self->{_goto_generation}; 2787 delete $self->{_goto_generation};
2636 $self->leave_link ($map, $x, $y); 2788 $self->leave_link ($map, $x, $y);
2637 } 2789 }
2638 2790
2639 $done->() if $done; 2791 $done->($self) if $done;
2640 })->prio (1); 2792 })->prio (1);
2641} 2793}
2642 2794
2643=item $player_object->enter_exit ($exit_object) 2795=item $player_object->enter_exit ($exit_object)
2644 2796
2737 $self->message ("Something went wrong deep within the deliantra server. " 2889 $self->message ("Something went wrong deep within the deliantra server. "
2738 . "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. "
2739 . "Please report this to the dungeon master!", 2891 . "Please report this to the dungeon master!",
2740 cf::NDI_UNIQUE | cf::NDI_RED); 2892 cf::NDI_UNIQUE | cf::NDI_RED);
2741 2893
2742 warn "ERROR in enter_exit: $@"; 2894 error "ERROR in enter_exit: $@";
2743 $self->leave_link; 2895 $self->leave_link;
2744 } 2896 }
2745 })->prio (1); 2897 })->prio (1);
2746} 2898}
2747 2899
2759sub cf::client::send_drawinfo { 2911sub cf::client::send_drawinfo {
2760 my ($self, $text, $flags) = @_; 2912 my ($self, $text, $flags) = @_;
2761 2913
2762 utf8::encode $text; 2914 utf8::encode $text;
2763 $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);
2764} 2941}
2765 2942
2766=item $client->send_msg ($channel, $msg, $color, [extra...]) 2943=item $client->send_msg ($channel, $msg, $color, [extra...])
2767 2944
2768Send 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
2772 2949
2773=cut 2950=cut
2774 2951
2775# non-persistent channels (usually the info channel) 2952# non-persistent channels (usually the info channel)
2776our %CHANNEL = ( 2953our %CHANNEL = (
2954 "c/motd" => {
2955 id => "infobox",
2956 title => "MOTD",
2957 reply => undef,
2958 tooltip => "The message of the day",
2959 },
2777 "c/identify" => { 2960 "c/identify" => {
2778 id => "infobox", 2961 id => "infobox",
2779 title => "Identify", 2962 title => "Identify",
2780 reply => undef, 2963 reply => undef,
2781 tooltip => "Items recently identified", 2964 tooltip => "Items recently identified",
2783 "c/examine" => { 2966 "c/examine" => {
2784 id => "infobox", 2967 id => "infobox",
2785 title => "Examine", 2968 title => "Examine",
2786 reply => undef, 2969 reply => undef,
2787 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",
2788 }, 2977 },
2789 "c/book" => { 2978 "c/book" => {
2790 id => "infobox", 2979 id => "infobox",
2791 title => "Book", 2980 title => "Book",
2792 reply => undef, 2981 reply => undef,
2808 id => "infobox", 2997 id => "infobox",
2809 title => "Body Parts", 2998 title => "Body Parts",
2810 reply => undef, 2999 reply => undef,
2811 tooltip => "Shows which body parts you posess and are available", 3000 tooltip => "Shows which body parts you posess and are available",
2812 }, 3001 },
3002 "c/statistics" => {
3003 id => "infobox",
3004 title => "Statistics",
3005 reply => undef,
3006 tooltip => "Shows your primary statistics",
3007 },
2813 "c/skills" => { 3008 "c/skills" => {
2814 id => "infobox", 3009 id => "infobox",
2815 title => "Skills", 3010 title => "Skills",
2816 reply => undef, 3011 reply => undef,
2817 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",
2818 }, 3037 },
2819 "c/uptime" => { 3038 "c/uptime" => {
2820 id => "infobox", 3039 id => "infobox",
2821 title => "Uptime", 3040 title => "Uptime",
2822 reply => undef, 3041 reply => undef,
2832 id => "party", 3051 id => "party",
2833 title => "Party", 3052 title => "Party",
2834 reply => "gsay ", 3053 reply => "gsay ",
2835 tooltip => "Messages and chat related to your party", 3054 tooltip => "Messages and chat related to your party",
2836 }, 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,
2837); 3064);
2838 3065
2839sub cf::client::send_msg { 3066sub cf::client::send_msg {
2840 my ($self, $channel, $msg, $color, @extra) = @_; 3067 my ($self, $channel, $msg, $color, @extra) = @_;
2841 3068
2846 3073
2847 # check predefined channels, for the benefit of C 3074 # check predefined channels, for the benefit of C
2848 if ($CHANNEL{$channel}) { 3075 if ($CHANNEL{$channel}) {
2849 $channel = $CHANNEL{$channel}; 3076 $channel = $CHANNEL{$channel};
2850 3077
2851 $self->ext_msg (channel_info => $channel) 3078 $self->ext_msg (channel_info => $channel);
2852 if $self->can_msg;
2853
2854 $channel = $channel->{id}; 3079 $channel = $channel->{id};
2855 3080
2856 } elsif (ref $channel) { 3081 } elsif (ref $channel) {
2857 # send meta info to client, if not yet sent 3082 # send meta info to client, if not yet sent
2858 unless (exists $self->{channel}{$channel->{id}}) { 3083 unless (exists $self->{channel}{$channel->{id}}) {
2859 $self->{channel}{$channel->{id}} = $channel; 3084 $self->{channel}{$channel->{id}} = $channel;
2860 $self->ext_msg (channel_info => $channel) 3085 $self->ext_msg (channel_info => $channel);
2861 if $self->can_msg;
2862 } 3086 }
2863 3087
2864 $channel = $channel->{id}; 3088 $channel = $channel->{id};
2865 } 3089 }
2866 3090
2867 return unless @extra || length $msg; 3091 return unless @extra || length $msg;
2868 3092
2869 if ($self->can_msg) {
2870 # default colour, mask it out 3093 # default colour, mask it out
2871 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3094 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2872 if $color & cf::NDI_DEF; 3095 if $color & cf::NDI_DEF;
2873 3096
2874 my $pkt = "msg " 3097 my $pkt = "msg "
2875 . $self->{json_coder}->encode ( 3098 . $self->{json_coder}->encode (
2876 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3099 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2877 ); 3100 );
2878 3101
2879 # try lzf for large packets
2880 $pkt = "lzf " . Compress::LZF::compress $pkt
2881 if 1024 <= length $pkt and $self->{can_lzf};
2882
2883 # split very large packets
2884 if (8192 < length $pkt and $self->{can_lzf}) {
2885 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2886 $pkt = "frag";
2887 }
2888
2889 $self->send_packet ($pkt); 3102 $self->send_big_packet ($pkt);
2890 } else {
2891 if ($color >= 0) {
2892 # replace some tags by gcfclient-compatible ones
2893 for ($msg) {
2894 1 while
2895 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2896 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2897 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2898 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2899 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2900 }
2901
2902 $color &= cf::NDI_COLOR_MASK;
2903
2904 utf8::encode $msg;
2905
2906 if (0 && $msg =~ /\[/) {
2907 # COMMAND/INFO
2908 $self->send_packet ("drawextinfo $color 10 8 $msg")
2909 } else {
2910 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2911 $self->send_packet ("drawinfo $color $msg")
2912 }
2913 }
2914 }
2915} 3103}
2916 3104
2917=item $client->ext_msg ($type, @msg) 3105=item $client->ext_msg ($type, @msg)
2918 3106
2919Sends an ext event to the client. 3107Sends an ext event to the client.
2922 3110
2923sub cf::client::ext_msg($$@) { 3111sub cf::client::ext_msg($$@) {
2924 my ($self, $type, @msg) = @_; 3112 my ($self, $type, @msg) = @_;
2925 3113
2926 if ($self->extcmd == 2) { 3114 if ($self->extcmd == 2) {
2927 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3115 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2928 } elsif ($self->extcmd == 1) { # TODO: remove 3116 } elsif ($self->extcmd == 1) { # TODO: remove
2929 push @msg, msgtype => "event_$type"; 3117 push @msg, msgtype => "event_$type";
2930 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3118 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2931 } 3119 }
2932} 3120}
2933 3121
2934=item $client->ext_reply ($msgid, @msg) 3122=item $client->ext_reply ($msgid, @msg)
2935 3123
2939 3127
2940sub cf::client::ext_reply($$@) { 3128sub cf::client::ext_reply($$@) {
2941 my ($self, $id, @msg) = @_; 3129 my ($self, $id, @msg) = @_;
2942 3130
2943 if ($self->extcmd == 2) { 3131 if ($self->extcmd == 2) {
2944 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3132 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2945 } elsif ($self->extcmd == 1) { 3133 } elsif ($self->extcmd == 1) {
2946 #TODO: version 1, remove 3134 #TODO: version 1, remove
2947 unshift @msg, msgtype => "reply", msgid => $id; 3135 unshift @msg, msgtype => "reply", msgid => $id;
2948 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3136 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2949 } 3137 }
2950} 3138}
2951 3139
2952=item $success = $client->query ($flags, "text", \&cb) 3140=item $success = $client->query ($flags, "text", \&cb)
2953 3141
3024 3212
3025 $ns->ext_reply ($reply, @reply) 3213 $ns->ext_reply ($reply, @reply)
3026 if $reply; 3214 if $reply;
3027 3215
3028 } else { 3216 } else {
3029 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";
3030 } 3218 }
3031 3219
3032 cf::override; 3220 cf::override;
3033 }, 3221 },
3034); 3222);
3054 3242
3055 $coro 3243 $coro
3056} 3244}
3057 3245
3058cf::client->attach ( 3246cf::client->attach (
3059 on_destroy => sub { 3247 on_client_destroy => sub {
3060 my ($ns) = @_; 3248 my ($ns) = @_;
3061 3249
3062 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3250 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3063 }, 3251 },
3064); 3252);
3080our $safe_hole = new Safe::Hole; 3268our $safe_hole = new Safe::Hole;
3081 3269
3082$SIG{FPE} = 'IGNORE'; 3270$SIG{FPE} = 'IGNORE';
3083 3271
3084$safe->permit_only (Opcode::opset qw( 3272$safe->permit_only (Opcode::opset qw(
3085 :base_core :base_mem :base_orig :base_math 3273 :base_core :base_mem :base_orig :base_math :base_loop
3086 grepstart grepwhile mapstart mapwhile 3274 grepstart grepwhile mapstart mapwhile
3087 sort time 3275 sort time
3088)); 3276));
3089 3277
3090# here we export the classes and methods available to script code 3278# here we export the classes and methods available to script code
3094The following functions and methods are available within a safe environment: 3282The following functions and methods are available within a safe environment:
3095 3283
3096 cf::object 3284 cf::object
3097 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
3098 insert remove name archname title slaying race decrease split 3286 insert remove name archname title slaying race decrease split
3287 value
3099 3288
3100 cf::object::player 3289 cf::object::player
3101 player 3290 player
3102 3291
3103 cf::player 3292 cf::player
3109=cut 3298=cut
3110 3299
3111for ( 3300for (
3112 ["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
3113 insert remove inv nrof name archname title slaying race 3302 insert remove inv nrof name archname title slaying race
3114 decrease split destroy change_exp)], 3303 decrease split destroy change_exp value msg lore send_msg)],
3115 ["cf::object::player" => qw(player)], 3304 ["cf::object::player" => qw(player)],
3116 ["cf::player" => qw(peaceful)], 3305 ["cf::player" => qw(peaceful send_msg)],
3117 ["cf::map" => qw(trigger)], 3306 ["cf::map" => qw(trigger)],
3118) { 3307) {
3119 no strict 'refs';
3120 my ($pkg, @funs) = @$_; 3308 my ($pkg, @funs) = @$_;
3121 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3309 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3122 for @funs; 3310 for @funs;
3123} 3311}
3124 3312
3139 3327
3140 my $qcode = $code; 3328 my $qcode = $code;
3141 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3329 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3142 $qcode =~ s/\n/\\n/g; 3330 $qcode =~ s/\n/\\n/g;
3143 3331
3332 %vars = (_dummy => 0) unless %vars;
3333
3334 my @res;
3144 local $_; 3335 local $_;
3145 local @safe::cf::_safe_eval_args = values %vars;
3146 3336
3147 my $eval = 3337 my $eval =
3148 "do {\n" 3338 "do {\n"
3149 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3339 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3150 . "#line 0 \"{$qcode}\"\n" 3340 . "#line 0 \"{$qcode}\"\n"
3151 . $code 3341 . $code
3152 . "\n}" 3342 . "\n}"
3153 ; 3343 ;
3154 3344
3345 if ($CFG{safe_eval}) {
3155 sub_generation_inc; 3346 sub_generation_inc;
3347 local @safe::cf::_safe_eval_args = values %vars;
3156 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3348 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3157 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 }
3158 3354
3159 if ($@) { 3355 if ($@) {
3160 warn "$@"; 3356 warn "$@",
3161 warn "while executing safe code '$code'\n"; 3357 "while executing safe code '$code'\n",
3162 warn "with arguments " . (join " ", %vars) . "\n"; 3358 "with arguments " . (join " ", %vars) . "\n";
3163 } 3359 }
3164 3360
3165 wantarray ? @res : $res[0] 3361 wantarray ? @res : $res[0]
3166} 3362}
3167 3363
3181=cut 3377=cut
3182 3378
3183sub register_script_function { 3379sub register_script_function {
3184 my ($fun, $cb) = @_; 3380 my ($fun, $cb) = @_;
3185 3381
3186 no strict 'refs'; 3382 $fun = "safe::$fun" if $CFG{safe_eval};
3187 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3383 *$fun = $safe_hole->wrap ($cb);
3188} 3384}
3189 3385
3190=back 3386=back
3191 3387
3192=cut 3388=cut
3201 # for this (global event?) 3397 # for this (global event?)
3202 %ext::player_env::MUSIC_FACE_CACHE = (); 3398 %ext::player_env::MUSIC_FACE_CACHE = ();
3203 3399
3204 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3400 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3205 3401
3206 warn "loading facedata from $path\n"; 3402 trace "loading facedata from $path\n";
3207 3403
3208 my $facedata;
3209 0 < aio_load $path, $facedata 3404 0 < aio_load $path, my $facedata
3210 or die "$path: $!"; 3405 or die "$path: $!";
3211 3406
3212 $facedata = Coro::Storable::thaw $facedata; 3407 $facedata = Coro::Storable::thaw $facedata;
3213 3408
3214 $facedata->{version} == 2 3409 $facedata->{version} == 2
3215 or cf::cleanup "$path: version mismatch, cannot proceed."; 3410 or cf::cleanup "$path: version mismatch, cannot proceed.";
3216 3411
3217 # 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]);
3218 $facedata->{resource}{"res/exp_table"} = { 3414 $facedata->{resource}{"res/exp_table"} = {
3219 type => FT_RSRC, 3415 type => FT_RSRC,
3220 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),
3221 }; 3418 };
3222 cf::cede_to_tick; 3419 cf::cede_to_tick;
3223 3420
3224 { 3421 {
3225 my $faces = $facedata->{faceinfo}; 3422 my $faces = $facedata->{faceinfo};
3227 while (my ($face, $info) = each %$faces) { 3424 while (my ($face, $info) = each %$faces) {
3228 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3425 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3229 3426
3230 cf::face::set_visibility $idx, $info->{visibility}; 3427 cf::face::set_visibility $idx, $info->{visibility};
3231 cf::face::set_magicmap $idx, $info->{magicmap}; 3428 cf::face::set_magicmap $idx, $info->{magicmap};
3232 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3429 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3233 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, $info->{glyph} , $info->{glyph} ;
3234 3432
3235 cf::cede_to_tick; 3433 cf::cede_to_tick;
3236 } 3434 }
3237 3435
3238 while (my ($face, $info) = each %$faces) { 3436 while (my ($face, $info) = each %$faces) {
3243 3441
3244 if (my $smooth = cf::face::find $info->{smooth}) { 3442 if (my $smooth = cf::face::find $info->{smooth}) {
3245 cf::face::set_smooth $idx, $smooth; 3443 cf::face::set_smooth $idx, $smooth;
3246 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3444 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3247 } else { 3445 } else {
3248 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3446 error "smooth face '$info->{smooth}' not found for face '$face'";
3249 } 3447 }
3250 3448
3251 cf::cede_to_tick; 3449 cf::cede_to_tick;
3252 } 3450 }
3253 } 3451 }
3262 3460
3263 cf::anim::invalidate_all; # d'oh 3461 cf::anim::invalidate_all; # d'oh
3264 } 3462 }
3265 3463
3266 { 3464 {
3267 # TODO: for gcfclient pleasure, we should give resources
3268 # that gcfclient doesn't grok a >10000 face index.
3269 my $res = $facedata->{resource}; 3465 my $res = $facedata->{resource};
3270 3466
3271 while (my ($name, $info) = each %$res) { 3467 while (my ($name, $info) = each %$res) {
3272 if (defined $info->{type}) { 3468 if (defined $info->{type}) {
3273 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3469 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3274 my $data;
3275 3470
3276 if ($info->{type} & 1) { 3471 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3277 # prepend meta info
3278
3279 my $meta = $enc->encode ({
3280 name => $name,
3281 %{ $info->{meta} || {} },
3282 });
3283
3284 $data = pack "(w/a*)*", $meta, $info->{data};
3285 } else {
3286 $data = $info->{data};
3287 }
3288
3289 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3290 cf::face::set_type $idx, $info->{type}; 3472 cf::face::set_type $idx, $info->{type};
3291 } else { 3473 } else {
3292 $RESOURCE{$name} = $info; 3474 $RESOURCE{$name} = $info; # unused
3293 } 3475 }
3294 3476
3295 cf::cede_to_tick; 3477 cf::cede_to_tick;
3296 } 3478 }
3297 } 3479 }
3298 3480
3299 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3481 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3300 3482
3301 1 3483 1
3302} 3484}
3303
3304cf::global->attach (on_resource_update => sub {
3305 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3306 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3307
3308 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3309 my $sound = $soundconf->{compat}[$_]
3310 or next;
3311
3312 my $face = cf::face::find "sound/$sound->[1]";
3313 cf::sound::set $sound->[0] => $face;
3314 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3315 }
3316
3317 while (my ($k, $v) = each %{$soundconf->{event}}) {
3318 my $face = cf::face::find "sound/$v";
3319 cf::sound::set $k => $face;
3320 }
3321 }
3322});
3323 3485
3324register_exticmd fx_want => sub { 3486register_exticmd fx_want => sub {
3325 my ($ns, $want) = @_; 3487 my ($ns, $want) = @_;
3326 3488
3327 while (my ($k, $v) = each %$want) { 3489 while (my ($k, $v) = each %$want) {
3366sub reload_treasures { 3528sub reload_treasures {
3367 load_resource_file "$DATADIR/treasures" 3529 load_resource_file "$DATADIR/treasures"
3368 or die "unable to load treasurelists\n"; 3530 or die "unable to load treasurelists\n";
3369} 3531}
3370 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
3371sub reload_resources { 3556sub reload_resources {
3372 warn "reloading resource files...\n"; 3557 trace "reloading resource files...\n";
3373 3558
3559 reload_exp_table;
3560 reload_materials;
3374 reload_facedata; 3561 reload_facedata;
3562 reload_sound;
3375 reload_archetypes; 3563 reload_archetypes;
3376 reload_regions; 3564 reload_regions;
3377 reload_treasures; 3565 reload_treasures;
3378 3566
3379 warn "finished reloading resource files\n"; 3567 trace "finished reloading resource files\n";
3380} 3568}
3381 3569
3382sub reload_config { 3570sub reload_config {
3383 open my $fh, "<:utf8", "$CONFDIR/config" 3571 trace "reloading config file...\n";
3384 or return;
3385 3572
3386 local $/; 3573 0 < aio_load "$CONFDIR/config", my $config
3387 *CFG = YAML::Load <$fh>; 3574 or die "$CONFDIR/config: $!";
3388 3575
3576 utf8::decode $config;
3577 *CFG = yaml_load $config;
3578
3389 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3579 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3390 3580
3391 $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};
3392 $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};
3393 3583
3394 if (exists $CFG{mlockall}) { 3584 if (exists $CFG{mlockall}) {
3417 3607
3418 seek $fh, 0, 0; 3608 seek $fh, 0, 0;
3419 print $fh $$; 3609 print $fh $$;
3420} 3610}
3421 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
3422sub main { 3621sub main {
3423 cf::init_globals; # initialise logging 3622 cf::init_globals; # initialise logging
3424 3623
3425 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3624 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3426 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.";
3427 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3626 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3428 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3627 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3429
3430 cf::init_experience;
3431 cf::init_anim;
3432 cf::init_attackmess;
3433 cf::init_dynamic;
3434 cf::init_block;
3435 3628
3436 $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
3437 3630
3438 # we must not ever block the main coroutine 3631 # we must not ever block the main coroutine
3439 local $Coro::idle = sub { 3632 local $Coro::idle = sub {
3445 }; 3638 };
3446 3639
3447 evthread_start IO::AIO::poll_fileno; 3640 evthread_start IO::AIO::poll_fileno;
3448 3641
3449 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
3450 reload_resources; 3651 reload_resources;
3451 reload_config; 3652 reload_config;
3452 db_init; 3653 db_init;
3453 3654
3454 cf::load_settings;
3455 cf::load_materials;
3456 cf::init_uuid; 3655 cf::init_uuid;
3457 cf::init_signals; 3656 cf::init_signals;
3458 cf::init_commands;
3459 cf::init_skills; 3657 cf::init_skills;
3460 3658
3461 cf::init_beforeplay; 3659 cf::init_beforeplay;
3462 3660
3463 atomic; 3661 atomic;
3465 load_extensions; 3663 load_extensions;
3466 3664
3467 utime time, time, $RUNTIMEFILE; 3665 utime time, time, $RUNTIMEFILE;
3468 3666
3469 # no (long-running) fork's whatsoever before this point(!) 3667 # no (long-running) fork's whatsoever before this point(!)
3668 use POSIX ();
3470 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};
3471 3670
3472 (pop @POST_INIT)->(0) while @POST_INIT; 3671 cf::_post_init 0;
3473 }; 3672 };
3474 3673
3475 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;
3476} 3683}
3477 3684
3478############################################################################# 3685#############################################################################
3479# initialisation and cleanup 3686# initialisation and cleanup
3480 3687
3481# install some emergency cleanup handlers 3688# install some emergency cleanup handlers
3482BEGIN { 3689BEGIN {
3483 our %SIGWATCHER = (); 3690 our %SIGWATCHER = ();
3484 for my $signal (qw(INT HUP TERM)) { 3691 for my $signal (qw(INT HUP TERM)) {
3485 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3692 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3486 cf::cleanup "SIG$signal"; 3693 cf::cleanup "SIG$signal";
3487 }; 3694 };
3488 } 3695 }
3489} 3696}
3490 3697
3491sub write_runtime_sync { 3698sub write_runtime_sync {
3699 my $t0 = AE::time;
3700
3492 # first touch the runtime file to show we are still running: 3701 # first touch the runtime file to show we are still running:
3493 # the fsync below can take a very very long time. 3702 # the fsync below can take a very very long time.
3494 3703
3495 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3704 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3496 3705
3497 my $guard = cf::lock_acquire "write_runtime"; 3706 my $guard = cf::lock_acquire "write_runtime";
3498 3707
3499 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3708 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3500 or return; 3709 or return;
3501 3710
3502 my $value = $cf::RUNTIME + 90 + 10; 3711 my $value = $cf::RUNTIME + 90 + 10;
3503 # 10 is the runtime save interval, for a monotonic clock 3712 # 10 is the runtime save interval, for a monotonic clock
3504 # 60 allows for the watchdog to kill the server. 3713 # 60 allows for the watchdog to kill the server.
3517 or return; 3726 or return;
3518 3727
3519 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3728 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3520 and return; 3729 and return;
3521 3730
3522 warn "runtime file written.\n"; 3731 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3523 3732
3524 1 3733 1
3525} 3734}
3526 3735
3527our $uuid_lock; 3736our $uuid_lock;
3539 or return; 3748 or return;
3540 3749
3541 my $value = uuid_seq uuid_cur; 3750 my $value = uuid_seq uuid_cur;
3542 3751
3543 unless ($value) { 3752 unless ($value) {
3544 warn "cowardly refusing to write zero uuid value!\n"; 3753 info "cowardly refusing to write zero uuid value!\n";
3545 return; 3754 return;
3546 } 3755 }
3547 3756
3548 my $value = uuid_str $value + $uuid_skip; 3757 my $value = uuid_str $value + $uuid_skip;
3549 $uuid_skip = 0; 3758 $uuid_skip = 0;
3559 or return; 3768 or return;
3560 3769
3561 aio_rename "$uuid~", $uuid 3770 aio_rename "$uuid~", $uuid
3562 and return; 3771 and return;
3563 3772
3564 warn "uuid file written ($value).\n"; 3773 trace "uuid file written ($value).\n";
3565 3774
3566 1 3775 1
3567 3776
3568} 3777}
3569 3778
3575} 3784}
3576 3785
3577sub emergency_save() { 3786sub emergency_save() {
3578 my $freeze_guard = cf::freeze_mainloop; 3787 my $freeze_guard = cf::freeze_mainloop;
3579 3788
3580 warn "emergency_perl_save: enter\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;
3581 3795
3582 cf::sync_job { 3796 cf::sync_job {
3583 # this is a trade-off: we want to be very quick here, so 3797 cf::write_runtime_sync; # external watchdog should not bark
3584 # save all maps without fsync, and later call a global sync
3585 # (which in turn might be very very slow)
3586 local $USE_FSYNC = 0;
3587 3798
3588 # use a peculiar iteration method to avoid tripping on perl 3799 # use a peculiar iteration method to avoid tripping on perl
3589 # refcount bugs in for. also avoids problems with players 3800 # refcount bugs in for. also avoids problems with players
3590 # and maps saved/destroyed asynchronously. 3801 # and maps saved/destroyed asynchronously.
3591 warn "emergency_perl_save: begin player save\n"; 3802 info "emergency_perl_save: begin player save\n";
3592 for my $login (keys %cf::PLAYER) { 3803 for my $login (keys %cf::PLAYER) {
3593 my $pl = $cf::PLAYER{$login} or next; 3804 my $pl = $cf::PLAYER{$login} or next;
3594 $pl->valid or next; 3805 $pl->valid or next;
3595 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3806 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3596 $pl->save; 3807 $pl->save;
3597 } 3808 }
3598 warn "emergency_perl_save: end player save\n"; 3809 info "emergency_perl_save: end player save\n";
3599 3810
3811 cf::write_runtime_sync; # external watchdog should not bark
3812
3600 warn "emergency_perl_save: begin map save\n"; 3813 info "emergency_perl_save: begin map save\n";
3601 for my $path (keys %cf::MAP) { 3814 for my $path (keys %cf::MAP) {
3602 my $map = $cf::MAP{$path} or next; 3815 my $map = $cf::MAP{$path} or next;
3603 $map->valid or next; 3816 $map->valid or next;
3604 $map->save; 3817 $map->save;
3605 } 3818 }
3606 warn "emergency_perl_save: end map save\n"; 3819 info "emergency_perl_save: end map save\n";
3607 3820
3821 cf::write_runtime_sync; # external watchdog should not bark
3822
3608 warn "emergency_perl_save: begin database checkpoint\n"; 3823 info "emergency_perl_save: begin database checkpoint\n";
3609 BDB::db_env_txn_checkpoint $DB_ENV; 3824 BDB::db_env_txn_checkpoint $DB_ENV;
3610 warn "emergency_perl_save: end database checkpoint\n"; 3825 info "emergency_perl_save: end database checkpoint\n";
3611 3826
3612 warn "emergency_perl_save: begin write uuid\n"; 3827 info "emergency_perl_save: begin write uuid\n";
3613 write_uuid_sync 1; 3828 write_uuid_sync 1;
3614 warn "emergency_perl_save: 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
3615 }; 3849 };
3616 3850
3617 warn "emergency_perl_save: starting sync()\n";
3618 IO::AIO::aio_sync sub {
3619 warn "emergency_perl_save: finished sync()\n";
3620 };
3621
3622 warn "emergency_perl_save: leave\n"; 3851 info "emergency_perl_save: leave\n";
3623} 3852}
3624 3853
3625sub post_cleanup { 3854sub post_cleanup {
3626 my ($make_core) = @_; 3855 my ($make_core) = @_;
3627 3856
3857 IO::AIO::flush;
3858
3628 warn Carp::longmess "post_cleanup backtrace" 3859 error Carp::longmess "post_cleanup backtrace"
3629 if $make_core; 3860 if $make_core;
3630 3861
3631 my $fh = pidfile; 3862 my $fh = pidfile;
3632 unlink $PIDFILE if <$fh> == $$; 3863 unlink $PIDFILE if <$fh> == $$;
3633} 3864}
3653 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3884 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3654 for my $name (keys %$leaf_symtab) { 3885 for my $name (keys %$leaf_symtab) {
3655 _gv_clear *{"$pkg$name"}; 3886 _gv_clear *{"$pkg$name"};
3656# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3887# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3657 } 3888 }
3658 warn "cleared package $pkg\n";#d#
3659} 3889}
3660 3890
3661sub do_reload_perl() { 3891sub do_reload_perl() {
3662 # can/must only be called in main 3892 # can/must only be called in main
3663 if ($Coro::current != $Coro::main) { 3893 unless (in_main) {
3664 warn "can only reload from main coroutine"; 3894 error "can only reload from main coroutine";
3665 return; 3895 return;
3666 } 3896 }
3667 3897
3668 return if $RELOAD++; 3898 return if $RELOAD++;
3669 3899
3670 my $t1 = EV::time; 3900 my $t1 = AE::time;
3671 3901
3672 while ($RELOAD) { 3902 while ($RELOAD) {
3673 warn "reloading..."; 3903 cf::get_slot 0.1, -1, "reload_perl";
3904 info "perl_reload: reloading...";
3674 3905
3675 warn "entering sync_job"; 3906 trace "perl_reload: entering sync_job";
3676 3907
3677 cf::sync_job { 3908 cf::sync_job {
3678 cf::write_runtime_sync; # external watchdog should not bark
3679 cf::emergency_save; 3909 #cf::emergency_save;
3680 cf::write_runtime_sync; # external watchdog should not bark
3681 3910
3682 warn "syncing database to disk";
3683 BDB::db_env_txn_checkpoint $DB_ENV;
3684
3685 # if anything goes wrong in here, we should simply crash as we already saved
3686
3687 warn "flushing outstanding aio requests";
3688 while (IO::AIO::nreqs || BDB::nreqs) {
3689 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3690 }
3691
3692 warn "cancelling all extension coros"; 3911 trace "perl_reload: cancelling all extension coros";
3693 $_->cancel for values %EXT_CORO; 3912 $_->cancel for values %EXT_CORO;
3694 %EXT_CORO = (); 3913 %EXT_CORO = ();
3695 3914
3696 warn "removing commands"; 3915 trace "perl_reload: removing commands";
3697 %COMMAND = (); 3916 %COMMAND = ();
3698 3917
3699 warn "removing ext/exti commands"; 3918 trace "perl_reload: removing ext/exti commands";
3700 %EXTCMD = (); 3919 %EXTCMD = ();
3701 %EXTICMD = (); 3920 %EXTICMD = ();
3702 3921
3703 warn "unloading/nuking all extensions"; 3922 trace "perl_reload: unloading/nuking all extensions";
3704 for my $pkg (@EXTS) { 3923 for my $pkg (@EXTS) {
3705 warn "... unloading $pkg"; 3924 trace "... unloading $pkg";
3706 3925
3707 if (my $cb = $pkg->can ("unload")) { 3926 if (my $cb = $pkg->can ("unload")) {
3708 eval { 3927 eval {
3709 $cb->($pkg); 3928 $cb->($pkg);
3710 1 3929 1
3711 } or warn "$pkg unloaded, but with errors: $@"; 3930 } or error "$pkg unloaded, but with errors: $@";
3712 } 3931 }
3713 3932
3714 warn "... clearing $pkg"; 3933 trace "... clearing $pkg";
3715 clear_package $pkg; 3934 clear_package $pkg;
3716 } 3935 }
3717 3936
3718 warn "unloading all perl modules loaded from $LIBDIR"; 3937 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3719 while (my ($k, $v) = each %INC) { 3938 while (my ($k, $v) = each %INC) {
3720 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3939 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3721 3940
3722 warn "... unloading $k"; 3941 trace "... unloading $k";
3723 delete $INC{$k}; 3942 delete $INC{$k};
3724 3943
3725 $k =~ s/\.pm$//; 3944 $k =~ s/\.pm$//;
3726 $k =~ s/\//::/g; 3945 $k =~ s/\//::/g;
3727 3946
3730 } 3949 }
3731 3950
3732 clear_package $k; 3951 clear_package $k;
3733 } 3952 }
3734 3953
3735 warn "getting rid of safe::, as good as possible"; 3954 trace "perl_reload: getting rid of safe::, as good as possible";
3736 clear_package "safe::$_" 3955 clear_package "safe::$_"
3737 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);
3738 3957
3739 warn "unloading cf.pm \"a bit\""; 3958 trace "perl_reload: unloading cf.pm \"a bit\"";
3740 delete $INC{"cf.pm"}; 3959 delete $INC{"cf.pm"};
3741 delete $INC{"cf/pod.pm"}; 3960 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3742 3961
3743 # don't, removes xs symbols, too, 3962 # don't, removes xs symbols, too,
3744 # and global variables created in xs 3963 # and global variables created in xs
3745 #clear_package __PACKAGE__; 3964 #clear_package __PACKAGE__;
3746 3965
3747 warn "unload completed, starting to reload now"; 3966 info "perl_reload: unload completed, starting to reload now";
3748 3967
3749 warn "reloading cf.pm"; 3968 trace "perl_reload: reloading cf.pm";
3750 require cf; 3969 require cf;
3751 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3970 cf::_connect_to_perl_1;
3752 3971
3753 warn "loading config and database again"; 3972 trace "perl_reload: loading config and database again";
3754 cf::reload_config; 3973 cf::reload_config;
3755 3974
3756 warn "loading extensions"; 3975 trace "perl_reload: loading extensions";
3757 cf::load_extensions; 3976 cf::load_extensions;
3758 3977
3759 if ($REATTACH_ON_RELOAD) { 3978 if ($REATTACH_ON_RELOAD) {
3760 warn "reattaching attachments to objects/players"; 3979 trace "perl_reload: reattaching attachments to objects/players";
3761 _global_reattach; # objects, sockets 3980 _global_reattach; # objects, sockets
3762 warn "reattaching attachments to maps"; 3981 trace "perl_reload: reattaching attachments to maps";
3763 reattach $_ for values %MAP; 3982 reattach $_ for values %MAP;
3764 warn "reattaching attachments to players"; 3983 trace "perl_reload: reattaching attachments to players";
3765 reattach $_ for values %PLAYER; 3984 reattach $_ for values %PLAYER;
3766 } 3985 }
3767 3986
3768 warn "running post_init jobs"; 3987 cf::_post_init 1;
3769 (pop @POST_INIT)->(1) while @POST_INIT;
3770 3988
3771 warn "leaving sync_job"; 3989 trace "perl_reload: leaving sync_job";
3772 3990
3773 1 3991 1
3774 } or do { 3992 } or do {
3775 warn $@; 3993 error $@;
3776 cf::cleanup "error while reloading, exiting."; 3994 cf::cleanup "perl_reload: error, exiting.";
3777 }; 3995 };
3778 3996
3779 warn "reloaded";
3780 --$RELOAD; 3997 --$RELOAD;
3781 } 3998 }
3782 3999
3783 $t1 = EV::time - $t1; 4000 $t1 = AE::time - $t1;
3784 warn "reload completed in ${t1}s\n"; 4001 info "perl_reload: completed in ${t1}s\n";
3785}; 4002};
3786 4003
3787our $RELOAD_WATCHER; # used only during reload 4004our $RELOAD_WATCHER; # used only during reload
3788 4005
3789sub reload_perl() { 4006sub reload_perl() {
3791 # coro crashes during coro_state_free->destroy here. 4008 # coro crashes during coro_state_free->destroy here.
3792 4009
3793 $RELOAD_WATCHER ||= cf::async { 4010 $RELOAD_WATCHER ||= cf::async {
3794 Coro::AIO::aio_wait cache_extensions; 4011 Coro::AIO::aio_wait cache_extensions;
3795 4012
3796 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4013 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3797 do_reload_perl; 4014 do_reload_perl;
3798 undef $RELOAD_WATCHER; 4015 undef $RELOAD_WATCHER;
3799 }; 4016 };
3800 }; 4017 };
3801} 4018}
3810 reload_perl; 4027 reload_perl;
3811 }; 4028 };
3812 } 4029 }
3813}; 4030};
3814 4031
3815unshift @INC, $LIBDIR; 4032#############################################################################
3816 4033
3817my $bug_warning = 0; 4034my $bug_warning = 0;
3818 4035
3819our @WAIT_FOR_TICK; 4036our @WAIT_FOR_TICK;
3820our @WAIT_FOR_TICK_BEGIN; 4037our @WAIT_FOR_TICK_BEGIN;
3821 4038
3822sub wait_for_tick { 4039sub wait_for_tick() {
3823 return if tick_inhibit || $Coro::current == $Coro::main; 4040 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3824 4041
3825 my $signal = new Coro::Signal; 4042 my $signal = new Coro::Signal;
3826 push @WAIT_FOR_TICK, $signal; 4043 push @WAIT_FOR_TICK, $signal;
3827 $signal->wait; 4044 $signal->wait;
3828} 4045}
3829 4046
3830sub wait_for_tick_begin { 4047sub wait_for_tick_begin() {
3831 return if tick_inhibit || $Coro::current == $Coro::main; 4048 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3832 4049
3833 my $signal = new Coro::Signal; 4050 my $signal = new Coro::Signal;
3834 push @WAIT_FOR_TICK_BEGIN, $signal; 4051 push @WAIT_FOR_TICK_BEGIN, $signal;
3835 $signal->wait; 4052 $signal->wait;
3836} 4053}
3842 return; 4059 return;
3843 } 4060 }
3844 4061
3845 cf::server_tick; # one server iteration 4062 cf::server_tick; # one server iteration
3846 4063
4064 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4065
3847 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4066 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3848 $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.;
3849 Coro::async_pool { 4068 Coro::async_pool {
3850 $Coro::current->{desc} = "runtime saver"; 4069 $Coro::current->{desc} = "runtime saver";
3851 write_runtime_sync 4070 write_runtime_sync
3852 or warn "ERROR: unable to write runtime file: $!"; 4071 or error "ERROR: unable to write runtime file: $!";
3853 }; 4072 };
3854 } 4073 }
3855 4074
3856 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4075 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3857 $sig->send; 4076 $sig->send;
3865 4084
3866 if (0) { 4085 if (0) {
3867 if ($NEXT_TICK) { 4086 if ($NEXT_TICK) {
3868 my $jitter = $TICK_START - $NEXT_TICK; 4087 my $jitter = $TICK_START - $NEXT_TICK;
3869 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4088 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3870 warn "jitter $JITTER\n";#d# 4089 debug "jitter $JITTER\n";#d#
3871 } 4090 }
3872 } 4091 }
3873} 4092}
3874 4093
3875{ 4094{
3876 # configure BDB 4095 # configure BDB
3877 4096
3878 BDB::min_parallel 8; 4097 BDB::min_parallel 16;
3879 BDB::max_poll_reqs $TICK * 0.1; 4098 BDB::max_poll_reqs $TICK * 0.1;
3880 $AnyEvent::BDB::WATCHER->priority (1); 4099 $AnyEvent::BDB::WATCHER->priority (1);
3881 4100
3882 unless ($DB_ENV) { 4101 unless ($DB_ENV) {
3883 $DB_ENV = BDB::db_env_create; 4102 $DB_ENV = BDB::db_env_create;
3920 IO::AIO::min_parallel 8; 4139 IO::AIO::min_parallel 8;
3921 IO::AIO::max_poll_time $TICK * 0.1; 4140 IO::AIO::max_poll_time $TICK * 0.1;
3922 undef $AnyEvent::AIO::WATCHER; 4141 undef $AnyEvent::AIO::WATCHER;
3923} 4142}
3924 4143
3925my $_log_backtrace; 4144our $_log_backtrace;
4145our $_log_backtrace_last;
3926 4146
3927sub _log_backtrace { 4147sub _log_backtrace {
3928 my ($msg, @addr) = @_; 4148 my ($msg, @addr) = @_;
3929 4149
3930 $msg =~ s/\n//; 4150 $msg =~ s/\n$//;
3931 4151
4152 if ($_log_backtrace_last eq $msg) {
4153 LOG llevInfo, "[ABT] $msg\n";
4154 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3932 # limit the # of concurrent backtraces 4155 # limit the # of concurrent backtraces
3933 if ($_log_backtrace < 2) { 4156 } elsif ($_log_backtrace < 2) {
4157 $_log_backtrace_last = $msg;
3934 ++$_log_backtrace; 4158 ++$_log_backtrace;
3935 my $perl_bt = Carp::longmess $msg; 4159 my $perl_bt = Carp::longmess $msg;
3936 async { 4160 async {
3937 $Coro::current->{desc} = "abt $msg"; 4161 $Coro::current->{desc} = "abt $msg";
3938 4162
3958 LOG llevInfo, "[ABT] $_\n" for @bt; 4182 LOG llevInfo, "[ABT] $_\n" for @bt;
3959 --$_log_backtrace; 4183 --$_log_backtrace;
3960 }; 4184 };
3961 } else { 4185 } else {
3962 LOG llevInfo, "[ABT] $msg\n"; 4186 LOG llevInfo, "[ABT] $msg\n";
3963 LOG llevInfo, "[ABT] [suppressed]\n"; 4187 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3964 } 4188 }
3965} 4189}
3966 4190
3967# load additional modules 4191# load additional modules
3968use cf::pod; 4192require "cf/$_.pm" for @EXTRA_MODULES;
4193cf::_connect_to_perl_2;
3969 4194
3970END { cf::emergency_save } 4195END { cf::emergency_save }
3971 4196
39721 41971
3973 4198

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines