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.452 by root, Tue Sep 23 00:24:52 2008 UTC vs.
Revision 1.558 by root, Tue Oct 5 22:35:30 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use common::sense;
25use utf8;
26use strict "vars", "subs";
27 26
28use Symbol; 27use Symbol;
29use List::Util; 28use List::Util;
30use Socket; 29use Socket;
31use EV; 30use EV;
32use Opcode; 31use Opcode;
33use Safe; 32use Safe;
34use Safe::Hole; 33use Safe::Hole;
35use Storable (); 34use Storable ();
35use Carp ();
36 36
37use Guard ();
37use Coro (); 38use Coro ();
38use Coro::State; 39use Coro::State;
39use Coro::Handle; 40use Coro::Handle;
40use Coro::EV; 41use Coro::EV;
41use Coro::AnyEvent; 42use Coro::AnyEvent;
42use Coro::Timer; 43use Coro::Timer;
43use Coro::Signal; 44use Coro::Signal;
44use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
45use Coro::AnyEvent; 47use Coro::AnyEvent;
46use Coro::AIO; 48use Coro::AIO;
47use Coro::BDB 1.6; 49use Coro::BDB 1.6;
48use Coro::Storable; 50use Coro::Storable;
49use Coro::Util (); 51use Coro::Util ();
50 52
51use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
52use BDB (); 54use BDB ();
53use Data::Dumper; 55use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 56use Fcntl;
56use YAML (); 57use YAML::XS ();
57use IO::AIO (); 58use IO::AIO ();
58use Time::HiRes; 59use Time::HiRes;
59use Compress::LZF; 60use Compress::LZF;
60use Digest::MD5 (); 61use Digest::MD5 ();
61 62
70 71
71# make sure c-lzf reinitialises itself 72# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
73Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
74 75
76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
78
75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
76 82
77our %COMMAND = (); 83our %COMMAND = ();
78our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
79 85
80our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
83our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
84our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
85 91
86our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
87our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
88 96
89our $CONFDIR = confdir; 97our $CONFDIR = confdir;
90our $DATADIR = datadir; 98our $DATADIR = datadir;
91our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
92our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
98our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
99our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
102 110
103our %RESOURCE; 111our %RESOURCE; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
104 118
105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107our $NEXT_TICK; 121our $NEXT_TICK;
108our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
109 123
110our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
112our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
113our $DB_ENV; 127our $DB_ENV;
114 128
129our @EXTRA_MODULES = qw(pod match mapscript incloader);
130
115our %CFG; 131our %CFG;
116 132
117our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
118our $RUNTIME; 134our $RUNTIME;
119our $NOW; 135our $NOW;
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 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
347 push @{ $LOCK{$key} }, $Coro::current;
348 Coro::schedule;
349 }
350} 432}
351 433
352sub lock_acquire($) { 434sub lock_acquire($) {
353 my ($key) = @_; 435 $LOCKS->guard ($_[0])
354
355 # wait, to be sure we are not locked
356 lock_wait $key;
357
358 $LOCK{$key} = [];
359 $LOCKER{$key} = $Coro::current;#d#
360
361 Coro::guard {
362 delete $LOCKER{$key};#d#
363 # wake up all waiters, to be on the safe side
364 $_->ready for @{ delete $LOCK{$key} };
365 }
366} 436}
367 437
368sub lock_active($) { 438sub lock_active($) {
369 my ($key) = @_; 439 $LOCKS->count ($_[0]) < 1
370
371 ! ! $LOCK{$key}
372} 440}
373 441
374sub freeze_mainloop { 442sub freeze_mainloop {
375 tick_inhibit_inc; 443 tick_inhibit_inc;
376 444
377 Coro::guard \&tick_inhibit_dec; 445 &Guard::guard (\&tick_inhibit_dec);
378} 446}
379 447
380=item cf::periodic $interval, $cb 448=item cf::periodic $interval, $cb
381 449
382Like 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
383get spread over timer. 451get spread over time.
384 452
385=cut 453=cut
386 454
387sub periodic($$) { 455sub periodic($$) {
388 my ($interval, $cb) = @_; 456 my ($interval, $cb) = @_;
405 473
406=cut 474=cut
407 475
408our @SLOT_QUEUE; 476our @SLOT_QUEUE;
409our $SLOT_QUEUE; 477our $SLOT_QUEUE;
478our $SLOT_DECAY = 0.9;
410 479
411$SLOT_QUEUE->cancel if $SLOT_QUEUE; 480$SLOT_QUEUE->cancel if $SLOT_QUEUE;
412$SLOT_QUEUE = Coro::async { 481$SLOT_QUEUE = Coro::async {
413 $Coro::current->desc ("timeslot manager"); 482 $Coro::current->desc ("timeslot manager");
414 483
415 my $signal = new Coro::Signal; 484 my $signal = new Coro::Signal;
485 my $busy;
416 486
417 while () { 487 while () {
418 next_job: 488 next_job:
489
419 my $avail = cf::till_tick; 490 my $avail = cf::till_tick;
420 if ($avail > 0.01) { 491
421 for (0 .. $#SLOT_QUEUE) { 492 for (0 .. $#SLOT_QUEUE) {
422 if ($SLOT_QUEUE[$_][0] < $avail) { 493 if ($SLOT_QUEUE[$_][0] <= $avail) {
494 $busy = 0;
423 my $job = splice @SLOT_QUEUE, $_, 1, (); 495 my $job = splice @SLOT_QUEUE, $_, 1, ();
424 $job->[2]->send; 496 $job->[2]->send;
425 Coro::cede; 497 Coro::cede;
426 goto next_job; 498 goto next_job;
427 } 499 } else {
500 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
428 } 501 }
429 } 502 }
430 503
431 if (@SLOT_QUEUE) { 504 if (@SLOT_QUEUE) {
432 # 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
433 push @cf::WAIT_FOR_TICK, $signal; 506 push @cf::WAIT_FOR_TICK, $signal;
434 $signal->wait; 507 $signal->wait;
435 } else { 508 } else {
509 $busy = 0;
436 Coro::schedule; 510 Coro::schedule;
437 } 511 }
438 } 512 }
439}; 513};
440 514
441sub get_slot($;$$) { 515sub get_slot($;$$) {
442 return if tick_inhibit || $Coro::current == $Coro::main; 516 return if tick_inhibit || $Coro::current == $Coro::main;
443 517
444 my ($time, $pri, $name) = @_; 518 my ($time, $pri, $name) = @_;
445 519
446 $time = $TICK * .6 if $time > $TICK * .6; 520 $time = clamp $time, 0.01, $TICK * .6;
521
447 my $sig = new Coro::Signal; 522 my $sig = new Coro::Signal;
448 523
449 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 524 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
450 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 525 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
451 $SLOT_QUEUE->ready; 526 $SLOT_QUEUE->ready;
477=cut 552=cut
478 553
479sub sync_job(&) { 554sub sync_job(&) {
480 my ($job) = @_; 555 my ($job) = @_;
481 556
482 if ($Coro::current == $Coro::main) { 557 if (in_main) {
483 my $time = EV::time; 558 my $time = AE::time;
484 559
485 # this is the main coro, too bad, we have to block 560 # this is the main coro, too bad, we have to block
486 # till the operation succeeds, freezing the server :/ 561 # till the operation succeeds, freezing the server :/
487 562
488 LOG llevError, Carp::longmess "sync job";#d# 563 #LOG llevError, Carp::longmess "sync job";#d#
489 564
490 my $freeze_guard = freeze_mainloop; 565 my $freeze_guard = freeze_mainloop;
491 566
492 my $busy = 1; 567 my $busy = 1;
493 my @res; 568 my @res;
494 569
495 (async { 570 (async {
496 $Coro::current->desc ("sync job coro"); 571 $Coro::current->desc ("sync job coro");
497 @res = eval { $job->() }; 572 @res = eval { $job->() };
498 warn $@ if $@; 573 error $@ if $@;
499 undef $busy; 574 undef $busy;
500 })->prio (Coro::PRIO_MAX); 575 })->prio (Coro::PRIO_MAX);
501 576
502 while ($busy) { 577 while ($busy) {
503 if (Coro::nready) { 578 if (Coro::nready) {
505 } else { 580 } else {
506 EV::loop EV::LOOP_ONESHOT; 581 EV::loop EV::LOOP_ONESHOT;
507 } 582 }
508 } 583 }
509 584
510 my $time = EV::time - $time; 585 my $time = AE::time - $time;
511 586
512 $TICK_START += $time; # do not account sync jobs to server load 587 $TICK_START += $time; # do not account sync jobs to server load
513 588
514 wantarray ? @res : $res[0] 589 wantarray ? @res : $res[0]
515 } else { 590 } else {
537 $EXT_CORO{$coro+0} = $coro; 612 $EXT_CORO{$coro+0} = $coro;
538 613
539 $coro 614 $coro
540} 615}
541 616
542=item fork_call { }, $args 617=item fork_call { }, @args
543 618
544Executes the given code block with the given arguments in a seperate 619Executes the given code block with the given arguments in a seperate
545process, returning the results. Everything must be serialisable with 620process, returning the results. Everything must be serialisable with
546Coro::Storable. May, of course, block. Note that the executed sub may 621Coro::Storable. May, of course, block. Note that the executed sub may
547never block itself or use any form of event handling. 622never block itself or use any form of event handling.
548 623
549=cut 624=cut
550 625
626sub post_fork {
627 reset_signals;
628}
629
551sub fork_call(&@) { 630sub fork_call(&@) {
552 my ($cb, @args) = @_; 631 my ($cb, @args) = @_;
553 632
554 # 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,
555 # otherwise perl prematurely frees the stuff :/ 634 # otherwise perl prematurely frees the stuff :/
556 # TODO: investigate and fix (likely this will be rather laborious) 635 # TODO: investigate and fix (likely this will be rather laborious)
557 636
558 my @res = Coro::Util::fork_eval { 637 my @res = Coro::Util::fork_eval {
559 reset_signals; 638 cf::post_fork;
560 &$cb 639 &$cb
561 }, @args; 640 } @args;
562 641
563 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 )
564} 654}
565 655
566=item $coin = coin_from_name $name 656=item $coin = coin_from_name $name
567 657
568=cut 658=cut
605within each server. 695within each server.
606 696
607=cut 697=cut
608 698
609sub db_table($) { 699sub db_table($) {
700 cf::error "db_get called from main context"
701 if $Coro::current == $Coro::main;
702
610 my ($name) = @_; 703 my ($name) = @_;
611 my $db = BDB::db_create $DB_ENV; 704 my $db = BDB::db_create $DB_ENV;
612 705
613 eval { 706 eval {
614 $db->set_flags (BDB::CHKSUM); 707 $db->set_flags (BDB::CHKSUM);
624} 717}
625 718
626our $DB; 719our $DB;
627 720
628sub db_init { 721sub db_init {
629 cf::sync_job {
630 $DB ||= db_table "db"; 722 $DB ||= db_table "db";
631 };
632} 723}
633 724
634sub db_get($$) { 725sub db_get($$) {
635 my $key = "$_[0]/$_[1]"; 726 my $key = "$_[0]/$_[1]";
636 727
637 cf::sync_job { 728 cf::error "db_get called from main context"
729 if $Coro::current == $Coro::main;
730
638 BDB::db_get $DB, undef, $key, my $data; 731 BDB::db_get $DB, undef, $key, my $data;
639 732
640 $! ? () 733 $! ? ()
641 : $data 734 : $data
642 }
643} 735}
644 736
645sub db_put($$$) { 737sub db_put($$$) {
646 BDB::dbreq_pri 4; 738 BDB::dbreq_pri 4;
647 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 739 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
703 795
704 my $t1 = Time::HiRes::time; 796 my $t1 = Time::HiRes::time;
705 my $data = $process->(\@data); 797 my $data = $process->(\@data);
706 my $t2 = Time::HiRes::time; 798 my $t2 = Time::HiRes::time;
707 799
708 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 800 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
709 801
710 db_put cache => "$id/data", $data; 802 db_put cache => "$id/data", $data;
711 db_put cache => "$id/md5" , $md5; 803 db_put cache => "$id/md5" , $md5;
712 db_put cache => "$id/meta", $meta; 804 db_put cache => "$id/meta", $meta;
713 805
723 815
724=cut 816=cut
725 817
726sub datalog($@) { 818sub datalog($@) {
727 my ($type, %kv) = @_; 819 my ($type, %kv) = @_;
728 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 820 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
729} 821}
730 822
731=back 823=back
732 824
733=cut 825=cut
928 1020
929 } elsif (exists $cb_id{$type}) { 1021 } elsif (exists $cb_id{$type}) {
930 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1022 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
931 1023
932 } elsif (ref $type) { 1024 } elsif (ref $type) {
933 warn "attaching objects not supported, ignoring.\n"; 1025 error "attaching objects not supported, ignoring.\n";
934 1026
935 } else { 1027 } else {
936 shift @arg; 1028 shift @arg;
937 warn "attach argument '$type' not supported, ignoring.\n"; 1029 error "attach argument '$type' not supported, ignoring.\n";
938 } 1030 }
939 } 1031 }
940} 1032}
941 1033
942sub _object_attach { 1034sub _object_attach {
952 _attach $registry, $klass, @attach; 1044 _attach $registry, $klass, @attach;
953 } 1045 }
954 1046
955 $obj->{$name} = \%arg; 1047 $obj->{$name} = \%arg;
956 } else { 1048 } else {
957 warn "object uses attachment '$name' which is not available, postponing.\n"; 1049 info "object uses attachment '$name' which is not available, postponing.\n";
958 } 1050 }
959 1051
960 $obj->{_attachment}{$name} = undef; 1052 $obj->{_attachment}{$name} = undef;
961} 1053}
962 1054
1021 1113
1022 for (@$callbacks) { 1114 for (@$callbacks) {
1023 eval { &{$_->[1]} }; 1115 eval { &{$_->[1]} };
1024 1116
1025 if ($@) { 1117 if ($@) {
1026 warn "$@";
1027 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1118 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1028 override; 1119 override;
1029 } 1120 }
1030 1121
1031 return 1 if $override; 1122 return 1 if $override;
1032 } 1123 }
1111 for (@$attach) { 1202 for (@$attach) {
1112 my ($klass, @attach) = @$_; 1203 my ($klass, @attach) = @$_;
1113 _attach $registry, $klass, @attach; 1204 _attach $registry, $klass, @attach;
1114 } 1205 }
1115 } else { 1206 } else {
1116 warn "object uses attachment '$name' that is not available, postponing.\n"; 1207 info "object uses attachment '$name' that is not available, postponing.\n";
1117 } 1208 }
1118 } 1209 }
1119} 1210}
1120 1211
1121cf::attachable->attach ( 1212cf::attachable->attach (
1148 my ($filename, $rdata, $objs) = @_; 1239 my ($filename, $rdata, $objs) = @_;
1149 1240
1150 sync_job { 1241 sync_job {
1151 if (length $$rdata) { 1242 if (length $$rdata) {
1152 utf8::decode (my $decname = $filename); 1243 utf8::decode (my $decname = $filename);
1153 warn sprintf "saving %s (%d,%d)\n", 1244 trace sprintf "saving %s (%d,%d)\n",
1154 $decname, length $$rdata, scalar @$objs; 1245 $decname, length $$rdata, scalar @$objs
1246 if $VERBOSE_IO;
1155 1247
1156 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1248 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1157 aio_chmod $fh, SAVE_MODE; 1249 aio_chmod $fh, SAVE_MODE;
1158 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1250 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1159 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 }
1160 aio_close $fh; 1255 aio_close $fh;
1161 1256
1162 if (@$objs) { 1257 if (@$objs) {
1163 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) {
1164 aio_chmod $fh, SAVE_MODE; 1259 aio_chmod $fh, SAVE_MODE;
1165 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1260 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1166 aio_write $fh, 0, (length $data), $data, 0; 1261 aio_write $fh, 0, (length $data), $data, 0;
1167 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 }
1168 aio_close $fh; 1266 aio_close $fh;
1169 aio_rename "$filename.pst~", "$filename.pst"; 1267 aio_rename "$filename.pst~", "$filename.pst";
1170 } 1268 }
1171 } else { 1269 } else {
1172 aio_unlink "$filename.pst"; 1270 aio_unlink "$filename.pst";
1173 } 1271 }
1174 1272
1175 aio_rename "$filename~", $filename; 1273 aio_rename "$filename~", $filename;
1274
1275 $filename =~ s%/[^/]+$%%;
1276 aio_pathsync $filename if $cf::USE_FSYNC;
1176 } else { 1277 } else {
1177 warn "FATAL: $filename~: $!\n"; 1278 error "unable to save objects: $filename~: $!\n";
1178 } 1279 }
1179 } else { 1280 } else {
1180 aio_unlink $filename; 1281 aio_unlink $filename;
1181 aio_unlink "$filename.pst"; 1282 aio_unlink "$filename.pst";
1182 } 1283 }
1206 my $st = eval { Coro::Storable::thaw $av }; 1307 my $st = eval { Coro::Storable::thaw $av };
1207 $av = $st->{objs}; 1308 $av = $st->{objs};
1208 } 1309 }
1209 1310
1210 utf8::decode (my $decname = $filename); 1311 utf8::decode (my $decname = $filename);
1211 warn sprintf "loading %s (%d,%d)\n", 1312 trace sprintf "loading %s (%d,%d)\n",
1212 $decname, length $data, scalar @{$av || []}; 1313 $decname, length $data, scalar @{$av || []}
1314 if $VERBOSE_IO;
1213 1315
1214 ($data, $av) 1316 ($data, $av)
1215} 1317}
1216 1318
1217=head2 COMMAND CALLBACKS 1319=head2 COMMAND CALLBACKS
1273 my ($name, $cb) = @_; 1375 my ($name, $cb) = @_;
1274 1376
1275 $EXTICMD{$name} = $cb; 1377 $EXTICMD{$name} = $cb;
1276} 1378}
1277 1379
1380use File::Glob ();
1381
1278cf::player->attach ( 1382cf::player->attach (
1279 on_command => sub { 1383 on_unknown_command => sub {
1280 my ($pl, $name, $params) = @_; 1384 my ($pl, $name, $params) = @_;
1281 1385
1282 my $cb = $COMMAND{$name} 1386 my $cb = $COMMAND{$name}
1283 or return; 1387 or return;
1284 1388
1307 1411
1308 $pl->ext_reply ($reply, @reply) 1412 $pl->ext_reply ($reply, @reply)
1309 if $reply; 1413 if $reply;
1310 1414
1311 } else { 1415 } else {
1312 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1416 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1313 } 1417 }
1314 1418
1315 cf::override; 1419 cf::override;
1316 }, 1420 },
1317); 1421);
1318 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
1319sub load_extensions { 1436sub load_extensions {
1437 info "loading extensions...";
1438
1320 cf::sync_job { 1439 cf::sync_job {
1321 my %todo; 1440 my %todo;
1322 1441
1323 for my $path (<$LIBDIR/*.ext>) { 1442 for my $path (<$LIBDIR/*.ext>) {
1324 next unless -r $path; 1443 next unless -r $path;
1342 1461
1343 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1462 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1344 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1463 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1345 1464
1346 $ext{source} = 1465 $ext{source} =
1347 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1466 "package $pkg; use common::sense;\n"
1348 . "#line 1 \"$path\"\n{\n" 1467 . "#line 1 \"$path\"\n{\n"
1349 . $source 1468 . $source
1350 . "\n};\n1"; 1469 . "\n};\n1";
1351 1470
1352 $todo{$base} = \%ext; 1471 $todo{$base} = \%ext;
1353 } 1472 }
1354 1473
1474 my $pass = 0;
1355 my %done; 1475 my %done;
1356 while (%todo) { 1476 while (%todo) {
1357 my $progress; 1477 my $progress;
1358 1478
1479 ++$pass;
1480
1481 ext:
1359 while (my ($k, $v) = each %todo) { 1482 while (my ($k, $v) = each %todo) {
1360 for (split /,\s*/, $v->{meta}{depends}) { 1483 for (split /,\s*/, $v->{meta}{depends}) {
1361 goto skip 1484 next ext
1362 unless exists $done{$_}; 1485 unless exists $done{$_};
1363 } 1486 }
1364 1487
1365 warn "... loading '$k' into '$v->{pkg}'\n"; 1488 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1366 1489
1367 unless (eval $v->{source}) { 1490 my $active = eval $v->{source};
1491
1492 if (length $@) {
1368 my $msg = $@ ? "$v->{path}: $@\n" 1493 error "$v->{path}: $@\n";
1369 : "$v->{base}: extension inactive.\n";
1370 1494
1371 if (exists $v->{meta}{mandatory}) {
1372 warn $msg;
1373 cf::cleanup "mandatory extension failed to load, exiting."; 1495 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1374 } 1496 if exists $v->{meta}{mandatory};
1375 1497
1376 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;
1377 } 1507 }
1378
1379 $done{$k} = delete $todo{$k};
1380 push @EXTS, $v->{pkg};
1381 $progress = 1;
1382 } 1508 }
1383 1509
1384 skip: 1510 unless ($progress) {
1385 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1511 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1386 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 }
1387 } 1518 }
1388 }; 1519 };
1389} 1520}
1390 1521
1391############################################################################# 1522#############################################################################
1475 $cf::PLAYER{$login} = $pl 1606 $cf::PLAYER{$login} = $pl
1476 } 1607 }
1477 } 1608 }
1478} 1609}
1479 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
1480sub save($) { 1624sub save($) {
1481 my ($pl) = @_; 1625 my ($pl) = @_;
1482 1626
1483 return if $pl->{deny_save}; 1627 return if $pl->{deny_save};
1484 1628
1489 1633
1490 aio_mkdir playerdir $pl, 0770; 1634 aio_mkdir playerdir $pl, 0770;
1491 $pl->{last_save} = $cf::RUNTIME; 1635 $pl->{last_save} = $cf::RUNTIME;
1492 1636
1493 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];
1494 1641
1495 $pl->save_pl ($path); 1642 $pl->save_pl ($path);
1496 cf::cede_to_tick; 1643 cf::cede_to_tick;
1497} 1644}
1498 1645
1532 my $name = $pl->ob->name; 1679 my $name = $pl->ob->name;
1533 1680
1534 $pl->{deny_save} = 1; 1681 $pl->{deny_save} = 1;
1535 $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
1536 1683
1537 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1684 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1538 $pl->deactivate; 1685 $pl->deactivate;
1686
1539 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;
1540 $pl->ob->check_score;
1541 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1688 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1689 ext::highscore::check ($pl->ob);
1690
1542 $pl->ns->destroy if $pl->ns; 1691 $pl->ns->destroy if $pl->ns;
1543 1692
1544 my $path = playerdir $pl; 1693 my $path = playerdir $pl;
1545 my $temp = "$path~$cf::RUNTIME~deleting~"; 1694 my $temp = "$path~$cf::RUNTIME~deleting~";
1546 aio_rename $path, $temp; 1695 aio_rename $path, $temp;
1600 \@logins 1749 \@logins
1601} 1750}
1602 1751
1603=item $player->maps 1752=item $player->maps
1604 1753
1754=item cf::player::maps $login
1755
1605Returns an arrayref of map paths that are private for this 1756Returns an arrayref of map paths that are private for this
1606player. May block. 1757player. May block.
1607 1758
1608=cut 1759=cut
1609 1760
1671=cut 1822=cut
1672 1823
1673sub find_by_path($) { 1824sub find_by_path($) {
1674 my ($path) = @_; 1825 my ($path) = @_;
1675 1826
1827 $path =~ s/^~[^\/]*//; # skip ~login
1828
1676 my ($match, $specificity); 1829 my ($match, $specificity);
1677 1830
1678 for my $region (list) { 1831 for my $region (list) {
1679 if ($region->{match} && $path =~ $region->{match}) { 1832 if ($region->{match} && $path =~ $region->{match}) {
1680 ($match, $specificity) = ($region, $region->specificity) 1833 ($match, $specificity) = ($region, $region->specificity)
1708sub generate_random_map { 1861sub generate_random_map {
1709 my ($self, $rmp) = @_; 1862 my ($self, $rmp) = @_;
1710 1863
1711 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
1712 1865
1713 # mit "rum" bekleckern, nicht
1714 $self->_create_random_map ( 1866 $self->_create_random_map ($rmp);
1715 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1716 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1717 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1718 $rmp->{exit_on_final_map},
1719 $rmp->{xsize}, $rmp->{ysize},
1720 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1721 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1722 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1723 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1724 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1725 (cf::region::find $rmp->{region}), $rmp->{custom}
1726 )
1727} 1867}
1728 1868
1729=item cf::map->register ($regex, $prio) 1869=item cf::map->register ($regex, $prio)
1730 1870
1731Register a handler for the map path matching the given regex at the 1871Register a handler for the map path matching the given regex at the
1736 1876
1737sub register { 1877sub register {
1738 my (undef, $regex, $prio) = @_; 1878 my (undef, $regex, $prio) = @_;
1739 my $pkg = caller; 1879 my $pkg = caller;
1740 1880
1741 no strict;
1742 push @{"$pkg\::ISA"}, __PACKAGE__; 1881 push @{"$pkg\::ISA"}, __PACKAGE__;
1743 1882
1744 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1883 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1745} 1884}
1746 1885
1747# also paths starting with '/' 1886# also paths starting with '/'
1748$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1887$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1749 1888
1750sub thawer_merge { 1889sub thawer_merge {
1751 my ($self, $merge) = @_; 1890 my ($self, $merge) = @_;
1752 1891
1753 # we have to keep some variables in memory intact 1892 # we have to keep some variables in memory intact
1758} 1897}
1759 1898
1760sub normalise { 1899sub normalise {
1761 my ($path, $base) = @_; 1900 my ($path, $base) = @_;
1762 1901
1763 $path = "$path"; # make sure its a string 1902 $path = "$path"; # make sure it's a string
1764 1903
1765 $path =~ s/\.map$//; 1904 $path =~ s/\.map$//;
1766 1905
1767 # map plan: 1906 # map plan:
1768 # 1907 #
1783 $base =~ s{[^/]+/?$}{}; 1922 $base =~ s{[^/]+/?$}{};
1784 $path = "$base/$path"; 1923 $path = "$base/$path";
1785 } 1924 }
1786 1925
1787 for ($path) { 1926 for ($path) {
1788 redo if s{//}{/};
1789 redo if s{/\.?/}{/}; 1927 redo if s{/\.?/}{/};
1790 redo if s{/[^/]+/\.\./}{/}; 1928 redo if s{/[^/]+/\.\./}{/};
1791 } 1929 }
1792 1930
1793 $path 1931 $path
1807 $self->init; # pass $1 etc. 1945 $self->init; # pass $1 etc.
1808 return $self; 1946 return $self;
1809 } 1947 }
1810 } 1948 }
1811 1949
1812 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1950 Carp::cluck "unable to resolve path '$path' (base '$base')";
1813 () 1951 ()
1814} 1952}
1815 1953
1816sub init { 1954sub init {
1817 my ($self) = @_; 1955 my ($self) = @_;
1849sub uniq_path { 1987sub uniq_path {
1850 my ($self) = @_; 1988 my ($self) = @_;
1851 1989
1852 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1990 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1853 "$UNIQUEDIR/$path" 1991 "$UNIQUEDIR/$path"
1854}
1855
1856# and all this just because we cannot iterate over
1857# all maps in C++...
1858sub change_all_map_light {
1859 my ($change) = @_;
1860
1861 $_->change_map_light ($change)
1862 for grep $_->outdoor, values %cf::MAP;
1863} 1992}
1864 1993
1865sub decay_objects { 1994sub decay_objects {
1866 my ($self) = @_; 1995 my ($self) = @_;
1867 1996
1949 2078
1950sub find; 2079sub find;
1951sub find { 2080sub find {
1952 my ($path, $origin) = @_; 2081 my ($path, $origin) = @_;
1953 2082
2083 cf::cede_to_tick;
2084
1954 $path = normalise $path, $origin && $origin->path; 2085 $path = normalise $path, $origin && $origin->path;
1955 2086
1956 cf::lock_wait "map_data:$path";#d#remove 2087 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1957 cf::lock_wait "map_find:$path"; 2088 my $guard2 = cf::lock_acquire "map_find:$path";
1958 2089
1959 $cf::MAP{$path} || do { 2090 $cf::MAP{$path} || do {
1960 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1961 my $guard2 = cf::lock_acquire "map_find:$path";
1962
1963 my $map = new_from_path cf::map $path 2091 my $map = new_from_path cf::map $path
1964 or return; 2092 or return;
1965 2093
1966 $map->{last_save} = $cf::RUNTIME; 2094 $map->{last_save} = $cf::RUNTIME;
1967 2095
1979 2107
1980 $cf::MAP{$path} = $map 2108 $cf::MAP{$path} = $map
1981 } 2109 }
1982} 2110}
1983 2111
1984sub pre_load { } 2112sub pre_load { }
1985sub post_load { } 2113#sub post_load { } # XS
1986 2114
1987sub load { 2115sub load {
1988 my ($self) = @_; 2116 my ($self) = @_;
1989 2117
1990 local $self->{deny_reset} = 1; # loading can take a long time 2118 local $self->{deny_reset} = 1; # loading can take a long time
2035 unless ($self->{deny_activate}) { 2163 unless ($self->{deny_activate}) {
2036 $self->decay_objects; 2164 $self->decay_objects;
2037 $self->fix_auto_apply; 2165 $self->fix_auto_apply;
2038 $self->update_buttons; 2166 $self->update_buttons;
2039 cf::cede_to_tick; 2167 cf::cede_to_tick;
2040 $self->set_darkness_map;
2041 cf::cede_to_tick;
2042 $self->activate; 2168 $self->activate;
2043 } 2169 }
2044 2170
2045 $self->{last_save} = $cf::RUNTIME; 2171 $self->{last_save} = $cf::RUNTIME;
2046 $self->last_access ($cf::RUNTIME); 2172 $self->last_access ($cf::RUNTIME);
2047 2173
2048 $self->in_memory (cf::MAP_ACTIVE); 2174 $self->in_memory (cf::MAP_ACTIVE);
2049 } 2175 }
2050 2176
2051 $self->post_load; 2177 $self->post_load;
2052}
2053 2178
2179 1
2180}
2181
2182# customize the map for a given player, i.e.
2183# return the _real_ map. used by e.g. per-player
2184# maps to change the path to ~playername/mappath
2054sub customise_for { 2185sub customise_for {
2055 my ($self, $ob) = @_; 2186 my ($self, $ob) = @_;
2056 2187
2057 return find "~" . $ob->name . "/" . $self->{path} 2188 return find "~" . $ob->name . "/" . $self->{path}
2058 if $self->per_player; 2189 if $self->per_player;
2074 or next; 2205 or next;
2075 $neigh = find $neigh, $map 2206 $neigh = find $neigh, $map
2076 or next; 2207 or next;
2077 $neigh->load; 2208 $neigh->load;
2078 2209
2210 # now find the diagonal neighbours
2079 push @neigh, 2211 push @neigh,
2080 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2212 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2081 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2213 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2082 } 2214 }
2083 2215
2090} 2222}
2091 2223
2092sub find_sync { 2224sub find_sync {
2093 my ($path, $origin) = @_; 2225 my ($path, $origin) = @_;
2094 2226
2095 cf::sync_job { find $path, $origin } 2227 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2228 if $Coro::current == $Coro::main;
2229
2230 find $path, $origin
2096} 2231}
2097 2232
2098sub do_load_sync { 2233sub do_load_sync {
2099 my ($map) = @_; 2234 my ($map) = @_;
2100 2235
2101 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2236 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2102 if $Coro::current == $Coro::main; 2237 if $Coro::current == $Coro::main;
2103 2238
2104 cf::sync_job { $map->load }; 2239 $map->load;
2105} 2240}
2106 2241
2107our %MAP_PREFETCH; 2242our %MAP_PREFETCH;
2108our $MAP_PREFETCHER = undef; 2243our $MAP_PREFETCHER = undef;
2109 2244
2135 $MAP_PREFETCHER->prio (6); 2270 $MAP_PREFETCHER->prio (6);
2136 2271
2137 () 2272 ()
2138} 2273}
2139 2274
2275# common code, used by both ->save and ->swapout
2140sub save { 2276sub _save {
2141 my ($self) = @_; 2277 my ($self) = @_;
2142
2143 my $lock = cf::lock_acquire "map_data:$self->{path}";
2144 2278
2145 $self->{last_save} = $cf::RUNTIME; 2279 $self->{last_save} = $cf::RUNTIME;
2146 2280
2147 return unless $self->dirty; 2281 return unless $self->dirty;
2148 2282
2168 } else { 2302 } else {
2169 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2303 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2170 } 2304 }
2171} 2305}
2172 2306
2307sub save {
2308 my ($self) = @_;
2309
2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311
2312 $self->_save;
2313}
2314
2173sub swap_out { 2315sub swap_out {
2174 my ($self) = @_; 2316 my ($self) = @_;
2175 2317
2176 # save first because save cedes
2177 $self->save;
2178
2179 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2318 my $lock = cf::lock_acquire "map_data:$self->{path}";
2180 2319
2181 return if $self->players;
2182 return if $self->in_memory != cf::MAP_ACTIVE; 2320 return if $self->in_memory != cf::MAP_ACTIVE;
2183 return if $self->{deny_save}; 2321 return if $self->{deny_save};
2322 return if $self->players;
2184 2323
2324 # first deactivate the map and "unlink" it from the core
2325 $self->deactivate;
2326 $_->clear_links_to ($self) for values %cf::MAP;
2185 $self->in_memory (cf::MAP_SWAPPED); 2327 $self->in_memory (cf::MAP_SWAPPED);
2328
2329 # then atomically save
2330 $self->_save;
2331
2332 # then free the map
2333 $self->clear;
2334}
2335
2336sub reset_at {
2337 my ($self) = @_;
2338
2339 # TODO: safety, remove and allow resettable per-player maps
2340 return 1e99 if $self->{deny_reset};
2341
2342 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2343 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2344
2345 $time + $to
2346}
2347
2348sub should_reset {
2349 my ($self) = @_;
2350
2351 $self->reset_at <= $cf::RUNTIME
2352}
2353
2354sub reset {
2355 my ($self) = @_;
2356
2357 my $lock = cf::lock_acquire "map_data:$self->{path}";
2358
2359 return if $self->players;
2360
2361 cf::trace "resetting map ", $self->path, "\n";
2362
2363 $self->in_memory (cf::MAP_SWAPPED);
2364
2365 # need to save uniques path
2366 unless ($self->{deny_save}) {
2367 my $uniq = $self->uniq_path; utf8::encode $uniq;
2368
2369 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2370 if $uniq;
2371 }
2372
2373 delete $cf::MAP{$self->path};
2186 2374
2187 $self->deactivate; 2375 $self->deactivate;
2188 $_->clear_links_to ($self) for values %cf::MAP; 2376 $_->clear_links_to ($self) for values %cf::MAP;
2189 $self->clear; 2377 $self->clear;
2190}
2191
2192sub reset_at {
2193 my ($self) = @_;
2194
2195 # TODO: safety, remove and allow resettable per-player maps
2196 return 1e99 if $self->{deny_reset};
2197
2198 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2199 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2200
2201 $time + $to
2202}
2203
2204sub should_reset {
2205 my ($self) = @_;
2206
2207 $self->reset_at <= $cf::RUNTIME
2208}
2209
2210sub reset {
2211 my ($self) = @_;
2212
2213 my $lock = cf::lock_acquire "map_data:$self->{path}";
2214
2215 return if $self->players;
2216
2217 warn "resetting map ", $self->path;
2218
2219 $self->in_memory (cf::MAP_SWAPPED);
2220
2221 # need to save uniques path
2222 unless ($self->{deny_save}) {
2223 my $uniq = $self->uniq_path; utf8::encode $uniq;
2224
2225 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2226 if $uniq;
2227 }
2228
2229 delete $cf::MAP{$self->path};
2230
2231 $self->deactivate;
2232 $_->clear_links_to ($self) for values %cf::MAP;
2233 $self->clear;
2234 2378
2235 $self->unlink_save; 2379 $self->unlink_save;
2236 $self->destroy; 2380 $self->destroy;
2237} 2381}
2238 2382
2246 2390
2247 delete $cf::MAP{$self->path}; 2391 delete $cf::MAP{$self->path};
2248 2392
2249 $self->unlink_save; 2393 $self->unlink_save;
2250 2394
2251 bless $self, "cf::map"; 2395 bless $self, "cf::map::wrap";
2252 delete $self->{deny_reset}; 2396 delete $self->{deny_reset};
2253 $self->{deny_save} = 1; 2397 $self->{deny_save} = 1;
2254 $self->reset_timeout (1); 2398 $self->reset_timeout (1);
2255 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2399 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2256 2400
2313 : normalise $_ 2457 : normalise $_
2314 } @{ aio_readdir $UNIQUEDIR or [] } 2458 } @{ aio_readdir $UNIQUEDIR or [] }
2315 ] 2459 ]
2316} 2460}
2317 2461
2462=item cf::map::static_maps
2463
2464Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2465file in the shared directory excluding F</styles> and F</editor>). May
2466block.
2467
2468=cut
2469
2470sub static_maps() {
2471 my @dirs = "";
2472 my @maps;
2473
2474 while (@dirs) {
2475 my $dir = shift @dirs;
2476
2477 next if $dir eq "/styles" || $dir eq "/editor";
2478
2479 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2480 or return;
2481
2482 for (@$files) {
2483 s/\.map$// or next;
2484 utf8::decode $_;
2485 push @maps, "$dir/$_";
2486 }
2487
2488 push @dirs, map "$dir/$_", @$dirs;
2489 }
2490
2491 \@maps
2492}
2493
2318=back 2494=back
2319 2495
2320=head3 cf::object 2496=head3 cf::object
2321 2497
2322=cut 2498=cut
2387 2563
2388our $SAY_CHANNEL = { 2564our $SAY_CHANNEL = {
2389 id => "say", 2565 id => "say",
2390 title => "Map", 2566 title => "Map",
2391 reply => "say ", 2567 reply => "say ",
2392 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2568 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2393}; 2569};
2394 2570
2395our $CHAT_CHANNEL = { 2571our $CHAT_CHANNEL = {
2396 id => "chat", 2572 id => "chat",
2397 title => "Chat", 2573 title => "Chat",
2454 2630
2455Freezes the player and moves him/her to a special map (C<{link}>). 2631Freezes the player and moves him/her to a special map (C<{link}>).
2456 2632
2457The player should be reasonably safe there for short amounts of time (e.g. 2633The player should be reasonably safe there for short amounts of time (e.g.
2458for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2634for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2459though, as the palyer cannot control the character while it is on the link 2635though, as the player cannot control the character while it is on the link
2460map. 2636map.
2461 2637
2462Will never block. 2638Will never block.
2463 2639
2464=item $player_object->leave_link ($map, $x, $y) 2640=item $player_object->leave_link ($map, $x, $y)
2485sub cf::object::player::enter_link { 2661sub cf::object::player::enter_link {
2486 my ($self) = @_; 2662 my ($self) = @_;
2487 2663
2488 $self->deactivate_recursive; 2664 $self->deactivate_recursive;
2489 2665
2666 ++$self->{_link_recursion};
2667
2490 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2668 return if UNIVERSAL::isa $self->map, "ext::map_link";
2491 2669
2492 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2670 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2493 if $self->map && $self->map->{path} ne "{link}"; 2671 if $self->map && $self->map->{path} ne "{link}";
2494 2672
2495 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2673 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2496} 2674}
2497 2675
2498sub cf::object::player::leave_link { 2676sub cf::object::player::leave_link {
2499 my ($self, $map, $x, $y) = @_; 2677 my ($self, $map, $x, $y) = @_;
2500 2678
2517 ($x, $y) = (-1, -1) 2695 ($x, $y) = (-1, -1)
2518 unless (defined $x) && (defined $y); 2696 unless (defined $x) && (defined $y);
2519 2697
2520 # use -1 or undef as default coordinates, not 0, 0 2698 # use -1 or undef as default coordinates, not 0, 0
2521 ($x, $y) = ($map->enter_x, $map->enter_y) 2699 ($x, $y) = ($map->enter_x, $map->enter_y)
2522 if $x <=0 && $y <= 0; 2700 if $x <= 0 && $y <= 0;
2523 2701
2524 $map->load; 2702 $map->load;
2525 $map->load_neighbours; 2703 $map->load_neighbours;
2526 2704
2527 return unless $self->contr->active; 2705 return unless $self->contr->active;
2528 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2529 $self->activate_recursive;
2530 2706
2531 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2707 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2532 $self->enter_map ($map, $x, $y); 2708 if ($self->enter_map ($map, $x, $y)) {
2533} 2709 # entering was successful
2710 delete $self->{_link_recursion};
2711 # only activate afterwards, to support waiting in hooks
2712 $self->activate_recursive;
2713 }
2534 2714
2715}
2716
2535=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2717=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2536 2718
2537Moves the player to the given map-path and coordinates by first freezing 2719Moves the player to the given map-path and coordinates by first freezing
2538her, loading and preparing them map, calling the provided $check callback 2720her, loading and preparing them map, calling the provided $check callback
2539that has to return the map if sucecssful, and then unfreezes the player on 2721that has to return the map if sucecssful, and then unfreezes the player on
2540the new (success) or old (failed) map position. In either case, $done will 2722the new (success) or old (failed) map position. In either case, $done will
2547 2729
2548our $GOTOGEN; 2730our $GOTOGEN;
2549 2731
2550sub cf::object::player::goto { 2732sub cf::object::player::goto {
2551 my ($self, $path, $x, $y, $check, $done) = @_; 2733 my ($self, $path, $x, $y, $check, $done) = @_;
2734
2735 if ($self->{_link_recursion} >= $MAX_LINKS) {
2736 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2737 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2738 ($path, $x, $y) = @$EMERGENCY_POSITION;
2739 }
2552 2740
2553 # do generation counting so two concurrent goto's will be executed in-order 2741 # do generation counting so two concurrent goto's will be executed in-order
2554 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2742 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2555 2743
2556 $self->enter_link; 2744 $self->enter_link;
2580 my $map = eval { 2768 my $map = eval {
2581 my $map = defined $path ? cf::map::find $path : undef; 2769 my $map = defined $path ? cf::map::find $path : undef;
2582 2770
2583 if ($map) { 2771 if ($map) {
2584 $map = $map->customise_for ($self); 2772 $map = $map->customise_for ($self);
2585 $map = $check->($map) if $check && $map; 2773 $map = $check->($map, $x, $y, $self) if $check && $map;
2586 } else { 2774 } else {
2587 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2775 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2588 } 2776 }
2589 2777
2590 $map 2778 $map
2598 if ($gen == $self->{_goto_generation}) { 2786 if ($gen == $self->{_goto_generation}) {
2599 delete $self->{_goto_generation}; 2787 delete $self->{_goto_generation};
2600 $self->leave_link ($map, $x, $y); 2788 $self->leave_link ($map, $x, $y);
2601 } 2789 }
2602 2790
2603 $done->() if $done; 2791 $done->($self) if $done;
2604 })->prio (1); 2792 })->prio (1);
2605} 2793}
2606 2794
2607=item $player_object->enter_exit ($exit_object) 2795=item $player_object->enter_exit ($exit_object)
2608 2796
2701 $self->message ("Something went wrong deep within the deliantra server. " 2889 $self->message ("Something went wrong deep within the deliantra server. "
2702 . "I'll try to bring you back to the map you were before. " 2890 . "I'll try to bring you back to the map you were before. "
2703 . "Please report this to the dungeon master!", 2891 . "Please report this to the dungeon master!",
2704 cf::NDI_UNIQUE | cf::NDI_RED); 2892 cf::NDI_UNIQUE | cf::NDI_RED);
2705 2893
2706 warn "ERROR in enter_exit: $@"; 2894 error "ERROR in enter_exit: $@";
2707 $self->leave_link; 2895 $self->leave_link;
2708 } 2896 }
2709 })->prio (1); 2897 })->prio (1);
2710} 2898}
2711 2899
2723sub cf::client::send_drawinfo { 2911sub cf::client::send_drawinfo {
2724 my ($self, $text, $flags) = @_; 2912 my ($self, $text, $flags) = @_;
2725 2913
2726 utf8::encode $text; 2914 utf8::encode $text;
2727 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2915 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2916}
2917
2918=item $client->send_big_packet ($pkt)
2919
2920Like C<send_packet>, but tries to compress large packets, and fragments
2921them as required.
2922
2923=cut
2924
2925our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2926
2927sub cf::client::send_big_packet {
2928 my ($self, $pkt) = @_;
2929
2930 # try lzf for large packets
2931 $pkt = "lzf " . Compress::LZF::compress $pkt
2932 if 1024 <= length $pkt and $self->{can_lzf};
2933
2934 # split very large packets
2935 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2936 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2937 $pkt = "frag";
2938 }
2939
2940 $self->send_packet ($pkt);
2728} 2941}
2729 2942
2730=item $client->send_msg ($channel, $msg, $color, [extra...]) 2943=item $client->send_msg ($channel, $msg, $color, [extra...])
2731 2944
2732Send a drawinfo or msg packet to the client, formatting the msg for the 2945Send a drawinfo or msg packet to the client, formatting the msg for the
2736 2949
2737=cut 2950=cut
2738 2951
2739# non-persistent channels (usually the info channel) 2952# non-persistent channels (usually the info channel)
2740our %CHANNEL = ( 2953our %CHANNEL = (
2954 "c/motd" => {
2955 id => "infobox",
2956 title => "MOTD",
2957 reply => undef,
2958 tooltip => "The message of the day",
2959 },
2741 "c/identify" => { 2960 "c/identify" => {
2742 id => "infobox", 2961 id => "infobox",
2743 title => "Identify", 2962 title => "Identify",
2744 reply => undef, 2963 reply => undef,
2745 tooltip => "Items recently identified", 2964 tooltip => "Items recently identified",
2747 "c/examine" => { 2966 "c/examine" => {
2748 id => "infobox", 2967 id => "infobox",
2749 title => "Examine", 2968 title => "Examine",
2750 reply => undef, 2969 reply => undef,
2751 tooltip => "Signs and other items you examined", 2970 tooltip => "Signs and other items you examined",
2971 },
2972 "c/shopinfo" => {
2973 id => "infobox",
2974 title => "Shop Info",
2975 reply => undef,
2976 tooltip => "What your bargaining skill tells you about the shop",
2752 }, 2977 },
2753 "c/book" => { 2978 "c/book" => {
2754 id => "infobox", 2979 id => "infobox",
2755 title => "Book", 2980 title => "Book",
2756 reply => undef, 2981 reply => undef,
2772 id => "infobox", 2997 id => "infobox",
2773 title => "Body Parts", 2998 title => "Body Parts",
2774 reply => undef, 2999 reply => undef,
2775 tooltip => "Shows which body parts you posess and are available", 3000 tooltip => "Shows which body parts you posess and are available",
2776 }, 3001 },
3002 "c/statistics" => {
3003 id => "infobox",
3004 title => "Statistics",
3005 reply => undef,
3006 tooltip => "Shows your primary statistics",
3007 },
2777 "c/skills" => { 3008 "c/skills" => {
2778 id => "infobox", 3009 id => "infobox",
2779 title => "Skills", 3010 title => "Skills",
2780 reply => undef, 3011 reply => undef,
2781 tooltip => "Shows your experience per skill and item power", 3012 tooltip => "Shows your experience per skill and item power",
3013 },
3014 "c/shopitems" => {
3015 id => "infobox",
3016 title => "Shop Items",
3017 reply => undef,
3018 tooltip => "Shows the items currently for sale in this shop",
3019 },
3020 "c/resistances" => {
3021 id => "infobox",
3022 title => "Resistances",
3023 reply => undef,
3024 tooltip => "Shows your resistances",
3025 },
3026 "c/pets" => {
3027 id => "infobox",
3028 title => "Pets",
3029 reply => undef,
3030 tooltip => "Shows information abotu your pets/a specific pet",
3031 },
3032 "c/perceiveself" => {
3033 id => "infobox",
3034 title => "Perceive Self",
3035 reply => undef,
3036 tooltip => "You gained detailed knowledge about yourself",
2782 }, 3037 },
2783 "c/uptime" => { 3038 "c/uptime" => {
2784 id => "infobox", 3039 id => "infobox",
2785 title => "Uptime", 3040 title => "Uptime",
2786 reply => undef, 3041 reply => undef,
2796 id => "party", 3051 id => "party",
2797 title => "Party", 3052 title => "Party",
2798 reply => "gsay ", 3053 reply => "gsay ",
2799 tooltip => "Messages and chat related to your party", 3054 tooltip => "Messages and chat related to your party",
2800 }, 3055 },
3056 "c/death" => {
3057 id => "death",
3058 title => "Death",
3059 reply => undef,
3060 tooltip => "Reason for and more info about your most recent death",
3061 },
3062 "c/say" => $SAY_CHANNEL,
3063 "c/chat" => $CHAT_CHANNEL,
2801); 3064);
2802 3065
2803sub cf::client::send_msg { 3066sub cf::client::send_msg {
2804 my ($self, $channel, $msg, $color, @extra) = @_; 3067 my ($self, $channel, $msg, $color, @extra) = @_;
2805 3068
2810 3073
2811 # check predefined channels, for the benefit of C 3074 # check predefined channels, for the benefit of C
2812 if ($CHANNEL{$channel}) { 3075 if ($CHANNEL{$channel}) {
2813 $channel = $CHANNEL{$channel}; 3076 $channel = $CHANNEL{$channel};
2814 3077
2815 $self->ext_msg (channel_info => $channel) 3078 $self->ext_msg (channel_info => $channel);
2816 if $self->can_msg;
2817
2818 $channel = $channel->{id}; 3079 $channel = $channel->{id};
2819 3080
2820 } elsif (ref $channel) { 3081 } elsif (ref $channel) {
2821 # send meta info to client, if not yet sent 3082 # send meta info to client, if not yet sent
2822 unless (exists $self->{channel}{$channel->{id}}) { 3083 unless (exists $self->{channel}{$channel->{id}}) {
2823 $self->{channel}{$channel->{id}} = $channel; 3084 $self->{channel}{$channel->{id}} = $channel;
2824 $self->ext_msg (channel_info => $channel) 3085 $self->ext_msg (channel_info => $channel);
2825 if $self->can_msg;
2826 } 3086 }
2827 3087
2828 $channel = $channel->{id}; 3088 $channel = $channel->{id};
2829 } 3089 }
2830 3090
2831 return unless @extra || length $msg; 3091 return unless @extra || length $msg;
2832 3092
2833 if ($self->can_msg) {
2834 # default colour, mask it out 3093 # default colour, mask it out
2835 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3094 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2836 if $color & cf::NDI_DEF; 3095 if $color & cf::NDI_DEF;
2837 3096
2838 my $pkt = "msg " 3097 my $pkt = "msg "
2839 . $self->{json_coder}->encode ( 3098 . $self->{json_coder}->encode (
2840 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3099 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2841 ); 3100 );
2842 3101
2843 # try lzf for large packets
2844 $pkt = "lzf " . Compress::LZF::compress $pkt
2845 if 1024 <= length $pkt and $self->{can_lzf};
2846
2847 # split very large packets
2848 if (8192 < length $pkt and $self->{can_lzf}) {
2849 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2850 $pkt = "frag";
2851 }
2852
2853 $self->send_packet ($pkt); 3102 $self->send_big_packet ($pkt);
2854 } else {
2855 if ($color >= 0) {
2856 # replace some tags by gcfclient-compatible ones
2857 for ($msg) {
2858 1 while
2859 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2860 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2861 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2862 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2863 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2864 }
2865
2866 $color &= cf::NDI_COLOR_MASK;
2867
2868 utf8::encode $msg;
2869
2870 if (0 && $msg =~ /\[/) {
2871 # COMMAND/INFO
2872 $self->send_packet ("drawextinfo $color 10 8 $msg")
2873 } else {
2874 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2875 $self->send_packet ("drawinfo $color $msg")
2876 }
2877 }
2878 }
2879} 3103}
2880 3104
2881=item $client->ext_msg ($type, @msg) 3105=item $client->ext_msg ($type, @msg)
2882 3106
2883Sends an ext event to the client. 3107Sends an ext event to the client.
2886 3110
2887sub cf::client::ext_msg($$@) { 3111sub cf::client::ext_msg($$@) {
2888 my ($self, $type, @msg) = @_; 3112 my ($self, $type, @msg) = @_;
2889 3113
2890 if ($self->extcmd == 2) { 3114 if ($self->extcmd == 2) {
2891 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3115 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2892 } elsif ($self->extcmd == 1) { # TODO: remove 3116 } elsif ($self->extcmd == 1) { # TODO: remove
2893 push @msg, msgtype => "event_$type"; 3117 push @msg, msgtype => "event_$type";
2894 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3118 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2895 } 3119 }
2896} 3120}
2897 3121
2898=item $client->ext_reply ($msgid, @msg) 3122=item $client->ext_reply ($msgid, @msg)
2899 3123
2903 3127
2904sub cf::client::ext_reply($$@) { 3128sub cf::client::ext_reply($$@) {
2905 my ($self, $id, @msg) = @_; 3129 my ($self, $id, @msg) = @_;
2906 3130
2907 if ($self->extcmd == 2) { 3131 if ($self->extcmd == 2) {
2908 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3132 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2909 } elsif ($self->extcmd == 1) { 3133 } elsif ($self->extcmd == 1) {
2910 #TODO: version 1, remove 3134 #TODO: version 1, remove
2911 unshift @msg, msgtype => "reply", msgid => $id; 3135 unshift @msg, msgtype => "reply", msgid => $id;
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3136 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2913 } 3137 }
2914} 3138}
2915 3139
2916=item $success = $client->query ($flags, "text", \&cb) 3140=item $success = $client->query ($flags, "text", \&cb)
2917 3141
2988 3212
2989 $ns->ext_reply ($reply, @reply) 3213 $ns->ext_reply ($reply, @reply)
2990 if $reply; 3214 if $reply;
2991 3215
2992 } else { 3216 } else {
2993 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3217 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2994 } 3218 }
2995 3219
2996 cf::override; 3220 cf::override;
2997 }, 3221 },
2998); 3222);
3018 3242
3019 $coro 3243 $coro
3020} 3244}
3021 3245
3022cf::client->attach ( 3246cf::client->attach (
3023 on_destroy => sub { 3247 on_client_destroy => sub {
3024 my ($ns) = @_; 3248 my ($ns) = @_;
3025 3249
3026 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3250 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3027 }, 3251 },
3028); 3252);
3044our $safe_hole = new Safe::Hole; 3268our $safe_hole = new Safe::Hole;
3045 3269
3046$SIG{FPE} = 'IGNORE'; 3270$SIG{FPE} = 'IGNORE';
3047 3271
3048$safe->permit_only (Opcode::opset qw( 3272$safe->permit_only (Opcode::opset qw(
3049 :base_core :base_mem :base_orig :base_math 3273 :base_core :base_mem :base_orig :base_math :base_loop
3050 grepstart grepwhile mapstart mapwhile 3274 grepstart grepwhile mapstart mapwhile
3051 sort time 3275 sort time
3052)); 3276));
3053 3277
3054# here we export the classes and methods available to script code 3278# here we export the classes and methods available to script code
3058The following functions and methods are available within a safe environment: 3282The following functions and methods are available within a safe environment:
3059 3283
3060 cf::object 3284 cf::object
3061 contr pay_amount pay_player map x y force_find force_add destroy 3285 contr pay_amount pay_player map x y force_find force_add destroy
3062 insert remove name archname title slaying race decrease split 3286 insert remove name archname title slaying race decrease split
3287 value
3063 3288
3064 cf::object::player 3289 cf::object::player
3065 player 3290 player
3066 3291
3067 cf::player 3292 cf::player
3073=cut 3298=cut
3074 3299
3075for ( 3300for (
3076 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3301 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3077 insert remove inv nrof name archname title slaying race 3302 insert remove inv nrof name archname title slaying race
3078 decrease split destroy change_exp)], 3303 decrease split destroy change_exp value msg lore send_msg)],
3079 ["cf::object::player" => qw(player)], 3304 ["cf::object::player" => qw(player)],
3080 ["cf::player" => qw(peaceful)], 3305 ["cf::player" => qw(peaceful send_msg)],
3081 ["cf::map" => qw(trigger)], 3306 ["cf::map" => qw(trigger)],
3082) { 3307) {
3083 no strict 'refs';
3084 my ($pkg, @funs) = @$_; 3308 my ($pkg, @funs) = @$_;
3085 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3309 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3086 for @funs; 3310 for @funs;
3087} 3311}
3088 3312
3103 3327
3104 my $qcode = $code; 3328 my $qcode = $code;
3105 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3329 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3106 $qcode =~ s/\n/\\n/g; 3330 $qcode =~ s/\n/\\n/g;
3107 3331
3332 %vars = (_dummy => 0) unless %vars;
3333
3334 my @res;
3108 local $_; 3335 local $_;
3109 local @safe::cf::_safe_eval_args = values %vars;
3110 3336
3111 my $eval = 3337 my $eval =
3112 "do {\n" 3338 "do {\n"
3113 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3339 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3114 . "#line 0 \"{$qcode}\"\n" 3340 . "#line 0 \"{$qcode}\"\n"
3115 . $code 3341 . $code
3116 . "\n}" 3342 . "\n}"
3117 ; 3343 ;
3118 3344
3345 if ($CFG{safe_eval}) {
3119 sub_generation_inc; 3346 sub_generation_inc;
3347 local @safe::cf::_safe_eval_args = values %vars;
3120 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3348 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3121 sub_generation_inc; 3349 sub_generation_inc;
3350 } else {
3351 local @cf::_safe_eval_args = values %vars;
3352 @res = wantarray ? eval eval : scalar eval $eval;
3353 }
3122 3354
3123 if ($@) { 3355 if ($@) {
3124 warn "$@"; 3356 warn "$@",
3125 warn "while executing safe code '$code'\n"; 3357 "while executing safe code '$code'\n",
3126 warn "with arguments " . (join " ", %vars) . "\n"; 3358 "with arguments " . (join " ", %vars) . "\n";
3127 } 3359 }
3128 3360
3129 wantarray ? @res : $res[0] 3361 wantarray ? @res : $res[0]
3130} 3362}
3131 3363
3145=cut 3377=cut
3146 3378
3147sub register_script_function { 3379sub register_script_function {
3148 my ($fun, $cb) = @_; 3380 my ($fun, $cb) = @_;
3149 3381
3150 no strict 'refs'; 3382 $fun = "safe::$fun" if $CFG{safe_eval};
3151 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3383 *$fun = $safe_hole->wrap ($cb);
3152} 3384}
3153 3385
3154=back 3386=back
3155 3387
3156=cut 3388=cut
3165 # for this (global event?) 3397 # for this (global event?)
3166 %ext::player_env::MUSIC_FACE_CACHE = (); 3398 %ext::player_env::MUSIC_FACE_CACHE = ();
3167 3399
3168 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3400 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3169 3401
3170 warn "loading facedata from $path\n"; 3402 trace "loading facedata from $path\n";
3171 3403
3172 my $facedata;
3173 0 < aio_load $path, $facedata 3404 0 < aio_load $path, my $facedata
3174 or die "$path: $!"; 3405 or die "$path: $!";
3175 3406
3176 $facedata = Coro::Storable::thaw $facedata; 3407 $facedata = Coro::Storable::thaw $facedata;
3177 3408
3178 $facedata->{version} == 2 3409 $facedata->{version} == 2
3179 or cf::cleanup "$path: version mismatch, cannot proceed."; 3410 or cf::cleanup "$path: version mismatch, cannot proceed.";
3180 3411
3181 # patch in the exptable 3412 # patch in the exptable
3413 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3182 $facedata->{resource}{"res/exp_table"} = { 3414 $facedata->{resource}{"res/exp_table"} = {
3183 type => FT_RSRC, 3415 type => FT_RSRC,
3184 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3416 data => $exp_table,
3417 hash => (Digest::MD5::md5 $exp_table),
3185 }; 3418 };
3186 cf::cede_to_tick; 3419 cf::cede_to_tick;
3187 3420
3188 { 3421 {
3189 my $faces = $facedata->{faceinfo}; 3422 my $faces = $facedata->{faceinfo};
3191 while (my ($face, $info) = each %$faces) { 3424 while (my ($face, $info) = each %$faces) {
3192 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3425 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3193 3426
3194 cf::face::set_visibility $idx, $info->{visibility}; 3427 cf::face::set_visibility $idx, $info->{visibility};
3195 cf::face::set_magicmap $idx, $info->{magicmap}; 3428 cf::face::set_magicmap $idx, $info->{magicmap};
3196 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3429 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3197 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3430 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3431 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3198 3432
3199 cf::cede_to_tick; 3433 cf::cede_to_tick;
3200 } 3434 }
3201 3435
3202 while (my ($face, $info) = each %$faces) { 3436 while (my ($face, $info) = each %$faces) {
3207 3441
3208 if (my $smooth = cf::face::find $info->{smooth}) { 3442 if (my $smooth = cf::face::find $info->{smooth}) {
3209 cf::face::set_smooth $idx, $smooth; 3443 cf::face::set_smooth $idx, $smooth;
3210 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3444 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3211 } else { 3445 } else {
3212 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3446 error "smooth face '$info->{smooth}' not found for face '$face'";
3213 } 3447 }
3214 3448
3215 cf::cede_to_tick; 3449 cf::cede_to_tick;
3216 } 3450 }
3217 } 3451 }
3226 3460
3227 cf::anim::invalidate_all; # d'oh 3461 cf::anim::invalidate_all; # d'oh
3228 } 3462 }
3229 3463
3230 { 3464 {
3231 # TODO: for gcfclient pleasure, we should give resources
3232 # that gcfclient doesn't grok a >10000 face index.
3233 my $res = $facedata->{resource}; 3465 my $res = $facedata->{resource};
3234 3466
3235 while (my ($name, $info) = each %$res) { 3467 while (my ($name, $info) = each %$res) {
3236 if (defined $info->{type}) { 3468 if (defined $info->{type}) {
3237 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3469 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3238 my $data;
3239 3470
3240 if ($info->{type} & 1) { 3471 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3241 # prepend meta info
3242
3243 my $meta = $enc->encode ({
3244 name => $name,
3245 %{ $info->{meta} || {} },
3246 });
3247
3248 $data = pack "(w/a*)*", $meta, $info->{data};
3249 } else {
3250 $data = $info->{data};
3251 }
3252
3253 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3254 cf::face::set_type $idx, $info->{type}; 3472 cf::face::set_type $idx, $info->{type};
3255 } else { 3473 } else {
3256 $RESOURCE{$name} = $info; 3474 $RESOURCE{$name} = $info; # unused
3257 } 3475 }
3258 3476
3259 cf::cede_to_tick; 3477 cf::cede_to_tick;
3260 } 3478 }
3261 } 3479 }
3262 3480
3263 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3481 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3264 3482
3265 1 3483 1
3266} 3484}
3267
3268cf::global->attach (on_resource_update => sub {
3269 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3270 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3271
3272 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3273 my $sound = $soundconf->{compat}[$_]
3274 or next;
3275
3276 my $face = cf::face::find "sound/$sound->[1]";
3277 cf::sound::set $sound->[0] => $face;
3278 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3279 }
3280
3281 while (my ($k, $v) = each %{$soundconf->{event}}) {
3282 my $face = cf::face::find "sound/$v";
3283 cf::sound::set $k => $face;
3284 }
3285 }
3286});
3287 3485
3288register_exticmd fx_want => sub { 3486register_exticmd fx_want => sub {
3289 my ($ns, $want) = @_; 3487 my ($ns, $want) = @_;
3290 3488
3291 while (my ($k, $v) = each %$want) { 3489 while (my ($k, $v) = each %$want) {
3330sub reload_treasures { 3528sub reload_treasures {
3331 load_resource_file "$DATADIR/treasures" 3529 load_resource_file "$DATADIR/treasures"
3332 or die "unable to load treasurelists\n"; 3530 or die "unable to load treasurelists\n";
3333} 3531}
3334 3532
3533sub reload_sound {
3534 trace "loading sound config from $DATADIR/sound\n";
3535
3536 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3537 or die "$DATADIR/sound $!";
3538
3539 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3540
3541 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3542 my $sound = $soundconf->{compat}[$_]
3543 or next;
3544
3545 my $face = cf::face::find "sound/$sound->[1]";
3546 cf::sound::set $sound->[0] => $face;
3547 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3548 }
3549
3550 while (my ($k, $v) = each %{$soundconf->{event}}) {
3551 my $face = cf::face::find "sound/$v";
3552 cf::sound::set $k => $face;
3553 }
3554}
3555
3335sub reload_resources { 3556sub reload_resources {
3336 warn "reloading resource files...\n"; 3557 trace "reloading resource files...\n";
3337 3558
3559 reload_exp_table;
3560 reload_materials;
3338 reload_facedata; 3561 reload_facedata;
3562 reload_sound;
3339 reload_archetypes; 3563 reload_archetypes;
3340 reload_regions; 3564 reload_regions;
3341 reload_treasures; 3565 reload_treasures;
3342 3566
3343 warn "finished reloading resource files\n"; 3567 trace "finished reloading resource files\n";
3344}
3345
3346sub init {
3347 my $guard = freeze_mainloop;
3348
3349 evthread_start IO::AIO::poll_fileno;
3350
3351 reload_resources;
3352} 3568}
3353 3569
3354sub reload_config { 3570sub reload_config {
3355 open my $fh, "<:utf8", "$CONFDIR/config" 3571 trace "reloading config file...\n";
3356 or return;
3357 3572
3358 local $/; 3573 0 < aio_load "$CONFDIR/config", my $config
3359 *CFG = YAML::Load <$fh>; 3574 or die "$CONFDIR/config: $!";
3360 3575
3576 utf8::decode $config;
3577 *CFG = yaml_load $config;
3578
3361 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3579 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3362 3580
3363 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3581 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3364 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3582 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3365 3583
3366 if (exists $CFG{mlockall}) { 3584 if (exists $CFG{mlockall}) {
3389 3607
3390 seek $fh, 0, 0; 3608 seek $fh, 0, 0;
3391 print $fh $$; 3609 print $fh $$;
3392} 3610}
3393 3611
3612sub main_loop {
3613 trace "EV::loop starting\n";
3614 if (1) {
3615 EV::loop;
3616 }
3617 trace "EV::loop returned\n";
3618 goto &main_loop unless $REALLY_UNLOOP;
3619}
3620
3394sub main { 3621sub main {
3395 atomic; 3622 cf::init_globals; # initialise logging
3623
3624 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3625 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3626 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3627 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3628
3629 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3396 3630
3397 # we must not ever block the main coroutine 3631 # we must not ever block the main coroutine
3398 local $Coro::idle = sub { 3632 local $Coro::idle = sub {
3399 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3633 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3400 (async { 3634 (async {
3401 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3635 $Coro::current->{desc} = "IDLE BUG HANDLER";
3402 EV::loop EV::LOOP_ONESHOT; 3636 EV::loop EV::LOOP_ONESHOT;
3403 })->prio (Coro::PRIO_MAX); 3637 })->prio (Coro::PRIO_MAX);
3404 }; 3638 };
3405 3639
3406 { 3640 evthread_start IO::AIO::poll_fileno;
3407 my $guard = freeze_mainloop; 3641
3642 cf::sync_job {
3643 cf::incloader::init ();
3644
3645 cf::init_anim;
3646 cf::init_attackmess;
3647 cf::init_dynamic;
3648
3649 cf::load_settings;
3650
3651 reload_resources;
3408 reload_config; 3652 reload_config;
3409 db_init; 3653 db_init;
3654
3655 cf::init_uuid;
3656 cf::init_signals;
3657 cf::init_skills;
3658
3659 cf::init_beforeplay;
3660
3661 atomic;
3662
3410 load_extensions; 3663 load_extensions;
3411 3664
3412 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3413 }
3414
3415 utime time, time, $RUNTIMEFILE; 3665 utime time, time, $RUNTIMEFILE;
3416 3666
3417 # no (long-running) fork's whatsoever before this point(!) 3667 # no (long-running) fork's whatsoever before this point(!)
3668 use POSIX ();
3418 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3669 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3419 3670
3420 EV::loop; 3671 cf::_post_init 0;
3672 };
3673
3674 cf::object::thawer::errors_are_fatal 0;
3675 info "parse errors in files are no longer fatal from this point on.\n";
3676
3677 my $free_main; $free_main = EV::idle sub {
3678 undef $free_main;
3679 undef &main; # free gobs of memory :)
3680 };
3681
3682 goto &main_loop;
3421} 3683}
3422 3684
3423############################################################################# 3685#############################################################################
3424# initialisation and cleanup 3686# initialisation and cleanup
3425 3687
3426# install some emergency cleanup handlers 3688# install some emergency cleanup handlers
3427BEGIN { 3689BEGIN {
3428 our %SIGWATCHER = (); 3690 our %SIGWATCHER = ();
3429 for my $signal (qw(INT HUP TERM)) { 3691 for my $signal (qw(INT HUP TERM)) {
3430 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3692 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3431 cf::cleanup "SIG$signal"; 3693 cf::cleanup "SIG$signal";
3432 }; 3694 };
3433 } 3695 }
3434} 3696}
3435 3697
3436sub write_runtime_sync { 3698sub write_runtime_sync {
3699 my $t0 = AE::time;
3700
3437 # first touch the runtime file to show we are still running: 3701 # first touch the runtime file to show we are still running:
3438 # the fsync below can take a very very long time. 3702 # the fsync below can take a very very long time.
3439 3703
3440 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3704 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3441 3705
3442 my $guard = cf::lock_acquire "write_runtime"; 3706 my $guard = cf::lock_acquire "write_runtime";
3443 3707
3444 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3708 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3445 or return; 3709 or return;
3446 3710
3447 my $value = $cf::RUNTIME + 90 + 10; 3711 my $value = $cf::RUNTIME + 90 + 10;
3448 # 10 is the runtime save interval, for a monotonic clock 3712 # 10 is the runtime save interval, for a monotonic clock
3449 # 60 allows for the watchdog to kill the server. 3713 # 60 allows for the watchdog to kill the server.
3462 or return; 3726 or return;
3463 3727
3464 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3728 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3465 and return; 3729 and return;
3466 3730
3467 warn "runtime file written.\n"; 3731 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3468 3732
3469 1 3733 1
3470} 3734}
3471 3735
3472our $uuid_lock; 3736our $uuid_lock;
3481 my $uuid = "$LOCALDIR/uuid"; 3745 my $uuid = "$LOCALDIR/uuid";
3482 3746
3483 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3747 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3484 or return; 3748 or return;
3485 3749
3486 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3750 my $value = uuid_seq uuid_cur;
3751
3752 unless ($value) {
3753 info "cowardly refusing to write zero uuid value!\n";
3754 return;
3755 }
3756
3757 my $value = uuid_str $value + $uuid_skip;
3487 $uuid_skip = 0; 3758 $uuid_skip = 0;
3488 3759
3489 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3760 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3490 and return; 3761 and return;
3491 3762
3497 or return; 3768 or return;
3498 3769
3499 aio_rename "$uuid~", $uuid 3770 aio_rename "$uuid~", $uuid
3500 and return; 3771 and return;
3501 3772
3502 warn "uuid file written ($value).\n"; 3773 trace "uuid file written ($value).\n";
3503 3774
3504 1 3775 1
3505 3776
3506} 3777}
3507 3778
3513} 3784}
3514 3785
3515sub emergency_save() { 3786sub emergency_save() {
3516 my $freeze_guard = cf::freeze_mainloop; 3787 my $freeze_guard = cf::freeze_mainloop;
3517 3788
3518 warn "enter emergency perl save\n"; 3789 info "emergency_perl_save: enter\n";
3790
3791 # this is a trade-off: we want to be very quick here, so
3792 # save all maps without fsync, and later call a global sync
3793 # (which in turn might be very very slow)
3794 local $USE_FSYNC = 0;
3519 3795
3520 cf::sync_job { 3796 cf::sync_job {
3797 cf::write_runtime_sync; # external watchdog should not bark
3798
3521 # use a peculiar iteration method to avoid tripping on perl 3799 # use a peculiar iteration method to avoid tripping on perl
3522 # refcount bugs in for. also avoids problems with players 3800 # refcount bugs in for. also avoids problems with players
3523 # and maps saved/destroyed asynchronously. 3801 # and maps saved/destroyed asynchronously.
3524 warn "begin emergency player save\n"; 3802 info "emergency_perl_save: begin player save\n";
3525 for my $login (keys %cf::PLAYER) { 3803 for my $login (keys %cf::PLAYER) {
3526 my $pl = $cf::PLAYER{$login} or next; 3804 my $pl = $cf::PLAYER{$login} or next;
3527 $pl->valid or next; 3805 $pl->valid or next;
3528 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3806 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3529 $pl->save; 3807 $pl->save;
3530 } 3808 }
3531 warn "end emergency player save\n"; 3809 info "emergency_perl_save: end player save\n";
3532 3810
3533 warn "begin emergency map save\n"; 3811 cf::write_runtime_sync; # external watchdog should not bark
3812
3813 info "emergency_perl_save: begin map save\n";
3534 for my $path (keys %cf::MAP) { 3814 for my $path (keys %cf::MAP) {
3535 my $map = $cf::MAP{$path} or next; 3815 my $map = $cf::MAP{$path} or next;
3536 $map->valid or next; 3816 $map->valid or next;
3537 $map->save; 3817 $map->save;
3538 } 3818 }
3539 warn "end emergency map save\n"; 3819 info "emergency_perl_save: end map save\n";
3540 3820
3541 warn "begin emergency database checkpoint\n"; 3821 cf::write_runtime_sync; # external watchdog should not bark
3822
3823 info "emergency_perl_save: begin database checkpoint\n";
3542 BDB::db_env_txn_checkpoint $DB_ENV; 3824 BDB::db_env_txn_checkpoint $DB_ENV;
3543 warn "end emergency database checkpoint\n"; 3825 info "emergency_perl_save: end database checkpoint\n";
3544 3826
3545 warn "begin write uuid\n"; 3827 info "emergency_perl_save: begin write uuid\n";
3546 write_uuid_sync 1; 3828 write_uuid_sync 1;
3547 warn "end write uuid\n"; 3829 info "emergency_perl_save: end write uuid\n";
3830
3831 cf::write_runtime_sync; # external watchdog should not bark
3832
3833 trace "emergency_perl_save: syncing database to disk";
3834 BDB::db_env_txn_checkpoint $DB_ENV;
3835
3836 info "emergency_perl_save: starting sync\n";
3837 IO::AIO::aio_sync sub {
3838 info "emergency_perl_save: finished sync\n";
3839 };
3840
3841 cf::write_runtime_sync; # external watchdog should not bark
3842
3843 trace "emergency_perl_save: flushing outstanding aio requests";
3844 while (IO::AIO::nreqs || BDB::nreqs) {
3845 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3846 }
3847
3848 cf::write_runtime_sync; # external watchdog should not bark
3548 }; 3849 };
3549 3850
3550 warn "leave emergency perl save\n"; 3851 info "emergency_perl_save: leave\n";
3551} 3852}
3552 3853
3553sub post_cleanup { 3854sub post_cleanup {
3554 my ($make_core) = @_; 3855 my ($make_core) = @_;
3555 3856
3857 IO::AIO::flush;
3858
3556 warn Carp::longmess "post_cleanup backtrace" 3859 error Carp::longmess "post_cleanup backtrace"
3557 if $make_core; 3860 if $make_core;
3558 3861
3559 my $fh = pidfile; 3862 my $fh = pidfile;
3560 unlink $PIDFILE if <$fh> == $$; 3863 unlink $PIDFILE if <$fh> == $$;
3561} 3864}
3581 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3884 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3582 for my $name (keys %$leaf_symtab) { 3885 for my $name (keys %$leaf_symtab) {
3583 _gv_clear *{"$pkg$name"}; 3886 _gv_clear *{"$pkg$name"};
3584# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3887# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3585 } 3888 }
3586 warn "cleared package $pkg\n";#d#
3587} 3889}
3588 3890
3589sub do_reload_perl() { 3891sub do_reload_perl() {
3590 # can/must only be called in main 3892 # can/must only be called in main
3591 if ($Coro::current != $Coro::main) { 3893 unless (in_main) {
3592 warn "can only reload from main coroutine"; 3894 error "can only reload from main coroutine";
3593 return; 3895 return;
3594 } 3896 }
3595 3897
3596 return if $RELOAD++; 3898 return if $RELOAD++;
3597 3899
3900 my $t1 = AE::time;
3901
3598 while ($RELOAD) { 3902 while ($RELOAD) {
3599 warn "reloading..."; 3903 cf::get_slot 0.1, -1, "reload_perl";
3904 info "perl_reload: reloading...";
3600 3905
3601 warn "entering sync_job"; 3906 trace "perl_reload: entering sync_job";
3602 3907
3603 cf::sync_job { 3908 cf::sync_job {
3604 cf::write_runtime_sync; # external watchdog should not bark
3605 cf::emergency_save; 3909 #cf::emergency_save;
3606 cf::write_runtime_sync; # external watchdog should not bark
3607 3910
3608 warn "syncing database to disk";
3609 BDB::db_env_txn_checkpoint $DB_ENV;
3610
3611 # if anything goes wrong in here, we should simply crash as we already saved
3612
3613 warn "flushing outstanding aio requests";
3614 while (IO::AIO::nreqs || BDB::nreqs) {
3615 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3616 }
3617
3618 warn "cancelling all extension coros"; 3911 trace "perl_reload: cancelling all extension coros";
3619 $_->cancel for values %EXT_CORO; 3912 $_->cancel for values %EXT_CORO;
3620 %EXT_CORO = (); 3913 %EXT_CORO = ();
3621 3914
3622 warn "removing commands"; 3915 trace "perl_reload: removing commands";
3623 %COMMAND = (); 3916 %COMMAND = ();
3624 3917
3625 warn "removing ext/exti commands"; 3918 trace "perl_reload: removing ext/exti commands";
3626 %EXTCMD = (); 3919 %EXTCMD = ();
3627 %EXTICMD = (); 3920 %EXTICMD = ();
3628 3921
3629 warn "unloading/nuking all extensions"; 3922 trace "perl_reload: unloading/nuking all extensions";
3630 for my $pkg (@EXTS) { 3923 for my $pkg (@EXTS) {
3631 warn "... unloading $pkg"; 3924 trace "... unloading $pkg";
3632 3925
3633 if (my $cb = $pkg->can ("unload")) { 3926 if (my $cb = $pkg->can ("unload")) {
3634 eval { 3927 eval {
3635 $cb->($pkg); 3928 $cb->($pkg);
3636 1 3929 1
3637 } or warn "$pkg unloaded, but with errors: $@"; 3930 } or error "$pkg unloaded, but with errors: $@";
3638 } 3931 }
3639 3932
3640 warn "... clearing $pkg"; 3933 trace "... clearing $pkg";
3641 clear_package $pkg; 3934 clear_package $pkg;
3642 } 3935 }
3643 3936
3644 warn "unloading all perl modules loaded from $LIBDIR"; 3937 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3645 while (my ($k, $v) = each %INC) { 3938 while (my ($k, $v) = each %INC) {
3646 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3939 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3647 3940
3648 warn "... unloading $k"; 3941 trace "... unloading $k";
3649 delete $INC{$k}; 3942 delete $INC{$k};
3650 3943
3651 $k =~ s/\.pm$//; 3944 $k =~ s/\.pm$//;
3652 $k =~ s/\//::/g; 3945 $k =~ s/\//::/g;
3653 3946
3656 } 3949 }
3657 3950
3658 clear_package $k; 3951 clear_package $k;
3659 } 3952 }
3660 3953
3661 warn "getting rid of safe::, as good as possible"; 3954 trace "perl_reload: getting rid of safe::, as good as possible";
3662 clear_package "safe::$_" 3955 clear_package "safe::$_"
3663 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3956 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3664 3957
3665 warn "unloading cf.pm \"a bit\""; 3958 trace "perl_reload: unloading cf.pm \"a bit\"";
3666 delete $INC{"cf.pm"}; 3959 delete $INC{"cf.pm"};
3667 delete $INC{"cf/pod.pm"}; 3960 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3668 3961
3669 # don't, removes xs symbols, too, 3962 # don't, removes xs symbols, too,
3670 # and global variables created in xs 3963 # and global variables created in xs
3671 #clear_package __PACKAGE__; 3964 #clear_package __PACKAGE__;
3672 3965
3673 warn "unload completed, starting to reload now"; 3966 info "perl_reload: unload completed, starting to reload now";
3674 3967
3675 warn "reloading cf.pm"; 3968 trace "perl_reload: reloading cf.pm";
3676 require cf; 3969 require cf;
3677 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3970 cf::_connect_to_perl_1;
3678 3971
3679 warn "loading config and database again"; 3972 trace "perl_reload: loading config and database again";
3680 cf::reload_config; 3973 cf::reload_config;
3681 3974
3682 warn "loading extensions"; 3975 trace "perl_reload: loading extensions";
3683 cf::load_extensions; 3976 cf::load_extensions;
3684 3977
3978 if ($REATTACH_ON_RELOAD) {
3685 warn "reattaching attachments to objects/players"; 3979 trace "perl_reload: reattaching attachments to objects/players";
3686 _global_reattach; # objects, sockets 3980 _global_reattach; # objects, sockets
3687 warn "reattaching attachments to maps"; 3981 trace "perl_reload: reattaching attachments to maps";
3688 reattach $_ for values %MAP; 3982 reattach $_ for values %MAP;
3689 warn "reattaching attachments to players"; 3983 trace "perl_reload: reattaching attachments to players";
3690 reattach $_ for values %PLAYER; 3984 reattach $_ for values %PLAYER;
3985 }
3691 3986
3692 warn "leaving sync_job"; 3987 cf::_post_init 1;
3988
3989 trace "perl_reload: leaving sync_job";
3693 3990
3694 1 3991 1
3695 } or do { 3992 } or do {
3696 warn $@; 3993 error $@;
3697 cf::cleanup "error while reloading, exiting."; 3994 cf::cleanup "perl_reload: error, exiting.";
3698 }; 3995 };
3699 3996
3700 warn "reloaded";
3701 --$RELOAD; 3997 --$RELOAD;
3702 } 3998 }
3999
4000 $t1 = AE::time - $t1;
4001 info "perl_reload: completed in ${t1}s\n";
3703}; 4002};
3704 4003
3705our $RELOAD_WATCHER; # used only during reload 4004our $RELOAD_WATCHER; # used only during reload
3706 4005
3707sub reload_perl() { 4006sub reload_perl() {
3708 # doing reload synchronously and two reloads happen back-to-back, 4007 # doing reload synchronously and two reloads happen back-to-back,
3709 # coro crashes during coro_state_free->destroy here. 4008 # coro crashes during coro_state_free->destroy here.
3710 4009
4010 $RELOAD_WATCHER ||= cf::async {
4011 Coro::AIO::aio_wait cache_extensions;
4012
3711 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 4013 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3712 do_reload_perl; 4014 do_reload_perl;
3713 undef $RELOAD_WATCHER; 4015 undef $RELOAD_WATCHER;
4016 };
3714 }; 4017 };
3715} 4018}
3716 4019
3717register_command "reload" => sub { 4020register_command "reload" => sub {
3718 my ($who, $arg) = @_; 4021 my ($who, $arg) = @_;
3724 reload_perl; 4027 reload_perl;
3725 }; 4028 };
3726 } 4029 }
3727}; 4030};
3728 4031
3729unshift @INC, $LIBDIR; 4032#############################################################################
3730 4033
3731my $bug_warning = 0; 4034my $bug_warning = 0;
3732 4035
3733our @WAIT_FOR_TICK; 4036our @WAIT_FOR_TICK;
3734our @WAIT_FOR_TICK_BEGIN; 4037our @WAIT_FOR_TICK_BEGIN;
3735 4038
3736sub wait_for_tick { 4039sub wait_for_tick() {
3737 return if tick_inhibit || $Coro::current == $Coro::main; 4040 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3738 4041
3739 my $signal = new Coro::Signal; 4042 my $signal = new Coro::Signal;
3740 push @WAIT_FOR_TICK, $signal; 4043 push @WAIT_FOR_TICK, $signal;
3741 $signal->wait; 4044 $signal->wait;
3742} 4045}
3743 4046
3744sub wait_for_tick_begin { 4047sub wait_for_tick_begin() {
3745 return if tick_inhibit || $Coro::current == $Coro::main; 4048 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3746 4049
3747 my $signal = new Coro::Signal; 4050 my $signal = new Coro::Signal;
3748 push @WAIT_FOR_TICK_BEGIN, $signal; 4051 push @WAIT_FOR_TICK_BEGIN, $signal;
3749 $signal->wait; 4052 $signal->wait;
3750} 4053}
3756 return; 4059 return;
3757 } 4060 }
3758 4061
3759 cf::server_tick; # one server iteration 4062 cf::server_tick; # one server iteration
3760 4063
4064 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4065
3761 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4066 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3762 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4067 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3763 Coro::async_pool { 4068 Coro::async_pool {
3764 $Coro::current->{desc} = "runtime saver"; 4069 $Coro::current->{desc} = "runtime saver";
3765 write_runtime_sync 4070 write_runtime_sync
3766 or warn "ERROR: unable to write runtime file: $!"; 4071 or error "ERROR: unable to write runtime file: $!";
3767 }; 4072 };
3768 } 4073 }
3769 4074
3770 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4075 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3771 $sig->send; 4076 $sig->send;
3779 4084
3780 if (0) { 4085 if (0) {
3781 if ($NEXT_TICK) { 4086 if ($NEXT_TICK) {
3782 my $jitter = $TICK_START - $NEXT_TICK; 4087 my $jitter = $TICK_START - $NEXT_TICK;
3783 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4088 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3784 warn "jitter $JITTER\n";#d# 4089 debug "jitter $JITTER\n";#d#
3785 } 4090 }
3786 } 4091 }
3787} 4092}
3788 4093
3789{ 4094{
3790 # configure BDB 4095 # configure BDB
3791 4096
3792 BDB::min_parallel 8; 4097 BDB::min_parallel 16;
3793 BDB::max_poll_reqs $TICK * 0.1; 4098 BDB::max_poll_reqs $TICK * 0.1;
3794 $AnyEvent::BDB::WATCHER->priority (1); 4099 $AnyEvent::BDB::WATCHER->priority (1);
3795 4100
3796 unless ($DB_ENV) { 4101 unless ($DB_ENV) {
3797 $DB_ENV = BDB::db_env_create; 4102 $DB_ENV = BDB::db_env_create;
3834 IO::AIO::min_parallel 8; 4139 IO::AIO::min_parallel 8;
3835 IO::AIO::max_poll_time $TICK * 0.1; 4140 IO::AIO::max_poll_time $TICK * 0.1;
3836 undef $AnyEvent::AIO::WATCHER; 4141 undef $AnyEvent::AIO::WATCHER;
3837} 4142}
3838 4143
3839my $_log_backtrace; 4144our $_log_backtrace;
4145our $_log_backtrace_last;
3840 4146
3841sub _log_backtrace { 4147sub _log_backtrace {
3842 my ($msg, @addr) = @_; 4148 my ($msg, @addr) = @_;
3843 4149
3844 $msg =~ s/\n//; 4150 $msg =~ s/\n$//;
3845 4151
4152 if ($_log_backtrace_last eq $msg) {
4153 LOG llevInfo, "[ABT] $msg\n";
4154 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3846 # limit the # of concurrent backtraces 4155 # limit the # of concurrent backtraces
3847 if ($_log_backtrace < 2) { 4156 } elsif ($_log_backtrace < 2) {
4157 $_log_backtrace_last = $msg;
3848 ++$_log_backtrace; 4158 ++$_log_backtrace;
3849 my $perl_bt = Carp::longmess $msg; 4159 my $perl_bt = Carp::longmess $msg;
3850 async { 4160 async {
3851 $Coro::current->{desc} = "abt $msg"; 4161 $Coro::current->{desc} = "abt $msg";
3852 4162
3872 LOG llevInfo, "[ABT] $_\n" for @bt; 4182 LOG llevInfo, "[ABT] $_\n" for @bt;
3873 --$_log_backtrace; 4183 --$_log_backtrace;
3874 }; 4184 };
3875 } else { 4185 } else {
3876 LOG llevInfo, "[ABT] $msg\n"; 4186 LOG llevInfo, "[ABT] $msg\n";
3877 LOG llevInfo, "[ABT] [suppressed]\n"; 4187 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3878 } 4188 }
3879} 4189}
3880 4190
3881# load additional modules 4191# load additional modules
3882use cf::pod; 4192require "cf/$_.pm" for @EXTRA_MODULES;
4193cf::_connect_to_perl_2;
3883 4194
3884END { cf::emergency_save } 4195END { cf::emergency_save }
3885 4196
38861 41971
3887 4198

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines