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.468 by root, Thu Jan 8 19:23:44 2009 UTC vs.
Revision 1.548 by root, Mon May 10 21:40:22 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
155 168
156our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
157 170
158sub cf::map::normalise; 171sub cf::map::normalise;
159 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::"} };
187
160############################################################################# 188#############################################################################
161 189
162=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
163 191
164=over 4 192=over 4
205from wherever your confdir points to. 233from wherever your confdir points to.
206 234
207=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
208 236
209These 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
210returns 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
211per 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.
212 240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
213=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
214 247
215This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
216C<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
217that call. 250that call.
218 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
219=back 258=back
220 259
221=cut 260=cut
222 261
223BEGIN { 262sub error(@) { LOG llevError, join "", @_ }
224 *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 {
225 my $msg = join "", @_; 269 my $msg = join "", @_;
226 270
227 $msg .= "\n" 271 $msg .= "\n"
228 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
229 273
230 $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;
231 275
232 LOG llevError, $msg; 276 LOG llevWarn, $msg;
233 }; 277};
234}
235 278
236$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
237 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
238 281
239 if ($Coro::current == $Coro::main) {#d# 282 error Carp::longmess $_[0];
283
284 if (in_main) {#d#
240 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
241 return;#d# 286 return;#d#
242 }#d# 287 }#d#
243 288
244 # kill coroutine otherwise 289 # kill coroutine otherwise
245 warn Carp::longmess $_[0];
246 Coro::terminate 290 Coro::terminate
247}; 291};
248
249$SIG{__DIE__} = sub { }; #d#?
250 292
251@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 293@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
252@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 294@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
253@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 295@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
254@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 296@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
268)) { 310)) {
269 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
270} 312}
271 313
272$EV::DIED = sub { 314$EV::DIED = sub {
273 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
274}; 316};
275 317
276############################################################################# 318#############################################################################
277 319
278=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
315our $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
316 358
317sub encode_json($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
318sub decode_json($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
319 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
320=item cf::post_init { BLOCK } 374=item cf::post_init { BLOCK }
321 375
322Execute the given codeblock, I<after> all extensions have been (re-)loaded, 376Execute the given codeblock, I<after> all extensions have been (re-)loaded,
323but I<before> the server starts ticking again. 377but I<before> the server starts ticking again.
324 378
325The cdoeblock will have a single boolean argument to indicate whether this 379The codeblock will have a single boolean argument to indicate whether this
326is a reload or not. 380is a reload or not.
327 381
328=cut 382=cut
329 383
330sub post_init(&) { 384sub post_init(&) {
375} 429}
376 430
377=item cf::periodic $interval, $cb 431=item cf::periodic $interval, $cb
378 432
379Like 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
380get spread over timer. 434get spread over time.
381 435
382=cut 436=cut
383 437
384sub periodic($$) { 438sub periodic($$) {
385 my ($interval, $cb) = @_; 439 my ($interval, $cb) = @_;
402 456
403=cut 457=cut
404 458
405our @SLOT_QUEUE; 459our @SLOT_QUEUE;
406our $SLOT_QUEUE; 460our $SLOT_QUEUE;
461our $SLOT_DECAY = 0.9;
407 462
408$SLOT_QUEUE->cancel if $SLOT_QUEUE; 463$SLOT_QUEUE->cancel if $SLOT_QUEUE;
409$SLOT_QUEUE = Coro::async { 464$SLOT_QUEUE = Coro::async {
410 $Coro::current->desc ("timeslot manager"); 465 $Coro::current->desc ("timeslot manager");
411 466
412 my $signal = new Coro::Signal; 467 my $signal = new Coro::Signal;
468 my $busy;
413 469
414 while () { 470 while () {
415 next_job: 471 next_job:
472
416 my $avail = cf::till_tick; 473 my $avail = cf::till_tick;
417 if ($avail > 0.01) { 474
418 for (0 .. $#SLOT_QUEUE) { 475 for (0 .. $#SLOT_QUEUE) {
419 if ($SLOT_QUEUE[$_][0] < $avail) { 476 if ($SLOT_QUEUE[$_][0] <= $avail) {
477 $busy = 0;
420 my $job = splice @SLOT_QUEUE, $_, 1, (); 478 my $job = splice @SLOT_QUEUE, $_, 1, ();
421 $job->[2]->send; 479 $job->[2]->send;
422 Coro::cede; 480 Coro::cede;
423 goto next_job; 481 goto next_job;
424 } 482 } else {
483 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
425 } 484 }
426 } 485 }
427 486
428 if (@SLOT_QUEUE) { 487 if (@SLOT_QUEUE) {
429 # 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
430 push @cf::WAIT_FOR_TICK, $signal; 489 push @cf::WAIT_FOR_TICK, $signal;
431 $signal->wait; 490 $signal->wait;
432 } else { 491 } else {
492 $busy = 0;
433 Coro::schedule; 493 Coro::schedule;
434 } 494 }
435 } 495 }
436}; 496};
437 497
438sub get_slot($;$$) { 498sub get_slot($;$$) {
439 return if tick_inhibit || $Coro::current == $Coro::main; 499 return if tick_inhibit || $Coro::current == $Coro::main;
440 500
441 my ($time, $pri, $name) = @_; 501 my ($time, $pri, $name) = @_;
442 502
443 $time = $TICK * .6 if $time > $TICK * .6; 503 $time = clamp $time, 0.01, $TICK * .6;
504
444 my $sig = new Coro::Signal; 505 my $sig = new Coro::Signal;
445 506
446 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 507 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
447 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 508 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
448 $SLOT_QUEUE->ready; 509 $SLOT_QUEUE->ready;
474=cut 535=cut
475 536
476sub sync_job(&) { 537sub sync_job(&) {
477 my ($job) = @_; 538 my ($job) = @_;
478 539
479 if ($Coro::current == $Coro::main) { 540 if (in_main) {
480 my $time = EV::time; 541 my $time = AE::time;
481 542
482 # this is the main coro, too bad, we have to block 543 # this is the main coro, too bad, we have to block
483 # till the operation succeeds, freezing the server :/ 544 # till the operation succeeds, freezing the server :/
484 545
485 LOG llevError, Carp::longmess "sync job";#d# 546 #LOG llevError, Carp::longmess "sync job";#d#
486 547
487 my $freeze_guard = freeze_mainloop; 548 my $freeze_guard = freeze_mainloop;
488 549
489 my $busy = 1; 550 my $busy = 1;
490 my @res; 551 my @res;
491 552
492 (async { 553 (async {
493 $Coro::current->desc ("sync job coro"); 554 $Coro::current->desc ("sync job coro");
494 @res = eval { $job->() }; 555 @res = eval { $job->() };
495 warn $@ if $@; 556 error $@ if $@;
496 undef $busy; 557 undef $busy;
497 })->prio (Coro::PRIO_MAX); 558 })->prio (Coro::PRIO_MAX);
498 559
499 while ($busy) { 560 while ($busy) {
500 if (Coro::nready) { 561 if (Coro::nready) {
502 } else { 563 } else {
503 EV::loop EV::LOOP_ONESHOT; 564 EV::loop EV::LOOP_ONESHOT;
504 } 565 }
505 } 566 }
506 567
507 my $time = EV::time - $time; 568 my $time = AE::time - $time;
508 569
509 $TICK_START += $time; # do not account sync jobs to server load 570 $TICK_START += $time; # do not account sync jobs to server load
510 571
511 wantarray ? @res : $res[0] 572 wantarray ? @res : $res[0]
512 } else { 573 } else {
534 $EXT_CORO{$coro+0} = $coro; 595 $EXT_CORO{$coro+0} = $coro;
535 596
536 $coro 597 $coro
537} 598}
538 599
539=item fork_call { }, $args 600=item fork_call { }, @args
540 601
541Executes the given code block with the given arguments in a seperate 602Executes the given code block with the given arguments in a seperate
542process, returning the results. Everything must be serialisable with 603process, returning the results. Everything must be serialisable with
543Coro::Storable. May, of course, block. Note that the executed sub may 604Coro::Storable. May, of course, block. Note that the executed sub may
544never block itself or use any form of event handling. 605never block itself or use any form of event handling.
545 606
546=cut 607=cut
547 608
609sub post_fork {
610 reset_signals;
611}
612
548sub fork_call(&@) { 613sub fork_call(&@) {
549 my ($cb, @args) = @_; 614 my ($cb, @args) = @_;
550 615
551 # 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,
552 # otherwise perl prematurely frees the stuff :/ 617 # otherwise perl prematurely frees the stuff :/
553 # TODO: investigate and fix (likely this will be rather laborious) 618 # TODO: investigate and fix (likely this will be rather laborious)
554 619
555 my @res = Coro::Util::fork_eval { 620 my @res = Coro::Util::fork_eval {
556 reset_signals; 621 cf::post_fork;
557 &$cb 622 &$cb
558 }, @args; 623 } @args;
559 624
560 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 )
561} 637}
562 638
563=item $coin = coin_from_name $name 639=item $coin = coin_from_name $name
564 640
565=cut 641=cut
602within each server. 678within each server.
603 679
604=cut 680=cut
605 681
606sub db_table($) { 682sub db_table($) {
683 cf::error "db_get called from main context"
684 if $Coro::current == $Coro::main;
685
607 my ($name) = @_; 686 my ($name) = @_;
608 my $db = BDB::db_create $DB_ENV; 687 my $db = BDB::db_create $DB_ENV;
609 688
610 eval { 689 eval {
611 $db->set_flags (BDB::CHKSUM); 690 $db->set_flags (BDB::CHKSUM);
621} 700}
622 701
623our $DB; 702our $DB;
624 703
625sub db_init { 704sub db_init {
626 cf::sync_job {
627 $DB ||= db_table "db"; 705 $DB ||= db_table "db";
628 };
629} 706}
630 707
631sub db_get($$) { 708sub db_get($$) {
632 my $key = "$_[0]/$_[1]"; 709 my $key = "$_[0]/$_[1]";
633 710
634 cf::sync_job { 711 cf::error "db_get called from main context"
712 if $Coro::current == $Coro::main;
713
635 BDB::db_get $DB, undef, $key, my $data; 714 BDB::db_get $DB, undef, $key, my $data;
636 715
637 $! ? () 716 $! ? ()
638 : $data 717 : $data
639 }
640} 718}
641 719
642sub db_put($$$) { 720sub db_put($$$) {
643 BDB::dbreq_pri 4; 721 BDB::dbreq_pri 4;
644 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 722 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
700 778
701 my $t1 = Time::HiRes::time; 779 my $t1 = Time::HiRes::time;
702 my $data = $process->(\@data); 780 my $data = $process->(\@data);
703 my $t2 = Time::HiRes::time; 781 my $t2 = Time::HiRes::time;
704 782
705 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 783 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
706 784
707 db_put cache => "$id/data", $data; 785 db_put cache => "$id/data", $data;
708 db_put cache => "$id/md5" , $md5; 786 db_put cache => "$id/md5" , $md5;
709 db_put cache => "$id/meta", $meta; 787 db_put cache => "$id/meta", $meta;
710 788
720 798
721=cut 799=cut
722 800
723sub datalog($@) { 801sub datalog($@) {
724 my ($type, %kv) = @_; 802 my ($type, %kv) = @_;
725 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 803 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
726} 804}
727 805
728=back 806=back
729 807
730=cut 808=cut
925 1003
926 } elsif (exists $cb_id{$type}) { 1004 } elsif (exists $cb_id{$type}) {
927 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1005 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
928 1006
929 } elsif (ref $type) { 1007 } elsif (ref $type) {
930 warn "attaching objects not supported, ignoring.\n"; 1008 error "attaching objects not supported, ignoring.\n";
931 1009
932 } else { 1010 } else {
933 shift @arg; 1011 shift @arg;
934 warn "attach argument '$type' not supported, ignoring.\n"; 1012 error "attach argument '$type' not supported, ignoring.\n";
935 } 1013 }
936 } 1014 }
937} 1015}
938 1016
939sub _object_attach { 1017sub _object_attach {
949 _attach $registry, $klass, @attach; 1027 _attach $registry, $klass, @attach;
950 } 1028 }
951 1029
952 $obj->{$name} = \%arg; 1030 $obj->{$name} = \%arg;
953 } else { 1031 } else {
954 warn "object uses attachment '$name' which is not available, postponing.\n"; 1032 info "object uses attachment '$name' which is not available, postponing.\n";
955 } 1033 }
956 1034
957 $obj->{_attachment}{$name} = undef; 1035 $obj->{_attachment}{$name} = undef;
958} 1036}
959 1037
1018 1096
1019 for (@$callbacks) { 1097 for (@$callbacks) {
1020 eval { &{$_->[1]} }; 1098 eval { &{$_->[1]} };
1021 1099
1022 if ($@) { 1100 if ($@) {
1023 warn "$@";
1024 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1101 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1025 override; 1102 override;
1026 } 1103 }
1027 1104
1028 return 1 if $override; 1105 return 1 if $override;
1029 } 1106 }
1108 for (@$attach) { 1185 for (@$attach) {
1109 my ($klass, @attach) = @$_; 1186 my ($klass, @attach) = @$_;
1110 _attach $registry, $klass, @attach; 1187 _attach $registry, $klass, @attach;
1111 } 1188 }
1112 } else { 1189 } else {
1113 warn "object uses attachment '$name' that is not available, postponing.\n"; 1190 info "object uses attachment '$name' that is not available, postponing.\n";
1114 } 1191 }
1115 } 1192 }
1116} 1193}
1117 1194
1118cf::attachable->attach ( 1195cf::attachable->attach (
1145 my ($filename, $rdata, $objs) = @_; 1222 my ($filename, $rdata, $objs) = @_;
1146 1223
1147 sync_job { 1224 sync_job {
1148 if (length $$rdata) { 1225 if (length $$rdata) {
1149 utf8::decode (my $decname = $filename); 1226 utf8::decode (my $decname = $filename);
1150 warn sprintf "saving %s (%d,%d)\n", 1227 trace sprintf "saving %s (%d,%d)\n",
1151 $decname, length $$rdata, scalar @$objs; 1228 $decname, length $$rdata, scalar @$objs
1229 if $VERBOSE_IO;
1152 1230
1153 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1231 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1154 aio_chmod $fh, SAVE_MODE; 1232 aio_chmod $fh, SAVE_MODE;
1155 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1233 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1156 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 }
1157 aio_close $fh; 1238 aio_close $fh;
1158 1239
1159 if (@$objs) { 1240 if (@$objs) {
1160 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) {
1161 aio_chmod $fh, SAVE_MODE; 1242 aio_chmod $fh, SAVE_MODE;
1162 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1243 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1163 aio_write $fh, 0, (length $data), $data, 0; 1244 aio_write $fh, 0, (length $data), $data, 0;
1164 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 }
1165 aio_close $fh; 1249 aio_close $fh;
1166 aio_rename "$filename.pst~", "$filename.pst"; 1250 aio_rename "$filename.pst~", "$filename.pst";
1167 } 1251 }
1168 } else { 1252 } else {
1169 aio_unlink "$filename.pst"; 1253 aio_unlink "$filename.pst";
1172 aio_rename "$filename~", $filename; 1256 aio_rename "$filename~", $filename;
1173 1257
1174 $filename =~ s%/[^/]+$%%; 1258 $filename =~ s%/[^/]+$%%;
1175 aio_pathsync $filename if $cf::USE_FSYNC; 1259 aio_pathsync $filename if $cf::USE_FSYNC;
1176 } else { 1260 } else {
1177 warn "unable to save objects: $filename~: $!\n"; 1261 error "unable to save objects: $filename~: $!\n";
1178 } 1262 }
1179 } else { 1263 } else {
1180 aio_unlink $filename; 1264 aio_unlink $filename;
1181 aio_unlink "$filename.pst"; 1265 aio_unlink "$filename.pst";
1182 } 1266 }
1206 my $st = eval { Coro::Storable::thaw $av }; 1290 my $st = eval { Coro::Storable::thaw $av };
1207 $av = $st->{objs}; 1291 $av = $st->{objs};
1208 } 1292 }
1209 1293
1210 utf8::decode (my $decname = $filename); 1294 utf8::decode (my $decname = $filename);
1211 warn sprintf "loading %s (%d,%d)\n", 1295 trace sprintf "loading %s (%d,%d)\n",
1212 $decname, length $data, scalar @{$av || []}; 1296 $decname, length $data, scalar @{$av || []}
1297 if $VERBOSE_IO;
1213 1298
1214 ($data, $av) 1299 ($data, $av)
1215} 1300}
1216 1301
1217=head2 COMMAND CALLBACKS 1302=head2 COMMAND CALLBACKS
1276} 1361}
1277 1362
1278use File::Glob (); 1363use File::Glob ();
1279 1364
1280cf::player->attach ( 1365cf::player->attach (
1281 on_command => sub { 1366 on_unknown_command => sub {
1282 my ($pl, $name, $params) = @_; 1367 my ($pl, $name, $params) = @_;
1283 1368
1284 my $cb = $COMMAND{$name} 1369 my $cb = $COMMAND{$name}
1285 or return; 1370 or return;
1286 1371
1309 1394
1310 $pl->ext_reply ($reply, @reply) 1395 $pl->ext_reply ($reply, @reply)
1311 if $reply; 1396 if $reply;
1312 1397
1313 } else { 1398 } else {
1314 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1399 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1315 } 1400 }
1316 1401
1317 cf::override; 1402 cf::override;
1318 }, 1403 },
1319); 1404);
1320 1405
1321# "readahead" all extensions 1406# "readahead" all extensions
1322sub cache_extensions { 1407sub cache_extensions {
1323 my $grp = IO::AIO::aio_group; 1408 my $grp = IO::AIO::aio_group;
1324 1409
1325 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1410 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1326 for (grep /\.ext$/, @{$_[0]}) { 1411 for (grep /\.ext$/, @{$_[0]}) {
1327 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1412 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1328 } 1413 }
1329 }; 1414 };
1330 1415
1331 $grp 1416 $grp
1332} 1417}
1333 1418
1334sub load_extensions { 1419sub load_extensions {
1420 info "loading extensions...";
1421
1335 cf::sync_job { 1422 cf::sync_job {
1336 my %todo; 1423 my %todo;
1337 1424
1338 for my $path (<$LIBDIR/*.ext>) { 1425 for my $path (<$LIBDIR/*.ext>) {
1339 next unless -r $path; 1426 next unless -r $path;
1357 1444
1358 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1445 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1359 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1446 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1360 1447
1361 $ext{source} = 1448 $ext{source} =
1362 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1449 "package $pkg; use common::sense;\n"
1363 . "#line 1 \"$path\"\n{\n" 1450 . "#line 1 \"$path\"\n{\n"
1364 . $source 1451 . $source
1365 . "\n};\n1"; 1452 . "\n};\n1";
1366 1453
1367 $todo{$base} = \%ext; 1454 $todo{$base} = \%ext;
1368 } 1455 }
1369 1456
1457 my $pass = 0;
1370 my %done; 1458 my %done;
1371 while (%todo) { 1459 while (%todo) {
1372 my $progress; 1460 my $progress;
1373 1461
1462 ++$pass;
1463
1464 ext:
1374 while (my ($k, $v) = each %todo) { 1465 while (my ($k, $v) = each %todo) {
1375 for (split /,\s*/, $v->{meta}{depends}) { 1466 for (split /,\s*/, $v->{meta}{depends}) {
1376 goto skip 1467 next ext
1377 unless exists $done{$_}; 1468 unless exists $done{$_};
1378 } 1469 }
1379 1470
1380 warn "... loading '$k' into '$v->{pkg}'\n"; 1471 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1381 1472
1382 unless (eval $v->{source}) { 1473 my $active = eval $v->{source};
1474
1475 if (length $@) {
1383 my $msg = $@ ? "$v->{path}: $@\n" 1476 error "$v->{path}: $@\n";
1384 : "$v->{base}: extension inactive.\n";
1385 1477
1386 if (exists $v->{meta}{mandatory}) {
1387 warn $msg;
1388 cf::cleanup "mandatory extension failed to load, exiting."; 1478 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1389 } 1479 if exists $v->{meta}{mandatory};
1390 1480
1391 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;
1392 } 1490 }
1393
1394 $done{$k} = delete $todo{$k};
1395 push @EXTS, $v->{pkg};
1396 $progress = 1;
1397 } 1491 }
1398 1492
1399 skip: 1493 unless ($progress) {
1400 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1494 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1401 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 }
1402 } 1501 }
1403 }; 1502 };
1404} 1503}
1405 1504
1406############################################################################# 1505#############################################################################
1490 $cf::PLAYER{$login} = $pl 1589 $cf::PLAYER{$login} = $pl
1491 } 1590 }
1492 } 1591 }
1493} 1592}
1494 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
1495sub save($) { 1607sub save($) {
1496 my ($pl) = @_; 1608 my ($pl) = @_;
1497 1609
1498 return if $pl->{deny_save}; 1610 return if $pl->{deny_save};
1499 1611
1504 1616
1505 aio_mkdir playerdir $pl, 0770; 1617 aio_mkdir playerdir $pl, 0770;
1506 $pl->{last_save} = $cf::RUNTIME; 1618 $pl->{last_save} = $cf::RUNTIME;
1507 1619
1508 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];
1509 1624
1510 $pl->save_pl ($path); 1625 $pl->save_pl ($path);
1511 cf::cede_to_tick; 1626 cf::cede_to_tick;
1512} 1627}
1513 1628
1549 $pl->{deny_save} = 1; 1664 $pl->{deny_save} = 1;
1550 $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
1551 1666
1552 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1667 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1553 $pl->deactivate; 1668 $pl->deactivate;
1669
1554 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;
1555 $pl->ob->check_score; 1671 ext::highscore::check ($pl->ob);
1672
1556 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1673 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1557 $pl->ns->destroy if $pl->ns; 1674 $pl->ns->destroy if $pl->ns;
1558 1675
1559 my $path = playerdir $pl; 1676 my $path = playerdir $pl;
1560 my $temp = "$path~$cf::RUNTIME~deleting~"; 1677 my $temp = "$path~$cf::RUNTIME~deleting~";
1615 \@logins 1732 \@logins
1616} 1733}
1617 1734
1618=item $player->maps 1735=item $player->maps
1619 1736
1737=item cf::player::maps $login
1738
1620Returns an arrayref of map paths that are private for this 1739Returns an arrayref of map paths that are private for this
1621player. May block. 1740player. May block.
1622 1741
1623=cut 1742=cut
1624 1743
1686=cut 1805=cut
1687 1806
1688sub find_by_path($) { 1807sub find_by_path($) {
1689 my ($path) = @_; 1808 my ($path) = @_;
1690 1809
1810 $path =~ s/^~[^\/]*//; # skip ~login
1811
1691 my ($match, $specificity); 1812 my ($match, $specificity);
1692 1813
1693 for my $region (list) { 1814 for my $region (list) {
1694 if ($region->{match} && $path =~ $region->{match}) { 1815 if ($region->{match} && $path =~ $region->{match}) {
1695 ($match, $specificity) = ($region, $region->specificity) 1816 ($match, $specificity) = ($region, $region->specificity)
1726 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
1727 1848
1728 # mit "rum" bekleckern, nicht 1849 # mit "rum" bekleckern, nicht
1729 $self->_create_random_map ( 1850 $self->_create_random_map (
1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1851 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1852 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1853 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1733 $rmp->{exit_on_final_map}, 1854 $rmp->{exit_on_final_map},
1734 $rmp->{xsize}, $rmp->{ysize}, 1855 $rmp->{xsize}, $rmp->{ysize},
1735 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1856 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1736 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1857 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1751 1872
1752sub register { 1873sub register {
1753 my (undef, $regex, $prio) = @_; 1874 my (undef, $regex, $prio) = @_;
1754 my $pkg = caller; 1875 my $pkg = caller;
1755 1876
1756 no strict;
1757 push @{"$pkg\::ISA"}, __PACKAGE__; 1877 push @{"$pkg\::ISA"}, __PACKAGE__;
1758 1878
1759 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1879 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1760} 1880}
1761 1881
1762# also paths starting with '/' 1882# also paths starting with '/'
1763$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1883$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1764 1884
1765sub thawer_merge { 1885sub thawer_merge {
1766 my ($self, $merge) = @_; 1886 my ($self, $merge) = @_;
1767 1887
1768 # we have to keep some variables in memory intact 1888 # we have to keep some variables in memory intact
1773} 1893}
1774 1894
1775sub normalise { 1895sub normalise {
1776 my ($path, $base) = @_; 1896 my ($path, $base) = @_;
1777 1897
1778 $path = "$path"; # make sure its a string 1898 $path = "$path"; # make sure it's a string
1779 1899
1780 $path =~ s/\.map$//; 1900 $path =~ s/\.map$//;
1781 1901
1782 # map plan: 1902 # map plan:
1783 # 1903 #
1822 $self->init; # pass $1 etc. 1942 $self->init; # pass $1 etc.
1823 return $self; 1943 return $self;
1824 } 1944 }
1825 } 1945 }
1826 1946
1827 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1947 Carp::cluck "unable to resolve path '$path' (base '$base')";
1828 () 1948 ()
1829} 1949}
1830 1950
1831sub init { 1951sub init {
1832 my ($self) = @_; 1952 my ($self) = @_;
1954} 2074}
1955 2075
1956sub find; 2076sub find;
1957sub find { 2077sub find {
1958 my ($path, $origin) = @_; 2078 my ($path, $origin) = @_;
2079
2080 cf::cede_to_tick;
1959 2081
1960 $path = normalise $path, $origin && $origin->path; 2082 $path = normalise $path, $origin && $origin->path;
1961 2083
1962 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2084 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1963 my $guard2 = cf::lock_acquire "map_find:$path"; 2085 my $guard2 = cf::lock_acquire "map_find:$path";
1982 2104
1983 $cf::MAP{$path} = $map 2105 $cf::MAP{$path} = $map
1984 } 2106 }
1985} 2107}
1986 2108
1987sub pre_load { } 2109sub pre_load { }
1988sub post_load { } 2110#sub post_load { } # XS
1989 2111
1990sub load { 2112sub load {
1991 my ($self) = @_; 2113 my ($self) = @_;
1992 2114
1993 local $self->{deny_reset} = 1; # loading can take a long time 2115 local $self->{deny_reset} = 1; # loading can take a long time
2050 } 2172 }
2051 2173
2052 $self->post_load; 2174 $self->post_load;
2053} 2175}
2054 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
2055sub customise_for { 2180sub customise_for {
2056 my ($self, $ob) = @_; 2181 my ($self, $ob) = @_;
2057 2182
2058 return find "~" . $ob->name . "/" . $self->{path} 2183 return find "~" . $ob->name . "/" . $self->{path}
2059 if $self->per_player; 2184 if $self->per_player;
2075 or next; 2200 or next;
2076 $neigh = find $neigh, $map 2201 $neigh = find $neigh, $map
2077 or next; 2202 or next;
2078 $neigh->load; 2203 $neigh->load;
2079 2204
2205 # now find the diagonal neighbours
2080 push @neigh, 2206 push @neigh,
2081 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2207 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2082 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2208 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2083 } 2209 }
2084 2210
2091} 2217}
2092 2218
2093sub find_sync { 2219sub find_sync {
2094 my ($path, $origin) = @_; 2220 my ($path, $origin) = @_;
2095 2221
2096 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
2097} 2226}
2098 2227
2099sub do_load_sync { 2228sub do_load_sync {
2100 my ($map) = @_; 2229 my ($map) = @_;
2101 2230
2102 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2231 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2103 if $Coro::current == $Coro::main; 2232 if $Coro::current == $Coro::main;
2104 2233
2105 cf::sync_job { $map->load }; 2234 $map->load;
2106} 2235}
2107 2236
2108our %MAP_PREFETCH; 2237our %MAP_PREFETCH;
2109our $MAP_PREFETCHER = undef; 2238our $MAP_PREFETCHER = undef;
2110 2239
2136 $MAP_PREFETCHER->prio (6); 2265 $MAP_PREFETCHER->prio (6);
2137 2266
2138 () 2267 ()
2139} 2268}
2140 2269
2270# common code, used by both ->save and ->swapout
2141sub save { 2271sub _save {
2142 my ($self) = @_; 2272 my ($self) = @_;
2143
2144 my $lock = cf::lock_acquire "map_data:$self->{path}";
2145 2273
2146 $self->{last_save} = $cf::RUNTIME; 2274 $self->{last_save} = $cf::RUNTIME;
2147 2275
2148 return unless $self->dirty; 2276 return unless $self->dirty;
2149 2277
2169 } else { 2297 } else {
2170 $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);
2171 } 2299 }
2172} 2300}
2173 2301
2302sub save {
2303 my ($self) = @_;
2304
2305 my $lock = cf::lock_acquire "map_data:$self->{path}";
2306
2307 $self->_save;
2308}
2309
2174sub swap_out { 2310sub swap_out {
2175 my ($self) = @_; 2311 my ($self) = @_;
2176 2312
2177 # save first because save cedes
2178 $self->save;
2179
2180 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2313 my $lock = cf::lock_acquire "map_data:$self->{path}";
2181 2314
2182 return if $self->players;
2183 return if $self->in_memory != cf::MAP_ACTIVE; 2315 return if $self->in_memory != cf::MAP_ACTIVE;
2184 return if $self->{deny_save}; 2316 return if $self->{deny_save};
2317 return if $self->players;
2185 2318
2319 # first deactivate the map and "unlink" it from the core
2320 $self->deactivate;
2321 $_->clear_links_to ($self) for values %cf::MAP;
2186 $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};
2187 2369
2188 $self->deactivate; 2370 $self->deactivate;
2189 $_->clear_links_to ($self) for values %cf::MAP; 2371 $_->clear_links_to ($self) for values %cf::MAP;
2190 $self->clear; 2372 $self->clear;
2191}
2192
2193sub reset_at {
2194 my ($self) = @_;
2195
2196 # TODO: safety, remove and allow resettable per-player maps
2197 return 1e99 if $self->{deny_reset};
2198
2199 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2200 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2201
2202 $time + $to
2203}
2204
2205sub should_reset {
2206 my ($self) = @_;
2207
2208 $self->reset_at <= $cf::RUNTIME
2209}
2210
2211sub reset {
2212 my ($self) = @_;
2213
2214 my $lock = cf::lock_acquire "map_data:$self->{path}";
2215
2216 return if $self->players;
2217
2218 warn "resetting map ", $self->path;
2219
2220 $self->in_memory (cf::MAP_SWAPPED);
2221
2222 # need to save uniques path
2223 unless ($self->{deny_save}) {
2224 my $uniq = $self->uniq_path; utf8::encode $uniq;
2225
2226 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2227 if $uniq;
2228 }
2229
2230 delete $cf::MAP{$self->path};
2231
2232 $self->deactivate;
2233 $_->clear_links_to ($self) for values %cf::MAP;
2234 $self->clear;
2235 2373
2236 $self->unlink_save; 2374 $self->unlink_save;
2237 $self->destroy; 2375 $self->destroy;
2238} 2376}
2239 2377
2247 2385
2248 delete $cf::MAP{$self->path}; 2386 delete $cf::MAP{$self->path};
2249 2387
2250 $self->unlink_save; 2388 $self->unlink_save;
2251 2389
2252 bless $self, "cf::map"; 2390 bless $self, "cf::map::wrap";
2253 delete $self->{deny_reset}; 2391 delete $self->{deny_reset};
2254 $self->{deny_save} = 1; 2392 $self->{deny_save} = 1;
2255 $self->reset_timeout (1); 2393 $self->reset_timeout (1);
2256 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2394 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2257 2395
2314 : normalise $_ 2452 : normalise $_
2315 } @{ aio_readdir $UNIQUEDIR or [] } 2453 } @{ aio_readdir $UNIQUEDIR or [] }
2316 ] 2454 ]
2317} 2455}
2318 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
2319=back 2489=back
2320 2490
2321=head3 cf::object 2491=head3 cf::object
2322 2492
2323=cut 2493=cut
2455 2625
2456Freezes 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}>).
2457 2627
2458The 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.
2459for 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,
2460though, 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
2461map. 2631map.
2462 2632
2463Will never block. 2633Will never block.
2464 2634
2465=item $player_object->leave_link ($map, $x, $y) 2635=item $player_object->leave_link ($map, $x, $y)
2486sub cf::object::player::enter_link { 2656sub cf::object::player::enter_link {
2487 my ($self) = @_; 2657 my ($self) = @_;
2488 2658
2489 $self->deactivate_recursive; 2659 $self->deactivate_recursive;
2490 2660
2661 ++$self->{_link_recursion};
2662
2491 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2663 return if UNIVERSAL::isa $self->map, "ext::map_link";
2492 2664
2493 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2665 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2494 if $self->map && $self->map->{path} ne "{link}"; 2666 if $self->map && $self->map->{path} ne "{link}";
2495 2667
2496 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2668 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2497} 2669}
2498 2670
2499sub cf::object::player::leave_link { 2671sub cf::object::player::leave_link {
2500 my ($self, $map, $x, $y) = @_; 2672 my ($self, $map, $x, $y) = @_;
2501 2673
2518 ($x, $y) = (-1, -1) 2690 ($x, $y) = (-1, -1)
2519 unless (defined $x) && (defined $y); 2691 unless (defined $x) && (defined $y);
2520 2692
2521 # use -1 or undef as default coordinates, not 0, 0 2693 # use -1 or undef as default coordinates, not 0, 0
2522 ($x, $y) = ($map->enter_x, $map->enter_y) 2694 ($x, $y) = ($map->enter_x, $map->enter_y)
2523 if $x <=0 && $y <= 0; 2695 if $x <= 0 && $y <= 0;
2524 2696
2525 $map->load; 2697 $map->load;
2526 $map->load_neighbours; 2698 $map->load_neighbours;
2527 2699
2528 return unless $self->contr->active; 2700 return unless $self->contr->active;
2529 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2530 $self->activate_recursive;
2531 2701
2532 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2702 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2533 $self->enter_map ($map, $x, $y); 2703 if ($self->enter_map ($map, $x, $y)) {
2534} 2704 # entering was successful
2705 delete $self->{_link_recursion};
2706 # only activate afterwards, to support waiting in hooks
2707 $self->activate_recursive;
2708 }
2535 2709
2710}
2711
2536=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)]])
2537 2713
2538Moves 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
2539her, loading and preparing them map, calling the provided $check callback 2715her, loading and preparing them map, calling the provided $check callback
2540that 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
2541the 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
2548 2724
2549our $GOTOGEN; 2725our $GOTOGEN;
2550 2726
2551sub cf::object::player::goto { 2727sub cf::object::player::goto {
2552 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 }
2553 2735
2554 # 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
2555 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2737 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2556 2738
2557 $self->enter_link; 2739 $self->enter_link;
2581 my $map = eval { 2763 my $map = eval {
2582 my $map = defined $path ? cf::map::find $path : undef; 2764 my $map = defined $path ? cf::map::find $path : undef;
2583 2765
2584 if ($map) { 2766 if ($map) {
2585 $map = $map->customise_for ($self); 2767 $map = $map->customise_for ($self);
2586 $map = $check->($map) if $check && $map; 2768 $map = $check->($map, $x, $y, $self) if $check && $map;
2587 } else { 2769 } else {
2588 $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);
2589 } 2771 }
2590 2772
2591 $map 2773 $map
2599 if ($gen == $self->{_goto_generation}) { 2781 if ($gen == $self->{_goto_generation}) {
2600 delete $self->{_goto_generation}; 2782 delete $self->{_goto_generation};
2601 $self->leave_link ($map, $x, $y); 2783 $self->leave_link ($map, $x, $y);
2602 } 2784 }
2603 2785
2604 $done->() if $done; 2786 $done->($self) if $done;
2605 })->prio (1); 2787 })->prio (1);
2606} 2788}
2607 2789
2608=item $player_object->enter_exit ($exit_object) 2790=item $player_object->enter_exit ($exit_object)
2609 2791
2702 $self->message ("Something went wrong deep within the deliantra server. " 2884 $self->message ("Something went wrong deep within the deliantra server. "
2703 . "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. "
2704 . "Please report this to the dungeon master!", 2886 . "Please report this to the dungeon master!",
2705 cf::NDI_UNIQUE | cf::NDI_RED); 2887 cf::NDI_UNIQUE | cf::NDI_RED);
2706 2888
2707 warn "ERROR in enter_exit: $@"; 2889 error "ERROR in enter_exit: $@";
2708 $self->leave_link; 2890 $self->leave_link;
2709 } 2891 }
2710 })->prio (1); 2892 })->prio (1);
2711} 2893}
2712 2894
2724sub cf::client::send_drawinfo { 2906sub cf::client::send_drawinfo {
2725 my ($self, $text, $flags) = @_; 2907 my ($self, $text, $flags) = @_;
2726 2908
2727 utf8::encode $text; 2909 utf8::encode $text;
2728 $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);
2729} 2936}
2730 2937
2731=item $client->send_msg ($channel, $msg, $color, [extra...]) 2938=item $client->send_msg ($channel, $msg, $color, [extra...])
2732 2939
2733Send 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
2737 2944
2738=cut 2945=cut
2739 2946
2740# non-persistent channels (usually the info channel) 2947# non-persistent channels (usually the info channel)
2741our %CHANNEL = ( 2948our %CHANNEL = (
2949 "c/motd" => {
2950 id => "infobox",
2951 title => "MOTD",
2952 reply => undef,
2953 tooltip => "The message of the day",
2954 },
2742 "c/identify" => { 2955 "c/identify" => {
2743 id => "infobox", 2956 id => "infobox",
2744 title => "Identify", 2957 title => "Identify",
2745 reply => undef, 2958 reply => undef,
2746 tooltip => "Items recently identified", 2959 tooltip => "Items recently identified",
2748 "c/examine" => { 2961 "c/examine" => {
2749 id => "infobox", 2962 id => "infobox",
2750 title => "Examine", 2963 title => "Examine",
2751 reply => undef, 2964 reply => undef,
2752 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",
2753 }, 2972 },
2754 "c/book" => { 2973 "c/book" => {
2755 id => "infobox", 2974 id => "infobox",
2756 title => "Book", 2975 title => "Book",
2757 reply => undef, 2976 reply => undef,
2785 id => "infobox", 3004 id => "infobox",
2786 title => "Skills", 3005 title => "Skills",
2787 reply => undef, 3006 reply => undef,
2788 tooltip => "Shows your experience per skill and item power", 3007 tooltip => "Shows your experience per skill and item power",
2789 }, 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 },
2790 "c/resistances" => { 3015 "c/resistances" => {
2791 id => "infobox", 3016 id => "infobox",
2792 title => "Resistances", 3017 title => "Resistances",
2793 reply => undef, 3018 reply => undef,
2794 tooltip => "Shows your resistances", 3019 tooltip => "Shows your resistances",
2796 "c/pets" => { 3021 "c/pets" => {
2797 id => "infobox", 3022 id => "infobox",
2798 title => "Pets", 3023 title => "Pets",
2799 reply => undef, 3024 reply => undef,
2800 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",
2801 }, 3032 },
2802 "c/uptime" => { 3033 "c/uptime" => {
2803 id => "infobox", 3034 id => "infobox",
2804 title => "Uptime", 3035 title => "Uptime",
2805 reply => undef, 3036 reply => undef,
2861 my $pkt = "msg " 3092 my $pkt = "msg "
2862 . $self->{json_coder}->encode ( 3093 . $self->{json_coder}->encode (
2863 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3094 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2864 ); 3095 );
2865 3096
2866 # try lzf for large packets
2867 $pkt = "lzf " . Compress::LZF::compress $pkt
2868 if 1024 <= length $pkt and $self->{can_lzf};
2869
2870 # split very large packets
2871 if (8192 < length $pkt and $self->{can_lzf}) {
2872 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2873 $pkt = "frag";
2874 }
2875
2876 $self->send_packet ($pkt); 3097 $self->send_big_packet ($pkt);
2877} 3098}
2878 3099
2879=item $client->ext_msg ($type, @msg) 3100=item $client->ext_msg ($type, @msg)
2880 3101
2881Sends an ext event to the client. 3102Sends an ext event to the client.
2884 3105
2885sub cf::client::ext_msg($$@) { 3106sub cf::client::ext_msg($$@) {
2886 my ($self, $type, @msg) = @_; 3107 my ($self, $type, @msg) = @_;
2887 3108
2888 if ($self->extcmd == 2) { 3109 if ($self->extcmd == 2) {
2889 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3110 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2890 } elsif ($self->extcmd == 1) { # TODO: remove 3111 } elsif ($self->extcmd == 1) { # TODO: remove
2891 push @msg, msgtype => "event_$type"; 3112 push @msg, msgtype => "event_$type";
2892 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3113 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2893 } 3114 }
2894} 3115}
2895 3116
2896=item $client->ext_reply ($msgid, @msg) 3117=item $client->ext_reply ($msgid, @msg)
2897 3118
2901 3122
2902sub cf::client::ext_reply($$@) { 3123sub cf::client::ext_reply($$@) {
2903 my ($self, $id, @msg) = @_; 3124 my ($self, $id, @msg) = @_;
2904 3125
2905 if ($self->extcmd == 2) { 3126 if ($self->extcmd == 2) {
2906 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3127 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2907 } elsif ($self->extcmd == 1) { 3128 } elsif ($self->extcmd == 1) {
2908 #TODO: version 1, remove 3129 #TODO: version 1, remove
2909 unshift @msg, msgtype => "reply", msgid => $id; 3130 unshift @msg, msgtype => "reply", msgid => $id;
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3131 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 } 3132 }
2912} 3133}
2913 3134
2914=item $success = $client->query ($flags, "text", \&cb) 3135=item $success = $client->query ($flags, "text", \&cb)
2915 3136
2986 3207
2987 $ns->ext_reply ($reply, @reply) 3208 $ns->ext_reply ($reply, @reply)
2988 if $reply; 3209 if $reply;
2989 3210
2990 } else { 3211 } else {
2991 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";
2992 } 3213 }
2993 3214
2994 cf::override; 3215 cf::override;
2995 }, 3216 },
2996); 3217);
3016 3237
3017 $coro 3238 $coro
3018} 3239}
3019 3240
3020cf::client->attach ( 3241cf::client->attach (
3021 on_destroy => sub { 3242 on_client_destroy => sub {
3022 my ($ns) = @_; 3243 my ($ns) = @_;
3023 3244
3024 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3245 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3025 }, 3246 },
3026); 3247);
3042our $safe_hole = new Safe::Hole; 3263our $safe_hole = new Safe::Hole;
3043 3264
3044$SIG{FPE} = 'IGNORE'; 3265$SIG{FPE} = 'IGNORE';
3045 3266
3046$safe->permit_only (Opcode::opset qw( 3267$safe->permit_only (Opcode::opset qw(
3047 :base_core :base_mem :base_orig :base_math 3268 :base_core :base_mem :base_orig :base_math :base_loop
3048 grepstart grepwhile mapstart mapwhile 3269 grepstart grepwhile mapstart mapwhile
3049 sort time 3270 sort time
3050)); 3271));
3051 3272
3052# here we export the classes and methods available to script code 3273# here we export the classes and methods available to script code
3077 decrease split destroy change_exp value msg lore send_msg)], 3298 decrease split destroy change_exp value msg lore send_msg)],
3078 ["cf::object::player" => qw(player)], 3299 ["cf::object::player" => qw(player)],
3079 ["cf::player" => qw(peaceful send_msg)], 3300 ["cf::player" => qw(peaceful send_msg)],
3080 ["cf::map" => qw(trigger)], 3301 ["cf::map" => qw(trigger)],
3081) { 3302) {
3082 no strict 'refs';
3083 my ($pkg, @funs) = @$_; 3303 my ($pkg, @funs) = @$_;
3084 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3304 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3085 for @funs; 3305 for @funs;
3086} 3306}
3087 3307
3104 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3324 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3105 $qcode =~ s/\n/\\n/g; 3325 $qcode =~ s/\n/\\n/g;
3106 3326
3107 %vars = (_dummy => 0) unless %vars; 3327 %vars = (_dummy => 0) unless %vars;
3108 3328
3329 my @res;
3109 local $_; 3330 local $_;
3110 local @safe::cf::_safe_eval_args = values %vars;
3111 3331
3112 my $eval = 3332 my $eval =
3113 "do {\n" 3333 "do {\n"
3114 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3334 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3115 . "#line 0 \"{$qcode}\"\n" 3335 . "#line 0 \"{$qcode}\"\n"
3116 . $code 3336 . $code
3117 . "\n}" 3337 . "\n}"
3118 ; 3338 ;
3119 3339
3340 if ($CFG{safe_eval}) {
3120 sub_generation_inc; 3341 sub_generation_inc;
3342 local @safe::cf::_safe_eval_args = values %vars;
3121 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3343 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3122 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 }
3123 3349
3124 if ($@) { 3350 if ($@) {
3125 warn "$@"; 3351 warn "$@",
3126 warn "while executing safe code '$code'\n"; 3352 "while executing safe code '$code'\n",
3127 warn "with arguments " . (join " ", %vars) . "\n"; 3353 "with arguments " . (join " ", %vars) . "\n";
3128 } 3354 }
3129 3355
3130 wantarray ? @res : $res[0] 3356 wantarray ? @res : $res[0]
3131} 3357}
3132 3358
3146=cut 3372=cut
3147 3373
3148sub register_script_function { 3374sub register_script_function {
3149 my ($fun, $cb) = @_; 3375 my ($fun, $cb) = @_;
3150 3376
3151 no strict 'refs'; 3377 $fun = "safe::$fun" if $CFG{safe_eval};
3152 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3378 *$fun = $safe_hole->wrap ($cb);
3153} 3379}
3154 3380
3155=back 3381=back
3156 3382
3157=cut 3383=cut
3166 # for this (global event?) 3392 # for this (global event?)
3167 %ext::player_env::MUSIC_FACE_CACHE = (); 3393 %ext::player_env::MUSIC_FACE_CACHE = ();
3168 3394
3169 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3395 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3170 3396
3171 warn "loading facedata from $path\n"; 3397 trace "loading facedata from $path\n";
3172 3398
3173 my $facedata;
3174 0 < aio_load $path, $facedata 3399 0 < aio_load $path, my $facedata
3175 or die "$path: $!"; 3400 or die "$path: $!";
3176 3401
3177 $facedata = Coro::Storable::thaw $facedata; 3402 $facedata = Coro::Storable::thaw $facedata;
3178 3403
3179 $facedata->{version} == 2 3404 $facedata->{version} == 2
3180 or cf::cleanup "$path: version mismatch, cannot proceed."; 3405 or cf::cleanup "$path: version mismatch, cannot proceed.";
3181 3406
3182 # 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]);
3183 $facedata->{resource}{"res/exp_table"} = { 3409 $facedata->{resource}{"res/exp_table"} = {
3184 type => FT_RSRC, 3410 type => FT_RSRC,
3185 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),
3186 }; 3413 };
3187 cf::cede_to_tick; 3414 cf::cede_to_tick;
3188 3415
3189 { 3416 {
3190 my $faces = $facedata->{faceinfo}; 3417 my $faces = $facedata->{faceinfo};
3192 while (my ($face, $info) = each %$faces) { 3419 while (my ($face, $info) = each %$faces) {
3193 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3420 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3194 3421
3195 cf::face::set_visibility $idx, $info->{visibility}; 3422 cf::face::set_visibility $idx, $info->{visibility};
3196 cf::face::set_magicmap $idx, $info->{magicmap}; 3423 cf::face::set_magicmap $idx, $info->{magicmap};
3197 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3424 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3198 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3425 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3199 3426
3200 cf::cede_to_tick; 3427 cf::cede_to_tick;
3201 } 3428 }
3202 3429
3203 while (my ($face, $info) = each %$faces) { 3430 while (my ($face, $info) = each %$faces) {
3208 3435
3209 if (my $smooth = cf::face::find $info->{smooth}) { 3436 if (my $smooth = cf::face::find $info->{smooth}) {
3210 cf::face::set_smooth $idx, $smooth; 3437 cf::face::set_smooth $idx, $smooth;
3211 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3438 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3212 } else { 3439 } else {
3213 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3440 error "smooth face '$info->{smooth}' not found for face '$face'";
3214 } 3441 }
3215 3442
3216 cf::cede_to_tick; 3443 cf::cede_to_tick;
3217 } 3444 }
3218 } 3445 }
3227 3454
3228 cf::anim::invalidate_all; # d'oh 3455 cf::anim::invalidate_all; # d'oh
3229 } 3456 }
3230 3457
3231 { 3458 {
3232 # TODO: for gcfclient pleasure, we should give resources
3233 # that gcfclient doesn't grok a >10000 face index.
3234 my $res = $facedata->{resource}; 3459 my $res = $facedata->{resource};
3235 3460
3236 while (my ($name, $info) = each %$res) { 3461 while (my ($name, $info) = each %$res) {
3237 if (defined $info->{type}) { 3462 if (defined $info->{type}) {
3238 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3463 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3239 my $data;
3240 3464
3241 if ($info->{type} & 1) { 3465 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3242 # prepend meta info
3243
3244 my $meta = $enc->encode ({
3245 name => $name,
3246 %{ $info->{meta} || {} },
3247 });
3248
3249 $data = pack "(w/a*)*", $meta, $info->{data};
3250 } else {
3251 $data = $info->{data};
3252 }
3253
3254 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3255 cf::face::set_type $idx, $info->{type}; 3466 cf::face::set_type $idx, $info->{type};
3256 } else { 3467 } else {
3257 $RESOURCE{$name} = $info; 3468 $RESOURCE{$name} = $info; # unused
3258 } 3469 }
3259 3470
3260 cf::cede_to_tick; 3471 cf::cede_to_tick;
3261 } 3472 }
3262 } 3473 }
3263 3474
3264 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3475 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3265 3476
3266 1 3477 1
3267} 3478}
3268
3269cf::global->attach (on_resource_update => sub {
3270 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3271 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3272
3273 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3274 my $sound = $soundconf->{compat}[$_]
3275 or next;
3276
3277 my $face = cf::face::find "sound/$sound->[1]";
3278 cf::sound::set $sound->[0] => $face;
3279 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3280 }
3281
3282 while (my ($k, $v) = each %{$soundconf->{event}}) {
3283 my $face = cf::face::find "sound/$v";
3284 cf::sound::set $k => $face;
3285 }
3286 }
3287});
3288 3479
3289register_exticmd fx_want => sub { 3480register_exticmd fx_want => sub {
3290 my ($ns, $want) = @_; 3481 my ($ns, $want) = @_;
3291 3482
3292 while (my ($k, $v) = each %$want) { 3483 while (my ($k, $v) = each %$want) {
3331sub reload_treasures { 3522sub reload_treasures {
3332 load_resource_file "$DATADIR/treasures" 3523 load_resource_file "$DATADIR/treasures"
3333 or die "unable to load treasurelists\n"; 3524 or die "unable to load treasurelists\n";
3334} 3525}
3335 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
3336sub reload_resources { 3550sub reload_resources {
3337 warn "reloading resource files...\n"; 3551 trace "reloading resource files...\n";
3338 3552
3553 reload_exp_table;
3554 reload_materials;
3339 reload_facedata; 3555 reload_facedata;
3556 reload_sound;
3340 reload_archetypes; 3557 reload_archetypes;
3341 reload_regions; 3558 reload_regions;
3342 reload_treasures; 3559 reload_treasures;
3343 3560
3344 warn "finished reloading resource files\n"; 3561 trace "finished reloading resource files\n";
3345} 3562}
3346 3563
3347sub reload_config { 3564sub reload_config {
3348 open my $fh, "<:utf8", "$CONFDIR/config" 3565 trace "reloading config file...\n";
3349 or return;
3350 3566
3351 local $/; 3567 0 < aio_load "$CONFDIR/config", my $config
3352 *CFG = YAML::Load <$fh>; 3568 or die "$CONFDIR/config: $!";
3353 3569
3570 utf8::decode $config;
3571 *CFG = yaml_load $config;
3572
3354 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3573 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3355 3574
3356 $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};
3357 $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};
3358 3577
3359 if (exists $CFG{mlockall}) { 3578 if (exists $CFG{mlockall}) {
3382 3601
3383 seek $fh, 0, 0; 3602 seek $fh, 0, 0;
3384 print $fh $$; 3603 print $fh $$;
3385} 3604}
3386 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
3387sub main { 3615sub main {
3388 cf::init_globals; # initialise logging 3616 cf::init_globals; # initialise logging
3389 3617
3390 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3618 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3391 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.";
3392 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3620 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3393 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3621 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3394
3395 cf::init_experience;
3396 cf::init_anim;
3397 cf::init_attackmess;
3398 cf::init_dynamic;
3399 3622
3400 $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
3401 3624
3402 # we must not ever block the main coroutine 3625 # we must not ever block the main coroutine
3403 local $Coro::idle = sub { 3626 local $Coro::idle = sub {
3409 }; 3632 };
3410 3633
3411 evthread_start IO::AIO::poll_fileno; 3634 evthread_start IO::AIO::poll_fileno;
3412 3635
3413 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
3414 reload_resources; 3645 reload_resources;
3415 reload_config; 3646 reload_config;
3416 db_init; 3647 db_init;
3417 3648
3418 cf::load_settings;
3419 cf::load_materials;
3420 cf::init_uuid; 3649 cf::init_uuid;
3421 cf::init_signals; 3650 cf::init_signals;
3422 cf::init_commands;
3423 cf::init_skills; 3651 cf::init_skills;
3424 3652
3425 cf::init_beforeplay; 3653 cf::init_beforeplay;
3426 3654
3427 atomic; 3655 atomic;
3429 load_extensions; 3657 load_extensions;
3430 3658
3431 utime time, time, $RUNTIMEFILE; 3659 utime time, time, $RUNTIMEFILE;
3432 3660
3433 # no (long-running) fork's whatsoever before this point(!) 3661 # no (long-running) fork's whatsoever before this point(!)
3662 use POSIX ();
3434 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};
3435 3664
3436 (pop @POST_INIT)->(0) while @POST_INIT; 3665 (pop @POST_INIT)->(0) while @POST_INIT;
3437 }; 3666 };
3438 3667
3439 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;
3440} 3677}
3441 3678
3442############################################################################# 3679#############################################################################
3443# initialisation and cleanup 3680# initialisation and cleanup
3444 3681
3445# install some emergency cleanup handlers 3682# install some emergency cleanup handlers
3446BEGIN { 3683BEGIN {
3447 our %SIGWATCHER = (); 3684 our %SIGWATCHER = ();
3448 for my $signal (qw(INT HUP TERM)) { 3685 for my $signal (qw(INT HUP TERM)) {
3449 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3686 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3450 cf::cleanup "SIG$signal"; 3687 cf::cleanup "SIG$signal";
3451 }; 3688 };
3452 } 3689 }
3453} 3690}
3454 3691
3455sub write_runtime_sync { 3692sub write_runtime_sync {
3693 my $t0 = AE::time;
3694
3456 # first touch the runtime file to show we are still running: 3695 # first touch the runtime file to show we are still running:
3457 # the fsync below can take a very very long time. 3696 # the fsync below can take a very very long time.
3458 3697
3459 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3698 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3460 3699
3461 my $guard = cf::lock_acquire "write_runtime"; 3700 my $guard = cf::lock_acquire "write_runtime";
3462 3701
3463 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3702 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3464 or return; 3703 or return;
3465 3704
3466 my $value = $cf::RUNTIME + 90 + 10; 3705 my $value = $cf::RUNTIME + 90 + 10;
3467 # 10 is the runtime save interval, for a monotonic clock 3706 # 10 is the runtime save interval, for a monotonic clock
3468 # 60 allows for the watchdog to kill the server. 3707 # 60 allows for the watchdog to kill the server.
3481 or return; 3720 or return;
3482 3721
3483 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3722 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3484 and return; 3723 and return;
3485 3724
3486 warn "runtime file written.\n"; 3725 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3487 3726
3488 1 3727 1
3489} 3728}
3490 3729
3491our $uuid_lock; 3730our $uuid_lock;
3503 or return; 3742 or return;
3504 3743
3505 my $value = uuid_seq uuid_cur; 3744 my $value = uuid_seq uuid_cur;
3506 3745
3507 unless ($value) { 3746 unless ($value) {
3508 warn "cowardly refusing to write zero uuid value!\n"; 3747 info "cowardly refusing to write zero uuid value!\n";
3509 return; 3748 return;
3510 } 3749 }
3511 3750
3512 my $value = uuid_str $value + $uuid_skip; 3751 my $value = uuid_str $value + $uuid_skip;
3513 $uuid_skip = 0; 3752 $uuid_skip = 0;
3523 or return; 3762 or return;
3524 3763
3525 aio_rename "$uuid~", $uuid 3764 aio_rename "$uuid~", $uuid
3526 and return; 3765 and return;
3527 3766
3528 warn "uuid file written ($value).\n"; 3767 trace "uuid file written ($value).\n";
3529 3768
3530 1 3769 1
3531 3770
3532} 3771}
3533 3772
3539} 3778}
3540 3779
3541sub emergency_save() { 3780sub emergency_save() {
3542 my $freeze_guard = cf::freeze_mainloop; 3781 my $freeze_guard = cf::freeze_mainloop;
3543 3782
3544 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;
3545 3789
3546 cf::sync_job { 3790 cf::sync_job {
3547 # this is a trade-off: we want to be very quick here, so 3791 cf::write_runtime_sync; # external watchdog should not bark
3548 # save all maps without fsync, and later call a global sync
3549 # (which in turn might be very very slow)
3550 local $USE_FSYNC = 0;
3551 3792
3552 # use a peculiar iteration method to avoid tripping on perl 3793 # use a peculiar iteration method to avoid tripping on perl
3553 # refcount bugs in for. also avoids problems with players 3794 # refcount bugs in for. also avoids problems with players
3554 # and maps saved/destroyed asynchronously. 3795 # and maps saved/destroyed asynchronously.
3555 warn "emergency_perl_save: begin player save\n"; 3796 info "emergency_perl_save: begin player save\n";
3556 for my $login (keys %cf::PLAYER) { 3797 for my $login (keys %cf::PLAYER) {
3557 my $pl = $cf::PLAYER{$login} or next; 3798 my $pl = $cf::PLAYER{$login} or next;
3558 $pl->valid or next; 3799 $pl->valid or next;
3559 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3800 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3560 $pl->save; 3801 $pl->save;
3561 } 3802 }
3562 warn "emergency_perl_save: end player save\n"; 3803 info "emergency_perl_save: end player save\n";
3563 3804
3805 cf::write_runtime_sync; # external watchdog should not bark
3806
3564 warn "emergency_perl_save: begin map save\n"; 3807 info "emergency_perl_save: begin map save\n";
3565 for my $path (keys %cf::MAP) { 3808 for my $path (keys %cf::MAP) {
3566 my $map = $cf::MAP{$path} or next; 3809 my $map = $cf::MAP{$path} or next;
3567 $map->valid or next; 3810 $map->valid or next;
3568 $map->save; 3811 $map->save;
3569 } 3812 }
3570 warn "emergency_perl_save: end map save\n"; 3813 info "emergency_perl_save: end map save\n";
3571 3814
3815 cf::write_runtime_sync; # external watchdog should not bark
3816
3572 warn "emergency_perl_save: begin database checkpoint\n"; 3817 info "emergency_perl_save: begin database checkpoint\n";
3573 BDB::db_env_txn_checkpoint $DB_ENV; 3818 BDB::db_env_txn_checkpoint $DB_ENV;
3574 warn "emergency_perl_save: end database checkpoint\n"; 3819 info "emergency_perl_save: end database checkpoint\n";
3575 3820
3576 warn "emergency_perl_save: begin write uuid\n"; 3821 info "emergency_perl_save: begin write uuid\n";
3577 write_uuid_sync 1; 3822 write_uuid_sync 1;
3578 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
3579 }; 3843 };
3580 3844
3581 warn "emergency_perl_save: starting sync()\n";
3582 IO::AIO::aio_sync sub {
3583 warn "emergency_perl_save: finished sync()\n";
3584 };
3585
3586 warn "emergency_perl_save: leave\n"; 3845 info "emergency_perl_save: leave\n";
3587} 3846}
3588 3847
3589sub post_cleanup { 3848sub post_cleanup {
3590 my ($make_core) = @_; 3849 my ($make_core) = @_;
3591 3850
3851 IO::AIO::flush;
3852
3592 warn Carp::longmess "post_cleanup backtrace" 3853 error Carp::longmess "post_cleanup backtrace"
3593 if $make_core; 3854 if $make_core;
3594 3855
3595 my $fh = pidfile; 3856 my $fh = pidfile;
3596 unlink $PIDFILE if <$fh> == $$; 3857 unlink $PIDFILE if <$fh> == $$;
3597} 3858}
3617 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3878 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3618 for my $name (keys %$leaf_symtab) { 3879 for my $name (keys %$leaf_symtab) {
3619 _gv_clear *{"$pkg$name"}; 3880 _gv_clear *{"$pkg$name"};
3620# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3881# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3621 } 3882 }
3622 warn "cleared package $pkg\n";#d#
3623} 3883}
3624 3884
3625sub do_reload_perl() { 3885sub do_reload_perl() {
3626 # can/must only be called in main 3886 # can/must only be called in main
3627 if ($Coro::current != $Coro::main) { 3887 unless (in_main) {
3628 warn "can only reload from main coroutine"; 3888 error "can only reload from main coroutine";
3629 return; 3889 return;
3630 } 3890 }
3631 3891
3632 return if $RELOAD++; 3892 return if $RELOAD++;
3633 3893
3634 my $t1 = EV::time; 3894 my $t1 = AE::time;
3635 3895
3636 while ($RELOAD) { 3896 while ($RELOAD) {
3897 cf::get_slot 0.1, -1, "reload_perl";
3637 warn "reloading..."; 3898 info "reloading...";
3638 3899
3639 warn "entering sync_job"; 3900 trace "entering sync_job";
3640 3901
3641 cf::sync_job { 3902 cf::sync_job {
3642 cf::write_runtime_sync; # external watchdog should not bark
3643 cf::emergency_save; 3903 #cf::emergency_save;
3644 cf::write_runtime_sync; # external watchdog should not bark
3645 3904
3646 warn "syncing database to disk";
3647 BDB::db_env_txn_checkpoint $DB_ENV;
3648
3649 # if anything goes wrong in here, we should simply crash as we already saved
3650
3651 warn "flushing outstanding aio requests";
3652 while (IO::AIO::nreqs || BDB::nreqs) {
3653 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3654 }
3655
3656 warn "cancelling all extension coros"; 3905 trace "cancelling all extension coros";
3657 $_->cancel for values %EXT_CORO; 3906 $_->cancel for values %EXT_CORO;
3658 %EXT_CORO = (); 3907 %EXT_CORO = ();
3659 3908
3660 warn "removing commands"; 3909 trace "removing commands";
3661 %COMMAND = (); 3910 %COMMAND = ();
3662 3911
3663 warn "removing ext/exti commands"; 3912 trace "removing ext/exti commands";
3664 %EXTCMD = (); 3913 %EXTCMD = ();
3665 %EXTICMD = (); 3914 %EXTICMD = ();
3666 3915
3667 warn "unloading/nuking all extensions"; 3916 trace "unloading/nuking all extensions";
3668 for my $pkg (@EXTS) { 3917 for my $pkg (@EXTS) {
3669 warn "... unloading $pkg"; 3918 trace "... unloading $pkg";
3670 3919
3671 if (my $cb = $pkg->can ("unload")) { 3920 if (my $cb = $pkg->can ("unload")) {
3672 eval { 3921 eval {
3673 $cb->($pkg); 3922 $cb->($pkg);
3674 1 3923 1
3675 } or warn "$pkg unloaded, but with errors: $@"; 3924 } or error "$pkg unloaded, but with errors: $@";
3676 } 3925 }
3677 3926
3678 warn "... clearing $pkg"; 3927 trace "... clearing $pkg";
3679 clear_package $pkg; 3928 clear_package $pkg;
3680 } 3929 }
3681 3930
3682 warn "unloading all perl modules loaded from $LIBDIR"; 3931 trace "unloading all perl modules loaded from $LIBDIR";
3683 while (my ($k, $v) = each %INC) { 3932 while (my ($k, $v) = each %INC) {
3684 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3933 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3685 3934
3686 warn "... unloading $k"; 3935 trace "... unloading $k";
3687 delete $INC{$k}; 3936 delete $INC{$k};
3688 3937
3689 $k =~ s/\.pm$//; 3938 $k =~ s/\.pm$//;
3690 $k =~ s/\//::/g; 3939 $k =~ s/\//::/g;
3691 3940
3694 } 3943 }
3695 3944
3696 clear_package $k; 3945 clear_package $k;
3697 } 3946 }
3698 3947
3699 warn "getting rid of safe::, as good as possible"; 3948 trace "getting rid of safe::, as good as possible";
3700 clear_package "safe::$_" 3949 clear_package "safe::$_"
3701 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);
3702 3951
3703 warn "unloading cf.pm \"a bit\""; 3952 trace "unloading cf.pm \"a bit\"";
3704 delete $INC{"cf.pm"}; 3953 delete $INC{"cf.pm"};
3705 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3954 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3706 3955
3707 # don't, removes xs symbols, too, 3956 # don't, removes xs symbols, too,
3708 # and global variables created in xs 3957 # and global variables created in xs
3709 #clear_package __PACKAGE__; 3958 #clear_package __PACKAGE__;
3710 3959
3711 warn "unload completed, starting to reload now"; 3960 info "unload completed, starting to reload now";
3712 3961
3713 warn "reloading cf.pm"; 3962 trace "reloading cf.pm";
3714 require cf; 3963 require cf;
3715 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3964 cf::_connect_to_perl_1;
3716 3965
3717 warn "loading config and database again"; 3966 trace "loading config and database again";
3718 cf::reload_config; 3967 cf::reload_config;
3719 3968
3720 warn "loading extensions"; 3969 trace "loading extensions";
3721 cf::load_extensions; 3970 cf::load_extensions;
3722 3971
3723 if ($REATTACH_ON_RELOAD) { 3972 if ($REATTACH_ON_RELOAD) {
3724 warn "reattaching attachments to objects/players"; 3973 trace "reattaching attachments to objects/players";
3725 _global_reattach; # objects, sockets 3974 _global_reattach; # objects, sockets
3726 warn "reattaching attachments to maps"; 3975 trace "reattaching attachments to maps";
3727 reattach $_ for values %MAP; 3976 reattach $_ for values %MAP;
3728 warn "reattaching attachments to players"; 3977 trace "reattaching attachments to players";
3729 reattach $_ for values %PLAYER; 3978 reattach $_ for values %PLAYER;
3730 } 3979 }
3731 3980
3732 warn "running post_init jobs"; 3981 trace "running post_init jobs";
3733 (pop @POST_INIT)->(1) while @POST_INIT; 3982 (pop @POST_INIT)->(1) while @POST_INIT;
3734 3983
3735 warn "leaving sync_job"; 3984 trace "leaving sync_job";
3736 3985
3737 1 3986 1
3738 } or do { 3987 } or do {
3739 warn $@; 3988 error $@;
3740 cf::cleanup "error while reloading, exiting."; 3989 cf::cleanup "error while reloading, exiting.";
3741 }; 3990 };
3742 3991
3743 warn "reloaded"; 3992 info "reloaded";
3744 --$RELOAD; 3993 --$RELOAD;
3745 } 3994 }
3746 3995
3747 $t1 = EV::time - $t1; 3996 $t1 = AE::time - $t1;
3748 warn "reload completed in ${t1}s\n"; 3997 info "reload completed in ${t1}s\n";
3749}; 3998};
3750 3999
3751our $RELOAD_WATCHER; # used only during reload 4000our $RELOAD_WATCHER; # used only during reload
3752 4001
3753sub reload_perl() { 4002sub reload_perl() {
3755 # coro crashes during coro_state_free->destroy here. 4004 # coro crashes during coro_state_free->destroy here.
3756 4005
3757 $RELOAD_WATCHER ||= cf::async { 4006 $RELOAD_WATCHER ||= cf::async {
3758 Coro::AIO::aio_wait cache_extensions; 4007 Coro::AIO::aio_wait cache_extensions;
3759 4008
3760 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4009 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3761 do_reload_perl; 4010 do_reload_perl;
3762 undef $RELOAD_WATCHER; 4011 undef $RELOAD_WATCHER;
3763 }; 4012 };
3764 }; 4013 };
3765} 4014}
3774 reload_perl; 4023 reload_perl;
3775 }; 4024 };
3776 } 4025 }
3777}; 4026};
3778 4027
3779unshift @INC, $LIBDIR; 4028#############################################################################
3780 4029
3781my $bug_warning = 0; 4030my $bug_warning = 0;
3782 4031
3783our @WAIT_FOR_TICK; 4032our @WAIT_FOR_TICK;
3784our @WAIT_FOR_TICK_BEGIN; 4033our @WAIT_FOR_TICK_BEGIN;
3785 4034
3786sub wait_for_tick { 4035sub wait_for_tick() {
3787 return if tick_inhibit || $Coro::current == $Coro::main; 4036 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3788 4037
3789 my $signal = new Coro::Signal; 4038 my $signal = new Coro::Signal;
3790 push @WAIT_FOR_TICK, $signal; 4039 push @WAIT_FOR_TICK, $signal;
3791 $signal->wait; 4040 $signal->wait;
3792} 4041}
3793 4042
3794sub wait_for_tick_begin { 4043sub wait_for_tick_begin() {
3795 return if tick_inhibit || $Coro::current == $Coro::main; 4044 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3796 4045
3797 my $signal = new Coro::Signal; 4046 my $signal = new Coro::Signal;
3798 push @WAIT_FOR_TICK_BEGIN, $signal; 4047 push @WAIT_FOR_TICK_BEGIN, $signal;
3799 $signal->wait; 4048 $signal->wait;
3800} 4049}
3806 return; 4055 return;
3807 } 4056 }
3808 4057
3809 cf::server_tick; # one server iteration 4058 cf::server_tick; # one server iteration
3810 4059
4060 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4061
3811 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4062 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3812 $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.;
3813 Coro::async_pool { 4064 Coro::async_pool {
3814 $Coro::current->{desc} = "runtime saver"; 4065 $Coro::current->{desc} = "runtime saver";
3815 write_runtime_sync 4066 write_runtime_sync
3816 or warn "ERROR: unable to write runtime file: $!"; 4067 or error "ERROR: unable to write runtime file: $!";
3817 }; 4068 };
3818 } 4069 }
3819 4070
3820 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4071 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3821 $sig->send; 4072 $sig->send;
3829 4080
3830 if (0) { 4081 if (0) {
3831 if ($NEXT_TICK) { 4082 if ($NEXT_TICK) {
3832 my $jitter = $TICK_START - $NEXT_TICK; 4083 my $jitter = $TICK_START - $NEXT_TICK;
3833 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4084 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3834 warn "jitter $JITTER\n";#d# 4085 debug "jitter $JITTER\n";#d#
3835 } 4086 }
3836 } 4087 }
3837} 4088}
3838 4089
3839{ 4090{
3840 # configure BDB 4091 # configure BDB
3841 4092
3842 BDB::min_parallel 8; 4093 BDB::min_parallel 16;
3843 BDB::max_poll_reqs $TICK * 0.1; 4094 BDB::max_poll_reqs $TICK * 0.1;
3844 $AnyEvent::BDB::WATCHER->priority (1); 4095 $AnyEvent::BDB::WATCHER->priority (1);
3845 4096
3846 unless ($DB_ENV) { 4097 unless ($DB_ENV) {
3847 $DB_ENV = BDB::db_env_create; 4098 $DB_ENV = BDB::db_env_create;
3928 } 4179 }
3929} 4180}
3930 4181
3931# load additional modules 4182# load additional modules
3932require "cf/$_.pm" for @EXTRA_MODULES; 4183require "cf/$_.pm" for @EXTRA_MODULES;
4184cf::_connect_to_perl_2;
3933 4185
3934END { cf::emergency_save } 4186END { cf::emergency_save }
3935 4187
39361 41881
3937 4189

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines