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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.468 by root, Thu Jan 8 19:23:44 2009 UTC vs.
Revision 1.536 by root, Thu Apr 29 08:26:38 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 5.10.0;
25use utf8; 26use utf8;
31use EV; 32use EV;
32use Opcode; 33use Opcode;
33use Safe; 34use Safe;
34use Safe::Hole; 35use Safe::Hole;
35use Storable (); 36use Storable ();
37use Carp ();
36 38
37use Guard (); 39use Guard ();
38use Coro (); 40use Coro ();
39use Coro::State; 41use Coro::State;
40use Coro::Handle; 42use Coro::Handle;
51use Coro::Util (); 53use Coro::Util ();
52 54
53use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
54use BDB (); 56use BDB ();
55use Data::Dumper; 57use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 58use Fcntl;
58use YAML (); 59use YAML::XS ();
59use IO::AIO (); 60use IO::AIO ();
60use Time::HiRes; 61use Time::HiRes;
61use Compress::LZF; 62use Compress::LZF;
62use Digest::MD5 (); 63use Digest::MD5 ();
63 64
71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72 73
73# make sure c-lzf reinitialises itself 74# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
77
78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
76 80
77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
78 82
79our %COMMAND = (); 83our %COMMAND = ();
80our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
85our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
86our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
87 91
88our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
89our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
90 96
91our $CONFDIR = confdir; 97our $CONFDIR = confdir;
92our $DATADIR = datadir; 98our $DATADIR = datadir;
93our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
94our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
100our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
101our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
104 110
105our %RESOURCE; 111our %RESOURCE; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
106 118
107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109our $NEXT_TICK; 121our $NEXT_TICK;
110our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
111 123
112our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
114our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
115our $DB_ENV; 127our $DB_ENV;
116 128
117our @EXTRA_MODULES = qw(pod mapscript); 129our @EXTRA_MODULES = qw(pod match mapscript);
118 130
119our %CFG; 131our %CFG;
120 132
121our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
122our $RUNTIME; 134our $RUNTIME;
134our $JITTER; # average jitter 146our $JITTER; # average jitter
135our $TICK_START; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
136 148
137our @POST_INIT; 149our @POST_INIT;
138 150
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
140 153
141binmode STDOUT; 154binmode STDOUT;
142binmode STDERR; 155binmode STDERR;
143 156
144# read virtual server time, if available 157# read virtual server time, if available
155 168
156our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
157 170
158sub cf::map::normalise; 171sub cf::map::normalise;
159 172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
187
160############################################################################# 188#############################################################################
161 189
162=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
163 191
164=over 4 192=over 4
210returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one process
211per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
212 240
213=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
214 242
215This array contains the results of the last C<invoke ()> call. When 243This array contains the results of the last C<invoke ()> call. When
216C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
217that call. 245that call.
218 246
247=item %cf::REFLECT
248
249Contains, for each (C++) class name, a hash reference with information
250about object members (methods, scalars, arrays and flags) and other
251metadata, which is useful for introspection.
252
219=back 253=back
220 254
221=cut 255=cut
222 256
223BEGIN { 257sub error(@) { LOG llevError, join "", @_ }
224 *CORE::GLOBAL::warn = sub { 258sub warn (@) { LOG llevWarn , join "", @_ }
259sub info (@) { LOG llevInfo , join "", @_ }
260sub debug(@) { LOG llevDebug, join "", @_ }
261sub trace(@) { LOG llevTrace, join "", @_ }
262
263$Coro::State::WARNHOOK = sub {
225 my $msg = join "", @_; 264 my $msg = join "", @_;
226 265
227 $msg .= "\n" 266 $msg .= "\n"
228 unless $msg =~ /\n$/; 267 unless $msg =~ /\n$/;
229 268
230 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 269 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
231 270
232 LOG llevError, $msg; 271 LOG llevWarn, $msg;
233 }; 272};
234}
235 273
236$Coro::State::DIEHOOK = sub { 274$Coro::State::DIEHOOK = sub {
237 return unless $^S eq 0; # "eq", not "==" 275 return unless $^S eq 0; # "eq", not "=="
238 276
239 if ($Coro::current == $Coro::main) {#d# 277 error Carp::longmess $_[0];
278
279 if (in_main) {#d#
240 warn "DIEHOOK called in main context, Coro bug?\n";#d# 280 error "DIEHOOK called in main context, Coro bug?\n";#d#
241 return;#d# 281 return;#d#
242 }#d# 282 }#d#
243 283
244 # kill coroutine otherwise 284 # kill coroutine otherwise
245 warn Carp::longmess $_[0];
246 Coro::terminate 285 Coro::terminate
247}; 286};
248
249$SIG{__DIE__} = sub { }; #d#?
250 287
251@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 288@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
252@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 289@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
253@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 290@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
254@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 291@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
268)) { 305)) {
269 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 306 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
270} 307}
271 308
272$EV::DIED = sub { 309$EV::DIED = sub {
273 warn "error in event callback: @_"; 310 Carp::cluck "error in event callback: @_";
274}; 311};
275 312
276############################################################################# 313#############################################################################
277 314
278=head2 UTILITY FUNCTIONS 315=head2 UTILITY FUNCTIONS
375} 412}
376 413
377=item cf::periodic $interval, $cb 414=item cf::periodic $interval, $cb
378 415
379Like EV::periodic, but randomly selects a starting point so that the actions 416Like EV::periodic, but randomly selects a starting point so that the actions
380get spread over timer. 417get spread over time.
381 418
382=cut 419=cut
383 420
384sub periodic($$) { 421sub periodic($$) {
385 my ($interval, $cb) = @_; 422 my ($interval, $cb) = @_;
402 439
403=cut 440=cut
404 441
405our @SLOT_QUEUE; 442our @SLOT_QUEUE;
406our $SLOT_QUEUE; 443our $SLOT_QUEUE;
444our $SLOT_DECAY = 0.9;
407 445
408$SLOT_QUEUE->cancel if $SLOT_QUEUE; 446$SLOT_QUEUE->cancel if $SLOT_QUEUE;
409$SLOT_QUEUE = Coro::async { 447$SLOT_QUEUE = Coro::async {
410 $Coro::current->desc ("timeslot manager"); 448 $Coro::current->desc ("timeslot manager");
411 449
412 my $signal = new Coro::Signal; 450 my $signal = new Coro::Signal;
451 my $busy;
413 452
414 while () { 453 while () {
415 next_job: 454 next_job:
455
416 my $avail = cf::till_tick; 456 my $avail = cf::till_tick;
417 if ($avail > 0.01) { 457
418 for (0 .. $#SLOT_QUEUE) { 458 for (0 .. $#SLOT_QUEUE) {
419 if ($SLOT_QUEUE[$_][0] < $avail) { 459 if ($SLOT_QUEUE[$_][0] <= $avail) {
460 $busy = 0;
420 my $job = splice @SLOT_QUEUE, $_, 1, (); 461 my $job = splice @SLOT_QUEUE, $_, 1, ();
421 $job->[2]->send; 462 $job->[2]->send;
422 Coro::cede; 463 Coro::cede;
423 goto next_job; 464 goto next_job;
424 } 465 } else {
466 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
425 } 467 }
426 } 468 }
427 469
428 if (@SLOT_QUEUE) { 470 if (@SLOT_QUEUE) {
429 # we do not use wait_for_tick() as it returns immediately when tick is inactive 471 # we do not use wait_for_tick() as it returns immediately when tick is inactive
430 push @cf::WAIT_FOR_TICK, $signal; 472 push @cf::WAIT_FOR_TICK, $signal;
431 $signal->wait; 473 $signal->wait;
432 } else { 474 } else {
475 $busy = 0;
433 Coro::schedule; 476 Coro::schedule;
434 } 477 }
435 } 478 }
436}; 479};
437 480
438sub get_slot($;$$) { 481sub get_slot($;$$) {
439 return if tick_inhibit || $Coro::current == $Coro::main; 482 return if tick_inhibit || $Coro::current == $Coro::main;
440 483
441 my ($time, $pri, $name) = @_; 484 my ($time, $pri, $name) = @_;
442 485
443 $time = $TICK * .6 if $time > $TICK * .6; 486 $time = clamp $time, 0.01, $TICK * .6;
487
444 my $sig = new Coro::Signal; 488 my $sig = new Coro::Signal;
445 489
446 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 490 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
447 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 491 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
448 $SLOT_QUEUE->ready; 492 $SLOT_QUEUE->ready;
474=cut 518=cut
475 519
476sub sync_job(&) { 520sub sync_job(&) {
477 my ($job) = @_; 521 my ($job) = @_;
478 522
479 if ($Coro::current == $Coro::main) { 523 if (in_main) {
480 my $time = EV::time; 524 my $time = AE::time;
481 525
482 # this is the main coro, too bad, we have to block 526 # this is the main coro, too bad, we have to block
483 # till the operation succeeds, freezing the server :/ 527 # till the operation succeeds, freezing the server :/
484 528
485 LOG llevError, Carp::longmess "sync job";#d# 529 #LOG llevError, Carp::longmess "sync job";#d#
486 530
487 my $freeze_guard = freeze_mainloop; 531 my $freeze_guard = freeze_mainloop;
488 532
489 my $busy = 1; 533 my $busy = 1;
490 my @res; 534 my @res;
491 535
492 (async { 536 (async {
493 $Coro::current->desc ("sync job coro"); 537 $Coro::current->desc ("sync job coro");
494 @res = eval { $job->() }; 538 @res = eval { $job->() };
495 warn $@ if $@; 539 error $@ if $@;
496 undef $busy; 540 undef $busy;
497 })->prio (Coro::PRIO_MAX); 541 })->prio (Coro::PRIO_MAX);
498 542
499 while ($busy) { 543 while ($busy) {
500 if (Coro::nready) { 544 if (Coro::nready) {
502 } else { 546 } else {
503 EV::loop EV::LOOP_ONESHOT; 547 EV::loop EV::LOOP_ONESHOT;
504 } 548 }
505 } 549 }
506 550
507 my $time = EV::time - $time; 551 my $time = AE::time - $time;
508 552
509 $TICK_START += $time; # do not account sync jobs to server load 553 $TICK_START += $time; # do not account sync jobs to server load
510 554
511 wantarray ? @res : $res[0] 555 wantarray ? @res : $res[0]
512 } else { 556 } else {
556 reset_signals; 600 reset_signals;
557 &$cb 601 &$cb
558 }, @args; 602 }, @args;
559 603
560 wantarray ? @res : $res[-1] 604 wantarray ? @res : $res[-1]
605}
606
607sub objinfo {
608 (
609 "counter value" => cf::object::object_count,
610 "objects created" => cf::object::create_count,
611 "objects destroyed" => cf::object::destroy_count,
612 "freelist size" => cf::object::free_count,
613 "allocated objects" => cf::object::objects_size,
614 "active objects" => cf::object::actives_size,
615 )
561} 616}
562 617
563=item $coin = coin_from_name $name 618=item $coin = coin_from_name $name
564 619
565=cut 620=cut
602within each server. 657within each server.
603 658
604=cut 659=cut
605 660
606sub db_table($) { 661sub db_table($) {
662 cf::error "db_get called from main context"
663 if $Coro::current == $Coro::main;
664
607 my ($name) = @_; 665 my ($name) = @_;
608 my $db = BDB::db_create $DB_ENV; 666 my $db = BDB::db_create $DB_ENV;
609 667
610 eval { 668 eval {
611 $db->set_flags (BDB::CHKSUM); 669 $db->set_flags (BDB::CHKSUM);
621} 679}
622 680
623our $DB; 681our $DB;
624 682
625sub db_init { 683sub db_init {
626 cf::sync_job {
627 $DB ||= db_table "db"; 684 $DB ||= db_table "db";
628 };
629} 685}
630 686
631sub db_get($$) { 687sub db_get($$) {
632 my $key = "$_[0]/$_[1]"; 688 my $key = "$_[0]/$_[1]";
633 689
634 cf::sync_job { 690 cf::error "db_get called from main context"
691 if $Coro::current == $Coro::main;
692
635 BDB::db_get $DB, undef, $key, my $data; 693 BDB::db_get $DB, undef, $key, my $data;
636 694
637 $! ? () 695 $! ? ()
638 : $data 696 : $data
639 }
640} 697}
641 698
642sub db_put($$$) { 699sub db_put($$$) {
643 BDB::dbreq_pri 4; 700 BDB::dbreq_pri 4;
644 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 701 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
700 757
701 my $t1 = Time::HiRes::time; 758 my $t1 = Time::HiRes::time;
702 my $data = $process->(\@data); 759 my $data = $process->(\@data);
703 my $t2 = Time::HiRes::time; 760 my $t2 = Time::HiRes::time;
704 761
705 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 762 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
706 763
707 db_put cache => "$id/data", $data; 764 db_put cache => "$id/data", $data;
708 db_put cache => "$id/md5" , $md5; 765 db_put cache => "$id/md5" , $md5;
709 db_put cache => "$id/meta", $meta; 766 db_put cache => "$id/meta", $meta;
710 767
720 777
721=cut 778=cut
722 779
723sub datalog($@) { 780sub datalog($@) {
724 my ($type, %kv) = @_; 781 my ($type, %kv) = @_;
725 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 782 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
726} 783}
727 784
728=back 785=back
729 786
730=cut 787=cut
925 982
926 } elsif (exists $cb_id{$type}) { 983 } elsif (exists $cb_id{$type}) {
927 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 984 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
928 985
929 } elsif (ref $type) { 986 } elsif (ref $type) {
930 warn "attaching objects not supported, ignoring.\n"; 987 error "attaching objects not supported, ignoring.\n";
931 988
932 } else { 989 } else {
933 shift @arg; 990 shift @arg;
934 warn "attach argument '$type' not supported, ignoring.\n"; 991 error "attach argument '$type' not supported, ignoring.\n";
935 } 992 }
936 } 993 }
937} 994}
938 995
939sub _object_attach { 996sub _object_attach {
949 _attach $registry, $klass, @attach; 1006 _attach $registry, $klass, @attach;
950 } 1007 }
951 1008
952 $obj->{$name} = \%arg; 1009 $obj->{$name} = \%arg;
953 } else { 1010 } else {
954 warn "object uses attachment '$name' which is not available, postponing.\n"; 1011 info "object uses attachment '$name' which is not available, postponing.\n";
955 } 1012 }
956 1013
957 $obj->{_attachment}{$name} = undef; 1014 $obj->{_attachment}{$name} = undef;
958} 1015}
959 1016
1018 1075
1019 for (@$callbacks) { 1076 for (@$callbacks) {
1020 eval { &{$_->[1]} }; 1077 eval { &{$_->[1]} };
1021 1078
1022 if ($@) { 1079 if ($@) {
1023 warn "$@";
1024 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1080 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1025 override; 1081 override;
1026 } 1082 }
1027 1083
1028 return 1 if $override; 1084 return 1 if $override;
1029 } 1085 }
1108 for (@$attach) { 1164 for (@$attach) {
1109 my ($klass, @attach) = @$_; 1165 my ($klass, @attach) = @$_;
1110 _attach $registry, $klass, @attach; 1166 _attach $registry, $klass, @attach;
1111 } 1167 }
1112 } else { 1168 } else {
1113 warn "object uses attachment '$name' that is not available, postponing.\n"; 1169 info "object uses attachment '$name' that is not available, postponing.\n";
1114 } 1170 }
1115 } 1171 }
1116} 1172}
1117 1173
1118cf::attachable->attach ( 1174cf::attachable->attach (
1145 my ($filename, $rdata, $objs) = @_; 1201 my ($filename, $rdata, $objs) = @_;
1146 1202
1147 sync_job { 1203 sync_job {
1148 if (length $$rdata) { 1204 if (length $$rdata) {
1149 utf8::decode (my $decname = $filename); 1205 utf8::decode (my $decname = $filename);
1150 warn sprintf "saving %s (%d,%d)\n", 1206 trace sprintf "saving %s (%d,%d)\n",
1151 $decname, length $$rdata, scalar @$objs; 1207 $decname, length $$rdata, scalar @$objs
1208 if $VERBOSE_IO;
1152 1209
1153 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1210 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1154 aio_chmod $fh, SAVE_MODE; 1211 aio_chmod $fh, SAVE_MODE;
1155 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1212 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1156 aio_fsync $fh if $cf::USE_FSYNC; 1213 if ($cf::USE_FSYNC) {
1214 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1215 aio_fsync $fh;
1216 }
1157 aio_close $fh; 1217 aio_close $fh;
1158 1218
1159 if (@$objs) { 1219 if (@$objs) {
1160 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1220 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1161 aio_chmod $fh, SAVE_MODE; 1221 aio_chmod $fh, SAVE_MODE;
1162 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1222 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1163 aio_write $fh, 0, (length $data), $data, 0; 1223 aio_write $fh, 0, (length $data), $data, 0;
1164 aio_fsync $fh if $cf::USE_FSYNC; 1224 if ($cf::USE_FSYNC) {
1225 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1226 aio_fsync $fh;
1227 }
1165 aio_close $fh; 1228 aio_close $fh;
1166 aio_rename "$filename.pst~", "$filename.pst"; 1229 aio_rename "$filename.pst~", "$filename.pst";
1167 } 1230 }
1168 } else { 1231 } else {
1169 aio_unlink "$filename.pst"; 1232 aio_unlink "$filename.pst";
1172 aio_rename "$filename~", $filename; 1235 aio_rename "$filename~", $filename;
1173 1236
1174 $filename =~ s%/[^/]+$%%; 1237 $filename =~ s%/[^/]+$%%;
1175 aio_pathsync $filename if $cf::USE_FSYNC; 1238 aio_pathsync $filename if $cf::USE_FSYNC;
1176 } else { 1239 } else {
1177 warn "unable to save objects: $filename~: $!\n"; 1240 error "unable to save objects: $filename~: $!\n";
1178 } 1241 }
1179 } else { 1242 } else {
1180 aio_unlink $filename; 1243 aio_unlink $filename;
1181 aio_unlink "$filename.pst"; 1244 aio_unlink "$filename.pst";
1182 } 1245 }
1206 my $st = eval { Coro::Storable::thaw $av }; 1269 my $st = eval { Coro::Storable::thaw $av };
1207 $av = $st->{objs}; 1270 $av = $st->{objs};
1208 } 1271 }
1209 1272
1210 utf8::decode (my $decname = $filename); 1273 utf8::decode (my $decname = $filename);
1211 warn sprintf "loading %s (%d,%d)\n", 1274 trace sprintf "loading %s (%d,%d)\n",
1212 $decname, length $data, scalar @{$av || []}; 1275 $decname, length $data, scalar @{$av || []}
1276 if $VERBOSE_IO;
1213 1277
1214 ($data, $av) 1278 ($data, $av)
1215} 1279}
1216 1280
1217=head2 COMMAND CALLBACKS 1281=head2 COMMAND CALLBACKS
1276} 1340}
1277 1341
1278use File::Glob (); 1342use File::Glob ();
1279 1343
1280cf::player->attach ( 1344cf::player->attach (
1281 on_command => sub { 1345 on_unknown_command => sub {
1282 my ($pl, $name, $params) = @_; 1346 my ($pl, $name, $params) = @_;
1283 1347
1284 my $cb = $COMMAND{$name} 1348 my $cb = $COMMAND{$name}
1285 or return; 1349 or return;
1286 1350
1309 1373
1310 $pl->ext_reply ($reply, @reply) 1374 $pl->ext_reply ($reply, @reply)
1311 if $reply; 1375 if $reply;
1312 1376
1313 } else { 1377 } else {
1314 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1378 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1315 } 1379 }
1316 1380
1317 cf::override; 1381 cf::override;
1318 }, 1382 },
1319); 1383);
1320 1384
1321# "readahead" all extensions 1385# "readahead" all extensions
1322sub cache_extensions { 1386sub cache_extensions {
1323 my $grp = IO::AIO::aio_group; 1387 my $grp = IO::AIO::aio_group;
1324 1388
1325 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1389 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1326 for (grep /\.ext$/, @{$_[0]}) { 1390 for (grep /\.ext$/, @{$_[0]}) {
1327 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1391 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1328 } 1392 }
1329 }; 1393 };
1330 1394
1331 $grp 1395 $grp
1332} 1396}
1333 1397
1334sub load_extensions { 1398sub load_extensions {
1399 info "loading extensions...";
1400
1335 cf::sync_job { 1401 cf::sync_job {
1336 my %todo; 1402 my %todo;
1337 1403
1338 for my $path (<$LIBDIR/*.ext>) { 1404 for my $path (<$LIBDIR/*.ext>) {
1339 next unless -r $path; 1405 next unless -r $path;
1365 . "\n};\n1"; 1431 . "\n};\n1";
1366 1432
1367 $todo{$base} = \%ext; 1433 $todo{$base} = \%ext;
1368 } 1434 }
1369 1435
1436 my $pass = 0;
1370 my %done; 1437 my %done;
1371 while (%todo) { 1438 while (%todo) {
1372 my $progress; 1439 my $progress;
1373 1440
1441 ++$pass;
1442
1443 ext:
1374 while (my ($k, $v) = each %todo) { 1444 while (my ($k, $v) = each %todo) {
1375 for (split /,\s*/, $v->{meta}{depends}) { 1445 for (split /,\s*/, $v->{meta}{depends}) {
1376 goto skip 1446 next ext
1377 unless exists $done{$_}; 1447 unless exists $done{$_};
1378 } 1448 }
1379 1449
1380 warn "... loading '$k' into '$v->{pkg}'\n"; 1450 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1381 1451
1382 unless (eval $v->{source}) { 1452 my $active = eval $v->{source};
1453
1454 if (length $@) {
1383 my $msg = $@ ? "$v->{path}: $@\n" 1455 error "$v->{path}: $@\n";
1384 : "$v->{base}: extension inactive.\n";
1385 1456
1386 if (exists $v->{meta}{mandatory}) {
1387 warn $msg;
1388 cf::cleanup "mandatory extension failed to load, exiting."; 1457 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1389 } 1458 if exists $v->{meta}{mandatory};
1390 1459
1391 warn $msg; 1460 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1461 delete $todo{$k};
1462 } else {
1463 $done{$k} = delete $todo{$k};
1464 push @EXTS, $v->{pkg};
1465 $progress = 1;
1466
1467 info "$v->{base}: extension inactive.\n"
1468 unless $active;
1392 } 1469 }
1393
1394 $done{$k} = delete $todo{$k};
1395 push @EXTS, $v->{pkg};
1396 $progress = 1;
1397 } 1470 }
1398 1471
1399 skip: 1472 unless ($progress) {
1400 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1473 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1401 unless $progress; 1474
1475 while (my ($k, $v) = each %todo) {
1476 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1477 if exists $v->{meta}{mandatory};
1478 }
1479 }
1402 } 1480 }
1403 }; 1481 };
1404} 1482}
1405 1483
1406############################################################################# 1484#############################################################################
1490 $cf::PLAYER{$login} = $pl 1568 $cf::PLAYER{$login} = $pl
1491 } 1569 }
1492 } 1570 }
1493} 1571}
1494 1572
1573cf::player->attach (
1574 on_load => sub {
1575 my ($pl, $path) = @_;
1576
1577 # restore slots saved in save, below
1578 my $slots = delete $pl->{_slots};
1579
1580 $pl->ob->current_weapon ($slots->[0]);
1581 $pl->combat_ob ($slots->[1]);
1582 $pl->ranged_ob ($slots->[2]);
1583 },
1584);
1585
1495sub save($) { 1586sub save($) {
1496 my ($pl) = @_; 1587 my ($pl) = @_;
1497 1588
1498 return if $pl->{deny_save}; 1589 return if $pl->{deny_save};
1499 1590
1504 1595
1505 aio_mkdir playerdir $pl, 0770; 1596 aio_mkdir playerdir $pl, 0770;
1506 $pl->{last_save} = $cf::RUNTIME; 1597 $pl->{last_save} = $cf::RUNTIME;
1507 1598
1508 cf::get_slot 0.01; 1599 cf::get_slot 0.01;
1600
1601 # save slots, to be restored later
1602 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1509 1603
1510 $pl->save_pl ($path); 1604 $pl->save_pl ($path);
1511 cf::cede_to_tick; 1605 cf::cede_to_tick;
1512} 1606}
1513 1607
1550 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1644 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1551 1645
1552 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1646 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1553 $pl->deactivate; 1647 $pl->deactivate;
1554 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1648 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1555 $pl->ob->check_score;
1556 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1649 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1557 $pl->ns->destroy if $pl->ns; 1650 $pl->ns->destroy if $pl->ns;
1558 1651
1559 my $path = playerdir $pl; 1652 my $path = playerdir $pl;
1560 my $temp = "$path~$cf::RUNTIME~deleting~"; 1653 my $temp = "$path~$cf::RUNTIME~deleting~";
1615 \@logins 1708 \@logins
1616} 1709}
1617 1710
1618=item $player->maps 1711=item $player->maps
1619 1712
1713=item cf::player::maps $login
1714
1620Returns an arrayref of map paths that are private for this 1715Returns an arrayref of map paths that are private for this
1621player. May block. 1716player. May block.
1622 1717
1623=cut 1718=cut
1624 1719
1686=cut 1781=cut
1687 1782
1688sub find_by_path($) { 1783sub find_by_path($) {
1689 my ($path) = @_; 1784 my ($path) = @_;
1690 1785
1786 $path =~ s/^~[^\/]*//; # skip ~login
1787
1691 my ($match, $specificity); 1788 my ($match, $specificity);
1692 1789
1693 for my $region (list) { 1790 for my $region (list) {
1694 if ($region->{match} && $path =~ $region->{match}) { 1791 if ($region->{match} && $path =~ $region->{match}) {
1695 ($match, $specificity) = ($region, $region->specificity) 1792 ($match, $specificity) = ($region, $region->specificity)
1726 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1823 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1727 1824
1728 # mit "rum" bekleckern, nicht 1825 # mit "rum" bekleckern, nicht
1729 $self->_create_random_map ( 1826 $self->_create_random_map (
1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1827 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1828 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1829 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1733 $rmp->{exit_on_final_map}, 1830 $rmp->{exit_on_final_map},
1734 $rmp->{xsize}, $rmp->{ysize}, 1831 $rmp->{xsize}, $rmp->{ysize},
1735 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1832 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1736 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1833 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1758 1855
1759 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1856 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1760} 1857}
1761 1858
1762# also paths starting with '/' 1859# also paths starting with '/'
1763$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1860$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1764 1861
1765sub thawer_merge { 1862sub thawer_merge {
1766 my ($self, $merge) = @_; 1863 my ($self, $merge) = @_;
1767 1864
1768 # we have to keep some variables in memory intact 1865 # we have to keep some variables in memory intact
1982 2079
1983 $cf::MAP{$path} = $map 2080 $cf::MAP{$path} = $map
1984 } 2081 }
1985} 2082}
1986 2083
1987sub pre_load { } 2084sub pre_load { }
1988sub post_load { } 2085#sub post_load { } # XS
1989 2086
1990sub load { 2087sub load {
1991 my ($self) = @_; 2088 my ($self) = @_;
1992 2089
1993 local $self->{deny_reset} = 1; # loading can take a long time 2090 local $self->{deny_reset} = 1; # loading can take a long time
2050 } 2147 }
2051 2148
2052 $self->post_load; 2149 $self->post_load;
2053} 2150}
2054 2151
2152# customize the map for a given player, i.e.
2153# return the _real_ map. used by e.g. per-player
2154# maps to change the path to ~playername/mappath
2055sub customise_for { 2155sub customise_for {
2056 my ($self, $ob) = @_; 2156 my ($self, $ob) = @_;
2057 2157
2058 return find "~" . $ob->name . "/" . $self->{path} 2158 return find "~" . $ob->name . "/" . $self->{path}
2059 if $self->per_player; 2159 if $self->per_player;
2075 or next; 2175 or next;
2076 $neigh = find $neigh, $map 2176 $neigh = find $neigh, $map
2077 or next; 2177 or next;
2078 $neigh->load; 2178 $neigh->load;
2079 2179
2180 # now find the diagonal neighbours
2080 push @neigh, 2181 push @neigh,
2081 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2182 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2082 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2183 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2083 } 2184 }
2084 2185
2091} 2192}
2092 2193
2093sub find_sync { 2194sub find_sync {
2094 my ($path, $origin) = @_; 2195 my ($path, $origin) = @_;
2095 2196
2096 cf::sync_job { find $path, $origin } 2197 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2198 if $Coro::current == $Coro::main;
2199
2200 find $path, $origin
2097} 2201}
2098 2202
2099sub do_load_sync { 2203sub do_load_sync {
2100 my ($map) = @_; 2204 my ($map) = @_;
2101 2205
2102 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2206 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2103 if $Coro::current == $Coro::main; 2207 if $Coro::current == $Coro::main;
2104 2208
2105 cf::sync_job { $map->load }; 2209 $map->load;
2106} 2210}
2107 2211
2108our %MAP_PREFETCH; 2212our %MAP_PREFETCH;
2109our $MAP_PREFETCHER = undef; 2213our $MAP_PREFETCHER = undef;
2110 2214
2136 $MAP_PREFETCHER->prio (6); 2240 $MAP_PREFETCHER->prio (6);
2137 2241
2138 () 2242 ()
2139} 2243}
2140 2244
2245# common code, used by both ->save and ->swapout
2141sub save { 2246sub _save {
2142 my ($self) = @_; 2247 my ($self) = @_;
2143
2144 my $lock = cf::lock_acquire "map_data:$self->{path}";
2145 2248
2146 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2147 2250
2148 return unless $self->dirty; 2251 return unless $self->dirty;
2149 2252
2169 } else { 2272 } else {
2170 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2273 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2171 } 2274 }
2172} 2275}
2173 2276
2277sub save {
2278 my ($self) = @_;
2279
2280 my $lock = cf::lock_acquire "map_data:$self->{path}";
2281
2282 $self->_save;
2283}
2284
2174sub swap_out { 2285sub swap_out {
2175 my ($self) = @_; 2286 my ($self) = @_;
2176 2287
2177 # save first because save cedes
2178 $self->save;
2179
2180 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2288 my $lock = cf::lock_acquire "map_data:$self->{path}";
2181 2289
2182 return if $self->players;
2183 return if $self->in_memory != cf::MAP_ACTIVE; 2290 return if $self->in_memory != cf::MAP_ACTIVE;
2184 return if $self->{deny_save}; 2291 return if $self->{deny_save};
2292 return if $self->players;
2185 2293
2294 # first deactivate the map and "unlink" it from the core
2295 $self->deactivate;
2296 $_->clear_links_to ($self) for values %cf::MAP;
2186 $self->in_memory (cf::MAP_SWAPPED); 2297 $self->in_memory (cf::MAP_SWAPPED);
2298
2299 # then atomically save
2300 $self->_save;
2301
2302 # then free the map
2303 $self->clear;
2304}
2305
2306sub reset_at {
2307 my ($self) = @_;
2308
2309 # TODO: safety, remove and allow resettable per-player maps
2310 return 1e99 if $self->{deny_reset};
2311
2312 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2313 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2314
2315 $time + $to
2316}
2317
2318sub should_reset {
2319 my ($self) = @_;
2320
2321 $self->reset_at <= $cf::RUNTIME
2322}
2323
2324sub reset {
2325 my ($self) = @_;
2326
2327 my $lock = cf::lock_acquire "map_data:$self->{path}";
2328
2329 return if $self->players;
2330
2331 cf::trace "resetting map ", $self->path, "\n";
2332
2333 $self->in_memory (cf::MAP_SWAPPED);
2334
2335 # need to save uniques path
2336 unless ($self->{deny_save}) {
2337 my $uniq = $self->uniq_path; utf8::encode $uniq;
2338
2339 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2340 if $uniq;
2341 }
2342
2343 delete $cf::MAP{$self->path};
2187 2344
2188 $self->deactivate; 2345 $self->deactivate;
2189 $_->clear_links_to ($self) for values %cf::MAP; 2346 $_->clear_links_to ($self) for values %cf::MAP;
2190 $self->clear; 2347 $self->clear;
2191}
2192
2193sub reset_at {
2194 my ($self) = @_;
2195
2196 # TODO: safety, remove and allow resettable per-player maps
2197 return 1e99 if $self->{deny_reset};
2198
2199 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2200 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2201
2202 $time + $to
2203}
2204
2205sub should_reset {
2206 my ($self) = @_;
2207
2208 $self->reset_at <= $cf::RUNTIME
2209}
2210
2211sub reset {
2212 my ($self) = @_;
2213
2214 my $lock = cf::lock_acquire "map_data:$self->{path}";
2215
2216 return if $self->players;
2217
2218 warn "resetting map ", $self->path;
2219
2220 $self->in_memory (cf::MAP_SWAPPED);
2221
2222 # need to save uniques path
2223 unless ($self->{deny_save}) {
2224 my $uniq = $self->uniq_path; utf8::encode $uniq;
2225
2226 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2227 if $uniq;
2228 }
2229
2230 delete $cf::MAP{$self->path};
2231
2232 $self->deactivate;
2233 $_->clear_links_to ($self) for values %cf::MAP;
2234 $self->clear;
2235 2348
2236 $self->unlink_save; 2349 $self->unlink_save;
2237 $self->destroy; 2350 $self->destroy;
2238} 2351}
2239 2352
2247 2360
2248 delete $cf::MAP{$self->path}; 2361 delete $cf::MAP{$self->path};
2249 2362
2250 $self->unlink_save; 2363 $self->unlink_save;
2251 2364
2252 bless $self, "cf::map"; 2365 bless $self, "cf::map::wrap";
2253 delete $self->{deny_reset}; 2366 delete $self->{deny_reset};
2254 $self->{deny_save} = 1; 2367 $self->{deny_save} = 1;
2255 $self->reset_timeout (1); 2368 $self->reset_timeout (1);
2256 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2369 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2257 2370
2314 : normalise $_ 2427 : normalise $_
2315 } @{ aio_readdir $UNIQUEDIR or [] } 2428 } @{ aio_readdir $UNIQUEDIR or [] }
2316 ] 2429 ]
2317} 2430}
2318 2431
2432=item cf::map::static_maps
2433
2434Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2435file in the shared directory excluding F</styles> and F</editor>). May
2436block.
2437
2438=cut
2439
2440sub static_maps() {
2441 my @dirs = "";
2442 my @maps;
2443
2444 while (@dirs) {
2445 my $dir = shift @dirs;
2446
2447 next if $dir eq "/styles" || $dir eq "/editor";
2448
2449 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2450 or return;
2451
2452 for (@$files) {
2453 s/\.map$// or next;
2454 utf8::decode $_;
2455 push @maps, "$dir/$_";
2456 }
2457
2458 push @dirs, map "$dir/$_", @$dirs;
2459 }
2460
2461 \@maps
2462}
2463
2319=back 2464=back
2320 2465
2321=head3 cf::object 2466=head3 cf::object
2322 2467
2323=cut 2468=cut
2455 2600
2456Freezes the player and moves him/her to a special map (C<{link}>). 2601Freezes the player and moves him/her to a special map (C<{link}>).
2457 2602
2458The player should be reasonably safe there for short amounts of time (e.g. 2603The player should be reasonably safe there for short amounts of time (e.g.
2459for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2604for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2460though, as the palyer cannot control the character while it is on the link 2605though, as the player cannot control the character while it is on the link
2461map. 2606map.
2462 2607
2463Will never block. 2608Will never block.
2464 2609
2465=item $player_object->leave_link ($map, $x, $y) 2610=item $player_object->leave_link ($map, $x, $y)
2486sub cf::object::player::enter_link { 2631sub cf::object::player::enter_link {
2487 my ($self) = @_; 2632 my ($self) = @_;
2488 2633
2489 $self->deactivate_recursive; 2634 $self->deactivate_recursive;
2490 2635
2636 ++$self->{_link_recursion};
2637
2491 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2638 return if UNIVERSAL::isa $self->map, "ext::map_link";
2492 2639
2493 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2640 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2494 if $self->map && $self->map->{path} ne "{link}"; 2641 if $self->map && $self->map->{path} ne "{link}";
2495 2642
2496 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2643 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2497} 2644}
2498 2645
2499sub cf::object::player::leave_link { 2646sub cf::object::player::leave_link {
2500 my ($self, $map, $x, $y) = @_; 2647 my ($self, $map, $x, $y) = @_;
2501 2648
2518 ($x, $y) = (-1, -1) 2665 ($x, $y) = (-1, -1)
2519 unless (defined $x) && (defined $y); 2666 unless (defined $x) && (defined $y);
2520 2667
2521 # use -1 or undef as default coordinates, not 0, 0 2668 # use -1 or undef as default coordinates, not 0, 0
2522 ($x, $y) = ($map->enter_x, $map->enter_y) 2669 ($x, $y) = ($map->enter_x, $map->enter_y)
2523 if $x <=0 && $y <= 0; 2670 if $x <= 0 && $y <= 0;
2524 2671
2525 $map->load; 2672 $map->load;
2526 $map->load_neighbours; 2673 $map->load_neighbours;
2527 2674
2528 return unless $self->contr->active; 2675 return unless $self->contr->active;
2529 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2530 $self->activate_recursive;
2531 2676
2532 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2677 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2533 $self->enter_map ($map, $x, $y); 2678 if ($self->enter_map ($map, $x, $y)) {
2534} 2679 # entering was successful
2680 delete $self->{_link_recursion};
2681 # only activate afterwards, to support waiting in hooks
2682 $self->activate_recursive;
2683 }
2535 2684
2685}
2686
2536=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2687=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2537 2688
2538Moves the player to the given map-path and coordinates by first freezing 2689Moves the player to the given map-path and coordinates by first freezing
2539her, loading and preparing them map, calling the provided $check callback 2690her, loading and preparing them map, calling the provided $check callback
2540that has to return the map if sucecssful, and then unfreezes the player on 2691that has to return the map if sucecssful, and then unfreezes the player on
2541the new (success) or old (failed) map position. In either case, $done will 2692the new (success) or old (failed) map position. In either case, $done will
2548 2699
2549our $GOTOGEN; 2700our $GOTOGEN;
2550 2701
2551sub cf::object::player::goto { 2702sub cf::object::player::goto {
2552 my ($self, $path, $x, $y, $check, $done) = @_; 2703 my ($self, $path, $x, $y, $check, $done) = @_;
2704
2705 if ($self->{_link_recursion} >= $MAX_LINKS) {
2706 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2707 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2708 ($path, $x, $y) = @$EMERGENCY_POSITION;
2709 }
2553 2710
2554 # do generation counting so two concurrent goto's will be executed in-order 2711 # do generation counting so two concurrent goto's will be executed in-order
2555 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2712 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2556 2713
2557 $self->enter_link; 2714 $self->enter_link;
2581 my $map = eval { 2738 my $map = eval {
2582 my $map = defined $path ? cf::map::find $path : undef; 2739 my $map = defined $path ? cf::map::find $path : undef;
2583 2740
2584 if ($map) { 2741 if ($map) {
2585 $map = $map->customise_for ($self); 2742 $map = $map->customise_for ($self);
2586 $map = $check->($map) if $check && $map; 2743 $map = $check->($map, $x, $y, $self) if $check && $map;
2587 } else { 2744 } else {
2588 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2745 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2589 } 2746 }
2590 2747
2591 $map 2748 $map
2599 if ($gen == $self->{_goto_generation}) { 2756 if ($gen == $self->{_goto_generation}) {
2600 delete $self->{_goto_generation}; 2757 delete $self->{_goto_generation};
2601 $self->leave_link ($map, $x, $y); 2758 $self->leave_link ($map, $x, $y);
2602 } 2759 }
2603 2760
2604 $done->() if $done; 2761 $done->($self) if $done;
2605 })->prio (1); 2762 })->prio (1);
2606} 2763}
2607 2764
2608=item $player_object->enter_exit ($exit_object) 2765=item $player_object->enter_exit ($exit_object)
2609 2766
2702 $self->message ("Something went wrong deep within the deliantra server. " 2859 $self->message ("Something went wrong deep within the deliantra server. "
2703 . "I'll try to bring you back to the map you were before. " 2860 . "I'll try to bring you back to the map you were before. "
2704 . "Please report this to the dungeon master!", 2861 . "Please report this to the dungeon master!",
2705 cf::NDI_UNIQUE | cf::NDI_RED); 2862 cf::NDI_UNIQUE | cf::NDI_RED);
2706 2863
2707 warn "ERROR in enter_exit: $@"; 2864 error "ERROR in enter_exit: $@";
2708 $self->leave_link; 2865 $self->leave_link;
2709 } 2866 }
2710 })->prio (1); 2867 })->prio (1);
2711} 2868}
2712 2869
2724sub cf::client::send_drawinfo { 2881sub cf::client::send_drawinfo {
2725 my ($self, $text, $flags) = @_; 2882 my ($self, $text, $flags) = @_;
2726 2883
2727 utf8::encode $text; 2884 utf8::encode $text;
2728 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2885 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2886}
2887
2888=item $client->send_big_packet ($pkt)
2889
2890Like C<send_packet>, but tries to compress large packets, and fragments
2891them as required.
2892
2893=cut
2894
2895our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2896
2897sub cf::client::send_big_packet {
2898 my ($self, $pkt) = @_;
2899
2900 # try lzf for large packets
2901 $pkt = "lzf " . Compress::LZF::compress $pkt
2902 if 1024 <= length $pkt and $self->{can_lzf};
2903
2904 # split very large packets
2905 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2906 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2907 $pkt = "frag";
2908 }
2909
2910 $self->send_packet ($pkt);
2729} 2911}
2730 2912
2731=item $client->send_msg ($channel, $msg, $color, [extra...]) 2913=item $client->send_msg ($channel, $msg, $color, [extra...])
2732 2914
2733Send a drawinfo or msg packet to the client, formatting the msg for the 2915Send a drawinfo or msg packet to the client, formatting the msg for the
2737 2919
2738=cut 2920=cut
2739 2921
2740# non-persistent channels (usually the info channel) 2922# non-persistent channels (usually the info channel)
2741our %CHANNEL = ( 2923our %CHANNEL = (
2924 "c/motd" => {
2925 id => "infobox",
2926 title => "MOTD",
2927 reply => undef,
2928 tooltip => "The message of the day",
2929 },
2742 "c/identify" => { 2930 "c/identify" => {
2743 id => "infobox", 2931 id => "infobox",
2744 title => "Identify", 2932 title => "Identify",
2745 reply => undef, 2933 reply => undef,
2746 tooltip => "Items recently identified", 2934 tooltip => "Items recently identified",
2748 "c/examine" => { 2936 "c/examine" => {
2749 id => "infobox", 2937 id => "infobox",
2750 title => "Examine", 2938 title => "Examine",
2751 reply => undef, 2939 reply => undef,
2752 tooltip => "Signs and other items you examined", 2940 tooltip => "Signs and other items you examined",
2941 },
2942 "c/shopinfo" => {
2943 id => "infobox",
2944 title => "Shop Info",
2945 reply => undef,
2946 tooltip => "What your bargaining skill tells you about the shop",
2753 }, 2947 },
2754 "c/book" => { 2948 "c/book" => {
2755 id => "infobox", 2949 id => "infobox",
2756 title => "Book", 2950 title => "Book",
2757 reply => undef, 2951 reply => undef,
2785 id => "infobox", 2979 id => "infobox",
2786 title => "Skills", 2980 title => "Skills",
2787 reply => undef, 2981 reply => undef,
2788 tooltip => "Shows your experience per skill and item power", 2982 tooltip => "Shows your experience per skill and item power",
2789 }, 2983 },
2984 "c/shopitems" => {
2985 id => "infobox",
2986 title => "Shop Items",
2987 reply => undef,
2988 tooltip => "Shows the items currently for sale in this shop",
2989 },
2790 "c/resistances" => { 2990 "c/resistances" => {
2791 id => "infobox", 2991 id => "infobox",
2792 title => "Resistances", 2992 title => "Resistances",
2793 reply => undef, 2993 reply => undef,
2794 tooltip => "Shows your resistances", 2994 tooltip => "Shows your resistances",
2796 "c/pets" => { 2996 "c/pets" => {
2797 id => "infobox", 2997 id => "infobox",
2798 title => "Pets", 2998 title => "Pets",
2799 reply => undef, 2999 reply => undef,
2800 tooltip => "Shows information abotu your pets/a specific pet", 3000 tooltip => "Shows information abotu your pets/a specific pet",
3001 },
3002 "c/perceiveself" => {
3003 id => "infobox",
3004 title => "Perceive Self",
3005 reply => undef,
3006 tooltip => "You gained detailed knowledge about yourself",
2801 }, 3007 },
2802 "c/uptime" => { 3008 "c/uptime" => {
2803 id => "infobox", 3009 id => "infobox",
2804 title => "Uptime", 3010 title => "Uptime",
2805 reply => undef, 3011 reply => undef,
2861 my $pkt = "msg " 3067 my $pkt = "msg "
2862 . $self->{json_coder}->encode ( 3068 . $self->{json_coder}->encode (
2863 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3069 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2864 ); 3070 );
2865 3071
2866 # try lzf for large packets
2867 $pkt = "lzf " . Compress::LZF::compress $pkt
2868 if 1024 <= length $pkt and $self->{can_lzf};
2869
2870 # split very large packets
2871 if (8192 < length $pkt and $self->{can_lzf}) {
2872 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2873 $pkt = "frag";
2874 }
2875
2876 $self->send_packet ($pkt); 3072 $self->send_big_packet ($pkt);
2877} 3073}
2878 3074
2879=item $client->ext_msg ($type, @msg) 3075=item $client->ext_msg ($type, @msg)
2880 3076
2881Sends an ext event to the client. 3077Sends an ext event to the client.
2884 3080
2885sub cf::client::ext_msg($$@) { 3081sub cf::client::ext_msg($$@) {
2886 my ($self, $type, @msg) = @_; 3082 my ($self, $type, @msg) = @_;
2887 3083
2888 if ($self->extcmd == 2) { 3084 if ($self->extcmd == 2) {
2889 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3085 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2890 } elsif ($self->extcmd == 1) { # TODO: remove 3086 } elsif ($self->extcmd == 1) { # TODO: remove
2891 push @msg, msgtype => "event_$type"; 3087 push @msg, msgtype => "event_$type";
2892 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3088 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2893 } 3089 }
2894} 3090}
2895 3091
2896=item $client->ext_reply ($msgid, @msg) 3092=item $client->ext_reply ($msgid, @msg)
2897 3093
2901 3097
2902sub cf::client::ext_reply($$@) { 3098sub cf::client::ext_reply($$@) {
2903 my ($self, $id, @msg) = @_; 3099 my ($self, $id, @msg) = @_;
2904 3100
2905 if ($self->extcmd == 2) { 3101 if ($self->extcmd == 2) {
2906 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3102 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2907 } elsif ($self->extcmd == 1) { 3103 } elsif ($self->extcmd == 1) {
2908 #TODO: version 1, remove 3104 #TODO: version 1, remove
2909 unshift @msg, msgtype => "reply", msgid => $id; 3105 unshift @msg, msgtype => "reply", msgid => $id;
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3106 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 } 3107 }
2912} 3108}
2913 3109
2914=item $success = $client->query ($flags, "text", \&cb) 3110=item $success = $client->query ($flags, "text", \&cb)
2915 3111
2986 3182
2987 $ns->ext_reply ($reply, @reply) 3183 $ns->ext_reply ($reply, @reply)
2988 if $reply; 3184 if $reply;
2989 3185
2990 } else { 3186 } else {
2991 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3187 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2992 } 3188 }
2993 3189
2994 cf::override; 3190 cf::override;
2995 }, 3191 },
2996); 3192);
3016 3212
3017 $coro 3213 $coro
3018} 3214}
3019 3215
3020cf::client->attach ( 3216cf::client->attach (
3021 on_destroy => sub { 3217 on_client_destroy => sub {
3022 my ($ns) = @_; 3218 my ($ns) = @_;
3023 3219
3024 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3220 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3025 }, 3221 },
3026); 3222);
3042our $safe_hole = new Safe::Hole; 3238our $safe_hole = new Safe::Hole;
3043 3239
3044$SIG{FPE} = 'IGNORE'; 3240$SIG{FPE} = 'IGNORE';
3045 3241
3046$safe->permit_only (Opcode::opset qw( 3242$safe->permit_only (Opcode::opset qw(
3047 :base_core :base_mem :base_orig :base_math 3243 :base_core :base_mem :base_orig :base_math :base_loop
3048 grepstart grepwhile mapstart mapwhile 3244 grepstart grepwhile mapstart mapwhile
3049 sort time 3245 sort time
3050)); 3246));
3051 3247
3052# here we export the classes and methods available to script code 3248# here we export the classes and methods available to script code
3104 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3300 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3105 $qcode =~ s/\n/\\n/g; 3301 $qcode =~ s/\n/\\n/g;
3106 3302
3107 %vars = (_dummy => 0) unless %vars; 3303 %vars = (_dummy => 0) unless %vars;
3108 3304
3305 my @res;
3109 local $_; 3306 local $_;
3110 local @safe::cf::_safe_eval_args = values %vars;
3111 3307
3112 my $eval = 3308 my $eval =
3113 "do {\n" 3309 "do {\n"
3114 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3310 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3115 . "#line 0 \"{$qcode}\"\n" 3311 . "#line 0 \"{$qcode}\"\n"
3116 . $code 3312 . $code
3117 . "\n}" 3313 . "\n}"
3118 ; 3314 ;
3119 3315
3316 if ($CFG{safe_eval}) {
3120 sub_generation_inc; 3317 sub_generation_inc;
3318 local @safe::cf::_safe_eval_args = values %vars;
3121 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3319 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3122 sub_generation_inc; 3320 sub_generation_inc;
3321 } else {
3322 local @cf::_safe_eval_args = values %vars;
3323 @res = wantarray ? eval eval : scalar eval $eval;
3324 }
3123 3325
3124 if ($@) { 3326 if ($@) {
3125 warn "$@"; 3327 warn "$@",
3126 warn "while executing safe code '$code'\n"; 3328 "while executing safe code '$code'\n",
3127 warn "with arguments " . (join " ", %vars) . "\n"; 3329 "with arguments " . (join " ", %vars) . "\n";
3128 } 3330 }
3129 3331
3130 wantarray ? @res : $res[0] 3332 wantarray ? @res : $res[0]
3131} 3333}
3132 3334
3146=cut 3348=cut
3147 3349
3148sub register_script_function { 3350sub register_script_function {
3149 my ($fun, $cb) = @_; 3351 my ($fun, $cb) = @_;
3150 3352
3151 no strict 'refs'; 3353 $fun = "safe::$fun" if $CFG{safe_eval};
3152 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3354 *$fun = $safe_hole->wrap ($cb);
3153} 3355}
3154 3356
3155=back 3357=back
3156 3358
3157=cut 3359=cut
3166 # for this (global event?) 3368 # for this (global event?)
3167 %ext::player_env::MUSIC_FACE_CACHE = (); 3369 %ext::player_env::MUSIC_FACE_CACHE = ();
3168 3370
3169 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3371 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3170 3372
3171 warn "loading facedata from $path\n"; 3373 trace "loading facedata from $path\n";
3172 3374
3173 my $facedata; 3375 my $facedata;
3174 0 < aio_load $path, $facedata 3376 0 < aio_load $path, $facedata
3175 or die "$path: $!"; 3377 or die "$path: $!";
3176 3378
3178 3380
3179 $facedata->{version} == 2 3381 $facedata->{version} == 2
3180 or cf::cleanup "$path: version mismatch, cannot proceed."; 3382 or cf::cleanup "$path: version mismatch, cannot proceed.";
3181 3383
3182 # patch in the exptable 3384 # patch in the exptable
3385 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3183 $facedata->{resource}{"res/exp_table"} = { 3386 $facedata->{resource}{"res/exp_table"} = {
3184 type => FT_RSRC, 3387 type => FT_RSRC,
3185 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3388 data => $exp_table,
3389 hash => (Digest::MD5::md5 $exp_table),
3186 }; 3390 };
3187 cf::cede_to_tick; 3391 cf::cede_to_tick;
3188 3392
3189 { 3393 {
3190 my $faces = $facedata->{faceinfo}; 3394 my $faces = $facedata->{faceinfo};
3192 while (my ($face, $info) = each %$faces) { 3396 while (my ($face, $info) = each %$faces) {
3193 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3397 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3194 3398
3195 cf::face::set_visibility $idx, $info->{visibility}; 3399 cf::face::set_visibility $idx, $info->{visibility};
3196 cf::face::set_magicmap $idx, $info->{magicmap}; 3400 cf::face::set_magicmap $idx, $info->{magicmap};
3197 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3401 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3198 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3402 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3199 3403
3200 cf::cede_to_tick; 3404 cf::cede_to_tick;
3201 } 3405 }
3202 3406
3203 while (my ($face, $info) = each %$faces) { 3407 while (my ($face, $info) = each %$faces) {
3208 3412
3209 if (my $smooth = cf::face::find $info->{smooth}) { 3413 if (my $smooth = cf::face::find $info->{smooth}) {
3210 cf::face::set_smooth $idx, $smooth; 3414 cf::face::set_smooth $idx, $smooth;
3211 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3415 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3212 } else { 3416 } else {
3213 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3417 error "smooth face '$info->{smooth}' not found for face '$face'";
3214 } 3418 }
3215 3419
3216 cf::cede_to_tick; 3420 cf::cede_to_tick;
3217 } 3421 }
3218 } 3422 }
3227 3431
3228 cf::anim::invalidate_all; # d'oh 3432 cf::anim::invalidate_all; # d'oh
3229 } 3433 }
3230 3434
3231 { 3435 {
3232 # TODO: for gcfclient pleasure, we should give resources
3233 # that gcfclient doesn't grok a >10000 face index.
3234 my $res = $facedata->{resource}; 3436 my $res = $facedata->{resource};
3235 3437
3236 while (my ($name, $info) = each %$res) { 3438 while (my ($name, $info) = each %$res) {
3237 if (defined $info->{type}) { 3439 if (defined $info->{type}) {
3238 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3440 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3239 my $data;
3240 3441
3241 if ($info->{type} & 1) { 3442 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3242 # prepend meta info
3243
3244 my $meta = $enc->encode ({
3245 name => $name,
3246 %{ $info->{meta} || {} },
3247 });
3248
3249 $data = pack "(w/a*)*", $meta, $info->{data};
3250 } else {
3251 $data = $info->{data};
3252 }
3253
3254 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3255 cf::face::set_type $idx, $info->{type}; 3443 cf::face::set_type $idx, $info->{type};
3256 } else { 3444 } else {
3257 $RESOURCE{$name} = $info; 3445 $RESOURCE{$name} = $info; # unused
3258 } 3446 }
3259 3447
3260 cf::cede_to_tick; 3448 cf::cede_to_tick;
3261 } 3449 }
3262 } 3450 }
3263 3451
3264 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3452 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3265 3453
3266 1 3454 1
3267} 3455}
3268
3269cf::global->attach (on_resource_update => sub {
3270 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3271 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3272
3273 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3274 my $sound = $soundconf->{compat}[$_]
3275 or next;
3276
3277 my $face = cf::face::find "sound/$sound->[1]";
3278 cf::sound::set $sound->[0] => $face;
3279 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3280 }
3281
3282 while (my ($k, $v) = each %{$soundconf->{event}}) {
3283 my $face = cf::face::find "sound/$v";
3284 cf::sound::set $k => $face;
3285 }
3286 }
3287});
3288 3456
3289register_exticmd fx_want => sub { 3457register_exticmd fx_want => sub {
3290 my ($ns, $want) = @_; 3458 my ($ns, $want) = @_;
3291 3459
3292 while (my ($k, $v) = each %$want) { 3460 while (my ($k, $v) = each %$want) {
3331sub reload_treasures { 3499sub reload_treasures {
3332 load_resource_file "$DATADIR/treasures" 3500 load_resource_file "$DATADIR/treasures"
3333 or die "unable to load treasurelists\n"; 3501 or die "unable to load treasurelists\n";
3334} 3502}
3335 3503
3504sub reload_sound {
3505 trace "loading sound config from $DATADIR/sound\n";
3506
3507 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3508 or die "$DATADIR/sound $!";
3509
3510 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3511
3512 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3513 my $sound = $soundconf->{compat}[$_]
3514 or next;
3515
3516 my $face = cf::face::find "sound/$sound->[1]";
3517 cf::sound::set $sound->[0] => $face;
3518 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3519 }
3520
3521 while (my ($k, $v) = each %{$soundconf->{event}}) {
3522 my $face = cf::face::find "sound/$v";
3523 cf::sound::set $k => $face;
3524 }
3525}
3526
3336sub reload_resources { 3527sub reload_resources {
3337 warn "reloading resource files...\n"; 3528 trace "reloading resource files...\n";
3338 3529
3339 reload_facedata; 3530 reload_facedata;
3531 reload_sound;
3340 reload_archetypes; 3532 reload_archetypes;
3341 reload_regions; 3533 reload_regions;
3342 reload_treasures; 3534 reload_treasures;
3343 3535
3344 warn "finished reloading resource files\n"; 3536 trace "finished reloading resource files\n";
3345} 3537}
3346 3538
3347sub reload_config { 3539sub reload_config {
3540 trace "reloading config file...\n";
3541
3348 open my $fh, "<:utf8", "$CONFDIR/config" 3542 open my $fh, "<:utf8", "$CONFDIR/config"
3349 or return; 3543 or return;
3350 3544
3351 local $/; 3545 local $/;
3352 *CFG = YAML::Load <$fh>; 3546 *CFG = YAML::XS::Load scalar <$fh>;
3353 3547
3354 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3548 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3355 3549
3356 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3550 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3357 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3551 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3358 3552
3359 if (exists $CFG{mlockall}) { 3553 if (exists $CFG{mlockall}) {
3361 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3555 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3362 and die "WARNING: m(un)lockall failed: $!\n"; 3556 and die "WARNING: m(un)lockall failed: $!\n";
3363 }; 3557 };
3364 warn $@ if $@; 3558 warn $@ if $@;
3365 } 3559 }
3560
3561 trace "finished reloading resource files\n";
3366} 3562}
3367 3563
3368sub pidfile() { 3564sub pidfile() {
3369 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3565 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3370 or die "$PIDFILE: $!"; 3566 or die "$PIDFILE: $!";
3382 3578
3383 seek $fh, 0, 0; 3579 seek $fh, 0, 0;
3384 print $fh $$; 3580 print $fh $$;
3385} 3581}
3386 3582
3583sub main_loop {
3584 trace "EV::loop starting\n";
3585 if (1) {
3586 EV::loop;
3587 }
3588 trace "EV::loop returned\n";
3589 goto &main_loop unless $REALLY_UNLOOP;
3590}
3591
3387sub main { 3592sub main {
3388 cf::init_globals; # initialise logging 3593 cf::init_globals; # initialise logging
3389 3594
3390 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3595 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3391 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3596 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3392 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3597 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3393 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3598 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3394
3395 cf::init_experience;
3396 cf::init_anim;
3397 cf::init_attackmess;
3398 cf::init_dynamic;
3399 3599
3400 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3600 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3401 3601
3402 # we must not ever block the main coroutine 3602 # we must not ever block the main coroutine
3403 local $Coro::idle = sub { 3603 local $Coro::idle = sub {
3409 }; 3609 };
3410 3610
3411 evthread_start IO::AIO::poll_fileno; 3611 evthread_start IO::AIO::poll_fileno;
3412 3612
3413 cf::sync_job { 3613 cf::sync_job {
3614 cf::init_experience;
3615 cf::init_anim;
3616 cf::init_attackmess;
3617 cf::init_dynamic;
3618
3619 cf::load_settings;
3620 cf::load_materials;
3621
3414 reload_resources; 3622 reload_resources;
3415 reload_config; 3623 reload_config;
3416 db_init; 3624 db_init;
3417 3625
3418 cf::load_settings;
3419 cf::load_materials;
3420 cf::init_uuid; 3626 cf::init_uuid;
3421 cf::init_signals; 3627 cf::init_signals;
3422 cf::init_commands;
3423 cf::init_skills; 3628 cf::init_skills;
3424 3629
3425 cf::init_beforeplay; 3630 cf::init_beforeplay;
3426 3631
3427 atomic; 3632 atomic;
3429 load_extensions; 3634 load_extensions;
3430 3635
3431 utime time, time, $RUNTIMEFILE; 3636 utime time, time, $RUNTIMEFILE;
3432 3637
3433 # no (long-running) fork's whatsoever before this point(!) 3638 # no (long-running) fork's whatsoever before this point(!)
3639 use POSIX ();
3434 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3640 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3435 3641
3436 (pop @POST_INIT)->(0) while @POST_INIT; 3642 (pop @POST_INIT)->(0) while @POST_INIT;
3437 }; 3643 };
3438 3644
3439 EV::loop; 3645 cf::object::thawer::errors_are_fatal 0;
3646 info "parse errors in files are no longer fatal from this point on.\n";
3647
3648 main_loop;
3440} 3649}
3441 3650
3442############################################################################# 3651#############################################################################
3443# initialisation and cleanup 3652# initialisation and cleanup
3444 3653
3445# install some emergency cleanup handlers 3654# install some emergency cleanup handlers
3446BEGIN { 3655BEGIN {
3447 our %SIGWATCHER = (); 3656 our %SIGWATCHER = ();
3448 for my $signal (qw(INT HUP TERM)) { 3657 for my $signal (qw(INT HUP TERM)) {
3449 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3658 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3450 cf::cleanup "SIG$signal"; 3659 cf::cleanup "SIG$signal";
3451 }; 3660 };
3452 } 3661 }
3453} 3662}
3454 3663
3455sub write_runtime_sync { 3664sub write_runtime_sync {
3665 my $t0 = AE::time;
3666
3456 # first touch the runtime file to show we are still running: 3667 # first touch the runtime file to show we are still running:
3457 # the fsync below can take a very very long time. 3668 # the fsync below can take a very very long time.
3458 3669
3459 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3670 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3460 3671
3461 my $guard = cf::lock_acquire "write_runtime"; 3672 my $guard = cf::lock_acquire "write_runtime";
3462 3673
3463 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3674 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3464 or return; 3675 or return;
3465 3676
3466 my $value = $cf::RUNTIME + 90 + 10; 3677 my $value = $cf::RUNTIME + 90 + 10;
3467 # 10 is the runtime save interval, for a monotonic clock 3678 # 10 is the runtime save interval, for a monotonic clock
3468 # 60 allows for the watchdog to kill the server. 3679 # 60 allows for the watchdog to kill the server.
3481 or return; 3692 or return;
3482 3693
3483 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3694 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3484 and return; 3695 and return;
3485 3696
3486 warn "runtime file written.\n"; 3697 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3487 3698
3488 1 3699 1
3489} 3700}
3490 3701
3491our $uuid_lock; 3702our $uuid_lock;
3503 or return; 3714 or return;
3504 3715
3505 my $value = uuid_seq uuid_cur; 3716 my $value = uuid_seq uuid_cur;
3506 3717
3507 unless ($value) { 3718 unless ($value) {
3508 warn "cowardly refusing to write zero uuid value!\n"; 3719 info "cowardly refusing to write zero uuid value!\n";
3509 return; 3720 return;
3510 } 3721 }
3511 3722
3512 my $value = uuid_str $value + $uuid_skip; 3723 my $value = uuid_str $value + $uuid_skip;
3513 $uuid_skip = 0; 3724 $uuid_skip = 0;
3523 or return; 3734 or return;
3524 3735
3525 aio_rename "$uuid~", $uuid 3736 aio_rename "$uuid~", $uuid
3526 and return; 3737 and return;
3527 3738
3528 warn "uuid file written ($value).\n"; 3739 trace "uuid file written ($value).\n";
3529 3740
3530 1 3741 1
3531 3742
3532} 3743}
3533 3744
3539} 3750}
3540 3751
3541sub emergency_save() { 3752sub emergency_save() {
3542 my $freeze_guard = cf::freeze_mainloop; 3753 my $freeze_guard = cf::freeze_mainloop;
3543 3754
3544 warn "emergency_perl_save: enter\n"; 3755 info "emergency_perl_save: enter\n";
3756
3757 # this is a trade-off: we want to be very quick here, so
3758 # save all maps without fsync, and later call a global sync
3759 # (which in turn might be very very slow)
3760 local $USE_FSYNC = 0;
3545 3761
3546 cf::sync_job { 3762 cf::sync_job {
3547 # this is a trade-off: we want to be very quick here, so 3763 cf::write_runtime_sync; # external watchdog should not bark
3548 # save all maps without fsync, and later call a global sync
3549 # (which in turn might be very very slow)
3550 local $USE_FSYNC = 0;
3551 3764
3552 # use a peculiar iteration method to avoid tripping on perl 3765 # use a peculiar iteration method to avoid tripping on perl
3553 # refcount bugs in for. also avoids problems with players 3766 # refcount bugs in for. also avoids problems with players
3554 # and maps saved/destroyed asynchronously. 3767 # and maps saved/destroyed asynchronously.
3555 warn "emergency_perl_save: begin player save\n"; 3768 info "emergency_perl_save: begin player save\n";
3556 for my $login (keys %cf::PLAYER) { 3769 for my $login (keys %cf::PLAYER) {
3557 my $pl = $cf::PLAYER{$login} or next; 3770 my $pl = $cf::PLAYER{$login} or next;
3558 $pl->valid or next; 3771 $pl->valid or next;
3559 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3772 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3560 $pl->save; 3773 $pl->save;
3561 } 3774 }
3562 warn "emergency_perl_save: end player save\n"; 3775 info "emergency_perl_save: end player save\n";
3563 3776
3777 cf::write_runtime_sync; # external watchdog should not bark
3778
3564 warn "emergency_perl_save: begin map save\n"; 3779 info "emergency_perl_save: begin map save\n";
3565 for my $path (keys %cf::MAP) { 3780 for my $path (keys %cf::MAP) {
3566 my $map = $cf::MAP{$path} or next; 3781 my $map = $cf::MAP{$path} or next;
3567 $map->valid or next; 3782 $map->valid or next;
3568 $map->save; 3783 $map->save;
3569 } 3784 }
3570 warn "emergency_perl_save: end map save\n"; 3785 info "emergency_perl_save: end map save\n";
3571 3786
3787 cf::write_runtime_sync; # external watchdog should not bark
3788
3572 warn "emergency_perl_save: begin database checkpoint\n"; 3789 info "emergency_perl_save: begin database checkpoint\n";
3573 BDB::db_env_txn_checkpoint $DB_ENV; 3790 BDB::db_env_txn_checkpoint $DB_ENV;
3574 warn "emergency_perl_save: end database checkpoint\n"; 3791 info "emergency_perl_save: end database checkpoint\n";
3575 3792
3576 warn "emergency_perl_save: begin write uuid\n"; 3793 info "emergency_perl_save: begin write uuid\n";
3577 write_uuid_sync 1; 3794 write_uuid_sync 1;
3578 warn "emergency_perl_save: end write uuid\n"; 3795 info "emergency_perl_save: end write uuid\n";
3796
3797 cf::write_runtime_sync; # external watchdog should not bark
3798
3799 trace "emergency_perl_save: syncing database to disk";
3800 BDB::db_env_txn_checkpoint $DB_ENV;
3801
3802 info "emergency_perl_save: starting sync\n";
3803 IO::AIO::aio_sync sub {
3804 info "emergency_perl_save: finished sync\n";
3805 };
3806
3807 cf::write_runtime_sync; # external watchdog should not bark
3808
3809 trace "emergency_perl_save: flushing outstanding aio requests";
3810 while (IO::AIO::nreqs || BDB::nreqs) {
3811 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3812 }
3813
3814 cf::write_runtime_sync; # external watchdog should not bark
3579 }; 3815 };
3580 3816
3581 warn "emergency_perl_save: starting sync()\n";
3582 IO::AIO::aio_sync sub {
3583 warn "emergency_perl_save: finished sync()\n";
3584 };
3585
3586 warn "emergency_perl_save: leave\n"; 3817 info "emergency_perl_save: leave\n";
3587} 3818}
3588 3819
3589sub post_cleanup { 3820sub post_cleanup {
3590 my ($make_core) = @_; 3821 my ($make_core) = @_;
3591 3822
3823 IO::AIO::flush;
3824
3825 IO::AIO::flush;
3826
3592 warn Carp::longmess "post_cleanup backtrace" 3827 error Carp::longmess "post_cleanup backtrace"
3593 if $make_core; 3828 if $make_core;
3594 3829
3595 my $fh = pidfile; 3830 my $fh = pidfile;
3596 unlink $PIDFILE if <$fh> == $$; 3831 unlink $PIDFILE if <$fh> == $$;
3597} 3832}
3617 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3852 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3618 for my $name (keys %$leaf_symtab) { 3853 for my $name (keys %$leaf_symtab) {
3619 _gv_clear *{"$pkg$name"}; 3854 _gv_clear *{"$pkg$name"};
3620# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3855# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3621 } 3856 }
3622 warn "cleared package $pkg\n";#d#
3623} 3857}
3624 3858
3625sub do_reload_perl() { 3859sub do_reload_perl() {
3626 # can/must only be called in main 3860 # can/must only be called in main
3627 if ($Coro::current != $Coro::main) { 3861 if (in_main) {
3628 warn "can only reload from main coroutine"; 3862 error "can only reload from main coroutine";
3629 return; 3863 return;
3630 } 3864 }
3631 3865
3632 return if $RELOAD++; 3866 return if $RELOAD++;
3633 3867
3634 my $t1 = EV::time; 3868 my $t1 = AE::time;
3635 3869
3636 while ($RELOAD) { 3870 while ($RELOAD) {
3637 warn "reloading..."; 3871 info "reloading...";
3638 3872
3639 warn "entering sync_job"; 3873 trace "entering sync_job";
3640 3874
3641 cf::sync_job { 3875 cf::sync_job {
3642 cf::write_runtime_sync; # external watchdog should not bark
3643 cf::emergency_save; 3876 cf::emergency_save;
3644 cf::write_runtime_sync; # external watchdog should not bark
3645 3877
3646 warn "syncing database to disk";
3647 BDB::db_env_txn_checkpoint $DB_ENV;
3648
3649 # if anything goes wrong in here, we should simply crash as we already saved
3650
3651 warn "flushing outstanding aio requests";
3652 while (IO::AIO::nreqs || BDB::nreqs) {
3653 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3654 }
3655
3656 warn "cancelling all extension coros"; 3878 trace "cancelling all extension coros";
3657 $_->cancel for values %EXT_CORO; 3879 $_->cancel for values %EXT_CORO;
3658 %EXT_CORO = (); 3880 %EXT_CORO = ();
3659 3881
3660 warn "removing commands"; 3882 trace "removing commands";
3661 %COMMAND = (); 3883 %COMMAND = ();
3662 3884
3663 warn "removing ext/exti commands"; 3885 trace "removing ext/exti commands";
3664 %EXTCMD = (); 3886 %EXTCMD = ();
3665 %EXTICMD = (); 3887 %EXTICMD = ();
3666 3888
3667 warn "unloading/nuking all extensions"; 3889 trace "unloading/nuking all extensions";
3668 for my $pkg (@EXTS) { 3890 for my $pkg (@EXTS) {
3669 warn "... unloading $pkg"; 3891 trace "... unloading $pkg";
3670 3892
3671 if (my $cb = $pkg->can ("unload")) { 3893 if (my $cb = $pkg->can ("unload")) {
3672 eval { 3894 eval {
3673 $cb->($pkg); 3895 $cb->($pkg);
3674 1 3896 1
3675 } or warn "$pkg unloaded, but with errors: $@"; 3897 } or error "$pkg unloaded, but with errors: $@";
3676 } 3898 }
3677 3899
3678 warn "... clearing $pkg"; 3900 trace "... clearing $pkg";
3679 clear_package $pkg; 3901 clear_package $pkg;
3680 } 3902 }
3681 3903
3682 warn "unloading all perl modules loaded from $LIBDIR"; 3904 trace "unloading all perl modules loaded from $LIBDIR";
3683 while (my ($k, $v) = each %INC) { 3905 while (my ($k, $v) = each %INC) {
3684 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3906 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3685 3907
3686 warn "... unloading $k"; 3908 trace "... unloading $k";
3687 delete $INC{$k}; 3909 delete $INC{$k};
3688 3910
3689 $k =~ s/\.pm$//; 3911 $k =~ s/\.pm$//;
3690 $k =~ s/\//::/g; 3912 $k =~ s/\//::/g;
3691 3913
3694 } 3916 }
3695 3917
3696 clear_package $k; 3918 clear_package $k;
3697 } 3919 }
3698 3920
3699 warn "getting rid of safe::, as good as possible"; 3921 trace "getting rid of safe::, as good as possible";
3700 clear_package "safe::$_" 3922 clear_package "safe::$_"
3701 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3923 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3702 3924
3703 warn "unloading cf.pm \"a bit\""; 3925 trace "unloading cf.pm \"a bit\"";
3704 delete $INC{"cf.pm"}; 3926 delete $INC{"cf.pm"};
3705 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3927 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3706 3928
3707 # don't, removes xs symbols, too, 3929 # don't, removes xs symbols, too,
3708 # and global variables created in xs 3930 # and global variables created in xs
3709 #clear_package __PACKAGE__; 3931 #clear_package __PACKAGE__;
3710 3932
3711 warn "unload completed, starting to reload now"; 3933 info "unload completed, starting to reload now";
3712 3934
3713 warn "reloading cf.pm"; 3935 trace "reloading cf.pm";
3714 require cf; 3936 require cf;
3715 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3937 cf::_connect_to_perl_1;
3716 3938
3717 warn "loading config and database again"; 3939 trace "loading config and database again";
3718 cf::reload_config; 3940 cf::reload_config;
3719 3941
3720 warn "loading extensions"; 3942 trace "loading extensions";
3721 cf::load_extensions; 3943 cf::load_extensions;
3722 3944
3723 if ($REATTACH_ON_RELOAD) { 3945 if ($REATTACH_ON_RELOAD) {
3724 warn "reattaching attachments to objects/players"; 3946 trace "reattaching attachments to objects/players";
3725 _global_reattach; # objects, sockets 3947 _global_reattach; # objects, sockets
3726 warn "reattaching attachments to maps"; 3948 trace "reattaching attachments to maps";
3727 reattach $_ for values %MAP; 3949 reattach $_ for values %MAP;
3728 warn "reattaching attachments to players"; 3950 trace "reattaching attachments to players";
3729 reattach $_ for values %PLAYER; 3951 reattach $_ for values %PLAYER;
3730 } 3952 }
3731 3953
3732 warn "running post_init jobs"; 3954 trace "running post_init jobs";
3733 (pop @POST_INIT)->(1) while @POST_INIT; 3955 (pop @POST_INIT)->(1) while @POST_INIT;
3734 3956
3735 warn "leaving sync_job"; 3957 trace "leaving sync_job";
3736 3958
3737 1 3959 1
3738 } or do { 3960 } or do {
3739 warn $@; 3961 error $@;
3740 cf::cleanup "error while reloading, exiting."; 3962 cf::cleanup "error while reloading, exiting.";
3741 }; 3963 };
3742 3964
3743 warn "reloaded"; 3965 info "reloaded";
3744 --$RELOAD; 3966 --$RELOAD;
3745 } 3967 }
3746 3968
3747 $t1 = EV::time - $t1; 3969 $t1 = AE::time - $t1;
3748 warn "reload completed in ${t1}s\n"; 3970 info "reload completed in ${t1}s\n";
3749}; 3971};
3750 3972
3751our $RELOAD_WATCHER; # used only during reload 3973our $RELOAD_WATCHER; # used only during reload
3752 3974
3753sub reload_perl() { 3975sub reload_perl() {
3755 # coro crashes during coro_state_free->destroy here. 3977 # coro crashes during coro_state_free->destroy here.
3756 3978
3757 $RELOAD_WATCHER ||= cf::async { 3979 $RELOAD_WATCHER ||= cf::async {
3758 Coro::AIO::aio_wait cache_extensions; 3980 Coro::AIO::aio_wait cache_extensions;
3759 3981
3760 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3982 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3761 do_reload_perl; 3983 do_reload_perl;
3762 undef $RELOAD_WATCHER; 3984 undef $RELOAD_WATCHER;
3763 }; 3985 };
3764 }; 3986 };
3765} 3987}
3782 4004
3783our @WAIT_FOR_TICK; 4005our @WAIT_FOR_TICK;
3784our @WAIT_FOR_TICK_BEGIN; 4006our @WAIT_FOR_TICK_BEGIN;
3785 4007
3786sub wait_for_tick { 4008sub wait_for_tick {
3787 return if tick_inhibit || $Coro::current == $Coro::main; 4009 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3788 4010
3789 my $signal = new Coro::Signal; 4011 my $signal = new Coro::Signal;
3790 push @WAIT_FOR_TICK, $signal; 4012 push @WAIT_FOR_TICK, $signal;
3791 $signal->wait; 4013 $signal->wait;
3792} 4014}
3793 4015
3794sub wait_for_tick_begin { 4016sub wait_for_tick_begin {
3795 return if tick_inhibit || $Coro::current == $Coro::main; 4017 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3796 4018
3797 my $signal = new Coro::Signal; 4019 my $signal = new Coro::Signal;
3798 push @WAIT_FOR_TICK_BEGIN, $signal; 4020 push @WAIT_FOR_TICK_BEGIN, $signal;
3799 $signal->wait; 4021 $signal->wait;
3800} 4022}
3806 return; 4028 return;
3807 } 4029 }
3808 4030
3809 cf::server_tick; # one server iteration 4031 cf::server_tick; # one server iteration
3810 4032
4033 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4034
3811 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4035 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3812 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4036 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3813 Coro::async_pool { 4037 Coro::async_pool {
3814 $Coro::current->{desc} = "runtime saver"; 4038 $Coro::current->{desc} = "runtime saver";
3815 write_runtime_sync 4039 write_runtime_sync
3816 or warn "ERROR: unable to write runtime file: $!"; 4040 or error "ERROR: unable to write runtime file: $!";
3817 }; 4041 };
3818 } 4042 }
3819 4043
3820 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4044 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3821 $sig->send; 4045 $sig->send;
3829 4053
3830 if (0) { 4054 if (0) {
3831 if ($NEXT_TICK) { 4055 if ($NEXT_TICK) {
3832 my $jitter = $TICK_START - $NEXT_TICK; 4056 my $jitter = $TICK_START - $NEXT_TICK;
3833 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4057 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3834 warn "jitter $JITTER\n";#d# 4058 debug "jitter $JITTER\n";#d#
3835 } 4059 }
3836 } 4060 }
3837} 4061}
3838 4062
3839{ 4063{
3840 # configure BDB 4064 # configure BDB
3841 4065
3842 BDB::min_parallel 8; 4066 BDB::min_parallel 16;
3843 BDB::max_poll_reqs $TICK * 0.1; 4067 BDB::max_poll_reqs $TICK * 0.1;
3844 $AnyEvent::BDB::WATCHER->priority (1); 4068 $AnyEvent::BDB::WATCHER->priority (1);
3845 4069
3846 unless ($DB_ENV) { 4070 unless ($DB_ENV) {
3847 $DB_ENV = BDB::db_env_create; 4071 $DB_ENV = BDB::db_env_create;
3928 } 4152 }
3929} 4153}
3930 4154
3931# load additional modules 4155# load additional modules
3932require "cf/$_.pm" for @EXTRA_MODULES; 4156require "cf/$_.pm" for @EXTRA_MODULES;
4157cf::_connect_to_perl_2;
3933 4158
3934END { cf::emergency_save } 4159END { cf::emergency_save }
3935 4160
39361 41611
3937 4162

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines