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.476 by root, Wed Sep 2 16:54:20 2009 UTC vs.
Revision 1.537 by root, Sun May 2 19:16:16 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 2676
2540 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2677 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2541 $self->enter_map ($map, $x, $y); 2678 if ($self->enter_map ($map, $x, $y)) {
2542 2679 # entering was successful
2680 delete $self->{_link_recursion};
2543 # only activate afterwards, to support waiting in hooks 2681 # only activate afterwards, to support waiting in hooks
2544 $self->activate_recursive; 2682 $self->activate_recursive;
2545} 2683 }
2546 2684
2685}
2686
2547=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)]])
2548 2688
2549Moves 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
2550her, loading and preparing them map, calling the provided $check callback 2690her, loading and preparing them map, calling the provided $check callback
2551that 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
2552the 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
2559 2699
2560our $GOTOGEN; 2700our $GOTOGEN;
2561 2701
2562sub cf::object::player::goto { 2702sub cf::object::player::goto {
2563 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 }
2564 2710
2565 # 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
2566 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2712 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2567 2713
2568 $self->enter_link; 2714 $self->enter_link;
2592 my $map = eval { 2738 my $map = eval {
2593 my $map = defined $path ? cf::map::find $path : undef; 2739 my $map = defined $path ? cf::map::find $path : undef;
2594 2740
2595 if ($map) { 2741 if ($map) {
2596 $map = $map->customise_for ($self); 2742 $map = $map->customise_for ($self);
2597 $map = $check->($map) if $check && $map; 2743 $map = $check->($map, $x, $y, $self) if $check && $map;
2598 } else { 2744 } else {
2599 $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);
2600 } 2746 }
2601 2747
2602 $map 2748 $map
2610 if ($gen == $self->{_goto_generation}) { 2756 if ($gen == $self->{_goto_generation}) {
2611 delete $self->{_goto_generation}; 2757 delete $self->{_goto_generation};
2612 $self->leave_link ($map, $x, $y); 2758 $self->leave_link ($map, $x, $y);
2613 } 2759 }
2614 2760
2615 $done->() if $done; 2761 $done->($self) if $done;
2616 })->prio (1); 2762 })->prio (1);
2617} 2763}
2618 2764
2619=item $player_object->enter_exit ($exit_object) 2765=item $player_object->enter_exit ($exit_object)
2620 2766
2713 $self->message ("Something went wrong deep within the deliantra server. " 2859 $self->message ("Something went wrong deep within the deliantra server. "
2714 . "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. "
2715 . "Please report this to the dungeon master!", 2861 . "Please report this to the dungeon master!",
2716 cf::NDI_UNIQUE | cf::NDI_RED); 2862 cf::NDI_UNIQUE | cf::NDI_RED);
2717 2863
2718 warn "ERROR in enter_exit: $@"; 2864 error "ERROR in enter_exit: $@";
2719 $self->leave_link; 2865 $self->leave_link;
2720 } 2866 }
2721 })->prio (1); 2867 })->prio (1);
2722} 2868}
2723 2869
2735sub cf::client::send_drawinfo { 2881sub cf::client::send_drawinfo {
2736 my ($self, $text, $flags) = @_; 2882 my ($self, $text, $flags) = @_;
2737 2883
2738 utf8::encode $text; 2884 utf8::encode $text;
2739 $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);
2740} 2911}
2741 2912
2742=item $client->send_msg ($channel, $msg, $color, [extra...]) 2913=item $client->send_msg ($channel, $msg, $color, [extra...])
2743 2914
2744Send 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
2748 2919
2749=cut 2920=cut
2750 2921
2751# non-persistent channels (usually the info channel) 2922# non-persistent channels (usually the info channel)
2752our %CHANNEL = ( 2923our %CHANNEL = (
2924 "c/motd" => {
2925 id => "infobox",
2926 title => "MOTD",
2927 reply => undef,
2928 tooltip => "The message of the day",
2929 },
2753 "c/identify" => { 2930 "c/identify" => {
2754 id => "infobox", 2931 id => "infobox",
2755 title => "Identify", 2932 title => "Identify",
2756 reply => undef, 2933 reply => undef,
2757 tooltip => "Items recently identified", 2934 tooltip => "Items recently identified",
2759 "c/examine" => { 2936 "c/examine" => {
2760 id => "infobox", 2937 id => "infobox",
2761 title => "Examine", 2938 title => "Examine",
2762 reply => undef, 2939 reply => undef,
2763 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",
2764 }, 2947 },
2765 "c/book" => { 2948 "c/book" => {
2766 id => "infobox", 2949 id => "infobox",
2767 title => "Book", 2950 title => "Book",
2768 reply => undef, 2951 reply => undef,
2884 my $pkt = "msg " 3067 my $pkt = "msg "
2885 . $self->{json_coder}->encode ( 3068 . $self->{json_coder}->encode (
2886 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3069 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2887 ); 3070 );
2888 3071
2889 # try lzf for large packets
2890 $pkt = "lzf " . Compress::LZF::compress $pkt
2891 if 1024 <= length $pkt and $self->{can_lzf};
2892
2893 # split very large packets
2894 if (8192 < length $pkt and $self->{can_lzf}) {
2895 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2896 $pkt = "frag";
2897 }
2898
2899 $self->send_packet ($pkt); 3072 $self->send_big_packet ($pkt);
2900} 3073}
2901 3074
2902=item $client->ext_msg ($type, @msg) 3075=item $client->ext_msg ($type, @msg)
2903 3076
2904Sends an ext event to the client. 3077Sends an ext event to the client.
2907 3080
2908sub cf::client::ext_msg($$@) { 3081sub cf::client::ext_msg($$@) {
2909 my ($self, $type, @msg) = @_; 3082 my ($self, $type, @msg) = @_;
2910 3083
2911 if ($self->extcmd == 2) { 3084 if ($self->extcmd == 2) {
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3085 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2913 } elsif ($self->extcmd == 1) { # TODO: remove 3086 } elsif ($self->extcmd == 1) { # TODO: remove
2914 push @msg, msgtype => "event_$type"; 3087 push @msg, msgtype => "event_$type";
2915 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3088 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2916 } 3089 }
2917} 3090}
2918 3091
2919=item $client->ext_reply ($msgid, @msg) 3092=item $client->ext_reply ($msgid, @msg)
2920 3093
2924 3097
2925sub cf::client::ext_reply($$@) { 3098sub cf::client::ext_reply($$@) {
2926 my ($self, $id, @msg) = @_; 3099 my ($self, $id, @msg) = @_;
2927 3100
2928 if ($self->extcmd == 2) { 3101 if ($self->extcmd == 2) {
2929 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3102 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2930 } elsif ($self->extcmd == 1) { 3103 } elsif ($self->extcmd == 1) {
2931 #TODO: version 1, remove 3104 #TODO: version 1, remove
2932 unshift @msg, msgtype => "reply", msgid => $id; 3105 unshift @msg, msgtype => "reply", msgid => $id;
2933 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3106 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2934 } 3107 }
2935} 3108}
2936 3109
2937=item $success = $client->query ($flags, "text", \&cb) 3110=item $success = $client->query ($flags, "text", \&cb)
2938 3111
3009 3182
3010 $ns->ext_reply ($reply, @reply) 3183 $ns->ext_reply ($reply, @reply)
3011 if $reply; 3184 if $reply;
3012 3185
3013 } else { 3186 } else {
3014 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";
3015 } 3188 }
3016 3189
3017 cf::override; 3190 cf::override;
3018 }, 3191 },
3019); 3192);
3039 3212
3040 $coro 3213 $coro
3041} 3214}
3042 3215
3043cf::client->attach ( 3216cf::client->attach (
3044 on_destroy => sub { 3217 on_client_destroy => sub {
3045 my ($ns) = @_; 3218 my ($ns) = @_;
3046 3219
3047 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3220 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3048 }, 3221 },
3049); 3222);
3065our $safe_hole = new Safe::Hole; 3238our $safe_hole = new Safe::Hole;
3066 3239
3067$SIG{FPE} = 'IGNORE'; 3240$SIG{FPE} = 'IGNORE';
3068 3241
3069$safe->permit_only (Opcode::opset qw( 3242$safe->permit_only (Opcode::opset qw(
3070 :base_core :base_mem :base_orig :base_math 3243 :base_core :base_mem :base_orig :base_math :base_loop
3071 grepstart grepwhile mapstart mapwhile 3244 grepstart grepwhile mapstart mapwhile
3072 sort time 3245 sort time
3073)); 3246));
3074 3247
3075# here we export the classes and methods available to script code 3248# here we export the classes and methods available to script code
3127 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3300 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3128 $qcode =~ s/\n/\\n/g; 3301 $qcode =~ s/\n/\\n/g;
3129 3302
3130 %vars = (_dummy => 0) unless %vars; 3303 %vars = (_dummy => 0) unless %vars;
3131 3304
3305 my @res;
3132 local $_; 3306 local $_;
3133 local @safe::cf::_safe_eval_args = values %vars;
3134 3307
3135 my $eval = 3308 my $eval =
3136 "do {\n" 3309 "do {\n"
3137 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3310 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3138 . "#line 0 \"{$qcode}\"\n" 3311 . "#line 0 \"{$qcode}\"\n"
3139 . $code 3312 . $code
3140 . "\n}" 3313 . "\n}"
3141 ; 3314 ;
3142 3315
3316 if ($CFG{safe_eval}) {
3143 sub_generation_inc; 3317 sub_generation_inc;
3318 local @safe::cf::_safe_eval_args = values %vars;
3144 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3319 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3145 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 }
3146 3325
3147 if ($@) { 3326 if ($@) {
3148 warn "$@"; 3327 warn "$@",
3149 warn "while executing safe code '$code'\n"; 3328 "while executing safe code '$code'\n",
3150 warn "with arguments " . (join " ", %vars) . "\n"; 3329 "with arguments " . (join " ", %vars) . "\n";
3151 } 3330 }
3152 3331
3153 wantarray ? @res : $res[0] 3332 wantarray ? @res : $res[0]
3154} 3333}
3155 3334
3169=cut 3348=cut
3170 3349
3171sub register_script_function { 3350sub register_script_function {
3172 my ($fun, $cb) = @_; 3351 my ($fun, $cb) = @_;
3173 3352
3174 no strict 'refs'; 3353 $fun = "safe::$fun" if $CFG{safe_eval};
3175 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3354 *$fun = $safe_hole->wrap ($cb);
3176} 3355}
3177 3356
3178=back 3357=back
3179 3358
3180=cut 3359=cut
3189 # for this (global event?) 3368 # for this (global event?)
3190 %ext::player_env::MUSIC_FACE_CACHE = (); 3369 %ext::player_env::MUSIC_FACE_CACHE = ();
3191 3370
3192 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3371 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3193 3372
3194 warn "loading facedata from $path\n"; 3373 trace "loading facedata from $path\n";
3195 3374
3196 my $facedata; 3375 my $facedata;
3197 0 < aio_load $path, $facedata 3376 0 < aio_load $path, $facedata
3198 or die "$path: $!"; 3377 or die "$path: $!";
3199 3378
3201 3380
3202 $facedata->{version} == 2 3381 $facedata->{version} == 2
3203 or cf::cleanup "$path: version mismatch, cannot proceed."; 3382 or cf::cleanup "$path: version mismatch, cannot proceed.";
3204 3383
3205 # 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]);
3206 $facedata->{resource}{"res/exp_table"} = { 3386 $facedata->{resource}{"res/exp_table"} = {
3207 type => FT_RSRC, 3387 type => FT_RSRC,
3208 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),
3209 }; 3390 };
3210 cf::cede_to_tick; 3391 cf::cede_to_tick;
3211 3392
3212 { 3393 {
3213 my $faces = $facedata->{faceinfo}; 3394 my $faces = $facedata->{faceinfo};
3215 while (my ($face, $info) = each %$faces) { 3396 while (my ($face, $info) = each %$faces) {
3216 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3397 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3217 3398
3218 cf::face::set_visibility $idx, $info->{visibility}; 3399 cf::face::set_visibility $idx, $info->{visibility};
3219 cf::face::set_magicmap $idx, $info->{magicmap}; 3400 cf::face::set_magicmap $idx, $info->{magicmap};
3220 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3401 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3221 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3402 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3222 3403
3223 cf::cede_to_tick; 3404 cf::cede_to_tick;
3224 } 3405 }
3225 3406
3226 while (my ($face, $info) = each %$faces) { 3407 while (my ($face, $info) = each %$faces) {
3231 3412
3232 if (my $smooth = cf::face::find $info->{smooth}) { 3413 if (my $smooth = cf::face::find $info->{smooth}) {
3233 cf::face::set_smooth $idx, $smooth; 3414 cf::face::set_smooth $idx, $smooth;
3234 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3415 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3235 } else { 3416 } else {
3236 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3417 error "smooth face '$info->{smooth}' not found for face '$face'";
3237 } 3418 }
3238 3419
3239 cf::cede_to_tick; 3420 cf::cede_to_tick;
3240 } 3421 }
3241 } 3422 }
3250 3431
3251 cf::anim::invalidate_all; # d'oh 3432 cf::anim::invalidate_all; # d'oh
3252 } 3433 }
3253 3434
3254 { 3435 {
3255 # TODO: for gcfclient pleasure, we should give resources
3256 # that gcfclient doesn't grok a >10000 face index.
3257 my $res = $facedata->{resource}; 3436 my $res = $facedata->{resource};
3258 3437
3259 while (my ($name, $info) = each %$res) { 3438 while (my ($name, $info) = each %$res) {
3260 if (defined $info->{type}) { 3439 if (defined $info->{type}) {
3261 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3440 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3262 my $data;
3263 3441
3264 if ($info->{type} & 1) { 3442 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3265 # prepend meta info
3266
3267 my $meta = $enc->encode ({
3268 name => $name,
3269 %{ $info->{meta} || {} },
3270 });
3271
3272 $data = pack "(w/a*)*", $meta, $info->{data};
3273 } else {
3274 $data = $info->{data};
3275 }
3276
3277 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3278 cf::face::set_type $idx, $info->{type}; 3443 cf::face::set_type $idx, $info->{type};
3279 } else { 3444 } else {
3280 $RESOURCE{$name} = $info; 3445 $RESOURCE{$name} = $info; # unused
3281 } 3446 }
3282 3447
3283 cf::cede_to_tick; 3448 cf::cede_to_tick;
3284 } 3449 }
3285 } 3450 }
3286 3451
3287 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3452 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3288 3453
3289 1 3454 1
3290} 3455}
3291
3292cf::global->attach (on_resource_update => sub {
3293 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3294 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3295
3296 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3297 my $sound = $soundconf->{compat}[$_]
3298 or next;
3299
3300 my $face = cf::face::find "sound/$sound->[1]";
3301 cf::sound::set $sound->[0] => $face;
3302 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3303 }
3304
3305 while (my ($k, $v) = each %{$soundconf->{event}}) {
3306 my $face = cf::face::find "sound/$v";
3307 cf::sound::set $k => $face;
3308 }
3309 }
3310});
3311 3456
3312register_exticmd fx_want => sub { 3457register_exticmd fx_want => sub {
3313 my ($ns, $want) = @_; 3458 my ($ns, $want) = @_;
3314 3459
3315 while (my ($k, $v) = each %$want) { 3460 while (my ($k, $v) = each %$want) {
3354sub reload_treasures { 3499sub reload_treasures {
3355 load_resource_file "$DATADIR/treasures" 3500 load_resource_file "$DATADIR/treasures"
3356 or die "unable to load treasurelists\n"; 3501 or die "unable to load treasurelists\n";
3357} 3502}
3358 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
3359sub reload_resources { 3527sub reload_resources {
3360 warn "reloading resource files...\n"; 3528 trace "reloading resource files...\n";
3361 3529
3362 reload_facedata; 3530 reload_facedata;
3531 reload_sound;
3363 reload_archetypes; 3532 reload_archetypes;
3364 reload_regions; 3533 reload_regions;
3365 reload_treasures; 3534 reload_treasures;
3366 3535
3367 warn "finished reloading resource files\n"; 3536 trace "finished reloading resource files\n";
3368} 3537}
3369 3538
3370sub reload_config { 3539sub reload_config {
3540 trace "reloading config file...\n";
3541
3371 open my $fh, "<:utf8", "$CONFDIR/config" 3542 open my $fh, "<:utf8", "$CONFDIR/config"
3372 or return; 3543 or return;
3373 3544
3374 local $/; 3545 local $/;
3375 *CFG = YAML::Load <$fh>; 3546 *CFG = YAML::XS::Load scalar <$fh>;
3376 3547
3377 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3548 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3378 3549
3379 $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};
3380 $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};
3381 3552
3382 if (exists $CFG{mlockall}) { 3553 if (exists $CFG{mlockall}) {
3384 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3555 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3385 and die "WARNING: m(un)lockall failed: $!\n"; 3556 and die "WARNING: m(un)lockall failed: $!\n";
3386 }; 3557 };
3387 warn $@ if $@; 3558 warn $@ if $@;
3388 } 3559 }
3560
3561 trace "finished reloading resource files\n";
3389} 3562}
3390 3563
3391sub pidfile() { 3564sub pidfile() {
3392 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3565 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3393 or die "$PIDFILE: $!"; 3566 or die "$PIDFILE: $!";
3406 seek $fh, 0, 0; 3579 seek $fh, 0, 0;
3407 print $fh $$; 3580 print $fh $$;
3408} 3581}
3409 3582
3410sub main_loop { 3583sub main_loop {
3411 warn "EV::loop starting\n"; 3584 trace "EV::loop starting\n";
3412 if (1) { 3585 if (1) {
3413 EV::loop; 3586 EV::loop;
3414 } 3587 }
3415 warn "EV::loop returned\n"; 3588 trace "EV::loop returned\n";
3416 goto &main_loop unless $REALLY_UNLOOP; 3589 goto &main_loop unless $REALLY_UNLOOP;
3417} 3590}
3418 3591
3419sub main { 3592sub main {
3420 cf::init_globals; # initialise logging 3593 cf::init_globals; # initialise logging
3421 3594
3422 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3595 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3423 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.";
3424 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3597 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3425 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3598 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3426
3427 cf::init_experience;
3428 cf::init_anim;
3429 cf::init_attackmess;
3430 cf::init_dynamic;
3431 3599
3432 $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
3433 3601
3434 # we must not ever block the main coroutine 3602 # we must not ever block the main coroutine
3435 local $Coro::idle = sub { 3603 local $Coro::idle = sub {
3441 }; 3609 };
3442 3610
3443 evthread_start IO::AIO::poll_fileno; 3611 evthread_start IO::AIO::poll_fileno;
3444 3612
3445 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
3446 reload_resources; 3622 reload_resources;
3447 reload_config; 3623 reload_config;
3448 db_init; 3624 db_init;
3449 3625
3450 cf::load_settings;
3451 cf::load_materials;
3452 cf::init_uuid; 3626 cf::init_uuid;
3453 cf::init_signals; 3627 cf::init_signals;
3454 cf::init_commands;
3455 cf::init_skills; 3628 cf::init_skills;
3456 3629
3457 cf::init_beforeplay; 3630 cf::init_beforeplay;
3458 3631
3459 atomic; 3632 atomic;
3466 use POSIX (); 3639 use POSIX ();
3467 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};
3468 3641
3469 (pop @POST_INIT)->(0) while @POST_INIT; 3642 (pop @POST_INIT)->(0) while @POST_INIT;
3470 }; 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";
3471 3647
3472 main_loop; 3648 main_loop;
3473} 3649}
3474 3650
3475############################################################################# 3651#############################################################################
3477 3653
3478# install some emergency cleanup handlers 3654# install some emergency cleanup handlers
3479BEGIN { 3655BEGIN {
3480 our %SIGWATCHER = (); 3656 our %SIGWATCHER = ();
3481 for my $signal (qw(INT HUP TERM)) { 3657 for my $signal (qw(INT HUP TERM)) {
3482 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3658 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3483 cf::cleanup "SIG$signal"; 3659 cf::cleanup "SIG$signal";
3484 }; 3660 };
3485 } 3661 }
3486} 3662}
3487 3663
3488sub write_runtime_sync { 3664sub write_runtime_sync {
3665 my $t0 = AE::time;
3666
3489 # first touch the runtime file to show we are still running: 3667 # first touch the runtime file to show we are still running:
3490 # the fsync below can take a very very long time. 3668 # the fsync below can take a very very long time.
3491 3669
3492 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3670 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3493 3671
3494 my $guard = cf::lock_acquire "write_runtime"; 3672 my $guard = cf::lock_acquire "write_runtime";
3495 3673
3496 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3674 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3497 or return; 3675 or return;
3498 3676
3499 my $value = $cf::RUNTIME + 90 + 10; 3677 my $value = $cf::RUNTIME + 90 + 10;
3500 # 10 is the runtime save interval, for a monotonic clock 3678 # 10 is the runtime save interval, for a monotonic clock
3501 # 60 allows for the watchdog to kill the server. 3679 # 60 allows for the watchdog to kill the server.
3514 or return; 3692 or return;
3515 3693
3516 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3694 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3517 and return; 3695 and return;
3518 3696
3519 warn "runtime file written.\n"; 3697 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3520 3698
3521 1 3699 1
3522} 3700}
3523 3701
3524our $uuid_lock; 3702our $uuid_lock;
3536 or return; 3714 or return;
3537 3715
3538 my $value = uuid_seq uuid_cur; 3716 my $value = uuid_seq uuid_cur;
3539 3717
3540 unless ($value) { 3718 unless ($value) {
3541 warn "cowardly refusing to write zero uuid value!\n"; 3719 info "cowardly refusing to write zero uuid value!\n";
3542 return; 3720 return;
3543 } 3721 }
3544 3722
3545 my $value = uuid_str $value + $uuid_skip; 3723 my $value = uuid_str $value + $uuid_skip;
3546 $uuid_skip = 0; 3724 $uuid_skip = 0;
3556 or return; 3734 or return;
3557 3735
3558 aio_rename "$uuid~", $uuid 3736 aio_rename "$uuid~", $uuid
3559 and return; 3737 and return;
3560 3738
3561 warn "uuid file written ($value).\n"; 3739 trace "uuid file written ($value).\n";
3562 3740
3563 1 3741 1
3564 3742
3565} 3743}
3566 3744
3572} 3750}
3573 3751
3574sub emergency_save() { 3752sub emergency_save() {
3575 my $freeze_guard = cf::freeze_mainloop; 3753 my $freeze_guard = cf::freeze_mainloop;
3576 3754
3577 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;
3578 3761
3579 cf::sync_job { 3762 cf::sync_job {
3580 # this is a trade-off: we want to be very quick here, so 3763 cf::write_runtime_sync; # external watchdog should not bark
3581 # save all maps without fsync, and later call a global sync
3582 # (which in turn might be very very slow)
3583 local $USE_FSYNC = 0;
3584 3764
3585 # use a peculiar iteration method to avoid tripping on perl 3765 # use a peculiar iteration method to avoid tripping on perl
3586 # refcount bugs in for. also avoids problems with players 3766 # refcount bugs in for. also avoids problems with players
3587 # and maps saved/destroyed asynchronously. 3767 # and maps saved/destroyed asynchronously.
3588 warn "emergency_perl_save: begin player save\n"; 3768 info "emergency_perl_save: begin player save\n";
3589 for my $login (keys %cf::PLAYER) { 3769 for my $login (keys %cf::PLAYER) {
3590 my $pl = $cf::PLAYER{$login} or next; 3770 my $pl = $cf::PLAYER{$login} or next;
3591 $pl->valid or next; 3771 $pl->valid or next;
3592 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3772 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3593 $pl->save; 3773 $pl->save;
3594 } 3774 }
3595 warn "emergency_perl_save: end player save\n"; 3775 info "emergency_perl_save: end player save\n";
3596 3776
3777 cf::write_runtime_sync; # external watchdog should not bark
3778
3597 warn "emergency_perl_save: begin map save\n"; 3779 info "emergency_perl_save: begin map save\n";
3598 for my $path (keys %cf::MAP) { 3780 for my $path (keys %cf::MAP) {
3599 my $map = $cf::MAP{$path} or next; 3781 my $map = $cf::MAP{$path} or next;
3600 $map->valid or next; 3782 $map->valid or next;
3601 $map->save; 3783 $map->save;
3602 } 3784 }
3603 warn "emergency_perl_save: end map save\n"; 3785 info "emergency_perl_save: end map save\n";
3604 3786
3787 cf::write_runtime_sync; # external watchdog should not bark
3788
3605 warn "emergency_perl_save: begin database checkpoint\n"; 3789 info "emergency_perl_save: begin database checkpoint\n";
3606 BDB::db_env_txn_checkpoint $DB_ENV; 3790 BDB::db_env_txn_checkpoint $DB_ENV;
3607 warn "emergency_perl_save: end database checkpoint\n"; 3791 info "emergency_perl_save: end database checkpoint\n";
3608 3792
3609 warn "emergency_perl_save: begin write uuid\n"; 3793 info "emergency_perl_save: begin write uuid\n";
3610 write_uuid_sync 1; 3794 write_uuid_sync 1;
3611 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
3612 }; 3815 };
3613 3816
3614 warn "emergency_perl_save: starting sync()\n";
3615 IO::AIO::aio_sync sub {
3616 warn "emergency_perl_save: finished sync()\n";
3617 };
3618
3619 warn "emergency_perl_save: leave\n"; 3817 info "emergency_perl_save: leave\n";
3620} 3818}
3621 3819
3622sub post_cleanup { 3820sub post_cleanup {
3623 my ($make_core) = @_; 3821 my ($make_core) = @_;
3624 3822
3823 IO::AIO::flush;
3824
3625 warn Carp::longmess "post_cleanup backtrace" 3825 error Carp::longmess "post_cleanup backtrace"
3626 if $make_core; 3826 if $make_core;
3627 3827
3628 my $fh = pidfile; 3828 my $fh = pidfile;
3629 unlink $PIDFILE if <$fh> == $$; 3829 unlink $PIDFILE if <$fh> == $$;
3630} 3830}
3650 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3850 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3651 for my $name (keys %$leaf_symtab) { 3851 for my $name (keys %$leaf_symtab) {
3652 _gv_clear *{"$pkg$name"}; 3852 _gv_clear *{"$pkg$name"};
3653# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3853# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3654 } 3854 }
3655 warn "cleared package $pkg\n";#d#
3656} 3855}
3657 3856
3658sub do_reload_perl() { 3857sub do_reload_perl() {
3659 # can/must only be called in main 3858 # can/must only be called in main
3660 if ($Coro::current != $Coro::main) { 3859 if (in_main) {
3661 warn "can only reload from main coroutine"; 3860 error "can only reload from main coroutine";
3662 return; 3861 return;
3663 } 3862 }
3664 3863
3665 return if $RELOAD++; 3864 return if $RELOAD++;
3666 3865
3667 my $t1 = EV::time; 3866 my $t1 = AE::time;
3668 3867
3669 while ($RELOAD) { 3868 while ($RELOAD) {
3670 warn "reloading..."; 3869 info "reloading...";
3671 3870
3672 warn "entering sync_job"; 3871 trace "entering sync_job";
3673 3872
3674 cf::sync_job { 3873 cf::sync_job {
3675 cf::write_runtime_sync; # external watchdog should not bark
3676 cf::emergency_save; 3874 cf::emergency_save;
3677 cf::write_runtime_sync; # external watchdog should not bark
3678 3875
3679 warn "syncing database to disk";
3680 BDB::db_env_txn_checkpoint $DB_ENV;
3681
3682 # if anything goes wrong in here, we should simply crash as we already saved
3683
3684 warn "flushing outstanding aio requests";
3685 while (IO::AIO::nreqs || BDB::nreqs) {
3686 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3687 }
3688
3689 warn "cancelling all extension coros"; 3876 trace "cancelling all extension coros";
3690 $_->cancel for values %EXT_CORO; 3877 $_->cancel for values %EXT_CORO;
3691 %EXT_CORO = (); 3878 %EXT_CORO = ();
3692 3879
3693 warn "removing commands"; 3880 trace "removing commands";
3694 %COMMAND = (); 3881 %COMMAND = ();
3695 3882
3696 warn "removing ext/exti commands"; 3883 trace "removing ext/exti commands";
3697 %EXTCMD = (); 3884 %EXTCMD = ();
3698 %EXTICMD = (); 3885 %EXTICMD = ();
3699 3886
3700 warn "unloading/nuking all extensions"; 3887 trace "unloading/nuking all extensions";
3701 for my $pkg (@EXTS) { 3888 for my $pkg (@EXTS) {
3702 warn "... unloading $pkg"; 3889 trace "... unloading $pkg";
3703 3890
3704 if (my $cb = $pkg->can ("unload")) { 3891 if (my $cb = $pkg->can ("unload")) {
3705 eval { 3892 eval {
3706 $cb->($pkg); 3893 $cb->($pkg);
3707 1 3894 1
3708 } or warn "$pkg unloaded, but with errors: $@"; 3895 } or error "$pkg unloaded, but with errors: $@";
3709 } 3896 }
3710 3897
3711 warn "... clearing $pkg"; 3898 trace "... clearing $pkg";
3712 clear_package $pkg; 3899 clear_package $pkg;
3713 } 3900 }
3714 3901
3715 warn "unloading all perl modules loaded from $LIBDIR"; 3902 trace "unloading all perl modules loaded from $LIBDIR";
3716 while (my ($k, $v) = each %INC) { 3903 while (my ($k, $v) = each %INC) {
3717 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3904 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3718 3905
3719 warn "... unloading $k"; 3906 trace "... unloading $k";
3720 delete $INC{$k}; 3907 delete $INC{$k};
3721 3908
3722 $k =~ s/\.pm$//; 3909 $k =~ s/\.pm$//;
3723 $k =~ s/\//::/g; 3910 $k =~ s/\//::/g;
3724 3911
3727 } 3914 }
3728 3915
3729 clear_package $k; 3916 clear_package $k;
3730 } 3917 }
3731 3918
3732 warn "getting rid of safe::, as good as possible"; 3919 trace "getting rid of safe::, as good as possible";
3733 clear_package "safe::$_" 3920 clear_package "safe::$_"
3734 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3921 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3735 3922
3736 warn "unloading cf.pm \"a bit\""; 3923 trace "unloading cf.pm \"a bit\"";
3737 delete $INC{"cf.pm"}; 3924 delete $INC{"cf.pm"};
3738 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3925 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3739 3926
3740 # don't, removes xs symbols, too, 3927 # don't, removes xs symbols, too,
3741 # and global variables created in xs 3928 # and global variables created in xs
3742 #clear_package __PACKAGE__; 3929 #clear_package __PACKAGE__;
3743 3930
3744 warn "unload completed, starting to reload now"; 3931 info "unload completed, starting to reload now";
3745 3932
3746 warn "reloading cf.pm"; 3933 trace "reloading cf.pm";
3747 require cf; 3934 require cf;
3748 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3935 cf::_connect_to_perl_1;
3749 3936
3750 warn "loading config and database again"; 3937 trace "loading config and database again";
3751 cf::reload_config; 3938 cf::reload_config;
3752 3939
3753 warn "loading extensions"; 3940 trace "loading extensions";
3754 cf::load_extensions; 3941 cf::load_extensions;
3755 3942
3756 if ($REATTACH_ON_RELOAD) { 3943 if ($REATTACH_ON_RELOAD) {
3757 warn "reattaching attachments to objects/players"; 3944 trace "reattaching attachments to objects/players";
3758 _global_reattach; # objects, sockets 3945 _global_reattach; # objects, sockets
3759 warn "reattaching attachments to maps"; 3946 trace "reattaching attachments to maps";
3760 reattach $_ for values %MAP; 3947 reattach $_ for values %MAP;
3761 warn "reattaching attachments to players"; 3948 trace "reattaching attachments to players";
3762 reattach $_ for values %PLAYER; 3949 reattach $_ for values %PLAYER;
3763 } 3950 }
3764 3951
3765 warn "running post_init jobs"; 3952 trace "running post_init jobs";
3766 (pop @POST_INIT)->(1) while @POST_INIT; 3953 (pop @POST_INIT)->(1) while @POST_INIT;
3767 3954
3768 warn "leaving sync_job"; 3955 trace "leaving sync_job";
3769 3956
3770 1 3957 1
3771 } or do { 3958 } or do {
3772 warn $@; 3959 error $@;
3773 cf::cleanup "error while reloading, exiting."; 3960 cf::cleanup "error while reloading, exiting.";
3774 }; 3961 };
3775 3962
3776 warn "reloaded"; 3963 info "reloaded";
3777 --$RELOAD; 3964 --$RELOAD;
3778 } 3965 }
3779 3966
3780 $t1 = EV::time - $t1; 3967 $t1 = AE::time - $t1;
3781 warn "reload completed in ${t1}s\n"; 3968 info "reload completed in ${t1}s\n";
3782}; 3969};
3783 3970
3784our $RELOAD_WATCHER; # used only during reload 3971our $RELOAD_WATCHER; # used only during reload
3785 3972
3786sub reload_perl() { 3973sub reload_perl() {
3788 # coro crashes during coro_state_free->destroy here. 3975 # coro crashes during coro_state_free->destroy here.
3789 3976
3790 $RELOAD_WATCHER ||= cf::async { 3977 $RELOAD_WATCHER ||= cf::async {
3791 Coro::AIO::aio_wait cache_extensions; 3978 Coro::AIO::aio_wait cache_extensions;
3792 3979
3793 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3980 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3794 do_reload_perl; 3981 do_reload_perl;
3795 undef $RELOAD_WATCHER; 3982 undef $RELOAD_WATCHER;
3796 }; 3983 };
3797 }; 3984 };
3798} 3985}
3815 4002
3816our @WAIT_FOR_TICK; 4003our @WAIT_FOR_TICK;
3817our @WAIT_FOR_TICK_BEGIN; 4004our @WAIT_FOR_TICK_BEGIN;
3818 4005
3819sub wait_for_tick { 4006sub wait_for_tick {
3820 return if tick_inhibit || $Coro::current == $Coro::main; 4007 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3821 4008
3822 my $signal = new Coro::Signal; 4009 my $signal = new Coro::Signal;
3823 push @WAIT_FOR_TICK, $signal; 4010 push @WAIT_FOR_TICK, $signal;
3824 $signal->wait; 4011 $signal->wait;
3825} 4012}
3826 4013
3827sub wait_for_tick_begin { 4014sub wait_for_tick_begin {
3828 return if tick_inhibit || $Coro::current == $Coro::main; 4015 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3829 4016
3830 my $signal = new Coro::Signal; 4017 my $signal = new Coro::Signal;
3831 push @WAIT_FOR_TICK_BEGIN, $signal; 4018 push @WAIT_FOR_TICK_BEGIN, $signal;
3832 $signal->wait; 4019 $signal->wait;
3833} 4020}
3839 return; 4026 return;
3840 } 4027 }
3841 4028
3842 cf::server_tick; # one server iteration 4029 cf::server_tick; # one server iteration
3843 4030
4031 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4032
3844 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4033 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3845 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4034 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3846 Coro::async_pool { 4035 Coro::async_pool {
3847 $Coro::current->{desc} = "runtime saver"; 4036 $Coro::current->{desc} = "runtime saver";
3848 write_runtime_sync 4037 write_runtime_sync
3849 or warn "ERROR: unable to write runtime file: $!"; 4038 or error "ERROR: unable to write runtime file: $!";
3850 }; 4039 };
3851 } 4040 }
3852 4041
3853 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4042 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3854 $sig->send; 4043 $sig->send;
3862 4051
3863 if (0) { 4052 if (0) {
3864 if ($NEXT_TICK) { 4053 if ($NEXT_TICK) {
3865 my $jitter = $TICK_START - $NEXT_TICK; 4054 my $jitter = $TICK_START - $NEXT_TICK;
3866 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4055 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3867 warn "jitter $JITTER\n";#d# 4056 debug "jitter $JITTER\n";#d#
3868 } 4057 }
3869 } 4058 }
3870} 4059}
3871 4060
3872{ 4061{
3873 # configure BDB 4062 # configure BDB
3874 4063
3875 BDB::min_parallel 8; 4064 BDB::min_parallel 16;
3876 BDB::max_poll_reqs $TICK * 0.1; 4065 BDB::max_poll_reqs $TICK * 0.1;
3877 $AnyEvent::BDB::WATCHER->priority (1); 4066 $AnyEvent::BDB::WATCHER->priority (1);
3878 4067
3879 unless ($DB_ENV) { 4068 unless ($DB_ENV) {
3880 $DB_ENV = BDB::db_env_create; 4069 $DB_ENV = BDB::db_env_create;
3961 } 4150 }
3962} 4151}
3963 4152
3964# load additional modules 4153# load additional modules
3965require "cf/$_.pm" for @EXTRA_MODULES; 4154require "cf/$_.pm" for @EXTRA_MODULES;
4155cf::_connect_to_perl_2;
3966 4156
3967END { cf::emergency_save } 4157END { cf::emergency_save }
3968 4158
39691 41591
3970 4160

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines