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.441 by root, Sat Aug 30 05:19:03 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
1515 1625
1516Expand crossfire pod fragments into protocol xml. 1626Expand crossfire pod fragments into protocol xml.
1517 1627
1518=cut 1628=cut
1519 1629
1630use re 'eval';
1631
1632my $group;
1633my $interior; $interior = qr{
1634 # match a pod interior sequence sans C<< >>
1635 (?:
1636 \ (.*?)\ (?{ $group = $^N })
1637 | < (??{$interior}) >
1638 )
1639}x;
1640
1520sub expand_cfpod { 1641sub expand_cfpod {
1521 ((my $self), (local $_)) = @_; 1642 my ($self, $pod) = @_;
1522 1643
1523 # escape & and < 1644 my $xml;
1524 s/&/&amp;/g;
1525 s/(?<![BIUGHT])</&lt;/g;
1526 1645
1527 # this is buggy, it needs to properly take care of nested <'s 1646 while () {
1647 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1648 $group = $1;
1528 1649
1529 1 while 1650 $group =~ s/&/&amp;/g;
1530 # replace B<>, I<>, U<> etc. 1651 $group =~ s/</&lt;/g;
1531 s/B<([^\>]*)>/<b>$1<\/b>/ 1652
1532 || s/I<([^\>]*)>/<i>$1<\/i>/ 1653 $xml .= $group;
1533 || s/U<([^\>]*)>/<u>$1<\/u>/ 1654 } elsif ($pod =~ m%\G
1534 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1655 ([BCGHITU])
1535 # replace G<male|female> tags 1656 <
1536 || s{G<([^>|]*)\|([^>]*)>}{ 1657 (?:
1537 $self->gender ? $2 : $1 1658 ([^<>]*) (?{ $group = $^N })
1538 }ge 1659 | < $interior >
1539 # replace H<hint text> 1660 )
1540 || s{H<([^\>]*)>} 1661 >
1662 %gcsx
1541 { 1663 ) {
1664 my ($code, $data) = ($1, $group);
1665
1666 if ($code eq "B") {
1667 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1668 } elsif ($code eq "I") {
1669 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1670 } elsif ($code eq "U") {
1671 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1672 } elsif ($code eq "C") {
1673 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1674 } elsif ($code eq "T") {
1675 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1676 } elsif ($code eq "G") {
1677 my ($male, $female) = split /\|/, $data;
1678 $data = $self->gender ? $female : $male;
1679 $xml .= expand_cfpod ($self, $data);
1680 } elsif ($code eq "H") {
1542 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1681 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1543 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1682 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1544 "") 1683 "")
1545 [$self->{hintmode}] 1684 [$self->{hintmode}];
1685 } else {
1686 $xml .= "error processing '$code($data)' directive";
1546 }ge; 1687 }
1688 } else {
1689 if ($pod =~ /\G(.+)/) {
1690 warn "parse error while expanding $pod (at $1)";
1691 }
1692 last;
1693 }
1694 }
1547 1695
1696 for ($xml) {
1548 # create single paragraphs (very hackish) 1697 # create single paragraphs (very hackish)
1549 s/(?<=\S)\n(?=\w)/ /g; 1698 s/(?<=\S)\n(?=\w)/ /g;
1550 1699
1551 # compress some whitespace 1700 # compress some whitespace
1552 s/\s+\n/\n/g; # ws line-ends 1701 s/\s+\n/\n/g; # ws line-ends
1553 s/\n\n+/\n/g; # double lines 1702 s/\n\n+/\n/g; # double lines
1554 s/^\n+//; # beginning lines 1703 s/^\n+//; # beginning lines
1555 s/\n+$//; # ending lines 1704 s/\n+$//; # ending lines
1705 }
1556 1706
1557 $_ 1707 $xml
1558} 1708}
1709
1710no re 'eval';
1559 1711
1560sub hintmode { 1712sub hintmode {
1561 $_[0]{hintmode} = $_[1] if @_ > 1; 1713 $_[0]{hintmode} = $_[1] if @_ > 1;
1562 $_[0]{hintmode} 1714 $_[0]{hintmode}
1563} 1715}
1635our $MAX_RESET = 3600; 1787our $MAX_RESET = 3600;
1636our $DEFAULT_RESET = 3000; 1788our $DEFAULT_RESET = 3000;
1637 1789
1638sub generate_random_map { 1790sub generate_random_map {
1639 my ($self, $rmp) = @_; 1791 my ($self, $rmp) = @_;
1792
1793 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1794
1640 # mit "rum" bekleckern, nicht 1795 # mit "rum" bekleckern, nicht
1641 $self->_create_random_map ( 1796 $self->_create_random_map (
1642 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1797 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1643 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1798 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1644 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1799 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1766 1921
1767# the temporary/swap location 1922# the temporary/swap location
1768sub save_path { 1923sub save_path {
1769 my ($self) = @_; 1924 my ($self) = @_;
1770 1925
1771 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1772 "$TMPDIR/$path.map" 1927 "$TMPDIR/$path.map"
1773} 1928}
1774 1929
1775# the unique path, undef == no special unique path 1930# the unique path, undef == no special unique path
1776sub uniq_path { 1931sub uniq_path {
1777 my ($self) = @_; 1932 my ($self) = @_;
1778 1933
1779 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1934 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1780 "$UNIQUEDIR/$path" 1935 "$UNIQUEDIR/$path"
1781} 1936}
1782 1937
1783# and all this just because we cannot iterate over 1938# and all this just because we cannot iterate over
1784# all maps in C++... 1939# all maps in C++...
1882 2037
1883 cf::lock_wait "map_data:$path";#d#remove 2038 cf::lock_wait "map_data:$path";#d#remove
1884 cf::lock_wait "map_find:$path"; 2039 cf::lock_wait "map_find:$path";
1885 2040
1886 $cf::MAP{$path} || do { 2041 $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 2042 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2043 my $guard2 = cf::lock_acquire "map_find:$path";
1889 2044
1890 my $map = new_from_path cf::map $path 2045 my $map = new_from_path cf::map $path
1891 or return; 2046 or return;
1892 2047
1893 $map->{last_save} = $cf::RUNTIME; 2048 $map->{last_save} = $cf::RUNTIME;
1896 or return; 2051 or return;
1897 2052
1898 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2053 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1899 # doing this can freeze the server in a sync job, obviously 2054 # doing this can freeze the server in a sync job, obviously
1900 #$cf::WAIT_FOR_TICK->wait; 2055 #$cf::WAIT_FOR_TICK->wait;
2056 undef $guard2;
1901 undef $guard1; 2057 undef $guard1;
1902 undef $guard2;
1903 $map->reset; 2058 $map->reset;
1904 return find $path; 2059 return find $path;
1905 } 2060 }
1906 2061
1907 $cf::MAP{$path} = $map 2062 $cf::MAP{$path} = $map
1934 my $f = new_from_file cf::object::thawer $self->{load_path}; 2089 my $f = new_from_file cf::object::thawer $self->{load_path};
1935 $f->skip_block; 2090 $f->skip_block;
1936 $self->_load_objects ($f) 2091 $self->_load_objects ($f)
1937 or return; 2092 or return;
1938 2093
1939 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2094 $self->post_load_original
1940 if delete $self->{load_original}; 2095 if delete $self->{load_original};
1941 2096
1942 if (my $uniq = $self->uniq_path) { 2097 if (my $uniq = $self->uniq_path) {
1943 utf8::encode $uniq; 2098 utf8::encode $uniq;
1944 unless (aio_stat $uniq) { 2099 unless (aio_stat $uniq) {
1970 } 2125 }
1971 2126
1972 $self->{last_save} = $cf::RUNTIME; 2127 $self->{last_save} = $cf::RUNTIME;
1973 $self->last_access ($cf::RUNTIME); 2128 $self->last_access ($cf::RUNTIME);
1974 2129
1975 $self->in_memory (cf::MAP_IN_MEMORY); 2130 $self->in_memory (cf::MAP_ACTIVE);
1976 } 2131 }
1977 2132
1978 $self->post_load; 2133 $self->post_load;
1979} 2134}
1980 2135
2038 my ($path, $origin, $load) = @_; 2193 my ($path, $origin, $load) = @_;
2039 2194
2040 $path = normalise $path, $origin && $origin->{path}; 2195 $path = normalise $path, $origin && $origin->{path};
2041 2196
2042 if (my $map = $cf::MAP{$path}) { 2197 if (my $map = $cf::MAP{$path}) {
2043 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2198 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2044 } 2199 }
2045 2200
2046 $MAP_PREFETCH{$path} |= $load; 2201 $MAP_PREFETCH{$path} |= $load;
2047 2202
2048 $MAP_PREFETCHER ||= cf::async { 2203 $MAP_PREFETCHER ||= cf::async {
2204 $Coro::current->{desc} = "map prefetcher";
2205
2049 while (%MAP_PREFETCH) { 2206 while (%MAP_PREFETCH) {
2050 while (my ($k, $v) = each %MAP_PREFETCH) { 2207 while (my ($k, $v) = each %MAP_PREFETCH) {
2051 if (my $map = find $k) { 2208 if (my $map = find $k) {
2052 $map->load if $v; 2209 $map->load if $v;
2053 } 2210 }
2079 return if $self->{deny_save}; 2236 return if $self->{deny_save};
2080 2237
2081 local $self->{last_access} = $self->last_access;#d# 2238 local $self->{last_access} = $self->last_access;#d#
2082 2239
2083 cf::async { 2240 cf::async {
2241 $Coro::current->{desc} = "map player save";
2084 $_->contr->save for $self->players; 2242 $_->contr->save for $self->players;
2085 }; 2243 };
2244
2245 cf::get_slot 0.02;
2086 2246
2087 if ($uniq) { 2247 if ($uniq) {
2088 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2248 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2089 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2249 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2090 } else { 2250 } else {
2099 $self->save; 2259 $self->save;
2100 2260
2101 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2261 my $lock = cf::lock_acquire "map_data:$self->{path}";
2102 2262
2103 return if $self->players; 2263 return if $self->players;
2104 return if $self->in_memory != cf::MAP_IN_MEMORY; 2264 return if $self->in_memory != cf::MAP_ACTIVE;
2105 return if $self->{deny_save}; 2265 return if $self->{deny_save};
2106 2266
2107 $self->in_memory (cf::MAP_SWAPPED); 2267 $self->in_memory (cf::MAP_SWAPPED);
2108 2268
2109 $self->deactivate; 2269 $self->deactivate;
2227 2387
2228sub unique_maps() { 2388sub unique_maps() {
2229 [ 2389 [
2230 map { 2390 map {
2231 utf8::decode $_; 2391 utf8::decode $_;
2232 /\.map$/ 2392 s/\.map$//; # TODO future compatibility hack
2393 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2394 ? ()
2233 ? normalise $_ 2395 : normalise $_
2234 : ()
2235 } @{ aio_readdir $UNIQUEDIR or [] } 2396 } @{ aio_readdir $UNIQUEDIR or [] }
2236 ] 2397 ]
2237} 2398}
2238 2399
2239package cf;
2240
2241=back 2400=back
2242 2401
2243=head3 cf::object 2402=head3 cf::object
2244 2403
2245=cut 2404=cut
2248 2407
2249=over 4 2408=over 4
2250 2409
2251=item $ob->inv_recursive 2410=item $ob->inv_recursive
2252 2411
2253Returns the inventory of the object _and_ their inventories, recursively. 2412Returns the inventory of the object I<and> their inventories, recursively,
2413but I<not> the object itself.
2254 2414
2255=cut 2415=cut
2256 2416
2257sub inv_recursive_; 2417sub inv_recursive_;
2258sub inv_recursive_ { 2418sub inv_recursive_ {
2263 inv_recursive_ inv $_[0] 2423 inv_recursive_ inv $_[0]
2264} 2424}
2265 2425
2266=item $ref = $ob->ref 2426=item $ref = $ob->ref
2267 2427
2268creates and returns a persistent reference to an objetc that can be stored as a string. 2428Creates and returns a persistent reference to an object that can be stored as a string.
2269 2429
2270=item $ob = cf::object::deref ($refstring) 2430=item $ob = cf::object::deref ($refstring)
2271 2431
2272returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2432returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2273even if the object actually exists. May block. 2433even if the object actually exists. May block.
2275=cut 2435=cut
2276 2436
2277sub deref { 2437sub deref {
2278 my ($ref) = @_; 2438 my ($ref) = @_;
2279 2439
2280 # temporary compatibility#TODO#remove
2281 $ref =~ s{^<}{player/<};
2282
2283 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2440 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2284 my ($uuid, $name) = ($1, $2); 2441 my ($uuid, $name) = ($1, $2);
2285 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2442 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2286 or return; 2443 or return;
2287 $pl->ob->uuid eq $uuid 2444 $pl->ob->uuid eq $uuid
2288 or return; 2445 or return;
2308can be C<undef>. Does the right thing when the player is currently in a 2465can be C<undef>. Does the right thing when the player is currently in a
2309dialogue with the given NPC character. 2466dialogue with the given NPC character.
2310 2467
2311=cut 2468=cut
2312 2469
2470our $SAY_CHANNEL = {
2471 id => "say",
2472 title => "Map",
2473 reply => "say ",
2474 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2475};
2476
2477our $CHAT_CHANNEL = {
2478 id => "chat",
2479 title => "Chat",
2480 reply => "chat ",
2481 tooltip => "Player chat and shouts, global to the server.",
2482};
2483
2313# rough implementation of a future "reply" method that works 2484# rough implementation of a future "reply" method that works
2314# with dialog boxes. 2485# with dialog boxes.
2315#TODO: the first argument must go, split into a $npc->reply_to ( method 2486#TODO: the first argument must go, split into a $npc->reply_to ( method
2316sub cf::object::player::reply($$$;$) { 2487sub cf::object::player::reply($$$;$) {
2317 my ($self, $npc, $msg, $flags) = @_; 2488 my ($self, $npc, $msg, $flags) = @_;
2328 my $dialog = $pl->{npc_dialog}; 2499 my $dialog = $pl->{npc_dialog};
2329 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2500 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2330 2501
2331 } else { 2502 } else {
2332 $msg = $npc->name . " says: $msg" if $npc; 2503 $msg = $npc->name . " says: $msg" if $npc;
2333 $self->message ($msg, $flags); 2504 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2334 } 2505 }
2335 } 2506 }
2336} 2507}
2337 2508
2338=item $object->send_msg ($channel, $msg, $color, [extra...]) 2509=item $object->send_msg ($channel, $msg, $color, [extra...])
2446her, loading and preparing them map, calling the provided $check callback 2617her, loading and preparing them map, calling the provided $check callback
2447that has to return the map if sucecssful, and then unfreezes the player on 2618that 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 2619the new (success) or old (failed) map position. In either case, $done will
2449be called at the end of this process. 2620be called at the end of this process.
2450 2621
2622Note that $check will be called with a potentially non-loaded map, so if
2623it needs a loaded map it has to call C<< ->load >>.
2624
2451=cut 2625=cut
2452 2626
2453our $GOTOGEN; 2627our $GOTOGEN;
2454 2628
2455sub cf::object::player::goto { 2629sub cf::object::player::goto {
2459 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2633 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2460 2634
2461 $self->enter_link; 2635 $self->enter_link;
2462 2636
2463 (async { 2637 (async {
2638 $Coro::current->{desc} = "player::goto $path $x $y";
2639
2464 # *tag paths override both path and x|y 2640 # *tag paths override both path and x|y
2465 if ($path =~ /^\*(.*)$/) { 2641 if ($path =~ /^\*(.*)$/) {
2466 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2642 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2467 my $ob = $obs[rand @obs]; 2643 my $ob = $obs[rand @obs];
2468 2644
2531} 2707}
2532 2708
2533sub prepare_random_map { 2709sub prepare_random_map {
2534 my ($exit) = @_; 2710 my ($exit) = @_;
2535 2711
2536 my $guard = cf::lock_acquire "exit_prepare:$exit";
2537
2538 # all this does is basically replace the /! path by 2712 # all this does is basically replace the /! path by
2539 # a new random map path (?random/...) with a seed 2713 # a new random map path (?random/...) with a seed
2540 # that depends on the exit object 2714 # that depends on the exit object
2541 2715
2542 my $rmp = parse_random_map_params $exit->msg; 2716 my $rmp = parse_random_map_params $exit->msg;
2544 if ($exit->map) { 2718 if ($exit->map) {
2545 $rmp->{region} = $exit->region->name; 2719 $rmp->{region} = $exit->region->name;
2546 $rmp->{origin_map} = $exit->map->path; 2720 $rmp->{origin_map} = $exit->map->path;
2547 $rmp->{origin_x} = $exit->x; 2721 $rmp->{origin_x} = $exit->x;
2548 $rmp->{origin_y} = $exit->y; 2722 $rmp->{origin_y} = $exit->y;
2723
2724 $exit->map->touch;
2549 } 2725 }
2550 2726
2551 $rmp->{random_seed} ||= $exit->random_seed; 2727 $rmp->{random_seed} ||= $exit->random_seed;
2552 2728
2553 my $data = cf::to_json $rmp; 2729 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2554 my $md5 = Digest::MD5::md5_hex $data; 2730 my $md5 = Digest::MD5::md5_hex $data;
2555 my $meta = "$RANDOMDIR/$md5.meta"; 2731 my $meta = "$RANDOMDIR/$md5.meta";
2556 2732
2557 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2733 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2558 aio_write $fh, 0, (length $data), $data, 0; 2734 aio_write $fh, 0, (length $data), $data, 0;
2559 undef $fh; 2735 undef $fh;
2560 aio_rename "$meta~", $meta; 2736 aio_rename "$meta~", $meta;
2561 2737
2738 my $slaying = "?random/$md5";
2739
2740 if ($exit->valid) {
2562 $exit->slaying ("?random/$md5"); 2741 $exit->slaying ("?random/$md5");
2563 $exit->msg (undef); 2742 $exit->msg (undef);
2743 }
2564 } 2744 }
2565} 2745}
2566 2746
2567sub cf::object::player::enter_exit { 2747sub cf::object::player::enter_exit {
2568 my ($self, $exit) = @_; 2748 my ($self, $exit) = @_;
2569 2749
2570 return unless $self->type == cf::PLAYER; 2750 return unless $self->type == cf::PLAYER;
2571 2751
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; 2752 $self->enter_link;
2584 2753
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 { 2754 (async {
2590 $self->deactivate_recursive; # just to be sure 2755 $Coro::current->{desc} = "enter_exit";
2756
2591 unless (eval { 2757 unless (eval {
2758 $self->deactivate_recursive; # just to be sure
2759
2760 # random map handling
2761 {
2762 my $guard = cf::lock_acquire "exit_prepare:$exit";
2763
2764 prepare_random_map $exit
2765 if $exit->slaying eq "/!";
2766 }
2767
2768 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2769 my $x = $exit->stats->hp;
2770 my $y = $exit->stats->sp;
2771
2592 $self->goto ($slaying, $hp, $sp); 2772 $self->goto ($map, $x, $y);
2593 2773
2774 # if exit is damned, update players death & WoR home-position
2775 $self->contr->savebed ($map, $x, $y)
2776 if $exit->flag (cf::FLAG_DAMNED);
2777
2594 1; 2778 1
2595 }) { 2779 }) {
2596 $self->message ("Something went wrong deep within the crossfire server. " 2780 $self->message ("Something went wrong deep within the crossfire server. "
2597 . "I'll try to bring you back to the map you were before. " 2781 . "I'll try to bring you back to the map you were before. "
2598 . "Please report this to the dungeon master!", 2782 . "Please report this to the dungeon master!",
2599 cf::NDI_UNIQUE | cf::NDI_RED); 2783 cf::NDI_UNIQUE | cf::NDI_RED);
2629the message, with C<log> being the default. If C<$color> is negative, suppress 2813the message, with C<log> being the default. If C<$color> is negative, suppress
2630the message unless the client supports the msg packet. 2814the message unless the client supports the msg packet.
2631 2815
2632=cut 2816=cut
2633 2817
2818# non-persistent channels (usually the info channel)
2634our %CHANNEL = ( 2819our %CHANNEL = (
2635 "c/identify" => { 2820 "c/identify" => {
2636 id => "identify", 2821 id => "infobox",
2637 title => "Identify", 2822 title => "Identify",
2638 reply => undef, 2823 reply => undef,
2639 tooltip => "Items recently identified", 2824 tooltip => "Items recently identified",
2640 }, 2825 },
2641 "c/examine" => { 2826 "c/examine" => {
2642 id => "examine", 2827 id => "infobox",
2643 title => "Examine", 2828 title => "Examine",
2644 reply => undef, 2829 reply => undef,
2645 tooltip => "Signs and other items you examined", 2830 tooltip => "Signs and other items you examined",
2646 }, 2831 },
2832 "c/book" => {
2833 id => "infobox",
2834 title => "Book",
2835 reply => undef,
2836 tooltip => "The contents of a note or book",
2837 },
2838 "c/lookat" => {
2839 id => "infobox",
2840 title => "Look",
2841 reply => undef,
2842 tooltip => "What you saw there",
2843 },
2844 "c/who" => {
2845 id => "infobox",
2846 title => "Players",
2847 reply => undef,
2848 tooltip => "Shows players who are currently online",
2849 },
2850 "c/body" => {
2851 id => "infobox",
2852 title => "Body Parts",
2853 reply => undef,
2854 tooltip => "Shows which body parts you posess and are available",
2855 },
2856 "c/uptime" => {
2857 id => "infobox",
2858 title => "Uptime",
2859 reply => undef,
2860 tooltip => "How long the server has been running since last restart",
2861 },
2862 "c/mapinfo" => {
2863 id => "infobox",
2864 title => "Map Info",
2865 reply => undef,
2866 tooltip => "Information related to the maps",
2867 },
2868 "c/party" => {
2869 id => "party",
2870 title => "Party",
2871 reply => "gsay ",
2872 tooltip => "Messages and chat related to your party",
2873 },
2647); 2874);
2648 2875
2649sub cf::client::send_msg { 2876sub cf::client::send_msg {
2650 my ($self, $channel, $msg, $color, @extra) = @_; 2877 my ($self, $channel, $msg, $color, @extra) = @_;
2651 2878
2652 $msg = $self->pl->expand_cfpod ($msg); 2879 $msg = $self->pl->expand_cfpod ($msg);
2653 2880
2654 $color &= cf::NDI_CLIENT_MASK; # just in case... 2881 $color &= cf::NDI_CLIENT_MASK; # just in case...
2655 2882
2656 # check predefined channels, for the benefit of C 2883 # check predefined channels, for the benefit of C
2657 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2884 if ($CHANNEL{$channel}) {
2885 $channel = $CHANNEL{$channel};
2658 2886
2887 $self->ext_msg (channel_info => $channel)
2888 if $self->can_msg;
2889
2890 $channel = $channel->{id};
2891
2659 if (ref $channel) { 2892 } elsif (ref $channel) {
2660 # send meta info to client, if not yet sent 2893 # send meta info to client, if not yet sent
2661 unless (exists $self->{channel}{$channel->{id}}) { 2894 unless (exists $self->{channel}{$channel->{id}}) {
2662 $self->{channel}{$channel->{id}} = $channel; 2895 $self->{channel}{$channel->{id}} = $channel;
2663 $self->ext_msg (channel_info => $channel) 2896 $self->ext_msg (channel_info => $channel)
2664 if $self->can_msg; 2897 if $self->can_msg;
2881=pod 3114=pod
2882 3115
2883The following functions and methods are available within a safe environment: 3116The following functions and methods are available within a safe environment:
2884 3117
2885 cf::object 3118 cf::object
2886 contr pay_amount pay_player map x y force_find force_add 3119 contr pay_amount pay_player map x y force_find force_add destroy
2887 insert remove name archname title slaying race decrease_ob_nr 3120 insert remove name archname title slaying race decrease split
2888 3121
2889 cf::object::player 3122 cf::object::player
2890 player 3123 player
2891 3124
2892 cf::player 3125 cf::player
2897 3130
2898=cut 3131=cut
2899 3132
2900for ( 3133for (
2901 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3134 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2902 insert remove inv name archname title slaying race 3135 insert remove inv nrof name archname title slaying race
2903 decrease_ob_nr)], 3136 decrease split destroy change_exp)],
2904 ["cf::object::player" => qw(player)], 3137 ["cf::object::player" => qw(player)],
2905 ["cf::player" => qw(peaceful)], 3138 ["cf::player" => qw(peaceful)],
2906 ["cf::map" => qw(trigger)], 3139 ["cf::map" => qw(trigger)],
2907) { 3140) {
2908 no strict 'refs'; 3141 no strict 'refs';
3013 { 3246 {
3014 my $faces = $facedata->{faceinfo}; 3247 my $faces = $facedata->{faceinfo};
3015 3248
3016 while (my ($face, $info) = each %$faces) { 3249 while (my ($face, $info) = each %$faces) {
3017 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3250 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3251
3018 cf::face::set_visibility $idx, $info->{visibility}; 3252 cf::face::set_visibility $idx, $info->{visibility};
3019 cf::face::set_magicmap $idx, $info->{magicmap}; 3253 cf::face::set_magicmap $idx, $info->{magicmap};
3020 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3254 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}; 3255 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3022 3256
3023 cf::cede_to_tick; 3257 cf::cede_to_tick;
3024 } 3258 }
3025 3259
3026 while (my ($face, $info) = each %$faces) { 3260 while (my ($face, $info) = each %$faces) {
3027 next unless $info->{smooth}; 3261 next unless $info->{smooth};
3262
3028 my $idx = cf::face::find $face 3263 my $idx = cf::face::find $face
3029 or next; 3264 or next;
3265
3030 if (my $smooth = cf::face::find $info->{smooth}) { 3266 if (my $smooth = cf::face::find $info->{smooth}) {
3031 cf::face::set_smooth $idx, $smooth; 3267 cf::face::set_smooth $idx, $smooth;
3032 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3268 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3033 } else { 3269 } else {
3034 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3270 warn "smooth face '$info->{smooth}' not found for face '$face'";
3052 { 3288 {
3053 # TODO: for gcfclient pleasure, we should give resources 3289 # TODO: for gcfclient pleasure, we should give resources
3054 # that gcfclient doesn't grok a >10000 face index. 3290 # that gcfclient doesn't grok a >10000 face index.
3055 my $res = $facedata->{resource}; 3291 my $res = $facedata->{resource};
3056 3292
3057 my $soundconf = delete $res->{"res/sound.conf"};
3058
3059 while (my ($name, $info) = each %$res) { 3293 while (my ($name, $info) = each %$res) {
3294 if (defined $info->{type}) {
3060 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3295 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3061 my $data; 3296 my $data;
3062 3297
3063 if ($info->{type} & 1) { 3298 if ($info->{type} & 1) {
3064 # prepend meta info 3299 # prepend meta info
3065 3300
3066 my $meta = $enc->encode ({ 3301 my $meta = $enc->encode ({
3067 name => $name, 3302 name => $name,
3068 %{ $info->{meta} || {} }, 3303 %{ $info->{meta} || {} },
3069 }); 3304 });
3070 3305
3071 $data = pack "(w/a*)*", $meta, $info->{data}; 3306 $data = pack "(w/a*)*", $meta, $info->{data};
3307 } else {
3308 $data = $info->{data};
3309 }
3310
3311 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3312 cf::face::set_type $idx, $info->{type};
3072 } else { 3313 } else {
3073 $data = $info->{data}; 3314 $RESOURCE{$name} = $info;
3074 } 3315 }
3075 3316
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; 3317 cf::cede_to_tick;
3080 } 3318 }
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 } 3319 }
3320
3321 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3100 3322
3101 1 3323 1
3102} 3324}
3325
3326cf::global->attach (on_resource_update => sub {
3327 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3328 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3329
3330 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3331 my $sound = $soundconf->{compat}[$_]
3332 or next;
3333
3334 my $face = cf::face::find "sound/$sound->[1]";
3335 cf::sound::set $sound->[0] => $face;
3336 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3337 }
3338
3339 while (my ($k, $v) = each %{$soundconf->{event}}) {
3340 my $face = cf::face::find "sound/$v";
3341 cf::sound::set $k => $face;
3342 }
3343 }
3344});
3103 3345
3104register_exticmd fx_want => sub { 3346register_exticmd fx_want => sub {
3105 my ($ns, $want) = @_; 3347 my ($ns, $want) = @_;
3106 3348
3107 while (my ($k, $v) = each %$want) { 3349 while (my ($k, $v) = each %$want) {
3108 $ns->fx_want ($k, $v); 3350 $ns->fx_want ($k, $v);
3109 } 3351 }
3110}; 3352};
3353
3354sub load_resource_file($) {
3355 my $guard = lock_acquire "load_resource_file";
3356
3357 my $status = load_resource_file_ $_[0];
3358 get_slot 0.1, 100;
3359 cf::arch::commit_load;
3360
3361 $status
3362}
3111 3363
3112sub reload_regions { 3364sub reload_regions {
3113 # HACK to clear player env face cache, we need some signal framework 3365 # HACK to clear player env face cache, we need some signal framework
3114 # for this (global event?) 3366 # for this (global event?)
3115 %ext::player_env::MUSIC_FACE_CACHE = (); 3367 %ext::player_env::MUSIC_FACE_CACHE = ();
3129} 3381}
3130 3382
3131sub reload_archetypes { 3383sub reload_archetypes {
3132 load_resource_file "$DATADIR/archetypes" 3384 load_resource_file "$DATADIR/archetypes"
3133 or die "unable to load archetypes\n"; 3385 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} 3386}
3140 3387
3141sub reload_treasures { 3388sub reload_treasures {
3142 load_resource_file "$DATADIR/treasures" 3389 load_resource_file "$DATADIR/treasures"
3143 or die "unable to load treasurelists\n"; 3390 or die "unable to load treasurelists\n";
3144} 3391}
3145 3392
3146sub reload_resources { 3393sub reload_resources {
3147 warn "reloading resource files...\n"; 3394 warn "reloading resource files...\n";
3148 3395
3396 reload_facedata;
3397 reload_archetypes;
3149 reload_regions; 3398 reload_regions;
3150 reload_facedata;
3151 #reload_archetypes;#d#
3152 reload_archetypes;
3153 reload_treasures; 3399 reload_treasures;
3154 3400
3155 warn "finished reloading resource files\n"; 3401 warn "finished reloading resource files\n";
3156} 3402}
3157 3403
3158sub init { 3404sub init {
3405 my $guard = freeze_mainloop;
3406
3407 evthread_start IO::AIO::poll_fileno;
3408
3159 reload_resources; 3409 reload_resources;
3160} 3410}
3161 3411
3162sub reload_config { 3412sub reload_config {
3163 open my $fh, "<:utf8", "$CONFDIR/config" 3413 open my $fh, "<:utf8", "$CONFDIR/config"
3164 or return; 3414 or return;
3165 3415
3166 local $/; 3416 local $/;
3167 *CFG = YAML::Syck::Load <$fh>; 3417 *CFG = YAML::Load <$fh>;
3168 3418
3169 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3419 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3170 3420
3171 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3421 $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}; 3422 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3183sub main { 3433sub main {
3184 # we must not ever block the main coroutine 3434 # we must not ever block the main coroutine
3185 local $Coro::idle = sub { 3435 local $Coro::idle = sub {
3186 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3436 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3187 (async { 3437 (async {
3188 Event::one_event; 3438 $Coro::current->{desc} = "IDLE BUG HANDLER";
3439 EV::loop EV::LOOP_ONESHOT;
3189 })->prio (Coro::PRIO_MAX); 3440 })->prio (Coro::PRIO_MAX);
3190 }; 3441 };
3191 3442
3443 {
3444 my $guard = freeze_mainloop;
3192 reload_config; 3445 reload_config;
3193 db_init; 3446 db_init;
3194 load_extensions; 3447 load_extensions;
3195 3448
3196 $TICK_WATCHER->start; 3449 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3450 }
3451
3197 Event::loop; 3452 EV::loop;
3198} 3453}
3199 3454
3200############################################################################# 3455#############################################################################
3201# initialisation and cleanup 3456# initialisation and cleanup
3202 3457
3203# install some emergency cleanup handlers 3458# install some emergency cleanup handlers
3204BEGIN { 3459BEGIN {
3460 our %SIGWATCHER = ();
3205 for my $signal (qw(INT HUP TERM)) { 3461 for my $signal (qw(INT HUP TERM)) {
3206 Event->signal ( 3462 $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"; 3463 cf::cleanup "SIG$signal";
3213 },
3214 ); 3464 };
3215 } 3465 }
3216} 3466}
3217 3467
3218sub write_runtime { 3468sub write_runtime_sync {
3219 my $runtime = "$LOCALDIR/runtime"; 3469 my $runtime = "$LOCALDIR/runtime";
3220 3470
3221 # first touch the runtime file to show we are still running: 3471 # first touch the runtime file to show we are still running:
3222 # the fsync below can take a very very long time. 3472 # the fsync below can take a very very long time.
3223 3473
3249 and return; 3499 and return;
3250 3500
3251 warn "runtime file written.\n"; 3501 warn "runtime file written.\n";
3252 3502
3253 1 3503 1
3504}
3505
3506our $uuid_lock;
3507our $uuid_skip;
3508
3509sub write_uuid_sync($) {
3510 $uuid_skip ||= $_[0];
3511
3512 return if $uuid_lock;
3513 local $uuid_lock = 1;
3514
3515 my $uuid = "$LOCALDIR/uuid";
3516
3517 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3518 or return;
3519
3520 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3521 $uuid_skip = 0;
3522
3523 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3524 and return;
3525
3526 # always fsync - this file is important
3527 aio_fsync $fh
3528 and return;
3529
3530 close $fh
3531 or return;
3532
3533 aio_rename "$uuid~", $uuid
3534 and return;
3535
3536 warn "uuid file written ($value).\n";
3537
3538 1
3539
3540}
3541
3542sub write_uuid($$) {
3543 my ($skip, $sync) = @_;
3544
3545 $sync ? write_uuid_sync $skip
3546 : async { write_uuid_sync $skip };
3254} 3547}
3255 3548
3256sub emergency_save() { 3549sub emergency_save() {
3257 my $freeze_guard = cf::freeze_mainloop; 3550 my $freeze_guard = cf::freeze_mainloop;
3258 3551
3264 # and maps saved/destroyed asynchronously. 3557 # and maps saved/destroyed asynchronously.
3265 warn "begin emergency player save\n"; 3558 warn "begin emergency player save\n";
3266 for my $login (keys %cf::PLAYER) { 3559 for my $login (keys %cf::PLAYER) {
3267 my $pl = $cf::PLAYER{$login} or next; 3560 my $pl = $cf::PLAYER{$login} or next;
3268 $pl->valid or next; 3561 $pl->valid or next;
3562 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3269 $pl->save; 3563 $pl->save;
3270 } 3564 }
3271 warn "end emergency player save\n"; 3565 warn "end emergency player save\n";
3272 3566
3273 warn "begin emergency map save\n"; 3567 warn "begin emergency map save\n";
3279 warn "end emergency map save\n"; 3573 warn "end emergency map save\n";
3280 3574
3281 warn "begin emergency database checkpoint\n"; 3575 warn "begin emergency database checkpoint\n";
3282 BDB::db_env_txn_checkpoint $DB_ENV; 3576 BDB::db_env_txn_checkpoint $DB_ENV;
3283 warn "end emergency database checkpoint\n"; 3577 warn "end emergency database checkpoint\n";
3578
3579 warn "begin write uuid\n";
3580 write_uuid_sync 1;
3581 warn "end write uuid\n";
3284 }; 3582 };
3285 3583
3286 warn "leave emergency perl save\n"; 3584 warn "leave emergency perl save\n";
3287} 3585}
3288 3586
3290 my ($make_core) = @_; 3588 my ($make_core) = @_;
3291 3589
3292 warn Carp::longmess "post_cleanup backtrace" 3590 warn Carp::longmess "post_cleanup backtrace"
3293 if $make_core; 3591 if $make_core;
3294} 3592}
3593
3594# a safer delete_package, copied from Symbol
3595sub clear_package($) {
3596 my $pkg = shift;
3597
3598 # expand to full symbol table name if needed
3599 unless ($pkg =~ /^main::.*::$/) {
3600 $pkg = "main$pkg" if $pkg =~ /^::/;
3601 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3602 $pkg .= '::' unless $pkg =~ /::$/;
3603 }
3604
3605 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3606 my $stem_symtab = *{$stem}{HASH};
3607
3608 defined $stem_symtab and exists $stem_symtab->{$leaf}
3609 or return;
3610
3611 # clear all symbols
3612 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3613 for my $name (keys %$leaf_symtab) {
3614 _gv_clear *{"$pkg$name"};
3615# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3616 }
3617 warn "cleared package #$pkg\n";#d#
3618}
3619
3620our $RELOAD; # how many times to reload
3295 3621
3296sub do_reload_perl() { 3622sub do_reload_perl() {
3297 # can/must only be called in main 3623 # can/must only be called in main
3298 if ($Coro::current != $Coro::main) { 3624 if ($Coro::current != $Coro::main) {
3299 warn "can only reload from main coroutine"; 3625 warn "can only reload from main coroutine";
3300 return; 3626 return;
3301 } 3627 }
3302 3628
3629 return if $RELOAD++;
3630
3631 while ($RELOAD) {
3303 warn "reloading..."; 3632 warn "reloading...";
3304 3633
3305 warn "entering sync_job"; 3634 warn "entering sync_job";
3306 3635
3307 cf::sync_job { 3636 cf::sync_job {
3308 cf::write_runtime; # external watchdog should not bark 3637 cf::write_runtime_sync; # external watchdog should not bark
3309 cf::emergency_save; 3638 cf::emergency_save;
3310 cf::write_runtime; # external watchdog should not bark 3639 cf::write_runtime_sync; # external watchdog should not bark
3311 3640
3312 warn "syncing database to disk"; 3641 warn "syncing database to disk";
3313 BDB::db_env_txn_checkpoint $DB_ENV; 3642 BDB::db_env_txn_checkpoint $DB_ENV;
3314 3643
3315 # if anything goes wrong in here, we should simply crash as we already saved 3644 # if anything goes wrong in here, we should simply crash as we already saved
3316 3645
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"; 3646 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; 3647 while (IO::AIO::nreqs || BDB::nreqs) {
3328 warn "iterate..."; 3648 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 } 3649 }
3354 3650
3355 warn "... nuking $pkg"; 3651 warn "cancelling all extension coros";
3356 Symbol::delete_package $pkg; 3652 $_->cancel for values %EXT_CORO;
3357 } 3653 %EXT_CORO = ();
3358 3654
3359 warn "unloading all perl modules loaded from $LIBDIR"; 3655 warn "removing commands";
3360 while (my ($k, $v) = each %INC) { 3656 %COMMAND = ();
3361 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3362 3657
3658 warn "removing ext/exti commands";
3659 %EXTCMD = ();
3660 %EXTICMD = ();
3661
3662 warn "unloading/nuking all extensions";
3663 for my $pkg (@EXTS) {
3363 warn "... unloading $k"; 3664 warn "... unloading $pkg";
3364 delete $INC{$k};
3365 3665
3366 $k =~ s/\.pm$//;
3367 $k =~ s/\//::/g;
3368
3369 if (my $cb = $k->can ("unload_module")) { 3666 if (my $cb = $pkg->can ("unload")) {
3667 eval {
3370 $cb->(); 3668 $cb->($pkg);
3669 1
3670 } or warn "$pkg unloaded, but with errors: $@";
3671 }
3672
3673 warn "... clearing $pkg";
3674 clear_package $pkg;
3371 } 3675 }
3372 3676
3373 Symbol::delete_package $k; 3677 warn "unloading all perl modules loaded from $LIBDIR";
3678 while (my ($k, $v) = each %INC) {
3679 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3680
3681 warn "... unloading $k";
3682 delete $INC{$k};
3683
3684 $k =~ s/\.pm$//;
3685 $k =~ s/\//::/g;
3686
3687 if (my $cb = $k->can ("unload_module")) {
3688 $cb->();
3689 }
3690
3691 clear_package $k;
3374 } 3692 }
3375 3693
3376 warn "getting rid of safe::, as good as possible"; 3694 warn "getting rid of safe::, as good as possible";
3377 Symbol::delete_package "safe::$_" 3695 clear_package "safe::$_"
3378 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3696 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3379 3697
3380 warn "unloading cf.pm \"a bit\""; 3698 warn "unloading cf.pm \"a bit\"";
3381 delete $INC{"cf.pm"}; 3699 delete $INC{"cf.pm"};
3382 delete $INC{"cf/pod.pm"}; 3700 delete $INC{"cf/pod.pm"};
3383 3701
3384 # don't, removes xs symbols, too, 3702 # don't, removes xs symbols, too,
3385 # and global variables created in xs 3703 # and global variables created in xs
3386 #Symbol::delete_package __PACKAGE__; 3704 #clear_package __PACKAGE__;
3387 3705
3388 warn "unload completed, starting to reload now"; 3706 warn "unload completed, starting to reload now";
3389 3707
3390 warn "reloading cf.pm"; 3708 warn "reloading cf.pm";
3391 require cf; 3709 require cf;
3392 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3710 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3393 3711
3394 warn "loading config and database again"; 3712 warn "loading config and database again";
3395 cf::reload_config; 3713 cf::reload_config;
3396 3714
3397 warn "loading extensions"; 3715 warn "loading extensions";
3398 cf::load_extensions; 3716 cf::load_extensions;
3399 3717
3400 warn "reattaching attachments to objects/players"; 3718 warn "reattaching attachments to objects/players";
3401 _global_reattach; # objects, sockets 3719 _global_reattach; # objects, sockets
3402 warn "reattaching attachments to maps"; 3720 warn "reattaching attachments to maps";
3403 reattach $_ for values %MAP; 3721 reattach $_ for values %MAP;
3404 warn "reattaching attachments to players"; 3722 warn "reattaching attachments to players";
3405 reattach $_ for values %PLAYER; 3723 reattach $_ for values %PLAYER;
3406 3724
3407 warn "leaving sync_job"; 3725 warn "leaving sync_job";
3408 3726
3409 1 3727 1
3410 } or do { 3728 } or do {
3411 warn $@; 3729 warn $@;
3412 warn "error while reloading, exiting."; 3730 cf::cleanup "error while reloading, exiting.";
3413 exit 1;
3414 }; 3731 };
3415 3732
3416 warn "reloaded"; 3733 warn "reloaded";
3734 --$RELOAD;
3735 }
3417}; 3736};
3418 3737
3419our $RELOAD_WATCHER; # used only during reload 3738our $RELOAD_WATCHER; # used only during reload
3420 3739
3421sub reload_perl() { 3740sub reload_perl() {
3422 # doing reload synchronously and two reloads happen back-to-back, 3741 # doing reload synchronously and two reloads happen back-to-back,
3423 # coro crashes during coro_state_free->destroy here. 3742 # coro crashes during coro_state_free->destroy here.
3424 3743
3425 $RELOAD_WATCHER ||= Event->timer ( 3744 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3426 reentrant => 0,
3427 after => 0,
3428 data => WF_AUTOCANCEL,
3429 cb => sub {
3430 do_reload_perl; 3745 do_reload_perl;
3431 undef $RELOAD_WATCHER; 3746 undef $RELOAD_WATCHER;
3432 },
3433 ); 3747 };
3434} 3748}
3435 3749
3436register_command "reload" => sub { 3750register_command "reload" => sub {
3437 my ($who, $arg) = @_; 3751 my ($who, $arg) = @_;
3438 3752
3439 if ($who->flag (FLAG_WIZ)) { 3753 if ($who->flag (FLAG_WIZ)) {
3440 $who->message ("reloading server."); 3754 $who->message ("reloading server.");
3755 async {
3756 $Coro::current->{desc} = "perl_reload";
3441 async { reload_perl }; 3757 reload_perl;
3758 };
3442 } 3759 }
3443}; 3760};
3444 3761
3445unshift @INC, $LIBDIR; 3762unshift @INC, $LIBDIR;
3446 3763
3448 3765
3449our @WAIT_FOR_TICK; 3766our @WAIT_FOR_TICK;
3450our @WAIT_FOR_TICK_BEGIN; 3767our @WAIT_FOR_TICK_BEGIN;
3451 3768
3452sub wait_for_tick { 3769sub wait_for_tick {
3453 return unless $TICK_WATCHER->is_active;
3454 return if $Coro::current == $Coro::main; 3770 return if tick_inhibit || $Coro::current == $Coro::main;
3455 3771
3456 my $signal = new Coro::Signal; 3772 my $signal = new Coro::Signal;
3457 push @WAIT_FOR_TICK, $signal; 3773 push @WAIT_FOR_TICK, $signal;
3458 $signal->wait; 3774 $signal->wait;
3459} 3775}
3460 3776
3461sub wait_for_tick_begin { 3777sub wait_for_tick_begin {
3462 return unless $TICK_WATCHER->is_active;
3463 return if $Coro::current == $Coro::main; 3778 return if tick_inhibit || $Coro::current == $Coro::main;
3464 3779
3465 my $signal = new Coro::Signal; 3780 my $signal = new Coro::Signal;
3466 push @WAIT_FOR_TICK_BEGIN, $signal; 3781 push @WAIT_FOR_TICK_BEGIN, $signal;
3467 $signal->wait; 3782 $signal->wait;
3468} 3783}
3469 3784
3470$TICK_WATCHER = Event->timer ( 3785sub 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) { 3786 if ($Coro::current != $Coro::main) {
3478 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3787 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3479 unless ++$bug_warning > 10; 3788 unless ++$bug_warning > 10;
3480 return; 3789 return;
3481 } 3790 }
3482 3791
3483 $NOW = $tick_start = Event::time;
3484
3485 cf::server_tick; # one server iteration 3792 cf::server_tick; # one server iteration
3486 3793
3487 $RUNTIME += $TICK;
3488 $NEXT_TICK += $TICK;
3489
3490 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3794 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3491 $NEXT_RUNTIME_WRITE = $NOW + 10; 3795 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3492 Coro::async_pool { 3796 Coro::async_pool {
3797 $Coro::current->{desc} = "runtime saver";
3493 write_runtime 3798 write_runtime_sync
3494 or warn "ERROR: unable to write runtime file: $!"; 3799 or warn "ERROR: unable to write runtime file: $!";
3495 };
3496 } 3800 };
3801 }
3497 3802
3498 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3803 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3499 $sig->send; 3804 $sig->send;
3500 } 3805 }
3501 while (my $sig = shift @WAIT_FOR_TICK) { 3806 while (my $sig = shift @WAIT_FOR_TICK) {
3502 $sig->send; 3807 $sig->send;
3503 } 3808 }
3504 3809
3505 $NOW = Event::time; 3810 $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; 3811 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3515 3812
3516 _post_tick; 3813 if (0) {
3814 if ($NEXT_TICK) {
3815 my $jitter = $TICK_START - $NEXT_TICK;
3816 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3817 warn "jitter $JITTER\n";#d#
3818 }
3517 }, 3819 }
3518); 3820}
3519 3821
3520{ 3822{
3823 # configure BDB
3824
3521 BDB::min_parallel 8; 3825 BDB::min_parallel 8;
3522 BDB::max_poll_time $TICK * 0.1; 3826 BDB::max_poll_reqs $TICK * 0.1;
3523 $BDB_POLL_WATCHER = Event->io ( 3827 $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 3828
3547 unless ($DB_ENV) { 3829 unless ($DB_ENV) {
3548 $DB_ENV = BDB::db_env_create; 3830 $DB_ENV = BDB::db_env_create;
3549 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3831 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3550 | BDB::LOG_AUTOREMOVE, 1); 3832 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3833 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3551 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3834 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3552 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3835 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3553 3836
3554 cf::sync_job { 3837 cf::sync_job {
3555 eval { 3838 eval {
3565 3848
3566 cf::cleanup "db_env_open(db): $@" if $@; 3849 cf::cleanup "db_env_open(db): $@" if $@;
3567 }; 3850 };
3568 } 3851 }
3569 3852
3570 $BDB_DEADLOCK_WATCHER = Event->timer ( 3853 $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 { }; 3854 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3578 },
3579 ); 3855 };
3580 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3856 $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 { }; 3857 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3588 },
3589 ); 3858 };
3590 $BDB_TRICKLE_WATCHER = Event->timer ( 3859 $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 { }; 3860 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3598 },
3599 ); 3861 };
3600} 3862}
3601 3863
3602{ 3864{
3865 # configure IO::AIO
3866
3603 IO::AIO::min_parallel 8; 3867 IO::AIO::min_parallel 8;
3604
3605 undef $Coro::AIO::WATCHER;
3606 IO::AIO::max_poll_time $TICK * 0.1; 3868 IO::AIO::max_poll_time $TICK * 0.1;
3607 $AIO_POLL_WATCHER = Event->io ( 3869 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} 3870}
3616 3871
3617my $_log_backtrace; 3872my $_log_backtrace;
3618 3873
3619sub _log_backtrace { 3874sub _log_backtrace {
3623 3878
3624 # limit the # of concurrent backtraces 3879 # limit the # of concurrent backtraces
3625 if ($_log_backtrace < 2) { 3880 if ($_log_backtrace < 2) {
3626 ++$_log_backtrace; 3881 ++$_log_backtrace;
3627 async { 3882 async {
3883 $Coro::current->{desc} = "abt $msg";
3884
3628 my @bt = fork_call { 3885 my @bt = fork_call {
3629 @addr = map { sprintf "%x", $_ } @addr; 3886 @addr = map { sprintf "%x", $_ } @addr;
3630 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3887 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3631 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3888 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3632 or die "addr2line: $!"; 3889 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines