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.449 by root, Sat Sep 20 00:09:27 2008 UTC vs.
Revision 1.554 by root, Sat Jun 26 22:10:18 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines