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.536 by root, Thu Apr 29 08:26:38 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;
478=cut 518=cut
479 519
480sub sync_job(&) { 520sub sync_job(&) {
481 my ($job) = @_; 521 my ($job) = @_;
482 522
483 if ($Coro::current == $Coro::main) { 523 if (in_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#
490 530
491 my $freeze_guard = freeze_mainloop; 531 my $freeze_guard = freeze_mainloop;
492 532
493 my $busy = 1; 533 my $busy = 1;
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
606within each server. 657within each server.
607 658
608=cut 659=cut
609 660
610sub db_table($) { 661sub db_table($) {
662 cf::error "db_get called from main context"
663 if $Coro::current == $Coro::main;
664
611 my ($name) = @_; 665 my ($name) = @_;
612 my $db = BDB::db_create $DB_ENV; 666 my $db = BDB::db_create $DB_ENV;
613 667
614 eval { 668 eval {
615 $db->set_flags (BDB::CHKSUM); 669 $db->set_flags (BDB::CHKSUM);
625} 679}
626 680
627our $DB; 681our $DB;
628 682
629sub db_init { 683sub db_init {
630 cf::sync_job {
631 $DB ||= db_table "db"; 684 $DB ||= db_table "db";
632 };
633} 685}
634 686
635sub db_get($$) { 687sub db_get($$) {
636 my $key = "$_[0]/$_[1]"; 688 my $key = "$_[0]/$_[1]";
637 689
638 cf::sync_job { 690 cf::error "db_get called from main context"
691 if $Coro::current == $Coro::main;
692
639 BDB::db_get $DB, undef, $key, my $data; 693 BDB::db_get $DB, undef, $key, my $data;
640 694
641 $! ? () 695 $! ? ()
642 : $data 696 : $data
643 }
644} 697}
645 698
646sub db_put($$$) { 699sub db_put($$$) {
647 BDB::dbreq_pri 4; 700 BDB::dbreq_pri 4;
648 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 701 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
704 757
705 my $t1 = Time::HiRes::time; 758 my $t1 = Time::HiRes::time;
706 my $data = $process->(\@data); 759 my $data = $process->(\@data);
707 my $t2 = Time::HiRes::time; 760 my $t2 = Time::HiRes::time;
708 761
709 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 762 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
710 763
711 db_put cache => "$id/data", $data; 764 db_put cache => "$id/data", $data;
712 db_put cache => "$id/md5" , $md5; 765 db_put cache => "$id/md5" , $md5;
713 db_put cache => "$id/meta", $meta; 766 db_put cache => "$id/meta", $meta;
714 767
724 777
725=cut 778=cut
726 779
727sub datalog($@) { 780sub datalog($@) {
728 my ($type, %kv) = @_; 781 my ($type, %kv) = @_;
729 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 782 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
730} 783}
731 784
732=back 785=back
733 786
734=cut 787=cut
929 982
930 } elsif (exists $cb_id{$type}) { 983 } elsif (exists $cb_id{$type}) {
931 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 984 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
932 985
933 } elsif (ref $type) { 986 } elsif (ref $type) {
934 warn "attaching objects not supported, ignoring.\n"; 987 error "attaching objects not supported, ignoring.\n";
935 988
936 } else { 989 } else {
937 shift @arg; 990 shift @arg;
938 warn "attach argument '$type' not supported, ignoring.\n"; 991 error "attach argument '$type' not supported, ignoring.\n";
939 } 992 }
940 } 993 }
941} 994}
942 995
943sub _object_attach { 996sub _object_attach {
953 _attach $registry, $klass, @attach; 1006 _attach $registry, $klass, @attach;
954 } 1007 }
955 1008
956 $obj->{$name} = \%arg; 1009 $obj->{$name} = \%arg;
957 } else { 1010 } else {
958 warn "object uses attachment '$name' which is not available, postponing.\n"; 1011 info "object uses attachment '$name' which is not available, postponing.\n";
959 } 1012 }
960 1013
961 $obj->{_attachment}{$name} = undef; 1014 $obj->{_attachment}{$name} = undef;
962} 1015}
963 1016
1022 1075
1023 for (@$callbacks) { 1076 for (@$callbacks) {
1024 eval { &{$_->[1]} }; 1077 eval { &{$_->[1]} };
1025 1078
1026 if ($@) { 1079 if ($@) {
1027 warn "$@";
1028 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1080 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1029 override; 1081 override;
1030 } 1082 }
1031 1083
1032 return 1 if $override; 1084 return 1 if $override;
1033 } 1085 }
1112 for (@$attach) { 1164 for (@$attach) {
1113 my ($klass, @attach) = @$_; 1165 my ($klass, @attach) = @$_;
1114 _attach $registry, $klass, @attach; 1166 _attach $registry, $klass, @attach;
1115 } 1167 }
1116 } else { 1168 } else {
1117 warn "object uses attachment '$name' that is not available, postponing.\n"; 1169 info "object uses attachment '$name' that is not available, postponing.\n";
1118 } 1170 }
1119 } 1171 }
1120} 1172}
1121 1173
1122cf::attachable->attach ( 1174cf::attachable->attach (
1149 my ($filename, $rdata, $objs) = @_; 1201 my ($filename, $rdata, $objs) = @_;
1150 1202
1151 sync_job { 1203 sync_job {
1152 if (length $$rdata) { 1204 if (length $$rdata) {
1153 utf8::decode (my $decname = $filename); 1205 utf8::decode (my $decname = $filename);
1154 warn sprintf "saving %s (%d,%d)\n", 1206 trace sprintf "saving %s (%d,%d)\n",
1155 $decname, length $$rdata, scalar @$objs; 1207 $decname, length $$rdata, scalar @$objs
1208 if $VERBOSE_IO;
1156 1209
1157 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1210 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1158 aio_chmod $fh, SAVE_MODE; 1211 aio_chmod $fh, SAVE_MODE;
1159 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1212 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1160 if ($cf::USE_FSYNC) { 1213 if ($cf::USE_FSYNC) {
1182 aio_rename "$filename~", $filename; 1235 aio_rename "$filename~", $filename;
1183 1236
1184 $filename =~ s%/[^/]+$%%; 1237 $filename =~ s%/[^/]+$%%;
1185 aio_pathsync $filename if $cf::USE_FSYNC; 1238 aio_pathsync $filename if $cf::USE_FSYNC;
1186 } else { 1239 } else {
1187 warn "unable to save objects: $filename~: $!\n"; 1240 error "unable to save objects: $filename~: $!\n";
1188 } 1241 }
1189 } else { 1242 } else {
1190 aio_unlink $filename; 1243 aio_unlink $filename;
1191 aio_unlink "$filename.pst"; 1244 aio_unlink "$filename.pst";
1192 } 1245 }
1216 my $st = eval { Coro::Storable::thaw $av }; 1269 my $st = eval { Coro::Storable::thaw $av };
1217 $av = $st->{objs}; 1270 $av = $st->{objs};
1218 } 1271 }
1219 1272
1220 utf8::decode (my $decname = $filename); 1273 utf8::decode (my $decname = $filename);
1221 warn sprintf "loading %s (%d,%d)\n", 1274 trace sprintf "loading %s (%d,%d)\n",
1222 $decname, length $data, scalar @{$av || []}; 1275 $decname, length $data, scalar @{$av || []}
1276 if $VERBOSE_IO;
1223 1277
1224 ($data, $av) 1278 ($data, $av)
1225} 1279}
1226 1280
1227=head2 COMMAND CALLBACKS 1281=head2 COMMAND CALLBACKS
1286} 1340}
1287 1341
1288use File::Glob (); 1342use File::Glob ();
1289 1343
1290cf::player->attach ( 1344cf::player->attach (
1291 on_command => sub { 1345 on_unknown_command => sub {
1292 my ($pl, $name, $params) = @_; 1346 my ($pl, $name, $params) = @_;
1293 1347
1294 my $cb = $COMMAND{$name} 1348 my $cb = $COMMAND{$name}
1295 or return; 1349 or return;
1296 1350
1319 1373
1320 $pl->ext_reply ($reply, @reply) 1374 $pl->ext_reply ($reply, @reply)
1321 if $reply; 1375 if $reply;
1322 1376
1323 } else { 1377 } else {
1324 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1378 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1325 } 1379 }
1326 1380
1327 cf::override; 1381 cf::override;
1328 }, 1382 },
1329); 1383);
1340 1394
1341 $grp 1395 $grp
1342} 1396}
1343 1397
1344sub load_extensions { 1398sub load_extensions {
1399 info "loading extensions...";
1400
1345 cf::sync_job { 1401 cf::sync_job {
1346 my %todo; 1402 my %todo;
1347 1403
1348 for my $path (<$LIBDIR/*.ext>) { 1404 for my $path (<$LIBDIR/*.ext>) {
1349 next unless -r $path; 1405 next unless -r $path;
1375 . "\n};\n1"; 1431 . "\n};\n1";
1376 1432
1377 $todo{$base} = \%ext; 1433 $todo{$base} = \%ext;
1378 } 1434 }
1379 1435
1436 my $pass = 0;
1380 my %done; 1437 my %done;
1381 while (%todo) { 1438 while (%todo) {
1382 my $progress; 1439 my $progress;
1383 1440
1441 ++$pass;
1442
1443 ext:
1384 while (my ($k, $v) = each %todo) { 1444 while (my ($k, $v) = each %todo) {
1385 for (split /,\s*/, $v->{meta}{depends}) { 1445 for (split /,\s*/, $v->{meta}{depends}) {
1386 goto skip 1446 next ext
1387 unless exists $done{$_}; 1447 unless exists $done{$_};
1388 } 1448 }
1389 1449
1390 warn "... loading '$k' into '$v->{pkg}'\n"; 1450 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1391 1451
1392 unless (eval $v->{source}) { 1452 my $active = eval $v->{source};
1453
1454 if (length $@) {
1393 my $msg = $@ ? "$v->{path}: $@\n" 1455 error "$v->{path}: $@\n";
1394 : "$v->{base}: extension inactive.\n";
1395 1456
1396 if (exists $v->{meta}{mandatory}) {
1397 warn $msg;
1398 cf::cleanup "mandatory extension failed to load, exiting."; 1457 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1399 } 1458 if exists $v->{meta}{mandatory};
1400 1459
1401 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;
1402 } 1469 }
1403
1404 $done{$k} = delete $todo{$k};
1405 push @EXTS, $v->{pkg};
1406 $progress = 1;
1407 } 1470 }
1408 1471
1409 skip: 1472 unless ($progress) {
1410 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1473 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1411 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 }
1412 } 1480 }
1413 }; 1481 };
1414} 1482}
1415 1483
1416############################################################################# 1484#############################################################################
1500 $cf::PLAYER{$login} = $pl 1568 $cf::PLAYER{$login} = $pl
1501 } 1569 }
1502 } 1570 }
1503} 1571}
1504 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
1505sub save($) { 1586sub save($) {
1506 my ($pl) = @_; 1587 my ($pl) = @_;
1507 1588
1508 return if $pl->{deny_save}; 1589 return if $pl->{deny_save};
1509 1590
1514 1595
1515 aio_mkdir playerdir $pl, 0770; 1596 aio_mkdir playerdir $pl, 0770;
1516 $pl->{last_save} = $cf::RUNTIME; 1597 $pl->{last_save} = $cf::RUNTIME;
1517 1598
1518 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];
1519 1603
1520 $pl->save_pl ($path); 1604 $pl->save_pl ($path);
1521 cf::cede_to_tick; 1605 cf::cede_to_tick;
1522} 1606}
1523 1607
1560 $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
1561 1645
1562 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1646 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1563 $pl->deactivate; 1647 $pl->deactivate;
1564 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;
1565 $pl->ob->check_score;
1566 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1649 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1567 $pl->ns->destroy if $pl->ns; 1650 $pl->ns->destroy if $pl->ns;
1568 1651
1569 my $path = playerdir $pl; 1652 my $path = playerdir $pl;
1570 my $temp = "$path~$cf::RUNTIME~deleting~"; 1653 my $temp = "$path~$cf::RUNTIME~deleting~";
1625 \@logins 1708 \@logins
1626} 1709}
1627 1710
1628=item $player->maps 1711=item $player->maps
1629 1712
1713=item cf::player::maps $login
1714
1630Returns an arrayref of map paths that are private for this 1715Returns an arrayref of map paths that are private for this
1631player. May block. 1716player. May block.
1632 1717
1633=cut 1718=cut
1634 1719
1696=cut 1781=cut
1697 1782
1698sub find_by_path($) { 1783sub find_by_path($) {
1699 my ($path) = @_; 1784 my ($path) = @_;
1700 1785
1786 $path =~ s/^~[^\/]*//; # skip ~login
1787
1701 my ($match, $specificity); 1788 my ($match, $specificity);
1702 1789
1703 for my $region (list) { 1790 for my $region (list) {
1704 if ($region->{match} && $path =~ $region->{match}) { 1791 if ($region->{match} && $path =~ $region->{match}) {
1705 ($match, $specificity) = ($region, $region->specificity) 1792 ($match, $specificity) = ($region, $region->specificity)
1736 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
1737 1824
1738 # mit "rum" bekleckern, nicht 1825 # mit "rum" bekleckern, nicht
1739 $self->_create_random_map ( 1826 $self->_create_random_map (
1740 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1827 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1741 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1828 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1742 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1829 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1743 $rmp->{exit_on_final_map}, 1830 $rmp->{exit_on_final_map},
1744 $rmp->{xsize}, $rmp->{ysize}, 1831 $rmp->{xsize}, $rmp->{ysize},
1745 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1832 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1746 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1833 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1768 1855
1769 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1856 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1770} 1857}
1771 1858
1772# also paths starting with '/' 1859# also paths starting with '/'
1773$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1860$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1774 1861
1775sub thawer_merge { 1862sub thawer_merge {
1776 my ($self, $merge) = @_; 1863 my ($self, $merge) = @_;
1777 1864
1778 # we have to keep some variables in memory intact 1865 # we have to keep some variables in memory intact
1992 2079
1993 $cf::MAP{$path} = $map 2080 $cf::MAP{$path} = $map
1994 } 2081 }
1995} 2082}
1996 2083
1997sub pre_load { } 2084sub pre_load { }
1998sub post_load { } 2085#sub post_load { } # XS
1999 2086
2000sub load { 2087sub load {
2001 my ($self) = @_; 2088 my ($self) = @_;
2002 2089
2003 local $self->{deny_reset} = 1; # loading can take a long time 2090 local $self->{deny_reset} = 1; # loading can take a long time
2060 } 2147 }
2061 2148
2062 $self->post_load; 2149 $self->post_load;
2063} 2150}
2064 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
2065sub customise_for { 2155sub customise_for {
2066 my ($self, $ob) = @_; 2156 my ($self, $ob) = @_;
2067 2157
2068 return find "~" . $ob->name . "/" . $self->{path} 2158 return find "~" . $ob->name . "/" . $self->{path}
2069 if $self->per_player; 2159 if $self->per_player;
2085 or next; 2175 or next;
2086 $neigh = find $neigh, $map 2176 $neigh = find $neigh, $map
2087 or next; 2177 or next;
2088 $neigh->load; 2178 $neigh->load;
2089 2179
2180 # now find the diagonal neighbours
2090 push @neigh, 2181 push @neigh,
2091 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2182 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2092 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2183 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2093 } 2184 }
2094 2185
2101} 2192}
2102 2193
2103sub find_sync { 2194sub find_sync {
2104 my ($path, $origin) = @_; 2195 my ($path, $origin) = @_;
2105 2196
2106 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
2107} 2201}
2108 2202
2109sub do_load_sync { 2203sub do_load_sync {
2110 my ($map) = @_; 2204 my ($map) = @_;
2111 2205
2112 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2206 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2113 if $Coro::current == $Coro::main; 2207 if $Coro::current == $Coro::main;
2114 2208
2115 cf::sync_job { $map->load }; 2209 $map->load;
2116} 2210}
2117 2211
2118our %MAP_PREFETCH; 2212our %MAP_PREFETCH;
2119our $MAP_PREFETCHER = undef; 2213our $MAP_PREFETCHER = undef;
2120 2214
2146 $MAP_PREFETCHER->prio (6); 2240 $MAP_PREFETCHER->prio (6);
2147 2241
2148 () 2242 ()
2149} 2243}
2150 2244
2245# common code, used by both ->save and ->swapout
2151sub save { 2246sub _save {
2152 my ($self) = @_; 2247 my ($self) = @_;
2153
2154 my $lock = cf::lock_acquire "map_data:$self->{path}";
2155 2248
2156 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2157 2250
2158 return unless $self->dirty; 2251 return unless $self->dirty;
2159 2252
2179 } else { 2272 } else {
2180 $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);
2181 } 2274 }
2182} 2275}
2183 2276
2277sub save {
2278 my ($self) = @_;
2279
2280 my $lock = cf::lock_acquire "map_data:$self->{path}";
2281
2282 $self->_save;
2283}
2284
2184sub swap_out { 2285sub swap_out {
2185 my ($self) = @_; 2286 my ($self) = @_;
2186 2287
2187 # save first because save cedes
2188 $self->save;
2189
2190 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2288 my $lock = cf::lock_acquire "map_data:$self->{path}";
2191 2289
2192 return if $self->players;
2193 return if $self->in_memory != cf::MAP_ACTIVE; 2290 return if $self->in_memory != cf::MAP_ACTIVE;
2194 return if $self->{deny_save}; 2291 return if $self->{deny_save};
2292 return if $self->players;
2195 2293
2294 # first deactivate the map and "unlink" it from the core
2295 $self->deactivate;
2296 $_->clear_links_to ($self) for values %cf::MAP;
2196 $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};
2197 2344
2198 $self->deactivate; 2345 $self->deactivate;
2199 $_->clear_links_to ($self) for values %cf::MAP; 2346 $_->clear_links_to ($self) for values %cf::MAP;
2200 $self->clear; 2347 $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 2348
2246 $self->unlink_save; 2349 $self->unlink_save;
2247 $self->destroy; 2350 $self->destroy;
2248} 2351}
2249 2352
2257 2360
2258 delete $cf::MAP{$self->path}; 2361 delete $cf::MAP{$self->path};
2259 2362
2260 $self->unlink_save; 2363 $self->unlink_save;
2261 2364
2262 bless $self, "cf::map"; 2365 bless $self, "cf::map::wrap";
2263 delete $self->{deny_reset}; 2366 delete $self->{deny_reset};
2264 $self->{deny_save} = 1; 2367 $self->{deny_save} = 1;
2265 $self->reset_timeout (1); 2368 $self->reset_timeout (1);
2266 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2369 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2267 2370
2324 : normalise $_ 2427 : normalise $_
2325 } @{ aio_readdir $UNIQUEDIR or [] } 2428 } @{ aio_readdir $UNIQUEDIR or [] }
2326 ] 2429 ]
2327} 2430}
2328 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
2329=back 2464=back
2330 2465
2331=head3 cf::object 2466=head3 cf::object
2332 2467
2333=cut 2468=cut
2465 2600
2466Freezes 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}>).
2467 2602
2468The 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.
2469for 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,
2470though, 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
2471map. 2606map.
2472 2607
2473Will never block. 2608Will never block.
2474 2609
2475=item $player_object->leave_link ($map, $x, $y) 2610=item $player_object->leave_link ($map, $x, $y)
2496sub cf::object::player::enter_link { 2631sub cf::object::player::enter_link {
2497 my ($self) = @_; 2632 my ($self) = @_;
2498 2633
2499 $self->deactivate_recursive; 2634 $self->deactivate_recursive;
2500 2635
2636 ++$self->{_link_recursion};
2637
2501 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2638 return if UNIVERSAL::isa $self->map, "ext::map_link";
2502 2639
2503 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2640 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2504 if $self->map && $self->map->{path} ne "{link}"; 2641 if $self->map && $self->map->{path} ne "{link}";
2505 2642
2506 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2643 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2507} 2644}
2508 2645
2509sub cf::object::player::leave_link { 2646sub cf::object::player::leave_link {
2510 my ($self, $map, $x, $y) = @_; 2647 my ($self, $map, $x, $y) = @_;
2511 2648
2528 ($x, $y) = (-1, -1) 2665 ($x, $y) = (-1, -1)
2529 unless (defined $x) && (defined $y); 2666 unless (defined $x) && (defined $y);
2530 2667
2531 # use -1 or undef as default coordinates, not 0, 0 2668 # use -1 or undef as default coordinates, not 0, 0
2532 ($x, $y) = ($map->enter_x, $map->enter_y) 2669 ($x, $y) = ($map->enter_x, $map->enter_y)
2533 if $x <=0 && $y <= 0; 2670 if $x <= 0 && $y <= 0;
2534 2671
2535 $map->load; 2672 $map->load;
2536 $map->load_neighbours; 2673 $map->load_neighbours;
2537 2674
2538 return unless $self->contr->active; 2675 return unless $self->contr->active;
2539 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2540 $self->activate_recursive;
2541 2676
2542 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2677 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2543 $self->enter_map ($map, $x, $y); 2678 if ($self->enter_map ($map, $x, $y)) {
2544} 2679 # entering was successful
2680 delete $self->{_link_recursion};
2681 # only activate afterwards, to support waiting in hooks
2682 $self->activate_recursive;
2683 }
2545 2684
2685}
2686
2546=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)]])
2547 2688
2548Moves 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
2549her, loading and preparing them map, calling the provided $check callback 2690her, loading and preparing them map, calling the provided $check callback
2550that 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
2551the 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
2558 2699
2559our $GOTOGEN; 2700our $GOTOGEN;
2560 2701
2561sub cf::object::player::goto { 2702sub cf::object::player::goto {
2562 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 }
2563 2710
2564 # 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
2565 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2712 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2566 2713
2567 $self->enter_link; 2714 $self->enter_link;
2591 my $map = eval { 2738 my $map = eval {
2592 my $map = defined $path ? cf::map::find $path : undef; 2739 my $map = defined $path ? cf::map::find $path : undef;
2593 2740
2594 if ($map) { 2741 if ($map) {
2595 $map = $map->customise_for ($self); 2742 $map = $map->customise_for ($self);
2596 $map = $check->($map) if $check && $map; 2743 $map = $check->($map, $x, $y, $self) if $check && $map;
2597 } else { 2744 } else {
2598 $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);
2599 } 2746 }
2600 2747
2601 $map 2748 $map
2609 if ($gen == $self->{_goto_generation}) { 2756 if ($gen == $self->{_goto_generation}) {
2610 delete $self->{_goto_generation}; 2757 delete $self->{_goto_generation};
2611 $self->leave_link ($map, $x, $y); 2758 $self->leave_link ($map, $x, $y);
2612 } 2759 }
2613 2760
2614 $done->() if $done; 2761 $done->($self) if $done;
2615 })->prio (1); 2762 })->prio (1);
2616} 2763}
2617 2764
2618=item $player_object->enter_exit ($exit_object) 2765=item $player_object->enter_exit ($exit_object)
2619 2766
2712 $self->message ("Something went wrong deep within the deliantra server. " 2859 $self->message ("Something went wrong deep within the deliantra server. "
2713 . "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. "
2714 . "Please report this to the dungeon master!", 2861 . "Please report this to the dungeon master!",
2715 cf::NDI_UNIQUE | cf::NDI_RED); 2862 cf::NDI_UNIQUE | cf::NDI_RED);
2716 2863
2717 warn "ERROR in enter_exit: $@"; 2864 error "ERROR in enter_exit: $@";
2718 $self->leave_link; 2865 $self->leave_link;
2719 } 2866 }
2720 })->prio (1); 2867 })->prio (1);
2721} 2868}
2722 2869
2734sub cf::client::send_drawinfo { 2881sub cf::client::send_drawinfo {
2735 my ($self, $text, $flags) = @_; 2882 my ($self, $text, $flags) = @_;
2736 2883
2737 utf8::encode $text; 2884 utf8::encode $text;
2738 $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);
2739} 2911}
2740 2912
2741=item $client->send_msg ($channel, $msg, $color, [extra...]) 2913=item $client->send_msg ($channel, $msg, $color, [extra...])
2742 2914
2743Send 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
2747 2919
2748=cut 2920=cut
2749 2921
2750# non-persistent channels (usually the info channel) 2922# non-persistent channels (usually the info channel)
2751our %CHANNEL = ( 2923our %CHANNEL = (
2924 "c/motd" => {
2925 id => "infobox",
2926 title => "MOTD",
2927 reply => undef,
2928 tooltip => "The message of the day",
2929 },
2752 "c/identify" => { 2930 "c/identify" => {
2753 id => "infobox", 2931 id => "infobox",
2754 title => "Identify", 2932 title => "Identify",
2755 reply => undef, 2933 reply => undef,
2756 tooltip => "Items recently identified", 2934 tooltip => "Items recently identified",
2758 "c/examine" => { 2936 "c/examine" => {
2759 id => "infobox", 2937 id => "infobox",
2760 title => "Examine", 2938 title => "Examine",
2761 reply => undef, 2939 reply => undef,
2762 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",
2763 }, 2947 },
2764 "c/book" => { 2948 "c/book" => {
2765 id => "infobox", 2949 id => "infobox",
2766 title => "Book", 2950 title => "Book",
2767 reply => undef, 2951 reply => undef,
2883 my $pkt = "msg " 3067 my $pkt = "msg "
2884 . $self->{json_coder}->encode ( 3068 . $self->{json_coder}->encode (
2885 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3069 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2886 ); 3070 );
2887 3071
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); 3072 $self->send_big_packet ($pkt);
2899} 3073}
2900 3074
2901=item $client->ext_msg ($type, @msg) 3075=item $client->ext_msg ($type, @msg)
2902 3076
2903Sends an ext event to the client. 3077Sends an ext event to the client.
2906 3080
2907sub cf::client::ext_msg($$@) { 3081sub cf::client::ext_msg($$@) {
2908 my ($self, $type, @msg) = @_; 3082 my ($self, $type, @msg) = @_;
2909 3083
2910 if ($self->extcmd == 2) { 3084 if ($self->extcmd == 2) {
2911 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3085 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2912 } elsif ($self->extcmd == 1) { # TODO: remove 3086 } elsif ($self->extcmd == 1) { # TODO: remove
2913 push @msg, msgtype => "event_$type"; 3087 push @msg, msgtype => "event_$type";
2914 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3088 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2915 } 3089 }
2916} 3090}
2917 3091
2918=item $client->ext_reply ($msgid, @msg) 3092=item $client->ext_reply ($msgid, @msg)
2919 3093
2923 3097
2924sub cf::client::ext_reply($$@) { 3098sub cf::client::ext_reply($$@) {
2925 my ($self, $id, @msg) = @_; 3099 my ($self, $id, @msg) = @_;
2926 3100
2927 if ($self->extcmd == 2) { 3101 if ($self->extcmd == 2) {
2928 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3102 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2929 } elsif ($self->extcmd == 1) { 3103 } elsif ($self->extcmd == 1) {
2930 #TODO: version 1, remove 3104 #TODO: version 1, remove
2931 unshift @msg, msgtype => "reply", msgid => $id; 3105 unshift @msg, msgtype => "reply", msgid => $id;
2932 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3106 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2933 } 3107 }
2934} 3108}
2935 3109
2936=item $success = $client->query ($flags, "text", \&cb) 3110=item $success = $client->query ($flags, "text", \&cb)
2937 3111
3008 3182
3009 $ns->ext_reply ($reply, @reply) 3183 $ns->ext_reply ($reply, @reply)
3010 if $reply; 3184 if $reply;
3011 3185
3012 } else { 3186 } else {
3013 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";
3014 } 3188 }
3015 3189
3016 cf::override; 3190 cf::override;
3017 }, 3191 },
3018); 3192);
3038 3212
3039 $coro 3213 $coro
3040} 3214}
3041 3215
3042cf::client->attach ( 3216cf::client->attach (
3043 on_destroy => sub { 3217 on_client_destroy => sub {
3044 my ($ns) = @_; 3218 my ($ns) = @_;
3045 3219
3046 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3220 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3047 }, 3221 },
3048); 3222);
3064our $safe_hole = new Safe::Hole; 3238our $safe_hole = new Safe::Hole;
3065 3239
3066$SIG{FPE} = 'IGNORE'; 3240$SIG{FPE} = 'IGNORE';
3067 3241
3068$safe->permit_only (Opcode::opset qw( 3242$safe->permit_only (Opcode::opset qw(
3069 :base_core :base_mem :base_orig :base_math 3243 :base_core :base_mem :base_orig :base_math :base_loop
3070 grepstart grepwhile mapstart mapwhile 3244 grepstart grepwhile mapstart mapwhile
3071 sort time 3245 sort time
3072)); 3246));
3073 3247
3074# here we export the classes and methods available to script code 3248# here we export the classes and methods available to script code
3126 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3300 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3127 $qcode =~ s/\n/\\n/g; 3301 $qcode =~ s/\n/\\n/g;
3128 3302
3129 %vars = (_dummy => 0) unless %vars; 3303 %vars = (_dummy => 0) unless %vars;
3130 3304
3305 my @res;
3131 local $_; 3306 local $_;
3132 local @safe::cf::_safe_eval_args = values %vars;
3133 3307
3134 my $eval = 3308 my $eval =
3135 "do {\n" 3309 "do {\n"
3136 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3310 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3137 . "#line 0 \"{$qcode}\"\n" 3311 . "#line 0 \"{$qcode}\"\n"
3138 . $code 3312 . $code
3139 . "\n}" 3313 . "\n}"
3140 ; 3314 ;
3141 3315
3316 if ($CFG{safe_eval}) {
3142 sub_generation_inc; 3317 sub_generation_inc;
3318 local @safe::cf::_safe_eval_args = values %vars;
3143 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3319 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3144 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 }
3145 3325
3146 if ($@) { 3326 if ($@) {
3147 warn "$@"; 3327 warn "$@",
3148 warn "while executing safe code '$code'\n"; 3328 "while executing safe code '$code'\n",
3149 warn "with arguments " . (join " ", %vars) . "\n"; 3329 "with arguments " . (join " ", %vars) . "\n";
3150 } 3330 }
3151 3331
3152 wantarray ? @res : $res[0] 3332 wantarray ? @res : $res[0]
3153} 3333}
3154 3334
3168=cut 3348=cut
3169 3349
3170sub register_script_function { 3350sub register_script_function {
3171 my ($fun, $cb) = @_; 3351 my ($fun, $cb) = @_;
3172 3352
3173 no strict 'refs'; 3353 $fun = "safe::$fun" if $CFG{safe_eval};
3174 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3354 *$fun = $safe_hole->wrap ($cb);
3175} 3355}
3176 3356
3177=back 3357=back
3178 3358
3179=cut 3359=cut
3188 # for this (global event?) 3368 # for this (global event?)
3189 %ext::player_env::MUSIC_FACE_CACHE = (); 3369 %ext::player_env::MUSIC_FACE_CACHE = ();
3190 3370
3191 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3371 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3192 3372
3193 warn "loading facedata from $path\n"; 3373 trace "loading facedata from $path\n";
3194 3374
3195 my $facedata; 3375 my $facedata;
3196 0 < aio_load $path, $facedata 3376 0 < aio_load $path, $facedata
3197 or die "$path: $!"; 3377 or die "$path: $!";
3198 3378
3200 3380
3201 $facedata->{version} == 2 3381 $facedata->{version} == 2
3202 or cf::cleanup "$path: version mismatch, cannot proceed."; 3382 or cf::cleanup "$path: version mismatch, cannot proceed.";
3203 3383
3204 # 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]);
3205 $facedata->{resource}{"res/exp_table"} = { 3386 $facedata->{resource}{"res/exp_table"} = {
3206 type => FT_RSRC, 3387 type => FT_RSRC,
3207 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),
3208 }; 3390 };
3209 cf::cede_to_tick; 3391 cf::cede_to_tick;
3210 3392
3211 { 3393 {
3212 my $faces = $facedata->{faceinfo}; 3394 my $faces = $facedata->{faceinfo};
3214 while (my ($face, $info) = each %$faces) { 3396 while (my ($face, $info) = each %$faces) {
3215 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3397 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3216 3398
3217 cf::face::set_visibility $idx, $info->{visibility}; 3399 cf::face::set_visibility $idx, $info->{visibility};
3218 cf::face::set_magicmap $idx, $info->{magicmap}; 3400 cf::face::set_magicmap $idx, $info->{magicmap};
3219 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3401 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3220 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3402 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3221 3403
3222 cf::cede_to_tick; 3404 cf::cede_to_tick;
3223 } 3405 }
3224 3406
3225 while (my ($face, $info) = each %$faces) { 3407 while (my ($face, $info) = each %$faces) {
3230 3412
3231 if (my $smooth = cf::face::find $info->{smooth}) { 3413 if (my $smooth = cf::face::find $info->{smooth}) {
3232 cf::face::set_smooth $idx, $smooth; 3414 cf::face::set_smooth $idx, $smooth;
3233 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3415 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3234 } else { 3416 } else {
3235 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3417 error "smooth face '$info->{smooth}' not found for face '$face'";
3236 } 3418 }
3237 3419
3238 cf::cede_to_tick; 3420 cf::cede_to_tick;
3239 } 3421 }
3240 } 3422 }
3249 3431
3250 cf::anim::invalidate_all; # d'oh 3432 cf::anim::invalidate_all; # d'oh
3251 } 3433 }
3252 3434
3253 { 3435 {
3254 # TODO: for gcfclient pleasure, we should give resources
3255 # that gcfclient doesn't grok a >10000 face index.
3256 my $res = $facedata->{resource}; 3436 my $res = $facedata->{resource};
3257 3437
3258 while (my ($name, $info) = each %$res) { 3438 while (my ($name, $info) = each %$res) {
3259 if (defined $info->{type}) { 3439 if (defined $info->{type}) {
3260 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3440 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3261 my $data;
3262 3441
3263 if ($info->{type} & 1) { 3442 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}; 3443 cf::face::set_type $idx, $info->{type};
3278 } else { 3444 } else {
3279 $RESOURCE{$name} = $info; 3445 $RESOURCE{$name} = $info; # unused
3280 } 3446 }
3281 3447
3282 cf::cede_to_tick; 3448 cf::cede_to_tick;
3283 } 3449 }
3284 } 3450 }
3285 3451
3286 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3452 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3287 3453
3288 1 3454 1
3289} 3455}
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 3456
3311register_exticmd fx_want => sub { 3457register_exticmd fx_want => sub {
3312 my ($ns, $want) = @_; 3458 my ($ns, $want) = @_;
3313 3459
3314 while (my ($k, $v) = each %$want) { 3460 while (my ($k, $v) = each %$want) {
3353sub reload_treasures { 3499sub reload_treasures {
3354 load_resource_file "$DATADIR/treasures" 3500 load_resource_file "$DATADIR/treasures"
3355 or die "unable to load treasurelists\n"; 3501 or die "unable to load treasurelists\n";
3356} 3502}
3357 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
3358sub reload_resources { 3527sub reload_resources {
3359 warn "reloading resource files...\n"; 3528 trace "reloading resource files...\n";
3360 3529
3361 reload_facedata; 3530 reload_facedata;
3531 reload_sound;
3362 reload_archetypes; 3532 reload_archetypes;
3363 reload_regions; 3533 reload_regions;
3364 reload_treasures; 3534 reload_treasures;
3365 3535
3366 warn "finished reloading resource files\n"; 3536 trace "finished reloading resource files\n";
3367} 3537}
3368 3538
3369sub reload_config { 3539sub reload_config {
3540 trace "reloading config file...\n";
3541
3370 open my $fh, "<:utf8", "$CONFDIR/config" 3542 open my $fh, "<:utf8", "$CONFDIR/config"
3371 or return; 3543 or return;
3372 3544
3373 local $/; 3545 local $/;
3374 *CFG = YAML::Load <$fh>; 3546 *CFG = YAML::XS::Load scalar <$fh>;
3375 3547
3376 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3548 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3377 3549
3378 $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};
3379 $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};
3380 3552
3381 if (exists $CFG{mlockall}) { 3553 if (exists $CFG{mlockall}) {
3383 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3555 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3384 and die "WARNING: m(un)lockall failed: $!\n"; 3556 and die "WARNING: m(un)lockall failed: $!\n";
3385 }; 3557 };
3386 warn $@ if $@; 3558 warn $@ if $@;
3387 } 3559 }
3560
3561 trace "finished reloading resource files\n";
3388} 3562}
3389 3563
3390sub pidfile() { 3564sub pidfile() {
3391 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3565 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3392 or die "$PIDFILE: $!"; 3566 or die "$PIDFILE: $!";
3405 seek $fh, 0, 0; 3579 seek $fh, 0, 0;
3406 print $fh $$; 3580 print $fh $$;
3407} 3581}
3408 3582
3409sub main_loop { 3583sub main_loop {
3410 warn "EV::loop starting\n"; 3584 trace "EV::loop starting\n";
3411 if (1) { 3585 if (1) {
3412 EV::loop; 3586 EV::loop;
3413 } 3587 }
3414 warn "EV::loop returned\n"; 3588 trace "EV::loop returned\n";
3415 goto &main_loop unless $REALLY_UNLOOP; 3589 goto &main_loop unless $REALLY_UNLOOP;
3416} 3590}
3417 3591
3418sub main { 3592sub main {
3419 cf::init_globals; # initialise logging 3593 cf::init_globals; # initialise logging
3420 3594
3421 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3595 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3422 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.";
3423 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3597 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3424 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3598 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 3599
3431 $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
3432 3601
3433 # we must not ever block the main coroutine 3602 # we must not ever block the main coroutine
3434 local $Coro::idle = sub { 3603 local $Coro::idle = sub {
3440 }; 3609 };
3441 3610
3442 evthread_start IO::AIO::poll_fileno; 3611 evthread_start IO::AIO::poll_fileno;
3443 3612
3444 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
3445 reload_resources; 3622 reload_resources;
3446 reload_config; 3623 reload_config;
3447 db_init; 3624 db_init;
3448 3625
3449 cf::load_settings;
3450 cf::load_materials;
3451 cf::init_uuid; 3626 cf::init_uuid;
3452 cf::init_signals; 3627 cf::init_signals;
3453 cf::init_commands;
3454 cf::init_skills; 3628 cf::init_skills;
3455 3629
3456 cf::init_beforeplay; 3630 cf::init_beforeplay;
3457 3631
3458 atomic; 3632 atomic;
3460 load_extensions; 3634 load_extensions;
3461 3635
3462 utime time, time, $RUNTIMEFILE; 3636 utime time, time, $RUNTIMEFILE;
3463 3637
3464 # no (long-running) fork's whatsoever before this point(!) 3638 # no (long-running) fork's whatsoever before this point(!)
3639 use POSIX ();
3465 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};
3466 3641
3467 (pop @POST_INIT)->(0) while @POST_INIT; 3642 (pop @POST_INIT)->(0) while @POST_INIT;
3468 }; 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";
3469 3647
3470 main_loop; 3648 main_loop;
3471} 3649}
3472 3650
3473############################################################################# 3651#############################################################################
3475 3653
3476# install some emergency cleanup handlers 3654# install some emergency cleanup handlers
3477BEGIN { 3655BEGIN {
3478 our %SIGWATCHER = (); 3656 our %SIGWATCHER = ();
3479 for my $signal (qw(INT HUP TERM)) { 3657 for my $signal (qw(INT HUP TERM)) {
3480 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3658 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3481 cf::cleanup "SIG$signal"; 3659 cf::cleanup "SIG$signal";
3482 }; 3660 };
3483 } 3661 }
3484} 3662}
3485 3663
3486sub write_runtime_sync { 3664sub write_runtime_sync {
3665 my $t0 = AE::time;
3666
3487 # first touch the runtime file to show we are still running: 3667 # first touch the runtime file to show we are still running:
3488 # the fsync below can take a very very long time. 3668 # the fsync below can take a very very long time.
3489 3669
3490 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3670 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3491 3671
3492 my $guard = cf::lock_acquire "write_runtime"; 3672 my $guard = cf::lock_acquire "write_runtime";
3493 3673
3494 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3674 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3495 or return; 3675 or return;
3496 3676
3497 my $value = $cf::RUNTIME + 90 + 10; 3677 my $value = $cf::RUNTIME + 90 + 10;
3498 # 10 is the runtime save interval, for a monotonic clock 3678 # 10 is the runtime save interval, for a monotonic clock
3499 # 60 allows for the watchdog to kill the server. 3679 # 60 allows for the watchdog to kill the server.
3512 or return; 3692 or return;
3513 3693
3514 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3694 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3515 and return; 3695 and return;
3516 3696
3517 warn "runtime file written.\n"; 3697 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3518 3698
3519 1 3699 1
3520} 3700}
3521 3701
3522our $uuid_lock; 3702our $uuid_lock;
3534 or return; 3714 or return;
3535 3715
3536 my $value = uuid_seq uuid_cur; 3716 my $value = uuid_seq uuid_cur;
3537 3717
3538 unless ($value) { 3718 unless ($value) {
3539 warn "cowardly refusing to write zero uuid value!\n"; 3719 info "cowardly refusing to write zero uuid value!\n";
3540 return; 3720 return;
3541 } 3721 }
3542 3722
3543 my $value = uuid_str $value + $uuid_skip; 3723 my $value = uuid_str $value + $uuid_skip;
3544 $uuid_skip = 0; 3724 $uuid_skip = 0;
3554 or return; 3734 or return;
3555 3735
3556 aio_rename "$uuid~", $uuid 3736 aio_rename "$uuid~", $uuid
3557 and return; 3737 and return;
3558 3738
3559 warn "uuid file written ($value).\n"; 3739 trace "uuid file written ($value).\n";
3560 3740
3561 1 3741 1
3562 3742
3563} 3743}
3564 3744
3570} 3750}
3571 3751
3572sub emergency_save() { 3752sub emergency_save() {
3573 my $freeze_guard = cf::freeze_mainloop; 3753 my $freeze_guard = cf::freeze_mainloop;
3574 3754
3575 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;
3576 3761
3577 cf::sync_job { 3762 cf::sync_job {
3578 # this is a trade-off: we want to be very quick here, so 3763 cf::write_runtime_sync; # external watchdog should not bark
3579 # save all maps without fsync, and later call a global sync
3580 # (which in turn might be very very slow)
3581 local $USE_FSYNC = 0;
3582 3764
3583 # use a peculiar iteration method to avoid tripping on perl 3765 # use a peculiar iteration method to avoid tripping on perl
3584 # refcount bugs in for. also avoids problems with players 3766 # refcount bugs in for. also avoids problems with players
3585 # and maps saved/destroyed asynchronously. 3767 # and maps saved/destroyed asynchronously.
3586 warn "emergency_perl_save: begin player save\n"; 3768 info "emergency_perl_save: begin player save\n";
3587 for my $login (keys %cf::PLAYER) { 3769 for my $login (keys %cf::PLAYER) {
3588 my $pl = $cf::PLAYER{$login} or next; 3770 my $pl = $cf::PLAYER{$login} or next;
3589 $pl->valid or next; 3771 $pl->valid or next;
3590 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3772 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3591 $pl->save; 3773 $pl->save;
3592 } 3774 }
3593 warn "emergency_perl_save: end player save\n"; 3775 info "emergency_perl_save: end player save\n";
3594 3776
3777 cf::write_runtime_sync; # external watchdog should not bark
3778
3595 warn "emergency_perl_save: begin map save\n"; 3779 info "emergency_perl_save: begin map save\n";
3596 for my $path (keys %cf::MAP) { 3780 for my $path (keys %cf::MAP) {
3597 my $map = $cf::MAP{$path} or next; 3781 my $map = $cf::MAP{$path} or next;
3598 $map->valid or next; 3782 $map->valid or next;
3599 $map->save; 3783 $map->save;
3600 } 3784 }
3601 warn "emergency_perl_save: end map save\n"; 3785 info "emergency_perl_save: end map save\n";
3602 3786
3787 cf::write_runtime_sync; # external watchdog should not bark
3788
3603 warn "emergency_perl_save: begin database checkpoint\n"; 3789 info "emergency_perl_save: begin database checkpoint\n";
3604 BDB::db_env_txn_checkpoint $DB_ENV; 3790 BDB::db_env_txn_checkpoint $DB_ENV;
3605 warn "emergency_perl_save: end database checkpoint\n"; 3791 info "emergency_perl_save: end database checkpoint\n";
3606 3792
3607 warn "emergency_perl_save: begin write uuid\n"; 3793 info "emergency_perl_save: begin write uuid\n";
3608 write_uuid_sync 1; 3794 write_uuid_sync 1;
3609 warn "emergency_perl_save: end write uuid\n"; 3795 info "emergency_perl_save: end write uuid\n";
3796
3797 cf::write_runtime_sync; # external watchdog should not bark
3798
3799 trace "emergency_perl_save: syncing database to disk";
3800 BDB::db_env_txn_checkpoint $DB_ENV;
3801
3802 info "emergency_perl_save: starting sync\n";
3803 IO::AIO::aio_sync sub {
3804 info "emergency_perl_save: finished sync\n";
3805 };
3806
3807 cf::write_runtime_sync; # external watchdog should not bark
3808
3809 trace "emergency_perl_save: flushing outstanding aio requests";
3810 while (IO::AIO::nreqs || BDB::nreqs) {
3811 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3812 }
3813
3814 cf::write_runtime_sync; # external watchdog should not bark
3610 }; 3815 };
3611 3816
3612 warn "emergency_perl_save: starting sync()\n";
3613 IO::AIO::aio_sync sub {
3614 warn "emergency_perl_save: finished sync()\n";
3615 };
3616
3617 warn "emergency_perl_save: leave\n"; 3817 info "emergency_perl_save: leave\n";
3618} 3818}
3619 3819
3620sub post_cleanup { 3820sub post_cleanup {
3621 my ($make_core) = @_; 3821 my ($make_core) = @_;
3622 3822
3823 IO::AIO::flush;
3824
3825 IO::AIO::flush;
3826
3623 warn Carp::longmess "post_cleanup backtrace" 3827 error Carp::longmess "post_cleanup backtrace"
3624 if $make_core; 3828 if $make_core;
3625 3829
3626 my $fh = pidfile; 3830 my $fh = pidfile;
3627 unlink $PIDFILE if <$fh> == $$; 3831 unlink $PIDFILE if <$fh> == $$;
3628} 3832}
3648 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3852 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3649 for my $name (keys %$leaf_symtab) { 3853 for my $name (keys %$leaf_symtab) {
3650 _gv_clear *{"$pkg$name"}; 3854 _gv_clear *{"$pkg$name"};
3651# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3855# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3652 } 3856 }
3653 warn "cleared package $pkg\n";#d#
3654} 3857}
3655 3858
3656sub do_reload_perl() { 3859sub do_reload_perl() {
3657 # can/must only be called in main 3860 # can/must only be called in main
3658 if ($Coro::current != $Coro::main) { 3861 if (in_main) {
3659 warn "can only reload from main coroutine"; 3862 error "can only reload from main coroutine";
3660 return; 3863 return;
3661 } 3864 }
3662 3865
3663 return if $RELOAD++; 3866 return if $RELOAD++;
3664 3867
3665 my $t1 = EV::time; 3868 my $t1 = AE::time;
3666 3869
3667 while ($RELOAD) { 3870 while ($RELOAD) {
3668 warn "reloading..."; 3871 info "reloading...";
3669 3872
3670 warn "entering sync_job"; 3873 trace "entering sync_job";
3671 3874
3672 cf::sync_job { 3875 cf::sync_job {
3673 cf::write_runtime_sync; # external watchdog should not bark
3674 cf::emergency_save; 3876 cf::emergency_save;
3675 cf::write_runtime_sync; # external watchdog should not bark
3676 3877
3677 warn "syncing database to disk";
3678 BDB::db_env_txn_checkpoint $DB_ENV;
3679
3680 # if anything goes wrong in here, we should simply crash as we already saved
3681
3682 warn "flushing outstanding aio requests";
3683 while (IO::AIO::nreqs || BDB::nreqs) {
3684 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3685 }
3686
3687 warn "cancelling all extension coros"; 3878 trace "cancelling all extension coros";
3688 $_->cancel for values %EXT_CORO; 3879 $_->cancel for values %EXT_CORO;
3689 %EXT_CORO = (); 3880 %EXT_CORO = ();
3690 3881
3691 warn "removing commands"; 3882 trace "removing commands";
3692 %COMMAND = (); 3883 %COMMAND = ();
3693 3884
3694 warn "removing ext/exti commands"; 3885 trace "removing ext/exti commands";
3695 %EXTCMD = (); 3886 %EXTCMD = ();
3696 %EXTICMD = (); 3887 %EXTICMD = ();
3697 3888
3698 warn "unloading/nuking all extensions"; 3889 trace "unloading/nuking all extensions";
3699 for my $pkg (@EXTS) { 3890 for my $pkg (@EXTS) {
3700 warn "... unloading $pkg"; 3891 trace "... unloading $pkg";
3701 3892
3702 if (my $cb = $pkg->can ("unload")) { 3893 if (my $cb = $pkg->can ("unload")) {
3703 eval { 3894 eval {
3704 $cb->($pkg); 3895 $cb->($pkg);
3705 1 3896 1
3706 } or warn "$pkg unloaded, but with errors: $@"; 3897 } or error "$pkg unloaded, but with errors: $@";
3707 } 3898 }
3708 3899
3709 warn "... clearing $pkg"; 3900 trace "... clearing $pkg";
3710 clear_package $pkg; 3901 clear_package $pkg;
3711 } 3902 }
3712 3903
3713 warn "unloading all perl modules loaded from $LIBDIR"; 3904 trace "unloading all perl modules loaded from $LIBDIR";
3714 while (my ($k, $v) = each %INC) { 3905 while (my ($k, $v) = each %INC) {
3715 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3906 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3716 3907
3717 warn "... unloading $k"; 3908 trace "... unloading $k";
3718 delete $INC{$k}; 3909 delete $INC{$k};
3719 3910
3720 $k =~ s/\.pm$//; 3911 $k =~ s/\.pm$//;
3721 $k =~ s/\//::/g; 3912 $k =~ s/\//::/g;
3722 3913
3725 } 3916 }
3726 3917
3727 clear_package $k; 3918 clear_package $k;
3728 } 3919 }
3729 3920
3730 warn "getting rid of safe::, as good as possible"; 3921 trace "getting rid of safe::, as good as possible";
3731 clear_package "safe::$_" 3922 clear_package "safe::$_"
3732 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3923 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3733 3924
3734 warn "unloading cf.pm \"a bit\""; 3925 trace "unloading cf.pm \"a bit\"";
3735 delete $INC{"cf.pm"}; 3926 delete $INC{"cf.pm"};
3736 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3927 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3737 3928
3738 # don't, removes xs symbols, too, 3929 # don't, removes xs symbols, too,
3739 # and global variables created in xs 3930 # and global variables created in xs
3740 #clear_package __PACKAGE__; 3931 #clear_package __PACKAGE__;
3741 3932
3742 warn "unload completed, starting to reload now"; 3933 info "unload completed, starting to reload now";
3743 3934
3744 warn "reloading cf.pm"; 3935 trace "reloading cf.pm";
3745 require cf; 3936 require cf;
3746 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3937 cf::_connect_to_perl_1;
3747 3938
3748 warn "loading config and database again"; 3939 trace "loading config and database again";
3749 cf::reload_config; 3940 cf::reload_config;
3750 3941
3751 warn "loading extensions"; 3942 trace "loading extensions";
3752 cf::load_extensions; 3943 cf::load_extensions;
3753 3944
3754 if ($REATTACH_ON_RELOAD) { 3945 if ($REATTACH_ON_RELOAD) {
3755 warn "reattaching attachments to objects/players"; 3946 trace "reattaching attachments to objects/players";
3756 _global_reattach; # objects, sockets 3947 _global_reattach; # objects, sockets
3757 warn "reattaching attachments to maps"; 3948 trace "reattaching attachments to maps";
3758 reattach $_ for values %MAP; 3949 reattach $_ for values %MAP;
3759 warn "reattaching attachments to players"; 3950 trace "reattaching attachments to players";
3760 reattach $_ for values %PLAYER; 3951 reattach $_ for values %PLAYER;
3761 } 3952 }
3762 3953
3763 warn "running post_init jobs"; 3954 trace "running post_init jobs";
3764 (pop @POST_INIT)->(1) while @POST_INIT; 3955 (pop @POST_INIT)->(1) while @POST_INIT;
3765 3956
3766 warn "leaving sync_job"; 3957 trace "leaving sync_job";
3767 3958
3768 1 3959 1
3769 } or do { 3960 } or do {
3770 warn $@; 3961 error $@;
3771 cf::cleanup "error while reloading, exiting."; 3962 cf::cleanup "error while reloading, exiting.";
3772 }; 3963 };
3773 3964
3774 warn "reloaded"; 3965 info "reloaded";
3775 --$RELOAD; 3966 --$RELOAD;
3776 } 3967 }
3777 3968
3778 $t1 = EV::time - $t1; 3969 $t1 = AE::time - $t1;
3779 warn "reload completed in ${t1}s\n"; 3970 info "reload completed in ${t1}s\n";
3780}; 3971};
3781 3972
3782our $RELOAD_WATCHER; # used only during reload 3973our $RELOAD_WATCHER; # used only during reload
3783 3974
3784sub reload_perl() { 3975sub reload_perl() {
3786 # coro crashes during coro_state_free->destroy here. 3977 # coro crashes during coro_state_free->destroy here.
3787 3978
3788 $RELOAD_WATCHER ||= cf::async { 3979 $RELOAD_WATCHER ||= cf::async {
3789 Coro::AIO::aio_wait cache_extensions; 3980 Coro::AIO::aio_wait cache_extensions;
3790 3981
3791 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3982 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3792 do_reload_perl; 3983 do_reload_perl;
3793 undef $RELOAD_WATCHER; 3984 undef $RELOAD_WATCHER;
3794 }; 3985 };
3795 }; 3986 };
3796} 3987}
3813 4004
3814our @WAIT_FOR_TICK; 4005our @WAIT_FOR_TICK;
3815our @WAIT_FOR_TICK_BEGIN; 4006our @WAIT_FOR_TICK_BEGIN;
3816 4007
3817sub wait_for_tick { 4008sub wait_for_tick {
3818 return if tick_inhibit || $Coro::current == $Coro::main; 4009 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3819 4010
3820 my $signal = new Coro::Signal; 4011 my $signal = new Coro::Signal;
3821 push @WAIT_FOR_TICK, $signal; 4012 push @WAIT_FOR_TICK, $signal;
3822 $signal->wait; 4013 $signal->wait;
3823} 4014}
3824 4015
3825sub wait_for_tick_begin { 4016sub wait_for_tick_begin {
3826 return if tick_inhibit || $Coro::current == $Coro::main; 4017 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3827 4018
3828 my $signal = new Coro::Signal; 4019 my $signal = new Coro::Signal;
3829 push @WAIT_FOR_TICK_BEGIN, $signal; 4020 push @WAIT_FOR_TICK_BEGIN, $signal;
3830 $signal->wait; 4021 $signal->wait;
3831} 4022}
3837 return; 4028 return;
3838 } 4029 }
3839 4030
3840 cf::server_tick; # one server iteration 4031 cf::server_tick; # one server iteration
3841 4032
4033 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4034
3842 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4035 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3843 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4036 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3844 Coro::async_pool { 4037 Coro::async_pool {
3845 $Coro::current->{desc} = "runtime saver"; 4038 $Coro::current->{desc} = "runtime saver";
3846 write_runtime_sync 4039 write_runtime_sync
3847 or warn "ERROR: unable to write runtime file: $!"; 4040 or error "ERROR: unable to write runtime file: $!";
3848 }; 4041 };
3849 } 4042 }
3850 4043
3851 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4044 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3852 $sig->send; 4045 $sig->send;
3860 4053
3861 if (0) { 4054 if (0) {
3862 if ($NEXT_TICK) { 4055 if ($NEXT_TICK) {
3863 my $jitter = $TICK_START - $NEXT_TICK; 4056 my $jitter = $TICK_START - $NEXT_TICK;
3864 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4057 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3865 warn "jitter $JITTER\n";#d# 4058 debug "jitter $JITTER\n";#d#
3866 } 4059 }
3867 } 4060 }
3868} 4061}
3869 4062
3870{ 4063{
3871 # configure BDB 4064 # configure BDB
3872 4065
3873 BDB::min_parallel 8; 4066 BDB::min_parallel 16;
3874 BDB::max_poll_reqs $TICK * 0.1; 4067 BDB::max_poll_reqs $TICK * 0.1;
3875 $AnyEvent::BDB::WATCHER->priority (1); 4068 $AnyEvent::BDB::WATCHER->priority (1);
3876 4069
3877 unless ($DB_ENV) { 4070 unless ($DB_ENV) {
3878 $DB_ENV = BDB::db_env_create; 4071 $DB_ENV = BDB::db_env_create;
3959 } 4152 }
3960} 4153}
3961 4154
3962# load additional modules 4155# load additional modules
3963require "cf/$_.pm" for @EXTRA_MODULES; 4156require "cf/$_.pm" for @EXTRA_MODULES;
4157cf::_connect_to_perl_2;
3964 4158
3965END { cf::emergency_save } 4159END { cf::emergency_save }
3966 4160
39671 41611
3968 4162

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines