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.506 by root, Wed Feb 3 20:48:22 2010 UTC vs.
Revision 1.565 by root, Sat Apr 30 05:41:17 2011 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 9# option) any later version.
… …
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
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
112 120
113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
115our $NEXT_TICK; 123our $NEXT_TICK;
116our $USE_FSYNC = 1; # use fsync to write maps - default on 124our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
118our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
119our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
120our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
121our $DB_ENV; 129our $DB_ENV;
122 130
123our @EXTRA_MODULES = qw(pod match mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
124 132
125our %CFG; 133our %CFG;
126 134
127our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
128our $RUNTIME; 136our $RUNTIME;
… …
162 170
163our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
164 172
165sub cf::map::normalise; 173sub cf::map::normalise;
166 174
175sub in_main() {
176 $Coro::current == $Coro::main
177}
178
167############################################################################# 179#############################################################################
168 180
169%REFLECT = (); 181%REFLECT = ();
170for (@REFLECT) { 182for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_; 183 my $reflect = JSON::XS::decode_json $_;
… …
223from wherever your confdir points to. 235from wherever your confdir points to.
224 236
225=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
226 238
227These 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
228returns 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
229per 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();
230 247
231=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
232 249
233This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
234C<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
… …
242 259
243=back 260=back
244 261
245=cut 262=cut
246 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
247$Coro::State::WARNHOOK = sub { 270$Coro::State::WARNHOOK = sub {
248 my $msg = join "", @_; 271 my $msg = join "", @_;
249 272
250 $msg .= "\n" 273 $msg .= "\n"
251 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
252 275
253 $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;
254 277
255 LOG llevError, $msg; 278 LOG llevWarn, $msg;
256}; 279};
257 280
258$Coro::State::DIEHOOK = sub { 281$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "==" 282 return unless $^S eq 0; # "eq", not "=="
260 283
261 warn Carp::longmess $_[0]; 284 error Carp::longmess $_[0];
262 285
263 if ($Coro::current == $Coro::main) {#d# 286 if (in_main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d# 287 error "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d# 288 return;#d#
266 }#d# 289 }#d#
267 290
268 # kill coroutine otherwise 291 # kill coroutine otherwise
269 Coro::terminate 292 Coro::terminate
… …
291} 314}
292 315
293$EV::DIED = sub { 316$EV::DIED = sub {
294 Carp::cluck "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
295}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
296 324
297############################################################################# 325#############################################################################
298 326
299=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
300 328
… …
321 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 349 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
322 $d 350 $d
323 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
324} 352}
325 353
354=item $scalar = load_file $path
355
356Loads the given file from path and returns its contents. Croaks on error
357and can block.
358
359=cut
360
361sub load_file($) {
362 0 <= aio_load $_[0], my $data
363 or Carp::croak "$_[0]: $!";
364
365 $data
366}
367
326=item $ref = cf::decode_json $json 368=item $ref = cf::decode_json $json
327 369
328Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
329 371
330=item $json = cf::encode_json $ref 372=item $json = cf::encode_json $ref
… …
336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 378our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
337 379
338sub encode_json($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
339sub decode_json($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
340 382
383=item $ref = cf::decode_storable $scalar
384
385Same as Coro::Storable::thaw, so blocks.
386
387=cut
388
389BEGIN { *decode_storable = \&Coro::Storable::thaw }
390
391=item $ref = cf::decode_yaml $scalar
392
393Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
394
395=cut
396
397sub decode_yaml($) {
398 fork_call { YAML::XS::Load $_[0] } @_
399}
400
401=item $scalar = cf::unlzf $scalar
402
403Same as Compress::LZF::compress, but takes server ticks into account, so
404blocks.
405
406=cut
407
408sub unlzf($) {
409 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
410 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
411 Compress::LZF::decompress $_[0]
412}
413
341=item cf::post_init { BLOCK } 414=item cf::post_init { BLOCK }
342 415
343Execute the given codeblock, I<after> all extensions have been (re-)loaded, 416Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again. 417but I<before> the server starts ticking again.
345 418
346The cdoeblock will have a single boolean argument to indicate whether this 419The codeblock will have a single boolean argument to indicate whether this
347is a reload or not. 420is a reload or not.
348 421
349=cut 422=cut
350 423
351sub post_init(&) { 424sub post_init(&) {
352 push @POST_INIT, shift; 425 push @POST_INIT, shift;
426}
427
428sub _post_init {
429 trace "running post_init jobs";
430
431 # run them in parallel...
432
433 my @join;
434
435 while () {
436 push @join, map &Coro::async ($_, 0), @POST_INIT;
437 @POST_INIT = ();
438
439 @join or last;
440
441 (pop @join)->join;
442 }
353} 443}
354 444
355=item cf::lock_wait $string 445=item cf::lock_wait $string
356 446
357Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
… …
396} 486}
397 487
398=item cf::periodic $interval, $cb 488=item cf::periodic $interval, $cb
399 489
400Like EV::periodic, but randomly selects a starting point so that the actions 490Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer. 491get spread over time.
402 492
403=cut 493=cut
404 494
405sub periodic($$) { 495sub periodic($$) {
406 my ($interval, $cb) = @_; 496 my ($interval, $cb) = @_;
… …
410 EV::periodic $start, $interval, 0, $cb 500 EV::periodic $start, $interval, 0, $cb
411} 501}
412 502
413=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
414 504
415Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
416This call blocks and returns only when you have at least C<$time> seconds 506(default: 0): This call blocks and returns only when you have at least
417of cpu time till the next tick. The slot is only valid till the next cede. 507C<$time> seconds of cpu time till the next tick. The slot is only valid
508till the next cede.
509
510Background jobs should use a priority les than zero, interactive jobs
511should use 100 or more.
418 512
419The optional C<$name> can be used to identify the job to run. It might be 513The optional C<$name> can be used to identify the job to run. It might be
420used for statistical purposes and should identify the same time-class. 514used for statistical purposes and should identify the same time-class.
421 515
422Useful for short background jobs. 516Useful for short background jobs.
… …
502=cut 596=cut
503 597
504sub sync_job(&) { 598sub sync_job(&) {
505 my ($job) = @_; 599 my ($job) = @_;
506 600
507 if ($Coro::current == $Coro::main) { 601 if (in_main) {
508 my $time = EV::time; 602 my $time = AE::time;
509 603
510 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
511 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
512 606
513 LOG llevError, Carp::longmess "sync job";#d# 607 #LOG llevError, Carp::longmess "sync job";#d#
514 608
515 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
516 610
517 my $busy = 1; 611 my $busy = 1;
518 my @res; 612 my @res;
519 613
520 (async { 614 (async {
521 $Coro::current->desc ("sync job coro"); 615 $Coro::current->desc ("sync job coro");
522 @res = eval { $job->() }; 616 @res = eval { $job->() };
523 warn $@ if $@; 617 error $@ if $@;
524 undef $busy; 618 undef $busy;
525 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
526 620
527 while ($busy) { 621 while ($busy) {
528 if (Coro::nready) { 622 if (Coro::nready) {
… …
530 } else { 624 } else {
531 EV::loop EV::LOOP_ONESHOT; 625 EV::loop EV::LOOP_ONESHOT;
532 } 626 }
533 } 627 }
534 628
535 my $time = EV::time - $time; 629 my $time = AE::time - $time;
536 630
537 $TICK_START += $time; # do not account sync jobs to server load 631 $TICK_START += $time; # do not account sync jobs to server load
538 632
539 wantarray ? @res : $res[0] 633 wantarray ? @res : $res[0]
540 } else { 634 } else {
… …
562 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
563 657
564 $coro 658 $coro
565} 659}
566 660
567=item fork_call { }, $args 661=item fork_call { }, @args
568 662
569Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
570process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
571Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
572never block itself or use any form of event handling. 666never block itself or use any form of event handling.
573 667
574=cut 668=cut
575 669
670sub post_fork {
671 reset_signals;
672}
673
576sub fork_call(&@) { 674sub fork_call(&@) {
577 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
578 676
579 # we seemingly have to make a local copy of the whole thing, 677 # we seemingly have to make a local copy of the whole thing,
580 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
581 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
582 680
583 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
584 reset_signals; 682 cf::post_fork;
585 &$cb 683 &$cb
586 }, @args; 684 } @args;
587 685
588 wantarray ? @res : $res[-1] 686 wantarray ? @res : $res[-1]
687}
688
689sub objinfo {
690 (
691 "counter value" => cf::object::object_count,
692 "objects created" => cf::object::create_count,
693 "objects destroyed" => cf::object::destroy_count,
694 "freelist size" => cf::object::free_count,
695 "allocated objects" => cf::object::objects_size,
696 "active objects" => cf::object::actives_size,
697 )
589} 698}
590 699
591=item $coin = coin_from_name $name 700=item $coin = coin_from_name $name
592 701
593=cut 702=cut
… …
630within each server. 739within each server.
631 740
632=cut 741=cut
633 742
634sub db_table($) { 743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
635 my ($name) = @_; 747 my ($name) = @_;
636 my $db = BDB::db_create $DB_ENV; 748 my $db = BDB::db_create $DB_ENV;
637 749
638 eval { 750 eval {
639 $db->set_flags (BDB::CHKSUM); 751 $db->set_flags (BDB::CHKSUM);
… …
649} 761}
650 762
651our $DB; 763our $DB;
652 764
653sub db_init { 765sub db_init {
654 cf::sync_job {
655 $DB ||= db_table "db"; 766 $DB ||= db_table "db";
656 };
657} 767}
658 768
659sub db_get($$) { 769sub db_get($$) {
660 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
661 771
662 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
663 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
664 776
665 $! ? () 777 $! ? ()
666 : $data 778 : $data
667 }
668} 779}
669 780
670sub db_put($$$) { 781sub db_put($$$) {
671 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
672 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
700 811
701 my @data; 812 my @data;
702 my $md5; 813 my $md5;
703 814
704 for (0 .. $#$src) { 815 for (0 .. $#$src) {
705 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
706 or Carp::croak "$src->[$_]: $!";
707 } 817 }
708 818
709 # if processing is expensive, check 819 # if processing is expensive, check
710 # checksum first 820 # checksum first
711 if (1) { 821 if (1) {
… …
728 838
729 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
730 my $data = $process->(\@data); 840 my $data = $process->(\@data);
731 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
732 842
733 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
734 844
735 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
736 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
737 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
738 848
… …
748 858
749=cut 859=cut
750 860
751sub datalog($@) { 861sub datalog($@) {
752 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
753 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
754} 864}
755 865
756=back 866=back
757 867
758=cut 868=cut
… …
953 1063
954 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
955 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
956 1066
957 } elsif (ref $type) { 1067 } elsif (ref $type) {
958 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
959 1069
960 } else { 1070 } else {
961 shift @arg; 1071 shift @arg;
962 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
963 } 1073 }
964 } 1074 }
965} 1075}
966 1076
967sub _object_attach { 1077sub _object_attach {
… …
977 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
978 } 1088 }
979 1089
980 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
981 } else { 1091 } else {
982 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
983 } 1093 }
984 1094
985 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
986} 1096}
987 1097
… …
1046 1156
1047 for (@$callbacks) { 1157 for (@$callbacks) {
1048 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
1049 1159
1050 if ($@) { 1160 if ($@) {
1051 warn "$@";
1052 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1053 override; 1162 override;
1054 } 1163 }
1055 1164
1056 return 1 if $override; 1165 return 1 if $override;
1057 } 1166 }
… …
1136 for (@$attach) { 1245 for (@$attach) {
1137 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
1138 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
1139 } 1248 }
1140 } else { 1249 } else {
1141 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
1142 } 1251 }
1143 } 1252 }
1144} 1253}
1145 1254
1146cf::attachable->attach ( 1255cf::attachable->attach (
… …
1173 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1174 1283
1175 sync_job { 1284 sync_job {
1176 if (length $$rdata) { 1285 if (length $$rdata) {
1177 utf8::decode (my $decname = $filename); 1286 utf8::decode (my $decname = $filename);
1178 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1179 $decname, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1180 1290
1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1182 aio_chmod $fh, SAVE_MODE; 1292 aio_chmod $fh, SAVE_MODE;
1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1184 if ($cf::USE_FSYNC) { 1294 if ($cf::USE_FSYNC) {
… …
1206 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1207 1317
1208 $filename =~ s%/[^/]+$%%; 1318 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC; 1319 aio_pathsync $filename if $cf::USE_FSYNC;
1210 } else { 1320 } else {
1211 warn "unable to save objects: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1212 } 1322 }
1213 } else { 1323 } else {
1214 aio_unlink $filename; 1324 aio_unlink $filename;
1215 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1216 } 1326 }
… …
1240 my $st = eval { Coro::Storable::thaw $av }; 1350 my $st = eval { Coro::Storable::thaw $av };
1241 $av = $st->{objs}; 1351 $av = $st->{objs};
1242 } 1352 }
1243 1353
1244 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1245 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1246 $decname, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1247 1358
1248 ($data, $av) 1359 ($data, $av)
1249} 1360}
1250 1361
1251=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
… …
1310} 1421}
1311 1422
1312use File::Glob (); 1423use File::Glob ();
1313 1424
1314cf::player->attach ( 1425cf::player->attach (
1315 on_command => sub { 1426 on_unknown_command => sub {
1316 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
1317 1428
1318 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
1319 or return; 1430 or return;
1320 1431
… …
1343 1454
1344 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1345 if $reply; 1456 if $reply;
1346 1457
1347 } else { 1458 } else {
1348 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1349 } 1460 }
1350 1461
1351 cf::override; 1462 cf::override;
1352 }, 1463 },
1353); 1464);
… …
1364 1475
1365 $grp 1476 $grp
1366} 1477}
1367 1478
1368sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1369 cf::sync_job { 1482 cf::sync_job {
1370 my %todo; 1483 my %todo;
1371 1484
1372 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1373 next unless -r $path; 1486 next unless -r $path;
… …
1391 1504
1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1394 1507
1395 $ext{source} = 1508 $ext{source} =
1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1397 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1398 . $source 1511 . $source
1399 . "\n};\n1"; 1512 . "\n};\n1";
1400 1513
1401 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
… …
1413 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1414 next ext 1527 next ext
1415 unless exists $done{$_}; 1528 unless exists $done{$_};
1416 } 1529 }
1417 1530
1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1419 1532
1420 my $active = eval $v->{source}; 1533 my $active = eval $v->{source};
1421 1534
1422 if (length $@) { 1535 if (length $@) {
1423 warn "$v->{path}: $@\n"; 1536 error "$v->{path}: $@\n";
1424 1537
1425 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1426 if exists $v->{meta}{mandatory}; 1539 if exists $v->{meta}{mandatory};
1540
1541 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1542 delete $todo{$k};
1427 } else { 1543 } else {
1428 $done{$k} = delete $todo{$k}; 1544 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg}; 1545 push @EXTS, $v->{pkg};
1430 $progress = 1; 1546 $progress = 1;
1431 1547
1432 warn "$v->{base}: extension inactive.\n" 1548 info "$v->{base}: extension inactive.\n"
1433 unless $active; 1549 unless $active;
1434 } 1550 }
1435 } 1551 }
1436 1552
1437 unless ($progress) { 1553 unless ($progress) {
… …
1439 1555
1440 while (my ($k, $v) = each %todo) { 1556 while (my ($k, $v) = each %todo) {
1441 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1557 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1442 if exists $v->{meta}{mandatory}; 1558 if exists $v->{meta}{mandatory};
1443 } 1559 }
1560
1561 last;
1444 } 1562 }
1445 } 1563 }
1446 }; 1564 };
1447} 1565}
1448 1566
… …
1533 $cf::PLAYER{$login} = $pl 1651 $cf::PLAYER{$login} = $pl
1534 } 1652 }
1535 } 1653 }
1536} 1654}
1537 1655
1656cf::player->attach (
1657 on_load => sub {
1658 my ($pl, $path) = @_;
1659
1660 # restore slots saved in save, below
1661 my $slots = delete $pl->{_slots};
1662
1663 $pl->ob->current_weapon ($slots->[0]);
1664 $pl->combat_ob ($slots->[1]);
1665 $pl->ranged_ob ($slots->[2]);
1666 },
1667);
1668
1538sub save($) { 1669sub save($) {
1539 my ($pl) = @_; 1670 my ($pl) = @_;
1540 1671
1541 return if $pl->{deny_save}; 1672 return if $pl->{deny_save};
1542 1673
… …
1547 1678
1548 aio_mkdir playerdir $pl, 0770; 1679 aio_mkdir playerdir $pl, 0770;
1549 $pl->{last_save} = $cf::RUNTIME; 1680 $pl->{last_save} = $cf::RUNTIME;
1550 1681
1551 cf::get_slot 0.01; 1682 cf::get_slot 0.01;
1683
1684 # save slots, to be restored later
1685 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1552 1686
1553 $pl->save_pl ($path); 1687 $pl->save_pl ($path);
1554 cf::cede_to_tick; 1688 cf::cede_to_tick;
1555} 1689}
1556 1690
… …
1590 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1591 1725
1592 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1593 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1727 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1594 1728
1595 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1596 $pl->deactivate; 1730 $pl->deactivate;
1731
1597 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1732 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1598 $pl->ob->check_score;
1599 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1600 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1601 1737
1602 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1603 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1604 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
… …
1658 \@logins 1794 \@logins
1659} 1795}
1660 1796
1661=item $player->maps 1797=item $player->maps
1662 1798
1799=item cf::player::maps $login
1800
1663Returns an arrayref of map paths that are private for this 1801Returns an arrayref of map paths that are private for this
1664player. May block. 1802player. May block.
1665 1803
1666=cut 1804=cut
1667 1805
… …
1729=cut 1867=cut
1730 1868
1731sub find_by_path($) { 1869sub find_by_path($) {
1732 my ($path) = @_; 1870 my ($path) = @_;
1733 1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1873
1734 my ($match, $specificity); 1874 my ($match, $specificity);
1735 1875
1736 for my $region (list) { 1876 for my $region (list) {
1737 if ($region->{match} && $path =~ $region->{match}) { 1877 if ($region->{match} && $path =~ $region->{match}) {
1738 ($match, $specificity) = ($region, $region->specificity) 1878 ($match, $specificity) = ($region, $region->specificity)
… …
1766sub generate_random_map { 1906sub generate_random_map {
1767 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1768 1908
1769 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1909 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1770 1910
1771 # mit "rum" bekleckern, nicht
1772 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1773 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1774 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1775 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1776 $rmp->{exit_on_final_map},
1777 $rmp->{xsize}, $rmp->{ysize},
1778 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1779 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1780 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1781 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1782 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1783 (cf::region::find $rmp->{region}), $rmp->{custom}
1784 )
1785} 1912}
1786 1913
1787=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1788 1915
1789Register a handler for the map path matching the given regex at the 1916Register a handler for the map path matching the given regex at the
… …
1794 1921
1795sub register { 1922sub register {
1796 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1797 my $pkg = caller; 1924 my $pkg = caller;
1798 1925
1799 no strict;
1800 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1801 1927
1802 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1803} 1929}
1804 1930
1805# also paths starting with '/' 1931# also paths starting with '/'
1806$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1807 1933
1808sub thawer_merge { 1934sub thawer_merge {
1809 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1810 1936
1811 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
… …
1816} 1942}
1817 1943
1818sub normalise { 1944sub normalise {
1819 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1820 1946
1821 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1822 1948
1823 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1824 1950
1825 # map plan: 1951 # map plan:
1826 # 1952 #
… …
1828 # {... are special paths that are not being touched 1954 # {... are special paths that are not being touched
1829 # ?xxx/... are special absolute paths 1955 # ?xxx/... are special absolute paths
1830 # ?random/... random maps 1956 # ?random/... random maps
1831 # /... normal maps 1957 # /... normal maps
1832 # ~user/... per-player map of a specific user 1958 # ~user/... per-player map of a specific user
1959 # !up !down for quad maps, or other maps with up/down layers
1833 1960
1834 $path =~ s/$PATH_SEP/\//go; 1961 $path =~ s/$PATH_SEP/\//go;
1835 1962
1836 # treat it as relative path if it starts with 1963 # treat it as relative path if it starts with
1837 # something that looks reasonable 1964 # something that looks reasonable
1838 if ($path =~ m{^(?:\./|\.\./|\w)}) { 1965 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1839 $base or Carp::carp "normalise called with relative path and no base: '$path'"; 1966 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1840 1967
1841 $base =~ s{[^/]+/?$}{}; 1968 $base =~ s{[^/]+/?$}{};
1842 $path = "$base/$path"; 1969 $path = "$base/$path";
1970
1971 } elsif ($path eq '!up') {
1972 $base && ref $base
1973 or Carp::carp "normalise called with relative tile path and no base: '$path'";
1974
1975 my $uppth = $base->tile_path (cf::TILE_UP);
1976 $path = $uppth if $uppth;
1977
1978 } elsif ($path eq '!down') {
1979 $base && ref $base
1980 or Carp::carp "normalise called with relative tile path and no base: '$path'";
1981
1982 my $dpth = $base->tile_path (cf::TILE_DOWN);
1983 $path = $dpth if $dpth;
1843 } 1984 }
1844 1985
1845 for ($path) { 1986 for ($path) {
1846 redo if s{//}{/};
1847 redo if s{/\.?/}{/}; 1987 redo if s{/\.?/}{/};
1848 redo if s{/[^/]+/\.\./}{/}; 1988 redo if s{/[^/]+/\.\./}{/};
1849 } 1989 }
1850 1990
1851 $path 1991 $path
… …
1865 $self->init; # pass $1 etc. 2005 $self->init; # pass $1 etc.
1866 return $self; 2006 return $self;
1867 } 2007 }
1868 } 2008 }
1869 2009
1870 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2010 Carp::cluck "unable to resolve path '$path' (base '$base')";
1871 () 2011 ()
1872} 2012}
1873 2013
2014# may re-bless or do other evil things
1874sub init { 2015sub init {
1875 my ($self) = @_; 2016 my ($self) = @_;
1876 2017
1877 $self 2018 $self
1878} 2019}
… …
1998 2139
1999sub find; 2140sub find;
2000sub find { 2141sub find {
2001 my ($path, $origin) = @_; 2142 my ($path, $origin) = @_;
2002 2143
2144 cf::cede_to_tick;
2145
2003 $path = normalise $path, $origin && $origin->path; 2146 $path = normalise $path, $origin;
2004 2147
2005 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2148 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2006 my $guard2 = cf::lock_acquire "map_find:$path"; 2149 my $guard2 = cf::lock_acquire "map_find:$path";
2007 2150
2008 $cf::MAP{$path} || do { 2151 $cf::MAP{$path} || do {
… …
2048 $self->alloc; 2191 $self->alloc;
2049 2192
2050 $self->pre_load; 2193 $self->pre_load;
2051 cf::cede_to_tick; 2194 cf::cede_to_tick;
2052 2195
2196 if (exists $self->{load_path}) {
2053 my $f = new_from_file cf::object::thawer $self->{load_path}; 2197 my $f = new_from_file cf::object::thawer $self->{load_path};
2054 $f->skip_block; 2198 $f->skip_block;
2055 $self->_load_objects ($f) 2199 $self->_load_objects ($f)
2056 or return; 2200 or return;
2057 2201
2058 $self->post_load_original 2202 $self->post_load_original
2059 if delete $self->{load_original}; 2203 if delete $self->{load_original};
2060 2204
2061 if (my $uniq = $self->uniq_path) { 2205 if (my $uniq = $self->uniq_path) {
2062 utf8::encode $uniq; 2206 utf8::encode $uniq;
2063 unless (aio_stat $uniq) { 2207 unless (aio_stat $uniq) {
2064 if (my $f = new_from_file cf::object::thawer $uniq) { 2208 if (my $f = new_from_file cf::object::thawer $uniq) {
2065 $self->clear_unique_items; 2209 $self->clear_unique_items;
2066 $self->_load_objects ($f); 2210 $self->_load_objects ($f);
2067 $f->resolve_delayed_derefs; 2211 $f->resolve_delayed_derefs;
2212 }
2068 } 2213 }
2069 } 2214 }
2070 }
2071 2215
2072 $f->resolve_delayed_derefs; 2216 $f->resolve_delayed_derefs;
2217 }
2073 2218
2074 cf::cede_to_tick; 2219 cf::cede_to_tick;
2075 # now do the right thing for maps 2220 # now do the right thing for maps
2076 $self->link_multipart_objects; 2221 $self->link_multipart_objects;
2077 $self->difficulty ($self->estimate_difficulty) 2222 $self->difficulty ($self->estimate_difficulty)
… …
2091 2236
2092 $self->in_memory (cf::MAP_ACTIVE); 2237 $self->in_memory (cf::MAP_ACTIVE);
2093 } 2238 }
2094 2239
2095 $self->post_load; 2240 $self->post_load;
2096}
2097 2241
2242 1
2243}
2244
2245# customize the map for a given player, i.e.
2246# return the _real_ map. used by e.g. per-player
2247# maps to change the path to ~playername/mappath
2098sub customise_for { 2248sub customise_for {
2099 my ($self, $ob) = @_; 2249 my ($self, $ob) = @_;
2100 2250
2101 return find "~" . $ob->name . "/" . $self->{path} 2251 return find "~" . $ob->name . "/" . $self->{path}
2102 if $self->per_player; 2252 if $self->per_player;
… …
2118 or next; 2268 or next;
2119 $neigh = find $neigh, $map 2269 $neigh = find $neigh, $map
2120 or next; 2270 or next;
2121 $neigh->load; 2271 $neigh->load;
2122 2272
2273 # now find the diagonal neighbours
2123 push @neigh, 2274 push @neigh,
2124 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2275 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2125 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2276 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2126 } 2277 }
2127 2278
… …
2134} 2285}
2135 2286
2136sub find_sync { 2287sub find_sync {
2137 my ($path, $origin) = @_; 2288 my ($path, $origin) = @_;
2138 2289
2139 cf::sync_job { find $path, $origin } 2290 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2291 if $Coro::current == $Coro::main;
2292
2293 find $path, $origin
2140} 2294}
2141 2295
2142sub do_load_sync { 2296sub do_load_sync {
2143 my ($map) = @_; 2297 my ($map) = @_;
2144 2298
2145 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2299 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2146 if $Coro::current == $Coro::main; 2300 if $Coro::current == $Coro::main;
2147 2301
2148 cf::sync_job { $map->load }; 2302 $map->load;
2149} 2303}
2150 2304
2151our %MAP_PREFETCH; 2305our %MAP_PREFETCH;
2152our $MAP_PREFETCHER = undef; 2306our $MAP_PREFETCHER = undef;
2153 2307
2154sub find_async { 2308sub find_async {
2155 my ($path, $origin, $load) = @_; 2309 my ($path, $origin, $load) = @_;
2156 2310
2157 $path = normalise $path, $origin && $origin->{path}; 2311 $path = normalise $path, $origin;
2158 2312
2159 if (my $map = $cf::MAP{$path}) { 2313 if (my $map = $cf::MAP{$path}) {
2160 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2314 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2161 } 2315 }
2162 2316
… …
2179 $MAP_PREFETCHER->prio (6); 2333 $MAP_PREFETCHER->prio (6);
2180 2334
2181 () 2335 ()
2182} 2336}
2183 2337
2338# common code, used by both ->save and ->swapout
2184sub save { 2339sub _save {
2185 my ($self) = @_; 2340 my ($self) = @_;
2186
2187 my $lock = cf::lock_acquire "map_data:$self->{path}";
2188 2341
2189 $self->{last_save} = $cf::RUNTIME; 2342 $self->{last_save} = $cf::RUNTIME;
2190 2343
2191 return unless $self->dirty; 2344 return unless $self->dirty;
2192 2345
… …
2212 } else { 2365 } else {
2213 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2366 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2214 } 2367 }
2215} 2368}
2216 2369
2370sub save {
2371 my ($self) = @_;
2372
2373 my $lock = cf::lock_acquire "map_data:$self->{path}";
2374
2375 $self->_save;
2376}
2377
2217sub swap_out { 2378sub swap_out {
2218 my ($self) = @_; 2379 my ($self) = @_;
2219 2380
2220 # save first because save cedes
2221 $self->save;
2222
2223 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2381 my $lock = cf::lock_acquire "map_data:$self->{path}";
2224 2382
2225 return if $self->players;
2226 return if $self->in_memory != cf::MAP_ACTIVE; 2383 return if $self->in_memory != cf::MAP_ACTIVE;
2227 return if $self->{deny_save}; 2384 return if $self->{deny_save};
2385 return if $self->players;
2228 2386
2387 # first deactivate the map and "unlink" it from the core
2388 $self->deactivate;
2389 $_->clear_links_to ($self) for values %cf::MAP;
2229 $self->in_memory (cf::MAP_SWAPPED); 2390 $self->in_memory (cf::MAP_SWAPPED);
2391
2392 # then atomically save
2393 $self->_save;
2394
2395 # then free the map
2396 $self->clear;
2397}
2398
2399sub reset_at {
2400 my ($self) = @_;
2401
2402 # TODO: safety, remove and allow resettable per-player maps
2403 return 1e99 if $self->{deny_reset};
2404
2405 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2406 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2407
2408 $time + $to
2409}
2410
2411sub should_reset {
2412 my ($self) = @_;
2413
2414 $self->reset_at <= $cf::RUNTIME
2415}
2416
2417sub reset {
2418 my ($self) = @_;
2419
2420 my $lock = cf::lock_acquire "map_data:$self->{path}";
2421
2422 return if $self->players;
2423
2424 cf::trace "resetting map ", $self->path, "\n";
2425
2426 $self->in_memory (cf::MAP_SWAPPED);
2427
2428 # need to save uniques path
2429 unless ($self->{deny_save}) {
2430 my $uniq = $self->uniq_path; utf8::encode $uniq;
2431
2432 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2433 if $uniq;
2434 }
2435
2436 delete $cf::MAP{$self->path};
2230 2437
2231 $self->deactivate; 2438 $self->deactivate;
2232 $_->clear_links_to ($self) for values %cf::MAP; 2439 $_->clear_links_to ($self) for values %cf::MAP;
2233 $self->clear; 2440 $self->clear;
2234}
2235
2236sub reset_at {
2237 my ($self) = @_;
2238
2239 # TODO: safety, remove and allow resettable per-player maps
2240 return 1e99 if $self->{deny_reset};
2241
2242 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2243 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2244
2245 $time + $to
2246}
2247
2248sub should_reset {
2249 my ($self) = @_;
2250
2251 $self->reset_at <= $cf::RUNTIME
2252}
2253
2254sub reset {
2255 my ($self) = @_;
2256
2257 my $lock = cf::lock_acquire "map_data:$self->{path}";
2258
2259 return if $self->players;
2260
2261 warn "resetting map ", $self->path, "\n";
2262
2263 $self->in_memory (cf::MAP_SWAPPED);
2264
2265 # need to save uniques path
2266 unless ($self->{deny_save}) {
2267 my $uniq = $self->uniq_path; utf8::encode $uniq;
2268
2269 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2270 if $uniq;
2271 }
2272
2273 delete $cf::MAP{$self->path};
2274
2275 $self->deactivate;
2276 $_->clear_links_to ($self) for values %cf::MAP;
2277 $self->clear;
2278 2441
2279 $self->unlink_save; 2442 $self->unlink_save;
2280 $self->destroy; 2443 $self->destroy;
2281} 2444}
2282 2445
… …
2290 2453
2291 delete $cf::MAP{$self->path}; 2454 delete $cf::MAP{$self->path};
2292 2455
2293 $self->unlink_save; 2456 $self->unlink_save;
2294 2457
2295 bless $self, "cf::map"; 2458 bless $self, "cf::map::wrap";
2296 delete $self->{deny_reset}; 2459 delete $self->{deny_reset};
2297 $self->{deny_save} = 1; 2460 $self->{deny_save} = 1;
2298 $self->reset_timeout (1); 2461 $self->reset_timeout (1);
2299 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2462 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2300 2463
… …
2530 2693
2531Freezes the player and moves him/her to a special map (C<{link}>). 2694Freezes the player and moves him/her to a special map (C<{link}>).
2532 2695
2533The player should be reasonably safe there for short amounts of time (e.g. 2696The player should be reasonably safe there for short amounts of time (e.g.
2534for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2697for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2535though, as the palyer cannot control the character while it is on the link 2698though, as the player cannot control the character while it is on the link
2536map. 2699map.
2537 2700
2538Will never block. 2701Will never block.
2539 2702
2540=item $player_object->leave_link ($map, $x, $y) 2703=item $player_object->leave_link ($map, $x, $y)
… …
2561sub cf::object::player::enter_link { 2724sub cf::object::player::enter_link {
2562 my ($self) = @_; 2725 my ($self) = @_;
2563 2726
2564 $self->deactivate_recursive; 2727 $self->deactivate_recursive;
2565 2728
2729 ++$self->{_link_recursion};
2730
2566 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2731 return if UNIVERSAL::isa $self->map, "ext::map_link";
2567 2732
2568 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2733 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2569 if $self->map && $self->map->{path} ne "{link}"; 2734 if $self->map && $self->map->{path} ne "{link}";
2570 2735
2571 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2736 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2572} 2737}
2573 2738
2574sub cf::object::player::leave_link { 2739sub cf::object::player::leave_link {
2575 my ($self, $map, $x, $y) = @_; 2740 my ($self, $map, $x, $y) = @_;
2576 2741
… …
2601 $map->load_neighbours; 2766 $map->load_neighbours;
2602 2767
2603 return unless $self->contr->active; 2768 return unless $self->contr->active;
2604 2769
2605 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2770 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2606 $self->enter_map ($map, $x, $y); 2771 if ($self->enter_map ($map, $x, $y)) {
2607 2772 # entering was successful
2773 delete $self->{_link_recursion};
2608 # only activate afterwards, to support waiting in hooks 2774 # only activate afterwards, to support waiting in hooks
2609 $self->activate_recursive; 2775 $self->activate_recursive;
2610} 2776 }
2611 2777
2778}
2779
2612=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2780=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2613 2781
2614Moves the player to the given map-path and coordinates by first freezing 2782Moves the player to the given map-path and coordinates by first freezing
2615her, loading and preparing them map, calling the provided $check callback 2783her, loading and preparing them map, calling the provided $check callback
2616that has to return the map if sucecssful, and then unfreezes the player on 2784that has to return the map if sucecssful, and then unfreezes the player on
2617the new (success) or old (failed) map position. In either case, $done will 2785the new (success) or old (failed) map position. In either case, $done will
… …
2624 2792
2625our $GOTOGEN; 2793our $GOTOGEN;
2626 2794
2627sub cf::object::player::goto { 2795sub cf::object::player::goto {
2628 my ($self, $path, $x, $y, $check, $done) = @_; 2796 my ($self, $path, $x, $y, $check, $done) = @_;
2797
2798 if ($self->{_link_recursion} >= $MAX_LINKS) {
2799 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2800 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2801 ($path, $x, $y) = @$EMERGENCY_POSITION;
2802 }
2629 2803
2630 # do generation counting so two concurrent goto's will be executed in-order 2804 # do generation counting so two concurrent goto's will be executed in-order
2631 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2805 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2632 2806
2633 $self->enter_link; 2807 $self->enter_link;
… …
2653 ($path, $x, $y) = (undef, undef, undef); 2827 ($path, $x, $y) = (undef, undef, undef);
2654 } 2828 }
2655 } 2829 }
2656 2830
2657 my $map = eval { 2831 my $map = eval {
2658 my $map = defined $path ? cf::map::find $path : undef; 2832 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2659 2833
2660 if ($map) { 2834 if ($map) {
2661 $map = $map->customise_for ($self); 2835 $map = $map->customise_for ($self);
2662 $map = $check->($map) if $check && $map; 2836 $map = $check->($map, $x, $y, $self) if $check && $map;
2663 } else { 2837 } else {
2664 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2838 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2665 } 2839 }
2666 2840
2667 $map 2841 $map
… …
2675 if ($gen == $self->{_goto_generation}) { 2849 if ($gen == $self->{_goto_generation}) {
2676 delete $self->{_goto_generation}; 2850 delete $self->{_goto_generation};
2677 $self->leave_link ($map, $x, $y); 2851 $self->leave_link ($map, $x, $y);
2678 } 2852 }
2679 2853
2680 $done->() if $done; 2854 $done->($self) if $done;
2681 })->prio (1); 2855 })->prio (1);
2682} 2856}
2683 2857
2684=item $player_object->enter_exit ($exit_object) 2858=item $player_object->enter_exit ($exit_object)
2685 2859
… …
2761 2935
2762 prepare_random_map $exit 2936 prepare_random_map $exit
2763 if $exit->slaying eq "/!"; 2937 if $exit->slaying eq "/!";
2764 } 2938 }
2765 2939
2766 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2940 my $map = cf::map::normalise $exit->slaying, $exit->map;
2767 my $x = $exit->stats->hp; 2941 my $x = $exit->stats->hp;
2768 my $y = $exit->stats->sp; 2942 my $y = $exit->stats->sp;
2769 2943
2770 $self->goto ($map, $x, $y); 2944 $self->goto ($map, $x, $y);
2771 2945
… …
2778 $self->message ("Something went wrong deep within the deliantra server. " 2952 $self->message ("Something went wrong deep within the deliantra server. "
2779 . "I'll try to bring you back to the map you were before. " 2953 . "I'll try to bring you back to the map you were before. "
2780 . "Please report this to the dungeon master!", 2954 . "Please report this to the dungeon master!",
2781 cf::NDI_UNIQUE | cf::NDI_RED); 2955 cf::NDI_UNIQUE | cf::NDI_RED);
2782 2956
2783 warn "ERROR in enter_exit: $@"; 2957 error "ERROR in enter_exit: $@";
2784 $self->leave_link; 2958 $self->leave_link;
2785 } 2959 }
2786 })->prio (1); 2960 })->prio (1);
2787} 2961}
2788 2962
… …
3101 3275
3102 $ns->ext_reply ($reply, @reply) 3276 $ns->ext_reply ($reply, @reply)
3103 if $reply; 3277 if $reply;
3104 3278
3105 } else { 3279 } else {
3106 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3280 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3107 } 3281 }
3108 3282
3109 cf::override; 3283 cf::override;
3110 }, 3284 },
3111); 3285);
… …
3131 3305
3132 $coro 3306 $coro
3133} 3307}
3134 3308
3135cf::client->attach ( 3309cf::client->attach (
3136 on_destroy => sub { 3310 on_client_destroy => sub {
3137 my ($ns) = @_; 3311 my ($ns) = @_;
3138 3312
3139 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3313 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3140 }, 3314 },
3141); 3315);
… …
3192 decrease split destroy change_exp value msg lore send_msg)], 3366 decrease split destroy change_exp value msg lore send_msg)],
3193 ["cf::object::player" => qw(player)], 3367 ["cf::object::player" => qw(player)],
3194 ["cf::player" => qw(peaceful send_msg)], 3368 ["cf::player" => qw(peaceful send_msg)],
3195 ["cf::map" => qw(trigger)], 3369 ["cf::map" => qw(trigger)],
3196) { 3370) {
3197 no strict 'refs';
3198 my ($pkg, @funs) = @$_; 3371 my ($pkg, @funs) = @$_;
3199 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3372 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3200 for @funs; 3373 for @funs;
3201} 3374}
3202 3375
… …
3241 local @cf::_safe_eval_args = values %vars; 3414 local @cf::_safe_eval_args = values %vars;
3242 @res = wantarray ? eval eval : scalar eval $eval; 3415 @res = wantarray ? eval eval : scalar eval $eval;
3243 } 3416 }
3244 3417
3245 if ($@) { 3418 if ($@) {
3246 warn "$@"; 3419 warn "$@",
3247 warn "while executing safe code '$code'\n"; 3420 "while executing safe code '$code'\n",
3248 warn "with arguments " . (join " ", %vars) . "\n"; 3421 "with arguments " . (join " ", %vars) . "\n";
3249 } 3422 }
3250 3423
3251 wantarray ? @res : $res[0] 3424 wantarray ? @res : $res[0]
3252} 3425}
3253 3426
… …
3287 # for this (global event?) 3460 # for this (global event?)
3288 %ext::player_env::MUSIC_FACE_CACHE = (); 3461 %ext::player_env::MUSIC_FACE_CACHE = ();
3289 3462
3290 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3463 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3291 3464
3292 warn "loading facedata from $path\n"; 3465 trace "loading facedata from $path\n";
3293 3466
3294 my $facedata; 3467 my $facedata = decode_storable load_file $path;
3295 0 < aio_load $path, $facedata
3296 or die "$path: $!";
3297
3298 $facedata = Coro::Storable::thaw $facedata;
3299 3468
3300 $facedata->{version} == 2 3469 $facedata->{version} == 2
3301 or cf::cleanup "$path: version mismatch, cannot proceed."; 3470 or cf::cleanup "$path: version mismatch, cannot proceed.";
3302 3471
3303 # patch in the exptable 3472 # patch in the exptable
… …
3317 3486
3318 cf::face::set_visibility $idx, $info->{visibility}; 3487 cf::face::set_visibility $idx, $info->{visibility};
3319 cf::face::set_magicmap $idx, $info->{magicmap}; 3488 cf::face::set_magicmap $idx, $info->{magicmap};
3320 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3489 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3321 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3490 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3491 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3322 3492
3323 cf::cede_to_tick; 3493 cf::cede_to_tick;
3324 } 3494 }
3325 3495
3326 while (my ($face, $info) = each %$faces) { 3496 while (my ($face, $info) = each %$faces) {
… …
3331 3501
3332 if (my $smooth = cf::face::find $info->{smooth}) { 3502 if (my $smooth = cf::face::find $info->{smooth}) {
3333 cf::face::set_smooth $idx, $smooth; 3503 cf::face::set_smooth $idx, $smooth;
3334 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3504 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3335 } else { 3505 } else {
3336 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3506 error "smooth face '$info->{smooth}' not found for face '$face'";
3337 } 3507 }
3338 3508
3339 cf::cede_to_tick; 3509 cf::cede_to_tick;
3340 } 3510 }
3341 } 3511 }
… …
3359 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3529 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3360 3530
3361 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3531 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3362 cf::face::set_type $idx, $info->{type}; 3532 cf::face::set_type $idx, $info->{type};
3363 } else { 3533 } else {
3364 $RESOURCE{$name} = $info; 3534 $RESOURCE{$name} = $info; # unused
3365 } 3535 }
3366 3536
3367 cf::cede_to_tick; 3537 cf::cede_to_tick;
3368 } 3538 }
3369 } 3539 }
3370 3540
3371 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3541 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3372 3542
3373 1 3543 1
3374} 3544}
3375
3376cf::global->attach (on_resource_update => sub {
3377 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3378 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3379
3380 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3381 my $sound = $soundconf->{compat}[$_]
3382 or next;
3383
3384 my $face = cf::face::find "sound/$sound->[1]";
3385 cf::sound::set $sound->[0] => $face;
3386 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3387 }
3388
3389 while (my ($k, $v) = each %{$soundconf->{event}}) {
3390 my $face = cf::face::find "sound/$v";
3391 cf::sound::set $k => $face;
3392 }
3393 }
3394});
3395 3545
3396register_exticmd fx_want => sub { 3546register_exticmd fx_want => sub {
3397 my ($ns, $want) = @_; 3547 my ($ns, $want) = @_;
3398 3548
3399 while (my ($k, $v) = each %$want) { 3549 while (my ($k, $v) = each %$want) {
… …
3438sub reload_treasures { 3588sub reload_treasures {
3439 load_resource_file "$DATADIR/treasures" 3589 load_resource_file "$DATADIR/treasures"
3440 or die "unable to load treasurelists\n"; 3590 or die "unable to load treasurelists\n";
3441} 3591}
3442 3592
3593sub reload_sound {
3594 trace "loading sound config from $DATADIR/sound\n";
3595
3596 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3597
3598 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3599 my $sound = $soundconf->{compat}[$_]
3600 or next;
3601
3602 my $face = cf::face::find "sound/$sound->[1]";
3603 cf::sound::set $sound->[0] => $face;
3604 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3605 }
3606
3607 while (my ($k, $v) = each %{$soundconf->{event}}) {
3608 my $face = cf::face::find "sound/$v";
3609 cf::sound::set $k => $face;
3610 }
3611}
3612
3443sub reload_resources { 3613sub reload_resources {
3444 warn "reloading resource files...\n"; 3614 trace "reloading resource files...\n";
3445 3615
3616 reload_exp_table;
3617 reload_materials;
3446 reload_facedata; 3618 reload_facedata;
3619 reload_sound;
3447 reload_archetypes; 3620 reload_archetypes;
3448 reload_regions; 3621 reload_regions;
3449 reload_treasures; 3622 reload_treasures;
3450 3623
3451 warn "finished reloading resource files\n"; 3624 trace "finished reloading resource files\n";
3452} 3625}
3453 3626
3454sub reload_config { 3627sub reload_config {
3455 warn "reloading config file...\n"; 3628 trace "reloading config file...\n";
3456 3629
3457 open my $fh, "<:utf8", "$CONFDIR/config" 3630 my $config = load_file "$CONFDIR/config";
3458 or return; 3631 utf8::decode $config;
3632 *CFG = decode_yaml $config;
3459 3633
3460 local $/;
3461 *CFG = YAML::XS::Load scalar <$fh>;
3462
3463 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3634 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3464 3635
3465 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3636 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3466 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3637 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3467 3638
3468 if (exists $CFG{mlockall}) { 3639 if (exists $CFG{mlockall}) {
… …
3470 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3641 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3471 and die "WARNING: m(un)lockall failed: $!\n"; 3642 and die "WARNING: m(un)lockall failed: $!\n";
3472 }; 3643 };
3473 warn $@ if $@; 3644 warn $@ if $@;
3474 } 3645 }
3475
3476 warn "finished reloading resource files\n";
3477} 3646}
3478 3647
3479sub pidfile() { 3648sub pidfile() {
3480 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3649 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3481 or die "$PIDFILE: $!"; 3650 or die "$PIDFILE: $!";
… …
3494 seek $fh, 0, 0; 3663 seek $fh, 0, 0;
3495 print $fh $$; 3664 print $fh $$;
3496} 3665}
3497 3666
3498sub main_loop { 3667sub main_loop {
3499 warn "EV::loop starting\n"; 3668 trace "EV::loop starting\n";
3500 if (1) { 3669 if (1) {
3501 EV::loop; 3670 EV::loop;
3502 } 3671 }
3503 warn "EV::loop returned\n"; 3672 trace "EV::loop returned\n";
3504 goto &main_loop unless $REALLY_UNLOOP; 3673 goto &main_loop unless $REALLY_UNLOOP;
3505} 3674}
3506 3675
3507sub main { 3676sub main {
3508 cf::init_globals; # initialise logging 3677 cf::init_globals; # initialise logging
3509 3678
3510 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3679 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3511 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3680 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3512 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3681 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3513 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3682 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3514
3515 cf::init_experience;
3516 cf::init_anim;
3517 cf::init_attackmess;
3518 cf::init_dynamic;
3519 3683
3520 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3684 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3521 3685
3522 # we must not ever block the main coroutine 3686 # we must not ever block the main coroutine
3523 local $Coro::idle = sub { 3687 local $Coro::idle = sub {
… …
3529 }; 3693 };
3530 3694
3531 evthread_start IO::AIO::poll_fileno; 3695 evthread_start IO::AIO::poll_fileno;
3532 3696
3533 cf::sync_job { 3697 cf::sync_job {
3698 cf::incloader::init ();
3699
3700 cf::init_anim;
3701 cf::init_attackmess;
3702 cf::init_dynamic;
3703
3534 cf::load_settings; 3704 cf::load_settings;
3535 cf::load_materials;
3536 3705
3537 reload_resources; 3706 reload_resources;
3538 reload_config; 3707 reload_config;
3539 db_init; 3708 db_init;
3540 3709
3541 cf::init_uuid; 3710 cf::init_uuid;
3542 cf::init_signals; 3711 cf::init_signals;
3543 cf::init_commands;
3544 cf::init_skills; 3712 cf::init_skills;
3545 3713
3546 cf::init_beforeplay; 3714 cf::init_beforeplay;
3547 3715
3548 atomic; 3716 atomic;
… …
3553 3721
3554 # no (long-running) fork's whatsoever before this point(!) 3722 # no (long-running) fork's whatsoever before this point(!)
3555 use POSIX (); 3723 use POSIX ();
3556 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3724 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3557 3725
3558 (pop @POST_INIT)->(0) while @POST_INIT; 3726 cf::_post_init 0;
3559 }; 3727 };
3560 3728
3729 cf::object::thawer::errors_are_fatal 0;
3730 info "parse errors in files are no longer fatal from this point on.\n";
3731
3732 my $free_main; $free_main = EV::idle sub {
3733 undef $free_main;
3734 undef &main; # free gobs of memory :)
3735 };
3736
3561 main_loop; 3737 goto &main_loop;
3562} 3738}
3563 3739
3564############################################################################# 3740#############################################################################
3565# initialisation and cleanup 3741# initialisation and cleanup
3566 3742
3567# install some emergency cleanup handlers 3743# install some emergency cleanup handlers
3568BEGIN { 3744BEGIN {
3569 our %SIGWATCHER = (); 3745 our %SIGWATCHER = ();
3570 for my $signal (qw(INT HUP TERM)) { 3746 for my $signal (qw(INT HUP TERM)) {
3571 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3747 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3572 cf::cleanup "SIG$signal"; 3748 cf::cleanup "SIG$signal";
3573 }; 3749 };
3574 } 3750 }
3575} 3751}
3576 3752
3577sub write_runtime_sync { 3753sub write_runtime_sync {
3578 my $t0 = EV::time; 3754 my $t0 = AE::time;
3579 3755
3580 # first touch the runtime file to show we are still running: 3756 # first touch the runtime file to show we are still running:
3581 # the fsync below can take a very very long time. 3757 # the fsync below can take a very very long time.
3582 3758
3583 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3759 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
… …
3605 or return; 3781 or return;
3606 3782
3607 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3783 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3608 and return; 3784 and return;
3609 3785
3610 warn sprintf "runtime file written (%gs).\n", EV::time - $t0; 3786 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3611 3787
3612 1 3788 1
3613} 3789}
3614 3790
3615our $uuid_lock; 3791our $uuid_lock;
… …
3627 or return; 3803 or return;
3628 3804
3629 my $value = uuid_seq uuid_cur; 3805 my $value = uuid_seq uuid_cur;
3630 3806
3631 unless ($value) { 3807 unless ($value) {
3632 warn "cowardly refusing to write zero uuid value!\n"; 3808 info "cowardly refusing to write zero uuid value!\n";
3633 return; 3809 return;
3634 } 3810 }
3635 3811
3636 my $value = uuid_str $value + $uuid_skip; 3812 my $value = uuid_str $value + $uuid_skip;
3637 $uuid_skip = 0; 3813 $uuid_skip = 0;
… …
3647 or return; 3823 or return;
3648 3824
3649 aio_rename "$uuid~", $uuid 3825 aio_rename "$uuid~", $uuid
3650 and return; 3826 and return;
3651 3827
3652 warn "uuid file written ($value).\n"; 3828 trace "uuid file written ($value).\n";
3653 3829
3654 1 3830 1
3655 3831
3656} 3832}
3657 3833
… …
3663} 3839}
3664 3840
3665sub emergency_save() { 3841sub emergency_save() {
3666 my $freeze_guard = cf::freeze_mainloop; 3842 my $freeze_guard = cf::freeze_mainloop;
3667 3843
3668 warn "emergency_perl_save: enter\n"; 3844 info "emergency_perl_save: enter\n";
3845
3846 # this is a trade-off: we want to be very quick here, so
3847 # save all maps without fsync, and later call a global sync
3848 # (which in turn might be very very slow)
3849 local $USE_FSYNC = 0;
3669 3850
3670 cf::sync_job { 3851 cf::sync_job {
3671 # this is a trade-off: we want to be very quick here, so 3852 cf::write_runtime_sync; # external watchdog should not bark
3672 # save all maps without fsync, and later call a global sync
3673 # (which in turn might be very very slow)
3674 local $USE_FSYNC = 0;
3675 3853
3676 # use a peculiar iteration method to avoid tripping on perl 3854 # use a peculiar iteration method to avoid tripping on perl
3677 # refcount bugs in for. also avoids problems with players 3855 # refcount bugs in for. also avoids problems with players
3678 # and maps saved/destroyed asynchronously. 3856 # and maps saved/destroyed asynchronously.
3679 warn "emergency_perl_save: begin player save\n"; 3857 info "emergency_perl_save: begin player save\n";
3680 for my $login (keys %cf::PLAYER) { 3858 for my $login (keys %cf::PLAYER) {
3681 my $pl = $cf::PLAYER{$login} or next; 3859 my $pl = $cf::PLAYER{$login} or next;
3682 $pl->valid or next; 3860 $pl->valid or next;
3683 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3861 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3684 $pl->save; 3862 $pl->save;
3685 } 3863 }
3686 warn "emergency_perl_save: end player save\n"; 3864 info "emergency_perl_save: end player save\n";
3687 3865
3866 cf::write_runtime_sync; # external watchdog should not bark
3867
3688 warn "emergency_perl_save: begin map save\n"; 3868 info "emergency_perl_save: begin map save\n";
3689 for my $path (keys %cf::MAP) { 3869 for my $path (keys %cf::MAP) {
3690 my $map = $cf::MAP{$path} or next; 3870 my $map = $cf::MAP{$path} or next;
3691 $map->valid or next; 3871 $map->valid or next;
3692 $map->save; 3872 $map->save;
3693 } 3873 }
3694 warn "emergency_perl_save: end map save\n"; 3874 info "emergency_perl_save: end map save\n";
3695 3875
3876 cf::write_runtime_sync; # external watchdog should not bark
3877
3696 warn "emergency_perl_save: begin database checkpoint\n"; 3878 info "emergency_perl_save: begin database checkpoint\n";
3697 BDB::db_env_txn_checkpoint $DB_ENV; 3879 BDB::db_env_txn_checkpoint $DB_ENV;
3698 warn "emergency_perl_save: end database checkpoint\n"; 3880 info "emergency_perl_save: end database checkpoint\n";
3699 3881
3700 warn "emergency_perl_save: begin write uuid\n"; 3882 info "emergency_perl_save: begin write uuid\n";
3701 write_uuid_sync 1; 3883 write_uuid_sync 1;
3702 warn "emergency_perl_save: end write uuid\n"; 3884 info "emergency_perl_save: end write uuid\n";
3885
3886 cf::write_runtime_sync; # external watchdog should not bark
3887
3888 trace "emergency_perl_save: syncing database to disk";
3889 BDB::db_env_txn_checkpoint $DB_ENV;
3890
3891 info "emergency_perl_save: starting sync\n";
3892 IO::AIO::aio_sync sub {
3893 info "emergency_perl_save: finished sync\n";
3894 };
3895
3896 cf::write_runtime_sync; # external watchdog should not bark
3897
3898 trace "emergency_perl_save: flushing outstanding aio requests";
3899 while (IO::AIO::nreqs || BDB::nreqs) {
3900 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3901 }
3902
3903 cf::write_runtime_sync; # external watchdog should not bark
3703 }; 3904 };
3704 3905
3705 warn "emergency_perl_save: starting sync()\n";
3706 IO::AIO::aio_sync sub {
3707 warn "emergency_perl_save: finished sync()\n";
3708 };
3709
3710 warn "emergency_perl_save: leave\n"; 3906 info "emergency_perl_save: leave\n";
3711} 3907}
3712 3908
3713sub post_cleanup { 3909sub post_cleanup {
3714 my ($make_core) = @_; 3910 my ($make_core) = @_;
3715 3911
3912 IO::AIO::flush;
3913
3716 warn Carp::longmess "post_cleanup backtrace" 3914 error Carp::longmess "post_cleanup backtrace"
3717 if $make_core; 3915 if $make_core;
3718 3916
3719 my $fh = pidfile; 3917 my $fh = pidfile;
3720 unlink $PIDFILE if <$fh> == $$; 3918 unlink $PIDFILE if <$fh> == $$;
3721} 3919}
… …
3741 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3939 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3742 for my $name (keys %$leaf_symtab) { 3940 for my $name (keys %$leaf_symtab) {
3743 _gv_clear *{"$pkg$name"}; 3941 _gv_clear *{"$pkg$name"};
3744# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3942# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3745 } 3943 }
3746 warn "cleared package $pkg\n";#d#
3747} 3944}
3748 3945
3749sub do_reload_perl() { 3946sub do_reload_perl() {
3750 # can/must only be called in main 3947 # can/must only be called in main
3751 if ($Coro::current != $Coro::main) { 3948 unless (in_main) {
3752 warn "can only reload from main coroutine"; 3949 error "can only reload from main coroutine";
3753 return; 3950 return;
3754 } 3951 }
3755 3952
3756 return if $RELOAD++; 3953 return if $RELOAD++;
3757 3954
3758 my $t1 = EV::time; 3955 my $t1 = AE::time;
3759 3956
3760 while ($RELOAD) { 3957 while ($RELOAD) {
3761 warn "reloading..."; 3958 cf::get_slot 0.1, -1, "reload_perl";
3959 info "perl_reload: reloading...";
3762 3960
3763 warn "entering sync_job"; 3961 trace "perl_reload: entering sync_job";
3764 3962
3765 cf::sync_job { 3963 cf::sync_job {
3766 cf::write_runtime_sync; # external watchdog should not bark
3767 cf::emergency_save; 3964 #cf::emergency_save;
3768 cf::write_runtime_sync; # external watchdog should not bark
3769 3965
3770 warn "syncing database to disk";
3771 BDB::db_env_txn_checkpoint $DB_ENV;
3772
3773 # if anything goes wrong in here, we should simply crash as we already saved
3774
3775 warn "flushing outstanding aio requests";
3776 while (IO::AIO::nreqs || BDB::nreqs) {
3777 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3778 }
3779
3780 warn "cancelling all extension coros"; 3966 trace "perl_reload: cancelling all extension coros";
3781 $_->cancel for values %EXT_CORO; 3967 $_->cancel for values %EXT_CORO;
3782 %EXT_CORO = (); 3968 %EXT_CORO = ();
3783 3969
3784 warn "removing commands"; 3970 trace "perl_reload: removing commands";
3785 %COMMAND = (); 3971 %COMMAND = ();
3786 3972
3787 warn "removing ext/exti commands"; 3973 trace "perl_reload: removing ext/exti commands";
3788 %EXTCMD = (); 3974 %EXTCMD = ();
3789 %EXTICMD = (); 3975 %EXTICMD = ();
3790 3976
3791 warn "unloading/nuking all extensions"; 3977 trace "perl_reload: unloading/nuking all extensions";
3792 for my $pkg (@EXTS) { 3978 for my $pkg (@EXTS) {
3793 warn "... unloading $pkg"; 3979 trace "... unloading $pkg";
3794 3980
3795 if (my $cb = $pkg->can ("unload")) { 3981 if (my $cb = $pkg->can ("unload")) {
3796 eval { 3982 eval {
3797 $cb->($pkg); 3983 $cb->($pkg);
3798 1 3984 1
3799 } or warn "$pkg unloaded, but with errors: $@"; 3985 } or error "$pkg unloaded, but with errors: $@";
3800 } 3986 }
3801 3987
3802 warn "... clearing $pkg"; 3988 trace "... clearing $pkg";
3803 clear_package $pkg; 3989 clear_package $pkg;
3804 } 3990 }
3805 3991
3806 warn "unloading all perl modules loaded from $LIBDIR"; 3992 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3807 while (my ($k, $v) = each %INC) { 3993 while (my ($k, $v) = each %INC) {
3808 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3994 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3809 3995
3810 warn "... unloading $k"; 3996 trace "... unloading $k";
3811 delete $INC{$k}; 3997 delete $INC{$k};
3812 3998
3813 $k =~ s/\.pm$//; 3999 $k =~ s/\.pm$//;
3814 $k =~ s/\//::/g; 4000 $k =~ s/\//::/g;
3815 4001
… …
3818 } 4004 }
3819 4005
3820 clear_package $k; 4006 clear_package $k;
3821 } 4007 }
3822 4008
3823 warn "getting rid of safe::, as good as possible"; 4009 trace "perl_reload: getting rid of safe::, as good as possible";
3824 clear_package "safe::$_" 4010 clear_package "safe::$_"
3825 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4011 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3826 4012
3827 warn "unloading cf.pm \"a bit\""; 4013 trace "perl_reload: unloading cf.pm \"a bit\"";
3828 delete $INC{"cf.pm"}; 4014 delete $INC{"cf.pm"};
3829 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4015 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3830 4016
3831 # don't, removes xs symbols, too, 4017 # don't, removes xs symbols, too,
3832 # and global variables created in xs 4018 # and global variables created in xs
3833 #clear_package __PACKAGE__; 4019 #clear_package __PACKAGE__;
3834 4020
3835 warn "unload completed, starting to reload now"; 4021 info "perl_reload: unload completed, starting to reload now";
3836 4022
3837 warn "reloading cf.pm"; 4023 trace "perl_reload: reloading cf.pm";
3838 require cf; 4024 require cf;
3839 cf::_connect_to_perl_1; 4025 cf::_connect_to_perl_1;
3840 4026
3841 warn "loading config and database again"; 4027 trace "perl_reload: loading config and database again";
3842 cf::reload_config; 4028 cf::reload_config;
3843 4029
3844 warn "loading extensions"; 4030 trace "perl_reload: loading extensions";
3845 cf::load_extensions; 4031 cf::load_extensions;
3846 4032
3847 if ($REATTACH_ON_RELOAD) { 4033 if ($REATTACH_ON_RELOAD) {
3848 warn "reattaching attachments to objects/players"; 4034 trace "perl_reload: reattaching attachments to objects/players";
3849 _global_reattach; # objects, sockets 4035 _global_reattach; # objects, sockets
3850 warn "reattaching attachments to maps"; 4036 trace "perl_reload: reattaching attachments to maps";
3851 reattach $_ for values %MAP; 4037 reattach $_ for values %MAP;
3852 warn "reattaching attachments to players"; 4038 trace "perl_reload: reattaching attachments to players";
3853 reattach $_ for values %PLAYER; 4039 reattach $_ for values %PLAYER;
3854 } 4040 }
3855 4041
3856 warn "running post_init jobs"; 4042 cf::_post_init 1;
3857 (pop @POST_INIT)->(1) while @POST_INIT;
3858 4043
3859 warn "leaving sync_job"; 4044 trace "perl_reload: leaving sync_job";
3860 4045
3861 1 4046 1
3862 } or do { 4047 } or do {
3863 warn $@; 4048 error $@;
3864 cf::cleanup "error while reloading, exiting."; 4049 cf::cleanup "perl_reload: error, exiting.";
3865 }; 4050 };
3866 4051
3867 warn "reloaded";
3868 --$RELOAD; 4052 --$RELOAD;
3869 } 4053 }
3870 4054
3871 $t1 = EV::time - $t1; 4055 $t1 = AE::time - $t1;
3872 warn "reload completed in ${t1}s\n"; 4056 info "perl_reload: completed in ${t1}s\n";
3873}; 4057};
3874 4058
3875our $RELOAD_WATCHER; # used only during reload 4059our $RELOAD_WATCHER; # used only during reload
3876 4060
3877sub reload_perl() { 4061sub reload_perl() {
… …
3879 # coro crashes during coro_state_free->destroy here. 4063 # coro crashes during coro_state_free->destroy here.
3880 4064
3881 $RELOAD_WATCHER ||= cf::async { 4065 $RELOAD_WATCHER ||= cf::async {
3882 Coro::AIO::aio_wait cache_extensions; 4066 Coro::AIO::aio_wait cache_extensions;
3883 4067
3884 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4068 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3885 do_reload_perl; 4069 do_reload_perl;
3886 undef $RELOAD_WATCHER; 4070 undef $RELOAD_WATCHER;
3887 }; 4071 };
3888 }; 4072 };
3889} 4073}
… …
3898 reload_perl; 4082 reload_perl;
3899 }; 4083 };
3900 } 4084 }
3901}; 4085};
3902 4086
3903unshift @INC, $LIBDIR; 4087#############################################################################
3904 4088
3905my $bug_warning = 0; 4089my $bug_warning = 0;
3906 4090
3907our @WAIT_FOR_TICK; 4091our @WAIT_FOR_TICK;
3908our @WAIT_FOR_TICK_BEGIN; 4092our @WAIT_FOR_TICK_BEGIN;
3909 4093
3910sub wait_for_tick { 4094sub wait_for_tick() {
3911 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4095 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3912 4096
3913 my $signal = new Coro::Signal; 4097 my $signal = new Coro::Signal;
3914 push @WAIT_FOR_TICK, $signal; 4098 push @WAIT_FOR_TICK, $signal;
3915 $signal->wait; 4099 $signal->wait;
3916} 4100}
3917 4101
3918sub wait_for_tick_begin { 4102sub wait_for_tick_begin() {
3919 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4103 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3920 4104
3921 my $signal = new Coro::Signal; 4105 my $signal = new Coro::Signal;
3922 push @WAIT_FOR_TICK_BEGIN, $signal; 4106 push @WAIT_FOR_TICK_BEGIN, $signal;
3923 $signal->wait; 4107 $signal->wait;
… …
3930 return; 4114 return;
3931 } 4115 }
3932 4116
3933 cf::server_tick; # one server iteration 4117 cf::server_tick; # one server iteration
3934 4118
3935 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d# 4119 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3936 4120
3937 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4121 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3938 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4122 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3939 Coro::async_pool { 4123 Coro::async_pool {
3940 $Coro::current->{desc} = "runtime saver"; 4124 $Coro::current->{desc} = "runtime saver";
3941 write_runtime_sync 4125 write_runtime_sync
3942 or warn "ERROR: unable to write runtime file: $!"; 4126 or error "ERROR: unable to write runtime file: $!";
3943 }; 4127 };
3944 } 4128 }
3945 4129
3946 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4130 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3947 $sig->send; 4131 $sig->send;
… …
3955 4139
3956 if (0) { 4140 if (0) {
3957 if ($NEXT_TICK) { 4141 if ($NEXT_TICK) {
3958 my $jitter = $TICK_START - $NEXT_TICK; 4142 my $jitter = $TICK_START - $NEXT_TICK;
3959 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4143 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3960 warn "jitter $JITTER\n";#d# 4144 debug "jitter $JITTER\n";#d#
3961 } 4145 }
3962 } 4146 }
3963} 4147}
3964 4148
3965{ 4149{
… …
4010 IO::AIO::min_parallel 8; 4194 IO::AIO::min_parallel 8;
4011 IO::AIO::max_poll_time $TICK * 0.1; 4195 IO::AIO::max_poll_time $TICK * 0.1;
4012 undef $AnyEvent::AIO::WATCHER; 4196 undef $AnyEvent::AIO::WATCHER;
4013} 4197}
4014 4198
4015my $_log_backtrace; 4199our $_log_backtrace;
4200our $_log_backtrace_last;
4016 4201
4017sub _log_backtrace { 4202sub _log_backtrace {
4018 my ($msg, @addr) = @_; 4203 my ($msg, @addr) = @_;
4019 4204
4020 $msg =~ s/\n//; 4205 $msg =~ s/\n$//;
4021 4206
4207 if ($_log_backtrace_last eq $msg) {
4208 LOG llevInfo, "[ABT] $msg\n";
4209 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4022 # limit the # of concurrent backtraces 4210 # limit the # of concurrent backtraces
4023 if ($_log_backtrace < 2) { 4211 } elsif ($_log_backtrace < 2) {
4212 $_log_backtrace_last = $msg;
4024 ++$_log_backtrace; 4213 ++$_log_backtrace;
4025 my $perl_bt = Carp::longmess $msg; 4214 my $perl_bt = Carp::longmess $msg;
4026 async { 4215 async {
4027 $Coro::current->{desc} = "abt $msg"; 4216 $Coro::current->{desc} = "abt $msg";
4028 4217
… …
4048 LOG llevInfo, "[ABT] $_\n" for @bt; 4237 LOG llevInfo, "[ABT] $_\n" for @bt;
4049 --$_log_backtrace; 4238 --$_log_backtrace;
4050 }; 4239 };
4051 } else { 4240 } else {
4052 LOG llevInfo, "[ABT] $msg\n"; 4241 LOG llevInfo, "[ABT] $msg\n";
4053 LOG llevInfo, "[ABT] [suppressed]\n"; 4242 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4054 } 4243 }
4055} 4244}
4056 4245
4057# load additional modules 4246# load additional modules
4058require "cf/$_.pm" for @EXTRA_MODULES; 4247require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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