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.477 by root, Wed Sep 2 22:52:36 2009 UTC vs.
Revision 1.557 by root, Tue Oct 5 21:40:05 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)
1730sub generate_random_map { 1861sub generate_random_map {
1731 my ($self, $rmp) = @_; 1862 my ($self, $rmp) = @_;
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
1736 $self->_create_random_map ( 1866 $self->_create_random_map ($rmp);
1737 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
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}
1748 )
1749} 1867}
1750 1868
1751=item cf::map->register ($regex, $prio) 1869=item cf::map->register ($regex, $prio)
1752 1870
1753Register 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
1758 1876
1759sub register { 1877sub register {
1760 my (undef, $regex, $prio) = @_; 1878 my (undef, $regex, $prio) = @_;
1761 my $pkg = caller; 1879 my $pkg = caller;
1762 1880
1763 no strict;
1764 push @{"$pkg\::ISA"}, __PACKAGE__; 1881 push @{"$pkg\::ISA"}, __PACKAGE__;
1765 1882
1766 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1883 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1767} 1884}
1768 1885
1769# also paths starting with '/' 1886# also paths starting with '/'
1770$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1887$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1771 1888
1772sub thawer_merge { 1889sub thawer_merge {
1773 my ($self, $merge) = @_; 1890 my ($self, $merge) = @_;
1774 1891
1775 # we have to keep some variables in memory intact 1892 # we have to keep some variables in memory intact
1780} 1897}
1781 1898
1782sub normalise { 1899sub normalise {
1783 my ($path, $base) = @_; 1900 my ($path, $base) = @_;
1784 1901
1785 $path = "$path"; # make sure its a string 1902 $path = "$path"; # make sure it's a string
1786 1903
1787 $path =~ s/\.map$//; 1904 $path =~ s/\.map$//;
1788 1905
1789 # map plan: 1906 # map plan:
1790 # 1907 #
1805 $base =~ s{[^/]+/?$}{}; 1922 $base =~ s{[^/]+/?$}{};
1806 $path = "$base/$path"; 1923 $path = "$base/$path";
1807 } 1924 }
1808 1925
1809 for ($path) { 1926 for ($path) {
1810 redo if s{//}{/};
1811 redo if s{/\.?/}{/}; 1927 redo if s{/\.?/}{/};
1812 redo if s{/[^/]+/\.\./}{/}; 1928 redo if s{/[^/]+/\.\./}{/};
1813 } 1929 }
1814 1930
1815 $path 1931 $path
1829 $self->init; # pass $1 etc. 1945 $self->init; # pass $1 etc.
1830 return $self; 1946 return $self;
1831 } 1947 }
1832 } 1948 }
1833 1949
1834 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1950 Carp::cluck "unable to resolve path '$path' (base '$base')";
1835 () 1951 ()
1836} 1952}
1837 1953
1838sub init { 1954sub init {
1839 my ($self) = @_; 1955 my ($self) = @_;
1961} 2077}
1962 2078
1963sub find; 2079sub find;
1964sub find { 2080sub find {
1965 my ($path, $origin) = @_; 2081 my ($path, $origin) = @_;
2082
2083 cf::cede_to_tick;
1966 2084
1967 $path = normalise $path, $origin && $origin->path; 2085 $path = normalise $path, $origin && $origin->path;
1968 2086
1969 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2087 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1970 my $guard2 = cf::lock_acquire "map_find:$path"; 2088 my $guard2 = cf::lock_acquire "map_find:$path";
1989 2107
1990 $cf::MAP{$path} = $map 2108 $cf::MAP{$path} = $map
1991 } 2109 }
1992} 2110}
1993 2111
1994sub pre_load { } 2112sub pre_load { }
1995sub post_load { } 2113#sub post_load { } # XS
1996 2114
1997sub load { 2115sub load {
1998 my ($self) = @_; 2116 my ($self) = @_;
1999 2117
2000 local $self->{deny_reset} = 1; # loading can take a long time 2118 local $self->{deny_reset} = 1; # loading can take a long time
2055 2173
2056 $self->in_memory (cf::MAP_ACTIVE); 2174 $self->in_memory (cf::MAP_ACTIVE);
2057 } 2175 }
2058 2176
2059 $self->post_load; 2177 $self->post_load;
2060}
2061 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
2062sub customise_for { 2185sub customise_for {
2063 my ($self, $ob) = @_; 2186 my ($self, $ob) = @_;
2064 2187
2065 return find "~" . $ob->name . "/" . $self->{path} 2188 return find "~" . $ob->name . "/" . $self->{path}
2066 if $self->per_player; 2189 if $self->per_player;
2082 or next; 2205 or next;
2083 $neigh = find $neigh, $map 2206 $neigh = find $neigh, $map
2084 or next; 2207 or next;
2085 $neigh->load; 2208 $neigh->load;
2086 2209
2210 # now find the diagonal neighbours
2087 push @neigh, 2211 push @neigh,
2088 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2212 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2089 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2213 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2090 } 2214 }
2091 2215
2098} 2222}
2099 2223
2100sub find_sync { 2224sub find_sync {
2101 my ($path, $origin) = @_; 2225 my ($path, $origin) = @_;
2102 2226
2103 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
2104} 2231}
2105 2232
2106sub do_load_sync { 2233sub do_load_sync {
2107 my ($map) = @_; 2234 my ($map) = @_;
2108 2235
2109 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2236 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2110 if $Coro::current == $Coro::main; 2237 if $Coro::current == $Coro::main;
2111 2238
2112 cf::sync_job { $map->load }; 2239 $map->load;
2113} 2240}
2114 2241
2115our %MAP_PREFETCH; 2242our %MAP_PREFETCH;
2116our $MAP_PREFETCHER = undef; 2243our $MAP_PREFETCHER = undef;
2117 2244
2143 $MAP_PREFETCHER->prio (6); 2270 $MAP_PREFETCHER->prio (6);
2144 2271
2145 () 2272 ()
2146} 2273}
2147 2274
2275# common code, used by both ->save and ->swapout
2148sub save { 2276sub _save {
2149 my ($self) = @_; 2277 my ($self) = @_;
2150
2151 my $lock = cf::lock_acquire "map_data:$self->{path}";
2152 2278
2153 $self->{last_save} = $cf::RUNTIME; 2279 $self->{last_save} = $cf::RUNTIME;
2154 2280
2155 return unless $self->dirty; 2281 return unless $self->dirty;
2156 2282
2176 } else { 2302 } else {
2177 $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);
2178 } 2304 }
2179} 2305}
2180 2306
2307sub save {
2308 my ($self) = @_;
2309
2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311
2312 $self->_save;
2313}
2314
2181sub swap_out { 2315sub swap_out {
2182 my ($self) = @_; 2316 my ($self) = @_;
2183 2317
2184 # save first because save cedes
2185 $self->save;
2186
2187 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2318 my $lock = cf::lock_acquire "map_data:$self->{path}";
2188 2319
2189 return if $self->players;
2190 return if $self->in_memory != cf::MAP_ACTIVE; 2320 return if $self->in_memory != cf::MAP_ACTIVE;
2191 return if $self->{deny_save}; 2321 return if $self->{deny_save};
2322 return if $self->players;
2192 2323
2324 # first deactivate the map and "unlink" it from the core
2325 $self->deactivate;
2326 $_->clear_links_to ($self) for values %cf::MAP;
2193 $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};
2194 2374
2195 $self->deactivate; 2375 $self->deactivate;
2196 $_->clear_links_to ($self) for values %cf::MAP; 2376 $_->clear_links_to ($self) for values %cf::MAP;
2197 $self->clear; 2377 $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;
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 2378
2243 $self->unlink_save; 2379 $self->unlink_save;
2244 $self->destroy; 2380 $self->destroy;
2245} 2381}
2246 2382
2254 2390
2255 delete $cf::MAP{$self->path}; 2391 delete $cf::MAP{$self->path};
2256 2392
2257 $self->unlink_save; 2393 $self->unlink_save;
2258 2394
2259 bless $self, "cf::map"; 2395 bless $self, "cf::map::wrap";
2260 delete $self->{deny_reset}; 2396 delete $self->{deny_reset};
2261 $self->{deny_save} = 1; 2397 $self->{deny_save} = 1;
2262 $self->reset_timeout (1); 2398 $self->reset_timeout (1);
2263 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2399 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2264 2400
2321 : normalise $_ 2457 : normalise $_
2322 } @{ aio_readdir $UNIQUEDIR or [] } 2458 } @{ aio_readdir $UNIQUEDIR or [] }
2323 ] 2459 ]
2324} 2460}
2325 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
2326=back 2494=back
2327 2495
2328=head3 cf::object 2496=head3 cf::object
2329 2497
2330=cut 2498=cut
2462 2630
2463Freezes 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}>).
2464 2632
2465The 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.
2466for 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,
2467though, 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
2468map. 2636map.
2469 2637
2470Will never block. 2638Will never block.
2471 2639
2472=item $player_object->leave_link ($map, $x, $y) 2640=item $player_object->leave_link ($map, $x, $y)
2493sub cf::object::player::enter_link { 2661sub cf::object::player::enter_link {
2494 my ($self) = @_; 2662 my ($self) = @_;
2495 2663
2496 $self->deactivate_recursive; 2664 $self->deactivate_recursive;
2497 2665
2666 ++$self->{_link_recursion};
2667
2498 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2668 return if UNIVERSAL::isa $self->map, "ext::map_link";
2499 2669
2500 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2670 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2501 if $self->map && $self->map->{path} ne "{link}"; 2671 if $self->map && $self->map->{path} ne "{link}";
2502 2672
2503 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2673 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2504} 2674}
2505 2675
2506sub cf::object::player::leave_link { 2676sub cf::object::player::leave_link {
2507 my ($self, $map, $x, $y) = @_; 2677 my ($self, $map, $x, $y) = @_;
2508 2678
2525 ($x, $y) = (-1, -1) 2695 ($x, $y) = (-1, -1)
2526 unless (defined $x) && (defined $y); 2696 unless (defined $x) && (defined $y);
2527 2697
2528 # use -1 or undef as default coordinates, not 0, 0 2698 # use -1 or undef as default coordinates, not 0, 0
2529 ($x, $y) = ($map->enter_x, $map->enter_y) 2699 ($x, $y) = ($map->enter_x, $map->enter_y)
2530 if $x <=0 && $y <= 0; 2700 if $x <= 0 && $y <= 0;
2531 2701
2532 $map->load; 2702 $map->load;
2533 $map->load_neighbours; 2703 $map->load_neighbours;
2534 2704
2535 return unless $self->contr->active; 2705 return unless $self->contr->active;
2536 2706
2537 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2707 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2538 $self->enter_map ($map, $x, $y); 2708 if ($self->enter_map ($map, $x, $y)) {
2539 2709 # entering was successful
2710 delete $self->{_link_recursion};
2540 # only activate afterwards, to support waiting in hooks 2711 # only activate afterwards, to support waiting in hooks
2541 $self->activate_recursive; 2712 $self->activate_recursive;
2542} 2713 }
2543 2714
2715}
2716
2544=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)]])
2545 2718
2546Moves 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
2547her, loading and preparing them map, calling the provided $check callback 2720her, loading and preparing them map, calling the provided $check callback
2548that 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
2549the 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
2556 2729
2557our $GOTOGEN; 2730our $GOTOGEN;
2558 2731
2559sub cf::object::player::goto { 2732sub cf::object::player::goto {
2560 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 }
2561 2740
2562 # 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
2563 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2742 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2564 2743
2565 $self->enter_link; 2744 $self->enter_link;
2589 my $map = eval { 2768 my $map = eval {
2590 my $map = defined $path ? cf::map::find $path : undef; 2769 my $map = defined $path ? cf::map::find $path : undef;
2591 2770
2592 if ($map) { 2771 if ($map) {
2593 $map = $map->customise_for ($self); 2772 $map = $map->customise_for ($self);
2594 $map = $check->($map) if $check && $map; 2773 $map = $check->($map, $x, $y, $self) if $check && $map;
2595 } else { 2774 } else {
2596 $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);
2597 } 2776 }
2598 2777
2599 $map 2778 $map
2607 if ($gen == $self->{_goto_generation}) { 2786 if ($gen == $self->{_goto_generation}) {
2608 delete $self->{_goto_generation}; 2787 delete $self->{_goto_generation};
2609 $self->leave_link ($map, $x, $y); 2788 $self->leave_link ($map, $x, $y);
2610 } 2789 }
2611 2790
2612 $done->() if $done; 2791 $done->($self) if $done;
2613 })->prio (1); 2792 })->prio (1);
2614} 2793}
2615 2794
2616=item $player_object->enter_exit ($exit_object) 2795=item $player_object->enter_exit ($exit_object)
2617 2796
2710 $self->message ("Something went wrong deep within the deliantra server. " 2889 $self->message ("Something went wrong deep within the deliantra server. "
2711 . "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. "
2712 . "Please report this to the dungeon master!", 2891 . "Please report this to the dungeon master!",
2713 cf::NDI_UNIQUE | cf::NDI_RED); 2892 cf::NDI_UNIQUE | cf::NDI_RED);
2714 2893
2715 warn "ERROR in enter_exit: $@"; 2894 error "ERROR in enter_exit: $@";
2716 $self->leave_link; 2895 $self->leave_link;
2717 } 2896 }
2718 })->prio (1); 2897 })->prio (1);
2719} 2898}
2720 2899
2732sub cf::client::send_drawinfo { 2911sub cf::client::send_drawinfo {
2733 my ($self, $text, $flags) = @_; 2912 my ($self, $text, $flags) = @_;
2734 2913
2735 utf8::encode $text; 2914 utf8::encode $text;
2736 $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);
2737} 2941}
2738 2942
2739=item $client->send_msg ($channel, $msg, $color, [extra...]) 2943=item $client->send_msg ($channel, $msg, $color, [extra...])
2740 2944
2741Send 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
2745 2949
2746=cut 2950=cut
2747 2951
2748# non-persistent channels (usually the info channel) 2952# non-persistent channels (usually the info channel)
2749our %CHANNEL = ( 2953our %CHANNEL = (
2954 "c/motd" => {
2955 id => "infobox",
2956 title => "MOTD",
2957 reply => undef,
2958 tooltip => "The message of the day",
2959 },
2750 "c/identify" => { 2960 "c/identify" => {
2751 id => "infobox", 2961 id => "infobox",
2752 title => "Identify", 2962 title => "Identify",
2753 reply => undef, 2963 reply => undef,
2754 tooltip => "Items recently identified", 2964 tooltip => "Items recently identified",
2756 "c/examine" => { 2966 "c/examine" => {
2757 id => "infobox", 2967 id => "infobox",
2758 title => "Examine", 2968 title => "Examine",
2759 reply => undef, 2969 reply => undef,
2760 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",
2761 }, 2977 },
2762 "c/book" => { 2978 "c/book" => {
2763 id => "infobox", 2979 id => "infobox",
2764 title => "Book", 2980 title => "Book",
2765 reply => undef, 2981 reply => undef,
2881 my $pkt = "msg " 3097 my $pkt = "msg "
2882 . $self->{json_coder}->encode ( 3098 . $self->{json_coder}->encode (
2883 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3099 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2884 ); 3100 );
2885 3101
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); 3102 $self->send_big_packet ($pkt);
2897} 3103}
2898 3104
2899=item $client->ext_msg ($type, @msg) 3105=item $client->ext_msg ($type, @msg)
2900 3106
2901Sends an ext event to the client. 3107Sends an ext event to the client.
2904 3110
2905sub cf::client::ext_msg($$@) { 3111sub cf::client::ext_msg($$@) {
2906 my ($self, $type, @msg) = @_; 3112 my ($self, $type, @msg) = @_;
2907 3113
2908 if ($self->extcmd == 2) { 3114 if ($self->extcmd == 2) {
2909 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3115 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2910 } elsif ($self->extcmd == 1) { # TODO: remove 3116 } elsif ($self->extcmd == 1) { # TODO: remove
2911 push @msg, msgtype => "event_$type"; 3117 push @msg, msgtype => "event_$type";
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3118 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2913 } 3119 }
2914} 3120}
2915 3121
2916=item $client->ext_reply ($msgid, @msg) 3122=item $client->ext_reply ($msgid, @msg)
2917 3123
2921 3127
2922sub cf::client::ext_reply($$@) { 3128sub cf::client::ext_reply($$@) {
2923 my ($self, $id, @msg) = @_; 3129 my ($self, $id, @msg) = @_;
2924 3130
2925 if ($self->extcmd == 2) { 3131 if ($self->extcmd == 2) {
2926 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3132 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2927 } elsif ($self->extcmd == 1) { 3133 } elsif ($self->extcmd == 1) {
2928 #TODO: version 1, remove 3134 #TODO: version 1, remove
2929 unshift @msg, msgtype => "reply", msgid => $id; 3135 unshift @msg, msgtype => "reply", msgid => $id;
2930 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3136 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2931 } 3137 }
2932} 3138}
2933 3139
2934=item $success = $client->query ($flags, "text", \&cb) 3140=item $success = $client->query ($flags, "text", \&cb)
2935 3141
3006 3212
3007 $ns->ext_reply ($reply, @reply) 3213 $ns->ext_reply ($reply, @reply)
3008 if $reply; 3214 if $reply;
3009 3215
3010 } else { 3216 } else {
3011 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";
3012 } 3218 }
3013 3219
3014 cf::override; 3220 cf::override;
3015 }, 3221 },
3016); 3222);
3036 3242
3037 $coro 3243 $coro
3038} 3244}
3039 3245
3040cf::client->attach ( 3246cf::client->attach (
3041 on_destroy => sub { 3247 on_client_destroy => sub {
3042 my ($ns) = @_; 3248 my ($ns) = @_;
3043 3249
3044 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3250 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3045 }, 3251 },
3046); 3252);
3062our $safe_hole = new Safe::Hole; 3268our $safe_hole = new Safe::Hole;
3063 3269
3064$SIG{FPE} = 'IGNORE'; 3270$SIG{FPE} = 'IGNORE';
3065 3271
3066$safe->permit_only (Opcode::opset qw( 3272$safe->permit_only (Opcode::opset qw(
3067 :base_core :base_mem :base_orig :base_math 3273 :base_core :base_mem :base_orig :base_math :base_loop
3068 grepstart grepwhile mapstart mapwhile 3274 grepstart grepwhile mapstart mapwhile
3069 sort time 3275 sort time
3070)); 3276));
3071 3277
3072# here we export the classes and methods available to script code 3278# here we export the classes and methods available to script code
3097 decrease split destroy change_exp value msg lore send_msg)], 3303 decrease split destroy change_exp value msg lore send_msg)],
3098 ["cf::object::player" => qw(player)], 3304 ["cf::object::player" => qw(player)],
3099 ["cf::player" => qw(peaceful send_msg)], 3305 ["cf::player" => qw(peaceful send_msg)],
3100 ["cf::map" => qw(trigger)], 3306 ["cf::map" => qw(trigger)],
3101) { 3307) {
3102 no strict 'refs';
3103 my ($pkg, @funs) = @$_; 3308 my ($pkg, @funs) = @$_;
3104 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3309 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3105 for @funs; 3310 for @funs;
3106} 3311}
3107 3312
3124 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3329 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3125 $qcode =~ s/\n/\\n/g; 3330 $qcode =~ s/\n/\\n/g;
3126 3331
3127 %vars = (_dummy => 0) unless %vars; 3332 %vars = (_dummy => 0) unless %vars;
3128 3333
3334 my @res;
3129 local $_; 3335 local $_;
3130 local @safe::cf::_safe_eval_args = values %vars;
3131 3336
3132 my $eval = 3337 my $eval =
3133 "do {\n" 3338 "do {\n"
3134 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3339 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3135 . "#line 0 \"{$qcode}\"\n" 3340 . "#line 0 \"{$qcode}\"\n"
3136 . $code 3341 . $code
3137 . "\n}" 3342 . "\n}"
3138 ; 3343 ;
3139 3344
3345 if ($CFG{safe_eval}) {
3140 sub_generation_inc; 3346 sub_generation_inc;
3347 local @safe::cf::_safe_eval_args = values %vars;
3141 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3348 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3142 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 }
3143 3354
3144 if ($@) { 3355 if ($@) {
3145 warn "$@"; 3356 warn "$@",
3146 warn "while executing safe code '$code'\n"; 3357 "while executing safe code '$code'\n",
3147 warn "with arguments " . (join " ", %vars) . "\n"; 3358 "with arguments " . (join " ", %vars) . "\n";
3148 } 3359 }
3149 3360
3150 wantarray ? @res : $res[0] 3361 wantarray ? @res : $res[0]
3151} 3362}
3152 3363
3166=cut 3377=cut
3167 3378
3168sub register_script_function { 3379sub register_script_function {
3169 my ($fun, $cb) = @_; 3380 my ($fun, $cb) = @_;
3170 3381
3171 no strict 'refs'; 3382 $fun = "safe::$fun" if $CFG{safe_eval};
3172 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3383 *$fun = $safe_hole->wrap ($cb);
3173} 3384}
3174 3385
3175=back 3386=back
3176 3387
3177=cut 3388=cut
3186 # for this (global event?) 3397 # for this (global event?)
3187 %ext::player_env::MUSIC_FACE_CACHE = (); 3398 %ext::player_env::MUSIC_FACE_CACHE = ();
3188 3399
3189 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3400 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3190 3401
3191 warn "loading facedata from $path\n"; 3402 trace "loading facedata from $path\n";
3192 3403
3193 my $facedata;
3194 0 < aio_load $path, $facedata 3404 0 < aio_load $path, my $facedata
3195 or die "$path: $!"; 3405 or die "$path: $!";
3196 3406
3197 $facedata = Coro::Storable::thaw $facedata; 3407 $facedata = Coro::Storable::thaw $facedata;
3198 3408
3199 $facedata->{version} == 2 3409 $facedata->{version} == 2
3200 or cf::cleanup "$path: version mismatch, cannot proceed."; 3410 or cf::cleanup "$path: version mismatch, cannot proceed.";
3201 3411
3202 # 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]);
3203 $facedata->{resource}{"res/exp_table"} = { 3414 $facedata->{resource}{"res/exp_table"} = {
3204 type => FT_RSRC, 3415 type => FT_RSRC,
3205 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),
3206 }; 3418 };
3207 cf::cede_to_tick; 3419 cf::cede_to_tick;
3208 3420
3209 { 3421 {
3210 my $faces = $facedata->{faceinfo}; 3422 my $faces = $facedata->{faceinfo};
3212 while (my ($face, $info) = each %$faces) { 3424 while (my ($face, $info) = each %$faces) {
3213 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3425 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3214 3426
3215 cf::face::set_visibility $idx, $info->{visibility}; 3427 cf::face::set_visibility $idx, $info->{visibility};
3216 cf::face::set_magicmap $idx, $info->{magicmap}; 3428 cf::face::set_magicmap $idx, $info->{magicmap};
3217 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3429 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3218 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3430 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3431 cf::face::set_data $idx, 2, "-", chr $idx & 255;
3219 3432
3220 cf::cede_to_tick; 3433 cf::cede_to_tick;
3221 } 3434 }
3222 3435
3223 while (my ($face, $info) = each %$faces) { 3436 while (my ($face, $info) = each %$faces) {
3228 3441
3229 if (my $smooth = cf::face::find $info->{smooth}) { 3442 if (my $smooth = cf::face::find $info->{smooth}) {
3230 cf::face::set_smooth $idx, $smooth; 3443 cf::face::set_smooth $idx, $smooth;
3231 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3444 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3232 } else { 3445 } else {
3233 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3446 error "smooth face '$info->{smooth}' not found for face '$face'";
3234 } 3447 }
3235 3448
3236 cf::cede_to_tick; 3449 cf::cede_to_tick;
3237 } 3450 }
3238 } 3451 }
3247 3460
3248 cf::anim::invalidate_all; # d'oh 3461 cf::anim::invalidate_all; # d'oh
3249 } 3462 }
3250 3463
3251 { 3464 {
3252 # TODO: for gcfclient pleasure, we should give resources
3253 # that gcfclient doesn't grok a >10000 face index.
3254 my $res = $facedata->{resource}; 3465 my $res = $facedata->{resource};
3255 3466
3256 while (my ($name, $info) = each %$res) { 3467 while (my ($name, $info) = each %$res) {
3257 if (defined $info->{type}) { 3468 if (defined $info->{type}) {
3258 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3469 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3259 my $data;
3260 3470
3261 if ($info->{type} & 1) { 3471 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}; 3472 cf::face::set_type $idx, $info->{type};
3276 } else { 3473 } else {
3277 $RESOURCE{$name} = $info; 3474 $RESOURCE{$name} = $info; # unused
3278 } 3475 }
3279 3476
3280 cf::cede_to_tick; 3477 cf::cede_to_tick;
3281 } 3478 }
3282 } 3479 }
3283 3480
3284 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3481 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3285 3482
3286 1 3483 1
3287} 3484}
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 3485
3309register_exticmd fx_want => sub { 3486register_exticmd fx_want => sub {
3310 my ($ns, $want) = @_; 3487 my ($ns, $want) = @_;
3311 3488
3312 while (my ($k, $v) = each %$want) { 3489 while (my ($k, $v) = each %$want) {
3351sub reload_treasures { 3528sub reload_treasures {
3352 load_resource_file "$DATADIR/treasures" 3529 load_resource_file "$DATADIR/treasures"
3353 or die "unable to load treasurelists\n"; 3530 or die "unable to load treasurelists\n";
3354} 3531}
3355 3532
3533sub reload_sound {
3534 trace "loading sound config from $DATADIR/sound\n";
3535
3536 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3537 or die "$DATADIR/sound $!";
3538
3539 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3540
3541 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3542 my $sound = $soundconf->{compat}[$_]
3543 or next;
3544
3545 my $face = cf::face::find "sound/$sound->[1]";
3546 cf::sound::set $sound->[0] => $face;
3547 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3548 }
3549
3550 while (my ($k, $v) = each %{$soundconf->{event}}) {
3551 my $face = cf::face::find "sound/$v";
3552 cf::sound::set $k => $face;
3553 }
3554}
3555
3356sub reload_resources { 3556sub reload_resources {
3357 warn "reloading resource files...\n"; 3557 trace "reloading resource files...\n";
3358 3558
3559 reload_exp_table;
3560 reload_materials;
3359 reload_facedata; 3561 reload_facedata;
3562 reload_sound;
3360 reload_archetypes; 3563 reload_archetypes;
3361 reload_regions; 3564 reload_regions;
3362 reload_treasures; 3565 reload_treasures;
3363 3566
3364 warn "finished reloading resource files\n"; 3567 trace "finished reloading resource files\n";
3365} 3568}
3366 3569
3367sub reload_config { 3570sub reload_config {
3368 open my $fh, "<:utf8", "$CONFDIR/config" 3571 trace "reloading config file...\n";
3369 or return;
3370 3572
3371 local $/; 3573 0 < aio_load "$CONFDIR/config", my $config
3372 *CFG = YAML::Load <$fh>; 3574 or die "$CONFDIR/config: $!";
3373 3575
3576 utf8::decode $config;
3577 *CFG = yaml_load $config;
3578
3374 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3579 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3375 3580
3376 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3581 $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}; 3582 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3378 3583
3379 if (exists $CFG{mlockall}) { 3584 if (exists $CFG{mlockall}) {
3403 seek $fh, 0, 0; 3608 seek $fh, 0, 0;
3404 print $fh $$; 3609 print $fh $$;
3405} 3610}
3406 3611
3407sub main_loop { 3612sub main_loop {
3408 warn "EV::loop starting\n"; 3613 trace "EV::loop starting\n";
3409 if (1) { 3614 if (1) {
3410 EV::loop; 3615 EV::loop;
3411 } 3616 }
3412 warn "EV::loop returned\n"; 3617 trace "EV::loop returned\n";
3413 goto &main_loop unless $REALLY_UNLOOP; 3618 goto &main_loop unless $REALLY_UNLOOP;
3414} 3619}
3415 3620
3416sub main { 3621sub main {
3417 cf::init_globals; # initialise logging 3622 cf::init_globals; # initialise logging
3418 3623
3419 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3624 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3420 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3625 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3421 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3626 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3422 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3627 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 3628
3429 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3629 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3430 3630
3431 # we must not ever block the main coroutine 3631 # we must not ever block the main coroutine
3432 local $Coro::idle = sub { 3632 local $Coro::idle = sub {
3438 }; 3638 };
3439 3639
3440 evthread_start IO::AIO::poll_fileno; 3640 evthread_start IO::AIO::poll_fileno;
3441 3641
3442 cf::sync_job { 3642 cf::sync_job {
3643 cf::incloader::init ();
3644
3645 cf::init_anim;
3646 cf::init_attackmess;
3647 cf::init_dynamic;
3648
3649 cf::load_settings;
3650
3443 reload_resources; 3651 reload_resources;
3444 reload_config; 3652 reload_config;
3445 db_init; 3653 db_init;
3446 3654
3447 cf::load_settings;
3448 cf::load_materials;
3449 cf::init_uuid; 3655 cf::init_uuid;
3450 cf::init_signals; 3656 cf::init_signals;
3451 cf::init_commands;
3452 cf::init_skills; 3657 cf::init_skills;
3453 3658
3454 cf::init_beforeplay; 3659 cf::init_beforeplay;
3455 3660
3456 atomic; 3661 atomic;
3461 3666
3462 # no (long-running) fork's whatsoever before this point(!) 3667 # no (long-running) fork's whatsoever before this point(!)
3463 use POSIX (); 3668 use POSIX ();
3464 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3669 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3465 3670
3466 (pop @POST_INIT)->(0) while @POST_INIT; 3671 cf::_post_init 0;
3467 }; 3672 };
3468 3673
3674 cf::object::thawer::errors_are_fatal 0;
3675 info "parse errors in files are no longer fatal from this point on.\n";
3676
3677 my $free_main; $free_main = EV::idle sub {
3678 undef $free_main;
3679 undef &main; # free gobs of memory :)
3680 };
3681
3469 main_loop; 3682 goto &main_loop;
3470} 3683}
3471 3684
3472############################################################################# 3685#############################################################################
3473# initialisation and cleanup 3686# initialisation and cleanup
3474 3687
3475# install some emergency cleanup handlers 3688# install some emergency cleanup handlers
3476BEGIN { 3689BEGIN {
3477 our %SIGWATCHER = (); 3690 our %SIGWATCHER = ();
3478 for my $signal (qw(INT HUP TERM)) { 3691 for my $signal (qw(INT HUP TERM)) {
3479 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3692 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3480 cf::cleanup "SIG$signal"; 3693 cf::cleanup "SIG$signal";
3481 }; 3694 };
3482 } 3695 }
3483} 3696}
3484 3697
3485sub write_runtime_sync { 3698sub write_runtime_sync {
3699 my $t0 = AE::time;
3700
3486 # first touch the runtime file to show we are still running: 3701 # first touch the runtime file to show we are still running:
3487 # the fsync below can take a very very long time. 3702 # the fsync below can take a very very long time.
3488 3703
3489 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3704 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3490 3705
3491 my $guard = cf::lock_acquire "write_runtime"; 3706 my $guard = cf::lock_acquire "write_runtime";
3492 3707
3493 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3708 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3494 or return; 3709 or return;
3495 3710
3496 my $value = $cf::RUNTIME + 90 + 10; 3711 my $value = $cf::RUNTIME + 90 + 10;
3497 # 10 is the runtime save interval, for a monotonic clock 3712 # 10 is the runtime save interval, for a monotonic clock
3498 # 60 allows for the watchdog to kill the server. 3713 # 60 allows for the watchdog to kill the server.
3511 or return; 3726 or return;
3512 3727
3513 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3728 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3514 and return; 3729 and return;
3515 3730
3516 warn "runtime file written.\n"; 3731 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3517 3732
3518 1 3733 1
3519} 3734}
3520 3735
3521our $uuid_lock; 3736our $uuid_lock;
3533 or return; 3748 or return;
3534 3749
3535 my $value = uuid_seq uuid_cur; 3750 my $value = uuid_seq uuid_cur;
3536 3751
3537 unless ($value) { 3752 unless ($value) {
3538 warn "cowardly refusing to write zero uuid value!\n"; 3753 info "cowardly refusing to write zero uuid value!\n";
3539 return; 3754 return;
3540 } 3755 }
3541 3756
3542 my $value = uuid_str $value + $uuid_skip; 3757 my $value = uuid_str $value + $uuid_skip;
3543 $uuid_skip = 0; 3758 $uuid_skip = 0;
3553 or return; 3768 or return;
3554 3769
3555 aio_rename "$uuid~", $uuid 3770 aio_rename "$uuid~", $uuid
3556 and return; 3771 and return;
3557 3772
3558 warn "uuid file written ($value).\n"; 3773 trace "uuid file written ($value).\n";
3559 3774
3560 1 3775 1
3561 3776
3562} 3777}
3563 3778
3569} 3784}
3570 3785
3571sub emergency_save() { 3786sub emergency_save() {
3572 my $freeze_guard = cf::freeze_mainloop; 3787 my $freeze_guard = cf::freeze_mainloop;
3573 3788
3574 warn "emergency_perl_save: enter\n"; 3789 info "emergency_perl_save: enter\n";
3790
3791 # this is a trade-off: we want to be very quick here, so
3792 # save all maps without fsync, and later call a global sync
3793 # (which in turn might be very very slow)
3794 local $USE_FSYNC = 0;
3575 3795
3576 cf::sync_job { 3796 cf::sync_job {
3577 # this is a trade-off: we want to be very quick here, so 3797 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 3798
3582 # use a peculiar iteration method to avoid tripping on perl 3799 # use a peculiar iteration method to avoid tripping on perl
3583 # refcount bugs in for. also avoids problems with players 3800 # refcount bugs in for. also avoids problems with players
3584 # and maps saved/destroyed asynchronously. 3801 # and maps saved/destroyed asynchronously.
3585 warn "emergency_perl_save: begin player save\n"; 3802 info "emergency_perl_save: begin player save\n";
3586 for my $login (keys %cf::PLAYER) { 3803 for my $login (keys %cf::PLAYER) {
3587 my $pl = $cf::PLAYER{$login} or next; 3804 my $pl = $cf::PLAYER{$login} or next;
3588 $pl->valid or next; 3805 $pl->valid or next;
3589 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3806 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3590 $pl->save; 3807 $pl->save;
3591 } 3808 }
3592 warn "emergency_perl_save: end player save\n"; 3809 info "emergency_perl_save: end player save\n";
3593 3810
3811 cf::write_runtime_sync; # external watchdog should not bark
3812
3594 warn "emergency_perl_save: begin map save\n"; 3813 info "emergency_perl_save: begin map save\n";
3595 for my $path (keys %cf::MAP) { 3814 for my $path (keys %cf::MAP) {
3596 my $map = $cf::MAP{$path} or next; 3815 my $map = $cf::MAP{$path} or next;
3597 $map->valid or next; 3816 $map->valid or next;
3598 $map->save; 3817 $map->save;
3599 } 3818 }
3600 warn "emergency_perl_save: end map save\n"; 3819 info "emergency_perl_save: end map save\n";
3601 3820
3821 cf::write_runtime_sync; # external watchdog should not bark
3822
3602 warn "emergency_perl_save: begin database checkpoint\n"; 3823 info "emergency_perl_save: begin database checkpoint\n";
3603 BDB::db_env_txn_checkpoint $DB_ENV; 3824 BDB::db_env_txn_checkpoint $DB_ENV;
3604 warn "emergency_perl_save: end database checkpoint\n"; 3825 info "emergency_perl_save: end database checkpoint\n";
3605 3826
3606 warn "emergency_perl_save: begin write uuid\n"; 3827 info "emergency_perl_save: begin write uuid\n";
3607 write_uuid_sync 1; 3828 write_uuid_sync 1;
3608 warn "emergency_perl_save: end write uuid\n"; 3829 info "emergency_perl_save: end write uuid\n";
3830
3831 cf::write_runtime_sync; # external watchdog should not bark
3832
3833 trace "emergency_perl_save: syncing database to disk";
3834 BDB::db_env_txn_checkpoint $DB_ENV;
3835
3836 info "emergency_perl_save: starting sync\n";
3837 IO::AIO::aio_sync sub {
3838 info "emergency_perl_save: finished sync\n";
3839 };
3840
3841 cf::write_runtime_sync; # external watchdog should not bark
3842
3843 trace "emergency_perl_save: flushing outstanding aio requests";
3844 while (IO::AIO::nreqs || BDB::nreqs) {
3845 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3846 }
3847
3848 cf::write_runtime_sync; # external watchdog should not bark
3609 }; 3849 };
3610 3850
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"; 3851 info "emergency_perl_save: leave\n";
3617} 3852}
3618 3853
3619sub post_cleanup { 3854sub post_cleanup {
3620 my ($make_core) = @_; 3855 my ($make_core) = @_;
3621 3856
3857 IO::AIO::flush;
3858
3622 warn Carp::longmess "post_cleanup backtrace" 3859 error Carp::longmess "post_cleanup backtrace"
3623 if $make_core; 3860 if $make_core;
3624 3861
3625 my $fh = pidfile; 3862 my $fh = pidfile;
3626 unlink $PIDFILE if <$fh> == $$; 3863 unlink $PIDFILE if <$fh> == $$;
3627} 3864}
3647 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3884 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3648 for my $name (keys %$leaf_symtab) { 3885 for my $name (keys %$leaf_symtab) {
3649 _gv_clear *{"$pkg$name"}; 3886 _gv_clear *{"$pkg$name"};
3650# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3887# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3651 } 3888 }
3652 warn "cleared package $pkg\n";#d#
3653} 3889}
3654 3890
3655sub do_reload_perl() { 3891sub do_reload_perl() {
3656 # can/must only be called in main 3892 # can/must only be called in main
3657 if ($Coro::current != $Coro::main) { 3893 unless (in_main) {
3658 warn "can only reload from main coroutine"; 3894 error "can only reload from main coroutine";
3659 return; 3895 return;
3660 } 3896 }
3661 3897
3662 return if $RELOAD++; 3898 return if $RELOAD++;
3663 3899
3664 my $t1 = EV::time; 3900 my $t1 = AE::time;
3665 3901
3666 while ($RELOAD) { 3902 while ($RELOAD) {
3667 warn "reloading..."; 3903 cf::get_slot 0.1, -1, "reload_perl";
3904 info "perl_reload: reloading...";
3668 3905
3669 warn "entering sync_job"; 3906 trace "perl_reload: entering sync_job";
3670 3907
3671 cf::sync_job { 3908 cf::sync_job {
3672 cf::write_runtime_sync; # external watchdog should not bark
3673 cf::emergency_save; 3909 #cf::emergency_save;
3674 cf::write_runtime_sync; # external watchdog should not bark
3675 3910
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"; 3911 trace "perl_reload: cancelling all extension coros";
3687 $_->cancel for values %EXT_CORO; 3912 $_->cancel for values %EXT_CORO;
3688 %EXT_CORO = (); 3913 %EXT_CORO = ();
3689 3914
3690 warn "removing commands"; 3915 trace "perl_reload: removing commands";
3691 %COMMAND = (); 3916 %COMMAND = ();
3692 3917
3693 warn "removing ext/exti commands"; 3918 trace "perl_reload: removing ext/exti commands";
3694 %EXTCMD = (); 3919 %EXTCMD = ();
3695 %EXTICMD = (); 3920 %EXTICMD = ();
3696 3921
3697 warn "unloading/nuking all extensions"; 3922 trace "perl_reload: unloading/nuking all extensions";
3698 for my $pkg (@EXTS) { 3923 for my $pkg (@EXTS) {
3699 warn "... unloading $pkg"; 3924 trace "... unloading $pkg";
3700 3925
3701 if (my $cb = $pkg->can ("unload")) { 3926 if (my $cb = $pkg->can ("unload")) {
3702 eval { 3927 eval {
3703 $cb->($pkg); 3928 $cb->($pkg);
3704 1 3929 1
3705 } or warn "$pkg unloaded, but with errors: $@"; 3930 } or error "$pkg unloaded, but with errors: $@";
3706 } 3931 }
3707 3932
3708 warn "... clearing $pkg"; 3933 trace "... clearing $pkg";
3709 clear_package $pkg; 3934 clear_package $pkg;
3710 } 3935 }
3711 3936
3712 warn "unloading all perl modules loaded from $LIBDIR"; 3937 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3713 while (my ($k, $v) = each %INC) { 3938 while (my ($k, $v) = each %INC) {
3714 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3939 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3715 3940
3716 warn "... unloading $k"; 3941 trace "... unloading $k";
3717 delete $INC{$k}; 3942 delete $INC{$k};
3718 3943
3719 $k =~ s/\.pm$//; 3944 $k =~ s/\.pm$//;
3720 $k =~ s/\//::/g; 3945 $k =~ s/\//::/g;
3721 3946
3724 } 3949 }
3725 3950
3726 clear_package $k; 3951 clear_package $k;
3727 } 3952 }
3728 3953
3729 warn "getting rid of safe::, as good as possible"; 3954 trace "perl_reload: getting rid of safe::, as good as possible";
3730 clear_package "safe::$_" 3955 clear_package "safe::$_"
3731 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3956 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3732 3957
3733 warn "unloading cf.pm \"a bit\""; 3958 trace "perl_reload: unloading cf.pm \"a bit\"";
3734 delete $INC{"cf.pm"}; 3959 delete $INC{"cf.pm"};
3735 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3960 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3736 3961
3737 # don't, removes xs symbols, too, 3962 # don't, removes xs symbols, too,
3738 # and global variables created in xs 3963 # and global variables created in xs
3739 #clear_package __PACKAGE__; 3964 #clear_package __PACKAGE__;
3740 3965
3741 warn "unload completed, starting to reload now"; 3966 info "perl_reload: unload completed, starting to reload now";
3742 3967
3743 warn "reloading cf.pm"; 3968 trace "perl_reload: reloading cf.pm";
3744 require cf; 3969 require cf;
3745 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3970 cf::_connect_to_perl_1;
3746 3971
3747 warn "loading config and database again"; 3972 trace "perl_reload: loading config and database again";
3748 cf::reload_config; 3973 cf::reload_config;
3749 3974
3750 warn "loading extensions"; 3975 trace "perl_reload: loading extensions";
3751 cf::load_extensions; 3976 cf::load_extensions;
3752 3977
3753 if ($REATTACH_ON_RELOAD) { 3978 if ($REATTACH_ON_RELOAD) {
3754 warn "reattaching attachments to objects/players"; 3979 trace "perl_reload: reattaching attachments to objects/players";
3755 _global_reattach; # objects, sockets 3980 _global_reattach; # objects, sockets
3756 warn "reattaching attachments to maps"; 3981 trace "perl_reload: reattaching attachments to maps";
3757 reattach $_ for values %MAP; 3982 reattach $_ for values %MAP;
3758 warn "reattaching attachments to players"; 3983 trace "perl_reload: reattaching attachments to players";
3759 reattach $_ for values %PLAYER; 3984 reattach $_ for values %PLAYER;
3760 } 3985 }
3761 3986
3762 warn "running post_init jobs"; 3987 cf::_post_init 1;
3763 (pop @POST_INIT)->(1) while @POST_INIT;
3764 3988
3765 warn "leaving sync_job"; 3989 trace "perl_reload: leaving sync_job";
3766 3990
3767 1 3991 1
3768 } or do { 3992 } or do {
3769 warn $@; 3993 error $@;
3770 cf::cleanup "error while reloading, exiting."; 3994 cf::cleanup "perl_reload: error, exiting.";
3771 }; 3995 };
3772 3996
3773 warn "reloaded";
3774 --$RELOAD; 3997 --$RELOAD;
3775 } 3998 }
3776 3999
3777 $t1 = EV::time - $t1; 4000 $t1 = AE::time - $t1;
3778 warn "reload completed in ${t1}s\n"; 4001 info "perl_reload: completed in ${t1}s\n";
3779}; 4002};
3780 4003
3781our $RELOAD_WATCHER; # used only during reload 4004our $RELOAD_WATCHER; # used only during reload
3782 4005
3783sub reload_perl() { 4006sub reload_perl() {
3785 # coro crashes during coro_state_free->destroy here. 4008 # coro crashes during coro_state_free->destroy here.
3786 4009
3787 $RELOAD_WATCHER ||= cf::async { 4010 $RELOAD_WATCHER ||= cf::async {
3788 Coro::AIO::aio_wait cache_extensions; 4011 Coro::AIO::aio_wait cache_extensions;
3789 4012
3790 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4013 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3791 do_reload_perl; 4014 do_reload_perl;
3792 undef $RELOAD_WATCHER; 4015 undef $RELOAD_WATCHER;
3793 }; 4016 };
3794 }; 4017 };
3795} 4018}
3804 reload_perl; 4027 reload_perl;
3805 }; 4028 };
3806 } 4029 }
3807}; 4030};
3808 4031
3809unshift @INC, $LIBDIR; 4032#############################################################################
3810 4033
3811my $bug_warning = 0; 4034my $bug_warning = 0;
3812 4035
3813our @WAIT_FOR_TICK; 4036our @WAIT_FOR_TICK;
3814our @WAIT_FOR_TICK_BEGIN; 4037our @WAIT_FOR_TICK_BEGIN;
3815 4038
3816sub wait_for_tick { 4039sub wait_for_tick() {
3817 return if tick_inhibit || $Coro::current == $Coro::main; 4040 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3818 4041
3819 my $signal = new Coro::Signal; 4042 my $signal = new Coro::Signal;
3820 push @WAIT_FOR_TICK, $signal; 4043 push @WAIT_FOR_TICK, $signal;
3821 $signal->wait; 4044 $signal->wait;
3822} 4045}
3823 4046
3824sub wait_for_tick_begin { 4047sub wait_for_tick_begin() {
3825 return if tick_inhibit || $Coro::current == $Coro::main; 4048 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3826 4049
3827 my $signal = new Coro::Signal; 4050 my $signal = new Coro::Signal;
3828 push @WAIT_FOR_TICK_BEGIN, $signal; 4051 push @WAIT_FOR_TICK_BEGIN, $signal;
3829 $signal->wait; 4052 $signal->wait;
3830} 4053}
3836 return; 4059 return;
3837 } 4060 }
3838 4061
3839 cf::server_tick; # one server iteration 4062 cf::server_tick; # one server iteration
3840 4063
4064 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4065
3841 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4066 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3842 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4067 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3843 Coro::async_pool { 4068 Coro::async_pool {
3844 $Coro::current->{desc} = "runtime saver"; 4069 $Coro::current->{desc} = "runtime saver";
3845 write_runtime_sync 4070 write_runtime_sync
3846 or warn "ERROR: unable to write runtime file: $!"; 4071 or error "ERROR: unable to write runtime file: $!";
3847 }; 4072 };
3848 } 4073 }
3849 4074
3850 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4075 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3851 $sig->send; 4076 $sig->send;
3859 4084
3860 if (0) { 4085 if (0) {
3861 if ($NEXT_TICK) { 4086 if ($NEXT_TICK) {
3862 my $jitter = $TICK_START - $NEXT_TICK; 4087 my $jitter = $TICK_START - $NEXT_TICK;
3863 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4088 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3864 warn "jitter $JITTER\n";#d# 4089 debug "jitter $JITTER\n";#d#
3865 } 4090 }
3866 } 4091 }
3867} 4092}
3868 4093
3869{ 4094{
3870 # configure BDB 4095 # configure BDB
3871 4096
3872 BDB::min_parallel 8; 4097 BDB::min_parallel 16;
3873 BDB::max_poll_reqs $TICK * 0.1; 4098 BDB::max_poll_reqs $TICK * 0.1;
3874 $AnyEvent::BDB::WATCHER->priority (1); 4099 $AnyEvent::BDB::WATCHER->priority (1);
3875 4100
3876 unless ($DB_ENV) { 4101 unless ($DB_ENV) {
3877 $DB_ENV = BDB::db_env_create; 4102 $DB_ENV = BDB::db_env_create;
3914 IO::AIO::min_parallel 8; 4139 IO::AIO::min_parallel 8;
3915 IO::AIO::max_poll_time $TICK * 0.1; 4140 IO::AIO::max_poll_time $TICK * 0.1;
3916 undef $AnyEvent::AIO::WATCHER; 4141 undef $AnyEvent::AIO::WATCHER;
3917} 4142}
3918 4143
3919my $_log_backtrace; 4144our $_log_backtrace;
4145our $_log_backtrace_last;
3920 4146
3921sub _log_backtrace { 4147sub _log_backtrace {
3922 my ($msg, @addr) = @_; 4148 my ($msg, @addr) = @_;
3923 4149
3924 $msg =~ s/\n//; 4150 $msg =~ s/\n$//;
3925 4151
4152 if ($_log_backtrace_last eq $msg) {
4153 LOG llevInfo, "[ABT] $msg\n";
4154 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3926 # limit the # of concurrent backtraces 4155 # limit the # of concurrent backtraces
3927 if ($_log_backtrace < 2) { 4156 } elsif ($_log_backtrace < 2) {
4157 $_log_backtrace_last = $msg;
3928 ++$_log_backtrace; 4158 ++$_log_backtrace;
3929 my $perl_bt = Carp::longmess $msg; 4159 my $perl_bt = Carp::longmess $msg;
3930 async { 4160 async {
3931 $Coro::current->{desc} = "abt $msg"; 4161 $Coro::current->{desc} = "abt $msg";
3932 4162
3952 LOG llevInfo, "[ABT] $_\n" for @bt; 4182 LOG llevInfo, "[ABT] $_\n" for @bt;
3953 --$_log_backtrace; 4183 --$_log_backtrace;
3954 }; 4184 };
3955 } else { 4185 } else {
3956 LOG llevInfo, "[ABT] $msg\n"; 4186 LOG llevInfo, "[ABT] $msg\n";
3957 LOG llevInfo, "[ABT] [suppressed]\n"; 4187 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3958 } 4188 }
3959} 4189}
3960 4190
3961# load additional modules 4191# load additional modules
3962require "cf/$_.pm" for @EXTRA_MODULES; 4192require "cf/$_.pm" for @EXTRA_MODULES;
4193cf::_connect_to_perl_2;
3963 4194
3964END { cf::emergency_save } 4195END { cf::emergency_save }
3965 4196
39661 41971
3967 4198

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines