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.458 by root, Sat Dec 13 20:34:37 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 Guard ();
38use Coro (); 38use Coro ();
39use Coro::State; 39use Coro::State;
40use Coro::Handle; 40use Coro::Handle;
41use Coro::EV; 41use Coro::EV;
42use Coro::AnyEvent; 42use Coro::AnyEvent;
43use Coro::Timer; 43use Coro::Timer;
44use Coro::Signal; 44use Coro::Signal;
45use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
46use Coro::AnyEvent; 47use Coro::AnyEvent;
47use Coro::AIO; 48use Coro::AIO;
48use Coro::BDB 1.6; 49use Coro::BDB 1.6;
49use Coro::Storable; 50use Coro::Storable;
50use Coro::Util (); 51use Coro::Util ();
51 52
52use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
53use BDB (); 54use BDB ();
54use Data::Dumper; 55use Data::Dumper;
55use Digest::MD5;
56use Fcntl; 56use Fcntl;
57use YAML (); 57use YAML::XS ();
58use IO::AIO (); 58use IO::AIO ();
59use Time::HiRes; 59use Time::HiRes;
60use Compress::LZF; 60use Compress::LZF;
61use Digest::MD5 (); 61use Digest::MD5 ();
62 62
71 71
72# make sure c-lzf reinitialises itself 72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
74Compress::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
75 75
76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
78
76sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
77 82
78our %COMMAND = (); 83our %COMMAND = ();
79our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
80 85
81our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
84our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
85our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
86 91
87our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
88our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
89 96
90our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
91our $DATADIR = datadir; 99our $DATADIR = datadir;
92our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
93our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
94our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
95our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
96our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
97our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
98our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
99our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
100our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
101our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
102our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
103 112
104our %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;
105 120
106our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
107our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
108our $NEXT_TICK; 123our $NEXT_TICK;
109our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
110 125
111our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
112our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
113our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
114our $DB_ENV; 129our $DB_ENV;
115 130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
116our %CFG; 133our %CFG;
117 134
118our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
119our $RUNTIME; 136our $RUNTIME;
120our $NOW; 137our $NOW;
131our $JITTER; # average jitter 148our $JITTER; # average jitter
132our $TICK_START; # for load detecting purposes 149our $TICK_START; # for load detecting purposes
133 150
134our @POST_INIT; 151our @POST_INIT;
135 152
136our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 153our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
154our $REALLY_UNLOOP; # never set to true, please :)
137 155
138binmode STDOUT; 156binmode STDOUT;
139binmode STDERR; 157binmode STDERR;
140 158
141# read virtual server time, if available 159# read virtual server time, if available
143 open my $fh, "<", $RUNTIMEFILE 161 open my $fh, "<", $RUNTIMEFILE
144 or die "unable to read $RUNTIMEFILE file: $!"; 162 or die "unable to read $RUNTIMEFILE file: $!";
145 $RUNTIME = <$fh> + 0.; 163 $RUNTIME = <$fh> + 0.;
146} 164}
147 165
166eval "sub TICK() { $TICK } 1" or die;
167
148mkdir $_ 168mkdir $_
149 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 169 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
150 170
151our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
152 172
153sub 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::"} };
154 189
155############################################################################# 190#############################################################################
156 191
157=head2 GLOBAL VARIABLES 192=head2 GLOBAL VARIABLES
158 193
200from wherever your confdir points to. 235from wherever your confdir points to.
201 236
202=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
203 238
204These 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
205returns 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
206per 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.
207 242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
247
208=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
209 249
210This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
211C<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
212that call. 252that call.
213 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
214=back 260=back
215 261
216=cut 262=cut
217 263
218BEGIN { 264sub error(@) { LOG llevError, join "", @_ }
219 *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 {
220 my $msg = join "", @_; 271 my $msg = join "", @_;
221 272
222 $msg .= "\n" 273 $msg .= "\n"
223 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
224 275
225 $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;
226 277
227 LOG llevError, $msg; 278 LOG llevWarn, $msg;
228 }; 279};
229}
230 280
231$Coro::State::DIEHOOK = sub { 281$Coro::State::DIEHOOK = sub {
232 return unless $^S eq 0; # "eq", not "==" 282 return unless $^S eq 0; # "eq", not "=="
233 283
234 if ($Coro::current == $Coro::main) {#d# 284 error Carp::longmess $_[0];
285
286 if (in_main) {#d#
235 warn "DIEHOOK called in main context, Coro bug?\n";#d# 287 error "DIEHOOK called in main context, Coro bug?\n";#d#
236 return;#d# 288 return;#d#
237 }#d# 289 }#d#
238 290
239 # kill coroutine otherwise 291 # kill coroutine otherwise
240 warn Carp::longmess $_[0];
241 Coro::terminate 292 Coro::terminate
242}; 293};
243
244$SIG{__DIE__} = sub { }; #d#?
245 294
246@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 295@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
247@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 296@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
248@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 297@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
249@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 298@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
263)) { 312)) {
264 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
265} 314}
266 315
267$EV::DIED = sub { 316$EV::DIED = sub {
268 warn "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
269}; 318};
270 319
271############################################################################# 320#############################################################################
272 321
273=head2 UTILITY FUNCTIONS 322=head2 UTILITY FUNCTIONS
310our $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
311 360
312sub encode_json($) { $json_coder->encode ($_[0]) } 361sub encode_json($) { $json_coder->encode ($_[0]) }
313sub decode_json($) { $json_coder->decode ($_[0]) } 362sub decode_json($) { $json_coder->decode ($_[0]) }
314 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
315=item cf::post_init { BLOCK } 376=item cf::post_init { BLOCK }
316 377
317Execute the given codeblock, I<after> all extensions have been (re-)loaded, 378Execute the given codeblock, I<after> all extensions have been (re-)loaded,
318but I<before> the server starts ticking again. 379but I<before> the server starts ticking again.
319 380
320The cdoeblock will have a single boolean argument to indicate whether this 381The codeblock will have a single boolean argument to indicate whether this
321is a reload or not. 382is a reload or not.
322 383
323=cut 384=cut
324 385
325sub post_init(&) { 386sub post_init(&) {
326 push @POST_INIT, shift; 387 push @POST_INIT, shift;
388}
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 }
327} 405}
328 406
329=item cf::lock_wait $string 407=item cf::lock_wait $string
330 408
331Wait until the given lock is available. See cf::lock_acquire. 409Wait until the given lock is available. See cf::lock_acquire.
347 425
348Return 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.
349 427
350=cut 428=cut
351 429
352our %LOCK; 430our $LOCKS = new Coro::SemaphoreSet;
353our %LOCKER;#d#
354 431
355sub lock_wait($) { 432sub lock_wait($) {
356 my ($key) = @_; 433 $LOCKS->wait ($_[0]);
357
358 if ($LOCKER{$key} == $Coro::current) {#d#
359 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
360 return;#d#
361 }#d#
362
363 # wait for lock, if any
364 while ($LOCK{$key}) {
365 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
366 push @{ $LOCK{$key} }, $Coro::current;
367 Coro::schedule;
368 }
369} 434}
370 435
371sub lock_acquire($) { 436sub lock_acquire($) {
372 my ($key) = @_; 437 $LOCKS->guard ($_[0])
373
374 # wait, to be sure we are not locked
375 lock_wait $key;
376
377 $LOCK{$key} = [];
378 $LOCKER{$key} = $Coro::current;#d#
379
380 Guard::guard {
381 delete $LOCKER{$key};#d#
382 # wake up all waiters, to be on the safe side
383 $_->ready for @{ delete $LOCK{$key} };
384 }
385} 438}
386 439
387sub lock_active($) { 440sub lock_active($) {
388 my ($key) = @_; 441 $LOCKS->count ($_[0]) < 1
389
390 ! ! $LOCK{$key}
391} 442}
392 443
393sub freeze_mainloop { 444sub freeze_mainloop {
394 tick_inhibit_inc; 445 tick_inhibit_inc;
395 446
397} 448}
398 449
399=item cf::periodic $interval, $cb 450=item cf::periodic $interval, $cb
400 451
401Like 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
402get spread over timer. 453get spread over time.
403 454
404=cut 455=cut
405 456
406sub periodic($$) { 457sub periodic($$) {
407 my ($interval, $cb) = @_; 458 my ($interval, $cb) = @_;
424 475
425=cut 476=cut
426 477
427our @SLOT_QUEUE; 478our @SLOT_QUEUE;
428our $SLOT_QUEUE; 479our $SLOT_QUEUE;
480our $SLOT_DECAY = 0.9;
429 481
430$SLOT_QUEUE->cancel if $SLOT_QUEUE; 482$SLOT_QUEUE->cancel if $SLOT_QUEUE;
431$SLOT_QUEUE = Coro::async { 483$SLOT_QUEUE = Coro::async {
432 $Coro::current->desc ("timeslot manager"); 484 $Coro::current->desc ("timeslot manager");
433 485
434 my $signal = new Coro::Signal; 486 my $signal = new Coro::Signal;
487 my $busy;
435 488
436 while () { 489 while () {
437 next_job: 490 next_job:
491
438 my $avail = cf::till_tick; 492 my $avail = cf::till_tick;
439 if ($avail > 0.01) { 493
440 for (0 .. $#SLOT_QUEUE) { 494 for (0 .. $#SLOT_QUEUE) {
441 if ($SLOT_QUEUE[$_][0] < $avail) { 495 if ($SLOT_QUEUE[$_][0] <= $avail) {
496 $busy = 0;
442 my $job = splice @SLOT_QUEUE, $_, 1, (); 497 my $job = splice @SLOT_QUEUE, $_, 1, ();
443 $job->[2]->send; 498 $job->[2]->send;
444 Coro::cede; 499 Coro::cede;
445 goto next_job; 500 goto next_job;
446 } 501 } else {
502 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
447 } 503 }
448 } 504 }
449 505
450 if (@SLOT_QUEUE) { 506 if (@SLOT_QUEUE) {
451 # 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
452 push @cf::WAIT_FOR_TICK, $signal; 508 push @cf::WAIT_FOR_TICK, $signal;
453 $signal->wait; 509 $signal->wait;
454 } else { 510 } else {
511 $busy = 0;
455 Coro::schedule; 512 Coro::schedule;
456 } 513 }
457 } 514 }
458}; 515};
459 516
460sub get_slot($;$$) { 517sub get_slot($;$$) {
461 return if tick_inhibit || $Coro::current == $Coro::main; 518 return if tick_inhibit || $Coro::current == $Coro::main;
462 519
463 my ($time, $pri, $name) = @_; 520 my ($time, $pri, $name) = @_;
464 521
465 $time = $TICK * .6 if $time > $TICK * .6; 522 $time = clamp $time, 0.01, $TICK * .6;
523
466 my $sig = new Coro::Signal; 524 my $sig = new Coro::Signal;
467 525
468 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 526 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
469 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 527 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
470 $SLOT_QUEUE->ready; 528 $SLOT_QUEUE->ready;
496=cut 554=cut
497 555
498sub sync_job(&) { 556sub sync_job(&) {
499 my ($job) = @_; 557 my ($job) = @_;
500 558
501 if ($Coro::current == $Coro::main) { 559 if (in_main) {
502 my $time = EV::time; 560 my $time = AE::time;
503 561
504 # this is the main coro, too bad, we have to block 562 # this is the main coro, too bad, we have to block
505 # till the operation succeeds, freezing the server :/ 563 # till the operation succeeds, freezing the server :/
506 564
507 LOG llevError, Carp::longmess "sync job";#d# 565 #LOG llevError, Carp::longmess "sync job";#d#
508 566
509 my $freeze_guard = freeze_mainloop; 567 my $freeze_guard = freeze_mainloop;
510 568
511 my $busy = 1; 569 my $busy = 1;
512 my @res; 570 my @res;
513 571
514 (async { 572 (async {
515 $Coro::current->desc ("sync job coro"); 573 $Coro::current->desc ("sync job coro");
516 @res = eval { $job->() }; 574 @res = eval { $job->() };
517 warn $@ if $@; 575 error $@ if $@;
518 undef $busy; 576 undef $busy;
519 })->prio (Coro::PRIO_MAX); 577 })->prio (Coro::PRIO_MAX);
520 578
521 while ($busy) { 579 while ($busy) {
522 if (Coro::nready) { 580 if (Coro::nready) {
524 } else { 582 } else {
525 EV::loop EV::LOOP_ONESHOT; 583 EV::loop EV::LOOP_ONESHOT;
526 } 584 }
527 } 585 }
528 586
529 my $time = EV::time - $time; 587 my $time = AE::time - $time;
530 588
531 $TICK_START += $time; # do not account sync jobs to server load 589 $TICK_START += $time; # do not account sync jobs to server load
532 590
533 wantarray ? @res : $res[0] 591 wantarray ? @res : $res[0]
534 } else { 592 } else {
556 $EXT_CORO{$coro+0} = $coro; 614 $EXT_CORO{$coro+0} = $coro;
557 615
558 $coro 616 $coro
559} 617}
560 618
561=item fork_call { }, $args 619=item fork_call { }, @args
562 620
563Executes the given code block with the given arguments in a seperate 621Executes the given code block with the given arguments in a seperate
564process, returning the results. Everything must be serialisable with 622process, returning the results. Everything must be serialisable with
565Coro::Storable. May, of course, block. Note that the executed sub may 623Coro::Storable. May, of course, block. Note that the executed sub may
566never block itself or use any form of event handling. 624never block itself or use any form of event handling.
567 625
568=cut 626=cut
569 627
628sub post_fork {
629 reset_signals;
630}
631
570sub fork_call(&@) { 632sub fork_call(&@) {
571 my ($cb, @args) = @_; 633 my ($cb, @args) = @_;
572 634
573 # 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,
574 # otherwise perl prematurely frees the stuff :/ 636 # otherwise perl prematurely frees the stuff :/
575 # TODO: investigate and fix (likely this will be rather laborious) 637 # TODO: investigate and fix (likely this will be rather laborious)
576 638
577 my @res = Coro::Util::fork_eval { 639 my @res = Coro::Util::fork_eval {
578 reset_signals; 640 cf::post_fork;
579 &$cb 641 &$cb
580 }, @args; 642 } @args;
581 643
582 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 )
583} 656}
584 657
585=item $coin = coin_from_name $name 658=item $coin = coin_from_name $name
586 659
587=cut 660=cut
624within each server. 697within each server.
625 698
626=cut 699=cut
627 700
628sub db_table($) { 701sub db_table($) {
702 cf::error "db_get called from main context"
703 if $Coro::current == $Coro::main;
704
629 my ($name) = @_; 705 my ($name) = @_;
630 my $db = BDB::db_create $DB_ENV; 706 my $db = BDB::db_create $DB_ENV;
631 707
632 eval { 708 eval {
633 $db->set_flags (BDB::CHKSUM); 709 $db->set_flags (BDB::CHKSUM);
643} 719}
644 720
645our $DB; 721our $DB;
646 722
647sub db_init { 723sub db_init {
648 cf::sync_job {
649 $DB ||= db_table "db"; 724 $DB ||= db_table "db";
650 };
651} 725}
652 726
653sub db_get($$) { 727sub db_get($$) {
654 my $key = "$_[0]/$_[1]"; 728 my $key = "$_[0]/$_[1]";
655 729
656 cf::sync_job { 730 cf::error "db_get called from main context"
731 if $Coro::current == $Coro::main;
732
657 BDB::db_get $DB, undef, $key, my $data; 733 BDB::db_get $DB, undef, $key, my $data;
658 734
659 $! ? () 735 $! ? ()
660 : $data 736 : $data
661 }
662} 737}
663 738
664sub db_put($$$) { 739sub db_put($$$) {
665 BDB::dbreq_pri 4; 740 BDB::dbreq_pri 4;
666 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 741 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
722 797
723 my $t1 = Time::HiRes::time; 798 my $t1 = Time::HiRes::time;
724 my $data = $process->(\@data); 799 my $data = $process->(\@data);
725 my $t2 = Time::HiRes::time; 800 my $t2 = Time::HiRes::time;
726 801
727 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 802 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
728 803
729 db_put cache => "$id/data", $data; 804 db_put cache => "$id/data", $data;
730 db_put cache => "$id/md5" , $md5; 805 db_put cache => "$id/md5" , $md5;
731 db_put cache => "$id/meta", $meta; 806 db_put cache => "$id/meta", $meta;
732 807
742 817
743=cut 818=cut
744 819
745sub datalog($@) { 820sub datalog($@) {
746 my ($type, %kv) = @_; 821 my ($type, %kv) = @_;
747 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 822 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
748} 823}
749 824
750=back 825=back
751 826
752=cut 827=cut
947 1022
948 } elsif (exists $cb_id{$type}) { 1023 } elsif (exists $cb_id{$type}) {
949 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1024 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
950 1025
951 } elsif (ref $type) { 1026 } elsif (ref $type) {
952 warn "attaching objects not supported, ignoring.\n"; 1027 error "attaching objects not supported, ignoring.\n";
953 1028
954 } else { 1029 } else {
955 shift @arg; 1030 shift @arg;
956 warn "attach argument '$type' not supported, ignoring.\n"; 1031 error "attach argument '$type' not supported, ignoring.\n";
957 } 1032 }
958 } 1033 }
959} 1034}
960 1035
961sub _object_attach { 1036sub _object_attach {
971 _attach $registry, $klass, @attach; 1046 _attach $registry, $klass, @attach;
972 } 1047 }
973 1048
974 $obj->{$name} = \%arg; 1049 $obj->{$name} = \%arg;
975 } else { 1050 } else {
976 warn "object uses attachment '$name' which is not available, postponing.\n"; 1051 info "object uses attachment '$name' which is not available, postponing.\n";
977 } 1052 }
978 1053
979 $obj->{_attachment}{$name} = undef; 1054 $obj->{_attachment}{$name} = undef;
980} 1055}
981 1056
1040 1115
1041 for (@$callbacks) { 1116 for (@$callbacks) {
1042 eval { &{$_->[1]} }; 1117 eval { &{$_->[1]} };
1043 1118
1044 if ($@) { 1119 if ($@) {
1045 warn "$@";
1046 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1120 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1047 override; 1121 override;
1048 } 1122 }
1049 1123
1050 return 1 if $override; 1124 return 1 if $override;
1051 } 1125 }
1130 for (@$attach) { 1204 for (@$attach) {
1131 my ($klass, @attach) = @$_; 1205 my ($klass, @attach) = @$_;
1132 _attach $registry, $klass, @attach; 1206 _attach $registry, $klass, @attach;
1133 } 1207 }
1134 } else { 1208 } else {
1135 warn "object uses attachment '$name' that is not available, postponing.\n"; 1209 info "object uses attachment '$name' that is not available, postponing.\n";
1136 } 1210 }
1137 } 1211 }
1138} 1212}
1139 1213
1140cf::attachable->attach ( 1214cf::attachable->attach (
1167 my ($filename, $rdata, $objs) = @_; 1241 my ($filename, $rdata, $objs) = @_;
1168 1242
1169 sync_job { 1243 sync_job {
1170 if (length $$rdata) { 1244 if (length $$rdata) {
1171 utf8::decode (my $decname = $filename); 1245 utf8::decode (my $decname = $filename);
1172 warn sprintf "saving %s (%d,%d)\n", 1246 trace sprintf "saving %s (%d,%d)\n",
1173 $decname, length $$rdata, scalar @$objs; 1247 $decname, length $$rdata, scalar @$objs
1248 if $VERBOSE_IO;
1174 1249
1175 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1250 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1176 aio_chmod $fh, SAVE_MODE; 1251 aio_chmod $fh, SAVE_MODE;
1177 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1252 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1178 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 }
1179 aio_close $fh; 1257 aio_close $fh;
1180 1258
1181 if (@$objs) { 1259 if (@$objs) {
1182 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) {
1183 aio_chmod $fh, SAVE_MODE; 1261 aio_chmod $fh, SAVE_MODE;
1184 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1262 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1185 aio_write $fh, 0, (length $data), $data, 0; 1263 aio_write $fh, 0, (length $data), $data, 0;
1186 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 }
1187 aio_close $fh; 1268 aio_close $fh;
1188 aio_rename "$filename.pst~", "$filename.pst"; 1269 aio_rename "$filename.pst~", "$filename.pst";
1189 } 1270 }
1190 } else { 1271 } else {
1191 aio_unlink "$filename.pst"; 1272 aio_unlink "$filename.pst";
1194 aio_rename "$filename~", $filename; 1275 aio_rename "$filename~", $filename;
1195 1276
1196 $filename =~ s%/[^/]+$%%; 1277 $filename =~ s%/[^/]+$%%;
1197 aio_pathsync $filename if $cf::USE_FSYNC; 1278 aio_pathsync $filename if $cf::USE_FSYNC;
1198 } else { 1279 } else {
1199 warn "FATAL: $filename~: $!\n"; 1280 error "unable to save objects: $filename~: $!\n";
1200 } 1281 }
1201 } else { 1282 } else {
1202 aio_unlink $filename; 1283 aio_unlink $filename;
1203 aio_unlink "$filename.pst"; 1284 aio_unlink "$filename.pst";
1204 } 1285 }
1228 my $st = eval { Coro::Storable::thaw $av }; 1309 my $st = eval { Coro::Storable::thaw $av };
1229 $av = $st->{objs}; 1310 $av = $st->{objs};
1230 } 1311 }
1231 1312
1232 utf8::decode (my $decname = $filename); 1313 utf8::decode (my $decname = $filename);
1233 warn sprintf "loading %s (%d,%d)\n", 1314 trace sprintf "loading %s (%d,%d)\n",
1234 $decname, length $data, scalar @{$av || []}; 1315 $decname, length $data, scalar @{$av || []}
1316 if $VERBOSE_IO;
1235 1317
1236 ($data, $av) 1318 ($data, $av)
1237} 1319}
1238 1320
1239=head2 COMMAND CALLBACKS 1321=head2 COMMAND CALLBACKS
1298} 1380}
1299 1381
1300use File::Glob (); 1382use File::Glob ();
1301 1383
1302cf::player->attach ( 1384cf::player->attach (
1303 on_command => sub { 1385 on_unknown_command => sub {
1304 my ($pl, $name, $params) = @_; 1386 my ($pl, $name, $params) = @_;
1305 1387
1306 my $cb = $COMMAND{$name} 1388 my $cb = $COMMAND{$name}
1307 or return; 1389 or return;
1308 1390
1331 1413
1332 $pl->ext_reply ($reply, @reply) 1414 $pl->ext_reply ($reply, @reply)
1333 if $reply; 1415 if $reply;
1334 1416
1335 } else { 1417 } else {
1336 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1418 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1337 } 1419 }
1338 1420
1339 cf::override; 1421 cf::override;
1340 }, 1422 },
1341); 1423);
1342 1424
1343# "readahead" all extensions 1425# "readahead" all extensions
1344sub cache_extensions { 1426sub cache_extensions {
1345 my $grp = IO::AIO::aio_group; 1427 my $grp = IO::AIO::aio_group;
1346 1428
1347 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1429 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1348 for (grep /\.ext$/, @{$_[0]}) { 1430 for (grep /\.ext$/, @{$_[0]}) {
1349 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1431 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1350 } 1432 }
1351 }; 1433 };
1352 1434
1353 $grp 1435 $grp
1354} 1436}
1355 1437
1356sub load_extensions { 1438sub load_extensions {
1439 info "loading extensions...";
1440
1357 cf::sync_job { 1441 cf::sync_job {
1358 my %todo; 1442 my %todo;
1359 1443
1360 for my $path (<$LIBDIR/*.ext>) { 1444 for my $path (<$LIBDIR/*.ext>) {
1361 next unless -r $path; 1445 next unless -r $path;
1379 1463
1380 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1464 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1381 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1465 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1382 1466
1383 $ext{source} = 1467 $ext{source} =
1384 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1468 "package $pkg; use common::sense;\n"
1385 . "#line 1 \"$path\"\n{\n" 1469 . "#line 1 \"$path\"\n{\n"
1386 . $source 1470 . $source
1387 . "\n};\n1"; 1471 . "\n};\n1";
1388 1472
1389 $todo{$base} = \%ext; 1473 $todo{$base} = \%ext;
1390 } 1474 }
1391 1475
1476 my $pass = 0;
1392 my %done; 1477 my %done;
1393 while (%todo) { 1478 while (%todo) {
1394 my $progress; 1479 my $progress;
1395 1480
1481 ++$pass;
1482
1483 ext:
1396 while (my ($k, $v) = each %todo) { 1484 while (my ($k, $v) = each %todo) {
1397 for (split /,\s*/, $v->{meta}{depends}) { 1485 for (split /,\s*/, $v->{meta}{depends}) {
1398 goto skip 1486 next ext
1399 unless exists $done{$_}; 1487 unless exists $done{$_};
1400 } 1488 }
1401 1489
1402 warn "... loading '$k' into '$v->{pkg}'\n"; 1490 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1403 1491
1404 unless (eval $v->{source}) { 1492 my $active = eval $v->{source};
1493
1494 if (length $@) {
1405 my $msg = $@ ? "$v->{path}: $@\n" 1495 error "$v->{path}: $@\n";
1406 : "$v->{base}: extension inactive.\n";
1407 1496
1408 if (exists $v->{meta}{mandatory}) {
1409 warn $msg;
1410 cf::cleanup "mandatory extension failed to load, exiting."; 1497 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1411 } 1498 if exists $v->{meta}{mandatory};
1412 1499
1413 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;
1414 } 1509 }
1415
1416 $done{$k} = delete $todo{$k};
1417 push @EXTS, $v->{pkg};
1418 $progress = 1;
1419 } 1510 }
1420 1511
1421 skip: 1512 unless ($progress) {
1422 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1513 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1423 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 }
1424 } 1520 }
1425 }; 1521 };
1426} 1522}
1427 1523
1428############################################################################# 1524#############################################################################
1512 $cf::PLAYER{$login} = $pl 1608 $cf::PLAYER{$login} = $pl
1513 } 1609 }
1514 } 1610 }
1515} 1611}
1516 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
1517sub save($) { 1626sub save($) {
1518 my ($pl) = @_; 1627 my ($pl) = @_;
1519 1628
1520 return if $pl->{deny_save}; 1629 return if $pl->{deny_save};
1521 1630
1526 1635
1527 aio_mkdir playerdir $pl, 0770; 1636 aio_mkdir playerdir $pl, 0770;
1528 $pl->{last_save} = $cf::RUNTIME; 1637 $pl->{last_save} = $cf::RUNTIME;
1529 1638
1530 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];
1531 1643
1532 $pl->save_pl ($path); 1644 $pl->save_pl ($path);
1533 cf::cede_to_tick; 1645 cf::cede_to_tick;
1534} 1646}
1535 1647
1569 my $name = $pl->ob->name; 1681 my $name = $pl->ob->name;
1570 1682
1571 $pl->{deny_save} = 1; 1683 $pl->{deny_save} = 1;
1572 $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
1573 1685
1574 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1686 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1575 $pl->deactivate; 1687 $pl->deactivate;
1688
1576 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;
1577 $pl->ob->check_score;
1578 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1690 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1691 ext::highscore::check ($pl->ob);
1692
1579 $pl->ns->destroy if $pl->ns; 1693 $pl->ns->destroy if $pl->ns;
1580 1694
1581 my $path = playerdir $pl; 1695 my $path = playerdir $pl;
1582 my $temp = "$path~$cf::RUNTIME~deleting~"; 1696 my $temp = "$path~$cf::RUNTIME~deleting~";
1583 aio_rename $path, $temp; 1697 aio_rename $path, $temp;
1637 \@logins 1751 \@logins
1638} 1752}
1639 1753
1640=item $player->maps 1754=item $player->maps
1641 1755
1756=item cf::player::maps $login
1757
1642Returns an arrayref of map paths that are private for this 1758Returns an arrayref of map paths that are private for this
1643player. May block. 1759player. May block.
1644 1760
1645=cut 1761=cut
1646 1762
1708=cut 1824=cut
1709 1825
1710sub find_by_path($) { 1826sub find_by_path($) {
1711 my ($path) = @_; 1827 my ($path) = @_;
1712 1828
1829 $path =~ s/^~[^\/]*//; # skip ~login
1830
1713 my ($match, $specificity); 1831 my ($match, $specificity);
1714 1832
1715 for my $region (list) { 1833 for my $region (list) {
1716 if ($region->{match} && $path =~ $region->{match}) { 1834 if ($region->{match} && $path =~ $region->{match}) {
1717 ($match, $specificity) = ($region, $region->specificity) 1835 ($match, $specificity) = ($region, $region->specificity)
1745sub generate_random_map { 1863sub generate_random_map {
1746 my ($self, $rmp) = @_; 1864 my ($self, $rmp) = @_;
1747 1865
1748 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
1749 1867
1750 # mit "rum" bekleckern, nicht
1751 $self->_create_random_map ( 1868 $self->_create_random_map ($rmp);
1752 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1753 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1754 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1755 $rmp->{exit_on_final_map},
1756 $rmp->{xsize}, $rmp->{ysize},
1757 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1758 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1759 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1760 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1761 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1762 (cf::region::find $rmp->{region}), $rmp->{custom}
1763 )
1764} 1869}
1765 1870
1766=item cf::map->register ($regex, $prio) 1871=item cf::map->register ($regex, $prio)
1767 1872
1768Register 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
1773 1878
1774sub register { 1879sub register {
1775 my (undef, $regex, $prio) = @_; 1880 my (undef, $regex, $prio) = @_;
1776 my $pkg = caller; 1881 my $pkg = caller;
1777 1882
1778 no strict;
1779 push @{"$pkg\::ISA"}, __PACKAGE__; 1883 push @{"$pkg\::ISA"}, __PACKAGE__;
1780 1884
1781 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1885 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1782} 1886}
1783 1887
1784# also paths starting with '/' 1888# also paths starting with '/'
1785$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1889$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1786 1890
1787sub thawer_merge { 1891sub thawer_merge {
1788 my ($self, $merge) = @_; 1892 my ($self, $merge) = @_;
1789 1893
1790 # we have to keep some variables in memory intact 1894 # we have to keep some variables in memory intact
1795} 1899}
1796 1900
1797sub normalise { 1901sub normalise {
1798 my ($path, $base) = @_; 1902 my ($path, $base) = @_;
1799 1903
1800 $path = "$path"; # make sure its a string 1904 $path = "$path"; # make sure it's a string
1801 1905
1802 $path =~ s/\.map$//; 1906 $path =~ s/\.map$//;
1803 1907
1804 # map plan: 1908 # map plan:
1805 # 1909 #
1820 $base =~ s{[^/]+/?$}{}; 1924 $base =~ s{[^/]+/?$}{};
1821 $path = "$base/$path"; 1925 $path = "$base/$path";
1822 } 1926 }
1823 1927
1824 for ($path) { 1928 for ($path) {
1825 redo if s{//}{/};
1826 redo if s{/\.?/}{/}; 1929 redo if s{/\.?/}{/};
1827 redo if s{/[^/]+/\.\./}{/}; 1930 redo if s{/[^/]+/\.\./}{/};
1828 } 1931 }
1829 1932
1830 $path 1933 $path
1844 $self->init; # pass $1 etc. 1947 $self->init; # pass $1 etc.
1845 return $self; 1948 return $self;
1846 } 1949 }
1847 } 1950 }
1848 1951
1849 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1952 Carp::cluck "unable to resolve path '$path' (base '$base')";
1850 () 1953 ()
1851} 1954}
1852 1955
1853sub init { 1956sub init {
1854 my ($self) = @_; 1957 my ($self) = @_;
1886sub uniq_path { 1989sub uniq_path {
1887 my ($self) = @_; 1990 my ($self) = @_;
1888 1991
1889 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1992 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1890 "$UNIQUEDIR/$path" 1993 "$UNIQUEDIR/$path"
1891}
1892
1893# and all this just because we cannot iterate over
1894# all maps in C++...
1895sub change_all_map_light {
1896 my ($change) = @_;
1897
1898 $_->change_map_light ($change)
1899 for grep $_->outdoor, values %cf::MAP;
1900} 1994}
1901 1995
1902sub decay_objects { 1996sub decay_objects {
1903 my ($self) = @_; 1997 my ($self) = @_;
1904 1998
1986 2080
1987sub find; 2081sub find;
1988sub find { 2082sub find {
1989 my ($path, $origin) = @_; 2083 my ($path, $origin) = @_;
1990 2084
2085 cf::cede_to_tick;
2086
1991 $path = normalise $path, $origin && $origin->path; 2087 $path = normalise $path, $origin && $origin->path;
1992 2088
1993 cf::lock_wait "map_data:$path";#d#remove 2089 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1994 cf::lock_wait "map_find:$path"; 2090 my $guard2 = cf::lock_acquire "map_find:$path";
1995 2091
1996 $cf::MAP{$path} || do { 2092 $cf::MAP{$path} || do {
1997 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1998 my $guard2 = cf::lock_acquire "map_find:$path";
1999
2000 my $map = new_from_path cf::map $path 2093 my $map = new_from_path cf::map $path
2001 or return; 2094 or return;
2002 2095
2003 $map->{last_save} = $cf::RUNTIME; 2096 $map->{last_save} = $cf::RUNTIME;
2004 2097
2016 2109
2017 $cf::MAP{$path} = $map 2110 $cf::MAP{$path} = $map
2018 } 2111 }
2019} 2112}
2020 2113
2021sub pre_load { } 2114sub pre_load { }
2022sub post_load { } 2115#sub post_load { } # XS
2023 2116
2024sub load { 2117sub load {
2025 my ($self) = @_; 2118 my ($self) = @_;
2026 2119
2027 local $self->{deny_reset} = 1; # loading can take a long time 2120 local $self->{deny_reset} = 1; # loading can take a long time
2072 unless ($self->{deny_activate}) { 2165 unless ($self->{deny_activate}) {
2073 $self->decay_objects; 2166 $self->decay_objects;
2074 $self->fix_auto_apply; 2167 $self->fix_auto_apply;
2075 $self->update_buttons; 2168 $self->update_buttons;
2076 cf::cede_to_tick; 2169 cf::cede_to_tick;
2077 $self->set_darkness_map;
2078 cf::cede_to_tick;
2079 $self->activate; 2170 $self->activate;
2080 } 2171 }
2081 2172
2082 $self->{last_save} = $cf::RUNTIME; 2173 $self->{last_save} = $cf::RUNTIME;
2083 $self->last_access ($cf::RUNTIME); 2174 $self->last_access ($cf::RUNTIME);
2084 2175
2085 $self->in_memory (cf::MAP_ACTIVE); 2176 $self->in_memory (cf::MAP_ACTIVE);
2086 } 2177 }
2087 2178
2088 $self->post_load; 2179 $self->post_load;
2089}
2090 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
2091sub customise_for { 2187sub customise_for {
2092 my ($self, $ob) = @_; 2188 my ($self, $ob) = @_;
2093 2189
2094 return find "~" . $ob->name . "/" . $self->{path} 2190 return find "~" . $ob->name . "/" . $self->{path}
2095 if $self->per_player; 2191 if $self->per_player;
2111 or next; 2207 or next;
2112 $neigh = find $neigh, $map 2208 $neigh = find $neigh, $map
2113 or next; 2209 or next;
2114 $neigh->load; 2210 $neigh->load;
2115 2211
2212 # now find the diagonal neighbours
2116 push @neigh, 2213 push @neigh,
2117 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2214 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2118 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2215 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2119 } 2216 }
2120 2217
2127} 2224}
2128 2225
2129sub find_sync { 2226sub find_sync {
2130 my ($path, $origin) = @_; 2227 my ($path, $origin) = @_;
2131 2228
2132 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
2133} 2233}
2134 2234
2135sub do_load_sync { 2235sub do_load_sync {
2136 my ($map) = @_; 2236 my ($map) = @_;
2137 2237
2138 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2238 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2139 if $Coro::current == $Coro::main; 2239 if $Coro::current == $Coro::main;
2140 2240
2141 cf::sync_job { $map->load }; 2241 $map->load;
2142} 2242}
2143 2243
2144our %MAP_PREFETCH; 2244our %MAP_PREFETCH;
2145our $MAP_PREFETCHER = undef; 2245our $MAP_PREFETCHER = undef;
2146 2246
2172 $MAP_PREFETCHER->prio (6); 2272 $MAP_PREFETCHER->prio (6);
2173 2273
2174 () 2274 ()
2175} 2275}
2176 2276
2277# common code, used by both ->save and ->swapout
2177sub save { 2278sub _save {
2178 my ($self) = @_; 2279 my ($self) = @_;
2179
2180 my $lock = cf::lock_acquire "map_data:$self->{path}";
2181 2280
2182 $self->{last_save} = $cf::RUNTIME; 2281 $self->{last_save} = $cf::RUNTIME;
2183 2282
2184 return unless $self->dirty; 2283 return unless $self->dirty;
2185 2284
2205 } else { 2304 } else {
2206 $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);
2207 } 2306 }
2208} 2307}
2209 2308
2309sub save {
2310 my ($self) = @_;
2311
2312 my $lock = cf::lock_acquire "map_data:$self->{path}";
2313
2314 $self->_save;
2315}
2316
2210sub swap_out { 2317sub swap_out {
2211 my ($self) = @_; 2318 my ($self) = @_;
2212 2319
2213 # save first because save cedes
2214 $self->save;
2215
2216 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2320 my $lock = cf::lock_acquire "map_data:$self->{path}";
2217 2321
2218 return if $self->players;
2219 return if $self->in_memory != cf::MAP_ACTIVE; 2322 return if $self->in_memory != cf::MAP_ACTIVE;
2220 return if $self->{deny_save}; 2323 return if $self->{deny_save};
2324 return if $self->players;
2221 2325
2326 # first deactivate the map and "unlink" it from the core
2327 $self->deactivate;
2328 $_->clear_links_to ($self) for values %cf::MAP;
2222 $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};
2223 2376
2224 $self->deactivate; 2377 $self->deactivate;
2225 $_->clear_links_to ($self) for values %cf::MAP; 2378 $_->clear_links_to ($self) for values %cf::MAP;
2226 $self->clear; 2379 $self->clear;
2227}
2228
2229sub reset_at {
2230 my ($self) = @_;
2231
2232 # TODO: safety, remove and allow resettable per-player maps
2233 return 1e99 if $self->{deny_reset};
2234
2235 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2236 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2237
2238 $time + $to
2239}
2240
2241sub should_reset {
2242 my ($self) = @_;
2243
2244 $self->reset_at <= $cf::RUNTIME
2245}
2246
2247sub reset {
2248 my ($self) = @_;
2249
2250 my $lock = cf::lock_acquire "map_data:$self->{path}";
2251
2252 return if $self->players;
2253
2254 warn "resetting map ", $self->path;
2255
2256 $self->in_memory (cf::MAP_SWAPPED);
2257
2258 # need to save uniques path
2259 unless ($self->{deny_save}) {
2260 my $uniq = $self->uniq_path; utf8::encode $uniq;
2261
2262 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2263 if $uniq;
2264 }
2265
2266 delete $cf::MAP{$self->path};
2267
2268 $self->deactivate;
2269 $_->clear_links_to ($self) for values %cf::MAP;
2270 $self->clear;
2271 2380
2272 $self->unlink_save; 2381 $self->unlink_save;
2273 $self->destroy; 2382 $self->destroy;
2274} 2383}
2275 2384
2283 2392
2284 delete $cf::MAP{$self->path}; 2393 delete $cf::MAP{$self->path};
2285 2394
2286 $self->unlink_save; 2395 $self->unlink_save;
2287 2396
2288 bless $self, "cf::map"; 2397 bless $self, "cf::map::wrap";
2289 delete $self->{deny_reset}; 2398 delete $self->{deny_reset};
2290 $self->{deny_save} = 1; 2399 $self->{deny_save} = 1;
2291 $self->reset_timeout (1); 2400 $self->reset_timeout (1);
2292 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2401 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2293 2402
2350 : normalise $_ 2459 : normalise $_
2351 } @{ aio_readdir $UNIQUEDIR or [] } 2460 } @{ aio_readdir $UNIQUEDIR or [] }
2352 ] 2461 ]
2353} 2462}
2354 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
2355=back 2496=back
2356 2497
2357=head3 cf::object 2498=head3 cf::object
2358 2499
2359=cut 2500=cut
2424 2565
2425our $SAY_CHANNEL = { 2566our $SAY_CHANNEL = {
2426 id => "say", 2567 id => "say",
2427 title => "Map", 2568 title => "Map",
2428 reply => "say ", 2569 reply => "say ",
2429 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.",
2430}; 2571};
2431 2572
2432our $CHAT_CHANNEL = { 2573our $CHAT_CHANNEL = {
2433 id => "chat", 2574 id => "chat",
2434 title => "Chat", 2575 title => "Chat",
2491 2632
2492Freezes 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}>).
2493 2634
2494The 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.
2495for 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,
2496though, 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
2497map. 2638map.
2498 2639
2499Will never block. 2640Will never block.
2500 2641
2501=item $player_object->leave_link ($map, $x, $y) 2642=item $player_object->leave_link ($map, $x, $y)
2522sub cf::object::player::enter_link { 2663sub cf::object::player::enter_link {
2523 my ($self) = @_; 2664 my ($self) = @_;
2524 2665
2525 $self->deactivate_recursive; 2666 $self->deactivate_recursive;
2526 2667
2668 ++$self->{_link_recursion};
2669
2527 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2670 return if UNIVERSAL::isa $self->map, "ext::map_link";
2528 2671
2529 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2672 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2530 if $self->map && $self->map->{path} ne "{link}"; 2673 if $self->map && $self->map->{path} ne "{link}";
2531 2674
2532 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2675 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2533} 2676}
2534 2677
2535sub cf::object::player::leave_link { 2678sub cf::object::player::leave_link {
2536 my ($self, $map, $x, $y) = @_; 2679 my ($self, $map, $x, $y) = @_;
2537 2680
2554 ($x, $y) = (-1, -1) 2697 ($x, $y) = (-1, -1)
2555 unless (defined $x) && (defined $y); 2698 unless (defined $x) && (defined $y);
2556 2699
2557 # use -1 or undef as default coordinates, not 0, 0 2700 # use -1 or undef as default coordinates, not 0, 0
2558 ($x, $y) = ($map->enter_x, $map->enter_y) 2701 ($x, $y) = ($map->enter_x, $map->enter_y)
2559 if $x <=0 && $y <= 0; 2702 if $x <= 0 && $y <= 0;
2560 2703
2561 $map->load; 2704 $map->load;
2562 $map->load_neighbours; 2705 $map->load_neighbours;
2563 2706
2564 return unless $self->contr->active; 2707 return unless $self->contr->active;
2565 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2566 $self->activate_recursive;
2567 2708
2568 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2709 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2569 $self->enter_map ($map, $x, $y); 2710 if ($self->enter_map ($map, $x, $y)) {
2570} 2711 # entering was successful
2712 delete $self->{_link_recursion};
2713 # only activate afterwards, to support waiting in hooks
2714 $self->activate_recursive;
2715 }
2571 2716
2717}
2718
2572=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)]])
2573 2720
2574Moves 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
2575her, loading and preparing them map, calling the provided $check callback 2722her, loading and preparing them map, calling the provided $check callback
2576that 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
2577the 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
2584 2731
2585our $GOTOGEN; 2732our $GOTOGEN;
2586 2733
2587sub cf::object::player::goto { 2734sub cf::object::player::goto {
2588 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 }
2589 2742
2590 # 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
2591 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2744 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2592 2745
2593 $self->enter_link; 2746 $self->enter_link;
2617 my $map = eval { 2770 my $map = eval {
2618 my $map = defined $path ? cf::map::find $path : undef; 2771 my $map = defined $path ? cf::map::find $path : undef;
2619 2772
2620 if ($map) { 2773 if ($map) {
2621 $map = $map->customise_for ($self); 2774 $map = $map->customise_for ($self);
2622 $map = $check->($map) if $check && $map; 2775 $map = $check->($map, $x, $y, $self) if $check && $map;
2623 } else { 2776 } else {
2624 $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);
2625 } 2778 }
2626 2779
2627 $map 2780 $map
2635 if ($gen == $self->{_goto_generation}) { 2788 if ($gen == $self->{_goto_generation}) {
2636 delete $self->{_goto_generation}; 2789 delete $self->{_goto_generation};
2637 $self->leave_link ($map, $x, $y); 2790 $self->leave_link ($map, $x, $y);
2638 } 2791 }
2639 2792
2640 $done->() if $done; 2793 $done->($self) if $done;
2641 })->prio (1); 2794 })->prio (1);
2642} 2795}
2643 2796
2644=item $player_object->enter_exit ($exit_object) 2797=item $player_object->enter_exit ($exit_object)
2645 2798
2738 $self->message ("Something went wrong deep within the deliantra server. " 2891 $self->message ("Something went wrong deep within the deliantra server. "
2739 . "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. "
2740 . "Please report this to the dungeon master!", 2893 . "Please report this to the dungeon master!",
2741 cf::NDI_UNIQUE | cf::NDI_RED); 2894 cf::NDI_UNIQUE | cf::NDI_RED);
2742 2895
2743 warn "ERROR in enter_exit: $@"; 2896 error "ERROR in enter_exit: $@";
2744 $self->leave_link; 2897 $self->leave_link;
2745 } 2898 }
2746 })->prio (1); 2899 })->prio (1);
2747} 2900}
2748 2901
2760sub cf::client::send_drawinfo { 2913sub cf::client::send_drawinfo {
2761 my ($self, $text, $flags) = @_; 2914 my ($self, $text, $flags) = @_;
2762 2915
2763 utf8::encode $text; 2916 utf8::encode $text;
2764 $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);
2765} 2943}
2766 2944
2767=item $client->send_msg ($channel, $msg, $color, [extra...]) 2945=item $client->send_msg ($channel, $msg, $color, [extra...])
2768 2946
2769Send 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
2773 2951
2774=cut 2952=cut
2775 2953
2776# non-persistent channels (usually the info channel) 2954# non-persistent channels (usually the info channel)
2777our %CHANNEL = ( 2955our %CHANNEL = (
2956 "c/motd" => {
2957 id => "infobox",
2958 title => "MOTD",
2959 reply => undef,
2960 tooltip => "The message of the day",
2961 },
2778 "c/identify" => { 2962 "c/identify" => {
2779 id => "infobox", 2963 id => "infobox",
2780 title => "Identify", 2964 title => "Identify",
2781 reply => undef, 2965 reply => undef,
2782 tooltip => "Items recently identified", 2966 tooltip => "Items recently identified",
2784 "c/examine" => { 2968 "c/examine" => {
2785 id => "infobox", 2969 id => "infobox",
2786 title => "Examine", 2970 title => "Examine",
2787 reply => undef, 2971 reply => undef,
2788 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",
2789 }, 2979 },
2790 "c/book" => { 2980 "c/book" => {
2791 id => "infobox", 2981 id => "infobox",
2792 title => "Book", 2982 title => "Book",
2793 reply => undef, 2983 reply => undef,
2809 id => "infobox", 2999 id => "infobox",
2810 title => "Body Parts", 3000 title => "Body Parts",
2811 reply => undef, 3001 reply => undef,
2812 tooltip => "Shows which body parts you posess and are available", 3002 tooltip => "Shows which body parts you posess and are available",
2813 }, 3003 },
3004 "c/statistics" => {
3005 id => "infobox",
3006 title => "Statistics",
3007 reply => undef,
3008 tooltip => "Shows your primary statistics",
3009 },
2814 "c/skills" => { 3010 "c/skills" => {
2815 id => "infobox", 3011 id => "infobox",
2816 title => "Skills", 3012 title => "Skills",
2817 reply => undef, 3013 reply => undef,
2818 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",
2819 }, 3039 },
2820 "c/uptime" => { 3040 "c/uptime" => {
2821 id => "infobox", 3041 id => "infobox",
2822 title => "Uptime", 3042 title => "Uptime",
2823 reply => undef, 3043 reply => undef,
2833 id => "party", 3053 id => "party",
2834 title => "Party", 3054 title => "Party",
2835 reply => "gsay ", 3055 reply => "gsay ",
2836 tooltip => "Messages and chat related to your party", 3056 tooltip => "Messages and chat related to your party",
2837 }, 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,
2838); 3066);
2839 3067
2840sub cf::client::send_msg { 3068sub cf::client::send_msg {
2841 my ($self, $channel, $msg, $color, @extra) = @_; 3069 my ($self, $channel, $msg, $color, @extra) = @_;
2842 3070
2847 3075
2848 # check predefined channels, for the benefit of C 3076 # check predefined channels, for the benefit of C
2849 if ($CHANNEL{$channel}) { 3077 if ($CHANNEL{$channel}) {
2850 $channel = $CHANNEL{$channel}; 3078 $channel = $CHANNEL{$channel};
2851 3079
2852 $self->ext_msg (channel_info => $channel) 3080 $self->ext_msg (channel_info => $channel);
2853 if $self->can_msg;
2854
2855 $channel = $channel->{id}; 3081 $channel = $channel->{id};
2856 3082
2857 } elsif (ref $channel) { 3083 } elsif (ref $channel) {
2858 # send meta info to client, if not yet sent 3084 # send meta info to client, if not yet sent
2859 unless (exists $self->{channel}{$channel->{id}}) { 3085 unless (exists $self->{channel}{$channel->{id}}) {
2860 $self->{channel}{$channel->{id}} = $channel; 3086 $self->{channel}{$channel->{id}} = $channel;
2861 $self->ext_msg (channel_info => $channel) 3087 $self->ext_msg (channel_info => $channel);
2862 if $self->can_msg;
2863 } 3088 }
2864 3089
2865 $channel = $channel->{id}; 3090 $channel = $channel->{id};
2866 } 3091 }
2867 3092
2868 return unless @extra || length $msg; 3093 return unless @extra || length $msg;
2869 3094
2870 if ($self->can_msg) {
2871 # default colour, mask it out 3095 # default colour, mask it out
2872 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3096 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2873 if $color & cf::NDI_DEF; 3097 if $color & cf::NDI_DEF;
2874 3098
2875 my $pkt = "msg " 3099 my $pkt = "msg "
2876 . $self->{json_coder}->encode ( 3100 . $self->{json_coder}->encode (
2877 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3101 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2878 ); 3102 );
2879 3103
2880 # try lzf for large packets
2881 $pkt = "lzf " . Compress::LZF::compress $pkt
2882 if 1024 <= length $pkt and $self->{can_lzf};
2883
2884 # split very large packets
2885 if (8192 < length $pkt and $self->{can_lzf}) {
2886 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2887 $pkt = "frag";
2888 }
2889
2890 $self->send_packet ($pkt); 3104 $self->send_big_packet ($pkt);
2891 } else {
2892 if ($color >= 0) {
2893 # replace some tags by gcfclient-compatible ones
2894 for ($msg) {
2895 1 while
2896 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2897 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2898 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2899 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2900 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2901 }
2902
2903 $color &= cf::NDI_COLOR_MASK;
2904
2905 utf8::encode $msg;
2906
2907 if (0 && $msg =~ /\[/) {
2908 # COMMAND/INFO
2909 $self->send_packet ("drawextinfo $color 10 8 $msg")
2910 } else {
2911 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2912 $self->send_packet ("drawinfo $color $msg")
2913 }
2914 }
2915 }
2916} 3105}
2917 3106
2918=item $client->ext_msg ($type, @msg) 3107=item $client->ext_msg ($type, @msg)
2919 3108
2920Sends an ext event to the client. 3109Sends an ext event to the client.
2923 3112
2924sub cf::client::ext_msg($$@) { 3113sub cf::client::ext_msg($$@) {
2925 my ($self, $type, @msg) = @_; 3114 my ($self, $type, @msg) = @_;
2926 3115
2927 if ($self->extcmd == 2) { 3116 if ($self->extcmd == 2) {
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3117 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2929 } elsif ($self->extcmd == 1) { # TODO: remove 3118 } elsif ($self->extcmd == 1) { # TODO: remove
2930 push @msg, msgtype => "event_$type"; 3119 push @msg, msgtype => "event_$type";
2931 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3120 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2932 } 3121 }
2933} 3122}
2934 3123
2935=item $client->ext_reply ($msgid, @msg) 3124=item $client->ext_reply ($msgid, @msg)
2936 3125
2940 3129
2941sub cf::client::ext_reply($$@) { 3130sub cf::client::ext_reply($$@) {
2942 my ($self, $id, @msg) = @_; 3131 my ($self, $id, @msg) = @_;
2943 3132
2944 if ($self->extcmd == 2) { 3133 if ($self->extcmd == 2) {
2945 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3134 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2946 } elsif ($self->extcmd == 1) { 3135 } elsif ($self->extcmd == 1) {
2947 #TODO: version 1, remove 3136 #TODO: version 1, remove
2948 unshift @msg, msgtype => "reply", msgid => $id; 3137 unshift @msg, msgtype => "reply", msgid => $id;
2949 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3138 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2950 } 3139 }
2951} 3140}
2952 3141
2953=item $success = $client->query ($flags, "text", \&cb) 3142=item $success = $client->query ($flags, "text", \&cb)
2954 3143
3025 3214
3026 $ns->ext_reply ($reply, @reply) 3215 $ns->ext_reply ($reply, @reply)
3027 if $reply; 3216 if $reply;
3028 3217
3029 } else { 3218 } else {
3030 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";
3031 } 3220 }
3032 3221
3033 cf::override; 3222 cf::override;
3034 }, 3223 },
3035); 3224);
3055 3244
3056 $coro 3245 $coro
3057} 3246}
3058 3247
3059cf::client->attach ( 3248cf::client->attach (
3060 on_destroy => sub { 3249 on_client_destroy => sub {
3061 my ($ns) = @_; 3250 my ($ns) = @_;
3062 3251
3063 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3252 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3064 }, 3253 },
3065); 3254);
3081our $safe_hole = new Safe::Hole; 3270our $safe_hole = new Safe::Hole;
3082 3271
3083$SIG{FPE} = 'IGNORE'; 3272$SIG{FPE} = 'IGNORE';
3084 3273
3085$safe->permit_only (Opcode::opset qw( 3274$safe->permit_only (Opcode::opset qw(
3086 :base_core :base_mem :base_orig :base_math 3275 :base_core :base_mem :base_orig :base_math :base_loop
3087 grepstart grepwhile mapstart mapwhile 3276 grepstart grepwhile mapstart mapwhile
3088 sort time 3277 sort time
3089)); 3278));
3090 3279
3091# here we export the classes and methods available to script code 3280# here we export the classes and methods available to script code
3095The following functions and methods are available within a safe environment: 3284The following functions and methods are available within a safe environment:
3096 3285
3097 cf::object 3286 cf::object
3098 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
3099 insert remove name archname title slaying race decrease split 3288 insert remove name archname title slaying race decrease split
3289 value
3100 3290
3101 cf::object::player 3291 cf::object::player
3102 player 3292 player
3103 3293
3104 cf::player 3294 cf::player
3110=cut 3300=cut
3111 3301
3112for ( 3302for (
3113 ["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
3114 insert remove inv nrof name archname title slaying race 3304 insert remove inv nrof name archname title slaying race
3115 decrease split destroy change_exp)], 3305 decrease split destroy change_exp value msg lore send_msg)],
3116 ["cf::object::player" => qw(player)], 3306 ["cf::object::player" => qw(player)],
3117 ["cf::player" => qw(peaceful)], 3307 ["cf::player" => qw(peaceful send_msg)],
3118 ["cf::map" => qw(trigger)], 3308 ["cf::map" => qw(trigger)],
3119) { 3309) {
3120 no strict 'refs';
3121 my ($pkg, @funs) = @$_; 3310 my ($pkg, @funs) = @$_;
3122 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3311 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3123 for @funs; 3312 for @funs;
3124} 3313}
3125 3314
3140 3329
3141 my $qcode = $code; 3330 my $qcode = $code;
3142 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3331 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3143 $qcode =~ s/\n/\\n/g; 3332 $qcode =~ s/\n/\\n/g;
3144 3333
3334 %vars = (_dummy => 0) unless %vars;
3335
3336 my @res;
3145 local $_; 3337 local $_;
3146 local @safe::cf::_safe_eval_args = values %vars;
3147 3338
3148 my $eval = 3339 my $eval =
3149 "do {\n" 3340 "do {\n"
3150 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3341 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3151 . "#line 0 \"{$qcode}\"\n" 3342 . "#line 0 \"{$qcode}\"\n"
3152 . $code 3343 . $code
3153 . "\n}" 3344 . "\n}"
3154 ; 3345 ;
3155 3346
3347 if ($CFG{safe_eval}) {
3156 sub_generation_inc; 3348 sub_generation_inc;
3349 local @safe::cf::_safe_eval_args = values %vars;
3157 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3350 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3158 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 }
3159 3356
3160 if ($@) { 3357 if ($@) {
3161 warn "$@"; 3358 warn "$@",
3162 warn "while executing safe code '$code'\n"; 3359 "while executing safe code '$code'\n",
3163 warn "with arguments " . (join " ", %vars) . "\n"; 3360 "with arguments " . (join " ", %vars) . "\n";
3164 } 3361 }
3165 3362
3166 wantarray ? @res : $res[0] 3363 wantarray ? @res : $res[0]
3167} 3364}
3168 3365
3182=cut 3379=cut
3183 3380
3184sub register_script_function { 3381sub register_script_function {
3185 my ($fun, $cb) = @_; 3382 my ($fun, $cb) = @_;
3186 3383
3187 no strict 'refs'; 3384 $fun = "safe::$fun" if $CFG{safe_eval};
3188 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3385 *$fun = $safe_hole->wrap ($cb);
3189} 3386}
3190 3387
3191=back 3388=back
3192 3389
3193=cut 3390=cut
3202 # for this (global event?) 3399 # for this (global event?)
3203 %ext::player_env::MUSIC_FACE_CACHE = (); 3400 %ext::player_env::MUSIC_FACE_CACHE = ();
3204 3401
3205 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3402 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3206 3403
3207 warn "loading facedata from $path\n"; 3404 trace "loading facedata from $path\n";
3208 3405
3209 my $facedata;
3210 0 < aio_load $path, $facedata 3406 0 < aio_load $path, my $facedata
3211 or die "$path: $!"; 3407 or die "$path: $!";
3212 3408
3213 $facedata = Coro::Storable::thaw $facedata; 3409 $facedata = Coro::Storable::thaw $facedata;
3214 3410
3215 $facedata->{version} == 2 3411 $facedata->{version} == 2
3216 or cf::cleanup "$path: version mismatch, cannot proceed."; 3412 or cf::cleanup "$path: version mismatch, cannot proceed.";
3217 3413
3218 # 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]);
3219 $facedata->{resource}{"res/exp_table"} = { 3416 $facedata->{resource}{"res/exp_table"} = {
3220 type => FT_RSRC, 3417 type => FT_RSRC,
3221 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),
3222 }; 3420 };
3223 cf::cede_to_tick; 3421 cf::cede_to_tick;
3224 3422
3225 { 3423 {
3226 my $faces = $facedata->{faceinfo}; 3424 my $faces = $facedata->{faceinfo};
3228 while (my ($face, $info) = each %$faces) { 3426 while (my ($face, $info) = each %$faces) {
3229 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3427 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3230 3428
3231 cf::face::set_visibility $idx, $info->{visibility}; 3429 cf::face::set_visibility $idx, $info->{visibility};
3232 cf::face::set_magicmap $idx, $info->{magicmap}; 3430 cf::face::set_magicmap $idx, $info->{magicmap};
3233 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3431 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3234 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} ;
3235 3434
3236 cf::cede_to_tick; 3435 cf::cede_to_tick;
3237 } 3436 }
3238 3437
3239 while (my ($face, $info) = each %$faces) { 3438 while (my ($face, $info) = each %$faces) {
3244 3443
3245 if (my $smooth = cf::face::find $info->{smooth}) { 3444 if (my $smooth = cf::face::find $info->{smooth}) {
3246 cf::face::set_smooth $idx, $smooth; 3445 cf::face::set_smooth $idx, $smooth;
3247 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3446 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3248 } else { 3447 } else {
3249 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3448 error "smooth face '$info->{smooth}' not found for face '$face'";
3250 } 3449 }
3251 3450
3252 cf::cede_to_tick; 3451 cf::cede_to_tick;
3253 } 3452 }
3254 } 3453 }
3263 3462
3264 cf::anim::invalidate_all; # d'oh 3463 cf::anim::invalidate_all; # d'oh
3265 } 3464 }
3266 3465
3267 { 3466 {
3268 # TODO: for gcfclient pleasure, we should give resources
3269 # that gcfclient doesn't grok a >10000 face index.
3270 my $res = $facedata->{resource}; 3467 my $res = $facedata->{resource};
3271 3468
3272 while (my ($name, $info) = each %$res) { 3469 while (my ($name, $info) = each %$res) {
3273 if (defined $info->{type}) { 3470 if (defined $info->{type}) {
3274 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3471 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3275 my $data;
3276 3472
3277 if ($info->{type} & 1) { 3473 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3278 # prepend meta info
3279
3280 my $meta = $enc->encode ({
3281 name => $name,
3282 %{ $info->{meta} || {} },
3283 });
3284
3285 $data = pack "(w/a*)*", $meta, $info->{data};
3286 } else {
3287 $data = $info->{data};
3288 }
3289
3290 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3291 cf::face::set_type $idx, $info->{type}; 3474 cf::face::set_type $idx, $info->{type};
3292 } else { 3475 } else {
3293 $RESOURCE{$name} = $info; 3476 $RESOURCE{$name} = $info; # unused
3294 } 3477 }
3295 3478
3296 cf::cede_to_tick; 3479 cf::cede_to_tick;
3297 } 3480 }
3298 } 3481 }
3299 3482
3300 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3483 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3301 3484
3302 1 3485 1
3303} 3486}
3304
3305cf::global->attach (on_resource_update => sub {
3306 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3307 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3308
3309 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3310 my $sound = $soundconf->{compat}[$_]
3311 or next;
3312
3313 my $face = cf::face::find "sound/$sound->[1]";
3314 cf::sound::set $sound->[0] => $face;
3315 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3316 }
3317
3318 while (my ($k, $v) = each %{$soundconf->{event}}) {
3319 my $face = cf::face::find "sound/$v";
3320 cf::sound::set $k => $face;
3321 }
3322 }
3323});
3324 3487
3325register_exticmd fx_want => sub { 3488register_exticmd fx_want => sub {
3326 my ($ns, $want) = @_; 3489 my ($ns, $want) = @_;
3327 3490
3328 while (my ($k, $v) = each %$want) { 3491 while (my ($k, $v) = each %$want) {
3367sub reload_treasures { 3530sub reload_treasures {
3368 load_resource_file "$DATADIR/treasures" 3531 load_resource_file "$DATADIR/treasures"
3369 or die "unable to load treasurelists\n"; 3532 or die "unable to load treasurelists\n";
3370} 3533}
3371 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
3372sub reload_resources { 3558sub reload_resources {
3373 warn "reloading resource files...\n"; 3559 trace "reloading resource files...\n";
3374 3560
3561 reload_exp_table;
3562 reload_materials;
3375 reload_facedata; 3563 reload_facedata;
3564 reload_sound;
3376 reload_archetypes; 3565 reload_archetypes;
3377 reload_regions; 3566 reload_regions;
3378 reload_treasures; 3567 reload_treasures;
3379 3568
3380 warn "finished reloading resource files\n"; 3569 trace "finished reloading resource files\n";
3381} 3570}
3382 3571
3383sub reload_config { 3572sub reload_config {
3384 open my $fh, "<:utf8", "$CONFDIR/config" 3573 trace "reloading config file...\n";
3385 or return;
3386 3574
3387 local $/; 3575 0 < aio_load "$CONFDIR/config", my $config
3388 *CFG = YAML::Load <$fh>; 3576 or die "$CONFDIR/config: $!";
3389 3577
3578 utf8::decode $config;
3579 *CFG = yaml_load $config;
3580
3390 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3581 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3391 3582
3392 $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};
3393 $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};
3394 3585
3395 if (exists $CFG{mlockall}) { 3586 if (exists $CFG{mlockall}) {
3418 3609
3419 seek $fh, 0, 0; 3610 seek $fh, 0, 0;
3420 print $fh $$; 3611 print $fh $$;
3421} 3612}
3422 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
3423sub main { 3623sub main {
3424 cf::init_globals; # initialise logging 3624 cf::init_globals; # initialise logging
3425 3625
3426 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3626 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3427 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.";
3428 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3628 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3429 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3629 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3430
3431 cf::init_experience;
3432 cf::init_anim;
3433 cf::init_attackmess;
3434 cf::init_dynamic;
3435 cf::init_block;
3436 3630
3437 $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
3438 3632
3439 # we must not ever block the main coroutine 3633 # we must not ever block the main coroutine
3440 local $Coro::idle = sub { 3634 local $Coro::idle = sub {
3446 }; 3640 };
3447 3641
3448 evthread_start IO::AIO::poll_fileno; 3642 evthread_start IO::AIO::poll_fileno;
3449 3643
3450 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
3451 reload_resources; 3653 reload_resources;
3452 reload_config; 3654 reload_config;
3453 db_init; 3655 db_init;
3454 3656
3455 cf::load_settings;
3456 cf::load_materials;
3457 cf::init_uuid; 3657 cf::init_uuid;
3458 cf::init_signals; 3658 cf::init_signals;
3459 cf::init_commands;
3460 cf::init_skills; 3659 cf::init_skills;
3461 3660
3462 cf::init_beforeplay; 3661 cf::init_beforeplay;
3463 3662
3464 atomic; 3663 atomic;
3466 load_extensions; 3665 load_extensions;
3467 3666
3468 utime time, time, $RUNTIMEFILE; 3667 utime time, time, $RUNTIMEFILE;
3469 3668
3470 # no (long-running) fork's whatsoever before this point(!) 3669 # no (long-running) fork's whatsoever before this point(!)
3670 use POSIX ();
3471 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};
3472 3672
3473 (pop @POST_INIT)->(0) while @POST_INIT; 3673 cf::_post_init 0;
3474 }; 3674 };
3475 3675
3476 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;
3477} 3685}
3478 3686
3479############################################################################# 3687#############################################################################
3480# initialisation and cleanup 3688# initialisation and cleanup
3481 3689
3482# install some emergency cleanup handlers 3690# install some emergency cleanup handlers
3483BEGIN { 3691BEGIN {
3484 our %SIGWATCHER = (); 3692 our %SIGWATCHER = ();
3485 for my $signal (qw(INT HUP TERM)) { 3693 for my $signal (qw(INT HUP TERM)) {
3486 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3694 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3487 cf::cleanup "SIG$signal"; 3695 cf::cleanup "SIG$signal";
3488 }; 3696 };
3489 } 3697 }
3490} 3698}
3491 3699
3492sub write_runtime_sync { 3700sub write_runtime_sync {
3701 my $t0 = AE::time;
3702
3493 # first touch the runtime file to show we are still running: 3703 # first touch the runtime file to show we are still running:
3494 # the fsync below can take a very very long time. 3704 # the fsync below can take a very very long time.
3495 3705
3496 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3706 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3497 3707
3498 my $guard = cf::lock_acquire "write_runtime"; 3708 my $guard = cf::lock_acquire "write_runtime";
3499 3709
3500 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3710 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3501 or return; 3711 or return;
3502 3712
3503 my $value = $cf::RUNTIME + 90 + 10; 3713 my $value = $cf::RUNTIME + 90 + 10;
3504 # 10 is the runtime save interval, for a monotonic clock 3714 # 10 is the runtime save interval, for a monotonic clock
3505 # 60 allows for the watchdog to kill the server. 3715 # 60 allows for the watchdog to kill the server.
3518 or return; 3728 or return;
3519 3729
3520 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3730 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3521 and return; 3731 and return;
3522 3732
3523 warn "runtime file written.\n"; 3733 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3524 3734
3525 1 3735 1
3526} 3736}
3527 3737
3528our $uuid_lock; 3738our $uuid_lock;
3540 or return; 3750 or return;
3541 3751
3542 my $value = uuid_seq uuid_cur; 3752 my $value = uuid_seq uuid_cur;
3543 3753
3544 unless ($value) { 3754 unless ($value) {
3545 warn "cowardly refusing to write zero uuid value!\n"; 3755 info "cowardly refusing to write zero uuid value!\n";
3546 return; 3756 return;
3547 } 3757 }
3548 3758
3549 my $value = uuid_str $value + $uuid_skip; 3759 my $value = uuid_str $value + $uuid_skip;
3550 $uuid_skip = 0; 3760 $uuid_skip = 0;
3560 or return; 3770 or return;
3561 3771
3562 aio_rename "$uuid~", $uuid 3772 aio_rename "$uuid~", $uuid
3563 and return; 3773 and return;
3564 3774
3565 warn "uuid file written ($value).\n"; 3775 trace "uuid file written ($value).\n";
3566 3776
3567 1 3777 1
3568 3778
3569} 3779}
3570 3780
3576} 3786}
3577 3787
3578sub emergency_save() { 3788sub emergency_save() {
3579 my $freeze_guard = cf::freeze_mainloop; 3789 my $freeze_guard = cf::freeze_mainloop;
3580 3790
3581 warn "emergency_perl_save: enter\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;
3582 3797
3583 cf::sync_job { 3798 cf::sync_job {
3584 # this is a trade-off: we want to be very quick here, so 3799 cf::write_runtime_sync; # external watchdog should not bark
3585 # save all maps without fsync, and later call a global sync
3586 # (which in turn might be very very slow)
3587 local $USE_FSYNC = 0;
3588 3800
3589 # use a peculiar iteration method to avoid tripping on perl 3801 # use a peculiar iteration method to avoid tripping on perl
3590 # refcount bugs in for. also avoids problems with players 3802 # refcount bugs in for. also avoids problems with players
3591 # and maps saved/destroyed asynchronously. 3803 # and maps saved/destroyed asynchronously.
3592 warn "emergency_perl_save: begin player save\n"; 3804 info "emergency_perl_save: begin player save\n";
3593 for my $login (keys %cf::PLAYER) { 3805 for my $login (keys %cf::PLAYER) {
3594 my $pl = $cf::PLAYER{$login} or next; 3806 my $pl = $cf::PLAYER{$login} or next;
3595 $pl->valid or next; 3807 $pl->valid or next;
3596 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3808 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3597 $pl->save; 3809 $pl->save;
3598 } 3810 }
3599 warn "emergency_perl_save: end player save\n"; 3811 info "emergency_perl_save: end player save\n";
3600 3812
3813 cf::write_runtime_sync; # external watchdog should not bark
3814
3601 warn "emergency_perl_save: begin map save\n"; 3815 info "emergency_perl_save: begin map save\n";
3602 for my $path (keys %cf::MAP) { 3816 for my $path (keys %cf::MAP) {
3603 my $map = $cf::MAP{$path} or next; 3817 my $map = $cf::MAP{$path} or next;
3604 $map->valid or next; 3818 $map->valid or next;
3605 $map->save; 3819 $map->save;
3606 } 3820 }
3607 warn "emergency_perl_save: end map save\n"; 3821 info "emergency_perl_save: end map save\n";
3608 3822
3823 cf::write_runtime_sync; # external watchdog should not bark
3824
3609 warn "emergency_perl_save: begin database checkpoint\n"; 3825 info "emergency_perl_save: begin database checkpoint\n";
3610 BDB::db_env_txn_checkpoint $DB_ENV; 3826 BDB::db_env_txn_checkpoint $DB_ENV;
3611 warn "emergency_perl_save: end database checkpoint\n"; 3827 info "emergency_perl_save: end database checkpoint\n";
3612 3828
3613 warn "emergency_perl_save: begin write uuid\n"; 3829 info "emergency_perl_save: begin write uuid\n";
3614 write_uuid_sync 1; 3830 write_uuid_sync 1;
3615 warn "emergency_perl_save: 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
3616 }; 3851 };
3617 3852
3618 warn "emergency_perl_save: starting sync()\n";
3619 IO::AIO::aio_sync sub {
3620 warn "emergency_perl_save: finished sync()\n";
3621 };
3622
3623 warn "emergency_perl_save: leave\n"; 3853 info "emergency_perl_save: leave\n";
3624} 3854}
3625 3855
3626sub post_cleanup { 3856sub post_cleanup {
3627 my ($make_core) = @_; 3857 my ($make_core) = @_;
3628 3858
3859 IO::AIO::flush;
3860
3629 warn Carp::longmess "post_cleanup backtrace" 3861 error Carp::longmess "post_cleanup backtrace"
3630 if $make_core; 3862 if $make_core;
3631 3863
3632 my $fh = pidfile; 3864 my $fh = pidfile;
3633 unlink $PIDFILE if <$fh> == $$; 3865 unlink $PIDFILE if <$fh> == $$;
3634} 3866}
3654 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3886 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3655 for my $name (keys %$leaf_symtab) { 3887 for my $name (keys %$leaf_symtab) {
3656 _gv_clear *{"$pkg$name"}; 3888 _gv_clear *{"$pkg$name"};
3657# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3889# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3658 } 3890 }
3659 warn "cleared package $pkg\n";#d#
3660} 3891}
3661 3892
3662sub do_reload_perl() { 3893sub do_reload_perl() {
3663 # can/must only be called in main 3894 # can/must only be called in main
3664 if ($Coro::current != $Coro::main) { 3895 unless (in_main) {
3665 warn "can only reload from main coroutine"; 3896 error "can only reload from main coroutine";
3666 return; 3897 return;
3667 } 3898 }
3668 3899
3669 return if $RELOAD++; 3900 return if $RELOAD++;
3670 3901
3671 my $t1 = EV::time; 3902 my $t1 = AE::time;
3672 3903
3673 while ($RELOAD) { 3904 while ($RELOAD) {
3674 warn "reloading..."; 3905 cf::get_slot 0.1, -1, "reload_perl";
3906 info "perl_reload: reloading...";
3675 3907
3676 warn "entering sync_job"; 3908 trace "perl_reload: entering sync_job";
3677 3909
3678 cf::sync_job { 3910 cf::sync_job {
3679 cf::write_runtime_sync; # external watchdog should not bark
3680 cf::emergency_save; 3911 #cf::emergency_save;
3681 cf::write_runtime_sync; # external watchdog should not bark
3682 3912
3683 warn "syncing database to disk";
3684 BDB::db_env_txn_checkpoint $DB_ENV;
3685
3686 # if anything goes wrong in here, we should simply crash as we already saved
3687
3688 warn "flushing outstanding aio requests";
3689 while (IO::AIO::nreqs || BDB::nreqs) {
3690 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3691 }
3692
3693 warn "cancelling all extension coros"; 3913 trace "perl_reload: cancelling all extension coros";
3694 $_->cancel for values %EXT_CORO; 3914 $_->cancel for values %EXT_CORO;
3695 %EXT_CORO = (); 3915 %EXT_CORO = ();
3696 3916
3697 warn "removing commands"; 3917 trace "perl_reload: removing commands";
3698 %COMMAND = (); 3918 %COMMAND = ();
3699 3919
3700 warn "removing ext/exti commands"; 3920 trace "perl_reload: removing ext/exti commands";
3701 %EXTCMD = (); 3921 %EXTCMD = ();
3702 %EXTICMD = (); 3922 %EXTICMD = ();
3703 3923
3704 warn "unloading/nuking all extensions"; 3924 trace "perl_reload: unloading/nuking all extensions";
3705 for my $pkg (@EXTS) { 3925 for my $pkg (@EXTS) {
3706 warn "... unloading $pkg"; 3926 trace "... unloading $pkg";
3707 3927
3708 if (my $cb = $pkg->can ("unload")) { 3928 if (my $cb = $pkg->can ("unload")) {
3709 eval { 3929 eval {
3710 $cb->($pkg); 3930 $cb->($pkg);
3711 1 3931 1
3712 } or warn "$pkg unloaded, but with errors: $@"; 3932 } or error "$pkg unloaded, but with errors: $@";
3713 } 3933 }
3714 3934
3715 warn "... clearing $pkg"; 3935 trace "... clearing $pkg";
3716 clear_package $pkg; 3936 clear_package $pkg;
3717 } 3937 }
3718 3938
3719 warn "unloading all perl modules loaded from $LIBDIR"; 3939 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3720 while (my ($k, $v) = each %INC) { 3940 while (my ($k, $v) = each %INC) {
3721 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3941 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3722 3942
3723 warn "... unloading $k"; 3943 trace "... unloading $k";
3724 delete $INC{$k}; 3944 delete $INC{$k};
3725 3945
3726 $k =~ s/\.pm$//; 3946 $k =~ s/\.pm$//;
3727 $k =~ s/\//::/g; 3947 $k =~ s/\//::/g;
3728 3948
3731 } 3951 }
3732 3952
3733 clear_package $k; 3953 clear_package $k;
3734 } 3954 }
3735 3955
3736 warn "getting rid of safe::, as good as possible"; 3956 trace "perl_reload: getting rid of safe::, as good as possible";
3737 clear_package "safe::$_" 3957 clear_package "safe::$_"
3738 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);
3739 3959
3740 warn "unloading cf.pm \"a bit\""; 3960 trace "perl_reload: unloading cf.pm \"a bit\"";
3741 delete $INC{"cf.pm"}; 3961 delete $INC{"cf.pm"};
3742 delete $INC{"cf/pod.pm"}; 3962 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3743 3963
3744 # don't, removes xs symbols, too, 3964 # don't, removes xs symbols, too,
3745 # and global variables created in xs 3965 # and global variables created in xs
3746 #clear_package __PACKAGE__; 3966 #clear_package __PACKAGE__;
3747 3967
3748 warn "unload completed, starting to reload now"; 3968 info "perl_reload: unload completed, starting to reload now";
3749 3969
3750 warn "reloading cf.pm"; 3970 trace "perl_reload: reloading cf.pm";
3751 require cf; 3971 require cf;
3752 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3972 cf::_connect_to_perl_1;
3753 3973
3754 warn "loading config and database again"; 3974 trace "perl_reload: loading config and database again";
3755 cf::reload_config; 3975 cf::reload_config;
3756 3976
3757 warn "loading extensions"; 3977 trace "perl_reload: loading extensions";
3758 cf::load_extensions; 3978 cf::load_extensions;
3759 3979
3760 if ($REATTACH_ON_RELOAD) { 3980 if ($REATTACH_ON_RELOAD) {
3761 warn "reattaching attachments to objects/players"; 3981 trace "perl_reload: reattaching attachments to objects/players";
3762 _global_reattach; # objects, sockets 3982 _global_reattach; # objects, sockets
3763 warn "reattaching attachments to maps"; 3983 trace "perl_reload: reattaching attachments to maps";
3764 reattach $_ for values %MAP; 3984 reattach $_ for values %MAP;
3765 warn "reattaching attachments to players"; 3985 trace "perl_reload: reattaching attachments to players";
3766 reattach $_ for values %PLAYER; 3986 reattach $_ for values %PLAYER;
3767 } 3987 }
3768 3988
3769 warn "running post_init jobs"; 3989 cf::_post_init 1;
3770 (pop @POST_INIT)->(1) while @POST_INIT;
3771 3990
3772 warn "leaving sync_job"; 3991 trace "perl_reload: leaving sync_job";
3773 3992
3774 1 3993 1
3775 } or do { 3994 } or do {
3776 warn $@; 3995 error $@;
3777 cf::cleanup "error while reloading, exiting."; 3996 cf::cleanup "perl_reload: error, exiting.";
3778 }; 3997 };
3779 3998
3780 warn "reloaded";
3781 --$RELOAD; 3999 --$RELOAD;
3782 } 4000 }
3783 4001
3784 $t1 = EV::time - $t1; 4002 $t1 = AE::time - $t1;
3785 warn "reload completed in ${t1}s\n"; 4003 info "perl_reload: completed in ${t1}s\n";
3786}; 4004};
3787 4005
3788our $RELOAD_WATCHER; # used only during reload 4006our $RELOAD_WATCHER; # used only during reload
3789 4007
3790sub reload_perl() { 4008sub reload_perl() {
3792 # coro crashes during coro_state_free->destroy here. 4010 # coro crashes during coro_state_free->destroy here.
3793 4011
3794 $RELOAD_WATCHER ||= cf::async { 4012 $RELOAD_WATCHER ||= cf::async {
3795 Coro::AIO::aio_wait cache_extensions; 4013 Coro::AIO::aio_wait cache_extensions;
3796 4014
3797 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4015 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3798 do_reload_perl; 4016 do_reload_perl;
3799 undef $RELOAD_WATCHER; 4017 undef $RELOAD_WATCHER;
3800 }; 4018 };
3801 }; 4019 };
3802} 4020}
3811 reload_perl; 4029 reload_perl;
3812 }; 4030 };
3813 } 4031 }
3814}; 4032};
3815 4033
3816unshift @INC, $LIBDIR; 4034#############################################################################
3817 4035
3818my $bug_warning = 0; 4036my $bug_warning = 0;
3819 4037
3820our @WAIT_FOR_TICK; 4038our @WAIT_FOR_TICK;
3821our @WAIT_FOR_TICK_BEGIN; 4039our @WAIT_FOR_TICK_BEGIN;
3822 4040
3823sub wait_for_tick { 4041sub wait_for_tick() {
3824 return if tick_inhibit || $Coro::current == $Coro::main; 4042 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3825 4043
3826 my $signal = new Coro::Signal; 4044 my $signal = new Coro::Signal;
3827 push @WAIT_FOR_TICK, $signal; 4045 push @WAIT_FOR_TICK, $signal;
3828 $signal->wait; 4046 $signal->wait;
3829} 4047}
3830 4048
3831sub wait_for_tick_begin { 4049sub wait_for_tick_begin() {
3832 return if tick_inhibit || $Coro::current == $Coro::main; 4050 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3833 4051
3834 my $signal = new Coro::Signal; 4052 my $signal = new Coro::Signal;
3835 push @WAIT_FOR_TICK_BEGIN, $signal; 4053 push @WAIT_FOR_TICK_BEGIN, $signal;
3836 $signal->wait; 4054 $signal->wait;
3837} 4055}
3843 return; 4061 return;
3844 } 4062 }
3845 4063
3846 cf::server_tick; # one server iteration 4064 cf::server_tick; # one server iteration
3847 4065
4066 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4067
3848 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4068 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3849 $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.;
3850 Coro::async_pool { 4070 Coro::async_pool {
3851 $Coro::current->{desc} = "runtime saver"; 4071 $Coro::current->{desc} = "runtime saver";
3852 write_runtime_sync 4072 write_runtime_sync
3853 or warn "ERROR: unable to write runtime file: $!"; 4073 or error "ERROR: unable to write runtime file: $!";
3854 }; 4074 };
3855 } 4075 }
3856 4076
3857 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4077 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3858 $sig->send; 4078 $sig->send;
3866 4086
3867 if (0) { 4087 if (0) {
3868 if ($NEXT_TICK) { 4088 if ($NEXT_TICK) {
3869 my $jitter = $TICK_START - $NEXT_TICK; 4089 my $jitter = $TICK_START - $NEXT_TICK;
3870 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4090 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3871 warn "jitter $JITTER\n";#d# 4091 debug "jitter $JITTER\n";#d#
3872 } 4092 }
3873 } 4093 }
3874} 4094}
3875 4095
3876{ 4096{
3877 # configure BDB 4097 # configure BDB
3878 4098
3879 BDB::min_parallel 8; 4099 BDB::min_parallel 16;
3880 BDB::max_poll_reqs $TICK * 0.1; 4100 BDB::max_poll_reqs $TICK * 0.1;
3881 $AnyEvent::BDB::WATCHER->priority (1); 4101 $AnyEvent::BDB::WATCHER->priority (1);
3882 4102
3883 unless ($DB_ENV) { 4103 unless ($DB_ENV) {
3884 $DB_ENV = BDB::db_env_create; 4104 $DB_ENV = BDB::db_env_create;
3921 IO::AIO::min_parallel 8; 4141 IO::AIO::min_parallel 8;
3922 IO::AIO::max_poll_time $TICK * 0.1; 4142 IO::AIO::max_poll_time $TICK * 0.1;
3923 undef $AnyEvent::AIO::WATCHER; 4143 undef $AnyEvent::AIO::WATCHER;
3924} 4144}
3925 4145
3926my $_log_backtrace; 4146our $_log_backtrace;
4147our $_log_backtrace_last;
3927 4148
3928sub _log_backtrace { 4149sub _log_backtrace {
3929 my ($msg, @addr) = @_; 4150 my ($msg, @addr) = @_;
3930 4151
3931 $msg =~ s/\n//; 4152 $msg =~ s/\n$//;
3932 4153
4154 if ($_log_backtrace_last eq $msg) {
4155 LOG llevInfo, "[ABT] $msg\n";
4156 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3933 # limit the # of concurrent backtraces 4157 # limit the # of concurrent backtraces
3934 if ($_log_backtrace < 2) { 4158 } elsif ($_log_backtrace < 2) {
4159 $_log_backtrace_last = $msg;
3935 ++$_log_backtrace; 4160 ++$_log_backtrace;
3936 my $perl_bt = Carp::longmess $msg; 4161 my $perl_bt = Carp::longmess $msg;
3937 async { 4162 async {
3938 $Coro::current->{desc} = "abt $msg"; 4163 $Coro::current->{desc} = "abt $msg";
3939 4164
3959 LOG llevInfo, "[ABT] $_\n" for @bt; 4184 LOG llevInfo, "[ABT] $_\n" for @bt;
3960 --$_log_backtrace; 4185 --$_log_backtrace;
3961 }; 4186 };
3962 } else { 4187 } else {
3963 LOG llevInfo, "[ABT] $msg\n"; 4188 LOG llevInfo, "[ABT] $msg\n";
3964 LOG llevInfo, "[ABT] [suppressed]\n"; 4189 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3965 } 4190 }
3966} 4191}
3967 4192
3968# load additional modules 4193# load additional modules
3969use cf::pod; 4194require "cf/$_.pm" for @EXTRA_MODULES;
4195cf::_connect_to_perl_2;
3970 4196
3971END { cf::emergency_save } 4197END { cf::emergency_save }
3972 4198
39731 41991
3974 4200

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines