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.361 by root, Sun Sep 9 12:52:48 2007 UTC vs.
Revision 1.418 by root, Fri Apr 11 21:09:53 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
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV 3.2;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
14 35
15use Coro 3.64 (); 36use Coro 4.50 ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::Event; 39use Coro::EV;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
22use Coro::AIO; 43use Coro::AIO;
44use Coro::BDB;
23use Coro::Storable; 45use Coro::Storable;
24use Coro::Util (); 46use Coro::Util ();
25 47
26use JSON::XS (); 48use JSON::XS 2.01 ();
27use BDB (); 49use BDB ();
28use Data::Dumper; 50use Data::Dumper;
29use Digest::MD5; 51use Digest::MD5;
30use Fcntl; 52use Fcntl;
31use YAML::Syck (); 53use YAML ();
32use IO::AIO 2.32 (); 54use IO::AIO 2.51 ();
33use Time::HiRes; 55use Time::HiRes;
34use Compress::LZF; 56use Compress::LZF;
35use Digest::MD5 (); 57use Digest::MD5 ();
36 58
37# configure various modules to our taste 59# configure various modules to our taste
38# 60#
39$Storable::canonical = 1; # reduce rsync transfers 61$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 62Coro::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 63Compress::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 64
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 66
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 68
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 87our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 89our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 90our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 91our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE;
75 93
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER; 95our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 97our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 98our $USE_FSYNC = 1; # use fsync to write maps - default off
83 99
84our $BDB_POLL_WATCHER; 100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 104our $DB_ENV;
86 105
87our %CFG; 106our %CFG;
88 107
89our $UPTIME; $UPTIME ||= time; 108our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 109our $RUNTIME;
110our $NOW;
91 111
92our (%PLAYER, %PLAYER_LOADING); # all users 112our (%PLAYER, %PLAYER_LOADING); # all users
93our (%MAP, %MAP_LOADING ); # all maps 113our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 114our $LINK_MAP; # the special {link} map, which is always available
95 115
96# used to convert map paths into valid unix filenames by replacing / by ∕ 116# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 118
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
102 123
103binmode STDOUT; 124binmode STDOUT;
104binmode STDERR; 125binmode STDERR;
105 126
106# read virtual server time, if available 127# read virtual server time, if available
159 180
160The raw value load value from the last tick. 181The raw value load value from the last tick.
161 182
162=item %cf::CFG 183=item %cf::CFG
163 184
164Configuration for the server, loaded from C</etc/crossfire/config>, or 185Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 186from wherever your confdir points to.
166 187
167=item cf::wait_for_tick, cf::wait_for_tick_begin 188=item cf::wait_for_tick, cf::wait_for_tick_begin
168 189
169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 190These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
187 $msg .= "\n" 208 $msg .= "\n"
188 unless $msg =~ /\n$/; 209 unless $msg =~ /\n$/;
189 210
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 212
192 utf8::encode $msg;
193 LOG llevError, $msg; 213 LOG llevError, $msg;
194 }; 214 };
195} 215}
216
217$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "=="
219
220 if ($Coro::current == $Coro::main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d#
223 }#d#
224
225 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate
228};
229
230$SIG{__DIE__} = sub { }; #d#?
196 231
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
213)) { 248)) {
214 no strict 'refs'; 249 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 251}
217 252
218$Event::DIED = sub { 253$EV::DIED = sub {
219 warn "error in event callback: @_"; 254 warn "error in event callback: @_";
220}; 255};
221 256
222############################################################################# 257#############################################################################
223 258
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 281 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 282 $d
248 } || "[unable to dump $_[0]: '$@']"; 283 } || "[unable to dump $_[0]: '$@']";
249} 284}
250 285
251=item $ref = cf::from_json $json 286=item $ref = cf::decode_json $json
252 287
253Converts a JSON string into the corresponding perl data structure. 288Converts a JSON string into the corresponding perl data structure.
254 289
255=item $json = cf::to_json $ref 290=item $json = cf::encode_json $ref
256 291
257Converts a perl data structure into its JSON representation. 292Converts a perl data structure into its JSON representation.
258 293
259=cut 294=cut
260 295
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 297
263sub to_json ($) { $json_coder->encode ($_[0]) } 298sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 299sub decode_json($) { $json_coder->decode ($_[0]) }
265 300
266=item cf::lock_wait $string 301=item cf::lock_wait $string
267 302
268Wait until the given lock is available. See cf::lock_acquire. 303Wait until the given lock is available. See cf::lock_acquire.
269 304
325 360
326 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
327} 362}
328 363
329sub freeze_mainloop { 364sub freeze_mainloop {
330 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
331 366
332 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
333 $TICK_WATCHER->start; 368}
334 }; 369
335 $TICK_WATCHER->stop; 370=item cf::periodic $interval, $cb
336 $guard 371
372Like EV::periodic, but randomly selects a starting point so that the actions
373get spread over timer.
374
375=cut
376
377sub periodic($$) {
378 my ($interval, $cb) = @_;
379
380 my $start = rand List::Util::min 180, $interval;
381
382 EV::periodic $start, $interval, 0, $cb
337} 383}
338 384
339=item cf::get_slot $time[, $priority[, $name]] 385=item cf::get_slot $time[, $priority[, $name]]
340 386
341Allocate $time seconds of blocking CPU time at priority C<$priority>: 387Allocate $time seconds of blocking CPU time at priority C<$priority>:
352our @SLOT_QUEUE; 398our @SLOT_QUEUE;
353our $SLOT_QUEUE; 399our $SLOT_QUEUE;
354 400
355$SLOT_QUEUE->cancel if $SLOT_QUEUE; 401$SLOT_QUEUE->cancel if $SLOT_QUEUE;
356$SLOT_QUEUE = Coro::async { 402$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager");
404
357 my $signal = new Coro::Signal; 405 my $signal = new Coro::Signal;
358 406
359 while () { 407 while () {
360 next_job: 408 next_job:
361 my $avail = cf::till_tick; 409 my $avail = cf::till_tick;
369 } 417 }
370 } 418 }
371 } 419 }
372 420
373 if (@SLOT_QUEUE) { 421 if (@SLOT_QUEUE) {
374 # we do not use wait_For_tick() as it returns immediately when tick is inactive 422 # we do not use wait_for_tick() as it returns immediately when tick is inactive
375 push @cf::WAIT_FOR_TICK, $signal; 423 push @cf::WAIT_FOR_TICK, $signal;
376 $signal->wait; 424 $signal->wait;
377 } else { 425 } else {
378 Coro::schedule; 426 Coro::schedule;
379 } 427 }
402 450
403BEGIN { *async = \&Coro::async_pool } 451BEGIN { *async = \&Coro::async_pool }
404 452
405=item cf::sync_job { BLOCK } 453=item cf::sync_job { BLOCK }
406 454
407The design of Crossfire TRT requires that the main coroutine ($Coro::main) 455The design of Deliantra requires that the main coroutine ($Coro::main)
408is always able to handle events or runnable, as Crossfire TRT is only 456is always able to handle events or runnable, as Deliantra is only
409partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 457partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
410acceptable. 458acceptable.
411 459
412If it must be done, put the blocking parts into C<sync_job>. This will run 460If it must be done, put the blocking parts into C<sync_job>. This will run
413the given BLOCK in another coroutine while waiting for the result. The 461the given BLOCK in another coroutine while waiting for the result. The
418 466
419sub sync_job(&) { 467sub sync_job(&) {
420 my ($job) = @_; 468 my ($job) = @_;
421 469
422 if ($Coro::current == $Coro::main) { 470 if ($Coro::current == $Coro::main) {
423 my $time = Event::time; 471 my $time = EV::time;
424 472
425 # this is the main coro, too bad, we have to block 473 # this is the main coro, too bad, we have to block
426 # till the operation succeeds, freezing the server :/ 474 # till the operation succeeds, freezing the server :/
427 475
428 # TODO: use suspend/resume instead 476 LOG llevError, Carp::longmess "sync job";#d#
429 # (but this is cancel-safe) 477
430 my $freeze_guard = freeze_mainloop; 478 my $freeze_guard = freeze_mainloop;
431 479
432 my $busy = 1; 480 my $busy = 1;
433 my @res; 481 my @res;
434 482
435 (async { 483 (async {
484 $Coro::current->desc ("sync job coro");
436 @res = eval { $job->() }; 485 @res = eval { $job->() };
437 warn $@ if $@; 486 warn $@ if $@;
438 undef $busy; 487 undef $busy;
439 })->prio (Coro::PRIO_MAX); 488 })->prio (Coro::PRIO_MAX);
440 489
441 while ($busy) { 490 while ($busy) {
442 Coro::cede or Event::one_event; 491 if (Coro::nready) {
492 Coro::cede_notself;
493 } else {
494 EV::loop EV::LOOP_ONESHOT;
443 } 495 }
496 }
444 497
445 $time = Event::time - $time; 498 my $time = EV::time - $time;
446 499
447 LOG llevError | logBacktrace, Carp::longmess "long sync job"
448 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
449
450 $tick_start += $time; # do not account sync jobs to server load 500 $TICK_START += $time; # do not account sync jobs to server load
451 501
452 wantarray ? @res : $res[0] 502 wantarray ? @res : $res[0]
453 } else { 503 } else {
454 # we are in another coroutine, how wonderful, everything just works 504 # we are in another coroutine, how wonderful, everything just works
455 505
480=item fork_call { }, $args 530=item fork_call { }, $args
481 531
482Executes the given code block with the given arguments in a seperate 532Executes the given code block with the given arguments in a seperate
483process, returning the results. Everything must be serialisable with 533process, returning the results. Everything must be serialisable with
484Coro::Storable. May, of course, block. Note that the executed sub may 534Coro::Storable. May, of course, block. Note that the executed sub may
485never block itself or use any form of Event handling. 535never block itself or use any form of event handling.
486 536
487=cut 537=cut
488 538
489sub fork_call(&@) { 539sub fork_call(&@) {
490 my ($cb, @args) = @_; 540 my ($cb, @args) = @_;
499 }, @args; 549 }, @args;
500 550
501 wantarray ? @res : $res[-1] 551 wantarray ? @res : $res[-1]
502} 552}
503 553
554=item $coin = coin_from_name $name
555
556=cut
557
558our %coin_alias = (
559 "silver" => "silvercoin",
560 "silvercoin" => "silvercoin",
561 "silvercoins" => "silvercoin",
562 "gold" => "goldcoin",
563 "goldcoin" => "goldcoin",
564 "goldcoins" => "goldcoin",
565 "platinum" => "platinacoin",
566 "platinumcoin" => "platinacoin",
567 "platinumcoins" => "platinacoin",
568 "platina" => "platinacoin",
569 "platinacoin" => "platinacoin",
570 "platinacoins" => "platinacoin",
571 "royalty" => "royalty",
572 "royalties" => "royalty",
573);
574
575sub coin_from_name($) {
576 $coin_alias{$_[0]}
577 ? cf::arch::find $coin_alias{$_[0]}
578 : undef
579}
580
504=item $value = cf::db_get $family => $key 581=item $value = cf::db_get $family => $key
505 582
506Returns a single value from the environment database. 583Returns a single value from the environment database.
507 584
508=item cf::db_put $family => $key => $value 585=item cf::db_put $family => $key => $value
509 586
510Stores the given C<$value> in the family. It can currently store binary 587Stores the given C<$value> in the family. It can currently store binary
511data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 588data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
512 589
590=item $db = cf::db_table "name"
591
592Create and/or open a new database table. The string must not be "db" and must be unique
593within each server.
594
513=cut 595=cut
596
597sub db_table($) {
598 my ($name) = @_;
599 my $db = BDB::db_create $DB_ENV;
600
601 eval {
602 $db->set_flags (BDB::CHKSUM);
603
604 utf8::encode $name;
605 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
606 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
607 cf::cleanup "db_open(db): $!" if $!;
608 };
609 cf::cleanup "db_open(db): $@" if $@;
610
611 $db
612}
514 613
515our $DB; 614our $DB;
516 615
517sub db_init { 616sub db_init {
518 unless ($DB) {
519 $DB = BDB::db_create $DB_ENV;
520
521 cf::sync_job { 617 cf::sync_job {
522 eval { 618 $DB ||= db_table "db";
523 $DB->set_flags (BDB::CHKSUM);
524
525 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
526 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
527 cf::cleanup "db_open(db): $!" if $!;
528 };
529 cf::cleanup "db_open(db): $@" if $@;
530 };
531 } 619 };
532} 620}
533 621
534sub db_get($$) { 622sub db_get($$) {
535 my $key = "$_[0]/$_[1]"; 623 my $key = "$_[0]/$_[1]";
536 624
640attach callbacks/event handlers (a collection of which is called an "attachment") 728attach callbacks/event handlers (a collection of which is called an "attachment")
641to it. All such attachable objects support the following methods. 729to it. All such attachable objects support the following methods.
642 730
643In the following description, CLASS can be any of C<global>, C<object> 731In the following description, CLASS can be any of C<global>, C<object>
644C<player>, C<client> or C<map> (i.e. the attachable objects in 732C<player>, C<client> or C<map> (i.e. the attachable objects in
645Crossfire TRT). 733Deliantra).
646 734
647=over 4 735=over 4
648 736
649=item $attachable->attach ($attachment, key => $value...) 737=item $attachable->attach ($attachment, key => $value...)
650 738
932 } 1020 }
933 1021
934 0 1022 0
935} 1023}
936 1024
937=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1025=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
938 1026
939=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1027=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
940 1028
941Generate an object-specific event with the given arguments. 1029Generate an object-specific event with the given arguments.
942 1030
948 1036
949=cut 1037=cut
950 1038
951############################################################################# 1039#############################################################################
952# object support 1040# object support
953#
954 1041
1042sub _object_equal($$);
1043sub _object_equal($$) {
1044 my ($a, $b) = @_;
1045
1046 return 0 unless (ref $a) eq (ref $b);
1047
1048 if ("HASH" eq ref $a) {
1049 my @ka = keys %$a;
1050 my @kb = keys %$b;
1051
1052 return 0 if @ka != @kb;
1053
1054 for (0 .. $#ka) {
1055 return 0 unless $ka[$_] eq $kb[$_];
1056 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1057 }
1058
1059 } elsif ("ARRAY" eq ref $a) {
1060
1061 return 0 if @$a != @$b;
1062
1063 for (0 .. $#$a) {
1064 return 0 unless _object_equal $a->[$_], $b->[$_];
1065 }
1066
1067 } elsif ($a ne $b) {
1068 return 0;
1069 }
1070
1071 1
1072}
1073
1074our $SLOW_MERGES;#d#
955sub _can_merge { 1075sub _can_merge {
956 my ($ob1, $ob2) = @_; 1076 my ($ob1, $ob2) = @_;
957 1077
958 local $Storable::canonical = 1; 1078 ++$SLOW_MERGES;#d#
959 my $fob1 = Storable::freeze $ob1;
960 my $fob2 = Storable::freeze $ob2;
961 1079
962 $fob1 eq $fob2 1080 # we do the slow way here
1081 return _object_equal $ob1, $ob2
963} 1082}
964 1083
965sub reattach { 1084sub reattach {
966 # basically do the same as instantiate, without calling instantiate 1085 # basically do the same as instantiate, without calling instantiate
967 my ($obj) = @_; 1086 my ($obj) = @_;
989cf::attachable->attach ( 1108cf::attachable->attach (
990 prio => -1000000, 1109 prio => -1000000,
991 on_instantiate => sub { 1110 on_instantiate => sub {
992 my ($obj, $data) = @_; 1111 my ($obj, $data) = @_;
993 1112
994 $data = from_json $data; 1113 $data = decode_json $data;
995 1114
996 for (@$data) { 1115 for (@$data) {
997 my ($name, $args) = @$_; 1116 my ($name, $args) = @$_;
998 1117
999 $obj->attach ($name, %{$args || {} }); 1118 $obj->attach ($name, %{$args || {} });
1013); 1132);
1014 1133
1015sub object_freezer_save { 1134sub object_freezer_save {
1016 my ($filename, $rdata, $objs) = @_; 1135 my ($filename, $rdata, $objs) = @_;
1017 1136
1018 my $guard = cf::lock_acquire "io";
1019
1020 sync_job { 1137 sync_job {
1021 if (length $$rdata) { 1138 if (length $$rdata) {
1139 utf8::decode (my $decname = $filename);
1022 warn sprintf "saving %s (%d,%d)\n", 1140 warn sprintf "saving %s (%d,%d)\n",
1023 $filename, length $$rdata, scalar @$objs; 1141 $decname, length $$rdata, scalar @$objs;
1024 1142
1025 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1026 chmod SAVE_MODE, $fh; 1144 chmod SAVE_MODE, $fh;
1027 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1028 aio_fsync $fh if $cf::USE_FSYNC; 1146 aio_fsync $fh if $cf::USE_FSYNC;
1029 close $fh; 1147 close $fh;
1030 1148
1031 if (@$objs) { 1149 if (@$objs) {
1032 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1150 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1033 chmod SAVE_MODE, $fh; 1151 chmod SAVE_MODE, $fh;
1034 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1035 aio_write $fh, 0, (length $data), $data, 0; 1153 aio_write $fh, 0, (length $data), $data, 0;
1036 aio_fsync $fh if $cf::USE_FSYNC; 1154 aio_fsync $fh if $cf::USE_FSYNC;
1037 close $fh; 1155 close $fh;
1038 aio_rename "$filename.pst~", "$filename.pst"; 1156 aio_rename "$filename.pst~", "$filename.pst";
1039 } 1157 }
1048 } else { 1166 } else {
1049 aio_unlink $filename; 1167 aio_unlink $filename;
1050 aio_unlink "$filename.pst"; 1168 aio_unlink "$filename.pst";
1051 } 1169 }
1052 }; 1170 };
1053
1054 undef $guard;
1055} 1171}
1056 1172
1057sub object_freezer_as_string { 1173sub object_freezer_as_string {
1058 my ($rdata, $objs) = @_; 1174 my ($rdata, $objs) = @_;
1059 1175
1064 1180
1065sub object_thawer_load { 1181sub object_thawer_load {
1066 my ($filename) = @_; 1182 my ($filename) = @_;
1067 1183
1068 my ($data, $av); 1184 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1071 1185
1072 (aio_load $filename, $data) >= 0 1186 (aio_load $filename, $data) >= 0
1073 or return; 1187 or return;
1074 1188
1075 unless (aio_stat "$filename.pst") { 1189 unless (aio_stat "$filename.pst") {
1076 (aio_load "$filename.pst", $av) >= 0 1190 (aio_load "$filename.pst", $av) >= 0
1077 or return; 1191 or return;
1078 1192
1079 undef $guard;
1080 $av = eval { (Storable::thaw $av)->{objs} }; 1193 my $st = eval { Coro::Storable::thaw $av };
1194 $av = $st->{objs};
1081 } 1195 }
1082 1196
1197 utf8::decode (my $decname = $filename);
1083 warn sprintf "loading %s (%d)\n", 1198 warn sprintf "loading %s (%d,%d)\n",
1084 $filename, length $data, scalar @{$av || []}; 1199 $decname, length $data, scalar @{$av || []};
1085 1200
1086 ($data, $av) 1201 ($data, $av)
1087} 1202}
1088 1203
1089=head2 COMMAND CALLBACKS 1204=head2 COMMAND CALLBACKS
1240 my $msg = $@ ? "$v->{path}: $@\n" 1355 my $msg = $@ ? "$v->{path}: $@\n"
1241 : "$v->{base}: extension inactive.\n"; 1356 : "$v->{base}: extension inactive.\n";
1242 1357
1243 if (exists $v->{meta}{mandatory}) { 1358 if (exists $v->{meta}{mandatory}) {
1244 warn $msg; 1359 warn $msg;
1245 warn "mandatory extension failed to load, exiting.\n"; 1360 cf::cleanup "mandatory extension failed to load, exiting.";
1246 exit 1;
1247 } 1361 }
1248 1362
1249 warn $msg; 1363 warn $msg;
1250 } 1364 }
1251 1365
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1452 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1453
1340 my $f = new_from_file cf::object::thawer path $login 1454 my $f = new_from_file cf::object::thawer path $login
1341 or return; 1455 or return;
1342 1456
1343 $f->next;
1344 my $pl = cf::player::load_pl $f 1457 my $pl = cf::player::load_pl $f
1345 or return; 1458 or return;
1346 local $cf::PLAYER_LOADING{$login} = $pl; 1459 local $cf::PLAYER_LOADING{$login} = $pl;
1347 $f->resolve_delayed_derefs; 1460 $f->resolve_delayed_derefs;
1348 $cf::PLAYER{$login} = $pl 1461 $cf::PLAYER{$login} = $pl
1500 1613
1501Expand crossfire pod fragments into protocol xml. 1614Expand crossfire pod fragments into protocol xml.
1502 1615
1503=cut 1616=cut
1504 1617
1618use re 'eval';
1619
1620my $group;
1621my $interior; $interior = qr{
1622 # match a pod interior sequence sans C<< >>
1623 (?:
1624 \ (.*?)\ (?{ $group = $^N })
1625 | < (??{$interior}) >
1626 )
1627}x;
1628
1505sub expand_cfpod { 1629sub expand_cfpod {
1506 ((my $self), (local $_)) = @_; 1630 my ($self, $pod) = @_;
1507 1631
1508 # escape & and < 1632 my $xml;
1509 s/&/&amp;/g;
1510 s/(?<![BIUGHT])</&lt;/g;
1511 1633
1512 # this is buggy, it needs to properly take care of nested <'s 1634 while () {
1635 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1636 $group = $1;
1513 1637
1514 1 while 1638 $group =~ s/&/&amp;/g;
1515 # replace B<>, I<>, U<> etc. 1639 $group =~ s/</&lt;/g;
1516 s/B<([^\>]*)>/<b>$1<\/b>/ 1640
1517 || s/I<([^\>]*)>/<i>$1<\/i>/ 1641 $xml .= $group;
1518 || s/U<([^\>]*)>/<u>$1<\/u>/ 1642 } elsif ($pod =~ m%\G
1519 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1643 ([BCGHITU])
1520 # replace G<male|female> tags 1644 <
1521 || s{G<([^>|]*)\|([^>]*)>}{ 1645 (?:
1522 $self->gender ? $2 : $1 1646 ([^<>]*) (?{ $group = $^N })
1523 }ge 1647 | < $interior >
1524 # replace H<hint text> 1648 )
1525 || s{H<([^\>]*)>} 1649 >
1650 %gcsx
1526 { 1651 ) {
1652 my ($code, $data) = ($1, $group);
1653
1654 if ($code eq "B") {
1655 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1656 } elsif ($code eq "I") {
1657 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1658 } elsif ($code eq "U") {
1659 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1660 } elsif ($code eq "C") {
1661 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1662 } elsif ($code eq "T") {
1663 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1664 } elsif ($code eq "G") {
1665 my ($male, $female) = split /\|/, $data;
1666 $data = $self->gender ? $female : $male;
1667 $xml .= expand_cfpod ($self, $data);
1668 } elsif ($code eq "H") {
1527 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1669 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1528 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1670 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1529 "") 1671 "")
1530 [$self->{hintmode}] 1672 [$self->{hintmode}];
1673 } else {
1674 $xml .= "error processing '$code($data)' directive";
1531 }ge; 1675 }
1676 } else {
1677 if ($pod =~ /\G(.+)/) {
1678 warn "parse error while expanding $pod (at $1)";
1679 }
1680 last;
1681 }
1682 }
1532 1683
1684 for ($xml) {
1533 # create single paragraphs (very hackish) 1685 # create single paragraphs (very hackish)
1534 s/(?<=\S)\n(?=\w)/ /g; 1686 s/(?<=\S)\n(?=\w)/ /g;
1535 1687
1536 # compress some whitespace 1688 # compress some whitespace
1537 s/\s+\n/\n/g; # ws line-ends 1689 s/\s+\n/\n/g; # ws line-ends
1538 s/\n\n+/\n/g; # double lines 1690 s/\n\n+/\n/g; # double lines
1539 s/^\n+//; # beginning lines 1691 s/^\n+//; # beginning lines
1540 s/\n+$//; # ending lines 1692 s/\n+$//; # ending lines
1693 }
1541 1694
1542 $_ 1695 $xml
1543} 1696}
1697
1698no re 'eval';
1544 1699
1545sub hintmode { 1700sub hintmode {
1546 $_[0]{hintmode} = $_[1] if @_ > 1; 1701 $_[0]{hintmode} = $_[1] if @_ > 1;
1547 $_[0]{hintmode} 1702 $_[0]{hintmode}
1548} 1703}
1620our $MAX_RESET = 3600; 1775our $MAX_RESET = 3600;
1621our $DEFAULT_RESET = 3000; 1776our $DEFAULT_RESET = 3000;
1622 1777
1623sub generate_random_map { 1778sub generate_random_map {
1624 my ($self, $rmp) = @_; 1779 my ($self, $rmp) = @_;
1780
1781 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1782
1625 # mit "rum" bekleckern, nicht 1783 # mit "rum" bekleckern, nicht
1626 $self->_create_random_map ( 1784 $self->_create_random_map (
1627 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1785 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1628 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1786 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1629 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1787 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
2029 } 2187 }
2030 2188
2031 $MAP_PREFETCH{$path} |= $load; 2189 $MAP_PREFETCH{$path} |= $load;
2032 2190
2033 $MAP_PREFETCHER ||= cf::async { 2191 $MAP_PREFETCHER ||= cf::async {
2192 $Coro::current->{desc} = "map prefetcher";
2193
2034 while (%MAP_PREFETCH) { 2194 while (%MAP_PREFETCH) {
2035 while (my ($k, $v) = each %MAP_PREFETCH) { 2195 while (my ($k, $v) = each %MAP_PREFETCH) {
2036 if (my $map = find $k) { 2196 if (my $map = find $k) {
2037 $map->load if $v; 2197 $map->load if $v;
2038 } 2198 }
2064 return if $self->{deny_save}; 2224 return if $self->{deny_save};
2065 2225
2066 local $self->{last_access} = $self->last_access;#d# 2226 local $self->{last_access} = $self->last_access;#d#
2067 2227
2068 cf::async { 2228 cf::async {
2229 $Coro::current->{desc} = "map player save";
2069 $_->contr->save for $self->players; 2230 $_->contr->save for $self->players;
2070 }; 2231 };
2071 2232
2072 if ($uniq) { 2233 if ($uniq) {
2073 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2234 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2219 : () 2380 : ()
2220 } @{ aio_readdir $UNIQUEDIR or [] } 2381 } @{ aio_readdir $UNIQUEDIR or [] }
2221 ] 2382 ]
2222} 2383}
2223 2384
2224package cf;
2225
2226=back 2385=back
2227 2386
2228=head3 cf::object 2387=head3 cf::object
2229 2388
2230=cut 2389=cut
2260=cut 2419=cut
2261 2420
2262sub deref { 2421sub deref {
2263 my ($ref) = @_; 2422 my ($ref) = @_;
2264 2423
2265 # temporary compatibility#TODO#remove
2266 $ref =~ s{^<}{player/<};
2267
2268 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2424 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2269 my ($uuid, $name) = ($1, $2); 2425 my ($uuid, $name) = ($1, $2);
2270 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2426 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2271 or return; 2427 or return;
2272 $pl->ob->uuid eq $uuid 2428 $pl->ob->uuid eq $uuid
2273 or return; 2429 or return;
2444 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2600 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2445 2601
2446 $self->enter_link; 2602 $self->enter_link;
2447 2603
2448 (async { 2604 (async {
2605 $Coro::current->{desc} = "player::goto $path $x $y";
2606
2607 # *tag paths override both path and x|y
2608 if ($path =~ /^\*(.*)$/) {
2609 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2610 my $ob = $obs[rand @obs];
2611
2612 # see if we actually can go there
2613 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2614 $ob = $obs[rand @obs];
2615 } else {
2616 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2617 }
2618 # else put us there anyways for now #d#
2619
2620 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2621 } else {
2622 ($path, $x, $y) = (undef, undef, undef);
2623 }
2624 }
2625
2449 my $map = eval { 2626 my $map = eval {
2450 my $map = cf::map::find $path; 2627 my $map = defined $path ? cf::map::find $path : undef;
2451 2628
2452 if ($map) { 2629 if ($map) {
2453 $map = $map->customise_for ($self); 2630 $map = $map->customise_for ($self);
2454 $map = $check->($map) if $check && $map; 2631 $map = $check->($map) if $check && $map;
2455 } else { 2632 } else {
2456 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2633 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2457 } 2634 }
2458 2635
2459 $map 2636 $map
2460 }; 2637 };
2461 2638
2514 $rmp->{origin_y} = $exit->y; 2691 $rmp->{origin_y} = $exit->y;
2515 } 2692 }
2516 2693
2517 $rmp->{random_seed} ||= $exit->random_seed; 2694 $rmp->{random_seed} ||= $exit->random_seed;
2518 2695
2519 my $data = cf::to_json $rmp; 2696 my $data = cf::encode_json $rmp;
2520 my $md5 = Digest::MD5::md5_hex $data; 2697 my $md5 = Digest::MD5::md5_hex $data;
2521 my $meta = "$RANDOMDIR/$md5.meta"; 2698 my $meta = "$RANDOMDIR/$md5.meta";
2522 2699
2523 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2700 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2524 aio_write $fh, 0, (length $data), $data, 0; 2701 aio_write $fh, 0, (length $data), $data, 0;
2551 # if exit is damned, update players death & WoR home-position 2728 # if exit is damned, update players death & WoR home-position
2552 $self->contr->savebed ($slaying, $hp, $sp) 2729 $self->contr->savebed ($slaying, $hp, $sp)
2553 if $exit->flag (FLAG_DAMNED); 2730 if $exit->flag (FLAG_DAMNED);
2554 2731
2555 (async { 2732 (async {
2733 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2734
2556 $self->deactivate_recursive; # just to be sure 2735 $self->deactivate_recursive; # just to be sure
2557 unless (eval { 2736 unless (eval {
2558 $self->goto ($slaying, $hp, $sp); 2737 $self->goto ($slaying, $hp, $sp);
2559 2738
2560 1; 2739 1;
2595the message, with C<log> being the default. If C<$color> is negative, suppress 2774the message, with C<log> being the default. If C<$color> is negative, suppress
2596the message unless the client supports the msg packet. 2775the message unless the client supports the msg packet.
2597 2776
2598=cut 2777=cut
2599 2778
2779# non-persistent channels (usually the info channel)
2600our %CHANNEL = ( 2780our %CHANNEL = (
2601 "c/identify" => { 2781 "c/identify" => {
2602 id => "identify", 2782 id => "infobox",
2603 title => "Identify", 2783 title => "Identify",
2604 reply => undef, 2784 reply => undef,
2605 tooltip => "Items recently identified", 2785 tooltip => "Items recently identified",
2606 }, 2786 },
2607 "c/examine" => { 2787 "c/examine" => {
2608 id => "examine", 2788 id => "infobox",
2609 title => "Examine", 2789 title => "Examine",
2610 reply => undef, 2790 reply => undef,
2611 tooltip => "Signs and other items you examined", 2791 tooltip => "Signs and other items you examined",
2612 }, 2792 },
2793 "c/book" => {
2794 id => "infobox",
2795 title => "Book",
2796 reply => undef,
2797 tooltip => "The contents of a note or book",
2798 },
2799 "c/lookat" => {
2800 id => "infobox",
2801 title => "Look",
2802 reply => undef,
2803 tooltip => "What you saw there",
2804 },
2805 "c/who" => {
2806 id => "infobox",
2807 title => "Players",
2808 reply => undef,
2809 tooltip => "Shows players who are currently online",
2810 },
2811 "c/body" => {
2812 id => "infobox",
2813 title => "Body Parts",
2814 reply => undef,
2815 tooltip => "Shows which body parts you posess and are available",
2816 },
2817 "c/uptime" => {
2818 id => "infobox",
2819 title => "Uptime",
2820 reply => undef,
2821 tooltip => "How long the server has been running since last restart",
2822 },
2823 "c/mapinfo" => {
2824 id => "infobox",
2825 title => "Map Info",
2826 reply => undef,
2827 tooltip => "Information related to the maps",
2828 },
2613); 2829);
2614 2830
2615sub cf::client::send_msg { 2831sub cf::client::send_msg {
2616 my ($self, $channel, $msg, $color, @extra) = @_; 2832 my ($self, $channel, $msg, $color, @extra) = @_;
2617 2833
2618 $msg = $self->pl->expand_cfpod ($msg); 2834 $msg = $self->pl->expand_cfpod ($msg);
2619 2835
2620 $color &= cf::NDI_CLIENT_MASK; # just in case... 2836 $color &= cf::NDI_CLIENT_MASK; # just in case...
2621 2837
2622 # check predefined channels, for the benefit of C 2838 # check predefined channels, for the benefit of C
2623 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2839 if ($CHANNEL{$channel}) {
2840 $channel = $CHANNEL{$channel};
2624 2841
2842 $self->ext_msg (channel_info => $channel)
2843 if $self->can_msg;
2844
2845 $channel = $channel->{id};
2846
2625 if (ref $channel) { 2847 } elsif (ref $channel) {
2626 # send meta info to client, if not yet sent 2848 # send meta info to client, if not yet sent
2627 unless (exists $self->{channel}{$channel->{id}}) { 2849 unless (exists $self->{channel}{$channel->{id}}) {
2628 $self->{channel}{$channel->{id}} = $channel; 2850 $self->{channel}{$channel->{id}} = $channel;
2629 $self->ext_msg (channel_info => $channel) 2851 $self->ext_msg (channel_info => $channel)
2630 if $self->can_msg; 2852 if $self->can_msg;
2847=pod 3069=pod
2848 3070
2849The following functions and methods are available within a safe environment: 3071The following functions and methods are available within a safe environment:
2850 3072
2851 cf::object 3073 cf::object
2852 contr pay_amount pay_player map x y force_find force_add 3074 contr pay_amount pay_player map x y force_find force_add destroy
2853 insert remove name archname title slaying race decrease_ob_nr 3075 insert remove name archname title slaying race decrease_ob_nr
2854 3076
2855 cf::object::player 3077 cf::object::player
2856 player 3078 player
2857 3079
2864=cut 3086=cut
2865 3087
2866for ( 3088for (
2867 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3089 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2868 insert remove inv name archname title slaying race 3090 insert remove inv name archname title slaying race
2869 decrease_ob_nr)], 3091 decrease_ob_nr destroy)],
2870 ["cf::object::player" => qw(player)], 3092 ["cf::object::player" => qw(player)],
2871 ["cf::player" => qw(peaceful)], 3093 ["cf::player" => qw(peaceful)],
2872 ["cf::map" => qw(trigger)], 3094 ["cf::map" => qw(trigger)],
2873) { 3095) {
2874 no strict 'refs'; 3096 no strict 'refs';
2979 { 3201 {
2980 my $faces = $facedata->{faceinfo}; 3202 my $faces = $facedata->{faceinfo};
2981 3203
2982 while (my ($face, $info) = each %$faces) { 3204 while (my ($face, $info) = each %$faces) {
2983 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3205 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3206
2984 cf::face::set_visibility $idx, $info->{visibility}; 3207 cf::face::set_visibility $idx, $info->{visibility};
2985 cf::face::set_magicmap $idx, $info->{magicmap}; 3208 cf::face::set_magicmap $idx, $info->{magicmap};
2986 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3209 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2987 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3210 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2988 3211
2989 cf::cede_to_tick; 3212 cf::cede_to_tick;
2990 } 3213 }
2991 3214
2992 while (my ($face, $info) = each %$faces) { 3215 while (my ($face, $info) = each %$faces) {
2993 next unless $info->{smooth}; 3216 next unless $info->{smooth};
3217
2994 my $idx = cf::face::find $face 3218 my $idx = cf::face::find $face
2995 or next; 3219 or next;
3220
2996 if (my $smooth = cf::face::find $info->{smooth}) { 3221 if (my $smooth = cf::face::find $info->{smooth}) {
2997 cf::face::set_smooth $idx, $smooth; 3222 cf::face::set_smooth $idx, $smooth;
2998 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3223 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2999 } else { 3224 } else {
3000 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3225 warn "smooth face '$info->{smooth}' not found for face '$face'";
3018 { 3243 {
3019 # TODO: for gcfclient pleasure, we should give resources 3244 # TODO: for gcfclient pleasure, we should give resources
3020 # that gcfclient doesn't grok a >10000 face index. 3245 # that gcfclient doesn't grok a >10000 face index.
3021 my $res = $facedata->{resource}; 3246 my $res = $facedata->{resource};
3022 3247
3023 my $soundconf = delete $res->{"res/sound.conf"};
3024
3025 while (my ($name, $info) = each %$res) { 3248 while (my ($name, $info) = each %$res) {
3249 if (defined $info->{type}) {
3026 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3250 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3027 my $data; 3251 my $data;
3028 3252
3029 if ($info->{type} & 1) { 3253 if ($info->{type} & 1) {
3030 # prepend meta info 3254 # prepend meta info
3031 3255
3032 my $meta = $enc->encode ({ 3256 my $meta = $enc->encode ({
3033 name => $name, 3257 name => $name,
3034 %{ $info->{meta} || {} }, 3258 %{ $info->{meta} || {} },
3035 }); 3259 });
3036 3260
3037 $data = pack "(w/a*)*", $meta, $info->{data}; 3261 $data = pack "(w/a*)*", $meta, $info->{data};
3262 } else {
3263 $data = $info->{data};
3264 }
3265
3266 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3267 cf::face::set_type $idx, $info->{type};
3038 } else { 3268 } else {
3039 $data = $info->{data}; 3269 $RESOURCE{$name} = $info;
3040 } 3270 }
3041 3271
3042 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3043 cf::face::set_type $idx, $info->{type};
3044
3045 cf::cede_to_tick; 3272 cf::cede_to_tick;
3046 } 3273 }
3047
3048 if ($soundconf) {
3049 $soundconf = $enc->decode (delete $soundconf->{data});
3050
3051 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3052 my $sound = $soundconf->{compat}[$_]
3053 or next;
3054
3055 my $face = cf::face::find "sound/$sound->[1]";
3056 cf::sound::set $sound->[0] => $face;
3057 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3058 }
3059
3060 while (my ($k, $v) = each %{$soundconf->{event}}) {
3061 my $face = cf::face::find "sound/$v";
3062 cf::sound::set $k => $face;
3063 }
3064 }
3065 } 3274 }
3275
3276 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3066 3277
3067 1 3278 1
3068} 3279}
3280
3281cf::global->attach (on_resource_update => sub {
3282 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3283 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3284
3285 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3286 my $sound = $soundconf->{compat}[$_]
3287 or next;
3288
3289 my $face = cf::face::find "sound/$sound->[1]";
3290 cf::sound::set $sound->[0] => $face;
3291 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3292 }
3293
3294 while (my ($k, $v) = each %{$soundconf->{event}}) {
3295 my $face = cf::face::find "sound/$v";
3296 cf::sound::set $k => $face;
3297 }
3298 }
3299});
3069 3300
3070register_exticmd fx_want => sub { 3301register_exticmd fx_want => sub {
3071 my ($ns, $want) = @_; 3302 my ($ns, $want) = @_;
3072 3303
3073 while (my ($k, $v) = each %$want) { 3304 while (my ($k, $v) = each %$want) {
3128sub reload_config { 3359sub reload_config {
3129 open my $fh, "<:utf8", "$CONFDIR/config" 3360 open my $fh, "<:utf8", "$CONFDIR/config"
3130 or return; 3361 or return;
3131 3362
3132 local $/; 3363 local $/;
3133 *CFG = YAML::Syck::Load <$fh>; 3364 *CFG = YAML::Load <$fh>;
3134 3365
3135 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3366 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3136 3367
3137 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3368 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3138 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3369 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3149sub main { 3380sub main {
3150 # we must not ever block the main coroutine 3381 # we must not ever block the main coroutine
3151 local $Coro::idle = sub { 3382 local $Coro::idle = sub {
3152 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3383 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3153 (async { 3384 (async {
3154 Event::one_event; 3385 $Coro::current->{desc} = "IDLE BUG HANDLER";
3386 EV::loop EV::LOOP_ONESHOT;
3155 })->prio (Coro::PRIO_MAX); 3387 })->prio (Coro::PRIO_MAX);
3156 }; 3388 };
3157 3389
3158 reload_config; 3390 reload_config;
3159 db_init; 3391 db_init;
3160 load_extensions; 3392 load_extensions;
3161 3393
3162 $TICK_WATCHER->start; 3394 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3395 evthread_start IO::AIO::poll_fileno;
3163 Event::loop; 3396 EV::loop;
3164} 3397}
3165 3398
3166############################################################################# 3399#############################################################################
3167# initialisation and cleanup 3400# initialisation and cleanup
3168 3401
3169# install some emergency cleanup handlers 3402# install some emergency cleanup handlers
3170BEGIN { 3403BEGIN {
3404 our %SIGWATCHER = ();
3171 for my $signal (qw(INT HUP TERM)) { 3405 for my $signal (qw(INT HUP TERM)) {
3172 Event->signal ( 3406 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3173 reentrant => 0,
3174 data => WF_AUTOCANCEL,
3175 signal => $signal,
3176 prio => 0,
3177 cb => sub {
3178 cf::cleanup "SIG$signal"; 3407 cf::cleanup "SIG$signal";
3179 },
3180 ); 3408 };
3181 } 3409 }
3182} 3410}
3183 3411
3184sub write_runtime { 3412sub write_runtime_sync {
3185 my $runtime = "$LOCALDIR/runtime"; 3413 my $runtime = "$LOCALDIR/runtime";
3186 3414
3187 # first touch the runtime file to show we are still running: 3415 # first touch the runtime file to show we are still running:
3188 # the fsync below can take a very very long time. 3416 # the fsync below can take a very very long time.
3189 3417
3215 and return; 3443 and return;
3216 3444
3217 warn "runtime file written.\n"; 3445 warn "runtime file written.\n";
3218 3446
3219 1 3447 1
3448}
3449
3450our $uuid_lock;
3451our $uuid_skip;
3452
3453sub write_uuid_sync($) {
3454 $uuid_skip ||= $_[0];
3455
3456 return if $uuid_lock;
3457 local $uuid_lock = 1;
3458
3459 my $uuid = "$LOCALDIR/uuid";
3460
3461 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3462 or return;
3463
3464 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3465 $uuid_skip = 0;
3466
3467 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3468 and return;
3469
3470 # always fsync - this file is important
3471 aio_fsync $fh
3472 and return;
3473
3474 close $fh
3475 or return;
3476
3477 aio_rename "$uuid~", $uuid
3478 and return;
3479
3480 warn "uuid file written ($value).\n";
3481
3482 1
3483
3484}
3485
3486sub write_uuid($$) {
3487 my ($skip, $sync) = @_;
3488
3489 $sync ? write_uuid_sync $skip
3490 : async { write_uuid_sync $skip };
3220} 3491}
3221 3492
3222sub emergency_save() { 3493sub emergency_save() {
3223 my $freeze_guard = cf::freeze_mainloop; 3494 my $freeze_guard = cf::freeze_mainloop;
3224 3495
3230 # and maps saved/destroyed asynchronously. 3501 # and maps saved/destroyed asynchronously.
3231 warn "begin emergency player save\n"; 3502 warn "begin emergency player save\n";
3232 for my $login (keys %cf::PLAYER) { 3503 for my $login (keys %cf::PLAYER) {
3233 my $pl = $cf::PLAYER{$login} or next; 3504 my $pl = $cf::PLAYER{$login} or next;
3234 $pl->valid or next; 3505 $pl->valid or next;
3506 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3235 $pl->save; 3507 $pl->save;
3236 } 3508 }
3237 warn "end emergency player save\n"; 3509 warn "end emergency player save\n";
3238 3510
3239 warn "begin emergency map save\n"; 3511 warn "begin emergency map save\n";
3245 warn "end emergency map save\n"; 3517 warn "end emergency map save\n";
3246 3518
3247 warn "begin emergency database checkpoint\n"; 3519 warn "begin emergency database checkpoint\n";
3248 BDB::db_env_txn_checkpoint $DB_ENV; 3520 BDB::db_env_txn_checkpoint $DB_ENV;
3249 warn "end emergency database checkpoint\n"; 3521 warn "end emergency database checkpoint\n";
3522
3523 warn "begin write uuid\n";
3524 write_uuid_sync 1;
3525 warn "end write uuid\n";
3250 }; 3526 };
3251 3527
3252 warn "leave emergency perl save\n"; 3528 warn "leave emergency perl save\n";
3253} 3529}
3254 3530
3269 warn "reloading..."; 3545 warn "reloading...";
3270 3546
3271 warn "entering sync_job"; 3547 warn "entering sync_job";
3272 3548
3273 cf::sync_job { 3549 cf::sync_job {
3274 cf::write_runtime; # external watchdog should not bark 3550 cf::write_runtime_sync; # external watchdog should not bark
3275 cf::emergency_save; 3551 cf::emergency_save;
3276 cf::write_runtime; # external watchdog should not bark 3552 cf::write_runtime_sync; # external watchdog should not bark
3277 3553
3278 warn "syncing database to disk"; 3554 warn "syncing database to disk";
3279 BDB::db_env_txn_checkpoint $DB_ENV; 3555 BDB::db_env_txn_checkpoint $DB_ENV;
3280 3556
3281 # if anything goes wrong in here, we should simply crash as we already saved 3557 # if anything goes wrong in here, we should simply crash as we already saved
3282
3283 warn "cancelling all WF_AUTOCANCEL watchers";
3284 for (Event::all_watchers) {
3285 $_->cancel if $_->data & WF_AUTOCANCEL;
3286 }
3287 3558
3288 warn "flushing outstanding aio requests"; 3559 warn "flushing outstanding aio requests";
3289 for (;;) { 3560 for (;;) {
3290 BDB::flush; 3561 BDB::flush;
3291 IO::AIO::flush; 3562 IO::AIO::flush;
3292 Coro::cede; 3563 Coro::cede_notself;
3293 last unless IO::AIO::nreqs || BDB::nreqs; 3564 last unless IO::AIO::nreqs || BDB::nreqs;
3294 warn "iterate..."; 3565 warn "iterate...";
3295 } 3566 }
3296 3567
3297 ++$RELOAD; 3568 ++$RELOAD;
3373 warn "leaving sync_job"; 3644 warn "leaving sync_job";
3374 3645
3375 1 3646 1
3376 } or do { 3647 } or do {
3377 warn $@; 3648 warn $@;
3378 warn "error while reloading, exiting."; 3649 cf::cleanup "error while reloading, exiting.";
3379 exit 1;
3380 }; 3650 };
3381 3651
3382 warn "reloaded"; 3652 warn "reloaded";
3383}; 3653};
3384 3654
3386 3656
3387sub reload_perl() { 3657sub reload_perl() {
3388 # doing reload synchronously and two reloads happen back-to-back, 3658 # doing reload synchronously and two reloads happen back-to-back,
3389 # coro crashes during coro_state_free->destroy here. 3659 # coro crashes during coro_state_free->destroy here.
3390 3660
3391 $RELOAD_WATCHER ||= Event->timer ( 3661 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3392 reentrant => 0,
3393 after => 0,
3394 data => WF_AUTOCANCEL,
3395 cb => sub {
3396 do_reload_perl; 3662 do_reload_perl;
3397 undef $RELOAD_WATCHER; 3663 undef $RELOAD_WATCHER;
3398 },
3399 ); 3664 };
3400} 3665}
3401 3666
3402register_command "reload" => sub { 3667register_command "reload" => sub {
3403 my ($who, $arg) = @_; 3668 my ($who, $arg) = @_;
3404 3669
3405 if ($who->flag (FLAG_WIZ)) { 3670 if ($who->flag (FLAG_WIZ)) {
3406 $who->message ("reloading server."); 3671 $who->message ("reloading server.");
3672 async {
3673 $Coro::current->{desc} = "perl_reload";
3407 async { reload_perl }; 3674 reload_perl;
3675 };
3408 } 3676 }
3409}; 3677};
3410 3678
3411unshift @INC, $LIBDIR; 3679unshift @INC, $LIBDIR;
3412 3680
3414 3682
3415our @WAIT_FOR_TICK; 3683our @WAIT_FOR_TICK;
3416our @WAIT_FOR_TICK_BEGIN; 3684our @WAIT_FOR_TICK_BEGIN;
3417 3685
3418sub wait_for_tick { 3686sub wait_for_tick {
3419 return unless $TICK_WATCHER->is_active; 3687 return if tick_inhibit;
3420 return if $Coro::current == $Coro::main; 3688 return if $Coro::current == $Coro::main;
3421 3689
3422 my $signal = new Coro::Signal; 3690 my $signal = new Coro::Signal;
3423 push @WAIT_FOR_TICK, $signal; 3691 push @WAIT_FOR_TICK, $signal;
3424 $signal->wait; 3692 $signal->wait;
3425} 3693}
3426 3694
3427sub wait_for_tick_begin { 3695sub wait_for_tick_begin {
3428 return unless $TICK_WATCHER->is_active; 3696 return if tick_inhibit;
3429 return if $Coro::current == $Coro::main; 3697 return if $Coro::current == $Coro::main;
3430 3698
3431 my $signal = new Coro::Signal; 3699 my $signal = new Coro::Signal;
3432 push @WAIT_FOR_TICK_BEGIN, $signal; 3700 push @WAIT_FOR_TICK_BEGIN, $signal;
3433 $signal->wait; 3701 $signal->wait;
3434} 3702}
3435 3703
3436 my $min = 1e6;#d# 3704sub tick {
3437 my $avg = 10;
3438$TICK_WATCHER = Event->timer (
3439 reentrant => 0,
3440 parked => 1,
3441 prio => 0,
3442 at => $NEXT_TICK || $TICK,
3443 data => WF_AUTOCANCEL,
3444 cb => sub {
3445 if ($Coro::current != $Coro::main) { 3705 if ($Coro::current != $Coro::main) {
3446 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3706 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3447 unless ++$bug_warning > 10; 3707 unless ++$bug_warning > 10;
3448 return; 3708 return;
3449 } 3709 }
3450 3710
3451 $NOW = $tick_start = Event::time;
3452
3453 cf::server_tick; # one server iteration 3711 cf::server_tick; # one server iteration
3454 3712
3455 0 && sync_job {#d# 3713 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3456 for(1..10) { 3714 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3457 my $t = Event::time; 3715 Coro::async_pool {
3458 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3716 $Coro::current->{desc} = "runtime saver";
3459 or die; 3717 write_runtime_sync
3460 3718 or warn "ERROR: unable to write runtime file: $!";
3461 $map->width (50);
3462 $map->height (50);
3463 $map->alloc;
3464 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3465 my $t = Event::time - $t;
3466
3467 #next unless $t < 0.0013;#d#
3468 if ($t < $min) {
3469 $min = $t;
3470 }
3471 $avg = $avg * 0.99 + $t * 0.01;
3472 }
3473 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3474 exit 0;
3475 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3476 }; 3719 };
3720 }
3477 3721
3478 $RUNTIME += $TICK;
3479 $NEXT_TICK += $TICK;
3480
3481 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3482 $NEXT_RUNTIME_WRITE = $NOW + 10;
3483 Coro::async_pool {
3484 write_runtime
3485 or warn "ERROR: unable to write runtime file: $!";
3486 };
3487 }
3488
3489# my $AFTER = Event::time;
3490# warn $AFTER - $NOW;#d#
3491
3492 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3722 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3493 $sig->send; 3723 $sig->send;
3494 } 3724 }
3495 while (my $sig = shift @WAIT_FOR_TICK) { 3725 while (my $sig = shift @WAIT_FOR_TICK) {
3496 $sig->send; 3726 $sig->send;
3497 } 3727 }
3498 3728
3499 $NOW = Event::time; 3729 $LOAD = ($NOW - $TICK_START) / $TICK;
3500
3501 # if we are delayed by four ticks or more, skip them all
3502 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3503
3504 $TICK_WATCHER->at ($NEXT_TICK);
3505 $TICK_WATCHER->start;
3506
3507 $LOAD = ($NOW - $tick_start) / $TICK;
3508 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3730 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3509 3731
3510 _post_tick; 3732 if (0) {
3511 3733 if ($NEXT_TICK) {
3512 3734 my $jitter = $TICK_START - $NEXT_TICK;
3735 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3736 warn "jitter $JITTER\n";#d#
3737 }
3513 }, 3738 }
3514); 3739}
3515 3740
3516{ 3741{
3517 BDB::max_poll_time $TICK * 0.1; 3742 # configure BDB
3518 $BDB_POLL_WATCHER = Event->io ( 3743
3519 reentrant => 0,
3520 fd => BDB::poll_fileno,
3521 poll => 'r',
3522 prio => 0,
3523 data => WF_AUTOCANCEL,
3524 cb => \&BDB::poll_cb,
3525 );
3526 BDB::min_parallel 8; 3744 BDB::min_parallel 8;
3527 3745 BDB::max_poll_reqs $TICK * 0.1;
3528 BDB::set_sync_prepare { 3746 $Coro::BDB::WATCHER->priority (1);
3529 my $status;
3530 my $current = $Coro::current;
3531 (
3532 sub {
3533 $status = $!;
3534 $current->ready; undef $current;
3535 },
3536 sub {
3537 Coro::schedule while defined $current;
3538 $! = $status;
3539 },
3540 )
3541 };
3542 3747
3543 unless ($DB_ENV) { 3748 unless ($DB_ENV) {
3544 $DB_ENV = BDB::db_env_create; 3749 $DB_ENV = BDB::db_env_create;
3750 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3751 | BDB::LOG_AUTOREMOVE, 1);
3752 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3753 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3545 3754
3546 cf::sync_job { 3755 cf::sync_job {
3547 eval { 3756 eval {
3548 BDB::db_env_open 3757 BDB::db_env_open
3549 $DB_ENV, 3758 $DB_ENV,
3551 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3760 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3552 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3761 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3553 0666; 3762 0666;
3554 3763
3555 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3764 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3556
3557 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3558 $DB_ENV->set_lk_detect;
3559 }; 3765 };
3560 3766
3561 cf::cleanup "db_env_open(db): $@" if $@; 3767 cf::cleanup "db_env_open(db): $@" if $@;
3562 }; 3768 };
3563 } 3769 }
3770
3771 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3772 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3773 };
3774 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3775 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3776 };
3777 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3778 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3779 };
3564} 3780}
3565 3781
3566{ 3782{
3783 # configure IO::AIO
3784
3567 IO::AIO::min_parallel 8; 3785 IO::AIO::min_parallel 8;
3568
3569 undef $Coro::AIO::WATCHER;
3570 IO::AIO::max_poll_time $TICK * 0.1; 3786 IO::AIO::max_poll_time $TICK * 0.1;
3571 $AIO_POLL_WATCHER = Event->io ( 3787 $Coro::AIO::WATCHER->priority (1);
3572 reentrant => 0,
3573 data => WF_AUTOCANCEL,
3574 fd => IO::AIO::poll_fileno,
3575 poll => 'r',
3576 prio => 6,
3577 cb => \&IO::AIO::poll_cb,
3578 );
3579} 3788}
3580 3789
3581my $_log_backtrace; 3790my $_log_backtrace;
3582 3791
3583sub _log_backtrace { 3792sub _log_backtrace {
3587 3796
3588 # limit the # of concurrent backtraces 3797 # limit the # of concurrent backtraces
3589 if ($_log_backtrace < 2) { 3798 if ($_log_backtrace < 2) {
3590 ++$_log_backtrace; 3799 ++$_log_backtrace;
3591 async { 3800 async {
3801 $Coro::current->{desc} = "abt $msg";
3802
3592 my @bt = fork_call { 3803 my @bt = fork_call {
3593 @addr = map { sprintf "%x", $_ } @addr; 3804 @addr = map { sprintf "%x", $_ } @addr;
3594 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3805 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3595 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3806 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3596 or die "addr2line: $!"; 3807 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines