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.371 by root, Thu Sep 13 16:16:01 2007 UTC vs.
Revision 1.442 by root, Sun Aug 31 09:03:31 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict "vars", "subs";
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use Storable; 31use EV;
10use Event;
11use Opcode; 32use Opcode;
12use Safe; 33use Safe;
13use Safe::Hole; 34use Safe::Hole;
35use Storable ();
14 36
15use Coro 3.64 (); 37use Coro ();
16use Coro::State; 38use Coro::State;
17use Coro::Handle; 39use Coro::Handle;
40use Coro::EV;
18use Coro::Event; 41use Coro::AnyEvent;
19use Coro::Timer; 42use Coro::Timer;
20use Coro::Signal; 43use Coro::Signal;
21use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
22use Coro::AIO; 46use Coro::AIO;
47use Coro::BDB 1.6;
23use Coro::Storable; 48use Coro::Storable;
24use Coro::Util (); 49use Coro::Util ();
25 50
26use JSON::XS (); 51use JSON::XS 2.01 ();
27use BDB (); 52use BDB ();
28use Data::Dumper; 53use Data::Dumper;
29use Digest::MD5; 54use Digest::MD5;
30use Fcntl; 55use Fcntl;
31use YAML::Syck (); 56use YAML ();
32use IO::AIO 2.32 (); 57use IO::AIO ();
33use Time::HiRes; 58use Time::HiRes;
34use Compress::LZF; 59use Compress::LZF;
35use Digest::MD5 (); 60use Digest::MD5 ();
61
62AnyEvent::detect;
36 63
37# configure various modules to our taste 64# configure various modules to our taste
38# 65#
39$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 68Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
43$Event::Eval = 1; # no idea why this is required, but it is
44
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47 69
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 71
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 73
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 92our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 94our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 95our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 96our $BDBDIR = "$LOCALDIR/db";
97our %RESOURCE;
75 98
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 101our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 102our $USE_FSYNC = 1; # use fsync to write maps - default off
83 103
84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 104our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 105our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 106our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 107our $DB_ENV;
89 108
90our %CFG; 109our %CFG;
91 110
92our $UPTIME; $UPTIME ||= time; 111our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 112our $RUNTIME;
113our $NOW;
94 114
95our (%PLAYER, %PLAYER_LOADING); # all users 115our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 116our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 117our $LINK_MAP; # the special {link} map, which is always available
98 118
99# used to convert map paths into valid unix filenames by replacing / by ∕ 119# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 120our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 121
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 122our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 123our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 125our $TICK_START; # for load detecting purposes
105 126
106binmode STDOUT; 127binmode STDOUT;
107binmode STDERR; 128binmode STDERR;
108 129
109# read virtual server time, if available 130# read virtual server time, if available
162 183
163The raw value load value from the last tick. 184The raw value load value from the last tick.
164 185
165=item %cf::CFG 186=item %cf::CFG
166 187
167Configuration for the server, loaded from C</etc/crossfire/config>, or 188Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 189from wherever your confdir points to.
169 190
170=item cf::wait_for_tick, cf::wait_for_tick_begin 191=item cf::wait_for_tick, cf::wait_for_tick_begin
171 192
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 193These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 214 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 215
195 LOG llevError, $msg; 216 LOG llevError, $msg;
196 }; 217 };
197} 218}
219
220$Coro::State::DIEHOOK = sub {
221 return unless $^S eq 0; # "eq", not "=="
222
223 if ($Coro::current == $Coro::main) {#d#
224 warn "DIEHOOK called in main context, Coro bug?\n";#d#
225 return;#d#
226 }#d#
227
228 # kill coroutine otherwise
229 warn Carp::longmess $_[0];
230 Coro::terminate
231};
232
233$SIG{__DIE__} = sub { }; #d#?
198 234
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 245for my $pkg (qw(
210 cf::global cf::attachable 246 cf::global cf::attachable
211 cf::object cf::object::player 247 cf::object cf::object::player
212 cf::client cf::player 248 cf::client cf::player
213 cf::arch cf::living 249 cf::arch cf::living
250 cf::map cf::mapspace
214 cf::map cf::party cf::region 251 cf::party cf::region
215)) { 252)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 254}
219 255
220$Event::DIED = sub { 256$EV::DIED = sub {
221 warn "error in event callback: @_"; 257 warn "error in event callback: @_";
222}; 258};
223 259
224############################################################################# 260#############################################################################
225 261
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 284 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 285 $d
250 } || "[unable to dump $_[0]: '$@']"; 286 } || "[unable to dump $_[0]: '$@']";
251} 287}
252 288
253=item $ref = cf::from_json $json 289=item $ref = cf::decode_json $json
254 290
255Converts a JSON string into the corresponding perl data structure. 291Converts a JSON string into the corresponding perl data structure.
256 292
257=item $json = cf::to_json $ref 293=item $json = cf::encode_json $ref
258 294
259Converts a perl data structure into its JSON representation. 295Converts a perl data structure into its JSON representation.
260 296
261=cut 297=cut
262 298
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 299our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 300
265sub to_json ($) { $json_coder->encode ($_[0]) } 301sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 302sub decode_json($) { $json_coder->decode ($_[0]) }
267 303
268=item cf::lock_wait $string 304=item cf::lock_wait $string
269 305
270Wait until the given lock is available. See cf::lock_acquire. 306Wait until the given lock is available. See cf::lock_acquire.
271 307
327 363
328 ! ! $LOCK{$key} 364 ! ! $LOCK{$key}
329} 365}
330 366
331sub freeze_mainloop { 367sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
333 369
334 my $guard = Coro::guard { 370 Coro::guard \&tick_inhibit_dec;
335 $TICK_WATCHER->start; 371}
336 }; 372
337 $TICK_WATCHER->stop; 373=item cf::periodic $interval, $cb
338 $guard 374
375Like EV::periodic, but randomly selects a starting point so that the actions
376get spread over timer.
377
378=cut
379
380sub periodic($$) {
381 my ($interval, $cb) = @_;
382
383 my $start = rand List::Util::min 180, $interval;
384
385 EV::periodic $start, $interval, 0, $cb
339} 386}
340 387
341=item cf::get_slot $time[, $priority[, $name]] 388=item cf::get_slot $time[, $priority[, $name]]
342 389
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 390Allocate $time seconds of blocking CPU time at priority C<$priority>:
354our @SLOT_QUEUE; 401our @SLOT_QUEUE;
355our $SLOT_QUEUE; 402our $SLOT_QUEUE;
356 403
357$SLOT_QUEUE->cancel if $SLOT_QUEUE; 404$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async { 405$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager");
407
359 my $signal = new Coro::Signal; 408 my $signal = new Coro::Signal;
360 409
361 while () { 410 while () {
362 next_job: 411 next_job:
363 my $avail = cf::till_tick; 412 my $avail = cf::till_tick;
371 } 420 }
372 } 421 }
373 } 422 }
374 423
375 if (@SLOT_QUEUE) { 424 if (@SLOT_QUEUE) {
376 # we do not use wait_For_tick() as it returns immediately when tick is inactive 425 # we do not use wait_for_tick() as it returns immediately when tick is inactive
377 push @cf::WAIT_FOR_TICK, $signal; 426 push @cf::WAIT_FOR_TICK, $signal;
378 $signal->wait; 427 $signal->wait;
379 } else { 428 } else {
380 Coro::schedule; 429 Coro::schedule;
381 } 430 }
382 } 431 }
383}; 432};
384 433
385sub get_slot($;$$) { 434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
386 my ($time, $pri, $name) = @_; 437 my ($time, $pri, $name) = @_;
387 438
388 $time = $TICK * .6 if $time > $TICK * .6; 439 $time = $TICK * .6 if $time > $TICK * .6;
389 my $sig = new Coro::Signal; 440 my $sig = new Coro::Signal;
390 441
404 455
405BEGIN { *async = \&Coro::async_pool } 456BEGIN { *async = \&Coro::async_pool }
406 457
407=item cf::sync_job { BLOCK } 458=item cf::sync_job { BLOCK }
408 459
409The design of Crossfire TRT requires that the main coroutine ($Coro::main) 460The design of Deliantra requires that the main coroutine ($Coro::main)
410is always able to handle events or runnable, as Crossfire TRT is only 461is always able to handle events or runnable, as Deliantra is only
411partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 462partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
412acceptable. 463acceptable.
413 464
414If it must be done, put the blocking parts into C<sync_job>. This will run 465If it must be done, put the blocking parts into C<sync_job>. This will run
415the given BLOCK in another coroutine while waiting for the result. The 466the given BLOCK in another coroutine while waiting for the result. The
420 471
421sub sync_job(&) { 472sub sync_job(&) {
422 my ($job) = @_; 473 my ($job) = @_;
423 474
424 if ($Coro::current == $Coro::main) { 475 if ($Coro::current == $Coro::main) {
425 my $time = Event::time; 476 my $time = EV::time;
426 477
427 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
428 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
429 480
430 # TODO: use suspend/resume instead 481 LOG llevError, Carp::longmess "sync job";#d#
431 # (but this is cancel-safe) 482
432 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
433 484
434 my $busy = 1; 485 my $busy = 1;
435 my @res; 486 my @res;
436 487
437 (async { 488 (async {
489 $Coro::current->desc ("sync job coro");
438 @res = eval { $job->() }; 490 @res = eval { $job->() };
439 warn $@ if $@; 491 warn $@ if $@;
440 undef $busy; 492 undef $busy;
441 })->prio (Coro::PRIO_MAX); 493 })->prio (Coro::PRIO_MAX);
442 494
443 while ($busy) { 495 while ($busy) {
444 Coro::cede or Event::one_event; 496 if (Coro::nready) {
497 Coro::cede_notself;
498 } else {
499 EV::loop EV::LOOP_ONESHOT;
445 } 500 }
501 }
446 502
447 $time = Event::time - $time; 503 my $time = EV::time - $time;
448 504
449 LOG llevError | logBacktrace, Carp::longmess "long sync job"
450 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
451
452 $tick_start += $time; # do not account sync jobs to server load 505 $TICK_START += $time; # do not account sync jobs to server load
453 506
454 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
455 } else { 508 } else {
456 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
457 510
482=item fork_call { }, $args 535=item fork_call { }, $args
483 536
484Executes the given code block with the given arguments in a seperate 537Executes the given code block with the given arguments in a seperate
485process, returning the results. Everything must be serialisable with 538process, returning the results. Everything must be serialisable with
486Coro::Storable. May, of course, block. Note that the executed sub may 539Coro::Storable. May, of course, block. Note that the executed sub may
487never block itself or use any form of Event handling. 540never block itself or use any form of event handling.
488 541
489=cut 542=cut
490 543
491sub fork_call(&@) { 544sub fork_call(&@) {
492 my ($cb, @args) = @_; 545 my ($cb, @args) = @_;
499 reset_signals; 552 reset_signals;
500 &$cb 553 &$cb
501 }, @args; 554 }, @args;
502 555
503 wantarray ? @res : $res[-1] 556 wantarray ? @res : $res[-1]
557}
558
559=item $coin = coin_from_name $name
560
561=cut
562
563our %coin_alias = (
564 "silver" => "silvercoin",
565 "silvercoin" => "silvercoin",
566 "silvercoins" => "silvercoin",
567 "gold" => "goldcoin",
568 "goldcoin" => "goldcoin",
569 "goldcoins" => "goldcoin",
570 "platinum" => "platinacoin",
571 "platinumcoin" => "platinacoin",
572 "platinumcoins" => "platinacoin",
573 "platina" => "platinacoin",
574 "platinacoin" => "platinacoin",
575 "platinacoins" => "platinacoin",
576 "royalty" => "royalty",
577 "royalties" => "royalty",
578);
579
580sub coin_from_name($) {
581 $coin_alias{$_[0]}
582 ? cf::arch::find $coin_alias{$_[0]}
583 : undef
504} 584}
505 585
506=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
507 587
508Returns a single value from the environment database. 588Returns a single value from the environment database.
653attach callbacks/event handlers (a collection of which is called an "attachment") 733attach callbacks/event handlers (a collection of which is called an "attachment")
654to it. All such attachable objects support the following methods. 734to it. All such attachable objects support the following methods.
655 735
656In the following description, CLASS can be any of C<global>, C<object> 736In the following description, CLASS can be any of C<global>, C<object>
657C<player>, C<client> or C<map> (i.e. the attachable objects in 737C<player>, C<client> or C<map> (i.e. the attachable objects in
658Crossfire TRT). 738Deliantra).
659 739
660=over 4 740=over 4
661 741
662=item $attachable->attach ($attachment, key => $value...) 742=item $attachable->attach ($attachment, key => $value...)
663 743
945 } 1025 }
946 1026
947 0 1027 0
948} 1028}
949 1029
950=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
951 1031
952=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1032=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
953 1033
954Generate an object-specific event with the given arguments. 1034Generate an object-specific event with the given arguments.
955 1035
961 1041
962=cut 1042=cut
963 1043
964############################################################################# 1044#############################################################################
965# object support 1045# object support
966#
967 1046
1047sub _object_equal($$);
1048sub _object_equal($$) {
1049 my ($a, $b) = @_;
1050
1051 return 0 unless (ref $a) eq (ref $b);
1052
1053 if ("HASH" eq ref $a) {
1054 my @ka = keys %$a;
1055 my @kb = keys %$b;
1056
1057 return 0 if @ka != @kb;
1058
1059 for (0 .. $#ka) {
1060 return 0 unless $ka[$_] eq $kb[$_];
1061 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1062 }
1063
1064 } elsif ("ARRAY" eq ref $a) {
1065
1066 return 0 if @$a != @$b;
1067
1068 for (0 .. $#$a) {
1069 return 0 unless _object_equal $a->[$_], $b->[$_];
1070 }
1071
1072 } elsif ($a ne $b) {
1073 return 0;
1074 }
1075
1076 1
1077}
1078
1079our $SLOW_MERGES;#d#
968sub _can_merge { 1080sub _can_merge {
969 my ($ob1, $ob2) = @_; 1081 my ($ob1, $ob2) = @_;
970 1082
971 local $Storable::canonical = 1; 1083 ++$SLOW_MERGES;#d#
972 my $fob1 = Storable::freeze $ob1;
973 my $fob2 = Storable::freeze $ob2;
974 1084
975 $fob1 eq $fob2 1085 # we do the slow way here
1086 return _object_equal $ob1, $ob2
976} 1087}
977 1088
978sub reattach { 1089sub reattach {
979 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
980 my ($obj) = @_; 1091 my ($obj) = @_;
981 1092
1093 # no longer needed after getting rid of delete_package?
982 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1094 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
983 1095
984 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
985 1097
986 @$registry = (); 1098 @$registry = ();
987 1099
1002cf::attachable->attach ( 1114cf::attachable->attach (
1003 prio => -1000000, 1115 prio => -1000000,
1004 on_instantiate => sub { 1116 on_instantiate => sub {
1005 my ($obj, $data) = @_; 1117 my ($obj, $data) = @_;
1006 1118
1007 $data = from_json $data; 1119 $data = decode_json $data;
1008 1120
1009 for (@$data) { 1121 for (@$data) {
1010 my ($name, $args) = @$_; 1122 my ($name, $args) = @$_;
1011 1123
1012 $obj->attach ($name, %{$args || {} }); 1124 $obj->attach ($name, %{$args || {} });
1025 }, 1137 },
1026); 1138);
1027 1139
1028sub object_freezer_save { 1140sub object_freezer_save {
1029 my ($filename, $rdata, $objs) = @_; 1141 my ($filename, $rdata, $objs) = @_;
1030
1031 my $guard = cf::lock_acquire "io";
1032 1142
1033 sync_job { 1143 sync_job {
1034 if (length $$rdata) { 1144 if (length $$rdata) {
1035 utf8::decode (my $decname = $filename); 1145 utf8::decode (my $decname = $filename);
1036 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
1037 $decname, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
1038 1148
1039 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1040 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
1041 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1042 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
1043 close $fh; 1153 aio_close $fh;
1044 1154
1045 if (@$objs) { 1155 if (@$objs) {
1046 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1047 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
1048 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1049 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
1050 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
1051 close $fh; 1161 aio_close $fh;
1052 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
1053 } 1163 }
1054 } else { 1164 } else {
1055 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1056 } 1166 }
1062 } else { 1172 } else {
1063 aio_unlink $filename; 1173 aio_unlink $filename;
1064 aio_unlink "$filename.pst"; 1174 aio_unlink "$filename.pst";
1065 } 1175 }
1066 }; 1176 };
1067
1068 undef $guard;
1069} 1177}
1070 1178
1071sub object_freezer_as_string { 1179sub object_freezer_as_string {
1072 my ($rdata, $objs) = @_; 1180 my ($rdata, $objs) = @_;
1073 1181
1078 1186
1079sub object_thawer_load { 1187sub object_thawer_load {
1080 my ($filename) = @_; 1188 my ($filename) = @_;
1081 1189
1082 my ($data, $av); 1190 my ($data, $av);
1083
1084 my $guard = cf::lock_acquire "io";
1085 1191
1086 (aio_load $filename, $data) >= 0 1192 (aio_load $filename, $data) >= 0
1087 or return; 1193 or return;
1088 1194
1089 unless (aio_stat "$filename.pst") { 1195 unless (aio_stat "$filename.pst") {
1090 (aio_load "$filename.pst", $av) >= 0 1196 (aio_load "$filename.pst", $av) >= 0
1091 or return; 1197 or return;
1092 1198
1093 undef $guard;
1094 $av = eval { (Storable::thaw $av)->{objs} }; 1199 my $st = eval { Coro::Storable::thaw $av };
1200 $av = $st->{objs};
1095 } 1201 }
1096 1202
1097 utf8::decode (my $decname = $filename); 1203 utf8::decode (my $decname = $filename);
1098 warn sprintf "loading %s (%d,%d)\n", 1204 warn sprintf "loading %s (%d,%d)\n",
1099 $decname, length $data, scalar @{$av || []}; 1205 $decname, length $data, scalar @{$av || []};
1229 1335
1230 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1336 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1231 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1337 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1232 1338
1233 $ext{source} = 1339 $ext{source} =
1234 "package $pkg; use strict; use utf8;\n" 1340 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1235 . "#line 1 \"$path\"\n{\n" 1341 . "#line 1 \"$path\"\n{\n"
1236 . $source 1342 . $source
1237 . "\n};\n1"; 1343 . "\n};\n1";
1238 1344
1239 $todo{$base} = \%ext; 1345 $todo{$base} = \%ext;
1255 my $msg = $@ ? "$v->{path}: $@\n" 1361 my $msg = $@ ? "$v->{path}: $@\n"
1256 : "$v->{base}: extension inactive.\n"; 1362 : "$v->{base}: extension inactive.\n";
1257 1363
1258 if (exists $v->{meta}{mandatory}) { 1364 if (exists $v->{meta}{mandatory}) {
1259 warn $msg; 1365 warn $msg;
1260 warn "mandatory extension failed to load, exiting.\n"; 1366 cf::cleanup "mandatory extension failed to load, exiting.";
1261 exit 1;
1262 } 1367 }
1263 1368
1264 warn $msg; 1369 warn $msg;
1265 } 1370 }
1266 1371
1353 aio_unlink +(playerdir $login) . "/$login.pl"; 1458 aio_unlink +(playerdir $login) . "/$login.pl";
1354 1459
1355 my $f = new_from_file cf::object::thawer path $login 1460 my $f = new_from_file cf::object::thawer path $login
1356 or return; 1461 or return;
1357 1462
1358 $f->next;
1359 my $pl = cf::player::load_pl $f 1463 my $pl = cf::player::load_pl $f
1360 or return; 1464 or return;
1465
1361 local $cf::PLAYER_LOADING{$login} = $pl; 1466 local $cf::PLAYER_LOADING{$login} = $pl;
1362 $f->resolve_delayed_derefs; 1467 $f->resolve_delayed_derefs;
1363 $cf::PLAYER{$login} = $pl 1468 $cf::PLAYER{$login} = $pl
1364 } 1469 }
1365 } 1470 }
1375 1480
1376 return if $pl->{deny_save}; 1481 return if $pl->{deny_save};
1377 1482
1378 aio_mkdir playerdir $pl, 0770; 1483 aio_mkdir playerdir $pl, 0770;
1379 $pl->{last_save} = $cf::RUNTIME; 1484 $pl->{last_save} = $cf::RUNTIME;
1485
1486 cf::get_slot 0.01;
1380 1487
1381 $pl->save_pl ($path); 1488 $pl->save_pl ($path);
1382 cf::cede_to_tick; 1489 cf::cede_to_tick;
1383} 1490}
1384 1491
1420 $pl->{deny_save} = 1; 1527 $pl->{deny_save} = 1;
1421 $pl->password ("*"); # this should lock out the player until we nuked the dir 1528 $pl->password ("*"); # this should lock out the player until we nuked the dir
1422 1529
1423 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1424 $pl->deactivate; 1531 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1425 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1534 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1426 $pl->ns->destroy if $pl->ns; 1535 $pl->ns->destroy if $pl->ns;
1427 1536
1428 my $path = playerdir $pl; 1537 my $path = playerdir $pl;
1429 my $temp = "$path~$cf::RUNTIME~deleting~"; 1538 my $temp = "$path~$cf::RUNTIME~deleting~";
1468 1577
1469 for my $login (@$dirs) { 1578 for my $login (@$dirs) {
1470 my $path = path $login; 1579 my $path = path $login;
1471 1580
1472 # a .pst is a dead give-away for a valid player 1581 # a .pst is a dead give-away for a valid player
1473 unless (-e "$path.pst") { 1582 # if no pst file found, open and chekc for blocked users
1583 if (aio_stat "$path.pst") {
1474 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1584 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1475 aio_read $fh, 0, 512, my $buf, 0 or next; 1585 aio_read $fh, 0, 512, my $buf, 0 or next;
1476 $buf !~ /^password -------------$/m or next; # official not-valid tag 1586 $buf !~ /^password -------------$/m or next; # official not-valid tag
1477 } 1587 }
1478 1588
1516Expand crossfire pod fragments into protocol xml. 1626Expand crossfire pod fragments into protocol xml.
1517 1627
1518=cut 1628=cut
1519 1629
1520sub expand_cfpod { 1630sub expand_cfpod {
1521 ((my $self), (local $_)) = @_; 1631 my ($self, $pod) = @_;
1522 1632
1523 # escape & and < 1633 my @nest = [qr<\G$>, undef, ""];
1524 s/&/&amp;/g; 1634 my $xml;
1525 s/(?<![BIUGHT])</&lt;/g;
1526 1635
1527 # this is buggy, it needs to properly take care of nested <'s 1636 for ($pod) {
1637 while () {
1638 if (/\G( (?: [^BCEGHITUZ&>\n\ ]+ | [BCEGHITUZ](?!<) | \ (?!>) )+ )/xgcs) {
1639 $xml .= $1;
1640 } elsif (/\G\n(?=\S)/xgcs) {
1641 $xml .= " ";
1642 } elsif (/\G\n/xgcs) {
1643 $xml .= "\n";
1644 } elsif (/\G ([BCEGHITUZ]) (< (?: <+\ | (?!<) ) )/xgcs) {
1645 my ($code, $delim) = ($1, scalar reverse $2);
1646 $delim =~ y/</>/; # delim now contains the stop sequence
1647 $delim = qr{\G\Q$delim};
1528 1648
1529 1 while 1649 my $cb;
1530 # replace B<>, I<>, U<> etc. 1650
1531 s/B<([^\>]*)>/<b>$1<\/b>/ 1651 if ($code eq "B") {
1532 || s/I<([^\>]*)>/<i>$1<\/i>/ 1652 $cb = sub { "<b>$_[0]</b>" };
1533 || s/U<([^\>]*)>/<u>$1<\/u>/ 1653 } elsif ($code eq "C") {
1534 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1654 $cb = sub { "<tt>$_[0]</tt>" };
1535 # replace G<male|female> tags 1655 } elsif ($code eq "E") {
1536 || s{G<([^>|]*)\|([^>]*)>}{ 1656 $cb = sub { warn "E<$_[0]>\n";"&$_[0];" };
1537 $self->gender ? $2 : $1 1657 } elsif ($code eq "G") {
1538 }ge 1658 $cb = sub {
1539 # replace H<hint text> 1659 my ($male, $female) = split /\|/, $_[0];
1540 || s{H<([^\>]*)>} 1660 $self->gender ? $female : $male
1541 { 1661 };
1662 } elsif ($code eq "H") {
1663 $cb = sub {
1664 (
1542 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1665 "<fg name=\"lightblue\">[$_[0] (Use hintmode to suppress hints)]</fg>",
1543 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1666 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1544 "") 1667 "",
1545 [$self->{hintmode}] 1668 )[$self->{hintmode}];
1669 };
1670 } elsif ($code eq "I") {
1671 $cb = sub { "<i>$_[0]</i>" };
1672 } elsif ($code eq "T") {
1673 $cb = sub { "<big><b>$_[0]</b></big>" };
1674 } elsif ($code eq "U") {
1675 $cb = sub { "<u>$_[0]</u>" };
1676 } elsif ($code eq "Z") {
1677 $cb = sub { };
1678 } else {
1679 die "FATAL error in expand_cfpod";
1680 }
1681
1682 push @nest, [$delim, $cb, $xml];
1683 undef $xml;
1684
1685 } elsif ($_ =~ /$nest[-1][0]/gcs) {
1686 my $nest = pop @nest;
1687
1688 if ($nest->[1]) {
1689 $xml = $nest->[2] . $nest->[1]->($xml);
1690 } else {
1691 last;
1692 }
1693 } elsif (/\G</xgcs) {
1694 $xml .= "&lt;";
1695 } elsif (/\G&/xgcs) {
1696 $xml .= "&amp;";
1697 } elsif (/\G>/xgcs) {
1698 $xml .= ">";
1699 } else {
1700 if ($pod =~ /\G(.+)/xgcs) {
1701 warn "parse error (at $1)($nest[-1][0]) while expanding cfpod:\n$pod";
1702 last;
1703 } else {
1704 warn "parse error (unclosed interior sequence at end of cfpod) while expanding cfpod:\n$pod";
1705 return "<b>Sorry, the server encountered an internal error when formatting this message, please report this.</b>";
1706 }
1546 }ge; 1707 }
1708 }
1709 }
1547 1710
1548 # create single paragraphs (very hackish) 1711 $xml
1549 s/(?<=\S)\n(?=\w)/ /g;
1550
1551 # compress some whitespace
1552 s/\s+\n/\n/g; # ws line-ends
1553 s/\n\n+/\n/g; # double lines
1554 s/^\n+//; # beginning lines
1555 s/\n+$//; # ending lines
1556
1557 $_
1558} 1712}
1559 1713
1560sub hintmode { 1714sub hintmode {
1561 $_[0]{hintmode} = $_[1] if @_ > 1; 1715 $_[0]{hintmode} = $_[1] if @_ > 1;
1562 $_[0]{hintmode} 1716 $_[0]{hintmode}
1635our $MAX_RESET = 3600; 1789our $MAX_RESET = 3600;
1636our $DEFAULT_RESET = 3000; 1790our $DEFAULT_RESET = 3000;
1637 1791
1638sub generate_random_map { 1792sub generate_random_map {
1639 my ($self, $rmp) = @_; 1793 my ($self, $rmp) = @_;
1794
1795 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1796
1640 # mit "rum" bekleckern, nicht 1797 # mit "rum" bekleckern, nicht
1641 $self->_create_random_map ( 1798 $self->_create_random_map (
1642 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1799 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1643 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1800 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1644 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1801 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1766 1923
1767# the temporary/swap location 1924# the temporary/swap location
1768sub save_path { 1925sub save_path {
1769 my ($self) = @_; 1926 my ($self) = @_;
1770 1927
1771 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1772 "$TMPDIR/$path.map" 1929 "$TMPDIR/$path.map"
1773} 1930}
1774 1931
1775# the unique path, undef == no special unique path 1932# the unique path, undef == no special unique path
1776sub uniq_path { 1933sub uniq_path {
1777 my ($self) = @_; 1934 my ($self) = @_;
1778 1935
1779 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1936 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1780 "$UNIQUEDIR/$path" 1937 "$UNIQUEDIR/$path"
1781} 1938}
1782 1939
1783# and all this just because we cannot iterate over 1940# and all this just because we cannot iterate over
1784# all maps in C++... 1941# all maps in C++...
1882 2039
1883 cf::lock_wait "map_data:$path";#d#remove 2040 cf::lock_wait "map_data:$path";#d#remove
1884 cf::lock_wait "map_find:$path"; 2041 cf::lock_wait "map_find:$path";
1885 2042
1886 $cf::MAP{$path} || do { 2043 $cf::MAP{$path} || do {
1887 my $guard1 = cf::lock_acquire "map_find:$path";
1888 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 2044 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2045 my $guard2 = cf::lock_acquire "map_find:$path";
1889 2046
1890 my $map = new_from_path cf::map $path 2047 my $map = new_from_path cf::map $path
1891 or return; 2048 or return;
1892 2049
1893 $map->{last_save} = $cf::RUNTIME; 2050 $map->{last_save} = $cf::RUNTIME;
1896 or return; 2053 or return;
1897 2054
1898 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2055 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1899 # doing this can freeze the server in a sync job, obviously 2056 # doing this can freeze the server in a sync job, obviously
1900 #$cf::WAIT_FOR_TICK->wait; 2057 #$cf::WAIT_FOR_TICK->wait;
2058 undef $guard2;
1901 undef $guard1; 2059 undef $guard1;
1902 undef $guard2;
1903 $map->reset; 2060 $map->reset;
1904 return find $path; 2061 return find $path;
1905 } 2062 }
1906 2063
1907 $cf::MAP{$path} = $map 2064 $cf::MAP{$path} = $map
1934 my $f = new_from_file cf::object::thawer $self->{load_path}; 2091 my $f = new_from_file cf::object::thawer $self->{load_path};
1935 $f->skip_block; 2092 $f->skip_block;
1936 $self->_load_objects ($f) 2093 $self->_load_objects ($f)
1937 or return; 2094 or return;
1938 2095
1939 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2096 $self->post_load_original
1940 if delete $self->{load_original}; 2097 if delete $self->{load_original};
1941 2098
1942 if (my $uniq = $self->uniq_path) { 2099 if (my $uniq = $self->uniq_path) {
1943 utf8::encode $uniq; 2100 utf8::encode $uniq;
1944 unless (aio_stat $uniq) { 2101 unless (aio_stat $uniq) {
1970 } 2127 }
1971 2128
1972 $self->{last_save} = $cf::RUNTIME; 2129 $self->{last_save} = $cf::RUNTIME;
1973 $self->last_access ($cf::RUNTIME); 2130 $self->last_access ($cf::RUNTIME);
1974 2131
1975 $self->in_memory (cf::MAP_IN_MEMORY); 2132 $self->in_memory (cf::MAP_ACTIVE);
1976 } 2133 }
1977 2134
1978 $self->post_load; 2135 $self->post_load;
1979} 2136}
1980 2137
2038 my ($path, $origin, $load) = @_; 2195 my ($path, $origin, $load) = @_;
2039 2196
2040 $path = normalise $path, $origin && $origin->{path}; 2197 $path = normalise $path, $origin && $origin->{path};
2041 2198
2042 if (my $map = $cf::MAP{$path}) { 2199 if (my $map = $cf::MAP{$path}) {
2043 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2200 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2044 } 2201 }
2045 2202
2046 $MAP_PREFETCH{$path} |= $load; 2203 $MAP_PREFETCH{$path} |= $load;
2047 2204
2048 $MAP_PREFETCHER ||= cf::async { 2205 $MAP_PREFETCHER ||= cf::async {
2206 $Coro::current->{desc} = "map prefetcher";
2207
2049 while (%MAP_PREFETCH) { 2208 while (%MAP_PREFETCH) {
2050 while (my ($k, $v) = each %MAP_PREFETCH) { 2209 while (my ($k, $v) = each %MAP_PREFETCH) {
2051 if (my $map = find $k) { 2210 if (my $map = find $k) {
2052 $map->load if $v; 2211 $map->load if $v;
2053 } 2212 }
2079 return if $self->{deny_save}; 2238 return if $self->{deny_save};
2080 2239
2081 local $self->{last_access} = $self->last_access;#d# 2240 local $self->{last_access} = $self->last_access;#d#
2082 2241
2083 cf::async { 2242 cf::async {
2243 $Coro::current->{desc} = "map player save";
2084 $_->contr->save for $self->players; 2244 $_->contr->save for $self->players;
2085 }; 2245 };
2246
2247 cf::get_slot 0.02;
2086 2248
2087 if ($uniq) { 2249 if ($uniq) {
2088 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2250 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2089 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2251 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2090 } else { 2252 } else {
2099 $self->save; 2261 $self->save;
2100 2262
2101 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2102 2264
2103 return if $self->players; 2265 return if $self->players;
2104 return if $self->in_memory != cf::MAP_IN_MEMORY; 2266 return if $self->in_memory != cf::MAP_ACTIVE;
2105 return if $self->{deny_save}; 2267 return if $self->{deny_save};
2106 2268
2107 $self->in_memory (cf::MAP_SWAPPED); 2269 $self->in_memory (cf::MAP_SWAPPED);
2108 2270
2109 $self->deactivate; 2271 $self->deactivate;
2227 2389
2228sub unique_maps() { 2390sub unique_maps() {
2229 [ 2391 [
2230 map { 2392 map {
2231 utf8::decode $_; 2393 utf8::decode $_;
2232 /\.map$/ 2394 s/\.map$//; # TODO future compatibility hack
2395 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2396 ? ()
2233 ? normalise $_ 2397 : normalise $_
2234 : ()
2235 } @{ aio_readdir $UNIQUEDIR or [] } 2398 } @{ aio_readdir $UNIQUEDIR or [] }
2236 ] 2399 ]
2237} 2400}
2238 2401
2239package cf;
2240
2241=back 2402=back
2242 2403
2243=head3 cf::object 2404=head3 cf::object
2244 2405
2245=cut 2406=cut
2248 2409
2249=over 4 2410=over 4
2250 2411
2251=item $ob->inv_recursive 2412=item $ob->inv_recursive
2252 2413
2253Returns the inventory of the object _and_ their inventories, recursively. 2414Returns the inventory of the object I<and> their inventories, recursively,
2415but I<not> the object itself.
2254 2416
2255=cut 2417=cut
2256 2418
2257sub inv_recursive_; 2419sub inv_recursive_;
2258sub inv_recursive_ { 2420sub inv_recursive_ {
2263 inv_recursive_ inv $_[0] 2425 inv_recursive_ inv $_[0]
2264} 2426}
2265 2427
2266=item $ref = $ob->ref 2428=item $ref = $ob->ref
2267 2429
2268creates and returns a persistent reference to an objetc that can be stored as a string. 2430Creates and returns a persistent reference to an object that can be stored as a string.
2269 2431
2270=item $ob = cf::object::deref ($refstring) 2432=item $ob = cf::object::deref ($refstring)
2271 2433
2272returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2434returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2273even if the object actually exists. May block. 2435even if the object actually exists. May block.
2275=cut 2437=cut
2276 2438
2277sub deref { 2439sub deref {
2278 my ($ref) = @_; 2440 my ($ref) = @_;
2279 2441
2280 # temporary compatibility#TODO#remove
2281 $ref =~ s{^<}{player/<};
2282
2283 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2442 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2284 my ($uuid, $name) = ($1, $2); 2443 my ($uuid, $name) = ($1, $2);
2285 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2444 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2286 or return; 2445 or return;
2287 $pl->ob->uuid eq $uuid 2446 $pl->ob->uuid eq $uuid
2288 or return; 2447 or return;
2308can be C<undef>. Does the right thing when the player is currently in a 2467can be C<undef>. Does the right thing when the player is currently in a
2309dialogue with the given NPC character. 2468dialogue with the given NPC character.
2310 2469
2311=cut 2470=cut
2312 2471
2472our $SAY_CHANNEL = {
2473 id => "say",
2474 title => "Map",
2475 reply => "say ",
2476 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2477};
2478
2479our $CHAT_CHANNEL = {
2480 id => "chat",
2481 title => "Chat",
2482 reply => "chat ",
2483 tooltip => "Player chat and shouts, global to the server.",
2484};
2485
2313# rough implementation of a future "reply" method that works 2486# rough implementation of a future "reply" method that works
2314# with dialog boxes. 2487# with dialog boxes.
2315#TODO: the first argument must go, split into a $npc->reply_to ( method 2488#TODO: the first argument must go, split into a $npc->reply_to ( method
2316sub cf::object::player::reply($$$;$) { 2489sub cf::object::player::reply($$$;$) {
2317 my ($self, $npc, $msg, $flags) = @_; 2490 my ($self, $npc, $msg, $flags) = @_;
2328 my $dialog = $pl->{npc_dialog}; 2501 my $dialog = $pl->{npc_dialog};
2329 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2502 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2330 2503
2331 } else { 2504 } else {
2332 $msg = $npc->name . " says: $msg" if $npc; 2505 $msg = $npc->name . " says: $msg" if $npc;
2333 $self->message ($msg, $flags); 2506 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2334 } 2507 }
2335 } 2508 }
2336} 2509}
2337 2510
2338=item $object->send_msg ($channel, $msg, $color, [extra...]) 2511=item $object->send_msg ($channel, $msg, $color, [extra...])
2446her, loading and preparing them map, calling the provided $check callback 2619her, loading and preparing them map, calling the provided $check callback
2447that has to return the map if sucecssful, and then unfreezes the player on 2620that has to return the map if sucecssful, and then unfreezes the player on
2448the new (success) or old (failed) map position. In either case, $done will 2621the new (success) or old (failed) map position. In either case, $done will
2449be called at the end of this process. 2622be called at the end of this process.
2450 2623
2624Note that $check will be called with a potentially non-loaded map, so if
2625it needs a loaded map it has to call C<< ->load >>.
2626
2451=cut 2627=cut
2452 2628
2453our $GOTOGEN; 2629our $GOTOGEN;
2454 2630
2455sub cf::object::player::goto { 2631sub cf::object::player::goto {
2459 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2635 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2460 2636
2461 $self->enter_link; 2637 $self->enter_link;
2462 2638
2463 (async { 2639 (async {
2640 $Coro::current->{desc} = "player::goto $path $x $y";
2641
2464 # *tag paths override both path and x|y 2642 # *tag paths override both path and x|y
2465 if ($path =~ /^\*(.*)$/) { 2643 if ($path =~ /^\*(.*)$/) {
2466 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2644 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2467 my $ob = $obs[rand @obs]; 2645 my $ob = $obs[rand @obs];
2468 2646
2531} 2709}
2532 2710
2533sub prepare_random_map { 2711sub prepare_random_map {
2534 my ($exit) = @_; 2712 my ($exit) = @_;
2535 2713
2536 my $guard = cf::lock_acquire "exit_prepare:$exit";
2537
2538 # all this does is basically replace the /! path by 2714 # all this does is basically replace the /! path by
2539 # a new random map path (?random/...) with a seed 2715 # a new random map path (?random/...) with a seed
2540 # that depends on the exit object 2716 # that depends on the exit object
2541 2717
2542 my $rmp = parse_random_map_params $exit->msg; 2718 my $rmp = parse_random_map_params $exit->msg;
2544 if ($exit->map) { 2720 if ($exit->map) {
2545 $rmp->{region} = $exit->region->name; 2721 $rmp->{region} = $exit->region->name;
2546 $rmp->{origin_map} = $exit->map->path; 2722 $rmp->{origin_map} = $exit->map->path;
2547 $rmp->{origin_x} = $exit->x; 2723 $rmp->{origin_x} = $exit->x;
2548 $rmp->{origin_y} = $exit->y; 2724 $rmp->{origin_y} = $exit->y;
2725
2726 $exit->map->touch;
2549 } 2727 }
2550 2728
2551 $rmp->{random_seed} ||= $exit->random_seed; 2729 $rmp->{random_seed} ||= $exit->random_seed;
2552 2730
2553 my $data = cf::to_json $rmp; 2731 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2554 my $md5 = Digest::MD5::md5_hex $data; 2732 my $md5 = Digest::MD5::md5_hex $data;
2555 my $meta = "$RANDOMDIR/$md5.meta"; 2733 my $meta = "$RANDOMDIR/$md5.meta";
2556 2734
2557 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2735 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2558 aio_write $fh, 0, (length $data), $data, 0; 2736 aio_write $fh, 0, (length $data), $data, 0;
2559 undef $fh; 2737 undef $fh;
2560 aio_rename "$meta~", $meta; 2738 aio_rename "$meta~", $meta;
2561 2739
2740 my $slaying = "?random/$md5";
2741
2742 if ($exit->valid) {
2562 $exit->slaying ("?random/$md5"); 2743 $exit->slaying ("?random/$md5");
2563 $exit->msg (undef); 2744 $exit->msg (undef);
2745 }
2564 } 2746 }
2565} 2747}
2566 2748
2567sub cf::object::player::enter_exit { 2749sub cf::object::player::enter_exit {
2568 my ($self, $exit) = @_; 2750 my ($self, $exit) = @_;
2569 2751
2570 return unless $self->type == cf::PLAYER; 2752 return unless $self->type == cf::PLAYER;
2571 2753
2572 if ($exit->slaying eq "/!") {
2573 #TODO: this should de-fi-ni-te-ly not be a sync-job
2574 # the problem is that $exit might not survive long enough
2575 # so it needs to be done right now, right here
2576 cf::sync_job { prepare_random_map $exit };
2577 }
2578
2579 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2580 my $hp = $exit->stats->hp;
2581 my $sp = $exit->stats->sp;
2582
2583 $self->enter_link; 2754 $self->enter_link;
2584 2755
2585 # if exit is damned, update players death & WoR home-position
2586 $self->contr->savebed ($slaying, $hp, $sp)
2587 if $exit->flag (FLAG_DAMNED);
2588
2589 (async { 2756 (async {
2590 $self->deactivate_recursive; # just to be sure 2757 $Coro::current->{desc} = "enter_exit";
2758
2591 unless (eval { 2759 unless (eval {
2760 $self->deactivate_recursive; # just to be sure
2761
2762 # random map handling
2763 {
2764 my $guard = cf::lock_acquire "exit_prepare:$exit";
2765
2766 prepare_random_map $exit
2767 if $exit->slaying eq "/!";
2768 }
2769
2770 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2771 my $x = $exit->stats->hp;
2772 my $y = $exit->stats->sp;
2773
2592 $self->goto ($slaying, $hp, $sp); 2774 $self->goto ($map, $x, $y);
2593 2775
2776 # if exit is damned, update players death & WoR home-position
2777 $self->contr->savebed ($map, $x, $y)
2778 if $exit->flag (cf::FLAG_DAMNED);
2779
2594 1; 2780 1
2595 }) { 2781 }) {
2596 $self->message ("Something went wrong deep within the crossfire server. " 2782 $self->message ("Something went wrong deep within the crossfire server. "
2597 . "I'll try to bring you back to the map you were before. " 2783 . "I'll try to bring you back to the map you were before. "
2598 . "Please report this to the dungeon master!", 2784 . "Please report this to the dungeon master!",
2599 cf::NDI_UNIQUE | cf::NDI_RED); 2785 cf::NDI_UNIQUE | cf::NDI_RED);
2629the message, with C<log> being the default. If C<$color> is negative, suppress 2815the message, with C<log> being the default. If C<$color> is negative, suppress
2630the message unless the client supports the msg packet. 2816the message unless the client supports the msg packet.
2631 2817
2632=cut 2818=cut
2633 2819
2820# non-persistent channels (usually the info channel)
2634our %CHANNEL = ( 2821our %CHANNEL = (
2635 "c/identify" => { 2822 "c/identify" => {
2636 id => "identify", 2823 id => "infobox",
2637 title => "Identify", 2824 title => "Identify",
2638 reply => undef, 2825 reply => undef,
2639 tooltip => "Items recently identified", 2826 tooltip => "Items recently identified",
2640 }, 2827 },
2641 "c/examine" => { 2828 "c/examine" => {
2642 id => "examine", 2829 id => "infobox",
2643 title => "Examine", 2830 title => "Examine",
2644 reply => undef, 2831 reply => undef,
2645 tooltip => "Signs and other items you examined", 2832 tooltip => "Signs and other items you examined",
2646 }, 2833 },
2834 "c/book" => {
2835 id => "infobox",
2836 title => "Book",
2837 reply => undef,
2838 tooltip => "The contents of a note or book",
2839 },
2840 "c/lookat" => {
2841 id => "infobox",
2842 title => "Look",
2843 reply => undef,
2844 tooltip => "What you saw there",
2845 },
2846 "c/who" => {
2847 id => "infobox",
2848 title => "Players",
2849 reply => undef,
2850 tooltip => "Shows players who are currently online",
2851 },
2852 "c/body" => {
2853 id => "infobox",
2854 title => "Body Parts",
2855 reply => undef,
2856 tooltip => "Shows which body parts you posess and are available",
2857 },
2858 "c/uptime" => {
2859 id => "infobox",
2860 title => "Uptime",
2861 reply => undef,
2862 tooltip => "How long the server has been running since last restart",
2863 },
2864 "c/mapinfo" => {
2865 id => "infobox",
2866 title => "Map Info",
2867 reply => undef,
2868 tooltip => "Information related to the maps",
2869 },
2870 "c/party" => {
2871 id => "party",
2872 title => "Party",
2873 reply => "gsay ",
2874 tooltip => "Messages and chat related to your party",
2875 },
2647); 2876);
2648 2877
2649sub cf::client::send_msg { 2878sub cf::client::send_msg {
2650 my ($self, $channel, $msg, $color, @extra) = @_; 2879 my ($self, $channel, $msg, $color, @extra) = @_;
2651 2880
2652 $msg = $self->pl->expand_cfpod ($msg); 2881 $msg = $self->pl->expand_cfpod ($msg);
2653 2882
2654 $color &= cf::NDI_CLIENT_MASK; # just in case... 2883 $color &= cf::NDI_CLIENT_MASK; # just in case...
2655 2884
2656 # check predefined channels, for the benefit of C 2885 # check predefined channels, for the benefit of C
2657 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2886 if ($CHANNEL{$channel}) {
2887 $channel = $CHANNEL{$channel};
2658 2888
2889 $self->ext_msg (channel_info => $channel)
2890 if $self->can_msg;
2891
2892 $channel = $channel->{id};
2893
2659 if (ref $channel) { 2894 } elsif (ref $channel) {
2660 # send meta info to client, if not yet sent 2895 # send meta info to client, if not yet sent
2661 unless (exists $self->{channel}{$channel->{id}}) { 2896 unless (exists $self->{channel}{$channel->{id}}) {
2662 $self->{channel}{$channel->{id}} = $channel; 2897 $self->{channel}{$channel->{id}} = $channel;
2663 $self->ext_msg (channel_info => $channel) 2898 $self->ext_msg (channel_info => $channel)
2664 if $self->can_msg; 2899 if $self->can_msg;
2881=pod 3116=pod
2882 3117
2883The following functions and methods are available within a safe environment: 3118The following functions and methods are available within a safe environment:
2884 3119
2885 cf::object 3120 cf::object
2886 contr pay_amount pay_player map x y force_find force_add 3121 contr pay_amount pay_player map x y force_find force_add destroy
2887 insert remove name archname title slaying race decrease_ob_nr 3122 insert remove name archname title slaying race decrease split
2888 3123
2889 cf::object::player 3124 cf::object::player
2890 player 3125 player
2891 3126
2892 cf::player 3127 cf::player
2897 3132
2898=cut 3133=cut
2899 3134
2900for ( 3135for (
2901 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3136 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2902 insert remove inv name archname title slaying race 3137 insert remove inv nrof name archname title slaying race
2903 decrease_ob_nr)], 3138 decrease split destroy change_exp)],
2904 ["cf::object::player" => qw(player)], 3139 ["cf::object::player" => qw(player)],
2905 ["cf::player" => qw(peaceful)], 3140 ["cf::player" => qw(peaceful)],
2906 ["cf::map" => qw(trigger)], 3141 ["cf::map" => qw(trigger)],
2907) { 3142) {
2908 no strict 'refs'; 3143 no strict 'refs';
3013 { 3248 {
3014 my $faces = $facedata->{faceinfo}; 3249 my $faces = $facedata->{faceinfo};
3015 3250
3016 while (my ($face, $info) = each %$faces) { 3251 while (my ($face, $info) = each %$faces) {
3017 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3252 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3253
3018 cf::face::set_visibility $idx, $info->{visibility}; 3254 cf::face::set_visibility $idx, $info->{visibility};
3019 cf::face::set_magicmap $idx, $info->{magicmap}; 3255 cf::face::set_magicmap $idx, $info->{magicmap};
3020 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3256 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3021 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3257 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3022 3258
3023 cf::cede_to_tick; 3259 cf::cede_to_tick;
3024 } 3260 }
3025 3261
3026 while (my ($face, $info) = each %$faces) { 3262 while (my ($face, $info) = each %$faces) {
3027 next unless $info->{smooth}; 3263 next unless $info->{smooth};
3264
3028 my $idx = cf::face::find $face 3265 my $idx = cf::face::find $face
3029 or next; 3266 or next;
3267
3030 if (my $smooth = cf::face::find $info->{smooth}) { 3268 if (my $smooth = cf::face::find $info->{smooth}) {
3031 cf::face::set_smooth $idx, $smooth; 3269 cf::face::set_smooth $idx, $smooth;
3032 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3270 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3033 } else { 3271 } else {
3034 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3272 warn "smooth face '$info->{smooth}' not found for face '$face'";
3052 { 3290 {
3053 # TODO: for gcfclient pleasure, we should give resources 3291 # TODO: for gcfclient pleasure, we should give resources
3054 # that gcfclient doesn't grok a >10000 face index. 3292 # that gcfclient doesn't grok a >10000 face index.
3055 my $res = $facedata->{resource}; 3293 my $res = $facedata->{resource};
3056 3294
3057 my $soundconf = delete $res->{"res/sound.conf"};
3058
3059 while (my ($name, $info) = each %$res) { 3295 while (my ($name, $info) = each %$res) {
3296 if (defined $info->{type}) {
3060 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3297 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3061 my $data; 3298 my $data;
3062 3299
3063 if ($info->{type} & 1) { 3300 if ($info->{type} & 1) {
3064 # prepend meta info 3301 # prepend meta info
3065 3302
3066 my $meta = $enc->encode ({ 3303 my $meta = $enc->encode ({
3067 name => $name, 3304 name => $name,
3068 %{ $info->{meta} || {} }, 3305 %{ $info->{meta} || {} },
3069 }); 3306 });
3070 3307
3071 $data = pack "(w/a*)*", $meta, $info->{data}; 3308 $data = pack "(w/a*)*", $meta, $info->{data};
3309 } else {
3310 $data = $info->{data};
3311 }
3312
3313 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3314 cf::face::set_type $idx, $info->{type};
3072 } else { 3315 } else {
3073 $data = $info->{data}; 3316 $RESOURCE{$name} = $info;
3074 } 3317 }
3075 3318
3076 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3077 cf::face::set_type $idx, $info->{type};
3078
3079 cf::cede_to_tick; 3319 cf::cede_to_tick;
3080 } 3320 }
3081
3082 if ($soundconf) {
3083 $soundconf = $enc->decode (delete $soundconf->{data});
3084
3085 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3086 my $sound = $soundconf->{compat}[$_]
3087 or next;
3088
3089 my $face = cf::face::find "sound/$sound->[1]";
3090 cf::sound::set $sound->[0] => $face;
3091 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3092 }
3093
3094 while (my ($k, $v) = each %{$soundconf->{event}}) {
3095 my $face = cf::face::find "sound/$v";
3096 cf::sound::set $k => $face;
3097 }
3098 }
3099 } 3321 }
3322
3323 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3100 3324
3101 1 3325 1
3102} 3326}
3327
3328cf::global->attach (on_resource_update => sub {
3329 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3330 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3331
3332 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3333 my $sound = $soundconf->{compat}[$_]
3334 or next;
3335
3336 my $face = cf::face::find "sound/$sound->[1]";
3337 cf::sound::set $sound->[0] => $face;
3338 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3339 }
3340
3341 while (my ($k, $v) = each %{$soundconf->{event}}) {
3342 my $face = cf::face::find "sound/$v";
3343 cf::sound::set $k => $face;
3344 }
3345 }
3346});
3103 3347
3104register_exticmd fx_want => sub { 3348register_exticmd fx_want => sub {
3105 my ($ns, $want) = @_; 3349 my ($ns, $want) = @_;
3106 3350
3107 while (my ($k, $v) = each %$want) { 3351 while (my ($k, $v) = each %$want) {
3108 $ns->fx_want ($k, $v); 3352 $ns->fx_want ($k, $v);
3109 } 3353 }
3110}; 3354};
3355
3356sub load_resource_file($) {
3357 my $guard = lock_acquire "load_resource_file";
3358
3359 my $status = load_resource_file_ $_[0];
3360 get_slot 0.1, 100;
3361 cf::arch::commit_load;
3362
3363 $status
3364}
3111 3365
3112sub reload_regions { 3366sub reload_regions {
3113 # HACK to clear player env face cache, we need some signal framework 3367 # HACK to clear player env face cache, we need some signal framework
3114 # for this (global event?) 3368 # for this (global event?)
3115 %ext::player_env::MUSIC_FACE_CACHE = (); 3369 %ext::player_env::MUSIC_FACE_CACHE = ();
3129} 3383}
3130 3384
3131sub reload_archetypes { 3385sub reload_archetypes {
3132 load_resource_file "$DATADIR/archetypes" 3386 load_resource_file "$DATADIR/archetypes"
3133 or die "unable to load archetypes\n"; 3387 or die "unable to load archetypes\n";
3134 #d# NEED to laod twice to resolve forward references
3135 # this really needs to be done in an extra post-pass
3136 # (which needs to be synchronous, so solve it differently)
3137 load_resource_file "$DATADIR/archetypes"
3138 or die "unable to load archetypes\n";
3139} 3388}
3140 3389
3141sub reload_treasures { 3390sub reload_treasures {
3142 load_resource_file "$DATADIR/treasures" 3391 load_resource_file "$DATADIR/treasures"
3143 or die "unable to load treasurelists\n"; 3392 or die "unable to load treasurelists\n";
3144} 3393}
3145 3394
3146sub reload_resources { 3395sub reload_resources {
3147 warn "reloading resource files...\n"; 3396 warn "reloading resource files...\n";
3148 3397
3398 reload_facedata;
3399 reload_archetypes;
3149 reload_regions; 3400 reload_regions;
3150 reload_facedata;
3151 #reload_archetypes;#d#
3152 reload_archetypes;
3153 reload_treasures; 3401 reload_treasures;
3154 3402
3155 warn "finished reloading resource files\n"; 3403 warn "finished reloading resource files\n";
3156} 3404}
3157 3405
3158sub init { 3406sub init {
3407 my $guard = freeze_mainloop;
3408
3409 evthread_start IO::AIO::poll_fileno;
3410
3159 reload_resources; 3411 reload_resources;
3160} 3412}
3161 3413
3162sub reload_config { 3414sub reload_config {
3163 open my $fh, "<:utf8", "$CONFDIR/config" 3415 open my $fh, "<:utf8", "$CONFDIR/config"
3164 or return; 3416 or return;
3165 3417
3166 local $/; 3418 local $/;
3167 *CFG = YAML::Syck::Load <$fh>; 3419 *CFG = YAML::Load <$fh>;
3168 3420
3169 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3421 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3170 3422
3171 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3423 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3172 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3424 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3183sub main { 3435sub main {
3184 # we must not ever block the main coroutine 3436 # we must not ever block the main coroutine
3185 local $Coro::idle = sub { 3437 local $Coro::idle = sub {
3186 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3438 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3187 (async { 3439 (async {
3188 Event::one_event; 3440 $Coro::current->{desc} = "IDLE BUG HANDLER";
3441 EV::loop EV::LOOP_ONESHOT;
3189 })->prio (Coro::PRIO_MAX); 3442 })->prio (Coro::PRIO_MAX);
3190 }; 3443 };
3191 3444
3445 {
3446 my $guard = freeze_mainloop;
3192 reload_config; 3447 reload_config;
3193 db_init; 3448 db_init;
3194 load_extensions; 3449 load_extensions;
3195 3450
3196 $TICK_WATCHER->start; 3451 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3452 }
3453
3197 Event::loop; 3454 EV::loop;
3198} 3455}
3199 3456
3200############################################################################# 3457#############################################################################
3201# initialisation and cleanup 3458# initialisation and cleanup
3202 3459
3203# install some emergency cleanup handlers 3460# install some emergency cleanup handlers
3204BEGIN { 3461BEGIN {
3462 our %SIGWATCHER = ();
3205 for my $signal (qw(INT HUP TERM)) { 3463 for my $signal (qw(INT HUP TERM)) {
3206 Event->signal ( 3464 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3207 reentrant => 0,
3208 data => WF_AUTOCANCEL,
3209 signal => $signal,
3210 prio => 0,
3211 cb => sub {
3212 cf::cleanup "SIG$signal"; 3465 cf::cleanup "SIG$signal";
3213 },
3214 ); 3466 };
3215 } 3467 }
3216} 3468}
3217 3469
3218sub write_runtime { 3470sub write_runtime_sync {
3219 my $runtime = "$LOCALDIR/runtime"; 3471 my $runtime = "$LOCALDIR/runtime";
3220 3472
3221 # first touch the runtime file to show we are still running: 3473 # first touch the runtime file to show we are still running:
3222 # the fsync below can take a very very long time. 3474 # the fsync below can take a very very long time.
3223 3475
3249 and return; 3501 and return;
3250 3502
3251 warn "runtime file written.\n"; 3503 warn "runtime file written.\n";
3252 3504
3253 1 3505 1
3506}
3507
3508our $uuid_lock;
3509our $uuid_skip;
3510
3511sub write_uuid_sync($) {
3512 $uuid_skip ||= $_[0];
3513
3514 return if $uuid_lock;
3515 local $uuid_lock = 1;
3516
3517 my $uuid = "$LOCALDIR/uuid";
3518
3519 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3520 or return;
3521
3522 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3523 $uuid_skip = 0;
3524
3525 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3526 and return;
3527
3528 # always fsync - this file is important
3529 aio_fsync $fh
3530 and return;
3531
3532 close $fh
3533 or return;
3534
3535 aio_rename "$uuid~", $uuid
3536 and return;
3537
3538 warn "uuid file written ($value).\n";
3539
3540 1
3541
3542}
3543
3544sub write_uuid($$) {
3545 my ($skip, $sync) = @_;
3546
3547 $sync ? write_uuid_sync $skip
3548 : async { write_uuid_sync $skip };
3254} 3549}
3255 3550
3256sub emergency_save() { 3551sub emergency_save() {
3257 my $freeze_guard = cf::freeze_mainloop; 3552 my $freeze_guard = cf::freeze_mainloop;
3258 3553
3264 # and maps saved/destroyed asynchronously. 3559 # and maps saved/destroyed asynchronously.
3265 warn "begin emergency player save\n"; 3560 warn "begin emergency player save\n";
3266 for my $login (keys %cf::PLAYER) { 3561 for my $login (keys %cf::PLAYER) {
3267 my $pl = $cf::PLAYER{$login} or next; 3562 my $pl = $cf::PLAYER{$login} or next;
3268 $pl->valid or next; 3563 $pl->valid or next;
3564 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3269 $pl->save; 3565 $pl->save;
3270 } 3566 }
3271 warn "end emergency player save\n"; 3567 warn "end emergency player save\n";
3272 3568
3273 warn "begin emergency map save\n"; 3569 warn "begin emergency map save\n";
3279 warn "end emergency map save\n"; 3575 warn "end emergency map save\n";
3280 3576
3281 warn "begin emergency database checkpoint\n"; 3577 warn "begin emergency database checkpoint\n";
3282 BDB::db_env_txn_checkpoint $DB_ENV; 3578 BDB::db_env_txn_checkpoint $DB_ENV;
3283 warn "end emergency database checkpoint\n"; 3579 warn "end emergency database checkpoint\n";
3580
3581 warn "begin write uuid\n";
3582 write_uuid_sync 1;
3583 warn "end write uuid\n";
3284 }; 3584 };
3285 3585
3286 warn "leave emergency perl save\n"; 3586 warn "leave emergency perl save\n";
3287} 3587}
3288 3588
3290 my ($make_core) = @_; 3590 my ($make_core) = @_;
3291 3591
3292 warn Carp::longmess "post_cleanup backtrace" 3592 warn Carp::longmess "post_cleanup backtrace"
3293 if $make_core; 3593 if $make_core;
3294} 3594}
3595
3596# a safer delete_package, copied from Symbol
3597sub clear_package($) {
3598 my $pkg = shift;
3599
3600 # expand to full symbol table name if needed
3601 unless ($pkg =~ /^main::.*::$/) {
3602 $pkg = "main$pkg" if $pkg =~ /^::/;
3603 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3604 $pkg .= '::' unless $pkg =~ /::$/;
3605 }
3606
3607 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3608 my $stem_symtab = *{$stem}{HASH};
3609
3610 defined $stem_symtab and exists $stem_symtab->{$leaf}
3611 or return;
3612
3613 # clear all symbols
3614 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3615 for my $name (keys %$leaf_symtab) {
3616 _gv_clear *{"$pkg$name"};
3617# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3618 }
3619 warn "cleared package #$pkg\n";#d#
3620}
3621
3622our $RELOAD; # how many times to reload
3295 3623
3296sub do_reload_perl() { 3624sub do_reload_perl() {
3297 # can/must only be called in main 3625 # can/must only be called in main
3298 if ($Coro::current != $Coro::main) { 3626 if ($Coro::current != $Coro::main) {
3299 warn "can only reload from main coroutine"; 3627 warn "can only reload from main coroutine";
3300 return; 3628 return;
3301 } 3629 }
3302 3630
3631 return if $RELOAD++;
3632
3633 while ($RELOAD) {
3303 warn "reloading..."; 3634 warn "reloading...";
3304 3635
3305 warn "entering sync_job"; 3636 warn "entering sync_job";
3306 3637
3307 cf::sync_job { 3638 cf::sync_job {
3308 cf::write_runtime; # external watchdog should not bark 3639 cf::write_runtime_sync; # external watchdog should not bark
3309 cf::emergency_save; 3640 cf::emergency_save;
3310 cf::write_runtime; # external watchdog should not bark 3641 cf::write_runtime_sync; # external watchdog should not bark
3311 3642
3312 warn "syncing database to disk"; 3643 warn "syncing database to disk";
3313 BDB::db_env_txn_checkpoint $DB_ENV; 3644 BDB::db_env_txn_checkpoint $DB_ENV;
3314 3645
3315 # if anything goes wrong in here, we should simply crash as we already saved 3646 # if anything goes wrong in here, we should simply crash as we already saved
3316 3647
3317 warn "cancelling all WF_AUTOCANCEL watchers";
3318 for (Event::all_watchers) {
3319 $_->cancel if $_->data & WF_AUTOCANCEL;
3320 }
3321
3322 warn "flushing outstanding aio requests"; 3648 warn "flushing outstanding aio requests";
3323 for (;;) {
3324 BDB::flush;
3325 IO::AIO::flush;
3326 Coro::cede;
3327 last unless IO::AIO::nreqs || BDB::nreqs; 3649 while (IO::AIO::nreqs || BDB::nreqs) {
3328 warn "iterate..."; 3650 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3329 }
3330
3331 ++$RELOAD;
3332
3333 warn "cancelling all extension coros";
3334 $_->cancel for values %EXT_CORO;
3335 %EXT_CORO = ();
3336
3337 warn "removing commands";
3338 %COMMAND = ();
3339
3340 warn "removing ext/exti commands";
3341 %EXTCMD = ();
3342 %EXTICMD = ();
3343
3344 warn "unloading/nuking all extensions";
3345 for my $pkg (@EXTS) {
3346 warn "... unloading $pkg";
3347
3348 if (my $cb = $pkg->can ("unload")) {
3349 eval {
3350 $cb->($pkg);
3351 1
3352 } or warn "$pkg unloaded, but with errors: $@";
3353 } 3651 }
3354 3652
3355 warn "... nuking $pkg"; 3653 warn "cancelling all extension coros";
3356 Symbol::delete_package $pkg; 3654 $_->cancel for values %EXT_CORO;
3357 } 3655 %EXT_CORO = ();
3358 3656
3359 warn "unloading all perl modules loaded from $LIBDIR"; 3657 warn "removing commands";
3360 while (my ($k, $v) = each %INC) { 3658 %COMMAND = ();
3361 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3362 3659
3660 warn "removing ext/exti commands";
3661 %EXTCMD = ();
3662 %EXTICMD = ();
3663
3664 warn "unloading/nuking all extensions";
3665 for my $pkg (@EXTS) {
3363 warn "... unloading $k"; 3666 warn "... unloading $pkg";
3364 delete $INC{$k};
3365 3667
3366 $k =~ s/\.pm$//;
3367 $k =~ s/\//::/g;
3368
3369 if (my $cb = $k->can ("unload_module")) { 3668 if (my $cb = $pkg->can ("unload")) {
3669 eval {
3370 $cb->(); 3670 $cb->($pkg);
3671 1
3672 } or warn "$pkg unloaded, but with errors: $@";
3673 }
3674
3675 warn "... clearing $pkg";
3676 clear_package $pkg;
3371 } 3677 }
3372 3678
3373 Symbol::delete_package $k; 3679 warn "unloading all perl modules loaded from $LIBDIR";
3680 while (my ($k, $v) = each %INC) {
3681 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3682
3683 warn "... unloading $k";
3684 delete $INC{$k};
3685
3686 $k =~ s/\.pm$//;
3687 $k =~ s/\//::/g;
3688
3689 if (my $cb = $k->can ("unload_module")) {
3690 $cb->();
3691 }
3692
3693 clear_package $k;
3374 } 3694 }
3375 3695
3376 warn "getting rid of safe::, as good as possible"; 3696 warn "getting rid of safe::, as good as possible";
3377 Symbol::delete_package "safe::$_" 3697 clear_package "safe::$_"
3378 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3698 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3379 3699
3380 warn "unloading cf.pm \"a bit\""; 3700 warn "unloading cf.pm \"a bit\"";
3381 delete $INC{"cf.pm"}; 3701 delete $INC{"cf.pm"};
3382 delete $INC{"cf/pod.pm"}; 3702 delete $INC{"cf/pod.pm"};
3383 3703
3384 # don't, removes xs symbols, too, 3704 # don't, removes xs symbols, too,
3385 # and global variables created in xs 3705 # and global variables created in xs
3386 #Symbol::delete_package __PACKAGE__; 3706 #clear_package __PACKAGE__;
3387 3707
3388 warn "unload completed, starting to reload now"; 3708 warn "unload completed, starting to reload now";
3389 3709
3390 warn "reloading cf.pm"; 3710 warn "reloading cf.pm";
3391 require cf; 3711 require cf;
3392 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3712 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3393 3713
3394 warn "loading config and database again"; 3714 warn "loading config and database again";
3395 cf::reload_config; 3715 cf::reload_config;
3396 3716
3397 warn "loading extensions"; 3717 warn "loading extensions";
3398 cf::load_extensions; 3718 cf::load_extensions;
3399 3719
3400 warn "reattaching attachments to objects/players"; 3720 warn "reattaching attachments to objects/players";
3401 _global_reattach; # objects, sockets 3721 _global_reattach; # objects, sockets
3402 warn "reattaching attachments to maps"; 3722 warn "reattaching attachments to maps";
3403 reattach $_ for values %MAP; 3723 reattach $_ for values %MAP;
3404 warn "reattaching attachments to players"; 3724 warn "reattaching attachments to players";
3405 reattach $_ for values %PLAYER; 3725 reattach $_ for values %PLAYER;
3406 3726
3407 warn "leaving sync_job"; 3727 warn "leaving sync_job";
3408 3728
3409 1 3729 1
3410 } or do { 3730 } or do {
3411 warn $@; 3731 warn $@;
3412 warn "error while reloading, exiting."; 3732 cf::cleanup "error while reloading, exiting.";
3413 exit 1;
3414 }; 3733 };
3415 3734
3416 warn "reloaded"; 3735 warn "reloaded";
3736 --$RELOAD;
3737 }
3417}; 3738};
3418 3739
3419our $RELOAD_WATCHER; # used only during reload 3740our $RELOAD_WATCHER; # used only during reload
3420 3741
3421sub reload_perl() { 3742sub reload_perl() {
3422 # doing reload synchronously and two reloads happen back-to-back, 3743 # doing reload synchronously and two reloads happen back-to-back,
3423 # coro crashes during coro_state_free->destroy here. 3744 # coro crashes during coro_state_free->destroy here.
3424 3745
3425 $RELOAD_WATCHER ||= Event->timer ( 3746 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3426 reentrant => 0,
3427 after => 0,
3428 data => WF_AUTOCANCEL,
3429 cb => sub {
3430 do_reload_perl; 3747 do_reload_perl;
3431 undef $RELOAD_WATCHER; 3748 undef $RELOAD_WATCHER;
3432 },
3433 ); 3749 };
3434} 3750}
3435 3751
3436register_command "reload" => sub { 3752register_command "reload" => sub {
3437 my ($who, $arg) = @_; 3753 my ($who, $arg) = @_;
3438 3754
3439 if ($who->flag (FLAG_WIZ)) { 3755 if ($who->flag (FLAG_WIZ)) {
3440 $who->message ("reloading server."); 3756 $who->message ("reloading server.");
3757 async {
3758 $Coro::current->{desc} = "perl_reload";
3441 async { reload_perl }; 3759 reload_perl;
3760 };
3442 } 3761 }
3443}; 3762};
3444 3763
3445unshift @INC, $LIBDIR; 3764unshift @INC, $LIBDIR;
3446 3765
3448 3767
3449our @WAIT_FOR_TICK; 3768our @WAIT_FOR_TICK;
3450our @WAIT_FOR_TICK_BEGIN; 3769our @WAIT_FOR_TICK_BEGIN;
3451 3770
3452sub wait_for_tick { 3771sub wait_for_tick {
3453 return unless $TICK_WATCHER->is_active;
3454 return if $Coro::current == $Coro::main; 3772 return if tick_inhibit || $Coro::current == $Coro::main;
3455 3773
3456 my $signal = new Coro::Signal; 3774 my $signal = new Coro::Signal;
3457 push @WAIT_FOR_TICK, $signal; 3775 push @WAIT_FOR_TICK, $signal;
3458 $signal->wait; 3776 $signal->wait;
3459} 3777}
3460 3778
3461sub wait_for_tick_begin { 3779sub wait_for_tick_begin {
3462 return unless $TICK_WATCHER->is_active;
3463 return if $Coro::current == $Coro::main; 3780 return if tick_inhibit || $Coro::current == $Coro::main;
3464 3781
3465 my $signal = new Coro::Signal; 3782 my $signal = new Coro::Signal;
3466 push @WAIT_FOR_TICK_BEGIN, $signal; 3783 push @WAIT_FOR_TICK_BEGIN, $signal;
3467 $signal->wait; 3784 $signal->wait;
3468} 3785}
3469 3786
3470$TICK_WATCHER = Event->timer ( 3787sub tick {
3471 reentrant => 0,
3472 parked => 1,
3473 prio => 0,
3474 at => $NEXT_TICK || $TICK,
3475 data => WF_AUTOCANCEL,
3476 cb => sub {
3477 if ($Coro::current != $Coro::main) { 3788 if ($Coro::current != $Coro::main) {
3478 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3789 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3479 unless ++$bug_warning > 10; 3790 unless ++$bug_warning > 10;
3480 return; 3791 return;
3481 } 3792 }
3482 3793
3483 $NOW = $tick_start = Event::time;
3484
3485 cf::server_tick; # one server iteration 3794 cf::server_tick; # one server iteration
3486 3795
3487 $RUNTIME += $TICK;
3488 $NEXT_TICK += $TICK;
3489
3490 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3796 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3491 $NEXT_RUNTIME_WRITE = $NOW + 10; 3797 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3492 Coro::async_pool { 3798 Coro::async_pool {
3799 $Coro::current->{desc} = "runtime saver";
3493 write_runtime 3800 write_runtime_sync
3494 or warn "ERROR: unable to write runtime file: $!"; 3801 or warn "ERROR: unable to write runtime file: $!";
3495 };
3496 } 3802 };
3803 }
3497 3804
3498 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3805 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3499 $sig->send; 3806 $sig->send;
3500 } 3807 }
3501 while (my $sig = shift @WAIT_FOR_TICK) { 3808 while (my $sig = shift @WAIT_FOR_TICK) {
3502 $sig->send; 3809 $sig->send;
3503 } 3810 }
3504 3811
3505 $NOW = Event::time; 3812 $LOAD = ($NOW - $TICK_START) / $TICK;
3506
3507 # if we are delayed by four ticks or more, skip them all
3508 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3509
3510 $TICK_WATCHER->at ($NEXT_TICK);
3511 $TICK_WATCHER->start;
3512
3513 $LOAD = ($NOW - $tick_start) / $TICK;
3514 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3813 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3515 3814
3516 _post_tick; 3815 if (0) {
3816 if ($NEXT_TICK) {
3817 my $jitter = $TICK_START - $NEXT_TICK;
3818 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3819 warn "jitter $JITTER\n";#d#
3820 }
3517 }, 3821 }
3518); 3822}
3519 3823
3520{ 3824{
3825 # configure BDB
3826
3521 BDB::min_parallel 8; 3827 BDB::min_parallel 8;
3522 BDB::max_poll_time $TICK * 0.1; 3828 BDB::max_poll_reqs $TICK * 0.1;
3523 $BDB_POLL_WATCHER = Event->io ( 3829 $AnyEvent::BDB::WATCHER->priority (1);
3524 reentrant => 0,
3525 fd => BDB::poll_fileno,
3526 poll => 'r',
3527 prio => 0,
3528 data => WF_AUTOCANCEL,
3529 cb => \&BDB::poll_cb,
3530 );
3531
3532 BDB::set_sync_prepare {
3533 my $status;
3534 my $current = $Coro::current;
3535 (
3536 sub {
3537 $status = $!;
3538 $current->ready; undef $current;
3539 },
3540 sub {
3541 Coro::schedule while defined $current;
3542 $! = $status;
3543 },
3544 )
3545 };
3546 3830
3547 unless ($DB_ENV) { 3831 unless ($DB_ENV) {
3548 $DB_ENV = BDB::db_env_create; 3832 $DB_ENV = BDB::db_env_create;
3549 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3833 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3550 | BDB::LOG_AUTOREMOVE, 1); 3834 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3835 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3551 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3836 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3552 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3837 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3553 3838
3554 cf::sync_job { 3839 cf::sync_job {
3555 eval { 3840 eval {
3565 3850
3566 cf::cleanup "db_env_open(db): $@" if $@; 3851 cf::cleanup "db_env_open(db): $@" if $@;
3567 }; 3852 };
3568 } 3853 }
3569 3854
3570 $BDB_DEADLOCK_WATCHER = Event->timer ( 3855 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3571 after => 3,
3572 interval => 1,
3573 hard => 1,
3574 prio => 0,
3575 data => WF_AUTOCANCEL,
3576 cb => sub {
3577 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3856 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3578 },
3579 ); 3857 };
3580 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3858 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3581 after => 11,
3582 interval => 60,
3583 hard => 1,
3584 prio => 0,
3585 data => WF_AUTOCANCEL,
3586 cb => sub {
3587 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3859 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3588 },
3589 ); 3860 };
3590 $BDB_TRICKLE_WATCHER = Event->timer ( 3861 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3591 after => 5,
3592 interval => 10,
3593 hard => 1,
3594 prio => 0,
3595 data => WF_AUTOCANCEL,
3596 cb => sub {
3597 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3862 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3598 },
3599 ); 3863 };
3600} 3864}
3601 3865
3602{ 3866{
3867 # configure IO::AIO
3868
3603 IO::AIO::min_parallel 8; 3869 IO::AIO::min_parallel 8;
3604
3605 undef $Coro::AIO::WATCHER;
3606 IO::AIO::max_poll_time $TICK * 0.1; 3870 IO::AIO::max_poll_time $TICK * 0.1;
3607 $AIO_POLL_WATCHER = Event->io ( 3871 undef $AnyEvent::AIO::WATCHER;
3608 reentrant => 0,
3609 data => WF_AUTOCANCEL,
3610 fd => IO::AIO::poll_fileno,
3611 poll => 'r',
3612 prio => 6,
3613 cb => \&IO::AIO::poll_cb,
3614 );
3615} 3872}
3616 3873
3617my $_log_backtrace; 3874my $_log_backtrace;
3618 3875
3619sub _log_backtrace { 3876sub _log_backtrace {
3623 3880
3624 # limit the # of concurrent backtraces 3881 # limit the # of concurrent backtraces
3625 if ($_log_backtrace < 2) { 3882 if ($_log_backtrace < 2) {
3626 ++$_log_backtrace; 3883 ++$_log_backtrace;
3627 async { 3884 async {
3885 $Coro::current->{desc} = "abt $msg";
3886
3628 my @bt = fork_call { 3887 my @bt = fork_call {
3629 @addr = map { sprintf "%x", $_ } @addr; 3888 @addr = map { sprintf "%x", $_ } @addr;
3630 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3889 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3631 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3890 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3632 or die "addr2line: $!"; 3891 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines