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

Diff Legend

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