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.453 by root, Tue Sep 23 04:29:11 2008 UTC vs.
Revision 1.554 by root, Sat Jun 26 22:10:18 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines