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.551 by root, Sun May 16 13:48:07 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)
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 1866 # mit "rum" bekleckern, nicht
1710 $self->_create_random_map ( 1867 $self->_create_random_map (
1711 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1868 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1712 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1869 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1713 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1870 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1714 $rmp->{exit_on_final_map}, 1871 $rmp->{exit_on_final_map},
1715 $rmp->{xsize}, $rmp->{ysize}, 1872 $rmp->{xsize}, $rmp->{ysize},
1716 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1873 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1717 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1874 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1732 1889
1733sub register { 1890sub register {
1734 my (undef, $regex, $prio) = @_; 1891 my (undef, $regex, $prio) = @_;
1735 my $pkg = caller; 1892 my $pkg = caller;
1736 1893
1737 no strict;
1738 push @{"$pkg\::ISA"}, __PACKAGE__; 1894 push @{"$pkg\::ISA"}, __PACKAGE__;
1739 1895
1740 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1896 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1741} 1897}
1742 1898
1743# also paths starting with '/' 1899# also paths starting with '/'
1744$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1900$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1745 1901
1746sub thawer_merge { 1902sub thawer_merge {
1747 my ($self, $merge) = @_; 1903 my ($self, $merge) = @_;
1748 1904
1749 # we have to keep some variables in memory intact 1905 # we have to keep some variables in memory intact
1754} 1910}
1755 1911
1756sub normalise { 1912sub normalise {
1757 my ($path, $base) = @_; 1913 my ($path, $base) = @_;
1758 1914
1759 $path = "$path"; # make sure its a string 1915 $path = "$path"; # make sure it's a string
1760 1916
1761 $path =~ s/\.map$//; 1917 $path =~ s/\.map$//;
1762 1918
1763 # map plan: 1919 # map plan:
1764 # 1920 #
1779 $base =~ s{[^/]+/?$}{}; 1935 $base =~ s{[^/]+/?$}{};
1780 $path = "$base/$path"; 1936 $path = "$base/$path";
1781 } 1937 }
1782 1938
1783 for ($path) { 1939 for ($path) {
1784 redo if s{//}{/};
1785 redo if s{/\.?/}{/}; 1940 redo if s{/\.?/}{/};
1786 redo if s{/[^/]+/\.\./}{/}; 1941 redo if s{/[^/]+/\.\./}{/};
1787 } 1942 }
1788 1943
1789 $path 1944 $path
1803 $self->init; # pass $1 etc. 1958 $self->init; # pass $1 etc.
1804 return $self; 1959 return $self;
1805 } 1960 }
1806 } 1961 }
1807 1962
1808 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1963 Carp::cluck "unable to resolve path '$path' (base '$base')";
1809 () 1964 ()
1810} 1965}
1811 1966
1812sub init { 1967sub init {
1813 my ($self) = @_; 1968 my ($self) = @_;
1845sub uniq_path { 2000sub uniq_path {
1846 my ($self) = @_; 2001 my ($self) = @_;
1847 2002
1848 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2003 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1849 "$UNIQUEDIR/$path" 2004 "$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} 2005}
1860 2006
1861sub decay_objects { 2007sub decay_objects {
1862 my ($self) = @_; 2008 my ($self) = @_;
1863 2009
1945 2091
1946sub find; 2092sub find;
1947sub find { 2093sub find {
1948 my ($path, $origin) = @_; 2094 my ($path, $origin) = @_;
1949 2095
2096 cf::cede_to_tick;
2097
1950 $path = normalise $path, $origin && $origin->path; 2098 $path = normalise $path, $origin && $origin->path;
1951 2099
1952 cf::lock_wait "map_data:$path";#d#remove 2100 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1953 cf::lock_wait "map_find:$path"; 2101 my $guard2 = cf::lock_acquire "map_find:$path";
1954 2102
1955 $cf::MAP{$path} || do { 2103 $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 2104 my $map = new_from_path cf::map $path
1960 or return; 2105 or return;
1961 2106
1962 $map->{last_save} = $cf::RUNTIME; 2107 $map->{last_save} = $cf::RUNTIME;
1963 2108
1975 2120
1976 $cf::MAP{$path} = $map 2121 $cf::MAP{$path} = $map
1977 } 2122 }
1978} 2123}
1979 2124
1980sub pre_load { } 2125sub pre_load { }
1981sub post_load { } 2126#sub post_load { } # XS
1982 2127
1983sub load { 2128sub load {
1984 my ($self) = @_; 2129 my ($self) = @_;
1985 2130
1986 local $self->{deny_reset} = 1; # loading can take a long time 2131 local $self->{deny_reset} = 1; # loading can take a long time
2031 unless ($self->{deny_activate}) { 2176 unless ($self->{deny_activate}) {
2032 $self->decay_objects; 2177 $self->decay_objects;
2033 $self->fix_auto_apply; 2178 $self->fix_auto_apply;
2034 $self->update_buttons; 2179 $self->update_buttons;
2035 cf::cede_to_tick; 2180 cf::cede_to_tick;
2036 $self->set_darkness_map;
2037 cf::cede_to_tick;
2038 $self->activate; 2181 $self->activate;
2039 } 2182 }
2040 2183
2041 $self->{last_save} = $cf::RUNTIME; 2184 $self->{last_save} = $cf::RUNTIME;
2042 $self->last_access ($cf::RUNTIME); 2185 $self->last_access ($cf::RUNTIME);
2045 } 2188 }
2046 2189
2047 $self->post_load; 2190 $self->post_load;
2048} 2191}
2049 2192
2193# customize the map for a given player, i.e.
2194# return the _real_ map. used by e.g. per-player
2195# maps to change the path to ~playername/mappath
2050sub customise_for { 2196sub customise_for {
2051 my ($self, $ob) = @_; 2197 my ($self, $ob) = @_;
2052 2198
2053 return find "~" . $ob->name . "/" . $self->{path} 2199 return find "~" . $ob->name . "/" . $self->{path}
2054 if $self->per_player; 2200 if $self->per_player;
2070 or next; 2216 or next;
2071 $neigh = find $neigh, $map 2217 $neigh = find $neigh, $map
2072 or next; 2218 or next;
2073 $neigh->load; 2219 $neigh->load;
2074 2220
2221 # now find the diagonal neighbours
2075 push @neigh, 2222 push @neigh,
2076 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2223 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2077 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2224 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2078 } 2225 }
2079 2226
2086} 2233}
2087 2234
2088sub find_sync { 2235sub find_sync {
2089 my ($path, $origin) = @_; 2236 my ($path, $origin) = @_;
2090 2237
2091 cf::sync_job { find $path, $origin } 2238 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2239 if $Coro::current == $Coro::main;
2240
2241 find $path, $origin
2092} 2242}
2093 2243
2094sub do_load_sync { 2244sub do_load_sync {
2095 my ($map) = @_; 2245 my ($map) = @_;
2096 2246
2097 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2247 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2098 if $Coro::current == $Coro::main; 2248 if $Coro::current == $Coro::main;
2099 2249
2100 cf::sync_job { $map->load }; 2250 $map->load;
2101} 2251}
2102 2252
2103our %MAP_PREFETCH; 2253our %MAP_PREFETCH;
2104our $MAP_PREFETCHER = undef; 2254our $MAP_PREFETCHER = undef;
2105 2255
2131 $MAP_PREFETCHER->prio (6); 2281 $MAP_PREFETCHER->prio (6);
2132 2282
2133 () 2283 ()
2134} 2284}
2135 2285
2286# common code, used by both ->save and ->swapout
2136sub save { 2287sub _save {
2137 my ($self) = @_; 2288 my ($self) = @_;
2138
2139 my $lock = cf::lock_acquire "map_data:$self->{path}";
2140 2289
2141 $self->{last_save} = $cf::RUNTIME; 2290 $self->{last_save} = $cf::RUNTIME;
2142 2291
2143 return unless $self->dirty; 2292 return unless $self->dirty;
2144 2293
2164 } else { 2313 } else {
2165 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2314 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2166 } 2315 }
2167} 2316}
2168 2317
2318sub save {
2319 my ($self) = @_;
2320
2321 my $lock = cf::lock_acquire "map_data:$self->{path}";
2322
2323 $self->_save;
2324}
2325
2169sub swap_out { 2326sub swap_out {
2170 my ($self) = @_; 2327 my ($self) = @_;
2171 2328
2172 # save first because save cedes
2173 $self->save;
2174
2175 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2329 my $lock = cf::lock_acquire "map_data:$self->{path}";
2176 2330
2177 return if $self->players;
2178 return if $self->in_memory != cf::MAP_ACTIVE; 2331 return if $self->in_memory != cf::MAP_ACTIVE;
2179 return if $self->{deny_save}; 2332 return if $self->{deny_save};
2333 return if $self->players;
2180 2334
2335 # first deactivate the map and "unlink" it from the core
2336 $self->deactivate;
2337 $_->clear_links_to ($self) for values %cf::MAP;
2181 $self->in_memory (cf::MAP_SWAPPED); 2338 $self->in_memory (cf::MAP_SWAPPED);
2339
2340 # then atomically save
2341 $self->_save;
2342
2343 # then free the map
2344 $self->clear;
2345}
2346
2347sub reset_at {
2348 my ($self) = @_;
2349
2350 # TODO: safety, remove and allow resettable per-player maps
2351 return 1e99 if $self->{deny_reset};
2352
2353 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2354 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2355
2356 $time + $to
2357}
2358
2359sub should_reset {
2360 my ($self) = @_;
2361
2362 $self->reset_at <= $cf::RUNTIME
2363}
2364
2365sub reset {
2366 my ($self) = @_;
2367
2368 my $lock = cf::lock_acquire "map_data:$self->{path}";
2369
2370 return if $self->players;
2371
2372 cf::trace "resetting map ", $self->path, "\n";
2373
2374 $self->in_memory (cf::MAP_SWAPPED);
2375
2376 # need to save uniques path
2377 unless ($self->{deny_save}) {
2378 my $uniq = $self->uniq_path; utf8::encode $uniq;
2379
2380 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2381 if $uniq;
2382 }
2383
2384 delete $cf::MAP{$self->path};
2182 2385
2183 $self->deactivate; 2386 $self->deactivate;
2184 $_->clear_links_to ($self) for values %cf::MAP; 2387 $_->clear_links_to ($self) for values %cf::MAP;
2185 $self->clear; 2388 $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 2389
2231 $self->unlink_save; 2390 $self->unlink_save;
2232 $self->destroy; 2391 $self->destroy;
2233} 2392}
2234 2393
2242 2401
2243 delete $cf::MAP{$self->path}; 2402 delete $cf::MAP{$self->path};
2244 2403
2245 $self->unlink_save; 2404 $self->unlink_save;
2246 2405
2247 bless $self, "cf::map"; 2406 bless $self, "cf::map::wrap";
2248 delete $self->{deny_reset}; 2407 delete $self->{deny_reset};
2249 $self->{deny_save} = 1; 2408 $self->{deny_save} = 1;
2250 $self->reset_timeout (1); 2409 $self->reset_timeout (1);
2251 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2410 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2252 2411
2309 : normalise $_ 2468 : normalise $_
2310 } @{ aio_readdir $UNIQUEDIR or [] } 2469 } @{ aio_readdir $UNIQUEDIR or [] }
2311 ] 2470 ]
2312} 2471}
2313 2472
2473=item cf::map::static_maps
2474
2475Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2476file in the shared directory excluding F</styles> and F</editor>). May
2477block.
2478
2479=cut
2480
2481sub static_maps() {
2482 my @dirs = "";
2483 my @maps;
2484
2485 while (@dirs) {
2486 my $dir = shift @dirs;
2487
2488 next if $dir eq "/styles" || $dir eq "/editor";
2489
2490 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2491 or return;
2492
2493 for (@$files) {
2494 s/\.map$// or next;
2495 utf8::decode $_;
2496 push @maps, "$dir/$_";
2497 }
2498
2499 push @dirs, map "$dir/$_", @$dirs;
2500 }
2501
2502 \@maps
2503}
2504
2314=back 2505=back
2315 2506
2316=head3 cf::object 2507=head3 cf::object
2317 2508
2318=cut 2509=cut
2383 2574
2384our $SAY_CHANNEL = { 2575our $SAY_CHANNEL = {
2385 id => "say", 2576 id => "say",
2386 title => "Map", 2577 title => "Map",
2387 reply => "say ", 2578 reply => "say ",
2388 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2579 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2389}; 2580};
2390 2581
2391our $CHAT_CHANNEL = { 2582our $CHAT_CHANNEL = {
2392 id => "chat", 2583 id => "chat",
2393 title => "Chat", 2584 title => "Chat",
2450 2641
2451Freezes the player and moves him/her to a special map (C<{link}>). 2642Freezes the player and moves him/her to a special map (C<{link}>).
2452 2643
2453The player should be reasonably safe there for short amounts of time (e.g. 2644The player should be reasonably safe there for short amounts of time (e.g.
2454for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2645for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2455though, as the palyer cannot control the character while it is on the link 2646though, as the player cannot control the character while it is on the link
2456map. 2647map.
2457 2648
2458Will never block. 2649Will never block.
2459 2650
2460=item $player_object->leave_link ($map, $x, $y) 2651=item $player_object->leave_link ($map, $x, $y)
2481sub cf::object::player::enter_link { 2672sub cf::object::player::enter_link {
2482 my ($self) = @_; 2673 my ($self) = @_;
2483 2674
2484 $self->deactivate_recursive; 2675 $self->deactivate_recursive;
2485 2676
2677 ++$self->{_link_recursion};
2678
2486 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2679 return if UNIVERSAL::isa $self->map, "ext::map_link";
2487 2680
2488 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2681 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2489 if $self->map && $self->map->{path} ne "{link}"; 2682 if $self->map && $self->map->{path} ne "{link}";
2490 2683
2491 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2684 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2492} 2685}
2493 2686
2494sub cf::object::player::leave_link { 2687sub cf::object::player::leave_link {
2495 my ($self, $map, $x, $y) = @_; 2688 my ($self, $map, $x, $y) = @_;
2496 2689
2513 ($x, $y) = (-1, -1) 2706 ($x, $y) = (-1, -1)
2514 unless (defined $x) && (defined $y); 2707 unless (defined $x) && (defined $y);
2515 2708
2516 # use -1 or undef as default coordinates, not 0, 0 2709 # use -1 or undef as default coordinates, not 0, 0
2517 ($x, $y) = ($map->enter_x, $map->enter_y) 2710 ($x, $y) = ($map->enter_x, $map->enter_y)
2518 if $x <=0 && $y <= 0; 2711 if $x <= 0 && $y <= 0;
2519 2712
2520 $map->load; 2713 $map->load;
2521 $map->load_neighbours; 2714 $map->load_neighbours;
2522 2715
2523 return unless $self->contr->active; 2716 return unless $self->contr->active;
2524 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2525 $self->activate_recursive;
2526 2717
2527 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2718 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2528 $self->enter_map ($map, $x, $y); 2719 if ($self->enter_map ($map, $x, $y)) {
2529} 2720 # entering was successful
2721 delete $self->{_link_recursion};
2722 # only activate afterwards, to support waiting in hooks
2723 $self->activate_recursive;
2724 }
2530 2725
2726}
2727
2531=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2728=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2532 2729
2533Moves the player to the given map-path and coordinates by first freezing 2730Moves the player to the given map-path and coordinates by first freezing
2534her, loading and preparing them map, calling the provided $check callback 2731her, loading and preparing them map, calling the provided $check callback
2535that has to return the map if sucecssful, and then unfreezes the player on 2732that has to return the map if sucecssful, and then unfreezes the player on
2536the new (success) or old (failed) map position. In either case, $done will 2733the new (success) or old (failed) map position. In either case, $done will
2543 2740
2544our $GOTOGEN; 2741our $GOTOGEN;
2545 2742
2546sub cf::object::player::goto { 2743sub cf::object::player::goto {
2547 my ($self, $path, $x, $y, $check, $done) = @_; 2744 my ($self, $path, $x, $y, $check, $done) = @_;
2745
2746 if ($self->{_link_recursion} >= $MAX_LINKS) {
2747 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2748 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2749 ($path, $x, $y) = @$EMERGENCY_POSITION;
2750 }
2548 2751
2549 # do generation counting so two concurrent goto's will be executed in-order 2752 # do generation counting so two concurrent goto's will be executed in-order
2550 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2753 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2551 2754
2552 $self->enter_link; 2755 $self->enter_link;
2576 my $map = eval { 2779 my $map = eval {
2577 my $map = defined $path ? cf::map::find $path : undef; 2780 my $map = defined $path ? cf::map::find $path : undef;
2578 2781
2579 if ($map) { 2782 if ($map) {
2580 $map = $map->customise_for ($self); 2783 $map = $map->customise_for ($self);
2581 $map = $check->($map) if $check && $map; 2784 $map = $check->($map, $x, $y, $self) if $check && $map;
2582 } else { 2785 } else {
2583 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2786 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2584 } 2787 }
2585 2788
2586 $map 2789 $map
2594 if ($gen == $self->{_goto_generation}) { 2797 if ($gen == $self->{_goto_generation}) {
2595 delete $self->{_goto_generation}; 2798 delete $self->{_goto_generation};
2596 $self->leave_link ($map, $x, $y); 2799 $self->leave_link ($map, $x, $y);
2597 } 2800 }
2598 2801
2599 $done->() if $done; 2802 $done->($self) if $done;
2600 })->prio (1); 2803 })->prio (1);
2601} 2804}
2602 2805
2603=item $player_object->enter_exit ($exit_object) 2806=item $player_object->enter_exit ($exit_object)
2604 2807
2697 $self->message ("Something went wrong deep within the deliantra server. " 2900 $self->message ("Something went wrong deep within the deliantra server. "
2698 . "I'll try to bring you back to the map you were before. " 2901 . "I'll try to bring you back to the map you were before. "
2699 . "Please report this to the dungeon master!", 2902 . "Please report this to the dungeon master!",
2700 cf::NDI_UNIQUE | cf::NDI_RED); 2903 cf::NDI_UNIQUE | cf::NDI_RED);
2701 2904
2702 warn "ERROR in enter_exit: $@"; 2905 error "ERROR in enter_exit: $@";
2703 $self->leave_link; 2906 $self->leave_link;
2704 } 2907 }
2705 })->prio (1); 2908 })->prio (1);
2706} 2909}
2707 2910
2719sub cf::client::send_drawinfo { 2922sub cf::client::send_drawinfo {
2720 my ($self, $text, $flags) = @_; 2923 my ($self, $text, $flags) = @_;
2721 2924
2722 utf8::encode $text; 2925 utf8::encode $text;
2723 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2926 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2927}
2928
2929=item $client->send_big_packet ($pkt)
2930
2931Like C<send_packet>, but tries to compress large packets, and fragments
2932them as required.
2933
2934=cut
2935
2936our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2937
2938sub cf::client::send_big_packet {
2939 my ($self, $pkt) = @_;
2940
2941 # try lzf for large packets
2942 $pkt = "lzf " . Compress::LZF::compress $pkt
2943 if 1024 <= length $pkt and $self->{can_lzf};
2944
2945 # split very large packets
2946 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2947 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2948 $pkt = "frag";
2949 }
2950
2951 $self->send_packet ($pkt);
2724} 2952}
2725 2953
2726=item $client->send_msg ($channel, $msg, $color, [extra...]) 2954=item $client->send_msg ($channel, $msg, $color, [extra...])
2727 2955
2728Send a drawinfo or msg packet to the client, formatting the msg for the 2956Send a drawinfo or msg packet to the client, formatting the msg for the
2732 2960
2733=cut 2961=cut
2734 2962
2735# non-persistent channels (usually the info channel) 2963# non-persistent channels (usually the info channel)
2736our %CHANNEL = ( 2964our %CHANNEL = (
2965 "c/motd" => {
2966 id => "infobox",
2967 title => "MOTD",
2968 reply => undef,
2969 tooltip => "The message of the day",
2970 },
2737 "c/identify" => { 2971 "c/identify" => {
2738 id => "infobox", 2972 id => "infobox",
2739 title => "Identify", 2973 title => "Identify",
2740 reply => undef, 2974 reply => undef,
2741 tooltip => "Items recently identified", 2975 tooltip => "Items recently identified",
2743 "c/examine" => { 2977 "c/examine" => {
2744 id => "infobox", 2978 id => "infobox",
2745 title => "Examine", 2979 title => "Examine",
2746 reply => undef, 2980 reply => undef,
2747 tooltip => "Signs and other items you examined", 2981 tooltip => "Signs and other items you examined",
2982 },
2983 "c/shopinfo" => {
2984 id => "infobox",
2985 title => "Shop Info",
2986 reply => undef,
2987 tooltip => "What your bargaining skill tells you about the shop",
2748 }, 2988 },
2749 "c/book" => { 2989 "c/book" => {
2750 id => "infobox", 2990 id => "infobox",
2751 title => "Book", 2991 title => "Book",
2752 reply => undef, 2992 reply => undef,
2768 id => "infobox", 3008 id => "infobox",
2769 title => "Body Parts", 3009 title => "Body Parts",
2770 reply => undef, 3010 reply => undef,
2771 tooltip => "Shows which body parts you posess and are available", 3011 tooltip => "Shows which body parts you posess and are available",
2772 }, 3012 },
3013 "c/statistics" => {
3014 id => "infobox",
3015 title => "Statistics",
3016 reply => undef,
3017 tooltip => "Shows your primary statistics",
3018 },
3019 "c/skills" => {
3020 id => "infobox",
3021 title => "Skills",
3022 reply => undef,
3023 tooltip => "Shows your experience per skill and item power",
3024 },
3025 "c/shopitems" => {
3026 id => "infobox",
3027 title => "Shop Items",
3028 reply => undef,
3029 tooltip => "Shows the items currently for sale in this shop",
3030 },
3031 "c/resistances" => {
3032 id => "infobox",
3033 title => "Resistances",
3034 reply => undef,
3035 tooltip => "Shows your resistances",
3036 },
3037 "c/pets" => {
3038 id => "infobox",
3039 title => "Pets",
3040 reply => undef,
3041 tooltip => "Shows information abotu your pets/a specific pet",
3042 },
3043 "c/perceiveself" => {
3044 id => "infobox",
3045 title => "Perceive Self",
3046 reply => undef,
3047 tooltip => "You gained detailed knowledge about yourself",
3048 },
2773 "c/uptime" => { 3049 "c/uptime" => {
2774 id => "infobox", 3050 id => "infobox",
2775 title => "Uptime", 3051 title => "Uptime",
2776 reply => undef, 3052 reply => undef,
2777 tooltip => "How long the server has been running since last restart", 3053 tooltip => "How long the server has been running since last restart",
2786 id => "party", 3062 id => "party",
2787 title => "Party", 3063 title => "Party",
2788 reply => "gsay ", 3064 reply => "gsay ",
2789 tooltip => "Messages and chat related to your party", 3065 tooltip => "Messages and chat related to your party",
2790 }, 3066 },
3067 "c/death" => {
3068 id => "death",
3069 title => "Death",
3070 reply => undef,
3071 tooltip => "Reason for and more info about your most recent death",
3072 },
3073 "c/say" => $SAY_CHANNEL,
3074 "c/chat" => $CHAT_CHANNEL,
2791); 3075);
2792 3076
2793sub cf::client::send_msg { 3077sub cf::client::send_msg {
2794 my ($self, $channel, $msg, $color, @extra) = @_; 3078 my ($self, $channel, $msg, $color, @extra) = @_;
2795 3079
2800 3084
2801 # check predefined channels, for the benefit of C 3085 # check predefined channels, for the benefit of C
2802 if ($CHANNEL{$channel}) { 3086 if ($CHANNEL{$channel}) {
2803 $channel = $CHANNEL{$channel}; 3087 $channel = $CHANNEL{$channel};
2804 3088
2805 $self->ext_msg (channel_info => $channel) 3089 $self->ext_msg (channel_info => $channel);
2806 if $self->can_msg;
2807
2808 $channel = $channel->{id}; 3090 $channel = $channel->{id};
2809 3091
2810 } elsif (ref $channel) { 3092 } elsif (ref $channel) {
2811 # send meta info to client, if not yet sent 3093 # send meta info to client, if not yet sent
2812 unless (exists $self->{channel}{$channel->{id}}) { 3094 unless (exists $self->{channel}{$channel->{id}}) {
2813 $self->{channel}{$channel->{id}} = $channel; 3095 $self->{channel}{$channel->{id}} = $channel;
2814 $self->ext_msg (channel_info => $channel) 3096 $self->ext_msg (channel_info => $channel);
2815 if $self->can_msg;
2816 } 3097 }
2817 3098
2818 $channel = $channel->{id}; 3099 $channel = $channel->{id};
2819 } 3100 }
2820 3101
2821 return unless @extra || length $msg; 3102 return unless @extra || length $msg;
2822 3103
2823 if ($self->can_msg) {
2824 # default colour, mask it out 3104 # default colour, mask it out
2825 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3105 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2826 if $color & cf::NDI_DEF; 3106 if $color & cf::NDI_DEF;
2827 3107
2828 my $pkt = "msg " 3108 my $pkt = "msg "
2829 . $self->{json_coder}->encode ( 3109 . $self->{json_coder}->encode (
2830 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3110 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2831 ); 3111 );
2832 3112
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); 3113 $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} 3114}
2870 3115
2871=item $client->ext_msg ($type, @msg) 3116=item $client->ext_msg ($type, @msg)
2872 3117
2873Sends an ext event to the client. 3118Sends an ext event to the client.
2876 3121
2877sub cf::client::ext_msg($$@) { 3122sub cf::client::ext_msg($$@) {
2878 my ($self, $type, @msg) = @_; 3123 my ($self, $type, @msg) = @_;
2879 3124
2880 if ($self->extcmd == 2) { 3125 if ($self->extcmd == 2) {
2881 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3126 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2882 } elsif ($self->extcmd == 1) { # TODO: remove 3127 } elsif ($self->extcmd == 1) { # TODO: remove
2883 push @msg, msgtype => "event_$type"; 3128 push @msg, msgtype => "event_$type";
2884 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3129 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2885 } 3130 }
2886} 3131}
2887 3132
2888=item $client->ext_reply ($msgid, @msg) 3133=item $client->ext_reply ($msgid, @msg)
2889 3134
2893 3138
2894sub cf::client::ext_reply($$@) { 3139sub cf::client::ext_reply($$@) {
2895 my ($self, $id, @msg) = @_; 3140 my ($self, $id, @msg) = @_;
2896 3141
2897 if ($self->extcmd == 2) { 3142 if ($self->extcmd == 2) {
2898 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3143 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2899 } elsif ($self->extcmd == 1) { 3144 } elsif ($self->extcmd == 1) {
2900 #TODO: version 1, remove 3145 #TODO: version 1, remove
2901 unshift @msg, msgtype => "reply", msgid => $id; 3146 unshift @msg, msgtype => "reply", msgid => $id;
2902 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3147 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2903 } 3148 }
2904} 3149}
2905 3150
2906=item $success = $client->query ($flags, "text", \&cb) 3151=item $success = $client->query ($flags, "text", \&cb)
2907 3152
2978 3223
2979 $ns->ext_reply ($reply, @reply) 3224 $ns->ext_reply ($reply, @reply)
2980 if $reply; 3225 if $reply;
2981 3226
2982 } else { 3227 } else {
2983 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3228 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2984 } 3229 }
2985 3230
2986 cf::override; 3231 cf::override;
2987 }, 3232 },
2988); 3233);
3008 3253
3009 $coro 3254 $coro
3010} 3255}
3011 3256
3012cf::client->attach ( 3257cf::client->attach (
3013 on_destroy => sub { 3258 on_client_destroy => sub {
3014 my ($ns) = @_; 3259 my ($ns) = @_;
3015 3260
3016 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3261 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3017 }, 3262 },
3018); 3263);
3034our $safe_hole = new Safe::Hole; 3279our $safe_hole = new Safe::Hole;
3035 3280
3036$SIG{FPE} = 'IGNORE'; 3281$SIG{FPE} = 'IGNORE';
3037 3282
3038$safe->permit_only (Opcode::opset qw( 3283$safe->permit_only (Opcode::opset qw(
3039 :base_core :base_mem :base_orig :base_math 3284 :base_core :base_mem :base_orig :base_math :base_loop
3040 grepstart grepwhile mapstart mapwhile 3285 grepstart grepwhile mapstart mapwhile
3041 sort time 3286 sort time
3042)); 3287));
3043 3288
3044# here we export the classes and methods available to script code 3289# here we export the classes and methods available to script code
3048The following functions and methods are available within a safe environment: 3293The following functions and methods are available within a safe environment:
3049 3294
3050 cf::object 3295 cf::object
3051 contr pay_amount pay_player map x y force_find force_add destroy 3296 contr pay_amount pay_player map x y force_find force_add destroy
3052 insert remove name archname title slaying race decrease split 3297 insert remove name archname title slaying race decrease split
3298 value
3053 3299
3054 cf::object::player 3300 cf::object::player
3055 player 3301 player
3056 3302
3057 cf::player 3303 cf::player
3063=cut 3309=cut
3064 3310
3065for ( 3311for (
3066 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3312 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3067 insert remove inv nrof name archname title slaying race 3313 insert remove inv nrof name archname title slaying race
3068 decrease split destroy change_exp)], 3314 decrease split destroy change_exp value msg lore send_msg)],
3069 ["cf::object::player" => qw(player)], 3315 ["cf::object::player" => qw(player)],
3070 ["cf::player" => qw(peaceful)], 3316 ["cf::player" => qw(peaceful send_msg)],
3071 ["cf::map" => qw(trigger)], 3317 ["cf::map" => qw(trigger)],
3072) { 3318) {
3073 no strict 'refs';
3074 my ($pkg, @funs) = @$_; 3319 my ($pkg, @funs) = @$_;
3075 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3320 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3076 for @funs; 3321 for @funs;
3077} 3322}
3078 3323
3093 3338
3094 my $qcode = $code; 3339 my $qcode = $code;
3095 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3340 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3096 $qcode =~ s/\n/\\n/g; 3341 $qcode =~ s/\n/\\n/g;
3097 3342
3343 %vars = (_dummy => 0) unless %vars;
3344
3345 my @res;
3098 local $_; 3346 local $_;
3099 local @safe::cf::_safe_eval_args = values %vars;
3100 3347
3101 my $eval = 3348 my $eval =
3102 "do {\n" 3349 "do {\n"
3103 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3350 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3104 . "#line 0 \"{$qcode}\"\n" 3351 . "#line 0 \"{$qcode}\"\n"
3105 . $code 3352 . $code
3106 . "\n}" 3353 . "\n}"
3107 ; 3354 ;
3108 3355
3356 if ($CFG{safe_eval}) {
3109 sub_generation_inc; 3357 sub_generation_inc;
3358 local @safe::cf::_safe_eval_args = values %vars;
3110 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3359 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3111 sub_generation_inc; 3360 sub_generation_inc;
3361 } else {
3362 local @cf::_safe_eval_args = values %vars;
3363 @res = wantarray ? eval eval : scalar eval $eval;
3364 }
3112 3365
3113 if ($@) { 3366 if ($@) {
3114 warn "$@"; 3367 warn "$@",
3115 warn "while executing safe code '$code'\n"; 3368 "while executing safe code '$code'\n",
3116 warn "with arguments " . (join " ", %vars) . "\n"; 3369 "with arguments " . (join " ", %vars) . "\n";
3117 } 3370 }
3118 3371
3119 wantarray ? @res : $res[0] 3372 wantarray ? @res : $res[0]
3120} 3373}
3121 3374
3135=cut 3388=cut
3136 3389
3137sub register_script_function { 3390sub register_script_function {
3138 my ($fun, $cb) = @_; 3391 my ($fun, $cb) = @_;
3139 3392
3140 no strict 'refs'; 3393 $fun = "safe::$fun" if $CFG{safe_eval};
3141 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3394 *$fun = $safe_hole->wrap ($cb);
3142} 3395}
3143 3396
3144=back 3397=back
3145 3398
3146=cut 3399=cut
3155 # for this (global event?) 3408 # for this (global event?)
3156 %ext::player_env::MUSIC_FACE_CACHE = (); 3409 %ext::player_env::MUSIC_FACE_CACHE = ();
3157 3410
3158 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3411 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3159 3412
3160 warn "loading facedata from $path\n"; 3413 trace "loading facedata from $path\n";
3161 3414
3162 my $facedata;
3163 0 < aio_load $path, $facedata 3415 0 < aio_load $path, my $facedata
3164 or die "$path: $!"; 3416 or die "$path: $!";
3165 3417
3166 $facedata = Coro::Storable::thaw $facedata; 3418 $facedata = Coro::Storable::thaw $facedata;
3167 3419
3168 $facedata->{version} == 2 3420 $facedata->{version} == 2
3169 or cf::cleanup "$path: version mismatch, cannot proceed."; 3421 or cf::cleanup "$path: version mismatch, cannot proceed.";
3170 3422
3171 # patch in the exptable 3423 # patch in the exptable
3424 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3172 $facedata->{resource}{"res/exp_table"} = { 3425 $facedata->{resource}{"res/exp_table"} = {
3173 type => FT_RSRC, 3426 type => FT_RSRC,
3174 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3427 data => $exp_table,
3428 hash => (Digest::MD5::md5 $exp_table),
3175 }; 3429 };
3176 cf::cede_to_tick; 3430 cf::cede_to_tick;
3177 3431
3178 { 3432 {
3179 my $faces = $facedata->{faceinfo}; 3433 my $faces = $facedata->{faceinfo};
3181 while (my ($face, $info) = each %$faces) { 3435 while (my ($face, $info) = each %$faces) {
3182 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3436 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3183 3437
3184 cf::face::set_visibility $idx, $info->{visibility}; 3438 cf::face::set_visibility $idx, $info->{visibility};
3185 cf::face::set_magicmap $idx, $info->{magicmap}; 3439 cf::face::set_magicmap $idx, $info->{magicmap};
3186 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3440 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3187 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3441 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3188 3442
3189 cf::cede_to_tick; 3443 cf::cede_to_tick;
3190 } 3444 }
3191 3445
3192 while (my ($face, $info) = each %$faces) { 3446 while (my ($face, $info) = each %$faces) {
3197 3451
3198 if (my $smooth = cf::face::find $info->{smooth}) { 3452 if (my $smooth = cf::face::find $info->{smooth}) {
3199 cf::face::set_smooth $idx, $smooth; 3453 cf::face::set_smooth $idx, $smooth;
3200 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3454 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3201 } else { 3455 } else {
3202 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3456 error "smooth face '$info->{smooth}' not found for face '$face'";
3203 } 3457 }
3204 3458
3205 cf::cede_to_tick; 3459 cf::cede_to_tick;
3206 } 3460 }
3207 } 3461 }
3216 3470
3217 cf::anim::invalidate_all; # d'oh 3471 cf::anim::invalidate_all; # d'oh
3218 } 3472 }
3219 3473
3220 { 3474 {
3221 # TODO: for gcfclient pleasure, we should give resources
3222 # that gcfclient doesn't grok a >10000 face index.
3223 my $res = $facedata->{resource}; 3475 my $res = $facedata->{resource};
3224 3476
3225 while (my ($name, $info) = each %$res) { 3477 while (my ($name, $info) = each %$res) {
3226 if (defined $info->{type}) { 3478 if (defined $info->{type}) {
3227 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3479 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3228 my $data;
3229 3480
3230 if ($info->{type} & 1) { 3481 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}; 3482 cf::face::set_type $idx, $info->{type};
3245 } else { 3483 } else {
3246 $RESOURCE{$name} = $info; 3484 $RESOURCE{$name} = $info; # unused
3247 } 3485 }
3248 3486
3249 cf::cede_to_tick; 3487 cf::cede_to_tick;
3250 } 3488 }
3251 } 3489 }
3252 3490
3253 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3491 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3254 3492
3255 1 3493 1
3256} 3494}
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 3495
3278register_exticmd fx_want => sub { 3496register_exticmd fx_want => sub {
3279 my ($ns, $want) = @_; 3497 my ($ns, $want) = @_;
3280 3498
3281 while (my ($k, $v) = each %$want) { 3499 while (my ($k, $v) = each %$want) {
3320sub reload_treasures { 3538sub reload_treasures {
3321 load_resource_file "$DATADIR/treasures" 3539 load_resource_file "$DATADIR/treasures"
3322 or die "unable to load treasurelists\n"; 3540 or die "unable to load treasurelists\n";
3323} 3541}
3324 3542
3543sub reload_sound {
3544 trace "loading sound config from $DATADIR/sound\n";
3545
3546 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3547 or die "$DATADIR/sound $!";
3548
3549 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3550
3551 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3552 my $sound = $soundconf->{compat}[$_]
3553 or next;
3554
3555 my $face = cf::face::find "sound/$sound->[1]";
3556 cf::sound::set $sound->[0] => $face;
3557 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3558 }
3559
3560 while (my ($k, $v) = each %{$soundconf->{event}}) {
3561 my $face = cf::face::find "sound/$v";
3562 cf::sound::set $k => $face;
3563 }
3564}
3565
3325sub reload_resources { 3566sub reload_resources {
3326 warn "reloading resource files...\n"; 3567 trace "reloading resource files...\n";
3327 3568
3569 reload_exp_table;
3570 reload_materials;
3328 reload_facedata; 3571 reload_facedata;
3572 reload_sound;
3329 reload_archetypes; 3573 reload_archetypes;
3330 reload_regions; 3574 reload_regions;
3331 reload_treasures; 3575 reload_treasures;
3332 3576
3333 warn "finished reloading resource files\n"; 3577 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} 3578}
3343 3579
3344sub reload_config { 3580sub reload_config {
3345 open my $fh, "<:utf8", "$CONFDIR/config" 3581 trace "reloading config file...\n";
3346 or return;
3347 3582
3348 local $/; 3583 0 < aio_load "$CONFDIR/config", my $config
3349 *CFG = YAML::Load <$fh>; 3584 or die "$CONFDIR/config: $!";
3350 3585
3586 utf8::decode $config;
3587 *CFG = yaml_load $config;
3588
3351 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3589 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3352 3590
3353 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3591 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3354 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3592 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3355 3593
3356 if (exists $CFG{mlockall}) { 3594 if (exists $CFG{mlockall}) {
3379 3617
3380 seek $fh, 0, 0; 3618 seek $fh, 0, 0;
3381 print $fh $$; 3619 print $fh $$;
3382} 3620}
3383 3621
3622sub main_loop {
3623 trace "EV::loop starting\n";
3624 if (1) {
3625 EV::loop;
3626 }
3627 trace "EV::loop returned\n";
3628 goto &main_loop unless $REALLY_UNLOOP;
3629}
3630
3384sub main { 3631sub main {
3385 atomic; 3632 cf::init_globals; # initialise logging
3633
3634 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3635 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3636 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3637 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3638
3639 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3386 3640
3387 # we must not ever block the main coroutine 3641 # we must not ever block the main coroutine
3388 local $Coro::idle = sub { 3642 local $Coro::idle = sub {
3389 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3643 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3390 (async { 3644 (async {
3391 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3645 $Coro::current->{desc} = "IDLE BUG HANDLER";
3392 EV::loop EV::LOOP_ONESHOT; 3646 EV::loop EV::LOOP_ONESHOT;
3393 })->prio (Coro::PRIO_MAX); 3647 })->prio (Coro::PRIO_MAX);
3394 }; 3648 };
3395 3649
3396 { 3650 evthread_start IO::AIO::poll_fileno;
3397 my $guard = freeze_mainloop; 3651
3652 cf::sync_job {
3653 cf::incloader::init ();
3654
3655 cf::init_anim;
3656 cf::init_attackmess;
3657 cf::init_dynamic;
3658
3659 cf::load_settings;
3660
3661 reload_resources;
3398 reload_config; 3662 reload_config;
3399 db_init; 3663 db_init;
3664
3665 cf::init_uuid;
3666 cf::init_signals;
3667 cf::init_skills;
3668
3669 cf::init_beforeplay;
3670
3671 atomic;
3672
3400 load_extensions; 3673 load_extensions;
3401 3674
3402 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3403 }
3404
3405 utime time, time, $RUNTIMEFILE; 3675 utime time, time, $RUNTIMEFILE;
3406 3676
3407 # no (long-running) fork's whatsoever before this point(!) 3677 # no (long-running) fork's whatsoever before this point(!)
3678 use POSIX ();
3408 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3679 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3409 3680
3410 EV::loop; 3681 cf::_post_init 0;
3682 };
3683
3684 cf::object::thawer::errors_are_fatal 0;
3685 info "parse errors in files are no longer fatal from this point on.\n";
3686
3687 my $free_main; $free_main = EV::idle sub {
3688 undef $free_main;
3689 undef &main; # free gobs of memory :)
3690 };
3691
3692 goto &main_loop;
3411} 3693}
3412 3694
3413############################################################################# 3695#############################################################################
3414# initialisation and cleanup 3696# initialisation and cleanup
3415 3697
3416# install some emergency cleanup handlers 3698# install some emergency cleanup handlers
3417BEGIN { 3699BEGIN {
3418 our %SIGWATCHER = (); 3700 our %SIGWATCHER = ();
3419 for my $signal (qw(INT HUP TERM)) { 3701 for my $signal (qw(INT HUP TERM)) {
3420 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3702 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3421 cf::cleanup "SIG$signal"; 3703 cf::cleanup "SIG$signal";
3422 }; 3704 };
3423 } 3705 }
3424} 3706}
3425 3707
3426sub write_runtime_sync { 3708sub write_runtime_sync {
3709 my $t0 = AE::time;
3710
3427 # first touch the runtime file to show we are still running: 3711 # first touch the runtime file to show we are still running:
3428 # the fsync below can take a very very long time. 3712 # the fsync below can take a very very long time.
3429 3713
3430 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3714 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3431 3715
3432 my $guard = cf::lock_acquire "write_runtime"; 3716 my $guard = cf::lock_acquire "write_runtime";
3433 3717
3434 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3718 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3435 or return; 3719 or return;
3436 3720
3437 my $value = $cf::RUNTIME + 90 + 10; 3721 my $value = $cf::RUNTIME + 90 + 10;
3438 # 10 is the runtime save interval, for a monotonic clock 3722 # 10 is the runtime save interval, for a monotonic clock
3439 # 60 allows for the watchdog to kill the server. 3723 # 60 allows for the watchdog to kill the server.
3452 or return; 3736 or return;
3453 3737
3454 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3738 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3455 and return; 3739 and return;
3456 3740
3457 warn "runtime file written.\n"; 3741 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3458 3742
3459 1 3743 1
3460} 3744}
3461 3745
3462our $uuid_lock; 3746our $uuid_lock;
3471 my $uuid = "$LOCALDIR/uuid"; 3755 my $uuid = "$LOCALDIR/uuid";
3472 3756
3473 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3757 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3474 or return; 3758 or return;
3475 3759
3476 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3760 my $value = uuid_seq uuid_cur;
3761
3762 unless ($value) {
3763 info "cowardly refusing to write zero uuid value!\n";
3764 return;
3765 }
3766
3767 my $value = uuid_str $value + $uuid_skip;
3477 $uuid_skip = 0; 3768 $uuid_skip = 0;
3478 3769
3479 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3770 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3480 and return; 3771 and return;
3481 3772
3487 or return; 3778 or return;
3488 3779
3489 aio_rename "$uuid~", $uuid 3780 aio_rename "$uuid~", $uuid
3490 and return; 3781 and return;
3491 3782
3492 warn "uuid file written ($value).\n"; 3783 trace "uuid file written ($value).\n";
3493 3784
3494 1 3785 1
3495 3786
3496} 3787}
3497 3788
3503} 3794}
3504 3795
3505sub emergency_save() { 3796sub emergency_save() {
3506 my $freeze_guard = cf::freeze_mainloop; 3797 my $freeze_guard = cf::freeze_mainloop;
3507 3798
3508 warn "enter emergency perl save\n"; 3799 info "emergency_perl_save: enter\n";
3800
3801 # this is a trade-off: we want to be very quick here, so
3802 # save all maps without fsync, and later call a global sync
3803 # (which in turn might be very very slow)
3804 local $USE_FSYNC = 0;
3509 3805
3510 cf::sync_job { 3806 cf::sync_job {
3807 cf::write_runtime_sync; # external watchdog should not bark
3808
3511 # use a peculiar iteration method to avoid tripping on perl 3809 # use a peculiar iteration method to avoid tripping on perl
3512 # refcount bugs in for. also avoids problems with players 3810 # refcount bugs in for. also avoids problems with players
3513 # and maps saved/destroyed asynchronously. 3811 # and maps saved/destroyed asynchronously.
3514 warn "begin emergency player save\n"; 3812 info "emergency_perl_save: begin player save\n";
3515 for my $login (keys %cf::PLAYER) { 3813 for my $login (keys %cf::PLAYER) {
3516 my $pl = $cf::PLAYER{$login} or next; 3814 my $pl = $cf::PLAYER{$login} or next;
3517 $pl->valid or next; 3815 $pl->valid or next;
3518 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3816 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3519 $pl->save; 3817 $pl->save;
3520 } 3818 }
3521 warn "end emergency player save\n"; 3819 info "emergency_perl_save: end player save\n";
3522 3820
3523 warn "begin emergency map save\n"; 3821 cf::write_runtime_sync; # external watchdog should not bark
3822
3823 info "emergency_perl_save: begin map save\n";
3524 for my $path (keys %cf::MAP) { 3824 for my $path (keys %cf::MAP) {
3525 my $map = $cf::MAP{$path} or next; 3825 my $map = $cf::MAP{$path} or next;
3526 $map->valid or next; 3826 $map->valid or next;
3527 $map->save; 3827 $map->save;
3528 } 3828 }
3529 warn "end emergency map save\n"; 3829 info "emergency_perl_save: end map save\n";
3530 3830
3531 warn "begin emergency database checkpoint\n"; 3831 cf::write_runtime_sync; # external watchdog should not bark
3832
3833 info "emergency_perl_save: begin database checkpoint\n";
3532 BDB::db_env_txn_checkpoint $DB_ENV; 3834 BDB::db_env_txn_checkpoint $DB_ENV;
3533 warn "end emergency database checkpoint\n"; 3835 info "emergency_perl_save: end database checkpoint\n";
3534 3836
3535 warn "begin write uuid\n"; 3837 info "emergency_perl_save: begin write uuid\n";
3536 write_uuid_sync 1; 3838 write_uuid_sync 1;
3537 warn "end write uuid\n"; 3839 info "emergency_perl_save: end write uuid\n";
3840
3841 cf::write_runtime_sync; # external watchdog should not bark
3842
3843 trace "emergency_perl_save: syncing database to disk";
3844 BDB::db_env_txn_checkpoint $DB_ENV;
3845
3846 info "emergency_perl_save: starting sync\n";
3847 IO::AIO::aio_sync sub {
3848 info "emergency_perl_save: finished sync\n";
3849 };
3850
3851 cf::write_runtime_sync; # external watchdog should not bark
3852
3853 trace "emergency_perl_save: flushing outstanding aio requests";
3854 while (IO::AIO::nreqs || BDB::nreqs) {
3855 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3856 }
3857
3858 cf::write_runtime_sync; # external watchdog should not bark
3538 }; 3859 };
3539 3860
3540 warn "leave emergency perl save\n"; 3861 info "emergency_perl_save: leave\n";
3541} 3862}
3542 3863
3543sub post_cleanup { 3864sub post_cleanup {
3544 my ($make_core) = @_; 3865 my ($make_core) = @_;
3545 3866
3867 IO::AIO::flush;
3868
3546 warn Carp::longmess "post_cleanup backtrace" 3869 error Carp::longmess "post_cleanup backtrace"
3547 if $make_core; 3870 if $make_core;
3548 3871
3549 my $fh = pidfile; 3872 my $fh = pidfile;
3550 unlink $PIDFILE if <$fh> == $$; 3873 unlink $PIDFILE if <$fh> == $$;
3551} 3874}
3571 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3894 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3572 for my $name (keys %$leaf_symtab) { 3895 for my $name (keys %$leaf_symtab) {
3573 _gv_clear *{"$pkg$name"}; 3896 _gv_clear *{"$pkg$name"};
3574# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3897# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3575 } 3898 }
3576 warn "cleared package #$pkg\n";#d#
3577} 3899}
3578
3579our $RELOAD; # how many times to reload
3580 3900
3581sub do_reload_perl() { 3901sub do_reload_perl() {
3582 # can/must only be called in main 3902 # can/must only be called in main
3583 if ($Coro::current != $Coro::main) { 3903 unless (in_main) {
3584 warn "can only reload from main coroutine"; 3904 error "can only reload from main coroutine";
3585 return; 3905 return;
3586 } 3906 }
3587 3907
3588 return if $RELOAD++; 3908 return if $RELOAD++;
3589 3909
3910 my $t1 = AE::time;
3911
3590 while ($RELOAD) { 3912 while ($RELOAD) {
3591 warn "reloading..."; 3913 cf::get_slot 0.1, -1, "reload_perl";
3914 info "perl_reload: reloading...";
3592 3915
3593 warn "entering sync_job"; 3916 trace "perl_reload: entering sync_job";
3594 3917
3595 cf::sync_job { 3918 cf::sync_job {
3596 cf::write_runtime_sync; # external watchdog should not bark
3597 cf::emergency_save; 3919 #cf::emergency_save;
3598 cf::write_runtime_sync; # external watchdog should not bark
3599 3920
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"; 3921 trace "perl_reload: cancelling all extension coros";
3611 $_->cancel for values %EXT_CORO; 3922 $_->cancel for values %EXT_CORO;
3612 %EXT_CORO = (); 3923 %EXT_CORO = ();
3613 3924
3614 warn "removing commands"; 3925 trace "perl_reload: removing commands";
3615 %COMMAND = (); 3926 %COMMAND = ();
3616 3927
3617 warn "removing ext/exti commands"; 3928 trace "perl_reload: removing ext/exti commands";
3618 %EXTCMD = (); 3929 %EXTCMD = ();
3619 %EXTICMD = (); 3930 %EXTICMD = ();
3620 3931
3621 warn "unloading/nuking all extensions"; 3932 trace "perl_reload: unloading/nuking all extensions";
3622 for my $pkg (@EXTS) { 3933 for my $pkg (@EXTS) {
3623 warn "... unloading $pkg"; 3934 trace "... unloading $pkg";
3624 3935
3625 if (my $cb = $pkg->can ("unload")) { 3936 if (my $cb = $pkg->can ("unload")) {
3626 eval { 3937 eval {
3627 $cb->($pkg); 3938 $cb->($pkg);
3628 1 3939 1
3629 } or warn "$pkg unloaded, but with errors: $@"; 3940 } or error "$pkg unloaded, but with errors: $@";
3630 } 3941 }
3631 3942
3632 warn "... clearing $pkg"; 3943 trace "... clearing $pkg";
3633 clear_package $pkg; 3944 clear_package $pkg;
3634 } 3945 }
3635 3946
3636 warn "unloading all perl modules loaded from $LIBDIR"; 3947 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3637 while (my ($k, $v) = each %INC) { 3948 while (my ($k, $v) = each %INC) {
3638 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3949 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3639 3950
3640 warn "... unloading $k"; 3951 trace "... unloading $k";
3641 delete $INC{$k}; 3952 delete $INC{$k};
3642 3953
3643 $k =~ s/\.pm$//; 3954 $k =~ s/\.pm$//;
3644 $k =~ s/\//::/g; 3955 $k =~ s/\//::/g;
3645 3956
3648 } 3959 }
3649 3960
3650 clear_package $k; 3961 clear_package $k;
3651 } 3962 }
3652 3963
3653 warn "getting rid of safe::, as good as possible"; 3964 trace "perl_reload: getting rid of safe::, as good as possible";
3654 clear_package "safe::$_" 3965 clear_package "safe::$_"
3655 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3966 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3656 3967
3657 warn "unloading cf.pm \"a bit\""; 3968 trace "perl_reload: unloading cf.pm \"a bit\"";
3658 delete $INC{"cf.pm"}; 3969 delete $INC{"cf.pm"};
3659 delete $INC{"cf/pod.pm"}; 3970 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3660 3971
3661 # don't, removes xs symbols, too, 3972 # don't, removes xs symbols, too,
3662 # and global variables created in xs 3973 # and global variables created in xs
3663 #clear_package __PACKAGE__; 3974 #clear_package __PACKAGE__;
3664 3975
3665 warn "unload completed, starting to reload now"; 3976 info "perl_reload: unload completed, starting to reload now";
3666 3977
3667 warn "reloading cf.pm"; 3978 trace "perl_reload: reloading cf.pm";
3668 require cf; 3979 require cf;
3669 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3980 cf::_connect_to_perl_1;
3670 3981
3671 warn "loading config and database again"; 3982 trace "perl_reload: loading config and database again";
3672 cf::reload_config; 3983 cf::reload_config;
3673 3984
3674 warn "loading extensions"; 3985 trace "perl_reload: loading extensions";
3675 cf::load_extensions; 3986 cf::load_extensions;
3676 3987
3988 if ($REATTACH_ON_RELOAD) {
3677 warn "reattaching attachments to objects/players"; 3989 trace "perl_reload: reattaching attachments to objects/players";
3678 _global_reattach; # objects, sockets 3990 _global_reattach; # objects, sockets
3679 warn "reattaching attachments to maps"; 3991 trace "perl_reload: reattaching attachments to maps";
3680 reattach $_ for values %MAP; 3992 reattach $_ for values %MAP;
3681 warn "reattaching attachments to players"; 3993 trace "perl_reload: reattaching attachments to players";
3682 reattach $_ for values %PLAYER; 3994 reattach $_ for values %PLAYER;
3995 }
3683 3996
3684 warn "leaving sync_job"; 3997 cf::_post_init 1;
3998
3999 trace "perl_reload: leaving sync_job";
3685 4000
3686 1 4001 1
3687 } or do { 4002 } or do {
3688 warn $@; 4003 error $@;
3689 cf::cleanup "error while reloading, exiting."; 4004 cf::cleanup "perl_reload: error, exiting.";
3690 }; 4005 };
3691 4006
3692 warn "reloaded";
3693 --$RELOAD; 4007 --$RELOAD;
3694 } 4008 }
4009
4010 $t1 = AE::time - $t1;
4011 info "perl_reload: completed in ${t1}s\n";
3695}; 4012};
3696 4013
3697our $RELOAD_WATCHER; # used only during reload 4014our $RELOAD_WATCHER; # used only during reload
3698 4015
3699sub reload_perl() { 4016sub reload_perl() {
3700 # doing reload synchronously and two reloads happen back-to-back, 4017 # doing reload synchronously and two reloads happen back-to-back,
3701 # coro crashes during coro_state_free->destroy here. 4018 # coro crashes during coro_state_free->destroy here.
3702 4019
4020 $RELOAD_WATCHER ||= cf::async {
4021 Coro::AIO::aio_wait cache_extensions;
4022
3703 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4023 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3704 do_reload_perl; 4024 do_reload_perl;
3705 undef $RELOAD_WATCHER; 4025 undef $RELOAD_WATCHER;
4026 };
3706 }; 4027 };
3707} 4028}
3708 4029
3709register_command "reload" => sub { 4030register_command "reload" => sub {
3710 my ($who, $arg) = @_; 4031 my ($who, $arg) = @_;
3716 reload_perl; 4037 reload_perl;
3717 }; 4038 };
3718 } 4039 }
3719}; 4040};
3720 4041
3721unshift @INC, $LIBDIR; 4042#############################################################################
3722 4043
3723my $bug_warning = 0; 4044my $bug_warning = 0;
3724 4045
3725our @WAIT_FOR_TICK; 4046our @WAIT_FOR_TICK;
3726our @WAIT_FOR_TICK_BEGIN; 4047our @WAIT_FOR_TICK_BEGIN;
3727 4048
3728sub wait_for_tick { 4049sub wait_for_tick() {
3729 return if tick_inhibit || $Coro::current == $Coro::main; 4050 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3730 4051
3731 my $signal = new Coro::Signal; 4052 my $signal = new Coro::Signal;
3732 push @WAIT_FOR_TICK, $signal; 4053 push @WAIT_FOR_TICK, $signal;
3733 $signal->wait; 4054 $signal->wait;
3734} 4055}
3735 4056
3736sub wait_for_tick_begin { 4057sub wait_for_tick_begin() {
3737 return if tick_inhibit || $Coro::current == $Coro::main; 4058 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3738 4059
3739 my $signal = new Coro::Signal; 4060 my $signal = new Coro::Signal;
3740 push @WAIT_FOR_TICK_BEGIN, $signal; 4061 push @WAIT_FOR_TICK_BEGIN, $signal;
3741 $signal->wait; 4062 $signal->wait;
3742} 4063}
3748 return; 4069 return;
3749 } 4070 }
3750 4071
3751 cf::server_tick; # one server iteration 4072 cf::server_tick; # one server iteration
3752 4073
4074 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4075
3753 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4076 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3754 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4077 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3755 Coro::async_pool { 4078 Coro::async_pool {
3756 $Coro::current->{desc} = "runtime saver"; 4079 $Coro::current->{desc} = "runtime saver";
3757 write_runtime_sync 4080 write_runtime_sync
3758 or warn "ERROR: unable to write runtime file: $!"; 4081 or error "ERROR: unable to write runtime file: $!";
3759 }; 4082 };
3760 } 4083 }
3761 4084
3762 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4085 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3763 $sig->send; 4086 $sig->send;
3771 4094
3772 if (0) { 4095 if (0) {
3773 if ($NEXT_TICK) { 4096 if ($NEXT_TICK) {
3774 my $jitter = $TICK_START - $NEXT_TICK; 4097 my $jitter = $TICK_START - $NEXT_TICK;
3775 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4098 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3776 warn "jitter $JITTER\n";#d# 4099 debug "jitter $JITTER\n";#d#
3777 } 4100 }
3778 } 4101 }
3779} 4102}
3780 4103
3781{ 4104{
3782 # configure BDB 4105 # configure BDB
3783 4106
3784 BDB::min_parallel 8; 4107 BDB::min_parallel 16;
3785 BDB::max_poll_reqs $TICK * 0.1; 4108 BDB::max_poll_reqs $TICK * 0.1;
3786 $AnyEvent::BDB::WATCHER->priority (1); 4109 $AnyEvent::BDB::WATCHER->priority (1);
3787 4110
3788 unless ($DB_ENV) { 4111 unless ($DB_ENV) {
3789 $DB_ENV = BDB::db_env_create; 4112 $DB_ENV = BDB::db_env_create;
3869 LOG llevInfo, "[ABT] [suppressed]\n"; 4192 LOG llevInfo, "[ABT] [suppressed]\n";
3870 } 4193 }
3871} 4194}
3872 4195
3873# load additional modules 4196# load additional modules
3874use cf::pod; 4197require "cf/$_.pm" for @EXTRA_MODULES;
4198cf::_connect_to_perl_2;
3875 4199
3876END { cf::emergency_save } 4200END { cf::emergency_save }
3877 4201
38781 42021
3879 4203

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines