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.474 by root, Thu Jul 16 21:42:56 2009 UTC vs.
Revision 1.561 by root, Fri Apr 22 06:10:33 2011 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use common::sense;
25use utf8;
26use strict 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
76 75
77# strictly for debugging 76# strictly for debugging
78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
79 78
80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
81 82
82our %COMMAND = (); 83our %COMMAND = ();
83our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
84 85
85our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
88our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
89our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
90 91
91our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
92our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
93 96
94our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
95our $DATADIR = datadir; 99our $DATADIR = datadir;
96our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
97our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
98our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
99our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
100our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
101our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
102our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
103our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
104our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
105our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
106our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
107 112
108our %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;
109 120
110our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
111our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
112our $NEXT_TICK; 123our $NEXT_TICK;
113our $USE_FSYNC = 1; # use fsync to write maps - default on 124our $USE_FSYNC = 1; # use fsync to write maps - default on
115our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
116our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
117our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
118our $DB_ENV; 129our $DB_ENV;
119 130
120our @EXTRA_MODULES = qw(pod mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
121 132
122our %CFG; 133our %CFG;
123 134
124our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
125our $RUNTIME; 136our $RUNTIME;
159 170
160our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
161 172
162sub cf::map::normalise; 173sub cf::map::normalise;
163 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
164############################################################################# 190#############################################################################
165 191
166=head2 GLOBAL VARIABLES 192=head2 GLOBAL VARIABLES
167 193
168=over 4 194=over 4
209from wherever your confdir points to. 235from wherever your confdir points to.
210 236
211=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
212 238
213These 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
214returns 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
215per 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.
216 242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
247
217=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
218 249
219This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
220C<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
221that call. 252that call.
222 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
223=back 260=back
224 261
225=cut 262=cut
226 263
227BEGIN { 264sub error(@) { LOG llevError, join "", @_ }
228 *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 {
229 my $msg = join "", @_; 271 my $msg = join "", @_;
230 272
231 $msg .= "\n" 273 $msg .= "\n"
232 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
233 275
234 $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;
235 277
236 LOG llevError, $msg; 278 LOG llevWarn, $msg;
237 }; 279};
238}
239 280
240$Coro::State::DIEHOOK = sub { 281$Coro::State::DIEHOOK = sub {
241 return unless $^S eq 0; # "eq", not "==" 282 return unless $^S eq 0; # "eq", not "=="
242 283
243 if ($Coro::current == $Coro::main) {#d# 284 error Carp::longmess $_[0];
285
286 if (in_main) {#d#
244 warn "DIEHOOK called in main context, Coro bug?\n";#d# 287 error "DIEHOOK called in main context, Coro bug?\n";#d#
245 return;#d# 288 return;#d#
246 }#d# 289 }#d#
247 290
248 # kill coroutine otherwise 291 # kill coroutine otherwise
249 warn Carp::longmess $_[0];
250 Coro::terminate 292 Coro::terminate
251}; 293};
252
253$SIG{__DIE__} = sub { }; #d#?
254 294
255@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 295@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
256@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 296@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
257@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 297@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
258@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 298@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
272)) { 312)) {
273 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
274} 314}
275 315
276$EV::DIED = sub { 316$EV::DIED = sub {
277 warn "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
278}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
279 324
280############################################################################# 325#############################################################################
281 326
282=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
283 328
304 $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;
305 $d 350 $d
306 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
307} 352}
308 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
309=item $ref = cf::decode_json $json 368=item $ref = cf::decode_json $json
310 369
311Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
312 371
313=item $json = cf::encode_json $ref 372=item $json = cf::encode_json $ref
319our $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
320 379
321sub encode_json($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
322sub decode_json($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
323 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
324=item cf::post_init { BLOCK } 414=item cf::post_init { BLOCK }
325 415
326Execute the given codeblock, I<after> all extensions have been (re-)loaded, 416Execute the given codeblock, I<after> all extensions have been (re-)loaded,
327but I<before> the server starts ticking again. 417but I<before> the server starts ticking again.
328 418
329The cdoeblock will have a single boolean argument to indicate whether this 419The codeblock will have a single boolean argument to indicate whether this
330is a reload or not. 420is a reload or not.
331 421
332=cut 422=cut
333 423
334sub post_init(&) { 424sub post_init(&) {
335 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 }
336} 443}
337 444
338=item cf::lock_wait $string 445=item cf::lock_wait $string
339 446
340Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
379} 486}
380 487
381=item cf::periodic $interval, $cb 488=item cf::periodic $interval, $cb
382 489
383Like 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
384get spread over timer. 491get spread over time.
385 492
386=cut 493=cut
387 494
388sub periodic($$) { 495sub periodic($$) {
389 my ($interval, $cb) = @_; 496 my ($interval, $cb) = @_;
393 EV::periodic $start, $interval, 0, $cb 500 EV::periodic $start, $interval, 0, $cb
394} 501}
395 502
396=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
397 504
398Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
399This 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
400of 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.
401 512
402The 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
403used for statistical purposes and should identify the same time-class. 514used for statistical purposes and should identify the same time-class.
404 515
405Useful for short background jobs. 516Useful for short background jobs.
406 517
407=cut 518=cut
408 519
409our @SLOT_QUEUE; 520our @SLOT_QUEUE;
410our $SLOT_QUEUE; 521our $SLOT_QUEUE;
522our $SLOT_DECAY = 0.9;
411 523
412$SLOT_QUEUE->cancel if $SLOT_QUEUE; 524$SLOT_QUEUE->cancel if $SLOT_QUEUE;
413$SLOT_QUEUE = Coro::async { 525$SLOT_QUEUE = Coro::async {
414 $Coro::current->desc ("timeslot manager"); 526 $Coro::current->desc ("timeslot manager");
415 527
416 my $signal = new Coro::Signal; 528 my $signal = new Coro::Signal;
529 my $busy;
417 530
418 while () { 531 while () {
419 next_job: 532 next_job:
533
420 my $avail = cf::till_tick; 534 my $avail = cf::till_tick;
421 if ($avail > 0.01) { 535
422 for (0 .. $#SLOT_QUEUE) { 536 for (0 .. $#SLOT_QUEUE) {
423 if ($SLOT_QUEUE[$_][0] < $avail) { 537 if ($SLOT_QUEUE[$_][0] <= $avail) {
538 $busy = 0;
424 my $job = splice @SLOT_QUEUE, $_, 1, (); 539 my $job = splice @SLOT_QUEUE, $_, 1, ();
425 $job->[2]->send; 540 $job->[2]->send;
426 Coro::cede; 541 Coro::cede;
427 goto next_job; 542 goto next_job;
428 } 543 } else {
544 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
429 } 545 }
430 } 546 }
431 547
432 if (@SLOT_QUEUE) { 548 if (@SLOT_QUEUE) {
433 # 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
434 push @cf::WAIT_FOR_TICK, $signal; 550 push @cf::WAIT_FOR_TICK, $signal;
435 $signal->wait; 551 $signal->wait;
436 } else { 552 } else {
553 $busy = 0;
437 Coro::schedule; 554 Coro::schedule;
438 } 555 }
439 } 556 }
440}; 557};
441 558
442sub get_slot($;$$) { 559sub get_slot($;$$) {
443 return if tick_inhibit || $Coro::current == $Coro::main; 560 return if tick_inhibit || $Coro::current == $Coro::main;
444 561
445 my ($time, $pri, $name) = @_; 562 my ($time, $pri, $name) = @_;
446 563
447 $time = $TICK * .6 if $time > $TICK * .6; 564 $time = clamp $time, 0.01, $TICK * .6;
565
448 my $sig = new Coro::Signal; 566 my $sig = new Coro::Signal;
449 567
450 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 568 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
451 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 569 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
452 $SLOT_QUEUE->ready; 570 $SLOT_QUEUE->ready;
478=cut 596=cut
479 597
480sub sync_job(&) { 598sub sync_job(&) {
481 my ($job) = @_; 599 my ($job) = @_;
482 600
483 if ($Coro::current == $Coro::main) { 601 if (in_main) {
484 my $time = EV::time; 602 my $time = AE::time;
485 603
486 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
487 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
488 606
489 LOG llevError, Carp::longmess "sync job";#d# 607 #LOG llevError, Carp::longmess "sync job";#d#
490 608
491 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
492 610
493 my $busy = 1; 611 my $busy = 1;
494 my @res; 612 my @res;
495 613
496 (async { 614 (async {
497 $Coro::current->desc ("sync job coro"); 615 $Coro::current->desc ("sync job coro");
498 @res = eval { $job->() }; 616 @res = eval { $job->() };
499 warn $@ if $@; 617 error $@ if $@;
500 undef $busy; 618 undef $busy;
501 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
502 620
503 while ($busy) { 621 while ($busy) {
504 if (Coro::nready) { 622 if (Coro::nready) {
506 } else { 624 } else {
507 EV::loop EV::LOOP_ONESHOT; 625 EV::loop EV::LOOP_ONESHOT;
508 } 626 }
509 } 627 }
510 628
511 my $time = EV::time - $time; 629 my $time = AE::time - $time;
512 630
513 $TICK_START += $time; # do not account sync jobs to server load 631 $TICK_START += $time; # do not account sync jobs to server load
514 632
515 wantarray ? @res : $res[0] 633 wantarray ? @res : $res[0]
516 } else { 634 } else {
538 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
539 657
540 $coro 658 $coro
541} 659}
542 660
543=item fork_call { }, $args 661=item fork_call { }, @args
544 662
545Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
546process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
547Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
548never block itself or use any form of event handling. 666never block itself or use any form of event handling.
549 667
550=cut 668=cut
551 669
670sub post_fork {
671 reset_signals;
672}
673
552sub fork_call(&@) { 674sub fork_call(&@) {
553 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
554 676
555 # 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,
556 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
557 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
558 680
559 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
560 reset_signals; 682 cf::post_fork;
561 &$cb 683 &$cb
562 }, @args; 684 } @args;
563 685
564 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 )
565} 698}
566 699
567=item $coin = coin_from_name $name 700=item $coin = coin_from_name $name
568 701
569=cut 702=cut
606within each server. 739within each server.
607 740
608=cut 741=cut
609 742
610sub db_table($) { 743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
611 my ($name) = @_; 747 my ($name) = @_;
612 my $db = BDB::db_create $DB_ENV; 748 my $db = BDB::db_create $DB_ENV;
613 749
614 eval { 750 eval {
615 $db->set_flags (BDB::CHKSUM); 751 $db->set_flags (BDB::CHKSUM);
625} 761}
626 762
627our $DB; 763our $DB;
628 764
629sub db_init { 765sub db_init {
630 cf::sync_job {
631 $DB ||= db_table "db"; 766 $DB ||= db_table "db";
632 };
633} 767}
634 768
635sub db_get($$) { 769sub db_get($$) {
636 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
637 771
638 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
639 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
640 776
641 $! ? () 777 $! ? ()
642 : $data 778 : $data
643 }
644} 779}
645 780
646sub db_put($$$) { 781sub db_put($$$) {
647 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
648 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
676 811
677 my @data; 812 my @data;
678 my $md5; 813 my $md5;
679 814
680 for (0 .. $#$src) { 815 for (0 .. $#$src) {
681 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
682 or Carp::croak "$src->[$_]: $!";
683 } 817 }
684 818
685 # if processing is expensive, check 819 # if processing is expensive, check
686 # checksum first 820 # checksum first
687 if (1) { 821 if (1) {
704 838
705 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
706 my $data = $process->(\@data); 840 my $data = $process->(\@data);
707 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
708 842
709 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
710 844
711 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
712 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
713 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
714 848
724 858
725=cut 859=cut
726 860
727sub datalog($@) { 861sub datalog($@) {
728 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
729 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
730} 864}
731 865
732=back 866=back
733 867
734=cut 868=cut
929 1063
930 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
931 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
932 1066
933 } elsif (ref $type) { 1067 } elsif (ref $type) {
934 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
935 1069
936 } else { 1070 } else {
937 shift @arg; 1071 shift @arg;
938 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
939 } 1073 }
940 } 1074 }
941} 1075}
942 1076
943sub _object_attach { 1077sub _object_attach {
953 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
954 } 1088 }
955 1089
956 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
957 } else { 1091 } else {
958 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
959 } 1093 }
960 1094
961 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
962} 1096}
963 1097
1022 1156
1023 for (@$callbacks) { 1157 for (@$callbacks) {
1024 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
1025 1159
1026 if ($@) { 1160 if ($@) {
1027 warn "$@";
1028 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1029 override; 1162 override;
1030 } 1163 }
1031 1164
1032 return 1 if $override; 1165 return 1 if $override;
1033 } 1166 }
1112 for (@$attach) { 1245 for (@$attach) {
1113 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
1114 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
1115 } 1248 }
1116 } else { 1249 } else {
1117 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
1118 } 1251 }
1119 } 1252 }
1120} 1253}
1121 1254
1122cf::attachable->attach ( 1255cf::attachable->attach (
1149 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1150 1283
1151 sync_job { 1284 sync_job {
1152 if (length $$rdata) { 1285 if (length $$rdata) {
1153 utf8::decode (my $decname = $filename); 1286 utf8::decode (my $decname = $filename);
1154 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1155 $decname, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1156 1290
1157 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1158 aio_chmod $fh, SAVE_MODE; 1292 aio_chmod $fh, SAVE_MODE;
1159 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1160 if ($cf::USE_FSYNC) { 1294 if ($cf::USE_FSYNC) {
1182 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1183 1317
1184 $filename =~ s%/[^/]+$%%; 1318 $filename =~ s%/[^/]+$%%;
1185 aio_pathsync $filename if $cf::USE_FSYNC; 1319 aio_pathsync $filename if $cf::USE_FSYNC;
1186 } else { 1320 } else {
1187 warn "unable to save objects: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1188 } 1322 }
1189 } else { 1323 } else {
1190 aio_unlink $filename; 1324 aio_unlink $filename;
1191 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1192 } 1326 }
1216 my $st = eval { Coro::Storable::thaw $av }; 1350 my $st = eval { Coro::Storable::thaw $av };
1217 $av = $st->{objs}; 1351 $av = $st->{objs};
1218 } 1352 }
1219 1353
1220 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1221 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1222 $decname, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1223 1358
1224 ($data, $av) 1359 ($data, $av)
1225} 1360}
1226 1361
1227=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
1286} 1421}
1287 1422
1288use File::Glob (); 1423use File::Glob ();
1289 1424
1290cf::player->attach ( 1425cf::player->attach (
1291 on_command => sub { 1426 on_unknown_command => sub {
1292 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
1293 1428
1294 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
1295 or return; 1430 or return;
1296 1431
1319 1454
1320 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1321 if $reply; 1456 if $reply;
1322 1457
1323 } else { 1458 } else {
1324 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1325 } 1460 }
1326 1461
1327 cf::override; 1462 cf::override;
1328 }, 1463 },
1329); 1464);
1340 1475
1341 $grp 1476 $grp
1342} 1477}
1343 1478
1344sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1345 cf::sync_job { 1482 cf::sync_job {
1346 my %todo; 1483 my %todo;
1347 1484
1348 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1349 next unless -r $path; 1486 next unless -r $path;
1367 1504
1368 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1369 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1370 1507
1371 $ext{source} = 1508 $ext{source} =
1372 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1373 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1374 . $source 1511 . $source
1375 . "\n};\n1"; 1512 . "\n};\n1";
1376 1513
1377 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
1378 } 1515 }
1379 1516
1517 my $pass = 0;
1380 my %done; 1518 my %done;
1381 while (%todo) { 1519 while (%todo) {
1382 my $progress; 1520 my $progress;
1383 1521
1522 ++$pass;
1523
1524 ext:
1384 while (my ($k, $v) = each %todo) { 1525 while (my ($k, $v) = each %todo) {
1385 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1386 goto skip 1527 next ext
1387 unless exists $done{$_}; 1528 unless exists $done{$_};
1388 } 1529 }
1389 1530
1390 warn "... loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1391 1532
1392 unless (eval $v->{source}) { 1533 my $active = eval $v->{source};
1534
1535 if (length $@) {
1393 my $msg = $@ ? "$v->{path}: $@\n" 1536 error "$v->{path}: $@\n";
1394 : "$v->{base}: extension inactive.\n";
1395 1537
1396 if (exists $v->{meta}{mandatory}) {
1397 warn $msg;
1398 cf::cleanup "mandatory extension failed to load, exiting."; 1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1399 } 1539 if exists $v->{meta}{mandatory};
1400 1540
1401 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;
1402 } 1550 }
1403
1404 $done{$k} = delete $todo{$k};
1405 push @EXTS, $v->{pkg};
1406 $progress = 1;
1407 } 1551 }
1408 1552
1409 skip: 1553 unless ($progress) {
1410 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1554 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1411 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 }
1412 } 1563 }
1413 }; 1564 };
1414} 1565}
1415 1566
1416############################################################################# 1567#############################################################################
1500 $cf::PLAYER{$login} = $pl 1651 $cf::PLAYER{$login} = $pl
1501 } 1652 }
1502 } 1653 }
1503} 1654}
1504 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
1505sub save($) { 1669sub save($) {
1506 my ($pl) = @_; 1670 my ($pl) = @_;
1507 1671
1508 return if $pl->{deny_save}; 1672 return if $pl->{deny_save};
1509 1673
1514 1678
1515 aio_mkdir playerdir $pl, 0770; 1679 aio_mkdir playerdir $pl, 0770;
1516 $pl->{last_save} = $cf::RUNTIME; 1680 $pl->{last_save} = $cf::RUNTIME;
1517 1681
1518 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];
1519 1686
1520 $pl->save_pl ($path); 1687 $pl->save_pl ($path);
1521 cf::cede_to_tick; 1688 cf::cede_to_tick;
1522} 1689}
1523 1690
1557 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1558 1725
1559 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1560 $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
1561 1728
1562 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1563 $pl->deactivate; 1730 $pl->deactivate;
1731
1564 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;
1565 $pl->ob->check_score;
1566 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1567 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1568 1737
1569 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1570 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1571 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
1625 \@logins 1794 \@logins
1626} 1795}
1627 1796
1628=item $player->maps 1797=item $player->maps
1629 1798
1799=item cf::player::maps $login
1800
1630Returns an arrayref of map paths that are private for this 1801Returns an arrayref of map paths that are private for this
1631player. May block. 1802player. May block.
1632 1803
1633=cut 1804=cut
1634 1805
1696=cut 1867=cut
1697 1868
1698sub find_by_path($) { 1869sub find_by_path($) {
1699 my ($path) = @_; 1870 my ($path) = @_;
1700 1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1873
1701 my ($match, $specificity); 1874 my ($match, $specificity);
1702 1875
1703 for my $region (list) { 1876 for my $region (list) {
1704 if ($region->{match} && $path =~ $region->{match}) { 1877 if ($region->{match} && $path =~ $region->{match}) {
1705 ($match, $specificity) = ($region, $region->specificity) 1878 ($match, $specificity) = ($region, $region->specificity)
1733sub generate_random_map { 1906sub generate_random_map {
1734 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1735 1908
1736 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
1737 1910
1738 # mit "rum" bekleckern, nicht
1739 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1740 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1741 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1742 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1743 $rmp->{exit_on_final_map},
1744 $rmp->{xsize}, $rmp->{ysize},
1745 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1746 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1747 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1748 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1749 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1750 (cf::region::find $rmp->{region}), $rmp->{custom}
1751 )
1752} 1912}
1753 1913
1754=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1755 1915
1756Register 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
1761 1921
1762sub register { 1922sub register {
1763 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1764 my $pkg = caller; 1924 my $pkg = caller;
1765 1925
1766 no strict;
1767 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1768 1927
1769 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1770} 1929}
1771 1930
1772# also paths starting with '/' 1931# also paths starting with '/'
1773$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1774 1933
1775sub thawer_merge { 1934sub thawer_merge {
1776 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1777 1936
1778 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
1783} 1942}
1784 1943
1785sub normalise { 1944sub normalise {
1786 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1787 1946
1788 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1789 1948
1790 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1791 1950
1792 # map plan: 1951 # map plan:
1793 # 1952 #
1808 $base =~ s{[^/]+/?$}{}; 1967 $base =~ s{[^/]+/?$}{};
1809 $path = "$base/$path"; 1968 $path = "$base/$path";
1810 } 1969 }
1811 1970
1812 for ($path) { 1971 for ($path) {
1813 redo if s{//}{/};
1814 redo if s{/\.?/}{/}; 1972 redo if s{/\.?/}{/};
1815 redo if s{/[^/]+/\.\./}{/}; 1973 redo if s{/[^/]+/\.\./}{/};
1816 } 1974 }
1817 1975
1818 $path 1976 $path
1832 $self->init; # pass $1 etc. 1990 $self->init; # pass $1 etc.
1833 return $self; 1991 return $self;
1834 } 1992 }
1835 } 1993 }
1836 1994
1837 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1995 Carp::cluck "unable to resolve path '$path' (base '$base')";
1838 () 1996 ()
1839} 1997}
1840 1998
1999# may re-bless or do other evil things
1841sub init { 2000sub init {
1842 my ($self) = @_; 2001 my ($self) = @_;
1843 2002
1844 $self 2003 $self
1845} 2004}
1964} 2123}
1965 2124
1966sub find; 2125sub find;
1967sub find { 2126sub find {
1968 my ($path, $origin) = @_; 2127 my ($path, $origin) = @_;
2128
2129 cf::cede_to_tick;
1969 2130
1970 $path = normalise $path, $origin && $origin->path; 2131 $path = normalise $path, $origin && $origin->path;
1971 2132
1972 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2133 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973 my $guard2 = cf::lock_acquire "map_find:$path"; 2134 my $guard2 = cf::lock_acquire "map_find:$path";
1992 2153
1993 $cf::MAP{$path} = $map 2154 $cf::MAP{$path} = $map
1994 } 2155 }
1995} 2156}
1996 2157
1997sub pre_load { } 2158sub pre_load { }
1998sub post_load { } 2159#sub post_load { } # XS
1999 2160
2000sub load { 2161sub load {
2001 my ($self) = @_; 2162 my ($self) = @_;
2002 2163
2003 local $self->{deny_reset} = 1; # loading can take a long time 2164 local $self->{deny_reset} = 1; # loading can take a long time
2058 2219
2059 $self->in_memory (cf::MAP_ACTIVE); 2220 $self->in_memory (cf::MAP_ACTIVE);
2060 } 2221 }
2061 2222
2062 $self->post_load; 2223 $self->post_load;
2063}
2064 2224
2225 1
2226}
2227
2228# customize the map for a given player, i.e.
2229# return the _real_ map. used by e.g. per-player
2230# maps to change the path to ~playername/mappath
2065sub customise_for { 2231sub customise_for {
2066 my ($self, $ob) = @_; 2232 my ($self, $ob) = @_;
2067 2233
2068 return find "~" . $ob->name . "/" . $self->{path} 2234 return find "~" . $ob->name . "/" . $self->{path}
2069 if $self->per_player; 2235 if $self->per_player;
2085 or next; 2251 or next;
2086 $neigh = find $neigh, $map 2252 $neigh = find $neigh, $map
2087 or next; 2253 or next;
2088 $neigh->load; 2254 $neigh->load;
2089 2255
2256 # now find the diagonal neighbours
2090 push @neigh, 2257 push @neigh,
2091 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2258 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2092 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2259 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2093 } 2260 }
2094 2261
2101} 2268}
2102 2269
2103sub find_sync { 2270sub find_sync {
2104 my ($path, $origin) = @_; 2271 my ($path, $origin) = @_;
2105 2272
2106 cf::sync_job { find $path, $origin } 2273 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2274 if $Coro::current == $Coro::main;
2275
2276 find $path, $origin
2107} 2277}
2108 2278
2109sub do_load_sync { 2279sub do_load_sync {
2110 my ($map) = @_; 2280 my ($map) = @_;
2111 2281
2112 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2282 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2113 if $Coro::current == $Coro::main; 2283 if $Coro::current == $Coro::main;
2114 2284
2115 cf::sync_job { $map->load }; 2285 $map->load;
2116} 2286}
2117 2287
2118our %MAP_PREFETCH; 2288our %MAP_PREFETCH;
2119our $MAP_PREFETCHER = undef; 2289our $MAP_PREFETCHER = undef;
2120 2290
2146 $MAP_PREFETCHER->prio (6); 2316 $MAP_PREFETCHER->prio (6);
2147 2317
2148 () 2318 ()
2149} 2319}
2150 2320
2321# common code, used by both ->save and ->swapout
2151sub save { 2322sub _save {
2152 my ($self) = @_; 2323 my ($self) = @_;
2153
2154 my $lock = cf::lock_acquire "map_data:$self->{path}";
2155 2324
2156 $self->{last_save} = $cf::RUNTIME; 2325 $self->{last_save} = $cf::RUNTIME;
2157 2326
2158 return unless $self->dirty; 2327 return unless $self->dirty;
2159 2328
2179 } else { 2348 } else {
2180 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2349 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2181 } 2350 }
2182} 2351}
2183 2352
2353sub save {
2354 my ($self) = @_;
2355
2356 my $lock = cf::lock_acquire "map_data:$self->{path}";
2357
2358 $self->_save;
2359}
2360
2184sub swap_out { 2361sub swap_out {
2185 my ($self) = @_; 2362 my ($self) = @_;
2186 2363
2187 # save first because save cedes
2188 $self->save;
2189
2190 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2364 my $lock = cf::lock_acquire "map_data:$self->{path}";
2191 2365
2192 return if $self->players;
2193 return if $self->in_memory != cf::MAP_ACTIVE; 2366 return if $self->in_memory != cf::MAP_ACTIVE;
2194 return if $self->{deny_save}; 2367 return if $self->{deny_save};
2368 return if $self->players;
2195 2369
2370 # first deactivate the map and "unlink" it from the core
2371 $self->deactivate;
2372 $_->clear_links_to ($self) for values %cf::MAP;
2196 $self->in_memory (cf::MAP_SWAPPED); 2373 $self->in_memory (cf::MAP_SWAPPED);
2374
2375 # then atomically save
2376 $self->_save;
2377
2378 # then free the map
2379 $self->clear;
2380}
2381
2382sub reset_at {
2383 my ($self) = @_;
2384
2385 # TODO: safety, remove and allow resettable per-player maps
2386 return 1e99 if $self->{deny_reset};
2387
2388 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2389 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2390
2391 $time + $to
2392}
2393
2394sub should_reset {
2395 my ($self) = @_;
2396
2397 $self->reset_at <= $cf::RUNTIME
2398}
2399
2400sub reset {
2401 my ($self) = @_;
2402
2403 my $lock = cf::lock_acquire "map_data:$self->{path}";
2404
2405 return if $self->players;
2406
2407 cf::trace "resetting map ", $self->path, "\n";
2408
2409 $self->in_memory (cf::MAP_SWAPPED);
2410
2411 # need to save uniques path
2412 unless ($self->{deny_save}) {
2413 my $uniq = $self->uniq_path; utf8::encode $uniq;
2414
2415 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2416 if $uniq;
2417 }
2418
2419 delete $cf::MAP{$self->path};
2197 2420
2198 $self->deactivate; 2421 $self->deactivate;
2199 $_->clear_links_to ($self) for values %cf::MAP; 2422 $_->clear_links_to ($self) for values %cf::MAP;
2200 $self->clear; 2423 $self->clear;
2201}
2202
2203sub reset_at {
2204 my ($self) = @_;
2205
2206 # TODO: safety, remove and allow resettable per-player maps
2207 return 1e99 if $self->{deny_reset};
2208
2209 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2210 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2211
2212 $time + $to
2213}
2214
2215sub should_reset {
2216 my ($self) = @_;
2217
2218 $self->reset_at <= $cf::RUNTIME
2219}
2220
2221sub reset {
2222 my ($self) = @_;
2223
2224 my $lock = cf::lock_acquire "map_data:$self->{path}";
2225
2226 return if $self->players;
2227
2228 warn "resetting map ", $self->path;
2229
2230 $self->in_memory (cf::MAP_SWAPPED);
2231
2232 # need to save uniques path
2233 unless ($self->{deny_save}) {
2234 my $uniq = $self->uniq_path; utf8::encode $uniq;
2235
2236 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2237 if $uniq;
2238 }
2239
2240 delete $cf::MAP{$self->path};
2241
2242 $self->deactivate;
2243 $_->clear_links_to ($self) for values %cf::MAP;
2244 $self->clear;
2245 2424
2246 $self->unlink_save; 2425 $self->unlink_save;
2247 $self->destroy; 2426 $self->destroy;
2248} 2427}
2249 2428
2257 2436
2258 delete $cf::MAP{$self->path}; 2437 delete $cf::MAP{$self->path};
2259 2438
2260 $self->unlink_save; 2439 $self->unlink_save;
2261 2440
2262 bless $self, "cf::map"; 2441 bless $self, "cf::map::wrap";
2263 delete $self->{deny_reset}; 2442 delete $self->{deny_reset};
2264 $self->{deny_save} = 1; 2443 $self->{deny_save} = 1;
2265 $self->reset_timeout (1); 2444 $self->reset_timeout (1);
2266 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2445 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2267 2446
2324 : normalise $_ 2503 : normalise $_
2325 } @{ aio_readdir $UNIQUEDIR or [] } 2504 } @{ aio_readdir $UNIQUEDIR or [] }
2326 ] 2505 ]
2327} 2506}
2328 2507
2508=item cf::map::static_maps
2509
2510Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2511file in the shared directory excluding F</styles> and F</editor>). May
2512block.
2513
2514=cut
2515
2516sub static_maps() {
2517 my @dirs = "";
2518 my @maps;
2519
2520 while (@dirs) {
2521 my $dir = shift @dirs;
2522
2523 next if $dir eq "/styles" || $dir eq "/editor";
2524
2525 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2526 or return;
2527
2528 for (@$files) {
2529 s/\.map$// or next;
2530 utf8::decode $_;
2531 push @maps, "$dir/$_";
2532 }
2533
2534 push @dirs, map "$dir/$_", @$dirs;
2535 }
2536
2537 \@maps
2538}
2539
2329=back 2540=back
2330 2541
2331=head3 cf::object 2542=head3 cf::object
2332 2543
2333=cut 2544=cut
2465 2676
2466Freezes the player and moves him/her to a special map (C<{link}>). 2677Freezes the player and moves him/her to a special map (C<{link}>).
2467 2678
2468The player should be reasonably safe there for short amounts of time (e.g. 2679The player should be reasonably safe there for short amounts of time (e.g.
2469for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2680for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2470though, as the palyer cannot control the character while it is on the link 2681though, as the player cannot control the character while it is on the link
2471map. 2682map.
2472 2683
2473Will never block. 2684Will never block.
2474 2685
2475=item $player_object->leave_link ($map, $x, $y) 2686=item $player_object->leave_link ($map, $x, $y)
2496sub cf::object::player::enter_link { 2707sub cf::object::player::enter_link {
2497 my ($self) = @_; 2708 my ($self) = @_;
2498 2709
2499 $self->deactivate_recursive; 2710 $self->deactivate_recursive;
2500 2711
2712 ++$self->{_link_recursion};
2713
2501 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2714 return if UNIVERSAL::isa $self->map, "ext::map_link";
2502 2715
2503 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2716 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2504 if $self->map && $self->map->{path} ne "{link}"; 2717 if $self->map && $self->map->{path} ne "{link}";
2505 2718
2506 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2719 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2507} 2720}
2508 2721
2509sub cf::object::player::leave_link { 2722sub cf::object::player::leave_link {
2510 my ($self, $map, $x, $y) = @_; 2723 my ($self, $map, $x, $y) = @_;
2511 2724
2528 ($x, $y) = (-1, -1) 2741 ($x, $y) = (-1, -1)
2529 unless (defined $x) && (defined $y); 2742 unless (defined $x) && (defined $y);
2530 2743
2531 # use -1 or undef as default coordinates, not 0, 0 2744 # use -1 or undef as default coordinates, not 0, 0
2532 ($x, $y) = ($map->enter_x, $map->enter_y) 2745 ($x, $y) = ($map->enter_x, $map->enter_y)
2533 if $x <=0 && $y <= 0; 2746 if $x <= 0 && $y <= 0;
2534 2747
2535 $map->load; 2748 $map->load;
2536 $map->load_neighbours; 2749 $map->load_neighbours;
2537 2750
2538 return unless $self->contr->active; 2751 return unless $self->contr->active;
2539 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2540 $self->activate_recursive;
2541 2752
2542 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2753 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2543 $self->enter_map ($map, $x, $y); 2754 if ($self->enter_map ($map, $x, $y)) {
2544} 2755 # entering was successful
2756 delete $self->{_link_recursion};
2757 # only activate afterwards, to support waiting in hooks
2758 $self->activate_recursive;
2759 }
2545 2760
2761}
2762
2546=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2763=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2547 2764
2548Moves the player to the given map-path and coordinates by first freezing 2765Moves the player to the given map-path and coordinates by first freezing
2549her, loading and preparing them map, calling the provided $check callback 2766her, loading and preparing them map, calling the provided $check callback
2550that has to return the map if sucecssful, and then unfreezes the player on 2767that has to return the map if sucecssful, and then unfreezes the player on
2551the new (success) or old (failed) map position. In either case, $done will 2768the new (success) or old (failed) map position. In either case, $done will
2558 2775
2559our $GOTOGEN; 2776our $GOTOGEN;
2560 2777
2561sub cf::object::player::goto { 2778sub cf::object::player::goto {
2562 my ($self, $path, $x, $y, $check, $done) = @_; 2779 my ($self, $path, $x, $y, $check, $done) = @_;
2780
2781 if ($self->{_link_recursion} >= $MAX_LINKS) {
2782 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2783 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2784 ($path, $x, $y) = @$EMERGENCY_POSITION;
2785 }
2563 2786
2564 # do generation counting so two concurrent goto's will be executed in-order 2787 # do generation counting so two concurrent goto's will be executed in-order
2565 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2788 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2566 2789
2567 $self->enter_link; 2790 $self->enter_link;
2591 my $map = eval { 2814 my $map = eval {
2592 my $map = defined $path ? cf::map::find $path : undef; 2815 my $map = defined $path ? cf::map::find $path : undef;
2593 2816
2594 if ($map) { 2817 if ($map) {
2595 $map = $map->customise_for ($self); 2818 $map = $map->customise_for ($self);
2596 $map = $check->($map) if $check && $map; 2819 $map = $check->($map, $x, $y, $self) if $check && $map;
2597 } else { 2820 } else {
2598 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2821 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2599 } 2822 }
2600 2823
2601 $map 2824 $map
2609 if ($gen == $self->{_goto_generation}) { 2832 if ($gen == $self->{_goto_generation}) {
2610 delete $self->{_goto_generation}; 2833 delete $self->{_goto_generation};
2611 $self->leave_link ($map, $x, $y); 2834 $self->leave_link ($map, $x, $y);
2612 } 2835 }
2613 2836
2614 $done->() if $done; 2837 $done->($self) if $done;
2615 })->prio (1); 2838 })->prio (1);
2616} 2839}
2617 2840
2618=item $player_object->enter_exit ($exit_object) 2841=item $player_object->enter_exit ($exit_object)
2619 2842
2712 $self->message ("Something went wrong deep within the deliantra server. " 2935 $self->message ("Something went wrong deep within the deliantra server. "
2713 . "I'll try to bring you back to the map you were before. " 2936 . "I'll try to bring you back to the map you were before. "
2714 . "Please report this to the dungeon master!", 2937 . "Please report this to the dungeon master!",
2715 cf::NDI_UNIQUE | cf::NDI_RED); 2938 cf::NDI_UNIQUE | cf::NDI_RED);
2716 2939
2717 warn "ERROR in enter_exit: $@"; 2940 error "ERROR in enter_exit: $@";
2718 $self->leave_link; 2941 $self->leave_link;
2719 } 2942 }
2720 })->prio (1); 2943 })->prio (1);
2721} 2944}
2722 2945
2734sub cf::client::send_drawinfo { 2957sub cf::client::send_drawinfo {
2735 my ($self, $text, $flags) = @_; 2958 my ($self, $text, $flags) = @_;
2736 2959
2737 utf8::encode $text; 2960 utf8::encode $text;
2738 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2961 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2962}
2963
2964=item $client->send_big_packet ($pkt)
2965
2966Like C<send_packet>, but tries to compress large packets, and fragments
2967them as required.
2968
2969=cut
2970
2971our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2972
2973sub cf::client::send_big_packet {
2974 my ($self, $pkt) = @_;
2975
2976 # try lzf for large packets
2977 $pkt = "lzf " . Compress::LZF::compress $pkt
2978 if 1024 <= length $pkt and $self->{can_lzf};
2979
2980 # split very large packets
2981 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2982 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2983 $pkt = "frag";
2984 }
2985
2986 $self->send_packet ($pkt);
2739} 2987}
2740 2988
2741=item $client->send_msg ($channel, $msg, $color, [extra...]) 2989=item $client->send_msg ($channel, $msg, $color, [extra...])
2742 2990
2743Send a drawinfo or msg packet to the client, formatting the msg for the 2991Send a drawinfo or msg packet to the client, formatting the msg for the
2747 2995
2748=cut 2996=cut
2749 2997
2750# non-persistent channels (usually the info channel) 2998# non-persistent channels (usually the info channel)
2751our %CHANNEL = ( 2999our %CHANNEL = (
3000 "c/motd" => {
3001 id => "infobox",
3002 title => "MOTD",
3003 reply => undef,
3004 tooltip => "The message of the day",
3005 },
2752 "c/identify" => { 3006 "c/identify" => {
2753 id => "infobox", 3007 id => "infobox",
2754 title => "Identify", 3008 title => "Identify",
2755 reply => undef, 3009 reply => undef,
2756 tooltip => "Items recently identified", 3010 tooltip => "Items recently identified",
2758 "c/examine" => { 3012 "c/examine" => {
2759 id => "infobox", 3013 id => "infobox",
2760 title => "Examine", 3014 title => "Examine",
2761 reply => undef, 3015 reply => undef,
2762 tooltip => "Signs and other items you examined", 3016 tooltip => "Signs and other items you examined",
3017 },
3018 "c/shopinfo" => {
3019 id => "infobox",
3020 title => "Shop Info",
3021 reply => undef,
3022 tooltip => "What your bargaining skill tells you about the shop",
2763 }, 3023 },
2764 "c/book" => { 3024 "c/book" => {
2765 id => "infobox", 3025 id => "infobox",
2766 title => "Book", 3026 title => "Book",
2767 reply => undef, 3027 reply => undef,
2883 my $pkt = "msg " 3143 my $pkt = "msg "
2884 . $self->{json_coder}->encode ( 3144 . $self->{json_coder}->encode (
2885 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3145 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2886 ); 3146 );
2887 3147
2888 # try lzf for large packets
2889 $pkt = "lzf " . Compress::LZF::compress $pkt
2890 if 1024 <= length $pkt and $self->{can_lzf};
2891
2892 # split very large packets
2893 if (8192 < length $pkt and $self->{can_lzf}) {
2894 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2895 $pkt = "frag";
2896 }
2897
2898 $self->send_packet ($pkt); 3148 $self->send_big_packet ($pkt);
2899} 3149}
2900 3150
2901=item $client->ext_msg ($type, @msg) 3151=item $client->ext_msg ($type, @msg)
2902 3152
2903Sends an ext event to the client. 3153Sends an ext event to the client.
2906 3156
2907sub cf::client::ext_msg($$@) { 3157sub cf::client::ext_msg($$@) {
2908 my ($self, $type, @msg) = @_; 3158 my ($self, $type, @msg) = @_;
2909 3159
2910 if ($self->extcmd == 2) { 3160 if ($self->extcmd == 2) {
2911 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3161 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2912 } elsif ($self->extcmd == 1) { # TODO: remove 3162 } elsif ($self->extcmd == 1) { # TODO: remove
2913 push @msg, msgtype => "event_$type"; 3163 push @msg, msgtype => "event_$type";
2914 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3164 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2915 } 3165 }
2916} 3166}
2917 3167
2918=item $client->ext_reply ($msgid, @msg) 3168=item $client->ext_reply ($msgid, @msg)
2919 3169
2923 3173
2924sub cf::client::ext_reply($$@) { 3174sub cf::client::ext_reply($$@) {
2925 my ($self, $id, @msg) = @_; 3175 my ($self, $id, @msg) = @_;
2926 3176
2927 if ($self->extcmd == 2) { 3177 if ($self->extcmd == 2) {
2928 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3178 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2929 } elsif ($self->extcmd == 1) { 3179 } elsif ($self->extcmd == 1) {
2930 #TODO: version 1, remove 3180 #TODO: version 1, remove
2931 unshift @msg, msgtype => "reply", msgid => $id; 3181 unshift @msg, msgtype => "reply", msgid => $id;
2932 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3182 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2933 } 3183 }
2934} 3184}
2935 3185
2936=item $success = $client->query ($flags, "text", \&cb) 3186=item $success = $client->query ($flags, "text", \&cb)
2937 3187
3008 3258
3009 $ns->ext_reply ($reply, @reply) 3259 $ns->ext_reply ($reply, @reply)
3010 if $reply; 3260 if $reply;
3011 3261
3012 } else { 3262 } else {
3013 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3263 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3014 } 3264 }
3015 3265
3016 cf::override; 3266 cf::override;
3017 }, 3267 },
3018); 3268);
3038 3288
3039 $coro 3289 $coro
3040} 3290}
3041 3291
3042cf::client->attach ( 3292cf::client->attach (
3043 on_destroy => sub { 3293 on_client_destroy => sub {
3044 my ($ns) = @_; 3294 my ($ns) = @_;
3045 3295
3046 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3296 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3047 }, 3297 },
3048); 3298);
3064our $safe_hole = new Safe::Hole; 3314our $safe_hole = new Safe::Hole;
3065 3315
3066$SIG{FPE} = 'IGNORE'; 3316$SIG{FPE} = 'IGNORE';
3067 3317
3068$safe->permit_only (Opcode::opset qw( 3318$safe->permit_only (Opcode::opset qw(
3069 :base_core :base_mem :base_orig :base_math 3319 :base_core :base_mem :base_orig :base_math :base_loop
3070 grepstart grepwhile mapstart mapwhile 3320 grepstart grepwhile mapstart mapwhile
3071 sort time 3321 sort time
3072)); 3322));
3073 3323
3074# here we export the classes and methods available to script code 3324# here we export the classes and methods available to script code
3099 decrease split destroy change_exp value msg lore send_msg)], 3349 decrease split destroy change_exp value msg lore send_msg)],
3100 ["cf::object::player" => qw(player)], 3350 ["cf::object::player" => qw(player)],
3101 ["cf::player" => qw(peaceful send_msg)], 3351 ["cf::player" => qw(peaceful send_msg)],
3102 ["cf::map" => qw(trigger)], 3352 ["cf::map" => qw(trigger)],
3103) { 3353) {
3104 no strict 'refs';
3105 my ($pkg, @funs) = @$_; 3354 my ($pkg, @funs) = @$_;
3106 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3355 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3107 for @funs; 3356 for @funs;
3108} 3357}
3109 3358
3126 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3375 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3127 $qcode =~ s/\n/\\n/g; 3376 $qcode =~ s/\n/\\n/g;
3128 3377
3129 %vars = (_dummy => 0) unless %vars; 3378 %vars = (_dummy => 0) unless %vars;
3130 3379
3380 my @res;
3131 local $_; 3381 local $_;
3132 local @safe::cf::_safe_eval_args = values %vars;
3133 3382
3134 my $eval = 3383 my $eval =
3135 "do {\n" 3384 "do {\n"
3136 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3385 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3137 . "#line 0 \"{$qcode}\"\n" 3386 . "#line 0 \"{$qcode}\"\n"
3138 . $code 3387 . $code
3139 . "\n}" 3388 . "\n}"
3140 ; 3389 ;
3141 3390
3391 if ($CFG{safe_eval}) {
3142 sub_generation_inc; 3392 sub_generation_inc;
3393 local @safe::cf::_safe_eval_args = values %vars;
3143 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3394 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3144 sub_generation_inc; 3395 sub_generation_inc;
3396 } else {
3397 local @cf::_safe_eval_args = values %vars;
3398 @res = wantarray ? eval eval : scalar eval $eval;
3399 }
3145 3400
3146 if ($@) { 3401 if ($@) {
3147 warn "$@"; 3402 warn "$@",
3148 warn "while executing safe code '$code'\n"; 3403 "while executing safe code '$code'\n",
3149 warn "with arguments " . (join " ", %vars) . "\n"; 3404 "with arguments " . (join " ", %vars) . "\n";
3150 } 3405 }
3151 3406
3152 wantarray ? @res : $res[0] 3407 wantarray ? @res : $res[0]
3153} 3408}
3154 3409
3168=cut 3423=cut
3169 3424
3170sub register_script_function { 3425sub register_script_function {
3171 my ($fun, $cb) = @_; 3426 my ($fun, $cb) = @_;
3172 3427
3173 no strict 'refs'; 3428 $fun = "safe::$fun" if $CFG{safe_eval};
3174 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3429 *$fun = $safe_hole->wrap ($cb);
3175} 3430}
3176 3431
3177=back 3432=back
3178 3433
3179=cut 3434=cut
3188 # for this (global event?) 3443 # for this (global event?)
3189 %ext::player_env::MUSIC_FACE_CACHE = (); 3444 %ext::player_env::MUSIC_FACE_CACHE = ();
3190 3445
3191 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3446 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3192 3447
3193 warn "loading facedata from $path\n"; 3448 trace "loading facedata from $path\n";
3194 3449
3195 my $facedata; 3450 my $facedata = decode_storable load_file $path;
3196 0 < aio_load $path, $facedata
3197 or die "$path: $!";
3198
3199 $facedata = Coro::Storable::thaw $facedata;
3200 3451
3201 $facedata->{version} == 2 3452 $facedata->{version} == 2
3202 or cf::cleanup "$path: version mismatch, cannot proceed."; 3453 or cf::cleanup "$path: version mismatch, cannot proceed.";
3203 3454
3204 # patch in the exptable 3455 # patch in the exptable
3456 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3205 $facedata->{resource}{"res/exp_table"} = { 3457 $facedata->{resource}{"res/exp_table"} = {
3206 type => FT_RSRC, 3458 type => FT_RSRC,
3207 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3459 data => $exp_table,
3460 hash => (Digest::MD5::md5 $exp_table),
3208 }; 3461 };
3209 cf::cede_to_tick; 3462 cf::cede_to_tick;
3210 3463
3211 { 3464 {
3212 my $faces = $facedata->{faceinfo}; 3465 my $faces = $facedata->{faceinfo};
3214 while (my ($face, $info) = each %$faces) { 3467 while (my ($face, $info) = each %$faces) {
3215 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3468 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3216 3469
3217 cf::face::set_visibility $idx, $info->{visibility}; 3470 cf::face::set_visibility $idx, $info->{visibility};
3218 cf::face::set_magicmap $idx, $info->{magicmap}; 3471 cf::face::set_magicmap $idx, $info->{magicmap};
3219 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3472 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3220 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3473 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3474 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3221 3475
3222 cf::cede_to_tick; 3476 cf::cede_to_tick;
3223 } 3477 }
3224 3478
3225 while (my ($face, $info) = each %$faces) { 3479 while (my ($face, $info) = each %$faces) {
3230 3484
3231 if (my $smooth = cf::face::find $info->{smooth}) { 3485 if (my $smooth = cf::face::find $info->{smooth}) {
3232 cf::face::set_smooth $idx, $smooth; 3486 cf::face::set_smooth $idx, $smooth;
3233 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3487 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3234 } else { 3488 } else {
3235 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3489 error "smooth face '$info->{smooth}' not found for face '$face'";
3236 } 3490 }
3237 3491
3238 cf::cede_to_tick; 3492 cf::cede_to_tick;
3239 } 3493 }
3240 } 3494 }
3249 3503
3250 cf::anim::invalidate_all; # d'oh 3504 cf::anim::invalidate_all; # d'oh
3251 } 3505 }
3252 3506
3253 { 3507 {
3254 # TODO: for gcfclient pleasure, we should give resources
3255 # that gcfclient doesn't grok a >10000 face index.
3256 my $res = $facedata->{resource}; 3508 my $res = $facedata->{resource};
3257 3509
3258 while (my ($name, $info) = each %$res) { 3510 while (my ($name, $info) = each %$res) {
3259 if (defined $info->{type}) { 3511 if (defined $info->{type}) {
3260 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3512 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3261 my $data;
3262 3513
3263 if ($info->{type} & 1) { 3514 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3264 # prepend meta info
3265
3266 my $meta = $enc->encode ({
3267 name => $name,
3268 %{ $info->{meta} || {} },
3269 });
3270
3271 $data = pack "(w/a*)*", $meta, $info->{data};
3272 } else {
3273 $data = $info->{data};
3274 }
3275
3276 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3277 cf::face::set_type $idx, $info->{type}; 3515 cf::face::set_type $idx, $info->{type};
3278 } else { 3516 } else {
3279 $RESOURCE{$name} = $info; 3517 $RESOURCE{$name} = $info; # unused
3280 } 3518 }
3281 3519
3282 cf::cede_to_tick; 3520 cf::cede_to_tick;
3283 } 3521 }
3284 } 3522 }
3285 3523
3286 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3524 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3287 3525
3288 1 3526 1
3289} 3527}
3290
3291cf::global->attach (on_resource_update => sub {
3292 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3293 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3294
3295 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3296 my $sound = $soundconf->{compat}[$_]
3297 or next;
3298
3299 my $face = cf::face::find "sound/$sound->[1]";
3300 cf::sound::set $sound->[0] => $face;
3301 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3302 }
3303
3304 while (my ($k, $v) = each %{$soundconf->{event}}) {
3305 my $face = cf::face::find "sound/$v";
3306 cf::sound::set $k => $face;
3307 }
3308 }
3309});
3310 3528
3311register_exticmd fx_want => sub { 3529register_exticmd fx_want => sub {
3312 my ($ns, $want) = @_; 3530 my ($ns, $want) = @_;
3313 3531
3314 while (my ($k, $v) = each %$want) { 3532 while (my ($k, $v) = each %$want) {
3353sub reload_treasures { 3571sub reload_treasures {
3354 load_resource_file "$DATADIR/treasures" 3572 load_resource_file "$DATADIR/treasures"
3355 or die "unable to load treasurelists\n"; 3573 or die "unable to load treasurelists\n";
3356} 3574}
3357 3575
3576sub reload_sound {
3577 trace "loading sound config from $DATADIR/sound\n";
3578
3579 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3580
3581 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3582 my $sound = $soundconf->{compat}[$_]
3583 or next;
3584
3585 my $face = cf::face::find "sound/$sound->[1]";
3586 cf::sound::set $sound->[0] => $face;
3587 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3588 }
3589
3590 while (my ($k, $v) = each %{$soundconf->{event}}) {
3591 my $face = cf::face::find "sound/$v";
3592 cf::sound::set $k => $face;
3593 }
3594}
3595
3358sub reload_resources { 3596sub reload_resources {
3359 warn "reloading resource files...\n"; 3597 trace "reloading resource files...\n";
3360 3598
3599 reload_exp_table;
3600 reload_materials;
3361 reload_facedata; 3601 reload_facedata;
3602 reload_sound;
3362 reload_archetypes; 3603 reload_archetypes;
3363 reload_regions; 3604 reload_regions;
3364 reload_treasures; 3605 reload_treasures;
3365 3606
3366 warn "finished reloading resource files\n"; 3607 trace "finished reloading resource files\n";
3367} 3608}
3368 3609
3369sub reload_config { 3610sub reload_config {
3370 open my $fh, "<:utf8", "$CONFDIR/config" 3611 trace "reloading config file...\n";
3371 or return;
3372 3612
3373 local $/; 3613 my $config = load_file "$CONFDIR/config";
3374 *CFG = YAML::Load <$fh>; 3614 utf8::decode $config;
3615 *CFG = decode_yaml $config;
3375 3616
3376 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3617 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3377 3618
3378 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3619 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3379 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3620 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3380 3621
3381 if (exists $CFG{mlockall}) { 3622 if (exists $CFG{mlockall}) {
3405 seek $fh, 0, 0; 3646 seek $fh, 0, 0;
3406 print $fh $$; 3647 print $fh $$;
3407} 3648}
3408 3649
3409sub main_loop { 3650sub main_loop {
3410 warn "EV::loop starting\n"; 3651 trace "EV::loop starting\n";
3411 if (1) { 3652 if (1) {
3412 EV::loop; 3653 EV::loop;
3413 } 3654 }
3414 warn "EV::loop returned\n"; 3655 trace "EV::loop returned\n";
3415 goto &main_loop unless $REALLY_UNLOOP; 3656 goto &main_loop unless $REALLY_UNLOOP;
3416} 3657}
3417 3658
3418sub main { 3659sub main {
3419 cf::init_globals; # initialise logging 3660 cf::init_globals; # initialise logging
3420 3661
3421 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3662 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3422 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3663 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3423 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3664 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3424 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3665 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3425
3426 cf::init_experience;
3427 cf::init_anim;
3428 cf::init_attackmess;
3429 cf::init_dynamic;
3430 3666
3431 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3667 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3432 3668
3433 # we must not ever block the main coroutine 3669 # we must not ever block the main coroutine
3434 local $Coro::idle = sub { 3670 local $Coro::idle = sub {
3440 }; 3676 };
3441 3677
3442 evthread_start IO::AIO::poll_fileno; 3678 evthread_start IO::AIO::poll_fileno;
3443 3679
3444 cf::sync_job { 3680 cf::sync_job {
3681 cf::incloader::init ();
3682
3683 cf::init_anim;
3684 cf::init_attackmess;
3685 cf::init_dynamic;
3686
3687 cf::load_settings;
3688
3445 reload_resources; 3689 reload_resources;
3446 reload_config; 3690 reload_config;
3447 db_init; 3691 db_init;
3448 3692
3449 cf::load_settings;
3450 cf::load_materials;
3451 cf::init_uuid; 3693 cf::init_uuid;
3452 cf::init_signals; 3694 cf::init_signals;
3453 cf::init_commands;
3454 cf::init_skills; 3695 cf::init_skills;
3455 3696
3456 cf::init_beforeplay; 3697 cf::init_beforeplay;
3457 3698
3458 atomic; 3699 atomic;
3460 load_extensions; 3701 load_extensions;
3461 3702
3462 utime time, time, $RUNTIMEFILE; 3703 utime time, time, $RUNTIMEFILE;
3463 3704
3464 # no (long-running) fork's whatsoever before this point(!) 3705 # no (long-running) fork's whatsoever before this point(!)
3706 use POSIX ();
3465 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3707 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3466 3708
3467 (pop @POST_INIT)->(0) while @POST_INIT; 3709 cf::_post_init 0;
3468 }; 3710 };
3469 3711
3712 cf::object::thawer::errors_are_fatal 0;
3713 info "parse errors in files are no longer fatal from this point on.\n";
3714
3715 my $free_main; $free_main = EV::idle sub {
3716 undef $free_main;
3717 undef &main; # free gobs of memory :)
3718 };
3719
3470 main_loop; 3720 goto &main_loop;
3471} 3721}
3472 3722
3473############################################################################# 3723#############################################################################
3474# initialisation and cleanup 3724# initialisation and cleanup
3475 3725
3476# install some emergency cleanup handlers 3726# install some emergency cleanup handlers
3477BEGIN { 3727BEGIN {
3478 our %SIGWATCHER = (); 3728 our %SIGWATCHER = ();
3479 for my $signal (qw(INT HUP TERM)) { 3729 for my $signal (qw(INT HUP TERM)) {
3480 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3730 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3481 cf::cleanup "SIG$signal"; 3731 cf::cleanup "SIG$signal";
3482 }; 3732 };
3483 } 3733 }
3484} 3734}
3485 3735
3486sub write_runtime_sync { 3736sub write_runtime_sync {
3737 my $t0 = AE::time;
3738
3487 # first touch the runtime file to show we are still running: 3739 # first touch the runtime file to show we are still running:
3488 # the fsync below can take a very very long time. 3740 # the fsync below can take a very very long time.
3489 3741
3490 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3742 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3491 3743
3492 my $guard = cf::lock_acquire "write_runtime"; 3744 my $guard = cf::lock_acquire "write_runtime";
3493 3745
3494 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3746 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3495 or return; 3747 or return;
3496 3748
3497 my $value = $cf::RUNTIME + 90 + 10; 3749 my $value = $cf::RUNTIME + 90 + 10;
3498 # 10 is the runtime save interval, for a monotonic clock 3750 # 10 is the runtime save interval, for a monotonic clock
3499 # 60 allows for the watchdog to kill the server. 3751 # 60 allows for the watchdog to kill the server.
3512 or return; 3764 or return;
3513 3765
3514 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3766 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3515 and return; 3767 and return;
3516 3768
3517 warn "runtime file written.\n"; 3769 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3518 3770
3519 1 3771 1
3520} 3772}
3521 3773
3522our $uuid_lock; 3774our $uuid_lock;
3534 or return; 3786 or return;
3535 3787
3536 my $value = uuid_seq uuid_cur; 3788 my $value = uuid_seq uuid_cur;
3537 3789
3538 unless ($value) { 3790 unless ($value) {
3539 warn "cowardly refusing to write zero uuid value!\n"; 3791 info "cowardly refusing to write zero uuid value!\n";
3540 return; 3792 return;
3541 } 3793 }
3542 3794
3543 my $value = uuid_str $value + $uuid_skip; 3795 my $value = uuid_str $value + $uuid_skip;
3544 $uuid_skip = 0; 3796 $uuid_skip = 0;
3554 or return; 3806 or return;
3555 3807
3556 aio_rename "$uuid~", $uuid 3808 aio_rename "$uuid~", $uuid
3557 and return; 3809 and return;
3558 3810
3559 warn "uuid file written ($value).\n"; 3811 trace "uuid file written ($value).\n";
3560 3812
3561 1 3813 1
3562 3814
3563} 3815}
3564 3816
3570} 3822}
3571 3823
3572sub emergency_save() { 3824sub emergency_save() {
3573 my $freeze_guard = cf::freeze_mainloop; 3825 my $freeze_guard = cf::freeze_mainloop;
3574 3826
3575 warn "emergency_perl_save: enter\n"; 3827 info "emergency_perl_save: enter\n";
3828
3829 # this is a trade-off: we want to be very quick here, so
3830 # save all maps without fsync, and later call a global sync
3831 # (which in turn might be very very slow)
3832 local $USE_FSYNC = 0;
3576 3833
3577 cf::sync_job { 3834 cf::sync_job {
3578 # this is a trade-off: we want to be very quick here, so 3835 cf::write_runtime_sync; # external watchdog should not bark
3579 # save all maps without fsync, and later call a global sync
3580 # (which in turn might be very very slow)
3581 local $USE_FSYNC = 0;
3582 3836
3583 # use a peculiar iteration method to avoid tripping on perl 3837 # use a peculiar iteration method to avoid tripping on perl
3584 # refcount bugs in for. also avoids problems with players 3838 # refcount bugs in for. also avoids problems with players
3585 # and maps saved/destroyed asynchronously. 3839 # and maps saved/destroyed asynchronously.
3586 warn "emergency_perl_save: begin player save\n"; 3840 info "emergency_perl_save: begin player save\n";
3587 for my $login (keys %cf::PLAYER) { 3841 for my $login (keys %cf::PLAYER) {
3588 my $pl = $cf::PLAYER{$login} or next; 3842 my $pl = $cf::PLAYER{$login} or next;
3589 $pl->valid or next; 3843 $pl->valid or next;
3590 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3844 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3591 $pl->save; 3845 $pl->save;
3592 } 3846 }
3593 warn "emergency_perl_save: end player save\n"; 3847 info "emergency_perl_save: end player save\n";
3594 3848
3849 cf::write_runtime_sync; # external watchdog should not bark
3850
3595 warn "emergency_perl_save: begin map save\n"; 3851 info "emergency_perl_save: begin map save\n";
3596 for my $path (keys %cf::MAP) { 3852 for my $path (keys %cf::MAP) {
3597 my $map = $cf::MAP{$path} or next; 3853 my $map = $cf::MAP{$path} or next;
3598 $map->valid or next; 3854 $map->valid or next;
3599 $map->save; 3855 $map->save;
3600 } 3856 }
3601 warn "emergency_perl_save: end map save\n"; 3857 info "emergency_perl_save: end map save\n";
3602 3858
3859 cf::write_runtime_sync; # external watchdog should not bark
3860
3603 warn "emergency_perl_save: begin database checkpoint\n"; 3861 info "emergency_perl_save: begin database checkpoint\n";
3604 BDB::db_env_txn_checkpoint $DB_ENV; 3862 BDB::db_env_txn_checkpoint $DB_ENV;
3605 warn "emergency_perl_save: end database checkpoint\n"; 3863 info "emergency_perl_save: end database checkpoint\n";
3606 3864
3607 warn "emergency_perl_save: begin write uuid\n"; 3865 info "emergency_perl_save: begin write uuid\n";
3608 write_uuid_sync 1; 3866 write_uuid_sync 1;
3609 warn "emergency_perl_save: end write uuid\n"; 3867 info "emergency_perl_save: end write uuid\n";
3868
3869 cf::write_runtime_sync; # external watchdog should not bark
3870
3871 trace "emergency_perl_save: syncing database to disk";
3872 BDB::db_env_txn_checkpoint $DB_ENV;
3873
3874 info "emergency_perl_save: starting sync\n";
3875 IO::AIO::aio_sync sub {
3876 info "emergency_perl_save: finished sync\n";
3877 };
3878
3879 cf::write_runtime_sync; # external watchdog should not bark
3880
3881 trace "emergency_perl_save: flushing outstanding aio requests";
3882 while (IO::AIO::nreqs || BDB::nreqs) {
3883 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3884 }
3885
3886 cf::write_runtime_sync; # external watchdog should not bark
3610 }; 3887 };
3611 3888
3612 warn "emergency_perl_save: starting sync()\n";
3613 IO::AIO::aio_sync sub {
3614 warn "emergency_perl_save: finished sync()\n";
3615 };
3616
3617 warn "emergency_perl_save: leave\n"; 3889 info "emergency_perl_save: leave\n";
3618} 3890}
3619 3891
3620sub post_cleanup { 3892sub post_cleanup {
3621 my ($make_core) = @_; 3893 my ($make_core) = @_;
3622 3894
3895 IO::AIO::flush;
3896
3623 warn Carp::longmess "post_cleanup backtrace" 3897 error Carp::longmess "post_cleanup backtrace"
3624 if $make_core; 3898 if $make_core;
3625 3899
3626 my $fh = pidfile; 3900 my $fh = pidfile;
3627 unlink $PIDFILE if <$fh> == $$; 3901 unlink $PIDFILE if <$fh> == $$;
3628} 3902}
3648 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3922 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3649 for my $name (keys %$leaf_symtab) { 3923 for my $name (keys %$leaf_symtab) {
3650 _gv_clear *{"$pkg$name"}; 3924 _gv_clear *{"$pkg$name"};
3651# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3925# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3652 } 3926 }
3653 warn "cleared package $pkg\n";#d#
3654} 3927}
3655 3928
3656sub do_reload_perl() { 3929sub do_reload_perl() {
3657 # can/must only be called in main 3930 # can/must only be called in main
3658 if ($Coro::current != $Coro::main) { 3931 unless (in_main) {
3659 warn "can only reload from main coroutine"; 3932 error "can only reload from main coroutine";
3660 return; 3933 return;
3661 } 3934 }
3662 3935
3663 return if $RELOAD++; 3936 return if $RELOAD++;
3664 3937
3665 my $t1 = EV::time; 3938 my $t1 = AE::time;
3666 3939
3667 while ($RELOAD) { 3940 while ($RELOAD) {
3668 warn "reloading..."; 3941 cf::get_slot 0.1, -1, "reload_perl";
3942 info "perl_reload: reloading...";
3669 3943
3670 warn "entering sync_job"; 3944 trace "perl_reload: entering sync_job";
3671 3945
3672 cf::sync_job { 3946 cf::sync_job {
3673 cf::write_runtime_sync; # external watchdog should not bark
3674 cf::emergency_save; 3947 #cf::emergency_save;
3675 cf::write_runtime_sync; # external watchdog should not bark
3676 3948
3677 warn "syncing database to disk";
3678 BDB::db_env_txn_checkpoint $DB_ENV;
3679
3680 # if anything goes wrong in here, we should simply crash as we already saved
3681
3682 warn "flushing outstanding aio requests";
3683 while (IO::AIO::nreqs || BDB::nreqs) {
3684 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3685 }
3686
3687 warn "cancelling all extension coros"; 3949 trace "perl_reload: cancelling all extension coros";
3688 $_->cancel for values %EXT_CORO; 3950 $_->cancel for values %EXT_CORO;
3689 %EXT_CORO = (); 3951 %EXT_CORO = ();
3690 3952
3691 warn "removing commands"; 3953 trace "perl_reload: removing commands";
3692 %COMMAND = (); 3954 %COMMAND = ();
3693 3955
3694 warn "removing ext/exti commands"; 3956 trace "perl_reload: removing ext/exti commands";
3695 %EXTCMD = (); 3957 %EXTCMD = ();
3696 %EXTICMD = (); 3958 %EXTICMD = ();
3697 3959
3698 warn "unloading/nuking all extensions"; 3960 trace "perl_reload: unloading/nuking all extensions";
3699 for my $pkg (@EXTS) { 3961 for my $pkg (@EXTS) {
3700 warn "... unloading $pkg"; 3962 trace "... unloading $pkg";
3701 3963
3702 if (my $cb = $pkg->can ("unload")) { 3964 if (my $cb = $pkg->can ("unload")) {
3703 eval { 3965 eval {
3704 $cb->($pkg); 3966 $cb->($pkg);
3705 1 3967 1
3706 } or warn "$pkg unloaded, but with errors: $@"; 3968 } or error "$pkg unloaded, but with errors: $@";
3707 } 3969 }
3708 3970
3709 warn "... clearing $pkg"; 3971 trace "... clearing $pkg";
3710 clear_package $pkg; 3972 clear_package $pkg;
3711 } 3973 }
3712 3974
3713 warn "unloading all perl modules loaded from $LIBDIR"; 3975 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3714 while (my ($k, $v) = each %INC) { 3976 while (my ($k, $v) = each %INC) {
3715 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3977 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3716 3978
3717 warn "... unloading $k"; 3979 trace "... unloading $k";
3718 delete $INC{$k}; 3980 delete $INC{$k};
3719 3981
3720 $k =~ s/\.pm$//; 3982 $k =~ s/\.pm$//;
3721 $k =~ s/\//::/g; 3983 $k =~ s/\//::/g;
3722 3984
3725 } 3987 }
3726 3988
3727 clear_package $k; 3989 clear_package $k;
3728 } 3990 }
3729 3991
3730 warn "getting rid of safe::, as good as possible"; 3992 trace "perl_reload: getting rid of safe::, as good as possible";
3731 clear_package "safe::$_" 3993 clear_package "safe::$_"
3732 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3994 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3733 3995
3734 warn "unloading cf.pm \"a bit\""; 3996 trace "perl_reload: unloading cf.pm \"a bit\"";
3735 delete $INC{"cf.pm"}; 3997 delete $INC{"cf.pm"};
3736 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3998 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3737 3999
3738 # don't, removes xs symbols, too, 4000 # don't, removes xs symbols, too,
3739 # and global variables created in xs 4001 # and global variables created in xs
3740 #clear_package __PACKAGE__; 4002 #clear_package __PACKAGE__;
3741 4003
3742 warn "unload completed, starting to reload now"; 4004 info "perl_reload: unload completed, starting to reload now";
3743 4005
3744 warn "reloading cf.pm"; 4006 trace "perl_reload: reloading cf.pm";
3745 require cf; 4007 require cf;
3746 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4008 cf::_connect_to_perl_1;
3747 4009
3748 warn "loading config and database again"; 4010 trace "perl_reload: loading config and database again";
3749 cf::reload_config; 4011 cf::reload_config;
3750 4012
3751 warn "loading extensions"; 4013 trace "perl_reload: loading extensions";
3752 cf::load_extensions; 4014 cf::load_extensions;
3753 4015
3754 if ($REATTACH_ON_RELOAD) { 4016 if ($REATTACH_ON_RELOAD) {
3755 warn "reattaching attachments to objects/players"; 4017 trace "perl_reload: reattaching attachments to objects/players";
3756 _global_reattach; # objects, sockets 4018 _global_reattach; # objects, sockets
3757 warn "reattaching attachments to maps"; 4019 trace "perl_reload: reattaching attachments to maps";
3758 reattach $_ for values %MAP; 4020 reattach $_ for values %MAP;
3759 warn "reattaching attachments to players"; 4021 trace "perl_reload: reattaching attachments to players";
3760 reattach $_ for values %PLAYER; 4022 reattach $_ for values %PLAYER;
3761 } 4023 }
3762 4024
3763 warn "running post_init jobs"; 4025 cf::_post_init 1;
3764 (pop @POST_INIT)->(1) while @POST_INIT;
3765 4026
3766 warn "leaving sync_job"; 4027 trace "perl_reload: leaving sync_job";
3767 4028
3768 1 4029 1
3769 } or do { 4030 } or do {
3770 warn $@; 4031 error $@;
3771 cf::cleanup "error while reloading, exiting."; 4032 cf::cleanup "perl_reload: error, exiting.";
3772 }; 4033 };
3773 4034
3774 warn "reloaded";
3775 --$RELOAD; 4035 --$RELOAD;
3776 } 4036 }
3777 4037
3778 $t1 = EV::time - $t1; 4038 $t1 = AE::time - $t1;
3779 warn "reload completed in ${t1}s\n"; 4039 info "perl_reload: completed in ${t1}s\n";
3780}; 4040};
3781 4041
3782our $RELOAD_WATCHER; # used only during reload 4042our $RELOAD_WATCHER; # used only during reload
3783 4043
3784sub reload_perl() { 4044sub reload_perl() {
3786 # coro crashes during coro_state_free->destroy here. 4046 # coro crashes during coro_state_free->destroy here.
3787 4047
3788 $RELOAD_WATCHER ||= cf::async { 4048 $RELOAD_WATCHER ||= cf::async {
3789 Coro::AIO::aio_wait cache_extensions; 4049 Coro::AIO::aio_wait cache_extensions;
3790 4050
3791 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4051 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3792 do_reload_perl; 4052 do_reload_perl;
3793 undef $RELOAD_WATCHER; 4053 undef $RELOAD_WATCHER;
3794 }; 4054 };
3795 }; 4055 };
3796} 4056}
3805 reload_perl; 4065 reload_perl;
3806 }; 4066 };
3807 } 4067 }
3808}; 4068};
3809 4069
3810unshift @INC, $LIBDIR; 4070#############################################################################
3811 4071
3812my $bug_warning = 0; 4072my $bug_warning = 0;
3813 4073
3814our @WAIT_FOR_TICK; 4074our @WAIT_FOR_TICK;
3815our @WAIT_FOR_TICK_BEGIN; 4075our @WAIT_FOR_TICK_BEGIN;
3816 4076
3817sub wait_for_tick { 4077sub wait_for_tick() {
3818 return if tick_inhibit || $Coro::current == $Coro::main; 4078 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3819 4079
3820 my $signal = new Coro::Signal; 4080 my $signal = new Coro::Signal;
3821 push @WAIT_FOR_TICK, $signal; 4081 push @WAIT_FOR_TICK, $signal;
3822 $signal->wait; 4082 $signal->wait;
3823} 4083}
3824 4084
3825sub wait_for_tick_begin { 4085sub wait_for_tick_begin() {
3826 return if tick_inhibit || $Coro::current == $Coro::main; 4086 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3827 4087
3828 my $signal = new Coro::Signal; 4088 my $signal = new Coro::Signal;
3829 push @WAIT_FOR_TICK_BEGIN, $signal; 4089 push @WAIT_FOR_TICK_BEGIN, $signal;
3830 $signal->wait; 4090 $signal->wait;
3831} 4091}
3837 return; 4097 return;
3838 } 4098 }
3839 4099
3840 cf::server_tick; # one server iteration 4100 cf::server_tick; # one server iteration
3841 4101
4102 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4103
3842 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4104 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3843 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4105 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3844 Coro::async_pool { 4106 Coro::async_pool {
3845 $Coro::current->{desc} = "runtime saver"; 4107 $Coro::current->{desc} = "runtime saver";
3846 write_runtime_sync 4108 write_runtime_sync
3847 or warn "ERROR: unable to write runtime file: $!"; 4109 or error "ERROR: unable to write runtime file: $!";
3848 }; 4110 };
3849 } 4111 }
3850 4112
3851 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4113 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3852 $sig->send; 4114 $sig->send;
3860 4122
3861 if (0) { 4123 if (0) {
3862 if ($NEXT_TICK) { 4124 if ($NEXT_TICK) {
3863 my $jitter = $TICK_START - $NEXT_TICK; 4125 my $jitter = $TICK_START - $NEXT_TICK;
3864 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4126 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3865 warn "jitter $JITTER\n";#d# 4127 debug "jitter $JITTER\n";#d#
3866 } 4128 }
3867 } 4129 }
3868} 4130}
3869 4131
3870{ 4132{
3871 # configure BDB 4133 # configure BDB
3872 4134
3873 BDB::min_parallel 8; 4135 BDB::min_parallel 16;
3874 BDB::max_poll_reqs $TICK * 0.1; 4136 BDB::max_poll_reqs $TICK * 0.1;
3875 $AnyEvent::BDB::WATCHER->priority (1); 4137 $AnyEvent::BDB::WATCHER->priority (1);
3876 4138
3877 unless ($DB_ENV) { 4139 unless ($DB_ENV) {
3878 $DB_ENV = BDB::db_env_create; 4140 $DB_ENV = BDB::db_env_create;
3915 IO::AIO::min_parallel 8; 4177 IO::AIO::min_parallel 8;
3916 IO::AIO::max_poll_time $TICK * 0.1; 4178 IO::AIO::max_poll_time $TICK * 0.1;
3917 undef $AnyEvent::AIO::WATCHER; 4179 undef $AnyEvent::AIO::WATCHER;
3918} 4180}
3919 4181
3920my $_log_backtrace; 4182our $_log_backtrace;
4183our $_log_backtrace_last;
3921 4184
3922sub _log_backtrace { 4185sub _log_backtrace {
3923 my ($msg, @addr) = @_; 4186 my ($msg, @addr) = @_;
3924 4187
3925 $msg =~ s/\n//; 4188 $msg =~ s/\n$//;
3926 4189
4190 if ($_log_backtrace_last eq $msg) {
4191 LOG llevInfo, "[ABT] $msg\n";
4192 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3927 # limit the # of concurrent backtraces 4193 # limit the # of concurrent backtraces
3928 if ($_log_backtrace < 2) { 4194 } elsif ($_log_backtrace < 2) {
4195 $_log_backtrace_last = $msg;
3929 ++$_log_backtrace; 4196 ++$_log_backtrace;
3930 my $perl_bt = Carp::longmess $msg; 4197 my $perl_bt = Carp::longmess $msg;
3931 async { 4198 async {
3932 $Coro::current->{desc} = "abt $msg"; 4199 $Coro::current->{desc} = "abt $msg";
3933 4200
3953 LOG llevInfo, "[ABT] $_\n" for @bt; 4220 LOG llevInfo, "[ABT] $_\n" for @bt;
3954 --$_log_backtrace; 4221 --$_log_backtrace;
3955 }; 4222 };
3956 } else { 4223 } else {
3957 LOG llevInfo, "[ABT] $msg\n"; 4224 LOG llevInfo, "[ABT] $msg\n";
3958 LOG llevInfo, "[ABT] [suppressed]\n"; 4225 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3959 } 4226 }
3960} 4227}
3961 4228
3962# load additional modules 4229# load additional modules
3963require "cf/$_.pm" for @EXTRA_MODULES; 4230require "cf/$_.pm" for @EXTRA_MODULES;
4231cf::_connect_to_perl_2;
3964 4232
3965END { cf::emergency_save } 4233END { cf::emergency_save }
3966 4234
39671 42351
3968 4236

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines