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.476 by root, Wed Sep 2 16:54:20 2009 UTC vs.
Revision 1.555 by root, Wed Jun 30 01:32:56 2010 UTC

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

Diff Legend

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