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.470 by root, Sun Apr 26 19:42:45 2009 UTC vs.
Revision 1.558 by root, Tue Oct 5 22:35:30 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use common::sense;
25use utf8;
26use strict qw(vars subs);
27 26
28use Symbol; 27use Symbol;
29use List::Util; 28use List::Util;
30use Socket; 29use Socket;
31use EV; 30use EV;
32use Opcode; 31use Opcode;
33use Safe; 32use Safe;
34use Safe::Hole; 33use Safe::Hole;
35use Storable (); 34use Storable ();
35use Carp ();
36 36
37use Guard (); 37use Guard ();
38use Coro (); 38use Coro ();
39use Coro::State; 39use Coro::State;
40use Coro::Handle; 40use Coro::Handle;
51use Coro::Util (); 51use Coro::Util ();
52 52
53use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
54use BDB (); 54use BDB ();
55use Data::Dumper; 55use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 56use Fcntl;
58use YAML (); 57use YAML::XS ();
59use IO::AIO (); 58use IO::AIO ();
60use Time::HiRes; 59use Time::HiRes;
61use Compress::LZF; 60use Compress::LZF;
62use Digest::MD5 (); 61use Digest::MD5 ();
63 62
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;
92our $DATADIR = datadir; 98our $DATADIR = datadir;
93our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
94our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
100our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
101our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
104 110
105our %RESOURCE; 111our %RESOURCE; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
106 118
107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109our $NEXT_TICK; 121our $NEXT_TICK;
110our $USE_FSYNC = 1; # use fsync to write maps - default on 122our $USE_FSYNC = 1; # use fsync to write maps - default on
112our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
114our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
115our $DB_ENV; 127our $DB_ENV;
116 128
117our @EXTRA_MODULES = qw(pod mapscript); 129our @EXTRA_MODULES = qw(pod match mapscript incloader);
118 130
119our %CFG; 131our %CFG;
120 132
121our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
122our $RUNTIME; 134our $RUNTIME;
134our $JITTER; # average jitter 146our $JITTER; # average jitter
135our $TICK_START; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
136 148
137our @POST_INIT; 149our @POST_INIT;
138 150
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
140 153
141binmode STDOUT; 154binmode STDOUT;
142binmode STDERR; 155binmode STDERR;
143 156
144# read virtual server time, if available 157# read virtual server time, if available
155 168
156our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
157 170
158sub cf::map::normalise; 171sub cf::map::normalise;
159 172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
187
160############################################################################# 188#############################################################################
161 189
162=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
163 191
164=over 4 192=over 4
205from wherever your confdir points to. 233from wherever your confdir points to.
206 234
207=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
208 236
209These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
210returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one thread
211per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
212 240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
213=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
214 247
215This array contains the results of the last C<invoke ()> call. When 248This 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 249C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
217that call. 250that call.
218 251
252=item %cf::REFLECT
253
254Contains, for each (C++) class name, a hash reference with information
255about object members (methods, scalars, arrays and flags) and other
256metadata, which is useful for introspection.
257
219=back 258=back
220 259
221=cut 260=cut
222 261
223BEGIN { 262sub error(@) { LOG llevError, join "", @_ }
224 *CORE::GLOBAL::warn = sub { 263sub warn (@) { LOG llevWarn , join "", @_ }
264sub info (@) { LOG llevInfo , join "", @_ }
265sub debug(@) { LOG llevDebug, join "", @_ }
266sub trace(@) { LOG llevTrace, join "", @_ }
267
268$Coro::State::WARNHOOK = sub {
225 my $msg = join "", @_; 269 my $msg = join "", @_;
226 270
227 $msg .= "\n" 271 $msg .= "\n"
228 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
229 273
230 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 274 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
231 275
232 LOG llevError, $msg; 276 LOG llevWarn, $msg;
233 }; 277};
234}
235 278
236$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
237 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
238 281
239 if ($Coro::current == $Coro::main) {#d# 282 error Carp::longmess $_[0];
283
284 if (in_main) {#d#
240 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
241 return;#d# 286 return;#d#
242 }#d# 287 }#d#
243 288
244 # kill coroutine otherwise 289 # kill coroutine otherwise
245 warn Carp::longmess $_[0];
246 Coro::terminate 290 Coro::terminate
247}; 291};
248
249$SIG{__DIE__} = sub { }; #d#?
250 292
251@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 293@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
252@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 294@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
253@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 295@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
254@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 296@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
268)) { 310)) {
269 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
270} 312}
271 313
272$EV::DIED = sub { 314$EV::DIED = sub {
273 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
274}; 316};
275 317
276############################################################################# 318#############################################################################
277 319
278=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
315our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 357our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
316 358
317sub encode_json($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
318sub decode_json($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
319 361
362=item $ref = cf::yaml_load $scalar
363
364Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
365
366=cut
367
368sub fork_call(&@);
369
370sub yaml_load($) {
371 fork_call { YAML::XS::Load $_[0] } @_
372}
373
320=item cf::post_init { BLOCK } 374=item cf::post_init { BLOCK }
321 375
322Execute the given codeblock, I<after> all extensions have been (re-)loaded, 376Execute the given codeblock, I<after> all extensions have been (re-)loaded,
323but I<before> the server starts ticking again. 377but I<before> the server starts ticking again.
324 378
325The cdoeblock will have a single boolean argument to indicate whether this 379The codeblock will have a single boolean argument to indicate whether this
326is a reload or not. 380is a reload or not.
327 381
328=cut 382=cut
329 383
330sub post_init(&) { 384sub post_init(&) {
331 push @POST_INIT, shift; 385 push @POST_INIT, shift;
386}
387
388sub _post_init {
389 trace "running post_init jobs";
390
391 # run them in parallel...
392
393 my @join;
394
395 while () {
396 push @join, map &Coro::async ($_, 0), @POST_INIT;
397 @POST_INIT = ();
398
399 @join or last;
400
401 (pop @join)->join;
402 }
332} 403}
333 404
334=item cf::lock_wait $string 405=item cf::lock_wait $string
335 406
336Wait until the given lock is available. See cf::lock_acquire. 407Wait until the given lock is available. See cf::lock_acquire.
375} 446}
376 447
377=item cf::periodic $interval, $cb 448=item cf::periodic $interval, $cb
378 449
379Like EV::periodic, but randomly selects a starting point so that the actions 450Like EV::periodic, but randomly selects a starting point so that the actions
380get spread over timer. 451get spread over time.
381 452
382=cut 453=cut
383 454
384sub periodic($$) { 455sub periodic($$) {
385 my ($interval, $cb) = @_; 456 my ($interval, $cb) = @_;
402 473
403=cut 474=cut
404 475
405our @SLOT_QUEUE; 476our @SLOT_QUEUE;
406our $SLOT_QUEUE; 477our $SLOT_QUEUE;
478our $SLOT_DECAY = 0.9;
407 479
408$SLOT_QUEUE->cancel if $SLOT_QUEUE; 480$SLOT_QUEUE->cancel if $SLOT_QUEUE;
409$SLOT_QUEUE = Coro::async { 481$SLOT_QUEUE = Coro::async {
410 $Coro::current->desc ("timeslot manager"); 482 $Coro::current->desc ("timeslot manager");
411 483
412 my $signal = new Coro::Signal; 484 my $signal = new Coro::Signal;
485 my $busy;
413 486
414 while () { 487 while () {
415 next_job: 488 next_job:
489
416 my $avail = cf::till_tick; 490 my $avail = cf::till_tick;
417 if ($avail > 0.01) { 491
418 for (0 .. $#SLOT_QUEUE) { 492 for (0 .. $#SLOT_QUEUE) {
419 if ($SLOT_QUEUE[$_][0] < $avail) { 493 if ($SLOT_QUEUE[$_][0] <= $avail) {
494 $busy = 0;
420 my $job = splice @SLOT_QUEUE, $_, 1, (); 495 my $job = splice @SLOT_QUEUE, $_, 1, ();
421 $job->[2]->send; 496 $job->[2]->send;
422 Coro::cede; 497 Coro::cede;
423 goto next_job; 498 goto next_job;
424 } 499 } else {
500 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
425 } 501 }
426 } 502 }
427 503
428 if (@SLOT_QUEUE) { 504 if (@SLOT_QUEUE) {
429 # we do not use wait_for_tick() as it returns immediately when tick is inactive 505 # we do not use wait_for_tick() as it returns immediately when tick is inactive
430 push @cf::WAIT_FOR_TICK, $signal; 506 push @cf::WAIT_FOR_TICK, $signal;
431 $signal->wait; 507 $signal->wait;
432 } else { 508 } else {
509 $busy = 0;
433 Coro::schedule; 510 Coro::schedule;
434 } 511 }
435 } 512 }
436}; 513};
437 514
438sub get_slot($;$$) { 515sub get_slot($;$$) {
439 return if tick_inhibit || $Coro::current == $Coro::main; 516 return if tick_inhibit || $Coro::current == $Coro::main;
440 517
441 my ($time, $pri, $name) = @_; 518 my ($time, $pri, $name) = @_;
442 519
443 $time = $TICK * .6 if $time > $TICK * .6; 520 $time = clamp $time, 0.01, $TICK * .6;
521
444 my $sig = new Coro::Signal; 522 my $sig = new Coro::Signal;
445 523
446 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 524 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
447 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 525 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
448 $SLOT_QUEUE->ready; 526 $SLOT_QUEUE->ready;
474=cut 552=cut
475 553
476sub sync_job(&) { 554sub sync_job(&) {
477 my ($job) = @_; 555 my ($job) = @_;
478 556
479 if ($Coro::current == $Coro::main) { 557 if (in_main) {
480 my $time = EV::time; 558 my $time = AE::time;
481 559
482 # this is the main coro, too bad, we have to block 560 # this is the main coro, too bad, we have to block
483 # till the operation succeeds, freezing the server :/ 561 # till the operation succeeds, freezing the server :/
484 562
485 LOG llevError, Carp::longmess "sync job";#d# 563 #LOG llevError, Carp::longmess "sync job";#d#
486 564
487 my $freeze_guard = freeze_mainloop; 565 my $freeze_guard = freeze_mainloop;
488 566
489 my $busy = 1; 567 my $busy = 1;
490 my @res; 568 my @res;
491 569
492 (async { 570 (async {
493 $Coro::current->desc ("sync job coro"); 571 $Coro::current->desc ("sync job coro");
494 @res = eval { $job->() }; 572 @res = eval { $job->() };
495 warn $@ if $@; 573 error $@ if $@;
496 undef $busy; 574 undef $busy;
497 })->prio (Coro::PRIO_MAX); 575 })->prio (Coro::PRIO_MAX);
498 576
499 while ($busy) { 577 while ($busy) {
500 if (Coro::nready) { 578 if (Coro::nready) {
502 } else { 580 } else {
503 EV::loop EV::LOOP_ONESHOT; 581 EV::loop EV::LOOP_ONESHOT;
504 } 582 }
505 } 583 }
506 584
507 my $time = EV::time - $time; 585 my $time = AE::time - $time;
508 586
509 $TICK_START += $time; # do not account sync jobs to server load 587 $TICK_START += $time; # do not account sync jobs to server load
510 588
511 wantarray ? @res : $res[0] 589 wantarray ? @res : $res[0]
512 } else { 590 } else {
534 $EXT_CORO{$coro+0} = $coro; 612 $EXT_CORO{$coro+0} = $coro;
535 613
536 $coro 614 $coro
537} 615}
538 616
539=item fork_call { }, $args 617=item fork_call { }, @args
540 618
541Executes the given code block with the given arguments in a seperate 619Executes the given code block with the given arguments in a seperate
542process, returning the results. Everything must be serialisable with 620process, returning the results. Everything must be serialisable with
543Coro::Storable. May, of course, block. Note that the executed sub may 621Coro::Storable. May, of course, block. Note that the executed sub may
544never block itself or use any form of event handling. 622never block itself or use any form of event handling.
545 623
546=cut 624=cut
547 625
626sub post_fork {
627 reset_signals;
628}
629
548sub fork_call(&@) { 630sub fork_call(&@) {
549 my ($cb, @args) = @_; 631 my ($cb, @args) = @_;
550 632
551 # we seemingly have to make a local copy of the whole thing, 633 # we seemingly have to make a local copy of the whole thing,
552 # otherwise perl prematurely frees the stuff :/ 634 # otherwise perl prematurely frees the stuff :/
553 # TODO: investigate and fix (likely this will be rather laborious) 635 # TODO: investigate and fix (likely this will be rather laborious)
554 636
555 my @res = Coro::Util::fork_eval { 637 my @res = Coro::Util::fork_eval {
556 reset_signals; 638 cf::post_fork;
557 &$cb 639 &$cb
558 }, @args; 640 } @args;
559 641
560 wantarray ? @res : $res[-1] 642 wantarray ? @res : $res[-1]
643}
644
645sub objinfo {
646 (
647 "counter value" => cf::object::object_count,
648 "objects created" => cf::object::create_count,
649 "objects destroyed" => cf::object::destroy_count,
650 "freelist size" => cf::object::free_count,
651 "allocated objects" => cf::object::objects_size,
652 "active objects" => cf::object::actives_size,
653 )
561} 654}
562 655
563=item $coin = coin_from_name $name 656=item $coin = coin_from_name $name
564 657
565=cut 658=cut
602within each server. 695within each server.
603 696
604=cut 697=cut
605 698
606sub db_table($) { 699sub db_table($) {
700 cf::error "db_get called from main context"
701 if $Coro::current == $Coro::main;
702
607 my ($name) = @_; 703 my ($name) = @_;
608 my $db = BDB::db_create $DB_ENV; 704 my $db = BDB::db_create $DB_ENV;
609 705
610 eval { 706 eval {
611 $db->set_flags (BDB::CHKSUM); 707 $db->set_flags (BDB::CHKSUM);
621} 717}
622 718
623our $DB; 719our $DB;
624 720
625sub db_init { 721sub db_init {
626 cf::sync_job {
627 $DB ||= db_table "db"; 722 $DB ||= db_table "db";
628 };
629} 723}
630 724
631sub db_get($$) { 725sub db_get($$) {
632 my $key = "$_[0]/$_[1]"; 726 my $key = "$_[0]/$_[1]";
633 727
634 cf::sync_job { 728 cf::error "db_get called from main context"
729 if $Coro::current == $Coro::main;
730
635 BDB::db_get $DB, undef, $key, my $data; 731 BDB::db_get $DB, undef, $key, my $data;
636 732
637 $! ? () 733 $! ? ()
638 : $data 734 : $data
639 }
640} 735}
641 736
642sub db_put($$$) { 737sub db_put($$$) {
643 BDB::dbreq_pri 4; 738 BDB::dbreq_pri 4;
644 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 739 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
700 795
701 my $t1 = Time::HiRes::time; 796 my $t1 = Time::HiRes::time;
702 my $data = $process->(\@data); 797 my $data = $process->(\@data);
703 my $t2 = Time::HiRes::time; 798 my $t2 = Time::HiRes::time;
704 799
705 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 800 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
706 801
707 db_put cache => "$id/data", $data; 802 db_put cache => "$id/data", $data;
708 db_put cache => "$id/md5" , $md5; 803 db_put cache => "$id/md5" , $md5;
709 db_put cache => "$id/meta", $meta; 804 db_put cache => "$id/meta", $meta;
710 805
720 815
721=cut 816=cut
722 817
723sub datalog($@) { 818sub datalog($@) {
724 my ($type, %kv) = @_; 819 my ($type, %kv) = @_;
725 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 820 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
726} 821}
727 822
728=back 823=back
729 824
730=cut 825=cut
925 1020
926 } elsif (exists $cb_id{$type}) { 1021 } elsif (exists $cb_id{$type}) {
927 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1022 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
928 1023
929 } elsif (ref $type) { 1024 } elsif (ref $type) {
930 warn "attaching objects not supported, ignoring.\n"; 1025 error "attaching objects not supported, ignoring.\n";
931 1026
932 } else { 1027 } else {
933 shift @arg; 1028 shift @arg;
934 warn "attach argument '$type' not supported, ignoring.\n"; 1029 error "attach argument '$type' not supported, ignoring.\n";
935 } 1030 }
936 } 1031 }
937} 1032}
938 1033
939sub _object_attach { 1034sub _object_attach {
949 _attach $registry, $klass, @attach; 1044 _attach $registry, $klass, @attach;
950 } 1045 }
951 1046
952 $obj->{$name} = \%arg; 1047 $obj->{$name} = \%arg;
953 } else { 1048 } else {
954 warn "object uses attachment '$name' which is not available, postponing.\n"; 1049 info "object uses attachment '$name' which is not available, postponing.\n";
955 } 1050 }
956 1051
957 $obj->{_attachment}{$name} = undef; 1052 $obj->{_attachment}{$name} = undef;
958} 1053}
959 1054
1018 1113
1019 for (@$callbacks) { 1114 for (@$callbacks) {
1020 eval { &{$_->[1]} }; 1115 eval { &{$_->[1]} };
1021 1116
1022 if ($@) { 1117 if ($@) {
1023 warn "$@";
1024 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1118 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1025 override; 1119 override;
1026 } 1120 }
1027 1121
1028 return 1 if $override; 1122 return 1 if $override;
1029 } 1123 }
1108 for (@$attach) { 1202 for (@$attach) {
1109 my ($klass, @attach) = @$_; 1203 my ($klass, @attach) = @$_;
1110 _attach $registry, $klass, @attach; 1204 _attach $registry, $klass, @attach;
1111 } 1205 }
1112 } else { 1206 } else {
1113 warn "object uses attachment '$name' that is not available, postponing.\n"; 1207 info "object uses attachment '$name' that is not available, postponing.\n";
1114 } 1208 }
1115 } 1209 }
1116} 1210}
1117 1211
1118cf::attachable->attach ( 1212cf::attachable->attach (
1145 my ($filename, $rdata, $objs) = @_; 1239 my ($filename, $rdata, $objs) = @_;
1146 1240
1147 sync_job { 1241 sync_job {
1148 if (length $$rdata) { 1242 if (length $$rdata) {
1149 utf8::decode (my $decname = $filename); 1243 utf8::decode (my $decname = $filename);
1150 warn sprintf "saving %s (%d,%d)\n", 1244 trace sprintf "saving %s (%d,%d)\n",
1151 $decname, length $$rdata, scalar @$objs; 1245 $decname, length $$rdata, scalar @$objs
1246 if $VERBOSE_IO;
1152 1247
1153 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1248 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1154 aio_chmod $fh, SAVE_MODE; 1249 aio_chmod $fh, SAVE_MODE;
1155 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1250 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1156 aio_fsync $fh if $cf::USE_FSYNC; 1251 if ($cf::USE_FSYNC) {
1252 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;
1253 aio_fsync $fh;
1254 }
1157 aio_close $fh; 1255 aio_close $fh;
1158 1256
1159 if (@$objs) { 1257 if (@$objs) {
1160 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1258 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1161 aio_chmod $fh, SAVE_MODE; 1259 aio_chmod $fh, SAVE_MODE;
1162 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1260 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1163 aio_write $fh, 0, (length $data), $data, 0; 1261 aio_write $fh, 0, (length $data), $data, 0;
1164 aio_fsync $fh if $cf::USE_FSYNC; 1262 if ($cf::USE_FSYNC) {
1263 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;
1264 aio_fsync $fh;
1265 }
1165 aio_close $fh; 1266 aio_close $fh;
1166 aio_rename "$filename.pst~", "$filename.pst"; 1267 aio_rename "$filename.pst~", "$filename.pst";
1167 } 1268 }
1168 } else { 1269 } else {
1169 aio_unlink "$filename.pst"; 1270 aio_unlink "$filename.pst";
1172 aio_rename "$filename~", $filename; 1273 aio_rename "$filename~", $filename;
1173 1274
1174 $filename =~ s%/[^/]+$%%; 1275 $filename =~ s%/[^/]+$%%;
1175 aio_pathsync $filename if $cf::USE_FSYNC; 1276 aio_pathsync $filename if $cf::USE_FSYNC;
1176 } else { 1277 } else {
1177 warn "unable to save objects: $filename~: $!\n"; 1278 error "unable to save objects: $filename~: $!\n";
1178 } 1279 }
1179 } else { 1280 } else {
1180 aio_unlink $filename; 1281 aio_unlink $filename;
1181 aio_unlink "$filename.pst"; 1282 aio_unlink "$filename.pst";
1182 } 1283 }
1206 my $st = eval { Coro::Storable::thaw $av }; 1307 my $st = eval { Coro::Storable::thaw $av };
1207 $av = $st->{objs}; 1308 $av = $st->{objs};
1208 } 1309 }
1209 1310
1210 utf8::decode (my $decname = $filename); 1311 utf8::decode (my $decname = $filename);
1211 warn sprintf "loading %s (%d,%d)\n", 1312 trace sprintf "loading %s (%d,%d)\n",
1212 $decname, length $data, scalar @{$av || []}; 1313 $decname, length $data, scalar @{$av || []}
1314 if $VERBOSE_IO;
1213 1315
1214 ($data, $av) 1316 ($data, $av)
1215} 1317}
1216 1318
1217=head2 COMMAND CALLBACKS 1319=head2 COMMAND CALLBACKS
1276} 1378}
1277 1379
1278use File::Glob (); 1380use File::Glob ();
1279 1381
1280cf::player->attach ( 1382cf::player->attach (
1281 on_command => sub { 1383 on_unknown_command => sub {
1282 my ($pl, $name, $params) = @_; 1384 my ($pl, $name, $params) = @_;
1283 1385
1284 my $cb = $COMMAND{$name} 1386 my $cb = $COMMAND{$name}
1285 or return; 1387 or return;
1286 1388
1309 1411
1310 $pl->ext_reply ($reply, @reply) 1412 $pl->ext_reply ($reply, @reply)
1311 if $reply; 1413 if $reply;
1312 1414
1313 } else { 1415 } else {
1314 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1416 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1315 } 1417 }
1316 1418
1317 cf::override; 1419 cf::override;
1318 }, 1420 },
1319); 1421);
1320 1422
1321# "readahead" all extensions 1423# "readahead" all extensions
1322sub cache_extensions { 1424sub cache_extensions {
1323 my $grp = IO::AIO::aio_group; 1425 my $grp = IO::AIO::aio_group;
1324 1426
1325 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1427 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1326 for (grep /\.ext$/, @{$_[0]}) { 1428 for (grep /\.ext$/, @{$_[0]}) {
1327 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1429 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1328 } 1430 }
1329 }; 1431 };
1330 1432
1331 $grp 1433 $grp
1332} 1434}
1333 1435
1334sub load_extensions { 1436sub load_extensions {
1437 info "loading extensions...";
1438
1335 cf::sync_job { 1439 cf::sync_job {
1336 my %todo; 1440 my %todo;
1337 1441
1338 for my $path (<$LIBDIR/*.ext>) { 1442 for my $path (<$LIBDIR/*.ext>) {
1339 next unless -r $path; 1443 next unless -r $path;
1357 1461
1358 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1462 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1359 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1463 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1360 1464
1361 $ext{source} = 1465 $ext{source} =
1362 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1466 "package $pkg; use common::sense;\n"
1363 . "#line 1 \"$path\"\n{\n" 1467 . "#line 1 \"$path\"\n{\n"
1364 . $source 1468 . $source
1365 . "\n};\n1"; 1469 . "\n};\n1";
1366 1470
1367 $todo{$base} = \%ext; 1471 $todo{$base} = \%ext;
1368 } 1472 }
1369 1473
1474 my $pass = 0;
1370 my %done; 1475 my %done;
1371 while (%todo) { 1476 while (%todo) {
1372 my $progress; 1477 my $progress;
1373 1478
1479 ++$pass;
1480
1481 ext:
1374 while (my ($k, $v) = each %todo) { 1482 while (my ($k, $v) = each %todo) {
1375 for (split /,\s*/, $v->{meta}{depends}) { 1483 for (split /,\s*/, $v->{meta}{depends}) {
1376 goto skip 1484 next ext
1377 unless exists $done{$_}; 1485 unless exists $done{$_};
1378 } 1486 }
1379 1487
1380 warn "... loading '$k' into '$v->{pkg}'\n"; 1488 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1381 1489
1382 unless (eval $v->{source}) { 1490 my $active = eval $v->{source};
1491
1492 if (length $@) {
1383 my $msg = $@ ? "$v->{path}: $@\n" 1493 error "$v->{path}: $@\n";
1384 : "$v->{base}: extension inactive.\n";
1385 1494
1386 if (exists $v->{meta}{mandatory}) {
1387 warn $msg;
1388 cf::cleanup "mandatory extension failed to load, exiting."; 1495 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1389 } 1496 if exists $v->{meta}{mandatory};
1390 1497
1391 warn $msg; 1498 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1499 delete $todo{$k};
1500 } else {
1501 $done{$k} = delete $todo{$k};
1502 push @EXTS, $v->{pkg};
1503 $progress = 1;
1504
1505 info "$v->{base}: extension inactive.\n"
1506 unless $active;
1392 } 1507 }
1393
1394 $done{$k} = delete $todo{$k};
1395 push @EXTS, $v->{pkg};
1396 $progress = 1;
1397 } 1508 }
1398 1509
1399 skip: 1510 unless ($progress) {
1400 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1511 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1401 unless $progress; 1512
1513 while (my ($k, $v) = each %todo) {
1514 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1515 if exists $v->{meta}{mandatory};
1516 }
1517 }
1402 } 1518 }
1403 }; 1519 };
1404} 1520}
1405 1521
1406############################################################################# 1522#############################################################################
1490 $cf::PLAYER{$login} = $pl 1606 $cf::PLAYER{$login} = $pl
1491 } 1607 }
1492 } 1608 }
1493} 1609}
1494 1610
1611cf::player->attach (
1612 on_load => sub {
1613 my ($pl, $path) = @_;
1614
1615 # restore slots saved in save, below
1616 my $slots = delete $pl->{_slots};
1617
1618 $pl->ob->current_weapon ($slots->[0]);
1619 $pl->combat_ob ($slots->[1]);
1620 $pl->ranged_ob ($slots->[2]);
1621 },
1622);
1623
1495sub save($) { 1624sub save($) {
1496 my ($pl) = @_; 1625 my ($pl) = @_;
1497 1626
1498 return if $pl->{deny_save}; 1627 return if $pl->{deny_save};
1499 1628
1504 1633
1505 aio_mkdir playerdir $pl, 0770; 1634 aio_mkdir playerdir $pl, 0770;
1506 $pl->{last_save} = $cf::RUNTIME; 1635 $pl->{last_save} = $cf::RUNTIME;
1507 1636
1508 cf::get_slot 0.01; 1637 cf::get_slot 0.01;
1638
1639 # save slots, to be restored later
1640 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1509 1641
1510 $pl->save_pl ($path); 1642 $pl->save_pl ($path);
1511 cf::cede_to_tick; 1643 cf::cede_to_tick;
1512} 1644}
1513 1645
1547 my $name = $pl->ob->name; 1679 my $name = $pl->ob->name;
1548 1680
1549 $pl->{deny_save} = 1; 1681 $pl->{deny_save} = 1;
1550 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1682 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1551 1683
1552 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1684 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1553 $pl->deactivate; 1685 $pl->deactivate;
1686
1554 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1687 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1555 $pl->ob->check_score;
1556 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1688 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1689 ext::highscore::check ($pl->ob);
1690
1557 $pl->ns->destroy if $pl->ns; 1691 $pl->ns->destroy if $pl->ns;
1558 1692
1559 my $path = playerdir $pl; 1693 my $path = playerdir $pl;
1560 my $temp = "$path~$cf::RUNTIME~deleting~"; 1694 my $temp = "$path~$cf::RUNTIME~deleting~";
1561 aio_rename $path, $temp; 1695 aio_rename $path, $temp;
1615 \@logins 1749 \@logins
1616} 1750}
1617 1751
1618=item $player->maps 1752=item $player->maps
1619 1753
1754=item cf::player::maps $login
1755
1620Returns an arrayref of map paths that are private for this 1756Returns an arrayref of map paths that are private for this
1621player. May block. 1757player. May block.
1622 1758
1623=cut 1759=cut
1624 1760
1686=cut 1822=cut
1687 1823
1688sub find_by_path($) { 1824sub find_by_path($) {
1689 my ($path) = @_; 1825 my ($path) = @_;
1690 1826
1827 $path =~ s/^~[^\/]*//; # skip ~login
1828
1691 my ($match, $specificity); 1829 my ($match, $specificity);
1692 1830
1693 for my $region (list) { 1831 for my $region (list) {
1694 if ($region->{match} && $path =~ $region->{match}) { 1832 if ($region->{match} && $path =~ $region->{match}) {
1695 ($match, $specificity) = ($region, $region->specificity) 1833 ($match, $specificity) = ($region, $region->specificity)
1723sub generate_random_map { 1861sub generate_random_map {
1724 my ($self, $rmp) = @_; 1862 my ($self, $rmp) = @_;
1725 1863
1726 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1864 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1727 1865
1728 # mit "rum" bekleckern, nicht
1729 $self->_create_random_map ( 1866 $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} 1867}
1743 1868
1744=item cf::map->register ($regex, $prio) 1869=item cf::map->register ($regex, $prio)
1745 1870
1746Register a handler for the map path matching the given regex at the 1871Register a handler for the map path matching the given regex at the
1751 1876
1752sub register { 1877sub register {
1753 my (undef, $regex, $prio) = @_; 1878 my (undef, $regex, $prio) = @_;
1754 my $pkg = caller; 1879 my $pkg = caller;
1755 1880
1756 no strict;
1757 push @{"$pkg\::ISA"}, __PACKAGE__; 1881 push @{"$pkg\::ISA"}, __PACKAGE__;
1758 1882
1759 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1883 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1760} 1884}
1761 1885
1762# also paths starting with '/' 1886# also paths starting with '/'
1763$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1887$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1764 1888
1765sub thawer_merge { 1889sub thawer_merge {
1766 my ($self, $merge) = @_; 1890 my ($self, $merge) = @_;
1767 1891
1768 # we have to keep some variables in memory intact 1892 # we have to keep some variables in memory intact
1773} 1897}
1774 1898
1775sub normalise { 1899sub normalise {
1776 my ($path, $base) = @_; 1900 my ($path, $base) = @_;
1777 1901
1778 $path = "$path"; # make sure its a string 1902 $path = "$path"; # make sure it's a string
1779 1903
1780 $path =~ s/\.map$//; 1904 $path =~ s/\.map$//;
1781 1905
1782 # map plan: 1906 # map plan:
1783 # 1907 #
1798 $base =~ s{[^/]+/?$}{}; 1922 $base =~ s{[^/]+/?$}{};
1799 $path = "$base/$path"; 1923 $path = "$base/$path";
1800 } 1924 }
1801 1925
1802 for ($path) { 1926 for ($path) {
1803 redo if s{//}{/};
1804 redo if s{/\.?/}{/}; 1927 redo if s{/\.?/}{/};
1805 redo if s{/[^/]+/\.\./}{/}; 1928 redo if s{/[^/]+/\.\./}{/};
1806 } 1929 }
1807 1930
1808 $path 1931 $path
1822 $self->init; # pass $1 etc. 1945 $self->init; # pass $1 etc.
1823 return $self; 1946 return $self;
1824 } 1947 }
1825 } 1948 }
1826 1949
1827 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1950 Carp::cluck "unable to resolve path '$path' (base '$base')";
1828 () 1951 ()
1829} 1952}
1830 1953
1831sub init { 1954sub init {
1832 my ($self) = @_; 1955 my ($self) = @_;
1954} 2077}
1955 2078
1956sub find; 2079sub find;
1957sub find { 2080sub find {
1958 my ($path, $origin) = @_; 2081 my ($path, $origin) = @_;
2082
2083 cf::cede_to_tick;
1959 2084
1960 $path = normalise $path, $origin && $origin->path; 2085 $path = normalise $path, $origin && $origin->path;
1961 2086
1962 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2087 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1963 my $guard2 = cf::lock_acquire "map_find:$path"; 2088 my $guard2 = cf::lock_acquire "map_find:$path";
1982 2107
1983 $cf::MAP{$path} = $map 2108 $cf::MAP{$path} = $map
1984 } 2109 }
1985} 2110}
1986 2111
1987sub pre_load { } 2112sub pre_load { }
1988sub post_load { } 2113#sub post_load { } # XS
1989 2114
1990sub load { 2115sub load {
1991 my ($self) = @_; 2116 my ($self) = @_;
1992 2117
1993 local $self->{deny_reset} = 1; # loading can take a long time 2118 local $self->{deny_reset} = 1; # loading can take a long time
2048 2173
2049 $self->in_memory (cf::MAP_ACTIVE); 2174 $self->in_memory (cf::MAP_ACTIVE);
2050 } 2175 }
2051 2176
2052 $self->post_load; 2177 $self->post_load;
2053}
2054 2178
2179 1
2180}
2181
2182# customize the map for a given player, i.e.
2183# return the _real_ map. used by e.g. per-player
2184# maps to change the path to ~playername/mappath
2055sub customise_for { 2185sub customise_for {
2056 my ($self, $ob) = @_; 2186 my ($self, $ob) = @_;
2057 2187
2058 return find "~" . $ob->name . "/" . $self->{path} 2188 return find "~" . $ob->name . "/" . $self->{path}
2059 if $self->per_player; 2189 if $self->per_player;
2075 or next; 2205 or next;
2076 $neigh = find $neigh, $map 2206 $neigh = find $neigh, $map
2077 or next; 2207 or next;
2078 $neigh->load; 2208 $neigh->load;
2079 2209
2210 # now find the diagonal neighbours
2080 push @neigh, 2211 push @neigh,
2081 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2212 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2082 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2213 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2083 } 2214 }
2084 2215
2091} 2222}
2092 2223
2093sub find_sync { 2224sub find_sync {
2094 my ($path, $origin) = @_; 2225 my ($path, $origin) = @_;
2095 2226
2096 cf::sync_job { find $path, $origin } 2227 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2228 if $Coro::current == $Coro::main;
2229
2230 find $path, $origin
2097} 2231}
2098 2232
2099sub do_load_sync { 2233sub do_load_sync {
2100 my ($map) = @_; 2234 my ($map) = @_;
2101 2235
2102 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2236 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2103 if $Coro::current == $Coro::main; 2237 if $Coro::current == $Coro::main;
2104 2238
2105 cf::sync_job { $map->load }; 2239 $map->load;
2106} 2240}
2107 2241
2108our %MAP_PREFETCH; 2242our %MAP_PREFETCH;
2109our $MAP_PREFETCHER = undef; 2243our $MAP_PREFETCHER = undef;
2110 2244
2136 $MAP_PREFETCHER->prio (6); 2270 $MAP_PREFETCHER->prio (6);
2137 2271
2138 () 2272 ()
2139} 2273}
2140 2274
2275# common code, used by both ->save and ->swapout
2141sub save { 2276sub _save {
2142 my ($self) = @_; 2277 my ($self) = @_;
2143
2144 my $lock = cf::lock_acquire "map_data:$self->{path}";
2145 2278
2146 $self->{last_save} = $cf::RUNTIME; 2279 $self->{last_save} = $cf::RUNTIME;
2147 2280
2148 return unless $self->dirty; 2281 return unless $self->dirty;
2149 2282
2169 } else { 2302 } else {
2170 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2303 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2171 } 2304 }
2172} 2305}
2173 2306
2307sub save {
2308 my ($self) = @_;
2309
2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311
2312 $self->_save;
2313}
2314
2174sub swap_out { 2315sub swap_out {
2175 my ($self) = @_; 2316 my ($self) = @_;
2176 2317
2177 # save first because save cedes
2178 $self->save;
2179
2180 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2318 my $lock = cf::lock_acquire "map_data:$self->{path}";
2181 2319
2182 return if $self->players;
2183 return if $self->in_memory != cf::MAP_ACTIVE; 2320 return if $self->in_memory != cf::MAP_ACTIVE;
2184 return if $self->{deny_save}; 2321 return if $self->{deny_save};
2322 return if $self->players;
2185 2323
2324 # first deactivate the map and "unlink" it from the core
2325 $self->deactivate;
2326 $_->clear_links_to ($self) for values %cf::MAP;
2186 $self->in_memory (cf::MAP_SWAPPED); 2327 $self->in_memory (cf::MAP_SWAPPED);
2328
2329 # then atomically save
2330 $self->_save;
2331
2332 # then free the map
2333 $self->clear;
2334}
2335
2336sub reset_at {
2337 my ($self) = @_;
2338
2339 # TODO: safety, remove and allow resettable per-player maps
2340 return 1e99 if $self->{deny_reset};
2341
2342 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2343 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2344
2345 $time + $to
2346}
2347
2348sub should_reset {
2349 my ($self) = @_;
2350
2351 $self->reset_at <= $cf::RUNTIME
2352}
2353
2354sub reset {
2355 my ($self) = @_;
2356
2357 my $lock = cf::lock_acquire "map_data:$self->{path}";
2358
2359 return if $self->players;
2360
2361 cf::trace "resetting map ", $self->path, "\n";
2362
2363 $self->in_memory (cf::MAP_SWAPPED);
2364
2365 # need to save uniques path
2366 unless ($self->{deny_save}) {
2367 my $uniq = $self->uniq_path; utf8::encode $uniq;
2368
2369 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2370 if $uniq;
2371 }
2372
2373 delete $cf::MAP{$self->path};
2187 2374
2188 $self->deactivate; 2375 $self->deactivate;
2189 $_->clear_links_to ($self) for values %cf::MAP; 2376 $_->clear_links_to ($self) for values %cf::MAP;
2190 $self->clear; 2377 $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 2378
2236 $self->unlink_save; 2379 $self->unlink_save;
2237 $self->destroy; 2380 $self->destroy;
2238} 2381}
2239 2382
2247 2390
2248 delete $cf::MAP{$self->path}; 2391 delete $cf::MAP{$self->path};
2249 2392
2250 $self->unlink_save; 2393 $self->unlink_save;
2251 2394
2252 bless $self, "cf::map"; 2395 bless $self, "cf::map::wrap";
2253 delete $self->{deny_reset}; 2396 delete $self->{deny_reset};
2254 $self->{deny_save} = 1; 2397 $self->{deny_save} = 1;
2255 $self->reset_timeout (1); 2398 $self->reset_timeout (1);
2256 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2399 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2257 2400
2314 : normalise $_ 2457 : normalise $_
2315 } @{ aio_readdir $UNIQUEDIR or [] } 2458 } @{ aio_readdir $UNIQUEDIR or [] }
2316 ] 2459 ]
2317} 2460}
2318 2461
2462=item cf::map::static_maps
2463
2464Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2465file in the shared directory excluding F</styles> and F</editor>). May
2466block.
2467
2468=cut
2469
2470sub static_maps() {
2471 my @dirs = "";
2472 my @maps;
2473
2474 while (@dirs) {
2475 my $dir = shift @dirs;
2476
2477 next if $dir eq "/styles" || $dir eq "/editor";
2478
2479 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2480 or return;
2481
2482 for (@$files) {
2483 s/\.map$// or next;
2484 utf8::decode $_;
2485 push @maps, "$dir/$_";
2486 }
2487
2488 push @dirs, map "$dir/$_", @$dirs;
2489 }
2490
2491 \@maps
2492}
2493
2319=back 2494=back
2320 2495
2321=head3 cf::object 2496=head3 cf::object
2322 2497
2323=cut 2498=cut
2455 2630
2456Freezes the player and moves him/her to a special map (C<{link}>). 2631Freezes the player and moves him/her to a special map (C<{link}>).
2457 2632
2458The player should be reasonably safe there for short amounts of time (e.g. 2633The 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, 2634for 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 2635though, as the player cannot control the character while it is on the link
2461map. 2636map.
2462 2637
2463Will never block. 2638Will never block.
2464 2639
2465=item $player_object->leave_link ($map, $x, $y) 2640=item $player_object->leave_link ($map, $x, $y)
2486sub cf::object::player::enter_link { 2661sub cf::object::player::enter_link {
2487 my ($self) = @_; 2662 my ($self) = @_;
2488 2663
2489 $self->deactivate_recursive; 2664 $self->deactivate_recursive;
2490 2665
2666 ++$self->{_link_recursion};
2667
2491 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2668 return if UNIVERSAL::isa $self->map, "ext::map_link";
2492 2669
2493 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2670 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2494 if $self->map && $self->map->{path} ne "{link}"; 2671 if $self->map && $self->map->{path} ne "{link}";
2495 2672
2496 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2673 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2497} 2674}
2498 2675
2499sub cf::object::player::leave_link { 2676sub cf::object::player::leave_link {
2500 my ($self, $map, $x, $y) = @_; 2677 my ($self, $map, $x, $y) = @_;
2501 2678
2518 ($x, $y) = (-1, -1) 2695 ($x, $y) = (-1, -1)
2519 unless (defined $x) && (defined $y); 2696 unless (defined $x) && (defined $y);
2520 2697
2521 # use -1 or undef as default coordinates, not 0, 0 2698 # use -1 or undef as default coordinates, not 0, 0
2522 ($x, $y) = ($map->enter_x, $map->enter_y) 2699 ($x, $y) = ($map->enter_x, $map->enter_y)
2523 if $x <=0 && $y <= 0; 2700 if $x <= 0 && $y <= 0;
2524 2701
2525 $map->load; 2702 $map->load;
2526 $map->load_neighbours; 2703 $map->load_neighbours;
2527 2704
2528 return unless $self->contr->active; 2705 return unless $self->contr->active;
2529 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2530 $self->activate_recursive;
2531 2706
2532 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2707 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2533 $self->enter_map ($map, $x, $y); 2708 if ($self->enter_map ($map, $x, $y)) {
2534} 2709 # entering was successful
2710 delete $self->{_link_recursion};
2711 # only activate afterwards, to support waiting in hooks
2712 $self->activate_recursive;
2713 }
2535 2714
2715}
2716
2536=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2717=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2537 2718
2538Moves the player to the given map-path and coordinates by first freezing 2719Moves the player to the given map-path and coordinates by first freezing
2539her, loading and preparing them map, calling the provided $check callback 2720her, loading and preparing them map, calling the provided $check callback
2540that has to return the map if sucecssful, and then unfreezes the player on 2721that 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 2722the new (success) or old (failed) map position. In either case, $done will
2548 2729
2549our $GOTOGEN; 2730our $GOTOGEN;
2550 2731
2551sub cf::object::player::goto { 2732sub cf::object::player::goto {
2552 my ($self, $path, $x, $y, $check, $done) = @_; 2733 my ($self, $path, $x, $y, $check, $done) = @_;
2734
2735 if ($self->{_link_recursion} >= $MAX_LINKS) {
2736 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2737 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2738 ($path, $x, $y) = @$EMERGENCY_POSITION;
2739 }
2553 2740
2554 # do generation counting so two concurrent goto's will be executed in-order 2741 # do generation counting so two concurrent goto's will be executed in-order
2555 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2742 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2556 2743
2557 $self->enter_link; 2744 $self->enter_link;
2581 my $map = eval { 2768 my $map = eval {
2582 my $map = defined $path ? cf::map::find $path : undef; 2769 my $map = defined $path ? cf::map::find $path : undef;
2583 2770
2584 if ($map) { 2771 if ($map) {
2585 $map = $map->customise_for ($self); 2772 $map = $map->customise_for ($self);
2586 $map = $check->($map) if $check && $map; 2773 $map = $check->($map, $x, $y, $self) if $check && $map;
2587 } else { 2774 } else {
2588 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2775 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2589 } 2776 }
2590 2777
2591 $map 2778 $map
2599 if ($gen == $self->{_goto_generation}) { 2786 if ($gen == $self->{_goto_generation}) {
2600 delete $self->{_goto_generation}; 2787 delete $self->{_goto_generation};
2601 $self->leave_link ($map, $x, $y); 2788 $self->leave_link ($map, $x, $y);
2602 } 2789 }
2603 2790
2604 $done->() if $done; 2791 $done->($self) if $done;
2605 })->prio (1); 2792 })->prio (1);
2606} 2793}
2607 2794
2608=item $player_object->enter_exit ($exit_object) 2795=item $player_object->enter_exit ($exit_object)
2609 2796
2702 $self->message ("Something went wrong deep within the deliantra server. " 2889 $self->message ("Something went wrong deep within the deliantra server. "
2703 . "I'll try to bring you back to the map you were before. " 2890 . "I'll try to bring you back to the map you were before. "
2704 . "Please report this to the dungeon master!", 2891 . "Please report this to the dungeon master!",
2705 cf::NDI_UNIQUE | cf::NDI_RED); 2892 cf::NDI_UNIQUE | cf::NDI_RED);
2706 2893
2707 warn "ERROR in enter_exit: $@"; 2894 error "ERROR in enter_exit: $@";
2708 $self->leave_link; 2895 $self->leave_link;
2709 } 2896 }
2710 })->prio (1); 2897 })->prio (1);
2711} 2898}
2712 2899
2724sub cf::client::send_drawinfo { 2911sub cf::client::send_drawinfo {
2725 my ($self, $text, $flags) = @_; 2912 my ($self, $text, $flags) = @_;
2726 2913
2727 utf8::encode $text; 2914 utf8::encode $text;
2728 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2915 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2916}
2917
2918=item $client->send_big_packet ($pkt)
2919
2920Like C<send_packet>, but tries to compress large packets, and fragments
2921them as required.
2922
2923=cut
2924
2925our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2926
2927sub cf::client::send_big_packet {
2928 my ($self, $pkt) = @_;
2929
2930 # try lzf for large packets
2931 $pkt = "lzf " . Compress::LZF::compress $pkt
2932 if 1024 <= length $pkt and $self->{can_lzf};
2933
2934 # split very large packets
2935 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2936 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2937 $pkt = "frag";
2938 }
2939
2940 $self->send_packet ($pkt);
2729} 2941}
2730 2942
2731=item $client->send_msg ($channel, $msg, $color, [extra...]) 2943=item $client->send_msg ($channel, $msg, $color, [extra...])
2732 2944
2733Send a drawinfo or msg packet to the client, formatting the msg for the 2945Send a drawinfo or msg packet to the client, formatting the msg for the
2737 2949
2738=cut 2950=cut
2739 2951
2740# non-persistent channels (usually the info channel) 2952# non-persistent channels (usually the info channel)
2741our %CHANNEL = ( 2953our %CHANNEL = (
2954 "c/motd" => {
2955 id => "infobox",
2956 title => "MOTD",
2957 reply => undef,
2958 tooltip => "The message of the day",
2959 },
2742 "c/identify" => { 2960 "c/identify" => {
2743 id => "infobox", 2961 id => "infobox",
2744 title => "Identify", 2962 title => "Identify",
2745 reply => undef, 2963 reply => undef,
2746 tooltip => "Items recently identified", 2964 tooltip => "Items recently identified",
2748 "c/examine" => { 2966 "c/examine" => {
2749 id => "infobox", 2967 id => "infobox",
2750 title => "Examine", 2968 title => "Examine",
2751 reply => undef, 2969 reply => undef,
2752 tooltip => "Signs and other items you examined", 2970 tooltip => "Signs and other items you examined",
2971 },
2972 "c/shopinfo" => {
2973 id => "infobox",
2974 title => "Shop Info",
2975 reply => undef,
2976 tooltip => "What your bargaining skill tells you about the shop",
2753 }, 2977 },
2754 "c/book" => { 2978 "c/book" => {
2755 id => "infobox", 2979 id => "infobox",
2756 title => "Book", 2980 title => "Book",
2757 reply => undef, 2981 reply => undef,
2803 id => "infobox", 3027 id => "infobox",
2804 title => "Pets", 3028 title => "Pets",
2805 reply => undef, 3029 reply => undef,
2806 tooltip => "Shows information abotu your pets/a specific pet", 3030 tooltip => "Shows information abotu your pets/a specific pet",
2807 }, 3031 },
3032 "c/perceiveself" => {
3033 id => "infobox",
3034 title => "Perceive Self",
3035 reply => undef,
3036 tooltip => "You gained detailed knowledge about yourself",
3037 },
2808 "c/uptime" => { 3038 "c/uptime" => {
2809 id => "infobox", 3039 id => "infobox",
2810 title => "Uptime", 3040 title => "Uptime",
2811 reply => undef, 3041 reply => undef,
2812 tooltip => "How long the server has been running since last restart", 3042 tooltip => "How long the server has been running since last restart",
2867 my $pkt = "msg " 3097 my $pkt = "msg "
2868 . $self->{json_coder}->encode ( 3098 . $self->{json_coder}->encode (
2869 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3099 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2870 ); 3100 );
2871 3101
2872 # try lzf for large packets
2873 $pkt = "lzf " . Compress::LZF::compress $pkt
2874 if 1024 <= length $pkt and $self->{can_lzf};
2875
2876 # split very large packets
2877 if (8192 < length $pkt and $self->{can_lzf}) {
2878 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2879 $pkt = "frag";
2880 }
2881
2882 $self->send_packet ($pkt); 3102 $self->send_big_packet ($pkt);
2883} 3103}
2884 3104
2885=item $client->ext_msg ($type, @msg) 3105=item $client->ext_msg ($type, @msg)
2886 3106
2887Sends an ext event to the client. 3107Sends an ext event to the client.
2890 3110
2891sub cf::client::ext_msg($$@) { 3111sub cf::client::ext_msg($$@) {
2892 my ($self, $type, @msg) = @_; 3112 my ($self, $type, @msg) = @_;
2893 3113
2894 if ($self->extcmd == 2) { 3114 if ($self->extcmd == 2) {
2895 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3115 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2896 } elsif ($self->extcmd == 1) { # TODO: remove 3116 } elsif ($self->extcmd == 1) { # TODO: remove
2897 push @msg, msgtype => "event_$type"; 3117 push @msg, msgtype => "event_$type";
2898 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3118 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2899 } 3119 }
2900} 3120}
2901 3121
2902=item $client->ext_reply ($msgid, @msg) 3122=item $client->ext_reply ($msgid, @msg)
2903 3123
2907 3127
2908sub cf::client::ext_reply($$@) { 3128sub cf::client::ext_reply($$@) {
2909 my ($self, $id, @msg) = @_; 3129 my ($self, $id, @msg) = @_;
2910 3130
2911 if ($self->extcmd == 2) { 3131 if ($self->extcmd == 2) {
2912 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3132 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2913 } elsif ($self->extcmd == 1) { 3133 } elsif ($self->extcmd == 1) {
2914 #TODO: version 1, remove 3134 #TODO: version 1, remove
2915 unshift @msg, msgtype => "reply", msgid => $id; 3135 unshift @msg, msgtype => "reply", msgid => $id;
2916 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3136 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2917 } 3137 }
2918} 3138}
2919 3139
2920=item $success = $client->query ($flags, "text", \&cb) 3140=item $success = $client->query ($flags, "text", \&cb)
2921 3141
2992 3212
2993 $ns->ext_reply ($reply, @reply) 3213 $ns->ext_reply ($reply, @reply)
2994 if $reply; 3214 if $reply;
2995 3215
2996 } else { 3216 } else {
2997 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3217 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2998 } 3218 }
2999 3219
3000 cf::override; 3220 cf::override;
3001 }, 3221 },
3002); 3222);
3022 3242
3023 $coro 3243 $coro
3024} 3244}
3025 3245
3026cf::client->attach ( 3246cf::client->attach (
3027 on_destroy => sub { 3247 on_client_destroy => sub {
3028 my ($ns) = @_; 3248 my ($ns) = @_;
3029 3249
3030 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3250 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3031 }, 3251 },
3032); 3252);
3048our $safe_hole = new Safe::Hole; 3268our $safe_hole = new Safe::Hole;
3049 3269
3050$SIG{FPE} = 'IGNORE'; 3270$SIG{FPE} = 'IGNORE';
3051 3271
3052$safe->permit_only (Opcode::opset qw( 3272$safe->permit_only (Opcode::opset qw(
3053 :base_core :base_mem :base_orig :base_math 3273 :base_core :base_mem :base_orig :base_math :base_loop
3054 grepstart grepwhile mapstart mapwhile 3274 grepstart grepwhile mapstart mapwhile
3055 sort time 3275 sort time
3056)); 3276));
3057 3277
3058# here we export the classes and methods available to script code 3278# here we export the classes and methods available to script code
3083 decrease split destroy change_exp value msg lore send_msg)], 3303 decrease split destroy change_exp value msg lore send_msg)],
3084 ["cf::object::player" => qw(player)], 3304 ["cf::object::player" => qw(player)],
3085 ["cf::player" => qw(peaceful send_msg)], 3305 ["cf::player" => qw(peaceful send_msg)],
3086 ["cf::map" => qw(trigger)], 3306 ["cf::map" => qw(trigger)],
3087) { 3307) {
3088 no strict 'refs';
3089 my ($pkg, @funs) = @$_; 3308 my ($pkg, @funs) = @$_;
3090 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3309 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3091 for @funs; 3310 for @funs;
3092} 3311}
3093 3312
3110 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3329 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3111 $qcode =~ s/\n/\\n/g; 3330 $qcode =~ s/\n/\\n/g;
3112 3331
3113 %vars = (_dummy => 0) unless %vars; 3332 %vars = (_dummy => 0) unless %vars;
3114 3333
3334 my @res;
3115 local $_; 3335 local $_;
3116 local @safe::cf::_safe_eval_args = values %vars;
3117 3336
3118 my $eval = 3337 my $eval =
3119 "do {\n" 3338 "do {\n"
3120 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3339 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3121 . "#line 0 \"{$qcode}\"\n" 3340 . "#line 0 \"{$qcode}\"\n"
3122 . $code 3341 . $code
3123 . "\n}" 3342 . "\n}"
3124 ; 3343 ;
3125 3344
3345 if ($CFG{safe_eval}) {
3126 sub_generation_inc; 3346 sub_generation_inc;
3347 local @safe::cf::_safe_eval_args = values %vars;
3127 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3348 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3128 sub_generation_inc; 3349 sub_generation_inc;
3350 } else {
3351 local @cf::_safe_eval_args = values %vars;
3352 @res = wantarray ? eval eval : scalar eval $eval;
3353 }
3129 3354
3130 if ($@) { 3355 if ($@) {
3131 warn "$@"; 3356 warn "$@",
3132 warn "while executing safe code '$code'\n"; 3357 "while executing safe code '$code'\n",
3133 warn "with arguments " . (join " ", %vars) . "\n"; 3358 "with arguments " . (join " ", %vars) . "\n";
3134 } 3359 }
3135 3360
3136 wantarray ? @res : $res[0] 3361 wantarray ? @res : $res[0]
3137} 3362}
3138 3363
3152=cut 3377=cut
3153 3378
3154sub register_script_function { 3379sub register_script_function {
3155 my ($fun, $cb) = @_; 3380 my ($fun, $cb) = @_;
3156 3381
3157 no strict 'refs'; 3382 $fun = "safe::$fun" if $CFG{safe_eval};
3158 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3383 *$fun = $safe_hole->wrap ($cb);
3159} 3384}
3160 3385
3161=back 3386=back
3162 3387
3163=cut 3388=cut
3172 # for this (global event?) 3397 # for this (global event?)
3173 %ext::player_env::MUSIC_FACE_CACHE = (); 3398 %ext::player_env::MUSIC_FACE_CACHE = ();
3174 3399
3175 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3400 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3176 3401
3177 warn "loading facedata from $path\n"; 3402 trace "loading facedata from $path\n";
3178 3403
3179 my $facedata;
3180 0 < aio_load $path, $facedata 3404 0 < aio_load $path, my $facedata
3181 or die "$path: $!"; 3405 or die "$path: $!";
3182 3406
3183 $facedata = Coro::Storable::thaw $facedata; 3407 $facedata = Coro::Storable::thaw $facedata;
3184 3408
3185 $facedata->{version} == 2 3409 $facedata->{version} == 2
3186 or cf::cleanup "$path: version mismatch, cannot proceed."; 3410 or cf::cleanup "$path: version mismatch, cannot proceed.";
3187 3411
3188 # patch in the exptable 3412 # patch in the exptable
3413 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3189 $facedata->{resource}{"res/exp_table"} = { 3414 $facedata->{resource}{"res/exp_table"} = {
3190 type => FT_RSRC, 3415 type => FT_RSRC,
3191 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3416 data => $exp_table,
3417 hash => (Digest::MD5::md5 $exp_table),
3192 }; 3418 };
3193 cf::cede_to_tick; 3419 cf::cede_to_tick;
3194 3420
3195 { 3421 {
3196 my $faces = $facedata->{faceinfo}; 3422 my $faces = $facedata->{faceinfo};
3198 while (my ($face, $info) = each %$faces) { 3424 while (my ($face, $info) = each %$faces) {
3199 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3425 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3200 3426
3201 cf::face::set_visibility $idx, $info->{visibility}; 3427 cf::face::set_visibility $idx, $info->{visibility};
3202 cf::face::set_magicmap $idx, $info->{magicmap}; 3428 cf::face::set_magicmap $idx, $info->{magicmap};
3203 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3429 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3204 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3430 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3431 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3205 3432
3206 cf::cede_to_tick; 3433 cf::cede_to_tick;
3207 } 3434 }
3208 3435
3209 while (my ($face, $info) = each %$faces) { 3436 while (my ($face, $info) = each %$faces) {
3214 3441
3215 if (my $smooth = cf::face::find $info->{smooth}) { 3442 if (my $smooth = cf::face::find $info->{smooth}) {
3216 cf::face::set_smooth $idx, $smooth; 3443 cf::face::set_smooth $idx, $smooth;
3217 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3444 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3218 } else { 3445 } else {
3219 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3446 error "smooth face '$info->{smooth}' not found for face '$face'";
3220 } 3447 }
3221 3448
3222 cf::cede_to_tick; 3449 cf::cede_to_tick;
3223 } 3450 }
3224 } 3451 }
3233 3460
3234 cf::anim::invalidate_all; # d'oh 3461 cf::anim::invalidate_all; # d'oh
3235 } 3462 }
3236 3463
3237 { 3464 {
3238 # TODO: for gcfclient pleasure, we should give resources
3239 # that gcfclient doesn't grok a >10000 face index.
3240 my $res = $facedata->{resource}; 3465 my $res = $facedata->{resource};
3241 3466
3242 while (my ($name, $info) = each %$res) { 3467 while (my ($name, $info) = each %$res) {
3243 if (defined $info->{type}) { 3468 if (defined $info->{type}) {
3244 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3469 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3245 my $data;
3246 3470
3247 if ($info->{type} & 1) { 3471 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3248 # prepend meta info
3249
3250 my $meta = $enc->encode ({
3251 name => $name,
3252 %{ $info->{meta} || {} },
3253 });
3254
3255 $data = pack "(w/a*)*", $meta, $info->{data};
3256 } else {
3257 $data = $info->{data};
3258 }
3259
3260 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3261 cf::face::set_type $idx, $info->{type}; 3472 cf::face::set_type $idx, $info->{type};
3262 } else { 3473 } else {
3263 $RESOURCE{$name} = $info; 3474 $RESOURCE{$name} = $info; # unused
3264 } 3475 }
3265 3476
3266 cf::cede_to_tick; 3477 cf::cede_to_tick;
3267 } 3478 }
3268 } 3479 }
3269 3480
3270 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3481 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3271 3482
3272 1 3483 1
3273} 3484}
3274
3275cf::global->attach (on_resource_update => sub {
3276 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3277 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3278
3279 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3280 my $sound = $soundconf->{compat}[$_]
3281 or next;
3282
3283 my $face = cf::face::find "sound/$sound->[1]";
3284 cf::sound::set $sound->[0] => $face;
3285 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3286 }
3287
3288 while (my ($k, $v) = each %{$soundconf->{event}}) {
3289 my $face = cf::face::find "sound/$v";
3290 cf::sound::set $k => $face;
3291 }
3292 }
3293});
3294 3485
3295register_exticmd fx_want => sub { 3486register_exticmd fx_want => sub {
3296 my ($ns, $want) = @_; 3487 my ($ns, $want) = @_;
3297 3488
3298 while (my ($k, $v) = each %$want) { 3489 while (my ($k, $v) = each %$want) {
3337sub reload_treasures { 3528sub reload_treasures {
3338 load_resource_file "$DATADIR/treasures" 3529 load_resource_file "$DATADIR/treasures"
3339 or die "unable to load treasurelists\n"; 3530 or die "unable to load treasurelists\n";
3340} 3531}
3341 3532
3533sub reload_sound {
3534 trace "loading sound config from $DATADIR/sound\n";
3535
3536 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3537 or die "$DATADIR/sound $!";
3538
3539 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3540
3541 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3542 my $sound = $soundconf->{compat}[$_]
3543 or next;
3544
3545 my $face = cf::face::find "sound/$sound->[1]";
3546 cf::sound::set $sound->[0] => $face;
3547 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3548 }
3549
3550 while (my ($k, $v) = each %{$soundconf->{event}}) {
3551 my $face = cf::face::find "sound/$v";
3552 cf::sound::set $k => $face;
3553 }
3554}
3555
3342sub reload_resources { 3556sub reload_resources {
3343 warn "reloading resource files...\n"; 3557 trace "reloading resource files...\n";
3344 3558
3559 reload_exp_table;
3560 reload_materials;
3345 reload_facedata; 3561 reload_facedata;
3562 reload_sound;
3346 reload_archetypes; 3563 reload_archetypes;
3347 reload_regions; 3564 reload_regions;
3348 reload_treasures; 3565 reload_treasures;
3349 3566
3350 warn "finished reloading resource files\n"; 3567 trace "finished reloading resource files\n";
3351} 3568}
3352 3569
3353sub reload_config { 3570sub reload_config {
3354 open my $fh, "<:utf8", "$CONFDIR/config" 3571 trace "reloading config file...\n";
3355 or return;
3356 3572
3357 local $/; 3573 0 < aio_load "$CONFDIR/config", my $config
3358 *CFG = YAML::Load <$fh>; 3574 or die "$CONFDIR/config: $!";
3359 3575
3576 utf8::decode $config;
3577 *CFG = yaml_load $config;
3578
3360 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3579 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3361 3580
3362 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3581 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3363 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3582 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3364 3583
3365 if (exists $CFG{mlockall}) { 3584 if (exists $CFG{mlockall}) {
3388 3607
3389 seek $fh, 0, 0; 3608 seek $fh, 0, 0;
3390 print $fh $$; 3609 print $fh $$;
3391} 3610}
3392 3611
3612sub main_loop {
3613 trace "EV::loop starting\n";
3614 if (1) {
3615 EV::loop;
3616 }
3617 trace "EV::loop returned\n";
3618 goto &main_loop unless $REALLY_UNLOOP;
3619}
3620
3393sub main { 3621sub main {
3394 cf::init_globals; # initialise logging 3622 cf::init_globals; # initialise logging
3395 3623
3396 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3624 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3397 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3625 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3398 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3626 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3399 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3627 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3400
3401 cf::init_experience;
3402 cf::init_anim;
3403 cf::init_attackmess;
3404 cf::init_dynamic;
3405 3628
3406 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3629 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3407 3630
3408 # we must not ever block the main coroutine 3631 # we must not ever block the main coroutine
3409 local $Coro::idle = sub { 3632 local $Coro::idle = sub {
3415 }; 3638 };
3416 3639
3417 evthread_start IO::AIO::poll_fileno; 3640 evthread_start IO::AIO::poll_fileno;
3418 3641
3419 cf::sync_job { 3642 cf::sync_job {
3643 cf::incloader::init ();
3644
3645 cf::init_anim;
3646 cf::init_attackmess;
3647 cf::init_dynamic;
3648
3649 cf::load_settings;
3650
3420 reload_resources; 3651 reload_resources;
3421 reload_config; 3652 reload_config;
3422 db_init; 3653 db_init;
3423 3654
3424 cf::load_settings;
3425 cf::load_materials;
3426 cf::init_uuid; 3655 cf::init_uuid;
3427 cf::init_signals; 3656 cf::init_signals;
3428 cf::init_commands;
3429 cf::init_skills; 3657 cf::init_skills;
3430 3658
3431 cf::init_beforeplay; 3659 cf::init_beforeplay;
3432 3660
3433 atomic; 3661 atomic;
3435 load_extensions; 3663 load_extensions;
3436 3664
3437 utime time, time, $RUNTIMEFILE; 3665 utime time, time, $RUNTIMEFILE;
3438 3666
3439 # no (long-running) fork's whatsoever before this point(!) 3667 # no (long-running) fork's whatsoever before this point(!)
3668 use POSIX ();
3440 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3669 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3441 3670
3442 (pop @POST_INIT)->(0) while @POST_INIT; 3671 cf::_post_init 0;
3443 }; 3672 };
3444 3673
3445 EV::loop; 3674 cf::object::thawer::errors_are_fatal 0;
3675 info "parse errors in files are no longer fatal from this point on.\n";
3676
3677 my $free_main; $free_main = EV::idle sub {
3678 undef $free_main;
3679 undef &main; # free gobs of memory :)
3680 };
3681
3682 goto &main_loop;
3446} 3683}
3447 3684
3448############################################################################# 3685#############################################################################
3449# initialisation and cleanup 3686# initialisation and cleanup
3450 3687
3451# install some emergency cleanup handlers 3688# install some emergency cleanup handlers
3452BEGIN { 3689BEGIN {
3453 our %SIGWATCHER = (); 3690 our %SIGWATCHER = ();
3454 for my $signal (qw(INT HUP TERM)) { 3691 for my $signal (qw(INT HUP TERM)) {
3455 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3692 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3456 cf::cleanup "SIG$signal"; 3693 cf::cleanup "SIG$signal";
3457 }; 3694 };
3458 } 3695 }
3459} 3696}
3460 3697
3461sub write_runtime_sync { 3698sub write_runtime_sync {
3699 my $t0 = AE::time;
3700
3462 # first touch the runtime file to show we are still running: 3701 # first touch the runtime file to show we are still running:
3463 # the fsync below can take a very very long time. 3702 # the fsync below can take a very very long time.
3464 3703
3465 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3704 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3466 3705
3467 my $guard = cf::lock_acquire "write_runtime"; 3706 my $guard = cf::lock_acquire "write_runtime";
3468 3707
3469 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3708 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3470 or return; 3709 or return;
3471 3710
3472 my $value = $cf::RUNTIME + 90 + 10; 3711 my $value = $cf::RUNTIME + 90 + 10;
3473 # 10 is the runtime save interval, for a monotonic clock 3712 # 10 is the runtime save interval, for a monotonic clock
3474 # 60 allows for the watchdog to kill the server. 3713 # 60 allows for the watchdog to kill the server.
3487 or return; 3726 or return;
3488 3727
3489 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3728 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3490 and return; 3729 and return;
3491 3730
3492 warn "runtime file written.\n"; 3731 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3493 3732
3494 1 3733 1
3495} 3734}
3496 3735
3497our $uuid_lock; 3736our $uuid_lock;
3509 or return; 3748 or return;
3510 3749
3511 my $value = uuid_seq uuid_cur; 3750 my $value = uuid_seq uuid_cur;
3512 3751
3513 unless ($value) { 3752 unless ($value) {
3514 warn "cowardly refusing to write zero uuid value!\n"; 3753 info "cowardly refusing to write zero uuid value!\n";
3515 return; 3754 return;
3516 } 3755 }
3517 3756
3518 my $value = uuid_str $value + $uuid_skip; 3757 my $value = uuid_str $value + $uuid_skip;
3519 $uuid_skip = 0; 3758 $uuid_skip = 0;
3529 or return; 3768 or return;
3530 3769
3531 aio_rename "$uuid~", $uuid 3770 aio_rename "$uuid~", $uuid
3532 and return; 3771 and return;
3533 3772
3534 warn "uuid file written ($value).\n"; 3773 trace "uuid file written ($value).\n";
3535 3774
3536 1 3775 1
3537 3776
3538} 3777}
3539 3778
3545} 3784}
3546 3785
3547sub emergency_save() { 3786sub emergency_save() {
3548 my $freeze_guard = cf::freeze_mainloop; 3787 my $freeze_guard = cf::freeze_mainloop;
3549 3788
3550 warn "emergency_perl_save: enter\n"; 3789 info "emergency_perl_save: enter\n";
3790
3791 # this is a trade-off: we want to be very quick here, so
3792 # save all maps without fsync, and later call a global sync
3793 # (which in turn might be very very slow)
3794 local $USE_FSYNC = 0;
3551 3795
3552 cf::sync_job { 3796 cf::sync_job {
3553 # this is a trade-off: we want to be very quick here, so 3797 cf::write_runtime_sync; # external watchdog should not bark
3554 # save all maps without fsync, and later call a global sync
3555 # (which in turn might be very very slow)
3556 local $USE_FSYNC = 0;
3557 3798
3558 # use a peculiar iteration method to avoid tripping on perl 3799 # use a peculiar iteration method to avoid tripping on perl
3559 # refcount bugs in for. also avoids problems with players 3800 # refcount bugs in for. also avoids problems with players
3560 # and maps saved/destroyed asynchronously. 3801 # and maps saved/destroyed asynchronously.
3561 warn "emergency_perl_save: begin player save\n"; 3802 info "emergency_perl_save: begin player save\n";
3562 for my $login (keys %cf::PLAYER) { 3803 for my $login (keys %cf::PLAYER) {
3563 my $pl = $cf::PLAYER{$login} or next; 3804 my $pl = $cf::PLAYER{$login} or next;
3564 $pl->valid or next; 3805 $pl->valid or next;
3565 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3806 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3566 $pl->save; 3807 $pl->save;
3567 } 3808 }
3568 warn "emergency_perl_save: end player save\n"; 3809 info "emergency_perl_save: end player save\n";
3569 3810
3811 cf::write_runtime_sync; # external watchdog should not bark
3812
3570 warn "emergency_perl_save: begin map save\n"; 3813 info "emergency_perl_save: begin map save\n";
3571 for my $path (keys %cf::MAP) { 3814 for my $path (keys %cf::MAP) {
3572 my $map = $cf::MAP{$path} or next; 3815 my $map = $cf::MAP{$path} or next;
3573 $map->valid or next; 3816 $map->valid or next;
3574 $map->save; 3817 $map->save;
3575 } 3818 }
3576 warn "emergency_perl_save: end map save\n"; 3819 info "emergency_perl_save: end map save\n";
3577 3820
3821 cf::write_runtime_sync; # external watchdog should not bark
3822
3578 warn "emergency_perl_save: begin database checkpoint\n"; 3823 info "emergency_perl_save: begin database checkpoint\n";
3579 BDB::db_env_txn_checkpoint $DB_ENV; 3824 BDB::db_env_txn_checkpoint $DB_ENV;
3580 warn "emergency_perl_save: end database checkpoint\n"; 3825 info "emergency_perl_save: end database checkpoint\n";
3581 3826
3582 warn "emergency_perl_save: begin write uuid\n"; 3827 info "emergency_perl_save: begin write uuid\n";
3583 write_uuid_sync 1; 3828 write_uuid_sync 1;
3584 warn "emergency_perl_save: end write uuid\n"; 3829 info "emergency_perl_save: end write uuid\n";
3830
3831 cf::write_runtime_sync; # external watchdog should not bark
3832
3833 trace "emergency_perl_save: syncing database to disk";
3834 BDB::db_env_txn_checkpoint $DB_ENV;
3835
3836 info "emergency_perl_save: starting sync\n";
3837 IO::AIO::aio_sync sub {
3838 info "emergency_perl_save: finished sync\n";
3839 };
3840
3841 cf::write_runtime_sync; # external watchdog should not bark
3842
3843 trace "emergency_perl_save: flushing outstanding aio requests";
3844 while (IO::AIO::nreqs || BDB::nreqs) {
3845 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3846 }
3847
3848 cf::write_runtime_sync; # external watchdog should not bark
3585 }; 3849 };
3586 3850
3587 warn "emergency_perl_save: starting sync()\n";
3588 IO::AIO::aio_sync sub {
3589 warn "emergency_perl_save: finished sync()\n";
3590 };
3591
3592 warn "emergency_perl_save: leave\n"; 3851 info "emergency_perl_save: leave\n";
3593} 3852}
3594 3853
3595sub post_cleanup { 3854sub post_cleanup {
3596 my ($make_core) = @_; 3855 my ($make_core) = @_;
3597 3856
3857 IO::AIO::flush;
3858
3598 warn Carp::longmess "post_cleanup backtrace" 3859 error Carp::longmess "post_cleanup backtrace"
3599 if $make_core; 3860 if $make_core;
3600 3861
3601 my $fh = pidfile; 3862 my $fh = pidfile;
3602 unlink $PIDFILE if <$fh> == $$; 3863 unlink $PIDFILE if <$fh> == $$;
3603} 3864}
3623 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3884 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3624 for my $name (keys %$leaf_symtab) { 3885 for my $name (keys %$leaf_symtab) {
3625 _gv_clear *{"$pkg$name"}; 3886 _gv_clear *{"$pkg$name"};
3626# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3887# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3627 } 3888 }
3628 warn "cleared package $pkg\n";#d#
3629} 3889}
3630 3890
3631sub do_reload_perl() { 3891sub do_reload_perl() {
3632 # can/must only be called in main 3892 # can/must only be called in main
3633 if ($Coro::current != $Coro::main) { 3893 unless (in_main) {
3634 warn "can only reload from main coroutine"; 3894 error "can only reload from main coroutine";
3635 return; 3895 return;
3636 } 3896 }
3637 3897
3638 return if $RELOAD++; 3898 return if $RELOAD++;
3639 3899
3640 my $t1 = EV::time; 3900 my $t1 = AE::time;
3641 3901
3642 while ($RELOAD) { 3902 while ($RELOAD) {
3643 warn "reloading..."; 3903 cf::get_slot 0.1, -1, "reload_perl";
3904 info "perl_reload: reloading...";
3644 3905
3645 warn "entering sync_job"; 3906 trace "perl_reload: entering sync_job";
3646 3907
3647 cf::sync_job { 3908 cf::sync_job {
3648 cf::write_runtime_sync; # external watchdog should not bark
3649 cf::emergency_save; 3909 #cf::emergency_save;
3650 cf::write_runtime_sync; # external watchdog should not bark
3651 3910
3652 warn "syncing database to disk";
3653 BDB::db_env_txn_checkpoint $DB_ENV;
3654
3655 # if anything goes wrong in here, we should simply crash as we already saved
3656
3657 warn "flushing outstanding aio requests";
3658 while (IO::AIO::nreqs || BDB::nreqs) {
3659 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3660 }
3661
3662 warn "cancelling all extension coros"; 3911 trace "perl_reload: cancelling all extension coros";
3663 $_->cancel for values %EXT_CORO; 3912 $_->cancel for values %EXT_CORO;
3664 %EXT_CORO = (); 3913 %EXT_CORO = ();
3665 3914
3666 warn "removing commands"; 3915 trace "perl_reload: removing commands";
3667 %COMMAND = (); 3916 %COMMAND = ();
3668 3917
3669 warn "removing ext/exti commands"; 3918 trace "perl_reload: removing ext/exti commands";
3670 %EXTCMD = (); 3919 %EXTCMD = ();
3671 %EXTICMD = (); 3920 %EXTICMD = ();
3672 3921
3673 warn "unloading/nuking all extensions"; 3922 trace "perl_reload: unloading/nuking all extensions";
3674 for my $pkg (@EXTS) { 3923 for my $pkg (@EXTS) {
3675 warn "... unloading $pkg"; 3924 trace "... unloading $pkg";
3676 3925
3677 if (my $cb = $pkg->can ("unload")) { 3926 if (my $cb = $pkg->can ("unload")) {
3678 eval { 3927 eval {
3679 $cb->($pkg); 3928 $cb->($pkg);
3680 1 3929 1
3681 } or warn "$pkg unloaded, but with errors: $@"; 3930 } or error "$pkg unloaded, but with errors: $@";
3682 } 3931 }
3683 3932
3684 warn "... clearing $pkg"; 3933 trace "... clearing $pkg";
3685 clear_package $pkg; 3934 clear_package $pkg;
3686 } 3935 }
3687 3936
3688 warn "unloading all perl modules loaded from $LIBDIR"; 3937 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3689 while (my ($k, $v) = each %INC) { 3938 while (my ($k, $v) = each %INC) {
3690 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3939 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3691 3940
3692 warn "... unloading $k"; 3941 trace "... unloading $k";
3693 delete $INC{$k}; 3942 delete $INC{$k};
3694 3943
3695 $k =~ s/\.pm$//; 3944 $k =~ s/\.pm$//;
3696 $k =~ s/\//::/g; 3945 $k =~ s/\//::/g;
3697 3946
3700 } 3949 }
3701 3950
3702 clear_package $k; 3951 clear_package $k;
3703 } 3952 }
3704 3953
3705 warn "getting rid of safe::, as good as possible"; 3954 trace "perl_reload: getting rid of safe::, as good as possible";
3706 clear_package "safe::$_" 3955 clear_package "safe::$_"
3707 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3956 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3708 3957
3709 warn "unloading cf.pm \"a bit\""; 3958 trace "perl_reload: unloading cf.pm \"a bit\"";
3710 delete $INC{"cf.pm"}; 3959 delete $INC{"cf.pm"};
3711 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3960 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3712 3961
3713 # don't, removes xs symbols, too, 3962 # don't, removes xs symbols, too,
3714 # and global variables created in xs 3963 # and global variables created in xs
3715 #clear_package __PACKAGE__; 3964 #clear_package __PACKAGE__;
3716 3965
3717 warn "unload completed, starting to reload now"; 3966 info "perl_reload: unload completed, starting to reload now";
3718 3967
3719 warn "reloading cf.pm"; 3968 trace "perl_reload: reloading cf.pm";
3720 require cf; 3969 require cf;
3721 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3970 cf::_connect_to_perl_1;
3722 3971
3723 warn "loading config and database again"; 3972 trace "perl_reload: loading config and database again";
3724 cf::reload_config; 3973 cf::reload_config;
3725 3974
3726 warn "loading extensions"; 3975 trace "perl_reload: loading extensions";
3727 cf::load_extensions; 3976 cf::load_extensions;
3728 3977
3729 if ($REATTACH_ON_RELOAD) { 3978 if ($REATTACH_ON_RELOAD) {
3730 warn "reattaching attachments to objects/players"; 3979 trace "perl_reload: reattaching attachments to objects/players";
3731 _global_reattach; # objects, sockets 3980 _global_reattach; # objects, sockets
3732 warn "reattaching attachments to maps"; 3981 trace "perl_reload: reattaching attachments to maps";
3733 reattach $_ for values %MAP; 3982 reattach $_ for values %MAP;
3734 warn "reattaching attachments to players"; 3983 trace "perl_reload: reattaching attachments to players";
3735 reattach $_ for values %PLAYER; 3984 reattach $_ for values %PLAYER;
3736 } 3985 }
3737 3986
3738 warn "running post_init jobs"; 3987 cf::_post_init 1;
3739 (pop @POST_INIT)->(1) while @POST_INIT;
3740 3988
3741 warn "leaving sync_job"; 3989 trace "perl_reload: leaving sync_job";
3742 3990
3743 1 3991 1
3744 } or do { 3992 } or do {
3745 warn $@; 3993 error $@;
3746 cf::cleanup "error while reloading, exiting."; 3994 cf::cleanup "perl_reload: error, exiting.";
3747 }; 3995 };
3748 3996
3749 warn "reloaded";
3750 --$RELOAD; 3997 --$RELOAD;
3751 } 3998 }
3752 3999
3753 $t1 = EV::time - $t1; 4000 $t1 = AE::time - $t1;
3754 warn "reload completed in ${t1}s\n"; 4001 info "perl_reload: completed in ${t1}s\n";
3755}; 4002};
3756 4003
3757our $RELOAD_WATCHER; # used only during reload 4004our $RELOAD_WATCHER; # used only during reload
3758 4005
3759sub reload_perl() { 4006sub reload_perl() {
3761 # coro crashes during coro_state_free->destroy here. 4008 # coro crashes during coro_state_free->destroy here.
3762 4009
3763 $RELOAD_WATCHER ||= cf::async { 4010 $RELOAD_WATCHER ||= cf::async {
3764 Coro::AIO::aio_wait cache_extensions; 4011 Coro::AIO::aio_wait cache_extensions;
3765 4012
3766 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4013 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3767 do_reload_perl; 4014 do_reload_perl;
3768 undef $RELOAD_WATCHER; 4015 undef $RELOAD_WATCHER;
3769 }; 4016 };
3770 }; 4017 };
3771} 4018}
3780 reload_perl; 4027 reload_perl;
3781 }; 4028 };
3782 } 4029 }
3783}; 4030};
3784 4031
3785unshift @INC, $LIBDIR; 4032#############################################################################
3786 4033
3787my $bug_warning = 0; 4034my $bug_warning = 0;
3788 4035
3789our @WAIT_FOR_TICK; 4036our @WAIT_FOR_TICK;
3790our @WAIT_FOR_TICK_BEGIN; 4037our @WAIT_FOR_TICK_BEGIN;
3791 4038
3792sub wait_for_tick { 4039sub wait_for_tick() {
3793 return if tick_inhibit || $Coro::current == $Coro::main; 4040 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3794 4041
3795 my $signal = new Coro::Signal; 4042 my $signal = new Coro::Signal;
3796 push @WAIT_FOR_TICK, $signal; 4043 push @WAIT_FOR_TICK, $signal;
3797 $signal->wait; 4044 $signal->wait;
3798} 4045}
3799 4046
3800sub wait_for_tick_begin { 4047sub wait_for_tick_begin() {
3801 return if tick_inhibit || $Coro::current == $Coro::main; 4048 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3802 4049
3803 my $signal = new Coro::Signal; 4050 my $signal = new Coro::Signal;
3804 push @WAIT_FOR_TICK_BEGIN, $signal; 4051 push @WAIT_FOR_TICK_BEGIN, $signal;
3805 $signal->wait; 4052 $signal->wait;
3806} 4053}
3812 return; 4059 return;
3813 } 4060 }
3814 4061
3815 cf::server_tick; # one server iteration 4062 cf::server_tick; # one server iteration
3816 4063
4064 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4065
3817 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4066 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3818 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4067 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3819 Coro::async_pool { 4068 Coro::async_pool {
3820 $Coro::current->{desc} = "runtime saver"; 4069 $Coro::current->{desc} = "runtime saver";
3821 write_runtime_sync 4070 write_runtime_sync
3822 or warn "ERROR: unable to write runtime file: $!"; 4071 or error "ERROR: unable to write runtime file: $!";
3823 }; 4072 };
3824 } 4073 }
3825 4074
3826 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4075 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3827 $sig->send; 4076 $sig->send;
3835 4084
3836 if (0) { 4085 if (0) {
3837 if ($NEXT_TICK) { 4086 if ($NEXT_TICK) {
3838 my $jitter = $TICK_START - $NEXT_TICK; 4087 my $jitter = $TICK_START - $NEXT_TICK;
3839 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4088 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3840 warn "jitter $JITTER\n";#d# 4089 debug "jitter $JITTER\n";#d#
3841 } 4090 }
3842 } 4091 }
3843} 4092}
3844 4093
3845{ 4094{
3846 # configure BDB 4095 # configure BDB
3847 4096
3848 BDB::min_parallel 8; 4097 BDB::min_parallel 16;
3849 BDB::max_poll_reqs $TICK * 0.1; 4098 BDB::max_poll_reqs $TICK * 0.1;
3850 $AnyEvent::BDB::WATCHER->priority (1); 4099 $AnyEvent::BDB::WATCHER->priority (1);
3851 4100
3852 unless ($DB_ENV) { 4101 unless ($DB_ENV) {
3853 $DB_ENV = BDB::db_env_create; 4102 $DB_ENV = BDB::db_env_create;
3890 IO::AIO::min_parallel 8; 4139 IO::AIO::min_parallel 8;
3891 IO::AIO::max_poll_time $TICK * 0.1; 4140 IO::AIO::max_poll_time $TICK * 0.1;
3892 undef $AnyEvent::AIO::WATCHER; 4141 undef $AnyEvent::AIO::WATCHER;
3893} 4142}
3894 4143
3895my $_log_backtrace; 4144our $_log_backtrace;
4145our $_log_backtrace_last;
3896 4146
3897sub _log_backtrace { 4147sub _log_backtrace {
3898 my ($msg, @addr) = @_; 4148 my ($msg, @addr) = @_;
3899 4149
3900 $msg =~ s/\n//; 4150 $msg =~ s/\n$//;
3901 4151
4152 if ($_log_backtrace_last eq $msg) {
4153 LOG llevInfo, "[ABT] $msg\n";
4154 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3902 # limit the # of concurrent backtraces 4155 # limit the # of concurrent backtraces
3903 if ($_log_backtrace < 2) { 4156 } elsif ($_log_backtrace < 2) {
4157 $_log_backtrace_last = $msg;
3904 ++$_log_backtrace; 4158 ++$_log_backtrace;
3905 my $perl_bt = Carp::longmess $msg; 4159 my $perl_bt = Carp::longmess $msg;
3906 async { 4160 async {
3907 $Coro::current->{desc} = "abt $msg"; 4161 $Coro::current->{desc} = "abt $msg";
3908 4162
3928 LOG llevInfo, "[ABT] $_\n" for @bt; 4182 LOG llevInfo, "[ABT] $_\n" for @bt;
3929 --$_log_backtrace; 4183 --$_log_backtrace;
3930 }; 4184 };
3931 } else { 4185 } else {
3932 LOG llevInfo, "[ABT] $msg\n"; 4186 LOG llevInfo, "[ABT] $msg\n";
3933 LOG llevInfo, "[ABT] [suppressed]\n"; 4187 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3934 } 4188 }
3935} 4189}
3936 4190
3937# load additional modules 4191# load additional modules
3938require "cf/$_.pm" for @EXTRA_MODULES; 4192require "cf/$_.pm" for @EXTRA_MODULES;
4193cf::_connect_to_perl_2;
3939 4194
3940END { cf::emergency_save } 4195END { cf::emergency_save }
3941 4196
39421 41971
3943 4198

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines