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

Diff Legend

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