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.474 by root, Thu Jul 16 21:42:56 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
76 75
77# strictly for debugging 76# strictly for debugging
78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
79 78
80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
81 82
82our %COMMAND = (); 83our %COMMAND = ();
83our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
84 85
85our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
88our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
89our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
90 91
91our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
92our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
93 96
94our $CONFDIR = confdir; 97our $CONFDIR = confdir;
95our $DATADIR = datadir; 98our $DATADIR = datadir;
96our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
97our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
103our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
104our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
105our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
106our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
107 110
108our %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;
109 118
110our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
111our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
112our $NEXT_TICK; 121our $NEXT_TICK;
113our $USE_FSYNC = 1; # use fsync to write maps - default on 122our $USE_FSYNC = 1; # use fsync to write maps - default on
115our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
116our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
117our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
118our $DB_ENV; 127our $DB_ENV;
119 128
120our @EXTRA_MODULES = qw(pod mapscript); 129our @EXTRA_MODULES = qw(pod match mapscript incloader);
121 130
122our %CFG; 131our %CFG;
123 132
124our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
125our $RUNTIME; 134our $RUNTIME;
159 168
160our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
161 170
162sub cf::map::normalise; 171sub cf::map::normalise;
163 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
164############################################################################# 188#############################################################################
165 189
166=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
167 191
168=over 4 192=over 4
209from wherever your confdir points to. 233from wherever your confdir points to.
210 234
211=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
212 236
213These 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
214returns 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
215per 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.
216 240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
217=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
218 247
219This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
220C<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
221that call. 250that call.
222 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
223=back 258=back
224 259
225=cut 260=cut
226 261
227BEGIN { 262sub error(@) { LOG llevError, join "", @_ }
228 *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 {
229 my $msg = join "", @_; 269 my $msg = join "", @_;
230 270
231 $msg .= "\n" 271 $msg .= "\n"
232 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
233 273
234 $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;
235 275
236 LOG llevError, $msg; 276 LOG llevWarn, $msg;
237 }; 277};
238}
239 278
240$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
241 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
242 281
243 if ($Coro::current == $Coro::main) {#d# 282 error Carp::longmess $_[0];
283
284 if (in_main) {#d#
244 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
245 return;#d# 286 return;#d#
246 }#d# 287 }#d#
247 288
248 # kill coroutine otherwise 289 # kill coroutine otherwise
249 warn Carp::longmess $_[0];
250 Coro::terminate 290 Coro::terminate
251}; 291};
252
253$SIG{__DIE__} = sub { }; #d#?
254 292
255@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 293@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
256@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 294@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
257@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 295@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
258@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 296@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
272)) { 310)) {
273 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
274} 312}
275 313
276$EV::DIED = sub { 314$EV::DIED = sub {
277 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
278}; 316};
279 317
280############################################################################# 318#############################################################################
281 319
282=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
319our $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
320 358
321sub encode_json($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
322sub decode_json($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
323 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
324=item cf::post_init { BLOCK } 374=item cf::post_init { BLOCK }
325 375
326Execute the given codeblock, I<after> all extensions have been (re-)loaded, 376Execute the given codeblock, I<after> all extensions have been (re-)loaded,
327but I<before> the server starts ticking again. 377but I<before> the server starts ticking again.
328 378
329The cdoeblock will have a single boolean argument to indicate whether this 379The codeblock will have a single boolean argument to indicate whether this
330is a reload or not. 380is a reload or not.
331 381
332=cut 382=cut
333 383
334sub post_init(&) { 384sub post_init(&) {
379} 429}
380 430
381=item cf::periodic $interval, $cb 431=item cf::periodic $interval, $cb
382 432
383Like 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
384get spread over timer. 434get spread over time.
385 435
386=cut 436=cut
387 437
388sub periodic($$) { 438sub periodic($$) {
389 my ($interval, $cb) = @_; 439 my ($interval, $cb) = @_;
406 456
407=cut 457=cut
408 458
409our @SLOT_QUEUE; 459our @SLOT_QUEUE;
410our $SLOT_QUEUE; 460our $SLOT_QUEUE;
461our $SLOT_DECAY = 0.9;
411 462
412$SLOT_QUEUE->cancel if $SLOT_QUEUE; 463$SLOT_QUEUE->cancel if $SLOT_QUEUE;
413$SLOT_QUEUE = Coro::async { 464$SLOT_QUEUE = Coro::async {
414 $Coro::current->desc ("timeslot manager"); 465 $Coro::current->desc ("timeslot manager");
415 466
416 my $signal = new Coro::Signal; 467 my $signal = new Coro::Signal;
468 my $busy;
417 469
418 while () { 470 while () {
419 next_job: 471 next_job:
472
420 my $avail = cf::till_tick; 473 my $avail = cf::till_tick;
421 if ($avail > 0.01) { 474
422 for (0 .. $#SLOT_QUEUE) { 475 for (0 .. $#SLOT_QUEUE) {
423 if ($SLOT_QUEUE[$_][0] < $avail) { 476 if ($SLOT_QUEUE[$_][0] <= $avail) {
477 $busy = 0;
424 my $job = splice @SLOT_QUEUE, $_, 1, (); 478 my $job = splice @SLOT_QUEUE, $_, 1, ();
425 $job->[2]->send; 479 $job->[2]->send;
426 Coro::cede; 480 Coro::cede;
427 goto next_job; 481 goto next_job;
428 } 482 } else {
483 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
429 } 484 }
430 } 485 }
431 486
432 if (@SLOT_QUEUE) { 487 if (@SLOT_QUEUE) {
433 # 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
434 push @cf::WAIT_FOR_TICK, $signal; 489 push @cf::WAIT_FOR_TICK, $signal;
435 $signal->wait; 490 $signal->wait;
436 } else { 491 } else {
492 $busy = 0;
437 Coro::schedule; 493 Coro::schedule;
438 } 494 }
439 } 495 }
440}; 496};
441 497
442sub get_slot($;$$) { 498sub get_slot($;$$) {
443 return if tick_inhibit || $Coro::current == $Coro::main; 499 return if tick_inhibit || $Coro::current == $Coro::main;
444 500
445 my ($time, $pri, $name) = @_; 501 my ($time, $pri, $name) = @_;
446 502
447 $time = $TICK * .6 if $time > $TICK * .6; 503 $time = clamp $time, 0.01, $TICK * .6;
504
448 my $sig = new Coro::Signal; 505 my $sig = new Coro::Signal;
449 506
450 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 507 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
451 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 508 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
452 $SLOT_QUEUE->ready; 509 $SLOT_QUEUE->ready;
478=cut 535=cut
479 536
480sub sync_job(&) { 537sub sync_job(&) {
481 my ($job) = @_; 538 my ($job) = @_;
482 539
483 if ($Coro::current == $Coro::main) { 540 if (in_main) {
484 my $time = EV::time; 541 my $time = AE::time;
485 542
486 # this is the main coro, too bad, we have to block 543 # this is the main coro, too bad, we have to block
487 # till the operation succeeds, freezing the server :/ 544 # till the operation succeeds, freezing the server :/
488 545
489 LOG llevError, Carp::longmess "sync job";#d# 546 #LOG llevError, Carp::longmess "sync job";#d#
490 547
491 my $freeze_guard = freeze_mainloop; 548 my $freeze_guard = freeze_mainloop;
492 549
493 my $busy = 1; 550 my $busy = 1;
494 my @res; 551 my @res;
495 552
496 (async { 553 (async {
497 $Coro::current->desc ("sync job coro"); 554 $Coro::current->desc ("sync job coro");
498 @res = eval { $job->() }; 555 @res = eval { $job->() };
499 warn $@ if $@; 556 error $@ if $@;
500 undef $busy; 557 undef $busy;
501 })->prio (Coro::PRIO_MAX); 558 })->prio (Coro::PRIO_MAX);
502 559
503 while ($busy) { 560 while ($busy) {
504 if (Coro::nready) { 561 if (Coro::nready) {
506 } else { 563 } else {
507 EV::loop EV::LOOP_ONESHOT; 564 EV::loop EV::LOOP_ONESHOT;
508 } 565 }
509 } 566 }
510 567
511 my $time = EV::time - $time; 568 my $time = AE::time - $time;
512 569
513 $TICK_START += $time; # do not account sync jobs to server load 570 $TICK_START += $time; # do not account sync jobs to server load
514 571
515 wantarray ? @res : $res[0] 572 wantarray ? @res : $res[0]
516 } else { 573 } else {
538 $EXT_CORO{$coro+0} = $coro; 595 $EXT_CORO{$coro+0} = $coro;
539 596
540 $coro 597 $coro
541} 598}
542 599
543=item fork_call { }, $args 600=item fork_call { }, @args
544 601
545Executes the given code block with the given arguments in a seperate 602Executes the given code block with the given arguments in a seperate
546process, returning the results. Everything must be serialisable with 603process, returning the results. Everything must be serialisable with
547Coro::Storable. May, of course, block. Note that the executed sub may 604Coro::Storable. May, of course, block. Note that the executed sub may
548never block itself or use any form of event handling. 605never block itself or use any form of event handling.
549 606
550=cut 607=cut
551 608
609sub post_fork {
610 reset_signals;
611}
612
552sub fork_call(&@) { 613sub fork_call(&@) {
553 my ($cb, @args) = @_; 614 my ($cb, @args) = @_;
554 615
555 # 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,
556 # otherwise perl prematurely frees the stuff :/ 617 # otherwise perl prematurely frees the stuff :/
557 # TODO: investigate and fix (likely this will be rather laborious) 618 # TODO: investigate and fix (likely this will be rather laborious)
558 619
559 my @res = Coro::Util::fork_eval { 620 my @res = Coro::Util::fork_eval {
560 reset_signals; 621 cf::post_fork;
561 &$cb 622 &$cb
562 }, @args; 623 } @args;
563 624
564 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 )
565} 637}
566 638
567=item $coin = coin_from_name $name 639=item $coin = coin_from_name $name
568 640
569=cut 641=cut
606within each server. 678within each server.
607 679
608=cut 680=cut
609 681
610sub db_table($) { 682sub db_table($) {
683 cf::error "db_get called from main context"
684 if $Coro::current == $Coro::main;
685
611 my ($name) = @_; 686 my ($name) = @_;
612 my $db = BDB::db_create $DB_ENV; 687 my $db = BDB::db_create $DB_ENV;
613 688
614 eval { 689 eval {
615 $db->set_flags (BDB::CHKSUM); 690 $db->set_flags (BDB::CHKSUM);
625} 700}
626 701
627our $DB; 702our $DB;
628 703
629sub db_init { 704sub db_init {
630 cf::sync_job {
631 $DB ||= db_table "db"; 705 $DB ||= db_table "db";
632 };
633} 706}
634 707
635sub db_get($$) { 708sub db_get($$) {
636 my $key = "$_[0]/$_[1]"; 709 my $key = "$_[0]/$_[1]";
637 710
638 cf::sync_job { 711 cf::error "db_get called from main context"
712 if $Coro::current == $Coro::main;
713
639 BDB::db_get $DB, undef, $key, my $data; 714 BDB::db_get $DB, undef, $key, my $data;
640 715
641 $! ? () 716 $! ? ()
642 : $data 717 : $data
643 }
644} 718}
645 719
646sub db_put($$$) { 720sub db_put($$$) {
647 BDB::dbreq_pri 4; 721 BDB::dbreq_pri 4;
648 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 722 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
704 778
705 my $t1 = Time::HiRes::time; 779 my $t1 = Time::HiRes::time;
706 my $data = $process->(\@data); 780 my $data = $process->(\@data);
707 my $t2 = Time::HiRes::time; 781 my $t2 = Time::HiRes::time;
708 782
709 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 783 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
710 784
711 db_put cache => "$id/data", $data; 785 db_put cache => "$id/data", $data;
712 db_put cache => "$id/md5" , $md5; 786 db_put cache => "$id/md5" , $md5;
713 db_put cache => "$id/meta", $meta; 787 db_put cache => "$id/meta", $meta;
714 788
724 798
725=cut 799=cut
726 800
727sub datalog($@) { 801sub datalog($@) {
728 my ($type, %kv) = @_; 802 my ($type, %kv) = @_;
729 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 803 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
730} 804}
731 805
732=back 806=back
733 807
734=cut 808=cut
929 1003
930 } elsif (exists $cb_id{$type}) { 1004 } elsif (exists $cb_id{$type}) {
931 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1005 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
932 1006
933 } elsif (ref $type) { 1007 } elsif (ref $type) {
934 warn "attaching objects not supported, ignoring.\n"; 1008 error "attaching objects not supported, ignoring.\n";
935 1009
936 } else { 1010 } else {
937 shift @arg; 1011 shift @arg;
938 warn "attach argument '$type' not supported, ignoring.\n"; 1012 error "attach argument '$type' not supported, ignoring.\n";
939 } 1013 }
940 } 1014 }
941} 1015}
942 1016
943sub _object_attach { 1017sub _object_attach {
953 _attach $registry, $klass, @attach; 1027 _attach $registry, $klass, @attach;
954 } 1028 }
955 1029
956 $obj->{$name} = \%arg; 1030 $obj->{$name} = \%arg;
957 } else { 1031 } else {
958 warn "object uses attachment '$name' which is not available, postponing.\n"; 1032 info "object uses attachment '$name' which is not available, postponing.\n";
959 } 1033 }
960 1034
961 $obj->{_attachment}{$name} = undef; 1035 $obj->{_attachment}{$name} = undef;
962} 1036}
963 1037
1022 1096
1023 for (@$callbacks) { 1097 for (@$callbacks) {
1024 eval { &{$_->[1]} }; 1098 eval { &{$_->[1]} };
1025 1099
1026 if ($@) { 1100 if ($@) {
1027 warn "$@";
1028 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1101 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1029 override; 1102 override;
1030 } 1103 }
1031 1104
1032 return 1 if $override; 1105 return 1 if $override;
1033 } 1106 }
1112 for (@$attach) { 1185 for (@$attach) {
1113 my ($klass, @attach) = @$_; 1186 my ($klass, @attach) = @$_;
1114 _attach $registry, $klass, @attach; 1187 _attach $registry, $klass, @attach;
1115 } 1188 }
1116 } else { 1189 } else {
1117 warn "object uses attachment '$name' that is not available, postponing.\n"; 1190 info "object uses attachment '$name' that is not available, postponing.\n";
1118 } 1191 }
1119 } 1192 }
1120} 1193}
1121 1194
1122cf::attachable->attach ( 1195cf::attachable->attach (
1149 my ($filename, $rdata, $objs) = @_; 1222 my ($filename, $rdata, $objs) = @_;
1150 1223
1151 sync_job { 1224 sync_job {
1152 if (length $$rdata) { 1225 if (length $$rdata) {
1153 utf8::decode (my $decname = $filename); 1226 utf8::decode (my $decname = $filename);
1154 warn sprintf "saving %s (%d,%d)\n", 1227 trace sprintf "saving %s (%d,%d)\n",
1155 $decname, length $$rdata, scalar @$objs; 1228 $decname, length $$rdata, scalar @$objs
1229 if $VERBOSE_IO;
1156 1230
1157 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1231 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1158 aio_chmod $fh, SAVE_MODE; 1232 aio_chmod $fh, SAVE_MODE;
1159 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1233 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1160 if ($cf::USE_FSYNC) { 1234 if ($cf::USE_FSYNC) {
1182 aio_rename "$filename~", $filename; 1256 aio_rename "$filename~", $filename;
1183 1257
1184 $filename =~ s%/[^/]+$%%; 1258 $filename =~ s%/[^/]+$%%;
1185 aio_pathsync $filename if $cf::USE_FSYNC; 1259 aio_pathsync $filename if $cf::USE_FSYNC;
1186 } else { 1260 } else {
1187 warn "unable to save objects: $filename~: $!\n"; 1261 error "unable to save objects: $filename~: $!\n";
1188 } 1262 }
1189 } else { 1263 } else {
1190 aio_unlink $filename; 1264 aio_unlink $filename;
1191 aio_unlink "$filename.pst"; 1265 aio_unlink "$filename.pst";
1192 } 1266 }
1216 my $st = eval { Coro::Storable::thaw $av }; 1290 my $st = eval { Coro::Storable::thaw $av };
1217 $av = $st->{objs}; 1291 $av = $st->{objs};
1218 } 1292 }
1219 1293
1220 utf8::decode (my $decname = $filename); 1294 utf8::decode (my $decname = $filename);
1221 warn sprintf "loading %s (%d,%d)\n", 1295 trace sprintf "loading %s (%d,%d)\n",
1222 $decname, length $data, scalar @{$av || []}; 1296 $decname, length $data, scalar @{$av || []}
1297 if $VERBOSE_IO;
1223 1298
1224 ($data, $av) 1299 ($data, $av)
1225} 1300}
1226 1301
1227=head2 COMMAND CALLBACKS 1302=head2 COMMAND CALLBACKS
1286} 1361}
1287 1362
1288use File::Glob (); 1363use File::Glob ();
1289 1364
1290cf::player->attach ( 1365cf::player->attach (
1291 on_command => sub { 1366 on_unknown_command => sub {
1292 my ($pl, $name, $params) = @_; 1367 my ($pl, $name, $params) = @_;
1293 1368
1294 my $cb = $COMMAND{$name} 1369 my $cb = $COMMAND{$name}
1295 or return; 1370 or return;
1296 1371
1319 1394
1320 $pl->ext_reply ($reply, @reply) 1395 $pl->ext_reply ($reply, @reply)
1321 if $reply; 1396 if $reply;
1322 1397
1323 } else { 1398 } else {
1324 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1399 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1325 } 1400 }
1326 1401
1327 cf::override; 1402 cf::override;
1328 }, 1403 },
1329); 1404);
1340 1415
1341 $grp 1416 $grp
1342} 1417}
1343 1418
1344sub load_extensions { 1419sub load_extensions {
1420 info "loading extensions...";
1421
1345 cf::sync_job { 1422 cf::sync_job {
1346 my %todo; 1423 my %todo;
1347 1424
1348 for my $path (<$LIBDIR/*.ext>) { 1425 for my $path (<$LIBDIR/*.ext>) {
1349 next unless -r $path; 1426 next unless -r $path;
1367 1444
1368 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1445 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1369 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1446 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1370 1447
1371 $ext{source} = 1448 $ext{source} =
1372 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1449 "package $pkg; use common::sense;\n"
1373 . "#line 1 \"$path\"\n{\n" 1450 . "#line 1 \"$path\"\n{\n"
1374 . $source 1451 . $source
1375 . "\n};\n1"; 1452 . "\n};\n1";
1376 1453
1377 $todo{$base} = \%ext; 1454 $todo{$base} = \%ext;
1378 } 1455 }
1379 1456
1457 my $pass = 0;
1380 my %done; 1458 my %done;
1381 while (%todo) { 1459 while (%todo) {
1382 my $progress; 1460 my $progress;
1383 1461
1462 ++$pass;
1463
1464 ext:
1384 while (my ($k, $v) = each %todo) { 1465 while (my ($k, $v) = each %todo) {
1385 for (split /,\s*/, $v->{meta}{depends}) { 1466 for (split /,\s*/, $v->{meta}{depends}) {
1386 goto skip 1467 next ext
1387 unless exists $done{$_}; 1468 unless exists $done{$_};
1388 } 1469 }
1389 1470
1390 warn "... loading '$k' into '$v->{pkg}'\n"; 1471 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1391 1472
1392 unless (eval $v->{source}) { 1473 my $active = eval $v->{source};
1474
1475 if (length $@) {
1393 my $msg = $@ ? "$v->{path}: $@\n" 1476 error "$v->{path}: $@\n";
1394 : "$v->{base}: extension inactive.\n";
1395 1477
1396 if (exists $v->{meta}{mandatory}) {
1397 warn $msg;
1398 cf::cleanup "mandatory extension failed to load, exiting."; 1478 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1399 } 1479 if exists $v->{meta}{mandatory};
1400 1480
1401 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;
1402 } 1490 }
1403
1404 $done{$k} = delete $todo{$k};
1405 push @EXTS, $v->{pkg};
1406 $progress = 1;
1407 } 1491 }
1408 1492
1409 skip: 1493 unless ($progress) {
1410 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1494 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1411 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 }
1412 } 1501 }
1413 }; 1502 };
1414} 1503}
1415 1504
1416############################################################################# 1505#############################################################################
1500 $cf::PLAYER{$login} = $pl 1589 $cf::PLAYER{$login} = $pl
1501 } 1590 }
1502 } 1591 }
1503} 1592}
1504 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
1505sub save($) { 1607sub save($) {
1506 my ($pl) = @_; 1608 my ($pl) = @_;
1507 1609
1508 return if $pl->{deny_save}; 1610 return if $pl->{deny_save};
1509 1611
1514 1616
1515 aio_mkdir playerdir $pl, 0770; 1617 aio_mkdir playerdir $pl, 0770;
1516 $pl->{last_save} = $cf::RUNTIME; 1618 $pl->{last_save} = $cf::RUNTIME;
1517 1619
1518 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];
1519 1624
1520 $pl->save_pl ($path); 1625 $pl->save_pl ($path);
1521 cf::cede_to_tick; 1626 cf::cede_to_tick;
1522} 1627}
1523 1628
1557 my $name = $pl->ob->name; 1662 my $name = $pl->ob->name;
1558 1663
1559 $pl->{deny_save} = 1; 1664 $pl->{deny_save} = 1;
1560 $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
1561 1666
1562 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1667 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1563 $pl->deactivate; 1668 $pl->deactivate;
1669
1564 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;
1565 $pl->ob->check_score;
1566 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1671 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1672 ext::highscore::check ($pl->ob);
1673
1567 $pl->ns->destroy if $pl->ns; 1674 $pl->ns->destroy if $pl->ns;
1568 1675
1569 my $path = playerdir $pl; 1676 my $path = playerdir $pl;
1570 my $temp = "$path~$cf::RUNTIME~deleting~"; 1677 my $temp = "$path~$cf::RUNTIME~deleting~";
1571 aio_rename $path, $temp; 1678 aio_rename $path, $temp;
1625 \@logins 1732 \@logins
1626} 1733}
1627 1734
1628=item $player->maps 1735=item $player->maps
1629 1736
1737=item cf::player::maps $login
1738
1630Returns an arrayref of map paths that are private for this 1739Returns an arrayref of map paths that are private for this
1631player. May block. 1740player. May block.
1632 1741
1633=cut 1742=cut
1634 1743
1696=cut 1805=cut
1697 1806
1698sub find_by_path($) { 1807sub find_by_path($) {
1699 my ($path) = @_; 1808 my ($path) = @_;
1700 1809
1810 $path =~ s/^~[^\/]*//; # skip ~login
1811
1701 my ($match, $specificity); 1812 my ($match, $specificity);
1702 1813
1703 for my $region (list) { 1814 for my $region (list) {
1704 if ($region->{match} && $path =~ $region->{match}) { 1815 if ($region->{match} && $path =~ $region->{match}) {
1705 ($match, $specificity) = ($region, $region->specificity) 1816 ($match, $specificity) = ($region, $region->specificity)
1736 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
1737 1848
1738 # mit "rum" bekleckern, nicht 1849 # mit "rum" bekleckern, nicht
1739 $self->_create_random_map ( 1850 $self->_create_random_map (
1740 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1851 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1741 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1852 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1742 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1853 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1743 $rmp->{exit_on_final_map}, 1854 $rmp->{exit_on_final_map},
1744 $rmp->{xsize}, $rmp->{ysize}, 1855 $rmp->{xsize}, $rmp->{ysize},
1745 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1856 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1746 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1857 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1761 1872
1762sub register { 1873sub register {
1763 my (undef, $regex, $prio) = @_; 1874 my (undef, $regex, $prio) = @_;
1764 my $pkg = caller; 1875 my $pkg = caller;
1765 1876
1766 no strict;
1767 push @{"$pkg\::ISA"}, __PACKAGE__; 1877 push @{"$pkg\::ISA"}, __PACKAGE__;
1768 1878
1769 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1879 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1770} 1880}
1771 1881
1772# also paths starting with '/' 1882# also paths starting with '/'
1773$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1883$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1774 1884
1775sub thawer_merge { 1885sub thawer_merge {
1776 my ($self, $merge) = @_; 1886 my ($self, $merge) = @_;
1777 1887
1778 # we have to keep some variables in memory intact 1888 # we have to keep some variables in memory intact
1783} 1893}
1784 1894
1785sub normalise { 1895sub normalise {
1786 my ($path, $base) = @_; 1896 my ($path, $base) = @_;
1787 1897
1788 $path = "$path"; # make sure its a string 1898 $path = "$path"; # make sure it's a string
1789 1899
1790 $path =~ s/\.map$//; 1900 $path =~ s/\.map$//;
1791 1901
1792 # map plan: 1902 # map plan:
1793 # 1903 #
1832 $self->init; # pass $1 etc. 1942 $self->init; # pass $1 etc.
1833 return $self; 1943 return $self;
1834 } 1944 }
1835 } 1945 }
1836 1946
1837 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1947 Carp::cluck "unable to resolve path '$path' (base '$base')";
1838 () 1948 ()
1839} 1949}
1840 1950
1841sub init { 1951sub init {
1842 my ($self) = @_; 1952 my ($self) = @_;
1964} 2074}
1965 2075
1966sub find; 2076sub find;
1967sub find { 2077sub find {
1968 my ($path, $origin) = @_; 2078 my ($path, $origin) = @_;
2079
2080 cf::cede_to_tick;
1969 2081
1970 $path = normalise $path, $origin && $origin->path; 2082 $path = normalise $path, $origin && $origin->path;
1971 2083
1972 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2084 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973 my $guard2 = cf::lock_acquire "map_find:$path"; 2085 my $guard2 = cf::lock_acquire "map_find:$path";
1992 2104
1993 $cf::MAP{$path} = $map 2105 $cf::MAP{$path} = $map
1994 } 2106 }
1995} 2107}
1996 2108
1997sub pre_load { } 2109sub pre_load { }
1998sub post_load { } 2110#sub post_load { } # XS
1999 2111
2000sub load { 2112sub load {
2001 my ($self) = @_; 2113 my ($self) = @_;
2002 2114
2003 local $self->{deny_reset} = 1; # loading can take a long time 2115 local $self->{deny_reset} = 1; # loading can take a long time
2060 } 2172 }
2061 2173
2062 $self->post_load; 2174 $self->post_load;
2063} 2175}
2064 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
2065sub customise_for { 2180sub customise_for {
2066 my ($self, $ob) = @_; 2181 my ($self, $ob) = @_;
2067 2182
2068 return find "~" . $ob->name . "/" . $self->{path} 2183 return find "~" . $ob->name . "/" . $self->{path}
2069 if $self->per_player; 2184 if $self->per_player;
2085 or next; 2200 or next;
2086 $neigh = find $neigh, $map 2201 $neigh = find $neigh, $map
2087 or next; 2202 or next;
2088 $neigh->load; 2203 $neigh->load;
2089 2204
2205 # now find the diagonal neighbours
2090 push @neigh, 2206 push @neigh,
2091 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2207 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2092 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2208 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2093 } 2209 }
2094 2210
2101} 2217}
2102 2218
2103sub find_sync { 2219sub find_sync {
2104 my ($path, $origin) = @_; 2220 my ($path, $origin) = @_;
2105 2221
2106 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
2107} 2226}
2108 2227
2109sub do_load_sync { 2228sub do_load_sync {
2110 my ($map) = @_; 2229 my ($map) = @_;
2111 2230
2112 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2231 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2113 if $Coro::current == $Coro::main; 2232 if $Coro::current == $Coro::main;
2114 2233
2115 cf::sync_job { $map->load }; 2234 $map->load;
2116} 2235}
2117 2236
2118our %MAP_PREFETCH; 2237our %MAP_PREFETCH;
2119our $MAP_PREFETCHER = undef; 2238our $MAP_PREFETCHER = undef;
2120 2239
2146 $MAP_PREFETCHER->prio (6); 2265 $MAP_PREFETCHER->prio (6);
2147 2266
2148 () 2267 ()
2149} 2268}
2150 2269
2270# common code, used by both ->save and ->swapout
2151sub save { 2271sub _save {
2152 my ($self) = @_; 2272 my ($self) = @_;
2153
2154 my $lock = cf::lock_acquire "map_data:$self->{path}";
2155 2273
2156 $self->{last_save} = $cf::RUNTIME; 2274 $self->{last_save} = $cf::RUNTIME;
2157 2275
2158 return unless $self->dirty; 2276 return unless $self->dirty;
2159 2277
2179 } else { 2297 } else {
2180 $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);
2181 } 2299 }
2182} 2300}
2183 2301
2302sub save {
2303 my ($self) = @_;
2304
2305 my $lock = cf::lock_acquire "map_data:$self->{path}";
2306
2307 $self->_save;
2308}
2309
2184sub swap_out { 2310sub swap_out {
2185 my ($self) = @_; 2311 my ($self) = @_;
2186 2312
2187 # save first because save cedes
2188 $self->save;
2189
2190 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2313 my $lock = cf::lock_acquire "map_data:$self->{path}";
2191 2314
2192 return if $self->players;
2193 return if $self->in_memory != cf::MAP_ACTIVE; 2315 return if $self->in_memory != cf::MAP_ACTIVE;
2194 return if $self->{deny_save}; 2316 return if $self->{deny_save};
2317 return if $self->players;
2195 2318
2319 # first deactivate the map and "unlink" it from the core
2320 $self->deactivate;
2321 $_->clear_links_to ($self) for values %cf::MAP;
2196 $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};
2197 2369
2198 $self->deactivate; 2370 $self->deactivate;
2199 $_->clear_links_to ($self) for values %cf::MAP; 2371 $_->clear_links_to ($self) for values %cf::MAP;
2200 $self->clear; 2372 $self->clear;
2201}
2202
2203sub reset_at {
2204 my ($self) = @_;
2205
2206 # TODO: safety, remove and allow resettable per-player maps
2207 return 1e99 if $self->{deny_reset};
2208
2209 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2210 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2211
2212 $time + $to
2213}
2214
2215sub should_reset {
2216 my ($self) = @_;
2217
2218 $self->reset_at <= $cf::RUNTIME
2219}
2220
2221sub reset {
2222 my ($self) = @_;
2223
2224 my $lock = cf::lock_acquire "map_data:$self->{path}";
2225
2226 return if $self->players;
2227
2228 warn "resetting map ", $self->path;
2229
2230 $self->in_memory (cf::MAP_SWAPPED);
2231
2232 # need to save uniques path
2233 unless ($self->{deny_save}) {
2234 my $uniq = $self->uniq_path; utf8::encode $uniq;
2235
2236 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2237 if $uniq;
2238 }
2239
2240 delete $cf::MAP{$self->path};
2241
2242 $self->deactivate;
2243 $_->clear_links_to ($self) for values %cf::MAP;
2244 $self->clear;
2245 2373
2246 $self->unlink_save; 2374 $self->unlink_save;
2247 $self->destroy; 2375 $self->destroy;
2248} 2376}
2249 2377
2257 2385
2258 delete $cf::MAP{$self->path}; 2386 delete $cf::MAP{$self->path};
2259 2387
2260 $self->unlink_save; 2388 $self->unlink_save;
2261 2389
2262 bless $self, "cf::map"; 2390 bless $self, "cf::map::wrap";
2263 delete $self->{deny_reset}; 2391 delete $self->{deny_reset};
2264 $self->{deny_save} = 1; 2392 $self->{deny_save} = 1;
2265 $self->reset_timeout (1); 2393 $self->reset_timeout (1);
2266 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2394 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2267 2395
2324 : normalise $_ 2452 : normalise $_
2325 } @{ aio_readdir $UNIQUEDIR or [] } 2453 } @{ aio_readdir $UNIQUEDIR or [] }
2326 ] 2454 ]
2327} 2455}
2328 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
2329=back 2489=back
2330 2490
2331=head3 cf::object 2491=head3 cf::object
2332 2492
2333=cut 2493=cut
2465 2625
2466Freezes 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}>).
2467 2627
2468The 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.
2469for 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,
2470though, 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
2471map. 2631map.
2472 2632
2473Will never block. 2633Will never block.
2474 2634
2475=item $player_object->leave_link ($map, $x, $y) 2635=item $player_object->leave_link ($map, $x, $y)
2496sub cf::object::player::enter_link { 2656sub cf::object::player::enter_link {
2497 my ($self) = @_; 2657 my ($self) = @_;
2498 2658
2499 $self->deactivate_recursive; 2659 $self->deactivate_recursive;
2500 2660
2661 ++$self->{_link_recursion};
2662
2501 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2663 return if UNIVERSAL::isa $self->map, "ext::map_link";
2502 2664
2503 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2665 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2504 if $self->map && $self->map->{path} ne "{link}"; 2666 if $self->map && $self->map->{path} ne "{link}";
2505 2667
2506 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2668 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2507} 2669}
2508 2670
2509sub cf::object::player::leave_link { 2671sub cf::object::player::leave_link {
2510 my ($self, $map, $x, $y) = @_; 2672 my ($self, $map, $x, $y) = @_;
2511 2673
2528 ($x, $y) = (-1, -1) 2690 ($x, $y) = (-1, -1)
2529 unless (defined $x) && (defined $y); 2691 unless (defined $x) && (defined $y);
2530 2692
2531 # use -1 or undef as default coordinates, not 0, 0 2693 # use -1 or undef as default coordinates, not 0, 0
2532 ($x, $y) = ($map->enter_x, $map->enter_y) 2694 ($x, $y) = ($map->enter_x, $map->enter_y)
2533 if $x <=0 && $y <= 0; 2695 if $x <= 0 && $y <= 0;
2534 2696
2535 $map->load; 2697 $map->load;
2536 $map->load_neighbours; 2698 $map->load_neighbours;
2537 2699
2538 return unless $self->contr->active; 2700 return unless $self->contr->active;
2539 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2540 $self->activate_recursive;
2541 2701
2542 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2702 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2543 $self->enter_map ($map, $x, $y); 2703 if ($self->enter_map ($map, $x, $y)) {
2544} 2704 # entering was successful
2705 delete $self->{_link_recursion};
2706 # only activate afterwards, to support waiting in hooks
2707 $self->activate_recursive;
2708 }
2545 2709
2710}
2711
2546=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)]])
2547 2713
2548Moves 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
2549her, loading and preparing them map, calling the provided $check callback 2715her, loading and preparing them map, calling the provided $check callback
2550that 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
2551the 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
2558 2724
2559our $GOTOGEN; 2725our $GOTOGEN;
2560 2726
2561sub cf::object::player::goto { 2727sub cf::object::player::goto {
2562 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 }
2563 2735
2564 # 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
2565 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2737 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2566 2738
2567 $self->enter_link; 2739 $self->enter_link;
2591 my $map = eval { 2763 my $map = eval {
2592 my $map = defined $path ? cf::map::find $path : undef; 2764 my $map = defined $path ? cf::map::find $path : undef;
2593 2765
2594 if ($map) { 2766 if ($map) {
2595 $map = $map->customise_for ($self); 2767 $map = $map->customise_for ($self);
2596 $map = $check->($map) if $check && $map; 2768 $map = $check->($map, $x, $y, $self) if $check && $map;
2597 } else { 2769 } else {
2598 $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);
2599 } 2771 }
2600 2772
2601 $map 2773 $map
2609 if ($gen == $self->{_goto_generation}) { 2781 if ($gen == $self->{_goto_generation}) {
2610 delete $self->{_goto_generation}; 2782 delete $self->{_goto_generation};
2611 $self->leave_link ($map, $x, $y); 2783 $self->leave_link ($map, $x, $y);
2612 } 2784 }
2613 2785
2614 $done->() if $done; 2786 $done->($self) if $done;
2615 })->prio (1); 2787 })->prio (1);
2616} 2788}
2617 2789
2618=item $player_object->enter_exit ($exit_object) 2790=item $player_object->enter_exit ($exit_object)
2619 2791
2712 $self->message ("Something went wrong deep within the deliantra server. " 2884 $self->message ("Something went wrong deep within the deliantra server. "
2713 . "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. "
2714 . "Please report this to the dungeon master!", 2886 . "Please report this to the dungeon master!",
2715 cf::NDI_UNIQUE | cf::NDI_RED); 2887 cf::NDI_UNIQUE | cf::NDI_RED);
2716 2888
2717 warn "ERROR in enter_exit: $@"; 2889 error "ERROR in enter_exit: $@";
2718 $self->leave_link; 2890 $self->leave_link;
2719 } 2891 }
2720 })->prio (1); 2892 })->prio (1);
2721} 2893}
2722 2894
2734sub cf::client::send_drawinfo { 2906sub cf::client::send_drawinfo {
2735 my ($self, $text, $flags) = @_; 2907 my ($self, $text, $flags) = @_;
2736 2908
2737 utf8::encode $text; 2909 utf8::encode $text;
2738 $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);
2739} 2936}
2740 2937
2741=item $client->send_msg ($channel, $msg, $color, [extra...]) 2938=item $client->send_msg ($channel, $msg, $color, [extra...])
2742 2939
2743Send 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
2747 2944
2748=cut 2945=cut
2749 2946
2750# non-persistent channels (usually the info channel) 2947# non-persistent channels (usually the info channel)
2751our %CHANNEL = ( 2948our %CHANNEL = (
2949 "c/motd" => {
2950 id => "infobox",
2951 title => "MOTD",
2952 reply => undef,
2953 tooltip => "The message of the day",
2954 },
2752 "c/identify" => { 2955 "c/identify" => {
2753 id => "infobox", 2956 id => "infobox",
2754 title => "Identify", 2957 title => "Identify",
2755 reply => undef, 2958 reply => undef,
2756 tooltip => "Items recently identified", 2959 tooltip => "Items recently identified",
2758 "c/examine" => { 2961 "c/examine" => {
2759 id => "infobox", 2962 id => "infobox",
2760 title => "Examine", 2963 title => "Examine",
2761 reply => undef, 2964 reply => undef,
2762 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",
2763 }, 2972 },
2764 "c/book" => { 2973 "c/book" => {
2765 id => "infobox", 2974 id => "infobox",
2766 title => "Book", 2975 title => "Book",
2767 reply => undef, 2976 reply => undef,
2883 my $pkt = "msg " 3092 my $pkt = "msg "
2884 . $self->{json_coder}->encode ( 3093 . $self->{json_coder}->encode (
2885 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3094 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2886 ); 3095 );
2887 3096
2888 # try lzf for large packets
2889 $pkt = "lzf " . Compress::LZF::compress $pkt
2890 if 1024 <= length $pkt and $self->{can_lzf};
2891
2892 # split very large packets
2893 if (8192 < length $pkt and $self->{can_lzf}) {
2894 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2895 $pkt = "frag";
2896 }
2897
2898 $self->send_packet ($pkt); 3097 $self->send_big_packet ($pkt);
2899} 3098}
2900 3099
2901=item $client->ext_msg ($type, @msg) 3100=item $client->ext_msg ($type, @msg)
2902 3101
2903Sends an ext event to the client. 3102Sends an ext event to the client.
2906 3105
2907sub cf::client::ext_msg($$@) { 3106sub cf::client::ext_msg($$@) {
2908 my ($self, $type, @msg) = @_; 3107 my ($self, $type, @msg) = @_;
2909 3108
2910 if ($self->extcmd == 2) { 3109 if ($self->extcmd == 2) {
2911 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3110 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2912 } elsif ($self->extcmd == 1) { # TODO: remove 3111 } elsif ($self->extcmd == 1) { # TODO: remove
2913 push @msg, msgtype => "event_$type"; 3112 push @msg, msgtype => "event_$type";
2914 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3113 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2915 } 3114 }
2916} 3115}
2917 3116
2918=item $client->ext_reply ($msgid, @msg) 3117=item $client->ext_reply ($msgid, @msg)
2919 3118
2923 3122
2924sub cf::client::ext_reply($$@) { 3123sub cf::client::ext_reply($$@) {
2925 my ($self, $id, @msg) = @_; 3124 my ($self, $id, @msg) = @_;
2926 3125
2927 if ($self->extcmd == 2) { 3126 if ($self->extcmd == 2) {
2928 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3127 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2929 } elsif ($self->extcmd == 1) { 3128 } elsif ($self->extcmd == 1) {
2930 #TODO: version 1, remove 3129 #TODO: version 1, remove
2931 unshift @msg, msgtype => "reply", msgid => $id; 3130 unshift @msg, msgtype => "reply", msgid => $id;
2932 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3131 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2933 } 3132 }
2934} 3133}
2935 3134
2936=item $success = $client->query ($flags, "text", \&cb) 3135=item $success = $client->query ($flags, "text", \&cb)
2937 3136
3008 3207
3009 $ns->ext_reply ($reply, @reply) 3208 $ns->ext_reply ($reply, @reply)
3010 if $reply; 3209 if $reply;
3011 3210
3012 } else { 3211 } else {
3013 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";
3014 } 3213 }
3015 3214
3016 cf::override; 3215 cf::override;
3017 }, 3216 },
3018); 3217);
3038 3237
3039 $coro 3238 $coro
3040} 3239}
3041 3240
3042cf::client->attach ( 3241cf::client->attach (
3043 on_destroy => sub { 3242 on_client_destroy => sub {
3044 my ($ns) = @_; 3243 my ($ns) = @_;
3045 3244
3046 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3245 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3047 }, 3246 },
3048); 3247);
3064our $safe_hole = new Safe::Hole; 3263our $safe_hole = new Safe::Hole;
3065 3264
3066$SIG{FPE} = 'IGNORE'; 3265$SIG{FPE} = 'IGNORE';
3067 3266
3068$safe->permit_only (Opcode::opset qw( 3267$safe->permit_only (Opcode::opset qw(
3069 :base_core :base_mem :base_orig :base_math 3268 :base_core :base_mem :base_orig :base_math :base_loop
3070 grepstart grepwhile mapstart mapwhile 3269 grepstart grepwhile mapstart mapwhile
3071 sort time 3270 sort time
3072)); 3271));
3073 3272
3074# here we export the classes and methods available to script code 3273# here we export the classes and methods available to script code
3099 decrease split destroy change_exp value msg lore send_msg)], 3298 decrease split destroy change_exp value msg lore send_msg)],
3100 ["cf::object::player" => qw(player)], 3299 ["cf::object::player" => qw(player)],
3101 ["cf::player" => qw(peaceful send_msg)], 3300 ["cf::player" => qw(peaceful send_msg)],
3102 ["cf::map" => qw(trigger)], 3301 ["cf::map" => qw(trigger)],
3103) { 3302) {
3104 no strict 'refs';
3105 my ($pkg, @funs) = @$_; 3303 my ($pkg, @funs) = @$_;
3106 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3304 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3107 for @funs; 3305 for @funs;
3108} 3306}
3109 3307
3126 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3324 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3127 $qcode =~ s/\n/\\n/g; 3325 $qcode =~ s/\n/\\n/g;
3128 3326
3129 %vars = (_dummy => 0) unless %vars; 3327 %vars = (_dummy => 0) unless %vars;
3130 3328
3329 my @res;
3131 local $_; 3330 local $_;
3132 local @safe::cf::_safe_eval_args = values %vars;
3133 3331
3134 my $eval = 3332 my $eval =
3135 "do {\n" 3333 "do {\n"
3136 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3334 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3137 . "#line 0 \"{$qcode}\"\n" 3335 . "#line 0 \"{$qcode}\"\n"
3138 . $code 3336 . $code
3139 . "\n}" 3337 . "\n}"
3140 ; 3338 ;
3141 3339
3340 if ($CFG{safe_eval}) {
3142 sub_generation_inc; 3341 sub_generation_inc;
3342 local @safe::cf::_safe_eval_args = values %vars;
3143 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3343 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3144 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 }
3145 3349
3146 if ($@) { 3350 if ($@) {
3147 warn "$@"; 3351 warn "$@",
3148 warn "while executing safe code '$code'\n"; 3352 "while executing safe code '$code'\n",
3149 warn "with arguments " . (join " ", %vars) . "\n"; 3353 "with arguments " . (join " ", %vars) . "\n";
3150 } 3354 }
3151 3355
3152 wantarray ? @res : $res[0] 3356 wantarray ? @res : $res[0]
3153} 3357}
3154 3358
3168=cut 3372=cut
3169 3373
3170sub register_script_function { 3374sub register_script_function {
3171 my ($fun, $cb) = @_; 3375 my ($fun, $cb) = @_;
3172 3376
3173 no strict 'refs'; 3377 $fun = "safe::$fun" if $CFG{safe_eval};
3174 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3378 *$fun = $safe_hole->wrap ($cb);
3175} 3379}
3176 3380
3177=back 3381=back
3178 3382
3179=cut 3383=cut
3188 # for this (global event?) 3392 # for this (global event?)
3189 %ext::player_env::MUSIC_FACE_CACHE = (); 3393 %ext::player_env::MUSIC_FACE_CACHE = ();
3190 3394
3191 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3395 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3192 3396
3193 warn "loading facedata from $path\n"; 3397 trace "loading facedata from $path\n";
3194 3398
3195 my $facedata;
3196 0 < aio_load $path, $facedata 3399 0 < aio_load $path, my $facedata
3197 or die "$path: $!"; 3400 or die "$path: $!";
3198 3401
3199 $facedata = Coro::Storable::thaw $facedata; 3402 $facedata = Coro::Storable::thaw $facedata;
3200 3403
3201 $facedata->{version} == 2 3404 $facedata->{version} == 2
3202 or cf::cleanup "$path: version mismatch, cannot proceed."; 3405 or cf::cleanup "$path: version mismatch, cannot proceed.";
3203 3406
3204 # 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]);
3205 $facedata->{resource}{"res/exp_table"} = { 3409 $facedata->{resource}{"res/exp_table"} = {
3206 type => FT_RSRC, 3410 type => FT_RSRC,
3207 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),
3208 }; 3413 };
3209 cf::cede_to_tick; 3414 cf::cede_to_tick;
3210 3415
3211 { 3416 {
3212 my $faces = $facedata->{faceinfo}; 3417 my $faces = $facedata->{faceinfo};
3214 while (my ($face, $info) = each %$faces) { 3419 while (my ($face, $info) = each %$faces) {
3215 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3420 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3216 3421
3217 cf::face::set_visibility $idx, $info->{visibility}; 3422 cf::face::set_visibility $idx, $info->{visibility};
3218 cf::face::set_magicmap $idx, $info->{magicmap}; 3423 cf::face::set_magicmap $idx, $info->{magicmap};
3219 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3424 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3220 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3425 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3221 3426
3222 cf::cede_to_tick; 3427 cf::cede_to_tick;
3223 } 3428 }
3224 3429
3225 while (my ($face, $info) = each %$faces) { 3430 while (my ($face, $info) = each %$faces) {
3230 3435
3231 if (my $smooth = cf::face::find $info->{smooth}) { 3436 if (my $smooth = cf::face::find $info->{smooth}) {
3232 cf::face::set_smooth $idx, $smooth; 3437 cf::face::set_smooth $idx, $smooth;
3233 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3438 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3234 } else { 3439 } else {
3235 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3440 error "smooth face '$info->{smooth}' not found for face '$face'";
3236 } 3441 }
3237 3442
3238 cf::cede_to_tick; 3443 cf::cede_to_tick;
3239 } 3444 }
3240 } 3445 }
3249 3454
3250 cf::anim::invalidate_all; # d'oh 3455 cf::anim::invalidate_all; # d'oh
3251 } 3456 }
3252 3457
3253 { 3458 {
3254 # TODO: for gcfclient pleasure, we should give resources
3255 # that gcfclient doesn't grok a >10000 face index.
3256 my $res = $facedata->{resource}; 3459 my $res = $facedata->{resource};
3257 3460
3258 while (my ($name, $info) = each %$res) { 3461 while (my ($name, $info) = each %$res) {
3259 if (defined $info->{type}) { 3462 if (defined $info->{type}) {
3260 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3463 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3261 my $data;
3262 3464
3263 if ($info->{type} & 1) { 3465 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3264 # prepend meta info
3265
3266 my $meta = $enc->encode ({
3267 name => $name,
3268 %{ $info->{meta} || {} },
3269 });
3270
3271 $data = pack "(w/a*)*", $meta, $info->{data};
3272 } else {
3273 $data = $info->{data};
3274 }
3275
3276 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3277 cf::face::set_type $idx, $info->{type}; 3466 cf::face::set_type $idx, $info->{type};
3278 } else { 3467 } else {
3279 $RESOURCE{$name} = $info; 3468 $RESOURCE{$name} = $info; # unused
3280 } 3469 }
3281 3470
3282 cf::cede_to_tick; 3471 cf::cede_to_tick;
3283 } 3472 }
3284 } 3473 }
3285 3474
3286 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3475 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3287 3476
3288 1 3477 1
3289} 3478}
3290
3291cf::global->attach (on_resource_update => sub {
3292 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3293 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3294
3295 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3296 my $sound = $soundconf->{compat}[$_]
3297 or next;
3298
3299 my $face = cf::face::find "sound/$sound->[1]";
3300 cf::sound::set $sound->[0] => $face;
3301 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3302 }
3303
3304 while (my ($k, $v) = each %{$soundconf->{event}}) {
3305 my $face = cf::face::find "sound/$v";
3306 cf::sound::set $k => $face;
3307 }
3308 }
3309});
3310 3479
3311register_exticmd fx_want => sub { 3480register_exticmd fx_want => sub {
3312 my ($ns, $want) = @_; 3481 my ($ns, $want) = @_;
3313 3482
3314 while (my ($k, $v) = each %$want) { 3483 while (my ($k, $v) = each %$want) {
3353sub reload_treasures { 3522sub reload_treasures {
3354 load_resource_file "$DATADIR/treasures" 3523 load_resource_file "$DATADIR/treasures"
3355 or die "unable to load treasurelists\n"; 3524 or die "unable to load treasurelists\n";
3356} 3525}
3357 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
3358sub reload_resources { 3550sub reload_resources {
3359 warn "reloading resource files...\n"; 3551 trace "reloading resource files...\n";
3360 3552
3553 reload_exp_table;
3554 reload_materials;
3361 reload_facedata; 3555 reload_facedata;
3556 reload_sound;
3362 reload_archetypes; 3557 reload_archetypes;
3363 reload_regions; 3558 reload_regions;
3364 reload_treasures; 3559 reload_treasures;
3365 3560
3366 warn "finished reloading resource files\n"; 3561 trace "finished reloading resource files\n";
3367} 3562}
3368 3563
3369sub reload_config { 3564sub reload_config {
3370 open my $fh, "<:utf8", "$CONFDIR/config" 3565 trace "reloading config file...\n";
3371 or return;
3372 3566
3373 local $/; 3567 0 < aio_load "$CONFDIR/config", my $config
3374 *CFG = YAML::Load <$fh>; 3568 or die "$CONFDIR/config: $!";
3375 3569
3570 utf8::decode $config;
3571 *CFG = yaml_load $config;
3572
3376 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3573 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3377 3574
3378 $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};
3379 $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};
3380 3577
3381 if (exists $CFG{mlockall}) { 3578 if (exists $CFG{mlockall}) {
3405 seek $fh, 0, 0; 3602 seek $fh, 0, 0;
3406 print $fh $$; 3603 print $fh $$;
3407} 3604}
3408 3605
3409sub main_loop { 3606sub main_loop {
3410 warn "EV::loop starting\n"; 3607 trace "EV::loop starting\n";
3411 if (1) { 3608 if (1) {
3412 EV::loop; 3609 EV::loop;
3413 } 3610 }
3414 warn "EV::loop returned\n"; 3611 trace "EV::loop returned\n";
3415 goto &main_loop unless $REALLY_UNLOOP; 3612 goto &main_loop unless $REALLY_UNLOOP;
3416} 3613}
3417 3614
3418sub main { 3615sub main {
3419 cf::init_globals; # initialise logging 3616 cf::init_globals; # initialise logging
3420 3617
3421 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3618 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3422 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.";
3423 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3620 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3424 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3621 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3425
3426 cf::init_experience;
3427 cf::init_anim;
3428 cf::init_attackmess;
3429 cf::init_dynamic;
3430 3622
3431 $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
3432 3624
3433 # we must not ever block the main coroutine 3625 # we must not ever block the main coroutine
3434 local $Coro::idle = sub { 3626 local $Coro::idle = sub {
3440 }; 3632 };
3441 3633
3442 evthread_start IO::AIO::poll_fileno; 3634 evthread_start IO::AIO::poll_fileno;
3443 3635
3444 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
3445 reload_resources; 3645 reload_resources;
3446 reload_config; 3646 reload_config;
3447 db_init; 3647 db_init;
3448 3648
3449 cf::load_settings;
3450 cf::load_materials;
3451 cf::init_uuid; 3649 cf::init_uuid;
3452 cf::init_signals; 3650 cf::init_signals;
3453 cf::init_commands;
3454 cf::init_skills; 3651 cf::init_skills;
3455 3652
3456 cf::init_beforeplay; 3653 cf::init_beforeplay;
3457 3654
3458 atomic; 3655 atomic;
3460 load_extensions; 3657 load_extensions;
3461 3658
3462 utime time, time, $RUNTIMEFILE; 3659 utime time, time, $RUNTIMEFILE;
3463 3660
3464 # no (long-running) fork's whatsoever before this point(!) 3661 # no (long-running) fork's whatsoever before this point(!)
3662 use POSIX ();
3465 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};
3466 3664
3467 (pop @POST_INIT)->(0) while @POST_INIT; 3665 (pop @POST_INIT)->(0) while @POST_INIT;
3468 }; 3666 };
3469 3667
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
3470 main_loop; 3676 goto &main_loop;
3471} 3677}
3472 3678
3473############################################################################# 3679#############################################################################
3474# initialisation and cleanup 3680# initialisation and cleanup
3475 3681
3476# install some emergency cleanup handlers 3682# install some emergency cleanup handlers
3477BEGIN { 3683BEGIN {
3478 our %SIGWATCHER = (); 3684 our %SIGWATCHER = ();
3479 for my $signal (qw(INT HUP TERM)) { 3685 for my $signal (qw(INT HUP TERM)) {
3480 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3686 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3481 cf::cleanup "SIG$signal"; 3687 cf::cleanup "SIG$signal";
3482 }; 3688 };
3483 } 3689 }
3484} 3690}
3485 3691
3486sub write_runtime_sync { 3692sub write_runtime_sync {
3693 my $t0 = AE::time;
3694
3487 # first touch the runtime file to show we are still running: 3695 # first touch the runtime file to show we are still running:
3488 # the fsync below can take a very very long time. 3696 # the fsync below can take a very very long time.
3489 3697
3490 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3698 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3491 3699
3492 my $guard = cf::lock_acquire "write_runtime"; 3700 my $guard = cf::lock_acquire "write_runtime";
3493 3701
3494 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3702 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3495 or return; 3703 or return;
3496 3704
3497 my $value = $cf::RUNTIME + 90 + 10; 3705 my $value = $cf::RUNTIME + 90 + 10;
3498 # 10 is the runtime save interval, for a monotonic clock 3706 # 10 is the runtime save interval, for a monotonic clock
3499 # 60 allows for the watchdog to kill the server. 3707 # 60 allows for the watchdog to kill the server.
3512 or return; 3720 or return;
3513 3721
3514 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3722 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3515 and return; 3723 and return;
3516 3724
3517 warn "runtime file written.\n"; 3725 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3518 3726
3519 1 3727 1
3520} 3728}
3521 3729
3522our $uuid_lock; 3730our $uuid_lock;
3534 or return; 3742 or return;
3535 3743
3536 my $value = uuid_seq uuid_cur; 3744 my $value = uuid_seq uuid_cur;
3537 3745
3538 unless ($value) { 3746 unless ($value) {
3539 warn "cowardly refusing to write zero uuid value!\n"; 3747 info "cowardly refusing to write zero uuid value!\n";
3540 return; 3748 return;
3541 } 3749 }
3542 3750
3543 my $value = uuid_str $value + $uuid_skip; 3751 my $value = uuid_str $value + $uuid_skip;
3544 $uuid_skip = 0; 3752 $uuid_skip = 0;
3554 or return; 3762 or return;
3555 3763
3556 aio_rename "$uuid~", $uuid 3764 aio_rename "$uuid~", $uuid
3557 and return; 3765 and return;
3558 3766
3559 warn "uuid file written ($value).\n"; 3767 trace "uuid file written ($value).\n";
3560 3768
3561 1 3769 1
3562 3770
3563} 3771}
3564 3772
3570} 3778}
3571 3779
3572sub emergency_save() { 3780sub emergency_save() {
3573 my $freeze_guard = cf::freeze_mainloop; 3781 my $freeze_guard = cf::freeze_mainloop;
3574 3782
3575 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;
3576 3789
3577 cf::sync_job { 3790 cf::sync_job {
3578 # this is a trade-off: we want to be very quick here, so 3791 cf::write_runtime_sync; # external watchdog should not bark
3579 # save all maps without fsync, and later call a global sync
3580 # (which in turn might be very very slow)
3581 local $USE_FSYNC = 0;
3582 3792
3583 # use a peculiar iteration method to avoid tripping on perl 3793 # use a peculiar iteration method to avoid tripping on perl
3584 # refcount bugs in for. also avoids problems with players 3794 # refcount bugs in for. also avoids problems with players
3585 # and maps saved/destroyed asynchronously. 3795 # and maps saved/destroyed asynchronously.
3586 warn "emergency_perl_save: begin player save\n"; 3796 info "emergency_perl_save: begin player save\n";
3587 for my $login (keys %cf::PLAYER) { 3797 for my $login (keys %cf::PLAYER) {
3588 my $pl = $cf::PLAYER{$login} or next; 3798 my $pl = $cf::PLAYER{$login} or next;
3589 $pl->valid or next; 3799 $pl->valid or next;
3590 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3800 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3591 $pl->save; 3801 $pl->save;
3592 } 3802 }
3593 warn "emergency_perl_save: end player save\n"; 3803 info "emergency_perl_save: end player save\n";
3594 3804
3805 cf::write_runtime_sync; # external watchdog should not bark
3806
3595 warn "emergency_perl_save: begin map save\n"; 3807 info "emergency_perl_save: begin map save\n";
3596 for my $path (keys %cf::MAP) { 3808 for my $path (keys %cf::MAP) {
3597 my $map = $cf::MAP{$path} or next; 3809 my $map = $cf::MAP{$path} or next;
3598 $map->valid or next; 3810 $map->valid or next;
3599 $map->save; 3811 $map->save;
3600 } 3812 }
3601 warn "emergency_perl_save: end map save\n"; 3813 info "emergency_perl_save: end map save\n";
3602 3814
3815 cf::write_runtime_sync; # external watchdog should not bark
3816
3603 warn "emergency_perl_save: begin database checkpoint\n"; 3817 info "emergency_perl_save: begin database checkpoint\n";
3604 BDB::db_env_txn_checkpoint $DB_ENV; 3818 BDB::db_env_txn_checkpoint $DB_ENV;
3605 warn "emergency_perl_save: end database checkpoint\n"; 3819 info "emergency_perl_save: end database checkpoint\n";
3606 3820
3607 warn "emergency_perl_save: begin write uuid\n"; 3821 info "emergency_perl_save: begin write uuid\n";
3608 write_uuid_sync 1; 3822 write_uuid_sync 1;
3609 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
3610 }; 3843 };
3611 3844
3612 warn "emergency_perl_save: starting sync()\n";
3613 IO::AIO::aio_sync sub {
3614 warn "emergency_perl_save: finished sync()\n";
3615 };
3616
3617 warn "emergency_perl_save: leave\n"; 3845 info "emergency_perl_save: leave\n";
3618} 3846}
3619 3847
3620sub post_cleanup { 3848sub post_cleanup {
3621 my ($make_core) = @_; 3849 my ($make_core) = @_;
3622 3850
3851 IO::AIO::flush;
3852
3623 warn Carp::longmess "post_cleanup backtrace" 3853 error Carp::longmess "post_cleanup backtrace"
3624 if $make_core; 3854 if $make_core;
3625 3855
3626 my $fh = pidfile; 3856 my $fh = pidfile;
3627 unlink $PIDFILE if <$fh> == $$; 3857 unlink $PIDFILE if <$fh> == $$;
3628} 3858}
3648 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3878 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3649 for my $name (keys %$leaf_symtab) { 3879 for my $name (keys %$leaf_symtab) {
3650 _gv_clear *{"$pkg$name"}; 3880 _gv_clear *{"$pkg$name"};
3651# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3881# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3652 } 3882 }
3653 warn "cleared package $pkg\n";#d#
3654} 3883}
3655 3884
3656sub do_reload_perl() { 3885sub do_reload_perl() {
3657 # can/must only be called in main 3886 # can/must only be called in main
3658 if ($Coro::current != $Coro::main) { 3887 unless (in_main) {
3659 warn "can only reload from main coroutine"; 3888 error "can only reload from main coroutine";
3660 return; 3889 return;
3661 } 3890 }
3662 3891
3663 return if $RELOAD++; 3892 return if $RELOAD++;
3664 3893
3665 my $t1 = EV::time; 3894 my $t1 = AE::time;
3666 3895
3667 while ($RELOAD) { 3896 while ($RELOAD) {
3897 cf::get_slot 0.1, -1, "reload_perl";
3668 warn "reloading..."; 3898 info "reloading...";
3669 3899
3670 warn "entering sync_job"; 3900 trace "entering sync_job";
3671 3901
3672 cf::sync_job { 3902 cf::sync_job {
3673 cf::write_runtime_sync; # external watchdog should not bark
3674 cf::emergency_save; 3903 #cf::emergency_save;
3675 cf::write_runtime_sync; # external watchdog should not bark
3676 3904
3677 warn "syncing database to disk";
3678 BDB::db_env_txn_checkpoint $DB_ENV;
3679
3680 # if anything goes wrong in here, we should simply crash as we already saved
3681
3682 warn "flushing outstanding aio requests";
3683 while (IO::AIO::nreqs || BDB::nreqs) {
3684 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3685 }
3686
3687 warn "cancelling all extension coros"; 3905 trace "cancelling all extension coros";
3688 $_->cancel for values %EXT_CORO; 3906 $_->cancel for values %EXT_CORO;
3689 %EXT_CORO = (); 3907 %EXT_CORO = ();
3690 3908
3691 warn "removing commands"; 3909 trace "removing commands";
3692 %COMMAND = (); 3910 %COMMAND = ();
3693 3911
3694 warn "removing ext/exti commands"; 3912 trace "removing ext/exti commands";
3695 %EXTCMD = (); 3913 %EXTCMD = ();
3696 %EXTICMD = (); 3914 %EXTICMD = ();
3697 3915
3698 warn "unloading/nuking all extensions"; 3916 trace "unloading/nuking all extensions";
3699 for my $pkg (@EXTS) { 3917 for my $pkg (@EXTS) {
3700 warn "... unloading $pkg"; 3918 trace "... unloading $pkg";
3701 3919
3702 if (my $cb = $pkg->can ("unload")) { 3920 if (my $cb = $pkg->can ("unload")) {
3703 eval { 3921 eval {
3704 $cb->($pkg); 3922 $cb->($pkg);
3705 1 3923 1
3706 } or warn "$pkg unloaded, but with errors: $@"; 3924 } or error "$pkg unloaded, but with errors: $@";
3707 } 3925 }
3708 3926
3709 warn "... clearing $pkg"; 3927 trace "... clearing $pkg";
3710 clear_package $pkg; 3928 clear_package $pkg;
3711 } 3929 }
3712 3930
3713 warn "unloading all perl modules loaded from $LIBDIR"; 3931 trace "unloading all perl modules loaded from $LIBDIR";
3714 while (my ($k, $v) = each %INC) { 3932 while (my ($k, $v) = each %INC) {
3715 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3933 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3716 3934
3717 warn "... unloading $k"; 3935 trace "... unloading $k";
3718 delete $INC{$k}; 3936 delete $INC{$k};
3719 3937
3720 $k =~ s/\.pm$//; 3938 $k =~ s/\.pm$//;
3721 $k =~ s/\//::/g; 3939 $k =~ s/\//::/g;
3722 3940
3725 } 3943 }
3726 3944
3727 clear_package $k; 3945 clear_package $k;
3728 } 3946 }
3729 3947
3730 warn "getting rid of safe::, as good as possible"; 3948 trace "getting rid of safe::, as good as possible";
3731 clear_package "safe::$_" 3949 clear_package "safe::$_"
3732 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);
3733 3951
3734 warn "unloading cf.pm \"a bit\""; 3952 trace "unloading cf.pm \"a bit\"";
3735 delete $INC{"cf.pm"}; 3953 delete $INC{"cf.pm"};
3736 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3954 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3737 3955
3738 # don't, removes xs symbols, too, 3956 # don't, removes xs symbols, too,
3739 # and global variables created in xs 3957 # and global variables created in xs
3740 #clear_package __PACKAGE__; 3958 #clear_package __PACKAGE__;
3741 3959
3742 warn "unload completed, starting to reload now"; 3960 info "unload completed, starting to reload now";
3743 3961
3744 warn "reloading cf.pm"; 3962 trace "reloading cf.pm";
3745 require cf; 3963 require cf;
3746 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3964 cf::_connect_to_perl_1;
3747 3965
3748 warn "loading config and database again"; 3966 trace "loading config and database again";
3749 cf::reload_config; 3967 cf::reload_config;
3750 3968
3751 warn "loading extensions"; 3969 trace "loading extensions";
3752 cf::load_extensions; 3970 cf::load_extensions;
3753 3971
3754 if ($REATTACH_ON_RELOAD) { 3972 if ($REATTACH_ON_RELOAD) {
3755 warn "reattaching attachments to objects/players"; 3973 trace "reattaching attachments to objects/players";
3756 _global_reattach; # objects, sockets 3974 _global_reattach; # objects, sockets
3757 warn "reattaching attachments to maps"; 3975 trace "reattaching attachments to maps";
3758 reattach $_ for values %MAP; 3976 reattach $_ for values %MAP;
3759 warn "reattaching attachments to players"; 3977 trace "reattaching attachments to players";
3760 reattach $_ for values %PLAYER; 3978 reattach $_ for values %PLAYER;
3761 } 3979 }
3762 3980
3763 warn "running post_init jobs"; 3981 trace "running post_init jobs";
3764 (pop @POST_INIT)->(1) while @POST_INIT; 3982 (pop @POST_INIT)->(1) while @POST_INIT;
3765 3983
3766 warn "leaving sync_job"; 3984 trace "leaving sync_job";
3767 3985
3768 1 3986 1
3769 } or do { 3987 } or do {
3770 warn $@; 3988 error $@;
3771 cf::cleanup "error while reloading, exiting."; 3989 cf::cleanup "error while reloading, exiting.";
3772 }; 3990 };
3773 3991
3774 warn "reloaded"; 3992 info "reloaded";
3775 --$RELOAD; 3993 --$RELOAD;
3776 } 3994 }
3777 3995
3778 $t1 = EV::time - $t1; 3996 $t1 = AE::time - $t1;
3779 warn "reload completed in ${t1}s\n"; 3997 info "reload completed in ${t1}s\n";
3780}; 3998};
3781 3999
3782our $RELOAD_WATCHER; # used only during reload 4000our $RELOAD_WATCHER; # used only during reload
3783 4001
3784sub reload_perl() { 4002sub reload_perl() {
3786 # coro crashes during coro_state_free->destroy here. 4004 # coro crashes during coro_state_free->destroy here.
3787 4005
3788 $RELOAD_WATCHER ||= cf::async { 4006 $RELOAD_WATCHER ||= cf::async {
3789 Coro::AIO::aio_wait cache_extensions; 4007 Coro::AIO::aio_wait cache_extensions;
3790 4008
3791 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4009 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3792 do_reload_perl; 4010 do_reload_perl;
3793 undef $RELOAD_WATCHER; 4011 undef $RELOAD_WATCHER;
3794 }; 4012 };
3795 }; 4013 };
3796} 4014}
3805 reload_perl; 4023 reload_perl;
3806 }; 4024 };
3807 } 4025 }
3808}; 4026};
3809 4027
3810unshift @INC, $LIBDIR; 4028#############################################################################
3811 4029
3812my $bug_warning = 0; 4030my $bug_warning = 0;
3813 4031
3814our @WAIT_FOR_TICK; 4032our @WAIT_FOR_TICK;
3815our @WAIT_FOR_TICK_BEGIN; 4033our @WAIT_FOR_TICK_BEGIN;
3816 4034
3817sub wait_for_tick { 4035sub wait_for_tick() {
3818 return if tick_inhibit || $Coro::current == $Coro::main; 4036 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3819 4037
3820 my $signal = new Coro::Signal; 4038 my $signal = new Coro::Signal;
3821 push @WAIT_FOR_TICK, $signal; 4039 push @WAIT_FOR_TICK, $signal;
3822 $signal->wait; 4040 $signal->wait;
3823} 4041}
3824 4042
3825sub wait_for_tick_begin { 4043sub wait_for_tick_begin() {
3826 return if tick_inhibit || $Coro::current == $Coro::main; 4044 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3827 4045
3828 my $signal = new Coro::Signal; 4046 my $signal = new Coro::Signal;
3829 push @WAIT_FOR_TICK_BEGIN, $signal; 4047 push @WAIT_FOR_TICK_BEGIN, $signal;
3830 $signal->wait; 4048 $signal->wait;
3831} 4049}
3837 return; 4055 return;
3838 } 4056 }
3839 4057
3840 cf::server_tick; # one server iteration 4058 cf::server_tick; # one server iteration
3841 4059
4060 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4061
3842 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4062 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3843 $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.;
3844 Coro::async_pool { 4064 Coro::async_pool {
3845 $Coro::current->{desc} = "runtime saver"; 4065 $Coro::current->{desc} = "runtime saver";
3846 write_runtime_sync 4066 write_runtime_sync
3847 or warn "ERROR: unable to write runtime file: $!"; 4067 or error "ERROR: unable to write runtime file: $!";
3848 }; 4068 };
3849 } 4069 }
3850 4070
3851 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4071 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3852 $sig->send; 4072 $sig->send;
3860 4080
3861 if (0) { 4081 if (0) {
3862 if ($NEXT_TICK) { 4082 if ($NEXT_TICK) {
3863 my $jitter = $TICK_START - $NEXT_TICK; 4083 my $jitter = $TICK_START - $NEXT_TICK;
3864 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4084 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3865 warn "jitter $JITTER\n";#d# 4085 debug "jitter $JITTER\n";#d#
3866 } 4086 }
3867 } 4087 }
3868} 4088}
3869 4089
3870{ 4090{
3871 # configure BDB 4091 # configure BDB
3872 4092
3873 BDB::min_parallel 8; 4093 BDB::min_parallel 16;
3874 BDB::max_poll_reqs $TICK * 0.1; 4094 BDB::max_poll_reqs $TICK * 0.1;
3875 $AnyEvent::BDB::WATCHER->priority (1); 4095 $AnyEvent::BDB::WATCHER->priority (1);
3876 4096
3877 unless ($DB_ENV) { 4097 unless ($DB_ENV) {
3878 $DB_ENV = BDB::db_env_create; 4098 $DB_ENV = BDB::db_env_create;
3959 } 4179 }
3960} 4180}
3961 4181
3962# load additional modules 4182# load additional modules
3963require "cf/$_.pm" for @EXTRA_MODULES; 4183require "cf/$_.pm" for @EXTRA_MODULES;
4184cf::_connect_to_perl_2;
3964 4185
3965END { cf::emergency_save } 4186END { cf::emergency_save }
3966 4187
39671 41881
3968 4189

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines