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

Diff Legend

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