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

Diff Legend

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