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.356 by root, Tue Sep 4 05:43:21 2007 UTC vs.
Revision 1.414 by root, Thu Apr 10 09:10:45 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
285Return true if the lock is currently active, i.e. somebody has locked it. 320Return true if the lock is currently active, i.e. somebody has locked it.
286 321
287=cut 322=cut
288 323
289our %LOCK; 324our %LOCK;
325our %LOCKER;#d#
290 326
291sub lock_wait($) { 327sub lock_wait($) {
292 my ($key) = @_; 328 my ($key) = @_;
329
330 if ($LOCKER{$key} == $Coro::current) {#d#
331 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332 return;#d#
333 }#d#
293 334
294 # wait for lock, if any 335 # wait for lock, if any
295 while ($LOCK{$key}) { 336 while ($LOCK{$key}) {
296 push @{ $LOCK{$key} }, $Coro::current; 337 push @{ $LOCK{$key} }, $Coro::current;
297 Coro::schedule; 338 Coro::schedule;
303 344
304 # wait, to be sure we are not locked 345 # wait, to be sure we are not locked
305 lock_wait $key; 346 lock_wait $key;
306 347
307 $LOCK{$key} = []; 348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
308 350
309 Coro::guard { 351 Coro::guard {
352 delete $LOCKER{$key};#d#
310 # wake up all waiters, to be on the safe side 353 # wake up all waiters, to be on the safe side
311 $_->ready for @{ delete $LOCK{$key} }; 354 $_->ready for @{ delete $LOCK{$key} };
312 } 355 }
313} 356}
314 357
317 360
318 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
319} 362}
320 363
321sub freeze_mainloop { 364sub freeze_mainloop {
322 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
323 366
324 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
325 $TICK_WATCHER->start; 368}
326 }; 369
327 $TICK_WATCHER->stop; 370=item cf::periodic $interval, $cb
328 $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
329} 383}
330 384
331=item cf::get_slot $time[, $priority[, $name]] 385=item cf::get_slot $time[, $priority[, $name]]
332 386
333Allocate $time seconds of blocking CPU time at priority C<$priority>: 387Allocate $time seconds of blocking CPU time at priority C<$priority>:
344our @SLOT_QUEUE; 398our @SLOT_QUEUE;
345our $SLOT_QUEUE; 399our $SLOT_QUEUE;
346 400
347$SLOT_QUEUE->cancel if $SLOT_QUEUE; 401$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async { 402$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager");
404
349 my $signal = new Coro::Signal; 405 my $signal = new Coro::Signal;
350 406
351 while () { 407 while () {
352 next_job: 408 next_job:
353 my $avail = cf::till_tick; 409 my $avail = cf::till_tick;
361 } 417 }
362 } 418 }
363 } 419 }
364 420
365 if (@SLOT_QUEUE) { 421 if (@SLOT_QUEUE) {
366 # 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
367 push @cf::WAIT_FOR_TICK, $signal; 423 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait; 424 $signal->wait;
369 } else { 425 } else {
370 Coro::schedule; 426 Coro::schedule;
371 } 427 }
394 450
395BEGIN { *async = \&Coro::async_pool } 451BEGIN { *async = \&Coro::async_pool }
396 452
397=item cf::sync_job { BLOCK } 453=item cf::sync_job { BLOCK }
398 454
399The design of Crossfire TRT requires that the main coroutine ($Coro::main) 455The design of Deliantra requires that the main coroutine ($Coro::main)
400is always able to handle events or runnable, as Crossfire TRT is only 456is always able to handle events or runnable, as Deliantra is only
401partly 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
402acceptable. 458acceptable.
403 459
404If 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
405the given BLOCK in another coroutine while waiting for the result. The 461the given BLOCK in another coroutine while waiting for the result. The
410 466
411sub sync_job(&) { 467sub sync_job(&) {
412 my ($job) = @_; 468 my ($job) = @_;
413 469
414 if ($Coro::current == $Coro::main) { 470 if ($Coro::current == $Coro::main) {
415 my $time = Event::time; 471 my $time = EV::time;
416 472
417 # this is the main coro, too bad, we have to block 473 # this is the main coro, too bad, we have to block
418 # till the operation succeeds, freezing the server :/ 474 # till the operation succeeds, freezing the server :/
419 475
420 # TODO: use suspend/resume instead 476 LOG llevError, Carp::longmess "sync job";#d#
421 # (but this is cancel-safe) 477
422 my $freeze_guard = freeze_mainloop; 478 my $freeze_guard = freeze_mainloop;
423 479
424 my $busy = 1; 480 my $busy = 1;
425 my @res; 481 my @res;
426 482
427 (async { 483 (async {
484 $Coro::current->desc ("sync job coro");
428 @res = eval { $job->() }; 485 @res = eval { $job->() };
429 warn $@ if $@; 486 warn $@ if $@;
430 undef $busy; 487 undef $busy;
431 })->prio (Coro::PRIO_MAX); 488 })->prio (Coro::PRIO_MAX);
432 489
433 while ($busy) { 490 while ($busy) {
434 Coro::cede or Event::one_event; 491 if (Coro::nready) {
492 Coro::cede_notself;
493 } else {
494 EV::loop EV::LOOP_ONESHOT;
435 } 495 }
496 }
436 497
437 $time = Event::time - $time; 498 my $time = EV::time - $time;
438 499
439 LOG llevError | logBacktrace, Carp::longmess "long sync job"
440 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
441
442 $tick_start += $time; # do not account sync jobs to server load 500 $TICK_START += $time; # do not account sync jobs to server load
443 501
444 wantarray ? @res : $res[0] 502 wantarray ? @res : $res[0]
445 } else { 503 } else {
446 # we are in another coroutine, how wonderful, everything just works 504 # we are in another coroutine, how wonderful, everything just works
447 505
472=item fork_call { }, $args 530=item fork_call { }, $args
473 531
474Executes the given code block with the given arguments in a seperate 532Executes the given code block with the given arguments in a seperate
475process, returning the results. Everything must be serialisable with 533process, returning the results. Everything must be serialisable with
476Coro::Storable. May, of course, block. Note that the executed sub may 534Coro::Storable. May, of course, block. Note that the executed sub may
477never block itself or use any form of Event handling. 535never block itself or use any form of event handling.
478 536
479=cut 537=cut
480 538
481sub fork_call(&@) { 539sub fork_call(&@) {
482 my ($cb, @args) = @_; 540 my ($cb, @args) = @_;
500=item cf::db_put $family => $key => $value 558=item cf::db_put $family => $key => $value
501 559
502Stores the given C<$value> in the family. It can currently store binary 560Stores the given C<$value> in the family. It can currently store binary
503data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 561data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
504 562
563=item $db = cf::db_table "name"
564
565Create and/or open a new database table. The string must not be "db" and must be unique
566within each server.
567
505=cut 568=cut
569
570sub db_table($) {
571 my ($name) = @_;
572 my $db = BDB::db_create $DB_ENV;
573
574 eval {
575 $db->set_flags (BDB::CHKSUM);
576
577 utf8::encode $name;
578 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
579 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
580 cf::cleanup "db_open(db): $!" if $!;
581 };
582 cf::cleanup "db_open(db): $@" if $@;
583
584 $db
585}
506 586
507our $DB; 587our $DB;
508 588
509sub db_init { 589sub db_init {
510 unless ($DB) {
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job { 590 cf::sync_job {
514 eval { 591 $DB ||= db_table "db";
515 $DB->set_flags (BDB::CHKSUM);
516
517 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
518 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
519 cf::cleanup "db_open(db): $!" if $!;
520 };
521 cf::cleanup "db_open(db): $@" if $@;
522 };
523 } 592 };
524} 593}
525 594
526sub db_get($$) { 595sub db_get($$) {
527 my $key = "$_[0]/$_[1]"; 596 my $key = "$_[0]/$_[1]";
528 597
632attach callbacks/event handlers (a collection of which is called an "attachment") 701attach callbacks/event handlers (a collection of which is called an "attachment")
633to it. All such attachable objects support the following methods. 702to it. All such attachable objects support the following methods.
634 703
635In the following description, CLASS can be any of C<global>, C<object> 704In the following description, CLASS can be any of C<global>, C<object>
636C<player>, C<client> or C<map> (i.e. the attachable objects in 705C<player>, C<client> or C<map> (i.e. the attachable objects in
637Crossfire TRT). 706Deliantra).
638 707
639=over 4 708=over 4
640 709
641=item $attachable->attach ($attachment, key => $value...) 710=item $attachable->attach ($attachment, key => $value...)
642 711
924 } 993 }
925 994
926 0 995 0
927} 996}
928 997
929=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 998=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
930 999
931=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1000=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
932 1001
933Generate an object-specific event with the given arguments. 1002Generate an object-specific event with the given arguments.
934 1003
940 1009
941=cut 1010=cut
942 1011
943############################################################################# 1012#############################################################################
944# object support 1013# object support
945#
946 1014
1015sub _object_equal($$);
1016sub _object_equal($$) {
1017 my ($a, $b) = @_;
1018
1019 return 0 unless (ref $a) eq (ref $b);
1020
1021 if ("HASH" eq ref $a) {
1022 my @ka = keys %$a;
1023 my @kb = keys %$b;
1024
1025 return 0 if @ka != @kb;
1026
1027 for (0 .. $#ka) {
1028 return 0 unless $ka[$_] eq $kb[$_];
1029 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1030 }
1031
1032 } elsif ("ARRAY" eq ref $a) {
1033
1034 return 0 if @$a != @$b;
1035
1036 for (0 .. $#$a) {
1037 return 0 unless _object_equal $a->[$_], $b->[$_];
1038 }
1039
1040 } elsif ($a ne $b) {
1041 return 0;
1042 }
1043
1044 1
1045}
1046
1047our $SLOW_MERGES;#d#
947sub _can_merge { 1048sub _can_merge {
948 my ($ob1, $ob2) = @_; 1049 my ($ob1, $ob2) = @_;
949 1050
950 local $Storable::canonical = 1; 1051 ++$SLOW_MERGES;#d#
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953 1052
954 $fob1 eq $fob2 1053 # we do the slow way here
1054 return _object_equal $ob1, $ob2
955} 1055}
956 1056
957sub reattach { 1057sub reattach {
958 # basically do the same as instantiate, without calling instantiate 1058 # basically do the same as instantiate, without calling instantiate
959 my ($obj) = @_; 1059 my ($obj) = @_;
981cf::attachable->attach ( 1081cf::attachable->attach (
982 prio => -1000000, 1082 prio => -1000000,
983 on_instantiate => sub { 1083 on_instantiate => sub {
984 my ($obj, $data) = @_; 1084 my ($obj, $data) = @_;
985 1085
986 $data = from_json $data; 1086 $data = decode_json $data;
987 1087
988 for (@$data) { 1088 for (@$data) {
989 my ($name, $args) = @$_; 1089 my ($name, $args) = @$_;
990 1090
991 $obj->attach ($name, %{$args || {} }); 1091 $obj->attach ($name, %{$args || {} });
1005); 1105);
1006 1106
1007sub object_freezer_save { 1107sub object_freezer_save {
1008 my ($filename, $rdata, $objs) = @_; 1108 my ($filename, $rdata, $objs) = @_;
1009 1109
1010 my $guard = cf::lock_acquire "io";
1011
1012 sync_job { 1110 sync_job {
1013 if (length $$rdata) { 1111 if (length $$rdata) {
1112 utf8::decode (my $decname = $filename);
1014 warn sprintf "saving %s (%d,%d)\n", 1113 warn sprintf "saving %s (%d,%d)\n",
1015 $filename, length $$rdata, scalar @$objs; 1114 $decname, length $$rdata, scalar @$objs;
1016 1115
1017 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1116 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1018 chmod SAVE_MODE, $fh; 1117 chmod SAVE_MODE, $fh;
1019 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1118 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1020 aio_fsync $fh if $cf::USE_FSYNC; 1119 aio_fsync $fh if $cf::USE_FSYNC;
1021 close $fh; 1120 close $fh;
1022 1121
1023 if (@$objs) { 1122 if (@$objs) {
1024 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1123 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1025 chmod SAVE_MODE, $fh; 1124 chmod SAVE_MODE, $fh;
1026 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1125 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1027 aio_write $fh, 0, (length $data), $data, 0; 1126 aio_write $fh, 0, (length $data), $data, 0;
1028 aio_fsync $fh if $cf::USE_FSYNC; 1127 aio_fsync $fh if $cf::USE_FSYNC;
1029 close $fh; 1128 close $fh;
1030 aio_rename "$filename.pst~", "$filename.pst"; 1129 aio_rename "$filename.pst~", "$filename.pst";
1031 } 1130 }
1040 } else { 1139 } else {
1041 aio_unlink $filename; 1140 aio_unlink $filename;
1042 aio_unlink "$filename.pst"; 1141 aio_unlink "$filename.pst";
1043 } 1142 }
1044 }; 1143 };
1045
1046 undef $guard;
1047} 1144}
1048 1145
1049sub object_freezer_as_string { 1146sub object_freezer_as_string {
1050 my ($rdata, $objs) = @_; 1147 my ($rdata, $objs) = @_;
1051 1148
1056 1153
1057sub object_thawer_load { 1154sub object_thawer_load {
1058 my ($filename) = @_; 1155 my ($filename) = @_;
1059 1156
1060 my ($data, $av); 1157 my ($data, $av);
1061
1062 my $guard = cf::lock_acquire "io";
1063 1158
1064 (aio_load $filename, $data) >= 0 1159 (aio_load $filename, $data) >= 0
1065 or return; 1160 or return;
1066 1161
1067 unless (aio_stat "$filename.pst") { 1162 unless (aio_stat "$filename.pst") {
1068 (aio_load "$filename.pst", $av) >= 0 1163 (aio_load "$filename.pst", $av) >= 0
1069 or return; 1164 or return;
1070 1165
1071 undef $guard;
1072 $av = eval { (Storable::thaw $av)->{objs} }; 1166 my $st = eval { Coro::Storable::thaw $av };
1167 $av = $st->{objs};
1073 } 1168 }
1074 1169
1170 utf8::decode (my $decname = $filename);
1075 warn sprintf "loading %s (%d)\n", 1171 warn sprintf "loading %s (%d,%d)\n",
1076 $filename, length $data, scalar @{$av || []}; 1172 $decname, length $data, scalar @{$av || []};
1077 1173
1078 ($data, $av) 1174 ($data, $av)
1079} 1175}
1080 1176
1081=head2 COMMAND CALLBACKS 1177=head2 COMMAND CALLBACKS
1232 my $msg = $@ ? "$v->{path}: $@\n" 1328 my $msg = $@ ? "$v->{path}: $@\n"
1233 : "$v->{base}: extension inactive.\n"; 1329 : "$v->{base}: extension inactive.\n";
1234 1330
1235 if (exists $v->{meta}{mandatory}) { 1331 if (exists $v->{meta}{mandatory}) {
1236 warn $msg; 1332 warn $msg;
1237 warn "mandatory extension failed to load, exiting.\n"; 1333 cf::cleanup "mandatory extension failed to load, exiting.";
1238 exit 1;
1239 } 1334 }
1240 1335
1241 warn $msg; 1336 warn $msg;
1242 } 1337 }
1243 1338
1268use Coro::AIO; 1363use Coro::AIO;
1269 1364
1270=head3 cf::player 1365=head3 cf::player
1271 1366
1272=over 4 1367=over 4
1368
1369=item cf::player::num_playing
1370
1371Returns the official number of playing players, as per the Crossfire metaserver rules.
1372
1373=cut
1374
1375sub num_playing {
1376 scalar grep
1377 $_->ob->map
1378 && !$_->hidden
1379 && !$_->ob->flag (cf::FLAG_WIZ),
1380 cf::player::list
1381}
1273 1382
1274=item cf::player::find $login 1383=item cf::player::find $login
1275 1384
1276Returns the given player object, loading it if necessary (might block). 1385Returns the given player object, loading it if necessary (might block).
1277 1386
1316 aio_unlink +(playerdir $login) . "/$login.pl"; 1425 aio_unlink +(playerdir $login) . "/$login.pl";
1317 1426
1318 my $f = new_from_file cf::object::thawer path $login 1427 my $f = new_from_file cf::object::thawer path $login
1319 or return; 1428 or return;
1320 1429
1321 $f->next;
1322 my $pl = cf::player::load_pl $f 1430 my $pl = cf::player::load_pl $f
1323 or return; 1431 or return;
1324 local $cf::PLAYER_LOADING{$login} = $pl; 1432 local $cf::PLAYER_LOADING{$login} = $pl;
1325 $f->resolve_delayed_derefs; 1433 $f->resolve_delayed_derefs;
1326 $cf::PLAYER{$login} = $pl 1434 $cf::PLAYER{$login} = $pl
1478 1586
1479Expand crossfire pod fragments into protocol xml. 1587Expand crossfire pod fragments into protocol xml.
1480 1588
1481=cut 1589=cut
1482 1590
1591use re 'eval';
1592
1593my $group;
1594my $interior; $interior = qr{
1595 # match a pod interior sequence sans C<< >>
1596 (?:
1597 \ (.*?)\ (?{ $group = $^N })
1598 | < (??{$interior}) >
1599 )
1600}x;
1601
1483sub expand_cfpod { 1602sub expand_cfpod {
1484 ((my $self), (local $_)) = @_; 1603 my ($self, $pod) = @_;
1485 1604
1486 # escape & and < 1605 my $xml;
1487 s/&/&amp;/g;
1488 s/(?<![BIUGHT])</&lt;/g;
1489 1606
1490 # this is buggy, it needs to properly take care of nested <'s 1607 while () {
1608 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1609 $group = $1;
1491 1610
1492 1 while 1611 $group =~ s/&/&amp;/g;
1493 # replace B<>, I<>, U<> etc. 1612 $group =~ s/</&lt;/g;
1494 s/B<([^\>]*)>/<b>$1<\/b>/ 1613
1495 || s/I<([^\>]*)>/<i>$1<\/i>/ 1614 $xml .= $group;
1496 || s/U<([^\>]*)>/<u>$1<\/u>/ 1615 } elsif ($pod =~ m%\G
1497 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1616 ([BCGHITU])
1498 # replace G<male|female> tags 1617 <
1499 || s{G<([^>|]*)\|([^>]*)>}{ 1618 (?:
1500 $self->gender ? $2 : $1 1619 ([^<>]*) (?{ $group = $^N })
1501 }ge 1620 | < $interior >
1502 # replace H<hint text> 1621 )
1503 || s{H<([^\>]*)>} 1622 >
1623 %gcsx
1504 { 1624 ) {
1625 my ($code, $data) = ($1, $group);
1626
1627 if ($code eq "B") {
1628 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1629 } elsif ($code eq "I") {
1630 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1631 } elsif ($code eq "U") {
1632 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1633 } elsif ($code eq "C") {
1634 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1635 } elsif ($code eq "T") {
1636 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1637 } elsif ($code eq "G") {
1638 my ($male, $female) = split /\|/, $data;
1639 $data = $self->gender ? $female : $male;
1640 $xml .= expand_cfpod ($self, $data);
1641 } elsif ($code eq "H") {
1505 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1642 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1506 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1643 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1507 "") 1644 "")
1508 [$self->{hintmode}] 1645 [$self->{hintmode}];
1646 } else {
1647 $xml .= "error processing '$code($data)' directive";
1509 }ge; 1648 }
1649 } else {
1650 if ($pod =~ /\G(.+)/) {
1651 warn "parse error while expanding $pod (at $1)";
1652 }
1653 last;
1654 }
1655 }
1510 1656
1657 for ($xml) {
1511 # create single paragraphs (very hackish) 1658 # create single paragraphs (very hackish)
1512 s/(?<=\S)\n(?=\w)/ /g; 1659 s/(?<=\S)\n(?=\w)/ /g;
1513 1660
1514 # compress some whitespace 1661 # compress some whitespace
1515 s/\s+\n/\n/g; # ws line-ends 1662 s/\s+\n/\n/g; # ws line-ends
1516 s/\n\n+/\n/g; # double lines 1663 s/\n\n+/\n/g; # double lines
1517 s/^\n+//; # beginning lines 1664 s/^\n+//; # beginning lines
1518 s/\n+$//; # ending lines 1665 s/\n+$//; # ending lines
1666 }
1519 1667
1520 $_ 1668 $xml
1521} 1669}
1670
1671no re 'eval';
1522 1672
1523sub hintmode { 1673sub hintmode {
1524 $_[0]{hintmode} = $_[1] if @_ > 1; 1674 $_[0]{hintmode} = $_[1] if @_ > 1;
1525 $_[0]{hintmode} 1675 $_[0]{hintmode}
1526} 1676}
1841sub find { 1991sub find {
1842 my ($path, $origin) = @_; 1992 my ($path, $origin) = @_;
1843 1993
1844 $path = normalise $path, $origin && $origin->path; 1994 $path = normalise $path, $origin && $origin->path;
1845 1995
1996 cf::lock_wait "map_data:$path";#d#remove
1846 cf::lock_wait "map_find:$path"; 1997 cf::lock_wait "map_find:$path";
1847 1998
1848 $cf::MAP{$path} || do { 1999 $cf::MAP{$path} || do {
1849 my $guard = cf::lock_acquire "map_find:$path"; 2000 my $guard1 = cf::lock_acquire "map_find:$path";
2001 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2002
1850 my $map = new_from_path cf::map $path 2003 my $map = new_from_path cf::map $path
1851 or return; 2004 or return;
1852 2005
1853 $map->{last_save} = $cf::RUNTIME; 2006 $map->{last_save} = $cf::RUNTIME;
1854 2007
1856 or return; 2009 or return;
1857 2010
1858 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2011 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1859 # doing this can freeze the server in a sync job, obviously 2012 # doing this can freeze the server in a sync job, obviously
1860 #$cf::WAIT_FOR_TICK->wait; 2013 #$cf::WAIT_FOR_TICK->wait;
2014 undef $guard1;
2015 undef $guard2;
1861 $map->reset; 2016 $map->reset;
1862 undef $guard;
1863 return find $path; 2017 return find $path;
1864 } 2018 }
1865 2019
1866 $cf::MAP{$path} = $map 2020 $cf::MAP{$path} = $map
1867 } 2021 }
1876 local $self->{deny_reset} = 1; # loading can take a long time 2030 local $self->{deny_reset} = 1; # loading can take a long time
1877 2031
1878 my $path = $self->{path}; 2032 my $path = $self->{path};
1879 2033
1880 { 2034 {
1881 my $guard1 = cf::lock_acquire "map_data:$path"; 2035 my $guard = cf::lock_acquire "map_data:$path";
1882 my $guard2 = cf::lock_acquire "map_load:$path";
1883 2036
2037 return unless $self->valid;
1884 return if $self->in_memory != cf::MAP_SWAPPED; 2038 return unless $self->in_memory == cf::MAP_SWAPPED;
1885 2039
1886 $self->in_memory (cf::MAP_LOADING); 2040 $self->in_memory (cf::MAP_LOADING);
1887 2041
1888 $self->alloc; 2042 $self->alloc;
1889 2043
2003 } 2157 }
2004 2158
2005 $MAP_PREFETCH{$path} |= $load; 2159 $MAP_PREFETCH{$path} |= $load;
2006 2160
2007 $MAP_PREFETCHER ||= cf::async { 2161 $MAP_PREFETCHER ||= cf::async {
2162 $Coro::current->{desc} = "map prefetcher";
2163
2008 while (%MAP_PREFETCH) { 2164 while (%MAP_PREFETCH) {
2009 while (my ($k, $v) = each %MAP_PREFETCH) { 2165 while (my ($k, $v) = each %MAP_PREFETCH) {
2010 if (my $map = find $k) { 2166 if (my $map = find $k) {
2011 $map->load if $v; 2167 $map->load if $v;
2012 } 2168 }
2038 return if $self->{deny_save}; 2194 return if $self->{deny_save};
2039 2195
2040 local $self->{last_access} = $self->last_access;#d# 2196 local $self->{last_access} = $self->last_access;#d#
2041 2197
2042 cf::async { 2198 cf::async {
2199 $Coro::current->{desc} = "map player save";
2043 $_->contr->save for $self->players; 2200 $_->contr->save for $self->players;
2044 }; 2201 };
2045 2202
2046 if ($uniq) { 2203 if ($uniq) {
2047 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2061 2218
2062 return if $self->players; 2219 return if $self->players;
2063 return if $self->in_memory != cf::MAP_IN_MEMORY; 2220 return if $self->in_memory != cf::MAP_IN_MEMORY;
2064 return if $self->{deny_save}; 2221 return if $self->{deny_save};
2065 2222
2223 $self->in_memory (cf::MAP_SWAPPED);
2224
2225 $self->deactivate;
2226 $_->clear_links_to ($self) for values %cf::MAP;
2066 $self->clear; 2227 $self->clear;
2067 $self->in_memory (cf::MAP_SWAPPED);
2068} 2228}
2069 2229
2070sub reset_at { 2230sub reset_at {
2071 my ($self) = @_; 2231 my ($self) = @_;
2072 2232
2104 if $uniq; 2264 if $uniq;
2105 } 2265 }
2106 2266
2107 delete $cf::MAP{$self->path}; 2267 delete $cf::MAP{$self->path};
2108 2268
2269 $self->deactivate;
2270 $_->clear_links_to ($self) for values %cf::MAP;
2109 $self->clear; 2271 $self->clear;
2110
2111 $_->clear_links_to ($self) for values %cf::MAP;
2112 2272
2113 $self->unlink_save; 2273 $self->unlink_save;
2114 $self->destroy; 2274 $self->destroy;
2115} 2275}
2116 2276
2231=cut 2391=cut
2232 2392
2233sub deref { 2393sub deref {
2234 my ($ref) = @_; 2394 my ($ref) = @_;
2235 2395
2236 # temporary compatibility#TODO#remove
2237 $ref =~ s{^<}{player/<};
2238
2239 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2396 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2240 my ($uuid, $name) = ($1, $2); 2397 my ($uuid, $name) = ($1, $2);
2241 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2398 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2242 or return; 2399 or return;
2243 $pl->ob->uuid eq $uuid 2400 $pl->ob->uuid eq $uuid
2244 or return; 2401 or return;
2415 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2572 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2416 2573
2417 $self->enter_link; 2574 $self->enter_link;
2418 2575
2419 (async { 2576 (async {
2577 $Coro::current->{desc} = "player::goto $path $x $y";
2578
2579 # *tag paths override both path and x|y
2580 if ($path =~ /^\*(.*)$/) {
2581 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2582 my $ob = $obs[rand @obs];
2583
2584 # see if we actually can go there
2585 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2586 $ob = $obs[rand @obs];
2587 } else {
2588 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2589 }
2590 # else put us there anyways for now #d#
2591
2592 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2593 } else {
2594 ($path, $x, $y) = (undef, undef, undef);
2595 }
2596 }
2597
2420 my $map = eval { 2598 my $map = eval {
2421 my $map = cf::map::find $path; 2599 my $map = defined $path ? cf::map::find $path : undef;
2422 2600
2423 if ($map) { 2601 if ($map) {
2424 $map = $map->customise_for ($self); 2602 $map = $map->customise_for ($self);
2425 $map = $check->($map) if $check && $map; 2603 $map = $check->($map) if $check && $map;
2426 } else { 2604 } else {
2427 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2605 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2428 } 2606 }
2429 2607
2430 $map 2608 $map
2431 }; 2609 };
2432 2610
2485 $rmp->{origin_y} = $exit->y; 2663 $rmp->{origin_y} = $exit->y;
2486 } 2664 }
2487 2665
2488 $rmp->{random_seed} ||= $exit->random_seed; 2666 $rmp->{random_seed} ||= $exit->random_seed;
2489 2667
2490 my $data = cf::to_json $rmp; 2668 my $data = cf::encode_json $rmp;
2491 my $md5 = Digest::MD5::md5_hex $data; 2669 my $md5 = Digest::MD5::md5_hex $data;
2492 my $meta = "$RANDOMDIR/$md5.meta"; 2670 my $meta = "$RANDOMDIR/$md5.meta";
2493 2671
2494 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2672 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2495 aio_write $fh, 0, (length $data), $data, 0; 2673 aio_write $fh, 0, (length $data), $data, 0;
2522 # if exit is damned, update players death & WoR home-position 2700 # if exit is damned, update players death & WoR home-position
2523 $self->contr->savebed ($slaying, $hp, $sp) 2701 $self->contr->savebed ($slaying, $hp, $sp)
2524 if $exit->flag (FLAG_DAMNED); 2702 if $exit->flag (FLAG_DAMNED);
2525 2703
2526 (async { 2704 (async {
2705 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2706
2527 $self->deactivate_recursive; # just to be sure 2707 $self->deactivate_recursive; # just to be sure
2528 unless (eval { 2708 unless (eval {
2529 $self->goto ($slaying, $hp, $sp); 2709 $self->goto ($slaying, $hp, $sp);
2530 2710
2531 1; 2711 1;
2566the message, with C<log> being the default. If C<$color> is negative, suppress 2746the message, with C<log> being the default. If C<$color> is negative, suppress
2567the message unless the client supports the msg packet. 2747the message unless the client supports the msg packet.
2568 2748
2569=cut 2749=cut
2570 2750
2751# non-persistent channels (usually the info channel)
2571our %CHANNEL = ( 2752our %CHANNEL = (
2572 "c/identify" => { 2753 "c/identify" => {
2573 id => "identify", 2754 id => "infobox",
2574 title => "Identify", 2755 title => "Identify",
2575 reply => undef, 2756 reply => undef,
2576 tooltip => "Items recently identified", 2757 tooltip => "Items recently identified",
2577 }, 2758 },
2578 "c/examine" => { 2759 "c/examine" => {
2579 id => "examine", 2760 id => "infobox",
2580 title => "Examine", 2761 title => "Examine",
2581 reply => undef, 2762 reply => undef,
2582 tooltip => "Signs and other items you examined", 2763 tooltip => "Signs and other items you examined",
2583 }, 2764 },
2765 "c/book" => {
2766 id => "infobox",
2767 title => "Book",
2768 reply => undef,
2769 tooltip => "The contents of a note or book",
2770 },
2771 "c/lookat" => {
2772 id => "infobox",
2773 title => "Look",
2774 reply => undef,
2775 tooltip => "What you saw there",
2776 },
2777 "c/who" => {
2778 id => "infobox",
2779 title => "Players",
2780 reply => undef,
2781 tooltip => "Shows players who are currently online",
2782 },
2783 "c/body" => {
2784 id => "infobox",
2785 title => "Body Parts",
2786 reply => undef,
2787 tooltip => "Shows which body parts you posess and are available",
2788 },
2789 "c/uptime" => {
2790 id => "infobox",
2791 title => "Uptime",
2792 reply => undef,
2793 tooltip => "How long the server has been running since last restart",
2794 },
2795 "c/mapinfo" => {
2796 id => "infobox",
2797 title => "Map Info",
2798 reply => undef,
2799 tooltip => "Information related to the maps",
2800 },
2584); 2801);
2585 2802
2586sub cf::client::send_msg { 2803sub cf::client::send_msg {
2587 my ($self, $channel, $msg, $color, @extra) = @_; 2804 my ($self, $channel, $msg, $color, @extra) = @_;
2588 2805
2589 $msg = $self->pl->expand_cfpod ($msg); 2806 $msg = $self->pl->expand_cfpod ($msg);
2590 2807
2591 $color &= cf::NDI_CLIENT_MASK; # just in case... 2808 $color &= cf::NDI_CLIENT_MASK; # just in case...
2592 2809
2593 # check predefined channels, for the benefit of C 2810 # check predefined channels, for the benefit of C
2594 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2811 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel};
2595 2813
2814 $self->ext_msg (channel_info => $channel)
2815 if $self->can_msg;
2816
2817 $channel = $channel->{id};
2818
2596 if (ref $channel) { 2819 } elsif (ref $channel) {
2597 # send meta info to client, if not yet sent 2820 # send meta info to client, if not yet sent
2598 unless (exists $self->{channel}{$channel->{id}}) { 2821 unless (exists $self->{channel}{$channel->{id}}) {
2599 $self->{channel}{$channel->{id}} = $channel; 2822 $self->{channel}{$channel->{id}} = $channel;
2600 $self->ext_msg (channel_info => $channel) 2823 $self->ext_msg (channel_info => $channel)
2601 if $self->can_msg; 2824 if $self->can_msg;
2818=pod 3041=pod
2819 3042
2820The following functions and methods are available within a safe environment: 3043The following functions and methods are available within a safe environment:
2821 3044
2822 cf::object 3045 cf::object
2823 contr pay_amount pay_player map x y force_find force_add 3046 contr pay_amount pay_player map x y force_find force_add destroy
2824 insert remove name archname title slaying race decrease_ob_nr 3047 insert remove name archname title slaying race decrease_ob_nr
2825 3048
2826 cf::object::player 3049 cf::object::player
2827 player 3050 player
2828 3051
2835=cut 3058=cut
2836 3059
2837for ( 3060for (
2838 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3061 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2839 insert remove inv name archname title slaying race 3062 insert remove inv name archname title slaying race
2840 decrease_ob_nr)], 3063 decrease_ob_nr destroy)],
2841 ["cf::object::player" => qw(player)], 3064 ["cf::object::player" => qw(player)],
2842 ["cf::player" => qw(peaceful)], 3065 ["cf::player" => qw(peaceful)],
2843 ["cf::map" => qw(trigger)], 3066 ["cf::map" => qw(trigger)],
2844) { 3067) {
2845 no strict 'refs'; 3068 no strict 'refs';
2950 { 3173 {
2951 my $faces = $facedata->{faceinfo}; 3174 my $faces = $facedata->{faceinfo};
2952 3175
2953 while (my ($face, $info) = each %$faces) { 3176 while (my ($face, $info) = each %$faces) {
2954 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3177 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3178
2955 cf::face::set_visibility $idx, $info->{visibility}; 3179 cf::face::set_visibility $idx, $info->{visibility};
2956 cf::face::set_magicmap $idx, $info->{magicmap}; 3180 cf::face::set_magicmap $idx, $info->{magicmap};
2957 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3181 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2958 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3182 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2959 3183
2960 cf::cede_to_tick; 3184 cf::cede_to_tick;
2961 } 3185 }
2962 3186
2963 while (my ($face, $info) = each %$faces) { 3187 while (my ($face, $info) = each %$faces) {
2964 next unless $info->{smooth}; 3188 next unless $info->{smooth};
3189
2965 my $idx = cf::face::find $face 3190 my $idx = cf::face::find $face
2966 or next; 3191 or next;
3192
2967 if (my $smooth = cf::face::find $info->{smooth}) { 3193 if (my $smooth = cf::face::find $info->{smooth}) {
2968 cf::face::set_smooth $idx, $smooth; 3194 cf::face::set_smooth $idx, $smooth;
2969 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3195 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2970 } else { 3196 } else {
2971 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3197 warn "smooth face '$info->{smooth}' not found for face '$face'";
2989 { 3215 {
2990 # TODO: for gcfclient pleasure, we should give resources 3216 # TODO: for gcfclient pleasure, we should give resources
2991 # that gcfclient doesn't grok a >10000 face index. 3217 # that gcfclient doesn't grok a >10000 face index.
2992 my $res = $facedata->{resource}; 3218 my $res = $facedata->{resource};
2993 3219
2994 my $soundconf = delete $res->{"res/sound.conf"};
2995
2996 while (my ($name, $info) = each %$res) { 3220 while (my ($name, $info) = each %$res) {
3221 if (defined $info->{type}) {
2997 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3222 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2998 my $data; 3223 my $data;
2999 3224
3000 if ($info->{type} & 1) { 3225 if ($info->{type} & 1) {
3001 # prepend meta info 3226 # prepend meta info
3002 3227
3003 my $meta = $enc->encode ({ 3228 my $meta = $enc->encode ({
3004 name => $name, 3229 name => $name,
3005 %{ $info->{meta} || {} }, 3230 %{ $info->{meta} || {} },
3006 }); 3231 });
3007 3232
3008 $data = pack "(w/a*)*", $meta, $info->{data}; 3233 $data = pack "(w/a*)*", $meta, $info->{data};
3234 } else {
3235 $data = $info->{data};
3236 }
3237
3238 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3239 cf::face::set_type $idx, $info->{type};
3009 } else { 3240 } else {
3010 $data = $info->{data}; 3241 $RESOURCE{$name} = $info;
3011 } 3242 }
3012 3243
3013 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3014 cf::face::set_type $idx, $info->{type};
3015
3016 cf::cede_to_tick; 3244 cf::cede_to_tick;
3017 } 3245 }
3018
3019 if ($soundconf) {
3020 $soundconf = $enc->decode (delete $soundconf->{data});
3021
3022 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3023 my $sound = $soundconf->{compat}[$_]
3024 or next;
3025
3026 my $face = cf::face::find "sound/$sound->[1]";
3027 cf::sound::set $sound->[0] => $face;
3028 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3029 }
3030
3031 while (my ($k, $v) = each %{$soundconf->{event}}) {
3032 my $face = cf::face::find "sound/$v";
3033 cf::sound::set $k => $face;
3034 }
3035 }
3036 } 3246 }
3247
3248 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3037 3249
3038 1 3250 1
3039} 3251}
3252
3253cf::global->attach (on_resource_update => sub {
3254 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3255 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3256
3257 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3258 my $sound = $soundconf->{compat}[$_]
3259 or next;
3260
3261 my $face = cf::face::find "sound/$sound->[1]";
3262 cf::sound::set $sound->[0] => $face;
3263 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3264 }
3265
3266 while (my ($k, $v) = each %{$soundconf->{event}}) {
3267 my $face = cf::face::find "sound/$v";
3268 cf::sound::set $k => $face;
3269 }
3270 }
3271});
3040 3272
3041register_exticmd fx_want => sub { 3273register_exticmd fx_want => sub {
3042 my ($ns, $want) = @_; 3274 my ($ns, $want) = @_;
3043 3275
3044 while (my ($k, $v) = each %$want) { 3276 while (my ($k, $v) = each %$want) {
3099sub reload_config { 3331sub reload_config {
3100 open my $fh, "<:utf8", "$CONFDIR/config" 3332 open my $fh, "<:utf8", "$CONFDIR/config"
3101 or return; 3333 or return;
3102 3334
3103 local $/; 3335 local $/;
3104 *CFG = YAML::Syck::Load <$fh>; 3336 *CFG = YAML::Load <$fh>;
3105 3337
3106 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3338 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3107 3339
3108 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3340 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3109 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3341 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3120sub main { 3352sub main {
3121 # we must not ever block the main coroutine 3353 # we must not ever block the main coroutine
3122 local $Coro::idle = sub { 3354 local $Coro::idle = sub {
3123 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3355 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3124 (async { 3356 (async {
3125 Event::one_event; 3357 $Coro::current->{desc} = "IDLE BUG HANDLER";
3358 EV::loop EV::LOOP_ONESHOT;
3126 })->prio (Coro::PRIO_MAX); 3359 })->prio (Coro::PRIO_MAX);
3127 }; 3360 };
3128 3361
3129 reload_config; 3362 reload_config;
3130 db_init; 3363 db_init;
3131 load_extensions; 3364 load_extensions;
3132 3365
3133 $TICK_WATCHER->start; 3366 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3367 evthread_start IO::AIO::poll_fileno;
3134 Event::loop; 3368 EV::loop;
3135} 3369}
3136 3370
3137############################################################################# 3371#############################################################################
3138# initialisation and cleanup 3372# initialisation and cleanup
3139 3373
3140# install some emergency cleanup handlers 3374# install some emergency cleanup handlers
3141BEGIN { 3375BEGIN {
3376 our %SIGWATCHER = ();
3142 for my $signal (qw(INT HUP TERM)) { 3377 for my $signal (qw(INT HUP TERM)) {
3143 Event->signal ( 3378 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3144 reentrant => 0,
3145 data => WF_AUTOCANCEL,
3146 signal => $signal,
3147 prio => 0,
3148 cb => sub {
3149 cf::cleanup "SIG$signal"; 3379 cf::cleanup "SIG$signal";
3150 },
3151 ); 3380 };
3152 } 3381 }
3153} 3382}
3154 3383
3155sub write_runtime { 3384sub write_runtime {
3156 my $runtime = "$LOCALDIR/runtime"; 3385 my $runtime = "$LOCALDIR/runtime";
3201 # and maps saved/destroyed asynchronously. 3430 # and maps saved/destroyed asynchronously.
3202 warn "begin emergency player save\n"; 3431 warn "begin emergency player save\n";
3203 for my $login (keys %cf::PLAYER) { 3432 for my $login (keys %cf::PLAYER) {
3204 my $pl = $cf::PLAYER{$login} or next; 3433 my $pl = $cf::PLAYER{$login} or next;
3205 $pl->valid or next; 3434 $pl->valid or next;
3435 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3206 $pl->save; 3436 $pl->save;
3207 } 3437 }
3208 warn "end emergency player save\n"; 3438 warn "end emergency player save\n";
3209 3439
3210 warn "begin emergency map save\n"; 3440 warn "begin emergency map save\n";
3249 warn "syncing database to disk"; 3479 warn "syncing database to disk";
3250 BDB::db_env_txn_checkpoint $DB_ENV; 3480 BDB::db_env_txn_checkpoint $DB_ENV;
3251 3481
3252 # if anything goes wrong in here, we should simply crash as we already saved 3482 # if anything goes wrong in here, we should simply crash as we already saved
3253 3483
3254 warn "cancelling all WF_AUTOCANCEL watchers";
3255 for (Event::all_watchers) {
3256 $_->cancel if $_->data & WF_AUTOCANCEL;
3257 }
3258
3259 warn "flushing outstanding aio requests"; 3484 warn "flushing outstanding aio requests";
3260 for (;;) { 3485 for (;;) {
3261 BDB::flush; 3486 BDB::flush;
3262 IO::AIO::flush; 3487 IO::AIO::flush;
3263 Coro::cede; 3488 Coro::cede_notself;
3264 last unless IO::AIO::nreqs || BDB::nreqs; 3489 last unless IO::AIO::nreqs || BDB::nreqs;
3265 warn "iterate..."; 3490 warn "iterate...";
3266 } 3491 }
3267 3492
3268 ++$RELOAD; 3493 ++$RELOAD;
3344 warn "leaving sync_job"; 3569 warn "leaving sync_job";
3345 3570
3346 1 3571 1
3347 } or do { 3572 } or do {
3348 warn $@; 3573 warn $@;
3349 warn "error while reloading, exiting."; 3574 cf::cleanup "error while reloading, exiting.";
3350 exit 1;
3351 }; 3575 };
3352 3576
3353 warn "reloaded"; 3577 warn "reloaded";
3354}; 3578};
3355 3579
3357 3581
3358sub reload_perl() { 3582sub reload_perl() {
3359 # doing reload synchronously and two reloads happen back-to-back, 3583 # doing reload synchronously and two reloads happen back-to-back,
3360 # coro crashes during coro_state_free->destroy here. 3584 # coro crashes during coro_state_free->destroy here.
3361 3585
3362 $RELOAD_WATCHER ||= Event->timer ( 3586 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3363 reentrant => 0,
3364 after => 0,
3365 data => WF_AUTOCANCEL,
3366 cb => sub {
3367 do_reload_perl; 3587 do_reload_perl;
3368 undef $RELOAD_WATCHER; 3588 undef $RELOAD_WATCHER;
3369 },
3370 ); 3589 };
3371} 3590}
3372 3591
3373register_command "reload" => sub { 3592register_command "reload" => sub {
3374 my ($who, $arg) = @_; 3593 my ($who, $arg) = @_;
3375 3594
3376 if ($who->flag (FLAG_WIZ)) { 3595 if ($who->flag (FLAG_WIZ)) {
3377 $who->message ("reloading server."); 3596 $who->message ("reloading server.");
3597 async {
3598 $Coro::current->{desc} = "perl_reload";
3378 async { reload_perl }; 3599 reload_perl;
3600 };
3379 } 3601 }
3380}; 3602};
3381 3603
3382unshift @INC, $LIBDIR; 3604unshift @INC, $LIBDIR;
3383 3605
3385 3607
3386our @WAIT_FOR_TICK; 3608our @WAIT_FOR_TICK;
3387our @WAIT_FOR_TICK_BEGIN; 3609our @WAIT_FOR_TICK_BEGIN;
3388 3610
3389sub wait_for_tick { 3611sub wait_for_tick {
3390 return unless $TICK_WATCHER->is_active; 3612 return if tick_inhibit;
3391 return if $Coro::current == $Coro::main; 3613 return if $Coro::current == $Coro::main;
3392 3614
3393 my $signal = new Coro::Signal; 3615 my $signal = new Coro::Signal;
3394 push @WAIT_FOR_TICK, $signal; 3616 push @WAIT_FOR_TICK, $signal;
3395 $signal->wait; 3617 $signal->wait;
3396} 3618}
3397 3619
3398sub wait_for_tick_begin { 3620sub wait_for_tick_begin {
3399 return unless $TICK_WATCHER->is_active; 3621 return if tick_inhibit;
3400 return if $Coro::current == $Coro::main; 3622 return if $Coro::current == $Coro::main;
3401 3623
3402 my $signal = new Coro::Signal; 3624 my $signal = new Coro::Signal;
3403 push @WAIT_FOR_TICK_BEGIN, $signal; 3625 push @WAIT_FOR_TICK_BEGIN, $signal;
3404 $signal->wait; 3626 $signal->wait;
3405} 3627}
3406 3628
3407 my $min = 1e6;#d# 3629sub tick {
3408 my $avg = 10;
3409$TICK_WATCHER = Event->timer (
3410 reentrant => 0,
3411 parked => 1,
3412 prio => 0,
3413 at => $NEXT_TICK || $TICK,
3414 data => WF_AUTOCANCEL,
3415 cb => sub {
3416 if ($Coro::current != $Coro::main) { 3630 if ($Coro::current != $Coro::main) {
3417 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3631 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3418 unless ++$bug_warning > 10; 3632 unless ++$bug_warning > 10;
3419 return; 3633 return;
3420 } 3634 }
3421 3635
3422 $NOW = $tick_start = Event::time;
3423
3424 cf::server_tick; # one server iteration 3636 cf::server_tick; # one server iteration
3425 3637
3426 0 && sync_job {#d# 3638 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3427 for(1..10) { 3639 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3428 my $t = Event::time; 3640 Coro::async_pool {
3429 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3641 $Coro::current->{desc} = "runtime saver";
3430 or die; 3642 write_runtime
3431 3643 or warn "ERROR: unable to write runtime file: $!";
3432 $map->width (50);
3433 $map->height (50);
3434 $map->alloc;
3435 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3436 my $t = Event::time - $t;
3437
3438 #next unless $t < 0.0013;#d#
3439 if ($t < $min) {
3440 $min = $t;
3441 }
3442 $avg = $avg * 0.99 + $t * 0.01;
3443 }
3444 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3445 exit 0;
3446 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3447 }; 3644 };
3645 }
3448 3646
3449 $RUNTIME += $TICK;
3450 $NEXT_TICK += $TICK;
3451
3452 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3453 $NEXT_RUNTIME_WRITE = $NOW + 10;
3454 Coro::async_pool {
3455 write_runtime
3456 or warn "ERROR: unable to write runtime file: $!";
3457 };
3458 }
3459
3460# my $AFTER = Event::time;
3461# warn $AFTER - $NOW;#d#
3462
3463 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3647 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3464 $sig->send; 3648 $sig->send;
3465 } 3649 }
3466 while (my $sig = shift @WAIT_FOR_TICK) { 3650 while (my $sig = shift @WAIT_FOR_TICK) {
3467 $sig->send; 3651 $sig->send;
3468 } 3652 }
3469 3653
3470 $NOW = Event::time; 3654 $LOAD = ($NOW - $TICK_START) / $TICK;
3471
3472 # if we are delayed by four ticks or more, skip them all
3473 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3474
3475 $TICK_WATCHER->at ($NEXT_TICK);
3476 $TICK_WATCHER->start;
3477
3478 $LOAD = ($NOW - $tick_start) / $TICK;
3479 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3655 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3480 3656
3481 _post_tick; 3657 if (0) {
3482 3658 if ($NEXT_TICK) {
3483 3659 my $jitter = $TICK_START - $NEXT_TICK;
3660 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3661 warn "jitter $JITTER\n";#d#
3662 }
3484 }, 3663 }
3485); 3664}
3486 3665
3487{ 3666{
3488 BDB::max_poll_time $TICK * 0.1; 3667 # configure BDB
3489 $BDB_POLL_WATCHER = Event->io ( 3668
3490 reentrant => 0,
3491 fd => BDB::poll_fileno,
3492 poll => 'r',
3493 prio => 0,
3494 data => WF_AUTOCANCEL,
3495 cb => \&BDB::poll_cb,
3496 );
3497 BDB::min_parallel 8; 3669 BDB::min_parallel 8;
3498 3670 BDB::max_poll_reqs $TICK * 0.1;
3499 BDB::set_sync_prepare { 3671 $Coro::BDB::WATCHER->priority (1);
3500 my $status;
3501 my $current = $Coro::current;
3502 (
3503 sub {
3504 $status = $!;
3505 $current->ready; undef $current;
3506 },
3507 sub {
3508 Coro::schedule while defined $current;
3509 $! = $status;
3510 },
3511 )
3512 };
3513 3672
3514 unless ($DB_ENV) { 3673 unless ($DB_ENV) {
3515 $DB_ENV = BDB::db_env_create; 3674 $DB_ENV = BDB::db_env_create;
3675 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3676 | BDB::LOG_AUTOREMOVE, 1);
3677 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3678 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3516 3679
3517 cf::sync_job { 3680 cf::sync_job {
3518 eval { 3681 eval {
3519 BDB::db_env_open 3682 BDB::db_env_open
3520 $DB_ENV, 3683 $DB_ENV,
3522 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3685 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3523 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3686 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3524 0666; 3687 0666;
3525 3688
3526 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3689 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3527
3528 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3529 $DB_ENV->set_lk_detect;
3530 }; 3690 };
3531 3691
3532 cf::cleanup "db_env_open(db): $@" if $@; 3692 cf::cleanup "db_env_open(db): $@" if $@;
3533 }; 3693 };
3534 } 3694 }
3695
3696 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3697 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3698 };
3699 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3700 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3701 };
3702 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3703 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3704 };
3535} 3705}
3536 3706
3537{ 3707{
3708 # configure IO::AIO
3709
3538 IO::AIO::min_parallel 8; 3710 IO::AIO::min_parallel 8;
3539
3540 undef $Coro::AIO::WATCHER;
3541 IO::AIO::max_poll_time $TICK * 0.1; 3711 IO::AIO::max_poll_time $TICK * 0.1;
3542 $AIO_POLL_WATCHER = Event->io ( 3712 $Coro::AIO::WATCHER->priority (1);
3543 reentrant => 0,
3544 data => WF_AUTOCANCEL,
3545 fd => IO::AIO::poll_fileno,
3546 poll => 'r',
3547 prio => 6,
3548 cb => \&IO::AIO::poll_cb,
3549 );
3550} 3713}
3551 3714
3552my $_log_backtrace; 3715my $_log_backtrace;
3553 3716
3554sub _log_backtrace { 3717sub _log_backtrace {
3558 3721
3559 # limit the # of concurrent backtraces 3722 # limit the # of concurrent backtraces
3560 if ($_log_backtrace < 2) { 3723 if ($_log_backtrace < 2) {
3561 ++$_log_backtrace; 3724 ++$_log_backtrace;
3562 async { 3725 async {
3726 $Coro::current->{desc} = "abt $msg";
3727
3563 my @bt = fork_call { 3728 my @bt = fork_call {
3564 @addr = map { sprintf "%x", $_ } @addr; 3729 @addr = map { sprintf "%x", $_ } @addr;
3565 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3730 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3566 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3731 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3567 or die "addr2line: $!"; 3732 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines