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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines