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.450 by root, Mon Sep 22 01:33:09 2008 UTC vs.
Revision 1.552 by root, Mon May 17 21:12:59 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
81our %EXTCMD = (); 87our %EXTCMD = ();
82our %EXTICMD = (); 88our %EXTICMD = ();
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 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;
127 143
128our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
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
148
149our @POST_INIT;
150
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
132 153
133binmode STDOUT; 154binmode STDOUT;
134binmode STDERR; 155binmode STDERR;
135 156
136# read virtual server time, if available 157# read virtual server time, if available
138 open my $fh, "<", $RUNTIMEFILE 159 open my $fh, "<", $RUNTIMEFILE
139 or die "unable to read $RUNTIMEFILE file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
140 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
141} 162}
142 163
164eval "sub TICK() { $TICK } 1" or die;
165
143mkdir $_ 166mkdir $_
144 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
145 168
146our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
147 170
148sub 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::"} };
149 187
150############################################################################# 188#############################################################################
151 189
152=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
153 191
195from wherever your confdir points to. 233from wherever your confdir points to.
196 234
197=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
198 236
199These 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
200returns 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
201per 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.
202 240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
203=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
204 247
205This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
206C<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
207that call. 250that call.
208 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
209=back 258=back
210 259
211=cut 260=cut
212 261
213BEGIN { 262sub error(@) { LOG llevError, join "", @_ }
214 *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 {
215 my $msg = join "", @_; 269 my $msg = join "", @_;
216 270
217 $msg .= "\n" 271 $msg .= "\n"
218 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
219 273
220 $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;
221 275
222 LOG llevError, $msg; 276 LOG llevWarn, $msg;
223 }; 277};
224}
225 278
226$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
227 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
228 281
229 if ($Coro::current == $Coro::main) {#d# 282 error Carp::longmess $_[0];
283
284 if (in_main) {#d#
230 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
231 return;#d# 286 return;#d#
232 }#d# 287 }#d#
233 288
234 # kill coroutine otherwise 289 # kill coroutine otherwise
235 warn Carp::longmess $_[0];
236 Coro::terminate 290 Coro::terminate
237}; 291};
238
239$SIG{__DIE__} = sub { }; #d#?
240 292
241@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 293@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
242@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 294@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
243@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 295@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
244@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 296@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
258)) { 310)) {
259 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
260} 312}
261 313
262$EV::DIED = sub { 314$EV::DIED = sub {
263 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
264}; 316};
265 317
266############################################################################# 318#############################################################################
267 319
268=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
305our $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
306 358
307sub encode_json($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
308sub decode_json($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
309 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
374=item cf::post_init { BLOCK }
375
376Execute the given codeblock, I<after> all extensions have been (re-)loaded,
377but I<before> the server starts ticking again.
378
379The codeblock will have a single boolean argument to indicate whether this
380is a reload or not.
381
382=cut
383
384sub post_init(&) {
385 push @POST_INIT, shift;
386}
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
310=item cf::lock_wait $string 405=item cf::lock_wait $string
311 406
312Wait until the given lock is available. See cf::lock_acquire. 407Wait until the given lock is available. See cf::lock_acquire.
313 408
314=item my $lock = cf::lock_acquire $string 409=item my $lock = cf::lock_acquire $string
315 410
316Wait 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
317a 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,
318for example when the coroutine gets canceled), the lock is automatically 413for example when the coroutine gets canceled), the lock is automatically
319returned. 414returned.
320 415
321Locks 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
322deadlocked coro. 417deadlocked coro.
328 423
329Return 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.
330 425
331=cut 426=cut
332 427
333our %LOCK; 428our $LOCKS = new Coro::SemaphoreSet;
334our %LOCKER;#d#
335 429
336sub lock_wait($) { 430sub lock_wait($) {
337 my ($key) = @_; 431 $LOCKS->wait ($_[0]);
338
339 if ($LOCKER{$key} == $Coro::current) {#d#
340 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
341 return;#d#
342 }#d#
343
344 # wait for lock, if any
345 while ($LOCK{$key}) {
346 push @{ $LOCK{$key} }, $Coro::current;
347 Coro::schedule;
348 }
349} 432}
350 433
351sub lock_acquire($) { 434sub lock_acquire($) {
352 my ($key) = @_; 435 $LOCKS->guard ($_[0])
353
354 # wait, to be sure we are not locked
355 lock_wait $key;
356
357 $LOCK{$key} = [];
358 $LOCKER{$key} = $Coro::current;#d#
359
360 Coro::guard {
361 delete $LOCKER{$key};#d#
362 # wake up all waiters, to be on the safe side
363 $_->ready for @{ delete $LOCK{$key} };
364 }
365} 436}
366 437
367sub lock_active($) { 438sub lock_active($) {
368 my ($key) = @_; 439 $LOCKS->count ($_[0]) < 1
369
370 ! ! $LOCK{$key}
371} 440}
372 441
373sub freeze_mainloop { 442sub freeze_mainloop {
374 tick_inhibit_inc; 443 tick_inhibit_inc;
375 444
376 Coro::guard \&tick_inhibit_dec; 445 &Guard::guard (\&tick_inhibit_dec);
377} 446}
378 447
379=item cf::periodic $interval, $cb 448=item cf::periodic $interval, $cb
380 449
381Like 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
382get spread over timer. 451get spread over time.
383 452
384=cut 453=cut
385 454
386sub periodic($$) { 455sub periodic($$) {
387 my ($interval, $cb) = @_; 456 my ($interval, $cb) = @_;
404 473
405=cut 474=cut
406 475
407our @SLOT_QUEUE; 476our @SLOT_QUEUE;
408our $SLOT_QUEUE; 477our $SLOT_QUEUE;
478our $SLOT_DECAY = 0.9;
409 479
410$SLOT_QUEUE->cancel if $SLOT_QUEUE; 480$SLOT_QUEUE->cancel if $SLOT_QUEUE;
411$SLOT_QUEUE = Coro::async { 481$SLOT_QUEUE = Coro::async {
412 $Coro::current->desc ("timeslot manager"); 482 $Coro::current->desc ("timeslot manager");
413 483
414 my $signal = new Coro::Signal; 484 my $signal = new Coro::Signal;
485 my $busy;
415 486
416 while () { 487 while () {
417 next_job: 488 next_job:
489
418 my $avail = cf::till_tick; 490 my $avail = cf::till_tick;
419 if ($avail > 0.01) { 491
420 for (0 .. $#SLOT_QUEUE) { 492 for (0 .. $#SLOT_QUEUE) {
421 if ($SLOT_QUEUE[$_][0] < $avail) { 493 if ($SLOT_QUEUE[$_][0] <= $avail) {
494 $busy = 0;
422 my $job = splice @SLOT_QUEUE, $_, 1, (); 495 my $job = splice @SLOT_QUEUE, $_, 1, ();
423 $job->[2]->send; 496 $job->[2]->send;
424 Coro::cede; 497 Coro::cede;
425 goto next_job; 498 goto next_job;
426 } 499 } else {
500 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
427 } 501 }
428 } 502 }
429 503
430 if (@SLOT_QUEUE) { 504 if (@SLOT_QUEUE) {
431 # 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
432 push @cf::WAIT_FOR_TICK, $signal; 506 push @cf::WAIT_FOR_TICK, $signal;
433 $signal->wait; 507 $signal->wait;
434 } else { 508 } else {
509 $busy = 0;
435 Coro::schedule; 510 Coro::schedule;
436 } 511 }
437 } 512 }
438}; 513};
439 514
440sub get_slot($;$$) { 515sub get_slot($;$$) {
441 return if tick_inhibit || $Coro::current == $Coro::main; 516 return if tick_inhibit || $Coro::current == $Coro::main;
442 517
443 my ($time, $pri, $name) = @_; 518 my ($time, $pri, $name) = @_;
444 519
445 $time = $TICK * .6 if $time > $TICK * .6; 520 $time = clamp $time, 0.01, $TICK * .6;
521
446 my $sig = new Coro::Signal; 522 my $sig = new Coro::Signal;
447 523
448 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 524 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
449 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 525 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
450 $SLOT_QUEUE->ready; 526 $SLOT_QUEUE->ready;
476=cut 552=cut
477 553
478sub sync_job(&) { 554sub sync_job(&) {
479 my ($job) = @_; 555 my ($job) = @_;
480 556
481 if ($Coro::current == $Coro::main) { 557 if (in_main) {
482 my $time = EV::time; 558 my $time = AE::time;
483 559
484 # this is the main coro, too bad, we have to block 560 # this is the main coro, too bad, we have to block
485 # till the operation succeeds, freezing the server :/ 561 # till the operation succeeds, freezing the server :/
486 562
487 LOG llevError, Carp::longmess "sync job";#d# 563 #LOG llevError, Carp::longmess "sync job";#d#
488 564
489 my $freeze_guard = freeze_mainloop; 565 my $freeze_guard = freeze_mainloop;
490 566
491 my $busy = 1; 567 my $busy = 1;
492 my @res; 568 my @res;
493 569
494 (async { 570 (async {
495 $Coro::current->desc ("sync job coro"); 571 $Coro::current->desc ("sync job coro");
496 @res = eval { $job->() }; 572 @res = eval { $job->() };
497 warn $@ if $@; 573 error $@ if $@;
498 undef $busy; 574 undef $busy;
499 })->prio (Coro::PRIO_MAX); 575 })->prio (Coro::PRIO_MAX);
500 576
501 while ($busy) { 577 while ($busy) {
502 if (Coro::nready) { 578 if (Coro::nready) {
504 } else { 580 } else {
505 EV::loop EV::LOOP_ONESHOT; 581 EV::loop EV::LOOP_ONESHOT;
506 } 582 }
507 } 583 }
508 584
509 my $time = EV::time - $time; 585 my $time = AE::time - $time;
510 586
511 $TICK_START += $time; # do not account sync jobs to server load 587 $TICK_START += $time; # do not account sync jobs to server load
512 588
513 wantarray ? @res : $res[0] 589 wantarray ? @res : $res[0]
514 } else { 590 } else {
536 $EXT_CORO{$coro+0} = $coro; 612 $EXT_CORO{$coro+0} = $coro;
537 613
538 $coro 614 $coro
539} 615}
540 616
541=item fork_call { }, $args 617=item fork_call { }, @args
542 618
543Executes the given code block with the given arguments in a seperate 619Executes the given code block with the given arguments in a seperate
544process, returning the results. Everything must be serialisable with 620process, returning the results. Everything must be serialisable with
545Coro::Storable. May, of course, block. Note that the executed sub may 621Coro::Storable. May, of course, block. Note that the executed sub may
546never block itself or use any form of event handling. 622never block itself or use any form of event handling.
547 623
548=cut 624=cut
549 625
626sub post_fork {
627 reset_signals;
628}
629
550sub fork_call(&@) { 630sub fork_call(&@) {
551 my ($cb, @args) = @_; 631 my ($cb, @args) = @_;
552 632
553 # 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,
554 # otherwise perl prematurely frees the stuff :/ 634 # otherwise perl prematurely frees the stuff :/
555 # TODO: investigate and fix (likely this will be rather laborious) 635 # TODO: investigate and fix (likely this will be rather laborious)
556 636
557 my @res = Coro::Util::fork_eval { 637 my @res = Coro::Util::fork_eval {
558 reset_signals; 638 cf::post_fork;
559 &$cb 639 &$cb
560 }, @args; 640 } @args;
561 641
562 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 )
563} 654}
564 655
565=item $coin = coin_from_name $name 656=item $coin = coin_from_name $name
566 657
567=cut 658=cut
604within each server. 695within each server.
605 696
606=cut 697=cut
607 698
608sub db_table($) { 699sub db_table($) {
700 cf::error "db_get called from main context"
701 if $Coro::current == $Coro::main;
702
609 my ($name) = @_; 703 my ($name) = @_;
610 my $db = BDB::db_create $DB_ENV; 704 my $db = BDB::db_create $DB_ENV;
611 705
612 eval { 706 eval {
613 $db->set_flags (BDB::CHKSUM); 707 $db->set_flags (BDB::CHKSUM);
623} 717}
624 718
625our $DB; 719our $DB;
626 720
627sub db_init { 721sub db_init {
628 cf::sync_job {
629 $DB ||= db_table "db"; 722 $DB ||= db_table "db";
630 };
631} 723}
632 724
633sub db_get($$) { 725sub db_get($$) {
634 my $key = "$_[0]/$_[1]"; 726 my $key = "$_[0]/$_[1]";
635 727
636 cf::sync_job { 728 cf::error "db_get called from main context"
729 if $Coro::current == $Coro::main;
730
637 BDB::db_get $DB, undef, $key, my $data; 731 BDB::db_get $DB, undef, $key, my $data;
638 732
639 $! ? () 733 $! ? ()
640 : $data 734 : $data
641 }
642} 735}
643 736
644sub db_put($$$) { 737sub db_put($$$) {
645 BDB::dbreq_pri 4; 738 BDB::dbreq_pri 4;
646 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 739 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
702 795
703 my $t1 = Time::HiRes::time; 796 my $t1 = Time::HiRes::time;
704 my $data = $process->(\@data); 797 my $data = $process->(\@data);
705 my $t2 = Time::HiRes::time; 798 my $t2 = Time::HiRes::time;
706 799
707 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 800 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
708 801
709 db_put cache => "$id/data", $data; 802 db_put cache => "$id/data", $data;
710 db_put cache => "$id/md5" , $md5; 803 db_put cache => "$id/md5" , $md5;
711 db_put cache => "$id/meta", $meta; 804 db_put cache => "$id/meta", $meta;
712 805
722 815
723=cut 816=cut
724 817
725sub datalog($@) { 818sub datalog($@) {
726 my ($type, %kv) = @_; 819 my ($type, %kv) = @_;
727 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 820 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
728} 821}
729 822
730=back 823=back
731 824
732=cut 825=cut
927 1020
928 } elsif (exists $cb_id{$type}) { 1021 } elsif (exists $cb_id{$type}) {
929 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1022 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
930 1023
931 } elsif (ref $type) { 1024 } elsif (ref $type) {
932 warn "attaching objects not supported, ignoring.\n"; 1025 error "attaching objects not supported, ignoring.\n";
933 1026
934 } else { 1027 } else {
935 shift @arg; 1028 shift @arg;
936 warn "attach argument '$type' not supported, ignoring.\n"; 1029 error "attach argument '$type' not supported, ignoring.\n";
937 } 1030 }
938 } 1031 }
939} 1032}
940 1033
941sub _object_attach { 1034sub _object_attach {
951 _attach $registry, $klass, @attach; 1044 _attach $registry, $klass, @attach;
952 } 1045 }
953 1046
954 $obj->{$name} = \%arg; 1047 $obj->{$name} = \%arg;
955 } else { 1048 } else {
956 warn "object uses attachment '$name' which is not available, postponing.\n"; 1049 info "object uses attachment '$name' which is not available, postponing.\n";
957 } 1050 }
958 1051
959 $obj->{_attachment}{$name} = undef; 1052 $obj->{_attachment}{$name} = undef;
960} 1053}
961 1054
1020 1113
1021 for (@$callbacks) { 1114 for (@$callbacks) {
1022 eval { &{$_->[1]} }; 1115 eval { &{$_->[1]} };
1023 1116
1024 if ($@) { 1117 if ($@) {
1025 warn "$@";
1026 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1118 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1027 override; 1119 override;
1028 } 1120 }
1029 1121
1030 return 1 if $override; 1122 return 1 if $override;
1031 } 1123 }
1110 for (@$attach) { 1202 for (@$attach) {
1111 my ($klass, @attach) = @$_; 1203 my ($klass, @attach) = @$_;
1112 _attach $registry, $klass, @attach; 1204 _attach $registry, $klass, @attach;
1113 } 1205 }
1114 } else { 1206 } else {
1115 warn "object uses attachment '$name' that is not available, postponing.\n"; 1207 info "object uses attachment '$name' that is not available, postponing.\n";
1116 } 1208 }
1117 } 1209 }
1118} 1210}
1119 1211
1120cf::attachable->attach ( 1212cf::attachable->attach (
1147 my ($filename, $rdata, $objs) = @_; 1239 my ($filename, $rdata, $objs) = @_;
1148 1240
1149 sync_job { 1241 sync_job {
1150 if (length $$rdata) { 1242 if (length $$rdata) {
1151 utf8::decode (my $decname = $filename); 1243 utf8::decode (my $decname = $filename);
1152 warn sprintf "saving %s (%d,%d)\n", 1244 trace sprintf "saving %s (%d,%d)\n",
1153 $decname, length $$rdata, scalar @$objs; 1245 $decname, length $$rdata, scalar @$objs
1246 if $VERBOSE_IO;
1154 1247
1155 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1248 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1156 aio_chmod $fh, SAVE_MODE; 1249 aio_chmod $fh, SAVE_MODE;
1157 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1250 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1158 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 }
1159 aio_close $fh; 1255 aio_close $fh;
1160 1256
1161 if (@$objs) { 1257 if (@$objs) {
1162 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) {
1163 aio_chmod $fh, SAVE_MODE; 1259 aio_chmod $fh, SAVE_MODE;
1164 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1260 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1165 aio_write $fh, 0, (length $data), $data, 0; 1261 aio_write $fh, 0, (length $data), $data, 0;
1166 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 }
1167 aio_close $fh; 1266 aio_close $fh;
1168 aio_rename "$filename.pst~", "$filename.pst"; 1267 aio_rename "$filename.pst~", "$filename.pst";
1169 } 1268 }
1170 } else { 1269 } else {
1171 aio_unlink "$filename.pst"; 1270 aio_unlink "$filename.pst";
1172 } 1271 }
1173 1272
1174 aio_rename "$filename~", $filename; 1273 aio_rename "$filename~", $filename;
1274
1275 $filename =~ s%/[^/]+$%%;
1276 aio_pathsync $filename if $cf::USE_FSYNC;
1175 } else { 1277 } else {
1176 warn "FATAL: $filename~: $!\n"; 1278 error "unable to save objects: $filename~: $!\n";
1177 } 1279 }
1178 } else { 1280 } else {
1179 aio_unlink $filename; 1281 aio_unlink $filename;
1180 aio_unlink "$filename.pst"; 1282 aio_unlink "$filename.pst";
1181 } 1283 }
1205 my $st = eval { Coro::Storable::thaw $av }; 1307 my $st = eval { Coro::Storable::thaw $av };
1206 $av = $st->{objs}; 1308 $av = $st->{objs};
1207 } 1309 }
1208 1310
1209 utf8::decode (my $decname = $filename); 1311 utf8::decode (my $decname = $filename);
1210 warn sprintf "loading %s (%d,%d)\n", 1312 trace sprintf "loading %s (%d,%d)\n",
1211 $decname, length $data, scalar @{$av || []}; 1313 $decname, length $data, scalar @{$av || []}
1314 if $VERBOSE_IO;
1212 1315
1213 ($data, $av) 1316 ($data, $av)
1214} 1317}
1215 1318
1216=head2 COMMAND CALLBACKS 1319=head2 COMMAND CALLBACKS
1272 my ($name, $cb) = @_; 1375 my ($name, $cb) = @_;
1273 1376
1274 $EXTICMD{$name} = $cb; 1377 $EXTICMD{$name} = $cb;
1275} 1378}
1276 1379
1380use File::Glob ();
1381
1277cf::player->attach ( 1382cf::player->attach (
1278 on_command => sub { 1383 on_unknown_command => sub {
1279 my ($pl, $name, $params) = @_; 1384 my ($pl, $name, $params) = @_;
1280 1385
1281 my $cb = $COMMAND{$name} 1386 my $cb = $COMMAND{$name}
1282 or return; 1387 or return;
1283 1388
1306 1411
1307 $pl->ext_reply ($reply, @reply) 1412 $pl->ext_reply ($reply, @reply)
1308 if $reply; 1413 if $reply;
1309 1414
1310 } else { 1415 } else {
1311 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1416 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1312 } 1417 }
1313 1418
1314 cf::override; 1419 cf::override;
1315 }, 1420 },
1316); 1421);
1317 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
1318sub load_extensions { 1436sub load_extensions {
1437 info "loading extensions...";
1438
1319 cf::sync_job { 1439 cf::sync_job {
1320 my %todo; 1440 my %todo;
1321 1441
1322 for my $path (<$LIBDIR/*.ext>) { 1442 for my $path (<$LIBDIR/*.ext>) {
1323 next unless -r $path; 1443 next unless -r $path;
1341 1461
1342 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1462 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1343 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1463 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1344 1464
1345 $ext{source} = 1465 $ext{source} =
1346 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1466 "package $pkg; use common::sense;\n"
1347 . "#line 1 \"$path\"\n{\n" 1467 . "#line 1 \"$path\"\n{\n"
1348 . $source 1468 . $source
1349 . "\n};\n1"; 1469 . "\n};\n1";
1350 1470
1351 $todo{$base} = \%ext; 1471 $todo{$base} = \%ext;
1352 } 1472 }
1353 1473
1474 my $pass = 0;
1354 my %done; 1475 my %done;
1355 while (%todo) { 1476 while (%todo) {
1356 my $progress; 1477 my $progress;
1357 1478
1479 ++$pass;
1480
1481 ext:
1358 while (my ($k, $v) = each %todo) { 1482 while (my ($k, $v) = each %todo) {
1359 for (split /,\s*/, $v->{meta}{depends}) { 1483 for (split /,\s*/, $v->{meta}{depends}) {
1360 goto skip 1484 next ext
1361 unless exists $done{$_}; 1485 unless exists $done{$_};
1362 } 1486 }
1363 1487
1364 warn "... loading '$k' into '$v->{pkg}'\n"; 1488 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1365 1489
1366 unless (eval $v->{source}) { 1490 my $active = eval $v->{source};
1491
1492 if (length $@) {
1367 my $msg = $@ ? "$v->{path}: $@\n" 1493 error "$v->{path}: $@\n";
1368 : "$v->{base}: extension inactive.\n";
1369 1494
1370 if (exists $v->{meta}{mandatory}) {
1371 warn $msg;
1372 cf::cleanup "mandatory extension failed to load, exiting."; 1495 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1373 } 1496 if exists $v->{meta}{mandatory};
1374 1497
1375 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;
1376 } 1507 }
1377
1378 $done{$k} = delete $todo{$k};
1379 push @EXTS, $v->{pkg};
1380 $progress = 1;
1381 } 1508 }
1382 1509
1383 skip: 1510 unless ($progress) {
1384 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1511 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1385 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 }
1386 } 1518 }
1387 }; 1519 };
1388} 1520}
1389 1521
1390############################################################################# 1522#############################################################################
1444 1576
1445sub exists($) { 1577sub exists($) {
1446 my ($login) = @_; 1578 my ($login) = @_;
1447 1579
1448 $cf::PLAYER{$login} 1580 $cf::PLAYER{$login}
1449 or cf::sync_job { !aio_stat path $login } 1581 or !aio_stat path $login
1450} 1582}
1451 1583
1452sub find($) { 1584sub find($) {
1453 return $cf::PLAYER{$_[0]} || do { 1585 return $cf::PLAYER{$_[0]} || do {
1454 my $login = $_[0]; 1586 my $login = $_[0];
1474 $cf::PLAYER{$login} = $pl 1606 $cf::PLAYER{$login} = $pl
1475 } 1607 }
1476 } 1608 }
1477} 1609}
1478 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
1479sub save($) { 1624sub save($) {
1480 my ($pl) = @_; 1625 my ($pl) = @_;
1481 1626
1482 return if $pl->{deny_save}; 1627 return if $pl->{deny_save};
1483 1628
1488 1633
1489 aio_mkdir playerdir $pl, 0770; 1634 aio_mkdir playerdir $pl, 0770;
1490 $pl->{last_save} = $cf::RUNTIME; 1635 $pl->{last_save} = $cf::RUNTIME;
1491 1636
1492 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];
1493 1641
1494 $pl->save_pl ($path); 1642 $pl->save_pl ($path);
1495 cf::cede_to_tick; 1643 cf::cede_to_tick;
1496} 1644}
1497 1645
1531 my $name = $pl->ob->name; 1679 my $name = $pl->ob->name;
1532 1680
1533 $pl->{deny_save} = 1; 1681 $pl->{deny_save} = 1;
1534 $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
1535 1683
1536 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1684 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1537 $pl->deactivate; 1685 $pl->deactivate;
1686
1538 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;
1539 $pl->ob->check_score;
1540 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1688 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1689 ext::highscore::check ($pl->ob);
1690
1541 $pl->ns->destroy if $pl->ns; 1691 $pl->ns->destroy if $pl->ns;
1542 1692
1543 my $path = playerdir $pl; 1693 my $path = playerdir $pl;
1544 my $temp = "$path~$cf::RUNTIME~deleting~"; 1694 my $temp = "$path~$cf::RUNTIME~deleting~";
1545 aio_rename $path, $temp; 1695 aio_rename $path, $temp;
1599 \@logins 1749 \@logins
1600} 1750}
1601 1751
1602=item $player->maps 1752=item $player->maps
1603 1753
1754=item cf::player::maps $login
1755
1604Returns an arrayref of map paths that are private for this 1756Returns an arrayref of map paths that are private for this
1605player. May block. 1757player. May block.
1606 1758
1607=cut 1759=cut
1608 1760
1670=cut 1822=cut
1671 1823
1672sub find_by_path($) { 1824sub find_by_path($) {
1673 my ($path) = @_; 1825 my ($path) = @_;
1674 1826
1827 $path =~ s/^~[^\/]*//; # skip ~login
1828
1675 my ($match, $specificity); 1829 my ($match, $specificity);
1676 1830
1677 for my $region (list) { 1831 for my $region (list) {
1678 if ($region->{match} && $path =~ $region->{match}) { 1832 if ($region->{match} && $path =~ $region->{match}) {
1679 ($match, $specificity) = ($region, $region->specificity) 1833 ($match, $specificity) = ($region, $region->specificity)
1710 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
1711 1865
1712 # mit "rum" bekleckern, nicht 1866 # mit "rum" bekleckern, nicht
1713 $self->_create_random_map ( 1867 $self->_create_random_map (
1714 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1868 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1715 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1869 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1716 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1870 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1717 $rmp->{exit_on_final_map}, 1871 $rmp->{exit_on_final_map},
1718 $rmp->{xsize}, $rmp->{ysize}, 1872 $rmp->{xsize}, $rmp->{ysize},
1719 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1873 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1720 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1874 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1735 1889
1736sub register { 1890sub register {
1737 my (undef, $regex, $prio) = @_; 1891 my (undef, $regex, $prio) = @_;
1738 my $pkg = caller; 1892 my $pkg = caller;
1739 1893
1740 no strict;
1741 push @{"$pkg\::ISA"}, __PACKAGE__; 1894 push @{"$pkg\::ISA"}, __PACKAGE__;
1742 1895
1743 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1896 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1744} 1897}
1745 1898
1746# also paths starting with '/' 1899# also paths starting with '/'
1747$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1900$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1748 1901
1749sub thawer_merge { 1902sub thawer_merge {
1750 my ($self, $merge) = @_; 1903 my ($self, $merge) = @_;
1751 1904
1752 # we have to keep some variables in memory intact 1905 # we have to keep some variables in memory intact
1757} 1910}
1758 1911
1759sub normalise { 1912sub normalise {
1760 my ($path, $base) = @_; 1913 my ($path, $base) = @_;
1761 1914
1762 $path = "$path"; # make sure its a string 1915 $path = "$path"; # make sure it's a string
1763 1916
1764 $path =~ s/\.map$//; 1917 $path =~ s/\.map$//;
1765 1918
1766 # map plan: 1919 # map plan:
1767 # 1920 #
1782 $base =~ s{[^/]+/?$}{}; 1935 $base =~ s{[^/]+/?$}{};
1783 $path = "$base/$path"; 1936 $path = "$base/$path";
1784 } 1937 }
1785 1938
1786 for ($path) { 1939 for ($path) {
1787 redo if s{//}{/};
1788 redo if s{/\.?/}{/}; 1940 redo if s{/\.?/}{/};
1789 redo if s{/[^/]+/\.\./}{/}; 1941 redo if s{/[^/]+/\.\./}{/};
1790 } 1942 }
1791 1943
1792 $path 1944 $path
1806 $self->init; # pass $1 etc. 1958 $self->init; # pass $1 etc.
1807 return $self; 1959 return $self;
1808 } 1960 }
1809 } 1961 }
1810 1962
1811 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1963 Carp::cluck "unable to resolve path '$path' (base '$base')";
1812 () 1964 ()
1813} 1965}
1814 1966
1815sub init { 1967sub init {
1816 my ($self) = @_; 1968 my ($self) = @_;
1848sub uniq_path { 2000sub uniq_path {
1849 my ($self) = @_; 2001 my ($self) = @_;
1850 2002
1851 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2003 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1852 "$UNIQUEDIR/$path" 2004 "$UNIQUEDIR/$path"
1853}
1854
1855# and all this just because we cannot iterate over
1856# all maps in C++...
1857sub change_all_map_light {
1858 my ($change) = @_;
1859
1860 $_->change_map_light ($change)
1861 for grep $_->outdoor, values %cf::MAP;
1862} 2005}
1863 2006
1864sub decay_objects { 2007sub decay_objects {
1865 my ($self) = @_; 2008 my ($self) = @_;
1866 2009
1948 2091
1949sub find; 2092sub find;
1950sub find { 2093sub find {
1951 my ($path, $origin) = @_; 2094 my ($path, $origin) = @_;
1952 2095
2096 cf::cede_to_tick;
2097
1953 $path = normalise $path, $origin && $origin->path; 2098 $path = normalise $path, $origin && $origin->path;
1954 2099
1955 cf::lock_wait "map_data:$path";#d#remove 2100 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1956 cf::lock_wait "map_find:$path"; 2101 my $guard2 = cf::lock_acquire "map_find:$path";
1957 2102
1958 $cf::MAP{$path} || do { 2103 $cf::MAP{$path} || do {
1959 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1960 my $guard2 = cf::lock_acquire "map_find:$path";
1961
1962 my $map = new_from_path cf::map $path 2104 my $map = new_from_path cf::map $path
1963 or return; 2105 or return;
1964 2106
1965 $map->{last_save} = $cf::RUNTIME; 2107 $map->{last_save} = $cf::RUNTIME;
1966 2108
1978 2120
1979 $cf::MAP{$path} = $map 2121 $cf::MAP{$path} = $map
1980 } 2122 }
1981} 2123}
1982 2124
1983sub pre_load { } 2125sub pre_load { }
1984sub post_load { } 2126#sub post_load { } # XS
1985 2127
1986sub load { 2128sub load {
1987 my ($self) = @_; 2129 my ($self) = @_;
1988 2130
1989 local $self->{deny_reset} = 1; # loading can take a long time 2131 local $self->{deny_reset} = 1; # loading can take a long time
2034 unless ($self->{deny_activate}) { 2176 unless ($self->{deny_activate}) {
2035 $self->decay_objects; 2177 $self->decay_objects;
2036 $self->fix_auto_apply; 2178 $self->fix_auto_apply;
2037 $self->update_buttons; 2179 $self->update_buttons;
2038 cf::cede_to_tick; 2180 cf::cede_to_tick;
2039 $self->set_darkness_map;
2040 cf::cede_to_tick;
2041 $self->activate; 2181 $self->activate;
2042 } 2182 }
2043 2183
2044 $self->{last_save} = $cf::RUNTIME; 2184 $self->{last_save} = $cf::RUNTIME;
2045 $self->last_access ($cf::RUNTIME); 2185 $self->last_access ($cf::RUNTIME);
2048 } 2188 }
2049 2189
2050 $self->post_load; 2190 $self->post_load;
2051} 2191}
2052 2192
2193# customize the map for a given player, i.e.
2194# return the _real_ map. used by e.g. per-player
2195# maps to change the path to ~playername/mappath
2053sub customise_for { 2196sub customise_for {
2054 my ($self, $ob) = @_; 2197 my ($self, $ob) = @_;
2055 2198
2056 return find "~" . $ob->name . "/" . $self->{path} 2199 return find "~" . $ob->name . "/" . $self->{path}
2057 if $self->per_player; 2200 if $self->per_player;
2073 or next; 2216 or next;
2074 $neigh = find $neigh, $map 2217 $neigh = find $neigh, $map
2075 or next; 2218 or next;
2076 $neigh->load; 2219 $neigh->load;
2077 2220
2221 # now find the diagonal neighbours
2078 push @neigh, 2222 push @neigh,
2079 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2223 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2080 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2224 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2081 } 2225 }
2082 2226
2089} 2233}
2090 2234
2091sub find_sync { 2235sub find_sync {
2092 my ($path, $origin) = @_; 2236 my ($path, $origin) = @_;
2093 2237
2094 cf::sync_job { find $path, $origin } 2238 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2239 if $Coro::current == $Coro::main;
2240
2241 find $path, $origin
2095} 2242}
2096 2243
2097sub do_load_sync { 2244sub do_load_sync {
2098 my ($map) = @_; 2245 my ($map) = @_;
2099 2246
2100 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2247 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2101 if $Coro::current == $Coro::main; 2248 if $Coro::current == $Coro::main;
2102 2249
2103 cf::sync_job { $map->load }; 2250 $map->load;
2104} 2251}
2105 2252
2106our %MAP_PREFETCH; 2253our %MAP_PREFETCH;
2107our $MAP_PREFETCHER = undef; 2254our $MAP_PREFETCHER = undef;
2108 2255
2134 $MAP_PREFETCHER->prio (6); 2281 $MAP_PREFETCHER->prio (6);
2135 2282
2136 () 2283 ()
2137} 2284}
2138 2285
2286# common code, used by both ->save and ->swapout
2139sub save { 2287sub _save {
2140 my ($self) = @_; 2288 my ($self) = @_;
2141
2142 my $lock = cf::lock_acquire "map_data:$self->{path}";
2143 2289
2144 $self->{last_save} = $cf::RUNTIME; 2290 $self->{last_save} = $cf::RUNTIME;
2145 2291
2146 return unless $self->dirty; 2292 return unless $self->dirty;
2147 2293
2167 } else { 2313 } else {
2168 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2314 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2169 } 2315 }
2170} 2316}
2171 2317
2318sub save {
2319 my ($self) = @_;
2320
2321 my $lock = cf::lock_acquire "map_data:$self->{path}";
2322
2323 $self->_save;
2324}
2325
2172sub swap_out { 2326sub swap_out {
2173 my ($self) = @_; 2327 my ($self) = @_;
2174 2328
2175 # save first because save cedes
2176 $self->save;
2177
2178 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2329 my $lock = cf::lock_acquire "map_data:$self->{path}";
2179 2330
2180 return if $self->players;
2181 return if $self->in_memory != cf::MAP_ACTIVE; 2331 return if $self->in_memory != cf::MAP_ACTIVE;
2182 return if $self->{deny_save}; 2332 return if $self->{deny_save};
2333 return if $self->players;
2183 2334
2335 # first deactivate the map and "unlink" it from the core
2336 $self->deactivate;
2337 $_->clear_links_to ($self) for values %cf::MAP;
2184 $self->in_memory (cf::MAP_SWAPPED); 2338 $self->in_memory (cf::MAP_SWAPPED);
2339
2340 # then atomically save
2341 $self->_save;
2342
2343 # then free the map
2344 $self->clear;
2345}
2346
2347sub reset_at {
2348 my ($self) = @_;
2349
2350 # TODO: safety, remove and allow resettable per-player maps
2351 return 1e99 if $self->{deny_reset};
2352
2353 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2354 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2355
2356 $time + $to
2357}
2358
2359sub should_reset {
2360 my ($self) = @_;
2361
2362 $self->reset_at <= $cf::RUNTIME
2363}
2364
2365sub reset {
2366 my ($self) = @_;
2367
2368 my $lock = cf::lock_acquire "map_data:$self->{path}";
2369
2370 return if $self->players;
2371
2372 cf::trace "resetting map ", $self->path, "\n";
2373
2374 $self->in_memory (cf::MAP_SWAPPED);
2375
2376 # need to save uniques path
2377 unless ($self->{deny_save}) {
2378 my $uniq = $self->uniq_path; utf8::encode $uniq;
2379
2380 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2381 if $uniq;
2382 }
2383
2384 delete $cf::MAP{$self->path};
2185 2385
2186 $self->deactivate; 2386 $self->deactivate;
2187 $_->clear_links_to ($self) for values %cf::MAP; 2387 $_->clear_links_to ($self) for values %cf::MAP;
2188 $self->clear; 2388 $self->clear;
2189}
2190
2191sub reset_at {
2192 my ($self) = @_;
2193
2194 # TODO: safety, remove and allow resettable per-player maps
2195 return 1e99 if $self->{deny_reset};
2196
2197 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2198 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2199
2200 $time + $to
2201}
2202
2203sub should_reset {
2204 my ($self) = @_;
2205
2206 $self->reset_at <= $cf::RUNTIME
2207}
2208
2209sub reset {
2210 my ($self) = @_;
2211
2212 my $lock = cf::lock_acquire "map_data:$self->{path}";
2213
2214 return if $self->players;
2215
2216 warn "resetting map ", $self->path;
2217
2218 $self->in_memory (cf::MAP_SWAPPED);
2219
2220 # need to save uniques path
2221 unless ($self->{deny_save}) {
2222 my $uniq = $self->uniq_path; utf8::encode $uniq;
2223
2224 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2225 if $uniq;
2226 }
2227
2228 delete $cf::MAP{$self->path};
2229
2230 $self->deactivate;
2231 $_->clear_links_to ($self) for values %cf::MAP;
2232 $self->clear;
2233 2389
2234 $self->unlink_save; 2390 $self->unlink_save;
2235 $self->destroy; 2391 $self->destroy;
2236} 2392}
2237 2393
2245 2401
2246 delete $cf::MAP{$self->path}; 2402 delete $cf::MAP{$self->path};
2247 2403
2248 $self->unlink_save; 2404 $self->unlink_save;
2249 2405
2250 bless $self, "cf::map"; 2406 bless $self, "cf::map::wrap";
2251 delete $self->{deny_reset}; 2407 delete $self->{deny_reset};
2252 $self->{deny_save} = 1; 2408 $self->{deny_save} = 1;
2253 $self->reset_timeout (1); 2409 $self->reset_timeout (1);
2254 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2410 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2255 2411
2312 : normalise $_ 2468 : normalise $_
2313 } @{ aio_readdir $UNIQUEDIR or [] } 2469 } @{ aio_readdir $UNIQUEDIR or [] }
2314 ] 2470 ]
2315} 2471}
2316 2472
2473=item cf::map::static_maps
2474
2475Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2476file in the shared directory excluding F</styles> and F</editor>). May
2477block.
2478
2479=cut
2480
2481sub static_maps() {
2482 my @dirs = "";
2483 my @maps;
2484
2485 while (@dirs) {
2486 my $dir = shift @dirs;
2487
2488 next if $dir eq "/styles" || $dir eq "/editor";
2489
2490 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2491 or return;
2492
2493 for (@$files) {
2494 s/\.map$// or next;
2495 utf8::decode $_;
2496 push @maps, "$dir/$_";
2497 }
2498
2499 push @dirs, map "$dir/$_", @$dirs;
2500 }
2501
2502 \@maps
2503}
2504
2317=back 2505=back
2318 2506
2319=head3 cf::object 2507=head3 cf::object
2320 2508
2321=cut 2509=cut
2386 2574
2387our $SAY_CHANNEL = { 2575our $SAY_CHANNEL = {
2388 id => "say", 2576 id => "say",
2389 title => "Map", 2577 title => "Map",
2390 reply => "say ", 2578 reply => "say ",
2391 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2579 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2392}; 2580};
2393 2581
2394our $CHAT_CHANNEL = { 2582our $CHAT_CHANNEL = {
2395 id => "chat", 2583 id => "chat",
2396 title => "Chat", 2584 title => "Chat",
2453 2641
2454Freezes the player and moves him/her to a special map (C<{link}>). 2642Freezes the player and moves him/her to a special map (C<{link}>).
2455 2643
2456The player should be reasonably safe there for short amounts of time (e.g. 2644The player should be reasonably safe there for short amounts of time (e.g.
2457for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2645for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2458though, as the palyer cannot control the character while it is on the link 2646though, as the player cannot control the character while it is on the link
2459map. 2647map.
2460 2648
2461Will never block. 2649Will never block.
2462 2650
2463=item $player_object->leave_link ($map, $x, $y) 2651=item $player_object->leave_link ($map, $x, $y)
2484sub cf::object::player::enter_link { 2672sub cf::object::player::enter_link {
2485 my ($self) = @_; 2673 my ($self) = @_;
2486 2674
2487 $self->deactivate_recursive; 2675 $self->deactivate_recursive;
2488 2676
2677 ++$self->{_link_recursion};
2678
2489 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2679 return if UNIVERSAL::isa $self->map, "ext::map_link";
2490 2680
2491 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2681 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2492 if $self->map && $self->map->{path} ne "{link}"; 2682 if $self->map && $self->map->{path} ne "{link}";
2493 2683
2494 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2684 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2495} 2685}
2496 2686
2497sub cf::object::player::leave_link { 2687sub cf::object::player::leave_link {
2498 my ($self, $map, $x, $y) = @_; 2688 my ($self, $map, $x, $y) = @_;
2499 2689
2516 ($x, $y) = (-1, -1) 2706 ($x, $y) = (-1, -1)
2517 unless (defined $x) && (defined $y); 2707 unless (defined $x) && (defined $y);
2518 2708
2519 # use -1 or undef as default coordinates, not 0, 0 2709 # use -1 or undef as default coordinates, not 0, 0
2520 ($x, $y) = ($map->enter_x, $map->enter_y) 2710 ($x, $y) = ($map->enter_x, $map->enter_y)
2521 if $x <=0 && $y <= 0; 2711 if $x <= 0 && $y <= 0;
2522 2712
2523 $map->load; 2713 $map->load;
2524 $map->load_neighbours; 2714 $map->load_neighbours;
2525 2715
2526 return unless $self->contr->active; 2716 return unless $self->contr->active;
2527 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2528 $self->activate_recursive;
2529 2717
2530 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2718 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2531 $self->enter_map ($map, $x, $y); 2719 if ($self->enter_map ($map, $x, $y)) {
2532} 2720 # entering was successful
2721 delete $self->{_link_recursion};
2722 # only activate afterwards, to support waiting in hooks
2723 $self->activate_recursive;
2724 }
2533 2725
2726}
2727
2534=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2728=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2535 2729
2536Moves the player to the given map-path and coordinates by first freezing 2730Moves the player to the given map-path and coordinates by first freezing
2537her, loading and preparing them map, calling the provided $check callback 2731her, loading and preparing them map, calling the provided $check callback
2538that has to return the map if sucecssful, and then unfreezes the player on 2732that has to return the map if sucecssful, and then unfreezes the player on
2539the new (success) or old (failed) map position. In either case, $done will 2733the new (success) or old (failed) map position. In either case, $done will
2546 2740
2547our $GOTOGEN; 2741our $GOTOGEN;
2548 2742
2549sub cf::object::player::goto { 2743sub cf::object::player::goto {
2550 my ($self, $path, $x, $y, $check, $done) = @_; 2744 my ($self, $path, $x, $y, $check, $done) = @_;
2745
2746 if ($self->{_link_recursion} >= $MAX_LINKS) {
2747 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2748 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2749 ($path, $x, $y) = @$EMERGENCY_POSITION;
2750 }
2551 2751
2552 # do generation counting so two concurrent goto's will be executed in-order 2752 # do generation counting so two concurrent goto's will be executed in-order
2553 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2753 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2554 2754
2555 $self->enter_link; 2755 $self->enter_link;
2579 my $map = eval { 2779 my $map = eval {
2580 my $map = defined $path ? cf::map::find $path : undef; 2780 my $map = defined $path ? cf::map::find $path : undef;
2581 2781
2582 if ($map) { 2782 if ($map) {
2583 $map = $map->customise_for ($self); 2783 $map = $map->customise_for ($self);
2584 $map = $check->($map) if $check && $map; 2784 $map = $check->($map, $x, $y, $self) if $check && $map;
2585 } else { 2785 } else {
2586 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2786 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2587 } 2787 }
2588 2788
2589 $map 2789 $map
2597 if ($gen == $self->{_goto_generation}) { 2797 if ($gen == $self->{_goto_generation}) {
2598 delete $self->{_goto_generation}; 2798 delete $self->{_goto_generation};
2599 $self->leave_link ($map, $x, $y); 2799 $self->leave_link ($map, $x, $y);
2600 } 2800 }
2601 2801
2602 $done->() if $done; 2802 $done->($self) if $done;
2603 })->prio (1); 2803 })->prio (1);
2604} 2804}
2605 2805
2606=item $player_object->enter_exit ($exit_object) 2806=item $player_object->enter_exit ($exit_object)
2607 2807
2700 $self->message ("Something went wrong deep within the deliantra server. " 2900 $self->message ("Something went wrong deep within the deliantra server. "
2701 . "I'll try to bring you back to the map you were before. " 2901 . "I'll try to bring you back to the map you were before. "
2702 . "Please report this to the dungeon master!", 2902 . "Please report this to the dungeon master!",
2703 cf::NDI_UNIQUE | cf::NDI_RED); 2903 cf::NDI_UNIQUE | cf::NDI_RED);
2704 2904
2705 warn "ERROR in enter_exit: $@"; 2905 error "ERROR in enter_exit: $@";
2706 $self->leave_link; 2906 $self->leave_link;
2707 } 2907 }
2708 })->prio (1); 2908 })->prio (1);
2709} 2909}
2710 2910
2722sub cf::client::send_drawinfo { 2922sub cf::client::send_drawinfo {
2723 my ($self, $text, $flags) = @_; 2923 my ($self, $text, $flags) = @_;
2724 2924
2725 utf8::encode $text; 2925 utf8::encode $text;
2726 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2926 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2927}
2928
2929=item $client->send_big_packet ($pkt)
2930
2931Like C<send_packet>, but tries to compress large packets, and fragments
2932them as required.
2933
2934=cut
2935
2936our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2937
2938sub cf::client::send_big_packet {
2939 my ($self, $pkt) = @_;
2940
2941 # try lzf for large packets
2942 $pkt = "lzf " . Compress::LZF::compress $pkt
2943 if 1024 <= length $pkt and $self->{can_lzf};
2944
2945 # split very large packets
2946 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2947 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2948 $pkt = "frag";
2949 }
2950
2951 $self->send_packet ($pkt);
2727} 2952}
2728 2953
2729=item $client->send_msg ($channel, $msg, $color, [extra...]) 2954=item $client->send_msg ($channel, $msg, $color, [extra...])
2730 2955
2731Send a drawinfo or msg packet to the client, formatting the msg for the 2956Send a drawinfo or msg packet to the client, formatting the msg for the
2735 2960
2736=cut 2961=cut
2737 2962
2738# non-persistent channels (usually the info channel) 2963# non-persistent channels (usually the info channel)
2739our %CHANNEL = ( 2964our %CHANNEL = (
2965 "c/motd" => {
2966 id => "infobox",
2967 title => "MOTD",
2968 reply => undef,
2969 tooltip => "The message of the day",
2970 },
2740 "c/identify" => { 2971 "c/identify" => {
2741 id => "infobox", 2972 id => "infobox",
2742 title => "Identify", 2973 title => "Identify",
2743 reply => undef, 2974 reply => undef,
2744 tooltip => "Items recently identified", 2975 tooltip => "Items recently identified",
2746 "c/examine" => { 2977 "c/examine" => {
2747 id => "infobox", 2978 id => "infobox",
2748 title => "Examine", 2979 title => "Examine",
2749 reply => undef, 2980 reply => undef,
2750 tooltip => "Signs and other items you examined", 2981 tooltip => "Signs and other items you examined",
2982 },
2983 "c/shopinfo" => {
2984 id => "infobox",
2985 title => "Shop Info",
2986 reply => undef,
2987 tooltip => "What your bargaining skill tells you about the shop",
2751 }, 2988 },
2752 "c/book" => { 2989 "c/book" => {
2753 id => "infobox", 2990 id => "infobox",
2754 title => "Book", 2991 title => "Book",
2755 reply => undef, 2992 reply => undef,
2771 id => "infobox", 3008 id => "infobox",
2772 title => "Body Parts", 3009 title => "Body Parts",
2773 reply => undef, 3010 reply => undef,
2774 tooltip => "Shows which body parts you posess and are available", 3011 tooltip => "Shows which body parts you posess and are available",
2775 }, 3012 },
3013 "c/statistics" => {
3014 id => "infobox",
3015 title => "Statistics",
3016 reply => undef,
3017 tooltip => "Shows your primary statistics",
3018 },
2776 "c/skills" => { 3019 "c/skills" => {
2777 id => "infobox", 3020 id => "infobox",
2778 title => "Skills", 3021 title => "Skills",
2779 reply => undef, 3022 reply => undef,
2780 tooltip => "Shows your experience per skill and item power", 3023 tooltip => "Shows your experience per skill and item power",
3024 },
3025 "c/shopitems" => {
3026 id => "infobox",
3027 title => "Shop Items",
3028 reply => undef,
3029 tooltip => "Shows the items currently for sale in this shop",
3030 },
3031 "c/resistances" => {
3032 id => "infobox",
3033 title => "Resistances",
3034 reply => undef,
3035 tooltip => "Shows your resistances",
3036 },
3037 "c/pets" => {
3038 id => "infobox",
3039 title => "Pets",
3040 reply => undef,
3041 tooltip => "Shows information abotu your pets/a specific pet",
3042 },
3043 "c/perceiveself" => {
3044 id => "infobox",
3045 title => "Perceive Self",
3046 reply => undef,
3047 tooltip => "You gained detailed knowledge about yourself",
2781 }, 3048 },
2782 "c/uptime" => { 3049 "c/uptime" => {
2783 id => "infobox", 3050 id => "infobox",
2784 title => "Uptime", 3051 title => "Uptime",
2785 reply => undef, 3052 reply => undef,
2795 id => "party", 3062 id => "party",
2796 title => "Party", 3063 title => "Party",
2797 reply => "gsay ", 3064 reply => "gsay ",
2798 tooltip => "Messages and chat related to your party", 3065 tooltip => "Messages and chat related to your party",
2799 }, 3066 },
3067 "c/death" => {
3068 id => "death",
3069 title => "Death",
3070 reply => undef,
3071 tooltip => "Reason for and more info about your most recent death",
3072 },
3073 "c/say" => $SAY_CHANNEL,
3074 "c/chat" => $CHAT_CHANNEL,
2800); 3075);
2801 3076
2802sub cf::client::send_msg { 3077sub cf::client::send_msg {
2803 my ($self, $channel, $msg, $color, @extra) = @_; 3078 my ($self, $channel, $msg, $color, @extra) = @_;
2804 3079
2809 3084
2810 # check predefined channels, for the benefit of C 3085 # check predefined channels, for the benefit of C
2811 if ($CHANNEL{$channel}) { 3086 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel}; 3087 $channel = $CHANNEL{$channel};
2813 3088
2814 $self->ext_msg (channel_info => $channel) 3089 $self->ext_msg (channel_info => $channel);
2815 if $self->can_msg;
2816
2817 $channel = $channel->{id}; 3090 $channel = $channel->{id};
2818 3091
2819 } elsif (ref $channel) { 3092 } elsif (ref $channel) {
2820 # send meta info to client, if not yet sent 3093 # send meta info to client, if not yet sent
2821 unless (exists $self->{channel}{$channel->{id}}) { 3094 unless (exists $self->{channel}{$channel->{id}}) {
2822 $self->{channel}{$channel->{id}} = $channel; 3095 $self->{channel}{$channel->{id}} = $channel;
2823 $self->ext_msg (channel_info => $channel) 3096 $self->ext_msg (channel_info => $channel);
2824 if $self->can_msg;
2825 } 3097 }
2826 3098
2827 $channel = $channel->{id}; 3099 $channel = $channel->{id};
2828 } 3100 }
2829 3101
2830 return unless @extra || length $msg; 3102 return unless @extra || length $msg;
2831 3103
2832 if ($self->can_msg) {
2833 # default colour, mask it out 3104 # default colour, mask it out
2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3105 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2835 if $color & cf::NDI_DEF; 3106 if $color & cf::NDI_DEF;
2836 3107
2837 my $pkt = "msg " 3108 my $pkt = "msg "
2838 . $self->{json_coder}->encode ( 3109 . $self->{json_coder}->encode (
2839 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3110 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2840 ); 3111 );
2841 3112
2842 # try lzf for large packets
2843 $pkt = "lzf " . Compress::LZF::compress $pkt
2844 if 1024 <= length $pkt and $self->{can_lzf};
2845
2846 # split very large packets
2847 if (8192 < length $pkt and $self->{can_lzf}) {
2848 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2849 $pkt = "frag";
2850 }
2851
2852 $self->send_packet ($pkt); 3113 $self->send_big_packet ($pkt);
2853 } else {
2854 if ($color >= 0) {
2855 # replace some tags by gcfclient-compatible ones
2856 for ($msg) {
2857 1 while
2858 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2859 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2860 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2861 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2862 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2863 }
2864
2865 $color &= cf::NDI_COLOR_MASK;
2866
2867 utf8::encode $msg;
2868
2869 if (0 && $msg =~ /\[/) {
2870 # COMMAND/INFO
2871 $self->send_packet ("drawextinfo $color 10 8 $msg")
2872 } else {
2873 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2874 $self->send_packet ("drawinfo $color $msg")
2875 }
2876 }
2877 }
2878} 3114}
2879 3115
2880=item $client->ext_msg ($type, @msg) 3116=item $client->ext_msg ($type, @msg)
2881 3117
2882Sends an ext event to the client. 3118Sends an ext event to the client.
2885 3121
2886sub cf::client::ext_msg($$@) { 3122sub cf::client::ext_msg($$@) {
2887 my ($self, $type, @msg) = @_; 3123 my ($self, $type, @msg) = @_;
2888 3124
2889 if ($self->extcmd == 2) { 3125 if ($self->extcmd == 2) {
2890 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3126 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2891 } elsif ($self->extcmd == 1) { # TODO: remove 3127 } elsif ($self->extcmd == 1) { # TODO: remove
2892 push @msg, msgtype => "event_$type"; 3128 push @msg, msgtype => "event_$type";
2893 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3129 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2894 } 3130 }
2895} 3131}
2896 3132
2897=item $client->ext_reply ($msgid, @msg) 3133=item $client->ext_reply ($msgid, @msg)
2898 3134
2902 3138
2903sub cf::client::ext_reply($$@) { 3139sub cf::client::ext_reply($$@) {
2904 my ($self, $id, @msg) = @_; 3140 my ($self, $id, @msg) = @_;
2905 3141
2906 if ($self->extcmd == 2) { 3142 if ($self->extcmd == 2) {
2907 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3143 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2908 } elsif ($self->extcmd == 1) { 3144 } elsif ($self->extcmd == 1) {
2909 #TODO: version 1, remove 3145 #TODO: version 1, remove
2910 unshift @msg, msgtype => "reply", msgid => $id; 3146 unshift @msg, msgtype => "reply", msgid => $id;
2911 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3147 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2912 } 3148 }
2913} 3149}
2914 3150
2915=item $success = $client->query ($flags, "text", \&cb) 3151=item $success = $client->query ($flags, "text", \&cb)
2916 3152
2987 3223
2988 $ns->ext_reply ($reply, @reply) 3224 $ns->ext_reply ($reply, @reply)
2989 if $reply; 3225 if $reply;
2990 3226
2991 } else { 3227 } else {
2992 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3228 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2993 } 3229 }
2994 3230
2995 cf::override; 3231 cf::override;
2996 }, 3232 },
2997); 3233);
3017 3253
3018 $coro 3254 $coro
3019} 3255}
3020 3256
3021cf::client->attach ( 3257cf::client->attach (
3022 on_destroy => sub { 3258 on_client_destroy => sub {
3023 my ($ns) = @_; 3259 my ($ns) = @_;
3024 3260
3025 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3261 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3026 }, 3262 },
3027); 3263);
3043our $safe_hole = new Safe::Hole; 3279our $safe_hole = new Safe::Hole;
3044 3280
3045$SIG{FPE} = 'IGNORE'; 3281$SIG{FPE} = 'IGNORE';
3046 3282
3047$safe->permit_only (Opcode::opset qw( 3283$safe->permit_only (Opcode::opset qw(
3048 :base_core :base_mem :base_orig :base_math 3284 :base_core :base_mem :base_orig :base_math :base_loop
3049 grepstart grepwhile mapstart mapwhile 3285 grepstart grepwhile mapstart mapwhile
3050 sort time 3286 sort time
3051)); 3287));
3052 3288
3053# here we export the classes and methods available to script code 3289# here we export the classes and methods available to script code
3057The following functions and methods are available within a safe environment: 3293The following functions and methods are available within a safe environment:
3058 3294
3059 cf::object 3295 cf::object
3060 contr pay_amount pay_player map x y force_find force_add destroy 3296 contr pay_amount pay_player map x y force_find force_add destroy
3061 insert remove name archname title slaying race decrease split 3297 insert remove name archname title slaying race decrease split
3298 value
3062 3299
3063 cf::object::player 3300 cf::object::player
3064 player 3301 player
3065 3302
3066 cf::player 3303 cf::player
3072=cut 3309=cut
3073 3310
3074for ( 3311for (
3075 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3312 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3076 insert remove inv nrof name archname title slaying race 3313 insert remove inv nrof name archname title slaying race
3077 decrease split destroy change_exp)], 3314 decrease split destroy change_exp value msg lore send_msg)],
3078 ["cf::object::player" => qw(player)], 3315 ["cf::object::player" => qw(player)],
3079 ["cf::player" => qw(peaceful)], 3316 ["cf::player" => qw(peaceful send_msg)],
3080 ["cf::map" => qw(trigger)], 3317 ["cf::map" => qw(trigger)],
3081) { 3318) {
3082 no strict 'refs';
3083 my ($pkg, @funs) = @$_; 3319 my ($pkg, @funs) = @$_;
3084 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3320 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3085 for @funs; 3321 for @funs;
3086} 3322}
3087 3323
3102 3338
3103 my $qcode = $code; 3339 my $qcode = $code;
3104 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3340 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3105 $qcode =~ s/\n/\\n/g; 3341 $qcode =~ s/\n/\\n/g;
3106 3342
3343 %vars = (_dummy => 0) unless %vars;
3344
3345 my @res;
3107 local $_; 3346 local $_;
3108 local @safe::cf::_safe_eval_args = values %vars;
3109 3347
3110 my $eval = 3348 my $eval =
3111 "do {\n" 3349 "do {\n"
3112 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3350 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3113 . "#line 0 \"{$qcode}\"\n" 3351 . "#line 0 \"{$qcode}\"\n"
3114 . $code 3352 . $code
3115 . "\n}" 3353 . "\n}"
3116 ; 3354 ;
3117 3355
3356 if ($CFG{safe_eval}) {
3118 sub_generation_inc; 3357 sub_generation_inc;
3358 local @safe::cf::_safe_eval_args = values %vars;
3119 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3359 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3120 sub_generation_inc; 3360 sub_generation_inc;
3361 } else {
3362 local @cf::_safe_eval_args = values %vars;
3363 @res = wantarray ? eval eval : scalar eval $eval;
3364 }
3121 3365
3122 if ($@) { 3366 if ($@) {
3123 warn "$@"; 3367 warn "$@",
3124 warn "while executing safe code '$code'\n"; 3368 "while executing safe code '$code'\n",
3125 warn "with arguments " . (join " ", %vars) . "\n"; 3369 "with arguments " . (join " ", %vars) . "\n";
3126 } 3370 }
3127 3371
3128 wantarray ? @res : $res[0] 3372 wantarray ? @res : $res[0]
3129} 3373}
3130 3374
3144=cut 3388=cut
3145 3389
3146sub register_script_function { 3390sub register_script_function {
3147 my ($fun, $cb) = @_; 3391 my ($fun, $cb) = @_;
3148 3392
3149 no strict 'refs'; 3393 $fun = "safe::$fun" if $CFG{safe_eval};
3150 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3394 *$fun = $safe_hole->wrap ($cb);
3151} 3395}
3152 3396
3153=back 3397=back
3154 3398
3155=cut 3399=cut
3164 # for this (global event?) 3408 # for this (global event?)
3165 %ext::player_env::MUSIC_FACE_CACHE = (); 3409 %ext::player_env::MUSIC_FACE_CACHE = ();
3166 3410
3167 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3411 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3168 3412
3169 warn "loading facedata from $path\n"; 3413 trace "loading facedata from $path\n";
3170 3414
3171 my $facedata;
3172 0 < aio_load $path, $facedata 3415 0 < aio_load $path, my $facedata
3173 or die "$path: $!"; 3416 or die "$path: $!";
3174 3417
3175 $facedata = Coro::Storable::thaw $facedata; 3418 $facedata = Coro::Storable::thaw $facedata;
3176 3419
3177 $facedata->{version} == 2 3420 $facedata->{version} == 2
3178 or cf::cleanup "$path: version mismatch, cannot proceed."; 3421 or cf::cleanup "$path: version mismatch, cannot proceed.";
3179 3422
3180 # patch in the exptable 3423 # patch in the exptable
3424 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3181 $facedata->{resource}{"res/exp_table"} = { 3425 $facedata->{resource}{"res/exp_table"} = {
3182 type => FT_RSRC, 3426 type => FT_RSRC,
3183 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3427 data => $exp_table,
3428 hash => (Digest::MD5::md5 $exp_table),
3184 }; 3429 };
3185 cf::cede_to_tick; 3430 cf::cede_to_tick;
3186 3431
3187 { 3432 {
3188 my $faces = $facedata->{faceinfo}; 3433 my $faces = $facedata->{faceinfo};
3190 while (my ($face, $info) = each %$faces) { 3435 while (my ($face, $info) = each %$faces) {
3191 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3436 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3192 3437
3193 cf::face::set_visibility $idx, $info->{visibility}; 3438 cf::face::set_visibility $idx, $info->{visibility};
3194 cf::face::set_magicmap $idx, $info->{magicmap}; 3439 cf::face::set_magicmap $idx, $info->{magicmap};
3195 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3440 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3196 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3441 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3197 3442
3198 cf::cede_to_tick; 3443 cf::cede_to_tick;
3199 } 3444 }
3200 3445
3201 while (my ($face, $info) = each %$faces) { 3446 while (my ($face, $info) = each %$faces) {
3206 3451
3207 if (my $smooth = cf::face::find $info->{smooth}) { 3452 if (my $smooth = cf::face::find $info->{smooth}) {
3208 cf::face::set_smooth $idx, $smooth; 3453 cf::face::set_smooth $idx, $smooth;
3209 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3454 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3210 } else { 3455 } else {
3211 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3456 error "smooth face '$info->{smooth}' not found for face '$face'";
3212 } 3457 }
3213 3458
3214 cf::cede_to_tick; 3459 cf::cede_to_tick;
3215 } 3460 }
3216 } 3461 }
3225 3470
3226 cf::anim::invalidate_all; # d'oh 3471 cf::anim::invalidate_all; # d'oh
3227 } 3472 }
3228 3473
3229 { 3474 {
3230 # TODO: for gcfclient pleasure, we should give resources
3231 # that gcfclient doesn't grok a >10000 face index.
3232 my $res = $facedata->{resource}; 3475 my $res = $facedata->{resource};
3233 3476
3234 while (my ($name, $info) = each %$res) { 3477 while (my ($name, $info) = each %$res) {
3235 if (defined $info->{type}) { 3478 if (defined $info->{type}) {
3236 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3479 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3237 my $data;
3238 3480
3239 if ($info->{type} & 1) { 3481 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3240 # prepend meta info
3241
3242 my $meta = $enc->encode ({
3243 name => $name,
3244 %{ $info->{meta} || {} },
3245 });
3246
3247 $data = pack "(w/a*)*", $meta, $info->{data};
3248 } else {
3249 $data = $info->{data};
3250 }
3251
3252 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3253 cf::face::set_type $idx, $info->{type}; 3482 cf::face::set_type $idx, $info->{type};
3254 } else { 3483 } else {
3255 $RESOURCE{$name} = $info; 3484 $RESOURCE{$name} = $info; # unused
3256 } 3485 }
3257 3486
3258 cf::cede_to_tick; 3487 cf::cede_to_tick;
3259 } 3488 }
3260 } 3489 }
3261 3490
3262 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3491 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3263 3492
3264 1 3493 1
3265} 3494}
3266
3267cf::global->attach (on_resource_update => sub {
3268 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3269 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3270
3271 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3272 my $sound = $soundconf->{compat}[$_]
3273 or next;
3274
3275 my $face = cf::face::find "sound/$sound->[1]";
3276 cf::sound::set $sound->[0] => $face;
3277 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3278 }
3279
3280 while (my ($k, $v) = each %{$soundconf->{event}}) {
3281 my $face = cf::face::find "sound/$v";
3282 cf::sound::set $k => $face;
3283 }
3284 }
3285});
3286 3495
3287register_exticmd fx_want => sub { 3496register_exticmd fx_want => sub {
3288 my ($ns, $want) = @_; 3497 my ($ns, $want) = @_;
3289 3498
3290 while (my ($k, $v) = each %$want) { 3499 while (my ($k, $v) = each %$want) {
3329sub reload_treasures { 3538sub reload_treasures {
3330 load_resource_file "$DATADIR/treasures" 3539 load_resource_file "$DATADIR/treasures"
3331 or die "unable to load treasurelists\n"; 3540 or die "unable to load treasurelists\n";
3332} 3541}
3333 3542
3543sub reload_sound {
3544 trace "loading sound config from $DATADIR/sound\n";
3545
3546 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3547 or die "$DATADIR/sound $!";
3548
3549 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3550
3551 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3552 my $sound = $soundconf->{compat}[$_]
3553 or next;
3554
3555 my $face = cf::face::find "sound/$sound->[1]";
3556 cf::sound::set $sound->[0] => $face;
3557 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3558 }
3559
3560 while (my ($k, $v) = each %{$soundconf->{event}}) {
3561 my $face = cf::face::find "sound/$v";
3562 cf::sound::set $k => $face;
3563 }
3564}
3565
3334sub reload_resources { 3566sub reload_resources {
3335 warn "reloading resource files...\n"; 3567 trace "reloading resource files...\n";
3336 3568
3569 reload_exp_table;
3570 reload_materials;
3337 reload_facedata; 3571 reload_facedata;
3572 reload_sound;
3338 reload_archetypes; 3573 reload_archetypes;
3339 reload_regions; 3574 reload_regions;
3340 reload_treasures; 3575 reload_treasures;
3341 3576
3342 warn "finished reloading resource files\n"; 3577 trace "finished reloading resource files\n";
3343}
3344
3345sub init {
3346 my $guard = freeze_mainloop;
3347
3348 evthread_start IO::AIO::poll_fileno;
3349
3350 reload_resources;
3351} 3578}
3352 3579
3353sub reload_config { 3580sub reload_config {
3354 open my $fh, "<:utf8", "$CONFDIR/config" 3581 trace "reloading config file...\n";
3355 or return;
3356 3582
3357 local $/; 3583 0 < aio_load "$CONFDIR/config", my $config
3358 *CFG = YAML::Load <$fh>; 3584 or die "$CONFDIR/config: $!";
3359 3585
3586 utf8::decode $config;
3587 *CFG = yaml_load $config;
3588
3360 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3589 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3361 3590
3362 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3591 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3363 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3592 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3364 3593
3365 if (exists $CFG{mlockall}) { 3594 if (exists $CFG{mlockall}) {
3388 3617
3389 seek $fh, 0, 0; 3618 seek $fh, 0, 0;
3390 print $fh $$; 3619 print $fh $$;
3391} 3620}
3392 3621
3622sub main_loop {
3623 trace "EV::loop starting\n";
3624 if (1) {
3625 EV::loop;
3626 }
3627 trace "EV::loop returned\n";
3628 goto &main_loop unless $REALLY_UNLOOP;
3629}
3630
3393sub main { 3631sub main {
3394 atomic; 3632 cf::init_globals; # initialise logging
3633
3634 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3635 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3636 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3637 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3638
3639 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3395 3640
3396 # we must not ever block the main coroutine 3641 # we must not ever block the main coroutine
3397 local $Coro::idle = sub { 3642 local $Coro::idle = sub {
3398 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3643 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3399 (async { 3644 (async {
3400 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3645 $Coro::current->{desc} = "IDLE BUG HANDLER";
3401 EV::loop EV::LOOP_ONESHOT; 3646 EV::loop EV::LOOP_ONESHOT;
3402 })->prio (Coro::PRIO_MAX); 3647 })->prio (Coro::PRIO_MAX);
3403 }; 3648 };
3404 3649
3405 { 3650 evthread_start IO::AIO::poll_fileno;
3406 my $guard = freeze_mainloop; 3651
3652 cf::sync_job {
3653 cf::incloader::init ();
3654
3655 cf::init_anim;
3656 cf::init_attackmess;
3657 cf::init_dynamic;
3658
3659 cf::load_settings;
3660
3661 reload_resources;
3407 reload_config; 3662 reload_config;
3408 db_init; 3663 db_init;
3664
3665 cf::init_uuid;
3666 cf::init_signals;
3667 cf::init_skills;
3668
3669 cf::init_beforeplay;
3670
3671 atomic;
3672
3409 load_extensions; 3673 load_extensions;
3410 3674
3411 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3412 }
3413
3414 utime time, time, $RUNTIMEFILE; 3675 utime time, time, $RUNTIMEFILE;
3415 3676
3416 # no (long-running) fork's whatsoever before this point(!) 3677 # no (long-running) fork's whatsoever before this point(!)
3678 use POSIX ();
3417 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3679 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3418 3680
3419 EV::loop; 3681 cf::_post_init 0;
3682 };
3683
3684 cf::object::thawer::errors_are_fatal 0;
3685 info "parse errors in files are no longer fatal from this point on.\n";
3686
3687 my $free_main; $free_main = EV::idle sub {
3688 undef $free_main;
3689 undef &main; # free gobs of memory :)
3690 };
3691
3692 goto &main_loop;
3420} 3693}
3421 3694
3422############################################################################# 3695#############################################################################
3423# initialisation and cleanup 3696# initialisation and cleanup
3424 3697
3425# install some emergency cleanup handlers 3698# install some emergency cleanup handlers
3426BEGIN { 3699BEGIN {
3427 our %SIGWATCHER = (); 3700 our %SIGWATCHER = ();
3428 for my $signal (qw(INT HUP TERM)) { 3701 for my $signal (qw(INT HUP TERM)) {
3429 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3702 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3430 cf::cleanup "SIG$signal"; 3703 cf::cleanup "SIG$signal";
3431 }; 3704 };
3432 } 3705 }
3433} 3706}
3434 3707
3435sub write_runtime_sync { 3708sub write_runtime_sync {
3709 my $t0 = AE::time;
3710
3436 # first touch the runtime file to show we are still running: 3711 # first touch the runtime file to show we are still running:
3437 # the fsync below can take a very very long time. 3712 # the fsync below can take a very very long time.
3438 3713
3439 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3714 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3440 3715
3441 my $guard = cf::lock_acquire "write_runtime"; 3716 my $guard = cf::lock_acquire "write_runtime";
3442 3717
3443 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3718 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3444 or return; 3719 or return;
3445 3720
3446 my $value = $cf::RUNTIME + 90 + 10; 3721 my $value = $cf::RUNTIME + 90 + 10;
3447 # 10 is the runtime save interval, for a monotonic clock 3722 # 10 is the runtime save interval, for a monotonic clock
3448 # 60 allows for the watchdog to kill the server. 3723 # 60 allows for the watchdog to kill the server.
3461 or return; 3736 or return;
3462 3737
3463 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3738 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3464 and return; 3739 and return;
3465 3740
3466 warn "runtime file written.\n"; 3741 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3467 3742
3468 1 3743 1
3469} 3744}
3470 3745
3471our $uuid_lock; 3746our $uuid_lock;
3480 my $uuid = "$LOCALDIR/uuid"; 3755 my $uuid = "$LOCALDIR/uuid";
3481 3756
3482 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3757 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3483 or return; 3758 or return;
3484 3759
3485 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3760 my $value = uuid_seq uuid_cur;
3761
3762 unless ($value) {
3763 info "cowardly refusing to write zero uuid value!\n";
3764 return;
3765 }
3766
3767 my $value = uuid_str $value + $uuid_skip;
3486 $uuid_skip = 0; 3768 $uuid_skip = 0;
3487 3769
3488 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3770 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3489 and return; 3771 and return;
3490 3772
3496 or return; 3778 or return;
3497 3779
3498 aio_rename "$uuid~", $uuid 3780 aio_rename "$uuid~", $uuid
3499 and return; 3781 and return;
3500 3782
3501 warn "uuid file written ($value).\n"; 3783 trace "uuid file written ($value).\n";
3502 3784
3503 1 3785 1
3504 3786
3505} 3787}
3506 3788
3512} 3794}
3513 3795
3514sub emergency_save() { 3796sub emergency_save() {
3515 my $freeze_guard = cf::freeze_mainloop; 3797 my $freeze_guard = cf::freeze_mainloop;
3516 3798
3517 warn "enter emergency perl save\n"; 3799 info "emergency_perl_save: enter\n";
3800
3801 # this is a trade-off: we want to be very quick here, so
3802 # save all maps without fsync, and later call a global sync
3803 # (which in turn might be very very slow)
3804 local $USE_FSYNC = 0;
3518 3805
3519 cf::sync_job { 3806 cf::sync_job {
3807 cf::write_runtime_sync; # external watchdog should not bark
3808
3520 # use a peculiar iteration method to avoid tripping on perl 3809 # use a peculiar iteration method to avoid tripping on perl
3521 # refcount bugs in for. also avoids problems with players 3810 # refcount bugs in for. also avoids problems with players
3522 # and maps saved/destroyed asynchronously. 3811 # and maps saved/destroyed asynchronously.
3523 warn "begin emergency player save\n"; 3812 info "emergency_perl_save: begin player save\n";
3524 for my $login (keys %cf::PLAYER) { 3813 for my $login (keys %cf::PLAYER) {
3525 my $pl = $cf::PLAYER{$login} or next; 3814 my $pl = $cf::PLAYER{$login} or next;
3526 $pl->valid or next; 3815 $pl->valid or next;
3527 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3816 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3528 $pl->save; 3817 $pl->save;
3529 } 3818 }
3530 warn "end emergency player save\n"; 3819 info "emergency_perl_save: end player save\n";
3531 3820
3532 warn "begin emergency map save\n"; 3821 cf::write_runtime_sync; # external watchdog should not bark
3822
3823 info "emergency_perl_save: begin map save\n";
3533 for my $path (keys %cf::MAP) { 3824 for my $path (keys %cf::MAP) {
3534 my $map = $cf::MAP{$path} or next; 3825 my $map = $cf::MAP{$path} or next;
3535 $map->valid or next; 3826 $map->valid or next;
3536 $map->save; 3827 $map->save;
3537 } 3828 }
3538 warn "end emergency map save\n"; 3829 info "emergency_perl_save: end map save\n";
3539 3830
3540 warn "begin emergency database checkpoint\n"; 3831 cf::write_runtime_sync; # external watchdog should not bark
3832
3833 info "emergency_perl_save: begin database checkpoint\n";
3541 BDB::db_env_txn_checkpoint $DB_ENV; 3834 BDB::db_env_txn_checkpoint $DB_ENV;
3542 warn "end emergency database checkpoint\n"; 3835 info "emergency_perl_save: end database checkpoint\n";
3543 3836
3544 warn "begin write uuid\n"; 3837 info "emergency_perl_save: begin write uuid\n";
3545 write_uuid_sync 1; 3838 write_uuid_sync 1;
3546 warn "end write uuid\n"; 3839 info "emergency_perl_save: end write uuid\n";
3840
3841 cf::write_runtime_sync; # external watchdog should not bark
3842
3843 trace "emergency_perl_save: syncing database to disk";
3844 BDB::db_env_txn_checkpoint $DB_ENV;
3845
3846 info "emergency_perl_save: starting sync\n";
3847 IO::AIO::aio_sync sub {
3848 info "emergency_perl_save: finished sync\n";
3849 };
3850
3851 cf::write_runtime_sync; # external watchdog should not bark
3852
3853 trace "emergency_perl_save: flushing outstanding aio requests";
3854 while (IO::AIO::nreqs || BDB::nreqs) {
3855 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3856 }
3857
3858 cf::write_runtime_sync; # external watchdog should not bark
3547 }; 3859 };
3548 3860
3549 warn "leave emergency perl save\n"; 3861 info "emergency_perl_save: leave\n";
3550} 3862}
3551 3863
3552sub post_cleanup { 3864sub post_cleanup {
3553 my ($make_core) = @_; 3865 my ($make_core) = @_;
3554 3866
3867 IO::AIO::flush;
3868
3555 warn Carp::longmess "post_cleanup backtrace" 3869 error Carp::longmess "post_cleanup backtrace"
3556 if $make_core; 3870 if $make_core;
3557 3871
3558 my $fh = pidfile; 3872 my $fh = pidfile;
3559 unlink $PIDFILE if <$fh> == $$; 3873 unlink $PIDFILE if <$fh> == $$;
3560} 3874}
3580 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3894 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3581 for my $name (keys %$leaf_symtab) { 3895 for my $name (keys %$leaf_symtab) {
3582 _gv_clear *{"$pkg$name"}; 3896 _gv_clear *{"$pkg$name"};
3583# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3897# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3584 } 3898 }
3585 warn "cleared package #$pkg\n";#d#
3586} 3899}
3587
3588our $RELOAD; # how many times to reload
3589 3900
3590sub do_reload_perl() { 3901sub do_reload_perl() {
3591 # can/must only be called in main 3902 # can/must only be called in main
3592 if ($Coro::current != $Coro::main) { 3903 unless (in_main) {
3593 warn "can only reload from main coroutine"; 3904 error "can only reload from main coroutine";
3594 return; 3905 return;
3595 } 3906 }
3596 3907
3597 return if $RELOAD++; 3908 return if $RELOAD++;
3598 3909
3910 my $t1 = AE::time;
3911
3599 while ($RELOAD) { 3912 while ($RELOAD) {
3600 warn "reloading..."; 3913 cf::get_slot 0.1, -1, "reload_perl";
3914 info "perl_reload: reloading...";
3601 3915
3602 warn "entering sync_job"; 3916 trace "perl_reload: entering sync_job";
3603 3917
3604 cf::sync_job { 3918 cf::sync_job {
3605 cf::write_runtime_sync; # external watchdog should not bark
3606 cf::emergency_save; 3919 #cf::emergency_save;
3607 cf::write_runtime_sync; # external watchdog should not bark
3608 3920
3609 warn "syncing database to disk";
3610 BDB::db_env_txn_checkpoint $DB_ENV;
3611
3612 # if anything goes wrong in here, we should simply crash as we already saved
3613
3614 warn "flushing outstanding aio requests";
3615 while (IO::AIO::nreqs || BDB::nreqs) {
3616 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3617 }
3618
3619 warn "cancelling all extension coros"; 3921 trace "perl_reload: cancelling all extension coros";
3620 $_->cancel for values %EXT_CORO; 3922 $_->cancel for values %EXT_CORO;
3621 %EXT_CORO = (); 3923 %EXT_CORO = ();
3622 3924
3623 warn "removing commands"; 3925 trace "perl_reload: removing commands";
3624 %COMMAND = (); 3926 %COMMAND = ();
3625 3927
3626 warn "removing ext/exti commands"; 3928 trace "perl_reload: removing ext/exti commands";
3627 %EXTCMD = (); 3929 %EXTCMD = ();
3628 %EXTICMD = (); 3930 %EXTICMD = ();
3629 3931
3630 warn "unloading/nuking all extensions"; 3932 trace "perl_reload: unloading/nuking all extensions";
3631 for my $pkg (@EXTS) { 3933 for my $pkg (@EXTS) {
3632 warn "... unloading $pkg"; 3934 trace "... unloading $pkg";
3633 3935
3634 if (my $cb = $pkg->can ("unload")) { 3936 if (my $cb = $pkg->can ("unload")) {
3635 eval { 3937 eval {
3636 $cb->($pkg); 3938 $cb->($pkg);
3637 1 3939 1
3638 } or warn "$pkg unloaded, but with errors: $@"; 3940 } or error "$pkg unloaded, but with errors: $@";
3639 } 3941 }
3640 3942
3641 warn "... clearing $pkg"; 3943 trace "... clearing $pkg";
3642 clear_package $pkg; 3944 clear_package $pkg;
3643 } 3945 }
3644 3946
3645 warn "unloading all perl modules loaded from $LIBDIR"; 3947 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3646 while (my ($k, $v) = each %INC) { 3948 while (my ($k, $v) = each %INC) {
3647 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3949 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3648 3950
3649 warn "... unloading $k"; 3951 trace "... unloading $k";
3650 delete $INC{$k}; 3952 delete $INC{$k};
3651 3953
3652 $k =~ s/\.pm$//; 3954 $k =~ s/\.pm$//;
3653 $k =~ s/\//::/g; 3955 $k =~ s/\//::/g;
3654 3956
3657 } 3959 }
3658 3960
3659 clear_package $k; 3961 clear_package $k;
3660 } 3962 }
3661 3963
3662 warn "getting rid of safe::, as good as possible"; 3964 trace "perl_reload: getting rid of safe::, as good as possible";
3663 clear_package "safe::$_" 3965 clear_package "safe::$_"
3664 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3966 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3665 3967
3666 warn "unloading cf.pm \"a bit\""; 3968 trace "perl_reload: unloading cf.pm \"a bit\"";
3667 delete $INC{"cf.pm"}; 3969 delete $INC{"cf.pm"};
3668 delete $INC{"cf/pod.pm"}; 3970 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3669 3971
3670 # don't, removes xs symbols, too, 3972 # don't, removes xs symbols, too,
3671 # and global variables created in xs 3973 # and global variables created in xs
3672 #clear_package __PACKAGE__; 3974 #clear_package __PACKAGE__;
3673 3975
3674 warn "unload completed, starting to reload now"; 3976 info "perl_reload: unload completed, starting to reload now";
3675 3977
3676 warn "reloading cf.pm"; 3978 trace "perl_reload: reloading cf.pm";
3677 require cf; 3979 require cf;
3678 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3980 cf::_connect_to_perl_1;
3679 3981
3680 warn "loading config and database again"; 3982 trace "perl_reload: loading config and database again";
3681 cf::reload_config; 3983 cf::reload_config;
3682 3984
3683 warn "loading extensions"; 3985 trace "perl_reload: loading extensions";
3684 cf::load_extensions; 3986 cf::load_extensions;
3685 3987
3988 if ($REATTACH_ON_RELOAD) {
3686 warn "reattaching attachments to objects/players"; 3989 trace "perl_reload: reattaching attachments to objects/players";
3687 _global_reattach; # objects, sockets 3990 _global_reattach; # objects, sockets
3688 warn "reattaching attachments to maps"; 3991 trace "perl_reload: reattaching attachments to maps";
3689 reattach $_ for values %MAP; 3992 reattach $_ for values %MAP;
3690 warn "reattaching attachments to players"; 3993 trace "perl_reload: reattaching attachments to players";
3691 reattach $_ for values %PLAYER; 3994 reattach $_ for values %PLAYER;
3995 }
3692 3996
3693 warn "leaving sync_job"; 3997 cf::_post_init 1;
3998
3999 trace "perl_reload: leaving sync_job";
3694 4000
3695 1 4001 1
3696 } or do { 4002 } or do {
3697 warn $@; 4003 error $@;
3698 cf::cleanup "error while reloading, exiting."; 4004 cf::cleanup "perl_reload: error, exiting.";
3699 }; 4005 };
3700 4006
3701 warn "reloaded";
3702 --$RELOAD; 4007 --$RELOAD;
3703 } 4008 }
4009
4010 $t1 = AE::time - $t1;
4011 info "perl_reload: completed in ${t1}s\n";
3704}; 4012};
3705 4013
3706our $RELOAD_WATCHER; # used only during reload 4014our $RELOAD_WATCHER; # used only during reload
3707 4015
3708sub reload_perl() { 4016sub reload_perl() {
3709 # doing reload synchronously and two reloads happen back-to-back, 4017 # doing reload synchronously and two reloads happen back-to-back,
3710 # coro crashes during coro_state_free->destroy here. 4018 # coro crashes during coro_state_free->destroy here.
3711 4019
4020 $RELOAD_WATCHER ||= cf::async {
4021 Coro::AIO::aio_wait cache_extensions;
4022
3712 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4023 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3713 do_reload_perl; 4024 do_reload_perl;
3714 undef $RELOAD_WATCHER; 4025 undef $RELOAD_WATCHER;
4026 };
3715 }; 4027 };
3716} 4028}
3717 4029
3718register_command "reload" => sub { 4030register_command "reload" => sub {
3719 my ($who, $arg) = @_; 4031 my ($who, $arg) = @_;
3725 reload_perl; 4037 reload_perl;
3726 }; 4038 };
3727 } 4039 }
3728}; 4040};
3729 4041
3730unshift @INC, $LIBDIR; 4042#############################################################################
3731 4043
3732my $bug_warning = 0; 4044my $bug_warning = 0;
3733 4045
3734our @WAIT_FOR_TICK; 4046our @WAIT_FOR_TICK;
3735our @WAIT_FOR_TICK_BEGIN; 4047our @WAIT_FOR_TICK_BEGIN;
3736 4048
3737sub wait_for_tick { 4049sub wait_for_tick() {
3738 return if tick_inhibit || $Coro::current == $Coro::main; 4050 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3739 4051
3740 my $signal = new Coro::Signal; 4052 my $signal = new Coro::Signal;
3741 push @WAIT_FOR_TICK, $signal; 4053 push @WAIT_FOR_TICK, $signal;
3742 $signal->wait; 4054 $signal->wait;
3743} 4055}
3744 4056
3745sub wait_for_tick_begin { 4057sub wait_for_tick_begin() {
3746 return if tick_inhibit || $Coro::current == $Coro::main; 4058 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3747 4059
3748 my $signal = new Coro::Signal; 4060 my $signal = new Coro::Signal;
3749 push @WAIT_FOR_TICK_BEGIN, $signal; 4061 push @WAIT_FOR_TICK_BEGIN, $signal;
3750 $signal->wait; 4062 $signal->wait;
3751} 4063}
3757 return; 4069 return;
3758 } 4070 }
3759 4071
3760 cf::server_tick; # one server iteration 4072 cf::server_tick; # one server iteration
3761 4073
4074 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4075
3762 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4076 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3763 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4077 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3764 Coro::async_pool { 4078 Coro::async_pool {
3765 $Coro::current->{desc} = "runtime saver"; 4079 $Coro::current->{desc} = "runtime saver";
3766 write_runtime_sync 4080 write_runtime_sync
3767 or warn "ERROR: unable to write runtime file: $!"; 4081 or error "ERROR: unable to write runtime file: $!";
3768 }; 4082 };
3769 } 4083 }
3770 4084
3771 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4085 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3772 $sig->send; 4086 $sig->send;
3780 4094
3781 if (0) { 4095 if (0) {
3782 if ($NEXT_TICK) { 4096 if ($NEXT_TICK) {
3783 my $jitter = $TICK_START - $NEXT_TICK; 4097 my $jitter = $TICK_START - $NEXT_TICK;
3784 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4098 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3785 warn "jitter $JITTER\n";#d# 4099 debug "jitter $JITTER\n";#d#
3786 } 4100 }
3787 } 4101 }
3788} 4102}
3789 4103
3790{ 4104{
3791 # configure BDB 4105 # configure BDB
3792 4106
3793 BDB::min_parallel 8; 4107 BDB::min_parallel 16;
3794 BDB::max_poll_reqs $TICK * 0.1; 4108 BDB::max_poll_reqs $TICK * 0.1;
3795 $AnyEvent::BDB::WATCHER->priority (1); 4109 $AnyEvent::BDB::WATCHER->priority (1);
3796 4110
3797 unless ($DB_ENV) { 4111 unless ($DB_ENV) {
3798 $DB_ENV = BDB::db_env_create; 4112 $DB_ENV = BDB::db_env_create;
3835 IO::AIO::min_parallel 8; 4149 IO::AIO::min_parallel 8;
3836 IO::AIO::max_poll_time $TICK * 0.1; 4150 IO::AIO::max_poll_time $TICK * 0.1;
3837 undef $AnyEvent::AIO::WATCHER; 4151 undef $AnyEvent::AIO::WATCHER;
3838} 4152}
3839 4153
3840my $_log_backtrace; 4154our $_log_backtrace;
4155our $_log_backtrace_last;
3841 4156
3842sub _log_backtrace { 4157sub _log_backtrace {
3843 my ($msg, @addr) = @_; 4158 my ($msg, @addr) = @_;
3844 4159
3845 $msg =~ s/\n//; 4160 $msg =~ s/\n$//;
3846 4161
4162 if ($_log_backtrace_last eq $msg) {
4163 LOG llevInfo, "[ABT] $msg\n";
4164 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3847 # limit the # of concurrent backtraces 4165 # limit the # of concurrent backtraces
3848 if ($_log_backtrace < 2) { 4166 } elsif ($_log_backtrace < 2) {
4167 $_log_backtrace_last = $msg;
3849 ++$_log_backtrace; 4168 ++$_log_backtrace;
3850 my $perl_bt = Carp::longmess $msg; 4169 my $perl_bt = Carp::longmess $msg;
3851 async { 4170 async {
3852 $Coro::current->{desc} = "abt $msg"; 4171 $Coro::current->{desc} = "abt $msg";
3853 4172
3873 LOG llevInfo, "[ABT] $_\n" for @bt; 4192 LOG llevInfo, "[ABT] $_\n" for @bt;
3874 --$_log_backtrace; 4193 --$_log_backtrace;
3875 }; 4194 };
3876 } else { 4195 } else {
3877 LOG llevInfo, "[ABT] $msg\n"; 4196 LOG llevInfo, "[ABT] $msg\n";
3878 LOG llevInfo, "[ABT] [suppressed]\n"; 4197 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3879 } 4198 }
3880} 4199}
3881 4200
3882# load additional modules 4201# load additional modules
3883use cf::pod; 4202require "cf/$_.pm" for @EXTRA_MODULES;
4203cf::_connect_to_perl_2;
3884 4204
3885END { cf::emergency_save } 4205END { cf::emergency_save }
3886 4206
38871 42071
3888 4208

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines