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

Diff Legend

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