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.473 by root, Fri Jun 26 16:32:10 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
72 71
73# make sure c-lzf reinitialises itself 72# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
76 75
76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
78
77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
78 82
79our %COMMAND = (); 83our %COMMAND = ();
80our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
81 85
82our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
85our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
86our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
87 91
88our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
89our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
90 96
91our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
92our $DATADIR = datadir; 99our $DATADIR = datadir;
93our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
94our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
95our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
96our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
97our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
99our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
100our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
101our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
104 112
105our %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;
106 120
107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109our $NEXT_TICK; 123our $NEXT_TICK;
110our $USE_FSYNC = 1; # use fsync to write maps - default on 124our $USE_FSYNC = 1; # use fsync to write maps - default on
112our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
114our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
115our $DB_ENV; 129our $DB_ENV;
116 130
117our @EXTRA_MODULES = qw(pod mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
118 132
119our %CFG; 133our %CFG;
120 134
121our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
122our $RUNTIME; 136our $RUNTIME;
134our $JITTER; # average jitter 148our $JITTER; # average jitter
135our $TICK_START; # for load detecting purposes 149our $TICK_START; # for load detecting purposes
136 150
137our @POST_INIT; 151our @POST_INIT;
138 152
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 153our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
154our $REALLY_UNLOOP; # never set to true, please :)
140 155
141binmode STDOUT; 156binmode STDOUT;
142binmode STDERR; 157binmode STDERR;
143 158
144# read virtual server time, if available 159# read virtual server time, if available
155 170
156our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
157 172
158sub cf::map::normalise; 173sub cf::map::normalise;
159 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
160############################################################################# 190#############################################################################
161 191
162=head2 GLOBAL VARIABLES 192=head2 GLOBAL VARIABLES
163 193
164=over 4 194=over 4
205from wherever your confdir points to. 235from wherever your confdir points to.
206 236
207=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
208 238
209These 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
210returns 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
211per 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.
212 242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
247
213=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
214 249
215This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
216C<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
217that call. 252that call.
218 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
219=back 260=back
220 261
221=cut 262=cut
222 263
223BEGIN { 264sub error(@) { LOG llevError, join "", @_ }
224 *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 {
225 my $msg = join "", @_; 271 my $msg = join "", @_;
226 272
227 $msg .= "\n" 273 $msg .= "\n"
228 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
229 275
230 $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;
231 277
232 LOG llevError, $msg; 278 LOG llevWarn, $msg;
233 }; 279};
234}
235 280
236$Coro::State::DIEHOOK = sub { 281$Coro::State::DIEHOOK = sub {
237 return unless $^S eq 0; # "eq", not "==" 282 return unless $^S eq 0; # "eq", not "=="
238 283
239 if ($Coro::current == $Coro::main) {#d# 284 error Carp::longmess $_[0];
285
286 if (in_main) {#d#
240 warn "DIEHOOK called in main context, Coro bug?\n";#d# 287 error "DIEHOOK called in main context, Coro bug?\n";#d#
241 return;#d# 288 return;#d#
242 }#d# 289 }#d#
243 290
244 # kill coroutine otherwise 291 # kill coroutine otherwise
245 warn Carp::longmess $_[0];
246 Coro::terminate 292 Coro::terminate
247}; 293};
248
249$SIG{__DIE__} = sub { }; #d#?
250 294
251@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 295@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
252@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 296@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
253@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 297@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
254@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 298@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
268)) { 312)) {
269 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
270} 314}
271 315
272$EV::DIED = sub { 316$EV::DIED = sub {
273 warn "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
274}; 318};
275 319
276############################################################################# 320#############################################################################
277 321
278=head2 UTILITY FUNCTIONS 322=head2 UTILITY FUNCTIONS
315our $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
316 360
317sub encode_json($) { $json_coder->encode ($_[0]) } 361sub encode_json($) { $json_coder->encode ($_[0]) }
318sub decode_json($) { $json_coder->decode ($_[0]) } 362sub decode_json($) { $json_coder->decode ($_[0]) }
319 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
320=item cf::post_init { BLOCK } 376=item cf::post_init { BLOCK }
321 377
322Execute the given codeblock, I<after> all extensions have been (re-)loaded, 378Execute the given codeblock, I<after> all extensions have been (re-)loaded,
323but I<before> the server starts ticking again. 379but I<before> the server starts ticking again.
324 380
325The cdoeblock will have a single boolean argument to indicate whether this 381The codeblock will have a single boolean argument to indicate whether this
326is a reload or not. 382is a reload or not.
327 383
328=cut 384=cut
329 385
330sub post_init(&) { 386sub post_init(&) {
331 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 }
332} 405}
333 406
334=item cf::lock_wait $string 407=item cf::lock_wait $string
335 408
336Wait until the given lock is available. See cf::lock_acquire. 409Wait until the given lock is available. See cf::lock_acquire.
375} 448}
376 449
377=item cf::periodic $interval, $cb 450=item cf::periodic $interval, $cb
378 451
379Like 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
380get spread over timer. 453get spread over time.
381 454
382=cut 455=cut
383 456
384sub periodic($$) { 457sub periodic($$) {
385 my ($interval, $cb) = @_; 458 my ($interval, $cb) = @_;
402 475
403=cut 476=cut
404 477
405our @SLOT_QUEUE; 478our @SLOT_QUEUE;
406our $SLOT_QUEUE; 479our $SLOT_QUEUE;
480our $SLOT_DECAY = 0.9;
407 481
408$SLOT_QUEUE->cancel if $SLOT_QUEUE; 482$SLOT_QUEUE->cancel if $SLOT_QUEUE;
409$SLOT_QUEUE = Coro::async { 483$SLOT_QUEUE = Coro::async {
410 $Coro::current->desc ("timeslot manager"); 484 $Coro::current->desc ("timeslot manager");
411 485
412 my $signal = new Coro::Signal; 486 my $signal = new Coro::Signal;
487 my $busy;
413 488
414 while () { 489 while () {
415 next_job: 490 next_job:
491
416 my $avail = cf::till_tick; 492 my $avail = cf::till_tick;
417 if ($avail > 0.01) { 493
418 for (0 .. $#SLOT_QUEUE) { 494 for (0 .. $#SLOT_QUEUE) {
419 if ($SLOT_QUEUE[$_][0] < $avail) { 495 if ($SLOT_QUEUE[$_][0] <= $avail) {
496 $busy = 0;
420 my $job = splice @SLOT_QUEUE, $_, 1, (); 497 my $job = splice @SLOT_QUEUE, $_, 1, ();
421 $job->[2]->send; 498 $job->[2]->send;
422 Coro::cede; 499 Coro::cede;
423 goto next_job; 500 goto next_job;
424 } 501 } else {
502 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
425 } 503 }
426 } 504 }
427 505
428 if (@SLOT_QUEUE) { 506 if (@SLOT_QUEUE) {
429 # 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
430 push @cf::WAIT_FOR_TICK, $signal; 508 push @cf::WAIT_FOR_TICK, $signal;
431 $signal->wait; 509 $signal->wait;
432 } else { 510 } else {
511 $busy = 0;
433 Coro::schedule; 512 Coro::schedule;
434 } 513 }
435 } 514 }
436}; 515};
437 516
438sub get_slot($;$$) { 517sub get_slot($;$$) {
439 return if tick_inhibit || $Coro::current == $Coro::main; 518 return if tick_inhibit || $Coro::current == $Coro::main;
440 519
441 my ($time, $pri, $name) = @_; 520 my ($time, $pri, $name) = @_;
442 521
443 $time = $TICK * .6 if $time > $TICK * .6; 522 $time = clamp $time, 0.01, $TICK * .6;
523
444 my $sig = new Coro::Signal; 524 my $sig = new Coro::Signal;
445 525
446 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 526 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
447 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 527 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
448 $SLOT_QUEUE->ready; 528 $SLOT_QUEUE->ready;
474=cut 554=cut
475 555
476sub sync_job(&) { 556sub sync_job(&) {
477 my ($job) = @_; 557 my ($job) = @_;
478 558
479 if ($Coro::current == $Coro::main) { 559 if (in_main) {
480 my $time = EV::time; 560 my $time = AE::time;
481 561
482 # this is the main coro, too bad, we have to block 562 # this is the main coro, too bad, we have to block
483 # till the operation succeeds, freezing the server :/ 563 # till the operation succeeds, freezing the server :/
484 564
485 LOG llevError, Carp::longmess "sync job";#d# 565 #LOG llevError, Carp::longmess "sync job";#d#
486 566
487 my $freeze_guard = freeze_mainloop; 567 my $freeze_guard = freeze_mainloop;
488 568
489 my $busy = 1; 569 my $busy = 1;
490 my @res; 570 my @res;
491 571
492 (async { 572 (async {
493 $Coro::current->desc ("sync job coro"); 573 $Coro::current->desc ("sync job coro");
494 @res = eval { $job->() }; 574 @res = eval { $job->() };
495 warn $@ if $@; 575 error $@ if $@;
496 undef $busy; 576 undef $busy;
497 })->prio (Coro::PRIO_MAX); 577 })->prio (Coro::PRIO_MAX);
498 578
499 while ($busy) { 579 while ($busy) {
500 if (Coro::nready) { 580 if (Coro::nready) {
502 } else { 582 } else {
503 EV::loop EV::LOOP_ONESHOT; 583 EV::loop EV::LOOP_ONESHOT;
504 } 584 }
505 } 585 }
506 586
507 my $time = EV::time - $time; 587 my $time = AE::time - $time;
508 588
509 $TICK_START += $time; # do not account sync jobs to server load 589 $TICK_START += $time; # do not account sync jobs to server load
510 590
511 wantarray ? @res : $res[0] 591 wantarray ? @res : $res[0]
512 } else { 592 } else {
534 $EXT_CORO{$coro+0} = $coro; 614 $EXT_CORO{$coro+0} = $coro;
535 615
536 $coro 616 $coro
537} 617}
538 618
539=item fork_call { }, $args 619=item fork_call { }, @args
540 620
541Executes the given code block with the given arguments in a seperate 621Executes the given code block with the given arguments in a seperate
542process, returning the results. Everything must be serialisable with 622process, returning the results. Everything must be serialisable with
543Coro::Storable. May, of course, block. Note that the executed sub may 623Coro::Storable. May, of course, block. Note that the executed sub may
544never block itself or use any form of event handling. 624never block itself or use any form of event handling.
545 625
546=cut 626=cut
547 627
628sub post_fork {
629 reset_signals;
630}
631
548sub fork_call(&@) { 632sub fork_call(&@) {
549 my ($cb, @args) = @_; 633 my ($cb, @args) = @_;
550 634
551 # 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,
552 # otherwise perl prematurely frees the stuff :/ 636 # otherwise perl prematurely frees the stuff :/
553 # TODO: investigate and fix (likely this will be rather laborious) 637 # TODO: investigate and fix (likely this will be rather laborious)
554 638
555 my @res = Coro::Util::fork_eval { 639 my @res = Coro::Util::fork_eval {
556 reset_signals; 640 cf::post_fork;
557 &$cb 641 &$cb
558 }, @args; 642 } @args;
559 643
560 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 )
561} 656}
562 657
563=item $coin = coin_from_name $name 658=item $coin = coin_from_name $name
564 659
565=cut 660=cut
602within each server. 697within each server.
603 698
604=cut 699=cut
605 700
606sub db_table($) { 701sub db_table($) {
702 cf::error "db_get called from main context"
703 if $Coro::current == $Coro::main;
704
607 my ($name) = @_; 705 my ($name) = @_;
608 my $db = BDB::db_create $DB_ENV; 706 my $db = BDB::db_create $DB_ENV;
609 707
610 eval { 708 eval {
611 $db->set_flags (BDB::CHKSUM); 709 $db->set_flags (BDB::CHKSUM);
621} 719}
622 720
623our $DB; 721our $DB;
624 722
625sub db_init { 723sub db_init {
626 cf::sync_job {
627 $DB ||= db_table "db"; 724 $DB ||= db_table "db";
628 };
629} 725}
630 726
631sub db_get($$) { 727sub db_get($$) {
632 my $key = "$_[0]/$_[1]"; 728 my $key = "$_[0]/$_[1]";
633 729
634 cf::sync_job { 730 cf::error "db_get called from main context"
731 if $Coro::current == $Coro::main;
732
635 BDB::db_get $DB, undef, $key, my $data; 733 BDB::db_get $DB, undef, $key, my $data;
636 734
637 $! ? () 735 $! ? ()
638 : $data 736 : $data
639 }
640} 737}
641 738
642sub db_put($$$) { 739sub db_put($$$) {
643 BDB::dbreq_pri 4; 740 BDB::dbreq_pri 4;
644 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 741 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
700 797
701 my $t1 = Time::HiRes::time; 798 my $t1 = Time::HiRes::time;
702 my $data = $process->(\@data); 799 my $data = $process->(\@data);
703 my $t2 = Time::HiRes::time; 800 my $t2 = Time::HiRes::time;
704 801
705 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 802 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
706 803
707 db_put cache => "$id/data", $data; 804 db_put cache => "$id/data", $data;
708 db_put cache => "$id/md5" , $md5; 805 db_put cache => "$id/md5" , $md5;
709 db_put cache => "$id/meta", $meta; 806 db_put cache => "$id/meta", $meta;
710 807
720 817
721=cut 818=cut
722 819
723sub datalog($@) { 820sub datalog($@) {
724 my ($type, %kv) = @_; 821 my ($type, %kv) = @_;
725 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 822 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
726} 823}
727 824
728=back 825=back
729 826
730=cut 827=cut
925 1022
926 } elsif (exists $cb_id{$type}) { 1023 } elsif (exists $cb_id{$type}) {
927 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1024 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
928 1025
929 } elsif (ref $type) { 1026 } elsif (ref $type) {
930 warn "attaching objects not supported, ignoring.\n"; 1027 error "attaching objects not supported, ignoring.\n";
931 1028
932 } else { 1029 } else {
933 shift @arg; 1030 shift @arg;
934 warn "attach argument '$type' not supported, ignoring.\n"; 1031 error "attach argument '$type' not supported, ignoring.\n";
935 } 1032 }
936 } 1033 }
937} 1034}
938 1035
939sub _object_attach { 1036sub _object_attach {
949 _attach $registry, $klass, @attach; 1046 _attach $registry, $klass, @attach;
950 } 1047 }
951 1048
952 $obj->{$name} = \%arg; 1049 $obj->{$name} = \%arg;
953 } else { 1050 } else {
954 warn "object uses attachment '$name' which is not available, postponing.\n"; 1051 info "object uses attachment '$name' which is not available, postponing.\n";
955 } 1052 }
956 1053
957 $obj->{_attachment}{$name} = undef; 1054 $obj->{_attachment}{$name} = undef;
958} 1055}
959 1056
1018 1115
1019 for (@$callbacks) { 1116 for (@$callbacks) {
1020 eval { &{$_->[1]} }; 1117 eval { &{$_->[1]} };
1021 1118
1022 if ($@) { 1119 if ($@) {
1023 warn "$@";
1024 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1120 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1025 override; 1121 override;
1026 } 1122 }
1027 1123
1028 return 1 if $override; 1124 return 1 if $override;
1029 } 1125 }
1108 for (@$attach) { 1204 for (@$attach) {
1109 my ($klass, @attach) = @$_; 1205 my ($klass, @attach) = @$_;
1110 _attach $registry, $klass, @attach; 1206 _attach $registry, $klass, @attach;
1111 } 1207 }
1112 } else { 1208 } else {
1113 warn "object uses attachment '$name' that is not available, postponing.\n"; 1209 info "object uses attachment '$name' that is not available, postponing.\n";
1114 } 1210 }
1115 } 1211 }
1116} 1212}
1117 1213
1118cf::attachable->attach ( 1214cf::attachable->attach (
1145 my ($filename, $rdata, $objs) = @_; 1241 my ($filename, $rdata, $objs) = @_;
1146 1242
1147 sync_job { 1243 sync_job {
1148 if (length $$rdata) { 1244 if (length $$rdata) {
1149 utf8::decode (my $decname = $filename); 1245 utf8::decode (my $decname = $filename);
1150 warn sprintf "saving %s (%d,%d)\n", 1246 trace sprintf "saving %s (%d,%d)\n",
1151 $decname, length $$rdata, scalar @$objs; 1247 $decname, length $$rdata, scalar @$objs
1248 if $VERBOSE_IO;
1152 1249
1153 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1250 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1154 aio_chmod $fh, SAVE_MODE; 1251 aio_chmod $fh, SAVE_MODE;
1155 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1252 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1156 if ($cf::USE_FSYNC) { 1253 if ($cf::USE_FSYNC) {
1178 aio_rename "$filename~", $filename; 1275 aio_rename "$filename~", $filename;
1179 1276
1180 $filename =~ s%/[^/]+$%%; 1277 $filename =~ s%/[^/]+$%%;
1181 aio_pathsync $filename if $cf::USE_FSYNC; 1278 aio_pathsync $filename if $cf::USE_FSYNC;
1182 } else { 1279 } else {
1183 warn "unable to save objects: $filename~: $!\n"; 1280 error "unable to save objects: $filename~: $!\n";
1184 } 1281 }
1185 } else { 1282 } else {
1186 aio_unlink $filename; 1283 aio_unlink $filename;
1187 aio_unlink "$filename.pst"; 1284 aio_unlink "$filename.pst";
1188 } 1285 }
1212 my $st = eval { Coro::Storable::thaw $av }; 1309 my $st = eval { Coro::Storable::thaw $av };
1213 $av = $st->{objs}; 1310 $av = $st->{objs};
1214 } 1311 }
1215 1312
1216 utf8::decode (my $decname = $filename); 1313 utf8::decode (my $decname = $filename);
1217 warn sprintf "loading %s (%d,%d)\n", 1314 trace sprintf "loading %s (%d,%d)\n",
1218 $decname, length $data, scalar @{$av || []}; 1315 $decname, length $data, scalar @{$av || []}
1316 if $VERBOSE_IO;
1219 1317
1220 ($data, $av) 1318 ($data, $av)
1221} 1319}
1222 1320
1223=head2 COMMAND CALLBACKS 1321=head2 COMMAND CALLBACKS
1282} 1380}
1283 1381
1284use File::Glob (); 1382use File::Glob ();
1285 1383
1286cf::player->attach ( 1384cf::player->attach (
1287 on_command => sub { 1385 on_unknown_command => sub {
1288 my ($pl, $name, $params) = @_; 1386 my ($pl, $name, $params) = @_;
1289 1387
1290 my $cb = $COMMAND{$name} 1388 my $cb = $COMMAND{$name}
1291 or return; 1389 or return;
1292 1390
1315 1413
1316 $pl->ext_reply ($reply, @reply) 1414 $pl->ext_reply ($reply, @reply)
1317 if $reply; 1415 if $reply;
1318 1416
1319 } else { 1417 } else {
1320 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1418 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1321 } 1419 }
1322 1420
1323 cf::override; 1421 cf::override;
1324 }, 1422 },
1325); 1423);
1336 1434
1337 $grp 1435 $grp
1338} 1436}
1339 1437
1340sub load_extensions { 1438sub load_extensions {
1439 info "loading extensions...";
1440
1341 cf::sync_job { 1441 cf::sync_job {
1342 my %todo; 1442 my %todo;
1343 1443
1344 for my $path (<$LIBDIR/*.ext>) { 1444 for my $path (<$LIBDIR/*.ext>) {
1345 next unless -r $path; 1445 next unless -r $path;
1363 1463
1364 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1464 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1365 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1465 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1366 1466
1367 $ext{source} = 1467 $ext{source} =
1368 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1468 "package $pkg; use common::sense;\n"
1369 . "#line 1 \"$path\"\n{\n" 1469 . "#line 1 \"$path\"\n{\n"
1370 . $source 1470 . $source
1371 . "\n};\n1"; 1471 . "\n};\n1";
1372 1472
1373 $todo{$base} = \%ext; 1473 $todo{$base} = \%ext;
1374 } 1474 }
1375 1475
1476 my $pass = 0;
1376 my %done; 1477 my %done;
1377 while (%todo) { 1478 while (%todo) {
1378 my $progress; 1479 my $progress;
1379 1480
1481 ++$pass;
1482
1483 ext:
1380 while (my ($k, $v) = each %todo) { 1484 while (my ($k, $v) = each %todo) {
1381 for (split /,\s*/, $v->{meta}{depends}) { 1485 for (split /,\s*/, $v->{meta}{depends}) {
1382 goto skip 1486 next ext
1383 unless exists $done{$_}; 1487 unless exists $done{$_};
1384 } 1488 }
1385 1489
1386 warn "... loading '$k' into '$v->{pkg}'\n"; 1490 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1387 1491
1388 unless (eval $v->{source}) { 1492 my $active = eval $v->{source};
1493
1494 if (length $@) {
1389 my $msg = $@ ? "$v->{path}: $@\n" 1495 error "$v->{path}: $@\n";
1390 : "$v->{base}: extension inactive.\n";
1391 1496
1392 if (exists $v->{meta}{mandatory}) {
1393 warn $msg;
1394 cf::cleanup "mandatory extension failed to load, exiting."; 1497 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1395 } 1498 if exists $v->{meta}{mandatory};
1396 1499
1397 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;
1398 } 1509 }
1399
1400 $done{$k} = delete $todo{$k};
1401 push @EXTS, $v->{pkg};
1402 $progress = 1;
1403 } 1510 }
1404 1511
1405 skip: 1512 unless ($progress) {
1406 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1513 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1407 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 }
1408 } 1520 }
1409 }; 1521 };
1410} 1522}
1411 1523
1412############################################################################# 1524#############################################################################
1496 $cf::PLAYER{$login} = $pl 1608 $cf::PLAYER{$login} = $pl
1497 } 1609 }
1498 } 1610 }
1499} 1611}
1500 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
1501sub save($) { 1626sub save($) {
1502 my ($pl) = @_; 1627 my ($pl) = @_;
1503 1628
1504 return if $pl->{deny_save}; 1629 return if $pl->{deny_save};
1505 1630
1510 1635
1511 aio_mkdir playerdir $pl, 0770; 1636 aio_mkdir playerdir $pl, 0770;
1512 $pl->{last_save} = $cf::RUNTIME; 1637 $pl->{last_save} = $cf::RUNTIME;
1513 1638
1514 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];
1515 1643
1516 $pl->save_pl ($path); 1644 $pl->save_pl ($path);
1517 cf::cede_to_tick; 1645 cf::cede_to_tick;
1518} 1646}
1519 1647
1553 my $name = $pl->ob->name; 1681 my $name = $pl->ob->name;
1554 1682
1555 $pl->{deny_save} = 1; 1683 $pl->{deny_save} = 1;
1556 $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
1557 1685
1558 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1686 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1559 $pl->deactivate; 1687 $pl->deactivate;
1688
1560 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;
1561 $pl->ob->check_score;
1562 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1690 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1691 ext::highscore::check ($pl->ob);
1692
1563 $pl->ns->destroy if $pl->ns; 1693 $pl->ns->destroy if $pl->ns;
1564 1694
1565 my $path = playerdir $pl; 1695 my $path = playerdir $pl;
1566 my $temp = "$path~$cf::RUNTIME~deleting~"; 1696 my $temp = "$path~$cf::RUNTIME~deleting~";
1567 aio_rename $path, $temp; 1697 aio_rename $path, $temp;
1621 \@logins 1751 \@logins
1622} 1752}
1623 1753
1624=item $player->maps 1754=item $player->maps
1625 1755
1756=item cf::player::maps $login
1757
1626Returns an arrayref of map paths that are private for this 1758Returns an arrayref of map paths that are private for this
1627player. May block. 1759player. May block.
1628 1760
1629=cut 1761=cut
1630 1762
1692=cut 1824=cut
1693 1825
1694sub find_by_path($) { 1826sub find_by_path($) {
1695 my ($path) = @_; 1827 my ($path) = @_;
1696 1828
1829 $path =~ s/^~[^\/]*//; # skip ~login
1830
1697 my ($match, $specificity); 1831 my ($match, $specificity);
1698 1832
1699 for my $region (list) { 1833 for my $region (list) {
1700 if ($region->{match} && $path =~ $region->{match}) { 1834 if ($region->{match} && $path =~ $region->{match}) {
1701 ($match, $specificity) = ($region, $region->specificity) 1835 ($match, $specificity) = ($region, $region->specificity)
1729sub generate_random_map { 1863sub generate_random_map {
1730 my ($self, $rmp) = @_; 1864 my ($self, $rmp) = @_;
1731 1865
1732 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
1733 1867
1734 # mit "rum" bekleckern, nicht
1735 $self->_create_random_map ( 1868 $self->_create_random_map ($rmp);
1736 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1737 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1738 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1739 $rmp->{exit_on_final_map},
1740 $rmp->{xsize}, $rmp->{ysize},
1741 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1742 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1743 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1744 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1745 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1746 (cf::region::find $rmp->{region}), $rmp->{custom}
1747 )
1748} 1869}
1749 1870
1750=item cf::map->register ($regex, $prio) 1871=item cf::map->register ($regex, $prio)
1751 1872
1752Register 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
1757 1878
1758sub register { 1879sub register {
1759 my (undef, $regex, $prio) = @_; 1880 my (undef, $regex, $prio) = @_;
1760 my $pkg = caller; 1881 my $pkg = caller;
1761 1882
1762 no strict;
1763 push @{"$pkg\::ISA"}, __PACKAGE__; 1883 push @{"$pkg\::ISA"}, __PACKAGE__;
1764 1884
1765 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1885 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1766} 1886}
1767 1887
1768# also paths starting with '/' 1888# also paths starting with '/'
1769$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1889$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1770 1890
1771sub thawer_merge { 1891sub thawer_merge {
1772 my ($self, $merge) = @_; 1892 my ($self, $merge) = @_;
1773 1893
1774 # we have to keep some variables in memory intact 1894 # we have to keep some variables in memory intact
1779} 1899}
1780 1900
1781sub normalise { 1901sub normalise {
1782 my ($path, $base) = @_; 1902 my ($path, $base) = @_;
1783 1903
1784 $path = "$path"; # make sure its a string 1904 $path = "$path"; # make sure it's a string
1785 1905
1786 $path =~ s/\.map$//; 1906 $path =~ s/\.map$//;
1787 1907
1788 # map plan: 1908 # map plan:
1789 # 1909 #
1804 $base =~ s{[^/]+/?$}{}; 1924 $base =~ s{[^/]+/?$}{};
1805 $path = "$base/$path"; 1925 $path = "$base/$path";
1806 } 1926 }
1807 1927
1808 for ($path) { 1928 for ($path) {
1809 redo if s{//}{/};
1810 redo if s{/\.?/}{/}; 1929 redo if s{/\.?/}{/};
1811 redo if s{/[^/]+/\.\./}{/}; 1930 redo if s{/[^/]+/\.\./}{/};
1812 } 1931 }
1813 1932
1814 $path 1933 $path
1828 $self->init; # pass $1 etc. 1947 $self->init; # pass $1 etc.
1829 return $self; 1948 return $self;
1830 } 1949 }
1831 } 1950 }
1832 1951
1833 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1952 Carp::cluck "unable to resolve path '$path' (base '$base')";
1834 () 1953 ()
1835} 1954}
1836 1955
1837sub init { 1956sub init {
1838 my ($self) = @_; 1957 my ($self) = @_;
1960} 2079}
1961 2080
1962sub find; 2081sub find;
1963sub find { 2082sub find {
1964 my ($path, $origin) = @_; 2083 my ($path, $origin) = @_;
2084
2085 cf::cede_to_tick;
1965 2086
1966 $path = normalise $path, $origin && $origin->path; 2087 $path = normalise $path, $origin && $origin->path;
1967 2088
1968 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2089 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1969 my $guard2 = cf::lock_acquire "map_find:$path"; 2090 my $guard2 = cf::lock_acquire "map_find:$path";
1988 2109
1989 $cf::MAP{$path} = $map 2110 $cf::MAP{$path} = $map
1990 } 2111 }
1991} 2112}
1992 2113
1993sub pre_load { } 2114sub pre_load { }
1994sub post_load { } 2115#sub post_load { } # XS
1995 2116
1996sub load { 2117sub load {
1997 my ($self) = @_; 2118 my ($self) = @_;
1998 2119
1999 local $self->{deny_reset} = 1; # loading can take a long time 2120 local $self->{deny_reset} = 1; # loading can take a long time
2054 2175
2055 $self->in_memory (cf::MAP_ACTIVE); 2176 $self->in_memory (cf::MAP_ACTIVE);
2056 } 2177 }
2057 2178
2058 $self->post_load; 2179 $self->post_load;
2059}
2060 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
2061sub customise_for { 2187sub customise_for {
2062 my ($self, $ob) = @_; 2188 my ($self, $ob) = @_;
2063 2189
2064 return find "~" . $ob->name . "/" . $self->{path} 2190 return find "~" . $ob->name . "/" . $self->{path}
2065 if $self->per_player; 2191 if $self->per_player;
2081 or next; 2207 or next;
2082 $neigh = find $neigh, $map 2208 $neigh = find $neigh, $map
2083 or next; 2209 or next;
2084 $neigh->load; 2210 $neigh->load;
2085 2211
2212 # now find the diagonal neighbours
2086 push @neigh, 2213 push @neigh,
2087 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2214 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2088 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2215 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2089 } 2216 }
2090 2217
2097} 2224}
2098 2225
2099sub find_sync { 2226sub find_sync {
2100 my ($path, $origin) = @_; 2227 my ($path, $origin) = @_;
2101 2228
2102 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
2103} 2233}
2104 2234
2105sub do_load_sync { 2235sub do_load_sync {
2106 my ($map) = @_; 2236 my ($map) = @_;
2107 2237
2108 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2238 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2109 if $Coro::current == $Coro::main; 2239 if $Coro::current == $Coro::main;
2110 2240
2111 cf::sync_job { $map->load }; 2241 $map->load;
2112} 2242}
2113 2243
2114our %MAP_PREFETCH; 2244our %MAP_PREFETCH;
2115our $MAP_PREFETCHER = undef; 2245our $MAP_PREFETCHER = undef;
2116 2246
2142 $MAP_PREFETCHER->prio (6); 2272 $MAP_PREFETCHER->prio (6);
2143 2273
2144 () 2274 ()
2145} 2275}
2146 2276
2277# common code, used by both ->save and ->swapout
2147sub save { 2278sub _save {
2148 my ($self) = @_; 2279 my ($self) = @_;
2149
2150 my $lock = cf::lock_acquire "map_data:$self->{path}";
2151 2280
2152 $self->{last_save} = $cf::RUNTIME; 2281 $self->{last_save} = $cf::RUNTIME;
2153 2282
2154 return unless $self->dirty; 2283 return unless $self->dirty;
2155 2284
2175 } else { 2304 } else {
2176 $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);
2177 } 2306 }
2178} 2307}
2179 2308
2309sub save {
2310 my ($self) = @_;
2311
2312 my $lock = cf::lock_acquire "map_data:$self->{path}";
2313
2314 $self->_save;
2315}
2316
2180sub swap_out { 2317sub swap_out {
2181 my ($self) = @_; 2318 my ($self) = @_;
2182 2319
2183 # save first because save cedes
2184 $self->save;
2185
2186 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2320 my $lock = cf::lock_acquire "map_data:$self->{path}";
2187 2321
2188 return if $self->players;
2189 return if $self->in_memory != cf::MAP_ACTIVE; 2322 return if $self->in_memory != cf::MAP_ACTIVE;
2190 return if $self->{deny_save}; 2323 return if $self->{deny_save};
2324 return if $self->players;
2191 2325
2326 # first deactivate the map and "unlink" it from the core
2327 $self->deactivate;
2328 $_->clear_links_to ($self) for values %cf::MAP;
2192 $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};
2193 2376
2194 $self->deactivate; 2377 $self->deactivate;
2195 $_->clear_links_to ($self) for values %cf::MAP; 2378 $_->clear_links_to ($self) for values %cf::MAP;
2196 $self->clear; 2379 $self->clear;
2197}
2198
2199sub reset_at {
2200 my ($self) = @_;
2201
2202 # TODO: safety, remove and allow resettable per-player maps
2203 return 1e99 if $self->{deny_reset};
2204
2205 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2206 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2207
2208 $time + $to
2209}
2210
2211sub should_reset {
2212 my ($self) = @_;
2213
2214 $self->reset_at <= $cf::RUNTIME
2215}
2216
2217sub reset {
2218 my ($self) = @_;
2219
2220 my $lock = cf::lock_acquire "map_data:$self->{path}";
2221
2222 return if $self->players;
2223
2224 warn "resetting map ", $self->path;
2225
2226 $self->in_memory (cf::MAP_SWAPPED);
2227
2228 # need to save uniques path
2229 unless ($self->{deny_save}) {
2230 my $uniq = $self->uniq_path; utf8::encode $uniq;
2231
2232 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2233 if $uniq;
2234 }
2235
2236 delete $cf::MAP{$self->path};
2237
2238 $self->deactivate;
2239 $_->clear_links_to ($self) for values %cf::MAP;
2240 $self->clear;
2241 2380
2242 $self->unlink_save; 2381 $self->unlink_save;
2243 $self->destroy; 2382 $self->destroy;
2244} 2383}
2245 2384
2253 2392
2254 delete $cf::MAP{$self->path}; 2393 delete $cf::MAP{$self->path};
2255 2394
2256 $self->unlink_save; 2395 $self->unlink_save;
2257 2396
2258 bless $self, "cf::map"; 2397 bless $self, "cf::map::wrap";
2259 delete $self->{deny_reset}; 2398 delete $self->{deny_reset};
2260 $self->{deny_save} = 1; 2399 $self->{deny_save} = 1;
2261 $self->reset_timeout (1); 2400 $self->reset_timeout (1);
2262 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2401 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2263 2402
2320 : normalise $_ 2459 : normalise $_
2321 } @{ aio_readdir $UNIQUEDIR or [] } 2460 } @{ aio_readdir $UNIQUEDIR or [] }
2322 ] 2461 ]
2323} 2462}
2324 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
2325=back 2496=back
2326 2497
2327=head3 cf::object 2498=head3 cf::object
2328 2499
2329=cut 2500=cut
2461 2632
2462Freezes 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}>).
2463 2634
2464The 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.
2465for 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,
2466though, 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
2467map. 2638map.
2468 2639
2469Will never block. 2640Will never block.
2470 2641
2471=item $player_object->leave_link ($map, $x, $y) 2642=item $player_object->leave_link ($map, $x, $y)
2492sub cf::object::player::enter_link { 2663sub cf::object::player::enter_link {
2493 my ($self) = @_; 2664 my ($self) = @_;
2494 2665
2495 $self->deactivate_recursive; 2666 $self->deactivate_recursive;
2496 2667
2668 ++$self->{_link_recursion};
2669
2497 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2670 return if UNIVERSAL::isa $self->map, "ext::map_link";
2498 2671
2499 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2672 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2500 if $self->map && $self->map->{path} ne "{link}"; 2673 if $self->map && $self->map->{path} ne "{link}";
2501 2674
2502 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2675 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2503} 2676}
2504 2677
2505sub cf::object::player::leave_link { 2678sub cf::object::player::leave_link {
2506 my ($self, $map, $x, $y) = @_; 2679 my ($self, $map, $x, $y) = @_;
2507 2680
2524 ($x, $y) = (-1, -1) 2697 ($x, $y) = (-1, -1)
2525 unless (defined $x) && (defined $y); 2698 unless (defined $x) && (defined $y);
2526 2699
2527 # use -1 or undef as default coordinates, not 0, 0 2700 # use -1 or undef as default coordinates, not 0, 0
2528 ($x, $y) = ($map->enter_x, $map->enter_y) 2701 ($x, $y) = ($map->enter_x, $map->enter_y)
2529 if $x <=0 && $y <= 0; 2702 if $x <= 0 && $y <= 0;
2530 2703
2531 $map->load; 2704 $map->load;
2532 $map->load_neighbours; 2705 $map->load_neighbours;
2533 2706
2534 return unless $self->contr->active; 2707 return unless $self->contr->active;
2535 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2536 $self->activate_recursive;
2537 2708
2538 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2709 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2539 $self->enter_map ($map, $x, $y); 2710 if ($self->enter_map ($map, $x, $y)) {
2540} 2711 # entering was successful
2712 delete $self->{_link_recursion};
2713 # only activate afterwards, to support waiting in hooks
2714 $self->activate_recursive;
2715 }
2541 2716
2717}
2718
2542=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)]])
2543 2720
2544Moves 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
2545her, loading and preparing them map, calling the provided $check callback 2722her, loading and preparing them map, calling the provided $check callback
2546that 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
2547the 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
2554 2731
2555our $GOTOGEN; 2732our $GOTOGEN;
2556 2733
2557sub cf::object::player::goto { 2734sub cf::object::player::goto {
2558 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 }
2559 2742
2560 # 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
2561 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2744 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2562 2745
2563 $self->enter_link; 2746 $self->enter_link;
2587 my $map = eval { 2770 my $map = eval {
2588 my $map = defined $path ? cf::map::find $path : undef; 2771 my $map = defined $path ? cf::map::find $path : undef;
2589 2772
2590 if ($map) { 2773 if ($map) {
2591 $map = $map->customise_for ($self); 2774 $map = $map->customise_for ($self);
2592 $map = $check->($map) if $check && $map; 2775 $map = $check->($map, $x, $y, $self) if $check && $map;
2593 } else { 2776 } else {
2594 $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);
2595 } 2778 }
2596 2779
2597 $map 2780 $map
2605 if ($gen == $self->{_goto_generation}) { 2788 if ($gen == $self->{_goto_generation}) {
2606 delete $self->{_goto_generation}; 2789 delete $self->{_goto_generation};
2607 $self->leave_link ($map, $x, $y); 2790 $self->leave_link ($map, $x, $y);
2608 } 2791 }
2609 2792
2610 $done->() if $done; 2793 $done->($self) if $done;
2611 })->prio (1); 2794 })->prio (1);
2612} 2795}
2613 2796
2614=item $player_object->enter_exit ($exit_object) 2797=item $player_object->enter_exit ($exit_object)
2615 2798
2708 $self->message ("Something went wrong deep within the deliantra server. " 2891 $self->message ("Something went wrong deep within the deliantra server. "
2709 . "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. "
2710 . "Please report this to the dungeon master!", 2893 . "Please report this to the dungeon master!",
2711 cf::NDI_UNIQUE | cf::NDI_RED); 2894 cf::NDI_UNIQUE | cf::NDI_RED);
2712 2895
2713 warn "ERROR in enter_exit: $@"; 2896 error "ERROR in enter_exit: $@";
2714 $self->leave_link; 2897 $self->leave_link;
2715 } 2898 }
2716 })->prio (1); 2899 })->prio (1);
2717} 2900}
2718 2901
2730sub cf::client::send_drawinfo { 2913sub cf::client::send_drawinfo {
2731 my ($self, $text, $flags) = @_; 2914 my ($self, $text, $flags) = @_;
2732 2915
2733 utf8::encode $text; 2916 utf8::encode $text;
2734 $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);
2735} 2943}
2736 2944
2737=item $client->send_msg ($channel, $msg, $color, [extra...]) 2945=item $client->send_msg ($channel, $msg, $color, [extra...])
2738 2946
2739Send 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
2743 2951
2744=cut 2952=cut
2745 2953
2746# non-persistent channels (usually the info channel) 2954# non-persistent channels (usually the info channel)
2747our %CHANNEL = ( 2955our %CHANNEL = (
2956 "c/motd" => {
2957 id => "infobox",
2958 title => "MOTD",
2959 reply => undef,
2960 tooltip => "The message of the day",
2961 },
2748 "c/identify" => { 2962 "c/identify" => {
2749 id => "infobox", 2963 id => "infobox",
2750 title => "Identify", 2964 title => "Identify",
2751 reply => undef, 2965 reply => undef,
2752 tooltip => "Items recently identified", 2966 tooltip => "Items recently identified",
2754 "c/examine" => { 2968 "c/examine" => {
2755 id => "infobox", 2969 id => "infobox",
2756 title => "Examine", 2970 title => "Examine",
2757 reply => undef, 2971 reply => undef,
2758 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",
2759 }, 2979 },
2760 "c/book" => { 2980 "c/book" => {
2761 id => "infobox", 2981 id => "infobox",
2762 title => "Book", 2982 title => "Book",
2763 reply => undef, 2983 reply => undef,
2879 my $pkt = "msg " 3099 my $pkt = "msg "
2880 . $self->{json_coder}->encode ( 3100 . $self->{json_coder}->encode (
2881 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3101 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2882 ); 3102 );
2883 3103
2884 # try lzf for large packets
2885 $pkt = "lzf " . Compress::LZF::compress $pkt
2886 if 1024 <= length $pkt and $self->{can_lzf};
2887
2888 # split very large packets
2889 if (8192 < length $pkt and $self->{can_lzf}) {
2890 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2891 $pkt = "frag";
2892 }
2893
2894 $self->send_packet ($pkt); 3104 $self->send_big_packet ($pkt);
2895} 3105}
2896 3106
2897=item $client->ext_msg ($type, @msg) 3107=item $client->ext_msg ($type, @msg)
2898 3108
2899Sends an ext event to the client. 3109Sends an ext event to the client.
2902 3112
2903sub cf::client::ext_msg($$@) { 3113sub cf::client::ext_msg($$@) {
2904 my ($self, $type, @msg) = @_; 3114 my ($self, $type, @msg) = @_;
2905 3115
2906 if ($self->extcmd == 2) { 3116 if ($self->extcmd == 2) {
2907 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3117 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2908 } elsif ($self->extcmd == 1) { # TODO: remove 3118 } elsif ($self->extcmd == 1) { # TODO: remove
2909 push @msg, msgtype => "event_$type"; 3119 push @msg, msgtype => "event_$type";
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3120 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 } 3121 }
2912} 3122}
2913 3123
2914=item $client->ext_reply ($msgid, @msg) 3124=item $client->ext_reply ($msgid, @msg)
2915 3125
2919 3129
2920sub cf::client::ext_reply($$@) { 3130sub cf::client::ext_reply($$@) {
2921 my ($self, $id, @msg) = @_; 3131 my ($self, $id, @msg) = @_;
2922 3132
2923 if ($self->extcmd == 2) { 3133 if ($self->extcmd == 2) {
2924 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3134 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2925 } elsif ($self->extcmd == 1) { 3135 } elsif ($self->extcmd == 1) {
2926 #TODO: version 1, remove 3136 #TODO: version 1, remove
2927 unshift @msg, msgtype => "reply", msgid => $id; 3137 unshift @msg, msgtype => "reply", msgid => $id;
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3138 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2929 } 3139 }
2930} 3140}
2931 3141
2932=item $success = $client->query ($flags, "text", \&cb) 3142=item $success = $client->query ($flags, "text", \&cb)
2933 3143
3004 3214
3005 $ns->ext_reply ($reply, @reply) 3215 $ns->ext_reply ($reply, @reply)
3006 if $reply; 3216 if $reply;
3007 3217
3008 } else { 3218 } else {
3009 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";
3010 } 3220 }
3011 3221
3012 cf::override; 3222 cf::override;
3013 }, 3223 },
3014); 3224);
3034 3244
3035 $coro 3245 $coro
3036} 3246}
3037 3247
3038cf::client->attach ( 3248cf::client->attach (
3039 on_destroy => sub { 3249 on_client_destroy => sub {
3040 my ($ns) = @_; 3250 my ($ns) = @_;
3041 3251
3042 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3252 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3043 }, 3253 },
3044); 3254);
3060our $safe_hole = new Safe::Hole; 3270our $safe_hole = new Safe::Hole;
3061 3271
3062$SIG{FPE} = 'IGNORE'; 3272$SIG{FPE} = 'IGNORE';
3063 3273
3064$safe->permit_only (Opcode::opset qw( 3274$safe->permit_only (Opcode::opset qw(
3065 :base_core :base_mem :base_orig :base_math 3275 :base_core :base_mem :base_orig :base_math :base_loop
3066 grepstart grepwhile mapstart mapwhile 3276 grepstart grepwhile mapstart mapwhile
3067 sort time 3277 sort time
3068)); 3278));
3069 3279
3070# here we export the classes and methods available to script code 3280# here we export the classes and methods available to script code
3095 decrease split destroy change_exp value msg lore send_msg)], 3305 decrease split destroy change_exp value msg lore send_msg)],
3096 ["cf::object::player" => qw(player)], 3306 ["cf::object::player" => qw(player)],
3097 ["cf::player" => qw(peaceful send_msg)], 3307 ["cf::player" => qw(peaceful send_msg)],
3098 ["cf::map" => qw(trigger)], 3308 ["cf::map" => qw(trigger)],
3099) { 3309) {
3100 no strict 'refs';
3101 my ($pkg, @funs) = @$_; 3310 my ($pkg, @funs) = @$_;
3102 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3311 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3103 for @funs; 3312 for @funs;
3104} 3313}
3105 3314
3122 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3331 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3123 $qcode =~ s/\n/\\n/g; 3332 $qcode =~ s/\n/\\n/g;
3124 3333
3125 %vars = (_dummy => 0) unless %vars; 3334 %vars = (_dummy => 0) unless %vars;
3126 3335
3336 my @res;
3127 local $_; 3337 local $_;
3128 local @safe::cf::_safe_eval_args = values %vars;
3129 3338
3130 my $eval = 3339 my $eval =
3131 "do {\n" 3340 "do {\n"
3132 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3341 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3133 . "#line 0 \"{$qcode}\"\n" 3342 . "#line 0 \"{$qcode}\"\n"
3134 . $code 3343 . $code
3135 . "\n}" 3344 . "\n}"
3136 ; 3345 ;
3137 3346
3347 if ($CFG{safe_eval}) {
3138 sub_generation_inc; 3348 sub_generation_inc;
3349 local @safe::cf::_safe_eval_args = values %vars;
3139 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3350 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3140 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 }
3141 3356
3142 if ($@) { 3357 if ($@) {
3143 warn "$@"; 3358 warn "$@",
3144 warn "while executing safe code '$code'\n"; 3359 "while executing safe code '$code'\n",
3145 warn "with arguments " . (join " ", %vars) . "\n"; 3360 "with arguments " . (join " ", %vars) . "\n";
3146 } 3361 }
3147 3362
3148 wantarray ? @res : $res[0] 3363 wantarray ? @res : $res[0]
3149} 3364}
3150 3365
3164=cut 3379=cut
3165 3380
3166sub register_script_function { 3381sub register_script_function {
3167 my ($fun, $cb) = @_; 3382 my ($fun, $cb) = @_;
3168 3383
3169 no strict 'refs'; 3384 $fun = "safe::$fun" if $CFG{safe_eval};
3170 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3385 *$fun = $safe_hole->wrap ($cb);
3171} 3386}
3172 3387
3173=back 3388=back
3174 3389
3175=cut 3390=cut
3184 # for this (global event?) 3399 # for this (global event?)
3185 %ext::player_env::MUSIC_FACE_CACHE = (); 3400 %ext::player_env::MUSIC_FACE_CACHE = ();
3186 3401
3187 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3402 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3188 3403
3189 warn "loading facedata from $path\n"; 3404 trace "loading facedata from $path\n";
3190 3405
3191 my $facedata;
3192 0 < aio_load $path, $facedata 3406 0 < aio_load $path, my $facedata
3193 or die "$path: $!"; 3407 or die "$path: $!";
3194 3408
3195 $facedata = Coro::Storable::thaw $facedata; 3409 $facedata = Coro::Storable::thaw $facedata;
3196 3410
3197 $facedata->{version} == 2 3411 $facedata->{version} == 2
3198 or cf::cleanup "$path: version mismatch, cannot proceed."; 3412 or cf::cleanup "$path: version mismatch, cannot proceed.";
3199 3413
3200 # 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]);
3201 $facedata->{resource}{"res/exp_table"} = { 3416 $facedata->{resource}{"res/exp_table"} = {
3202 type => FT_RSRC, 3417 type => FT_RSRC,
3203 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),
3204 }; 3420 };
3205 cf::cede_to_tick; 3421 cf::cede_to_tick;
3206 3422
3207 { 3423 {
3208 my $faces = $facedata->{faceinfo}; 3424 my $faces = $facedata->{faceinfo};
3210 while (my ($face, $info) = each %$faces) { 3426 while (my ($face, $info) = each %$faces) {
3211 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3427 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3212 3428
3213 cf::face::set_visibility $idx, $info->{visibility}; 3429 cf::face::set_visibility $idx, $info->{visibility};
3214 cf::face::set_magicmap $idx, $info->{magicmap}; 3430 cf::face::set_magicmap $idx, $info->{magicmap};
3215 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3431 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3216 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} ;
3217 3434
3218 cf::cede_to_tick; 3435 cf::cede_to_tick;
3219 } 3436 }
3220 3437
3221 while (my ($face, $info) = each %$faces) { 3438 while (my ($face, $info) = each %$faces) {
3226 3443
3227 if (my $smooth = cf::face::find $info->{smooth}) { 3444 if (my $smooth = cf::face::find $info->{smooth}) {
3228 cf::face::set_smooth $idx, $smooth; 3445 cf::face::set_smooth $idx, $smooth;
3229 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3446 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3230 } else { 3447 } else {
3231 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3448 error "smooth face '$info->{smooth}' not found for face '$face'";
3232 } 3449 }
3233 3450
3234 cf::cede_to_tick; 3451 cf::cede_to_tick;
3235 } 3452 }
3236 } 3453 }
3245 3462
3246 cf::anim::invalidate_all; # d'oh 3463 cf::anim::invalidate_all; # d'oh
3247 } 3464 }
3248 3465
3249 { 3466 {
3250 # TODO: for gcfclient pleasure, we should give resources
3251 # that gcfclient doesn't grok a >10000 face index.
3252 my $res = $facedata->{resource}; 3467 my $res = $facedata->{resource};
3253 3468
3254 while (my ($name, $info) = each %$res) { 3469 while (my ($name, $info) = each %$res) {
3255 if (defined $info->{type}) { 3470 if (defined $info->{type}) {
3256 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3471 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3257 my $data;
3258 3472
3259 if ($info->{type} & 1) { 3473 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3260 # prepend meta info
3261
3262 my $meta = $enc->encode ({
3263 name => $name,
3264 %{ $info->{meta} || {} },
3265 });
3266
3267 $data = pack "(w/a*)*", $meta, $info->{data};
3268 } else {
3269 $data = $info->{data};
3270 }
3271
3272 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3273 cf::face::set_type $idx, $info->{type}; 3474 cf::face::set_type $idx, $info->{type};
3274 } else { 3475 } else {
3275 $RESOURCE{$name} = $info; 3476 $RESOURCE{$name} = $info; # unused
3276 } 3477 }
3277 3478
3278 cf::cede_to_tick; 3479 cf::cede_to_tick;
3279 } 3480 }
3280 } 3481 }
3281 3482
3282 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3483 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3283 3484
3284 1 3485 1
3285} 3486}
3286
3287cf::global->attach (on_resource_update => sub {
3288 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3289 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3290
3291 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3292 my $sound = $soundconf->{compat}[$_]
3293 or next;
3294
3295 my $face = cf::face::find "sound/$sound->[1]";
3296 cf::sound::set $sound->[0] => $face;
3297 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3298 }
3299
3300 while (my ($k, $v) = each %{$soundconf->{event}}) {
3301 my $face = cf::face::find "sound/$v";
3302 cf::sound::set $k => $face;
3303 }
3304 }
3305});
3306 3487
3307register_exticmd fx_want => sub { 3488register_exticmd fx_want => sub {
3308 my ($ns, $want) = @_; 3489 my ($ns, $want) = @_;
3309 3490
3310 while (my ($k, $v) = each %$want) { 3491 while (my ($k, $v) = each %$want) {
3349sub reload_treasures { 3530sub reload_treasures {
3350 load_resource_file "$DATADIR/treasures" 3531 load_resource_file "$DATADIR/treasures"
3351 or die "unable to load treasurelists\n"; 3532 or die "unable to load treasurelists\n";
3352} 3533}
3353 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
3354sub reload_resources { 3558sub reload_resources {
3355 warn "reloading resource files...\n"; 3559 trace "reloading resource files...\n";
3356 3560
3561 reload_exp_table;
3562 reload_materials;
3357 reload_facedata; 3563 reload_facedata;
3564 reload_sound;
3358 reload_archetypes; 3565 reload_archetypes;
3359 reload_regions; 3566 reload_regions;
3360 reload_treasures; 3567 reload_treasures;
3361 3568
3362 warn "finished reloading resource files\n"; 3569 trace "finished reloading resource files\n";
3363} 3570}
3364 3571
3365sub reload_config { 3572sub reload_config {
3366 open my $fh, "<:utf8", "$CONFDIR/config" 3573 trace "reloading config file...\n";
3367 or return;
3368 3574
3369 local $/; 3575 0 < aio_load "$CONFDIR/config", my $config
3370 *CFG = YAML::Load <$fh>; 3576 or die "$CONFDIR/config: $!";
3371 3577
3578 utf8::decode $config;
3579 *CFG = yaml_load $config;
3580
3372 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3581 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3373 3582
3374 $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};
3375 $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};
3376 3585
3377 if (exists $CFG{mlockall}) { 3586 if (exists $CFG{mlockall}) {
3400 3609
3401 seek $fh, 0, 0; 3610 seek $fh, 0, 0;
3402 print $fh $$; 3611 print $fh $$;
3403} 3612}
3404 3613
3614sub main_loop {
3615 trace "EV::loop starting\n";
3616 if (1) {
3617 EV::loop;
3618 }
3619 trace "EV::loop returned\n";
3620 goto &main_loop unless $REALLY_UNLOOP;
3621}
3622
3405sub main { 3623sub main {
3406 cf::init_globals; # initialise logging 3624 cf::init_globals; # initialise logging
3407 3625
3408 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3626 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3409 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.";
3410 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3628 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3411 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3629 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3412
3413 cf::init_experience;
3414 cf::init_anim;
3415 cf::init_attackmess;
3416 cf::init_dynamic;
3417 3630
3418 $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
3419 3632
3420 # we must not ever block the main coroutine 3633 # we must not ever block the main coroutine
3421 local $Coro::idle = sub { 3634 local $Coro::idle = sub {
3427 }; 3640 };
3428 3641
3429 evthread_start IO::AIO::poll_fileno; 3642 evthread_start IO::AIO::poll_fileno;
3430 3643
3431 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
3432 reload_resources; 3653 reload_resources;
3433 reload_config; 3654 reload_config;
3434 db_init; 3655 db_init;
3435 3656
3436 cf::load_settings;
3437 cf::load_materials;
3438 cf::init_uuid; 3657 cf::init_uuid;
3439 cf::init_signals; 3658 cf::init_signals;
3440 cf::init_commands;
3441 cf::init_skills; 3659 cf::init_skills;
3442 3660
3443 cf::init_beforeplay; 3661 cf::init_beforeplay;
3444 3662
3445 atomic; 3663 atomic;
3447 load_extensions; 3665 load_extensions;
3448 3666
3449 utime time, time, $RUNTIMEFILE; 3667 utime time, time, $RUNTIMEFILE;
3450 3668
3451 # no (long-running) fork's whatsoever before this point(!) 3669 # no (long-running) fork's whatsoever before this point(!)
3670 use POSIX ();
3452 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};
3453 3672
3454 (pop @POST_INIT)->(0) while @POST_INIT; 3673 cf::_post_init 0;
3455 }; 3674 };
3456 3675
3457 EV::loop; 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
3684 goto &main_loop;
3458} 3685}
3459 3686
3460############################################################################# 3687#############################################################################
3461# initialisation and cleanup 3688# initialisation and cleanup
3462 3689
3463# install some emergency cleanup handlers 3690# install some emergency cleanup handlers
3464BEGIN { 3691BEGIN {
3465 our %SIGWATCHER = (); 3692 our %SIGWATCHER = ();
3466 for my $signal (qw(INT HUP TERM)) { 3693 for my $signal (qw(INT HUP TERM)) {
3467 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3694 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3468 cf::cleanup "SIG$signal"; 3695 cf::cleanup "SIG$signal";
3469 }; 3696 };
3470 } 3697 }
3471} 3698}
3472 3699
3473sub write_runtime_sync { 3700sub write_runtime_sync {
3701 my $t0 = AE::time;
3702
3474 # first touch the runtime file to show we are still running: 3703 # first touch the runtime file to show we are still running:
3475 # the fsync below can take a very very long time. 3704 # the fsync below can take a very very long time.
3476 3705
3477 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3706 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3478 3707
3479 my $guard = cf::lock_acquire "write_runtime"; 3708 my $guard = cf::lock_acquire "write_runtime";
3480 3709
3481 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3710 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3482 or return; 3711 or return;
3483 3712
3484 my $value = $cf::RUNTIME + 90 + 10; 3713 my $value = $cf::RUNTIME + 90 + 10;
3485 # 10 is the runtime save interval, for a monotonic clock 3714 # 10 is the runtime save interval, for a monotonic clock
3486 # 60 allows for the watchdog to kill the server. 3715 # 60 allows for the watchdog to kill the server.
3499 or return; 3728 or return;
3500 3729
3501 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3730 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3502 and return; 3731 and return;
3503 3732
3504 warn "runtime file written.\n"; 3733 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3505 3734
3506 1 3735 1
3507} 3736}
3508 3737
3509our $uuid_lock; 3738our $uuid_lock;
3521 or return; 3750 or return;
3522 3751
3523 my $value = uuid_seq uuid_cur; 3752 my $value = uuid_seq uuid_cur;
3524 3753
3525 unless ($value) { 3754 unless ($value) {
3526 warn "cowardly refusing to write zero uuid value!\n"; 3755 info "cowardly refusing to write zero uuid value!\n";
3527 return; 3756 return;
3528 } 3757 }
3529 3758
3530 my $value = uuid_str $value + $uuid_skip; 3759 my $value = uuid_str $value + $uuid_skip;
3531 $uuid_skip = 0; 3760 $uuid_skip = 0;
3541 or return; 3770 or return;
3542 3771
3543 aio_rename "$uuid~", $uuid 3772 aio_rename "$uuid~", $uuid
3544 and return; 3773 and return;
3545 3774
3546 warn "uuid file written ($value).\n"; 3775 trace "uuid file written ($value).\n";
3547 3776
3548 1 3777 1
3549 3778
3550} 3779}
3551 3780
3557} 3786}
3558 3787
3559sub emergency_save() { 3788sub emergency_save() {
3560 my $freeze_guard = cf::freeze_mainloop; 3789 my $freeze_guard = cf::freeze_mainloop;
3561 3790
3562 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;
3563 3797
3564 cf::sync_job { 3798 cf::sync_job {
3565 # this is a trade-off: we want to be very quick here, so 3799 cf::write_runtime_sync; # external watchdog should not bark
3566 # save all maps without fsync, and later call a global sync
3567 # (which in turn might be very very slow)
3568 local $USE_FSYNC = 0;
3569 3800
3570 # use a peculiar iteration method to avoid tripping on perl 3801 # use a peculiar iteration method to avoid tripping on perl
3571 # refcount bugs in for. also avoids problems with players 3802 # refcount bugs in for. also avoids problems with players
3572 # and maps saved/destroyed asynchronously. 3803 # and maps saved/destroyed asynchronously.
3573 warn "emergency_perl_save: begin player save\n"; 3804 info "emergency_perl_save: begin player save\n";
3574 for my $login (keys %cf::PLAYER) { 3805 for my $login (keys %cf::PLAYER) {
3575 my $pl = $cf::PLAYER{$login} or next; 3806 my $pl = $cf::PLAYER{$login} or next;
3576 $pl->valid or next; 3807 $pl->valid or next;
3577 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3808 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3578 $pl->save; 3809 $pl->save;
3579 } 3810 }
3580 warn "emergency_perl_save: end player save\n"; 3811 info "emergency_perl_save: end player save\n";
3581 3812
3813 cf::write_runtime_sync; # external watchdog should not bark
3814
3582 warn "emergency_perl_save: begin map save\n"; 3815 info "emergency_perl_save: begin map save\n";
3583 for my $path (keys %cf::MAP) { 3816 for my $path (keys %cf::MAP) {
3584 my $map = $cf::MAP{$path} or next; 3817 my $map = $cf::MAP{$path} or next;
3585 $map->valid or next; 3818 $map->valid or next;
3586 $map->save; 3819 $map->save;
3587 } 3820 }
3588 warn "emergency_perl_save: end map save\n"; 3821 info "emergency_perl_save: end map save\n";
3589 3822
3823 cf::write_runtime_sync; # external watchdog should not bark
3824
3590 warn "emergency_perl_save: begin database checkpoint\n"; 3825 info "emergency_perl_save: begin database checkpoint\n";
3591 BDB::db_env_txn_checkpoint $DB_ENV; 3826 BDB::db_env_txn_checkpoint $DB_ENV;
3592 warn "emergency_perl_save: end database checkpoint\n"; 3827 info "emergency_perl_save: end database checkpoint\n";
3593 3828
3594 warn "emergency_perl_save: begin write uuid\n"; 3829 info "emergency_perl_save: begin write uuid\n";
3595 write_uuid_sync 1; 3830 write_uuid_sync 1;
3596 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
3597 }; 3851 };
3598 3852
3599 warn "emergency_perl_save: starting sync()\n";
3600 IO::AIO::aio_sync sub {
3601 warn "emergency_perl_save: finished sync()\n";
3602 };
3603
3604 warn "emergency_perl_save: leave\n"; 3853 info "emergency_perl_save: leave\n";
3605} 3854}
3606 3855
3607sub post_cleanup { 3856sub post_cleanup {
3608 my ($make_core) = @_; 3857 my ($make_core) = @_;
3609 3858
3859 IO::AIO::flush;
3860
3610 warn Carp::longmess "post_cleanup backtrace" 3861 error Carp::longmess "post_cleanup backtrace"
3611 if $make_core; 3862 if $make_core;
3612 3863
3613 my $fh = pidfile; 3864 my $fh = pidfile;
3614 unlink $PIDFILE if <$fh> == $$; 3865 unlink $PIDFILE if <$fh> == $$;
3615} 3866}
3635 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3886 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3636 for my $name (keys %$leaf_symtab) { 3887 for my $name (keys %$leaf_symtab) {
3637 _gv_clear *{"$pkg$name"}; 3888 _gv_clear *{"$pkg$name"};
3638# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3889# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3639 } 3890 }
3640 warn "cleared package $pkg\n";#d#
3641} 3891}
3642 3892
3643sub do_reload_perl() { 3893sub do_reload_perl() {
3644 # can/must only be called in main 3894 # can/must only be called in main
3645 if ($Coro::current != $Coro::main) { 3895 unless (in_main) {
3646 warn "can only reload from main coroutine"; 3896 error "can only reload from main coroutine";
3647 return; 3897 return;
3648 } 3898 }
3649 3899
3650 return if $RELOAD++; 3900 return if $RELOAD++;
3651 3901
3652 my $t1 = EV::time; 3902 my $t1 = AE::time;
3653 3903
3654 while ($RELOAD) { 3904 while ($RELOAD) {
3655 warn "reloading..."; 3905 cf::get_slot 0.1, -1, "reload_perl";
3906 info "perl_reload: reloading...";
3656 3907
3657 warn "entering sync_job"; 3908 trace "perl_reload: entering sync_job";
3658 3909
3659 cf::sync_job { 3910 cf::sync_job {
3660 cf::write_runtime_sync; # external watchdog should not bark
3661 cf::emergency_save; 3911 #cf::emergency_save;
3662 cf::write_runtime_sync; # external watchdog should not bark
3663 3912
3664 warn "syncing database to disk";
3665 BDB::db_env_txn_checkpoint $DB_ENV;
3666
3667 # if anything goes wrong in here, we should simply crash as we already saved
3668
3669 warn "flushing outstanding aio requests";
3670 while (IO::AIO::nreqs || BDB::nreqs) {
3671 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3672 }
3673
3674 warn "cancelling all extension coros"; 3913 trace "perl_reload: cancelling all extension coros";
3675 $_->cancel for values %EXT_CORO; 3914 $_->cancel for values %EXT_CORO;
3676 %EXT_CORO = (); 3915 %EXT_CORO = ();
3677 3916
3678 warn "removing commands"; 3917 trace "perl_reload: removing commands";
3679 %COMMAND = (); 3918 %COMMAND = ();
3680 3919
3681 warn "removing ext/exti commands"; 3920 trace "perl_reload: removing ext/exti commands";
3682 %EXTCMD = (); 3921 %EXTCMD = ();
3683 %EXTICMD = (); 3922 %EXTICMD = ();
3684 3923
3685 warn "unloading/nuking all extensions"; 3924 trace "perl_reload: unloading/nuking all extensions";
3686 for my $pkg (@EXTS) { 3925 for my $pkg (@EXTS) {
3687 warn "... unloading $pkg"; 3926 trace "... unloading $pkg";
3688 3927
3689 if (my $cb = $pkg->can ("unload")) { 3928 if (my $cb = $pkg->can ("unload")) {
3690 eval { 3929 eval {
3691 $cb->($pkg); 3930 $cb->($pkg);
3692 1 3931 1
3693 } or warn "$pkg unloaded, but with errors: $@"; 3932 } or error "$pkg unloaded, but with errors: $@";
3694 } 3933 }
3695 3934
3696 warn "... clearing $pkg"; 3935 trace "... clearing $pkg";
3697 clear_package $pkg; 3936 clear_package $pkg;
3698 } 3937 }
3699 3938
3700 warn "unloading all perl modules loaded from $LIBDIR"; 3939 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3701 while (my ($k, $v) = each %INC) { 3940 while (my ($k, $v) = each %INC) {
3702 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3941 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3703 3942
3704 warn "... unloading $k"; 3943 trace "... unloading $k";
3705 delete $INC{$k}; 3944 delete $INC{$k};
3706 3945
3707 $k =~ s/\.pm$//; 3946 $k =~ s/\.pm$//;
3708 $k =~ s/\//::/g; 3947 $k =~ s/\//::/g;
3709 3948
3712 } 3951 }
3713 3952
3714 clear_package $k; 3953 clear_package $k;
3715 } 3954 }
3716 3955
3717 warn "getting rid of safe::, as good as possible"; 3956 trace "perl_reload: getting rid of safe::, as good as possible";
3718 clear_package "safe::$_" 3957 clear_package "safe::$_"
3719 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);
3720 3959
3721 warn "unloading cf.pm \"a bit\""; 3960 trace "perl_reload: unloading cf.pm \"a bit\"";
3722 delete $INC{"cf.pm"}; 3961 delete $INC{"cf.pm"};
3723 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3962 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3724 3963
3725 # don't, removes xs symbols, too, 3964 # don't, removes xs symbols, too,
3726 # and global variables created in xs 3965 # and global variables created in xs
3727 #clear_package __PACKAGE__; 3966 #clear_package __PACKAGE__;
3728 3967
3729 warn "unload completed, starting to reload now"; 3968 info "perl_reload: unload completed, starting to reload now";
3730 3969
3731 warn "reloading cf.pm"; 3970 trace "perl_reload: reloading cf.pm";
3732 require cf; 3971 require cf;
3733 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3972 cf::_connect_to_perl_1;
3734 3973
3735 warn "loading config and database again"; 3974 trace "perl_reload: loading config and database again";
3736 cf::reload_config; 3975 cf::reload_config;
3737 3976
3738 warn "loading extensions"; 3977 trace "perl_reload: loading extensions";
3739 cf::load_extensions; 3978 cf::load_extensions;
3740 3979
3741 if ($REATTACH_ON_RELOAD) { 3980 if ($REATTACH_ON_RELOAD) {
3742 warn "reattaching attachments to objects/players"; 3981 trace "perl_reload: reattaching attachments to objects/players";
3743 _global_reattach; # objects, sockets 3982 _global_reattach; # objects, sockets
3744 warn "reattaching attachments to maps"; 3983 trace "perl_reload: reattaching attachments to maps";
3745 reattach $_ for values %MAP; 3984 reattach $_ for values %MAP;
3746 warn "reattaching attachments to players"; 3985 trace "perl_reload: reattaching attachments to players";
3747 reattach $_ for values %PLAYER; 3986 reattach $_ for values %PLAYER;
3748 } 3987 }
3749 3988
3750 warn "running post_init jobs"; 3989 cf::_post_init 1;
3751 (pop @POST_INIT)->(1) while @POST_INIT;
3752 3990
3753 warn "leaving sync_job"; 3991 trace "perl_reload: leaving sync_job";
3754 3992
3755 1 3993 1
3756 } or do { 3994 } or do {
3757 warn $@; 3995 error $@;
3758 cf::cleanup "error while reloading, exiting."; 3996 cf::cleanup "perl_reload: error, exiting.";
3759 }; 3997 };
3760 3998
3761 warn "reloaded";
3762 --$RELOAD; 3999 --$RELOAD;
3763 } 4000 }
3764 4001
3765 $t1 = EV::time - $t1; 4002 $t1 = AE::time - $t1;
3766 warn "reload completed in ${t1}s\n"; 4003 info "perl_reload: completed in ${t1}s\n";
3767}; 4004};
3768 4005
3769our $RELOAD_WATCHER; # used only during reload 4006our $RELOAD_WATCHER; # used only during reload
3770 4007
3771sub reload_perl() { 4008sub reload_perl() {
3773 # coro crashes during coro_state_free->destroy here. 4010 # coro crashes during coro_state_free->destroy here.
3774 4011
3775 $RELOAD_WATCHER ||= cf::async { 4012 $RELOAD_WATCHER ||= cf::async {
3776 Coro::AIO::aio_wait cache_extensions; 4013 Coro::AIO::aio_wait cache_extensions;
3777 4014
3778 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4015 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3779 do_reload_perl; 4016 do_reload_perl;
3780 undef $RELOAD_WATCHER; 4017 undef $RELOAD_WATCHER;
3781 }; 4018 };
3782 }; 4019 };
3783} 4020}
3792 reload_perl; 4029 reload_perl;
3793 }; 4030 };
3794 } 4031 }
3795}; 4032};
3796 4033
3797unshift @INC, $LIBDIR; 4034#############################################################################
3798 4035
3799my $bug_warning = 0; 4036my $bug_warning = 0;
3800 4037
3801our @WAIT_FOR_TICK; 4038our @WAIT_FOR_TICK;
3802our @WAIT_FOR_TICK_BEGIN; 4039our @WAIT_FOR_TICK_BEGIN;
3803 4040
3804sub wait_for_tick { 4041sub wait_for_tick() {
3805 return if tick_inhibit || $Coro::current == $Coro::main; 4042 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3806 4043
3807 my $signal = new Coro::Signal; 4044 my $signal = new Coro::Signal;
3808 push @WAIT_FOR_TICK, $signal; 4045 push @WAIT_FOR_TICK, $signal;
3809 $signal->wait; 4046 $signal->wait;
3810} 4047}
3811 4048
3812sub wait_for_tick_begin { 4049sub wait_for_tick_begin() {
3813 return if tick_inhibit || $Coro::current == $Coro::main; 4050 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3814 4051
3815 my $signal = new Coro::Signal; 4052 my $signal = new Coro::Signal;
3816 push @WAIT_FOR_TICK_BEGIN, $signal; 4053 push @WAIT_FOR_TICK_BEGIN, $signal;
3817 $signal->wait; 4054 $signal->wait;
3818} 4055}
3824 return; 4061 return;
3825 } 4062 }
3826 4063
3827 cf::server_tick; # one server iteration 4064 cf::server_tick; # one server iteration
3828 4065
4066 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4067
3829 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4068 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3830 $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.;
3831 Coro::async_pool { 4070 Coro::async_pool {
3832 $Coro::current->{desc} = "runtime saver"; 4071 $Coro::current->{desc} = "runtime saver";
3833 write_runtime_sync 4072 write_runtime_sync
3834 or warn "ERROR: unable to write runtime file: $!"; 4073 or error "ERROR: unable to write runtime file: $!";
3835 }; 4074 };
3836 } 4075 }
3837 4076
3838 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4077 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3839 $sig->send; 4078 $sig->send;
3847 4086
3848 if (0) { 4087 if (0) {
3849 if ($NEXT_TICK) { 4088 if ($NEXT_TICK) {
3850 my $jitter = $TICK_START - $NEXT_TICK; 4089 my $jitter = $TICK_START - $NEXT_TICK;
3851 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4090 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3852 warn "jitter $JITTER\n";#d# 4091 debug "jitter $JITTER\n";#d#
3853 } 4092 }
3854 } 4093 }
3855} 4094}
3856 4095
3857{ 4096{
3858 # configure BDB 4097 # configure BDB
3859 4098
3860 BDB::min_parallel 8; 4099 BDB::min_parallel 16;
3861 BDB::max_poll_reqs $TICK * 0.1; 4100 BDB::max_poll_reqs $TICK * 0.1;
3862 $AnyEvent::BDB::WATCHER->priority (1); 4101 $AnyEvent::BDB::WATCHER->priority (1);
3863 4102
3864 unless ($DB_ENV) { 4103 unless ($DB_ENV) {
3865 $DB_ENV = BDB::db_env_create; 4104 $DB_ENV = BDB::db_env_create;
3902 IO::AIO::min_parallel 8; 4141 IO::AIO::min_parallel 8;
3903 IO::AIO::max_poll_time $TICK * 0.1; 4142 IO::AIO::max_poll_time $TICK * 0.1;
3904 undef $AnyEvent::AIO::WATCHER; 4143 undef $AnyEvent::AIO::WATCHER;
3905} 4144}
3906 4145
3907my $_log_backtrace; 4146our $_log_backtrace;
4147our $_log_backtrace_last;
3908 4148
3909sub _log_backtrace { 4149sub _log_backtrace {
3910 my ($msg, @addr) = @_; 4150 my ($msg, @addr) = @_;
3911 4151
3912 $msg =~ s/\n//; 4152 $msg =~ s/\n$//;
3913 4153
4154 if ($_log_backtrace_last eq $msg) {
4155 LOG llevInfo, "[ABT] $msg\n";
4156 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3914 # limit the # of concurrent backtraces 4157 # limit the # of concurrent backtraces
3915 if ($_log_backtrace < 2) { 4158 } elsif ($_log_backtrace < 2) {
4159 $_log_backtrace_last = $msg;
3916 ++$_log_backtrace; 4160 ++$_log_backtrace;
3917 my $perl_bt = Carp::longmess $msg; 4161 my $perl_bt = Carp::longmess $msg;
3918 async { 4162 async {
3919 $Coro::current->{desc} = "abt $msg"; 4163 $Coro::current->{desc} = "abt $msg";
3920 4164
3940 LOG llevInfo, "[ABT] $_\n" for @bt; 4184 LOG llevInfo, "[ABT] $_\n" for @bt;
3941 --$_log_backtrace; 4185 --$_log_backtrace;
3942 }; 4186 };
3943 } else { 4187 } else {
3944 LOG llevInfo, "[ABT] $msg\n"; 4188 LOG llevInfo, "[ABT] $msg\n";
3945 LOG llevInfo, "[ABT] [suppressed]\n"; 4189 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3946 } 4190 }
3947} 4191}
3948 4192
3949# load additional modules 4193# load additional modules
3950require "cf/$_.pm" for @EXTRA_MODULES; 4194require "cf/$_.pm" for @EXTRA_MODULES;
4195cf::_connect_to_perl_2;
3951 4196
3952END { cf::emergency_save } 4197END { cf::emergency_save }
3953 4198
39541 41991
3955 4200

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines