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.379 by root, Thu Oct 4 23:59:07 2007 UTC vs.
Revision 1.447 by root, Fri Sep 19 01:39:45 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
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 Storable; 31use EV;
10use Event;
11use Opcode; 32use Opcode;
12use Safe; 33use Safe;
13use Safe::Hole; 34use Safe::Hole;
35use Storable ();
14 36
15use Coro 3.64 (); 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.32 (); 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
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 68Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42 69
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 70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 71
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 73
52our %COMMAND = (); 74our %COMMAND = ();
59our %EXT_MAP = (); # pluggable maps 81our %EXT_MAP = (); # pluggable maps
60 82
61our $RELOAD; # number of reloads so far 83our $RELOAD; # number of reloads so far
62our @EVENT; 84our @EVENT;
63 85
64our $CONFDIR = confdir; 86our $CONFDIR = confdir;
65our $DATADIR = datadir; 87our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 88our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 89our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 90our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 91our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 92our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 94our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 95our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 96our $BDBDIR = "$LOCALDIR/db";
97our $PIDFILE = "$LOCALDIR/pid";
98our $RUNTIMEFILE = "$LOCALDIR/runtime";
99
100our %RESOURCE;
75 101
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 102our $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 103our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 104our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 105our $USE_FSYNC = 1; # use fsync to write maps - default off
83 106
84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 107our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 108our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 109our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 110our $DB_ENV;
89 111
90our %CFG; 112our %CFG;
91 113
92our $UPTIME; $UPTIME ||= time; 114our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 115our $RUNTIME;
116our $NOW;
94 117
95our (%PLAYER, %PLAYER_LOADING); # all users 118our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 119our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 120our $LINK_MAP; # the special {link} map, which is always available
98 121
99# used to convert map paths into valid unix filenames by replacing / by ∕ 122# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 123our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 124
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 125our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 126our $LOADAVG; # same thing, but with alpha-smoothing
127our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 128our $TICK_START; # for load detecting purposes
105 129
106binmode STDOUT; 130binmode STDOUT;
107binmode STDERR; 131binmode STDERR;
108 132
109# read virtual server time, if available 133# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 134unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 135 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 136 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 137 $RUNTIME = <$fh> + 0.;
114} 138}
115 139
116mkdir $_ 140mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 141 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
162 186
163The raw value load value from the last tick. 187The raw value load value from the last tick.
164 188
165=item %cf::CFG 189=item %cf::CFG
166 190
167Configuration for the server, loaded from C</etc/crossfire/config>, or 191Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 192from wherever your confdir points to.
169 193
170=item cf::wait_for_tick, cf::wait_for_tick_begin 194=item cf::wait_for_tick, cf::wait_for_tick_begin
171 195
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 196These 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; 217 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 218
195 LOG llevError, $msg; 219 LOG llevError, $msg;
196 }; 220 };
197} 221}
222
223$Coro::State::DIEHOOK = sub {
224 return unless $^S eq 0; # "eq", not "=="
225
226 if ($Coro::current == $Coro::main) {#d#
227 warn "DIEHOOK called in main context, Coro bug?\n";#d#
228 return;#d#
229 }#d#
230
231 # kill coroutine otherwise
232 warn Carp::longmess $_[0];
233 Coro::terminate
234};
235
236$SIG{__DIE__} = sub { }; #d#?
198 237
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 238@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 239@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 240@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 241@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 248for my $pkg (qw(
210 cf::global cf::attachable 249 cf::global cf::attachable
211 cf::object cf::object::player 250 cf::object cf::object::player
212 cf::client cf::player 251 cf::client cf::player
213 cf::arch cf::living 252 cf::arch cf::living
253 cf::map cf::mapspace
214 cf::map cf::party cf::region 254 cf::party cf::region
215)) { 255)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 256 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 257}
219 258
220$Event::DIED = sub { 259$EV::DIED = sub {
221 warn "error in event callback: @_"; 260 warn "error in event callback: @_";
222}; 261};
223 262
224############################################################################# 263#############################################################################
225 264
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 287 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 288 $d
250 } || "[unable to dump $_[0]: '$@']"; 289 } || "[unable to dump $_[0]: '$@']";
251} 290}
252 291
253=item $ref = cf::from_json $json 292=item $ref = cf::decode_json $json
254 293
255Converts a JSON string into the corresponding perl data structure. 294Converts a JSON string into the corresponding perl data structure.
256 295
257=item $json = cf::to_json $ref 296=item $json = cf::encode_json $ref
258 297
259Converts a perl data structure into its JSON representation. 298Converts a perl data structure into its JSON representation.
260 299
261=cut 300=cut
262 301
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 302our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 303
265sub to_json ($) { $json_coder->encode ($_[0]) } 304sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 305sub decode_json($) { $json_coder->decode ($_[0]) }
267 306
268=item cf::lock_wait $string 307=item cf::lock_wait $string
269 308
270Wait until the given lock is available. See cf::lock_acquire. 309Wait until the given lock is available. See cf::lock_acquire.
271 310
327 366
328 ! ! $LOCK{$key} 367 ! ! $LOCK{$key}
329} 368}
330 369
331sub freeze_mainloop { 370sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 371 tick_inhibit_inc;
333 372
334 my $guard = Coro::guard { 373 Coro::guard \&tick_inhibit_dec;
335 $TICK_WATCHER->start; 374}
336 }; 375
337 $TICK_WATCHER->stop; 376=item cf::periodic $interval, $cb
338 $guard 377
378Like EV::periodic, but randomly selects a starting point so that the actions
379get spread over timer.
380
381=cut
382
383sub periodic($$) {
384 my ($interval, $cb) = @_;
385
386 my $start = rand List::Util::min 180, $interval;
387
388 EV::periodic $start, $interval, 0, $cb
339} 389}
340 390
341=item cf::get_slot $time[, $priority[, $name]] 391=item cf::get_slot $time[, $priority[, $name]]
342 392
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 393Allocate $time seconds of blocking CPU time at priority C<$priority>:
373 } 423 }
374 } 424 }
375 } 425 }
376 426
377 if (@SLOT_QUEUE) { 427 if (@SLOT_QUEUE) {
378 # we do not use wait_For_tick() as it returns immediately when tick is inactive 428 # we do not use wait_for_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal; 429 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait; 430 $signal->wait;
381 } else { 431 } else {
382 Coro::schedule; 432 Coro::schedule;
383 } 433 }
384 } 434 }
385}; 435};
386 436
387sub get_slot($;$$) { 437sub get_slot($;$$) {
438 return if tick_inhibit || $Coro::current == $Coro::main;
439
388 my ($time, $pri, $name) = @_; 440 my ($time, $pri, $name) = @_;
389 441
390 $time = $TICK * .6 if $time > $TICK * .6; 442 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal; 443 my $sig = new Coro::Signal;
392 444
406 458
407BEGIN { *async = \&Coro::async_pool } 459BEGIN { *async = \&Coro::async_pool }
408 460
409=item cf::sync_job { BLOCK } 461=item cf::sync_job { BLOCK }
410 462
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 463The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 464is 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 465partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 466acceptable.
415 467
416If it must be done, put the blocking parts into C<sync_job>. This will run 468If 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 469the given BLOCK in another coroutine while waiting for the result. The
422 474
423sub sync_job(&) { 475sub sync_job(&) {
424 my ($job) = @_; 476 my ($job) = @_;
425 477
426 if ($Coro::current == $Coro::main) { 478 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 479 my $time = EV::time;
428 480
429 # this is the main coro, too bad, we have to block 481 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 482 # till the operation succeeds, freezing the server :/
431 483
432 LOG llevError | logBacktrace, Carp::longmess "sync job";#d# 484 LOG llevError, Carp::longmess "sync job";#d#
433 485
434 # TODO: use suspend/resume instead
435 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 486 my $freeze_guard = freeze_mainloop;
437 487
438 my $busy = 1; 488 my $busy = 1;
439 my @res; 489 my @res;
440 490
444 warn $@ if $@; 494 warn $@ if $@;
445 undef $busy; 495 undef $busy;
446 })->prio (Coro::PRIO_MAX); 496 })->prio (Coro::PRIO_MAX);
447 497
448 while ($busy) { 498 while ($busy) {
449 Coro::cede or Event::one_event; 499 if (Coro::nready) {
500 Coro::cede_notself;
501 } else {
502 EV::loop EV::LOOP_ONESHOT;
450 } 503 }
504 }
451 505
452 $time = Event::time - $time; 506 my $time = EV::time - $time;
453 507
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 508 $TICK_START += $time; # do not account sync jobs to server load
458 509
459 wantarray ? @res : $res[0] 510 wantarray ? @res : $res[0]
460 } else { 511 } else {
461 # we are in another coroutine, how wonderful, everything just works 512 # we are in another coroutine, how wonderful, everything just works
462 513
487=item fork_call { }, $args 538=item fork_call { }, $args
488 539
489Executes the given code block with the given arguments in a seperate 540Executes the given code block with the given arguments in a seperate
490process, returning the results. Everything must be serialisable with 541process, returning the results. Everything must be serialisable with
491Coro::Storable. May, of course, block. Note that the executed sub may 542Coro::Storable. May, of course, block. Note that the executed sub may
492never block itself or use any form of Event handling. 543never block itself or use any form of event handling.
493 544
494=cut 545=cut
495 546
496sub fork_call(&@) { 547sub fork_call(&@) {
497 my ($cb, @args) = @_; 548 my ($cb, @args) = @_;
504 reset_signals; 555 reset_signals;
505 &$cb 556 &$cb
506 }, @args; 557 }, @args;
507 558
508 wantarray ? @res : $res[-1] 559 wantarray ? @res : $res[-1]
560}
561
562=item $coin = coin_from_name $name
563
564=cut
565
566our %coin_alias = (
567 "silver" => "silvercoin",
568 "silvercoin" => "silvercoin",
569 "silvercoins" => "silvercoin",
570 "gold" => "goldcoin",
571 "goldcoin" => "goldcoin",
572 "goldcoins" => "goldcoin",
573 "platinum" => "platinacoin",
574 "platinumcoin" => "platinacoin",
575 "platinumcoins" => "platinacoin",
576 "platina" => "platinacoin",
577 "platinacoin" => "platinacoin",
578 "platinacoins" => "platinacoin",
579 "royalty" => "royalty",
580 "royalties" => "royalty",
581);
582
583sub coin_from_name($) {
584 $coin_alias{$_[0]}
585 ? cf::arch::find $coin_alias{$_[0]}
586 : undef
509} 587}
510 588
511=item $value = cf::db_get $family => $key 589=item $value = cf::db_get $family => $key
512 590
513Returns a single value from the environment database. 591Returns a single value from the environment database.
652 730
653############################################################################# 731#############################################################################
654 732
655=head2 ATTACHABLE OBJECTS 733=head2 ATTACHABLE OBJECTS
656 734
657Many objects in crossfire are so-called attachable objects. That means you can 735Many objects in deliantra are so-called attachable objects. That means you can
658attach callbacks/event handlers (a collection of which is called an "attachment") 736attach callbacks/event handlers (a collection of which is called an "attachment")
659to it. All such attachable objects support the following methods. 737to it. All such attachable objects support the following methods.
660 738
661In the following description, CLASS can be any of C<global>, C<object> 739In 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 740C<player>, C<client> or C<map> (i.e. the attachable objects in
663Crossfire TRT). 741Deliantra).
664 742
665=over 4 743=over 4
666 744
667=item $attachable->attach ($attachment, key => $value...) 745=item $attachable->attach ($attachment, key => $value...)
668 746
712=item cf::CLASS::attachment $name, ... 790=item cf::CLASS::attachment $name, ...
713 791
714Register an attachment by C<$name> through which attachable objects of the 792Register an attachment by C<$name> through which attachable objects of the
715given CLASS can refer to this attachment. 793given CLASS can refer to this attachment.
716 794
717Some classes such as crossfire maps and objects can specify attachments 795Some classes such as deliantra maps and objects can specify attachments
718that are attached at load/instantiate time, thus the need for a name. 796that are attached at load/instantiate time, thus the need for a name.
719 797
720These calls expect any number of the following handler/hook descriptions: 798These calls expect any number of the following handler/hook descriptions:
721 799
722=over 4 800=over 4
950 } 1028 }
951 1029
952 0 1030 0
953} 1031}
954 1032
955=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1033=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
956 1034
957=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1035=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
958 1036
959Generate an object-specific event with the given arguments. 1037Generate an object-specific event with the given arguments.
960 1038
966 1044
967=cut 1045=cut
968 1046
969############################################################################# 1047#############################################################################
970# object support 1048# object support
971#
972 1049
1050sub _object_equal($$);
1051sub _object_equal($$) {
1052 my ($a, $b) = @_;
1053
1054 return 0 unless (ref $a) eq (ref $b);
1055
1056 if ("HASH" eq ref $a) {
1057 my @ka = keys %$a;
1058 my @kb = keys %$b;
1059
1060 return 0 if @ka != @kb;
1061
1062 for (0 .. $#ka) {
1063 return 0 unless $ka[$_] eq $kb[$_];
1064 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1065 }
1066
1067 } elsif ("ARRAY" eq ref $a) {
1068
1069 return 0 if @$a != @$b;
1070
1071 for (0 .. $#$a) {
1072 return 0 unless _object_equal $a->[$_], $b->[$_];
1073 }
1074
1075 } elsif ($a ne $b) {
1076 return 0;
1077 }
1078
1079 1
1080}
1081
1082our $SLOW_MERGES;#d#
973sub _can_merge { 1083sub _can_merge {
974 my ($ob1, $ob2) = @_; 1084 my ($ob1, $ob2) = @_;
975 1085
976 local $Storable::canonical = 1; 1086 ++$SLOW_MERGES;#d#
977 my $fob1 = Storable::freeze $ob1;
978 my $fob2 = Storable::freeze $ob2;
979 1087
980 $fob1 eq $fob2 1088 # we do the slow way here
1089 return _object_equal $ob1, $ob2
981} 1090}
982 1091
983sub reattach { 1092sub reattach {
984 # basically do the same as instantiate, without calling instantiate 1093 # basically do the same as instantiate, without calling instantiate
985 my ($obj) = @_; 1094 my ($obj) = @_;
986 1095
1096 # no longer needed after getting rid of delete_package?
987 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1097 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
988 1098
989 my $registry = $obj->registry; 1099 my $registry = $obj->registry;
990 1100
991 @$registry = (); 1101 @$registry = ();
992 1102
1007cf::attachable->attach ( 1117cf::attachable->attach (
1008 prio => -1000000, 1118 prio => -1000000,
1009 on_instantiate => sub { 1119 on_instantiate => sub {
1010 my ($obj, $data) = @_; 1120 my ($obj, $data) = @_;
1011 1121
1012 $data = from_json $data; 1122 $data = decode_json $data;
1013 1123
1014 for (@$data) { 1124 for (@$data) {
1015 my ($name, $args) = @$_; 1125 my ($name, $args) = @$_;
1016 1126
1017 $obj->attach ($name, %{$args || {} }); 1127 $obj->attach ($name, %{$args || {} });
1038 utf8::decode (my $decname = $filename); 1148 utf8::decode (my $decname = $filename);
1039 warn sprintf "saving %s (%d,%d)\n", 1149 warn sprintf "saving %s (%d,%d)\n",
1040 $decname, length $$rdata, scalar @$objs; 1150 $decname, length $$rdata, scalar @$objs;
1041 1151
1042 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1152 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1043 chmod SAVE_MODE, $fh; 1153 aio_chmod $fh, SAVE_MODE;
1044 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1154 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1045 aio_fsync $fh if $cf::USE_FSYNC; 1155 aio_fsync $fh if $cf::USE_FSYNC;
1046 close $fh; 1156 aio_close $fh;
1047 1157
1048 if (@$objs) { 1158 if (@$objs) {
1049 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1159 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1160 aio_chmod $fh, SAVE_MODE;
1051 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1161 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1052 aio_write $fh, 0, (length $data), $data, 0; 1162 aio_write $fh, 0, (length $data), $data, 0;
1053 aio_fsync $fh if $cf::USE_FSYNC; 1163 aio_fsync $fh if $cf::USE_FSYNC;
1054 close $fh; 1164 aio_close $fh;
1055 aio_rename "$filename.pst~", "$filename.pst"; 1165 aio_rename "$filename.pst~", "$filename.pst";
1056 } 1166 }
1057 } else { 1167 } else {
1058 aio_unlink "$filename.pst"; 1168 aio_unlink "$filename.pst";
1059 } 1169 }
1087 1197
1088 unless (aio_stat "$filename.pst") { 1198 unless (aio_stat "$filename.pst") {
1089 (aio_load "$filename.pst", $av) >= 0 1199 (aio_load "$filename.pst", $av) >= 0
1090 or return; 1200 or return;
1091 1201
1092 $av = eval { (Storable::thaw $av)->{objs} }; 1202 my $st = eval { Coro::Storable::thaw $av };
1203 $av = $st->{objs};
1093 } 1204 }
1094 1205
1095 utf8::decode (my $decname = $filename); 1206 utf8::decode (my $decname = $filename);
1096 warn sprintf "loading %s (%d,%d)\n", 1207 warn sprintf "loading %s (%d,%d)\n",
1097 $decname, length $data, scalar @{$av || []}; 1208 $decname, length $data, scalar @{$av || []};
1227 1338
1228 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1339 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1229 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1340 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1230 1341
1231 $ext{source} = 1342 $ext{source} =
1232 "package $pkg; use strict; use utf8;\n" 1343 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1233 . "#line 1 \"$path\"\n{\n" 1344 . "#line 1 \"$path\"\n{\n"
1234 . $source 1345 . $source
1235 . "\n};\n1"; 1346 . "\n};\n1";
1236 1347
1237 $todo{$base} = \%ext; 1348 $todo{$base} = \%ext;
1253 my $msg = $@ ? "$v->{path}: $@\n" 1364 my $msg = $@ ? "$v->{path}: $@\n"
1254 : "$v->{base}: extension inactive.\n"; 1365 : "$v->{base}: extension inactive.\n";
1255 1366
1256 if (exists $v->{meta}{mandatory}) { 1367 if (exists $v->{meta}{mandatory}) {
1257 warn $msg; 1368 warn $msg;
1258 warn "mandatory extension failed to load, exiting.\n"; 1369 cf::cleanup "mandatory extension failed to load, exiting.";
1259 exit 1;
1260 } 1370 }
1261 1371
1262 warn $msg; 1372 warn $msg;
1263 } 1373 }
1264 1374
1278 1388
1279=back 1389=back
1280 1390
1281=head2 CORE EXTENSIONS 1391=head2 CORE EXTENSIONS
1282 1392
1283Functions and methods that extend core crossfire objects. 1393Functions and methods that extend core deliantra objects.
1284 1394
1285=cut 1395=cut
1286 1396
1287package cf::player; 1397package cf::player;
1288 1398
1353 my $f = new_from_file cf::object::thawer path $login 1463 my $f = new_from_file cf::object::thawer path $login
1354 or return; 1464 or return;
1355 1465
1356 my $pl = cf::player::load_pl $f 1466 my $pl = cf::player::load_pl $f
1357 or return; 1467 or return;
1468
1358 local $cf::PLAYER_LOADING{$login} = $pl; 1469 local $cf::PLAYER_LOADING{$login} = $pl;
1359 $f->resolve_delayed_derefs; 1470 $f->resolve_delayed_derefs;
1360 $cf::PLAYER{$login} = $pl 1471 $cf::PLAYER{$login} = $pl
1361 } 1472 }
1362 } 1473 }
1372 1483
1373 return if $pl->{deny_save}; 1484 return if $pl->{deny_save};
1374 1485
1375 aio_mkdir playerdir $pl, 0770; 1486 aio_mkdir playerdir $pl, 0770;
1376 $pl->{last_save} = $cf::RUNTIME; 1487 $pl->{last_save} = $cf::RUNTIME;
1488
1489 cf::get_slot 0.01;
1377 1490
1378 $pl->save_pl ($path); 1491 $pl->save_pl ($path);
1379 cf::cede_to_tick; 1492 cf::cede_to_tick;
1380} 1493}
1381 1494
1413 my ($pl) = @_; 1526 my ($pl) = @_;
1414 1527
1415 my $name = $pl->ob->name; 1528 my $name = $pl->ob->name;
1416 1529
1417 $pl->{deny_save} = 1; 1530 $pl->{deny_save} = 1;
1418 $pl->password ("*"); # this should lock out the player until we nuked the dir 1531 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1419 1532
1420 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1533 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1421 $pl->deactivate; 1534 $pl->deactivate;
1535 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1536 $pl->ob->check_score;
1422 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1537 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1423 $pl->ns->destroy if $pl->ns; 1538 $pl->ns->destroy if $pl->ns;
1424 1539
1425 my $path = playerdir $pl; 1540 my $path = playerdir $pl;
1426 my $temp = "$path~$cf::RUNTIME~deleting~"; 1541 my $temp = "$path~$cf::RUNTIME~deleting~";
1465 1580
1466 for my $login (@$dirs) { 1581 for my $login (@$dirs) {
1467 my $path = path $login; 1582 my $path = path $login;
1468 1583
1469 # a .pst is a dead give-away for a valid player 1584 # a .pst is a dead give-away for a valid player
1470 unless (-e "$path.pst") { 1585 # if no pst file found, open and chekc for blocked users
1586 if (aio_stat "$path.pst") {
1471 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1587 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1472 aio_read $fh, 0, 512, my $buf, 0 or next; 1588 aio_read $fh, 0, 512, my $buf, 0 or next;
1473 $buf !~ /^password -------------$/m or next; # official not-valid tag 1589 $buf !~ /^password -------------$/m or next; # official not-valid tag
1474 } 1590 }
1475 1591
1506 } 1622 }
1507 1623
1508 \@paths 1624 \@paths
1509} 1625}
1510 1626
1511=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1627=item $protocol_xml = $player->expand_cfpod ($cfpod)
1512 1628
1513Expand crossfire pod fragments into protocol xml. 1629Expand deliantra pod fragments into protocol xml.
1514
1515=cut
1516
1517sub expand_cfpod {
1518 ((my $self), (local $_)) = @_;
1519
1520 # escape & and <
1521 s/&/&amp;/g;
1522 s/(?<![BIUGHT])</&lt;/g;
1523
1524 # this is buggy, it needs to properly take care of nested <'s
1525
1526 1 while
1527 # replace B<>, I<>, U<> etc.
1528 s/B<([^\>]*)>/<b>$1<\/b>/
1529 || s/I<([^\>]*)>/<i>$1<\/i>/
1530 || s/U<([^\>]*)>/<u>$1<\/u>/
1531 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1532 # replace G<male|female> tags
1533 || s{G<([^>|]*)\|([^>]*)>}{
1534 $self->gender ? $2 : $1
1535 }ge
1536 # replace H<hint text>
1537 || s{H<([^\>]*)>}
1538 {
1539 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1540 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1541 "")
1542 [$self->{hintmode}]
1543 }ge;
1544
1545 # create single paragraphs (very hackish)
1546 s/(?<=\S)\n(?=\w)/ /g;
1547
1548 # compress some whitespace
1549 s/\s+\n/\n/g; # ws line-ends
1550 s/\n\n+/\n/g; # double lines
1551 s/^\n+//; # beginning lines
1552 s/\n+$//; # ending lines
1553
1554 $_
1555}
1556
1557sub hintmode {
1558 $_[0]{hintmode} = $_[1] if @_ > 1;
1559 $_[0]{hintmode}
1560}
1561 1630
1562=item $player->ext_reply ($msgid, @msg) 1631=item $player->ext_reply ($msgid, @msg)
1563 1632
1564Sends an ext reply to the player. 1633Sends an ext reply to the player.
1565 1634
1632our $MAX_RESET = 3600; 1701our $MAX_RESET = 3600;
1633our $DEFAULT_RESET = 3000; 1702our $DEFAULT_RESET = 3000;
1634 1703
1635sub generate_random_map { 1704sub generate_random_map {
1636 my ($self, $rmp) = @_; 1705 my ($self, $rmp) = @_;
1706
1707 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1708
1637 # mit "rum" bekleckern, nicht 1709 # mit "rum" bekleckern, nicht
1638 $self->_create_random_map ( 1710 $self->_create_random_map (
1639 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1711 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1640 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1712 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1641 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1713 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1763 1835
1764# the temporary/swap location 1836# the temporary/swap location
1765sub save_path { 1837sub save_path {
1766 my ($self) = @_; 1838 my ($self) = @_;
1767 1839
1768 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1840 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1769 "$TMPDIR/$path.map" 1841 "$TMPDIR/$path.map"
1770} 1842}
1771 1843
1772# the unique path, undef == no special unique path 1844# the unique path, undef == no special unique path
1773sub uniq_path { 1845sub uniq_path {
1774 my ($self) = @_; 1846 my ($self) = @_;
1775 1847
1776 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1848 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1777 "$UNIQUEDIR/$path" 1849 "$UNIQUEDIR/$path"
1778} 1850}
1779 1851
1780# and all this just because we cannot iterate over 1852# and all this just because we cannot iterate over
1781# all maps in C++... 1853# all maps in C++...
1879 1951
1880 cf::lock_wait "map_data:$path";#d#remove 1952 cf::lock_wait "map_data:$path";#d#remove
1881 cf::lock_wait "map_find:$path"; 1953 cf::lock_wait "map_find:$path";
1882 1954
1883 $cf::MAP{$path} || do { 1955 $cf::MAP{$path} || do {
1884 my $guard1 = cf::lock_acquire "map_find:$path";
1885 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 1956 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1957 my $guard2 = cf::lock_acquire "map_find:$path";
1886 1958
1887 my $map = new_from_path cf::map $path 1959 my $map = new_from_path cf::map $path
1888 or return; 1960 or return;
1889 1961
1890 $map->{last_save} = $cf::RUNTIME; 1962 $map->{last_save} = $cf::RUNTIME;
1893 or return; 1965 or return;
1894 1966
1895 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1967 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1896 # doing this can freeze the server in a sync job, obviously 1968 # doing this can freeze the server in a sync job, obviously
1897 #$cf::WAIT_FOR_TICK->wait; 1969 #$cf::WAIT_FOR_TICK->wait;
1970 undef $guard2;
1898 undef $guard1; 1971 undef $guard1;
1899 undef $guard2;
1900 $map->reset; 1972 $map->reset;
1901 return find $path; 1973 return find $path;
1902 } 1974 }
1903 1975
1904 $cf::MAP{$path} = $map 1976 $cf::MAP{$path} = $map
1931 my $f = new_from_file cf::object::thawer $self->{load_path}; 2003 my $f = new_from_file cf::object::thawer $self->{load_path};
1932 $f->skip_block; 2004 $f->skip_block;
1933 $self->_load_objects ($f) 2005 $self->_load_objects ($f)
1934 or return; 2006 or return;
1935 2007
1936 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2008 $self->post_load_original
1937 if delete $self->{load_original}; 2009 if delete $self->{load_original};
1938 2010
1939 if (my $uniq = $self->uniq_path) { 2011 if (my $uniq = $self->uniq_path) {
1940 utf8::encode $uniq; 2012 utf8::encode $uniq;
1941 unless (aio_stat $uniq) { 2013 unless (aio_stat $uniq) {
1967 } 2039 }
1968 2040
1969 $self->{last_save} = $cf::RUNTIME; 2041 $self->{last_save} = $cf::RUNTIME;
1970 $self->last_access ($cf::RUNTIME); 2042 $self->last_access ($cf::RUNTIME);
1971 2043
1972 $self->in_memory (cf::MAP_IN_MEMORY); 2044 $self->in_memory (cf::MAP_ACTIVE);
1973 } 2045 }
1974 2046
1975 $self->post_load; 2047 $self->post_load;
1976} 2048}
1977 2049
2035 my ($path, $origin, $load) = @_; 2107 my ($path, $origin, $load) = @_;
2036 2108
2037 $path = normalise $path, $origin && $origin->{path}; 2109 $path = normalise $path, $origin && $origin->{path};
2038 2110
2039 if (my $map = $cf::MAP{$path}) { 2111 if (my $map = $cf::MAP{$path}) {
2040 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2112 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2041 } 2113 }
2042 2114
2043 $MAP_PREFETCH{$path} |= $load; 2115 $MAP_PREFETCH{$path} |= $load;
2044 2116
2045 $MAP_PREFETCHER ||= cf::async { 2117 $MAP_PREFETCHER ||= cf::async {
2082 cf::async { 2154 cf::async {
2083 $Coro::current->{desc} = "map player save"; 2155 $Coro::current->{desc} = "map player save";
2084 $_->contr->save for $self->players; 2156 $_->contr->save for $self->players;
2085 }; 2157 };
2086 2158
2159 cf::get_slot 0.02;
2160
2087 if ($uniq) { 2161 if ($uniq) {
2088 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2162 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2089 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2163 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2090 } else { 2164 } else {
2091 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2165 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2099 $self->save; 2173 $self->save;
2100 2174
2101 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2175 my $lock = cf::lock_acquire "map_data:$self->{path}";
2102 2176
2103 return if $self->players; 2177 return if $self->players;
2104 return if $self->in_memory != cf::MAP_IN_MEMORY; 2178 return if $self->in_memory != cf::MAP_ACTIVE;
2105 return if $self->{deny_save}; 2179 return if $self->{deny_save};
2106 2180
2107 $self->in_memory (cf::MAP_SWAPPED); 2181 $self->in_memory (cf::MAP_SWAPPED);
2108 2182
2109 $self->deactivate; 2183 $self->deactivate;
2227 2301
2228sub unique_maps() { 2302sub unique_maps() {
2229 [ 2303 [
2230 map { 2304 map {
2231 utf8::decode $_; 2305 utf8::decode $_;
2232 /\.map$/ 2306 s/\.map$//; # TODO future compatibility hack
2307 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2308 ? ()
2233 ? normalise $_ 2309 : normalise $_
2234 : ()
2235 } @{ aio_readdir $UNIQUEDIR or [] } 2310 } @{ aio_readdir $UNIQUEDIR or [] }
2236 ] 2311 ]
2237} 2312}
2238 2313
2239package cf;
2240
2241=back 2314=back
2242 2315
2243=head3 cf::object 2316=head3 cf::object
2244 2317
2245=cut 2318=cut
2248 2321
2249=over 4 2322=over 4
2250 2323
2251=item $ob->inv_recursive 2324=item $ob->inv_recursive
2252 2325
2253Returns the inventory of the object _and_ their inventories, recursively. 2326Returns the inventory of the object I<and> their inventories, recursively,
2327but I<not> the object itself.
2254 2328
2255=cut 2329=cut
2256 2330
2257sub inv_recursive_; 2331sub inv_recursive_;
2258sub inv_recursive_ { 2332sub inv_recursive_ {
2263 inv_recursive_ inv $_[0] 2337 inv_recursive_ inv $_[0]
2264} 2338}
2265 2339
2266=item $ref = $ob->ref 2340=item $ref = $ob->ref
2267 2341
2268creates and returns a persistent reference to an objetc that can be stored as a string. 2342Creates and returns a persistent reference to an object that can be stored as a string.
2269 2343
2270=item $ob = cf::object::deref ($refstring) 2344=item $ob = cf::object::deref ($refstring)
2271 2345
2272returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2346returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2273even if the object actually exists. May block. 2347even if the object actually exists. May block.
2305can be C<undef>. Does the right thing when the player is currently in a 2379can be C<undef>. Does the right thing when the player is currently in a
2306dialogue with the given NPC character. 2380dialogue with the given NPC character.
2307 2381
2308=cut 2382=cut
2309 2383
2384our $SAY_CHANNEL = {
2385 id => "say",
2386 title => "Map",
2387 reply => "say ",
2388 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2389};
2390
2391our $CHAT_CHANNEL = {
2392 id => "chat",
2393 title => "Chat",
2394 reply => "chat ",
2395 tooltip => "Player chat and shouts, global to the server.",
2396};
2397
2310# rough implementation of a future "reply" method that works 2398# rough implementation of a future "reply" method that works
2311# with dialog boxes. 2399# with dialog boxes.
2312#TODO: the first argument must go, split into a $npc->reply_to ( method 2400#TODO: the first argument must go, split into a $npc->reply_to ( method
2313sub cf::object::player::reply($$$;$) { 2401sub cf::object::player::reply($$$;$) {
2314 my ($self, $npc, $msg, $flags) = @_; 2402 my ($self, $npc, $msg, $flags) = @_;
2325 my $dialog = $pl->{npc_dialog}; 2413 my $dialog = $pl->{npc_dialog};
2326 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2414 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2327 2415
2328 } else { 2416 } else {
2329 $msg = $npc->name . " says: $msg" if $npc; 2417 $msg = $npc->name . " says: $msg" if $npc;
2330 $self->message ($msg, $flags); 2418 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2331 } 2419 }
2332 } 2420 }
2333} 2421}
2334 2422
2335=item $object->send_msg ($channel, $msg, $color, [extra...]) 2423=item $object->send_msg ($channel, $msg, $color, [extra...])
2360 2448
2361=item $player_object->enter_link 2449=item $player_object->enter_link
2362 2450
2363Freezes the player and moves him/her to a special map (C<{link}>). 2451Freezes the player and moves him/her to a special map (C<{link}>).
2364 2452
2365The player should be reasonably safe there for short amounts of time. You 2453The player should be reasonably safe there for short amounts of time (e.g.
2366I<MUST> call C<leave_link> as soon as possible, though. 2454for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2455though, as the palyer cannot control the character while it is on the link
2456map.
2367 2457
2368Will never block. 2458Will never block.
2369 2459
2370=item $player_object->leave_link ($map, $x, $y) 2460=item $player_object->leave_link ($map, $x, $y)
2371 2461
2429 2519
2430 $map->load; 2520 $map->load;
2431 $map->load_neighbours; 2521 $map->load_neighbours;
2432 2522
2433 return unless $self->contr->active; 2523 return unless $self->contr->active;
2524 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2434 $self->activate_recursive; 2525 $self->activate_recursive;
2435 2526
2436 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2527 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2437 $self->enter_map ($map, $x, $y); 2528 $self->enter_map ($map, $x, $y);
2438} 2529}
2442Moves the player to the given map-path and coordinates by first freezing 2533Moves the player to the given map-path and coordinates by first freezing
2443her, loading and preparing them map, calling the provided $check callback 2534her, loading and preparing them map, calling the provided $check callback
2444that has to return the map if sucecssful, and then unfreezes the player on 2535that has to return the map if sucecssful, and then unfreezes the player on
2445the new (success) or old (failed) map position. In either case, $done will 2536the new (success) or old (failed) map position. In either case, $done will
2446be called at the end of this process. 2537be called at the end of this process.
2538
2539Note that $check will be called with a potentially non-loaded map, so if
2540it needs a loaded map it has to call C<< ->load >>.
2447 2541
2448=cut 2542=cut
2449 2543
2450our $GOTOGEN; 2544our $GOTOGEN;
2451 2545
2530} 2624}
2531 2625
2532sub prepare_random_map { 2626sub prepare_random_map {
2533 my ($exit) = @_; 2627 my ($exit) = @_;
2534 2628
2535 my $guard = cf::lock_acquire "exit_prepare:$exit";
2536
2537 # all this does is basically replace the /! path by 2629 # all this does is basically replace the /! path by
2538 # a new random map path (?random/...) with a seed 2630 # a new random map path (?random/...) with a seed
2539 # that depends on the exit object 2631 # that depends on the exit object
2540 2632
2541 my $rmp = parse_random_map_params $exit->msg; 2633 my $rmp = parse_random_map_params $exit->msg;
2543 if ($exit->map) { 2635 if ($exit->map) {
2544 $rmp->{region} = $exit->region->name; 2636 $rmp->{region} = $exit->region->name;
2545 $rmp->{origin_map} = $exit->map->path; 2637 $rmp->{origin_map} = $exit->map->path;
2546 $rmp->{origin_x} = $exit->x; 2638 $rmp->{origin_x} = $exit->x;
2547 $rmp->{origin_y} = $exit->y; 2639 $rmp->{origin_y} = $exit->y;
2640
2641 $exit->map->touch;
2548 } 2642 }
2549 2643
2550 $rmp->{random_seed} ||= $exit->random_seed; 2644 $rmp->{random_seed} ||= $exit->random_seed;
2551 2645
2552 my $data = cf::to_json $rmp; 2646 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2553 my $md5 = Digest::MD5::md5_hex $data; 2647 my $md5 = Digest::MD5::md5_hex $data;
2554 my $meta = "$RANDOMDIR/$md5.meta"; 2648 my $meta = "$RANDOMDIR/$md5.meta";
2555 2649
2556 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2650 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2557 aio_write $fh, 0, (length $data), $data, 0; 2651 aio_write $fh, 0, (length $data), $data, 0;
2558 undef $fh; 2652 undef $fh;
2559 aio_rename "$meta~", $meta; 2653 aio_rename "$meta~", $meta;
2560 2654
2655 my $slaying = "?random/$md5";
2656
2657 if ($exit->valid) {
2561 $exit->slaying ("?random/$md5"); 2658 $exit->slaying ("?random/$md5");
2562 $exit->msg (undef); 2659 $exit->msg (undef);
2660 }
2563 } 2661 }
2564} 2662}
2565 2663
2566sub cf::object::player::enter_exit { 2664sub cf::object::player::enter_exit {
2567 my ($self, $exit) = @_; 2665 my ($self, $exit) = @_;
2568 2666
2569 return unless $self->type == cf::PLAYER; 2667 return unless $self->type == cf::PLAYER;
2570 2668
2571 if ($exit->slaying eq "/!") {
2572 #TODO: this should de-fi-ni-te-ly not be a sync-job
2573 # the problem is that $exit might not survive long enough
2574 # so it needs to be done right now, right here
2575 cf::sync_job { prepare_random_map $exit };
2576 }
2577
2578 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2579 my $hp = $exit->stats->hp;
2580 my $sp = $exit->stats->sp;
2581
2582 $self->enter_link; 2669 $self->enter_link;
2583 2670
2584 # if exit is damned, update players death & WoR home-position
2585 $self->contr->savebed ($slaying, $hp, $sp)
2586 if $exit->flag (FLAG_DAMNED);
2587
2588 (async { 2671 (async {
2589 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2672 $Coro::current->{desc} = "enter_exit";
2590 2673
2591 $self->deactivate_recursive; # just to be sure
2592 unless (eval { 2674 unless (eval {
2675 $self->deactivate_recursive; # just to be sure
2676
2677 # random map handling
2678 {
2679 my $guard = cf::lock_acquire "exit_prepare:$exit";
2680
2681 prepare_random_map $exit
2682 if $exit->slaying eq "/!";
2683 }
2684
2685 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2686 my $x = $exit->stats->hp;
2687 my $y = $exit->stats->sp;
2688
2593 $self->goto ($slaying, $hp, $sp); 2689 $self->goto ($map, $x, $y);
2594 2690
2691 # if exit is damned, update players death & WoR home-position
2692 $self->contr->savebed ($map, $x, $y)
2693 if $exit->flag (cf::FLAG_DAMNED);
2694
2595 1; 2695 1
2596 }) { 2696 }) {
2597 $self->message ("Something went wrong deep within the crossfire server. " 2697 $self->message ("Something went wrong deep within the deliantra server. "
2598 . "I'll try to bring you back to the map you were before. " 2698 . "I'll try to bring you back to the map you were before. "
2599 . "Please report this to the dungeon master!", 2699 . "Please report this to the dungeon master!",
2600 cf::NDI_UNIQUE | cf::NDI_RED); 2700 cf::NDI_UNIQUE | cf::NDI_RED);
2601 2701
2602 warn "ERROR in enter_exit: $@"; 2702 warn "ERROR in enter_exit: $@";
2630the message, with C<log> being the default. If C<$color> is negative, suppress 2730the message, with C<log> being the default. If C<$color> is negative, suppress
2631the message unless the client supports the msg packet. 2731the message unless the client supports the msg packet.
2632 2732
2633=cut 2733=cut
2634 2734
2735# non-persistent channels (usually the info channel)
2635our %CHANNEL = ( 2736our %CHANNEL = (
2636 "c/identify" => { 2737 "c/identify" => {
2637 id => "infobox", 2738 id => "infobox",
2638 title => "Identify", 2739 title => "Identify",
2639 reply => undef, 2740 reply => undef,
2643 id => "infobox", 2744 id => "infobox",
2644 title => "Examine", 2745 title => "Examine",
2645 reply => undef, 2746 reply => undef,
2646 tooltip => "Signs and other items you examined", 2747 tooltip => "Signs and other items you examined",
2647 }, 2748 },
2749 "c/book" => {
2750 id => "infobox",
2751 title => "Book",
2752 reply => undef,
2753 tooltip => "The contents of a note or book",
2754 },
2648 "c/lookat" => { 2755 "c/lookat" => {
2649 id => "infobox", 2756 id => "infobox",
2650 title => "Look", 2757 title => "Look",
2651 reply => undef, 2758 reply => undef,
2652 tooltip => "What you saw there", 2759 tooltip => "What you saw there",
2653 }, 2760 },
2761 "c/who" => {
2762 id => "infobox",
2763 title => "Players",
2764 reply => undef,
2765 tooltip => "Shows players who are currently online",
2766 },
2767 "c/body" => {
2768 id => "infobox",
2769 title => "Body Parts",
2770 reply => undef,
2771 tooltip => "Shows which body parts you posess and are available",
2772 },
2773 "c/uptime" => {
2774 id => "infobox",
2775 title => "Uptime",
2776 reply => undef,
2777 tooltip => "How long the server has been running since last restart",
2778 },
2779 "c/mapinfo" => {
2780 id => "infobox",
2781 title => "Map Info",
2782 reply => undef,
2783 tooltip => "Information related to the maps",
2784 },
2785 "c/party" => {
2786 id => "party",
2787 title => "Party",
2788 reply => "gsay ",
2789 tooltip => "Messages and chat related to your party",
2790 },
2654); 2791);
2655 2792
2656sub cf::client::send_msg { 2793sub cf::client::send_msg {
2657 my ($self, $channel, $msg, $color, @extra) = @_; 2794 my ($self, $channel, $msg, $color, @extra) = @_;
2658 2795
2659 $msg = $self->pl->expand_cfpod ($msg); 2796 $msg = $self->pl->expand_cfpod ($msg)
2797 unless $color & cf::NDI_VERBATIM;
2660 2798
2661 $color &= cf::NDI_CLIENT_MASK; # just in case... 2799 $color &= cf::NDI_CLIENT_MASK; # just in case...
2662 2800
2663 # check predefined channels, for the benefit of C 2801 # check predefined channels, for the benefit of C
2664 if ($CHANNEL{$channel}) { 2802 if ($CHANNEL{$channel}) {
2685 if ($self->can_msg) { 2823 if ($self->can_msg) {
2686 # default colour, mask it out 2824 # default colour, mask it out
2687 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2825 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2688 if $color & cf::NDI_DEF; 2826 if $color & cf::NDI_DEF;
2689 2827
2690 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2828 my $pkt = "msg "
2829 . $self->{json_coder}->encode (
2691 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2830 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2831 );
2832
2833 # try lzf for large packets
2834 $pkt = "lzf " . Compress::LZF::compress $pkt
2835 if 1024 <= length $pkt and $self->{can_lzf};
2836
2837 # split very large packets
2838 if (8192 < length $pkt and $self->{can_lzf}) {
2839 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2840 $pkt = "frag";
2841 }
2842
2843 $self->send_packet ($pkt);
2692 } else { 2844 } else {
2693 if ($color >= 0) { 2845 if ($color >= 0) {
2694 # replace some tags by gcfclient-compatible ones 2846 # replace some tags by gcfclient-compatible ones
2695 for ($msg) { 2847 for ($msg) {
2696 1 while 2848 1 while
2894=pod 3046=pod
2895 3047
2896The following functions and methods are available within a safe environment: 3048The following functions and methods are available within a safe environment:
2897 3049
2898 cf::object 3050 cf::object
2899 contr pay_amount pay_player map x y force_find force_add 3051 contr pay_amount pay_player map x y force_find force_add destroy
2900 insert remove name archname title slaying race decrease_ob_nr 3052 insert remove name archname title slaying race decrease split
2901 3053
2902 cf::object::player 3054 cf::object::player
2903 player 3055 player
2904 3056
2905 cf::player 3057 cf::player
2910 3062
2911=cut 3063=cut
2912 3064
2913for ( 3065for (
2914 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3066 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2915 insert remove inv name archname title slaying race 3067 insert remove inv nrof name archname title slaying race
2916 decrease_ob_nr)], 3068 decrease split destroy change_exp)],
2917 ["cf::object::player" => qw(player)], 3069 ["cf::object::player" => qw(player)],
2918 ["cf::player" => qw(peaceful)], 3070 ["cf::player" => qw(peaceful)],
2919 ["cf::map" => qw(trigger)], 3071 ["cf::map" => qw(trigger)],
2920) { 3072) {
2921 no strict 'refs'; 3073 no strict 'refs';
3026 { 3178 {
3027 my $faces = $facedata->{faceinfo}; 3179 my $faces = $facedata->{faceinfo};
3028 3180
3029 while (my ($face, $info) = each %$faces) { 3181 while (my ($face, $info) = each %$faces) {
3030 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3182 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3183
3031 cf::face::set_visibility $idx, $info->{visibility}; 3184 cf::face::set_visibility $idx, $info->{visibility};
3032 cf::face::set_magicmap $idx, $info->{magicmap}; 3185 cf::face::set_magicmap $idx, $info->{magicmap};
3033 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3186 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3034 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3187 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3035 3188
3036 cf::cede_to_tick; 3189 cf::cede_to_tick;
3037 } 3190 }
3038 3191
3039 while (my ($face, $info) = each %$faces) { 3192 while (my ($face, $info) = each %$faces) {
3040 next unless $info->{smooth}; 3193 next unless $info->{smooth};
3194
3041 my $idx = cf::face::find $face 3195 my $idx = cf::face::find $face
3042 or next; 3196 or next;
3197
3043 if (my $smooth = cf::face::find $info->{smooth}) { 3198 if (my $smooth = cf::face::find $info->{smooth}) {
3044 cf::face::set_smooth $idx, $smooth; 3199 cf::face::set_smooth $idx, $smooth;
3045 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3200 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3046 } else { 3201 } else {
3047 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3202 warn "smooth face '$info->{smooth}' not found for face '$face'";
3065 { 3220 {
3066 # TODO: for gcfclient pleasure, we should give resources 3221 # TODO: for gcfclient pleasure, we should give resources
3067 # that gcfclient doesn't grok a >10000 face index. 3222 # that gcfclient doesn't grok a >10000 face index.
3068 my $res = $facedata->{resource}; 3223 my $res = $facedata->{resource};
3069 3224
3070 my $soundconf = delete $res->{"res/sound.conf"};
3071
3072 while (my ($name, $info) = each %$res) { 3225 while (my ($name, $info) = each %$res) {
3226 if (defined $info->{type}) {
3073 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3227 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3074 my $data; 3228 my $data;
3075 3229
3076 if ($info->{type} & 1) { 3230 if ($info->{type} & 1) {
3077 # prepend meta info 3231 # prepend meta info
3078 3232
3079 my $meta = $enc->encode ({ 3233 my $meta = $enc->encode ({
3080 name => $name, 3234 name => $name,
3081 %{ $info->{meta} || {} }, 3235 %{ $info->{meta} || {} },
3082 }); 3236 });
3083 3237
3084 $data = pack "(w/a*)*", $meta, $info->{data}; 3238 $data = pack "(w/a*)*", $meta, $info->{data};
3239 } else {
3240 $data = $info->{data};
3241 }
3242
3243 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3244 cf::face::set_type $idx, $info->{type};
3085 } else { 3245 } else {
3086 $data = $info->{data}; 3246 $RESOURCE{$name} = $info;
3087 } 3247 }
3088 3248
3089 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3090 cf::face::set_type $idx, $info->{type};
3091
3092 cf::cede_to_tick; 3249 cf::cede_to_tick;
3093 } 3250 }
3094
3095 if ($soundconf) {
3096 $soundconf = $enc->decode (delete $soundconf->{data});
3097
3098 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3099 my $sound = $soundconf->{compat}[$_]
3100 or next;
3101
3102 my $face = cf::face::find "sound/$sound->[1]";
3103 cf::sound::set $sound->[0] => $face;
3104 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3105 }
3106
3107 while (my ($k, $v) = each %{$soundconf->{event}}) {
3108 my $face = cf::face::find "sound/$v";
3109 cf::sound::set $k => $face;
3110 }
3111 }
3112 } 3251 }
3252
3253 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3113 3254
3114 1 3255 1
3115} 3256}
3257
3258cf::global->attach (on_resource_update => sub {
3259 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3260 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3261
3262 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3263 my $sound = $soundconf->{compat}[$_]
3264 or next;
3265
3266 my $face = cf::face::find "sound/$sound->[1]";
3267 cf::sound::set $sound->[0] => $face;
3268 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3269 }
3270
3271 while (my ($k, $v) = each %{$soundconf->{event}}) {
3272 my $face = cf::face::find "sound/$v";
3273 cf::sound::set $k => $face;
3274 }
3275 }
3276});
3116 3277
3117register_exticmd fx_want => sub { 3278register_exticmd fx_want => sub {
3118 my ($ns, $want) = @_; 3279 my ($ns, $want) = @_;
3119 3280
3120 while (my ($k, $v) = each %$want) { 3281 while (my ($k, $v) = each %$want) {
3121 $ns->fx_want ($k, $v); 3282 $ns->fx_want ($k, $v);
3122 } 3283 }
3123}; 3284};
3285
3286sub load_resource_file($) {
3287 my $guard = lock_acquire "load_resource_file";
3288
3289 my $status = load_resource_file_ $_[0];
3290 get_slot 0.1, 100;
3291 cf::arch::commit_load;
3292
3293 $status
3294}
3124 3295
3125sub reload_regions { 3296sub reload_regions {
3126 # HACK to clear player env face cache, we need some signal framework 3297 # HACK to clear player env face cache, we need some signal framework
3127 # for this (global event?) 3298 # for this (global event?)
3128 %ext::player_env::MUSIC_FACE_CACHE = (); 3299 %ext::player_env::MUSIC_FACE_CACHE = ();
3142} 3313}
3143 3314
3144sub reload_archetypes { 3315sub reload_archetypes {
3145 load_resource_file "$DATADIR/archetypes" 3316 load_resource_file "$DATADIR/archetypes"
3146 or die "unable to load archetypes\n"; 3317 or die "unable to load archetypes\n";
3147 #d# NEED to laod twice to resolve forward references
3148 # this really needs to be done in an extra post-pass
3149 # (which needs to be synchronous, so solve it differently)
3150 load_resource_file "$DATADIR/archetypes"
3151 or die "unable to load archetypes\n";
3152} 3318}
3153 3319
3154sub reload_treasures { 3320sub reload_treasures {
3155 load_resource_file "$DATADIR/treasures" 3321 load_resource_file "$DATADIR/treasures"
3156 or die "unable to load treasurelists\n"; 3322 or die "unable to load treasurelists\n";
3157} 3323}
3158 3324
3159sub reload_resources { 3325sub reload_resources {
3160 warn "reloading resource files...\n"; 3326 warn "reloading resource files...\n";
3161 3327
3328 reload_facedata;
3329 reload_archetypes;
3162 reload_regions; 3330 reload_regions;
3163 reload_facedata;
3164 #reload_archetypes;#d#
3165 reload_archetypes;
3166 reload_treasures; 3331 reload_treasures;
3167 3332
3168 warn "finished reloading resource files\n"; 3333 warn "finished reloading resource files\n";
3169} 3334}
3170 3335
3171sub init { 3336sub init {
3337 my $guard = freeze_mainloop;
3338
3339 evthread_start IO::AIO::poll_fileno;
3340
3172 reload_resources; 3341 reload_resources;
3173} 3342}
3174 3343
3175sub reload_config { 3344sub reload_config {
3176 open my $fh, "<:utf8", "$CONFDIR/config" 3345 open my $fh, "<:utf8", "$CONFDIR/config"
3177 or return; 3346 or return;
3178 3347
3179 local $/; 3348 local $/;
3180 *CFG = YAML::Syck::Load <$fh>; 3349 *CFG = YAML::Load <$fh>;
3181 3350
3182 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3351 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3183 3352
3184 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3353 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3185 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3354 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3191 }; 3360 };
3192 warn $@ if $@; 3361 warn $@ if $@;
3193 } 3362 }
3194} 3363}
3195 3364
3365sub pidfile() {
3366 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3367 or die "$PIDFILE: $!";
3368 flock $fh, &Fcntl::LOCK_EX
3369 or die "$PIDFILE: flock: $!";
3370 $fh
3371}
3372
3373# make sure only one server instance is running at any one time
3374sub atomic {
3375 my $fh = pidfile;
3376
3377 my $pid = <$fh>;
3378 kill 9, $pid if $pid > 0;
3379
3380 seek $fh, 0, 0;
3381 print $fh $$;
3382}
3383
3196sub main { 3384sub main {
3385 atomic;
3386
3197 # we must not ever block the main coroutine 3387 # we must not ever block the main coroutine
3198 local $Coro::idle = sub { 3388 local $Coro::idle = sub {
3199 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3389 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3200 (async { 3390 (async {
3201 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3391 $Coro::current->{desc} = "IDLE BUG HANDLER";
3202 Event::one_event; 3392 EV::loop EV::LOOP_ONESHOT;
3203 })->prio (Coro::PRIO_MAX); 3393 })->prio (Coro::PRIO_MAX);
3204 }; 3394 };
3205 3395
3396 {
3397 my $guard = freeze_mainloop;
3206 reload_config; 3398 reload_config;
3207 db_init; 3399 db_init;
3208 load_extensions; 3400 load_extensions;
3209 3401
3210 $TICK_WATCHER->start; 3402 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3403 }
3404
3405 utime time, time, $RUNTIMEFILE;
3406
3407 # no (long-running) fork's whatsoever before this point(!)
3408 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3409
3211 Event::loop; 3410 EV::loop;
3212} 3411}
3213 3412
3214############################################################################# 3413#############################################################################
3215# initialisation and cleanup 3414# initialisation and cleanup
3216 3415
3217# install some emergency cleanup handlers 3416# install some emergency cleanup handlers
3218BEGIN { 3417BEGIN {
3418 our %SIGWATCHER = ();
3219 for my $signal (qw(INT HUP TERM)) { 3419 for my $signal (qw(INT HUP TERM)) {
3220 Event->signal ( 3420 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3221 reentrant => 0,
3222 data => WF_AUTOCANCEL,
3223 signal => $signal,
3224 prio => 0,
3225 cb => sub {
3226 cf::cleanup "SIG$signal"; 3421 cf::cleanup "SIG$signal";
3227 },
3228 ); 3422 };
3229 } 3423 }
3230} 3424}
3231 3425
3232sub write_runtime { 3426sub write_runtime_sync {
3233 my $runtime = "$LOCALDIR/runtime";
3234
3235 # first touch the runtime file to show we are still running: 3427 # first touch the runtime file to show we are still running:
3236 # the fsync below can take a very very long time. 3428 # the fsync below can take a very very long time.
3237 3429
3238 IO::AIO::aio_utime $runtime, undef, undef; 3430 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3239 3431
3240 my $guard = cf::lock_acquire "write_runtime"; 3432 my $guard = cf::lock_acquire "write_runtime";
3241 3433
3242 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3434 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3243 or return; 3435 or return;
3244 3436
3245 my $value = $cf::RUNTIME + 90 + 10; 3437 my $value = $cf::RUNTIME + 90 + 10;
3246 # 10 is the runtime save interval, for a monotonic clock 3438 # 10 is the runtime save interval, for a monotonic clock
3247 # 60 allows for the watchdog to kill the server. 3439 # 60 allows for the watchdog to kill the server.
3257 aio_utime $fh, undef, undef; 3449 aio_utime $fh, undef, undef;
3258 3450
3259 close $fh 3451 close $fh
3260 or return; 3452 or return;
3261 3453
3262 aio_rename "$runtime~", $runtime 3454 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3263 and return; 3455 and return;
3264 3456
3265 warn "runtime file written.\n"; 3457 warn "runtime file written.\n";
3266 3458
3267 1 3459 1
3460}
3461
3462our $uuid_lock;
3463our $uuid_skip;
3464
3465sub write_uuid_sync($) {
3466 $uuid_skip ||= $_[0];
3467
3468 return if $uuid_lock;
3469 local $uuid_lock = 1;
3470
3471 my $uuid = "$LOCALDIR/uuid";
3472
3473 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3474 or return;
3475
3476 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3477 $uuid_skip = 0;
3478
3479 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3480 and return;
3481
3482 # always fsync - this file is important
3483 aio_fsync $fh
3484 and return;
3485
3486 close $fh
3487 or return;
3488
3489 aio_rename "$uuid~", $uuid
3490 and return;
3491
3492 warn "uuid file written ($value).\n";
3493
3494 1
3495
3496}
3497
3498sub write_uuid($$) {
3499 my ($skip, $sync) = @_;
3500
3501 $sync ? write_uuid_sync $skip
3502 : async { write_uuid_sync $skip };
3268} 3503}
3269 3504
3270sub emergency_save() { 3505sub emergency_save() {
3271 my $freeze_guard = cf::freeze_mainloop; 3506 my $freeze_guard = cf::freeze_mainloop;
3272 3507
3278 # and maps saved/destroyed asynchronously. 3513 # and maps saved/destroyed asynchronously.
3279 warn "begin emergency player save\n"; 3514 warn "begin emergency player save\n";
3280 for my $login (keys %cf::PLAYER) { 3515 for my $login (keys %cf::PLAYER) {
3281 my $pl = $cf::PLAYER{$login} or next; 3516 my $pl = $cf::PLAYER{$login} or next;
3282 $pl->valid or next; 3517 $pl->valid or next;
3518 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3283 $pl->save; 3519 $pl->save;
3284 } 3520 }
3285 warn "end emergency player save\n"; 3521 warn "end emergency player save\n";
3286 3522
3287 warn "begin emergency map save\n"; 3523 warn "begin emergency map save\n";
3293 warn "end emergency map save\n"; 3529 warn "end emergency map save\n";
3294 3530
3295 warn "begin emergency database checkpoint\n"; 3531 warn "begin emergency database checkpoint\n";
3296 BDB::db_env_txn_checkpoint $DB_ENV; 3532 BDB::db_env_txn_checkpoint $DB_ENV;
3297 warn "end emergency database checkpoint\n"; 3533 warn "end emergency database checkpoint\n";
3534
3535 warn "begin write uuid\n";
3536 write_uuid_sync 1;
3537 warn "end write uuid\n";
3298 }; 3538 };
3299 3539
3300 warn "leave emergency perl save\n"; 3540 warn "leave emergency perl save\n";
3301} 3541}
3302 3542
3303sub post_cleanup { 3543sub post_cleanup {
3304 my ($make_core) = @_; 3544 my ($make_core) = @_;
3305 3545
3306 warn Carp::longmess "post_cleanup backtrace" 3546 warn Carp::longmess "post_cleanup backtrace"
3307 if $make_core; 3547 if $make_core;
3548
3549 my $fh = pidfile;
3550 unlink $PIDFILE if <$fh> == $$;
3308} 3551}
3552
3553# a safer delete_package, copied from Symbol
3554sub clear_package($) {
3555 my $pkg = shift;
3556
3557 # expand to full symbol table name if needed
3558 unless ($pkg =~ /^main::.*::$/) {
3559 $pkg = "main$pkg" if $pkg =~ /^::/;
3560 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3561 $pkg .= '::' unless $pkg =~ /::$/;
3562 }
3563
3564 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3565 my $stem_symtab = *{$stem}{HASH};
3566
3567 defined $stem_symtab and exists $stem_symtab->{$leaf}
3568 or return;
3569
3570 # clear all symbols
3571 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3572 for my $name (keys %$leaf_symtab) {
3573 _gv_clear *{"$pkg$name"};
3574# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3575 }
3576 warn "cleared package #$pkg\n";#d#
3577}
3578
3579our $RELOAD; # how many times to reload
3309 3580
3310sub do_reload_perl() { 3581sub do_reload_perl() {
3311 # can/must only be called in main 3582 # can/must only be called in main
3312 if ($Coro::current != $Coro::main) { 3583 if ($Coro::current != $Coro::main) {
3313 warn "can only reload from main coroutine"; 3584 warn "can only reload from main coroutine";
3314 return; 3585 return;
3315 } 3586 }
3316 3587
3588 return if $RELOAD++;
3589
3590 while ($RELOAD) {
3317 warn "reloading..."; 3591 warn "reloading...";
3318 3592
3319 warn "entering sync_job"; 3593 warn "entering sync_job";
3320 3594
3321 cf::sync_job { 3595 cf::sync_job {
3322 cf::write_runtime; # external watchdog should not bark 3596 cf::write_runtime_sync; # external watchdog should not bark
3323 cf::emergency_save; 3597 cf::emergency_save;
3324 cf::write_runtime; # external watchdog should not bark 3598 cf::write_runtime_sync; # external watchdog should not bark
3325 3599
3326 warn "syncing database to disk"; 3600 warn "syncing database to disk";
3327 BDB::db_env_txn_checkpoint $DB_ENV; 3601 BDB::db_env_txn_checkpoint $DB_ENV;
3328 3602
3329 # if anything goes wrong in here, we should simply crash as we already saved 3603 # if anything goes wrong in here, we should simply crash as we already saved
3330 3604
3331 warn "cancelling all WF_AUTOCANCEL watchers";
3332 for (Event::all_watchers) {
3333 $_->cancel if $_->data & WF_AUTOCANCEL;
3334 }
3335
3336 warn "flushing outstanding aio requests"; 3605 warn "flushing outstanding aio requests";
3337 for (;;) {
3338 BDB::flush;
3339 IO::AIO::flush;
3340 Coro::cede;
3341 last unless IO::AIO::nreqs || BDB::nreqs; 3606 while (IO::AIO::nreqs || BDB::nreqs) {
3342 warn "iterate..."; 3607 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3343 }
3344
3345 ++$RELOAD;
3346
3347 warn "cancelling all extension coros";
3348 $_->cancel for values %EXT_CORO;
3349 %EXT_CORO = ();
3350
3351 warn "removing commands";
3352 %COMMAND = ();
3353
3354 warn "removing ext/exti commands";
3355 %EXTCMD = ();
3356 %EXTICMD = ();
3357
3358 warn "unloading/nuking all extensions";
3359 for my $pkg (@EXTS) {
3360 warn "... unloading $pkg";
3361
3362 if (my $cb = $pkg->can ("unload")) {
3363 eval {
3364 $cb->($pkg);
3365 1
3366 } or warn "$pkg unloaded, but with errors: $@";
3367 } 3608 }
3368 3609
3369 warn "... nuking $pkg"; 3610 warn "cancelling all extension coros";
3370 Symbol::delete_package $pkg; 3611 $_->cancel for values %EXT_CORO;
3371 } 3612 %EXT_CORO = ();
3372 3613
3373 warn "unloading all perl modules loaded from $LIBDIR"; 3614 warn "removing commands";
3374 while (my ($k, $v) = each %INC) { 3615 %COMMAND = ();
3375 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3376 3616
3617 warn "removing ext/exti commands";
3618 %EXTCMD = ();
3619 %EXTICMD = ();
3620
3621 warn "unloading/nuking all extensions";
3622 for my $pkg (@EXTS) {
3377 warn "... unloading $k"; 3623 warn "... unloading $pkg";
3378 delete $INC{$k};
3379 3624
3380 $k =~ s/\.pm$//;
3381 $k =~ s/\//::/g;
3382
3383 if (my $cb = $k->can ("unload_module")) { 3625 if (my $cb = $pkg->can ("unload")) {
3626 eval {
3384 $cb->(); 3627 $cb->($pkg);
3628 1
3629 } or warn "$pkg unloaded, but with errors: $@";
3630 }
3631
3632 warn "... clearing $pkg";
3633 clear_package $pkg;
3385 } 3634 }
3386 3635
3387 Symbol::delete_package $k; 3636 warn "unloading all perl modules loaded from $LIBDIR";
3637 while (my ($k, $v) = each %INC) {
3638 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3639
3640 warn "... unloading $k";
3641 delete $INC{$k};
3642
3643 $k =~ s/\.pm$//;
3644 $k =~ s/\//::/g;
3645
3646 if (my $cb = $k->can ("unload_module")) {
3647 $cb->();
3648 }
3649
3650 clear_package $k;
3388 } 3651 }
3389 3652
3390 warn "getting rid of safe::, as good as possible"; 3653 warn "getting rid of safe::, as good as possible";
3391 Symbol::delete_package "safe::$_" 3654 clear_package "safe::$_"
3392 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3655 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3393 3656
3394 warn "unloading cf.pm \"a bit\""; 3657 warn "unloading cf.pm \"a bit\"";
3395 delete $INC{"cf.pm"}; 3658 delete $INC{"cf.pm"};
3396 delete $INC{"cf/pod.pm"}; 3659 delete $INC{"cf/pod.pm"};
3397 3660
3398 # don't, removes xs symbols, too, 3661 # don't, removes xs symbols, too,
3399 # and global variables created in xs 3662 # and global variables created in xs
3400 #Symbol::delete_package __PACKAGE__; 3663 #clear_package __PACKAGE__;
3401 3664
3402 warn "unload completed, starting to reload now"; 3665 warn "unload completed, starting to reload now";
3403 3666
3404 warn "reloading cf.pm"; 3667 warn "reloading cf.pm";
3405 require cf; 3668 require cf;
3406 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3669 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3407 3670
3408 warn "loading config and database again"; 3671 warn "loading config and database again";
3409 cf::reload_config; 3672 cf::reload_config;
3410 3673
3411 warn "loading extensions"; 3674 warn "loading extensions";
3412 cf::load_extensions; 3675 cf::load_extensions;
3413 3676
3414 warn "reattaching attachments to objects/players"; 3677 warn "reattaching attachments to objects/players";
3415 _global_reattach; # objects, sockets 3678 _global_reattach; # objects, sockets
3416 warn "reattaching attachments to maps"; 3679 warn "reattaching attachments to maps";
3417 reattach $_ for values %MAP; 3680 reattach $_ for values %MAP;
3418 warn "reattaching attachments to players"; 3681 warn "reattaching attachments to players";
3419 reattach $_ for values %PLAYER; 3682 reattach $_ for values %PLAYER;
3420 3683
3421 warn "leaving sync_job"; 3684 warn "leaving sync_job";
3422 3685
3423 1 3686 1
3424 } or do { 3687 } or do {
3425 warn $@; 3688 warn $@;
3426 warn "error while reloading, exiting."; 3689 cf::cleanup "error while reloading, exiting.";
3427 exit 1;
3428 }; 3690 };
3429 3691
3430 warn "reloaded"; 3692 warn "reloaded";
3693 --$RELOAD;
3694 }
3431}; 3695};
3432 3696
3433our $RELOAD_WATCHER; # used only during reload 3697our $RELOAD_WATCHER; # used only during reload
3434 3698
3435sub reload_perl() { 3699sub reload_perl() {
3436 # doing reload synchronously and two reloads happen back-to-back, 3700 # doing reload synchronously and two reloads happen back-to-back,
3437 # coro crashes during coro_state_free->destroy here. 3701 # coro crashes during coro_state_free->destroy here.
3438 3702
3439 $RELOAD_WATCHER ||= Event->timer ( 3703 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3440 reentrant => 0,
3441 after => 0,
3442 data => WF_AUTOCANCEL,
3443 cb => sub {
3444 do_reload_perl; 3704 do_reload_perl;
3445 undef $RELOAD_WATCHER; 3705 undef $RELOAD_WATCHER;
3446 },
3447 ); 3706 };
3448} 3707}
3449 3708
3450register_command "reload" => sub { 3709register_command "reload" => sub {
3451 my ($who, $arg) = @_; 3710 my ($who, $arg) = @_;
3452 3711
3465 3724
3466our @WAIT_FOR_TICK; 3725our @WAIT_FOR_TICK;
3467our @WAIT_FOR_TICK_BEGIN; 3726our @WAIT_FOR_TICK_BEGIN;
3468 3727
3469sub wait_for_tick { 3728sub wait_for_tick {
3470 return unless $TICK_WATCHER->is_active;
3471 return if $Coro::current == $Coro::main; 3729 return if tick_inhibit || $Coro::current == $Coro::main;
3472 3730
3473 my $signal = new Coro::Signal; 3731 my $signal = new Coro::Signal;
3474 push @WAIT_FOR_TICK, $signal; 3732 push @WAIT_FOR_TICK, $signal;
3475 $signal->wait; 3733 $signal->wait;
3476} 3734}
3477 3735
3478sub wait_for_tick_begin { 3736sub wait_for_tick_begin {
3479 return unless $TICK_WATCHER->is_active;
3480 return if $Coro::current == $Coro::main; 3737 return if tick_inhibit || $Coro::current == $Coro::main;
3481 3738
3482 my $signal = new Coro::Signal; 3739 my $signal = new Coro::Signal;
3483 push @WAIT_FOR_TICK_BEGIN, $signal; 3740 push @WAIT_FOR_TICK_BEGIN, $signal;
3484 $signal->wait; 3741 $signal->wait;
3485} 3742}
3486 3743
3487$TICK_WATCHER = Event->timer ( 3744sub tick {
3488 reentrant => 0,
3489 parked => 1,
3490 prio => 0,
3491 at => $NEXT_TICK || $TICK,
3492 data => WF_AUTOCANCEL,
3493 cb => sub {
3494 if ($Coro::current != $Coro::main) { 3745 if ($Coro::current != $Coro::main) {
3495 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3746 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3496 unless ++$bug_warning > 10; 3747 unless ++$bug_warning > 10;
3497 return; 3748 return;
3498 } 3749 }
3499 3750
3500 $NOW = $tick_start = Event::time;
3501
3502 cf::server_tick; # one server iteration 3751 cf::server_tick; # one server iteration
3503 3752
3504 $RUNTIME += $TICK;
3505 $NEXT_TICK += $TICK;
3506
3507 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3753 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3508 $NEXT_RUNTIME_WRITE = $NOW + 10; 3754 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3509 Coro::async_pool { 3755 Coro::async_pool {
3510 $Coro::current->{desc} = "runtime saver"; 3756 $Coro::current->{desc} = "runtime saver";
3511 write_runtime 3757 write_runtime_sync
3512 or warn "ERROR: unable to write runtime file: $!"; 3758 or warn "ERROR: unable to write runtime file: $!";
3513 };
3514 } 3759 };
3760 }
3515 3761
3516 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3762 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3517 $sig->send; 3763 $sig->send;
3518 } 3764 }
3519 while (my $sig = shift @WAIT_FOR_TICK) { 3765 while (my $sig = shift @WAIT_FOR_TICK) {
3520 $sig->send; 3766 $sig->send;
3521 } 3767 }
3522 3768
3523 $NOW = Event::time; 3769 $LOAD = ($NOW - $TICK_START) / $TICK;
3524
3525 # if we are delayed by four ticks or more, skip them all
3526 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3527
3528 $TICK_WATCHER->at ($NEXT_TICK);
3529 $TICK_WATCHER->start;
3530
3531 $LOAD = ($NOW - $tick_start) / $TICK;
3532 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3770 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3533 3771
3534 _post_tick; 3772 if (0) {
3773 if ($NEXT_TICK) {
3774 my $jitter = $TICK_START - $NEXT_TICK;
3775 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3776 warn "jitter $JITTER\n";#d#
3777 }
3535 }, 3778 }
3536); 3779}
3537 3780
3538{ 3781{
3782 # configure BDB
3783
3539 BDB::min_parallel 8; 3784 BDB::min_parallel 8;
3540 BDB::max_poll_time $TICK * 0.1; 3785 BDB::max_poll_reqs $TICK * 0.1;
3541 $BDB_POLL_WATCHER = Event->io ( 3786 $AnyEvent::BDB::WATCHER->priority (1);
3542 reentrant => 0,
3543 fd => BDB::poll_fileno,
3544 poll => 'r',
3545 prio => 0,
3546 data => WF_AUTOCANCEL,
3547 cb => \&BDB::poll_cb,
3548 );
3549
3550 BDB::set_sync_prepare {
3551 my $status;
3552 my $current = $Coro::current;
3553 (
3554 sub {
3555 $status = $!;
3556 $current->ready; undef $current;
3557 },
3558 sub {
3559 Coro::schedule while defined $current;
3560 $! = $status;
3561 },
3562 )
3563 };
3564 3787
3565 unless ($DB_ENV) { 3788 unless ($DB_ENV) {
3566 $DB_ENV = BDB::db_env_create; 3789 $DB_ENV = BDB::db_env_create;
3567 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3790 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3568 | BDB::LOG_AUTOREMOVE, 1); 3791 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3792 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3569 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3793 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3570 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3794 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3571 3795
3572 cf::sync_job { 3796 cf::sync_job {
3573 eval { 3797 eval {
3583 3807
3584 cf::cleanup "db_env_open(db): $@" if $@; 3808 cf::cleanup "db_env_open(db): $@" if $@;
3585 }; 3809 };
3586 } 3810 }
3587 3811
3588 $BDB_DEADLOCK_WATCHER = Event->timer ( 3812 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3589 after => 3,
3590 interval => 1,
3591 hard => 1,
3592 prio => 0,
3593 data => WF_AUTOCANCEL,
3594 cb => sub {
3595 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3813 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3596 },
3597 ); 3814 };
3598 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3815 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3599 after => 11,
3600 interval => 60,
3601 hard => 1,
3602 prio => 0,
3603 data => WF_AUTOCANCEL,
3604 cb => sub {
3605 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3816 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3606 },
3607 ); 3817 };
3608 $BDB_TRICKLE_WATCHER = Event->timer ( 3818 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3609 after => 5,
3610 interval => 10,
3611 hard => 1,
3612 prio => 0,
3613 data => WF_AUTOCANCEL,
3614 cb => sub {
3615 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3819 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3616 },
3617 ); 3820 };
3618} 3821}
3619 3822
3620{ 3823{
3824 # configure IO::AIO
3825
3621 IO::AIO::min_parallel 8; 3826 IO::AIO::min_parallel 8;
3622
3623 undef $Coro::AIO::WATCHER;
3624 IO::AIO::max_poll_time $TICK * 0.1; 3827 IO::AIO::max_poll_time $TICK * 0.1;
3625 $AIO_POLL_WATCHER = Event->io ( 3828 undef $AnyEvent::AIO::WATCHER;
3626 reentrant => 0,
3627 data => WF_AUTOCANCEL,
3628 fd => IO::AIO::poll_fileno,
3629 poll => 'r',
3630 prio => 0,
3631 cb => \&IO::AIO::poll_cb,
3632 );
3633} 3829}
3634 3830
3635my $_log_backtrace; 3831my $_log_backtrace;
3636 3832
3637sub _log_backtrace { 3833sub _log_backtrace {
3640 $msg =~ s/\n//; 3836 $msg =~ s/\n//;
3641 3837
3642 # limit the # of concurrent backtraces 3838 # limit the # of concurrent backtraces
3643 if ($_log_backtrace < 2) { 3839 if ($_log_backtrace < 2) {
3644 ++$_log_backtrace; 3840 ++$_log_backtrace;
3841 my $perl_bt = Carp::longmess $msg;
3645 async { 3842 async {
3646 $Coro::current->{desc} = "abt $msg"; 3843 $Coro::current->{desc} = "abt $msg";
3647 3844
3648 my @bt = fork_call { 3845 my @bt = fork_call {
3649 @addr = map { sprintf "%x", $_ } @addr; 3846 @addr = map { sprintf "%x", $_ } @addr;
3660 } 3857 }
3661 3858
3662 @funcs 3859 @funcs
3663 }; 3860 };
3664 3861
3665 LOG llevInfo, "[ABT] $msg\n"; 3862 LOG llevInfo, "[ABT] $perl_bt\n";
3863 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3666 LOG llevInfo, "[ABT] $_\n" for @bt; 3864 LOG llevInfo, "[ABT] $_\n" for @bt;
3667 --$_log_backtrace; 3865 --$_log_backtrace;
3668 }; 3866 };
3669 } else { 3867 } else {
3670 LOG llevInfo, "[ABT] $msg\n"; 3868 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines