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.466 by root, Thu Jan 8 03:03:24 2009 UTC vs.
Revision 1.565 by root, Sat Apr 30 05:41:17 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,2011 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 qw(vars subs);
27 26
28use Symbol; 27use Symbol;
29use List::Util; 28use List::Util;
30use Socket; 29use Socket;
31use EV; 30use EV;
32use Opcode; 31use Opcode;
33use Safe; 32use Safe;
34use Safe::Hole; 33use Safe::Hole;
35use Storable (); 34use Storable ();
35use Carp ();
36 36
37use Guard (); 37use Guard ();
38use Coro (); 38use Coro ();
39use Coro::State; 39use Coro::State;
40use Coro::Handle; 40use Coro::Handle;
… …
51use Coro::Util (); 51use Coro::Util ();
52 52
53use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
54use BDB (); 54use BDB ();
55use Data::Dumper; 55use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 56use Fcntl;
58use YAML (); 57use YAML::XS ();
59use IO::AIO (); 58use IO::AIO ();
60use Time::HiRes; 59use Time::HiRes;
61use Compress::LZF; 60use Compress::LZF;
62use Digest::MD5 (); 61use Digest::MD5 ();
63 62
… …
72 71
73# make sure c-lzf reinitialises itself 72# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
75Compress::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
76 75
76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
78
77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
78 82
79our %COMMAND = (); 83our %COMMAND = ();
80our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
81 85
82our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
… …
85our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
86our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
87 91
88our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
89our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
90 96
91our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
92our $DATADIR = datadir; 99our $DATADIR = datadir;
93our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
94our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
95our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
96our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
97our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
99our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
100our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
101our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
104 112
105our %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;
106 120
107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109our $NEXT_TICK; 123our $NEXT_TICK;
110our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
111 125
112our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
114our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
115our $DB_ENV; 129our $DB_ENV;
116 130
117our @EXTRA_MODULES = qw(pod mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
118 132
119our %CFG; 133our %CFG;
120 134
121our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
122our $RUNTIME; 136our $RUNTIME;
… …
134our $JITTER; # average jitter 148our $JITTER; # average jitter
135our $TICK_START; # for load detecting purposes 149our $TICK_START; # for load detecting purposes
136 150
137our @POST_INIT; 151our @POST_INIT;
138 152
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 153our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
154our $REALLY_UNLOOP; # never set to true, please :)
140 155
141binmode STDOUT; 156binmode STDOUT;
142binmode STDERR; 157binmode STDERR;
143 158
144# read virtual server time, if available 159# read virtual server time, if available
… …
146 open my $fh, "<", $RUNTIMEFILE 161 open my $fh, "<", $RUNTIMEFILE
147 or die "unable to read $RUNTIMEFILE file: $!"; 162 or die "unable to read $RUNTIMEFILE file: $!";
148 $RUNTIME = <$fh> + 0.; 163 $RUNTIME = <$fh> + 0.;
149} 164}
150 165
166eval "sub TICK() { $TICK } 1" or die;
167
151mkdir $_ 168mkdir $_
152 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 169 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
153 170
154our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
155 172
156sub 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::"} };
157 189
158############################################################################# 190#############################################################################
159 191
160=head2 GLOBAL VARIABLES 192=head2 GLOBAL VARIABLES
161 193
… …
203from wherever your confdir points to. 235from wherever your confdir points to.
204 236
205=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
206 238
207These 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
208returns 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
209per 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.
210 242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
247
211=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
212 249
213This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
214C<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
215that call. 252that call.
216 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
217=back 260=back
218 261
219=cut 262=cut
220 263
221BEGIN { 264sub error(@) { LOG llevError, join "", @_ }
222 *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 {
223 my $msg = join "", @_; 271 my $msg = join "", @_;
224 272
225 $msg .= "\n" 273 $msg .= "\n"
226 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
227 275
228 $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;
229 277
230 LOG llevError, $msg; 278 LOG llevWarn, $msg;
231 }; 279};
232}
233 280
234$Coro::State::DIEHOOK = sub { 281$Coro::State::DIEHOOK = sub {
235 return unless $^S eq 0; # "eq", not "==" 282 return unless $^S eq 0; # "eq", not "=="
236 283
237 if ($Coro::current == $Coro::main) {#d# 284 error Carp::longmess $_[0];
285
286 if (in_main) {#d#
238 warn "DIEHOOK called in main context, Coro bug?\n";#d# 287 error "DIEHOOK called in main context, Coro bug?\n";#d#
239 return;#d# 288 return;#d#
240 }#d# 289 }#d#
241 290
242 # kill coroutine otherwise 291 # kill coroutine otherwise
243 warn Carp::longmess $_[0];
244 Coro::terminate 292 Coro::terminate
245}; 293};
246
247$SIG{__DIE__} = sub { }; #d#?
248 294
249@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 295@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
250@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 296@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
251@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 297@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
252@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 298@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
266)) { 312)) {
267 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
268} 314}
269 315
270$EV::DIED = sub { 316$EV::DIED = sub {
271 warn "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
272}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
273 324
274############################################################################# 325#############################################################################
275 326
276=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
277 328
… …
298 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 349 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
299 $d 350 $d
300 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
301} 352}
302 353
354=item $scalar = load_file $path
355
356Loads the given file from path and returns its contents. Croaks on error
357and can block.
358
359=cut
360
361sub load_file($) {
362 0 <= aio_load $_[0], my $data
363 or Carp::croak "$_[0]: $!";
364
365 $data
366}
367
303=item $ref = cf::decode_json $json 368=item $ref = cf::decode_json $json
304 369
305Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
306 371
307=item $json = cf::encode_json $ref 372=item $json = cf::encode_json $ref
… …
313our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 378our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
314 379
315sub encode_json($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
316sub decode_json($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
317 382
383=item $ref = cf::decode_storable $scalar
384
385Same as Coro::Storable::thaw, so blocks.
386
387=cut
388
389BEGIN { *decode_storable = \&Coro::Storable::thaw }
390
391=item $ref = cf::decode_yaml $scalar
392
393Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
394
395=cut
396
397sub decode_yaml($) {
398 fork_call { YAML::XS::Load $_[0] } @_
399}
400
401=item $scalar = cf::unlzf $scalar
402
403Same as Compress::LZF::compress, but takes server ticks into account, so
404blocks.
405
406=cut
407
408sub unlzf($) {
409 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
410 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
411 Compress::LZF::decompress $_[0]
412}
413
318=item cf::post_init { BLOCK } 414=item cf::post_init { BLOCK }
319 415
320Execute the given codeblock, I<after> all extensions have been (re-)loaded, 416Execute the given codeblock, I<after> all extensions have been (re-)loaded,
321but I<before> the server starts ticking again. 417but I<before> the server starts ticking again.
322 418
323The cdoeblock will have a single boolean argument to indicate whether this 419The codeblock will have a single boolean argument to indicate whether this
324is a reload or not. 420is a reload or not.
325 421
326=cut 422=cut
327 423
328sub post_init(&) { 424sub post_init(&) {
329 push @POST_INIT, shift; 425 push @POST_INIT, shift;
426}
427
428sub _post_init {
429 trace "running post_init jobs";
430
431 # run them in parallel...
432
433 my @join;
434
435 while () {
436 push @join, map &Coro::async ($_, 0), @POST_INIT;
437 @POST_INIT = ();
438
439 @join or last;
440
441 (pop @join)->join;
442 }
330} 443}
331 444
332=item cf::lock_wait $string 445=item cf::lock_wait $string
333 446
334Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
… …
373} 486}
374 487
375=item cf::periodic $interval, $cb 488=item cf::periodic $interval, $cb
376 489
377Like EV::periodic, but randomly selects a starting point so that the actions 490Like EV::periodic, but randomly selects a starting point so that the actions
378get spread over timer. 491get spread over time.
379 492
380=cut 493=cut
381 494
382sub periodic($$) { 495sub periodic($$) {
383 my ($interval, $cb) = @_; 496 my ($interval, $cb) = @_;
… …
387 EV::periodic $start, $interval, 0, $cb 500 EV::periodic $start, $interval, 0, $cb
388} 501}
389 502
390=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
391 504
392Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
393This call blocks and returns only when you have at least C<$time> seconds 506(default: 0): This call blocks and returns only when you have at least
394of cpu time till the next tick. The slot is only valid till the next cede. 507C<$time> seconds of cpu time till the next tick. The slot is only valid
508till the next cede.
509
510Background jobs should use a priority les than zero, interactive jobs
511should use 100 or more.
395 512
396The optional C<$name> can be used to identify the job to run. It might be 513The optional C<$name> can be used to identify the job to run. It might be
397used for statistical purposes and should identify the same time-class. 514used for statistical purposes and should identify the same time-class.
398 515
399Useful for short background jobs. 516Useful for short background jobs.
400 517
401=cut 518=cut
402 519
403our @SLOT_QUEUE; 520our @SLOT_QUEUE;
404our $SLOT_QUEUE; 521our $SLOT_QUEUE;
522our $SLOT_DECAY = 0.9;
405 523
406$SLOT_QUEUE->cancel if $SLOT_QUEUE; 524$SLOT_QUEUE->cancel if $SLOT_QUEUE;
407$SLOT_QUEUE = Coro::async { 525$SLOT_QUEUE = Coro::async {
408 $Coro::current->desc ("timeslot manager"); 526 $Coro::current->desc ("timeslot manager");
409 527
410 my $signal = new Coro::Signal; 528 my $signal = new Coro::Signal;
529 my $busy;
411 530
412 while () { 531 while () {
413 next_job: 532 next_job:
533
414 my $avail = cf::till_tick; 534 my $avail = cf::till_tick;
415 if ($avail > 0.01) { 535
416 for (0 .. $#SLOT_QUEUE) { 536 for (0 .. $#SLOT_QUEUE) {
417 if ($SLOT_QUEUE[$_][0] < $avail) { 537 if ($SLOT_QUEUE[$_][0] <= $avail) {
538 $busy = 0;
418 my $job = splice @SLOT_QUEUE, $_, 1, (); 539 my $job = splice @SLOT_QUEUE, $_, 1, ();
419 $job->[2]->send; 540 $job->[2]->send;
420 Coro::cede; 541 Coro::cede;
421 goto next_job; 542 goto next_job;
422 } 543 } else {
544 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
423 } 545 }
424 } 546 }
425 547
426 if (@SLOT_QUEUE) { 548 if (@SLOT_QUEUE) {
427 # we do not use wait_for_tick() as it returns immediately when tick is inactive 549 # we do not use wait_for_tick() as it returns immediately when tick is inactive
428 push @cf::WAIT_FOR_TICK, $signal; 550 push @cf::WAIT_FOR_TICK, $signal;
429 $signal->wait; 551 $signal->wait;
430 } else { 552 } else {
553 $busy = 0;
431 Coro::schedule; 554 Coro::schedule;
432 } 555 }
433 } 556 }
434}; 557};
435 558
436sub get_slot($;$$) { 559sub get_slot($;$$) {
437 return if tick_inhibit || $Coro::current == $Coro::main; 560 return if tick_inhibit || $Coro::current == $Coro::main;
438 561
439 my ($time, $pri, $name) = @_; 562 my ($time, $pri, $name) = @_;
440 563
441 $time = $TICK * .6 if $time > $TICK * .6; 564 $time = clamp $time, 0.01, $TICK * .6;
565
442 my $sig = new Coro::Signal; 566 my $sig = new Coro::Signal;
443 567
444 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 568 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
445 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 569 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
446 $SLOT_QUEUE->ready; 570 $SLOT_QUEUE->ready;
… …
472=cut 596=cut
473 597
474sub sync_job(&) { 598sub sync_job(&) {
475 my ($job) = @_; 599 my ($job) = @_;
476 600
477 if ($Coro::current == $Coro::main) { 601 if (in_main) {
478 my $time = EV::time; 602 my $time = AE::time;
479 603
480 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
481 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
482 606
483 LOG llevError, Carp::longmess "sync job";#d# 607 #LOG llevError, Carp::longmess "sync job";#d#
484 608
485 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
486 610
487 my $busy = 1; 611 my $busy = 1;
488 my @res; 612 my @res;
489 613
490 (async { 614 (async {
491 $Coro::current->desc ("sync job coro"); 615 $Coro::current->desc ("sync job coro");
492 @res = eval { $job->() }; 616 @res = eval { $job->() };
493 warn $@ if $@; 617 error $@ if $@;
494 undef $busy; 618 undef $busy;
495 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
496 620
497 while ($busy) { 621 while ($busy) {
498 if (Coro::nready) { 622 if (Coro::nready) {
… …
500 } else { 624 } else {
501 EV::loop EV::LOOP_ONESHOT; 625 EV::loop EV::LOOP_ONESHOT;
502 } 626 }
503 } 627 }
504 628
505 my $time = EV::time - $time; 629 my $time = AE::time - $time;
506 630
507 $TICK_START += $time; # do not account sync jobs to server load 631 $TICK_START += $time; # do not account sync jobs to server load
508 632
509 wantarray ? @res : $res[0] 633 wantarray ? @res : $res[0]
510 } else { 634 } else {
… …
532 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
533 657
534 $coro 658 $coro
535} 659}
536 660
537=item fork_call { }, $args 661=item fork_call { }, @args
538 662
539Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
540process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
541Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
542never block itself or use any form of event handling. 666never block itself or use any form of event handling.
543 667
544=cut 668=cut
545 669
670sub post_fork {
671 reset_signals;
672}
673
546sub fork_call(&@) { 674sub fork_call(&@) {
547 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
548 676
549 # we seemingly have to make a local copy of the whole thing, 677 # we seemingly have to make a local copy of the whole thing,
550 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
551 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
552 680
553 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
554 reset_signals; 682 cf::post_fork;
555 &$cb 683 &$cb
556 }, @args; 684 } @args;
557 685
558 wantarray ? @res : $res[-1] 686 wantarray ? @res : $res[-1]
687}
688
689sub objinfo {
690 (
691 "counter value" => cf::object::object_count,
692 "objects created" => cf::object::create_count,
693 "objects destroyed" => cf::object::destroy_count,
694 "freelist size" => cf::object::free_count,
695 "allocated objects" => cf::object::objects_size,
696 "active objects" => cf::object::actives_size,
697 )
559} 698}
560 699
561=item $coin = coin_from_name $name 700=item $coin = coin_from_name $name
562 701
563=cut 702=cut
… …
600within each server. 739within each server.
601 740
602=cut 741=cut
603 742
604sub db_table($) { 743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
605 my ($name) = @_; 747 my ($name) = @_;
606 my $db = BDB::db_create $DB_ENV; 748 my $db = BDB::db_create $DB_ENV;
607 749
608 eval { 750 eval {
609 $db->set_flags (BDB::CHKSUM); 751 $db->set_flags (BDB::CHKSUM);
… …
619} 761}
620 762
621our $DB; 763our $DB;
622 764
623sub db_init { 765sub db_init {
624 cf::sync_job {
625 $DB ||= db_table "db"; 766 $DB ||= db_table "db";
626 };
627} 767}
628 768
629sub db_get($$) { 769sub db_get($$) {
630 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
631 771
632 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
633 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
634 776
635 $! ? () 777 $! ? ()
636 : $data 778 : $data
637 }
638} 779}
639 780
640sub db_put($$$) { 781sub db_put($$$) {
641 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
642 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
670 811
671 my @data; 812 my @data;
672 my $md5; 813 my $md5;
673 814
674 for (0 .. $#$src) { 815 for (0 .. $#$src) {
675 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
676 or Carp::croak "$src->[$_]: $!";
677 } 817 }
678 818
679 # if processing is expensive, check 819 # if processing is expensive, check
680 # checksum first 820 # checksum first
681 if (1) { 821 if (1) {
… …
698 838
699 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
700 my $data = $process->(\@data); 840 my $data = $process->(\@data);
701 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
702 842
703 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
704 844
705 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
706 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
707 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
708 848
… …
718 858
719=cut 859=cut
720 860
721sub datalog($@) { 861sub datalog($@) {
722 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
723 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
724} 864}
725 865
726=back 866=back
727 867
728=cut 868=cut
… …
923 1063
924 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
925 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
926 1066
927 } elsif (ref $type) { 1067 } elsif (ref $type) {
928 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
929 1069
930 } else { 1070 } else {
931 shift @arg; 1071 shift @arg;
932 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
933 } 1073 }
934 } 1074 }
935} 1075}
936 1076
937sub _object_attach { 1077sub _object_attach {
… …
947 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
948 } 1088 }
949 1089
950 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
951 } else { 1091 } else {
952 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
953 } 1093 }
954 1094
955 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
956} 1096}
957 1097
… …
1016 1156
1017 for (@$callbacks) { 1157 for (@$callbacks) {
1018 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
1019 1159
1020 if ($@) { 1160 if ($@) {
1021 warn "$@";
1022 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1023 override; 1162 override;
1024 } 1163 }
1025 1164
1026 return 1 if $override; 1165 return 1 if $override;
1027 } 1166 }
… …
1106 for (@$attach) { 1245 for (@$attach) {
1107 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
1108 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
1109 } 1248 }
1110 } else { 1249 } else {
1111 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
1112 } 1251 }
1113 } 1252 }
1114} 1253}
1115 1254
1116cf::attachable->attach ( 1255cf::attachable->attach (
… …
1143 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1144 1283
1145 sync_job { 1284 sync_job {
1146 if (length $$rdata) { 1285 if (length $$rdata) {
1147 utf8::decode (my $decname = $filename); 1286 utf8::decode (my $decname = $filename);
1148 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1149 $decname, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1150 1290
1151 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1152 aio_chmod $fh, SAVE_MODE; 1292 aio_chmod $fh, SAVE_MODE;
1153 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1154 aio_fsync $fh if $cf::USE_FSYNC; 1294 if ($cf::USE_FSYNC) {
1295 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;
1296 aio_fsync $fh;
1297 }
1155 aio_close $fh; 1298 aio_close $fh;
1156 1299
1157 if (@$objs) { 1300 if (@$objs) {
1158 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1301 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1159 aio_chmod $fh, SAVE_MODE; 1302 aio_chmod $fh, SAVE_MODE;
1160 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1303 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1161 aio_write $fh, 0, (length $data), $data, 0; 1304 aio_write $fh, 0, (length $data), $data, 0;
1162 aio_fsync $fh if $cf::USE_FSYNC; 1305 if ($cf::USE_FSYNC) {
1306 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;
1307 aio_fsync $fh;
1308 }
1163 aio_close $fh; 1309 aio_close $fh;
1164 aio_rename "$filename.pst~", "$filename.pst"; 1310 aio_rename "$filename.pst~", "$filename.pst";
1165 } 1311 }
1166 } else { 1312 } else {
1167 aio_unlink "$filename.pst"; 1313 aio_unlink "$filename.pst";
… …
1170 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1171 1317
1172 $filename =~ s%/[^/]+$%%; 1318 $filename =~ s%/[^/]+$%%;
1173 aio_pathsync $filename if $cf::USE_FSYNC; 1319 aio_pathsync $filename if $cf::USE_FSYNC;
1174 } else { 1320 } else {
1175 warn "unable to save objects: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1176 } 1322 }
1177 } else { 1323 } else {
1178 aio_unlink $filename; 1324 aio_unlink $filename;
1179 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1180 } 1326 }
… …
1204 my $st = eval { Coro::Storable::thaw $av }; 1350 my $st = eval { Coro::Storable::thaw $av };
1205 $av = $st->{objs}; 1351 $av = $st->{objs};
1206 } 1352 }
1207 1353
1208 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1209 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1210 $decname, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1211 1358
1212 ($data, $av) 1359 ($data, $av)
1213} 1360}
1214 1361
1215=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
… …
1274} 1421}
1275 1422
1276use File::Glob (); 1423use File::Glob ();
1277 1424
1278cf::player->attach ( 1425cf::player->attach (
1279 on_command => sub { 1426 on_unknown_command => sub {
1280 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
1281 1428
1282 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
1283 or return; 1430 or return;
1284 1431
… …
1307 1454
1308 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1309 if $reply; 1456 if $reply;
1310 1457
1311 } else { 1458 } else {
1312 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1313 } 1460 }
1314 1461
1315 cf::override; 1462 cf::override;
1316 }, 1463 },
1317); 1464);
1318 1465
1319# "readahead" all extensions 1466# "readahead" all extensions
1320sub cache_extensions { 1467sub cache_extensions {
1321 my $grp = IO::AIO::aio_group; 1468 my $grp = IO::AIO::aio_group;
1322 1469
1323 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1470 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1324 for (grep /\.ext$/, @{$_[0]}) { 1471 for (grep /\.ext$/, @{$_[0]}) {
1325 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1472 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1326 } 1473 }
1327 }; 1474 };
1328 1475
1329 $grp 1476 $grp
1330} 1477}
1331 1478
1332sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1333 cf::sync_job { 1482 cf::sync_job {
1334 my %todo; 1483 my %todo;
1335 1484
1336 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1337 next unless -r $path; 1486 next unless -r $path;
… …
1355 1504
1356 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1357 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1358 1507
1359 $ext{source} = 1508 $ext{source} =
1360 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1361 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1362 . $source 1511 . $source
1363 . "\n};\n1"; 1512 . "\n};\n1";
1364 1513
1365 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
1366 } 1515 }
1367 1516
1517 my $pass = 0;
1368 my %done; 1518 my %done;
1369 while (%todo) { 1519 while (%todo) {
1370 my $progress; 1520 my $progress;
1371 1521
1522 ++$pass;
1523
1524 ext:
1372 while (my ($k, $v) = each %todo) { 1525 while (my ($k, $v) = each %todo) {
1373 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1374 goto skip 1527 next ext
1375 unless exists $done{$_}; 1528 unless exists $done{$_};
1376 } 1529 }
1377 1530
1378 warn "... loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1379 1532
1380 unless (eval $v->{source}) { 1533 my $active = eval $v->{source};
1534
1535 if (length $@) {
1381 my $msg = $@ ? "$v->{path}: $@\n" 1536 error "$v->{path}: $@\n";
1382 : "$v->{base}: extension inactive.\n";
1383 1537
1384 if (exists $v->{meta}{mandatory}) {
1385 warn $msg;
1386 cf::cleanup "mandatory extension failed to load, exiting."; 1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1387 } 1539 if exists $v->{meta}{mandatory};
1388 1540
1389 warn $msg; 1541 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1542 delete $todo{$k};
1543 } else {
1544 $done{$k} = delete $todo{$k};
1545 push @EXTS, $v->{pkg};
1546 $progress = 1;
1547
1548 info "$v->{base}: extension inactive.\n"
1549 unless $active;
1390 } 1550 }
1391
1392 $done{$k} = delete $todo{$k};
1393 push @EXTS, $v->{pkg};
1394 $progress = 1;
1395 } 1551 }
1396 1552
1397 skip: 1553 unless ($progress) {
1398 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1554 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1399 unless $progress; 1555
1556 while (my ($k, $v) = each %todo) {
1557 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1558 if exists $v->{meta}{mandatory};
1559 }
1560
1561 last;
1562 }
1400 } 1563 }
1401 }; 1564 };
1402} 1565}
1403 1566
1404############################################################################# 1567#############################################################################
… …
1488 $cf::PLAYER{$login} = $pl 1651 $cf::PLAYER{$login} = $pl
1489 } 1652 }
1490 } 1653 }
1491} 1654}
1492 1655
1656cf::player->attach (
1657 on_load => sub {
1658 my ($pl, $path) = @_;
1659
1660 # restore slots saved in save, below
1661 my $slots = delete $pl->{_slots};
1662
1663 $pl->ob->current_weapon ($slots->[0]);
1664 $pl->combat_ob ($slots->[1]);
1665 $pl->ranged_ob ($slots->[2]);
1666 },
1667);
1668
1493sub save($) { 1669sub save($) {
1494 my ($pl) = @_; 1670 my ($pl) = @_;
1495 1671
1496 return if $pl->{deny_save}; 1672 return if $pl->{deny_save};
1497 1673
… …
1502 1678
1503 aio_mkdir playerdir $pl, 0770; 1679 aio_mkdir playerdir $pl, 0770;
1504 $pl->{last_save} = $cf::RUNTIME; 1680 $pl->{last_save} = $cf::RUNTIME;
1505 1681
1506 cf::get_slot 0.01; 1682 cf::get_slot 0.01;
1683
1684 # save slots, to be restored later
1685 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1507 1686
1508 $pl->save_pl ($path); 1687 $pl->save_pl ($path);
1509 cf::cede_to_tick; 1688 cf::cede_to_tick;
1510} 1689}
1511 1690
… …
1545 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1546 1725
1547 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1548 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1727 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1549 1728
1550 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1551 $pl->deactivate; 1730 $pl->deactivate;
1731
1552 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1732 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1553 $pl->ob->check_score;
1554 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1555 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1556 1737
1557 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1558 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1559 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
… …
1613 \@logins 1794 \@logins
1614} 1795}
1615 1796
1616=item $player->maps 1797=item $player->maps
1617 1798
1799=item cf::player::maps $login
1800
1618Returns an arrayref of map paths that are private for this 1801Returns an arrayref of map paths that are private for this
1619player. May block. 1802player. May block.
1620 1803
1621=cut 1804=cut
1622 1805
… …
1684=cut 1867=cut
1685 1868
1686sub find_by_path($) { 1869sub find_by_path($) {
1687 my ($path) = @_; 1870 my ($path) = @_;
1688 1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1873
1689 my ($match, $specificity); 1874 my ($match, $specificity);
1690 1875
1691 for my $region (list) { 1876 for my $region (list) {
1692 if ($region->{match} && $path =~ $region->{match}) { 1877 if ($region->{match} && $path =~ $region->{match}) {
1693 ($match, $specificity) = ($region, $region->specificity) 1878 ($match, $specificity) = ($region, $region->specificity)
… …
1721sub generate_random_map { 1906sub generate_random_map {
1722 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1723 1908
1724 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1909 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1725 1910
1726 # mit "rum" bekleckern, nicht
1727 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1728 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1729 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1730 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1731 $rmp->{exit_on_final_map},
1732 $rmp->{xsize}, $rmp->{ysize},
1733 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1734 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1735 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1736 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1737 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1738 (cf::region::find $rmp->{region}), $rmp->{custom}
1739 )
1740} 1912}
1741 1913
1742=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1743 1915
1744Register a handler for the map path matching the given regex at the 1916Register a handler for the map path matching the given regex at the
… …
1749 1921
1750sub register { 1922sub register {
1751 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1752 my $pkg = caller; 1924 my $pkg = caller;
1753 1925
1754 no strict;
1755 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1756 1927
1757 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1758} 1929}
1759 1930
1760# also paths starting with '/' 1931# also paths starting with '/'
1761$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1762 1933
1763sub thawer_merge { 1934sub thawer_merge {
1764 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1765 1936
1766 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
… …
1771} 1942}
1772 1943
1773sub normalise { 1944sub normalise {
1774 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1775 1946
1776 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1777 1948
1778 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1779 1950
1780 # map plan: 1951 # map plan:
1781 # 1952 #
… …
1783 # {... are special paths that are not being touched 1954 # {... are special paths that are not being touched
1784 # ?xxx/... are special absolute paths 1955 # ?xxx/... are special absolute paths
1785 # ?random/... random maps 1956 # ?random/... random maps
1786 # /... normal maps 1957 # /... normal maps
1787 # ~user/... per-player map of a specific user 1958 # ~user/... per-player map of a specific user
1959 # !up !down for quad maps, or other maps with up/down layers
1788 1960
1789 $path =~ s/$PATH_SEP/\//go; 1961 $path =~ s/$PATH_SEP/\//go;
1790 1962
1791 # treat it as relative path if it starts with 1963 # treat it as relative path if it starts with
1792 # something that looks reasonable 1964 # something that looks reasonable
1793 if ($path =~ m{^(?:\./|\.\./|\w)}) { 1965 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1794 $base or Carp::carp "normalise called with relative path and no base: '$path'"; 1966 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1795 1967
1796 $base =~ s{[^/]+/?$}{}; 1968 $base =~ s{[^/]+/?$}{};
1797 $path = "$base/$path"; 1969 $path = "$base/$path";
1970
1971 } elsif ($path eq '!up') {
1972 $base && ref $base
1973 or Carp::carp "normalise called with relative tile path and no base: '$path'";
1974
1975 my $uppth = $base->tile_path (cf::TILE_UP);
1976 $path = $uppth if $uppth;
1977
1978 } elsif ($path eq '!down') {
1979 $base && ref $base
1980 or Carp::carp "normalise called with relative tile path and no base: '$path'";
1981
1982 my $dpth = $base->tile_path (cf::TILE_DOWN);
1983 $path = $dpth if $dpth;
1798 } 1984 }
1799 1985
1800 for ($path) { 1986 for ($path) {
1801 redo if s{//}{/};
1802 redo if s{/\.?/}{/}; 1987 redo if s{/\.?/}{/};
1803 redo if s{/[^/]+/\.\./}{/}; 1988 redo if s{/[^/]+/\.\./}{/};
1804 } 1989 }
1805 1990
1806 $path 1991 $path
… …
1820 $self->init; # pass $1 etc. 2005 $self->init; # pass $1 etc.
1821 return $self; 2006 return $self;
1822 } 2007 }
1823 } 2008 }
1824 2009
1825 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2010 Carp::cluck "unable to resolve path '$path' (base '$base')";
1826 () 2011 ()
1827} 2012}
1828 2013
2014# may re-bless or do other evil things
1829sub init { 2015sub init {
1830 my ($self) = @_; 2016 my ($self) = @_;
1831 2017
1832 $self 2018 $self
1833} 2019}
… …
1953 2139
1954sub find; 2140sub find;
1955sub find { 2141sub find {
1956 my ($path, $origin) = @_; 2142 my ($path, $origin) = @_;
1957 2143
2144 cf::cede_to_tick;
2145
1958 $path = normalise $path, $origin && $origin->path; 2146 $path = normalise $path, $origin;
1959 2147
1960 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2148 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1961 my $guard2 = cf::lock_acquire "map_find:$path"; 2149 my $guard2 = cf::lock_acquire "map_find:$path";
1962 2150
1963 $cf::MAP{$path} || do { 2151 $cf::MAP{$path} || do {
… …
1980 2168
1981 $cf::MAP{$path} = $map 2169 $cf::MAP{$path} = $map
1982 } 2170 }
1983} 2171}
1984 2172
1985sub pre_load { } 2173sub pre_load { }
1986sub post_load { } 2174#sub post_load { } # XS
1987 2175
1988sub load { 2176sub load {
1989 my ($self) = @_; 2177 my ($self) = @_;
1990 2178
1991 local $self->{deny_reset} = 1; # loading can take a long time 2179 local $self->{deny_reset} = 1; # loading can take a long time
… …
2003 $self->alloc; 2191 $self->alloc;
2004 2192
2005 $self->pre_load; 2193 $self->pre_load;
2006 cf::cede_to_tick; 2194 cf::cede_to_tick;
2007 2195
2196 if (exists $self->{load_path}) {
2008 my $f = new_from_file cf::object::thawer $self->{load_path}; 2197 my $f = new_from_file cf::object::thawer $self->{load_path};
2009 $f->skip_block; 2198 $f->skip_block;
2010 $self->_load_objects ($f) 2199 $self->_load_objects ($f)
2011 or return; 2200 or return;
2012 2201
2013 $self->post_load_original 2202 $self->post_load_original
2014 if delete $self->{load_original}; 2203 if delete $self->{load_original};
2015 2204
2016 if (my $uniq = $self->uniq_path) { 2205 if (my $uniq = $self->uniq_path) {
2017 utf8::encode $uniq; 2206 utf8::encode $uniq;
2018 unless (aio_stat $uniq) { 2207 unless (aio_stat $uniq) {
2019 if (my $f = new_from_file cf::object::thawer $uniq) { 2208 if (my $f = new_from_file cf::object::thawer $uniq) {
2020 $self->clear_unique_items; 2209 $self->clear_unique_items;
2021 $self->_load_objects ($f); 2210 $self->_load_objects ($f);
2022 $f->resolve_delayed_derefs; 2211 $f->resolve_delayed_derefs;
2212 }
2023 } 2213 }
2024 } 2214 }
2025 }
2026 2215
2027 $f->resolve_delayed_derefs; 2216 $f->resolve_delayed_derefs;
2217 }
2028 2218
2029 cf::cede_to_tick; 2219 cf::cede_to_tick;
2030 # now do the right thing for maps 2220 # now do the right thing for maps
2031 $self->link_multipart_objects; 2221 $self->link_multipart_objects;
2032 $self->difficulty ($self->estimate_difficulty) 2222 $self->difficulty ($self->estimate_difficulty)
… …
2046 2236
2047 $self->in_memory (cf::MAP_ACTIVE); 2237 $self->in_memory (cf::MAP_ACTIVE);
2048 } 2238 }
2049 2239
2050 $self->post_load; 2240 $self->post_load;
2051}
2052 2241
2242 1
2243}
2244
2245# customize the map for a given player, i.e.
2246# return the _real_ map. used by e.g. per-player
2247# maps to change the path to ~playername/mappath
2053sub customise_for { 2248sub customise_for {
2054 my ($self, $ob) = @_; 2249 my ($self, $ob) = @_;
2055 2250
2056 return find "~" . $ob->name . "/" . $self->{path} 2251 return find "~" . $ob->name . "/" . $self->{path}
2057 if $self->per_player; 2252 if $self->per_player;
… …
2073 or next; 2268 or next;
2074 $neigh = find $neigh, $map 2269 $neigh = find $neigh, $map
2075 or next; 2270 or next;
2076 $neigh->load; 2271 $neigh->load;
2077 2272
2273 # now find the diagonal neighbours
2078 push @neigh, 2274 push @neigh,
2079 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2275 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2080 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2276 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2081 } 2277 }
2082 2278
… …
2089} 2285}
2090 2286
2091sub find_sync { 2287sub find_sync {
2092 my ($path, $origin) = @_; 2288 my ($path, $origin) = @_;
2093 2289
2094 cf::sync_job { find $path, $origin } 2290 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2291 if $Coro::current == $Coro::main;
2292
2293 find $path, $origin
2095} 2294}
2096 2295
2097sub do_load_sync { 2296sub do_load_sync {
2098 my ($map) = @_; 2297 my ($map) = @_;
2099 2298
2100 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2299 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2101 if $Coro::current == $Coro::main; 2300 if $Coro::current == $Coro::main;
2102 2301
2103 cf::sync_job { $map->load }; 2302 $map->load;
2104} 2303}
2105 2304
2106our %MAP_PREFETCH; 2305our %MAP_PREFETCH;
2107our $MAP_PREFETCHER = undef; 2306our $MAP_PREFETCHER = undef;
2108 2307
2109sub find_async { 2308sub find_async {
2110 my ($path, $origin, $load) = @_; 2309 my ($path, $origin, $load) = @_;
2111 2310
2112 $path = normalise $path, $origin && $origin->{path}; 2311 $path = normalise $path, $origin;
2113 2312
2114 if (my $map = $cf::MAP{$path}) { 2313 if (my $map = $cf::MAP{$path}) {
2115 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2314 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2116 } 2315 }
2117 2316
… …
2134 $MAP_PREFETCHER->prio (6); 2333 $MAP_PREFETCHER->prio (6);
2135 2334
2136 () 2335 ()
2137} 2336}
2138 2337
2338# common code, used by both ->save and ->swapout
2139sub save { 2339sub _save {
2140 my ($self) = @_; 2340 my ($self) = @_;
2141
2142 my $lock = cf::lock_acquire "map_data:$self->{path}";
2143 2341
2144 $self->{last_save} = $cf::RUNTIME; 2342 $self->{last_save} = $cf::RUNTIME;
2145 2343
2146 return unless $self->dirty; 2344 return unless $self->dirty;
2147 2345
… …
2167 } else { 2365 } else {
2168 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2366 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2169 } 2367 }
2170} 2368}
2171 2369
2370sub save {
2371 my ($self) = @_;
2372
2373 my $lock = cf::lock_acquire "map_data:$self->{path}";
2374
2375 $self->_save;
2376}
2377
2172sub swap_out { 2378sub swap_out {
2173 my ($self) = @_; 2379 my ($self) = @_;
2174 2380
2175 # save first because save cedes
2176 $self->save;
2177
2178 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2381 my $lock = cf::lock_acquire "map_data:$self->{path}";
2179 2382
2180 return if $self->players;
2181 return if $self->in_memory != cf::MAP_ACTIVE; 2383 return if $self->in_memory != cf::MAP_ACTIVE;
2182 return if $self->{deny_save}; 2384 return if $self->{deny_save};
2385 return if $self->players;
2183 2386
2387 # first deactivate the map and "unlink" it from the core
2388 $self->deactivate;
2389 $_->clear_links_to ($self) for values %cf::MAP;
2184 $self->in_memory (cf::MAP_SWAPPED); 2390 $self->in_memory (cf::MAP_SWAPPED);
2391
2392 # then atomically save
2393 $self->_save;
2394
2395 # then free the map
2396 $self->clear;
2397}
2398
2399sub reset_at {
2400 my ($self) = @_;
2401
2402 # TODO: safety, remove and allow resettable per-player maps
2403 return 1e99 if $self->{deny_reset};
2404
2405 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2406 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2407
2408 $time + $to
2409}
2410
2411sub should_reset {
2412 my ($self) = @_;
2413
2414 $self->reset_at <= $cf::RUNTIME
2415}
2416
2417sub reset {
2418 my ($self) = @_;
2419
2420 my $lock = cf::lock_acquire "map_data:$self->{path}";
2421
2422 return if $self->players;
2423
2424 cf::trace "resetting map ", $self->path, "\n";
2425
2426 $self->in_memory (cf::MAP_SWAPPED);
2427
2428 # need to save uniques path
2429 unless ($self->{deny_save}) {
2430 my $uniq = $self->uniq_path; utf8::encode $uniq;
2431
2432 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2433 if $uniq;
2434 }
2435
2436 delete $cf::MAP{$self->path};
2185 2437
2186 $self->deactivate; 2438 $self->deactivate;
2187 $_->clear_links_to ($self) for values %cf::MAP; 2439 $_->clear_links_to ($self) for values %cf::MAP;
2188 $self->clear; 2440 $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 2441
2234 $self->unlink_save; 2442 $self->unlink_save;
2235 $self->destroy; 2443 $self->destroy;
2236} 2444}
2237 2445
… …
2245 2453
2246 delete $cf::MAP{$self->path}; 2454 delete $cf::MAP{$self->path};
2247 2455
2248 $self->unlink_save; 2456 $self->unlink_save;
2249 2457
2250 bless $self, "cf::map"; 2458 bless $self, "cf::map::wrap";
2251 delete $self->{deny_reset}; 2459 delete $self->{deny_reset};
2252 $self->{deny_save} = 1; 2460 $self->{deny_save} = 1;
2253 $self->reset_timeout (1); 2461 $self->reset_timeout (1);
2254 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2462 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2255 2463
… …
2312 : normalise $_ 2520 : normalise $_
2313 } @{ aio_readdir $UNIQUEDIR or [] } 2521 } @{ aio_readdir $UNIQUEDIR or [] }
2314 ] 2522 ]
2315} 2523}
2316 2524
2525=item cf::map::static_maps
2526
2527Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2528file in the shared directory excluding F</styles> and F</editor>). May
2529block.
2530
2531=cut
2532
2533sub static_maps() {
2534 my @dirs = "";
2535 my @maps;
2536
2537 while (@dirs) {
2538 my $dir = shift @dirs;
2539
2540 next if $dir eq "/styles" || $dir eq "/editor";
2541
2542 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2543 or return;
2544
2545 for (@$files) {
2546 s/\.map$// or next;
2547 utf8::decode $_;
2548 push @maps, "$dir/$_";
2549 }
2550
2551 push @dirs, map "$dir/$_", @$dirs;
2552 }
2553
2554 \@maps
2555}
2556
2317=back 2557=back
2318 2558
2319=head3 cf::object 2559=head3 cf::object
2320 2560
2321=cut 2561=cut
… …
2386 2626
2387our $SAY_CHANNEL = { 2627our $SAY_CHANNEL = {
2388 id => "say", 2628 id => "say",
2389 title => "Map", 2629 title => "Map",
2390 reply => "say ", 2630 reply => "say ",
2391 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2631 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2392}; 2632};
2393 2633
2394our $CHAT_CHANNEL = { 2634our $CHAT_CHANNEL = {
2395 id => "chat", 2635 id => "chat",
2396 title => "Chat", 2636 title => "Chat",
… …
2453 2693
2454Freezes the player and moves him/her to a special map (C<{link}>). 2694Freezes the player and moves him/her to a special map (C<{link}>).
2455 2695
2456The player should be reasonably safe there for short amounts of time (e.g. 2696The 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, 2697for 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 2698though, as the player cannot control the character while it is on the link
2459map. 2699map.
2460 2700
2461Will never block. 2701Will never block.
2462 2702
2463=item $player_object->leave_link ($map, $x, $y) 2703=item $player_object->leave_link ($map, $x, $y)
… …
2484sub cf::object::player::enter_link { 2724sub cf::object::player::enter_link {
2485 my ($self) = @_; 2725 my ($self) = @_;
2486 2726
2487 $self->deactivate_recursive; 2727 $self->deactivate_recursive;
2488 2728
2729 ++$self->{_link_recursion};
2730
2489 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2731 return if UNIVERSAL::isa $self->map, "ext::map_link";
2490 2732
2491 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2733 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2492 if $self->map && $self->map->{path} ne "{link}"; 2734 if $self->map && $self->map->{path} ne "{link}";
2493 2735
2494 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2736 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2495} 2737}
2496 2738
2497sub cf::object::player::leave_link { 2739sub cf::object::player::leave_link {
2498 my ($self, $map, $x, $y) = @_; 2740 my ($self, $map, $x, $y) = @_;
2499 2741
… …
2516 ($x, $y) = (-1, -1) 2758 ($x, $y) = (-1, -1)
2517 unless (defined $x) && (defined $y); 2759 unless (defined $x) && (defined $y);
2518 2760
2519 # use -1 or undef as default coordinates, not 0, 0 2761 # use -1 or undef as default coordinates, not 0, 0
2520 ($x, $y) = ($map->enter_x, $map->enter_y) 2762 ($x, $y) = ($map->enter_x, $map->enter_y)
2521 if $x <=0 && $y <= 0; 2763 if $x <= 0 && $y <= 0;
2522 2764
2523 $map->load; 2765 $map->load;
2524 $map->load_neighbours; 2766 $map->load_neighbours;
2525 2767
2526 return unless $self->contr->active; 2768 return unless $self->contr->active;
2527 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2528 $self->activate_recursive;
2529 2769
2530 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2770 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2531 $self->enter_map ($map, $x, $y); 2771 if ($self->enter_map ($map, $x, $y)) {
2532} 2772 # entering was successful
2773 delete $self->{_link_recursion};
2774 # only activate afterwards, to support waiting in hooks
2775 $self->activate_recursive;
2776 }
2533 2777
2778}
2779
2534=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2780=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2535 2781
2536Moves the player to the given map-path and coordinates by first freezing 2782Moves the player to the given map-path and coordinates by first freezing
2537her, loading and preparing them map, calling the provided $check callback 2783her, loading and preparing them map, calling the provided $check callback
2538that has to return the map if sucecssful, and then unfreezes the player on 2784that 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 2785the new (success) or old (failed) map position. In either case, $done will
… …
2546 2792
2547our $GOTOGEN; 2793our $GOTOGEN;
2548 2794
2549sub cf::object::player::goto { 2795sub cf::object::player::goto {
2550 my ($self, $path, $x, $y, $check, $done) = @_; 2796 my ($self, $path, $x, $y, $check, $done) = @_;
2797
2798 if ($self->{_link_recursion} >= $MAX_LINKS) {
2799 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2800 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2801 ($path, $x, $y) = @$EMERGENCY_POSITION;
2802 }
2551 2803
2552 # do generation counting so two concurrent goto's will be executed in-order 2804 # do generation counting so two concurrent goto's will be executed in-order
2553 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2805 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2554 2806
2555 $self->enter_link; 2807 $self->enter_link;
… …
2575 ($path, $x, $y) = (undef, undef, undef); 2827 ($path, $x, $y) = (undef, undef, undef);
2576 } 2828 }
2577 } 2829 }
2578 2830
2579 my $map = eval { 2831 my $map = eval {
2580 my $map = defined $path ? cf::map::find $path : undef; 2832 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2581 2833
2582 if ($map) { 2834 if ($map) {
2583 $map = $map->customise_for ($self); 2835 $map = $map->customise_for ($self);
2584 $map = $check->($map) if $check && $map; 2836 $map = $check->($map, $x, $y, $self) if $check && $map;
2585 } else { 2837 } else {
2586 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2838 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2587 } 2839 }
2588 2840
2589 $map 2841 $map
… …
2597 if ($gen == $self->{_goto_generation}) { 2849 if ($gen == $self->{_goto_generation}) {
2598 delete $self->{_goto_generation}; 2850 delete $self->{_goto_generation};
2599 $self->leave_link ($map, $x, $y); 2851 $self->leave_link ($map, $x, $y);
2600 } 2852 }
2601 2853
2602 $done->() if $done; 2854 $done->($self) if $done;
2603 })->prio (1); 2855 })->prio (1);
2604} 2856}
2605 2857
2606=item $player_object->enter_exit ($exit_object) 2858=item $player_object->enter_exit ($exit_object)
2607 2859
… …
2683 2935
2684 prepare_random_map $exit 2936 prepare_random_map $exit
2685 if $exit->slaying eq "/!"; 2937 if $exit->slaying eq "/!";
2686 } 2938 }
2687 2939
2688 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2940 my $map = cf::map::normalise $exit->slaying, $exit->map;
2689 my $x = $exit->stats->hp; 2941 my $x = $exit->stats->hp;
2690 my $y = $exit->stats->sp; 2942 my $y = $exit->stats->sp;
2691 2943
2692 $self->goto ($map, $x, $y); 2944 $self->goto ($map, $x, $y);
2693 2945
… …
2700 $self->message ("Something went wrong deep within the deliantra server. " 2952 $self->message ("Something went wrong deep within the deliantra server. "
2701 . "I'll try to bring you back to the map you were before. " 2953 . "I'll try to bring you back to the map you were before. "
2702 . "Please report this to the dungeon master!", 2954 . "Please report this to the dungeon master!",
2703 cf::NDI_UNIQUE | cf::NDI_RED); 2955 cf::NDI_UNIQUE | cf::NDI_RED);
2704 2956
2705 warn "ERROR in enter_exit: $@"; 2957 error "ERROR in enter_exit: $@";
2706 $self->leave_link; 2958 $self->leave_link;
2707 } 2959 }
2708 })->prio (1); 2960 })->prio (1);
2709} 2961}
2710 2962
… …
2722sub cf::client::send_drawinfo { 2974sub cf::client::send_drawinfo {
2723 my ($self, $text, $flags) = @_; 2975 my ($self, $text, $flags) = @_;
2724 2976
2725 utf8::encode $text; 2977 utf8::encode $text;
2726 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2978 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2979}
2980
2981=item $client->send_big_packet ($pkt)
2982
2983Like C<send_packet>, but tries to compress large packets, and fragments
2984them as required.
2985
2986=cut
2987
2988our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2989
2990sub cf::client::send_big_packet {
2991 my ($self, $pkt) = @_;
2992
2993 # try lzf for large packets
2994 $pkt = "lzf " . Compress::LZF::compress $pkt
2995 if 1024 <= length $pkt and $self->{can_lzf};
2996
2997 # split very large packets
2998 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2999 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3000 $pkt = "frag";
3001 }
3002
3003 $self->send_packet ($pkt);
2727} 3004}
2728 3005
2729=item $client->send_msg ($channel, $msg, $color, [extra...]) 3006=item $client->send_msg ($channel, $msg, $color, [extra...])
2730 3007
2731Send a drawinfo or msg packet to the client, formatting the msg for the 3008Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2735 3012
2736=cut 3013=cut
2737 3014
2738# non-persistent channels (usually the info channel) 3015# non-persistent channels (usually the info channel)
2739our %CHANNEL = ( 3016our %CHANNEL = (
3017 "c/motd" => {
3018 id => "infobox",
3019 title => "MOTD",
3020 reply => undef,
3021 tooltip => "The message of the day",
3022 },
2740 "c/identify" => { 3023 "c/identify" => {
2741 id => "infobox", 3024 id => "infobox",
2742 title => "Identify", 3025 title => "Identify",
2743 reply => undef, 3026 reply => undef,
2744 tooltip => "Items recently identified", 3027 tooltip => "Items recently identified",
… …
2746 "c/examine" => { 3029 "c/examine" => {
2747 id => "infobox", 3030 id => "infobox",
2748 title => "Examine", 3031 title => "Examine",
2749 reply => undef, 3032 reply => undef,
2750 tooltip => "Signs and other items you examined", 3033 tooltip => "Signs and other items you examined",
3034 },
3035 "c/shopinfo" => {
3036 id => "infobox",
3037 title => "Shop Info",
3038 reply => undef,
3039 tooltip => "What your bargaining skill tells you about the shop",
2751 }, 3040 },
2752 "c/book" => { 3041 "c/book" => {
2753 id => "infobox", 3042 id => "infobox",
2754 title => "Book", 3043 title => "Book",
2755 reply => undef, 3044 reply => undef,
… …
2783 id => "infobox", 3072 id => "infobox",
2784 title => "Skills", 3073 title => "Skills",
2785 reply => undef, 3074 reply => undef,
2786 tooltip => "Shows your experience per skill and item power", 3075 tooltip => "Shows your experience per skill and item power",
2787 }, 3076 },
3077 "c/shopitems" => {
3078 id => "infobox",
3079 title => "Shop Items",
3080 reply => undef,
3081 tooltip => "Shows the items currently for sale in this shop",
3082 },
2788 "c/resistances" => { 3083 "c/resistances" => {
2789 id => "infobox", 3084 id => "infobox",
2790 title => "Resistances", 3085 title => "Resistances",
2791 reply => undef, 3086 reply => undef,
2792 tooltip => "Shows your resistances", 3087 tooltip => "Shows your resistances",
… …
2794 "c/pets" => { 3089 "c/pets" => {
2795 id => "infobox", 3090 id => "infobox",
2796 title => "Pets", 3091 title => "Pets",
2797 reply => undef, 3092 reply => undef,
2798 tooltip => "Shows information abotu your pets/a specific pet", 3093 tooltip => "Shows information abotu your pets/a specific pet",
3094 },
3095 "c/perceiveself" => {
3096 id => "infobox",
3097 title => "Perceive Self",
3098 reply => undef,
3099 tooltip => "You gained detailed knowledge about yourself",
2799 }, 3100 },
2800 "c/uptime" => { 3101 "c/uptime" => {
2801 id => "infobox", 3102 id => "infobox",
2802 title => "Uptime", 3103 title => "Uptime",
2803 reply => undef, 3104 reply => undef,
… …
2859 my $pkt = "msg " 3160 my $pkt = "msg "
2860 . $self->{json_coder}->encode ( 3161 . $self->{json_coder}->encode (
2861 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3162 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2862 ); 3163 );
2863 3164
2864 # try lzf for large packets
2865 $pkt = "lzf " . Compress::LZF::compress $pkt
2866 if 1024 <= length $pkt and $self->{can_lzf};
2867
2868 # split very large packets
2869 if (8192 < length $pkt and $self->{can_lzf}) {
2870 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2871 $pkt = "frag";
2872 }
2873
2874 $self->send_packet ($pkt); 3165 $self->send_big_packet ($pkt);
2875} 3166}
2876 3167
2877=item $client->ext_msg ($type, @msg) 3168=item $client->ext_msg ($type, @msg)
2878 3169
2879Sends an ext event to the client. 3170Sends an ext event to the client.
… …
2882 3173
2883sub cf::client::ext_msg($$@) { 3174sub cf::client::ext_msg($$@) {
2884 my ($self, $type, @msg) = @_; 3175 my ($self, $type, @msg) = @_;
2885 3176
2886 if ($self->extcmd == 2) { 3177 if ($self->extcmd == 2) {
2887 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3178 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2888 } elsif ($self->extcmd == 1) { # TODO: remove 3179 } elsif ($self->extcmd == 1) { # TODO: remove
2889 push @msg, msgtype => "event_$type"; 3180 push @msg, msgtype => "event_$type";
2890 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3181 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2891 } 3182 }
2892} 3183}
2893 3184
2894=item $client->ext_reply ($msgid, @msg) 3185=item $client->ext_reply ($msgid, @msg)
2895 3186
… …
2899 3190
2900sub cf::client::ext_reply($$@) { 3191sub cf::client::ext_reply($$@) {
2901 my ($self, $id, @msg) = @_; 3192 my ($self, $id, @msg) = @_;
2902 3193
2903 if ($self->extcmd == 2) { 3194 if ($self->extcmd == 2) {
2904 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3195 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2905 } elsif ($self->extcmd == 1) { 3196 } elsif ($self->extcmd == 1) {
2906 #TODO: version 1, remove 3197 #TODO: version 1, remove
2907 unshift @msg, msgtype => "reply", msgid => $id; 3198 unshift @msg, msgtype => "reply", msgid => $id;
2908 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3199 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2909 } 3200 }
2910} 3201}
2911 3202
2912=item $success = $client->query ($flags, "text", \&cb) 3203=item $success = $client->query ($flags, "text", \&cb)
2913 3204
… …
2984 3275
2985 $ns->ext_reply ($reply, @reply) 3276 $ns->ext_reply ($reply, @reply)
2986 if $reply; 3277 if $reply;
2987 3278
2988 } else { 3279 } else {
2989 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3280 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2990 } 3281 }
2991 3282
2992 cf::override; 3283 cf::override;
2993 }, 3284 },
2994); 3285);
… …
3014 3305
3015 $coro 3306 $coro
3016} 3307}
3017 3308
3018cf::client->attach ( 3309cf::client->attach (
3019 on_destroy => sub { 3310 on_client_destroy => sub {
3020 my ($ns) = @_; 3311 my ($ns) = @_;
3021 3312
3022 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3313 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3023 }, 3314 },
3024); 3315);
… …
3040our $safe_hole = new Safe::Hole; 3331our $safe_hole = new Safe::Hole;
3041 3332
3042$SIG{FPE} = 'IGNORE'; 3333$SIG{FPE} = 'IGNORE';
3043 3334
3044$safe->permit_only (Opcode::opset qw( 3335$safe->permit_only (Opcode::opset qw(
3045 :base_core :base_mem :base_orig :base_math 3336 :base_core :base_mem :base_orig :base_math :base_loop
3046 grepstart grepwhile mapstart mapwhile 3337 grepstart grepwhile mapstart mapwhile
3047 sort time 3338 sort time
3048)); 3339));
3049 3340
3050# here we export the classes and methods available to script code 3341# here we export the classes and methods available to script code
… …
3075 decrease split destroy change_exp value msg lore send_msg)], 3366 decrease split destroy change_exp value msg lore send_msg)],
3076 ["cf::object::player" => qw(player)], 3367 ["cf::object::player" => qw(player)],
3077 ["cf::player" => qw(peaceful send_msg)], 3368 ["cf::player" => qw(peaceful send_msg)],
3078 ["cf::map" => qw(trigger)], 3369 ["cf::map" => qw(trigger)],
3079) { 3370) {
3080 no strict 'refs';
3081 my ($pkg, @funs) = @$_; 3371 my ($pkg, @funs) = @$_;
3082 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3372 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3083 for @funs; 3373 for @funs;
3084} 3374}
3085 3375
… …
3102 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3392 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3103 $qcode =~ s/\n/\\n/g; 3393 $qcode =~ s/\n/\\n/g;
3104 3394
3105 %vars = (_dummy => 0) unless %vars; 3395 %vars = (_dummy => 0) unless %vars;
3106 3396
3397 my @res;
3107 local $_; 3398 local $_;
3108 local @safe::cf::_safe_eval_args = values %vars;
3109 3399
3110 my $eval = 3400 my $eval =
3111 "do {\n" 3401 "do {\n"
3112 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3402 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3113 . "#line 0 \"{$qcode}\"\n" 3403 . "#line 0 \"{$qcode}\"\n"
3114 . $code 3404 . $code
3115 . "\n}" 3405 . "\n}"
3116 ; 3406 ;
3117 3407
3408 if ($CFG{safe_eval}) {
3118 sub_generation_inc; 3409 sub_generation_inc;
3410 local @safe::cf::_safe_eval_args = values %vars;
3119 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3411 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3120 sub_generation_inc; 3412 sub_generation_inc;
3413 } else {
3414 local @cf::_safe_eval_args = values %vars;
3415 @res = wantarray ? eval eval : scalar eval $eval;
3416 }
3121 3417
3122 if ($@) { 3418 if ($@) {
3123 warn "$@"; 3419 warn "$@",
3124 warn "while executing safe code '$code'\n"; 3420 "while executing safe code '$code'\n",
3125 warn "with arguments " . (join " ", %vars) . "\n"; 3421 "with arguments " . (join " ", %vars) . "\n";
3126 } 3422 }
3127 3423
3128 wantarray ? @res : $res[0] 3424 wantarray ? @res : $res[0]
3129} 3425}
3130 3426
… …
3144=cut 3440=cut
3145 3441
3146sub register_script_function { 3442sub register_script_function {
3147 my ($fun, $cb) = @_; 3443 my ($fun, $cb) = @_;
3148 3444
3149 no strict 'refs'; 3445 $fun = "safe::$fun" if $CFG{safe_eval};
3150 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3446 *$fun = $safe_hole->wrap ($cb);
3151} 3447}
3152 3448
3153=back 3449=back
3154 3450
3155=cut 3451=cut
… …
3164 # for this (global event?) 3460 # for this (global event?)
3165 %ext::player_env::MUSIC_FACE_CACHE = (); 3461 %ext::player_env::MUSIC_FACE_CACHE = ();
3166 3462
3167 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3463 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3168 3464
3169 warn "loading facedata from $path\n"; 3465 trace "loading facedata from $path\n";
3170 3466
3171 my $facedata; 3467 my $facedata = decode_storable load_file $path;
3172 0 < aio_load $path, $facedata
3173 or die "$path: $!";
3174
3175 $facedata = Coro::Storable::thaw $facedata;
3176 3468
3177 $facedata->{version} == 2 3469 $facedata->{version} == 2
3178 or cf::cleanup "$path: version mismatch, cannot proceed."; 3470 or cf::cleanup "$path: version mismatch, cannot proceed.";
3179 3471
3180 # patch in the exptable 3472 # patch in the exptable
3473 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3181 $facedata->{resource}{"res/exp_table"} = { 3474 $facedata->{resource}{"res/exp_table"} = {
3182 type => FT_RSRC, 3475 type => FT_RSRC,
3183 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3476 data => $exp_table,
3477 hash => (Digest::MD5::md5 $exp_table),
3184 }; 3478 };
3185 cf::cede_to_tick; 3479 cf::cede_to_tick;
3186 3480
3187 { 3481 {
3188 my $faces = $facedata->{faceinfo}; 3482 my $faces = $facedata->{faceinfo};
… …
3190 while (my ($face, $info) = each %$faces) { 3484 while (my ($face, $info) = each %$faces) {
3191 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3485 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3192 3486
3193 cf::face::set_visibility $idx, $info->{visibility}; 3487 cf::face::set_visibility $idx, $info->{visibility};
3194 cf::face::set_magicmap $idx, $info->{magicmap}; 3488 cf::face::set_magicmap $idx, $info->{magicmap};
3195 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3489 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3196 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3490 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3491 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3197 3492
3198 cf::cede_to_tick; 3493 cf::cede_to_tick;
3199 } 3494 }
3200 3495
3201 while (my ($face, $info) = each %$faces) { 3496 while (my ($face, $info) = each %$faces) {
… …
3206 3501
3207 if (my $smooth = cf::face::find $info->{smooth}) { 3502 if (my $smooth = cf::face::find $info->{smooth}) {
3208 cf::face::set_smooth $idx, $smooth; 3503 cf::face::set_smooth $idx, $smooth;
3209 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3504 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3210 } else { 3505 } else {
3211 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3506 error "smooth face '$info->{smooth}' not found for face '$face'";
3212 } 3507 }
3213 3508
3214 cf::cede_to_tick; 3509 cf::cede_to_tick;
3215 } 3510 }
3216 } 3511 }
… …
3225 3520
3226 cf::anim::invalidate_all; # d'oh 3521 cf::anim::invalidate_all; # d'oh
3227 } 3522 }
3228 3523
3229 { 3524 {
3230 # TODO: for gcfclient pleasure, we should give resources
3231 # that gcfclient doesn't grok a >10000 face index.
3232 my $res = $facedata->{resource}; 3525 my $res = $facedata->{resource};
3233 3526
3234 while (my ($name, $info) = each %$res) { 3527 while (my ($name, $info) = each %$res) {
3235 if (defined $info->{type}) { 3528 if (defined $info->{type}) {
3236 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3529 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3237 my $data;
3238 3530
3239 if ($info->{type} & 1) { 3531 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3240 # prepend meta info
3241
3242 my $meta = $enc->encode ({
3243 name => $name,
3244 %{ $info->{meta} || {} },
3245 });
3246
3247 $data = pack "(w/a*)*", $meta, $info->{data};
3248 } else {
3249 $data = $info->{data};
3250 }
3251
3252 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3253 cf::face::set_type $idx, $info->{type}; 3532 cf::face::set_type $idx, $info->{type};
3254 } else { 3533 } else {
3255 $RESOURCE{$name} = $info; 3534 $RESOURCE{$name} = $info; # unused
3256 } 3535 }
3257 3536
3258 cf::cede_to_tick; 3537 cf::cede_to_tick;
3259 } 3538 }
3260 } 3539 }
3261 3540
3262 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3541 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3263 3542
3264 1 3543 1
3265} 3544}
3266
3267cf::global->attach (on_resource_update => sub {
3268 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3269 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3270
3271 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3272 my $sound = $soundconf->{compat}[$_]
3273 or next;
3274
3275 my $face = cf::face::find "sound/$sound->[1]";
3276 cf::sound::set $sound->[0] => $face;
3277 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3278 }
3279
3280 while (my ($k, $v) = each %{$soundconf->{event}}) {
3281 my $face = cf::face::find "sound/$v";
3282 cf::sound::set $k => $face;
3283 }
3284 }
3285});
3286 3545
3287register_exticmd fx_want => sub { 3546register_exticmd fx_want => sub {
3288 my ($ns, $want) = @_; 3547 my ($ns, $want) = @_;
3289 3548
3290 while (my ($k, $v) = each %$want) { 3549 while (my ($k, $v) = each %$want) {
… …
3329sub reload_treasures { 3588sub reload_treasures {
3330 load_resource_file "$DATADIR/treasures" 3589 load_resource_file "$DATADIR/treasures"
3331 or die "unable to load treasurelists\n"; 3590 or die "unable to load treasurelists\n";
3332} 3591}
3333 3592
3593sub reload_sound {
3594 trace "loading sound config from $DATADIR/sound\n";
3595
3596 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3597
3598 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3599 my $sound = $soundconf->{compat}[$_]
3600 or next;
3601
3602 my $face = cf::face::find "sound/$sound->[1]";
3603 cf::sound::set $sound->[0] => $face;
3604 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3605 }
3606
3607 while (my ($k, $v) = each %{$soundconf->{event}}) {
3608 my $face = cf::face::find "sound/$v";
3609 cf::sound::set $k => $face;
3610 }
3611}
3612
3334sub reload_resources { 3613sub reload_resources {
3335 warn "reloading resource files...\n"; 3614 trace "reloading resource files...\n";
3336 3615
3616 reload_exp_table;
3617 reload_materials;
3337 reload_facedata; 3618 reload_facedata;
3619 reload_sound;
3338 reload_archetypes; 3620 reload_archetypes;
3339 reload_regions; 3621 reload_regions;
3340 reload_treasures; 3622 reload_treasures;
3341 3623
3342 warn "finished reloading resource files\n"; 3624 trace "finished reloading resource files\n";
3343} 3625}
3344 3626
3345sub reload_config { 3627sub reload_config {
3346 open my $fh, "<:utf8", "$CONFDIR/config" 3628 trace "reloading config file...\n";
3347 or return;
3348 3629
3349 local $/; 3630 my $config = load_file "$CONFDIR/config";
3350 *CFG = YAML::Load <$fh>; 3631 utf8::decode $config;
3632 *CFG = decode_yaml $config;
3351 3633
3352 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3634 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3353 3635
3354 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3636 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3355 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3637 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3356 3638
3357 if (exists $CFG{mlockall}) { 3639 if (exists $CFG{mlockall}) {
… …
3380 3662
3381 seek $fh, 0, 0; 3663 seek $fh, 0, 0;
3382 print $fh $$; 3664 print $fh $$;
3383} 3665}
3384 3666
3667sub main_loop {
3668 trace "EV::loop starting\n";
3669 if (1) {
3670 EV::loop;
3671 }
3672 trace "EV::loop returned\n";
3673 goto &main_loop unless $REALLY_UNLOOP;
3674}
3675
3385sub main { 3676sub main {
3386 cf::init_globals; # initialise logging 3677 cf::init_globals; # initialise logging
3387 3678
3388 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3679 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3389 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3680 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3390 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3681 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3391 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3682 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3392
3393 cf::init_experience;
3394 cf::init_anim;
3395 cf::init_attackmess;
3396 cf::init_dynamic;
3397 3683
3398 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3684 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3399 3685
3400 # we must not ever block the main coroutine 3686 # we must not ever block the main coroutine
3401 local $Coro::idle = sub { 3687 local $Coro::idle = sub {
… …
3407 }; 3693 };
3408 3694
3409 evthread_start IO::AIO::poll_fileno; 3695 evthread_start IO::AIO::poll_fileno;
3410 3696
3411 cf::sync_job { 3697 cf::sync_job {
3698 cf::incloader::init ();
3699
3700 cf::init_anim;
3701 cf::init_attackmess;
3702 cf::init_dynamic;
3703
3704 cf::load_settings;
3705
3412 reload_resources; 3706 reload_resources;
3413 reload_config; 3707 reload_config;
3414 db_init; 3708 db_init;
3415 3709
3416 cf::load_settings;
3417 cf::load_materials;
3418 cf::init_uuid; 3710 cf::init_uuid;
3419 cf::init_signals; 3711 cf::init_signals;
3420 cf::init_commands;
3421 cf::init_skills; 3712 cf::init_skills;
3422 3713
3423 cf::init_beforeplay; 3714 cf::init_beforeplay;
3424 3715
3425 atomic; 3716 atomic;
… …
3427 load_extensions; 3718 load_extensions;
3428 3719
3429 utime time, time, $RUNTIMEFILE; 3720 utime time, time, $RUNTIMEFILE;
3430 3721
3431 # no (long-running) fork's whatsoever before this point(!) 3722 # no (long-running) fork's whatsoever before this point(!)
3723 use POSIX ();
3432 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3724 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3433 3725
3434 (pop @POST_INIT)->(0) while @POST_INIT; 3726 cf::_post_init 0;
3435 }; 3727 };
3436 3728
3437 EV::loop; 3729 cf::object::thawer::errors_are_fatal 0;
3730 info "parse errors in files are no longer fatal from this point on.\n";
3731
3732 my $free_main; $free_main = EV::idle sub {
3733 undef $free_main;
3734 undef &main; # free gobs of memory :)
3735 };
3736
3737 goto &main_loop;
3438} 3738}
3439 3739
3440############################################################################# 3740#############################################################################
3441# initialisation and cleanup 3741# initialisation and cleanup
3442 3742
3443# install some emergency cleanup handlers 3743# install some emergency cleanup handlers
3444BEGIN { 3744BEGIN {
3445 our %SIGWATCHER = (); 3745 our %SIGWATCHER = ();
3446 for my $signal (qw(INT HUP TERM)) { 3746 for my $signal (qw(INT HUP TERM)) {
3447 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3747 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3448 cf::cleanup "SIG$signal"; 3748 cf::cleanup "SIG$signal";
3449 }; 3749 };
3450 } 3750 }
3451} 3751}
3452 3752
3453sub write_runtime_sync { 3753sub write_runtime_sync {
3754 my $t0 = AE::time;
3755
3454 # first touch the runtime file to show we are still running: 3756 # first touch the runtime file to show we are still running:
3455 # the fsync below can take a very very long time. 3757 # the fsync below can take a very very long time.
3456 3758
3457 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3759 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3458 3760
3459 my $guard = cf::lock_acquire "write_runtime"; 3761 my $guard = cf::lock_acquire "write_runtime";
3460 3762
3461 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3763 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3462 or return; 3764 or return;
3463 3765
3464 my $value = $cf::RUNTIME + 90 + 10; 3766 my $value = $cf::RUNTIME + 90 + 10;
3465 # 10 is the runtime save interval, for a monotonic clock 3767 # 10 is the runtime save interval, for a monotonic clock
3466 # 60 allows for the watchdog to kill the server. 3768 # 60 allows for the watchdog to kill the server.
… …
3479 or return; 3781 or return;
3480 3782
3481 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3783 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3482 and return; 3784 and return;
3483 3785
3484 warn "runtime file written.\n"; 3786 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3485 3787
3486 1 3788 1
3487} 3789}
3488 3790
3489our $uuid_lock; 3791our $uuid_lock;
… …
3501 or return; 3803 or return;
3502 3804
3503 my $value = uuid_seq uuid_cur; 3805 my $value = uuid_seq uuid_cur;
3504 3806
3505 unless ($value) { 3807 unless ($value) {
3506 warn "cowardly refusing to write zero uuid value!\n"; 3808 info "cowardly refusing to write zero uuid value!\n";
3507 return; 3809 return;
3508 } 3810 }
3509 3811
3510 my $value = uuid_str $value + $uuid_skip; 3812 my $value = uuid_str $value + $uuid_skip;
3511 $uuid_skip = 0; 3813 $uuid_skip = 0;
… …
3521 or return; 3823 or return;
3522 3824
3523 aio_rename "$uuid~", $uuid 3825 aio_rename "$uuid~", $uuid
3524 and return; 3826 and return;
3525 3827
3526 warn "uuid file written ($value).\n"; 3828 trace "uuid file written ($value).\n";
3527 3829
3528 1 3830 1
3529 3831
3530} 3832}
3531 3833
… …
3537} 3839}
3538 3840
3539sub emergency_save() { 3841sub emergency_save() {
3540 my $freeze_guard = cf::freeze_mainloop; 3842 my $freeze_guard = cf::freeze_mainloop;
3541 3843
3542 warn "emergency_perl_save: enter\n"; 3844 info "emergency_perl_save: enter\n";
3845
3846 # this is a trade-off: we want to be very quick here, so
3847 # save all maps without fsync, and later call a global sync
3848 # (which in turn might be very very slow)
3849 local $USE_FSYNC = 0;
3543 3850
3544 cf::sync_job { 3851 cf::sync_job {
3545 # this is a trade-off: we want to be very quick here, so 3852 cf::write_runtime_sync; # external watchdog should not bark
3546 # save all maps without fsync, and later call a global sync
3547 # (which in turn might be very very slow)
3548 local $USE_FSYNC = 0;
3549 3853
3550 # use a peculiar iteration method to avoid tripping on perl 3854 # use a peculiar iteration method to avoid tripping on perl
3551 # refcount bugs in for. also avoids problems with players 3855 # refcount bugs in for. also avoids problems with players
3552 # and maps saved/destroyed asynchronously. 3856 # and maps saved/destroyed asynchronously.
3553 warn "emergency_perl_save: begin player save\n"; 3857 info "emergency_perl_save: begin player save\n";
3554 for my $login (keys %cf::PLAYER) { 3858 for my $login (keys %cf::PLAYER) {
3555 my $pl = $cf::PLAYER{$login} or next; 3859 my $pl = $cf::PLAYER{$login} or next;
3556 $pl->valid or next; 3860 $pl->valid or next;
3557 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3861 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3558 $pl->save; 3862 $pl->save;
3559 } 3863 }
3560 warn "emergency_perl_save: end player save\n"; 3864 info "emergency_perl_save: end player save\n";
3561 3865
3866 cf::write_runtime_sync; # external watchdog should not bark
3867
3562 warn "emergency_perl_save: begin map save\n"; 3868 info "emergency_perl_save: begin map save\n";
3563 for my $path (keys %cf::MAP) { 3869 for my $path (keys %cf::MAP) {
3564 my $map = $cf::MAP{$path} or next; 3870 my $map = $cf::MAP{$path} or next;
3565 $map->valid or next; 3871 $map->valid or next;
3566 $map->save; 3872 $map->save;
3567 } 3873 }
3568 warn "emergency_perl_save: end map save\n"; 3874 info "emergency_perl_save: end map save\n";
3569 3875
3876 cf::write_runtime_sync; # external watchdog should not bark
3877
3570 warn "emergency_perl_save: begin database checkpoint\n"; 3878 info "emergency_perl_save: begin database checkpoint\n";
3571 BDB::db_env_txn_checkpoint $DB_ENV; 3879 BDB::db_env_txn_checkpoint $DB_ENV;
3572 warn "emergency_perl_save: end database checkpoint\n"; 3880 info "emergency_perl_save: end database checkpoint\n";
3573 3881
3574 warn "emergency_perl_save: begin write uuid\n"; 3882 info "emergency_perl_save: begin write uuid\n";
3575 write_uuid_sync 1; 3883 write_uuid_sync 1;
3576 warn "emergency_perl_save: end write uuid\n"; 3884 info "emergency_perl_save: end write uuid\n";
3885
3886 cf::write_runtime_sync; # external watchdog should not bark
3887
3888 trace "emergency_perl_save: syncing database to disk";
3889 BDB::db_env_txn_checkpoint $DB_ENV;
3890
3891 info "emergency_perl_save: starting sync\n";
3892 IO::AIO::aio_sync sub {
3893 info "emergency_perl_save: finished sync\n";
3894 };
3895
3896 cf::write_runtime_sync; # external watchdog should not bark
3897
3898 trace "emergency_perl_save: flushing outstanding aio requests";
3899 while (IO::AIO::nreqs || BDB::nreqs) {
3900 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3901 }
3902
3903 cf::write_runtime_sync; # external watchdog should not bark
3577 }; 3904 };
3578 3905
3579 warn "emergency_perl_save: starting sync()\n";
3580 IO::AIO::aio_sync sub {
3581 warn "emergency_perl_save: finished sync()\n";
3582 };
3583
3584 warn "emergency_perl_save: leave\n"; 3906 info "emergency_perl_save: leave\n";
3585} 3907}
3586 3908
3587sub post_cleanup { 3909sub post_cleanup {
3588 my ($make_core) = @_; 3910 my ($make_core) = @_;
3589 3911
3912 IO::AIO::flush;
3913
3590 warn Carp::longmess "post_cleanup backtrace" 3914 error Carp::longmess "post_cleanup backtrace"
3591 if $make_core; 3915 if $make_core;
3592 3916
3593 my $fh = pidfile; 3917 my $fh = pidfile;
3594 unlink $PIDFILE if <$fh> == $$; 3918 unlink $PIDFILE if <$fh> == $$;
3595} 3919}
… …
3615 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3939 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3616 for my $name (keys %$leaf_symtab) { 3940 for my $name (keys %$leaf_symtab) {
3617 _gv_clear *{"$pkg$name"}; 3941 _gv_clear *{"$pkg$name"};
3618# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3942# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3619 } 3943 }
3620 warn "cleared package $pkg\n";#d#
3621} 3944}
3622 3945
3623sub do_reload_perl() { 3946sub do_reload_perl() {
3624 # can/must only be called in main 3947 # can/must only be called in main
3625 if ($Coro::current != $Coro::main) { 3948 unless (in_main) {
3626 warn "can only reload from main coroutine"; 3949 error "can only reload from main coroutine";
3627 return; 3950 return;
3628 } 3951 }
3629 3952
3630 return if $RELOAD++; 3953 return if $RELOAD++;
3631 3954
3632 my $t1 = EV::time; 3955 my $t1 = AE::time;
3633 3956
3634 while ($RELOAD) { 3957 while ($RELOAD) {
3635 warn "reloading..."; 3958 cf::get_slot 0.1, -1, "reload_perl";
3959 info "perl_reload: reloading...";
3636 3960
3637 warn "entering sync_job"; 3961 trace "perl_reload: entering sync_job";
3638 3962
3639 cf::sync_job { 3963 cf::sync_job {
3640 cf::write_runtime_sync; # external watchdog should not bark
3641 cf::emergency_save; 3964 #cf::emergency_save;
3642 cf::write_runtime_sync; # external watchdog should not bark
3643 3965
3644 warn "syncing database to disk";
3645 BDB::db_env_txn_checkpoint $DB_ENV;
3646
3647 # if anything goes wrong in here, we should simply crash as we already saved
3648
3649 warn "flushing outstanding aio requests";
3650 while (IO::AIO::nreqs || BDB::nreqs) {
3651 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3652 }
3653
3654 warn "cancelling all extension coros"; 3966 trace "perl_reload: cancelling all extension coros";
3655 $_->cancel for values %EXT_CORO; 3967 $_->cancel for values %EXT_CORO;
3656 %EXT_CORO = (); 3968 %EXT_CORO = ();
3657 3969
3658 warn "removing commands"; 3970 trace "perl_reload: removing commands";
3659 %COMMAND = (); 3971 %COMMAND = ();
3660 3972
3661 warn "removing ext/exti commands"; 3973 trace "perl_reload: removing ext/exti commands";
3662 %EXTCMD = (); 3974 %EXTCMD = ();
3663 %EXTICMD = (); 3975 %EXTICMD = ();
3664 3976
3665 warn "unloading/nuking all extensions"; 3977 trace "perl_reload: unloading/nuking all extensions";
3666 for my $pkg (@EXTS) { 3978 for my $pkg (@EXTS) {
3667 warn "... unloading $pkg"; 3979 trace "... unloading $pkg";
3668 3980
3669 if (my $cb = $pkg->can ("unload")) { 3981 if (my $cb = $pkg->can ("unload")) {
3670 eval { 3982 eval {
3671 $cb->($pkg); 3983 $cb->($pkg);
3672 1 3984 1
3673 } or warn "$pkg unloaded, but with errors: $@"; 3985 } or error "$pkg unloaded, but with errors: $@";
3674 } 3986 }
3675 3987
3676 warn "... clearing $pkg"; 3988 trace "... clearing $pkg";
3677 clear_package $pkg; 3989 clear_package $pkg;
3678 } 3990 }
3679 3991
3680 warn "unloading all perl modules loaded from $LIBDIR"; 3992 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3681 while (my ($k, $v) = each %INC) { 3993 while (my ($k, $v) = each %INC) {
3682 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3994 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3683 3995
3684 warn "... unloading $k"; 3996 trace "... unloading $k";
3685 delete $INC{$k}; 3997 delete $INC{$k};
3686 3998
3687 $k =~ s/\.pm$//; 3999 $k =~ s/\.pm$//;
3688 $k =~ s/\//::/g; 4000 $k =~ s/\//::/g;
3689 4001
… …
3692 } 4004 }
3693 4005
3694 clear_package $k; 4006 clear_package $k;
3695 } 4007 }
3696 4008
3697 warn "getting rid of safe::, as good as possible"; 4009 trace "perl_reload: getting rid of safe::, as good as possible";
3698 clear_package "safe::$_" 4010 clear_package "safe::$_"
3699 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4011 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3700 4012
3701 warn "unloading cf.pm \"a bit\""; 4013 trace "perl_reload: unloading cf.pm \"a bit\"";
3702 delete $INC{"cf.pm"}; 4014 delete $INC{"cf.pm"};
3703 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4015 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3704 4016
3705 # don't, removes xs symbols, too, 4017 # don't, removes xs symbols, too,
3706 # and global variables created in xs 4018 # and global variables created in xs
3707 #clear_package __PACKAGE__; 4019 #clear_package __PACKAGE__;
3708 4020
3709 warn "unload completed, starting to reload now"; 4021 info "perl_reload: unload completed, starting to reload now";
3710 4022
3711 warn "reloading cf.pm"; 4023 trace "perl_reload: reloading cf.pm";
3712 require cf; 4024 require cf;
3713 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4025 cf::_connect_to_perl_1;
3714 4026
3715 warn "loading config and database again"; 4027 trace "perl_reload: loading config and database again";
3716 cf::reload_config; 4028 cf::reload_config;
3717 4029
3718 warn "loading extensions"; 4030 trace "perl_reload: loading extensions";
3719 cf::load_extensions; 4031 cf::load_extensions;
3720 4032
3721 if ($REATTACH_ON_RELOAD) { 4033 if ($REATTACH_ON_RELOAD) {
3722 warn "reattaching attachments to objects/players"; 4034 trace "perl_reload: reattaching attachments to objects/players";
3723 _global_reattach; # objects, sockets 4035 _global_reattach; # objects, sockets
3724 warn "reattaching attachments to maps"; 4036 trace "perl_reload: reattaching attachments to maps";
3725 reattach $_ for values %MAP; 4037 reattach $_ for values %MAP;
3726 warn "reattaching attachments to players"; 4038 trace "perl_reload: reattaching attachments to players";
3727 reattach $_ for values %PLAYER; 4039 reattach $_ for values %PLAYER;
3728 } 4040 }
3729 4041
3730 warn "running post_init jobs"; 4042 cf::_post_init 1;
3731 (pop @POST_INIT)->(1) while @POST_INIT;
3732 4043
3733 warn "leaving sync_job"; 4044 trace "perl_reload: leaving sync_job";
3734 4045
3735 1 4046 1
3736 } or do { 4047 } or do {
3737 warn $@; 4048 error $@;
3738 cf::cleanup "error while reloading, exiting."; 4049 cf::cleanup "perl_reload: error, exiting.";
3739 }; 4050 };
3740 4051
3741 warn "reloaded";
3742 --$RELOAD; 4052 --$RELOAD;
3743 } 4053 }
3744 4054
3745 $t1 = EV::time - $t1; 4055 $t1 = AE::time - $t1;
3746 warn "reload completed in ${t1}s\n"; 4056 info "perl_reload: completed in ${t1}s\n";
3747}; 4057};
3748 4058
3749our $RELOAD_WATCHER; # used only during reload 4059our $RELOAD_WATCHER; # used only during reload
3750 4060
3751sub reload_perl() { 4061sub reload_perl() {
… …
3753 # coro crashes during coro_state_free->destroy here. 4063 # coro crashes during coro_state_free->destroy here.
3754 4064
3755 $RELOAD_WATCHER ||= cf::async { 4065 $RELOAD_WATCHER ||= cf::async {
3756 Coro::AIO::aio_wait cache_extensions; 4066 Coro::AIO::aio_wait cache_extensions;
3757 4067
3758 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4068 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3759 do_reload_perl; 4069 do_reload_perl;
3760 undef $RELOAD_WATCHER; 4070 undef $RELOAD_WATCHER;
3761 }; 4071 };
3762 }; 4072 };
3763} 4073}
… …
3772 reload_perl; 4082 reload_perl;
3773 }; 4083 };
3774 } 4084 }
3775}; 4085};
3776 4086
3777unshift @INC, $LIBDIR; 4087#############################################################################
3778 4088
3779my $bug_warning = 0; 4089my $bug_warning = 0;
3780 4090
3781our @WAIT_FOR_TICK; 4091our @WAIT_FOR_TICK;
3782our @WAIT_FOR_TICK_BEGIN; 4092our @WAIT_FOR_TICK_BEGIN;
3783 4093
3784sub wait_for_tick { 4094sub wait_for_tick() {
3785 return if tick_inhibit || $Coro::current == $Coro::main; 4095 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3786 4096
3787 my $signal = new Coro::Signal; 4097 my $signal = new Coro::Signal;
3788 push @WAIT_FOR_TICK, $signal; 4098 push @WAIT_FOR_TICK, $signal;
3789 $signal->wait; 4099 $signal->wait;
3790} 4100}
3791 4101
3792sub wait_for_tick_begin { 4102sub wait_for_tick_begin() {
3793 return if tick_inhibit || $Coro::current == $Coro::main; 4103 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3794 4104
3795 my $signal = new Coro::Signal; 4105 my $signal = new Coro::Signal;
3796 push @WAIT_FOR_TICK_BEGIN, $signal; 4106 push @WAIT_FOR_TICK_BEGIN, $signal;
3797 $signal->wait; 4107 $signal->wait;
3798} 4108}
… …
3804 return; 4114 return;
3805 } 4115 }
3806 4116
3807 cf::server_tick; # one server iteration 4117 cf::server_tick; # one server iteration
3808 4118
4119 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4120
3809 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4121 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3810 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4122 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3811 Coro::async_pool { 4123 Coro::async_pool {
3812 $Coro::current->{desc} = "runtime saver"; 4124 $Coro::current->{desc} = "runtime saver";
3813 write_runtime_sync 4125 write_runtime_sync
3814 or warn "ERROR: unable to write runtime file: $!"; 4126 or error "ERROR: unable to write runtime file: $!";
3815 }; 4127 };
3816 } 4128 }
3817 4129
3818 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4130 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3819 $sig->send; 4131 $sig->send;
… …
3827 4139
3828 if (0) { 4140 if (0) {
3829 if ($NEXT_TICK) { 4141 if ($NEXT_TICK) {
3830 my $jitter = $TICK_START - $NEXT_TICK; 4142 my $jitter = $TICK_START - $NEXT_TICK;
3831 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4143 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3832 warn "jitter $JITTER\n";#d# 4144 debug "jitter $JITTER\n";#d#
3833 } 4145 }
3834 } 4146 }
3835} 4147}
3836 4148
3837{ 4149{
3838 # configure BDB 4150 # configure BDB
3839 4151
3840 BDB::min_parallel 8; 4152 BDB::min_parallel 16;
3841 BDB::max_poll_reqs $TICK * 0.1; 4153 BDB::max_poll_reqs $TICK * 0.1;
3842 $AnyEvent::BDB::WATCHER->priority (1); 4154 $AnyEvent::BDB::WATCHER->priority (1);
3843 4155
3844 unless ($DB_ENV) { 4156 unless ($DB_ENV) {
3845 $DB_ENV = BDB::db_env_create; 4157 $DB_ENV = BDB::db_env_create;
… …
3882 IO::AIO::min_parallel 8; 4194 IO::AIO::min_parallel 8;
3883 IO::AIO::max_poll_time $TICK * 0.1; 4195 IO::AIO::max_poll_time $TICK * 0.1;
3884 undef $AnyEvent::AIO::WATCHER; 4196 undef $AnyEvent::AIO::WATCHER;
3885} 4197}
3886 4198
3887my $_log_backtrace; 4199our $_log_backtrace;
4200our $_log_backtrace_last;
3888 4201
3889sub _log_backtrace { 4202sub _log_backtrace {
3890 my ($msg, @addr) = @_; 4203 my ($msg, @addr) = @_;
3891 4204
3892 $msg =~ s/\n//; 4205 $msg =~ s/\n$//;
3893 4206
4207 if ($_log_backtrace_last eq $msg) {
4208 LOG llevInfo, "[ABT] $msg\n";
4209 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3894 # limit the # of concurrent backtraces 4210 # limit the # of concurrent backtraces
3895 if ($_log_backtrace < 2) { 4211 } elsif ($_log_backtrace < 2) {
4212 $_log_backtrace_last = $msg;
3896 ++$_log_backtrace; 4213 ++$_log_backtrace;
3897 my $perl_bt = Carp::longmess $msg; 4214 my $perl_bt = Carp::longmess $msg;
3898 async { 4215 async {
3899 $Coro::current->{desc} = "abt $msg"; 4216 $Coro::current->{desc} = "abt $msg";
3900 4217
… …
3920 LOG llevInfo, "[ABT] $_\n" for @bt; 4237 LOG llevInfo, "[ABT] $_\n" for @bt;
3921 --$_log_backtrace; 4238 --$_log_backtrace;
3922 }; 4239 };
3923 } else { 4240 } else {
3924 LOG llevInfo, "[ABT] $msg\n"; 4241 LOG llevInfo, "[ABT] $msg\n";
3925 LOG llevInfo, "[ABT] [suppressed]\n"; 4242 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3926 } 4243 }
3927} 4244}
3928 4245
3929# load additional modules 4246# load additional modules
3930eval "use cf::$_" for @EXTRA_MODULES; 4247require "cf/$_.pm" for @EXTRA_MODULES;
4248cf::_connect_to_perl_2;
3931 4249
3932END { cf::emergency_save } 4250END { cf::emergency_save }
3933 4251
39341 42521
3935 4253

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines