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.462 by root, Tue Dec 23 06:58:23 2008 UTC vs.
Revision 1.553 by root, Tue May 18 21:30:16 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines