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.479 by root, Thu Oct 8 05:04:27 2009 UTC vs.
Revision 1.534 by root, Thu Apr 29 08:13:51 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use 5.10.0;
25use utf8; 26use utf8;
… …
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
… …
105our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
106our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
107our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
108our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
109 110
110our %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;
111 118
112our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
113our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
114our $NEXT_TICK; 121our $NEXT_TICK;
115our $USE_FSYNC = 1; # use fsync to write maps - default on 122our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
117our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
118our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
119our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
120our $DB_ENV; 127our $DB_ENV;
121 128
122our @EXTRA_MODULES = qw(pod mapscript); 129our @EXTRA_MODULES = qw(pod match mapscript);
123 130
124our %CFG; 131our %CFG;
125 132
126our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
127our $RUNTIME; 134our $RUNTIME;
… …
161 168
162our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
163 170
164sub cf::map::normalise; 171sub cf::map::normalise;
165 172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
166############################################################################# 177#############################################################################
167 178
168%REFLECT = (); 179%REFLECT = ();
169for (@REFLECT) { 180for (@REFLECT) {
170 my $reflect = JSON::XS::decode_json $_; 181 my $reflect = JSON::XS::decode_json $_;
171 $REFLECT{$reflect->{class}} = $reflect; 182 $REFLECT{$reflect->{class}} = $reflect;
172} 183}
173 184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
187
174############################################################################# 188#############################################################################
175 189
176=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
177 191
178=over 4 192=over 4
… …
224returns 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
225per 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.
226 240
227=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
228 242
229This array contains the results of the last C<invoke ()> call. When 243This array contains the results of the last C<invoke ()> call. When
230C<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
231that call. 245that call.
232 246
233=item %cf::REFLECT 247=item %cf::REFLECT
234 248
235Contains, for each (C++) class name, a hash reference with information 249Contains, for each (C++) class name, a hash reference with information
236about object members (methods, scalars and arrays) and other metadata, 250about object members (methods, scalars, arrays and flags) and other
237which is useful for introspection. 251metadata, which is useful for introspection.
238 252
239=back 253=back
240 254
241=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 "", @_ }
242 262
243$Coro::State::WARNHOOK = sub { 263$Coro::State::WARNHOOK = sub {
244 my $msg = join "", @_; 264 my $msg = join "", @_;
245 265
246 $msg .= "\n" 266 $msg .= "\n"
247 unless $msg =~ /\n$/; 267 unless $msg =~ /\n$/;
248 268
249 $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;
250 270
251 LOG llevError, $msg; 271 LOG llevWarn, $msg;
252}; 272};
253 273
254$Coro::State::DIEHOOK = sub { 274$Coro::State::DIEHOOK = sub {
255 return unless $^S eq 0; # "eq", not "==" 275 return unless $^S eq 0; # "eq", not "=="
256 276
257 warn Carp::longmess $_[0]; 277 error Carp::longmess $_[0];
258 278
259 if ($Coro::current == $Coro::main) {#d# 279 if (in_main) {#d#
260 warn "DIEHOOK called in main context, Coro bug?\n";#d# 280 error "DIEHOOK called in main context, Coro bug?\n";#d#
261 return;#d# 281 return;#d#
262 }#d# 282 }#d#
263 283
264 # kill coroutine otherwise 284 # kill coroutine otherwise
265 Coro::terminate 285 Coro::terminate
… …
285)) { 305)) {
286 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 306 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
287} 307}
288 308
289$EV::DIED = sub { 309$EV::DIED = sub {
290 warn "error in event callback: @_"; 310 Carp::cluck "error in event callback: @_";
291}; 311};
292 312
293############################################################################# 313#############################################################################
294 314
295=head2 UTILITY FUNCTIONS 315=head2 UTILITY FUNCTIONS
… …
392} 412}
393 413
394=item cf::periodic $interval, $cb 414=item cf::periodic $interval, $cb
395 415
396Like 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
397get spread over timer. 417get spread over time.
398 418
399=cut 419=cut
400 420
401sub periodic($$) { 421sub periodic($$) {
402 my ($interval, $cb) = @_; 422 my ($interval, $cb) = @_;
… …
419 439
420=cut 440=cut
421 441
422our @SLOT_QUEUE; 442our @SLOT_QUEUE;
423our $SLOT_QUEUE; 443our $SLOT_QUEUE;
444our $SLOT_DECAY = 0.9;
424 445
425$SLOT_QUEUE->cancel if $SLOT_QUEUE; 446$SLOT_QUEUE->cancel if $SLOT_QUEUE;
426$SLOT_QUEUE = Coro::async { 447$SLOT_QUEUE = Coro::async {
427 $Coro::current->desc ("timeslot manager"); 448 $Coro::current->desc ("timeslot manager");
428 449
429 my $signal = new Coro::Signal; 450 my $signal = new Coro::Signal;
451 my $busy;
430 452
431 while () { 453 while () {
432 next_job: 454 next_job:
455
433 my $avail = cf::till_tick; 456 my $avail = cf::till_tick;
434 if ($avail > 0.01) { 457
435 for (0 .. $#SLOT_QUEUE) { 458 for (0 .. $#SLOT_QUEUE) {
436 if ($SLOT_QUEUE[$_][0] < $avail) { 459 if ($SLOT_QUEUE[$_][0] <= $avail) {
460 $busy = 0;
437 my $job = splice @SLOT_QUEUE, $_, 1, (); 461 my $job = splice @SLOT_QUEUE, $_, 1, ();
438 $job->[2]->send; 462 $job->[2]->send;
439 Coro::cede; 463 Coro::cede;
440 goto next_job; 464 goto next_job;
441 } 465 } else {
466 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
442 } 467 }
443 } 468 }
444 469
445 if (@SLOT_QUEUE) { 470 if (@SLOT_QUEUE) {
446 # 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
447 push @cf::WAIT_FOR_TICK, $signal; 472 push @cf::WAIT_FOR_TICK, $signal;
448 $signal->wait; 473 $signal->wait;
449 } else { 474 } else {
475 $busy = 0;
450 Coro::schedule; 476 Coro::schedule;
451 } 477 }
452 } 478 }
453}; 479};
454 480
455sub get_slot($;$$) { 481sub get_slot($;$$) {
456 return if tick_inhibit || $Coro::current == $Coro::main; 482 return if tick_inhibit || $Coro::current == $Coro::main;
457 483
458 my ($time, $pri, $name) = @_; 484 my ($time, $pri, $name) = @_;
459 485
460 $time = $TICK * .6 if $time > $TICK * .6; 486 $time = clamp $time, 0.01, $TICK * .6;
487
461 my $sig = new Coro::Signal; 488 my $sig = new Coro::Signal;
462 489
463 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 490 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
464 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 491 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
465 $SLOT_QUEUE->ready; 492 $SLOT_QUEUE->ready;
… …
491=cut 518=cut
492 519
493sub sync_job(&) { 520sub sync_job(&) {
494 my ($job) = @_; 521 my ($job) = @_;
495 522
496 if ($Coro::current == $Coro::main) { 523 if (in_main) {
497 my $time = EV::time; 524 my $time = AE::time;
498 525
499 # this is the main coro, too bad, we have to block 526 # this is the main coro, too bad, we have to block
500 # till the operation succeeds, freezing the server :/ 527 # till the operation succeeds, freezing the server :/
501 528
502 LOG llevError, Carp::longmess "sync job";#d# 529 #LOG llevError, Carp::longmess "sync job";#d#
503 530
504 my $freeze_guard = freeze_mainloop; 531 my $freeze_guard = freeze_mainloop;
505 532
506 my $busy = 1; 533 my $busy = 1;
507 my @res; 534 my @res;
508 535
509 (async { 536 (async {
510 $Coro::current->desc ("sync job coro"); 537 $Coro::current->desc ("sync job coro");
511 @res = eval { $job->() }; 538 @res = eval { $job->() };
512 warn $@ if $@; 539 error $@ if $@;
513 undef $busy; 540 undef $busy;
514 })->prio (Coro::PRIO_MAX); 541 })->prio (Coro::PRIO_MAX);
515 542
516 while ($busy) { 543 while ($busy) {
517 if (Coro::nready) { 544 if (Coro::nready) {
… …
519 } else { 546 } else {
520 EV::loop EV::LOOP_ONESHOT; 547 EV::loop EV::LOOP_ONESHOT;
521 } 548 }
522 } 549 }
523 550
524 my $time = EV::time - $time; 551 my $time = AE::time - $time;
525 552
526 $TICK_START += $time; # do not account sync jobs to server load 553 $TICK_START += $time; # do not account sync jobs to server load
527 554
528 wantarray ? @res : $res[0] 555 wantarray ? @res : $res[0]
529 } else { 556 } else {
… …
573 reset_signals; 600 reset_signals;
574 &$cb 601 &$cb
575 }, @args; 602 }, @args;
576 603
577 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 )
578} 616}
579 617
580=item $coin = coin_from_name $name 618=item $coin = coin_from_name $name
581 619
582=cut 620=cut
… …
619within each server. 657within each server.
620 658
621=cut 659=cut
622 660
623sub db_table($) { 661sub db_table($) {
662 cf::error "db_get called from main context"
663 if $Coro::current == $Coro::main;
664
624 my ($name) = @_; 665 my ($name) = @_;
625 my $db = BDB::db_create $DB_ENV; 666 my $db = BDB::db_create $DB_ENV;
626 667
627 eval { 668 eval {
628 $db->set_flags (BDB::CHKSUM); 669 $db->set_flags (BDB::CHKSUM);
… …
638} 679}
639 680
640our $DB; 681our $DB;
641 682
642sub db_init { 683sub db_init {
643 cf::sync_job {
644 $DB ||= db_table "db"; 684 $DB ||= db_table "db";
645 };
646} 685}
647 686
648sub db_get($$) { 687sub db_get($$) {
649 my $key = "$_[0]/$_[1]"; 688 my $key = "$_[0]/$_[1]";
650 689
651 cf::sync_job { 690 cf::error "db_get called from main context"
691 if $Coro::current == $Coro::main;
692
652 BDB::db_get $DB, undef, $key, my $data; 693 BDB::db_get $DB, undef, $key, my $data;
653 694
654 $! ? () 695 $! ? ()
655 : $data 696 : $data
656 }
657} 697}
658 698
659sub db_put($$$) { 699sub db_put($$$) {
660 BDB::dbreq_pri 4; 700 BDB::dbreq_pri 4;
661 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 701 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
717 757
718 my $t1 = Time::HiRes::time; 758 my $t1 = Time::HiRes::time;
719 my $data = $process->(\@data); 759 my $data = $process->(\@data);
720 my $t2 = Time::HiRes::time; 760 my $t2 = Time::HiRes::time;
721 761
722 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 762 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
723 763
724 db_put cache => "$id/data", $data; 764 db_put cache => "$id/data", $data;
725 db_put cache => "$id/md5" , $md5; 765 db_put cache => "$id/md5" , $md5;
726 db_put cache => "$id/meta", $meta; 766 db_put cache => "$id/meta", $meta;
727 767
… …
737 777
738=cut 778=cut
739 779
740sub datalog($@) { 780sub datalog($@) {
741 my ($type, %kv) = @_; 781 my ($type, %kv) = @_;
742 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 782 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
743} 783}
744 784
745=back 785=back
746 786
747=cut 787=cut
… …
942 982
943 } elsif (exists $cb_id{$type}) { 983 } elsif (exists $cb_id{$type}) {
944 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 984 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
945 985
946 } elsif (ref $type) { 986 } elsif (ref $type) {
947 warn "attaching objects not supported, ignoring.\n"; 987 error "attaching objects not supported, ignoring.\n";
948 988
949 } else { 989 } else {
950 shift @arg; 990 shift @arg;
951 warn "attach argument '$type' not supported, ignoring.\n"; 991 error "attach argument '$type' not supported, ignoring.\n";
952 } 992 }
953 } 993 }
954} 994}
955 995
956sub _object_attach { 996sub _object_attach {
… …
966 _attach $registry, $klass, @attach; 1006 _attach $registry, $klass, @attach;
967 } 1007 }
968 1008
969 $obj->{$name} = \%arg; 1009 $obj->{$name} = \%arg;
970 } else { 1010 } else {
971 warn "object uses attachment '$name' which is not available, postponing.\n"; 1011 info "object uses attachment '$name' which is not available, postponing.\n";
972 } 1012 }
973 1013
974 $obj->{_attachment}{$name} = undef; 1014 $obj->{_attachment}{$name} = undef;
975} 1015}
976 1016
… …
1035 1075
1036 for (@$callbacks) { 1076 for (@$callbacks) {
1037 eval { &{$_->[1]} }; 1077 eval { &{$_->[1]} };
1038 1078
1039 if ($@) { 1079 if ($@) {
1040 warn "$@";
1041 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1080 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1042 override; 1081 override;
1043 } 1082 }
1044 1083
1045 return 1 if $override; 1084 return 1 if $override;
1046 } 1085 }
… …
1125 for (@$attach) { 1164 for (@$attach) {
1126 my ($klass, @attach) = @$_; 1165 my ($klass, @attach) = @$_;
1127 _attach $registry, $klass, @attach; 1166 _attach $registry, $klass, @attach;
1128 } 1167 }
1129 } else { 1168 } else {
1130 warn "object uses attachment '$name' that is not available, postponing.\n"; 1169 info "object uses attachment '$name' that is not available, postponing.\n";
1131 } 1170 }
1132 } 1171 }
1133} 1172}
1134 1173
1135cf::attachable->attach ( 1174cf::attachable->attach (
… …
1162 my ($filename, $rdata, $objs) = @_; 1201 my ($filename, $rdata, $objs) = @_;
1163 1202
1164 sync_job { 1203 sync_job {
1165 if (length $$rdata) { 1204 if (length $$rdata) {
1166 utf8::decode (my $decname = $filename); 1205 utf8::decode (my $decname = $filename);
1167 warn sprintf "saving %s (%d,%d)\n", 1206 trace sprintf "saving %s (%d,%d)\n",
1168 $decname, length $$rdata, scalar @$objs; 1207 $decname, length $$rdata, scalar @$objs
1208 if $VERBOSE_IO;
1169 1209
1170 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1210 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1171 aio_chmod $fh, SAVE_MODE; 1211 aio_chmod $fh, SAVE_MODE;
1172 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1212 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1173 if ($cf::USE_FSYNC) { 1213 if ($cf::USE_FSYNC) {
… …
1195 aio_rename "$filename~", $filename; 1235 aio_rename "$filename~", $filename;
1196 1236
1197 $filename =~ s%/[^/]+$%%; 1237 $filename =~ s%/[^/]+$%%;
1198 aio_pathsync $filename if $cf::USE_FSYNC; 1238 aio_pathsync $filename if $cf::USE_FSYNC;
1199 } else { 1239 } else {
1200 warn "unable to save objects: $filename~: $!\n"; 1240 error "unable to save objects: $filename~: $!\n";
1201 } 1241 }
1202 } else { 1242 } else {
1203 aio_unlink $filename; 1243 aio_unlink $filename;
1204 aio_unlink "$filename.pst"; 1244 aio_unlink "$filename.pst";
1205 } 1245 }
… …
1229 my $st = eval { Coro::Storable::thaw $av }; 1269 my $st = eval { Coro::Storable::thaw $av };
1230 $av = $st->{objs}; 1270 $av = $st->{objs};
1231 } 1271 }
1232 1272
1233 utf8::decode (my $decname = $filename); 1273 utf8::decode (my $decname = $filename);
1234 warn sprintf "loading %s (%d,%d)\n", 1274 trace sprintf "loading %s (%d,%d)\n",
1235 $decname, length $data, scalar @{$av || []}; 1275 $decname, length $data, scalar @{$av || []}
1276 if $VERBOSE_IO;
1236 1277
1237 ($data, $av) 1278 ($data, $av)
1238} 1279}
1239 1280
1240=head2 COMMAND CALLBACKS 1281=head2 COMMAND CALLBACKS
… …
1299} 1340}
1300 1341
1301use File::Glob (); 1342use File::Glob ();
1302 1343
1303cf::player->attach ( 1344cf::player->attach (
1304 on_command => sub { 1345 on_unknown_command => sub {
1305 my ($pl, $name, $params) = @_; 1346 my ($pl, $name, $params) = @_;
1306 1347
1307 my $cb = $COMMAND{$name} 1348 my $cb = $COMMAND{$name}
1308 or return; 1349 or return;
1309 1350
… …
1332 1373
1333 $pl->ext_reply ($reply, @reply) 1374 $pl->ext_reply ($reply, @reply)
1334 if $reply; 1375 if $reply;
1335 1376
1336 } else { 1377 } else {
1337 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1378 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1338 } 1379 }
1339 1380
1340 cf::override; 1381 cf::override;
1341 }, 1382 },
1342); 1383);
… …
1353 1394
1354 $grp 1395 $grp
1355} 1396}
1356 1397
1357sub load_extensions { 1398sub load_extensions {
1399 info "loading extensions...";
1400
1358 cf::sync_job { 1401 cf::sync_job {
1359 my %todo; 1402 my %todo;
1360 1403
1361 for my $path (<$LIBDIR/*.ext>) { 1404 for my $path (<$LIBDIR/*.ext>) {
1362 next unless -r $path; 1405 next unless -r $path;
… …
1388 . "\n};\n1"; 1431 . "\n};\n1";
1389 1432
1390 $todo{$base} = \%ext; 1433 $todo{$base} = \%ext;
1391 } 1434 }
1392 1435
1436 my $pass = 0;
1393 my %done; 1437 my %done;
1394 while (%todo) { 1438 while (%todo) {
1395 my $progress; 1439 my $progress;
1396 1440
1441 ++$pass;
1442
1443 ext:
1397 while (my ($k, $v) = each %todo) { 1444 while (my ($k, $v) = each %todo) {
1398 for (split /,\s*/, $v->{meta}{depends}) { 1445 for (split /,\s*/, $v->{meta}{depends}) {
1399 goto skip 1446 next ext
1400 unless exists $done{$_}; 1447 unless exists $done{$_};
1401 } 1448 }
1402 1449
1403 warn "... loading '$k' into '$v->{pkg}'\n"; 1450 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1404 1451
1405 unless (eval $v->{source}) { 1452 my $active = eval $v->{source};
1453
1454 if (length $@) {
1406 my $msg = $@ ? "$v->{path}: $@\n" 1455 error "$v->{path}: $@\n";
1407 : "$v->{base}: extension inactive.\n";
1408 1456
1409 if (exists $v->{meta}{mandatory}) {
1410 warn $msg;
1411 cf::cleanup "mandatory extension failed to load, exiting."; 1457 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1412 } 1458 if exists $v->{meta}{mandatory};
1413 1459
1414 warn $msg; 1460 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1461 delete $todo{$k};
1462 } else {
1463 $done{$k} = delete $todo{$k};
1464 push @EXTS, $v->{pkg};
1465 $progress = 1;
1466
1467 info "$v->{base}: extension inactive.\n"
1468 unless $active;
1415 } 1469 }
1416
1417 $done{$k} = delete $todo{$k};
1418 push @EXTS, $v->{pkg};
1419 $progress = 1;
1420 } 1470 }
1421 1471
1422 skip: 1472 unless ($progress) {
1423 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1473 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1424 unless $progress; 1474
1475 while (my ($k, $v) = each %todo) {
1476 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1477 if exists $v->{meta}{mandatory};
1478 }
1479 }
1425 } 1480 }
1426 }; 1481 };
1427} 1482}
1428 1483
1429############################################################################# 1484#############################################################################
… …
1513 $cf::PLAYER{$login} = $pl 1568 $cf::PLAYER{$login} = $pl
1514 } 1569 }
1515 } 1570 }
1516} 1571}
1517 1572
1573cf::player->attach (
1574 on_load => sub {
1575 my ($pl, $path) = @_;
1576
1577 # restore slots saved in save, below
1578 my $slots = delete $pl->{_slots};
1579
1580 $pl->ob->current_weapon ($slots->[0]);
1581 $pl->combat_ob ($slots->[1]);
1582 $pl->ranged_ob ($slots->[2]);
1583 },
1584);
1585
1518sub save($) { 1586sub save($) {
1519 my ($pl) = @_; 1587 my ($pl) = @_;
1520 1588
1521 return if $pl->{deny_save}; 1589 return if $pl->{deny_save};
1522 1590
… …
1527 1595
1528 aio_mkdir playerdir $pl, 0770; 1596 aio_mkdir playerdir $pl, 0770;
1529 $pl->{last_save} = $cf::RUNTIME; 1597 $pl->{last_save} = $cf::RUNTIME;
1530 1598
1531 cf::get_slot 0.01; 1599 cf::get_slot 0.01;
1600
1601 # save slots, to be restored later
1602 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1532 1603
1533 $pl->save_pl ($path); 1604 $pl->save_pl ($path);
1534 cf::cede_to_tick; 1605 cf::cede_to_tick;
1535} 1606}
1536 1607
… …
1573 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1644 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1574 1645
1575 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1646 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1576 $pl->deactivate; 1647 $pl->deactivate;
1577 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1648 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1578 $pl->ob->check_score;
1579 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1649 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1580 $pl->ns->destroy if $pl->ns; 1650 $pl->ns->destroy if $pl->ns;
1581 1651
1582 my $path = playerdir $pl; 1652 my $path = playerdir $pl;
1583 my $temp = "$path~$cf::RUNTIME~deleting~"; 1653 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1638 \@logins 1708 \@logins
1639} 1709}
1640 1710
1641=item $player->maps 1711=item $player->maps
1642 1712
1713=item cf::player::maps $login
1714
1643Returns an arrayref of map paths that are private for this 1715Returns an arrayref of map paths that are private for this
1644player. May block. 1716player. May block.
1645 1717
1646=cut 1718=cut
1647 1719
… …
1709=cut 1781=cut
1710 1782
1711sub find_by_path($) { 1783sub find_by_path($) {
1712 my ($path) = @_; 1784 my ($path) = @_;
1713 1785
1786 $path =~ s/^~[^\/]*//; # skip ~login
1787
1714 my ($match, $specificity); 1788 my ($match, $specificity);
1715 1789
1716 for my $region (list) { 1790 for my $region (list) {
1717 if ($region->{match} && $path =~ $region->{match}) { 1791 if ($region->{match} && $path =~ $region->{match}) {
1718 ($match, $specificity) = ($region, $region->specificity) 1792 ($match, $specificity) = ($region, $region->specificity)
… …
1749 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1823 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1750 1824
1751 # mit "rum" bekleckern, nicht 1825 # mit "rum" bekleckern, nicht
1752 $self->_create_random_map ( 1826 $self->_create_random_map (
1753 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1827 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1754 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1828 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1755 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1829 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1756 $rmp->{exit_on_final_map}, 1830 $rmp->{exit_on_final_map},
1757 $rmp->{xsize}, $rmp->{ysize}, 1831 $rmp->{xsize}, $rmp->{ysize},
1758 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1832 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1759 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1833 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1781 1855
1782 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1856 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1783} 1857}
1784 1858
1785# also paths starting with '/' 1859# also paths starting with '/'
1786$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1860$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1787 1861
1788sub thawer_merge { 1862sub thawer_merge {
1789 my ($self, $merge) = @_; 1863 my ($self, $merge) = @_;
1790 1864
1791 # we have to keep some variables in memory intact 1865 # we have to keep some variables in memory intact
… …
2005 2079
2006 $cf::MAP{$path} = $map 2080 $cf::MAP{$path} = $map
2007 } 2081 }
2008} 2082}
2009 2083
2010sub pre_load { } 2084sub pre_load { }
2011sub post_load { } 2085#sub post_load { } # XS
2012 2086
2013sub load { 2087sub load {
2014 my ($self) = @_; 2088 my ($self) = @_;
2015 2089
2016 local $self->{deny_reset} = 1; # loading can take a long time 2090 local $self->{deny_reset} = 1; # loading can take a long time
… …
2073 } 2147 }
2074 2148
2075 $self->post_load; 2149 $self->post_load;
2076} 2150}
2077 2151
2152# customize the map for a given player, i.e.
2153# return the _real_ map. used by e.g. per-player
2154# maps to change the path to ~playername/mappath
2078sub customise_for { 2155sub customise_for {
2079 my ($self, $ob) = @_; 2156 my ($self, $ob) = @_;
2080 2157
2081 return find "~" . $ob->name . "/" . $self->{path} 2158 return find "~" . $ob->name . "/" . $self->{path}
2082 if $self->per_player; 2159 if $self->per_player;
… …
2098 or next; 2175 or next;
2099 $neigh = find $neigh, $map 2176 $neigh = find $neigh, $map
2100 or next; 2177 or next;
2101 $neigh->load; 2178 $neigh->load;
2102 2179
2180 # now find the diagonal neighbours
2103 push @neigh, 2181 push @neigh,
2104 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2182 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2105 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2183 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2106 } 2184 }
2107 2185
… …
2114} 2192}
2115 2193
2116sub find_sync { 2194sub find_sync {
2117 my ($path, $origin) = @_; 2195 my ($path, $origin) = @_;
2118 2196
2119 cf::sync_job { find $path, $origin } 2197 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2198 if $Coro::current == $Coro::main;
2199
2200 find $path, $origin
2120} 2201}
2121 2202
2122sub do_load_sync { 2203sub do_load_sync {
2123 my ($map) = @_; 2204 my ($map) = @_;
2124 2205
2125 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2206 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2126 if $Coro::current == $Coro::main; 2207 if $Coro::current == $Coro::main;
2127 2208
2128 cf::sync_job { $map->load }; 2209 $map->load;
2129} 2210}
2130 2211
2131our %MAP_PREFETCH; 2212our %MAP_PREFETCH;
2132our $MAP_PREFETCHER = undef; 2213our $MAP_PREFETCHER = undef;
2133 2214
… …
2159 $MAP_PREFETCHER->prio (6); 2240 $MAP_PREFETCHER->prio (6);
2160 2241
2161 () 2242 ()
2162} 2243}
2163 2244
2245# common code, used by both ->save and ->swapout
2164sub save { 2246sub _save {
2165 my ($self) = @_; 2247 my ($self) = @_;
2166
2167 my $lock = cf::lock_acquire "map_data:$self->{path}";
2168 2248
2169 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2170 2250
2171 return unless $self->dirty; 2251 return unless $self->dirty;
2172 2252
… …
2192 } else { 2272 } else {
2193 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2273 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2194 } 2274 }
2195} 2275}
2196 2276
2277sub save {
2278 my ($self) = @_;
2279
2280 my $lock = cf::lock_acquire "map_data:$self->{path}";
2281
2282 $self->_save;
2283}
2284
2197sub swap_out { 2285sub swap_out {
2198 my ($self) = @_; 2286 my ($self) = @_;
2199 2287
2200 # save first because save cedes
2201 $self->save;
2202
2203 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2288 my $lock = cf::lock_acquire "map_data:$self->{path}";
2204 2289
2205 return if $self->players;
2206 return if $self->in_memory != cf::MAP_ACTIVE; 2290 return if $self->in_memory != cf::MAP_ACTIVE;
2207 return if $self->{deny_save}; 2291 return if $self->{deny_save};
2292 return if $self->players;
2208 2293
2294 # first deactivate the map and "unlink" it from the core
2295 $self->deactivate;
2296 $_->clear_links_to ($self) for values %cf::MAP;
2209 $self->in_memory (cf::MAP_SWAPPED); 2297 $self->in_memory (cf::MAP_SWAPPED);
2298
2299 # then atomically save
2300 $self->_save;
2301
2302 # then free the map
2303 $self->clear;
2304}
2305
2306sub reset_at {
2307 my ($self) = @_;
2308
2309 # TODO: safety, remove and allow resettable per-player maps
2310 return 1e99 if $self->{deny_reset};
2311
2312 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2313 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2314
2315 $time + $to
2316}
2317
2318sub should_reset {
2319 my ($self) = @_;
2320
2321 $self->reset_at <= $cf::RUNTIME
2322}
2323
2324sub reset {
2325 my ($self) = @_;
2326
2327 my $lock = cf::lock_acquire "map_data:$self->{path}";
2328
2329 return if $self->players;
2330
2331 cf::trace "resetting map ", $self->path, "\n";
2332
2333 $self->in_memory (cf::MAP_SWAPPED);
2334
2335 # need to save uniques path
2336 unless ($self->{deny_save}) {
2337 my $uniq = $self->uniq_path; utf8::encode $uniq;
2338
2339 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2340 if $uniq;
2341 }
2342
2343 delete $cf::MAP{$self->path};
2210 2344
2211 $self->deactivate; 2345 $self->deactivate;
2212 $_->clear_links_to ($self) for values %cf::MAP; 2346 $_->clear_links_to ($self) for values %cf::MAP;
2213 $self->clear; 2347 $self->clear;
2214}
2215
2216sub reset_at {
2217 my ($self) = @_;
2218
2219 # TODO: safety, remove and allow resettable per-player maps
2220 return 1e99 if $self->{deny_reset};
2221
2222 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2223 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2224
2225 $time + $to
2226}
2227
2228sub should_reset {
2229 my ($self) = @_;
2230
2231 $self->reset_at <= $cf::RUNTIME
2232}
2233
2234sub reset {
2235 my ($self) = @_;
2236
2237 my $lock = cf::lock_acquire "map_data:$self->{path}";
2238
2239 return if $self->players;
2240
2241 warn "resetting map ", $self->path, "\n";
2242
2243 $self->in_memory (cf::MAP_SWAPPED);
2244
2245 # need to save uniques path
2246 unless ($self->{deny_save}) {
2247 my $uniq = $self->uniq_path; utf8::encode $uniq;
2248
2249 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2250 if $uniq;
2251 }
2252
2253 delete $cf::MAP{$self->path};
2254
2255 $self->deactivate;
2256 $_->clear_links_to ($self) for values %cf::MAP;
2257 $self->clear;
2258 2348
2259 $self->unlink_save; 2349 $self->unlink_save;
2260 $self->destroy; 2350 $self->destroy;
2261} 2351}
2262 2352
… …
2270 2360
2271 delete $cf::MAP{$self->path}; 2361 delete $cf::MAP{$self->path};
2272 2362
2273 $self->unlink_save; 2363 $self->unlink_save;
2274 2364
2275 bless $self, "cf::map"; 2365 bless $self, "cf::map::wrap";
2276 delete $self->{deny_reset}; 2366 delete $self->{deny_reset};
2277 $self->{deny_save} = 1; 2367 $self->{deny_save} = 1;
2278 $self->reset_timeout (1); 2368 $self->reset_timeout (1);
2279 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2369 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2280 2370
… …
2337 : normalise $_ 2427 : normalise $_
2338 } @{ aio_readdir $UNIQUEDIR or [] } 2428 } @{ aio_readdir $UNIQUEDIR or [] }
2339 ] 2429 ]
2340} 2430}
2341 2431
2432=item cf::map::static_maps
2433
2434Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2435file in the shared directory excluding F</styles> and F</editor>). May
2436block.
2437
2438=cut
2439
2440sub static_maps() {
2441 my @dirs = "";
2442 my @maps;
2443
2444 while (@dirs) {
2445 my $dir = shift @dirs;
2446
2447 next if $dir eq "/styles" || $dir eq "/editor";
2448
2449 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2450 or return;
2451
2452 for (@$files) {
2453 s/\.map$// or next;
2454 utf8::decode $_;
2455 push @maps, "$dir/$_";
2456 }
2457
2458 push @dirs, map "$dir/$_", @$dirs;
2459 }
2460
2461 \@maps
2462}
2463
2342=back 2464=back
2343 2465
2344=head3 cf::object 2466=head3 cf::object
2345 2467
2346=cut 2468=cut
… …
2478 2600
2479Freezes the player and moves him/her to a special map (C<{link}>). 2601Freezes the player and moves him/her to a special map (C<{link}>).
2480 2602
2481The player should be reasonably safe there for short amounts of time (e.g. 2603The player should be reasonably safe there for short amounts of time (e.g.
2482for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2604for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2483though, as the palyer cannot control the character while it is on the link 2605though, as the player cannot control the character while it is on the link
2484map. 2606map.
2485 2607
2486Will never block. 2608Will never block.
2487 2609
2488=item $player_object->leave_link ($map, $x, $y) 2610=item $player_object->leave_link ($map, $x, $y)
… …
2509sub cf::object::player::enter_link { 2631sub cf::object::player::enter_link {
2510 my ($self) = @_; 2632 my ($self) = @_;
2511 2633
2512 $self->deactivate_recursive; 2634 $self->deactivate_recursive;
2513 2635
2636 ++$self->{_link_recursion};
2637
2514 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2638 return if UNIVERSAL::isa $self->map, "ext::map_link";
2515 2639
2516 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2640 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2517 if $self->map && $self->map->{path} ne "{link}"; 2641 if $self->map && $self->map->{path} ne "{link}";
2518 2642
2519 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2643 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2520} 2644}
2521 2645
2522sub cf::object::player::leave_link { 2646sub cf::object::player::leave_link {
2523 my ($self, $map, $x, $y) = @_; 2647 my ($self, $map, $x, $y) = @_;
2524 2648
… …
2541 ($x, $y) = (-1, -1) 2665 ($x, $y) = (-1, -1)
2542 unless (defined $x) && (defined $y); 2666 unless (defined $x) && (defined $y);
2543 2667
2544 # use -1 or undef as default coordinates, not 0, 0 2668 # use -1 or undef as default coordinates, not 0, 0
2545 ($x, $y) = ($map->enter_x, $map->enter_y) 2669 ($x, $y) = ($map->enter_x, $map->enter_y)
2546 if $x <=0 && $y <= 0; 2670 if $x <= 0 && $y <= 0;
2547 2671
2548 $map->load; 2672 $map->load;
2549 $map->load_neighbours; 2673 $map->load_neighbours;
2550 2674
2551 return unless $self->contr->active; 2675 return unless $self->contr->active;
2552 2676
2553 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2677 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2554 $self->enter_map ($map, $x, $y); 2678 if ($self->enter_map ($map, $x, $y)) {
2555 2679 # entering was successful
2680 delete $self->{_link_recursion};
2556 # only activate afterwards, to support waiting in hooks 2681 # only activate afterwards, to support waiting in hooks
2557 $self->activate_recursive; 2682 $self->activate_recursive;
2558} 2683 }
2559 2684
2685}
2686
2560=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2687=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2561 2688
2562Moves the player to the given map-path and coordinates by first freezing 2689Moves the player to the given map-path and coordinates by first freezing
2563her, loading and preparing them map, calling the provided $check callback 2690her, loading and preparing them map, calling the provided $check callback
2564that has to return the map if sucecssful, and then unfreezes the player on 2691that has to return the map if sucecssful, and then unfreezes the player on
2565the new (success) or old (failed) map position. In either case, $done will 2692the new (success) or old (failed) map position. In either case, $done will
… …
2572 2699
2573our $GOTOGEN; 2700our $GOTOGEN;
2574 2701
2575sub cf::object::player::goto { 2702sub cf::object::player::goto {
2576 my ($self, $path, $x, $y, $check, $done) = @_; 2703 my ($self, $path, $x, $y, $check, $done) = @_;
2704
2705 if ($self->{_link_recursion} >= $MAX_LINKS) {
2706 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2707 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2708 ($path, $x, $y) = @$EMERGENCY_POSITION;
2709 }
2577 2710
2578 # do generation counting so two concurrent goto's will be executed in-order 2711 # do generation counting so two concurrent goto's will be executed in-order
2579 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2712 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2580 2713
2581 $self->enter_link; 2714 $self->enter_link;
… …
2605 my $map = eval { 2738 my $map = eval {
2606 my $map = defined $path ? cf::map::find $path : undef; 2739 my $map = defined $path ? cf::map::find $path : undef;
2607 2740
2608 if ($map) { 2741 if ($map) {
2609 $map = $map->customise_for ($self); 2742 $map = $map->customise_for ($self);
2610 $map = $check->($map) if $check && $map; 2743 $map = $check->($map, $x, $y, $self) if $check && $map;
2611 } else { 2744 } else {
2612 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2745 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2613 } 2746 }
2614 2747
2615 $map 2748 $map
… …
2623 if ($gen == $self->{_goto_generation}) { 2756 if ($gen == $self->{_goto_generation}) {
2624 delete $self->{_goto_generation}; 2757 delete $self->{_goto_generation};
2625 $self->leave_link ($map, $x, $y); 2758 $self->leave_link ($map, $x, $y);
2626 } 2759 }
2627 2760
2628 $done->() if $done; 2761 $done->($self) if $done;
2629 })->prio (1); 2762 })->prio (1);
2630} 2763}
2631 2764
2632=item $player_object->enter_exit ($exit_object) 2765=item $player_object->enter_exit ($exit_object)
2633 2766
… …
2726 $self->message ("Something went wrong deep within the deliantra server. " 2859 $self->message ("Something went wrong deep within the deliantra server. "
2727 . "I'll try to bring you back to the map you were before. " 2860 . "I'll try to bring you back to the map you were before. "
2728 . "Please report this to the dungeon master!", 2861 . "Please report this to the dungeon master!",
2729 cf::NDI_UNIQUE | cf::NDI_RED); 2862 cf::NDI_UNIQUE | cf::NDI_RED);
2730 2863
2731 warn "ERROR in enter_exit: $@"; 2864 error "ERROR in enter_exit: $@";
2732 $self->leave_link; 2865 $self->leave_link;
2733 } 2866 }
2734 })->prio (1); 2867 })->prio (1);
2735} 2868}
2736 2869
… …
2748sub cf::client::send_drawinfo { 2881sub cf::client::send_drawinfo {
2749 my ($self, $text, $flags) = @_; 2882 my ($self, $text, $flags) = @_;
2750 2883
2751 utf8::encode $text; 2884 utf8::encode $text;
2752 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2885 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2886}
2887
2888=item $client->send_big_packet ($pkt)
2889
2890Like C<send_packet>, but tries to compress large packets, and fragments
2891them as required.
2892
2893=cut
2894
2895our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2896
2897sub cf::client::send_big_packet {
2898 my ($self, $pkt) = @_;
2899
2900 # try lzf for large packets
2901 $pkt = "lzf " . Compress::LZF::compress $pkt
2902 if 1024 <= length $pkt and $self->{can_lzf};
2903
2904 # split very large packets
2905 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2906 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2907 $pkt = "frag";
2908 }
2909
2910 $self->send_packet ($pkt);
2753} 2911}
2754 2912
2755=item $client->send_msg ($channel, $msg, $color, [extra...]) 2913=item $client->send_msg ($channel, $msg, $color, [extra...])
2756 2914
2757Send a drawinfo or msg packet to the client, formatting the msg for the 2915Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2761 2919
2762=cut 2920=cut
2763 2921
2764# non-persistent channels (usually the info channel) 2922# non-persistent channels (usually the info channel)
2765our %CHANNEL = ( 2923our %CHANNEL = (
2924 "c/motd" => {
2925 id => "infobox",
2926 title => "MOTD",
2927 reply => undef,
2928 tooltip => "The message of the day",
2929 },
2766 "c/identify" => { 2930 "c/identify" => {
2767 id => "infobox", 2931 id => "infobox",
2768 title => "Identify", 2932 title => "Identify",
2769 reply => undef, 2933 reply => undef,
2770 tooltip => "Items recently identified", 2934 tooltip => "Items recently identified",
… …
2772 "c/examine" => { 2936 "c/examine" => {
2773 id => "infobox", 2937 id => "infobox",
2774 title => "Examine", 2938 title => "Examine",
2775 reply => undef, 2939 reply => undef,
2776 tooltip => "Signs and other items you examined", 2940 tooltip => "Signs and other items you examined",
2941 },
2942 "c/shopinfo" => {
2943 id => "infobox",
2944 title => "Shop Info",
2945 reply => undef,
2946 tooltip => "What your bargaining skill tells you about the shop",
2777 }, 2947 },
2778 "c/book" => { 2948 "c/book" => {
2779 id => "infobox", 2949 id => "infobox",
2780 title => "Book", 2950 title => "Book",
2781 reply => undef, 2951 reply => undef,
… …
2897 my $pkt = "msg " 3067 my $pkt = "msg "
2898 . $self->{json_coder}->encode ( 3068 . $self->{json_coder}->encode (
2899 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3069 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2900 ); 3070 );
2901 3071
2902 # try lzf for large packets
2903 $pkt = "lzf " . Compress::LZF::compress $pkt
2904 if 1024 <= length $pkt and $self->{can_lzf};
2905
2906 # split very large packets
2907 if (8192 < length $pkt and $self->{can_lzf}) {
2908 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2909 $pkt = "frag";
2910 }
2911
2912 $self->send_packet ($pkt); 3072 $self->send_big_packet ($pkt);
2913} 3073}
2914 3074
2915=item $client->ext_msg ($type, @msg) 3075=item $client->ext_msg ($type, @msg)
2916 3076
2917Sends an ext event to the client. 3077Sends an ext event to the client.
… …
2920 3080
2921sub cf::client::ext_msg($$@) { 3081sub cf::client::ext_msg($$@) {
2922 my ($self, $type, @msg) = @_; 3082 my ($self, $type, @msg) = @_;
2923 3083
2924 if ($self->extcmd == 2) { 3084 if ($self->extcmd == 2) {
2925 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3085 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2926 } elsif ($self->extcmd == 1) { # TODO: remove 3086 } elsif ($self->extcmd == 1) { # TODO: remove
2927 push @msg, msgtype => "event_$type"; 3087 push @msg, msgtype => "event_$type";
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3088 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2929 } 3089 }
2930} 3090}
2931 3091
2932=item $client->ext_reply ($msgid, @msg) 3092=item $client->ext_reply ($msgid, @msg)
2933 3093
… …
2937 3097
2938sub cf::client::ext_reply($$@) { 3098sub cf::client::ext_reply($$@) {
2939 my ($self, $id, @msg) = @_; 3099 my ($self, $id, @msg) = @_;
2940 3100
2941 if ($self->extcmd == 2) { 3101 if ($self->extcmd == 2) {
2942 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3102 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2943 } elsif ($self->extcmd == 1) { 3103 } elsif ($self->extcmd == 1) {
2944 #TODO: version 1, remove 3104 #TODO: version 1, remove
2945 unshift @msg, msgtype => "reply", msgid => $id; 3105 unshift @msg, msgtype => "reply", msgid => $id;
2946 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3106 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2947 } 3107 }
2948} 3108}
2949 3109
2950=item $success = $client->query ($flags, "text", \&cb) 3110=item $success = $client->query ($flags, "text", \&cb)
2951 3111
… …
3022 3182
3023 $ns->ext_reply ($reply, @reply) 3183 $ns->ext_reply ($reply, @reply)
3024 if $reply; 3184 if $reply;
3025 3185
3026 } else { 3186 } else {
3027 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3187 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3028 } 3188 }
3029 3189
3030 cf::override; 3190 cf::override;
3031 }, 3191 },
3032); 3192);
… …
3052 3212
3053 $coro 3213 $coro
3054} 3214}
3055 3215
3056cf::client->attach ( 3216cf::client->attach (
3057 on_destroy => sub { 3217 on_client_destroy => sub {
3058 my ($ns) = @_; 3218 my ($ns) = @_;
3059 3219
3060 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3220 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3061 }, 3221 },
3062); 3222);
… …
3078our $safe_hole = new Safe::Hole; 3238our $safe_hole = new Safe::Hole;
3079 3239
3080$SIG{FPE} = 'IGNORE'; 3240$SIG{FPE} = 'IGNORE';
3081 3241
3082$safe->permit_only (Opcode::opset qw( 3242$safe->permit_only (Opcode::opset qw(
3083 :base_core :base_mem :base_orig :base_math 3243 :base_core :base_mem :base_orig :base_math :base_loop
3084 grepstart grepwhile mapstart mapwhile 3244 grepstart grepwhile mapstart mapwhile
3085 sort time 3245 sort time
3086)); 3246));
3087 3247
3088# here we export the classes and methods available to script code 3248# here we export the classes and methods available to script code
… …
3140 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3300 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3141 $qcode =~ s/\n/\\n/g; 3301 $qcode =~ s/\n/\\n/g;
3142 3302
3143 %vars = (_dummy => 0) unless %vars; 3303 %vars = (_dummy => 0) unless %vars;
3144 3304
3305 my @res;
3145 local $_; 3306 local $_;
3146 local @safe::cf::_safe_eval_args = values %vars;
3147 3307
3148 my $eval = 3308 my $eval =
3149 "do {\n" 3309 "do {\n"
3150 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3310 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3151 . "#line 0 \"{$qcode}\"\n" 3311 . "#line 0 \"{$qcode}\"\n"
3152 . $code 3312 . $code
3153 . "\n}" 3313 . "\n}"
3154 ; 3314 ;
3155 3315
3316 if ($CFG{safe_eval}) {
3156 sub_generation_inc; 3317 sub_generation_inc;
3318 local @safe::cf::_safe_eval_args = values %vars;
3157 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3319 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3158 sub_generation_inc; 3320 sub_generation_inc;
3321 } else {
3322 local @cf::_safe_eval_args = values %vars;
3323 @res = wantarray ? eval eval : scalar eval $eval;
3324 }
3159 3325
3160 if ($@) { 3326 if ($@) {
3161 warn "$@"; 3327 warn "$@",
3162 warn "while executing safe code '$code'\n"; 3328 "while executing safe code '$code'\n",
3163 warn "with arguments " . (join " ", %vars) . "\n"; 3329 "with arguments " . (join " ", %vars) . "\n";
3164 } 3330 }
3165 3331
3166 wantarray ? @res : $res[0] 3332 wantarray ? @res : $res[0]
3167} 3333}
3168 3334
… …
3182=cut 3348=cut
3183 3349
3184sub register_script_function { 3350sub register_script_function {
3185 my ($fun, $cb) = @_; 3351 my ($fun, $cb) = @_;
3186 3352
3187 no strict 'refs'; 3353 $fun = "safe::$fun" if $CFG{safe_eval};
3188 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3354 *$fun = $safe_hole->wrap ($cb);
3189} 3355}
3190 3356
3191=back 3357=back
3192 3358
3193=cut 3359=cut
… …
3202 # for this (global event?) 3368 # for this (global event?)
3203 %ext::player_env::MUSIC_FACE_CACHE = (); 3369 %ext::player_env::MUSIC_FACE_CACHE = ();
3204 3370
3205 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3371 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3206 3372
3207 warn "loading facedata from $path\n"; 3373 trace "loading facedata from $path\n";
3208 3374
3209 my $facedata; 3375 my $facedata;
3210 0 < aio_load $path, $facedata 3376 0 < aio_load $path, $facedata
3211 or die "$path: $!"; 3377 or die "$path: $!";
3212 3378
… …
3214 3380
3215 $facedata->{version} == 2 3381 $facedata->{version} == 2
3216 or cf::cleanup "$path: version mismatch, cannot proceed."; 3382 or cf::cleanup "$path: version mismatch, cannot proceed.";
3217 3383
3218 # patch in the exptable 3384 # patch in the exptable
3385 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3219 $facedata->{resource}{"res/exp_table"} = { 3386 $facedata->{resource}{"res/exp_table"} = {
3220 type => FT_RSRC, 3387 type => FT_RSRC,
3221 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3388 data => $exp_table,
3389 hash => (Digest::MD5::md5 $exp_table),
3222 }; 3390 };
3223 cf::cede_to_tick; 3391 cf::cede_to_tick;
3224 3392
3225 { 3393 {
3226 my $faces = $facedata->{faceinfo}; 3394 my $faces = $facedata->{faceinfo};
… …
3228 while (my ($face, $info) = each %$faces) { 3396 while (my ($face, $info) = each %$faces) {
3229 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3397 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3230 3398
3231 cf::face::set_visibility $idx, $info->{visibility}; 3399 cf::face::set_visibility $idx, $info->{visibility};
3232 cf::face::set_magicmap $idx, $info->{magicmap}; 3400 cf::face::set_magicmap $idx, $info->{magicmap};
3233 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3401 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3234 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3402 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3235 3403
3236 cf::cede_to_tick; 3404 cf::cede_to_tick;
3237 } 3405 }
3238 3406
3239 while (my ($face, $info) = each %$faces) { 3407 while (my ($face, $info) = each %$faces) {
… …
3244 3412
3245 if (my $smooth = cf::face::find $info->{smooth}) { 3413 if (my $smooth = cf::face::find $info->{smooth}) {
3246 cf::face::set_smooth $idx, $smooth; 3414 cf::face::set_smooth $idx, $smooth;
3247 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3415 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3248 } else { 3416 } else {
3249 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3417 error "smooth face '$info->{smooth}' not found for face '$face'";
3250 } 3418 }
3251 3419
3252 cf::cede_to_tick; 3420 cf::cede_to_tick;
3253 } 3421 }
3254 } 3422 }
… …
3263 3431
3264 cf::anim::invalidate_all; # d'oh 3432 cf::anim::invalidate_all; # d'oh
3265 } 3433 }
3266 3434
3267 { 3435 {
3268 # TODO: for gcfclient pleasure, we should give resources
3269 # that gcfclient doesn't grok a >10000 face index.
3270 my $res = $facedata->{resource}; 3436 my $res = $facedata->{resource};
3271 3437
3272 while (my ($name, $info) = each %$res) { 3438 while (my ($name, $info) = each %$res) {
3273 if (defined $info->{type}) { 3439 if (defined $info->{type}) {
3274 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3440 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3275 my $data;
3276 3441
3277 if ($info->{type} & 1) { 3442 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3278 # prepend meta info
3279
3280 my $meta = $enc->encode ({
3281 name => $name,
3282 %{ $info->{meta} || {} },
3283 });
3284
3285 $data = pack "(w/a*)*", $meta, $info->{data};
3286 } else {
3287 $data = $info->{data};
3288 }
3289
3290 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3291 cf::face::set_type $idx, $info->{type}; 3443 cf::face::set_type $idx, $info->{type};
3292 } else { 3444 } else {
3293 $RESOURCE{$name} = $info; 3445 $RESOURCE{$name} = $info; # unused
3294 } 3446 }
3295 3447
3296 cf::cede_to_tick; 3448 cf::cede_to_tick;
3297 } 3449 }
3298 } 3450 }
3299 3451
3300 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3452 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3301 3453
3302 1 3454 1
3303} 3455}
3304
3305cf::global->attach (on_resource_update => sub {
3306 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3307 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3308
3309 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3310 my $sound = $soundconf->{compat}[$_]
3311 or next;
3312
3313 my $face = cf::face::find "sound/$sound->[1]";
3314 cf::sound::set $sound->[0] => $face;
3315 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3316 }
3317
3318 while (my ($k, $v) = each %{$soundconf->{event}}) {
3319 my $face = cf::face::find "sound/$v";
3320 cf::sound::set $k => $face;
3321 }
3322 }
3323});
3324 3456
3325register_exticmd fx_want => sub { 3457register_exticmd fx_want => sub {
3326 my ($ns, $want) = @_; 3458 my ($ns, $want) = @_;
3327 3459
3328 while (my ($k, $v) = each %$want) { 3460 while (my ($k, $v) = each %$want) {
… …
3367sub reload_treasures { 3499sub reload_treasures {
3368 load_resource_file "$DATADIR/treasures" 3500 load_resource_file "$DATADIR/treasures"
3369 or die "unable to load treasurelists\n"; 3501 or die "unable to load treasurelists\n";
3370} 3502}
3371 3503
3504sub reload_sound {
3505 trace "loading sound config from $DATADIR/sound\n";
3506
3507 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3508 or die "$DATADIR/sound $!";
3509
3510 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3511
3512 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3513 my $sound = $soundconf->{compat}[$_]
3514 or next;
3515
3516 my $face = cf::face::find "sound/$sound->[1]";
3517 cf::sound::set $sound->[0] => $face;
3518 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3519 }
3520
3521 while (my ($k, $v) = each %{$soundconf->{event}}) {
3522 my $face = cf::face::find "sound/$v";
3523 cf::sound::set $k => $face;
3524 }
3525}
3526
3372sub reload_resources { 3527sub reload_resources {
3373 warn "reloading resource files...\n"; 3528 trace "reloading resource files...\n";
3374 3529
3375 reload_facedata; 3530 reload_facedata;
3531 reload_sound;
3376 reload_archetypes; 3532 reload_archetypes;
3377 reload_regions; 3533 reload_regions;
3378 reload_treasures; 3534 reload_treasures;
3379 3535
3380 warn "finished reloading resource files\n"; 3536 trace "finished reloading resource files\n";
3381} 3537}
3382 3538
3383sub reload_config { 3539sub reload_config {
3540 trace "reloading config file...\n";
3541
3384 open my $fh, "<:utf8", "$CONFDIR/config" 3542 open my $fh, "<:utf8", "$CONFDIR/config"
3385 or return; 3543 or return;
3386 3544
3387 local $/; 3545 local $/;
3388 *CFG = YAML::Load <$fh>; 3546 *CFG = YAML::XS::Load scalar <$fh>;
3389 3547
3390 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3548 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3391 3549
3392 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3550 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3393 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3551 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3394 3552
3395 if (exists $CFG{mlockall}) { 3553 if (exists $CFG{mlockall}) {
… …
3397 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3555 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3398 and die "WARNING: m(un)lockall failed: $!\n"; 3556 and die "WARNING: m(un)lockall failed: $!\n";
3399 }; 3557 };
3400 warn $@ if $@; 3558 warn $@ if $@;
3401 } 3559 }
3560
3561 trace "finished reloading resource files\n";
3402} 3562}
3403 3563
3404sub pidfile() { 3564sub pidfile() {
3405 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3565 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3406 or die "$PIDFILE: $!"; 3566 or die "$PIDFILE: $!";
… …
3419 seek $fh, 0, 0; 3579 seek $fh, 0, 0;
3420 print $fh $$; 3580 print $fh $$;
3421} 3581}
3422 3582
3423sub main_loop { 3583sub main_loop {
3424 warn "EV::loop starting\n"; 3584 trace "EV::loop starting\n";
3425 if (1) { 3585 if (1) {
3426 EV::loop; 3586 EV::loop;
3427 } 3587 }
3428 warn "EV::loop returned\n"; 3588 trace "EV::loop returned\n";
3429 goto &main_loop unless $REALLY_UNLOOP; 3589 goto &main_loop unless $REALLY_UNLOOP;
3430} 3590}
3431 3591
3432sub main { 3592sub main {
3433 cf::init_globals; # initialise logging 3593 cf::init_globals; # initialise logging
3434 3594
3435 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3595 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3436 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3596 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3437 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3597 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3438 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3598 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3439
3440 cf::init_experience;
3441 cf::init_anim;
3442 cf::init_attackmess;
3443 cf::init_dynamic;
3444 3599
3445 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3600 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3446 3601
3447 # we must not ever block the main coroutine 3602 # we must not ever block the main coroutine
3448 local $Coro::idle = sub { 3603 local $Coro::idle = sub {
… …
3454 }; 3609 };
3455 3610
3456 evthread_start IO::AIO::poll_fileno; 3611 evthread_start IO::AIO::poll_fileno;
3457 3612
3458 cf::sync_job { 3613 cf::sync_job {
3614 cf::init_experience;
3615 cf::init_anim;
3616 cf::init_attackmess;
3617 cf::init_dynamic;
3618
3619 cf::load_settings;
3620 cf::load_materials;
3621
3459 reload_resources; 3622 reload_resources;
3460 reload_config; 3623 reload_config;
3461 db_init; 3624 db_init;
3462 3625
3463 cf::load_settings;
3464 cf::load_materials;
3465 cf::init_uuid; 3626 cf::init_uuid;
3466 cf::init_signals; 3627 cf::init_signals;
3467 cf::init_commands;
3468 cf::init_skills; 3628 cf::init_skills;
3469 3629
3470 cf::init_beforeplay; 3630 cf::init_beforeplay;
3471 3631
3472 atomic; 3632 atomic;
… …
3479 use POSIX (); 3639 use POSIX ();
3480 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3640 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3481 3641
3482 (pop @POST_INIT)->(0) while @POST_INIT; 3642 (pop @POST_INIT)->(0) while @POST_INIT;
3483 }; 3643 };
3644
3645 cf::object::thawer::errors_are_fatal 0;
3646 info "parse errors in files are no longer fatal from this point on.\n";
3484 3647
3485 main_loop; 3648 main_loop;
3486} 3649}
3487 3650
3488############################################################################# 3651#############################################################################
… …
3490 3653
3491# install some emergency cleanup handlers 3654# install some emergency cleanup handlers
3492BEGIN { 3655BEGIN {
3493 our %SIGWATCHER = (); 3656 our %SIGWATCHER = ();
3494 for my $signal (qw(INT HUP TERM)) { 3657 for my $signal (qw(INT HUP TERM)) {
3495 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3658 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3496 cf::cleanup "SIG$signal"; 3659 cf::cleanup "SIG$signal";
3497 }; 3660 };
3498 } 3661 }
3499} 3662}
3500 3663
3501sub write_runtime_sync { 3664sub write_runtime_sync {
3665 my $t0 = AE::time;
3666
3502 # first touch the runtime file to show we are still running: 3667 # first touch the runtime file to show we are still running:
3503 # the fsync below can take a very very long time. 3668 # the fsync below can take a very very long time.
3504 3669
3505 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3670 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3506 3671
3507 my $guard = cf::lock_acquire "write_runtime"; 3672 my $guard = cf::lock_acquire "write_runtime";
3508 3673
3509 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3674 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3510 or return; 3675 or return;
3511 3676
3512 my $value = $cf::RUNTIME + 90 + 10; 3677 my $value = $cf::RUNTIME + 90 + 10;
3513 # 10 is the runtime save interval, for a monotonic clock 3678 # 10 is the runtime save interval, for a monotonic clock
3514 # 60 allows for the watchdog to kill the server. 3679 # 60 allows for the watchdog to kill the server.
… …
3527 or return; 3692 or return;
3528 3693
3529 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3694 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3530 and return; 3695 and return;
3531 3696
3532 warn "runtime file written.\n"; 3697 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3533 3698
3534 1 3699 1
3535} 3700}
3536 3701
3537our $uuid_lock; 3702our $uuid_lock;
… …
3549 or return; 3714 or return;
3550 3715
3551 my $value = uuid_seq uuid_cur; 3716 my $value = uuid_seq uuid_cur;
3552 3717
3553 unless ($value) { 3718 unless ($value) {
3554 warn "cowardly refusing to write zero uuid value!\n"; 3719 info "cowardly refusing to write zero uuid value!\n";
3555 return; 3720 return;
3556 } 3721 }
3557 3722
3558 my $value = uuid_str $value + $uuid_skip; 3723 my $value = uuid_str $value + $uuid_skip;
3559 $uuid_skip = 0; 3724 $uuid_skip = 0;
… …
3569 or return; 3734 or return;
3570 3735
3571 aio_rename "$uuid~", $uuid 3736 aio_rename "$uuid~", $uuid
3572 and return; 3737 and return;
3573 3738
3574 warn "uuid file written ($value).\n"; 3739 trace "uuid file written ($value).\n";
3575 3740
3576 1 3741 1
3577 3742
3578} 3743}
3579 3744
… …
3585} 3750}
3586 3751
3587sub emergency_save() { 3752sub emergency_save() {
3588 my $freeze_guard = cf::freeze_mainloop; 3753 my $freeze_guard = cf::freeze_mainloop;
3589 3754
3590 warn "emergency_perl_save: enter\n"; 3755 info "emergency_perl_save: enter\n";
3756
3757 # this is a trade-off: we want to be very quick here, so
3758 # save all maps without fsync, and later call a global sync
3759 # (which in turn might be very very slow)
3760 local $USE_FSYNC = 0;
3591 3761
3592 cf::sync_job { 3762 cf::sync_job {
3593 # this is a trade-off: we want to be very quick here, so
3594 # save all maps without fsync, and later call a global sync
3595 # (which in turn might be very very slow)
3596 local $USE_FSYNC = 0;
3597
3598 # use a peculiar iteration method to avoid tripping on perl 3763 # use a peculiar iteration method to avoid tripping on perl
3599 # refcount bugs in for. also avoids problems with players 3764 # refcount bugs in for. also avoids problems with players
3600 # and maps saved/destroyed asynchronously. 3765 # and maps saved/destroyed asynchronously.
3601 warn "emergency_perl_save: begin player save\n"; 3766 info "emergency_perl_save: begin player save\n";
3602 for my $login (keys %cf::PLAYER) { 3767 for my $login (keys %cf::PLAYER) {
3603 my $pl = $cf::PLAYER{$login} or next; 3768 my $pl = $cf::PLAYER{$login} or next;
3604 $pl->valid or next; 3769 $pl->valid or next;
3605 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3770 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3606 $pl->save; 3771 $pl->save;
3607 } 3772 }
3608 warn "emergency_perl_save: end player save\n"; 3773 info "emergency_perl_save: end player save\n";
3609 3774
3610 warn "emergency_perl_save: begin map save\n"; 3775 info "emergency_perl_save: begin map save\n";
3611 for my $path (keys %cf::MAP) { 3776 for my $path (keys %cf::MAP) {
3612 my $map = $cf::MAP{$path} or next; 3777 my $map = $cf::MAP{$path} or next;
3613 $map->valid or next; 3778 $map->valid or next;
3614 $map->save; 3779 $map->save;
3615 } 3780 }
3616 warn "emergency_perl_save: end map save\n"; 3781 info "emergency_perl_save: end map save\n";
3617 3782
3618 warn "emergency_perl_save: begin database checkpoint\n"; 3783 info "emergency_perl_save: begin database checkpoint\n";
3619 BDB::db_env_txn_checkpoint $DB_ENV; 3784 BDB::db_env_txn_checkpoint $DB_ENV;
3620 warn "emergency_perl_save: end database checkpoint\n"; 3785 info "emergency_perl_save: end database checkpoint\n";
3621 3786
3622 warn "emergency_perl_save: begin write uuid\n"; 3787 info "emergency_perl_save: begin write uuid\n";
3623 write_uuid_sync 1; 3788 write_uuid_sync 1;
3624 warn "emergency_perl_save: end write uuid\n"; 3789 info "emergency_perl_save: end write uuid\n";
3625 }; 3790 };
3626 3791
3627 warn "emergency_perl_save: starting sync()\n"; 3792 info "emergency_perl_save: starting sync()\n";
3628 IO::AIO::aio_sync sub { 3793 IO::AIO::aio_sync sub {
3629 warn "emergency_perl_save: finished sync()\n"; 3794 info "emergency_perl_save: finished sync()\n";
3630 }; 3795 };
3631 3796
3632 warn "emergency_perl_save: leave\n"; 3797 info "emergency_perl_save: leave\n";
3633} 3798}
3634 3799
3635sub post_cleanup { 3800sub post_cleanup {
3636 my ($make_core) = @_; 3801 my ($make_core) = @_;
3637 3802
3638 warn Carp::longmess "post_cleanup backtrace" 3803 error Carp::longmess "post_cleanup backtrace"
3639 if $make_core; 3804 if $make_core;
3640 3805
3641 my $fh = pidfile; 3806 my $fh = pidfile;
3642 unlink $PIDFILE if <$fh> == $$; 3807 unlink $PIDFILE if <$fh> == $$;
3643} 3808}
… …
3663 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3828 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3664 for my $name (keys %$leaf_symtab) { 3829 for my $name (keys %$leaf_symtab) {
3665 _gv_clear *{"$pkg$name"}; 3830 _gv_clear *{"$pkg$name"};
3666# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3831# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3667 } 3832 }
3668 warn "cleared package $pkg\n";#d#
3669} 3833}
3670 3834
3671sub do_reload_perl() { 3835sub do_reload_perl() {
3672 # can/must only be called in main 3836 # can/must only be called in main
3673 if ($Coro::current != $Coro::main) { 3837 if (in_main) {
3674 warn "can only reload from main coroutine"; 3838 error "can only reload from main coroutine";
3675 return; 3839 return;
3676 } 3840 }
3677 3841
3678 return if $RELOAD++; 3842 return if $RELOAD++;
3679 3843
3680 my $t1 = EV::time; 3844 my $t1 = AE::time;
3681 3845
3682 while ($RELOAD) { 3846 while ($RELOAD) {
3683 warn "reloading..."; 3847 info "reloading...";
3684 3848
3685 warn "entering sync_job"; 3849 trace "entering sync_job";
3686 3850
3687 cf::sync_job { 3851 cf::sync_job {
3688 cf::write_runtime_sync; # external watchdog should not bark 3852 cf::write_runtime_sync; # external watchdog should not bark
3689 cf::emergency_save; 3853 cf::emergency_save;
3690 cf::write_runtime_sync; # external watchdog should not bark 3854 cf::write_runtime_sync; # external watchdog should not bark
3691 3855
3692 warn "syncing database to disk"; 3856 trace "syncing database to disk";
3693 BDB::db_env_txn_checkpoint $DB_ENV; 3857 BDB::db_env_txn_checkpoint $DB_ENV;
3694 3858
3695 # if anything goes wrong in here, we should simply crash as we already saved 3859 # if anything goes wrong in here, we should simply crash as we already saved
3696 3860
3697 warn "flushing outstanding aio requests"; 3861 trace "flushing outstanding aio requests";
3698 while (IO::AIO::nreqs || BDB::nreqs) { 3862 while (IO::AIO::nreqs || BDB::nreqs) {
3699 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 3863 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3700 } 3864 }
3701 3865
3702 warn "cancelling all extension coros"; 3866 trace "cancelling all extension coros";
3703 $_->cancel for values %EXT_CORO; 3867 $_->cancel for values %EXT_CORO;
3704 %EXT_CORO = (); 3868 %EXT_CORO = ();
3705 3869
3706 warn "removing commands"; 3870 trace "removing commands";
3707 %COMMAND = (); 3871 %COMMAND = ();
3708 3872
3709 warn "removing ext/exti commands"; 3873 trace "removing ext/exti commands";
3710 %EXTCMD = (); 3874 %EXTCMD = ();
3711 %EXTICMD = (); 3875 %EXTICMD = ();
3712 3876
3713 warn "unloading/nuking all extensions"; 3877 trace "unloading/nuking all extensions";
3714 for my $pkg (@EXTS) { 3878 for my $pkg (@EXTS) {
3715 warn "... unloading $pkg"; 3879 trace "... unloading $pkg";
3716 3880
3717 if (my $cb = $pkg->can ("unload")) { 3881 if (my $cb = $pkg->can ("unload")) {
3718 eval { 3882 eval {
3719 $cb->($pkg); 3883 $cb->($pkg);
3720 1 3884 1
3721 } or warn "$pkg unloaded, but with errors: $@"; 3885 } or error "$pkg unloaded, but with errors: $@";
3722 } 3886 }
3723 3887
3724 warn "... clearing $pkg"; 3888 trace "... clearing $pkg";
3725 clear_package $pkg; 3889 clear_package $pkg;
3726 } 3890 }
3727 3891
3728 warn "unloading all perl modules loaded from $LIBDIR"; 3892 trace "unloading all perl modules loaded from $LIBDIR";
3729 while (my ($k, $v) = each %INC) { 3893 while (my ($k, $v) = each %INC) {
3730 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3894 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3731 3895
3732 warn "... unloading $k"; 3896 trace "... unloading $k";
3733 delete $INC{$k}; 3897 delete $INC{$k};
3734 3898
3735 $k =~ s/\.pm$//; 3899 $k =~ s/\.pm$//;
3736 $k =~ s/\//::/g; 3900 $k =~ s/\//::/g;
3737 3901
… …
3740 } 3904 }
3741 3905
3742 clear_package $k; 3906 clear_package $k;
3743 } 3907 }
3744 3908
3745 warn "getting rid of safe::, as good as possible"; 3909 trace "getting rid of safe::, as good as possible";
3746 clear_package "safe::$_" 3910 clear_package "safe::$_"
3747 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3911 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3748 3912
3749 warn "unloading cf.pm \"a bit\""; 3913 trace "unloading cf.pm \"a bit\"";
3750 delete $INC{"cf.pm"}; 3914 delete $INC{"cf.pm"};
3751 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3915 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3752 3916
3753 # don't, removes xs symbols, too, 3917 # don't, removes xs symbols, too,
3754 # and global variables created in xs 3918 # and global variables created in xs
3755 #clear_package __PACKAGE__; 3919 #clear_package __PACKAGE__;
3756 3920
3757 warn "unload completed, starting to reload now"; 3921 info "unload completed, starting to reload now";
3758 3922
3759 warn "reloading cf.pm"; 3923 trace "reloading cf.pm";
3760 require cf; 3924 require cf;
3761 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3925 cf::_connect_to_perl_1;
3762 3926
3763 warn "loading config and database again"; 3927 trace "loading config and database again";
3764 cf::reload_config; 3928 cf::reload_config;
3765 3929
3766 warn "loading extensions"; 3930 trace "loading extensions";
3767 cf::load_extensions; 3931 cf::load_extensions;
3768 3932
3769 if ($REATTACH_ON_RELOAD) { 3933 if ($REATTACH_ON_RELOAD) {
3770 warn "reattaching attachments to objects/players"; 3934 trace "reattaching attachments to objects/players";
3771 _global_reattach; # objects, sockets 3935 _global_reattach; # objects, sockets
3772 warn "reattaching attachments to maps"; 3936 trace "reattaching attachments to maps";
3773 reattach $_ for values %MAP; 3937 reattach $_ for values %MAP;
3774 warn "reattaching attachments to players"; 3938 trace "reattaching attachments to players";
3775 reattach $_ for values %PLAYER; 3939 reattach $_ for values %PLAYER;
3776 } 3940 }
3777 3941
3778 warn "running post_init jobs"; 3942 trace "running post_init jobs";
3779 (pop @POST_INIT)->(1) while @POST_INIT; 3943 (pop @POST_INIT)->(1) while @POST_INIT;
3780 3944
3781 warn "leaving sync_job"; 3945 trace "leaving sync_job";
3782 3946
3783 1 3947 1
3784 } or do { 3948 } or do {
3785 warn $@; 3949 error $@;
3786 cf::cleanup "error while reloading, exiting."; 3950 cf::cleanup "error while reloading, exiting.";
3787 }; 3951 };
3788 3952
3789 warn "reloaded"; 3953 info "reloaded";
3790 --$RELOAD; 3954 --$RELOAD;
3791 } 3955 }
3792 3956
3793 $t1 = EV::time - $t1; 3957 $t1 = AE::time - $t1;
3794 warn "reload completed in ${t1}s\n"; 3958 info "reload completed in ${t1}s\n";
3795}; 3959};
3796 3960
3797our $RELOAD_WATCHER; # used only during reload 3961our $RELOAD_WATCHER; # used only during reload
3798 3962
3799sub reload_perl() { 3963sub reload_perl() {
… …
3801 # coro crashes during coro_state_free->destroy here. 3965 # coro crashes during coro_state_free->destroy here.
3802 3966
3803 $RELOAD_WATCHER ||= cf::async { 3967 $RELOAD_WATCHER ||= cf::async {
3804 Coro::AIO::aio_wait cache_extensions; 3968 Coro::AIO::aio_wait cache_extensions;
3805 3969
3806 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3970 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3807 do_reload_perl; 3971 do_reload_perl;
3808 undef $RELOAD_WATCHER; 3972 undef $RELOAD_WATCHER;
3809 }; 3973 };
3810 }; 3974 };
3811} 3975}
… …
3828 3992
3829our @WAIT_FOR_TICK; 3993our @WAIT_FOR_TICK;
3830our @WAIT_FOR_TICK_BEGIN; 3994our @WAIT_FOR_TICK_BEGIN;
3831 3995
3832sub wait_for_tick { 3996sub wait_for_tick {
3833 return if tick_inhibit || $Coro::current == $Coro::main; 3997 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3834 3998
3835 my $signal = new Coro::Signal; 3999 my $signal = new Coro::Signal;
3836 push @WAIT_FOR_TICK, $signal; 4000 push @WAIT_FOR_TICK, $signal;
3837 $signal->wait; 4001 $signal->wait;
3838} 4002}
3839 4003
3840sub wait_for_tick_begin { 4004sub wait_for_tick_begin {
3841 return if tick_inhibit || $Coro::current == $Coro::main; 4005 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3842 4006
3843 my $signal = new Coro::Signal; 4007 my $signal = new Coro::Signal;
3844 push @WAIT_FOR_TICK_BEGIN, $signal; 4008 push @WAIT_FOR_TICK_BEGIN, $signal;
3845 $signal->wait; 4009 $signal->wait;
3846} 4010}
… …
3852 return; 4016 return;
3853 } 4017 }
3854 4018
3855 cf::server_tick; # one server iteration 4019 cf::server_tick; # one server iteration
3856 4020
4021 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4022
3857 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4023 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3858 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4024 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3859 Coro::async_pool { 4025 Coro::async_pool {
3860 $Coro::current->{desc} = "runtime saver"; 4026 $Coro::current->{desc} = "runtime saver";
3861 write_runtime_sync 4027 write_runtime_sync
3862 or warn "ERROR: unable to write runtime file: $!"; 4028 or error "ERROR: unable to write runtime file: $!";
3863 }; 4029 };
3864 } 4030 }
3865 4031
3866 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4032 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3867 $sig->send; 4033 $sig->send;
… …
3875 4041
3876 if (0) { 4042 if (0) {
3877 if ($NEXT_TICK) { 4043 if ($NEXT_TICK) {
3878 my $jitter = $TICK_START - $NEXT_TICK; 4044 my $jitter = $TICK_START - $NEXT_TICK;
3879 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4045 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3880 warn "jitter $JITTER\n";#d# 4046 debug "jitter $JITTER\n";#d#
3881 } 4047 }
3882 } 4048 }
3883} 4049}
3884 4050
3885{ 4051{
3886 # configure BDB 4052 # configure BDB
3887 4053
3888 BDB::min_parallel 8; 4054 BDB::min_parallel 16;
3889 BDB::max_poll_reqs $TICK * 0.1; 4055 BDB::max_poll_reqs $TICK * 0.1;
3890 $AnyEvent::BDB::WATCHER->priority (1); 4056 $AnyEvent::BDB::WATCHER->priority (1);
3891 4057
3892 unless ($DB_ENV) { 4058 unless ($DB_ENV) {
3893 $DB_ENV = BDB::db_env_create; 4059 $DB_ENV = BDB::db_env_create;
… …
3974 } 4140 }
3975} 4141}
3976 4142
3977# load additional modules 4143# load additional modules
3978require "cf/$_.pm" for @EXTRA_MODULES; 4144require "cf/$_.pm" for @EXTRA_MODULES;
4145cf::_connect_to_perl_2;
3979 4146
3980END { cf::emergency_save } 4147END { cf::emergency_save }
3981 4148
39821 41491
3983 4150

Diff Legend

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