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.465 by root, Thu Jan 8 00:54:55 2009 UTC vs.
Revision 1.550 by root, Fri May 14 22:56:47 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 "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
129our @EXTRA_MODULES = qw(pod match mapscript incloader);
130
117our %CFG; 131our %CFG;
118 132
119our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
120our $RUNTIME; 134our $RUNTIME;
121our $NOW; 135our $NOW;
132our $JITTER; # average jitter 146our $JITTER; # average jitter
133our $TICK_START; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
134 148
135our @POST_INIT; 149our @POST_INIT;
136 150
137our $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 :)
138 153
139binmode STDOUT; 154binmode STDOUT;
140binmode STDERR; 155binmode STDERR;
141 156
142# read virtual server time, if available 157# read virtual server time, if available
144 open my $fh, "<", $RUNTIMEFILE 159 open my $fh, "<", $RUNTIMEFILE
145 or die "unable to read $RUNTIMEFILE file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
146 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
147} 162}
148 163
164eval "sub TICK() { $TICK } 1" or die;
165
149mkdir $_ 166mkdir $_
150 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
151 168
152our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
153 170
154sub 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::"} };
155 187
156############################################################################# 188#############################################################################
157 189
158=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
159 191
201from wherever your confdir points to. 233from wherever your confdir points to.
202 234
203=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
204 236
205These 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
206returns 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
207per 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.
208 240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
209=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
210 247
211This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
212C<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
213that call. 250that call.
214 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
215=back 258=back
216 259
217=cut 260=cut
218 261
219BEGIN { 262sub error(@) { LOG llevError, join "", @_ }
220 *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 {
221 my $msg = join "", @_; 269 my $msg = join "", @_;
222 270
223 $msg .= "\n" 271 $msg .= "\n"
224 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
225 273
226 $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;
227 275
228 LOG llevError, $msg; 276 LOG llevWarn, $msg;
229 }; 277};
230}
231 278
232$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
233 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
234 281
235 if ($Coro::current == $Coro::main) {#d# 282 error Carp::longmess $_[0];
283
284 if (in_main) {#d#
236 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
237 return;#d# 286 return;#d#
238 }#d# 287 }#d#
239 288
240 # kill coroutine otherwise 289 # kill coroutine otherwise
241 warn Carp::longmess $_[0];
242 Coro::terminate 290 Coro::terminate
243}; 291};
244
245$SIG{__DIE__} = sub { }; #d#?
246 292
247@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 293@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
248@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 294@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
249@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 295@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
250@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 296@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
264)) { 310)) {
265 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
266} 312}
267 313
268$EV::DIED = sub { 314$EV::DIED = sub {
269 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
270}; 316};
271 317
272############################################################################# 318#############################################################################
273 319
274=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
311our $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
312 358
313sub encode_json($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
314sub decode_json($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
315 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
316=item cf::post_init { BLOCK } 374=item cf::post_init { BLOCK }
317 375
318Execute the given codeblock, I<after> all extensions have been (re-)loaded, 376Execute the given codeblock, I<after> all extensions have been (re-)loaded,
319but I<before> the server starts ticking again. 377but I<before> the server starts ticking again.
320 378
321The cdoeblock will have a single boolean argument to indicate whether this 379The codeblock will have a single boolean argument to indicate whether this
322is a reload or not. 380is a reload or not.
323 381
324=cut 382=cut
325 383
326sub post_init(&) { 384sub post_init(&) {
327 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 }
328} 403}
329 404
330=item cf::lock_wait $string 405=item cf::lock_wait $string
331 406
332Wait until the given lock is available. See cf::lock_acquire. 407Wait until the given lock is available. See cf::lock_acquire.
371} 446}
372 447
373=item cf::periodic $interval, $cb 448=item cf::periodic $interval, $cb
374 449
375Like 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
376get spread over timer. 451get spread over time.
377 452
378=cut 453=cut
379 454
380sub periodic($$) { 455sub periodic($$) {
381 my ($interval, $cb) = @_; 456 my ($interval, $cb) = @_;
398 473
399=cut 474=cut
400 475
401our @SLOT_QUEUE; 476our @SLOT_QUEUE;
402our $SLOT_QUEUE; 477our $SLOT_QUEUE;
478our $SLOT_DECAY = 0.9;
403 479
404$SLOT_QUEUE->cancel if $SLOT_QUEUE; 480$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405$SLOT_QUEUE = Coro::async { 481$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager"); 482 $Coro::current->desc ("timeslot manager");
407 483
408 my $signal = new Coro::Signal; 484 my $signal = new Coro::Signal;
485 my $busy;
409 486
410 while () { 487 while () {
411 next_job: 488 next_job:
489
412 my $avail = cf::till_tick; 490 my $avail = cf::till_tick;
413 if ($avail > 0.01) { 491
414 for (0 .. $#SLOT_QUEUE) { 492 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) { 493 if ($SLOT_QUEUE[$_][0] <= $avail) {
494 $busy = 0;
416 my $job = splice @SLOT_QUEUE, $_, 1, (); 495 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send; 496 $job->[2]->send;
418 Coro::cede; 497 Coro::cede;
419 goto next_job; 498 goto next_job;
420 } 499 } else {
500 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
421 } 501 }
422 } 502 }
423 503
424 if (@SLOT_QUEUE) { 504 if (@SLOT_QUEUE) {
425 # 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
426 push @cf::WAIT_FOR_TICK, $signal; 506 push @cf::WAIT_FOR_TICK, $signal;
427 $signal->wait; 507 $signal->wait;
428 } else { 508 } else {
509 $busy = 0;
429 Coro::schedule; 510 Coro::schedule;
430 } 511 }
431 } 512 }
432}; 513};
433 514
434sub get_slot($;$$) { 515sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main; 516 return if tick_inhibit || $Coro::current == $Coro::main;
436 517
437 my ($time, $pri, $name) = @_; 518 my ($time, $pri, $name) = @_;
438 519
439 $time = $TICK * .6 if $time > $TICK * .6; 520 $time = clamp $time, 0.01, $TICK * .6;
521
440 my $sig = new Coro::Signal; 522 my $sig = new Coro::Signal;
441 523
442 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 524 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 525 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444 $SLOT_QUEUE->ready; 526 $SLOT_QUEUE->ready;
470=cut 552=cut
471 553
472sub sync_job(&) { 554sub sync_job(&) {
473 my ($job) = @_; 555 my ($job) = @_;
474 556
475 if ($Coro::current == $Coro::main) { 557 if (in_main) {
476 my $time = EV::time; 558 my $time = AE::time;
477 559
478 # this is the main coro, too bad, we have to block 560 # this is the main coro, too bad, we have to block
479 # till the operation succeeds, freezing the server :/ 561 # till the operation succeeds, freezing the server :/
480 562
481 LOG llevError, Carp::longmess "sync job";#d# 563 #LOG llevError, Carp::longmess "sync job";#d#
482 564
483 my $freeze_guard = freeze_mainloop; 565 my $freeze_guard = freeze_mainloop;
484 566
485 my $busy = 1; 567 my $busy = 1;
486 my @res; 568 my @res;
487 569
488 (async { 570 (async {
489 $Coro::current->desc ("sync job coro"); 571 $Coro::current->desc ("sync job coro");
490 @res = eval { $job->() }; 572 @res = eval { $job->() };
491 warn $@ if $@; 573 error $@ if $@;
492 undef $busy; 574 undef $busy;
493 })->prio (Coro::PRIO_MAX); 575 })->prio (Coro::PRIO_MAX);
494 576
495 while ($busy) { 577 while ($busy) {
496 if (Coro::nready) { 578 if (Coro::nready) {
498 } else { 580 } else {
499 EV::loop EV::LOOP_ONESHOT; 581 EV::loop EV::LOOP_ONESHOT;
500 } 582 }
501 } 583 }
502 584
503 my $time = EV::time - $time; 585 my $time = AE::time - $time;
504 586
505 $TICK_START += $time; # do not account sync jobs to server load 587 $TICK_START += $time; # do not account sync jobs to server load
506 588
507 wantarray ? @res : $res[0] 589 wantarray ? @res : $res[0]
508 } else { 590 } else {
530 $EXT_CORO{$coro+0} = $coro; 612 $EXT_CORO{$coro+0} = $coro;
531 613
532 $coro 614 $coro
533} 615}
534 616
535=item fork_call { }, $args 617=item fork_call { }, @args
536 618
537Executes the given code block with the given arguments in a seperate 619Executes the given code block with the given arguments in a seperate
538process, returning the results. Everything must be serialisable with 620process, returning the results. Everything must be serialisable with
539Coro::Storable. May, of course, block. Note that the executed sub may 621Coro::Storable. May, of course, block. Note that the executed sub may
540never block itself or use any form of event handling. 622never block itself or use any form of event handling.
541 623
542=cut 624=cut
543 625
626sub post_fork {
627 reset_signals;
628}
629
544sub fork_call(&@) { 630sub fork_call(&@) {
545 my ($cb, @args) = @_; 631 my ($cb, @args) = @_;
546 632
547 # 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,
548 # otherwise perl prematurely frees the stuff :/ 634 # otherwise perl prematurely frees the stuff :/
549 # TODO: investigate and fix (likely this will be rather laborious) 635 # TODO: investigate and fix (likely this will be rather laborious)
550 636
551 my @res = Coro::Util::fork_eval { 637 my @res = Coro::Util::fork_eval {
552 reset_signals; 638 cf::post_fork;
553 &$cb 639 &$cb
554 }, @args; 640 } @args;
555 641
556 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 )
557} 654}
558 655
559=item $coin = coin_from_name $name 656=item $coin = coin_from_name $name
560 657
561=cut 658=cut
598within each server. 695within each server.
599 696
600=cut 697=cut
601 698
602sub db_table($) { 699sub db_table($) {
700 cf::error "db_get called from main context"
701 if $Coro::current == $Coro::main;
702
603 my ($name) = @_; 703 my ($name) = @_;
604 my $db = BDB::db_create $DB_ENV; 704 my $db = BDB::db_create $DB_ENV;
605 705
606 eval { 706 eval {
607 $db->set_flags (BDB::CHKSUM); 707 $db->set_flags (BDB::CHKSUM);
617} 717}
618 718
619our $DB; 719our $DB;
620 720
621sub db_init { 721sub db_init {
622 cf::sync_job {
623 $DB ||= db_table "db"; 722 $DB ||= db_table "db";
624 };
625} 723}
626 724
627sub db_get($$) { 725sub db_get($$) {
628 my $key = "$_[0]/$_[1]"; 726 my $key = "$_[0]/$_[1]";
629 727
630 cf::sync_job { 728 cf::error "db_get called from main context"
729 if $Coro::current == $Coro::main;
730
631 BDB::db_get $DB, undef, $key, my $data; 731 BDB::db_get $DB, undef, $key, my $data;
632 732
633 $! ? () 733 $! ? ()
634 : $data 734 : $data
635 }
636} 735}
637 736
638sub db_put($$$) { 737sub db_put($$$) {
639 BDB::dbreq_pri 4; 738 BDB::dbreq_pri 4;
640 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 739 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
696 795
697 my $t1 = Time::HiRes::time; 796 my $t1 = Time::HiRes::time;
698 my $data = $process->(\@data); 797 my $data = $process->(\@data);
699 my $t2 = Time::HiRes::time; 798 my $t2 = Time::HiRes::time;
700 799
701 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 800 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
702 801
703 db_put cache => "$id/data", $data; 802 db_put cache => "$id/data", $data;
704 db_put cache => "$id/md5" , $md5; 803 db_put cache => "$id/md5" , $md5;
705 db_put cache => "$id/meta", $meta; 804 db_put cache => "$id/meta", $meta;
706 805
716 815
717=cut 816=cut
718 817
719sub datalog($@) { 818sub datalog($@) {
720 my ($type, %kv) = @_; 819 my ($type, %kv) = @_;
721 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 820 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
722} 821}
723 822
724=back 823=back
725 824
726=cut 825=cut
921 1020
922 } elsif (exists $cb_id{$type}) { 1021 } elsif (exists $cb_id{$type}) {
923 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1022 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
924 1023
925 } elsif (ref $type) { 1024 } elsif (ref $type) {
926 warn "attaching objects not supported, ignoring.\n"; 1025 error "attaching objects not supported, ignoring.\n";
927 1026
928 } else { 1027 } else {
929 shift @arg; 1028 shift @arg;
930 warn "attach argument '$type' not supported, ignoring.\n"; 1029 error "attach argument '$type' not supported, ignoring.\n";
931 } 1030 }
932 } 1031 }
933} 1032}
934 1033
935sub _object_attach { 1034sub _object_attach {
945 _attach $registry, $klass, @attach; 1044 _attach $registry, $klass, @attach;
946 } 1045 }
947 1046
948 $obj->{$name} = \%arg; 1047 $obj->{$name} = \%arg;
949 } else { 1048 } else {
950 warn "object uses attachment '$name' which is not available, postponing.\n"; 1049 info "object uses attachment '$name' which is not available, postponing.\n";
951 } 1050 }
952 1051
953 $obj->{_attachment}{$name} = undef; 1052 $obj->{_attachment}{$name} = undef;
954} 1053}
955 1054
1014 1113
1015 for (@$callbacks) { 1114 for (@$callbacks) {
1016 eval { &{$_->[1]} }; 1115 eval { &{$_->[1]} };
1017 1116
1018 if ($@) { 1117 if ($@) {
1019 warn "$@";
1020 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1118 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1021 override; 1119 override;
1022 } 1120 }
1023 1121
1024 return 1 if $override; 1122 return 1 if $override;
1025 } 1123 }
1104 for (@$attach) { 1202 for (@$attach) {
1105 my ($klass, @attach) = @$_; 1203 my ($klass, @attach) = @$_;
1106 _attach $registry, $klass, @attach; 1204 _attach $registry, $klass, @attach;
1107 } 1205 }
1108 } else { 1206 } else {
1109 warn "object uses attachment '$name' that is not available, postponing.\n"; 1207 info "object uses attachment '$name' that is not available, postponing.\n";
1110 } 1208 }
1111 } 1209 }
1112} 1210}
1113 1211
1114cf::attachable->attach ( 1212cf::attachable->attach (
1141 my ($filename, $rdata, $objs) = @_; 1239 my ($filename, $rdata, $objs) = @_;
1142 1240
1143 sync_job { 1241 sync_job {
1144 if (length $$rdata) { 1242 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename); 1243 utf8::decode (my $decname = $filename);
1146 warn sprintf "saving %s (%d,%d)\n", 1244 trace sprintf "saving %s (%d,%d)\n",
1147 $decname, length $$rdata, scalar @$objs; 1245 $decname, length $$rdata, scalar @$objs
1246 if $VERBOSE_IO;
1148 1247
1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1248 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150 aio_chmod $fh, SAVE_MODE; 1249 aio_chmod $fh, SAVE_MODE;
1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1250 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152 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 }
1153 aio_close $fh; 1255 aio_close $fh;
1154 1256
1155 if (@$objs) { 1257 if (@$objs) {
1156 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) {
1157 aio_chmod $fh, SAVE_MODE; 1259 aio_chmod $fh, SAVE_MODE;
1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1260 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159 aio_write $fh, 0, (length $data), $data, 0; 1261 aio_write $fh, 0, (length $data), $data, 0;
1160 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 }
1161 aio_close $fh; 1266 aio_close $fh;
1162 aio_rename "$filename.pst~", "$filename.pst"; 1267 aio_rename "$filename.pst~", "$filename.pst";
1163 } 1268 }
1164 } else { 1269 } else {
1165 aio_unlink "$filename.pst"; 1270 aio_unlink "$filename.pst";
1168 aio_rename "$filename~", $filename; 1273 aio_rename "$filename~", $filename;
1169 1274
1170 $filename =~ s%/[^/]+$%%; 1275 $filename =~ s%/[^/]+$%%;
1171 aio_pathsync $filename if $cf::USE_FSYNC; 1276 aio_pathsync $filename if $cf::USE_FSYNC;
1172 } else { 1277 } else {
1173 warn "unable to save objects: $filename~: $!\n"; 1278 error "unable to save objects: $filename~: $!\n";
1174 } 1279 }
1175 } else { 1280 } else {
1176 aio_unlink $filename; 1281 aio_unlink $filename;
1177 aio_unlink "$filename.pst"; 1282 aio_unlink "$filename.pst";
1178 } 1283 }
1202 my $st = eval { Coro::Storable::thaw $av }; 1307 my $st = eval { Coro::Storable::thaw $av };
1203 $av = $st->{objs}; 1308 $av = $st->{objs};
1204 } 1309 }
1205 1310
1206 utf8::decode (my $decname = $filename); 1311 utf8::decode (my $decname = $filename);
1207 warn sprintf "loading %s (%d,%d)\n", 1312 trace sprintf "loading %s (%d,%d)\n",
1208 $decname, length $data, scalar @{$av || []}; 1313 $decname, length $data, scalar @{$av || []}
1314 if $VERBOSE_IO;
1209 1315
1210 ($data, $av) 1316 ($data, $av)
1211} 1317}
1212 1318
1213=head2 COMMAND CALLBACKS 1319=head2 COMMAND CALLBACKS
1272} 1378}
1273 1379
1274use File::Glob (); 1380use File::Glob ();
1275 1381
1276cf::player->attach ( 1382cf::player->attach (
1277 on_command => sub { 1383 on_unknown_command => sub {
1278 my ($pl, $name, $params) = @_; 1384 my ($pl, $name, $params) = @_;
1279 1385
1280 my $cb = $COMMAND{$name} 1386 my $cb = $COMMAND{$name}
1281 or return; 1387 or return;
1282 1388
1305 1411
1306 $pl->ext_reply ($reply, @reply) 1412 $pl->ext_reply ($reply, @reply)
1307 if $reply; 1413 if $reply;
1308 1414
1309 } else { 1415 } else {
1310 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1416 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1311 } 1417 }
1312 1418
1313 cf::override; 1419 cf::override;
1314 }, 1420 },
1315); 1421);
1316 1422
1317# "readahead" all extensions 1423# "readahead" all extensions
1318sub cache_extensions { 1424sub cache_extensions {
1319 my $grp = IO::AIO::aio_group; 1425 my $grp = IO::AIO::aio_group;
1320 1426
1321 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1427 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1322 for (grep /\.ext$/, @{$_[0]}) { 1428 for (grep /\.ext$/, @{$_[0]}) {
1323 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1429 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1324 } 1430 }
1325 }; 1431 };
1326 1432
1327 $grp 1433 $grp
1328} 1434}
1329 1435
1330sub load_extensions { 1436sub load_extensions {
1437 info "loading extensions...";
1438
1331 cf::sync_job { 1439 cf::sync_job {
1332 my %todo; 1440 my %todo;
1333 1441
1334 for my $path (<$LIBDIR/*.ext>) { 1442 for my $path (<$LIBDIR/*.ext>) {
1335 next unless -r $path; 1443 next unless -r $path;
1353 1461
1354 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1462 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1355 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1463 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1356 1464
1357 $ext{source} = 1465 $ext{source} =
1358 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1466 "package $pkg; use common::sense;\n"
1359 . "#line 1 \"$path\"\n{\n" 1467 . "#line 1 \"$path\"\n{\n"
1360 . $source 1468 . $source
1361 . "\n};\n1"; 1469 . "\n};\n1";
1362 1470
1363 $todo{$base} = \%ext; 1471 $todo{$base} = \%ext;
1364 } 1472 }
1365 1473
1474 my $pass = 0;
1366 my %done; 1475 my %done;
1367 while (%todo) { 1476 while (%todo) {
1368 my $progress; 1477 my $progress;
1369 1478
1479 ++$pass;
1480
1481 ext:
1370 while (my ($k, $v) = each %todo) { 1482 while (my ($k, $v) = each %todo) {
1371 for (split /,\s*/, $v->{meta}{depends}) { 1483 for (split /,\s*/, $v->{meta}{depends}) {
1372 goto skip 1484 next ext
1373 unless exists $done{$_}; 1485 unless exists $done{$_};
1374 } 1486 }
1375 1487
1376 warn "... loading '$k' into '$v->{pkg}'\n"; 1488 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1377 1489
1378 unless (eval $v->{source}) { 1490 my $active = eval $v->{source};
1491
1492 if (length $@) {
1379 my $msg = $@ ? "$v->{path}: $@\n" 1493 error "$v->{path}: $@\n";
1380 : "$v->{base}: extension inactive.\n";
1381 1494
1382 if (exists $v->{meta}{mandatory}) {
1383 warn $msg;
1384 cf::cleanup "mandatory extension failed to load, exiting."; 1495 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1385 } 1496 if exists $v->{meta}{mandatory};
1386 1497
1387 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;
1388 } 1507 }
1389
1390 $done{$k} = delete $todo{$k};
1391 push @EXTS, $v->{pkg};
1392 $progress = 1;
1393 } 1508 }
1394 1509
1395 skip: 1510 unless ($progress) {
1396 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1511 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1397 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 }
1398 } 1518 }
1399 }; 1519 };
1400} 1520}
1401 1521
1402############################################################################# 1522#############################################################################
1486 $cf::PLAYER{$login} = $pl 1606 $cf::PLAYER{$login} = $pl
1487 } 1607 }
1488 } 1608 }
1489} 1609}
1490 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
1491sub save($) { 1624sub save($) {
1492 my ($pl) = @_; 1625 my ($pl) = @_;
1493 1626
1494 return if $pl->{deny_save}; 1627 return if $pl->{deny_save};
1495 1628
1500 1633
1501 aio_mkdir playerdir $pl, 0770; 1634 aio_mkdir playerdir $pl, 0770;
1502 $pl->{last_save} = $cf::RUNTIME; 1635 $pl->{last_save} = $cf::RUNTIME;
1503 1636
1504 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];
1505 1641
1506 $pl->save_pl ($path); 1642 $pl->save_pl ($path);
1507 cf::cede_to_tick; 1643 cf::cede_to_tick;
1508} 1644}
1509 1645
1543 my $name = $pl->ob->name; 1679 my $name = $pl->ob->name;
1544 1680
1545 $pl->{deny_save} = 1; 1681 $pl->{deny_save} = 1;
1546 $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
1547 1683
1548 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1684 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1549 $pl->deactivate; 1685 $pl->deactivate;
1686
1550 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;
1551 $pl->ob->check_score;
1552 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1688 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1689 ext::highscore::check ($pl->ob);
1690
1553 $pl->ns->destroy if $pl->ns; 1691 $pl->ns->destroy if $pl->ns;
1554 1692
1555 my $path = playerdir $pl; 1693 my $path = playerdir $pl;
1556 my $temp = "$path~$cf::RUNTIME~deleting~"; 1694 my $temp = "$path~$cf::RUNTIME~deleting~";
1557 aio_rename $path, $temp; 1695 aio_rename $path, $temp;
1611 \@logins 1749 \@logins
1612} 1750}
1613 1751
1614=item $player->maps 1752=item $player->maps
1615 1753
1754=item cf::player::maps $login
1755
1616Returns an arrayref of map paths that are private for this 1756Returns an arrayref of map paths that are private for this
1617player. May block. 1757player. May block.
1618 1758
1619=cut 1759=cut
1620 1760
1682=cut 1822=cut
1683 1823
1684sub find_by_path($) { 1824sub find_by_path($) {
1685 my ($path) = @_; 1825 my ($path) = @_;
1686 1826
1827 $path =~ s/^~[^\/]*//; # skip ~login
1828
1687 my ($match, $specificity); 1829 my ($match, $specificity);
1688 1830
1689 for my $region (list) { 1831 for my $region (list) {
1690 if ($region->{match} && $path =~ $region->{match}) { 1832 if ($region->{match} && $path =~ $region->{match}) {
1691 ($match, $specificity) = ($region, $region->specificity) 1833 ($match, $specificity) = ($region, $region->specificity)
1722 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
1723 1865
1724 # mit "rum" bekleckern, nicht 1866 # mit "rum" bekleckern, nicht
1725 $self->_create_random_map ( 1867 $self->_create_random_map (
1726 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1868 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1727 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1869 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1728 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1870 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1729 $rmp->{exit_on_final_map}, 1871 $rmp->{exit_on_final_map},
1730 $rmp->{xsize}, $rmp->{ysize}, 1872 $rmp->{xsize}, $rmp->{ysize},
1731 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1873 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1732 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1874 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1747 1889
1748sub register { 1890sub register {
1749 my (undef, $regex, $prio) = @_; 1891 my (undef, $regex, $prio) = @_;
1750 my $pkg = caller; 1892 my $pkg = caller;
1751 1893
1752 no strict;
1753 push @{"$pkg\::ISA"}, __PACKAGE__; 1894 push @{"$pkg\::ISA"}, __PACKAGE__;
1754 1895
1755 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1896 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1756} 1897}
1757 1898
1758# also paths starting with '/' 1899# also paths starting with '/'
1759$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1900$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1760 1901
1761sub thawer_merge { 1902sub thawer_merge {
1762 my ($self, $merge) = @_; 1903 my ($self, $merge) = @_;
1763 1904
1764 # we have to keep some variables in memory intact 1905 # we have to keep some variables in memory intact
1769} 1910}
1770 1911
1771sub normalise { 1912sub normalise {
1772 my ($path, $base) = @_; 1913 my ($path, $base) = @_;
1773 1914
1774 $path = "$path"; # make sure its a string 1915 $path = "$path"; # make sure it's a string
1775 1916
1776 $path =~ s/\.map$//; 1917 $path =~ s/\.map$//;
1777 1918
1778 # map plan: 1919 # map plan:
1779 # 1920 #
1818 $self->init; # pass $1 etc. 1959 $self->init; # pass $1 etc.
1819 return $self; 1960 return $self;
1820 } 1961 }
1821 } 1962 }
1822 1963
1823 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1964 Carp::cluck "unable to resolve path '$path' (base '$base')";
1824 () 1965 ()
1825} 1966}
1826 1967
1827sub init { 1968sub init {
1828 my ($self) = @_; 1969 my ($self) = @_;
1950} 2091}
1951 2092
1952sub find; 2093sub find;
1953sub find { 2094sub find {
1954 my ($path, $origin) = @_; 2095 my ($path, $origin) = @_;
2096
2097 cf::cede_to_tick;
1955 2098
1956 $path = normalise $path, $origin && $origin->path; 2099 $path = normalise $path, $origin && $origin->path;
1957 2100
1958 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2101 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1959 my $guard2 = cf::lock_acquire "map_find:$path"; 2102 my $guard2 = cf::lock_acquire "map_find:$path";
1978 2121
1979 $cf::MAP{$path} = $map 2122 $cf::MAP{$path} = $map
1980 } 2123 }
1981} 2124}
1982 2125
1983sub pre_load { } 2126sub pre_load { }
1984sub post_load { } 2127#sub post_load { } # XS
1985 2128
1986sub load { 2129sub load {
1987 my ($self) = @_; 2130 my ($self) = @_;
1988 2131
1989 local $self->{deny_reset} = 1; # loading can take a long time 2132 local $self->{deny_reset} = 1; # loading can take a long time
2046 } 2189 }
2047 2190
2048 $self->post_load; 2191 $self->post_load;
2049} 2192}
2050 2193
2194# customize the map for a given player, i.e.
2195# return the _real_ map. used by e.g. per-player
2196# maps to change the path to ~playername/mappath
2051sub customise_for { 2197sub customise_for {
2052 my ($self, $ob) = @_; 2198 my ($self, $ob) = @_;
2053 2199
2054 return find "~" . $ob->name . "/" . $self->{path} 2200 return find "~" . $ob->name . "/" . $self->{path}
2055 if $self->per_player; 2201 if $self->per_player;
2071 or next; 2217 or next;
2072 $neigh = find $neigh, $map 2218 $neigh = find $neigh, $map
2073 or next; 2219 or next;
2074 $neigh->load; 2220 $neigh->load;
2075 2221
2222 # now find the diagonal neighbours
2076 push @neigh, 2223 push @neigh,
2077 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2224 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2078 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2225 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2079 } 2226 }
2080 2227
2087} 2234}
2088 2235
2089sub find_sync { 2236sub find_sync {
2090 my ($path, $origin) = @_; 2237 my ($path, $origin) = @_;
2091 2238
2092 cf::sync_job { find $path, $origin } 2239 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2240 if $Coro::current == $Coro::main;
2241
2242 find $path, $origin
2093} 2243}
2094 2244
2095sub do_load_sync { 2245sub do_load_sync {
2096 my ($map) = @_; 2246 my ($map) = @_;
2097 2247
2098 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2248 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2099 if $Coro::current == $Coro::main; 2249 if $Coro::current == $Coro::main;
2100 2250
2101 cf::sync_job { $map->load }; 2251 $map->load;
2102} 2252}
2103 2253
2104our %MAP_PREFETCH; 2254our %MAP_PREFETCH;
2105our $MAP_PREFETCHER = undef; 2255our $MAP_PREFETCHER = undef;
2106 2256
2132 $MAP_PREFETCHER->prio (6); 2282 $MAP_PREFETCHER->prio (6);
2133 2283
2134 () 2284 ()
2135} 2285}
2136 2286
2287# common code, used by both ->save and ->swapout
2137sub save { 2288sub _save {
2138 my ($self) = @_; 2289 my ($self) = @_;
2139
2140 my $lock = cf::lock_acquire "map_data:$self->{path}";
2141 2290
2142 $self->{last_save} = $cf::RUNTIME; 2291 $self->{last_save} = $cf::RUNTIME;
2143 2292
2144 return unless $self->dirty; 2293 return unless $self->dirty;
2145 2294
2165 } else { 2314 } else {
2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2315 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2167 } 2316 }
2168} 2317}
2169 2318
2319sub save {
2320 my ($self) = @_;
2321
2322 my $lock = cf::lock_acquire "map_data:$self->{path}";
2323
2324 $self->_save;
2325}
2326
2170sub swap_out { 2327sub swap_out {
2171 my ($self) = @_; 2328 my ($self) = @_;
2172 2329
2173 # save first because save cedes
2174 $self->save;
2175
2176 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2330 my $lock = cf::lock_acquire "map_data:$self->{path}";
2177 2331
2178 return if $self->players;
2179 return if $self->in_memory != cf::MAP_ACTIVE; 2332 return if $self->in_memory != cf::MAP_ACTIVE;
2180 return if $self->{deny_save}; 2333 return if $self->{deny_save};
2334 return if $self->players;
2181 2335
2336 # first deactivate the map and "unlink" it from the core
2337 $self->deactivate;
2338 $_->clear_links_to ($self) for values %cf::MAP;
2182 $self->in_memory (cf::MAP_SWAPPED); 2339 $self->in_memory (cf::MAP_SWAPPED);
2340
2341 # then atomically save
2342 $self->_save;
2343
2344 # then free the map
2345 $self->clear;
2346}
2347
2348sub reset_at {
2349 my ($self) = @_;
2350
2351 # TODO: safety, remove and allow resettable per-player maps
2352 return 1e99 if $self->{deny_reset};
2353
2354 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2355 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2356
2357 $time + $to
2358}
2359
2360sub should_reset {
2361 my ($self) = @_;
2362
2363 $self->reset_at <= $cf::RUNTIME
2364}
2365
2366sub reset {
2367 my ($self) = @_;
2368
2369 my $lock = cf::lock_acquire "map_data:$self->{path}";
2370
2371 return if $self->players;
2372
2373 cf::trace "resetting map ", $self->path, "\n";
2374
2375 $self->in_memory (cf::MAP_SWAPPED);
2376
2377 # need to save uniques path
2378 unless ($self->{deny_save}) {
2379 my $uniq = $self->uniq_path; utf8::encode $uniq;
2380
2381 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2382 if $uniq;
2383 }
2384
2385 delete $cf::MAP{$self->path};
2183 2386
2184 $self->deactivate; 2387 $self->deactivate;
2185 $_->clear_links_to ($self) for values %cf::MAP; 2388 $_->clear_links_to ($self) for values %cf::MAP;
2186 $self->clear; 2389 $self->clear;
2187}
2188
2189sub reset_at {
2190 my ($self) = @_;
2191
2192 # TODO: safety, remove and allow resettable per-player maps
2193 return 1e99 if $self->{deny_reset};
2194
2195 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2196 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2197
2198 $time + $to
2199}
2200
2201sub should_reset {
2202 my ($self) = @_;
2203
2204 $self->reset_at <= $cf::RUNTIME
2205}
2206
2207sub reset {
2208 my ($self) = @_;
2209
2210 my $lock = cf::lock_acquire "map_data:$self->{path}";
2211
2212 return if $self->players;
2213
2214 warn "resetting map ", $self->path;
2215
2216 $self->in_memory (cf::MAP_SWAPPED);
2217
2218 # need to save uniques path
2219 unless ($self->{deny_save}) {
2220 my $uniq = $self->uniq_path; utf8::encode $uniq;
2221
2222 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2223 if $uniq;
2224 }
2225
2226 delete $cf::MAP{$self->path};
2227
2228 $self->deactivate;
2229 $_->clear_links_to ($self) for values %cf::MAP;
2230 $self->clear;
2231 2390
2232 $self->unlink_save; 2391 $self->unlink_save;
2233 $self->destroy; 2392 $self->destroy;
2234} 2393}
2235 2394
2243 2402
2244 delete $cf::MAP{$self->path}; 2403 delete $cf::MAP{$self->path};
2245 2404
2246 $self->unlink_save; 2405 $self->unlink_save;
2247 2406
2248 bless $self, "cf::map"; 2407 bless $self, "cf::map::wrap";
2249 delete $self->{deny_reset}; 2408 delete $self->{deny_reset};
2250 $self->{deny_save} = 1; 2409 $self->{deny_save} = 1;
2251 $self->reset_timeout (1); 2410 $self->reset_timeout (1);
2252 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2411 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2253 2412
2310 : normalise $_ 2469 : normalise $_
2311 } @{ aio_readdir $UNIQUEDIR or [] } 2470 } @{ aio_readdir $UNIQUEDIR or [] }
2312 ] 2471 ]
2313} 2472}
2314 2473
2474=item cf::map::static_maps
2475
2476Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2477file in the shared directory excluding F</styles> and F</editor>). May
2478block.
2479
2480=cut
2481
2482sub static_maps() {
2483 my @dirs = "";
2484 my @maps;
2485
2486 while (@dirs) {
2487 my $dir = shift @dirs;
2488
2489 next if $dir eq "/styles" || $dir eq "/editor";
2490
2491 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2492 or return;
2493
2494 for (@$files) {
2495 s/\.map$// or next;
2496 utf8::decode $_;
2497 push @maps, "$dir/$_";
2498 }
2499
2500 push @dirs, map "$dir/$_", @$dirs;
2501 }
2502
2503 \@maps
2504}
2505
2315=back 2506=back
2316 2507
2317=head3 cf::object 2508=head3 cf::object
2318 2509
2319=cut 2510=cut
2384 2575
2385our $SAY_CHANNEL = { 2576our $SAY_CHANNEL = {
2386 id => "say", 2577 id => "say",
2387 title => "Map", 2578 title => "Map",
2388 reply => "say ", 2579 reply => "say ",
2389 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2580 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2390}; 2581};
2391 2582
2392our $CHAT_CHANNEL = { 2583our $CHAT_CHANNEL = {
2393 id => "chat", 2584 id => "chat",
2394 title => "Chat", 2585 title => "Chat",
2451 2642
2452Freezes the player and moves him/her to a special map (C<{link}>). 2643Freezes the player and moves him/her to a special map (C<{link}>).
2453 2644
2454The player should be reasonably safe there for short amounts of time (e.g. 2645The player should be reasonably safe there for short amounts of time (e.g.
2455for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2646for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2456though, as the palyer cannot control the character while it is on the link 2647though, as the player cannot control the character while it is on the link
2457map. 2648map.
2458 2649
2459Will never block. 2650Will never block.
2460 2651
2461=item $player_object->leave_link ($map, $x, $y) 2652=item $player_object->leave_link ($map, $x, $y)
2482sub cf::object::player::enter_link { 2673sub cf::object::player::enter_link {
2483 my ($self) = @_; 2674 my ($self) = @_;
2484 2675
2485 $self->deactivate_recursive; 2676 $self->deactivate_recursive;
2486 2677
2678 ++$self->{_link_recursion};
2679
2487 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2680 return if UNIVERSAL::isa $self->map, "ext::map_link";
2488 2681
2489 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2682 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2490 if $self->map && $self->map->{path} ne "{link}"; 2683 if $self->map && $self->map->{path} ne "{link}";
2491 2684
2492 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2685 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2493} 2686}
2494 2687
2495sub cf::object::player::leave_link { 2688sub cf::object::player::leave_link {
2496 my ($self, $map, $x, $y) = @_; 2689 my ($self, $map, $x, $y) = @_;
2497 2690
2514 ($x, $y) = (-1, -1) 2707 ($x, $y) = (-1, -1)
2515 unless (defined $x) && (defined $y); 2708 unless (defined $x) && (defined $y);
2516 2709
2517 # use -1 or undef as default coordinates, not 0, 0 2710 # use -1 or undef as default coordinates, not 0, 0
2518 ($x, $y) = ($map->enter_x, $map->enter_y) 2711 ($x, $y) = ($map->enter_x, $map->enter_y)
2519 if $x <=0 && $y <= 0; 2712 if $x <= 0 && $y <= 0;
2520 2713
2521 $map->load; 2714 $map->load;
2522 $map->load_neighbours; 2715 $map->load_neighbours;
2523 2716
2524 return unless $self->contr->active; 2717 return unless $self->contr->active;
2525 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2526 $self->activate_recursive;
2527 2718
2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2719 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2529 $self->enter_map ($map, $x, $y); 2720 if ($self->enter_map ($map, $x, $y)) {
2530} 2721 # entering was successful
2722 delete $self->{_link_recursion};
2723 # only activate afterwards, to support waiting in hooks
2724 $self->activate_recursive;
2725 }
2531 2726
2727}
2728
2532=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2729=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2533 2730
2534Moves the player to the given map-path and coordinates by first freezing 2731Moves the player to the given map-path and coordinates by first freezing
2535her, loading and preparing them map, calling the provided $check callback 2732her, loading and preparing them map, calling the provided $check callback
2536that has to return the map if sucecssful, and then unfreezes the player on 2733that has to return the map if sucecssful, and then unfreezes the player on
2537the new (success) or old (failed) map position. In either case, $done will 2734the new (success) or old (failed) map position. In either case, $done will
2544 2741
2545our $GOTOGEN; 2742our $GOTOGEN;
2546 2743
2547sub cf::object::player::goto { 2744sub cf::object::player::goto {
2548 my ($self, $path, $x, $y, $check, $done) = @_; 2745 my ($self, $path, $x, $y, $check, $done) = @_;
2746
2747 if ($self->{_link_recursion} >= $MAX_LINKS) {
2748 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2749 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2750 ($path, $x, $y) = @$EMERGENCY_POSITION;
2751 }
2549 2752
2550 # do generation counting so two concurrent goto's will be executed in-order 2753 # do generation counting so two concurrent goto's will be executed in-order
2551 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2754 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2552 2755
2553 $self->enter_link; 2756 $self->enter_link;
2577 my $map = eval { 2780 my $map = eval {
2578 my $map = defined $path ? cf::map::find $path : undef; 2781 my $map = defined $path ? cf::map::find $path : undef;
2579 2782
2580 if ($map) { 2783 if ($map) {
2581 $map = $map->customise_for ($self); 2784 $map = $map->customise_for ($self);
2582 $map = $check->($map) if $check && $map; 2785 $map = $check->($map, $x, $y, $self) if $check && $map;
2583 } else { 2786 } else {
2584 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2787 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2585 } 2788 }
2586 2789
2587 $map 2790 $map
2595 if ($gen == $self->{_goto_generation}) { 2798 if ($gen == $self->{_goto_generation}) {
2596 delete $self->{_goto_generation}; 2799 delete $self->{_goto_generation};
2597 $self->leave_link ($map, $x, $y); 2800 $self->leave_link ($map, $x, $y);
2598 } 2801 }
2599 2802
2600 $done->() if $done; 2803 $done->($self) if $done;
2601 })->prio (1); 2804 })->prio (1);
2602} 2805}
2603 2806
2604=item $player_object->enter_exit ($exit_object) 2807=item $player_object->enter_exit ($exit_object)
2605 2808
2698 $self->message ("Something went wrong deep within the deliantra server. " 2901 $self->message ("Something went wrong deep within the deliantra server. "
2699 . "I'll try to bring you back to the map you were before. " 2902 . "I'll try to bring you back to the map you were before. "
2700 . "Please report this to the dungeon master!", 2903 . "Please report this to the dungeon master!",
2701 cf::NDI_UNIQUE | cf::NDI_RED); 2904 cf::NDI_UNIQUE | cf::NDI_RED);
2702 2905
2703 warn "ERROR in enter_exit: $@"; 2906 error "ERROR in enter_exit: $@";
2704 $self->leave_link; 2907 $self->leave_link;
2705 } 2908 }
2706 })->prio (1); 2909 })->prio (1);
2707} 2910}
2708 2911
2720sub cf::client::send_drawinfo { 2923sub cf::client::send_drawinfo {
2721 my ($self, $text, $flags) = @_; 2924 my ($self, $text, $flags) = @_;
2722 2925
2723 utf8::encode $text; 2926 utf8::encode $text;
2724 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2927 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2928}
2929
2930=item $client->send_big_packet ($pkt)
2931
2932Like C<send_packet>, but tries to compress large packets, and fragments
2933them as required.
2934
2935=cut
2936
2937our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2938
2939sub cf::client::send_big_packet {
2940 my ($self, $pkt) = @_;
2941
2942 # try lzf for large packets
2943 $pkt = "lzf " . Compress::LZF::compress $pkt
2944 if 1024 <= length $pkt and $self->{can_lzf};
2945
2946 # split very large packets
2947 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2948 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2949 $pkt = "frag";
2950 }
2951
2952 $self->send_packet ($pkt);
2725} 2953}
2726 2954
2727=item $client->send_msg ($channel, $msg, $color, [extra...]) 2955=item $client->send_msg ($channel, $msg, $color, [extra...])
2728 2956
2729Send a drawinfo or msg packet to the client, formatting the msg for the 2957Send a drawinfo or msg packet to the client, formatting the msg for the
2733 2961
2734=cut 2962=cut
2735 2963
2736# non-persistent channels (usually the info channel) 2964# non-persistent channels (usually the info channel)
2737our %CHANNEL = ( 2965our %CHANNEL = (
2966 "c/motd" => {
2967 id => "infobox",
2968 title => "MOTD",
2969 reply => undef,
2970 tooltip => "The message of the day",
2971 },
2738 "c/identify" => { 2972 "c/identify" => {
2739 id => "infobox", 2973 id => "infobox",
2740 title => "Identify", 2974 title => "Identify",
2741 reply => undef, 2975 reply => undef,
2742 tooltip => "Items recently identified", 2976 tooltip => "Items recently identified",
2744 "c/examine" => { 2978 "c/examine" => {
2745 id => "infobox", 2979 id => "infobox",
2746 title => "Examine", 2980 title => "Examine",
2747 reply => undef, 2981 reply => undef,
2748 tooltip => "Signs and other items you examined", 2982 tooltip => "Signs and other items you examined",
2983 },
2984 "c/shopinfo" => {
2985 id => "infobox",
2986 title => "Shop Info",
2987 reply => undef,
2988 tooltip => "What your bargaining skill tells you about the shop",
2749 }, 2989 },
2750 "c/book" => { 2990 "c/book" => {
2751 id => "infobox", 2991 id => "infobox",
2752 title => "Book", 2992 title => "Book",
2753 reply => undef, 2993 reply => undef,
2781 id => "infobox", 3021 id => "infobox",
2782 title => "Skills", 3022 title => "Skills",
2783 reply => undef, 3023 reply => undef,
2784 tooltip => "Shows your experience per skill and item power", 3024 tooltip => "Shows your experience per skill and item power",
2785 }, 3025 },
3026 "c/shopitems" => {
3027 id => "infobox",
3028 title => "Shop Items",
3029 reply => undef,
3030 tooltip => "Shows the items currently for sale in this shop",
3031 },
2786 "c/resistances" => { 3032 "c/resistances" => {
2787 id => "infobox", 3033 id => "infobox",
2788 title => "Resistances", 3034 title => "Resistances",
2789 reply => undef, 3035 reply => undef,
2790 tooltip => "Shows your resistances", 3036 tooltip => "Shows your resistances",
2792 "c/pets" => { 3038 "c/pets" => {
2793 id => "infobox", 3039 id => "infobox",
2794 title => "Pets", 3040 title => "Pets",
2795 reply => undef, 3041 reply => undef,
2796 tooltip => "Shows information abotu your pets/a specific pet", 3042 tooltip => "Shows information abotu your pets/a specific pet",
3043 },
3044 "c/perceiveself" => {
3045 id => "infobox",
3046 title => "Perceive Self",
3047 reply => undef,
3048 tooltip => "You gained detailed knowledge about yourself",
2797 }, 3049 },
2798 "c/uptime" => { 3050 "c/uptime" => {
2799 id => "infobox", 3051 id => "infobox",
2800 title => "Uptime", 3052 title => "Uptime",
2801 reply => undef, 3053 reply => undef,
2857 my $pkt = "msg " 3109 my $pkt = "msg "
2858 . $self->{json_coder}->encode ( 3110 . $self->{json_coder}->encode (
2859 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3111 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2860 ); 3112 );
2861 3113
2862 # try lzf for large packets
2863 $pkt = "lzf " . Compress::LZF::compress $pkt
2864 if 1024 <= length $pkt and $self->{can_lzf};
2865
2866 # split very large packets
2867 if (8192 < length $pkt and $self->{can_lzf}) {
2868 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2869 $pkt = "frag";
2870 }
2871
2872 $self->send_packet ($pkt); 3114 $self->send_big_packet ($pkt);
2873} 3115}
2874 3116
2875=item $client->ext_msg ($type, @msg) 3117=item $client->ext_msg ($type, @msg)
2876 3118
2877Sends an ext event to the client. 3119Sends an ext event to the client.
2880 3122
2881sub cf::client::ext_msg($$@) { 3123sub cf::client::ext_msg($$@) {
2882 my ($self, $type, @msg) = @_; 3124 my ($self, $type, @msg) = @_;
2883 3125
2884 if ($self->extcmd == 2) { 3126 if ($self->extcmd == 2) {
2885 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3127 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2886 } elsif ($self->extcmd == 1) { # TODO: remove 3128 } elsif ($self->extcmd == 1) { # TODO: remove
2887 push @msg, msgtype => "event_$type"; 3129 push @msg, msgtype => "event_$type";
2888 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3130 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2889 } 3131 }
2890} 3132}
2891 3133
2892=item $client->ext_reply ($msgid, @msg) 3134=item $client->ext_reply ($msgid, @msg)
2893 3135
2897 3139
2898sub cf::client::ext_reply($$@) { 3140sub cf::client::ext_reply($$@) {
2899 my ($self, $id, @msg) = @_; 3141 my ($self, $id, @msg) = @_;
2900 3142
2901 if ($self->extcmd == 2) { 3143 if ($self->extcmd == 2) {
2902 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3144 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2903 } elsif ($self->extcmd == 1) { 3145 } elsif ($self->extcmd == 1) {
2904 #TODO: version 1, remove 3146 #TODO: version 1, remove
2905 unshift @msg, msgtype => "reply", msgid => $id; 3147 unshift @msg, msgtype => "reply", msgid => $id;
2906 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3148 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2907 } 3149 }
2908} 3150}
2909 3151
2910=item $success = $client->query ($flags, "text", \&cb) 3152=item $success = $client->query ($flags, "text", \&cb)
2911 3153
2982 3224
2983 $ns->ext_reply ($reply, @reply) 3225 $ns->ext_reply ($reply, @reply)
2984 if $reply; 3226 if $reply;
2985 3227
2986 } else { 3228 } else {
2987 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3229 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2988 } 3230 }
2989 3231
2990 cf::override; 3232 cf::override;
2991 }, 3233 },
2992); 3234);
3012 3254
3013 $coro 3255 $coro
3014} 3256}
3015 3257
3016cf::client->attach ( 3258cf::client->attach (
3017 on_destroy => sub { 3259 on_client_destroy => sub {
3018 my ($ns) = @_; 3260 my ($ns) = @_;
3019 3261
3020 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3262 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3021 }, 3263 },
3022); 3264);
3038our $safe_hole = new Safe::Hole; 3280our $safe_hole = new Safe::Hole;
3039 3281
3040$SIG{FPE} = 'IGNORE'; 3282$SIG{FPE} = 'IGNORE';
3041 3283
3042$safe->permit_only (Opcode::opset qw( 3284$safe->permit_only (Opcode::opset qw(
3043 :base_core :base_mem :base_orig :base_math 3285 :base_core :base_mem :base_orig :base_math :base_loop
3044 grepstart grepwhile mapstart mapwhile 3286 grepstart grepwhile mapstart mapwhile
3045 sort time 3287 sort time
3046)); 3288));
3047 3289
3048# here we export the classes and methods available to script code 3290# here we export the classes and methods available to script code
3052The following functions and methods are available within a safe environment: 3294The following functions and methods are available within a safe environment:
3053 3295
3054 cf::object 3296 cf::object
3055 contr pay_amount pay_player map x y force_find force_add destroy 3297 contr pay_amount pay_player map x y force_find force_add destroy
3056 insert remove name archname title slaying race decrease split 3298 insert remove name archname title slaying race decrease split
3299 value
3057 3300
3058 cf::object::player 3301 cf::object::player
3059 player 3302 player
3060 3303
3061 cf::player 3304 cf::player
3067=cut 3310=cut
3068 3311
3069for ( 3312for (
3070 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3313 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3071 insert remove inv nrof name archname title slaying race 3314 insert remove inv nrof name archname title slaying race
3072 decrease split destroy change_exp)], 3315 decrease split destroy change_exp value msg lore send_msg)],
3073 ["cf::object::player" => qw(player)], 3316 ["cf::object::player" => qw(player)],
3074 ["cf::player" => qw(peaceful)], 3317 ["cf::player" => qw(peaceful send_msg)],
3075 ["cf::map" => qw(trigger)], 3318 ["cf::map" => qw(trigger)],
3076) { 3319) {
3077 no strict 'refs';
3078 my ($pkg, @funs) = @$_; 3320 my ($pkg, @funs) = @$_;
3079 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3321 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3080 for @funs; 3322 for @funs;
3081} 3323}
3082 3324
3097 3339
3098 my $qcode = $code; 3340 my $qcode = $code;
3099 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3341 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3100 $qcode =~ s/\n/\\n/g; 3342 $qcode =~ s/\n/\\n/g;
3101 3343
3344 %vars = (_dummy => 0) unless %vars;
3345
3346 my @res;
3102 local $_; 3347 local $_;
3103 local @safe::cf::_safe_eval_args = values %vars;
3104 3348
3105 my $eval = 3349 my $eval =
3106 "do {\n" 3350 "do {\n"
3107 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3351 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3108 . "#line 0 \"{$qcode}\"\n" 3352 . "#line 0 \"{$qcode}\"\n"
3109 . $code 3353 . $code
3110 . "\n}" 3354 . "\n}"
3111 ; 3355 ;
3112 3356
3357 if ($CFG{safe_eval}) {
3113 sub_generation_inc; 3358 sub_generation_inc;
3359 local @safe::cf::_safe_eval_args = values %vars;
3114 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3360 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3115 sub_generation_inc; 3361 sub_generation_inc;
3362 } else {
3363 local @cf::_safe_eval_args = values %vars;
3364 @res = wantarray ? eval eval : scalar eval $eval;
3365 }
3116 3366
3117 if ($@) { 3367 if ($@) {
3118 warn "$@"; 3368 warn "$@",
3119 warn "while executing safe code '$code'\n"; 3369 "while executing safe code '$code'\n",
3120 warn "with arguments " . (join " ", %vars) . "\n"; 3370 "with arguments " . (join " ", %vars) . "\n";
3121 } 3371 }
3122 3372
3123 wantarray ? @res : $res[0] 3373 wantarray ? @res : $res[0]
3124} 3374}
3125 3375
3139=cut 3389=cut
3140 3390
3141sub register_script_function { 3391sub register_script_function {
3142 my ($fun, $cb) = @_; 3392 my ($fun, $cb) = @_;
3143 3393
3144 no strict 'refs'; 3394 $fun = "safe::$fun" if $CFG{safe_eval};
3145 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3395 *$fun = $safe_hole->wrap ($cb);
3146} 3396}
3147 3397
3148=back 3398=back
3149 3399
3150=cut 3400=cut
3159 # for this (global event?) 3409 # for this (global event?)
3160 %ext::player_env::MUSIC_FACE_CACHE = (); 3410 %ext::player_env::MUSIC_FACE_CACHE = ();
3161 3411
3162 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3412 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3163 3413
3164 warn "loading facedata from $path\n"; 3414 trace "loading facedata from $path\n";
3165 3415
3166 my $facedata;
3167 0 < aio_load $path, $facedata 3416 0 < aio_load $path, my $facedata
3168 or die "$path: $!"; 3417 or die "$path: $!";
3169 3418
3170 $facedata = Coro::Storable::thaw $facedata; 3419 $facedata = Coro::Storable::thaw $facedata;
3171 3420
3172 $facedata->{version} == 2 3421 $facedata->{version} == 2
3173 or cf::cleanup "$path: version mismatch, cannot proceed."; 3422 or cf::cleanup "$path: version mismatch, cannot proceed.";
3174 3423
3175 # patch in the exptable 3424 # patch in the exptable
3425 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3176 $facedata->{resource}{"res/exp_table"} = { 3426 $facedata->{resource}{"res/exp_table"} = {
3177 type => FT_RSRC, 3427 type => FT_RSRC,
3178 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3428 data => $exp_table,
3429 hash => (Digest::MD5::md5 $exp_table),
3179 }; 3430 };
3180 cf::cede_to_tick; 3431 cf::cede_to_tick;
3181 3432
3182 { 3433 {
3183 my $faces = $facedata->{faceinfo}; 3434 my $faces = $facedata->{faceinfo};
3185 while (my ($face, $info) = each %$faces) { 3436 while (my ($face, $info) = each %$faces) {
3186 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3437 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3187 3438
3188 cf::face::set_visibility $idx, $info->{visibility}; 3439 cf::face::set_visibility $idx, $info->{visibility};
3189 cf::face::set_magicmap $idx, $info->{magicmap}; 3440 cf::face::set_magicmap $idx, $info->{magicmap};
3190 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3441 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3191 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3442 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3192 3443
3193 cf::cede_to_tick; 3444 cf::cede_to_tick;
3194 } 3445 }
3195 3446
3196 while (my ($face, $info) = each %$faces) { 3447 while (my ($face, $info) = each %$faces) {
3201 3452
3202 if (my $smooth = cf::face::find $info->{smooth}) { 3453 if (my $smooth = cf::face::find $info->{smooth}) {
3203 cf::face::set_smooth $idx, $smooth; 3454 cf::face::set_smooth $idx, $smooth;
3204 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3455 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3205 } else { 3456 } else {
3206 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3457 error "smooth face '$info->{smooth}' not found for face '$face'";
3207 } 3458 }
3208 3459
3209 cf::cede_to_tick; 3460 cf::cede_to_tick;
3210 } 3461 }
3211 } 3462 }
3220 3471
3221 cf::anim::invalidate_all; # d'oh 3472 cf::anim::invalidate_all; # d'oh
3222 } 3473 }
3223 3474
3224 { 3475 {
3225 # TODO: for gcfclient pleasure, we should give resources
3226 # that gcfclient doesn't grok a >10000 face index.
3227 my $res = $facedata->{resource}; 3476 my $res = $facedata->{resource};
3228 3477
3229 while (my ($name, $info) = each %$res) { 3478 while (my ($name, $info) = each %$res) {
3230 if (defined $info->{type}) { 3479 if (defined $info->{type}) {
3231 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3480 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3232 my $data;
3233 3481
3234 if ($info->{type} & 1) { 3482 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3235 # prepend meta info
3236
3237 my $meta = $enc->encode ({
3238 name => $name,
3239 %{ $info->{meta} || {} },
3240 });
3241
3242 $data = pack "(w/a*)*", $meta, $info->{data};
3243 } else {
3244 $data = $info->{data};
3245 }
3246
3247 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3248 cf::face::set_type $idx, $info->{type}; 3483 cf::face::set_type $idx, $info->{type};
3249 } else { 3484 } else {
3250 $RESOURCE{$name} = $info; 3485 $RESOURCE{$name} = $info; # unused
3251 } 3486 }
3252 3487
3253 cf::cede_to_tick; 3488 cf::cede_to_tick;
3254 } 3489 }
3255 } 3490 }
3256 3491
3257 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3492 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3258 3493
3259 1 3494 1
3260} 3495}
3261
3262cf::global->attach (on_resource_update => sub {
3263 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3264 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3265
3266 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3267 my $sound = $soundconf->{compat}[$_]
3268 or next;
3269
3270 my $face = cf::face::find "sound/$sound->[1]";
3271 cf::sound::set $sound->[0] => $face;
3272 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3273 }
3274
3275 while (my ($k, $v) = each %{$soundconf->{event}}) {
3276 my $face = cf::face::find "sound/$v";
3277 cf::sound::set $k => $face;
3278 }
3279 }
3280});
3281 3496
3282register_exticmd fx_want => sub { 3497register_exticmd fx_want => sub {
3283 my ($ns, $want) = @_; 3498 my ($ns, $want) = @_;
3284 3499
3285 while (my ($k, $v) = each %$want) { 3500 while (my ($k, $v) = each %$want) {
3324sub reload_treasures { 3539sub reload_treasures {
3325 load_resource_file "$DATADIR/treasures" 3540 load_resource_file "$DATADIR/treasures"
3326 or die "unable to load treasurelists\n"; 3541 or die "unable to load treasurelists\n";
3327} 3542}
3328 3543
3544sub reload_sound {
3545 trace "loading sound config from $DATADIR/sound\n";
3546
3547 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3548 or die "$DATADIR/sound $!";
3549
3550 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3551
3552 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3553 my $sound = $soundconf->{compat}[$_]
3554 or next;
3555
3556 my $face = cf::face::find "sound/$sound->[1]";
3557 cf::sound::set $sound->[0] => $face;
3558 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3559 }
3560
3561 while (my ($k, $v) = each %{$soundconf->{event}}) {
3562 my $face = cf::face::find "sound/$v";
3563 cf::sound::set $k => $face;
3564 }
3565}
3566
3329sub reload_resources { 3567sub reload_resources {
3330 warn "reloading resource files...\n"; 3568 trace "reloading resource files...\n";
3331 3569
3570 reload_exp_table;
3571 reload_materials;
3332 reload_facedata; 3572 reload_facedata;
3573 reload_sound;
3333 reload_archetypes; 3574 reload_archetypes;
3334 reload_regions; 3575 reload_regions;
3335 reload_treasures; 3576 reload_treasures;
3336 3577
3337 warn "finished reloading resource files\n"; 3578 trace "finished reloading resource files\n";
3338} 3579}
3339 3580
3340sub reload_config { 3581sub reload_config {
3341 open my $fh, "<:utf8", "$CONFDIR/config" 3582 trace "reloading config file...\n";
3342 or return;
3343 3583
3344 local $/; 3584 0 < aio_load "$CONFDIR/config", my $config
3345 *CFG = YAML::Load <$fh>; 3585 or die "$CONFDIR/config: $!";
3346 3586
3587 utf8::decode $config;
3588 *CFG = yaml_load $config;
3589
3347 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3590 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3348 3591
3349 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3592 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3350 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3593 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3351 3594
3352 if (exists $CFG{mlockall}) { 3595 if (exists $CFG{mlockall}) {
3375 3618
3376 seek $fh, 0, 0; 3619 seek $fh, 0, 0;
3377 print $fh $$; 3620 print $fh $$;
3378} 3621}
3379 3622
3623sub main_loop {
3624 trace "EV::loop starting\n";
3625 if (1) {
3626 EV::loop;
3627 }
3628 trace "EV::loop returned\n";
3629 goto &main_loop unless $REALLY_UNLOOP;
3630}
3631
3380sub main { 3632sub main {
3381 cf::init_globals; # initialise logging 3633 cf::init_globals; # initialise logging
3382 3634
3383 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3635 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3384 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3636 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3385 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3637 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3386 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3638 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3387
3388 cf::init_experience;
3389 cf::init_anim;
3390 cf::init_attackmess;
3391 cf::init_dynamic;
3392 3639
3393 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3640 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3394 3641
3395 # we must not ever block the main coroutine 3642 # we must not ever block the main coroutine
3396 local $Coro::idle = sub { 3643 local $Coro::idle = sub {
3402 }; 3649 };
3403 3650
3404 evthread_start IO::AIO::poll_fileno; 3651 evthread_start IO::AIO::poll_fileno;
3405 3652
3406 cf::sync_job { 3653 cf::sync_job {
3654 cf::incloader::init ();
3655
3656 cf::init_anim;
3657 cf::init_attackmess;
3658 cf::init_dynamic;
3659
3660 cf::load_settings;
3661
3407 reload_resources; 3662 reload_resources;
3408 reload_config; 3663 reload_config;
3409 db_init; 3664 db_init;
3410 3665
3411 cf::load_settings;
3412 cf::load_materials;
3413 cf::init_uuid; 3666 cf::init_uuid;
3414 cf::init_signals; 3667 cf::init_signals;
3415 cf::init_commands;
3416 cf::init_skills; 3668 cf::init_skills;
3417 3669
3418 cf::init_beforeplay; 3670 cf::init_beforeplay;
3419 3671
3420 atomic; 3672 atomic;
3422 load_extensions; 3674 load_extensions;
3423 3675
3424 utime time, time, $RUNTIMEFILE; 3676 utime time, time, $RUNTIMEFILE;
3425 3677
3426 # no (long-running) fork's whatsoever before this point(!) 3678 # no (long-running) fork's whatsoever before this point(!)
3679 use POSIX ();
3427 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3680 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3428 3681
3429 (pop @POST_INIT)->(0) while @POST_INIT; 3682 cf::_post_init 0;
3430 }; 3683 };
3431 3684
3432 EV::loop; 3685 cf::object::thawer::errors_are_fatal 0;
3686 info "parse errors in files are no longer fatal from this point on.\n";
3687
3688 my $free_main; $free_main = EV::idle sub {
3689 undef $free_main;
3690 undef &main; # free gobs of memory :)
3691 };
3692
3693 goto &main_loop;
3433} 3694}
3434 3695
3435############################################################################# 3696#############################################################################
3436# initialisation and cleanup 3697# initialisation and cleanup
3437 3698
3438# install some emergency cleanup handlers 3699# install some emergency cleanup handlers
3439BEGIN { 3700BEGIN {
3440 our %SIGWATCHER = (); 3701 our %SIGWATCHER = ();
3441 for my $signal (qw(INT HUP TERM)) { 3702 for my $signal (qw(INT HUP TERM)) {
3442 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3703 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3443 cf::cleanup "SIG$signal"; 3704 cf::cleanup "SIG$signal";
3444 }; 3705 };
3445 } 3706 }
3446} 3707}
3447 3708
3448sub write_runtime_sync { 3709sub write_runtime_sync {
3710 my $t0 = AE::time;
3711
3449 # first touch the runtime file to show we are still running: 3712 # first touch the runtime file to show we are still running:
3450 # the fsync below can take a very very long time. 3713 # the fsync below can take a very very long time.
3451 3714
3452 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3715 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3453 3716
3454 my $guard = cf::lock_acquire "write_runtime"; 3717 my $guard = cf::lock_acquire "write_runtime";
3455 3718
3456 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3719 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3457 or return; 3720 or return;
3458 3721
3459 my $value = $cf::RUNTIME + 90 + 10; 3722 my $value = $cf::RUNTIME + 90 + 10;
3460 # 10 is the runtime save interval, for a monotonic clock 3723 # 10 is the runtime save interval, for a monotonic clock
3461 # 60 allows for the watchdog to kill the server. 3724 # 60 allows for the watchdog to kill the server.
3474 or return; 3737 or return;
3475 3738
3476 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3739 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3477 and return; 3740 and return;
3478 3741
3479 warn "runtime file written.\n"; 3742 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3480 3743
3481 1 3744 1
3482} 3745}
3483 3746
3484our $uuid_lock; 3747our $uuid_lock;
3496 or return; 3759 or return;
3497 3760
3498 my $value = uuid_seq uuid_cur; 3761 my $value = uuid_seq uuid_cur;
3499 3762
3500 unless ($value) { 3763 unless ($value) {
3501 warn "cowardly refusing to write zero uuid value!\n"; 3764 info "cowardly refusing to write zero uuid value!\n";
3502 return; 3765 return;
3503 } 3766 }
3504 3767
3505 my $value = uuid_str $value + $uuid_skip; 3768 my $value = uuid_str $value + $uuid_skip;
3506 $uuid_skip = 0; 3769 $uuid_skip = 0;
3516 or return; 3779 or return;
3517 3780
3518 aio_rename "$uuid~", $uuid 3781 aio_rename "$uuid~", $uuid
3519 and return; 3782 and return;
3520 3783
3521 warn "uuid file written ($value).\n"; 3784 trace "uuid file written ($value).\n";
3522 3785
3523 1 3786 1
3524 3787
3525} 3788}
3526 3789
3532} 3795}
3533 3796
3534sub emergency_save() { 3797sub emergency_save() {
3535 my $freeze_guard = cf::freeze_mainloop; 3798 my $freeze_guard = cf::freeze_mainloop;
3536 3799
3537 warn "emergency_perl_save: enter\n"; 3800 info "emergency_perl_save: enter\n";
3801
3802 # this is a trade-off: we want to be very quick here, so
3803 # save all maps without fsync, and later call a global sync
3804 # (which in turn might be very very slow)
3805 local $USE_FSYNC = 0;
3538 3806
3539 cf::sync_job { 3807 cf::sync_job {
3540 # this is a trade-off: we want to be very quick here, so 3808 cf::write_runtime_sync; # external watchdog should not bark
3541 # save all maps without fsync, and later call a global sync
3542 # (which in turn might be very very slow)
3543 local $USE_FSYNC = 0;
3544 3809
3545 # use a peculiar iteration method to avoid tripping on perl 3810 # use a peculiar iteration method to avoid tripping on perl
3546 # refcount bugs in for. also avoids problems with players 3811 # refcount bugs in for. also avoids problems with players
3547 # and maps saved/destroyed asynchronously. 3812 # and maps saved/destroyed asynchronously.
3548 warn "emergency_perl_save: begin player save\n"; 3813 info "emergency_perl_save: begin player save\n";
3549 for my $login (keys %cf::PLAYER) { 3814 for my $login (keys %cf::PLAYER) {
3550 my $pl = $cf::PLAYER{$login} or next; 3815 my $pl = $cf::PLAYER{$login} or next;
3551 $pl->valid or next; 3816 $pl->valid or next;
3552 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3817 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3553 $pl->save; 3818 $pl->save;
3554 } 3819 }
3555 warn "emergency_perl_save: end player save\n"; 3820 info "emergency_perl_save: end player save\n";
3556 3821
3822 cf::write_runtime_sync; # external watchdog should not bark
3823
3557 warn "emergency_perl_save: begin map save\n"; 3824 info "emergency_perl_save: begin map save\n";
3558 for my $path (keys %cf::MAP) { 3825 for my $path (keys %cf::MAP) {
3559 my $map = $cf::MAP{$path} or next; 3826 my $map = $cf::MAP{$path} or next;
3560 $map->valid or next; 3827 $map->valid or next;
3561 $map->save; 3828 $map->save;
3562 } 3829 }
3563 warn "emergency_perl_save: end map save\n"; 3830 info "emergency_perl_save: end map save\n";
3564 3831
3832 cf::write_runtime_sync; # external watchdog should not bark
3833
3565 warn "emergency_perl_save: begin database checkpoint\n"; 3834 info "emergency_perl_save: begin database checkpoint\n";
3566 BDB::db_env_txn_checkpoint $DB_ENV; 3835 BDB::db_env_txn_checkpoint $DB_ENV;
3567 warn "emergency_perl_save: end database checkpoint\n"; 3836 info "emergency_perl_save: end database checkpoint\n";
3568 3837
3569 warn "emergency_perl_save: begin write uuid\n"; 3838 info "emergency_perl_save: begin write uuid\n";
3570 write_uuid_sync 1; 3839 write_uuid_sync 1;
3571 warn "emergency_perl_save: end write uuid\n"; 3840 info "emergency_perl_save: end write uuid\n";
3841
3842 cf::write_runtime_sync; # external watchdog should not bark
3843
3844 trace "emergency_perl_save: syncing database to disk";
3845 BDB::db_env_txn_checkpoint $DB_ENV;
3846
3847 info "emergency_perl_save: starting sync\n";
3848 IO::AIO::aio_sync sub {
3849 info "emergency_perl_save: finished sync\n";
3850 };
3851
3852 cf::write_runtime_sync; # external watchdog should not bark
3853
3854 trace "emergency_perl_save: flushing outstanding aio requests";
3855 while (IO::AIO::nreqs || BDB::nreqs) {
3856 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3857 }
3858
3859 cf::write_runtime_sync; # external watchdog should not bark
3572 }; 3860 };
3573 3861
3574 warn "emergency_perl_save: starting sync()\n";
3575 IO::AIO::aio_sync sub {
3576 warn "emergency_perl_save: finished sync()\n";
3577 };
3578
3579 warn "emergency_perl_save: leave\n"; 3862 info "emergency_perl_save: leave\n";
3580} 3863}
3581 3864
3582sub post_cleanup { 3865sub post_cleanup {
3583 my ($make_core) = @_; 3866 my ($make_core) = @_;
3584 3867
3868 IO::AIO::flush;
3869
3585 warn Carp::longmess "post_cleanup backtrace" 3870 error Carp::longmess "post_cleanup backtrace"
3586 if $make_core; 3871 if $make_core;
3587 3872
3588 my $fh = pidfile; 3873 my $fh = pidfile;
3589 unlink $PIDFILE if <$fh> == $$; 3874 unlink $PIDFILE if <$fh> == $$;
3590} 3875}
3610 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3895 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3611 for my $name (keys %$leaf_symtab) { 3896 for my $name (keys %$leaf_symtab) {
3612 _gv_clear *{"$pkg$name"}; 3897 _gv_clear *{"$pkg$name"};
3613# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3898# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3614 } 3899 }
3615 warn "cleared package $pkg\n";#d#
3616} 3900}
3617 3901
3618sub do_reload_perl() { 3902sub do_reload_perl() {
3619 # can/must only be called in main 3903 # can/must only be called in main
3620 if ($Coro::current != $Coro::main) { 3904 unless (in_main) {
3621 warn "can only reload from main coroutine"; 3905 error "can only reload from main coroutine";
3622 return; 3906 return;
3623 } 3907 }
3624 3908
3625 return if $RELOAD++; 3909 return if $RELOAD++;
3626 3910
3627 my $t1 = EV::time; 3911 my $t1 = AE::time;
3628 3912
3629 while ($RELOAD) { 3913 while ($RELOAD) {
3630 warn "reloading..."; 3914 cf::get_slot 0.1, -1, "reload_perl";
3915 info "perl_reload: reloading...";
3631 3916
3632 warn "entering sync_job"; 3917 trace "perl_reload: entering sync_job";
3633 3918
3634 cf::sync_job { 3919 cf::sync_job {
3635 cf::write_runtime_sync; # external watchdog should not bark
3636 cf::emergency_save; 3920 #cf::emergency_save;
3637 cf::write_runtime_sync; # external watchdog should not bark
3638 3921
3639 warn "syncing database to disk";
3640 BDB::db_env_txn_checkpoint $DB_ENV;
3641
3642 # if anything goes wrong in here, we should simply crash as we already saved
3643
3644 warn "flushing outstanding aio requests";
3645 while (IO::AIO::nreqs || BDB::nreqs) {
3646 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3647 }
3648
3649 warn "cancelling all extension coros"; 3922 trace "perl_reload: cancelling all extension coros";
3650 $_->cancel for values %EXT_CORO; 3923 $_->cancel for values %EXT_CORO;
3651 %EXT_CORO = (); 3924 %EXT_CORO = ();
3652 3925
3653 warn "removing commands"; 3926 trace "perl_reload: removing commands";
3654 %COMMAND = (); 3927 %COMMAND = ();
3655 3928
3656 warn "removing ext/exti commands"; 3929 trace "perl_reload: removing ext/exti commands";
3657 %EXTCMD = (); 3930 %EXTCMD = ();
3658 %EXTICMD = (); 3931 %EXTICMD = ();
3659 3932
3660 warn "unloading/nuking all extensions"; 3933 trace "perl_reload: unloading/nuking all extensions";
3661 for my $pkg (@EXTS) { 3934 for my $pkg (@EXTS) {
3662 warn "... unloading $pkg"; 3935 trace "... unloading $pkg";
3663 3936
3664 if (my $cb = $pkg->can ("unload")) { 3937 if (my $cb = $pkg->can ("unload")) {
3665 eval { 3938 eval {
3666 $cb->($pkg); 3939 $cb->($pkg);
3667 1 3940 1
3668 } or warn "$pkg unloaded, but with errors: $@"; 3941 } or error "$pkg unloaded, but with errors: $@";
3669 } 3942 }
3670 3943
3671 warn "... clearing $pkg"; 3944 trace "... clearing $pkg";
3672 clear_package $pkg; 3945 clear_package $pkg;
3673 } 3946 }
3674 3947
3675 warn "unloading all perl modules loaded from $LIBDIR"; 3948 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3676 while (my ($k, $v) = each %INC) { 3949 while (my ($k, $v) = each %INC) {
3677 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3950 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3678 3951
3679 warn "... unloading $k"; 3952 trace "... unloading $k";
3680 delete $INC{$k}; 3953 delete $INC{$k};
3681 3954
3682 $k =~ s/\.pm$//; 3955 $k =~ s/\.pm$//;
3683 $k =~ s/\//::/g; 3956 $k =~ s/\//::/g;
3684 3957
3687 } 3960 }
3688 3961
3689 clear_package $k; 3962 clear_package $k;
3690 } 3963 }
3691 3964
3692 warn "getting rid of safe::, as good as possible"; 3965 trace "perl_reload: getting rid of safe::, as good as possible";
3693 clear_package "safe::$_" 3966 clear_package "safe::$_"
3694 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3967 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3695 3968
3696 warn "unloading cf.pm \"a bit\""; 3969 trace "perl_reload: unloading cf.pm \"a bit\"";
3697 delete $INC{"cf.pm"}; 3970 delete $INC{"cf.pm"};
3698 delete $INC{"cf/pod.pm"}; 3971 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3699 3972
3700 # don't, removes xs symbols, too, 3973 # don't, removes xs symbols, too,
3701 # and global variables created in xs 3974 # and global variables created in xs
3702 #clear_package __PACKAGE__; 3975 #clear_package __PACKAGE__;
3703 3976
3704 warn "unload completed, starting to reload now"; 3977 info "perl_reload: unload completed, starting to reload now";
3705 3978
3706 warn "reloading cf.pm"; 3979 trace "perl_reload: reloading cf.pm";
3707 require cf; 3980 require cf;
3708 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3981 cf::_connect_to_perl_1;
3709 3982
3710 warn "loading config and database again"; 3983 trace "perl_reload: loading config and database again";
3711 cf::reload_config; 3984 cf::reload_config;
3712 3985
3713 warn "loading extensions"; 3986 trace "perl_reload: loading extensions";
3714 cf::load_extensions; 3987 cf::load_extensions;
3715 3988
3716 if ($REATTACH_ON_RELOAD) { 3989 if ($REATTACH_ON_RELOAD) {
3717 warn "reattaching attachments to objects/players"; 3990 trace "perl_reload: reattaching attachments to objects/players";
3718 _global_reattach; # objects, sockets 3991 _global_reattach; # objects, sockets
3719 warn "reattaching attachments to maps"; 3992 trace "perl_reload: reattaching attachments to maps";
3720 reattach $_ for values %MAP; 3993 reattach $_ for values %MAP;
3721 warn "reattaching attachments to players"; 3994 trace "perl_reload: reattaching attachments to players";
3722 reattach $_ for values %PLAYER; 3995 reattach $_ for values %PLAYER;
3723 } 3996 }
3724 3997
3725 warn "running post_init jobs"; 3998 cf::_post_init 1;
3726 (pop @POST_INIT)->(1) while @POST_INIT;
3727 3999
3728 warn "leaving sync_job"; 4000 trace "perl_reload: leaving sync_job";
3729 4001
3730 1 4002 1
3731 } or do { 4003 } or do {
3732 warn $@; 4004 error $@;
3733 cf::cleanup "error while reloading, exiting."; 4005 cf::cleanup "perl_reload: error, exiting.";
3734 }; 4006 };
3735 4007
3736 warn "reloaded";
3737 --$RELOAD; 4008 --$RELOAD;
3738 } 4009 }
3739 4010
3740 $t1 = EV::time - $t1; 4011 $t1 = AE::time - $t1;
3741 warn "reload completed in ${t1}s\n"; 4012 info "perl_reload: completed in ${t1}s\n";
3742}; 4013};
3743 4014
3744our $RELOAD_WATCHER; # used only during reload 4015our $RELOAD_WATCHER; # used only during reload
3745 4016
3746sub reload_perl() { 4017sub reload_perl() {
3748 # coro crashes during coro_state_free->destroy here. 4019 # coro crashes during coro_state_free->destroy here.
3749 4020
3750 $RELOAD_WATCHER ||= cf::async { 4021 $RELOAD_WATCHER ||= cf::async {
3751 Coro::AIO::aio_wait cache_extensions; 4022 Coro::AIO::aio_wait cache_extensions;
3752 4023
3753 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4024 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3754 do_reload_perl; 4025 do_reload_perl;
3755 undef $RELOAD_WATCHER; 4026 undef $RELOAD_WATCHER;
3756 }; 4027 };
3757 }; 4028 };
3758} 4029}
3767 reload_perl; 4038 reload_perl;
3768 }; 4039 };
3769 } 4040 }
3770}; 4041};
3771 4042
3772unshift @INC, $LIBDIR; 4043#############################################################################
3773 4044
3774my $bug_warning = 0; 4045my $bug_warning = 0;
3775 4046
3776our @WAIT_FOR_TICK; 4047our @WAIT_FOR_TICK;
3777our @WAIT_FOR_TICK_BEGIN; 4048our @WAIT_FOR_TICK_BEGIN;
3778 4049
3779sub wait_for_tick { 4050sub wait_for_tick() {
3780 return if tick_inhibit || $Coro::current == $Coro::main; 4051 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3781 4052
3782 my $signal = new Coro::Signal; 4053 my $signal = new Coro::Signal;
3783 push @WAIT_FOR_TICK, $signal; 4054 push @WAIT_FOR_TICK, $signal;
3784 $signal->wait; 4055 $signal->wait;
3785} 4056}
3786 4057
3787sub wait_for_tick_begin { 4058sub wait_for_tick_begin() {
3788 return if tick_inhibit || $Coro::current == $Coro::main; 4059 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3789 4060
3790 my $signal = new Coro::Signal; 4061 my $signal = new Coro::Signal;
3791 push @WAIT_FOR_TICK_BEGIN, $signal; 4062 push @WAIT_FOR_TICK_BEGIN, $signal;
3792 $signal->wait; 4063 $signal->wait;
3793} 4064}
3799 return; 4070 return;
3800 } 4071 }
3801 4072
3802 cf::server_tick; # one server iteration 4073 cf::server_tick; # one server iteration
3803 4074
4075 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4076
3804 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4077 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3805 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4078 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3806 Coro::async_pool { 4079 Coro::async_pool {
3807 $Coro::current->{desc} = "runtime saver"; 4080 $Coro::current->{desc} = "runtime saver";
3808 write_runtime_sync 4081 write_runtime_sync
3809 or warn "ERROR: unable to write runtime file: $!"; 4082 or error "ERROR: unable to write runtime file: $!";
3810 }; 4083 };
3811 } 4084 }
3812 4085
3813 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4086 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3814 $sig->send; 4087 $sig->send;
3822 4095
3823 if (0) { 4096 if (0) {
3824 if ($NEXT_TICK) { 4097 if ($NEXT_TICK) {
3825 my $jitter = $TICK_START - $NEXT_TICK; 4098 my $jitter = $TICK_START - $NEXT_TICK;
3826 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4099 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3827 warn "jitter $JITTER\n";#d# 4100 debug "jitter $JITTER\n";#d#
3828 } 4101 }
3829 } 4102 }
3830} 4103}
3831 4104
3832{ 4105{
3833 # configure BDB 4106 # configure BDB
3834 4107
3835 BDB::min_parallel 8; 4108 BDB::min_parallel 16;
3836 BDB::max_poll_reqs $TICK * 0.1; 4109 BDB::max_poll_reqs $TICK * 0.1;
3837 $AnyEvent::BDB::WATCHER->priority (1); 4110 $AnyEvent::BDB::WATCHER->priority (1);
3838 4111
3839 unless ($DB_ENV) { 4112 unless ($DB_ENV) {
3840 $DB_ENV = BDB::db_env_create; 4113 $DB_ENV = BDB::db_env_create;
3920 LOG llevInfo, "[ABT] [suppressed]\n"; 4193 LOG llevInfo, "[ABT] [suppressed]\n";
3921 } 4194 }
3922} 4195}
3923 4196
3924# load additional modules 4197# load additional modules
3925use cf::pod; 4198require "cf/$_.pm" for @EXTRA_MODULES;
4199cf::_connect_to_perl_2;
3926 4200
3927END { cf::emergency_save } 4201END { cf::emergency_save }
3928 4202
39291 42031
3930 4204

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines