ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.449 by root, Sat Sep 20 00:09:27 2008 UTC vs.
Revision 1.559 by root, Sat Feb 26 12:50:27 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines