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.445 by root, Wed Sep 10 18:18:10 2008 UTC vs.
Revision 1.547 by root, Sun May 9 22:51:13 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use common::sense;
25use utf8;
26use strict "vars", "subs";
27 26
28use Symbol; 27use Symbol;
29use List::Util; 28use List::Util;
30use Socket; 29use Socket;
31use EV; 30use EV;
32use Opcode; 31use Opcode;
33use Safe; 32use Safe;
34use Safe::Hole; 33use Safe::Hole;
35use Storable (); 34use Storable ();
35use Carp ();
36 36
37use Guard ();
37use Coro (); 38use Coro ();
38use Coro::State; 39use Coro::State;
39use Coro::Handle; 40use Coro::Handle;
40use Coro::EV; 41use Coro::EV;
41use Coro::AnyEvent; 42use Coro::AnyEvent;
42use Coro::Timer; 43use Coro::Timer;
43use Coro::Signal; 44use Coro::Signal;
44use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
45use Coro::AnyEvent; 47use Coro::AnyEvent;
46use Coro::AIO; 48use Coro::AIO;
47use Coro::BDB 1.6; 49use Coro::BDB 1.6;
48use Coro::Storable; 50use Coro::Storable;
49use Coro::Util (); 51use Coro::Util ();
50 52
51use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
52use BDB (); 54use BDB ();
53use Data::Dumper; 55use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 56use Fcntl;
56use YAML (); 57use YAML::XS ();
57use IO::AIO (); 58use IO::AIO ();
58use Time::HiRes; 59use Time::HiRes;
59use Compress::LZF; 60use Compress::LZF;
60use Digest::MD5 (); 61use Digest::MD5 ();
61 62
63 64
64# configure various modules to our taste 65# configure various modules to our taste
65# 66#
66$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
68Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
69 75
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
71 78
72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
73 82
74our %COMMAND = (); 83our %COMMAND = ();
75our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
76 85
77our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
78our %EXTCMD = (); 87our %EXTCMD = ();
79our %EXTICMD = (); 88our %EXTICMD = ();
80our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
81our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
82 91
83our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
84our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
85 96
86our $CONFDIR = confdir; 97our $CONFDIR = confdir;
87our $DATADIR = datadir; 98our $DATADIR = datadir;
88our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
89our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
95our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
96our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
97our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
98our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
99 110
100our %RESOURCE; 111our %RESOURCE; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
101 118
102our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
103our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
104our $NEXT_TICK; 121our $NEXT_TICK;
105our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
106 123
107our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
108our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
109our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
110our $DB_ENV; 127our $DB_ENV;
111 128
129our @EXTRA_MODULES = qw(pod match mapscript incloader);
130
112our %CFG; 131our %CFG;
113 132
114our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
115our $RUNTIME; 134our $RUNTIME;
116our $NOW; 135our $NOW;
124 143
125our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
126our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
127our $JITTER; # average jitter 146our $JITTER; # average jitter
128our $TICK_START; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
148
149our @POST_INIT;
150
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
129 153
130binmode STDOUT; 154binmode STDOUT;
131binmode STDERR; 155binmode STDERR;
132 156
133# read virtual server time, if available 157# read virtual server time, if available
135 open my $fh, "<", $RUNTIMEFILE 159 open my $fh, "<", $RUNTIMEFILE
136 or die "unable to read $RUNTIMEFILE file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
137 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
138} 162}
139 163
164eval "sub TICK() { $TICK } 1" or die;
165
140mkdir $_ 166mkdir $_
141 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
142 168
143our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
144 170
145sub cf::map::normalise; 171sub cf::map::normalise;
172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
146 187
147############################################################################# 188#############################################################################
148 189
149=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
150 191
192from wherever your confdir points to. 233from wherever your confdir points to.
193 234
194=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
195 236
196These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
197returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one thread
198per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
199 240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
200=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
201 247
202This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
203C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 249C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
204that call. 250that call.
205 251
252=item %cf::REFLECT
253
254Contains, for each (C++) class name, a hash reference with information
255about object members (methods, scalars, arrays and flags) and other
256metadata, which is useful for introspection.
257
206=back 258=back
207 259
208=cut 260=cut
209 261
210BEGIN { 262sub error(@) { LOG llevError, join "", @_ }
211 *CORE::GLOBAL::warn = sub { 263sub warn (@) { LOG llevWarn , join "", @_ }
264sub info (@) { LOG llevInfo , join "", @_ }
265sub debug(@) { LOG llevDebug, join "", @_ }
266sub trace(@) { LOG llevTrace, join "", @_ }
267
268$Coro::State::WARNHOOK = sub {
212 my $msg = join "", @_; 269 my $msg = join "", @_;
213 270
214 $msg .= "\n" 271 $msg .= "\n"
215 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
216 273
217 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 274 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
218 275
219 LOG llevError, $msg; 276 LOG llevWarn, $msg;
220 }; 277};
221}
222 278
223$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
224 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
225 281
226 if ($Coro::current == $Coro::main) {#d# 282 error Carp::longmess $_[0];
283
284 if (in_main) {#d#
227 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
228 return;#d# 286 return;#d#
229 }#d# 287 }#d#
230 288
231 # kill coroutine otherwise 289 # kill coroutine otherwise
232 warn Carp::longmess $_[0];
233 Coro::terminate 290 Coro::terminate
234}; 291};
235
236$SIG{__DIE__} = sub { }; #d#?
237 292
238@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 293@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
239@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 294@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
240@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 295@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
241@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 296@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
255)) { 310)) {
256 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
257} 312}
258 313
259$EV::DIED = sub { 314$EV::DIED = sub {
260 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
261}; 316};
262 317
263############################################################################# 318#############################################################################
264 319
265=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
302our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 357our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
303 358
304sub encode_json($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
305sub decode_json($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
306 361
362=item cf::post_init { BLOCK }
363
364Execute the given codeblock, I<after> all extensions have been (re-)loaded,
365but I<before> the server starts ticking again.
366
367The cdoeblock will have a single boolean argument to indicate whether this
368is a reload or not.
369
370=cut
371
372sub post_init(&) {
373 push @POST_INIT, shift;
374}
375
307=item cf::lock_wait $string 376=item cf::lock_wait $string
308 377
309Wait until the given lock is available. See cf::lock_acquire. 378Wait until the given lock is available. See cf::lock_acquire.
310 379
311=item my $lock = cf::lock_acquire $string 380=item my $lock = cf::lock_acquire $string
312 381
313Wait until the given lock is available and then acquires it and returns 382Wait until the given lock is available and then acquires it and returns
314a Coro::guard object. If the guard object gets destroyed (goes out of scope, 383a L<Guard> object. If the guard object gets destroyed (goes out of scope,
315for example when the coroutine gets canceled), the lock is automatically 384for example when the coroutine gets canceled), the lock is automatically
316returned. 385returned.
317 386
318Locks are *not* recursive, locking from the same coro twice results in a 387Locks are *not* recursive, locking from the same coro twice results in a
319deadlocked coro. 388deadlocked coro.
325 394
326Return true if the lock is currently active, i.e. somebody has locked it. 395Return true if the lock is currently active, i.e. somebody has locked it.
327 396
328=cut 397=cut
329 398
330our %LOCK; 399our $LOCKS = new Coro::SemaphoreSet;
331our %LOCKER;#d#
332 400
333sub lock_wait($) { 401sub lock_wait($) {
334 my ($key) = @_; 402 $LOCKS->wait ($_[0]);
335
336 if ($LOCKER{$key} == $Coro::current) {#d#
337 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
338 return;#d#
339 }#d#
340
341 # wait for lock, if any
342 while ($LOCK{$key}) {
343 push @{ $LOCK{$key} }, $Coro::current;
344 Coro::schedule;
345 }
346} 403}
347 404
348sub lock_acquire($) { 405sub lock_acquire($) {
349 my ($key) = @_; 406 $LOCKS->guard ($_[0])
350
351 # wait, to be sure we are not locked
352 lock_wait $key;
353
354 $LOCK{$key} = [];
355 $LOCKER{$key} = $Coro::current;#d#
356
357 Coro::guard {
358 delete $LOCKER{$key};#d#
359 # wake up all waiters, to be on the safe side
360 $_->ready for @{ delete $LOCK{$key} };
361 }
362} 407}
363 408
364sub lock_active($) { 409sub lock_active($) {
365 my ($key) = @_; 410 $LOCKS->count ($_[0]) < 1
366
367 ! ! $LOCK{$key}
368} 411}
369 412
370sub freeze_mainloop { 413sub freeze_mainloop {
371 tick_inhibit_inc; 414 tick_inhibit_inc;
372 415
373 Coro::guard \&tick_inhibit_dec; 416 &Guard::guard (\&tick_inhibit_dec);
374} 417}
375 418
376=item cf::periodic $interval, $cb 419=item cf::periodic $interval, $cb
377 420
378Like EV::periodic, but randomly selects a starting point so that the actions 421Like EV::periodic, but randomly selects a starting point so that the actions
379get spread over timer. 422get spread over time.
380 423
381=cut 424=cut
382 425
383sub periodic($$) { 426sub periodic($$) {
384 my ($interval, $cb) = @_; 427 my ($interval, $cb) = @_;
401 444
402=cut 445=cut
403 446
404our @SLOT_QUEUE; 447our @SLOT_QUEUE;
405our $SLOT_QUEUE; 448our $SLOT_QUEUE;
449our $SLOT_DECAY = 0.9;
406 450
407$SLOT_QUEUE->cancel if $SLOT_QUEUE; 451$SLOT_QUEUE->cancel if $SLOT_QUEUE;
408$SLOT_QUEUE = Coro::async { 452$SLOT_QUEUE = Coro::async {
409 $Coro::current->desc ("timeslot manager"); 453 $Coro::current->desc ("timeslot manager");
410 454
411 my $signal = new Coro::Signal; 455 my $signal = new Coro::Signal;
456 my $busy;
412 457
413 while () { 458 while () {
414 next_job: 459 next_job:
460
415 my $avail = cf::till_tick; 461 my $avail = cf::till_tick;
416 if ($avail > 0.01) { 462
417 for (0 .. $#SLOT_QUEUE) { 463 for (0 .. $#SLOT_QUEUE) {
418 if ($SLOT_QUEUE[$_][0] < $avail) { 464 if ($SLOT_QUEUE[$_][0] <= $avail) {
465 $busy = 0;
419 my $job = splice @SLOT_QUEUE, $_, 1, (); 466 my $job = splice @SLOT_QUEUE, $_, 1, ();
420 $job->[2]->send; 467 $job->[2]->send;
421 Coro::cede; 468 Coro::cede;
422 goto next_job; 469 goto next_job;
423 } 470 } else {
471 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
424 } 472 }
425 } 473 }
426 474
427 if (@SLOT_QUEUE) { 475 if (@SLOT_QUEUE) {
428 # we do not use wait_for_tick() as it returns immediately when tick is inactive 476 # we do not use wait_for_tick() as it returns immediately when tick is inactive
429 push @cf::WAIT_FOR_TICK, $signal; 477 push @cf::WAIT_FOR_TICK, $signal;
430 $signal->wait; 478 $signal->wait;
431 } else { 479 } else {
480 $busy = 0;
432 Coro::schedule; 481 Coro::schedule;
433 } 482 }
434 } 483 }
435}; 484};
436 485
437sub get_slot($;$$) { 486sub get_slot($;$$) {
438 return if tick_inhibit || $Coro::current == $Coro::main; 487 return if tick_inhibit || $Coro::current == $Coro::main;
439 488
440 my ($time, $pri, $name) = @_; 489 my ($time, $pri, $name) = @_;
441 490
442 $time = $TICK * .6 if $time > $TICK * .6; 491 $time = clamp $time, 0.01, $TICK * .6;
492
443 my $sig = new Coro::Signal; 493 my $sig = new Coro::Signal;
444 494
445 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 495 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
446 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 496 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
447 $SLOT_QUEUE->ready; 497 $SLOT_QUEUE->ready;
473=cut 523=cut
474 524
475sub sync_job(&) { 525sub sync_job(&) {
476 my ($job) = @_; 526 my ($job) = @_;
477 527
478 if ($Coro::current == $Coro::main) { 528 if (in_main) {
479 my $time = EV::time; 529 my $time = AE::time;
480 530
481 # this is the main coro, too bad, we have to block 531 # this is the main coro, too bad, we have to block
482 # till the operation succeeds, freezing the server :/ 532 # till the operation succeeds, freezing the server :/
483 533
484 LOG llevError, Carp::longmess "sync job";#d# 534 #LOG llevError, Carp::longmess "sync job";#d#
485 535
486 my $freeze_guard = freeze_mainloop; 536 my $freeze_guard = freeze_mainloop;
487 537
488 my $busy = 1; 538 my $busy = 1;
489 my @res; 539 my @res;
490 540
491 (async { 541 (async {
492 $Coro::current->desc ("sync job coro"); 542 $Coro::current->desc ("sync job coro");
493 @res = eval { $job->() }; 543 @res = eval { $job->() };
494 warn $@ if $@; 544 error $@ if $@;
495 undef $busy; 545 undef $busy;
496 })->prio (Coro::PRIO_MAX); 546 })->prio (Coro::PRIO_MAX);
497 547
498 while ($busy) { 548 while ($busy) {
499 if (Coro::nready) { 549 if (Coro::nready) {
501 } else { 551 } else {
502 EV::loop EV::LOOP_ONESHOT; 552 EV::loop EV::LOOP_ONESHOT;
503 } 553 }
504 } 554 }
505 555
506 my $time = EV::time - $time; 556 my $time = AE::time - $time;
507 557
508 $TICK_START += $time; # do not account sync jobs to server load 558 $TICK_START += $time; # do not account sync jobs to server load
509 559
510 wantarray ? @res : $res[0] 560 wantarray ? @res : $res[0]
511 } else { 561 } else {
542Coro::Storable. May, of course, block. Note that the executed sub may 592Coro::Storable. May, of course, block. Note that the executed sub may
543never block itself or use any form of event handling. 593never block itself or use any form of event handling.
544 594
545=cut 595=cut
546 596
597sub post_fork {
598 reset_signals;
599}
600
547sub fork_call(&@) { 601sub fork_call(&@) {
548 my ($cb, @args) = @_; 602 my ($cb, @args) = @_;
549 603
550 # we seemingly have to make a local copy of the whole thing, 604 # we seemingly have to make a local copy of the whole thing,
551 # otherwise perl prematurely frees the stuff :/ 605 # otherwise perl prematurely frees the stuff :/
552 # TODO: investigate and fix (likely this will be rather laborious) 606 # TODO: investigate and fix (likely this will be rather laborious)
553 607
554 my @res = Coro::Util::fork_eval { 608 my @res = Coro::Util::fork_eval {
555 reset_signals; 609 cf::post_fork;
556 &$cb 610 &$cb
557 }, @args; 611 }, @args;
558 612
559 wantarray ? @res : $res[-1] 613 wantarray ? @res : $res[-1]
614}
615
616sub objinfo {
617 (
618 "counter value" => cf::object::object_count,
619 "objects created" => cf::object::create_count,
620 "objects destroyed" => cf::object::destroy_count,
621 "freelist size" => cf::object::free_count,
622 "allocated objects" => cf::object::objects_size,
623 "active objects" => cf::object::actives_size,
624 )
560} 625}
561 626
562=item $coin = coin_from_name $name 627=item $coin = coin_from_name $name
563 628
564=cut 629=cut
601within each server. 666within each server.
602 667
603=cut 668=cut
604 669
605sub db_table($) { 670sub db_table($) {
671 cf::error "db_get called from main context"
672 if $Coro::current == $Coro::main;
673
606 my ($name) = @_; 674 my ($name) = @_;
607 my $db = BDB::db_create $DB_ENV; 675 my $db = BDB::db_create $DB_ENV;
608 676
609 eval { 677 eval {
610 $db->set_flags (BDB::CHKSUM); 678 $db->set_flags (BDB::CHKSUM);
620} 688}
621 689
622our $DB; 690our $DB;
623 691
624sub db_init { 692sub db_init {
625 cf::sync_job {
626 $DB ||= db_table "db"; 693 $DB ||= db_table "db";
627 };
628} 694}
629 695
630sub db_get($$) { 696sub db_get($$) {
631 my $key = "$_[0]/$_[1]"; 697 my $key = "$_[0]/$_[1]";
632 698
633 cf::sync_job { 699 cf::error "db_get called from main context"
700 if $Coro::current == $Coro::main;
701
634 BDB::db_get $DB, undef, $key, my $data; 702 BDB::db_get $DB, undef, $key, my $data;
635 703
636 $! ? () 704 $! ? ()
637 : $data 705 : $data
638 }
639} 706}
640 707
641sub db_put($$$) { 708sub db_put($$$) {
642 BDB::dbreq_pri 4; 709 BDB::dbreq_pri 4;
643 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 710 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
699 766
700 my $t1 = Time::HiRes::time; 767 my $t1 = Time::HiRes::time;
701 my $data = $process->(\@data); 768 my $data = $process->(\@data);
702 my $t2 = Time::HiRes::time; 769 my $t2 = Time::HiRes::time;
703 770
704 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 771 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
705 772
706 db_put cache => "$id/data", $data; 773 db_put cache => "$id/data", $data;
707 db_put cache => "$id/md5" , $md5; 774 db_put cache => "$id/md5" , $md5;
708 db_put cache => "$id/meta", $meta; 775 db_put cache => "$id/meta", $meta;
709 776
719 786
720=cut 787=cut
721 788
722sub datalog($@) { 789sub datalog($@) {
723 my ($type, %kv) = @_; 790 my ($type, %kv) = @_;
724 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 791 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
725} 792}
726 793
727=back 794=back
728 795
729=cut 796=cut
730 797
731############################################################################# 798#############################################################################
732 799
733=head2 ATTACHABLE OBJECTS 800=head2 ATTACHABLE OBJECTS
734 801
735Many objects in crossfire are so-called attachable objects. That means you can 802Many objects in deliantra are so-called attachable objects. That means you can
736attach callbacks/event handlers (a collection of which is called an "attachment") 803attach callbacks/event handlers (a collection of which is called an "attachment")
737to it. All such attachable objects support the following methods. 804to it. All such attachable objects support the following methods.
738 805
739In the following description, CLASS can be any of C<global>, C<object> 806In the following description, CLASS can be any of C<global>, C<object>
740C<player>, C<client> or C<map> (i.e. the attachable objects in 807C<player>, C<client> or C<map> (i.e. the attachable objects in
790=item cf::CLASS::attachment $name, ... 857=item cf::CLASS::attachment $name, ...
791 858
792Register an attachment by C<$name> through which attachable objects of the 859Register an attachment by C<$name> through which attachable objects of the
793given CLASS can refer to this attachment. 860given CLASS can refer to this attachment.
794 861
795Some classes such as crossfire maps and objects can specify attachments 862Some classes such as deliantra maps and objects can specify attachments
796that are attached at load/instantiate time, thus the need for a name. 863that are attached at load/instantiate time, thus the need for a name.
797 864
798These calls expect any number of the following handler/hook descriptions: 865These calls expect any number of the following handler/hook descriptions:
799 866
800=over 4 867=over 4
924 991
925 } elsif (exists $cb_id{$type}) { 992 } elsif (exists $cb_id{$type}) {
926 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 993 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
927 994
928 } elsif (ref $type) { 995 } elsif (ref $type) {
929 warn "attaching objects not supported, ignoring.\n"; 996 error "attaching objects not supported, ignoring.\n";
930 997
931 } else { 998 } else {
932 shift @arg; 999 shift @arg;
933 warn "attach argument '$type' not supported, ignoring.\n"; 1000 error "attach argument '$type' not supported, ignoring.\n";
934 } 1001 }
935 } 1002 }
936} 1003}
937 1004
938sub _object_attach { 1005sub _object_attach {
948 _attach $registry, $klass, @attach; 1015 _attach $registry, $klass, @attach;
949 } 1016 }
950 1017
951 $obj->{$name} = \%arg; 1018 $obj->{$name} = \%arg;
952 } else { 1019 } else {
953 warn "object uses attachment '$name' which is not available, postponing.\n"; 1020 info "object uses attachment '$name' which is not available, postponing.\n";
954 } 1021 }
955 1022
956 $obj->{_attachment}{$name} = undef; 1023 $obj->{_attachment}{$name} = undef;
957} 1024}
958 1025
1017 1084
1018 for (@$callbacks) { 1085 for (@$callbacks) {
1019 eval { &{$_->[1]} }; 1086 eval { &{$_->[1]} };
1020 1087
1021 if ($@) { 1088 if ($@) {
1022 warn "$@";
1023 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1089 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1024 override; 1090 override;
1025 } 1091 }
1026 1092
1027 return 1 if $override; 1093 return 1 if $override;
1028 } 1094 }
1107 for (@$attach) { 1173 for (@$attach) {
1108 my ($klass, @attach) = @$_; 1174 my ($klass, @attach) = @$_;
1109 _attach $registry, $klass, @attach; 1175 _attach $registry, $klass, @attach;
1110 } 1176 }
1111 } else { 1177 } else {
1112 warn "object uses attachment '$name' that is not available, postponing.\n"; 1178 info "object uses attachment '$name' that is not available, postponing.\n";
1113 } 1179 }
1114 } 1180 }
1115} 1181}
1116 1182
1117cf::attachable->attach ( 1183cf::attachable->attach (
1144 my ($filename, $rdata, $objs) = @_; 1210 my ($filename, $rdata, $objs) = @_;
1145 1211
1146 sync_job { 1212 sync_job {
1147 if (length $$rdata) { 1213 if (length $$rdata) {
1148 utf8::decode (my $decname = $filename); 1214 utf8::decode (my $decname = $filename);
1149 warn sprintf "saving %s (%d,%d)\n", 1215 trace sprintf "saving %s (%d,%d)\n",
1150 $decname, length $$rdata, scalar @$objs; 1216 $decname, length $$rdata, scalar @$objs
1217 if $VERBOSE_IO;
1151 1218
1152 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1219 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1153 aio_chmod $fh, SAVE_MODE; 1220 aio_chmod $fh, SAVE_MODE;
1154 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1221 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1155 aio_fsync $fh if $cf::USE_FSYNC; 1222 if ($cf::USE_FSYNC) {
1223 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;
1224 aio_fsync $fh;
1225 }
1156 aio_close $fh; 1226 aio_close $fh;
1157 1227
1158 if (@$objs) { 1228 if (@$objs) {
1159 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1229 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1160 aio_chmod $fh, SAVE_MODE; 1230 aio_chmod $fh, SAVE_MODE;
1161 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1231 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1162 aio_write $fh, 0, (length $data), $data, 0; 1232 aio_write $fh, 0, (length $data), $data, 0;
1163 aio_fsync $fh if $cf::USE_FSYNC; 1233 if ($cf::USE_FSYNC) {
1234 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;
1235 aio_fsync $fh;
1236 }
1164 aio_close $fh; 1237 aio_close $fh;
1165 aio_rename "$filename.pst~", "$filename.pst"; 1238 aio_rename "$filename.pst~", "$filename.pst";
1166 } 1239 }
1167 } else { 1240 } else {
1168 aio_unlink "$filename.pst"; 1241 aio_unlink "$filename.pst";
1169 } 1242 }
1170 1243
1171 aio_rename "$filename~", $filename; 1244 aio_rename "$filename~", $filename;
1245
1246 $filename =~ s%/[^/]+$%%;
1247 aio_pathsync $filename if $cf::USE_FSYNC;
1172 } else { 1248 } else {
1173 warn "FATAL: $filename~: $!\n"; 1249 error "unable to save objects: $filename~: $!\n";
1174 } 1250 }
1175 } else { 1251 } else {
1176 aio_unlink $filename; 1252 aio_unlink $filename;
1177 aio_unlink "$filename.pst"; 1253 aio_unlink "$filename.pst";
1178 } 1254 }
1202 my $st = eval { Coro::Storable::thaw $av }; 1278 my $st = eval { Coro::Storable::thaw $av };
1203 $av = $st->{objs}; 1279 $av = $st->{objs};
1204 } 1280 }
1205 1281
1206 utf8::decode (my $decname = $filename); 1282 utf8::decode (my $decname = $filename);
1207 warn sprintf "loading %s (%d,%d)\n", 1283 trace sprintf "loading %s (%d,%d)\n",
1208 $decname, length $data, scalar @{$av || []}; 1284 $decname, length $data, scalar @{$av || []}
1285 if $VERBOSE_IO;
1209 1286
1210 ($data, $av) 1287 ($data, $av)
1211} 1288}
1212 1289
1213=head2 COMMAND CALLBACKS 1290=head2 COMMAND CALLBACKS
1269 my ($name, $cb) = @_; 1346 my ($name, $cb) = @_;
1270 1347
1271 $EXTICMD{$name} = $cb; 1348 $EXTICMD{$name} = $cb;
1272} 1349}
1273 1350
1351use File::Glob ();
1352
1274cf::player->attach ( 1353cf::player->attach (
1275 on_command => sub { 1354 on_unknown_command => sub {
1276 my ($pl, $name, $params) = @_; 1355 my ($pl, $name, $params) = @_;
1277 1356
1278 my $cb = $COMMAND{$name} 1357 my $cb = $COMMAND{$name}
1279 or return; 1358 or return;
1280 1359
1303 1382
1304 $pl->ext_reply ($reply, @reply) 1383 $pl->ext_reply ($reply, @reply)
1305 if $reply; 1384 if $reply;
1306 1385
1307 } else { 1386 } else {
1308 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1387 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1309 } 1388 }
1310 1389
1311 cf::override; 1390 cf::override;
1312 }, 1391 },
1313); 1392);
1314 1393
1394# "readahead" all extensions
1395sub cache_extensions {
1396 my $grp = IO::AIO::aio_group;
1397
1398 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1399 for (grep /\.ext$/, @{$_[0]}) {
1400 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1401 }
1402 };
1403
1404 $grp
1405}
1406
1315sub load_extensions { 1407sub load_extensions {
1408 info "loading extensions...";
1409
1316 cf::sync_job { 1410 cf::sync_job {
1317 my %todo; 1411 my %todo;
1318 1412
1319 for my $path (<$LIBDIR/*.ext>) { 1413 for my $path (<$LIBDIR/*.ext>) {
1320 next unless -r $path; 1414 next unless -r $path;
1338 1432
1339 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1433 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1340 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1434 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1341 1435
1342 $ext{source} = 1436 $ext{source} =
1343 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1437 "package $pkg; use common::sense;\n"
1344 . "#line 1 \"$path\"\n{\n" 1438 . "#line 1 \"$path\"\n{\n"
1345 . $source 1439 . $source
1346 . "\n};\n1"; 1440 . "\n};\n1";
1347 1441
1348 $todo{$base} = \%ext; 1442 $todo{$base} = \%ext;
1349 } 1443 }
1350 1444
1445 my $pass = 0;
1351 my %done; 1446 my %done;
1352 while (%todo) { 1447 while (%todo) {
1353 my $progress; 1448 my $progress;
1354 1449
1450 ++$pass;
1451
1452 ext:
1355 while (my ($k, $v) = each %todo) { 1453 while (my ($k, $v) = each %todo) {
1356 for (split /,\s*/, $v->{meta}{depends}) { 1454 for (split /,\s*/, $v->{meta}{depends}) {
1357 goto skip 1455 next ext
1358 unless exists $done{$_}; 1456 unless exists $done{$_};
1359 } 1457 }
1360 1458
1361 warn "... loading '$k' into '$v->{pkg}'\n"; 1459 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1362 1460
1363 unless (eval $v->{source}) { 1461 my $active = eval $v->{source};
1462
1463 if (length $@) {
1364 my $msg = $@ ? "$v->{path}: $@\n" 1464 error "$v->{path}: $@\n";
1365 : "$v->{base}: extension inactive.\n";
1366 1465
1367 if (exists $v->{meta}{mandatory}) {
1368 warn $msg;
1369 cf::cleanup "mandatory extension failed to load, exiting."; 1466 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1370 } 1467 if exists $v->{meta}{mandatory};
1371 1468
1372 warn $msg; 1469 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1470 delete $todo{$k};
1471 } else {
1472 $done{$k} = delete $todo{$k};
1473 push @EXTS, $v->{pkg};
1474 $progress = 1;
1475
1476 info "$v->{base}: extension inactive.\n"
1477 unless $active;
1373 } 1478 }
1374
1375 $done{$k} = delete $todo{$k};
1376 push @EXTS, $v->{pkg};
1377 $progress = 1;
1378 } 1479 }
1379 1480
1380 skip: 1481 unless ($progress) {
1381 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1482 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1382 unless $progress; 1483
1484 while (my ($k, $v) = each %todo) {
1485 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1486 if exists $v->{meta}{mandatory};
1487 }
1488 }
1383 } 1489 }
1384 }; 1490 };
1385} 1491}
1386 1492
1387############################################################################# 1493#############################################################################
1388 1494
1389=back 1495=back
1390 1496
1391=head2 CORE EXTENSIONS 1497=head2 CORE EXTENSIONS
1392 1498
1393Functions and methods that extend core crossfire objects. 1499Functions and methods that extend core deliantra objects.
1394 1500
1395=cut 1501=cut
1396 1502
1397package cf::player; 1503package cf::player;
1398 1504
1441 1547
1442sub exists($) { 1548sub exists($) {
1443 my ($login) = @_; 1549 my ($login) = @_;
1444 1550
1445 $cf::PLAYER{$login} 1551 $cf::PLAYER{$login}
1446 or cf::sync_job { !aio_stat path $login } 1552 or !aio_stat path $login
1447} 1553}
1448 1554
1449sub find($) { 1555sub find($) {
1450 return $cf::PLAYER{$_[0]} || do { 1556 return $cf::PLAYER{$_[0]} || do {
1451 my $login = $_[0]; 1557 my $login = $_[0];
1471 $cf::PLAYER{$login} = $pl 1577 $cf::PLAYER{$login} = $pl
1472 } 1578 }
1473 } 1579 }
1474} 1580}
1475 1581
1582cf::player->attach (
1583 on_load => sub {
1584 my ($pl, $path) = @_;
1585
1586 # restore slots saved in save, below
1587 my $slots = delete $pl->{_slots};
1588
1589 $pl->ob->current_weapon ($slots->[0]);
1590 $pl->combat_ob ($slots->[1]);
1591 $pl->ranged_ob ($slots->[2]);
1592 },
1593);
1594
1476sub save($) { 1595sub save($) {
1477 my ($pl) = @_; 1596 my ($pl) = @_;
1478 1597
1479 return if $pl->{deny_save}; 1598 return if $pl->{deny_save};
1480 1599
1485 1604
1486 aio_mkdir playerdir $pl, 0770; 1605 aio_mkdir playerdir $pl, 0770;
1487 $pl->{last_save} = $cf::RUNTIME; 1606 $pl->{last_save} = $cf::RUNTIME;
1488 1607
1489 cf::get_slot 0.01; 1608 cf::get_slot 0.01;
1609
1610 # save slots, to be restored later
1611 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1490 1612
1491 $pl->save_pl ($path); 1613 $pl->save_pl ($path);
1492 cf::cede_to_tick; 1614 cf::cede_to_tick;
1493} 1615}
1494 1616
1530 $pl->{deny_save} = 1; 1652 $pl->{deny_save} = 1;
1531 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1653 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1532 1654
1533 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1655 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1534 $pl->deactivate; 1656 $pl->deactivate;
1657
1535 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1658 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1536 $pl->ob->check_score; 1659 ext::highscore::check ($pl->ob);
1660
1537 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1661 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1538 $pl->ns->destroy if $pl->ns; 1662 $pl->ns->destroy if $pl->ns;
1539 1663
1540 my $path = playerdir $pl; 1664 my $path = playerdir $pl;
1541 my $temp = "$path~$cf::RUNTIME~deleting~"; 1665 my $temp = "$path~$cf::RUNTIME~deleting~";
1596 \@logins 1720 \@logins
1597} 1721}
1598 1722
1599=item $player->maps 1723=item $player->maps
1600 1724
1725=item cf::player::maps $login
1726
1601Returns an arrayref of map paths that are private for this 1727Returns an arrayref of map paths that are private for this
1602player. May block. 1728player. May block.
1603 1729
1604=cut 1730=cut
1605 1731
1622 } 1748 }
1623 1749
1624 \@paths 1750 \@paths
1625} 1751}
1626 1752
1627=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1753=item $protocol_xml = $player->expand_cfpod ($cfpod)
1628 1754
1629Expand crossfire pod fragments into protocol xml. 1755Expand deliantra pod fragments into protocol xml.
1630 1756
1631=item $player->ext_reply ($msgid, @msg) 1757=item $player->ext_reply ($msgid, @msg)
1632 1758
1633Sends an ext reply to the player. 1759Sends an ext reply to the player.
1634 1760
1666 1792
1667=cut 1793=cut
1668 1794
1669sub find_by_path($) { 1795sub find_by_path($) {
1670 my ($path) = @_; 1796 my ($path) = @_;
1797
1798 $path =~ s/^~[^\/]*//; # skip ~login
1671 1799
1672 my ($match, $specificity); 1800 my ($match, $specificity);
1673 1801
1674 for my $region (list) { 1802 for my $region (list) {
1675 if ($region->{match} && $path =~ $region->{match}) { 1803 if ($region->{match} && $path =~ $region->{match}) {
1707 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1835 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1708 1836
1709 # mit "rum" bekleckern, nicht 1837 # mit "rum" bekleckern, nicht
1710 $self->_create_random_map ( 1838 $self->_create_random_map (
1711 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1839 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1712 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1840 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1713 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1841 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1714 $rmp->{exit_on_final_map}, 1842 $rmp->{exit_on_final_map},
1715 $rmp->{xsize}, $rmp->{ysize}, 1843 $rmp->{xsize}, $rmp->{ysize},
1716 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1844 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1717 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1845 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1732 1860
1733sub register { 1861sub register {
1734 my (undef, $regex, $prio) = @_; 1862 my (undef, $regex, $prio) = @_;
1735 my $pkg = caller; 1863 my $pkg = caller;
1736 1864
1737 no strict;
1738 push @{"$pkg\::ISA"}, __PACKAGE__; 1865 push @{"$pkg\::ISA"}, __PACKAGE__;
1739 1866
1740 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1867 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1741} 1868}
1742 1869
1743# also paths starting with '/' 1870# also paths starting with '/'
1744$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1871$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1745 1872
1746sub thawer_merge { 1873sub thawer_merge {
1747 my ($self, $merge) = @_; 1874 my ($self, $merge) = @_;
1748 1875
1749 # we have to keep some variables in memory intact 1876 # we have to keep some variables in memory intact
1754} 1881}
1755 1882
1756sub normalise { 1883sub normalise {
1757 my ($path, $base) = @_; 1884 my ($path, $base) = @_;
1758 1885
1759 $path = "$path"; # make sure its a string 1886 $path = "$path"; # make sure it's a string
1760 1887
1761 $path =~ s/\.map$//; 1888 $path =~ s/\.map$//;
1762 1889
1763 # map plan: 1890 # map plan:
1764 # 1891 #
1803 $self->init; # pass $1 etc. 1930 $self->init; # pass $1 etc.
1804 return $self; 1931 return $self;
1805 } 1932 }
1806 } 1933 }
1807 1934
1808 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1935 Carp::cluck "unable to resolve path '$path' (base '$base')";
1809 () 1936 ()
1810} 1937}
1811 1938
1812sub init { 1939sub init {
1813 my ($self) = @_; 1940 my ($self) = @_;
1845sub uniq_path { 1972sub uniq_path {
1846 my ($self) = @_; 1973 my ($self) = @_;
1847 1974
1848 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1975 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1849 "$UNIQUEDIR/$path" 1976 "$UNIQUEDIR/$path"
1850}
1851
1852# and all this just because we cannot iterate over
1853# all maps in C++...
1854sub change_all_map_light {
1855 my ($change) = @_;
1856
1857 $_->change_map_light ($change)
1858 for grep $_->outdoor, values %cf::MAP;
1859} 1977}
1860 1978
1861sub decay_objects { 1979sub decay_objects {
1862 my ($self) = @_; 1980 my ($self) = @_;
1863 1981
1945 2063
1946sub find; 2064sub find;
1947sub find { 2065sub find {
1948 my ($path, $origin) = @_; 2066 my ($path, $origin) = @_;
1949 2067
2068 cf::cede_to_tick;
2069
1950 $path = normalise $path, $origin && $origin->path; 2070 $path = normalise $path, $origin && $origin->path;
1951 2071
1952 cf::lock_wait "map_data:$path";#d#remove 2072 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1953 cf::lock_wait "map_find:$path"; 2073 my $guard2 = cf::lock_acquire "map_find:$path";
1954 2074
1955 $cf::MAP{$path} || do { 2075 $cf::MAP{$path} || do {
1956 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1957 my $guard2 = cf::lock_acquire "map_find:$path";
1958
1959 my $map = new_from_path cf::map $path 2076 my $map = new_from_path cf::map $path
1960 or return; 2077 or return;
1961 2078
1962 $map->{last_save} = $cf::RUNTIME; 2079 $map->{last_save} = $cf::RUNTIME;
1963 2080
1975 2092
1976 $cf::MAP{$path} = $map 2093 $cf::MAP{$path} = $map
1977 } 2094 }
1978} 2095}
1979 2096
1980sub pre_load { } 2097sub pre_load { }
1981sub post_load { } 2098#sub post_load { } # XS
1982 2099
1983sub load { 2100sub load {
1984 my ($self) = @_; 2101 my ($self) = @_;
1985 2102
1986 local $self->{deny_reset} = 1; # loading can take a long time 2103 local $self->{deny_reset} = 1; # loading can take a long time
2031 unless ($self->{deny_activate}) { 2148 unless ($self->{deny_activate}) {
2032 $self->decay_objects; 2149 $self->decay_objects;
2033 $self->fix_auto_apply; 2150 $self->fix_auto_apply;
2034 $self->update_buttons; 2151 $self->update_buttons;
2035 cf::cede_to_tick; 2152 cf::cede_to_tick;
2036 $self->set_darkness_map;
2037 cf::cede_to_tick;
2038 $self->activate; 2153 $self->activate;
2039 } 2154 }
2040 2155
2041 $self->{last_save} = $cf::RUNTIME; 2156 $self->{last_save} = $cf::RUNTIME;
2042 $self->last_access ($cf::RUNTIME); 2157 $self->last_access ($cf::RUNTIME);
2045 } 2160 }
2046 2161
2047 $self->post_load; 2162 $self->post_load;
2048} 2163}
2049 2164
2165# customize the map for a given player, i.e.
2166# return the _real_ map. used by e.g. per-player
2167# maps to change the path to ~playername/mappath
2050sub customise_for { 2168sub customise_for {
2051 my ($self, $ob) = @_; 2169 my ($self, $ob) = @_;
2052 2170
2053 return find "~" . $ob->name . "/" . $self->{path} 2171 return find "~" . $ob->name . "/" . $self->{path}
2054 if $self->per_player; 2172 if $self->per_player;
2070 or next; 2188 or next;
2071 $neigh = find $neigh, $map 2189 $neigh = find $neigh, $map
2072 or next; 2190 or next;
2073 $neigh->load; 2191 $neigh->load;
2074 2192
2193 # now find the diagonal neighbours
2075 push @neigh, 2194 push @neigh,
2076 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2195 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2077 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2196 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2078 } 2197 }
2079 2198
2086} 2205}
2087 2206
2088sub find_sync { 2207sub find_sync {
2089 my ($path, $origin) = @_; 2208 my ($path, $origin) = @_;
2090 2209
2091 cf::sync_job { find $path, $origin } 2210 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2211 if $Coro::current == $Coro::main;
2212
2213 find $path, $origin
2092} 2214}
2093 2215
2094sub do_load_sync { 2216sub do_load_sync {
2095 my ($map) = @_; 2217 my ($map) = @_;
2096 2218
2097 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2219 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2098 if $Coro::current == $Coro::main; 2220 if $Coro::current == $Coro::main;
2099 2221
2100 cf::sync_job { $map->load }; 2222 $map->load;
2101} 2223}
2102 2224
2103our %MAP_PREFETCH; 2225our %MAP_PREFETCH;
2104our $MAP_PREFETCHER = undef; 2226our $MAP_PREFETCHER = undef;
2105 2227
2131 $MAP_PREFETCHER->prio (6); 2253 $MAP_PREFETCHER->prio (6);
2132 2254
2133 () 2255 ()
2134} 2256}
2135 2257
2258# common code, used by both ->save and ->swapout
2136sub save { 2259sub _save {
2137 my ($self) = @_; 2260 my ($self) = @_;
2138
2139 my $lock = cf::lock_acquire "map_data:$self->{path}";
2140 2261
2141 $self->{last_save} = $cf::RUNTIME; 2262 $self->{last_save} = $cf::RUNTIME;
2142 2263
2143 return unless $self->dirty; 2264 return unless $self->dirty;
2144 2265
2164 } else { 2285 } else {
2165 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2286 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2166 } 2287 }
2167} 2288}
2168 2289
2290sub save {
2291 my ($self) = @_;
2292
2293 my $lock = cf::lock_acquire "map_data:$self->{path}";
2294
2295 $self->_save;
2296}
2297
2169sub swap_out { 2298sub swap_out {
2170 my ($self) = @_; 2299 my ($self) = @_;
2171 2300
2172 # save first because save cedes
2173 $self->save;
2174
2175 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2301 my $lock = cf::lock_acquire "map_data:$self->{path}";
2176 2302
2177 return if $self->players;
2178 return if $self->in_memory != cf::MAP_ACTIVE; 2303 return if $self->in_memory != cf::MAP_ACTIVE;
2179 return if $self->{deny_save}; 2304 return if $self->{deny_save};
2305 return if $self->players;
2180 2306
2307 # first deactivate the map and "unlink" it from the core
2308 $self->deactivate;
2309 $_->clear_links_to ($self) for values %cf::MAP;
2181 $self->in_memory (cf::MAP_SWAPPED); 2310 $self->in_memory (cf::MAP_SWAPPED);
2311
2312 # then atomically save
2313 $self->_save;
2314
2315 # then free the map
2316 $self->clear;
2317}
2318
2319sub reset_at {
2320 my ($self) = @_;
2321
2322 # TODO: safety, remove and allow resettable per-player maps
2323 return 1e99 if $self->{deny_reset};
2324
2325 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2326 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2327
2328 $time + $to
2329}
2330
2331sub should_reset {
2332 my ($self) = @_;
2333
2334 $self->reset_at <= $cf::RUNTIME
2335}
2336
2337sub reset {
2338 my ($self) = @_;
2339
2340 my $lock = cf::lock_acquire "map_data:$self->{path}";
2341
2342 return if $self->players;
2343
2344 cf::trace "resetting map ", $self->path, "\n";
2345
2346 $self->in_memory (cf::MAP_SWAPPED);
2347
2348 # need to save uniques path
2349 unless ($self->{deny_save}) {
2350 my $uniq = $self->uniq_path; utf8::encode $uniq;
2351
2352 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2353 if $uniq;
2354 }
2355
2356 delete $cf::MAP{$self->path};
2182 2357
2183 $self->deactivate; 2358 $self->deactivate;
2184 $_->clear_links_to ($self) for values %cf::MAP; 2359 $_->clear_links_to ($self) for values %cf::MAP;
2185 $self->clear; 2360 $self->clear;
2186}
2187
2188sub reset_at {
2189 my ($self) = @_;
2190
2191 # TODO: safety, remove and allow resettable per-player maps
2192 return 1e99 if $self->{deny_reset};
2193
2194 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2195 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2196
2197 $time + $to
2198}
2199
2200sub should_reset {
2201 my ($self) = @_;
2202
2203 $self->reset_at <= $cf::RUNTIME
2204}
2205
2206sub reset {
2207 my ($self) = @_;
2208
2209 my $lock = cf::lock_acquire "map_data:$self->{path}";
2210
2211 return if $self->players;
2212
2213 warn "resetting map ", $self->path;
2214
2215 $self->in_memory (cf::MAP_SWAPPED);
2216
2217 # need to save uniques path
2218 unless ($self->{deny_save}) {
2219 my $uniq = $self->uniq_path; utf8::encode $uniq;
2220
2221 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2222 if $uniq;
2223 }
2224
2225 delete $cf::MAP{$self->path};
2226
2227 $self->deactivate;
2228 $_->clear_links_to ($self) for values %cf::MAP;
2229 $self->clear;
2230 2361
2231 $self->unlink_save; 2362 $self->unlink_save;
2232 $self->destroy; 2363 $self->destroy;
2233} 2364}
2234 2365
2242 2373
2243 delete $cf::MAP{$self->path}; 2374 delete $cf::MAP{$self->path};
2244 2375
2245 $self->unlink_save; 2376 $self->unlink_save;
2246 2377
2247 bless $self, "cf::map"; 2378 bless $self, "cf::map::wrap";
2248 delete $self->{deny_reset}; 2379 delete $self->{deny_reset};
2249 $self->{deny_save} = 1; 2380 $self->{deny_save} = 1;
2250 $self->reset_timeout (1); 2381 $self->reset_timeout (1);
2251 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2382 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2252 2383
2309 : normalise $_ 2440 : normalise $_
2310 } @{ aio_readdir $UNIQUEDIR or [] } 2441 } @{ aio_readdir $UNIQUEDIR or [] }
2311 ] 2442 ]
2312} 2443}
2313 2444
2445=item cf::map::static_maps
2446
2447Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2448file in the shared directory excluding F</styles> and F</editor>). May
2449block.
2450
2451=cut
2452
2453sub static_maps() {
2454 my @dirs = "";
2455 my @maps;
2456
2457 while (@dirs) {
2458 my $dir = shift @dirs;
2459
2460 next if $dir eq "/styles" || $dir eq "/editor";
2461
2462 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2463 or return;
2464
2465 for (@$files) {
2466 s/\.map$// or next;
2467 utf8::decode $_;
2468 push @maps, "$dir/$_";
2469 }
2470
2471 push @dirs, map "$dir/$_", @$dirs;
2472 }
2473
2474 \@maps
2475}
2476
2314=back 2477=back
2315 2478
2316=head3 cf::object 2479=head3 cf::object
2317 2480
2318=cut 2481=cut
2383 2546
2384our $SAY_CHANNEL = { 2547our $SAY_CHANNEL = {
2385 id => "say", 2548 id => "say",
2386 title => "Map", 2549 title => "Map",
2387 reply => "say ", 2550 reply => "say ",
2388 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2551 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2389}; 2552};
2390 2553
2391our $CHAT_CHANNEL = { 2554our $CHAT_CHANNEL = {
2392 id => "chat", 2555 id => "chat",
2393 title => "Chat", 2556 title => "Chat",
2448 2611
2449=item $player_object->enter_link 2612=item $player_object->enter_link
2450 2613
2451Freezes the player and moves him/her to a special map (C<{link}>). 2614Freezes the player and moves him/her to a special map (C<{link}>).
2452 2615
2453The player should be reasonably safe there for short amounts of time. You 2616The player should be reasonably safe there for short amounts of time (e.g.
2454I<MUST> call C<leave_link> as soon as possible, though. 2617for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2618though, as the player cannot control the character while it is on the link
2619map.
2455 2620
2456Will never block. 2621Will never block.
2457 2622
2458=item $player_object->leave_link ($map, $x, $y) 2623=item $player_object->leave_link ($map, $x, $y)
2459 2624
2479sub cf::object::player::enter_link { 2644sub cf::object::player::enter_link {
2480 my ($self) = @_; 2645 my ($self) = @_;
2481 2646
2482 $self->deactivate_recursive; 2647 $self->deactivate_recursive;
2483 2648
2649 ++$self->{_link_recursion};
2650
2484 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2651 return if UNIVERSAL::isa $self->map, "ext::map_link";
2485 2652
2486 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2653 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2487 if $self->map && $self->map->{path} ne "{link}"; 2654 if $self->map && $self->map->{path} ne "{link}";
2488 2655
2489 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2656 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2490} 2657}
2491 2658
2492sub cf::object::player::leave_link { 2659sub cf::object::player::leave_link {
2493 my ($self, $map, $x, $y) = @_; 2660 my ($self, $map, $x, $y) = @_;
2494 2661
2511 ($x, $y) = (-1, -1) 2678 ($x, $y) = (-1, -1)
2512 unless (defined $x) && (defined $y); 2679 unless (defined $x) && (defined $y);
2513 2680
2514 # use -1 or undef as default coordinates, not 0, 0 2681 # use -1 or undef as default coordinates, not 0, 0
2515 ($x, $y) = ($map->enter_x, $map->enter_y) 2682 ($x, $y) = ($map->enter_x, $map->enter_y)
2516 if $x <=0 && $y <= 0; 2683 if $x <= 0 && $y <= 0;
2517 2684
2518 $map->load; 2685 $map->load;
2519 $map->load_neighbours; 2686 $map->load_neighbours;
2520 2687
2521 return unless $self->contr->active; 2688 return unless $self->contr->active;
2522 $self->activate_recursive;
2523 2689
2524 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2690 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2525 $self->enter_map ($map, $x, $y); 2691 if ($self->enter_map ($map, $x, $y)) {
2526} 2692 # entering was successful
2693 delete $self->{_link_recursion};
2694 # only activate afterwards, to support waiting in hooks
2695 $self->activate_recursive;
2696 }
2527 2697
2698}
2699
2528=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2700=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2529 2701
2530Moves the player to the given map-path and coordinates by first freezing 2702Moves the player to the given map-path and coordinates by first freezing
2531her, loading and preparing them map, calling the provided $check callback 2703her, loading and preparing them map, calling the provided $check callback
2532that has to return the map if sucecssful, and then unfreezes the player on 2704that has to return the map if sucecssful, and then unfreezes the player on
2533the new (success) or old (failed) map position. In either case, $done will 2705the new (success) or old (failed) map position. In either case, $done will
2540 2712
2541our $GOTOGEN; 2713our $GOTOGEN;
2542 2714
2543sub cf::object::player::goto { 2715sub cf::object::player::goto {
2544 my ($self, $path, $x, $y, $check, $done) = @_; 2716 my ($self, $path, $x, $y, $check, $done) = @_;
2717
2718 if ($self->{_link_recursion} >= $MAX_LINKS) {
2719 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2720 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2721 ($path, $x, $y) = @$EMERGENCY_POSITION;
2722 }
2545 2723
2546 # do generation counting so two concurrent goto's will be executed in-order 2724 # do generation counting so two concurrent goto's will be executed in-order
2547 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2725 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2548 2726
2549 $self->enter_link; 2727 $self->enter_link;
2573 my $map = eval { 2751 my $map = eval {
2574 my $map = defined $path ? cf::map::find $path : undef; 2752 my $map = defined $path ? cf::map::find $path : undef;
2575 2753
2576 if ($map) { 2754 if ($map) {
2577 $map = $map->customise_for ($self); 2755 $map = $map->customise_for ($self);
2578 $map = $check->($map) if $check && $map; 2756 $map = $check->($map, $x, $y, $self) if $check && $map;
2579 } else { 2757 } else {
2580 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2758 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2581 } 2759 }
2582 2760
2583 $map 2761 $map
2591 if ($gen == $self->{_goto_generation}) { 2769 if ($gen == $self->{_goto_generation}) {
2592 delete $self->{_goto_generation}; 2770 delete $self->{_goto_generation};
2593 $self->leave_link ($map, $x, $y); 2771 $self->leave_link ($map, $x, $y);
2594 } 2772 }
2595 2773
2596 $done->() if $done; 2774 $done->($self) if $done;
2597 })->prio (1); 2775 })->prio (1);
2598} 2776}
2599 2777
2600=item $player_object->enter_exit ($exit_object) 2778=item $player_object->enter_exit ($exit_object)
2601 2779
2689 $self->contr->savebed ($map, $x, $y) 2867 $self->contr->savebed ($map, $x, $y)
2690 if $exit->flag (cf::FLAG_DAMNED); 2868 if $exit->flag (cf::FLAG_DAMNED);
2691 2869
2692 1 2870 1
2693 }) { 2871 }) {
2694 $self->message ("Something went wrong deep within the crossfire server. " 2872 $self->message ("Something went wrong deep within the deliantra server. "
2695 . "I'll try to bring you back to the map you were before. " 2873 . "I'll try to bring you back to the map you were before. "
2696 . "Please report this to the dungeon master!", 2874 . "Please report this to the dungeon master!",
2697 cf::NDI_UNIQUE | cf::NDI_RED); 2875 cf::NDI_UNIQUE | cf::NDI_RED);
2698 2876
2699 warn "ERROR in enter_exit: $@"; 2877 error "ERROR in enter_exit: $@";
2700 $self->leave_link; 2878 $self->leave_link;
2701 } 2879 }
2702 })->prio (1); 2880 })->prio (1);
2703} 2881}
2704 2882
2716sub cf::client::send_drawinfo { 2894sub cf::client::send_drawinfo {
2717 my ($self, $text, $flags) = @_; 2895 my ($self, $text, $flags) = @_;
2718 2896
2719 utf8::encode $text; 2897 utf8::encode $text;
2720 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2898 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2899}
2900
2901=item $client->send_big_packet ($pkt)
2902
2903Like C<send_packet>, but tries to compress large packets, and fragments
2904them as required.
2905
2906=cut
2907
2908our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2909
2910sub cf::client::send_big_packet {
2911 my ($self, $pkt) = @_;
2912
2913 # try lzf for large packets
2914 $pkt = "lzf " . Compress::LZF::compress $pkt
2915 if 1024 <= length $pkt and $self->{can_lzf};
2916
2917 # split very large packets
2918 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2919 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2920 $pkt = "frag";
2921 }
2922
2923 $self->send_packet ($pkt);
2721} 2924}
2722 2925
2723=item $client->send_msg ($channel, $msg, $color, [extra...]) 2926=item $client->send_msg ($channel, $msg, $color, [extra...])
2724 2927
2725Send a drawinfo or msg packet to the client, formatting the msg for the 2928Send a drawinfo or msg packet to the client, formatting the msg for the
2729 2932
2730=cut 2933=cut
2731 2934
2732# non-persistent channels (usually the info channel) 2935# non-persistent channels (usually the info channel)
2733our %CHANNEL = ( 2936our %CHANNEL = (
2937 "c/motd" => {
2938 id => "infobox",
2939 title => "MOTD",
2940 reply => undef,
2941 tooltip => "The message of the day",
2942 },
2734 "c/identify" => { 2943 "c/identify" => {
2735 id => "infobox", 2944 id => "infobox",
2736 title => "Identify", 2945 title => "Identify",
2737 reply => undef, 2946 reply => undef,
2738 tooltip => "Items recently identified", 2947 tooltip => "Items recently identified",
2740 "c/examine" => { 2949 "c/examine" => {
2741 id => "infobox", 2950 id => "infobox",
2742 title => "Examine", 2951 title => "Examine",
2743 reply => undef, 2952 reply => undef,
2744 tooltip => "Signs and other items you examined", 2953 tooltip => "Signs and other items you examined",
2954 },
2955 "c/shopinfo" => {
2956 id => "infobox",
2957 title => "Shop Info",
2958 reply => undef,
2959 tooltip => "What your bargaining skill tells you about the shop",
2745 }, 2960 },
2746 "c/book" => { 2961 "c/book" => {
2747 id => "infobox", 2962 id => "infobox",
2748 title => "Book", 2963 title => "Book",
2749 reply => undef, 2964 reply => undef,
2765 id => "infobox", 2980 id => "infobox",
2766 title => "Body Parts", 2981 title => "Body Parts",
2767 reply => undef, 2982 reply => undef,
2768 tooltip => "Shows which body parts you posess and are available", 2983 tooltip => "Shows which body parts you posess and are available",
2769 }, 2984 },
2985 "c/statistics" => {
2986 id => "infobox",
2987 title => "Statistics",
2988 reply => undef,
2989 tooltip => "Shows your primary statistics",
2990 },
2991 "c/skills" => {
2992 id => "infobox",
2993 title => "Skills",
2994 reply => undef,
2995 tooltip => "Shows your experience per skill and item power",
2996 },
2997 "c/shopitems" => {
2998 id => "infobox",
2999 title => "Shop Items",
3000 reply => undef,
3001 tooltip => "Shows the items currently for sale in this shop",
3002 },
3003 "c/resistances" => {
3004 id => "infobox",
3005 title => "Resistances",
3006 reply => undef,
3007 tooltip => "Shows your resistances",
3008 },
3009 "c/pets" => {
3010 id => "infobox",
3011 title => "Pets",
3012 reply => undef,
3013 tooltip => "Shows information abotu your pets/a specific pet",
3014 },
3015 "c/perceiveself" => {
3016 id => "infobox",
3017 title => "Perceive Self",
3018 reply => undef,
3019 tooltip => "You gained detailed knowledge about yourself",
3020 },
2770 "c/uptime" => { 3021 "c/uptime" => {
2771 id => "infobox", 3022 id => "infobox",
2772 title => "Uptime", 3023 title => "Uptime",
2773 reply => undef, 3024 reply => undef,
2774 tooltip => "How long the server has been running since last restart", 3025 tooltip => "How long the server has been running since last restart",
2783 id => "party", 3034 id => "party",
2784 title => "Party", 3035 title => "Party",
2785 reply => "gsay ", 3036 reply => "gsay ",
2786 tooltip => "Messages and chat related to your party", 3037 tooltip => "Messages and chat related to your party",
2787 }, 3038 },
3039 "c/death" => {
3040 id => "death",
3041 title => "Death",
3042 reply => undef,
3043 tooltip => "Reason for and more info about your most recent death",
3044 },
3045 "c/say" => $SAY_CHANNEL,
3046 "c/chat" => $CHAT_CHANNEL,
2788); 3047);
2789 3048
2790sub cf::client::send_msg { 3049sub cf::client::send_msg {
2791 my ($self, $channel, $msg, $color, @extra) = @_; 3050 my ($self, $channel, $msg, $color, @extra) = @_;
2792 3051
2793 $msg = $self->pl->expand_cfpod ($msg); 3052 $msg = $self->pl->expand_cfpod ($msg)
3053 unless $color & cf::NDI_VERBATIM;
2794 3054
2795 $color &= cf::NDI_CLIENT_MASK; # just in case... 3055 $color &= cf::NDI_CLIENT_MASK; # just in case...
2796 3056
2797 # check predefined channels, for the benefit of C 3057 # check predefined channels, for the benefit of C
2798 if ($CHANNEL{$channel}) { 3058 if ($CHANNEL{$channel}) {
2799 $channel = $CHANNEL{$channel}; 3059 $channel = $CHANNEL{$channel};
2800 3060
2801 $self->ext_msg (channel_info => $channel) 3061 $self->ext_msg (channel_info => $channel);
2802 if $self->can_msg;
2803
2804 $channel = $channel->{id}; 3062 $channel = $channel->{id};
2805 3063
2806 } elsif (ref $channel) { 3064 } elsif (ref $channel) {
2807 # send meta info to client, if not yet sent 3065 # send meta info to client, if not yet sent
2808 unless (exists $self->{channel}{$channel->{id}}) { 3066 unless (exists $self->{channel}{$channel->{id}}) {
2809 $self->{channel}{$channel->{id}} = $channel; 3067 $self->{channel}{$channel->{id}} = $channel;
2810 $self->ext_msg (channel_info => $channel) 3068 $self->ext_msg (channel_info => $channel);
2811 if $self->can_msg;
2812 } 3069 }
2813 3070
2814 $channel = $channel->{id}; 3071 $channel = $channel->{id};
2815 } 3072 }
2816 3073
2817 return unless @extra || length $msg; 3074 return unless @extra || length $msg;
2818 3075
2819 if ($self->can_msg) {
2820 # default colour, mask it out 3076 # default colour, mask it out
2821 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3077 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2822 if $color & cf::NDI_DEF; 3078 if $color & cf::NDI_DEF;
2823 3079
2824 my $pkt = "msg " 3080 my $pkt = "msg "
2825 . $self->{json_coder}->encode ( 3081 . $self->{json_coder}->encode (
2826 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3082 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2827 ); 3083 );
2828 3084
2829 # try lzf for large packets
2830 $pkt = "lzf " . Compress::LZF::compress $pkt
2831 if 1024 <= length $pkt and $self->{can_lzf};
2832
2833 # split very large packets
2834 if (8192 < length $pkt and $self->{can_lzf}) {
2835 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2836 $pkt = "frag";
2837 }
2838
2839 $self->send_packet ($pkt); 3085 $self->send_big_packet ($pkt);
2840 } else {
2841 if ($color >= 0) {
2842 # replace some tags by gcfclient-compatible ones
2843 for ($msg) {
2844 1 while
2845 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2846 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2847 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2848 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2849 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2850 }
2851
2852 $color &= cf::NDI_COLOR_MASK;
2853
2854 utf8::encode $msg;
2855
2856 if (0 && $msg =~ /\[/) {
2857 # COMMAND/INFO
2858 $self->send_packet ("drawextinfo $color 10 8 $msg")
2859 } else {
2860 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2861 $self->send_packet ("drawinfo $color $msg")
2862 }
2863 }
2864 }
2865} 3086}
2866 3087
2867=item $client->ext_msg ($type, @msg) 3088=item $client->ext_msg ($type, @msg)
2868 3089
2869Sends an ext event to the client. 3090Sends an ext event to the client.
2872 3093
2873sub cf::client::ext_msg($$@) { 3094sub cf::client::ext_msg($$@) {
2874 my ($self, $type, @msg) = @_; 3095 my ($self, $type, @msg) = @_;
2875 3096
2876 if ($self->extcmd == 2) { 3097 if ($self->extcmd == 2) {
2877 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3098 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2878 } elsif ($self->extcmd == 1) { # TODO: remove 3099 } elsif ($self->extcmd == 1) { # TODO: remove
2879 push @msg, msgtype => "event_$type"; 3100 push @msg, msgtype => "event_$type";
2880 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3101 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2881 } 3102 }
2882} 3103}
2883 3104
2884=item $client->ext_reply ($msgid, @msg) 3105=item $client->ext_reply ($msgid, @msg)
2885 3106
2889 3110
2890sub cf::client::ext_reply($$@) { 3111sub cf::client::ext_reply($$@) {
2891 my ($self, $id, @msg) = @_; 3112 my ($self, $id, @msg) = @_;
2892 3113
2893 if ($self->extcmd == 2) { 3114 if ($self->extcmd == 2) {
2894 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3115 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2895 } elsif ($self->extcmd == 1) { 3116 } elsif ($self->extcmd == 1) {
2896 #TODO: version 1, remove 3117 #TODO: version 1, remove
2897 unshift @msg, msgtype => "reply", msgid => $id; 3118 unshift @msg, msgtype => "reply", msgid => $id;
2898 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3119 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2899 } 3120 }
2900} 3121}
2901 3122
2902=item $success = $client->query ($flags, "text", \&cb) 3123=item $success = $client->query ($flags, "text", \&cb)
2903 3124
2974 3195
2975 $ns->ext_reply ($reply, @reply) 3196 $ns->ext_reply ($reply, @reply)
2976 if $reply; 3197 if $reply;
2977 3198
2978 } else { 3199 } else {
2979 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3200 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2980 } 3201 }
2981 3202
2982 cf::override; 3203 cf::override;
2983 }, 3204 },
2984); 3205);
3004 3225
3005 $coro 3226 $coro
3006} 3227}
3007 3228
3008cf::client->attach ( 3229cf::client->attach (
3009 on_destroy => sub { 3230 on_client_destroy => sub {
3010 my ($ns) = @_; 3231 my ($ns) = @_;
3011 3232
3012 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3233 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3013 }, 3234 },
3014); 3235);
3030our $safe_hole = new Safe::Hole; 3251our $safe_hole = new Safe::Hole;
3031 3252
3032$SIG{FPE} = 'IGNORE'; 3253$SIG{FPE} = 'IGNORE';
3033 3254
3034$safe->permit_only (Opcode::opset qw( 3255$safe->permit_only (Opcode::opset qw(
3035 :base_core :base_mem :base_orig :base_math 3256 :base_core :base_mem :base_orig :base_math :base_loop
3036 grepstart grepwhile mapstart mapwhile 3257 grepstart grepwhile mapstart mapwhile
3037 sort time 3258 sort time
3038)); 3259));
3039 3260
3040# here we export the classes and methods available to script code 3261# here we export the classes and methods available to script code
3044The following functions and methods are available within a safe environment: 3265The following functions and methods are available within a safe environment:
3045 3266
3046 cf::object 3267 cf::object
3047 contr pay_amount pay_player map x y force_find force_add destroy 3268 contr pay_amount pay_player map x y force_find force_add destroy
3048 insert remove name archname title slaying race decrease split 3269 insert remove name archname title slaying race decrease split
3270 value
3049 3271
3050 cf::object::player 3272 cf::object::player
3051 player 3273 player
3052 3274
3053 cf::player 3275 cf::player
3059=cut 3281=cut
3060 3282
3061for ( 3283for (
3062 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3284 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3063 insert remove inv nrof name archname title slaying race 3285 insert remove inv nrof name archname title slaying race
3064 decrease split destroy change_exp)], 3286 decrease split destroy change_exp value msg lore send_msg)],
3065 ["cf::object::player" => qw(player)], 3287 ["cf::object::player" => qw(player)],
3066 ["cf::player" => qw(peaceful)], 3288 ["cf::player" => qw(peaceful send_msg)],
3067 ["cf::map" => qw(trigger)], 3289 ["cf::map" => qw(trigger)],
3068) { 3290) {
3069 no strict 'refs';
3070 my ($pkg, @funs) = @$_; 3291 my ($pkg, @funs) = @$_;
3071 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3292 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3072 for @funs; 3293 for @funs;
3073} 3294}
3074 3295
3089 3310
3090 my $qcode = $code; 3311 my $qcode = $code;
3091 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3312 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3092 $qcode =~ s/\n/\\n/g; 3313 $qcode =~ s/\n/\\n/g;
3093 3314
3315 %vars = (_dummy => 0) unless %vars;
3316
3317 my @res;
3094 local $_; 3318 local $_;
3095 local @safe::cf::_safe_eval_args = values %vars;
3096 3319
3097 my $eval = 3320 my $eval =
3098 "do {\n" 3321 "do {\n"
3099 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3322 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3100 . "#line 0 \"{$qcode}\"\n" 3323 . "#line 0 \"{$qcode}\"\n"
3101 . $code 3324 . $code
3102 . "\n}" 3325 . "\n}"
3103 ; 3326 ;
3104 3327
3328 if ($CFG{safe_eval}) {
3105 sub_generation_inc; 3329 sub_generation_inc;
3330 local @safe::cf::_safe_eval_args = values %vars;
3106 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3331 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3107 sub_generation_inc; 3332 sub_generation_inc;
3333 } else {
3334 local @cf::_safe_eval_args = values %vars;
3335 @res = wantarray ? eval eval : scalar eval $eval;
3336 }
3108 3337
3109 if ($@) { 3338 if ($@) {
3110 warn "$@"; 3339 warn "$@",
3111 warn "while executing safe code '$code'\n"; 3340 "while executing safe code '$code'\n",
3112 warn "with arguments " . (join " ", %vars) . "\n"; 3341 "with arguments " . (join " ", %vars) . "\n";
3113 } 3342 }
3114 3343
3115 wantarray ? @res : $res[0] 3344 wantarray ? @res : $res[0]
3116} 3345}
3117 3346
3131=cut 3360=cut
3132 3361
3133sub register_script_function { 3362sub register_script_function {
3134 my ($fun, $cb) = @_; 3363 my ($fun, $cb) = @_;
3135 3364
3136 no strict 'refs'; 3365 $fun = "safe::$fun" if $CFG{safe_eval};
3137 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3366 *$fun = $safe_hole->wrap ($cb);
3138} 3367}
3139 3368
3140=back 3369=back
3141 3370
3142=cut 3371=cut
3151 # for this (global event?) 3380 # for this (global event?)
3152 %ext::player_env::MUSIC_FACE_CACHE = (); 3381 %ext::player_env::MUSIC_FACE_CACHE = ();
3153 3382
3154 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3383 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3155 3384
3156 warn "loading facedata from $path\n"; 3385 trace "loading facedata from $path\n";
3157 3386
3158 my $facedata;
3159 0 < aio_load $path, $facedata 3387 0 < aio_load $path, my $facedata
3160 or die "$path: $!"; 3388 or die "$path: $!";
3161 3389
3162 $facedata = Coro::Storable::thaw $facedata; 3390 $facedata = Coro::Storable::thaw $facedata;
3163 3391
3164 $facedata->{version} == 2 3392 $facedata->{version} == 2
3165 or cf::cleanup "$path: version mismatch, cannot proceed."; 3393 or cf::cleanup "$path: version mismatch, cannot proceed.";
3166 3394
3167 # patch in the exptable 3395 # patch in the exptable
3396 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3168 $facedata->{resource}{"res/exp_table"} = { 3397 $facedata->{resource}{"res/exp_table"} = {
3169 type => FT_RSRC, 3398 type => FT_RSRC,
3170 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3399 data => $exp_table,
3400 hash => (Digest::MD5::md5 $exp_table),
3171 }; 3401 };
3172 cf::cede_to_tick; 3402 cf::cede_to_tick;
3173 3403
3174 { 3404 {
3175 my $faces = $facedata->{faceinfo}; 3405 my $faces = $facedata->{faceinfo};
3177 while (my ($face, $info) = each %$faces) { 3407 while (my ($face, $info) = each %$faces) {
3178 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3408 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3179 3409
3180 cf::face::set_visibility $idx, $info->{visibility}; 3410 cf::face::set_visibility $idx, $info->{visibility};
3181 cf::face::set_magicmap $idx, $info->{magicmap}; 3411 cf::face::set_magicmap $idx, $info->{magicmap};
3182 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3412 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3183 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3413 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3184 3414
3185 cf::cede_to_tick; 3415 cf::cede_to_tick;
3186 } 3416 }
3187 3417
3188 while (my ($face, $info) = each %$faces) { 3418 while (my ($face, $info) = each %$faces) {
3193 3423
3194 if (my $smooth = cf::face::find $info->{smooth}) { 3424 if (my $smooth = cf::face::find $info->{smooth}) {
3195 cf::face::set_smooth $idx, $smooth; 3425 cf::face::set_smooth $idx, $smooth;
3196 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3426 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3197 } else { 3427 } else {
3198 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3428 error "smooth face '$info->{smooth}' not found for face '$face'";
3199 } 3429 }
3200 3430
3201 cf::cede_to_tick; 3431 cf::cede_to_tick;
3202 } 3432 }
3203 } 3433 }
3212 3442
3213 cf::anim::invalidate_all; # d'oh 3443 cf::anim::invalidate_all; # d'oh
3214 } 3444 }
3215 3445
3216 { 3446 {
3217 # TODO: for gcfclient pleasure, we should give resources
3218 # that gcfclient doesn't grok a >10000 face index.
3219 my $res = $facedata->{resource}; 3447 my $res = $facedata->{resource};
3220 3448
3221 while (my ($name, $info) = each %$res) { 3449 while (my ($name, $info) = each %$res) {
3222 if (defined $info->{type}) { 3450 if (defined $info->{type}) {
3223 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3451 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3224 my $data;
3225 3452
3226 if ($info->{type} & 1) { 3453 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3227 # prepend meta info
3228
3229 my $meta = $enc->encode ({
3230 name => $name,
3231 %{ $info->{meta} || {} },
3232 });
3233
3234 $data = pack "(w/a*)*", $meta, $info->{data};
3235 } else {
3236 $data = $info->{data};
3237 }
3238
3239 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3240 cf::face::set_type $idx, $info->{type}; 3454 cf::face::set_type $idx, $info->{type};
3241 } else { 3455 } else {
3242 $RESOURCE{$name} = $info; 3456 $RESOURCE{$name} = $info; # unused
3243 } 3457 }
3244 3458
3245 cf::cede_to_tick; 3459 cf::cede_to_tick;
3246 } 3460 }
3247 } 3461 }
3248 3462
3249 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3463 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3250 3464
3251 1 3465 1
3252} 3466}
3253
3254cf::global->attach (on_resource_update => sub {
3255 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3256 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3257
3258 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3259 my $sound = $soundconf->{compat}[$_]
3260 or next;
3261
3262 my $face = cf::face::find "sound/$sound->[1]";
3263 cf::sound::set $sound->[0] => $face;
3264 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3265 }
3266
3267 while (my ($k, $v) = each %{$soundconf->{event}}) {
3268 my $face = cf::face::find "sound/$v";
3269 cf::sound::set $k => $face;
3270 }
3271 }
3272});
3273 3467
3274register_exticmd fx_want => sub { 3468register_exticmd fx_want => sub {
3275 my ($ns, $want) = @_; 3469 my ($ns, $want) = @_;
3276 3470
3277 while (my ($k, $v) = each %$want) { 3471 while (my ($k, $v) = each %$want) {
3316sub reload_treasures { 3510sub reload_treasures {
3317 load_resource_file "$DATADIR/treasures" 3511 load_resource_file "$DATADIR/treasures"
3318 or die "unable to load treasurelists\n"; 3512 or die "unable to load treasurelists\n";
3319} 3513}
3320 3514
3515sub reload_sound {
3516 trace "loading sound config from $DATADIR/sound\n";
3517
3518 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3519 or die "$DATADIR/sound $!";
3520
3521 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3522
3523 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3524 my $sound = $soundconf->{compat}[$_]
3525 or next;
3526
3527 my $face = cf::face::find "sound/$sound->[1]";
3528 cf::sound::set $sound->[0] => $face;
3529 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3530 }
3531
3532 while (my ($k, $v) = each %{$soundconf->{event}}) {
3533 my $face = cf::face::find "sound/$v";
3534 cf::sound::set $k => $face;
3535 }
3536}
3537
3321sub reload_resources { 3538sub reload_resources {
3322 warn "reloading resource files...\n"; 3539 trace "reloading resource files...\n";
3323 3540
3541 reload_exp_table;
3542 reload_materials;
3324 reload_facedata; 3543 reload_facedata;
3544 reload_sound;
3325 reload_archetypes; 3545 reload_archetypes;
3326 reload_regions; 3546 reload_regions;
3327 reload_treasures; 3547 reload_treasures;
3328 3548
3329 warn "finished reloading resource files\n"; 3549 trace "finished reloading resource files\n";
3330}
3331
3332sub init {
3333 my $guard = freeze_mainloop;
3334
3335 evthread_start IO::AIO::poll_fileno;
3336
3337 reload_resources;
3338} 3550}
3339 3551
3340sub reload_config { 3552sub reload_config {
3341 open my $fh, "<:utf8", "$CONFDIR/config" 3553 trace "reloading config file...\n";
3342 or return;
3343 3554
3344 local $/; 3555 0 < aio_load "$CONFDIR/config", my $config
3556 or die "$CONFDIR/config: $!";
3557
3558 utf8::decode $config;
3559
3560 cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow...
3345 *CFG = YAML::Load <$fh>; 3561 *CFG = YAML::XS::Load $config;
3346 3562
3347 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3563 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3348 3564
3349 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3565 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3350 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3566 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3351 3567
3352 if (exists $CFG{mlockall}) { 3568 if (exists $CFG{mlockall}) {
3375 3591
3376 seek $fh, 0, 0; 3592 seek $fh, 0, 0;
3377 print $fh $$; 3593 print $fh $$;
3378} 3594}
3379 3595
3596sub main_loop {
3597 trace "EV::loop starting\n";
3598 if (1) {
3599 EV::loop;
3600 }
3601 trace "EV::loop returned\n";
3602 goto &main_loop unless $REALLY_UNLOOP;
3603}
3604
3380sub main { 3605sub main {
3381 atomic; 3606 cf::init_globals; # initialise logging
3607
3608 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3609 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3610 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3611 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3612
3613 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3382 3614
3383 # we must not ever block the main coroutine 3615 # we must not ever block the main coroutine
3384 local $Coro::idle = sub { 3616 local $Coro::idle = sub {
3385 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3617 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3386 (async { 3618 (async {
3387 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3619 $Coro::current->{desc} = "IDLE BUG HANDLER";
3388 EV::loop EV::LOOP_ONESHOT; 3620 EV::loop EV::LOOP_ONESHOT;
3389 })->prio (Coro::PRIO_MAX); 3621 })->prio (Coro::PRIO_MAX);
3390 }; 3622 };
3391 3623
3392 { 3624 evthread_start IO::AIO::poll_fileno;
3393 my $guard = freeze_mainloop; 3625
3626 cf::sync_job {
3627 cf::incloader::init ();
3628
3629 cf::init_anim;
3630 cf::init_attackmess;
3631 cf::init_dynamic;
3632
3633 cf::load_settings;
3634
3635 reload_resources;
3394 reload_config; 3636 reload_config;
3395 db_init; 3637 db_init;
3638
3639 cf::init_uuid;
3640 cf::init_signals;
3641 cf::init_skills;
3642
3643 cf::init_beforeplay;
3644
3645 atomic;
3646
3396 load_extensions; 3647 load_extensions;
3397 3648
3398 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3399 }
3400
3401 utime time, time, $RUNTIMEFILE; 3649 utime time, time, $RUNTIMEFILE;
3402 3650
3403 # no (long-running) fork's whatsoever before this point(!) 3651 # no (long-running) fork's whatsoever before this point(!)
3652 use POSIX ();
3404 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3653 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3405 3654
3406 EV::loop; 3655 (pop @POST_INIT)->(0) while @POST_INIT;
3656 };
3657
3658 cf::object::thawer::errors_are_fatal 0;
3659 info "parse errors in files are no longer fatal from this point on.\n";
3660
3661 my $free_main; $free_main = EV::idle sub {
3662 undef $free_main;
3663 undef &main; # free gobs of memory :)
3664 };
3665
3666 goto &main_loop;
3407} 3667}
3408 3668
3409############################################################################# 3669#############################################################################
3410# initialisation and cleanup 3670# initialisation and cleanup
3411 3671
3412# install some emergency cleanup handlers 3672# install some emergency cleanup handlers
3413BEGIN { 3673BEGIN {
3414 our %SIGWATCHER = (); 3674 our %SIGWATCHER = ();
3415 for my $signal (qw(INT HUP TERM)) { 3675 for my $signal (qw(INT HUP TERM)) {
3416 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3676 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3417 cf::cleanup "SIG$signal"; 3677 cf::cleanup "SIG$signal";
3418 }; 3678 };
3419 } 3679 }
3420} 3680}
3421 3681
3422sub write_runtime_sync { 3682sub write_runtime_sync {
3683 my $t0 = AE::time;
3684
3423 # first touch the runtime file to show we are still running: 3685 # first touch the runtime file to show we are still running:
3424 # the fsync below can take a very very long time. 3686 # the fsync below can take a very very long time.
3425 3687
3426 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3688 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3427 3689
3428 my $guard = cf::lock_acquire "write_runtime"; 3690 my $guard = cf::lock_acquire "write_runtime";
3429 3691
3430 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3692 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3431 or return; 3693 or return;
3432 3694
3433 my $value = $cf::RUNTIME + 90 + 10; 3695 my $value = $cf::RUNTIME + 90 + 10;
3434 # 10 is the runtime save interval, for a monotonic clock 3696 # 10 is the runtime save interval, for a monotonic clock
3435 # 60 allows for the watchdog to kill the server. 3697 # 60 allows for the watchdog to kill the server.
3448 or return; 3710 or return;
3449 3711
3450 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3712 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3451 and return; 3713 and return;
3452 3714
3453 warn "runtime file written.\n"; 3715 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3454 3716
3455 1 3717 1
3456} 3718}
3457 3719
3458our $uuid_lock; 3720our $uuid_lock;
3467 my $uuid = "$LOCALDIR/uuid"; 3729 my $uuid = "$LOCALDIR/uuid";
3468 3730
3469 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3731 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3470 or return; 3732 or return;
3471 3733
3472 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3734 my $value = uuid_seq uuid_cur;
3735
3736 unless ($value) {
3737 info "cowardly refusing to write zero uuid value!\n";
3738 return;
3739 }
3740
3741 my $value = uuid_str $value + $uuid_skip;
3473 $uuid_skip = 0; 3742 $uuid_skip = 0;
3474 3743
3475 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3744 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3476 and return; 3745 and return;
3477 3746
3483 or return; 3752 or return;
3484 3753
3485 aio_rename "$uuid~", $uuid 3754 aio_rename "$uuid~", $uuid
3486 and return; 3755 and return;
3487 3756
3488 warn "uuid file written ($value).\n"; 3757 trace "uuid file written ($value).\n";
3489 3758
3490 1 3759 1
3491 3760
3492} 3761}
3493 3762
3499} 3768}
3500 3769
3501sub emergency_save() { 3770sub emergency_save() {
3502 my $freeze_guard = cf::freeze_mainloop; 3771 my $freeze_guard = cf::freeze_mainloop;
3503 3772
3504 warn "enter emergency perl save\n"; 3773 info "emergency_perl_save: enter\n";
3774
3775 # this is a trade-off: we want to be very quick here, so
3776 # save all maps without fsync, and later call a global sync
3777 # (which in turn might be very very slow)
3778 local $USE_FSYNC = 0;
3505 3779
3506 cf::sync_job { 3780 cf::sync_job {
3781 cf::write_runtime_sync; # external watchdog should not bark
3782
3507 # use a peculiar iteration method to avoid tripping on perl 3783 # use a peculiar iteration method to avoid tripping on perl
3508 # refcount bugs in for. also avoids problems with players 3784 # refcount bugs in for. also avoids problems with players
3509 # and maps saved/destroyed asynchronously. 3785 # and maps saved/destroyed asynchronously.
3510 warn "begin emergency player save\n"; 3786 info "emergency_perl_save: begin player save\n";
3511 for my $login (keys %cf::PLAYER) { 3787 for my $login (keys %cf::PLAYER) {
3512 my $pl = $cf::PLAYER{$login} or next; 3788 my $pl = $cf::PLAYER{$login} or next;
3513 $pl->valid or next; 3789 $pl->valid or next;
3514 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3790 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3515 $pl->save; 3791 $pl->save;
3516 } 3792 }
3517 warn "end emergency player save\n"; 3793 info "emergency_perl_save: end player save\n";
3518 3794
3519 warn "begin emergency map save\n"; 3795 cf::write_runtime_sync; # external watchdog should not bark
3796
3797 info "emergency_perl_save: begin map save\n";
3520 for my $path (keys %cf::MAP) { 3798 for my $path (keys %cf::MAP) {
3521 my $map = $cf::MAP{$path} or next; 3799 my $map = $cf::MAP{$path} or next;
3522 $map->valid or next; 3800 $map->valid or next;
3523 $map->save; 3801 $map->save;
3524 } 3802 }
3525 warn "end emergency map save\n"; 3803 info "emergency_perl_save: end map save\n";
3526 3804
3527 warn "begin emergency database checkpoint\n"; 3805 cf::write_runtime_sync; # external watchdog should not bark
3806
3807 info "emergency_perl_save: begin database checkpoint\n";
3528 BDB::db_env_txn_checkpoint $DB_ENV; 3808 BDB::db_env_txn_checkpoint $DB_ENV;
3529 warn "end emergency database checkpoint\n"; 3809 info "emergency_perl_save: end database checkpoint\n";
3530 3810
3531 warn "begin write uuid\n"; 3811 info "emergency_perl_save: begin write uuid\n";
3532 write_uuid_sync 1; 3812 write_uuid_sync 1;
3533 warn "end write uuid\n"; 3813 info "emergency_perl_save: end write uuid\n";
3814
3815 cf::write_runtime_sync; # external watchdog should not bark
3816
3817 trace "emergency_perl_save: syncing database to disk";
3818 BDB::db_env_txn_checkpoint $DB_ENV;
3819
3820 info "emergency_perl_save: starting sync\n";
3821 IO::AIO::aio_sync sub {
3822 info "emergency_perl_save: finished sync\n";
3823 };
3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3826
3827 trace "emergency_perl_save: flushing outstanding aio requests";
3828 while (IO::AIO::nreqs || BDB::nreqs) {
3829 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3830 }
3831
3832 cf::write_runtime_sync; # external watchdog should not bark
3534 }; 3833 };
3535 3834
3536 warn "leave emergency perl save\n"; 3835 info "emergency_perl_save: leave\n";
3537} 3836}
3538 3837
3539sub post_cleanup { 3838sub post_cleanup {
3540 my ($make_core) = @_; 3839 my ($make_core) = @_;
3541 3840
3841 IO::AIO::flush;
3842
3542 warn Carp::longmess "post_cleanup backtrace" 3843 error Carp::longmess "post_cleanup backtrace"
3543 if $make_core; 3844 if $make_core;
3544 3845
3545 my $fh = pidfile; 3846 my $fh = pidfile;
3546 unlink $PIDFILE if <$fh> == $$; 3847 unlink $PIDFILE if <$fh> == $$;
3547} 3848}
3567 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3868 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3568 for my $name (keys %$leaf_symtab) { 3869 for my $name (keys %$leaf_symtab) {
3569 _gv_clear *{"$pkg$name"}; 3870 _gv_clear *{"$pkg$name"};
3570# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3871# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3571 } 3872 }
3572 warn "cleared package #$pkg\n";#d#
3573} 3873}
3574
3575our $RELOAD; # how many times to reload
3576 3874
3577sub do_reload_perl() { 3875sub do_reload_perl() {
3578 # can/must only be called in main 3876 # can/must only be called in main
3579 if ($Coro::current != $Coro::main) { 3877 unless (in_main) {
3580 warn "can only reload from main coroutine"; 3878 error "can only reload from main coroutine";
3581 return; 3879 return;
3582 } 3880 }
3583 3881
3584 return if $RELOAD++; 3882 return if $RELOAD++;
3585 3883
3884 my $t1 = AE::time;
3885
3586 while ($RELOAD) { 3886 while ($RELOAD) {
3887 cf::get_slot 0.1, -1, "reload_perl";
3587 warn "reloading..."; 3888 info "reloading...";
3588 3889
3589 warn "entering sync_job"; 3890 trace "entering sync_job";
3590 3891
3591 cf::sync_job { 3892 cf::sync_job {
3592 cf::write_runtime_sync; # external watchdog should not bark
3593 cf::emergency_save; 3893 #cf::emergency_save;
3594 cf::write_runtime_sync; # external watchdog should not bark
3595 3894
3596 warn "syncing database to disk";
3597 BDB::db_env_txn_checkpoint $DB_ENV;
3598
3599 # if anything goes wrong in here, we should simply crash as we already saved
3600
3601 warn "flushing outstanding aio requests";
3602 while (IO::AIO::nreqs || BDB::nreqs) {
3603 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3604 }
3605
3606 warn "cancelling all extension coros"; 3895 trace "cancelling all extension coros";
3607 $_->cancel for values %EXT_CORO; 3896 $_->cancel for values %EXT_CORO;
3608 %EXT_CORO = (); 3897 %EXT_CORO = ();
3609 3898
3610 warn "removing commands"; 3899 trace "removing commands";
3611 %COMMAND = (); 3900 %COMMAND = ();
3612 3901
3613 warn "removing ext/exti commands"; 3902 trace "removing ext/exti commands";
3614 %EXTCMD = (); 3903 %EXTCMD = ();
3615 %EXTICMD = (); 3904 %EXTICMD = ();
3616 3905
3617 warn "unloading/nuking all extensions"; 3906 trace "unloading/nuking all extensions";
3618 for my $pkg (@EXTS) { 3907 for my $pkg (@EXTS) {
3619 warn "... unloading $pkg"; 3908 trace "... unloading $pkg";
3620 3909
3621 if (my $cb = $pkg->can ("unload")) { 3910 if (my $cb = $pkg->can ("unload")) {
3622 eval { 3911 eval {
3623 $cb->($pkg); 3912 $cb->($pkg);
3624 1 3913 1
3625 } or warn "$pkg unloaded, but with errors: $@"; 3914 } or error "$pkg unloaded, but with errors: $@";
3626 } 3915 }
3627 3916
3628 warn "... clearing $pkg"; 3917 trace "... clearing $pkg";
3629 clear_package $pkg; 3918 clear_package $pkg;
3630 } 3919 }
3631 3920
3632 warn "unloading all perl modules loaded from $LIBDIR"; 3921 trace "unloading all perl modules loaded from $LIBDIR";
3633 while (my ($k, $v) = each %INC) { 3922 while (my ($k, $v) = each %INC) {
3634 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3923 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3635 3924
3636 warn "... unloading $k"; 3925 trace "... unloading $k";
3637 delete $INC{$k}; 3926 delete $INC{$k};
3638 3927
3639 $k =~ s/\.pm$//; 3928 $k =~ s/\.pm$//;
3640 $k =~ s/\//::/g; 3929 $k =~ s/\//::/g;
3641 3930
3644 } 3933 }
3645 3934
3646 clear_package $k; 3935 clear_package $k;
3647 } 3936 }
3648 3937
3649 warn "getting rid of safe::, as good as possible"; 3938 trace "getting rid of safe::, as good as possible";
3650 clear_package "safe::$_" 3939 clear_package "safe::$_"
3651 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3940 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3652 3941
3653 warn "unloading cf.pm \"a bit\""; 3942 trace "unloading cf.pm \"a bit\"";
3654 delete $INC{"cf.pm"}; 3943 delete $INC{"cf.pm"};
3655 delete $INC{"cf/pod.pm"}; 3944 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3656 3945
3657 # don't, removes xs symbols, too, 3946 # don't, removes xs symbols, too,
3658 # and global variables created in xs 3947 # and global variables created in xs
3659 #clear_package __PACKAGE__; 3948 #clear_package __PACKAGE__;
3660 3949
3661 warn "unload completed, starting to reload now"; 3950 info "unload completed, starting to reload now";
3662 3951
3663 warn "reloading cf.pm"; 3952 trace "reloading cf.pm";
3664 require cf; 3953 require cf;
3665 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3954 cf::_connect_to_perl_1;
3666 3955
3667 warn "loading config and database again"; 3956 trace "loading config and database again";
3668 cf::reload_config; 3957 cf::reload_config;
3669 3958
3670 warn "loading extensions"; 3959 trace "loading extensions";
3671 cf::load_extensions; 3960 cf::load_extensions;
3672 3961
3962 if ($REATTACH_ON_RELOAD) {
3673 warn "reattaching attachments to objects/players"; 3963 trace "reattaching attachments to objects/players";
3674 _global_reattach; # objects, sockets 3964 _global_reattach; # objects, sockets
3675 warn "reattaching attachments to maps"; 3965 trace "reattaching attachments to maps";
3676 reattach $_ for values %MAP; 3966 reattach $_ for values %MAP;
3677 warn "reattaching attachments to players"; 3967 trace "reattaching attachments to players";
3678 reattach $_ for values %PLAYER; 3968 reattach $_ for values %PLAYER;
3969 }
3679 3970
3971 trace "running post_init jobs";
3972 (pop @POST_INIT)->(1) while @POST_INIT;
3973
3680 warn "leaving sync_job"; 3974 trace "leaving sync_job";
3681 3975
3682 1 3976 1
3683 } or do { 3977 } or do {
3684 warn $@; 3978 error $@;
3685 cf::cleanup "error while reloading, exiting."; 3979 cf::cleanup "error while reloading, exiting.";
3686 }; 3980 };
3687 3981
3688 warn "reloaded"; 3982 info "reloaded";
3689 --$RELOAD; 3983 --$RELOAD;
3690 } 3984 }
3985
3986 $t1 = AE::time - $t1;
3987 info "reload completed in ${t1}s\n";
3691}; 3988};
3692 3989
3693our $RELOAD_WATCHER; # used only during reload 3990our $RELOAD_WATCHER; # used only during reload
3694 3991
3695sub reload_perl() { 3992sub reload_perl() {
3696 # doing reload synchronously and two reloads happen back-to-back, 3993 # doing reload synchronously and two reloads happen back-to-back,
3697 # coro crashes during coro_state_free->destroy here. 3994 # coro crashes during coro_state_free->destroy here.
3698 3995
3996 $RELOAD_WATCHER ||= cf::async {
3997 Coro::AIO::aio_wait cache_extensions;
3998
3699 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3999 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3700 do_reload_perl; 4000 do_reload_perl;
3701 undef $RELOAD_WATCHER; 4001 undef $RELOAD_WATCHER;
4002 };
3702 }; 4003 };
3703} 4004}
3704 4005
3705register_command "reload" => sub { 4006register_command "reload" => sub {
3706 my ($who, $arg) = @_; 4007 my ($who, $arg) = @_;
3712 reload_perl; 4013 reload_perl;
3713 }; 4014 };
3714 } 4015 }
3715}; 4016};
3716 4017
3717unshift @INC, $LIBDIR; 4018#############################################################################
3718 4019
3719my $bug_warning = 0; 4020my $bug_warning = 0;
3720 4021
3721our @WAIT_FOR_TICK; 4022our @WAIT_FOR_TICK;
3722our @WAIT_FOR_TICK_BEGIN; 4023our @WAIT_FOR_TICK_BEGIN;
3723 4024
3724sub wait_for_tick { 4025sub wait_for_tick() {
3725 return if tick_inhibit || $Coro::current == $Coro::main; 4026 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3726 4027
3727 my $signal = new Coro::Signal; 4028 my $signal = new Coro::Signal;
3728 push @WAIT_FOR_TICK, $signal; 4029 push @WAIT_FOR_TICK, $signal;
3729 $signal->wait; 4030 $signal->wait;
3730} 4031}
3731 4032
3732sub wait_for_tick_begin { 4033sub wait_for_tick_begin() {
3733 return if tick_inhibit || $Coro::current == $Coro::main; 4034 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3734 4035
3735 my $signal = new Coro::Signal; 4036 my $signal = new Coro::Signal;
3736 push @WAIT_FOR_TICK_BEGIN, $signal; 4037 push @WAIT_FOR_TICK_BEGIN, $signal;
3737 $signal->wait; 4038 $signal->wait;
3738} 4039}
3744 return; 4045 return;
3745 } 4046 }
3746 4047
3747 cf::server_tick; # one server iteration 4048 cf::server_tick; # one server iteration
3748 4049
4050 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4051
3749 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4052 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3750 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4053 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3751 Coro::async_pool { 4054 Coro::async_pool {
3752 $Coro::current->{desc} = "runtime saver"; 4055 $Coro::current->{desc} = "runtime saver";
3753 write_runtime_sync 4056 write_runtime_sync
3754 or warn "ERROR: unable to write runtime file: $!"; 4057 or error "ERROR: unable to write runtime file: $!";
3755 }; 4058 };
3756 } 4059 }
3757 4060
3758 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4061 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3759 $sig->send; 4062 $sig->send;
3767 4070
3768 if (0) { 4071 if (0) {
3769 if ($NEXT_TICK) { 4072 if ($NEXT_TICK) {
3770 my $jitter = $TICK_START - $NEXT_TICK; 4073 my $jitter = $TICK_START - $NEXT_TICK;
3771 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4074 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3772 warn "jitter $JITTER\n";#d# 4075 debug "jitter $JITTER\n";#d#
3773 } 4076 }
3774 } 4077 }
3775} 4078}
3776 4079
3777{ 4080{
3778 # configure BDB 4081 # configure BDB
3779 4082
3780 BDB::min_parallel 8; 4083 BDB::min_parallel 16;
3781 BDB::max_poll_reqs $TICK * 0.1; 4084 BDB::max_poll_reqs $TICK * 0.1;
3782 $AnyEvent::BDB::WATCHER->priority (1); 4085 $AnyEvent::BDB::WATCHER->priority (1);
3783 4086
3784 unless ($DB_ENV) { 4087 unless ($DB_ENV) {
3785 $DB_ENV = BDB::db_env_create; 4088 $DB_ENV = BDB::db_env_create;
3832 $msg =~ s/\n//; 4135 $msg =~ s/\n//;
3833 4136
3834 # limit the # of concurrent backtraces 4137 # limit the # of concurrent backtraces
3835 if ($_log_backtrace < 2) { 4138 if ($_log_backtrace < 2) {
3836 ++$_log_backtrace; 4139 ++$_log_backtrace;
4140 my $perl_bt = Carp::longmess $msg;
3837 async { 4141 async {
3838 $Coro::current->{desc} = "abt $msg"; 4142 $Coro::current->{desc} = "abt $msg";
3839 4143
3840 my @bt = fork_call { 4144 my @bt = fork_call {
3841 @addr = map { sprintf "%x", $_ } @addr; 4145 @addr = map { sprintf "%x", $_ } @addr;
3852 } 4156 }
3853 4157
3854 @funcs 4158 @funcs
3855 }; 4159 };
3856 4160
3857 LOG llevInfo, "[ABT] $msg\n"; 4161 LOG llevInfo, "[ABT] $perl_bt\n";
4162 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3858 LOG llevInfo, "[ABT] $_\n" for @bt; 4163 LOG llevInfo, "[ABT] $_\n" for @bt;
3859 --$_log_backtrace; 4164 --$_log_backtrace;
3860 }; 4165 };
3861 } else { 4166 } else {
3862 LOG llevInfo, "[ABT] $msg\n"; 4167 LOG llevInfo, "[ABT] $msg\n";
3863 LOG llevInfo, "[ABT] [suppressed]\n"; 4168 LOG llevInfo, "[ABT] [suppressed]\n";
3864 } 4169 }
3865} 4170}
3866 4171
3867# load additional modules 4172# load additional modules
3868use cf::pod; 4173require "cf/$_.pm" for @EXTRA_MODULES;
4174cf::_connect_to_perl_2;
3869 4175
3870END { cf::emergency_save } 4176END { cf::emergency_save }
3871 4177
38721 41781
3873 4179

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines