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.469 by root, Mon Mar 2 22:25:19 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 aio_fsync $fh if $cf::USE_FSYNC; 1253 if ($cf::USE_FSYNC) {
1254 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1255 aio_fsync $fh;
1256 }
1157 aio_close $fh; 1257 aio_close $fh;
1158 1258
1159 if (@$objs) { 1259 if (@$objs) {
1160 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1260 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1161 aio_chmod $fh, SAVE_MODE; 1261 aio_chmod $fh, SAVE_MODE;
1162 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1262 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1163 aio_write $fh, 0, (length $data), $data, 0; 1263 aio_write $fh, 0, (length $data), $data, 0;
1164 aio_fsync $fh if $cf::USE_FSYNC; 1264 if ($cf::USE_FSYNC) {
1265 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1266 aio_fsync $fh;
1267 }
1165 aio_close $fh; 1268 aio_close $fh;
1166 aio_rename "$filename.pst~", "$filename.pst"; 1269 aio_rename "$filename.pst~", "$filename.pst";
1167 } 1270 }
1168 } else { 1271 } else {
1169 aio_unlink "$filename.pst"; 1272 aio_unlink "$filename.pst";
1172 aio_rename "$filename~", $filename; 1275 aio_rename "$filename~", $filename;
1173 1276
1174 $filename =~ s%/[^/]+$%%; 1277 $filename =~ s%/[^/]+$%%;
1175 aio_pathsync $filename if $cf::USE_FSYNC; 1278 aio_pathsync $filename if $cf::USE_FSYNC;
1176 } else { 1279 } else {
1177 warn "unable to save objects: $filename~: $!\n"; 1280 error "unable to save objects: $filename~: $!\n";
1178 } 1281 }
1179 } else { 1282 } else {
1180 aio_unlink $filename; 1283 aio_unlink $filename;
1181 aio_unlink "$filename.pst"; 1284 aio_unlink "$filename.pst";
1182 } 1285 }
1206 my $st = eval { Coro::Storable::thaw $av }; 1309 my $st = eval { Coro::Storable::thaw $av };
1207 $av = $st->{objs}; 1310 $av = $st->{objs};
1208 } 1311 }
1209 1312
1210 utf8::decode (my $decname = $filename); 1313 utf8::decode (my $decname = $filename);
1211 warn sprintf "loading %s (%d,%d)\n", 1314 trace sprintf "loading %s (%d,%d)\n",
1212 $decname, length $data, scalar @{$av || []}; 1315 $decname, length $data, scalar @{$av || []}
1316 if $VERBOSE_IO;
1213 1317
1214 ($data, $av) 1318 ($data, $av)
1215} 1319}
1216 1320
1217=head2 COMMAND CALLBACKS 1321=head2 COMMAND CALLBACKS
1276} 1380}
1277 1381
1278use File::Glob (); 1382use File::Glob ();
1279 1383
1280cf::player->attach ( 1384cf::player->attach (
1281 on_command => sub { 1385 on_unknown_command => sub {
1282 my ($pl, $name, $params) = @_; 1386 my ($pl, $name, $params) = @_;
1283 1387
1284 my $cb = $COMMAND{$name} 1388 my $cb = $COMMAND{$name}
1285 or return; 1389 or return;
1286 1390
1309 1413
1310 $pl->ext_reply ($reply, @reply) 1414 $pl->ext_reply ($reply, @reply)
1311 if $reply; 1415 if $reply;
1312 1416
1313 } else { 1417 } else {
1314 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1418 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1315 } 1419 }
1316 1420
1317 cf::override; 1421 cf::override;
1318 }, 1422 },
1319); 1423);
1320 1424
1321# "readahead" all extensions 1425# "readahead" all extensions
1322sub cache_extensions { 1426sub cache_extensions {
1323 my $grp = IO::AIO::aio_group; 1427 my $grp = IO::AIO::aio_group;
1324 1428
1325 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1429 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1326 for (grep /\.ext$/, @{$_[0]}) { 1430 for (grep /\.ext$/, @{$_[0]}) {
1327 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1431 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1328 } 1432 }
1329 }; 1433 };
1330 1434
1331 $grp 1435 $grp
1332} 1436}
1333 1437
1334sub load_extensions { 1438sub load_extensions {
1439 info "loading extensions...";
1440
1335 cf::sync_job { 1441 cf::sync_job {
1336 my %todo; 1442 my %todo;
1337 1443
1338 for my $path (<$LIBDIR/*.ext>) { 1444 for my $path (<$LIBDIR/*.ext>) {
1339 next unless -r $path; 1445 next unless -r $path;
1357 1463
1358 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1464 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1359 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1465 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1360 1466
1361 $ext{source} = 1467 $ext{source} =
1362 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1468 "package $pkg; use common::sense;\n"
1363 . "#line 1 \"$path\"\n{\n" 1469 . "#line 1 \"$path\"\n{\n"
1364 . $source 1470 . $source
1365 . "\n};\n1"; 1471 . "\n};\n1";
1366 1472
1367 $todo{$base} = \%ext; 1473 $todo{$base} = \%ext;
1368 } 1474 }
1369 1475
1476 my $pass = 0;
1370 my %done; 1477 my %done;
1371 while (%todo) { 1478 while (%todo) {
1372 my $progress; 1479 my $progress;
1373 1480
1481 ++$pass;
1482
1483 ext:
1374 while (my ($k, $v) = each %todo) { 1484 while (my ($k, $v) = each %todo) {
1375 for (split /,\s*/, $v->{meta}{depends}) { 1485 for (split /,\s*/, $v->{meta}{depends}) {
1376 goto skip 1486 next ext
1377 unless exists $done{$_}; 1487 unless exists $done{$_};
1378 } 1488 }
1379 1489
1380 warn "... loading '$k' into '$v->{pkg}'\n"; 1490 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1381 1491
1382 unless (eval $v->{source}) { 1492 my $active = eval $v->{source};
1493
1494 if (length $@) {
1383 my $msg = $@ ? "$v->{path}: $@\n" 1495 error "$v->{path}: $@\n";
1384 : "$v->{base}: extension inactive.\n";
1385 1496
1386 if (exists $v->{meta}{mandatory}) {
1387 warn $msg;
1388 cf::cleanup "mandatory extension failed to load, exiting."; 1497 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1389 } 1498 if exists $v->{meta}{mandatory};
1390 1499
1391 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;
1392 } 1509 }
1393
1394 $done{$k} = delete $todo{$k};
1395 push @EXTS, $v->{pkg};
1396 $progress = 1;
1397 } 1510 }
1398 1511
1399 skip: 1512 unless ($progress) {
1400 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1513 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1401 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 }
1402 } 1520 }
1403 }; 1521 };
1404} 1522}
1405 1523
1406############################################################################# 1524#############################################################################
1490 $cf::PLAYER{$login} = $pl 1608 $cf::PLAYER{$login} = $pl
1491 } 1609 }
1492 } 1610 }
1493} 1611}
1494 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
1495sub save($) { 1626sub save($) {
1496 my ($pl) = @_; 1627 my ($pl) = @_;
1497 1628
1498 return if $pl->{deny_save}; 1629 return if $pl->{deny_save};
1499 1630
1504 1635
1505 aio_mkdir playerdir $pl, 0770; 1636 aio_mkdir playerdir $pl, 0770;
1506 $pl->{last_save} = $cf::RUNTIME; 1637 $pl->{last_save} = $cf::RUNTIME;
1507 1638
1508 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];
1509 1643
1510 $pl->save_pl ($path); 1644 $pl->save_pl ($path);
1511 cf::cede_to_tick; 1645 cf::cede_to_tick;
1512} 1646}
1513 1647
1547 my $name = $pl->ob->name; 1681 my $name = $pl->ob->name;
1548 1682
1549 $pl->{deny_save} = 1; 1683 $pl->{deny_save} = 1;
1550 $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
1551 1685
1552 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1686 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1553 $pl->deactivate; 1687 $pl->deactivate;
1688
1554 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;
1555 $pl->ob->check_score;
1556 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1690 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1691 ext::highscore::check ($pl->ob);
1692
1557 $pl->ns->destroy if $pl->ns; 1693 $pl->ns->destroy if $pl->ns;
1558 1694
1559 my $path = playerdir $pl; 1695 my $path = playerdir $pl;
1560 my $temp = "$path~$cf::RUNTIME~deleting~"; 1696 my $temp = "$path~$cf::RUNTIME~deleting~";
1561 aio_rename $path, $temp; 1697 aio_rename $path, $temp;
1615 \@logins 1751 \@logins
1616} 1752}
1617 1753
1618=item $player->maps 1754=item $player->maps
1619 1755
1756=item cf::player::maps $login
1757
1620Returns an arrayref of map paths that are private for this 1758Returns an arrayref of map paths that are private for this
1621player. May block. 1759player. May block.
1622 1760
1623=cut 1761=cut
1624 1762
1686=cut 1824=cut
1687 1825
1688sub find_by_path($) { 1826sub find_by_path($) {
1689 my ($path) = @_; 1827 my ($path) = @_;
1690 1828
1829 $path =~ s/^~[^\/]*//; # skip ~login
1830
1691 my ($match, $specificity); 1831 my ($match, $specificity);
1692 1832
1693 for my $region (list) { 1833 for my $region (list) {
1694 if ($region->{match} && $path =~ $region->{match}) { 1834 if ($region->{match} && $path =~ $region->{match}) {
1695 ($match, $specificity) = ($region, $region->specificity) 1835 ($match, $specificity) = ($region, $region->specificity)
1723sub generate_random_map { 1863sub generate_random_map {
1724 my ($self, $rmp) = @_; 1864 my ($self, $rmp) = @_;
1725 1865
1726 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
1727 1867
1728 # mit "rum" bekleckern, nicht
1729 $self->_create_random_map ( 1868 $self->_create_random_map ($rmp);
1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1733 $rmp->{exit_on_final_map},
1734 $rmp->{xsize}, $rmp->{ysize},
1735 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1736 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1737 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1738 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1739 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1740 (cf::region::find $rmp->{region}), $rmp->{custom}
1741 )
1742} 1869}
1743 1870
1744=item cf::map->register ($regex, $prio) 1871=item cf::map->register ($regex, $prio)
1745 1872
1746Register 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
1751 1878
1752sub register { 1879sub register {
1753 my (undef, $regex, $prio) = @_; 1880 my (undef, $regex, $prio) = @_;
1754 my $pkg = caller; 1881 my $pkg = caller;
1755 1882
1756 no strict;
1757 push @{"$pkg\::ISA"}, __PACKAGE__; 1883 push @{"$pkg\::ISA"}, __PACKAGE__;
1758 1884
1759 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1885 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1760} 1886}
1761 1887
1762# also paths starting with '/' 1888# also paths starting with '/'
1763$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1889$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1764 1890
1765sub thawer_merge { 1891sub thawer_merge {
1766 my ($self, $merge) = @_; 1892 my ($self, $merge) = @_;
1767 1893
1768 # we have to keep some variables in memory intact 1894 # we have to keep some variables in memory intact
1773} 1899}
1774 1900
1775sub normalise { 1901sub normalise {
1776 my ($path, $base) = @_; 1902 my ($path, $base) = @_;
1777 1903
1778 $path = "$path"; # make sure its a string 1904 $path = "$path"; # make sure it's a string
1779 1905
1780 $path =~ s/\.map$//; 1906 $path =~ s/\.map$//;
1781 1907
1782 # map plan: 1908 # map plan:
1783 # 1909 #
1798 $base =~ s{[^/]+/?$}{}; 1924 $base =~ s{[^/]+/?$}{};
1799 $path = "$base/$path"; 1925 $path = "$base/$path";
1800 } 1926 }
1801 1927
1802 for ($path) { 1928 for ($path) {
1803 redo if s{//}{/};
1804 redo if s{/\.?/}{/}; 1929 redo if s{/\.?/}{/};
1805 redo if s{/[^/]+/\.\./}{/}; 1930 redo if s{/[^/]+/\.\./}{/};
1806 } 1931 }
1807 1932
1808 $path 1933 $path
1822 $self->init; # pass $1 etc. 1947 $self->init; # pass $1 etc.
1823 return $self; 1948 return $self;
1824 } 1949 }
1825 } 1950 }
1826 1951
1827 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1952 Carp::cluck "unable to resolve path '$path' (base '$base')";
1828 () 1953 ()
1829} 1954}
1830 1955
1831sub init { 1956sub init {
1832 my ($self) = @_; 1957 my ($self) = @_;
1954} 2079}
1955 2080
1956sub find; 2081sub find;
1957sub find { 2082sub find {
1958 my ($path, $origin) = @_; 2083 my ($path, $origin) = @_;
2084
2085 cf::cede_to_tick;
1959 2086
1960 $path = normalise $path, $origin && $origin->path; 2087 $path = normalise $path, $origin && $origin->path;
1961 2088
1962 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2089 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1963 my $guard2 = cf::lock_acquire "map_find:$path"; 2090 my $guard2 = cf::lock_acquire "map_find:$path";
1982 2109
1983 $cf::MAP{$path} = $map 2110 $cf::MAP{$path} = $map
1984 } 2111 }
1985} 2112}
1986 2113
1987sub pre_load { } 2114sub pre_load { }
1988sub post_load { } 2115#sub post_load { } # XS
1989 2116
1990sub load { 2117sub load {
1991 my ($self) = @_; 2118 my ($self) = @_;
1992 2119
1993 local $self->{deny_reset} = 1; # loading can take a long time 2120 local $self->{deny_reset} = 1; # loading can take a long time
2048 2175
2049 $self->in_memory (cf::MAP_ACTIVE); 2176 $self->in_memory (cf::MAP_ACTIVE);
2050 } 2177 }
2051 2178
2052 $self->post_load; 2179 $self->post_load;
2053}
2054 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
2055sub customise_for { 2187sub customise_for {
2056 my ($self, $ob) = @_; 2188 my ($self, $ob) = @_;
2057 2189
2058 return find "~" . $ob->name . "/" . $self->{path} 2190 return find "~" . $ob->name . "/" . $self->{path}
2059 if $self->per_player; 2191 if $self->per_player;
2075 or next; 2207 or next;
2076 $neigh = find $neigh, $map 2208 $neigh = find $neigh, $map
2077 or next; 2209 or next;
2078 $neigh->load; 2210 $neigh->load;
2079 2211
2212 # now find the diagonal neighbours
2080 push @neigh, 2213 push @neigh,
2081 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2214 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2082 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2215 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2083 } 2216 }
2084 2217
2091} 2224}
2092 2225
2093sub find_sync { 2226sub find_sync {
2094 my ($path, $origin) = @_; 2227 my ($path, $origin) = @_;
2095 2228
2096 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
2097} 2233}
2098 2234
2099sub do_load_sync { 2235sub do_load_sync {
2100 my ($map) = @_; 2236 my ($map) = @_;
2101 2237
2102 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2238 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2103 if $Coro::current == $Coro::main; 2239 if $Coro::current == $Coro::main;
2104 2240
2105 cf::sync_job { $map->load }; 2241 $map->load;
2106} 2242}
2107 2243
2108our %MAP_PREFETCH; 2244our %MAP_PREFETCH;
2109our $MAP_PREFETCHER = undef; 2245our $MAP_PREFETCHER = undef;
2110 2246
2136 $MAP_PREFETCHER->prio (6); 2272 $MAP_PREFETCHER->prio (6);
2137 2273
2138 () 2274 ()
2139} 2275}
2140 2276
2277# common code, used by both ->save and ->swapout
2141sub save { 2278sub _save {
2142 my ($self) = @_; 2279 my ($self) = @_;
2143
2144 my $lock = cf::lock_acquire "map_data:$self->{path}";
2145 2280
2146 $self->{last_save} = $cf::RUNTIME; 2281 $self->{last_save} = $cf::RUNTIME;
2147 2282
2148 return unless $self->dirty; 2283 return unless $self->dirty;
2149 2284
2169 } else { 2304 } else {
2170 $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);
2171 } 2306 }
2172} 2307}
2173 2308
2309sub save {
2310 my ($self) = @_;
2311
2312 my $lock = cf::lock_acquire "map_data:$self->{path}";
2313
2314 $self->_save;
2315}
2316
2174sub swap_out { 2317sub swap_out {
2175 my ($self) = @_; 2318 my ($self) = @_;
2176 2319
2177 # save first because save cedes
2178 $self->save;
2179
2180 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2320 my $lock = cf::lock_acquire "map_data:$self->{path}";
2181 2321
2182 return if $self->players;
2183 return if $self->in_memory != cf::MAP_ACTIVE; 2322 return if $self->in_memory != cf::MAP_ACTIVE;
2184 return if $self->{deny_save}; 2323 return if $self->{deny_save};
2324 return if $self->players;
2185 2325
2326 # first deactivate the map and "unlink" it from the core
2327 $self->deactivate;
2328 $_->clear_links_to ($self) for values %cf::MAP;
2186 $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};
2187 2376
2188 $self->deactivate; 2377 $self->deactivate;
2189 $_->clear_links_to ($self) for values %cf::MAP; 2378 $_->clear_links_to ($self) for values %cf::MAP;
2190 $self->clear; 2379 $self->clear;
2191}
2192
2193sub reset_at {
2194 my ($self) = @_;
2195
2196 # TODO: safety, remove and allow resettable per-player maps
2197 return 1e99 if $self->{deny_reset};
2198
2199 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2200 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2201
2202 $time + $to
2203}
2204
2205sub should_reset {
2206 my ($self) = @_;
2207
2208 $self->reset_at <= $cf::RUNTIME
2209}
2210
2211sub reset {
2212 my ($self) = @_;
2213
2214 my $lock = cf::lock_acquire "map_data:$self->{path}";
2215
2216 return if $self->players;
2217
2218 warn "resetting map ", $self->path;
2219
2220 $self->in_memory (cf::MAP_SWAPPED);
2221
2222 # need to save uniques path
2223 unless ($self->{deny_save}) {
2224 my $uniq = $self->uniq_path; utf8::encode $uniq;
2225
2226 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2227 if $uniq;
2228 }
2229
2230 delete $cf::MAP{$self->path};
2231
2232 $self->deactivate;
2233 $_->clear_links_to ($self) for values %cf::MAP;
2234 $self->clear;
2235 2380
2236 $self->unlink_save; 2381 $self->unlink_save;
2237 $self->destroy; 2382 $self->destroy;
2238} 2383}
2239 2384
2247 2392
2248 delete $cf::MAP{$self->path}; 2393 delete $cf::MAP{$self->path};
2249 2394
2250 $self->unlink_save; 2395 $self->unlink_save;
2251 2396
2252 bless $self, "cf::map"; 2397 bless $self, "cf::map::wrap";
2253 delete $self->{deny_reset}; 2398 delete $self->{deny_reset};
2254 $self->{deny_save} = 1; 2399 $self->{deny_save} = 1;
2255 $self->reset_timeout (1); 2400 $self->reset_timeout (1);
2256 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2401 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2257 2402
2314 : normalise $_ 2459 : normalise $_
2315 } @{ aio_readdir $UNIQUEDIR or [] } 2460 } @{ aio_readdir $UNIQUEDIR or [] }
2316 ] 2461 ]
2317} 2462}
2318 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
2319=back 2496=back
2320 2497
2321=head3 cf::object 2498=head3 cf::object
2322 2499
2323=cut 2500=cut
2455 2632
2456Freezes 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}>).
2457 2634
2458The 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.
2459for 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,
2460though, 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
2461map. 2638map.
2462 2639
2463Will never block. 2640Will never block.
2464 2641
2465=item $player_object->leave_link ($map, $x, $y) 2642=item $player_object->leave_link ($map, $x, $y)
2486sub cf::object::player::enter_link { 2663sub cf::object::player::enter_link {
2487 my ($self) = @_; 2664 my ($self) = @_;
2488 2665
2489 $self->deactivate_recursive; 2666 $self->deactivate_recursive;
2490 2667
2668 ++$self->{_link_recursion};
2669
2491 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2670 return if UNIVERSAL::isa $self->map, "ext::map_link";
2492 2671
2493 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2672 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2494 if $self->map && $self->map->{path} ne "{link}"; 2673 if $self->map && $self->map->{path} ne "{link}";
2495 2674
2496 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2675 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2497} 2676}
2498 2677
2499sub cf::object::player::leave_link { 2678sub cf::object::player::leave_link {
2500 my ($self, $map, $x, $y) = @_; 2679 my ($self, $map, $x, $y) = @_;
2501 2680
2518 ($x, $y) = (-1, -1) 2697 ($x, $y) = (-1, -1)
2519 unless (defined $x) && (defined $y); 2698 unless (defined $x) && (defined $y);
2520 2699
2521 # use -1 or undef as default coordinates, not 0, 0 2700 # use -1 or undef as default coordinates, not 0, 0
2522 ($x, $y) = ($map->enter_x, $map->enter_y) 2701 ($x, $y) = ($map->enter_x, $map->enter_y)
2523 if $x <=0 && $y <= 0; 2702 if $x <= 0 && $y <= 0;
2524 2703
2525 $map->load; 2704 $map->load;
2526 $map->load_neighbours; 2705 $map->load_neighbours;
2527 2706
2528 return unless $self->contr->active; 2707 return unless $self->contr->active;
2529 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2530 $self->activate_recursive;
2531 2708
2532 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2709 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2533 $self->enter_map ($map, $x, $y); 2710 if ($self->enter_map ($map, $x, $y)) {
2534} 2711 # entering was successful
2712 delete $self->{_link_recursion};
2713 # only activate afterwards, to support waiting in hooks
2714 $self->activate_recursive;
2715 }
2535 2716
2717}
2718
2536=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)]])
2537 2720
2538Moves 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
2539her, loading and preparing them map, calling the provided $check callback 2722her, loading and preparing them map, calling the provided $check callback
2540that 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
2541the 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
2548 2731
2549our $GOTOGEN; 2732our $GOTOGEN;
2550 2733
2551sub cf::object::player::goto { 2734sub cf::object::player::goto {
2552 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 }
2553 2742
2554 # 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
2555 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2744 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2556 2745
2557 $self->enter_link; 2746 $self->enter_link;
2581 my $map = eval { 2770 my $map = eval {
2582 my $map = defined $path ? cf::map::find $path : undef; 2771 my $map = defined $path ? cf::map::find $path : undef;
2583 2772
2584 if ($map) { 2773 if ($map) {
2585 $map = $map->customise_for ($self); 2774 $map = $map->customise_for ($self);
2586 $map = $check->($map) if $check && $map; 2775 $map = $check->($map, $x, $y, $self) if $check && $map;
2587 } else { 2776 } else {
2588 $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);
2589 } 2778 }
2590 2779
2591 $map 2780 $map
2599 if ($gen == $self->{_goto_generation}) { 2788 if ($gen == $self->{_goto_generation}) {
2600 delete $self->{_goto_generation}; 2789 delete $self->{_goto_generation};
2601 $self->leave_link ($map, $x, $y); 2790 $self->leave_link ($map, $x, $y);
2602 } 2791 }
2603 2792
2604 $done->() if $done; 2793 $done->($self) if $done;
2605 })->prio (1); 2794 })->prio (1);
2606} 2795}
2607 2796
2608=item $player_object->enter_exit ($exit_object) 2797=item $player_object->enter_exit ($exit_object)
2609 2798
2702 $self->message ("Something went wrong deep within the deliantra server. " 2891 $self->message ("Something went wrong deep within the deliantra server. "
2703 . "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. "
2704 . "Please report this to the dungeon master!", 2893 . "Please report this to the dungeon master!",
2705 cf::NDI_UNIQUE | cf::NDI_RED); 2894 cf::NDI_UNIQUE | cf::NDI_RED);
2706 2895
2707 warn "ERROR in enter_exit: $@"; 2896 error "ERROR in enter_exit: $@";
2708 $self->leave_link; 2897 $self->leave_link;
2709 } 2898 }
2710 })->prio (1); 2899 })->prio (1);
2711} 2900}
2712 2901
2724sub cf::client::send_drawinfo { 2913sub cf::client::send_drawinfo {
2725 my ($self, $text, $flags) = @_; 2914 my ($self, $text, $flags) = @_;
2726 2915
2727 utf8::encode $text; 2916 utf8::encode $text;
2728 $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);
2729} 2943}
2730 2944
2731=item $client->send_msg ($channel, $msg, $color, [extra...]) 2945=item $client->send_msg ($channel, $msg, $color, [extra...])
2732 2946
2733Send 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
2737 2951
2738=cut 2952=cut
2739 2953
2740# non-persistent channels (usually the info channel) 2954# non-persistent channels (usually the info channel)
2741our %CHANNEL = ( 2955our %CHANNEL = (
2956 "c/motd" => {
2957 id => "infobox",
2958 title => "MOTD",
2959 reply => undef,
2960 tooltip => "The message of the day",
2961 },
2742 "c/identify" => { 2962 "c/identify" => {
2743 id => "infobox", 2963 id => "infobox",
2744 title => "Identify", 2964 title => "Identify",
2745 reply => undef, 2965 reply => undef,
2746 tooltip => "Items recently identified", 2966 tooltip => "Items recently identified",
2748 "c/examine" => { 2968 "c/examine" => {
2749 id => "infobox", 2969 id => "infobox",
2750 title => "Examine", 2970 title => "Examine",
2751 reply => undef, 2971 reply => undef,
2752 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",
2753 }, 2979 },
2754 "c/book" => { 2980 "c/book" => {
2755 id => "infobox", 2981 id => "infobox",
2756 title => "Book", 2982 title => "Book",
2757 reply => undef, 2983 reply => undef,
2785 id => "infobox", 3011 id => "infobox",
2786 title => "Skills", 3012 title => "Skills",
2787 reply => undef, 3013 reply => undef,
2788 tooltip => "Shows your experience per skill and item power", 3014 tooltip => "Shows your experience per skill and item power",
2789 }, 3015 },
3016 "c/shopitems" => {
3017 id => "infobox",
3018 title => "Shop Items",
3019 reply => undef,
3020 tooltip => "Shows the items currently for sale in this shop",
3021 },
2790 "c/resistances" => { 3022 "c/resistances" => {
2791 id => "infobox", 3023 id => "infobox",
2792 title => "Resistances", 3024 title => "Resistances",
2793 reply => undef, 3025 reply => undef,
2794 tooltip => "Shows your resistances", 3026 tooltip => "Shows your resistances",
2796 "c/pets" => { 3028 "c/pets" => {
2797 id => "infobox", 3029 id => "infobox",
2798 title => "Pets", 3030 title => "Pets",
2799 reply => undef, 3031 reply => undef,
2800 tooltip => "Shows information abotu your pets/a specific pet", 3032 tooltip => "Shows information abotu your pets/a specific pet",
3033 },
3034 "c/perceiveself" => {
3035 id => "infobox",
3036 title => "Perceive Self",
3037 reply => undef,
3038 tooltip => "You gained detailed knowledge about yourself",
2801 }, 3039 },
2802 "c/uptime" => { 3040 "c/uptime" => {
2803 id => "infobox", 3041 id => "infobox",
2804 title => "Uptime", 3042 title => "Uptime",
2805 reply => undef, 3043 reply => undef,
2861 my $pkt = "msg " 3099 my $pkt = "msg "
2862 . $self->{json_coder}->encode ( 3100 . $self->{json_coder}->encode (
2863 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3101 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2864 ); 3102 );
2865 3103
2866 # try lzf for large packets
2867 $pkt = "lzf " . Compress::LZF::compress $pkt
2868 if 1024 <= length $pkt and $self->{can_lzf};
2869
2870 # split very large packets
2871 if (8192 < length $pkt and $self->{can_lzf}) {
2872 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2873 $pkt = "frag";
2874 }
2875
2876 $self->send_packet ($pkt); 3104 $self->send_big_packet ($pkt);
2877} 3105}
2878 3106
2879=item $client->ext_msg ($type, @msg) 3107=item $client->ext_msg ($type, @msg)
2880 3108
2881Sends an ext event to the client. 3109Sends an ext event to the client.
2884 3112
2885sub cf::client::ext_msg($$@) { 3113sub cf::client::ext_msg($$@) {
2886 my ($self, $type, @msg) = @_; 3114 my ($self, $type, @msg) = @_;
2887 3115
2888 if ($self->extcmd == 2) { 3116 if ($self->extcmd == 2) {
2889 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3117 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2890 } elsif ($self->extcmd == 1) { # TODO: remove 3118 } elsif ($self->extcmd == 1) { # TODO: remove
2891 push @msg, msgtype => "event_$type"; 3119 push @msg, msgtype => "event_$type";
2892 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3120 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2893 } 3121 }
2894} 3122}
2895 3123
2896=item $client->ext_reply ($msgid, @msg) 3124=item $client->ext_reply ($msgid, @msg)
2897 3125
2901 3129
2902sub cf::client::ext_reply($$@) { 3130sub cf::client::ext_reply($$@) {
2903 my ($self, $id, @msg) = @_; 3131 my ($self, $id, @msg) = @_;
2904 3132
2905 if ($self->extcmd == 2) { 3133 if ($self->extcmd == 2) {
2906 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3134 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2907 } elsif ($self->extcmd == 1) { 3135 } elsif ($self->extcmd == 1) {
2908 #TODO: version 1, remove 3136 #TODO: version 1, remove
2909 unshift @msg, msgtype => "reply", msgid => $id; 3137 unshift @msg, msgtype => "reply", msgid => $id;
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3138 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 } 3139 }
2912} 3140}
2913 3141
2914=item $success = $client->query ($flags, "text", \&cb) 3142=item $success = $client->query ($flags, "text", \&cb)
2915 3143
2986 3214
2987 $ns->ext_reply ($reply, @reply) 3215 $ns->ext_reply ($reply, @reply)
2988 if $reply; 3216 if $reply;
2989 3217
2990 } else { 3218 } else {
2991 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";
2992 } 3220 }
2993 3221
2994 cf::override; 3222 cf::override;
2995 }, 3223 },
2996); 3224);
3016 3244
3017 $coro 3245 $coro
3018} 3246}
3019 3247
3020cf::client->attach ( 3248cf::client->attach (
3021 on_destroy => sub { 3249 on_client_destroy => sub {
3022 my ($ns) = @_; 3250 my ($ns) = @_;
3023 3251
3024 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3252 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3025 }, 3253 },
3026); 3254);
3042our $safe_hole = new Safe::Hole; 3270our $safe_hole = new Safe::Hole;
3043 3271
3044$SIG{FPE} = 'IGNORE'; 3272$SIG{FPE} = 'IGNORE';
3045 3273
3046$safe->permit_only (Opcode::opset qw( 3274$safe->permit_only (Opcode::opset qw(
3047 :base_core :base_mem :base_orig :base_math 3275 :base_core :base_mem :base_orig :base_math :base_loop
3048 grepstart grepwhile mapstart mapwhile 3276 grepstart grepwhile mapstart mapwhile
3049 sort time 3277 sort time
3050)); 3278));
3051 3279
3052# here we export the classes and methods available to script code 3280# here we export the classes and methods available to script code
3077 decrease split destroy change_exp value msg lore send_msg)], 3305 decrease split destroy change_exp value msg lore send_msg)],
3078 ["cf::object::player" => qw(player)], 3306 ["cf::object::player" => qw(player)],
3079 ["cf::player" => qw(peaceful send_msg)], 3307 ["cf::player" => qw(peaceful send_msg)],
3080 ["cf::map" => qw(trigger)], 3308 ["cf::map" => qw(trigger)],
3081) { 3309) {
3082 no strict 'refs';
3083 my ($pkg, @funs) = @$_; 3310 my ($pkg, @funs) = @$_;
3084 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3311 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3085 for @funs; 3312 for @funs;
3086} 3313}
3087 3314
3104 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3331 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3105 $qcode =~ s/\n/\\n/g; 3332 $qcode =~ s/\n/\\n/g;
3106 3333
3107 %vars = (_dummy => 0) unless %vars; 3334 %vars = (_dummy => 0) unless %vars;
3108 3335
3336 my @res;
3109 local $_; 3337 local $_;
3110 local @safe::cf::_safe_eval_args = values %vars;
3111 3338
3112 my $eval = 3339 my $eval =
3113 "do {\n" 3340 "do {\n"
3114 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3341 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3115 . "#line 0 \"{$qcode}\"\n" 3342 . "#line 0 \"{$qcode}\"\n"
3116 . $code 3343 . $code
3117 . "\n}" 3344 . "\n}"
3118 ; 3345 ;
3119 3346
3347 if ($CFG{safe_eval}) {
3120 sub_generation_inc; 3348 sub_generation_inc;
3349 local @safe::cf::_safe_eval_args = values %vars;
3121 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3350 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3122 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 }
3123 3356
3124 if ($@) { 3357 if ($@) {
3125 warn "$@"; 3358 warn "$@",
3126 warn "while executing safe code '$code'\n"; 3359 "while executing safe code '$code'\n",
3127 warn "with arguments " . (join " ", %vars) . "\n"; 3360 "with arguments " . (join " ", %vars) . "\n";
3128 } 3361 }
3129 3362
3130 wantarray ? @res : $res[0] 3363 wantarray ? @res : $res[0]
3131} 3364}
3132 3365
3146=cut 3379=cut
3147 3380
3148sub register_script_function { 3381sub register_script_function {
3149 my ($fun, $cb) = @_; 3382 my ($fun, $cb) = @_;
3150 3383
3151 no strict 'refs'; 3384 $fun = "safe::$fun" if $CFG{safe_eval};
3152 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3385 *$fun = $safe_hole->wrap ($cb);
3153} 3386}
3154 3387
3155=back 3388=back
3156 3389
3157=cut 3390=cut
3166 # for this (global event?) 3399 # for this (global event?)
3167 %ext::player_env::MUSIC_FACE_CACHE = (); 3400 %ext::player_env::MUSIC_FACE_CACHE = ();
3168 3401
3169 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3402 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3170 3403
3171 warn "loading facedata from $path\n"; 3404 trace "loading facedata from $path\n";
3172 3405
3173 my $facedata;
3174 0 < aio_load $path, $facedata 3406 0 < aio_load $path, my $facedata
3175 or die "$path: $!"; 3407 or die "$path: $!";
3176 3408
3177 $facedata = Coro::Storable::thaw $facedata; 3409 $facedata = Coro::Storable::thaw $facedata;
3178 3410
3179 $facedata->{version} == 2 3411 $facedata->{version} == 2
3180 or cf::cleanup "$path: version mismatch, cannot proceed."; 3412 or cf::cleanup "$path: version mismatch, cannot proceed.";
3181 3413
3182 # 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]);
3183 $facedata->{resource}{"res/exp_table"} = { 3416 $facedata->{resource}{"res/exp_table"} = {
3184 type => FT_RSRC, 3417 type => FT_RSRC,
3185 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),
3186 }; 3420 };
3187 cf::cede_to_tick; 3421 cf::cede_to_tick;
3188 3422
3189 { 3423 {
3190 my $faces = $facedata->{faceinfo}; 3424 my $faces = $facedata->{faceinfo};
3192 while (my ($face, $info) = each %$faces) { 3426 while (my ($face, $info) = each %$faces) {
3193 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3427 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3194 3428
3195 cf::face::set_visibility $idx, $info->{visibility}; 3429 cf::face::set_visibility $idx, $info->{visibility};
3196 cf::face::set_magicmap $idx, $info->{magicmap}; 3430 cf::face::set_magicmap $idx, $info->{magicmap};
3197 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3431 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3198 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} ;
3199 3434
3200 cf::cede_to_tick; 3435 cf::cede_to_tick;
3201 } 3436 }
3202 3437
3203 while (my ($face, $info) = each %$faces) { 3438 while (my ($face, $info) = each %$faces) {
3208 3443
3209 if (my $smooth = cf::face::find $info->{smooth}) { 3444 if (my $smooth = cf::face::find $info->{smooth}) {
3210 cf::face::set_smooth $idx, $smooth; 3445 cf::face::set_smooth $idx, $smooth;
3211 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3446 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3212 } else { 3447 } else {
3213 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3448 error "smooth face '$info->{smooth}' not found for face '$face'";
3214 } 3449 }
3215 3450
3216 cf::cede_to_tick; 3451 cf::cede_to_tick;
3217 } 3452 }
3218 } 3453 }
3227 3462
3228 cf::anim::invalidate_all; # d'oh 3463 cf::anim::invalidate_all; # d'oh
3229 } 3464 }
3230 3465
3231 { 3466 {
3232 # TODO: for gcfclient pleasure, we should give resources
3233 # that gcfclient doesn't grok a >10000 face index.
3234 my $res = $facedata->{resource}; 3467 my $res = $facedata->{resource};
3235 3468
3236 while (my ($name, $info) = each %$res) { 3469 while (my ($name, $info) = each %$res) {
3237 if (defined $info->{type}) { 3470 if (defined $info->{type}) {
3238 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3471 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3239 my $data;
3240 3472
3241 if ($info->{type} & 1) { 3473 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3242 # prepend meta info
3243
3244 my $meta = $enc->encode ({
3245 name => $name,
3246 %{ $info->{meta} || {} },
3247 });
3248
3249 $data = pack "(w/a*)*", $meta, $info->{data};
3250 } else {
3251 $data = $info->{data};
3252 }
3253
3254 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3255 cf::face::set_type $idx, $info->{type}; 3474 cf::face::set_type $idx, $info->{type};
3256 } else { 3475 } else {
3257 $RESOURCE{$name} = $info; 3476 $RESOURCE{$name} = $info; # unused
3258 } 3477 }
3259 3478
3260 cf::cede_to_tick; 3479 cf::cede_to_tick;
3261 } 3480 }
3262 } 3481 }
3263 3482
3264 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3483 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3265 3484
3266 1 3485 1
3267} 3486}
3268
3269cf::global->attach (on_resource_update => sub {
3270 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3271 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3272
3273 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3274 my $sound = $soundconf->{compat}[$_]
3275 or next;
3276
3277 my $face = cf::face::find "sound/$sound->[1]";
3278 cf::sound::set $sound->[0] => $face;
3279 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3280 }
3281
3282 while (my ($k, $v) = each %{$soundconf->{event}}) {
3283 my $face = cf::face::find "sound/$v";
3284 cf::sound::set $k => $face;
3285 }
3286 }
3287});
3288 3487
3289register_exticmd fx_want => sub { 3488register_exticmd fx_want => sub {
3290 my ($ns, $want) = @_; 3489 my ($ns, $want) = @_;
3291 3490
3292 while (my ($k, $v) = each %$want) { 3491 while (my ($k, $v) = each %$want) {
3331sub reload_treasures { 3530sub reload_treasures {
3332 load_resource_file "$DATADIR/treasures" 3531 load_resource_file "$DATADIR/treasures"
3333 or die "unable to load treasurelists\n"; 3532 or die "unable to load treasurelists\n";
3334} 3533}
3335 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
3336sub reload_resources { 3558sub reload_resources {
3337 warn "reloading resource files...\n"; 3559 trace "reloading resource files...\n";
3338 3560
3561 reload_exp_table;
3562 reload_materials;
3339 reload_facedata; 3563 reload_facedata;
3564 reload_sound;
3340 reload_archetypes; 3565 reload_archetypes;
3341 reload_regions; 3566 reload_regions;
3342 reload_treasures; 3567 reload_treasures;
3343 3568
3344 warn "finished reloading resource files\n"; 3569 trace "finished reloading resource files\n";
3345} 3570}
3346 3571
3347sub reload_config { 3572sub reload_config {
3348 open my $fh, "<:utf8", "$CONFDIR/config" 3573 trace "reloading config file...\n";
3349 or return;
3350 3574
3351 local $/; 3575 0 < aio_load "$CONFDIR/config", my $config
3352 *CFG = YAML::Load <$fh>; 3576 or die "$CONFDIR/config: $!";
3353 3577
3578 utf8::decode $config;
3579 *CFG = yaml_load $config;
3580
3354 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3581 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3355 3582
3356 $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};
3357 $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};
3358 3585
3359 if (exists $CFG{mlockall}) { 3586 if (exists $CFG{mlockall}) {
3382 3609
3383 seek $fh, 0, 0; 3610 seek $fh, 0, 0;
3384 print $fh $$; 3611 print $fh $$;
3385} 3612}
3386 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
3387sub main { 3623sub main {
3388 cf::init_globals; # initialise logging 3624 cf::init_globals; # initialise logging
3389 3625
3390 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3626 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3391 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.";
3392 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3628 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3393 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3629 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3394
3395 cf::init_experience;
3396 cf::init_anim;
3397 cf::init_attackmess;
3398 cf::init_dynamic;
3399 3630
3400 $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
3401 3632
3402 # we must not ever block the main coroutine 3633 # we must not ever block the main coroutine
3403 local $Coro::idle = sub { 3634 local $Coro::idle = sub {
3409 }; 3640 };
3410 3641
3411 evthread_start IO::AIO::poll_fileno; 3642 evthread_start IO::AIO::poll_fileno;
3412 3643
3413 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
3414 reload_resources; 3653 reload_resources;
3415 reload_config; 3654 reload_config;
3416 db_init; 3655 db_init;
3417 3656
3418 cf::load_settings;
3419 cf::load_materials;
3420 cf::init_uuid; 3657 cf::init_uuid;
3421 cf::init_signals; 3658 cf::init_signals;
3422 cf::init_commands;
3423 cf::init_skills; 3659 cf::init_skills;
3424 3660
3425 cf::init_beforeplay; 3661 cf::init_beforeplay;
3426 3662
3427 atomic; 3663 atomic;
3429 load_extensions; 3665 load_extensions;
3430 3666
3431 utime time, time, $RUNTIMEFILE; 3667 utime time, time, $RUNTIMEFILE;
3432 3668
3433 # no (long-running) fork's whatsoever before this point(!) 3669 # no (long-running) fork's whatsoever before this point(!)
3670 use POSIX ();
3434 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};
3435 3672
3436 (pop @POST_INIT)->(0) while @POST_INIT; 3673 cf::_post_init 0;
3437 }; 3674 };
3438 3675
3439 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;
3440} 3685}
3441 3686
3442############################################################################# 3687#############################################################################
3443# initialisation and cleanup 3688# initialisation and cleanup
3444 3689
3445# install some emergency cleanup handlers 3690# install some emergency cleanup handlers
3446BEGIN { 3691BEGIN {
3447 our %SIGWATCHER = (); 3692 our %SIGWATCHER = ();
3448 for my $signal (qw(INT HUP TERM)) { 3693 for my $signal (qw(INT HUP TERM)) {
3449 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3694 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3450 cf::cleanup "SIG$signal"; 3695 cf::cleanup "SIG$signal";
3451 }; 3696 };
3452 } 3697 }
3453} 3698}
3454 3699
3455sub write_runtime_sync { 3700sub write_runtime_sync {
3701 my $t0 = AE::time;
3702
3456 # first touch the runtime file to show we are still running: 3703 # first touch the runtime file to show we are still running:
3457 # the fsync below can take a very very long time. 3704 # the fsync below can take a very very long time.
3458 3705
3459 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3706 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3460 3707
3461 my $guard = cf::lock_acquire "write_runtime"; 3708 my $guard = cf::lock_acquire "write_runtime";
3462 3709
3463 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3710 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3464 or return; 3711 or return;
3465 3712
3466 my $value = $cf::RUNTIME + 90 + 10; 3713 my $value = $cf::RUNTIME + 90 + 10;
3467 # 10 is the runtime save interval, for a monotonic clock 3714 # 10 is the runtime save interval, for a monotonic clock
3468 # 60 allows for the watchdog to kill the server. 3715 # 60 allows for the watchdog to kill the server.
3481 or return; 3728 or return;
3482 3729
3483 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3730 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3484 and return; 3731 and return;
3485 3732
3486 warn "runtime file written.\n"; 3733 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3487 3734
3488 1 3735 1
3489} 3736}
3490 3737
3491our $uuid_lock; 3738our $uuid_lock;
3503 or return; 3750 or return;
3504 3751
3505 my $value = uuid_seq uuid_cur; 3752 my $value = uuid_seq uuid_cur;
3506 3753
3507 unless ($value) { 3754 unless ($value) {
3508 warn "cowardly refusing to write zero uuid value!\n"; 3755 info "cowardly refusing to write zero uuid value!\n";
3509 return; 3756 return;
3510 } 3757 }
3511 3758
3512 my $value = uuid_str $value + $uuid_skip; 3759 my $value = uuid_str $value + $uuid_skip;
3513 $uuid_skip = 0; 3760 $uuid_skip = 0;
3523 or return; 3770 or return;
3524 3771
3525 aio_rename "$uuid~", $uuid 3772 aio_rename "$uuid~", $uuid
3526 and return; 3773 and return;
3527 3774
3528 warn "uuid file written ($value).\n"; 3775 trace "uuid file written ($value).\n";
3529 3776
3530 1 3777 1
3531 3778
3532} 3779}
3533 3780
3539} 3786}
3540 3787
3541sub emergency_save() { 3788sub emergency_save() {
3542 my $freeze_guard = cf::freeze_mainloop; 3789 my $freeze_guard = cf::freeze_mainloop;
3543 3790
3544 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;
3545 3797
3546 cf::sync_job { 3798 cf::sync_job {
3547 # this is a trade-off: we want to be very quick here, so 3799 cf::write_runtime_sync; # external watchdog should not bark
3548 # save all maps without fsync, and later call a global sync
3549 # (which in turn might be very very slow)
3550 local $USE_FSYNC = 0;
3551 3800
3552 # use a peculiar iteration method to avoid tripping on perl 3801 # use a peculiar iteration method to avoid tripping on perl
3553 # refcount bugs in for. also avoids problems with players 3802 # refcount bugs in for. also avoids problems with players
3554 # and maps saved/destroyed asynchronously. 3803 # and maps saved/destroyed asynchronously.
3555 warn "emergency_perl_save: begin player save\n"; 3804 info "emergency_perl_save: begin player save\n";
3556 for my $login (keys %cf::PLAYER) { 3805 for my $login (keys %cf::PLAYER) {
3557 my $pl = $cf::PLAYER{$login} or next; 3806 my $pl = $cf::PLAYER{$login} or next;
3558 $pl->valid or next; 3807 $pl->valid or next;
3559 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3808 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3560 $pl->save; 3809 $pl->save;
3561 } 3810 }
3562 warn "emergency_perl_save: end player save\n"; 3811 info "emergency_perl_save: end player save\n";
3563 3812
3813 cf::write_runtime_sync; # external watchdog should not bark
3814
3564 warn "emergency_perl_save: begin map save\n"; 3815 info "emergency_perl_save: begin map save\n";
3565 for my $path (keys %cf::MAP) { 3816 for my $path (keys %cf::MAP) {
3566 my $map = $cf::MAP{$path} or next; 3817 my $map = $cf::MAP{$path} or next;
3567 $map->valid or next; 3818 $map->valid or next;
3568 $map->save; 3819 $map->save;
3569 } 3820 }
3570 warn "emergency_perl_save: end map save\n"; 3821 info "emergency_perl_save: end map save\n";
3571 3822
3823 cf::write_runtime_sync; # external watchdog should not bark
3824
3572 warn "emergency_perl_save: begin database checkpoint\n"; 3825 info "emergency_perl_save: begin database checkpoint\n";
3573 BDB::db_env_txn_checkpoint $DB_ENV; 3826 BDB::db_env_txn_checkpoint $DB_ENV;
3574 warn "emergency_perl_save: end database checkpoint\n"; 3827 info "emergency_perl_save: end database checkpoint\n";
3575 3828
3576 warn "emergency_perl_save: begin write uuid\n"; 3829 info "emergency_perl_save: begin write uuid\n";
3577 write_uuid_sync 1; 3830 write_uuid_sync 1;
3578 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
3579 }; 3851 };
3580 3852
3581 warn "emergency_perl_save: starting sync()\n";
3582 IO::AIO::aio_sync sub {
3583 warn "emergency_perl_save: finished sync()\n";
3584 };
3585
3586 warn "emergency_perl_save: leave\n"; 3853 info "emergency_perl_save: leave\n";
3587} 3854}
3588 3855
3589sub post_cleanup { 3856sub post_cleanup {
3590 my ($make_core) = @_; 3857 my ($make_core) = @_;
3591 3858
3859 IO::AIO::flush;
3860
3592 warn Carp::longmess "post_cleanup backtrace" 3861 error Carp::longmess "post_cleanup backtrace"
3593 if $make_core; 3862 if $make_core;
3594 3863
3595 my $fh = pidfile; 3864 my $fh = pidfile;
3596 unlink $PIDFILE if <$fh> == $$; 3865 unlink $PIDFILE if <$fh> == $$;
3597} 3866}
3617 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3886 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3618 for my $name (keys %$leaf_symtab) { 3887 for my $name (keys %$leaf_symtab) {
3619 _gv_clear *{"$pkg$name"}; 3888 _gv_clear *{"$pkg$name"};
3620# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3889# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3621 } 3890 }
3622 warn "cleared package $pkg\n";#d#
3623} 3891}
3624 3892
3625sub do_reload_perl() { 3893sub do_reload_perl() {
3626 # can/must only be called in main 3894 # can/must only be called in main
3627 if ($Coro::current != $Coro::main) { 3895 unless (in_main) {
3628 warn "can only reload from main coroutine"; 3896 error "can only reload from main coroutine";
3629 return; 3897 return;
3630 } 3898 }
3631 3899
3632 return if $RELOAD++; 3900 return if $RELOAD++;
3633 3901
3634 my $t1 = EV::time; 3902 my $t1 = AE::time;
3635 3903
3636 while ($RELOAD) { 3904 while ($RELOAD) {
3637 warn "reloading..."; 3905 cf::get_slot 0.1, -1, "reload_perl";
3906 info "perl_reload: reloading...";
3638 3907
3639 warn "entering sync_job"; 3908 trace "perl_reload: entering sync_job";
3640 3909
3641 cf::sync_job { 3910 cf::sync_job {
3642 cf::write_runtime_sync; # external watchdog should not bark
3643 cf::emergency_save; 3911 #cf::emergency_save;
3644 cf::write_runtime_sync; # external watchdog should not bark
3645 3912
3646 warn "syncing database to disk";
3647 BDB::db_env_txn_checkpoint $DB_ENV;
3648
3649 # if anything goes wrong in here, we should simply crash as we already saved
3650
3651 warn "flushing outstanding aio requests";
3652 while (IO::AIO::nreqs || BDB::nreqs) {
3653 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3654 }
3655
3656 warn "cancelling all extension coros"; 3913 trace "perl_reload: cancelling all extension coros";
3657 $_->cancel for values %EXT_CORO; 3914 $_->cancel for values %EXT_CORO;
3658 %EXT_CORO = (); 3915 %EXT_CORO = ();
3659 3916
3660 warn "removing commands"; 3917 trace "perl_reload: removing commands";
3661 %COMMAND = (); 3918 %COMMAND = ();
3662 3919
3663 warn "removing ext/exti commands"; 3920 trace "perl_reload: removing ext/exti commands";
3664 %EXTCMD = (); 3921 %EXTCMD = ();
3665 %EXTICMD = (); 3922 %EXTICMD = ();
3666 3923
3667 warn "unloading/nuking all extensions"; 3924 trace "perl_reload: unloading/nuking all extensions";
3668 for my $pkg (@EXTS) { 3925 for my $pkg (@EXTS) {
3669 warn "... unloading $pkg"; 3926 trace "... unloading $pkg";
3670 3927
3671 if (my $cb = $pkg->can ("unload")) { 3928 if (my $cb = $pkg->can ("unload")) {
3672 eval { 3929 eval {
3673 $cb->($pkg); 3930 $cb->($pkg);
3674 1 3931 1
3675 } or warn "$pkg unloaded, but with errors: $@"; 3932 } or error "$pkg unloaded, but with errors: $@";
3676 } 3933 }
3677 3934
3678 warn "... clearing $pkg"; 3935 trace "... clearing $pkg";
3679 clear_package $pkg; 3936 clear_package $pkg;
3680 } 3937 }
3681 3938
3682 warn "unloading all perl modules loaded from $LIBDIR"; 3939 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3683 while (my ($k, $v) = each %INC) { 3940 while (my ($k, $v) = each %INC) {
3684 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3941 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3685 3942
3686 warn "... unloading $k"; 3943 trace "... unloading $k";
3687 delete $INC{$k}; 3944 delete $INC{$k};
3688 3945
3689 $k =~ s/\.pm$//; 3946 $k =~ s/\.pm$//;
3690 $k =~ s/\//::/g; 3947 $k =~ s/\//::/g;
3691 3948
3694 } 3951 }
3695 3952
3696 clear_package $k; 3953 clear_package $k;
3697 } 3954 }
3698 3955
3699 warn "getting rid of safe::, as good as possible"; 3956 trace "perl_reload: getting rid of safe::, as good as possible";
3700 clear_package "safe::$_" 3957 clear_package "safe::$_"
3701 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);
3702 3959
3703 warn "unloading cf.pm \"a bit\""; 3960 trace "perl_reload: unloading cf.pm \"a bit\"";
3704 delete $INC{"cf.pm"}; 3961 delete $INC{"cf.pm"};
3705 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3962 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3706 3963
3707 # don't, removes xs symbols, too, 3964 # don't, removes xs symbols, too,
3708 # and global variables created in xs 3965 # and global variables created in xs
3709 #clear_package __PACKAGE__; 3966 #clear_package __PACKAGE__;
3710 3967
3711 warn "unload completed, starting to reload now"; 3968 info "perl_reload: unload completed, starting to reload now";
3712 3969
3713 warn "reloading cf.pm"; 3970 trace "perl_reload: reloading cf.pm";
3714 require cf; 3971 require cf;
3715 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3972 cf::_connect_to_perl_1;
3716 3973
3717 warn "loading config and database again"; 3974 trace "perl_reload: loading config and database again";
3718 cf::reload_config; 3975 cf::reload_config;
3719 3976
3720 warn "loading extensions"; 3977 trace "perl_reload: loading extensions";
3721 cf::load_extensions; 3978 cf::load_extensions;
3722 3979
3723 if ($REATTACH_ON_RELOAD) { 3980 if ($REATTACH_ON_RELOAD) {
3724 warn "reattaching attachments to objects/players"; 3981 trace "perl_reload: reattaching attachments to objects/players";
3725 _global_reattach; # objects, sockets 3982 _global_reattach; # objects, sockets
3726 warn "reattaching attachments to maps"; 3983 trace "perl_reload: reattaching attachments to maps";
3727 reattach $_ for values %MAP; 3984 reattach $_ for values %MAP;
3728 warn "reattaching attachments to players"; 3985 trace "perl_reload: reattaching attachments to players";
3729 reattach $_ for values %PLAYER; 3986 reattach $_ for values %PLAYER;
3730 } 3987 }
3731 3988
3732 warn "running post_init jobs"; 3989 cf::_post_init 1;
3733 (pop @POST_INIT)->(1) while @POST_INIT;
3734 3990
3735 warn "leaving sync_job"; 3991 trace "perl_reload: leaving sync_job";
3736 3992
3737 1 3993 1
3738 } or do { 3994 } or do {
3739 warn $@; 3995 error $@;
3740 cf::cleanup "error while reloading, exiting."; 3996 cf::cleanup "perl_reload: error, exiting.";
3741 }; 3997 };
3742 3998
3743 warn "reloaded";
3744 --$RELOAD; 3999 --$RELOAD;
3745 } 4000 }
3746 4001
3747 $t1 = EV::time - $t1; 4002 $t1 = AE::time - $t1;
3748 warn "reload completed in ${t1}s\n"; 4003 info "perl_reload: completed in ${t1}s\n";
3749}; 4004};
3750 4005
3751our $RELOAD_WATCHER; # used only during reload 4006our $RELOAD_WATCHER; # used only during reload
3752 4007
3753sub reload_perl() { 4008sub reload_perl() {
3755 # coro crashes during coro_state_free->destroy here. 4010 # coro crashes during coro_state_free->destroy here.
3756 4011
3757 $RELOAD_WATCHER ||= cf::async { 4012 $RELOAD_WATCHER ||= cf::async {
3758 Coro::AIO::aio_wait cache_extensions; 4013 Coro::AIO::aio_wait cache_extensions;
3759 4014
3760 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4015 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3761 do_reload_perl; 4016 do_reload_perl;
3762 undef $RELOAD_WATCHER; 4017 undef $RELOAD_WATCHER;
3763 }; 4018 };
3764 }; 4019 };
3765} 4020}
3774 reload_perl; 4029 reload_perl;
3775 }; 4030 };
3776 } 4031 }
3777}; 4032};
3778 4033
3779unshift @INC, $LIBDIR; 4034#############################################################################
3780 4035
3781my $bug_warning = 0; 4036my $bug_warning = 0;
3782 4037
3783our @WAIT_FOR_TICK; 4038our @WAIT_FOR_TICK;
3784our @WAIT_FOR_TICK_BEGIN; 4039our @WAIT_FOR_TICK_BEGIN;
3785 4040
3786sub wait_for_tick { 4041sub wait_for_tick() {
3787 return if tick_inhibit || $Coro::current == $Coro::main; 4042 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3788 4043
3789 my $signal = new Coro::Signal; 4044 my $signal = new Coro::Signal;
3790 push @WAIT_FOR_TICK, $signal; 4045 push @WAIT_FOR_TICK, $signal;
3791 $signal->wait; 4046 $signal->wait;
3792} 4047}
3793 4048
3794sub wait_for_tick_begin { 4049sub wait_for_tick_begin() {
3795 return if tick_inhibit || $Coro::current == $Coro::main; 4050 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3796 4051
3797 my $signal = new Coro::Signal; 4052 my $signal = new Coro::Signal;
3798 push @WAIT_FOR_TICK_BEGIN, $signal; 4053 push @WAIT_FOR_TICK_BEGIN, $signal;
3799 $signal->wait; 4054 $signal->wait;
3800} 4055}
3806 return; 4061 return;
3807 } 4062 }
3808 4063
3809 cf::server_tick; # one server iteration 4064 cf::server_tick; # one server iteration
3810 4065
4066 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4067
3811 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4068 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3812 $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.;
3813 Coro::async_pool { 4070 Coro::async_pool {
3814 $Coro::current->{desc} = "runtime saver"; 4071 $Coro::current->{desc} = "runtime saver";
3815 write_runtime_sync 4072 write_runtime_sync
3816 or warn "ERROR: unable to write runtime file: $!"; 4073 or error "ERROR: unable to write runtime file: $!";
3817 }; 4074 };
3818 } 4075 }
3819 4076
3820 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4077 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3821 $sig->send; 4078 $sig->send;
3829 4086
3830 if (0) { 4087 if (0) {
3831 if ($NEXT_TICK) { 4088 if ($NEXT_TICK) {
3832 my $jitter = $TICK_START - $NEXT_TICK; 4089 my $jitter = $TICK_START - $NEXT_TICK;
3833 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4090 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3834 warn "jitter $JITTER\n";#d# 4091 debug "jitter $JITTER\n";#d#
3835 } 4092 }
3836 } 4093 }
3837} 4094}
3838 4095
3839{ 4096{
3840 # configure BDB 4097 # configure BDB
3841 4098
3842 BDB::min_parallel 8; 4099 BDB::min_parallel 16;
3843 BDB::max_poll_reqs $TICK * 0.1; 4100 BDB::max_poll_reqs $TICK * 0.1;
3844 $AnyEvent::BDB::WATCHER->priority (1); 4101 $AnyEvent::BDB::WATCHER->priority (1);
3845 4102
3846 unless ($DB_ENV) { 4103 unless ($DB_ENV) {
3847 $DB_ENV = BDB::db_env_create; 4104 $DB_ENV = BDB::db_env_create;
3884 IO::AIO::min_parallel 8; 4141 IO::AIO::min_parallel 8;
3885 IO::AIO::max_poll_time $TICK * 0.1; 4142 IO::AIO::max_poll_time $TICK * 0.1;
3886 undef $AnyEvent::AIO::WATCHER; 4143 undef $AnyEvent::AIO::WATCHER;
3887} 4144}
3888 4145
3889my $_log_backtrace; 4146our $_log_backtrace;
4147our $_log_backtrace_last;
3890 4148
3891sub _log_backtrace { 4149sub _log_backtrace {
3892 my ($msg, @addr) = @_; 4150 my ($msg, @addr) = @_;
3893 4151
3894 $msg =~ s/\n//; 4152 $msg =~ s/\n$//;
3895 4153
4154 if ($_log_backtrace_last eq $msg) {
4155 LOG llevInfo, "[ABT] $msg\n";
4156 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3896 # limit the # of concurrent backtraces 4157 # limit the # of concurrent backtraces
3897 if ($_log_backtrace < 2) { 4158 } elsif ($_log_backtrace < 2) {
4159 $_log_backtrace_last = $msg;
3898 ++$_log_backtrace; 4160 ++$_log_backtrace;
3899 my $perl_bt = Carp::longmess $msg; 4161 my $perl_bt = Carp::longmess $msg;
3900 async { 4162 async {
3901 $Coro::current->{desc} = "abt $msg"; 4163 $Coro::current->{desc} = "abt $msg";
3902 4164
3922 LOG llevInfo, "[ABT] $_\n" for @bt; 4184 LOG llevInfo, "[ABT] $_\n" for @bt;
3923 --$_log_backtrace; 4185 --$_log_backtrace;
3924 }; 4186 };
3925 } else { 4187 } else {
3926 LOG llevInfo, "[ABT] $msg\n"; 4188 LOG llevInfo, "[ABT] $msg\n";
3927 LOG llevInfo, "[ABT] [suppressed]\n"; 4189 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3928 } 4190 }
3929} 4191}
3930 4192
3931# load additional modules 4193# load additional modules
3932require "cf/$_.pm" for @EXTRA_MODULES; 4194require "cf/$_.pm" for @EXTRA_MODULES;
4195cf::_connect_to_perl_2;
3933 4196
3934END { cf::emergency_save } 4197END { cf::emergency_save }
3935 4198
39361 41991
3937 4200

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines