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.474 by root, Thu Jul 16 21:42:56 2009 UTC vs.
Revision 1.554 by root, Sat Jun 26 22:10:18 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,
1869 $rmp->{wall_name}, $rmp->{monsterstyle},
1741 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1870 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1742 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1871 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{this_map},
1743 $rmp->{exit_on_final_map}, 1872 $rmp->{exit_on_final_map},
1744 $rmp->{xsize}, $rmp->{ysize}, 1873 $rmp->{xsize}, $rmp->{ysize},
1745 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1874 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1746 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1875 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1747 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1876 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1748 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1877 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1749 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1878 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1750 (cf::region::find $rmp->{region}), $rmp->{custom} 1879 (cf::region::find $rmp->{region})
1751 ) 1880 )
1752} 1881}
1753 1882
1754=item cf::map->register ($regex, $prio) 1883=item cf::map->register ($regex, $prio)
1755 1884
1761 1890
1762sub register { 1891sub register {
1763 my (undef, $regex, $prio) = @_; 1892 my (undef, $regex, $prio) = @_;
1764 my $pkg = caller; 1893 my $pkg = caller;
1765 1894
1766 no strict;
1767 push @{"$pkg\::ISA"}, __PACKAGE__; 1895 push @{"$pkg\::ISA"}, __PACKAGE__;
1768 1896
1769 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1897 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1770} 1898}
1771 1899
1772# also paths starting with '/' 1900# also paths starting with '/'
1773$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1901$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1774 1902
1775sub thawer_merge { 1903sub thawer_merge {
1776 my ($self, $merge) = @_; 1904 my ($self, $merge) = @_;
1777 1905
1778 # we have to keep some variables in memory intact 1906 # we have to keep some variables in memory intact
1783} 1911}
1784 1912
1785sub normalise { 1913sub normalise {
1786 my ($path, $base) = @_; 1914 my ($path, $base) = @_;
1787 1915
1788 $path = "$path"; # make sure its a string 1916 $path = "$path"; # make sure it's a string
1789 1917
1790 $path =~ s/\.map$//; 1918 $path =~ s/\.map$//;
1791 1919
1792 # map plan: 1920 # map plan:
1793 # 1921 #
1808 $base =~ s{[^/]+/?$}{}; 1936 $base =~ s{[^/]+/?$}{};
1809 $path = "$base/$path"; 1937 $path = "$base/$path";
1810 } 1938 }
1811 1939
1812 for ($path) { 1940 for ($path) {
1813 redo if s{//}{/};
1814 redo if s{/\.?/}{/}; 1941 redo if s{/\.?/}{/};
1815 redo if s{/[^/]+/\.\./}{/}; 1942 redo if s{/[^/]+/\.\./}{/};
1816 } 1943 }
1817 1944
1818 $path 1945 $path
1832 $self->init; # pass $1 etc. 1959 $self->init; # pass $1 etc.
1833 return $self; 1960 return $self;
1834 } 1961 }
1835 } 1962 }
1836 1963
1837 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1964 Carp::cluck "unable to resolve path '$path' (base '$base')";
1838 () 1965 ()
1839} 1966}
1840 1967
1841sub init { 1968sub init {
1842 my ($self) = @_; 1969 my ($self) = @_;
1964} 2091}
1965 2092
1966sub find; 2093sub find;
1967sub find { 2094sub find {
1968 my ($path, $origin) = @_; 2095 my ($path, $origin) = @_;
2096
2097 cf::cede_to_tick;
1969 2098
1970 $path = normalise $path, $origin && $origin->path; 2099 $path = normalise $path, $origin && $origin->path;
1971 2100
1972 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2101 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973 my $guard2 = cf::lock_acquire "map_find:$path"; 2102 my $guard2 = cf::lock_acquire "map_find:$path";
1992 2121
1993 $cf::MAP{$path} = $map 2122 $cf::MAP{$path} = $map
1994 } 2123 }
1995} 2124}
1996 2125
1997sub pre_load { } 2126sub pre_load { }
1998sub post_load { } 2127#sub post_load { } # XS
1999 2128
2000sub load { 2129sub load {
2001 my ($self) = @_; 2130 my ($self) = @_;
2002 2131
2003 local $self->{deny_reset} = 1; # loading can take a long time 2132 local $self->{deny_reset} = 1; # loading can take a long time
2058 2187
2059 $self->in_memory (cf::MAP_ACTIVE); 2188 $self->in_memory (cf::MAP_ACTIVE);
2060 } 2189 }
2061 2190
2062 $self->post_load; 2191 $self->post_load;
2063}
2064 2192
2193 1
2194}
2195
2196# customize the map for a given player, i.e.
2197# return the _real_ map. used by e.g. per-player
2198# maps to change the path to ~playername/mappath
2065sub customise_for { 2199sub customise_for {
2066 my ($self, $ob) = @_; 2200 my ($self, $ob) = @_;
2067 2201
2068 return find "~" . $ob->name . "/" . $self->{path} 2202 return find "~" . $ob->name . "/" . $self->{path}
2069 if $self->per_player; 2203 if $self->per_player;
2085 or next; 2219 or next;
2086 $neigh = find $neigh, $map 2220 $neigh = find $neigh, $map
2087 or next; 2221 or next;
2088 $neigh->load; 2222 $neigh->load;
2089 2223
2224 # now find the diagonal neighbours
2090 push @neigh, 2225 push @neigh,
2091 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2226 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2092 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2227 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2093 } 2228 }
2094 2229
2101} 2236}
2102 2237
2103sub find_sync { 2238sub find_sync {
2104 my ($path, $origin) = @_; 2239 my ($path, $origin) = @_;
2105 2240
2106 cf::sync_job { find $path, $origin } 2241 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2242 if $Coro::current == $Coro::main;
2243
2244 find $path, $origin
2107} 2245}
2108 2246
2109sub do_load_sync { 2247sub do_load_sync {
2110 my ($map) = @_; 2248 my ($map) = @_;
2111 2249
2112 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2250 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2113 if $Coro::current == $Coro::main; 2251 if $Coro::current == $Coro::main;
2114 2252
2115 cf::sync_job { $map->load }; 2253 $map->load;
2116} 2254}
2117 2255
2118our %MAP_PREFETCH; 2256our %MAP_PREFETCH;
2119our $MAP_PREFETCHER = undef; 2257our $MAP_PREFETCHER = undef;
2120 2258
2146 $MAP_PREFETCHER->prio (6); 2284 $MAP_PREFETCHER->prio (6);
2147 2285
2148 () 2286 ()
2149} 2287}
2150 2288
2289# common code, used by both ->save and ->swapout
2151sub save { 2290sub _save {
2152 my ($self) = @_; 2291 my ($self) = @_;
2153
2154 my $lock = cf::lock_acquire "map_data:$self->{path}";
2155 2292
2156 $self->{last_save} = $cf::RUNTIME; 2293 $self->{last_save} = $cf::RUNTIME;
2157 2294
2158 return unless $self->dirty; 2295 return unless $self->dirty;
2159 2296
2179 } else { 2316 } else {
2180 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2317 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2181 } 2318 }
2182} 2319}
2183 2320
2321sub save {
2322 my ($self) = @_;
2323
2324 my $lock = cf::lock_acquire "map_data:$self->{path}";
2325
2326 $self->_save;
2327}
2328
2184sub swap_out { 2329sub swap_out {
2185 my ($self) = @_; 2330 my ($self) = @_;
2186 2331
2187 # save first because save cedes
2188 $self->save;
2189
2190 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2332 my $lock = cf::lock_acquire "map_data:$self->{path}";
2191 2333
2192 return if $self->players;
2193 return if $self->in_memory != cf::MAP_ACTIVE; 2334 return if $self->in_memory != cf::MAP_ACTIVE;
2194 return if $self->{deny_save}; 2335 return if $self->{deny_save};
2336 return if $self->players;
2195 2337
2338 # first deactivate the map and "unlink" it from the core
2339 $self->deactivate;
2340 $_->clear_links_to ($self) for values %cf::MAP;
2196 $self->in_memory (cf::MAP_SWAPPED); 2341 $self->in_memory (cf::MAP_SWAPPED);
2342
2343 # then atomically save
2344 $self->_save;
2345
2346 # then free the map
2347 $self->clear;
2348}
2349
2350sub reset_at {
2351 my ($self) = @_;
2352
2353 # TODO: safety, remove and allow resettable per-player maps
2354 return 1e99 if $self->{deny_reset};
2355
2356 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2357 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2358
2359 $time + $to
2360}
2361
2362sub should_reset {
2363 my ($self) = @_;
2364
2365 $self->reset_at <= $cf::RUNTIME
2366}
2367
2368sub reset {
2369 my ($self) = @_;
2370
2371 my $lock = cf::lock_acquire "map_data:$self->{path}";
2372
2373 return if $self->players;
2374
2375 cf::trace "resetting map ", $self->path, "\n";
2376
2377 $self->in_memory (cf::MAP_SWAPPED);
2378
2379 # need to save uniques path
2380 unless ($self->{deny_save}) {
2381 my $uniq = $self->uniq_path; utf8::encode $uniq;
2382
2383 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2384 if $uniq;
2385 }
2386
2387 delete $cf::MAP{$self->path};
2197 2388
2198 $self->deactivate; 2389 $self->deactivate;
2199 $_->clear_links_to ($self) for values %cf::MAP; 2390 $_->clear_links_to ($self) for values %cf::MAP;
2200 $self->clear; 2391 $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 2392
2246 $self->unlink_save; 2393 $self->unlink_save;
2247 $self->destroy; 2394 $self->destroy;
2248} 2395}
2249 2396
2257 2404
2258 delete $cf::MAP{$self->path}; 2405 delete $cf::MAP{$self->path};
2259 2406
2260 $self->unlink_save; 2407 $self->unlink_save;
2261 2408
2262 bless $self, "cf::map"; 2409 bless $self, "cf::map::wrap";
2263 delete $self->{deny_reset}; 2410 delete $self->{deny_reset};
2264 $self->{deny_save} = 1; 2411 $self->{deny_save} = 1;
2265 $self->reset_timeout (1); 2412 $self->reset_timeout (1);
2266 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2413 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2267 2414
2324 : normalise $_ 2471 : normalise $_
2325 } @{ aio_readdir $UNIQUEDIR or [] } 2472 } @{ aio_readdir $UNIQUEDIR or [] }
2326 ] 2473 ]
2327} 2474}
2328 2475
2476=item cf::map::static_maps
2477
2478Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2479file in the shared directory excluding F</styles> and F</editor>). May
2480block.
2481
2482=cut
2483
2484sub static_maps() {
2485 my @dirs = "";
2486 my @maps;
2487
2488 while (@dirs) {
2489 my $dir = shift @dirs;
2490
2491 next if $dir eq "/styles" || $dir eq "/editor";
2492
2493 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2494 or return;
2495
2496 for (@$files) {
2497 s/\.map$// or next;
2498 utf8::decode $_;
2499 push @maps, "$dir/$_";
2500 }
2501
2502 push @dirs, map "$dir/$_", @$dirs;
2503 }
2504
2505 \@maps
2506}
2507
2329=back 2508=back
2330 2509
2331=head3 cf::object 2510=head3 cf::object
2332 2511
2333=cut 2512=cut
2465 2644
2466Freezes the player and moves him/her to a special map (C<{link}>). 2645Freezes the player and moves him/her to a special map (C<{link}>).
2467 2646
2468The player should be reasonably safe there for short amounts of time (e.g. 2647The 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, 2648for 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 2649though, as the player cannot control the character while it is on the link
2471map. 2650map.
2472 2651
2473Will never block. 2652Will never block.
2474 2653
2475=item $player_object->leave_link ($map, $x, $y) 2654=item $player_object->leave_link ($map, $x, $y)
2496sub cf::object::player::enter_link { 2675sub cf::object::player::enter_link {
2497 my ($self) = @_; 2676 my ($self) = @_;
2498 2677
2499 $self->deactivate_recursive; 2678 $self->deactivate_recursive;
2500 2679
2680 ++$self->{_link_recursion};
2681
2501 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2682 return if UNIVERSAL::isa $self->map, "ext::map_link";
2502 2683
2503 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2684 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2504 if $self->map && $self->map->{path} ne "{link}"; 2685 if $self->map && $self->map->{path} ne "{link}";
2505 2686
2506 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2687 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2507} 2688}
2508 2689
2509sub cf::object::player::leave_link { 2690sub cf::object::player::leave_link {
2510 my ($self, $map, $x, $y) = @_; 2691 my ($self, $map, $x, $y) = @_;
2511 2692
2528 ($x, $y) = (-1, -1) 2709 ($x, $y) = (-1, -1)
2529 unless (defined $x) && (defined $y); 2710 unless (defined $x) && (defined $y);
2530 2711
2531 # use -1 or undef as default coordinates, not 0, 0 2712 # use -1 or undef as default coordinates, not 0, 0
2532 ($x, $y) = ($map->enter_x, $map->enter_y) 2713 ($x, $y) = ($map->enter_x, $map->enter_y)
2533 if $x <=0 && $y <= 0; 2714 if $x <= 0 && $y <= 0;
2534 2715
2535 $map->load; 2716 $map->load;
2536 $map->load_neighbours; 2717 $map->load_neighbours;
2537 2718
2538 return unless $self->contr->active; 2719 return unless $self->contr->active;
2539 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2540 $self->activate_recursive;
2541 2720
2542 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2721 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2543 $self->enter_map ($map, $x, $y); 2722 if ($self->enter_map ($map, $x, $y)) {
2544} 2723 # entering was successful
2724 delete $self->{_link_recursion};
2725 # only activate afterwards, to support waiting in hooks
2726 $self->activate_recursive;
2727 }
2545 2728
2729}
2730
2546=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2731=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2547 2732
2548Moves the player to the given map-path and coordinates by first freezing 2733Moves the player to the given map-path and coordinates by first freezing
2549her, loading and preparing them map, calling the provided $check callback 2734her, loading and preparing them map, calling the provided $check callback
2550that has to return the map if sucecssful, and then unfreezes the player on 2735that has to return the map if sucecssful, and then unfreezes the player on
2551the new (success) or old (failed) map position. In either case, $done will 2736the new (success) or old (failed) map position. In either case, $done will
2558 2743
2559our $GOTOGEN; 2744our $GOTOGEN;
2560 2745
2561sub cf::object::player::goto { 2746sub cf::object::player::goto {
2562 my ($self, $path, $x, $y, $check, $done) = @_; 2747 my ($self, $path, $x, $y, $check, $done) = @_;
2748
2749 if ($self->{_link_recursion} >= $MAX_LINKS) {
2750 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2751 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2752 ($path, $x, $y) = @$EMERGENCY_POSITION;
2753 }
2563 2754
2564 # do generation counting so two concurrent goto's will be executed in-order 2755 # do generation counting so two concurrent goto's will be executed in-order
2565 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2756 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2566 2757
2567 $self->enter_link; 2758 $self->enter_link;
2591 my $map = eval { 2782 my $map = eval {
2592 my $map = defined $path ? cf::map::find $path : undef; 2783 my $map = defined $path ? cf::map::find $path : undef;
2593 2784
2594 if ($map) { 2785 if ($map) {
2595 $map = $map->customise_for ($self); 2786 $map = $map->customise_for ($self);
2596 $map = $check->($map) if $check && $map; 2787 $map = $check->($map, $x, $y, $self) if $check && $map;
2597 } else { 2788 } else {
2598 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2789 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2599 } 2790 }
2600 2791
2601 $map 2792 $map
2609 if ($gen == $self->{_goto_generation}) { 2800 if ($gen == $self->{_goto_generation}) {
2610 delete $self->{_goto_generation}; 2801 delete $self->{_goto_generation};
2611 $self->leave_link ($map, $x, $y); 2802 $self->leave_link ($map, $x, $y);
2612 } 2803 }
2613 2804
2614 $done->() if $done; 2805 $done->($self) if $done;
2615 })->prio (1); 2806 })->prio (1);
2616} 2807}
2617 2808
2618=item $player_object->enter_exit ($exit_object) 2809=item $player_object->enter_exit ($exit_object)
2619 2810
2712 $self->message ("Something went wrong deep within the deliantra server. " 2903 $self->message ("Something went wrong deep within the deliantra server. "
2713 . "I'll try to bring you back to the map you were before. " 2904 . "I'll try to bring you back to the map you were before. "
2714 . "Please report this to the dungeon master!", 2905 . "Please report this to the dungeon master!",
2715 cf::NDI_UNIQUE | cf::NDI_RED); 2906 cf::NDI_UNIQUE | cf::NDI_RED);
2716 2907
2717 warn "ERROR in enter_exit: $@"; 2908 error "ERROR in enter_exit: $@";
2718 $self->leave_link; 2909 $self->leave_link;
2719 } 2910 }
2720 })->prio (1); 2911 })->prio (1);
2721} 2912}
2722 2913
2734sub cf::client::send_drawinfo { 2925sub cf::client::send_drawinfo {
2735 my ($self, $text, $flags) = @_; 2926 my ($self, $text, $flags) = @_;
2736 2927
2737 utf8::encode $text; 2928 utf8::encode $text;
2738 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2929 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2930}
2931
2932=item $client->send_big_packet ($pkt)
2933
2934Like C<send_packet>, but tries to compress large packets, and fragments
2935them as required.
2936
2937=cut
2938
2939our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2940
2941sub cf::client::send_big_packet {
2942 my ($self, $pkt) = @_;
2943
2944 # try lzf for large packets
2945 $pkt = "lzf " . Compress::LZF::compress $pkt
2946 if 1024 <= length $pkt and $self->{can_lzf};
2947
2948 # split very large packets
2949 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2950 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2951 $pkt = "frag";
2952 }
2953
2954 $self->send_packet ($pkt);
2739} 2955}
2740 2956
2741=item $client->send_msg ($channel, $msg, $color, [extra...]) 2957=item $client->send_msg ($channel, $msg, $color, [extra...])
2742 2958
2743Send a drawinfo or msg packet to the client, formatting the msg for the 2959Send a drawinfo or msg packet to the client, formatting the msg for the
2747 2963
2748=cut 2964=cut
2749 2965
2750# non-persistent channels (usually the info channel) 2966# non-persistent channels (usually the info channel)
2751our %CHANNEL = ( 2967our %CHANNEL = (
2968 "c/motd" => {
2969 id => "infobox",
2970 title => "MOTD",
2971 reply => undef,
2972 tooltip => "The message of the day",
2973 },
2752 "c/identify" => { 2974 "c/identify" => {
2753 id => "infobox", 2975 id => "infobox",
2754 title => "Identify", 2976 title => "Identify",
2755 reply => undef, 2977 reply => undef,
2756 tooltip => "Items recently identified", 2978 tooltip => "Items recently identified",
2758 "c/examine" => { 2980 "c/examine" => {
2759 id => "infobox", 2981 id => "infobox",
2760 title => "Examine", 2982 title => "Examine",
2761 reply => undef, 2983 reply => undef,
2762 tooltip => "Signs and other items you examined", 2984 tooltip => "Signs and other items you examined",
2985 },
2986 "c/shopinfo" => {
2987 id => "infobox",
2988 title => "Shop Info",
2989 reply => undef,
2990 tooltip => "What your bargaining skill tells you about the shop",
2763 }, 2991 },
2764 "c/book" => { 2992 "c/book" => {
2765 id => "infobox", 2993 id => "infobox",
2766 title => "Book", 2994 title => "Book",
2767 reply => undef, 2995 reply => undef,
2883 my $pkt = "msg " 3111 my $pkt = "msg "
2884 . $self->{json_coder}->encode ( 3112 . $self->{json_coder}->encode (
2885 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3113 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2886 ); 3114 );
2887 3115
2888 # try lzf for large packets
2889 $pkt = "lzf " . Compress::LZF::compress $pkt
2890 if 1024 <= length $pkt and $self->{can_lzf};
2891
2892 # split very large packets
2893 if (8192 < length $pkt and $self->{can_lzf}) {
2894 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2895 $pkt = "frag";
2896 }
2897
2898 $self->send_packet ($pkt); 3116 $self->send_big_packet ($pkt);
2899} 3117}
2900 3118
2901=item $client->ext_msg ($type, @msg) 3119=item $client->ext_msg ($type, @msg)
2902 3120
2903Sends an ext event to the client. 3121Sends an ext event to the client.
2906 3124
2907sub cf::client::ext_msg($$@) { 3125sub cf::client::ext_msg($$@) {
2908 my ($self, $type, @msg) = @_; 3126 my ($self, $type, @msg) = @_;
2909 3127
2910 if ($self->extcmd == 2) { 3128 if ($self->extcmd == 2) {
2911 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3129 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2912 } elsif ($self->extcmd == 1) { # TODO: remove 3130 } elsif ($self->extcmd == 1) { # TODO: remove
2913 push @msg, msgtype => "event_$type"; 3131 push @msg, msgtype => "event_$type";
2914 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3132 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2915 } 3133 }
2916} 3134}
2917 3135
2918=item $client->ext_reply ($msgid, @msg) 3136=item $client->ext_reply ($msgid, @msg)
2919 3137
2923 3141
2924sub cf::client::ext_reply($$@) { 3142sub cf::client::ext_reply($$@) {
2925 my ($self, $id, @msg) = @_; 3143 my ($self, $id, @msg) = @_;
2926 3144
2927 if ($self->extcmd == 2) { 3145 if ($self->extcmd == 2) {
2928 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3146 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2929 } elsif ($self->extcmd == 1) { 3147 } elsif ($self->extcmd == 1) {
2930 #TODO: version 1, remove 3148 #TODO: version 1, remove
2931 unshift @msg, msgtype => "reply", msgid => $id; 3149 unshift @msg, msgtype => "reply", msgid => $id;
2932 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3150 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2933 } 3151 }
2934} 3152}
2935 3153
2936=item $success = $client->query ($flags, "text", \&cb) 3154=item $success = $client->query ($flags, "text", \&cb)
2937 3155
3008 3226
3009 $ns->ext_reply ($reply, @reply) 3227 $ns->ext_reply ($reply, @reply)
3010 if $reply; 3228 if $reply;
3011 3229
3012 } else { 3230 } else {
3013 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3231 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3014 } 3232 }
3015 3233
3016 cf::override; 3234 cf::override;
3017 }, 3235 },
3018); 3236);
3038 3256
3039 $coro 3257 $coro
3040} 3258}
3041 3259
3042cf::client->attach ( 3260cf::client->attach (
3043 on_destroy => sub { 3261 on_client_destroy => sub {
3044 my ($ns) = @_; 3262 my ($ns) = @_;
3045 3263
3046 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3264 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3047 }, 3265 },
3048); 3266);
3064our $safe_hole = new Safe::Hole; 3282our $safe_hole = new Safe::Hole;
3065 3283
3066$SIG{FPE} = 'IGNORE'; 3284$SIG{FPE} = 'IGNORE';
3067 3285
3068$safe->permit_only (Opcode::opset qw( 3286$safe->permit_only (Opcode::opset qw(
3069 :base_core :base_mem :base_orig :base_math 3287 :base_core :base_mem :base_orig :base_math :base_loop
3070 grepstart grepwhile mapstart mapwhile 3288 grepstart grepwhile mapstart mapwhile
3071 sort time 3289 sort time
3072)); 3290));
3073 3291
3074# here we export the classes and methods available to script code 3292# here we export the classes and methods available to script code
3099 decrease split destroy change_exp value msg lore send_msg)], 3317 decrease split destroy change_exp value msg lore send_msg)],
3100 ["cf::object::player" => qw(player)], 3318 ["cf::object::player" => qw(player)],
3101 ["cf::player" => qw(peaceful send_msg)], 3319 ["cf::player" => qw(peaceful send_msg)],
3102 ["cf::map" => qw(trigger)], 3320 ["cf::map" => qw(trigger)],
3103) { 3321) {
3104 no strict 'refs';
3105 my ($pkg, @funs) = @$_; 3322 my ($pkg, @funs) = @$_;
3106 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3323 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3107 for @funs; 3324 for @funs;
3108} 3325}
3109 3326
3126 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3343 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3127 $qcode =~ s/\n/\\n/g; 3344 $qcode =~ s/\n/\\n/g;
3128 3345
3129 %vars = (_dummy => 0) unless %vars; 3346 %vars = (_dummy => 0) unless %vars;
3130 3347
3348 my @res;
3131 local $_; 3349 local $_;
3132 local @safe::cf::_safe_eval_args = values %vars;
3133 3350
3134 my $eval = 3351 my $eval =
3135 "do {\n" 3352 "do {\n"
3136 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3353 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3137 . "#line 0 \"{$qcode}\"\n" 3354 . "#line 0 \"{$qcode}\"\n"
3138 . $code 3355 . $code
3139 . "\n}" 3356 . "\n}"
3140 ; 3357 ;
3141 3358
3359 if ($CFG{safe_eval}) {
3142 sub_generation_inc; 3360 sub_generation_inc;
3361 local @safe::cf::_safe_eval_args = values %vars;
3143 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3362 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3144 sub_generation_inc; 3363 sub_generation_inc;
3364 } else {
3365 local @cf::_safe_eval_args = values %vars;
3366 @res = wantarray ? eval eval : scalar eval $eval;
3367 }
3145 3368
3146 if ($@) { 3369 if ($@) {
3147 warn "$@"; 3370 warn "$@",
3148 warn "while executing safe code '$code'\n"; 3371 "while executing safe code '$code'\n",
3149 warn "with arguments " . (join " ", %vars) . "\n"; 3372 "with arguments " . (join " ", %vars) . "\n";
3150 } 3373 }
3151 3374
3152 wantarray ? @res : $res[0] 3375 wantarray ? @res : $res[0]
3153} 3376}
3154 3377
3168=cut 3391=cut
3169 3392
3170sub register_script_function { 3393sub register_script_function {
3171 my ($fun, $cb) = @_; 3394 my ($fun, $cb) = @_;
3172 3395
3173 no strict 'refs'; 3396 $fun = "safe::$fun" if $CFG{safe_eval};
3174 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3397 *$fun = $safe_hole->wrap ($cb);
3175} 3398}
3176 3399
3177=back 3400=back
3178 3401
3179=cut 3402=cut
3188 # for this (global event?) 3411 # for this (global event?)
3189 %ext::player_env::MUSIC_FACE_CACHE = (); 3412 %ext::player_env::MUSIC_FACE_CACHE = ();
3190 3413
3191 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3414 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3192 3415
3193 warn "loading facedata from $path\n"; 3416 trace "loading facedata from $path\n";
3194 3417
3195 my $facedata;
3196 0 < aio_load $path, $facedata 3418 0 < aio_load $path, my $facedata
3197 or die "$path: $!"; 3419 or die "$path: $!";
3198 3420
3199 $facedata = Coro::Storable::thaw $facedata; 3421 $facedata = Coro::Storable::thaw $facedata;
3200 3422
3201 $facedata->{version} == 2 3423 $facedata->{version} == 2
3202 or cf::cleanup "$path: version mismatch, cannot proceed."; 3424 or cf::cleanup "$path: version mismatch, cannot proceed.";
3203 3425
3204 # patch in the exptable 3426 # patch in the exptable
3427 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3205 $facedata->{resource}{"res/exp_table"} = { 3428 $facedata->{resource}{"res/exp_table"} = {
3206 type => FT_RSRC, 3429 type => FT_RSRC,
3207 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3430 data => $exp_table,
3431 hash => (Digest::MD5::md5 $exp_table),
3208 }; 3432 };
3209 cf::cede_to_tick; 3433 cf::cede_to_tick;
3210 3434
3211 { 3435 {
3212 my $faces = $facedata->{faceinfo}; 3436 my $faces = $facedata->{faceinfo};
3214 while (my ($face, $info) = each %$faces) { 3438 while (my ($face, $info) = each %$faces) {
3215 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3439 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3216 3440
3217 cf::face::set_visibility $idx, $info->{visibility}; 3441 cf::face::set_visibility $idx, $info->{visibility};
3218 cf::face::set_magicmap $idx, $info->{magicmap}; 3442 cf::face::set_magicmap $idx, $info->{magicmap};
3219 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3443 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3220 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3444 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3221 3445
3222 cf::cede_to_tick; 3446 cf::cede_to_tick;
3223 } 3447 }
3224 3448
3225 while (my ($face, $info) = each %$faces) { 3449 while (my ($face, $info) = each %$faces) {
3230 3454
3231 if (my $smooth = cf::face::find $info->{smooth}) { 3455 if (my $smooth = cf::face::find $info->{smooth}) {
3232 cf::face::set_smooth $idx, $smooth; 3456 cf::face::set_smooth $idx, $smooth;
3233 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3457 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3234 } else { 3458 } else {
3235 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3459 error "smooth face '$info->{smooth}' not found for face '$face'";
3236 } 3460 }
3237 3461
3238 cf::cede_to_tick; 3462 cf::cede_to_tick;
3239 } 3463 }
3240 } 3464 }
3249 3473
3250 cf::anim::invalidate_all; # d'oh 3474 cf::anim::invalidate_all; # d'oh
3251 } 3475 }
3252 3476
3253 { 3477 {
3254 # TODO: for gcfclient pleasure, we should give resources
3255 # that gcfclient doesn't grok a >10000 face index.
3256 my $res = $facedata->{resource}; 3478 my $res = $facedata->{resource};
3257 3479
3258 while (my ($name, $info) = each %$res) { 3480 while (my ($name, $info) = each %$res) {
3259 if (defined $info->{type}) { 3481 if (defined $info->{type}) {
3260 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3482 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3261 my $data;
3262 3483
3263 if ($info->{type} & 1) { 3484 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3264 # prepend meta info
3265
3266 my $meta = $enc->encode ({
3267 name => $name,
3268 %{ $info->{meta} || {} },
3269 });
3270
3271 $data = pack "(w/a*)*", $meta, $info->{data};
3272 } else {
3273 $data = $info->{data};
3274 }
3275
3276 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3277 cf::face::set_type $idx, $info->{type}; 3485 cf::face::set_type $idx, $info->{type};
3278 } else { 3486 } else {
3279 $RESOURCE{$name} = $info; 3487 $RESOURCE{$name} = $info; # unused
3280 } 3488 }
3281 3489
3282 cf::cede_to_tick; 3490 cf::cede_to_tick;
3283 } 3491 }
3284 } 3492 }
3285 3493
3286 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3494 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3287 3495
3288 1 3496 1
3289} 3497}
3290
3291cf::global->attach (on_resource_update => sub {
3292 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3293 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3294
3295 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3296 my $sound = $soundconf->{compat}[$_]
3297 or next;
3298
3299 my $face = cf::face::find "sound/$sound->[1]";
3300 cf::sound::set $sound->[0] => $face;
3301 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3302 }
3303
3304 while (my ($k, $v) = each %{$soundconf->{event}}) {
3305 my $face = cf::face::find "sound/$v";
3306 cf::sound::set $k => $face;
3307 }
3308 }
3309});
3310 3498
3311register_exticmd fx_want => sub { 3499register_exticmd fx_want => sub {
3312 my ($ns, $want) = @_; 3500 my ($ns, $want) = @_;
3313 3501
3314 while (my ($k, $v) = each %$want) { 3502 while (my ($k, $v) = each %$want) {
3353sub reload_treasures { 3541sub reload_treasures {
3354 load_resource_file "$DATADIR/treasures" 3542 load_resource_file "$DATADIR/treasures"
3355 or die "unable to load treasurelists\n"; 3543 or die "unable to load treasurelists\n";
3356} 3544}
3357 3545
3546sub reload_sound {
3547 trace "loading sound config from $DATADIR/sound\n";
3548
3549 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3550 or die "$DATADIR/sound $!";
3551
3552 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3553
3554 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3555 my $sound = $soundconf->{compat}[$_]
3556 or next;
3557
3558 my $face = cf::face::find "sound/$sound->[1]";
3559 cf::sound::set $sound->[0] => $face;
3560 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3561 }
3562
3563 while (my ($k, $v) = each %{$soundconf->{event}}) {
3564 my $face = cf::face::find "sound/$v";
3565 cf::sound::set $k => $face;
3566 }
3567}
3568
3358sub reload_resources { 3569sub reload_resources {
3359 warn "reloading resource files...\n"; 3570 trace "reloading resource files...\n";
3360 3571
3572 reload_exp_table;
3573 reload_materials;
3361 reload_facedata; 3574 reload_facedata;
3575 reload_sound;
3362 reload_archetypes; 3576 reload_archetypes;
3363 reload_regions; 3577 reload_regions;
3364 reload_treasures; 3578 reload_treasures;
3365 3579
3366 warn "finished reloading resource files\n"; 3580 trace "finished reloading resource files\n";
3367} 3581}
3368 3582
3369sub reload_config { 3583sub reload_config {
3370 open my $fh, "<:utf8", "$CONFDIR/config" 3584 trace "reloading config file...\n";
3371 or return;
3372 3585
3373 local $/; 3586 0 < aio_load "$CONFDIR/config", my $config
3374 *CFG = YAML::Load <$fh>; 3587 or die "$CONFDIR/config: $!";
3375 3588
3589 utf8::decode $config;
3590 *CFG = yaml_load $config;
3591
3376 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3592 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3377 3593
3378 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3594 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3379 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3595 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3380 3596
3381 if (exists $CFG{mlockall}) { 3597 if (exists $CFG{mlockall}) {
3405 seek $fh, 0, 0; 3621 seek $fh, 0, 0;
3406 print $fh $$; 3622 print $fh $$;
3407} 3623}
3408 3624
3409sub main_loop { 3625sub main_loop {
3410 warn "EV::loop starting\n"; 3626 trace "EV::loop starting\n";
3411 if (1) { 3627 if (1) {
3412 EV::loop; 3628 EV::loop;
3413 } 3629 }
3414 warn "EV::loop returned\n"; 3630 trace "EV::loop returned\n";
3415 goto &main_loop unless $REALLY_UNLOOP; 3631 goto &main_loop unless $REALLY_UNLOOP;
3416} 3632}
3417 3633
3418sub main { 3634sub main {
3419 cf::init_globals; # initialise logging 3635 cf::init_globals; # initialise logging
3420 3636
3421 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3637 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3422 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3638 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3423 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3639 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3424 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3640 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3425
3426 cf::init_experience;
3427 cf::init_anim;
3428 cf::init_attackmess;
3429 cf::init_dynamic;
3430 3641
3431 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3642 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3432 3643
3433 # we must not ever block the main coroutine 3644 # we must not ever block the main coroutine
3434 local $Coro::idle = sub { 3645 local $Coro::idle = sub {
3440 }; 3651 };
3441 3652
3442 evthread_start IO::AIO::poll_fileno; 3653 evthread_start IO::AIO::poll_fileno;
3443 3654
3444 cf::sync_job { 3655 cf::sync_job {
3656 cf::incloader::init ();
3657
3658 cf::init_anim;
3659 cf::init_attackmess;
3660 cf::init_dynamic;
3661
3662 cf::load_settings;
3663
3445 reload_resources; 3664 reload_resources;
3446 reload_config; 3665 reload_config;
3447 db_init; 3666 db_init;
3448 3667
3449 cf::load_settings;
3450 cf::load_materials;
3451 cf::init_uuid; 3668 cf::init_uuid;
3452 cf::init_signals; 3669 cf::init_signals;
3453 cf::init_commands;
3454 cf::init_skills; 3670 cf::init_skills;
3455 3671
3456 cf::init_beforeplay; 3672 cf::init_beforeplay;
3457 3673
3458 atomic; 3674 atomic;
3460 load_extensions; 3676 load_extensions;
3461 3677
3462 utime time, time, $RUNTIMEFILE; 3678 utime time, time, $RUNTIMEFILE;
3463 3679
3464 # no (long-running) fork's whatsoever before this point(!) 3680 # no (long-running) fork's whatsoever before this point(!)
3681 use POSIX ();
3465 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3682 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3466 3683
3467 (pop @POST_INIT)->(0) while @POST_INIT; 3684 cf::_post_init 0;
3468 }; 3685 };
3469 3686
3687 cf::object::thawer::errors_are_fatal 0;
3688 info "parse errors in files are no longer fatal from this point on.\n";
3689
3690 my $free_main; $free_main = EV::idle sub {
3691 undef $free_main;
3692 undef &main; # free gobs of memory :)
3693 };
3694
3470 main_loop; 3695 goto &main_loop;
3471} 3696}
3472 3697
3473############################################################################# 3698#############################################################################
3474# initialisation and cleanup 3699# initialisation and cleanup
3475 3700
3476# install some emergency cleanup handlers 3701# install some emergency cleanup handlers
3477BEGIN { 3702BEGIN {
3478 our %SIGWATCHER = (); 3703 our %SIGWATCHER = ();
3479 for my $signal (qw(INT HUP TERM)) { 3704 for my $signal (qw(INT HUP TERM)) {
3480 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3705 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3481 cf::cleanup "SIG$signal"; 3706 cf::cleanup "SIG$signal";
3482 }; 3707 };
3483 } 3708 }
3484} 3709}
3485 3710
3486sub write_runtime_sync { 3711sub write_runtime_sync {
3712 my $t0 = AE::time;
3713
3487 # first touch the runtime file to show we are still running: 3714 # first touch the runtime file to show we are still running:
3488 # the fsync below can take a very very long time. 3715 # the fsync below can take a very very long time.
3489 3716
3490 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3717 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3491 3718
3492 my $guard = cf::lock_acquire "write_runtime"; 3719 my $guard = cf::lock_acquire "write_runtime";
3493 3720
3494 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3721 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3495 or return; 3722 or return;
3496 3723
3497 my $value = $cf::RUNTIME + 90 + 10; 3724 my $value = $cf::RUNTIME + 90 + 10;
3498 # 10 is the runtime save interval, for a monotonic clock 3725 # 10 is the runtime save interval, for a monotonic clock
3499 # 60 allows for the watchdog to kill the server. 3726 # 60 allows for the watchdog to kill the server.
3512 or return; 3739 or return;
3513 3740
3514 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3741 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3515 and return; 3742 and return;
3516 3743
3517 warn "runtime file written.\n"; 3744 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3518 3745
3519 1 3746 1
3520} 3747}
3521 3748
3522our $uuid_lock; 3749our $uuid_lock;
3534 or return; 3761 or return;
3535 3762
3536 my $value = uuid_seq uuid_cur; 3763 my $value = uuid_seq uuid_cur;
3537 3764
3538 unless ($value) { 3765 unless ($value) {
3539 warn "cowardly refusing to write zero uuid value!\n"; 3766 info "cowardly refusing to write zero uuid value!\n";
3540 return; 3767 return;
3541 } 3768 }
3542 3769
3543 my $value = uuid_str $value + $uuid_skip; 3770 my $value = uuid_str $value + $uuid_skip;
3544 $uuid_skip = 0; 3771 $uuid_skip = 0;
3554 or return; 3781 or return;
3555 3782
3556 aio_rename "$uuid~", $uuid 3783 aio_rename "$uuid~", $uuid
3557 and return; 3784 and return;
3558 3785
3559 warn "uuid file written ($value).\n"; 3786 trace "uuid file written ($value).\n";
3560 3787
3561 1 3788 1
3562 3789
3563} 3790}
3564 3791
3570} 3797}
3571 3798
3572sub emergency_save() { 3799sub emergency_save() {
3573 my $freeze_guard = cf::freeze_mainloop; 3800 my $freeze_guard = cf::freeze_mainloop;
3574 3801
3575 warn "emergency_perl_save: enter\n"; 3802 info "emergency_perl_save: enter\n";
3803
3804 # this is a trade-off: we want to be very quick here, so
3805 # save all maps without fsync, and later call a global sync
3806 # (which in turn might be very very slow)
3807 local $USE_FSYNC = 0;
3576 3808
3577 cf::sync_job { 3809 cf::sync_job {
3578 # this is a trade-off: we want to be very quick here, so 3810 cf::write_runtime_sync; # external watchdog should not bark
3579 # save all maps without fsync, and later call a global sync
3580 # (which in turn might be very very slow)
3581 local $USE_FSYNC = 0;
3582 3811
3583 # use a peculiar iteration method to avoid tripping on perl 3812 # use a peculiar iteration method to avoid tripping on perl
3584 # refcount bugs in for. also avoids problems with players 3813 # refcount bugs in for. also avoids problems with players
3585 # and maps saved/destroyed asynchronously. 3814 # and maps saved/destroyed asynchronously.
3586 warn "emergency_perl_save: begin player save\n"; 3815 info "emergency_perl_save: begin player save\n";
3587 for my $login (keys %cf::PLAYER) { 3816 for my $login (keys %cf::PLAYER) {
3588 my $pl = $cf::PLAYER{$login} or next; 3817 my $pl = $cf::PLAYER{$login} or next;
3589 $pl->valid or next; 3818 $pl->valid or next;
3590 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3819 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3591 $pl->save; 3820 $pl->save;
3592 } 3821 }
3593 warn "emergency_perl_save: end player save\n"; 3822 info "emergency_perl_save: end player save\n";
3594 3823
3824 cf::write_runtime_sync; # external watchdog should not bark
3825
3595 warn "emergency_perl_save: begin map save\n"; 3826 info "emergency_perl_save: begin map save\n";
3596 for my $path (keys %cf::MAP) { 3827 for my $path (keys %cf::MAP) {
3597 my $map = $cf::MAP{$path} or next; 3828 my $map = $cf::MAP{$path} or next;
3598 $map->valid or next; 3829 $map->valid or next;
3599 $map->save; 3830 $map->save;
3600 } 3831 }
3601 warn "emergency_perl_save: end map save\n"; 3832 info "emergency_perl_save: end map save\n";
3602 3833
3834 cf::write_runtime_sync; # external watchdog should not bark
3835
3603 warn "emergency_perl_save: begin database checkpoint\n"; 3836 info "emergency_perl_save: begin database checkpoint\n";
3604 BDB::db_env_txn_checkpoint $DB_ENV; 3837 BDB::db_env_txn_checkpoint $DB_ENV;
3605 warn "emergency_perl_save: end database checkpoint\n"; 3838 info "emergency_perl_save: end database checkpoint\n";
3606 3839
3607 warn "emergency_perl_save: begin write uuid\n"; 3840 info "emergency_perl_save: begin write uuid\n";
3608 write_uuid_sync 1; 3841 write_uuid_sync 1;
3609 warn "emergency_perl_save: end write uuid\n"; 3842 info "emergency_perl_save: end write uuid\n";
3843
3844 cf::write_runtime_sync; # external watchdog should not bark
3845
3846 trace "emergency_perl_save: syncing database to disk";
3847 BDB::db_env_txn_checkpoint $DB_ENV;
3848
3849 info "emergency_perl_save: starting sync\n";
3850 IO::AIO::aio_sync sub {
3851 info "emergency_perl_save: finished sync\n";
3852 };
3853
3854 cf::write_runtime_sync; # external watchdog should not bark
3855
3856 trace "emergency_perl_save: flushing outstanding aio requests";
3857 while (IO::AIO::nreqs || BDB::nreqs) {
3858 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3859 }
3860
3861 cf::write_runtime_sync; # external watchdog should not bark
3610 }; 3862 };
3611 3863
3612 warn "emergency_perl_save: starting sync()\n";
3613 IO::AIO::aio_sync sub {
3614 warn "emergency_perl_save: finished sync()\n";
3615 };
3616
3617 warn "emergency_perl_save: leave\n"; 3864 info "emergency_perl_save: leave\n";
3618} 3865}
3619 3866
3620sub post_cleanup { 3867sub post_cleanup {
3621 my ($make_core) = @_; 3868 my ($make_core) = @_;
3622 3869
3870 IO::AIO::flush;
3871
3623 warn Carp::longmess "post_cleanup backtrace" 3872 error Carp::longmess "post_cleanup backtrace"
3624 if $make_core; 3873 if $make_core;
3625 3874
3626 my $fh = pidfile; 3875 my $fh = pidfile;
3627 unlink $PIDFILE if <$fh> == $$; 3876 unlink $PIDFILE if <$fh> == $$;
3628} 3877}
3648 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3897 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3649 for my $name (keys %$leaf_symtab) { 3898 for my $name (keys %$leaf_symtab) {
3650 _gv_clear *{"$pkg$name"}; 3899 _gv_clear *{"$pkg$name"};
3651# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3900# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3652 } 3901 }
3653 warn "cleared package $pkg\n";#d#
3654} 3902}
3655 3903
3656sub do_reload_perl() { 3904sub do_reload_perl() {
3657 # can/must only be called in main 3905 # can/must only be called in main
3658 if ($Coro::current != $Coro::main) { 3906 unless (in_main) {
3659 warn "can only reload from main coroutine"; 3907 error "can only reload from main coroutine";
3660 return; 3908 return;
3661 } 3909 }
3662 3910
3663 return if $RELOAD++; 3911 return if $RELOAD++;
3664 3912
3665 my $t1 = EV::time; 3913 my $t1 = AE::time;
3666 3914
3667 while ($RELOAD) { 3915 while ($RELOAD) {
3668 warn "reloading..."; 3916 cf::get_slot 0.1, -1, "reload_perl";
3917 info "perl_reload: reloading...";
3669 3918
3670 warn "entering sync_job"; 3919 trace "perl_reload: entering sync_job";
3671 3920
3672 cf::sync_job { 3921 cf::sync_job {
3673 cf::write_runtime_sync; # external watchdog should not bark
3674 cf::emergency_save; 3922 #cf::emergency_save;
3675 cf::write_runtime_sync; # external watchdog should not bark
3676 3923
3677 warn "syncing database to disk";
3678 BDB::db_env_txn_checkpoint $DB_ENV;
3679
3680 # if anything goes wrong in here, we should simply crash as we already saved
3681
3682 warn "flushing outstanding aio requests";
3683 while (IO::AIO::nreqs || BDB::nreqs) {
3684 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3685 }
3686
3687 warn "cancelling all extension coros"; 3924 trace "perl_reload: cancelling all extension coros";
3688 $_->cancel for values %EXT_CORO; 3925 $_->cancel for values %EXT_CORO;
3689 %EXT_CORO = (); 3926 %EXT_CORO = ();
3690 3927
3691 warn "removing commands"; 3928 trace "perl_reload: removing commands";
3692 %COMMAND = (); 3929 %COMMAND = ();
3693 3930
3694 warn "removing ext/exti commands"; 3931 trace "perl_reload: removing ext/exti commands";
3695 %EXTCMD = (); 3932 %EXTCMD = ();
3696 %EXTICMD = (); 3933 %EXTICMD = ();
3697 3934
3698 warn "unloading/nuking all extensions"; 3935 trace "perl_reload: unloading/nuking all extensions";
3699 for my $pkg (@EXTS) { 3936 for my $pkg (@EXTS) {
3700 warn "... unloading $pkg"; 3937 trace "... unloading $pkg";
3701 3938
3702 if (my $cb = $pkg->can ("unload")) { 3939 if (my $cb = $pkg->can ("unload")) {
3703 eval { 3940 eval {
3704 $cb->($pkg); 3941 $cb->($pkg);
3705 1 3942 1
3706 } or warn "$pkg unloaded, but with errors: $@"; 3943 } or error "$pkg unloaded, but with errors: $@";
3707 } 3944 }
3708 3945
3709 warn "... clearing $pkg"; 3946 trace "... clearing $pkg";
3710 clear_package $pkg; 3947 clear_package $pkg;
3711 } 3948 }
3712 3949
3713 warn "unloading all perl modules loaded from $LIBDIR"; 3950 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3714 while (my ($k, $v) = each %INC) { 3951 while (my ($k, $v) = each %INC) {
3715 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3952 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3716 3953
3717 warn "... unloading $k"; 3954 trace "... unloading $k";
3718 delete $INC{$k}; 3955 delete $INC{$k};
3719 3956
3720 $k =~ s/\.pm$//; 3957 $k =~ s/\.pm$//;
3721 $k =~ s/\//::/g; 3958 $k =~ s/\//::/g;
3722 3959
3725 } 3962 }
3726 3963
3727 clear_package $k; 3964 clear_package $k;
3728 } 3965 }
3729 3966
3730 warn "getting rid of safe::, as good as possible"; 3967 trace "perl_reload: getting rid of safe::, as good as possible";
3731 clear_package "safe::$_" 3968 clear_package "safe::$_"
3732 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3969 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3733 3970
3734 warn "unloading cf.pm \"a bit\""; 3971 trace "perl_reload: unloading cf.pm \"a bit\"";
3735 delete $INC{"cf.pm"}; 3972 delete $INC{"cf.pm"};
3736 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3973 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3737 3974
3738 # don't, removes xs symbols, too, 3975 # don't, removes xs symbols, too,
3739 # and global variables created in xs 3976 # and global variables created in xs
3740 #clear_package __PACKAGE__; 3977 #clear_package __PACKAGE__;
3741 3978
3742 warn "unload completed, starting to reload now"; 3979 info "perl_reload: unload completed, starting to reload now";
3743 3980
3744 warn "reloading cf.pm"; 3981 trace "perl_reload: reloading cf.pm";
3745 require cf; 3982 require cf;
3746 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3983 cf::_connect_to_perl_1;
3747 3984
3748 warn "loading config and database again"; 3985 trace "perl_reload: loading config and database again";
3749 cf::reload_config; 3986 cf::reload_config;
3750 3987
3751 warn "loading extensions"; 3988 trace "perl_reload: loading extensions";
3752 cf::load_extensions; 3989 cf::load_extensions;
3753 3990
3754 if ($REATTACH_ON_RELOAD) { 3991 if ($REATTACH_ON_RELOAD) {
3755 warn "reattaching attachments to objects/players"; 3992 trace "perl_reload: reattaching attachments to objects/players";
3756 _global_reattach; # objects, sockets 3993 _global_reattach; # objects, sockets
3757 warn "reattaching attachments to maps"; 3994 trace "perl_reload: reattaching attachments to maps";
3758 reattach $_ for values %MAP; 3995 reattach $_ for values %MAP;
3759 warn "reattaching attachments to players"; 3996 trace "perl_reload: reattaching attachments to players";
3760 reattach $_ for values %PLAYER; 3997 reattach $_ for values %PLAYER;
3761 } 3998 }
3762 3999
3763 warn "running post_init jobs"; 4000 cf::_post_init 1;
3764 (pop @POST_INIT)->(1) while @POST_INIT;
3765 4001
3766 warn "leaving sync_job"; 4002 trace "perl_reload: leaving sync_job";
3767 4003
3768 1 4004 1
3769 } or do { 4005 } or do {
3770 warn $@; 4006 error $@;
3771 cf::cleanup "error while reloading, exiting."; 4007 cf::cleanup "perl_reload: error, exiting.";
3772 }; 4008 };
3773 4009
3774 warn "reloaded";
3775 --$RELOAD; 4010 --$RELOAD;
3776 } 4011 }
3777 4012
3778 $t1 = EV::time - $t1; 4013 $t1 = AE::time - $t1;
3779 warn "reload completed in ${t1}s\n"; 4014 info "perl_reload: completed in ${t1}s\n";
3780}; 4015};
3781 4016
3782our $RELOAD_WATCHER; # used only during reload 4017our $RELOAD_WATCHER; # used only during reload
3783 4018
3784sub reload_perl() { 4019sub reload_perl() {
3786 # coro crashes during coro_state_free->destroy here. 4021 # coro crashes during coro_state_free->destroy here.
3787 4022
3788 $RELOAD_WATCHER ||= cf::async { 4023 $RELOAD_WATCHER ||= cf::async {
3789 Coro::AIO::aio_wait cache_extensions; 4024 Coro::AIO::aio_wait cache_extensions;
3790 4025
3791 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4026 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3792 do_reload_perl; 4027 do_reload_perl;
3793 undef $RELOAD_WATCHER; 4028 undef $RELOAD_WATCHER;
3794 }; 4029 };
3795 }; 4030 };
3796} 4031}
3805 reload_perl; 4040 reload_perl;
3806 }; 4041 };
3807 } 4042 }
3808}; 4043};
3809 4044
3810unshift @INC, $LIBDIR; 4045#############################################################################
3811 4046
3812my $bug_warning = 0; 4047my $bug_warning = 0;
3813 4048
3814our @WAIT_FOR_TICK; 4049our @WAIT_FOR_TICK;
3815our @WAIT_FOR_TICK_BEGIN; 4050our @WAIT_FOR_TICK_BEGIN;
3816 4051
3817sub wait_for_tick { 4052sub wait_for_tick() {
3818 return if tick_inhibit || $Coro::current == $Coro::main; 4053 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3819 4054
3820 my $signal = new Coro::Signal; 4055 my $signal = new Coro::Signal;
3821 push @WAIT_FOR_TICK, $signal; 4056 push @WAIT_FOR_TICK, $signal;
3822 $signal->wait; 4057 $signal->wait;
3823} 4058}
3824 4059
3825sub wait_for_tick_begin { 4060sub wait_for_tick_begin() {
3826 return if tick_inhibit || $Coro::current == $Coro::main; 4061 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3827 4062
3828 my $signal = new Coro::Signal; 4063 my $signal = new Coro::Signal;
3829 push @WAIT_FOR_TICK_BEGIN, $signal; 4064 push @WAIT_FOR_TICK_BEGIN, $signal;
3830 $signal->wait; 4065 $signal->wait;
3831} 4066}
3837 return; 4072 return;
3838 } 4073 }
3839 4074
3840 cf::server_tick; # one server iteration 4075 cf::server_tick; # one server iteration
3841 4076
4077 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4078
3842 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4079 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3843 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4080 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3844 Coro::async_pool { 4081 Coro::async_pool {
3845 $Coro::current->{desc} = "runtime saver"; 4082 $Coro::current->{desc} = "runtime saver";
3846 write_runtime_sync 4083 write_runtime_sync
3847 or warn "ERROR: unable to write runtime file: $!"; 4084 or error "ERROR: unable to write runtime file: $!";
3848 }; 4085 };
3849 } 4086 }
3850 4087
3851 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4088 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3852 $sig->send; 4089 $sig->send;
3860 4097
3861 if (0) { 4098 if (0) {
3862 if ($NEXT_TICK) { 4099 if ($NEXT_TICK) {
3863 my $jitter = $TICK_START - $NEXT_TICK; 4100 my $jitter = $TICK_START - $NEXT_TICK;
3864 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4101 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3865 warn "jitter $JITTER\n";#d# 4102 debug "jitter $JITTER\n";#d#
3866 } 4103 }
3867 } 4104 }
3868} 4105}
3869 4106
3870{ 4107{
3871 # configure BDB 4108 # configure BDB
3872 4109
3873 BDB::min_parallel 8; 4110 BDB::min_parallel 16;
3874 BDB::max_poll_reqs $TICK * 0.1; 4111 BDB::max_poll_reqs $TICK * 0.1;
3875 $AnyEvent::BDB::WATCHER->priority (1); 4112 $AnyEvent::BDB::WATCHER->priority (1);
3876 4113
3877 unless ($DB_ENV) { 4114 unless ($DB_ENV) {
3878 $DB_ENV = BDB::db_env_create; 4115 $DB_ENV = BDB::db_env_create;
3915 IO::AIO::min_parallel 8; 4152 IO::AIO::min_parallel 8;
3916 IO::AIO::max_poll_time $TICK * 0.1; 4153 IO::AIO::max_poll_time $TICK * 0.1;
3917 undef $AnyEvent::AIO::WATCHER; 4154 undef $AnyEvent::AIO::WATCHER;
3918} 4155}
3919 4156
3920my $_log_backtrace; 4157our $_log_backtrace;
4158our $_log_backtrace_last;
3921 4159
3922sub _log_backtrace { 4160sub _log_backtrace {
3923 my ($msg, @addr) = @_; 4161 my ($msg, @addr) = @_;
3924 4162
3925 $msg =~ s/\n//; 4163 $msg =~ s/\n$//;
3926 4164
4165 if ($_log_backtrace_last eq $msg) {
4166 LOG llevInfo, "[ABT] $msg\n";
4167 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3927 # limit the # of concurrent backtraces 4168 # limit the # of concurrent backtraces
3928 if ($_log_backtrace < 2) { 4169 } elsif ($_log_backtrace < 2) {
4170 $_log_backtrace_last = $msg;
3929 ++$_log_backtrace; 4171 ++$_log_backtrace;
3930 my $perl_bt = Carp::longmess $msg; 4172 my $perl_bt = Carp::longmess $msg;
3931 async { 4173 async {
3932 $Coro::current->{desc} = "abt $msg"; 4174 $Coro::current->{desc} = "abt $msg";
3933 4175
3953 LOG llevInfo, "[ABT] $_\n" for @bt; 4195 LOG llevInfo, "[ABT] $_\n" for @bt;
3954 --$_log_backtrace; 4196 --$_log_backtrace;
3955 }; 4197 };
3956 } else { 4198 } else {
3957 LOG llevInfo, "[ABT] $msg\n"; 4199 LOG llevInfo, "[ABT] $msg\n";
3958 LOG llevInfo, "[ABT] [suppressed]\n"; 4200 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3959 } 4201 }
3960} 4202}
3961 4203
3962# load additional modules 4204# load additional modules
3963require "cf/$_.pm" for @EXTRA_MODULES; 4205require "cf/$_.pm" for @EXTRA_MODULES;
4206cf::_connect_to_perl_2;
3964 4207
3965END { cf::emergency_save } 4208END { cf::emergency_save }
3966 4209
39671 42101
3968 4211

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines