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.455 by root, Sat Sep 27 08:17:40 2008 UTC vs.
Revision 1.559 by root, Sat Feb 26 12:50:27 2011 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use common::sense;
25use utf8;
26use strict "vars", "subs";
27 26
28use Symbol; 27use Symbol;
29use List::Util; 28use List::Util;
30use Socket; 29use Socket;
31use EV; 30use EV;
32use Opcode; 31use Opcode;
33use Safe; 32use Safe;
34use Safe::Hole; 33use Safe::Hole;
35use Storable (); 34use Storable ();
35use Carp ();
36 36
37use Guard ();
37use Coro (); 38use Coro ();
38use Coro::State; 39use Coro::State;
39use Coro::Handle; 40use Coro::Handle;
40use Coro::EV; 41use Coro::EV;
41use Coro::AnyEvent; 42use Coro::AnyEvent;
42use Coro::Timer; 43use Coro::Timer;
43use Coro::Signal; 44use Coro::Signal;
44use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
45use Coro::AnyEvent; 47use Coro::AnyEvent;
46use Coro::AIO; 48use Coro::AIO;
47use Coro::BDB 1.6; 49use Coro::BDB 1.6;
48use Coro::Storable; 50use Coro::Storable;
49use Coro::Util (); 51use Coro::Util ();
50 52
51use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
52use BDB (); 54use BDB ();
53use Data::Dumper; 55use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 56use Fcntl;
56use YAML (); 57use YAML::XS ();
57use IO::AIO (); 58use IO::AIO ();
58use Time::HiRes; 59use Time::HiRes;
59use Compress::LZF; 60use Compress::LZF;
60use Digest::MD5 (); 61use Digest::MD5 ();
61 62
70 71
71# make sure c-lzf reinitialises itself 72# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
73Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
74 75
76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
78
75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
76 82
77our %COMMAND = (); 83our %COMMAND = ();
78our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
79 85
80our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
83our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
84our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
85 91
86our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
87our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
88 96
89our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
90our $DATADIR = datadir; 99our $DATADIR = datadir;
91our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
92our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
93our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
94our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
95our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
96our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
97our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
98our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
99our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
102 112
103our %RESOURCE; 113our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
104 120
105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107our $NEXT_TICK; 123our $NEXT_TICK;
108our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
109 125
110our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
112our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
113our $DB_ENV; 129our $DB_ENV;
114 130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
115our %CFG; 133our %CFG;
116 134
117our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
118our $RUNTIME; 136our $RUNTIME;
119our $NOW; 137our $NOW;
129our $LOADAVG; # same thing, but with alpha-smoothing 147our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter 148our $JITTER; # average jitter
131our $TICK_START; # for load detecting purposes 149our $TICK_START; # for load detecting purposes
132 150
133our @POST_INIT; 151our @POST_INIT;
152
153our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
154our $REALLY_UNLOOP; # never set to true, please :)
134 155
135binmode STDOUT; 156binmode STDOUT;
136binmode STDERR; 157binmode STDERR;
137 158
138# read virtual server time, if available 159# read virtual server time, if available
140 open my $fh, "<", $RUNTIMEFILE 161 open my $fh, "<", $RUNTIMEFILE
141 or die "unable to read $RUNTIMEFILE file: $!"; 162 or die "unable to read $RUNTIMEFILE file: $!";
142 $RUNTIME = <$fh> + 0.; 163 $RUNTIME = <$fh> + 0.;
143} 164}
144 165
166eval "sub TICK() { $TICK } 1" or die;
167
145mkdir $_ 168mkdir $_
146 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 169 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
147 170
148our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
149 172
150sub cf::map::normalise; 173sub cf::map::normalise;
174
175sub in_main() {
176 $Coro::current == $Coro::main
177}
178
179#############################################################################
180
181%REFLECT = ();
182for (@REFLECT) {
183 my $reflect = JSON::XS::decode_json $_;
184 $REFLECT{$reflect->{class}} = $reflect;
185}
186
187# this is decidedly evil
188$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
151 189
152############################################################################# 190#############################################################################
153 191
154=head2 GLOBAL VARIABLES 192=head2 GLOBAL VARIABLES
155 193
197from wherever your confdir points to. 235from wherever your confdir points to.
198 236
199=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
200 238
201These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 239These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
202returns directly I<after> the tick processing (and consequently, can only wake one process 240returns directly I<after> the tick processing (and consequently, can only wake one thread
203per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 241per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
204 242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
247
205=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
206 249
207This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
208C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 251C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
209that call. 252that call.
210 253
254=item %cf::REFLECT
255
256Contains, for each (C++) class name, a hash reference with information
257about object members (methods, scalars, arrays and flags) and other
258metadata, which is useful for introspection.
259
211=back 260=back
212 261
213=cut 262=cut
214 263
215BEGIN { 264sub error(@) { LOG llevError, join "", @_ }
216 *CORE::GLOBAL::warn = sub { 265sub warn (@) { LOG llevWarn , join "", @_ }
266sub info (@) { LOG llevInfo , join "", @_ }
267sub debug(@) { LOG llevDebug, join "", @_ }
268sub trace(@) { LOG llevTrace, join "", @_ }
269
270$Coro::State::WARNHOOK = sub {
217 my $msg = join "", @_; 271 my $msg = join "", @_;
218 272
219 $msg .= "\n" 273 $msg .= "\n"
220 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
221 275
222 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 276 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
223 277
224 LOG llevError, $msg; 278 LOG llevWarn, $msg;
225 }; 279};
226}
227 280
228$Coro::State::DIEHOOK = sub { 281$Coro::State::DIEHOOK = sub {
229 return unless $^S eq 0; # "eq", not "==" 282 return unless $^S eq 0; # "eq", not "=="
230 283
231 if ($Coro::current == $Coro::main) {#d# 284 error Carp::longmess $_[0];
285
286 if (in_main) {#d#
232 warn "DIEHOOK called in main context, Coro bug?\n";#d# 287 error "DIEHOOK called in main context, Coro bug?\n";#d#
233 return;#d# 288 return;#d#
234 }#d# 289 }#d#
235 290
236 # kill coroutine otherwise 291 # kill coroutine otherwise
237 warn Carp::longmess $_[0];
238 Coro::terminate 292 Coro::terminate
239}; 293};
240
241$SIG{__DIE__} = sub { }; #d#?
242 294
243@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 295@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
244@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 296@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
245@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 297@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
246@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 298@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
260)) { 312)) {
261 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
262} 314}
263 315
264$EV::DIED = sub { 316$EV::DIED = sub {
265 warn "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
266}; 318};
267 319
268############################################################################# 320#############################################################################
269 321
270=head2 UTILITY FUNCTIONS 322=head2 UTILITY FUNCTIONS
307our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 359our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
308 360
309sub encode_json($) { $json_coder->encode ($_[0]) } 361sub encode_json($) { $json_coder->encode ($_[0]) }
310sub decode_json($) { $json_coder->decode ($_[0]) } 362sub decode_json($) { $json_coder->decode ($_[0]) }
311 363
364=item $ref = cf::yaml_load $scalar
365
366Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
367
368=cut
369
370sub fork_call(&@);
371
372sub yaml_load($) {
373 fork_call { YAML::XS::Load $_[0] } @_
374}
375
312=item cf::post_init { BLOCK } 376=item cf::post_init { BLOCK }
313 377
314Execute the given codeblock, I<after> all extensions have been (re-)loaded, 378Execute the given codeblock, I<after> all extensions have been (re-)loaded,
315but I<before> the server starts ticking again. 379but I<before> the server starts ticking again.
316 380
317The cdoeblock will have a single boolean argument to indicate whether this 381The codeblock will have a single boolean argument to indicate whether this
318is a reload or not. 382is a reload or not.
319 383
320=cut 384=cut
321 385
322sub post_init(&) { 386sub post_init(&) {
323 push @POST_INIT, shift; 387 push @POST_INIT, shift;
324} 388}
325 389
390sub _post_init {
391 trace "running post_init jobs";
392
393 # run them in parallel...
394
395 my @join;
396
397 while () {
398 push @join, map &Coro::async ($_, 0), @POST_INIT;
399 @POST_INIT = ();
400
401 @join or last;
402
403 (pop @join)->join;
404 }
405}
406
326=item cf::lock_wait $string 407=item cf::lock_wait $string
327 408
328Wait until the given lock is available. See cf::lock_acquire. 409Wait until the given lock is available. See cf::lock_acquire.
329 410
330=item my $lock = cf::lock_acquire $string 411=item my $lock = cf::lock_acquire $string
331 412
332Wait until the given lock is available and then acquires it and returns 413Wait until the given lock is available and then acquires it and returns
333a Coro::guard object. If the guard object gets destroyed (goes out of scope, 414a L<Guard> object. If the guard object gets destroyed (goes out of scope,
334for example when the coroutine gets canceled), the lock is automatically 415for example when the coroutine gets canceled), the lock is automatically
335returned. 416returned.
336 417
337Locks are *not* recursive, locking from the same coro twice results in a 418Locks are *not* recursive, locking from the same coro twice results in a
338deadlocked coro. 419deadlocked coro.
344 425
345Return true if the lock is currently active, i.e. somebody has locked it. 426Return true if the lock is currently active, i.e. somebody has locked it.
346 427
347=cut 428=cut
348 429
349our %LOCK; 430our $LOCKS = new Coro::SemaphoreSet;
350our %LOCKER;#d#
351 431
352sub lock_wait($) { 432sub lock_wait($) {
353 my ($key) = @_; 433 $LOCKS->wait ($_[0]);
354
355 if ($LOCKER{$key} == $Coro::current) {#d#
356 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
357 return;#d#
358 }#d#
359
360 # wait for lock, if any
361 while ($LOCK{$key}) {
362 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
363 push @{ $LOCK{$key} }, $Coro::current;
364 Coro::schedule;
365 }
366} 434}
367 435
368sub lock_acquire($) { 436sub lock_acquire($) {
369 my ($key) = @_; 437 $LOCKS->guard ($_[0])
370
371 # wait, to be sure we are not locked
372 lock_wait $key;
373
374 $LOCK{$key} = [];
375 $LOCKER{$key} = $Coro::current;#d#
376
377 Coro::guard {
378 delete $LOCKER{$key};#d#
379 # wake up all waiters, to be on the safe side
380 $_->ready for @{ delete $LOCK{$key} };
381 }
382} 438}
383 439
384sub lock_active($) { 440sub lock_active($) {
385 my ($key) = @_; 441 $LOCKS->count ($_[0]) < 1
386
387 ! ! $LOCK{$key}
388} 442}
389 443
390sub freeze_mainloop { 444sub freeze_mainloop {
391 tick_inhibit_inc; 445 tick_inhibit_inc;
392 446
393 Coro::guard \&tick_inhibit_dec; 447 &Guard::guard (\&tick_inhibit_dec);
394} 448}
395 449
396=item cf::periodic $interval, $cb 450=item cf::periodic $interval, $cb
397 451
398Like EV::periodic, but randomly selects a starting point so that the actions 452Like EV::periodic, but randomly selects a starting point so that the actions
399get spread over timer. 453get spread over time.
400 454
401=cut 455=cut
402 456
403sub periodic($$) { 457sub periodic($$) {
404 my ($interval, $cb) = @_; 458 my ($interval, $cb) = @_;
421 475
422=cut 476=cut
423 477
424our @SLOT_QUEUE; 478our @SLOT_QUEUE;
425our $SLOT_QUEUE; 479our $SLOT_QUEUE;
480our $SLOT_DECAY = 0.9;
426 481
427$SLOT_QUEUE->cancel if $SLOT_QUEUE; 482$SLOT_QUEUE->cancel if $SLOT_QUEUE;
428$SLOT_QUEUE = Coro::async { 483$SLOT_QUEUE = Coro::async {
429 $Coro::current->desc ("timeslot manager"); 484 $Coro::current->desc ("timeslot manager");
430 485
431 my $signal = new Coro::Signal; 486 my $signal = new Coro::Signal;
487 my $busy;
432 488
433 while () { 489 while () {
434 next_job: 490 next_job:
491
435 my $avail = cf::till_tick; 492 my $avail = cf::till_tick;
436 if ($avail > 0.01) { 493
437 for (0 .. $#SLOT_QUEUE) { 494 for (0 .. $#SLOT_QUEUE) {
438 if ($SLOT_QUEUE[$_][0] < $avail) { 495 if ($SLOT_QUEUE[$_][0] <= $avail) {
496 $busy = 0;
439 my $job = splice @SLOT_QUEUE, $_, 1, (); 497 my $job = splice @SLOT_QUEUE, $_, 1, ();
440 $job->[2]->send; 498 $job->[2]->send;
441 Coro::cede; 499 Coro::cede;
442 goto next_job; 500 goto next_job;
443 } 501 } else {
502 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
444 } 503 }
445 } 504 }
446 505
447 if (@SLOT_QUEUE) { 506 if (@SLOT_QUEUE) {
448 # we do not use wait_for_tick() as it returns immediately when tick is inactive 507 # we do not use wait_for_tick() as it returns immediately when tick is inactive
449 push @cf::WAIT_FOR_TICK, $signal; 508 push @cf::WAIT_FOR_TICK, $signal;
450 $signal->wait; 509 $signal->wait;
451 } else { 510 } else {
511 $busy = 0;
452 Coro::schedule; 512 Coro::schedule;
453 } 513 }
454 } 514 }
455}; 515};
456 516
457sub get_slot($;$$) { 517sub get_slot($;$$) {
458 return if tick_inhibit || $Coro::current == $Coro::main; 518 return if tick_inhibit || $Coro::current == $Coro::main;
459 519
460 my ($time, $pri, $name) = @_; 520 my ($time, $pri, $name) = @_;
461 521
462 $time = $TICK * .6 if $time > $TICK * .6; 522 $time = clamp $time, 0.01, $TICK * .6;
523
463 my $sig = new Coro::Signal; 524 my $sig = new Coro::Signal;
464 525
465 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 526 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
466 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 527 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
467 $SLOT_QUEUE->ready; 528 $SLOT_QUEUE->ready;
493=cut 554=cut
494 555
495sub sync_job(&) { 556sub sync_job(&) {
496 my ($job) = @_; 557 my ($job) = @_;
497 558
498 if ($Coro::current == $Coro::main) { 559 if (in_main) {
499 my $time = EV::time; 560 my $time = AE::time;
500 561
501 # this is the main coro, too bad, we have to block 562 # this is the main coro, too bad, we have to block
502 # till the operation succeeds, freezing the server :/ 563 # till the operation succeeds, freezing the server :/
503 564
504 LOG llevError, Carp::longmess "sync job";#d# 565 #LOG llevError, Carp::longmess "sync job";#d#
505 566
506 my $freeze_guard = freeze_mainloop; 567 my $freeze_guard = freeze_mainloop;
507 568
508 my $busy = 1; 569 my $busy = 1;
509 my @res; 570 my @res;
510 571
511 (async { 572 (async {
512 $Coro::current->desc ("sync job coro"); 573 $Coro::current->desc ("sync job coro");
513 @res = eval { $job->() }; 574 @res = eval { $job->() };
514 warn $@ if $@; 575 error $@ if $@;
515 undef $busy; 576 undef $busy;
516 })->prio (Coro::PRIO_MAX); 577 })->prio (Coro::PRIO_MAX);
517 578
518 while ($busy) { 579 while ($busy) {
519 if (Coro::nready) { 580 if (Coro::nready) {
521 } else { 582 } else {
522 EV::loop EV::LOOP_ONESHOT; 583 EV::loop EV::LOOP_ONESHOT;
523 } 584 }
524 } 585 }
525 586
526 my $time = EV::time - $time; 587 my $time = AE::time - $time;
527 588
528 $TICK_START += $time; # do not account sync jobs to server load 589 $TICK_START += $time; # do not account sync jobs to server load
529 590
530 wantarray ? @res : $res[0] 591 wantarray ? @res : $res[0]
531 } else { 592 } else {
553 $EXT_CORO{$coro+0} = $coro; 614 $EXT_CORO{$coro+0} = $coro;
554 615
555 $coro 616 $coro
556} 617}
557 618
558=item fork_call { }, $args 619=item fork_call { }, @args
559 620
560Executes the given code block with the given arguments in a seperate 621Executes the given code block with the given arguments in a seperate
561process, returning the results. Everything must be serialisable with 622process, returning the results. Everything must be serialisable with
562Coro::Storable. May, of course, block. Note that the executed sub may 623Coro::Storable. May, of course, block. Note that the executed sub may
563never block itself or use any form of event handling. 624never block itself or use any form of event handling.
564 625
565=cut 626=cut
566 627
628sub post_fork {
629 reset_signals;
630}
631
567sub fork_call(&@) { 632sub fork_call(&@) {
568 my ($cb, @args) = @_; 633 my ($cb, @args) = @_;
569 634
570 # we seemingly have to make a local copy of the whole thing, 635 # we seemingly have to make a local copy of the whole thing,
571 # otherwise perl prematurely frees the stuff :/ 636 # otherwise perl prematurely frees the stuff :/
572 # TODO: investigate and fix (likely this will be rather laborious) 637 # TODO: investigate and fix (likely this will be rather laborious)
573 638
574 my @res = Coro::Util::fork_eval { 639 my @res = Coro::Util::fork_eval {
575 reset_signals; 640 cf::post_fork;
576 &$cb 641 &$cb
577 }, @args; 642 } @args;
578 643
579 wantarray ? @res : $res[-1] 644 wantarray ? @res : $res[-1]
645}
646
647sub objinfo {
648 (
649 "counter value" => cf::object::object_count,
650 "objects created" => cf::object::create_count,
651 "objects destroyed" => cf::object::destroy_count,
652 "freelist size" => cf::object::free_count,
653 "allocated objects" => cf::object::objects_size,
654 "active objects" => cf::object::actives_size,
655 )
580} 656}
581 657
582=item $coin = coin_from_name $name 658=item $coin = coin_from_name $name
583 659
584=cut 660=cut
621within each server. 697within each server.
622 698
623=cut 699=cut
624 700
625sub db_table($) { 701sub db_table($) {
702 cf::error "db_get called from main context"
703 if $Coro::current == $Coro::main;
704
626 my ($name) = @_; 705 my ($name) = @_;
627 my $db = BDB::db_create $DB_ENV; 706 my $db = BDB::db_create $DB_ENV;
628 707
629 eval { 708 eval {
630 $db->set_flags (BDB::CHKSUM); 709 $db->set_flags (BDB::CHKSUM);
640} 719}
641 720
642our $DB; 721our $DB;
643 722
644sub db_init { 723sub db_init {
645 cf::sync_job {
646 $DB ||= db_table "db"; 724 $DB ||= db_table "db";
647 };
648} 725}
649 726
650sub db_get($$) { 727sub db_get($$) {
651 my $key = "$_[0]/$_[1]"; 728 my $key = "$_[0]/$_[1]";
652 729
653 cf::sync_job { 730 cf::error "db_get called from main context"
731 if $Coro::current == $Coro::main;
732
654 BDB::db_get $DB, undef, $key, my $data; 733 BDB::db_get $DB, undef, $key, my $data;
655 734
656 $! ? () 735 $! ? ()
657 : $data 736 : $data
658 }
659} 737}
660 738
661sub db_put($$$) { 739sub db_put($$$) {
662 BDB::dbreq_pri 4; 740 BDB::dbreq_pri 4;
663 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 741 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
719 797
720 my $t1 = Time::HiRes::time; 798 my $t1 = Time::HiRes::time;
721 my $data = $process->(\@data); 799 my $data = $process->(\@data);
722 my $t2 = Time::HiRes::time; 800 my $t2 = Time::HiRes::time;
723 801
724 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 802 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
725 803
726 db_put cache => "$id/data", $data; 804 db_put cache => "$id/data", $data;
727 db_put cache => "$id/md5" , $md5; 805 db_put cache => "$id/md5" , $md5;
728 db_put cache => "$id/meta", $meta; 806 db_put cache => "$id/meta", $meta;
729 807
739 817
740=cut 818=cut
741 819
742sub datalog($@) { 820sub datalog($@) {
743 my ($type, %kv) = @_; 821 my ($type, %kv) = @_;
744 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 822 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
745} 823}
746 824
747=back 825=back
748 826
749=cut 827=cut
944 1022
945 } elsif (exists $cb_id{$type}) { 1023 } elsif (exists $cb_id{$type}) {
946 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1024 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
947 1025
948 } elsif (ref $type) { 1026 } elsif (ref $type) {
949 warn "attaching objects not supported, ignoring.\n"; 1027 error "attaching objects not supported, ignoring.\n";
950 1028
951 } else { 1029 } else {
952 shift @arg; 1030 shift @arg;
953 warn "attach argument '$type' not supported, ignoring.\n"; 1031 error "attach argument '$type' not supported, ignoring.\n";
954 } 1032 }
955 } 1033 }
956} 1034}
957 1035
958sub _object_attach { 1036sub _object_attach {
968 _attach $registry, $klass, @attach; 1046 _attach $registry, $klass, @attach;
969 } 1047 }
970 1048
971 $obj->{$name} = \%arg; 1049 $obj->{$name} = \%arg;
972 } else { 1050 } else {
973 warn "object uses attachment '$name' which is not available, postponing.\n"; 1051 info "object uses attachment '$name' which is not available, postponing.\n";
974 } 1052 }
975 1053
976 $obj->{_attachment}{$name} = undef; 1054 $obj->{_attachment}{$name} = undef;
977} 1055}
978 1056
1037 1115
1038 for (@$callbacks) { 1116 for (@$callbacks) {
1039 eval { &{$_->[1]} }; 1117 eval { &{$_->[1]} };
1040 1118
1041 if ($@) { 1119 if ($@) {
1042 warn "$@";
1043 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1120 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1044 override; 1121 override;
1045 } 1122 }
1046 1123
1047 return 1 if $override; 1124 return 1 if $override;
1048 } 1125 }
1127 for (@$attach) { 1204 for (@$attach) {
1128 my ($klass, @attach) = @$_; 1205 my ($klass, @attach) = @$_;
1129 _attach $registry, $klass, @attach; 1206 _attach $registry, $klass, @attach;
1130 } 1207 }
1131 } else { 1208 } else {
1132 warn "object uses attachment '$name' that is not available, postponing.\n"; 1209 info "object uses attachment '$name' that is not available, postponing.\n";
1133 } 1210 }
1134 } 1211 }
1135} 1212}
1136 1213
1137cf::attachable->attach ( 1214cf::attachable->attach (
1164 my ($filename, $rdata, $objs) = @_; 1241 my ($filename, $rdata, $objs) = @_;
1165 1242
1166 sync_job { 1243 sync_job {
1167 if (length $$rdata) { 1244 if (length $$rdata) {
1168 utf8::decode (my $decname = $filename); 1245 utf8::decode (my $decname = $filename);
1169 warn sprintf "saving %s (%d,%d)\n", 1246 trace sprintf "saving %s (%d,%d)\n",
1170 $decname, length $$rdata, scalar @$objs; 1247 $decname, length $$rdata, scalar @$objs
1248 if $VERBOSE_IO;
1171 1249
1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1250 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1173 aio_chmod $fh, SAVE_MODE; 1251 aio_chmod $fh, SAVE_MODE;
1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1252 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1175 aio_fsync $fh if $cf::USE_FSYNC; 1253 if ($cf::USE_FSYNC) {
1254 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;
1255 aio_fsync $fh;
1256 }
1176 aio_close $fh; 1257 aio_close $fh;
1177 1258
1178 if (@$objs) { 1259 if (@$objs) {
1179 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1260 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1180 aio_chmod $fh, SAVE_MODE; 1261 aio_chmod $fh, SAVE_MODE;
1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1262 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1182 aio_write $fh, 0, (length $data), $data, 0; 1263 aio_write $fh, 0, (length $data), $data, 0;
1183 aio_fsync $fh if $cf::USE_FSYNC; 1264 if ($cf::USE_FSYNC) {
1265 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;
1266 aio_fsync $fh;
1267 }
1184 aio_close $fh; 1268 aio_close $fh;
1185 aio_rename "$filename.pst~", "$filename.pst"; 1269 aio_rename "$filename.pst~", "$filename.pst";
1186 } 1270 }
1187 } else { 1271 } else {
1188 aio_unlink "$filename.pst"; 1272 aio_unlink "$filename.pst";
1189 } 1273 }
1190 1274
1191 aio_rename "$filename~", $filename; 1275 aio_rename "$filename~", $filename;
1276
1277 $filename =~ s%/[^/]+$%%;
1278 aio_pathsync $filename if $cf::USE_FSYNC;
1192 } else { 1279 } else {
1193 warn "FATAL: $filename~: $!\n"; 1280 error "unable to save objects: $filename~: $!\n";
1194 } 1281 }
1195 } else { 1282 } else {
1196 aio_unlink $filename; 1283 aio_unlink $filename;
1197 aio_unlink "$filename.pst"; 1284 aio_unlink "$filename.pst";
1198 } 1285 }
1222 my $st = eval { Coro::Storable::thaw $av }; 1309 my $st = eval { Coro::Storable::thaw $av };
1223 $av = $st->{objs}; 1310 $av = $st->{objs};
1224 } 1311 }
1225 1312
1226 utf8::decode (my $decname = $filename); 1313 utf8::decode (my $decname = $filename);
1227 warn sprintf "loading %s (%d,%d)\n", 1314 trace sprintf "loading %s (%d,%d)\n",
1228 $decname, length $data, scalar @{$av || []}; 1315 $decname, length $data, scalar @{$av || []}
1316 if $VERBOSE_IO;
1229 1317
1230 ($data, $av) 1318 ($data, $av)
1231} 1319}
1232 1320
1233=head2 COMMAND CALLBACKS 1321=head2 COMMAND CALLBACKS
1289 my ($name, $cb) = @_; 1377 my ($name, $cb) = @_;
1290 1378
1291 $EXTICMD{$name} = $cb; 1379 $EXTICMD{$name} = $cb;
1292} 1380}
1293 1381
1382use File::Glob ();
1383
1294cf::player->attach ( 1384cf::player->attach (
1295 on_command => sub { 1385 on_unknown_command => sub {
1296 my ($pl, $name, $params) = @_; 1386 my ($pl, $name, $params) = @_;
1297 1387
1298 my $cb = $COMMAND{$name} 1388 my $cb = $COMMAND{$name}
1299 or return; 1389 or return;
1300 1390
1323 1413
1324 $pl->ext_reply ($reply, @reply) 1414 $pl->ext_reply ($reply, @reply)
1325 if $reply; 1415 if $reply;
1326 1416
1327 } else { 1417 } else {
1328 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1418 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1329 } 1419 }
1330 1420
1331 cf::override; 1421 cf::override;
1332 }, 1422 },
1333); 1423);
1334 1424
1425# "readahead" all extensions
1426sub cache_extensions {
1427 my $grp = IO::AIO::aio_group;
1428
1429 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1430 for (grep /\.ext$/, @{$_[0]}) {
1431 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1432 }
1433 };
1434
1435 $grp
1436}
1437
1335sub load_extensions { 1438sub load_extensions {
1439 info "loading extensions...";
1440
1336 cf::sync_job { 1441 cf::sync_job {
1337 my %todo; 1442 my %todo;
1338 1443
1339 for my $path (<$LIBDIR/*.ext>) { 1444 for my $path (<$LIBDIR/*.ext>) {
1340 next unless -r $path; 1445 next unless -r $path;
1358 1463
1359 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1464 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1360 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1465 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1361 1466
1362 $ext{source} = 1467 $ext{source} =
1363 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1468 "package $pkg; use common::sense;\n"
1364 . "#line 1 \"$path\"\n{\n" 1469 . "#line 1 \"$path\"\n{\n"
1365 . $source 1470 . $source
1366 . "\n};\n1"; 1471 . "\n};\n1";
1367 1472
1368 $todo{$base} = \%ext; 1473 $todo{$base} = \%ext;
1369 } 1474 }
1370 1475
1476 my $pass = 0;
1371 my %done; 1477 my %done;
1372 while (%todo) { 1478 while (%todo) {
1373 my $progress; 1479 my $progress;
1374 1480
1481 ++$pass;
1482
1483 ext:
1375 while (my ($k, $v) = each %todo) { 1484 while (my ($k, $v) = each %todo) {
1376 for (split /,\s*/, $v->{meta}{depends}) { 1485 for (split /,\s*/, $v->{meta}{depends}) {
1377 goto skip 1486 next ext
1378 unless exists $done{$_}; 1487 unless exists $done{$_};
1379 } 1488 }
1380 1489
1381 warn "... loading '$k' into '$v->{pkg}'\n"; 1490 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1382 1491
1383 unless (eval $v->{source}) { 1492 my $active = eval $v->{source};
1493
1494 if (length $@) {
1384 my $msg = $@ ? "$v->{path}: $@\n" 1495 error "$v->{path}: $@\n";
1385 : "$v->{base}: extension inactive.\n";
1386 1496
1387 if (exists $v->{meta}{mandatory}) {
1388 warn $msg;
1389 cf::cleanup "mandatory extension failed to load, exiting."; 1497 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1390 } 1498 if exists $v->{meta}{mandatory};
1391 1499
1392 warn $msg; 1500 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1501 delete $todo{$k};
1502 } else {
1503 $done{$k} = delete $todo{$k};
1504 push @EXTS, $v->{pkg};
1505 $progress = 1;
1506
1507 info "$v->{base}: extension inactive.\n"
1508 unless $active;
1393 } 1509 }
1394
1395 $done{$k} = delete $todo{$k};
1396 push @EXTS, $v->{pkg};
1397 $progress = 1;
1398 } 1510 }
1399 1511
1400 skip: 1512 unless ($progress) {
1401 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1513 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1402 unless $progress; 1514
1515 while (my ($k, $v) = each %todo) {
1516 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1517 if exists $v->{meta}{mandatory};
1518 }
1519 }
1403 } 1520 }
1404 }; 1521 };
1405} 1522}
1406 1523
1407############################################################################# 1524#############################################################################
1491 $cf::PLAYER{$login} = $pl 1608 $cf::PLAYER{$login} = $pl
1492 } 1609 }
1493 } 1610 }
1494} 1611}
1495 1612
1613cf::player->attach (
1614 on_load => sub {
1615 my ($pl, $path) = @_;
1616
1617 # restore slots saved in save, below
1618 my $slots = delete $pl->{_slots};
1619
1620 $pl->ob->current_weapon ($slots->[0]);
1621 $pl->combat_ob ($slots->[1]);
1622 $pl->ranged_ob ($slots->[2]);
1623 },
1624);
1625
1496sub save($) { 1626sub save($) {
1497 my ($pl) = @_; 1627 my ($pl) = @_;
1498 1628
1499 return if $pl->{deny_save}; 1629 return if $pl->{deny_save};
1500 1630
1505 1635
1506 aio_mkdir playerdir $pl, 0770; 1636 aio_mkdir playerdir $pl, 0770;
1507 $pl->{last_save} = $cf::RUNTIME; 1637 $pl->{last_save} = $cf::RUNTIME;
1508 1638
1509 cf::get_slot 0.01; 1639 cf::get_slot 0.01;
1640
1641 # save slots, to be restored later
1642 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1510 1643
1511 $pl->save_pl ($path); 1644 $pl->save_pl ($path);
1512 cf::cede_to_tick; 1645 cf::cede_to_tick;
1513} 1646}
1514 1647
1548 my $name = $pl->ob->name; 1681 my $name = $pl->ob->name;
1549 1682
1550 $pl->{deny_save} = 1; 1683 $pl->{deny_save} = 1;
1551 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1684 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1552 1685
1553 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1686 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1554 $pl->deactivate; 1687 $pl->deactivate;
1688
1555 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1689 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1556 $pl->ob->check_score;
1557 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1690 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1691 ext::highscore::check ($pl->ob);
1692
1558 $pl->ns->destroy if $pl->ns; 1693 $pl->ns->destroy if $pl->ns;
1559 1694
1560 my $path = playerdir $pl; 1695 my $path = playerdir $pl;
1561 my $temp = "$path~$cf::RUNTIME~deleting~"; 1696 my $temp = "$path~$cf::RUNTIME~deleting~";
1562 aio_rename $path, $temp; 1697 aio_rename $path, $temp;
1616 \@logins 1751 \@logins
1617} 1752}
1618 1753
1619=item $player->maps 1754=item $player->maps
1620 1755
1756=item cf::player::maps $login
1757
1621Returns an arrayref of map paths that are private for this 1758Returns an arrayref of map paths that are private for this
1622player. May block. 1759player. May block.
1623 1760
1624=cut 1761=cut
1625 1762
1687=cut 1824=cut
1688 1825
1689sub find_by_path($) { 1826sub find_by_path($) {
1690 my ($path) = @_; 1827 my ($path) = @_;
1691 1828
1829 $path =~ s/^~[^\/]*//; # skip ~login
1830
1692 my ($match, $specificity); 1831 my ($match, $specificity);
1693 1832
1694 for my $region (list) { 1833 for my $region (list) {
1695 if ($region->{match} && $path =~ $region->{match}) { 1834 if ($region->{match} && $path =~ $region->{match}) {
1696 ($match, $specificity) = ($region, $region->specificity) 1835 ($match, $specificity) = ($region, $region->specificity)
1724sub generate_random_map { 1863sub generate_random_map {
1725 my ($self, $rmp) = @_; 1864 my ($self, $rmp) = @_;
1726 1865
1727 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1866 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1728 1867
1729 # mit "rum" bekleckern, nicht
1730 $self->_create_random_map ( 1868 $self->_create_random_map ($rmp);
1731 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1732 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1733 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1734 $rmp->{exit_on_final_map},
1735 $rmp->{xsize}, $rmp->{ysize},
1736 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1737 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1738 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1739 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1740 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1741 (cf::region::find $rmp->{region}), $rmp->{custom}
1742 )
1743} 1869}
1744 1870
1745=item cf::map->register ($regex, $prio) 1871=item cf::map->register ($regex, $prio)
1746 1872
1747Register a handler for the map path matching the given regex at the 1873Register a handler for the map path matching the given regex at the
1752 1878
1753sub register { 1879sub register {
1754 my (undef, $regex, $prio) = @_; 1880 my (undef, $regex, $prio) = @_;
1755 my $pkg = caller; 1881 my $pkg = caller;
1756 1882
1757 no strict;
1758 push @{"$pkg\::ISA"}, __PACKAGE__; 1883 push @{"$pkg\::ISA"}, __PACKAGE__;
1759 1884
1760 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1885 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1761} 1886}
1762 1887
1763# also paths starting with '/' 1888# also paths starting with '/'
1764$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1889$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1765 1890
1766sub thawer_merge { 1891sub thawer_merge {
1767 my ($self, $merge) = @_; 1892 my ($self, $merge) = @_;
1768 1893
1769 # we have to keep some variables in memory intact 1894 # we have to keep some variables in memory intact
1774} 1899}
1775 1900
1776sub normalise { 1901sub normalise {
1777 my ($path, $base) = @_; 1902 my ($path, $base) = @_;
1778 1903
1779 $path = "$path"; # make sure its a string 1904 $path = "$path"; # make sure it's a string
1780 1905
1781 $path =~ s/\.map$//; 1906 $path =~ s/\.map$//;
1782 1907
1783 # map plan: 1908 # map plan:
1784 # 1909 #
1799 $base =~ s{[^/]+/?$}{}; 1924 $base =~ s{[^/]+/?$}{};
1800 $path = "$base/$path"; 1925 $path = "$base/$path";
1801 } 1926 }
1802 1927
1803 for ($path) { 1928 for ($path) {
1804 redo if s{//}{/};
1805 redo if s{/\.?/}{/}; 1929 redo if s{/\.?/}{/};
1806 redo if s{/[^/]+/\.\./}{/}; 1930 redo if s{/[^/]+/\.\./}{/};
1807 } 1931 }
1808 1932
1809 $path 1933 $path
1823 $self->init; # pass $1 etc. 1947 $self->init; # pass $1 etc.
1824 return $self; 1948 return $self;
1825 } 1949 }
1826 } 1950 }
1827 1951
1828 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1952 Carp::cluck "unable to resolve path '$path' (base '$base')";
1829 () 1953 ()
1830} 1954}
1831 1955
1832sub init { 1956sub init {
1833 my ($self) = @_; 1957 my ($self) = @_;
1865sub uniq_path { 1989sub uniq_path {
1866 my ($self) = @_; 1990 my ($self) = @_;
1867 1991
1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1992 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1869 "$UNIQUEDIR/$path" 1993 "$UNIQUEDIR/$path"
1870}
1871
1872# and all this just because we cannot iterate over
1873# all maps in C++...
1874sub change_all_map_light {
1875 my ($change) = @_;
1876
1877 $_->change_map_light ($change)
1878 for grep $_->outdoor, values %cf::MAP;
1879} 1994}
1880 1995
1881sub decay_objects { 1996sub decay_objects {
1882 my ($self) = @_; 1997 my ($self) = @_;
1883 1998
1965 2080
1966sub find; 2081sub find;
1967sub find { 2082sub find {
1968 my ($path, $origin) = @_; 2083 my ($path, $origin) = @_;
1969 2084
2085 cf::cede_to_tick;
2086
1970 $path = normalise $path, $origin && $origin->path; 2087 $path = normalise $path, $origin && $origin->path;
1971 2088
1972 cf::lock_wait "map_data:$path";#d#remove 2089 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973 cf::lock_wait "map_find:$path"; 2090 my $guard2 = cf::lock_acquire "map_find:$path";
1974 2091
1975 $cf::MAP{$path} || do { 2092 $cf::MAP{$path} || do {
1976 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1977 my $guard2 = cf::lock_acquire "map_find:$path";
1978
1979 my $map = new_from_path cf::map $path 2093 my $map = new_from_path cf::map $path
1980 or return; 2094 or return;
1981 2095
1982 $map->{last_save} = $cf::RUNTIME; 2096 $map->{last_save} = $cf::RUNTIME;
1983 2097
1995 2109
1996 $cf::MAP{$path} = $map 2110 $cf::MAP{$path} = $map
1997 } 2111 }
1998} 2112}
1999 2113
2000sub pre_load { } 2114sub pre_load { }
2001sub post_load { } 2115#sub post_load { } # XS
2002 2116
2003sub load { 2117sub load {
2004 my ($self) = @_; 2118 my ($self) = @_;
2005 2119
2006 local $self->{deny_reset} = 1; # loading can take a long time 2120 local $self->{deny_reset} = 1; # loading can take a long time
2051 unless ($self->{deny_activate}) { 2165 unless ($self->{deny_activate}) {
2052 $self->decay_objects; 2166 $self->decay_objects;
2053 $self->fix_auto_apply; 2167 $self->fix_auto_apply;
2054 $self->update_buttons; 2168 $self->update_buttons;
2055 cf::cede_to_tick; 2169 cf::cede_to_tick;
2056 $self->set_darkness_map;
2057 cf::cede_to_tick;
2058 $self->activate; 2170 $self->activate;
2059 } 2171 }
2060 2172
2061 $self->{last_save} = $cf::RUNTIME; 2173 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME); 2174 $self->last_access ($cf::RUNTIME);
2063 2175
2064 $self->in_memory (cf::MAP_ACTIVE); 2176 $self->in_memory (cf::MAP_ACTIVE);
2065 } 2177 }
2066 2178
2067 $self->post_load; 2179 $self->post_load;
2068}
2069 2180
2181 1
2182}
2183
2184# customize the map for a given player, i.e.
2185# return the _real_ map. used by e.g. per-player
2186# maps to change the path to ~playername/mappath
2070sub customise_for { 2187sub customise_for {
2071 my ($self, $ob) = @_; 2188 my ($self, $ob) = @_;
2072 2189
2073 return find "~" . $ob->name . "/" . $self->{path} 2190 return find "~" . $ob->name . "/" . $self->{path}
2074 if $self->per_player; 2191 if $self->per_player;
2090 or next; 2207 or next;
2091 $neigh = find $neigh, $map 2208 $neigh = find $neigh, $map
2092 or next; 2209 or next;
2093 $neigh->load; 2210 $neigh->load;
2094 2211
2212 # now find the diagonal neighbours
2095 push @neigh, 2213 push @neigh,
2096 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2214 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2097 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2215 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2098 } 2216 }
2099 2217
2106} 2224}
2107 2225
2108sub find_sync { 2226sub find_sync {
2109 my ($path, $origin) = @_; 2227 my ($path, $origin) = @_;
2110 2228
2111 cf::sync_job { find $path, $origin } 2229 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2230 if $Coro::current == $Coro::main;
2231
2232 find $path, $origin
2112} 2233}
2113 2234
2114sub do_load_sync { 2235sub do_load_sync {
2115 my ($map) = @_; 2236 my ($map) = @_;
2116 2237
2117 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2238 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2118 if $Coro::current == $Coro::main; 2239 if $Coro::current == $Coro::main;
2119 2240
2120 cf::sync_job { $map->load }; 2241 $map->load;
2121} 2242}
2122 2243
2123our %MAP_PREFETCH; 2244our %MAP_PREFETCH;
2124our $MAP_PREFETCHER = undef; 2245our $MAP_PREFETCHER = undef;
2125 2246
2151 $MAP_PREFETCHER->prio (6); 2272 $MAP_PREFETCHER->prio (6);
2152 2273
2153 () 2274 ()
2154} 2275}
2155 2276
2277# common code, used by both ->save and ->swapout
2156sub save { 2278sub _save {
2157 my ($self) = @_; 2279 my ($self) = @_;
2158
2159 my $lock = cf::lock_acquire "map_data:$self->{path}";
2160 2280
2161 $self->{last_save} = $cf::RUNTIME; 2281 $self->{last_save} = $cf::RUNTIME;
2162 2282
2163 return unless $self->dirty; 2283 return unless $self->dirty;
2164 2284
2184 } else { 2304 } else {
2185 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2305 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2186 } 2306 }
2187} 2307}
2188 2308
2309sub save {
2310 my ($self) = @_;
2311
2312 my $lock = cf::lock_acquire "map_data:$self->{path}";
2313
2314 $self->_save;
2315}
2316
2189sub swap_out { 2317sub swap_out {
2190 my ($self) = @_; 2318 my ($self) = @_;
2191 2319
2192 # save first because save cedes
2193 $self->save;
2194
2195 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2320 my $lock = cf::lock_acquire "map_data:$self->{path}";
2196 2321
2197 return if $self->players;
2198 return if $self->in_memory != cf::MAP_ACTIVE; 2322 return if $self->in_memory != cf::MAP_ACTIVE;
2199 return if $self->{deny_save}; 2323 return if $self->{deny_save};
2324 return if $self->players;
2200 2325
2326 # first deactivate the map and "unlink" it from the core
2327 $self->deactivate;
2328 $_->clear_links_to ($self) for values %cf::MAP;
2201 $self->in_memory (cf::MAP_SWAPPED); 2329 $self->in_memory (cf::MAP_SWAPPED);
2330
2331 # then atomically save
2332 $self->_save;
2333
2334 # then free the map
2335 $self->clear;
2336}
2337
2338sub reset_at {
2339 my ($self) = @_;
2340
2341 # TODO: safety, remove and allow resettable per-player maps
2342 return 1e99 if $self->{deny_reset};
2343
2344 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2345 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2346
2347 $time + $to
2348}
2349
2350sub should_reset {
2351 my ($self) = @_;
2352
2353 $self->reset_at <= $cf::RUNTIME
2354}
2355
2356sub reset {
2357 my ($self) = @_;
2358
2359 my $lock = cf::lock_acquire "map_data:$self->{path}";
2360
2361 return if $self->players;
2362
2363 cf::trace "resetting map ", $self->path, "\n";
2364
2365 $self->in_memory (cf::MAP_SWAPPED);
2366
2367 # need to save uniques path
2368 unless ($self->{deny_save}) {
2369 my $uniq = $self->uniq_path; utf8::encode $uniq;
2370
2371 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2372 if $uniq;
2373 }
2374
2375 delete $cf::MAP{$self->path};
2202 2376
2203 $self->deactivate; 2377 $self->deactivate;
2204 $_->clear_links_to ($self) for values %cf::MAP; 2378 $_->clear_links_to ($self) for values %cf::MAP;
2205 $self->clear; 2379 $self->clear;
2206}
2207
2208sub reset_at {
2209 my ($self) = @_;
2210
2211 # TODO: safety, remove and allow resettable per-player maps
2212 return 1e99 if $self->{deny_reset};
2213
2214 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2215 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2216
2217 $time + $to
2218}
2219
2220sub should_reset {
2221 my ($self) = @_;
2222
2223 $self->reset_at <= $cf::RUNTIME
2224}
2225
2226sub reset {
2227 my ($self) = @_;
2228
2229 my $lock = cf::lock_acquire "map_data:$self->{path}";
2230
2231 return if $self->players;
2232
2233 warn "resetting map ", $self->path;
2234
2235 $self->in_memory (cf::MAP_SWAPPED);
2236
2237 # need to save uniques path
2238 unless ($self->{deny_save}) {
2239 my $uniq = $self->uniq_path; utf8::encode $uniq;
2240
2241 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2242 if $uniq;
2243 }
2244
2245 delete $cf::MAP{$self->path};
2246
2247 $self->deactivate;
2248 $_->clear_links_to ($self) for values %cf::MAP;
2249 $self->clear;
2250 2380
2251 $self->unlink_save; 2381 $self->unlink_save;
2252 $self->destroy; 2382 $self->destroy;
2253} 2383}
2254 2384
2262 2392
2263 delete $cf::MAP{$self->path}; 2393 delete $cf::MAP{$self->path};
2264 2394
2265 $self->unlink_save; 2395 $self->unlink_save;
2266 2396
2267 bless $self, "cf::map"; 2397 bless $self, "cf::map::wrap";
2268 delete $self->{deny_reset}; 2398 delete $self->{deny_reset};
2269 $self->{deny_save} = 1; 2399 $self->{deny_save} = 1;
2270 $self->reset_timeout (1); 2400 $self->reset_timeout (1);
2271 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2401 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2272 2402
2329 : normalise $_ 2459 : normalise $_
2330 } @{ aio_readdir $UNIQUEDIR or [] } 2460 } @{ aio_readdir $UNIQUEDIR or [] }
2331 ] 2461 ]
2332} 2462}
2333 2463
2464=item cf::map::static_maps
2465
2466Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2467file in the shared directory excluding F</styles> and F</editor>). May
2468block.
2469
2470=cut
2471
2472sub static_maps() {
2473 my @dirs = "";
2474 my @maps;
2475
2476 while (@dirs) {
2477 my $dir = shift @dirs;
2478
2479 next if $dir eq "/styles" || $dir eq "/editor";
2480
2481 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2482 or return;
2483
2484 for (@$files) {
2485 s/\.map$// or next;
2486 utf8::decode $_;
2487 push @maps, "$dir/$_";
2488 }
2489
2490 push @dirs, map "$dir/$_", @$dirs;
2491 }
2492
2493 \@maps
2494}
2495
2334=back 2496=back
2335 2497
2336=head3 cf::object 2498=head3 cf::object
2337 2499
2338=cut 2500=cut
2403 2565
2404our $SAY_CHANNEL = { 2566our $SAY_CHANNEL = {
2405 id => "say", 2567 id => "say",
2406 title => "Map", 2568 title => "Map",
2407 reply => "say ", 2569 reply => "say ",
2408 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2570 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2409}; 2571};
2410 2572
2411our $CHAT_CHANNEL = { 2573our $CHAT_CHANNEL = {
2412 id => "chat", 2574 id => "chat",
2413 title => "Chat", 2575 title => "Chat",
2470 2632
2471Freezes the player and moves him/her to a special map (C<{link}>). 2633Freezes the player and moves him/her to a special map (C<{link}>).
2472 2634
2473The player should be reasonably safe there for short amounts of time (e.g. 2635The player should be reasonably safe there for short amounts of time (e.g.
2474for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2636for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2475though, as the palyer cannot control the character while it is on the link 2637though, as the player cannot control the character while it is on the link
2476map. 2638map.
2477 2639
2478Will never block. 2640Will never block.
2479 2641
2480=item $player_object->leave_link ($map, $x, $y) 2642=item $player_object->leave_link ($map, $x, $y)
2501sub cf::object::player::enter_link { 2663sub cf::object::player::enter_link {
2502 my ($self) = @_; 2664 my ($self) = @_;
2503 2665
2504 $self->deactivate_recursive; 2666 $self->deactivate_recursive;
2505 2667
2668 ++$self->{_link_recursion};
2669
2506 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2670 return if UNIVERSAL::isa $self->map, "ext::map_link";
2507 2671
2508 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2672 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2509 if $self->map && $self->map->{path} ne "{link}"; 2673 if $self->map && $self->map->{path} ne "{link}";
2510 2674
2511 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2675 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2512} 2676}
2513 2677
2514sub cf::object::player::leave_link { 2678sub cf::object::player::leave_link {
2515 my ($self, $map, $x, $y) = @_; 2679 my ($self, $map, $x, $y) = @_;
2516 2680
2533 ($x, $y) = (-1, -1) 2697 ($x, $y) = (-1, -1)
2534 unless (defined $x) && (defined $y); 2698 unless (defined $x) && (defined $y);
2535 2699
2536 # use -1 or undef as default coordinates, not 0, 0 2700 # use -1 or undef as default coordinates, not 0, 0
2537 ($x, $y) = ($map->enter_x, $map->enter_y) 2701 ($x, $y) = ($map->enter_x, $map->enter_y)
2538 if $x <=0 && $y <= 0; 2702 if $x <= 0 && $y <= 0;
2539 2703
2540 $map->load; 2704 $map->load;
2541 $map->load_neighbours; 2705 $map->load_neighbours;
2542 2706
2543 return unless $self->contr->active; 2707 return unless $self->contr->active;
2544 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2545 $self->activate_recursive;
2546 2708
2547 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2709 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2548 $self->enter_map ($map, $x, $y); 2710 if ($self->enter_map ($map, $x, $y)) {
2549} 2711 # entering was successful
2712 delete $self->{_link_recursion};
2713 # only activate afterwards, to support waiting in hooks
2714 $self->activate_recursive;
2715 }
2550 2716
2717}
2718
2551=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2719=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2552 2720
2553Moves the player to the given map-path and coordinates by first freezing 2721Moves the player to the given map-path and coordinates by first freezing
2554her, loading and preparing them map, calling the provided $check callback 2722her, loading and preparing them map, calling the provided $check callback
2555that has to return the map if sucecssful, and then unfreezes the player on 2723that has to return the map if sucecssful, and then unfreezes the player on
2556the new (success) or old (failed) map position. In either case, $done will 2724the new (success) or old (failed) map position. In either case, $done will
2563 2731
2564our $GOTOGEN; 2732our $GOTOGEN;
2565 2733
2566sub cf::object::player::goto { 2734sub cf::object::player::goto {
2567 my ($self, $path, $x, $y, $check, $done) = @_; 2735 my ($self, $path, $x, $y, $check, $done) = @_;
2736
2737 if ($self->{_link_recursion} >= $MAX_LINKS) {
2738 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2739 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2740 ($path, $x, $y) = @$EMERGENCY_POSITION;
2741 }
2568 2742
2569 # do generation counting so two concurrent goto's will be executed in-order 2743 # do generation counting so two concurrent goto's will be executed in-order
2570 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2744 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2571 2745
2572 $self->enter_link; 2746 $self->enter_link;
2596 my $map = eval { 2770 my $map = eval {
2597 my $map = defined $path ? cf::map::find $path : undef; 2771 my $map = defined $path ? cf::map::find $path : undef;
2598 2772
2599 if ($map) { 2773 if ($map) {
2600 $map = $map->customise_for ($self); 2774 $map = $map->customise_for ($self);
2601 $map = $check->($map) if $check && $map; 2775 $map = $check->($map, $x, $y, $self) if $check && $map;
2602 } else { 2776 } else {
2603 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2777 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2604 } 2778 }
2605 2779
2606 $map 2780 $map
2614 if ($gen == $self->{_goto_generation}) { 2788 if ($gen == $self->{_goto_generation}) {
2615 delete $self->{_goto_generation}; 2789 delete $self->{_goto_generation};
2616 $self->leave_link ($map, $x, $y); 2790 $self->leave_link ($map, $x, $y);
2617 } 2791 }
2618 2792
2619 $done->() if $done; 2793 $done->($self) if $done;
2620 })->prio (1); 2794 })->prio (1);
2621} 2795}
2622 2796
2623=item $player_object->enter_exit ($exit_object) 2797=item $player_object->enter_exit ($exit_object)
2624 2798
2717 $self->message ("Something went wrong deep within the deliantra server. " 2891 $self->message ("Something went wrong deep within the deliantra server. "
2718 . "I'll try to bring you back to the map you were before. " 2892 . "I'll try to bring you back to the map you were before. "
2719 . "Please report this to the dungeon master!", 2893 . "Please report this to the dungeon master!",
2720 cf::NDI_UNIQUE | cf::NDI_RED); 2894 cf::NDI_UNIQUE | cf::NDI_RED);
2721 2895
2722 warn "ERROR in enter_exit: $@"; 2896 error "ERROR in enter_exit: $@";
2723 $self->leave_link; 2897 $self->leave_link;
2724 } 2898 }
2725 })->prio (1); 2899 })->prio (1);
2726} 2900}
2727 2901
2739sub cf::client::send_drawinfo { 2913sub cf::client::send_drawinfo {
2740 my ($self, $text, $flags) = @_; 2914 my ($self, $text, $flags) = @_;
2741 2915
2742 utf8::encode $text; 2916 utf8::encode $text;
2743 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2917 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2918}
2919
2920=item $client->send_big_packet ($pkt)
2921
2922Like C<send_packet>, but tries to compress large packets, and fragments
2923them as required.
2924
2925=cut
2926
2927our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2928
2929sub cf::client::send_big_packet {
2930 my ($self, $pkt) = @_;
2931
2932 # try lzf for large packets
2933 $pkt = "lzf " . Compress::LZF::compress $pkt
2934 if 1024 <= length $pkt and $self->{can_lzf};
2935
2936 # split very large packets
2937 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2938 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2939 $pkt = "frag";
2940 }
2941
2942 $self->send_packet ($pkt);
2744} 2943}
2745 2944
2746=item $client->send_msg ($channel, $msg, $color, [extra...]) 2945=item $client->send_msg ($channel, $msg, $color, [extra...])
2747 2946
2748Send a drawinfo or msg packet to the client, formatting the msg for the 2947Send a drawinfo or msg packet to the client, formatting the msg for the
2752 2951
2753=cut 2952=cut
2754 2953
2755# non-persistent channels (usually the info channel) 2954# non-persistent channels (usually the info channel)
2756our %CHANNEL = ( 2955our %CHANNEL = (
2956 "c/motd" => {
2957 id => "infobox",
2958 title => "MOTD",
2959 reply => undef,
2960 tooltip => "The message of the day",
2961 },
2757 "c/identify" => { 2962 "c/identify" => {
2758 id => "infobox", 2963 id => "infobox",
2759 title => "Identify", 2964 title => "Identify",
2760 reply => undef, 2965 reply => undef,
2761 tooltip => "Items recently identified", 2966 tooltip => "Items recently identified",
2763 "c/examine" => { 2968 "c/examine" => {
2764 id => "infobox", 2969 id => "infobox",
2765 title => "Examine", 2970 title => "Examine",
2766 reply => undef, 2971 reply => undef,
2767 tooltip => "Signs and other items you examined", 2972 tooltip => "Signs and other items you examined",
2973 },
2974 "c/shopinfo" => {
2975 id => "infobox",
2976 title => "Shop Info",
2977 reply => undef,
2978 tooltip => "What your bargaining skill tells you about the shop",
2768 }, 2979 },
2769 "c/book" => { 2980 "c/book" => {
2770 id => "infobox", 2981 id => "infobox",
2771 title => "Book", 2982 title => "Book",
2772 reply => undef, 2983 reply => undef,
2788 id => "infobox", 2999 id => "infobox",
2789 title => "Body Parts", 3000 title => "Body Parts",
2790 reply => undef, 3001 reply => undef,
2791 tooltip => "Shows which body parts you posess and are available", 3002 tooltip => "Shows which body parts you posess and are available",
2792 }, 3003 },
3004 "c/statistics" => {
3005 id => "infobox",
3006 title => "Statistics",
3007 reply => undef,
3008 tooltip => "Shows your primary statistics",
3009 },
2793 "c/skills" => { 3010 "c/skills" => {
2794 id => "infobox", 3011 id => "infobox",
2795 title => "Skills", 3012 title => "Skills",
2796 reply => undef, 3013 reply => undef,
2797 tooltip => "Shows your experience per skill and item power", 3014 tooltip => "Shows your experience per skill and item power",
3015 },
3016 "c/shopitems" => {
3017 id => "infobox",
3018 title => "Shop Items",
3019 reply => undef,
3020 tooltip => "Shows the items currently for sale in this shop",
3021 },
3022 "c/resistances" => {
3023 id => "infobox",
3024 title => "Resistances",
3025 reply => undef,
3026 tooltip => "Shows your resistances",
3027 },
3028 "c/pets" => {
3029 id => "infobox",
3030 title => "Pets",
3031 reply => undef,
3032 tooltip => "Shows information abotu your pets/a specific pet",
3033 },
3034 "c/perceiveself" => {
3035 id => "infobox",
3036 title => "Perceive Self",
3037 reply => undef,
3038 tooltip => "You gained detailed knowledge about yourself",
2798 }, 3039 },
2799 "c/uptime" => { 3040 "c/uptime" => {
2800 id => "infobox", 3041 id => "infobox",
2801 title => "Uptime", 3042 title => "Uptime",
2802 reply => undef, 3043 reply => undef,
2812 id => "party", 3053 id => "party",
2813 title => "Party", 3054 title => "Party",
2814 reply => "gsay ", 3055 reply => "gsay ",
2815 tooltip => "Messages and chat related to your party", 3056 tooltip => "Messages and chat related to your party",
2816 }, 3057 },
3058 "c/death" => {
3059 id => "death",
3060 title => "Death",
3061 reply => undef,
3062 tooltip => "Reason for and more info about your most recent death",
3063 },
3064 "c/say" => $SAY_CHANNEL,
3065 "c/chat" => $CHAT_CHANNEL,
2817); 3066);
2818 3067
2819sub cf::client::send_msg { 3068sub cf::client::send_msg {
2820 my ($self, $channel, $msg, $color, @extra) = @_; 3069 my ($self, $channel, $msg, $color, @extra) = @_;
2821 3070
2826 3075
2827 # check predefined channels, for the benefit of C 3076 # check predefined channels, for the benefit of C
2828 if ($CHANNEL{$channel}) { 3077 if ($CHANNEL{$channel}) {
2829 $channel = $CHANNEL{$channel}; 3078 $channel = $CHANNEL{$channel};
2830 3079
2831 $self->ext_msg (channel_info => $channel) 3080 $self->ext_msg (channel_info => $channel);
2832 if $self->can_msg;
2833
2834 $channel = $channel->{id}; 3081 $channel = $channel->{id};
2835 3082
2836 } elsif (ref $channel) { 3083 } elsif (ref $channel) {
2837 # send meta info to client, if not yet sent 3084 # send meta info to client, if not yet sent
2838 unless (exists $self->{channel}{$channel->{id}}) { 3085 unless (exists $self->{channel}{$channel->{id}}) {
2839 $self->{channel}{$channel->{id}} = $channel; 3086 $self->{channel}{$channel->{id}} = $channel;
2840 $self->ext_msg (channel_info => $channel) 3087 $self->ext_msg (channel_info => $channel);
2841 if $self->can_msg;
2842 } 3088 }
2843 3089
2844 $channel = $channel->{id}; 3090 $channel = $channel->{id};
2845 } 3091 }
2846 3092
2847 return unless @extra || length $msg; 3093 return unless @extra || length $msg;
2848 3094
2849 if ($self->can_msg) {
2850 # default colour, mask it out 3095 # default colour, mask it out
2851 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3096 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2852 if $color & cf::NDI_DEF; 3097 if $color & cf::NDI_DEF;
2853 3098
2854 my $pkt = "msg " 3099 my $pkt = "msg "
2855 . $self->{json_coder}->encode ( 3100 . $self->{json_coder}->encode (
2856 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3101 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2857 ); 3102 );
2858 3103
2859 # try lzf for large packets
2860 $pkt = "lzf " . Compress::LZF::compress $pkt
2861 if 1024 <= length $pkt and $self->{can_lzf};
2862
2863 # split very large packets
2864 if (8192 < length $pkt and $self->{can_lzf}) {
2865 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2866 $pkt = "frag";
2867 }
2868
2869 $self->send_packet ($pkt); 3104 $self->send_big_packet ($pkt);
2870 } else {
2871 if ($color >= 0) {
2872 # replace some tags by gcfclient-compatible ones
2873 for ($msg) {
2874 1 while
2875 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2876 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2877 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2878 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2879 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2880 }
2881
2882 $color &= cf::NDI_COLOR_MASK;
2883
2884 utf8::encode $msg;
2885
2886 if (0 && $msg =~ /\[/) {
2887 # COMMAND/INFO
2888 $self->send_packet ("drawextinfo $color 10 8 $msg")
2889 } else {
2890 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2891 $self->send_packet ("drawinfo $color $msg")
2892 }
2893 }
2894 }
2895} 3105}
2896 3106
2897=item $client->ext_msg ($type, @msg) 3107=item $client->ext_msg ($type, @msg)
2898 3108
2899Sends an ext event to the client. 3109Sends an ext event to the client.
2902 3112
2903sub cf::client::ext_msg($$@) { 3113sub cf::client::ext_msg($$@) {
2904 my ($self, $type, @msg) = @_; 3114 my ($self, $type, @msg) = @_;
2905 3115
2906 if ($self->extcmd == 2) { 3116 if ($self->extcmd == 2) {
2907 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3117 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2908 } elsif ($self->extcmd == 1) { # TODO: remove 3118 } elsif ($self->extcmd == 1) { # TODO: remove
2909 push @msg, msgtype => "event_$type"; 3119 push @msg, msgtype => "event_$type";
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3120 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 } 3121 }
2912} 3122}
2913 3123
2914=item $client->ext_reply ($msgid, @msg) 3124=item $client->ext_reply ($msgid, @msg)
2915 3125
2919 3129
2920sub cf::client::ext_reply($$@) { 3130sub cf::client::ext_reply($$@) {
2921 my ($self, $id, @msg) = @_; 3131 my ($self, $id, @msg) = @_;
2922 3132
2923 if ($self->extcmd == 2) { 3133 if ($self->extcmd == 2) {
2924 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3134 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2925 } elsif ($self->extcmd == 1) { 3135 } elsif ($self->extcmd == 1) {
2926 #TODO: version 1, remove 3136 #TODO: version 1, remove
2927 unshift @msg, msgtype => "reply", msgid => $id; 3137 unshift @msg, msgtype => "reply", msgid => $id;
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3138 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2929 } 3139 }
2930} 3140}
2931 3141
2932=item $success = $client->query ($flags, "text", \&cb) 3142=item $success = $client->query ($flags, "text", \&cb)
2933 3143
3004 3214
3005 $ns->ext_reply ($reply, @reply) 3215 $ns->ext_reply ($reply, @reply)
3006 if $reply; 3216 if $reply;
3007 3217
3008 } else { 3218 } else {
3009 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3219 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3010 } 3220 }
3011 3221
3012 cf::override; 3222 cf::override;
3013 }, 3223 },
3014); 3224);
3034 3244
3035 $coro 3245 $coro
3036} 3246}
3037 3247
3038cf::client->attach ( 3248cf::client->attach (
3039 on_destroy => sub { 3249 on_client_destroy => sub {
3040 my ($ns) = @_; 3250 my ($ns) = @_;
3041 3251
3042 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3252 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3043 }, 3253 },
3044); 3254);
3060our $safe_hole = new Safe::Hole; 3270our $safe_hole = new Safe::Hole;
3061 3271
3062$SIG{FPE} = 'IGNORE'; 3272$SIG{FPE} = 'IGNORE';
3063 3273
3064$safe->permit_only (Opcode::opset qw( 3274$safe->permit_only (Opcode::opset qw(
3065 :base_core :base_mem :base_orig :base_math 3275 :base_core :base_mem :base_orig :base_math :base_loop
3066 grepstart grepwhile mapstart mapwhile 3276 grepstart grepwhile mapstart mapwhile
3067 sort time 3277 sort time
3068)); 3278));
3069 3279
3070# here we export the classes and methods available to script code 3280# here we export the classes and methods available to script code
3074The following functions and methods are available within a safe environment: 3284The following functions and methods are available within a safe environment:
3075 3285
3076 cf::object 3286 cf::object
3077 contr pay_amount pay_player map x y force_find force_add destroy 3287 contr pay_amount pay_player map x y force_find force_add destroy
3078 insert remove name archname title slaying race decrease split 3288 insert remove name archname title slaying race decrease split
3289 value
3079 3290
3080 cf::object::player 3291 cf::object::player
3081 player 3292 player
3082 3293
3083 cf::player 3294 cf::player
3089=cut 3300=cut
3090 3301
3091for ( 3302for (
3092 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3303 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3093 insert remove inv nrof name archname title slaying race 3304 insert remove inv nrof name archname title slaying race
3094 decrease split destroy change_exp)], 3305 decrease split destroy change_exp value msg lore send_msg)],
3095 ["cf::object::player" => qw(player)], 3306 ["cf::object::player" => qw(player)],
3096 ["cf::player" => qw(peaceful)], 3307 ["cf::player" => qw(peaceful send_msg)],
3097 ["cf::map" => qw(trigger)], 3308 ["cf::map" => qw(trigger)],
3098) { 3309) {
3099 no strict 'refs';
3100 my ($pkg, @funs) = @$_; 3310 my ($pkg, @funs) = @$_;
3101 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3311 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3102 for @funs; 3312 for @funs;
3103} 3313}
3104 3314
3119 3329
3120 my $qcode = $code; 3330 my $qcode = $code;
3121 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3331 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3122 $qcode =~ s/\n/\\n/g; 3332 $qcode =~ s/\n/\\n/g;
3123 3333
3334 %vars = (_dummy => 0) unless %vars;
3335
3336 my @res;
3124 local $_; 3337 local $_;
3125 local @safe::cf::_safe_eval_args = values %vars;
3126 3338
3127 my $eval = 3339 my $eval =
3128 "do {\n" 3340 "do {\n"
3129 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3341 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3130 . "#line 0 \"{$qcode}\"\n" 3342 . "#line 0 \"{$qcode}\"\n"
3131 . $code 3343 . $code
3132 . "\n}" 3344 . "\n}"
3133 ; 3345 ;
3134 3346
3347 if ($CFG{safe_eval}) {
3135 sub_generation_inc; 3348 sub_generation_inc;
3349 local @safe::cf::_safe_eval_args = values %vars;
3136 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3350 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3137 sub_generation_inc; 3351 sub_generation_inc;
3352 } else {
3353 local @cf::_safe_eval_args = values %vars;
3354 @res = wantarray ? eval eval : scalar eval $eval;
3355 }
3138 3356
3139 if ($@) { 3357 if ($@) {
3140 warn "$@"; 3358 warn "$@",
3141 warn "while executing safe code '$code'\n"; 3359 "while executing safe code '$code'\n",
3142 warn "with arguments " . (join " ", %vars) . "\n"; 3360 "with arguments " . (join " ", %vars) . "\n";
3143 } 3361 }
3144 3362
3145 wantarray ? @res : $res[0] 3363 wantarray ? @res : $res[0]
3146} 3364}
3147 3365
3161=cut 3379=cut
3162 3380
3163sub register_script_function { 3381sub register_script_function {
3164 my ($fun, $cb) = @_; 3382 my ($fun, $cb) = @_;
3165 3383
3166 no strict 'refs'; 3384 $fun = "safe::$fun" if $CFG{safe_eval};
3167 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3385 *$fun = $safe_hole->wrap ($cb);
3168} 3386}
3169 3387
3170=back 3388=back
3171 3389
3172=cut 3390=cut
3181 # for this (global event?) 3399 # for this (global event?)
3182 %ext::player_env::MUSIC_FACE_CACHE = (); 3400 %ext::player_env::MUSIC_FACE_CACHE = ();
3183 3401
3184 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3402 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3185 3403
3186 warn "loading facedata from $path\n"; 3404 trace "loading facedata from $path\n";
3187 3405
3188 my $facedata;
3189 0 < aio_load $path, $facedata 3406 0 < aio_load $path, my $facedata
3190 or die "$path: $!"; 3407 or die "$path: $!";
3191 3408
3192 $facedata = Coro::Storable::thaw $facedata; 3409 $facedata = Coro::Storable::thaw $facedata;
3193 3410
3194 $facedata->{version} == 2 3411 $facedata->{version} == 2
3195 or cf::cleanup "$path: version mismatch, cannot proceed."; 3412 or cf::cleanup "$path: version mismatch, cannot proceed.";
3196 3413
3197 # patch in the exptable 3414 # patch in the exptable
3415 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3198 $facedata->{resource}{"res/exp_table"} = { 3416 $facedata->{resource}{"res/exp_table"} = {
3199 type => FT_RSRC, 3417 type => FT_RSRC,
3200 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3418 data => $exp_table,
3419 hash => (Digest::MD5::md5 $exp_table),
3201 }; 3420 };
3202 cf::cede_to_tick; 3421 cf::cede_to_tick;
3203 3422
3204 { 3423 {
3205 my $faces = $facedata->{faceinfo}; 3424 my $faces = $facedata->{faceinfo};
3207 while (my ($face, $info) = each %$faces) { 3426 while (my ($face, $info) = each %$faces) {
3208 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3427 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3209 3428
3210 cf::face::set_visibility $idx, $info->{visibility}; 3429 cf::face::set_visibility $idx, $info->{visibility};
3211 cf::face::set_magicmap $idx, $info->{magicmap}; 3430 cf::face::set_magicmap $idx, $info->{magicmap};
3212 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3431 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3213 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3432 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3433 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3214 3434
3215 cf::cede_to_tick; 3435 cf::cede_to_tick;
3216 } 3436 }
3217 3437
3218 while (my ($face, $info) = each %$faces) { 3438 while (my ($face, $info) = each %$faces) {
3223 3443
3224 if (my $smooth = cf::face::find $info->{smooth}) { 3444 if (my $smooth = cf::face::find $info->{smooth}) {
3225 cf::face::set_smooth $idx, $smooth; 3445 cf::face::set_smooth $idx, $smooth;
3226 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3446 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3227 } else { 3447 } else {
3228 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3448 error "smooth face '$info->{smooth}' not found for face '$face'";
3229 } 3449 }
3230 3450
3231 cf::cede_to_tick; 3451 cf::cede_to_tick;
3232 } 3452 }
3233 } 3453 }
3242 3462
3243 cf::anim::invalidate_all; # d'oh 3463 cf::anim::invalidate_all; # d'oh
3244 } 3464 }
3245 3465
3246 { 3466 {
3247 # TODO: for gcfclient pleasure, we should give resources
3248 # that gcfclient doesn't grok a >10000 face index.
3249 my $res = $facedata->{resource}; 3467 my $res = $facedata->{resource};
3250 3468
3251 while (my ($name, $info) = each %$res) { 3469 while (my ($name, $info) = each %$res) {
3252 if (defined $info->{type}) { 3470 if (defined $info->{type}) {
3253 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3471 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3254 my $data;
3255 3472
3256 if ($info->{type} & 1) { 3473 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3257 # prepend meta info
3258
3259 my $meta = $enc->encode ({
3260 name => $name,
3261 %{ $info->{meta} || {} },
3262 });
3263
3264 $data = pack "(w/a*)*", $meta, $info->{data};
3265 } else {
3266 $data = $info->{data};
3267 }
3268
3269 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3270 cf::face::set_type $idx, $info->{type}; 3474 cf::face::set_type $idx, $info->{type};
3271 } else { 3475 } else {
3272 $RESOURCE{$name} = $info; 3476 $RESOURCE{$name} = $info; # unused
3273 } 3477 }
3274 3478
3275 cf::cede_to_tick; 3479 cf::cede_to_tick;
3276 } 3480 }
3277 } 3481 }
3278 3482
3279 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3483 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3280 3484
3281 1 3485 1
3282} 3486}
3283
3284cf::global->attach (on_resource_update => sub {
3285 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3286 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3287
3288 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3289 my $sound = $soundconf->{compat}[$_]
3290 or next;
3291
3292 my $face = cf::face::find "sound/$sound->[1]";
3293 cf::sound::set $sound->[0] => $face;
3294 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3295 }
3296
3297 while (my ($k, $v) = each %{$soundconf->{event}}) {
3298 my $face = cf::face::find "sound/$v";
3299 cf::sound::set $k => $face;
3300 }
3301 }
3302});
3303 3487
3304register_exticmd fx_want => sub { 3488register_exticmd fx_want => sub {
3305 my ($ns, $want) = @_; 3489 my ($ns, $want) = @_;
3306 3490
3307 while (my ($k, $v) = each %$want) { 3491 while (my ($k, $v) = each %$want) {
3346sub reload_treasures { 3530sub reload_treasures {
3347 load_resource_file "$DATADIR/treasures" 3531 load_resource_file "$DATADIR/treasures"
3348 or die "unable to load treasurelists\n"; 3532 or die "unable to load treasurelists\n";
3349} 3533}
3350 3534
3535sub reload_sound {
3536 trace "loading sound config from $DATADIR/sound\n";
3537
3538 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3539 or die "$DATADIR/sound $!";
3540
3541 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3542
3543 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3544 my $sound = $soundconf->{compat}[$_]
3545 or next;
3546
3547 my $face = cf::face::find "sound/$sound->[1]";
3548 cf::sound::set $sound->[0] => $face;
3549 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3550 }
3551
3552 while (my ($k, $v) = each %{$soundconf->{event}}) {
3553 my $face = cf::face::find "sound/$v";
3554 cf::sound::set $k => $face;
3555 }
3556}
3557
3351sub reload_resources { 3558sub reload_resources {
3352 warn "reloading resource files...\n"; 3559 trace "reloading resource files...\n";
3353 3560
3561 reload_exp_table;
3562 reload_materials;
3354 reload_facedata; 3563 reload_facedata;
3564 reload_sound;
3355 reload_archetypes; 3565 reload_archetypes;
3356 reload_regions; 3566 reload_regions;
3357 reload_treasures; 3567 reload_treasures;
3358 3568
3359 warn "finished reloading resource files\n"; 3569 trace "finished reloading resource files\n";
3360} 3570}
3361 3571
3362sub reload_config { 3572sub reload_config {
3363 open my $fh, "<:utf8", "$CONFDIR/config" 3573 trace "reloading config file...\n";
3364 or return;
3365 3574
3366 local $/; 3575 0 < aio_load "$CONFDIR/config", my $config
3367 *CFG = YAML::Load <$fh>; 3576 or die "$CONFDIR/config: $!";
3368 3577
3578 utf8::decode $config;
3579 *CFG = yaml_load $config;
3580
3369 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3581 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3370 3582
3371 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3583 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3372 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3584 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3373 3585
3374 if (exists $CFG{mlockall}) { 3586 if (exists $CFG{mlockall}) {
3397 3609
3398 seek $fh, 0, 0; 3610 seek $fh, 0, 0;
3399 print $fh $$; 3611 print $fh $$;
3400} 3612}
3401 3613
3614sub main_loop {
3615 trace "EV::loop starting\n";
3616 if (1) {
3617 EV::loop;
3618 }
3619 trace "EV::loop returned\n";
3620 goto &main_loop unless $REALLY_UNLOOP;
3621}
3622
3402sub main { 3623sub main {
3403 cf::init_globals; # initialise logging 3624 cf::init_globals; # initialise logging
3404 3625
3405 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3626 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3406 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3627 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3407 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3628 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3408 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3629 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3409
3410 cf::init_experience;
3411 cf::init_anim;
3412 cf::init_attackmess;
3413 cf::init_dynamic;
3414 cf::init_block;
3415 3630
3416 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3631 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3417 3632
3418 # we must not ever block the main coroutine 3633 # we must not ever block the main coroutine
3419 local $Coro::idle = sub { 3634 local $Coro::idle = sub {
3425 }; 3640 };
3426 3641
3427 evthread_start IO::AIO::poll_fileno; 3642 evthread_start IO::AIO::poll_fileno;
3428 3643
3429 cf::sync_job { 3644 cf::sync_job {
3645 cf::incloader::init ();
3646
3647 cf::init_anim;
3648 cf::init_attackmess;
3649 cf::init_dynamic;
3650
3651 cf::load_settings;
3652
3430 reload_resources; 3653 reload_resources;
3431 reload_config; 3654 reload_config;
3432 db_init; 3655 db_init;
3433 3656
3434 cf::load_settings;
3435 cf::load_materials;
3436 cf::init_uuid; 3657 cf::init_uuid;
3437 cf::init_signals; 3658 cf::init_signals;
3438 cf::init_commands;
3439 cf::init_skills; 3659 cf::init_skills;
3440 3660
3441 cf::init_beforeplay; 3661 cf::init_beforeplay;
3442 3662
3443 atomic; 3663 atomic;
3445 load_extensions; 3665 load_extensions;
3446 3666
3447 utime time, time, $RUNTIMEFILE; 3667 utime time, time, $RUNTIMEFILE;
3448 3668
3449 # no (long-running) fork's whatsoever before this point(!) 3669 # no (long-running) fork's whatsoever before this point(!)
3670 use POSIX ();
3450 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3671 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3451 3672
3452 (pop @POST_INIT)->(0) while @POST_INIT; 3673 cf::_post_init 0;
3453 }; 3674 };
3454 3675
3455 EV::loop; 3676 cf::object::thawer::errors_are_fatal 0;
3677 info "parse errors in files are no longer fatal from this point on.\n";
3678
3679 my $free_main; $free_main = EV::idle sub {
3680 undef $free_main;
3681 undef &main; # free gobs of memory :)
3682 };
3683
3684 goto &main_loop;
3456} 3685}
3457 3686
3458############################################################################# 3687#############################################################################
3459# initialisation and cleanup 3688# initialisation and cleanup
3460 3689
3461# install some emergency cleanup handlers 3690# install some emergency cleanup handlers
3462BEGIN { 3691BEGIN {
3463 our %SIGWATCHER = (); 3692 our %SIGWATCHER = ();
3464 for my $signal (qw(INT HUP TERM)) { 3693 for my $signal (qw(INT HUP TERM)) {
3465 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3694 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3466 cf::cleanup "SIG$signal"; 3695 cf::cleanup "SIG$signal";
3467 }; 3696 };
3468 } 3697 }
3469} 3698}
3470 3699
3471sub write_runtime_sync { 3700sub write_runtime_sync {
3701 my $t0 = AE::time;
3702
3472 # first touch the runtime file to show we are still running: 3703 # first touch the runtime file to show we are still running:
3473 # the fsync below can take a very very long time. 3704 # the fsync below can take a very very long time.
3474 3705
3475 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3706 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3476 3707
3477 my $guard = cf::lock_acquire "write_runtime"; 3708 my $guard = cf::lock_acquire "write_runtime";
3478 3709
3479 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3710 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3480 or return; 3711 or return;
3481 3712
3482 my $value = $cf::RUNTIME + 90 + 10; 3713 my $value = $cf::RUNTIME + 90 + 10;
3483 # 10 is the runtime save interval, for a monotonic clock 3714 # 10 is the runtime save interval, for a monotonic clock
3484 # 60 allows for the watchdog to kill the server. 3715 # 60 allows for the watchdog to kill the server.
3497 or return; 3728 or return;
3498 3729
3499 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3730 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3500 and return; 3731 and return;
3501 3732
3502 warn "runtime file written.\n"; 3733 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3503 3734
3504 1 3735 1
3505} 3736}
3506 3737
3507our $uuid_lock; 3738our $uuid_lock;
3519 or return; 3750 or return;
3520 3751
3521 my $value = uuid_seq uuid_cur; 3752 my $value = uuid_seq uuid_cur;
3522 3753
3523 unless ($value) { 3754 unless ($value) {
3524 warn "cowardly refusing to write zero uuid value!\n"; 3755 info "cowardly refusing to write zero uuid value!\n";
3525 return; 3756 return;
3526 } 3757 }
3527 3758
3528 my $value = uuid_str $value + $uuid_skip; 3759 my $value = uuid_str $value + $uuid_skip;
3529 $uuid_skip = 0; 3760 $uuid_skip = 0;
3539 or return; 3770 or return;
3540 3771
3541 aio_rename "$uuid~", $uuid 3772 aio_rename "$uuid~", $uuid
3542 and return; 3773 and return;
3543 3774
3544 warn "uuid file written ($value).\n"; 3775 trace "uuid file written ($value).\n";
3545 3776
3546 1 3777 1
3547 3778
3548} 3779}
3549 3780
3555} 3786}
3556 3787
3557sub emergency_save() { 3788sub emergency_save() {
3558 my $freeze_guard = cf::freeze_mainloop; 3789 my $freeze_guard = cf::freeze_mainloop;
3559 3790
3560 warn "enter emergency perl save\n"; 3791 info "emergency_perl_save: enter\n";
3792
3793 # this is a trade-off: we want to be very quick here, so
3794 # save all maps without fsync, and later call a global sync
3795 # (which in turn might be very very slow)
3796 local $USE_FSYNC = 0;
3561 3797
3562 cf::sync_job { 3798 cf::sync_job {
3799 cf::write_runtime_sync; # external watchdog should not bark
3800
3563 # use a peculiar iteration method to avoid tripping on perl 3801 # use a peculiar iteration method to avoid tripping on perl
3564 # refcount bugs in for. also avoids problems with players 3802 # refcount bugs in for. also avoids problems with players
3565 # and maps saved/destroyed asynchronously. 3803 # and maps saved/destroyed asynchronously.
3566 warn "begin emergency player save\n"; 3804 info "emergency_perl_save: begin player save\n";
3567 for my $login (keys %cf::PLAYER) { 3805 for my $login (keys %cf::PLAYER) {
3568 my $pl = $cf::PLAYER{$login} or next; 3806 my $pl = $cf::PLAYER{$login} or next;
3569 $pl->valid or next; 3807 $pl->valid or next;
3570 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3808 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3571 $pl->save; 3809 $pl->save;
3572 } 3810 }
3573 warn "end emergency player save\n"; 3811 info "emergency_perl_save: end player save\n";
3574 3812
3575 warn "begin emergency map save\n"; 3813 cf::write_runtime_sync; # external watchdog should not bark
3814
3815 info "emergency_perl_save: begin map save\n";
3576 for my $path (keys %cf::MAP) { 3816 for my $path (keys %cf::MAP) {
3577 my $map = $cf::MAP{$path} or next; 3817 my $map = $cf::MAP{$path} or next;
3578 $map->valid or next; 3818 $map->valid or next;
3579 $map->save; 3819 $map->save;
3580 } 3820 }
3581 warn "end emergency map save\n"; 3821 info "emergency_perl_save: end map save\n";
3582 3822
3583 warn "begin emergency database checkpoint\n"; 3823 cf::write_runtime_sync; # external watchdog should not bark
3824
3825 info "emergency_perl_save: begin database checkpoint\n";
3584 BDB::db_env_txn_checkpoint $DB_ENV; 3826 BDB::db_env_txn_checkpoint $DB_ENV;
3585 warn "end emergency database checkpoint\n"; 3827 info "emergency_perl_save: end database checkpoint\n";
3586 3828
3587 warn "begin write uuid\n"; 3829 info "emergency_perl_save: begin write uuid\n";
3588 write_uuid_sync 1; 3830 write_uuid_sync 1;
3589 warn "end write uuid\n"; 3831 info "emergency_perl_save: end write uuid\n";
3832
3833 cf::write_runtime_sync; # external watchdog should not bark
3834
3835 trace "emergency_perl_save: syncing database to disk";
3836 BDB::db_env_txn_checkpoint $DB_ENV;
3837
3838 info "emergency_perl_save: starting sync\n";
3839 IO::AIO::aio_sync sub {
3840 info "emergency_perl_save: finished sync\n";
3841 };
3842
3843 cf::write_runtime_sync; # external watchdog should not bark
3844
3845 trace "emergency_perl_save: flushing outstanding aio requests";
3846 while (IO::AIO::nreqs || BDB::nreqs) {
3847 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3848 }
3849
3850 cf::write_runtime_sync; # external watchdog should not bark
3590 }; 3851 };
3591 3852
3592 warn "leave emergency perl save\n"; 3853 info "emergency_perl_save: leave\n";
3593} 3854}
3594 3855
3595sub post_cleanup { 3856sub post_cleanup {
3596 my ($make_core) = @_; 3857 my ($make_core) = @_;
3597 3858
3859 IO::AIO::flush;
3860
3598 warn Carp::longmess "post_cleanup backtrace" 3861 error Carp::longmess "post_cleanup backtrace"
3599 if $make_core; 3862 if $make_core;
3600 3863
3601 my $fh = pidfile; 3864 my $fh = pidfile;
3602 unlink $PIDFILE if <$fh> == $$; 3865 unlink $PIDFILE if <$fh> == $$;
3603} 3866}
3623 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3886 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3624 for my $name (keys %$leaf_symtab) { 3887 for my $name (keys %$leaf_symtab) {
3625 _gv_clear *{"$pkg$name"}; 3888 _gv_clear *{"$pkg$name"};
3626# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3889# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3627 } 3890 }
3628 warn "cleared package $pkg\n";#d#
3629} 3891}
3630 3892
3631sub do_reload_perl() { 3893sub do_reload_perl() {
3632 # can/must only be called in main 3894 # can/must only be called in main
3633 if ($Coro::current != $Coro::main) { 3895 unless (in_main) {
3634 warn "can only reload from main coroutine"; 3896 error "can only reload from main coroutine";
3635 return; 3897 return;
3636 } 3898 }
3637 3899
3638 return if $RELOAD++; 3900 return if $RELOAD++;
3639 3901
3902 my $t1 = AE::time;
3903
3640 while ($RELOAD) { 3904 while ($RELOAD) {
3641 warn "reloading..."; 3905 cf::get_slot 0.1, -1, "reload_perl";
3906 info "perl_reload: reloading...";
3642 3907
3643 warn "entering sync_job"; 3908 trace "perl_reload: entering sync_job";
3644 3909
3645 cf::sync_job { 3910 cf::sync_job {
3646 cf::write_runtime_sync; # external watchdog should not bark
3647 cf::emergency_save; 3911 #cf::emergency_save;
3648 cf::write_runtime_sync; # external watchdog should not bark
3649 3912
3650 warn "syncing database to disk";
3651 BDB::db_env_txn_checkpoint $DB_ENV;
3652
3653 # if anything goes wrong in here, we should simply crash as we already saved
3654
3655 warn "flushing outstanding aio requests";
3656 while (IO::AIO::nreqs || BDB::nreqs) {
3657 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3658 }
3659
3660 warn "cancelling all extension coros"; 3913 trace "perl_reload: cancelling all extension coros";
3661 $_->cancel for values %EXT_CORO; 3914 $_->cancel for values %EXT_CORO;
3662 %EXT_CORO = (); 3915 %EXT_CORO = ();
3663 3916
3664 warn "removing commands"; 3917 trace "perl_reload: removing commands";
3665 %COMMAND = (); 3918 %COMMAND = ();
3666 3919
3667 warn "removing ext/exti commands"; 3920 trace "perl_reload: removing ext/exti commands";
3668 %EXTCMD = (); 3921 %EXTCMD = ();
3669 %EXTICMD = (); 3922 %EXTICMD = ();
3670 3923
3671 warn "unloading/nuking all extensions"; 3924 trace "perl_reload: unloading/nuking all extensions";
3672 for my $pkg (@EXTS) { 3925 for my $pkg (@EXTS) {
3673 warn "... unloading $pkg"; 3926 trace "... unloading $pkg";
3674 3927
3675 if (my $cb = $pkg->can ("unload")) { 3928 if (my $cb = $pkg->can ("unload")) {
3676 eval { 3929 eval {
3677 $cb->($pkg); 3930 $cb->($pkg);
3678 1 3931 1
3679 } or warn "$pkg unloaded, but with errors: $@"; 3932 } or error "$pkg unloaded, but with errors: $@";
3680 } 3933 }
3681 3934
3682 warn "... clearing $pkg"; 3935 trace "... clearing $pkg";
3683 clear_package $pkg; 3936 clear_package $pkg;
3684 } 3937 }
3685 3938
3686 warn "unloading all perl modules loaded from $LIBDIR"; 3939 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3687 while (my ($k, $v) = each %INC) { 3940 while (my ($k, $v) = each %INC) {
3688 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3941 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3689 3942
3690 warn "... unloading $k"; 3943 trace "... unloading $k";
3691 delete $INC{$k}; 3944 delete $INC{$k};
3692 3945
3693 $k =~ s/\.pm$//; 3946 $k =~ s/\.pm$//;
3694 $k =~ s/\//::/g; 3947 $k =~ s/\//::/g;
3695 3948
3698 } 3951 }
3699 3952
3700 clear_package $k; 3953 clear_package $k;
3701 } 3954 }
3702 3955
3703 warn "getting rid of safe::, as good as possible"; 3956 trace "perl_reload: getting rid of safe::, as good as possible";
3704 clear_package "safe::$_" 3957 clear_package "safe::$_"
3705 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3958 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3706 3959
3707 warn "unloading cf.pm \"a bit\""; 3960 trace "perl_reload: unloading cf.pm \"a bit\"";
3708 delete $INC{"cf.pm"}; 3961 delete $INC{"cf.pm"};
3709 delete $INC{"cf/pod.pm"}; 3962 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3710 3963
3711 # don't, removes xs symbols, too, 3964 # don't, removes xs symbols, too,
3712 # and global variables created in xs 3965 # and global variables created in xs
3713 #clear_package __PACKAGE__; 3966 #clear_package __PACKAGE__;
3714 3967
3715 warn "unload completed, starting to reload now"; 3968 info "perl_reload: unload completed, starting to reload now";
3716 3969
3717 warn "reloading cf.pm"; 3970 trace "perl_reload: reloading cf.pm";
3718 require cf; 3971 require cf;
3719 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3972 cf::_connect_to_perl_1;
3720 3973
3721 warn "loading config and database again"; 3974 trace "perl_reload: loading config and database again";
3722 cf::reload_config; 3975 cf::reload_config;
3723 3976
3724 warn "loading extensions"; 3977 trace "perl_reload: loading extensions";
3725 cf::load_extensions; 3978 cf::load_extensions;
3726 3979
3980 if ($REATTACH_ON_RELOAD) {
3727 warn "reattaching attachments to objects/players"; 3981 trace "perl_reload: reattaching attachments to objects/players";
3728 _global_reattach; # objects, sockets 3982 _global_reattach; # objects, sockets
3729 warn "reattaching attachments to maps"; 3983 trace "perl_reload: reattaching attachments to maps";
3730 reattach $_ for values %MAP; 3984 reattach $_ for values %MAP;
3731 warn "reattaching attachments to players"; 3985 trace "perl_reload: reattaching attachments to players";
3732 reattach $_ for values %PLAYER; 3986 reattach $_ for values %PLAYER;
3987 }
3733 3988
3734 warn "running post_load"; 3989 cf::_post_init 1;
3735 (pop @POST_INIT)->(1) while @POST_INIT;
3736 3990
3737 warn "leaving sync_job"; 3991 trace "perl_reload: leaving sync_job";
3738 3992
3739 1 3993 1
3740 } or do { 3994 } or do {
3741 warn $@; 3995 error $@;
3742 cf::cleanup "error while reloading, exiting."; 3996 cf::cleanup "perl_reload: error, exiting.";
3743 }; 3997 };
3744 3998
3745 warn "reloaded";
3746 --$RELOAD; 3999 --$RELOAD;
3747 } 4000 }
4001
4002 $t1 = AE::time - $t1;
4003 info "perl_reload: completed in ${t1}s\n";
3748}; 4004};
3749 4005
3750our $RELOAD_WATCHER; # used only during reload 4006our $RELOAD_WATCHER; # used only during reload
3751 4007
3752sub reload_perl() { 4008sub reload_perl() {
3753 # doing reload synchronously and two reloads happen back-to-back, 4009 # doing reload synchronously and two reloads happen back-to-back,
3754 # coro crashes during coro_state_free->destroy here. 4010 # coro crashes during coro_state_free->destroy here.
3755 4011
4012 $RELOAD_WATCHER ||= cf::async {
4013 Coro::AIO::aio_wait cache_extensions;
4014
3756 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 4015 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3757 do_reload_perl; 4016 do_reload_perl;
3758 undef $RELOAD_WATCHER; 4017 undef $RELOAD_WATCHER;
4018 };
3759 }; 4019 };
3760} 4020}
3761 4021
3762register_command "reload" => sub { 4022register_command "reload" => sub {
3763 my ($who, $arg) = @_; 4023 my ($who, $arg) = @_;
3769 reload_perl; 4029 reload_perl;
3770 }; 4030 };
3771 } 4031 }
3772}; 4032};
3773 4033
3774unshift @INC, $LIBDIR; 4034#############################################################################
3775 4035
3776my $bug_warning = 0; 4036my $bug_warning = 0;
3777 4037
3778our @WAIT_FOR_TICK; 4038our @WAIT_FOR_TICK;
3779our @WAIT_FOR_TICK_BEGIN; 4039our @WAIT_FOR_TICK_BEGIN;
3780 4040
3781sub wait_for_tick { 4041sub wait_for_tick() {
3782 return if tick_inhibit || $Coro::current == $Coro::main; 4042 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3783 4043
3784 my $signal = new Coro::Signal; 4044 my $signal = new Coro::Signal;
3785 push @WAIT_FOR_TICK, $signal; 4045 push @WAIT_FOR_TICK, $signal;
3786 $signal->wait; 4046 $signal->wait;
3787} 4047}
3788 4048
3789sub wait_for_tick_begin { 4049sub wait_for_tick_begin() {
3790 return if tick_inhibit || $Coro::current == $Coro::main; 4050 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3791 4051
3792 my $signal = new Coro::Signal; 4052 my $signal = new Coro::Signal;
3793 push @WAIT_FOR_TICK_BEGIN, $signal; 4053 push @WAIT_FOR_TICK_BEGIN, $signal;
3794 $signal->wait; 4054 $signal->wait;
3795} 4055}
3801 return; 4061 return;
3802 } 4062 }
3803 4063
3804 cf::server_tick; # one server iteration 4064 cf::server_tick; # one server iteration
3805 4065
4066 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4067
3806 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4068 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3807 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4069 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3808 Coro::async_pool { 4070 Coro::async_pool {
3809 $Coro::current->{desc} = "runtime saver"; 4071 $Coro::current->{desc} = "runtime saver";
3810 write_runtime_sync 4072 write_runtime_sync
3811 or warn "ERROR: unable to write runtime file: $!"; 4073 or error "ERROR: unable to write runtime file: $!";
3812 }; 4074 };
3813 } 4075 }
3814 4076
3815 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4077 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3816 $sig->send; 4078 $sig->send;
3824 4086
3825 if (0) { 4087 if (0) {
3826 if ($NEXT_TICK) { 4088 if ($NEXT_TICK) {
3827 my $jitter = $TICK_START - $NEXT_TICK; 4089 my $jitter = $TICK_START - $NEXT_TICK;
3828 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4090 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3829 warn "jitter $JITTER\n";#d# 4091 debug "jitter $JITTER\n";#d#
3830 } 4092 }
3831 } 4093 }
3832} 4094}
3833 4095
3834{ 4096{
3835 # configure BDB 4097 # configure BDB
3836 4098
3837 BDB::min_parallel 8; 4099 BDB::min_parallel 16;
3838 BDB::max_poll_reqs $TICK * 0.1; 4100 BDB::max_poll_reqs $TICK * 0.1;
3839 $AnyEvent::BDB::WATCHER->priority (1); 4101 $AnyEvent::BDB::WATCHER->priority (1);
3840 4102
3841 unless ($DB_ENV) { 4103 unless ($DB_ENV) {
3842 $DB_ENV = BDB::db_env_create; 4104 $DB_ENV = BDB::db_env_create;
3879 IO::AIO::min_parallel 8; 4141 IO::AIO::min_parallel 8;
3880 IO::AIO::max_poll_time $TICK * 0.1; 4142 IO::AIO::max_poll_time $TICK * 0.1;
3881 undef $AnyEvent::AIO::WATCHER; 4143 undef $AnyEvent::AIO::WATCHER;
3882} 4144}
3883 4145
3884my $_log_backtrace; 4146our $_log_backtrace;
4147our $_log_backtrace_last;
3885 4148
3886sub _log_backtrace { 4149sub _log_backtrace {
3887 my ($msg, @addr) = @_; 4150 my ($msg, @addr) = @_;
3888 4151
3889 $msg =~ s/\n//; 4152 $msg =~ s/\n$//;
3890 4153
4154 if ($_log_backtrace_last eq $msg) {
4155 LOG llevInfo, "[ABT] $msg\n";
4156 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3891 # limit the # of concurrent backtraces 4157 # limit the # of concurrent backtraces
3892 if ($_log_backtrace < 2) { 4158 } elsif ($_log_backtrace < 2) {
4159 $_log_backtrace_last = $msg;
3893 ++$_log_backtrace; 4160 ++$_log_backtrace;
3894 my $perl_bt = Carp::longmess $msg; 4161 my $perl_bt = Carp::longmess $msg;
3895 async { 4162 async {
3896 $Coro::current->{desc} = "abt $msg"; 4163 $Coro::current->{desc} = "abt $msg";
3897 4164
3917 LOG llevInfo, "[ABT] $_\n" for @bt; 4184 LOG llevInfo, "[ABT] $_\n" for @bt;
3918 --$_log_backtrace; 4185 --$_log_backtrace;
3919 }; 4186 };
3920 } else { 4187 } else {
3921 LOG llevInfo, "[ABT] $msg\n"; 4188 LOG llevInfo, "[ABT] $msg\n";
3922 LOG llevInfo, "[ABT] [suppressed]\n"; 4189 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3923 } 4190 }
3924} 4191}
3925 4192
3926# load additional modules 4193# load additional modules
3927use cf::pod; 4194require "cf/$_.pm" for @EXTRA_MODULES;
4195cf::_connect_to_perl_2;
3928 4196
3929END { cf::emergency_save } 4197END { cf::emergency_save }
3930 4198
39311 41991
3932 4200

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines