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.473 by root, Fri Jun 26 16:32:10 2009 UTC vs.
Revision 1.556 by root, Sat Jul 3 01:49:18 2010 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
72 71
73# make sure c-lzf reinitialises itself 72# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
76 75
76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
78
77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
78 82
79our %COMMAND = (); 83our %COMMAND = ();
80our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
81 85
82our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
85our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
86our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
87 91
88our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
89our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
90 96
91our $CONFDIR = confdir; 97our $CONFDIR = confdir;
92our $DATADIR = datadir; 98our $DATADIR = datadir;
93our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
94our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
100our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
101our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
104 110
105our %RESOURCE; 111our %RESOURCE; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
106 118
107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109our $NEXT_TICK; 121our $NEXT_TICK;
110our $USE_FSYNC = 1; # use fsync to write maps - default on 122our $USE_FSYNC = 1; # use fsync to write maps - default on
112our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
114our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
115our $DB_ENV; 127our $DB_ENV;
116 128
117our @EXTRA_MODULES = qw(pod mapscript); 129our @EXTRA_MODULES = qw(pod match mapscript incloader);
118 130
119our %CFG; 131our %CFG;
120 132
121our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
122our $RUNTIME; 134our $RUNTIME;
134our $JITTER; # average jitter 146our $JITTER; # average jitter
135our $TICK_START; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
136 148
137our @POST_INIT; 149our @POST_INIT;
138 150
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
140 153
141binmode STDOUT; 154binmode STDOUT;
142binmode STDERR; 155binmode STDERR;
143 156
144# read virtual server time, if available 157# read virtual server time, if available
155 168
156our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
157 170
158sub cf::map::normalise; 171sub cf::map::normalise;
159 172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
187
160############################################################################# 188#############################################################################
161 189
162=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
163 191
164=over 4 192=over 4
205from wherever your confdir points to. 233from wherever your confdir points to.
206 234
207=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
208 236
209These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
210returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one thread
211per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
212 240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
213=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
214 247
215This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
216C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 249C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
217that call. 250that call.
218 251
252=item %cf::REFLECT
253
254Contains, for each (C++) class name, a hash reference with information
255about object members (methods, scalars, arrays and flags) and other
256metadata, which is useful for introspection.
257
219=back 258=back
220 259
221=cut 260=cut
222 261
223BEGIN { 262sub error(@) { LOG llevError, join "", @_ }
224 *CORE::GLOBAL::warn = sub { 263sub warn (@) { LOG llevWarn , join "", @_ }
264sub info (@) { LOG llevInfo , join "", @_ }
265sub debug(@) { LOG llevDebug, join "", @_ }
266sub trace(@) { LOG llevTrace, join "", @_ }
267
268$Coro::State::WARNHOOK = sub {
225 my $msg = join "", @_; 269 my $msg = join "", @_;
226 270
227 $msg .= "\n" 271 $msg .= "\n"
228 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
229 273
230 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 274 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
231 275
232 LOG llevError, $msg; 276 LOG llevWarn, $msg;
233 }; 277};
234}
235 278
236$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
237 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
238 281
239 if ($Coro::current == $Coro::main) {#d# 282 error Carp::longmess $_[0];
283
284 if (in_main) {#d#
240 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
241 return;#d# 286 return;#d#
242 }#d# 287 }#d#
243 288
244 # kill coroutine otherwise 289 # kill coroutine otherwise
245 warn Carp::longmess $_[0];
246 Coro::terminate 290 Coro::terminate
247}; 291};
248
249$SIG{__DIE__} = sub { }; #d#?
250 292
251@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 293@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
252@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 294@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
253@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 295@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
254@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 296@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
268)) { 310)) {
269 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
270} 312}
271 313
272$EV::DIED = sub { 314$EV::DIED = sub {
273 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
274}; 316};
275 317
276############################################################################# 318#############################################################################
277 319
278=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
315our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 357our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
316 358
317sub encode_json($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
318sub decode_json($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
319 361
362=item $ref = cf::yaml_load $scalar
363
364Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
365
366=cut
367
368sub fork_call(&@);
369
370sub yaml_load($) {
371 fork_call { YAML::XS::Load $_[0] } @_
372}
373
320=item cf::post_init { BLOCK } 374=item cf::post_init { BLOCK }
321 375
322Execute the given codeblock, I<after> all extensions have been (re-)loaded, 376Execute the given codeblock, I<after> all extensions have been (re-)loaded,
323but I<before> the server starts ticking again. 377but I<before> the server starts ticking again.
324 378
325The cdoeblock will have a single boolean argument to indicate whether this 379The codeblock will have a single boolean argument to indicate whether this
326is a reload or not. 380is a reload or not.
327 381
328=cut 382=cut
329 383
330sub post_init(&) { 384sub post_init(&) {
331 push @POST_INIT, shift; 385 push @POST_INIT, shift;
386}
387
388sub _post_init {
389 trace "running post_init jobs";
390
391 # run them in parallel...
392
393 my @join;
394
395 while () {
396 push @join, map &Coro::async ($_, 0), @POST_INIT;
397 @POST_INIT = ();
398
399 @join or last;
400
401 (pop @join)->join;
402 }
332} 403}
333 404
334=item cf::lock_wait $string 405=item cf::lock_wait $string
335 406
336Wait until the given lock is available. See cf::lock_acquire. 407Wait until the given lock is available. See cf::lock_acquire.
375} 446}
376 447
377=item cf::periodic $interval, $cb 448=item cf::periodic $interval, $cb
378 449
379Like EV::periodic, but randomly selects a starting point so that the actions 450Like EV::periodic, but randomly selects a starting point so that the actions
380get spread over timer. 451get spread over time.
381 452
382=cut 453=cut
383 454
384sub periodic($$) { 455sub periodic($$) {
385 my ($interval, $cb) = @_; 456 my ($interval, $cb) = @_;
402 473
403=cut 474=cut
404 475
405our @SLOT_QUEUE; 476our @SLOT_QUEUE;
406our $SLOT_QUEUE; 477our $SLOT_QUEUE;
478our $SLOT_DECAY = 0.9;
407 479
408$SLOT_QUEUE->cancel if $SLOT_QUEUE; 480$SLOT_QUEUE->cancel if $SLOT_QUEUE;
409$SLOT_QUEUE = Coro::async { 481$SLOT_QUEUE = Coro::async {
410 $Coro::current->desc ("timeslot manager"); 482 $Coro::current->desc ("timeslot manager");
411 483
412 my $signal = new Coro::Signal; 484 my $signal = new Coro::Signal;
485 my $busy;
413 486
414 while () { 487 while () {
415 next_job: 488 next_job:
489
416 my $avail = cf::till_tick; 490 my $avail = cf::till_tick;
417 if ($avail > 0.01) { 491
418 for (0 .. $#SLOT_QUEUE) { 492 for (0 .. $#SLOT_QUEUE) {
419 if ($SLOT_QUEUE[$_][0] < $avail) { 493 if ($SLOT_QUEUE[$_][0] <= $avail) {
494 $busy = 0;
420 my $job = splice @SLOT_QUEUE, $_, 1, (); 495 my $job = splice @SLOT_QUEUE, $_, 1, ();
421 $job->[2]->send; 496 $job->[2]->send;
422 Coro::cede; 497 Coro::cede;
423 goto next_job; 498 goto next_job;
424 } 499 } else {
500 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
425 } 501 }
426 } 502 }
427 503
428 if (@SLOT_QUEUE) { 504 if (@SLOT_QUEUE) {
429 # we do not use wait_for_tick() as it returns immediately when tick is inactive 505 # we do not use wait_for_tick() as it returns immediately when tick is inactive
430 push @cf::WAIT_FOR_TICK, $signal; 506 push @cf::WAIT_FOR_TICK, $signal;
431 $signal->wait; 507 $signal->wait;
432 } else { 508 } else {
509 $busy = 0;
433 Coro::schedule; 510 Coro::schedule;
434 } 511 }
435 } 512 }
436}; 513};
437 514
438sub get_slot($;$$) { 515sub get_slot($;$$) {
439 return if tick_inhibit || $Coro::current == $Coro::main; 516 return if tick_inhibit || $Coro::current == $Coro::main;
440 517
441 my ($time, $pri, $name) = @_; 518 my ($time, $pri, $name) = @_;
442 519
443 $time = $TICK * .6 if $time > $TICK * .6; 520 $time = clamp $time, 0.01, $TICK * .6;
521
444 my $sig = new Coro::Signal; 522 my $sig = new Coro::Signal;
445 523
446 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 524 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
447 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 525 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
448 $SLOT_QUEUE->ready; 526 $SLOT_QUEUE->ready;
474=cut 552=cut
475 553
476sub sync_job(&) { 554sub sync_job(&) {
477 my ($job) = @_; 555 my ($job) = @_;
478 556
479 if ($Coro::current == $Coro::main) { 557 if (in_main) {
480 my $time = EV::time; 558 my $time = AE::time;
481 559
482 # this is the main coro, too bad, we have to block 560 # this is the main coro, too bad, we have to block
483 # till the operation succeeds, freezing the server :/ 561 # till the operation succeeds, freezing the server :/
484 562
485 LOG llevError, Carp::longmess "sync job";#d# 563 #LOG llevError, Carp::longmess "sync job";#d#
486 564
487 my $freeze_guard = freeze_mainloop; 565 my $freeze_guard = freeze_mainloop;
488 566
489 my $busy = 1; 567 my $busy = 1;
490 my @res; 568 my @res;
491 569
492 (async { 570 (async {
493 $Coro::current->desc ("sync job coro"); 571 $Coro::current->desc ("sync job coro");
494 @res = eval { $job->() }; 572 @res = eval { $job->() };
495 warn $@ if $@; 573 error $@ if $@;
496 undef $busy; 574 undef $busy;
497 })->prio (Coro::PRIO_MAX); 575 })->prio (Coro::PRIO_MAX);
498 576
499 while ($busy) { 577 while ($busy) {
500 if (Coro::nready) { 578 if (Coro::nready) {
502 } else { 580 } else {
503 EV::loop EV::LOOP_ONESHOT; 581 EV::loop EV::LOOP_ONESHOT;
504 } 582 }
505 } 583 }
506 584
507 my $time = EV::time - $time; 585 my $time = AE::time - $time;
508 586
509 $TICK_START += $time; # do not account sync jobs to server load 587 $TICK_START += $time; # do not account sync jobs to server load
510 588
511 wantarray ? @res : $res[0] 589 wantarray ? @res : $res[0]
512 } else { 590 } else {
534 $EXT_CORO{$coro+0} = $coro; 612 $EXT_CORO{$coro+0} = $coro;
535 613
536 $coro 614 $coro
537} 615}
538 616
539=item fork_call { }, $args 617=item fork_call { }, @args
540 618
541Executes the given code block with the given arguments in a seperate 619Executes the given code block with the given arguments in a seperate
542process, returning the results. Everything must be serialisable with 620process, returning the results. Everything must be serialisable with
543Coro::Storable. May, of course, block. Note that the executed sub may 621Coro::Storable. May, of course, block. Note that the executed sub may
544never block itself or use any form of event handling. 622never block itself or use any form of event handling.
545 623
546=cut 624=cut
547 625
626sub post_fork {
627 reset_signals;
628}
629
548sub fork_call(&@) { 630sub fork_call(&@) {
549 my ($cb, @args) = @_; 631 my ($cb, @args) = @_;
550 632
551 # we seemingly have to make a local copy of the whole thing, 633 # we seemingly have to make a local copy of the whole thing,
552 # otherwise perl prematurely frees the stuff :/ 634 # otherwise perl prematurely frees the stuff :/
553 # TODO: investigate and fix (likely this will be rather laborious) 635 # TODO: investigate and fix (likely this will be rather laborious)
554 636
555 my @res = Coro::Util::fork_eval { 637 my @res = Coro::Util::fork_eval {
556 reset_signals; 638 cf::post_fork;
557 &$cb 639 &$cb
558 }, @args; 640 } @args;
559 641
560 wantarray ? @res : $res[-1] 642 wantarray ? @res : $res[-1]
643}
644
645sub objinfo {
646 (
647 "counter value" => cf::object::object_count,
648 "objects created" => cf::object::create_count,
649 "objects destroyed" => cf::object::destroy_count,
650 "freelist size" => cf::object::free_count,
651 "allocated objects" => cf::object::objects_size,
652 "active objects" => cf::object::actives_size,
653 )
561} 654}
562 655
563=item $coin = coin_from_name $name 656=item $coin = coin_from_name $name
564 657
565=cut 658=cut
602within each server. 695within each server.
603 696
604=cut 697=cut
605 698
606sub db_table($) { 699sub db_table($) {
700 cf::error "db_get called from main context"
701 if $Coro::current == $Coro::main;
702
607 my ($name) = @_; 703 my ($name) = @_;
608 my $db = BDB::db_create $DB_ENV; 704 my $db = BDB::db_create $DB_ENV;
609 705
610 eval { 706 eval {
611 $db->set_flags (BDB::CHKSUM); 707 $db->set_flags (BDB::CHKSUM);
621} 717}
622 718
623our $DB; 719our $DB;
624 720
625sub db_init { 721sub db_init {
626 cf::sync_job {
627 $DB ||= db_table "db"; 722 $DB ||= db_table "db";
628 };
629} 723}
630 724
631sub db_get($$) { 725sub db_get($$) {
632 my $key = "$_[0]/$_[1]"; 726 my $key = "$_[0]/$_[1]";
633 727
634 cf::sync_job { 728 cf::error "db_get called from main context"
729 if $Coro::current == $Coro::main;
730
635 BDB::db_get $DB, undef, $key, my $data; 731 BDB::db_get $DB, undef, $key, my $data;
636 732
637 $! ? () 733 $! ? ()
638 : $data 734 : $data
639 }
640} 735}
641 736
642sub db_put($$$) { 737sub db_put($$$) {
643 BDB::dbreq_pri 4; 738 BDB::dbreq_pri 4;
644 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 739 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
700 795
701 my $t1 = Time::HiRes::time; 796 my $t1 = Time::HiRes::time;
702 my $data = $process->(\@data); 797 my $data = $process->(\@data);
703 my $t2 = Time::HiRes::time; 798 my $t2 = Time::HiRes::time;
704 799
705 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 800 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
706 801
707 db_put cache => "$id/data", $data; 802 db_put cache => "$id/data", $data;
708 db_put cache => "$id/md5" , $md5; 803 db_put cache => "$id/md5" , $md5;
709 db_put cache => "$id/meta", $meta; 804 db_put cache => "$id/meta", $meta;
710 805
720 815
721=cut 816=cut
722 817
723sub datalog($@) { 818sub datalog($@) {
724 my ($type, %kv) = @_; 819 my ($type, %kv) = @_;
725 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 820 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
726} 821}
727 822
728=back 823=back
729 824
730=cut 825=cut
925 1020
926 } elsif (exists $cb_id{$type}) { 1021 } elsif (exists $cb_id{$type}) {
927 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1022 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
928 1023
929 } elsif (ref $type) { 1024 } elsif (ref $type) {
930 warn "attaching objects not supported, ignoring.\n"; 1025 error "attaching objects not supported, ignoring.\n";
931 1026
932 } else { 1027 } else {
933 shift @arg; 1028 shift @arg;
934 warn "attach argument '$type' not supported, ignoring.\n"; 1029 error "attach argument '$type' not supported, ignoring.\n";
935 } 1030 }
936 } 1031 }
937} 1032}
938 1033
939sub _object_attach { 1034sub _object_attach {
949 _attach $registry, $klass, @attach; 1044 _attach $registry, $klass, @attach;
950 } 1045 }
951 1046
952 $obj->{$name} = \%arg; 1047 $obj->{$name} = \%arg;
953 } else { 1048 } else {
954 warn "object uses attachment '$name' which is not available, postponing.\n"; 1049 info "object uses attachment '$name' which is not available, postponing.\n";
955 } 1050 }
956 1051
957 $obj->{_attachment}{$name} = undef; 1052 $obj->{_attachment}{$name} = undef;
958} 1053}
959 1054
1018 1113
1019 for (@$callbacks) { 1114 for (@$callbacks) {
1020 eval { &{$_->[1]} }; 1115 eval { &{$_->[1]} };
1021 1116
1022 if ($@) { 1117 if ($@) {
1023 warn "$@";
1024 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1118 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1025 override; 1119 override;
1026 } 1120 }
1027 1121
1028 return 1 if $override; 1122 return 1 if $override;
1029 } 1123 }
1108 for (@$attach) { 1202 for (@$attach) {
1109 my ($klass, @attach) = @$_; 1203 my ($klass, @attach) = @$_;
1110 _attach $registry, $klass, @attach; 1204 _attach $registry, $klass, @attach;
1111 } 1205 }
1112 } else { 1206 } else {
1113 warn "object uses attachment '$name' that is not available, postponing.\n"; 1207 info "object uses attachment '$name' that is not available, postponing.\n";
1114 } 1208 }
1115 } 1209 }
1116} 1210}
1117 1211
1118cf::attachable->attach ( 1212cf::attachable->attach (
1145 my ($filename, $rdata, $objs) = @_; 1239 my ($filename, $rdata, $objs) = @_;
1146 1240
1147 sync_job { 1241 sync_job {
1148 if (length $$rdata) { 1242 if (length $$rdata) {
1149 utf8::decode (my $decname = $filename); 1243 utf8::decode (my $decname = $filename);
1150 warn sprintf "saving %s (%d,%d)\n", 1244 trace sprintf "saving %s (%d,%d)\n",
1151 $decname, length $$rdata, scalar @$objs; 1245 $decname, length $$rdata, scalar @$objs
1246 if $VERBOSE_IO;
1152 1247
1153 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1248 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1154 aio_chmod $fh, SAVE_MODE; 1249 aio_chmod $fh, SAVE_MODE;
1155 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1250 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1156 if ($cf::USE_FSYNC) { 1251 if ($cf::USE_FSYNC) {
1178 aio_rename "$filename~", $filename; 1273 aio_rename "$filename~", $filename;
1179 1274
1180 $filename =~ s%/[^/]+$%%; 1275 $filename =~ s%/[^/]+$%%;
1181 aio_pathsync $filename if $cf::USE_FSYNC; 1276 aio_pathsync $filename if $cf::USE_FSYNC;
1182 } else { 1277 } else {
1183 warn "unable to save objects: $filename~: $!\n"; 1278 error "unable to save objects: $filename~: $!\n";
1184 } 1279 }
1185 } else { 1280 } else {
1186 aio_unlink $filename; 1281 aio_unlink $filename;
1187 aio_unlink "$filename.pst"; 1282 aio_unlink "$filename.pst";
1188 } 1283 }
1212 my $st = eval { Coro::Storable::thaw $av }; 1307 my $st = eval { Coro::Storable::thaw $av };
1213 $av = $st->{objs}; 1308 $av = $st->{objs};
1214 } 1309 }
1215 1310
1216 utf8::decode (my $decname = $filename); 1311 utf8::decode (my $decname = $filename);
1217 warn sprintf "loading %s (%d,%d)\n", 1312 trace sprintf "loading %s (%d,%d)\n",
1218 $decname, length $data, scalar @{$av || []}; 1313 $decname, length $data, scalar @{$av || []}
1314 if $VERBOSE_IO;
1219 1315
1220 ($data, $av) 1316 ($data, $av)
1221} 1317}
1222 1318
1223=head2 COMMAND CALLBACKS 1319=head2 COMMAND CALLBACKS
1282} 1378}
1283 1379
1284use File::Glob (); 1380use File::Glob ();
1285 1381
1286cf::player->attach ( 1382cf::player->attach (
1287 on_command => sub { 1383 on_unknown_command => sub {
1288 my ($pl, $name, $params) = @_; 1384 my ($pl, $name, $params) = @_;
1289 1385
1290 my $cb = $COMMAND{$name} 1386 my $cb = $COMMAND{$name}
1291 or return; 1387 or return;
1292 1388
1315 1411
1316 $pl->ext_reply ($reply, @reply) 1412 $pl->ext_reply ($reply, @reply)
1317 if $reply; 1413 if $reply;
1318 1414
1319 } else { 1415 } else {
1320 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1416 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1321 } 1417 }
1322 1418
1323 cf::override; 1419 cf::override;
1324 }, 1420 },
1325); 1421);
1336 1432
1337 $grp 1433 $grp
1338} 1434}
1339 1435
1340sub load_extensions { 1436sub load_extensions {
1437 info "loading extensions...";
1438
1341 cf::sync_job { 1439 cf::sync_job {
1342 my %todo; 1440 my %todo;
1343 1441
1344 for my $path (<$LIBDIR/*.ext>) { 1442 for my $path (<$LIBDIR/*.ext>) {
1345 next unless -r $path; 1443 next unless -r $path;
1363 1461
1364 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1462 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1365 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1463 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1366 1464
1367 $ext{source} = 1465 $ext{source} =
1368 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1466 "package $pkg; use common::sense;\n"
1369 . "#line 1 \"$path\"\n{\n" 1467 . "#line 1 \"$path\"\n{\n"
1370 . $source 1468 . $source
1371 . "\n};\n1"; 1469 . "\n};\n1";
1372 1470
1373 $todo{$base} = \%ext; 1471 $todo{$base} = \%ext;
1374 } 1472 }
1375 1473
1474 my $pass = 0;
1376 my %done; 1475 my %done;
1377 while (%todo) { 1476 while (%todo) {
1378 my $progress; 1477 my $progress;
1379 1478
1479 ++$pass;
1480
1481 ext:
1380 while (my ($k, $v) = each %todo) { 1482 while (my ($k, $v) = each %todo) {
1381 for (split /,\s*/, $v->{meta}{depends}) { 1483 for (split /,\s*/, $v->{meta}{depends}) {
1382 goto skip 1484 next ext
1383 unless exists $done{$_}; 1485 unless exists $done{$_};
1384 } 1486 }
1385 1487
1386 warn "... loading '$k' into '$v->{pkg}'\n"; 1488 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1387 1489
1388 unless (eval $v->{source}) { 1490 my $active = eval $v->{source};
1491
1492 if (length $@) {
1389 my $msg = $@ ? "$v->{path}: $@\n" 1493 error "$v->{path}: $@\n";
1390 : "$v->{base}: extension inactive.\n";
1391 1494
1392 if (exists $v->{meta}{mandatory}) {
1393 warn $msg;
1394 cf::cleanup "mandatory extension failed to load, exiting."; 1495 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1395 } 1496 if exists $v->{meta}{mandatory};
1396 1497
1397 warn $msg; 1498 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1499 delete $todo{$k};
1500 } else {
1501 $done{$k} = delete $todo{$k};
1502 push @EXTS, $v->{pkg};
1503 $progress = 1;
1504
1505 info "$v->{base}: extension inactive.\n"
1506 unless $active;
1398 } 1507 }
1399
1400 $done{$k} = delete $todo{$k};
1401 push @EXTS, $v->{pkg};
1402 $progress = 1;
1403 } 1508 }
1404 1509
1405 skip: 1510 unless ($progress) {
1406 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1511 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1407 unless $progress; 1512
1513 while (my ($k, $v) = each %todo) {
1514 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1515 if exists $v->{meta}{mandatory};
1516 }
1517 }
1408 } 1518 }
1409 }; 1519 };
1410} 1520}
1411 1521
1412############################################################################# 1522#############################################################################
1496 $cf::PLAYER{$login} = $pl 1606 $cf::PLAYER{$login} = $pl
1497 } 1607 }
1498 } 1608 }
1499} 1609}
1500 1610
1611cf::player->attach (
1612 on_load => sub {
1613 my ($pl, $path) = @_;
1614
1615 # restore slots saved in save, below
1616 my $slots = delete $pl->{_slots};
1617
1618 $pl->ob->current_weapon ($slots->[0]);
1619 $pl->combat_ob ($slots->[1]);
1620 $pl->ranged_ob ($slots->[2]);
1621 },
1622);
1623
1501sub save($) { 1624sub save($) {
1502 my ($pl) = @_; 1625 my ($pl) = @_;
1503 1626
1504 return if $pl->{deny_save}; 1627 return if $pl->{deny_save};
1505 1628
1510 1633
1511 aio_mkdir playerdir $pl, 0770; 1634 aio_mkdir playerdir $pl, 0770;
1512 $pl->{last_save} = $cf::RUNTIME; 1635 $pl->{last_save} = $cf::RUNTIME;
1513 1636
1514 cf::get_slot 0.01; 1637 cf::get_slot 0.01;
1638
1639 # save slots, to be restored later
1640 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1515 1641
1516 $pl->save_pl ($path); 1642 $pl->save_pl ($path);
1517 cf::cede_to_tick; 1643 cf::cede_to_tick;
1518} 1644}
1519 1645
1553 my $name = $pl->ob->name; 1679 my $name = $pl->ob->name;
1554 1680
1555 $pl->{deny_save} = 1; 1681 $pl->{deny_save} = 1;
1556 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1682 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1557 1683
1558 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1684 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1559 $pl->deactivate; 1685 $pl->deactivate;
1686
1560 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1687 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1561 $pl->ob->check_score;
1562 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1688 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1689 ext::highscore::check ($pl->ob);
1690
1563 $pl->ns->destroy if $pl->ns; 1691 $pl->ns->destroy if $pl->ns;
1564 1692
1565 my $path = playerdir $pl; 1693 my $path = playerdir $pl;
1566 my $temp = "$path~$cf::RUNTIME~deleting~"; 1694 my $temp = "$path~$cf::RUNTIME~deleting~";
1567 aio_rename $path, $temp; 1695 aio_rename $path, $temp;
1621 \@logins 1749 \@logins
1622} 1750}
1623 1751
1624=item $player->maps 1752=item $player->maps
1625 1753
1754=item cf::player::maps $login
1755
1626Returns an arrayref of map paths that are private for this 1756Returns an arrayref of map paths that are private for this
1627player. May block. 1757player. May block.
1628 1758
1629=cut 1759=cut
1630 1760
1692=cut 1822=cut
1693 1823
1694sub find_by_path($) { 1824sub find_by_path($) {
1695 my ($path) = @_; 1825 my ($path) = @_;
1696 1826
1827 $path =~ s/^~[^\/]*//; # skip ~login
1828
1697 my ($match, $specificity); 1829 my ($match, $specificity);
1698 1830
1699 for my $region (list) { 1831 for my $region (list) {
1700 if ($region->{match} && $path =~ $region->{match}) { 1832 if ($region->{match} && $path =~ $region->{match}) {
1701 ($match, $specificity) = ($region, $region->specificity) 1833 ($match, $specificity) = ($region, $region->specificity)
1729sub generate_random_map { 1861sub generate_random_map {
1730 my ($self, $rmp) = @_; 1862 my ($self, $rmp) = @_;
1731 1863
1732 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1864 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1733 1865
1734 # mit "rum" bekleckern, nicht
1735 $self->_create_random_map ( 1866 $self->_create_random_map ($rmp);
1736 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1737 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1738 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1739 $rmp->{exit_on_final_map},
1740 $rmp->{xsize}, $rmp->{ysize},
1741 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1742 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1743 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1744 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1745 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1746 (cf::region::find $rmp->{region}), $rmp->{custom}
1747 )
1748} 1867}
1749 1868
1750=item cf::map->register ($regex, $prio) 1869=item cf::map->register ($regex, $prio)
1751 1870
1752Register a handler for the map path matching the given regex at the 1871Register a handler for the map path matching the given regex at the
1757 1876
1758sub register { 1877sub register {
1759 my (undef, $regex, $prio) = @_; 1878 my (undef, $regex, $prio) = @_;
1760 my $pkg = caller; 1879 my $pkg = caller;
1761 1880
1762 no strict;
1763 push @{"$pkg\::ISA"}, __PACKAGE__; 1881 push @{"$pkg\::ISA"}, __PACKAGE__;
1764 1882
1765 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1883 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1766} 1884}
1767 1885
1768# also paths starting with '/' 1886# also paths starting with '/'
1769$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1887$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1770 1888
1771sub thawer_merge { 1889sub thawer_merge {
1772 my ($self, $merge) = @_; 1890 my ($self, $merge) = @_;
1773 1891
1774 # we have to keep some variables in memory intact 1892 # we have to keep some variables in memory intact
1779} 1897}
1780 1898
1781sub normalise { 1899sub normalise {
1782 my ($path, $base) = @_; 1900 my ($path, $base) = @_;
1783 1901
1784 $path = "$path"; # make sure its a string 1902 $path = "$path"; # make sure it's a string
1785 1903
1786 $path =~ s/\.map$//; 1904 $path =~ s/\.map$//;
1787 1905
1788 # map plan: 1906 # map plan:
1789 # 1907 #
1804 $base =~ s{[^/]+/?$}{}; 1922 $base =~ s{[^/]+/?$}{};
1805 $path = "$base/$path"; 1923 $path = "$base/$path";
1806 } 1924 }
1807 1925
1808 for ($path) { 1926 for ($path) {
1809 redo if s{//}{/};
1810 redo if s{/\.?/}{/}; 1927 redo if s{/\.?/}{/};
1811 redo if s{/[^/]+/\.\./}{/}; 1928 redo if s{/[^/]+/\.\./}{/};
1812 } 1929 }
1813 1930
1814 $path 1931 $path
1828 $self->init; # pass $1 etc. 1945 $self->init; # pass $1 etc.
1829 return $self; 1946 return $self;
1830 } 1947 }
1831 } 1948 }
1832 1949
1833 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1950 Carp::cluck "unable to resolve path '$path' (base '$base')";
1834 () 1951 ()
1835} 1952}
1836 1953
1837sub init { 1954sub init {
1838 my ($self) = @_; 1955 my ($self) = @_;
1960} 2077}
1961 2078
1962sub find; 2079sub find;
1963sub find { 2080sub find {
1964 my ($path, $origin) = @_; 2081 my ($path, $origin) = @_;
2082
2083 cf::cede_to_tick;
1965 2084
1966 $path = normalise $path, $origin && $origin->path; 2085 $path = normalise $path, $origin && $origin->path;
1967 2086
1968 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2087 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1969 my $guard2 = cf::lock_acquire "map_find:$path"; 2088 my $guard2 = cf::lock_acquire "map_find:$path";
1988 2107
1989 $cf::MAP{$path} = $map 2108 $cf::MAP{$path} = $map
1990 } 2109 }
1991} 2110}
1992 2111
1993sub pre_load { } 2112sub pre_load { }
1994sub post_load { } 2113#sub post_load { } # XS
1995 2114
1996sub load { 2115sub load {
1997 my ($self) = @_; 2116 my ($self) = @_;
1998 2117
1999 local $self->{deny_reset} = 1; # loading can take a long time 2118 local $self->{deny_reset} = 1; # loading can take a long time
2054 2173
2055 $self->in_memory (cf::MAP_ACTIVE); 2174 $self->in_memory (cf::MAP_ACTIVE);
2056 } 2175 }
2057 2176
2058 $self->post_load; 2177 $self->post_load;
2059}
2060 2178
2179 1
2180}
2181
2182# customize the map for a given player, i.e.
2183# return the _real_ map. used by e.g. per-player
2184# maps to change the path to ~playername/mappath
2061sub customise_for { 2185sub customise_for {
2062 my ($self, $ob) = @_; 2186 my ($self, $ob) = @_;
2063 2187
2064 return find "~" . $ob->name . "/" . $self->{path} 2188 return find "~" . $ob->name . "/" . $self->{path}
2065 if $self->per_player; 2189 if $self->per_player;
2081 or next; 2205 or next;
2082 $neigh = find $neigh, $map 2206 $neigh = find $neigh, $map
2083 or next; 2207 or next;
2084 $neigh->load; 2208 $neigh->load;
2085 2209
2210 # now find the diagonal neighbours
2086 push @neigh, 2211 push @neigh,
2087 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2212 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2088 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2213 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2089 } 2214 }
2090 2215
2097} 2222}
2098 2223
2099sub find_sync { 2224sub find_sync {
2100 my ($path, $origin) = @_; 2225 my ($path, $origin) = @_;
2101 2226
2102 cf::sync_job { find $path, $origin } 2227 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2228 if $Coro::current == $Coro::main;
2229
2230 find $path, $origin
2103} 2231}
2104 2232
2105sub do_load_sync { 2233sub do_load_sync {
2106 my ($map) = @_; 2234 my ($map) = @_;
2107 2235
2108 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2236 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2109 if $Coro::current == $Coro::main; 2237 if $Coro::current == $Coro::main;
2110 2238
2111 cf::sync_job { $map->load }; 2239 $map->load;
2112} 2240}
2113 2241
2114our %MAP_PREFETCH; 2242our %MAP_PREFETCH;
2115our $MAP_PREFETCHER = undef; 2243our $MAP_PREFETCHER = undef;
2116 2244
2142 $MAP_PREFETCHER->prio (6); 2270 $MAP_PREFETCHER->prio (6);
2143 2271
2144 () 2272 ()
2145} 2273}
2146 2274
2275# common code, used by both ->save and ->swapout
2147sub save { 2276sub _save {
2148 my ($self) = @_; 2277 my ($self) = @_;
2149
2150 my $lock = cf::lock_acquire "map_data:$self->{path}";
2151 2278
2152 $self->{last_save} = $cf::RUNTIME; 2279 $self->{last_save} = $cf::RUNTIME;
2153 2280
2154 return unless $self->dirty; 2281 return unless $self->dirty;
2155 2282
2175 } else { 2302 } else {
2176 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2303 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2177 } 2304 }
2178} 2305}
2179 2306
2307sub save {
2308 my ($self) = @_;
2309
2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311
2312 $self->_save;
2313}
2314
2180sub swap_out { 2315sub swap_out {
2181 my ($self) = @_; 2316 my ($self) = @_;
2182 2317
2183 # save first because save cedes
2184 $self->save;
2185
2186 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2318 my $lock = cf::lock_acquire "map_data:$self->{path}";
2187 2319
2188 return if $self->players;
2189 return if $self->in_memory != cf::MAP_ACTIVE; 2320 return if $self->in_memory != cf::MAP_ACTIVE;
2190 return if $self->{deny_save}; 2321 return if $self->{deny_save};
2322 return if $self->players;
2191 2323
2324 # first deactivate the map and "unlink" it from the core
2325 $self->deactivate;
2326 $_->clear_links_to ($self) for values %cf::MAP;
2192 $self->in_memory (cf::MAP_SWAPPED); 2327 $self->in_memory (cf::MAP_SWAPPED);
2328
2329 # then atomically save
2330 $self->_save;
2331
2332 # then free the map
2333 $self->clear;
2334}
2335
2336sub reset_at {
2337 my ($self) = @_;
2338
2339 # TODO: safety, remove and allow resettable per-player maps
2340 return 1e99 if $self->{deny_reset};
2341
2342 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2343 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2344
2345 $time + $to
2346}
2347
2348sub should_reset {
2349 my ($self) = @_;
2350
2351 $self->reset_at <= $cf::RUNTIME
2352}
2353
2354sub reset {
2355 my ($self) = @_;
2356
2357 my $lock = cf::lock_acquire "map_data:$self->{path}";
2358
2359 return if $self->players;
2360
2361 cf::trace "resetting map ", $self->path, "\n";
2362
2363 $self->in_memory (cf::MAP_SWAPPED);
2364
2365 # need to save uniques path
2366 unless ($self->{deny_save}) {
2367 my $uniq = $self->uniq_path; utf8::encode $uniq;
2368
2369 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2370 if $uniq;
2371 }
2372
2373 delete $cf::MAP{$self->path};
2193 2374
2194 $self->deactivate; 2375 $self->deactivate;
2195 $_->clear_links_to ($self) for values %cf::MAP; 2376 $_->clear_links_to ($self) for values %cf::MAP;
2196 $self->clear; 2377 $self->clear;
2197}
2198
2199sub reset_at {
2200 my ($self) = @_;
2201
2202 # TODO: safety, remove and allow resettable per-player maps
2203 return 1e99 if $self->{deny_reset};
2204
2205 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2206 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2207
2208 $time + $to
2209}
2210
2211sub should_reset {
2212 my ($self) = @_;
2213
2214 $self->reset_at <= $cf::RUNTIME
2215}
2216
2217sub reset {
2218 my ($self) = @_;
2219
2220 my $lock = cf::lock_acquire "map_data:$self->{path}";
2221
2222 return if $self->players;
2223
2224 warn "resetting map ", $self->path;
2225
2226 $self->in_memory (cf::MAP_SWAPPED);
2227
2228 # need to save uniques path
2229 unless ($self->{deny_save}) {
2230 my $uniq = $self->uniq_path; utf8::encode $uniq;
2231
2232 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2233 if $uniq;
2234 }
2235
2236 delete $cf::MAP{$self->path};
2237
2238 $self->deactivate;
2239 $_->clear_links_to ($self) for values %cf::MAP;
2240 $self->clear;
2241 2378
2242 $self->unlink_save; 2379 $self->unlink_save;
2243 $self->destroy; 2380 $self->destroy;
2244} 2381}
2245 2382
2253 2390
2254 delete $cf::MAP{$self->path}; 2391 delete $cf::MAP{$self->path};
2255 2392
2256 $self->unlink_save; 2393 $self->unlink_save;
2257 2394
2258 bless $self, "cf::map"; 2395 bless $self, "cf::map::wrap";
2259 delete $self->{deny_reset}; 2396 delete $self->{deny_reset};
2260 $self->{deny_save} = 1; 2397 $self->{deny_save} = 1;
2261 $self->reset_timeout (1); 2398 $self->reset_timeout (1);
2262 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2399 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2263 2400
2320 : normalise $_ 2457 : normalise $_
2321 } @{ aio_readdir $UNIQUEDIR or [] } 2458 } @{ aio_readdir $UNIQUEDIR or [] }
2322 ] 2459 ]
2323} 2460}
2324 2461
2462=item cf::map::static_maps
2463
2464Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2465file in the shared directory excluding F</styles> and F</editor>). May
2466block.
2467
2468=cut
2469
2470sub static_maps() {
2471 my @dirs = "";
2472 my @maps;
2473
2474 while (@dirs) {
2475 my $dir = shift @dirs;
2476
2477 next if $dir eq "/styles" || $dir eq "/editor";
2478
2479 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2480 or return;
2481
2482 for (@$files) {
2483 s/\.map$// or next;
2484 utf8::decode $_;
2485 push @maps, "$dir/$_";
2486 }
2487
2488 push @dirs, map "$dir/$_", @$dirs;
2489 }
2490
2491 \@maps
2492}
2493
2325=back 2494=back
2326 2495
2327=head3 cf::object 2496=head3 cf::object
2328 2497
2329=cut 2498=cut
2461 2630
2462Freezes the player and moves him/her to a special map (C<{link}>). 2631Freezes the player and moves him/her to a special map (C<{link}>).
2463 2632
2464The player should be reasonably safe there for short amounts of time (e.g. 2633The player should be reasonably safe there for short amounts of time (e.g.
2465for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2634for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2466though, as the palyer cannot control the character while it is on the link 2635though, as the player cannot control the character while it is on the link
2467map. 2636map.
2468 2637
2469Will never block. 2638Will never block.
2470 2639
2471=item $player_object->leave_link ($map, $x, $y) 2640=item $player_object->leave_link ($map, $x, $y)
2492sub cf::object::player::enter_link { 2661sub cf::object::player::enter_link {
2493 my ($self) = @_; 2662 my ($self) = @_;
2494 2663
2495 $self->deactivate_recursive; 2664 $self->deactivate_recursive;
2496 2665
2666 ++$self->{_link_recursion};
2667
2497 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2668 return if UNIVERSAL::isa $self->map, "ext::map_link";
2498 2669
2499 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2670 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2500 if $self->map && $self->map->{path} ne "{link}"; 2671 if $self->map && $self->map->{path} ne "{link}";
2501 2672
2502 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2673 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2503} 2674}
2504 2675
2505sub cf::object::player::leave_link { 2676sub cf::object::player::leave_link {
2506 my ($self, $map, $x, $y) = @_; 2677 my ($self, $map, $x, $y) = @_;
2507 2678
2524 ($x, $y) = (-1, -1) 2695 ($x, $y) = (-1, -1)
2525 unless (defined $x) && (defined $y); 2696 unless (defined $x) && (defined $y);
2526 2697
2527 # use -1 or undef as default coordinates, not 0, 0 2698 # use -1 or undef as default coordinates, not 0, 0
2528 ($x, $y) = ($map->enter_x, $map->enter_y) 2699 ($x, $y) = ($map->enter_x, $map->enter_y)
2529 if $x <=0 && $y <= 0; 2700 if $x <= 0 && $y <= 0;
2530 2701
2531 $map->load; 2702 $map->load;
2532 $map->load_neighbours; 2703 $map->load_neighbours;
2533 2704
2534 return unless $self->contr->active; 2705 return unless $self->contr->active;
2535 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2536 $self->activate_recursive;
2537 2706
2538 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2707 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2539 $self->enter_map ($map, $x, $y); 2708 if ($self->enter_map ($map, $x, $y)) {
2540} 2709 # entering was successful
2710 delete $self->{_link_recursion};
2711 # only activate afterwards, to support waiting in hooks
2712 $self->activate_recursive;
2713 }
2541 2714
2715}
2716
2542=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2717=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2543 2718
2544Moves the player to the given map-path and coordinates by first freezing 2719Moves the player to the given map-path and coordinates by first freezing
2545her, loading and preparing them map, calling the provided $check callback 2720her, loading and preparing them map, calling the provided $check callback
2546that has to return the map if sucecssful, and then unfreezes the player on 2721that has to return the map if sucecssful, and then unfreezes the player on
2547the new (success) or old (failed) map position. In either case, $done will 2722the new (success) or old (failed) map position. In either case, $done will
2554 2729
2555our $GOTOGEN; 2730our $GOTOGEN;
2556 2731
2557sub cf::object::player::goto { 2732sub cf::object::player::goto {
2558 my ($self, $path, $x, $y, $check, $done) = @_; 2733 my ($self, $path, $x, $y, $check, $done) = @_;
2734
2735 if ($self->{_link_recursion} >= $MAX_LINKS) {
2736 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2737 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2738 ($path, $x, $y) = @$EMERGENCY_POSITION;
2739 }
2559 2740
2560 # do generation counting so two concurrent goto's will be executed in-order 2741 # do generation counting so two concurrent goto's will be executed in-order
2561 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2742 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2562 2743
2563 $self->enter_link; 2744 $self->enter_link;
2587 my $map = eval { 2768 my $map = eval {
2588 my $map = defined $path ? cf::map::find $path : undef; 2769 my $map = defined $path ? cf::map::find $path : undef;
2589 2770
2590 if ($map) { 2771 if ($map) {
2591 $map = $map->customise_for ($self); 2772 $map = $map->customise_for ($self);
2592 $map = $check->($map) if $check && $map; 2773 $map = $check->($map, $x, $y, $self) if $check && $map;
2593 } else { 2774 } else {
2594 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2775 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2595 } 2776 }
2596 2777
2597 $map 2778 $map
2605 if ($gen == $self->{_goto_generation}) { 2786 if ($gen == $self->{_goto_generation}) {
2606 delete $self->{_goto_generation}; 2787 delete $self->{_goto_generation};
2607 $self->leave_link ($map, $x, $y); 2788 $self->leave_link ($map, $x, $y);
2608 } 2789 }
2609 2790
2610 $done->() if $done; 2791 $done->($self) if $done;
2611 })->prio (1); 2792 })->prio (1);
2612} 2793}
2613 2794
2614=item $player_object->enter_exit ($exit_object) 2795=item $player_object->enter_exit ($exit_object)
2615 2796
2708 $self->message ("Something went wrong deep within the deliantra server. " 2889 $self->message ("Something went wrong deep within the deliantra server. "
2709 . "I'll try to bring you back to the map you were before. " 2890 . "I'll try to bring you back to the map you were before. "
2710 . "Please report this to the dungeon master!", 2891 . "Please report this to the dungeon master!",
2711 cf::NDI_UNIQUE | cf::NDI_RED); 2892 cf::NDI_UNIQUE | cf::NDI_RED);
2712 2893
2713 warn "ERROR in enter_exit: $@"; 2894 error "ERROR in enter_exit: $@";
2714 $self->leave_link; 2895 $self->leave_link;
2715 } 2896 }
2716 })->prio (1); 2897 })->prio (1);
2717} 2898}
2718 2899
2730sub cf::client::send_drawinfo { 2911sub cf::client::send_drawinfo {
2731 my ($self, $text, $flags) = @_; 2912 my ($self, $text, $flags) = @_;
2732 2913
2733 utf8::encode $text; 2914 utf8::encode $text;
2734 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2915 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2916}
2917
2918=item $client->send_big_packet ($pkt)
2919
2920Like C<send_packet>, but tries to compress large packets, and fragments
2921them as required.
2922
2923=cut
2924
2925our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2926
2927sub cf::client::send_big_packet {
2928 my ($self, $pkt) = @_;
2929
2930 # try lzf for large packets
2931 $pkt = "lzf " . Compress::LZF::compress $pkt
2932 if 1024 <= length $pkt and $self->{can_lzf};
2933
2934 # split very large packets
2935 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2936 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2937 $pkt = "frag";
2938 }
2939
2940 $self->send_packet ($pkt);
2735} 2941}
2736 2942
2737=item $client->send_msg ($channel, $msg, $color, [extra...]) 2943=item $client->send_msg ($channel, $msg, $color, [extra...])
2738 2944
2739Send a drawinfo or msg packet to the client, formatting the msg for the 2945Send a drawinfo or msg packet to the client, formatting the msg for the
2743 2949
2744=cut 2950=cut
2745 2951
2746# non-persistent channels (usually the info channel) 2952# non-persistent channels (usually the info channel)
2747our %CHANNEL = ( 2953our %CHANNEL = (
2954 "c/motd" => {
2955 id => "infobox",
2956 title => "MOTD",
2957 reply => undef,
2958 tooltip => "The message of the day",
2959 },
2748 "c/identify" => { 2960 "c/identify" => {
2749 id => "infobox", 2961 id => "infobox",
2750 title => "Identify", 2962 title => "Identify",
2751 reply => undef, 2963 reply => undef,
2752 tooltip => "Items recently identified", 2964 tooltip => "Items recently identified",
2754 "c/examine" => { 2966 "c/examine" => {
2755 id => "infobox", 2967 id => "infobox",
2756 title => "Examine", 2968 title => "Examine",
2757 reply => undef, 2969 reply => undef,
2758 tooltip => "Signs and other items you examined", 2970 tooltip => "Signs and other items you examined",
2971 },
2972 "c/shopinfo" => {
2973 id => "infobox",
2974 title => "Shop Info",
2975 reply => undef,
2976 tooltip => "What your bargaining skill tells you about the shop",
2759 }, 2977 },
2760 "c/book" => { 2978 "c/book" => {
2761 id => "infobox", 2979 id => "infobox",
2762 title => "Book", 2980 title => "Book",
2763 reply => undef, 2981 reply => undef,
2879 my $pkt = "msg " 3097 my $pkt = "msg "
2880 . $self->{json_coder}->encode ( 3098 . $self->{json_coder}->encode (
2881 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3099 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2882 ); 3100 );
2883 3101
2884 # try lzf for large packets
2885 $pkt = "lzf " . Compress::LZF::compress $pkt
2886 if 1024 <= length $pkt and $self->{can_lzf};
2887
2888 # split very large packets
2889 if (8192 < length $pkt and $self->{can_lzf}) {
2890 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2891 $pkt = "frag";
2892 }
2893
2894 $self->send_packet ($pkt); 3102 $self->send_big_packet ($pkt);
2895} 3103}
2896 3104
2897=item $client->ext_msg ($type, @msg) 3105=item $client->ext_msg ($type, @msg)
2898 3106
2899Sends an ext event to the client. 3107Sends an ext event to the client.
2902 3110
2903sub cf::client::ext_msg($$@) { 3111sub cf::client::ext_msg($$@) {
2904 my ($self, $type, @msg) = @_; 3112 my ($self, $type, @msg) = @_;
2905 3113
2906 if ($self->extcmd == 2) { 3114 if ($self->extcmd == 2) {
2907 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3115 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2908 } elsif ($self->extcmd == 1) { # TODO: remove 3116 } elsif ($self->extcmd == 1) { # TODO: remove
2909 push @msg, msgtype => "event_$type"; 3117 push @msg, msgtype => "event_$type";
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3118 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 } 3119 }
2912} 3120}
2913 3121
2914=item $client->ext_reply ($msgid, @msg) 3122=item $client->ext_reply ($msgid, @msg)
2915 3123
2919 3127
2920sub cf::client::ext_reply($$@) { 3128sub cf::client::ext_reply($$@) {
2921 my ($self, $id, @msg) = @_; 3129 my ($self, $id, @msg) = @_;
2922 3130
2923 if ($self->extcmd == 2) { 3131 if ($self->extcmd == 2) {
2924 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3132 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2925 } elsif ($self->extcmd == 1) { 3133 } elsif ($self->extcmd == 1) {
2926 #TODO: version 1, remove 3134 #TODO: version 1, remove
2927 unshift @msg, msgtype => "reply", msgid => $id; 3135 unshift @msg, msgtype => "reply", msgid => $id;
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3136 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2929 } 3137 }
2930} 3138}
2931 3139
2932=item $success = $client->query ($flags, "text", \&cb) 3140=item $success = $client->query ($flags, "text", \&cb)
2933 3141
3004 3212
3005 $ns->ext_reply ($reply, @reply) 3213 $ns->ext_reply ($reply, @reply)
3006 if $reply; 3214 if $reply;
3007 3215
3008 } else { 3216 } else {
3009 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3217 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3010 } 3218 }
3011 3219
3012 cf::override; 3220 cf::override;
3013 }, 3221 },
3014); 3222);
3034 3242
3035 $coro 3243 $coro
3036} 3244}
3037 3245
3038cf::client->attach ( 3246cf::client->attach (
3039 on_destroy => sub { 3247 on_client_destroy => sub {
3040 my ($ns) = @_; 3248 my ($ns) = @_;
3041 3249
3042 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3250 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3043 }, 3251 },
3044); 3252);
3060our $safe_hole = new Safe::Hole; 3268our $safe_hole = new Safe::Hole;
3061 3269
3062$SIG{FPE} = 'IGNORE'; 3270$SIG{FPE} = 'IGNORE';
3063 3271
3064$safe->permit_only (Opcode::opset qw( 3272$safe->permit_only (Opcode::opset qw(
3065 :base_core :base_mem :base_orig :base_math 3273 :base_core :base_mem :base_orig :base_math :base_loop
3066 grepstart grepwhile mapstart mapwhile 3274 grepstart grepwhile mapstart mapwhile
3067 sort time 3275 sort time
3068)); 3276));
3069 3277
3070# here we export the classes and methods available to script code 3278# here we export the classes and methods available to script code
3095 decrease split destroy change_exp value msg lore send_msg)], 3303 decrease split destroy change_exp value msg lore send_msg)],
3096 ["cf::object::player" => qw(player)], 3304 ["cf::object::player" => qw(player)],
3097 ["cf::player" => qw(peaceful send_msg)], 3305 ["cf::player" => qw(peaceful send_msg)],
3098 ["cf::map" => qw(trigger)], 3306 ["cf::map" => qw(trigger)],
3099) { 3307) {
3100 no strict 'refs';
3101 my ($pkg, @funs) = @$_; 3308 my ($pkg, @funs) = @$_;
3102 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3309 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3103 for @funs; 3310 for @funs;
3104} 3311}
3105 3312
3122 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3329 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3123 $qcode =~ s/\n/\\n/g; 3330 $qcode =~ s/\n/\\n/g;
3124 3331
3125 %vars = (_dummy => 0) unless %vars; 3332 %vars = (_dummy => 0) unless %vars;
3126 3333
3334 my @res;
3127 local $_; 3335 local $_;
3128 local @safe::cf::_safe_eval_args = values %vars;
3129 3336
3130 my $eval = 3337 my $eval =
3131 "do {\n" 3338 "do {\n"
3132 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3339 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3133 . "#line 0 \"{$qcode}\"\n" 3340 . "#line 0 \"{$qcode}\"\n"
3134 . $code 3341 . $code
3135 . "\n}" 3342 . "\n}"
3136 ; 3343 ;
3137 3344
3345 if ($CFG{safe_eval}) {
3138 sub_generation_inc; 3346 sub_generation_inc;
3347 local @safe::cf::_safe_eval_args = values %vars;
3139 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3348 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3140 sub_generation_inc; 3349 sub_generation_inc;
3350 } else {
3351 local @cf::_safe_eval_args = values %vars;
3352 @res = wantarray ? eval eval : scalar eval $eval;
3353 }
3141 3354
3142 if ($@) { 3355 if ($@) {
3143 warn "$@"; 3356 warn "$@",
3144 warn "while executing safe code '$code'\n"; 3357 "while executing safe code '$code'\n",
3145 warn "with arguments " . (join " ", %vars) . "\n"; 3358 "with arguments " . (join " ", %vars) . "\n";
3146 } 3359 }
3147 3360
3148 wantarray ? @res : $res[0] 3361 wantarray ? @res : $res[0]
3149} 3362}
3150 3363
3164=cut 3377=cut
3165 3378
3166sub register_script_function { 3379sub register_script_function {
3167 my ($fun, $cb) = @_; 3380 my ($fun, $cb) = @_;
3168 3381
3169 no strict 'refs'; 3382 $fun = "safe::$fun" if $CFG{safe_eval};
3170 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3383 *$fun = $safe_hole->wrap ($cb);
3171} 3384}
3172 3385
3173=back 3386=back
3174 3387
3175=cut 3388=cut
3184 # for this (global event?) 3397 # for this (global event?)
3185 %ext::player_env::MUSIC_FACE_CACHE = (); 3398 %ext::player_env::MUSIC_FACE_CACHE = ();
3186 3399
3187 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3400 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3188 3401
3189 warn "loading facedata from $path\n"; 3402 trace "loading facedata from $path\n";
3190 3403
3191 my $facedata;
3192 0 < aio_load $path, $facedata 3404 0 < aio_load $path, my $facedata
3193 or die "$path: $!"; 3405 or die "$path: $!";
3194 3406
3195 $facedata = Coro::Storable::thaw $facedata; 3407 $facedata = Coro::Storable::thaw $facedata;
3196 3408
3197 $facedata->{version} == 2 3409 $facedata->{version} == 2
3198 or cf::cleanup "$path: version mismatch, cannot proceed."; 3410 or cf::cleanup "$path: version mismatch, cannot proceed.";
3199 3411
3200 # patch in the exptable 3412 # patch in the exptable
3413 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3201 $facedata->{resource}{"res/exp_table"} = { 3414 $facedata->{resource}{"res/exp_table"} = {
3202 type => FT_RSRC, 3415 type => FT_RSRC,
3203 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3416 data => $exp_table,
3417 hash => (Digest::MD5::md5 $exp_table),
3204 }; 3418 };
3205 cf::cede_to_tick; 3419 cf::cede_to_tick;
3206 3420
3207 { 3421 {
3208 my $faces = $facedata->{faceinfo}; 3422 my $faces = $facedata->{faceinfo};
3210 while (my ($face, $info) = each %$faces) { 3424 while (my ($face, $info) = each %$faces) {
3211 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3425 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3212 3426
3213 cf::face::set_visibility $idx, $info->{visibility}; 3427 cf::face::set_visibility $idx, $info->{visibility};
3214 cf::face::set_magicmap $idx, $info->{magicmap}; 3428 cf::face::set_magicmap $idx, $info->{magicmap};
3215 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3429 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3216 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3430 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3217 3431
3218 cf::cede_to_tick; 3432 cf::cede_to_tick;
3219 } 3433 }
3220 3434
3221 while (my ($face, $info) = each %$faces) { 3435 while (my ($face, $info) = each %$faces) {
3226 3440
3227 if (my $smooth = cf::face::find $info->{smooth}) { 3441 if (my $smooth = cf::face::find $info->{smooth}) {
3228 cf::face::set_smooth $idx, $smooth; 3442 cf::face::set_smooth $idx, $smooth;
3229 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3443 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3230 } else { 3444 } else {
3231 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3445 error "smooth face '$info->{smooth}' not found for face '$face'";
3232 } 3446 }
3233 3447
3234 cf::cede_to_tick; 3448 cf::cede_to_tick;
3235 } 3449 }
3236 } 3450 }
3245 3459
3246 cf::anim::invalidate_all; # d'oh 3460 cf::anim::invalidate_all; # d'oh
3247 } 3461 }
3248 3462
3249 { 3463 {
3250 # TODO: for gcfclient pleasure, we should give resources
3251 # that gcfclient doesn't grok a >10000 face index.
3252 my $res = $facedata->{resource}; 3464 my $res = $facedata->{resource};
3253 3465
3254 while (my ($name, $info) = each %$res) { 3466 while (my ($name, $info) = each %$res) {
3255 if (defined $info->{type}) { 3467 if (defined $info->{type}) {
3256 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3468 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3257 my $data;
3258 3469
3259 if ($info->{type} & 1) { 3470 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3260 # prepend meta info
3261
3262 my $meta = $enc->encode ({
3263 name => $name,
3264 %{ $info->{meta} || {} },
3265 });
3266
3267 $data = pack "(w/a*)*", $meta, $info->{data};
3268 } else {
3269 $data = $info->{data};
3270 }
3271
3272 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3273 cf::face::set_type $idx, $info->{type}; 3471 cf::face::set_type $idx, $info->{type};
3274 } else { 3472 } else {
3275 $RESOURCE{$name} = $info; 3473 $RESOURCE{$name} = $info; # unused
3276 } 3474 }
3277 3475
3278 cf::cede_to_tick; 3476 cf::cede_to_tick;
3279 } 3477 }
3280 } 3478 }
3281 3479
3282 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3480 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3283 3481
3284 1 3482 1
3285} 3483}
3286
3287cf::global->attach (on_resource_update => sub {
3288 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3289 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3290
3291 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3292 my $sound = $soundconf->{compat}[$_]
3293 or next;
3294
3295 my $face = cf::face::find "sound/$sound->[1]";
3296 cf::sound::set $sound->[0] => $face;
3297 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3298 }
3299
3300 while (my ($k, $v) = each %{$soundconf->{event}}) {
3301 my $face = cf::face::find "sound/$v";
3302 cf::sound::set $k => $face;
3303 }
3304 }
3305});
3306 3484
3307register_exticmd fx_want => sub { 3485register_exticmd fx_want => sub {
3308 my ($ns, $want) = @_; 3486 my ($ns, $want) = @_;
3309 3487
3310 while (my ($k, $v) = each %$want) { 3488 while (my ($k, $v) = each %$want) {
3349sub reload_treasures { 3527sub reload_treasures {
3350 load_resource_file "$DATADIR/treasures" 3528 load_resource_file "$DATADIR/treasures"
3351 or die "unable to load treasurelists\n"; 3529 or die "unable to load treasurelists\n";
3352} 3530}
3353 3531
3532sub reload_sound {
3533 trace "loading sound config from $DATADIR/sound\n";
3534
3535 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3536 or die "$DATADIR/sound $!";
3537
3538 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3539
3540 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3541 my $sound = $soundconf->{compat}[$_]
3542 or next;
3543
3544 my $face = cf::face::find "sound/$sound->[1]";
3545 cf::sound::set $sound->[0] => $face;
3546 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3547 }
3548
3549 while (my ($k, $v) = each %{$soundconf->{event}}) {
3550 my $face = cf::face::find "sound/$v";
3551 cf::sound::set $k => $face;
3552 }
3553}
3554
3354sub reload_resources { 3555sub reload_resources {
3355 warn "reloading resource files...\n"; 3556 trace "reloading resource files...\n";
3356 3557
3558 reload_exp_table;
3559 reload_materials;
3357 reload_facedata; 3560 reload_facedata;
3561 reload_sound;
3358 reload_archetypes; 3562 reload_archetypes;
3359 reload_regions; 3563 reload_regions;
3360 reload_treasures; 3564 reload_treasures;
3361 3565
3362 warn "finished reloading resource files\n"; 3566 trace "finished reloading resource files\n";
3363} 3567}
3364 3568
3365sub reload_config { 3569sub reload_config {
3366 open my $fh, "<:utf8", "$CONFDIR/config" 3570 trace "reloading config file...\n";
3367 or return;
3368 3571
3369 local $/; 3572 0 < aio_load "$CONFDIR/config", my $config
3370 *CFG = YAML::Load <$fh>; 3573 or die "$CONFDIR/config: $!";
3371 3574
3575 utf8::decode $config;
3576 *CFG = yaml_load $config;
3577
3372 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3578 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3373 3579
3374 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3580 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3375 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3581 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3376 3582
3377 if (exists $CFG{mlockall}) { 3583 if (exists $CFG{mlockall}) {
3400 3606
3401 seek $fh, 0, 0; 3607 seek $fh, 0, 0;
3402 print $fh $$; 3608 print $fh $$;
3403} 3609}
3404 3610
3611sub main_loop {
3612 trace "EV::loop starting\n";
3613 if (1) {
3614 EV::loop;
3615 }
3616 trace "EV::loop returned\n";
3617 goto &main_loop unless $REALLY_UNLOOP;
3618}
3619
3405sub main { 3620sub main {
3406 cf::init_globals; # initialise logging 3621 cf::init_globals; # initialise logging
3407 3622
3408 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3623 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3409 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3624 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3410 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3625 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3411 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3626 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3412
3413 cf::init_experience;
3414 cf::init_anim;
3415 cf::init_attackmess;
3416 cf::init_dynamic;
3417 3627
3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3628 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3419 3629
3420 # we must not ever block the main coroutine 3630 # we must not ever block the main coroutine
3421 local $Coro::idle = sub { 3631 local $Coro::idle = sub {
3427 }; 3637 };
3428 3638
3429 evthread_start IO::AIO::poll_fileno; 3639 evthread_start IO::AIO::poll_fileno;
3430 3640
3431 cf::sync_job { 3641 cf::sync_job {
3642 cf::incloader::init ();
3643
3644 cf::init_anim;
3645 cf::init_attackmess;
3646 cf::init_dynamic;
3647
3648 cf::load_settings;
3649
3432 reload_resources; 3650 reload_resources;
3433 reload_config; 3651 reload_config;
3434 db_init; 3652 db_init;
3435 3653
3436 cf::load_settings;
3437 cf::load_materials;
3438 cf::init_uuid; 3654 cf::init_uuid;
3439 cf::init_signals; 3655 cf::init_signals;
3440 cf::init_commands;
3441 cf::init_skills; 3656 cf::init_skills;
3442 3657
3443 cf::init_beforeplay; 3658 cf::init_beforeplay;
3444 3659
3445 atomic; 3660 atomic;
3447 load_extensions; 3662 load_extensions;
3448 3663
3449 utime time, time, $RUNTIMEFILE; 3664 utime time, time, $RUNTIMEFILE;
3450 3665
3451 # no (long-running) fork's whatsoever before this point(!) 3666 # no (long-running) fork's whatsoever before this point(!)
3667 use POSIX ();
3452 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3668 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3453 3669
3454 (pop @POST_INIT)->(0) while @POST_INIT; 3670 cf::_post_init 0;
3455 }; 3671 };
3456 3672
3457 EV::loop; 3673 cf::object::thawer::errors_are_fatal 0;
3674 info "parse errors in files are no longer fatal from this point on.\n";
3675
3676 my $free_main; $free_main = EV::idle sub {
3677 undef $free_main;
3678 undef &main; # free gobs of memory :)
3679 };
3680
3681 goto &main_loop;
3458} 3682}
3459 3683
3460############################################################################# 3684#############################################################################
3461# initialisation and cleanup 3685# initialisation and cleanup
3462 3686
3463# install some emergency cleanup handlers 3687# install some emergency cleanup handlers
3464BEGIN { 3688BEGIN {
3465 our %SIGWATCHER = (); 3689 our %SIGWATCHER = ();
3466 for my $signal (qw(INT HUP TERM)) { 3690 for my $signal (qw(INT HUP TERM)) {
3467 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3691 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3468 cf::cleanup "SIG$signal"; 3692 cf::cleanup "SIG$signal";
3469 }; 3693 };
3470 } 3694 }
3471} 3695}
3472 3696
3473sub write_runtime_sync { 3697sub write_runtime_sync {
3698 my $t0 = AE::time;
3699
3474 # first touch the runtime file to show we are still running: 3700 # first touch the runtime file to show we are still running:
3475 # the fsync below can take a very very long time. 3701 # the fsync below can take a very very long time.
3476 3702
3477 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3703 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3478 3704
3479 my $guard = cf::lock_acquire "write_runtime"; 3705 my $guard = cf::lock_acquire "write_runtime";
3480 3706
3481 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3707 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3482 or return; 3708 or return;
3483 3709
3484 my $value = $cf::RUNTIME + 90 + 10; 3710 my $value = $cf::RUNTIME + 90 + 10;
3485 # 10 is the runtime save interval, for a monotonic clock 3711 # 10 is the runtime save interval, for a monotonic clock
3486 # 60 allows for the watchdog to kill the server. 3712 # 60 allows for the watchdog to kill the server.
3499 or return; 3725 or return;
3500 3726
3501 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3727 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3502 and return; 3728 and return;
3503 3729
3504 warn "runtime file written.\n"; 3730 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3505 3731
3506 1 3732 1
3507} 3733}
3508 3734
3509our $uuid_lock; 3735our $uuid_lock;
3521 or return; 3747 or return;
3522 3748
3523 my $value = uuid_seq uuid_cur; 3749 my $value = uuid_seq uuid_cur;
3524 3750
3525 unless ($value) { 3751 unless ($value) {
3526 warn "cowardly refusing to write zero uuid value!\n"; 3752 info "cowardly refusing to write zero uuid value!\n";
3527 return; 3753 return;
3528 } 3754 }
3529 3755
3530 my $value = uuid_str $value + $uuid_skip; 3756 my $value = uuid_str $value + $uuid_skip;
3531 $uuid_skip = 0; 3757 $uuid_skip = 0;
3541 or return; 3767 or return;
3542 3768
3543 aio_rename "$uuid~", $uuid 3769 aio_rename "$uuid~", $uuid
3544 and return; 3770 and return;
3545 3771
3546 warn "uuid file written ($value).\n"; 3772 trace "uuid file written ($value).\n";
3547 3773
3548 1 3774 1
3549 3775
3550} 3776}
3551 3777
3557} 3783}
3558 3784
3559sub emergency_save() { 3785sub emergency_save() {
3560 my $freeze_guard = cf::freeze_mainloop; 3786 my $freeze_guard = cf::freeze_mainloop;
3561 3787
3562 warn "emergency_perl_save: enter\n"; 3788 info "emergency_perl_save: enter\n";
3789
3790 # this is a trade-off: we want to be very quick here, so
3791 # save all maps without fsync, and later call a global sync
3792 # (which in turn might be very very slow)
3793 local $USE_FSYNC = 0;
3563 3794
3564 cf::sync_job { 3795 cf::sync_job {
3565 # this is a trade-off: we want to be very quick here, so 3796 cf::write_runtime_sync; # external watchdog should not bark
3566 # save all maps without fsync, and later call a global sync
3567 # (which in turn might be very very slow)
3568 local $USE_FSYNC = 0;
3569 3797
3570 # use a peculiar iteration method to avoid tripping on perl 3798 # use a peculiar iteration method to avoid tripping on perl
3571 # refcount bugs in for. also avoids problems with players 3799 # refcount bugs in for. also avoids problems with players
3572 # and maps saved/destroyed asynchronously. 3800 # and maps saved/destroyed asynchronously.
3573 warn "emergency_perl_save: begin player save\n"; 3801 info "emergency_perl_save: begin player save\n";
3574 for my $login (keys %cf::PLAYER) { 3802 for my $login (keys %cf::PLAYER) {
3575 my $pl = $cf::PLAYER{$login} or next; 3803 my $pl = $cf::PLAYER{$login} or next;
3576 $pl->valid or next; 3804 $pl->valid or next;
3577 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3805 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3578 $pl->save; 3806 $pl->save;
3579 } 3807 }
3580 warn "emergency_perl_save: end player save\n"; 3808 info "emergency_perl_save: end player save\n";
3581 3809
3810 cf::write_runtime_sync; # external watchdog should not bark
3811
3582 warn "emergency_perl_save: begin map save\n"; 3812 info "emergency_perl_save: begin map save\n";
3583 for my $path (keys %cf::MAP) { 3813 for my $path (keys %cf::MAP) {
3584 my $map = $cf::MAP{$path} or next; 3814 my $map = $cf::MAP{$path} or next;
3585 $map->valid or next; 3815 $map->valid or next;
3586 $map->save; 3816 $map->save;
3587 } 3817 }
3588 warn "emergency_perl_save: end map save\n"; 3818 info "emergency_perl_save: end map save\n";
3589 3819
3820 cf::write_runtime_sync; # external watchdog should not bark
3821
3590 warn "emergency_perl_save: begin database checkpoint\n"; 3822 info "emergency_perl_save: begin database checkpoint\n";
3591 BDB::db_env_txn_checkpoint $DB_ENV; 3823 BDB::db_env_txn_checkpoint $DB_ENV;
3592 warn "emergency_perl_save: end database checkpoint\n"; 3824 info "emergency_perl_save: end database checkpoint\n";
3593 3825
3594 warn "emergency_perl_save: begin write uuid\n"; 3826 info "emergency_perl_save: begin write uuid\n";
3595 write_uuid_sync 1; 3827 write_uuid_sync 1;
3596 warn "emergency_perl_save: end write uuid\n"; 3828 info "emergency_perl_save: end write uuid\n";
3829
3830 cf::write_runtime_sync; # external watchdog should not bark
3831
3832 trace "emergency_perl_save: syncing database to disk";
3833 BDB::db_env_txn_checkpoint $DB_ENV;
3834
3835 info "emergency_perl_save: starting sync\n";
3836 IO::AIO::aio_sync sub {
3837 info "emergency_perl_save: finished sync\n";
3838 };
3839
3840 cf::write_runtime_sync; # external watchdog should not bark
3841
3842 trace "emergency_perl_save: flushing outstanding aio requests";
3843 while (IO::AIO::nreqs || BDB::nreqs) {
3844 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3845 }
3846
3847 cf::write_runtime_sync; # external watchdog should not bark
3597 }; 3848 };
3598 3849
3599 warn "emergency_perl_save: starting sync()\n";
3600 IO::AIO::aio_sync sub {
3601 warn "emergency_perl_save: finished sync()\n";
3602 };
3603
3604 warn "emergency_perl_save: leave\n"; 3850 info "emergency_perl_save: leave\n";
3605} 3851}
3606 3852
3607sub post_cleanup { 3853sub post_cleanup {
3608 my ($make_core) = @_; 3854 my ($make_core) = @_;
3609 3855
3856 IO::AIO::flush;
3857
3610 warn Carp::longmess "post_cleanup backtrace" 3858 error Carp::longmess "post_cleanup backtrace"
3611 if $make_core; 3859 if $make_core;
3612 3860
3613 my $fh = pidfile; 3861 my $fh = pidfile;
3614 unlink $PIDFILE if <$fh> == $$; 3862 unlink $PIDFILE if <$fh> == $$;
3615} 3863}
3635 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3883 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3636 for my $name (keys %$leaf_symtab) { 3884 for my $name (keys %$leaf_symtab) {
3637 _gv_clear *{"$pkg$name"}; 3885 _gv_clear *{"$pkg$name"};
3638# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3886# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3639 } 3887 }
3640 warn "cleared package $pkg\n";#d#
3641} 3888}
3642 3889
3643sub do_reload_perl() { 3890sub do_reload_perl() {
3644 # can/must only be called in main 3891 # can/must only be called in main
3645 if ($Coro::current != $Coro::main) { 3892 unless (in_main) {
3646 warn "can only reload from main coroutine"; 3893 error "can only reload from main coroutine";
3647 return; 3894 return;
3648 } 3895 }
3649 3896
3650 return if $RELOAD++; 3897 return if $RELOAD++;
3651 3898
3652 my $t1 = EV::time; 3899 my $t1 = AE::time;
3653 3900
3654 while ($RELOAD) { 3901 while ($RELOAD) {
3655 warn "reloading..."; 3902 cf::get_slot 0.1, -1, "reload_perl";
3903 info "perl_reload: reloading...";
3656 3904
3657 warn "entering sync_job"; 3905 trace "perl_reload: entering sync_job";
3658 3906
3659 cf::sync_job { 3907 cf::sync_job {
3660 cf::write_runtime_sync; # external watchdog should not bark
3661 cf::emergency_save; 3908 #cf::emergency_save;
3662 cf::write_runtime_sync; # external watchdog should not bark
3663 3909
3664 warn "syncing database to disk";
3665 BDB::db_env_txn_checkpoint $DB_ENV;
3666
3667 # if anything goes wrong in here, we should simply crash as we already saved
3668
3669 warn "flushing outstanding aio requests";
3670 while (IO::AIO::nreqs || BDB::nreqs) {
3671 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3672 }
3673
3674 warn "cancelling all extension coros"; 3910 trace "perl_reload: cancelling all extension coros";
3675 $_->cancel for values %EXT_CORO; 3911 $_->cancel for values %EXT_CORO;
3676 %EXT_CORO = (); 3912 %EXT_CORO = ();
3677 3913
3678 warn "removing commands"; 3914 trace "perl_reload: removing commands";
3679 %COMMAND = (); 3915 %COMMAND = ();
3680 3916
3681 warn "removing ext/exti commands"; 3917 trace "perl_reload: removing ext/exti commands";
3682 %EXTCMD = (); 3918 %EXTCMD = ();
3683 %EXTICMD = (); 3919 %EXTICMD = ();
3684 3920
3685 warn "unloading/nuking all extensions"; 3921 trace "perl_reload: unloading/nuking all extensions";
3686 for my $pkg (@EXTS) { 3922 for my $pkg (@EXTS) {
3687 warn "... unloading $pkg"; 3923 trace "... unloading $pkg";
3688 3924
3689 if (my $cb = $pkg->can ("unload")) { 3925 if (my $cb = $pkg->can ("unload")) {
3690 eval { 3926 eval {
3691 $cb->($pkg); 3927 $cb->($pkg);
3692 1 3928 1
3693 } or warn "$pkg unloaded, but with errors: $@"; 3929 } or error "$pkg unloaded, but with errors: $@";
3694 } 3930 }
3695 3931
3696 warn "... clearing $pkg"; 3932 trace "... clearing $pkg";
3697 clear_package $pkg; 3933 clear_package $pkg;
3698 } 3934 }
3699 3935
3700 warn "unloading all perl modules loaded from $LIBDIR"; 3936 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3701 while (my ($k, $v) = each %INC) { 3937 while (my ($k, $v) = each %INC) {
3702 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3938 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3703 3939
3704 warn "... unloading $k"; 3940 trace "... unloading $k";
3705 delete $INC{$k}; 3941 delete $INC{$k};
3706 3942
3707 $k =~ s/\.pm$//; 3943 $k =~ s/\.pm$//;
3708 $k =~ s/\//::/g; 3944 $k =~ s/\//::/g;
3709 3945
3712 } 3948 }
3713 3949
3714 clear_package $k; 3950 clear_package $k;
3715 } 3951 }
3716 3952
3717 warn "getting rid of safe::, as good as possible"; 3953 trace "perl_reload: getting rid of safe::, as good as possible";
3718 clear_package "safe::$_" 3954 clear_package "safe::$_"
3719 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3955 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3720 3956
3721 warn "unloading cf.pm \"a bit\""; 3957 trace "perl_reload: unloading cf.pm \"a bit\"";
3722 delete $INC{"cf.pm"}; 3958 delete $INC{"cf.pm"};
3723 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3959 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3724 3960
3725 # don't, removes xs symbols, too, 3961 # don't, removes xs symbols, too,
3726 # and global variables created in xs 3962 # and global variables created in xs
3727 #clear_package __PACKAGE__; 3963 #clear_package __PACKAGE__;
3728 3964
3729 warn "unload completed, starting to reload now"; 3965 info "perl_reload: unload completed, starting to reload now";
3730 3966
3731 warn "reloading cf.pm"; 3967 trace "perl_reload: reloading cf.pm";
3732 require cf; 3968 require cf;
3733 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3969 cf::_connect_to_perl_1;
3734 3970
3735 warn "loading config and database again"; 3971 trace "perl_reload: loading config and database again";
3736 cf::reload_config; 3972 cf::reload_config;
3737 3973
3738 warn "loading extensions"; 3974 trace "perl_reload: loading extensions";
3739 cf::load_extensions; 3975 cf::load_extensions;
3740 3976
3741 if ($REATTACH_ON_RELOAD) { 3977 if ($REATTACH_ON_RELOAD) {
3742 warn "reattaching attachments to objects/players"; 3978 trace "perl_reload: reattaching attachments to objects/players";
3743 _global_reattach; # objects, sockets 3979 _global_reattach; # objects, sockets
3744 warn "reattaching attachments to maps"; 3980 trace "perl_reload: reattaching attachments to maps";
3745 reattach $_ for values %MAP; 3981 reattach $_ for values %MAP;
3746 warn "reattaching attachments to players"; 3982 trace "perl_reload: reattaching attachments to players";
3747 reattach $_ for values %PLAYER; 3983 reattach $_ for values %PLAYER;
3748 } 3984 }
3749 3985
3750 warn "running post_init jobs"; 3986 cf::_post_init 1;
3751 (pop @POST_INIT)->(1) while @POST_INIT;
3752 3987
3753 warn "leaving sync_job"; 3988 trace "perl_reload: leaving sync_job";
3754 3989
3755 1 3990 1
3756 } or do { 3991 } or do {
3757 warn $@; 3992 error $@;
3758 cf::cleanup "error while reloading, exiting."; 3993 cf::cleanup "perl_reload: error, exiting.";
3759 }; 3994 };
3760 3995
3761 warn "reloaded";
3762 --$RELOAD; 3996 --$RELOAD;
3763 } 3997 }
3764 3998
3765 $t1 = EV::time - $t1; 3999 $t1 = AE::time - $t1;
3766 warn "reload completed in ${t1}s\n"; 4000 info "perl_reload: completed in ${t1}s\n";
3767}; 4001};
3768 4002
3769our $RELOAD_WATCHER; # used only during reload 4003our $RELOAD_WATCHER; # used only during reload
3770 4004
3771sub reload_perl() { 4005sub reload_perl() {
3773 # coro crashes during coro_state_free->destroy here. 4007 # coro crashes during coro_state_free->destroy here.
3774 4008
3775 $RELOAD_WATCHER ||= cf::async { 4009 $RELOAD_WATCHER ||= cf::async {
3776 Coro::AIO::aio_wait cache_extensions; 4010 Coro::AIO::aio_wait cache_extensions;
3777 4011
3778 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4012 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3779 do_reload_perl; 4013 do_reload_perl;
3780 undef $RELOAD_WATCHER; 4014 undef $RELOAD_WATCHER;
3781 }; 4015 };
3782 }; 4016 };
3783} 4017}
3792 reload_perl; 4026 reload_perl;
3793 }; 4027 };
3794 } 4028 }
3795}; 4029};
3796 4030
3797unshift @INC, $LIBDIR; 4031#############################################################################
3798 4032
3799my $bug_warning = 0; 4033my $bug_warning = 0;
3800 4034
3801our @WAIT_FOR_TICK; 4035our @WAIT_FOR_TICK;
3802our @WAIT_FOR_TICK_BEGIN; 4036our @WAIT_FOR_TICK_BEGIN;
3803 4037
3804sub wait_for_tick { 4038sub wait_for_tick() {
3805 return if tick_inhibit || $Coro::current == $Coro::main; 4039 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3806 4040
3807 my $signal = new Coro::Signal; 4041 my $signal = new Coro::Signal;
3808 push @WAIT_FOR_TICK, $signal; 4042 push @WAIT_FOR_TICK, $signal;
3809 $signal->wait; 4043 $signal->wait;
3810} 4044}
3811 4045
3812sub wait_for_tick_begin { 4046sub wait_for_tick_begin() {
3813 return if tick_inhibit || $Coro::current == $Coro::main; 4047 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3814 4048
3815 my $signal = new Coro::Signal; 4049 my $signal = new Coro::Signal;
3816 push @WAIT_FOR_TICK_BEGIN, $signal; 4050 push @WAIT_FOR_TICK_BEGIN, $signal;
3817 $signal->wait; 4051 $signal->wait;
3818} 4052}
3824 return; 4058 return;
3825 } 4059 }
3826 4060
3827 cf::server_tick; # one server iteration 4061 cf::server_tick; # one server iteration
3828 4062
4063 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4064
3829 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4065 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3830 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4066 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3831 Coro::async_pool { 4067 Coro::async_pool {
3832 $Coro::current->{desc} = "runtime saver"; 4068 $Coro::current->{desc} = "runtime saver";
3833 write_runtime_sync 4069 write_runtime_sync
3834 or warn "ERROR: unable to write runtime file: $!"; 4070 or error "ERROR: unable to write runtime file: $!";
3835 }; 4071 };
3836 } 4072 }
3837 4073
3838 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4074 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3839 $sig->send; 4075 $sig->send;
3847 4083
3848 if (0) { 4084 if (0) {
3849 if ($NEXT_TICK) { 4085 if ($NEXT_TICK) {
3850 my $jitter = $TICK_START - $NEXT_TICK; 4086 my $jitter = $TICK_START - $NEXT_TICK;
3851 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4087 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3852 warn "jitter $JITTER\n";#d# 4088 debug "jitter $JITTER\n";#d#
3853 } 4089 }
3854 } 4090 }
3855} 4091}
3856 4092
3857{ 4093{
3858 # configure BDB 4094 # configure BDB
3859 4095
3860 BDB::min_parallel 8; 4096 BDB::min_parallel 16;
3861 BDB::max_poll_reqs $TICK * 0.1; 4097 BDB::max_poll_reqs $TICK * 0.1;
3862 $AnyEvent::BDB::WATCHER->priority (1); 4098 $AnyEvent::BDB::WATCHER->priority (1);
3863 4099
3864 unless ($DB_ENV) { 4100 unless ($DB_ENV) {
3865 $DB_ENV = BDB::db_env_create; 4101 $DB_ENV = BDB::db_env_create;
3902 IO::AIO::min_parallel 8; 4138 IO::AIO::min_parallel 8;
3903 IO::AIO::max_poll_time $TICK * 0.1; 4139 IO::AIO::max_poll_time $TICK * 0.1;
3904 undef $AnyEvent::AIO::WATCHER; 4140 undef $AnyEvent::AIO::WATCHER;
3905} 4141}
3906 4142
3907my $_log_backtrace; 4143our $_log_backtrace;
4144our $_log_backtrace_last;
3908 4145
3909sub _log_backtrace { 4146sub _log_backtrace {
3910 my ($msg, @addr) = @_; 4147 my ($msg, @addr) = @_;
3911 4148
3912 $msg =~ s/\n//; 4149 $msg =~ s/\n$//;
3913 4150
4151 if ($_log_backtrace_last eq $msg) {
4152 LOG llevInfo, "[ABT] $msg\n";
4153 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3914 # limit the # of concurrent backtraces 4154 # limit the # of concurrent backtraces
3915 if ($_log_backtrace < 2) { 4155 } elsif ($_log_backtrace < 2) {
4156 $_log_backtrace_last = $msg;
3916 ++$_log_backtrace; 4157 ++$_log_backtrace;
3917 my $perl_bt = Carp::longmess $msg; 4158 my $perl_bt = Carp::longmess $msg;
3918 async { 4159 async {
3919 $Coro::current->{desc} = "abt $msg"; 4160 $Coro::current->{desc} = "abt $msg";
3920 4161
3940 LOG llevInfo, "[ABT] $_\n" for @bt; 4181 LOG llevInfo, "[ABT] $_\n" for @bt;
3941 --$_log_backtrace; 4182 --$_log_backtrace;
3942 }; 4183 };
3943 } else { 4184 } else {
3944 LOG llevInfo, "[ABT] $msg\n"; 4185 LOG llevInfo, "[ABT] $msg\n";
3945 LOG llevInfo, "[ABT] [suppressed]\n"; 4186 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3946 } 4187 }
3947} 4188}
3948 4189
3949# load additional modules 4190# load additional modules
3950require "cf/$_.pm" for @EXTRA_MODULES; 4191require "cf/$_.pm" for @EXTRA_MODULES;
4192cf::_connect_to_perl_2;
3951 4193
3952END { cf::emergency_save } 4194END { cf::emergency_save }
3953 4195
39541 41961
3955 4197

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines