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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines