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.538 by root, Tue May 4 21:45:43 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;
… …
1357 1423
1358 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1424 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1359 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1425 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1360 1426
1361 $ext{source} = 1427 $ext{source} =
1362 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1428 "package $pkg; use common::sense;\n"
1363 . "#line 1 \"$path\"\n{\n" 1429 . "#line 1 \"$path\"\n{\n"
1364 . $source 1430 . $source
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"; 1456 undef $@; # work around perl 5.10.0 utf-8 caching bug
1385 1457
1386 if (exists $v->{meta}{mandatory}) {
1387 warn $msg;
1388 cf::cleanup "mandatory extension failed to load, exiting."; 1458 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1389 } 1459 if exists $v->{meta}{mandatory};
1390 1460
1391 warn $msg; 1461 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1462 delete $todo{$k};
1463 } else {
1464 $done{$k} = delete $todo{$k};
1465 push @EXTS, $v->{pkg};
1466 $progress = 1;
1467
1468 info "$v->{base}: extension inactive.\n"
1469 unless $active;
1392 } 1470 }
1393
1394 $done{$k} = delete $todo{$k};
1395 push @EXTS, $v->{pkg};
1396 $progress = 1;
1397 } 1471 }
1398 1472
1399 skip: 1473 unless ($progress) {
1400 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1474 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1401 unless $progress; 1475
1476 while (my ($k, $v) = each %todo) {
1477 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1478 if exists $v->{meta}{mandatory};
1479 }
1480 }
1402 } 1481 }
1403 }; 1482 };
1404} 1483}
1405 1484
1406############################################################################# 1485#############################################################################
… …
1490 $cf::PLAYER{$login} = $pl 1569 $cf::PLAYER{$login} = $pl
1491 } 1570 }
1492 } 1571 }
1493} 1572}
1494 1573
1574cf::player->attach (
1575 on_load => sub {
1576 my ($pl, $path) = @_;
1577
1578 # restore slots saved in save, below
1579 my $slots = delete $pl->{_slots};
1580
1581 $pl->ob->current_weapon ($slots->[0]);
1582 $pl->combat_ob ($slots->[1]);
1583 $pl->ranged_ob ($slots->[2]);
1584 },
1585);
1586
1495sub save($) { 1587sub save($) {
1496 my ($pl) = @_; 1588 my ($pl) = @_;
1497 1589
1498 return if $pl->{deny_save}; 1590 return if $pl->{deny_save};
1499 1591
… …
1504 1596
1505 aio_mkdir playerdir $pl, 0770; 1597 aio_mkdir playerdir $pl, 0770;
1506 $pl->{last_save} = $cf::RUNTIME; 1598 $pl->{last_save} = $cf::RUNTIME;
1507 1599
1508 cf::get_slot 0.01; 1600 cf::get_slot 0.01;
1601
1602 # save slots, to be restored later
1603 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1509 1604
1510 $pl->save_pl ($path); 1605 $pl->save_pl ($path);
1511 cf::cede_to_tick; 1606 cf::cede_to_tick;
1512} 1607}
1513 1608
… …
1550 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1645 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1551 1646
1552 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1647 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1553 $pl->deactivate; 1648 $pl->deactivate;
1554 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1649 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1555 $pl->ob->check_score;
1556 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1650 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1557 $pl->ns->destroy if $pl->ns; 1651 $pl->ns->destroy if $pl->ns;
1558 1652
1559 my $path = playerdir $pl; 1653 my $path = playerdir $pl;
1560 my $temp = "$path~$cf::RUNTIME~deleting~"; 1654 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1615 \@logins 1709 \@logins
1616} 1710}
1617 1711
1618=item $player->maps 1712=item $player->maps
1619 1713
1714=item cf::player::maps $login
1715
1620Returns an arrayref of map paths that are private for this 1716Returns an arrayref of map paths that are private for this
1621player. May block. 1717player. May block.
1622 1718
1623=cut 1719=cut
1624 1720
… …
1686=cut 1782=cut
1687 1783
1688sub find_by_path($) { 1784sub find_by_path($) {
1689 my ($path) = @_; 1785 my ($path) = @_;
1690 1786
1787 $path =~ s/^~[^\/]*//; # skip ~login
1788
1691 my ($match, $specificity); 1789 my ($match, $specificity);
1692 1790
1693 for my $region (list) { 1791 for my $region (list) {
1694 if ($region->{match} && $path =~ $region->{match}) { 1792 if ($region->{match} && $path =~ $region->{match}) {
1695 ($match, $specificity) = ($region, $region->specificity) 1793 ($match, $specificity) = ($region, $region->specificity)
… …
1726 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1824 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1727 1825
1728 # mit "rum" bekleckern, nicht 1826 # mit "rum" bekleckern, nicht
1729 $self->_create_random_map ( 1827 $self->_create_random_map (
1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1828 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1829 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1830 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1733 $rmp->{exit_on_final_map}, 1831 $rmp->{exit_on_final_map},
1734 $rmp->{xsize}, $rmp->{ysize}, 1832 $rmp->{xsize}, $rmp->{ysize},
1735 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1833 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1736 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1834 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1758 1856
1759 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1857 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1760} 1858}
1761 1859
1762# also paths starting with '/' 1860# also paths starting with '/'
1763$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1861$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1764 1862
1765sub thawer_merge { 1863sub thawer_merge {
1766 my ($self, $merge) = @_; 1864 my ($self, $merge) = @_;
1767 1865
1768 # we have to keep some variables in memory intact 1866 # we have to keep some variables in memory intact
… …
1982 2080
1983 $cf::MAP{$path} = $map 2081 $cf::MAP{$path} = $map
1984 } 2082 }
1985} 2083}
1986 2084
1987sub pre_load { } 2085sub pre_load { }
1988sub post_load { } 2086#sub post_load { } # XS
1989 2087
1990sub load { 2088sub load {
1991 my ($self) = @_; 2089 my ($self) = @_;
1992 2090
1993 local $self->{deny_reset} = 1; # loading can take a long time 2091 local $self->{deny_reset} = 1; # loading can take a long time
… …
2050 } 2148 }
2051 2149
2052 $self->post_load; 2150 $self->post_load;
2053} 2151}
2054 2152
2153# customize the map for a given player, i.e.
2154# return the _real_ map. used by e.g. per-player
2155# maps to change the path to ~playername/mappath
2055sub customise_for { 2156sub customise_for {
2056 my ($self, $ob) = @_; 2157 my ($self, $ob) = @_;
2057 2158
2058 return find "~" . $ob->name . "/" . $self->{path} 2159 return find "~" . $ob->name . "/" . $self->{path}
2059 if $self->per_player; 2160 if $self->per_player;
… …
2075 or next; 2176 or next;
2076 $neigh = find $neigh, $map 2177 $neigh = find $neigh, $map
2077 or next; 2178 or next;
2078 $neigh->load; 2179 $neigh->load;
2079 2180
2181 # now find the diagonal neighbours
2080 push @neigh, 2182 push @neigh,
2081 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2183 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2082 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2184 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2083 } 2185 }
2084 2186
… …
2091} 2193}
2092 2194
2093sub find_sync { 2195sub find_sync {
2094 my ($path, $origin) = @_; 2196 my ($path, $origin) = @_;
2095 2197
2096 cf::sync_job { find $path, $origin } 2198 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2199 if $Coro::current == $Coro::main;
2200
2201 find $path, $origin
2097} 2202}
2098 2203
2099sub do_load_sync { 2204sub do_load_sync {
2100 my ($map) = @_; 2205 my ($map) = @_;
2101 2206
2102 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2207 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2103 if $Coro::current == $Coro::main; 2208 if $Coro::current == $Coro::main;
2104 2209
2105 cf::sync_job { $map->load }; 2210 $map->load;
2106} 2211}
2107 2212
2108our %MAP_PREFETCH; 2213our %MAP_PREFETCH;
2109our $MAP_PREFETCHER = undef; 2214our $MAP_PREFETCHER = undef;
2110 2215
… …
2136 $MAP_PREFETCHER->prio (6); 2241 $MAP_PREFETCHER->prio (6);
2137 2242
2138 () 2243 ()
2139} 2244}
2140 2245
2246# common code, used by both ->save and ->swapout
2141sub save { 2247sub _save {
2142 my ($self) = @_; 2248 my ($self) = @_;
2143
2144 my $lock = cf::lock_acquire "map_data:$self->{path}";
2145 2249
2146 $self->{last_save} = $cf::RUNTIME; 2250 $self->{last_save} = $cf::RUNTIME;
2147 2251
2148 return unless $self->dirty; 2252 return unless $self->dirty;
2149 2253
… …
2169 } else { 2273 } else {
2170 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2274 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2171 } 2275 }
2172} 2276}
2173 2277
2278sub save {
2279 my ($self) = @_;
2280
2281 my $lock = cf::lock_acquire "map_data:$self->{path}";
2282
2283 $self->_save;
2284}
2285
2174sub swap_out { 2286sub swap_out {
2175 my ($self) = @_; 2287 my ($self) = @_;
2176 2288
2177 # save first because save cedes
2178 $self->save;
2179
2180 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2289 my $lock = cf::lock_acquire "map_data:$self->{path}";
2181 2290
2182 return if $self->players;
2183 return if $self->in_memory != cf::MAP_ACTIVE; 2291 return if $self->in_memory != cf::MAP_ACTIVE;
2184 return if $self->{deny_save}; 2292 return if $self->{deny_save};
2293 return if $self->players;
2185 2294
2295 # first deactivate the map and "unlink" it from the core
2296 $self->deactivate;
2297 $_->clear_links_to ($self) for values %cf::MAP;
2186 $self->in_memory (cf::MAP_SWAPPED); 2298 $self->in_memory (cf::MAP_SWAPPED);
2299
2300 # then atomically save
2301 $self->_save;
2302
2303 # then free the map
2304 $self->clear;
2305}
2306
2307sub reset_at {
2308 my ($self) = @_;
2309
2310 # TODO: safety, remove and allow resettable per-player maps
2311 return 1e99 if $self->{deny_reset};
2312
2313 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2314 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2315
2316 $time + $to
2317}
2318
2319sub should_reset {
2320 my ($self) = @_;
2321
2322 $self->reset_at <= $cf::RUNTIME
2323}
2324
2325sub reset {
2326 my ($self) = @_;
2327
2328 my $lock = cf::lock_acquire "map_data:$self->{path}";
2329
2330 return if $self->players;
2331
2332 cf::trace "resetting map ", $self->path, "\n";
2333
2334 $self->in_memory (cf::MAP_SWAPPED);
2335
2336 # need to save uniques path
2337 unless ($self->{deny_save}) {
2338 my $uniq = $self->uniq_path; utf8::encode $uniq;
2339
2340 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2341 if $uniq;
2342 }
2343
2344 delete $cf::MAP{$self->path};
2187 2345
2188 $self->deactivate; 2346 $self->deactivate;
2189 $_->clear_links_to ($self) for values %cf::MAP; 2347 $_->clear_links_to ($self) for values %cf::MAP;
2190 $self->clear; 2348 $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 2349
2236 $self->unlink_save; 2350 $self->unlink_save;
2237 $self->destroy; 2351 $self->destroy;
2238} 2352}
2239 2353
… …
2247 2361
2248 delete $cf::MAP{$self->path}; 2362 delete $cf::MAP{$self->path};
2249 2363
2250 $self->unlink_save; 2364 $self->unlink_save;
2251 2365
2252 bless $self, "cf::map"; 2366 bless $self, "cf::map::wrap";
2253 delete $self->{deny_reset}; 2367 delete $self->{deny_reset};
2254 $self->{deny_save} = 1; 2368 $self->{deny_save} = 1;
2255 $self->reset_timeout (1); 2369 $self->reset_timeout (1);
2256 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2370 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2257 2371
… …
2314 : normalise $_ 2428 : normalise $_
2315 } @{ aio_readdir $UNIQUEDIR or [] } 2429 } @{ aio_readdir $UNIQUEDIR or [] }
2316 ] 2430 ]
2317} 2431}
2318 2432
2433=item cf::map::static_maps
2434
2435Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2436file in the shared directory excluding F</styles> and F</editor>). May
2437block.
2438
2439=cut
2440
2441sub static_maps() {
2442 my @dirs = "";
2443 my @maps;
2444
2445 while (@dirs) {
2446 my $dir = shift @dirs;
2447
2448 next if $dir eq "/styles" || $dir eq "/editor";
2449
2450 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2451 or return;
2452
2453 for (@$files) {
2454 s/\.map$// or next;
2455 utf8::decode $_;
2456 push @maps, "$dir/$_";
2457 }
2458
2459 push @dirs, map "$dir/$_", @$dirs;
2460 }
2461
2462 \@maps
2463}
2464
2319=back 2465=back
2320 2466
2321=head3 cf::object 2467=head3 cf::object
2322 2468
2323=cut 2469=cut
… …
2455 2601
2456Freezes the player and moves him/her to a special map (C<{link}>). 2602Freezes the player and moves him/her to a special map (C<{link}>).
2457 2603
2458The player should be reasonably safe there for short amounts of time (e.g. 2604The 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, 2605for 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 2606though, as the player cannot control the character while it is on the link
2461map. 2607map.
2462 2608
2463Will never block. 2609Will never block.
2464 2610
2465=item $player_object->leave_link ($map, $x, $y) 2611=item $player_object->leave_link ($map, $x, $y)
… …
2486sub cf::object::player::enter_link { 2632sub cf::object::player::enter_link {
2487 my ($self) = @_; 2633 my ($self) = @_;
2488 2634
2489 $self->deactivate_recursive; 2635 $self->deactivate_recursive;
2490 2636
2637 ++$self->{_link_recursion};
2638
2491 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2639 return if UNIVERSAL::isa $self->map, "ext::map_link";
2492 2640
2493 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2641 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2494 if $self->map && $self->map->{path} ne "{link}"; 2642 if $self->map && $self->map->{path} ne "{link}";
2495 2643
2496 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2644 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2497} 2645}
2498 2646
2499sub cf::object::player::leave_link { 2647sub cf::object::player::leave_link {
2500 my ($self, $map, $x, $y) = @_; 2648 my ($self, $map, $x, $y) = @_;
2501 2649
… …
2518 ($x, $y) = (-1, -1) 2666 ($x, $y) = (-1, -1)
2519 unless (defined $x) && (defined $y); 2667 unless (defined $x) && (defined $y);
2520 2668
2521 # use -1 or undef as default coordinates, not 0, 0 2669 # use -1 or undef as default coordinates, not 0, 0
2522 ($x, $y) = ($map->enter_x, $map->enter_y) 2670 ($x, $y) = ($map->enter_x, $map->enter_y)
2523 if $x <=0 && $y <= 0; 2671 if $x <= 0 && $y <= 0;
2524 2672
2525 $map->load; 2673 $map->load;
2526 $map->load_neighbours; 2674 $map->load_neighbours;
2527 2675
2528 return unless $self->contr->active; 2676 return unless $self->contr->active;
2529 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2530 $self->activate_recursive;
2531 2677
2532 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2678 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2533 $self->enter_map ($map, $x, $y); 2679 if ($self->enter_map ($map, $x, $y)) {
2534} 2680 # entering was successful
2681 delete $self->{_link_recursion};
2682 # only activate afterwards, to support waiting in hooks
2683 $self->activate_recursive;
2684 }
2535 2685
2686}
2687
2536=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2688=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2537 2689
2538Moves the player to the given map-path and coordinates by first freezing 2690Moves the player to the given map-path and coordinates by first freezing
2539her, loading and preparing them map, calling the provided $check callback 2691her, loading and preparing them map, calling the provided $check callback
2540that has to return the map if sucecssful, and then unfreezes the player on 2692that 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 2693the new (success) or old (failed) map position. In either case, $done will
… …
2548 2700
2549our $GOTOGEN; 2701our $GOTOGEN;
2550 2702
2551sub cf::object::player::goto { 2703sub cf::object::player::goto {
2552 my ($self, $path, $x, $y, $check, $done) = @_; 2704 my ($self, $path, $x, $y, $check, $done) = @_;
2705
2706 if ($self->{_link_recursion} >= $MAX_LINKS) {
2707 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2708 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2709 ($path, $x, $y) = @$EMERGENCY_POSITION;
2710 }
2553 2711
2554 # do generation counting so two concurrent goto's will be executed in-order 2712 # do generation counting so two concurrent goto's will be executed in-order
2555 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2713 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2556 2714
2557 $self->enter_link; 2715 $self->enter_link;
… …
2581 my $map = eval { 2739 my $map = eval {
2582 my $map = defined $path ? cf::map::find $path : undef; 2740 my $map = defined $path ? cf::map::find $path : undef;
2583 2741
2584 if ($map) { 2742 if ($map) {
2585 $map = $map->customise_for ($self); 2743 $map = $map->customise_for ($self);
2586 $map = $check->($map) if $check && $map; 2744 $map = $check->($map, $x, $y, $self) if $check && $map;
2587 } else { 2745 } else {
2588 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2746 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2589 } 2747 }
2590 2748
2591 $map 2749 $map
… …
2599 if ($gen == $self->{_goto_generation}) { 2757 if ($gen == $self->{_goto_generation}) {
2600 delete $self->{_goto_generation}; 2758 delete $self->{_goto_generation};
2601 $self->leave_link ($map, $x, $y); 2759 $self->leave_link ($map, $x, $y);
2602 } 2760 }
2603 2761
2604 $done->() if $done; 2762 $done->($self) if $done;
2605 })->prio (1); 2763 })->prio (1);
2606} 2764}
2607 2765
2608=item $player_object->enter_exit ($exit_object) 2766=item $player_object->enter_exit ($exit_object)
2609 2767
… …
2702 $self->message ("Something went wrong deep within the deliantra server. " 2860 $self->message ("Something went wrong deep within the deliantra server. "
2703 . "I'll try to bring you back to the map you were before. " 2861 . "I'll try to bring you back to the map you were before. "
2704 . "Please report this to the dungeon master!", 2862 . "Please report this to the dungeon master!",
2705 cf::NDI_UNIQUE | cf::NDI_RED); 2863 cf::NDI_UNIQUE | cf::NDI_RED);
2706 2864
2707 warn "ERROR in enter_exit: $@"; 2865 error "ERROR in enter_exit: $@";
2708 $self->leave_link; 2866 $self->leave_link;
2709 } 2867 }
2710 })->prio (1); 2868 })->prio (1);
2711} 2869}
2712 2870
… …
2724sub cf::client::send_drawinfo { 2882sub cf::client::send_drawinfo {
2725 my ($self, $text, $flags) = @_; 2883 my ($self, $text, $flags) = @_;
2726 2884
2727 utf8::encode $text; 2885 utf8::encode $text;
2728 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2886 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2887}
2888
2889=item $client->send_big_packet ($pkt)
2890
2891Like C<send_packet>, but tries to compress large packets, and fragments
2892them as required.
2893
2894=cut
2895
2896our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2897
2898sub cf::client::send_big_packet {
2899 my ($self, $pkt) = @_;
2900
2901 # try lzf for large packets
2902 $pkt = "lzf " . Compress::LZF::compress $pkt
2903 if 1024 <= length $pkt and $self->{can_lzf};
2904
2905 # split very large packets
2906 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2907 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2908 $pkt = "frag";
2909 }
2910
2911 $self->send_packet ($pkt);
2729} 2912}
2730 2913
2731=item $client->send_msg ($channel, $msg, $color, [extra...]) 2914=item $client->send_msg ($channel, $msg, $color, [extra...])
2732 2915
2733Send a drawinfo or msg packet to the client, formatting the msg for the 2916Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2737 2920
2738=cut 2921=cut
2739 2922
2740# non-persistent channels (usually the info channel) 2923# non-persistent channels (usually the info channel)
2741our %CHANNEL = ( 2924our %CHANNEL = (
2925 "c/motd" => {
2926 id => "infobox",
2927 title => "MOTD",
2928 reply => undef,
2929 tooltip => "The message of the day",
2930 },
2742 "c/identify" => { 2931 "c/identify" => {
2743 id => "infobox", 2932 id => "infobox",
2744 title => "Identify", 2933 title => "Identify",
2745 reply => undef, 2934 reply => undef,
2746 tooltip => "Items recently identified", 2935 tooltip => "Items recently identified",
… …
2748 "c/examine" => { 2937 "c/examine" => {
2749 id => "infobox", 2938 id => "infobox",
2750 title => "Examine", 2939 title => "Examine",
2751 reply => undef, 2940 reply => undef,
2752 tooltip => "Signs and other items you examined", 2941 tooltip => "Signs and other items you examined",
2942 },
2943 "c/shopinfo" => {
2944 id => "infobox",
2945 title => "Shop Info",
2946 reply => undef,
2947 tooltip => "What your bargaining skill tells you about the shop",
2753 }, 2948 },
2754 "c/book" => { 2949 "c/book" => {
2755 id => "infobox", 2950 id => "infobox",
2756 title => "Book", 2951 title => "Book",
2757 reply => undef, 2952 reply => undef,
… …
2785 id => "infobox", 2980 id => "infobox",
2786 title => "Skills", 2981 title => "Skills",
2787 reply => undef, 2982 reply => undef,
2788 tooltip => "Shows your experience per skill and item power", 2983 tooltip => "Shows your experience per skill and item power",
2789 }, 2984 },
2985 "c/shopitems" => {
2986 id => "infobox",
2987 title => "Shop Items",
2988 reply => undef,
2989 tooltip => "Shows the items currently for sale in this shop",
2990 },
2790 "c/resistances" => { 2991 "c/resistances" => {
2791 id => "infobox", 2992 id => "infobox",
2792 title => "Resistances", 2993 title => "Resistances",
2793 reply => undef, 2994 reply => undef,
2794 tooltip => "Shows your resistances", 2995 tooltip => "Shows your resistances",
… …
2796 "c/pets" => { 2997 "c/pets" => {
2797 id => "infobox", 2998 id => "infobox",
2798 title => "Pets", 2999 title => "Pets",
2799 reply => undef, 3000 reply => undef,
2800 tooltip => "Shows information abotu your pets/a specific pet", 3001 tooltip => "Shows information abotu your pets/a specific pet",
3002 },
3003 "c/perceiveself" => {
3004 id => "infobox",
3005 title => "Perceive Self",
3006 reply => undef,
3007 tooltip => "You gained detailed knowledge about yourself",
2801 }, 3008 },
2802 "c/uptime" => { 3009 "c/uptime" => {
2803 id => "infobox", 3010 id => "infobox",
2804 title => "Uptime", 3011 title => "Uptime",
2805 reply => undef, 3012 reply => undef,
… …
2861 my $pkt = "msg " 3068 my $pkt = "msg "
2862 . $self->{json_coder}->encode ( 3069 . $self->{json_coder}->encode (
2863 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3070 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2864 ); 3071 );
2865 3072
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); 3073 $self->send_big_packet ($pkt);
2877} 3074}
2878 3075
2879=item $client->ext_msg ($type, @msg) 3076=item $client->ext_msg ($type, @msg)
2880 3077
2881Sends an ext event to the client. 3078Sends an ext event to the client.
… …
2884 3081
2885sub cf::client::ext_msg($$@) { 3082sub cf::client::ext_msg($$@) {
2886 my ($self, $type, @msg) = @_; 3083 my ($self, $type, @msg) = @_;
2887 3084
2888 if ($self->extcmd == 2) { 3085 if ($self->extcmd == 2) {
2889 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3086 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2890 } elsif ($self->extcmd == 1) { # TODO: remove 3087 } elsif ($self->extcmd == 1) { # TODO: remove
2891 push @msg, msgtype => "event_$type"; 3088 push @msg, msgtype => "event_$type";
2892 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3089 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2893 } 3090 }
2894} 3091}
2895 3092
2896=item $client->ext_reply ($msgid, @msg) 3093=item $client->ext_reply ($msgid, @msg)
2897 3094
… …
2901 3098
2902sub cf::client::ext_reply($$@) { 3099sub cf::client::ext_reply($$@) {
2903 my ($self, $id, @msg) = @_; 3100 my ($self, $id, @msg) = @_;
2904 3101
2905 if ($self->extcmd == 2) { 3102 if ($self->extcmd == 2) {
2906 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3103 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2907 } elsif ($self->extcmd == 1) { 3104 } elsif ($self->extcmd == 1) {
2908 #TODO: version 1, remove 3105 #TODO: version 1, remove
2909 unshift @msg, msgtype => "reply", msgid => $id; 3106 unshift @msg, msgtype => "reply", msgid => $id;
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3107 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 } 3108 }
2912} 3109}
2913 3110
2914=item $success = $client->query ($flags, "text", \&cb) 3111=item $success = $client->query ($flags, "text", \&cb)
2915 3112
… …
2986 3183
2987 $ns->ext_reply ($reply, @reply) 3184 $ns->ext_reply ($reply, @reply)
2988 if $reply; 3185 if $reply;
2989 3186
2990 } else { 3187 } else {
2991 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3188 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2992 } 3189 }
2993 3190
2994 cf::override; 3191 cf::override;
2995 }, 3192 },
2996); 3193);
… …
3016 3213
3017 $coro 3214 $coro
3018} 3215}
3019 3216
3020cf::client->attach ( 3217cf::client->attach (
3021 on_destroy => sub { 3218 on_client_destroy => sub {
3022 my ($ns) = @_; 3219 my ($ns) = @_;
3023 3220
3024 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3221 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3025 }, 3222 },
3026); 3223);
… …
3042our $safe_hole = new Safe::Hole; 3239our $safe_hole = new Safe::Hole;
3043 3240
3044$SIG{FPE} = 'IGNORE'; 3241$SIG{FPE} = 'IGNORE';
3045 3242
3046$safe->permit_only (Opcode::opset qw( 3243$safe->permit_only (Opcode::opset qw(
3047 :base_core :base_mem :base_orig :base_math 3244 :base_core :base_mem :base_orig :base_math :base_loop
3048 grepstart grepwhile mapstart mapwhile 3245 grepstart grepwhile mapstart mapwhile
3049 sort time 3246 sort time
3050)); 3247));
3051 3248
3052# here we export the classes and methods available to script code 3249# here we export the classes and methods available to script code
… …
3104 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3301 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3105 $qcode =~ s/\n/\\n/g; 3302 $qcode =~ s/\n/\\n/g;
3106 3303
3107 %vars = (_dummy => 0) unless %vars; 3304 %vars = (_dummy => 0) unless %vars;
3108 3305
3306 my @res;
3109 local $_; 3307 local $_;
3110 local @safe::cf::_safe_eval_args = values %vars;
3111 3308
3112 my $eval = 3309 my $eval =
3113 "do {\n" 3310 "do {\n"
3114 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3311 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3115 . "#line 0 \"{$qcode}\"\n" 3312 . "#line 0 \"{$qcode}\"\n"
3116 . $code 3313 . $code
3117 . "\n}" 3314 . "\n}"
3118 ; 3315 ;
3119 3316
3317 if ($CFG{safe_eval}) {
3120 sub_generation_inc; 3318 sub_generation_inc;
3319 local @safe::cf::_safe_eval_args = values %vars;
3121 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3320 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3122 sub_generation_inc; 3321 sub_generation_inc;
3322 } else {
3323 local @cf::_safe_eval_args = values %vars;
3324 @res = wantarray ? eval eval : scalar eval $eval;
3325 }
3123 3326
3124 if ($@) { 3327 if ($@) {
3125 warn "$@"; 3328 warn "$@",
3126 warn "while executing safe code '$code'\n"; 3329 "while executing safe code '$code'\n",
3127 warn "with arguments " . (join " ", %vars) . "\n"; 3330 "with arguments " . (join " ", %vars) . "\n";
3128 } 3331 }
3129 3332
3130 wantarray ? @res : $res[0] 3333 wantarray ? @res : $res[0]
3131} 3334}
3132 3335
… …
3146=cut 3349=cut
3147 3350
3148sub register_script_function { 3351sub register_script_function {
3149 my ($fun, $cb) = @_; 3352 my ($fun, $cb) = @_;
3150 3353
3151 no strict 'refs'; 3354 $fun = "safe::$fun" if $CFG{safe_eval};
3152 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3355 *$fun = $safe_hole->wrap ($cb);
3153} 3356}
3154 3357
3155=back 3358=back
3156 3359
3157=cut 3360=cut
… …
3166 # for this (global event?) 3369 # for this (global event?)
3167 %ext::player_env::MUSIC_FACE_CACHE = (); 3370 %ext::player_env::MUSIC_FACE_CACHE = ();
3168 3371
3169 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3372 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3170 3373
3171 warn "loading facedata from $path\n"; 3374 trace "loading facedata from $path\n";
3172 3375
3173 my $facedata; 3376 my $facedata;
3174 0 < aio_load $path, $facedata 3377 0 < aio_load $path, $facedata
3175 or die "$path: $!"; 3378 or die "$path: $!";
3176 3379
… …
3178 3381
3179 $facedata->{version} == 2 3382 $facedata->{version} == 2
3180 or cf::cleanup "$path: version mismatch, cannot proceed."; 3383 or cf::cleanup "$path: version mismatch, cannot proceed.";
3181 3384
3182 # patch in the exptable 3385 # patch in the exptable
3386 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3183 $facedata->{resource}{"res/exp_table"} = { 3387 $facedata->{resource}{"res/exp_table"} = {
3184 type => FT_RSRC, 3388 type => FT_RSRC,
3185 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3389 data => $exp_table,
3390 hash => (Digest::MD5::md5 $exp_table),
3186 }; 3391 };
3187 cf::cede_to_tick; 3392 cf::cede_to_tick;
3188 3393
3189 { 3394 {
3190 my $faces = $facedata->{faceinfo}; 3395 my $faces = $facedata->{faceinfo};
… …
3192 while (my ($face, $info) = each %$faces) { 3397 while (my ($face, $info) = each %$faces) {
3193 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3398 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3194 3399
3195 cf::face::set_visibility $idx, $info->{visibility}; 3400 cf::face::set_visibility $idx, $info->{visibility};
3196 cf::face::set_magicmap $idx, $info->{magicmap}; 3401 cf::face::set_magicmap $idx, $info->{magicmap};
3197 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3402 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3198 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3403 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3199 3404
3200 cf::cede_to_tick; 3405 cf::cede_to_tick;
3201 } 3406 }
3202 3407
3203 while (my ($face, $info) = each %$faces) { 3408 while (my ($face, $info) = each %$faces) {
… …
3208 3413
3209 if (my $smooth = cf::face::find $info->{smooth}) { 3414 if (my $smooth = cf::face::find $info->{smooth}) {
3210 cf::face::set_smooth $idx, $smooth; 3415 cf::face::set_smooth $idx, $smooth;
3211 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3416 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3212 } else { 3417 } else {
3213 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3418 error "smooth face '$info->{smooth}' not found for face '$face'";
3214 } 3419 }
3215 3420
3216 cf::cede_to_tick; 3421 cf::cede_to_tick;
3217 } 3422 }
3218 } 3423 }
… …
3227 3432
3228 cf::anim::invalidate_all; # d'oh 3433 cf::anim::invalidate_all; # d'oh
3229 } 3434 }
3230 3435
3231 { 3436 {
3232 # TODO: for gcfclient pleasure, we should give resources
3233 # that gcfclient doesn't grok a >10000 face index.
3234 my $res = $facedata->{resource}; 3437 my $res = $facedata->{resource};
3235 3438
3236 while (my ($name, $info) = each %$res) { 3439 while (my ($name, $info) = each %$res) {
3237 if (defined $info->{type}) { 3440 if (defined $info->{type}) {
3238 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3441 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3239 my $data;
3240 3442
3241 if ($info->{type} & 1) { 3443 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}; 3444 cf::face::set_type $idx, $info->{type};
3256 } else { 3445 } else {
3257 $RESOURCE{$name} = $info; 3446 $RESOURCE{$name} = $info; # unused
3258 } 3447 }
3259 3448
3260 cf::cede_to_tick; 3449 cf::cede_to_tick;
3261 } 3450 }
3262 } 3451 }
3263 3452
3264 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3453 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3265 3454
3266 1 3455 1
3267} 3456}
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 3457
3289register_exticmd fx_want => sub { 3458register_exticmd fx_want => sub {
3290 my ($ns, $want) = @_; 3459 my ($ns, $want) = @_;
3291 3460
3292 while (my ($k, $v) = each %$want) { 3461 while (my ($k, $v) = each %$want) {
… …
3331sub reload_treasures { 3500sub reload_treasures {
3332 load_resource_file "$DATADIR/treasures" 3501 load_resource_file "$DATADIR/treasures"
3333 or die "unable to load treasurelists\n"; 3502 or die "unable to load treasurelists\n";
3334} 3503}
3335 3504
3505sub reload_sound {
3506 trace "loading sound config from $DATADIR/sound\n";
3507
3508 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3509 or die "$DATADIR/sound $!";
3510
3511 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3512
3513 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3514 my $sound = $soundconf->{compat}[$_]
3515 or next;
3516
3517 my $face = cf::face::find "sound/$sound->[1]";
3518 cf::sound::set $sound->[0] => $face;
3519 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3520 }
3521
3522 while (my ($k, $v) = each %{$soundconf->{event}}) {
3523 my $face = cf::face::find "sound/$v";
3524 cf::sound::set $k => $face;
3525 }
3526}
3527
3336sub reload_resources { 3528sub reload_resources {
3337 warn "reloading resource files...\n"; 3529 trace "reloading resource files...\n";
3338 3530
3339 reload_facedata; 3531 reload_facedata;
3532 reload_sound;
3340 reload_archetypes; 3533 reload_archetypes;
3341 reload_regions; 3534 reload_regions;
3342 reload_treasures; 3535 reload_treasures;
3343 3536
3344 warn "finished reloading resource files\n"; 3537 trace "finished reloading resource files\n";
3345} 3538}
3346 3539
3347sub reload_config { 3540sub reload_config {
3541 trace "reloading config file...\n";
3542
3348 open my $fh, "<:utf8", "$CONFDIR/config" 3543 open my $fh, "<:utf8", "$CONFDIR/config"
3349 or return; 3544 or return;
3350 3545
3351 local $/; 3546 local $/;
3352 *CFG = YAML::Load <$fh>; 3547 *CFG = YAML::XS::Load scalar <$fh>;
3353 3548
3354 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3549 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3355 3550
3356 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3551 $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}; 3552 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3358 3553
3359 if (exists $CFG{mlockall}) { 3554 if (exists $CFG{mlockall}) {
… …
3361 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3556 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3362 and die "WARNING: m(un)lockall failed: $!\n"; 3557 and die "WARNING: m(un)lockall failed: $!\n";
3363 }; 3558 };
3364 warn $@ if $@; 3559 warn $@ if $@;
3365 } 3560 }
3561
3562 trace "finished reloading resource files\n";
3366} 3563}
3367 3564
3368sub pidfile() { 3565sub pidfile() {
3369 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3566 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3370 or die "$PIDFILE: $!"; 3567 or die "$PIDFILE: $!";
… …
3382 3579
3383 seek $fh, 0, 0; 3580 seek $fh, 0, 0;
3384 print $fh $$; 3581 print $fh $$;
3385} 3582}
3386 3583
3584sub main_loop {
3585 trace "EV::loop starting\n";
3586 if (1) {
3587 EV::loop;
3588 }
3589 trace "EV::loop returned\n";
3590 goto &main_loop unless $REALLY_UNLOOP;
3591}
3592
3387sub main { 3593sub main {
3388 cf::init_globals; # initialise logging 3594 cf::init_globals; # initialise logging
3389 3595
3390 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3596 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3391 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3597 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3392 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3598 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3393 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3599 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 3600
3400 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3601 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3401 3602
3402 # we must not ever block the main coroutine 3603 # we must not ever block the main coroutine
3403 local $Coro::idle = sub { 3604 local $Coro::idle = sub {
… …
3409 }; 3610 };
3410 3611
3411 evthread_start IO::AIO::poll_fileno; 3612 evthread_start IO::AIO::poll_fileno;
3412 3613
3413 cf::sync_job { 3614 cf::sync_job {
3615 cf::init_experience;
3616 cf::init_anim;
3617 cf::init_attackmess;
3618 cf::init_dynamic;
3619
3620 cf::load_settings;
3621 cf::load_materials;
3622
3414 reload_resources; 3623 reload_resources;
3415 reload_config; 3624 reload_config;
3416 db_init; 3625 db_init;
3417 3626
3418 cf::load_settings;
3419 cf::load_materials;
3420 cf::init_uuid; 3627 cf::init_uuid;
3421 cf::init_signals; 3628 cf::init_signals;
3422 cf::init_commands;
3423 cf::init_skills; 3629 cf::init_skills;
3424 3630
3425 cf::init_beforeplay; 3631 cf::init_beforeplay;
3426 3632
3427 atomic; 3633 atomic;
… …
3429 load_extensions; 3635 load_extensions;
3430 3636
3431 utime time, time, $RUNTIMEFILE; 3637 utime time, time, $RUNTIMEFILE;
3432 3638
3433 # no (long-running) fork's whatsoever before this point(!) 3639 # no (long-running) fork's whatsoever before this point(!)
3640 use POSIX ();
3434 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3641 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3435 3642
3436 (pop @POST_INIT)->(0) while @POST_INIT; 3643 (pop @POST_INIT)->(0) while @POST_INIT;
3437 }; 3644 };
3438 3645
3439 EV::loop; 3646 cf::object::thawer::errors_are_fatal 0;
3647 info "parse errors in files are no longer fatal from this point on.\n";
3648
3649 main_loop;
3440} 3650}
3441 3651
3442############################################################################# 3652#############################################################################
3443# initialisation and cleanup 3653# initialisation and cleanup
3444 3654
3445# install some emergency cleanup handlers 3655# install some emergency cleanup handlers
3446BEGIN { 3656BEGIN {
3447 our %SIGWATCHER = (); 3657 our %SIGWATCHER = ();
3448 for my $signal (qw(INT HUP TERM)) { 3658 for my $signal (qw(INT HUP TERM)) {
3449 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3659 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3450 cf::cleanup "SIG$signal"; 3660 cf::cleanup "SIG$signal";
3451 }; 3661 };
3452 } 3662 }
3453} 3663}
3454 3664
3455sub write_runtime_sync { 3665sub write_runtime_sync {
3666 my $t0 = AE::time;
3667
3456 # first touch the runtime file to show we are still running: 3668 # first touch the runtime file to show we are still running:
3457 # the fsync below can take a very very long time. 3669 # the fsync below can take a very very long time.
3458 3670
3459 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3671 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3460 3672
3461 my $guard = cf::lock_acquire "write_runtime"; 3673 my $guard = cf::lock_acquire "write_runtime";
3462 3674
3463 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3675 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3464 or return; 3676 or return;
3465 3677
3466 my $value = $cf::RUNTIME + 90 + 10; 3678 my $value = $cf::RUNTIME + 90 + 10;
3467 # 10 is the runtime save interval, for a monotonic clock 3679 # 10 is the runtime save interval, for a monotonic clock
3468 # 60 allows for the watchdog to kill the server. 3680 # 60 allows for the watchdog to kill the server.
… …
3481 or return; 3693 or return;
3482 3694
3483 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3695 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3484 and return; 3696 and return;
3485 3697
3486 warn "runtime file written.\n"; 3698 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3487 3699
3488 1 3700 1
3489} 3701}
3490 3702
3491our $uuid_lock; 3703our $uuid_lock;
… …
3503 or return; 3715 or return;
3504 3716
3505 my $value = uuid_seq uuid_cur; 3717 my $value = uuid_seq uuid_cur;
3506 3718
3507 unless ($value) { 3719 unless ($value) {
3508 warn "cowardly refusing to write zero uuid value!\n"; 3720 info "cowardly refusing to write zero uuid value!\n";
3509 return; 3721 return;
3510 } 3722 }
3511 3723
3512 my $value = uuid_str $value + $uuid_skip; 3724 my $value = uuid_str $value + $uuid_skip;
3513 $uuid_skip = 0; 3725 $uuid_skip = 0;
… …
3523 or return; 3735 or return;
3524 3736
3525 aio_rename "$uuid~", $uuid 3737 aio_rename "$uuid~", $uuid
3526 and return; 3738 and return;
3527 3739
3528 warn "uuid file written ($value).\n"; 3740 trace "uuid file written ($value).\n";
3529 3741
3530 1 3742 1
3531 3743
3532} 3744}
3533 3745
… …
3539} 3751}
3540 3752
3541sub emergency_save() { 3753sub emergency_save() {
3542 my $freeze_guard = cf::freeze_mainloop; 3754 my $freeze_guard = cf::freeze_mainloop;
3543 3755
3544 warn "emergency_perl_save: enter\n"; 3756 info "emergency_perl_save: enter\n";
3757
3758 # this is a trade-off: we want to be very quick here, so
3759 # save all maps without fsync, and later call a global sync
3760 # (which in turn might be very very slow)
3761 local $USE_FSYNC = 0;
3545 3762
3546 cf::sync_job { 3763 cf::sync_job {
3547 # this is a trade-off: we want to be very quick here, so 3764 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 3765
3552 # use a peculiar iteration method to avoid tripping on perl 3766 # use a peculiar iteration method to avoid tripping on perl
3553 # refcount bugs in for. also avoids problems with players 3767 # refcount bugs in for. also avoids problems with players
3554 # and maps saved/destroyed asynchronously. 3768 # and maps saved/destroyed asynchronously.
3555 warn "emergency_perl_save: begin player save\n"; 3769 info "emergency_perl_save: begin player save\n";
3556 for my $login (keys %cf::PLAYER) { 3770 for my $login (keys %cf::PLAYER) {
3557 my $pl = $cf::PLAYER{$login} or next; 3771 my $pl = $cf::PLAYER{$login} or next;
3558 $pl->valid or next; 3772 $pl->valid or next;
3559 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3773 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3560 $pl->save; 3774 $pl->save;
3561 } 3775 }
3562 warn "emergency_perl_save: end player save\n"; 3776 info "emergency_perl_save: end player save\n";
3563 3777
3778 cf::write_runtime_sync; # external watchdog should not bark
3779
3564 warn "emergency_perl_save: begin map save\n"; 3780 info "emergency_perl_save: begin map save\n";
3565 for my $path (keys %cf::MAP) { 3781 for my $path (keys %cf::MAP) {
3566 my $map = $cf::MAP{$path} or next; 3782 my $map = $cf::MAP{$path} or next;
3567 $map->valid or next; 3783 $map->valid or next;
3568 $map->save; 3784 $map->save;
3569 } 3785 }
3570 warn "emergency_perl_save: end map save\n"; 3786 info "emergency_perl_save: end map save\n";
3571 3787
3788 cf::write_runtime_sync; # external watchdog should not bark
3789
3572 warn "emergency_perl_save: begin database checkpoint\n"; 3790 info "emergency_perl_save: begin database checkpoint\n";
3573 BDB::db_env_txn_checkpoint $DB_ENV; 3791 BDB::db_env_txn_checkpoint $DB_ENV;
3574 warn "emergency_perl_save: end database checkpoint\n"; 3792 info "emergency_perl_save: end database checkpoint\n";
3575 3793
3576 warn "emergency_perl_save: begin write uuid\n"; 3794 info "emergency_perl_save: begin write uuid\n";
3577 write_uuid_sync 1; 3795 write_uuid_sync 1;
3578 warn "emergency_perl_save: end write uuid\n"; 3796 info "emergency_perl_save: end write uuid\n";
3797
3798 cf::write_runtime_sync; # external watchdog should not bark
3799
3800 trace "emergency_perl_save: syncing database to disk";
3801 BDB::db_env_txn_checkpoint $DB_ENV;
3802
3803 info "emergency_perl_save: starting sync\n";
3804 IO::AIO::aio_sync sub {
3805 info "emergency_perl_save: finished sync\n";
3806 };
3807
3808 cf::write_runtime_sync; # external watchdog should not bark
3809
3810 trace "emergency_perl_save: flushing outstanding aio requests";
3811 while (IO::AIO::nreqs || BDB::nreqs) {
3812 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3813 }
3814
3815 cf::write_runtime_sync; # external watchdog should not bark
3579 }; 3816 };
3580 3817
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"; 3818 info "emergency_perl_save: leave\n";
3587} 3819}
3588 3820
3589sub post_cleanup { 3821sub post_cleanup {
3590 my ($make_core) = @_; 3822 my ($make_core) = @_;
3591 3823
3824 IO::AIO::flush;
3825
3592 warn Carp::longmess "post_cleanup backtrace" 3826 error Carp::longmess "post_cleanup backtrace"
3593 if $make_core; 3827 if $make_core;
3594 3828
3595 my $fh = pidfile; 3829 my $fh = pidfile;
3596 unlink $PIDFILE if <$fh> == $$; 3830 unlink $PIDFILE if <$fh> == $$;
3597} 3831}
… …
3617 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3851 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3618 for my $name (keys %$leaf_symtab) { 3852 for my $name (keys %$leaf_symtab) {
3619 _gv_clear *{"$pkg$name"}; 3853 _gv_clear *{"$pkg$name"};
3620# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3854# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3621 } 3855 }
3622 warn "cleared package $pkg\n";#d#
3623} 3856}
3624 3857
3625sub do_reload_perl() { 3858sub do_reload_perl() {
3626 # can/must only be called in main 3859 # can/must only be called in main
3627 if ($Coro::current != $Coro::main) { 3860 if (in_main) {
3628 warn "can only reload from main coroutine"; 3861 error "can only reload from main coroutine";
3629 return; 3862 return;
3630 } 3863 }
3631 3864
3632 return if $RELOAD++; 3865 return if $RELOAD++;
3633 3866
3634 my $t1 = EV::time; 3867 my $t1 = AE::time;
3635 3868
3636 while ($RELOAD) { 3869 while ($RELOAD) {
3637 warn "reloading..."; 3870 info "reloading...";
3638 3871
3639 warn "entering sync_job"; 3872 trace "entering sync_job";
3640 3873
3641 cf::sync_job { 3874 cf::sync_job {
3642 cf::write_runtime_sync; # external watchdog should not bark
3643 cf::emergency_save; 3875 cf::emergency_save;
3644 cf::write_runtime_sync; # external watchdog should not bark
3645 3876
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"; 3877 trace "cancelling all extension coros";
3657 $_->cancel for values %EXT_CORO; 3878 $_->cancel for values %EXT_CORO;
3658 %EXT_CORO = (); 3879 %EXT_CORO = ();
3659 3880
3660 warn "removing commands"; 3881 trace "removing commands";
3661 %COMMAND = (); 3882 %COMMAND = ();
3662 3883
3663 warn "removing ext/exti commands"; 3884 trace "removing ext/exti commands";
3664 %EXTCMD = (); 3885 %EXTCMD = ();
3665 %EXTICMD = (); 3886 %EXTICMD = ();
3666 3887
3667 warn "unloading/nuking all extensions"; 3888 trace "unloading/nuking all extensions";
3668 for my $pkg (@EXTS) { 3889 for my $pkg (@EXTS) {
3669 warn "... unloading $pkg"; 3890 trace "... unloading $pkg";
3670 3891
3671 if (my $cb = $pkg->can ("unload")) { 3892 if (my $cb = $pkg->can ("unload")) {
3672 eval { 3893 eval {
3673 $cb->($pkg); 3894 $cb->($pkg);
3674 1 3895 1
3675 } or warn "$pkg unloaded, but with errors: $@"; 3896 } or error "$pkg unloaded, but with errors: $@";
3676 } 3897 }
3677 3898
3678 warn "... clearing $pkg"; 3899 trace "... clearing $pkg";
3679 clear_package $pkg; 3900 clear_package $pkg;
3680 } 3901 }
3681 3902
3682 warn "unloading all perl modules loaded from $LIBDIR"; 3903 trace "unloading all perl modules loaded from $LIBDIR";
3683 while (my ($k, $v) = each %INC) { 3904 while (my ($k, $v) = each %INC) {
3684 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3905 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3685 3906
3686 warn "... unloading $k"; 3907 trace "... unloading $k";
3687 delete $INC{$k}; 3908 delete $INC{$k};
3688 3909
3689 $k =~ s/\.pm$//; 3910 $k =~ s/\.pm$//;
3690 $k =~ s/\//::/g; 3911 $k =~ s/\//::/g;
3691 3912
… …
3694 } 3915 }
3695 3916
3696 clear_package $k; 3917 clear_package $k;
3697 } 3918 }
3698 3919
3699 warn "getting rid of safe::, as good as possible"; 3920 trace "getting rid of safe::, as good as possible";
3700 clear_package "safe::$_" 3921 clear_package "safe::$_"
3701 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3922 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3702 3923
3703 warn "unloading cf.pm \"a bit\""; 3924 trace "unloading cf.pm \"a bit\"";
3704 delete $INC{"cf.pm"}; 3925 delete $INC{"cf.pm"};
3705 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3926 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3706 3927
3707 # don't, removes xs symbols, too, 3928 # don't, removes xs symbols, too,
3708 # and global variables created in xs 3929 # and global variables created in xs
3709 #clear_package __PACKAGE__; 3930 #clear_package __PACKAGE__;
3710 3931
3711 warn "unload completed, starting to reload now"; 3932 info "unload completed, starting to reload now";
3712 3933
3713 warn "reloading cf.pm"; 3934 trace "reloading cf.pm";
3714 require cf; 3935 require cf;
3715 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3936 cf::_connect_to_perl_1;
3716 3937
3717 warn "loading config and database again"; 3938 trace "loading config and database again";
3718 cf::reload_config; 3939 cf::reload_config;
3719 3940
3720 warn "loading extensions"; 3941 trace "loading extensions";
3721 cf::load_extensions; 3942 cf::load_extensions;
3722 3943
3723 if ($REATTACH_ON_RELOAD) { 3944 if ($REATTACH_ON_RELOAD) {
3724 warn "reattaching attachments to objects/players"; 3945 trace "reattaching attachments to objects/players";
3725 _global_reattach; # objects, sockets 3946 _global_reattach; # objects, sockets
3726 warn "reattaching attachments to maps"; 3947 trace "reattaching attachments to maps";
3727 reattach $_ for values %MAP; 3948 reattach $_ for values %MAP;
3728 warn "reattaching attachments to players"; 3949 trace "reattaching attachments to players";
3729 reattach $_ for values %PLAYER; 3950 reattach $_ for values %PLAYER;
3730 } 3951 }
3731 3952
3732 warn "running post_init jobs"; 3953 trace "running post_init jobs";
3733 (pop @POST_INIT)->(1) while @POST_INIT; 3954 (pop @POST_INIT)->(1) while @POST_INIT;
3734 3955
3735 warn "leaving sync_job"; 3956 trace "leaving sync_job";
3736 3957
3737 1 3958 1
3738 } or do { 3959 } or do {
3739 warn $@; 3960 error $@;
3740 cf::cleanup "error while reloading, exiting."; 3961 cf::cleanup "error while reloading, exiting.";
3741 }; 3962 };
3742 3963
3743 warn "reloaded"; 3964 info "reloaded";
3744 --$RELOAD; 3965 --$RELOAD;
3745 } 3966 }
3746 3967
3747 $t1 = EV::time - $t1; 3968 $t1 = AE::time - $t1;
3748 warn "reload completed in ${t1}s\n"; 3969 info "reload completed in ${t1}s\n";
3749}; 3970};
3750 3971
3751our $RELOAD_WATCHER; # used only during reload 3972our $RELOAD_WATCHER; # used only during reload
3752 3973
3753sub reload_perl() { 3974sub reload_perl() {
… …
3755 # coro crashes during coro_state_free->destroy here. 3976 # coro crashes during coro_state_free->destroy here.
3756 3977
3757 $RELOAD_WATCHER ||= cf::async { 3978 $RELOAD_WATCHER ||= cf::async {
3758 Coro::AIO::aio_wait cache_extensions; 3979 Coro::AIO::aio_wait cache_extensions;
3759 3980
3760 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3981 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3761 do_reload_perl; 3982 do_reload_perl;
3762 undef $RELOAD_WATCHER; 3983 undef $RELOAD_WATCHER;
3763 }; 3984 };
3764 }; 3985 };
3765} 3986}
… …
3782 4003
3783our @WAIT_FOR_TICK; 4004our @WAIT_FOR_TICK;
3784our @WAIT_FOR_TICK_BEGIN; 4005our @WAIT_FOR_TICK_BEGIN;
3785 4006
3786sub wait_for_tick { 4007sub wait_for_tick {
3787 return if tick_inhibit || $Coro::current == $Coro::main; 4008 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3788 4009
3789 my $signal = new Coro::Signal; 4010 my $signal = new Coro::Signal;
3790 push @WAIT_FOR_TICK, $signal; 4011 push @WAIT_FOR_TICK, $signal;
3791 $signal->wait; 4012 $signal->wait;
3792} 4013}
3793 4014
3794sub wait_for_tick_begin { 4015sub wait_for_tick_begin {
3795 return if tick_inhibit || $Coro::current == $Coro::main; 4016 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3796 4017
3797 my $signal = new Coro::Signal; 4018 my $signal = new Coro::Signal;
3798 push @WAIT_FOR_TICK_BEGIN, $signal; 4019 push @WAIT_FOR_TICK_BEGIN, $signal;
3799 $signal->wait; 4020 $signal->wait;
3800} 4021}
… …
3806 return; 4027 return;
3807 } 4028 }
3808 4029
3809 cf::server_tick; # one server iteration 4030 cf::server_tick; # one server iteration
3810 4031
4032 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4033
3811 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4034 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3812 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4035 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3813 Coro::async_pool { 4036 Coro::async_pool {
3814 $Coro::current->{desc} = "runtime saver"; 4037 $Coro::current->{desc} = "runtime saver";
3815 write_runtime_sync 4038 write_runtime_sync
3816 or warn "ERROR: unable to write runtime file: $!"; 4039 or error "ERROR: unable to write runtime file: $!";
3817 }; 4040 };
3818 } 4041 }
3819 4042
3820 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4043 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3821 $sig->send; 4044 $sig->send;
… …
3829 4052
3830 if (0) { 4053 if (0) {
3831 if ($NEXT_TICK) { 4054 if ($NEXT_TICK) {
3832 my $jitter = $TICK_START - $NEXT_TICK; 4055 my $jitter = $TICK_START - $NEXT_TICK;
3833 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4056 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3834 warn "jitter $JITTER\n";#d# 4057 debug "jitter $JITTER\n";#d#
3835 } 4058 }
3836 } 4059 }
3837} 4060}
3838 4061
3839{ 4062{
3840 # configure BDB 4063 # configure BDB
3841 4064
3842 BDB::min_parallel 8; 4065 BDB::min_parallel 16;
3843 BDB::max_poll_reqs $TICK * 0.1; 4066 BDB::max_poll_reqs $TICK * 0.1;
3844 $AnyEvent::BDB::WATCHER->priority (1); 4067 $AnyEvent::BDB::WATCHER->priority (1);
3845 4068
3846 unless ($DB_ENV) { 4069 unless ($DB_ENV) {
3847 $DB_ENV = BDB::db_env_create; 4070 $DB_ENV = BDB::db_env_create;
… …
3928 } 4151 }
3929} 4152}
3930 4153
3931# load additional modules 4154# load additional modules
3932require "cf/$_.pm" for @EXTRA_MODULES; 4155require "cf/$_.pm" for @EXTRA_MODULES;
4156cf::_connect_to_perl_2;
3933 4157
3934END { cf::emergency_save } 4158END { cf::emergency_save }
3935 4159
39361 41601
3937 4161

Diff Legend

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