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.463 by root, Sun Dec 28 06:59:27 2008 UTC vs.
Revision 1.559 by root, Sat Feb 26 12:50:27 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines