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.480 by root, Thu Oct 8 05:09:43 2009 UTC vs.
Revision 1.550 by root, Fri May 14 22:56:47 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
… …
105our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
106our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
107our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
108our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
109 110
110our %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;
111 118
112our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
113our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
114our $NEXT_TICK; 121our $NEXT_TICK;
115our $USE_FSYNC = 1; # use fsync to write maps - default on 122our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
117our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
118our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
119our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
120our $DB_ENV; 127our $DB_ENV;
121 128
122our @EXTRA_MODULES = qw(pod mapscript); 129our @EXTRA_MODULES = qw(pod match mapscript incloader);
123 130
124our %CFG; 131our %CFG;
125 132
126our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
127our $RUNTIME; 134our $RUNTIME;
… …
161 168
162our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
163 170
164sub cf::map::normalise; 171sub cf::map::normalise;
165 172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
166############################################################################# 177#############################################################################
167 178
168%REFLECT = (); 179%REFLECT = ();
169for (@REFLECT) { 180for (@REFLECT) {
170 my $reflect = JSON::XS::decode_json $_; 181 my $reflect = JSON::XS::decode_json $_;
171 $REFLECT{$reflect->{class}} = $reflect; 182 $REFLECT{$reflect->{class}} = $reflect;
172} 183}
173 184
174# this is decidedly evil 185# this is decidedly evil
175$REFLECT{object}{flags} = [grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"}]; 186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
176 187
177############################################################################# 188#############################################################################
178 189
179=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
180 191
… …
222from wherever your confdir points to. 233from wherever your confdir points to.
223 234
224=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
225 236
226These 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
227returns 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
228per 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.
229 240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
230=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
231 247
232This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
233C<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
234that call. 250that call.
235 251
236=item %cf::REFLECT 252=item %cf::REFLECT
237 253
… …
241 257
242=back 258=back
243 259
244=cut 260=cut
245 261
262sub error(@) { LOG llevError, join "", @_ }
263sub warn (@) { LOG llevWarn , join "", @_ }
264sub info (@) { LOG llevInfo , join "", @_ }
265sub debug(@) { LOG llevDebug, join "", @_ }
266sub trace(@) { LOG llevTrace, join "", @_ }
267
246$Coro::State::WARNHOOK = sub { 268$Coro::State::WARNHOOK = sub {
247 my $msg = join "", @_; 269 my $msg = join "", @_;
248 270
249 $msg .= "\n" 271 $msg .= "\n"
250 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
251 273
252 $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;
253 275
254 LOG llevError, $msg; 276 LOG llevWarn, $msg;
255}; 277};
256 278
257$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
258 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
259 281
260 warn Carp::longmess $_[0]; 282 error Carp::longmess $_[0];
261 283
262 if ($Coro::current == $Coro::main) {#d# 284 if (in_main) {#d#
263 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
264 return;#d# 286 return;#d#
265 }#d# 287 }#d#
266 288
267 # kill coroutine otherwise 289 # kill coroutine otherwise
268 Coro::terminate 290 Coro::terminate
… …
288)) { 310)) {
289 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
290} 312}
291 313
292$EV::DIED = sub { 314$EV::DIED = sub {
293 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
294}; 316};
295 317
296############################################################################# 318#############################################################################
297 319
298=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
… …
335our $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
336 358
337sub encode_json($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
338sub decode_json($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
339 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
340=item cf::post_init { BLOCK } 374=item cf::post_init { BLOCK }
341 375
342Execute the given codeblock, I<after> all extensions have been (re-)loaded, 376Execute the given codeblock, I<after> all extensions have been (re-)loaded,
343but I<before> the server starts ticking again. 377but I<before> the server starts ticking again.
344 378
345The cdoeblock will have a single boolean argument to indicate whether this 379The codeblock will have a single boolean argument to indicate whether this
346is a reload or not. 380is a reload or not.
347 381
348=cut 382=cut
349 383
350sub post_init(&) { 384sub post_init(&) {
351 push @POST_INIT, shift; 385 push @POST_INIT, shift;
386}
387
388sub _post_init {
389 trace "running post_init jobs";
390
391 # run them in parallel...
392
393 my @join;
394
395 while () {
396 push @join, map &Coro::async ($_, 0), @POST_INIT;
397 @POST_INIT = ();
398
399 @join or last;
400
401 (pop @join)->join;
402 }
352} 403}
353 404
354=item cf::lock_wait $string 405=item cf::lock_wait $string
355 406
356Wait until the given lock is available. See cf::lock_acquire. 407Wait until the given lock is available. See cf::lock_acquire.
… …
395} 446}
396 447
397=item cf::periodic $interval, $cb 448=item cf::periodic $interval, $cb
398 449
399Like EV::periodic, but randomly selects a starting point so that the actions 450Like EV::periodic, but randomly selects a starting point so that the actions
400get spread over timer. 451get spread over time.
401 452
402=cut 453=cut
403 454
404sub periodic($$) { 455sub periodic($$) {
405 my ($interval, $cb) = @_; 456 my ($interval, $cb) = @_;
… …
422 473
423=cut 474=cut
424 475
425our @SLOT_QUEUE; 476our @SLOT_QUEUE;
426our $SLOT_QUEUE; 477our $SLOT_QUEUE;
478our $SLOT_DECAY = 0.9;
427 479
428$SLOT_QUEUE->cancel if $SLOT_QUEUE; 480$SLOT_QUEUE->cancel if $SLOT_QUEUE;
429$SLOT_QUEUE = Coro::async { 481$SLOT_QUEUE = Coro::async {
430 $Coro::current->desc ("timeslot manager"); 482 $Coro::current->desc ("timeslot manager");
431 483
432 my $signal = new Coro::Signal; 484 my $signal = new Coro::Signal;
485 my $busy;
433 486
434 while () { 487 while () {
435 next_job: 488 next_job:
489
436 my $avail = cf::till_tick; 490 my $avail = cf::till_tick;
437 if ($avail > 0.01) { 491
438 for (0 .. $#SLOT_QUEUE) { 492 for (0 .. $#SLOT_QUEUE) {
439 if ($SLOT_QUEUE[$_][0] < $avail) { 493 if ($SLOT_QUEUE[$_][0] <= $avail) {
494 $busy = 0;
440 my $job = splice @SLOT_QUEUE, $_, 1, (); 495 my $job = splice @SLOT_QUEUE, $_, 1, ();
441 $job->[2]->send; 496 $job->[2]->send;
442 Coro::cede; 497 Coro::cede;
443 goto next_job; 498 goto next_job;
444 } 499 } else {
500 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
445 } 501 }
446 } 502 }
447 503
448 if (@SLOT_QUEUE) { 504 if (@SLOT_QUEUE) {
449 # we do not use wait_for_tick() as it returns immediately when tick is inactive 505 # we do not use wait_for_tick() as it returns immediately when tick is inactive
450 push @cf::WAIT_FOR_TICK, $signal; 506 push @cf::WAIT_FOR_TICK, $signal;
451 $signal->wait; 507 $signal->wait;
452 } else { 508 } else {
509 $busy = 0;
453 Coro::schedule; 510 Coro::schedule;
454 } 511 }
455 } 512 }
456}; 513};
457 514
458sub get_slot($;$$) { 515sub get_slot($;$$) {
459 return if tick_inhibit || $Coro::current == $Coro::main; 516 return if tick_inhibit || $Coro::current == $Coro::main;
460 517
461 my ($time, $pri, $name) = @_; 518 my ($time, $pri, $name) = @_;
462 519
463 $time = $TICK * .6 if $time > $TICK * .6; 520 $time = clamp $time, 0.01, $TICK * .6;
521
464 my $sig = new Coro::Signal; 522 my $sig = new Coro::Signal;
465 523
466 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 524 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
467 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 525 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
468 $SLOT_QUEUE->ready; 526 $SLOT_QUEUE->ready;
… …
494=cut 552=cut
495 553
496sub sync_job(&) { 554sub sync_job(&) {
497 my ($job) = @_; 555 my ($job) = @_;
498 556
499 if ($Coro::current == $Coro::main) { 557 if (in_main) {
500 my $time = EV::time; 558 my $time = AE::time;
501 559
502 # this is the main coro, too bad, we have to block 560 # this is the main coro, too bad, we have to block
503 # till the operation succeeds, freezing the server :/ 561 # till the operation succeeds, freezing the server :/
504 562
505 LOG llevError, Carp::longmess "sync job";#d# 563 #LOG llevError, Carp::longmess "sync job";#d#
506 564
507 my $freeze_guard = freeze_mainloop; 565 my $freeze_guard = freeze_mainloop;
508 566
509 my $busy = 1; 567 my $busy = 1;
510 my @res; 568 my @res;
511 569
512 (async { 570 (async {
513 $Coro::current->desc ("sync job coro"); 571 $Coro::current->desc ("sync job coro");
514 @res = eval { $job->() }; 572 @res = eval { $job->() };
515 warn $@ if $@; 573 error $@ if $@;
516 undef $busy; 574 undef $busy;
517 })->prio (Coro::PRIO_MAX); 575 })->prio (Coro::PRIO_MAX);
518 576
519 while ($busy) { 577 while ($busy) {
520 if (Coro::nready) { 578 if (Coro::nready) {
… …
522 } else { 580 } else {
523 EV::loop EV::LOOP_ONESHOT; 581 EV::loop EV::LOOP_ONESHOT;
524 } 582 }
525 } 583 }
526 584
527 my $time = EV::time - $time; 585 my $time = AE::time - $time;
528 586
529 $TICK_START += $time; # do not account sync jobs to server load 587 $TICK_START += $time; # do not account sync jobs to server load
530 588
531 wantarray ? @res : $res[0] 589 wantarray ? @res : $res[0]
532 } else { 590 } else {
… …
554 $EXT_CORO{$coro+0} = $coro; 612 $EXT_CORO{$coro+0} = $coro;
555 613
556 $coro 614 $coro
557} 615}
558 616
559=item fork_call { }, $args 617=item fork_call { }, @args
560 618
561Executes the given code block with the given arguments in a seperate 619Executes the given code block with the given arguments in a seperate
562process, returning the results. Everything must be serialisable with 620process, returning the results. Everything must be serialisable with
563Coro::Storable. May, of course, block. Note that the executed sub may 621Coro::Storable. May, of course, block. Note that the executed sub may
564never block itself or use any form of event handling. 622never block itself or use any form of event handling.
565 623
566=cut 624=cut
567 625
626sub post_fork {
627 reset_signals;
628}
629
568sub fork_call(&@) { 630sub fork_call(&@) {
569 my ($cb, @args) = @_; 631 my ($cb, @args) = @_;
570 632
571 # we seemingly have to make a local copy of the whole thing, 633 # we seemingly have to make a local copy of the whole thing,
572 # otherwise perl prematurely frees the stuff :/ 634 # otherwise perl prematurely frees the stuff :/
573 # TODO: investigate and fix (likely this will be rather laborious) 635 # TODO: investigate and fix (likely this will be rather laborious)
574 636
575 my @res = Coro::Util::fork_eval { 637 my @res = Coro::Util::fork_eval {
576 reset_signals; 638 cf::post_fork;
577 &$cb 639 &$cb
578 }, @args; 640 } @args;
579 641
580 wantarray ? @res : $res[-1] 642 wantarray ? @res : $res[-1]
643}
644
645sub objinfo {
646 (
647 "counter value" => cf::object::object_count,
648 "objects created" => cf::object::create_count,
649 "objects destroyed" => cf::object::destroy_count,
650 "freelist size" => cf::object::free_count,
651 "allocated objects" => cf::object::objects_size,
652 "active objects" => cf::object::actives_size,
653 )
581} 654}
582 655
583=item $coin = coin_from_name $name 656=item $coin = coin_from_name $name
584 657
585=cut 658=cut
… …
622within each server. 695within each server.
623 696
624=cut 697=cut
625 698
626sub db_table($) { 699sub db_table($) {
700 cf::error "db_get called from main context"
701 if $Coro::current == $Coro::main;
702
627 my ($name) = @_; 703 my ($name) = @_;
628 my $db = BDB::db_create $DB_ENV; 704 my $db = BDB::db_create $DB_ENV;
629 705
630 eval { 706 eval {
631 $db->set_flags (BDB::CHKSUM); 707 $db->set_flags (BDB::CHKSUM);
… …
641} 717}
642 718
643our $DB; 719our $DB;
644 720
645sub db_init { 721sub db_init {
646 cf::sync_job {
647 $DB ||= db_table "db"; 722 $DB ||= db_table "db";
648 };
649} 723}
650 724
651sub db_get($$) { 725sub db_get($$) {
652 my $key = "$_[0]/$_[1]"; 726 my $key = "$_[0]/$_[1]";
653 727
654 cf::sync_job { 728 cf::error "db_get called from main context"
729 if $Coro::current == $Coro::main;
730
655 BDB::db_get $DB, undef, $key, my $data; 731 BDB::db_get $DB, undef, $key, my $data;
656 732
657 $! ? () 733 $! ? ()
658 : $data 734 : $data
659 }
660} 735}
661 736
662sub db_put($$$) { 737sub db_put($$$) {
663 BDB::dbreq_pri 4; 738 BDB::dbreq_pri 4;
664 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 739 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
720 795
721 my $t1 = Time::HiRes::time; 796 my $t1 = Time::HiRes::time;
722 my $data = $process->(\@data); 797 my $data = $process->(\@data);
723 my $t2 = Time::HiRes::time; 798 my $t2 = Time::HiRes::time;
724 799
725 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 800 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
726 801
727 db_put cache => "$id/data", $data; 802 db_put cache => "$id/data", $data;
728 db_put cache => "$id/md5" , $md5; 803 db_put cache => "$id/md5" , $md5;
729 db_put cache => "$id/meta", $meta; 804 db_put cache => "$id/meta", $meta;
730 805
… …
740 815
741=cut 816=cut
742 817
743sub datalog($@) { 818sub datalog($@) {
744 my ($type, %kv) = @_; 819 my ($type, %kv) = @_;
745 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 820 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
746} 821}
747 822
748=back 823=back
749 824
750=cut 825=cut
… …
945 1020
946 } elsif (exists $cb_id{$type}) { 1021 } elsif (exists $cb_id{$type}) {
947 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1022 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
948 1023
949 } elsif (ref $type) { 1024 } elsif (ref $type) {
950 warn "attaching objects not supported, ignoring.\n"; 1025 error "attaching objects not supported, ignoring.\n";
951 1026
952 } else { 1027 } else {
953 shift @arg; 1028 shift @arg;
954 warn "attach argument '$type' not supported, ignoring.\n"; 1029 error "attach argument '$type' not supported, ignoring.\n";
955 } 1030 }
956 } 1031 }
957} 1032}
958 1033
959sub _object_attach { 1034sub _object_attach {
… …
969 _attach $registry, $klass, @attach; 1044 _attach $registry, $klass, @attach;
970 } 1045 }
971 1046
972 $obj->{$name} = \%arg; 1047 $obj->{$name} = \%arg;
973 } else { 1048 } else {
974 warn "object uses attachment '$name' which is not available, postponing.\n"; 1049 info "object uses attachment '$name' which is not available, postponing.\n";
975 } 1050 }
976 1051
977 $obj->{_attachment}{$name} = undef; 1052 $obj->{_attachment}{$name} = undef;
978} 1053}
979 1054
… …
1038 1113
1039 for (@$callbacks) { 1114 for (@$callbacks) {
1040 eval { &{$_->[1]} }; 1115 eval { &{$_->[1]} };
1041 1116
1042 if ($@) { 1117 if ($@) {
1043 warn "$@";
1044 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1118 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1045 override; 1119 override;
1046 } 1120 }
1047 1121
1048 return 1 if $override; 1122 return 1 if $override;
1049 } 1123 }
… …
1128 for (@$attach) { 1202 for (@$attach) {
1129 my ($klass, @attach) = @$_; 1203 my ($klass, @attach) = @$_;
1130 _attach $registry, $klass, @attach; 1204 _attach $registry, $klass, @attach;
1131 } 1205 }
1132 } else { 1206 } else {
1133 warn "object uses attachment '$name' that is not available, postponing.\n"; 1207 info "object uses attachment '$name' that is not available, postponing.\n";
1134 } 1208 }
1135 } 1209 }
1136} 1210}
1137 1211
1138cf::attachable->attach ( 1212cf::attachable->attach (
… …
1165 my ($filename, $rdata, $objs) = @_; 1239 my ($filename, $rdata, $objs) = @_;
1166 1240
1167 sync_job { 1241 sync_job {
1168 if (length $$rdata) { 1242 if (length $$rdata) {
1169 utf8::decode (my $decname = $filename); 1243 utf8::decode (my $decname = $filename);
1170 warn sprintf "saving %s (%d,%d)\n", 1244 trace sprintf "saving %s (%d,%d)\n",
1171 $decname, length $$rdata, scalar @$objs; 1245 $decname, length $$rdata, scalar @$objs
1246 if $VERBOSE_IO;
1172 1247
1173 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1248 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1174 aio_chmod $fh, SAVE_MODE; 1249 aio_chmod $fh, SAVE_MODE;
1175 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1250 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1176 if ($cf::USE_FSYNC) { 1251 if ($cf::USE_FSYNC) {
… …
1198 aio_rename "$filename~", $filename; 1273 aio_rename "$filename~", $filename;
1199 1274
1200 $filename =~ s%/[^/]+$%%; 1275 $filename =~ s%/[^/]+$%%;
1201 aio_pathsync $filename if $cf::USE_FSYNC; 1276 aio_pathsync $filename if $cf::USE_FSYNC;
1202 } else { 1277 } else {
1203 warn "unable to save objects: $filename~: $!\n"; 1278 error "unable to save objects: $filename~: $!\n";
1204 } 1279 }
1205 } else { 1280 } else {
1206 aio_unlink $filename; 1281 aio_unlink $filename;
1207 aio_unlink "$filename.pst"; 1282 aio_unlink "$filename.pst";
1208 } 1283 }
… …
1232 my $st = eval { Coro::Storable::thaw $av }; 1307 my $st = eval { Coro::Storable::thaw $av };
1233 $av = $st->{objs}; 1308 $av = $st->{objs};
1234 } 1309 }
1235 1310
1236 utf8::decode (my $decname = $filename); 1311 utf8::decode (my $decname = $filename);
1237 warn sprintf "loading %s (%d,%d)\n", 1312 trace sprintf "loading %s (%d,%d)\n",
1238 $decname, length $data, scalar @{$av || []}; 1313 $decname, length $data, scalar @{$av || []}
1314 if $VERBOSE_IO;
1239 1315
1240 ($data, $av) 1316 ($data, $av)
1241} 1317}
1242 1318
1243=head2 COMMAND CALLBACKS 1319=head2 COMMAND CALLBACKS
… …
1302} 1378}
1303 1379
1304use File::Glob (); 1380use File::Glob ();
1305 1381
1306cf::player->attach ( 1382cf::player->attach (
1307 on_command => sub { 1383 on_unknown_command => sub {
1308 my ($pl, $name, $params) = @_; 1384 my ($pl, $name, $params) = @_;
1309 1385
1310 my $cb = $COMMAND{$name} 1386 my $cb = $COMMAND{$name}
1311 or return; 1387 or return;
1312 1388
… …
1335 1411
1336 $pl->ext_reply ($reply, @reply) 1412 $pl->ext_reply ($reply, @reply)
1337 if $reply; 1413 if $reply;
1338 1414
1339 } else { 1415 } else {
1340 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1416 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1341 } 1417 }
1342 1418
1343 cf::override; 1419 cf::override;
1344 }, 1420 },
1345); 1421);
… …
1356 1432
1357 $grp 1433 $grp
1358} 1434}
1359 1435
1360sub load_extensions { 1436sub load_extensions {
1437 info "loading extensions...";
1438
1361 cf::sync_job { 1439 cf::sync_job {
1362 my %todo; 1440 my %todo;
1363 1441
1364 for my $path (<$LIBDIR/*.ext>) { 1442 for my $path (<$LIBDIR/*.ext>) {
1365 next unless -r $path; 1443 next unless -r $path;
… …
1383 1461
1384 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1462 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1385 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1463 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1386 1464
1387 $ext{source} = 1465 $ext{source} =
1388 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1466 "package $pkg; use common::sense;\n"
1389 . "#line 1 \"$path\"\n{\n" 1467 . "#line 1 \"$path\"\n{\n"
1390 . $source 1468 . $source
1391 . "\n};\n1"; 1469 . "\n};\n1";
1392 1470
1393 $todo{$base} = \%ext; 1471 $todo{$base} = \%ext;
1394 } 1472 }
1395 1473
1474 my $pass = 0;
1396 my %done; 1475 my %done;
1397 while (%todo) { 1476 while (%todo) {
1398 my $progress; 1477 my $progress;
1399 1478
1479 ++$pass;
1480
1481 ext:
1400 while (my ($k, $v) = each %todo) { 1482 while (my ($k, $v) = each %todo) {
1401 for (split /,\s*/, $v->{meta}{depends}) { 1483 for (split /,\s*/, $v->{meta}{depends}) {
1402 goto skip 1484 next ext
1403 unless exists $done{$_}; 1485 unless exists $done{$_};
1404 } 1486 }
1405 1487
1406 warn "... loading '$k' into '$v->{pkg}'\n"; 1488 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1407 1489
1408 unless (eval $v->{source}) { 1490 my $active = eval $v->{source};
1491
1492 if (length $@) {
1409 my $msg = $@ ? "$v->{path}: $@\n" 1493 error "$v->{path}: $@\n";
1410 : "$v->{base}: extension inactive.\n";
1411 1494
1412 if (exists $v->{meta}{mandatory}) {
1413 warn $msg;
1414 cf::cleanup "mandatory extension failed to load, exiting."; 1495 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1415 } 1496 if exists $v->{meta}{mandatory};
1416 1497
1417 warn $msg; 1498 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1499 delete $todo{$k};
1500 } else {
1501 $done{$k} = delete $todo{$k};
1502 push @EXTS, $v->{pkg};
1503 $progress = 1;
1504
1505 info "$v->{base}: extension inactive.\n"
1506 unless $active;
1418 } 1507 }
1419
1420 $done{$k} = delete $todo{$k};
1421 push @EXTS, $v->{pkg};
1422 $progress = 1;
1423 } 1508 }
1424 1509
1425 skip: 1510 unless ($progress) {
1426 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1511 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1427 unless $progress; 1512
1513 while (my ($k, $v) = each %todo) {
1514 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1515 if exists $v->{meta}{mandatory};
1516 }
1517 }
1428 } 1518 }
1429 }; 1519 };
1430} 1520}
1431 1521
1432############################################################################# 1522#############################################################################
… …
1516 $cf::PLAYER{$login} = $pl 1606 $cf::PLAYER{$login} = $pl
1517 } 1607 }
1518 } 1608 }
1519} 1609}
1520 1610
1611cf::player->attach (
1612 on_load => sub {
1613 my ($pl, $path) = @_;
1614
1615 # restore slots saved in save, below
1616 my $slots = delete $pl->{_slots};
1617
1618 $pl->ob->current_weapon ($slots->[0]);
1619 $pl->combat_ob ($slots->[1]);
1620 $pl->ranged_ob ($slots->[2]);
1621 },
1622);
1623
1521sub save($) { 1624sub save($) {
1522 my ($pl) = @_; 1625 my ($pl) = @_;
1523 1626
1524 return if $pl->{deny_save}; 1627 return if $pl->{deny_save};
1525 1628
… …
1530 1633
1531 aio_mkdir playerdir $pl, 0770; 1634 aio_mkdir playerdir $pl, 0770;
1532 $pl->{last_save} = $cf::RUNTIME; 1635 $pl->{last_save} = $cf::RUNTIME;
1533 1636
1534 cf::get_slot 0.01; 1637 cf::get_slot 0.01;
1638
1639 # save slots, to be restored later
1640 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1535 1641
1536 $pl->save_pl ($path); 1642 $pl->save_pl ($path);
1537 cf::cede_to_tick; 1643 cf::cede_to_tick;
1538} 1644}
1539 1645
… …
1573 my $name = $pl->ob->name; 1679 my $name = $pl->ob->name;
1574 1680
1575 $pl->{deny_save} = 1; 1681 $pl->{deny_save} = 1;
1576 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1682 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1577 1683
1578 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1684 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1579 $pl->deactivate; 1685 $pl->deactivate;
1686
1580 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1687 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1581 $pl->ob->check_score;
1582 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1688 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1689 ext::highscore::check ($pl->ob);
1690
1583 $pl->ns->destroy if $pl->ns; 1691 $pl->ns->destroy if $pl->ns;
1584 1692
1585 my $path = playerdir $pl; 1693 my $path = playerdir $pl;
1586 my $temp = "$path~$cf::RUNTIME~deleting~"; 1694 my $temp = "$path~$cf::RUNTIME~deleting~";
1587 aio_rename $path, $temp; 1695 aio_rename $path, $temp;
… …
1641 \@logins 1749 \@logins
1642} 1750}
1643 1751
1644=item $player->maps 1752=item $player->maps
1645 1753
1754=item cf::player::maps $login
1755
1646Returns an arrayref of map paths that are private for this 1756Returns an arrayref of map paths that are private for this
1647player. May block. 1757player. May block.
1648 1758
1649=cut 1759=cut
1650 1760
… …
1712=cut 1822=cut
1713 1823
1714sub find_by_path($) { 1824sub find_by_path($) {
1715 my ($path) = @_; 1825 my ($path) = @_;
1716 1826
1827 $path =~ s/^~[^\/]*//; # skip ~login
1828
1717 my ($match, $specificity); 1829 my ($match, $specificity);
1718 1830
1719 for my $region (list) { 1831 for my $region (list) {
1720 if ($region->{match} && $path =~ $region->{match}) { 1832 if ($region->{match} && $path =~ $region->{match}) {
1721 ($match, $specificity) = ($region, $region->specificity) 1833 ($match, $specificity) = ($region, $region->specificity)
… …
1752 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1864 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1753 1865
1754 # mit "rum" bekleckern, nicht 1866 # mit "rum" bekleckern, nicht
1755 $self->_create_random_map ( 1867 $self->_create_random_map (
1756 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1868 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1757 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1869 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1758 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1870 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1759 $rmp->{exit_on_final_map}, 1871 $rmp->{exit_on_final_map},
1760 $rmp->{xsize}, $rmp->{ysize}, 1872 $rmp->{xsize}, $rmp->{ysize},
1761 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1873 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1762 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1874 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1777 1889
1778sub register { 1890sub register {
1779 my (undef, $regex, $prio) = @_; 1891 my (undef, $regex, $prio) = @_;
1780 my $pkg = caller; 1892 my $pkg = caller;
1781 1893
1782 no strict;
1783 push @{"$pkg\::ISA"}, __PACKAGE__; 1894 push @{"$pkg\::ISA"}, __PACKAGE__;
1784 1895
1785 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1896 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1786} 1897}
1787 1898
1788# also paths starting with '/' 1899# also paths starting with '/'
1789$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1900$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1790 1901
1791sub thawer_merge { 1902sub thawer_merge {
1792 my ($self, $merge) = @_; 1903 my ($self, $merge) = @_;
1793 1904
1794 # we have to keep some variables in memory intact 1905 # we have to keep some variables in memory intact
… …
1799} 1910}
1800 1911
1801sub normalise { 1912sub normalise {
1802 my ($path, $base) = @_; 1913 my ($path, $base) = @_;
1803 1914
1804 $path = "$path"; # make sure its a string 1915 $path = "$path"; # make sure it's a string
1805 1916
1806 $path =~ s/\.map$//; 1917 $path =~ s/\.map$//;
1807 1918
1808 # map plan: 1919 # map plan:
1809 # 1920 #
… …
1848 $self->init; # pass $1 etc. 1959 $self->init; # pass $1 etc.
1849 return $self; 1960 return $self;
1850 } 1961 }
1851 } 1962 }
1852 1963
1853 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1964 Carp::cluck "unable to resolve path '$path' (base '$base')";
1854 () 1965 ()
1855} 1966}
1856 1967
1857sub init { 1968sub init {
1858 my ($self) = @_; 1969 my ($self) = @_;
… …
1980} 2091}
1981 2092
1982sub find; 2093sub find;
1983sub find { 2094sub find {
1984 my ($path, $origin) = @_; 2095 my ($path, $origin) = @_;
2096
2097 cf::cede_to_tick;
1985 2098
1986 $path = normalise $path, $origin && $origin->path; 2099 $path = normalise $path, $origin && $origin->path;
1987 2100
1988 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2101 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1989 my $guard2 = cf::lock_acquire "map_find:$path"; 2102 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2008 2121
2009 $cf::MAP{$path} = $map 2122 $cf::MAP{$path} = $map
2010 } 2123 }
2011} 2124}
2012 2125
2013sub pre_load { } 2126sub pre_load { }
2014sub post_load { } 2127#sub post_load { } # XS
2015 2128
2016sub load { 2129sub load {
2017 my ($self) = @_; 2130 my ($self) = @_;
2018 2131
2019 local $self->{deny_reset} = 1; # loading can take a long time 2132 local $self->{deny_reset} = 1; # loading can take a long time
… …
2076 } 2189 }
2077 2190
2078 $self->post_load; 2191 $self->post_load;
2079} 2192}
2080 2193
2194# customize the map for a given player, i.e.
2195# return the _real_ map. used by e.g. per-player
2196# maps to change the path to ~playername/mappath
2081sub customise_for { 2197sub customise_for {
2082 my ($self, $ob) = @_; 2198 my ($self, $ob) = @_;
2083 2199
2084 return find "~" . $ob->name . "/" . $self->{path} 2200 return find "~" . $ob->name . "/" . $self->{path}
2085 if $self->per_player; 2201 if $self->per_player;
… …
2101 or next; 2217 or next;
2102 $neigh = find $neigh, $map 2218 $neigh = find $neigh, $map
2103 or next; 2219 or next;
2104 $neigh->load; 2220 $neigh->load;
2105 2221
2222 # now find the diagonal neighbours
2106 push @neigh, 2223 push @neigh,
2107 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2224 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2108 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2225 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2109 } 2226 }
2110 2227
… …
2117} 2234}
2118 2235
2119sub find_sync { 2236sub find_sync {
2120 my ($path, $origin) = @_; 2237 my ($path, $origin) = @_;
2121 2238
2122 cf::sync_job { find $path, $origin } 2239 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2240 if $Coro::current == $Coro::main;
2241
2242 find $path, $origin
2123} 2243}
2124 2244
2125sub do_load_sync { 2245sub do_load_sync {
2126 my ($map) = @_; 2246 my ($map) = @_;
2127 2247
2128 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2248 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2129 if $Coro::current == $Coro::main; 2249 if $Coro::current == $Coro::main;
2130 2250
2131 cf::sync_job { $map->load }; 2251 $map->load;
2132} 2252}
2133 2253
2134our %MAP_PREFETCH; 2254our %MAP_PREFETCH;
2135our $MAP_PREFETCHER = undef; 2255our $MAP_PREFETCHER = undef;
2136 2256
… …
2162 $MAP_PREFETCHER->prio (6); 2282 $MAP_PREFETCHER->prio (6);
2163 2283
2164 () 2284 ()
2165} 2285}
2166 2286
2287# common code, used by both ->save and ->swapout
2167sub save { 2288sub _save {
2168 my ($self) = @_; 2289 my ($self) = @_;
2169
2170 my $lock = cf::lock_acquire "map_data:$self->{path}";
2171 2290
2172 $self->{last_save} = $cf::RUNTIME; 2291 $self->{last_save} = $cf::RUNTIME;
2173 2292
2174 return unless $self->dirty; 2293 return unless $self->dirty;
2175 2294
… …
2195 } else { 2314 } else {
2196 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2315 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2197 } 2316 }
2198} 2317}
2199 2318
2319sub save {
2320 my ($self) = @_;
2321
2322 my $lock = cf::lock_acquire "map_data:$self->{path}";
2323
2324 $self->_save;
2325}
2326
2200sub swap_out { 2327sub swap_out {
2201 my ($self) = @_; 2328 my ($self) = @_;
2202 2329
2203 # save first because save cedes
2204 $self->save;
2205
2206 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2330 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207 2331
2208 return if $self->players;
2209 return if $self->in_memory != cf::MAP_ACTIVE; 2332 return if $self->in_memory != cf::MAP_ACTIVE;
2210 return if $self->{deny_save}; 2333 return if $self->{deny_save};
2334 return if $self->players;
2211 2335
2336 # first deactivate the map and "unlink" it from the core
2337 $self->deactivate;
2338 $_->clear_links_to ($self) for values %cf::MAP;
2212 $self->in_memory (cf::MAP_SWAPPED); 2339 $self->in_memory (cf::MAP_SWAPPED);
2340
2341 # then atomically save
2342 $self->_save;
2343
2344 # then free the map
2345 $self->clear;
2346}
2347
2348sub reset_at {
2349 my ($self) = @_;
2350
2351 # TODO: safety, remove and allow resettable per-player maps
2352 return 1e99 if $self->{deny_reset};
2353
2354 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2355 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2356
2357 $time + $to
2358}
2359
2360sub should_reset {
2361 my ($self) = @_;
2362
2363 $self->reset_at <= $cf::RUNTIME
2364}
2365
2366sub reset {
2367 my ($self) = @_;
2368
2369 my $lock = cf::lock_acquire "map_data:$self->{path}";
2370
2371 return if $self->players;
2372
2373 cf::trace "resetting map ", $self->path, "\n";
2374
2375 $self->in_memory (cf::MAP_SWAPPED);
2376
2377 # need to save uniques path
2378 unless ($self->{deny_save}) {
2379 my $uniq = $self->uniq_path; utf8::encode $uniq;
2380
2381 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2382 if $uniq;
2383 }
2384
2385 delete $cf::MAP{$self->path};
2213 2386
2214 $self->deactivate; 2387 $self->deactivate;
2215 $_->clear_links_to ($self) for values %cf::MAP; 2388 $_->clear_links_to ($self) for values %cf::MAP;
2216 $self->clear; 2389 $self->clear;
2217}
2218
2219sub reset_at {
2220 my ($self) = @_;
2221
2222 # TODO: safety, remove and allow resettable per-player maps
2223 return 1e99 if $self->{deny_reset};
2224
2225 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2226 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2227
2228 $time + $to
2229}
2230
2231sub should_reset {
2232 my ($self) = @_;
2233
2234 $self->reset_at <= $cf::RUNTIME
2235}
2236
2237sub reset {
2238 my ($self) = @_;
2239
2240 my $lock = cf::lock_acquire "map_data:$self->{path}";
2241
2242 return if $self->players;
2243
2244 warn "resetting map ", $self->path, "\n";
2245
2246 $self->in_memory (cf::MAP_SWAPPED);
2247
2248 # need to save uniques path
2249 unless ($self->{deny_save}) {
2250 my $uniq = $self->uniq_path; utf8::encode $uniq;
2251
2252 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2253 if $uniq;
2254 }
2255
2256 delete $cf::MAP{$self->path};
2257
2258 $self->deactivate;
2259 $_->clear_links_to ($self) for values %cf::MAP;
2260 $self->clear;
2261 2390
2262 $self->unlink_save; 2391 $self->unlink_save;
2263 $self->destroy; 2392 $self->destroy;
2264} 2393}
2265 2394
… …
2273 2402
2274 delete $cf::MAP{$self->path}; 2403 delete $cf::MAP{$self->path};
2275 2404
2276 $self->unlink_save; 2405 $self->unlink_save;
2277 2406
2278 bless $self, "cf::map"; 2407 bless $self, "cf::map::wrap";
2279 delete $self->{deny_reset}; 2408 delete $self->{deny_reset};
2280 $self->{deny_save} = 1; 2409 $self->{deny_save} = 1;
2281 $self->reset_timeout (1); 2410 $self->reset_timeout (1);
2282 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2411 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2283 2412
… …
2340 : normalise $_ 2469 : normalise $_
2341 } @{ aio_readdir $UNIQUEDIR or [] } 2470 } @{ aio_readdir $UNIQUEDIR or [] }
2342 ] 2471 ]
2343} 2472}
2344 2473
2474=item cf::map::static_maps
2475
2476Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2477file in the shared directory excluding F</styles> and F</editor>). May
2478block.
2479
2480=cut
2481
2482sub static_maps() {
2483 my @dirs = "";
2484 my @maps;
2485
2486 while (@dirs) {
2487 my $dir = shift @dirs;
2488
2489 next if $dir eq "/styles" || $dir eq "/editor";
2490
2491 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2492 or return;
2493
2494 for (@$files) {
2495 s/\.map$// or next;
2496 utf8::decode $_;
2497 push @maps, "$dir/$_";
2498 }
2499
2500 push @dirs, map "$dir/$_", @$dirs;
2501 }
2502
2503 \@maps
2504}
2505
2345=back 2506=back
2346 2507
2347=head3 cf::object 2508=head3 cf::object
2348 2509
2349=cut 2510=cut
… …
2481 2642
2482Freezes the player and moves him/her to a special map (C<{link}>). 2643Freezes the player and moves him/her to a special map (C<{link}>).
2483 2644
2484The player should be reasonably safe there for short amounts of time (e.g. 2645The player should be reasonably safe there for short amounts of time (e.g.
2485for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2646for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2486though, as the palyer cannot control the character while it is on the link 2647though, as the player cannot control the character while it is on the link
2487map. 2648map.
2488 2649
2489Will never block. 2650Will never block.
2490 2651
2491=item $player_object->leave_link ($map, $x, $y) 2652=item $player_object->leave_link ($map, $x, $y)
… …
2512sub cf::object::player::enter_link { 2673sub cf::object::player::enter_link {
2513 my ($self) = @_; 2674 my ($self) = @_;
2514 2675
2515 $self->deactivate_recursive; 2676 $self->deactivate_recursive;
2516 2677
2678 ++$self->{_link_recursion};
2679
2517 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2680 return if UNIVERSAL::isa $self->map, "ext::map_link";
2518 2681
2519 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2682 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2520 if $self->map && $self->map->{path} ne "{link}"; 2683 if $self->map && $self->map->{path} ne "{link}";
2521 2684
2522 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2685 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2523} 2686}
2524 2687
2525sub cf::object::player::leave_link { 2688sub cf::object::player::leave_link {
2526 my ($self, $map, $x, $y) = @_; 2689 my ($self, $map, $x, $y) = @_;
2527 2690
… …
2544 ($x, $y) = (-1, -1) 2707 ($x, $y) = (-1, -1)
2545 unless (defined $x) && (defined $y); 2708 unless (defined $x) && (defined $y);
2546 2709
2547 # use -1 or undef as default coordinates, not 0, 0 2710 # use -1 or undef as default coordinates, not 0, 0
2548 ($x, $y) = ($map->enter_x, $map->enter_y) 2711 ($x, $y) = ($map->enter_x, $map->enter_y)
2549 if $x <=0 && $y <= 0; 2712 if $x <= 0 && $y <= 0;
2550 2713
2551 $map->load; 2714 $map->load;
2552 $map->load_neighbours; 2715 $map->load_neighbours;
2553 2716
2554 return unless $self->contr->active; 2717 return unless $self->contr->active;
2555 2718
2556 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2719 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2557 $self->enter_map ($map, $x, $y); 2720 if ($self->enter_map ($map, $x, $y)) {
2558 2721 # entering was successful
2722 delete $self->{_link_recursion};
2559 # only activate afterwards, to support waiting in hooks 2723 # only activate afterwards, to support waiting in hooks
2560 $self->activate_recursive; 2724 $self->activate_recursive;
2561} 2725 }
2562 2726
2727}
2728
2563=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2729=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2564 2730
2565Moves the player to the given map-path and coordinates by first freezing 2731Moves the player to the given map-path and coordinates by first freezing
2566her, loading and preparing them map, calling the provided $check callback 2732her, loading and preparing them map, calling the provided $check callback
2567that has to return the map if sucecssful, and then unfreezes the player on 2733that has to return the map if sucecssful, and then unfreezes the player on
2568the new (success) or old (failed) map position. In either case, $done will 2734the new (success) or old (failed) map position. In either case, $done will
… …
2575 2741
2576our $GOTOGEN; 2742our $GOTOGEN;
2577 2743
2578sub cf::object::player::goto { 2744sub cf::object::player::goto {
2579 my ($self, $path, $x, $y, $check, $done) = @_; 2745 my ($self, $path, $x, $y, $check, $done) = @_;
2746
2747 if ($self->{_link_recursion} >= $MAX_LINKS) {
2748 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2749 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2750 ($path, $x, $y) = @$EMERGENCY_POSITION;
2751 }
2580 2752
2581 # do generation counting so two concurrent goto's will be executed in-order 2753 # do generation counting so two concurrent goto's will be executed in-order
2582 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2754 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2583 2755
2584 $self->enter_link; 2756 $self->enter_link;
… …
2608 my $map = eval { 2780 my $map = eval {
2609 my $map = defined $path ? cf::map::find $path : undef; 2781 my $map = defined $path ? cf::map::find $path : undef;
2610 2782
2611 if ($map) { 2783 if ($map) {
2612 $map = $map->customise_for ($self); 2784 $map = $map->customise_for ($self);
2613 $map = $check->($map) if $check && $map; 2785 $map = $check->($map, $x, $y, $self) if $check && $map;
2614 } else { 2786 } else {
2615 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2787 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2616 } 2788 }
2617 2789
2618 $map 2790 $map
… …
2626 if ($gen == $self->{_goto_generation}) { 2798 if ($gen == $self->{_goto_generation}) {
2627 delete $self->{_goto_generation}; 2799 delete $self->{_goto_generation};
2628 $self->leave_link ($map, $x, $y); 2800 $self->leave_link ($map, $x, $y);
2629 } 2801 }
2630 2802
2631 $done->() if $done; 2803 $done->($self) if $done;
2632 })->prio (1); 2804 })->prio (1);
2633} 2805}
2634 2806
2635=item $player_object->enter_exit ($exit_object) 2807=item $player_object->enter_exit ($exit_object)
2636 2808
… …
2729 $self->message ("Something went wrong deep within the deliantra server. " 2901 $self->message ("Something went wrong deep within the deliantra server. "
2730 . "I'll try to bring you back to the map you were before. " 2902 . "I'll try to bring you back to the map you were before. "
2731 . "Please report this to the dungeon master!", 2903 . "Please report this to the dungeon master!",
2732 cf::NDI_UNIQUE | cf::NDI_RED); 2904 cf::NDI_UNIQUE | cf::NDI_RED);
2733 2905
2734 warn "ERROR in enter_exit: $@"; 2906 error "ERROR in enter_exit: $@";
2735 $self->leave_link; 2907 $self->leave_link;
2736 } 2908 }
2737 })->prio (1); 2909 })->prio (1);
2738} 2910}
2739 2911
… …
2751sub cf::client::send_drawinfo { 2923sub cf::client::send_drawinfo {
2752 my ($self, $text, $flags) = @_; 2924 my ($self, $text, $flags) = @_;
2753 2925
2754 utf8::encode $text; 2926 utf8::encode $text;
2755 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2927 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2928}
2929
2930=item $client->send_big_packet ($pkt)
2931
2932Like C<send_packet>, but tries to compress large packets, and fragments
2933them as required.
2934
2935=cut
2936
2937our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2938
2939sub cf::client::send_big_packet {
2940 my ($self, $pkt) = @_;
2941
2942 # try lzf for large packets
2943 $pkt = "lzf " . Compress::LZF::compress $pkt
2944 if 1024 <= length $pkt and $self->{can_lzf};
2945
2946 # split very large packets
2947 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2948 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2949 $pkt = "frag";
2950 }
2951
2952 $self->send_packet ($pkt);
2756} 2953}
2757 2954
2758=item $client->send_msg ($channel, $msg, $color, [extra...]) 2955=item $client->send_msg ($channel, $msg, $color, [extra...])
2759 2956
2760Send a drawinfo or msg packet to the client, formatting the msg for the 2957Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2764 2961
2765=cut 2962=cut
2766 2963
2767# non-persistent channels (usually the info channel) 2964# non-persistent channels (usually the info channel)
2768our %CHANNEL = ( 2965our %CHANNEL = (
2966 "c/motd" => {
2967 id => "infobox",
2968 title => "MOTD",
2969 reply => undef,
2970 tooltip => "The message of the day",
2971 },
2769 "c/identify" => { 2972 "c/identify" => {
2770 id => "infobox", 2973 id => "infobox",
2771 title => "Identify", 2974 title => "Identify",
2772 reply => undef, 2975 reply => undef,
2773 tooltip => "Items recently identified", 2976 tooltip => "Items recently identified",
… …
2775 "c/examine" => { 2978 "c/examine" => {
2776 id => "infobox", 2979 id => "infobox",
2777 title => "Examine", 2980 title => "Examine",
2778 reply => undef, 2981 reply => undef,
2779 tooltip => "Signs and other items you examined", 2982 tooltip => "Signs and other items you examined",
2983 },
2984 "c/shopinfo" => {
2985 id => "infobox",
2986 title => "Shop Info",
2987 reply => undef,
2988 tooltip => "What your bargaining skill tells you about the shop",
2780 }, 2989 },
2781 "c/book" => { 2990 "c/book" => {
2782 id => "infobox", 2991 id => "infobox",
2783 title => "Book", 2992 title => "Book",
2784 reply => undef, 2993 reply => undef,
… …
2900 my $pkt = "msg " 3109 my $pkt = "msg "
2901 . $self->{json_coder}->encode ( 3110 . $self->{json_coder}->encode (
2902 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3111 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2903 ); 3112 );
2904 3113
2905 # try lzf for large packets
2906 $pkt = "lzf " . Compress::LZF::compress $pkt
2907 if 1024 <= length $pkt and $self->{can_lzf};
2908
2909 # split very large packets
2910 if (8192 < length $pkt and $self->{can_lzf}) {
2911 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2912 $pkt = "frag";
2913 }
2914
2915 $self->send_packet ($pkt); 3114 $self->send_big_packet ($pkt);
2916} 3115}
2917 3116
2918=item $client->ext_msg ($type, @msg) 3117=item $client->ext_msg ($type, @msg)
2919 3118
2920Sends an ext event to the client. 3119Sends an ext event to the client.
… …
2923 3122
2924sub cf::client::ext_msg($$@) { 3123sub cf::client::ext_msg($$@) {
2925 my ($self, $type, @msg) = @_; 3124 my ($self, $type, @msg) = @_;
2926 3125
2927 if ($self->extcmd == 2) { 3126 if ($self->extcmd == 2) {
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3127 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2929 } elsif ($self->extcmd == 1) { # TODO: remove 3128 } elsif ($self->extcmd == 1) { # TODO: remove
2930 push @msg, msgtype => "event_$type"; 3129 push @msg, msgtype => "event_$type";
2931 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3130 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2932 } 3131 }
2933} 3132}
2934 3133
2935=item $client->ext_reply ($msgid, @msg) 3134=item $client->ext_reply ($msgid, @msg)
2936 3135
… …
2940 3139
2941sub cf::client::ext_reply($$@) { 3140sub cf::client::ext_reply($$@) {
2942 my ($self, $id, @msg) = @_; 3141 my ($self, $id, @msg) = @_;
2943 3142
2944 if ($self->extcmd == 2) { 3143 if ($self->extcmd == 2) {
2945 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3144 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2946 } elsif ($self->extcmd == 1) { 3145 } elsif ($self->extcmd == 1) {
2947 #TODO: version 1, remove 3146 #TODO: version 1, remove
2948 unshift @msg, msgtype => "reply", msgid => $id; 3147 unshift @msg, msgtype => "reply", msgid => $id;
2949 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3148 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2950 } 3149 }
2951} 3150}
2952 3151
2953=item $success = $client->query ($flags, "text", \&cb) 3152=item $success = $client->query ($flags, "text", \&cb)
2954 3153
… …
3025 3224
3026 $ns->ext_reply ($reply, @reply) 3225 $ns->ext_reply ($reply, @reply)
3027 if $reply; 3226 if $reply;
3028 3227
3029 } else { 3228 } else {
3030 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3229 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3031 } 3230 }
3032 3231
3033 cf::override; 3232 cf::override;
3034 }, 3233 },
3035); 3234);
… …
3055 3254
3056 $coro 3255 $coro
3057} 3256}
3058 3257
3059cf::client->attach ( 3258cf::client->attach (
3060 on_destroy => sub { 3259 on_client_destroy => sub {
3061 my ($ns) = @_; 3260 my ($ns) = @_;
3062 3261
3063 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3262 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3064 }, 3263 },
3065); 3264);
… …
3081our $safe_hole = new Safe::Hole; 3280our $safe_hole = new Safe::Hole;
3082 3281
3083$SIG{FPE} = 'IGNORE'; 3282$SIG{FPE} = 'IGNORE';
3084 3283
3085$safe->permit_only (Opcode::opset qw( 3284$safe->permit_only (Opcode::opset qw(
3086 :base_core :base_mem :base_orig :base_math 3285 :base_core :base_mem :base_orig :base_math :base_loop
3087 grepstart grepwhile mapstart mapwhile 3286 grepstart grepwhile mapstart mapwhile
3088 sort time 3287 sort time
3089)); 3288));
3090 3289
3091# here we export the classes and methods available to script code 3290# here we export the classes and methods available to script code
… …
3116 decrease split destroy change_exp value msg lore send_msg)], 3315 decrease split destroy change_exp value msg lore send_msg)],
3117 ["cf::object::player" => qw(player)], 3316 ["cf::object::player" => qw(player)],
3118 ["cf::player" => qw(peaceful send_msg)], 3317 ["cf::player" => qw(peaceful send_msg)],
3119 ["cf::map" => qw(trigger)], 3318 ["cf::map" => qw(trigger)],
3120) { 3319) {
3121 no strict 'refs';
3122 my ($pkg, @funs) = @$_; 3320 my ($pkg, @funs) = @$_;
3123 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3321 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3124 for @funs; 3322 for @funs;
3125} 3323}
3126 3324
… …
3143 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3341 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3144 $qcode =~ s/\n/\\n/g; 3342 $qcode =~ s/\n/\\n/g;
3145 3343
3146 %vars = (_dummy => 0) unless %vars; 3344 %vars = (_dummy => 0) unless %vars;
3147 3345
3346 my @res;
3148 local $_; 3347 local $_;
3149 local @safe::cf::_safe_eval_args = values %vars;
3150 3348
3151 my $eval = 3349 my $eval =
3152 "do {\n" 3350 "do {\n"
3153 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3351 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3154 . "#line 0 \"{$qcode}\"\n" 3352 . "#line 0 \"{$qcode}\"\n"
3155 . $code 3353 . $code
3156 . "\n}" 3354 . "\n}"
3157 ; 3355 ;
3158 3356
3357 if ($CFG{safe_eval}) {
3159 sub_generation_inc; 3358 sub_generation_inc;
3359 local @safe::cf::_safe_eval_args = values %vars;
3160 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3360 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3161 sub_generation_inc; 3361 sub_generation_inc;
3362 } else {
3363 local @cf::_safe_eval_args = values %vars;
3364 @res = wantarray ? eval eval : scalar eval $eval;
3365 }
3162 3366
3163 if ($@) { 3367 if ($@) {
3164 warn "$@"; 3368 warn "$@",
3165 warn "while executing safe code '$code'\n"; 3369 "while executing safe code '$code'\n",
3166 warn "with arguments " . (join " ", %vars) . "\n"; 3370 "with arguments " . (join " ", %vars) . "\n";
3167 } 3371 }
3168 3372
3169 wantarray ? @res : $res[0] 3373 wantarray ? @res : $res[0]
3170} 3374}
3171 3375
… …
3185=cut 3389=cut
3186 3390
3187sub register_script_function { 3391sub register_script_function {
3188 my ($fun, $cb) = @_; 3392 my ($fun, $cb) = @_;
3189 3393
3190 no strict 'refs'; 3394 $fun = "safe::$fun" if $CFG{safe_eval};
3191 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3395 *$fun = $safe_hole->wrap ($cb);
3192} 3396}
3193 3397
3194=back 3398=back
3195 3399
3196=cut 3400=cut
… …
3205 # for this (global event?) 3409 # for this (global event?)
3206 %ext::player_env::MUSIC_FACE_CACHE = (); 3410 %ext::player_env::MUSIC_FACE_CACHE = ();
3207 3411
3208 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3412 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3209 3413
3210 warn "loading facedata from $path\n"; 3414 trace "loading facedata from $path\n";
3211 3415
3212 my $facedata;
3213 0 < aio_load $path, $facedata 3416 0 < aio_load $path, my $facedata
3214 or die "$path: $!"; 3417 or die "$path: $!";
3215 3418
3216 $facedata = Coro::Storable::thaw $facedata; 3419 $facedata = Coro::Storable::thaw $facedata;
3217 3420
3218 $facedata->{version} == 2 3421 $facedata->{version} == 2
3219 or cf::cleanup "$path: version mismatch, cannot proceed."; 3422 or cf::cleanup "$path: version mismatch, cannot proceed.";
3220 3423
3221 # patch in the exptable 3424 # patch in the exptable
3425 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3222 $facedata->{resource}{"res/exp_table"} = { 3426 $facedata->{resource}{"res/exp_table"} = {
3223 type => FT_RSRC, 3427 type => FT_RSRC,
3224 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3428 data => $exp_table,
3429 hash => (Digest::MD5::md5 $exp_table),
3225 }; 3430 };
3226 cf::cede_to_tick; 3431 cf::cede_to_tick;
3227 3432
3228 { 3433 {
3229 my $faces = $facedata->{faceinfo}; 3434 my $faces = $facedata->{faceinfo};
… …
3231 while (my ($face, $info) = each %$faces) { 3436 while (my ($face, $info) = each %$faces) {
3232 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3437 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3233 3438
3234 cf::face::set_visibility $idx, $info->{visibility}; 3439 cf::face::set_visibility $idx, $info->{visibility};
3235 cf::face::set_magicmap $idx, $info->{magicmap}; 3440 cf::face::set_magicmap $idx, $info->{magicmap};
3236 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3441 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3237 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3442 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3238 3443
3239 cf::cede_to_tick; 3444 cf::cede_to_tick;
3240 } 3445 }
3241 3446
3242 while (my ($face, $info) = each %$faces) { 3447 while (my ($face, $info) = each %$faces) {
… …
3247 3452
3248 if (my $smooth = cf::face::find $info->{smooth}) { 3453 if (my $smooth = cf::face::find $info->{smooth}) {
3249 cf::face::set_smooth $idx, $smooth; 3454 cf::face::set_smooth $idx, $smooth;
3250 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3455 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3251 } else { 3456 } else {
3252 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3457 error "smooth face '$info->{smooth}' not found for face '$face'";
3253 } 3458 }
3254 3459
3255 cf::cede_to_tick; 3460 cf::cede_to_tick;
3256 } 3461 }
3257 } 3462 }
… …
3266 3471
3267 cf::anim::invalidate_all; # d'oh 3472 cf::anim::invalidate_all; # d'oh
3268 } 3473 }
3269 3474
3270 { 3475 {
3271 # TODO: for gcfclient pleasure, we should give resources
3272 # that gcfclient doesn't grok a >10000 face index.
3273 my $res = $facedata->{resource}; 3476 my $res = $facedata->{resource};
3274 3477
3275 while (my ($name, $info) = each %$res) { 3478 while (my ($name, $info) = each %$res) {
3276 if (defined $info->{type}) { 3479 if (defined $info->{type}) {
3277 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3480 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3278 my $data;
3279 3481
3280 if ($info->{type} & 1) { 3482 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3281 # prepend meta info
3282
3283 my $meta = $enc->encode ({
3284 name => $name,
3285 %{ $info->{meta} || {} },
3286 });
3287
3288 $data = pack "(w/a*)*", $meta, $info->{data};
3289 } else {
3290 $data = $info->{data};
3291 }
3292
3293 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3294 cf::face::set_type $idx, $info->{type}; 3483 cf::face::set_type $idx, $info->{type};
3295 } else { 3484 } else {
3296 $RESOURCE{$name} = $info; 3485 $RESOURCE{$name} = $info; # unused
3297 } 3486 }
3298 3487
3299 cf::cede_to_tick; 3488 cf::cede_to_tick;
3300 } 3489 }
3301 } 3490 }
3302 3491
3303 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3492 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3304 3493
3305 1 3494 1
3306} 3495}
3307
3308cf::global->attach (on_resource_update => sub {
3309 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3310 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3311
3312 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3313 my $sound = $soundconf->{compat}[$_]
3314 or next;
3315
3316 my $face = cf::face::find "sound/$sound->[1]";
3317 cf::sound::set $sound->[0] => $face;
3318 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3319 }
3320
3321 while (my ($k, $v) = each %{$soundconf->{event}}) {
3322 my $face = cf::face::find "sound/$v";
3323 cf::sound::set $k => $face;
3324 }
3325 }
3326});
3327 3496
3328register_exticmd fx_want => sub { 3497register_exticmd fx_want => sub {
3329 my ($ns, $want) = @_; 3498 my ($ns, $want) = @_;
3330 3499
3331 while (my ($k, $v) = each %$want) { 3500 while (my ($k, $v) = each %$want) {
… …
3370sub reload_treasures { 3539sub reload_treasures {
3371 load_resource_file "$DATADIR/treasures" 3540 load_resource_file "$DATADIR/treasures"
3372 or die "unable to load treasurelists\n"; 3541 or die "unable to load treasurelists\n";
3373} 3542}
3374 3543
3544sub reload_sound {
3545 trace "loading sound config from $DATADIR/sound\n";
3546
3547 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3548 or die "$DATADIR/sound $!";
3549
3550 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3551
3552 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3553 my $sound = $soundconf->{compat}[$_]
3554 or next;
3555
3556 my $face = cf::face::find "sound/$sound->[1]";
3557 cf::sound::set $sound->[0] => $face;
3558 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3559 }
3560
3561 while (my ($k, $v) = each %{$soundconf->{event}}) {
3562 my $face = cf::face::find "sound/$v";
3563 cf::sound::set $k => $face;
3564 }
3565}
3566
3375sub reload_resources { 3567sub reload_resources {
3376 warn "reloading resource files...\n"; 3568 trace "reloading resource files...\n";
3377 3569
3570 reload_exp_table;
3571 reload_materials;
3378 reload_facedata; 3572 reload_facedata;
3573 reload_sound;
3379 reload_archetypes; 3574 reload_archetypes;
3380 reload_regions; 3575 reload_regions;
3381 reload_treasures; 3576 reload_treasures;
3382 3577
3383 warn "finished reloading resource files\n"; 3578 trace "finished reloading resource files\n";
3384} 3579}
3385 3580
3386sub reload_config { 3581sub reload_config {
3387 open my $fh, "<:utf8", "$CONFDIR/config" 3582 trace "reloading config file...\n";
3388 or return;
3389 3583
3390 local $/; 3584 0 < aio_load "$CONFDIR/config", my $config
3391 *CFG = YAML::Load <$fh>; 3585 or die "$CONFDIR/config: $!";
3392 3586
3587 utf8::decode $config;
3588 *CFG = yaml_load $config;
3589
3393 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3590 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3394 3591
3395 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3592 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3396 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3593 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3397 3594
3398 if (exists $CFG{mlockall}) { 3595 if (exists $CFG{mlockall}) {
… …
3422 seek $fh, 0, 0; 3619 seek $fh, 0, 0;
3423 print $fh $$; 3620 print $fh $$;
3424} 3621}
3425 3622
3426sub main_loop { 3623sub main_loop {
3427 warn "EV::loop starting\n"; 3624 trace "EV::loop starting\n";
3428 if (1) { 3625 if (1) {
3429 EV::loop; 3626 EV::loop;
3430 } 3627 }
3431 warn "EV::loop returned\n"; 3628 trace "EV::loop returned\n";
3432 goto &main_loop unless $REALLY_UNLOOP; 3629 goto &main_loop unless $REALLY_UNLOOP;
3433} 3630}
3434 3631
3435sub main { 3632sub main {
3436 cf::init_globals; # initialise logging 3633 cf::init_globals; # initialise logging
3437 3634
3438 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3635 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3439 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3636 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3440 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3637 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3441 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3638 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3442
3443 cf::init_experience;
3444 cf::init_anim;
3445 cf::init_attackmess;
3446 cf::init_dynamic;
3447 3639
3448 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3640 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3449 3641
3450 # we must not ever block the main coroutine 3642 # we must not ever block the main coroutine
3451 local $Coro::idle = sub { 3643 local $Coro::idle = sub {
… …
3457 }; 3649 };
3458 3650
3459 evthread_start IO::AIO::poll_fileno; 3651 evthread_start IO::AIO::poll_fileno;
3460 3652
3461 cf::sync_job { 3653 cf::sync_job {
3654 cf::incloader::init ();
3655
3656 cf::init_anim;
3657 cf::init_attackmess;
3658 cf::init_dynamic;
3659
3660 cf::load_settings;
3661
3462 reload_resources; 3662 reload_resources;
3463 reload_config; 3663 reload_config;
3464 db_init; 3664 db_init;
3465 3665
3466 cf::load_settings;
3467 cf::load_materials;
3468 cf::init_uuid; 3666 cf::init_uuid;
3469 cf::init_signals; 3667 cf::init_signals;
3470 cf::init_commands;
3471 cf::init_skills; 3668 cf::init_skills;
3472 3669
3473 cf::init_beforeplay; 3670 cf::init_beforeplay;
3474 3671
3475 atomic; 3672 atomic;
… …
3480 3677
3481 # no (long-running) fork's whatsoever before this point(!) 3678 # no (long-running) fork's whatsoever before this point(!)
3482 use POSIX (); 3679 use POSIX ();
3483 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3680 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3484 3681
3485 (pop @POST_INIT)->(0) while @POST_INIT; 3682 cf::_post_init 0;
3486 }; 3683 };
3487 3684
3685 cf::object::thawer::errors_are_fatal 0;
3686 info "parse errors in files are no longer fatal from this point on.\n";
3687
3688 my $free_main; $free_main = EV::idle sub {
3689 undef $free_main;
3690 undef &main; # free gobs of memory :)
3691 };
3692
3488 main_loop; 3693 goto &main_loop;
3489} 3694}
3490 3695
3491############################################################################# 3696#############################################################################
3492# initialisation and cleanup 3697# initialisation and cleanup
3493 3698
3494# install some emergency cleanup handlers 3699# install some emergency cleanup handlers
3495BEGIN { 3700BEGIN {
3496 our %SIGWATCHER = (); 3701 our %SIGWATCHER = ();
3497 for my $signal (qw(INT HUP TERM)) { 3702 for my $signal (qw(INT HUP TERM)) {
3498 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3703 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3499 cf::cleanup "SIG$signal"; 3704 cf::cleanup "SIG$signal";
3500 }; 3705 };
3501 } 3706 }
3502} 3707}
3503 3708
3504sub write_runtime_sync { 3709sub write_runtime_sync {
3710 my $t0 = AE::time;
3711
3505 # first touch the runtime file to show we are still running: 3712 # first touch the runtime file to show we are still running:
3506 # the fsync below can take a very very long time. 3713 # the fsync below can take a very very long time.
3507 3714
3508 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3715 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3509 3716
3510 my $guard = cf::lock_acquire "write_runtime"; 3717 my $guard = cf::lock_acquire "write_runtime";
3511 3718
3512 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3719 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3513 or return; 3720 or return;
3514 3721
3515 my $value = $cf::RUNTIME + 90 + 10; 3722 my $value = $cf::RUNTIME + 90 + 10;
3516 # 10 is the runtime save interval, for a monotonic clock 3723 # 10 is the runtime save interval, for a monotonic clock
3517 # 60 allows for the watchdog to kill the server. 3724 # 60 allows for the watchdog to kill the server.
… …
3530 or return; 3737 or return;
3531 3738
3532 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3739 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3533 and return; 3740 and return;
3534 3741
3535 warn "runtime file written.\n"; 3742 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3536 3743
3537 1 3744 1
3538} 3745}
3539 3746
3540our $uuid_lock; 3747our $uuid_lock;
… …
3552 or return; 3759 or return;
3553 3760
3554 my $value = uuid_seq uuid_cur; 3761 my $value = uuid_seq uuid_cur;
3555 3762
3556 unless ($value) { 3763 unless ($value) {
3557 warn "cowardly refusing to write zero uuid value!\n"; 3764 info "cowardly refusing to write zero uuid value!\n";
3558 return; 3765 return;
3559 } 3766 }
3560 3767
3561 my $value = uuid_str $value + $uuid_skip; 3768 my $value = uuid_str $value + $uuid_skip;
3562 $uuid_skip = 0; 3769 $uuid_skip = 0;
… …
3572 or return; 3779 or return;
3573 3780
3574 aio_rename "$uuid~", $uuid 3781 aio_rename "$uuid~", $uuid
3575 and return; 3782 and return;
3576 3783
3577 warn "uuid file written ($value).\n"; 3784 trace "uuid file written ($value).\n";
3578 3785
3579 1 3786 1
3580 3787
3581} 3788}
3582 3789
… …
3588} 3795}
3589 3796
3590sub emergency_save() { 3797sub emergency_save() {
3591 my $freeze_guard = cf::freeze_mainloop; 3798 my $freeze_guard = cf::freeze_mainloop;
3592 3799
3593 warn "emergency_perl_save: enter\n"; 3800 info "emergency_perl_save: enter\n";
3801
3802 # this is a trade-off: we want to be very quick here, so
3803 # save all maps without fsync, and later call a global sync
3804 # (which in turn might be very very slow)
3805 local $USE_FSYNC = 0;
3594 3806
3595 cf::sync_job { 3807 cf::sync_job {
3596 # this is a trade-off: we want to be very quick here, so 3808 cf::write_runtime_sync; # external watchdog should not bark
3597 # save all maps without fsync, and later call a global sync
3598 # (which in turn might be very very slow)
3599 local $USE_FSYNC = 0;
3600 3809
3601 # use a peculiar iteration method to avoid tripping on perl 3810 # use a peculiar iteration method to avoid tripping on perl
3602 # refcount bugs in for. also avoids problems with players 3811 # refcount bugs in for. also avoids problems with players
3603 # and maps saved/destroyed asynchronously. 3812 # and maps saved/destroyed asynchronously.
3604 warn "emergency_perl_save: begin player save\n"; 3813 info "emergency_perl_save: begin player save\n";
3605 for my $login (keys %cf::PLAYER) { 3814 for my $login (keys %cf::PLAYER) {
3606 my $pl = $cf::PLAYER{$login} or next; 3815 my $pl = $cf::PLAYER{$login} or next;
3607 $pl->valid or next; 3816 $pl->valid or next;
3608 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3817 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3609 $pl->save; 3818 $pl->save;
3610 } 3819 }
3611 warn "emergency_perl_save: end player save\n"; 3820 info "emergency_perl_save: end player save\n";
3612 3821
3822 cf::write_runtime_sync; # external watchdog should not bark
3823
3613 warn "emergency_perl_save: begin map save\n"; 3824 info "emergency_perl_save: begin map save\n";
3614 for my $path (keys %cf::MAP) { 3825 for my $path (keys %cf::MAP) {
3615 my $map = $cf::MAP{$path} or next; 3826 my $map = $cf::MAP{$path} or next;
3616 $map->valid or next; 3827 $map->valid or next;
3617 $map->save; 3828 $map->save;
3618 } 3829 }
3619 warn "emergency_perl_save: end map save\n"; 3830 info "emergency_perl_save: end map save\n";
3620 3831
3832 cf::write_runtime_sync; # external watchdog should not bark
3833
3621 warn "emergency_perl_save: begin database checkpoint\n"; 3834 info "emergency_perl_save: begin database checkpoint\n";
3622 BDB::db_env_txn_checkpoint $DB_ENV; 3835 BDB::db_env_txn_checkpoint $DB_ENV;
3623 warn "emergency_perl_save: end database checkpoint\n"; 3836 info "emergency_perl_save: end database checkpoint\n";
3624 3837
3625 warn "emergency_perl_save: begin write uuid\n"; 3838 info "emergency_perl_save: begin write uuid\n";
3626 write_uuid_sync 1; 3839 write_uuid_sync 1;
3627 warn "emergency_perl_save: end write uuid\n"; 3840 info "emergency_perl_save: end write uuid\n";
3841
3842 cf::write_runtime_sync; # external watchdog should not bark
3843
3844 trace "emergency_perl_save: syncing database to disk";
3845 BDB::db_env_txn_checkpoint $DB_ENV;
3846
3847 info "emergency_perl_save: starting sync\n";
3848 IO::AIO::aio_sync sub {
3849 info "emergency_perl_save: finished sync\n";
3850 };
3851
3852 cf::write_runtime_sync; # external watchdog should not bark
3853
3854 trace "emergency_perl_save: flushing outstanding aio requests";
3855 while (IO::AIO::nreqs || BDB::nreqs) {
3856 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3857 }
3858
3859 cf::write_runtime_sync; # external watchdog should not bark
3628 }; 3860 };
3629 3861
3630 warn "emergency_perl_save: starting sync()\n";
3631 IO::AIO::aio_sync sub {
3632 warn "emergency_perl_save: finished sync()\n";
3633 };
3634
3635 warn "emergency_perl_save: leave\n"; 3862 info "emergency_perl_save: leave\n";
3636} 3863}
3637 3864
3638sub post_cleanup { 3865sub post_cleanup {
3639 my ($make_core) = @_; 3866 my ($make_core) = @_;
3640 3867
3868 IO::AIO::flush;
3869
3641 warn Carp::longmess "post_cleanup backtrace" 3870 error Carp::longmess "post_cleanup backtrace"
3642 if $make_core; 3871 if $make_core;
3643 3872
3644 my $fh = pidfile; 3873 my $fh = pidfile;
3645 unlink $PIDFILE if <$fh> == $$; 3874 unlink $PIDFILE if <$fh> == $$;
3646} 3875}
… …
3666 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3895 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3667 for my $name (keys %$leaf_symtab) { 3896 for my $name (keys %$leaf_symtab) {
3668 _gv_clear *{"$pkg$name"}; 3897 _gv_clear *{"$pkg$name"};
3669# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3898# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3670 } 3899 }
3671 warn "cleared package $pkg\n";#d#
3672} 3900}
3673 3901
3674sub do_reload_perl() { 3902sub do_reload_perl() {
3675 # can/must only be called in main 3903 # can/must only be called in main
3676 if ($Coro::current != $Coro::main) { 3904 unless (in_main) {
3677 warn "can only reload from main coroutine"; 3905 error "can only reload from main coroutine";
3678 return; 3906 return;
3679 } 3907 }
3680 3908
3681 return if $RELOAD++; 3909 return if $RELOAD++;
3682 3910
3683 my $t1 = EV::time; 3911 my $t1 = AE::time;
3684 3912
3685 while ($RELOAD) { 3913 while ($RELOAD) {
3686 warn "reloading..."; 3914 cf::get_slot 0.1, -1, "reload_perl";
3915 info "perl_reload: reloading...";
3687 3916
3688 warn "entering sync_job"; 3917 trace "perl_reload: entering sync_job";
3689 3918
3690 cf::sync_job { 3919 cf::sync_job {
3691 cf::write_runtime_sync; # external watchdog should not bark
3692 cf::emergency_save; 3920 #cf::emergency_save;
3693 cf::write_runtime_sync; # external watchdog should not bark
3694 3921
3695 warn "syncing database to disk";
3696 BDB::db_env_txn_checkpoint $DB_ENV;
3697
3698 # if anything goes wrong in here, we should simply crash as we already saved
3699
3700 warn "flushing outstanding aio requests";
3701 while (IO::AIO::nreqs || BDB::nreqs) {
3702 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3703 }
3704
3705 warn "cancelling all extension coros"; 3922 trace "perl_reload: cancelling all extension coros";
3706 $_->cancel for values %EXT_CORO; 3923 $_->cancel for values %EXT_CORO;
3707 %EXT_CORO = (); 3924 %EXT_CORO = ();
3708 3925
3709 warn "removing commands"; 3926 trace "perl_reload: removing commands";
3710 %COMMAND = (); 3927 %COMMAND = ();
3711 3928
3712 warn "removing ext/exti commands"; 3929 trace "perl_reload: removing ext/exti commands";
3713 %EXTCMD = (); 3930 %EXTCMD = ();
3714 %EXTICMD = (); 3931 %EXTICMD = ();
3715 3932
3716 warn "unloading/nuking all extensions"; 3933 trace "perl_reload: unloading/nuking all extensions";
3717 for my $pkg (@EXTS) { 3934 for my $pkg (@EXTS) {
3718 warn "... unloading $pkg"; 3935 trace "... unloading $pkg";
3719 3936
3720 if (my $cb = $pkg->can ("unload")) { 3937 if (my $cb = $pkg->can ("unload")) {
3721 eval { 3938 eval {
3722 $cb->($pkg); 3939 $cb->($pkg);
3723 1 3940 1
3724 } or warn "$pkg unloaded, but with errors: $@"; 3941 } or error "$pkg unloaded, but with errors: $@";
3725 } 3942 }
3726 3943
3727 warn "... clearing $pkg"; 3944 trace "... clearing $pkg";
3728 clear_package $pkg; 3945 clear_package $pkg;
3729 } 3946 }
3730 3947
3731 warn "unloading all perl modules loaded from $LIBDIR"; 3948 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3732 while (my ($k, $v) = each %INC) { 3949 while (my ($k, $v) = each %INC) {
3733 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3950 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3734 3951
3735 warn "... unloading $k"; 3952 trace "... unloading $k";
3736 delete $INC{$k}; 3953 delete $INC{$k};
3737 3954
3738 $k =~ s/\.pm$//; 3955 $k =~ s/\.pm$//;
3739 $k =~ s/\//::/g; 3956 $k =~ s/\//::/g;
3740 3957
… …
3743 } 3960 }
3744 3961
3745 clear_package $k; 3962 clear_package $k;
3746 } 3963 }
3747 3964
3748 warn "getting rid of safe::, as good as possible"; 3965 trace "perl_reload: getting rid of safe::, as good as possible";
3749 clear_package "safe::$_" 3966 clear_package "safe::$_"
3750 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3967 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3751 3968
3752 warn "unloading cf.pm \"a bit\""; 3969 trace "perl_reload: unloading cf.pm \"a bit\"";
3753 delete $INC{"cf.pm"}; 3970 delete $INC{"cf.pm"};
3754 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3971 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3755 3972
3756 # don't, removes xs symbols, too, 3973 # don't, removes xs symbols, too,
3757 # and global variables created in xs 3974 # and global variables created in xs
3758 #clear_package __PACKAGE__; 3975 #clear_package __PACKAGE__;
3759 3976
3760 warn "unload completed, starting to reload now"; 3977 info "perl_reload: unload completed, starting to reload now";
3761 3978
3762 warn "reloading cf.pm"; 3979 trace "perl_reload: reloading cf.pm";
3763 require cf; 3980 require cf;
3764 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3981 cf::_connect_to_perl_1;
3765 3982
3766 warn "loading config and database again"; 3983 trace "perl_reload: loading config and database again";
3767 cf::reload_config; 3984 cf::reload_config;
3768 3985
3769 warn "loading extensions"; 3986 trace "perl_reload: loading extensions";
3770 cf::load_extensions; 3987 cf::load_extensions;
3771 3988
3772 if ($REATTACH_ON_RELOAD) { 3989 if ($REATTACH_ON_RELOAD) {
3773 warn "reattaching attachments to objects/players"; 3990 trace "perl_reload: reattaching attachments to objects/players";
3774 _global_reattach; # objects, sockets 3991 _global_reattach; # objects, sockets
3775 warn "reattaching attachments to maps"; 3992 trace "perl_reload: reattaching attachments to maps";
3776 reattach $_ for values %MAP; 3993 reattach $_ for values %MAP;
3777 warn "reattaching attachments to players"; 3994 trace "perl_reload: reattaching attachments to players";
3778 reattach $_ for values %PLAYER; 3995 reattach $_ for values %PLAYER;
3779 } 3996 }
3780 3997
3781 warn "running post_init jobs"; 3998 cf::_post_init 1;
3782 (pop @POST_INIT)->(1) while @POST_INIT;
3783 3999
3784 warn "leaving sync_job"; 4000 trace "perl_reload: leaving sync_job";
3785 4001
3786 1 4002 1
3787 } or do { 4003 } or do {
3788 warn $@; 4004 error $@;
3789 cf::cleanup "error while reloading, exiting."; 4005 cf::cleanup "perl_reload: error, exiting.";
3790 }; 4006 };
3791 4007
3792 warn "reloaded";
3793 --$RELOAD; 4008 --$RELOAD;
3794 } 4009 }
3795 4010
3796 $t1 = EV::time - $t1; 4011 $t1 = AE::time - $t1;
3797 warn "reload completed in ${t1}s\n"; 4012 info "perl_reload: completed in ${t1}s\n";
3798}; 4013};
3799 4014
3800our $RELOAD_WATCHER; # used only during reload 4015our $RELOAD_WATCHER; # used only during reload
3801 4016
3802sub reload_perl() { 4017sub reload_perl() {
… …
3804 # coro crashes during coro_state_free->destroy here. 4019 # coro crashes during coro_state_free->destroy here.
3805 4020
3806 $RELOAD_WATCHER ||= cf::async { 4021 $RELOAD_WATCHER ||= cf::async {
3807 Coro::AIO::aio_wait cache_extensions; 4022 Coro::AIO::aio_wait cache_extensions;
3808 4023
3809 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4024 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3810 do_reload_perl; 4025 do_reload_perl;
3811 undef $RELOAD_WATCHER; 4026 undef $RELOAD_WATCHER;
3812 }; 4027 };
3813 }; 4028 };
3814} 4029}
… …
3823 reload_perl; 4038 reload_perl;
3824 }; 4039 };
3825 } 4040 }
3826}; 4041};
3827 4042
3828unshift @INC, $LIBDIR; 4043#############################################################################
3829 4044
3830my $bug_warning = 0; 4045my $bug_warning = 0;
3831 4046
3832our @WAIT_FOR_TICK; 4047our @WAIT_FOR_TICK;
3833our @WAIT_FOR_TICK_BEGIN; 4048our @WAIT_FOR_TICK_BEGIN;
3834 4049
3835sub wait_for_tick { 4050sub wait_for_tick() {
3836 return if tick_inhibit || $Coro::current == $Coro::main; 4051 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3837 4052
3838 my $signal = new Coro::Signal; 4053 my $signal = new Coro::Signal;
3839 push @WAIT_FOR_TICK, $signal; 4054 push @WAIT_FOR_TICK, $signal;
3840 $signal->wait; 4055 $signal->wait;
3841} 4056}
3842 4057
3843sub wait_for_tick_begin { 4058sub wait_for_tick_begin() {
3844 return if tick_inhibit || $Coro::current == $Coro::main; 4059 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3845 4060
3846 my $signal = new Coro::Signal; 4061 my $signal = new Coro::Signal;
3847 push @WAIT_FOR_TICK_BEGIN, $signal; 4062 push @WAIT_FOR_TICK_BEGIN, $signal;
3848 $signal->wait; 4063 $signal->wait;
3849} 4064}
… …
3855 return; 4070 return;
3856 } 4071 }
3857 4072
3858 cf::server_tick; # one server iteration 4073 cf::server_tick; # one server iteration
3859 4074
4075 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4076
3860 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4077 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3861 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4078 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3862 Coro::async_pool { 4079 Coro::async_pool {
3863 $Coro::current->{desc} = "runtime saver"; 4080 $Coro::current->{desc} = "runtime saver";
3864 write_runtime_sync 4081 write_runtime_sync
3865 or warn "ERROR: unable to write runtime file: $!"; 4082 or error "ERROR: unable to write runtime file: $!";
3866 }; 4083 };
3867 } 4084 }
3868 4085
3869 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4086 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3870 $sig->send; 4087 $sig->send;
… …
3878 4095
3879 if (0) { 4096 if (0) {
3880 if ($NEXT_TICK) { 4097 if ($NEXT_TICK) {
3881 my $jitter = $TICK_START - $NEXT_TICK; 4098 my $jitter = $TICK_START - $NEXT_TICK;
3882 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4099 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3883 warn "jitter $JITTER\n";#d# 4100 debug "jitter $JITTER\n";#d#
3884 } 4101 }
3885 } 4102 }
3886} 4103}
3887 4104
3888{ 4105{
3889 # configure BDB 4106 # configure BDB
3890 4107
3891 BDB::min_parallel 8; 4108 BDB::min_parallel 16;
3892 BDB::max_poll_reqs $TICK * 0.1; 4109 BDB::max_poll_reqs $TICK * 0.1;
3893 $AnyEvent::BDB::WATCHER->priority (1); 4110 $AnyEvent::BDB::WATCHER->priority (1);
3894 4111
3895 unless ($DB_ENV) { 4112 unless ($DB_ENV) {
3896 $DB_ENV = BDB::db_env_create; 4113 $DB_ENV = BDB::db_env_create;
… …
3977 } 4194 }
3978} 4195}
3979 4196
3980# load additional modules 4197# load additional modules
3981require "cf/$_.pm" for @EXTRA_MODULES; 4198require "cf/$_.pm" for @EXTRA_MODULES;
4199cf::_connect_to_perl_2;
3982 4200
3983END { cf::emergency_save } 4201END { cf::emergency_save }
3984 4202
39851 42031
3986 4204

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines