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.200 by root, Mon Jan 29 17:57:22 2007 UTC vs.
Revision 1.270 by root, Sat May 26 15:44:06 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
25use BDB ();
20use Data::Dumper; 26use Data::Dumper;
21use Digest::MD5; 27use Digest::MD5;
22use Fcntl; 28use Fcntl;
29use YAML::Syck ();
23use IO::AIO 2.32 (); 30use IO::AIO 2.32 ();
24use YAML::Syck ();
25use Time::HiRes; 31use Time::HiRes;
32use Compress::LZF;
26 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
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39
27use 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
28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 41
31# 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?
32$YAML::Syck::ImplicitUnicode = 1; 43$YAML::Syck::ImplicitUnicode = 1;
33 44
34$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
35 48
36our %COMMAND = (); 49our %COMMAND = ();
37our %COMMAND_TIME = (); 50our %COMMAND_TIME = ();
38 51
39our @EXTS = (); # list of extension package names 52our @EXTS = (); # list of extension package names
40our %EXTCMD = (); 53our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions 54our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps 55our %EXT_MAP = (); # pluggable maps
43 56
57our $RELOAD; # number of reloads so far
44our @EVENT; 58our @EVENT;
45our $LIBDIR = datadir . "/ext";
46 59
47our $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(!)
48our $TICK_WATCHER; 73our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 74our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
51our $NEXT_TICK; 76our $NEXT_TICK;
52our $NOW; 77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off
79
80our $BDB_POLL_WATCHER;
81our $DB_ENV;
53 82
54our %CFG; 83our %CFG;
55 84
56our $UPTIME; $UPTIME ||= time; 85our $UPTIME; $UPTIME ||= time;
57our $RUNTIME; 86our $RUNTIME;
58 87
59our %PLAYER; # all users 88our %PLAYER; # all users
60our %MAP; # all maps 89our %MAP; # all maps
61our $LINK_MAP; # the special {link} map, which is always available 90our $LINK_MAP; # the special {link} map, which is always available
62our $RANDOM_MAPS = cf::localdir . "/random";
63
64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66 91
67# 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 ∕
68our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
69 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
70binmode STDOUT; 99binmode STDOUT;
71binmode STDERR; 100binmode STDERR;
72 101
73# read virtual server time, if available 102# read virtual server time, if available
74unless ($RUNTIME || !-e cf::localdir . "/runtime") { 103unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
75 open my $fh, "<", cf::localdir . "/runtime" 104 open my $fh, "<", "$LOCALDIR/runtime"
76 or die "unable to read runtime file: $!"; 105 or die "unable to read runtime file: $!";
77 $RUNTIME = <$fh> + 0.; 106 $RUNTIME = <$fh> + 0.;
78} 107}
79 108
80mkdir cf::localdir; 109mkdir $_
81mkdir cf::localdir . "/" . cf::playerdir; 110 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
82mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS;
85 111
86our $EMERGENCY_POSITION; 112our $EMERGENCY_POSITION;
87 113
88sub cf::map::normalise; 114sub cf::map::normalise;
89 115
100=item $cf::RUNTIME 126=item $cf::RUNTIME
101 127
102The 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
103every server tick. 129every server tick.
104 130
105=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
106 134
107The perl library directory, where extensions and cf-specific modules can 135Various directories - "/etc", read-only install directory, perl-library
108be 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.
109 139
110=item $cf::NOW 140=item $cf::NOW
111 141
112The time of the last (current) server tick. 142The time of the last (current) server tick.
113 143
114=item $cf::TICK 144=item $cf::TICK
115 145
116The 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.
117 157
118=item %cf::CFG 158=item %cf::CFG
119 159
120Configuration for the server, loaded from C</etc/crossfire/config>, or 160Configuration for the server, loaded from C</etc/crossfire/config>, or
121from wherever your confdir points to. 161from wherever your confdir points to.
122 162
123=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 163=item cf::wait_for_tick, cf::wait_for_tick_begin
124 164
125These 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
126or 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
127processing 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.
128window of cpu time available, or simply to synchronise to the server tick.
129 168
130=back 169=back
131 170
132=cut 171=cut
133 172
134BEGIN { 173BEGIN {
135 *CORE::GLOBAL::warn = sub { 174 *CORE::GLOBAL::warn = sub {
136 my $msg = join "", @_; 175 my $msg = join "", @_;
137 utf8::encode $msg;
138 176
139 $msg .= "\n" 177 $msg .= "\n"
140 unless $msg =~ /\n$/; 178 unless $msg =~ /\n$/;
141 179
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181
182 utf8::encode $msg;
142 LOG llevError, $msg; 183 LOG llevError, $msg;
143 }; 184 };
144} 185}
145 186
146@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
192 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 233 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
193 $d 234 $d
194 } || "[unable to dump $_[0]: '$@']"; 235 } || "[unable to dump $_[0]: '$@']";
195} 236}
196 237
197use JSON::Syck (); # TODO# replace by JSON::PC once working 238use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
198 239
199=item $ref = cf::from_json $json 240=item $ref = cf::from_json $json
200 241
201Converts a JSON string into the corresponding perl data structure. 242Converts a JSON string into the corresponding perl data structure.
202 243
203=cut
204
205sub from_json($) {
206 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
207 JSON::Syck::Load $_[0]
208}
209
210=item $json = cf::to_json $ref 244=item $json = cf::to_json $ref
211 245
212Converts a perl data structure into its JSON representation. 246Converts a perl data structure into its JSON representation.
213
214=cut
215
216sub to_json($) {
217 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
218 JSON::Syck::Dump $_[0]
219}
220 247
221=item cf::lock_wait $string 248=item cf::lock_wait $string
222 249
223Wait until the given lock is available. See cf::lock_acquire. 250Wait until the given lock is available. See cf::lock_acquire.
224 251
230returned. 257returned.
231 258
232Lock names should begin with a unique identifier (for example, cf::map::find 259Lock names should begin with a unique identifier (for example, cf::map::find
233uses map_find and cf::map::load uses map_load). 260uses map_find and cf::map::load uses map_load).
234 261
262=item $locked = cf::lock_active $string
263
264Return true if the lock is currently active, i.e. somebody has locked it.
265
235=cut 266=cut
236 267
237our %LOCK; 268our %LOCK;
238 269
239sub lock_wait($) { 270sub lock_wait($) {
258 # wake up all waiters, to be on the safe side 289 # wake up all waiters, to be on the safe side
259 $_->ready for @{ delete $LOCK{$key} }; 290 $_->ready for @{ delete $LOCK{$key} };
260 } 291 }
261} 292}
262 293
294sub lock_active($) {
295 my ($key) = @_;
296
297 ! ! $LOCK{$key}
298}
299
263sub freeze_mainloop { 300sub freeze_mainloop {
264 return unless $TICK_WATCHER->is_active; 301 return unless $TICK_WATCHER->is_active;
265 302
266 my $guard = Coro::guard { 303 my $guard = Coro::guard {
267 $TICK_WATCHER->start; 304 $TICK_WATCHER->start;
268 $WRITE_RUNTIME_WATCHER->start;
269 }; 305 };
270 $WRITE_RUNTIME_WATCHER->stop;
271 $TICK_WATCHER->stop; 306 $TICK_WATCHER->stop;
272 $guard 307 $guard
273} 308}
274 309
275=item cf::async { BLOCK } 310=item cf::async { BLOCK }
297 332
298sub sync_job(&) { 333sub sync_job(&) {
299 my ($job) = @_; 334 my ($job) = @_;
300 335
301 if ($Coro::current == $Coro::main) { 336 if ($Coro::current == $Coro::main) {
337 my $time = Event::time;
338
302 # this is the main coro, too bad, we have to block 339 # this is the main coro, too bad, we have to block
303 # till the operation succeeds, freezing the server :/ 340 # till the operation succeeds, freezing the server :/
304 341
305 # TODO: use suspend/resume instead 342 # TODO: use suspend/resume instead
306 # (but this is cancel-safe) 343 # (but this is cancel-safe)
317 354
318 while ($busy) { 355 while ($busy) {
319 Coro::cede or Event::one_event; 356 Coro::cede or Event::one_event;
320 } 357 }
321 358
359 $time = Event::time - $time;
360
361 LOG llevError | logBacktrace, Carp::longmess "long sync job"
362 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
363
364 $tick_start += $time; # do not account sync jobs to server load
365
322 wantarray ? @res : $res[0] 366 wantarray ? @res : $res[0]
323 } else { 367 } else {
324 # we are in another coroutine, how wonderful, everything just works 368 # we are in another coroutine, how wonderful, everything just works
325 369
326 $job->() 370 $job->()
346 390
347 $coro 391 $coro
348} 392}
349 393
350sub write_runtime { 394sub write_runtime {
351 my $runtime = cf::localdir . "/runtime"; 395 my $runtime = "$LOCALDIR/runtime";
396
397 # first touch the runtime file to show we are still running:
398 # the fsync below can take a very very long time.
399
400 if (my $fh = aio_open $runtime, O_WRONLY, 0) {
401 utime undef, undef, $fh;
402 }
403
404 my $guard = cf::lock_acquire "write_runtime";
352 405
353 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 406 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
354 or return; 407 or return;
355 408
356 my $value = $cf::RUNTIME + 90 + 10; 409 my $value = $cf::RUNTIME + 90 + 10;
358 # 60 allows for the watchdog to kill the server. 411 # 60 allows for the watchdog to kill the server.
359 412
360 (aio_write $fh, 0, (length $value), $value, 0) <= 0 413 (aio_write $fh, 0, (length $value), $value, 0) <= 0
361 and return; 414 and return;
362 415
416 # always fsync - this file is important
363 aio_fsync $fh 417 aio_fsync $fh
364 and return; 418 and return;
365 419
420 # touch it again to show we are up-to-date
421 utime undef, undef, $fh;
422
366 close $fh 423 close $fh
367 or return; 424 or return;
368 425
369 aio_rename "$runtime~", $runtime 426 aio_rename "$runtime~", $runtime
370 and return; 427 and return;
371 428
429 warn "runtime file written.\n";#d#
430
372 1 431 1
432}
433
434=item cf::datalog type => key => value, ...
435
436Log a datalog packet of the given type with the given key-value pairs.
437
438=cut
439
440sub datalog($@) {
441 my ($type, %kv) = @_;
442 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
373} 443}
374 444
375=back 445=back
376 446
377=cut 447=cut
557 $registry = $CB_TYPE[$object_type] ||= []; 627 $registry = $CB_TYPE[$object_type] ||= [];
558 628
559 } elsif ($type eq "subtype") { 629 } elsif ($type eq "subtype") {
560 defined $object_type or Carp::croak "subtype specified without type"; 630 defined $object_type or Carp::croak "subtype specified without type";
561 my $object_subtype = shift @arg; 631 my $object_subtype = shift @arg;
562 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 632 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
563 633
564 } elsif ($type eq "package") { 634 } elsif ($type eq "package") {
565 my $pkg = shift @arg; 635 my $pkg = shift @arg;
566 636
567 while (my ($name, $id) = each %cb_id) { 637 while (my ($name, $id) = each %cb_id) {
608 if (ref $_[0]) { 678 if (ref $_[0]) {
609 _object_attach @_; 679 _object_attach @_;
610 } else { 680 } else {
611 _attach shift->_attach_registry, @_; 681 _attach shift->_attach_registry, @_;
612 } 682 }
683 _recalc_want;
613}; 684};
614 685
615# all those should be optimised 686# all those should be optimised
616sub cf::attachable::detach { 687sub cf::attachable::detach {
617 my ($obj, $name) = @_; 688 my ($obj, $name) = @_;
620 delete $obj->{_attachment}{$name}; 691 delete $obj->{_attachment}{$name};
621 reattach ($obj); 692 reattach ($obj);
622 } else { 693 } else {
623 Carp::croak "cannot, currently, detach class attachments"; 694 Carp::croak "cannot, currently, detach class attachments";
624 } 695 }
696 _recalc_want;
625}; 697};
626 698
627sub cf::attachable::attached { 699sub cf::attachable::attached {
628 my ($obj, $name) = @_; 700 my ($obj, $name) = @_;
629 701
752 $filename, length $$rdata, scalar @$objs; 824 $filename, length $$rdata, scalar @$objs;
753 825
754 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 826 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
755 chmod SAVE_MODE, $fh; 827 chmod SAVE_MODE, $fh;
756 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 828 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
757 aio_fsync $fh; 829 aio_fsync $fh if $cf::USE_FSYNC;
758 close $fh; 830 close $fh;
759 831
760 if (@$objs) { 832 if (@$objs) {
761 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 833 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
762 chmod SAVE_MODE, $fh; 834 chmod SAVE_MODE, $fh;
763 my $data = Storable::nfreeze { version => 1, objs => $objs }; 835 my $data = Storable::nfreeze { version => 1, objs => $objs };
764 aio_write $fh, 0, (length $data), $data, 0; 836 aio_write $fh, 0, (length $data), $data, 0;
765 aio_fsync $fh; 837 aio_fsync $fh if $cf::USE_FSYNC;
766 close $fh; 838 close $fh;
767 aio_rename "$filename.pst~", "$filename.pst"; 839 aio_rename "$filename.pst~", "$filename.pst";
768 } 840 }
769 } else { 841 } else {
770 aio_unlink "$filename.pst"; 842 aio_unlink "$filename.pst";
776 } 848 }
777 } else { 849 } else {
778 aio_unlink $filename; 850 aio_unlink $filename;
779 aio_unlink "$filename.pst"; 851 aio_unlink "$filename.pst";
780 } 852 }
781
782 #d##TODO# nuke non .map-files if exist
783 if ($filename =~ s/\.map$//) {
784 aio_unlink $filename;
785 aio_unlink "$filename.pst";
786 }
787 } 853 }
788} 854}
789 855
790sub object_freezer_as_string { 856sub object_freezer_as_string {
791 my ($rdata, $objs) = @_; 857 my ($rdata, $objs) = @_;
797 863
798sub object_thawer_load { 864sub object_thawer_load {
799 my ($filename) = @_; 865 my ($filename) = @_;
800 866
801 my ($data, $av); 867 my ($data, $av);
802
803 #d#TODO remove .map if file does not exist
804 aio_stat $filename and $filename =~ s/\.map$//;
805 868
806 (aio_load $filename, $data) >= 0 869 (aio_load $filename, $data) >= 0
807 or return; 870 or return;
808 871
809 unless (aio_stat "$filename.pst") { 872 unless (aio_stat "$filename.pst") {
948Returns the given player object, loading it if necessary (might block). 1011Returns the given player object, loading it if necessary (might block).
949 1012
950=cut 1013=cut
951 1014
952sub playerdir($) { 1015sub playerdir($) {
953 cf::localdir 1016 "$PLAYERDIR/"
954 . "/"
955 . cf::playerdir
956 . "/"
957 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1017 . (ref $_[0] ? $_[0]->ob->name : $_[0])
958} 1018}
959 1019
960sub path($) { 1020sub path($) {
961 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1021 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
962 1022
963 (playerdir $login) . "/$login.pl" 1023 (playerdir $login) . "/playerdata"
964} 1024}
965 1025
966sub find_active($) { 1026sub find_active($) {
967 $cf::PLAYER{$_[0]} 1027 $cf::PLAYER{$_[0]}
968 and $cf::PLAYER{$_[0]}->active 1028 and $cf::PLAYER{$_[0]}->active
981 my $login = $_[0]; 1041 my $login = $_[0];
982 1042
983 my $guard = cf::lock_acquire "user_find:$login"; 1043 my $guard = cf::lock_acquire "user_find:$login";
984 1044
985 $cf::PLAYER{$_[0]} || do { 1045 $cf::PLAYER{$_[0]} || do {
1046 # rename old playerfiles to new ones
1047 #TODO: remove when no longer required
1048 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1049 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1050 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1051 aio_unlink +(playerdir $login) . "/$login.pl";
1052
986 my $pl = load_pl path $login 1053 my $pl = load_pl path $login
987 or return; 1054 or return;
988 $cf::PLAYER{$login} = $pl 1055 $cf::PLAYER{$login} = $pl
989 } 1056 }
990 } 1057 }
1027 1094
1028=cut 1095=cut
1029 1096
1030sub quit_character { 1097sub quit_character {
1031 my ($pl) = @_; 1098 my ($pl) = @_;
1099
1100 my $name = $pl->ob->name;
1032 1101
1033 $pl->{deny_save} = 1; 1102 $pl->{deny_save} = 1;
1034 $pl->password ("*"); # this should lock out the player until we nuked the dir 1103 $pl->password ("*"); # this should lock out the player until we nuked the dir
1035 1104
1036 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1105 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1041 my $path = playerdir $pl; 1110 my $path = playerdir $pl;
1042 my $temp = "$path~$cf::RUNTIME~deleting~"; 1111 my $temp = "$path~$cf::RUNTIME~deleting~";
1043 aio_rename $path, $temp; 1112 aio_rename $path, $temp;
1044 delete $cf::PLAYER{$pl->ob->name}; 1113 delete $cf::PLAYER{$pl->ob->name};
1045 $pl->destroy; 1114 $pl->destroy;
1115
1116 my $prefix = qr<^~\Q$name\E/>;
1117
1118 # nuke player maps
1119 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1120
1046 IO::AIO::aio_rmtree $temp; 1121 IO::AIO::aio_rmtree $temp;
1122}
1123
1124=item $pl->kick
1125
1126Kicks a player out of the game. This destroys the connection.
1127
1128=cut
1129
1130sub kick {
1131 my ($pl, $kicker) = @_;
1132
1133 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1134 $pl->killer ("kicked");
1135 $pl->ns->destroy;
1047} 1136}
1048 1137
1049=item cf::player::list_logins 1138=item cf::player::list_logins
1050 1139
1051Returns am arrayref of all valid playernames in the system, can take a 1140Returns am arrayref of all valid playernames in the system, can take a
1052while and may block, so not sync_job-capable, ever. 1141while and may block, so not sync_job-capable, ever.
1053 1142
1054=cut 1143=cut
1055 1144
1056sub list_logins { 1145sub list_logins {
1057 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1146 my $dirs = aio_readdir $PLAYERDIR
1058 or return []; 1147 or return [];
1059 1148
1060 my @logins; 1149 my @logins;
1061 1150
1062 for my $login (@$dirs) { 1151 for my $login (@$dirs) {
1079=cut 1168=cut
1080 1169
1081sub maps($) { 1170sub maps($) {
1082 my ($pl) = @_; 1171 my ($pl) = @_;
1083 1172
1173 $pl = ref $pl ? $pl->ob->name : $pl;
1174
1084 my $files = aio_readdir playerdir $pl 1175 my $files = aio_readdir playerdir $pl
1085 or return; 1176 or return;
1086 1177
1087 my @paths; 1178 my @paths;
1088 1179
1089 for (@$files) { 1180 for (@$files) {
1090 utf8::decode $_; 1181 utf8::decode $_;
1091 next if /\.(?:pl|pst)$/; 1182 next if /\.(?:pl|pst)$/;
1092 next unless /^$PATH_SEP/o; 1183 next unless /^$PATH_SEP/o;
1093 1184
1094 push @paths, cf::map::normalise "~" . $pl->ob->name . "/" . $_; 1185 push @paths, cf::map::normalise "~$pl/$_";
1095 } 1186 }
1096 1187
1097 \@paths 1188 \@paths
1098} 1189}
1099 1190
1100=item $player->ext_reply ($msgid, $msgtype, %msg) 1191=item $player->ext_reply ($msgid, %msg)
1101 1192
1102Sends an ext reply to the player. 1193Sends an ext reply to the player.
1103 1194
1104=cut 1195=cut
1105 1196
1106sub ext_reply($$$%) { 1197sub ext_reply($$%) {
1107 my ($self, $id, %msg) = @_; 1198 my ($self, $id, %msg) = @_;
1108 1199
1109 $msg{msgid} = $id; 1200 $msg{msgid} = $id;
1110 1201
1111 $self->send ("ext " . cf::to_json \%msg); 1202 $self->send ("ext " . cf::to_json \%msg);
1112} 1203}
1113 1204
1114package cf; 1205=item $player->ext_event ($type, %msg)
1206
1207Sends an ext event to the client.
1208
1209=cut
1210
1211sub ext_event($$%) {
1212 my ($self, $type, %msg) = @_;
1213
1214 $self->ns->ext_event ($type, %msg);
1215}
1216
1217=head3 cf::region
1218
1219=over 4
1220
1221=cut
1222
1223package cf::region;
1224
1225=item cf::region::find_by_path $path
1226
1227Tries to decuce the probable region for a map knowing only its path.
1228
1229=cut
1230
1231sub find_by_path($) {
1232 my ($path) = @_;
1233
1234 my ($match, $specificity);
1235
1236 for my $region (list) {
1237 if ($region->match && $path =~ $region->match) {
1238 ($match, $specificity) = ($region, $region->specificity)
1239 if $region->specificity > $specificity;
1240 }
1241 }
1242
1243 $match
1244}
1115 1245
1116=back 1246=back
1117
1118 1247
1119=head3 cf::map 1248=head3 cf::map
1120 1249
1121=over 4 1250=over 4
1122 1251
1260 1389
1261# the original (read-only) location 1390# the original (read-only) location
1262sub load_path { 1391sub load_path {
1263 my ($self) = @_; 1392 my ($self) = @_;
1264 1393
1265 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1394 "$MAPDIR/$self->{path}.map"
1266} 1395}
1267 1396
1268# the temporary/swap location 1397# the temporary/swap location
1269sub save_path { 1398sub save_path {
1270 my ($self) = @_; 1399 my ($self) = @_;
1271 1400
1272 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1401 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1273 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1402 "$TMPDIR/$path.map"
1274} 1403}
1275 1404
1276# the unique path, undef == no special unique path 1405# the unique path, undef == no special unique path
1277sub uniq_path { 1406sub uniq_path {
1278 my ($self) = @_; 1407 my ($self) = @_;
1279 1408
1280 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1409 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1281 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1410 "$UNIQUEDIR/$path"
1282} 1411}
1283 1412
1284# and all this just because we cannot iterate over 1413# and all this just because we cannot iterate over
1285# all maps in C++... 1414# all maps in C++...
1286sub change_all_map_light { 1415sub change_all_map_light {
1294 my ($self) = @_; 1423 my ($self) = @_;
1295 1424
1296 utf8::encode (my $save = $self->save_path); 1425 utf8::encode (my $save = $self->save_path);
1297 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1426 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1298 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1427 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1299
1300 #d#TODO remove .map and also nuke
1301 $save =~ s/\.map// or return;#d#
1302 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1303 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1304} 1428}
1305 1429
1306sub load_header_from($) { 1430sub load_header_from($) {
1307 my ($self, $path) = @_; 1431 my ($self, $path) = @_;
1308 1432
1358 $self->load_header_orig 1482 $self->load_header_orig
1359 or return; 1483 or return;
1360 $self->prepare_orig; 1484 $self->prepare_orig;
1361 } 1485 }
1362 1486
1487 $self->default_region (cf::region::find_by_path $self->{path})
1488 unless $self->default_region;
1489
1363 1 1490 1
1364} 1491}
1365 1492
1366sub find; 1493sub find;
1367sub find { 1494sub find {
1400 my ($self) = @_; 1527 my ($self) = @_;
1401 1528
1402 local $self->{deny_reset} = 1; # loading can take a long time 1529 local $self->{deny_reset} = 1; # loading can take a long time
1403 1530
1404 my $path = $self->{path}; 1531 my $path = $self->{path};
1532
1533 {
1405 my $guard = cf::lock_acquire "map_load:$path"; 1534 my $guard = cf::lock_acquire "map_load:$path";
1406 1535
1407 return if $self->in_memory != cf::MAP_SWAPPED; 1536 return if $self->in_memory != cf::MAP_SWAPPED;
1408 1537
1409 $self->in_memory (cf::MAP_LOADING); 1538 $self->in_memory (cf::MAP_LOADING);
1410 1539
1411 $self->alloc; 1540 $self->alloc;
1412 1541
1413 $self->pre_load; 1542 $self->pre_load;
1414
1415 $self->_load_objects ($self->{load_path}, 1)
1416 or return;
1417
1418 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1419 if delete $self->{load_original};
1420
1421 if (my $uniq = $self->uniq_path) {
1422 utf8::encode $uniq;
1423 if (aio_open $uniq, O_RDONLY, 0) {
1424 $self->clear_unique_items;
1425 $self->_load_objects ($uniq, 0);
1426 }
1427 }
1428
1429 Coro::cede;
1430
1431 # now do the right thing for maps
1432 $self->link_multipart_objects;
1433
1434 unless ($self->{deny_activate}) {
1435 $self->decay_objects;
1436 $self->fix_auto_apply;
1437 $self->update_buttons;
1438 Coro::cede; 1543 Coro::cede;
1439 $self->set_darkness_map; 1544
1545 $self->_load_objects ($self->{load_path}, 1)
1546 or return;
1547
1548 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1549 if delete $self->{load_original};
1550
1551 if (my $uniq = $self->uniq_path) {
1552 utf8::encode $uniq;
1553 if (aio_open $uniq, O_RDONLY, 0) {
1554 $self->clear_unique_items;
1555 $self->_load_objects ($uniq, 0);
1556 }
1557 }
1558
1559 Coro::cede;
1560 # now do the right thing for maps
1561 $self->link_multipart_objects;
1440 $self->difficulty ($self->estimate_difficulty) 1562 $self->difficulty ($self->estimate_difficulty)
1441 unless $self->difficulty; 1563 unless $self->difficulty;
1442 Coro::cede; 1564 Coro::cede;
1565
1566 unless ($self->{deny_activate}) {
1567 $self->decay_objects;
1568 $self->fix_auto_apply;
1569 $self->update_buttons;
1570 Coro::cede;
1571 $self->set_darkness_map;
1572 Coro::cede;
1443 $self->activate; 1573 $self->activate;
1574 }
1575
1576 $self->in_memory (cf::MAP_IN_MEMORY);
1444 } 1577 }
1445 1578
1446 $self->post_load; 1579 $self->post_load;
1447
1448 $self->in_memory (cf::MAP_IN_MEMORY);
1449} 1580}
1450 1581
1451sub customise_for { 1582sub customise_for {
1452 my ($self, $ob) = @_; 1583 my ($self, $ob) = @_;
1453 1584
1596 return if $self->players; 1727 return if $self->players;
1597 return if $self->isa ("ext::map_per_player");#d# 1728 return if $self->isa ("ext::map_per_player");#d#
1598 1729
1599 warn "resetting map ", $self->path;#d# 1730 warn "resetting map ", $self->path;#d#
1600 1731
1732 $self->in_memory (cf::MAP_SWAPPED);
1733
1734 # need to save uniques path
1735 unless ($self->{deny_save}) {
1736 my $uniq = $self->uniq_path; utf8::encode $uniq;
1737
1738 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1739 if $uniq;
1740 }
1741
1601 delete $cf::MAP{$self->path}; 1742 delete $cf::MAP{$self->path};
1602 1743
1603 $self->in_memory (cf::MAP_SWAPPED);
1604 $self->clear; 1744 $self->clear;
1605 1745
1606 $_->clear_links_to ($self) for values %cf::MAP; 1746 $_->clear_links_to ($self) for values %cf::MAP;
1607 1747
1608 $self->unlink_save; 1748 $self->unlink_save;
1635instantiated unique items. May block. 1775instantiated unique items. May block.
1636 1776
1637=cut 1777=cut
1638 1778
1639sub unique_maps() { 1779sub unique_maps() {
1640 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 1780 my $files = aio_readdir $UNIQUEDIR
1641 or return; 1781 or return;
1642 1782
1643 my @paths; 1783 my @paths;
1644 1784
1645 for (@$files) { 1785 for (@$files) {
1764 $self->deactivate_recursive; 1904 $self->deactivate_recursive;
1765 1905
1766 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1906 return if UNIVERSAL::isa $self->map, "ext::map_link";
1767 1907
1768 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1908 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1769 if $self->map; 1909 if $self->map && $self->map->{path} ne "{link}";
1770 1910
1771 $self->enter_map ($LINK_MAP || link_map, 10, 10); 1911 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1772} 1912}
1773 1913
1774sub cf::object::player::leave_link { 1914sub cf::object::player::leave_link {
1775 my ($self, $map, $x, $y) = @_; 1915 my ($self, $map, $x, $y) = @_;
1916
1917 return unless $self->contr->active;
1776 1918
1777 my $link_pos = delete $self->{_link_pos}; 1919 my $link_pos = delete $self->{_link_pos};
1778 1920
1779 unless ($map) { 1921 unless ($map) {
1780 # restore original map position 1922 # restore original map position
1798 $map->load; 1940 $map->load;
1799 $map->load_diag; 1941 $map->load_diag;
1800 1942
1801 return unless $self->contr->active; 1943 return unless $self->contr->active;
1802 $self->activate_recursive; 1944 $self->activate_recursive;
1945
1946 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1803 $self->enter_map ($map, $x, $y); 1947 $self->enter_map ($map, $x, $y);
1804} 1948}
1805 1949
1806cf::player->attach (
1807 on_logout => sub {
1808 my ($pl) = @_;
1809
1810 # abort map switching before logout
1811 if ($pl->ob->{_link_pos}) {
1812 cf::sync_job {
1813 $pl->ob->leave_link
1814 };
1815 }
1816 },
1817 on_login => sub {
1818 my ($pl) = @_;
1819
1820 # try to abort aborted map switching on player login :)
1821 # should happen only on crashes
1822 if ($pl->ob->{_link_pos}) {
1823 $pl->ob->enter_link;
1824 (async {
1825 # we need this sleep as the login has a concurrent enter_exit running
1826 # and this sleep increases chances of the player not ending up in scorn
1827 $pl->ob->reply (undef,
1828 "There was an internal problem at your last logout, "
1829 . "the server will try to bring you to your intended destination in a second.",
1830 cf::NDI_RED);
1831 Coro::Timer::sleep 1;
1832 $pl->ob->leave_link;
1833 })->prio (2);
1834 }
1835 },
1836);
1837
1838=item $player_object->goto ($path, $x, $y) 1950=item $player_object->goto ($path, $x, $y[, $check->($map)])
1839 1951
1952Moves the player to the given map-path and coordinates by first freezing
1953her, loading and preparing them map, calling the provided $check callback
1954that has to return the map if sucecssful, and then unfreezes the player on
1955the new (success) or old (failed) map position.
1956
1840=cut 1957=cut
1958
1959our $GOTOGEN;
1841 1960
1842sub cf::object::player::goto { 1961sub cf::object::player::goto {
1843 my ($self, $path, $x, $y) = @_; 1962 my ($self, $path, $x, $y, $check) = @_;
1963
1964 # do generation counting so two concurrent goto's will be executed in-order
1965 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1844 1966
1845 $self->enter_link; 1967 $self->enter_link;
1846 1968
1847 (async { 1969 (async {
1848 my $map = eval { 1970 my $map = eval {
1849 my $map = cf::map::find $path; 1971 my $map = cf::map::find $path;
1972
1973 if ($map) {
1850 $map = $map->customise_for ($self) if $map; 1974 $map = $map->customise_for ($self);
1975 $map = $check->($map) if $check && $map;
1976 } else {
1977 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1978 }
1979
1851 $map 1980 $map
1981 };
1982
1983 if ($@) {
1984 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
1985 LOG llevError | logBacktrace, Carp::longmess $@;
1852 } or 1986 }
1853 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1854 1987
1988 if ($gen == $self->{_goto_generation}) {
1989 delete $self->{_goto_generation};
1855 $self->leave_link ($map, $x, $y); 1990 $self->leave_link ($map, $x, $y);
1991 }
1856 })->prio (1); 1992 })->prio (1);
1857} 1993}
1858 1994
1859=item $player_object->enter_exit ($exit_object) 1995=item $player_object->enter_exit ($exit_object)
1860 1996
1899 2035
1900 $rmp->{random_seed} ||= $exit->random_seed; 2036 $rmp->{random_seed} ||= $exit->random_seed;
1901 2037
1902 my $data = cf::to_json $rmp; 2038 my $data = cf::to_json $rmp;
1903 my $md5 = Digest::MD5::md5_hex $data; 2039 my $md5 = Digest::MD5::md5_hex $data;
1904 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2040 my $meta = "$RANDOMDIR/$md5.meta";
1905 2041
1906 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2042 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1907 aio_write $fh, 0, (length $data), $data, 0; 2043 aio_write $fh, 0, (length $data), $data, 0;
1908 undef $fh; 2044 undef $fh;
1909 aio_rename "$meta~", $meta; 2045 aio_rename "$meta~", $meta;
1918 2054
1919 return unless $self->type == cf::PLAYER; 2055 return unless $self->type == cf::PLAYER;
1920 2056
1921 if ($exit->slaying eq "/!") { 2057 if ($exit->slaying eq "/!") {
1922 #TODO: this should de-fi-ni-te-ly not be a sync-job 2058 #TODO: this should de-fi-ni-te-ly not be a sync-job
2059 # the problem is that $exit might not survive long enough
2060 # so it needs to be done right now, right here
1923 cf::sync_job { prepare_random_map $exit }; 2061 cf::sync_job { prepare_random_map $exit };
1924 } 2062 }
1925 2063
1926 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2064 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1927 my $hp = $exit->stats->hp; 2065 my $hp = $exit->stats->hp;
1935 $self->goto ($slaying, $hp, $sp); 2073 $self->goto ($slaying, $hp, $sp);
1936 2074
1937 1; 2075 1;
1938 }) { 2076 }) {
1939 $self->message ("Something went wrong deep within the crossfire server. " 2077 $self->message ("Something went wrong deep within the crossfire server. "
1940 . "I'll try to bring you back to the map you were before. " 2078 . "I'll try to bring you back to the map you were before. "
1941 . "Please report this to the dungeon master!", 2079 . "Please report this to the dungeon master!",
1942 cf::NDI_UNIQUE | cf::NDI_RED); 2080 cf::NDI_UNIQUE | cf::NDI_RED);
1943 2081
1944 warn "ERROR in enter_exit: $@"; 2082 warn "ERROR in enter_exit: $@";
1945 $self->leave_link; 2083 $self->leave_link;
1946 } 2084 }
1947 })->prio (1); 2085 })->prio (1);
1960 2098
1961sub cf::client::send_drawinfo { 2099sub cf::client::send_drawinfo {
1962 my ($self, $text, $flags) = @_; 2100 my ($self, $text, $flags) = @_;
1963 2101
1964 utf8::encode $text; 2102 utf8::encode $text;
1965 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2103 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1966} 2104}
1967 2105
2106=item $client->ext_event ($type, %msg)
2107
2108Sends an exti event to the client.
2109
2110=cut
2111
2112sub cf::client::ext_event($$%) {
2113 my ($self, $type, %msg) = @_;
2114
2115 $msg{msgtype} = "event_$type";
2116 $self->send_packet ("ext " . cf::to_json \%msg);
2117}
1968 2118
1969=item $success = $client->query ($flags, "text", \&cb) 2119=item $success = $client->query ($flags, "text", \&cb)
1970 2120
1971Queues a query to the client, calling the given callback with 2121Queues a query to the client, calling the given callback with
1972the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2122the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2001 # get handled first 2151 # get handled first
2002 my $queue = delete $ns->{query_queue} 2152 my $queue = delete $ns->{query_queue}
2003 or return; # be conservative, not sure how that can happen, but we saw a crash here 2153 or return; # be conservative, not sure how that can happen, but we saw a crash here
2004 2154
2005 (shift @$queue)->[1]->($msg); 2155 (shift @$queue)->[1]->($msg);
2156 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
2006 2157
2007 push @{ $ns->{query_queue} }, @$queue; 2158 push @{ $ns->{query_queue} }, @$queue;
2008 2159
2009 if (@{ $ns->{query_queue} } == @$queue) { 2160 if (@{ $ns->{query_queue} } == @$queue) {
2010 if (@$queue) { 2161 if (@$queue) {
2068 2219
2069# here we export the classes and methods available to script code 2220# here we export the classes and methods available to script code
2070 2221
2071=pod 2222=pod
2072 2223
2073The following fucntions and emthods are available within a safe environment: 2224The following functions and methods are available within a safe environment:
2074 2225
2075 cf::object contr pay_amount pay_player map 2226 cf::object contr pay_amount pay_player map
2076 cf::object::player player 2227 cf::object::player player
2077 cf::player peaceful 2228 cf::player peaceful
2078 cf::map trigger 2229 cf::map trigger
2163############################################################################# 2314#############################################################################
2164 2315
2165=head2 EXTENSION DATABASE SUPPORT 2316=head2 EXTENSION DATABASE SUPPORT
2166 2317
2167Crossfire maintains a very simple database for extension use. It can 2318Crossfire maintains a very simple database for extension use. It can
2168currently store anything that can be serialised using Storable, which 2319currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2169excludes objects. 2320convert to/from binary).
2170 2321
2171The parameter C<$family> should best start with the name of the extension 2322The parameter C<$family> should best start with the name of the extension
2172using it, it should be unique. 2323using it, it should be unique.
2173 2324
2174=over 4 2325=over 4
2175 2326
2176=item $hashref = cf::db_get $family
2177
2178Return a hashref for use by the extension C<$family>, which can be
2179modified. After modifications, you have to call C<cf::db_dirty> or
2180C<cf::db_sync>.
2181
2182=item $value = cf::db_get $family => $key 2327=item $value = cf::db_get $family => $key
2183 2328
2184Returns a single value from the database 2329Returns a single value from the database.
2185
2186=item cf::db_put $family => $hashref
2187
2188Stores the given family hashref into the database. Updates are delayed, if
2189you want the data to be synced to disk immediately, use C<cf::db_sync>.
2190 2330
2191=item cf::db_put $family => $key => $value 2331=item cf::db_put $family => $key => $value
2192 2332
2193Stores the given C<$value> in the family hash. Updates are delayed, if you 2333Stores the given C<$value> in the family.
2194want the data to be synced to disk immediately, use C<cf::db_sync>.
2195
2196=item cf::db_dirty
2197
2198Marks the database as dirty, to be updated at a later time.
2199
2200=item cf::db_sync
2201
2202Immediately write the database to disk I<if it is dirty>.
2203 2334
2204=cut 2335=cut
2205 2336
2206our $DB; 2337our $DB;
2207 2338
2208{ 2339sub db_init {
2209 my $path = cf::localdir . "/database.pst"; 2340 unless ($DB) {
2341 $DB = BDB::db_create $DB_ENV;
2210 2342
2211 sub db_load() { 2343 cf::sync_job {
2212 $DB = stat $path ? Storable::retrieve $path : { }; 2344 eval {
2213 } 2345 $DB->set_flags (BDB::CHKSUM);
2214 2346
2215 my $pid; 2347 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2216 2348 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2217 sub db_save() { 2349 cf::cleanup "db_open(db): $!" if $!;
2218 waitpid $pid, 0 if $pid; 2350 };
2219 if (0 == ($pid = fork)) { 2351 cf::cleanup "db_open(db): $@" if $@;
2220 $DB->{_meta}{version} = 1;
2221 Storable::nstore $DB, "$path~";
2222 rename "$path~", $path;
2223 cf::_exit 0 if defined $pid;
2224 } 2352 };
2225 } 2353 }
2354}
2226 2355
2227 my $dirty;
2228
2229 sub db_sync() {
2230 db_save if $dirty;
2231 undef $dirty;
2232 }
2233
2234 my $idle = Event->idle (
2235 reentrant => 0,
2236 min => 10,
2237 max => 20,
2238 repeat => 0,
2239 data => WF_AUTOCANCEL,
2240 cb => \&db_sync,
2241 );
2242
2243 sub db_dirty() {
2244 $dirty = 1;
2245 $idle->start;
2246 }
2247
2248 sub db_get($;$) { 2356sub db_get($$) {
2249 @_ >= 2 2357 my $key = "$_[0]/$_[1]";
2250 ? $DB->{$_[0]}{$_[1]}
2251 : ($DB->{$_[0]} ||= { })
2252 }
2253 2358
2359 cf::sync_job {
2360 BDB::db_get $DB, undef, $key, my $data;
2361
2362 $! ? ()
2363 : $data
2364 }
2365}
2366
2254 sub db_put($$;$) { 2367sub db_put($$$) {
2255 if (@_ >= 3) { 2368 BDB::dbreq_pri 4;
2256 $DB->{$_[0]}{$_[1]} = $_[2]; 2369 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2257 } else { 2370}
2258 $DB->{$_[0]} = $_[1];
2259 }
2260 db_dirty;
2261 }
2262 2371
2263 cf::global->attach ( 2372=item cf::cache $id => [$paths...], $processversion => $process
2264 prio => 10000, 2373
2265 on_cleanup => sub { 2374Generic caching function that returns the value of the resource $id,
2266 db_sync; 2375caching and regenerating as required.
2376
2377This function can block.
2378
2379=cut
2380
2381sub cache {
2382 my ($id, $src, $processversion, $process) = @_;
2383
2384 my $meta =
2385 join "\x00",
2386 $processversion,
2387 map {
2388 aio_stat $_
2389 and Carp::croak "$_: $!";
2390
2391 ($_, (stat _)[7,9])
2392 } @$src;
2393
2394 my $dbmeta = db_get cache => "$id/meta";
2395 if ($dbmeta ne $meta) {
2396 # changed, we may need to process
2397
2398 my @data;
2399 my $md5;
2400
2401 for (0 .. $#$src) {
2402 0 <= aio_load $src->[$_], $data[$_]
2403 or Carp::croak "$src->[$_]: $!";
2267 }, 2404 }
2268 ); 2405
2406 # if processing is expensive, check
2407 # checksum first
2408 if (1) {
2409 $md5 =
2410 join "\x00",
2411 $processversion,
2412 map {
2413 Coro::cede;
2414 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2415 } 0.. $#$src;
2416
2417
2418 my $dbmd5 = db_get cache => "$id/md5";
2419 if ($dbmd5 eq $md5) {
2420 db_put cache => "$id/meta", $meta;
2421
2422 return db_get cache => "$id/data";
2423 }
2424 }
2425
2426 my $t1 = Time::HiRes::time;
2427 my $data = $process->(\@data);
2428 my $t2 = Time::HiRes::time;
2429
2430 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2431
2432 db_put cache => "$id/data", $data;
2433 db_put cache => "$id/md5" , $md5;
2434 db_put cache => "$id/meta", $meta;
2435
2436 return $data;
2437 }
2438
2439 db_get cache => "$id/data"
2269} 2440}
2441
2442=item fork_call { }, $args
2443
2444Executes the given code block with the given arguments in a seperate
2445process, returning the results. Everything must be serialisable with
2446Coro::Storable. May, of course, block. Note that the executed sub may
2447never block itself or use any form of Event handling.
2448
2449=cut
2450
2451sub fork_call(&@) {
2452 my ($cb, @args) = @_;
2453
2454# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2455# or die "socketpair: $!";
2456 pipe my $fh1, my $fh2
2457 or die "pipe: $!";
2458
2459 if (my $pid = fork) {
2460 close $fh2;
2461
2462 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2463 $res = Coro::Storable::thaw $res;
2464
2465 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2466
2467 die $$res unless "ARRAY" eq ref $res;
2468
2469 return wantarray ? @$res : $res->[-1];
2470 } else {
2471 reset_signals;
2472 local $SIG{__WARN__};
2473 local $SIG{__DIE__};
2474 eval {
2475 close $fh1;
2476
2477 my @res = eval { $cb->(@args) };
2478 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2479 };
2480
2481 warn $@ if $@;
2482 _exit 0;
2483 }
2484}
2485
2486
2270 2487
2271############################################################################# 2488#############################################################################
2272# the server's main() 2489# the server's init and main functions
2490
2491sub load_facedata($) {
2492 my ($path) = @_;
2493
2494 warn "loading facedata from $path\n";
2495
2496 my $facedata;
2497 0 < aio_load $path, $facedata
2498 or die "$path: $!";
2499
2500 $facedata = Coro::Storable::thaw $facedata;
2501
2502 $facedata->{version} == 2
2503 or cf::cleanup "$path: version mismatch, cannot proceed.";
2504
2505 {
2506 my $faces = $facedata->{faceinfo};
2507
2508 while (my ($face, $info) = each %$faces) {
2509 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2510 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2511 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2512 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2513 Coro::cede;
2514 }
2515
2516 while (my ($face, $info) = each %$faces) {
2517 next unless $info->{smooth};
2518 my $idx = cf::face::find $face
2519 or next;
2520 if (my $smooth = cf::face::find $info->{smooth}) {
2521 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2522 } else {
2523 warn "smooth face '$info->{smooth}' not found for face '$face'";
2524 }
2525 Coro::cede;
2526 }
2527 }
2528
2529 {
2530 my $anims = $facedata->{animinfo};
2531
2532 while (my ($anim, $info) = each %$anims) {
2533 cf::anim::set $anim, $info->{frames}, $info->{facings};
2534 Coro::cede;
2535 }
2536
2537 cf::anim::invalidate_all; # d'oh
2538 }
2539
2540 1
2541}
2542
2543sub reload_regions {
2544 load_resource_file "$MAPDIR/regions"
2545 or die "unable to load regions file\n";
2546}
2547
2548sub reload_facedata {
2549 load_facedata "$DATADIR/facedata"
2550 or die "unable to load facedata\n";
2551}
2552
2553sub reload_archetypes {
2554 load_resource_file "$DATADIR/archetypes"
2555 or die "unable to load archetypes\n";
2556}
2557
2558sub reload_treasures {
2559 load_resource_file "$DATADIR/treasures"
2560 or die "unable to load treasurelists\n";
2561}
2562
2563sub reload_resources {
2564 warn "reloading resource files...\n";
2565
2566 reload_regions;
2567 reload_facedata;
2568 reload_archetypes;
2569 reload_treasures;
2570
2571 warn "finished reloading resource files\n";
2572}
2573
2574sub init {
2575 reload_resources;
2576}
2273 2577
2274sub cfg_load { 2578sub cfg_load {
2275 open my $fh, "<:utf8", cf::confdir . "/config" 2579 open my $fh, "<:utf8", "$CONFDIR/config"
2276 or return; 2580 or return;
2277 2581
2278 local $/; 2582 local $/;
2279 *CFG = YAML::Syck::Load <$fh>; 2583 *CFG = YAML::Syck::Load <$fh>;
2280 2584
2300 Event::one_event; 2604 Event::one_event;
2301 })->prio (Coro::PRIO_MAX); 2605 })->prio (Coro::PRIO_MAX);
2302 }; 2606 };
2303 2607
2304 cfg_load; 2608 cfg_load;
2305 db_load; 2609 db_init;
2306 load_extensions; 2610 load_extensions;
2307 2611
2308 $TICK_WATCHER->start; 2612 $TICK_WATCHER->start;
2309 Event::loop; 2613 Event::loop;
2310} 2614}
2349 my $map = $cf::MAP{$path} or next; 2653 my $map = $cf::MAP{$path} or next;
2350 $map->valid or next; 2654 $map->valid or next;
2351 $map->save; 2655 $map->save;
2352 } 2656 }
2353 warn "end emergency map save\n"; 2657 warn "end emergency map save\n";
2658
2659 warn "begin emergency database checkpoint\n";
2660 BDB::db_env_txn_checkpoint $DB_ENV;
2661 warn "end emergency database checkpoint\n";
2354 }; 2662 };
2355 2663
2356 warn "leave emergency perl save\n"; 2664 warn "leave emergency perl save\n";
2357} 2665}
2358 2666
2667sub post_cleanup {
2668 my ($make_core) = @_;
2669
2670 warn Carp::longmess "post_cleanup backtrace"
2671 if $make_core;
2672}
2673
2359sub reload() { 2674sub do_reload_perl() {
2360 # can/must only be called in main 2675 # can/must only be called in main
2361 if ($Coro::current != $Coro::main) { 2676 if ($Coro::current != $Coro::main) {
2362 warn "can only reload from main coroutine"; 2677 warn "can only reload from main coroutine";
2363 return; 2678 return;
2364 } 2679 }
2365 2680
2366 warn "reloading..."; 2681 warn "reloading...";
2367 2682
2368 warn "cancelling server ticker"; 2683 warn "entering sync_job";
2369 $TICK_WATCHER->cancel;
2370 2684
2685 cf::sync_job {
2686 cf::write_runtime; # external watchdog should not bark
2371 cf::emergency_save; 2687 cf::emergency_save;
2688 cf::write_runtime; # external watchdog should not bark
2372 2689
2373 eval { 2690 warn "syncing database to disk";
2691 BDB::db_env_txn_checkpoint $DB_ENV;
2692
2374 # if anything goes wrong in here, we should simply crash as we already saved 2693 # if anything goes wrong in here, we should simply crash as we already saved
2375
2376 warn "syncing database to disk";
2377 cf::db_sync;
2378 2694
2379 warn "cancelling all WF_AUTOCANCEL watchers"; 2695 warn "cancelling all WF_AUTOCANCEL watchers";
2380 for (Event::all_watchers) { 2696 for (Event::all_watchers) {
2381 $_->cancel if $_->data & WF_AUTOCANCEL; 2697 $_->cancel if $_->data & WF_AUTOCANCEL;
2382 } 2698 }
2383 2699
2384 warn "flushing outstanding aio requests"; 2700 warn "flushing outstanding aio requests";
2385 for (;;) { 2701 for (;;) {
2702 BDB::flush;
2386 IO::AIO::flush; 2703 IO::AIO::flush;
2387 Coro::cede; 2704 Coro::cede;
2388 last unless IO::AIO::nreqs; 2705 last unless IO::AIO::nreqs || BDB::nreqs;
2389 warn "iterate..."; 2706 warn "iterate...";
2390 } 2707 }
2708
2709 ++$RELOAD;
2391 2710
2392 warn "cancelling all extension coros"; 2711 warn "cancelling all extension coros";
2393 $_->cancel for values %EXT_CORO; 2712 $_->cancel for values %EXT_CORO;
2394 %EXT_CORO = (); 2713 %EXT_CORO = ();
2395 2714
2435 Symbol::delete_package "safe::$_" 2754 Symbol::delete_package "safe::$_"
2436 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2755 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2437 2756
2438 warn "unloading cf.pm \"a bit\""; 2757 warn "unloading cf.pm \"a bit\"";
2439 delete $INC{"cf.pm"}; 2758 delete $INC{"cf.pm"};
2759 delete $INC{"cf/pod.pm"};
2440 2760
2441 # don't, removes xs symbols, too, 2761 # don't, removes xs symbols, too,
2442 # and global variables created in xs 2762 # and global variables created in xs
2443 #Symbol::delete_package __PACKAGE__; 2763 #Symbol::delete_package __PACKAGE__;
2444 2764
2448 require cf; 2768 require cf;
2449 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2769 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2450 2770
2451 warn "loading config and database again"; 2771 warn "loading config and database again";
2452 cf::cfg_load; 2772 cf::cfg_load;
2453 cf::db_load;
2454 2773
2455 warn "loading extensions"; 2774 warn "loading extensions";
2456 cf::load_extensions; 2775 cf::load_extensions;
2457 2776
2458 warn "reattaching attachments to objects/players"; 2777 warn "reattaching attachments to objects/players";
2459 _global_reattach; 2778 _global_reattach; # objects, sockets
2460 warn "reattaching attachments to maps"; 2779 warn "reattaching attachments to maps";
2461 reattach $_ for values %MAP; 2780 reattach $_ for values %MAP;
2781 warn "reattaching attachments to players";
2782 reattach $_ for values %PLAYER;
2462 2783
2463 warn "restarting server ticker"; 2784 warn "leaving sync_job";
2464 2785
2465 $TICK_WATCHER->start; 2786 1
2466 }; 2787 } or do {
2467
2468 if ($@) {
2469 warn $@; 2788 warn $@;
2470 warn "error while reloading, exiting."; 2789 warn "error while reloading, exiting.";
2471 exit 1; 2790 exit 1;
2472 } 2791 };
2473 2792
2474 warn "reloaded"; 2793 warn "reloaded";
2475}; 2794};
2476 2795
2477our $RELOAD_WATCHER; # used only during reload 2796our $RELOAD_WATCHER; # used only during reload
2478 2797
2798sub reload_perl() {
2799 # doing reload synchronously and two reloads happen back-to-back,
2800 # coro crashes during coro_state_free->destroy here.
2801
2802 $RELOAD_WATCHER ||= Event->timer (
2803 reentrant => 0,
2804 after => 0,
2805 data => WF_AUTOCANCEL,
2806 cb => sub {
2807 do_reload_perl;
2808 undef $RELOAD_WATCHER;
2809 },
2810 );
2811}
2812
2479register_command "reload" => sub { 2813register_command "reload" => sub {
2480 my ($who, $arg) = @_; 2814 my ($who, $arg) = @_;
2481 2815
2482 if ($who->flag (FLAG_WIZ)) { 2816 if ($who->flag (FLAG_WIZ)) {
2483 $who->message ("reloading server."); 2817 $who->message ("reloading server.");
2484 2818 async { reload_perl };
2485 # doing reload synchronously and two reloads happen back-to-back,
2486 # coro crashes during coro_state_free->destroy here.
2487
2488 $RELOAD_WATCHER ||= Event->timer (
2489 reentrant => 0,
2490 after => 0,
2491 data => WF_AUTOCANCEL,
2492 cb => sub {
2493 reload;
2494 undef $RELOAD_WATCHER;
2495 },
2496 );
2497 } 2819 }
2498}; 2820};
2499 2821
2500unshift @INC, $LIBDIR; 2822unshift @INC, $LIBDIR;
2501 2823
2502my $bug_warning = 0; 2824my $bug_warning = 0;
2503 2825
2826our @WAIT_FOR_TICK;
2827our @WAIT_FOR_TICK_BEGIN;
2828
2829sub wait_for_tick {
2830 return unless $TICK_WATCHER->is_active;
2831 return if $Coro::current == $Coro::main;
2832
2833 my $signal = new Coro::Signal;
2834 push @WAIT_FOR_TICK, $signal;
2835 $signal->wait;
2836}
2837
2838sub wait_for_tick_begin {
2839 return unless $TICK_WATCHER->is_active;
2840 return if $Coro::current == $Coro::main;
2841
2842 my $signal = new Coro::Signal;
2843 push @WAIT_FOR_TICK_BEGIN, $signal;
2844 $signal->wait;
2845}
2846
2847 my $min = 1e6;#d#
2848 my $avg = 10;
2504$TICK_WATCHER = Event->timer ( 2849$TICK_WATCHER = Event->timer (
2505 reentrant => 0, 2850 reentrant => 0,
2506 parked => 1, 2851 parked => 1,
2507 prio => 0, 2852 prio => 0,
2508 at => $NEXT_TICK || $TICK, 2853 at => $NEXT_TICK || $TICK,
2512 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 2857 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2513 unless ++$bug_warning > 10; 2858 unless ++$bug_warning > 10;
2514 return; 2859 return;
2515 } 2860 }
2516 2861
2517 $NOW = Event::time; 2862 $NOW = $tick_start = Event::time;
2518 2863
2519 cf::server_tick; # one server iteration 2864 cf::server_tick; # one server iteration
2865
2866 0 && sync_job {#d#
2867 for(1..10) {
2868 my $t = Event::time;
2869 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2870 or die;
2871
2872 $map->width (50);
2873 $map->height (50);
2874 $map->alloc;
2875 $map->_load_objects ("/tmp/x.map", 1);
2876 my $t = Event::time - $t;
2877
2878 #next unless $t < 0.0013;#d#
2879 if ($t < $min) {
2880 $min = $t;
2881 }
2882 $avg = $avg * 0.99 + $t * 0.01;
2883 }
2884 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2885 exit 0;
2886 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2887 };
2888
2520 $RUNTIME += $TICK; 2889 $RUNTIME += $TICK;
2521 $NEXT_TICK += $TICK; 2890 $NEXT_TICK += $TICK;
2522 2891
2523 $WAIT_FOR_TICK->broadcast; 2892 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2524 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2893 $NEXT_RUNTIME_WRITE = $NOW + 10;
2525 2894 Coro::async_pool {
2526 Event::sweep; 2895 write_runtime
2527 Coro::cede_notself; 2896 or warn "ERROR: unable to write runtime file: $!";
2897 };
2528 2898 }
2899
2529# my $AFTER = Event::time; 2900# my $AFTER = Event::time;
2530# warn $AFTER - $NOW;#d# 2901# warn $AFTER - $NOW;#d#
2531 2902
2903 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2904 $sig->send;
2905 }
2906 while (my $sig = shift @WAIT_FOR_TICK) {
2907 $sig->send;
2908 }
2909
2910 $NOW = Event::time;
2911
2532 # if we are delayed by four ticks or more, skip them all 2912 # if we are delayed by four ticks or more, skip them all
2533 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2913 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2534 2914
2535 $TICK_WATCHER->at ($NEXT_TICK); 2915 $TICK_WATCHER->at ($NEXT_TICK);
2536 $TICK_WATCHER->start; 2916 $TICK_WATCHER->start;
2917
2918 $LOAD = ($NOW - $tick_start) / $TICK;
2919 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2920
2921 _post_tick;
2922
2923
2537 }, 2924 },
2538); 2925);
2539 2926
2927{
2928 BDB::max_poll_time $TICK * 0.1;
2929 $BDB_POLL_WATCHER = Event->io (
2930 reentrant => 0,
2931 fd => BDB::poll_fileno,
2932 poll => 'r',
2933 prio => 0,
2934 data => WF_AUTOCANCEL,
2935 cb => \&BDB::poll_cb,
2936 );
2937 BDB::min_parallel 8;
2938
2939 BDB::set_sync_prepare {
2940 my $status;
2941 my $current = $Coro::current;
2942 (
2943 sub {
2944 $status = $!;
2945 $current->ready; undef $current;
2946 },
2947 sub {
2948 Coro::schedule while defined $current;
2949 $! = $status;
2950 },
2951 )
2952 };
2953
2954 unless ($DB_ENV) {
2955 $DB_ENV = BDB::db_env_create;
2956
2957 cf::sync_job {
2958 eval {
2959 BDB::db_env_open
2960 $DB_ENV,
2961 $BDBDIR,
2962 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2963 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2964 0666;
2965
2966 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2967
2968 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2969 $DB_ENV->set_lk_detect;
2970 };
2971
2972 cf::cleanup "db_env_open(db): $@" if $@;
2973 };
2974 }
2975}
2976
2977{
2978 IO::AIO::min_parallel 8;
2979
2980 undef $Coro::AIO::WATCHER;
2540IO::AIO::max_poll_time $TICK * 0.1; 2981 IO::AIO::max_poll_time $TICK * 0.1;
2541
2542undef $Coro::AIO::WATCHER;
2543$AIO_POLL_WATCHER = Event->io ( 2982 $AIO_POLL_WATCHER = Event->io (
2544 reentrant => 0, 2983 reentrant => 0,
2984 data => WF_AUTOCANCEL,
2545 fd => IO::AIO::poll_fileno, 2985 fd => IO::AIO::poll_fileno,
2546 poll => 'r', 2986 poll => 'r',
2547 prio => 6, 2987 prio => 6,
2548 data => WF_AUTOCANCEL,
2549 cb => \&IO::AIO::poll_cb, 2988 cb => \&IO::AIO::poll_cb,
2550); 2989 );
2990}
2551 2991
2552$WRITE_RUNTIME_WATCHER = Event->timer ( 2992my $_log_backtrace;
2553 reentrant => 0, 2993
2554 data => WF_AUTOCANCEL, 2994sub _log_backtrace {
2555 after => 1, 2995 my ($msg, @addr) = @_;
2556 interval => 10, 2996
2557 prio => 6, # keep it lowest so it acts like a watchdog 2997 $msg =~ s/\n//;
2558 cb => Coro::unblock_sub { 2998
2559 write_runtime 2999 # limit the # of concurrent backtraces
2560 or warn "ERROR: unable to write runtime file: $!"; 3000 if ($_log_backtrace < 2) {
3001 ++$_log_backtrace;
3002 async {
3003 my @bt = fork_call {
3004 @addr = map { sprintf "%x", $_ } @addr;
3005 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3006 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3007 or die "addr2line: $!";
3008
3009 my @funcs;
3010 my @res = <$fh>;
3011 chomp for @res;
3012 while (@res) {
3013 my ($func, $line) = splice @res, 0, 2, ();
3014 push @funcs, "[$func] $line";
3015 }
3016
3017 @funcs
3018 };
3019
3020 LOG llevInfo, "[ABT] $msg\n";
3021 LOG llevInfo, "[ABT] $_\n" for @bt;
3022 --$_log_backtrace;
3023 };
3024 } else {
3025 LOG llevInfo, "[ABT] $msg\n";
3026 LOG llevInfo, "[ABT] [suppressed]\n";
2561 }, 3027 }
2562); 3028}
3029
3030# load additional modules
3031use cf::pod;
2563 3032
2564END { cf::emergency_save } 3033END { cf::emergency_save }
2565 3034
25661 30351
2567 3036

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines