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.471 by root, Mon Apr 27 01:38:48 2009 UTC vs.
Revision 1.551 by root, Sun May 16 13:48:07 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)
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 1866 # mit "rum" bekleckern, nicht
1729 $self->_create_random_map ( 1867 $self->_create_random_map (
1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1868 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1869 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1870 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1733 $rmp->{exit_on_final_map}, 1871 $rmp->{exit_on_final_map},
1734 $rmp->{xsize}, $rmp->{ysize}, 1872 $rmp->{xsize}, $rmp->{ysize},
1735 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1873 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1736 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1874 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1751 1889
1752sub register { 1890sub register {
1753 my (undef, $regex, $prio) = @_; 1891 my (undef, $regex, $prio) = @_;
1754 my $pkg = caller; 1892 my $pkg = caller;
1755 1893
1756 no strict;
1757 push @{"$pkg\::ISA"}, __PACKAGE__; 1894 push @{"$pkg\::ISA"}, __PACKAGE__;
1758 1895
1759 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1896 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1760} 1897}
1761 1898
1762# also paths starting with '/' 1899# also paths starting with '/'
1763$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1900$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1764 1901
1765sub thawer_merge { 1902sub thawer_merge {
1766 my ($self, $merge) = @_; 1903 my ($self, $merge) = @_;
1767 1904
1768 # we have to keep some variables in memory intact 1905 # we have to keep some variables in memory intact
1773} 1910}
1774 1911
1775sub normalise { 1912sub normalise {
1776 my ($path, $base) = @_; 1913 my ($path, $base) = @_;
1777 1914
1778 $path = "$path"; # make sure its a string 1915 $path = "$path"; # make sure it's a string
1779 1916
1780 $path =~ s/\.map$//; 1917 $path =~ s/\.map$//;
1781 1918
1782 # map plan: 1919 # map plan:
1783 # 1920 #
1798 $base =~ s{[^/]+/?$}{}; 1935 $base =~ s{[^/]+/?$}{};
1799 $path = "$base/$path"; 1936 $path = "$base/$path";
1800 } 1937 }
1801 1938
1802 for ($path) { 1939 for ($path) {
1803 redo if s{//}{/};
1804 redo if s{/\.?/}{/}; 1940 redo if s{/\.?/}{/};
1805 redo if s{/[^/]+/\.\./}{/}; 1941 redo if s{/[^/]+/\.\./}{/};
1806 } 1942 }
1807 1943
1808 $path 1944 $path
1822 $self->init; # pass $1 etc. 1958 $self->init; # pass $1 etc.
1823 return $self; 1959 return $self;
1824 } 1960 }
1825 } 1961 }
1826 1962
1827 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1963 Carp::cluck "unable to resolve path '$path' (base '$base')";
1828 () 1964 ()
1829} 1965}
1830 1966
1831sub init { 1967sub init {
1832 my ($self) = @_; 1968 my ($self) = @_;
1954} 2090}
1955 2091
1956sub find; 2092sub find;
1957sub find { 2093sub find {
1958 my ($path, $origin) = @_; 2094 my ($path, $origin) = @_;
2095
2096 cf::cede_to_tick;
1959 2097
1960 $path = normalise $path, $origin && $origin->path; 2098 $path = normalise $path, $origin && $origin->path;
1961 2099
1962 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2100 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1963 my $guard2 = cf::lock_acquire "map_find:$path"; 2101 my $guard2 = cf::lock_acquire "map_find:$path";
1982 2120
1983 $cf::MAP{$path} = $map 2121 $cf::MAP{$path} = $map
1984 } 2122 }
1985} 2123}
1986 2124
1987sub pre_load { } 2125sub pre_load { }
1988sub post_load { } 2126#sub post_load { } # XS
1989 2127
1990sub load { 2128sub load {
1991 my ($self) = @_; 2129 my ($self) = @_;
1992 2130
1993 local $self->{deny_reset} = 1; # loading can take a long time 2131 local $self->{deny_reset} = 1; # loading can take a long time
2050 } 2188 }
2051 2189
2052 $self->post_load; 2190 $self->post_load;
2053} 2191}
2054 2192
2193# customize the map for a given player, i.e.
2194# return the _real_ map. used by e.g. per-player
2195# maps to change the path to ~playername/mappath
2055sub customise_for { 2196sub customise_for {
2056 my ($self, $ob) = @_; 2197 my ($self, $ob) = @_;
2057 2198
2058 return find "~" . $ob->name . "/" . $self->{path} 2199 return find "~" . $ob->name . "/" . $self->{path}
2059 if $self->per_player; 2200 if $self->per_player;
2075 or next; 2216 or next;
2076 $neigh = find $neigh, $map 2217 $neigh = find $neigh, $map
2077 or next; 2218 or next;
2078 $neigh->load; 2219 $neigh->load;
2079 2220
2221 # now find the diagonal neighbours
2080 push @neigh, 2222 push @neigh,
2081 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2223 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2082 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2224 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2083 } 2225 }
2084 2226
2091} 2233}
2092 2234
2093sub find_sync { 2235sub find_sync {
2094 my ($path, $origin) = @_; 2236 my ($path, $origin) = @_;
2095 2237
2096 cf::sync_job { find $path, $origin } 2238 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2239 if $Coro::current == $Coro::main;
2240
2241 find $path, $origin
2097} 2242}
2098 2243
2099sub do_load_sync { 2244sub do_load_sync {
2100 my ($map) = @_; 2245 my ($map) = @_;
2101 2246
2102 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2247 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2103 if $Coro::current == $Coro::main; 2248 if $Coro::current == $Coro::main;
2104 2249
2105 cf::sync_job { $map->load }; 2250 $map->load;
2106} 2251}
2107 2252
2108our %MAP_PREFETCH; 2253our %MAP_PREFETCH;
2109our $MAP_PREFETCHER = undef; 2254our $MAP_PREFETCHER = undef;
2110 2255
2136 $MAP_PREFETCHER->prio (6); 2281 $MAP_PREFETCHER->prio (6);
2137 2282
2138 () 2283 ()
2139} 2284}
2140 2285
2286# common code, used by both ->save and ->swapout
2141sub save { 2287sub _save {
2142 my ($self) = @_; 2288 my ($self) = @_;
2143
2144 my $lock = cf::lock_acquire "map_data:$self->{path}";
2145 2289
2146 $self->{last_save} = $cf::RUNTIME; 2290 $self->{last_save} = $cf::RUNTIME;
2147 2291
2148 return unless $self->dirty; 2292 return unless $self->dirty;
2149 2293
2169 } else { 2313 } else {
2170 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2314 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2171 } 2315 }
2172} 2316}
2173 2317
2318sub save {
2319 my ($self) = @_;
2320
2321 my $lock = cf::lock_acquire "map_data:$self->{path}";
2322
2323 $self->_save;
2324}
2325
2174sub swap_out { 2326sub swap_out {
2175 my ($self) = @_; 2327 my ($self) = @_;
2176 2328
2177 # save first because save cedes
2178 $self->save;
2179
2180 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2329 my $lock = cf::lock_acquire "map_data:$self->{path}";
2181 2330
2182 return if $self->players;
2183 return if $self->in_memory != cf::MAP_ACTIVE; 2331 return if $self->in_memory != cf::MAP_ACTIVE;
2184 return if $self->{deny_save}; 2332 return if $self->{deny_save};
2333 return if $self->players;
2185 2334
2335 # first deactivate the map and "unlink" it from the core
2336 $self->deactivate;
2337 $_->clear_links_to ($self) for values %cf::MAP;
2186 $self->in_memory (cf::MAP_SWAPPED); 2338 $self->in_memory (cf::MAP_SWAPPED);
2339
2340 # then atomically save
2341 $self->_save;
2342
2343 # then free the map
2344 $self->clear;
2345}
2346
2347sub reset_at {
2348 my ($self) = @_;
2349
2350 # TODO: safety, remove and allow resettable per-player maps
2351 return 1e99 if $self->{deny_reset};
2352
2353 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2354 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2355
2356 $time + $to
2357}
2358
2359sub should_reset {
2360 my ($self) = @_;
2361
2362 $self->reset_at <= $cf::RUNTIME
2363}
2364
2365sub reset {
2366 my ($self) = @_;
2367
2368 my $lock = cf::lock_acquire "map_data:$self->{path}";
2369
2370 return if $self->players;
2371
2372 cf::trace "resetting map ", $self->path, "\n";
2373
2374 $self->in_memory (cf::MAP_SWAPPED);
2375
2376 # need to save uniques path
2377 unless ($self->{deny_save}) {
2378 my $uniq = $self->uniq_path; utf8::encode $uniq;
2379
2380 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2381 if $uniq;
2382 }
2383
2384 delete $cf::MAP{$self->path};
2187 2385
2188 $self->deactivate; 2386 $self->deactivate;
2189 $_->clear_links_to ($self) for values %cf::MAP; 2387 $_->clear_links_to ($self) for values %cf::MAP;
2190 $self->clear; 2388 $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 2389
2236 $self->unlink_save; 2390 $self->unlink_save;
2237 $self->destroy; 2391 $self->destroy;
2238} 2392}
2239 2393
2247 2401
2248 delete $cf::MAP{$self->path}; 2402 delete $cf::MAP{$self->path};
2249 2403
2250 $self->unlink_save; 2404 $self->unlink_save;
2251 2405
2252 bless $self, "cf::map"; 2406 bless $self, "cf::map::wrap";
2253 delete $self->{deny_reset}; 2407 delete $self->{deny_reset};
2254 $self->{deny_save} = 1; 2408 $self->{deny_save} = 1;
2255 $self->reset_timeout (1); 2409 $self->reset_timeout (1);
2256 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2410 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2257 2411
2314 : normalise $_ 2468 : normalise $_
2315 } @{ aio_readdir $UNIQUEDIR or [] } 2469 } @{ aio_readdir $UNIQUEDIR or [] }
2316 ] 2470 ]
2317} 2471}
2318 2472
2473=item cf::map::static_maps
2474
2475Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2476file in the shared directory excluding F</styles> and F</editor>). May
2477block.
2478
2479=cut
2480
2481sub static_maps() {
2482 my @dirs = "";
2483 my @maps;
2484
2485 while (@dirs) {
2486 my $dir = shift @dirs;
2487
2488 next if $dir eq "/styles" || $dir eq "/editor";
2489
2490 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2491 or return;
2492
2493 for (@$files) {
2494 s/\.map$// or next;
2495 utf8::decode $_;
2496 push @maps, "$dir/$_";
2497 }
2498
2499 push @dirs, map "$dir/$_", @$dirs;
2500 }
2501
2502 \@maps
2503}
2504
2319=back 2505=back
2320 2506
2321=head3 cf::object 2507=head3 cf::object
2322 2508
2323=cut 2509=cut
2455 2641
2456Freezes the player and moves him/her to a special map (C<{link}>). 2642Freezes the player and moves him/her to a special map (C<{link}>).
2457 2643
2458The player should be reasonably safe there for short amounts of time (e.g. 2644The 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, 2645for 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 2646though, as the player cannot control the character while it is on the link
2461map. 2647map.
2462 2648
2463Will never block. 2649Will never block.
2464 2650
2465=item $player_object->leave_link ($map, $x, $y) 2651=item $player_object->leave_link ($map, $x, $y)
2486sub cf::object::player::enter_link { 2672sub cf::object::player::enter_link {
2487 my ($self) = @_; 2673 my ($self) = @_;
2488 2674
2489 $self->deactivate_recursive; 2675 $self->deactivate_recursive;
2490 2676
2677 ++$self->{_link_recursion};
2678
2491 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2679 return if UNIVERSAL::isa $self->map, "ext::map_link";
2492 2680
2493 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2681 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2494 if $self->map && $self->map->{path} ne "{link}"; 2682 if $self->map && $self->map->{path} ne "{link}";
2495 2683
2496 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2684 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2497} 2685}
2498 2686
2499sub cf::object::player::leave_link { 2687sub cf::object::player::leave_link {
2500 my ($self, $map, $x, $y) = @_; 2688 my ($self, $map, $x, $y) = @_;
2501 2689
2518 ($x, $y) = (-1, -1) 2706 ($x, $y) = (-1, -1)
2519 unless (defined $x) && (defined $y); 2707 unless (defined $x) && (defined $y);
2520 2708
2521 # use -1 or undef as default coordinates, not 0, 0 2709 # use -1 or undef as default coordinates, not 0, 0
2522 ($x, $y) = ($map->enter_x, $map->enter_y) 2710 ($x, $y) = ($map->enter_x, $map->enter_y)
2523 if $x <=0 && $y <= 0; 2711 if $x <= 0 && $y <= 0;
2524 2712
2525 $map->load; 2713 $map->load;
2526 $map->load_neighbours; 2714 $map->load_neighbours;
2527 2715
2528 return unless $self->contr->active; 2716 return unless $self->contr->active;
2529 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2530 $self->activate_recursive;
2531 2717
2532 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2718 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2533 $self->enter_map ($map, $x, $y); 2719 if ($self->enter_map ($map, $x, $y)) {
2534} 2720 # entering was successful
2721 delete $self->{_link_recursion};
2722 # only activate afterwards, to support waiting in hooks
2723 $self->activate_recursive;
2724 }
2535 2725
2726}
2727
2536=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2728=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2537 2729
2538Moves the player to the given map-path and coordinates by first freezing 2730Moves the player to the given map-path and coordinates by first freezing
2539her, loading and preparing them map, calling the provided $check callback 2731her, loading and preparing them map, calling the provided $check callback
2540that has to return the map if sucecssful, and then unfreezes the player on 2732that 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 2733the new (success) or old (failed) map position. In either case, $done will
2548 2740
2549our $GOTOGEN; 2741our $GOTOGEN;
2550 2742
2551sub cf::object::player::goto { 2743sub cf::object::player::goto {
2552 my ($self, $path, $x, $y, $check, $done) = @_; 2744 my ($self, $path, $x, $y, $check, $done) = @_;
2745
2746 if ($self->{_link_recursion} >= $MAX_LINKS) {
2747 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2748 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2749 ($path, $x, $y) = @$EMERGENCY_POSITION;
2750 }
2553 2751
2554 # do generation counting so two concurrent goto's will be executed in-order 2752 # do generation counting so two concurrent goto's will be executed in-order
2555 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2753 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2556 2754
2557 $self->enter_link; 2755 $self->enter_link;
2581 my $map = eval { 2779 my $map = eval {
2582 my $map = defined $path ? cf::map::find $path : undef; 2780 my $map = defined $path ? cf::map::find $path : undef;
2583 2781
2584 if ($map) { 2782 if ($map) {
2585 $map = $map->customise_for ($self); 2783 $map = $map->customise_for ($self);
2586 $map = $check->($map) if $check && $map; 2784 $map = $check->($map, $x, $y, $self) if $check && $map;
2587 } else { 2785 } else {
2588 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2786 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2589 } 2787 }
2590 2788
2591 $map 2789 $map
2599 if ($gen == $self->{_goto_generation}) { 2797 if ($gen == $self->{_goto_generation}) {
2600 delete $self->{_goto_generation}; 2798 delete $self->{_goto_generation};
2601 $self->leave_link ($map, $x, $y); 2799 $self->leave_link ($map, $x, $y);
2602 } 2800 }
2603 2801
2604 $done->() if $done; 2802 $done->($self) if $done;
2605 })->prio (1); 2803 })->prio (1);
2606} 2804}
2607 2805
2608=item $player_object->enter_exit ($exit_object) 2806=item $player_object->enter_exit ($exit_object)
2609 2807
2702 $self->message ("Something went wrong deep within the deliantra server. " 2900 $self->message ("Something went wrong deep within the deliantra server. "
2703 . "I'll try to bring you back to the map you were before. " 2901 . "I'll try to bring you back to the map you were before. "
2704 . "Please report this to the dungeon master!", 2902 . "Please report this to the dungeon master!",
2705 cf::NDI_UNIQUE | cf::NDI_RED); 2903 cf::NDI_UNIQUE | cf::NDI_RED);
2706 2904
2707 warn "ERROR in enter_exit: $@"; 2905 error "ERROR in enter_exit: $@";
2708 $self->leave_link; 2906 $self->leave_link;
2709 } 2907 }
2710 })->prio (1); 2908 })->prio (1);
2711} 2909}
2712 2910
2724sub cf::client::send_drawinfo { 2922sub cf::client::send_drawinfo {
2725 my ($self, $text, $flags) = @_; 2923 my ($self, $text, $flags) = @_;
2726 2924
2727 utf8::encode $text; 2925 utf8::encode $text;
2728 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2926 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2927}
2928
2929=item $client->send_big_packet ($pkt)
2930
2931Like C<send_packet>, but tries to compress large packets, and fragments
2932them as required.
2933
2934=cut
2935
2936our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2937
2938sub cf::client::send_big_packet {
2939 my ($self, $pkt) = @_;
2940
2941 # try lzf for large packets
2942 $pkt = "lzf " . Compress::LZF::compress $pkt
2943 if 1024 <= length $pkt and $self->{can_lzf};
2944
2945 # split very large packets
2946 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2947 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2948 $pkt = "frag";
2949 }
2950
2951 $self->send_packet ($pkt);
2729} 2952}
2730 2953
2731=item $client->send_msg ($channel, $msg, $color, [extra...]) 2954=item $client->send_msg ($channel, $msg, $color, [extra...])
2732 2955
2733Send a drawinfo or msg packet to the client, formatting the msg for the 2956Send a drawinfo or msg packet to the client, formatting the msg for the
2737 2960
2738=cut 2961=cut
2739 2962
2740# non-persistent channels (usually the info channel) 2963# non-persistent channels (usually the info channel)
2741our %CHANNEL = ( 2964our %CHANNEL = (
2965 "c/motd" => {
2966 id => "infobox",
2967 title => "MOTD",
2968 reply => undef,
2969 tooltip => "The message of the day",
2970 },
2742 "c/identify" => { 2971 "c/identify" => {
2743 id => "infobox", 2972 id => "infobox",
2744 title => "Identify", 2973 title => "Identify",
2745 reply => undef, 2974 reply => undef,
2746 tooltip => "Items recently identified", 2975 tooltip => "Items recently identified",
2748 "c/examine" => { 2977 "c/examine" => {
2749 id => "infobox", 2978 id => "infobox",
2750 title => "Examine", 2979 title => "Examine",
2751 reply => undef, 2980 reply => undef,
2752 tooltip => "Signs and other items you examined", 2981 tooltip => "Signs and other items you examined",
2982 },
2983 "c/shopinfo" => {
2984 id => "infobox",
2985 title => "Shop Info",
2986 reply => undef,
2987 tooltip => "What your bargaining skill tells you about the shop",
2753 }, 2988 },
2754 "c/book" => { 2989 "c/book" => {
2755 id => "infobox", 2990 id => "infobox",
2756 title => "Book", 2991 title => "Book",
2757 reply => undef, 2992 reply => undef,
2873 my $pkt = "msg " 3108 my $pkt = "msg "
2874 . $self->{json_coder}->encode ( 3109 . $self->{json_coder}->encode (
2875 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3110 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2876 ); 3111 );
2877 3112
2878 # try lzf for large packets
2879 $pkt = "lzf " . Compress::LZF::compress $pkt
2880 if 1024 <= length $pkt and $self->{can_lzf};
2881
2882 # split very large packets
2883 if (8192 < length $pkt and $self->{can_lzf}) {
2884 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2885 $pkt = "frag";
2886 }
2887
2888 $self->send_packet ($pkt); 3113 $self->send_big_packet ($pkt);
2889} 3114}
2890 3115
2891=item $client->ext_msg ($type, @msg) 3116=item $client->ext_msg ($type, @msg)
2892 3117
2893Sends an ext event to the client. 3118Sends an ext event to the client.
2896 3121
2897sub cf::client::ext_msg($$@) { 3122sub cf::client::ext_msg($$@) {
2898 my ($self, $type, @msg) = @_; 3123 my ($self, $type, @msg) = @_;
2899 3124
2900 if ($self->extcmd == 2) { 3125 if ($self->extcmd == 2) {
2901 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3126 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2902 } elsif ($self->extcmd == 1) { # TODO: remove 3127 } elsif ($self->extcmd == 1) { # TODO: remove
2903 push @msg, msgtype => "event_$type"; 3128 push @msg, msgtype => "event_$type";
2904 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3129 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2905 } 3130 }
2906} 3131}
2907 3132
2908=item $client->ext_reply ($msgid, @msg) 3133=item $client->ext_reply ($msgid, @msg)
2909 3134
2913 3138
2914sub cf::client::ext_reply($$@) { 3139sub cf::client::ext_reply($$@) {
2915 my ($self, $id, @msg) = @_; 3140 my ($self, $id, @msg) = @_;
2916 3141
2917 if ($self->extcmd == 2) { 3142 if ($self->extcmd == 2) {
2918 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3143 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2919 } elsif ($self->extcmd == 1) { 3144 } elsif ($self->extcmd == 1) {
2920 #TODO: version 1, remove 3145 #TODO: version 1, remove
2921 unshift @msg, msgtype => "reply", msgid => $id; 3146 unshift @msg, msgtype => "reply", msgid => $id;
2922 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3147 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2923 } 3148 }
2924} 3149}
2925 3150
2926=item $success = $client->query ($flags, "text", \&cb) 3151=item $success = $client->query ($flags, "text", \&cb)
2927 3152
2998 3223
2999 $ns->ext_reply ($reply, @reply) 3224 $ns->ext_reply ($reply, @reply)
3000 if $reply; 3225 if $reply;
3001 3226
3002 } else { 3227 } else {
3003 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3228 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3004 } 3229 }
3005 3230
3006 cf::override; 3231 cf::override;
3007 }, 3232 },
3008); 3233);
3028 3253
3029 $coro 3254 $coro
3030} 3255}
3031 3256
3032cf::client->attach ( 3257cf::client->attach (
3033 on_destroy => sub { 3258 on_client_destroy => sub {
3034 my ($ns) = @_; 3259 my ($ns) = @_;
3035 3260
3036 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3261 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3037 }, 3262 },
3038); 3263);
3054our $safe_hole = new Safe::Hole; 3279our $safe_hole = new Safe::Hole;
3055 3280
3056$SIG{FPE} = 'IGNORE'; 3281$SIG{FPE} = 'IGNORE';
3057 3282
3058$safe->permit_only (Opcode::opset qw( 3283$safe->permit_only (Opcode::opset qw(
3059 :base_core :base_mem :base_orig :base_math 3284 :base_core :base_mem :base_orig :base_math :base_loop
3060 grepstart grepwhile mapstart mapwhile 3285 grepstart grepwhile mapstart mapwhile
3061 sort time 3286 sort time
3062)); 3287));
3063 3288
3064# here we export the classes and methods available to script code 3289# here we export the classes and methods available to script code
3089 decrease split destroy change_exp value msg lore send_msg)], 3314 decrease split destroy change_exp value msg lore send_msg)],
3090 ["cf::object::player" => qw(player)], 3315 ["cf::object::player" => qw(player)],
3091 ["cf::player" => qw(peaceful send_msg)], 3316 ["cf::player" => qw(peaceful send_msg)],
3092 ["cf::map" => qw(trigger)], 3317 ["cf::map" => qw(trigger)],
3093) { 3318) {
3094 no strict 'refs';
3095 my ($pkg, @funs) = @$_; 3319 my ($pkg, @funs) = @$_;
3096 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3320 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3097 for @funs; 3321 for @funs;
3098} 3322}
3099 3323
3116 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3340 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3117 $qcode =~ s/\n/\\n/g; 3341 $qcode =~ s/\n/\\n/g;
3118 3342
3119 %vars = (_dummy => 0) unless %vars; 3343 %vars = (_dummy => 0) unless %vars;
3120 3344
3345 my @res;
3121 local $_; 3346 local $_;
3122 local @safe::cf::_safe_eval_args = values %vars;
3123 3347
3124 my $eval = 3348 my $eval =
3125 "do {\n" 3349 "do {\n"
3126 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3350 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3127 . "#line 0 \"{$qcode}\"\n" 3351 . "#line 0 \"{$qcode}\"\n"
3128 . $code 3352 . $code
3129 . "\n}" 3353 . "\n}"
3130 ; 3354 ;
3131 3355
3356 if ($CFG{safe_eval}) {
3132 sub_generation_inc; 3357 sub_generation_inc;
3358 local @safe::cf::_safe_eval_args = values %vars;
3133 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3359 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3134 sub_generation_inc; 3360 sub_generation_inc;
3361 } else {
3362 local @cf::_safe_eval_args = values %vars;
3363 @res = wantarray ? eval eval : scalar eval $eval;
3364 }
3135 3365
3136 if ($@) { 3366 if ($@) {
3137 warn "$@"; 3367 warn "$@",
3138 warn "while executing safe code '$code'\n"; 3368 "while executing safe code '$code'\n",
3139 warn "with arguments " . (join " ", %vars) . "\n"; 3369 "with arguments " . (join " ", %vars) . "\n";
3140 } 3370 }
3141 3371
3142 wantarray ? @res : $res[0] 3372 wantarray ? @res : $res[0]
3143} 3373}
3144 3374
3158=cut 3388=cut
3159 3389
3160sub register_script_function { 3390sub register_script_function {
3161 my ($fun, $cb) = @_; 3391 my ($fun, $cb) = @_;
3162 3392
3163 no strict 'refs'; 3393 $fun = "safe::$fun" if $CFG{safe_eval};
3164 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3394 *$fun = $safe_hole->wrap ($cb);
3165} 3395}
3166 3396
3167=back 3397=back
3168 3398
3169=cut 3399=cut
3178 # for this (global event?) 3408 # for this (global event?)
3179 %ext::player_env::MUSIC_FACE_CACHE = (); 3409 %ext::player_env::MUSIC_FACE_CACHE = ();
3180 3410
3181 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3411 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3182 3412
3183 warn "loading facedata from $path\n"; 3413 trace "loading facedata from $path\n";
3184 3414
3185 my $facedata;
3186 0 < aio_load $path, $facedata 3415 0 < aio_load $path, my $facedata
3187 or die "$path: $!"; 3416 or die "$path: $!";
3188 3417
3189 $facedata = Coro::Storable::thaw $facedata; 3418 $facedata = Coro::Storable::thaw $facedata;
3190 3419
3191 $facedata->{version} == 2 3420 $facedata->{version} == 2
3192 or cf::cleanup "$path: version mismatch, cannot proceed."; 3421 or cf::cleanup "$path: version mismatch, cannot proceed.";
3193 3422
3194 # patch in the exptable 3423 # patch in the exptable
3424 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3195 $facedata->{resource}{"res/exp_table"} = { 3425 $facedata->{resource}{"res/exp_table"} = {
3196 type => FT_RSRC, 3426 type => FT_RSRC,
3197 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3427 data => $exp_table,
3428 hash => (Digest::MD5::md5 $exp_table),
3198 }; 3429 };
3199 cf::cede_to_tick; 3430 cf::cede_to_tick;
3200 3431
3201 { 3432 {
3202 my $faces = $facedata->{faceinfo}; 3433 my $faces = $facedata->{faceinfo};
3204 while (my ($face, $info) = each %$faces) { 3435 while (my ($face, $info) = each %$faces) {
3205 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3436 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3206 3437
3207 cf::face::set_visibility $idx, $info->{visibility}; 3438 cf::face::set_visibility $idx, $info->{visibility};
3208 cf::face::set_magicmap $idx, $info->{magicmap}; 3439 cf::face::set_magicmap $idx, $info->{magicmap};
3209 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3440 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3210 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3441 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3211 3442
3212 cf::cede_to_tick; 3443 cf::cede_to_tick;
3213 } 3444 }
3214 3445
3215 while (my ($face, $info) = each %$faces) { 3446 while (my ($face, $info) = each %$faces) {
3220 3451
3221 if (my $smooth = cf::face::find $info->{smooth}) { 3452 if (my $smooth = cf::face::find $info->{smooth}) {
3222 cf::face::set_smooth $idx, $smooth; 3453 cf::face::set_smooth $idx, $smooth;
3223 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3454 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3224 } else { 3455 } else {
3225 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3456 error "smooth face '$info->{smooth}' not found for face '$face'";
3226 } 3457 }
3227 3458
3228 cf::cede_to_tick; 3459 cf::cede_to_tick;
3229 } 3460 }
3230 } 3461 }
3239 3470
3240 cf::anim::invalidate_all; # d'oh 3471 cf::anim::invalidate_all; # d'oh
3241 } 3472 }
3242 3473
3243 { 3474 {
3244 # TODO: for gcfclient pleasure, we should give resources
3245 # that gcfclient doesn't grok a >10000 face index.
3246 my $res = $facedata->{resource}; 3475 my $res = $facedata->{resource};
3247 3476
3248 while (my ($name, $info) = each %$res) { 3477 while (my ($name, $info) = each %$res) {
3249 if (defined $info->{type}) { 3478 if (defined $info->{type}) {
3250 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3479 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3251 my $data;
3252 3480
3253 if ($info->{type} & 1) { 3481 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3254 # prepend meta info
3255
3256 my $meta = $enc->encode ({
3257 name => $name,
3258 %{ $info->{meta} || {} },
3259 });
3260
3261 $data = pack "(w/a*)*", $meta, $info->{data};
3262 } else {
3263 $data = $info->{data};
3264 }
3265
3266 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3267 cf::face::set_type $idx, $info->{type}; 3482 cf::face::set_type $idx, $info->{type};
3268 } else { 3483 } else {
3269 $RESOURCE{$name} = $info; 3484 $RESOURCE{$name} = $info; # unused
3270 } 3485 }
3271 3486
3272 cf::cede_to_tick; 3487 cf::cede_to_tick;
3273 } 3488 }
3274 } 3489 }
3275 3490
3276 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3491 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3277 3492
3278 1 3493 1
3279} 3494}
3280
3281cf::global->attach (on_resource_update => sub {
3282 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3283 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3284
3285 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3286 my $sound = $soundconf->{compat}[$_]
3287 or next;
3288
3289 my $face = cf::face::find "sound/$sound->[1]";
3290 cf::sound::set $sound->[0] => $face;
3291 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3292 }
3293
3294 while (my ($k, $v) = each %{$soundconf->{event}}) {
3295 my $face = cf::face::find "sound/$v";
3296 cf::sound::set $k => $face;
3297 }
3298 }
3299});
3300 3495
3301register_exticmd fx_want => sub { 3496register_exticmd fx_want => sub {
3302 my ($ns, $want) = @_; 3497 my ($ns, $want) = @_;
3303 3498
3304 while (my ($k, $v) = each %$want) { 3499 while (my ($k, $v) = each %$want) {
3343sub reload_treasures { 3538sub reload_treasures {
3344 load_resource_file "$DATADIR/treasures" 3539 load_resource_file "$DATADIR/treasures"
3345 or die "unable to load treasurelists\n"; 3540 or die "unable to load treasurelists\n";
3346} 3541}
3347 3542
3543sub reload_sound {
3544 trace "loading sound config from $DATADIR/sound\n";
3545
3546 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3547 or die "$DATADIR/sound $!";
3548
3549 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3550
3551 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3552 my $sound = $soundconf->{compat}[$_]
3553 or next;
3554
3555 my $face = cf::face::find "sound/$sound->[1]";
3556 cf::sound::set $sound->[0] => $face;
3557 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3558 }
3559
3560 while (my ($k, $v) = each %{$soundconf->{event}}) {
3561 my $face = cf::face::find "sound/$v";
3562 cf::sound::set $k => $face;
3563 }
3564}
3565
3348sub reload_resources { 3566sub reload_resources {
3349 warn "reloading resource files...\n"; 3567 trace "reloading resource files...\n";
3350 3568
3569 reload_exp_table;
3570 reload_materials;
3351 reload_facedata; 3571 reload_facedata;
3572 reload_sound;
3352 reload_archetypes; 3573 reload_archetypes;
3353 reload_regions; 3574 reload_regions;
3354 reload_treasures; 3575 reload_treasures;
3355 3576
3356 warn "finished reloading resource files\n"; 3577 trace "finished reloading resource files\n";
3357} 3578}
3358 3579
3359sub reload_config { 3580sub reload_config {
3360 open my $fh, "<:utf8", "$CONFDIR/config" 3581 trace "reloading config file...\n";
3361 or return;
3362 3582
3363 local $/; 3583 0 < aio_load "$CONFDIR/config", my $config
3364 *CFG = YAML::Load <$fh>; 3584 or die "$CONFDIR/config: $!";
3365 3585
3586 utf8::decode $config;
3587 *CFG = yaml_load $config;
3588
3366 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3589 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3367 3590
3368 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3591 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3369 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3592 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3370 3593
3371 if (exists $CFG{mlockall}) { 3594 if (exists $CFG{mlockall}) {
3394 3617
3395 seek $fh, 0, 0; 3618 seek $fh, 0, 0;
3396 print $fh $$; 3619 print $fh $$;
3397} 3620}
3398 3621
3622sub main_loop {
3623 trace "EV::loop starting\n";
3624 if (1) {
3625 EV::loop;
3626 }
3627 trace "EV::loop returned\n";
3628 goto &main_loop unless $REALLY_UNLOOP;
3629}
3630
3399sub main { 3631sub main {
3400 cf::init_globals; # initialise logging 3632 cf::init_globals; # initialise logging
3401 3633
3402 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3634 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3403 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3635 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3404 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3636 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3405 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3637 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3406
3407 cf::init_experience;
3408 cf::init_anim;
3409 cf::init_attackmess;
3410 cf::init_dynamic;
3411 3638
3412 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3639 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3413 3640
3414 # we must not ever block the main coroutine 3641 # we must not ever block the main coroutine
3415 local $Coro::idle = sub { 3642 local $Coro::idle = sub {
3421 }; 3648 };
3422 3649
3423 evthread_start IO::AIO::poll_fileno; 3650 evthread_start IO::AIO::poll_fileno;
3424 3651
3425 cf::sync_job { 3652 cf::sync_job {
3653 cf::incloader::init ();
3654
3655 cf::init_anim;
3656 cf::init_attackmess;
3657 cf::init_dynamic;
3658
3659 cf::load_settings;
3660
3426 reload_resources; 3661 reload_resources;
3427 reload_config; 3662 reload_config;
3428 db_init; 3663 db_init;
3429 3664
3430 cf::load_settings;
3431 cf::load_materials;
3432 cf::init_uuid; 3665 cf::init_uuid;
3433 cf::init_signals; 3666 cf::init_signals;
3434 cf::init_commands;
3435 cf::init_skills; 3667 cf::init_skills;
3436 3668
3437 cf::init_beforeplay; 3669 cf::init_beforeplay;
3438 3670
3439 atomic; 3671 atomic;
3441 load_extensions; 3673 load_extensions;
3442 3674
3443 utime time, time, $RUNTIMEFILE; 3675 utime time, time, $RUNTIMEFILE;
3444 3676
3445 # no (long-running) fork's whatsoever before this point(!) 3677 # no (long-running) fork's whatsoever before this point(!)
3678 use POSIX ();
3446 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3679 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3447 3680
3448 (pop @POST_INIT)->(0) while @POST_INIT; 3681 cf::_post_init 0;
3449 }; 3682 };
3450 3683
3451 EV::loop; 3684 cf::object::thawer::errors_are_fatal 0;
3685 info "parse errors in files are no longer fatal from this point on.\n";
3686
3687 my $free_main; $free_main = EV::idle sub {
3688 undef $free_main;
3689 undef &main; # free gobs of memory :)
3690 };
3691
3692 goto &main_loop;
3452} 3693}
3453 3694
3454############################################################################# 3695#############################################################################
3455# initialisation and cleanup 3696# initialisation and cleanup
3456 3697
3457# install some emergency cleanup handlers 3698# install some emergency cleanup handlers
3458BEGIN { 3699BEGIN {
3459 our %SIGWATCHER = (); 3700 our %SIGWATCHER = ();
3460 for my $signal (qw(INT HUP TERM)) { 3701 for my $signal (qw(INT HUP TERM)) {
3461 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3702 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3462 cf::cleanup "SIG$signal"; 3703 cf::cleanup "SIG$signal";
3463 }; 3704 };
3464 } 3705 }
3465} 3706}
3466 3707
3467sub write_runtime_sync { 3708sub write_runtime_sync {
3709 my $t0 = AE::time;
3710
3468 # first touch the runtime file to show we are still running: 3711 # first touch the runtime file to show we are still running:
3469 # the fsync below can take a very very long time. 3712 # the fsync below can take a very very long time.
3470 3713
3471 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3714 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3472 3715
3473 my $guard = cf::lock_acquire "write_runtime"; 3716 my $guard = cf::lock_acquire "write_runtime";
3474 3717
3475 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3718 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3476 or return; 3719 or return;
3477 3720
3478 my $value = $cf::RUNTIME + 90 + 10; 3721 my $value = $cf::RUNTIME + 90 + 10;
3479 # 10 is the runtime save interval, for a monotonic clock 3722 # 10 is the runtime save interval, for a monotonic clock
3480 # 60 allows for the watchdog to kill the server. 3723 # 60 allows for the watchdog to kill the server.
3493 or return; 3736 or return;
3494 3737
3495 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3738 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3496 and return; 3739 and return;
3497 3740
3498 warn "runtime file written.\n"; 3741 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3499 3742
3500 1 3743 1
3501} 3744}
3502 3745
3503our $uuid_lock; 3746our $uuid_lock;
3515 or return; 3758 or return;
3516 3759
3517 my $value = uuid_seq uuid_cur; 3760 my $value = uuid_seq uuid_cur;
3518 3761
3519 unless ($value) { 3762 unless ($value) {
3520 warn "cowardly refusing to write zero uuid value!\n"; 3763 info "cowardly refusing to write zero uuid value!\n";
3521 return; 3764 return;
3522 } 3765 }
3523 3766
3524 my $value = uuid_str $value + $uuid_skip; 3767 my $value = uuid_str $value + $uuid_skip;
3525 $uuid_skip = 0; 3768 $uuid_skip = 0;
3535 or return; 3778 or return;
3536 3779
3537 aio_rename "$uuid~", $uuid 3780 aio_rename "$uuid~", $uuid
3538 and return; 3781 and return;
3539 3782
3540 warn "uuid file written ($value).\n"; 3783 trace "uuid file written ($value).\n";
3541 3784
3542 1 3785 1
3543 3786
3544} 3787}
3545 3788
3551} 3794}
3552 3795
3553sub emergency_save() { 3796sub emergency_save() {
3554 my $freeze_guard = cf::freeze_mainloop; 3797 my $freeze_guard = cf::freeze_mainloop;
3555 3798
3556 warn "emergency_perl_save: enter\n"; 3799 info "emergency_perl_save: enter\n";
3800
3801 # this is a trade-off: we want to be very quick here, so
3802 # save all maps without fsync, and later call a global sync
3803 # (which in turn might be very very slow)
3804 local $USE_FSYNC = 0;
3557 3805
3558 cf::sync_job { 3806 cf::sync_job {
3559 # this is a trade-off: we want to be very quick here, so 3807 cf::write_runtime_sync; # external watchdog should not bark
3560 # save all maps without fsync, and later call a global sync
3561 # (which in turn might be very very slow)
3562 local $USE_FSYNC = 0;
3563 3808
3564 # use a peculiar iteration method to avoid tripping on perl 3809 # use a peculiar iteration method to avoid tripping on perl
3565 # refcount bugs in for. also avoids problems with players 3810 # refcount bugs in for. also avoids problems with players
3566 # and maps saved/destroyed asynchronously. 3811 # and maps saved/destroyed asynchronously.
3567 warn "emergency_perl_save: begin player save\n"; 3812 info "emergency_perl_save: begin player save\n";
3568 for my $login (keys %cf::PLAYER) { 3813 for my $login (keys %cf::PLAYER) {
3569 my $pl = $cf::PLAYER{$login} or next; 3814 my $pl = $cf::PLAYER{$login} or next;
3570 $pl->valid or next; 3815 $pl->valid or next;
3571 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3816 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3572 $pl->save; 3817 $pl->save;
3573 } 3818 }
3574 warn "emergency_perl_save: end player save\n"; 3819 info "emergency_perl_save: end player save\n";
3575 3820
3821 cf::write_runtime_sync; # external watchdog should not bark
3822
3576 warn "emergency_perl_save: begin map save\n"; 3823 info "emergency_perl_save: begin map save\n";
3577 for my $path (keys %cf::MAP) { 3824 for my $path (keys %cf::MAP) {
3578 my $map = $cf::MAP{$path} or next; 3825 my $map = $cf::MAP{$path} or next;
3579 $map->valid or next; 3826 $map->valid or next;
3580 $map->save; 3827 $map->save;
3581 } 3828 }
3582 warn "emergency_perl_save: end map save\n"; 3829 info "emergency_perl_save: end map save\n";
3583 3830
3831 cf::write_runtime_sync; # external watchdog should not bark
3832
3584 warn "emergency_perl_save: begin database checkpoint\n"; 3833 info "emergency_perl_save: begin database checkpoint\n";
3585 BDB::db_env_txn_checkpoint $DB_ENV; 3834 BDB::db_env_txn_checkpoint $DB_ENV;
3586 warn "emergency_perl_save: end database checkpoint\n"; 3835 info "emergency_perl_save: end database checkpoint\n";
3587 3836
3588 warn "emergency_perl_save: begin write uuid\n"; 3837 info "emergency_perl_save: begin write uuid\n";
3589 write_uuid_sync 1; 3838 write_uuid_sync 1;
3590 warn "emergency_perl_save: end write uuid\n"; 3839 info "emergency_perl_save: end write uuid\n";
3840
3841 cf::write_runtime_sync; # external watchdog should not bark
3842
3843 trace "emergency_perl_save: syncing database to disk";
3844 BDB::db_env_txn_checkpoint $DB_ENV;
3845
3846 info "emergency_perl_save: starting sync\n";
3847 IO::AIO::aio_sync sub {
3848 info "emergency_perl_save: finished sync\n";
3849 };
3850
3851 cf::write_runtime_sync; # external watchdog should not bark
3852
3853 trace "emergency_perl_save: flushing outstanding aio requests";
3854 while (IO::AIO::nreqs || BDB::nreqs) {
3855 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3856 }
3857
3858 cf::write_runtime_sync; # external watchdog should not bark
3591 }; 3859 };
3592 3860
3593 warn "emergency_perl_save: starting sync()\n";
3594 IO::AIO::aio_sync sub {
3595 warn "emergency_perl_save: finished sync()\n";
3596 };
3597
3598 warn "emergency_perl_save: leave\n"; 3861 info "emergency_perl_save: leave\n";
3599} 3862}
3600 3863
3601sub post_cleanup { 3864sub post_cleanup {
3602 my ($make_core) = @_; 3865 my ($make_core) = @_;
3603 3866
3867 IO::AIO::flush;
3868
3604 warn Carp::longmess "post_cleanup backtrace" 3869 error Carp::longmess "post_cleanup backtrace"
3605 if $make_core; 3870 if $make_core;
3606 3871
3607 my $fh = pidfile; 3872 my $fh = pidfile;
3608 unlink $PIDFILE if <$fh> == $$; 3873 unlink $PIDFILE if <$fh> == $$;
3609} 3874}
3629 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3894 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3630 for my $name (keys %$leaf_symtab) { 3895 for my $name (keys %$leaf_symtab) {
3631 _gv_clear *{"$pkg$name"}; 3896 _gv_clear *{"$pkg$name"};
3632# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3897# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3633 } 3898 }
3634 warn "cleared package $pkg\n";#d#
3635} 3899}
3636 3900
3637sub do_reload_perl() { 3901sub do_reload_perl() {
3638 # can/must only be called in main 3902 # can/must only be called in main
3639 if ($Coro::current != $Coro::main) { 3903 unless (in_main) {
3640 warn "can only reload from main coroutine"; 3904 error "can only reload from main coroutine";
3641 return; 3905 return;
3642 } 3906 }
3643 3907
3644 return if $RELOAD++; 3908 return if $RELOAD++;
3645 3909
3646 my $t1 = EV::time; 3910 my $t1 = AE::time;
3647 3911
3648 while ($RELOAD) { 3912 while ($RELOAD) {
3649 warn "reloading..."; 3913 cf::get_slot 0.1, -1, "reload_perl";
3914 info "perl_reload: reloading...";
3650 3915
3651 warn "entering sync_job"; 3916 trace "perl_reload: entering sync_job";
3652 3917
3653 cf::sync_job { 3918 cf::sync_job {
3654 cf::write_runtime_sync; # external watchdog should not bark
3655 cf::emergency_save; 3919 #cf::emergency_save;
3656 cf::write_runtime_sync; # external watchdog should not bark
3657 3920
3658 warn "syncing database to disk";
3659 BDB::db_env_txn_checkpoint $DB_ENV;
3660
3661 # if anything goes wrong in here, we should simply crash as we already saved
3662
3663 warn "flushing outstanding aio requests";
3664 while (IO::AIO::nreqs || BDB::nreqs) {
3665 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3666 }
3667
3668 warn "cancelling all extension coros"; 3921 trace "perl_reload: cancelling all extension coros";
3669 $_->cancel for values %EXT_CORO; 3922 $_->cancel for values %EXT_CORO;
3670 %EXT_CORO = (); 3923 %EXT_CORO = ();
3671 3924
3672 warn "removing commands"; 3925 trace "perl_reload: removing commands";
3673 %COMMAND = (); 3926 %COMMAND = ();
3674 3927
3675 warn "removing ext/exti commands"; 3928 trace "perl_reload: removing ext/exti commands";
3676 %EXTCMD = (); 3929 %EXTCMD = ();
3677 %EXTICMD = (); 3930 %EXTICMD = ();
3678 3931
3679 warn "unloading/nuking all extensions"; 3932 trace "perl_reload: unloading/nuking all extensions";
3680 for my $pkg (@EXTS) { 3933 for my $pkg (@EXTS) {
3681 warn "... unloading $pkg"; 3934 trace "... unloading $pkg";
3682 3935
3683 if (my $cb = $pkg->can ("unload")) { 3936 if (my $cb = $pkg->can ("unload")) {
3684 eval { 3937 eval {
3685 $cb->($pkg); 3938 $cb->($pkg);
3686 1 3939 1
3687 } or warn "$pkg unloaded, but with errors: $@"; 3940 } or error "$pkg unloaded, but with errors: $@";
3688 } 3941 }
3689 3942
3690 warn "... clearing $pkg"; 3943 trace "... clearing $pkg";
3691 clear_package $pkg; 3944 clear_package $pkg;
3692 } 3945 }
3693 3946
3694 warn "unloading all perl modules loaded from $LIBDIR"; 3947 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3695 while (my ($k, $v) = each %INC) { 3948 while (my ($k, $v) = each %INC) {
3696 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3949 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3697 3950
3698 warn "... unloading $k"; 3951 trace "... unloading $k";
3699 delete $INC{$k}; 3952 delete $INC{$k};
3700 3953
3701 $k =~ s/\.pm$//; 3954 $k =~ s/\.pm$//;
3702 $k =~ s/\//::/g; 3955 $k =~ s/\//::/g;
3703 3956
3706 } 3959 }
3707 3960
3708 clear_package $k; 3961 clear_package $k;
3709 } 3962 }
3710 3963
3711 warn "getting rid of safe::, as good as possible"; 3964 trace "perl_reload: getting rid of safe::, as good as possible";
3712 clear_package "safe::$_" 3965 clear_package "safe::$_"
3713 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3966 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3714 3967
3715 warn "unloading cf.pm \"a bit\""; 3968 trace "perl_reload: unloading cf.pm \"a bit\"";
3716 delete $INC{"cf.pm"}; 3969 delete $INC{"cf.pm"};
3717 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3970 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3718 3971
3719 # don't, removes xs symbols, too, 3972 # don't, removes xs symbols, too,
3720 # and global variables created in xs 3973 # and global variables created in xs
3721 #clear_package __PACKAGE__; 3974 #clear_package __PACKAGE__;
3722 3975
3723 warn "unload completed, starting to reload now"; 3976 info "perl_reload: unload completed, starting to reload now";
3724 3977
3725 warn "reloading cf.pm"; 3978 trace "perl_reload: reloading cf.pm";
3726 require cf; 3979 require cf;
3727 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3980 cf::_connect_to_perl_1;
3728 3981
3729 warn "loading config and database again"; 3982 trace "perl_reload: loading config and database again";
3730 cf::reload_config; 3983 cf::reload_config;
3731 3984
3732 warn "loading extensions"; 3985 trace "perl_reload: loading extensions";
3733 cf::load_extensions; 3986 cf::load_extensions;
3734 3987
3735 if ($REATTACH_ON_RELOAD) { 3988 if ($REATTACH_ON_RELOAD) {
3736 warn "reattaching attachments to objects/players"; 3989 trace "perl_reload: reattaching attachments to objects/players";
3737 _global_reattach; # objects, sockets 3990 _global_reattach; # objects, sockets
3738 warn "reattaching attachments to maps"; 3991 trace "perl_reload: reattaching attachments to maps";
3739 reattach $_ for values %MAP; 3992 reattach $_ for values %MAP;
3740 warn "reattaching attachments to players"; 3993 trace "perl_reload: reattaching attachments to players";
3741 reattach $_ for values %PLAYER; 3994 reattach $_ for values %PLAYER;
3742 } 3995 }
3743 3996
3744 warn "running post_init jobs"; 3997 cf::_post_init 1;
3745 (pop @POST_INIT)->(1) while @POST_INIT;
3746 3998
3747 warn "leaving sync_job"; 3999 trace "perl_reload: leaving sync_job";
3748 4000
3749 1 4001 1
3750 } or do { 4002 } or do {
3751 warn $@; 4003 error $@;
3752 cf::cleanup "error while reloading, exiting."; 4004 cf::cleanup "perl_reload: error, exiting.";
3753 }; 4005 };
3754 4006
3755 warn "reloaded";
3756 --$RELOAD; 4007 --$RELOAD;
3757 } 4008 }
3758 4009
3759 $t1 = EV::time - $t1; 4010 $t1 = AE::time - $t1;
3760 warn "reload completed in ${t1}s\n"; 4011 info "perl_reload: completed in ${t1}s\n";
3761}; 4012};
3762 4013
3763our $RELOAD_WATCHER; # used only during reload 4014our $RELOAD_WATCHER; # used only during reload
3764 4015
3765sub reload_perl() { 4016sub reload_perl() {
3767 # coro crashes during coro_state_free->destroy here. 4018 # coro crashes during coro_state_free->destroy here.
3768 4019
3769 $RELOAD_WATCHER ||= cf::async { 4020 $RELOAD_WATCHER ||= cf::async {
3770 Coro::AIO::aio_wait cache_extensions; 4021 Coro::AIO::aio_wait cache_extensions;
3771 4022
3772 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4023 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3773 do_reload_perl; 4024 do_reload_perl;
3774 undef $RELOAD_WATCHER; 4025 undef $RELOAD_WATCHER;
3775 }; 4026 };
3776 }; 4027 };
3777} 4028}
3786 reload_perl; 4037 reload_perl;
3787 }; 4038 };
3788 } 4039 }
3789}; 4040};
3790 4041
3791unshift @INC, $LIBDIR; 4042#############################################################################
3792 4043
3793my $bug_warning = 0; 4044my $bug_warning = 0;
3794 4045
3795our @WAIT_FOR_TICK; 4046our @WAIT_FOR_TICK;
3796our @WAIT_FOR_TICK_BEGIN; 4047our @WAIT_FOR_TICK_BEGIN;
3797 4048
3798sub wait_for_tick { 4049sub wait_for_tick() {
3799 return if tick_inhibit || $Coro::current == $Coro::main; 4050 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3800 4051
3801 my $signal = new Coro::Signal; 4052 my $signal = new Coro::Signal;
3802 push @WAIT_FOR_TICK, $signal; 4053 push @WAIT_FOR_TICK, $signal;
3803 $signal->wait; 4054 $signal->wait;
3804} 4055}
3805 4056
3806sub wait_for_tick_begin { 4057sub wait_for_tick_begin() {
3807 return if tick_inhibit || $Coro::current == $Coro::main; 4058 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3808 4059
3809 my $signal = new Coro::Signal; 4060 my $signal = new Coro::Signal;
3810 push @WAIT_FOR_TICK_BEGIN, $signal; 4061 push @WAIT_FOR_TICK_BEGIN, $signal;
3811 $signal->wait; 4062 $signal->wait;
3812} 4063}
3818 return; 4069 return;
3819 } 4070 }
3820 4071
3821 cf::server_tick; # one server iteration 4072 cf::server_tick; # one server iteration
3822 4073
4074 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4075
3823 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4076 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3824 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4077 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3825 Coro::async_pool { 4078 Coro::async_pool {
3826 $Coro::current->{desc} = "runtime saver"; 4079 $Coro::current->{desc} = "runtime saver";
3827 write_runtime_sync 4080 write_runtime_sync
3828 or warn "ERROR: unable to write runtime file: $!"; 4081 or error "ERROR: unable to write runtime file: $!";
3829 }; 4082 };
3830 } 4083 }
3831 4084
3832 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4085 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3833 $sig->send; 4086 $sig->send;
3841 4094
3842 if (0) { 4095 if (0) {
3843 if ($NEXT_TICK) { 4096 if ($NEXT_TICK) {
3844 my $jitter = $TICK_START - $NEXT_TICK; 4097 my $jitter = $TICK_START - $NEXT_TICK;
3845 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4098 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3846 warn "jitter $JITTER\n";#d# 4099 debug "jitter $JITTER\n";#d#
3847 } 4100 }
3848 } 4101 }
3849} 4102}
3850 4103
3851{ 4104{
3852 # configure BDB 4105 # configure BDB
3853 4106
3854 BDB::min_parallel 8; 4107 BDB::min_parallel 16;
3855 BDB::max_poll_reqs $TICK * 0.1; 4108 BDB::max_poll_reqs $TICK * 0.1;
3856 $AnyEvent::BDB::WATCHER->priority (1); 4109 $AnyEvent::BDB::WATCHER->priority (1);
3857 4110
3858 unless ($DB_ENV) { 4111 unless ($DB_ENV) {
3859 $DB_ENV = BDB::db_env_create; 4112 $DB_ENV = BDB::db_env_create;
3940 } 4193 }
3941} 4194}
3942 4195
3943# load additional modules 4196# load additional modules
3944require "cf/$_.pm" for @EXTRA_MODULES; 4197require "cf/$_.pm" for @EXTRA_MODULES;
4198cf::_connect_to_perl_2;
3945 4199
3946END { cf::emergency_save } 4200END { cf::emergency_save }
3947 4201
39481 42021
3949 4203

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines