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.462 by root, Tue Dec 23 06:58:23 2008 UTC vs.
Revision 1.532 by root, Thu Apr 29 07:32:34 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;
471 519
472sub sync_job(&) { 520sub sync_job(&) {
473 my ($job) = @_; 521 my ($job) = @_;
474 522
475 if ($Coro::current == $Coro::main) { 523 if ($Coro::current == $Coro::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#
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
696 755
697 my $t1 = Time::HiRes::time; 756 my $t1 = Time::HiRes::time;
698 my $data = $process->(\@data); 757 my $data = $process->(\@data);
699 my $t2 = Time::HiRes::time; 758 my $t2 = Time::HiRes::time;
700 759
701 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 760 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
702 761
703 db_put cache => "$id/data", $data; 762 db_put cache => "$id/data", $data;
704 db_put cache => "$id/md5" , $md5; 763 db_put cache => "$id/md5" , $md5;
705 db_put cache => "$id/meta", $meta; 764 db_put cache => "$id/meta", $meta;
706 765
716 775
717=cut 776=cut
718 777
719sub datalog($@) { 778sub datalog($@) {
720 my ($type, %kv) = @_; 779 my ($type, %kv) = @_;
721 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 780 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
722} 781}
723 782
724=back 783=back
725 784
726=cut 785=cut
921 980
922 } elsif (exists $cb_id{$type}) { 981 } elsif (exists $cb_id{$type}) {
923 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 982 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
924 983
925 } elsif (ref $type) { 984 } elsif (ref $type) {
926 warn "attaching objects not supported, ignoring.\n"; 985 error "attaching objects not supported, ignoring.\n";
927 986
928 } else { 987 } else {
929 shift @arg; 988 shift @arg;
930 warn "attach argument '$type' not supported, ignoring.\n"; 989 error "attach argument '$type' not supported, ignoring.\n";
931 } 990 }
932 } 991 }
933} 992}
934 993
935sub _object_attach { 994sub _object_attach {
945 _attach $registry, $klass, @attach; 1004 _attach $registry, $klass, @attach;
946 } 1005 }
947 1006
948 $obj->{$name} = \%arg; 1007 $obj->{$name} = \%arg;
949 } else { 1008 } else {
950 warn "object uses attachment '$name' which is not available, postponing.\n"; 1009 info "object uses attachment '$name' which is not available, postponing.\n";
951 } 1010 }
952 1011
953 $obj->{_attachment}{$name} = undef; 1012 $obj->{_attachment}{$name} = undef;
954} 1013}
955 1014
1014 1073
1015 for (@$callbacks) { 1074 for (@$callbacks) {
1016 eval { &{$_->[1]} }; 1075 eval { &{$_->[1]} };
1017 1076
1018 if ($@) { 1077 if ($@) {
1019 warn "$@";
1020 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1078 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1021 override; 1079 override;
1022 } 1080 }
1023 1081
1024 return 1 if $override; 1082 return 1 if $override;
1025 } 1083 }
1104 for (@$attach) { 1162 for (@$attach) {
1105 my ($klass, @attach) = @$_; 1163 my ($klass, @attach) = @$_;
1106 _attach $registry, $klass, @attach; 1164 _attach $registry, $klass, @attach;
1107 } 1165 }
1108 } else { 1166 } else {
1109 warn "object uses attachment '$name' that is not available, postponing.\n"; 1167 info "object uses attachment '$name' that is not available, postponing.\n";
1110 } 1168 }
1111 } 1169 }
1112} 1170}
1113 1171
1114cf::attachable->attach ( 1172cf::attachable->attach (
1141 my ($filename, $rdata, $objs) = @_; 1199 my ($filename, $rdata, $objs) = @_;
1142 1200
1143 sync_job { 1201 sync_job {
1144 if (length $$rdata) { 1202 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename); 1203 utf8::decode (my $decname = $filename);
1146 warn sprintf "saving %s (%d,%d)\n", 1204 trace sprintf "saving %s (%d,%d)\n",
1147 $decname, length $$rdata, scalar @$objs; 1205 $decname, length $$rdata, scalar @$objs
1206 if $VERBOSE_IO;
1148 1207
1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1208 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150 aio_chmod $fh, SAVE_MODE; 1209 aio_chmod $fh, SAVE_MODE;
1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1210 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152 aio_fsync $fh if $cf::USE_FSYNC; 1211 if ($cf::USE_FSYNC) {
1212 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;
1213 aio_fsync $fh;
1214 }
1153 aio_close $fh; 1215 aio_close $fh;
1154 1216
1155 if (@$objs) { 1217 if (@$objs) {
1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1218 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1157 aio_chmod $fh, SAVE_MODE; 1219 aio_chmod $fh, SAVE_MODE;
1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1220 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159 aio_write $fh, 0, (length $data), $data, 0; 1221 aio_write $fh, 0, (length $data), $data, 0;
1160 aio_fsync $fh if $cf::USE_FSYNC; 1222 if ($cf::USE_FSYNC) {
1223 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;
1224 aio_fsync $fh;
1225 }
1161 aio_close $fh; 1226 aio_close $fh;
1162 aio_rename "$filename.pst~", "$filename.pst"; 1227 aio_rename "$filename.pst~", "$filename.pst";
1163 } 1228 }
1164 } else { 1229 } else {
1165 aio_unlink "$filename.pst"; 1230 aio_unlink "$filename.pst";
1168 aio_rename "$filename~", $filename; 1233 aio_rename "$filename~", $filename;
1169 1234
1170 $filename =~ s%/[^/]+$%%; 1235 $filename =~ s%/[^/]+$%%;
1171 aio_pathsync $filename if $cf::USE_FSYNC; 1236 aio_pathsync $filename if $cf::USE_FSYNC;
1172 } else { 1237 } else {
1173 warn "unable to save objects: $filename~: $!\n"; 1238 error "unable to save objects: $filename~: $!\n";
1174 } 1239 }
1175 } else { 1240 } else {
1176 aio_unlink $filename; 1241 aio_unlink $filename;
1177 aio_unlink "$filename.pst"; 1242 aio_unlink "$filename.pst";
1178 } 1243 }
1202 my $st = eval { Coro::Storable::thaw $av }; 1267 my $st = eval { Coro::Storable::thaw $av };
1203 $av = $st->{objs}; 1268 $av = $st->{objs};
1204 } 1269 }
1205 1270
1206 utf8::decode (my $decname = $filename); 1271 utf8::decode (my $decname = $filename);
1207 warn sprintf "loading %s (%d,%d)\n", 1272 trace sprintf "loading %s (%d,%d)\n",
1208 $decname, length $data, scalar @{$av || []}; 1273 $decname, length $data, scalar @{$av || []}
1274 if $VERBOSE_IO;
1209 1275
1210 ($data, $av) 1276 ($data, $av)
1211} 1277}
1212 1278
1213=head2 COMMAND CALLBACKS 1279=head2 COMMAND CALLBACKS
1272} 1338}
1273 1339
1274use File::Glob (); 1340use File::Glob ();
1275 1341
1276cf::player->attach ( 1342cf::player->attach (
1277 on_command => sub { 1343 on_unknown_command => sub {
1278 my ($pl, $name, $params) = @_; 1344 my ($pl, $name, $params) = @_;
1279 1345
1280 my $cb = $COMMAND{$name} 1346 my $cb = $COMMAND{$name}
1281 or return; 1347 or return;
1282 1348
1305 1371
1306 $pl->ext_reply ($reply, @reply) 1372 $pl->ext_reply ($reply, @reply)
1307 if $reply; 1373 if $reply;
1308 1374
1309 } else { 1375 } else {
1310 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1376 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1311 } 1377 }
1312 1378
1313 cf::override; 1379 cf::override;
1314 }, 1380 },
1315); 1381);
1316 1382
1317# "readahead" all extensions 1383# "readahead" all extensions
1318sub cache_extensions { 1384sub cache_extensions {
1319 my $grp = IO::AIO::aio_group; 1385 my $grp = IO::AIO::aio_group;
1320 1386
1321 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1387 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1322 for (grep /\.ext$/, @{$_[0]}) { 1388 for (grep /\.ext$/, @{$_[0]}) {
1323 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1389 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1324 } 1390 }
1325 }; 1391 };
1326 1392
1327 $grp 1393 $grp
1328} 1394}
1329 1395
1330sub load_extensions { 1396sub load_extensions {
1397 info "loading extensions...";
1398
1331 cf::sync_job { 1399 cf::sync_job {
1332 my %todo; 1400 my %todo;
1333 1401
1334 for my $path (<$LIBDIR/*.ext>) { 1402 for my $path (<$LIBDIR/*.ext>) {
1335 next unless -r $path; 1403 next unless -r $path;
1361 . "\n};\n1"; 1429 . "\n};\n1";
1362 1430
1363 $todo{$base} = \%ext; 1431 $todo{$base} = \%ext;
1364 } 1432 }
1365 1433
1434 my $pass = 0;
1366 my %done; 1435 my %done;
1367 while (%todo) { 1436 while (%todo) {
1368 my $progress; 1437 my $progress;
1369 1438
1439 ++$pass;
1440
1441 ext:
1370 while (my ($k, $v) = each %todo) { 1442 while (my ($k, $v) = each %todo) {
1371 for (split /,\s*/, $v->{meta}{depends}) { 1443 for (split /,\s*/, $v->{meta}{depends}) {
1372 goto skip 1444 next ext
1373 unless exists $done{$_}; 1445 unless exists $done{$_};
1374 } 1446 }
1375 1447
1376 warn "... loading '$k' into '$v->{pkg}'\n"; 1448 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1377 1449
1378 unless (eval $v->{source}) { 1450 my $active = eval $v->{source};
1451
1452 if (length $@) {
1379 my $msg = $@ ? "$v->{path}: $@\n" 1453 error "$v->{path}: $@\n";
1380 : "$v->{base}: extension inactive.\n";
1381 1454
1382 if (exists $v->{meta}{mandatory}) {
1383 warn $msg;
1384 cf::cleanup "mandatory extension failed to load, exiting."; 1455 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1385 } 1456 if exists $v->{meta}{mandatory};
1386 1457
1387 warn $msg; 1458 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1459 delete $todo{$k};
1460 } else {
1461 $done{$k} = delete $todo{$k};
1462 push @EXTS, $v->{pkg};
1463 $progress = 1;
1464
1465 info "$v->{base}: extension inactive.\n"
1466 unless $active;
1388 } 1467 }
1389
1390 $done{$k} = delete $todo{$k};
1391 push @EXTS, $v->{pkg};
1392 $progress = 1;
1393 } 1468 }
1394 1469
1395 skip: 1470 unless ($progress) {
1396 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1471 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1397 unless $progress; 1472
1473 while (my ($k, $v) = each %todo) {
1474 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1475 if exists $v->{meta}{mandatory};
1476 }
1477 }
1398 } 1478 }
1399 }; 1479 };
1400} 1480}
1401 1481
1402############################################################################# 1482#############################################################################
1486 $cf::PLAYER{$login} = $pl 1566 $cf::PLAYER{$login} = $pl
1487 } 1567 }
1488 } 1568 }
1489} 1569}
1490 1570
1571cf::player->attach (
1572 on_load => sub {
1573 my ($pl, $path) = @_;
1574
1575 # restore slots saved in save, below
1576 my $slots = delete $pl->{_slots};
1577
1578 $pl->ob->current_weapon ($slots->[0]);
1579 $pl->combat_ob ($slots->[1]);
1580 $pl->ranged_ob ($slots->[2]);
1581 },
1582);
1583
1491sub save($) { 1584sub save($) {
1492 my ($pl) = @_; 1585 my ($pl) = @_;
1493 1586
1494 return if $pl->{deny_save}; 1587 return if $pl->{deny_save};
1495 1588
1500 1593
1501 aio_mkdir playerdir $pl, 0770; 1594 aio_mkdir playerdir $pl, 0770;
1502 $pl->{last_save} = $cf::RUNTIME; 1595 $pl->{last_save} = $cf::RUNTIME;
1503 1596
1504 cf::get_slot 0.01; 1597 cf::get_slot 0.01;
1598
1599 # save slots, to be restored later
1600 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1505 1601
1506 $pl->save_pl ($path); 1602 $pl->save_pl ($path);
1507 cf::cede_to_tick; 1603 cf::cede_to_tick;
1508} 1604}
1509 1605
1546 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1642 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1547 1643
1548 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1644 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1549 $pl->deactivate; 1645 $pl->deactivate;
1550 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1646 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1551 $pl->ob->check_score;
1552 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1647 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1553 $pl->ns->destroy if $pl->ns; 1648 $pl->ns->destroy if $pl->ns;
1554 1649
1555 my $path = playerdir $pl; 1650 my $path = playerdir $pl;
1556 my $temp = "$path~$cf::RUNTIME~deleting~"; 1651 my $temp = "$path~$cf::RUNTIME~deleting~";
1611 \@logins 1706 \@logins
1612} 1707}
1613 1708
1614=item $player->maps 1709=item $player->maps
1615 1710
1711=item cf::player::maps $login
1712
1616Returns an arrayref of map paths that are private for this 1713Returns an arrayref of map paths that are private for this
1617player. May block. 1714player. May block.
1618 1715
1619=cut 1716=cut
1620 1717
1682=cut 1779=cut
1683 1780
1684sub find_by_path($) { 1781sub find_by_path($) {
1685 my ($path) = @_; 1782 my ($path) = @_;
1686 1783
1784 $path =~ s/^~[^\/]*//; # skip ~login
1785
1687 my ($match, $specificity); 1786 my ($match, $specificity);
1688 1787
1689 for my $region (list) { 1788 for my $region (list) {
1690 if ($region->{match} && $path =~ $region->{match}) { 1789 if ($region->{match} && $path =~ $region->{match}) {
1691 ($match, $specificity) = ($region, $region->specificity) 1790 ($match, $specificity) = ($region, $region->specificity)
1722 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1821 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1723 1822
1724 # mit "rum" bekleckern, nicht 1823 # mit "rum" bekleckern, nicht
1725 $self->_create_random_map ( 1824 $self->_create_random_map (
1726 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1825 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1727 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1826 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1728 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1827 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1729 $rmp->{exit_on_final_map}, 1828 $rmp->{exit_on_final_map},
1730 $rmp->{xsize}, $rmp->{ysize}, 1829 $rmp->{xsize}, $rmp->{ysize},
1731 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1830 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1732 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1831 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1754 1853
1755 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1854 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1756} 1855}
1757 1856
1758# also paths starting with '/' 1857# also paths starting with '/'
1759$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1858$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1760 1859
1761sub thawer_merge { 1860sub thawer_merge {
1762 my ($self, $merge) = @_; 1861 my ($self, $merge) = @_;
1763 1862
1764 # we have to keep some variables in memory intact 1863 # we have to keep some variables in memory intact
1978 2077
1979 $cf::MAP{$path} = $map 2078 $cf::MAP{$path} = $map
1980 } 2079 }
1981} 2080}
1982 2081
1983sub pre_load { } 2082sub pre_load { }
1984sub post_load { } 2083#sub post_load { } # XS
1985 2084
1986sub load { 2085sub load {
1987 my ($self) = @_; 2086 my ($self) = @_;
1988 2087
1989 local $self->{deny_reset} = 1; # loading can take a long time 2088 local $self->{deny_reset} = 1; # loading can take a long time
2046 } 2145 }
2047 2146
2048 $self->post_load; 2147 $self->post_load;
2049} 2148}
2050 2149
2150# customize the map for a given player, i.e.
2151# return the _real_ map. used by e.g. per-player
2152# maps to change the path to ~playername/mappath
2051sub customise_for { 2153sub customise_for {
2052 my ($self, $ob) = @_; 2154 my ($self, $ob) = @_;
2053 2155
2054 return find "~" . $ob->name . "/" . $self->{path} 2156 return find "~" . $ob->name . "/" . $self->{path}
2055 if $self->per_player; 2157 if $self->per_player;
2071 or next; 2173 or next;
2072 $neigh = find $neigh, $map 2174 $neigh = find $neigh, $map
2073 or next; 2175 or next;
2074 $neigh->load; 2176 $neigh->load;
2075 2177
2178 # now find the diagonal neighbours
2076 push @neigh, 2179 push @neigh,
2077 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2180 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2078 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2181 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2079 } 2182 }
2080 2183
2132 $MAP_PREFETCHER->prio (6); 2235 $MAP_PREFETCHER->prio (6);
2133 2236
2134 () 2237 ()
2135} 2238}
2136 2239
2240# common code, used by both ->save and ->swapout
2137sub save { 2241sub _save {
2138 my ($self) = @_; 2242 my ($self) = @_;
2139
2140 my $lock = cf::lock_acquire "map_data:$self->{path}";
2141 2243
2142 $self->{last_save} = $cf::RUNTIME; 2244 $self->{last_save} = $cf::RUNTIME;
2143 2245
2144 return unless $self->dirty; 2246 return unless $self->dirty;
2145 2247
2165 } else { 2267 } else {
2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2268 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2167 } 2269 }
2168} 2270}
2169 2271
2272sub save {
2273 my ($self) = @_;
2274
2275 my $lock = cf::lock_acquire "map_data:$self->{path}";
2276
2277 $self->_save;
2278}
2279
2170sub swap_out { 2280sub swap_out {
2171 my ($self) = @_; 2281 my ($self) = @_;
2172 2282
2173 # save first because save cedes
2174 $self->save;
2175
2176 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2283 my $lock = cf::lock_acquire "map_data:$self->{path}";
2177 2284
2178 return if $self->players;
2179 return if $self->in_memory != cf::MAP_ACTIVE; 2285 return if $self->in_memory != cf::MAP_ACTIVE;
2180 return if $self->{deny_save}; 2286 return if $self->{deny_save};
2287 return if $self->players;
2181 2288
2289 # first deactivate the map and "unlink" it from the core
2290 $self->deactivate;
2291 $_->clear_links_to ($self) for values %cf::MAP;
2182 $self->in_memory (cf::MAP_SWAPPED); 2292 $self->in_memory (cf::MAP_SWAPPED);
2293
2294 # then atomically save
2295 $self->_save;
2296
2297 # then free the map
2298 $self->clear;
2299}
2300
2301sub reset_at {
2302 my ($self) = @_;
2303
2304 # TODO: safety, remove and allow resettable per-player maps
2305 return 1e99 if $self->{deny_reset};
2306
2307 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2308 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2309
2310 $time + $to
2311}
2312
2313sub should_reset {
2314 my ($self) = @_;
2315
2316 $self->reset_at <= $cf::RUNTIME
2317}
2318
2319sub reset {
2320 my ($self) = @_;
2321
2322 my $lock = cf::lock_acquire "map_data:$self->{path}";
2323
2324 return if $self->players;
2325
2326 cf::trace "resetting map ", $self->path, "\n";
2327
2328 $self->in_memory (cf::MAP_SWAPPED);
2329
2330 # need to save uniques path
2331 unless ($self->{deny_save}) {
2332 my $uniq = $self->uniq_path; utf8::encode $uniq;
2333
2334 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2335 if $uniq;
2336 }
2337
2338 delete $cf::MAP{$self->path};
2183 2339
2184 $self->deactivate; 2340 $self->deactivate;
2185 $_->clear_links_to ($self) for values %cf::MAP; 2341 $_->clear_links_to ($self) for values %cf::MAP;
2186 $self->clear; 2342 $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 2343
2232 $self->unlink_save; 2344 $self->unlink_save;
2233 $self->destroy; 2345 $self->destroy;
2234} 2346}
2235 2347
2243 2355
2244 delete $cf::MAP{$self->path}; 2356 delete $cf::MAP{$self->path};
2245 2357
2246 $self->unlink_save; 2358 $self->unlink_save;
2247 2359
2248 bless $self, "cf::map"; 2360 bless $self, "cf::map::wrap";
2249 delete $self->{deny_reset}; 2361 delete $self->{deny_reset};
2250 $self->{deny_save} = 1; 2362 $self->{deny_save} = 1;
2251 $self->reset_timeout (1); 2363 $self->reset_timeout (1);
2252 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2364 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2253 2365
2310 : normalise $_ 2422 : normalise $_
2311 } @{ aio_readdir $UNIQUEDIR or [] } 2423 } @{ aio_readdir $UNIQUEDIR or [] }
2312 ] 2424 ]
2313} 2425}
2314 2426
2427=item cf::map::static_maps
2428
2429Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2430file in the shared directory excluding F</styles> and F</editor>). May
2431block.
2432
2433=cut
2434
2435sub static_maps() {
2436 my @dirs = "";
2437 my @maps;
2438
2439 while (@dirs) {
2440 my $dir = shift @dirs;
2441
2442 next if $dir eq "/styles" || $dir eq "/editor";
2443
2444 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2445 or return;
2446
2447 for (@$files) {
2448 s/\.map$// or next;
2449 utf8::decode $_;
2450 push @maps, "$dir/$_";
2451 }
2452
2453 push @dirs, map "$dir/$_", @$dirs;
2454 }
2455
2456 \@maps
2457}
2458
2315=back 2459=back
2316 2460
2317=head3 cf::object 2461=head3 cf::object
2318 2462
2319=cut 2463=cut
2384 2528
2385our $SAY_CHANNEL = { 2529our $SAY_CHANNEL = {
2386 id => "say", 2530 id => "say",
2387 title => "Map", 2531 title => "Map",
2388 reply => "say ", 2532 reply => "say ",
2389 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2533 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2390}; 2534};
2391 2535
2392our $CHAT_CHANNEL = { 2536our $CHAT_CHANNEL = {
2393 id => "chat", 2537 id => "chat",
2394 title => "Chat", 2538 title => "Chat",
2451 2595
2452Freezes the player and moves him/her to a special map (C<{link}>). 2596Freezes the player and moves him/her to a special map (C<{link}>).
2453 2597
2454The player should be reasonably safe there for short amounts of time (e.g. 2598The 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, 2599for 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 2600though, as the player cannot control the character while it is on the link
2457map. 2601map.
2458 2602
2459Will never block. 2603Will never block.
2460 2604
2461=item $player_object->leave_link ($map, $x, $y) 2605=item $player_object->leave_link ($map, $x, $y)
2482sub cf::object::player::enter_link { 2626sub cf::object::player::enter_link {
2483 my ($self) = @_; 2627 my ($self) = @_;
2484 2628
2485 $self->deactivate_recursive; 2629 $self->deactivate_recursive;
2486 2630
2631 ++$self->{_link_recursion};
2632
2487 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2633 return if UNIVERSAL::isa $self->map, "ext::map_link";
2488 2634
2489 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2635 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2490 if $self->map && $self->map->{path} ne "{link}"; 2636 if $self->map && $self->map->{path} ne "{link}";
2491 2637
2492 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2638 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2493} 2639}
2494 2640
2495sub cf::object::player::leave_link { 2641sub cf::object::player::leave_link {
2496 my ($self, $map, $x, $y) = @_; 2642 my ($self, $map, $x, $y) = @_;
2497 2643
2514 ($x, $y) = (-1, -1) 2660 ($x, $y) = (-1, -1)
2515 unless (defined $x) && (defined $y); 2661 unless (defined $x) && (defined $y);
2516 2662
2517 # use -1 or undef as default coordinates, not 0, 0 2663 # use -1 or undef as default coordinates, not 0, 0
2518 ($x, $y) = ($map->enter_x, $map->enter_y) 2664 ($x, $y) = ($map->enter_x, $map->enter_y)
2519 if $x <=0 && $y <= 0; 2665 if $x <= 0 && $y <= 0;
2520 2666
2521 $map->load; 2667 $map->load;
2522 $map->load_neighbours; 2668 $map->load_neighbours;
2523 2669
2524 return unless $self->contr->active; 2670 return unless $self->contr->active;
2525 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2526 $self->activate_recursive;
2527 2671
2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2672 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2529 $self->enter_map ($map, $x, $y); 2673 if ($self->enter_map ($map, $x, $y)) {
2530} 2674 # entering was successful
2675 delete $self->{_link_recursion};
2676 # only activate afterwards, to support waiting in hooks
2677 $self->activate_recursive;
2678 }
2531 2679
2680}
2681
2532=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2682=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2533 2683
2534Moves the player to the given map-path and coordinates by first freezing 2684Moves the player to the given map-path and coordinates by first freezing
2535her, loading and preparing them map, calling the provided $check callback 2685her, loading and preparing them map, calling the provided $check callback
2536that has to return the map if sucecssful, and then unfreezes the player on 2686that 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 2687the new (success) or old (failed) map position. In either case, $done will
2544 2694
2545our $GOTOGEN; 2695our $GOTOGEN;
2546 2696
2547sub cf::object::player::goto { 2697sub cf::object::player::goto {
2548 my ($self, $path, $x, $y, $check, $done) = @_; 2698 my ($self, $path, $x, $y, $check, $done) = @_;
2699
2700 if ($self->{_link_recursion} >= $MAX_LINKS) {
2701 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2702 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2703 ($path, $x, $y) = @$EMERGENCY_POSITION;
2704 }
2549 2705
2550 # do generation counting so two concurrent goto's will be executed in-order 2706 # do generation counting so two concurrent goto's will be executed in-order
2551 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2707 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2552 2708
2553 $self->enter_link; 2709 $self->enter_link;
2577 my $map = eval { 2733 my $map = eval {
2578 my $map = defined $path ? cf::map::find $path : undef; 2734 my $map = defined $path ? cf::map::find $path : undef;
2579 2735
2580 if ($map) { 2736 if ($map) {
2581 $map = $map->customise_for ($self); 2737 $map = $map->customise_for ($self);
2582 $map = $check->($map) if $check && $map; 2738 $map = $check->($map, $x, $y, $self) if $check && $map;
2583 } else { 2739 } else {
2584 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2740 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2585 } 2741 }
2586 2742
2587 $map 2743 $map
2595 if ($gen == $self->{_goto_generation}) { 2751 if ($gen == $self->{_goto_generation}) {
2596 delete $self->{_goto_generation}; 2752 delete $self->{_goto_generation};
2597 $self->leave_link ($map, $x, $y); 2753 $self->leave_link ($map, $x, $y);
2598 } 2754 }
2599 2755
2600 $done->() if $done; 2756 $done->($self) if $done;
2601 })->prio (1); 2757 })->prio (1);
2602} 2758}
2603 2759
2604=item $player_object->enter_exit ($exit_object) 2760=item $player_object->enter_exit ($exit_object)
2605 2761
2698 $self->message ("Something went wrong deep within the deliantra server. " 2854 $self->message ("Something went wrong deep within the deliantra server. "
2699 . "I'll try to bring you back to the map you were before. " 2855 . "I'll try to bring you back to the map you were before. "
2700 . "Please report this to the dungeon master!", 2856 . "Please report this to the dungeon master!",
2701 cf::NDI_UNIQUE | cf::NDI_RED); 2857 cf::NDI_UNIQUE | cf::NDI_RED);
2702 2858
2703 warn "ERROR in enter_exit: $@"; 2859 error "ERROR in enter_exit: $@";
2704 $self->leave_link; 2860 $self->leave_link;
2705 } 2861 }
2706 })->prio (1); 2862 })->prio (1);
2707} 2863}
2708 2864
2720sub cf::client::send_drawinfo { 2876sub cf::client::send_drawinfo {
2721 my ($self, $text, $flags) = @_; 2877 my ($self, $text, $flags) = @_;
2722 2878
2723 utf8::encode $text; 2879 utf8::encode $text;
2724 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2880 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2881}
2882
2883=item $client->send_big_packet ($pkt)
2884
2885Like C<send_packet>, but tries to compress large packets, and fragments
2886them as required.
2887
2888=cut
2889
2890our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2891
2892sub cf::client::send_big_packet {
2893 my ($self, $pkt) = @_;
2894
2895 # try lzf for large packets
2896 $pkt = "lzf " . Compress::LZF::compress $pkt
2897 if 1024 <= length $pkt and $self->{can_lzf};
2898
2899 # split very large packets
2900 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2901 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2902 $pkt = "frag";
2903 }
2904
2905 $self->send_packet ($pkt);
2725} 2906}
2726 2907
2727=item $client->send_msg ($channel, $msg, $color, [extra...]) 2908=item $client->send_msg ($channel, $msg, $color, [extra...])
2728 2909
2729Send a drawinfo or msg packet to the client, formatting the msg for the 2910Send a drawinfo or msg packet to the client, formatting the msg for the
2733 2914
2734=cut 2915=cut
2735 2916
2736# non-persistent channels (usually the info channel) 2917# non-persistent channels (usually the info channel)
2737our %CHANNEL = ( 2918our %CHANNEL = (
2919 "c/motd" => {
2920 id => "infobox",
2921 title => "MOTD",
2922 reply => undef,
2923 tooltip => "The message of the day",
2924 },
2738 "c/identify" => { 2925 "c/identify" => {
2739 id => "infobox", 2926 id => "infobox",
2740 title => "Identify", 2927 title => "Identify",
2741 reply => undef, 2928 reply => undef,
2742 tooltip => "Items recently identified", 2929 tooltip => "Items recently identified",
2744 "c/examine" => { 2931 "c/examine" => {
2745 id => "infobox", 2932 id => "infobox",
2746 title => "Examine", 2933 title => "Examine",
2747 reply => undef, 2934 reply => undef,
2748 tooltip => "Signs and other items you examined", 2935 tooltip => "Signs and other items you examined",
2936 },
2937 "c/shopinfo" => {
2938 id => "infobox",
2939 title => "Shop Info",
2940 reply => undef,
2941 tooltip => "What your bargaining skill tells you about the shop",
2749 }, 2942 },
2750 "c/book" => { 2943 "c/book" => {
2751 id => "infobox", 2944 id => "infobox",
2752 title => "Book", 2945 title => "Book",
2753 reply => undef, 2946 reply => undef,
2769 id => "infobox", 2962 id => "infobox",
2770 title => "Body Parts", 2963 title => "Body Parts",
2771 reply => undef, 2964 reply => undef,
2772 tooltip => "Shows which body parts you posess and are available", 2965 tooltip => "Shows which body parts you posess and are available",
2773 }, 2966 },
2967 "c/statistics" => {
2968 id => "infobox",
2969 title => "Statistics",
2970 reply => undef,
2971 tooltip => "Shows your primary statistics",
2972 },
2774 "c/skills" => { 2973 "c/skills" => {
2775 id => "infobox", 2974 id => "infobox",
2776 title => "Skills", 2975 title => "Skills",
2777 reply => undef, 2976 reply => undef,
2778 tooltip => "Shows your experience per skill and item power", 2977 tooltip => "Shows your experience per skill and item power",
2978 },
2979 "c/shopitems" => {
2980 id => "infobox",
2981 title => "Shop Items",
2982 reply => undef,
2983 tooltip => "Shows the items currently for sale in this shop",
2984 },
2985 "c/resistances" => {
2986 id => "infobox",
2987 title => "Resistances",
2988 reply => undef,
2989 tooltip => "Shows your resistances",
2990 },
2991 "c/pets" => {
2992 id => "infobox",
2993 title => "Pets",
2994 reply => undef,
2995 tooltip => "Shows information abotu your pets/a specific pet",
2996 },
2997 "c/perceiveself" => {
2998 id => "infobox",
2999 title => "Perceive Self",
3000 reply => undef,
3001 tooltip => "You gained detailed knowledge about yourself",
2779 }, 3002 },
2780 "c/uptime" => { 3003 "c/uptime" => {
2781 id => "infobox", 3004 id => "infobox",
2782 title => "Uptime", 3005 title => "Uptime",
2783 reply => undef, 3006 reply => undef,
2793 id => "party", 3016 id => "party",
2794 title => "Party", 3017 title => "Party",
2795 reply => "gsay ", 3018 reply => "gsay ",
2796 tooltip => "Messages and chat related to your party", 3019 tooltip => "Messages and chat related to your party",
2797 }, 3020 },
3021 "c/death" => {
3022 id => "death",
3023 title => "Death",
3024 reply => undef,
3025 tooltip => "Reason for and more info about your most recent death",
3026 },
2798 "c/say" => $SAY_CHANNEL, 3027 "c/say" => $SAY_CHANNEL,
2799 "c/chat" => $CHAT_CHANNEL, 3028 "c/chat" => $CHAT_CHANNEL,
2800); 3029);
2801 3030
2802sub cf::client::send_msg { 3031sub cf::client::send_msg {
2809 3038
2810 # check predefined channels, for the benefit of C 3039 # check predefined channels, for the benefit of C
2811 if ($CHANNEL{$channel}) { 3040 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel}; 3041 $channel = $CHANNEL{$channel};
2813 3042
2814 $self->ext_msg (channel_info => $channel) 3043 $self->ext_msg (channel_info => $channel);
2815 if $self->can_msg;
2816
2817 $channel = $channel->{id}; 3044 $channel = $channel->{id};
2818 3045
2819 } elsif (ref $channel) { 3046 } elsif (ref $channel) {
2820 # send meta info to client, if not yet sent 3047 # send meta info to client, if not yet sent
2821 unless (exists $self->{channel}{$channel->{id}}) { 3048 unless (exists $self->{channel}{$channel->{id}}) {
2822 $self->{channel}{$channel->{id}} = $channel; 3049 $self->{channel}{$channel->{id}} = $channel;
2823 $self->ext_msg (channel_info => $channel) 3050 $self->ext_msg (channel_info => $channel);
2824 if $self->can_msg;
2825 } 3051 }
2826 3052
2827 $channel = $channel->{id}; 3053 $channel = $channel->{id};
2828 } 3054 }
2829 3055
2830 return unless @extra || length $msg; 3056 return unless @extra || length $msg;
2831 3057
2832 if ($self->can_msg) {
2833 # default colour, mask it out 3058 # default colour, mask it out
2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3059 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2835 if $color & cf::NDI_DEF; 3060 if $color & cf::NDI_DEF;
2836 3061
2837 my $pkt = "msg " 3062 my $pkt = "msg "
2838 . $self->{json_coder}->encode ( 3063 . $self->{json_coder}->encode (
2839 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3064 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2840 ); 3065 );
2841 3066
2842 # try lzf for large packets
2843 $pkt = "lzf " . Compress::LZF::compress $pkt
2844 if 1024 <= length $pkt and $self->{can_lzf};
2845
2846 # split very large packets
2847 if (8192 < length $pkt and $self->{can_lzf}) {
2848 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2849 $pkt = "frag";
2850 }
2851
2852 $self->send_packet ($pkt); 3067 $self->send_big_packet ($pkt);
2853 } else {
2854 if ($color >= 0) {
2855 # replace some tags by gcfclient-compatible ones
2856 for ($msg) {
2857 1 while
2858 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2859 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2860 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2861 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2862 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2863 }
2864
2865 $color &= cf::NDI_COLOR_MASK;
2866
2867 utf8::encode $msg;
2868
2869 if (0 && $msg =~ /\[/) {
2870 # COMMAND/INFO
2871 $self->send_packet ("drawextinfo $color 10 8 $msg")
2872 } else {
2873 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2874 $self->send_packet ("drawinfo $color $msg")
2875 }
2876 }
2877 }
2878} 3068}
2879 3069
2880=item $client->ext_msg ($type, @msg) 3070=item $client->ext_msg ($type, @msg)
2881 3071
2882Sends an ext event to the client. 3072Sends an ext event to the client.
2885 3075
2886sub cf::client::ext_msg($$@) { 3076sub cf::client::ext_msg($$@) {
2887 my ($self, $type, @msg) = @_; 3077 my ($self, $type, @msg) = @_;
2888 3078
2889 if ($self->extcmd == 2) { 3079 if ($self->extcmd == 2) {
2890 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3080 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2891 } elsif ($self->extcmd == 1) { # TODO: remove 3081 } elsif ($self->extcmd == 1) { # TODO: remove
2892 push @msg, msgtype => "event_$type"; 3082 push @msg, msgtype => "event_$type";
2893 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3083 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2894 } 3084 }
2895} 3085}
2896 3086
2897=item $client->ext_reply ($msgid, @msg) 3087=item $client->ext_reply ($msgid, @msg)
2898 3088
2902 3092
2903sub cf::client::ext_reply($$@) { 3093sub cf::client::ext_reply($$@) {
2904 my ($self, $id, @msg) = @_; 3094 my ($self, $id, @msg) = @_;
2905 3095
2906 if ($self->extcmd == 2) { 3096 if ($self->extcmd == 2) {
2907 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3097 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2908 } elsif ($self->extcmd == 1) { 3098 } elsif ($self->extcmd == 1) {
2909 #TODO: version 1, remove 3099 #TODO: version 1, remove
2910 unshift @msg, msgtype => "reply", msgid => $id; 3100 unshift @msg, msgtype => "reply", msgid => $id;
2911 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3101 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2912 } 3102 }
2913} 3103}
2914 3104
2915=item $success = $client->query ($flags, "text", \&cb) 3105=item $success = $client->query ($flags, "text", \&cb)
2916 3106
2987 3177
2988 $ns->ext_reply ($reply, @reply) 3178 $ns->ext_reply ($reply, @reply)
2989 if $reply; 3179 if $reply;
2990 3180
2991 } else { 3181 } else {
2992 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3182 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2993 } 3183 }
2994 3184
2995 cf::override; 3185 cf::override;
2996 }, 3186 },
2997); 3187);
3017 3207
3018 $coro 3208 $coro
3019} 3209}
3020 3210
3021cf::client->attach ( 3211cf::client->attach (
3022 on_destroy => sub { 3212 on_client_destroy => sub {
3023 my ($ns) = @_; 3213 my ($ns) = @_;
3024 3214
3025 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3215 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3026 }, 3216 },
3027); 3217);
3043our $safe_hole = new Safe::Hole; 3233our $safe_hole = new Safe::Hole;
3044 3234
3045$SIG{FPE} = 'IGNORE'; 3235$SIG{FPE} = 'IGNORE';
3046 3236
3047$safe->permit_only (Opcode::opset qw( 3237$safe->permit_only (Opcode::opset qw(
3048 :base_core :base_mem :base_orig :base_math 3238 :base_core :base_mem :base_orig :base_math :base_loop
3049 grepstart grepwhile mapstart mapwhile 3239 grepstart grepwhile mapstart mapwhile
3050 sort time 3240 sort time
3051)); 3241));
3052 3242
3053# here we export the classes and methods available to script code 3243# here we export the classes and methods available to script code
3057The following functions and methods are available within a safe environment: 3247The following functions and methods are available within a safe environment:
3058 3248
3059 cf::object 3249 cf::object
3060 contr pay_amount pay_player map x y force_find force_add destroy 3250 contr pay_amount pay_player map x y force_find force_add destroy
3061 insert remove name archname title slaying race decrease split 3251 insert remove name archname title slaying race decrease split
3252 value
3062 3253
3063 cf::object::player 3254 cf::object::player
3064 player 3255 player
3065 3256
3066 cf::player 3257 cf::player
3072=cut 3263=cut
3073 3264
3074for ( 3265for (
3075 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3266 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3076 insert remove inv nrof name archname title slaying race 3267 insert remove inv nrof name archname title slaying race
3077 decrease split destroy change_exp)], 3268 decrease split destroy change_exp value msg lore send_msg)],
3078 ["cf::object::player" => qw(player)], 3269 ["cf::object::player" => qw(player)],
3079 ["cf::player" => qw(peaceful)], 3270 ["cf::player" => qw(peaceful send_msg)],
3080 ["cf::map" => qw(trigger)], 3271 ["cf::map" => qw(trigger)],
3081) { 3272) {
3082 no strict 'refs'; 3273 no strict 'refs';
3083 my ($pkg, @funs) = @$_; 3274 my ($pkg, @funs) = @$_;
3084 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3275 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3102 3293
3103 my $qcode = $code; 3294 my $qcode = $code;
3104 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3295 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3105 $qcode =~ s/\n/\\n/g; 3296 $qcode =~ s/\n/\\n/g;
3106 3297
3298 %vars = (_dummy => 0) unless %vars;
3299
3300 my @res;
3107 local $_; 3301 local $_;
3108 local @safe::cf::_safe_eval_args = values %vars;
3109 3302
3110 my $eval = 3303 my $eval =
3111 "do {\n" 3304 "do {\n"
3112 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3305 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3113 . "#line 0 \"{$qcode}\"\n" 3306 . "#line 0 \"{$qcode}\"\n"
3114 . $code 3307 . $code
3115 . "\n}" 3308 . "\n}"
3116 ; 3309 ;
3117 3310
3311 if ($CFG{safe_eval}) {
3118 sub_generation_inc; 3312 sub_generation_inc;
3313 local @safe::cf::_safe_eval_args = values %vars;
3119 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3314 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3120 sub_generation_inc; 3315 sub_generation_inc;
3316 } else {
3317 local @cf::_safe_eval_args = values %vars;
3318 @res = wantarray ? eval eval : scalar eval $eval;
3319 }
3121 3320
3122 if ($@) { 3321 if ($@) {
3123 warn "$@"; 3322 warn "$@",
3124 warn "while executing safe code '$code'\n"; 3323 "while executing safe code '$code'\n",
3125 warn "with arguments " . (join " ", %vars) . "\n"; 3324 "with arguments " . (join " ", %vars) . "\n";
3126 } 3325 }
3127 3326
3128 wantarray ? @res : $res[0] 3327 wantarray ? @res : $res[0]
3129} 3328}
3130 3329
3144=cut 3343=cut
3145 3344
3146sub register_script_function { 3345sub register_script_function {
3147 my ($fun, $cb) = @_; 3346 my ($fun, $cb) = @_;
3148 3347
3149 no strict 'refs'; 3348 $fun = "safe::$fun" if $CFG{safe_eval};
3150 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3349 *$fun = $safe_hole->wrap ($cb);
3151} 3350}
3152 3351
3153=back 3352=back
3154 3353
3155=cut 3354=cut
3164 # for this (global event?) 3363 # for this (global event?)
3165 %ext::player_env::MUSIC_FACE_CACHE = (); 3364 %ext::player_env::MUSIC_FACE_CACHE = ();
3166 3365
3167 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3366 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3168 3367
3169 warn "loading facedata from $path\n"; 3368 trace "loading facedata from $path\n";
3170 3369
3171 my $facedata; 3370 my $facedata;
3172 0 < aio_load $path, $facedata 3371 0 < aio_load $path, $facedata
3173 or die "$path: $!"; 3372 or die "$path: $!";
3174 3373
3176 3375
3177 $facedata->{version} == 2 3376 $facedata->{version} == 2
3178 or cf::cleanup "$path: version mismatch, cannot proceed."; 3377 or cf::cleanup "$path: version mismatch, cannot proceed.";
3179 3378
3180 # patch in the exptable 3379 # patch in the exptable
3380 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3181 $facedata->{resource}{"res/exp_table"} = { 3381 $facedata->{resource}{"res/exp_table"} = {
3182 type => FT_RSRC, 3382 type => FT_RSRC,
3183 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3383 data => $exp_table,
3384 hash => (Digest::MD5::md5 $exp_table),
3184 }; 3385 };
3185 cf::cede_to_tick; 3386 cf::cede_to_tick;
3186 3387
3187 { 3388 {
3188 my $faces = $facedata->{faceinfo}; 3389 my $faces = $facedata->{faceinfo};
3190 while (my ($face, $info) = each %$faces) { 3391 while (my ($face, $info) = each %$faces) {
3191 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3392 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3192 3393
3193 cf::face::set_visibility $idx, $info->{visibility}; 3394 cf::face::set_visibility $idx, $info->{visibility};
3194 cf::face::set_magicmap $idx, $info->{magicmap}; 3395 cf::face::set_magicmap $idx, $info->{magicmap};
3195 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3396 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3196 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3397 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3197 3398
3198 cf::cede_to_tick; 3399 cf::cede_to_tick;
3199 } 3400 }
3200 3401
3201 while (my ($face, $info) = each %$faces) { 3402 while (my ($face, $info) = each %$faces) {
3206 3407
3207 if (my $smooth = cf::face::find $info->{smooth}) { 3408 if (my $smooth = cf::face::find $info->{smooth}) {
3208 cf::face::set_smooth $idx, $smooth; 3409 cf::face::set_smooth $idx, $smooth;
3209 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3410 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3210 } else { 3411 } else {
3211 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3412 error "smooth face '$info->{smooth}' not found for face '$face'";
3212 } 3413 }
3213 3414
3214 cf::cede_to_tick; 3415 cf::cede_to_tick;
3215 } 3416 }
3216 } 3417 }
3225 3426
3226 cf::anim::invalidate_all; # d'oh 3427 cf::anim::invalidate_all; # d'oh
3227 } 3428 }
3228 3429
3229 { 3430 {
3230 # TODO: for gcfclient pleasure, we should give resources
3231 # that gcfclient doesn't grok a >10000 face index.
3232 my $res = $facedata->{resource}; 3431 my $res = $facedata->{resource};
3233 3432
3234 while (my ($name, $info) = each %$res) { 3433 while (my ($name, $info) = each %$res) {
3235 if (defined $info->{type}) { 3434 if (defined $info->{type}) {
3236 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3435 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3237 my $data;
3238 3436
3239 if ($info->{type} & 1) { 3437 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}; 3438 cf::face::set_type $idx, $info->{type};
3254 } else { 3439 } else {
3255 $RESOURCE{$name} = $info; 3440 $RESOURCE{$name} = $info; # unused
3256 } 3441 }
3257 3442
3258 cf::cede_to_tick; 3443 cf::cede_to_tick;
3259 } 3444 }
3260 } 3445 }
3261 3446
3262 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3447 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3263 3448
3264 1 3449 1
3265} 3450}
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 3451
3287register_exticmd fx_want => sub { 3452register_exticmd fx_want => sub {
3288 my ($ns, $want) = @_; 3453 my ($ns, $want) = @_;
3289 3454
3290 while (my ($k, $v) = each %$want) { 3455 while (my ($k, $v) = each %$want) {
3329sub reload_treasures { 3494sub reload_treasures {
3330 load_resource_file "$DATADIR/treasures" 3495 load_resource_file "$DATADIR/treasures"
3331 or die "unable to load treasurelists\n"; 3496 or die "unable to load treasurelists\n";
3332} 3497}
3333 3498
3499sub reload_sound {
3500 trace "loading sound config from $DATADIR/sound\n";
3501
3502 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3503 or die "$DATADIR/sound $!";
3504
3505 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3506
3507 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3508 my $sound = $soundconf->{compat}[$_]
3509 or next;
3510
3511 my $face = cf::face::find "sound/$sound->[1]";
3512 cf::sound::set $sound->[0] => $face;
3513 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3514 }
3515
3516 while (my ($k, $v) = each %{$soundconf->{event}}) {
3517 my $face = cf::face::find "sound/$v";
3518 cf::sound::set $k => $face;
3519 }
3520}
3521
3334sub reload_resources { 3522sub reload_resources {
3335 warn "reloading resource files...\n"; 3523 trace "reloading resource files...\n";
3336 3524
3337 reload_facedata; 3525 reload_facedata;
3526 reload_sound;
3338 reload_archetypes; 3527 reload_archetypes;
3339 reload_regions; 3528 reload_regions;
3340 reload_treasures; 3529 reload_treasures;
3341 3530
3342 warn "finished reloading resource files\n"; 3531 trace "finished reloading resource files\n";
3343} 3532}
3344 3533
3345sub reload_config { 3534sub reload_config {
3535 trace "reloading config file...\n";
3536
3346 open my $fh, "<:utf8", "$CONFDIR/config" 3537 open my $fh, "<:utf8", "$CONFDIR/config"
3347 or return; 3538 or return;
3348 3539
3349 local $/; 3540 local $/;
3350 *CFG = YAML::Load <$fh>; 3541 *CFG = YAML::XS::Load scalar <$fh>;
3351 3542
3352 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3543 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3353 3544
3354 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3545 $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}; 3546 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3356 3547
3357 if (exists $CFG{mlockall}) { 3548 if (exists $CFG{mlockall}) {
3359 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3550 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3360 and die "WARNING: m(un)lockall failed: $!\n"; 3551 and die "WARNING: m(un)lockall failed: $!\n";
3361 }; 3552 };
3362 warn $@ if $@; 3553 warn $@ if $@;
3363 } 3554 }
3555
3556 trace "finished reloading resource files\n";
3364} 3557}
3365 3558
3366sub pidfile() { 3559sub pidfile() {
3367 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3560 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3368 or die "$PIDFILE: $!"; 3561 or die "$PIDFILE: $!";
3380 3573
3381 seek $fh, 0, 0; 3574 seek $fh, 0, 0;
3382 print $fh $$; 3575 print $fh $$;
3383} 3576}
3384 3577
3578sub main_loop {
3579 trace "EV::loop starting\n";
3580 if (1) {
3581 EV::loop;
3582 }
3583 trace "EV::loop returned\n";
3584 goto &main_loop unless $REALLY_UNLOOP;
3585}
3586
3385sub main { 3587sub main {
3386 cf::init_globals; # initialise logging 3588 cf::init_globals; # initialise logging
3387 3589
3388 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3590 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3389 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3591 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3390 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3592 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3391 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3593 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 3594
3398 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3595 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3399 3596
3400 # we must not ever block the main coroutine 3597 # we must not ever block the main coroutine
3401 local $Coro::idle = sub { 3598 local $Coro::idle = sub {
3407 }; 3604 };
3408 3605
3409 evthread_start IO::AIO::poll_fileno; 3606 evthread_start IO::AIO::poll_fileno;
3410 3607
3411 cf::sync_job { 3608 cf::sync_job {
3609 cf::init_experience;
3610 cf::init_anim;
3611 cf::init_attackmess;
3612 cf::init_dynamic;
3613
3614 cf::load_settings;
3615 cf::load_materials;
3616
3412 reload_resources; 3617 reload_resources;
3413 reload_config; 3618 reload_config;
3414 db_init; 3619 db_init;
3415 3620
3416 cf::load_settings;
3417 cf::load_materials;
3418 cf::init_uuid; 3621 cf::init_uuid;
3419 cf::init_signals; 3622 cf::init_signals;
3420 cf::init_commands;
3421 cf::init_skills; 3623 cf::init_skills;
3422 3624
3423 cf::init_beforeplay; 3625 cf::init_beforeplay;
3424 3626
3425 atomic; 3627 atomic;
3427 load_extensions; 3629 load_extensions;
3428 3630
3429 utime time, time, $RUNTIMEFILE; 3631 utime time, time, $RUNTIMEFILE;
3430 3632
3431 # no (long-running) fork's whatsoever before this point(!) 3633 # no (long-running) fork's whatsoever before this point(!)
3634 use POSIX ();
3432 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3635 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3433 3636
3434 (pop @POST_INIT)->(0) while @POST_INIT; 3637 (pop @POST_INIT)->(0) while @POST_INIT;
3435 }; 3638 };
3436 3639
3437 EV::loop; 3640 cf::object::thawer::errors_are_fatal 0;
3641 info "parse errors in files are no longer fatal from this point on.\n";
3642
3643 main_loop;
3438} 3644}
3439 3645
3440############################################################################# 3646#############################################################################
3441# initialisation and cleanup 3647# initialisation and cleanup
3442 3648
3443# install some emergency cleanup handlers 3649# install some emergency cleanup handlers
3444BEGIN { 3650BEGIN {
3445 our %SIGWATCHER = (); 3651 our %SIGWATCHER = ();
3446 for my $signal (qw(INT HUP TERM)) { 3652 for my $signal (qw(INT HUP TERM)) {
3447 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3653 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3448 cf::cleanup "SIG$signal"; 3654 cf::cleanup "SIG$signal";
3449 }; 3655 };
3450 } 3656 }
3451} 3657}
3452 3658
3453sub write_runtime_sync { 3659sub write_runtime_sync {
3660 my $t0 = AE::time;
3661
3454 # first touch the runtime file to show we are still running: 3662 # first touch the runtime file to show we are still running:
3455 # the fsync below can take a very very long time. 3663 # the fsync below can take a very very long time.
3456 3664
3457 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3665 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3458 3666
3459 my $guard = cf::lock_acquire "write_runtime"; 3667 my $guard = cf::lock_acquire "write_runtime";
3460 3668
3461 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3669 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3462 or return; 3670 or return;
3463 3671
3464 my $value = $cf::RUNTIME + 90 + 10; 3672 my $value = $cf::RUNTIME + 90 + 10;
3465 # 10 is the runtime save interval, for a monotonic clock 3673 # 10 is the runtime save interval, for a monotonic clock
3466 # 60 allows for the watchdog to kill the server. 3674 # 60 allows for the watchdog to kill the server.
3479 or return; 3687 or return;
3480 3688
3481 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3689 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3482 and return; 3690 and return;
3483 3691
3484 warn "runtime file written.\n"; 3692 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3485 3693
3486 1 3694 1
3487} 3695}
3488 3696
3489our $uuid_lock; 3697our $uuid_lock;
3501 or return; 3709 or return;
3502 3710
3503 my $value = uuid_seq uuid_cur; 3711 my $value = uuid_seq uuid_cur;
3504 3712
3505 unless ($value) { 3713 unless ($value) {
3506 warn "cowardly refusing to write zero uuid value!\n"; 3714 info "cowardly refusing to write zero uuid value!\n";
3507 return; 3715 return;
3508 } 3716 }
3509 3717
3510 my $value = uuid_str $value + $uuid_skip; 3718 my $value = uuid_str $value + $uuid_skip;
3511 $uuid_skip = 0; 3719 $uuid_skip = 0;
3521 or return; 3729 or return;
3522 3730
3523 aio_rename "$uuid~", $uuid 3731 aio_rename "$uuid~", $uuid
3524 and return; 3732 and return;
3525 3733
3526 warn "uuid file written ($value).\n"; 3734 trace "uuid file written ($value).\n";
3527 3735
3528 1 3736 1
3529 3737
3530} 3738}
3531 3739
3537} 3745}
3538 3746
3539sub emergency_save() { 3747sub emergency_save() {
3540 my $freeze_guard = cf::freeze_mainloop; 3748 my $freeze_guard = cf::freeze_mainloop;
3541 3749
3542 warn "emergency_perl_save: enter\n"; 3750 info "emergency_perl_save: enter\n";
3543 3751
3544 cf::sync_job { 3752 cf::sync_job {
3545 # this is a trade-off: we want to be very quick here, so 3753 # this is a trade-off: we want to be very quick here, so
3546 # save all maps without fsync, and later call a global sync 3754 # save all maps without fsync, and later call a global sync
3547 # (which in turn might be very very slow) 3755 # (which in turn might be very very slow)
3548 local $USE_FSYNC = 0; 3756 local $USE_FSYNC = 0;
3549 3757
3550 # use a peculiar iteration method to avoid tripping on perl 3758 # use a peculiar iteration method to avoid tripping on perl
3551 # refcount bugs in for. also avoids problems with players 3759 # refcount bugs in for. also avoids problems with players
3552 # and maps saved/destroyed asynchronously. 3760 # and maps saved/destroyed asynchronously.
3553 warn "emergency_perl_save: begin player save\n"; 3761 info "emergency_perl_save: begin player save\n";
3554 for my $login (keys %cf::PLAYER) { 3762 for my $login (keys %cf::PLAYER) {
3555 my $pl = $cf::PLAYER{$login} or next; 3763 my $pl = $cf::PLAYER{$login} or next;
3556 $pl->valid or next; 3764 $pl->valid or next;
3557 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3765 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3558 $pl->save; 3766 $pl->save;
3559 } 3767 }
3560 warn "emergency_perl_save: end player save\n"; 3768 info "emergency_perl_save: end player save\n";
3561 3769
3562 warn "emergency_perl_save: begin map save\n"; 3770 info "emergency_perl_save: begin map save\n";
3563 for my $path (keys %cf::MAP) { 3771 for my $path (keys %cf::MAP) {
3564 my $map = $cf::MAP{$path} or next; 3772 my $map = $cf::MAP{$path} or next;
3565 $map->valid or next; 3773 $map->valid or next;
3566 $map->save; 3774 $map->save;
3567 } 3775 }
3568 warn "emergency_perl_save: end map save\n"; 3776 info "emergency_perl_save: end map save\n";
3569 3777
3570 warn "emergency_perl_save: begin database checkpoint\n"; 3778 info "emergency_perl_save: begin database checkpoint\n";
3571 BDB::db_env_txn_checkpoint $DB_ENV; 3779 BDB::db_env_txn_checkpoint $DB_ENV;
3572 warn "emergency_perl_save: end database checkpoint\n"; 3780 info "emergency_perl_save: end database checkpoint\n";
3573 3781
3574 warn "emergency_perl_save: begin write uuid\n"; 3782 info "emergency_perl_save: begin write uuid\n";
3575 write_uuid_sync 1; 3783 write_uuid_sync 1;
3576 warn "emergency_perl_save: end write uuid\n"; 3784 info "emergency_perl_save: end write uuid\n";
3577 }; 3785 };
3578 3786
3579 warn "emergency_perl_save: starting sync()\n"; 3787 info "emergency_perl_save: starting sync()\n";
3580 IO::AIO::aio_sync sub { 3788 IO::AIO::aio_sync sub {
3581 warn "emergency_perl_save: finished sync()\n"; 3789 info "emergency_perl_save: finished sync()\n";
3582 }; 3790 };
3583 3791
3584 warn "emergency_perl_save: leave\n"; 3792 info "emergency_perl_save: leave\n";
3585} 3793}
3586 3794
3587sub post_cleanup { 3795sub post_cleanup {
3588 my ($make_core) = @_; 3796 my ($make_core) = @_;
3589 3797
3590 warn Carp::longmess "post_cleanup backtrace" 3798 error Carp::longmess "post_cleanup backtrace"
3591 if $make_core; 3799 if $make_core;
3592 3800
3593 my $fh = pidfile; 3801 my $fh = pidfile;
3594 unlink $PIDFILE if <$fh> == $$; 3802 unlink $PIDFILE if <$fh> == $$;
3595} 3803}
3615 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3823 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3616 for my $name (keys %$leaf_symtab) { 3824 for my $name (keys %$leaf_symtab) {
3617 _gv_clear *{"$pkg$name"}; 3825 _gv_clear *{"$pkg$name"};
3618# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3826# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3619 } 3827 }
3620 warn "cleared package $pkg\n";#d#
3621} 3828}
3622 3829
3623sub do_reload_perl() { 3830sub do_reload_perl() {
3624 # can/must only be called in main 3831 # can/must only be called in main
3625 if ($Coro::current != $Coro::main) { 3832 if (in_main) {
3626 warn "can only reload from main coroutine"; 3833 error "can only reload from main coroutine";
3627 return; 3834 return;
3628 } 3835 }
3629 3836
3630 return if $RELOAD++; 3837 return if $RELOAD++;
3631 3838
3632 my $t1 = EV::time; 3839 my $t1 = AE::time;
3633 3840
3634 while ($RELOAD) { 3841 while ($RELOAD) {
3635 warn "reloading..."; 3842 info "reloading...";
3636 3843
3637 warn "entering sync_job"; 3844 trace "entering sync_job";
3638 3845
3639 cf::sync_job { 3846 cf::sync_job {
3640 cf::write_runtime_sync; # external watchdog should not bark 3847 cf::write_runtime_sync; # external watchdog should not bark
3641 cf::emergency_save; 3848 cf::emergency_save;
3642 cf::write_runtime_sync; # external watchdog should not bark 3849 cf::write_runtime_sync; # external watchdog should not bark
3643 3850
3644 warn "syncing database to disk"; 3851 trace "syncing database to disk";
3645 BDB::db_env_txn_checkpoint $DB_ENV; 3852 BDB::db_env_txn_checkpoint $DB_ENV;
3646 3853
3647 # if anything goes wrong in here, we should simply crash as we already saved 3854 # if anything goes wrong in here, we should simply crash as we already saved
3648 3855
3649 warn "flushing outstanding aio requests"; 3856 trace "flushing outstanding aio requests";
3650 while (IO::AIO::nreqs || BDB::nreqs) { 3857 while (IO::AIO::nreqs || BDB::nreqs) {
3651 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 3858 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3652 } 3859 }
3653 3860
3654 warn "cancelling all extension coros"; 3861 trace "cancelling all extension coros";
3655 $_->cancel for values %EXT_CORO; 3862 $_->cancel for values %EXT_CORO;
3656 %EXT_CORO = (); 3863 %EXT_CORO = ();
3657 3864
3658 warn "removing commands"; 3865 trace "removing commands";
3659 %COMMAND = (); 3866 %COMMAND = ();
3660 3867
3661 warn "removing ext/exti commands"; 3868 trace "removing ext/exti commands";
3662 %EXTCMD = (); 3869 %EXTCMD = ();
3663 %EXTICMD = (); 3870 %EXTICMD = ();
3664 3871
3665 warn "unloading/nuking all extensions"; 3872 trace "unloading/nuking all extensions";
3666 for my $pkg (@EXTS) { 3873 for my $pkg (@EXTS) {
3667 warn "... unloading $pkg"; 3874 trace "... unloading $pkg";
3668 3875
3669 if (my $cb = $pkg->can ("unload")) { 3876 if (my $cb = $pkg->can ("unload")) {
3670 eval { 3877 eval {
3671 $cb->($pkg); 3878 $cb->($pkg);
3672 1 3879 1
3673 } or warn "$pkg unloaded, but with errors: $@"; 3880 } or error "$pkg unloaded, but with errors: $@";
3674 } 3881 }
3675 3882
3676 warn "... clearing $pkg"; 3883 trace "... clearing $pkg";
3677 clear_package $pkg; 3884 clear_package $pkg;
3678 } 3885 }
3679 3886
3680 warn "unloading all perl modules loaded from $LIBDIR"; 3887 trace "unloading all perl modules loaded from $LIBDIR";
3681 while (my ($k, $v) = each %INC) { 3888 while (my ($k, $v) = each %INC) {
3682 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3889 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3683 3890
3684 warn "... unloading $k"; 3891 trace "... unloading $k";
3685 delete $INC{$k}; 3892 delete $INC{$k};
3686 3893
3687 $k =~ s/\.pm$//; 3894 $k =~ s/\.pm$//;
3688 $k =~ s/\//::/g; 3895 $k =~ s/\//::/g;
3689 3896
3692 } 3899 }
3693 3900
3694 clear_package $k; 3901 clear_package $k;
3695 } 3902 }
3696 3903
3697 warn "getting rid of safe::, as good as possible"; 3904 trace "getting rid of safe::, as good as possible";
3698 clear_package "safe::$_" 3905 clear_package "safe::$_"
3699 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3906 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3700 3907
3701 warn "unloading cf.pm \"a bit\""; 3908 trace "unloading cf.pm \"a bit\"";
3702 delete $INC{"cf.pm"}; 3909 delete $INC{"cf.pm"};
3703 delete $INC{"cf/pod.pm"}; 3910 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3704 3911
3705 # don't, removes xs symbols, too, 3912 # don't, removes xs symbols, too,
3706 # and global variables created in xs 3913 # and global variables created in xs
3707 #clear_package __PACKAGE__; 3914 #clear_package __PACKAGE__;
3708 3915
3709 warn "unload completed, starting to reload now"; 3916 info "unload completed, starting to reload now";
3710 3917
3711 warn "reloading cf.pm"; 3918 trace "reloading cf.pm";
3712 require cf; 3919 require cf;
3713 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3920 cf::_connect_to_perl_1;
3714 3921
3715 warn "loading config and database again"; 3922 trace "loading config and database again";
3716 cf::reload_config; 3923 cf::reload_config;
3717 3924
3718 warn "loading extensions"; 3925 trace "loading extensions";
3719 cf::load_extensions; 3926 cf::load_extensions;
3720 3927
3721 if ($REATTACH_ON_RELOAD) { 3928 if ($REATTACH_ON_RELOAD) {
3722 warn "reattaching attachments to objects/players"; 3929 trace "reattaching attachments to objects/players";
3723 _global_reattach; # objects, sockets 3930 _global_reattach; # objects, sockets
3724 warn "reattaching attachments to maps"; 3931 trace "reattaching attachments to maps";
3725 reattach $_ for values %MAP; 3932 reattach $_ for values %MAP;
3726 warn "reattaching attachments to players"; 3933 trace "reattaching attachments to players";
3727 reattach $_ for values %PLAYER; 3934 reattach $_ for values %PLAYER;
3728 } 3935 }
3729 3936
3730 warn "running post_init jobs"; 3937 trace "running post_init jobs";
3731 (pop @POST_INIT)->(1) while @POST_INIT; 3938 (pop @POST_INIT)->(1) while @POST_INIT;
3732 3939
3733 warn "leaving sync_job"; 3940 trace "leaving sync_job";
3734 3941
3735 1 3942 1
3736 } or do { 3943 } or do {
3737 warn $@; 3944 error $@;
3738 cf::cleanup "error while reloading, exiting."; 3945 cf::cleanup "error while reloading, exiting.";
3739 }; 3946 };
3740 3947
3741 warn "reloaded"; 3948 info "reloaded";
3742 --$RELOAD; 3949 --$RELOAD;
3743 } 3950 }
3744 3951
3745 $t1 = EV::time - $t1; 3952 $t1 = AE::time - $t1;
3746 warn "reload completed in ${t1}s\n"; 3953 info "reload completed in ${t1}s\n";
3747}; 3954};
3748 3955
3749our $RELOAD_WATCHER; # used only during reload 3956our $RELOAD_WATCHER; # used only during reload
3750 3957
3751sub reload_perl() { 3958sub reload_perl() {
3753 # coro crashes during coro_state_free->destroy here. 3960 # coro crashes during coro_state_free->destroy here.
3754 3961
3755 $RELOAD_WATCHER ||= cf::async { 3962 $RELOAD_WATCHER ||= cf::async {
3756 Coro::AIO::aio_wait cache_extensions; 3963 Coro::AIO::aio_wait cache_extensions;
3757 3964
3758 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3965 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3759 do_reload_perl; 3966 do_reload_perl;
3760 undef $RELOAD_WATCHER; 3967 undef $RELOAD_WATCHER;
3761 }; 3968 };
3762 }; 3969 };
3763} 3970}
3780 3987
3781our @WAIT_FOR_TICK; 3988our @WAIT_FOR_TICK;
3782our @WAIT_FOR_TICK_BEGIN; 3989our @WAIT_FOR_TICK_BEGIN;
3783 3990
3784sub wait_for_tick { 3991sub wait_for_tick {
3785 return if tick_inhibit || $Coro::current == $Coro::main; 3992 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3786 3993
3787 my $signal = new Coro::Signal; 3994 my $signal = new Coro::Signal;
3788 push @WAIT_FOR_TICK, $signal; 3995 push @WAIT_FOR_TICK, $signal;
3789 $signal->wait; 3996 $signal->wait;
3790} 3997}
3791 3998
3792sub wait_for_tick_begin { 3999sub wait_for_tick_begin {
3793 return if tick_inhibit || $Coro::current == $Coro::main; 4000 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3794 4001
3795 my $signal = new Coro::Signal; 4002 my $signal = new Coro::Signal;
3796 push @WAIT_FOR_TICK_BEGIN, $signal; 4003 push @WAIT_FOR_TICK_BEGIN, $signal;
3797 $signal->wait; 4004 $signal->wait;
3798} 4005}
3804 return; 4011 return;
3805 } 4012 }
3806 4013
3807 cf::server_tick; # one server iteration 4014 cf::server_tick; # one server iteration
3808 4015
4016 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4017
3809 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4018 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3810 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4019 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3811 Coro::async_pool { 4020 Coro::async_pool {
3812 $Coro::current->{desc} = "runtime saver"; 4021 $Coro::current->{desc} = "runtime saver";
3813 write_runtime_sync 4022 write_runtime_sync
3814 or warn "ERROR: unable to write runtime file: $!"; 4023 or error "ERROR: unable to write runtime file: $!";
3815 }; 4024 };
3816 } 4025 }
3817 4026
3818 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4027 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3819 $sig->send; 4028 $sig->send;
3827 4036
3828 if (0) { 4037 if (0) {
3829 if ($NEXT_TICK) { 4038 if ($NEXT_TICK) {
3830 my $jitter = $TICK_START - $NEXT_TICK; 4039 my $jitter = $TICK_START - $NEXT_TICK;
3831 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4040 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3832 warn "jitter $JITTER\n";#d# 4041 debug "jitter $JITTER\n";#d#
3833 } 4042 }
3834 } 4043 }
3835} 4044}
3836 4045
3837{ 4046{
3838 # configure BDB 4047 # configure BDB
3839 4048
3840 BDB::min_parallel 8; 4049 BDB::min_parallel 16;
3841 BDB::max_poll_reqs $TICK * 0.1; 4050 BDB::max_poll_reqs $TICK * 0.1;
3842 $AnyEvent::BDB::WATCHER->priority (1); 4051 $AnyEvent::BDB::WATCHER->priority (1);
3843 4052
3844 unless ($DB_ENV) { 4053 unless ($DB_ENV) {
3845 $DB_ENV = BDB::db_env_create; 4054 $DB_ENV = BDB::db_env_create;
3925 LOG llevInfo, "[ABT] [suppressed]\n"; 4134 LOG llevInfo, "[ABT] [suppressed]\n";
3926 } 4135 }
3927} 4136}
3928 4137
3929# load additional modules 4138# load additional modules
3930use cf::pod; 4139require "cf/$_.pm" for @EXTRA_MODULES;
4140cf::_connect_to_perl_2;
3931 4141
3932END { cf::emergency_save } 4142END { cf::emergency_save }
3933 4143
39341 41441
3935 4145

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines