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.386 by root, Mon Oct 15 17:50:27 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
444 warn $@ if $@; 514 warn $@ if $@;
445 undef $busy; 515 undef $busy;
446 })->prio (Coro::PRIO_MAX); 516 })->prio (Coro::PRIO_MAX);
447 517
448 while ($busy) { 518 while ($busy) {
449 Coro::cede or Event::one_event; 519 if (Coro::nready) {
520 Coro::cede_notself;
521 } else {
522 EV::loop EV::LOOP_ONESHOT;
450 } 523 }
524 }
451 525
452 $time = Event::time - $time; 526 my $time = EV::time - $time;
453 527
454 LOG llevError | logBacktrace, Carp::longmess "long sync job"
455 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
456
457 $tick_start += $time; # do not account sync jobs to server load 528 $TICK_START += $time; # do not account sync jobs to server load
458 529
459 wantarray ? @res : $res[0] 530 wantarray ? @res : $res[0]
460 } else { 531 } else {
461 # we are in another coroutine, how wonderful, everything just works 532 # we are in another coroutine, how wonderful, everything just works
462 533
487=item fork_call { }, $args 558=item fork_call { }, $args
488 559
489Executes the given code block with the given arguments in a seperate 560Executes the given code block with the given arguments in a seperate
490process, returning the results. Everything must be serialisable with 561process, returning the results. Everything must be serialisable with
491Coro::Storable. May, of course, block. Note that the executed sub may 562Coro::Storable. May, of course, block. Note that the executed sub may
492never block itself or use any form of Event handling. 563never block itself or use any form of event handling.
493 564
494=cut 565=cut
495 566
496sub fork_call(&@) { 567sub fork_call(&@) {
497 my ($cb, @args) = @_; 568 my ($cb, @args) = @_;
504 reset_signals; 575 reset_signals;
505 &$cb 576 &$cb
506 }, @args; 577 }, @args;
507 578
508 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
509} 607}
510 608
511=item $value = cf::db_get $family => $key 609=item $value = cf::db_get $family => $key
512 610
513Returns a single value from the environment database. 611Returns a single value from the environment database.
652 750
653############################################################################# 751#############################################################################
654 752
655=head2 ATTACHABLE OBJECTS 753=head2 ATTACHABLE OBJECTS
656 754
657Many 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
658attach callbacks/event handlers (a collection of which is called an "attachment") 756attach callbacks/event handlers (a collection of which is called an "attachment")
659to it. All such attachable objects support the following methods. 757to it. All such attachable objects support the following methods.
660 758
661In 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>
662C<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
663Crossfire TRT). 761Deliantra).
664 762
665=over 4 763=over 4
666 764
667=item $attachable->attach ($attachment, key => $value...) 765=item $attachable->attach ($attachment, key => $value...)
668 766
712=item cf::CLASS::attachment $name, ... 810=item cf::CLASS::attachment $name, ...
713 811
714Register an attachment by C<$name> through which attachable objects of the 812Register an attachment by C<$name> through which attachable objects of the
715given CLASS can refer to this attachment. 813given CLASS can refer to this attachment.
716 814
717Some classes such as crossfire maps and objects can specify attachments 815Some classes such as deliantra maps and objects can specify attachments
718that 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.
719 817
720These calls expect any number of the following handler/hook descriptions: 818These calls expect any number of the following handler/hook descriptions:
721 819
722=over 4 820=over 4
950 } 1048 }
951 1049
952 0 1050 0
953} 1051}
954 1052
955=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1053=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
956 1054
957=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1055=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
958 1056
959Generate an object-specific event with the given arguments. 1057Generate an object-specific event with the given arguments.
960 1058
1013 1111
1014sub reattach { 1112sub reattach {
1015 # basically do the same as instantiate, without calling instantiate 1113 # basically do the same as instantiate, without calling instantiate
1016 my ($obj) = @_; 1114 my ($obj) = @_;
1017 1115
1116 # no longer needed after getting rid of delete_package?
1018 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
1019 1118
1020 my $registry = $obj->registry; 1119 my $registry = $obj->registry;
1021 1120
1022 @$registry = (); 1121 @$registry = ();
1023 1122
1038cf::attachable->attach ( 1137cf::attachable->attach (
1039 prio => -1000000, 1138 prio => -1000000,
1040 on_instantiate => sub { 1139 on_instantiate => sub {
1041 my ($obj, $data) = @_; 1140 my ($obj, $data) = @_;
1042 1141
1043 $data = from_json $data; 1142 $data = decode_json $data;
1044 1143
1045 for (@$data) { 1144 for (@$data) {
1046 my ($name, $args) = @$_; 1145 my ($name, $args) = @$_;
1047 1146
1048 $obj->attach ($name, %{$args || {} }); 1147 $obj->attach ($name, %{$args || {} });
1069 utf8::decode (my $decname = $filename); 1168 utf8::decode (my $decname = $filename);
1070 warn sprintf "saving %s (%d,%d)\n", 1169 warn sprintf "saving %s (%d,%d)\n",
1071 $decname, length $$rdata, scalar @$objs; 1170 $decname, length $$rdata, scalar @$objs;
1072 1171
1073 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1074 chmod SAVE_MODE, $fh; 1173 aio_chmod $fh, SAVE_MODE;
1075 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1076 aio_fsync $fh if $cf::USE_FSYNC; 1175 aio_fsync $fh if $cf::USE_FSYNC;
1077 close $fh; 1176 aio_close $fh;
1078 1177
1079 if (@$objs) { 1178 if (@$objs) {
1080 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) {
1081 chmod SAVE_MODE, $fh; 1180 aio_chmod $fh, SAVE_MODE;
1082 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs }; 1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1083 aio_write $fh, 0, (length $data), $data, 0; 1182 aio_write $fh, 0, (length $data), $data, 0;
1084 aio_fsync $fh if $cf::USE_FSYNC; 1183 aio_fsync $fh if $cf::USE_FSYNC;
1085 close $fh; 1184 aio_close $fh;
1086 aio_rename "$filename.pst~", "$filename.pst"; 1185 aio_rename "$filename.pst~", "$filename.pst";
1087 } 1186 }
1088 } else { 1187 } else {
1089 aio_unlink "$filename.pst"; 1188 aio_unlink "$filename.pst";
1090 } 1189 }
1118 1217
1119 unless (aio_stat "$filename.pst") { 1218 unless (aio_stat "$filename.pst") {
1120 (aio_load "$filename.pst", $av) >= 0 1219 (aio_load "$filename.pst", $av) >= 0
1121 or return; 1220 or return;
1122 1221
1123 my $st = eval { Coro::Storable::thaw $av } 1222 my $st = eval { Coro::Storable::thaw $av };
1124 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1125 $av = $st->{objs}; 1223 $av = $st->{objs};
1126 } 1224 }
1127 1225
1128 utf8::decode (my $decname = $filename); 1226 utf8::decode (my $decname = $filename);
1129 warn sprintf "loading %s (%d,%d)\n", 1227 warn sprintf "loading %s (%d,%d)\n",
1260 1358
1261 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1359 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1262 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1360 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1263 1361
1264 $ext{source} = 1362 $ext{source} =
1265 "package $pkg; use strict; use utf8;\n" 1363 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1266 . "#line 1 \"$path\"\n{\n" 1364 . "#line 1 \"$path\"\n{\n"
1267 . $source 1365 . $source
1268 . "\n};\n1"; 1366 . "\n};\n1";
1269 1367
1270 $todo{$base} = \%ext; 1368 $todo{$base} = \%ext;
1286 my $msg = $@ ? "$v->{path}: $@\n" 1384 my $msg = $@ ? "$v->{path}: $@\n"
1287 : "$v->{base}: extension inactive.\n"; 1385 : "$v->{base}: extension inactive.\n";
1288 1386
1289 if (exists $v->{meta}{mandatory}) { 1387 if (exists $v->{meta}{mandatory}) {
1290 warn $msg; 1388 warn $msg;
1291 warn "mandatory extension failed to load, exiting.\n"; 1389 cf::cleanup "mandatory extension failed to load, exiting.";
1292 exit 1;
1293 } 1390 }
1294 1391
1295 warn $msg; 1392 warn $msg;
1296 } 1393 }
1297 1394
1311 1408
1312=back 1409=back
1313 1410
1314=head2 CORE EXTENSIONS 1411=head2 CORE EXTENSIONS
1315 1412
1316Functions and methods that extend core crossfire objects. 1413Functions and methods that extend core deliantra objects.
1317 1414
1318=cut 1415=cut
1319 1416
1320package cf::player; 1417package cf::player;
1321 1418
1364 1461
1365sub exists($) { 1462sub exists($) {
1366 my ($login) = @_; 1463 my ($login) = @_;
1367 1464
1368 $cf::PLAYER{$login} 1465 $cf::PLAYER{$login}
1369 or cf::sync_job { !aio_stat path $login } 1466 or !aio_stat path $login
1370} 1467}
1371 1468
1372sub find($) { 1469sub find($) {
1373 return $cf::PLAYER{$_[0]} || do { 1470 return $cf::PLAYER{$_[0]} || do {
1374 my $login = $_[0]; 1471 my $login = $_[0];
1386 my $f = new_from_file cf::object::thawer path $login 1483 my $f = new_from_file cf::object::thawer path $login
1387 or return; 1484 or return;
1388 1485
1389 my $pl = cf::player::load_pl $f 1486 my $pl = cf::player::load_pl $f
1390 or return; 1487 or return;
1488
1391 local $cf::PLAYER_LOADING{$login} = $pl; 1489 local $cf::PLAYER_LOADING{$login} = $pl;
1392 $f->resolve_delayed_derefs; 1490 $f->resolve_delayed_derefs;
1393 $cf::PLAYER{$login} = $pl 1491 $cf::PLAYER{$login} = $pl
1394 } 1492 }
1395 } 1493 }
1405 1503
1406 return if $pl->{deny_save}; 1504 return if $pl->{deny_save};
1407 1505
1408 aio_mkdir playerdir $pl, 0770; 1506 aio_mkdir playerdir $pl, 0770;
1409 $pl->{last_save} = $cf::RUNTIME; 1507 $pl->{last_save} = $cf::RUNTIME;
1508
1509 cf::get_slot 0.01;
1410 1510
1411 $pl->save_pl ($path); 1511 $pl->save_pl ($path);
1412 cf::cede_to_tick; 1512 cf::cede_to_tick;
1413} 1513}
1414 1514
1446 my ($pl) = @_; 1546 my ($pl) = @_;
1447 1547
1448 my $name = $pl->ob->name; 1548 my $name = $pl->ob->name;
1449 1549
1450 $pl->{deny_save} = 1; 1550 $pl->{deny_save} = 1;
1451 $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
1452 1552
1453 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1553 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1454 $pl->deactivate; 1554 $pl->deactivate;
1555 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1556 $pl->ob->check_score;
1455 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1557 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1456 $pl->ns->destroy if $pl->ns; 1558 $pl->ns->destroy if $pl->ns;
1457 1559
1458 my $path = playerdir $pl; 1560 my $path = playerdir $pl;
1459 my $temp = "$path~$cf::RUNTIME~deleting~"; 1561 my $temp = "$path~$cf::RUNTIME~deleting~";
1498 1600
1499 for my $login (@$dirs) { 1601 for my $login (@$dirs) {
1500 my $path = path $login; 1602 my $path = path $login;
1501 1603
1502 # a .pst is a dead give-away for a valid player 1604 # a .pst is a dead give-away for a valid player
1503 unless (-e "$path.pst") { 1605 # if no pst file found, open and chekc for blocked users
1606 if (aio_stat "$path.pst") {
1504 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1607 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1505 aio_read $fh, 0, 512, my $buf, 0 or next; 1608 aio_read $fh, 0, 512, my $buf, 0 or next;
1506 $buf !~ /^password -------------$/m or next; # official not-valid tag 1609 $buf !~ /^password -------------$/m or next; # official not-valid tag
1507 } 1610 }
1508 1611
1539 } 1642 }
1540 1643
1541 \@paths 1644 \@paths
1542} 1645}
1543 1646
1544=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1647=item $protocol_xml = $player->expand_cfpod ($cfpod)
1545 1648
1546Expand crossfire pod fragments into protocol xml. 1649Expand deliantra pod fragments into protocol xml.
1547
1548=cut
1549
1550sub expand_cfpod {
1551 ((my $self), (local $_)) = @_;
1552
1553 # escape & and <
1554 s/&/&amp;/g;
1555 s/(?<![BIUGHT])</&lt;/g;
1556
1557 # this is buggy, it needs to properly take care of nested <'s
1558
1559 1 while
1560 # replace B<>, I<>, U<> etc.
1561 s/B<([^\>]*)>/<b>$1<\/b>/
1562 || s/I<([^\>]*)>/<i>$1<\/i>/
1563 || s/U<([^\>]*)>/<u>$1<\/u>/
1564 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1565 # replace G<male|female> tags
1566 || s{G<([^>|]*)\|([^>]*)>}{
1567 $self->gender ? $2 : $1
1568 }ge
1569 # replace H<hint text>
1570 || s{H<([^\>]*)>}
1571 {
1572 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1573 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1574 "")
1575 [$self->{hintmode}]
1576 }ge;
1577
1578 # create single paragraphs (very hackish)
1579 s/(?<=\S)\n(?=\w)/ /g;
1580
1581 # compress some whitespace
1582 s/\s+\n/\n/g; # ws line-ends
1583 s/\n\n+/\n/g; # double lines
1584 s/^\n+//; # beginning lines
1585 s/\n+$//; # ending lines
1586
1587 $_
1588}
1589
1590sub hintmode {
1591 $_[0]{hintmode} = $_[1] if @_ > 1;
1592 $_[0]{hintmode}
1593}
1594 1650
1595=item $player->ext_reply ($msgid, @msg) 1651=item $player->ext_reply ($msgid, @msg)
1596 1652
1597Sends an ext reply to the player. 1653Sends an ext reply to the player.
1598 1654
1665our $MAX_RESET = 3600; 1721our $MAX_RESET = 3600;
1666our $DEFAULT_RESET = 3000; 1722our $DEFAULT_RESET = 3000;
1667 1723
1668sub generate_random_map { 1724sub generate_random_map {
1669 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
1670 # mit "rum" bekleckern, nicht 1729 # mit "rum" bekleckern, nicht
1671 $self->_create_random_map ( 1730 $self->_create_random_map (
1672 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1731 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1673 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1732 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1674 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1733 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1796 1855
1797# the temporary/swap location 1856# the temporary/swap location
1798sub save_path { 1857sub save_path {
1799 my ($self) = @_; 1858 my ($self) = @_;
1800 1859
1801 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1860 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1802 "$TMPDIR/$path.map" 1861 "$TMPDIR/$path.map"
1803} 1862}
1804 1863
1805# the unique path, undef == no special unique path 1864# the unique path, undef == no special unique path
1806sub uniq_path { 1865sub uniq_path {
1807 my ($self) = @_; 1866 my ($self) = @_;
1808 1867
1809 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1810 "$UNIQUEDIR/$path" 1869 "$UNIQUEDIR/$path"
1811} 1870}
1812 1871
1813# and all this just because we cannot iterate over 1872# and all this just because we cannot iterate over
1814# all maps in C++... 1873# all maps in C++...
1912 1971
1913 cf::lock_wait "map_data:$path";#d#remove 1972 cf::lock_wait "map_data:$path";#d#remove
1914 cf::lock_wait "map_find:$path"; 1973 cf::lock_wait "map_find:$path";
1915 1974
1916 $cf::MAP{$path} || do { 1975 $cf::MAP{$path} || do {
1917 my $guard1 = cf::lock_acquire "map_find:$path";
1918 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";
1919 1978
1920 my $map = new_from_path cf::map $path 1979 my $map = new_from_path cf::map $path
1921 or return; 1980 or return;
1922 1981
1923 $map->{last_save} = $cf::RUNTIME; 1982 $map->{last_save} = $cf::RUNTIME;
1926 or return; 1985 or return;
1927 1986
1928 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1987 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1929 # doing this can freeze the server in a sync job, obviously 1988 # doing this can freeze the server in a sync job, obviously
1930 #$cf::WAIT_FOR_TICK->wait; 1989 #$cf::WAIT_FOR_TICK->wait;
1990 undef $guard2;
1931 undef $guard1; 1991 undef $guard1;
1932 undef $guard2;
1933 $map->reset; 1992 $map->reset;
1934 return find $path; 1993 return find $path;
1935 } 1994 }
1936 1995
1937 $cf::MAP{$path} = $map 1996 $cf::MAP{$path} = $map
1964 my $f = new_from_file cf::object::thawer $self->{load_path}; 2023 my $f = new_from_file cf::object::thawer $self->{load_path};
1965 $f->skip_block; 2024 $f->skip_block;
1966 $self->_load_objects ($f) 2025 $self->_load_objects ($f)
1967 or return; 2026 or return;
1968 2027
1969 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2028 $self->post_load_original
1970 if delete $self->{load_original}; 2029 if delete $self->{load_original};
1971 2030
1972 if (my $uniq = $self->uniq_path) { 2031 if (my $uniq = $self->uniq_path) {
1973 utf8::encode $uniq; 2032 utf8::encode $uniq;
1974 unless (aio_stat $uniq) { 2033 unless (aio_stat $uniq) {
2000 } 2059 }
2001 2060
2002 $self->{last_save} = $cf::RUNTIME; 2061 $self->{last_save} = $cf::RUNTIME;
2003 $self->last_access ($cf::RUNTIME); 2062 $self->last_access ($cf::RUNTIME);
2004 2063
2005 $self->in_memory (cf::MAP_IN_MEMORY); 2064 $self->in_memory (cf::MAP_ACTIVE);
2006 } 2065 }
2007 2066
2008 $self->post_load; 2067 $self->post_load;
2009} 2068}
2010 2069
2068 my ($path, $origin, $load) = @_; 2127 my ($path, $origin, $load) = @_;
2069 2128
2070 $path = normalise $path, $origin && $origin->{path}; 2129 $path = normalise $path, $origin && $origin->{path};
2071 2130
2072 if (my $map = $cf::MAP{$path}) { 2131 if (my $map = $cf::MAP{$path}) {
2073 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2132 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2074 } 2133 }
2075 2134
2076 $MAP_PREFETCH{$path} |= $load; 2135 $MAP_PREFETCH{$path} |= $load;
2077 2136
2078 $MAP_PREFETCHER ||= cf::async { 2137 $MAP_PREFETCHER ||= cf::async {
2115 cf::async { 2174 cf::async {
2116 $Coro::current->{desc} = "map player save"; 2175 $Coro::current->{desc} = "map player save";
2117 $_->contr->save for $self->players; 2176 $_->contr->save for $self->players;
2118 }; 2177 };
2119 2178
2179 cf::get_slot 0.02;
2180
2120 if ($uniq) { 2181 if ($uniq) {
2121 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2182 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2122 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2183 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2123 } else { 2184 } else {
2124 $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);
2132 $self->save; 2193 $self->save;
2133 2194
2134 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2195 my $lock = cf::lock_acquire "map_data:$self->{path}";
2135 2196
2136 return if $self->players; 2197 return if $self->players;
2137 return if $self->in_memory != cf::MAP_IN_MEMORY; 2198 return if $self->in_memory != cf::MAP_ACTIVE;
2138 return if $self->{deny_save}; 2199 return if $self->{deny_save};
2139 2200
2140 $self->in_memory (cf::MAP_SWAPPED); 2201 $self->in_memory (cf::MAP_SWAPPED);
2141 2202
2142 $self->deactivate; 2203 $self->deactivate;
2260 2321
2261sub unique_maps() { 2322sub unique_maps() {
2262 [ 2323 [
2263 map { 2324 map {
2264 utf8::decode $_; 2325 utf8::decode $_;
2265 /\.map$/ 2326 s/\.map$//; # TODO future compatibility hack
2327 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2328 ? ()
2266 ? normalise $_ 2329 : normalise $_
2267 : ()
2268 } @{ aio_readdir $UNIQUEDIR or [] } 2330 } @{ aio_readdir $UNIQUEDIR or [] }
2269 ] 2331 ]
2270} 2332}
2271 2333
2272package cf;
2273
2274=back 2334=back
2275 2335
2276=head3 cf::object 2336=head3 cf::object
2277 2337
2278=cut 2338=cut
2281 2341
2282=over 4 2342=over 4
2283 2343
2284=item $ob->inv_recursive 2344=item $ob->inv_recursive
2285 2345
2286Returns 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.
2287 2348
2288=cut 2349=cut
2289 2350
2290sub inv_recursive_; 2351sub inv_recursive_;
2291sub inv_recursive_ { 2352sub inv_recursive_ {
2296 inv_recursive_ inv $_[0] 2357 inv_recursive_ inv $_[0]
2297} 2358}
2298 2359
2299=item $ref = $ob->ref 2360=item $ref = $ob->ref
2300 2361
2301creates 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.
2302 2363
2303=item $ob = cf::object::deref ($refstring) 2364=item $ob = cf::object::deref ($refstring)
2304 2365
2305returns 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,
2306even if the object actually exists. May block. 2367even if the object actually exists. May block.
2338can 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
2339dialogue with the given NPC character. 2400dialogue with the given NPC character.
2340 2401
2341=cut 2402=cut
2342 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
2343# rough implementation of a future "reply" method that works 2418# rough implementation of a future "reply" method that works
2344# with dialog boxes. 2419# with dialog boxes.
2345#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
2346sub cf::object::player::reply($$$;$) { 2421sub cf::object::player::reply($$$;$) {
2347 my ($self, $npc, $msg, $flags) = @_; 2422 my ($self, $npc, $msg, $flags) = @_;
2358 my $dialog = $pl->{npc_dialog}; 2433 my $dialog = $pl->{npc_dialog};
2359 $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));
2360 2435
2361 } else { 2436 } else {
2362 $msg = $npc->name . " says: $msg" if $npc; 2437 $msg = $npc->name . " says: $msg" if $npc;
2363 $self->message ($msg, $flags); 2438 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2364 } 2439 }
2365 } 2440 }
2366} 2441}
2367 2442
2368=item $object->send_msg ($channel, $msg, $color, [extra...]) 2443=item $object->send_msg ($channel, $msg, $color, [extra...])
2393 2468
2394=item $player_object->enter_link 2469=item $player_object->enter_link
2395 2470
2396Freezes 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}>).
2397 2472
2398The 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.
2399I<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.
2400 2477
2401Will never block. 2478Will never block.
2402 2479
2403=item $player_object->leave_link ($map, $x, $y) 2480=item $player_object->leave_link ($map, $x, $y)
2404 2481
2462 2539
2463 $map->load; 2540 $map->load;
2464 $map->load_neighbours; 2541 $map->load_neighbours;
2465 2542
2466 return unless $self->contr->active; 2543 return unless $self->contr->active;
2544 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2467 $self->activate_recursive; 2545 $self->activate_recursive;
2468 2546
2469 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2547 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2470 $self->enter_map ($map, $x, $y); 2548 $self->enter_map ($map, $x, $y);
2471} 2549}
2475Moves 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
2476her, loading and preparing them map, calling the provided $check callback 2554her, loading and preparing them map, calling the provided $check callback
2477that 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
2478the 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
2479be 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 >>.
2480 2561
2481=cut 2562=cut
2482 2563
2483our $GOTOGEN; 2564our $GOTOGEN;
2484 2565
2563} 2644}
2564 2645
2565sub prepare_random_map { 2646sub prepare_random_map {
2566 my ($exit) = @_; 2647 my ($exit) = @_;
2567 2648
2568 my $guard = cf::lock_acquire "exit_prepare:$exit";
2569
2570 # all this does is basically replace the /! path by 2649 # all this does is basically replace the /! path by
2571 # a new random map path (?random/...) with a seed 2650 # a new random map path (?random/...) with a seed
2572 # that depends on the exit object 2651 # that depends on the exit object
2573 2652
2574 my $rmp = parse_random_map_params $exit->msg; 2653 my $rmp = parse_random_map_params $exit->msg;
2576 if ($exit->map) { 2655 if ($exit->map) {
2577 $rmp->{region} = $exit->region->name; 2656 $rmp->{region} = $exit->region->name;
2578 $rmp->{origin_map} = $exit->map->path; 2657 $rmp->{origin_map} = $exit->map->path;
2579 $rmp->{origin_x} = $exit->x; 2658 $rmp->{origin_x} = $exit->x;
2580 $rmp->{origin_y} = $exit->y; 2659 $rmp->{origin_y} = $exit->y;
2660
2661 $exit->map->touch;
2581 } 2662 }
2582 2663
2583 $rmp->{random_seed} ||= $exit->random_seed; 2664 $rmp->{random_seed} ||= $exit->random_seed;
2584 2665
2585 my $data = cf::to_json $rmp; 2666 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2586 my $md5 = Digest::MD5::md5_hex $data; 2667 my $md5 = Digest::MD5::md5_hex $data;
2587 my $meta = "$RANDOMDIR/$md5.meta"; 2668 my $meta = "$RANDOMDIR/$md5.meta";
2588 2669
2589 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2670 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2590 aio_write $fh, 0, (length $data), $data, 0; 2671 aio_write $fh, 0, (length $data), $data, 0;
2591 undef $fh; 2672 undef $fh;
2592 aio_rename "$meta~", $meta; 2673 aio_rename "$meta~", $meta;
2593 2674
2675 my $slaying = "?random/$md5";
2676
2677 if ($exit->valid) {
2594 $exit->slaying ("?random/$md5"); 2678 $exit->slaying ("?random/$md5");
2595 $exit->msg (undef); 2679 $exit->msg (undef);
2680 }
2596 } 2681 }
2597} 2682}
2598 2683
2599sub cf::object::player::enter_exit { 2684sub cf::object::player::enter_exit {
2600 my ($self, $exit) = @_; 2685 my ($self, $exit) = @_;
2601 2686
2602 return unless $self->type == cf::PLAYER; 2687 return unless $self->type == cf::PLAYER;
2603 2688
2604 if ($exit->slaying eq "/!") {
2605 #TODO: this should de-fi-ni-te-ly not be a sync-job
2606 # the problem is that $exit might not survive long enough
2607 # so it needs to be done right now, right here
2608 cf::sync_job { prepare_random_map $exit };
2609 }
2610
2611 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2612 my $hp = $exit->stats->hp;
2613 my $sp = $exit->stats->sp;
2614
2615 $self->enter_link; 2689 $self->enter_link;
2616 2690
2617 # if exit is damned, update players death & WoR home-position
2618 $self->contr->savebed ($slaying, $hp, $sp)
2619 if $exit->flag (FLAG_DAMNED);
2620
2621 (async { 2691 (async {
2622 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2692 $Coro::current->{desc} = "enter_exit";
2623 2693
2624 $self->deactivate_recursive; # just to be sure
2625 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
2626 $self->goto ($slaying, $hp, $sp); 2709 $self->goto ($map, $x, $y);
2627 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
2628 1; 2715 1
2629 }) { 2716 }) {
2630 $self->message ("Something went wrong deep within the crossfire server. " 2717 $self->message ("Something went wrong deep within the deliantra server. "
2631 . "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. "
2632 . "Please report this to the dungeon master!", 2719 . "Please report this to the dungeon master!",
2633 cf::NDI_UNIQUE | cf::NDI_RED); 2720 cf::NDI_UNIQUE | cf::NDI_RED);
2634 2721
2635 warn "ERROR in enter_exit: $@"; 2722 warn "ERROR in enter_exit: $@";
2663the 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
2664the message unless the client supports the msg packet. 2751the message unless the client supports the msg packet.
2665 2752
2666=cut 2753=cut
2667 2754
2755# non-persistent channels (usually the info channel)
2668our %CHANNEL = ( 2756our %CHANNEL = (
2669 "c/identify" => { 2757 "c/identify" => {
2670 id => "infobox", 2758 id => "infobox",
2671 title => "Identify", 2759 title => "Identify",
2672 reply => undef, 2760 reply => undef,
2676 id => "infobox", 2764 id => "infobox",
2677 title => "Examine", 2765 title => "Examine",
2678 reply => undef, 2766 reply => undef,
2679 tooltip => "Signs and other items you examined", 2767 tooltip => "Signs and other items you examined",
2680 }, 2768 },
2769 "c/book" => {
2770 id => "infobox",
2771 title => "Book",
2772 reply => undef,
2773 tooltip => "The contents of a note or book",
2774 },
2681 "c/lookat" => { 2775 "c/lookat" => {
2682 id => "infobox", 2776 id => "infobox",
2683 title => "Look", 2777 title => "Look",
2684 reply => undef, 2778 reply => undef,
2685 tooltip => "What you saw there", 2779 tooltip => "What you saw there",
2686 }, 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 },
2687); 2817);
2688 2818
2689sub cf::client::send_msg { 2819sub cf::client::send_msg {
2690 my ($self, $channel, $msg, $color, @extra) = @_; 2820 my ($self, $channel, $msg, $color, @extra) = @_;
2691 2821
2692 $msg = $self->pl->expand_cfpod ($msg); 2822 $msg = $self->pl->expand_cfpod ($msg)
2823 unless $color & cf::NDI_VERBATIM;
2693 2824
2694 $color &= cf::NDI_CLIENT_MASK; # just in case... 2825 $color &= cf::NDI_CLIENT_MASK; # just in case...
2695 2826
2696 # check predefined channels, for the benefit of C 2827 # check predefined channels, for the benefit of C
2697 if ($CHANNEL{$channel}) { 2828 if ($CHANNEL{$channel}) {
2718 if ($self->can_msg) { 2849 if ($self->can_msg) {
2719 # default colour, mask it out 2850 # default colour, mask it out
2720 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2851 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2721 if $color & cf::NDI_DEF; 2852 if $color & cf::NDI_DEF;
2722 2853
2723 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2854 my $pkt = "msg "
2855 . $self->{json_coder}->encode (
2724 [$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);
2725 } else { 2870 } else {
2726 if ($color >= 0) { 2871 if ($color >= 0) {
2727 # replace some tags by gcfclient-compatible ones 2872 # replace some tags by gcfclient-compatible ones
2728 for ($msg) { 2873 for ($msg) {
2729 1 while 2874 1 while
2928 3073
2929The following functions and methods are available within a safe environment: 3074The following functions and methods are available within a safe environment:
2930 3075
2931 cf::object 3076 cf::object
2932 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
2933 insert remove name archname title slaying race decrease_ob_nr 3078 insert remove name archname title slaying race decrease split
2934 3079
2935 cf::object::player 3080 cf::object::player
2936 player 3081 player
2937 3082
2938 cf::player 3083 cf::player
2943 3088
2944=cut 3089=cut
2945 3090
2946for ( 3091for (
2947 ["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
2948 insert remove inv name archname title slaying race 3093 insert remove inv nrof name archname title slaying race
2949 decrease_ob_nr destroy)], 3094 decrease split destroy change_exp)],
2950 ["cf::object::player" => qw(player)], 3095 ["cf::object::player" => qw(player)],
2951 ["cf::player" => qw(peaceful)], 3096 ["cf::player" => qw(peaceful)],
2952 ["cf::map" => qw(trigger)], 3097 ["cf::map" => qw(trigger)],
2953) { 3098) {
2954 no strict 'refs'; 3099 no strict 'refs';
3059 { 3204 {
3060 my $faces = $facedata->{faceinfo}; 3205 my $faces = $facedata->{faceinfo};
3061 3206
3062 while (my ($face, $info) = each %$faces) { 3207 while (my ($face, $info) = each %$faces) {
3063 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3208 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3209
3064 cf::face::set_visibility $idx, $info->{visibility}; 3210 cf::face::set_visibility $idx, $info->{visibility};
3065 cf::face::set_magicmap $idx, $info->{magicmap}; 3211 cf::face::set_magicmap $idx, $info->{magicmap};
3066 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};
3067 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};
3068 3214
3069 cf::cede_to_tick; 3215 cf::cede_to_tick;
3070 } 3216 }
3071 3217
3072 while (my ($face, $info) = each %$faces) { 3218 while (my ($face, $info) = each %$faces) {
3073 next unless $info->{smooth}; 3219 next unless $info->{smooth};
3220
3074 my $idx = cf::face::find $face 3221 my $idx = cf::face::find $face
3075 or next; 3222 or next;
3223
3076 if (my $smooth = cf::face::find $info->{smooth}) { 3224 if (my $smooth = cf::face::find $info->{smooth}) {
3077 cf::face::set_smooth $idx, $smooth; 3225 cf::face::set_smooth $idx, $smooth;
3078 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3226 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3079 } else { 3227 } else {
3080 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3228 warn "smooth face '$info->{smooth}' not found for face '$face'";
3098 { 3246 {
3099 # TODO: for gcfclient pleasure, we should give resources 3247 # TODO: for gcfclient pleasure, we should give resources
3100 # that gcfclient doesn't grok a >10000 face index. 3248 # that gcfclient doesn't grok a >10000 face index.
3101 my $res = $facedata->{resource}; 3249 my $res = $facedata->{resource};
3102 3250
3103 my $soundconf = delete $res->{"res/sound.conf"};
3104
3105 while (my ($name, $info) = each %$res) { 3251 while (my ($name, $info) = each %$res) {
3252 if (defined $info->{type}) {
3106 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3253 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3107 my $data; 3254 my $data;
3108 3255
3109 if ($info->{type} & 1) { 3256 if ($info->{type} & 1) {
3110 # prepend meta info 3257 # prepend meta info
3111 3258
3112 my $meta = $enc->encode ({ 3259 my $meta = $enc->encode ({
3113 name => $name, 3260 name => $name,
3114 %{ $info->{meta} || {} }, 3261 %{ $info->{meta} || {} },
3115 }); 3262 });
3116 3263
3117 $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};
3118 } else { 3271 } else {
3119 $data = $info->{data}; 3272 $RESOURCE{$name} = $info;
3120 } 3273 }
3121 3274
3122 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3123 cf::face::set_type $idx, $info->{type};
3124
3125 cf::cede_to_tick; 3275 cf::cede_to_tick;
3126 } 3276 }
3127
3128 if ($soundconf) {
3129 $soundconf = $enc->decode (delete $soundconf->{data});
3130
3131 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3132 my $sound = $soundconf->{compat}[$_]
3133 or next;
3134
3135 my $face = cf::face::find "sound/$sound->[1]";
3136 cf::sound::set $sound->[0] => $face;
3137 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3138 }
3139
3140 while (my ($k, $v) = each %{$soundconf->{event}}) {
3141 my $face = cf::face::find "sound/$v";
3142 cf::sound::set $k => $face;
3143 }
3144 }
3145 } 3277 }
3278
3279 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3146 3280
3147 1 3281 1
3148} 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});
3149 3303
3150register_exticmd fx_want => sub { 3304register_exticmd fx_want => sub {
3151 my ($ns, $want) = @_; 3305 my ($ns, $want) = @_;
3152 3306
3153 while (my ($k, $v) = each %$want) { 3307 while (my ($k, $v) = each %$want) {
3154 $ns->fx_want ($k, $v); 3308 $ns->fx_want ($k, $v);
3155 } 3309 }
3156}; 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}
3157 3321
3158sub reload_regions { 3322sub reload_regions {
3159 # 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
3160 # for this (global event?) 3324 # for this (global event?)
3161 %ext::player_env::MUSIC_FACE_CACHE = (); 3325 %ext::player_env::MUSIC_FACE_CACHE = ();
3175} 3339}
3176 3340
3177sub reload_archetypes { 3341sub reload_archetypes {
3178 load_resource_file "$DATADIR/archetypes" 3342 load_resource_file "$DATADIR/archetypes"
3179 or die "unable to load archetypes\n"; 3343 or die "unable to load archetypes\n";
3180 #d# NEED to laod twice to resolve forward references
3181 # this really needs to be done in an extra post-pass
3182 # (which needs to be synchronous, so solve it differently)
3183 load_resource_file "$DATADIR/archetypes"
3184 or die "unable to load archetypes\n";
3185} 3344}
3186 3345
3187sub reload_treasures { 3346sub reload_treasures {
3188 load_resource_file "$DATADIR/treasures" 3347 load_resource_file "$DATADIR/treasures"
3189 or die "unable to load treasurelists\n"; 3348 or die "unable to load treasurelists\n";
3190} 3349}
3191 3350
3192sub reload_resources { 3351sub reload_resources {
3193 warn "reloading resource files...\n"; 3352 warn "reloading resource files...\n";
3194 3353
3354 reload_facedata;
3355 reload_archetypes;
3195 reload_regions; 3356 reload_regions;
3196 reload_facedata;
3197 #reload_archetypes;#d#
3198 reload_archetypes;
3199 reload_treasures; 3357 reload_treasures;
3200 3358
3201 warn "finished reloading resource files\n"; 3359 warn "finished reloading resource files\n";
3202}
3203
3204sub init {
3205 reload_resources;
3206} 3360}
3207 3361
3208sub reload_config { 3362sub reload_config {
3209 open my $fh, "<:utf8", "$CONFDIR/config" 3363 open my $fh, "<:utf8", "$CONFDIR/config"
3210 or return; 3364 or return;
3211 3365
3212 local $/; 3366 local $/;
3213 *CFG = YAML::Syck::Load <$fh>; 3367 *CFG = YAML::Load <$fh>;
3214 3368
3215 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3369 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3216 3370
3217 $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};
3218 $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};
3224 }; 3378 };
3225 warn $@ if $@; 3379 warn $@ if $@;
3226 } 3380 }
3227} 3381}
3228 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
3229sub 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
3230 # we must not ever block the main coroutine 3418 # we must not ever block the main coroutine
3231 local $Coro::idle = sub { 3419 local $Coro::idle = sub {
3232 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#
3233 (async { 3421 (async {
3234 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3422 $Coro::current->{desc} = "IDLE BUG HANDLER";
3235 Event::one_event; 3423 EV::loop EV::LOOP_ONESHOT;
3236 })->prio (Coro::PRIO_MAX); 3424 })->prio (Coro::PRIO_MAX);
3237 }; 3425 };
3238 3426
3427 evthread_start IO::AIO::poll_fileno;
3428
3429 cf::sync_job {
3430 reload_resources;
3239 reload_config; 3431 reload_config;
3240 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
3241 load_extensions; 3445 load_extensions;
3242 3446
3243 $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
3244 Event::loop; 3455 EV::loop;
3245} 3456}
3246 3457
3247############################################################################# 3458#############################################################################
3248# initialisation and cleanup 3459# initialisation and cleanup
3249 3460
3250# install some emergency cleanup handlers 3461# install some emergency cleanup handlers
3251BEGIN { 3462BEGIN {
3463 our %SIGWATCHER = ();
3252 for my $signal (qw(INT HUP TERM)) { 3464 for my $signal (qw(INT HUP TERM)) {
3253 Event->signal ( 3465 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3254 reentrant => 0,
3255 data => WF_AUTOCANCEL,
3256 signal => $signal,
3257 prio => 0,
3258 cb => sub {
3259 cf::cleanup "SIG$signal"; 3466 cf::cleanup "SIG$signal";
3260 },
3261 ); 3467 };
3262 } 3468 }
3263} 3469}
3264 3470
3265sub write_runtime { 3471sub write_runtime_sync {
3266 my $runtime = "$LOCALDIR/runtime";
3267
3268 # first touch the runtime file to show we are still running: 3472 # first touch the runtime file to show we are still running:
3269 # the fsync below can take a very very long time. 3473 # the fsync below can take a very very long time.
3270 3474
3271 IO::AIO::aio_utime $runtime, undef, undef; 3475 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3272 3476
3273 my $guard = cf::lock_acquire "write_runtime"; 3477 my $guard = cf::lock_acquire "write_runtime";
3274 3478
3275 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3479 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3276 or return; 3480 or return;
3277 3481
3278 my $value = $cf::RUNTIME + 90 + 10; 3482 my $value = $cf::RUNTIME + 90 + 10;
3279 # 10 is the runtime save interval, for a monotonic clock 3483 # 10 is the runtime save interval, for a monotonic clock
3280 # 60 allows for the watchdog to kill the server. 3484 # 60 allows for the watchdog to kill the server.
3290 aio_utime $fh, undef, undef; 3494 aio_utime $fh, undef, undef;
3291 3495
3292 close $fh 3496 close $fh
3293 or return; 3497 or return;
3294 3498
3295 aio_rename "$runtime~", $runtime 3499 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3296 and return; 3500 and return;
3297 3501
3298 warn "runtime file written.\n"; 3502 warn "runtime file written.\n";
3299 3503
3300 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 };
3301} 3555}
3302 3556
3303sub emergency_save() { 3557sub emergency_save() {
3304 my $freeze_guard = cf::freeze_mainloop; 3558 my $freeze_guard = cf::freeze_mainloop;
3305 3559
3327 warn "end emergency map save\n"; 3581 warn "end emergency map save\n";
3328 3582
3329 warn "begin emergency database checkpoint\n"; 3583 warn "begin emergency database checkpoint\n";
3330 BDB::db_env_txn_checkpoint $DB_ENV; 3584 BDB::db_env_txn_checkpoint $DB_ENV;
3331 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";
3332 }; 3590 };
3333 3591
3334 warn "leave emergency perl save\n"; 3592 warn "leave emergency perl save\n";
3335} 3593}
3336 3594
3337sub post_cleanup { 3595sub post_cleanup {
3338 my ($make_core) = @_; 3596 my ($make_core) = @_;
3339 3597
3340 warn Carp::longmess "post_cleanup backtrace" 3598 warn Carp::longmess "post_cleanup backtrace"
3341 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#
3342} 3629}
3343 3630
3344sub do_reload_perl() { 3631sub do_reload_perl() {
3345 # can/must only be called in main 3632 # can/must only be called in main
3346 if ($Coro::current != $Coro::main) { 3633 if ($Coro::current != $Coro::main) {
3347 warn "can only reload from main coroutine"; 3634 warn "can only reload from main coroutine";
3348 return; 3635 return;
3349 } 3636 }
3350 3637
3638 return if $RELOAD++;
3639
3640 while ($RELOAD) {
3351 warn "reloading..."; 3641 warn "reloading...";
3352 3642
3353 warn "entering sync_job"; 3643 warn "entering sync_job";
3354 3644
3355 cf::sync_job { 3645 cf::sync_job {
3356 cf::write_runtime; # external watchdog should not bark 3646 cf::write_runtime_sync; # external watchdog should not bark
3357 cf::emergency_save; 3647 cf::emergency_save;
3358 cf::write_runtime; # external watchdog should not bark 3648 cf::write_runtime_sync; # external watchdog should not bark
3359 3649
3360 warn "syncing database to disk"; 3650 warn "syncing database to disk";
3361 BDB::db_env_txn_checkpoint $DB_ENV; 3651 BDB::db_env_txn_checkpoint $DB_ENV;
3362 3652
3363 # 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
3364 3654
3365 warn "cancelling all WF_AUTOCANCEL watchers";
3366 for (Event::all_watchers) {
3367 $_->cancel if $_->data & WF_AUTOCANCEL;
3368 }
3369
3370 warn "flushing outstanding aio requests"; 3655 warn "flushing outstanding aio requests";
3371 for (;;) {
3372 BDB::flush;
3373 IO::AIO::flush;
3374 Coro::cede;
3375 last unless IO::AIO::nreqs || BDB::nreqs; 3656 while (IO::AIO::nreqs || BDB::nreqs) {
3376 warn "iterate..."; 3657 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3377 }
3378
3379 ++$RELOAD;
3380
3381 warn "cancelling all extension coros";
3382 $_->cancel for values %EXT_CORO;
3383 %EXT_CORO = ();
3384
3385 warn "removing commands";
3386 %COMMAND = ();
3387
3388 warn "removing ext/exti commands";
3389 %EXTCMD = ();
3390 %EXTICMD = ();
3391
3392 warn "unloading/nuking all extensions";
3393 for my $pkg (@EXTS) {
3394 warn "... unloading $pkg";
3395
3396 if (my $cb = $pkg->can ("unload")) {
3397 eval {
3398 $cb->($pkg);
3399 1
3400 } or warn "$pkg unloaded, but with errors: $@";
3401 } 3658 }
3402 3659
3403 warn "... nuking $pkg"; 3660 warn "cancelling all extension coros";
3404 Symbol::delete_package $pkg; 3661 $_->cancel for values %EXT_CORO;
3405 } 3662 %EXT_CORO = ();
3406 3663
3407 warn "unloading all perl modules loaded from $LIBDIR"; 3664 warn "removing commands";
3408 while (my ($k, $v) = each %INC) { 3665 %COMMAND = ();
3409 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3410 3666
3667 warn "removing ext/exti commands";
3668 %EXTCMD = ();
3669 %EXTICMD = ();
3670
3671 warn "unloading/nuking all extensions";
3672 for my $pkg (@EXTS) {
3411 warn "... unloading $k"; 3673 warn "... unloading $pkg";
3412 delete $INC{$k};
3413 3674
3414 $k =~ s/\.pm$//;
3415 $k =~ s/\//::/g;
3416
3417 if (my $cb = $k->can ("unload_module")) { 3675 if (my $cb = $pkg->can ("unload")) {
3676 eval {
3418 $cb->(); 3677 $cb->($pkg);
3678 1
3679 } or warn "$pkg unloaded, but with errors: $@";
3680 }
3681
3682 warn "... clearing $pkg";
3683 clear_package $pkg;
3419 } 3684 }
3420 3685
3421 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;
3422 } 3701 }
3423 3702
3424 warn "getting rid of safe::, as good as possible"; 3703 warn "getting rid of safe::, as good as possible";
3425 Symbol::delete_package "safe::$_" 3704 clear_package "safe::$_"
3426 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);
3427 3706
3428 warn "unloading cf.pm \"a bit\""; 3707 warn "unloading cf.pm \"a bit\"";
3429 delete $INC{"cf.pm"}; 3708 delete $INC{"cf.pm"};
3430 delete $INC{"cf/pod.pm"}; 3709 delete $INC{"cf/pod.pm"};
3431 3710
3432 # don't, removes xs symbols, too, 3711 # don't, removes xs symbols, too,
3433 # and global variables created in xs 3712 # and global variables created in xs
3434 #Symbol::delete_package __PACKAGE__; 3713 #clear_package __PACKAGE__;
3435 3714
3436 warn "unload completed, starting to reload now"; 3715 warn "unload completed, starting to reload now";
3437 3716
3438 warn "reloading cf.pm"; 3717 warn "reloading cf.pm";
3439 require cf; 3718 require cf;
3440 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3719 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3441 3720
3442 warn "loading config and database again"; 3721 warn "loading config and database again";
3443 cf::reload_config; 3722 cf::reload_config;
3444 3723
3445 warn "loading extensions"; 3724 warn "loading extensions";
3446 cf::load_extensions; 3725 cf::load_extensions;
3447 3726
3448 warn "reattaching attachments to objects/players"; 3727 warn "reattaching attachments to objects/players";
3449 _global_reattach; # objects, sockets 3728 _global_reattach; # objects, sockets
3450 warn "reattaching attachments to maps"; 3729 warn "reattaching attachments to maps";
3451 reattach $_ for values %MAP; 3730 reattach $_ for values %MAP;
3452 warn "reattaching attachments to players"; 3731 warn "reattaching attachments to players";
3453 reattach $_ for values %PLAYER; 3732 reattach $_ for values %PLAYER;
3454 3733
3734 warn "running post_load";
3735 (pop @POST_INIT)->(1) while @POST_INIT;
3736
3455 warn "leaving sync_job"; 3737 warn "leaving sync_job";
3456 3738
3457 1 3739 1
3458 } or do { 3740 } or do {
3459 warn $@; 3741 warn $@;
3460 warn "error while reloading, exiting."; 3742 cf::cleanup "error while reloading, exiting.";
3461 exit 1;
3462 }; 3743 };
3463 3744
3464 warn "reloaded"; 3745 warn "reloaded";
3746 --$RELOAD;
3747 }
3465}; 3748};
3466 3749
3467our $RELOAD_WATCHER; # used only during reload 3750our $RELOAD_WATCHER; # used only during reload
3468 3751
3469sub reload_perl() { 3752sub reload_perl() {
3470 # doing reload synchronously and two reloads happen back-to-back, 3753 # doing reload synchronously and two reloads happen back-to-back,
3471 # coro crashes during coro_state_free->destroy here. 3754 # coro crashes during coro_state_free->destroy here.
3472 3755
3473 $RELOAD_WATCHER ||= Event->timer ( 3756 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub {
3474 reentrant => 0,
3475 after => 0,
3476 data => WF_AUTOCANCEL,
3477 cb => sub {
3478 do_reload_perl; 3757 do_reload_perl;
3479 undef $RELOAD_WATCHER; 3758 undef $RELOAD_WATCHER;
3480 },
3481 ); 3759 };
3482} 3760}
3483 3761
3484register_command "reload" => sub { 3762register_command "reload" => sub {
3485 my ($who, $arg) = @_; 3763 my ($who, $arg) = @_;
3486 3764
3499 3777
3500our @WAIT_FOR_TICK; 3778our @WAIT_FOR_TICK;
3501our @WAIT_FOR_TICK_BEGIN; 3779our @WAIT_FOR_TICK_BEGIN;
3502 3780
3503sub wait_for_tick { 3781sub wait_for_tick {
3504 return unless $TICK_WATCHER->is_active;
3505 return if $Coro::current == $Coro::main; 3782 return if tick_inhibit || $Coro::current == $Coro::main;
3506 3783
3507 my $signal = new Coro::Signal; 3784 my $signal = new Coro::Signal;
3508 push @WAIT_FOR_TICK, $signal; 3785 push @WAIT_FOR_TICK, $signal;
3509 $signal->wait; 3786 $signal->wait;
3510} 3787}
3511 3788
3512sub wait_for_tick_begin { 3789sub wait_for_tick_begin {
3513 return unless $TICK_WATCHER->is_active;
3514 return if $Coro::current == $Coro::main; 3790 return if tick_inhibit || $Coro::current == $Coro::main;
3515 3791
3516 my $signal = new Coro::Signal; 3792 my $signal = new Coro::Signal;
3517 push @WAIT_FOR_TICK_BEGIN, $signal; 3793 push @WAIT_FOR_TICK_BEGIN, $signal;
3518 $signal->wait; 3794 $signal->wait;
3519} 3795}
3520 3796
3521$TICK_WATCHER = Event->timer ( 3797sub tick {
3522 reentrant => 0,
3523 parked => 1,
3524 prio => 0,
3525 at => $NEXT_TICK || $TICK,
3526 data => WF_AUTOCANCEL,
3527 cb => sub {
3528 if ($Coro::current != $Coro::main) { 3798 if ($Coro::current != $Coro::main) {
3529 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"
3530 unless ++$bug_warning > 10; 3800 unless ++$bug_warning > 10;
3531 return; 3801 return;
3532 } 3802 }
3533 3803
3534 $NOW = $tick_start = Event::time;
3535
3536 cf::server_tick; # one server iteration 3804 cf::server_tick; # one server iteration
3537 3805
3538 $RUNTIME += $TICK;
3539 $NEXT_TICK += $TICK;
3540
3541 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3806 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3542 $NEXT_RUNTIME_WRITE = $NOW + 10; 3807 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3543 Coro::async_pool { 3808 Coro::async_pool {
3544 $Coro::current->{desc} = "runtime saver"; 3809 $Coro::current->{desc} = "runtime saver";
3545 write_runtime 3810 write_runtime_sync
3546 or warn "ERROR: unable to write runtime file: $!"; 3811 or warn "ERROR: unable to write runtime file: $!";
3547 };
3548 } 3812 };
3813 }
3549 3814
3550 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3815 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3551 $sig->send; 3816 $sig->send;
3552 } 3817 }
3553 while (my $sig = shift @WAIT_FOR_TICK) { 3818 while (my $sig = shift @WAIT_FOR_TICK) {
3554 $sig->send; 3819 $sig->send;
3555 } 3820 }
3556 3821
3557 $NOW = Event::time; 3822 $LOAD = ($NOW - $TICK_START) / $TICK;
3558
3559 # if we are delayed by four ticks or more, skip them all
3560 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3561
3562 $TICK_WATCHER->at ($NEXT_TICK);
3563 $TICK_WATCHER->start;
3564
3565 $LOAD = ($NOW - $tick_start) / $TICK;
3566 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3823 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3567 3824
3568 _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 }
3569 }, 3831 }
3570); 3832}
3571 3833
3572{ 3834{
3835 # configure BDB
3836
3573 BDB::min_parallel 8; 3837 BDB::min_parallel 8;
3574 BDB::max_poll_time $TICK * 0.1; 3838 BDB::max_poll_reqs $TICK * 0.1;
3575 $BDB_POLL_WATCHER = Event->io ( 3839 $AnyEvent::BDB::WATCHER->priority (1);
3576 reentrant => 0,
3577 fd => BDB::poll_fileno,
3578 poll => 'r',
3579 prio => 0,
3580 data => WF_AUTOCANCEL,
3581 cb => \&BDB::poll_cb,
3582 );
3583
3584 BDB::set_sync_prepare {
3585 my $status;
3586 my $current = $Coro::current;
3587 (
3588 sub {
3589 $status = $!;
3590 $current->ready; undef $current;
3591 },
3592 sub {
3593 Coro::schedule while defined $current;
3594 $! = $status;
3595 },
3596 )
3597 };
3598 3840
3599 unless ($DB_ENV) { 3841 unless ($DB_ENV) {
3600 $DB_ENV = BDB::db_env_create; 3842 $DB_ENV = BDB::db_env_create;
3601 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3843 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3602 | 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;
3603 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3846 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3604 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3847 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3605 3848
3606 cf::sync_job { 3849 cf::sync_job {
3607 eval { 3850 eval {
3617 3860
3618 cf::cleanup "db_env_open(db): $@" if $@; 3861 cf::cleanup "db_env_open(db): $@" if $@;
3619 }; 3862 };
3620 } 3863 }
3621 3864
3622 $BDB_DEADLOCK_WATCHER = Event->timer ( 3865 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3623 after => 3,
3624 interval => 1,
3625 hard => 1,
3626 prio => 0,
3627 data => WF_AUTOCANCEL,
3628 cb => sub {
3629 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 { };
3630 },
3631 ); 3867 };
3632 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3868 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3633 after => 11,
3634 interval => 60,
3635 hard => 1,
3636 prio => 0,
3637 data => WF_AUTOCANCEL,
3638 cb => sub {
3639 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3869 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3640 },
3641 ); 3870 };
3642 $BDB_TRICKLE_WATCHER = Event->timer ( 3871 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3643 after => 5,
3644 interval => 10,
3645 hard => 1,
3646 prio => 0,
3647 data => WF_AUTOCANCEL,
3648 cb => sub {
3649 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3872 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3650 },
3651 ); 3873 };
3652} 3874}
3653 3875
3654{ 3876{
3877 # configure IO::AIO
3878
3655 IO::AIO::min_parallel 8; 3879 IO::AIO::min_parallel 8;
3656
3657 undef $Coro::AIO::WATCHER;
3658 IO::AIO::max_poll_time $TICK * 0.1; 3880 IO::AIO::max_poll_time $TICK * 0.1;
3659 $AIO_POLL_WATCHER = Event->io ( 3881 undef $AnyEvent::AIO::WATCHER;
3660 reentrant => 0,
3661 data => WF_AUTOCANCEL,
3662 fd => IO::AIO::poll_fileno,
3663 poll => 'r',
3664 prio => 0,
3665 cb => \&IO::AIO::poll_cb,
3666 );
3667} 3882}
3668 3883
3669my $_log_backtrace; 3884my $_log_backtrace;
3670 3885
3671sub _log_backtrace { 3886sub _log_backtrace {
3674 $msg =~ s/\n//; 3889 $msg =~ s/\n//;
3675 3890
3676 # limit the # of concurrent backtraces 3891 # limit the # of concurrent backtraces
3677 if ($_log_backtrace < 2) { 3892 if ($_log_backtrace < 2) {
3678 ++$_log_backtrace; 3893 ++$_log_backtrace;
3894 my $perl_bt = Carp::longmess $msg;
3679 async { 3895 async {
3680 $Coro::current->{desc} = "abt $msg"; 3896 $Coro::current->{desc} = "abt $msg";
3681 3897
3682 my @bt = fork_call { 3898 my @bt = fork_call {
3683 @addr = map { sprintf "%x", $_ } @addr; 3899 @addr = map { sprintf "%x", $_ } @addr;
3694 } 3910 }
3695 3911
3696 @funcs 3912 @funcs
3697 }; 3913 };
3698 3914
3699 LOG llevInfo, "[ABT] $msg\n"; 3915 LOG llevInfo, "[ABT] $perl_bt\n";
3916 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3700 LOG llevInfo, "[ABT] $_\n" for @bt; 3917 LOG llevInfo, "[ABT] $_\n" for @bt;
3701 --$_log_backtrace; 3918 --$_log_backtrace;
3702 }; 3919 };
3703 } else { 3920 } else {
3704 LOG llevInfo, "[ABT] $msg\n"; 3921 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines