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.526 by root, Wed Apr 21 05:48:35 2010 UTC vs.
Revision 1.559 by root, Sat Feb 26 12:50:27 2011 UTC

… …
20# 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>
21# 21#
22 22
23package cf; 23package cf;
24 24
25use 5.10.0; 25use common::sense;
26use utf8;
27use strict qw(vars subs);
28 26
29use Symbol; 27use Symbol;
30use List::Util; 28use List::Util;
31use Socket; 29use Socket;
32use EV; 30use EV;
… …
78# strictly for debugging 76# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80 78
81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82 80
81our @ORIG_INC;
82
83our %COMMAND = (); 83our %COMMAND = ();
84our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
85 85
86our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 87our %EXTCMD = ();
… …
93our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS 94our @REFLECT; # set by XS
95our %REFLECT; # set by us 95our %REFLECT; # set by us
96 96
97our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
98our $DATADIR = datadir; 99our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
102our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 112
111our %RESOURCE; 113our %RESOURCE; # unused
112 114
113our $OUTPUT_RATE_MIN = 4000; 115our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 100000; 116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
115 120
116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
118our $NEXT_TICK; 123our $NEXT_TICK;
119our $USE_FSYNC = 1; # use fsync to write maps - default on 124our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
121our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
122our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
123our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
124our $DB_ENV; 129our $DB_ENV;
125 130
126our @EXTRA_MODULES = qw(pod match mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
127 132
128our %CFG; 133our %CFG;
129 134
130our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
131our $RUNTIME; 136our $RUNTIME;
… …
230from wherever your confdir points to. 235from wherever your confdir points to.
231 236
232=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
233 238
234These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 239These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
235returns directly I<after> the tick processing (and consequently, can only wake one process 240returns directly I<after> the tick processing (and consequently, can only wake one thread
236per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 241per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
237 247
238=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
239 249
240This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
241C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 251C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
… …
249 259
250=back 260=back
251 261
252=cut 262=cut
253 263
264sub error(@) { LOG llevError, join "", @_ }
265sub warn (@) { LOG llevWarn , join "", @_ }
266sub info (@) { LOG llevInfo , join "", @_ }
267sub debug(@) { LOG llevDebug, join "", @_ }
268sub trace(@) { LOG llevTrace, join "", @_ }
269
254$Coro::State::WARNHOOK = sub { 270$Coro::State::WARNHOOK = sub {
255 my $msg = join "", @_; 271 my $msg = join "", @_;
256 272
257 $msg .= "\n" 273 $msg .= "\n"
258 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
259 275
260 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 276 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
261 277
262 LOG llevError, $msg; 278 LOG llevWarn, $msg;
263}; 279};
264 280
265$Coro::State::DIEHOOK = sub { 281$Coro::State::DIEHOOK = sub {
266 return unless $^S eq 0; # "eq", not "==" 282 return unless $^S eq 0; # "eq", not "=="
267 283
268 warn Carp::longmess $_[0]; 284 error Carp::longmess $_[0];
269 285
270 if (in_main) {#d# 286 if (in_main) {#d#
271 warn "DIEHOOK called in main context, Coro bug?\n";#d# 287 error "DIEHOOK called in main context, Coro bug?\n";#d#
272 return;#d# 288 return;#d#
273 }#d# 289 }#d#
274 290
275 # kill coroutine otherwise 291 # kill coroutine otherwise
276 Coro::terminate 292 Coro::terminate
… …
343our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 359our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
344 360
345sub encode_json($) { $json_coder->encode ($_[0]) } 361sub encode_json($) { $json_coder->encode ($_[0]) }
346sub decode_json($) { $json_coder->decode ($_[0]) } 362sub decode_json($) { $json_coder->decode ($_[0]) }
347 363
364=item $ref = cf::yaml_load $scalar
365
366Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
367
368=cut
369
370sub fork_call(&@);
371
372sub yaml_load($) {
373 fork_call { YAML::XS::Load $_[0] } @_
374}
375
348=item cf::post_init { BLOCK } 376=item cf::post_init { BLOCK }
349 377
350Execute the given codeblock, I<after> all extensions have been (re-)loaded, 378Execute the given codeblock, I<after> all extensions have been (re-)loaded,
351but I<before> the server starts ticking again. 379but I<before> the server starts ticking again.
352 380
353The cdoeblock will have a single boolean argument to indicate whether this 381The codeblock will have a single boolean argument to indicate whether this
354is a reload or not. 382is a reload or not.
355 383
356=cut 384=cut
357 385
358sub post_init(&) { 386sub post_init(&) {
359 push @POST_INIT, shift; 387 push @POST_INIT, shift;
388}
389
390sub _post_init {
391 trace "running post_init jobs";
392
393 # run them in parallel...
394
395 my @join;
396
397 while () {
398 push @join, map &Coro::async ($_, 0), @POST_INIT;
399 @POST_INIT = ();
400
401 @join or last;
402
403 (pop @join)->join;
404 }
360} 405}
361 406
362=item cf::lock_wait $string 407=item cf::lock_wait $string
363 408
364Wait until the given lock is available. See cf::lock_acquire. 409Wait until the given lock is available. See cf::lock_acquire.
… …
509=cut 554=cut
510 555
511sub sync_job(&) { 556sub sync_job(&) {
512 my ($job) = @_; 557 my ($job) = @_;
513 558
514 if ($Coro::current == $Coro::main) { 559 if (in_main) {
515 my $time = AE::time; 560 my $time = AE::time;
516 561
517 # this is the main coro, too bad, we have to block 562 # this is the main coro, too bad, we have to block
518 # till the operation succeeds, freezing the server :/ 563 # till the operation succeeds, freezing the server :/
519 564
520 LOG llevError, Carp::longmess "sync job";#d# 565 #LOG llevError, Carp::longmess "sync job";#d#
521 566
522 my $freeze_guard = freeze_mainloop; 567 my $freeze_guard = freeze_mainloop;
523 568
524 my $busy = 1; 569 my $busy = 1;
525 my @res; 570 my @res;
526 571
527 (async { 572 (async {
528 $Coro::current->desc ("sync job coro"); 573 $Coro::current->desc ("sync job coro");
529 @res = eval { $job->() }; 574 @res = eval { $job->() };
530 warn $@ if $@; 575 error $@ if $@;
531 undef $busy; 576 undef $busy;
532 })->prio (Coro::PRIO_MAX); 577 })->prio (Coro::PRIO_MAX);
533 578
534 while ($busy) { 579 while ($busy) {
535 if (Coro::nready) { 580 if (Coro::nready) {
… …
569 $EXT_CORO{$coro+0} = $coro; 614 $EXT_CORO{$coro+0} = $coro;
570 615
571 $coro 616 $coro
572} 617}
573 618
574=item fork_call { }, $args 619=item fork_call { }, @args
575 620
576Executes the given code block with the given arguments in a seperate 621Executes the given code block with the given arguments in a seperate
577process, returning the results. Everything must be serialisable with 622process, returning the results. Everything must be serialisable with
578Coro::Storable. May, of course, block. Note that the executed sub may 623Coro::Storable. May, of course, block. Note that the executed sub may
579never block itself or use any form of event handling. 624never block itself or use any form of event handling.
580 625
581=cut 626=cut
582 627
628sub post_fork {
629 reset_signals;
630}
631
583sub fork_call(&@) { 632sub fork_call(&@) {
584 my ($cb, @args) = @_; 633 my ($cb, @args) = @_;
585 634
586 # we seemingly have to make a local copy of the whole thing, 635 # we seemingly have to make a local copy of the whole thing,
587 # otherwise perl prematurely frees the stuff :/ 636 # otherwise perl prematurely frees the stuff :/
588 # TODO: investigate and fix (likely this will be rather laborious) 637 # TODO: investigate and fix (likely this will be rather laborious)
589 638
590 my @res = Coro::Util::fork_eval { 639 my @res = Coro::Util::fork_eval {
591 reset_signals; 640 cf::post_fork;
592 &$cb 641 &$cb
593 }, @args; 642 } @args;
594 643
595 wantarray ? @res : $res[-1] 644 wantarray ? @res : $res[-1]
596} 645}
597 646
598sub objinfo { 647sub objinfo {
… …
648within each server. 697within each server.
649 698
650=cut 699=cut
651 700
652sub db_table($) { 701sub db_table($) {
702 cf::error "db_get called from main context"
703 if $Coro::current == $Coro::main;
704
653 my ($name) = @_; 705 my ($name) = @_;
654 my $db = BDB::db_create $DB_ENV; 706 my $db = BDB::db_create $DB_ENV;
655 707
656 eval { 708 eval {
657 $db->set_flags (BDB::CHKSUM); 709 $db->set_flags (BDB::CHKSUM);
… …
667} 719}
668 720
669our $DB; 721our $DB;
670 722
671sub db_init { 723sub db_init {
672 cf::sync_job {
673 $DB ||= db_table "db"; 724 $DB ||= db_table "db";
674 };
675} 725}
676 726
677sub db_get($$) { 727sub db_get($$) {
678 my $key = "$_[0]/$_[1]"; 728 my $key = "$_[0]/$_[1]";
679 729
680 cf::sync_job { 730 cf::error "db_get called from main context"
731 if $Coro::current == $Coro::main;
732
681 BDB::db_get $DB, undef, $key, my $data; 733 BDB::db_get $DB, undef, $key, my $data;
682 734
683 $! ? () 735 $! ? ()
684 : $data 736 : $data
685 }
686} 737}
687 738
688sub db_put($$$) { 739sub db_put($$$) {
689 BDB::dbreq_pri 4; 740 BDB::dbreq_pri 4;
690 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 741 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
746 797
747 my $t1 = Time::HiRes::time; 798 my $t1 = Time::HiRes::time;
748 my $data = $process->(\@data); 799 my $data = $process->(\@data);
749 my $t2 = Time::HiRes::time; 800 my $t2 = Time::HiRes::time;
750 801
751 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 802 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
752 803
753 db_put cache => "$id/data", $data; 804 db_put cache => "$id/data", $data;
754 db_put cache => "$id/md5" , $md5; 805 db_put cache => "$id/md5" , $md5;
755 db_put cache => "$id/meta", $meta; 806 db_put cache => "$id/meta", $meta;
756 807
… …
766 817
767=cut 818=cut
768 819
769sub datalog($@) { 820sub datalog($@) {
770 my ($type, %kv) = @_; 821 my ($type, %kv) = @_;
771 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 822 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
772} 823}
773 824
774=back 825=back
775 826
776=cut 827=cut
… …
971 1022
972 } elsif (exists $cb_id{$type}) { 1023 } elsif (exists $cb_id{$type}) {
973 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1024 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
974 1025
975 } elsif (ref $type) { 1026 } elsif (ref $type) {
976 warn "attaching objects not supported, ignoring.\n"; 1027 error "attaching objects not supported, ignoring.\n";
977 1028
978 } else { 1029 } else {
979 shift @arg; 1030 shift @arg;
980 warn "attach argument '$type' not supported, ignoring.\n"; 1031 error "attach argument '$type' not supported, ignoring.\n";
981 } 1032 }
982 } 1033 }
983} 1034}
984 1035
985sub _object_attach { 1036sub _object_attach {
… …
995 _attach $registry, $klass, @attach; 1046 _attach $registry, $klass, @attach;
996 } 1047 }
997 1048
998 $obj->{$name} = \%arg; 1049 $obj->{$name} = \%arg;
999 } else { 1050 } else {
1000 warn "object uses attachment '$name' which is not available, postponing.\n"; 1051 info "object uses attachment '$name' which is not available, postponing.\n";
1001 } 1052 }
1002 1053
1003 $obj->{_attachment}{$name} = undef; 1054 $obj->{_attachment}{$name} = undef;
1004} 1055}
1005 1056
… …
1064 1115
1065 for (@$callbacks) { 1116 for (@$callbacks) {
1066 eval { &{$_->[1]} }; 1117 eval { &{$_->[1]} };
1067 1118
1068 if ($@) { 1119 if ($@) {
1069 warn "$@";
1070 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1120 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1071 override; 1121 override;
1072 } 1122 }
1073 1123
1074 return 1 if $override; 1124 return 1 if $override;
1075 } 1125 }
… …
1154 for (@$attach) { 1204 for (@$attach) {
1155 my ($klass, @attach) = @$_; 1205 my ($klass, @attach) = @$_;
1156 _attach $registry, $klass, @attach; 1206 _attach $registry, $klass, @attach;
1157 } 1207 }
1158 } else { 1208 } else {
1159 warn "object uses attachment '$name' that is not available, postponing.\n"; 1209 info "object uses attachment '$name' that is not available, postponing.\n";
1160 } 1210 }
1161 } 1211 }
1162} 1212}
1163 1213
1164cf::attachable->attach ( 1214cf::attachable->attach (
… …
1191 my ($filename, $rdata, $objs) = @_; 1241 my ($filename, $rdata, $objs) = @_;
1192 1242
1193 sync_job { 1243 sync_job {
1194 if (length $$rdata) { 1244 if (length $$rdata) {
1195 utf8::decode (my $decname = $filename); 1245 utf8::decode (my $decname = $filename);
1196 warn sprintf "saving %s (%d,%d)\n", 1246 trace sprintf "saving %s (%d,%d)\n",
1197 $decname, length $$rdata, scalar @$objs; 1247 $decname, length $$rdata, scalar @$objs
1248 if $VERBOSE_IO;
1198 1249
1199 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1250 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1200 aio_chmod $fh, SAVE_MODE; 1251 aio_chmod $fh, SAVE_MODE;
1201 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1252 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1202 if ($cf::USE_FSYNC) { 1253 if ($cf::USE_FSYNC) {
… …
1224 aio_rename "$filename~", $filename; 1275 aio_rename "$filename~", $filename;
1225 1276
1226 $filename =~ s%/[^/]+$%%; 1277 $filename =~ s%/[^/]+$%%;
1227 aio_pathsync $filename if $cf::USE_FSYNC; 1278 aio_pathsync $filename if $cf::USE_FSYNC;
1228 } else { 1279 } else {
1229 warn "unable to save objects: $filename~: $!\n"; 1280 error "unable to save objects: $filename~: $!\n";
1230 } 1281 }
1231 } else { 1282 } else {
1232 aio_unlink $filename; 1283 aio_unlink $filename;
1233 aio_unlink "$filename.pst"; 1284 aio_unlink "$filename.pst";
1234 } 1285 }
… …
1258 my $st = eval { Coro::Storable::thaw $av }; 1309 my $st = eval { Coro::Storable::thaw $av };
1259 $av = $st->{objs}; 1310 $av = $st->{objs};
1260 } 1311 }
1261 1312
1262 utf8::decode (my $decname = $filename); 1313 utf8::decode (my $decname = $filename);
1263 warn sprintf "loading %s (%d,%d)\n", 1314 trace sprintf "loading %s (%d,%d)\n",
1264 $decname, length $data, scalar @{$av || []}; 1315 $decname, length $data, scalar @{$av || []}
1316 if $VERBOSE_IO;
1265 1317
1266 ($data, $av) 1318 ($data, $av)
1267} 1319}
1268 1320
1269=head2 COMMAND CALLBACKS 1321=head2 COMMAND CALLBACKS
… …
1361 1413
1362 $pl->ext_reply ($reply, @reply) 1414 $pl->ext_reply ($reply, @reply)
1363 if $reply; 1415 if $reply;
1364 1416
1365 } else { 1417 } else {
1366 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1418 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1367 } 1419 }
1368 1420
1369 cf::override; 1421 cf::override;
1370 }, 1422 },
1371); 1423);
… …
1382 1434
1383 $grp 1435 $grp
1384} 1436}
1385 1437
1386sub load_extensions { 1438sub load_extensions {
1439 info "loading extensions...";
1440
1387 cf::sync_job { 1441 cf::sync_job {
1388 my %todo; 1442 my %todo;
1389 1443
1390 for my $path (<$LIBDIR/*.ext>) { 1444 for my $path (<$LIBDIR/*.ext>) {
1391 next unless -r $path; 1445 next unless -r $path;
… …
1409 1463
1410 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1464 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1411 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1465 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1412 1466
1413 $ext{source} = 1467 $ext{source} =
1414 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1468 "package $pkg; use common::sense;\n"
1415 . "#line 1 \"$path\"\n{\n" 1469 . "#line 1 \"$path\"\n{\n"
1416 . $source 1470 . $source
1417 . "\n};\n1"; 1471 . "\n};\n1";
1418 1472
1419 $todo{$base} = \%ext; 1473 $todo{$base} = \%ext;
… …
1431 for (split /,\s*/, $v->{meta}{depends}) { 1485 for (split /,\s*/, $v->{meta}{depends}) {
1432 next ext 1486 next ext
1433 unless exists $done{$_}; 1487 unless exists $done{$_};
1434 } 1488 }
1435 1489
1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1490 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1437 1491
1438 my $active = eval $v->{source}; 1492 my $active = eval $v->{source};
1439 1493
1440 if (length $@) { 1494 if (length $@) {
1441 warn "$v->{path}: $@\n"; 1495 error "$v->{path}: $@\n";
1442 1496
1443 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1497 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1444 if exists $v->{meta}{mandatory}; 1498 if exists $v->{meta}{mandatory};
1445 1499
1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; 1500 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
… …
1448 } else { 1502 } else {
1449 $done{$k} = delete $todo{$k}; 1503 $done{$k} = delete $todo{$k};
1450 push @EXTS, $v->{pkg}; 1504 push @EXTS, $v->{pkg};
1451 $progress = 1; 1505 $progress = 1;
1452 1506
1453 warn "$v->{base}: extension inactive.\n" 1507 info "$v->{base}: extension inactive.\n"
1454 unless $active; 1508 unless $active;
1455 } 1509 }
1456 } 1510 }
1457 1511
1458 unless ($progress) { 1512 unless ($progress) {
… …
1627 my $name = $pl->ob->name; 1681 my $name = $pl->ob->name;
1628 1682
1629 $pl->{deny_save} = 1; 1683 $pl->{deny_save} = 1;
1630 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1684 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1631 1685
1632 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1686 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1633 $pl->deactivate; 1687 $pl->deactivate;
1688
1634 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1689 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1635 $pl->ob->check_score;
1636 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1690 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1691 ext::highscore::check ($pl->ob);
1692
1637 $pl->ns->destroy if $pl->ns; 1693 $pl->ns->destroy if $pl->ns;
1638 1694
1639 my $path = playerdir $pl; 1695 my $path = playerdir $pl;
1640 my $temp = "$path~$cf::RUNTIME~deleting~"; 1696 my $temp = "$path~$cf::RUNTIME~deleting~";
1641 aio_rename $path, $temp; 1697 aio_rename $path, $temp;
… …
1807sub generate_random_map { 1863sub generate_random_map {
1808 my ($self, $rmp) = @_; 1864 my ($self, $rmp) = @_;
1809 1865
1810 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1866 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1811 1867
1812 # mit "rum" bekleckern, nicht
1813 $self->_create_random_map ( 1868 $self->_create_random_map ($rmp);
1814 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1815 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1816 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1817 $rmp->{exit_on_final_map},
1818 $rmp->{xsize}, $rmp->{ysize},
1819 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1820 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1821 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1822 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1823 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1824 (cf::region::find $rmp->{region}), $rmp->{custom}
1825 )
1826} 1869}
1827 1870
1828=item cf::map->register ($regex, $prio) 1871=item cf::map->register ($regex, $prio)
1829 1872
1830Register a handler for the map path matching the given regex at the 1873Register a handler for the map path matching the given regex at the
… …
1835 1878
1836sub register { 1879sub register {
1837 my (undef, $regex, $prio) = @_; 1880 my (undef, $regex, $prio) = @_;
1838 my $pkg = caller; 1881 my $pkg = caller;
1839 1882
1840 no strict;
1841 push @{"$pkg\::ISA"}, __PACKAGE__; 1883 push @{"$pkg\::ISA"}, __PACKAGE__;
1842 1884
1843 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1885 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1844} 1886}
1845 1887
… …
1857} 1899}
1858 1900
1859sub normalise { 1901sub normalise {
1860 my ($path, $base) = @_; 1902 my ($path, $base) = @_;
1861 1903
1862 $path = "$path"; # make sure its a string 1904 $path = "$path"; # make sure it's a string
1863 1905
1864 $path =~ s/\.map$//; 1906 $path =~ s/\.map$//;
1865 1907
1866 # map plan: 1908 # map plan:
1867 # 1909 #
… …
1882 $base =~ s{[^/]+/?$}{}; 1924 $base =~ s{[^/]+/?$}{};
1883 $path = "$base/$path"; 1925 $path = "$base/$path";
1884 } 1926 }
1885 1927
1886 for ($path) { 1928 for ($path) {
1887 redo if s{//}{/};
1888 redo if s{/\.?/}{/}; 1929 redo if s{/\.?/}{/};
1889 redo if s{/[^/]+/\.\./}{/}; 1930 redo if s{/[^/]+/\.\./}{/};
1890 } 1931 }
1891 1932
1892 $path 1933 $path
… …
1906 $self->init; # pass $1 etc. 1947 $self->init; # pass $1 etc.
1907 return $self; 1948 return $self;
1908 } 1949 }
1909 } 1950 }
1910 1951
1911 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1952 Carp::cluck "unable to resolve path '$path' (base '$base')";
1912 () 1953 ()
1913} 1954}
1914 1955
1915sub init { 1956sub init {
1916 my ($self) = @_; 1957 my ($self) = @_;
… …
2038} 2079}
2039 2080
2040sub find; 2081sub find;
2041sub find { 2082sub find {
2042 my ($path, $origin) = @_; 2083 my ($path, $origin) = @_;
2084
2085 cf::cede_to_tick;
2043 2086
2044 $path = normalise $path, $origin && $origin->path; 2087 $path = normalise $path, $origin && $origin->path;
2045 2088
2046 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2089 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2047 my $guard2 = cf::lock_acquire "map_find:$path"; 2090 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2132 2175
2133 $self->in_memory (cf::MAP_ACTIVE); 2176 $self->in_memory (cf::MAP_ACTIVE);
2134 } 2177 }
2135 2178
2136 $self->post_load; 2179 $self->post_load;
2180
2181 1
2137} 2182}
2138 2183
2139# customize the map for a given player, i.e. 2184# customize the map for a given player, i.e.
2140# return the _real_ map. used by e.g. per-player 2185# return the _real_ map. used by e.g. per-player
2141# maps to change the path to ~playername/mappath 2186# maps to change the path to ~playername/mappath
… …
2162 or next; 2207 or next;
2163 $neigh = find $neigh, $map 2208 $neigh = find $neigh, $map
2164 or next; 2209 or next;
2165 $neigh->load; 2210 $neigh->load;
2166 2211
2212 # now find the diagonal neighbours
2167 push @neigh, 2213 push @neigh,
2168 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2214 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2169 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2215 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2170 } 2216 }
2171 2217
… …
2178} 2224}
2179 2225
2180sub find_sync { 2226sub find_sync {
2181 my ($path, $origin) = @_; 2227 my ($path, $origin) = @_;
2182 2228
2183 cf::sync_job { find $path, $origin } 2229 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2230 if $Coro::current == $Coro::main;
2231
2232 find $path, $origin
2184} 2233}
2185 2234
2186sub do_load_sync { 2235sub do_load_sync {
2187 my ($map) = @_; 2236 my ($map) = @_;
2188 2237
2189 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2238 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2190 if $Coro::current == $Coro::main; 2239 if $Coro::current == $Coro::main;
2191 2240
2192 cf::sync_job { $map->load }; 2241 $map->load;
2193} 2242}
2194 2243
2195our %MAP_PREFETCH; 2244our %MAP_PREFETCH;
2196our $MAP_PREFETCHER = undef; 2245our $MAP_PREFETCHER = undef;
2197 2246
… …
2309 2358
2310 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2359 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311 2360
2312 return if $self->players; 2361 return if $self->players;
2313 2362
2314 warn "resetting map ", $self->path, "\n"; 2363 cf::trace "resetting map ", $self->path, "\n";
2315 2364
2316 $self->in_memory (cf::MAP_SWAPPED); 2365 $self->in_memory (cf::MAP_SWAPPED);
2317 2366
2318 # need to save uniques path 2367 # need to save uniques path
2319 unless ($self->{deny_save}) { 2368 unless ($self->{deny_save}) {
… …
2583 2632
2584Freezes the player and moves him/her to a special map (C<{link}>). 2633Freezes the player and moves him/her to a special map (C<{link}>).
2585 2634
2586The player should be reasonably safe there for short amounts of time (e.g. 2635The player should be reasonably safe there for short amounts of time (e.g.
2587for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2636for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2588though, as the palyer cannot control the character while it is on the link 2637though, as the player cannot control the character while it is on the link
2589map. 2638map.
2590 2639
2591Will never block. 2640Will never block.
2592 2641
2593=item $player_object->leave_link ($map, $x, $y) 2642=item $player_object->leave_link ($map, $x, $y)
… …
2614sub cf::object::player::enter_link { 2663sub cf::object::player::enter_link {
2615 my ($self) = @_; 2664 my ($self) = @_;
2616 2665
2617 $self->deactivate_recursive; 2666 $self->deactivate_recursive;
2618 2667
2668 ++$self->{_link_recursion};
2669
2619 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2670 return if UNIVERSAL::isa $self->map, "ext::map_link";
2620 2671
2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2672 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2622 if $self->map && $self->map->{path} ne "{link}"; 2673 if $self->map && $self->map->{path} ne "{link}";
2623 2674
… …
2654 $map->load_neighbours; 2705 $map->load_neighbours;
2655 2706
2656 return unless $self->contr->active; 2707 return unless $self->contr->active;
2657 2708
2658 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2709 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2659 $self->enter_map ($map, $x, $y); 2710 if ($self->enter_map ($map, $x, $y)) {
2660 2711 # entering was successful
2712 delete $self->{_link_recursion};
2661 # only activate afterwards, to support waiting in hooks 2713 # only activate afterwards, to support waiting in hooks
2662 $self->activate_recursive; 2714 $self->activate_recursive;
2663# unless exists $self->{_link_pos}; # maybe we re in-flight again 2715 }
2664}
2665 2716
2717}
2718
2666=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2719=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2667 2720
2668Moves the player to the given map-path and coordinates by first freezing 2721Moves the player to the given map-path and coordinates by first freezing
2669her, loading and preparing them map, calling the provided $check callback 2722her, loading and preparing them map, calling the provided $check callback
2670that has to return the map if sucecssful, and then unfreezes the player on 2723that has to return the map if sucecssful, and then unfreezes the player on
2671the new (success) or old (failed) map position. In either case, $done will 2724the new (success) or old (failed) map position. In either case, $done will
… …
2678 2731
2679our $GOTOGEN; 2732our $GOTOGEN;
2680 2733
2681sub cf::object::player::goto { 2734sub cf::object::player::goto {
2682 my ($self, $path, $x, $y, $check, $done) = @_; 2735 my ($self, $path, $x, $y, $check, $done) = @_;
2736
2737 if ($self->{_link_recursion} >= $MAX_LINKS) {
2738 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2739 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2740 ($path, $x, $y) = @$EMERGENCY_POSITION;
2741 }
2683 2742
2684 # do generation counting so two concurrent goto's will be executed in-order 2743 # do generation counting so two concurrent goto's will be executed in-order
2685 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2744 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2686 2745
2687 $self->enter_link; 2746 $self->enter_link;
… …
2711 my $map = eval { 2770 my $map = eval {
2712 my $map = defined $path ? cf::map::find $path : undef; 2771 my $map = defined $path ? cf::map::find $path : undef;
2713 2772
2714 if ($map) { 2773 if ($map) {
2715 $map = $map->customise_for ($self); 2774 $map = $map->customise_for ($self);
2716 $map = $check->($map) if $check && $map; 2775 $map = $check->($map, $x, $y, $self) if $check && $map;
2717 } else { 2776 } else {
2718 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2777 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2719 } 2778 }
2720 2779
2721 $map 2780 $map
… …
2729 if ($gen == $self->{_goto_generation}) { 2788 if ($gen == $self->{_goto_generation}) {
2730 delete $self->{_goto_generation}; 2789 delete $self->{_goto_generation};
2731 $self->leave_link ($map, $x, $y); 2790 $self->leave_link ($map, $x, $y);
2732 } 2791 }
2733 2792
2734 $done->() if $done; 2793 $done->($self) if $done;
2735 })->prio (1); 2794 })->prio (1);
2736} 2795}
2737 2796
2738=item $player_object->enter_exit ($exit_object) 2797=item $player_object->enter_exit ($exit_object)
2739 2798
… …
2832 $self->message ("Something went wrong deep within the deliantra server. " 2891 $self->message ("Something went wrong deep within the deliantra server. "
2833 . "I'll try to bring you back to the map you were before. " 2892 . "I'll try to bring you back to the map you were before. "
2834 . "Please report this to the dungeon master!", 2893 . "Please report this to the dungeon master!",
2835 cf::NDI_UNIQUE | cf::NDI_RED); 2894 cf::NDI_UNIQUE | cf::NDI_RED);
2836 2895
2837 warn "ERROR in enter_exit: $@"; 2896 error "ERROR in enter_exit: $@";
2838 $self->leave_link; 2897 $self->leave_link;
2839 } 2898 }
2840 })->prio (1); 2899 })->prio (1);
2841} 2900}
2842 2901
… …
3155 3214
3156 $ns->ext_reply ($reply, @reply) 3215 $ns->ext_reply ($reply, @reply)
3157 if $reply; 3216 if $reply;
3158 3217
3159 } else { 3218 } else {
3160 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3219 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3161 } 3220 }
3162 3221
3163 cf::override; 3222 cf::override;
3164 }, 3223 },
3165); 3224);
… …
3246 decrease split destroy change_exp value msg lore send_msg)], 3305 decrease split destroy change_exp value msg lore send_msg)],
3247 ["cf::object::player" => qw(player)], 3306 ["cf::object::player" => qw(player)],
3248 ["cf::player" => qw(peaceful send_msg)], 3307 ["cf::player" => qw(peaceful send_msg)],
3249 ["cf::map" => qw(trigger)], 3308 ["cf::map" => qw(trigger)],
3250) { 3309) {
3251 no strict 'refs';
3252 my ($pkg, @funs) = @$_; 3310 my ($pkg, @funs) = @$_;
3253 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3311 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3254 for @funs; 3312 for @funs;
3255} 3313}
3256 3314
… …
3295 local @cf::_safe_eval_args = values %vars; 3353 local @cf::_safe_eval_args = values %vars;
3296 @res = wantarray ? eval eval : scalar eval $eval; 3354 @res = wantarray ? eval eval : scalar eval $eval;
3297 } 3355 }
3298 3356
3299 if ($@) { 3357 if ($@) {
3300 warn "$@"; 3358 warn "$@",
3301 warn "while executing safe code '$code'\n"; 3359 "while executing safe code '$code'\n",
3302 warn "with arguments " . (join " ", %vars) . "\n"; 3360 "with arguments " . (join " ", %vars) . "\n";
3303 } 3361 }
3304 3362
3305 wantarray ? @res : $res[0] 3363 wantarray ? @res : $res[0]
3306} 3364}
3307 3365
… …
3341 # for this (global event?) 3399 # for this (global event?)
3342 %ext::player_env::MUSIC_FACE_CACHE = (); 3400 %ext::player_env::MUSIC_FACE_CACHE = ();
3343 3401
3344 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3402 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3345 3403
3346 warn "loading facedata from $path\n"; 3404 trace "loading facedata from $path\n";
3347 3405
3348 my $facedata;
3349 0 < aio_load $path, $facedata 3406 0 < aio_load $path, my $facedata
3350 or die "$path: $!"; 3407 or die "$path: $!";
3351 3408
3352 $facedata = Coro::Storable::thaw $facedata; 3409 $facedata = Coro::Storable::thaw $facedata;
3353 3410
3354 $facedata->{version} == 2 3411 $facedata->{version} == 2
… …
3371 3428
3372 cf::face::set_visibility $idx, $info->{visibility}; 3429 cf::face::set_visibility $idx, $info->{visibility};
3373 cf::face::set_magicmap $idx, $info->{magicmap}; 3430 cf::face::set_magicmap $idx, $info->{magicmap};
3374 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3431 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3375 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3432 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3433 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3376 3434
3377 cf::cede_to_tick; 3435 cf::cede_to_tick;
3378 } 3436 }
3379 3437
3380 while (my ($face, $info) = each %$faces) { 3438 while (my ($face, $info) = each %$faces) {
… …
3385 3443
3386 if (my $smooth = cf::face::find $info->{smooth}) { 3444 if (my $smooth = cf::face::find $info->{smooth}) {
3387 cf::face::set_smooth $idx, $smooth; 3445 cf::face::set_smooth $idx, $smooth;
3388 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3446 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3389 } else { 3447 } else {
3390 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3448 error "smooth face '$info->{smooth}' not found for face '$face'";
3391 } 3449 }
3392 3450
3393 cf::cede_to_tick; 3451 cf::cede_to_tick;
3394 } 3452 }
3395 } 3453 }
… …
3413 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3471 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3414 3472
3415 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3473 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3416 cf::face::set_type $idx, $info->{type}; 3474 cf::face::set_type $idx, $info->{type};
3417 } else { 3475 } else {
3418 $RESOURCE{$name} = $info; 3476 $RESOURCE{$name} = $info; # unused
3419 } 3477 }
3420 3478
3421 cf::cede_to_tick; 3479 cf::cede_to_tick;
3422 } 3480 }
3423 } 3481 }
3424 3482
3425 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3483 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3426 3484
3427 1 3485 1
3428} 3486}
3429
3430cf::global->attach (on_resource_update => sub {
3431 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3432 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3433
3434 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3435 my $sound = $soundconf->{compat}[$_]
3436 or next;
3437
3438 my $face = cf::face::find "sound/$sound->[1]";
3439 cf::sound::set $sound->[0] => $face;
3440 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3441 }
3442
3443 while (my ($k, $v) = each %{$soundconf->{event}}) {
3444 my $face = cf::face::find "sound/$v";
3445 cf::sound::set $k => $face;
3446 }
3447 }
3448});
3449 3487
3450register_exticmd fx_want => sub { 3488register_exticmd fx_want => sub {
3451 my ($ns, $want) = @_; 3489 my ($ns, $want) = @_;
3452 3490
3453 while (my ($k, $v) = each %$want) { 3491 while (my ($k, $v) = each %$want) {
… …
3492sub reload_treasures { 3530sub reload_treasures {
3493 load_resource_file "$DATADIR/treasures" 3531 load_resource_file "$DATADIR/treasures"
3494 or die "unable to load treasurelists\n"; 3532 or die "unable to load treasurelists\n";
3495} 3533}
3496 3534
3535sub reload_sound {
3536 trace "loading sound config from $DATADIR/sound\n";
3537
3538 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3539 or die "$DATADIR/sound $!";
3540
3541 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3542
3543 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3544 my $sound = $soundconf->{compat}[$_]
3545 or next;
3546
3547 my $face = cf::face::find "sound/$sound->[1]";
3548 cf::sound::set $sound->[0] => $face;
3549 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3550 }
3551
3552 while (my ($k, $v) = each %{$soundconf->{event}}) {
3553 my $face = cf::face::find "sound/$v";
3554 cf::sound::set $k => $face;
3555 }
3556}
3557
3497sub reload_resources { 3558sub reload_resources {
3498 warn "reloading resource files...\n"; 3559 trace "reloading resource files...\n";
3499 3560
3561 reload_exp_table;
3562 reload_materials;
3500 reload_facedata; 3563 reload_facedata;
3564 reload_sound;
3501 reload_archetypes; 3565 reload_archetypes;
3502 reload_regions; 3566 reload_regions;
3503 reload_treasures; 3567 reload_treasures;
3504 3568
3505 warn "finished reloading resource files\n"; 3569 trace "finished reloading resource files\n";
3506} 3570}
3507 3571
3508sub reload_config { 3572sub reload_config {
3509 warn "reloading config file...\n"; 3573 trace "reloading config file...\n";
3510 3574
3511 open my $fh, "<:utf8", "$CONFDIR/config" 3575 0 < aio_load "$CONFDIR/config", my $config
3512 or return; 3576 or die "$CONFDIR/config: $!";
3513 3577
3514 local $/; 3578 utf8::decode $config;
3515 *CFG = YAML::XS::Load scalar <$fh>; 3579 *CFG = yaml_load $config;
3516 3580
3517 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3581 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3518 3582
3519 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3583 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3520 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3584 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3521 3585
3522 if (exists $CFG{mlockall}) { 3586 if (exists $CFG{mlockall}) {
… …
3524 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3588 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3525 and die "WARNING: m(un)lockall failed: $!\n"; 3589 and die "WARNING: m(un)lockall failed: $!\n";
3526 }; 3590 };
3527 warn $@ if $@; 3591 warn $@ if $@;
3528 } 3592 }
3529
3530 warn "finished reloading resource files\n";
3531} 3593}
3532 3594
3533sub pidfile() { 3595sub pidfile() {
3534 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3596 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3535 or die "$PIDFILE: $!"; 3597 or die "$PIDFILE: $!";
… …
3548 seek $fh, 0, 0; 3610 seek $fh, 0, 0;
3549 print $fh $$; 3611 print $fh $$;
3550} 3612}
3551 3613
3552sub main_loop { 3614sub main_loop {
3553 warn "EV::loop starting\n"; 3615 trace "EV::loop starting\n";
3554 if (1) { 3616 if (1) {
3555 EV::loop; 3617 EV::loop;
3556 } 3618 }
3557 warn "EV::loop returned\n"; 3619 trace "EV::loop returned\n";
3558 goto &main_loop unless $REALLY_UNLOOP; 3620 goto &main_loop unless $REALLY_UNLOOP;
3559} 3621}
3560 3622
3561sub main { 3623sub main {
3562 cf::init_globals; # initialise logging 3624 cf::init_globals; # initialise logging
3563 3625
3564 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3626 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3565 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3627 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3566 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3628 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3567 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3629 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3568 3630
3569 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3631 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3570 3632
… …
3578 }; 3640 };
3579 3641
3580 evthread_start IO::AIO::poll_fileno; 3642 evthread_start IO::AIO::poll_fileno;
3581 3643
3582 cf::sync_job { 3644 cf::sync_job {
3583 cf::init_experience; 3645 cf::incloader::init ();
3646
3584 cf::init_anim; 3647 cf::init_anim;
3585 cf::init_attackmess; 3648 cf::init_attackmess;
3586 cf::init_dynamic; 3649 cf::init_dynamic;
3587 3650
3588 cf::load_settings; 3651 cf::load_settings;
3589 cf::load_materials;
3590 3652
3591 reload_resources; 3653 reload_resources;
3592 reload_config; 3654 reload_config;
3593 db_init; 3655 db_init;
3594 3656
… …
3606 3668
3607 # no (long-running) fork's whatsoever before this point(!) 3669 # no (long-running) fork's whatsoever before this point(!)
3608 use POSIX (); 3670 use POSIX ();
3609 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3671 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3610 3672
3611 (pop @POST_INIT)->(0) while @POST_INIT; 3673 cf::_post_init 0;
3612 }; 3674 };
3613 3675
3614 cf::object::thawer::errors_are_fatal 0; 3676 cf::object::thawer::errors_are_fatal 0;
3615 warn "parse errors in files are no longer fatal from this point on.\n"; 3677 info "parse errors in files are no longer fatal from this point on.\n";
3616 3678
3679 my $free_main; $free_main = EV::idle sub {
3680 undef $free_main;
3681 undef &main; # free gobs of memory :)
3682 };
3683
3617 main_loop; 3684 goto &main_loop;
3618} 3685}
3619 3686
3620############################################################################# 3687#############################################################################
3621# initialisation and cleanup 3688# initialisation and cleanup
3622 3689
… …
3661 or return; 3728 or return;
3662 3729
3663 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3730 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3664 and return; 3731 and return;
3665 3732
3666 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3733 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3667 3734
3668 1 3735 1
3669} 3736}
3670 3737
3671our $uuid_lock; 3738our $uuid_lock;
… …
3683 or return; 3750 or return;
3684 3751
3685 my $value = uuid_seq uuid_cur; 3752 my $value = uuid_seq uuid_cur;
3686 3753
3687 unless ($value) { 3754 unless ($value) {
3688 warn "cowardly refusing to write zero uuid value!\n"; 3755 info "cowardly refusing to write zero uuid value!\n";
3689 return; 3756 return;
3690 } 3757 }
3691 3758
3692 my $value = uuid_str $value + $uuid_skip; 3759 my $value = uuid_str $value + $uuid_skip;
3693 $uuid_skip = 0; 3760 $uuid_skip = 0;
… …
3703 or return; 3770 or return;
3704 3771
3705 aio_rename "$uuid~", $uuid 3772 aio_rename "$uuid~", $uuid
3706 and return; 3773 and return;
3707 3774
3708 warn "uuid file written ($value).\n"; 3775 trace "uuid file written ($value).\n";
3709 3776
3710 1 3777 1
3711 3778
3712} 3779}
3713 3780
… …
3719} 3786}
3720 3787
3721sub emergency_save() { 3788sub emergency_save() {
3722 my $freeze_guard = cf::freeze_mainloop; 3789 my $freeze_guard = cf::freeze_mainloop;
3723 3790
3724 warn "emergency_perl_save: enter\n"; 3791 info "emergency_perl_save: enter\n";
3792
3793 # this is a trade-off: we want to be very quick here, so
3794 # save all maps without fsync, and later call a global sync
3795 # (which in turn might be very very slow)
3796 local $USE_FSYNC = 0;
3725 3797
3726 cf::sync_job { 3798 cf::sync_job {
3727 # this is a trade-off: we want to be very quick here, so 3799 cf::write_runtime_sync; # external watchdog should not bark
3728 # save all maps without fsync, and later call a global sync
3729 # (which in turn might be very very slow)
3730 local $USE_FSYNC = 0;
3731 3800
3732 # use a peculiar iteration method to avoid tripping on perl 3801 # use a peculiar iteration method to avoid tripping on perl
3733 # refcount bugs in for. also avoids problems with players 3802 # refcount bugs in for. also avoids problems with players
3734 # and maps saved/destroyed asynchronously. 3803 # and maps saved/destroyed asynchronously.
3735 warn "emergency_perl_save: begin player save\n"; 3804 info "emergency_perl_save: begin player save\n";
3736 for my $login (keys %cf::PLAYER) { 3805 for my $login (keys %cf::PLAYER) {
3737 my $pl = $cf::PLAYER{$login} or next; 3806 my $pl = $cf::PLAYER{$login} or next;
3738 $pl->valid or next; 3807 $pl->valid or next;
3739 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3808 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3740 $pl->save; 3809 $pl->save;
3741 } 3810 }
3742 warn "emergency_perl_save: end player save\n"; 3811 info "emergency_perl_save: end player save\n";
3743 3812
3813 cf::write_runtime_sync; # external watchdog should not bark
3814
3744 warn "emergency_perl_save: begin map save\n"; 3815 info "emergency_perl_save: begin map save\n";
3745 for my $path (keys %cf::MAP) { 3816 for my $path (keys %cf::MAP) {
3746 my $map = $cf::MAP{$path} or next; 3817 my $map = $cf::MAP{$path} or next;
3747 $map->valid or next; 3818 $map->valid or next;
3748 $map->save; 3819 $map->save;
3749 } 3820 }
3750 warn "emergency_perl_save: end map save\n"; 3821 info "emergency_perl_save: end map save\n";
3751 3822
3823 cf::write_runtime_sync; # external watchdog should not bark
3824
3752 warn "emergency_perl_save: begin database checkpoint\n"; 3825 info "emergency_perl_save: begin database checkpoint\n";
3753 BDB::db_env_txn_checkpoint $DB_ENV; 3826 BDB::db_env_txn_checkpoint $DB_ENV;
3754 warn "emergency_perl_save: end database checkpoint\n"; 3827 info "emergency_perl_save: end database checkpoint\n";
3755 3828
3756 warn "emergency_perl_save: begin write uuid\n"; 3829 info "emergency_perl_save: begin write uuid\n";
3757 write_uuid_sync 1; 3830 write_uuid_sync 1;
3758 warn "emergency_perl_save: end write uuid\n"; 3831 info "emergency_perl_save: end write uuid\n";
3832
3833 cf::write_runtime_sync; # external watchdog should not bark
3834
3835 trace "emergency_perl_save: syncing database to disk";
3836 BDB::db_env_txn_checkpoint $DB_ENV;
3837
3838 info "emergency_perl_save: starting sync\n";
3839 IO::AIO::aio_sync sub {
3840 info "emergency_perl_save: finished sync\n";
3841 };
3842
3843 cf::write_runtime_sync; # external watchdog should not bark
3844
3845 trace "emergency_perl_save: flushing outstanding aio requests";
3846 while (IO::AIO::nreqs || BDB::nreqs) {
3847 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3848 }
3849
3850 cf::write_runtime_sync; # external watchdog should not bark
3759 }; 3851 };
3760 3852
3761 warn "emergency_perl_save: starting sync()\n";
3762 IO::AIO::aio_sync sub {
3763 warn "emergency_perl_save: finished sync()\n";
3764 };
3765
3766 warn "emergency_perl_save: leave\n"; 3853 info "emergency_perl_save: leave\n";
3767} 3854}
3768 3855
3769sub post_cleanup { 3856sub post_cleanup {
3770 my ($make_core) = @_; 3857 my ($make_core) = @_;
3771 3858
3859 IO::AIO::flush;
3860
3772 warn Carp::longmess "post_cleanup backtrace" 3861 error Carp::longmess "post_cleanup backtrace"
3773 if $make_core; 3862 if $make_core;
3774 3863
3775 my $fh = pidfile; 3864 my $fh = pidfile;
3776 unlink $PIDFILE if <$fh> == $$; 3865 unlink $PIDFILE if <$fh> == $$;
3777} 3866}
… …
3801 } 3890 }
3802} 3891}
3803 3892
3804sub do_reload_perl() { 3893sub do_reload_perl() {
3805 # can/must only be called in main 3894 # can/must only be called in main
3806 if (in_main) { 3895 unless (in_main) {
3807 warn "can only reload from main coroutine"; 3896 error "can only reload from main coroutine";
3808 return; 3897 return;
3809 } 3898 }
3810 3899
3811 return if $RELOAD++; 3900 return if $RELOAD++;
3812 3901
3813 my $t1 = AE::time; 3902 my $t1 = AE::time;
3814 3903
3815 while ($RELOAD) { 3904 while ($RELOAD) {
3816 warn "reloading..."; 3905 cf::get_slot 0.1, -1, "reload_perl";
3906 info "perl_reload: reloading...";
3817 3907
3818 warn "entering sync_job"; 3908 trace "perl_reload: entering sync_job";
3819 3909
3820 cf::sync_job { 3910 cf::sync_job {
3821 cf::write_runtime_sync; # external watchdog should not bark
3822 cf::emergency_save; 3911 #cf::emergency_save;
3823 cf::write_runtime_sync; # external watchdog should not bark
3824 3912
3825 warn "syncing database to disk";
3826 BDB::db_env_txn_checkpoint $DB_ENV;
3827
3828 # if anything goes wrong in here, we should simply crash as we already saved
3829
3830 warn "flushing outstanding aio requests";
3831 while (IO::AIO::nreqs || BDB::nreqs) {
3832 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3833 }
3834
3835 warn "cancelling all extension coros"; 3913 trace "perl_reload: cancelling all extension coros";
3836 $_->cancel for values %EXT_CORO; 3914 $_->cancel for values %EXT_CORO;
3837 %EXT_CORO = (); 3915 %EXT_CORO = ();
3838 3916
3839 warn "removing commands"; 3917 trace "perl_reload: removing commands";
3840 %COMMAND = (); 3918 %COMMAND = ();
3841 3919
3842 warn "removing ext/exti commands"; 3920 trace "perl_reload: removing ext/exti commands";
3843 %EXTCMD = (); 3921 %EXTCMD = ();
3844 %EXTICMD = (); 3922 %EXTICMD = ();
3845 3923
3846 warn "unloading/nuking all extensions"; 3924 trace "perl_reload: unloading/nuking all extensions";
3847 for my $pkg (@EXTS) { 3925 for my $pkg (@EXTS) {
3848 warn "... unloading $pkg"; 3926 trace "... unloading $pkg";
3849 3927
3850 if (my $cb = $pkg->can ("unload")) { 3928 if (my $cb = $pkg->can ("unload")) {
3851 eval { 3929 eval {
3852 $cb->($pkg); 3930 $cb->($pkg);
3853 1 3931 1
3854 } or warn "$pkg unloaded, but with errors: $@"; 3932 } or error "$pkg unloaded, but with errors: $@";
3855 } 3933 }
3856 3934
3857 warn "... clearing $pkg"; 3935 trace "... clearing $pkg";
3858 clear_package $pkg; 3936 clear_package $pkg;
3859 } 3937 }
3860 3938
3861 warn "unloading all perl modules loaded from $LIBDIR"; 3939 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3862 while (my ($k, $v) = each %INC) { 3940 while (my ($k, $v) = each %INC) {
3863 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3941 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3864 3942
3865 warn "... unloading $k"; 3943 trace "... unloading $k";
3866 delete $INC{$k}; 3944 delete $INC{$k};
3867 3945
3868 $k =~ s/\.pm$//; 3946 $k =~ s/\.pm$//;
3869 $k =~ s/\//::/g; 3947 $k =~ s/\//::/g;
3870 3948
… …
3873 } 3951 }
3874 3952
3875 clear_package $k; 3953 clear_package $k;
3876 } 3954 }
3877 3955
3878 warn "getting rid of safe::, as good as possible"; 3956 trace "perl_reload: getting rid of safe::, as good as possible";
3879 clear_package "safe::$_" 3957 clear_package "safe::$_"
3880 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3958 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3881 3959
3882 warn "unloading cf.pm \"a bit\""; 3960 trace "perl_reload: unloading cf.pm \"a bit\"";
3883 delete $INC{"cf.pm"}; 3961 delete $INC{"cf.pm"};
3884 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3962 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3885 3963
3886 # don't, removes xs symbols, too, 3964 # don't, removes xs symbols, too,
3887 # and global variables created in xs 3965 # and global variables created in xs
3888 #clear_package __PACKAGE__; 3966 #clear_package __PACKAGE__;
3889 3967
3890 warn "unload completed, starting to reload now"; 3968 info "perl_reload: unload completed, starting to reload now";
3891 3969
3892 warn "reloading cf.pm"; 3970 trace "perl_reload: reloading cf.pm";
3893 require cf; 3971 require cf;
3894 cf::_connect_to_perl_1; 3972 cf::_connect_to_perl_1;
3895 3973
3896 warn "loading config and database again"; 3974 trace "perl_reload: loading config and database again";
3897 cf::reload_config; 3975 cf::reload_config;
3898 3976
3899 warn "loading extensions"; 3977 trace "perl_reload: loading extensions";
3900 cf::load_extensions; 3978 cf::load_extensions;
3901 3979
3902 if ($REATTACH_ON_RELOAD) { 3980 if ($REATTACH_ON_RELOAD) {
3903 warn "reattaching attachments to objects/players"; 3981 trace "perl_reload: reattaching attachments to objects/players";
3904 _global_reattach; # objects, sockets 3982 _global_reattach; # objects, sockets
3905 warn "reattaching attachments to maps"; 3983 trace "perl_reload: reattaching attachments to maps";
3906 reattach $_ for values %MAP; 3984 reattach $_ for values %MAP;
3907 warn "reattaching attachments to players"; 3985 trace "perl_reload: reattaching attachments to players";
3908 reattach $_ for values %PLAYER; 3986 reattach $_ for values %PLAYER;
3909 } 3987 }
3910 3988
3911 warn "running post_init jobs"; 3989 cf::_post_init 1;
3912 (pop @POST_INIT)->(1) while @POST_INIT;
3913 3990
3914 warn "leaving sync_job"; 3991 trace "perl_reload: leaving sync_job";
3915 3992
3916 1 3993 1
3917 } or do { 3994 } or do {
3918 warn $@; 3995 error $@;
3919 cf::cleanup "error while reloading, exiting."; 3996 cf::cleanup "perl_reload: error, exiting.";
3920 }; 3997 };
3921 3998
3922 warn "reloaded";
3923 --$RELOAD; 3999 --$RELOAD;
3924 } 4000 }
3925 4001
3926 $t1 = AE::time - $t1; 4002 $t1 = AE::time - $t1;
3927 warn "reload completed in ${t1}s\n"; 4003 info "perl_reload: completed in ${t1}s\n";
3928}; 4004};
3929 4005
3930our $RELOAD_WATCHER; # used only during reload 4006our $RELOAD_WATCHER; # used only during reload
3931 4007
3932sub reload_perl() { 4008sub reload_perl() {
… …
3953 reload_perl; 4029 reload_perl;
3954 }; 4030 };
3955 } 4031 }
3956}; 4032};
3957 4033
3958unshift @INC, $LIBDIR; 4034#############################################################################
3959 4035
3960my $bug_warning = 0; 4036my $bug_warning = 0;
3961 4037
3962our @WAIT_FOR_TICK; 4038our @WAIT_FOR_TICK;
3963our @WAIT_FOR_TICK_BEGIN; 4039our @WAIT_FOR_TICK_BEGIN;
3964 4040
3965sub wait_for_tick { 4041sub wait_for_tick() {
3966 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4042 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3967 4043
3968 my $signal = new Coro::Signal; 4044 my $signal = new Coro::Signal;
3969 push @WAIT_FOR_TICK, $signal; 4045 push @WAIT_FOR_TICK, $signal;
3970 $signal->wait; 4046 $signal->wait;
3971} 4047}
3972 4048
3973sub wait_for_tick_begin { 4049sub wait_for_tick_begin() {
3974 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4050 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3975 4051
3976 my $signal = new Coro::Signal; 4052 my $signal = new Coro::Signal;
3977 push @WAIT_FOR_TICK_BEGIN, $signal; 4053 push @WAIT_FOR_TICK_BEGIN, $signal;
3978 $signal->wait; 4054 $signal->wait;
… …
3992 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4068 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3993 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4069 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3994 Coro::async_pool { 4070 Coro::async_pool {
3995 $Coro::current->{desc} = "runtime saver"; 4071 $Coro::current->{desc} = "runtime saver";
3996 write_runtime_sync 4072 write_runtime_sync
3997 or warn "ERROR: unable to write runtime file: $!"; 4073 or error "ERROR: unable to write runtime file: $!";
3998 }; 4074 };
3999 } 4075 }
4000 4076
4001 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4077 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4002 $sig->send; 4078 $sig->send;
… …
4010 4086
4011 if (0) { 4087 if (0) {
4012 if ($NEXT_TICK) { 4088 if ($NEXT_TICK) {
4013 my $jitter = $TICK_START - $NEXT_TICK; 4089 my $jitter = $TICK_START - $NEXT_TICK;
4014 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4090 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4015 warn "jitter $JITTER\n";#d# 4091 debug "jitter $JITTER\n";#d#
4016 } 4092 }
4017 } 4093 }
4018} 4094}
4019 4095
4020{ 4096{
… …
4065 IO::AIO::min_parallel 8; 4141 IO::AIO::min_parallel 8;
4066 IO::AIO::max_poll_time $TICK * 0.1; 4142 IO::AIO::max_poll_time $TICK * 0.1;
4067 undef $AnyEvent::AIO::WATCHER; 4143 undef $AnyEvent::AIO::WATCHER;
4068} 4144}
4069 4145
4070my $_log_backtrace; 4146our $_log_backtrace;
4147our $_log_backtrace_last;
4071 4148
4072sub _log_backtrace { 4149sub _log_backtrace {
4073 my ($msg, @addr) = @_; 4150 my ($msg, @addr) = @_;
4074 4151
4075 $msg =~ s/\n//; 4152 $msg =~ s/\n$//;
4076 4153
4154 if ($_log_backtrace_last eq $msg) {
4155 LOG llevInfo, "[ABT] $msg\n";
4156 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4077 # limit the # of concurrent backtraces 4157 # limit the # of concurrent backtraces
4078 if ($_log_backtrace < 2) { 4158 } elsif ($_log_backtrace < 2) {
4159 $_log_backtrace_last = $msg;
4079 ++$_log_backtrace; 4160 ++$_log_backtrace;
4080 my $perl_bt = Carp::longmess $msg; 4161 my $perl_bt = Carp::longmess $msg;
4081 async { 4162 async {
4082 $Coro::current->{desc} = "abt $msg"; 4163 $Coro::current->{desc} = "abt $msg";
4083 4164
… …
4103 LOG llevInfo, "[ABT] $_\n" for @bt; 4184 LOG llevInfo, "[ABT] $_\n" for @bt;
4104 --$_log_backtrace; 4185 --$_log_backtrace;
4105 }; 4186 };
4106 } else { 4187 } else {
4107 LOG llevInfo, "[ABT] $msg\n"; 4188 LOG llevInfo, "[ABT] $msg\n";
4108 LOG llevInfo, "[ABT] [suppressed]\n"; 4189 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4109 } 4190 }
4110} 4191}
4111 4192
4112# load additional modules 4193# load additional modules
4113require "cf/$_.pm" for @EXTRA_MODULES; 4194require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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