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.466 by root, Thu Jan 8 03:03:24 2009 UTC vs.
Revision 1.557 by root, Tue Oct 5 21:40:05 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 off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
111 123
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
146 open my $fh, "<", $RUNTIMEFILE 159 open my $fh, "<", $RUNTIMEFILE
147 or die "unable to read $RUNTIMEFILE file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
148 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
149} 162}
150 163
164eval "sub TICK() { $TICK } 1" or die;
165
151mkdir $_ 166mkdir $_
152 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
153 168
154our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
155 170
156sub cf::map::normalise; 171sub cf::map::normalise;
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::"} };
157 187
158############################################################################# 188#############################################################################
159 189
160=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
161 191
203from wherever your confdir points to. 233from wherever your confdir points to.
204 234
205=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
206 236
207These 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
208returns 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
209per 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.
210 240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
211=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
212 247
213This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
214C<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
215that call. 250that call.
216 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
217=back 258=back
218 259
219=cut 260=cut
220 261
221BEGIN { 262sub error(@) { LOG llevError, join "", @_ }
222 *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 {
223 my $msg = join "", @_; 269 my $msg = join "", @_;
224 270
225 $msg .= "\n" 271 $msg .= "\n"
226 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
227 273
228 $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;
229 275
230 LOG llevError, $msg; 276 LOG llevWarn, $msg;
231 }; 277};
232}
233 278
234$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
235 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
236 281
237 if ($Coro::current == $Coro::main) {#d# 282 error Carp::longmess $_[0];
283
284 if (in_main) {#d#
238 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
239 return;#d# 286 return;#d#
240 }#d# 287 }#d#
241 288
242 # kill coroutine otherwise 289 # kill coroutine otherwise
243 warn Carp::longmess $_[0];
244 Coro::terminate 290 Coro::terminate
245}; 291};
246
247$SIG{__DIE__} = sub { }; #d#?
248 292
249@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 293@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
250@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 294@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
251@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 295@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
252@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 296@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
266)) { 310)) {
267 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
268} 312}
269 313
270$EV::DIED = sub { 314$EV::DIED = sub {
271 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
272}; 316};
273 317
274############################################################################# 318#############################################################################
275 319
276=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
313our $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
314 358
315sub encode_json($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
316sub decode_json($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
317 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
318=item cf::post_init { BLOCK } 374=item cf::post_init { BLOCK }
319 375
320Execute the given codeblock, I<after> all extensions have been (re-)loaded, 376Execute the given codeblock, I<after> all extensions have been (re-)loaded,
321but I<before> the server starts ticking again. 377but I<before> the server starts ticking again.
322 378
323The cdoeblock will have a single boolean argument to indicate whether this 379The codeblock will have a single boolean argument to indicate whether this
324is a reload or not. 380is a reload or not.
325 381
326=cut 382=cut
327 383
328sub post_init(&) { 384sub post_init(&) {
329 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 }
330} 403}
331 404
332=item cf::lock_wait $string 405=item cf::lock_wait $string
333 406
334Wait until the given lock is available. See cf::lock_acquire. 407Wait until the given lock is available. See cf::lock_acquire.
373} 446}
374 447
375=item cf::periodic $interval, $cb 448=item cf::periodic $interval, $cb
376 449
377Like 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
378get spread over timer. 451get spread over time.
379 452
380=cut 453=cut
381 454
382sub periodic($$) { 455sub periodic($$) {
383 my ($interval, $cb) = @_; 456 my ($interval, $cb) = @_;
400 473
401=cut 474=cut
402 475
403our @SLOT_QUEUE; 476our @SLOT_QUEUE;
404our $SLOT_QUEUE; 477our $SLOT_QUEUE;
478our $SLOT_DECAY = 0.9;
405 479
406$SLOT_QUEUE->cancel if $SLOT_QUEUE; 480$SLOT_QUEUE->cancel if $SLOT_QUEUE;
407$SLOT_QUEUE = Coro::async { 481$SLOT_QUEUE = Coro::async {
408 $Coro::current->desc ("timeslot manager"); 482 $Coro::current->desc ("timeslot manager");
409 483
410 my $signal = new Coro::Signal; 484 my $signal = new Coro::Signal;
485 my $busy;
411 486
412 while () { 487 while () {
413 next_job: 488 next_job:
489
414 my $avail = cf::till_tick; 490 my $avail = cf::till_tick;
415 if ($avail > 0.01) { 491
416 for (0 .. $#SLOT_QUEUE) { 492 for (0 .. $#SLOT_QUEUE) {
417 if ($SLOT_QUEUE[$_][0] < $avail) { 493 if ($SLOT_QUEUE[$_][0] <= $avail) {
494 $busy = 0;
418 my $job = splice @SLOT_QUEUE, $_, 1, (); 495 my $job = splice @SLOT_QUEUE, $_, 1, ();
419 $job->[2]->send; 496 $job->[2]->send;
420 Coro::cede; 497 Coro::cede;
421 goto next_job; 498 goto next_job;
422 } 499 } else {
500 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
423 } 501 }
424 } 502 }
425 503
426 if (@SLOT_QUEUE) { 504 if (@SLOT_QUEUE) {
427 # 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
428 push @cf::WAIT_FOR_TICK, $signal; 506 push @cf::WAIT_FOR_TICK, $signal;
429 $signal->wait; 507 $signal->wait;
430 } else { 508 } else {
509 $busy = 0;
431 Coro::schedule; 510 Coro::schedule;
432 } 511 }
433 } 512 }
434}; 513};
435 514
436sub get_slot($;$$) { 515sub get_slot($;$$) {
437 return if tick_inhibit || $Coro::current == $Coro::main; 516 return if tick_inhibit || $Coro::current == $Coro::main;
438 517
439 my ($time, $pri, $name) = @_; 518 my ($time, $pri, $name) = @_;
440 519
441 $time = $TICK * .6 if $time > $TICK * .6; 520 $time = clamp $time, 0.01, $TICK * .6;
521
442 my $sig = new Coro::Signal; 522 my $sig = new Coro::Signal;
443 523
444 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 524 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
445 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 525 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
446 $SLOT_QUEUE->ready; 526 $SLOT_QUEUE->ready;
472=cut 552=cut
473 553
474sub sync_job(&) { 554sub sync_job(&) {
475 my ($job) = @_; 555 my ($job) = @_;
476 556
477 if ($Coro::current == $Coro::main) { 557 if (in_main) {
478 my $time = EV::time; 558 my $time = AE::time;
479 559
480 # this is the main coro, too bad, we have to block 560 # this is the main coro, too bad, we have to block
481 # till the operation succeeds, freezing the server :/ 561 # till the operation succeeds, freezing the server :/
482 562
483 LOG llevError, Carp::longmess "sync job";#d# 563 #LOG llevError, Carp::longmess "sync job";#d#
484 564
485 my $freeze_guard = freeze_mainloop; 565 my $freeze_guard = freeze_mainloop;
486 566
487 my $busy = 1; 567 my $busy = 1;
488 my @res; 568 my @res;
489 569
490 (async { 570 (async {
491 $Coro::current->desc ("sync job coro"); 571 $Coro::current->desc ("sync job coro");
492 @res = eval { $job->() }; 572 @res = eval { $job->() };
493 warn $@ if $@; 573 error $@ if $@;
494 undef $busy; 574 undef $busy;
495 })->prio (Coro::PRIO_MAX); 575 })->prio (Coro::PRIO_MAX);
496 576
497 while ($busy) { 577 while ($busy) {
498 if (Coro::nready) { 578 if (Coro::nready) {
500 } else { 580 } else {
501 EV::loop EV::LOOP_ONESHOT; 581 EV::loop EV::LOOP_ONESHOT;
502 } 582 }
503 } 583 }
504 584
505 my $time = EV::time - $time; 585 my $time = AE::time - $time;
506 586
507 $TICK_START += $time; # do not account sync jobs to server load 587 $TICK_START += $time; # do not account sync jobs to server load
508 588
509 wantarray ? @res : $res[0] 589 wantarray ? @res : $res[0]
510 } else { 590 } else {
532 $EXT_CORO{$coro+0} = $coro; 612 $EXT_CORO{$coro+0} = $coro;
533 613
534 $coro 614 $coro
535} 615}
536 616
537=item fork_call { }, $args 617=item fork_call { }, @args
538 618
539Executes the given code block with the given arguments in a seperate 619Executes the given code block with the given arguments in a seperate
540process, returning the results. Everything must be serialisable with 620process, returning the results. Everything must be serialisable with
541Coro::Storable. May, of course, block. Note that the executed sub may 621Coro::Storable. May, of course, block. Note that the executed sub may
542never block itself or use any form of event handling. 622never block itself or use any form of event handling.
543 623
544=cut 624=cut
545 625
626sub post_fork {
627 reset_signals;
628}
629
546sub fork_call(&@) { 630sub fork_call(&@) {
547 my ($cb, @args) = @_; 631 my ($cb, @args) = @_;
548 632
549 # 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,
550 # otherwise perl prematurely frees the stuff :/ 634 # otherwise perl prematurely frees the stuff :/
551 # TODO: investigate and fix (likely this will be rather laborious) 635 # TODO: investigate and fix (likely this will be rather laborious)
552 636
553 my @res = Coro::Util::fork_eval { 637 my @res = Coro::Util::fork_eval {
554 reset_signals; 638 cf::post_fork;
555 &$cb 639 &$cb
556 }, @args; 640 } @args;
557 641
558 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 )
559} 654}
560 655
561=item $coin = coin_from_name $name 656=item $coin = coin_from_name $name
562 657
563=cut 658=cut
600within each server. 695within each server.
601 696
602=cut 697=cut
603 698
604sub db_table($) { 699sub db_table($) {
700 cf::error "db_get called from main context"
701 if $Coro::current == $Coro::main;
702
605 my ($name) = @_; 703 my ($name) = @_;
606 my $db = BDB::db_create $DB_ENV; 704 my $db = BDB::db_create $DB_ENV;
607 705
608 eval { 706 eval {
609 $db->set_flags (BDB::CHKSUM); 707 $db->set_flags (BDB::CHKSUM);
619} 717}
620 718
621our $DB; 719our $DB;
622 720
623sub db_init { 721sub db_init {
624 cf::sync_job {
625 $DB ||= db_table "db"; 722 $DB ||= db_table "db";
626 };
627} 723}
628 724
629sub db_get($$) { 725sub db_get($$) {
630 my $key = "$_[0]/$_[1]"; 726 my $key = "$_[0]/$_[1]";
631 727
632 cf::sync_job { 728 cf::error "db_get called from main context"
729 if $Coro::current == $Coro::main;
730
633 BDB::db_get $DB, undef, $key, my $data; 731 BDB::db_get $DB, undef, $key, my $data;
634 732
635 $! ? () 733 $! ? ()
636 : $data 734 : $data
637 }
638} 735}
639 736
640sub db_put($$$) { 737sub db_put($$$) {
641 BDB::dbreq_pri 4; 738 BDB::dbreq_pri 4;
642 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 739 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
698 795
699 my $t1 = Time::HiRes::time; 796 my $t1 = Time::HiRes::time;
700 my $data = $process->(\@data); 797 my $data = $process->(\@data);
701 my $t2 = Time::HiRes::time; 798 my $t2 = Time::HiRes::time;
702 799
703 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 800 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
704 801
705 db_put cache => "$id/data", $data; 802 db_put cache => "$id/data", $data;
706 db_put cache => "$id/md5" , $md5; 803 db_put cache => "$id/md5" , $md5;
707 db_put cache => "$id/meta", $meta; 804 db_put cache => "$id/meta", $meta;
708 805
718 815
719=cut 816=cut
720 817
721sub datalog($@) { 818sub datalog($@) {
722 my ($type, %kv) = @_; 819 my ($type, %kv) = @_;
723 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 820 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
724} 821}
725 822
726=back 823=back
727 824
728=cut 825=cut
923 1020
924 } elsif (exists $cb_id{$type}) { 1021 } elsif (exists $cb_id{$type}) {
925 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1022 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
926 1023
927 } elsif (ref $type) { 1024 } elsif (ref $type) {
928 warn "attaching objects not supported, ignoring.\n"; 1025 error "attaching objects not supported, ignoring.\n";
929 1026
930 } else { 1027 } else {
931 shift @arg; 1028 shift @arg;
932 warn "attach argument '$type' not supported, ignoring.\n"; 1029 error "attach argument '$type' not supported, ignoring.\n";
933 } 1030 }
934 } 1031 }
935} 1032}
936 1033
937sub _object_attach { 1034sub _object_attach {
947 _attach $registry, $klass, @attach; 1044 _attach $registry, $klass, @attach;
948 } 1045 }
949 1046
950 $obj->{$name} = \%arg; 1047 $obj->{$name} = \%arg;
951 } else { 1048 } else {
952 warn "object uses attachment '$name' which is not available, postponing.\n"; 1049 info "object uses attachment '$name' which is not available, postponing.\n";
953 } 1050 }
954 1051
955 $obj->{_attachment}{$name} = undef; 1052 $obj->{_attachment}{$name} = undef;
956} 1053}
957 1054
1016 1113
1017 for (@$callbacks) { 1114 for (@$callbacks) {
1018 eval { &{$_->[1]} }; 1115 eval { &{$_->[1]} };
1019 1116
1020 if ($@) { 1117 if ($@) {
1021 warn "$@";
1022 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1118 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1023 override; 1119 override;
1024 } 1120 }
1025 1121
1026 return 1 if $override; 1122 return 1 if $override;
1027 } 1123 }
1106 for (@$attach) { 1202 for (@$attach) {
1107 my ($klass, @attach) = @$_; 1203 my ($klass, @attach) = @$_;
1108 _attach $registry, $klass, @attach; 1204 _attach $registry, $klass, @attach;
1109 } 1205 }
1110 } else { 1206 } else {
1111 warn "object uses attachment '$name' that is not available, postponing.\n"; 1207 info "object uses attachment '$name' that is not available, postponing.\n";
1112 } 1208 }
1113 } 1209 }
1114} 1210}
1115 1211
1116cf::attachable->attach ( 1212cf::attachable->attach (
1143 my ($filename, $rdata, $objs) = @_; 1239 my ($filename, $rdata, $objs) = @_;
1144 1240
1145 sync_job { 1241 sync_job {
1146 if (length $$rdata) { 1242 if (length $$rdata) {
1147 utf8::decode (my $decname = $filename); 1243 utf8::decode (my $decname = $filename);
1148 warn sprintf "saving %s (%d,%d)\n", 1244 trace sprintf "saving %s (%d,%d)\n",
1149 $decname, length $$rdata, scalar @$objs; 1245 $decname, length $$rdata, scalar @$objs
1246 if $VERBOSE_IO;
1150 1247
1151 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1248 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1152 aio_chmod $fh, SAVE_MODE; 1249 aio_chmod $fh, SAVE_MODE;
1153 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1250 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1154 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 }
1155 aio_close $fh; 1255 aio_close $fh;
1156 1256
1157 if (@$objs) { 1257 if (@$objs) {
1158 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) {
1159 aio_chmod $fh, SAVE_MODE; 1259 aio_chmod $fh, SAVE_MODE;
1160 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1260 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1161 aio_write $fh, 0, (length $data), $data, 0; 1261 aio_write $fh, 0, (length $data), $data, 0;
1162 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 }
1163 aio_close $fh; 1266 aio_close $fh;
1164 aio_rename "$filename.pst~", "$filename.pst"; 1267 aio_rename "$filename.pst~", "$filename.pst";
1165 } 1268 }
1166 } else { 1269 } else {
1167 aio_unlink "$filename.pst"; 1270 aio_unlink "$filename.pst";
1170 aio_rename "$filename~", $filename; 1273 aio_rename "$filename~", $filename;
1171 1274
1172 $filename =~ s%/[^/]+$%%; 1275 $filename =~ s%/[^/]+$%%;
1173 aio_pathsync $filename if $cf::USE_FSYNC; 1276 aio_pathsync $filename if $cf::USE_FSYNC;
1174 } else { 1277 } else {
1175 warn "unable to save objects: $filename~: $!\n"; 1278 error "unable to save objects: $filename~: $!\n";
1176 } 1279 }
1177 } else { 1280 } else {
1178 aio_unlink $filename; 1281 aio_unlink $filename;
1179 aio_unlink "$filename.pst"; 1282 aio_unlink "$filename.pst";
1180 } 1283 }
1204 my $st = eval { Coro::Storable::thaw $av }; 1307 my $st = eval { Coro::Storable::thaw $av };
1205 $av = $st->{objs}; 1308 $av = $st->{objs};
1206 } 1309 }
1207 1310
1208 utf8::decode (my $decname = $filename); 1311 utf8::decode (my $decname = $filename);
1209 warn sprintf "loading %s (%d,%d)\n", 1312 trace sprintf "loading %s (%d,%d)\n",
1210 $decname, length $data, scalar @{$av || []}; 1313 $decname, length $data, scalar @{$av || []}
1314 if $VERBOSE_IO;
1211 1315
1212 ($data, $av) 1316 ($data, $av)
1213} 1317}
1214 1318
1215=head2 COMMAND CALLBACKS 1319=head2 COMMAND CALLBACKS
1274} 1378}
1275 1379
1276use File::Glob (); 1380use File::Glob ();
1277 1381
1278cf::player->attach ( 1382cf::player->attach (
1279 on_command => sub { 1383 on_unknown_command => sub {
1280 my ($pl, $name, $params) = @_; 1384 my ($pl, $name, $params) = @_;
1281 1385
1282 my $cb = $COMMAND{$name} 1386 my $cb = $COMMAND{$name}
1283 or return; 1387 or return;
1284 1388
1307 1411
1308 $pl->ext_reply ($reply, @reply) 1412 $pl->ext_reply ($reply, @reply)
1309 if $reply; 1413 if $reply;
1310 1414
1311 } else { 1415 } else {
1312 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1416 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1313 } 1417 }
1314 1418
1315 cf::override; 1419 cf::override;
1316 }, 1420 },
1317); 1421);
1318 1422
1319# "readahead" all extensions 1423# "readahead" all extensions
1320sub cache_extensions { 1424sub cache_extensions {
1321 my $grp = IO::AIO::aio_group; 1425 my $grp = IO::AIO::aio_group;
1322 1426
1323 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1427 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1324 for (grep /\.ext$/, @{$_[0]}) { 1428 for (grep /\.ext$/, @{$_[0]}) {
1325 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1429 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1326 } 1430 }
1327 }; 1431 };
1328 1432
1329 $grp 1433 $grp
1330} 1434}
1331 1435
1332sub load_extensions { 1436sub load_extensions {
1437 info "loading extensions...";
1438
1333 cf::sync_job { 1439 cf::sync_job {
1334 my %todo; 1440 my %todo;
1335 1441
1336 for my $path (<$LIBDIR/*.ext>) { 1442 for my $path (<$LIBDIR/*.ext>) {
1337 next unless -r $path; 1443 next unless -r $path;
1355 1461
1356 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1462 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1357 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1463 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1358 1464
1359 $ext{source} = 1465 $ext{source} =
1360 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1466 "package $pkg; use common::sense;\n"
1361 . "#line 1 \"$path\"\n{\n" 1467 . "#line 1 \"$path\"\n{\n"
1362 . $source 1468 . $source
1363 . "\n};\n1"; 1469 . "\n};\n1";
1364 1470
1365 $todo{$base} = \%ext; 1471 $todo{$base} = \%ext;
1366 } 1472 }
1367 1473
1474 my $pass = 0;
1368 my %done; 1475 my %done;
1369 while (%todo) { 1476 while (%todo) {
1370 my $progress; 1477 my $progress;
1371 1478
1479 ++$pass;
1480
1481 ext:
1372 while (my ($k, $v) = each %todo) { 1482 while (my ($k, $v) = each %todo) {
1373 for (split /,\s*/, $v->{meta}{depends}) { 1483 for (split /,\s*/, $v->{meta}{depends}) {
1374 goto skip 1484 next ext
1375 unless exists $done{$_}; 1485 unless exists $done{$_};
1376 } 1486 }
1377 1487
1378 warn "... loading '$k' into '$v->{pkg}'\n"; 1488 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1379 1489
1380 unless (eval $v->{source}) { 1490 my $active = eval $v->{source};
1491
1492 if (length $@) {
1381 my $msg = $@ ? "$v->{path}: $@\n" 1493 error "$v->{path}: $@\n";
1382 : "$v->{base}: extension inactive.\n";
1383 1494
1384 if (exists $v->{meta}{mandatory}) {
1385 warn $msg;
1386 cf::cleanup "mandatory extension failed to load, exiting."; 1495 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1387 } 1496 if exists $v->{meta}{mandatory};
1388 1497
1389 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;
1390 } 1507 }
1391
1392 $done{$k} = delete $todo{$k};
1393 push @EXTS, $v->{pkg};
1394 $progress = 1;
1395 } 1508 }
1396 1509
1397 skip: 1510 unless ($progress) {
1398 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1511 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1399 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 }
1400 } 1518 }
1401 }; 1519 };
1402} 1520}
1403 1521
1404############################################################################# 1522#############################################################################
1488 $cf::PLAYER{$login} = $pl 1606 $cf::PLAYER{$login} = $pl
1489 } 1607 }
1490 } 1608 }
1491} 1609}
1492 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
1493sub save($) { 1624sub save($) {
1494 my ($pl) = @_; 1625 my ($pl) = @_;
1495 1626
1496 return if $pl->{deny_save}; 1627 return if $pl->{deny_save};
1497 1628
1502 1633
1503 aio_mkdir playerdir $pl, 0770; 1634 aio_mkdir playerdir $pl, 0770;
1504 $pl->{last_save} = $cf::RUNTIME; 1635 $pl->{last_save} = $cf::RUNTIME;
1505 1636
1506 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];
1507 1641
1508 $pl->save_pl ($path); 1642 $pl->save_pl ($path);
1509 cf::cede_to_tick; 1643 cf::cede_to_tick;
1510} 1644}
1511 1645
1545 my $name = $pl->ob->name; 1679 my $name = $pl->ob->name;
1546 1680
1547 $pl->{deny_save} = 1; 1681 $pl->{deny_save} = 1;
1548 $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
1549 1683
1550 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1684 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1551 $pl->deactivate; 1685 $pl->deactivate;
1686
1552 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;
1553 $pl->ob->check_score;
1554 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1688 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1689 ext::highscore::check ($pl->ob);
1690
1555 $pl->ns->destroy if $pl->ns; 1691 $pl->ns->destroy if $pl->ns;
1556 1692
1557 my $path = playerdir $pl; 1693 my $path = playerdir $pl;
1558 my $temp = "$path~$cf::RUNTIME~deleting~"; 1694 my $temp = "$path~$cf::RUNTIME~deleting~";
1559 aio_rename $path, $temp; 1695 aio_rename $path, $temp;
1613 \@logins 1749 \@logins
1614} 1750}
1615 1751
1616=item $player->maps 1752=item $player->maps
1617 1753
1754=item cf::player::maps $login
1755
1618Returns an arrayref of map paths that are private for this 1756Returns an arrayref of map paths that are private for this
1619player. May block. 1757player. May block.
1620 1758
1621=cut 1759=cut
1622 1760
1684=cut 1822=cut
1685 1823
1686sub find_by_path($) { 1824sub find_by_path($) {
1687 my ($path) = @_; 1825 my ($path) = @_;
1688 1826
1827 $path =~ s/^~[^\/]*//; # skip ~login
1828
1689 my ($match, $specificity); 1829 my ($match, $specificity);
1690 1830
1691 for my $region (list) { 1831 for my $region (list) {
1692 if ($region->{match} && $path =~ $region->{match}) { 1832 if ($region->{match} && $path =~ $region->{match}) {
1693 ($match, $specificity) = ($region, $region->specificity) 1833 ($match, $specificity) = ($region, $region->specificity)
1721sub generate_random_map { 1861sub generate_random_map {
1722 my ($self, $rmp) = @_; 1862 my ($self, $rmp) = @_;
1723 1863
1724 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
1725 1865
1726 # mit "rum" bekleckern, nicht
1727 $self->_create_random_map ( 1866 $self->_create_random_map ($rmp);
1728 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1729 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1730 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1731 $rmp->{exit_on_final_map},
1732 $rmp->{xsize}, $rmp->{ysize},
1733 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1734 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1735 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1736 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1737 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1738 (cf::region::find $rmp->{region}), $rmp->{custom}
1739 )
1740} 1867}
1741 1868
1742=item cf::map->register ($regex, $prio) 1869=item cf::map->register ($regex, $prio)
1743 1870
1744Register 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
1749 1876
1750sub register { 1877sub register {
1751 my (undef, $regex, $prio) = @_; 1878 my (undef, $regex, $prio) = @_;
1752 my $pkg = caller; 1879 my $pkg = caller;
1753 1880
1754 no strict;
1755 push @{"$pkg\::ISA"}, __PACKAGE__; 1881 push @{"$pkg\::ISA"}, __PACKAGE__;
1756 1882
1757 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1883 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1758} 1884}
1759 1885
1760# also paths starting with '/' 1886# also paths starting with '/'
1761$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1887$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1762 1888
1763sub thawer_merge { 1889sub thawer_merge {
1764 my ($self, $merge) = @_; 1890 my ($self, $merge) = @_;
1765 1891
1766 # we have to keep some variables in memory intact 1892 # we have to keep some variables in memory intact
1771} 1897}
1772 1898
1773sub normalise { 1899sub normalise {
1774 my ($path, $base) = @_; 1900 my ($path, $base) = @_;
1775 1901
1776 $path = "$path"; # make sure its a string 1902 $path = "$path"; # make sure it's a string
1777 1903
1778 $path =~ s/\.map$//; 1904 $path =~ s/\.map$//;
1779 1905
1780 # map plan: 1906 # map plan:
1781 # 1907 #
1796 $base =~ s{[^/]+/?$}{}; 1922 $base =~ s{[^/]+/?$}{};
1797 $path = "$base/$path"; 1923 $path = "$base/$path";
1798 } 1924 }
1799 1925
1800 for ($path) { 1926 for ($path) {
1801 redo if s{//}{/};
1802 redo if s{/\.?/}{/}; 1927 redo if s{/\.?/}{/};
1803 redo if s{/[^/]+/\.\./}{/}; 1928 redo if s{/[^/]+/\.\./}{/};
1804 } 1929 }
1805 1930
1806 $path 1931 $path
1820 $self->init; # pass $1 etc. 1945 $self->init; # pass $1 etc.
1821 return $self; 1946 return $self;
1822 } 1947 }
1823 } 1948 }
1824 1949
1825 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1950 Carp::cluck "unable to resolve path '$path' (base '$base')";
1826 () 1951 ()
1827} 1952}
1828 1953
1829sub init { 1954sub init {
1830 my ($self) = @_; 1955 my ($self) = @_;
1952} 2077}
1953 2078
1954sub find; 2079sub find;
1955sub find { 2080sub find {
1956 my ($path, $origin) = @_; 2081 my ($path, $origin) = @_;
2082
2083 cf::cede_to_tick;
1957 2084
1958 $path = normalise $path, $origin && $origin->path; 2085 $path = normalise $path, $origin && $origin->path;
1959 2086
1960 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2087 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1961 my $guard2 = cf::lock_acquire "map_find:$path"; 2088 my $guard2 = cf::lock_acquire "map_find:$path";
1980 2107
1981 $cf::MAP{$path} = $map 2108 $cf::MAP{$path} = $map
1982 } 2109 }
1983} 2110}
1984 2111
1985sub pre_load { } 2112sub pre_load { }
1986sub post_load { } 2113#sub post_load { } # XS
1987 2114
1988sub load { 2115sub load {
1989 my ($self) = @_; 2116 my ($self) = @_;
1990 2117
1991 local $self->{deny_reset} = 1; # loading can take a long time 2118 local $self->{deny_reset} = 1; # loading can take a long time
2046 2173
2047 $self->in_memory (cf::MAP_ACTIVE); 2174 $self->in_memory (cf::MAP_ACTIVE);
2048 } 2175 }
2049 2176
2050 $self->post_load; 2177 $self->post_load;
2051}
2052 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
2053sub customise_for { 2185sub customise_for {
2054 my ($self, $ob) = @_; 2186 my ($self, $ob) = @_;
2055 2187
2056 return find "~" . $ob->name . "/" . $self->{path} 2188 return find "~" . $ob->name . "/" . $self->{path}
2057 if $self->per_player; 2189 if $self->per_player;
2073 or next; 2205 or next;
2074 $neigh = find $neigh, $map 2206 $neigh = find $neigh, $map
2075 or next; 2207 or next;
2076 $neigh->load; 2208 $neigh->load;
2077 2209
2210 # now find the diagonal neighbours
2078 push @neigh, 2211 push @neigh,
2079 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2212 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2080 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2213 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2081 } 2214 }
2082 2215
2089} 2222}
2090 2223
2091sub find_sync { 2224sub find_sync {
2092 my ($path, $origin) = @_; 2225 my ($path, $origin) = @_;
2093 2226
2094 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
2095} 2231}
2096 2232
2097sub do_load_sync { 2233sub do_load_sync {
2098 my ($map) = @_; 2234 my ($map) = @_;
2099 2235
2100 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2236 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2101 if $Coro::current == $Coro::main; 2237 if $Coro::current == $Coro::main;
2102 2238
2103 cf::sync_job { $map->load }; 2239 $map->load;
2104} 2240}
2105 2241
2106our %MAP_PREFETCH; 2242our %MAP_PREFETCH;
2107our $MAP_PREFETCHER = undef; 2243our $MAP_PREFETCHER = undef;
2108 2244
2134 $MAP_PREFETCHER->prio (6); 2270 $MAP_PREFETCHER->prio (6);
2135 2271
2136 () 2272 ()
2137} 2273}
2138 2274
2275# common code, used by both ->save and ->swapout
2139sub save { 2276sub _save {
2140 my ($self) = @_; 2277 my ($self) = @_;
2141
2142 my $lock = cf::lock_acquire "map_data:$self->{path}";
2143 2278
2144 $self->{last_save} = $cf::RUNTIME; 2279 $self->{last_save} = $cf::RUNTIME;
2145 2280
2146 return unless $self->dirty; 2281 return unless $self->dirty;
2147 2282
2167 } else { 2302 } else {
2168 $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);
2169 } 2304 }
2170} 2305}
2171 2306
2307sub save {
2308 my ($self) = @_;
2309
2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311
2312 $self->_save;
2313}
2314
2172sub swap_out { 2315sub swap_out {
2173 my ($self) = @_; 2316 my ($self) = @_;
2174 2317
2175 # save first because save cedes
2176 $self->save;
2177
2178 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2318 my $lock = cf::lock_acquire "map_data:$self->{path}";
2179 2319
2180 return if $self->players;
2181 return if $self->in_memory != cf::MAP_ACTIVE; 2320 return if $self->in_memory != cf::MAP_ACTIVE;
2182 return if $self->{deny_save}; 2321 return if $self->{deny_save};
2322 return if $self->players;
2183 2323
2324 # first deactivate the map and "unlink" it from the core
2325 $self->deactivate;
2326 $_->clear_links_to ($self) for values %cf::MAP;
2184 $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};
2185 2374
2186 $self->deactivate; 2375 $self->deactivate;
2187 $_->clear_links_to ($self) for values %cf::MAP; 2376 $_->clear_links_to ($self) for values %cf::MAP;
2188 $self->clear; 2377 $self->clear;
2189}
2190
2191sub reset_at {
2192 my ($self) = @_;
2193
2194 # TODO: safety, remove and allow resettable per-player maps
2195 return 1e99 if $self->{deny_reset};
2196
2197 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2198 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2199
2200 $time + $to
2201}
2202
2203sub should_reset {
2204 my ($self) = @_;
2205
2206 $self->reset_at <= $cf::RUNTIME
2207}
2208
2209sub reset {
2210 my ($self) = @_;
2211
2212 my $lock = cf::lock_acquire "map_data:$self->{path}";
2213
2214 return if $self->players;
2215
2216 warn "resetting map ", $self->path;
2217
2218 $self->in_memory (cf::MAP_SWAPPED);
2219
2220 # need to save uniques path
2221 unless ($self->{deny_save}) {
2222 my $uniq = $self->uniq_path; utf8::encode $uniq;
2223
2224 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2225 if $uniq;
2226 }
2227
2228 delete $cf::MAP{$self->path};
2229
2230 $self->deactivate;
2231 $_->clear_links_to ($self) for values %cf::MAP;
2232 $self->clear;
2233 2378
2234 $self->unlink_save; 2379 $self->unlink_save;
2235 $self->destroy; 2380 $self->destroy;
2236} 2381}
2237 2382
2245 2390
2246 delete $cf::MAP{$self->path}; 2391 delete $cf::MAP{$self->path};
2247 2392
2248 $self->unlink_save; 2393 $self->unlink_save;
2249 2394
2250 bless $self, "cf::map"; 2395 bless $self, "cf::map::wrap";
2251 delete $self->{deny_reset}; 2396 delete $self->{deny_reset};
2252 $self->{deny_save} = 1; 2397 $self->{deny_save} = 1;
2253 $self->reset_timeout (1); 2398 $self->reset_timeout (1);
2254 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2399 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2255 2400
2312 : normalise $_ 2457 : normalise $_
2313 } @{ aio_readdir $UNIQUEDIR or [] } 2458 } @{ aio_readdir $UNIQUEDIR or [] }
2314 ] 2459 ]
2315} 2460}
2316 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
2317=back 2494=back
2318 2495
2319=head3 cf::object 2496=head3 cf::object
2320 2497
2321=cut 2498=cut
2386 2563
2387our $SAY_CHANNEL = { 2564our $SAY_CHANNEL = {
2388 id => "say", 2565 id => "say",
2389 title => "Map", 2566 title => "Map",
2390 reply => "say ", 2567 reply => "say ",
2391 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2568 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2392}; 2569};
2393 2570
2394our $CHAT_CHANNEL = { 2571our $CHAT_CHANNEL = {
2395 id => "chat", 2572 id => "chat",
2396 title => "Chat", 2573 title => "Chat",
2453 2630
2454Freezes 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}>).
2455 2632
2456The 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.
2457for 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,
2458though, 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
2459map. 2636map.
2460 2637
2461Will never block. 2638Will never block.
2462 2639
2463=item $player_object->leave_link ($map, $x, $y) 2640=item $player_object->leave_link ($map, $x, $y)
2484sub cf::object::player::enter_link { 2661sub cf::object::player::enter_link {
2485 my ($self) = @_; 2662 my ($self) = @_;
2486 2663
2487 $self->deactivate_recursive; 2664 $self->deactivate_recursive;
2488 2665
2666 ++$self->{_link_recursion};
2667
2489 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2668 return if UNIVERSAL::isa $self->map, "ext::map_link";
2490 2669
2491 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2670 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2492 if $self->map && $self->map->{path} ne "{link}"; 2671 if $self->map && $self->map->{path} ne "{link}";
2493 2672
2494 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2673 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2495} 2674}
2496 2675
2497sub cf::object::player::leave_link { 2676sub cf::object::player::leave_link {
2498 my ($self, $map, $x, $y) = @_; 2677 my ($self, $map, $x, $y) = @_;
2499 2678
2516 ($x, $y) = (-1, -1) 2695 ($x, $y) = (-1, -1)
2517 unless (defined $x) && (defined $y); 2696 unless (defined $x) && (defined $y);
2518 2697
2519 # use -1 or undef as default coordinates, not 0, 0 2698 # use -1 or undef as default coordinates, not 0, 0
2520 ($x, $y) = ($map->enter_x, $map->enter_y) 2699 ($x, $y) = ($map->enter_x, $map->enter_y)
2521 if $x <=0 && $y <= 0; 2700 if $x <= 0 && $y <= 0;
2522 2701
2523 $map->load; 2702 $map->load;
2524 $map->load_neighbours; 2703 $map->load_neighbours;
2525 2704
2526 return unless $self->contr->active; 2705 return unless $self->contr->active;
2527 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2528 $self->activate_recursive;
2529 2706
2530 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2707 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2531 $self->enter_map ($map, $x, $y); 2708 if ($self->enter_map ($map, $x, $y)) {
2532} 2709 # entering was successful
2710 delete $self->{_link_recursion};
2711 # only activate afterwards, to support waiting in hooks
2712 $self->activate_recursive;
2713 }
2533 2714
2715}
2716
2534=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)]])
2535 2718
2536Moves 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
2537her, loading and preparing them map, calling the provided $check callback 2720her, loading and preparing them map, calling the provided $check callback
2538that 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
2539the 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
2546 2729
2547our $GOTOGEN; 2730our $GOTOGEN;
2548 2731
2549sub cf::object::player::goto { 2732sub cf::object::player::goto {
2550 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 }
2551 2740
2552 # 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
2553 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2742 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2554 2743
2555 $self->enter_link; 2744 $self->enter_link;
2579 my $map = eval { 2768 my $map = eval {
2580 my $map = defined $path ? cf::map::find $path : undef; 2769 my $map = defined $path ? cf::map::find $path : undef;
2581 2770
2582 if ($map) { 2771 if ($map) {
2583 $map = $map->customise_for ($self); 2772 $map = $map->customise_for ($self);
2584 $map = $check->($map) if $check && $map; 2773 $map = $check->($map, $x, $y, $self) if $check && $map;
2585 } else { 2774 } else {
2586 $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);
2587 } 2776 }
2588 2777
2589 $map 2778 $map
2597 if ($gen == $self->{_goto_generation}) { 2786 if ($gen == $self->{_goto_generation}) {
2598 delete $self->{_goto_generation}; 2787 delete $self->{_goto_generation};
2599 $self->leave_link ($map, $x, $y); 2788 $self->leave_link ($map, $x, $y);
2600 } 2789 }
2601 2790
2602 $done->() if $done; 2791 $done->($self) if $done;
2603 })->prio (1); 2792 })->prio (1);
2604} 2793}
2605 2794
2606=item $player_object->enter_exit ($exit_object) 2795=item $player_object->enter_exit ($exit_object)
2607 2796
2700 $self->message ("Something went wrong deep within the deliantra server. " 2889 $self->message ("Something went wrong deep within the deliantra server. "
2701 . "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. "
2702 . "Please report this to the dungeon master!", 2891 . "Please report this to the dungeon master!",
2703 cf::NDI_UNIQUE | cf::NDI_RED); 2892 cf::NDI_UNIQUE | cf::NDI_RED);
2704 2893
2705 warn "ERROR in enter_exit: $@"; 2894 error "ERROR in enter_exit: $@";
2706 $self->leave_link; 2895 $self->leave_link;
2707 } 2896 }
2708 })->prio (1); 2897 })->prio (1);
2709} 2898}
2710 2899
2722sub cf::client::send_drawinfo { 2911sub cf::client::send_drawinfo {
2723 my ($self, $text, $flags) = @_; 2912 my ($self, $text, $flags) = @_;
2724 2913
2725 utf8::encode $text; 2914 utf8::encode $text;
2726 $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);
2727} 2941}
2728 2942
2729=item $client->send_msg ($channel, $msg, $color, [extra...]) 2943=item $client->send_msg ($channel, $msg, $color, [extra...])
2730 2944
2731Send 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
2735 2949
2736=cut 2950=cut
2737 2951
2738# non-persistent channels (usually the info channel) 2952# non-persistent channels (usually the info channel)
2739our %CHANNEL = ( 2953our %CHANNEL = (
2954 "c/motd" => {
2955 id => "infobox",
2956 title => "MOTD",
2957 reply => undef,
2958 tooltip => "The message of the day",
2959 },
2740 "c/identify" => { 2960 "c/identify" => {
2741 id => "infobox", 2961 id => "infobox",
2742 title => "Identify", 2962 title => "Identify",
2743 reply => undef, 2963 reply => undef,
2744 tooltip => "Items recently identified", 2964 tooltip => "Items recently identified",
2746 "c/examine" => { 2966 "c/examine" => {
2747 id => "infobox", 2967 id => "infobox",
2748 title => "Examine", 2968 title => "Examine",
2749 reply => undef, 2969 reply => undef,
2750 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",
2751 }, 2977 },
2752 "c/book" => { 2978 "c/book" => {
2753 id => "infobox", 2979 id => "infobox",
2754 title => "Book", 2980 title => "Book",
2755 reply => undef, 2981 reply => undef,
2783 id => "infobox", 3009 id => "infobox",
2784 title => "Skills", 3010 title => "Skills",
2785 reply => undef, 3011 reply => undef,
2786 tooltip => "Shows your experience per skill and item power", 3012 tooltip => "Shows your experience per skill and item power",
2787 }, 3013 },
3014 "c/shopitems" => {
3015 id => "infobox",
3016 title => "Shop Items",
3017 reply => undef,
3018 tooltip => "Shows the items currently for sale in this shop",
3019 },
2788 "c/resistances" => { 3020 "c/resistances" => {
2789 id => "infobox", 3021 id => "infobox",
2790 title => "Resistances", 3022 title => "Resistances",
2791 reply => undef, 3023 reply => undef,
2792 tooltip => "Shows your resistances", 3024 tooltip => "Shows your resistances",
2794 "c/pets" => { 3026 "c/pets" => {
2795 id => "infobox", 3027 id => "infobox",
2796 title => "Pets", 3028 title => "Pets",
2797 reply => undef, 3029 reply => undef,
2798 tooltip => "Shows information abotu your pets/a specific pet", 3030 tooltip => "Shows information abotu your pets/a specific pet",
3031 },
3032 "c/perceiveself" => {
3033 id => "infobox",
3034 title => "Perceive Self",
3035 reply => undef,
3036 tooltip => "You gained detailed knowledge about yourself",
2799 }, 3037 },
2800 "c/uptime" => { 3038 "c/uptime" => {
2801 id => "infobox", 3039 id => "infobox",
2802 title => "Uptime", 3040 title => "Uptime",
2803 reply => undef, 3041 reply => undef,
2859 my $pkt = "msg " 3097 my $pkt = "msg "
2860 . $self->{json_coder}->encode ( 3098 . $self->{json_coder}->encode (
2861 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3099 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2862 ); 3100 );
2863 3101
2864 # try lzf for large packets
2865 $pkt = "lzf " . Compress::LZF::compress $pkt
2866 if 1024 <= length $pkt and $self->{can_lzf};
2867
2868 # split very large packets
2869 if (8192 < length $pkt and $self->{can_lzf}) {
2870 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2871 $pkt = "frag";
2872 }
2873
2874 $self->send_packet ($pkt); 3102 $self->send_big_packet ($pkt);
2875} 3103}
2876 3104
2877=item $client->ext_msg ($type, @msg) 3105=item $client->ext_msg ($type, @msg)
2878 3106
2879Sends an ext event to the client. 3107Sends an ext event to the client.
2882 3110
2883sub cf::client::ext_msg($$@) { 3111sub cf::client::ext_msg($$@) {
2884 my ($self, $type, @msg) = @_; 3112 my ($self, $type, @msg) = @_;
2885 3113
2886 if ($self->extcmd == 2) { 3114 if ($self->extcmd == 2) {
2887 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3115 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2888 } elsif ($self->extcmd == 1) { # TODO: remove 3116 } elsif ($self->extcmd == 1) { # TODO: remove
2889 push @msg, msgtype => "event_$type"; 3117 push @msg, msgtype => "event_$type";
2890 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3118 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2891 } 3119 }
2892} 3120}
2893 3121
2894=item $client->ext_reply ($msgid, @msg) 3122=item $client->ext_reply ($msgid, @msg)
2895 3123
2899 3127
2900sub cf::client::ext_reply($$@) { 3128sub cf::client::ext_reply($$@) {
2901 my ($self, $id, @msg) = @_; 3129 my ($self, $id, @msg) = @_;
2902 3130
2903 if ($self->extcmd == 2) { 3131 if ($self->extcmd == 2) {
2904 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3132 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2905 } elsif ($self->extcmd == 1) { 3133 } elsif ($self->extcmd == 1) {
2906 #TODO: version 1, remove 3134 #TODO: version 1, remove
2907 unshift @msg, msgtype => "reply", msgid => $id; 3135 unshift @msg, msgtype => "reply", msgid => $id;
2908 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3136 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2909 } 3137 }
2910} 3138}
2911 3139
2912=item $success = $client->query ($flags, "text", \&cb) 3140=item $success = $client->query ($flags, "text", \&cb)
2913 3141
2984 3212
2985 $ns->ext_reply ($reply, @reply) 3213 $ns->ext_reply ($reply, @reply)
2986 if $reply; 3214 if $reply;
2987 3215
2988 } else { 3216 } else {
2989 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";
2990 } 3218 }
2991 3219
2992 cf::override; 3220 cf::override;
2993 }, 3221 },
2994); 3222);
3014 3242
3015 $coro 3243 $coro
3016} 3244}
3017 3245
3018cf::client->attach ( 3246cf::client->attach (
3019 on_destroy => sub { 3247 on_client_destroy => sub {
3020 my ($ns) = @_; 3248 my ($ns) = @_;
3021 3249
3022 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3250 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3023 }, 3251 },
3024); 3252);
3040our $safe_hole = new Safe::Hole; 3268our $safe_hole = new Safe::Hole;
3041 3269
3042$SIG{FPE} = 'IGNORE'; 3270$SIG{FPE} = 'IGNORE';
3043 3271
3044$safe->permit_only (Opcode::opset qw( 3272$safe->permit_only (Opcode::opset qw(
3045 :base_core :base_mem :base_orig :base_math 3273 :base_core :base_mem :base_orig :base_math :base_loop
3046 grepstart grepwhile mapstart mapwhile 3274 grepstart grepwhile mapstart mapwhile
3047 sort time 3275 sort time
3048)); 3276));
3049 3277
3050# here we export the classes and methods available to script code 3278# here we export the classes and methods available to script code
3075 decrease split destroy change_exp value msg lore send_msg)], 3303 decrease split destroy change_exp value msg lore send_msg)],
3076 ["cf::object::player" => qw(player)], 3304 ["cf::object::player" => qw(player)],
3077 ["cf::player" => qw(peaceful send_msg)], 3305 ["cf::player" => qw(peaceful send_msg)],
3078 ["cf::map" => qw(trigger)], 3306 ["cf::map" => qw(trigger)],
3079) { 3307) {
3080 no strict 'refs';
3081 my ($pkg, @funs) = @$_; 3308 my ($pkg, @funs) = @$_;
3082 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3309 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3083 for @funs; 3310 for @funs;
3084} 3311}
3085 3312
3102 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3329 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3103 $qcode =~ s/\n/\\n/g; 3330 $qcode =~ s/\n/\\n/g;
3104 3331
3105 %vars = (_dummy => 0) unless %vars; 3332 %vars = (_dummy => 0) unless %vars;
3106 3333
3334 my @res;
3107 local $_; 3335 local $_;
3108 local @safe::cf::_safe_eval_args = values %vars;
3109 3336
3110 my $eval = 3337 my $eval =
3111 "do {\n" 3338 "do {\n"
3112 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3339 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3113 . "#line 0 \"{$qcode}\"\n" 3340 . "#line 0 \"{$qcode}\"\n"
3114 . $code 3341 . $code
3115 . "\n}" 3342 . "\n}"
3116 ; 3343 ;
3117 3344
3345 if ($CFG{safe_eval}) {
3118 sub_generation_inc; 3346 sub_generation_inc;
3347 local @safe::cf::_safe_eval_args = values %vars;
3119 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3348 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3120 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 }
3121 3354
3122 if ($@) { 3355 if ($@) {
3123 warn "$@"; 3356 warn "$@",
3124 warn "while executing safe code '$code'\n"; 3357 "while executing safe code '$code'\n",
3125 warn "with arguments " . (join " ", %vars) . "\n"; 3358 "with arguments " . (join " ", %vars) . "\n";
3126 } 3359 }
3127 3360
3128 wantarray ? @res : $res[0] 3361 wantarray ? @res : $res[0]
3129} 3362}
3130 3363
3144=cut 3377=cut
3145 3378
3146sub register_script_function { 3379sub register_script_function {
3147 my ($fun, $cb) = @_; 3380 my ($fun, $cb) = @_;
3148 3381
3149 no strict 'refs'; 3382 $fun = "safe::$fun" if $CFG{safe_eval};
3150 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3383 *$fun = $safe_hole->wrap ($cb);
3151} 3384}
3152 3385
3153=back 3386=back
3154 3387
3155=cut 3388=cut
3164 # for this (global event?) 3397 # for this (global event?)
3165 %ext::player_env::MUSIC_FACE_CACHE = (); 3398 %ext::player_env::MUSIC_FACE_CACHE = ();
3166 3399
3167 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3400 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3168 3401
3169 warn "loading facedata from $path\n"; 3402 trace "loading facedata from $path\n";
3170 3403
3171 my $facedata;
3172 0 < aio_load $path, $facedata 3404 0 < aio_load $path, my $facedata
3173 or die "$path: $!"; 3405 or die "$path: $!";
3174 3406
3175 $facedata = Coro::Storable::thaw $facedata; 3407 $facedata = Coro::Storable::thaw $facedata;
3176 3408
3177 $facedata->{version} == 2 3409 $facedata->{version} == 2
3178 or cf::cleanup "$path: version mismatch, cannot proceed."; 3410 or cf::cleanup "$path: version mismatch, cannot proceed.";
3179 3411
3180 # 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]);
3181 $facedata->{resource}{"res/exp_table"} = { 3414 $facedata->{resource}{"res/exp_table"} = {
3182 type => FT_RSRC, 3415 type => FT_RSRC,
3183 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),
3184 }; 3418 };
3185 cf::cede_to_tick; 3419 cf::cede_to_tick;
3186 3420
3187 { 3421 {
3188 my $faces = $facedata->{faceinfo}; 3422 my $faces = $facedata->{faceinfo};
3190 while (my ($face, $info) = each %$faces) { 3424 while (my ($face, $info) = each %$faces) {
3191 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3425 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3192 3426
3193 cf::face::set_visibility $idx, $info->{visibility}; 3427 cf::face::set_visibility $idx, $info->{visibility};
3194 cf::face::set_magicmap $idx, $info->{magicmap}; 3428 cf::face::set_magicmap $idx, $info->{magicmap};
3195 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3429 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3196 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, "-", chr $idx & 255;
3197 3432
3198 cf::cede_to_tick; 3433 cf::cede_to_tick;
3199 } 3434 }
3200 3435
3201 while (my ($face, $info) = each %$faces) { 3436 while (my ($face, $info) = each %$faces) {
3206 3441
3207 if (my $smooth = cf::face::find $info->{smooth}) { 3442 if (my $smooth = cf::face::find $info->{smooth}) {
3208 cf::face::set_smooth $idx, $smooth; 3443 cf::face::set_smooth $idx, $smooth;
3209 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3444 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3210 } else { 3445 } else {
3211 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3446 error "smooth face '$info->{smooth}' not found for face '$face'";
3212 } 3447 }
3213 3448
3214 cf::cede_to_tick; 3449 cf::cede_to_tick;
3215 } 3450 }
3216 } 3451 }
3225 3460
3226 cf::anim::invalidate_all; # d'oh 3461 cf::anim::invalidate_all; # d'oh
3227 } 3462 }
3228 3463
3229 { 3464 {
3230 # TODO: for gcfclient pleasure, we should give resources
3231 # that gcfclient doesn't grok a >10000 face index.
3232 my $res = $facedata->{resource}; 3465 my $res = $facedata->{resource};
3233 3466
3234 while (my ($name, $info) = each %$res) { 3467 while (my ($name, $info) = each %$res) {
3235 if (defined $info->{type}) { 3468 if (defined $info->{type}) {
3236 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3469 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3237 my $data;
3238 3470
3239 if ($info->{type} & 1) { 3471 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3240 # prepend meta info
3241
3242 my $meta = $enc->encode ({
3243 name => $name,
3244 %{ $info->{meta} || {} },
3245 });
3246
3247 $data = pack "(w/a*)*", $meta, $info->{data};
3248 } else {
3249 $data = $info->{data};
3250 }
3251
3252 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3253 cf::face::set_type $idx, $info->{type}; 3472 cf::face::set_type $idx, $info->{type};
3254 } else { 3473 } else {
3255 $RESOURCE{$name} = $info; 3474 $RESOURCE{$name} = $info; # unused
3256 } 3475 }
3257 3476
3258 cf::cede_to_tick; 3477 cf::cede_to_tick;
3259 } 3478 }
3260 } 3479 }
3261 3480
3262 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3481 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3263 3482
3264 1 3483 1
3265} 3484}
3266
3267cf::global->attach (on_resource_update => sub {
3268 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3269 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3270
3271 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3272 my $sound = $soundconf->{compat}[$_]
3273 or next;
3274
3275 my $face = cf::face::find "sound/$sound->[1]";
3276 cf::sound::set $sound->[0] => $face;
3277 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3278 }
3279
3280 while (my ($k, $v) = each %{$soundconf->{event}}) {
3281 my $face = cf::face::find "sound/$v";
3282 cf::sound::set $k => $face;
3283 }
3284 }
3285});
3286 3485
3287register_exticmd fx_want => sub { 3486register_exticmd fx_want => sub {
3288 my ($ns, $want) = @_; 3487 my ($ns, $want) = @_;
3289 3488
3290 while (my ($k, $v) = each %$want) { 3489 while (my ($k, $v) = each %$want) {
3329sub reload_treasures { 3528sub reload_treasures {
3330 load_resource_file "$DATADIR/treasures" 3529 load_resource_file "$DATADIR/treasures"
3331 or die "unable to load treasurelists\n"; 3530 or die "unable to load treasurelists\n";
3332} 3531}
3333 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
3334sub reload_resources { 3556sub reload_resources {
3335 warn "reloading resource files...\n"; 3557 trace "reloading resource files...\n";
3336 3558
3559 reload_exp_table;
3560 reload_materials;
3337 reload_facedata; 3561 reload_facedata;
3562 reload_sound;
3338 reload_archetypes; 3563 reload_archetypes;
3339 reload_regions; 3564 reload_regions;
3340 reload_treasures; 3565 reload_treasures;
3341 3566
3342 warn "finished reloading resource files\n"; 3567 trace "finished reloading resource files\n";
3343} 3568}
3344 3569
3345sub reload_config { 3570sub reload_config {
3346 open my $fh, "<:utf8", "$CONFDIR/config" 3571 trace "reloading config file...\n";
3347 or return;
3348 3572
3349 local $/; 3573 0 < aio_load "$CONFDIR/config", my $config
3350 *CFG = YAML::Load <$fh>; 3574 or die "$CONFDIR/config: $!";
3351 3575
3576 utf8::decode $config;
3577 *CFG = yaml_load $config;
3578
3352 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3579 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3353 3580
3354 $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};
3355 $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};
3356 3583
3357 if (exists $CFG{mlockall}) { 3584 if (exists $CFG{mlockall}) {
3380 3607
3381 seek $fh, 0, 0; 3608 seek $fh, 0, 0;
3382 print $fh $$; 3609 print $fh $$;
3383} 3610}
3384 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
3385sub main { 3621sub main {
3386 cf::init_globals; # initialise logging 3622 cf::init_globals; # initialise logging
3387 3623
3388 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3624 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3389 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.";
3390 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3626 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3391 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3627 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3392
3393 cf::init_experience;
3394 cf::init_anim;
3395 cf::init_attackmess;
3396 cf::init_dynamic;
3397 3628
3398 $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
3399 3630
3400 # we must not ever block the main coroutine 3631 # we must not ever block the main coroutine
3401 local $Coro::idle = sub { 3632 local $Coro::idle = sub {
3407 }; 3638 };
3408 3639
3409 evthread_start IO::AIO::poll_fileno; 3640 evthread_start IO::AIO::poll_fileno;
3410 3641
3411 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
3412 reload_resources; 3651 reload_resources;
3413 reload_config; 3652 reload_config;
3414 db_init; 3653 db_init;
3415 3654
3416 cf::load_settings;
3417 cf::load_materials;
3418 cf::init_uuid; 3655 cf::init_uuid;
3419 cf::init_signals; 3656 cf::init_signals;
3420 cf::init_commands;
3421 cf::init_skills; 3657 cf::init_skills;
3422 3658
3423 cf::init_beforeplay; 3659 cf::init_beforeplay;
3424 3660
3425 atomic; 3661 atomic;
3427 load_extensions; 3663 load_extensions;
3428 3664
3429 utime time, time, $RUNTIMEFILE; 3665 utime time, time, $RUNTIMEFILE;
3430 3666
3431 # no (long-running) fork's whatsoever before this point(!) 3667 # no (long-running) fork's whatsoever before this point(!)
3668 use POSIX ();
3432 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};
3433 3670
3434 (pop @POST_INIT)->(0) while @POST_INIT; 3671 cf::_post_init 0;
3435 }; 3672 };
3436 3673
3437 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;
3438} 3683}
3439 3684
3440############################################################################# 3685#############################################################################
3441# initialisation and cleanup 3686# initialisation and cleanup
3442 3687
3443# install some emergency cleanup handlers 3688# install some emergency cleanup handlers
3444BEGIN { 3689BEGIN {
3445 our %SIGWATCHER = (); 3690 our %SIGWATCHER = ();
3446 for my $signal (qw(INT HUP TERM)) { 3691 for my $signal (qw(INT HUP TERM)) {
3447 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3692 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3448 cf::cleanup "SIG$signal"; 3693 cf::cleanup "SIG$signal";
3449 }; 3694 };
3450 } 3695 }
3451} 3696}
3452 3697
3453sub write_runtime_sync { 3698sub write_runtime_sync {
3699 my $t0 = AE::time;
3700
3454 # first touch the runtime file to show we are still running: 3701 # first touch the runtime file to show we are still running:
3455 # the fsync below can take a very very long time. 3702 # the fsync below can take a very very long time.
3456 3703
3457 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3704 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3458 3705
3459 my $guard = cf::lock_acquire "write_runtime"; 3706 my $guard = cf::lock_acquire "write_runtime";
3460 3707
3461 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3708 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3462 or return; 3709 or return;
3463 3710
3464 my $value = $cf::RUNTIME + 90 + 10; 3711 my $value = $cf::RUNTIME + 90 + 10;
3465 # 10 is the runtime save interval, for a monotonic clock 3712 # 10 is the runtime save interval, for a monotonic clock
3466 # 60 allows for the watchdog to kill the server. 3713 # 60 allows for the watchdog to kill the server.
3479 or return; 3726 or return;
3480 3727
3481 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3728 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3482 and return; 3729 and return;
3483 3730
3484 warn "runtime file written.\n"; 3731 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3485 3732
3486 1 3733 1
3487} 3734}
3488 3735
3489our $uuid_lock; 3736our $uuid_lock;
3501 or return; 3748 or return;
3502 3749
3503 my $value = uuid_seq uuid_cur; 3750 my $value = uuid_seq uuid_cur;
3504 3751
3505 unless ($value) { 3752 unless ($value) {
3506 warn "cowardly refusing to write zero uuid value!\n"; 3753 info "cowardly refusing to write zero uuid value!\n";
3507 return; 3754 return;
3508 } 3755 }
3509 3756
3510 my $value = uuid_str $value + $uuid_skip; 3757 my $value = uuid_str $value + $uuid_skip;
3511 $uuid_skip = 0; 3758 $uuid_skip = 0;
3521 or return; 3768 or return;
3522 3769
3523 aio_rename "$uuid~", $uuid 3770 aio_rename "$uuid~", $uuid
3524 and return; 3771 and return;
3525 3772
3526 warn "uuid file written ($value).\n"; 3773 trace "uuid file written ($value).\n";
3527 3774
3528 1 3775 1
3529 3776
3530} 3777}
3531 3778
3537} 3784}
3538 3785
3539sub emergency_save() { 3786sub emergency_save() {
3540 my $freeze_guard = cf::freeze_mainloop; 3787 my $freeze_guard = cf::freeze_mainloop;
3541 3788
3542 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;
3543 3795
3544 cf::sync_job { 3796 cf::sync_job {
3545 # this is a trade-off: we want to be very quick here, so 3797 cf::write_runtime_sync; # external watchdog should not bark
3546 # save all maps without fsync, and later call a global sync
3547 # (which in turn might be very very slow)
3548 local $USE_FSYNC = 0;
3549 3798
3550 # use a peculiar iteration method to avoid tripping on perl 3799 # use a peculiar iteration method to avoid tripping on perl
3551 # refcount bugs in for. also avoids problems with players 3800 # refcount bugs in for. also avoids problems with players
3552 # and maps saved/destroyed asynchronously. 3801 # and maps saved/destroyed asynchronously.
3553 warn "emergency_perl_save: begin player save\n"; 3802 info "emergency_perl_save: begin player save\n";
3554 for my $login (keys %cf::PLAYER) { 3803 for my $login (keys %cf::PLAYER) {
3555 my $pl = $cf::PLAYER{$login} or next; 3804 my $pl = $cf::PLAYER{$login} or next;
3556 $pl->valid or next; 3805 $pl->valid or next;
3557 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3806 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3558 $pl->save; 3807 $pl->save;
3559 } 3808 }
3560 warn "emergency_perl_save: end player save\n"; 3809 info "emergency_perl_save: end player save\n";
3561 3810
3811 cf::write_runtime_sync; # external watchdog should not bark
3812
3562 warn "emergency_perl_save: begin map save\n"; 3813 info "emergency_perl_save: begin map save\n";
3563 for my $path (keys %cf::MAP) { 3814 for my $path (keys %cf::MAP) {
3564 my $map = $cf::MAP{$path} or next; 3815 my $map = $cf::MAP{$path} or next;
3565 $map->valid or next; 3816 $map->valid or next;
3566 $map->save; 3817 $map->save;
3567 } 3818 }
3568 warn "emergency_perl_save: end map save\n"; 3819 info "emergency_perl_save: end map save\n";
3569 3820
3821 cf::write_runtime_sync; # external watchdog should not bark
3822
3570 warn "emergency_perl_save: begin database checkpoint\n"; 3823 info "emergency_perl_save: begin database checkpoint\n";
3571 BDB::db_env_txn_checkpoint $DB_ENV; 3824 BDB::db_env_txn_checkpoint $DB_ENV;
3572 warn "emergency_perl_save: end database checkpoint\n"; 3825 info "emergency_perl_save: end database checkpoint\n";
3573 3826
3574 warn "emergency_perl_save: begin write uuid\n"; 3827 info "emergency_perl_save: begin write uuid\n";
3575 write_uuid_sync 1; 3828 write_uuid_sync 1;
3576 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
3577 }; 3849 };
3578 3850
3579 warn "emergency_perl_save: starting sync()\n";
3580 IO::AIO::aio_sync sub {
3581 warn "emergency_perl_save: finished sync()\n";
3582 };
3583
3584 warn "emergency_perl_save: leave\n"; 3851 info "emergency_perl_save: leave\n";
3585} 3852}
3586 3853
3587sub post_cleanup { 3854sub post_cleanup {
3588 my ($make_core) = @_; 3855 my ($make_core) = @_;
3589 3856
3857 IO::AIO::flush;
3858
3590 warn Carp::longmess "post_cleanup backtrace" 3859 error Carp::longmess "post_cleanup backtrace"
3591 if $make_core; 3860 if $make_core;
3592 3861
3593 my $fh = pidfile; 3862 my $fh = pidfile;
3594 unlink $PIDFILE if <$fh> == $$; 3863 unlink $PIDFILE if <$fh> == $$;
3595} 3864}
3615 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3884 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3616 for my $name (keys %$leaf_symtab) { 3885 for my $name (keys %$leaf_symtab) {
3617 _gv_clear *{"$pkg$name"}; 3886 _gv_clear *{"$pkg$name"};
3618# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3887# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3619 } 3888 }
3620 warn "cleared package $pkg\n";#d#
3621} 3889}
3622 3890
3623sub do_reload_perl() { 3891sub do_reload_perl() {
3624 # can/must only be called in main 3892 # can/must only be called in main
3625 if ($Coro::current != $Coro::main) { 3893 unless (in_main) {
3626 warn "can only reload from main coroutine"; 3894 error "can only reload from main coroutine";
3627 return; 3895 return;
3628 } 3896 }
3629 3897
3630 return if $RELOAD++; 3898 return if $RELOAD++;
3631 3899
3632 my $t1 = EV::time; 3900 my $t1 = AE::time;
3633 3901
3634 while ($RELOAD) { 3902 while ($RELOAD) {
3635 warn "reloading..."; 3903 cf::get_slot 0.1, -1, "reload_perl";
3904 info "perl_reload: reloading...";
3636 3905
3637 warn "entering sync_job"; 3906 trace "perl_reload: entering sync_job";
3638 3907
3639 cf::sync_job { 3908 cf::sync_job {
3640 cf::write_runtime_sync; # external watchdog should not bark
3641 cf::emergency_save; 3909 #cf::emergency_save;
3642 cf::write_runtime_sync; # external watchdog should not bark
3643 3910
3644 warn "syncing database to disk";
3645 BDB::db_env_txn_checkpoint $DB_ENV;
3646
3647 # if anything goes wrong in here, we should simply crash as we already saved
3648
3649 warn "flushing outstanding aio requests";
3650 while (IO::AIO::nreqs || BDB::nreqs) {
3651 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3652 }
3653
3654 warn "cancelling all extension coros"; 3911 trace "perl_reload: cancelling all extension coros";
3655 $_->cancel for values %EXT_CORO; 3912 $_->cancel for values %EXT_CORO;
3656 %EXT_CORO = (); 3913 %EXT_CORO = ();
3657 3914
3658 warn "removing commands"; 3915 trace "perl_reload: removing commands";
3659 %COMMAND = (); 3916 %COMMAND = ();
3660 3917
3661 warn "removing ext/exti commands"; 3918 trace "perl_reload: removing ext/exti commands";
3662 %EXTCMD = (); 3919 %EXTCMD = ();
3663 %EXTICMD = (); 3920 %EXTICMD = ();
3664 3921
3665 warn "unloading/nuking all extensions"; 3922 trace "perl_reload: unloading/nuking all extensions";
3666 for my $pkg (@EXTS) { 3923 for my $pkg (@EXTS) {
3667 warn "... unloading $pkg"; 3924 trace "... unloading $pkg";
3668 3925
3669 if (my $cb = $pkg->can ("unload")) { 3926 if (my $cb = $pkg->can ("unload")) {
3670 eval { 3927 eval {
3671 $cb->($pkg); 3928 $cb->($pkg);
3672 1 3929 1
3673 } or warn "$pkg unloaded, but with errors: $@"; 3930 } or error "$pkg unloaded, but with errors: $@";
3674 } 3931 }
3675 3932
3676 warn "... clearing $pkg"; 3933 trace "... clearing $pkg";
3677 clear_package $pkg; 3934 clear_package $pkg;
3678 } 3935 }
3679 3936
3680 warn "unloading all perl modules loaded from $LIBDIR"; 3937 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3681 while (my ($k, $v) = each %INC) { 3938 while (my ($k, $v) = each %INC) {
3682 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3939 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3683 3940
3684 warn "... unloading $k"; 3941 trace "... unloading $k";
3685 delete $INC{$k}; 3942 delete $INC{$k};
3686 3943
3687 $k =~ s/\.pm$//; 3944 $k =~ s/\.pm$//;
3688 $k =~ s/\//::/g; 3945 $k =~ s/\//::/g;
3689 3946
3692 } 3949 }
3693 3950
3694 clear_package $k; 3951 clear_package $k;
3695 } 3952 }
3696 3953
3697 warn "getting rid of safe::, as good as possible"; 3954 trace "perl_reload: getting rid of safe::, as good as possible";
3698 clear_package "safe::$_" 3955 clear_package "safe::$_"
3699 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);
3700 3957
3701 warn "unloading cf.pm \"a bit\""; 3958 trace "perl_reload: unloading cf.pm \"a bit\"";
3702 delete $INC{"cf.pm"}; 3959 delete $INC{"cf.pm"};
3703 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3960 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3704 3961
3705 # don't, removes xs symbols, too, 3962 # don't, removes xs symbols, too,
3706 # and global variables created in xs 3963 # and global variables created in xs
3707 #clear_package __PACKAGE__; 3964 #clear_package __PACKAGE__;
3708 3965
3709 warn "unload completed, starting to reload now"; 3966 info "perl_reload: unload completed, starting to reload now";
3710 3967
3711 warn "reloading cf.pm"; 3968 trace "perl_reload: reloading cf.pm";
3712 require cf; 3969 require cf;
3713 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3970 cf::_connect_to_perl_1;
3714 3971
3715 warn "loading config and database again"; 3972 trace "perl_reload: loading config and database again";
3716 cf::reload_config; 3973 cf::reload_config;
3717 3974
3718 warn "loading extensions"; 3975 trace "perl_reload: loading extensions";
3719 cf::load_extensions; 3976 cf::load_extensions;
3720 3977
3721 if ($REATTACH_ON_RELOAD) { 3978 if ($REATTACH_ON_RELOAD) {
3722 warn "reattaching attachments to objects/players"; 3979 trace "perl_reload: reattaching attachments to objects/players";
3723 _global_reattach; # objects, sockets 3980 _global_reattach; # objects, sockets
3724 warn "reattaching attachments to maps"; 3981 trace "perl_reload: reattaching attachments to maps";
3725 reattach $_ for values %MAP; 3982 reattach $_ for values %MAP;
3726 warn "reattaching attachments to players"; 3983 trace "perl_reload: reattaching attachments to players";
3727 reattach $_ for values %PLAYER; 3984 reattach $_ for values %PLAYER;
3728 } 3985 }
3729 3986
3730 warn "running post_init jobs"; 3987 cf::_post_init 1;
3731 (pop @POST_INIT)->(1) while @POST_INIT;
3732 3988
3733 warn "leaving sync_job"; 3989 trace "perl_reload: leaving sync_job";
3734 3990
3735 1 3991 1
3736 } or do { 3992 } or do {
3737 warn $@; 3993 error $@;
3738 cf::cleanup "error while reloading, exiting."; 3994 cf::cleanup "perl_reload: error, exiting.";
3739 }; 3995 };
3740 3996
3741 warn "reloaded";
3742 --$RELOAD; 3997 --$RELOAD;
3743 } 3998 }
3744 3999
3745 $t1 = EV::time - $t1; 4000 $t1 = AE::time - $t1;
3746 warn "reload completed in ${t1}s\n"; 4001 info "perl_reload: completed in ${t1}s\n";
3747}; 4002};
3748 4003
3749our $RELOAD_WATCHER; # used only during reload 4004our $RELOAD_WATCHER; # used only during reload
3750 4005
3751sub reload_perl() { 4006sub reload_perl() {
3753 # coro crashes during coro_state_free->destroy here. 4008 # coro crashes during coro_state_free->destroy here.
3754 4009
3755 $RELOAD_WATCHER ||= cf::async { 4010 $RELOAD_WATCHER ||= cf::async {
3756 Coro::AIO::aio_wait cache_extensions; 4011 Coro::AIO::aio_wait cache_extensions;
3757 4012
3758 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4013 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3759 do_reload_perl; 4014 do_reload_perl;
3760 undef $RELOAD_WATCHER; 4015 undef $RELOAD_WATCHER;
3761 }; 4016 };
3762 }; 4017 };
3763} 4018}
3772 reload_perl; 4027 reload_perl;
3773 }; 4028 };
3774 } 4029 }
3775}; 4030};
3776 4031
3777unshift @INC, $LIBDIR; 4032#############################################################################
3778 4033
3779my $bug_warning = 0; 4034my $bug_warning = 0;
3780 4035
3781our @WAIT_FOR_TICK; 4036our @WAIT_FOR_TICK;
3782our @WAIT_FOR_TICK_BEGIN; 4037our @WAIT_FOR_TICK_BEGIN;
3783 4038
3784sub wait_for_tick { 4039sub wait_for_tick() {
3785 return if tick_inhibit || $Coro::current == $Coro::main; 4040 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3786 4041
3787 my $signal = new Coro::Signal; 4042 my $signal = new Coro::Signal;
3788 push @WAIT_FOR_TICK, $signal; 4043 push @WAIT_FOR_TICK, $signal;
3789 $signal->wait; 4044 $signal->wait;
3790} 4045}
3791 4046
3792sub wait_for_tick_begin { 4047sub wait_for_tick_begin() {
3793 return if tick_inhibit || $Coro::current == $Coro::main; 4048 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3794 4049
3795 my $signal = new Coro::Signal; 4050 my $signal = new Coro::Signal;
3796 push @WAIT_FOR_TICK_BEGIN, $signal; 4051 push @WAIT_FOR_TICK_BEGIN, $signal;
3797 $signal->wait; 4052 $signal->wait;
3798} 4053}
3804 return; 4059 return;
3805 } 4060 }
3806 4061
3807 cf::server_tick; # one server iteration 4062 cf::server_tick; # one server iteration
3808 4063
4064 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4065
3809 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4066 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3810 $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.;
3811 Coro::async_pool { 4068 Coro::async_pool {
3812 $Coro::current->{desc} = "runtime saver"; 4069 $Coro::current->{desc} = "runtime saver";
3813 write_runtime_sync 4070 write_runtime_sync
3814 or warn "ERROR: unable to write runtime file: $!"; 4071 or error "ERROR: unable to write runtime file: $!";
3815 }; 4072 };
3816 } 4073 }
3817 4074
3818 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4075 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3819 $sig->send; 4076 $sig->send;
3827 4084
3828 if (0) { 4085 if (0) {
3829 if ($NEXT_TICK) { 4086 if ($NEXT_TICK) {
3830 my $jitter = $TICK_START - $NEXT_TICK; 4087 my $jitter = $TICK_START - $NEXT_TICK;
3831 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4088 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3832 warn "jitter $JITTER\n";#d# 4089 debug "jitter $JITTER\n";#d#
3833 } 4090 }
3834 } 4091 }
3835} 4092}
3836 4093
3837{ 4094{
3838 # configure BDB 4095 # configure BDB
3839 4096
3840 BDB::min_parallel 8; 4097 BDB::min_parallel 16;
3841 BDB::max_poll_reqs $TICK * 0.1; 4098 BDB::max_poll_reqs $TICK * 0.1;
3842 $AnyEvent::BDB::WATCHER->priority (1); 4099 $AnyEvent::BDB::WATCHER->priority (1);
3843 4100
3844 unless ($DB_ENV) { 4101 unless ($DB_ENV) {
3845 $DB_ENV = BDB::db_env_create; 4102 $DB_ENV = BDB::db_env_create;
3882 IO::AIO::min_parallel 8; 4139 IO::AIO::min_parallel 8;
3883 IO::AIO::max_poll_time $TICK * 0.1; 4140 IO::AIO::max_poll_time $TICK * 0.1;
3884 undef $AnyEvent::AIO::WATCHER; 4141 undef $AnyEvent::AIO::WATCHER;
3885} 4142}
3886 4143
3887my $_log_backtrace; 4144our $_log_backtrace;
4145our $_log_backtrace_last;
3888 4146
3889sub _log_backtrace { 4147sub _log_backtrace {
3890 my ($msg, @addr) = @_; 4148 my ($msg, @addr) = @_;
3891 4149
3892 $msg =~ s/\n//; 4150 $msg =~ s/\n$//;
3893 4151
4152 if ($_log_backtrace_last eq $msg) {
4153 LOG llevInfo, "[ABT] $msg\n";
4154 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3894 # limit the # of concurrent backtraces 4155 # limit the # of concurrent backtraces
3895 if ($_log_backtrace < 2) { 4156 } elsif ($_log_backtrace < 2) {
4157 $_log_backtrace_last = $msg;
3896 ++$_log_backtrace; 4158 ++$_log_backtrace;
3897 my $perl_bt = Carp::longmess $msg; 4159 my $perl_bt = Carp::longmess $msg;
3898 async { 4160 async {
3899 $Coro::current->{desc} = "abt $msg"; 4161 $Coro::current->{desc} = "abt $msg";
3900 4162
3920 LOG llevInfo, "[ABT] $_\n" for @bt; 4182 LOG llevInfo, "[ABT] $_\n" for @bt;
3921 --$_log_backtrace; 4183 --$_log_backtrace;
3922 }; 4184 };
3923 } else { 4185 } else {
3924 LOG llevInfo, "[ABT] $msg\n"; 4186 LOG llevInfo, "[ABT] $msg\n";
3925 LOG llevInfo, "[ABT] [suppressed]\n"; 4187 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3926 } 4188 }
3927} 4189}
3928 4190
3929# load additional modules 4191# load additional modules
3930eval "use cf::$_" for @EXTRA_MODULES; 4192require "cf/$_.pm" for @EXTRA_MODULES;
4193cf::_connect_to_perl_2;
3931 4194
3932END { cf::emergency_save } 4195END { cf::emergency_save }
3933 4196
39341 41971
3935 4198

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines