ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.466 by root, Thu Jan 8 03:03:24 2009 UTC vs.
Revision 1.549 by root, Tue May 11 13:19:59 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use common::sense;
25use utf8;
26use strict qw(vars subs);
27 26
28use Symbol; 27use Symbol;
29use List::Util; 28use List::Util;
30use Socket; 29use Socket;
31use EV; 30use EV;
32use Opcode; 31use Opcode;
33use Safe; 32use Safe;
34use Safe::Hole; 33use Safe::Hole;
35use Storable (); 34use Storable ();
35use Carp ();
36 36
37use Guard (); 37use Guard ();
38use Coro (); 38use Coro ();
39use Coro::State; 39use Coro::State;
40use Coro::Handle; 40use Coro::Handle;
51use Coro::Util (); 51use Coro::Util ();
52 52
53use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
54use BDB (); 54use BDB ();
55use Data::Dumper; 55use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 56use Fcntl;
58use YAML (); 57use YAML::XS ();
59use IO::AIO (); 58use IO::AIO ();
60use Time::HiRes; 59use Time::HiRes;
61use Compress::LZF; 60use Compress::LZF;
62use Digest::MD5 (); 61use Digest::MD5 ();
63 62
72 71
73# make sure c-lzf reinitialises itself 72# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
76 75
76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
78
77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
78 82
79our %COMMAND = (); 83our %COMMAND = ();
80our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
81 85
82our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
85our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
86our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
87 91
88our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
89our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
90 96
91our $CONFDIR = confdir; 97our $CONFDIR = confdir;
92our $DATADIR = datadir; 98our $DATADIR = datadir;
93our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
94our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
100our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
101our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
104 110
105our %RESOURCE; 111our %RESOURCE; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
106 118
107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109our $NEXT_TICK; 121our $NEXT_TICK;
110our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
111 123
112our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
114our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
115our $DB_ENV; 127our $DB_ENV;
116 128
117our @EXTRA_MODULES = qw(pod mapscript); 129our @EXTRA_MODULES = qw(pod match mapscript incloader);
118 130
119our %CFG; 131our %CFG;
120 132
121our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
122our $RUNTIME; 134our $RUNTIME;
134our $JITTER; # average jitter 146our $JITTER; # average jitter
135our $TICK_START; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
136 148
137our @POST_INIT; 149our @POST_INIT;
138 150
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
140 153
141binmode STDOUT; 154binmode STDOUT;
142binmode STDERR; 155binmode STDERR;
143 156
144# read virtual server time, if available 157# read virtual server time, if available
146 open my $fh, "<", $RUNTIMEFILE 159 open my $fh, "<", $RUNTIMEFILE
147 or die "unable to read $RUNTIMEFILE file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
148 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
149} 162}
150 163
164eval "sub TICK() { $TICK } 1" or die;
165
151mkdir $_ 166mkdir $_
152 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
153 168
154our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
155 170
156sub cf::map::normalise; 171sub cf::map::normalise;
172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
157 187
158############################################################################# 188#############################################################################
159 189
160=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
161 191
203from wherever your confdir points to. 233from wherever your confdir points to.
204 234
205=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
206 236
207These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
208returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one thread
209per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
210 240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
211=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
212 247
213This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
214C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 249C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
215that call. 250that call.
216 251
252=item %cf::REFLECT
253
254Contains, for each (C++) class name, a hash reference with information
255about object members (methods, scalars, arrays and flags) and other
256metadata, which is useful for introspection.
257
217=back 258=back
218 259
219=cut 260=cut
220 261
221BEGIN { 262sub error(@) { LOG llevError, join "", @_ }
222 *CORE::GLOBAL::warn = sub { 263sub warn (@) { LOG llevWarn , join "", @_ }
264sub info (@) { LOG llevInfo , join "", @_ }
265sub debug(@) { LOG llevDebug, join "", @_ }
266sub trace(@) { LOG llevTrace, join "", @_ }
267
268$Coro::State::WARNHOOK = sub {
223 my $msg = join "", @_; 269 my $msg = join "", @_;
224 270
225 $msg .= "\n" 271 $msg .= "\n"
226 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
227 273
228 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 274 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
229 275
230 LOG llevError, $msg; 276 LOG llevWarn, $msg;
231 }; 277};
232}
233 278
234$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
235 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
236 281
237 if ($Coro::current == $Coro::main) {#d# 282 error Carp::longmess $_[0];
283
284 if (in_main) {#d#
238 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
239 return;#d# 286 return;#d#
240 }#d# 287 }#d#
241 288
242 # kill coroutine otherwise 289 # kill coroutine otherwise
243 warn Carp::longmess $_[0];
244 Coro::terminate 290 Coro::terminate
245}; 291};
246
247$SIG{__DIE__} = sub { }; #d#?
248 292
249@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 293@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
250@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 294@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
251@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 295@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
252@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 296@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
266)) { 310)) {
267 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
268} 312}
269 313
270$EV::DIED = sub { 314$EV::DIED = sub {
271 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
272}; 316};
273 317
274############################################################################# 318#############################################################################
275 319
276=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
313our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 357our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
314 358
315sub encode_json($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
316sub decode_json($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
317 361
362=item $ref = cf::yaml_load $scalar
363
364Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
365
366=cut
367
368sub fork_call(&@);
369
370sub yaml_load($) {
371 fork_call { YAML::XS::Load $_[0] } @_
372}
373
318=item cf::post_init { BLOCK } 374=item cf::post_init { BLOCK }
319 375
320Execute the given codeblock, I<after> all extensions have been (re-)loaded, 376Execute the given codeblock, I<after> all extensions have been (re-)loaded,
321but I<before> the server starts ticking again. 377but I<before> the server starts ticking again.
322 378
323The cdoeblock will have a single boolean argument to indicate whether this 379The codeblock will have a single boolean argument to indicate whether this
324is a reload or not. 380is a reload or not.
325 381
326=cut 382=cut
327 383
328sub post_init(&) { 384sub post_init(&) {
373} 429}
374 430
375=item cf::periodic $interval, $cb 431=item cf::periodic $interval, $cb
376 432
377Like EV::periodic, but randomly selects a starting point so that the actions 433Like EV::periodic, but randomly selects a starting point so that the actions
378get spread over timer. 434get spread over time.
379 435
380=cut 436=cut
381 437
382sub periodic($$) { 438sub periodic($$) {
383 my ($interval, $cb) = @_; 439 my ($interval, $cb) = @_;
400 456
401=cut 457=cut
402 458
403our @SLOT_QUEUE; 459our @SLOT_QUEUE;
404our $SLOT_QUEUE; 460our $SLOT_QUEUE;
461our $SLOT_DECAY = 0.9;
405 462
406$SLOT_QUEUE->cancel if $SLOT_QUEUE; 463$SLOT_QUEUE->cancel if $SLOT_QUEUE;
407$SLOT_QUEUE = Coro::async { 464$SLOT_QUEUE = Coro::async {
408 $Coro::current->desc ("timeslot manager"); 465 $Coro::current->desc ("timeslot manager");
409 466
410 my $signal = new Coro::Signal; 467 my $signal = new Coro::Signal;
468 my $busy;
411 469
412 while () { 470 while () {
413 next_job: 471 next_job:
472
414 my $avail = cf::till_tick; 473 my $avail = cf::till_tick;
415 if ($avail > 0.01) { 474
416 for (0 .. $#SLOT_QUEUE) { 475 for (0 .. $#SLOT_QUEUE) {
417 if ($SLOT_QUEUE[$_][0] < $avail) { 476 if ($SLOT_QUEUE[$_][0] <= $avail) {
477 $busy = 0;
418 my $job = splice @SLOT_QUEUE, $_, 1, (); 478 my $job = splice @SLOT_QUEUE, $_, 1, ();
419 $job->[2]->send; 479 $job->[2]->send;
420 Coro::cede; 480 Coro::cede;
421 goto next_job; 481 goto next_job;
422 } 482 } else {
483 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
423 } 484 }
424 } 485 }
425 486
426 if (@SLOT_QUEUE) { 487 if (@SLOT_QUEUE) {
427 # we do not use wait_for_tick() as it returns immediately when tick is inactive 488 # we do not use wait_for_tick() as it returns immediately when tick is inactive
428 push @cf::WAIT_FOR_TICK, $signal; 489 push @cf::WAIT_FOR_TICK, $signal;
429 $signal->wait; 490 $signal->wait;
430 } else { 491 } else {
492 $busy = 0;
431 Coro::schedule; 493 Coro::schedule;
432 } 494 }
433 } 495 }
434}; 496};
435 497
436sub get_slot($;$$) { 498sub get_slot($;$$) {
437 return if tick_inhibit || $Coro::current == $Coro::main; 499 return if tick_inhibit || $Coro::current == $Coro::main;
438 500
439 my ($time, $pri, $name) = @_; 501 my ($time, $pri, $name) = @_;
440 502
441 $time = $TICK * .6 if $time > $TICK * .6; 503 $time = clamp $time, 0.01, $TICK * .6;
504
442 my $sig = new Coro::Signal; 505 my $sig = new Coro::Signal;
443 506
444 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 507 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
445 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 508 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
446 $SLOT_QUEUE->ready; 509 $SLOT_QUEUE->ready;
472=cut 535=cut
473 536
474sub sync_job(&) { 537sub sync_job(&) {
475 my ($job) = @_; 538 my ($job) = @_;
476 539
477 if ($Coro::current == $Coro::main) { 540 if (in_main) {
478 my $time = EV::time; 541 my $time = AE::time;
479 542
480 # this is the main coro, too bad, we have to block 543 # this is the main coro, too bad, we have to block
481 # till the operation succeeds, freezing the server :/ 544 # till the operation succeeds, freezing the server :/
482 545
483 LOG llevError, Carp::longmess "sync job";#d# 546 #LOG llevError, Carp::longmess "sync job";#d#
484 547
485 my $freeze_guard = freeze_mainloop; 548 my $freeze_guard = freeze_mainloop;
486 549
487 my $busy = 1; 550 my $busy = 1;
488 my @res; 551 my @res;
489 552
490 (async { 553 (async {
491 $Coro::current->desc ("sync job coro"); 554 $Coro::current->desc ("sync job coro");
492 @res = eval { $job->() }; 555 @res = eval { $job->() };
493 warn $@ if $@; 556 error $@ if $@;
494 undef $busy; 557 undef $busy;
495 })->prio (Coro::PRIO_MAX); 558 })->prio (Coro::PRIO_MAX);
496 559
497 while ($busy) { 560 while ($busy) {
498 if (Coro::nready) { 561 if (Coro::nready) {
500 } else { 563 } else {
501 EV::loop EV::LOOP_ONESHOT; 564 EV::loop EV::LOOP_ONESHOT;
502 } 565 }
503 } 566 }
504 567
505 my $time = EV::time - $time; 568 my $time = AE::time - $time;
506 569
507 $TICK_START += $time; # do not account sync jobs to server load 570 $TICK_START += $time; # do not account sync jobs to server load
508 571
509 wantarray ? @res : $res[0] 572 wantarray ? @res : $res[0]
510 } else { 573 } else {
532 $EXT_CORO{$coro+0} = $coro; 595 $EXT_CORO{$coro+0} = $coro;
533 596
534 $coro 597 $coro
535} 598}
536 599
537=item fork_call { }, $args 600=item fork_call { }, @args
538 601
539Executes the given code block with the given arguments in a seperate 602Executes the given code block with the given arguments in a seperate
540process, returning the results. Everything must be serialisable with 603process, returning the results. Everything must be serialisable with
541Coro::Storable. May, of course, block. Note that the executed sub may 604Coro::Storable. May, of course, block. Note that the executed sub may
542never block itself or use any form of event handling. 605never block itself or use any form of event handling.
543 606
544=cut 607=cut
545 608
609sub post_fork {
610 reset_signals;
611}
612
546sub fork_call(&@) { 613sub fork_call(&@) {
547 my ($cb, @args) = @_; 614 my ($cb, @args) = @_;
548 615
549 # we seemingly have to make a local copy of the whole thing, 616 # we seemingly have to make a local copy of the whole thing,
550 # otherwise perl prematurely frees the stuff :/ 617 # otherwise perl prematurely frees the stuff :/
551 # TODO: investigate and fix (likely this will be rather laborious) 618 # TODO: investigate and fix (likely this will be rather laborious)
552 619
553 my @res = Coro::Util::fork_eval { 620 my @res = Coro::Util::fork_eval {
554 reset_signals; 621 cf::post_fork;
555 &$cb 622 &$cb
556 }, @args; 623 } @args;
557 624
558 wantarray ? @res : $res[-1] 625 wantarray ? @res : $res[-1]
626}
627
628sub objinfo {
629 (
630 "counter value" => cf::object::object_count,
631 "objects created" => cf::object::create_count,
632 "objects destroyed" => cf::object::destroy_count,
633 "freelist size" => cf::object::free_count,
634 "allocated objects" => cf::object::objects_size,
635 "active objects" => cf::object::actives_size,
636 )
559} 637}
560 638
561=item $coin = coin_from_name $name 639=item $coin = coin_from_name $name
562 640
563=cut 641=cut
600within each server. 678within each server.
601 679
602=cut 680=cut
603 681
604sub db_table($) { 682sub db_table($) {
683 cf::error "db_get called from main context"
684 if $Coro::current == $Coro::main;
685
605 my ($name) = @_; 686 my ($name) = @_;
606 my $db = BDB::db_create $DB_ENV; 687 my $db = BDB::db_create $DB_ENV;
607 688
608 eval { 689 eval {
609 $db->set_flags (BDB::CHKSUM); 690 $db->set_flags (BDB::CHKSUM);
619} 700}
620 701
621our $DB; 702our $DB;
622 703
623sub db_init { 704sub db_init {
624 cf::sync_job {
625 $DB ||= db_table "db"; 705 $DB ||= db_table "db";
626 };
627} 706}
628 707
629sub db_get($$) { 708sub db_get($$) {
630 my $key = "$_[0]/$_[1]"; 709 my $key = "$_[0]/$_[1]";
631 710
632 cf::sync_job { 711 cf::error "db_get called from main context"
712 if $Coro::current == $Coro::main;
713
633 BDB::db_get $DB, undef, $key, my $data; 714 BDB::db_get $DB, undef, $key, my $data;
634 715
635 $! ? () 716 $! ? ()
636 : $data 717 : $data
637 }
638} 718}
639 719
640sub db_put($$$) { 720sub db_put($$$) {
641 BDB::dbreq_pri 4; 721 BDB::dbreq_pri 4;
642 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 722 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
698 778
699 my $t1 = Time::HiRes::time; 779 my $t1 = Time::HiRes::time;
700 my $data = $process->(\@data); 780 my $data = $process->(\@data);
701 my $t2 = Time::HiRes::time; 781 my $t2 = Time::HiRes::time;
702 782
703 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 783 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
704 784
705 db_put cache => "$id/data", $data; 785 db_put cache => "$id/data", $data;
706 db_put cache => "$id/md5" , $md5; 786 db_put cache => "$id/md5" , $md5;
707 db_put cache => "$id/meta", $meta; 787 db_put cache => "$id/meta", $meta;
708 788
718 798
719=cut 799=cut
720 800
721sub datalog($@) { 801sub datalog($@) {
722 my ($type, %kv) = @_; 802 my ($type, %kv) = @_;
723 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 803 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
724} 804}
725 805
726=back 806=back
727 807
728=cut 808=cut
923 1003
924 } elsif (exists $cb_id{$type}) { 1004 } elsif (exists $cb_id{$type}) {
925 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1005 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
926 1006
927 } elsif (ref $type) { 1007 } elsif (ref $type) {
928 warn "attaching objects not supported, ignoring.\n"; 1008 error "attaching objects not supported, ignoring.\n";
929 1009
930 } else { 1010 } else {
931 shift @arg; 1011 shift @arg;
932 warn "attach argument '$type' not supported, ignoring.\n"; 1012 error "attach argument '$type' not supported, ignoring.\n";
933 } 1013 }
934 } 1014 }
935} 1015}
936 1016
937sub _object_attach { 1017sub _object_attach {
947 _attach $registry, $klass, @attach; 1027 _attach $registry, $klass, @attach;
948 } 1028 }
949 1029
950 $obj->{$name} = \%arg; 1030 $obj->{$name} = \%arg;
951 } else { 1031 } else {
952 warn "object uses attachment '$name' which is not available, postponing.\n"; 1032 info "object uses attachment '$name' which is not available, postponing.\n";
953 } 1033 }
954 1034
955 $obj->{_attachment}{$name} = undef; 1035 $obj->{_attachment}{$name} = undef;
956} 1036}
957 1037
1016 1096
1017 for (@$callbacks) { 1097 for (@$callbacks) {
1018 eval { &{$_->[1]} }; 1098 eval { &{$_->[1]} };
1019 1099
1020 if ($@) { 1100 if ($@) {
1021 warn "$@";
1022 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1101 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1023 override; 1102 override;
1024 } 1103 }
1025 1104
1026 return 1 if $override; 1105 return 1 if $override;
1027 } 1106 }
1106 for (@$attach) { 1185 for (@$attach) {
1107 my ($klass, @attach) = @$_; 1186 my ($klass, @attach) = @$_;
1108 _attach $registry, $klass, @attach; 1187 _attach $registry, $klass, @attach;
1109 } 1188 }
1110 } else { 1189 } else {
1111 warn "object uses attachment '$name' that is not available, postponing.\n"; 1190 info "object uses attachment '$name' that is not available, postponing.\n";
1112 } 1191 }
1113 } 1192 }
1114} 1193}
1115 1194
1116cf::attachable->attach ( 1195cf::attachable->attach (
1143 my ($filename, $rdata, $objs) = @_; 1222 my ($filename, $rdata, $objs) = @_;
1144 1223
1145 sync_job { 1224 sync_job {
1146 if (length $$rdata) { 1225 if (length $$rdata) {
1147 utf8::decode (my $decname = $filename); 1226 utf8::decode (my $decname = $filename);
1148 warn sprintf "saving %s (%d,%d)\n", 1227 trace sprintf "saving %s (%d,%d)\n",
1149 $decname, length $$rdata, scalar @$objs; 1228 $decname, length $$rdata, scalar @$objs
1229 if $VERBOSE_IO;
1150 1230
1151 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1231 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1152 aio_chmod $fh, SAVE_MODE; 1232 aio_chmod $fh, SAVE_MODE;
1153 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1233 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1154 aio_fsync $fh if $cf::USE_FSYNC; 1234 if ($cf::USE_FSYNC) {
1235 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;
1236 aio_fsync $fh;
1237 }
1155 aio_close $fh; 1238 aio_close $fh;
1156 1239
1157 if (@$objs) { 1240 if (@$objs) {
1158 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1241 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1159 aio_chmod $fh, SAVE_MODE; 1242 aio_chmod $fh, SAVE_MODE;
1160 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1243 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1161 aio_write $fh, 0, (length $data), $data, 0; 1244 aio_write $fh, 0, (length $data), $data, 0;
1162 aio_fsync $fh if $cf::USE_FSYNC; 1245 if ($cf::USE_FSYNC) {
1246 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;
1247 aio_fsync $fh;
1248 }
1163 aio_close $fh; 1249 aio_close $fh;
1164 aio_rename "$filename.pst~", "$filename.pst"; 1250 aio_rename "$filename.pst~", "$filename.pst";
1165 } 1251 }
1166 } else { 1252 } else {
1167 aio_unlink "$filename.pst"; 1253 aio_unlink "$filename.pst";
1170 aio_rename "$filename~", $filename; 1256 aio_rename "$filename~", $filename;
1171 1257
1172 $filename =~ s%/[^/]+$%%; 1258 $filename =~ s%/[^/]+$%%;
1173 aio_pathsync $filename if $cf::USE_FSYNC; 1259 aio_pathsync $filename if $cf::USE_FSYNC;
1174 } else { 1260 } else {
1175 warn "unable to save objects: $filename~: $!\n"; 1261 error "unable to save objects: $filename~: $!\n";
1176 } 1262 }
1177 } else { 1263 } else {
1178 aio_unlink $filename; 1264 aio_unlink $filename;
1179 aio_unlink "$filename.pst"; 1265 aio_unlink "$filename.pst";
1180 } 1266 }
1204 my $st = eval { Coro::Storable::thaw $av }; 1290 my $st = eval { Coro::Storable::thaw $av };
1205 $av = $st->{objs}; 1291 $av = $st->{objs};
1206 } 1292 }
1207 1293
1208 utf8::decode (my $decname = $filename); 1294 utf8::decode (my $decname = $filename);
1209 warn sprintf "loading %s (%d,%d)\n", 1295 trace sprintf "loading %s (%d,%d)\n",
1210 $decname, length $data, scalar @{$av || []}; 1296 $decname, length $data, scalar @{$av || []}
1297 if $VERBOSE_IO;
1211 1298
1212 ($data, $av) 1299 ($data, $av)
1213} 1300}
1214 1301
1215=head2 COMMAND CALLBACKS 1302=head2 COMMAND CALLBACKS
1274} 1361}
1275 1362
1276use File::Glob (); 1363use File::Glob ();
1277 1364
1278cf::player->attach ( 1365cf::player->attach (
1279 on_command => sub { 1366 on_unknown_command => sub {
1280 my ($pl, $name, $params) = @_; 1367 my ($pl, $name, $params) = @_;
1281 1368
1282 my $cb = $COMMAND{$name} 1369 my $cb = $COMMAND{$name}
1283 or return; 1370 or return;
1284 1371
1307 1394
1308 $pl->ext_reply ($reply, @reply) 1395 $pl->ext_reply ($reply, @reply)
1309 if $reply; 1396 if $reply;
1310 1397
1311 } else { 1398 } else {
1312 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1399 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1313 } 1400 }
1314 1401
1315 cf::override; 1402 cf::override;
1316 }, 1403 },
1317); 1404);
1318 1405
1319# "readahead" all extensions 1406# "readahead" all extensions
1320sub cache_extensions { 1407sub cache_extensions {
1321 my $grp = IO::AIO::aio_group; 1408 my $grp = IO::AIO::aio_group;
1322 1409
1323 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1410 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1324 for (grep /\.ext$/, @{$_[0]}) { 1411 for (grep /\.ext$/, @{$_[0]}) {
1325 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1412 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1326 } 1413 }
1327 }; 1414 };
1328 1415
1329 $grp 1416 $grp
1330} 1417}
1331 1418
1332sub load_extensions { 1419sub load_extensions {
1420 info "loading extensions...";
1421
1333 cf::sync_job { 1422 cf::sync_job {
1334 my %todo; 1423 my %todo;
1335 1424
1336 for my $path (<$LIBDIR/*.ext>) { 1425 for my $path (<$LIBDIR/*.ext>) {
1337 next unless -r $path; 1426 next unless -r $path;
1355 1444
1356 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1445 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1357 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1446 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1358 1447
1359 $ext{source} = 1448 $ext{source} =
1360 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1449 "package $pkg; use common::sense;\n"
1361 . "#line 1 \"$path\"\n{\n" 1450 . "#line 1 \"$path\"\n{\n"
1362 . $source 1451 . $source
1363 . "\n};\n1"; 1452 . "\n};\n1";
1364 1453
1365 $todo{$base} = \%ext; 1454 $todo{$base} = \%ext;
1366 } 1455 }
1367 1456
1457 my $pass = 0;
1368 my %done; 1458 my %done;
1369 while (%todo) { 1459 while (%todo) {
1370 my $progress; 1460 my $progress;
1371 1461
1462 ++$pass;
1463
1464 ext:
1372 while (my ($k, $v) = each %todo) { 1465 while (my ($k, $v) = each %todo) {
1373 for (split /,\s*/, $v->{meta}{depends}) { 1466 for (split /,\s*/, $v->{meta}{depends}) {
1374 goto skip 1467 next ext
1375 unless exists $done{$_}; 1468 unless exists $done{$_};
1376 } 1469 }
1377 1470
1378 warn "... loading '$k' into '$v->{pkg}'\n"; 1471 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1379 1472
1380 unless (eval $v->{source}) { 1473 my $active = eval $v->{source};
1474
1475 if (length $@) {
1381 my $msg = $@ ? "$v->{path}: $@\n" 1476 error "$v->{path}: $@\n";
1382 : "$v->{base}: extension inactive.\n";
1383 1477
1384 if (exists $v->{meta}{mandatory}) {
1385 warn $msg;
1386 cf::cleanup "mandatory extension failed to load, exiting."; 1478 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1387 } 1479 if exists $v->{meta}{mandatory};
1388 1480
1389 warn $msg; 1481 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1482 delete $todo{$k};
1483 } else {
1484 $done{$k} = delete $todo{$k};
1485 push @EXTS, $v->{pkg};
1486 $progress = 1;
1487
1488 info "$v->{base}: extension inactive.\n"
1489 unless $active;
1390 } 1490 }
1391
1392 $done{$k} = delete $todo{$k};
1393 push @EXTS, $v->{pkg};
1394 $progress = 1;
1395 } 1491 }
1396 1492
1397 skip: 1493 unless ($progress) {
1398 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1494 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1399 unless $progress; 1495
1496 while (my ($k, $v) = each %todo) {
1497 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1498 if exists $v->{meta}{mandatory};
1499 }
1500 }
1400 } 1501 }
1401 }; 1502 };
1402} 1503}
1403 1504
1404############################################################################# 1505#############################################################################
1488 $cf::PLAYER{$login} = $pl 1589 $cf::PLAYER{$login} = $pl
1489 } 1590 }
1490 } 1591 }
1491} 1592}
1492 1593
1594cf::player->attach (
1595 on_load => sub {
1596 my ($pl, $path) = @_;
1597
1598 # restore slots saved in save, below
1599 my $slots = delete $pl->{_slots};
1600
1601 $pl->ob->current_weapon ($slots->[0]);
1602 $pl->combat_ob ($slots->[1]);
1603 $pl->ranged_ob ($slots->[2]);
1604 },
1605);
1606
1493sub save($) { 1607sub save($) {
1494 my ($pl) = @_; 1608 my ($pl) = @_;
1495 1609
1496 return if $pl->{deny_save}; 1610 return if $pl->{deny_save};
1497 1611
1502 1616
1503 aio_mkdir playerdir $pl, 0770; 1617 aio_mkdir playerdir $pl, 0770;
1504 $pl->{last_save} = $cf::RUNTIME; 1618 $pl->{last_save} = $cf::RUNTIME;
1505 1619
1506 cf::get_slot 0.01; 1620 cf::get_slot 0.01;
1621
1622 # save slots, to be restored later
1623 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1507 1624
1508 $pl->save_pl ($path); 1625 $pl->save_pl ($path);
1509 cf::cede_to_tick; 1626 cf::cede_to_tick;
1510} 1627}
1511 1628
1545 my $name = $pl->ob->name; 1662 my $name = $pl->ob->name;
1546 1663
1547 $pl->{deny_save} = 1; 1664 $pl->{deny_save} = 1;
1548 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1665 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1549 1666
1550 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1667 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1551 $pl->deactivate; 1668 $pl->deactivate;
1669
1552 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1670 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1553 $pl->ob->check_score;
1554 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1671 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1672 ext::highscore::check ($pl->ob);
1673
1555 $pl->ns->destroy if $pl->ns; 1674 $pl->ns->destroy if $pl->ns;
1556 1675
1557 my $path = playerdir $pl; 1676 my $path = playerdir $pl;
1558 my $temp = "$path~$cf::RUNTIME~deleting~"; 1677 my $temp = "$path~$cf::RUNTIME~deleting~";
1559 aio_rename $path, $temp; 1678 aio_rename $path, $temp;
1613 \@logins 1732 \@logins
1614} 1733}
1615 1734
1616=item $player->maps 1735=item $player->maps
1617 1736
1737=item cf::player::maps $login
1738
1618Returns an arrayref of map paths that are private for this 1739Returns an arrayref of map paths that are private for this
1619player. May block. 1740player. May block.
1620 1741
1621=cut 1742=cut
1622 1743
1684=cut 1805=cut
1685 1806
1686sub find_by_path($) { 1807sub find_by_path($) {
1687 my ($path) = @_; 1808 my ($path) = @_;
1688 1809
1810 $path =~ s/^~[^\/]*//; # skip ~login
1811
1689 my ($match, $specificity); 1812 my ($match, $specificity);
1690 1813
1691 for my $region (list) { 1814 for my $region (list) {
1692 if ($region->{match} && $path =~ $region->{match}) { 1815 if ($region->{match} && $path =~ $region->{match}) {
1693 ($match, $specificity) = ($region, $region->specificity) 1816 ($match, $specificity) = ($region, $region->specificity)
1724 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1847 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1725 1848
1726 # mit "rum" bekleckern, nicht 1849 # mit "rum" bekleckern, nicht
1727 $self->_create_random_map ( 1850 $self->_create_random_map (
1728 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1851 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1729 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1852 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1730 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1853 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1731 $rmp->{exit_on_final_map}, 1854 $rmp->{exit_on_final_map},
1732 $rmp->{xsize}, $rmp->{ysize}, 1855 $rmp->{xsize}, $rmp->{ysize},
1733 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1856 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1734 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1857 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1749 1872
1750sub register { 1873sub register {
1751 my (undef, $regex, $prio) = @_; 1874 my (undef, $regex, $prio) = @_;
1752 my $pkg = caller; 1875 my $pkg = caller;
1753 1876
1754 no strict;
1755 push @{"$pkg\::ISA"}, __PACKAGE__; 1877 push @{"$pkg\::ISA"}, __PACKAGE__;
1756 1878
1757 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1879 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1758} 1880}
1759 1881
1760# also paths starting with '/' 1882# also paths starting with '/'
1761$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1883$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1762 1884
1763sub thawer_merge { 1885sub thawer_merge {
1764 my ($self, $merge) = @_; 1886 my ($self, $merge) = @_;
1765 1887
1766 # we have to keep some variables in memory intact 1888 # we have to keep some variables in memory intact
1771} 1893}
1772 1894
1773sub normalise { 1895sub normalise {
1774 my ($path, $base) = @_; 1896 my ($path, $base) = @_;
1775 1897
1776 $path = "$path"; # make sure its a string 1898 $path = "$path"; # make sure it's a string
1777 1899
1778 $path =~ s/\.map$//; 1900 $path =~ s/\.map$//;
1779 1901
1780 # map plan: 1902 # map plan:
1781 # 1903 #
1820 $self->init; # pass $1 etc. 1942 $self->init; # pass $1 etc.
1821 return $self; 1943 return $self;
1822 } 1944 }
1823 } 1945 }
1824 1946
1825 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1947 Carp::cluck "unable to resolve path '$path' (base '$base')";
1826 () 1948 ()
1827} 1949}
1828 1950
1829sub init { 1951sub init {
1830 my ($self) = @_; 1952 my ($self) = @_;
1952} 2074}
1953 2075
1954sub find; 2076sub find;
1955sub find { 2077sub find {
1956 my ($path, $origin) = @_; 2078 my ($path, $origin) = @_;
2079
2080 cf::cede_to_tick;
1957 2081
1958 $path = normalise $path, $origin && $origin->path; 2082 $path = normalise $path, $origin && $origin->path;
1959 2083
1960 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2084 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1961 my $guard2 = cf::lock_acquire "map_find:$path"; 2085 my $guard2 = cf::lock_acquire "map_find:$path";
1980 2104
1981 $cf::MAP{$path} = $map 2105 $cf::MAP{$path} = $map
1982 } 2106 }
1983} 2107}
1984 2108
1985sub pre_load { } 2109sub pre_load { }
1986sub post_load { } 2110#sub post_load { } # XS
1987 2111
1988sub load { 2112sub load {
1989 my ($self) = @_; 2113 my ($self) = @_;
1990 2114
1991 local $self->{deny_reset} = 1; # loading can take a long time 2115 local $self->{deny_reset} = 1; # loading can take a long time
2048 } 2172 }
2049 2173
2050 $self->post_load; 2174 $self->post_load;
2051} 2175}
2052 2176
2177# customize the map for a given player, i.e.
2178# return the _real_ map. used by e.g. per-player
2179# maps to change the path to ~playername/mappath
2053sub customise_for { 2180sub customise_for {
2054 my ($self, $ob) = @_; 2181 my ($self, $ob) = @_;
2055 2182
2056 return find "~" . $ob->name . "/" . $self->{path} 2183 return find "~" . $ob->name . "/" . $self->{path}
2057 if $self->per_player; 2184 if $self->per_player;
2073 or next; 2200 or next;
2074 $neigh = find $neigh, $map 2201 $neigh = find $neigh, $map
2075 or next; 2202 or next;
2076 $neigh->load; 2203 $neigh->load;
2077 2204
2205 # now find the diagonal neighbours
2078 push @neigh, 2206 push @neigh,
2079 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2207 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2080 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2208 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2081 } 2209 }
2082 2210
2089} 2217}
2090 2218
2091sub find_sync { 2219sub find_sync {
2092 my ($path, $origin) = @_; 2220 my ($path, $origin) = @_;
2093 2221
2094 cf::sync_job { find $path, $origin } 2222 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2223 if $Coro::current == $Coro::main;
2224
2225 find $path, $origin
2095} 2226}
2096 2227
2097sub do_load_sync { 2228sub do_load_sync {
2098 my ($map) = @_; 2229 my ($map) = @_;
2099 2230
2100 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2231 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2101 if $Coro::current == $Coro::main; 2232 if $Coro::current == $Coro::main;
2102 2233
2103 cf::sync_job { $map->load }; 2234 $map->load;
2104} 2235}
2105 2236
2106our %MAP_PREFETCH; 2237our %MAP_PREFETCH;
2107our $MAP_PREFETCHER = undef; 2238our $MAP_PREFETCHER = undef;
2108 2239
2134 $MAP_PREFETCHER->prio (6); 2265 $MAP_PREFETCHER->prio (6);
2135 2266
2136 () 2267 ()
2137} 2268}
2138 2269
2270# common code, used by both ->save and ->swapout
2139sub save { 2271sub _save {
2140 my ($self) = @_; 2272 my ($self) = @_;
2141
2142 my $lock = cf::lock_acquire "map_data:$self->{path}";
2143 2273
2144 $self->{last_save} = $cf::RUNTIME; 2274 $self->{last_save} = $cf::RUNTIME;
2145 2275
2146 return unless $self->dirty; 2276 return unless $self->dirty;
2147 2277
2167 } else { 2297 } else {
2168 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2298 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2169 } 2299 }
2170} 2300}
2171 2301
2302sub save {
2303 my ($self) = @_;
2304
2305 my $lock = cf::lock_acquire "map_data:$self->{path}";
2306
2307 $self->_save;
2308}
2309
2172sub swap_out { 2310sub swap_out {
2173 my ($self) = @_; 2311 my ($self) = @_;
2174 2312
2175 # save first because save cedes
2176 $self->save;
2177
2178 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2313 my $lock = cf::lock_acquire "map_data:$self->{path}";
2179 2314
2180 return if $self->players;
2181 return if $self->in_memory != cf::MAP_ACTIVE; 2315 return if $self->in_memory != cf::MAP_ACTIVE;
2182 return if $self->{deny_save}; 2316 return if $self->{deny_save};
2317 return if $self->players;
2183 2318
2319 # first deactivate the map and "unlink" it from the core
2320 $self->deactivate;
2321 $_->clear_links_to ($self) for values %cf::MAP;
2184 $self->in_memory (cf::MAP_SWAPPED); 2322 $self->in_memory (cf::MAP_SWAPPED);
2323
2324 # then atomically save
2325 $self->_save;
2326
2327 # then free the map
2328 $self->clear;
2329}
2330
2331sub reset_at {
2332 my ($self) = @_;
2333
2334 # TODO: safety, remove and allow resettable per-player maps
2335 return 1e99 if $self->{deny_reset};
2336
2337 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2338 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2339
2340 $time + $to
2341}
2342
2343sub should_reset {
2344 my ($self) = @_;
2345
2346 $self->reset_at <= $cf::RUNTIME
2347}
2348
2349sub reset {
2350 my ($self) = @_;
2351
2352 my $lock = cf::lock_acquire "map_data:$self->{path}";
2353
2354 return if $self->players;
2355
2356 cf::trace "resetting map ", $self->path, "\n";
2357
2358 $self->in_memory (cf::MAP_SWAPPED);
2359
2360 # need to save uniques path
2361 unless ($self->{deny_save}) {
2362 my $uniq = $self->uniq_path; utf8::encode $uniq;
2363
2364 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2365 if $uniq;
2366 }
2367
2368 delete $cf::MAP{$self->path};
2185 2369
2186 $self->deactivate; 2370 $self->deactivate;
2187 $_->clear_links_to ($self) for values %cf::MAP; 2371 $_->clear_links_to ($self) for values %cf::MAP;
2188 $self->clear; 2372 $self->clear;
2189}
2190
2191sub reset_at {
2192 my ($self) = @_;
2193
2194 # TODO: safety, remove and allow resettable per-player maps
2195 return 1e99 if $self->{deny_reset};
2196
2197 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2198 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2199
2200 $time + $to
2201}
2202
2203sub should_reset {
2204 my ($self) = @_;
2205
2206 $self->reset_at <= $cf::RUNTIME
2207}
2208
2209sub reset {
2210 my ($self) = @_;
2211
2212 my $lock = cf::lock_acquire "map_data:$self->{path}";
2213
2214 return if $self->players;
2215
2216 warn "resetting map ", $self->path;
2217
2218 $self->in_memory (cf::MAP_SWAPPED);
2219
2220 # need to save uniques path
2221 unless ($self->{deny_save}) {
2222 my $uniq = $self->uniq_path; utf8::encode $uniq;
2223
2224 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2225 if $uniq;
2226 }
2227
2228 delete $cf::MAP{$self->path};
2229
2230 $self->deactivate;
2231 $_->clear_links_to ($self) for values %cf::MAP;
2232 $self->clear;
2233 2373
2234 $self->unlink_save; 2374 $self->unlink_save;
2235 $self->destroy; 2375 $self->destroy;
2236} 2376}
2237 2377
2245 2385
2246 delete $cf::MAP{$self->path}; 2386 delete $cf::MAP{$self->path};
2247 2387
2248 $self->unlink_save; 2388 $self->unlink_save;
2249 2389
2250 bless $self, "cf::map"; 2390 bless $self, "cf::map::wrap";
2251 delete $self->{deny_reset}; 2391 delete $self->{deny_reset};
2252 $self->{deny_save} = 1; 2392 $self->{deny_save} = 1;
2253 $self->reset_timeout (1); 2393 $self->reset_timeout (1);
2254 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2394 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2255 2395
2312 : normalise $_ 2452 : normalise $_
2313 } @{ aio_readdir $UNIQUEDIR or [] } 2453 } @{ aio_readdir $UNIQUEDIR or [] }
2314 ] 2454 ]
2315} 2455}
2316 2456
2457=item cf::map::static_maps
2458
2459Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2460file in the shared directory excluding F</styles> and F</editor>). May
2461block.
2462
2463=cut
2464
2465sub static_maps() {
2466 my @dirs = "";
2467 my @maps;
2468
2469 while (@dirs) {
2470 my $dir = shift @dirs;
2471
2472 next if $dir eq "/styles" || $dir eq "/editor";
2473
2474 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2475 or return;
2476
2477 for (@$files) {
2478 s/\.map$// or next;
2479 utf8::decode $_;
2480 push @maps, "$dir/$_";
2481 }
2482
2483 push @dirs, map "$dir/$_", @$dirs;
2484 }
2485
2486 \@maps
2487}
2488
2317=back 2489=back
2318 2490
2319=head3 cf::object 2491=head3 cf::object
2320 2492
2321=cut 2493=cut
2386 2558
2387our $SAY_CHANNEL = { 2559our $SAY_CHANNEL = {
2388 id => "say", 2560 id => "say",
2389 title => "Map", 2561 title => "Map",
2390 reply => "say ", 2562 reply => "say ",
2391 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2563 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2392}; 2564};
2393 2565
2394our $CHAT_CHANNEL = { 2566our $CHAT_CHANNEL = {
2395 id => "chat", 2567 id => "chat",
2396 title => "Chat", 2568 title => "Chat",
2453 2625
2454Freezes the player and moves him/her to a special map (C<{link}>). 2626Freezes the player and moves him/her to a special map (C<{link}>).
2455 2627
2456The player should be reasonably safe there for short amounts of time (e.g. 2628The player should be reasonably safe there for short amounts of time (e.g.
2457for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2629for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2458though, as the palyer cannot control the character while it is on the link 2630though, as the player cannot control the character while it is on the link
2459map. 2631map.
2460 2632
2461Will never block. 2633Will never block.
2462 2634
2463=item $player_object->leave_link ($map, $x, $y) 2635=item $player_object->leave_link ($map, $x, $y)
2484sub cf::object::player::enter_link { 2656sub cf::object::player::enter_link {
2485 my ($self) = @_; 2657 my ($self) = @_;
2486 2658
2487 $self->deactivate_recursive; 2659 $self->deactivate_recursive;
2488 2660
2661 ++$self->{_link_recursion};
2662
2489 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2663 return if UNIVERSAL::isa $self->map, "ext::map_link";
2490 2664
2491 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2665 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2492 if $self->map && $self->map->{path} ne "{link}"; 2666 if $self->map && $self->map->{path} ne "{link}";
2493 2667
2494 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2668 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2495} 2669}
2496 2670
2497sub cf::object::player::leave_link { 2671sub cf::object::player::leave_link {
2498 my ($self, $map, $x, $y) = @_; 2672 my ($self, $map, $x, $y) = @_;
2499 2673
2516 ($x, $y) = (-1, -1) 2690 ($x, $y) = (-1, -1)
2517 unless (defined $x) && (defined $y); 2691 unless (defined $x) && (defined $y);
2518 2692
2519 # use -1 or undef as default coordinates, not 0, 0 2693 # use -1 or undef as default coordinates, not 0, 0
2520 ($x, $y) = ($map->enter_x, $map->enter_y) 2694 ($x, $y) = ($map->enter_x, $map->enter_y)
2521 if $x <=0 && $y <= 0; 2695 if $x <= 0 && $y <= 0;
2522 2696
2523 $map->load; 2697 $map->load;
2524 $map->load_neighbours; 2698 $map->load_neighbours;
2525 2699
2526 return unless $self->contr->active; 2700 return unless $self->contr->active;
2527 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2528 $self->activate_recursive;
2529 2701
2530 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2702 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2531 $self->enter_map ($map, $x, $y); 2703 if ($self->enter_map ($map, $x, $y)) {
2532} 2704 # entering was successful
2705 delete $self->{_link_recursion};
2706 # only activate afterwards, to support waiting in hooks
2707 $self->activate_recursive;
2708 }
2533 2709
2710}
2711
2534=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2712=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2535 2713
2536Moves the player to the given map-path and coordinates by first freezing 2714Moves the player to the given map-path and coordinates by first freezing
2537her, loading and preparing them map, calling the provided $check callback 2715her, loading and preparing them map, calling the provided $check callback
2538that has to return the map if sucecssful, and then unfreezes the player on 2716that has to return the map if sucecssful, and then unfreezes the player on
2539the new (success) or old (failed) map position. In either case, $done will 2717the new (success) or old (failed) map position. In either case, $done will
2546 2724
2547our $GOTOGEN; 2725our $GOTOGEN;
2548 2726
2549sub cf::object::player::goto { 2727sub cf::object::player::goto {
2550 my ($self, $path, $x, $y, $check, $done) = @_; 2728 my ($self, $path, $x, $y, $check, $done) = @_;
2729
2730 if ($self->{_link_recursion} >= $MAX_LINKS) {
2731 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2732 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2733 ($path, $x, $y) = @$EMERGENCY_POSITION;
2734 }
2551 2735
2552 # do generation counting so two concurrent goto's will be executed in-order 2736 # do generation counting so two concurrent goto's will be executed in-order
2553 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2737 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2554 2738
2555 $self->enter_link; 2739 $self->enter_link;
2579 my $map = eval { 2763 my $map = eval {
2580 my $map = defined $path ? cf::map::find $path : undef; 2764 my $map = defined $path ? cf::map::find $path : undef;
2581 2765
2582 if ($map) { 2766 if ($map) {
2583 $map = $map->customise_for ($self); 2767 $map = $map->customise_for ($self);
2584 $map = $check->($map) if $check && $map; 2768 $map = $check->($map, $x, $y, $self) if $check && $map;
2585 } else { 2769 } else {
2586 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2770 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2587 } 2771 }
2588 2772
2589 $map 2773 $map
2597 if ($gen == $self->{_goto_generation}) { 2781 if ($gen == $self->{_goto_generation}) {
2598 delete $self->{_goto_generation}; 2782 delete $self->{_goto_generation};
2599 $self->leave_link ($map, $x, $y); 2783 $self->leave_link ($map, $x, $y);
2600 } 2784 }
2601 2785
2602 $done->() if $done; 2786 $done->($self) if $done;
2603 })->prio (1); 2787 })->prio (1);
2604} 2788}
2605 2789
2606=item $player_object->enter_exit ($exit_object) 2790=item $player_object->enter_exit ($exit_object)
2607 2791
2700 $self->message ("Something went wrong deep within the deliantra server. " 2884 $self->message ("Something went wrong deep within the deliantra server. "
2701 . "I'll try to bring you back to the map you were before. " 2885 . "I'll try to bring you back to the map you were before. "
2702 . "Please report this to the dungeon master!", 2886 . "Please report this to the dungeon master!",
2703 cf::NDI_UNIQUE | cf::NDI_RED); 2887 cf::NDI_UNIQUE | cf::NDI_RED);
2704 2888
2705 warn "ERROR in enter_exit: $@"; 2889 error "ERROR in enter_exit: $@";
2706 $self->leave_link; 2890 $self->leave_link;
2707 } 2891 }
2708 })->prio (1); 2892 })->prio (1);
2709} 2893}
2710 2894
2722sub cf::client::send_drawinfo { 2906sub cf::client::send_drawinfo {
2723 my ($self, $text, $flags) = @_; 2907 my ($self, $text, $flags) = @_;
2724 2908
2725 utf8::encode $text; 2909 utf8::encode $text;
2726 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2910 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2911}
2912
2913=item $client->send_big_packet ($pkt)
2914
2915Like C<send_packet>, but tries to compress large packets, and fragments
2916them as required.
2917
2918=cut
2919
2920our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2921
2922sub cf::client::send_big_packet {
2923 my ($self, $pkt) = @_;
2924
2925 # try lzf for large packets
2926 $pkt = "lzf " . Compress::LZF::compress $pkt
2927 if 1024 <= length $pkt and $self->{can_lzf};
2928
2929 # split very large packets
2930 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2931 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2932 $pkt = "frag";
2933 }
2934
2935 $self->send_packet ($pkt);
2727} 2936}
2728 2937
2729=item $client->send_msg ($channel, $msg, $color, [extra...]) 2938=item $client->send_msg ($channel, $msg, $color, [extra...])
2730 2939
2731Send a drawinfo or msg packet to the client, formatting the msg for the 2940Send a drawinfo or msg packet to the client, formatting the msg for the
2735 2944
2736=cut 2945=cut
2737 2946
2738# non-persistent channels (usually the info channel) 2947# non-persistent channels (usually the info channel)
2739our %CHANNEL = ( 2948our %CHANNEL = (
2949 "c/motd" => {
2950 id => "infobox",
2951 title => "MOTD",
2952 reply => undef,
2953 tooltip => "The message of the day",
2954 },
2740 "c/identify" => { 2955 "c/identify" => {
2741 id => "infobox", 2956 id => "infobox",
2742 title => "Identify", 2957 title => "Identify",
2743 reply => undef, 2958 reply => undef,
2744 tooltip => "Items recently identified", 2959 tooltip => "Items recently identified",
2746 "c/examine" => { 2961 "c/examine" => {
2747 id => "infobox", 2962 id => "infobox",
2748 title => "Examine", 2963 title => "Examine",
2749 reply => undef, 2964 reply => undef,
2750 tooltip => "Signs and other items you examined", 2965 tooltip => "Signs and other items you examined",
2966 },
2967 "c/shopinfo" => {
2968 id => "infobox",
2969 title => "Shop Info",
2970 reply => undef,
2971 tooltip => "What your bargaining skill tells you about the shop",
2751 }, 2972 },
2752 "c/book" => { 2973 "c/book" => {
2753 id => "infobox", 2974 id => "infobox",
2754 title => "Book", 2975 title => "Book",
2755 reply => undef, 2976 reply => undef,
2783 id => "infobox", 3004 id => "infobox",
2784 title => "Skills", 3005 title => "Skills",
2785 reply => undef, 3006 reply => undef,
2786 tooltip => "Shows your experience per skill and item power", 3007 tooltip => "Shows your experience per skill and item power",
2787 }, 3008 },
3009 "c/shopitems" => {
3010 id => "infobox",
3011 title => "Shop Items",
3012 reply => undef,
3013 tooltip => "Shows the items currently for sale in this shop",
3014 },
2788 "c/resistances" => { 3015 "c/resistances" => {
2789 id => "infobox", 3016 id => "infobox",
2790 title => "Resistances", 3017 title => "Resistances",
2791 reply => undef, 3018 reply => undef,
2792 tooltip => "Shows your resistances", 3019 tooltip => "Shows your resistances",
2794 "c/pets" => { 3021 "c/pets" => {
2795 id => "infobox", 3022 id => "infobox",
2796 title => "Pets", 3023 title => "Pets",
2797 reply => undef, 3024 reply => undef,
2798 tooltip => "Shows information abotu your pets/a specific pet", 3025 tooltip => "Shows information abotu your pets/a specific pet",
3026 },
3027 "c/perceiveself" => {
3028 id => "infobox",
3029 title => "Perceive Self",
3030 reply => undef,
3031 tooltip => "You gained detailed knowledge about yourself",
2799 }, 3032 },
2800 "c/uptime" => { 3033 "c/uptime" => {
2801 id => "infobox", 3034 id => "infobox",
2802 title => "Uptime", 3035 title => "Uptime",
2803 reply => undef, 3036 reply => undef,
2859 my $pkt = "msg " 3092 my $pkt = "msg "
2860 . $self->{json_coder}->encode ( 3093 . $self->{json_coder}->encode (
2861 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3094 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2862 ); 3095 );
2863 3096
2864 # try lzf for large packets
2865 $pkt = "lzf " . Compress::LZF::compress $pkt
2866 if 1024 <= length $pkt and $self->{can_lzf};
2867
2868 # split very large packets
2869 if (8192 < length $pkt and $self->{can_lzf}) {
2870 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2871 $pkt = "frag";
2872 }
2873
2874 $self->send_packet ($pkt); 3097 $self->send_big_packet ($pkt);
2875} 3098}
2876 3099
2877=item $client->ext_msg ($type, @msg) 3100=item $client->ext_msg ($type, @msg)
2878 3101
2879Sends an ext event to the client. 3102Sends an ext event to the client.
2882 3105
2883sub cf::client::ext_msg($$@) { 3106sub cf::client::ext_msg($$@) {
2884 my ($self, $type, @msg) = @_; 3107 my ($self, $type, @msg) = @_;
2885 3108
2886 if ($self->extcmd == 2) { 3109 if ($self->extcmd == 2) {
2887 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3110 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2888 } elsif ($self->extcmd == 1) { # TODO: remove 3111 } elsif ($self->extcmd == 1) { # TODO: remove
2889 push @msg, msgtype => "event_$type"; 3112 push @msg, msgtype => "event_$type";
2890 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3113 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2891 } 3114 }
2892} 3115}
2893 3116
2894=item $client->ext_reply ($msgid, @msg) 3117=item $client->ext_reply ($msgid, @msg)
2895 3118
2899 3122
2900sub cf::client::ext_reply($$@) { 3123sub cf::client::ext_reply($$@) {
2901 my ($self, $id, @msg) = @_; 3124 my ($self, $id, @msg) = @_;
2902 3125
2903 if ($self->extcmd == 2) { 3126 if ($self->extcmd == 2) {
2904 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3127 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2905 } elsif ($self->extcmd == 1) { 3128 } elsif ($self->extcmd == 1) {
2906 #TODO: version 1, remove 3129 #TODO: version 1, remove
2907 unshift @msg, msgtype => "reply", msgid => $id; 3130 unshift @msg, msgtype => "reply", msgid => $id;
2908 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3131 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2909 } 3132 }
2910} 3133}
2911 3134
2912=item $success = $client->query ($flags, "text", \&cb) 3135=item $success = $client->query ($flags, "text", \&cb)
2913 3136
2984 3207
2985 $ns->ext_reply ($reply, @reply) 3208 $ns->ext_reply ($reply, @reply)
2986 if $reply; 3209 if $reply;
2987 3210
2988 } else { 3211 } else {
2989 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3212 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2990 } 3213 }
2991 3214
2992 cf::override; 3215 cf::override;
2993 }, 3216 },
2994); 3217);
3014 3237
3015 $coro 3238 $coro
3016} 3239}
3017 3240
3018cf::client->attach ( 3241cf::client->attach (
3019 on_destroy => sub { 3242 on_client_destroy => sub {
3020 my ($ns) = @_; 3243 my ($ns) = @_;
3021 3244
3022 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3245 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3023 }, 3246 },
3024); 3247);
3040our $safe_hole = new Safe::Hole; 3263our $safe_hole = new Safe::Hole;
3041 3264
3042$SIG{FPE} = 'IGNORE'; 3265$SIG{FPE} = 'IGNORE';
3043 3266
3044$safe->permit_only (Opcode::opset qw( 3267$safe->permit_only (Opcode::opset qw(
3045 :base_core :base_mem :base_orig :base_math 3268 :base_core :base_mem :base_orig :base_math :base_loop
3046 grepstart grepwhile mapstart mapwhile 3269 grepstart grepwhile mapstart mapwhile
3047 sort time 3270 sort time
3048)); 3271));
3049 3272
3050# here we export the classes and methods available to script code 3273# here we export the classes and methods available to script code
3075 decrease split destroy change_exp value msg lore send_msg)], 3298 decrease split destroy change_exp value msg lore send_msg)],
3076 ["cf::object::player" => qw(player)], 3299 ["cf::object::player" => qw(player)],
3077 ["cf::player" => qw(peaceful send_msg)], 3300 ["cf::player" => qw(peaceful send_msg)],
3078 ["cf::map" => qw(trigger)], 3301 ["cf::map" => qw(trigger)],
3079) { 3302) {
3080 no strict 'refs';
3081 my ($pkg, @funs) = @$_; 3303 my ($pkg, @funs) = @$_;
3082 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3304 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3083 for @funs; 3305 for @funs;
3084} 3306}
3085 3307
3102 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3324 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3103 $qcode =~ s/\n/\\n/g; 3325 $qcode =~ s/\n/\\n/g;
3104 3326
3105 %vars = (_dummy => 0) unless %vars; 3327 %vars = (_dummy => 0) unless %vars;
3106 3328
3329 my @res;
3107 local $_; 3330 local $_;
3108 local @safe::cf::_safe_eval_args = values %vars;
3109 3331
3110 my $eval = 3332 my $eval =
3111 "do {\n" 3333 "do {\n"
3112 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3334 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3113 . "#line 0 \"{$qcode}\"\n" 3335 . "#line 0 \"{$qcode}\"\n"
3114 . $code 3336 . $code
3115 . "\n}" 3337 . "\n}"
3116 ; 3338 ;
3117 3339
3340 if ($CFG{safe_eval}) {
3118 sub_generation_inc; 3341 sub_generation_inc;
3342 local @safe::cf::_safe_eval_args = values %vars;
3119 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3343 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3120 sub_generation_inc; 3344 sub_generation_inc;
3345 } else {
3346 local @cf::_safe_eval_args = values %vars;
3347 @res = wantarray ? eval eval : scalar eval $eval;
3348 }
3121 3349
3122 if ($@) { 3350 if ($@) {
3123 warn "$@"; 3351 warn "$@",
3124 warn "while executing safe code '$code'\n"; 3352 "while executing safe code '$code'\n",
3125 warn "with arguments " . (join " ", %vars) . "\n"; 3353 "with arguments " . (join " ", %vars) . "\n";
3126 } 3354 }
3127 3355
3128 wantarray ? @res : $res[0] 3356 wantarray ? @res : $res[0]
3129} 3357}
3130 3358
3144=cut 3372=cut
3145 3373
3146sub register_script_function { 3374sub register_script_function {
3147 my ($fun, $cb) = @_; 3375 my ($fun, $cb) = @_;
3148 3376
3149 no strict 'refs'; 3377 $fun = "safe::$fun" if $CFG{safe_eval};
3150 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3378 *$fun = $safe_hole->wrap ($cb);
3151} 3379}
3152 3380
3153=back 3381=back
3154 3382
3155=cut 3383=cut
3164 # for this (global event?) 3392 # for this (global event?)
3165 %ext::player_env::MUSIC_FACE_CACHE = (); 3393 %ext::player_env::MUSIC_FACE_CACHE = ();
3166 3394
3167 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3395 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3168 3396
3169 warn "loading facedata from $path\n"; 3397 trace "loading facedata from $path\n";
3170 3398
3171 my $facedata;
3172 0 < aio_load $path, $facedata 3399 0 < aio_load $path, my $facedata
3173 or die "$path: $!"; 3400 or die "$path: $!";
3174 3401
3175 $facedata = Coro::Storable::thaw $facedata; 3402 $facedata = Coro::Storable::thaw $facedata;
3176 3403
3177 $facedata->{version} == 2 3404 $facedata->{version} == 2
3178 or cf::cleanup "$path: version mismatch, cannot proceed."; 3405 or cf::cleanup "$path: version mismatch, cannot proceed.";
3179 3406
3180 # patch in the exptable 3407 # patch in the exptable
3408 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3181 $facedata->{resource}{"res/exp_table"} = { 3409 $facedata->{resource}{"res/exp_table"} = {
3182 type => FT_RSRC, 3410 type => FT_RSRC,
3183 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3411 data => $exp_table,
3412 hash => (Digest::MD5::md5 $exp_table),
3184 }; 3413 };
3185 cf::cede_to_tick; 3414 cf::cede_to_tick;
3186 3415
3187 { 3416 {
3188 my $faces = $facedata->{faceinfo}; 3417 my $faces = $facedata->{faceinfo};
3190 while (my ($face, $info) = each %$faces) { 3419 while (my ($face, $info) = each %$faces) {
3191 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3420 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3192 3421
3193 cf::face::set_visibility $idx, $info->{visibility}; 3422 cf::face::set_visibility $idx, $info->{visibility};
3194 cf::face::set_magicmap $idx, $info->{magicmap}; 3423 cf::face::set_magicmap $idx, $info->{magicmap};
3195 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3424 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3196 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3425 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3197 3426
3198 cf::cede_to_tick; 3427 cf::cede_to_tick;
3199 } 3428 }
3200 3429
3201 while (my ($face, $info) = each %$faces) { 3430 while (my ($face, $info) = each %$faces) {
3206 3435
3207 if (my $smooth = cf::face::find $info->{smooth}) { 3436 if (my $smooth = cf::face::find $info->{smooth}) {
3208 cf::face::set_smooth $idx, $smooth; 3437 cf::face::set_smooth $idx, $smooth;
3209 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3438 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3210 } else { 3439 } else {
3211 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3440 error "smooth face '$info->{smooth}' not found for face '$face'";
3212 } 3441 }
3213 3442
3214 cf::cede_to_tick; 3443 cf::cede_to_tick;
3215 } 3444 }
3216 } 3445 }
3225 3454
3226 cf::anim::invalidate_all; # d'oh 3455 cf::anim::invalidate_all; # d'oh
3227 } 3456 }
3228 3457
3229 { 3458 {
3230 # TODO: for gcfclient pleasure, we should give resources
3231 # that gcfclient doesn't grok a >10000 face index.
3232 my $res = $facedata->{resource}; 3459 my $res = $facedata->{resource};
3233 3460
3234 while (my ($name, $info) = each %$res) { 3461 while (my ($name, $info) = each %$res) {
3235 if (defined $info->{type}) { 3462 if (defined $info->{type}) {
3236 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3463 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3237 my $data;
3238 3464
3239 if ($info->{type} & 1) { 3465 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}; 3466 cf::face::set_type $idx, $info->{type};
3254 } else { 3467 } else {
3255 $RESOURCE{$name} = $info; 3468 $RESOURCE{$name} = $info; # unused
3256 } 3469 }
3257 3470
3258 cf::cede_to_tick; 3471 cf::cede_to_tick;
3259 } 3472 }
3260 } 3473 }
3261 3474
3262 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3475 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3263 3476
3264 1 3477 1
3265} 3478}
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 3479
3287register_exticmd fx_want => sub { 3480register_exticmd fx_want => sub {
3288 my ($ns, $want) = @_; 3481 my ($ns, $want) = @_;
3289 3482
3290 while (my ($k, $v) = each %$want) { 3483 while (my ($k, $v) = each %$want) {
3329sub reload_treasures { 3522sub reload_treasures {
3330 load_resource_file "$DATADIR/treasures" 3523 load_resource_file "$DATADIR/treasures"
3331 or die "unable to load treasurelists\n"; 3524 or die "unable to load treasurelists\n";
3332} 3525}
3333 3526
3527sub reload_sound {
3528 trace "loading sound config from $DATADIR/sound\n";
3529
3530 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3531 or die "$DATADIR/sound $!";
3532
3533 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3534
3535 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3536 my $sound = $soundconf->{compat}[$_]
3537 or next;
3538
3539 my $face = cf::face::find "sound/$sound->[1]";
3540 cf::sound::set $sound->[0] => $face;
3541 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3542 }
3543
3544 while (my ($k, $v) = each %{$soundconf->{event}}) {
3545 my $face = cf::face::find "sound/$v";
3546 cf::sound::set $k => $face;
3547 }
3548}
3549
3334sub reload_resources { 3550sub reload_resources {
3335 warn "reloading resource files...\n"; 3551 trace "reloading resource files...\n";
3336 3552
3553 reload_exp_table;
3554 reload_materials;
3337 reload_facedata; 3555 reload_facedata;
3556 reload_sound;
3338 reload_archetypes; 3557 reload_archetypes;
3339 reload_regions; 3558 reload_regions;
3340 reload_treasures; 3559 reload_treasures;
3341 3560
3342 warn "finished reloading resource files\n"; 3561 trace "finished reloading resource files\n";
3343} 3562}
3344 3563
3345sub reload_config { 3564sub reload_config {
3346 open my $fh, "<:utf8", "$CONFDIR/config" 3565 trace "reloading config file...\n";
3347 or return;
3348 3566
3349 local $/; 3567 0 < aio_load "$CONFDIR/config", my $config
3350 *CFG = YAML::Load <$fh>; 3568 or die "$CONFDIR/config: $!";
3351 3569
3570 utf8::decode $config;
3571 *CFG = yaml_load $config;
3572
3352 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3573 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3353 3574
3354 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3575 $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}; 3576 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3356 3577
3357 if (exists $CFG{mlockall}) { 3578 if (exists $CFG{mlockall}) {
3380 3601
3381 seek $fh, 0, 0; 3602 seek $fh, 0, 0;
3382 print $fh $$; 3603 print $fh $$;
3383} 3604}
3384 3605
3606sub main_loop {
3607 trace "EV::loop starting\n";
3608 if (1) {
3609 EV::loop;
3610 }
3611 trace "EV::loop returned\n";
3612 goto &main_loop unless $REALLY_UNLOOP;
3613}
3614
3385sub main { 3615sub main {
3386 cf::init_globals; # initialise logging 3616 cf::init_globals; # initialise logging
3387 3617
3388 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3618 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3389 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3619 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3390 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3620 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3391 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3621 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 3622
3398 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3623 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3399 3624
3400 # we must not ever block the main coroutine 3625 # we must not ever block the main coroutine
3401 local $Coro::idle = sub { 3626 local $Coro::idle = sub {
3407 }; 3632 };
3408 3633
3409 evthread_start IO::AIO::poll_fileno; 3634 evthread_start IO::AIO::poll_fileno;
3410 3635
3411 cf::sync_job { 3636 cf::sync_job {
3637 cf::incloader::init ();
3638
3639 cf::init_anim;
3640 cf::init_attackmess;
3641 cf::init_dynamic;
3642
3643 cf::load_settings;
3644
3412 reload_resources; 3645 reload_resources;
3413 reload_config; 3646 reload_config;
3414 db_init; 3647 db_init;
3415 3648
3416 cf::load_settings;
3417 cf::load_materials;
3418 cf::init_uuid; 3649 cf::init_uuid;
3419 cf::init_signals; 3650 cf::init_signals;
3420 cf::init_commands;
3421 cf::init_skills; 3651 cf::init_skills;
3422 3652
3423 cf::init_beforeplay; 3653 cf::init_beforeplay;
3424 3654
3425 atomic; 3655 atomic;
3427 load_extensions; 3657 load_extensions;
3428 3658
3429 utime time, time, $RUNTIMEFILE; 3659 utime time, time, $RUNTIMEFILE;
3430 3660
3431 # no (long-running) fork's whatsoever before this point(!) 3661 # no (long-running) fork's whatsoever before this point(!)
3662 use POSIX ();
3432 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3663 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3433 3664
3434 (pop @POST_INIT)->(0) while @POST_INIT; 3665 (pop @POST_INIT)->(0) while @POST_INIT;
3435 }; 3666 };
3436 3667
3437 EV::loop; 3668 cf::object::thawer::errors_are_fatal 0;
3669 info "parse errors in files are no longer fatal from this point on.\n";
3670
3671 my $free_main; $free_main = EV::idle sub {
3672 undef $free_main;
3673 undef &main; # free gobs of memory :)
3674 };
3675
3676 goto &main_loop;
3438} 3677}
3439 3678
3440############################################################################# 3679#############################################################################
3441# initialisation and cleanup 3680# initialisation and cleanup
3442 3681
3443# install some emergency cleanup handlers 3682# install some emergency cleanup handlers
3444BEGIN { 3683BEGIN {
3445 our %SIGWATCHER = (); 3684 our %SIGWATCHER = ();
3446 for my $signal (qw(INT HUP TERM)) { 3685 for my $signal (qw(INT HUP TERM)) {
3447 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3686 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3448 cf::cleanup "SIG$signal"; 3687 cf::cleanup "SIG$signal";
3449 }; 3688 };
3450 } 3689 }
3451} 3690}
3452 3691
3453sub write_runtime_sync { 3692sub write_runtime_sync {
3693 my $t0 = AE::time;
3694
3454 # first touch the runtime file to show we are still running: 3695 # first touch the runtime file to show we are still running:
3455 # the fsync below can take a very very long time. 3696 # the fsync below can take a very very long time.
3456 3697
3457 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3698 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3458 3699
3459 my $guard = cf::lock_acquire "write_runtime"; 3700 my $guard = cf::lock_acquire "write_runtime";
3460 3701
3461 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3702 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3462 or return; 3703 or return;
3463 3704
3464 my $value = $cf::RUNTIME + 90 + 10; 3705 my $value = $cf::RUNTIME + 90 + 10;
3465 # 10 is the runtime save interval, for a monotonic clock 3706 # 10 is the runtime save interval, for a monotonic clock
3466 # 60 allows for the watchdog to kill the server. 3707 # 60 allows for the watchdog to kill the server.
3479 or return; 3720 or return;
3480 3721
3481 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3722 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3482 and return; 3723 and return;
3483 3724
3484 warn "runtime file written.\n"; 3725 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3485 3726
3486 1 3727 1
3487} 3728}
3488 3729
3489our $uuid_lock; 3730our $uuid_lock;
3501 or return; 3742 or return;
3502 3743
3503 my $value = uuid_seq uuid_cur; 3744 my $value = uuid_seq uuid_cur;
3504 3745
3505 unless ($value) { 3746 unless ($value) {
3506 warn "cowardly refusing to write zero uuid value!\n"; 3747 info "cowardly refusing to write zero uuid value!\n";
3507 return; 3748 return;
3508 } 3749 }
3509 3750
3510 my $value = uuid_str $value + $uuid_skip; 3751 my $value = uuid_str $value + $uuid_skip;
3511 $uuid_skip = 0; 3752 $uuid_skip = 0;
3521 or return; 3762 or return;
3522 3763
3523 aio_rename "$uuid~", $uuid 3764 aio_rename "$uuid~", $uuid
3524 and return; 3765 and return;
3525 3766
3526 warn "uuid file written ($value).\n"; 3767 trace "uuid file written ($value).\n";
3527 3768
3528 1 3769 1
3529 3770
3530} 3771}
3531 3772
3537} 3778}
3538 3779
3539sub emergency_save() { 3780sub emergency_save() {
3540 my $freeze_guard = cf::freeze_mainloop; 3781 my $freeze_guard = cf::freeze_mainloop;
3541 3782
3542 warn "emergency_perl_save: enter\n"; 3783 info "emergency_perl_save: enter\n";
3784
3785 # this is a trade-off: we want to be very quick here, so
3786 # save all maps without fsync, and later call a global sync
3787 # (which in turn might be very very slow)
3788 local $USE_FSYNC = 0;
3543 3789
3544 cf::sync_job { 3790 cf::sync_job {
3545 # this is a trade-off: we want to be very quick here, so 3791 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 3792
3550 # use a peculiar iteration method to avoid tripping on perl 3793 # use a peculiar iteration method to avoid tripping on perl
3551 # refcount bugs in for. also avoids problems with players 3794 # refcount bugs in for. also avoids problems with players
3552 # and maps saved/destroyed asynchronously. 3795 # and maps saved/destroyed asynchronously.
3553 warn "emergency_perl_save: begin player save\n"; 3796 info "emergency_perl_save: begin player save\n";
3554 for my $login (keys %cf::PLAYER) { 3797 for my $login (keys %cf::PLAYER) {
3555 my $pl = $cf::PLAYER{$login} or next; 3798 my $pl = $cf::PLAYER{$login} or next;
3556 $pl->valid or next; 3799 $pl->valid or next;
3557 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3800 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3558 $pl->save; 3801 $pl->save;
3559 } 3802 }
3560 warn "emergency_perl_save: end player save\n"; 3803 info "emergency_perl_save: end player save\n";
3561 3804
3805 cf::write_runtime_sync; # external watchdog should not bark
3806
3562 warn "emergency_perl_save: begin map save\n"; 3807 info "emergency_perl_save: begin map save\n";
3563 for my $path (keys %cf::MAP) { 3808 for my $path (keys %cf::MAP) {
3564 my $map = $cf::MAP{$path} or next; 3809 my $map = $cf::MAP{$path} or next;
3565 $map->valid or next; 3810 $map->valid or next;
3566 $map->save; 3811 $map->save;
3567 } 3812 }
3568 warn "emergency_perl_save: end map save\n"; 3813 info "emergency_perl_save: end map save\n";
3569 3814
3815 cf::write_runtime_sync; # external watchdog should not bark
3816
3570 warn "emergency_perl_save: begin database checkpoint\n"; 3817 info "emergency_perl_save: begin database checkpoint\n";
3571 BDB::db_env_txn_checkpoint $DB_ENV; 3818 BDB::db_env_txn_checkpoint $DB_ENV;
3572 warn "emergency_perl_save: end database checkpoint\n"; 3819 info "emergency_perl_save: end database checkpoint\n";
3573 3820
3574 warn "emergency_perl_save: begin write uuid\n"; 3821 info "emergency_perl_save: begin write uuid\n";
3575 write_uuid_sync 1; 3822 write_uuid_sync 1;
3576 warn "emergency_perl_save: end write uuid\n"; 3823 info "emergency_perl_save: end write uuid\n";
3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3826
3827 trace "emergency_perl_save: syncing database to disk";
3828 BDB::db_env_txn_checkpoint $DB_ENV;
3829
3830 info "emergency_perl_save: starting sync\n";
3831 IO::AIO::aio_sync sub {
3832 info "emergency_perl_save: finished sync\n";
3833 };
3834
3835 cf::write_runtime_sync; # external watchdog should not bark
3836
3837 trace "emergency_perl_save: flushing outstanding aio requests";
3838 while (IO::AIO::nreqs || BDB::nreqs) {
3839 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3840 }
3841
3842 cf::write_runtime_sync; # external watchdog should not bark
3577 }; 3843 };
3578 3844
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"; 3845 info "emergency_perl_save: leave\n";
3585} 3846}
3586 3847
3587sub post_cleanup { 3848sub post_cleanup {
3588 my ($make_core) = @_; 3849 my ($make_core) = @_;
3589 3850
3851 IO::AIO::flush;
3852
3590 warn Carp::longmess "post_cleanup backtrace" 3853 error Carp::longmess "post_cleanup backtrace"
3591 if $make_core; 3854 if $make_core;
3592 3855
3593 my $fh = pidfile; 3856 my $fh = pidfile;
3594 unlink $PIDFILE if <$fh> == $$; 3857 unlink $PIDFILE if <$fh> == $$;
3595} 3858}
3615 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3878 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3616 for my $name (keys %$leaf_symtab) { 3879 for my $name (keys %$leaf_symtab) {
3617 _gv_clear *{"$pkg$name"}; 3880 _gv_clear *{"$pkg$name"};
3618# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3881# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3619 } 3882 }
3620 warn "cleared package $pkg\n";#d#
3621} 3883}
3622 3884
3623sub do_reload_perl() { 3885sub do_reload_perl() {
3624 # can/must only be called in main 3886 # can/must only be called in main
3625 if ($Coro::current != $Coro::main) { 3887 unless (in_main) {
3626 warn "can only reload from main coroutine"; 3888 error "can only reload from main coroutine";
3627 return; 3889 return;
3628 } 3890 }
3629 3891
3630 return if $RELOAD++; 3892 return if $RELOAD++;
3631 3893
3632 my $t1 = EV::time; 3894 my $t1 = AE::time;
3633 3895
3634 while ($RELOAD) { 3896 while ($RELOAD) {
3897 cf::get_slot 0.1, -1, "reload_perl";
3635 warn "reloading..."; 3898 info "reloading...";
3636 3899
3637 warn "entering sync_job"; 3900 trace "entering sync_job";
3638 3901
3639 cf::sync_job { 3902 cf::sync_job {
3640 cf::write_runtime_sync; # external watchdog should not bark
3641 cf::emergency_save; 3903 #cf::emergency_save;
3642 cf::write_runtime_sync; # external watchdog should not bark
3643 3904
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"; 3905 trace "cancelling all extension coros";
3655 $_->cancel for values %EXT_CORO; 3906 $_->cancel for values %EXT_CORO;
3656 %EXT_CORO = (); 3907 %EXT_CORO = ();
3657 3908
3658 warn "removing commands"; 3909 trace "removing commands";
3659 %COMMAND = (); 3910 %COMMAND = ();
3660 3911
3661 warn "removing ext/exti commands"; 3912 trace "removing ext/exti commands";
3662 %EXTCMD = (); 3913 %EXTCMD = ();
3663 %EXTICMD = (); 3914 %EXTICMD = ();
3664 3915
3665 warn "unloading/nuking all extensions"; 3916 trace "unloading/nuking all extensions";
3666 for my $pkg (@EXTS) { 3917 for my $pkg (@EXTS) {
3667 warn "... unloading $pkg"; 3918 trace "... unloading $pkg";
3668 3919
3669 if (my $cb = $pkg->can ("unload")) { 3920 if (my $cb = $pkg->can ("unload")) {
3670 eval { 3921 eval {
3671 $cb->($pkg); 3922 $cb->($pkg);
3672 1 3923 1
3673 } or warn "$pkg unloaded, but with errors: $@"; 3924 } or error "$pkg unloaded, but with errors: $@";
3674 } 3925 }
3675 3926
3676 warn "... clearing $pkg"; 3927 trace "... clearing $pkg";
3677 clear_package $pkg; 3928 clear_package $pkg;
3678 } 3929 }
3679 3930
3680 warn "unloading all perl modules loaded from $LIBDIR"; 3931 trace "unloading all perl modules loaded from $LIBDIR";
3681 while (my ($k, $v) = each %INC) { 3932 while (my ($k, $v) = each %INC) {
3682 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3933 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3683 3934
3684 warn "... unloading $k"; 3935 trace "... unloading $k";
3685 delete $INC{$k}; 3936 delete $INC{$k};
3686 3937
3687 $k =~ s/\.pm$//; 3938 $k =~ s/\.pm$//;
3688 $k =~ s/\//::/g; 3939 $k =~ s/\//::/g;
3689 3940
3692 } 3943 }
3693 3944
3694 clear_package $k; 3945 clear_package $k;
3695 } 3946 }
3696 3947
3697 warn "getting rid of safe::, as good as possible"; 3948 trace "getting rid of safe::, as good as possible";
3698 clear_package "safe::$_" 3949 clear_package "safe::$_"
3699 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3950 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3700 3951
3701 warn "unloading cf.pm \"a bit\""; 3952 trace "unloading cf.pm \"a bit\"";
3702 delete $INC{"cf.pm"}; 3953 delete $INC{"cf.pm"};
3703 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3954 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3704 3955
3705 # don't, removes xs symbols, too, 3956 # don't, removes xs symbols, too,
3706 # and global variables created in xs 3957 # and global variables created in xs
3707 #clear_package __PACKAGE__; 3958 #clear_package __PACKAGE__;
3708 3959
3709 warn "unload completed, starting to reload now"; 3960 info "unload completed, starting to reload now";
3710 3961
3711 warn "reloading cf.pm"; 3962 trace "reloading cf.pm";
3712 require cf; 3963 require cf;
3713 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3964 cf::_connect_to_perl_1;
3714 3965
3715 warn "loading config and database again"; 3966 trace "loading config and database again";
3716 cf::reload_config; 3967 cf::reload_config;
3717 3968
3718 warn "loading extensions"; 3969 trace "loading extensions";
3719 cf::load_extensions; 3970 cf::load_extensions;
3720 3971
3721 if ($REATTACH_ON_RELOAD) { 3972 if ($REATTACH_ON_RELOAD) {
3722 warn "reattaching attachments to objects/players"; 3973 trace "reattaching attachments to objects/players";
3723 _global_reattach; # objects, sockets 3974 _global_reattach; # objects, sockets
3724 warn "reattaching attachments to maps"; 3975 trace "reattaching attachments to maps";
3725 reattach $_ for values %MAP; 3976 reattach $_ for values %MAP;
3726 warn "reattaching attachments to players"; 3977 trace "reattaching attachments to players";
3727 reattach $_ for values %PLAYER; 3978 reattach $_ for values %PLAYER;
3728 } 3979 }
3729 3980
3730 warn "running post_init jobs"; 3981 trace "running post_init jobs";
3731 (pop @POST_INIT)->(1) while @POST_INIT; 3982 (pop @POST_INIT)->(1) while @POST_INIT;
3732 3983
3733 warn "leaving sync_job"; 3984 trace "leaving sync_job";
3734 3985
3735 1 3986 1
3736 } or do { 3987 } or do {
3737 warn $@; 3988 error $@;
3738 cf::cleanup "error while reloading, exiting."; 3989 cf::cleanup "error while reloading, exiting.";
3739 }; 3990 };
3740 3991
3741 warn "reloaded"; 3992 info "reloaded";
3742 --$RELOAD; 3993 --$RELOAD;
3743 } 3994 }
3744 3995
3745 $t1 = EV::time - $t1; 3996 $t1 = AE::time - $t1;
3746 warn "reload completed in ${t1}s\n"; 3997 info "reload completed in ${t1}s\n";
3747}; 3998};
3748 3999
3749our $RELOAD_WATCHER; # used only during reload 4000our $RELOAD_WATCHER; # used only during reload
3750 4001
3751sub reload_perl() { 4002sub reload_perl() {
3753 # coro crashes during coro_state_free->destroy here. 4004 # coro crashes during coro_state_free->destroy here.
3754 4005
3755 $RELOAD_WATCHER ||= cf::async { 4006 $RELOAD_WATCHER ||= cf::async {
3756 Coro::AIO::aio_wait cache_extensions; 4007 Coro::AIO::aio_wait cache_extensions;
3757 4008
3758 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4009 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3759 do_reload_perl; 4010 do_reload_perl;
3760 undef $RELOAD_WATCHER; 4011 undef $RELOAD_WATCHER;
3761 }; 4012 };
3762 }; 4013 };
3763} 4014}
3772 reload_perl; 4023 reload_perl;
3773 }; 4024 };
3774 } 4025 }
3775}; 4026};
3776 4027
3777unshift @INC, $LIBDIR; 4028#############################################################################
3778 4029
3779my $bug_warning = 0; 4030my $bug_warning = 0;
3780 4031
3781our @WAIT_FOR_TICK; 4032our @WAIT_FOR_TICK;
3782our @WAIT_FOR_TICK_BEGIN; 4033our @WAIT_FOR_TICK_BEGIN;
3783 4034
3784sub wait_for_tick { 4035sub wait_for_tick() {
3785 return if tick_inhibit || $Coro::current == $Coro::main; 4036 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3786 4037
3787 my $signal = new Coro::Signal; 4038 my $signal = new Coro::Signal;
3788 push @WAIT_FOR_TICK, $signal; 4039 push @WAIT_FOR_TICK, $signal;
3789 $signal->wait; 4040 $signal->wait;
3790} 4041}
3791 4042
3792sub wait_for_tick_begin { 4043sub wait_for_tick_begin() {
3793 return if tick_inhibit || $Coro::current == $Coro::main; 4044 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3794 4045
3795 my $signal = new Coro::Signal; 4046 my $signal = new Coro::Signal;
3796 push @WAIT_FOR_TICK_BEGIN, $signal; 4047 push @WAIT_FOR_TICK_BEGIN, $signal;
3797 $signal->wait; 4048 $signal->wait;
3798} 4049}
3804 return; 4055 return;
3805 } 4056 }
3806 4057
3807 cf::server_tick; # one server iteration 4058 cf::server_tick; # one server iteration
3808 4059
4060 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4061
3809 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4062 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3810 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4063 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3811 Coro::async_pool { 4064 Coro::async_pool {
3812 $Coro::current->{desc} = "runtime saver"; 4065 $Coro::current->{desc} = "runtime saver";
3813 write_runtime_sync 4066 write_runtime_sync
3814 or warn "ERROR: unable to write runtime file: $!"; 4067 or error "ERROR: unable to write runtime file: $!";
3815 }; 4068 };
3816 } 4069 }
3817 4070
3818 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4071 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3819 $sig->send; 4072 $sig->send;
3827 4080
3828 if (0) { 4081 if (0) {
3829 if ($NEXT_TICK) { 4082 if ($NEXT_TICK) {
3830 my $jitter = $TICK_START - $NEXT_TICK; 4083 my $jitter = $TICK_START - $NEXT_TICK;
3831 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4084 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3832 warn "jitter $JITTER\n";#d# 4085 debug "jitter $JITTER\n";#d#
3833 } 4086 }
3834 } 4087 }
3835} 4088}
3836 4089
3837{ 4090{
3838 # configure BDB 4091 # configure BDB
3839 4092
3840 BDB::min_parallel 8; 4093 BDB::min_parallel 16;
3841 BDB::max_poll_reqs $TICK * 0.1; 4094 BDB::max_poll_reqs $TICK * 0.1;
3842 $AnyEvent::BDB::WATCHER->priority (1); 4095 $AnyEvent::BDB::WATCHER->priority (1);
3843 4096
3844 unless ($DB_ENV) { 4097 unless ($DB_ENV) {
3845 $DB_ENV = BDB::db_env_create; 4098 $DB_ENV = BDB::db_env_create;
3925 LOG llevInfo, "[ABT] [suppressed]\n"; 4178 LOG llevInfo, "[ABT] [suppressed]\n";
3926 } 4179 }
3927} 4180}
3928 4181
3929# load additional modules 4182# load additional modules
3930eval "use cf::$_" for @EXTRA_MODULES; 4183require "cf/$_.pm" for @EXTRA_MODULES;
4184cf::_connect_to_perl_2;
3931 4185
3932END { cf::emergency_save } 4186END { cf::emergency_save }
3933 4187
39341 41881
3935 4189

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines