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.480 by root, Thu Oct 8 05:09:43 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
… …
105our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
106our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
107our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
108our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
109 110
110our %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;
111 118
112our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
113our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
114our $NEXT_TICK; 121our $NEXT_TICK;
115our $USE_FSYNC = 1; # use fsync to write maps - default on 122our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
117our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
118our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
119our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
120our $DB_ENV; 127our $DB_ENV;
121 128
122our @EXTRA_MODULES = qw(pod mapscript); 129our @EXTRA_MODULES = qw(pod match mapscript incloader);
123 130
124our %CFG; 131our %CFG;
125 132
126our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
127our $RUNTIME; 134our $RUNTIME;
… …
161 168
162our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
163 170
164sub cf::map::normalise; 171sub cf::map::normalise;
165 172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
166############################################################################# 177#############################################################################
167 178
168%REFLECT = (); 179%REFLECT = ();
169for (@REFLECT) { 180for (@REFLECT) {
170 my $reflect = JSON::XS::decode_json $_; 181 my $reflect = JSON::XS::decode_json $_;
171 $REFLECT{$reflect->{class}} = $reflect; 182 $REFLECT{$reflect->{class}} = $reflect;
172} 183}
173 184
174# this is decidedly evil 185# this is decidedly evil
175$REFLECT{object}{flags} = [grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"}]; 186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
176 187
177############################################################################# 188#############################################################################
178 189
179=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
180 191
… …
222from wherever your confdir points to. 233from wherever your confdir points to.
223 234
224=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
225 236
226These 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
227returns 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
228per 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.
229 240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
230=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
231 247
232This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
233C<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
234that call. 250that call.
235 251
236=item %cf::REFLECT 252=item %cf::REFLECT
237 253
… …
241 257
242=back 258=back
243 259
244=cut 260=cut
245 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 "", @_ }
267
246$Coro::State::WARNHOOK = sub { 268$Coro::State::WARNHOOK = sub {
247 my $msg = join "", @_; 269 my $msg = join "", @_;
248 270
249 $msg .= "\n" 271 $msg .= "\n"
250 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
251 273
252 $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;
253 275
254 LOG llevError, $msg; 276 LOG llevWarn, $msg;
255}; 277};
256 278
257$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
258 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
259 281
260 warn Carp::longmess $_[0]; 282 error Carp::longmess $_[0];
261 283
262 if ($Coro::current == $Coro::main) {#d# 284 if (in_main) {#d#
263 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
264 return;#d# 286 return;#d#
265 }#d# 287 }#d#
266 288
267 # kill coroutine otherwise 289 # kill coroutine otherwise
268 Coro::terminate 290 Coro::terminate
… …
288)) { 310)) {
289 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
290} 312}
291 313
292$EV::DIED = sub { 314$EV::DIED = sub {
293 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
294}; 316};
295 317
296############################################################################# 318#############################################################################
297 319
298=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
… …
335our $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
336 358
337sub encode_json($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
338sub decode_json($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
339 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
340=item cf::post_init { BLOCK } 374=item cf::post_init { BLOCK }
341 375
342Execute the given codeblock, I<after> all extensions have been (re-)loaded, 376Execute the given codeblock, I<after> all extensions have been (re-)loaded,
343but I<before> the server starts ticking again. 377but I<before> the server starts ticking again.
344 378
345The cdoeblock will have a single boolean argument to indicate whether this 379The codeblock will have a single boolean argument to indicate whether this
346is a reload or not. 380is a reload or not.
347 381
348=cut 382=cut
349 383
350sub post_init(&) { 384sub post_init(&) {
351 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 }
352} 403}
353 404
354=item cf::lock_wait $string 405=item cf::lock_wait $string
355 406
356Wait until the given lock is available. See cf::lock_acquire. 407Wait until the given lock is available. See cf::lock_acquire.
… …
395} 446}
396 447
397=item cf::periodic $interval, $cb 448=item cf::periodic $interval, $cb
398 449
399Like 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
400get spread over timer. 451get spread over time.
401 452
402=cut 453=cut
403 454
404sub periodic($$) { 455sub periodic($$) {
405 my ($interval, $cb) = @_; 456 my ($interval, $cb) = @_;
… …
422 473
423=cut 474=cut
424 475
425our @SLOT_QUEUE; 476our @SLOT_QUEUE;
426our $SLOT_QUEUE; 477our $SLOT_QUEUE;
478our $SLOT_DECAY = 0.9;
427 479
428$SLOT_QUEUE->cancel if $SLOT_QUEUE; 480$SLOT_QUEUE->cancel if $SLOT_QUEUE;
429$SLOT_QUEUE = Coro::async { 481$SLOT_QUEUE = Coro::async {
430 $Coro::current->desc ("timeslot manager"); 482 $Coro::current->desc ("timeslot manager");
431 483
432 my $signal = new Coro::Signal; 484 my $signal = new Coro::Signal;
485 my $busy;
433 486
434 while () { 487 while () {
435 next_job: 488 next_job:
489
436 my $avail = cf::till_tick; 490 my $avail = cf::till_tick;
437 if ($avail > 0.01) { 491
438 for (0 .. $#SLOT_QUEUE) { 492 for (0 .. $#SLOT_QUEUE) {
439 if ($SLOT_QUEUE[$_][0] < $avail) { 493 if ($SLOT_QUEUE[$_][0] <= $avail) {
494 $busy = 0;
440 my $job = splice @SLOT_QUEUE, $_, 1, (); 495 my $job = splice @SLOT_QUEUE, $_, 1, ();
441 $job->[2]->send; 496 $job->[2]->send;
442 Coro::cede; 497 Coro::cede;
443 goto next_job; 498 goto next_job;
444 } 499 } else {
500 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
445 } 501 }
446 } 502 }
447 503
448 if (@SLOT_QUEUE) { 504 if (@SLOT_QUEUE) {
449 # 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
450 push @cf::WAIT_FOR_TICK, $signal; 506 push @cf::WAIT_FOR_TICK, $signal;
451 $signal->wait; 507 $signal->wait;
452 } else { 508 } else {
509 $busy = 0;
453 Coro::schedule; 510 Coro::schedule;
454 } 511 }
455 } 512 }
456}; 513};
457 514
458sub get_slot($;$$) { 515sub get_slot($;$$) {
459 return if tick_inhibit || $Coro::current == $Coro::main; 516 return if tick_inhibit || $Coro::current == $Coro::main;
460 517
461 my ($time, $pri, $name) = @_; 518 my ($time, $pri, $name) = @_;
462 519
463 $time = $TICK * .6 if $time > $TICK * .6; 520 $time = clamp $time, 0.01, $TICK * .6;
521
464 my $sig = new Coro::Signal; 522 my $sig = new Coro::Signal;
465 523
466 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 524 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
467 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 525 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
468 $SLOT_QUEUE->ready; 526 $SLOT_QUEUE->ready;
… …
494=cut 552=cut
495 553
496sub sync_job(&) { 554sub sync_job(&) {
497 my ($job) = @_; 555 my ($job) = @_;
498 556
499 if ($Coro::current == $Coro::main) { 557 if (in_main) {
500 my $time = EV::time; 558 my $time = AE::time;
501 559
502 # this is the main coro, too bad, we have to block 560 # this is the main coro, too bad, we have to block
503 # till the operation succeeds, freezing the server :/ 561 # till the operation succeeds, freezing the server :/
504 562
505 LOG llevError, Carp::longmess "sync job";#d# 563 #LOG llevError, Carp::longmess "sync job";#d#
506 564
507 my $freeze_guard = freeze_mainloop; 565 my $freeze_guard = freeze_mainloop;
508 566
509 my $busy = 1; 567 my $busy = 1;
510 my @res; 568 my @res;
511 569
512 (async { 570 (async {
513 $Coro::current->desc ("sync job coro"); 571 $Coro::current->desc ("sync job coro");
514 @res = eval { $job->() }; 572 @res = eval { $job->() };
515 warn $@ if $@; 573 error $@ if $@;
516 undef $busy; 574 undef $busy;
517 })->prio (Coro::PRIO_MAX); 575 })->prio (Coro::PRIO_MAX);
518 576
519 while ($busy) { 577 while ($busy) {
520 if (Coro::nready) { 578 if (Coro::nready) {
… …
522 } else { 580 } else {
523 EV::loop EV::LOOP_ONESHOT; 581 EV::loop EV::LOOP_ONESHOT;
524 } 582 }
525 } 583 }
526 584
527 my $time = EV::time - $time; 585 my $time = AE::time - $time;
528 586
529 $TICK_START += $time; # do not account sync jobs to server load 587 $TICK_START += $time; # do not account sync jobs to server load
530 588
531 wantarray ? @res : $res[0] 589 wantarray ? @res : $res[0]
532 } else { 590 } else {
… …
554 $EXT_CORO{$coro+0} = $coro; 612 $EXT_CORO{$coro+0} = $coro;
555 613
556 $coro 614 $coro
557} 615}
558 616
559=item fork_call { }, $args 617=item fork_call { }, @args
560 618
561Executes the given code block with the given arguments in a seperate 619Executes the given code block with the given arguments in a seperate
562process, returning the results. Everything must be serialisable with 620process, returning the results. Everything must be serialisable with
563Coro::Storable. May, of course, block. Note that the executed sub may 621Coro::Storable. May, of course, block. Note that the executed sub may
564never block itself or use any form of event handling. 622never block itself or use any form of event handling.
565 623
566=cut 624=cut
567 625
626sub post_fork {
627 reset_signals;
628}
629
568sub fork_call(&@) { 630sub fork_call(&@) {
569 my ($cb, @args) = @_; 631 my ($cb, @args) = @_;
570 632
571 # 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,
572 # otherwise perl prematurely frees the stuff :/ 634 # otherwise perl prematurely frees the stuff :/
573 # TODO: investigate and fix (likely this will be rather laborious) 635 # TODO: investigate and fix (likely this will be rather laborious)
574 636
575 my @res = Coro::Util::fork_eval { 637 my @res = Coro::Util::fork_eval {
576 reset_signals; 638 cf::post_fork;
577 &$cb 639 &$cb
578 }, @args; 640 } @args;
579 641
580 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 )
581} 654}
582 655
583=item $coin = coin_from_name $name 656=item $coin = coin_from_name $name
584 657
585=cut 658=cut
… …
622within each server. 695within each server.
623 696
624=cut 697=cut
625 698
626sub db_table($) { 699sub db_table($) {
700 cf::error "db_get called from main context"
701 if $Coro::current == $Coro::main;
702
627 my ($name) = @_; 703 my ($name) = @_;
628 my $db = BDB::db_create $DB_ENV; 704 my $db = BDB::db_create $DB_ENV;
629 705
630 eval { 706 eval {
631 $db->set_flags (BDB::CHKSUM); 707 $db->set_flags (BDB::CHKSUM);
… …
641} 717}
642 718
643our $DB; 719our $DB;
644 720
645sub db_init { 721sub db_init {
646 cf::sync_job {
647 $DB ||= db_table "db"; 722 $DB ||= db_table "db";
648 };
649} 723}
650 724
651sub db_get($$) { 725sub db_get($$) {
652 my $key = "$_[0]/$_[1]"; 726 my $key = "$_[0]/$_[1]";
653 727
654 cf::sync_job { 728 cf::error "db_get called from main context"
729 if $Coro::current == $Coro::main;
730
655 BDB::db_get $DB, undef, $key, my $data; 731 BDB::db_get $DB, undef, $key, my $data;
656 732
657 $! ? () 733 $! ? ()
658 : $data 734 : $data
659 }
660} 735}
661 736
662sub db_put($$$) { 737sub db_put($$$) {
663 BDB::dbreq_pri 4; 738 BDB::dbreq_pri 4;
664 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 739 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
720 795
721 my $t1 = Time::HiRes::time; 796 my $t1 = Time::HiRes::time;
722 my $data = $process->(\@data); 797 my $data = $process->(\@data);
723 my $t2 = Time::HiRes::time; 798 my $t2 = Time::HiRes::time;
724 799
725 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 800 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
726 801
727 db_put cache => "$id/data", $data; 802 db_put cache => "$id/data", $data;
728 db_put cache => "$id/md5" , $md5; 803 db_put cache => "$id/md5" , $md5;
729 db_put cache => "$id/meta", $meta; 804 db_put cache => "$id/meta", $meta;
730 805
… …
740 815
741=cut 816=cut
742 817
743sub datalog($@) { 818sub datalog($@) {
744 my ($type, %kv) = @_; 819 my ($type, %kv) = @_;
745 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 820 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
746} 821}
747 822
748=back 823=back
749 824
750=cut 825=cut
… …
945 1020
946 } elsif (exists $cb_id{$type}) { 1021 } elsif (exists $cb_id{$type}) {
947 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1022 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
948 1023
949 } elsif (ref $type) { 1024 } elsif (ref $type) {
950 warn "attaching objects not supported, ignoring.\n"; 1025 error "attaching objects not supported, ignoring.\n";
951 1026
952 } else { 1027 } else {
953 shift @arg; 1028 shift @arg;
954 warn "attach argument '$type' not supported, ignoring.\n"; 1029 error "attach argument '$type' not supported, ignoring.\n";
955 } 1030 }
956 } 1031 }
957} 1032}
958 1033
959sub _object_attach { 1034sub _object_attach {
… …
969 _attach $registry, $klass, @attach; 1044 _attach $registry, $klass, @attach;
970 } 1045 }
971 1046
972 $obj->{$name} = \%arg; 1047 $obj->{$name} = \%arg;
973 } else { 1048 } else {
974 warn "object uses attachment '$name' which is not available, postponing.\n"; 1049 info "object uses attachment '$name' which is not available, postponing.\n";
975 } 1050 }
976 1051
977 $obj->{_attachment}{$name} = undef; 1052 $obj->{_attachment}{$name} = undef;
978} 1053}
979 1054
… …
1038 1113
1039 for (@$callbacks) { 1114 for (@$callbacks) {
1040 eval { &{$_->[1]} }; 1115 eval { &{$_->[1]} };
1041 1116
1042 if ($@) { 1117 if ($@) {
1043 warn "$@";
1044 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1118 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1045 override; 1119 override;
1046 } 1120 }
1047 1121
1048 return 1 if $override; 1122 return 1 if $override;
1049 } 1123 }
… …
1128 for (@$attach) { 1202 for (@$attach) {
1129 my ($klass, @attach) = @$_; 1203 my ($klass, @attach) = @$_;
1130 _attach $registry, $klass, @attach; 1204 _attach $registry, $klass, @attach;
1131 } 1205 }
1132 } else { 1206 } else {
1133 warn "object uses attachment '$name' that is not available, postponing.\n"; 1207 info "object uses attachment '$name' that is not available, postponing.\n";
1134 } 1208 }
1135 } 1209 }
1136} 1210}
1137 1211
1138cf::attachable->attach ( 1212cf::attachable->attach (
… …
1165 my ($filename, $rdata, $objs) = @_; 1239 my ($filename, $rdata, $objs) = @_;
1166 1240
1167 sync_job { 1241 sync_job {
1168 if (length $$rdata) { 1242 if (length $$rdata) {
1169 utf8::decode (my $decname = $filename); 1243 utf8::decode (my $decname = $filename);
1170 warn sprintf "saving %s (%d,%d)\n", 1244 trace sprintf "saving %s (%d,%d)\n",
1171 $decname, length $$rdata, scalar @$objs; 1245 $decname, length $$rdata, scalar @$objs
1246 if $VERBOSE_IO;
1172 1247
1173 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1248 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1174 aio_chmod $fh, SAVE_MODE; 1249 aio_chmod $fh, SAVE_MODE;
1175 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1250 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1176 if ($cf::USE_FSYNC) { 1251 if ($cf::USE_FSYNC) {
… …
1198 aio_rename "$filename~", $filename; 1273 aio_rename "$filename~", $filename;
1199 1274
1200 $filename =~ s%/[^/]+$%%; 1275 $filename =~ s%/[^/]+$%%;
1201 aio_pathsync $filename if $cf::USE_FSYNC; 1276 aio_pathsync $filename if $cf::USE_FSYNC;
1202 } else { 1277 } else {
1203 warn "unable to save objects: $filename~: $!\n"; 1278 error "unable to save objects: $filename~: $!\n";
1204 } 1279 }
1205 } else { 1280 } else {
1206 aio_unlink $filename; 1281 aio_unlink $filename;
1207 aio_unlink "$filename.pst"; 1282 aio_unlink "$filename.pst";
1208 } 1283 }
… …
1232 my $st = eval { Coro::Storable::thaw $av }; 1307 my $st = eval { Coro::Storable::thaw $av };
1233 $av = $st->{objs}; 1308 $av = $st->{objs};
1234 } 1309 }
1235 1310
1236 utf8::decode (my $decname = $filename); 1311 utf8::decode (my $decname = $filename);
1237 warn sprintf "loading %s (%d,%d)\n", 1312 trace sprintf "loading %s (%d,%d)\n",
1238 $decname, length $data, scalar @{$av || []}; 1313 $decname, length $data, scalar @{$av || []}
1314 if $VERBOSE_IO;
1239 1315
1240 ($data, $av) 1316 ($data, $av)
1241} 1317}
1242 1318
1243=head2 COMMAND CALLBACKS 1319=head2 COMMAND CALLBACKS
… …
1302} 1378}
1303 1379
1304use File::Glob (); 1380use File::Glob ();
1305 1381
1306cf::player->attach ( 1382cf::player->attach (
1307 on_command => sub { 1383 on_unknown_command => sub {
1308 my ($pl, $name, $params) = @_; 1384 my ($pl, $name, $params) = @_;
1309 1385
1310 my $cb = $COMMAND{$name} 1386 my $cb = $COMMAND{$name}
1311 or return; 1387 or return;
1312 1388
… …
1335 1411
1336 $pl->ext_reply ($reply, @reply) 1412 $pl->ext_reply ($reply, @reply)
1337 if $reply; 1413 if $reply;
1338 1414
1339 } else { 1415 } else {
1340 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1416 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1341 } 1417 }
1342 1418
1343 cf::override; 1419 cf::override;
1344 }, 1420 },
1345); 1421);
… …
1356 1432
1357 $grp 1433 $grp
1358} 1434}
1359 1435
1360sub load_extensions { 1436sub load_extensions {
1437 info "loading extensions...";
1438
1361 cf::sync_job { 1439 cf::sync_job {
1362 my %todo; 1440 my %todo;
1363 1441
1364 for my $path (<$LIBDIR/*.ext>) { 1442 for my $path (<$LIBDIR/*.ext>) {
1365 next unless -r $path; 1443 next unless -r $path;
… …
1383 1461
1384 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1462 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1385 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1463 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1386 1464
1387 $ext{source} = 1465 $ext{source} =
1388 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1466 "package $pkg; use common::sense;\n"
1389 . "#line 1 \"$path\"\n{\n" 1467 . "#line 1 \"$path\"\n{\n"
1390 . $source 1468 . $source
1391 . "\n};\n1"; 1469 . "\n};\n1";
1392 1470
1393 $todo{$base} = \%ext; 1471 $todo{$base} = \%ext;
1394 } 1472 }
1395 1473
1474 my $pass = 0;
1396 my %done; 1475 my %done;
1397 while (%todo) { 1476 while (%todo) {
1398 my $progress; 1477 my $progress;
1399 1478
1479 ++$pass;
1480
1481 ext:
1400 while (my ($k, $v) = each %todo) { 1482 while (my ($k, $v) = each %todo) {
1401 for (split /,\s*/, $v->{meta}{depends}) { 1483 for (split /,\s*/, $v->{meta}{depends}) {
1402 goto skip 1484 next ext
1403 unless exists $done{$_}; 1485 unless exists $done{$_};
1404 } 1486 }
1405 1487
1406 warn "... loading '$k' into '$v->{pkg}'\n"; 1488 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1407 1489
1408 unless (eval $v->{source}) { 1490 my $active = eval $v->{source};
1491
1492 if (length $@) {
1409 my $msg = $@ ? "$v->{path}: $@\n" 1493 error "$v->{path}: $@\n";
1410 : "$v->{base}: extension inactive.\n";
1411 1494
1412 if (exists $v->{meta}{mandatory}) {
1413 warn $msg;
1414 cf::cleanup "mandatory extension failed to load, exiting."; 1495 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1415 } 1496 if exists $v->{meta}{mandatory};
1416 1497
1417 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;
1418 } 1507 }
1419
1420 $done{$k} = delete $todo{$k};
1421 push @EXTS, $v->{pkg};
1422 $progress = 1;
1423 } 1508 }
1424 1509
1425 skip: 1510 unless ($progress) {
1426 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1511 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1427 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 }
1428 } 1518 }
1429 }; 1519 };
1430} 1520}
1431 1521
1432############################################################################# 1522#############################################################################
… …
1516 $cf::PLAYER{$login} = $pl 1606 $cf::PLAYER{$login} = $pl
1517 } 1607 }
1518 } 1608 }
1519} 1609}
1520 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
1521sub save($) { 1624sub save($) {
1522 my ($pl) = @_; 1625 my ($pl) = @_;
1523 1626
1524 return if $pl->{deny_save}; 1627 return if $pl->{deny_save};
1525 1628
… …
1530 1633
1531 aio_mkdir playerdir $pl, 0770; 1634 aio_mkdir playerdir $pl, 0770;
1532 $pl->{last_save} = $cf::RUNTIME; 1635 $pl->{last_save} = $cf::RUNTIME;
1533 1636
1534 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];
1535 1641
1536 $pl->save_pl ($path); 1642 $pl->save_pl ($path);
1537 cf::cede_to_tick; 1643 cf::cede_to_tick;
1538} 1644}
1539 1645
… …
1573 my $name = $pl->ob->name; 1679 my $name = $pl->ob->name;
1574 1680
1575 $pl->{deny_save} = 1; 1681 $pl->{deny_save} = 1;
1576 $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
1577 1683
1578 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1684 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1579 $pl->deactivate; 1685 $pl->deactivate;
1686
1580 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;
1581 $pl->ob->check_score;
1582 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1688 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1689 ext::highscore::check ($pl->ob);
1690
1583 $pl->ns->destroy if $pl->ns; 1691 $pl->ns->destroy if $pl->ns;
1584 1692
1585 my $path = playerdir $pl; 1693 my $path = playerdir $pl;
1586 my $temp = "$path~$cf::RUNTIME~deleting~"; 1694 my $temp = "$path~$cf::RUNTIME~deleting~";
1587 aio_rename $path, $temp; 1695 aio_rename $path, $temp;
… …
1641 \@logins 1749 \@logins
1642} 1750}
1643 1751
1644=item $player->maps 1752=item $player->maps
1645 1753
1754=item cf::player::maps $login
1755
1646Returns an arrayref of map paths that are private for this 1756Returns an arrayref of map paths that are private for this
1647player. May block. 1757player. May block.
1648 1758
1649=cut 1759=cut
1650 1760
… …
1712=cut 1822=cut
1713 1823
1714sub find_by_path($) { 1824sub find_by_path($) {
1715 my ($path) = @_; 1825 my ($path) = @_;
1716 1826
1827 $path =~ s/^~[^\/]*//; # skip ~login
1828
1717 my ($match, $specificity); 1829 my ($match, $specificity);
1718 1830
1719 for my $region (list) { 1831 for my $region (list) {
1720 if ($region->{match} && $path =~ $region->{match}) { 1832 if ($region->{match} && $path =~ $region->{match}) {
1721 ($match, $specificity) = ($region, $region->specificity) 1833 ($match, $specificity) = ($region, $region->specificity)
… …
1751 1863
1752 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
1753 1865
1754 # mit "rum" bekleckern, nicht 1866 # mit "rum" bekleckern, nicht
1755 $self->_create_random_map ( 1867 $self->_create_random_map (
1756 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1868 $rmp, $rmp->{total_map_hp},
1757 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1758 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1759 $rmp->{exit_on_final_map},
1760 $rmp->{xsize}, $rmp->{ysize},
1761 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1762 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1763 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1764 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1765 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1766 (cf::region::find $rmp->{region}), $rmp->{custom} 1869 (cf::region::find $rmp->{region})
1767 ) 1870 )
1768} 1871}
1769 1872
1770=item cf::map->register ($regex, $prio) 1873=item cf::map->register ($regex, $prio)
1771 1874
… …
1777 1880
1778sub register { 1881sub register {
1779 my (undef, $regex, $prio) = @_; 1882 my (undef, $regex, $prio) = @_;
1780 my $pkg = caller; 1883 my $pkg = caller;
1781 1884
1782 no strict;
1783 push @{"$pkg\::ISA"}, __PACKAGE__; 1885 push @{"$pkg\::ISA"}, __PACKAGE__;
1784 1886
1785 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1887 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1786} 1888}
1787 1889
1788# also paths starting with '/' 1890# also paths starting with '/'
1789$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1891$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1790 1892
1791sub thawer_merge { 1893sub thawer_merge {
1792 my ($self, $merge) = @_; 1894 my ($self, $merge) = @_;
1793 1895
1794 # we have to keep some variables in memory intact 1896 # we have to keep some variables in memory intact
… …
1799} 1901}
1800 1902
1801sub normalise { 1903sub normalise {
1802 my ($path, $base) = @_; 1904 my ($path, $base) = @_;
1803 1905
1804 $path = "$path"; # make sure its a string 1906 $path = "$path"; # make sure it's a string
1805 1907
1806 $path =~ s/\.map$//; 1908 $path =~ s/\.map$//;
1807 1909
1808 # map plan: 1910 # map plan:
1809 # 1911 #
… …
1824 $base =~ s{[^/]+/?$}{}; 1926 $base =~ s{[^/]+/?$}{};
1825 $path = "$base/$path"; 1927 $path = "$base/$path";
1826 } 1928 }
1827 1929
1828 for ($path) { 1930 for ($path) {
1829 redo if s{//}{/};
1830 redo if s{/\.?/}{/}; 1931 redo if s{/\.?/}{/};
1831 redo if s{/[^/]+/\.\./}{/}; 1932 redo if s{/[^/]+/\.\./}{/};
1832 } 1933 }
1833 1934
1834 $path 1935 $path
… …
1848 $self->init; # pass $1 etc. 1949 $self->init; # pass $1 etc.
1849 return $self; 1950 return $self;
1850 } 1951 }
1851 } 1952 }
1852 1953
1853 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1954 Carp::cluck "unable to resolve path '$path' (base '$base')";
1854 () 1955 ()
1855} 1956}
1856 1957
1857sub init { 1958sub init {
1858 my ($self) = @_; 1959 my ($self) = @_;
… …
1980} 2081}
1981 2082
1982sub find; 2083sub find;
1983sub find { 2084sub find {
1984 my ($path, $origin) = @_; 2085 my ($path, $origin) = @_;
2086
2087 cf::cede_to_tick;
1985 2088
1986 $path = normalise $path, $origin && $origin->path; 2089 $path = normalise $path, $origin && $origin->path;
1987 2090
1988 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2091 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1989 my $guard2 = cf::lock_acquire "map_find:$path"; 2092 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2008 2111
2009 $cf::MAP{$path} = $map 2112 $cf::MAP{$path} = $map
2010 } 2113 }
2011} 2114}
2012 2115
2013sub pre_load { } 2116sub pre_load { }
2014sub post_load { } 2117#sub post_load { } # XS
2015 2118
2016sub load { 2119sub load {
2017 my ($self) = @_; 2120 my ($self) = @_;
2018 2121
2019 local $self->{deny_reset} = 1; # loading can take a long time 2122 local $self->{deny_reset} = 1; # loading can take a long time
… …
2074 2177
2075 $self->in_memory (cf::MAP_ACTIVE); 2178 $self->in_memory (cf::MAP_ACTIVE);
2076 } 2179 }
2077 2180
2078 $self->post_load; 2181 $self->post_load;
2079}
2080 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
2081sub customise_for { 2189sub customise_for {
2082 my ($self, $ob) = @_; 2190 my ($self, $ob) = @_;
2083 2191
2084 return find "~" . $ob->name . "/" . $self->{path} 2192 return find "~" . $ob->name . "/" . $self->{path}
2085 if $self->per_player; 2193 if $self->per_player;
… …
2101 or next; 2209 or next;
2102 $neigh = find $neigh, $map 2210 $neigh = find $neigh, $map
2103 or next; 2211 or next;
2104 $neigh->load; 2212 $neigh->load;
2105 2213
2214 # now find the diagonal neighbours
2106 push @neigh, 2215 push @neigh,
2107 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2216 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2108 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2217 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2109 } 2218 }
2110 2219
… …
2117} 2226}
2118 2227
2119sub find_sync { 2228sub find_sync {
2120 my ($path, $origin) = @_; 2229 my ($path, $origin) = @_;
2121 2230
2122 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
2123} 2235}
2124 2236
2125sub do_load_sync { 2237sub do_load_sync {
2126 my ($map) = @_; 2238 my ($map) = @_;
2127 2239
2128 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2240 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2129 if $Coro::current == $Coro::main; 2241 if $Coro::current == $Coro::main;
2130 2242
2131 cf::sync_job { $map->load }; 2243 $map->load;
2132} 2244}
2133 2245
2134our %MAP_PREFETCH; 2246our %MAP_PREFETCH;
2135our $MAP_PREFETCHER = undef; 2247our $MAP_PREFETCHER = undef;
2136 2248
… …
2162 $MAP_PREFETCHER->prio (6); 2274 $MAP_PREFETCHER->prio (6);
2163 2275
2164 () 2276 ()
2165} 2277}
2166 2278
2279# common code, used by both ->save and ->swapout
2167sub save { 2280sub _save {
2168 my ($self) = @_; 2281 my ($self) = @_;
2169
2170 my $lock = cf::lock_acquire "map_data:$self->{path}";
2171 2282
2172 $self->{last_save} = $cf::RUNTIME; 2283 $self->{last_save} = $cf::RUNTIME;
2173 2284
2174 return unless $self->dirty; 2285 return unless $self->dirty;
2175 2286
… …
2195 } else { 2306 } else {
2196 $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);
2197 } 2308 }
2198} 2309}
2199 2310
2311sub save {
2312 my ($self) = @_;
2313
2314 my $lock = cf::lock_acquire "map_data:$self->{path}";
2315
2316 $self->_save;
2317}
2318
2200sub swap_out { 2319sub swap_out {
2201 my ($self) = @_; 2320 my ($self) = @_;
2202 2321
2203 # save first because save cedes
2204 $self->save;
2205
2206 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2322 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207 2323
2208 return if $self->players;
2209 return if $self->in_memory != cf::MAP_ACTIVE; 2324 return if $self->in_memory != cf::MAP_ACTIVE;
2210 return if $self->{deny_save}; 2325 return if $self->{deny_save};
2326 return if $self->players;
2211 2327
2328 # first deactivate the map and "unlink" it from the core
2329 $self->deactivate;
2330 $_->clear_links_to ($self) for values %cf::MAP;
2212 $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};
2213 2378
2214 $self->deactivate; 2379 $self->deactivate;
2215 $_->clear_links_to ($self) for values %cf::MAP; 2380 $_->clear_links_to ($self) for values %cf::MAP;
2216 $self->clear; 2381 $self->clear;
2217}
2218
2219sub reset_at {
2220 my ($self) = @_;
2221
2222 # TODO: safety, remove and allow resettable per-player maps
2223 return 1e99 if $self->{deny_reset};
2224
2225 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2226 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2227
2228 $time + $to
2229}
2230
2231sub should_reset {
2232 my ($self) = @_;
2233
2234 $self->reset_at <= $cf::RUNTIME
2235}
2236
2237sub reset {
2238 my ($self) = @_;
2239
2240 my $lock = cf::lock_acquire "map_data:$self->{path}";
2241
2242 return if $self->players;
2243
2244 warn "resetting map ", $self->path, "\n";
2245
2246 $self->in_memory (cf::MAP_SWAPPED);
2247
2248 # need to save uniques path
2249 unless ($self->{deny_save}) {
2250 my $uniq = $self->uniq_path; utf8::encode $uniq;
2251
2252 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2253 if $uniq;
2254 }
2255
2256 delete $cf::MAP{$self->path};
2257
2258 $self->deactivate;
2259 $_->clear_links_to ($self) for values %cf::MAP;
2260 $self->clear;
2261 2382
2262 $self->unlink_save; 2383 $self->unlink_save;
2263 $self->destroy; 2384 $self->destroy;
2264} 2385}
2265 2386
… …
2273 2394
2274 delete $cf::MAP{$self->path}; 2395 delete $cf::MAP{$self->path};
2275 2396
2276 $self->unlink_save; 2397 $self->unlink_save;
2277 2398
2278 bless $self, "cf::map"; 2399 bless $self, "cf::map::wrap";
2279 delete $self->{deny_reset}; 2400 delete $self->{deny_reset};
2280 $self->{deny_save} = 1; 2401 $self->{deny_save} = 1;
2281 $self->reset_timeout (1); 2402 $self->reset_timeout (1);
2282 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2403 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2283 2404
… …
2340 : normalise $_ 2461 : normalise $_
2341 } @{ aio_readdir $UNIQUEDIR or [] } 2462 } @{ aio_readdir $UNIQUEDIR or [] }
2342 ] 2463 ]
2343} 2464}
2344 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
2345=back 2498=back
2346 2499
2347=head3 cf::object 2500=head3 cf::object
2348 2501
2349=cut 2502=cut
… …
2481 2634
2482Freezes 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}>).
2483 2636
2484The 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.
2485for 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,
2486though, 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
2487map. 2640map.
2488 2641
2489Will never block. 2642Will never block.
2490 2643
2491=item $player_object->leave_link ($map, $x, $y) 2644=item $player_object->leave_link ($map, $x, $y)
… …
2512sub cf::object::player::enter_link { 2665sub cf::object::player::enter_link {
2513 my ($self) = @_; 2666 my ($self) = @_;
2514 2667
2515 $self->deactivate_recursive; 2668 $self->deactivate_recursive;
2516 2669
2670 ++$self->{_link_recursion};
2671
2517 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2672 return if UNIVERSAL::isa $self->map, "ext::map_link";
2518 2673
2519 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2674 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2520 if $self->map && $self->map->{path} ne "{link}"; 2675 if $self->map && $self->map->{path} ne "{link}";
2521 2676
2522 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2677 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2523} 2678}
2524 2679
2525sub cf::object::player::leave_link { 2680sub cf::object::player::leave_link {
2526 my ($self, $map, $x, $y) = @_; 2681 my ($self, $map, $x, $y) = @_;
2527 2682
… …
2544 ($x, $y) = (-1, -1) 2699 ($x, $y) = (-1, -1)
2545 unless (defined $x) && (defined $y); 2700 unless (defined $x) && (defined $y);
2546 2701
2547 # use -1 or undef as default coordinates, not 0, 0 2702 # use -1 or undef as default coordinates, not 0, 0
2548 ($x, $y) = ($map->enter_x, $map->enter_y) 2703 ($x, $y) = ($map->enter_x, $map->enter_y)
2549 if $x <=0 && $y <= 0; 2704 if $x <= 0 && $y <= 0;
2550 2705
2551 $map->load; 2706 $map->load;
2552 $map->load_neighbours; 2707 $map->load_neighbours;
2553 2708
2554 return unless $self->contr->active; 2709 return unless $self->contr->active;
2555 2710
2556 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2711 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2557 $self->enter_map ($map, $x, $y); 2712 if ($self->enter_map ($map, $x, $y)) {
2558 2713 # entering was successful
2714 delete $self->{_link_recursion};
2559 # only activate afterwards, to support waiting in hooks 2715 # only activate afterwards, to support waiting in hooks
2560 $self->activate_recursive; 2716 $self->activate_recursive;
2561} 2717 }
2562 2718
2719}
2720
2563=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)]])
2564 2722
2565Moves 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
2566her, loading and preparing them map, calling the provided $check callback 2724her, loading and preparing them map, calling the provided $check callback
2567that 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
2568the 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
… …
2575 2733
2576our $GOTOGEN; 2734our $GOTOGEN;
2577 2735
2578sub cf::object::player::goto { 2736sub cf::object::player::goto {
2579 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 }
2580 2744
2581 # 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
2582 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2746 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2583 2747
2584 $self->enter_link; 2748 $self->enter_link;
… …
2608 my $map = eval { 2772 my $map = eval {
2609 my $map = defined $path ? cf::map::find $path : undef; 2773 my $map = defined $path ? cf::map::find $path : undef;
2610 2774
2611 if ($map) { 2775 if ($map) {
2612 $map = $map->customise_for ($self); 2776 $map = $map->customise_for ($self);
2613 $map = $check->($map) if $check && $map; 2777 $map = $check->($map, $x, $y, $self) if $check && $map;
2614 } else { 2778 } else {
2615 $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);
2616 } 2780 }
2617 2781
2618 $map 2782 $map
… …
2626 if ($gen == $self->{_goto_generation}) { 2790 if ($gen == $self->{_goto_generation}) {
2627 delete $self->{_goto_generation}; 2791 delete $self->{_goto_generation};
2628 $self->leave_link ($map, $x, $y); 2792 $self->leave_link ($map, $x, $y);
2629 } 2793 }
2630 2794
2631 $done->() if $done; 2795 $done->($self) if $done;
2632 })->prio (1); 2796 })->prio (1);
2633} 2797}
2634 2798
2635=item $player_object->enter_exit ($exit_object) 2799=item $player_object->enter_exit ($exit_object)
2636 2800
… …
2729 $self->message ("Something went wrong deep within the deliantra server. " 2893 $self->message ("Something went wrong deep within the deliantra server. "
2730 . "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. "
2731 . "Please report this to the dungeon master!", 2895 . "Please report this to the dungeon master!",
2732 cf::NDI_UNIQUE | cf::NDI_RED); 2896 cf::NDI_UNIQUE | cf::NDI_RED);
2733 2897
2734 warn "ERROR in enter_exit: $@"; 2898 error "ERROR in enter_exit: $@";
2735 $self->leave_link; 2899 $self->leave_link;
2736 } 2900 }
2737 })->prio (1); 2901 })->prio (1);
2738} 2902}
2739 2903
… …
2751sub cf::client::send_drawinfo { 2915sub cf::client::send_drawinfo {
2752 my ($self, $text, $flags) = @_; 2916 my ($self, $text, $flags) = @_;
2753 2917
2754 utf8::encode $text; 2918 utf8::encode $text;
2755 $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);
2756} 2945}
2757 2946
2758=item $client->send_msg ($channel, $msg, $color, [extra...]) 2947=item $client->send_msg ($channel, $msg, $color, [extra...])
2759 2948
2760Send 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
… …
2764 2953
2765=cut 2954=cut
2766 2955
2767# non-persistent channels (usually the info channel) 2956# non-persistent channels (usually the info channel)
2768our %CHANNEL = ( 2957our %CHANNEL = (
2958 "c/motd" => {
2959 id => "infobox",
2960 title => "MOTD",
2961 reply => undef,
2962 tooltip => "The message of the day",
2963 },
2769 "c/identify" => { 2964 "c/identify" => {
2770 id => "infobox", 2965 id => "infobox",
2771 title => "Identify", 2966 title => "Identify",
2772 reply => undef, 2967 reply => undef,
2773 tooltip => "Items recently identified", 2968 tooltip => "Items recently identified",
… …
2775 "c/examine" => { 2970 "c/examine" => {
2776 id => "infobox", 2971 id => "infobox",
2777 title => "Examine", 2972 title => "Examine",
2778 reply => undef, 2973 reply => undef,
2779 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",
2780 }, 2981 },
2781 "c/book" => { 2982 "c/book" => {
2782 id => "infobox", 2983 id => "infobox",
2783 title => "Book", 2984 title => "Book",
2784 reply => undef, 2985 reply => undef,
… …
2900 my $pkt = "msg " 3101 my $pkt = "msg "
2901 . $self->{json_coder}->encode ( 3102 . $self->{json_coder}->encode (
2902 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3103 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2903 ); 3104 );
2904 3105
2905 # try lzf for large packets
2906 $pkt = "lzf " . Compress::LZF::compress $pkt
2907 if 1024 <= length $pkt and $self->{can_lzf};
2908
2909 # split very large packets
2910 if (8192 < length $pkt and $self->{can_lzf}) {
2911 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2912 $pkt = "frag";
2913 }
2914
2915 $self->send_packet ($pkt); 3106 $self->send_big_packet ($pkt);
2916} 3107}
2917 3108
2918=item $client->ext_msg ($type, @msg) 3109=item $client->ext_msg ($type, @msg)
2919 3110
2920Sends an ext event to the client. 3111Sends an ext event to the client.
… …
2923 3114
2924sub cf::client::ext_msg($$@) { 3115sub cf::client::ext_msg($$@) {
2925 my ($self, $type, @msg) = @_; 3116 my ($self, $type, @msg) = @_;
2926 3117
2927 if ($self->extcmd == 2) { 3118 if ($self->extcmd == 2) {
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3119 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2929 } elsif ($self->extcmd == 1) { # TODO: remove 3120 } elsif ($self->extcmd == 1) { # TODO: remove
2930 push @msg, msgtype => "event_$type"; 3121 push @msg, msgtype => "event_$type";
2931 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3122 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2932 } 3123 }
2933} 3124}
2934 3125
2935=item $client->ext_reply ($msgid, @msg) 3126=item $client->ext_reply ($msgid, @msg)
2936 3127
… …
2940 3131
2941sub cf::client::ext_reply($$@) { 3132sub cf::client::ext_reply($$@) {
2942 my ($self, $id, @msg) = @_; 3133 my ($self, $id, @msg) = @_;
2943 3134
2944 if ($self->extcmd == 2) { 3135 if ($self->extcmd == 2) {
2945 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3136 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2946 } elsif ($self->extcmd == 1) { 3137 } elsif ($self->extcmd == 1) {
2947 #TODO: version 1, remove 3138 #TODO: version 1, remove
2948 unshift @msg, msgtype => "reply", msgid => $id; 3139 unshift @msg, msgtype => "reply", msgid => $id;
2949 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3140 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2950 } 3141 }
2951} 3142}
2952 3143
2953=item $success = $client->query ($flags, "text", \&cb) 3144=item $success = $client->query ($flags, "text", \&cb)
2954 3145
… …
3025 3216
3026 $ns->ext_reply ($reply, @reply) 3217 $ns->ext_reply ($reply, @reply)
3027 if $reply; 3218 if $reply;
3028 3219
3029 } else { 3220 } else {
3030 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";
3031 } 3222 }
3032 3223
3033 cf::override; 3224 cf::override;
3034 }, 3225 },
3035); 3226);
… …
3055 3246
3056 $coro 3247 $coro
3057} 3248}
3058 3249
3059cf::client->attach ( 3250cf::client->attach (
3060 on_destroy => sub { 3251 on_client_destroy => sub {
3061 my ($ns) = @_; 3252 my ($ns) = @_;
3062 3253
3063 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3254 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3064 }, 3255 },
3065); 3256);
… …
3081our $safe_hole = new Safe::Hole; 3272our $safe_hole = new Safe::Hole;
3082 3273
3083$SIG{FPE} = 'IGNORE'; 3274$SIG{FPE} = 'IGNORE';
3084 3275
3085$safe->permit_only (Opcode::opset qw( 3276$safe->permit_only (Opcode::opset qw(
3086 :base_core :base_mem :base_orig :base_math 3277 :base_core :base_mem :base_orig :base_math :base_loop
3087 grepstart grepwhile mapstart mapwhile 3278 grepstart grepwhile mapstart mapwhile
3088 sort time 3279 sort time
3089)); 3280));
3090 3281
3091# here we export the classes and methods available to script code 3282# here we export the classes and methods available to script code
… …
3116 decrease split destroy change_exp value msg lore send_msg)], 3307 decrease split destroy change_exp value msg lore send_msg)],
3117 ["cf::object::player" => qw(player)], 3308 ["cf::object::player" => qw(player)],
3118 ["cf::player" => qw(peaceful send_msg)], 3309 ["cf::player" => qw(peaceful send_msg)],
3119 ["cf::map" => qw(trigger)], 3310 ["cf::map" => qw(trigger)],
3120) { 3311) {
3121 no strict 'refs';
3122 my ($pkg, @funs) = @$_; 3312 my ($pkg, @funs) = @$_;
3123 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3313 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3124 for @funs; 3314 for @funs;
3125} 3315}
3126 3316
… …
3143 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3333 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3144 $qcode =~ s/\n/\\n/g; 3334 $qcode =~ s/\n/\\n/g;
3145 3335
3146 %vars = (_dummy => 0) unless %vars; 3336 %vars = (_dummy => 0) unless %vars;
3147 3337
3338 my @res;
3148 local $_; 3339 local $_;
3149 local @safe::cf::_safe_eval_args = values %vars;
3150 3340
3151 my $eval = 3341 my $eval =
3152 "do {\n" 3342 "do {\n"
3153 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3343 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3154 . "#line 0 \"{$qcode}\"\n" 3344 . "#line 0 \"{$qcode}\"\n"
3155 . $code 3345 . $code
3156 . "\n}" 3346 . "\n}"
3157 ; 3347 ;
3158 3348
3349 if ($CFG{safe_eval}) {
3159 sub_generation_inc; 3350 sub_generation_inc;
3351 local @safe::cf::_safe_eval_args = values %vars;
3160 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3352 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3161 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 }
3162 3358
3163 if ($@) { 3359 if ($@) {
3164 warn "$@"; 3360 warn "$@",
3165 warn "while executing safe code '$code'\n"; 3361 "while executing safe code '$code'\n",
3166 warn "with arguments " . (join " ", %vars) . "\n"; 3362 "with arguments " . (join " ", %vars) . "\n";
3167 } 3363 }
3168 3364
3169 wantarray ? @res : $res[0] 3365 wantarray ? @res : $res[0]
3170} 3366}
3171 3367
… …
3185=cut 3381=cut
3186 3382
3187sub register_script_function { 3383sub register_script_function {
3188 my ($fun, $cb) = @_; 3384 my ($fun, $cb) = @_;
3189 3385
3190 no strict 'refs'; 3386 $fun = "safe::$fun" if $CFG{safe_eval};
3191 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3387 *$fun = $safe_hole->wrap ($cb);
3192} 3388}
3193 3389
3194=back 3390=back
3195 3391
3196=cut 3392=cut
… …
3205 # for this (global event?) 3401 # for this (global event?)
3206 %ext::player_env::MUSIC_FACE_CACHE = (); 3402 %ext::player_env::MUSIC_FACE_CACHE = ();
3207 3403
3208 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3404 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3209 3405
3210 warn "loading facedata from $path\n"; 3406 trace "loading facedata from $path\n";
3211 3407
3212 my $facedata;
3213 0 < aio_load $path, $facedata 3408 0 < aio_load $path, my $facedata
3214 or die "$path: $!"; 3409 or die "$path: $!";
3215 3410
3216 $facedata = Coro::Storable::thaw $facedata; 3411 $facedata = Coro::Storable::thaw $facedata;
3217 3412
3218 $facedata->{version} == 2 3413 $facedata->{version} == 2
3219 or cf::cleanup "$path: version mismatch, cannot proceed."; 3414 or cf::cleanup "$path: version mismatch, cannot proceed.";
3220 3415
3221 # 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]);
3222 $facedata->{resource}{"res/exp_table"} = { 3418 $facedata->{resource}{"res/exp_table"} = {
3223 type => FT_RSRC, 3419 type => FT_RSRC,
3224 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),
3225 }; 3422 };
3226 cf::cede_to_tick; 3423 cf::cede_to_tick;
3227 3424
3228 { 3425 {
3229 my $faces = $facedata->{faceinfo}; 3426 my $faces = $facedata->{faceinfo};
… …
3231 while (my ($face, $info) = each %$faces) { 3428 while (my ($face, $info) = each %$faces) {
3232 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3429 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3233 3430
3234 cf::face::set_visibility $idx, $info->{visibility}; 3431 cf::face::set_visibility $idx, $info->{visibility};
3235 cf::face::set_magicmap $idx, $info->{magicmap}; 3432 cf::face::set_magicmap $idx, $info->{magicmap};
3236 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3433 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3237 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3434 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3238 3435
3239 cf::cede_to_tick; 3436 cf::cede_to_tick;
3240 } 3437 }
3241 3438
3242 while (my ($face, $info) = each %$faces) { 3439 while (my ($face, $info) = each %$faces) {
… …
3247 3444
3248 if (my $smooth = cf::face::find $info->{smooth}) { 3445 if (my $smooth = cf::face::find $info->{smooth}) {
3249 cf::face::set_smooth $idx, $smooth; 3446 cf::face::set_smooth $idx, $smooth;
3250 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3447 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3251 } else { 3448 } else {
3252 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3449 error "smooth face '$info->{smooth}' not found for face '$face'";
3253 } 3450 }
3254 3451
3255 cf::cede_to_tick; 3452 cf::cede_to_tick;
3256 } 3453 }
3257 } 3454 }
… …
3266 3463
3267 cf::anim::invalidate_all; # d'oh 3464 cf::anim::invalidate_all; # d'oh
3268 } 3465 }
3269 3466
3270 { 3467 {
3271 # TODO: for gcfclient pleasure, we should give resources
3272 # that gcfclient doesn't grok a >10000 face index.
3273 my $res = $facedata->{resource}; 3468 my $res = $facedata->{resource};
3274 3469
3275 while (my ($name, $info) = each %$res) { 3470 while (my ($name, $info) = each %$res) {
3276 if (defined $info->{type}) { 3471 if (defined $info->{type}) {
3277 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3472 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3278 my $data;
3279 3473
3280 if ($info->{type} & 1) { 3474 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3281 # prepend meta info
3282
3283 my $meta = $enc->encode ({
3284 name => $name,
3285 %{ $info->{meta} || {} },
3286 });
3287
3288 $data = pack "(w/a*)*", $meta, $info->{data};
3289 } else {
3290 $data = $info->{data};
3291 }
3292
3293 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3294 cf::face::set_type $idx, $info->{type}; 3475 cf::face::set_type $idx, $info->{type};
3295 } else { 3476 } else {
3296 $RESOURCE{$name} = $info; 3477 $RESOURCE{$name} = $info; # unused
3297 } 3478 }
3298 3479
3299 cf::cede_to_tick; 3480 cf::cede_to_tick;
3300 } 3481 }
3301 } 3482 }
3302 3483
3303 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3484 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3304 3485
3305 1 3486 1
3306} 3487}
3307
3308cf::global->attach (on_resource_update => sub {
3309 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3310 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3311
3312 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3313 my $sound = $soundconf->{compat}[$_]
3314 or next;
3315
3316 my $face = cf::face::find "sound/$sound->[1]";
3317 cf::sound::set $sound->[0] => $face;
3318 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3319 }
3320
3321 while (my ($k, $v) = each %{$soundconf->{event}}) {
3322 my $face = cf::face::find "sound/$v";
3323 cf::sound::set $k => $face;
3324 }
3325 }
3326});
3327 3488
3328register_exticmd fx_want => sub { 3489register_exticmd fx_want => sub {
3329 my ($ns, $want) = @_; 3490 my ($ns, $want) = @_;
3330 3491
3331 while (my ($k, $v) = each %$want) { 3492 while (my ($k, $v) = each %$want) {
… …
3370sub reload_treasures { 3531sub reload_treasures {
3371 load_resource_file "$DATADIR/treasures" 3532 load_resource_file "$DATADIR/treasures"
3372 or die "unable to load treasurelists\n"; 3533 or die "unable to load treasurelists\n";
3373} 3534}
3374 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
3375sub reload_resources { 3559sub reload_resources {
3376 warn "reloading resource files...\n"; 3560 trace "reloading resource files...\n";
3377 3561
3562 reload_exp_table;
3563 reload_materials;
3378 reload_facedata; 3564 reload_facedata;
3565 reload_sound;
3379 reload_archetypes; 3566 reload_archetypes;
3380 reload_regions; 3567 reload_regions;
3381 reload_treasures; 3568 reload_treasures;
3382 3569
3383 warn "finished reloading resource files\n"; 3570 trace "finished reloading resource files\n";
3384} 3571}
3385 3572
3386sub reload_config { 3573sub reload_config {
3387 open my $fh, "<:utf8", "$CONFDIR/config" 3574 trace "reloading config file...\n";
3388 or return;
3389 3575
3390 local $/; 3576 0 < aio_load "$CONFDIR/config", my $config
3391 *CFG = YAML::Load <$fh>; 3577 or die "$CONFDIR/config: $!";
3392 3578
3579 utf8::decode $config;
3580 *CFG = yaml_load $config;
3581
3393 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3582 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3394 3583
3395 $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};
3396 $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};
3397 3586
3398 if (exists $CFG{mlockall}) { 3587 if (exists $CFG{mlockall}) {
… …
3422 seek $fh, 0, 0; 3611 seek $fh, 0, 0;
3423 print $fh $$; 3612 print $fh $$;
3424} 3613}
3425 3614
3426sub main_loop { 3615sub main_loop {
3427 warn "EV::loop starting\n"; 3616 trace "EV::loop starting\n";
3428 if (1) { 3617 if (1) {
3429 EV::loop; 3618 EV::loop;
3430 } 3619 }
3431 warn "EV::loop returned\n"; 3620 trace "EV::loop returned\n";
3432 goto &main_loop unless $REALLY_UNLOOP; 3621 goto &main_loop unless $REALLY_UNLOOP;
3433} 3622}
3434 3623
3435sub main { 3624sub main {
3436 cf::init_globals; # initialise logging 3625 cf::init_globals; # initialise logging
3437 3626
3438 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3627 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3439 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.";
3440 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3629 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3441 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3630 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3442
3443 cf::init_experience;
3444 cf::init_anim;
3445 cf::init_attackmess;
3446 cf::init_dynamic;
3447 3631
3448 $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
3449 3633
3450 # we must not ever block the main coroutine 3634 # we must not ever block the main coroutine
3451 local $Coro::idle = sub { 3635 local $Coro::idle = sub {
… …
3457 }; 3641 };
3458 3642
3459 evthread_start IO::AIO::poll_fileno; 3643 evthread_start IO::AIO::poll_fileno;
3460 3644
3461 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
3462 reload_resources; 3654 reload_resources;
3463 reload_config; 3655 reload_config;
3464 db_init; 3656 db_init;
3465 3657
3466 cf::load_settings;
3467 cf::load_materials;
3468 cf::init_uuid; 3658 cf::init_uuid;
3469 cf::init_signals; 3659 cf::init_signals;
3470 cf::init_commands;
3471 cf::init_skills; 3660 cf::init_skills;
3472 3661
3473 cf::init_beforeplay; 3662 cf::init_beforeplay;
3474 3663
3475 atomic; 3664 atomic;
… …
3480 3669
3481 # no (long-running) fork's whatsoever before this point(!) 3670 # no (long-running) fork's whatsoever before this point(!)
3482 use POSIX (); 3671 use POSIX ();
3483 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};
3484 3673
3485 (pop @POST_INIT)->(0) while @POST_INIT; 3674 cf::_post_init 0;
3486 }; 3675 };
3487 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
3488 main_loop; 3685 goto &main_loop;
3489} 3686}
3490 3687
3491############################################################################# 3688#############################################################################
3492# initialisation and cleanup 3689# initialisation and cleanup
3493 3690
3494# install some emergency cleanup handlers 3691# install some emergency cleanup handlers
3495BEGIN { 3692BEGIN {
3496 our %SIGWATCHER = (); 3693 our %SIGWATCHER = ();
3497 for my $signal (qw(INT HUP TERM)) { 3694 for my $signal (qw(INT HUP TERM)) {
3498 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3695 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3499 cf::cleanup "SIG$signal"; 3696 cf::cleanup "SIG$signal";
3500 }; 3697 };
3501 } 3698 }
3502} 3699}
3503 3700
3504sub write_runtime_sync { 3701sub write_runtime_sync {
3702 my $t0 = AE::time;
3703
3505 # first touch the runtime file to show we are still running: 3704 # first touch the runtime file to show we are still running:
3506 # the fsync below can take a very very long time. 3705 # the fsync below can take a very very long time.
3507 3706
3508 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3707 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3509 3708
3510 my $guard = cf::lock_acquire "write_runtime"; 3709 my $guard = cf::lock_acquire "write_runtime";
3511 3710
3512 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3711 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3513 or return; 3712 or return;
3514 3713
3515 my $value = $cf::RUNTIME + 90 + 10; 3714 my $value = $cf::RUNTIME + 90 + 10;
3516 # 10 is the runtime save interval, for a monotonic clock 3715 # 10 is the runtime save interval, for a monotonic clock
3517 # 60 allows for the watchdog to kill the server. 3716 # 60 allows for the watchdog to kill the server.
… …
3530 or return; 3729 or return;
3531 3730
3532 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3731 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3533 and return; 3732 and return;
3534 3733
3535 warn "runtime file written.\n"; 3734 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3536 3735
3537 1 3736 1
3538} 3737}
3539 3738
3540our $uuid_lock; 3739our $uuid_lock;
… …
3552 or return; 3751 or return;
3553 3752
3554 my $value = uuid_seq uuid_cur; 3753 my $value = uuid_seq uuid_cur;
3555 3754
3556 unless ($value) { 3755 unless ($value) {
3557 warn "cowardly refusing to write zero uuid value!\n"; 3756 info "cowardly refusing to write zero uuid value!\n";
3558 return; 3757 return;
3559 } 3758 }
3560 3759
3561 my $value = uuid_str $value + $uuid_skip; 3760 my $value = uuid_str $value + $uuid_skip;
3562 $uuid_skip = 0; 3761 $uuid_skip = 0;
… …
3572 or return; 3771 or return;
3573 3772
3574 aio_rename "$uuid~", $uuid 3773 aio_rename "$uuid~", $uuid
3575 and return; 3774 and return;
3576 3775
3577 warn "uuid file written ($value).\n"; 3776 trace "uuid file written ($value).\n";
3578 3777
3579 1 3778 1
3580 3779
3581} 3780}
3582 3781
… …
3588} 3787}
3589 3788
3590sub emergency_save() { 3789sub emergency_save() {
3591 my $freeze_guard = cf::freeze_mainloop; 3790 my $freeze_guard = cf::freeze_mainloop;
3592 3791
3593 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;
3594 3798
3595 cf::sync_job { 3799 cf::sync_job {
3596 # this is a trade-off: we want to be very quick here, so 3800 cf::write_runtime_sync; # external watchdog should not bark
3597 # save all maps without fsync, and later call a global sync
3598 # (which in turn might be very very slow)
3599 local $USE_FSYNC = 0;
3600 3801
3601 # use a peculiar iteration method to avoid tripping on perl 3802 # use a peculiar iteration method to avoid tripping on perl
3602 # refcount bugs in for. also avoids problems with players 3803 # refcount bugs in for. also avoids problems with players
3603 # and maps saved/destroyed asynchronously. 3804 # and maps saved/destroyed asynchronously.
3604 warn "emergency_perl_save: begin player save\n"; 3805 info "emergency_perl_save: begin player save\n";
3605 for my $login (keys %cf::PLAYER) { 3806 for my $login (keys %cf::PLAYER) {
3606 my $pl = $cf::PLAYER{$login} or next; 3807 my $pl = $cf::PLAYER{$login} or next;
3607 $pl->valid or next; 3808 $pl->valid or next;
3608 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3809 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3609 $pl->save; 3810 $pl->save;
3610 } 3811 }
3611 warn "emergency_perl_save: end player save\n"; 3812 info "emergency_perl_save: end player save\n";
3612 3813
3814 cf::write_runtime_sync; # external watchdog should not bark
3815
3613 warn "emergency_perl_save: begin map save\n"; 3816 info "emergency_perl_save: begin map save\n";
3614 for my $path (keys %cf::MAP) { 3817 for my $path (keys %cf::MAP) {
3615 my $map = $cf::MAP{$path} or next; 3818 my $map = $cf::MAP{$path} or next;
3616 $map->valid or next; 3819 $map->valid or next;
3617 $map->save; 3820 $map->save;
3618 } 3821 }
3619 warn "emergency_perl_save: end map save\n"; 3822 info "emergency_perl_save: end map save\n";
3620 3823
3824 cf::write_runtime_sync; # external watchdog should not bark
3825
3621 warn "emergency_perl_save: begin database checkpoint\n"; 3826 info "emergency_perl_save: begin database checkpoint\n";
3622 BDB::db_env_txn_checkpoint $DB_ENV; 3827 BDB::db_env_txn_checkpoint $DB_ENV;
3623 warn "emergency_perl_save: end database checkpoint\n"; 3828 info "emergency_perl_save: end database checkpoint\n";
3624 3829
3625 warn "emergency_perl_save: begin write uuid\n"; 3830 info "emergency_perl_save: begin write uuid\n";
3626 write_uuid_sync 1; 3831 write_uuid_sync 1;
3627 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
3628 }; 3852 };
3629 3853
3630 warn "emergency_perl_save: starting sync()\n";
3631 IO::AIO::aio_sync sub {
3632 warn "emergency_perl_save: finished sync()\n";
3633 };
3634
3635 warn "emergency_perl_save: leave\n"; 3854 info "emergency_perl_save: leave\n";
3636} 3855}
3637 3856
3638sub post_cleanup { 3857sub post_cleanup {
3639 my ($make_core) = @_; 3858 my ($make_core) = @_;
3640 3859
3860 IO::AIO::flush;
3861
3641 warn Carp::longmess "post_cleanup backtrace" 3862 error Carp::longmess "post_cleanup backtrace"
3642 if $make_core; 3863 if $make_core;
3643 3864
3644 my $fh = pidfile; 3865 my $fh = pidfile;
3645 unlink $PIDFILE if <$fh> == $$; 3866 unlink $PIDFILE if <$fh> == $$;
3646} 3867}
… …
3666 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3887 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3667 for my $name (keys %$leaf_symtab) { 3888 for my $name (keys %$leaf_symtab) {
3668 _gv_clear *{"$pkg$name"}; 3889 _gv_clear *{"$pkg$name"};
3669# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3890# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3670 } 3891 }
3671 warn "cleared package $pkg\n";#d#
3672} 3892}
3673 3893
3674sub do_reload_perl() { 3894sub do_reload_perl() {
3675 # can/must only be called in main 3895 # can/must only be called in main
3676 if ($Coro::current != $Coro::main) { 3896 unless (in_main) {
3677 warn "can only reload from main coroutine"; 3897 error "can only reload from main coroutine";
3678 return; 3898 return;
3679 } 3899 }
3680 3900
3681 return if $RELOAD++; 3901 return if $RELOAD++;
3682 3902
3683 my $t1 = EV::time; 3903 my $t1 = AE::time;
3684 3904
3685 while ($RELOAD) { 3905 while ($RELOAD) {
3686 warn "reloading..."; 3906 cf::get_slot 0.1, -1, "reload_perl";
3907 info "perl_reload: reloading...";
3687 3908
3688 warn "entering sync_job"; 3909 trace "perl_reload: entering sync_job";
3689 3910
3690 cf::sync_job { 3911 cf::sync_job {
3691 cf::write_runtime_sync; # external watchdog should not bark
3692 cf::emergency_save; 3912 #cf::emergency_save;
3693 cf::write_runtime_sync; # external watchdog should not bark
3694 3913
3695 warn "syncing database to disk";
3696 BDB::db_env_txn_checkpoint $DB_ENV;
3697
3698 # if anything goes wrong in here, we should simply crash as we already saved
3699
3700 warn "flushing outstanding aio requests";
3701 while (IO::AIO::nreqs || BDB::nreqs) {
3702 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3703 }
3704
3705 warn "cancelling all extension coros"; 3914 trace "perl_reload: cancelling all extension coros";
3706 $_->cancel for values %EXT_CORO; 3915 $_->cancel for values %EXT_CORO;
3707 %EXT_CORO = (); 3916 %EXT_CORO = ();
3708 3917
3709 warn "removing commands"; 3918 trace "perl_reload: removing commands";
3710 %COMMAND = (); 3919 %COMMAND = ();
3711 3920
3712 warn "removing ext/exti commands"; 3921 trace "perl_reload: removing ext/exti commands";
3713 %EXTCMD = (); 3922 %EXTCMD = ();
3714 %EXTICMD = (); 3923 %EXTICMD = ();
3715 3924
3716 warn "unloading/nuking all extensions"; 3925 trace "perl_reload: unloading/nuking all extensions";
3717 for my $pkg (@EXTS) { 3926 for my $pkg (@EXTS) {
3718 warn "... unloading $pkg"; 3927 trace "... unloading $pkg";
3719 3928
3720 if (my $cb = $pkg->can ("unload")) { 3929 if (my $cb = $pkg->can ("unload")) {
3721 eval { 3930 eval {
3722 $cb->($pkg); 3931 $cb->($pkg);
3723 1 3932 1
3724 } or warn "$pkg unloaded, but with errors: $@"; 3933 } or error "$pkg unloaded, but with errors: $@";
3725 } 3934 }
3726 3935
3727 warn "... clearing $pkg"; 3936 trace "... clearing $pkg";
3728 clear_package $pkg; 3937 clear_package $pkg;
3729 } 3938 }
3730 3939
3731 warn "unloading all perl modules loaded from $LIBDIR"; 3940 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3732 while (my ($k, $v) = each %INC) { 3941 while (my ($k, $v) = each %INC) {
3733 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3942 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3734 3943
3735 warn "... unloading $k"; 3944 trace "... unloading $k";
3736 delete $INC{$k}; 3945 delete $INC{$k};
3737 3946
3738 $k =~ s/\.pm$//; 3947 $k =~ s/\.pm$//;
3739 $k =~ s/\//::/g; 3948 $k =~ s/\//::/g;
3740 3949
… …
3743 } 3952 }
3744 3953
3745 clear_package $k; 3954 clear_package $k;
3746 } 3955 }
3747 3956
3748 warn "getting rid of safe::, as good as possible"; 3957 trace "perl_reload: getting rid of safe::, as good as possible";
3749 clear_package "safe::$_" 3958 clear_package "safe::$_"
3750 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);
3751 3960
3752 warn "unloading cf.pm \"a bit\""; 3961 trace "perl_reload: unloading cf.pm \"a bit\"";
3753 delete $INC{"cf.pm"}; 3962 delete $INC{"cf.pm"};
3754 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3963 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3755 3964
3756 # don't, removes xs symbols, too, 3965 # don't, removes xs symbols, too,
3757 # and global variables created in xs 3966 # and global variables created in xs
3758 #clear_package __PACKAGE__; 3967 #clear_package __PACKAGE__;
3759 3968
3760 warn "unload completed, starting to reload now"; 3969 info "perl_reload: unload completed, starting to reload now";
3761 3970
3762 warn "reloading cf.pm"; 3971 trace "perl_reload: reloading cf.pm";
3763 require cf; 3972 require cf;
3764 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3973 cf::_connect_to_perl_1;
3765 3974
3766 warn "loading config and database again"; 3975 trace "perl_reload: loading config and database again";
3767 cf::reload_config; 3976 cf::reload_config;
3768 3977
3769 warn "loading extensions"; 3978 trace "perl_reload: loading extensions";
3770 cf::load_extensions; 3979 cf::load_extensions;
3771 3980
3772 if ($REATTACH_ON_RELOAD) { 3981 if ($REATTACH_ON_RELOAD) {
3773 warn "reattaching attachments to objects/players"; 3982 trace "perl_reload: reattaching attachments to objects/players";
3774 _global_reattach; # objects, sockets 3983 _global_reattach; # objects, sockets
3775 warn "reattaching attachments to maps"; 3984 trace "perl_reload: reattaching attachments to maps";
3776 reattach $_ for values %MAP; 3985 reattach $_ for values %MAP;
3777 warn "reattaching attachments to players"; 3986 trace "perl_reload: reattaching attachments to players";
3778 reattach $_ for values %PLAYER; 3987 reattach $_ for values %PLAYER;
3779 } 3988 }
3780 3989
3781 warn "running post_init jobs"; 3990 cf::_post_init 1;
3782 (pop @POST_INIT)->(1) while @POST_INIT;
3783 3991
3784 warn "leaving sync_job"; 3992 trace "perl_reload: leaving sync_job";
3785 3993
3786 1 3994 1
3787 } or do { 3995 } or do {
3788 warn $@; 3996 error $@;
3789 cf::cleanup "error while reloading, exiting."; 3997 cf::cleanup "perl_reload: error, exiting.";
3790 }; 3998 };
3791 3999
3792 warn "reloaded";
3793 --$RELOAD; 4000 --$RELOAD;
3794 } 4001 }
3795 4002
3796 $t1 = EV::time - $t1; 4003 $t1 = AE::time - $t1;
3797 warn "reload completed in ${t1}s\n"; 4004 info "perl_reload: completed in ${t1}s\n";
3798}; 4005};
3799 4006
3800our $RELOAD_WATCHER; # used only during reload 4007our $RELOAD_WATCHER; # used only during reload
3801 4008
3802sub reload_perl() { 4009sub reload_perl() {
… …
3804 # coro crashes during coro_state_free->destroy here. 4011 # coro crashes during coro_state_free->destroy here.
3805 4012
3806 $RELOAD_WATCHER ||= cf::async { 4013 $RELOAD_WATCHER ||= cf::async {
3807 Coro::AIO::aio_wait cache_extensions; 4014 Coro::AIO::aio_wait cache_extensions;
3808 4015
3809 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4016 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3810 do_reload_perl; 4017 do_reload_perl;
3811 undef $RELOAD_WATCHER; 4018 undef $RELOAD_WATCHER;
3812 }; 4019 };
3813 }; 4020 };
3814} 4021}
… …
3823 reload_perl; 4030 reload_perl;
3824 }; 4031 };
3825 } 4032 }
3826}; 4033};
3827 4034
3828unshift @INC, $LIBDIR; 4035#############################################################################
3829 4036
3830my $bug_warning = 0; 4037my $bug_warning = 0;
3831 4038
3832our @WAIT_FOR_TICK; 4039our @WAIT_FOR_TICK;
3833our @WAIT_FOR_TICK_BEGIN; 4040our @WAIT_FOR_TICK_BEGIN;
3834 4041
3835sub wait_for_tick { 4042sub wait_for_tick() {
3836 return if tick_inhibit || $Coro::current == $Coro::main; 4043 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3837 4044
3838 my $signal = new Coro::Signal; 4045 my $signal = new Coro::Signal;
3839 push @WAIT_FOR_TICK, $signal; 4046 push @WAIT_FOR_TICK, $signal;
3840 $signal->wait; 4047 $signal->wait;
3841} 4048}
3842 4049
3843sub wait_for_tick_begin { 4050sub wait_for_tick_begin() {
3844 return if tick_inhibit || $Coro::current == $Coro::main; 4051 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3845 4052
3846 my $signal = new Coro::Signal; 4053 my $signal = new Coro::Signal;
3847 push @WAIT_FOR_TICK_BEGIN, $signal; 4054 push @WAIT_FOR_TICK_BEGIN, $signal;
3848 $signal->wait; 4055 $signal->wait;
3849} 4056}
… …
3855 return; 4062 return;
3856 } 4063 }
3857 4064
3858 cf::server_tick; # one server iteration 4065 cf::server_tick; # one server iteration
3859 4066
4067 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4068
3860 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4069 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3861 $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.;
3862 Coro::async_pool { 4071 Coro::async_pool {
3863 $Coro::current->{desc} = "runtime saver"; 4072 $Coro::current->{desc} = "runtime saver";
3864 write_runtime_sync 4073 write_runtime_sync
3865 or warn "ERROR: unable to write runtime file: $!"; 4074 or error "ERROR: unable to write runtime file: $!";
3866 }; 4075 };
3867 } 4076 }
3868 4077
3869 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4078 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3870 $sig->send; 4079 $sig->send;
… …
3878 4087
3879 if (0) { 4088 if (0) {
3880 if ($NEXT_TICK) { 4089 if ($NEXT_TICK) {
3881 my $jitter = $TICK_START - $NEXT_TICK; 4090 my $jitter = $TICK_START - $NEXT_TICK;
3882 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4091 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3883 warn "jitter $JITTER\n";#d# 4092 debug "jitter $JITTER\n";#d#
3884 } 4093 }
3885 } 4094 }
3886} 4095}
3887 4096
3888{ 4097{
3889 # configure BDB 4098 # configure BDB
3890 4099
3891 BDB::min_parallel 8; 4100 BDB::min_parallel 16;
3892 BDB::max_poll_reqs $TICK * 0.1; 4101 BDB::max_poll_reqs $TICK * 0.1;
3893 $AnyEvent::BDB::WATCHER->priority (1); 4102 $AnyEvent::BDB::WATCHER->priority (1);
3894 4103
3895 unless ($DB_ENV) { 4104 unless ($DB_ENV) {
3896 $DB_ENV = BDB::db_env_create; 4105 $DB_ENV = BDB::db_env_create;
… …
3933 IO::AIO::min_parallel 8; 4142 IO::AIO::min_parallel 8;
3934 IO::AIO::max_poll_time $TICK * 0.1; 4143 IO::AIO::max_poll_time $TICK * 0.1;
3935 undef $AnyEvent::AIO::WATCHER; 4144 undef $AnyEvent::AIO::WATCHER;
3936} 4145}
3937 4146
3938my $_log_backtrace; 4147our $_log_backtrace;
4148our $_log_backtrace_last;
3939 4149
3940sub _log_backtrace { 4150sub _log_backtrace {
3941 my ($msg, @addr) = @_; 4151 my ($msg, @addr) = @_;
3942 4152
3943 $msg =~ s/\n//; 4153 $msg =~ s/\n$//;
3944 4154
4155 if ($_log_backtrace_last eq $msg) {
4156 LOG llevInfo, "[ABT] $msg\n";
4157 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3945 # limit the # of concurrent backtraces 4158 # limit the # of concurrent backtraces
3946 if ($_log_backtrace < 2) { 4159 } elsif ($_log_backtrace < 2) {
4160 $_log_backtrace_last = $msg;
3947 ++$_log_backtrace; 4161 ++$_log_backtrace;
3948 my $perl_bt = Carp::longmess $msg; 4162 my $perl_bt = Carp::longmess $msg;
3949 async { 4163 async {
3950 $Coro::current->{desc} = "abt $msg"; 4164 $Coro::current->{desc} = "abt $msg";
3951 4165
… …
3971 LOG llevInfo, "[ABT] $_\n" for @bt; 4185 LOG llevInfo, "[ABT] $_\n" for @bt;
3972 --$_log_backtrace; 4186 --$_log_backtrace;
3973 }; 4187 };
3974 } else { 4188 } else {
3975 LOG llevInfo, "[ABT] $msg\n"; 4189 LOG llevInfo, "[ABT] $msg\n";
3976 LOG llevInfo, "[ABT] [suppressed]\n"; 4190 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3977 } 4191 }
3978} 4192}
3979 4193
3980# load additional modules 4194# load additional modules
3981require "cf/$_.pm" for @EXTRA_MODULES; 4195require "cf/$_.pm" for @EXTRA_MODULES;
4196cf::_connect_to_perl_2;
3982 4197
3983END { cf::emergency_save } 4198END { cf::emergency_save }
3984 4199
39851 42001
3986 4201

Diff Legend

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