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.212 by root, Tue Feb 13 19:25:44 2007 UTC vs.
Revision 1.277 by root, Sun Jun 10 04:24:50 2007 UTC

3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket;
8use Storable; 9use Storable;
10use Event;
9use Opcode; 11use Opcode;
10use Safe; 12use Safe;
11use Safe::Hole; 13use Safe::Hole;
12 14
13use Coro 3.5 (); 15use Coro 3.61 ();
16use Coro::State;
17use Coro::Handle;
14use Coro::Event; 18use Coro::Event;
15use Coro::Timer; 19use Coro::Timer;
16use Coro::Signal; 20use Coro::Signal;
17use Coro::Semaphore; 21use Coro::Semaphore;
18use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable;
19 24
20use BDB (); 25use BDB ();
21use Data::Dumper; 26use Data::Dumper;
22use Digest::MD5; 27use Digest::MD5;
23use Fcntl; 28use Fcntl;
29use YAML::Syck ();
24use IO::AIO 2.32 (); 30use IO::AIO 2.32 ();
25use YAML::Syck ();
26use Time::HiRes; 31use Time::HiRes;
27use Compress::LZF; 32use Compress::LZF;
28 33
34# configure various modules to our taste
35#
36$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
29Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
30 39
31use Event; $Event::Eval = 1; # no idea why this is required, but it is 40$Event::Eval = 1; # no idea why this is required, but it is
32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 41
35# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
36$YAML::Syck::ImplicitUnicode = 1; 43$YAML::Syck::ImplicitUnicode = 1;
37 44
38$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
39 48
40our %COMMAND = (); 49our %COMMAND = ();
41our %COMMAND_TIME = (); 50our %COMMAND_TIME = ();
42 51
43our @EXTS = (); # list of extension package names 52our @EXTS = (); # list of extension package names
44our %EXTCMD = (); 53our %EXTCMD = ();
45our %EXT_CORO = (); # coroutines bound to extensions 54our %EXT_CORO = (); # coroutines bound to extensions
46our %EXT_MAP = (); # pluggable maps 55our %EXT_MAP = (); # pluggable maps
47 56
57our $RELOAD; # number of reloads so far
48our @EVENT; 58our @EVENT;
49our $LIBDIR = datadir . "/ext";
50 59
51our $TICK = MAX_TIME * 1e-6; 60our $CONFDIR = confdir;
61our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db";
71
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
52our $TICK_WATCHER; 73our $TICK_WATCHER;
53our $AIO_POLL_WATCHER; 74our $AIO_POLL_WATCHER;
54our $WRITE_RUNTIME_WATCHER; 75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
55our $NEXT_TICK; 76our $NEXT_TICK;
56our $NOW; 77our $NOW;
57our $USE_FSYNC = 1; # use fsync to write maps - default off 78our $USE_FSYNC = 1; # use fsync to write maps - default off
58 79
59our $BDB_POLL_WATCHER; 80our $BDB_POLL_WATCHER;
65our $RUNTIME; 86our $RUNTIME;
66 87
67our %PLAYER; # all users 88our %PLAYER; # all users
68our %MAP; # all maps 89our %MAP; # all maps
69our $LINK_MAP; # the special {link} map, which is always available 90our $LINK_MAP; # the special {link} map, which is always available
70our $RANDOM_MAPS = cf::localdir . "/random";
71our $BDB_ENV_DIR = cf::localdir . "/db";
72
73our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
74our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
75 91
76# used to convert map paths into valid unix filenames by replacing / by ∕ 92# used to convert map paths into valid unix filenames by replacing / by ∕
77our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
78 94
95our $LOAD; # a number between 0 (idle) and 1 (too many objects)
96our $LOADAVG; # same thing, but with alpha-smoothing
97our $tick_start; # for load detecting purposes
98
79binmode STDOUT; 99binmode STDOUT;
80binmode STDERR; 100binmode STDERR;
81 101
82# read virtual server time, if available 102# read virtual server time, if available
83unless ($RUNTIME || !-e cf::localdir . "/runtime") { 103unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
84 open my $fh, "<", cf::localdir . "/runtime" 104 open my $fh, "<", "$LOCALDIR/runtime"
85 or die "unable to read runtime file: $!"; 105 or die "unable to read runtime file: $!";
86 $RUNTIME = <$fh> + 0.; 106 $RUNTIME = <$fh> + 0.;
87} 107}
88 108
89mkdir cf::localdir; 109mkdir $_
90mkdir cf::localdir . "/" . cf::playerdir; 110 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
91mkdir cf::localdir . "/" . cf::tmpdir;
92mkdir cf::localdir . "/" . cf::uniquedir;
93mkdir $RANDOM_MAPS;
94mkdir $BDB_ENV_DIR;
95 111
96our $EMERGENCY_POSITION; 112our $EMERGENCY_POSITION;
97 113
98sub cf::map::normalise; 114sub cf::map::normalise;
99 115
110=item $cf::RUNTIME 126=item $cf::RUNTIME
111 127
112The time this server has run, starts at 0 and is increased by $cf::TICK on 128The time this server has run, starts at 0 and is increased by $cf::TICK on
113every server tick. 129every server tick.
114 130
115=item $cf::LIBDIR 131=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
132$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
133$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
116 134
117The perl library directory, where extensions and cf-specific modules can 135Various directories - "/etc", read-only install directory, perl-library
118be found. It will be added to C<@INC> automatically. 136directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
137unique-items directory, player file directory, random maps directory and
138database environment.
119 139
120=item $cf::NOW 140=item $cf::NOW
121 141
122The time of the last (current) server tick. 142The time of the last (current) server tick.
123 143
124=item $cf::TICK 144=item $cf::TICK
125 145
126The interval between server ticks, in seconds. 146The interval between server ticks, in seconds.
147
148=item $cf::LOADAVG
149
150The current CPU load on the server (alpha-smoothed), as a value between 0
151(none) and 1 (overloaded), indicating how much time is spent on processing
152objects per tick. Healthy values are < 0.5.
153
154=item $cf::LOAD
155
156The raw value load value from the last tick.
127 157
128=item %cf::CFG 158=item %cf::CFG
129 159
130Configuration for the server, loaded from C</etc/crossfire/config>, or 160Configuration for the server, loaded from C</etc/crossfire/config>, or
131from wherever your confdir points to. 161from wherever your confdir points to.
132 162
133=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 163=item cf::wait_for_tick, cf::wait_for_tick_begin
134 164
135These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
136or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 166returns directly I<after> the tick processing (and consequently, can only wake one process
137processing has been done. Call C<< ->wait >> on them to maximise the 167per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
138window of cpu time available, or simply to synchronise to the server tick.
139 168
140=back 169=back
141 170
142=cut 171=cut
143 172
144BEGIN { 173BEGIN {
145 *CORE::GLOBAL::warn = sub { 174 *CORE::GLOBAL::warn = sub {
146 my $msg = join "", @_; 175 my $msg = join "", @_;
147 utf8::encode $msg;
148 176
149 $msg .= "\n" 177 $msg .= "\n"
150 unless $msg =~ /\n$/; 178 unless $msg =~ /\n$/;
151 179
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181
182 utf8::encode $msg;
152 LOG llevError, $msg; 183 LOG llevError, $msg;
153 }; 184 };
154} 185}
155 186
156@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
157@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
158@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
159@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
160@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 191@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
192@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
161@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 193@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
162 194
163# we bless all objects into (empty) derived classes to force a method lookup 195# we bless all objects into (empty) derived classes to force a method lookup
164# within the Safe compartment. 196# within the Safe compartment.
165for my $pkg (qw( 197for my $pkg (qw(
166 cf::global cf::attachable 198 cf::global cf::attachable
202 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 234 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
203 $d 235 $d
204 } || "[unable to dump $_[0]: '$@']"; 236 } || "[unable to dump $_[0]: '$@']";
205} 237}
206 238
207use JSON::Syck (); # TODO# replace by JSON::PC once working 239use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
208 240
209=item $ref = cf::from_json $json 241=item $ref = cf::from_json $json
210 242
211Converts a JSON string into the corresponding perl data structure. 243Converts a JSON string into the corresponding perl data structure.
212 244
213=cut
214
215sub from_json($) {
216 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
217 JSON::Syck::Load $_[0]
218}
219
220=item $json = cf::to_json $ref 245=item $json = cf::to_json $ref
221 246
222Converts a perl data structure into its JSON representation. 247Converts a perl data structure into its JSON representation.
223
224=cut
225
226sub to_json($) {
227 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
228 JSON::Syck::Dump $_[0]
229}
230 248
231=item cf::lock_wait $string 249=item cf::lock_wait $string
232 250
233Wait until the given lock is available. See cf::lock_acquire. 251Wait until the given lock is available. See cf::lock_acquire.
234 252
240returned. 258returned.
241 259
242Lock names should begin with a unique identifier (for example, cf::map::find 260Lock names should begin with a unique identifier (for example, cf::map::find
243uses map_find and cf::map::load uses map_load). 261uses map_find and cf::map::load uses map_load).
244 262
263=item $locked = cf::lock_active $string
264
265Return true if the lock is currently active, i.e. somebody has locked it.
266
245=cut 267=cut
246 268
247our %LOCK; 269our %LOCK;
248 270
249sub lock_wait($) { 271sub lock_wait($) {
268 # wake up all waiters, to be on the safe side 290 # wake up all waiters, to be on the safe side
269 $_->ready for @{ delete $LOCK{$key} }; 291 $_->ready for @{ delete $LOCK{$key} };
270 } 292 }
271} 293}
272 294
295sub lock_active($) {
296 my ($key) = @_;
297
298 ! ! $LOCK{$key}
299}
300
273sub freeze_mainloop { 301sub freeze_mainloop {
274 return unless $TICK_WATCHER->is_active; 302 return unless $TICK_WATCHER->is_active;
275 303
276 my $guard = Coro::guard { 304 my $guard = Coro::guard {
277 $TICK_WATCHER->start; 305 $TICK_WATCHER->start;
278 $WRITE_RUNTIME_WATCHER->start;
279 }; 306 };
280 $WRITE_RUNTIME_WATCHER->stop;
281 $TICK_WATCHER->stop; 307 $TICK_WATCHER->stop;
282 $guard 308 $guard
283} 309}
284 310
285=item cf::async { BLOCK } 311=item cf::async { BLOCK }
307 333
308sub sync_job(&) { 334sub sync_job(&) {
309 my ($job) = @_; 335 my ($job) = @_;
310 336
311 if ($Coro::current == $Coro::main) { 337 if ($Coro::current == $Coro::main) {
338 my $time = Event::time;
339
312 # this is the main coro, too bad, we have to block 340 # this is the main coro, too bad, we have to block
313 # till the operation succeeds, freezing the server :/ 341 # till the operation succeeds, freezing the server :/
314 342
315 # TODO: use suspend/resume instead 343 # TODO: use suspend/resume instead
316 # (but this is cancel-safe) 344 # (but this is cancel-safe)
327 355
328 while ($busy) { 356 while ($busy) {
329 Coro::cede or Event::one_event; 357 Coro::cede or Event::one_event;
330 } 358 }
331 359
360 $time = Event::time - $time;
361
362 LOG llevError | logBacktrace, Carp::longmess "long sync job"
363 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
364
365 $tick_start += $time; # do not account sync jobs to server load
366
332 wantarray ? @res : $res[0] 367 wantarray ? @res : $res[0]
333 } else { 368 } else {
334 # we are in another coroutine, how wonderful, everything just works 369 # we are in another coroutine, how wonderful, everything just works
335 370
336 $job->() 371 $job->()
356 391
357 $coro 392 $coro
358} 393}
359 394
360sub write_runtime { 395sub write_runtime {
361 my $runtime = cf::localdir . "/runtime"; 396 my $runtime = "$LOCALDIR/runtime";
397
398 # first touch the runtime file to show we are still running:
399 # the fsync below can take a very very long time.
400
401 IO::AIO::aio_utime $runtime, undef, undef;
402
403 my $guard = cf::lock_acquire "write_runtime";
362 404
363 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
364 or return; 406 or return;
365 407
366 my $value = $cf::RUNTIME + 90 + 10; 408 my $value = $cf::RUNTIME + 90 + 10;
372 414
373 # always fsync - this file is important 415 # always fsync - this file is important
374 aio_fsync $fh 416 aio_fsync $fh
375 and return; 417 and return;
376 418
419 # touch it again to show we are up-to-date
420 aio_utime $fh, undef, undef;
421
377 close $fh 422 close $fh
378 or return; 423 or return;
379 424
380 aio_rename "$runtime~", $runtime 425 aio_rename "$runtime~", $runtime
381 and return; 426 and return;
382 427
428 warn "runtime file written.\n";
429
383 1 430 1
431}
432
433=item cf::datalog type => key => value, ...
434
435Log a datalog packet of the given type with the given key-value pairs.
436
437=cut
438
439sub datalog($@) {
440 my ($type, %kv) = @_;
441 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
384} 442}
385 443
386=back 444=back
387 445
388=cut 446=cut
568 $registry = $CB_TYPE[$object_type] ||= []; 626 $registry = $CB_TYPE[$object_type] ||= [];
569 627
570 } elsif ($type eq "subtype") { 628 } elsif ($type eq "subtype") {
571 defined $object_type or Carp::croak "subtype specified without type"; 629 defined $object_type or Carp::croak "subtype specified without type";
572 my $object_subtype = shift @arg; 630 my $object_subtype = shift @arg;
573 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 631 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
574 632
575 } elsif ($type eq "package") { 633 } elsif ($type eq "package") {
576 my $pkg = shift @arg; 634 my $pkg = shift @arg;
577 635
578 while (my ($name, $id) = each %cb_id) { 636 while (my ($name, $id) = each %cb_id) {
619 if (ref $_[0]) { 677 if (ref $_[0]) {
620 _object_attach @_; 678 _object_attach @_;
621 } else { 679 } else {
622 _attach shift->_attach_registry, @_; 680 _attach shift->_attach_registry, @_;
623 } 681 }
682 _recalc_want;
624}; 683};
625 684
626# all those should be optimised 685# all those should be optimised
627sub cf::attachable::detach { 686sub cf::attachable::detach {
628 my ($obj, $name) = @_; 687 my ($obj, $name) = @_;
631 delete $obj->{_attachment}{$name}; 690 delete $obj->{_attachment}{$name};
632 reattach ($obj); 691 reattach ($obj);
633 } else { 692 } else {
634 Carp::croak "cannot, currently, detach class attachments"; 693 Carp::croak "cannot, currently, detach class attachments";
635 } 694 }
695 _recalc_want;
636}; 696};
637 697
638sub cf::attachable::attached { 698sub cf::attachable::attached {
639 my ($obj, $name) = @_; 699 my ($obj, $name) = @_;
640 700
787 } 847 }
788 } else { 848 } else {
789 aio_unlink $filename; 849 aio_unlink $filename;
790 aio_unlink "$filename.pst"; 850 aio_unlink "$filename.pst";
791 } 851 }
792
793 #d##TODO# nuke non .map-files if exist
794 if ($filename =~ s/\.map$//) {
795 aio_unlink $filename;
796 aio_unlink "$filename.pst";
797 }
798 } 852 }
799} 853}
800 854
801sub object_freezer_as_string { 855sub object_freezer_as_string {
802 my ($rdata, $objs) = @_; 856 my ($rdata, $objs) = @_;
808 862
809sub object_thawer_load { 863sub object_thawer_load {
810 my ($filename) = @_; 864 my ($filename) = @_;
811 865
812 my ($data, $av); 866 my ($data, $av);
813
814 #d#TODO remove .map if file does not exist
815 aio_stat $filename and $filename =~ s/\.map$//;
816 867
817 (aio_load $filename, $data) >= 0 868 (aio_load $filename, $data) >= 0
818 or return; 869 or return;
819 870
820 unless (aio_stat "$filename.pst") { 871 unless (aio_stat "$filename.pst") {
822 or return; 873 or return;
823 $av = eval { (Storable::thaw $av)->{objs} }; 874 $av = eval { (Storable::thaw $av)->{objs} };
824 } 875 }
825 876
826 warn sprintf "loading %s (%d)\n", 877 warn sprintf "loading %s (%d)\n",
827 $filename, length $data, scalar @{$av || []};#d# 878 $filename, length $data, scalar @{$av || []};
828 return ($data, $av); 879 return ($data, $av);
829} 880}
830 881
831############################################################################# 882#############################################################################
832# command handling &c 883# command handling &c
959Returns the given player object, loading it if necessary (might block). 1010Returns the given player object, loading it if necessary (might block).
960 1011
961=cut 1012=cut
962 1013
963sub playerdir($) { 1014sub playerdir($) {
964 cf::localdir 1015 "$PLAYERDIR/"
965 . "/"
966 . cf::playerdir
967 . "/"
968 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1016 . (ref $_[0] ? $_[0]->ob->name : $_[0])
969} 1017}
970 1018
971sub path($) { 1019sub path($) {
972 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1020 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
973 1021
974 (playerdir $login) . "/$login.pl" 1022 (playerdir $login) . "/playerdata"
975} 1023}
976 1024
977sub find_active($) { 1025sub find_active($) {
978 $cf::PLAYER{$_[0]} 1026 $cf::PLAYER{$_[0]}
979 and $cf::PLAYER{$_[0]}->active 1027 and $cf::PLAYER{$_[0]}->active
992 my $login = $_[0]; 1040 my $login = $_[0];
993 1041
994 my $guard = cf::lock_acquire "user_find:$login"; 1042 my $guard = cf::lock_acquire "user_find:$login";
995 1043
996 $cf::PLAYER{$_[0]} || do { 1044 $cf::PLAYER{$_[0]} || do {
1045 # rename old playerfiles to new ones
1046 #TODO: remove when no longer required
1047 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1048 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1049 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1050 aio_unlink +(playerdir $login) . "/$login.pl";
1051
997 my $pl = load_pl path $login 1052 my $pl = load_pl path $login
998 or return; 1053 or return;
999 $cf::PLAYER{$login} = $pl 1054 $cf::PLAYER{$login} = $pl
1000 } 1055 }
1001 } 1056 }
1038 1093
1039=cut 1094=cut
1040 1095
1041sub quit_character { 1096sub quit_character {
1042 my ($pl) = @_; 1097 my ($pl) = @_;
1098
1099 my $name = $pl->ob->name;
1043 1100
1044 $pl->{deny_save} = 1; 1101 $pl->{deny_save} = 1;
1045 $pl->password ("*"); # this should lock out the player until we nuked the dir 1102 $pl->password ("*"); # this should lock out the player until we nuked the dir
1046 1103
1047 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1104 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1052 my $path = playerdir $pl; 1109 my $path = playerdir $pl;
1053 my $temp = "$path~$cf::RUNTIME~deleting~"; 1110 my $temp = "$path~$cf::RUNTIME~deleting~";
1054 aio_rename $path, $temp; 1111 aio_rename $path, $temp;
1055 delete $cf::PLAYER{$pl->ob->name}; 1112 delete $cf::PLAYER{$pl->ob->name};
1056 $pl->destroy; 1113 $pl->destroy;
1114
1115 my $prefix = qr<^~\Q$name\E/>;
1116
1117 # nuke player maps
1118 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1119
1057 IO::AIO::aio_rmtree $temp; 1120 IO::AIO::aio_rmtree $temp;
1121}
1122
1123=item $pl->kick
1124
1125Kicks a player out of the game. This destroys the connection.
1126
1127=cut
1128
1129sub kick {
1130 my ($pl, $kicker) = @_;
1131
1132 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1133 $pl->killer ("kicked");
1134 $pl->ns->destroy;
1058} 1135}
1059 1136
1060=item cf::player::list_logins 1137=item cf::player::list_logins
1061 1138
1062Returns am arrayref of all valid playernames in the system, can take a 1139Returns am arrayref of all valid playernames in the system, can take a
1063while and may block, so not sync_job-capable, ever. 1140while and may block, so not sync_job-capable, ever.
1064 1141
1065=cut 1142=cut
1066 1143
1067sub list_logins { 1144sub list_logins {
1068 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1145 my $dirs = aio_readdir $PLAYERDIR
1069 or return []; 1146 or return [];
1070 1147
1071 my @logins; 1148 my @logins;
1072 1149
1073 for my $login (@$dirs) { 1150 for my $login (@$dirs) {
1108 } 1185 }
1109 1186
1110 \@paths 1187 \@paths
1111} 1188}
1112 1189
1113=item $player->ext_reply ($msgid, $msgtype, %msg) 1190=item $player->ext_reply ($msgid, %msg)
1114 1191
1115Sends an ext reply to the player. 1192Sends an ext reply to the player.
1116 1193
1117=cut 1194=cut
1118 1195
1119sub ext_reply($$$%) { 1196sub ext_reply($$%) {
1120 my ($self, $id, %msg) = @_; 1197 my ($self, $id, %msg) = @_;
1121 1198
1122 $msg{msgid} = $id; 1199 $msg{msgid} = $id;
1123 1200
1124 $self->send ("ext " . cf::to_json \%msg); 1201 $self->send ("ext " . cf::to_json \%msg);
1125} 1202}
1126 1203
1127package cf; 1204=item $player->ext_event ($type, %msg)
1205
1206Sends an ext event to the client.
1207
1208=cut
1209
1210sub ext_event($$%) {
1211 my ($self, $type, %msg) = @_;
1212
1213 $self->ns->ext_event ($type, %msg);
1214}
1215
1216=head3 cf::region
1217
1218=over 4
1219
1220=cut
1221
1222package cf::region;
1223
1224=item cf::region::find_by_path $path
1225
1226Tries to decuce the probable region for a map knowing only its path.
1227
1228=cut
1229
1230sub find_by_path($) {
1231 my ($path) = @_;
1232
1233 my ($match, $specificity);
1234
1235 for my $region (list) {
1236 if ($region->match && $path =~ $region->match) {
1237 ($match, $specificity) = ($region, $region->specificity)
1238 if $region->specificity > $specificity;
1239 }
1240 }
1241
1242 $match
1243}
1128 1244
1129=back 1245=back
1130
1131 1246
1132=head3 cf::map 1247=head3 cf::map
1133 1248
1134=over 4 1249=over 4
1135 1250
1190 my ($self, $merge) = @_; 1305 my ($self, $merge) = @_;
1191 1306
1192 # we have to keep some variables in memory intact 1307 # we have to keep some variables in memory intact
1193 local $self->{path}; 1308 local $self->{path};
1194 local $self->{load_path}; 1309 local $self->{load_path};
1195 local $self->{deny_save};
1196 local $self->{deny_reset};
1197 1310
1198 $self->SUPER::thawer_merge ($merge); 1311 $self->SUPER::thawer_merge ($merge);
1199} 1312}
1200 1313
1201sub normalise { 1314sub normalise {
1273 1386
1274# the original (read-only) location 1387# the original (read-only) location
1275sub load_path { 1388sub load_path {
1276 my ($self) = @_; 1389 my ($self) = @_;
1277 1390
1278 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1391 "$MAPDIR/$self->{path}.map"
1279} 1392}
1280 1393
1281# the temporary/swap location 1394# the temporary/swap location
1282sub save_path { 1395sub save_path {
1283 my ($self) = @_; 1396 my ($self) = @_;
1284 1397
1285 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1398 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1286 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1399 "$TMPDIR/$path.map"
1287} 1400}
1288 1401
1289# the unique path, undef == no special unique path 1402# the unique path, undef == no special unique path
1290sub uniq_path { 1403sub uniq_path {
1291 my ($self) = @_; 1404 my ($self) = @_;
1292 1405
1293 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1406 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1294 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1407 "$UNIQUEDIR/$path"
1295} 1408}
1296 1409
1297# and all this just because we cannot iterate over 1410# and all this just because we cannot iterate over
1298# all maps in C++... 1411# all maps in C++...
1299sub change_all_map_light { 1412sub change_all_map_light {
1301 1414
1302 $_->change_map_light ($change) 1415 $_->change_map_light ($change)
1303 for grep $_->outdoor, values %cf::MAP; 1416 for grep $_->outdoor, values %cf::MAP;
1304} 1417}
1305 1418
1419sub decay_objects {
1420 my ($self) = @_;
1421
1422 return if $self->{deny_reset};
1423
1424 $self->do_decay_objects;
1425}
1426
1306sub unlink_save { 1427sub unlink_save {
1307 my ($self) = @_; 1428 my ($self) = @_;
1308 1429
1309 utf8::encode (my $save = $self->save_path); 1430 utf8::encode (my $save = $self->save_path);
1310 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1431 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1311 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1432 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1312
1313 #d#TODO remove .map and also nuke
1314 $save =~ s/\.map// or return;#d#
1315 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1316 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1317} 1433}
1318 1434
1319sub load_header_from($) { 1435sub load_header_from($) {
1320 my ($self, $path) = @_; 1436 my ($self, $path) = @_;
1321 1437
1371 $self->load_header_orig 1487 $self->load_header_orig
1372 or return; 1488 or return;
1373 $self->prepare_orig; 1489 $self->prepare_orig;
1374 } 1490 }
1375 1491
1492 $self->{deny_reset} = 1
1493 if $self->no_reset;
1494
1495 $self->default_region (cf::region::find_by_path $self->{path})
1496 unless $self->default_region;
1497
1376 1 1498 1
1377} 1499}
1378 1500
1379sub find; 1501sub find;
1380sub find { 1502sub find {
1392 $map->{last_save} = $cf::RUNTIME; 1514 $map->{last_save} = $cf::RUNTIME;
1393 1515
1394 $map->load_header 1516 $map->load_header
1395 or return; 1517 or return;
1396 1518
1397 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1519 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1398 # doing this can freeze the server in a sync job, obviously 1520 # doing this can freeze the server in a sync job, obviously
1399 #$cf::WAIT_FOR_TICK->wait; 1521 #$cf::WAIT_FOR_TICK->wait;
1400 $map->reset; 1522 $map->reset;
1401 undef $guard; 1523 undef $guard;
1402 return find $path; 1524 return find $path;
1413 my ($self) = @_; 1535 my ($self) = @_;
1414 1536
1415 local $self->{deny_reset} = 1; # loading can take a long time 1537 local $self->{deny_reset} = 1; # loading can take a long time
1416 1538
1417 my $path = $self->{path}; 1539 my $path = $self->{path};
1540
1541 {
1418 my $guard = cf::lock_acquire "map_load:$path"; 1542 my $guard = cf::lock_acquire "map_load:$path";
1419 1543
1420 return if $self->in_memory != cf::MAP_SWAPPED; 1544 return if $self->in_memory != cf::MAP_SWAPPED;
1421 1545
1422 $self->in_memory (cf::MAP_LOADING); 1546 $self->in_memory (cf::MAP_LOADING);
1423 1547
1424 $self->alloc; 1548 $self->alloc;
1425 1549
1426 $self->pre_load; 1550 $self->pre_load;
1427
1428 $self->_load_objects ($self->{load_path}, 1)
1429 or return;
1430
1431 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1432 if delete $self->{load_original};
1433
1434 if (my $uniq = $self->uniq_path) {
1435 utf8::encode $uniq;
1436 if (aio_open $uniq, O_RDONLY, 0) {
1437 $self->clear_unique_items;
1438 $self->_load_objects ($uniq, 0);
1439 }
1440 }
1441
1442 Coro::cede;
1443
1444 # now do the right thing for maps
1445 $self->link_multipart_objects;
1446
1447 unless ($self->{deny_activate}) {
1448 $self->decay_objects;
1449 $self->fix_auto_apply;
1450 $self->update_buttons;
1451 Coro::cede; 1551 Coro::cede;
1452 $self->set_darkness_map; 1552
1553 $self->_load_objects ($self->{load_path}, 1)
1554 or return;
1555
1556 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1557 if delete $self->{load_original};
1558
1559 if (my $uniq = $self->uniq_path) {
1560 utf8::encode $uniq;
1561 if (aio_open $uniq, O_RDONLY, 0) {
1562 $self->clear_unique_items;
1563 $self->_load_objects ($uniq, 0);
1564 }
1565 }
1566
1567 Coro::cede;
1568 # now do the right thing for maps
1569 $self->link_multipart_objects;
1453 $self->difficulty ($self->estimate_difficulty) 1570 $self->difficulty ($self->estimate_difficulty)
1454 unless $self->difficulty; 1571 unless $self->difficulty;
1455 Coro::cede; 1572 Coro::cede;
1573
1574 unless ($self->{deny_activate}) {
1575 $self->decay_objects;
1576 $self->fix_auto_apply;
1577 $self->update_buttons;
1578 Coro::cede;
1579 $self->set_darkness_map;
1580 Coro::cede;
1456 $self->activate; 1581 $self->activate;
1582 }
1583
1584 $self->in_memory (cf::MAP_IN_MEMORY);
1457 } 1585 }
1458 1586
1459 $self->post_load; 1587 $self->post_load;
1460
1461 $self->in_memory (cf::MAP_IN_MEMORY);
1462} 1588}
1463 1589
1464sub customise_for { 1590sub customise_for {
1465 my ($self, $ob) = @_; 1591 my ($self, $ob) = @_;
1466 1592
1467 return find "~" . $ob->name . "/" . $self->{path} 1593 return find "~" . $ob->name . "/" . $self->{path}
1468 if $self->per_player; 1594 if $self->per_player;
1595
1596# return find "?party/" . $ob->name . "/" . $self->{path}
1597# if $self->per_party;
1469 1598
1470 $self 1599 $self
1471} 1600}
1472 1601
1473# find and load all maps in the 3x3 area around a map 1602# find and load all maps in the 3x3 area around a map
1584 1713
1585sub reset_at { 1714sub reset_at {
1586 my ($self) = @_; 1715 my ($self) = @_;
1587 1716
1588 # TODO: safety, remove and allow resettable per-player maps 1717 # TODO: safety, remove and allow resettable per-player maps
1589 return 1e99 if $self->isa ("ext::map_per_player");#d#
1590 return 1e99 if $self->{deny_reset}; 1718 return 1e99 if $self->{deny_reset};
1591 1719
1592 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1720 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1593 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1721 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1594 1722
1605 my ($self) = @_; 1733 my ($self) = @_;
1606 1734
1607 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1735 my $lock = cf::lock_acquire "map_data:$self->{path}";
1608 1736
1609 return if $self->players; 1737 return if $self->players;
1610 return if $self->isa ("ext::map_per_player");#d#
1611 1738
1612 warn "resetting map ", $self->path;#d# 1739 warn "resetting map ", $self->path;
1613 1740
1614 $self->in_memory (cf::MAP_SWAPPED); 1741 $self->in_memory (cf::MAP_SWAPPED);
1615 1742
1616 # need to save uniques path 1743 # need to save uniques path
1617 unless ($self->{deny_save}) { 1744 unless ($self->{deny_save}) {
1649 $cf::MAP{$self->path} = $self; 1776 $cf::MAP{$self->path} = $self;
1650 1777
1651 $self->reset; # polite request, might not happen 1778 $self->reset; # polite request, might not happen
1652} 1779}
1653 1780
1781=item $maps = cf::map::tmp_maps
1782
1783Returns an arrayref with all map paths of currently instantiated and saved
1784maps. May block.
1785
1786=cut
1787
1788sub tmp_maps() {
1789 [
1790 map {
1791 utf8::decode $_;
1792 /\.map$/
1793 ? normalise $_
1794 : ()
1795 } @{ aio_readdir $TMPDIR or [] }
1796 ]
1797}
1798
1799=item $maps = cf::map::random_maps
1800
1801Returns an arrayref with all map paths of currently instantiated and saved
1802random maps. May block.
1803
1804=cut
1805
1806sub random_maps() {
1807 [
1808 map {
1809 utf8::decode $_;
1810 /\.map$/
1811 ? normalise "?random/$_"
1812 : ()
1813 } @{ aio_readdir $RANDOMDIR or [] }
1814 ]
1815}
1816
1654=item cf::map::unique_maps 1817=item cf::map::unique_maps
1655 1818
1656Returns an arrayref of paths of all shared maps that have 1819Returns an arrayref of paths of all shared maps that have
1657instantiated unique items. May block. 1820instantiated unique items. May block.
1658 1821
1659=cut 1822=cut
1660 1823
1661sub unique_maps() { 1824sub unique_maps() {
1662 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 1825 [
1663 or return; 1826 map {
1664
1665 my @paths;
1666
1667 for (@$files) {
1668 utf8::decode $_; 1827 utf8::decode $_;
1669 next if /\.pst$/; 1828 /\.map$/
1670 next unless /^$PATH_SEP/o; 1829 ? normalise $_
1671 1830 : ()
1672 push @paths, cf::map::normalise $_; 1831 } @{ aio_readdir $UNIQUEDIR or [] }
1673 } 1832 ]
1674
1675 \@paths
1676} 1833}
1677 1834
1678package cf; 1835package cf;
1679 1836
1680=back 1837=back
1786 $self->deactivate_recursive; 1943 $self->deactivate_recursive;
1787 1944
1788 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1945 return if UNIVERSAL::isa $self->map, "ext::map_link";
1789 1946
1790 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1947 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1791 if $self->map; 1948 if $self->map && $self->map->{path} ne "{link}";
1792 1949
1793 $self->enter_map ($LINK_MAP || link_map, 10, 10); 1950 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1794} 1951}
1795 1952
1796sub cf::object::player::leave_link { 1953sub cf::object::player::leave_link {
1797 my ($self, $map, $x, $y) = @_; 1954 my ($self, $map, $x, $y) = @_;
1955
1956 return unless $self->contr->active;
1798 1957
1799 my $link_pos = delete $self->{_link_pos}; 1958 my $link_pos = delete $self->{_link_pos};
1800 1959
1801 unless ($map) { 1960 unless ($map) {
1802 # restore original map position 1961 # restore original map position
1820 $map->load; 1979 $map->load;
1821 $map->load_diag; 1980 $map->load_diag;
1822 1981
1823 return unless $self->contr->active; 1982 return unless $self->contr->active;
1824 $self->activate_recursive; 1983 $self->activate_recursive;
1984
1985 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1825 $self->enter_map ($map, $x, $y); 1986 $self->enter_map ($map, $x, $y);
1826} 1987}
1827 1988
1828cf::player->attach (
1829 on_logout => sub {
1830 my ($pl) = @_;
1831
1832 # abort map switching before logout
1833 if ($pl->ob->{_link_pos}) {
1834 cf::sync_job {
1835 $pl->ob->leave_link
1836 };
1837 }
1838 },
1839 on_login => sub {
1840 my ($pl) = @_;
1841
1842 # try to abort aborted map switching on player login :)
1843 # should happen only on crashes
1844 if ($pl->ob->{_link_pos}) {
1845 $pl->ob->enter_link;
1846 (async {
1847 # we need this sleep as the login has a concurrent enter_exit running
1848 # and this sleep increases chances of the player not ending up in scorn
1849 $pl->ob->reply (undef,
1850 "There was an internal problem at your last logout, "
1851 . "the server will try to bring you to your intended destination in a second.",
1852 cf::NDI_RED);
1853 Coro::Timer::sleep 1;
1854 $pl->ob->leave_link;
1855 })->prio (2);
1856 }
1857 },
1858);
1859
1860=item $player_object->goto ($path, $x, $y) 1989=item $player_object->goto ($path, $x, $y[, $check->($map)])
1861 1990
1991Moves the player to the given map-path and coordinates by first freezing
1992her, loading and preparing them map, calling the provided $check callback
1993that has to return the map if sucecssful, and then unfreezes the player on
1994the new (success) or old (failed) map position.
1995
1862=cut 1996=cut
1997
1998our $GOTOGEN;
1863 1999
1864sub cf::object::player::goto { 2000sub cf::object::player::goto {
1865 my ($self, $path, $x, $y) = @_; 2001 my ($self, $path, $x, $y, $check) = @_;
2002
2003 # do generation counting so two concurrent goto's will be executed in-order
2004 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1866 2005
1867 $self->enter_link; 2006 $self->enter_link;
1868 2007
1869 (async { 2008 (async {
1870 my $map = eval { 2009 my $map = eval {
1871 my $map = cf::map::find $path; 2010 my $map = cf::map::find $path;
2011
2012 if ($map) {
1872 $map = $map->customise_for ($self) if $map; 2013 $map = $map->customise_for ($self);
2014 $map = $check->($map) if $check && $map;
2015 } else {
2016 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2017 }
2018
1873 $map 2019 $map
2020 };
2021
2022 if ($@) {
2023 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2024 LOG llevError | logBacktrace, Carp::longmess $@;
1874 } or 2025 }
1875 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1876 2026
2027 if ($gen == $self->{_goto_generation}) {
2028 delete $self->{_goto_generation};
1877 $self->leave_link ($map, $x, $y); 2029 $self->leave_link ($map, $x, $y);
2030 }
1878 })->prio (1); 2031 })->prio (1);
1879} 2032}
1880 2033
1881=item $player_object->enter_exit ($exit_object) 2034=item $player_object->enter_exit ($exit_object)
1882 2035
1921 2074
1922 $rmp->{random_seed} ||= $exit->random_seed; 2075 $rmp->{random_seed} ||= $exit->random_seed;
1923 2076
1924 my $data = cf::to_json $rmp; 2077 my $data = cf::to_json $rmp;
1925 my $md5 = Digest::MD5::md5_hex $data; 2078 my $md5 = Digest::MD5::md5_hex $data;
1926 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2079 my $meta = "$RANDOMDIR/$md5.meta";
1927 2080
1928 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2081 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1929 aio_write $fh, 0, (length $data), $data, 0; 2082 aio_write $fh, 0, (length $data), $data, 0;
1930 undef $fh; 2083 undef $fh;
1931 aio_rename "$meta~", $meta; 2084 aio_rename "$meta~", $meta;
1940 2093
1941 return unless $self->type == cf::PLAYER; 2094 return unless $self->type == cf::PLAYER;
1942 2095
1943 if ($exit->slaying eq "/!") { 2096 if ($exit->slaying eq "/!") {
1944 #TODO: this should de-fi-ni-te-ly not be a sync-job 2097 #TODO: this should de-fi-ni-te-ly not be a sync-job
2098 # the problem is that $exit might not survive long enough
2099 # so it needs to be done right now, right here
1945 cf::sync_job { prepare_random_map $exit }; 2100 cf::sync_job { prepare_random_map $exit };
1946 } 2101 }
1947 2102
1948 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2103 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1949 my $hp = $exit->stats->hp; 2104 my $hp = $exit->stats->hp;
1957 $self->goto ($slaying, $hp, $sp); 2112 $self->goto ($slaying, $hp, $sp);
1958 2113
1959 1; 2114 1;
1960 }) { 2115 }) {
1961 $self->message ("Something went wrong deep within the crossfire server. " 2116 $self->message ("Something went wrong deep within the crossfire server. "
1962 . "I'll try to bring you back to the map you were before. " 2117 . "I'll try to bring you back to the map you were before. "
1963 . "Please report this to the dungeon master!", 2118 . "Please report this to the dungeon master!",
1964 cf::NDI_UNIQUE | cf::NDI_RED); 2119 cf::NDI_UNIQUE | cf::NDI_RED);
1965 2120
1966 warn "ERROR in enter_exit: $@"; 2121 warn "ERROR in enter_exit: $@";
1967 $self->leave_link; 2122 $self->leave_link;
1968 } 2123 }
1969 })->prio (1); 2124 })->prio (1);
1982 2137
1983sub cf::client::send_drawinfo { 2138sub cf::client::send_drawinfo {
1984 my ($self, $text, $flags) = @_; 2139 my ($self, $text, $flags) = @_;
1985 2140
1986 utf8::encode $text; 2141 utf8::encode $text;
1987 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2142 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1988} 2143}
1989 2144
2145=item $client->ext_event ($type, %msg)
2146
2147Sends an exti event to the client.
2148
2149=cut
2150
2151sub cf::client::ext_event($$%) {
2152 my ($self, $type, %msg) = @_;
2153
2154 $msg{msgtype} = "event_$type";
2155 $self->send_packet ("ext " . cf::to_json \%msg);
2156}
1990 2157
1991=item $success = $client->query ($flags, "text", \&cb) 2158=item $success = $client->query ($flags, "text", \&cb)
1992 2159
1993Queues a query to the client, calling the given callback with 2160Queues a query to the client, calling the given callback with
1994the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2161the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2091 2258
2092# here we export the classes and methods available to script code 2259# here we export the classes and methods available to script code
2093 2260
2094=pod 2261=pod
2095 2262
2096The following fucntions and emthods are available within a safe environment: 2263The following functions and methods are available within a safe environment:
2097 2264
2098 cf::object contr pay_amount pay_player map 2265 cf::object contr pay_amount pay_player map
2099 cf::object::player player 2266 cf::object::player player
2100 cf::player peaceful 2267 cf::player peaceful
2101 cf::map trigger 2268 cf::map trigger
2186############################################################################# 2353#############################################################################
2187 2354
2188=head2 EXTENSION DATABASE SUPPORT 2355=head2 EXTENSION DATABASE SUPPORT
2189 2356
2190Crossfire maintains a very simple database for extension use. It can 2357Crossfire maintains a very simple database for extension use. It can
2191currently store anything that can be serialised using Storable, which 2358currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2192excludes objects. 2359convert to/from binary).
2193 2360
2194The parameter C<$family> should best start with the name of the extension 2361The parameter C<$family> should best start with the name of the extension
2195using it, it should be unique. 2362using it, it should be unique.
2196 2363
2197=over 4 2364=over 4
2220 BDB::CREATE | BDB::AUTO_COMMIT, 0666; 2387 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2221 cf::cleanup "db_open(db): $!" if $!; 2388 cf::cleanup "db_open(db): $!" if $!;
2222 }; 2389 };
2223 cf::cleanup "db_open(db): $@" if $@; 2390 cf::cleanup "db_open(db): $@" if $@;
2224 }; 2391 };
2225
2226 my $path = cf::localdir . "/database.pst";
2227 if (stat $path) {
2228 cf::sync_job {
2229 my $pst = Storable::retrieve $path;
2230
2231 cf::db_put (board => data => $pst->{board});
2232 cf::db_put (guildrules => data => $pst->{guildrules});
2233 cf::db_put (rent => balance => $pst->{rent}{balance});
2234 BDB::db_env_txn_checkpoint $DB_ENV;
2235
2236 unlink $path;
2237 };
2238 }
2239 } 2392 }
2240} 2393}
2241 2394
2242sub db_get($$) { 2395sub db_get($$) {
2243 my $key = "$_[0]/$_[1]"; 2396 my $key = "$_[0]/$_[1]";
2244 2397
2245 cf::sync_job { 2398 cf::sync_job {
2246 BDB::db_get $DB, undef, $key, my $data; 2399 BDB::db_get $DB, undef, $key, my $data;
2247 2400
2248 $! ? () 2401 $! ? ()
2249 : Compress::LZF::sthaw $data 2402 : $data
2250 } 2403 }
2251} 2404}
2252 2405
2253sub db_put($$$) { 2406sub db_put($$$) {
2254 BDB::dbreq_pri 4; 2407 BDB::dbreq_pri 4;
2255 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { }; 2408 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2409}
2410
2411=item cf::cache $id => [$paths...], $processversion => $process
2412
2413Generic caching function that returns the value of the resource $id,
2414caching and regenerating as required.
2415
2416This function can block.
2417
2418=cut
2419
2420sub cache {
2421 my ($id, $src, $processversion, $process) = @_;
2422
2423 my $meta =
2424 join "\x00",
2425 $processversion,
2426 map {
2427 aio_stat $_
2428 and Carp::croak "$_: $!";
2429
2430 ($_, (stat _)[7,9])
2431 } @$src;
2432
2433 my $dbmeta = db_get cache => "$id/meta";
2434 if ($dbmeta ne $meta) {
2435 # changed, we may need to process
2436
2437 my @data;
2438 my $md5;
2439
2440 for (0 .. $#$src) {
2441 0 <= aio_load $src->[$_], $data[$_]
2442 or Carp::croak "$src->[$_]: $!";
2443 }
2444
2445 # if processing is expensive, check
2446 # checksum first
2447 if (1) {
2448 $md5 =
2449 join "\x00",
2450 $processversion,
2451 map {
2452 Coro::cede;
2453 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2454 } 0.. $#$src;
2455
2456
2457 my $dbmd5 = db_get cache => "$id/md5";
2458 if ($dbmd5 eq $md5) {
2459 db_put cache => "$id/meta", $meta;
2460
2461 return db_get cache => "$id/data";
2462 }
2463 }
2464
2465 my $t1 = Time::HiRes::time;
2466 my $data = $process->(\@data);
2467 my $t2 = Time::HiRes::time;
2468
2469 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2470
2471 db_put cache => "$id/data", $data;
2472 db_put cache => "$id/md5" , $md5;
2473 db_put cache => "$id/meta", $meta;
2474
2475 return $data;
2476 }
2477
2478 db_get cache => "$id/data"
2479}
2480
2481=item fork_call { }, $args
2482
2483Executes the given code block with the given arguments in a seperate
2484process, returning the results. Everything must be serialisable with
2485Coro::Storable. May, of course, block. Note that the executed sub may
2486never block itself or use any form of Event handling.
2487
2488=cut
2489
2490sub fork_call(&@) {
2491 my ($cb, @args) = @_;
2492
2493# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2494# or die "socketpair: $!";
2495 pipe my $fh1, my $fh2
2496 or die "pipe: $!";
2497
2498 if (my $pid = fork) {
2499 close $fh2;
2500
2501 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2502 $res = Coro::Storable::thaw $res;
2503
2504 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2505
2506 die $$res unless "ARRAY" eq ref $res;
2507
2508 return wantarray ? @$res : $res->[-1];
2509 } else {
2510 reset_signals;
2511 local $SIG{__WARN__};
2512 local $SIG{__DIE__};
2513 eval {
2514 close $fh1;
2515
2516 my @res = eval { $cb->(@args) };
2517 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2518 };
2519
2520 warn $@ if $@;
2521 _exit 0;
2522 }
2256} 2523}
2257 2524
2258############################################################################# 2525#############################################################################
2259# the server's init and main functions 2526# the server's init and main functions
2260 2527
2261sub load_resources { 2528sub load_facedata($) {
2262 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2529 my ($path) = @_;
2530
2531 warn "loading facedata from $path\n";
2532
2533 my $facedata;
2534 0 < aio_load $path, $facedata
2535 or die "$path: $!";
2536
2537 $facedata = Coro::Storable::thaw $facedata;
2538
2539 $facedata->{version} == 2
2540 or cf::cleanup "$path: version mismatch, cannot proceed.";
2541
2542 {
2543 my $faces = $facedata->{faceinfo};
2544
2545 while (my ($face, $info) = each %$faces) {
2546 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2547 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2548 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2549 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2550 Coro::cede;
2551 }
2552
2553 while (my ($face, $info) = each %$faces) {
2554 next unless $info->{smooth};
2555 my $idx = cf::face::find $face
2556 or next;
2557 if (my $smooth = cf::face::find $info->{smooth}) {
2558 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2559 } else {
2560 warn "smooth face '$info->{smooth}' not found for face '$face'";
2561 }
2562 Coro::cede;
2563 }
2564 }
2565
2566 {
2567 my $anims = $facedata->{animinfo};
2568
2569 while (my ($anim, $info) = each %$anims) {
2570 cf::anim::set $anim, $info->{frames}, $info->{facings};
2571 Coro::cede;
2572 }
2573
2574 cf::anim::invalidate_all; # d'oh
2575 }
2576
2577 1
2578}
2579
2580sub reload_regions {
2581 load_resource_file "$MAPDIR/regions"
2263 or die "unable to load regions file\n";#d# 2582 or die "unable to load regions file\n";
2583}
2584
2585sub reload_facedata {
2586 load_facedata "$DATADIR/facedata"
2587 or die "unable to load facedata\n";
2588}
2589
2590sub reload_archetypes {
2591 load_resource_file "$DATADIR/archetypes"
2592 or die "unable to load archetypes\n";
2593}
2594
2595sub reload_treasures {
2596 load_resource_file "$DATADIR/treasures"
2597 or die "unable to load treasurelists\n";
2598}
2599
2600sub reload_resources {
2601 warn "reloading resource files...\n";
2602
2603 reload_regions;
2604 reload_facedata;
2605 #reload_archetypes;#d#
2606 reload_archetypes;
2607 reload_treasures;
2608
2609 warn "finished reloading resource files\n";
2610}
2611
2612sub init {
2613 reload_resources;
2264} 2614}
2265 2615
2266sub cfg_load { 2616sub cfg_load {
2267 open my $fh, "<:utf8", cf::confdir . "/config" 2617 open my $fh, "<:utf8", "$CONFDIR/config"
2268 or return; 2618 or return;
2269 2619
2270 local $/; 2620 local $/;
2271 *CFG = YAML::Syck::Load <$fh>; 2621 *CFG = YAML::Syck::Load <$fh>;
2272 2622
2280 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2630 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2281 and die "WARNING: m(un)lockall failed: $!\n"; 2631 and die "WARNING: m(un)lockall failed: $!\n";
2282 }; 2632 };
2283 warn $@ if $@; 2633 warn $@ if $@;
2284 } 2634 }
2285}
2286
2287sub init {
2288 load_resources;
2289} 2635}
2290 2636
2291sub main { 2637sub main {
2292 # we must not ever block the main coroutine 2638 # we must not ever block the main coroutine
2293 local $Coro::idle = sub { 2639 local $Coro::idle = sub {
2361 2707
2362 warn Carp::longmess "post_cleanup backtrace" 2708 warn Carp::longmess "post_cleanup backtrace"
2363 if $make_core; 2709 if $make_core;
2364} 2710}
2365 2711
2366sub reload() { 2712sub do_reload_perl() {
2367 # can/must only be called in main 2713 # can/must only be called in main
2368 if ($Coro::current != $Coro::main) { 2714 if ($Coro::current != $Coro::main) {
2369 warn "can only reload from main coroutine"; 2715 warn "can only reload from main coroutine";
2370 return; 2716 return;
2371 } 2717 }
2372 2718
2373 warn "reloading..."; 2719 warn "reloading...";
2374 2720
2375 warn "entering sync_job"; 2721 warn "entering sync_job";
2376 2722
2377 sync_job { 2723 cf::sync_job {
2378 write_runtime; 2724 cf::write_runtime; # external watchdog should not bark
2379 cf::emergency_save; 2725 cf::emergency_save;
2380 write_runtime; 2726 cf::write_runtime; # external watchdog should not bark
2381 2727
2382 warn "syncing database to disk"; 2728 warn "syncing database to disk";
2383 BDB::db_env_txn_checkpoint $DB_ENV; 2729 BDB::db_env_txn_checkpoint $DB_ENV;
2384 2730
2385 # if anything goes wrong in here, we should simply crash as we already saved 2731 # if anything goes wrong in here, we should simply crash as we already saved
2396 Coro::cede; 2742 Coro::cede;
2397 last unless IO::AIO::nreqs || BDB::nreqs; 2743 last unless IO::AIO::nreqs || BDB::nreqs;
2398 warn "iterate..."; 2744 warn "iterate...";
2399 } 2745 }
2400 2746
2747 ++$RELOAD;
2748
2401 warn "cancelling all extension coros"; 2749 warn "cancelling all extension coros";
2402 $_->cancel for values %EXT_CORO; 2750 $_->cancel for values %EXT_CORO;
2403 %EXT_CORO = (); 2751 %EXT_CORO = ();
2404 2752
2405 warn "removing commands"; 2753 warn "removing commands";
2444 Symbol::delete_package "safe::$_" 2792 Symbol::delete_package "safe::$_"
2445 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2793 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2446 2794
2447 warn "unloading cf.pm \"a bit\""; 2795 warn "unloading cf.pm \"a bit\"";
2448 delete $INC{"cf.pm"}; 2796 delete $INC{"cf.pm"};
2797 delete $INC{"cf/pod.pm"};
2449 2798
2450 # don't, removes xs symbols, too, 2799 # don't, removes xs symbols, too,
2451 # and global variables created in xs 2800 # and global variables created in xs
2452 #Symbol::delete_package __PACKAGE__; 2801 #Symbol::delete_package __PACKAGE__;
2453 2802
2462 2811
2463 warn "loading extensions"; 2812 warn "loading extensions";
2464 cf::load_extensions; 2813 cf::load_extensions;
2465 2814
2466 warn "reattaching attachments to objects/players"; 2815 warn "reattaching attachments to objects/players";
2467 _global_reattach; 2816 _global_reattach; # objects, sockets
2468 warn "reattaching attachments to maps"; 2817 warn "reattaching attachments to maps";
2469 reattach $_ for values %MAP; 2818 reattach $_ for values %MAP;
2470 2819 warn "reattaching attachments to players";
2471 warn "loading reloadable resources"; 2820 reattach $_ for values %PLAYER;
2472 load_resources;
2473 2821
2474 warn "leaving sync_job"; 2822 warn "leaving sync_job";
2475 2823
2476 1 2824 1
2477 } or do { 2825 } or do {
2483 warn "reloaded"; 2831 warn "reloaded";
2484}; 2832};
2485 2833
2486our $RELOAD_WATCHER; # used only during reload 2834our $RELOAD_WATCHER; # used only during reload
2487 2835
2836sub reload_perl() {
2837 # doing reload synchronously and two reloads happen back-to-back,
2838 # coro crashes during coro_state_free->destroy here.
2839
2840 $RELOAD_WATCHER ||= Event->timer (
2841 reentrant => 0,
2842 after => 0,
2843 data => WF_AUTOCANCEL,
2844 cb => sub {
2845 do_reload_perl;
2846 undef $RELOAD_WATCHER;
2847 },
2848 );
2849}
2850
2488register_command "reload" => sub { 2851register_command "reload" => sub {
2489 my ($who, $arg) = @_; 2852 my ($who, $arg) = @_;
2490 2853
2491 if ($who->flag (FLAG_WIZ)) { 2854 if ($who->flag (FLAG_WIZ)) {
2492 $who->message ("reloading server."); 2855 $who->message ("reloading server.");
2493 2856 async { reload_perl };
2494 # doing reload synchronously and two reloads happen back-to-back,
2495 # coro crashes during coro_state_free->destroy here.
2496
2497 $RELOAD_WATCHER ||= Event->timer (
2498 reentrant => 0,
2499 after => 0,
2500 data => WF_AUTOCANCEL,
2501 cb => sub {
2502 reload;
2503 undef $RELOAD_WATCHER;
2504 },
2505 );
2506 } 2857 }
2507}; 2858};
2508 2859
2509unshift @INC, $LIBDIR; 2860unshift @INC, $LIBDIR;
2510 2861
2511my $bug_warning = 0; 2862my $bug_warning = 0;
2512 2863
2864our @WAIT_FOR_TICK;
2865our @WAIT_FOR_TICK_BEGIN;
2866
2867sub wait_for_tick {
2868 return unless $TICK_WATCHER->is_active;
2869 return if $Coro::current == $Coro::main;
2870
2871 my $signal = new Coro::Signal;
2872 push @WAIT_FOR_TICK, $signal;
2873 $signal->wait;
2874}
2875
2876sub wait_for_tick_begin {
2877 return unless $TICK_WATCHER->is_active;
2878 return if $Coro::current == $Coro::main;
2879
2880 my $signal = new Coro::Signal;
2881 push @WAIT_FOR_TICK_BEGIN, $signal;
2882 $signal->wait;
2883}
2884
2885 my $min = 1e6;#d#
2886 my $avg = 10;
2513$TICK_WATCHER = Event->timer ( 2887$TICK_WATCHER = Event->timer (
2514 reentrant => 0, 2888 reentrant => 0,
2515 parked => 1, 2889 parked => 1,
2516 prio => 0, 2890 prio => 0,
2517 at => $NEXT_TICK || $TICK, 2891 at => $NEXT_TICK || $TICK,
2521 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 2895 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2522 unless ++$bug_warning > 10; 2896 unless ++$bug_warning > 10;
2523 return; 2897 return;
2524 } 2898 }
2525 2899
2526 $NOW = Event::time; 2900 $NOW = $tick_start = Event::time;
2527 2901
2528 cf::server_tick; # one server iteration 2902 cf::server_tick; # one server iteration
2903
2904 0 && sync_job {#d#
2905 for(1..10) {
2906 my $t = Event::time;
2907 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2908 or die;
2909
2910 $map->width (50);
2911 $map->height (50);
2912 $map->alloc;
2913 $map->_load_objects ("/tmp/x.map", 1);
2914 my $t = Event::time - $t;
2915
2916 #next unless $t < 0.0013;#d#
2917 if ($t < $min) {
2918 $min = $t;
2919 }
2920 $avg = $avg * 0.99 + $t * 0.01;
2921 }
2922 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2923 exit 0;
2924 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2925 };
2926
2529 $RUNTIME += $TICK; 2927 $RUNTIME += $TICK;
2530 $NEXT_TICK += $TICK; 2928 $NEXT_TICK += $TICK;
2531 2929
2532 $WAIT_FOR_TICK->broadcast; 2930 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2533 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2931 $NEXT_RUNTIME_WRITE = $NOW + 10;
2932 Coro::async_pool {
2933 write_runtime
2934 or warn "ERROR: unable to write runtime file: $!";
2935 };
2936 }
2534 2937
2535# my $AFTER = Event::time; 2938# my $AFTER = Event::time;
2536# warn $AFTER - $NOW;#d# 2939# warn $AFTER - $NOW;#d#
2537 2940
2941 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2942 $sig->send;
2943 }
2944 while (my $sig = shift @WAIT_FOR_TICK) {
2945 $sig->send;
2946 }
2947
2948 $NOW = Event::time;
2949
2538 # if we are delayed by four ticks or more, skip them all 2950 # if we are delayed by four ticks or more, skip them all
2539 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2951 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2540 2952
2541 $TICK_WATCHER->at ($NEXT_TICK); 2953 $TICK_WATCHER->at ($NEXT_TICK);
2542 $TICK_WATCHER->start; 2954 $TICK_WATCHER->start;
2955
2956 $LOAD = ($NOW - $tick_start) / $TICK;
2957 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2958
2959 _post_tick;
2960
2961
2543 }, 2962 },
2544); 2963);
2545 2964
2546{ 2965{
2547 BDB::max_poll_time $TICK * 0.1; 2966 BDB::max_poll_time $TICK * 0.1;
2575 2994
2576 cf::sync_job { 2995 cf::sync_job {
2577 eval { 2996 eval {
2578 BDB::db_env_open 2997 BDB::db_env_open
2579 $DB_ENV, 2998 $DB_ENV,
2580 $BDB_ENV_DIR, 2999 $BDBDIR,
2581 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3000 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2582 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3001 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2583 0666; 3002 0666;
2584 3003
2585 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3004 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2586 3005
2587 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3006 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2588 $DB_ENV->set_lk_detect; 3007 $DB_ENV->set_lk_detect;
2589 }; 3008 };
2590 3009
2598 3017
2599 undef $Coro::AIO::WATCHER; 3018 undef $Coro::AIO::WATCHER;
2600 IO::AIO::max_poll_time $TICK * 0.1; 3019 IO::AIO::max_poll_time $TICK * 0.1;
2601 $AIO_POLL_WATCHER = Event->io ( 3020 $AIO_POLL_WATCHER = Event->io (
2602 reentrant => 0, 3021 reentrant => 0,
3022 data => WF_AUTOCANCEL,
2603 fd => IO::AIO::poll_fileno, 3023 fd => IO::AIO::poll_fileno,
2604 poll => 'r', 3024 poll => 'r',
2605 prio => 6, 3025 prio => 6,
2606 data => WF_AUTOCANCEL,
2607 cb => \&IO::AIO::poll_cb, 3026 cb => \&IO::AIO::poll_cb,
2608 ); 3027 );
2609} 3028}
2610 3029
2611$WRITE_RUNTIME_WATCHER = Event->timer ( 3030my $_log_backtrace;
2612 reentrant => 0,
2613 data => WF_AUTOCANCEL,
2614 parked => 1,
2615 after => 1,
2616 interval => 10,
2617 prio => 6, # keep it lowest so it acts like a watchdog
2618 cb => sub {
2619 $TICK_WATCHER->is_active or cf::cleanup "mainloop frozen but runtime active", 1;
2620 3031
2621 Coro::async_pool { 3032sub _log_backtrace {
2622 write_runtime 3033 my ($msg, @addr) = @_;
2623 or warn "ERROR: unable to write runtime file: $!"; 3034
3035 $msg =~ s/\n//;
3036
3037 # limit the # of concurrent backtraces
3038 if ($_log_backtrace < 2) {
3039 ++$_log_backtrace;
3040 async {
3041 my @bt = fork_call {
3042 @addr = map { sprintf "%x", $_ } @addr;
3043 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3044 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3045 or die "addr2line: $!";
3046
3047 my @funcs;
3048 my @res = <$fh>;
3049 chomp for @res;
3050 while (@res) {
3051 my ($func, $line) = splice @res, 0, 2, ();
3052 push @funcs, "[$func] $line";
3053 }
3054
3055 @funcs
3056 };
3057
3058 LOG llevInfo, "[ABT] $msg\n";
3059 LOG llevInfo, "[ABT] $_\n" for @bt;
3060 --$_log_backtrace;
2624 }; 3061 };
3062 } else {
3063 LOG llevInfo, "[ABT] $msg\n";
3064 LOG llevInfo, "[ABT] [suppressed]\n";
2625 }, 3065 }
2626); 3066}
3067
3068# load additional modules
3069use cf::pod;
2627 3070
2628END { cf::emergency_save } 3071END { cf::emergency_save }
2629 3072
26301 30731
2631 3074

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines