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.447 by root, Fri Sep 19 01:39:45 2008 UTC vs.
Revision 1.556 by root, Sat Jul 3 01:49:18 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines