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.211 by root, Tue Feb 13 16:23:32 2007 UTC vs.
Revision 1.276 by root, Sun Jun 10 04:05:47 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 $TICK_WATCHER->is_active or cf::cleanup "mainloop frozen but runtime active", 1; 396 my $runtime = "$LOCALDIR/runtime";
362 397
363 my $runtime = cf::localdir . "/runtime"; 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";
364 404
365 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
366 or return; 406 or return;
367 407
368 my $value = $cf::RUNTIME + 90 + 10; 408 my $value = $cf::RUNTIME + 90 + 10;
374 414
375 # always fsync - this file is important 415 # always fsync - this file is important
376 aio_fsync $fh 416 aio_fsync $fh
377 and return; 417 and return;
378 418
419 # touch it again to show we are up-to-date
420 aio_utime $fh, undef, undef;
421
379 close $fh 422 close $fh
380 or return; 423 or return;
381 424
382 aio_rename "$runtime~", $runtime 425 aio_rename "$runtime~", $runtime
383 and return; 426 and return;
384 427
428 warn "runtime file written.\n";
429
385 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 });
386} 442}
387 443
388=back 444=back
389 445
390=cut 446=cut
570 $registry = $CB_TYPE[$object_type] ||= []; 626 $registry = $CB_TYPE[$object_type] ||= [];
571 627
572 } elsif ($type eq "subtype") { 628 } elsif ($type eq "subtype") {
573 defined $object_type or Carp::croak "subtype specified without type"; 629 defined $object_type or Carp::croak "subtype specified without type";
574 my $object_subtype = shift @arg; 630 my $object_subtype = shift @arg;
575 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 631 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
576 632
577 } elsif ($type eq "package") { 633 } elsif ($type eq "package") {
578 my $pkg = shift @arg; 634 my $pkg = shift @arg;
579 635
580 while (my ($name, $id) = each %cb_id) { 636 while (my ($name, $id) = each %cb_id) {
621 if (ref $_[0]) { 677 if (ref $_[0]) {
622 _object_attach @_; 678 _object_attach @_;
623 } else { 679 } else {
624 _attach shift->_attach_registry, @_; 680 _attach shift->_attach_registry, @_;
625 } 681 }
682 _recalc_want;
626}; 683};
627 684
628# all those should be optimised 685# all those should be optimised
629sub cf::attachable::detach { 686sub cf::attachable::detach {
630 my ($obj, $name) = @_; 687 my ($obj, $name) = @_;
633 delete $obj->{_attachment}{$name}; 690 delete $obj->{_attachment}{$name};
634 reattach ($obj); 691 reattach ($obj);
635 } else { 692 } else {
636 Carp::croak "cannot, currently, detach class attachments"; 693 Carp::croak "cannot, currently, detach class attachments";
637 } 694 }
695 _recalc_want;
638}; 696};
639 697
640sub cf::attachable::attached { 698sub cf::attachable::attached {
641 my ($obj, $name) = @_; 699 my ($obj, $name) = @_;
642 700
789 } 847 }
790 } else { 848 } else {
791 aio_unlink $filename; 849 aio_unlink $filename;
792 aio_unlink "$filename.pst"; 850 aio_unlink "$filename.pst";
793 } 851 }
794
795 #d##TODO# nuke non .map-files if exist
796 if ($filename =~ s/\.map$//) {
797 aio_unlink $filename;
798 aio_unlink "$filename.pst";
799 }
800 } 852 }
801} 853}
802 854
803sub object_freezer_as_string { 855sub object_freezer_as_string {
804 my ($rdata, $objs) = @_; 856 my ($rdata, $objs) = @_;
810 862
811sub object_thawer_load { 863sub object_thawer_load {
812 my ($filename) = @_; 864 my ($filename) = @_;
813 865
814 my ($data, $av); 866 my ($data, $av);
815
816 #d#TODO remove .map if file does not exist
817 aio_stat $filename and $filename =~ s/\.map$//;
818 867
819 (aio_load $filename, $data) >= 0 868 (aio_load $filename, $data) >= 0
820 or return; 869 or return;
821 870
822 unless (aio_stat "$filename.pst") { 871 unless (aio_stat "$filename.pst") {
824 or return; 873 or return;
825 $av = eval { (Storable::thaw $av)->{objs} }; 874 $av = eval { (Storable::thaw $av)->{objs} };
826 } 875 }
827 876
828 warn sprintf "loading %s (%d)\n", 877 warn sprintf "loading %s (%d)\n",
829 $filename, length $data, scalar @{$av || []};#d# 878 $filename, length $data, scalar @{$av || []};
830 return ($data, $av); 879 return ($data, $av);
831} 880}
832 881
833############################################################################# 882#############################################################################
834# command handling &c 883# command handling &c
961Returns the given player object, loading it if necessary (might block). 1010Returns the given player object, loading it if necessary (might block).
962 1011
963=cut 1012=cut
964 1013
965sub playerdir($) { 1014sub playerdir($) {
966 cf::localdir 1015 "$PLAYERDIR/"
967 . "/"
968 . cf::playerdir
969 . "/"
970 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1016 . (ref $_[0] ? $_[0]->ob->name : $_[0])
971} 1017}
972 1018
973sub path($) { 1019sub path($) {
974 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1020 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
975 1021
976 (playerdir $login) . "/$login.pl" 1022 (playerdir $login) . "/playerdata"
977} 1023}
978 1024
979sub find_active($) { 1025sub find_active($) {
980 $cf::PLAYER{$_[0]} 1026 $cf::PLAYER{$_[0]}
981 and $cf::PLAYER{$_[0]}->active 1027 and $cf::PLAYER{$_[0]}->active
994 my $login = $_[0]; 1040 my $login = $_[0];
995 1041
996 my $guard = cf::lock_acquire "user_find:$login"; 1042 my $guard = cf::lock_acquire "user_find:$login";
997 1043
998 $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
999 my $pl = load_pl path $login 1052 my $pl = load_pl path $login
1000 or return; 1053 or return;
1001 $cf::PLAYER{$login} = $pl 1054 $cf::PLAYER{$login} = $pl
1002 } 1055 }
1003 } 1056 }
1040 1093
1041=cut 1094=cut
1042 1095
1043sub quit_character { 1096sub quit_character {
1044 my ($pl) = @_; 1097 my ($pl) = @_;
1098
1099 my $name = $pl->ob->name;
1045 1100
1046 $pl->{deny_save} = 1; 1101 $pl->{deny_save} = 1;
1047 $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
1048 1103
1049 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1104 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1054 my $path = playerdir $pl; 1109 my $path = playerdir $pl;
1055 my $temp = "$path~$cf::RUNTIME~deleting~"; 1110 my $temp = "$path~$cf::RUNTIME~deleting~";
1056 aio_rename $path, $temp; 1111 aio_rename $path, $temp;
1057 delete $cf::PLAYER{$pl->ob->name}; 1112 delete $cf::PLAYER{$pl->ob->name};
1058 $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
1059 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;
1060} 1135}
1061 1136
1062=item cf::player::list_logins 1137=item cf::player::list_logins
1063 1138
1064Returns 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
1065while and may block, so not sync_job-capable, ever. 1140while and may block, so not sync_job-capable, ever.
1066 1141
1067=cut 1142=cut
1068 1143
1069sub list_logins { 1144sub list_logins {
1070 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1145 my $dirs = aio_readdir $PLAYERDIR
1071 or return []; 1146 or return [];
1072 1147
1073 my @logins; 1148 my @logins;
1074 1149
1075 for my $login (@$dirs) { 1150 for my $login (@$dirs) {
1110 } 1185 }
1111 1186
1112 \@paths 1187 \@paths
1113} 1188}
1114 1189
1115=item $player->ext_reply ($msgid, $msgtype, %msg) 1190=item $player->ext_reply ($msgid, %msg)
1116 1191
1117Sends an ext reply to the player. 1192Sends an ext reply to the player.
1118 1193
1119=cut 1194=cut
1120 1195
1121sub ext_reply($$$%) { 1196sub ext_reply($$%) {
1122 my ($self, $id, %msg) = @_; 1197 my ($self, $id, %msg) = @_;
1123 1198
1124 $msg{msgid} = $id; 1199 $msg{msgid} = $id;
1125 1200
1126 $self->send ("ext " . cf::to_json \%msg); 1201 $self->send ("ext " . cf::to_json \%msg);
1127} 1202}
1128 1203
1129package 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}
1130 1244
1131=back 1245=back
1132
1133 1246
1134=head3 cf::map 1247=head3 cf::map
1135 1248
1136=over 4 1249=over 4
1137 1250
1192 my ($self, $merge) = @_; 1305 my ($self, $merge) = @_;
1193 1306
1194 # we have to keep some variables in memory intact 1307 # we have to keep some variables in memory intact
1195 local $self->{path}; 1308 local $self->{path};
1196 local $self->{load_path}; 1309 local $self->{load_path};
1197 local $self->{deny_save};
1198 local $self->{deny_reset};
1199 1310
1200 $self->SUPER::thawer_merge ($merge); 1311 $self->SUPER::thawer_merge ($merge);
1201} 1312}
1202 1313
1203sub normalise { 1314sub normalise {
1275 1386
1276# the original (read-only) location 1387# the original (read-only) location
1277sub load_path { 1388sub load_path {
1278 my ($self) = @_; 1389 my ($self) = @_;
1279 1390
1280 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1391 "$MAPDIR/$self->{path}.map"
1281} 1392}
1282 1393
1283# the temporary/swap location 1394# the temporary/swap location
1284sub save_path { 1395sub save_path {
1285 my ($self) = @_; 1396 my ($self) = @_;
1286 1397
1287 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1398 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1288 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1399 "$TMPDIR/$path.map"
1289} 1400}
1290 1401
1291# the unique path, undef == no special unique path 1402# the unique path, undef == no special unique path
1292sub uniq_path { 1403sub uniq_path {
1293 my ($self) = @_; 1404 my ($self) = @_;
1294 1405
1295 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1406 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1296 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1407 "$UNIQUEDIR/$path"
1297} 1408}
1298 1409
1299# and all this just because we cannot iterate over 1410# and all this just because we cannot iterate over
1300# all maps in C++... 1411# all maps in C++...
1301sub change_all_map_light { 1412sub change_all_map_light {
1303 1414
1304 $_->change_map_light ($change) 1415 $_->change_map_light ($change)
1305 for grep $_->outdoor, values %cf::MAP; 1416 for grep $_->outdoor, values %cf::MAP;
1306} 1417}
1307 1418
1419sub decay_objects {
1420 my ($self) = @_;
1421
1422 return if $self->{deny_reset};
1423
1424 $self->do_decay_objects;
1425}
1426
1308sub unlink_save { 1427sub unlink_save {
1309 my ($self) = @_; 1428 my ($self) = @_;
1310 1429
1311 utf8::encode (my $save = $self->save_path); 1430 utf8::encode (my $save = $self->save_path);
1312 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1431 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1313 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1432 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1314
1315 #d#TODO remove .map and also nuke
1316 $save =~ s/\.map// or return;#d#
1317 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1318 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1319} 1433}
1320 1434
1321sub load_header_from($) { 1435sub load_header_from($) {
1322 my ($self, $path) = @_; 1436 my ($self, $path) = @_;
1323 1437
1373 $self->load_header_orig 1487 $self->load_header_orig
1374 or return; 1488 or return;
1375 $self->prepare_orig; 1489 $self->prepare_orig;
1376 } 1490 }
1377 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
1378 1 1498 1
1379} 1499}
1380 1500
1381sub find; 1501sub find;
1382sub find { 1502sub find {
1394 $map->{last_save} = $cf::RUNTIME; 1514 $map->{last_save} = $cf::RUNTIME;
1395 1515
1396 $map->load_header 1516 $map->load_header
1397 or return; 1517 or return;
1398 1518
1399 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1519 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1400 # doing this can freeze the server in a sync job, obviously 1520 # doing this can freeze the server in a sync job, obviously
1401 #$cf::WAIT_FOR_TICK->wait; 1521 #$cf::WAIT_FOR_TICK->wait;
1402 $map->reset; 1522 $map->reset;
1403 undef $guard; 1523 undef $guard;
1404 return find $path; 1524 return find $path;
1415 my ($self) = @_; 1535 my ($self) = @_;
1416 1536
1417 local $self->{deny_reset} = 1; # loading can take a long time 1537 local $self->{deny_reset} = 1; # loading can take a long time
1418 1538
1419 my $path = $self->{path}; 1539 my $path = $self->{path};
1540
1541 {
1420 my $guard = cf::lock_acquire "map_load:$path"; 1542 my $guard = cf::lock_acquire "map_load:$path";
1421 1543
1422 return if $self->in_memory != cf::MAP_SWAPPED; 1544 return if $self->in_memory != cf::MAP_SWAPPED;
1423 1545
1424 $self->in_memory (cf::MAP_LOADING); 1546 $self->in_memory (cf::MAP_LOADING);
1425 1547
1426 $self->alloc; 1548 $self->alloc;
1427 1549
1428 $self->pre_load; 1550 $self->pre_load;
1429
1430 $self->_load_objects ($self->{load_path}, 1)
1431 or return;
1432
1433 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1434 if delete $self->{load_original};
1435
1436 if (my $uniq = $self->uniq_path) {
1437 utf8::encode $uniq;
1438 if (aio_open $uniq, O_RDONLY, 0) {
1439 $self->clear_unique_items;
1440 $self->_load_objects ($uniq, 0);
1441 }
1442 }
1443
1444 Coro::cede;
1445
1446 # now do the right thing for maps
1447 $self->link_multipart_objects;
1448
1449 unless ($self->{deny_activate}) {
1450 $self->decay_objects;
1451 $self->fix_auto_apply;
1452 $self->update_buttons;
1453 Coro::cede; 1551 Coro::cede;
1454 $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;
1455 $self->difficulty ($self->estimate_difficulty) 1570 $self->difficulty ($self->estimate_difficulty)
1456 unless $self->difficulty; 1571 unless $self->difficulty;
1457 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;
1458 $self->activate; 1581 $self->activate;
1582 }
1583
1584 $self->in_memory (cf::MAP_IN_MEMORY);
1459 } 1585 }
1460 1586
1461 $self->post_load; 1587 $self->post_load;
1462
1463 $self->in_memory (cf::MAP_IN_MEMORY);
1464} 1588}
1465 1589
1466sub customise_for { 1590sub customise_for {
1467 my ($self, $ob) = @_; 1591 my ($self, $ob) = @_;
1468 1592
1469 return find "~" . $ob->name . "/" . $self->{path} 1593 return find "~" . $ob->name . "/" . $self->{path}
1470 if $self->per_player; 1594 if $self->per_player;
1595
1596# return find "?party/" . $ob->name . "/" . $self->{path}
1597# if $self->per_party;
1471 1598
1472 $self 1599 $self
1473} 1600}
1474 1601
1475# 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
1586 1713
1587sub reset_at { 1714sub reset_at {
1588 my ($self) = @_; 1715 my ($self) = @_;
1589 1716
1590 # TODO: safety, remove and allow resettable per-player maps 1717 # TODO: safety, remove and allow resettable per-player maps
1591 return 1e99 if $self->isa ("ext::map_per_player");#d#
1592 return 1e99 if $self->{deny_reset}; 1718 return 1e99 if $self->{deny_reset};
1593 1719
1594 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1720 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1595 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;
1596 1722
1607 my ($self) = @_; 1733 my ($self) = @_;
1608 1734
1609 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1735 my $lock = cf::lock_acquire "map_data:$self->{path}";
1610 1736
1611 return if $self->players; 1737 return if $self->players;
1612 return if $self->isa ("ext::map_per_player");#d#
1613 1738
1614 warn "resetting map ", $self->path;#d# 1739 warn "resetting map ", $self->path;
1615 1740
1616 $self->in_memory (cf::MAP_SWAPPED); 1741 $self->in_memory (cf::MAP_SWAPPED);
1617 1742
1618 # need to save uniques path 1743 # need to save uniques path
1619 unless ($self->{deny_save}) { 1744 unless ($self->{deny_save}) {
1651 $cf::MAP{$self->path} = $self; 1776 $cf::MAP{$self->path} = $self;
1652 1777
1653 $self->reset; # polite request, might not happen 1778 $self->reset; # polite request, might not happen
1654} 1779}
1655 1780
1781=item $maps = cf::map::tmp_maps
1782
1783Returns an arrayref with all map paths of currently instantiated and saved
1784maps.
1785
1786=cut
1787
1788sub tmp_maps() {
1789 [
1790 map {
1791 utf8::decode $_;
1792 !/\.(?:pst|meta)$/ && /^$PATH_SEP/o
1793 ? normalise $_
1794 : ()
1795 } @{ aio_readdir $TMPDIR or [] }
1796 ]
1797}
1798
1656=item cf::map::unique_maps 1799=item cf::map::unique_maps
1657 1800
1658Returns an arrayref of paths of all shared maps that have 1801Returns an arrayref of paths of all shared maps that have
1659instantiated unique items. May block. 1802instantiated unique items. May block.
1660 1803
1661=cut 1804=cut
1662 1805
1663sub unique_maps() { 1806sub unique_maps() {
1664 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 1807 [
1665 or return; 1808 map {
1666
1667 my @paths;
1668
1669 for (@$files) {
1670 utf8::decode $_; 1809 utf8::decode $_;
1671 next if /\.pst$/; 1810 !/\.(?:pst|meta)$/ && /^$PATH_SEP/o
1672 next unless /^$PATH_SEP/o; 1811 ? normalise $_
1673 1812 : ()
1674 push @paths, cf::map::normalise $_; 1813 } @{ aio_readdir $UNIQUEDIR or [] }
1675 } 1814 ]
1676
1677 \@paths
1678} 1815}
1679 1816
1680package cf; 1817package cf;
1681 1818
1682=back 1819=back
1788 $self->deactivate_recursive; 1925 $self->deactivate_recursive;
1789 1926
1790 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1927 return if UNIVERSAL::isa $self->map, "ext::map_link";
1791 1928
1792 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1929 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1793 if $self->map; 1930 if $self->map && $self->map->{path} ne "{link}";
1794 1931
1795 $self->enter_map ($LINK_MAP || link_map, 10, 10); 1932 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1796} 1933}
1797 1934
1798sub cf::object::player::leave_link { 1935sub cf::object::player::leave_link {
1799 my ($self, $map, $x, $y) = @_; 1936 my ($self, $map, $x, $y) = @_;
1937
1938 return unless $self->contr->active;
1800 1939
1801 my $link_pos = delete $self->{_link_pos}; 1940 my $link_pos = delete $self->{_link_pos};
1802 1941
1803 unless ($map) { 1942 unless ($map) {
1804 # restore original map position 1943 # restore original map position
1822 $map->load; 1961 $map->load;
1823 $map->load_diag; 1962 $map->load_diag;
1824 1963
1825 return unless $self->contr->active; 1964 return unless $self->contr->active;
1826 $self->activate_recursive; 1965 $self->activate_recursive;
1966
1967 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1827 $self->enter_map ($map, $x, $y); 1968 $self->enter_map ($map, $x, $y);
1828} 1969}
1829 1970
1830cf::player->attach (
1831 on_logout => sub {
1832 my ($pl) = @_;
1833
1834 # abort map switching before logout
1835 if ($pl->ob->{_link_pos}) {
1836 cf::sync_job {
1837 $pl->ob->leave_link
1838 };
1839 }
1840 },
1841 on_login => sub {
1842 my ($pl) = @_;
1843
1844 # try to abort aborted map switching on player login :)
1845 # should happen only on crashes
1846 if ($pl->ob->{_link_pos}) {
1847 $pl->ob->enter_link;
1848 (async {
1849 # we need this sleep as the login has a concurrent enter_exit running
1850 # and this sleep increases chances of the player not ending up in scorn
1851 $pl->ob->reply (undef,
1852 "There was an internal problem at your last logout, "
1853 . "the server will try to bring you to your intended destination in a second.",
1854 cf::NDI_RED);
1855 Coro::Timer::sleep 1;
1856 $pl->ob->leave_link;
1857 })->prio (2);
1858 }
1859 },
1860);
1861
1862=item $player_object->goto ($path, $x, $y) 1971=item $player_object->goto ($path, $x, $y[, $check->($map)])
1863 1972
1973Moves the player to the given map-path and coordinates by first freezing
1974her, loading and preparing them map, calling the provided $check callback
1975that has to return the map if sucecssful, and then unfreezes the player on
1976the new (success) or old (failed) map position.
1977
1864=cut 1978=cut
1979
1980our $GOTOGEN;
1865 1981
1866sub cf::object::player::goto { 1982sub cf::object::player::goto {
1867 my ($self, $path, $x, $y) = @_; 1983 my ($self, $path, $x, $y, $check) = @_;
1984
1985 # do generation counting so two concurrent goto's will be executed in-order
1986 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1868 1987
1869 $self->enter_link; 1988 $self->enter_link;
1870 1989
1871 (async { 1990 (async {
1872 my $map = eval { 1991 my $map = eval {
1873 my $map = cf::map::find $path; 1992 my $map = cf::map::find $path;
1993
1994 if ($map) {
1874 $map = $map->customise_for ($self) if $map; 1995 $map = $map->customise_for ($self);
1996 $map = $check->($map) if $check && $map;
1997 } else {
1998 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1999 }
2000
1875 $map 2001 $map
2002 };
2003
2004 if ($@) {
2005 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2006 LOG llevError | logBacktrace, Carp::longmess $@;
1876 } or 2007 }
1877 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1878 2008
2009 if ($gen == $self->{_goto_generation}) {
2010 delete $self->{_goto_generation};
1879 $self->leave_link ($map, $x, $y); 2011 $self->leave_link ($map, $x, $y);
2012 }
1880 })->prio (1); 2013 })->prio (1);
1881} 2014}
1882 2015
1883=item $player_object->enter_exit ($exit_object) 2016=item $player_object->enter_exit ($exit_object)
1884 2017
1923 2056
1924 $rmp->{random_seed} ||= $exit->random_seed; 2057 $rmp->{random_seed} ||= $exit->random_seed;
1925 2058
1926 my $data = cf::to_json $rmp; 2059 my $data = cf::to_json $rmp;
1927 my $md5 = Digest::MD5::md5_hex $data; 2060 my $md5 = Digest::MD5::md5_hex $data;
1928 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2061 my $meta = "$RANDOMDIR/$md5.meta";
1929 2062
1930 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2063 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1931 aio_write $fh, 0, (length $data), $data, 0; 2064 aio_write $fh, 0, (length $data), $data, 0;
1932 undef $fh; 2065 undef $fh;
1933 aio_rename "$meta~", $meta; 2066 aio_rename "$meta~", $meta;
1942 2075
1943 return unless $self->type == cf::PLAYER; 2076 return unless $self->type == cf::PLAYER;
1944 2077
1945 if ($exit->slaying eq "/!") { 2078 if ($exit->slaying eq "/!") {
1946 #TODO: this should de-fi-ni-te-ly not be a sync-job 2079 #TODO: this should de-fi-ni-te-ly not be a sync-job
2080 # the problem is that $exit might not survive long enough
2081 # so it needs to be done right now, right here
1947 cf::sync_job { prepare_random_map $exit }; 2082 cf::sync_job { prepare_random_map $exit };
1948 } 2083 }
1949 2084
1950 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2085 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1951 my $hp = $exit->stats->hp; 2086 my $hp = $exit->stats->hp;
1959 $self->goto ($slaying, $hp, $sp); 2094 $self->goto ($slaying, $hp, $sp);
1960 2095
1961 1; 2096 1;
1962 }) { 2097 }) {
1963 $self->message ("Something went wrong deep within the crossfire server. " 2098 $self->message ("Something went wrong deep within the crossfire server. "
1964 . "I'll try to bring you back to the map you were before. " 2099 . "I'll try to bring you back to the map you were before. "
1965 . "Please report this to the dungeon master!", 2100 . "Please report this to the dungeon master!",
1966 cf::NDI_UNIQUE | cf::NDI_RED); 2101 cf::NDI_UNIQUE | cf::NDI_RED);
1967 2102
1968 warn "ERROR in enter_exit: $@"; 2103 warn "ERROR in enter_exit: $@";
1969 $self->leave_link; 2104 $self->leave_link;
1970 } 2105 }
1971 })->prio (1); 2106 })->prio (1);
1984 2119
1985sub cf::client::send_drawinfo { 2120sub cf::client::send_drawinfo {
1986 my ($self, $text, $flags) = @_; 2121 my ($self, $text, $flags) = @_;
1987 2122
1988 utf8::encode $text; 2123 utf8::encode $text;
1989 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2124 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1990} 2125}
1991 2126
2127=item $client->ext_event ($type, %msg)
2128
2129Sends an exti event to the client.
2130
2131=cut
2132
2133sub cf::client::ext_event($$%) {
2134 my ($self, $type, %msg) = @_;
2135
2136 $msg{msgtype} = "event_$type";
2137 $self->send_packet ("ext " . cf::to_json \%msg);
2138}
1992 2139
1993=item $success = $client->query ($flags, "text", \&cb) 2140=item $success = $client->query ($flags, "text", \&cb)
1994 2141
1995Queues a query to the client, calling the given callback with 2142Queues a query to the client, calling the given callback with
1996the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2143the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2093 2240
2094# here we export the classes and methods available to script code 2241# here we export the classes and methods available to script code
2095 2242
2096=pod 2243=pod
2097 2244
2098The following fucntions and emthods are available within a safe environment: 2245The following functions and methods are available within a safe environment:
2099 2246
2100 cf::object contr pay_amount pay_player map 2247 cf::object contr pay_amount pay_player map
2101 cf::object::player player 2248 cf::object::player player
2102 cf::player peaceful 2249 cf::player peaceful
2103 cf::map trigger 2250 cf::map trigger
2188############################################################################# 2335#############################################################################
2189 2336
2190=head2 EXTENSION DATABASE SUPPORT 2337=head2 EXTENSION DATABASE SUPPORT
2191 2338
2192Crossfire maintains a very simple database for extension use. It can 2339Crossfire maintains a very simple database for extension use. It can
2193currently store anything that can be serialised using Storable, which 2340currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2194excludes objects. 2341convert to/from binary).
2195 2342
2196The parameter C<$family> should best start with the name of the extension 2343The parameter C<$family> should best start with the name of the extension
2197using it, it should be unique. 2344using it, it should be unique.
2198 2345
2199=over 4 2346=over 4
2222 BDB::CREATE | BDB::AUTO_COMMIT, 0666; 2369 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2223 cf::cleanup "db_open(db): $!" if $!; 2370 cf::cleanup "db_open(db): $!" if $!;
2224 }; 2371 };
2225 cf::cleanup "db_open(db): $@" if $@; 2372 cf::cleanup "db_open(db): $@" if $@;
2226 }; 2373 };
2227
2228 my $path = cf::localdir . "/database.pst";
2229 if (stat $path) {
2230 cf::sync_job {
2231 my $pst = Storable::retrieve $path;
2232
2233 cf::db_put (board => data => $pst->{board});
2234 cf::db_put (guildrules => data => $pst->{guildrules});
2235 cf::db_put (rent => balance => $pst->{rent}{balance});
2236 BDB::db_env_txn_checkpoint $DB_ENV;
2237
2238 unlink $path;
2239 };
2240 }
2241 } 2374 }
2242} 2375}
2243 2376
2244sub db_get($$) { 2377sub db_get($$) {
2245 my $key = "$_[0]/$_[1]"; 2378 my $key = "$_[0]/$_[1]";
2246 2379
2247 cf::sync_job { 2380 cf::sync_job {
2248 BDB::db_get $DB, undef, $key, my $data; 2381 BDB::db_get $DB, undef, $key, my $data;
2249 2382
2250 $! ? () 2383 $! ? ()
2251 : Compress::LZF::sthaw $data 2384 : $data
2252 } 2385 }
2253} 2386}
2254 2387
2255sub db_put($$$) { 2388sub db_put($$$) {
2256 BDB::dbreq_pri 4; 2389 BDB::dbreq_pri 4;
2257 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { }; 2390 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2391}
2392
2393=item cf::cache $id => [$paths...], $processversion => $process
2394
2395Generic caching function that returns the value of the resource $id,
2396caching and regenerating as required.
2397
2398This function can block.
2399
2400=cut
2401
2402sub cache {
2403 my ($id, $src, $processversion, $process) = @_;
2404
2405 my $meta =
2406 join "\x00",
2407 $processversion,
2408 map {
2409 aio_stat $_
2410 and Carp::croak "$_: $!";
2411
2412 ($_, (stat _)[7,9])
2413 } @$src;
2414
2415 my $dbmeta = db_get cache => "$id/meta";
2416 if ($dbmeta ne $meta) {
2417 # changed, we may need to process
2418
2419 my @data;
2420 my $md5;
2421
2422 for (0 .. $#$src) {
2423 0 <= aio_load $src->[$_], $data[$_]
2424 or Carp::croak "$src->[$_]: $!";
2425 }
2426
2427 # if processing is expensive, check
2428 # checksum first
2429 if (1) {
2430 $md5 =
2431 join "\x00",
2432 $processversion,
2433 map {
2434 Coro::cede;
2435 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2436 } 0.. $#$src;
2437
2438
2439 my $dbmd5 = db_get cache => "$id/md5";
2440 if ($dbmd5 eq $md5) {
2441 db_put cache => "$id/meta", $meta;
2442
2443 return db_get cache => "$id/data";
2444 }
2445 }
2446
2447 my $t1 = Time::HiRes::time;
2448 my $data = $process->(\@data);
2449 my $t2 = Time::HiRes::time;
2450
2451 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2452
2453 db_put cache => "$id/data", $data;
2454 db_put cache => "$id/md5" , $md5;
2455 db_put cache => "$id/meta", $meta;
2456
2457 return $data;
2458 }
2459
2460 db_get cache => "$id/data"
2461}
2462
2463=item fork_call { }, $args
2464
2465Executes the given code block with the given arguments in a seperate
2466process, returning the results. Everything must be serialisable with
2467Coro::Storable. May, of course, block. Note that the executed sub may
2468never block itself or use any form of Event handling.
2469
2470=cut
2471
2472sub fork_call(&@) {
2473 my ($cb, @args) = @_;
2474
2475# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2476# or die "socketpair: $!";
2477 pipe my $fh1, my $fh2
2478 or die "pipe: $!";
2479
2480 if (my $pid = fork) {
2481 close $fh2;
2482
2483 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2484 $res = Coro::Storable::thaw $res;
2485
2486 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2487
2488 die $$res unless "ARRAY" eq ref $res;
2489
2490 return wantarray ? @$res : $res->[-1];
2491 } else {
2492 reset_signals;
2493 local $SIG{__WARN__};
2494 local $SIG{__DIE__};
2495 eval {
2496 close $fh1;
2497
2498 my @res = eval { $cb->(@args) };
2499 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2500 };
2501
2502 warn $@ if $@;
2503 _exit 0;
2504 }
2258} 2505}
2259 2506
2260############################################################################# 2507#############################################################################
2261# the server's init and main functions 2508# the server's init and main functions
2262 2509
2263sub load_resources { 2510sub load_facedata($) {
2264 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2511 my ($path) = @_;
2512
2513 warn "loading facedata from $path\n";
2514
2515 my $facedata;
2516 0 < aio_load $path, $facedata
2517 or die "$path: $!";
2518
2519 $facedata = Coro::Storable::thaw $facedata;
2520
2521 $facedata->{version} == 2
2522 or cf::cleanup "$path: version mismatch, cannot proceed.";
2523
2524 {
2525 my $faces = $facedata->{faceinfo};
2526
2527 while (my ($face, $info) = each %$faces) {
2528 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2529 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2530 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2531 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2532 Coro::cede;
2533 }
2534
2535 while (my ($face, $info) = each %$faces) {
2536 next unless $info->{smooth};
2537 my $idx = cf::face::find $face
2538 or next;
2539 if (my $smooth = cf::face::find $info->{smooth}) {
2540 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2541 } else {
2542 warn "smooth face '$info->{smooth}' not found for face '$face'";
2543 }
2544 Coro::cede;
2545 }
2546 }
2547
2548 {
2549 my $anims = $facedata->{animinfo};
2550
2551 while (my ($anim, $info) = each %$anims) {
2552 cf::anim::set $anim, $info->{frames}, $info->{facings};
2553 Coro::cede;
2554 }
2555
2556 cf::anim::invalidate_all; # d'oh
2557 }
2558
2559 1
2560}
2561
2562sub reload_regions {
2563 load_resource_file "$MAPDIR/regions"
2265 or die "unable to load regions file\n";#d# 2564 or die "unable to load regions file\n";
2565}
2566
2567sub reload_facedata {
2568 load_facedata "$DATADIR/facedata"
2569 or die "unable to load facedata\n";
2570}
2571
2572sub reload_archetypes {
2573 load_resource_file "$DATADIR/archetypes"
2574 or die "unable to load archetypes\n";
2575}
2576
2577sub reload_treasures {
2578 load_resource_file "$DATADIR/treasures"
2579 or die "unable to load treasurelists\n";
2580}
2581
2582sub reload_resources {
2583 warn "reloading resource files...\n";
2584
2585 reload_regions;
2586 reload_facedata;
2587 #reload_archetypes;#d#
2588 reload_archetypes;
2589 reload_treasures;
2590
2591 warn "finished reloading resource files\n";
2592}
2593
2594sub init {
2595 reload_resources;
2266} 2596}
2267 2597
2268sub cfg_load { 2598sub cfg_load {
2269 open my $fh, "<:utf8", cf::confdir . "/config" 2599 open my $fh, "<:utf8", "$CONFDIR/config"
2270 or return; 2600 or return;
2271 2601
2272 local $/; 2602 local $/;
2273 *CFG = YAML::Syck::Load <$fh>; 2603 *CFG = YAML::Syck::Load <$fh>;
2274 2604
2282 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2612 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2283 and die "WARNING: m(un)lockall failed: $!\n"; 2613 and die "WARNING: m(un)lockall failed: $!\n";
2284 }; 2614 };
2285 warn $@ if $@; 2615 warn $@ if $@;
2286 } 2616 }
2287}
2288
2289sub init {
2290 load_resources;
2291} 2617}
2292 2618
2293sub main { 2619sub main {
2294 # we must not ever block the main coroutine 2620 # we must not ever block the main coroutine
2295 local $Coro::idle = sub { 2621 local $Coro::idle = sub {
2363 2689
2364 warn Carp::longmess "post_cleanup backtrace" 2690 warn Carp::longmess "post_cleanup backtrace"
2365 if $make_core; 2691 if $make_core;
2366} 2692}
2367 2693
2368sub reload() { 2694sub do_reload_perl() {
2369 # can/must only be called in main 2695 # can/must only be called in main
2370 if ($Coro::current != $Coro::main) { 2696 if ($Coro::current != $Coro::main) {
2371 warn "can only reload from main coroutine"; 2697 warn "can only reload from main coroutine";
2372 return; 2698 return;
2373 } 2699 }
2374 2700
2375 warn "reloading..."; 2701 warn "reloading...";
2376 2702
2377 warn "cancelling server ticker"; 2703 warn "entering sync_job";
2378 $TICK_WATCHER->cancel;
2379 2704
2705 cf::sync_job {
2706 cf::write_runtime; # external watchdog should not bark
2380 cf::emergency_save; 2707 cf::emergency_save;
2708 cf::write_runtime; # external watchdog should not bark
2381 2709
2382 eval { 2710 warn "syncing database to disk";
2711 BDB::db_env_txn_checkpoint $DB_ENV;
2712
2383 # if anything goes wrong in here, we should simply crash as we already saved 2713 # if anything goes wrong in here, we should simply crash as we already saved
2384 2714
2385 warn "cancelling all WF_AUTOCANCEL watchers"; 2715 warn "cancelling all WF_AUTOCANCEL watchers";
2386 for (Event::all_watchers) { 2716 for (Event::all_watchers) {
2387 $_->cancel if $_->data & WF_AUTOCANCEL; 2717 $_->cancel if $_->data & WF_AUTOCANCEL;
2388 } 2718 }
2389
2390 warn "syncing database to disk";
2391 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
2392 2719
2393 warn "flushing outstanding aio requests"; 2720 warn "flushing outstanding aio requests";
2394 for (;;) { 2721 for (;;) {
2395 BDB::flush; 2722 BDB::flush;
2396 IO::AIO::flush; 2723 IO::AIO::flush;
2397 Coro::cede; 2724 Coro::cede;
2398 last unless IO::AIO::nreqs || BDB::nreqs; 2725 last unless IO::AIO::nreqs || BDB::nreqs;
2399 warn "iterate..."; 2726 warn "iterate...";
2400 } 2727 }
2401 2728
2729 ++$RELOAD;
2730
2402 warn "cancelling all extension coros"; 2731 warn "cancelling all extension coros";
2403 $_->cancel for values %EXT_CORO; 2732 $_->cancel for values %EXT_CORO;
2404 %EXT_CORO = (); 2733 %EXT_CORO = ();
2405 2734
2406 warn "removing commands"; 2735 warn "removing commands";
2445 Symbol::delete_package "safe::$_" 2774 Symbol::delete_package "safe::$_"
2446 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2775 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2447 2776
2448 warn "unloading cf.pm \"a bit\""; 2777 warn "unloading cf.pm \"a bit\"";
2449 delete $INC{"cf.pm"}; 2778 delete $INC{"cf.pm"};
2779 delete $INC{"cf/pod.pm"};
2450 2780
2451 # don't, removes xs symbols, too, 2781 # don't, removes xs symbols, too,
2452 # and global variables created in xs 2782 # and global variables created in xs
2453 #Symbol::delete_package __PACKAGE__; 2783 #Symbol::delete_package __PACKAGE__;
2454 2784
2463 2793
2464 warn "loading extensions"; 2794 warn "loading extensions";
2465 cf::load_extensions; 2795 cf::load_extensions;
2466 2796
2467 warn "reattaching attachments to objects/players"; 2797 warn "reattaching attachments to objects/players";
2468 _global_reattach; 2798 _global_reattach; # objects, sockets
2469 warn "reattaching attachments to maps"; 2799 warn "reattaching attachments to maps";
2470 reattach $_ for values %MAP; 2800 reattach $_ for values %MAP;
2801 warn "reattaching attachments to players";
2802 reattach $_ for values %PLAYER;
2471 2803
2472 warn "loading reloadable resources"; 2804 warn "leaving sync_job";
2473 load_resources;
2474 2805
2475 warn "restarting server ticker"; 2806 1
2476 2807 } or do {
2477 $TICK_WATCHER->start;
2478 };
2479
2480 if ($@) {
2481 warn $@; 2808 warn $@;
2482 warn "error while reloading, exiting."; 2809 warn "error while reloading, exiting.";
2483 exit 1; 2810 exit 1;
2484 } 2811 };
2485 2812
2486 warn "reloaded"; 2813 warn "reloaded";
2487}; 2814};
2488 2815
2489our $RELOAD_WATCHER; # used only during reload 2816our $RELOAD_WATCHER; # used only during reload
2490 2817
2818sub reload_perl() {
2819 # doing reload synchronously and two reloads happen back-to-back,
2820 # coro crashes during coro_state_free->destroy here.
2821
2822 $RELOAD_WATCHER ||= Event->timer (
2823 reentrant => 0,
2824 after => 0,
2825 data => WF_AUTOCANCEL,
2826 cb => sub {
2827 do_reload_perl;
2828 undef $RELOAD_WATCHER;
2829 },
2830 );
2831}
2832
2491register_command "reload" => sub { 2833register_command "reload" => sub {
2492 my ($who, $arg) = @_; 2834 my ($who, $arg) = @_;
2493 2835
2494 if ($who->flag (FLAG_WIZ)) { 2836 if ($who->flag (FLAG_WIZ)) {
2495 $who->message ("reloading server."); 2837 $who->message ("reloading server.");
2496 2838 async { reload_perl };
2497 # doing reload synchronously and two reloads happen back-to-back,
2498 # coro crashes during coro_state_free->destroy here.
2499
2500 $RELOAD_WATCHER ||= Event->timer (
2501 reentrant => 0,
2502 after => 0,
2503 data => WF_AUTOCANCEL,
2504 cb => sub {
2505 reload;
2506 undef $RELOAD_WATCHER;
2507 },
2508 );
2509 } 2839 }
2510}; 2840};
2511 2841
2512unshift @INC, $LIBDIR; 2842unshift @INC, $LIBDIR;
2513 2843
2514my $bug_warning = 0; 2844my $bug_warning = 0;
2515 2845
2846our @WAIT_FOR_TICK;
2847our @WAIT_FOR_TICK_BEGIN;
2848
2849sub wait_for_tick {
2850 return unless $TICK_WATCHER->is_active;
2851 return if $Coro::current == $Coro::main;
2852
2853 my $signal = new Coro::Signal;
2854 push @WAIT_FOR_TICK, $signal;
2855 $signal->wait;
2856}
2857
2858sub wait_for_tick_begin {
2859 return unless $TICK_WATCHER->is_active;
2860 return if $Coro::current == $Coro::main;
2861
2862 my $signal = new Coro::Signal;
2863 push @WAIT_FOR_TICK_BEGIN, $signal;
2864 $signal->wait;
2865}
2866
2867 my $min = 1e6;#d#
2868 my $avg = 10;
2516$TICK_WATCHER = Event->timer ( 2869$TICK_WATCHER = Event->timer (
2517 reentrant => 0, 2870 reentrant => 0,
2518 parked => 1, 2871 parked => 1,
2519 prio => 0, 2872 prio => 0,
2520 at => $NEXT_TICK || $TICK, 2873 at => $NEXT_TICK || $TICK,
2524 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 2877 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2525 unless ++$bug_warning > 10; 2878 unless ++$bug_warning > 10;
2526 return; 2879 return;
2527 } 2880 }
2528 2881
2529 $NOW = Event::time; 2882 $NOW = $tick_start = Event::time;
2530 2883
2531 cf::server_tick; # one server iteration 2884 cf::server_tick; # one server iteration
2885
2886 0 && sync_job {#d#
2887 for(1..10) {
2888 my $t = Event::time;
2889 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2890 or die;
2891
2892 $map->width (50);
2893 $map->height (50);
2894 $map->alloc;
2895 $map->_load_objects ("/tmp/x.map", 1);
2896 my $t = Event::time - $t;
2897
2898 #next unless $t < 0.0013;#d#
2899 if ($t < $min) {
2900 $min = $t;
2901 }
2902 $avg = $avg * 0.99 + $t * 0.01;
2903 }
2904 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2905 exit 0;
2906 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2907 };
2908
2532 $RUNTIME += $TICK; 2909 $RUNTIME += $TICK;
2533 $NEXT_TICK += $TICK; 2910 $NEXT_TICK += $TICK;
2534 2911
2535 $WAIT_FOR_TICK->broadcast; 2912 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2536 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2913 $NEXT_RUNTIME_WRITE = $NOW + 10;
2537 2914 Coro::async_pool {
2538 Event::sweep; 2915 write_runtime
2539 Coro::cede_notself; 2916 or warn "ERROR: unable to write runtime file: $!";
2917 };
2540 2918 }
2919
2541# my $AFTER = Event::time; 2920# my $AFTER = Event::time;
2542# warn $AFTER - $NOW;#d# 2921# warn $AFTER - $NOW;#d#
2543 2922
2923 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2924 $sig->send;
2925 }
2926 while (my $sig = shift @WAIT_FOR_TICK) {
2927 $sig->send;
2928 }
2929
2930 $NOW = Event::time;
2931
2544 # if we are delayed by four ticks or more, skip them all 2932 # if we are delayed by four ticks or more, skip them all
2545 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2933 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2546 2934
2547 $TICK_WATCHER->at ($NEXT_TICK); 2935 $TICK_WATCHER->at ($NEXT_TICK);
2548 $TICK_WATCHER->start; 2936 $TICK_WATCHER->start;
2937
2938 $LOAD = ($NOW - $tick_start) / $TICK;
2939 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2940
2941 _post_tick;
2942
2943
2549 }, 2944 },
2550); 2945);
2551 2946
2552{ 2947{
2553 BDB::max_poll_time $TICK * 0.1; 2948 BDB::max_poll_time $TICK * 0.1;
2581 2976
2582 cf::sync_job { 2977 cf::sync_job {
2583 eval { 2978 eval {
2584 BDB::db_env_open 2979 BDB::db_env_open
2585 $DB_ENV, 2980 $DB_ENV,
2586 $BDB_ENV_DIR, 2981 $BDBDIR,
2587 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 2982 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2588 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 2983 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2589 0666; 2984 0666;
2590 2985
2591 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 2986 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2592 2987
2593 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 2988 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2594 $DB_ENV->set_lk_detect; 2989 $DB_ENV->set_lk_detect;
2595 }; 2990 };
2596 2991
2604 2999
2605 undef $Coro::AIO::WATCHER; 3000 undef $Coro::AIO::WATCHER;
2606 IO::AIO::max_poll_time $TICK * 0.1; 3001 IO::AIO::max_poll_time $TICK * 0.1;
2607 $AIO_POLL_WATCHER = Event->io ( 3002 $AIO_POLL_WATCHER = Event->io (
2608 reentrant => 0, 3003 reentrant => 0,
3004 data => WF_AUTOCANCEL,
2609 fd => IO::AIO::poll_fileno, 3005 fd => IO::AIO::poll_fileno,
2610 poll => 'r', 3006 poll => 'r',
2611 prio => 6, 3007 prio => 6,
2612 data => WF_AUTOCANCEL,
2613 cb => \&IO::AIO::poll_cb, 3008 cb => \&IO::AIO::poll_cb,
2614 ); 3009 );
2615} 3010}
2616 3011
2617$WRITE_RUNTIME_WATCHER = Event->timer ( 3012my $_log_backtrace;
2618 reentrant => 0, 3013
2619 data => WF_AUTOCANCEL, 3014sub _log_backtrace {
2620 after => 1, 3015 my ($msg, @addr) = @_;
2621 interval => 10, 3016
2622 prio => 6, # keep it lowest so it acts like a watchdog 3017 $msg =~ s/\n//;
2623 cb => Coro::unblock_sub { 3018
2624 write_runtime 3019 # limit the # of concurrent backtraces
2625 or warn "ERROR: unable to write runtime file: $!"; 3020 if ($_log_backtrace < 2) {
3021 ++$_log_backtrace;
3022 async {
3023 my @bt = fork_call {
3024 @addr = map { sprintf "%x", $_ } @addr;
3025 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3026 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3027 or die "addr2line: $!";
3028
3029 my @funcs;
3030 my @res = <$fh>;
3031 chomp for @res;
3032 while (@res) {
3033 my ($func, $line) = splice @res, 0, 2, ();
3034 push @funcs, "[$func] $line";
3035 }
3036
3037 @funcs
3038 };
3039
3040 LOG llevInfo, "[ABT] $msg\n";
3041 LOG llevInfo, "[ABT] $_\n" for @bt;
3042 --$_log_backtrace;
3043 };
3044 } else {
3045 LOG llevInfo, "[ABT] $msg\n";
3046 LOG llevInfo, "[ABT] [suppressed]\n";
2626 }, 3047 }
2627); 3048}
3049
3050# load additional modules
3051use cf::pod;
2628 3052
2629END { cf::emergency_save } 3053END { cf::emergency_save }
2630 3054
26311 30551
2632 3056

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines