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.384 by root, Fri Oct 12 18:17:16 2007 UTC vs.
Revision 1.448 by root, Fri Sep 19 05:30:23 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 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
41Compress::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 68
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70
71{
72 # very ugly, but ensure we acquire the storable lock
73
74 sub net_mstore {
75 my $guard = Coro::Storable::guard;
76 &Storable::net_mstore
77 }
78
79 sub mretrieve {
80 my $guard = Coro::Storable::guard;
81 &Storable::mretrieve
82 }
83
84 Compress::LZF::set_serializer "Coro::Storable", "cf::net_mstore", "cf::mretrieve";
85 Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
86}
49 87
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 88sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 89
52our %COMMAND = (); 90our %COMMAND = ();
53our %COMMAND_TIME = (); 91our %COMMAND_TIME = ();
59our %EXT_MAP = (); # pluggable maps 97our %EXT_MAP = (); # pluggable maps
60 98
61our $RELOAD; # number of reloads so far 99our $RELOAD; # number of reloads so far
62our @EVENT; 100our @EVENT;
63 101
64our $CONFDIR = confdir; 102our $CONFDIR = confdir;
65our $DATADIR = datadir; 103our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 104our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 105our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 106our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 107our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 108our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 109our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 110our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 111our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 112our $BDBDIR = "$LOCALDIR/db";
113our $PIDFILE = "$LOCALDIR/pid";
114our $RUNTIMEFILE = "$LOCALDIR/runtime";
115
116our %RESOURCE;
75 117
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 118our $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 119our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 120our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 121our $USE_FSYNC = 1; # use fsync to write maps - default off
83 122
84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 123our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 124our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 125our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 126our $DB_ENV;
89 127
90our %CFG; 128our %CFG;
91 129
92our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 131our $RUNTIME;
132our $NOW;
94 133
95our (%PLAYER, %PLAYER_LOADING); # all users 134our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 135our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 136our $LINK_MAP; # the special {link} map, which is always available
98 137
99# used to convert map paths into valid unix filenames by replacing / by ∕ 138# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 139our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 140
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 141our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
143our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
105 145
106binmode STDOUT; 146binmode STDOUT;
107binmode STDERR; 147binmode STDERR;
108 148
109# read virtual server time, if available 149# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 150unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 151 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 152 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 153 $RUNTIME = <$fh> + 0.;
114} 154}
115 155
116mkdir $_ 156mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 157 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
162 202
163The raw value load value from the last tick. 203The raw value load value from the last tick.
164 204
165=item %cf::CFG 205=item %cf::CFG
166 206
167Configuration for the server, loaded from C</etc/crossfire/config>, or 207Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 208from wherever your confdir points to.
169 209
170=item cf::wait_for_tick, cf::wait_for_tick_begin 210=item cf::wait_for_tick, cf::wait_for_tick_begin
171 211
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 212These 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; 233 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 234
195 LOG llevError, $msg; 235 LOG llevError, $msg;
196 }; 236 };
197} 237}
238
239$Coro::State::DIEHOOK = sub {
240 return unless $^S eq 0; # "eq", not "=="
241
242 if ($Coro::current == $Coro::main) {#d#
243 warn "DIEHOOK called in main context, Coro bug?\n";#d#
244 return;#d#
245 }#d#
246
247 # kill coroutine otherwise
248 warn Carp::longmess $_[0];
249 Coro::terminate
250};
251
252$SIG{__DIE__} = sub { }; #d#?
198 253
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 254@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 255@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 256@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 257@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 264for my $pkg (qw(
210 cf::global cf::attachable 265 cf::global cf::attachable
211 cf::object cf::object::player 266 cf::object cf::object::player
212 cf::client cf::player 267 cf::client cf::player
213 cf::arch cf::living 268 cf::arch cf::living
269 cf::map cf::mapspace
214 cf::map cf::party cf::region 270 cf::party cf::region
215)) { 271)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 272 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 273}
219 274
220$Event::DIED = sub { 275$EV::DIED = sub {
221 warn "error in event callback: @_"; 276 warn "error in event callback: @_";
222}; 277};
223 278
224############################################################################# 279#############################################################################
225 280
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 303 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 304 $d
250 } || "[unable to dump $_[0]: '$@']"; 305 } || "[unable to dump $_[0]: '$@']";
251} 306}
252 307
253=item $ref = cf::from_json $json 308=item $ref = cf::decode_json $json
254 309
255Converts a JSON string into the corresponding perl data structure. 310Converts a JSON string into the corresponding perl data structure.
256 311
257=item $json = cf::to_json $ref 312=item $json = cf::encode_json $ref
258 313
259Converts a perl data structure into its JSON representation. 314Converts a perl data structure into its JSON representation.
260 315
261=cut 316=cut
262 317
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 318our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 319
265sub to_json ($) { $json_coder->encode ($_[0]) } 320sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 321sub decode_json($) { $json_coder->decode ($_[0]) }
267 322
268=item cf::lock_wait $string 323=item cf::lock_wait $string
269 324
270Wait until the given lock is available. See cf::lock_acquire. 325Wait until the given lock is available. See cf::lock_acquire.
271 326
327 382
328 ! ! $LOCK{$key} 383 ! ! $LOCK{$key}
329} 384}
330 385
331sub freeze_mainloop { 386sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 387 tick_inhibit_inc;
333 388
334 my $guard = Coro::guard { 389 Coro::guard \&tick_inhibit_dec;
335 $TICK_WATCHER->start; 390}
336 }; 391
337 $TICK_WATCHER->stop; 392=item cf::periodic $interval, $cb
338 $guard 393
394Like EV::periodic, but randomly selects a starting point so that the actions
395get spread over timer.
396
397=cut
398
399sub periodic($$) {
400 my ($interval, $cb) = @_;
401
402 my $start = rand List::Util::min 180, $interval;
403
404 EV::periodic $start, $interval, 0, $cb
339} 405}
340 406
341=item cf::get_slot $time[, $priority[, $name]] 407=item cf::get_slot $time[, $priority[, $name]]
342 408
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 409Allocate $time seconds of blocking CPU time at priority C<$priority>:
383 } 449 }
384 } 450 }
385}; 451};
386 452
387sub get_slot($;$$) { 453sub get_slot($;$$) {
454 return if tick_inhibit || $Coro::current == $Coro::main;
455
388 my ($time, $pri, $name) = @_; 456 my ($time, $pri, $name) = @_;
389 457
390 $time = $TICK * .6 if $time > $TICK * .6; 458 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal; 459 my $sig = new Coro::Signal;
392 460
406 474
407BEGIN { *async = \&Coro::async_pool } 475BEGIN { *async = \&Coro::async_pool }
408 476
409=item cf::sync_job { BLOCK } 477=item cf::sync_job { BLOCK }
410 478
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 479The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 480is 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 481partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 482acceptable.
415 483
416If it must be done, put the blocking parts into C<sync_job>. This will run 484If 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 485the given BLOCK in another coroutine while waiting for the result. The
422 490
423sub sync_job(&) { 491sub sync_job(&) {
424 my ($job) = @_; 492 my ($job) = @_;
425 493
426 if ($Coro::current == $Coro::main) { 494 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 495 my $time = EV::time;
428 496
429 # this is the main coro, too bad, we have to block 497 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 498 # till the operation succeeds, freezing the server :/
431 499
432 LOG llevError | logBacktrace, Carp::longmess "sync job";#d# 500 LOG llevError, Carp::longmess "sync job";#d#
433 501
434 # TODO: use suspend/resume instead
435 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 502 my $freeze_guard = freeze_mainloop;
437 503
438 my $busy = 1; 504 my $busy = 1;
439 my @res; 505 my @res;
440 506
444 warn $@ if $@; 510 warn $@ if $@;
445 undef $busy; 511 undef $busy;
446 })->prio (Coro::PRIO_MAX); 512 })->prio (Coro::PRIO_MAX);
447 513
448 while ($busy) { 514 while ($busy) {
449 Coro::cede or Event::one_event; 515 if (Coro::nready) {
516 Coro::cede_notself;
517 } else {
518 EV::loop EV::LOOP_ONESHOT;
450 } 519 }
520 }
451 521
452 $time = Event::time - $time; 522 my $time = EV::time - $time;
453 523
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 524 $TICK_START += $time; # do not account sync jobs to server load
458 525
459 wantarray ? @res : $res[0] 526 wantarray ? @res : $res[0]
460 } else { 527 } else {
461 # we are in another coroutine, how wonderful, everything just works 528 # we are in another coroutine, how wonderful, everything just works
462 529
487=item fork_call { }, $args 554=item fork_call { }, $args
488 555
489Executes the given code block with the given arguments in a seperate 556Executes the given code block with the given arguments in a seperate
490process, returning the results. Everything must be serialisable with 557process, returning the results. Everything must be serialisable with
491Coro::Storable. May, of course, block. Note that the executed sub may 558Coro::Storable. May, of course, block. Note that the executed sub may
492never block itself or use any form of Event handling. 559never block itself or use any form of event handling.
493 560
494=cut 561=cut
495 562
496sub fork_call(&@) { 563sub fork_call(&@) {
497 my ($cb, @args) = @_; 564 my ($cb, @args) = @_;
504 reset_signals; 571 reset_signals;
505 &$cb 572 &$cb
506 }, @args; 573 }, @args;
507 574
508 wantarray ? @res : $res[-1] 575 wantarray ? @res : $res[-1]
576}
577
578=item $coin = coin_from_name $name
579
580=cut
581
582our %coin_alias = (
583 "silver" => "silvercoin",
584 "silvercoin" => "silvercoin",
585 "silvercoins" => "silvercoin",
586 "gold" => "goldcoin",
587 "goldcoin" => "goldcoin",
588 "goldcoins" => "goldcoin",
589 "platinum" => "platinacoin",
590 "platinumcoin" => "platinacoin",
591 "platinumcoins" => "platinacoin",
592 "platina" => "platinacoin",
593 "platinacoin" => "platinacoin",
594 "platinacoins" => "platinacoin",
595 "royalty" => "royalty",
596 "royalties" => "royalty",
597);
598
599sub coin_from_name($) {
600 $coin_alias{$_[0]}
601 ? cf::arch::find $coin_alias{$_[0]}
602 : undef
509} 603}
510 604
511=item $value = cf::db_get $family => $key 605=item $value = cf::db_get $family => $key
512 606
513Returns a single value from the environment database. 607Returns a single value from the environment database.
652 746
653############################################################################# 747#############################################################################
654 748
655=head2 ATTACHABLE OBJECTS 749=head2 ATTACHABLE OBJECTS
656 750
657Many objects in crossfire are so-called attachable objects. That means you can 751Many objects in deliantra are so-called attachable objects. That means you can
658attach callbacks/event handlers (a collection of which is called an "attachment") 752attach callbacks/event handlers (a collection of which is called an "attachment")
659to it. All such attachable objects support the following methods. 753to it. All such attachable objects support the following methods.
660 754
661In the following description, CLASS can be any of C<global>, C<object> 755In 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 756C<player>, C<client> or C<map> (i.e. the attachable objects in
663Crossfire TRT). 757Deliantra).
664 758
665=over 4 759=over 4
666 760
667=item $attachable->attach ($attachment, key => $value...) 761=item $attachable->attach ($attachment, key => $value...)
668 762
712=item cf::CLASS::attachment $name, ... 806=item cf::CLASS::attachment $name, ...
713 807
714Register an attachment by C<$name> through which attachable objects of the 808Register an attachment by C<$name> through which attachable objects of the
715given CLASS can refer to this attachment. 809given CLASS can refer to this attachment.
716 810
717Some classes such as crossfire maps and objects can specify attachments 811Some classes such as deliantra maps and objects can specify attachments
718that are attached at load/instantiate time, thus the need for a name. 812that are attached at load/instantiate time, thus the need for a name.
719 813
720These calls expect any number of the following handler/hook descriptions: 814These calls expect any number of the following handler/hook descriptions:
721 815
722=over 4 816=over 4
950 } 1044 }
951 1045
952 0 1046 0
953} 1047}
954 1048
955=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1049=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
956 1050
957=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1051=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
958 1052
959Generate an object-specific event with the given arguments. 1053Generate an object-specific event with the given arguments.
960 1054
966 1060
967=cut 1061=cut
968 1062
969############################################################################# 1063#############################################################################
970# object support 1064# object support
971#
972 1065
1066sub _object_equal($$);
1067sub _object_equal($$) {
1068 my ($a, $b) = @_;
1069
1070 return 0 unless (ref $a) eq (ref $b);
1071
1072 if ("HASH" eq ref $a) {
1073 my @ka = keys %$a;
1074 my @kb = keys %$b;
1075
1076 return 0 if @ka != @kb;
1077
1078 for (0 .. $#ka) {
1079 return 0 unless $ka[$_] eq $kb[$_];
1080 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1081 }
1082
1083 } elsif ("ARRAY" eq ref $a) {
1084
1085 return 0 if @$a != @$b;
1086
1087 for (0 .. $#$a) {
1088 return 0 unless _object_equal $a->[$_], $b->[$_];
1089 }
1090
1091 } elsif ($a ne $b) {
1092 return 0;
1093 }
1094
1095 1
1096}
1097
1098our $SLOW_MERGES;#d#
973sub _can_merge { 1099sub _can_merge {
974 my ($ob1, $ob2) = @_; 1100 my ($ob1, $ob2) = @_;
975 1101
976 local $Storable::canonical = 1; 1102 ++$SLOW_MERGES;#d#
977 my $fob1 = Storable::freeze $ob1;
978 my $fob2 = Storable::freeze $ob2;
979 1103
980 $fob1 eq $fob2 1104 # we do the slow way here
1105 return _object_equal $ob1, $ob2
981} 1106}
982 1107
983sub reattach { 1108sub reattach {
984 # basically do the same as instantiate, without calling instantiate 1109 # basically do the same as instantiate, without calling instantiate
985 my ($obj) = @_; 1110 my ($obj) = @_;
986 1111
1112 # no longer needed after getting rid of delete_package?
987 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1113 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
988 1114
989 my $registry = $obj->registry; 1115 my $registry = $obj->registry;
990 1116
991 @$registry = (); 1117 @$registry = ();
992 1118
1007cf::attachable->attach ( 1133cf::attachable->attach (
1008 prio => -1000000, 1134 prio => -1000000,
1009 on_instantiate => sub { 1135 on_instantiate => sub {
1010 my ($obj, $data) = @_; 1136 my ($obj, $data) = @_;
1011 1137
1012 $data = from_json $data; 1138 $data = decode_json $data;
1013 1139
1014 for (@$data) { 1140 for (@$data) {
1015 my ($name, $args) = @$_; 1141 my ($name, $args) = @$_;
1016 1142
1017 $obj->attach ($name, %{$args || {} }); 1143 $obj->attach ($name, %{$args || {} });
1038 utf8::decode (my $decname = $filename); 1164 utf8::decode (my $decname = $filename);
1039 warn sprintf "saving %s (%d,%d)\n", 1165 warn sprintf "saving %s (%d,%d)\n",
1040 $decname, length $$rdata, scalar @$objs; 1166 $decname, length $$rdata, scalar @$objs;
1041 1167
1042 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1168 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1043 chmod SAVE_MODE, $fh; 1169 aio_chmod $fh, SAVE_MODE;
1044 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1170 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1045 aio_fsync $fh if $cf::USE_FSYNC; 1171 aio_fsync $fh if $cf::USE_FSYNC;
1046 close $fh; 1172 aio_close $fh;
1047 1173
1048 if (@$objs) { 1174 if (@$objs) {
1049 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1175 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1176 aio_chmod $fh, SAVE_MODE;
1051 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs }; 1177 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1052 aio_write $fh, 0, (length $data), $data, 0; 1178 aio_write $fh, 0, (length $data), $data, 0;
1053 aio_fsync $fh if $cf::USE_FSYNC; 1179 aio_fsync $fh if $cf::USE_FSYNC;
1054 close $fh; 1180 aio_close $fh;
1055 aio_rename "$filename.pst~", "$filename.pst"; 1181 aio_rename "$filename.pst~", "$filename.pst";
1056 } 1182 }
1057 } else { 1183 } else {
1058 aio_unlink "$filename.pst"; 1184 aio_unlink "$filename.pst";
1059 } 1185 }
1087 1213
1088 unless (aio_stat "$filename.pst") { 1214 unless (aio_stat "$filename.pst") {
1089 (aio_load "$filename.pst", $av) >= 0 1215 (aio_load "$filename.pst", $av) >= 0
1090 or return; 1216 or return;
1091 1217
1092 my $st = eval { Coro::Storable::thaw $av } 1218 my $st = eval { Coro::Storable::thaw $av };
1093 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1094 $av = $st->{objs}; 1219 $av = $st->{objs};
1095 } 1220 }
1096 1221
1097 utf8::decode (my $decname = $filename); 1222 utf8::decode (my $decname = $filename);
1098 warn sprintf "loading %s (%d,%d)\n", 1223 warn sprintf "loading %s (%d,%d)\n",
1229 1354
1230 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1355 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1231 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1356 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1232 1357
1233 $ext{source} = 1358 $ext{source} =
1234 "package $pkg; use strict; use utf8;\n" 1359 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1235 . "#line 1 \"$path\"\n{\n" 1360 . "#line 1 \"$path\"\n{\n"
1236 . $source 1361 . $source
1237 . "\n};\n1"; 1362 . "\n};\n1";
1238 1363
1239 $todo{$base} = \%ext; 1364 $todo{$base} = \%ext;
1255 my $msg = $@ ? "$v->{path}: $@\n" 1380 my $msg = $@ ? "$v->{path}: $@\n"
1256 : "$v->{base}: extension inactive.\n"; 1381 : "$v->{base}: extension inactive.\n";
1257 1382
1258 if (exists $v->{meta}{mandatory}) { 1383 if (exists $v->{meta}{mandatory}) {
1259 warn $msg; 1384 warn $msg;
1260 warn "mandatory extension failed to load, exiting.\n"; 1385 cf::cleanup "mandatory extension failed to load, exiting.";
1261 exit 1;
1262 } 1386 }
1263 1387
1264 warn $msg; 1388 warn $msg;
1265 } 1389 }
1266 1390
1280 1404
1281=back 1405=back
1282 1406
1283=head2 CORE EXTENSIONS 1407=head2 CORE EXTENSIONS
1284 1408
1285Functions and methods that extend core crossfire objects. 1409Functions and methods that extend core deliantra objects.
1286 1410
1287=cut 1411=cut
1288 1412
1289package cf::player; 1413package cf::player;
1290 1414
1355 my $f = new_from_file cf::object::thawer path $login 1479 my $f = new_from_file cf::object::thawer path $login
1356 or return; 1480 or return;
1357 1481
1358 my $pl = cf::player::load_pl $f 1482 my $pl = cf::player::load_pl $f
1359 or return; 1483 or return;
1484
1360 local $cf::PLAYER_LOADING{$login} = $pl; 1485 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs; 1486 $f->resolve_delayed_derefs;
1362 $cf::PLAYER{$login} = $pl 1487 $cf::PLAYER{$login} = $pl
1363 } 1488 }
1364 } 1489 }
1374 1499
1375 return if $pl->{deny_save}; 1500 return if $pl->{deny_save};
1376 1501
1377 aio_mkdir playerdir $pl, 0770; 1502 aio_mkdir playerdir $pl, 0770;
1378 $pl->{last_save} = $cf::RUNTIME; 1503 $pl->{last_save} = $cf::RUNTIME;
1504
1505 cf::get_slot 0.01;
1379 1506
1380 $pl->save_pl ($path); 1507 $pl->save_pl ($path);
1381 cf::cede_to_tick; 1508 cf::cede_to_tick;
1382} 1509}
1383 1510
1415 my ($pl) = @_; 1542 my ($pl) = @_;
1416 1543
1417 my $name = $pl->ob->name; 1544 my $name = $pl->ob->name;
1418 1545
1419 $pl->{deny_save} = 1; 1546 $pl->{deny_save} = 1;
1420 $pl->password ("*"); # this should lock out the player until we nuked the dir 1547 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1421 1548
1422 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1549 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1423 $pl->deactivate; 1550 $pl->deactivate;
1551 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1552 $pl->ob->check_score;
1424 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1553 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1425 $pl->ns->destroy if $pl->ns; 1554 $pl->ns->destroy if $pl->ns;
1426 1555
1427 my $path = playerdir $pl; 1556 my $path = playerdir $pl;
1428 my $temp = "$path~$cf::RUNTIME~deleting~"; 1557 my $temp = "$path~$cf::RUNTIME~deleting~";
1467 1596
1468 for my $login (@$dirs) { 1597 for my $login (@$dirs) {
1469 my $path = path $login; 1598 my $path = path $login;
1470 1599
1471 # a .pst is a dead give-away for a valid player 1600 # a .pst is a dead give-away for a valid player
1472 unless (-e "$path.pst") { 1601 # if no pst file found, open and chekc for blocked users
1602 if (aio_stat "$path.pst") {
1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1603 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1474 aio_read $fh, 0, 512, my $buf, 0 or next; 1604 aio_read $fh, 0, 512, my $buf, 0 or next;
1475 $buf !~ /^password -------------$/m or next; # official not-valid tag 1605 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 } 1606 }
1477 1607
1508 } 1638 }
1509 1639
1510 \@paths 1640 \@paths
1511} 1641}
1512 1642
1513=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1643=item $protocol_xml = $player->expand_cfpod ($cfpod)
1514 1644
1515Expand crossfire pod fragments into protocol xml. 1645Expand deliantra pod fragments into protocol xml.
1516
1517=cut
1518
1519sub expand_cfpod {
1520 ((my $self), (local $_)) = @_;
1521
1522 # escape & and <
1523 s/&/&amp;/g;
1524 s/(?<![BIUGHT])</&lt;/g;
1525
1526 # this is buggy, it needs to properly take care of nested <'s
1527
1528 1 while
1529 # replace B<>, I<>, U<> etc.
1530 s/B<([^\>]*)>/<b>$1<\/b>/
1531 || s/I<([^\>]*)>/<i>$1<\/i>/
1532 || s/U<([^\>]*)>/<u>$1<\/u>/
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1534 # replace G<male|female> tags
1535 || s{G<([^>|]*)\|([^>]*)>}{
1536 $self->gender ? $2 : $1
1537 }ge
1538 # replace H<hint text>
1539 || s{H<([^\>]*)>}
1540 {
1541 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1542 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1543 "")
1544 [$self->{hintmode}]
1545 }ge;
1546
1547 # create single paragraphs (very hackish)
1548 s/(?<=\S)\n(?=\w)/ /g;
1549
1550 # compress some whitespace
1551 s/\s+\n/\n/g; # ws line-ends
1552 s/\n\n+/\n/g; # double lines
1553 s/^\n+//; # beginning lines
1554 s/\n+$//; # ending lines
1555
1556 $_
1557}
1558
1559sub hintmode {
1560 $_[0]{hintmode} = $_[1] if @_ > 1;
1561 $_[0]{hintmode}
1562}
1563 1646
1564=item $player->ext_reply ($msgid, @msg) 1647=item $player->ext_reply ($msgid, @msg)
1565 1648
1566Sends an ext reply to the player. 1649Sends an ext reply to the player.
1567 1650
1634our $MAX_RESET = 3600; 1717our $MAX_RESET = 3600;
1635our $DEFAULT_RESET = 3000; 1718our $DEFAULT_RESET = 3000;
1636 1719
1637sub generate_random_map { 1720sub generate_random_map {
1638 my ($self, $rmp) = @_; 1721 my ($self, $rmp) = @_;
1722
1723 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1724
1639 # mit "rum" bekleckern, nicht 1725 # mit "rum" bekleckern, nicht
1640 $self->_create_random_map ( 1726 $self->_create_random_map (
1641 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1727 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1642 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1728 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1643 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1729 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1765 1851
1766# the temporary/swap location 1852# the temporary/swap location
1767sub save_path { 1853sub save_path {
1768 my ($self) = @_; 1854 my ($self) = @_;
1769 1855
1770 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1856 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1771 "$TMPDIR/$path.map" 1857 "$TMPDIR/$path.map"
1772} 1858}
1773 1859
1774# the unique path, undef == no special unique path 1860# the unique path, undef == no special unique path
1775sub uniq_path { 1861sub uniq_path {
1776 my ($self) = @_; 1862 my ($self) = @_;
1777 1863
1778 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1864 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1779 "$UNIQUEDIR/$path" 1865 "$UNIQUEDIR/$path"
1780} 1866}
1781 1867
1782# and all this just because we cannot iterate over 1868# and all this just because we cannot iterate over
1783# all maps in C++... 1869# all maps in C++...
1881 1967
1882 cf::lock_wait "map_data:$path";#d#remove 1968 cf::lock_wait "map_data:$path";#d#remove
1883 cf::lock_wait "map_find:$path"; 1969 cf::lock_wait "map_find:$path";
1884 1970
1885 $cf::MAP{$path} || do { 1971 $cf::MAP{$path} || do {
1886 my $guard1 = cf::lock_acquire "map_find:$path";
1887 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 1972 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1973 my $guard2 = cf::lock_acquire "map_find:$path";
1888 1974
1889 my $map = new_from_path cf::map $path 1975 my $map = new_from_path cf::map $path
1890 or return; 1976 or return;
1891 1977
1892 $map->{last_save} = $cf::RUNTIME; 1978 $map->{last_save} = $cf::RUNTIME;
1895 or return; 1981 or return;
1896 1982
1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1983 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1898 # doing this can freeze the server in a sync job, obviously 1984 # doing this can freeze the server in a sync job, obviously
1899 #$cf::WAIT_FOR_TICK->wait; 1985 #$cf::WAIT_FOR_TICK->wait;
1986 undef $guard2;
1900 undef $guard1; 1987 undef $guard1;
1901 undef $guard2;
1902 $map->reset; 1988 $map->reset;
1903 return find $path; 1989 return find $path;
1904 } 1990 }
1905 1991
1906 $cf::MAP{$path} = $map 1992 $cf::MAP{$path} = $map
1933 my $f = new_from_file cf::object::thawer $self->{load_path}; 2019 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block; 2020 $f->skip_block;
1935 $self->_load_objects ($f) 2021 $self->_load_objects ($f)
1936 or return; 2022 or return;
1937 2023
1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2024 $self->post_load_original
1939 if delete $self->{load_original}; 2025 if delete $self->{load_original};
1940 2026
1941 if (my $uniq = $self->uniq_path) { 2027 if (my $uniq = $self->uniq_path) {
1942 utf8::encode $uniq; 2028 utf8::encode $uniq;
1943 unless (aio_stat $uniq) { 2029 unless (aio_stat $uniq) {
1969 } 2055 }
1970 2056
1971 $self->{last_save} = $cf::RUNTIME; 2057 $self->{last_save} = $cf::RUNTIME;
1972 $self->last_access ($cf::RUNTIME); 2058 $self->last_access ($cf::RUNTIME);
1973 2059
1974 $self->in_memory (cf::MAP_IN_MEMORY); 2060 $self->in_memory (cf::MAP_ACTIVE);
1975 } 2061 }
1976 2062
1977 $self->post_load; 2063 $self->post_load;
1978} 2064}
1979 2065
2037 my ($path, $origin, $load) = @_; 2123 my ($path, $origin, $load) = @_;
2038 2124
2039 $path = normalise $path, $origin && $origin->{path}; 2125 $path = normalise $path, $origin && $origin->{path};
2040 2126
2041 if (my $map = $cf::MAP{$path}) { 2127 if (my $map = $cf::MAP{$path}) {
2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2128 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2043 } 2129 }
2044 2130
2045 $MAP_PREFETCH{$path} |= $load; 2131 $MAP_PREFETCH{$path} |= $load;
2046 2132
2047 $MAP_PREFETCHER ||= cf::async { 2133 $MAP_PREFETCHER ||= cf::async {
2084 cf::async { 2170 cf::async {
2085 $Coro::current->{desc} = "map player save"; 2171 $Coro::current->{desc} = "map player save";
2086 $_->contr->save for $self->players; 2172 $_->contr->save for $self->players;
2087 }; 2173 };
2088 2174
2175 cf::get_slot 0.02;
2176
2089 if ($uniq) { 2177 if ($uniq) {
2090 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2178 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2091 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2179 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2092 } else { 2180 } else {
2093 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2181 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2101 $self->save; 2189 $self->save;
2102 2190
2103 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2191 my $lock = cf::lock_acquire "map_data:$self->{path}";
2104 2192
2105 return if $self->players; 2193 return if $self->players;
2106 return if $self->in_memory != cf::MAP_IN_MEMORY; 2194 return if $self->in_memory != cf::MAP_ACTIVE;
2107 return if $self->{deny_save}; 2195 return if $self->{deny_save};
2108 2196
2109 $self->in_memory (cf::MAP_SWAPPED); 2197 $self->in_memory (cf::MAP_SWAPPED);
2110 2198
2111 $self->deactivate; 2199 $self->deactivate;
2229 2317
2230sub unique_maps() { 2318sub unique_maps() {
2231 [ 2319 [
2232 map { 2320 map {
2233 utf8::decode $_; 2321 utf8::decode $_;
2234 /\.map$/ 2322 s/\.map$//; # TODO future compatibility hack
2323 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2324 ? ()
2235 ? normalise $_ 2325 : normalise $_
2236 : ()
2237 } @{ aio_readdir $UNIQUEDIR or [] } 2326 } @{ aio_readdir $UNIQUEDIR or [] }
2238 ] 2327 ]
2239} 2328}
2240 2329
2241package cf;
2242
2243=back 2330=back
2244 2331
2245=head3 cf::object 2332=head3 cf::object
2246 2333
2247=cut 2334=cut
2250 2337
2251=over 4 2338=over 4
2252 2339
2253=item $ob->inv_recursive 2340=item $ob->inv_recursive
2254 2341
2255Returns the inventory of the object _and_ their inventories, recursively. 2342Returns the inventory of the object I<and> their inventories, recursively,
2343but I<not> the object itself.
2256 2344
2257=cut 2345=cut
2258 2346
2259sub inv_recursive_; 2347sub inv_recursive_;
2260sub inv_recursive_ { 2348sub inv_recursive_ {
2265 inv_recursive_ inv $_[0] 2353 inv_recursive_ inv $_[0]
2266} 2354}
2267 2355
2268=item $ref = $ob->ref 2356=item $ref = $ob->ref
2269 2357
2270creates and returns a persistent reference to an objetc that can be stored as a string. 2358Creates and returns a persistent reference to an object that can be stored as a string.
2271 2359
2272=item $ob = cf::object::deref ($refstring) 2360=item $ob = cf::object::deref ($refstring)
2273 2361
2274returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2362returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2275even if the object actually exists. May block. 2363even if the object actually exists. May block.
2307can be C<undef>. Does the right thing when the player is currently in a 2395can be C<undef>. Does the right thing when the player is currently in a
2308dialogue with the given NPC character. 2396dialogue with the given NPC character.
2309 2397
2310=cut 2398=cut
2311 2399
2400our $SAY_CHANNEL = {
2401 id => "say",
2402 title => "Map",
2403 reply => "say ",
2404 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2405};
2406
2407our $CHAT_CHANNEL = {
2408 id => "chat",
2409 title => "Chat",
2410 reply => "chat ",
2411 tooltip => "Player chat and shouts, global to the server.",
2412};
2413
2312# rough implementation of a future "reply" method that works 2414# rough implementation of a future "reply" method that works
2313# with dialog boxes. 2415# with dialog boxes.
2314#TODO: the first argument must go, split into a $npc->reply_to ( method 2416#TODO: the first argument must go, split into a $npc->reply_to ( method
2315sub cf::object::player::reply($$$;$) { 2417sub cf::object::player::reply($$$;$) {
2316 my ($self, $npc, $msg, $flags) = @_; 2418 my ($self, $npc, $msg, $flags) = @_;
2327 my $dialog = $pl->{npc_dialog}; 2429 my $dialog = $pl->{npc_dialog};
2328 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2430 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2329 2431
2330 } else { 2432 } else {
2331 $msg = $npc->name . " says: $msg" if $npc; 2433 $msg = $npc->name . " says: $msg" if $npc;
2332 $self->message ($msg, $flags); 2434 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2333 } 2435 }
2334 } 2436 }
2335} 2437}
2336 2438
2337=item $object->send_msg ($channel, $msg, $color, [extra...]) 2439=item $object->send_msg ($channel, $msg, $color, [extra...])
2362 2464
2363=item $player_object->enter_link 2465=item $player_object->enter_link
2364 2466
2365Freezes the player and moves him/her to a special map (C<{link}>). 2467Freezes the player and moves him/her to a special map (C<{link}>).
2366 2468
2367The player should be reasonably safe there for short amounts of time. You 2469The player should be reasonably safe there for short amounts of time (e.g.
2368I<MUST> call C<leave_link> as soon as possible, though. 2470for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2471though, as the palyer cannot control the character while it is on the link
2472map.
2369 2473
2370Will never block. 2474Will never block.
2371 2475
2372=item $player_object->leave_link ($map, $x, $y) 2476=item $player_object->leave_link ($map, $x, $y)
2373 2477
2431 2535
2432 $map->load; 2536 $map->load;
2433 $map->load_neighbours; 2537 $map->load_neighbours;
2434 2538
2435 return unless $self->contr->active; 2539 return unless $self->contr->active;
2540 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2436 $self->activate_recursive; 2541 $self->activate_recursive;
2437 2542
2438 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2543 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2439 $self->enter_map ($map, $x, $y); 2544 $self->enter_map ($map, $x, $y);
2440} 2545}
2444Moves the player to the given map-path and coordinates by first freezing 2549Moves the player to the given map-path and coordinates by first freezing
2445her, loading and preparing them map, calling the provided $check callback 2550her, loading and preparing them map, calling the provided $check callback
2446that has to return the map if sucecssful, and then unfreezes the player on 2551that has to return the map if sucecssful, and then unfreezes the player on
2447the new (success) or old (failed) map position. In either case, $done will 2552the new (success) or old (failed) map position. In either case, $done will
2448be called at the end of this process. 2553be called at the end of this process.
2554
2555Note that $check will be called with a potentially non-loaded map, so if
2556it needs a loaded map it has to call C<< ->load >>.
2449 2557
2450=cut 2558=cut
2451 2559
2452our $GOTOGEN; 2560our $GOTOGEN;
2453 2561
2532} 2640}
2533 2641
2534sub prepare_random_map { 2642sub prepare_random_map {
2535 my ($exit) = @_; 2643 my ($exit) = @_;
2536 2644
2537 my $guard = cf::lock_acquire "exit_prepare:$exit";
2538
2539 # all this does is basically replace the /! path by 2645 # all this does is basically replace the /! path by
2540 # a new random map path (?random/...) with a seed 2646 # a new random map path (?random/...) with a seed
2541 # that depends on the exit object 2647 # that depends on the exit object
2542 2648
2543 my $rmp = parse_random_map_params $exit->msg; 2649 my $rmp = parse_random_map_params $exit->msg;
2545 if ($exit->map) { 2651 if ($exit->map) {
2546 $rmp->{region} = $exit->region->name; 2652 $rmp->{region} = $exit->region->name;
2547 $rmp->{origin_map} = $exit->map->path; 2653 $rmp->{origin_map} = $exit->map->path;
2548 $rmp->{origin_x} = $exit->x; 2654 $rmp->{origin_x} = $exit->x;
2549 $rmp->{origin_y} = $exit->y; 2655 $rmp->{origin_y} = $exit->y;
2656
2657 $exit->map->touch;
2550 } 2658 }
2551 2659
2552 $rmp->{random_seed} ||= $exit->random_seed; 2660 $rmp->{random_seed} ||= $exit->random_seed;
2553 2661
2554 my $data = cf::to_json $rmp; 2662 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2555 my $md5 = Digest::MD5::md5_hex $data; 2663 my $md5 = Digest::MD5::md5_hex $data;
2556 my $meta = "$RANDOMDIR/$md5.meta"; 2664 my $meta = "$RANDOMDIR/$md5.meta";
2557 2665
2558 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2666 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2559 aio_write $fh, 0, (length $data), $data, 0; 2667 aio_write $fh, 0, (length $data), $data, 0;
2560 undef $fh; 2668 undef $fh;
2561 aio_rename "$meta~", $meta; 2669 aio_rename "$meta~", $meta;
2562 2670
2671 my $slaying = "?random/$md5";
2672
2673 if ($exit->valid) {
2563 $exit->slaying ("?random/$md5"); 2674 $exit->slaying ("?random/$md5");
2564 $exit->msg (undef); 2675 $exit->msg (undef);
2676 }
2565 } 2677 }
2566} 2678}
2567 2679
2568sub cf::object::player::enter_exit { 2680sub cf::object::player::enter_exit {
2569 my ($self, $exit) = @_; 2681 my ($self, $exit) = @_;
2570 2682
2571 return unless $self->type == cf::PLAYER; 2683 return unless $self->type == cf::PLAYER;
2572 2684
2573 if ($exit->slaying eq "/!") {
2574 #TODO: this should de-fi-ni-te-ly not be a sync-job
2575 # the problem is that $exit might not survive long enough
2576 # so it needs to be done right now, right here
2577 cf::sync_job { prepare_random_map $exit };
2578 }
2579
2580 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2581 my $hp = $exit->stats->hp;
2582 my $sp = $exit->stats->sp;
2583
2584 $self->enter_link; 2685 $self->enter_link;
2585 2686
2586 # if exit is damned, update players death & WoR home-position
2587 $self->contr->savebed ($slaying, $hp, $sp)
2588 if $exit->flag (FLAG_DAMNED);
2589
2590 (async { 2687 (async {
2591 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2688 $Coro::current->{desc} = "enter_exit";
2592 2689
2593 $self->deactivate_recursive; # just to be sure
2594 unless (eval { 2690 unless (eval {
2691 $self->deactivate_recursive; # just to be sure
2692
2693 # random map handling
2694 {
2695 my $guard = cf::lock_acquire "exit_prepare:$exit";
2696
2697 prepare_random_map $exit
2698 if $exit->slaying eq "/!";
2699 }
2700
2701 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2702 my $x = $exit->stats->hp;
2703 my $y = $exit->stats->sp;
2704
2595 $self->goto ($slaying, $hp, $sp); 2705 $self->goto ($map, $x, $y);
2596 2706
2707 # if exit is damned, update players death & WoR home-position
2708 $self->contr->savebed ($map, $x, $y)
2709 if $exit->flag (cf::FLAG_DAMNED);
2710
2597 1; 2711 1
2598 }) { 2712 }) {
2599 $self->message ("Something went wrong deep within the crossfire server. " 2713 $self->message ("Something went wrong deep within the deliantra server. "
2600 . "I'll try to bring you back to the map you were before. " 2714 . "I'll try to bring you back to the map you were before. "
2601 . "Please report this to the dungeon master!", 2715 . "Please report this to the dungeon master!",
2602 cf::NDI_UNIQUE | cf::NDI_RED); 2716 cf::NDI_UNIQUE | cf::NDI_RED);
2603 2717
2604 warn "ERROR in enter_exit: $@"; 2718 warn "ERROR in enter_exit: $@";
2632the message, with C<log> being the default. If C<$color> is negative, suppress 2746the message, with C<log> being the default. If C<$color> is negative, suppress
2633the message unless the client supports the msg packet. 2747the message unless the client supports the msg packet.
2634 2748
2635=cut 2749=cut
2636 2750
2751# non-persistent channels (usually the info channel)
2637our %CHANNEL = ( 2752our %CHANNEL = (
2638 "c/identify" => { 2753 "c/identify" => {
2639 id => "infobox", 2754 id => "infobox",
2640 title => "Identify", 2755 title => "Identify",
2641 reply => undef, 2756 reply => undef,
2645 id => "infobox", 2760 id => "infobox",
2646 title => "Examine", 2761 title => "Examine",
2647 reply => undef, 2762 reply => undef,
2648 tooltip => "Signs and other items you examined", 2763 tooltip => "Signs and other items you examined",
2649 }, 2764 },
2765 "c/book" => {
2766 id => "infobox",
2767 title => "Book",
2768 reply => undef,
2769 tooltip => "The contents of a note or book",
2770 },
2650 "c/lookat" => { 2771 "c/lookat" => {
2651 id => "infobox", 2772 id => "infobox",
2652 title => "Look", 2773 title => "Look",
2653 reply => undef, 2774 reply => undef,
2654 tooltip => "What you saw there", 2775 tooltip => "What you saw there",
2655 }, 2776 },
2777 "c/who" => {
2778 id => "infobox",
2779 title => "Players",
2780 reply => undef,
2781 tooltip => "Shows players who are currently online",
2782 },
2783 "c/body" => {
2784 id => "infobox",
2785 title => "Body Parts",
2786 reply => undef,
2787 tooltip => "Shows which body parts you posess and are available",
2788 },
2789 "c/uptime" => {
2790 id => "infobox",
2791 title => "Uptime",
2792 reply => undef,
2793 tooltip => "How long the server has been running since last restart",
2794 },
2795 "c/mapinfo" => {
2796 id => "infobox",
2797 title => "Map Info",
2798 reply => undef,
2799 tooltip => "Information related to the maps",
2800 },
2801 "c/party" => {
2802 id => "party",
2803 title => "Party",
2804 reply => "gsay ",
2805 tooltip => "Messages and chat related to your party",
2806 },
2656); 2807);
2657 2808
2658sub cf::client::send_msg { 2809sub cf::client::send_msg {
2659 my ($self, $channel, $msg, $color, @extra) = @_; 2810 my ($self, $channel, $msg, $color, @extra) = @_;
2660 2811
2661 $msg = $self->pl->expand_cfpod ($msg); 2812 $msg = $self->pl->expand_cfpod ($msg)
2813 unless $color & cf::NDI_VERBATIM;
2662 2814
2663 $color &= cf::NDI_CLIENT_MASK; # just in case... 2815 $color &= cf::NDI_CLIENT_MASK; # just in case...
2664 2816
2665 # check predefined channels, for the benefit of C 2817 # check predefined channels, for the benefit of C
2666 if ($CHANNEL{$channel}) { 2818 if ($CHANNEL{$channel}) {
2687 if ($self->can_msg) { 2839 if ($self->can_msg) {
2688 # default colour, mask it out 2840 # default colour, mask it out
2689 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2841 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2690 if $color & cf::NDI_DEF; 2842 if $color & cf::NDI_DEF;
2691 2843
2692 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2844 my $pkt = "msg "
2845 . $self->{json_coder}->encode (
2693 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2846 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2847 );
2848
2849 # try lzf for large packets
2850 $pkt = "lzf " . Compress::LZF::compress $pkt
2851 if 1024 <= length $pkt and $self->{can_lzf};
2852
2853 # split very large packets
2854 if (8192 < length $pkt and $self->{can_lzf}) {
2855 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2856 $pkt = "frag";
2857 }
2858
2859 $self->send_packet ($pkt);
2694 } else { 2860 } else {
2695 if ($color >= 0) { 2861 if ($color >= 0) {
2696 # replace some tags by gcfclient-compatible ones 2862 # replace some tags by gcfclient-compatible ones
2697 for ($msg) { 2863 for ($msg) {
2698 1 while 2864 1 while
2897 3063
2898The following functions and methods are available within a safe environment: 3064The following functions and methods are available within a safe environment:
2899 3065
2900 cf::object 3066 cf::object
2901 contr pay_amount pay_player map x y force_find force_add destroy 3067 contr pay_amount pay_player map x y force_find force_add destroy
2902 insert remove name archname title slaying race decrease_ob_nr 3068 insert remove name archname title slaying race decrease split
2903 3069
2904 cf::object::player 3070 cf::object::player
2905 player 3071 player
2906 3072
2907 cf::player 3073 cf::player
2912 3078
2913=cut 3079=cut
2914 3080
2915for ( 3081for (
2916 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3082 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2917 insert remove inv name archname title slaying race 3083 insert remove inv nrof name archname title slaying race
2918 decrease_ob_nr destroy)], 3084 decrease split destroy change_exp)],
2919 ["cf::object::player" => qw(player)], 3085 ["cf::object::player" => qw(player)],
2920 ["cf::player" => qw(peaceful)], 3086 ["cf::player" => qw(peaceful)],
2921 ["cf::map" => qw(trigger)], 3087 ["cf::map" => qw(trigger)],
2922) { 3088) {
2923 no strict 'refs'; 3089 no strict 'refs';
3028 { 3194 {
3029 my $faces = $facedata->{faceinfo}; 3195 my $faces = $facedata->{faceinfo};
3030 3196
3031 while (my ($face, $info) = each %$faces) { 3197 while (my ($face, $info) = each %$faces) {
3032 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3198 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3199
3033 cf::face::set_visibility $idx, $info->{visibility}; 3200 cf::face::set_visibility $idx, $info->{visibility};
3034 cf::face::set_magicmap $idx, $info->{magicmap}; 3201 cf::face::set_magicmap $idx, $info->{magicmap};
3035 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3202 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3036 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3203 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3037 3204
3038 cf::cede_to_tick; 3205 cf::cede_to_tick;
3039 } 3206 }
3040 3207
3041 while (my ($face, $info) = each %$faces) { 3208 while (my ($face, $info) = each %$faces) {
3042 next unless $info->{smooth}; 3209 next unless $info->{smooth};
3210
3043 my $idx = cf::face::find $face 3211 my $idx = cf::face::find $face
3044 or next; 3212 or next;
3213
3045 if (my $smooth = cf::face::find $info->{smooth}) { 3214 if (my $smooth = cf::face::find $info->{smooth}) {
3046 cf::face::set_smooth $idx, $smooth; 3215 cf::face::set_smooth $idx, $smooth;
3047 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3216 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3048 } else { 3217 } else {
3049 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3218 warn "smooth face '$info->{smooth}' not found for face '$face'";
3067 { 3236 {
3068 # TODO: for gcfclient pleasure, we should give resources 3237 # TODO: for gcfclient pleasure, we should give resources
3069 # that gcfclient doesn't grok a >10000 face index. 3238 # that gcfclient doesn't grok a >10000 face index.
3070 my $res = $facedata->{resource}; 3239 my $res = $facedata->{resource};
3071 3240
3072 my $soundconf = delete $res->{"res/sound.conf"};
3073
3074 while (my ($name, $info) = each %$res) { 3241 while (my ($name, $info) = each %$res) {
3242 if (defined $info->{type}) {
3075 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3243 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3076 my $data; 3244 my $data;
3077 3245
3078 if ($info->{type} & 1) { 3246 if ($info->{type} & 1) {
3079 # prepend meta info 3247 # prepend meta info
3080 3248
3081 my $meta = $enc->encode ({ 3249 my $meta = $enc->encode ({
3082 name => $name, 3250 name => $name,
3083 %{ $info->{meta} || {} }, 3251 %{ $info->{meta} || {} },
3084 }); 3252 });
3085 3253
3086 $data = pack "(w/a*)*", $meta, $info->{data}; 3254 $data = pack "(w/a*)*", $meta, $info->{data};
3255 } else {
3256 $data = $info->{data};
3257 }
3258
3259 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3260 cf::face::set_type $idx, $info->{type};
3087 } else { 3261 } else {
3088 $data = $info->{data}; 3262 $RESOURCE{$name} = $info;
3089 } 3263 }
3090 3264
3091 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3092 cf::face::set_type $idx, $info->{type};
3093
3094 cf::cede_to_tick; 3265 cf::cede_to_tick;
3095 } 3266 }
3096
3097 if ($soundconf) {
3098 $soundconf = $enc->decode (delete $soundconf->{data});
3099
3100 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3101 my $sound = $soundconf->{compat}[$_]
3102 or next;
3103
3104 my $face = cf::face::find "sound/$sound->[1]";
3105 cf::sound::set $sound->[0] => $face;
3106 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3107 }
3108
3109 while (my ($k, $v) = each %{$soundconf->{event}}) {
3110 my $face = cf::face::find "sound/$v";
3111 cf::sound::set $k => $face;
3112 }
3113 }
3114 } 3267 }
3268
3269 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3115 3270
3116 1 3271 1
3117} 3272}
3273
3274cf::global->attach (on_resource_update => sub {
3275 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3276 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3277
3278 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3279 my $sound = $soundconf->{compat}[$_]
3280 or next;
3281
3282 my $face = cf::face::find "sound/$sound->[1]";
3283 cf::sound::set $sound->[0] => $face;
3284 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3285 }
3286
3287 while (my ($k, $v) = each %{$soundconf->{event}}) {
3288 my $face = cf::face::find "sound/$v";
3289 cf::sound::set $k => $face;
3290 }
3291 }
3292});
3118 3293
3119register_exticmd fx_want => sub { 3294register_exticmd fx_want => sub {
3120 my ($ns, $want) = @_; 3295 my ($ns, $want) = @_;
3121 3296
3122 while (my ($k, $v) = each %$want) { 3297 while (my ($k, $v) = each %$want) {
3123 $ns->fx_want ($k, $v); 3298 $ns->fx_want ($k, $v);
3124 } 3299 }
3125}; 3300};
3301
3302sub load_resource_file($) {
3303 my $guard = lock_acquire "load_resource_file";
3304
3305 my $status = load_resource_file_ $_[0];
3306 get_slot 0.1, 100;
3307 cf::arch::commit_load;
3308
3309 $status
3310}
3126 3311
3127sub reload_regions { 3312sub reload_regions {
3128 # HACK to clear player env face cache, we need some signal framework 3313 # HACK to clear player env face cache, we need some signal framework
3129 # for this (global event?) 3314 # for this (global event?)
3130 %ext::player_env::MUSIC_FACE_CACHE = (); 3315 %ext::player_env::MUSIC_FACE_CACHE = ();
3144} 3329}
3145 3330
3146sub reload_archetypes { 3331sub reload_archetypes {
3147 load_resource_file "$DATADIR/archetypes" 3332 load_resource_file "$DATADIR/archetypes"
3148 or die "unable to load archetypes\n"; 3333 or die "unable to load archetypes\n";
3149 #d# NEED to laod twice to resolve forward references
3150 # this really needs to be done in an extra post-pass
3151 # (which needs to be synchronous, so solve it differently)
3152 load_resource_file "$DATADIR/archetypes"
3153 or die "unable to load archetypes\n";
3154} 3334}
3155 3335
3156sub reload_treasures { 3336sub reload_treasures {
3157 load_resource_file "$DATADIR/treasures" 3337 load_resource_file "$DATADIR/treasures"
3158 or die "unable to load treasurelists\n"; 3338 or die "unable to load treasurelists\n";
3159} 3339}
3160 3340
3161sub reload_resources { 3341sub reload_resources {
3162 warn "reloading resource files...\n"; 3342 warn "reloading resource files...\n";
3163 3343
3344 reload_facedata;
3345 reload_archetypes;
3164 reload_regions; 3346 reload_regions;
3165 reload_facedata;
3166 #reload_archetypes;#d#
3167 reload_archetypes;
3168 reload_treasures; 3347 reload_treasures;
3169 3348
3170 warn "finished reloading resource files\n"; 3349 warn "finished reloading resource files\n";
3171} 3350}
3172 3351
3173sub init { 3352sub init {
3353 my $guard = freeze_mainloop;
3354
3355 evthread_start IO::AIO::poll_fileno;
3356
3174 reload_resources; 3357 reload_resources;
3175} 3358}
3176 3359
3177sub reload_config { 3360sub reload_config {
3178 open my $fh, "<:utf8", "$CONFDIR/config" 3361 open my $fh, "<:utf8", "$CONFDIR/config"
3179 or return; 3362 or return;
3180 3363
3181 local $/; 3364 local $/;
3182 *CFG = YAML::Syck::Load <$fh>; 3365 *CFG = YAML::Load <$fh>;
3183 3366
3184 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3367 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3185 3368
3186 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3369 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3187 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3370 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3193 }; 3376 };
3194 warn $@ if $@; 3377 warn $@ if $@;
3195 } 3378 }
3196} 3379}
3197 3380
3381sub pidfile() {
3382 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3383 or die "$PIDFILE: $!";
3384 flock $fh, &Fcntl::LOCK_EX
3385 or die "$PIDFILE: flock: $!";
3386 $fh
3387}
3388
3389# make sure only one server instance is running at any one time
3390sub atomic {
3391 my $fh = pidfile;
3392
3393 my $pid = <$fh>;
3394 kill 9, $pid if $pid > 0;
3395
3396 seek $fh, 0, 0;
3397 print $fh $$;
3398}
3399
3198sub main { 3400sub main {
3401 atomic;
3402
3199 # we must not ever block the main coroutine 3403 # we must not ever block the main coroutine
3200 local $Coro::idle = sub { 3404 local $Coro::idle = sub {
3201 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3405 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3202 (async { 3406 (async {
3203 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3407 $Coro::current->{desc} = "IDLE BUG HANDLER";
3204 Event::one_event; 3408 EV::loop EV::LOOP_ONESHOT;
3205 })->prio (Coro::PRIO_MAX); 3409 })->prio (Coro::PRIO_MAX);
3206 }; 3410 };
3207 3411
3412 {
3413 my $guard = freeze_mainloop;
3208 reload_config; 3414 reload_config;
3209 db_init; 3415 db_init;
3210 load_extensions; 3416 load_extensions;
3211 3417
3212 $TICK_WATCHER->start; 3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3419 }
3420
3421 utime time, time, $RUNTIMEFILE;
3422
3423 # no (long-running) fork's whatsoever before this point(!)
3424 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3425
3213 Event::loop; 3426 EV::loop;
3214} 3427}
3215 3428
3216############################################################################# 3429#############################################################################
3217# initialisation and cleanup 3430# initialisation and cleanup
3218 3431
3219# install some emergency cleanup handlers 3432# install some emergency cleanup handlers
3220BEGIN { 3433BEGIN {
3434 our %SIGWATCHER = ();
3221 for my $signal (qw(INT HUP TERM)) { 3435 for my $signal (qw(INT HUP TERM)) {
3222 Event->signal ( 3436 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3223 reentrant => 0,
3224 data => WF_AUTOCANCEL,
3225 signal => $signal,
3226 prio => 0,
3227 cb => sub {
3228 cf::cleanup "SIG$signal"; 3437 cf::cleanup "SIG$signal";
3229 },
3230 ); 3438 };
3231 } 3439 }
3232} 3440}
3233 3441
3234sub write_runtime { 3442sub write_runtime_sync {
3235 my $runtime = "$LOCALDIR/runtime";
3236
3237 # first touch the runtime file to show we are still running: 3443 # first touch the runtime file to show we are still running:
3238 # the fsync below can take a very very long time. 3444 # the fsync below can take a very very long time.
3239 3445
3240 IO::AIO::aio_utime $runtime, undef, undef; 3446 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3241 3447
3242 my $guard = cf::lock_acquire "write_runtime"; 3448 my $guard = cf::lock_acquire "write_runtime";
3243 3449
3244 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3450 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3245 or return; 3451 or return;
3246 3452
3247 my $value = $cf::RUNTIME + 90 + 10; 3453 my $value = $cf::RUNTIME + 90 + 10;
3248 # 10 is the runtime save interval, for a monotonic clock 3454 # 10 is the runtime save interval, for a monotonic clock
3249 # 60 allows for the watchdog to kill the server. 3455 # 60 allows for the watchdog to kill the server.
3259 aio_utime $fh, undef, undef; 3465 aio_utime $fh, undef, undef;
3260 3466
3261 close $fh 3467 close $fh
3262 or return; 3468 or return;
3263 3469
3264 aio_rename "$runtime~", $runtime 3470 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3265 and return; 3471 and return;
3266 3472
3267 warn "runtime file written.\n"; 3473 warn "runtime file written.\n";
3268 3474
3269 1 3475 1
3476}
3477
3478our $uuid_lock;
3479our $uuid_skip;
3480
3481sub write_uuid_sync($) {
3482 $uuid_skip ||= $_[0];
3483
3484 return if $uuid_lock;
3485 local $uuid_lock = 1;
3486
3487 my $uuid = "$LOCALDIR/uuid";
3488
3489 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3490 or return;
3491
3492 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3493 $uuid_skip = 0;
3494
3495 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3496 and return;
3497
3498 # always fsync - this file is important
3499 aio_fsync $fh
3500 and return;
3501
3502 close $fh
3503 or return;
3504
3505 aio_rename "$uuid~", $uuid
3506 and return;
3507
3508 warn "uuid file written ($value).\n";
3509
3510 1
3511
3512}
3513
3514sub write_uuid($$) {
3515 my ($skip, $sync) = @_;
3516
3517 $sync ? write_uuid_sync $skip
3518 : async { write_uuid_sync $skip };
3270} 3519}
3271 3520
3272sub emergency_save() { 3521sub emergency_save() {
3273 my $freeze_guard = cf::freeze_mainloop; 3522 my $freeze_guard = cf::freeze_mainloop;
3274 3523
3296 warn "end emergency map save\n"; 3545 warn "end emergency map save\n";
3297 3546
3298 warn "begin emergency database checkpoint\n"; 3547 warn "begin emergency database checkpoint\n";
3299 BDB::db_env_txn_checkpoint $DB_ENV; 3548 BDB::db_env_txn_checkpoint $DB_ENV;
3300 warn "end emergency database checkpoint\n"; 3549 warn "end emergency database checkpoint\n";
3550
3551 warn "begin write uuid\n";
3552 write_uuid_sync 1;
3553 warn "end write uuid\n";
3301 }; 3554 };
3302 3555
3303 warn "leave emergency perl save\n"; 3556 warn "leave emergency perl save\n";
3304} 3557}
3305 3558
3306sub post_cleanup { 3559sub post_cleanup {
3307 my ($make_core) = @_; 3560 my ($make_core) = @_;
3308 3561
3309 warn Carp::longmess "post_cleanup backtrace" 3562 warn Carp::longmess "post_cleanup backtrace"
3310 if $make_core; 3563 if $make_core;
3564
3565 my $fh = pidfile;
3566 unlink $PIDFILE if <$fh> == $$;
3311} 3567}
3568
3569# a safer delete_package, copied from Symbol
3570sub clear_package($) {
3571 my $pkg = shift;
3572
3573 # expand to full symbol table name if needed
3574 unless ($pkg =~ /^main::.*::$/) {
3575 $pkg = "main$pkg" if $pkg =~ /^::/;
3576 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3577 $pkg .= '::' unless $pkg =~ /::$/;
3578 }
3579
3580 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3581 my $stem_symtab = *{$stem}{HASH};
3582
3583 defined $stem_symtab and exists $stem_symtab->{$leaf}
3584 or return;
3585
3586 # clear all symbols
3587 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3588 for my $name (keys %$leaf_symtab) {
3589 _gv_clear *{"$pkg$name"};
3590# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3591 }
3592 warn "cleared package #$pkg\n";#d#
3593}
3594
3595our $RELOAD; # how many times to reload
3312 3596
3313sub do_reload_perl() { 3597sub do_reload_perl() {
3314 # can/must only be called in main 3598 # can/must only be called in main
3315 if ($Coro::current != $Coro::main) { 3599 if ($Coro::current != $Coro::main) {
3316 warn "can only reload from main coroutine"; 3600 warn "can only reload from main coroutine";
3317 return; 3601 return;
3318 } 3602 }
3319 3603
3604 return if $RELOAD++;
3605
3606 while ($RELOAD) {
3320 warn "reloading..."; 3607 warn "reloading...";
3321 3608
3322 warn "entering sync_job"; 3609 warn "entering sync_job";
3323 3610
3324 cf::sync_job { 3611 cf::sync_job {
3325 cf::write_runtime; # external watchdog should not bark 3612 cf::write_runtime_sync; # external watchdog should not bark
3326 cf::emergency_save; 3613 cf::emergency_save;
3327 cf::write_runtime; # external watchdog should not bark 3614 cf::write_runtime_sync; # external watchdog should not bark
3328 3615
3329 warn "syncing database to disk"; 3616 warn "syncing database to disk";
3330 BDB::db_env_txn_checkpoint $DB_ENV; 3617 BDB::db_env_txn_checkpoint $DB_ENV;
3331 3618
3332 # if anything goes wrong in here, we should simply crash as we already saved 3619 # if anything goes wrong in here, we should simply crash as we already saved
3333 3620
3334 warn "cancelling all WF_AUTOCANCEL watchers";
3335 for (Event::all_watchers) {
3336 $_->cancel if $_->data & WF_AUTOCANCEL;
3337 }
3338
3339 warn "flushing outstanding aio requests"; 3621 warn "flushing outstanding aio requests";
3340 for (;;) {
3341 BDB::flush;
3342 IO::AIO::flush;
3343 Coro::cede;
3344 last unless IO::AIO::nreqs || BDB::nreqs; 3622 while (IO::AIO::nreqs || BDB::nreqs) {
3345 warn "iterate..."; 3623 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3346 }
3347
3348 ++$RELOAD;
3349
3350 warn "cancelling all extension coros";
3351 $_->cancel for values %EXT_CORO;
3352 %EXT_CORO = ();
3353
3354 warn "removing commands";
3355 %COMMAND = ();
3356
3357 warn "removing ext/exti commands";
3358 %EXTCMD = ();
3359 %EXTICMD = ();
3360
3361 warn "unloading/nuking all extensions";
3362 for my $pkg (@EXTS) {
3363 warn "... unloading $pkg";
3364
3365 if (my $cb = $pkg->can ("unload")) {
3366 eval {
3367 $cb->($pkg);
3368 1
3369 } or warn "$pkg unloaded, but with errors: $@";
3370 } 3624 }
3371 3625
3372 warn "... nuking $pkg"; 3626 warn "cancelling all extension coros";
3373 Symbol::delete_package $pkg; 3627 $_->cancel for values %EXT_CORO;
3374 } 3628 %EXT_CORO = ();
3375 3629
3376 warn "unloading all perl modules loaded from $LIBDIR"; 3630 warn "removing commands";
3377 while (my ($k, $v) = each %INC) { 3631 %COMMAND = ();
3378 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3379 3632
3633 warn "removing ext/exti commands";
3634 %EXTCMD = ();
3635 %EXTICMD = ();
3636
3637 warn "unloading/nuking all extensions";
3638 for my $pkg (@EXTS) {
3380 warn "... unloading $k"; 3639 warn "... unloading $pkg";
3381 delete $INC{$k};
3382 3640
3383 $k =~ s/\.pm$//;
3384 $k =~ s/\//::/g;
3385
3386 if (my $cb = $k->can ("unload_module")) { 3641 if (my $cb = $pkg->can ("unload")) {
3642 eval {
3387 $cb->(); 3643 $cb->($pkg);
3644 1
3645 } or warn "$pkg unloaded, but with errors: $@";
3646 }
3647
3648 warn "... clearing $pkg";
3649 clear_package $pkg;
3388 } 3650 }
3389 3651
3390 Symbol::delete_package $k; 3652 warn "unloading all perl modules loaded from $LIBDIR";
3653 while (my ($k, $v) = each %INC) {
3654 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3655
3656 warn "... unloading $k";
3657 delete $INC{$k};
3658
3659 $k =~ s/\.pm$//;
3660 $k =~ s/\//::/g;
3661
3662 if (my $cb = $k->can ("unload_module")) {
3663 $cb->();
3664 }
3665
3666 clear_package $k;
3391 } 3667 }
3392 3668
3393 warn "getting rid of safe::, as good as possible"; 3669 warn "getting rid of safe::, as good as possible";
3394 Symbol::delete_package "safe::$_" 3670 clear_package "safe::$_"
3395 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3671 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3396 3672
3397 warn "unloading cf.pm \"a bit\""; 3673 warn "unloading cf.pm \"a bit\"";
3398 delete $INC{"cf.pm"}; 3674 delete $INC{"cf.pm"};
3399 delete $INC{"cf/pod.pm"}; 3675 delete $INC{"cf/pod.pm"};
3400 3676
3401 # don't, removes xs symbols, too, 3677 # don't, removes xs symbols, too,
3402 # and global variables created in xs 3678 # and global variables created in xs
3403 #Symbol::delete_package __PACKAGE__; 3679 #clear_package __PACKAGE__;
3404 3680
3405 warn "unload completed, starting to reload now"; 3681 warn "unload completed, starting to reload now";
3406 3682
3407 warn "reloading cf.pm"; 3683 warn "reloading cf.pm";
3408 require cf; 3684 require cf;
3409 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3685 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3410 3686
3411 warn "loading config and database again"; 3687 warn "loading config and database again";
3412 cf::reload_config; 3688 cf::reload_config;
3413 3689
3414 warn "loading extensions"; 3690 warn "loading extensions";
3415 cf::load_extensions; 3691 cf::load_extensions;
3416 3692
3417 warn "reattaching attachments to objects/players"; 3693 warn "reattaching attachments to objects/players";
3418 _global_reattach; # objects, sockets 3694 _global_reattach; # objects, sockets
3419 warn "reattaching attachments to maps"; 3695 warn "reattaching attachments to maps";
3420 reattach $_ for values %MAP; 3696 reattach $_ for values %MAP;
3421 warn "reattaching attachments to players"; 3697 warn "reattaching attachments to players";
3422 reattach $_ for values %PLAYER; 3698 reattach $_ for values %PLAYER;
3423 3699
3424 warn "leaving sync_job"; 3700 warn "leaving sync_job";
3425 3701
3426 1 3702 1
3427 } or do { 3703 } or do {
3428 warn $@; 3704 warn $@;
3429 warn "error while reloading, exiting."; 3705 cf::cleanup "error while reloading, exiting.";
3430 exit 1;
3431 }; 3706 };
3432 3707
3433 warn "reloaded"; 3708 warn "reloaded";
3709 --$RELOAD;
3710 }
3434}; 3711};
3435 3712
3436our $RELOAD_WATCHER; # used only during reload 3713our $RELOAD_WATCHER; # used only during reload
3437 3714
3438sub reload_perl() { 3715sub reload_perl() {
3439 # doing reload synchronously and two reloads happen back-to-back, 3716 # doing reload synchronously and two reloads happen back-to-back,
3440 # coro crashes during coro_state_free->destroy here. 3717 # coro crashes during coro_state_free->destroy here.
3441 3718
3442 $RELOAD_WATCHER ||= Event->timer ( 3719 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3443 reentrant => 0,
3444 after => 0,
3445 data => WF_AUTOCANCEL,
3446 cb => sub {
3447 do_reload_perl; 3720 do_reload_perl;
3448 undef $RELOAD_WATCHER; 3721 undef $RELOAD_WATCHER;
3449 },
3450 ); 3722 };
3451} 3723}
3452 3724
3453register_command "reload" => sub { 3725register_command "reload" => sub {
3454 my ($who, $arg) = @_; 3726 my ($who, $arg) = @_;
3455 3727
3468 3740
3469our @WAIT_FOR_TICK; 3741our @WAIT_FOR_TICK;
3470our @WAIT_FOR_TICK_BEGIN; 3742our @WAIT_FOR_TICK_BEGIN;
3471 3743
3472sub wait_for_tick { 3744sub wait_for_tick {
3473 return unless $TICK_WATCHER->is_active;
3474 return if $Coro::current == $Coro::main; 3745 return if tick_inhibit || $Coro::current == $Coro::main;
3475 3746
3476 my $signal = new Coro::Signal; 3747 my $signal = new Coro::Signal;
3477 push @WAIT_FOR_TICK, $signal; 3748 push @WAIT_FOR_TICK, $signal;
3478 $signal->wait; 3749 $signal->wait;
3479} 3750}
3480 3751
3481sub wait_for_tick_begin { 3752sub wait_for_tick_begin {
3482 return unless $TICK_WATCHER->is_active;
3483 return if $Coro::current == $Coro::main; 3753 return if tick_inhibit || $Coro::current == $Coro::main;
3484 3754
3485 my $signal = new Coro::Signal; 3755 my $signal = new Coro::Signal;
3486 push @WAIT_FOR_TICK_BEGIN, $signal; 3756 push @WAIT_FOR_TICK_BEGIN, $signal;
3487 $signal->wait; 3757 $signal->wait;
3488} 3758}
3489 3759
3490$TICK_WATCHER = Event->timer ( 3760sub tick {
3491 reentrant => 0,
3492 parked => 1,
3493 prio => 0,
3494 at => $NEXT_TICK || $TICK,
3495 data => WF_AUTOCANCEL,
3496 cb => sub {
3497 if ($Coro::current != $Coro::main) { 3761 if ($Coro::current != $Coro::main) {
3498 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3762 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3499 unless ++$bug_warning > 10; 3763 unless ++$bug_warning > 10;
3500 return; 3764 return;
3501 } 3765 }
3502 3766
3503 $NOW = $tick_start = Event::time;
3504
3505 cf::server_tick; # one server iteration 3767 cf::server_tick; # one server iteration
3506 3768
3507 $RUNTIME += $TICK;
3508 $NEXT_TICK += $TICK;
3509
3510 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3769 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3511 $NEXT_RUNTIME_WRITE = $NOW + 10; 3770 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3512 Coro::async_pool { 3771 Coro::async_pool {
3513 $Coro::current->{desc} = "runtime saver"; 3772 $Coro::current->{desc} = "runtime saver";
3514 write_runtime 3773 write_runtime_sync
3515 or warn "ERROR: unable to write runtime file: $!"; 3774 or warn "ERROR: unable to write runtime file: $!";
3516 };
3517 } 3775 };
3776 }
3518 3777
3519 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3778 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3520 $sig->send; 3779 $sig->send;
3521 } 3780 }
3522 while (my $sig = shift @WAIT_FOR_TICK) { 3781 while (my $sig = shift @WAIT_FOR_TICK) {
3523 $sig->send; 3782 $sig->send;
3524 } 3783 }
3525 3784
3526 $NOW = Event::time; 3785 $LOAD = ($NOW - $TICK_START) / $TICK;
3527
3528 # if we are delayed by four ticks or more, skip them all
3529 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3530
3531 $TICK_WATCHER->at ($NEXT_TICK);
3532 $TICK_WATCHER->start;
3533
3534 $LOAD = ($NOW - $tick_start) / $TICK;
3535 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3786 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3536 3787
3537 _post_tick; 3788 if (0) {
3789 if ($NEXT_TICK) {
3790 my $jitter = $TICK_START - $NEXT_TICK;
3791 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3792 warn "jitter $JITTER\n";#d#
3793 }
3538 }, 3794 }
3539); 3795}
3540 3796
3541{ 3797{
3798 # configure BDB
3799
3542 BDB::min_parallel 8; 3800 BDB::min_parallel 8;
3543 BDB::max_poll_time $TICK * 0.1; 3801 BDB::max_poll_reqs $TICK * 0.1;
3544 $BDB_POLL_WATCHER = Event->io ( 3802 $AnyEvent::BDB::WATCHER->priority (1);
3545 reentrant => 0,
3546 fd => BDB::poll_fileno,
3547 poll => 'r',
3548 prio => 0,
3549 data => WF_AUTOCANCEL,
3550 cb => \&BDB::poll_cb,
3551 );
3552
3553 BDB::set_sync_prepare {
3554 my $status;
3555 my $current = $Coro::current;
3556 (
3557 sub {
3558 $status = $!;
3559 $current->ready; undef $current;
3560 },
3561 sub {
3562 Coro::schedule while defined $current;
3563 $! = $status;
3564 },
3565 )
3566 };
3567 3803
3568 unless ($DB_ENV) { 3804 unless ($DB_ENV) {
3569 $DB_ENV = BDB::db_env_create; 3805 $DB_ENV = BDB::db_env_create;
3570 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3806 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3571 | BDB::LOG_AUTOREMOVE, 1); 3807 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3808 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3572 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3809 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3573 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3810 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3574 3811
3575 cf::sync_job { 3812 cf::sync_job {
3576 eval { 3813 eval {
3586 3823
3587 cf::cleanup "db_env_open(db): $@" if $@; 3824 cf::cleanup "db_env_open(db): $@" if $@;
3588 }; 3825 };
3589 } 3826 }
3590 3827
3591 $BDB_DEADLOCK_WATCHER = Event->timer ( 3828 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3592 after => 3,
3593 interval => 1,
3594 hard => 1,
3595 prio => 0,
3596 data => WF_AUTOCANCEL,
3597 cb => sub {
3598 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3829 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3599 },
3600 ); 3830 };
3601 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3831 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3602 after => 11,
3603 interval => 60,
3604 hard => 1,
3605 prio => 0,
3606 data => WF_AUTOCANCEL,
3607 cb => sub {
3608 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3832 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3609 },
3610 ); 3833 };
3611 $BDB_TRICKLE_WATCHER = Event->timer ( 3834 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3612 after => 5,
3613 interval => 10,
3614 hard => 1,
3615 prio => 0,
3616 data => WF_AUTOCANCEL,
3617 cb => sub {
3618 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3835 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3619 },
3620 ); 3836 };
3621} 3837}
3622 3838
3623{ 3839{
3840 # configure IO::AIO
3841
3624 IO::AIO::min_parallel 8; 3842 IO::AIO::min_parallel 8;
3625
3626 undef $Coro::AIO::WATCHER;
3627 IO::AIO::max_poll_time $TICK * 0.1; 3843 IO::AIO::max_poll_time $TICK * 0.1;
3628 $AIO_POLL_WATCHER = Event->io ( 3844 undef $AnyEvent::AIO::WATCHER;
3629 reentrant => 0,
3630 data => WF_AUTOCANCEL,
3631 fd => IO::AIO::poll_fileno,
3632 poll => 'r',
3633 prio => 0,
3634 cb => \&IO::AIO::poll_cb,
3635 );
3636} 3845}
3637 3846
3638my $_log_backtrace; 3847my $_log_backtrace;
3639 3848
3640sub _log_backtrace { 3849sub _log_backtrace {
3643 $msg =~ s/\n//; 3852 $msg =~ s/\n//;
3644 3853
3645 # limit the # of concurrent backtraces 3854 # limit the # of concurrent backtraces
3646 if ($_log_backtrace < 2) { 3855 if ($_log_backtrace < 2) {
3647 ++$_log_backtrace; 3856 ++$_log_backtrace;
3857 my $perl_bt = Carp::longmess $msg;
3648 async { 3858 async {
3649 $Coro::current->{desc} = "abt $msg"; 3859 $Coro::current->{desc} = "abt $msg";
3650 3860
3651 my @bt = fork_call { 3861 my @bt = fork_call {
3652 @addr = map { sprintf "%x", $_ } @addr; 3862 @addr = map { sprintf "%x", $_ } @addr;
3663 } 3873 }
3664 3874
3665 @funcs 3875 @funcs
3666 }; 3876 };
3667 3877
3668 LOG llevInfo, "[ABT] $msg\n"; 3878 LOG llevInfo, "[ABT] $perl_bt\n";
3879 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3669 LOG llevInfo, "[ABT] $_\n" for @bt; 3880 LOG llevInfo, "[ABT] $_\n" for @bt;
3670 --$_log_backtrace; 3881 --$_log_backtrace;
3671 }; 3882 };
3672 } else { 3883 } else {
3673 LOG llevInfo, "[ABT] $msg\n"; 3884 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines