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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines