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

Diff Legend

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