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.388 by root, Thu Oct 18 02:56:13 2007 UTC vs.
Revision 1.456 by root, Tue Sep 30 04:00:35 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict "vars", "subs";
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use Event; 31use EV;
10use Opcode; 32use Opcode;
11use Safe; 33use Safe;
12use Safe::Hole; 34use Safe::Hole;
13use Storable (); 35use Storable ();
14 36
15use Coro 4.1 (); 37use Coro ();
16use Coro::State; 38use Coro::State;
17use Coro::Handle; 39use Coro::Handle;
40use Coro::EV;
18use Coro::Event; 41use Coro::AnyEvent;
19use Coro::Timer; 42use Coro::Timer;
20use Coro::Signal; 43use Coro::Signal;
21use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
22use Coro::AIO; 46use Coro::AIO;
47use Coro::BDB 1.6;
23use Coro::Storable; 48use Coro::Storable;
24use Coro::Util (); 49use Coro::Util ();
25 50
26use JSON::XS (); 51use JSON::XS 2.01 ();
27use BDB (); 52use BDB ();
28use Data::Dumper; 53use Data::Dumper;
29use Digest::MD5; 54use Digest::MD5;
30use Fcntl; 55use Fcntl;
31use YAML::Syck (); 56use YAML ();
32use IO::AIO 2.51 (); 57use IO::AIO ();
33use Time::HiRes; 58use Time::HiRes;
34use Compress::LZF; 59use Compress::LZF;
35use Digest::MD5 (); 60use Digest::MD5 ();
61
62AnyEvent::detect;
36 63
37# configure various modules to our taste 64# configure various modules to our taste
38# 65#
39$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
68
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70
71# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 73Compress::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
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 74
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 76
52our %COMMAND = (); 77our %COMMAND = ();
53our %COMMAND_TIME = (); 78our %COMMAND_TIME = ();
56our %EXTCMD = (); 81our %EXTCMD = ();
57our %EXTICMD = (); 82our %EXTICMD = ();
58our %EXT_CORO = (); # coroutines bound to extensions 83our %EXT_CORO = (); # coroutines bound to extensions
59our %EXT_MAP = (); # pluggable maps 84our %EXT_MAP = (); # pluggable maps
60 85
61our $RELOAD; # number of reloads so far 86our $RELOAD; # number of reloads so far, non-zero while in reload
62our @EVENT; 87our @EVENT;
63 88
64our $CONFDIR = confdir; 89our $CONFDIR = confdir;
65our $DATADIR = datadir; 90our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 91our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 92our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 93our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 94our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 95our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 96our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 97our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 98our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 99our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime";
102
103our %RESOURCE;
75 104
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 107our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 108our $USE_FSYNC = 1; # use fsync to write maps - default off
83 109
84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 110our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 111our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 112our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 113our $DB_ENV;
89 114
90our %CFG; 115our %CFG;
91 116
92our $UPTIME; $UPTIME ||= time; 117our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 118our $RUNTIME;
119our $NOW;
94 120
95our (%PLAYER, %PLAYER_LOADING); # all users 121our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 122our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 123our $LINK_MAP; # the special {link} map, which is always available
98 124
99# used to convert map paths into valid unix filenames by replacing / by ∕ 125# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 126our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 127
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 128our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 129our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 131our $TICK_START; # for load detecting purposes
132
133our @POST_INIT;
105 134
106binmode STDOUT; 135binmode STDOUT;
107binmode STDERR; 136binmode STDERR;
108 137
109# read virtual server time, if available 138# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 139unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 140 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 141 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 142 $RUNTIME = <$fh> + 0.;
114} 143}
115 144
116mkdir $_ 145mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 146 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
162 191
163The raw value load value from the last tick. 192The raw value load value from the last tick.
164 193
165=item %cf::CFG 194=item %cf::CFG
166 195
167Configuration for the server, loaded from C</etc/crossfire/config>, or 196Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 197from wherever your confdir points to.
169 198
170=item cf::wait_for_tick, cf::wait_for_tick_begin 199=item cf::wait_for_tick, cf::wait_for_tick_begin
171 200
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 201These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 222 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 223
195 LOG llevError, $msg; 224 LOG llevError, $msg;
196 }; 225 };
197} 226}
227
228$Coro::State::DIEHOOK = sub {
229 return unless $^S eq 0; # "eq", not "=="
230
231 if ($Coro::current == $Coro::main) {#d#
232 warn "DIEHOOK called in main context, Coro bug?\n";#d#
233 return;#d#
234 }#d#
235
236 # kill coroutine otherwise
237 warn Carp::longmess $_[0];
238 Coro::terminate
239};
240
241$SIG{__DIE__} = sub { }; #d#?
198 242
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 243@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 244@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 245@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 246@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 253for my $pkg (qw(
210 cf::global cf::attachable 254 cf::global cf::attachable
211 cf::object cf::object::player 255 cf::object cf::object::player
212 cf::client cf::player 256 cf::client cf::player
213 cf::arch cf::living 257 cf::arch cf::living
258 cf::map cf::mapspace
214 cf::map cf::party cf::region 259 cf::party cf::region
215)) { 260)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 261 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 262}
219 263
220$Event::DIED = sub { 264$EV::DIED = sub {
221 warn "error in event callback: @_"; 265 warn "error in event callback: @_";
222}; 266};
223 267
224############################################################################# 268#############################################################################
225 269
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 292 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 293 $d
250 } || "[unable to dump $_[0]: '$@']"; 294 } || "[unable to dump $_[0]: '$@']";
251} 295}
252 296
253=item $ref = cf::from_json $json 297=item $ref = cf::decode_json $json
254 298
255Converts a JSON string into the corresponding perl data structure. 299Converts a JSON string into the corresponding perl data structure.
256 300
257=item $json = cf::to_json $ref 301=item $json = cf::encode_json $ref
258 302
259Converts a perl data structure into its JSON representation. 303Converts a perl data structure into its JSON representation.
260 304
261=cut 305=cut
262 306
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 307our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 308
265sub to_json ($) { $json_coder->encode ($_[0]) } 309sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 310sub decode_json($) { $json_coder->decode ($_[0]) }
311
312=item cf::post_init { BLOCK }
313
314Execute the given codeblock, I<after> all extensions have been (re-)loaded,
315but I<before> the server starts ticking again.
316
317The cdoeblock will have a single boolean argument to indicate whether this
318is a reload or not.
319
320=cut
321
322sub post_init(&) {
323 push @POST_INIT, shift;
324}
267 325
268=item cf::lock_wait $string 326=item cf::lock_wait $string
269 327
270Wait until the given lock is available. See cf::lock_acquire. 328Wait until the given lock is available. See cf::lock_acquire.
271 329
299 return;#d# 357 return;#d#
300 }#d# 358 }#d#
301 359
302 # wait for lock, if any 360 # wait for lock, if any
303 while ($LOCK{$key}) { 361 while ($LOCK{$key}) {
362 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
304 push @{ $LOCK{$key} }, $Coro::current; 363 push @{ $LOCK{$key} }, $Coro::current;
305 Coro::schedule; 364 Coro::schedule;
306 } 365 }
307} 366}
308 367
327 386
328 ! ! $LOCK{$key} 387 ! ! $LOCK{$key}
329} 388}
330 389
331sub freeze_mainloop { 390sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 391 tick_inhibit_inc;
333 392
334 my $guard = Coro::guard { 393 Coro::guard \&tick_inhibit_dec;
335 $TICK_WATCHER->start; 394}
336 }; 395
337 $TICK_WATCHER->stop; 396=item cf::periodic $interval, $cb
338 $guard 397
398Like EV::periodic, but randomly selects a starting point so that the actions
399get spread over timer.
400
401=cut
402
403sub periodic($$) {
404 my ($interval, $cb) = @_;
405
406 my $start = rand List::Util::min 180, $interval;
407
408 EV::periodic $start, $interval, 0, $cb
339} 409}
340 410
341=item cf::get_slot $time[, $priority[, $name]] 411=item cf::get_slot $time[, $priority[, $name]]
342 412
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 413Allocate $time seconds of blocking CPU time at priority C<$priority>:
383 } 453 }
384 } 454 }
385}; 455};
386 456
387sub get_slot($;$$) { 457sub get_slot($;$$) {
458 return if tick_inhibit || $Coro::current == $Coro::main;
459
388 my ($time, $pri, $name) = @_; 460 my ($time, $pri, $name) = @_;
389 461
390 $time = $TICK * .6 if $time > $TICK * .6; 462 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal; 463 my $sig = new Coro::Signal;
392 464
406 478
407BEGIN { *async = \&Coro::async_pool } 479BEGIN { *async = \&Coro::async_pool }
408 480
409=item cf::sync_job { BLOCK } 481=item cf::sync_job { BLOCK }
410 482
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 483The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 484is always able to handle events or runnable, as Deliantra is only
413partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 485partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 486acceptable.
415 487
416If it must be done, put the blocking parts into C<sync_job>. This will run 488If it must be done, put the blocking parts into C<sync_job>. This will run
417the given BLOCK in another coroutine while waiting for the result. The 489the given BLOCK in another coroutine while waiting for the result. The
422 494
423sub sync_job(&) { 495sub sync_job(&) {
424 my ($job) = @_; 496 my ($job) = @_;
425 497
426 if ($Coro::current == $Coro::main) { 498 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 499 my $time = EV::time;
428 500
429 # this is the main coro, too bad, we have to block 501 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 502 # till the operation succeeds, freezing the server :/
431 503
432 LOG llevError, Carp::longmess "sync job";#d# 504 LOG llevError, Carp::longmess "sync job";#d#
433 505
434 # TODO: use suspend/resume instead
435 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 506 my $freeze_guard = freeze_mainloop;
437 507
438 my $busy = 1; 508 my $busy = 1;
439 my @res; 509 my @res;
440 510
447 517
448 while ($busy) { 518 while ($busy) {
449 if (Coro::nready) { 519 if (Coro::nready) {
450 Coro::cede_notself; 520 Coro::cede_notself;
451 } else { 521 } else {
452 Event::one_event; 522 EV::loop EV::LOOP_ONESHOT;
453 } 523 }
454 } 524 }
455 525
456 $time = Event::time - $time; 526 my $time = EV::time - $time;
457 527
458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
459 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
460
461 $tick_start += $time; # do not account sync jobs to server load 528 $TICK_START += $time; # do not account sync jobs to server load
462 529
463 wantarray ? @res : $res[0] 530 wantarray ? @res : $res[0]
464 } else { 531 } else {
465 # we are in another coroutine, how wonderful, everything just works 532 # we are in another coroutine, how wonderful, everything just works
466 533
491=item fork_call { }, $args 558=item fork_call { }, $args
492 559
493Executes the given code block with the given arguments in a seperate 560Executes the given code block with the given arguments in a seperate
494process, returning the results. Everything must be serialisable with 561process, returning the results. Everything must be serialisable with
495Coro::Storable. May, of course, block. Note that the executed sub may 562Coro::Storable. May, of course, block. Note that the executed sub may
496never block itself or use any form of Event handling. 563never block itself or use any form of event handling.
497 564
498=cut 565=cut
499 566
500sub fork_call(&@) { 567sub fork_call(&@) {
501 my ($cb, @args) = @_; 568 my ($cb, @args) = @_;
508 reset_signals; 575 reset_signals;
509 &$cb 576 &$cb
510 }, @args; 577 }, @args;
511 578
512 wantarray ? @res : $res[-1] 579 wantarray ? @res : $res[-1]
580}
581
582=item $coin = coin_from_name $name
583
584=cut
585
586our %coin_alias = (
587 "silver" => "silvercoin",
588 "silvercoin" => "silvercoin",
589 "silvercoins" => "silvercoin",
590 "gold" => "goldcoin",
591 "goldcoin" => "goldcoin",
592 "goldcoins" => "goldcoin",
593 "platinum" => "platinacoin",
594 "platinumcoin" => "platinacoin",
595 "platinumcoins" => "platinacoin",
596 "platina" => "platinacoin",
597 "platinacoin" => "platinacoin",
598 "platinacoins" => "platinacoin",
599 "royalty" => "royalty",
600 "royalties" => "royalty",
601);
602
603sub coin_from_name($) {
604 $coin_alias{$_[0]}
605 ? cf::arch::find $coin_alias{$_[0]}
606 : undef
513} 607}
514 608
515=item $value = cf::db_get $family => $key 609=item $value = cf::db_get $family => $key
516 610
517Returns a single value from the environment database. 611Returns a single value from the environment database.
656 750
657############################################################################# 751#############################################################################
658 752
659=head2 ATTACHABLE OBJECTS 753=head2 ATTACHABLE OBJECTS
660 754
661Many objects in crossfire are so-called attachable objects. That means you can 755Many objects in deliantra are so-called attachable objects. That means you can
662attach callbacks/event handlers (a collection of which is called an "attachment") 756attach callbacks/event handlers (a collection of which is called an "attachment")
663to it. All such attachable objects support the following methods. 757to it. All such attachable objects support the following methods.
664 758
665In the following description, CLASS can be any of C<global>, C<object> 759In the following description, CLASS can be any of C<global>, C<object>
666C<player>, C<client> or C<map> (i.e. the attachable objects in 760C<player>, C<client> or C<map> (i.e. the attachable objects in
667Crossfire TRT). 761Deliantra).
668 762
669=over 4 763=over 4
670 764
671=item $attachable->attach ($attachment, key => $value...) 765=item $attachable->attach ($attachment, key => $value...)
672 766
716=item cf::CLASS::attachment $name, ... 810=item cf::CLASS::attachment $name, ...
717 811
718Register an attachment by C<$name> through which attachable objects of the 812Register an attachment by C<$name> through which attachable objects of the
719given CLASS can refer to this attachment. 813given CLASS can refer to this attachment.
720 814
721Some classes such as crossfire maps and objects can specify attachments 815Some classes such as deliantra maps and objects can specify attachments
722that are attached at load/instantiate time, thus the need for a name. 816that are attached at load/instantiate time, thus the need for a name.
723 817
724These calls expect any number of the following handler/hook descriptions: 818These calls expect any number of the following handler/hook descriptions:
725 819
726=over 4 820=over 4
954 } 1048 }
955 1049
956 0 1050 0
957} 1051}
958 1052
959=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1053=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
960 1054
961=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1055=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
962 1056
963Generate an object-specific event with the given arguments. 1057Generate an object-specific event with the given arguments.
964 1058
1017 1111
1018sub reattach { 1112sub reattach {
1019 # basically do the same as instantiate, without calling instantiate 1113 # basically do the same as instantiate, without calling instantiate
1020 my ($obj) = @_; 1114 my ($obj) = @_;
1021 1115
1116 # no longer needed after getting rid of delete_package?
1022 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1117 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1023 1118
1024 my $registry = $obj->registry; 1119 my $registry = $obj->registry;
1025 1120
1026 @$registry = (); 1121 @$registry = ();
1027 1122
1042cf::attachable->attach ( 1137cf::attachable->attach (
1043 prio => -1000000, 1138 prio => -1000000,
1044 on_instantiate => sub { 1139 on_instantiate => sub {
1045 my ($obj, $data) = @_; 1140 my ($obj, $data) = @_;
1046 1141
1047 $data = from_json $data; 1142 $data = decode_json $data;
1048 1143
1049 for (@$data) { 1144 for (@$data) {
1050 my ($name, $args) = @$_; 1145 my ($name, $args) = @$_;
1051 1146
1052 $obj->attach ($name, %{$args || {} }); 1147 $obj->attach ($name, %{$args || {} });
1073 utf8::decode (my $decname = $filename); 1168 utf8::decode (my $decname = $filename);
1074 warn sprintf "saving %s (%d,%d)\n", 1169 warn sprintf "saving %s (%d,%d)\n",
1075 $decname, length $$rdata, scalar @$objs; 1170 $decname, length $$rdata, scalar @$objs;
1076 1171
1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1078 chmod SAVE_MODE, $fh; 1173 aio_chmod $fh, SAVE_MODE;
1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1080 aio_fsync $fh if $cf::USE_FSYNC; 1175 aio_fsync $fh if $cf::USE_FSYNC;
1081 close $fh; 1176 aio_close $fh;
1082 1177
1083 if (@$objs) { 1178 if (@$objs) {
1084 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1179 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1085 chmod SAVE_MODE, $fh; 1180 aio_chmod $fh, SAVE_MODE;
1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1087 aio_write $fh, 0, (length $data), $data, 0; 1182 aio_write $fh, 0, (length $data), $data, 0;
1088 aio_fsync $fh if $cf::USE_FSYNC; 1183 aio_fsync $fh if $cf::USE_FSYNC;
1089 close $fh; 1184 aio_close $fh;
1090 aio_rename "$filename.pst~", "$filename.pst"; 1185 aio_rename "$filename.pst~", "$filename.pst";
1091 } 1186 }
1092 } else { 1187 } else {
1093 aio_unlink "$filename.pst"; 1188 aio_unlink "$filename.pst";
1094 } 1189 }
1095 1190
1096 aio_rename "$filename~", $filename; 1191 aio_rename "$filename~", $filename;
1192
1193 $filename =~ s%/[^/]+$%%;
1194 aio_pathsync $filename;
1097 } else { 1195 } else {
1098 warn "FATAL: $filename~: $!\n"; 1196 warn "FATAL: $filename~: $!\n";
1099 } 1197 }
1100 } else { 1198 } else {
1101 aio_unlink $filename; 1199 aio_unlink $filename;
1263 1361
1264 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1362 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1265 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1363 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1266 1364
1267 $ext{source} = 1365 $ext{source} =
1268 "package $pkg; use strict; use utf8;\n" 1366 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1269 . "#line 1 \"$path\"\n{\n" 1367 . "#line 1 \"$path\"\n{\n"
1270 . $source 1368 . $source
1271 . "\n};\n1"; 1369 . "\n};\n1";
1272 1370
1273 $todo{$base} = \%ext; 1371 $todo{$base} = \%ext;
1289 my $msg = $@ ? "$v->{path}: $@\n" 1387 my $msg = $@ ? "$v->{path}: $@\n"
1290 : "$v->{base}: extension inactive.\n"; 1388 : "$v->{base}: extension inactive.\n";
1291 1389
1292 if (exists $v->{meta}{mandatory}) { 1390 if (exists $v->{meta}{mandatory}) {
1293 warn $msg; 1391 warn $msg;
1294 warn "mandatory extension failed to load, exiting.\n"; 1392 cf::cleanup "mandatory extension failed to load, exiting.";
1295 exit 1;
1296 } 1393 }
1297 1394
1298 warn $msg; 1395 warn $msg;
1299 } 1396 }
1300 1397
1314 1411
1315=back 1412=back
1316 1413
1317=head2 CORE EXTENSIONS 1414=head2 CORE EXTENSIONS
1318 1415
1319Functions and methods that extend core crossfire objects. 1416Functions and methods that extend core deliantra objects.
1320 1417
1321=cut 1418=cut
1322 1419
1323package cf::player; 1420package cf::player;
1324 1421
1367 1464
1368sub exists($) { 1465sub exists($) {
1369 my ($login) = @_; 1466 my ($login) = @_;
1370 1467
1371 $cf::PLAYER{$login} 1468 $cf::PLAYER{$login}
1372 or cf::sync_job { !aio_stat path $login } 1469 or !aio_stat path $login
1373} 1470}
1374 1471
1375sub find($) { 1472sub find($) {
1376 return $cf::PLAYER{$_[0]} || do { 1473 return $cf::PLAYER{$_[0]} || do {
1377 my $login = $_[0]; 1474 my $login = $_[0];
1389 my $f = new_from_file cf::object::thawer path $login 1486 my $f = new_from_file cf::object::thawer path $login
1390 or return; 1487 or return;
1391 1488
1392 my $pl = cf::player::load_pl $f 1489 my $pl = cf::player::load_pl $f
1393 or return; 1490 or return;
1491
1394 local $cf::PLAYER_LOADING{$login} = $pl; 1492 local $cf::PLAYER_LOADING{$login} = $pl;
1395 $f->resolve_delayed_derefs; 1493 $f->resolve_delayed_derefs;
1396 $cf::PLAYER{$login} = $pl 1494 $cf::PLAYER{$login} = $pl
1397 } 1495 }
1398 } 1496 }
1408 1506
1409 return if $pl->{deny_save}; 1507 return if $pl->{deny_save};
1410 1508
1411 aio_mkdir playerdir $pl, 0770; 1509 aio_mkdir playerdir $pl, 0770;
1412 $pl->{last_save} = $cf::RUNTIME; 1510 $pl->{last_save} = $cf::RUNTIME;
1511
1512 cf::get_slot 0.01;
1413 1513
1414 $pl->save_pl ($path); 1514 $pl->save_pl ($path);
1415 cf::cede_to_tick; 1515 cf::cede_to_tick;
1416} 1516}
1417 1517
1449 my ($pl) = @_; 1549 my ($pl) = @_;
1450 1550
1451 my $name = $pl->ob->name; 1551 my $name = $pl->ob->name;
1452 1552
1453 $pl->{deny_save} = 1; 1553 $pl->{deny_save} = 1;
1454 $pl->password ("*"); # this should lock out the player until we nuked the dir 1554 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1455 1555
1456 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1556 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1457 $pl->deactivate; 1557 $pl->deactivate;
1558 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1559 $pl->ob->check_score;
1458 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1560 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1459 $pl->ns->destroy if $pl->ns; 1561 $pl->ns->destroy if $pl->ns;
1460 1562
1461 my $path = playerdir $pl; 1563 my $path = playerdir $pl;
1462 my $temp = "$path~$cf::RUNTIME~deleting~"; 1564 my $temp = "$path~$cf::RUNTIME~deleting~";
1501 1603
1502 for my $login (@$dirs) { 1604 for my $login (@$dirs) {
1503 my $path = path $login; 1605 my $path = path $login;
1504 1606
1505 # a .pst is a dead give-away for a valid player 1607 # a .pst is a dead give-away for a valid player
1506 unless (-e "$path.pst") { 1608 # if no pst file found, open and chekc for blocked users
1609 if (aio_stat "$path.pst") {
1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1610 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1508 aio_read $fh, 0, 512, my $buf, 0 or next; 1611 aio_read $fh, 0, 512, my $buf, 0 or next;
1509 $buf !~ /^password -------------$/m or next; # official not-valid tag 1612 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 } 1613 }
1511 1614
1542 } 1645 }
1543 1646
1544 \@paths 1647 \@paths
1545} 1648}
1546 1649
1547=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1650=item $protocol_xml = $player->expand_cfpod ($cfpod)
1548 1651
1549Expand crossfire pod fragments into protocol xml. 1652Expand deliantra pod fragments into protocol xml.
1550
1551=cut
1552
1553sub expand_cfpod {
1554 ((my $self), (local $_)) = @_;
1555
1556 # escape & and <
1557 s/&/&amp;/g;
1558 s/(?<![BIUGHT])</&lt;/g;
1559
1560 # this is buggy, it needs to properly take care of nested <'s
1561
1562 1 while
1563 # replace B<>, I<>, U<> etc.
1564 s/B<([^\>]*)>/<b>$1<\/b>/
1565 || s/I<([^\>]*)>/<i>$1<\/i>/
1566 || s/U<([^\>]*)>/<u>$1<\/u>/
1567 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1568 # replace G<male|female> tags
1569 || s{G<([^>|]*)\|([^>]*)>}{
1570 $self->gender ? $2 : $1
1571 }ge
1572 # replace H<hint text>
1573 || s{H<([^\>]*)>}
1574 {
1575 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1576 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1577 "")
1578 [$self->{hintmode}]
1579 }ge;
1580
1581 # create single paragraphs (very hackish)
1582 s/(?<=\S)\n(?=\w)/ /g;
1583
1584 # compress some whitespace
1585 s/\s+\n/\n/g; # ws line-ends
1586 s/\n\n+/\n/g; # double lines
1587 s/^\n+//; # beginning lines
1588 s/\n+$//; # ending lines
1589
1590 $_
1591}
1592
1593sub hintmode {
1594 $_[0]{hintmode} = $_[1] if @_ > 1;
1595 $_[0]{hintmode}
1596}
1597 1653
1598=item $player->ext_reply ($msgid, @msg) 1654=item $player->ext_reply ($msgid, @msg)
1599 1655
1600Sends an ext reply to the player. 1656Sends an ext reply to the player.
1601 1657
1668our $MAX_RESET = 3600; 1724our $MAX_RESET = 3600;
1669our $DEFAULT_RESET = 3000; 1725our $DEFAULT_RESET = 3000;
1670 1726
1671sub generate_random_map { 1727sub generate_random_map {
1672 my ($self, $rmp) = @_; 1728 my ($self, $rmp) = @_;
1729
1730 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1731
1673 # mit "rum" bekleckern, nicht 1732 # mit "rum" bekleckern, nicht
1674 $self->_create_random_map ( 1733 $self->_create_random_map (
1675 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1734 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1676 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1735 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1677 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1736 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1799 1858
1800# the temporary/swap location 1859# the temporary/swap location
1801sub save_path { 1860sub save_path {
1802 my ($self) = @_; 1861 my ($self) = @_;
1803 1862
1804 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1805 "$TMPDIR/$path.map" 1864 "$TMPDIR/$path.map"
1806} 1865}
1807 1866
1808# the unique path, undef == no special unique path 1867# the unique path, undef == no special unique path
1809sub uniq_path { 1868sub uniq_path {
1810 my ($self) = @_; 1869 my ($self) = @_;
1811 1870
1812 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1871 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1813 "$UNIQUEDIR/$path" 1872 "$UNIQUEDIR/$path"
1814} 1873}
1815 1874
1816# and all this just because we cannot iterate over 1875# and all this just because we cannot iterate over
1817# all maps in C++... 1876# all maps in C++...
1915 1974
1916 cf::lock_wait "map_data:$path";#d#remove 1975 cf::lock_wait "map_data:$path";#d#remove
1917 cf::lock_wait "map_find:$path"; 1976 cf::lock_wait "map_find:$path";
1918 1977
1919 $cf::MAP{$path} || do { 1978 $cf::MAP{$path} || do {
1920 my $guard1 = cf::lock_acquire "map_find:$path";
1921 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 1979 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1980 my $guard2 = cf::lock_acquire "map_find:$path";
1922 1981
1923 my $map = new_from_path cf::map $path 1982 my $map = new_from_path cf::map $path
1924 or return; 1983 or return;
1925 1984
1926 $map->{last_save} = $cf::RUNTIME; 1985 $map->{last_save} = $cf::RUNTIME;
1929 or return; 1988 or return;
1930 1989
1931 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1990 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1932 # doing this can freeze the server in a sync job, obviously 1991 # doing this can freeze the server in a sync job, obviously
1933 #$cf::WAIT_FOR_TICK->wait; 1992 #$cf::WAIT_FOR_TICK->wait;
1993 undef $guard2;
1934 undef $guard1; 1994 undef $guard1;
1935 undef $guard2;
1936 $map->reset; 1995 $map->reset;
1937 return find $path; 1996 return find $path;
1938 } 1997 }
1939 1998
1940 $cf::MAP{$path} = $map 1999 $cf::MAP{$path} = $map
1967 my $f = new_from_file cf::object::thawer $self->{load_path}; 2026 my $f = new_from_file cf::object::thawer $self->{load_path};
1968 $f->skip_block; 2027 $f->skip_block;
1969 $self->_load_objects ($f) 2028 $self->_load_objects ($f)
1970 or return; 2029 or return;
1971 2030
1972 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2031 $self->post_load_original
1973 if delete $self->{load_original}; 2032 if delete $self->{load_original};
1974 2033
1975 if (my $uniq = $self->uniq_path) { 2034 if (my $uniq = $self->uniq_path) {
1976 utf8::encode $uniq; 2035 utf8::encode $uniq;
1977 unless (aio_stat $uniq) { 2036 unless (aio_stat $uniq) {
2003 } 2062 }
2004 2063
2005 $self->{last_save} = $cf::RUNTIME; 2064 $self->{last_save} = $cf::RUNTIME;
2006 $self->last_access ($cf::RUNTIME); 2065 $self->last_access ($cf::RUNTIME);
2007 2066
2008 $self->in_memory (cf::MAP_IN_MEMORY); 2067 $self->in_memory (cf::MAP_ACTIVE);
2009 } 2068 }
2010 2069
2011 $self->post_load; 2070 $self->post_load;
2012} 2071}
2013 2072
2071 my ($path, $origin, $load) = @_; 2130 my ($path, $origin, $load) = @_;
2072 2131
2073 $path = normalise $path, $origin && $origin->{path}; 2132 $path = normalise $path, $origin && $origin->{path};
2074 2133
2075 if (my $map = $cf::MAP{$path}) { 2134 if (my $map = $cf::MAP{$path}) {
2076 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2135 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2077 } 2136 }
2078 2137
2079 $MAP_PREFETCH{$path} |= $load; 2138 $MAP_PREFETCH{$path} |= $load;
2080 2139
2081 $MAP_PREFETCHER ||= cf::async { 2140 $MAP_PREFETCHER ||= cf::async {
2118 cf::async { 2177 cf::async {
2119 $Coro::current->{desc} = "map player save"; 2178 $Coro::current->{desc} = "map player save";
2120 $_->contr->save for $self->players; 2179 $_->contr->save for $self->players;
2121 }; 2180 };
2122 2181
2182 cf::get_slot 0.02;
2183
2123 if ($uniq) { 2184 if ($uniq) {
2124 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2185 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2125 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2186 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2126 } else { 2187 } else {
2127 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2188 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2135 $self->save; 2196 $self->save;
2136 2197
2137 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2198 my $lock = cf::lock_acquire "map_data:$self->{path}";
2138 2199
2139 return if $self->players; 2200 return if $self->players;
2140 return if $self->in_memory != cf::MAP_IN_MEMORY; 2201 return if $self->in_memory != cf::MAP_ACTIVE;
2141 return if $self->{deny_save}; 2202 return if $self->{deny_save};
2142 2203
2143 $self->in_memory (cf::MAP_SWAPPED); 2204 $self->in_memory (cf::MAP_SWAPPED);
2144 2205
2145 $self->deactivate; 2206 $self->deactivate;
2263 2324
2264sub unique_maps() { 2325sub unique_maps() {
2265 [ 2326 [
2266 map { 2327 map {
2267 utf8::decode $_; 2328 utf8::decode $_;
2268 /\.map$/ 2329 s/\.map$//; # TODO future compatibility hack
2330 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2331 ? ()
2269 ? normalise $_ 2332 : normalise $_
2270 : ()
2271 } @{ aio_readdir $UNIQUEDIR or [] } 2333 } @{ aio_readdir $UNIQUEDIR or [] }
2272 ] 2334 ]
2273} 2335}
2274 2336
2275package cf;
2276
2277=back 2337=back
2278 2338
2279=head3 cf::object 2339=head3 cf::object
2280 2340
2281=cut 2341=cut
2284 2344
2285=over 4 2345=over 4
2286 2346
2287=item $ob->inv_recursive 2347=item $ob->inv_recursive
2288 2348
2289Returns the inventory of the object _and_ their inventories, recursively. 2349Returns the inventory of the object I<and> their inventories, recursively,
2350but I<not> the object itself.
2290 2351
2291=cut 2352=cut
2292 2353
2293sub inv_recursive_; 2354sub inv_recursive_;
2294sub inv_recursive_ { 2355sub inv_recursive_ {
2299 inv_recursive_ inv $_[0] 2360 inv_recursive_ inv $_[0]
2300} 2361}
2301 2362
2302=item $ref = $ob->ref 2363=item $ref = $ob->ref
2303 2364
2304creates and returns a persistent reference to an objetc that can be stored as a string. 2365Creates and returns a persistent reference to an object that can be stored as a string.
2305 2366
2306=item $ob = cf::object::deref ($refstring) 2367=item $ob = cf::object::deref ($refstring)
2307 2368
2308returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2369returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2309even if the object actually exists. May block. 2370even if the object actually exists. May block.
2341can be C<undef>. Does the right thing when the player is currently in a 2402can be C<undef>. Does the right thing when the player is currently in a
2342dialogue with the given NPC character. 2403dialogue with the given NPC character.
2343 2404
2344=cut 2405=cut
2345 2406
2407our $SAY_CHANNEL = {
2408 id => "say",
2409 title => "Map",
2410 reply => "say ",
2411 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2412};
2413
2414our $CHAT_CHANNEL = {
2415 id => "chat",
2416 title => "Chat",
2417 reply => "chat ",
2418 tooltip => "Player chat and shouts, global to the server.",
2419};
2420
2346# rough implementation of a future "reply" method that works 2421# rough implementation of a future "reply" method that works
2347# with dialog boxes. 2422# with dialog boxes.
2348#TODO: the first argument must go, split into a $npc->reply_to ( method 2423#TODO: the first argument must go, split into a $npc->reply_to ( method
2349sub cf::object::player::reply($$$;$) { 2424sub cf::object::player::reply($$$;$) {
2350 my ($self, $npc, $msg, $flags) = @_; 2425 my ($self, $npc, $msg, $flags) = @_;
2361 my $dialog = $pl->{npc_dialog}; 2436 my $dialog = $pl->{npc_dialog};
2362 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2437 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2363 2438
2364 } else { 2439 } else {
2365 $msg = $npc->name . " says: $msg" if $npc; 2440 $msg = $npc->name . " says: $msg" if $npc;
2366 $self->message ($msg, $flags); 2441 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2367 } 2442 }
2368 } 2443 }
2369} 2444}
2370 2445
2371=item $object->send_msg ($channel, $msg, $color, [extra...]) 2446=item $object->send_msg ($channel, $msg, $color, [extra...])
2396 2471
2397=item $player_object->enter_link 2472=item $player_object->enter_link
2398 2473
2399Freezes the player and moves him/her to a special map (C<{link}>). 2474Freezes the player and moves him/her to a special map (C<{link}>).
2400 2475
2401The player should be reasonably safe there for short amounts of time. You 2476The player should be reasonably safe there for short amounts of time (e.g.
2402I<MUST> call C<leave_link> as soon as possible, though. 2477for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2478though, as the palyer cannot control the character while it is on the link
2479map.
2403 2480
2404Will never block. 2481Will never block.
2405 2482
2406=item $player_object->leave_link ($map, $x, $y) 2483=item $player_object->leave_link ($map, $x, $y)
2407 2484
2465 2542
2466 $map->load; 2543 $map->load;
2467 $map->load_neighbours; 2544 $map->load_neighbours;
2468 2545
2469 return unless $self->contr->active; 2546 return unless $self->contr->active;
2547 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2470 $self->activate_recursive; 2548 $self->activate_recursive;
2471 2549
2472 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2550 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2473 $self->enter_map ($map, $x, $y); 2551 $self->enter_map ($map, $x, $y);
2474} 2552}
2478Moves the player to the given map-path and coordinates by first freezing 2556Moves the player to the given map-path and coordinates by first freezing
2479her, loading and preparing them map, calling the provided $check callback 2557her, loading and preparing them map, calling the provided $check callback
2480that has to return the map if sucecssful, and then unfreezes the player on 2558that has to return the map if sucecssful, and then unfreezes the player on
2481the new (success) or old (failed) map position. In either case, $done will 2559the new (success) or old (failed) map position. In either case, $done will
2482be called at the end of this process. 2560be called at the end of this process.
2561
2562Note that $check will be called with a potentially non-loaded map, so if
2563it needs a loaded map it has to call C<< ->load >>.
2483 2564
2484=cut 2565=cut
2485 2566
2486our $GOTOGEN; 2567our $GOTOGEN;
2487 2568
2566} 2647}
2567 2648
2568sub prepare_random_map { 2649sub prepare_random_map {
2569 my ($exit) = @_; 2650 my ($exit) = @_;
2570 2651
2571 my $guard = cf::lock_acquire "exit_prepare:$exit";
2572
2573 # all this does is basically replace the /! path by 2652 # all this does is basically replace the /! path by
2574 # a new random map path (?random/...) with a seed 2653 # a new random map path (?random/...) with a seed
2575 # that depends on the exit object 2654 # that depends on the exit object
2576 2655
2577 my $rmp = parse_random_map_params $exit->msg; 2656 my $rmp = parse_random_map_params $exit->msg;
2579 if ($exit->map) { 2658 if ($exit->map) {
2580 $rmp->{region} = $exit->region->name; 2659 $rmp->{region} = $exit->region->name;
2581 $rmp->{origin_map} = $exit->map->path; 2660 $rmp->{origin_map} = $exit->map->path;
2582 $rmp->{origin_x} = $exit->x; 2661 $rmp->{origin_x} = $exit->x;
2583 $rmp->{origin_y} = $exit->y; 2662 $rmp->{origin_y} = $exit->y;
2663
2664 $exit->map->touch;
2584 } 2665 }
2585 2666
2586 $rmp->{random_seed} ||= $exit->random_seed; 2667 $rmp->{random_seed} ||= $exit->random_seed;
2587 2668
2588 my $data = cf::to_json $rmp; 2669 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2589 my $md5 = Digest::MD5::md5_hex $data; 2670 my $md5 = Digest::MD5::md5_hex $data;
2590 my $meta = "$RANDOMDIR/$md5.meta"; 2671 my $meta = "$RANDOMDIR/$md5.meta";
2591 2672
2592 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2673 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2593 aio_write $fh, 0, (length $data), $data, 0; 2674 aio_write $fh, 0, (length $data), $data, 0;
2594 undef $fh; 2675 undef $fh;
2595 aio_rename "$meta~", $meta; 2676 aio_rename "$meta~", $meta;
2596 2677
2678 my $slaying = "?random/$md5";
2679
2680 if ($exit->valid) {
2597 $exit->slaying ("?random/$md5"); 2681 $exit->slaying ("?random/$md5");
2598 $exit->msg (undef); 2682 $exit->msg (undef);
2683 }
2599 } 2684 }
2600} 2685}
2601 2686
2602sub cf::object::player::enter_exit { 2687sub cf::object::player::enter_exit {
2603 my ($self, $exit) = @_; 2688 my ($self, $exit) = @_;
2604 2689
2605 return unless $self->type == cf::PLAYER; 2690 return unless $self->type == cf::PLAYER;
2606 2691
2607 if ($exit->slaying eq "/!") {
2608 #TODO: this should de-fi-ni-te-ly not be a sync-job
2609 # the problem is that $exit might not survive long enough
2610 # so it needs to be done right now, right here
2611 cf::sync_job { prepare_random_map $exit };
2612 }
2613
2614 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2615 my $hp = $exit->stats->hp;
2616 my $sp = $exit->stats->sp;
2617
2618 $self->enter_link; 2692 $self->enter_link;
2619 2693
2620 # if exit is damned, update players death & WoR home-position
2621 $self->contr->savebed ($slaying, $hp, $sp)
2622 if $exit->flag (FLAG_DAMNED);
2623
2624 (async { 2694 (async {
2625 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2695 $Coro::current->{desc} = "enter_exit";
2626 2696
2627 $self->deactivate_recursive; # just to be sure
2628 unless (eval { 2697 unless (eval {
2698 $self->deactivate_recursive; # just to be sure
2699
2700 # random map handling
2701 {
2702 my $guard = cf::lock_acquire "exit_prepare:$exit";
2703
2704 prepare_random_map $exit
2705 if $exit->slaying eq "/!";
2706 }
2707
2708 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2709 my $x = $exit->stats->hp;
2710 my $y = $exit->stats->sp;
2711
2629 $self->goto ($slaying, $hp, $sp); 2712 $self->goto ($map, $x, $y);
2630 2713
2714 # if exit is damned, update players death & WoR home-position
2715 $self->contr->savebed ($map, $x, $y)
2716 if $exit->flag (cf::FLAG_DAMNED);
2717
2631 1; 2718 1
2632 }) { 2719 }) {
2633 $self->message ("Something went wrong deep within the crossfire server. " 2720 $self->message ("Something went wrong deep within the deliantra server. "
2634 . "I'll try to bring you back to the map you were before. " 2721 . "I'll try to bring you back to the map you were before. "
2635 . "Please report this to the dungeon master!", 2722 . "Please report this to the dungeon master!",
2636 cf::NDI_UNIQUE | cf::NDI_RED); 2723 cf::NDI_UNIQUE | cf::NDI_RED);
2637 2724
2638 warn "ERROR in enter_exit: $@"; 2725 warn "ERROR in enter_exit: $@";
2666the message, with C<log> being the default. If C<$color> is negative, suppress 2753the message, with C<log> being the default. If C<$color> is negative, suppress
2667the message unless the client supports the msg packet. 2754the message unless the client supports the msg packet.
2668 2755
2669=cut 2756=cut
2670 2757
2758# non-persistent channels (usually the info channel)
2671our %CHANNEL = ( 2759our %CHANNEL = (
2672 "c/identify" => { 2760 "c/identify" => {
2673 id => "infobox", 2761 id => "infobox",
2674 title => "Identify", 2762 title => "Identify",
2675 reply => undef, 2763 reply => undef,
2679 id => "infobox", 2767 id => "infobox",
2680 title => "Examine", 2768 title => "Examine",
2681 reply => undef, 2769 reply => undef,
2682 tooltip => "Signs and other items you examined", 2770 tooltip => "Signs and other items you examined",
2683 }, 2771 },
2772 "c/book" => {
2773 id => "infobox",
2774 title => "Book",
2775 reply => undef,
2776 tooltip => "The contents of a note or book",
2777 },
2684 "c/lookat" => { 2778 "c/lookat" => {
2685 id => "infobox", 2779 id => "infobox",
2686 title => "Look", 2780 title => "Look",
2687 reply => undef, 2781 reply => undef,
2688 tooltip => "What you saw there", 2782 tooltip => "What you saw there",
2689 }, 2783 },
2784 "c/who" => {
2785 id => "infobox",
2786 title => "Players",
2787 reply => undef,
2788 tooltip => "Shows players who are currently online",
2789 },
2790 "c/body" => {
2791 id => "infobox",
2792 title => "Body Parts",
2793 reply => undef,
2794 tooltip => "Shows which body parts you posess and are available",
2795 },
2796 "c/skills" => {
2797 id => "infobox",
2798 title => "Skills",
2799 reply => undef,
2800 tooltip => "Shows your experience per skill and item power",
2801 },
2802 "c/uptime" => {
2803 id => "infobox",
2804 title => "Uptime",
2805 reply => undef,
2806 tooltip => "How long the server has been running since last restart",
2807 },
2808 "c/mapinfo" => {
2809 id => "infobox",
2810 title => "Map Info",
2811 reply => undef,
2812 tooltip => "Information related to the maps",
2813 },
2814 "c/party" => {
2815 id => "party",
2816 title => "Party",
2817 reply => "gsay ",
2818 tooltip => "Messages and chat related to your party",
2819 },
2690); 2820);
2691 2821
2692sub cf::client::send_msg { 2822sub cf::client::send_msg {
2693 my ($self, $channel, $msg, $color, @extra) = @_; 2823 my ($self, $channel, $msg, $color, @extra) = @_;
2694 2824
2695 $msg = $self->pl->expand_cfpod ($msg); 2825 $msg = $self->pl->expand_cfpod ($msg)
2826 unless $color & cf::NDI_VERBATIM;
2696 2827
2697 $color &= cf::NDI_CLIENT_MASK; # just in case... 2828 $color &= cf::NDI_CLIENT_MASK; # just in case...
2698 2829
2699 # check predefined channels, for the benefit of C 2830 # check predefined channels, for the benefit of C
2700 if ($CHANNEL{$channel}) { 2831 if ($CHANNEL{$channel}) {
2721 if ($self->can_msg) { 2852 if ($self->can_msg) {
2722 # default colour, mask it out 2853 # default colour, mask it out
2723 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2854 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2724 if $color & cf::NDI_DEF; 2855 if $color & cf::NDI_DEF;
2725 2856
2726 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2857 my $pkt = "msg "
2858 . $self->{json_coder}->encode (
2727 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2859 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2860 );
2861
2862 # try lzf for large packets
2863 $pkt = "lzf " . Compress::LZF::compress $pkt
2864 if 1024 <= length $pkt and $self->{can_lzf};
2865
2866 # split very large packets
2867 if (8192 < length $pkt and $self->{can_lzf}) {
2868 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2869 $pkt = "frag";
2870 }
2871
2872 $self->send_packet ($pkt);
2728 } else { 2873 } else {
2729 if ($color >= 0) { 2874 if ($color >= 0) {
2730 # replace some tags by gcfclient-compatible ones 2875 # replace some tags by gcfclient-compatible ones
2731 for ($msg) { 2876 for ($msg) {
2732 1 while 2877 1 while
2931 3076
2932The following functions and methods are available within a safe environment: 3077The following functions and methods are available within a safe environment:
2933 3078
2934 cf::object 3079 cf::object
2935 contr pay_amount pay_player map x y force_find force_add destroy 3080 contr pay_amount pay_player map x y force_find force_add destroy
2936 insert remove name archname title slaying race decrease_ob_nr 3081 insert remove name archname title slaying race decrease split
2937 3082
2938 cf::object::player 3083 cf::object::player
2939 player 3084 player
2940 3085
2941 cf::player 3086 cf::player
2946 3091
2947=cut 3092=cut
2948 3093
2949for ( 3094for (
2950 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3095 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2951 insert remove inv name archname title slaying race 3096 insert remove inv nrof name archname title slaying race
2952 decrease_ob_nr destroy)], 3097 decrease split destroy change_exp)],
2953 ["cf::object::player" => qw(player)], 3098 ["cf::object::player" => qw(player)],
2954 ["cf::player" => qw(peaceful)], 3099 ["cf::player" => qw(peaceful)],
2955 ["cf::map" => qw(trigger)], 3100 ["cf::map" => qw(trigger)],
2956) { 3101) {
2957 no strict 'refs'; 3102 no strict 'refs';
3062 { 3207 {
3063 my $faces = $facedata->{faceinfo}; 3208 my $faces = $facedata->{faceinfo};
3064 3209
3065 while (my ($face, $info) = each %$faces) { 3210 while (my ($face, $info) = each %$faces) {
3066 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3211 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3212
3067 cf::face::set_visibility $idx, $info->{visibility}; 3213 cf::face::set_visibility $idx, $info->{visibility};
3068 cf::face::set_magicmap $idx, $info->{magicmap}; 3214 cf::face::set_magicmap $idx, $info->{magicmap};
3069 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3215 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3070 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3216 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3071 3217
3072 cf::cede_to_tick; 3218 cf::cede_to_tick;
3073 } 3219 }
3074 3220
3075 while (my ($face, $info) = each %$faces) { 3221 while (my ($face, $info) = each %$faces) {
3076 next unless $info->{smooth}; 3222 next unless $info->{smooth};
3223
3077 my $idx = cf::face::find $face 3224 my $idx = cf::face::find $face
3078 or next; 3225 or next;
3226
3079 if (my $smooth = cf::face::find $info->{smooth}) { 3227 if (my $smooth = cf::face::find $info->{smooth}) {
3080 cf::face::set_smooth $idx, $smooth; 3228 cf::face::set_smooth $idx, $smooth;
3081 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3229 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3082 } else { 3230 } else {
3083 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3231 warn "smooth face '$info->{smooth}' not found for face '$face'";
3101 { 3249 {
3102 # TODO: for gcfclient pleasure, we should give resources 3250 # TODO: for gcfclient pleasure, we should give resources
3103 # that gcfclient doesn't grok a >10000 face index. 3251 # that gcfclient doesn't grok a >10000 face index.
3104 my $res = $facedata->{resource}; 3252 my $res = $facedata->{resource};
3105 3253
3106 my $soundconf = delete $res->{"res/sound.conf"};
3107
3108 while (my ($name, $info) = each %$res) { 3254 while (my ($name, $info) = each %$res) {
3255 if (defined $info->{type}) {
3109 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3256 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3110 my $data; 3257 my $data;
3111 3258
3112 if ($info->{type} & 1) { 3259 if ($info->{type} & 1) {
3113 # prepend meta info 3260 # prepend meta info
3114 3261
3115 my $meta = $enc->encode ({ 3262 my $meta = $enc->encode ({
3116 name => $name, 3263 name => $name,
3117 %{ $info->{meta} || {} }, 3264 %{ $info->{meta} || {} },
3118 }); 3265 });
3119 3266
3120 $data = pack "(w/a*)*", $meta, $info->{data}; 3267 $data = pack "(w/a*)*", $meta, $info->{data};
3268 } else {
3269 $data = $info->{data};
3270 }
3271
3272 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3273 cf::face::set_type $idx, $info->{type};
3121 } else { 3274 } else {
3122 $data = $info->{data}; 3275 $RESOURCE{$name} = $info;
3123 } 3276 }
3124 3277
3125 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3126 cf::face::set_type $idx, $info->{type};
3127
3128 cf::cede_to_tick; 3278 cf::cede_to_tick;
3129 } 3279 }
3130
3131 if ($soundconf) {
3132 $soundconf = $enc->decode (delete $soundconf->{data});
3133
3134 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3135 my $sound = $soundconf->{compat}[$_]
3136 or next;
3137
3138 my $face = cf::face::find "sound/$sound->[1]";
3139 cf::sound::set $sound->[0] => $face;
3140 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3141 }
3142
3143 while (my ($k, $v) = each %{$soundconf->{event}}) {
3144 my $face = cf::face::find "sound/$v";
3145 cf::sound::set $k => $face;
3146 }
3147 }
3148 } 3280 }
3281
3282 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3149 3283
3150 1 3284 1
3151} 3285}
3286
3287cf::global->attach (on_resource_update => sub {
3288 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3289 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3290
3291 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3292 my $sound = $soundconf->{compat}[$_]
3293 or next;
3294
3295 my $face = cf::face::find "sound/$sound->[1]";
3296 cf::sound::set $sound->[0] => $face;
3297 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3298 }
3299
3300 while (my ($k, $v) = each %{$soundconf->{event}}) {
3301 my $face = cf::face::find "sound/$v";
3302 cf::sound::set $k => $face;
3303 }
3304 }
3305});
3152 3306
3153register_exticmd fx_want => sub { 3307register_exticmd fx_want => sub {
3154 my ($ns, $want) = @_; 3308 my ($ns, $want) = @_;
3155 3309
3156 while (my ($k, $v) = each %$want) { 3310 while (my ($k, $v) = each %$want) {
3157 $ns->fx_want ($k, $v); 3311 $ns->fx_want ($k, $v);
3158 } 3312 }
3159}; 3313};
3314
3315sub load_resource_file($) {
3316 my $guard = lock_acquire "load_resource_file";
3317
3318 my $status = load_resource_file_ $_[0];
3319 get_slot 0.1, 100;
3320 cf::arch::commit_load;
3321
3322 $status
3323}
3160 3324
3161sub reload_regions { 3325sub reload_regions {
3162 # HACK to clear player env face cache, we need some signal framework 3326 # HACK to clear player env face cache, we need some signal framework
3163 # for this (global event?) 3327 # for this (global event?)
3164 %ext::player_env::MUSIC_FACE_CACHE = (); 3328 %ext::player_env::MUSIC_FACE_CACHE = ();
3178} 3342}
3179 3343
3180sub reload_archetypes { 3344sub reload_archetypes {
3181 load_resource_file "$DATADIR/archetypes" 3345 load_resource_file "$DATADIR/archetypes"
3182 or die "unable to load archetypes\n"; 3346 or die "unable to load archetypes\n";
3183 #d# NEED to laod twice to resolve forward references
3184 # this really needs to be done in an extra post-pass
3185 # (which needs to be synchronous, so solve it differently)
3186 load_resource_file "$DATADIR/archetypes"
3187 or die "unable to load archetypes\n";
3188} 3347}
3189 3348
3190sub reload_treasures { 3349sub reload_treasures {
3191 load_resource_file "$DATADIR/treasures" 3350 load_resource_file "$DATADIR/treasures"
3192 or die "unable to load treasurelists\n"; 3351 or die "unable to load treasurelists\n";
3193} 3352}
3194 3353
3195sub reload_resources { 3354sub reload_resources {
3196 warn "reloading resource files...\n"; 3355 warn "reloading resource files...\n";
3197 3356
3357 reload_facedata;
3358 reload_archetypes;
3198 reload_regions; 3359 reload_regions;
3199 reload_facedata;
3200 #reload_archetypes;#d#
3201 reload_archetypes;
3202 reload_treasures; 3360 reload_treasures;
3203 3361
3204 warn "finished reloading resource files\n"; 3362 warn "finished reloading resource files\n";
3205}
3206
3207sub init {
3208 reload_resources;
3209} 3363}
3210 3364
3211sub reload_config { 3365sub reload_config {
3212 open my $fh, "<:utf8", "$CONFDIR/config" 3366 open my $fh, "<:utf8", "$CONFDIR/config"
3213 or return; 3367 or return;
3214 3368
3215 local $/; 3369 local $/;
3216 *CFG = YAML::Syck::Load <$fh>; 3370 *CFG = YAML::Load <$fh>;
3217 3371
3218 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3372 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3219 3373
3220 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3374 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3221 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3375 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3227 }; 3381 };
3228 warn $@ if $@; 3382 warn $@ if $@;
3229 } 3383 }
3230} 3384}
3231 3385
3386sub pidfile() {
3387 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3388 or die "$PIDFILE: $!";
3389 flock $fh, &Fcntl::LOCK_EX
3390 or die "$PIDFILE: flock: $!";
3391 $fh
3392}
3393
3394# make sure only one server instance is running at any one time
3395sub atomic {
3396 my $fh = pidfile;
3397
3398 my $pid = <$fh>;
3399 kill 9, $pid if $pid > 0;
3400
3401 seek $fh, 0, 0;
3402 print $fh $$;
3403}
3404
3232sub main { 3405sub main {
3406 cf::init_globals; # initialise logging
3407
3408 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3409 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3410 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3411 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3412
3413 cf::init_experience;
3414 cf::init_anim;
3415 cf::init_attackmess;
3416 cf::init_dynamic;
3417 cf::init_block;
3418
3419 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3420
3233 # we must not ever block the main coroutine 3421 # we must not ever block the main coroutine
3234 local $Coro::idle = sub { 3422 local $Coro::idle = sub {
3235 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3423 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3236 (async { 3424 (async {
3237 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3425 $Coro::current->{desc} = "IDLE BUG HANDLER";
3238 Event::one_event; 3426 EV::loop EV::LOOP_ONESHOT;
3239 })->prio (Coro::PRIO_MAX); 3427 })->prio (Coro::PRIO_MAX);
3240 }; 3428 };
3241 3429
3430 evthread_start IO::AIO::poll_fileno;
3431
3432 cf::sync_job {
3433 reload_resources;
3242 reload_config; 3434 reload_config;
3243 db_init; 3435 db_init;
3436
3437 cf::load_settings;
3438 cf::load_materials;
3439 cf::init_uuid;
3440 cf::init_signals;
3441 cf::init_commands;
3442 cf::init_skills;
3443
3444 cf::init_beforeplay;
3445
3446 atomic;
3447
3244 load_extensions; 3448 load_extensions;
3245 3449
3246 $TICK_WATCHER->start; 3450 utime time, time, $RUNTIMEFILE;
3451
3452 # no (long-running) fork's whatsoever before this point(!)
3453 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3454
3455 (pop @POST_INIT)->(0) while @POST_INIT;
3456 };
3457
3247 Event::loop; 3458 EV::loop;
3248} 3459}
3249 3460
3250############################################################################# 3461#############################################################################
3251# initialisation and cleanup 3462# initialisation and cleanup
3252 3463
3253# install some emergency cleanup handlers 3464# install some emergency cleanup handlers
3254BEGIN { 3465BEGIN {
3466 our %SIGWATCHER = ();
3255 for my $signal (qw(INT HUP TERM)) { 3467 for my $signal (qw(INT HUP TERM)) {
3256 Event->signal ( 3468 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3257 reentrant => 0,
3258 data => WF_AUTOCANCEL,
3259 signal => $signal,
3260 prio => 0,
3261 cb => sub {
3262 cf::cleanup "SIG$signal"; 3469 cf::cleanup "SIG$signal";
3263 },
3264 ); 3470 };
3265 } 3471 }
3266} 3472}
3267 3473
3268sub write_runtime { 3474sub write_runtime_sync {
3269 my $runtime = "$LOCALDIR/runtime";
3270
3271 # first touch the runtime file to show we are still running: 3475 # first touch the runtime file to show we are still running:
3272 # the fsync below can take a very very long time. 3476 # the fsync below can take a very very long time.
3273 3477
3274 IO::AIO::aio_utime $runtime, undef, undef; 3478 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3275 3479
3276 my $guard = cf::lock_acquire "write_runtime"; 3480 my $guard = cf::lock_acquire "write_runtime";
3277 3481
3278 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3482 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3279 or return; 3483 or return;
3280 3484
3281 my $value = $cf::RUNTIME + 90 + 10; 3485 my $value = $cf::RUNTIME + 90 + 10;
3282 # 10 is the runtime save interval, for a monotonic clock 3486 # 10 is the runtime save interval, for a monotonic clock
3283 # 60 allows for the watchdog to kill the server. 3487 # 60 allows for the watchdog to kill the server.
3293 aio_utime $fh, undef, undef; 3497 aio_utime $fh, undef, undef;
3294 3498
3295 close $fh 3499 close $fh
3296 or return; 3500 or return;
3297 3501
3298 aio_rename "$runtime~", $runtime 3502 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3299 and return; 3503 and return;
3300 3504
3301 warn "runtime file written.\n"; 3505 warn "runtime file written.\n";
3302 3506
3303 1 3507 1
3508}
3509
3510our $uuid_lock;
3511our $uuid_skip;
3512
3513sub write_uuid_sync($) {
3514 $uuid_skip ||= $_[0];
3515
3516 return if $uuid_lock;
3517 local $uuid_lock = 1;
3518
3519 my $uuid = "$LOCALDIR/uuid";
3520
3521 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3522 or return;
3523
3524 my $value = uuid_seq uuid_cur;
3525
3526 unless ($value) {
3527 warn "cowardly refusing to write zero uuid value!\n";
3528 return;
3529 }
3530
3531 my $value = uuid_str $value + $uuid_skip;
3532 $uuid_skip = 0;
3533
3534 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3535 and return;
3536
3537 # always fsync - this file is important
3538 aio_fsync $fh
3539 and return;
3540
3541 close $fh
3542 or return;
3543
3544 aio_rename "$uuid~", $uuid
3545 and return;
3546
3547 warn "uuid file written ($value).\n";
3548
3549 1
3550
3551}
3552
3553sub write_uuid($$) {
3554 my ($skip, $sync) = @_;
3555
3556 $sync ? write_uuid_sync $skip
3557 : async { write_uuid_sync $skip };
3304} 3558}
3305 3559
3306sub emergency_save() { 3560sub emergency_save() {
3307 my $freeze_guard = cf::freeze_mainloop; 3561 my $freeze_guard = cf::freeze_mainloop;
3308 3562
3330 warn "end emergency map save\n"; 3584 warn "end emergency map save\n";
3331 3585
3332 warn "begin emergency database checkpoint\n"; 3586 warn "begin emergency database checkpoint\n";
3333 BDB::db_env_txn_checkpoint $DB_ENV; 3587 BDB::db_env_txn_checkpoint $DB_ENV;
3334 warn "end emergency database checkpoint\n"; 3588 warn "end emergency database checkpoint\n";
3589
3590 warn "begin write uuid\n";
3591 write_uuid_sync 1;
3592 warn "end write uuid\n";
3335 }; 3593 };
3336 3594
3337 warn "leave emergency perl save\n"; 3595 warn "leave emergency perl save\n";
3338} 3596}
3339 3597
3340sub post_cleanup { 3598sub post_cleanup {
3341 my ($make_core) = @_; 3599 my ($make_core) = @_;
3342 3600
3343 warn Carp::longmess "post_cleanup backtrace" 3601 warn Carp::longmess "post_cleanup backtrace"
3344 if $make_core; 3602 if $make_core;
3603
3604 my $fh = pidfile;
3605 unlink $PIDFILE if <$fh> == $$;
3606}
3607
3608# a safer delete_package, copied from Symbol
3609sub clear_package($) {
3610 my $pkg = shift;
3611
3612 # expand to full symbol table name if needed
3613 unless ($pkg =~ /^main::.*::$/) {
3614 $pkg = "main$pkg" if $pkg =~ /^::/;
3615 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3616 $pkg .= '::' unless $pkg =~ /::$/;
3617 }
3618
3619 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3620 my $stem_symtab = *{$stem}{HASH};
3621
3622 defined $stem_symtab and exists $stem_symtab->{$leaf}
3623 or return;
3624
3625 # clear all symbols
3626 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3627 for my $name (keys %$leaf_symtab) {
3628 _gv_clear *{"$pkg$name"};
3629# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3630 }
3631 warn "cleared package $pkg\n";#d#
3345} 3632}
3346 3633
3347sub do_reload_perl() { 3634sub do_reload_perl() {
3348 # can/must only be called in main 3635 # can/must only be called in main
3349 if ($Coro::current != $Coro::main) { 3636 if ($Coro::current != $Coro::main) {
3350 warn "can only reload from main coroutine"; 3637 warn "can only reload from main coroutine";
3351 return; 3638 return;
3352 } 3639 }
3353 3640
3641 return if $RELOAD++;
3642
3643 while ($RELOAD) {
3354 warn "reloading..."; 3644 warn "reloading...";
3355 3645
3356 warn "entering sync_job"; 3646 warn "entering sync_job";
3357 3647
3358 cf::sync_job { 3648 cf::sync_job {
3359 cf::write_runtime; # external watchdog should not bark 3649 cf::write_runtime_sync; # external watchdog should not bark
3360 cf::emergency_save; 3650 cf::emergency_save;
3361 cf::write_runtime; # external watchdog should not bark 3651 cf::write_runtime_sync; # external watchdog should not bark
3362 3652
3363 warn "syncing database to disk"; 3653 warn "syncing database to disk";
3364 BDB::db_env_txn_checkpoint $DB_ENV; 3654 BDB::db_env_txn_checkpoint $DB_ENV;
3365 3655
3366 # if anything goes wrong in here, we should simply crash as we already saved 3656 # if anything goes wrong in here, we should simply crash as we already saved
3367 3657
3368 warn "cancelling all WF_AUTOCANCEL watchers";
3369 for (Event::all_watchers) {
3370 $_->cancel if $_->data & WF_AUTOCANCEL;
3371 }
3372
3373 warn "flushing outstanding aio requests"; 3658 warn "flushing outstanding aio requests";
3374 for (;;) {
3375 BDB::flush;
3376 IO::AIO::flush;
3377 Coro::cede_notself;
3378 last unless IO::AIO::nreqs || BDB::nreqs; 3659 while (IO::AIO::nreqs || BDB::nreqs) {
3379 warn "iterate..."; 3660 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3380 }
3381
3382 ++$RELOAD;
3383
3384 warn "cancelling all extension coros";
3385 $_->cancel for values %EXT_CORO;
3386 %EXT_CORO = ();
3387
3388 warn "removing commands";
3389 %COMMAND = ();
3390
3391 warn "removing ext/exti commands";
3392 %EXTCMD = ();
3393 %EXTICMD = ();
3394
3395 warn "unloading/nuking all extensions";
3396 for my $pkg (@EXTS) {
3397 warn "... unloading $pkg";
3398
3399 if (my $cb = $pkg->can ("unload")) {
3400 eval {
3401 $cb->($pkg);
3402 1
3403 } or warn "$pkg unloaded, but with errors: $@";
3404 } 3661 }
3405 3662
3406 warn "... nuking $pkg"; 3663 warn "cancelling all extension coros";
3407 Symbol::delete_package $pkg; 3664 $_->cancel for values %EXT_CORO;
3408 } 3665 %EXT_CORO = ();
3409 3666
3410 warn "unloading all perl modules loaded from $LIBDIR"; 3667 warn "removing commands";
3411 while (my ($k, $v) = each %INC) { 3668 %COMMAND = ();
3412 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3413 3669
3670 warn "removing ext/exti commands";
3671 %EXTCMD = ();
3672 %EXTICMD = ();
3673
3674 warn "unloading/nuking all extensions";
3675 for my $pkg (@EXTS) {
3414 warn "... unloading $k"; 3676 warn "... unloading $pkg";
3415 delete $INC{$k};
3416 3677
3417 $k =~ s/\.pm$//;
3418 $k =~ s/\//::/g;
3419
3420 if (my $cb = $k->can ("unload_module")) { 3678 if (my $cb = $pkg->can ("unload")) {
3679 eval {
3421 $cb->(); 3680 $cb->($pkg);
3681 1
3682 } or warn "$pkg unloaded, but with errors: $@";
3683 }
3684
3685 warn "... clearing $pkg";
3686 clear_package $pkg;
3422 } 3687 }
3423 3688
3424 Symbol::delete_package $k; 3689 warn "unloading all perl modules loaded from $LIBDIR";
3690 while (my ($k, $v) = each %INC) {
3691 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3692
3693 warn "... unloading $k";
3694 delete $INC{$k};
3695
3696 $k =~ s/\.pm$//;
3697 $k =~ s/\//::/g;
3698
3699 if (my $cb = $k->can ("unload_module")) {
3700 $cb->();
3701 }
3702
3703 clear_package $k;
3425 } 3704 }
3426 3705
3427 warn "getting rid of safe::, as good as possible"; 3706 warn "getting rid of safe::, as good as possible";
3428 Symbol::delete_package "safe::$_" 3707 clear_package "safe::$_"
3429 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3708 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3430 3709
3431 warn "unloading cf.pm \"a bit\""; 3710 warn "unloading cf.pm \"a bit\"";
3432 delete $INC{"cf.pm"}; 3711 delete $INC{"cf.pm"};
3433 delete $INC{"cf/pod.pm"}; 3712 delete $INC{"cf/pod.pm"};
3434 3713
3435 # don't, removes xs symbols, too, 3714 # don't, removes xs symbols, too,
3436 # and global variables created in xs 3715 # and global variables created in xs
3437 #Symbol::delete_package __PACKAGE__; 3716 #clear_package __PACKAGE__;
3438 3717
3439 warn "unload completed, starting to reload now"; 3718 warn "unload completed, starting to reload now";
3440 3719
3441 warn "reloading cf.pm"; 3720 warn "reloading cf.pm";
3442 require cf; 3721 require cf;
3443 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3722 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3444 3723
3445 warn "loading config and database again"; 3724 warn "loading config and database again";
3446 cf::reload_config; 3725 cf::reload_config;
3447 3726
3448 warn "loading extensions"; 3727 warn "loading extensions";
3449 cf::load_extensions; 3728 cf::load_extensions;
3450 3729
3451 warn "reattaching attachments to objects/players"; 3730 warn "reattaching attachments to objects/players";
3452 _global_reattach; # objects, sockets 3731 _global_reattach; # objects, sockets
3453 warn "reattaching attachments to maps"; 3732 warn "reattaching attachments to maps";
3454 reattach $_ for values %MAP; 3733 reattach $_ for values %MAP;
3455 warn "reattaching attachments to players"; 3734 warn "reattaching attachments to players";
3456 reattach $_ for values %PLAYER; 3735 reattach $_ for values %PLAYER;
3457 3736
3737 warn "running post_load";
3738 (pop @POST_INIT)->(1) while @POST_INIT;
3739
3458 warn "leaving sync_job"; 3740 warn "leaving sync_job";
3459 3741
3460 1 3742 1
3461 } or do { 3743 } or do {
3462 warn $@; 3744 warn $@;
3463 warn "error while reloading, exiting."; 3745 cf::cleanup "error while reloading, exiting.";
3464 exit 1;
3465 }; 3746 };
3466 3747
3467 warn "reloaded"; 3748 warn "reloaded";
3749 --$RELOAD;
3750 }
3468}; 3751};
3469 3752
3470our $RELOAD_WATCHER; # used only during reload 3753our $RELOAD_WATCHER; # used only during reload
3471 3754
3472sub reload_perl() { 3755sub reload_perl() {
3473 # doing reload synchronously and two reloads happen back-to-back, 3756 # doing reload synchronously and two reloads happen back-to-back,
3474 # coro crashes during coro_state_free->destroy here. 3757 # coro crashes during coro_state_free->destroy here.
3475 3758
3476 $RELOAD_WATCHER ||= Event->timer ( 3759 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub {
3477 reentrant => 0,
3478 after => 0,
3479 data => WF_AUTOCANCEL,
3480 cb => sub {
3481 do_reload_perl; 3760 do_reload_perl;
3482 undef $RELOAD_WATCHER; 3761 undef $RELOAD_WATCHER;
3483 },
3484 ); 3762 };
3485} 3763}
3486 3764
3487register_command "reload" => sub { 3765register_command "reload" => sub {
3488 my ($who, $arg) = @_; 3766 my ($who, $arg) = @_;
3489 3767
3502 3780
3503our @WAIT_FOR_TICK; 3781our @WAIT_FOR_TICK;
3504our @WAIT_FOR_TICK_BEGIN; 3782our @WAIT_FOR_TICK_BEGIN;
3505 3783
3506sub wait_for_tick { 3784sub wait_for_tick {
3507 return unless $TICK_WATCHER->is_active;
3508 return if $Coro::current == $Coro::main; 3785 return if tick_inhibit || $Coro::current == $Coro::main;
3509 3786
3510 my $signal = new Coro::Signal; 3787 my $signal = new Coro::Signal;
3511 push @WAIT_FOR_TICK, $signal; 3788 push @WAIT_FOR_TICK, $signal;
3512 $signal->wait; 3789 $signal->wait;
3513} 3790}
3514 3791
3515sub wait_for_tick_begin { 3792sub wait_for_tick_begin {
3516 return unless $TICK_WATCHER->is_active;
3517 return if $Coro::current == $Coro::main; 3793 return if tick_inhibit || $Coro::current == $Coro::main;
3518 3794
3519 my $signal = new Coro::Signal; 3795 my $signal = new Coro::Signal;
3520 push @WAIT_FOR_TICK_BEGIN, $signal; 3796 push @WAIT_FOR_TICK_BEGIN, $signal;
3521 $signal->wait; 3797 $signal->wait;
3522} 3798}
3523 3799
3524$TICK_WATCHER = Event->timer ( 3800sub tick {
3525 reentrant => 0,
3526 parked => 1,
3527 prio => 0,
3528 at => $NEXT_TICK || $TICK,
3529 data => WF_AUTOCANCEL,
3530 cb => sub {
3531 if ($Coro::current != $Coro::main) { 3801 if ($Coro::current != $Coro::main) {
3532 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3802 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3533 unless ++$bug_warning > 10; 3803 unless ++$bug_warning > 10;
3534 return; 3804 return;
3535 } 3805 }
3536 3806
3537 $NOW = $tick_start = Event::time;
3538
3539 cf::server_tick; # one server iteration 3807 cf::server_tick; # one server iteration
3540 3808
3541 $RUNTIME += $TICK;
3542 $NEXT_TICK += $TICK;
3543
3544 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3809 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3545 $NEXT_RUNTIME_WRITE = $NOW + 10; 3810 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3546 Coro::async_pool { 3811 Coro::async_pool {
3547 $Coro::current->{desc} = "runtime saver"; 3812 $Coro::current->{desc} = "runtime saver";
3548 write_runtime 3813 write_runtime_sync
3549 or warn "ERROR: unable to write runtime file: $!"; 3814 or warn "ERROR: unable to write runtime file: $!";
3550 };
3551 } 3815 };
3816 }
3552 3817
3553 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3818 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3554 $sig->send; 3819 $sig->send;
3555 } 3820 }
3556 while (my $sig = shift @WAIT_FOR_TICK) { 3821 while (my $sig = shift @WAIT_FOR_TICK) {
3557 $sig->send; 3822 $sig->send;
3558 } 3823 }
3559 3824
3560 $NOW = Event::time; 3825 $LOAD = ($NOW - $TICK_START) / $TICK;
3561
3562 # if we are delayed by four ticks or more, skip them all
3563 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3564
3565 $TICK_WATCHER->at ($NEXT_TICK);
3566 $TICK_WATCHER->start;
3567
3568 $LOAD = ($NOW - $tick_start) / $TICK;
3569 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3826 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3570 3827
3571 _post_tick; 3828 if (0) {
3829 if ($NEXT_TICK) {
3830 my $jitter = $TICK_START - $NEXT_TICK;
3831 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3832 warn "jitter $JITTER\n";#d#
3833 }
3572 }, 3834 }
3573); 3835}
3574 3836
3575{ 3837{
3838 # configure BDB
3839
3576 BDB::min_parallel 8; 3840 BDB::min_parallel 8;
3577 BDB::max_poll_time $TICK * 0.1; 3841 BDB::max_poll_reqs $TICK * 0.1;
3578 $BDB_POLL_WATCHER = Event->io ( 3842 $AnyEvent::BDB::WATCHER->priority (1);
3579 reentrant => 0,
3580 fd => BDB::poll_fileno,
3581 poll => 'r',
3582 prio => 0,
3583 data => WF_AUTOCANCEL,
3584 cb => \&BDB::poll_cb,
3585 );
3586
3587 BDB::set_sync_prepare {
3588 my $status;
3589 my $current = $Coro::current;
3590 (
3591 sub {
3592 $status = $!;
3593 $current->ready; undef $current;
3594 },
3595 sub {
3596 Coro::schedule while defined $current;
3597 $! = $status;
3598 },
3599 )
3600 };
3601 3843
3602 unless ($DB_ENV) { 3844 unless ($DB_ENV) {
3603 $DB_ENV = BDB::db_env_create; 3845 $DB_ENV = BDB::db_env_create;
3604 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3846 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3605 | BDB::LOG_AUTOREMOVE, 1); 3847 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3848 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3606 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3849 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3607 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3850 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3608 3851
3609 cf::sync_job { 3852 cf::sync_job {
3610 eval { 3853 eval {
3620 3863
3621 cf::cleanup "db_env_open(db): $@" if $@; 3864 cf::cleanup "db_env_open(db): $@" if $@;
3622 }; 3865 };
3623 } 3866 }
3624 3867
3625 $BDB_DEADLOCK_WATCHER = Event->timer ( 3868 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3626 after => 3,
3627 interval => 1,
3628 hard => 1,
3629 prio => 0,
3630 data => WF_AUTOCANCEL,
3631 cb => sub {
3632 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3869 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3633 },
3634 ); 3870 };
3635 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3871 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3636 after => 11,
3637 interval => 60,
3638 hard => 1,
3639 prio => 0,
3640 data => WF_AUTOCANCEL,
3641 cb => sub {
3642 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3872 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3643 },
3644 ); 3873 };
3645 $BDB_TRICKLE_WATCHER = Event->timer ( 3874 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3646 after => 5,
3647 interval => 10,
3648 hard => 1,
3649 prio => 0,
3650 data => WF_AUTOCANCEL,
3651 cb => sub {
3652 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3875 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3653 },
3654 ); 3876 };
3655} 3877}
3656 3878
3657{ 3879{
3880 # configure IO::AIO
3881
3658 IO::AIO::min_parallel 8; 3882 IO::AIO::min_parallel 8;
3659
3660 undef $Coro::AIO::WATCHER;
3661 IO::AIO::max_poll_time $TICK * 0.1; 3883 IO::AIO::max_poll_time $TICK * 0.1;
3662 $AIO_POLL_WATCHER = Event->io ( 3884 undef $AnyEvent::AIO::WATCHER;
3663 reentrant => 0,
3664 data => WF_AUTOCANCEL,
3665 fd => IO::AIO::poll_fileno,
3666 poll => 'r',
3667 prio => 0,
3668 cb => \&IO::AIO::poll_cb,
3669 );
3670} 3885}
3671 3886
3672my $_log_backtrace; 3887my $_log_backtrace;
3673 3888
3674sub _log_backtrace { 3889sub _log_backtrace {
3677 $msg =~ s/\n//; 3892 $msg =~ s/\n//;
3678 3893
3679 # limit the # of concurrent backtraces 3894 # limit the # of concurrent backtraces
3680 if ($_log_backtrace < 2) { 3895 if ($_log_backtrace < 2) {
3681 ++$_log_backtrace; 3896 ++$_log_backtrace;
3897 my $perl_bt = Carp::longmess $msg;
3682 async { 3898 async {
3683 $Coro::current->{desc} = "abt $msg"; 3899 $Coro::current->{desc} = "abt $msg";
3684 3900
3685 my @bt = fork_call { 3901 my @bt = fork_call {
3686 @addr = map { sprintf "%x", $_ } @addr; 3902 @addr = map { sprintf "%x", $_ } @addr;
3697 } 3913 }
3698 3914
3699 @funcs 3915 @funcs
3700 }; 3916 };
3701 3917
3702 LOG llevInfo, "[ABT] $msg\n"; 3918 LOG llevInfo, "[ABT] $perl_bt\n";
3919 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3703 LOG llevInfo, "[ABT] $_\n" for @bt; 3920 LOG llevInfo, "[ABT] $_\n" for @bt;
3704 --$_log_backtrace; 3921 --$_log_backtrace;
3705 }; 3922 };
3706 } else { 3923 } else {
3707 LOG llevInfo, "[ABT] $msg\n"; 3924 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines