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.477 by root, Wed Sep 2 22:52:36 2009 UTC vs.
Revision 1.533 by root, Thu Apr 29 07:59:17 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use 5.10.0;
25use utf8; 26use utf8;
… …
31use EV; 32use EV;
32use Opcode; 33use Opcode;
33use Safe; 34use Safe;
34use Safe::Hole; 35use Safe::Hole;
35use Storable (); 36use Storable ();
37use Carp ();
36 38
37use Guard (); 39use Guard ();
38use Coro (); 40use Coro ();
39use Coro::State; 41use Coro::State;
40use Coro::Handle; 42use Coro::Handle;
… …
51use Coro::Util (); 53use Coro::Util ();
52 54
53use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
54use BDB (); 56use BDB ();
55use Data::Dumper; 57use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 58use Fcntl;
58use YAML (); 59use YAML::XS ();
59use IO::AIO (); 60use IO::AIO ();
60use Time::HiRes; 61use Time::HiRes;
61use Compress::LZF; 62use Compress::LZF;
62use Digest::MD5 (); 63use Digest::MD5 ();
63 64
… …
88our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
89our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
90 91
91our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
92our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
93 96
94our $CONFDIR = confdir; 97our $CONFDIR = confdir;
95our $DATADIR = datadir; 98our $DATADIR = datadir;
96our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
97our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
… …
103our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
104our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
105our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
106our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
107 110
108our %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;
109 118
110our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
111our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
112our $NEXT_TICK; 121our $NEXT_TICK;
113our $USE_FSYNC = 1; # use fsync to write maps - default on 122our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
115our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
116our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
117our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
118our $DB_ENV; 127our $DB_ENV;
119 128
120our @EXTRA_MODULES = qw(pod mapscript); 129our @EXTRA_MODULES = qw(pod match mapscript);
121 130
122our %CFG; 131our %CFG;
123 132
124our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
125our $RUNTIME; 134our $RUNTIME;
… …
159 168
160our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
161 170
162sub cf::map::normalise; 171sub cf::map::normalise;
163 172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
187
164############################################################################# 188#############################################################################
165 189
166=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
167 191
168=over 4 192=over 4
… …
214returns 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
215per 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.
216 240
217=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
218 242
219This array contains the results of the last C<invoke ()> call. When 243This array contains the results of the last C<invoke ()> call. When
220C<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
221that call. 245that call.
222 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
223=back 253=back
224 254
225=cut 255=cut
256
257sub error(@) { LOG llevError, join "", @_ }
258sub warn (@) { LOG llevWarn , join "", @_ }
259sub info (@) { LOG llevInfo , join "", @_ }
260sub debug(@) { LOG llevDebug, join "", @_ }
261sub trace(@) { LOG llevTrace, join "", @_ }
226 262
227$Coro::State::WARNHOOK = sub { 263$Coro::State::WARNHOOK = sub {
228 my $msg = join "", @_; 264 my $msg = join "", @_;
229 265
230 $msg .= "\n" 266 $msg .= "\n"
231 unless $msg =~ /\n$/; 267 unless $msg =~ /\n$/;
232 268
233 $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;
234 270
235 LOG llevError, $msg; 271 LOG llevWarn, $msg;
236}; 272};
237 273
238$Coro::State::DIEHOOK = sub { 274$Coro::State::DIEHOOK = sub {
239 return unless $^S eq 0; # "eq", not "==" 275 return unless $^S eq 0; # "eq", not "=="
240 276
241 warn Carp::longmess $_[0]; 277 error Carp::longmess $_[0];
242 278
243 if ($Coro::current == $Coro::main) {#d# 279 if (in_main) {#d#
244 warn "DIEHOOK called in main context, Coro bug?\n";#d# 280 error "DIEHOOK called in main context, Coro bug?\n";#d#
245 return;#d# 281 return;#d#
246 }#d# 282 }#d#
247 283
248 # kill coroutine otherwise 284 # kill coroutine otherwise
249 Coro::terminate 285 Coro::terminate
… …
269)) { 305)) {
270 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 306 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
271} 307}
272 308
273$EV::DIED = sub { 309$EV::DIED = sub {
274 warn "error in event callback: @_"; 310 Carp::cluck "error in event callback: @_";
275}; 311};
276 312
277############################################################################# 313#############################################################################
278 314
279=head2 UTILITY FUNCTIONS 315=head2 UTILITY FUNCTIONS
… …
376} 412}
377 413
378=item cf::periodic $interval, $cb 414=item cf::periodic $interval, $cb
379 415
380Like 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
381get spread over timer. 417get spread over time.
382 418
383=cut 419=cut
384 420
385sub periodic($$) { 421sub periodic($$) {
386 my ($interval, $cb) = @_; 422 my ($interval, $cb) = @_;
… …
403 439
404=cut 440=cut
405 441
406our @SLOT_QUEUE; 442our @SLOT_QUEUE;
407our $SLOT_QUEUE; 443our $SLOT_QUEUE;
444our $SLOT_DECAY = 0.9;
408 445
409$SLOT_QUEUE->cancel if $SLOT_QUEUE; 446$SLOT_QUEUE->cancel if $SLOT_QUEUE;
410$SLOT_QUEUE = Coro::async { 447$SLOT_QUEUE = Coro::async {
411 $Coro::current->desc ("timeslot manager"); 448 $Coro::current->desc ("timeslot manager");
412 449
413 my $signal = new Coro::Signal; 450 my $signal = new Coro::Signal;
451 my $busy;
414 452
415 while () { 453 while () {
416 next_job: 454 next_job:
455
417 my $avail = cf::till_tick; 456 my $avail = cf::till_tick;
418 if ($avail > 0.01) { 457
419 for (0 .. $#SLOT_QUEUE) { 458 for (0 .. $#SLOT_QUEUE) {
420 if ($SLOT_QUEUE[$_][0] < $avail) { 459 if ($SLOT_QUEUE[$_][0] <= $avail) {
460 $busy = 0;
421 my $job = splice @SLOT_QUEUE, $_, 1, (); 461 my $job = splice @SLOT_QUEUE, $_, 1, ();
422 $job->[2]->send; 462 $job->[2]->send;
423 Coro::cede; 463 Coro::cede;
424 goto next_job; 464 goto next_job;
425 } 465 } else {
466 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
426 } 467 }
427 } 468 }
428 469
429 if (@SLOT_QUEUE) { 470 if (@SLOT_QUEUE) {
430 # 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
431 push @cf::WAIT_FOR_TICK, $signal; 472 push @cf::WAIT_FOR_TICK, $signal;
432 $signal->wait; 473 $signal->wait;
433 } else { 474 } else {
475 $busy = 0;
434 Coro::schedule; 476 Coro::schedule;
435 } 477 }
436 } 478 }
437}; 479};
438 480
439sub get_slot($;$$) { 481sub get_slot($;$$) {
440 return if tick_inhibit || $Coro::current == $Coro::main; 482 return if tick_inhibit || $Coro::current == $Coro::main;
441 483
442 my ($time, $pri, $name) = @_; 484 my ($time, $pri, $name) = @_;
443 485
444 $time = $TICK * .6 if $time > $TICK * .6; 486 $time = clamp $time, 0.01, $TICK * .6;
487
445 my $sig = new Coro::Signal; 488 my $sig = new Coro::Signal;
446 489
447 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 490 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
448 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 491 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
449 $SLOT_QUEUE->ready; 492 $SLOT_QUEUE->ready;
… …
476 519
477sub sync_job(&) { 520sub sync_job(&) {
478 my ($job) = @_; 521 my ($job) = @_;
479 522
480 if ($Coro::current == $Coro::main) { 523 if ($Coro::current == $Coro::main) {
481 my $time = EV::time; 524 my $time = AE::time;
482 525
483 # this is the main coro, too bad, we have to block 526 # this is the main coro, too bad, we have to block
484 # till the operation succeeds, freezing the server :/ 527 # till the operation succeeds, freezing the server :/
485 528
486 LOG llevError, Carp::longmess "sync job";#d# 529 LOG llevError, Carp::longmess "sync job";#d#
… …
491 my @res; 534 my @res;
492 535
493 (async { 536 (async {
494 $Coro::current->desc ("sync job coro"); 537 $Coro::current->desc ("sync job coro");
495 @res = eval { $job->() }; 538 @res = eval { $job->() };
496 warn $@ if $@; 539 error $@ if $@;
497 undef $busy; 540 undef $busy;
498 })->prio (Coro::PRIO_MAX); 541 })->prio (Coro::PRIO_MAX);
499 542
500 while ($busy) { 543 while ($busy) {
501 if (Coro::nready) { 544 if (Coro::nready) {
… …
503 } else { 546 } else {
504 EV::loop EV::LOOP_ONESHOT; 547 EV::loop EV::LOOP_ONESHOT;
505 } 548 }
506 } 549 }
507 550
508 my $time = EV::time - $time; 551 my $time = AE::time - $time;
509 552
510 $TICK_START += $time; # do not account sync jobs to server load 553 $TICK_START += $time; # do not account sync jobs to server load
511 554
512 wantarray ? @res : $res[0] 555 wantarray ? @res : $res[0]
513 } else { 556 } else {
… …
557 reset_signals; 600 reset_signals;
558 &$cb 601 &$cb
559 }, @args; 602 }, @args;
560 603
561 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 )
562} 616}
563 617
564=item $coin = coin_from_name $name 618=item $coin = coin_from_name $name
565 619
566=cut 620=cut
… …
701 755
702 my $t1 = Time::HiRes::time; 756 my $t1 = Time::HiRes::time;
703 my $data = $process->(\@data); 757 my $data = $process->(\@data);
704 my $t2 = Time::HiRes::time; 758 my $t2 = Time::HiRes::time;
705 759
706 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 760 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
707 761
708 db_put cache => "$id/data", $data; 762 db_put cache => "$id/data", $data;
709 db_put cache => "$id/md5" , $md5; 763 db_put cache => "$id/md5" , $md5;
710 db_put cache => "$id/meta", $meta; 764 db_put cache => "$id/meta", $meta;
711 765
… …
721 775
722=cut 776=cut
723 777
724sub datalog($@) { 778sub datalog($@) {
725 my ($type, %kv) = @_; 779 my ($type, %kv) = @_;
726 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 780 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
727} 781}
728 782
729=back 783=back
730 784
731=cut 785=cut
… …
926 980
927 } elsif (exists $cb_id{$type}) { 981 } elsif (exists $cb_id{$type}) {
928 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 982 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
929 983
930 } elsif (ref $type) { 984 } elsif (ref $type) {
931 warn "attaching objects not supported, ignoring.\n"; 985 error "attaching objects not supported, ignoring.\n";
932 986
933 } else { 987 } else {
934 shift @arg; 988 shift @arg;
935 warn "attach argument '$type' not supported, ignoring.\n"; 989 error "attach argument '$type' not supported, ignoring.\n";
936 } 990 }
937 } 991 }
938} 992}
939 993
940sub _object_attach { 994sub _object_attach {
… …
950 _attach $registry, $klass, @attach; 1004 _attach $registry, $klass, @attach;
951 } 1005 }
952 1006
953 $obj->{$name} = \%arg; 1007 $obj->{$name} = \%arg;
954 } else { 1008 } else {
955 warn "object uses attachment '$name' which is not available, postponing.\n"; 1009 info "object uses attachment '$name' which is not available, postponing.\n";
956 } 1010 }
957 1011
958 $obj->{_attachment}{$name} = undef; 1012 $obj->{_attachment}{$name} = undef;
959} 1013}
960 1014
… …
1019 1073
1020 for (@$callbacks) { 1074 for (@$callbacks) {
1021 eval { &{$_->[1]} }; 1075 eval { &{$_->[1]} };
1022 1076
1023 if ($@) { 1077 if ($@) {
1024 warn "$@";
1025 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1078 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1026 override; 1079 override;
1027 } 1080 }
1028 1081
1029 return 1 if $override; 1082 return 1 if $override;
1030 } 1083 }
… …
1109 for (@$attach) { 1162 for (@$attach) {
1110 my ($klass, @attach) = @$_; 1163 my ($klass, @attach) = @$_;
1111 _attach $registry, $klass, @attach; 1164 _attach $registry, $klass, @attach;
1112 } 1165 }
1113 } else { 1166 } else {
1114 warn "object uses attachment '$name' that is not available, postponing.\n"; 1167 info "object uses attachment '$name' that is not available, postponing.\n";
1115 } 1168 }
1116 } 1169 }
1117} 1170}
1118 1171
1119cf::attachable->attach ( 1172cf::attachable->attach (
… …
1146 my ($filename, $rdata, $objs) = @_; 1199 my ($filename, $rdata, $objs) = @_;
1147 1200
1148 sync_job { 1201 sync_job {
1149 if (length $$rdata) { 1202 if (length $$rdata) {
1150 utf8::decode (my $decname = $filename); 1203 utf8::decode (my $decname = $filename);
1151 warn sprintf "saving %s (%d,%d)\n", 1204 trace sprintf "saving %s (%d,%d)\n",
1152 $decname, length $$rdata, scalar @$objs; 1205 $decname, length $$rdata, scalar @$objs
1206 if $VERBOSE_IO;
1153 1207
1154 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1208 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1155 aio_chmod $fh, SAVE_MODE; 1209 aio_chmod $fh, SAVE_MODE;
1156 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1210 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1157 if ($cf::USE_FSYNC) { 1211 if ($cf::USE_FSYNC) {
… …
1179 aio_rename "$filename~", $filename; 1233 aio_rename "$filename~", $filename;
1180 1234
1181 $filename =~ s%/[^/]+$%%; 1235 $filename =~ s%/[^/]+$%%;
1182 aio_pathsync $filename if $cf::USE_FSYNC; 1236 aio_pathsync $filename if $cf::USE_FSYNC;
1183 } else { 1237 } else {
1184 warn "unable to save objects: $filename~: $!\n"; 1238 error "unable to save objects: $filename~: $!\n";
1185 } 1239 }
1186 } else { 1240 } else {
1187 aio_unlink $filename; 1241 aio_unlink $filename;
1188 aio_unlink "$filename.pst"; 1242 aio_unlink "$filename.pst";
1189 } 1243 }
… …
1213 my $st = eval { Coro::Storable::thaw $av }; 1267 my $st = eval { Coro::Storable::thaw $av };
1214 $av = $st->{objs}; 1268 $av = $st->{objs};
1215 } 1269 }
1216 1270
1217 utf8::decode (my $decname = $filename); 1271 utf8::decode (my $decname = $filename);
1218 warn sprintf "loading %s (%d,%d)\n", 1272 trace sprintf "loading %s (%d,%d)\n",
1219 $decname, length $data, scalar @{$av || []}; 1273 $decname, length $data, scalar @{$av || []}
1274 if $VERBOSE_IO;
1220 1275
1221 ($data, $av) 1276 ($data, $av)
1222} 1277}
1223 1278
1224=head2 COMMAND CALLBACKS 1279=head2 COMMAND CALLBACKS
… …
1283} 1338}
1284 1339
1285use File::Glob (); 1340use File::Glob ();
1286 1341
1287cf::player->attach ( 1342cf::player->attach (
1288 on_command => sub { 1343 on_unknown_command => sub {
1289 my ($pl, $name, $params) = @_; 1344 my ($pl, $name, $params) = @_;
1290 1345
1291 my $cb = $COMMAND{$name} 1346 my $cb = $COMMAND{$name}
1292 or return; 1347 or return;
1293 1348
… …
1316 1371
1317 $pl->ext_reply ($reply, @reply) 1372 $pl->ext_reply ($reply, @reply)
1318 if $reply; 1373 if $reply;
1319 1374
1320 } else { 1375 } else {
1321 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1376 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1322 } 1377 }
1323 1378
1324 cf::override; 1379 cf::override;
1325 }, 1380 },
1326); 1381);
… …
1337 1392
1338 $grp 1393 $grp
1339} 1394}
1340 1395
1341sub load_extensions { 1396sub load_extensions {
1397 info "loading extensions...";
1398
1342 cf::sync_job { 1399 cf::sync_job {
1343 my %todo; 1400 my %todo;
1344 1401
1345 for my $path (<$LIBDIR/*.ext>) { 1402 for my $path (<$LIBDIR/*.ext>) {
1346 next unless -r $path; 1403 next unless -r $path;
… …
1372 . "\n};\n1"; 1429 . "\n};\n1";
1373 1430
1374 $todo{$base} = \%ext; 1431 $todo{$base} = \%ext;
1375 } 1432 }
1376 1433
1434 my $pass = 0;
1377 my %done; 1435 my %done;
1378 while (%todo) { 1436 while (%todo) {
1379 my $progress; 1437 my $progress;
1380 1438
1439 ++$pass;
1440
1441 ext:
1381 while (my ($k, $v) = each %todo) { 1442 while (my ($k, $v) = each %todo) {
1382 for (split /,\s*/, $v->{meta}{depends}) { 1443 for (split /,\s*/, $v->{meta}{depends}) {
1383 goto skip 1444 next ext
1384 unless exists $done{$_}; 1445 unless exists $done{$_};
1385 } 1446 }
1386 1447
1387 warn "... loading '$k' into '$v->{pkg}'\n"; 1448 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1388 1449
1389 unless (eval $v->{source}) { 1450 my $active = eval $v->{source};
1451
1452 if (length $@) {
1390 my $msg = $@ ? "$v->{path}: $@\n" 1453 error "$v->{path}: $@\n";
1391 : "$v->{base}: extension inactive.\n";
1392 1454
1393 if (exists $v->{meta}{mandatory}) {
1394 warn $msg;
1395 cf::cleanup "mandatory extension failed to load, exiting."; 1455 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1396 } 1456 if exists $v->{meta}{mandatory};
1397 1457
1398 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;
1399 } 1467 }
1400
1401 $done{$k} = delete $todo{$k};
1402 push @EXTS, $v->{pkg};
1403 $progress = 1;
1404 } 1468 }
1405 1469
1406 skip: 1470 unless ($progress) {
1407 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1471 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1408 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 }
1409 } 1478 }
1410 }; 1479 };
1411} 1480}
1412 1481
1413############################################################################# 1482#############################################################################
… …
1497 $cf::PLAYER{$login} = $pl 1566 $cf::PLAYER{$login} = $pl
1498 } 1567 }
1499 } 1568 }
1500} 1569}
1501 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
1502sub save($) { 1584sub save($) {
1503 my ($pl) = @_; 1585 my ($pl) = @_;
1504 1586
1505 return if $pl->{deny_save}; 1587 return if $pl->{deny_save};
1506 1588
… …
1511 1593
1512 aio_mkdir playerdir $pl, 0770; 1594 aio_mkdir playerdir $pl, 0770;
1513 $pl->{last_save} = $cf::RUNTIME; 1595 $pl->{last_save} = $cf::RUNTIME;
1514 1596
1515 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];
1516 1601
1517 $pl->save_pl ($path); 1602 $pl->save_pl ($path);
1518 cf::cede_to_tick; 1603 cf::cede_to_tick;
1519} 1604}
1520 1605
… …
1557 $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
1558 1643
1559 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1644 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1560 $pl->deactivate; 1645 $pl->deactivate;
1561 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;
1562 $pl->ob->check_score;
1563 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1647 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1564 $pl->ns->destroy if $pl->ns; 1648 $pl->ns->destroy if $pl->ns;
1565 1649
1566 my $path = playerdir $pl; 1650 my $path = playerdir $pl;
1567 my $temp = "$path~$cf::RUNTIME~deleting~"; 1651 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1622 \@logins 1706 \@logins
1623} 1707}
1624 1708
1625=item $player->maps 1709=item $player->maps
1626 1710
1711=item cf::player::maps $login
1712
1627Returns an arrayref of map paths that are private for this 1713Returns an arrayref of map paths that are private for this
1628player. May block. 1714player. May block.
1629 1715
1630=cut 1716=cut
1631 1717
… …
1693=cut 1779=cut
1694 1780
1695sub find_by_path($) { 1781sub find_by_path($) {
1696 my ($path) = @_; 1782 my ($path) = @_;
1697 1783
1784 $path =~ s/^~[^\/]*//; # skip ~login
1785
1698 my ($match, $specificity); 1786 my ($match, $specificity);
1699 1787
1700 for my $region (list) { 1788 for my $region (list) {
1701 if ($region->{match} && $path =~ $region->{match}) { 1789 if ($region->{match} && $path =~ $region->{match}) {
1702 ($match, $specificity) = ($region, $region->specificity) 1790 ($match, $specificity) = ($region, $region->specificity)
… …
1733 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
1734 1822
1735 # mit "rum" bekleckern, nicht 1823 # mit "rum" bekleckern, nicht
1736 $self->_create_random_map ( 1824 $self->_create_random_map (
1737 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1825 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1738 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1826 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1739 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1827 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1740 $rmp->{exit_on_final_map}, 1828 $rmp->{exit_on_final_map},
1741 $rmp->{xsize}, $rmp->{ysize}, 1829 $rmp->{xsize}, $rmp->{ysize},
1742 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1830 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1743 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1831 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1765 1853
1766 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1854 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1767} 1855}
1768 1856
1769# also paths starting with '/' 1857# also paths starting with '/'
1770$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1858$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1771 1859
1772sub thawer_merge { 1860sub thawer_merge {
1773 my ($self, $merge) = @_; 1861 my ($self, $merge) = @_;
1774 1862
1775 # we have to keep some variables in memory intact 1863 # we have to keep some variables in memory intact
… …
1989 2077
1990 $cf::MAP{$path} = $map 2078 $cf::MAP{$path} = $map
1991 } 2079 }
1992} 2080}
1993 2081
1994sub pre_load { } 2082sub pre_load { }
1995sub post_load { } 2083#sub post_load { } # XS
1996 2084
1997sub load { 2085sub load {
1998 my ($self) = @_; 2086 my ($self) = @_;
1999 2087
2000 local $self->{deny_reset} = 1; # loading can take a long time 2088 local $self->{deny_reset} = 1; # loading can take a long time
… …
2057 } 2145 }
2058 2146
2059 $self->post_load; 2147 $self->post_load;
2060} 2148}
2061 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
2062sub customise_for { 2153sub customise_for {
2063 my ($self, $ob) = @_; 2154 my ($self, $ob) = @_;
2064 2155
2065 return find "~" . $ob->name . "/" . $self->{path} 2156 return find "~" . $ob->name . "/" . $self->{path}
2066 if $self->per_player; 2157 if $self->per_player;
… …
2082 or next; 2173 or next;
2083 $neigh = find $neigh, $map 2174 $neigh = find $neigh, $map
2084 or next; 2175 or next;
2085 $neigh->load; 2176 $neigh->load;
2086 2177
2178 # now find the diagonal neighbours
2087 push @neigh, 2179 push @neigh,
2088 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2180 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2089 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2181 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2090 } 2182 }
2091 2183
… …
2143 $MAP_PREFETCHER->prio (6); 2235 $MAP_PREFETCHER->prio (6);
2144 2236
2145 () 2237 ()
2146} 2238}
2147 2239
2240# common code, used by both ->save and ->swapout
2148sub save { 2241sub _save {
2149 my ($self) = @_; 2242 my ($self) = @_;
2150
2151 my $lock = cf::lock_acquire "map_data:$self->{path}";
2152 2243
2153 $self->{last_save} = $cf::RUNTIME; 2244 $self->{last_save} = $cf::RUNTIME;
2154 2245
2155 return unless $self->dirty; 2246 return unless $self->dirty;
2156 2247
… …
2176 } else { 2267 } else {
2177 $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);
2178 } 2269 }
2179} 2270}
2180 2271
2272sub save {
2273 my ($self) = @_;
2274
2275 my $lock = cf::lock_acquire "map_data:$self->{path}";
2276
2277 $self->_save;
2278}
2279
2181sub swap_out { 2280sub swap_out {
2182 my ($self) = @_; 2281 my ($self) = @_;
2183 2282
2184 # save first because save cedes
2185 $self->save;
2186
2187 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2283 my $lock = cf::lock_acquire "map_data:$self->{path}";
2188 2284
2189 return if $self->players;
2190 return if $self->in_memory != cf::MAP_ACTIVE; 2285 return if $self->in_memory != cf::MAP_ACTIVE;
2191 return if $self->{deny_save}; 2286 return if $self->{deny_save};
2287 return if $self->players;
2192 2288
2289 # first deactivate the map and "unlink" it from the core
2290 $self->deactivate;
2291 $_->clear_links_to ($self) for values %cf::MAP;
2193 $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};
2194 2339
2195 $self->deactivate; 2340 $self->deactivate;
2196 $_->clear_links_to ($self) for values %cf::MAP; 2341 $_->clear_links_to ($self) for values %cf::MAP;
2197 $self->clear; 2342 $self->clear;
2198}
2199
2200sub reset_at {
2201 my ($self) = @_;
2202
2203 # TODO: safety, remove and allow resettable per-player maps
2204 return 1e99 if $self->{deny_reset};
2205
2206 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2207 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2208
2209 $time + $to
2210}
2211
2212sub should_reset {
2213 my ($self) = @_;
2214
2215 $self->reset_at <= $cf::RUNTIME
2216}
2217
2218sub reset {
2219 my ($self) = @_;
2220
2221 my $lock = cf::lock_acquire "map_data:$self->{path}";
2222
2223 return if $self->players;
2224
2225 warn "resetting map ", $self->path;
2226
2227 $self->in_memory (cf::MAP_SWAPPED);
2228
2229 # need to save uniques path
2230 unless ($self->{deny_save}) {
2231 my $uniq = $self->uniq_path; utf8::encode $uniq;
2232
2233 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2234 if $uniq;
2235 }
2236
2237 delete $cf::MAP{$self->path};
2238
2239 $self->deactivate;
2240 $_->clear_links_to ($self) for values %cf::MAP;
2241 $self->clear;
2242 2343
2243 $self->unlink_save; 2344 $self->unlink_save;
2244 $self->destroy; 2345 $self->destroy;
2245} 2346}
2246 2347
… …
2254 2355
2255 delete $cf::MAP{$self->path}; 2356 delete $cf::MAP{$self->path};
2256 2357
2257 $self->unlink_save; 2358 $self->unlink_save;
2258 2359
2259 bless $self, "cf::map"; 2360 bless $self, "cf::map::wrap";
2260 delete $self->{deny_reset}; 2361 delete $self->{deny_reset};
2261 $self->{deny_save} = 1; 2362 $self->{deny_save} = 1;
2262 $self->reset_timeout (1); 2363 $self->reset_timeout (1);
2263 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2364 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2264 2365
… …
2321 : normalise $_ 2422 : normalise $_
2322 } @{ aio_readdir $UNIQUEDIR or [] } 2423 } @{ aio_readdir $UNIQUEDIR or [] }
2323 ] 2424 ]
2324} 2425}
2325 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
2326=back 2459=back
2327 2460
2328=head3 cf::object 2461=head3 cf::object
2329 2462
2330=cut 2463=cut
… …
2462 2595
2463Freezes 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}>).
2464 2597
2465The 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.
2466for 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,
2467though, 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
2468map. 2601map.
2469 2602
2470Will never block. 2603Will never block.
2471 2604
2472=item $player_object->leave_link ($map, $x, $y) 2605=item $player_object->leave_link ($map, $x, $y)
… …
2493sub cf::object::player::enter_link { 2626sub cf::object::player::enter_link {
2494 my ($self) = @_; 2627 my ($self) = @_;
2495 2628
2496 $self->deactivate_recursive; 2629 $self->deactivate_recursive;
2497 2630
2631 ++$self->{_link_recursion};
2632
2498 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2633 return if UNIVERSAL::isa $self->map, "ext::map_link";
2499 2634
2500 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2635 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2501 if $self->map && $self->map->{path} ne "{link}"; 2636 if $self->map && $self->map->{path} ne "{link}";
2502 2637
2503 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2638 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2504} 2639}
2505 2640
2506sub cf::object::player::leave_link { 2641sub cf::object::player::leave_link {
2507 my ($self, $map, $x, $y) = @_; 2642 my ($self, $map, $x, $y) = @_;
2508 2643
… …
2525 ($x, $y) = (-1, -1) 2660 ($x, $y) = (-1, -1)
2526 unless (defined $x) && (defined $y); 2661 unless (defined $x) && (defined $y);
2527 2662
2528 # use -1 or undef as default coordinates, not 0, 0 2663 # use -1 or undef as default coordinates, not 0, 0
2529 ($x, $y) = ($map->enter_x, $map->enter_y) 2664 ($x, $y) = ($map->enter_x, $map->enter_y)
2530 if $x <=0 && $y <= 0; 2665 if $x <= 0 && $y <= 0;
2531 2666
2532 $map->load; 2667 $map->load;
2533 $map->load_neighbours; 2668 $map->load_neighbours;
2534 2669
2535 return unless $self->contr->active; 2670 return unless $self->contr->active;
2536 2671
2537 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2672 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2538 $self->enter_map ($map, $x, $y); 2673 if ($self->enter_map ($map, $x, $y)) {
2539 2674 # entering was successful
2675 delete $self->{_link_recursion};
2540 # only activate afterwards, to support waiting in hooks 2676 # only activate afterwards, to support waiting in hooks
2541 $self->activate_recursive; 2677 $self->activate_recursive;
2542} 2678 }
2543 2679
2680}
2681
2544=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)]])
2545 2683
2546Moves 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
2547her, loading and preparing them map, calling the provided $check callback 2685her, loading and preparing them map, calling the provided $check callback
2548that 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
2549the 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
… …
2556 2694
2557our $GOTOGEN; 2695our $GOTOGEN;
2558 2696
2559sub cf::object::player::goto { 2697sub cf::object::player::goto {
2560 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 }
2561 2705
2562 # 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
2563 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2707 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2564 2708
2565 $self->enter_link; 2709 $self->enter_link;
… …
2589 my $map = eval { 2733 my $map = eval {
2590 my $map = defined $path ? cf::map::find $path : undef; 2734 my $map = defined $path ? cf::map::find $path : undef;
2591 2735
2592 if ($map) { 2736 if ($map) {
2593 $map = $map->customise_for ($self); 2737 $map = $map->customise_for ($self);
2594 $map = $check->($map) if $check && $map; 2738 $map = $check->($map, $x, $y, $self) if $check && $map;
2595 } else { 2739 } else {
2596 $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);
2597 } 2741 }
2598 2742
2599 $map 2743 $map
… …
2607 if ($gen == $self->{_goto_generation}) { 2751 if ($gen == $self->{_goto_generation}) {
2608 delete $self->{_goto_generation}; 2752 delete $self->{_goto_generation};
2609 $self->leave_link ($map, $x, $y); 2753 $self->leave_link ($map, $x, $y);
2610 } 2754 }
2611 2755
2612 $done->() if $done; 2756 $done->($self) if $done;
2613 })->prio (1); 2757 })->prio (1);
2614} 2758}
2615 2759
2616=item $player_object->enter_exit ($exit_object) 2760=item $player_object->enter_exit ($exit_object)
2617 2761
… …
2710 $self->message ("Something went wrong deep within the deliantra server. " 2854 $self->message ("Something went wrong deep within the deliantra server. "
2711 . "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. "
2712 . "Please report this to the dungeon master!", 2856 . "Please report this to the dungeon master!",
2713 cf::NDI_UNIQUE | cf::NDI_RED); 2857 cf::NDI_UNIQUE | cf::NDI_RED);
2714 2858
2715 warn "ERROR in enter_exit: $@"; 2859 error "ERROR in enter_exit: $@";
2716 $self->leave_link; 2860 $self->leave_link;
2717 } 2861 }
2718 })->prio (1); 2862 })->prio (1);
2719} 2863}
2720 2864
… …
2732sub cf::client::send_drawinfo { 2876sub cf::client::send_drawinfo {
2733 my ($self, $text, $flags) = @_; 2877 my ($self, $text, $flags) = @_;
2734 2878
2735 utf8::encode $text; 2879 utf8::encode $text;
2736 $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);
2737} 2906}
2738 2907
2739=item $client->send_msg ($channel, $msg, $color, [extra...]) 2908=item $client->send_msg ($channel, $msg, $color, [extra...])
2740 2909
2741Send 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
… …
2745 2914
2746=cut 2915=cut
2747 2916
2748# non-persistent channels (usually the info channel) 2917# non-persistent channels (usually the info channel)
2749our %CHANNEL = ( 2918our %CHANNEL = (
2919 "c/motd" => {
2920 id => "infobox",
2921 title => "MOTD",
2922 reply => undef,
2923 tooltip => "The message of the day",
2924 },
2750 "c/identify" => { 2925 "c/identify" => {
2751 id => "infobox", 2926 id => "infobox",
2752 title => "Identify", 2927 title => "Identify",
2753 reply => undef, 2928 reply => undef,
2754 tooltip => "Items recently identified", 2929 tooltip => "Items recently identified",
… …
2756 "c/examine" => { 2931 "c/examine" => {
2757 id => "infobox", 2932 id => "infobox",
2758 title => "Examine", 2933 title => "Examine",
2759 reply => undef, 2934 reply => undef,
2760 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",
2761 }, 2942 },
2762 "c/book" => { 2943 "c/book" => {
2763 id => "infobox", 2944 id => "infobox",
2764 title => "Book", 2945 title => "Book",
2765 reply => undef, 2946 reply => undef,
… …
2881 my $pkt = "msg " 3062 my $pkt = "msg "
2882 . $self->{json_coder}->encode ( 3063 . $self->{json_coder}->encode (
2883 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3064 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2884 ); 3065 );
2885 3066
2886 # try lzf for large packets
2887 $pkt = "lzf " . Compress::LZF::compress $pkt
2888 if 1024 <= length $pkt and $self->{can_lzf};
2889
2890 # split very large packets
2891 if (8192 < length $pkt and $self->{can_lzf}) {
2892 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2893 $pkt = "frag";
2894 }
2895
2896 $self->send_packet ($pkt); 3067 $self->send_big_packet ($pkt);
2897} 3068}
2898 3069
2899=item $client->ext_msg ($type, @msg) 3070=item $client->ext_msg ($type, @msg)
2900 3071
2901Sends an ext event to the client. 3072Sends an ext event to the client.
… …
2904 3075
2905sub cf::client::ext_msg($$@) { 3076sub cf::client::ext_msg($$@) {
2906 my ($self, $type, @msg) = @_; 3077 my ($self, $type, @msg) = @_;
2907 3078
2908 if ($self->extcmd == 2) { 3079 if ($self->extcmd == 2) {
2909 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3080 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2910 } elsif ($self->extcmd == 1) { # TODO: remove 3081 } elsif ($self->extcmd == 1) { # TODO: remove
2911 push @msg, msgtype => "event_$type"; 3082 push @msg, msgtype => "event_$type";
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3083 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2913 } 3084 }
2914} 3085}
2915 3086
2916=item $client->ext_reply ($msgid, @msg) 3087=item $client->ext_reply ($msgid, @msg)
2917 3088
… …
2921 3092
2922sub cf::client::ext_reply($$@) { 3093sub cf::client::ext_reply($$@) {
2923 my ($self, $id, @msg) = @_; 3094 my ($self, $id, @msg) = @_;
2924 3095
2925 if ($self->extcmd == 2) { 3096 if ($self->extcmd == 2) {
2926 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3097 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2927 } elsif ($self->extcmd == 1) { 3098 } elsif ($self->extcmd == 1) {
2928 #TODO: version 1, remove 3099 #TODO: version 1, remove
2929 unshift @msg, msgtype => "reply", msgid => $id; 3100 unshift @msg, msgtype => "reply", msgid => $id;
2930 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3101 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2931 } 3102 }
2932} 3103}
2933 3104
2934=item $success = $client->query ($flags, "text", \&cb) 3105=item $success = $client->query ($flags, "text", \&cb)
2935 3106
… …
3006 3177
3007 $ns->ext_reply ($reply, @reply) 3178 $ns->ext_reply ($reply, @reply)
3008 if $reply; 3179 if $reply;
3009 3180
3010 } else { 3181 } else {
3011 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";
3012 } 3183 }
3013 3184
3014 cf::override; 3185 cf::override;
3015 }, 3186 },
3016); 3187);
… …
3036 3207
3037 $coro 3208 $coro
3038} 3209}
3039 3210
3040cf::client->attach ( 3211cf::client->attach (
3041 on_destroy => sub { 3212 on_client_destroy => sub {
3042 my ($ns) = @_; 3213 my ($ns) = @_;
3043 3214
3044 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3215 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3045 }, 3216 },
3046); 3217);
… …
3062our $safe_hole = new Safe::Hole; 3233our $safe_hole = new Safe::Hole;
3063 3234
3064$SIG{FPE} = 'IGNORE'; 3235$SIG{FPE} = 'IGNORE';
3065 3236
3066$safe->permit_only (Opcode::opset qw( 3237$safe->permit_only (Opcode::opset qw(
3067 :base_core :base_mem :base_orig :base_math 3238 :base_core :base_mem :base_orig :base_math :base_loop
3068 grepstart grepwhile mapstart mapwhile 3239 grepstart grepwhile mapstart mapwhile
3069 sort time 3240 sort time
3070)); 3241));
3071 3242
3072# here we export the classes and methods available to script code 3243# here we export the classes and methods available to script code
… …
3124 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3295 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3125 $qcode =~ s/\n/\\n/g; 3296 $qcode =~ s/\n/\\n/g;
3126 3297
3127 %vars = (_dummy => 0) unless %vars; 3298 %vars = (_dummy => 0) unless %vars;
3128 3299
3300 my @res;
3129 local $_; 3301 local $_;
3130 local @safe::cf::_safe_eval_args = values %vars;
3131 3302
3132 my $eval = 3303 my $eval =
3133 "do {\n" 3304 "do {\n"
3134 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3305 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3135 . "#line 0 \"{$qcode}\"\n" 3306 . "#line 0 \"{$qcode}\"\n"
3136 . $code 3307 . $code
3137 . "\n}" 3308 . "\n}"
3138 ; 3309 ;
3139 3310
3311 if ($CFG{safe_eval}) {
3140 sub_generation_inc; 3312 sub_generation_inc;
3313 local @safe::cf::_safe_eval_args = values %vars;
3141 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3314 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3142 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 }
3143 3320
3144 if ($@) { 3321 if ($@) {
3145 warn "$@"; 3322 warn "$@",
3146 warn "while executing safe code '$code'\n"; 3323 "while executing safe code '$code'\n",
3147 warn "with arguments " . (join " ", %vars) . "\n"; 3324 "with arguments " . (join " ", %vars) . "\n";
3148 } 3325 }
3149 3326
3150 wantarray ? @res : $res[0] 3327 wantarray ? @res : $res[0]
3151} 3328}
3152 3329
… …
3166=cut 3343=cut
3167 3344
3168sub register_script_function { 3345sub register_script_function {
3169 my ($fun, $cb) = @_; 3346 my ($fun, $cb) = @_;
3170 3347
3171 no strict 'refs'; 3348 $fun = "safe::$fun" if $CFG{safe_eval};
3172 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3349 *$fun = $safe_hole->wrap ($cb);
3173} 3350}
3174 3351
3175=back 3352=back
3176 3353
3177=cut 3354=cut
… …
3186 # for this (global event?) 3363 # for this (global event?)
3187 %ext::player_env::MUSIC_FACE_CACHE = (); 3364 %ext::player_env::MUSIC_FACE_CACHE = ();
3188 3365
3189 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3366 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3190 3367
3191 warn "loading facedata from $path\n"; 3368 trace "loading facedata from $path\n";
3192 3369
3193 my $facedata; 3370 my $facedata;
3194 0 < aio_load $path, $facedata 3371 0 < aio_load $path, $facedata
3195 or die "$path: $!"; 3372 or die "$path: $!";
3196 3373
… …
3198 3375
3199 $facedata->{version} == 2 3376 $facedata->{version} == 2
3200 or cf::cleanup "$path: version mismatch, cannot proceed."; 3377 or cf::cleanup "$path: version mismatch, cannot proceed.";
3201 3378
3202 # 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]);
3203 $facedata->{resource}{"res/exp_table"} = { 3381 $facedata->{resource}{"res/exp_table"} = {
3204 type => FT_RSRC, 3382 type => FT_RSRC,
3205 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),
3206 }; 3385 };
3207 cf::cede_to_tick; 3386 cf::cede_to_tick;
3208 3387
3209 { 3388 {
3210 my $faces = $facedata->{faceinfo}; 3389 my $faces = $facedata->{faceinfo};
… …
3212 while (my ($face, $info) = each %$faces) { 3391 while (my ($face, $info) = each %$faces) {
3213 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3392 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3214 3393
3215 cf::face::set_visibility $idx, $info->{visibility}; 3394 cf::face::set_visibility $idx, $info->{visibility};
3216 cf::face::set_magicmap $idx, $info->{magicmap}; 3395 cf::face::set_magicmap $idx, $info->{magicmap};
3217 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3396 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3218 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3397 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3219 3398
3220 cf::cede_to_tick; 3399 cf::cede_to_tick;
3221 } 3400 }
3222 3401
3223 while (my ($face, $info) = each %$faces) { 3402 while (my ($face, $info) = each %$faces) {
… …
3228 3407
3229 if (my $smooth = cf::face::find $info->{smooth}) { 3408 if (my $smooth = cf::face::find $info->{smooth}) {
3230 cf::face::set_smooth $idx, $smooth; 3409 cf::face::set_smooth $idx, $smooth;
3231 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3410 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3232 } else { 3411 } else {
3233 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3412 error "smooth face '$info->{smooth}' not found for face '$face'";
3234 } 3413 }
3235 3414
3236 cf::cede_to_tick; 3415 cf::cede_to_tick;
3237 } 3416 }
3238 } 3417 }
… …
3247 3426
3248 cf::anim::invalidate_all; # d'oh 3427 cf::anim::invalidate_all; # d'oh
3249 } 3428 }
3250 3429
3251 { 3430 {
3252 # TODO: for gcfclient pleasure, we should give resources
3253 # that gcfclient doesn't grok a >10000 face index.
3254 my $res = $facedata->{resource}; 3431 my $res = $facedata->{resource};
3255 3432
3256 while (my ($name, $info) = each %$res) { 3433 while (my ($name, $info) = each %$res) {
3257 if (defined $info->{type}) { 3434 if (defined $info->{type}) {
3258 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3435 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3259 my $data;
3260 3436
3261 if ($info->{type} & 1) { 3437 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3262 # prepend meta info
3263
3264 my $meta = $enc->encode ({
3265 name => $name,
3266 %{ $info->{meta} || {} },
3267 });
3268
3269 $data = pack "(w/a*)*", $meta, $info->{data};
3270 } else {
3271 $data = $info->{data};
3272 }
3273
3274 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3275 cf::face::set_type $idx, $info->{type}; 3438 cf::face::set_type $idx, $info->{type};
3276 } else { 3439 } else {
3277 $RESOURCE{$name} = $info; 3440 $RESOURCE{$name} = $info; # unused
3278 } 3441 }
3279 3442
3280 cf::cede_to_tick; 3443 cf::cede_to_tick;
3281 } 3444 }
3282 } 3445 }
3283 3446
3284 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3447 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3285 3448
3286 1 3449 1
3287} 3450}
3288
3289cf::global->attach (on_resource_update => sub {
3290 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3291 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3292
3293 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3294 my $sound = $soundconf->{compat}[$_]
3295 or next;
3296
3297 my $face = cf::face::find "sound/$sound->[1]";
3298 cf::sound::set $sound->[0] => $face;
3299 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3300 }
3301
3302 while (my ($k, $v) = each %{$soundconf->{event}}) {
3303 my $face = cf::face::find "sound/$v";
3304 cf::sound::set $k => $face;
3305 }
3306 }
3307});
3308 3451
3309register_exticmd fx_want => sub { 3452register_exticmd fx_want => sub {
3310 my ($ns, $want) = @_; 3453 my ($ns, $want) = @_;
3311 3454
3312 while (my ($k, $v) = each %$want) { 3455 while (my ($k, $v) = each %$want) {
… …
3351sub reload_treasures { 3494sub reload_treasures {
3352 load_resource_file "$DATADIR/treasures" 3495 load_resource_file "$DATADIR/treasures"
3353 or die "unable to load treasurelists\n"; 3496 or die "unable to load treasurelists\n";
3354} 3497}
3355 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
3356sub reload_resources { 3522sub reload_resources {
3357 warn "reloading resource files...\n"; 3523 trace "reloading resource files...\n";
3358 3524
3359 reload_facedata; 3525 reload_facedata;
3526 reload_sound;
3360 reload_archetypes; 3527 reload_archetypes;
3361 reload_regions; 3528 reload_regions;
3362 reload_treasures; 3529 reload_treasures;
3363 3530
3364 warn "finished reloading resource files\n"; 3531 trace "finished reloading resource files\n";
3365} 3532}
3366 3533
3367sub reload_config { 3534sub reload_config {
3535 trace "reloading config file...\n";
3536
3368 open my $fh, "<:utf8", "$CONFDIR/config" 3537 open my $fh, "<:utf8", "$CONFDIR/config"
3369 or return; 3538 or return;
3370 3539
3371 local $/; 3540 local $/;
3372 *CFG = YAML::Load <$fh>; 3541 *CFG = YAML::XS::Load scalar <$fh>;
3373 3542
3374 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3543 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3375 3544
3376 $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};
3377 $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};
3378 3547
3379 if (exists $CFG{mlockall}) { 3548 if (exists $CFG{mlockall}) {
… …
3381 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3550 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3382 and die "WARNING: m(un)lockall failed: $!\n"; 3551 and die "WARNING: m(un)lockall failed: $!\n";
3383 }; 3552 };
3384 warn $@ if $@; 3553 warn $@ if $@;
3385 } 3554 }
3555
3556 trace "finished reloading resource files\n";
3386} 3557}
3387 3558
3388sub pidfile() { 3559sub pidfile() {
3389 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3560 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3390 or die "$PIDFILE: $!"; 3561 or die "$PIDFILE: $!";
… …
3403 seek $fh, 0, 0; 3574 seek $fh, 0, 0;
3404 print $fh $$; 3575 print $fh $$;
3405} 3576}
3406 3577
3407sub main_loop { 3578sub main_loop {
3408 warn "EV::loop starting\n"; 3579 trace "EV::loop starting\n";
3409 if (1) { 3580 if (1) {
3410 EV::loop; 3581 EV::loop;
3411 } 3582 }
3412 warn "EV::loop returned\n"; 3583 trace "EV::loop returned\n";
3413 goto &main_loop unless $REALLY_UNLOOP; 3584 goto &main_loop unless $REALLY_UNLOOP;
3414} 3585}
3415 3586
3416sub main { 3587sub main {
3417 cf::init_globals; # initialise logging 3588 cf::init_globals; # initialise logging
3418 3589
3419 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3590 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3420 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.";
3421 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3592 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3422 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3593 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3423
3424 cf::init_experience;
3425 cf::init_anim;
3426 cf::init_attackmess;
3427 cf::init_dynamic;
3428 3594
3429 $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
3430 3596
3431 # we must not ever block the main coroutine 3597 # we must not ever block the main coroutine
3432 local $Coro::idle = sub { 3598 local $Coro::idle = sub {
… …
3438 }; 3604 };
3439 3605
3440 evthread_start IO::AIO::poll_fileno; 3606 evthread_start IO::AIO::poll_fileno;
3441 3607
3442 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
3443 reload_resources; 3617 reload_resources;
3444 reload_config; 3618 reload_config;
3445 db_init; 3619 db_init;
3446 3620
3447 cf::load_settings;
3448 cf::load_materials;
3449 cf::init_uuid; 3621 cf::init_uuid;
3450 cf::init_signals; 3622 cf::init_signals;
3451 cf::init_commands;
3452 cf::init_skills; 3623 cf::init_skills;
3453 3624
3454 cf::init_beforeplay; 3625 cf::init_beforeplay;
3455 3626
3456 atomic; 3627 atomic;
… …
3463 use POSIX (); 3634 use POSIX ();
3464 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};
3465 3636
3466 (pop @POST_INIT)->(0) while @POST_INIT; 3637 (pop @POST_INIT)->(0) while @POST_INIT;
3467 }; 3638 };
3639
3640 cf::object::thawer::errors_are_fatal 0;
3641 info "parse errors in files are no longer fatal from this point on.\n";
3468 3642
3469 main_loop; 3643 main_loop;
3470} 3644}
3471 3645
3472############################################################################# 3646#############################################################################
… …
3474 3648
3475# install some emergency cleanup handlers 3649# install some emergency cleanup handlers
3476BEGIN { 3650BEGIN {
3477 our %SIGWATCHER = (); 3651 our %SIGWATCHER = ();
3478 for my $signal (qw(INT HUP TERM)) { 3652 for my $signal (qw(INT HUP TERM)) {
3479 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3653 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3480 cf::cleanup "SIG$signal"; 3654 cf::cleanup "SIG$signal";
3481 }; 3655 };
3482 } 3656 }
3483} 3657}
3484 3658
3485sub write_runtime_sync { 3659sub write_runtime_sync {
3660 my $t0 = AE::time;
3661
3486 # first touch the runtime file to show we are still running: 3662 # first touch the runtime file to show we are still running:
3487 # the fsync below can take a very very long time. 3663 # the fsync below can take a very very long time.
3488 3664
3489 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3665 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3490 3666
3491 my $guard = cf::lock_acquire "write_runtime"; 3667 my $guard = cf::lock_acquire "write_runtime";
3492 3668
3493 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3669 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3494 or return; 3670 or return;
3495 3671
3496 my $value = $cf::RUNTIME + 90 + 10; 3672 my $value = $cf::RUNTIME + 90 + 10;
3497 # 10 is the runtime save interval, for a monotonic clock 3673 # 10 is the runtime save interval, for a monotonic clock
3498 # 60 allows for the watchdog to kill the server. 3674 # 60 allows for the watchdog to kill the server.
… …
3511 or return; 3687 or return;
3512 3688
3513 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3689 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3514 and return; 3690 and return;
3515 3691
3516 warn "runtime file written.\n"; 3692 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3517 3693
3518 1 3694 1
3519} 3695}
3520 3696
3521our $uuid_lock; 3697our $uuid_lock;
… …
3533 or return; 3709 or return;
3534 3710
3535 my $value = uuid_seq uuid_cur; 3711 my $value = uuid_seq uuid_cur;
3536 3712
3537 unless ($value) { 3713 unless ($value) {
3538 warn "cowardly refusing to write zero uuid value!\n"; 3714 info "cowardly refusing to write zero uuid value!\n";
3539 return; 3715 return;
3540 } 3716 }
3541 3717
3542 my $value = uuid_str $value + $uuid_skip; 3718 my $value = uuid_str $value + $uuid_skip;
3543 $uuid_skip = 0; 3719 $uuid_skip = 0;
… …
3553 or return; 3729 or return;
3554 3730
3555 aio_rename "$uuid~", $uuid 3731 aio_rename "$uuid~", $uuid
3556 and return; 3732 and return;
3557 3733
3558 warn "uuid file written ($value).\n"; 3734 trace "uuid file written ($value).\n";
3559 3735
3560 1 3736 1
3561 3737
3562} 3738}
3563 3739
… …
3569} 3745}
3570 3746
3571sub emergency_save() { 3747sub emergency_save() {
3572 my $freeze_guard = cf::freeze_mainloop; 3748 my $freeze_guard = cf::freeze_mainloop;
3573 3749
3574 warn "emergency_perl_save: enter\n"; 3750 info "emergency_perl_save: enter\n";
3575 3751
3576 cf::sync_job { 3752 cf::sync_job {
3577 # 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
3578 # save all maps without fsync, and later call a global sync 3754 # save all maps without fsync, and later call a global sync
3579 # (which in turn might be very very slow) 3755 # (which in turn might be very very slow)
3580 local $USE_FSYNC = 0; 3756 local $USE_FSYNC = 0;
3581 3757
3582 # use a peculiar iteration method to avoid tripping on perl 3758 # use a peculiar iteration method to avoid tripping on perl
3583 # refcount bugs in for. also avoids problems with players 3759 # refcount bugs in for. also avoids problems with players
3584 # and maps saved/destroyed asynchronously. 3760 # and maps saved/destroyed asynchronously.
3585 warn "emergency_perl_save: begin player save\n"; 3761 info "emergency_perl_save: begin player save\n";
3586 for my $login (keys %cf::PLAYER) { 3762 for my $login (keys %cf::PLAYER) {
3587 my $pl = $cf::PLAYER{$login} or next; 3763 my $pl = $cf::PLAYER{$login} or next;
3588 $pl->valid or next; 3764 $pl->valid or next;
3589 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3765 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3590 $pl->save; 3766 $pl->save;
3591 } 3767 }
3592 warn "emergency_perl_save: end player save\n"; 3768 info "emergency_perl_save: end player save\n";
3593 3769
3594 warn "emergency_perl_save: begin map save\n"; 3770 info "emergency_perl_save: begin map save\n";
3595 for my $path (keys %cf::MAP) { 3771 for my $path (keys %cf::MAP) {
3596 my $map = $cf::MAP{$path} or next; 3772 my $map = $cf::MAP{$path} or next;
3597 $map->valid or next; 3773 $map->valid or next;
3598 $map->save; 3774 $map->save;
3599 } 3775 }
3600 warn "emergency_perl_save: end map save\n"; 3776 info "emergency_perl_save: end map save\n";
3601 3777
3602 warn "emergency_perl_save: begin database checkpoint\n"; 3778 info "emergency_perl_save: begin database checkpoint\n";
3603 BDB::db_env_txn_checkpoint $DB_ENV; 3779 BDB::db_env_txn_checkpoint $DB_ENV;
3604 warn "emergency_perl_save: end database checkpoint\n"; 3780 info "emergency_perl_save: end database checkpoint\n";
3605 3781
3606 warn "emergency_perl_save: begin write uuid\n"; 3782 info "emergency_perl_save: begin write uuid\n";
3607 write_uuid_sync 1; 3783 write_uuid_sync 1;
3608 warn "emergency_perl_save: end write uuid\n"; 3784 info "emergency_perl_save: end write uuid\n";
3609 }; 3785 };
3610 3786
3611 warn "emergency_perl_save: starting sync()\n"; 3787 info "emergency_perl_save: starting sync()\n";
3612 IO::AIO::aio_sync sub { 3788 IO::AIO::aio_sync sub {
3613 warn "emergency_perl_save: finished sync()\n"; 3789 info "emergency_perl_save: finished sync()\n";
3614 }; 3790 };
3615 3791
3616 warn "emergency_perl_save: leave\n"; 3792 info "emergency_perl_save: leave\n";
3617} 3793}
3618 3794
3619sub post_cleanup { 3795sub post_cleanup {
3620 my ($make_core) = @_; 3796 my ($make_core) = @_;
3621 3797
3622 warn Carp::longmess "post_cleanup backtrace" 3798 error Carp::longmess "post_cleanup backtrace"
3623 if $make_core; 3799 if $make_core;
3624 3800
3625 my $fh = pidfile; 3801 my $fh = pidfile;
3626 unlink $PIDFILE if <$fh> == $$; 3802 unlink $PIDFILE if <$fh> == $$;
3627} 3803}
… …
3647 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3823 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3648 for my $name (keys %$leaf_symtab) { 3824 for my $name (keys %$leaf_symtab) {
3649 _gv_clear *{"$pkg$name"}; 3825 _gv_clear *{"$pkg$name"};
3650# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3826# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3651 } 3827 }
3652 warn "cleared package $pkg\n";#d#
3653} 3828}
3654 3829
3655sub do_reload_perl() { 3830sub do_reload_perl() {
3656 # can/must only be called in main 3831 # can/must only be called in main
3657 if ($Coro::current != $Coro::main) { 3832 if (in_main) {
3658 warn "can only reload from main coroutine"; 3833 error "can only reload from main coroutine";
3659 return; 3834 return;
3660 } 3835 }
3661 3836
3662 return if $RELOAD++; 3837 return if $RELOAD++;
3663 3838
3664 my $t1 = EV::time; 3839 my $t1 = AE::time;
3665 3840
3666 while ($RELOAD) { 3841 while ($RELOAD) {
3667 warn "reloading..."; 3842 info "reloading...";
3668 3843
3669 warn "entering sync_job"; 3844 trace "entering sync_job";
3670 3845
3671 cf::sync_job { 3846 cf::sync_job {
3672 cf::write_runtime_sync; # external watchdog should not bark 3847 cf::write_runtime_sync; # external watchdog should not bark
3673 cf::emergency_save; 3848 cf::emergency_save;
3674 cf::write_runtime_sync; # external watchdog should not bark 3849 cf::write_runtime_sync; # external watchdog should not bark
3675 3850
3676 warn "syncing database to disk"; 3851 trace "syncing database to disk";
3677 BDB::db_env_txn_checkpoint $DB_ENV; 3852 BDB::db_env_txn_checkpoint $DB_ENV;
3678 3853
3679 # 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
3680 3855
3681 warn "flushing outstanding aio requests"; 3856 trace "flushing outstanding aio requests";
3682 while (IO::AIO::nreqs || BDB::nreqs) { 3857 while (IO::AIO::nreqs || BDB::nreqs) {
3683 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
3684 } 3859 }
3685 3860
3686 warn "cancelling all extension coros"; 3861 trace "cancelling all extension coros";
3687 $_->cancel for values %EXT_CORO; 3862 $_->cancel for values %EXT_CORO;
3688 %EXT_CORO = (); 3863 %EXT_CORO = ();
3689 3864
3690 warn "removing commands"; 3865 trace "removing commands";
3691 %COMMAND = (); 3866 %COMMAND = ();
3692 3867
3693 warn "removing ext/exti commands"; 3868 trace "removing ext/exti commands";
3694 %EXTCMD = (); 3869 %EXTCMD = ();
3695 %EXTICMD = (); 3870 %EXTICMD = ();
3696 3871
3697 warn "unloading/nuking all extensions"; 3872 trace "unloading/nuking all extensions";
3698 for my $pkg (@EXTS) { 3873 for my $pkg (@EXTS) {
3699 warn "... unloading $pkg"; 3874 trace "... unloading $pkg";
3700 3875
3701 if (my $cb = $pkg->can ("unload")) { 3876 if (my $cb = $pkg->can ("unload")) {
3702 eval { 3877 eval {
3703 $cb->($pkg); 3878 $cb->($pkg);
3704 1 3879 1
3705 } or warn "$pkg unloaded, but with errors: $@"; 3880 } or error "$pkg unloaded, but with errors: $@";
3706 } 3881 }
3707 3882
3708 warn "... clearing $pkg"; 3883 trace "... clearing $pkg";
3709 clear_package $pkg; 3884 clear_package $pkg;
3710 } 3885 }
3711 3886
3712 warn "unloading all perl modules loaded from $LIBDIR"; 3887 trace "unloading all perl modules loaded from $LIBDIR";
3713 while (my ($k, $v) = each %INC) { 3888 while (my ($k, $v) = each %INC) {
3714 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3889 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3715 3890
3716 warn "... unloading $k"; 3891 trace "... unloading $k";
3717 delete $INC{$k}; 3892 delete $INC{$k};
3718 3893
3719 $k =~ s/\.pm$//; 3894 $k =~ s/\.pm$//;
3720 $k =~ s/\//::/g; 3895 $k =~ s/\//::/g;
3721 3896
… …
3724 } 3899 }
3725 3900
3726 clear_package $k; 3901 clear_package $k;
3727 } 3902 }
3728 3903
3729 warn "getting rid of safe::, as good as possible"; 3904 trace "getting rid of safe::, as good as possible";
3730 clear_package "safe::$_" 3905 clear_package "safe::$_"
3731 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);
3732 3907
3733 warn "unloading cf.pm \"a bit\""; 3908 trace "unloading cf.pm \"a bit\"";
3734 delete $INC{"cf.pm"}; 3909 delete $INC{"cf.pm"};
3735 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3910 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3736 3911
3737 # don't, removes xs symbols, too, 3912 # don't, removes xs symbols, too,
3738 # and global variables created in xs 3913 # and global variables created in xs
3739 #clear_package __PACKAGE__; 3914 #clear_package __PACKAGE__;
3740 3915
3741 warn "unload completed, starting to reload now"; 3916 info "unload completed, starting to reload now";
3742 3917
3743 warn "reloading cf.pm"; 3918 trace "reloading cf.pm";
3744 require cf; 3919 require cf;
3745 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3920 cf::_connect_to_perl_1;
3746 3921
3747 warn "loading config and database again"; 3922 trace "loading config and database again";
3748 cf::reload_config; 3923 cf::reload_config;
3749 3924
3750 warn "loading extensions"; 3925 trace "loading extensions";
3751 cf::load_extensions; 3926 cf::load_extensions;
3752 3927
3753 if ($REATTACH_ON_RELOAD) { 3928 if ($REATTACH_ON_RELOAD) {
3754 warn "reattaching attachments to objects/players"; 3929 trace "reattaching attachments to objects/players";
3755 _global_reattach; # objects, sockets 3930 _global_reattach; # objects, sockets
3756 warn "reattaching attachments to maps"; 3931 trace "reattaching attachments to maps";
3757 reattach $_ for values %MAP; 3932 reattach $_ for values %MAP;
3758 warn "reattaching attachments to players"; 3933 trace "reattaching attachments to players";
3759 reattach $_ for values %PLAYER; 3934 reattach $_ for values %PLAYER;
3760 } 3935 }
3761 3936
3762 warn "running post_init jobs"; 3937 trace "running post_init jobs";
3763 (pop @POST_INIT)->(1) while @POST_INIT; 3938 (pop @POST_INIT)->(1) while @POST_INIT;
3764 3939
3765 warn "leaving sync_job"; 3940 trace "leaving sync_job";
3766 3941
3767 1 3942 1
3768 } or do { 3943 } or do {
3769 warn $@; 3944 error $@;
3770 cf::cleanup "error while reloading, exiting."; 3945 cf::cleanup "error while reloading, exiting.";
3771 }; 3946 };
3772 3947
3773 warn "reloaded"; 3948 info "reloaded";
3774 --$RELOAD; 3949 --$RELOAD;
3775 } 3950 }
3776 3951
3777 $t1 = EV::time - $t1; 3952 $t1 = AE::time - $t1;
3778 warn "reload completed in ${t1}s\n"; 3953 info "reload completed in ${t1}s\n";
3779}; 3954};
3780 3955
3781our $RELOAD_WATCHER; # used only during reload 3956our $RELOAD_WATCHER; # used only during reload
3782 3957
3783sub reload_perl() { 3958sub reload_perl() {
… …
3785 # coro crashes during coro_state_free->destroy here. 3960 # coro crashes during coro_state_free->destroy here.
3786 3961
3787 $RELOAD_WATCHER ||= cf::async { 3962 $RELOAD_WATCHER ||= cf::async {
3788 Coro::AIO::aio_wait cache_extensions; 3963 Coro::AIO::aio_wait cache_extensions;
3789 3964
3790 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3965 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3791 do_reload_perl; 3966 do_reload_perl;
3792 undef $RELOAD_WATCHER; 3967 undef $RELOAD_WATCHER;
3793 }; 3968 };
3794 }; 3969 };
3795} 3970}
… …
3812 3987
3813our @WAIT_FOR_TICK; 3988our @WAIT_FOR_TICK;
3814our @WAIT_FOR_TICK_BEGIN; 3989our @WAIT_FOR_TICK_BEGIN;
3815 3990
3816sub wait_for_tick { 3991sub wait_for_tick {
3817 return if tick_inhibit || $Coro::current == $Coro::main; 3992 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3818 3993
3819 my $signal = new Coro::Signal; 3994 my $signal = new Coro::Signal;
3820 push @WAIT_FOR_TICK, $signal; 3995 push @WAIT_FOR_TICK, $signal;
3821 $signal->wait; 3996 $signal->wait;
3822} 3997}
3823 3998
3824sub wait_for_tick_begin { 3999sub wait_for_tick_begin {
3825 return if tick_inhibit || $Coro::current == $Coro::main; 4000 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3826 4001
3827 my $signal = new Coro::Signal; 4002 my $signal = new Coro::Signal;
3828 push @WAIT_FOR_TICK_BEGIN, $signal; 4003 push @WAIT_FOR_TICK_BEGIN, $signal;
3829 $signal->wait; 4004 $signal->wait;
3830} 4005}
… …
3836 return; 4011 return;
3837 } 4012 }
3838 4013
3839 cf::server_tick; # one server iteration 4014 cf::server_tick; # one server iteration
3840 4015
4016 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4017
3841 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4018 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3842 $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.;
3843 Coro::async_pool { 4020 Coro::async_pool {
3844 $Coro::current->{desc} = "runtime saver"; 4021 $Coro::current->{desc} = "runtime saver";
3845 write_runtime_sync 4022 write_runtime_sync
3846 or warn "ERROR: unable to write runtime file: $!"; 4023 or error "ERROR: unable to write runtime file: $!";
3847 }; 4024 };
3848 } 4025 }
3849 4026
3850 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4027 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3851 $sig->send; 4028 $sig->send;
… …
3859 4036
3860 if (0) { 4037 if (0) {
3861 if ($NEXT_TICK) { 4038 if ($NEXT_TICK) {
3862 my $jitter = $TICK_START - $NEXT_TICK; 4039 my $jitter = $TICK_START - $NEXT_TICK;
3863 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4040 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3864 warn "jitter $JITTER\n";#d# 4041 debug "jitter $JITTER\n";#d#
3865 } 4042 }
3866 } 4043 }
3867} 4044}
3868 4045
3869{ 4046{
3870 # configure BDB 4047 # configure BDB
3871 4048
3872 BDB::min_parallel 8; 4049 BDB::min_parallel 16;
3873 BDB::max_poll_reqs $TICK * 0.1; 4050 BDB::max_poll_reqs $TICK * 0.1;
3874 $AnyEvent::BDB::WATCHER->priority (1); 4051 $AnyEvent::BDB::WATCHER->priority (1);
3875 4052
3876 unless ($DB_ENV) { 4053 unless ($DB_ENV) {
3877 $DB_ENV = BDB::db_env_create; 4054 $DB_ENV = BDB::db_env_create;
… …
3879 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4056 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3880 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7; 4057 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3881 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4058 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3882 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4059 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3883 4060
4061 (Coro::async { # async to keep sync_job from complaining
3884 cf::sync_job { 4062 cf::sync_job {
3885 eval { 4063 eval {
3886 BDB::db_env_open 4064 BDB::db_env_open
3887 $DB_ENV, 4065 $DB_ENV,
3888 $BDBDIR, 4066 $BDBDIR,
3889 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4067 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3890 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4068 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3891 0666; 4069 0666;
3892 4070
3893 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4071 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
4072 };
4073
4074 cf::cleanup "db_env_open(db): $@" if $@;
3894 }; 4075 };
3895 4076 })->join;
3896 cf::cleanup "db_env_open(db): $@" if $@;
3897 };
3898 } 4077 }
3899 4078
3900 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub { 4079 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3901 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 4080 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3902 }; 4081 };
… …
3958 } 4137 }
3959} 4138}
3960 4139
3961# load additional modules 4140# load additional modules
3962require "cf/$_.pm" for @EXTRA_MODULES; 4141require "cf/$_.pm" for @EXTRA_MODULES;
4142cf::_connect_to_perl_2;
3963 4143
3964END { cf::emergency_save } 4144END { cf::emergency_save }
3965 4145
39661 41461
3967 4147

Diff Legend

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