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.387 by root, Mon Oct 15 23:49:10 2007 UTC vs.
Revision 1.454 by root, Thu Sep 25 12:14:32 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::blocking_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 }
1122 1217
1123 unless (aio_stat "$filename.pst") { 1218 unless (aio_stat "$filename.pst") {
1124 (aio_load "$filename.pst", $av) >= 0 1219 (aio_load "$filename.pst", $av) >= 0
1125 or return; 1220 or return;
1126 1221
1127 my $st = eval { Coro::Storable::thaw $av } 1222 my $st = eval { Coro::Storable::thaw $av };
1128 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1129 $av = $st->{objs}; 1223 $av = $st->{objs};
1130 } 1224 }
1131 1225
1132 utf8::decode (my $decname = $filename); 1226 utf8::decode (my $decname = $filename);
1133 warn sprintf "loading %s (%d,%d)\n", 1227 warn sprintf "loading %s (%d,%d)\n",
1264 1358
1265 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1359 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1266 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1360 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1267 1361
1268 $ext{source} = 1362 $ext{source} =
1269 "package $pkg; use strict; use utf8;\n" 1363 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1270 . "#line 1 \"$path\"\n{\n" 1364 . "#line 1 \"$path\"\n{\n"
1271 . $source 1365 . $source
1272 . "\n};\n1"; 1366 . "\n};\n1";
1273 1367
1274 $todo{$base} = \%ext; 1368 $todo{$base} = \%ext;
1290 my $msg = $@ ? "$v->{path}: $@\n" 1384 my $msg = $@ ? "$v->{path}: $@\n"
1291 : "$v->{base}: extension inactive.\n"; 1385 : "$v->{base}: extension inactive.\n";
1292 1386
1293 if (exists $v->{meta}{mandatory}) { 1387 if (exists $v->{meta}{mandatory}) {
1294 warn $msg; 1388 warn $msg;
1295 warn "mandatory extension failed to load, exiting.\n"; 1389 cf::cleanup "mandatory extension failed to load, exiting.";
1296 exit 1;
1297 } 1390 }
1298 1391
1299 warn $msg; 1392 warn $msg;
1300 } 1393 }
1301 1394
1315 1408
1316=back 1409=back
1317 1410
1318=head2 CORE EXTENSIONS 1411=head2 CORE EXTENSIONS
1319 1412
1320Functions and methods that extend core crossfire objects. 1413Functions and methods that extend core deliantra objects.
1321 1414
1322=cut 1415=cut
1323 1416
1324package cf::player; 1417package cf::player;
1325 1418
1368 1461
1369sub exists($) { 1462sub exists($) {
1370 my ($login) = @_; 1463 my ($login) = @_;
1371 1464
1372 $cf::PLAYER{$login} 1465 $cf::PLAYER{$login}
1373 or cf::sync_job { !aio_stat path $login } 1466 or !aio_stat path $login
1374} 1467}
1375 1468
1376sub find($) { 1469sub find($) {
1377 return $cf::PLAYER{$_[0]} || do { 1470 return $cf::PLAYER{$_[0]} || do {
1378 my $login = $_[0]; 1471 my $login = $_[0];
1390 my $f = new_from_file cf::object::thawer path $login 1483 my $f = new_from_file cf::object::thawer path $login
1391 or return; 1484 or return;
1392 1485
1393 my $pl = cf::player::load_pl $f 1486 my $pl = cf::player::load_pl $f
1394 or return; 1487 or return;
1488
1395 local $cf::PLAYER_LOADING{$login} = $pl; 1489 local $cf::PLAYER_LOADING{$login} = $pl;
1396 $f->resolve_delayed_derefs; 1490 $f->resolve_delayed_derefs;
1397 $cf::PLAYER{$login} = $pl 1491 $cf::PLAYER{$login} = $pl
1398 } 1492 }
1399 } 1493 }
1409 1503
1410 return if $pl->{deny_save}; 1504 return if $pl->{deny_save};
1411 1505
1412 aio_mkdir playerdir $pl, 0770; 1506 aio_mkdir playerdir $pl, 0770;
1413 $pl->{last_save} = $cf::RUNTIME; 1507 $pl->{last_save} = $cf::RUNTIME;
1508
1509 cf::get_slot 0.01;
1414 1510
1415 $pl->save_pl ($path); 1511 $pl->save_pl ($path);
1416 cf::cede_to_tick; 1512 cf::cede_to_tick;
1417} 1513}
1418 1514
1450 my ($pl) = @_; 1546 my ($pl) = @_;
1451 1547
1452 my $name = $pl->ob->name; 1548 my $name = $pl->ob->name;
1453 1549
1454 $pl->{deny_save} = 1; 1550 $pl->{deny_save} = 1;
1455 $pl->password ("*"); # this should lock out the player until we nuked the dir 1551 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1456 1552
1457 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1553 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1458 $pl->deactivate; 1554 $pl->deactivate;
1555 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1556 $pl->ob->check_score;
1459 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1557 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1460 $pl->ns->destroy if $pl->ns; 1558 $pl->ns->destroy if $pl->ns;
1461 1559
1462 my $path = playerdir $pl; 1560 my $path = playerdir $pl;
1463 my $temp = "$path~$cf::RUNTIME~deleting~"; 1561 my $temp = "$path~$cf::RUNTIME~deleting~";
1502 1600
1503 for my $login (@$dirs) { 1601 for my $login (@$dirs) {
1504 my $path = path $login; 1602 my $path = path $login;
1505 1603
1506 # a .pst is a dead give-away for a valid player 1604 # a .pst is a dead give-away for a valid player
1507 unless (-e "$path.pst") { 1605 # if no pst file found, open and chekc for blocked users
1606 if (aio_stat "$path.pst") {
1508 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1607 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1509 aio_read $fh, 0, 512, my $buf, 0 or next; 1608 aio_read $fh, 0, 512, my $buf, 0 or next;
1510 $buf !~ /^password -------------$/m or next; # official not-valid tag 1609 $buf !~ /^password -------------$/m or next; # official not-valid tag
1511 } 1610 }
1512 1611
1543 } 1642 }
1544 1643
1545 \@paths 1644 \@paths
1546} 1645}
1547 1646
1548=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1647=item $protocol_xml = $player->expand_cfpod ($cfpod)
1549 1648
1550Expand crossfire pod fragments into protocol xml. 1649Expand deliantra pod fragments into protocol xml.
1551
1552=cut
1553
1554sub expand_cfpod {
1555 ((my $self), (local $_)) = @_;
1556
1557 # escape & and <
1558 s/&/&amp;/g;
1559 s/(?<![BIUGHT])</&lt;/g;
1560
1561 # this is buggy, it needs to properly take care of nested <'s
1562
1563 1 while
1564 # replace B<>, I<>, U<> etc.
1565 s/B<([^\>]*)>/<b>$1<\/b>/
1566 || s/I<([^\>]*)>/<i>$1<\/i>/
1567 || s/U<([^\>]*)>/<u>$1<\/u>/
1568 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1569 # replace G<male|female> tags
1570 || s{G<([^>|]*)\|([^>]*)>}{
1571 $self->gender ? $2 : $1
1572 }ge
1573 # replace H<hint text>
1574 || s{H<([^\>]*)>}
1575 {
1576 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1577 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1578 "")
1579 [$self->{hintmode}]
1580 }ge;
1581
1582 # create single paragraphs (very hackish)
1583 s/(?<=\S)\n(?=\w)/ /g;
1584
1585 # compress some whitespace
1586 s/\s+\n/\n/g; # ws line-ends
1587 s/\n\n+/\n/g; # double lines
1588 s/^\n+//; # beginning lines
1589 s/\n+$//; # ending lines
1590
1591 $_
1592}
1593
1594sub hintmode {
1595 $_[0]{hintmode} = $_[1] if @_ > 1;
1596 $_[0]{hintmode}
1597}
1598 1650
1599=item $player->ext_reply ($msgid, @msg) 1651=item $player->ext_reply ($msgid, @msg)
1600 1652
1601Sends an ext reply to the player. 1653Sends an ext reply to the player.
1602 1654
1669our $MAX_RESET = 3600; 1721our $MAX_RESET = 3600;
1670our $DEFAULT_RESET = 3000; 1722our $DEFAULT_RESET = 3000;
1671 1723
1672sub generate_random_map { 1724sub generate_random_map {
1673 my ($self, $rmp) = @_; 1725 my ($self, $rmp) = @_;
1726
1727 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1728
1674 # mit "rum" bekleckern, nicht 1729 # mit "rum" bekleckern, nicht
1675 $self->_create_random_map ( 1730 $self->_create_random_map (
1676 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1731 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1677 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1732 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1678 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1733 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1800 1855
1801# the temporary/swap location 1856# the temporary/swap location
1802sub save_path { 1857sub save_path {
1803 my ($self) = @_; 1858 my ($self) = @_;
1804 1859
1805 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1860 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1806 "$TMPDIR/$path.map" 1861 "$TMPDIR/$path.map"
1807} 1862}
1808 1863
1809# the unique path, undef == no special unique path 1864# the unique path, undef == no special unique path
1810sub uniq_path { 1865sub uniq_path {
1811 my ($self) = @_; 1866 my ($self) = @_;
1812 1867
1813 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1814 "$UNIQUEDIR/$path" 1869 "$UNIQUEDIR/$path"
1815} 1870}
1816 1871
1817# and all this just because we cannot iterate over 1872# and all this just because we cannot iterate over
1818# all maps in C++... 1873# all maps in C++...
1916 1971
1917 cf::lock_wait "map_data:$path";#d#remove 1972 cf::lock_wait "map_data:$path";#d#remove
1918 cf::lock_wait "map_find:$path"; 1973 cf::lock_wait "map_find:$path";
1919 1974
1920 $cf::MAP{$path} || do { 1975 $cf::MAP{$path} || do {
1921 my $guard1 = cf::lock_acquire "map_find:$path";
1922 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 1976 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1977 my $guard2 = cf::lock_acquire "map_find:$path";
1923 1978
1924 my $map = new_from_path cf::map $path 1979 my $map = new_from_path cf::map $path
1925 or return; 1980 or return;
1926 1981
1927 $map->{last_save} = $cf::RUNTIME; 1982 $map->{last_save} = $cf::RUNTIME;
1930 or return; 1985 or return;
1931 1986
1932 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1987 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1933 # doing this can freeze the server in a sync job, obviously 1988 # doing this can freeze the server in a sync job, obviously
1934 #$cf::WAIT_FOR_TICK->wait; 1989 #$cf::WAIT_FOR_TICK->wait;
1990 undef $guard2;
1935 undef $guard1; 1991 undef $guard1;
1936 undef $guard2;
1937 $map->reset; 1992 $map->reset;
1938 return find $path; 1993 return find $path;
1939 } 1994 }
1940 1995
1941 $cf::MAP{$path} = $map 1996 $cf::MAP{$path} = $map
1968 my $f = new_from_file cf::object::thawer $self->{load_path}; 2023 my $f = new_from_file cf::object::thawer $self->{load_path};
1969 $f->skip_block; 2024 $f->skip_block;
1970 $self->_load_objects ($f) 2025 $self->_load_objects ($f)
1971 or return; 2026 or return;
1972 2027
1973 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2028 $self->post_load_original
1974 if delete $self->{load_original}; 2029 if delete $self->{load_original};
1975 2030
1976 if (my $uniq = $self->uniq_path) { 2031 if (my $uniq = $self->uniq_path) {
1977 utf8::encode $uniq; 2032 utf8::encode $uniq;
1978 unless (aio_stat $uniq) { 2033 unless (aio_stat $uniq) {
2004 } 2059 }
2005 2060
2006 $self->{last_save} = $cf::RUNTIME; 2061 $self->{last_save} = $cf::RUNTIME;
2007 $self->last_access ($cf::RUNTIME); 2062 $self->last_access ($cf::RUNTIME);
2008 2063
2009 $self->in_memory (cf::MAP_IN_MEMORY); 2064 $self->in_memory (cf::MAP_ACTIVE);
2010 } 2065 }
2011 2066
2012 $self->post_load; 2067 $self->post_load;
2013} 2068}
2014 2069
2072 my ($path, $origin, $load) = @_; 2127 my ($path, $origin, $load) = @_;
2073 2128
2074 $path = normalise $path, $origin && $origin->{path}; 2129 $path = normalise $path, $origin && $origin->{path};
2075 2130
2076 if (my $map = $cf::MAP{$path}) { 2131 if (my $map = $cf::MAP{$path}) {
2077 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2132 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2078 } 2133 }
2079 2134
2080 $MAP_PREFETCH{$path} |= $load; 2135 $MAP_PREFETCH{$path} |= $load;
2081 2136
2082 $MAP_PREFETCHER ||= cf::async { 2137 $MAP_PREFETCHER ||= cf::async {
2119 cf::async { 2174 cf::async {
2120 $Coro::current->{desc} = "map player save"; 2175 $Coro::current->{desc} = "map player save";
2121 $_->contr->save for $self->players; 2176 $_->contr->save for $self->players;
2122 }; 2177 };
2123 2178
2179 cf::get_slot 0.02;
2180
2124 if ($uniq) { 2181 if ($uniq) {
2125 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2182 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2126 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2183 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2127 } else { 2184 } else {
2128 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2185 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2136 $self->save; 2193 $self->save;
2137 2194
2138 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2195 my $lock = cf::lock_acquire "map_data:$self->{path}";
2139 2196
2140 return if $self->players; 2197 return if $self->players;
2141 return if $self->in_memory != cf::MAP_IN_MEMORY; 2198 return if $self->in_memory != cf::MAP_ACTIVE;
2142 return if $self->{deny_save}; 2199 return if $self->{deny_save};
2143 2200
2144 $self->in_memory (cf::MAP_SWAPPED); 2201 $self->in_memory (cf::MAP_SWAPPED);
2145 2202
2146 $self->deactivate; 2203 $self->deactivate;
2264 2321
2265sub unique_maps() { 2322sub unique_maps() {
2266 [ 2323 [
2267 map { 2324 map {
2268 utf8::decode $_; 2325 utf8::decode $_;
2269 /\.map$/ 2326 s/\.map$//; # TODO future compatibility hack
2327 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2328 ? ()
2270 ? normalise $_ 2329 : normalise $_
2271 : ()
2272 } @{ aio_readdir $UNIQUEDIR or [] } 2330 } @{ aio_readdir $UNIQUEDIR or [] }
2273 ] 2331 ]
2274} 2332}
2275 2333
2276package cf;
2277
2278=back 2334=back
2279 2335
2280=head3 cf::object 2336=head3 cf::object
2281 2337
2282=cut 2338=cut
2285 2341
2286=over 4 2342=over 4
2287 2343
2288=item $ob->inv_recursive 2344=item $ob->inv_recursive
2289 2345
2290Returns the inventory of the object _and_ their inventories, recursively. 2346Returns the inventory of the object I<and> their inventories, recursively,
2347but I<not> the object itself.
2291 2348
2292=cut 2349=cut
2293 2350
2294sub inv_recursive_; 2351sub inv_recursive_;
2295sub inv_recursive_ { 2352sub inv_recursive_ {
2300 inv_recursive_ inv $_[0] 2357 inv_recursive_ inv $_[0]
2301} 2358}
2302 2359
2303=item $ref = $ob->ref 2360=item $ref = $ob->ref
2304 2361
2305creates and returns a persistent reference to an objetc that can be stored as a string. 2362Creates and returns a persistent reference to an object that can be stored as a string.
2306 2363
2307=item $ob = cf::object::deref ($refstring) 2364=item $ob = cf::object::deref ($refstring)
2308 2365
2309returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2366returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2310even if the object actually exists. May block. 2367even if the object actually exists. May block.
2342can be C<undef>. Does the right thing when the player is currently in a 2399can be C<undef>. Does the right thing when the player is currently in a
2343dialogue with the given NPC character. 2400dialogue with the given NPC character.
2344 2401
2345=cut 2402=cut
2346 2403
2404our $SAY_CHANNEL = {
2405 id => "say",
2406 title => "Map",
2407 reply => "say ",
2408 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2409};
2410
2411our $CHAT_CHANNEL = {
2412 id => "chat",
2413 title => "Chat",
2414 reply => "chat ",
2415 tooltip => "Player chat and shouts, global to the server.",
2416};
2417
2347# rough implementation of a future "reply" method that works 2418# rough implementation of a future "reply" method that works
2348# with dialog boxes. 2419# with dialog boxes.
2349#TODO: the first argument must go, split into a $npc->reply_to ( method 2420#TODO: the first argument must go, split into a $npc->reply_to ( method
2350sub cf::object::player::reply($$$;$) { 2421sub cf::object::player::reply($$$;$) {
2351 my ($self, $npc, $msg, $flags) = @_; 2422 my ($self, $npc, $msg, $flags) = @_;
2362 my $dialog = $pl->{npc_dialog}; 2433 my $dialog = $pl->{npc_dialog};
2363 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2434 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2364 2435
2365 } else { 2436 } else {
2366 $msg = $npc->name . " says: $msg" if $npc; 2437 $msg = $npc->name . " says: $msg" if $npc;
2367 $self->message ($msg, $flags); 2438 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2368 } 2439 }
2369 } 2440 }
2370} 2441}
2371 2442
2372=item $object->send_msg ($channel, $msg, $color, [extra...]) 2443=item $object->send_msg ($channel, $msg, $color, [extra...])
2397 2468
2398=item $player_object->enter_link 2469=item $player_object->enter_link
2399 2470
2400Freezes the player and moves him/her to a special map (C<{link}>). 2471Freezes the player and moves him/her to a special map (C<{link}>).
2401 2472
2402The player should be reasonably safe there for short amounts of time. You 2473The player should be reasonably safe there for short amounts of time (e.g.
2403I<MUST> call C<leave_link> as soon as possible, though. 2474for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2475though, as the palyer cannot control the character while it is on the link
2476map.
2404 2477
2405Will never block. 2478Will never block.
2406 2479
2407=item $player_object->leave_link ($map, $x, $y) 2480=item $player_object->leave_link ($map, $x, $y)
2408 2481
2466 2539
2467 $map->load; 2540 $map->load;
2468 $map->load_neighbours; 2541 $map->load_neighbours;
2469 2542
2470 return unless $self->contr->active; 2543 return unless $self->contr->active;
2544 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2471 $self->activate_recursive; 2545 $self->activate_recursive;
2472 2546
2473 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2547 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2474 $self->enter_map ($map, $x, $y); 2548 $self->enter_map ($map, $x, $y);
2475} 2549}
2479Moves the player to the given map-path and coordinates by first freezing 2553Moves the player to the given map-path and coordinates by first freezing
2480her, loading and preparing them map, calling the provided $check callback 2554her, loading and preparing them map, calling the provided $check callback
2481that has to return the map if sucecssful, and then unfreezes the player on 2555that has to return the map if sucecssful, and then unfreezes the player on
2482the new (success) or old (failed) map position. In either case, $done will 2556the new (success) or old (failed) map position. In either case, $done will
2483be called at the end of this process. 2557be called at the end of this process.
2558
2559Note that $check will be called with a potentially non-loaded map, so if
2560it needs a loaded map it has to call C<< ->load >>.
2484 2561
2485=cut 2562=cut
2486 2563
2487our $GOTOGEN; 2564our $GOTOGEN;
2488 2565
2567} 2644}
2568 2645
2569sub prepare_random_map { 2646sub prepare_random_map {
2570 my ($exit) = @_; 2647 my ($exit) = @_;
2571 2648
2572 my $guard = cf::lock_acquire "exit_prepare:$exit";
2573
2574 # all this does is basically replace the /! path by 2649 # all this does is basically replace the /! path by
2575 # a new random map path (?random/...) with a seed 2650 # a new random map path (?random/...) with a seed
2576 # that depends on the exit object 2651 # that depends on the exit object
2577 2652
2578 my $rmp = parse_random_map_params $exit->msg; 2653 my $rmp = parse_random_map_params $exit->msg;
2580 if ($exit->map) { 2655 if ($exit->map) {
2581 $rmp->{region} = $exit->region->name; 2656 $rmp->{region} = $exit->region->name;
2582 $rmp->{origin_map} = $exit->map->path; 2657 $rmp->{origin_map} = $exit->map->path;
2583 $rmp->{origin_x} = $exit->x; 2658 $rmp->{origin_x} = $exit->x;
2584 $rmp->{origin_y} = $exit->y; 2659 $rmp->{origin_y} = $exit->y;
2660
2661 $exit->map->touch;
2585 } 2662 }
2586 2663
2587 $rmp->{random_seed} ||= $exit->random_seed; 2664 $rmp->{random_seed} ||= $exit->random_seed;
2588 2665
2589 my $data = cf::to_json $rmp; 2666 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2590 my $md5 = Digest::MD5::md5_hex $data; 2667 my $md5 = Digest::MD5::md5_hex $data;
2591 my $meta = "$RANDOMDIR/$md5.meta"; 2668 my $meta = "$RANDOMDIR/$md5.meta";
2592 2669
2593 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2670 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2594 aio_write $fh, 0, (length $data), $data, 0; 2671 aio_write $fh, 0, (length $data), $data, 0;
2595 undef $fh; 2672 undef $fh;
2596 aio_rename "$meta~", $meta; 2673 aio_rename "$meta~", $meta;
2597 2674
2675 my $slaying = "?random/$md5";
2676
2677 if ($exit->valid) {
2598 $exit->slaying ("?random/$md5"); 2678 $exit->slaying ("?random/$md5");
2599 $exit->msg (undef); 2679 $exit->msg (undef);
2680 }
2600 } 2681 }
2601} 2682}
2602 2683
2603sub cf::object::player::enter_exit { 2684sub cf::object::player::enter_exit {
2604 my ($self, $exit) = @_; 2685 my ($self, $exit) = @_;
2605 2686
2606 return unless $self->type == cf::PLAYER; 2687 return unless $self->type == cf::PLAYER;
2607 2688
2608 if ($exit->slaying eq "/!") {
2609 #TODO: this should de-fi-ni-te-ly not be a sync-job
2610 # the problem is that $exit might not survive long enough
2611 # so it needs to be done right now, right here
2612 cf::sync_job { prepare_random_map $exit };
2613 }
2614
2615 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2616 my $hp = $exit->stats->hp;
2617 my $sp = $exit->stats->sp;
2618
2619 $self->enter_link; 2689 $self->enter_link;
2620 2690
2621 # if exit is damned, update players death & WoR home-position
2622 $self->contr->savebed ($slaying, $hp, $sp)
2623 if $exit->flag (FLAG_DAMNED);
2624
2625 (async { 2691 (async {
2626 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2692 $Coro::current->{desc} = "enter_exit";
2627 2693
2628 $self->deactivate_recursive; # just to be sure
2629 unless (eval { 2694 unless (eval {
2695 $self->deactivate_recursive; # just to be sure
2696
2697 # random map handling
2698 {
2699 my $guard = cf::lock_acquire "exit_prepare:$exit";
2700
2701 prepare_random_map $exit
2702 if $exit->slaying eq "/!";
2703 }
2704
2705 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2706 my $x = $exit->stats->hp;
2707 my $y = $exit->stats->sp;
2708
2630 $self->goto ($slaying, $hp, $sp); 2709 $self->goto ($map, $x, $y);
2631 2710
2711 # if exit is damned, update players death & WoR home-position
2712 $self->contr->savebed ($map, $x, $y)
2713 if $exit->flag (cf::FLAG_DAMNED);
2714
2632 1; 2715 1
2633 }) { 2716 }) {
2634 $self->message ("Something went wrong deep within the crossfire server. " 2717 $self->message ("Something went wrong deep within the deliantra server. "
2635 . "I'll try to bring you back to the map you were before. " 2718 . "I'll try to bring you back to the map you were before. "
2636 . "Please report this to the dungeon master!", 2719 . "Please report this to the dungeon master!",
2637 cf::NDI_UNIQUE | cf::NDI_RED); 2720 cf::NDI_UNIQUE | cf::NDI_RED);
2638 2721
2639 warn "ERROR in enter_exit: $@"; 2722 warn "ERROR in enter_exit: $@";
2667the message, with C<log> being the default. If C<$color> is negative, suppress 2750the message, with C<log> being the default. If C<$color> is negative, suppress
2668the message unless the client supports the msg packet. 2751the message unless the client supports the msg packet.
2669 2752
2670=cut 2753=cut
2671 2754
2755# non-persistent channels (usually the info channel)
2672our %CHANNEL = ( 2756our %CHANNEL = (
2673 "c/identify" => { 2757 "c/identify" => {
2674 id => "infobox", 2758 id => "infobox",
2675 title => "Identify", 2759 title => "Identify",
2676 reply => undef, 2760 reply => undef,
2680 id => "infobox", 2764 id => "infobox",
2681 title => "Examine", 2765 title => "Examine",
2682 reply => undef, 2766 reply => undef,
2683 tooltip => "Signs and other items you examined", 2767 tooltip => "Signs and other items you examined",
2684 }, 2768 },
2769 "c/book" => {
2770 id => "infobox",
2771 title => "Book",
2772 reply => undef,
2773 tooltip => "The contents of a note or book",
2774 },
2685 "c/lookat" => { 2775 "c/lookat" => {
2686 id => "infobox", 2776 id => "infobox",
2687 title => "Look", 2777 title => "Look",
2688 reply => undef, 2778 reply => undef,
2689 tooltip => "What you saw there", 2779 tooltip => "What you saw there",
2690 }, 2780 },
2781 "c/who" => {
2782 id => "infobox",
2783 title => "Players",
2784 reply => undef,
2785 tooltip => "Shows players who are currently online",
2786 },
2787 "c/body" => {
2788 id => "infobox",
2789 title => "Body Parts",
2790 reply => undef,
2791 tooltip => "Shows which body parts you posess and are available",
2792 },
2793 "c/skills" => {
2794 id => "infobox",
2795 title => "Skills",
2796 reply => undef,
2797 tooltip => "Shows your experience per skill and item power",
2798 },
2799 "c/uptime" => {
2800 id => "infobox",
2801 title => "Uptime",
2802 reply => undef,
2803 tooltip => "How long the server has been running since last restart",
2804 },
2805 "c/mapinfo" => {
2806 id => "infobox",
2807 title => "Map Info",
2808 reply => undef,
2809 tooltip => "Information related to the maps",
2810 },
2811 "c/party" => {
2812 id => "party",
2813 title => "Party",
2814 reply => "gsay ",
2815 tooltip => "Messages and chat related to your party",
2816 },
2691); 2817);
2692 2818
2693sub cf::client::send_msg { 2819sub cf::client::send_msg {
2694 my ($self, $channel, $msg, $color, @extra) = @_; 2820 my ($self, $channel, $msg, $color, @extra) = @_;
2695 2821
2696 $msg = $self->pl->expand_cfpod ($msg); 2822 $msg = $self->pl->expand_cfpod ($msg)
2823 unless $color & cf::NDI_VERBATIM;
2697 2824
2698 $color &= cf::NDI_CLIENT_MASK; # just in case... 2825 $color &= cf::NDI_CLIENT_MASK; # just in case...
2699 2826
2700 # check predefined channels, for the benefit of C 2827 # check predefined channels, for the benefit of C
2701 if ($CHANNEL{$channel}) { 2828 if ($CHANNEL{$channel}) {
2722 if ($self->can_msg) { 2849 if ($self->can_msg) {
2723 # default colour, mask it out 2850 # default colour, mask it out
2724 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2851 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2725 if $color & cf::NDI_DEF; 2852 if $color & cf::NDI_DEF;
2726 2853
2727 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2854 my $pkt = "msg "
2855 . $self->{json_coder}->encode (
2728 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2856 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2857 );
2858
2859 # try lzf for large packets
2860 $pkt = "lzf " . Compress::LZF::compress $pkt
2861 if 1024 <= length $pkt and $self->{can_lzf};
2862
2863 # split very large packets
2864 if (8192 < length $pkt and $self->{can_lzf}) {
2865 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2866 $pkt = "frag";
2867 }
2868
2869 $self->send_packet ($pkt);
2729 } else { 2870 } else {
2730 if ($color >= 0) { 2871 if ($color >= 0) {
2731 # replace some tags by gcfclient-compatible ones 2872 # replace some tags by gcfclient-compatible ones
2732 for ($msg) { 2873 for ($msg) {
2733 1 while 2874 1 while
2932 3073
2933The following functions and methods are available within a safe environment: 3074The following functions and methods are available within a safe environment:
2934 3075
2935 cf::object 3076 cf::object
2936 contr pay_amount pay_player map x y force_find force_add destroy 3077 contr pay_amount pay_player map x y force_find force_add destroy
2937 insert remove name archname title slaying race decrease_ob_nr 3078 insert remove name archname title slaying race decrease split
2938 3079
2939 cf::object::player 3080 cf::object::player
2940 player 3081 player
2941 3082
2942 cf::player 3083 cf::player
2947 3088
2948=cut 3089=cut
2949 3090
2950for ( 3091for (
2951 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3092 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2952 insert remove inv name archname title slaying race 3093 insert remove inv nrof name archname title slaying race
2953 decrease_ob_nr destroy)], 3094 decrease split destroy change_exp)],
2954 ["cf::object::player" => qw(player)], 3095 ["cf::object::player" => qw(player)],
2955 ["cf::player" => qw(peaceful)], 3096 ["cf::player" => qw(peaceful)],
2956 ["cf::map" => qw(trigger)], 3097 ["cf::map" => qw(trigger)],
2957) { 3098) {
2958 no strict 'refs'; 3099 no strict 'refs';
3063 { 3204 {
3064 my $faces = $facedata->{faceinfo}; 3205 my $faces = $facedata->{faceinfo};
3065 3206
3066 while (my ($face, $info) = each %$faces) { 3207 while (my ($face, $info) = each %$faces) {
3067 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3208 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3209
3068 cf::face::set_visibility $idx, $info->{visibility}; 3210 cf::face::set_visibility $idx, $info->{visibility};
3069 cf::face::set_magicmap $idx, $info->{magicmap}; 3211 cf::face::set_magicmap $idx, $info->{magicmap};
3070 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3212 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3071 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3213 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3072 3214
3073 cf::cede_to_tick; 3215 cf::cede_to_tick;
3074 } 3216 }
3075 3217
3076 while (my ($face, $info) = each %$faces) { 3218 while (my ($face, $info) = each %$faces) {
3077 next unless $info->{smooth}; 3219 next unless $info->{smooth};
3220
3078 my $idx = cf::face::find $face 3221 my $idx = cf::face::find $face
3079 or next; 3222 or next;
3223
3080 if (my $smooth = cf::face::find $info->{smooth}) { 3224 if (my $smooth = cf::face::find $info->{smooth}) {
3081 cf::face::set_smooth $idx, $smooth; 3225 cf::face::set_smooth $idx, $smooth;
3082 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3226 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3083 } else { 3227 } else {
3084 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3228 warn "smooth face '$info->{smooth}' not found for face '$face'";
3102 { 3246 {
3103 # TODO: for gcfclient pleasure, we should give resources 3247 # TODO: for gcfclient pleasure, we should give resources
3104 # that gcfclient doesn't grok a >10000 face index. 3248 # that gcfclient doesn't grok a >10000 face index.
3105 my $res = $facedata->{resource}; 3249 my $res = $facedata->{resource};
3106 3250
3107 my $soundconf = delete $res->{"res/sound.conf"};
3108
3109 while (my ($name, $info) = each %$res) { 3251 while (my ($name, $info) = each %$res) {
3252 if (defined $info->{type}) {
3110 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3253 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3111 my $data; 3254 my $data;
3112 3255
3113 if ($info->{type} & 1) { 3256 if ($info->{type} & 1) {
3114 # prepend meta info 3257 # prepend meta info
3115 3258
3116 my $meta = $enc->encode ({ 3259 my $meta = $enc->encode ({
3117 name => $name, 3260 name => $name,
3118 %{ $info->{meta} || {} }, 3261 %{ $info->{meta} || {} },
3119 }); 3262 });
3120 3263
3121 $data = pack "(w/a*)*", $meta, $info->{data}; 3264 $data = pack "(w/a*)*", $meta, $info->{data};
3265 } else {
3266 $data = $info->{data};
3267 }
3268
3269 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3270 cf::face::set_type $idx, $info->{type};
3122 } else { 3271 } else {
3123 $data = $info->{data}; 3272 $RESOURCE{$name} = $info;
3124 } 3273 }
3125 3274
3126 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3127 cf::face::set_type $idx, $info->{type};
3128
3129 cf::cede_to_tick; 3275 cf::cede_to_tick;
3130 } 3276 }
3131
3132 if ($soundconf) {
3133 $soundconf = $enc->decode (delete $soundconf->{data});
3134
3135 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3136 my $sound = $soundconf->{compat}[$_]
3137 or next;
3138
3139 my $face = cf::face::find "sound/$sound->[1]";
3140 cf::sound::set $sound->[0] => $face;
3141 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3142 }
3143
3144 while (my ($k, $v) = each %{$soundconf->{event}}) {
3145 my $face = cf::face::find "sound/$v";
3146 cf::sound::set $k => $face;
3147 }
3148 }
3149 } 3277 }
3278
3279 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3150 3280
3151 1 3281 1
3152} 3282}
3283
3284cf::global->attach (on_resource_update => sub {
3285 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3286 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3287
3288 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3289 my $sound = $soundconf->{compat}[$_]
3290 or next;
3291
3292 my $face = cf::face::find "sound/$sound->[1]";
3293 cf::sound::set $sound->[0] => $face;
3294 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3295 }
3296
3297 while (my ($k, $v) = each %{$soundconf->{event}}) {
3298 my $face = cf::face::find "sound/$v";
3299 cf::sound::set $k => $face;
3300 }
3301 }
3302});
3153 3303
3154register_exticmd fx_want => sub { 3304register_exticmd fx_want => sub {
3155 my ($ns, $want) = @_; 3305 my ($ns, $want) = @_;
3156 3306
3157 while (my ($k, $v) = each %$want) { 3307 while (my ($k, $v) = each %$want) {
3158 $ns->fx_want ($k, $v); 3308 $ns->fx_want ($k, $v);
3159 } 3309 }
3160}; 3310};
3311
3312sub load_resource_file($) {
3313 my $guard = lock_acquire "load_resource_file";
3314
3315 my $status = load_resource_file_ $_[0];
3316 get_slot 0.1, 100;
3317 cf::arch::commit_load;
3318
3319 $status
3320}
3161 3321
3162sub reload_regions { 3322sub reload_regions {
3163 # HACK to clear player env face cache, we need some signal framework 3323 # HACK to clear player env face cache, we need some signal framework
3164 # for this (global event?) 3324 # for this (global event?)
3165 %ext::player_env::MUSIC_FACE_CACHE = (); 3325 %ext::player_env::MUSIC_FACE_CACHE = ();
3179} 3339}
3180 3340
3181sub reload_archetypes { 3341sub reload_archetypes {
3182 load_resource_file "$DATADIR/archetypes" 3342 load_resource_file "$DATADIR/archetypes"
3183 or die "unable to load archetypes\n"; 3343 or die "unable to load archetypes\n";
3184 #d# NEED to laod twice to resolve forward references
3185 # this really needs to be done in an extra post-pass
3186 # (which needs to be synchronous, so solve it differently)
3187 load_resource_file "$DATADIR/archetypes"
3188 or die "unable to load archetypes\n";
3189} 3344}
3190 3345
3191sub reload_treasures { 3346sub reload_treasures {
3192 load_resource_file "$DATADIR/treasures" 3347 load_resource_file "$DATADIR/treasures"
3193 or die "unable to load treasurelists\n"; 3348 or die "unable to load treasurelists\n";
3194} 3349}
3195 3350
3196sub reload_resources { 3351sub reload_resources {
3197 warn "reloading resource files...\n"; 3352 warn "reloading resource files...\n";
3198 3353
3354 reload_facedata;
3355 reload_archetypes;
3199 reload_regions; 3356 reload_regions;
3200 reload_facedata;
3201 #reload_archetypes;#d#
3202 reload_archetypes;
3203 reload_treasures; 3357 reload_treasures;
3204 3358
3205 warn "finished reloading resource files\n"; 3359 warn "finished reloading resource files\n";
3206}
3207
3208sub init {
3209 reload_resources;
3210} 3360}
3211 3361
3212sub reload_config { 3362sub reload_config {
3213 open my $fh, "<:utf8", "$CONFDIR/config" 3363 open my $fh, "<:utf8", "$CONFDIR/config"
3214 or return; 3364 or return;
3215 3365
3216 local $/; 3366 local $/;
3217 *CFG = YAML::Syck::Load <$fh>; 3367 *CFG = YAML::Load <$fh>;
3218 3368
3219 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3369 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3220 3370
3221 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3371 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3222 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3372 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3228 }; 3378 };
3229 warn $@ if $@; 3379 warn $@ if $@;
3230 } 3380 }
3231} 3381}
3232 3382
3383sub pidfile() {
3384 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3385 or die "$PIDFILE: $!";
3386 flock $fh, &Fcntl::LOCK_EX
3387 or die "$PIDFILE: flock: $!";
3388 $fh
3389}
3390
3391# make sure only one server instance is running at any one time
3392sub atomic {
3393 my $fh = pidfile;
3394
3395 my $pid = <$fh>;
3396 kill 9, $pid if $pid > 0;
3397
3398 seek $fh, 0, 0;
3399 print $fh $$;
3400}
3401
3233sub main { 3402sub main {
3403 cf::init_globals; # initialise logging
3404
3405 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3406 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3407 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3408 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3409
3410 cf::init_experience;
3411 cf::init_anim;
3412 cf::init_attackmess;
3413 cf::init_dynamic;
3414 cf::init_block;
3415
3416 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3417
3234 # we must not ever block the main coroutine 3418 # we must not ever block the main coroutine
3235 local $Coro::idle = sub { 3419 local $Coro::idle = sub {
3236 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3420 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3237 (async { 3421 (async {
3238 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3422 $Coro::current->{desc} = "IDLE BUG HANDLER";
3239 Event::one_event; 3423 EV::loop EV::LOOP_ONESHOT;
3240 })->prio (Coro::PRIO_MAX); 3424 })->prio (Coro::PRIO_MAX);
3241 }; 3425 };
3242 3426
3427 evthread_start IO::AIO::poll_fileno;
3428
3429 cf::sync_job {
3430 reload_resources;
3243 reload_config; 3431 reload_config;
3244 db_init; 3432 db_init;
3433
3434 cf::load_settings;
3435 cf::load_materials;
3436 cf::init_uuid;
3437 cf::init_signals;
3438 cf::init_commands;
3439 cf::init_skills;
3440
3441 cf::init_beforeplay;
3442
3443 atomic;
3444
3245 load_extensions; 3445 load_extensions;
3246 3446
3247 $TICK_WATCHER->start; 3447 utime time, time, $RUNTIMEFILE;
3448
3449 # no (long-running) fork's whatsoever before this point(!)
3450 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3451
3452 (pop @POST_INIT)->(0) while @POST_INIT;
3453 };
3454
3248 Event::loop; 3455 EV::loop;
3249} 3456}
3250 3457
3251############################################################################# 3458#############################################################################
3252# initialisation and cleanup 3459# initialisation and cleanup
3253 3460
3254# install some emergency cleanup handlers 3461# install some emergency cleanup handlers
3255BEGIN { 3462BEGIN {
3463 our %SIGWATCHER = ();
3256 for my $signal (qw(INT HUP TERM)) { 3464 for my $signal (qw(INT HUP TERM)) {
3257 Event->signal ( 3465 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3258 reentrant => 0,
3259 data => WF_AUTOCANCEL,
3260 signal => $signal,
3261 prio => 0,
3262 cb => sub {
3263 cf::cleanup "SIG$signal"; 3466 cf::cleanup "SIG$signal";
3264 },
3265 ); 3467 };
3266 } 3468 }
3267} 3469}
3268 3470
3269sub write_runtime { 3471sub write_runtime_sync {
3270 my $runtime = "$LOCALDIR/runtime";
3271
3272 # first touch the runtime file to show we are still running: 3472 # first touch the runtime file to show we are still running:
3273 # the fsync below can take a very very long time. 3473 # the fsync below can take a very very long time.
3274 3474
3275 IO::AIO::aio_utime $runtime, undef, undef; 3475 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3276 3476
3277 my $guard = cf::lock_acquire "write_runtime"; 3477 my $guard = cf::lock_acquire "write_runtime";
3278 3478
3279 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3479 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3280 or return; 3480 or return;
3281 3481
3282 my $value = $cf::RUNTIME + 90 + 10; 3482 my $value = $cf::RUNTIME + 90 + 10;
3283 # 10 is the runtime save interval, for a monotonic clock 3483 # 10 is the runtime save interval, for a monotonic clock
3284 # 60 allows for the watchdog to kill the server. 3484 # 60 allows for the watchdog to kill the server.
3294 aio_utime $fh, undef, undef; 3494 aio_utime $fh, undef, undef;
3295 3495
3296 close $fh 3496 close $fh
3297 or return; 3497 or return;
3298 3498
3299 aio_rename "$runtime~", $runtime 3499 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3300 and return; 3500 and return;
3301 3501
3302 warn "runtime file written.\n"; 3502 warn "runtime file written.\n";
3303 3503
3304 1 3504 1
3505}
3506
3507our $uuid_lock;
3508our $uuid_skip;
3509
3510sub write_uuid_sync($) {
3511 $uuid_skip ||= $_[0];
3512
3513 return if $uuid_lock;
3514 local $uuid_lock = 1;
3515
3516 my $uuid = "$LOCALDIR/uuid";
3517
3518 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3519 or return;
3520
3521 my $value = uuid_seq uuid_cur;
3522
3523 if ($value < 1024) {
3524 warn "cowardly refusing to write low uuid value ($value)!\n";
3525 return;
3526 }
3527
3528 my $value = uuid_str $value + $uuid_skip;
3529 $uuid_skip = 0;
3530
3531 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3532 and return;
3533
3534 # always fsync - this file is important
3535 aio_fsync $fh
3536 and return;
3537
3538 close $fh
3539 or return;
3540
3541 aio_rename "$uuid~", $uuid
3542 and return;
3543
3544 warn "uuid file written ($value).\n";
3545
3546 1
3547
3548}
3549
3550sub write_uuid($$) {
3551 my ($skip, $sync) = @_;
3552
3553 $sync ? write_uuid_sync $skip
3554 : async { write_uuid_sync $skip };
3305} 3555}
3306 3556
3307sub emergency_save() { 3557sub emergency_save() {
3308 my $freeze_guard = cf::freeze_mainloop; 3558 my $freeze_guard = cf::freeze_mainloop;
3309 3559
3331 warn "end emergency map save\n"; 3581 warn "end emergency map save\n";
3332 3582
3333 warn "begin emergency database checkpoint\n"; 3583 warn "begin emergency database checkpoint\n";
3334 BDB::db_env_txn_checkpoint $DB_ENV; 3584 BDB::db_env_txn_checkpoint $DB_ENV;
3335 warn "end emergency database checkpoint\n"; 3585 warn "end emergency database checkpoint\n";
3586
3587 warn "begin write uuid\n";
3588 write_uuid_sync 1;
3589 warn "end write uuid\n";
3336 }; 3590 };
3337 3591
3338 warn "leave emergency perl save\n"; 3592 warn "leave emergency perl save\n";
3339} 3593}
3340 3594
3341sub post_cleanup { 3595sub post_cleanup {
3342 my ($make_core) = @_; 3596 my ($make_core) = @_;
3343 3597
3344 warn Carp::longmess "post_cleanup backtrace" 3598 warn Carp::longmess "post_cleanup backtrace"
3345 if $make_core; 3599 if $make_core;
3600
3601 my $fh = pidfile;
3602 unlink $PIDFILE if <$fh> == $$;
3603}
3604
3605# a safer delete_package, copied from Symbol
3606sub clear_package($) {
3607 my $pkg = shift;
3608
3609 # expand to full symbol table name if needed
3610 unless ($pkg =~ /^main::.*::$/) {
3611 $pkg = "main$pkg" if $pkg =~ /^::/;
3612 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3613 $pkg .= '::' unless $pkg =~ /::$/;
3614 }
3615
3616 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3617 my $stem_symtab = *{$stem}{HASH};
3618
3619 defined $stem_symtab and exists $stem_symtab->{$leaf}
3620 or return;
3621
3622 # clear all symbols
3623 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3624 for my $name (keys %$leaf_symtab) {
3625 _gv_clear *{"$pkg$name"};
3626# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3627 }
3628 warn "cleared package $pkg\n";#d#
3346} 3629}
3347 3630
3348sub do_reload_perl() { 3631sub do_reload_perl() {
3349 # can/must only be called in main 3632 # can/must only be called in main
3350 if ($Coro::current != $Coro::main) { 3633 if ($Coro::current != $Coro::main) {
3351 warn "can only reload from main coroutine"; 3634 warn "can only reload from main coroutine";
3352 return; 3635 return;
3353 } 3636 }
3354 3637
3638 return if $RELOAD++;
3639
3640 while ($RELOAD) {
3355 warn "reloading..."; 3641 warn "reloading...";
3356 3642
3357 warn "entering sync_job"; 3643 warn "entering sync_job";
3358 3644
3359 cf::sync_job { 3645 cf::sync_job {
3360 cf::write_runtime; # external watchdog should not bark 3646 cf::write_runtime_sync; # external watchdog should not bark
3361 cf::emergency_save; 3647 cf::emergency_save;
3362 cf::write_runtime; # external watchdog should not bark 3648 cf::write_runtime_sync; # external watchdog should not bark
3363 3649
3364 warn "syncing database to disk"; 3650 warn "syncing database to disk";
3365 BDB::db_env_txn_checkpoint $DB_ENV; 3651 BDB::db_env_txn_checkpoint $DB_ENV;
3366 3652
3367 # if anything goes wrong in here, we should simply crash as we already saved 3653 # if anything goes wrong in here, we should simply crash as we already saved
3368 3654
3369 warn "cancelling all WF_AUTOCANCEL watchers";
3370 for (Event::all_watchers) {
3371 $_->cancel if $_->data & WF_AUTOCANCEL;
3372 }
3373
3374 warn "flushing outstanding aio requests"; 3655 warn "flushing outstanding aio requests";
3375 for (;;) {
3376 BDB::flush;
3377 IO::AIO::flush;
3378 Coro::cede_notself;
3379 last unless IO::AIO::nreqs || BDB::nreqs; 3656 while (IO::AIO::nreqs || BDB::nreqs) {
3380 warn "iterate..."; 3657 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3381 }
3382
3383 ++$RELOAD;
3384
3385 warn "cancelling all extension coros";
3386 $_->cancel for values %EXT_CORO;
3387 %EXT_CORO = ();
3388
3389 warn "removing commands";
3390 %COMMAND = ();
3391
3392 warn "removing ext/exti commands";
3393 %EXTCMD = ();
3394 %EXTICMD = ();
3395
3396 warn "unloading/nuking all extensions";
3397 for my $pkg (@EXTS) {
3398 warn "... unloading $pkg";
3399
3400 if (my $cb = $pkg->can ("unload")) {
3401 eval {
3402 $cb->($pkg);
3403 1
3404 } or warn "$pkg unloaded, but with errors: $@";
3405 } 3658 }
3406 3659
3407 warn "... nuking $pkg"; 3660 warn "cancelling all extension coros";
3408 Symbol::delete_package $pkg; 3661 $_->cancel for values %EXT_CORO;
3409 } 3662 %EXT_CORO = ();
3410 3663
3411 warn "unloading all perl modules loaded from $LIBDIR"; 3664 warn "removing commands";
3412 while (my ($k, $v) = each %INC) { 3665 %COMMAND = ();
3413 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3414 3666
3667 warn "removing ext/exti commands";
3668 %EXTCMD = ();
3669 %EXTICMD = ();
3670
3671 warn "unloading/nuking all extensions";
3672 for my $pkg (@EXTS) {
3415 warn "... unloading $k"; 3673 warn "... unloading $pkg";
3416 delete $INC{$k};
3417 3674
3418 $k =~ s/\.pm$//;
3419 $k =~ s/\//::/g;
3420
3421 if (my $cb = $k->can ("unload_module")) { 3675 if (my $cb = $pkg->can ("unload")) {
3676 eval {
3422 $cb->(); 3677 $cb->($pkg);
3678 1
3679 } or warn "$pkg unloaded, but with errors: $@";
3680 }
3681
3682 warn "... clearing $pkg";
3683 clear_package $pkg;
3423 } 3684 }
3424 3685
3425 Symbol::delete_package $k; 3686 warn "unloading all perl modules loaded from $LIBDIR";
3687 while (my ($k, $v) = each %INC) {
3688 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3689
3690 warn "... unloading $k";
3691 delete $INC{$k};
3692
3693 $k =~ s/\.pm$//;
3694 $k =~ s/\//::/g;
3695
3696 if (my $cb = $k->can ("unload_module")) {
3697 $cb->();
3698 }
3699
3700 clear_package $k;
3426 } 3701 }
3427 3702
3428 warn "getting rid of safe::, as good as possible"; 3703 warn "getting rid of safe::, as good as possible";
3429 Symbol::delete_package "safe::$_" 3704 clear_package "safe::$_"
3430 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3705 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3431 3706
3432 warn "unloading cf.pm \"a bit\""; 3707 warn "unloading cf.pm \"a bit\"";
3433 delete $INC{"cf.pm"}; 3708 delete $INC{"cf.pm"};
3434 delete $INC{"cf/pod.pm"}; 3709 delete $INC{"cf/pod.pm"};
3435 3710
3436 # don't, removes xs symbols, too, 3711 # don't, removes xs symbols, too,
3437 # and global variables created in xs 3712 # and global variables created in xs
3438 #Symbol::delete_package __PACKAGE__; 3713 #clear_package __PACKAGE__;
3439 3714
3440 warn "unload completed, starting to reload now"; 3715 warn "unload completed, starting to reload now";
3441 3716
3442 warn "reloading cf.pm"; 3717 warn "reloading cf.pm";
3443 require cf; 3718 require cf;
3444 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3719 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3445 3720
3446 warn "loading config and database again"; 3721 warn "loading config and database again";
3447 cf::reload_config; 3722 cf::reload_config;
3448 3723
3449 warn "loading extensions"; 3724 warn "loading extensions";
3450 cf::load_extensions; 3725 cf::load_extensions;
3451 3726
3452 warn "reattaching attachments to objects/players"; 3727 warn "reattaching attachments to objects/players";
3453 _global_reattach; # objects, sockets 3728 _global_reattach; # objects, sockets
3454 warn "reattaching attachments to maps"; 3729 warn "reattaching attachments to maps";
3455 reattach $_ for values %MAP; 3730 reattach $_ for values %MAP;
3456 warn "reattaching attachments to players"; 3731 warn "reattaching attachments to players";
3457 reattach $_ for values %PLAYER; 3732 reattach $_ for values %PLAYER;
3458 3733
3734 warn "running post_load";
3735 (pop @POST_INIT)->(1) while @POST_INIT;
3736
3459 warn "leaving sync_job"; 3737 warn "leaving sync_job";
3460 3738
3461 1 3739 1
3462 } or do { 3740 } or do {
3463 warn $@; 3741 warn $@;
3464 warn "error while reloading, exiting."; 3742 cf::cleanup "error while reloading, exiting.";
3465 exit 1;
3466 }; 3743 };
3467 3744
3468 warn "reloaded"; 3745 warn "reloaded";
3746 --$RELOAD;
3747 }
3469}; 3748};
3470 3749
3471our $RELOAD_WATCHER; # used only during reload 3750our $RELOAD_WATCHER; # used only during reload
3472 3751
3473sub reload_perl() { 3752sub reload_perl() {
3474 # doing reload synchronously and two reloads happen back-to-back, 3753 # doing reload synchronously and two reloads happen back-to-back,
3475 # coro crashes during coro_state_free->destroy here. 3754 # coro crashes during coro_state_free->destroy here.
3476 3755
3477 $RELOAD_WATCHER ||= Event->timer ( 3756 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub {
3478 reentrant => 0,
3479 after => 0,
3480 data => WF_AUTOCANCEL,
3481 cb => sub {
3482 do_reload_perl; 3757 do_reload_perl;
3483 undef $RELOAD_WATCHER; 3758 undef $RELOAD_WATCHER;
3484 },
3485 ); 3759 };
3486} 3760}
3487 3761
3488register_command "reload" => sub { 3762register_command "reload" => sub {
3489 my ($who, $arg) = @_; 3763 my ($who, $arg) = @_;
3490 3764
3503 3777
3504our @WAIT_FOR_TICK; 3778our @WAIT_FOR_TICK;
3505our @WAIT_FOR_TICK_BEGIN; 3779our @WAIT_FOR_TICK_BEGIN;
3506 3780
3507sub wait_for_tick { 3781sub wait_for_tick {
3508 return unless $TICK_WATCHER->is_active;
3509 return if $Coro::current == $Coro::main; 3782 return if tick_inhibit || $Coro::current == $Coro::main;
3510 3783
3511 my $signal = new Coro::Signal; 3784 my $signal = new Coro::Signal;
3512 push @WAIT_FOR_TICK, $signal; 3785 push @WAIT_FOR_TICK, $signal;
3513 $signal->wait; 3786 $signal->wait;
3514} 3787}
3515 3788
3516sub wait_for_tick_begin { 3789sub wait_for_tick_begin {
3517 return unless $TICK_WATCHER->is_active;
3518 return if $Coro::current == $Coro::main; 3790 return if tick_inhibit || $Coro::current == $Coro::main;
3519 3791
3520 my $signal = new Coro::Signal; 3792 my $signal = new Coro::Signal;
3521 push @WAIT_FOR_TICK_BEGIN, $signal; 3793 push @WAIT_FOR_TICK_BEGIN, $signal;
3522 $signal->wait; 3794 $signal->wait;
3523} 3795}
3524 3796
3525$TICK_WATCHER = Event->timer ( 3797sub tick {
3526 reentrant => 0,
3527 parked => 1,
3528 prio => 0,
3529 at => $NEXT_TICK || $TICK,
3530 data => WF_AUTOCANCEL,
3531 cb => sub {
3532 if ($Coro::current != $Coro::main) { 3798 if ($Coro::current != $Coro::main) {
3533 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3799 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3534 unless ++$bug_warning > 10; 3800 unless ++$bug_warning > 10;
3535 return; 3801 return;
3536 } 3802 }
3537 3803
3538 $NOW = $tick_start = Event::time;
3539
3540 cf::server_tick; # one server iteration 3804 cf::server_tick; # one server iteration
3541 3805
3542 $RUNTIME += $TICK;
3543 $NEXT_TICK += $TICK;
3544
3545 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3806 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3546 $NEXT_RUNTIME_WRITE = $NOW + 10; 3807 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3547 Coro::async_pool { 3808 Coro::async_pool {
3548 $Coro::current->{desc} = "runtime saver"; 3809 $Coro::current->{desc} = "runtime saver";
3549 write_runtime 3810 write_runtime_sync
3550 or warn "ERROR: unable to write runtime file: $!"; 3811 or warn "ERROR: unable to write runtime file: $!";
3551 };
3552 } 3812 };
3813 }
3553 3814
3554 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3815 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3555 $sig->send; 3816 $sig->send;
3556 } 3817 }
3557 while (my $sig = shift @WAIT_FOR_TICK) { 3818 while (my $sig = shift @WAIT_FOR_TICK) {
3558 $sig->send; 3819 $sig->send;
3559 } 3820 }
3560 3821
3561 $NOW = Event::time; 3822 $LOAD = ($NOW - $TICK_START) / $TICK;
3562
3563 # if we are delayed by four ticks or more, skip them all
3564 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3565
3566 $TICK_WATCHER->at ($NEXT_TICK);
3567 $TICK_WATCHER->start;
3568
3569 $LOAD = ($NOW - $tick_start) / $TICK;
3570 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3823 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3571 3824
3572 _post_tick; 3825 if (0) {
3826 if ($NEXT_TICK) {
3827 my $jitter = $TICK_START - $NEXT_TICK;
3828 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3829 warn "jitter $JITTER\n";#d#
3830 }
3573 }, 3831 }
3574); 3832}
3575 3833
3576{ 3834{
3835 # configure BDB
3836
3577 BDB::min_parallel 8; 3837 BDB::min_parallel 8;
3578 BDB::max_poll_time $TICK * 0.1; 3838 BDB::max_poll_reqs $TICK * 0.1;
3579 $BDB_POLL_WATCHER = Event->io ( 3839 $AnyEvent::BDB::WATCHER->priority (1);
3580 reentrant => 0,
3581 fd => BDB::poll_fileno,
3582 poll => 'r',
3583 prio => 0,
3584 data => WF_AUTOCANCEL,
3585 cb => \&BDB::poll_cb,
3586 );
3587
3588 BDB::set_sync_prepare {
3589 my $status;
3590 my $current = $Coro::current;
3591 (
3592 sub {
3593 $status = $!;
3594 $current->ready; undef $current;
3595 },
3596 sub {
3597 Coro::schedule while defined $current;
3598 $! = $status;
3599 },
3600 )
3601 };
3602 3840
3603 unless ($DB_ENV) { 3841 unless ($DB_ENV) {
3604 $DB_ENV = BDB::db_env_create; 3842 $DB_ENV = BDB::db_env_create;
3605 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3843 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3606 | BDB::LOG_AUTOREMOVE, 1); 3844 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3845 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3607 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3846 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3608 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3847 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3609 3848
3610 cf::sync_job { 3849 cf::sync_job {
3611 eval { 3850 eval {
3621 3860
3622 cf::cleanup "db_env_open(db): $@" if $@; 3861 cf::cleanup "db_env_open(db): $@" if $@;
3623 }; 3862 };
3624 } 3863 }
3625 3864
3626 $BDB_DEADLOCK_WATCHER = Event->timer ( 3865 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3627 after => 3,
3628 interval => 1,
3629 hard => 1,
3630 prio => 0,
3631 data => WF_AUTOCANCEL,
3632 cb => sub {
3633 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3866 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3634 },
3635 ); 3867 };
3636 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3868 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3637 after => 11,
3638 interval => 60,
3639 hard => 1,
3640 prio => 0,
3641 data => WF_AUTOCANCEL,
3642 cb => sub {
3643 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3869 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3644 },
3645 ); 3870 };
3646 $BDB_TRICKLE_WATCHER = Event->timer ( 3871 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3647 after => 5,
3648 interval => 10,
3649 hard => 1,
3650 prio => 0,
3651 data => WF_AUTOCANCEL,
3652 cb => sub {
3653 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3872 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3654 },
3655 ); 3873 };
3656} 3874}
3657 3875
3658{ 3876{
3877 # configure IO::AIO
3878
3659 IO::AIO::min_parallel 8; 3879 IO::AIO::min_parallel 8;
3660
3661 undef $Coro::AIO::WATCHER;
3662 IO::AIO::max_poll_time $TICK * 0.1; 3880 IO::AIO::max_poll_time $TICK * 0.1;
3663 $AIO_POLL_WATCHER = Event->io ( 3881 undef $AnyEvent::AIO::WATCHER;
3664 reentrant => 0,
3665 data => WF_AUTOCANCEL,
3666 fd => IO::AIO::poll_fileno,
3667 poll => 'r',
3668 prio => 0,
3669 cb => \&IO::AIO::poll_cb,
3670 );
3671} 3882}
3672 3883
3673my $_log_backtrace; 3884my $_log_backtrace;
3674 3885
3675sub _log_backtrace { 3886sub _log_backtrace {
3678 $msg =~ s/\n//; 3889 $msg =~ s/\n//;
3679 3890
3680 # limit the # of concurrent backtraces 3891 # limit the # of concurrent backtraces
3681 if ($_log_backtrace < 2) { 3892 if ($_log_backtrace < 2) {
3682 ++$_log_backtrace; 3893 ++$_log_backtrace;
3894 my $perl_bt = Carp::longmess $msg;
3683 async { 3895 async {
3684 $Coro::current->{desc} = "abt $msg"; 3896 $Coro::current->{desc} = "abt $msg";
3685 3897
3686 my @bt = fork_call { 3898 my @bt = fork_call {
3687 @addr = map { sprintf "%x", $_ } @addr; 3899 @addr = map { sprintf "%x", $_ } @addr;
3698 } 3910 }
3699 3911
3700 @funcs 3912 @funcs
3701 }; 3913 };
3702 3914
3703 LOG llevInfo, "[ABT] $msg\n"; 3915 LOG llevInfo, "[ABT] $perl_bt\n";
3916 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3704 LOG llevInfo, "[ABT] $_\n" for @bt; 3917 LOG llevInfo, "[ABT] $_\n" for @bt;
3705 --$_log_backtrace; 3918 --$_log_backtrace;
3706 }; 3919 };
3707 } else { 3920 } else {
3708 LOG llevInfo, "[ABT] $msg\n"; 3921 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines