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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines