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.478 by root, Thu Sep 17 01:57:31 2009 UTC vs.
Revision 1.538 by root, Tue May 4 21:45:43 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use 5.10.0;
25use utf8; 26use utf8;
31use EV; 32use EV;
32use Opcode; 33use Opcode;
33use Safe; 34use Safe;
34use Safe::Hole; 35use Safe::Hole;
35use Storable (); 36use Storable ();
37use Carp ();
36 38
37use Guard (); 39use Guard ();
38use Coro (); 40use Coro ();
39use Coro::State; 41use Coro::State;
40use Coro::Handle; 42use Coro::Handle;
51use Coro::Util (); 53use Coro::Util ();
52 54
53use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
54use BDB (); 56use BDB ();
55use Data::Dumper; 57use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 58use Fcntl;
58use YAML (); 59use YAML::XS ();
59use IO::AIO (); 60use IO::AIO ();
60use Time::HiRes; 61use Time::HiRes;
61use Compress::LZF; 62use Compress::LZF;
62use Digest::MD5 (); 63use Digest::MD5 ();
63 64
88our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
89our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
90 91
91our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
92our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
93 96
94our $CONFDIR = confdir; 97our $CONFDIR = confdir;
95our $DATADIR = datadir; 98our $DATADIR = datadir;
96our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
97our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
103our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
104our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
105our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
106our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
107 110
108our %RESOURCE; 111our %RESOURCE; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
109 118
110our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
111our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
112our $NEXT_TICK; 121our $NEXT_TICK;
113our $USE_FSYNC = 1; # use fsync to write maps - default on 122our $USE_FSYNC = 1; # use fsync to write maps - default on
115our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
116our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
117our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
118our $DB_ENV; 127our $DB_ENV;
119 128
120our @EXTRA_MODULES = qw(pod mapscript); 129our @EXTRA_MODULES = qw(pod match mapscript);
121 130
122our %CFG; 131our %CFG;
123 132
124our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
125our $RUNTIME; 134our $RUNTIME;
159 168
160our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
161 170
162sub cf::map::normalise; 171sub cf::map::normalise;
163 172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
187
164############################################################################# 188#############################################################################
165 189
166=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
167 191
168=over 4 192=over 4
214returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one process
215per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
216 240
217=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
218 242
219This array contains the results of the last C<invoke ()> call. When 243This array contains the results of the last C<invoke ()> call. When
220C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
221that call. 245that call.
222 246
247=item %cf::REFLECT
248
249Contains, for each (C++) class name, a hash reference with information
250about object members (methods, scalars, arrays and flags) and other
251metadata, which is useful for introspection.
252
223=back 253=back
224 254
225=cut 255=cut
256
257sub error(@) { LOG llevError, join "", @_ }
258sub warn (@) { LOG llevWarn , join "", @_ }
259sub info (@) { LOG llevInfo , join "", @_ }
260sub debug(@) { LOG llevDebug, join "", @_ }
261sub trace(@) { LOG llevTrace, join "", @_ }
226 262
227$Coro::State::WARNHOOK = sub { 263$Coro::State::WARNHOOK = sub {
228 my $msg = join "", @_; 264 my $msg = join "", @_;
229 265
230 $msg .= "\n" 266 $msg .= "\n"
231 unless $msg =~ /\n$/; 267 unless $msg =~ /\n$/;
232 268
233 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 269 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
234 270
235 LOG llevError, $msg; 271 LOG llevWarn, $msg;
236}; 272};
237 273
238$Coro::State::DIEHOOK = sub { 274$Coro::State::DIEHOOK = sub {
239 return unless $^S eq 0; # "eq", not "==" 275 return unless $^S eq 0; # "eq", not "=="
240 276
241 warn Carp::longmess $_[0]; 277 error Carp::longmess $_[0];
242 278
243 if ($Coro::current == $Coro::main) {#d# 279 if (in_main) {#d#
244 warn "DIEHOOK called in main context, Coro bug?\n";#d# 280 error "DIEHOOK called in main context, Coro bug?\n";#d#
245 return;#d# 281 return;#d#
246 }#d# 282 }#d#
247 283
248 # kill coroutine otherwise 284 # kill coroutine otherwise
249 Coro::terminate 285 Coro::terminate
269)) { 305)) {
270 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 306 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
271} 307}
272 308
273$EV::DIED = sub { 309$EV::DIED = sub {
274 warn "error in event callback: @_"; 310 Carp::cluck "error in event callback: @_";
275}; 311};
276 312
277############################################################################# 313#############################################################################
278 314
279=head2 UTILITY FUNCTIONS 315=head2 UTILITY FUNCTIONS
376} 412}
377 413
378=item cf::periodic $interval, $cb 414=item cf::periodic $interval, $cb
379 415
380Like EV::periodic, but randomly selects a starting point so that the actions 416Like EV::periodic, but randomly selects a starting point so that the actions
381get spread over timer. 417get spread over time.
382 418
383=cut 419=cut
384 420
385sub periodic($$) { 421sub periodic($$) {
386 my ($interval, $cb) = @_; 422 my ($interval, $cb) = @_;
403 439
404=cut 440=cut
405 441
406our @SLOT_QUEUE; 442our @SLOT_QUEUE;
407our $SLOT_QUEUE; 443our $SLOT_QUEUE;
444our $SLOT_DECAY = 0.9;
408 445
409$SLOT_QUEUE->cancel if $SLOT_QUEUE; 446$SLOT_QUEUE->cancel if $SLOT_QUEUE;
410$SLOT_QUEUE = Coro::async { 447$SLOT_QUEUE = Coro::async {
411 $Coro::current->desc ("timeslot manager"); 448 $Coro::current->desc ("timeslot manager");
412 449
413 my $signal = new Coro::Signal; 450 my $signal = new Coro::Signal;
451 my $busy;
414 452
415 while () { 453 while () {
416 next_job: 454 next_job:
455
417 my $avail = cf::till_tick; 456 my $avail = cf::till_tick;
418 if ($avail > 0.01) { 457
419 for (0 .. $#SLOT_QUEUE) { 458 for (0 .. $#SLOT_QUEUE) {
420 if ($SLOT_QUEUE[$_][0] < $avail) { 459 if ($SLOT_QUEUE[$_][0] <= $avail) {
460 $busy = 0;
421 my $job = splice @SLOT_QUEUE, $_, 1, (); 461 my $job = splice @SLOT_QUEUE, $_, 1, ();
422 $job->[2]->send; 462 $job->[2]->send;
423 Coro::cede; 463 Coro::cede;
424 goto next_job; 464 goto next_job;
425 } 465 } else {
466 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
426 } 467 }
427 } 468 }
428 469
429 if (@SLOT_QUEUE) { 470 if (@SLOT_QUEUE) {
430 # we do not use wait_for_tick() as it returns immediately when tick is inactive 471 # we do not use wait_for_tick() as it returns immediately when tick is inactive
431 push @cf::WAIT_FOR_TICK, $signal; 472 push @cf::WAIT_FOR_TICK, $signal;
432 $signal->wait; 473 $signal->wait;
433 } else { 474 } else {
475 $busy = 0;
434 Coro::schedule; 476 Coro::schedule;
435 } 477 }
436 } 478 }
437}; 479};
438 480
439sub get_slot($;$$) { 481sub get_slot($;$$) {
440 return if tick_inhibit || $Coro::current == $Coro::main; 482 return if tick_inhibit || $Coro::current == $Coro::main;
441 483
442 my ($time, $pri, $name) = @_; 484 my ($time, $pri, $name) = @_;
443 485
444 $time = $TICK * .6 if $time > $TICK * .6; 486 $time = clamp $time, 0.01, $TICK * .6;
487
445 my $sig = new Coro::Signal; 488 my $sig = new Coro::Signal;
446 489
447 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 490 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
448 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 491 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
449 $SLOT_QUEUE->ready; 492 $SLOT_QUEUE->ready;
475=cut 518=cut
476 519
477sub sync_job(&) { 520sub sync_job(&) {
478 my ($job) = @_; 521 my ($job) = @_;
479 522
480 if ($Coro::current == $Coro::main) { 523 if (in_main) {
481 my $time = EV::time; 524 my $time = AE::time;
482 525
483 # this is the main coro, too bad, we have to block 526 # this is the main coro, too bad, we have to block
484 # till the operation succeeds, freezing the server :/ 527 # till the operation succeeds, freezing the server :/
485 528
486 LOG llevError, Carp::longmess "sync job";#d# 529 #LOG llevError, Carp::longmess "sync job";#d#
487 530
488 my $freeze_guard = freeze_mainloop; 531 my $freeze_guard = freeze_mainloop;
489 532
490 my $busy = 1; 533 my $busy = 1;
491 my @res; 534 my @res;
492 535
493 (async { 536 (async {
494 $Coro::current->desc ("sync job coro"); 537 $Coro::current->desc ("sync job coro");
495 @res = eval { $job->() }; 538 @res = eval { $job->() };
496 warn $@ if $@; 539 error $@ if $@;
497 undef $busy; 540 undef $busy;
498 })->prio (Coro::PRIO_MAX); 541 })->prio (Coro::PRIO_MAX);
499 542
500 while ($busy) { 543 while ($busy) {
501 if (Coro::nready) { 544 if (Coro::nready) {
503 } else { 546 } else {
504 EV::loop EV::LOOP_ONESHOT; 547 EV::loop EV::LOOP_ONESHOT;
505 } 548 }
506 } 549 }
507 550
508 my $time = EV::time - $time; 551 my $time = AE::time - $time;
509 552
510 $TICK_START += $time; # do not account sync jobs to server load 553 $TICK_START += $time; # do not account sync jobs to server load
511 554
512 wantarray ? @res : $res[0] 555 wantarray ? @res : $res[0]
513 } else { 556 } else {
557 reset_signals; 600 reset_signals;
558 &$cb 601 &$cb
559 }, @args; 602 }, @args;
560 603
561 wantarray ? @res : $res[-1] 604 wantarray ? @res : $res[-1]
605}
606
607sub objinfo {
608 (
609 "counter value" => cf::object::object_count,
610 "objects created" => cf::object::create_count,
611 "objects destroyed" => cf::object::destroy_count,
612 "freelist size" => cf::object::free_count,
613 "allocated objects" => cf::object::objects_size,
614 "active objects" => cf::object::actives_size,
615 )
562} 616}
563 617
564=item $coin = coin_from_name $name 618=item $coin = coin_from_name $name
565 619
566=cut 620=cut
603within each server. 657within each server.
604 658
605=cut 659=cut
606 660
607sub db_table($) { 661sub db_table($) {
662 cf::error "db_get called from main context"
663 if $Coro::current == $Coro::main;
664
608 my ($name) = @_; 665 my ($name) = @_;
609 my $db = BDB::db_create $DB_ENV; 666 my $db = BDB::db_create $DB_ENV;
610 667
611 eval { 668 eval {
612 $db->set_flags (BDB::CHKSUM); 669 $db->set_flags (BDB::CHKSUM);
622} 679}
623 680
624our $DB; 681our $DB;
625 682
626sub db_init { 683sub db_init {
627 cf::sync_job {
628 $DB ||= db_table "db"; 684 $DB ||= db_table "db";
629 };
630} 685}
631 686
632sub db_get($$) { 687sub db_get($$) {
633 my $key = "$_[0]/$_[1]"; 688 my $key = "$_[0]/$_[1]";
634 689
635 cf::sync_job { 690 cf::error "db_get called from main context"
691 if $Coro::current == $Coro::main;
692
636 BDB::db_get $DB, undef, $key, my $data; 693 BDB::db_get $DB, undef, $key, my $data;
637 694
638 $! ? () 695 $! ? ()
639 : $data 696 : $data
640 }
641} 697}
642 698
643sub db_put($$$) { 699sub db_put($$$) {
644 BDB::dbreq_pri 4; 700 BDB::dbreq_pri 4;
645 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 701 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
701 757
702 my $t1 = Time::HiRes::time; 758 my $t1 = Time::HiRes::time;
703 my $data = $process->(\@data); 759 my $data = $process->(\@data);
704 my $t2 = Time::HiRes::time; 760 my $t2 = Time::HiRes::time;
705 761
706 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 762 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
707 763
708 db_put cache => "$id/data", $data; 764 db_put cache => "$id/data", $data;
709 db_put cache => "$id/md5" , $md5; 765 db_put cache => "$id/md5" , $md5;
710 db_put cache => "$id/meta", $meta; 766 db_put cache => "$id/meta", $meta;
711 767
721 777
722=cut 778=cut
723 779
724sub datalog($@) { 780sub datalog($@) {
725 my ($type, %kv) = @_; 781 my ($type, %kv) = @_;
726 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 782 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
727} 783}
728 784
729=back 785=back
730 786
731=cut 787=cut
926 982
927 } elsif (exists $cb_id{$type}) { 983 } elsif (exists $cb_id{$type}) {
928 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 984 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
929 985
930 } elsif (ref $type) { 986 } elsif (ref $type) {
931 warn "attaching objects not supported, ignoring.\n"; 987 error "attaching objects not supported, ignoring.\n";
932 988
933 } else { 989 } else {
934 shift @arg; 990 shift @arg;
935 warn "attach argument '$type' not supported, ignoring.\n"; 991 error "attach argument '$type' not supported, ignoring.\n";
936 } 992 }
937 } 993 }
938} 994}
939 995
940sub _object_attach { 996sub _object_attach {
950 _attach $registry, $klass, @attach; 1006 _attach $registry, $klass, @attach;
951 } 1007 }
952 1008
953 $obj->{$name} = \%arg; 1009 $obj->{$name} = \%arg;
954 } else { 1010 } else {
955 warn "object uses attachment '$name' which is not available, postponing.\n"; 1011 info "object uses attachment '$name' which is not available, postponing.\n";
956 } 1012 }
957 1013
958 $obj->{_attachment}{$name} = undef; 1014 $obj->{_attachment}{$name} = undef;
959} 1015}
960 1016
1019 1075
1020 for (@$callbacks) { 1076 for (@$callbacks) {
1021 eval { &{$_->[1]} }; 1077 eval { &{$_->[1]} };
1022 1078
1023 if ($@) { 1079 if ($@) {
1024 warn "$@";
1025 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1080 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1026 override; 1081 override;
1027 } 1082 }
1028 1083
1029 return 1 if $override; 1084 return 1 if $override;
1030 } 1085 }
1109 for (@$attach) { 1164 for (@$attach) {
1110 my ($klass, @attach) = @$_; 1165 my ($klass, @attach) = @$_;
1111 _attach $registry, $klass, @attach; 1166 _attach $registry, $klass, @attach;
1112 } 1167 }
1113 } else { 1168 } else {
1114 warn "object uses attachment '$name' that is not available, postponing.\n"; 1169 info "object uses attachment '$name' that is not available, postponing.\n";
1115 } 1170 }
1116 } 1171 }
1117} 1172}
1118 1173
1119cf::attachable->attach ( 1174cf::attachable->attach (
1146 my ($filename, $rdata, $objs) = @_; 1201 my ($filename, $rdata, $objs) = @_;
1147 1202
1148 sync_job { 1203 sync_job {
1149 if (length $$rdata) { 1204 if (length $$rdata) {
1150 utf8::decode (my $decname = $filename); 1205 utf8::decode (my $decname = $filename);
1151 warn sprintf "saving %s (%d,%d)\n", 1206 trace sprintf "saving %s (%d,%d)\n",
1152 $decname, length $$rdata, scalar @$objs; 1207 $decname, length $$rdata, scalar @$objs
1208 if $VERBOSE_IO;
1153 1209
1154 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1210 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1155 aio_chmod $fh, SAVE_MODE; 1211 aio_chmod $fh, SAVE_MODE;
1156 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1212 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1157 if ($cf::USE_FSYNC) { 1213 if ($cf::USE_FSYNC) {
1179 aio_rename "$filename~", $filename; 1235 aio_rename "$filename~", $filename;
1180 1236
1181 $filename =~ s%/[^/]+$%%; 1237 $filename =~ s%/[^/]+$%%;
1182 aio_pathsync $filename if $cf::USE_FSYNC; 1238 aio_pathsync $filename if $cf::USE_FSYNC;
1183 } else { 1239 } else {
1184 warn "unable to save objects: $filename~: $!\n"; 1240 error "unable to save objects: $filename~: $!\n";
1185 } 1241 }
1186 } else { 1242 } else {
1187 aio_unlink $filename; 1243 aio_unlink $filename;
1188 aio_unlink "$filename.pst"; 1244 aio_unlink "$filename.pst";
1189 } 1245 }
1213 my $st = eval { Coro::Storable::thaw $av }; 1269 my $st = eval { Coro::Storable::thaw $av };
1214 $av = $st->{objs}; 1270 $av = $st->{objs};
1215 } 1271 }
1216 1272
1217 utf8::decode (my $decname = $filename); 1273 utf8::decode (my $decname = $filename);
1218 warn sprintf "loading %s (%d,%d)\n", 1274 trace sprintf "loading %s (%d,%d)\n",
1219 $decname, length $data, scalar @{$av || []}; 1275 $decname, length $data, scalar @{$av || []}
1276 if $VERBOSE_IO;
1220 1277
1221 ($data, $av) 1278 ($data, $av)
1222} 1279}
1223 1280
1224=head2 COMMAND CALLBACKS 1281=head2 COMMAND CALLBACKS
1283} 1340}
1284 1341
1285use File::Glob (); 1342use File::Glob ();
1286 1343
1287cf::player->attach ( 1344cf::player->attach (
1288 on_command => sub { 1345 on_unknown_command => sub {
1289 my ($pl, $name, $params) = @_; 1346 my ($pl, $name, $params) = @_;
1290 1347
1291 my $cb = $COMMAND{$name} 1348 my $cb = $COMMAND{$name}
1292 or return; 1349 or return;
1293 1350
1316 1373
1317 $pl->ext_reply ($reply, @reply) 1374 $pl->ext_reply ($reply, @reply)
1318 if $reply; 1375 if $reply;
1319 1376
1320 } else { 1377 } else {
1321 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1378 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1322 } 1379 }
1323 1380
1324 cf::override; 1381 cf::override;
1325 }, 1382 },
1326); 1383);
1337 1394
1338 $grp 1395 $grp
1339} 1396}
1340 1397
1341sub load_extensions { 1398sub load_extensions {
1399 info "loading extensions...";
1400
1342 cf::sync_job { 1401 cf::sync_job {
1343 my %todo; 1402 my %todo;
1344 1403
1345 for my $path (<$LIBDIR/*.ext>) { 1404 for my $path (<$LIBDIR/*.ext>) {
1346 next unless -r $path; 1405 next unless -r $path;
1364 1423
1365 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1424 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1366 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1425 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1367 1426
1368 $ext{source} = 1427 $ext{source} =
1369 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1428 "package $pkg; use common::sense;\n"
1370 . "#line 1 \"$path\"\n{\n" 1429 . "#line 1 \"$path\"\n{\n"
1371 . $source 1430 . $source
1372 . "\n};\n1"; 1431 . "\n};\n1";
1373 1432
1374 $todo{$base} = \%ext; 1433 $todo{$base} = \%ext;
1375 } 1434 }
1376 1435
1436 my $pass = 0;
1377 my %done; 1437 my %done;
1378 while (%todo) { 1438 while (%todo) {
1379 my $progress; 1439 my $progress;
1380 1440
1441 ++$pass;
1442
1443 ext:
1381 while (my ($k, $v) = each %todo) { 1444 while (my ($k, $v) = each %todo) {
1382 for (split /,\s*/, $v->{meta}{depends}) { 1445 for (split /,\s*/, $v->{meta}{depends}) {
1383 goto skip 1446 next ext
1384 unless exists $done{$_}; 1447 unless exists $done{$_};
1385 } 1448 }
1386 1449
1387 warn "... loading '$k' into '$v->{pkg}'\n"; 1450 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1388 1451
1389 unless (eval $v->{source}) { 1452 my $active = eval $v->{source};
1453
1454 if (length $@) {
1390 my $msg = $@ ? "$v->{path}: $@\n" 1455 error "$v->{path}: $@\n";
1391 : "$v->{base}: extension inactive.\n"; 1456 undef $@; # work around perl 5.10.0 utf-8 caching bug
1392 1457
1393 if (exists $v->{meta}{mandatory}) {
1394 warn $msg;
1395 cf::cleanup "mandatory extension failed to load, exiting."; 1458 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1396 } 1459 if exists $v->{meta}{mandatory};
1397 1460
1398 warn $msg; 1461 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1462 delete $todo{$k};
1463 } else {
1464 $done{$k} = delete $todo{$k};
1465 push @EXTS, $v->{pkg};
1466 $progress = 1;
1467
1468 info "$v->{base}: extension inactive.\n"
1469 unless $active;
1399 } 1470 }
1400
1401 $done{$k} = delete $todo{$k};
1402 push @EXTS, $v->{pkg};
1403 $progress = 1;
1404 } 1471 }
1405 1472
1406 skip: 1473 unless ($progress) {
1407 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1474 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1408 unless $progress; 1475
1476 while (my ($k, $v) = each %todo) {
1477 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1478 if exists $v->{meta}{mandatory};
1479 }
1480 }
1409 } 1481 }
1410 }; 1482 };
1411} 1483}
1412 1484
1413############################################################################# 1485#############################################################################
1497 $cf::PLAYER{$login} = $pl 1569 $cf::PLAYER{$login} = $pl
1498 } 1570 }
1499 } 1571 }
1500} 1572}
1501 1573
1574cf::player->attach (
1575 on_load => sub {
1576 my ($pl, $path) = @_;
1577
1578 # restore slots saved in save, below
1579 my $slots = delete $pl->{_slots};
1580
1581 $pl->ob->current_weapon ($slots->[0]);
1582 $pl->combat_ob ($slots->[1]);
1583 $pl->ranged_ob ($slots->[2]);
1584 },
1585);
1586
1502sub save($) { 1587sub save($) {
1503 my ($pl) = @_; 1588 my ($pl) = @_;
1504 1589
1505 return if $pl->{deny_save}; 1590 return if $pl->{deny_save};
1506 1591
1511 1596
1512 aio_mkdir playerdir $pl, 0770; 1597 aio_mkdir playerdir $pl, 0770;
1513 $pl->{last_save} = $cf::RUNTIME; 1598 $pl->{last_save} = $cf::RUNTIME;
1514 1599
1515 cf::get_slot 0.01; 1600 cf::get_slot 0.01;
1601
1602 # save slots, to be restored later
1603 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1516 1604
1517 $pl->save_pl ($path); 1605 $pl->save_pl ($path);
1518 cf::cede_to_tick; 1606 cf::cede_to_tick;
1519} 1607}
1520 1608
1557 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1645 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1558 1646
1559 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1647 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1560 $pl->deactivate; 1648 $pl->deactivate;
1561 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1649 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1562 $pl->ob->check_score;
1563 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1650 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1564 $pl->ns->destroy if $pl->ns; 1651 $pl->ns->destroy if $pl->ns;
1565 1652
1566 my $path = playerdir $pl; 1653 my $path = playerdir $pl;
1567 my $temp = "$path~$cf::RUNTIME~deleting~"; 1654 my $temp = "$path~$cf::RUNTIME~deleting~";
1622 \@logins 1709 \@logins
1623} 1710}
1624 1711
1625=item $player->maps 1712=item $player->maps
1626 1713
1714=item cf::player::maps $login
1715
1627Returns an arrayref of map paths that are private for this 1716Returns an arrayref of map paths that are private for this
1628player. May block. 1717player. May block.
1629 1718
1630=cut 1719=cut
1631 1720
1693=cut 1782=cut
1694 1783
1695sub find_by_path($) { 1784sub find_by_path($) {
1696 my ($path) = @_; 1785 my ($path) = @_;
1697 1786
1787 $path =~ s/^~[^\/]*//; # skip ~login
1788
1698 my ($match, $specificity); 1789 my ($match, $specificity);
1699 1790
1700 for my $region (list) { 1791 for my $region (list) {
1701 if ($region->{match} && $path =~ $region->{match}) { 1792 if ($region->{match} && $path =~ $region->{match}) {
1702 ($match, $specificity) = ($region, $region->specificity) 1793 ($match, $specificity) = ($region, $region->specificity)
1733 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1824 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1734 1825
1735 # mit "rum" bekleckern, nicht 1826 # mit "rum" bekleckern, nicht
1736 $self->_create_random_map ( 1827 $self->_create_random_map (
1737 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1828 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1738 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1829 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1739 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1830 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1740 $rmp->{exit_on_final_map}, 1831 $rmp->{exit_on_final_map},
1741 $rmp->{xsize}, $rmp->{ysize}, 1832 $rmp->{xsize}, $rmp->{ysize},
1742 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1833 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1743 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1834 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1765 1856
1766 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1857 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1767} 1858}
1768 1859
1769# also paths starting with '/' 1860# also paths starting with '/'
1770$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1861$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1771 1862
1772sub thawer_merge { 1863sub thawer_merge {
1773 my ($self, $merge) = @_; 1864 my ($self, $merge) = @_;
1774 1865
1775 # we have to keep some variables in memory intact 1866 # we have to keep some variables in memory intact
1989 2080
1990 $cf::MAP{$path} = $map 2081 $cf::MAP{$path} = $map
1991 } 2082 }
1992} 2083}
1993 2084
1994sub pre_load { } 2085sub pre_load { }
1995sub post_load { } 2086#sub post_load { } # XS
1996 2087
1997sub load { 2088sub load {
1998 my ($self) = @_; 2089 my ($self) = @_;
1999 2090
2000 local $self->{deny_reset} = 1; # loading can take a long time 2091 local $self->{deny_reset} = 1; # loading can take a long time
2057 } 2148 }
2058 2149
2059 $self->post_load; 2150 $self->post_load;
2060} 2151}
2061 2152
2153# customize the map for a given player, i.e.
2154# return the _real_ map. used by e.g. per-player
2155# maps to change the path to ~playername/mappath
2062sub customise_for { 2156sub customise_for {
2063 my ($self, $ob) = @_; 2157 my ($self, $ob) = @_;
2064 2158
2065 return find "~" . $ob->name . "/" . $self->{path} 2159 return find "~" . $ob->name . "/" . $self->{path}
2066 if $self->per_player; 2160 if $self->per_player;
2082 or next; 2176 or next;
2083 $neigh = find $neigh, $map 2177 $neigh = find $neigh, $map
2084 or next; 2178 or next;
2085 $neigh->load; 2179 $neigh->load;
2086 2180
2181 # now find the diagonal neighbours
2087 push @neigh, 2182 push @neigh,
2088 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2183 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2089 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2184 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2090 } 2185 }
2091 2186
2098} 2193}
2099 2194
2100sub find_sync { 2195sub find_sync {
2101 my ($path, $origin) = @_; 2196 my ($path, $origin) = @_;
2102 2197
2103 cf::sync_job { find $path, $origin } 2198 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2199 if $Coro::current == $Coro::main;
2200
2201 find $path, $origin
2104} 2202}
2105 2203
2106sub do_load_sync { 2204sub do_load_sync {
2107 my ($map) = @_; 2205 my ($map) = @_;
2108 2206
2109 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2207 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2110 if $Coro::current == $Coro::main; 2208 if $Coro::current == $Coro::main;
2111 2209
2112 cf::sync_job { $map->load }; 2210 $map->load;
2113} 2211}
2114 2212
2115our %MAP_PREFETCH; 2213our %MAP_PREFETCH;
2116our $MAP_PREFETCHER = undef; 2214our $MAP_PREFETCHER = undef;
2117 2215
2143 $MAP_PREFETCHER->prio (6); 2241 $MAP_PREFETCHER->prio (6);
2144 2242
2145 () 2243 ()
2146} 2244}
2147 2245
2246# common code, used by both ->save and ->swapout
2148sub save { 2247sub _save {
2149 my ($self) = @_; 2248 my ($self) = @_;
2150
2151 my $lock = cf::lock_acquire "map_data:$self->{path}";
2152 2249
2153 $self->{last_save} = $cf::RUNTIME; 2250 $self->{last_save} = $cf::RUNTIME;
2154 2251
2155 return unless $self->dirty; 2252 return unless $self->dirty;
2156 2253
2176 } else { 2273 } else {
2177 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2274 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2178 } 2275 }
2179} 2276}
2180 2277
2278sub save {
2279 my ($self) = @_;
2280
2281 my $lock = cf::lock_acquire "map_data:$self->{path}";
2282
2283 $self->_save;
2284}
2285
2181sub swap_out { 2286sub swap_out {
2182 my ($self) = @_; 2287 my ($self) = @_;
2183 2288
2184 # save first because save cedes
2185 $self->save;
2186
2187 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2289 my $lock = cf::lock_acquire "map_data:$self->{path}";
2188 2290
2189 return if $self->players;
2190 return if $self->in_memory != cf::MAP_ACTIVE; 2291 return if $self->in_memory != cf::MAP_ACTIVE;
2191 return if $self->{deny_save}; 2292 return if $self->{deny_save};
2293 return if $self->players;
2192 2294
2295 # first deactivate the map and "unlink" it from the core
2296 $self->deactivate;
2297 $_->clear_links_to ($self) for values %cf::MAP;
2193 $self->in_memory (cf::MAP_SWAPPED); 2298 $self->in_memory (cf::MAP_SWAPPED);
2299
2300 # then atomically save
2301 $self->_save;
2302
2303 # then free the map
2304 $self->clear;
2305}
2306
2307sub reset_at {
2308 my ($self) = @_;
2309
2310 # TODO: safety, remove and allow resettable per-player maps
2311 return 1e99 if $self->{deny_reset};
2312
2313 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2314 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2315
2316 $time + $to
2317}
2318
2319sub should_reset {
2320 my ($self) = @_;
2321
2322 $self->reset_at <= $cf::RUNTIME
2323}
2324
2325sub reset {
2326 my ($self) = @_;
2327
2328 my $lock = cf::lock_acquire "map_data:$self->{path}";
2329
2330 return if $self->players;
2331
2332 cf::trace "resetting map ", $self->path, "\n";
2333
2334 $self->in_memory (cf::MAP_SWAPPED);
2335
2336 # need to save uniques path
2337 unless ($self->{deny_save}) {
2338 my $uniq = $self->uniq_path; utf8::encode $uniq;
2339
2340 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2341 if $uniq;
2342 }
2343
2344 delete $cf::MAP{$self->path};
2194 2345
2195 $self->deactivate; 2346 $self->deactivate;
2196 $_->clear_links_to ($self) for values %cf::MAP; 2347 $_->clear_links_to ($self) for values %cf::MAP;
2197 $self->clear; 2348 $self->clear;
2198}
2199
2200sub reset_at {
2201 my ($self) = @_;
2202
2203 # TODO: safety, remove and allow resettable per-player maps
2204 return 1e99 if $self->{deny_reset};
2205
2206 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2207 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2208
2209 $time + $to
2210}
2211
2212sub should_reset {
2213 my ($self) = @_;
2214
2215 $self->reset_at <= $cf::RUNTIME
2216}
2217
2218sub reset {
2219 my ($self) = @_;
2220
2221 my $lock = cf::lock_acquire "map_data:$self->{path}";
2222
2223 return if $self->players;
2224
2225 warn "resetting map ", $self->path, "\n";
2226
2227 $self->in_memory (cf::MAP_SWAPPED);
2228
2229 # need to save uniques path
2230 unless ($self->{deny_save}) {
2231 my $uniq = $self->uniq_path; utf8::encode $uniq;
2232
2233 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2234 if $uniq;
2235 }
2236
2237 delete $cf::MAP{$self->path};
2238
2239 $self->deactivate;
2240 $_->clear_links_to ($self) for values %cf::MAP;
2241 $self->clear;
2242 2349
2243 $self->unlink_save; 2350 $self->unlink_save;
2244 $self->destroy; 2351 $self->destroy;
2245} 2352}
2246 2353
2254 2361
2255 delete $cf::MAP{$self->path}; 2362 delete $cf::MAP{$self->path};
2256 2363
2257 $self->unlink_save; 2364 $self->unlink_save;
2258 2365
2259 bless $self, "cf::map"; 2366 bless $self, "cf::map::wrap";
2260 delete $self->{deny_reset}; 2367 delete $self->{deny_reset};
2261 $self->{deny_save} = 1; 2368 $self->{deny_save} = 1;
2262 $self->reset_timeout (1); 2369 $self->reset_timeout (1);
2263 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2370 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2264 2371
2321 : normalise $_ 2428 : normalise $_
2322 } @{ aio_readdir $UNIQUEDIR or [] } 2429 } @{ aio_readdir $UNIQUEDIR or [] }
2323 ] 2430 ]
2324} 2431}
2325 2432
2433=item cf::map::static_maps
2434
2435Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2436file in the shared directory excluding F</styles> and F</editor>). May
2437block.
2438
2439=cut
2440
2441sub static_maps() {
2442 my @dirs = "";
2443 my @maps;
2444
2445 while (@dirs) {
2446 my $dir = shift @dirs;
2447
2448 next if $dir eq "/styles" || $dir eq "/editor";
2449
2450 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2451 or return;
2452
2453 for (@$files) {
2454 s/\.map$// or next;
2455 utf8::decode $_;
2456 push @maps, "$dir/$_";
2457 }
2458
2459 push @dirs, map "$dir/$_", @$dirs;
2460 }
2461
2462 \@maps
2463}
2464
2326=back 2465=back
2327 2466
2328=head3 cf::object 2467=head3 cf::object
2329 2468
2330=cut 2469=cut
2462 2601
2463Freezes the player and moves him/her to a special map (C<{link}>). 2602Freezes the player and moves him/her to a special map (C<{link}>).
2464 2603
2465The player should be reasonably safe there for short amounts of time (e.g. 2604The player should be reasonably safe there for short amounts of time (e.g.
2466for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2605for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2467though, as the palyer cannot control the character while it is on the link 2606though, as the player cannot control the character while it is on the link
2468map. 2607map.
2469 2608
2470Will never block. 2609Will never block.
2471 2610
2472=item $player_object->leave_link ($map, $x, $y) 2611=item $player_object->leave_link ($map, $x, $y)
2493sub cf::object::player::enter_link { 2632sub cf::object::player::enter_link {
2494 my ($self) = @_; 2633 my ($self) = @_;
2495 2634
2496 $self->deactivate_recursive; 2635 $self->deactivate_recursive;
2497 2636
2637 ++$self->{_link_recursion};
2638
2498 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2639 return if UNIVERSAL::isa $self->map, "ext::map_link";
2499 2640
2500 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2641 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2501 if $self->map && $self->map->{path} ne "{link}"; 2642 if $self->map && $self->map->{path} ne "{link}";
2502 2643
2503 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2644 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2504} 2645}
2505 2646
2506sub cf::object::player::leave_link { 2647sub cf::object::player::leave_link {
2507 my ($self, $map, $x, $y) = @_; 2648 my ($self, $map, $x, $y) = @_;
2508 2649
2525 ($x, $y) = (-1, -1) 2666 ($x, $y) = (-1, -1)
2526 unless (defined $x) && (defined $y); 2667 unless (defined $x) && (defined $y);
2527 2668
2528 # use -1 or undef as default coordinates, not 0, 0 2669 # use -1 or undef as default coordinates, not 0, 0
2529 ($x, $y) = ($map->enter_x, $map->enter_y) 2670 ($x, $y) = ($map->enter_x, $map->enter_y)
2530 if $x <=0 && $y <= 0; 2671 if $x <= 0 && $y <= 0;
2531 2672
2532 $map->load; 2673 $map->load;
2533 $map->load_neighbours; 2674 $map->load_neighbours;
2534 2675
2535 return unless $self->contr->active; 2676 return unless $self->contr->active;
2536 2677
2537 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2678 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2538 $self->enter_map ($map, $x, $y); 2679 if ($self->enter_map ($map, $x, $y)) {
2539 2680 # entering was successful
2681 delete $self->{_link_recursion};
2540 # only activate afterwards, to support waiting in hooks 2682 # only activate afterwards, to support waiting in hooks
2541 $self->activate_recursive; 2683 $self->activate_recursive;
2542} 2684 }
2543 2685
2686}
2687
2544=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2688=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2545 2689
2546Moves the player to the given map-path and coordinates by first freezing 2690Moves the player to the given map-path and coordinates by first freezing
2547her, loading and preparing them map, calling the provided $check callback 2691her, loading and preparing them map, calling the provided $check callback
2548that has to return the map if sucecssful, and then unfreezes the player on 2692that has to return the map if sucecssful, and then unfreezes the player on
2549the new (success) or old (failed) map position. In either case, $done will 2693the new (success) or old (failed) map position. In either case, $done will
2556 2700
2557our $GOTOGEN; 2701our $GOTOGEN;
2558 2702
2559sub cf::object::player::goto { 2703sub cf::object::player::goto {
2560 my ($self, $path, $x, $y, $check, $done) = @_; 2704 my ($self, $path, $x, $y, $check, $done) = @_;
2705
2706 if ($self->{_link_recursion} >= $MAX_LINKS) {
2707 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2708 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2709 ($path, $x, $y) = @$EMERGENCY_POSITION;
2710 }
2561 2711
2562 # do generation counting so two concurrent goto's will be executed in-order 2712 # do generation counting so two concurrent goto's will be executed in-order
2563 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2713 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2564 2714
2565 $self->enter_link; 2715 $self->enter_link;
2589 my $map = eval { 2739 my $map = eval {
2590 my $map = defined $path ? cf::map::find $path : undef; 2740 my $map = defined $path ? cf::map::find $path : undef;
2591 2741
2592 if ($map) { 2742 if ($map) {
2593 $map = $map->customise_for ($self); 2743 $map = $map->customise_for ($self);
2594 $map = $check->($map) if $check && $map; 2744 $map = $check->($map, $x, $y, $self) if $check && $map;
2595 } else { 2745 } else {
2596 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2746 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2597 } 2747 }
2598 2748
2599 $map 2749 $map
2607 if ($gen == $self->{_goto_generation}) { 2757 if ($gen == $self->{_goto_generation}) {
2608 delete $self->{_goto_generation}; 2758 delete $self->{_goto_generation};
2609 $self->leave_link ($map, $x, $y); 2759 $self->leave_link ($map, $x, $y);
2610 } 2760 }
2611 2761
2612 $done->() if $done; 2762 $done->($self) if $done;
2613 })->prio (1); 2763 })->prio (1);
2614} 2764}
2615 2765
2616=item $player_object->enter_exit ($exit_object) 2766=item $player_object->enter_exit ($exit_object)
2617 2767
2710 $self->message ("Something went wrong deep within the deliantra server. " 2860 $self->message ("Something went wrong deep within the deliantra server. "
2711 . "I'll try to bring you back to the map you were before. " 2861 . "I'll try to bring you back to the map you were before. "
2712 . "Please report this to the dungeon master!", 2862 . "Please report this to the dungeon master!",
2713 cf::NDI_UNIQUE | cf::NDI_RED); 2863 cf::NDI_UNIQUE | cf::NDI_RED);
2714 2864
2715 warn "ERROR in enter_exit: $@"; 2865 error "ERROR in enter_exit: $@";
2716 $self->leave_link; 2866 $self->leave_link;
2717 } 2867 }
2718 })->prio (1); 2868 })->prio (1);
2719} 2869}
2720 2870
2732sub cf::client::send_drawinfo { 2882sub cf::client::send_drawinfo {
2733 my ($self, $text, $flags) = @_; 2883 my ($self, $text, $flags) = @_;
2734 2884
2735 utf8::encode $text; 2885 utf8::encode $text;
2736 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2886 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2887}
2888
2889=item $client->send_big_packet ($pkt)
2890
2891Like C<send_packet>, but tries to compress large packets, and fragments
2892them as required.
2893
2894=cut
2895
2896our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2897
2898sub cf::client::send_big_packet {
2899 my ($self, $pkt) = @_;
2900
2901 # try lzf for large packets
2902 $pkt = "lzf " . Compress::LZF::compress $pkt
2903 if 1024 <= length $pkt and $self->{can_lzf};
2904
2905 # split very large packets
2906 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2907 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2908 $pkt = "frag";
2909 }
2910
2911 $self->send_packet ($pkt);
2737} 2912}
2738 2913
2739=item $client->send_msg ($channel, $msg, $color, [extra...]) 2914=item $client->send_msg ($channel, $msg, $color, [extra...])
2740 2915
2741Send a drawinfo or msg packet to the client, formatting the msg for the 2916Send a drawinfo or msg packet to the client, formatting the msg for the
2745 2920
2746=cut 2921=cut
2747 2922
2748# non-persistent channels (usually the info channel) 2923# non-persistent channels (usually the info channel)
2749our %CHANNEL = ( 2924our %CHANNEL = (
2925 "c/motd" => {
2926 id => "infobox",
2927 title => "MOTD",
2928 reply => undef,
2929 tooltip => "The message of the day",
2930 },
2750 "c/identify" => { 2931 "c/identify" => {
2751 id => "infobox", 2932 id => "infobox",
2752 title => "Identify", 2933 title => "Identify",
2753 reply => undef, 2934 reply => undef,
2754 tooltip => "Items recently identified", 2935 tooltip => "Items recently identified",
2756 "c/examine" => { 2937 "c/examine" => {
2757 id => "infobox", 2938 id => "infobox",
2758 title => "Examine", 2939 title => "Examine",
2759 reply => undef, 2940 reply => undef,
2760 tooltip => "Signs and other items you examined", 2941 tooltip => "Signs and other items you examined",
2942 },
2943 "c/shopinfo" => {
2944 id => "infobox",
2945 title => "Shop Info",
2946 reply => undef,
2947 tooltip => "What your bargaining skill tells you about the shop",
2761 }, 2948 },
2762 "c/book" => { 2949 "c/book" => {
2763 id => "infobox", 2950 id => "infobox",
2764 title => "Book", 2951 title => "Book",
2765 reply => undef, 2952 reply => undef,
2881 my $pkt = "msg " 3068 my $pkt = "msg "
2882 . $self->{json_coder}->encode ( 3069 . $self->{json_coder}->encode (
2883 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3070 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2884 ); 3071 );
2885 3072
2886 # try lzf for large packets
2887 $pkt = "lzf " . Compress::LZF::compress $pkt
2888 if 1024 <= length $pkt and $self->{can_lzf};
2889
2890 # split very large packets
2891 if (8192 < length $pkt and $self->{can_lzf}) {
2892 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2893 $pkt = "frag";
2894 }
2895
2896 $self->send_packet ($pkt); 3073 $self->send_big_packet ($pkt);
2897} 3074}
2898 3075
2899=item $client->ext_msg ($type, @msg) 3076=item $client->ext_msg ($type, @msg)
2900 3077
2901Sends an ext event to the client. 3078Sends an ext event to the client.
2904 3081
2905sub cf::client::ext_msg($$@) { 3082sub cf::client::ext_msg($$@) {
2906 my ($self, $type, @msg) = @_; 3083 my ($self, $type, @msg) = @_;
2907 3084
2908 if ($self->extcmd == 2) { 3085 if ($self->extcmd == 2) {
2909 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3086 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2910 } elsif ($self->extcmd == 1) { # TODO: remove 3087 } elsif ($self->extcmd == 1) { # TODO: remove
2911 push @msg, msgtype => "event_$type"; 3088 push @msg, msgtype => "event_$type";
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3089 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2913 } 3090 }
2914} 3091}
2915 3092
2916=item $client->ext_reply ($msgid, @msg) 3093=item $client->ext_reply ($msgid, @msg)
2917 3094
2921 3098
2922sub cf::client::ext_reply($$@) { 3099sub cf::client::ext_reply($$@) {
2923 my ($self, $id, @msg) = @_; 3100 my ($self, $id, @msg) = @_;
2924 3101
2925 if ($self->extcmd == 2) { 3102 if ($self->extcmd == 2) {
2926 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3103 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2927 } elsif ($self->extcmd == 1) { 3104 } elsif ($self->extcmd == 1) {
2928 #TODO: version 1, remove 3105 #TODO: version 1, remove
2929 unshift @msg, msgtype => "reply", msgid => $id; 3106 unshift @msg, msgtype => "reply", msgid => $id;
2930 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3107 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2931 } 3108 }
2932} 3109}
2933 3110
2934=item $success = $client->query ($flags, "text", \&cb) 3111=item $success = $client->query ($flags, "text", \&cb)
2935 3112
3006 3183
3007 $ns->ext_reply ($reply, @reply) 3184 $ns->ext_reply ($reply, @reply)
3008 if $reply; 3185 if $reply;
3009 3186
3010 } else { 3187 } else {
3011 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3188 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3012 } 3189 }
3013 3190
3014 cf::override; 3191 cf::override;
3015 }, 3192 },
3016); 3193);
3036 3213
3037 $coro 3214 $coro
3038} 3215}
3039 3216
3040cf::client->attach ( 3217cf::client->attach (
3041 on_destroy => sub { 3218 on_client_destroy => sub {
3042 my ($ns) = @_; 3219 my ($ns) = @_;
3043 3220
3044 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3221 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3045 }, 3222 },
3046); 3223);
3062our $safe_hole = new Safe::Hole; 3239our $safe_hole = new Safe::Hole;
3063 3240
3064$SIG{FPE} = 'IGNORE'; 3241$SIG{FPE} = 'IGNORE';
3065 3242
3066$safe->permit_only (Opcode::opset qw( 3243$safe->permit_only (Opcode::opset qw(
3067 :base_core :base_mem :base_orig :base_math 3244 :base_core :base_mem :base_orig :base_math :base_loop
3068 grepstart grepwhile mapstart mapwhile 3245 grepstart grepwhile mapstart mapwhile
3069 sort time 3246 sort time
3070)); 3247));
3071 3248
3072# here we export the classes and methods available to script code 3249# here we export the classes and methods available to script code
3124 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3301 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3125 $qcode =~ s/\n/\\n/g; 3302 $qcode =~ s/\n/\\n/g;
3126 3303
3127 %vars = (_dummy => 0) unless %vars; 3304 %vars = (_dummy => 0) unless %vars;
3128 3305
3306 my @res;
3129 local $_; 3307 local $_;
3130 local @safe::cf::_safe_eval_args = values %vars;
3131 3308
3132 my $eval = 3309 my $eval =
3133 "do {\n" 3310 "do {\n"
3134 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3311 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3135 . "#line 0 \"{$qcode}\"\n" 3312 . "#line 0 \"{$qcode}\"\n"
3136 . $code 3313 . $code
3137 . "\n}" 3314 . "\n}"
3138 ; 3315 ;
3139 3316
3317 if ($CFG{safe_eval}) {
3140 sub_generation_inc; 3318 sub_generation_inc;
3319 local @safe::cf::_safe_eval_args = values %vars;
3141 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3320 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3142 sub_generation_inc; 3321 sub_generation_inc;
3322 } else {
3323 local @cf::_safe_eval_args = values %vars;
3324 @res = wantarray ? eval eval : scalar eval $eval;
3325 }
3143 3326
3144 if ($@) { 3327 if ($@) {
3145 warn "$@"; 3328 warn "$@",
3146 warn "while executing safe code '$code'\n"; 3329 "while executing safe code '$code'\n",
3147 warn "with arguments " . (join " ", %vars) . "\n"; 3330 "with arguments " . (join " ", %vars) . "\n";
3148 } 3331 }
3149 3332
3150 wantarray ? @res : $res[0] 3333 wantarray ? @res : $res[0]
3151} 3334}
3152 3335
3166=cut 3349=cut
3167 3350
3168sub register_script_function { 3351sub register_script_function {
3169 my ($fun, $cb) = @_; 3352 my ($fun, $cb) = @_;
3170 3353
3171 no strict 'refs'; 3354 $fun = "safe::$fun" if $CFG{safe_eval};
3172 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3355 *$fun = $safe_hole->wrap ($cb);
3173} 3356}
3174 3357
3175=back 3358=back
3176 3359
3177=cut 3360=cut
3186 # for this (global event?) 3369 # for this (global event?)
3187 %ext::player_env::MUSIC_FACE_CACHE = (); 3370 %ext::player_env::MUSIC_FACE_CACHE = ();
3188 3371
3189 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3372 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3190 3373
3191 warn "loading facedata from $path\n"; 3374 trace "loading facedata from $path\n";
3192 3375
3193 my $facedata; 3376 my $facedata;
3194 0 < aio_load $path, $facedata 3377 0 < aio_load $path, $facedata
3195 or die "$path: $!"; 3378 or die "$path: $!";
3196 3379
3198 3381
3199 $facedata->{version} == 2 3382 $facedata->{version} == 2
3200 or cf::cleanup "$path: version mismatch, cannot proceed."; 3383 or cf::cleanup "$path: version mismatch, cannot proceed.";
3201 3384
3202 # patch in the exptable 3385 # patch in the exptable
3386 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3203 $facedata->{resource}{"res/exp_table"} = { 3387 $facedata->{resource}{"res/exp_table"} = {
3204 type => FT_RSRC, 3388 type => FT_RSRC,
3205 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3389 data => $exp_table,
3390 hash => (Digest::MD5::md5 $exp_table),
3206 }; 3391 };
3207 cf::cede_to_tick; 3392 cf::cede_to_tick;
3208 3393
3209 { 3394 {
3210 my $faces = $facedata->{faceinfo}; 3395 my $faces = $facedata->{faceinfo};
3212 while (my ($face, $info) = each %$faces) { 3397 while (my ($face, $info) = each %$faces) {
3213 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3398 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3214 3399
3215 cf::face::set_visibility $idx, $info->{visibility}; 3400 cf::face::set_visibility $idx, $info->{visibility};
3216 cf::face::set_magicmap $idx, $info->{magicmap}; 3401 cf::face::set_magicmap $idx, $info->{magicmap};
3217 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3402 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3218 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3403 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3219 3404
3220 cf::cede_to_tick; 3405 cf::cede_to_tick;
3221 } 3406 }
3222 3407
3223 while (my ($face, $info) = each %$faces) { 3408 while (my ($face, $info) = each %$faces) {
3228 3413
3229 if (my $smooth = cf::face::find $info->{smooth}) { 3414 if (my $smooth = cf::face::find $info->{smooth}) {
3230 cf::face::set_smooth $idx, $smooth; 3415 cf::face::set_smooth $idx, $smooth;
3231 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3416 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3232 } else { 3417 } else {
3233 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3418 error "smooth face '$info->{smooth}' not found for face '$face'";
3234 } 3419 }
3235 3420
3236 cf::cede_to_tick; 3421 cf::cede_to_tick;
3237 } 3422 }
3238 } 3423 }
3247 3432
3248 cf::anim::invalidate_all; # d'oh 3433 cf::anim::invalidate_all; # d'oh
3249 } 3434 }
3250 3435
3251 { 3436 {
3252 # TODO: for gcfclient pleasure, we should give resources
3253 # that gcfclient doesn't grok a >10000 face index.
3254 my $res = $facedata->{resource}; 3437 my $res = $facedata->{resource};
3255 3438
3256 while (my ($name, $info) = each %$res) { 3439 while (my ($name, $info) = each %$res) {
3257 if (defined $info->{type}) { 3440 if (defined $info->{type}) {
3258 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3441 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3259 my $data;
3260 3442
3261 if ($info->{type} & 1) { 3443 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3262 # prepend meta info
3263
3264 my $meta = $enc->encode ({
3265 name => $name,
3266 %{ $info->{meta} || {} },
3267 });
3268
3269 $data = pack "(w/a*)*", $meta, $info->{data};
3270 } else {
3271 $data = $info->{data};
3272 }
3273
3274 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3275 cf::face::set_type $idx, $info->{type}; 3444 cf::face::set_type $idx, $info->{type};
3276 } else { 3445 } else {
3277 $RESOURCE{$name} = $info; 3446 $RESOURCE{$name} = $info; # unused
3278 } 3447 }
3279 3448
3280 cf::cede_to_tick; 3449 cf::cede_to_tick;
3281 } 3450 }
3282 } 3451 }
3283 3452
3284 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3453 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3285 3454
3286 1 3455 1
3287} 3456}
3288
3289cf::global->attach (on_resource_update => sub {
3290 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3291 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3292
3293 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3294 my $sound = $soundconf->{compat}[$_]
3295 or next;
3296
3297 my $face = cf::face::find "sound/$sound->[1]";
3298 cf::sound::set $sound->[0] => $face;
3299 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3300 }
3301
3302 while (my ($k, $v) = each %{$soundconf->{event}}) {
3303 my $face = cf::face::find "sound/$v";
3304 cf::sound::set $k => $face;
3305 }
3306 }
3307});
3308 3457
3309register_exticmd fx_want => sub { 3458register_exticmd fx_want => sub {
3310 my ($ns, $want) = @_; 3459 my ($ns, $want) = @_;
3311 3460
3312 while (my ($k, $v) = each %$want) { 3461 while (my ($k, $v) = each %$want) {
3351sub reload_treasures { 3500sub reload_treasures {
3352 load_resource_file "$DATADIR/treasures" 3501 load_resource_file "$DATADIR/treasures"
3353 or die "unable to load treasurelists\n"; 3502 or die "unable to load treasurelists\n";
3354} 3503}
3355 3504
3505sub reload_sound {
3506 trace "loading sound config from $DATADIR/sound\n";
3507
3508 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3509 or die "$DATADIR/sound $!";
3510
3511 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3512
3513 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3514 my $sound = $soundconf->{compat}[$_]
3515 or next;
3516
3517 my $face = cf::face::find "sound/$sound->[1]";
3518 cf::sound::set $sound->[0] => $face;
3519 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3520 }
3521
3522 while (my ($k, $v) = each %{$soundconf->{event}}) {
3523 my $face = cf::face::find "sound/$v";
3524 cf::sound::set $k => $face;
3525 }
3526}
3527
3356sub reload_resources { 3528sub reload_resources {
3357 warn "reloading resource files...\n"; 3529 trace "reloading resource files...\n";
3358 3530
3359 reload_facedata; 3531 reload_facedata;
3532 reload_sound;
3360 reload_archetypes; 3533 reload_archetypes;
3361 reload_regions; 3534 reload_regions;
3362 reload_treasures; 3535 reload_treasures;
3363 3536
3364 warn "finished reloading resource files\n"; 3537 trace "finished reloading resource files\n";
3365} 3538}
3366 3539
3367sub reload_config { 3540sub reload_config {
3541 trace "reloading config file...\n";
3542
3368 open my $fh, "<:utf8", "$CONFDIR/config" 3543 open my $fh, "<:utf8", "$CONFDIR/config"
3369 or return; 3544 or return;
3370 3545
3371 local $/; 3546 local $/;
3372 *CFG = YAML::Load <$fh>; 3547 *CFG = YAML::XS::Load scalar <$fh>;
3373 3548
3374 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3549 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3375 3550
3376 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3551 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3377 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3552 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3378 3553
3379 if (exists $CFG{mlockall}) { 3554 if (exists $CFG{mlockall}) {
3381 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3556 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3382 and die "WARNING: m(un)lockall failed: $!\n"; 3557 and die "WARNING: m(un)lockall failed: $!\n";
3383 }; 3558 };
3384 warn $@ if $@; 3559 warn $@ if $@;
3385 } 3560 }
3561
3562 trace "finished reloading resource files\n";
3386} 3563}
3387 3564
3388sub pidfile() { 3565sub pidfile() {
3389 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3566 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3390 or die "$PIDFILE: $!"; 3567 or die "$PIDFILE: $!";
3403 seek $fh, 0, 0; 3580 seek $fh, 0, 0;
3404 print $fh $$; 3581 print $fh $$;
3405} 3582}
3406 3583
3407sub main_loop { 3584sub main_loop {
3408 warn "EV::loop starting\n"; 3585 trace "EV::loop starting\n";
3409 if (1) { 3586 if (1) {
3410 EV::loop; 3587 EV::loop;
3411 } 3588 }
3412 warn "EV::loop returned\n"; 3589 trace "EV::loop returned\n";
3413 goto &main_loop unless $REALLY_UNLOOP; 3590 goto &main_loop unless $REALLY_UNLOOP;
3414} 3591}
3415 3592
3416sub main { 3593sub main {
3417 cf::init_globals; # initialise logging 3594 cf::init_globals; # initialise logging
3418 3595
3419 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3596 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3420 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3597 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3421 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3598 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3422 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3599 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3423
3424 cf::init_experience;
3425 cf::init_anim;
3426 cf::init_attackmess;
3427 cf::init_dynamic;
3428 3600
3429 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3601 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3430 3602
3431 # we must not ever block the main coroutine 3603 # we must not ever block the main coroutine
3432 local $Coro::idle = sub { 3604 local $Coro::idle = sub {
3438 }; 3610 };
3439 3611
3440 evthread_start IO::AIO::poll_fileno; 3612 evthread_start IO::AIO::poll_fileno;
3441 3613
3442 cf::sync_job { 3614 cf::sync_job {
3615 cf::init_experience;
3616 cf::init_anim;
3617 cf::init_attackmess;
3618 cf::init_dynamic;
3619
3620 cf::load_settings;
3621 cf::load_materials;
3622
3443 reload_resources; 3623 reload_resources;
3444 reload_config; 3624 reload_config;
3445 db_init; 3625 db_init;
3446 3626
3447 cf::load_settings;
3448 cf::load_materials;
3449 cf::init_uuid; 3627 cf::init_uuid;
3450 cf::init_signals; 3628 cf::init_signals;
3451 cf::init_commands;
3452 cf::init_skills; 3629 cf::init_skills;
3453 3630
3454 cf::init_beforeplay; 3631 cf::init_beforeplay;
3455 3632
3456 atomic; 3633 atomic;
3463 use POSIX (); 3640 use POSIX ();
3464 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3641 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3465 3642
3466 (pop @POST_INIT)->(0) while @POST_INIT; 3643 (pop @POST_INIT)->(0) while @POST_INIT;
3467 }; 3644 };
3645
3646 cf::object::thawer::errors_are_fatal 0;
3647 info "parse errors in files are no longer fatal from this point on.\n";
3468 3648
3469 main_loop; 3649 main_loop;
3470} 3650}
3471 3651
3472############################################################################# 3652#############################################################################
3474 3654
3475# install some emergency cleanup handlers 3655# install some emergency cleanup handlers
3476BEGIN { 3656BEGIN {
3477 our %SIGWATCHER = (); 3657 our %SIGWATCHER = ();
3478 for my $signal (qw(INT HUP TERM)) { 3658 for my $signal (qw(INT HUP TERM)) {
3479 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3659 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3480 cf::cleanup "SIG$signal"; 3660 cf::cleanup "SIG$signal";
3481 }; 3661 };
3482 } 3662 }
3483} 3663}
3484 3664
3485sub write_runtime_sync { 3665sub write_runtime_sync {
3666 my $t0 = AE::time;
3667
3486 # first touch the runtime file to show we are still running: 3668 # first touch the runtime file to show we are still running:
3487 # the fsync below can take a very very long time. 3669 # the fsync below can take a very very long time.
3488 3670
3489 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3671 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3490 3672
3491 my $guard = cf::lock_acquire "write_runtime"; 3673 my $guard = cf::lock_acquire "write_runtime";
3492 3674
3493 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3675 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3494 or return; 3676 or return;
3495 3677
3496 my $value = $cf::RUNTIME + 90 + 10; 3678 my $value = $cf::RUNTIME + 90 + 10;
3497 # 10 is the runtime save interval, for a monotonic clock 3679 # 10 is the runtime save interval, for a monotonic clock
3498 # 60 allows for the watchdog to kill the server. 3680 # 60 allows for the watchdog to kill the server.
3511 or return; 3693 or return;
3512 3694
3513 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3695 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3514 and return; 3696 and return;
3515 3697
3516 warn "runtime file written.\n"; 3698 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3517 3699
3518 1 3700 1
3519} 3701}
3520 3702
3521our $uuid_lock; 3703our $uuid_lock;
3533 or return; 3715 or return;
3534 3716
3535 my $value = uuid_seq uuid_cur; 3717 my $value = uuid_seq uuid_cur;
3536 3718
3537 unless ($value) { 3719 unless ($value) {
3538 warn "cowardly refusing to write zero uuid value!\n"; 3720 info "cowardly refusing to write zero uuid value!\n";
3539 return; 3721 return;
3540 } 3722 }
3541 3723
3542 my $value = uuid_str $value + $uuid_skip; 3724 my $value = uuid_str $value + $uuid_skip;
3543 $uuid_skip = 0; 3725 $uuid_skip = 0;
3553 or return; 3735 or return;
3554 3736
3555 aio_rename "$uuid~", $uuid 3737 aio_rename "$uuid~", $uuid
3556 and return; 3738 and return;
3557 3739
3558 warn "uuid file written ($value).\n"; 3740 trace "uuid file written ($value).\n";
3559 3741
3560 1 3742 1
3561 3743
3562} 3744}
3563 3745
3569} 3751}
3570 3752
3571sub emergency_save() { 3753sub emergency_save() {
3572 my $freeze_guard = cf::freeze_mainloop; 3754 my $freeze_guard = cf::freeze_mainloop;
3573 3755
3574 warn "emergency_perl_save: enter\n"; 3756 info "emergency_perl_save: enter\n";
3757
3758 # this is a trade-off: we want to be very quick here, so
3759 # save all maps without fsync, and later call a global sync
3760 # (which in turn might be very very slow)
3761 local $USE_FSYNC = 0;
3575 3762
3576 cf::sync_job { 3763 cf::sync_job {
3577 # this is a trade-off: we want to be very quick here, so 3764 cf::write_runtime_sync; # external watchdog should not bark
3578 # save all maps without fsync, and later call a global sync
3579 # (which in turn might be very very slow)
3580 local $USE_FSYNC = 0;
3581 3765
3582 # use a peculiar iteration method to avoid tripping on perl 3766 # use a peculiar iteration method to avoid tripping on perl
3583 # refcount bugs in for. also avoids problems with players 3767 # refcount bugs in for. also avoids problems with players
3584 # and maps saved/destroyed asynchronously. 3768 # and maps saved/destroyed asynchronously.
3585 warn "emergency_perl_save: begin player save\n"; 3769 info "emergency_perl_save: begin player save\n";
3586 for my $login (keys %cf::PLAYER) { 3770 for my $login (keys %cf::PLAYER) {
3587 my $pl = $cf::PLAYER{$login} or next; 3771 my $pl = $cf::PLAYER{$login} or next;
3588 $pl->valid or next; 3772 $pl->valid or next;
3589 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3773 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3590 $pl->save; 3774 $pl->save;
3591 } 3775 }
3592 warn "emergency_perl_save: end player save\n"; 3776 info "emergency_perl_save: end player save\n";
3593 3777
3778 cf::write_runtime_sync; # external watchdog should not bark
3779
3594 warn "emergency_perl_save: begin map save\n"; 3780 info "emergency_perl_save: begin map save\n";
3595 for my $path (keys %cf::MAP) { 3781 for my $path (keys %cf::MAP) {
3596 my $map = $cf::MAP{$path} or next; 3782 my $map = $cf::MAP{$path} or next;
3597 $map->valid or next; 3783 $map->valid or next;
3598 $map->save; 3784 $map->save;
3599 } 3785 }
3600 warn "emergency_perl_save: end map save\n"; 3786 info "emergency_perl_save: end map save\n";
3601 3787
3788 cf::write_runtime_sync; # external watchdog should not bark
3789
3602 warn "emergency_perl_save: begin database checkpoint\n"; 3790 info "emergency_perl_save: begin database checkpoint\n";
3603 BDB::db_env_txn_checkpoint $DB_ENV; 3791 BDB::db_env_txn_checkpoint $DB_ENV;
3604 warn "emergency_perl_save: end database checkpoint\n"; 3792 info "emergency_perl_save: end database checkpoint\n";
3605 3793
3606 warn "emergency_perl_save: begin write uuid\n"; 3794 info "emergency_perl_save: begin write uuid\n";
3607 write_uuid_sync 1; 3795 write_uuid_sync 1;
3608 warn "emergency_perl_save: end write uuid\n"; 3796 info "emergency_perl_save: end write uuid\n";
3797
3798 cf::write_runtime_sync; # external watchdog should not bark
3799
3800 trace "emergency_perl_save: syncing database to disk";
3801 BDB::db_env_txn_checkpoint $DB_ENV;
3802
3803 info "emergency_perl_save: starting sync\n";
3804 IO::AIO::aio_sync sub {
3805 info "emergency_perl_save: finished sync\n";
3806 };
3807
3808 cf::write_runtime_sync; # external watchdog should not bark
3809
3810 trace "emergency_perl_save: flushing outstanding aio requests";
3811 while (IO::AIO::nreqs || BDB::nreqs) {
3812 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3813 }
3814
3815 cf::write_runtime_sync; # external watchdog should not bark
3609 }; 3816 };
3610 3817
3611 warn "emergency_perl_save: starting sync()\n";
3612 IO::AIO::aio_sync sub {
3613 warn "emergency_perl_save: finished sync()\n";
3614 };
3615
3616 warn "emergency_perl_save: leave\n"; 3818 info "emergency_perl_save: leave\n";
3617} 3819}
3618 3820
3619sub post_cleanup { 3821sub post_cleanup {
3620 my ($make_core) = @_; 3822 my ($make_core) = @_;
3621 3823
3824 IO::AIO::flush;
3825
3622 warn Carp::longmess "post_cleanup backtrace" 3826 error Carp::longmess "post_cleanup backtrace"
3623 if $make_core; 3827 if $make_core;
3624 3828
3625 my $fh = pidfile; 3829 my $fh = pidfile;
3626 unlink $PIDFILE if <$fh> == $$; 3830 unlink $PIDFILE if <$fh> == $$;
3627} 3831}
3647 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3851 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3648 for my $name (keys %$leaf_symtab) { 3852 for my $name (keys %$leaf_symtab) {
3649 _gv_clear *{"$pkg$name"}; 3853 _gv_clear *{"$pkg$name"};
3650# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3854# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3651 } 3855 }
3652 warn "cleared package $pkg\n";#d#
3653} 3856}
3654 3857
3655sub do_reload_perl() { 3858sub do_reload_perl() {
3656 # can/must only be called in main 3859 # can/must only be called in main
3657 if ($Coro::current != $Coro::main) { 3860 if (in_main) {
3658 warn "can only reload from main coroutine"; 3861 error "can only reload from main coroutine";
3659 return; 3862 return;
3660 } 3863 }
3661 3864
3662 return if $RELOAD++; 3865 return if $RELOAD++;
3663 3866
3664 my $t1 = EV::time; 3867 my $t1 = AE::time;
3665 3868
3666 while ($RELOAD) { 3869 while ($RELOAD) {
3667 warn "reloading..."; 3870 info "reloading...";
3668 3871
3669 warn "entering sync_job"; 3872 trace "entering sync_job";
3670 3873
3671 cf::sync_job { 3874 cf::sync_job {
3672 cf::write_runtime_sync; # external watchdog should not bark
3673 cf::emergency_save; 3875 cf::emergency_save;
3674 cf::write_runtime_sync; # external watchdog should not bark
3675 3876
3676 warn "syncing database to disk";
3677 BDB::db_env_txn_checkpoint $DB_ENV;
3678
3679 # if anything goes wrong in here, we should simply crash as we already saved
3680
3681 warn "flushing outstanding aio requests";
3682 while (IO::AIO::nreqs || BDB::nreqs) {
3683 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3684 }
3685
3686 warn "cancelling all extension coros"; 3877 trace "cancelling all extension coros";
3687 $_->cancel for values %EXT_CORO; 3878 $_->cancel for values %EXT_CORO;
3688 %EXT_CORO = (); 3879 %EXT_CORO = ();
3689 3880
3690 warn "removing commands"; 3881 trace "removing commands";
3691 %COMMAND = (); 3882 %COMMAND = ();
3692 3883
3693 warn "removing ext/exti commands"; 3884 trace "removing ext/exti commands";
3694 %EXTCMD = (); 3885 %EXTCMD = ();
3695 %EXTICMD = (); 3886 %EXTICMD = ();
3696 3887
3697 warn "unloading/nuking all extensions"; 3888 trace "unloading/nuking all extensions";
3698 for my $pkg (@EXTS) { 3889 for my $pkg (@EXTS) {
3699 warn "... unloading $pkg"; 3890 trace "... unloading $pkg";
3700 3891
3701 if (my $cb = $pkg->can ("unload")) { 3892 if (my $cb = $pkg->can ("unload")) {
3702 eval { 3893 eval {
3703 $cb->($pkg); 3894 $cb->($pkg);
3704 1 3895 1
3705 } or warn "$pkg unloaded, but with errors: $@"; 3896 } or error "$pkg unloaded, but with errors: $@";
3706 } 3897 }
3707 3898
3708 warn "... clearing $pkg"; 3899 trace "... clearing $pkg";
3709 clear_package $pkg; 3900 clear_package $pkg;
3710 } 3901 }
3711 3902
3712 warn "unloading all perl modules loaded from $LIBDIR"; 3903 trace "unloading all perl modules loaded from $LIBDIR";
3713 while (my ($k, $v) = each %INC) { 3904 while (my ($k, $v) = each %INC) {
3714 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3905 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3715 3906
3716 warn "... unloading $k"; 3907 trace "... unloading $k";
3717 delete $INC{$k}; 3908 delete $INC{$k};
3718 3909
3719 $k =~ s/\.pm$//; 3910 $k =~ s/\.pm$//;
3720 $k =~ s/\//::/g; 3911 $k =~ s/\//::/g;
3721 3912
3724 } 3915 }
3725 3916
3726 clear_package $k; 3917 clear_package $k;
3727 } 3918 }
3728 3919
3729 warn "getting rid of safe::, as good as possible"; 3920 trace "getting rid of safe::, as good as possible";
3730 clear_package "safe::$_" 3921 clear_package "safe::$_"
3731 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3922 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3732 3923
3733 warn "unloading cf.pm \"a bit\""; 3924 trace "unloading cf.pm \"a bit\"";
3734 delete $INC{"cf.pm"}; 3925 delete $INC{"cf.pm"};
3735 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3926 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3736 3927
3737 # don't, removes xs symbols, too, 3928 # don't, removes xs symbols, too,
3738 # and global variables created in xs 3929 # and global variables created in xs
3739 #clear_package __PACKAGE__; 3930 #clear_package __PACKAGE__;
3740 3931
3741 warn "unload completed, starting to reload now"; 3932 info "unload completed, starting to reload now";
3742 3933
3743 warn "reloading cf.pm"; 3934 trace "reloading cf.pm";
3744 require cf; 3935 require cf;
3745 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3936 cf::_connect_to_perl_1;
3746 3937
3747 warn "loading config and database again"; 3938 trace "loading config and database again";
3748 cf::reload_config; 3939 cf::reload_config;
3749 3940
3750 warn "loading extensions"; 3941 trace "loading extensions";
3751 cf::load_extensions; 3942 cf::load_extensions;
3752 3943
3753 if ($REATTACH_ON_RELOAD) { 3944 if ($REATTACH_ON_RELOAD) {
3754 warn "reattaching attachments to objects/players"; 3945 trace "reattaching attachments to objects/players";
3755 _global_reattach; # objects, sockets 3946 _global_reattach; # objects, sockets
3756 warn "reattaching attachments to maps"; 3947 trace "reattaching attachments to maps";
3757 reattach $_ for values %MAP; 3948 reattach $_ for values %MAP;
3758 warn "reattaching attachments to players"; 3949 trace "reattaching attachments to players";
3759 reattach $_ for values %PLAYER; 3950 reattach $_ for values %PLAYER;
3760 } 3951 }
3761 3952
3762 warn "running post_init jobs"; 3953 trace "running post_init jobs";
3763 (pop @POST_INIT)->(1) while @POST_INIT; 3954 (pop @POST_INIT)->(1) while @POST_INIT;
3764 3955
3765 warn "leaving sync_job"; 3956 trace "leaving sync_job";
3766 3957
3767 1 3958 1
3768 } or do { 3959 } or do {
3769 warn $@; 3960 error $@;
3770 cf::cleanup "error while reloading, exiting."; 3961 cf::cleanup "error while reloading, exiting.";
3771 }; 3962 };
3772 3963
3773 warn "reloaded"; 3964 info "reloaded";
3774 --$RELOAD; 3965 --$RELOAD;
3775 } 3966 }
3776 3967
3777 $t1 = EV::time - $t1; 3968 $t1 = AE::time - $t1;
3778 warn "reload completed in ${t1}s\n"; 3969 info "reload completed in ${t1}s\n";
3779}; 3970};
3780 3971
3781our $RELOAD_WATCHER; # used only during reload 3972our $RELOAD_WATCHER; # used only during reload
3782 3973
3783sub reload_perl() { 3974sub reload_perl() {
3785 # coro crashes during coro_state_free->destroy here. 3976 # coro crashes during coro_state_free->destroy here.
3786 3977
3787 $RELOAD_WATCHER ||= cf::async { 3978 $RELOAD_WATCHER ||= cf::async {
3788 Coro::AIO::aio_wait cache_extensions; 3979 Coro::AIO::aio_wait cache_extensions;
3789 3980
3790 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3981 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3791 do_reload_perl; 3982 do_reload_perl;
3792 undef $RELOAD_WATCHER; 3983 undef $RELOAD_WATCHER;
3793 }; 3984 };
3794 }; 3985 };
3795} 3986}
3812 4003
3813our @WAIT_FOR_TICK; 4004our @WAIT_FOR_TICK;
3814our @WAIT_FOR_TICK_BEGIN; 4005our @WAIT_FOR_TICK_BEGIN;
3815 4006
3816sub wait_for_tick { 4007sub wait_for_tick {
3817 return if tick_inhibit || $Coro::current == $Coro::main; 4008 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3818 4009
3819 my $signal = new Coro::Signal; 4010 my $signal = new Coro::Signal;
3820 push @WAIT_FOR_TICK, $signal; 4011 push @WAIT_FOR_TICK, $signal;
3821 $signal->wait; 4012 $signal->wait;
3822} 4013}
3823 4014
3824sub wait_for_tick_begin { 4015sub wait_for_tick_begin {
3825 return if tick_inhibit || $Coro::current == $Coro::main; 4016 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3826 4017
3827 my $signal = new Coro::Signal; 4018 my $signal = new Coro::Signal;
3828 push @WAIT_FOR_TICK_BEGIN, $signal; 4019 push @WAIT_FOR_TICK_BEGIN, $signal;
3829 $signal->wait; 4020 $signal->wait;
3830} 4021}
3836 return; 4027 return;
3837 } 4028 }
3838 4029
3839 cf::server_tick; # one server iteration 4030 cf::server_tick; # one server iteration
3840 4031
4032 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4033
3841 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4034 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3842 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4035 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3843 Coro::async_pool { 4036 Coro::async_pool {
3844 $Coro::current->{desc} = "runtime saver"; 4037 $Coro::current->{desc} = "runtime saver";
3845 write_runtime_sync 4038 write_runtime_sync
3846 or warn "ERROR: unable to write runtime file: $!"; 4039 or error "ERROR: unable to write runtime file: $!";
3847 }; 4040 };
3848 } 4041 }
3849 4042
3850 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4043 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3851 $sig->send; 4044 $sig->send;
3859 4052
3860 if (0) { 4053 if (0) {
3861 if ($NEXT_TICK) { 4054 if ($NEXT_TICK) {
3862 my $jitter = $TICK_START - $NEXT_TICK; 4055 my $jitter = $TICK_START - $NEXT_TICK;
3863 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4056 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3864 warn "jitter $JITTER\n";#d# 4057 debug "jitter $JITTER\n";#d#
3865 } 4058 }
3866 } 4059 }
3867} 4060}
3868 4061
3869{ 4062{
3870 # configure BDB 4063 # configure BDB
3871 4064
3872 BDB::min_parallel 8; 4065 BDB::min_parallel 16;
3873 BDB::max_poll_reqs $TICK * 0.1; 4066 BDB::max_poll_reqs $TICK * 0.1;
3874 $AnyEvent::BDB::WATCHER->priority (1); 4067 $AnyEvent::BDB::WATCHER->priority (1);
3875 4068
3876 unless ($DB_ENV) { 4069 unless ($DB_ENV) {
3877 $DB_ENV = BDB::db_env_create; 4070 $DB_ENV = BDB::db_env_create;
3958 } 4151 }
3959} 4152}
3960 4153
3961# load additional modules 4154# load additional modules
3962require "cf/$_.pm" for @EXTRA_MODULES; 4155require "cf/$_.pm" for @EXTRA_MODULES;
4156cf::_connect_to_perl_2;
3963 4157
3964END { cf::emergency_save } 4158END { cf::emergency_save }
3965 4159
39661 41601
3967 4161

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines