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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines