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.428 by root, Thu May 1 06:33:19 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
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV 3.2;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
14 35
15use Coro 3.64 (); 36use Coro 4.50 ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::Event; 39use Coro::EV;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
22use Coro::AIO; 43use Coro::AIO;
44use Coro::BDB;
23use Coro::Storable; 45use Coro::Storable;
24use Coro::Util (); 46use Coro::Util ();
25 47
26use JSON::XS (); 48use JSON::XS 2.01 ();
27use BDB (); 49use BDB ();
28use Data::Dumper; 50use Data::Dumper;
29use Digest::MD5; 51use Digest::MD5;
30use Fcntl; 52use Fcntl;
31use YAML::Syck (); 53use YAML ();
32use IO::AIO 2.32 (); 54use IO::AIO 2.51 ();
33use Time::HiRes; 55use Time::HiRes;
34use Compress::LZF; 56use Compress::LZF;
35use Digest::MD5 (); 57use Digest::MD5 ();
36 58
37# configure various modules to our taste 59# configure various modules to our taste
38# 60#
39$Storable::canonical = 1; # reduce rsync transfers 61$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 62Coro::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 63Compress::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 64
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 66
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 68
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 87our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 89our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 90our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 91our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE;
75 93
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER; 95our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 97our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 98our $USE_FSYNC = 1; # use fsync to write maps - default off
83 99
84our $BDB_POLL_WATCHER; 100our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 101our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 102our $BDB_CHECKPOINT_WATCHER;
89 105
90our %CFG; 106our %CFG;
91 107
92our $UPTIME; $UPTIME ||= time; 108our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 109our $RUNTIME;
110our $NOW;
94 111
95our (%PLAYER, %PLAYER_LOADING); # all users 112our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 113our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 114our $LINK_MAP; # the special {link} map, which is always available
98 115
99# used to convert map paths into valid unix filenames by replacing / by ∕ 116# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 118
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
105 123
106binmode STDOUT; 124binmode STDOUT;
107binmode STDERR; 125binmode STDERR;
108 126
109# read virtual server time, if available 127# read virtual server time, if available
162 180
163The raw value load value from the last tick. 181The raw value load value from the last tick.
164 182
165=item %cf::CFG 183=item %cf::CFG
166 184
167Configuration for the server, loaded from C</etc/crossfire/config>, or 185Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 186from wherever your confdir points to.
169 187
170=item cf::wait_for_tick, cf::wait_for_tick_begin 188=item cf::wait_for_tick, cf::wait_for_tick_begin
171 189
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 190These 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; 211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 212
195 LOG llevError, $msg; 213 LOG llevError, $msg;
196 }; 214 };
197} 215}
216
217$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "=="
219
220 if ($Coro::current == $Coro::main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d#
223 }#d#
224
225 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate
228};
229
230$SIG{__DIE__} = sub { }; #d#?
198 231
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
215)) { 248)) {
216 no strict 'refs'; 249 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 251}
219 252
220$Event::DIED = sub { 253$EV::DIED = sub {
221 warn "error in event callback: @_"; 254 warn "error in event callback: @_";
222}; 255};
223 256
224############################################################################# 257#############################################################################
225 258
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 281 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 282 $d
250 } || "[unable to dump $_[0]: '$@']"; 283 } || "[unable to dump $_[0]: '$@']";
251} 284}
252 285
253=item $ref = cf::from_json $json 286=item $ref = cf::decode_json $json
254 287
255Converts a JSON string into the corresponding perl data structure. 288Converts a JSON string into the corresponding perl data structure.
256 289
257=item $json = cf::to_json $ref 290=item $json = cf::encode_json $ref
258 291
259Converts a perl data structure into its JSON representation. 292Converts a perl data structure into its JSON representation.
260 293
261=cut 294=cut
262 295
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 297
265sub to_json ($) { $json_coder->encode ($_[0]) } 298sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 299sub decode_json($) { $json_coder->decode ($_[0]) }
267 300
268=item cf::lock_wait $string 301=item cf::lock_wait $string
269 302
270Wait until the given lock is available. See cf::lock_acquire. 303Wait until the given lock is available. See cf::lock_acquire.
271 304
327 360
328 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
329} 362}
330 363
331sub freeze_mainloop { 364sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
333 366
334 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
335 $TICK_WATCHER->start; 368}
336 }; 369
337 $TICK_WATCHER->stop; 370=item cf::periodic $interval, $cb
338 $guard 371
372Like EV::periodic, but randomly selects a starting point so that the actions
373get spread over timer.
374
375=cut
376
377sub periodic($$) {
378 my ($interval, $cb) = @_;
379
380 my $start = rand List::Util::min 180, $interval;
381
382 EV::periodic $start, $interval, 0, $cb
339} 383}
340 384
341=item cf::get_slot $time[, $priority[, $name]] 385=item cf::get_slot $time[, $priority[, $name]]
342 386
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 387Allocate $time seconds of blocking CPU time at priority C<$priority>:
373 } 417 }
374 } 418 }
375 } 419 }
376 420
377 if (@SLOT_QUEUE) { 421 if (@SLOT_QUEUE) {
378 # we do not use wait_For_tick() as it returns immediately when tick is inactive 422 # we do not use wait_for_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal; 423 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait; 424 $signal->wait;
381 } else { 425 } else {
382 Coro::schedule; 426 Coro::schedule;
383 } 427 }
384 } 428 }
385}; 429};
386 430
387sub get_slot($;$$) { 431sub get_slot($;$$) {
432 return if tick_inhibit || $Coro::current == $Coro::main;
433
388 my ($time, $pri, $name) = @_; 434 my ($time, $pri, $name) = @_;
389 435
390 $time = $TICK * .6 if $time > $TICK * .6; 436 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal; 437 my $sig = new Coro::Signal;
392 438
406 452
407BEGIN { *async = \&Coro::async_pool } 453BEGIN { *async = \&Coro::async_pool }
408 454
409=item cf::sync_job { BLOCK } 455=item cf::sync_job { BLOCK }
410 456
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 457The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 458is 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 459partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 460acceptable.
415 461
416If it must be done, put the blocking parts into C<sync_job>. This will run 462If 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 463the given BLOCK in another coroutine while waiting for the result. The
422 468
423sub sync_job(&) { 469sub sync_job(&) {
424 my ($job) = @_; 470 my ($job) = @_;
425 471
426 if ($Coro::current == $Coro::main) { 472 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 473 my $time = EV::time;
428 474
429 # this is the main coro, too bad, we have to block 475 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 476 # till the operation succeeds, freezing the server :/
431 477
432 LOG llevError | logBacktrace, Carp::longmess "sync job";#d# 478 LOG llevError, Carp::longmess "sync job";#d#
433 479
434 # TODO: use suspend/resume instead
435 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 480 my $freeze_guard = freeze_mainloop;
437 481
438 my $busy = 1; 482 my $busy = 1;
439 my @res; 483 my @res;
440 484
444 warn $@ if $@; 488 warn $@ if $@;
445 undef $busy; 489 undef $busy;
446 })->prio (Coro::PRIO_MAX); 490 })->prio (Coro::PRIO_MAX);
447 491
448 while ($busy) { 492 while ($busy) {
449 Coro::cede or Event::one_event; 493 if (Coro::nready) {
494 Coro::cede_notself;
495 } else {
496 EV::loop EV::LOOP_ONESHOT;
450 } 497 }
498 }
451 499
452 $time = Event::time - $time; 500 my $time = EV::time - $time;
453 501
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 502 $TICK_START += $time; # do not account sync jobs to server load
458 503
459 wantarray ? @res : $res[0] 504 wantarray ? @res : $res[0]
460 } else { 505 } else {
461 # we are in another coroutine, how wonderful, everything just works 506 # we are in another coroutine, how wonderful, everything just works
462 507
487=item fork_call { }, $args 532=item fork_call { }, $args
488 533
489Executes the given code block with the given arguments in a seperate 534Executes the given code block with the given arguments in a seperate
490process, returning the results. Everything must be serialisable with 535process, returning the results. Everything must be serialisable with
491Coro::Storable. May, of course, block. Note that the executed sub may 536Coro::Storable. May, of course, block. Note that the executed sub may
492never block itself or use any form of Event handling. 537never block itself or use any form of event handling.
493 538
494=cut 539=cut
495 540
496sub fork_call(&@) { 541sub fork_call(&@) {
497 my ($cb, @args) = @_; 542 my ($cb, @args) = @_;
504 reset_signals; 549 reset_signals;
505 &$cb 550 &$cb
506 }, @args; 551 }, @args;
507 552
508 wantarray ? @res : $res[-1] 553 wantarray ? @res : $res[-1]
554}
555
556=item $coin = coin_from_name $name
557
558=cut
559
560our %coin_alias = (
561 "silver" => "silvercoin",
562 "silvercoin" => "silvercoin",
563 "silvercoins" => "silvercoin",
564 "gold" => "goldcoin",
565 "goldcoin" => "goldcoin",
566 "goldcoins" => "goldcoin",
567 "platinum" => "platinacoin",
568 "platinumcoin" => "platinacoin",
569 "platinumcoins" => "platinacoin",
570 "platina" => "platinacoin",
571 "platinacoin" => "platinacoin",
572 "platinacoins" => "platinacoin",
573 "royalty" => "royalty",
574 "royalties" => "royalty",
575);
576
577sub coin_from_name($) {
578 $coin_alias{$_[0]}
579 ? cf::arch::find $coin_alias{$_[0]}
580 : undef
509} 581}
510 582
511=item $value = cf::db_get $family => $key 583=item $value = cf::db_get $family => $key
512 584
513Returns a single value from the environment database. 585Returns a single value from the environment database.
658attach callbacks/event handlers (a collection of which is called an "attachment") 730attach callbacks/event handlers (a collection of which is called an "attachment")
659to it. All such attachable objects support the following methods. 731to it. All such attachable objects support the following methods.
660 732
661In the following description, CLASS can be any of C<global>, C<object> 733In 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 734C<player>, C<client> or C<map> (i.e. the attachable objects in
663Crossfire TRT). 735Deliantra).
664 736
665=over 4 737=over 4
666 738
667=item $attachable->attach ($attachment, key => $value...) 739=item $attachable->attach ($attachment, key => $value...)
668 740
950 } 1022 }
951 1023
952 0 1024 0
953} 1025}
954 1026
955=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1027=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
956 1028
957=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1029=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
958 1030
959Generate an object-specific event with the given arguments. 1031Generate an object-specific event with the given arguments.
960 1032
966 1038
967=cut 1039=cut
968 1040
969############################################################################# 1041#############################################################################
970# object support 1042# object support
971#
972 1043
1044sub _object_equal($$);
1045sub _object_equal($$) {
1046 my ($a, $b) = @_;
1047
1048 return 0 unless (ref $a) eq (ref $b);
1049
1050 if ("HASH" eq ref $a) {
1051 my @ka = keys %$a;
1052 my @kb = keys %$b;
1053
1054 return 0 if @ka != @kb;
1055
1056 for (0 .. $#ka) {
1057 return 0 unless $ka[$_] eq $kb[$_];
1058 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1059 }
1060
1061 } elsif ("ARRAY" eq ref $a) {
1062
1063 return 0 if @$a != @$b;
1064
1065 for (0 .. $#$a) {
1066 return 0 unless _object_equal $a->[$_], $b->[$_];
1067 }
1068
1069 } elsif ($a ne $b) {
1070 return 0;
1071 }
1072
1073 1
1074}
1075
1076our $SLOW_MERGES;#d#
973sub _can_merge { 1077sub _can_merge {
974 my ($ob1, $ob2) = @_; 1078 my ($ob1, $ob2) = @_;
975 1079
976 local $Storable::canonical = 1; 1080 ++$SLOW_MERGES;#d#
977 my $fob1 = Storable::freeze $ob1;
978 my $fob2 = Storable::freeze $ob2;
979 1081
980 $fob1 eq $fob2 1082 # we do the slow way here
1083 return _object_equal $ob1, $ob2
981} 1084}
982 1085
983sub reattach { 1086sub reattach {
984 # basically do the same as instantiate, without calling instantiate 1087 # basically do the same as instantiate, without calling instantiate
985 my ($obj) = @_; 1088 my ($obj) = @_;
1007cf::attachable->attach ( 1110cf::attachable->attach (
1008 prio => -1000000, 1111 prio => -1000000,
1009 on_instantiate => sub { 1112 on_instantiate => sub {
1010 my ($obj, $data) = @_; 1113 my ($obj, $data) = @_;
1011 1114
1012 $data = from_json $data; 1115 $data = decode_json $data;
1013 1116
1014 for (@$data) { 1117 for (@$data) {
1015 my ($name, $args) = @$_; 1118 my ($name, $args) = @$_;
1016 1119
1017 $obj->attach ($name, %{$args || {} }); 1120 $obj->attach ($name, %{$args || {} });
1038 utf8::decode (my $decname = $filename); 1141 utf8::decode (my $decname = $filename);
1039 warn sprintf "saving %s (%d,%d)\n", 1142 warn sprintf "saving %s (%d,%d)\n",
1040 $decname, length $$rdata, scalar @$objs; 1143 $decname, length $$rdata, scalar @$objs;
1041 1144
1042 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1043 chmod SAVE_MODE, $fh; 1146 aio_chmod $fh, SAVE_MODE;
1044 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1045 aio_fsync $fh if $cf::USE_FSYNC; 1148 aio_fsync $fh if $cf::USE_FSYNC;
1046 close $fh; 1149 aio_close $fh;
1047 1150
1048 if (@$objs) { 1151 if (@$objs) {
1049 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1152 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1153 aio_chmod $fh, SAVE_MODE;
1051 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1052 aio_write $fh, 0, (length $data), $data, 0; 1155 aio_write $fh, 0, (length $data), $data, 0;
1053 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
1054 close $fh; 1157 aio_close $fh;
1055 aio_rename "$filename.pst~", "$filename.pst"; 1158 aio_rename "$filename.pst~", "$filename.pst";
1056 } 1159 }
1057 } else { 1160 } else {
1058 aio_unlink "$filename.pst"; 1161 aio_unlink "$filename.pst";
1059 } 1162 }
1087 1190
1088 unless (aio_stat "$filename.pst") { 1191 unless (aio_stat "$filename.pst") {
1089 (aio_load "$filename.pst", $av) >= 0 1192 (aio_load "$filename.pst", $av) >= 0
1090 or return; 1193 or return;
1091 1194
1092 $av = eval { (Storable::thaw $av)->{objs} }; 1195 my $st = eval { Coro::Storable::thaw $av };
1196 $av = $st->{objs};
1093 } 1197 }
1094 1198
1095 utf8::decode (my $decname = $filename); 1199 utf8::decode (my $decname = $filename);
1096 warn sprintf "loading %s (%d,%d)\n", 1200 warn sprintf "loading %s (%d,%d)\n",
1097 $decname, length $data, scalar @{$av || []}; 1201 $decname, length $data, scalar @{$av || []};
1253 my $msg = $@ ? "$v->{path}: $@\n" 1357 my $msg = $@ ? "$v->{path}: $@\n"
1254 : "$v->{base}: extension inactive.\n"; 1358 : "$v->{base}: extension inactive.\n";
1255 1359
1256 if (exists $v->{meta}{mandatory}) { 1360 if (exists $v->{meta}{mandatory}) {
1257 warn $msg; 1361 warn $msg;
1258 warn "mandatory extension failed to load, exiting.\n"; 1362 cf::cleanup "mandatory extension failed to load, exiting.";
1259 exit 1;
1260 } 1363 }
1261 1364
1262 warn $msg; 1365 warn $msg;
1263 } 1366 }
1264 1367
1353 my $f = new_from_file cf::object::thawer path $login 1456 my $f = new_from_file cf::object::thawer path $login
1354 or return; 1457 or return;
1355 1458
1356 my $pl = cf::player::load_pl $f 1459 my $pl = cf::player::load_pl $f
1357 or return; 1460 or return;
1461
1358 local $cf::PLAYER_LOADING{$login} = $pl; 1462 local $cf::PLAYER_LOADING{$login} = $pl;
1359 $f->resolve_delayed_derefs; 1463 $f->resolve_delayed_derefs;
1360 $cf::PLAYER{$login} = $pl 1464 $cf::PLAYER{$login} = $pl
1361 } 1465 }
1362 } 1466 }
1372 1476
1373 return if $pl->{deny_save}; 1477 return if $pl->{deny_save};
1374 1478
1375 aio_mkdir playerdir $pl, 0770; 1479 aio_mkdir playerdir $pl, 0770;
1376 $pl->{last_save} = $cf::RUNTIME; 1480 $pl->{last_save} = $cf::RUNTIME;
1481
1482 cf::get_slot 0.01;
1377 1483
1378 $pl->save_pl ($path); 1484 $pl->save_pl ($path);
1379 cf::cede_to_tick; 1485 cf::cede_to_tick;
1380} 1486}
1381 1487
1465 1571
1466 for my $login (@$dirs) { 1572 for my $login (@$dirs) {
1467 my $path = path $login; 1573 my $path = path $login;
1468 1574
1469 # a .pst is a dead give-away for a valid player 1575 # a .pst is a dead give-away for a valid player
1470 unless (-e "$path.pst") { 1576 # if no pst file found, open and chekc for blocked users
1577 if (aio_stat "$path.pst") {
1471 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1578 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1472 aio_read $fh, 0, 512, my $buf, 0 or next; 1579 aio_read $fh, 0, 512, my $buf, 0 or next;
1473 $buf !~ /^password -------------$/m or next; # official not-valid tag 1580 $buf !~ /^password -------------$/m or next; # official not-valid tag
1474 } 1581 }
1475 1582
1512 1619
1513Expand crossfire pod fragments into protocol xml. 1620Expand crossfire pod fragments into protocol xml.
1514 1621
1515=cut 1622=cut
1516 1623
1624use re 'eval';
1625
1626my $group;
1627my $interior; $interior = qr{
1628 # match a pod interior sequence sans C<< >>
1629 (?:
1630 \ (.*?)\ (?{ $group = $^N })
1631 | < (??{$interior}) >
1632 )
1633}x;
1634
1517sub expand_cfpod { 1635sub expand_cfpod {
1518 ((my $self), (local $_)) = @_; 1636 my ($self, $pod) = @_;
1519 1637
1520 # escape & and < 1638 my $xml;
1521 s/&/&amp;/g;
1522 s/(?<![BIUGHT])</&lt;/g;
1523 1639
1524 # this is buggy, it needs to properly take care of nested <'s 1640 while () {
1641 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1642 $group = $1;
1525 1643
1526 1 while 1644 $group =~ s/&/&amp;/g;
1527 # replace B<>, I<>, U<> etc. 1645 $group =~ s/</&lt;/g;
1528 s/B<([^\>]*)>/<b>$1<\/b>/ 1646
1529 || s/I<([^\>]*)>/<i>$1<\/i>/ 1647 $xml .= $group;
1530 || s/U<([^\>]*)>/<u>$1<\/u>/ 1648 } elsif ($pod =~ m%\G
1531 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1649 ([BCGHITU])
1532 # replace G<male|female> tags 1650 <
1533 || s{G<([^>|]*)\|([^>]*)>}{ 1651 (?:
1534 $self->gender ? $2 : $1 1652 ([^<>]*) (?{ $group = $^N })
1535 }ge 1653 | < $interior >
1536 # replace H<hint text> 1654 )
1537 || s{H<([^\>]*)>} 1655 >
1656 %gcsx
1538 { 1657 ) {
1658 my ($code, $data) = ($1, $group);
1659
1660 if ($code eq "B") {
1661 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1662 } elsif ($code eq "I") {
1663 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1664 } elsif ($code eq "U") {
1665 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1666 } elsif ($code eq "C") {
1667 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1668 } elsif ($code eq "T") {
1669 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1670 } elsif ($code eq "G") {
1671 my ($male, $female) = split /\|/, $data;
1672 $data = $self->gender ? $female : $male;
1673 $xml .= expand_cfpod ($self, $data);
1674 } elsif ($code eq "H") {
1539 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1675 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1540 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1676 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1541 "") 1677 "")
1542 [$self->{hintmode}] 1678 [$self->{hintmode}];
1679 } else {
1680 $xml .= "error processing '$code($data)' directive";
1543 }ge; 1681 }
1682 } else {
1683 if ($pod =~ /\G(.+)/) {
1684 warn "parse error while expanding $pod (at $1)";
1685 }
1686 last;
1687 }
1688 }
1544 1689
1690 for ($xml) {
1545 # create single paragraphs (very hackish) 1691 # create single paragraphs (very hackish)
1546 s/(?<=\S)\n(?=\w)/ /g; 1692 s/(?<=\S)\n(?=\w)/ /g;
1547 1693
1548 # compress some whitespace 1694 # compress some whitespace
1549 s/\s+\n/\n/g; # ws line-ends 1695 s/\s+\n/\n/g; # ws line-ends
1550 s/\n\n+/\n/g; # double lines 1696 s/\n\n+/\n/g; # double lines
1551 s/^\n+//; # beginning lines 1697 s/^\n+//; # beginning lines
1552 s/\n+$//; # ending lines 1698 s/\n+$//; # ending lines
1699 }
1553 1700
1554 $_ 1701 $xml
1555} 1702}
1703
1704no re 'eval';
1556 1705
1557sub hintmode { 1706sub hintmode {
1558 $_[0]{hintmode} = $_[1] if @_ > 1; 1707 $_[0]{hintmode} = $_[1] if @_ > 1;
1559 $_[0]{hintmode} 1708 $_[0]{hintmode}
1560} 1709}
1632our $MAX_RESET = 3600; 1781our $MAX_RESET = 3600;
1633our $DEFAULT_RESET = 3000; 1782our $DEFAULT_RESET = 3000;
1634 1783
1635sub generate_random_map { 1784sub generate_random_map {
1636 my ($self, $rmp) = @_; 1785 my ($self, $rmp) = @_;
1786
1787 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1788
1637 # mit "rum" bekleckern, nicht 1789 # mit "rum" bekleckern, nicht
1638 $self->_create_random_map ( 1790 $self->_create_random_map (
1639 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1791 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1640 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1792 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1641 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1793 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1763 1915
1764# the temporary/swap location 1916# the temporary/swap location
1765sub save_path { 1917sub save_path {
1766 my ($self) = @_; 1918 my ($self) = @_;
1767 1919
1768 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1920 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1769 "$TMPDIR/$path.map" 1921 "$TMPDIR/$path.map"
1770} 1922}
1771 1923
1772# the unique path, undef == no special unique path 1924# the unique path, undef == no special unique path
1773sub uniq_path { 1925sub uniq_path {
1774 my ($self) = @_; 1926 my ($self) = @_;
1775 1927
1776 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1777 "$UNIQUEDIR/$path" 1929 "$UNIQUEDIR/$path"
1778} 1930}
1779 1931
1780# and all this just because we cannot iterate over 1932# and all this just because we cannot iterate over
1781# all maps in C++... 1933# all maps in C++...
1967 } 2119 }
1968 2120
1969 $self->{last_save} = $cf::RUNTIME; 2121 $self->{last_save} = $cf::RUNTIME;
1970 $self->last_access ($cf::RUNTIME); 2122 $self->last_access ($cf::RUNTIME);
1971 2123
1972 $self->in_memory (cf::MAP_IN_MEMORY); 2124 $self->in_memory (cf::MAP_ACTIVE);
1973 } 2125 }
1974 2126
1975 $self->post_load; 2127 $self->post_load;
1976} 2128}
1977 2129
2035 my ($path, $origin, $load) = @_; 2187 my ($path, $origin, $load) = @_;
2036 2188
2037 $path = normalise $path, $origin && $origin->{path}; 2189 $path = normalise $path, $origin && $origin->{path};
2038 2190
2039 if (my $map = $cf::MAP{$path}) { 2191 if (my $map = $cf::MAP{$path}) {
2040 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2192 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2041 } 2193 }
2042 2194
2043 $MAP_PREFETCH{$path} |= $load; 2195 $MAP_PREFETCH{$path} |= $load;
2044 2196
2045 $MAP_PREFETCHER ||= cf::async { 2197 $MAP_PREFETCHER ||= cf::async {
2082 cf::async { 2234 cf::async {
2083 $Coro::current->{desc} = "map player save"; 2235 $Coro::current->{desc} = "map player save";
2084 $_->contr->save for $self->players; 2236 $_->contr->save for $self->players;
2085 }; 2237 };
2086 2238
2239 cf::get_slot 0.02;
2240
2087 if ($uniq) { 2241 if ($uniq) {
2088 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2242 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2089 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2243 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2090 } else { 2244 } else {
2091 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2099 $self->save; 2253 $self->save;
2100 2254
2101 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2255 my $lock = cf::lock_acquire "map_data:$self->{path}";
2102 2256
2103 return if $self->players; 2257 return if $self->players;
2104 return if $self->in_memory != cf::MAP_IN_MEMORY; 2258 return if $self->in_memory != cf::MAP_ACTIVE;
2105 return if $self->{deny_save}; 2259 return if $self->{deny_save};
2106 2260
2107 $self->in_memory (cf::MAP_SWAPPED); 2261 $self->in_memory (cf::MAP_SWAPPED);
2108 2262
2109 $self->deactivate; 2263 $self->deactivate;
2227 2381
2228sub unique_maps() { 2382sub unique_maps() {
2229 [ 2383 [
2230 map { 2384 map {
2231 utf8::decode $_; 2385 utf8::decode $_;
2232 /\.map$/ 2386 s/\.map$//; # TODO future compatibility hack
2387 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2388 ? ()
2233 ? normalise $_ 2389 : normalise $_
2234 : ()
2235 } @{ aio_readdir $UNIQUEDIR or [] } 2390 } @{ aio_readdir $UNIQUEDIR or [] }
2236 ] 2391 ]
2237} 2392}
2238 2393
2239package cf;
2240
2241=back 2394=back
2242 2395
2243=head3 cf::object 2396=head3 cf::object
2244 2397
2245=cut 2398=cut
2248 2401
2249=over 4 2402=over 4
2250 2403
2251=item $ob->inv_recursive 2404=item $ob->inv_recursive
2252 2405
2253Returns the inventory of the object _and_ their inventories, recursively. 2406Returns the inventory of the object I<and> their inventories, recursively,
2407but I<not> the object itself.
2254 2408
2255=cut 2409=cut
2256 2410
2257sub inv_recursive_; 2411sub inv_recursive_;
2258sub inv_recursive_ { 2412sub inv_recursive_ {
2263 inv_recursive_ inv $_[0] 2417 inv_recursive_ inv $_[0]
2264} 2418}
2265 2419
2266=item $ref = $ob->ref 2420=item $ref = $ob->ref
2267 2421
2268creates and returns a persistent reference to an objetc that can be stored as a string. 2422Creates and returns a persistent reference to an object that can be stored as a string.
2269 2423
2270=item $ob = cf::object::deref ($refstring) 2424=item $ob = cf::object::deref ($refstring)
2271 2425
2272returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2426returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2273even if the object actually exists. May block. 2427even if the object actually exists. May block.
2305can be C<undef>. Does the right thing when the player is currently in a 2459can be C<undef>. Does the right thing when the player is currently in a
2306dialogue with the given NPC character. 2460dialogue with the given NPC character.
2307 2461
2308=cut 2462=cut
2309 2463
2464our $SAY_CHANNEL = {
2465 id => "say",
2466 title => "Map",
2467 reply => "say ",
2468 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2469};
2470
2471our $CHAT_CHANNEL = {
2472 id => "chat",
2473 title => "Chat",
2474 reply => "chat ",
2475 tooltip => "Player chat and shouts, global to the server.",
2476};
2477
2310# rough implementation of a future "reply" method that works 2478# rough implementation of a future "reply" method that works
2311# with dialog boxes. 2479# with dialog boxes.
2312#TODO: the first argument must go, split into a $npc->reply_to ( method 2480#TODO: the first argument must go, split into a $npc->reply_to ( method
2313sub cf::object::player::reply($$$;$) { 2481sub cf::object::player::reply($$$;$) {
2314 my ($self, $npc, $msg, $flags) = @_; 2482 my ($self, $npc, $msg, $flags) = @_;
2325 my $dialog = $pl->{npc_dialog}; 2493 my $dialog = $pl->{npc_dialog};
2326 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2494 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2327 2495
2328 } else { 2496 } else {
2329 $msg = $npc->name . " says: $msg" if $npc; 2497 $msg = $npc->name . " says: $msg" if $npc;
2330 $self->message ($msg, $flags); 2498 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2331 } 2499 }
2332 } 2500 }
2333} 2501}
2334 2502
2335=item $object->send_msg ($channel, $msg, $color, [extra...]) 2503=item $object->send_msg ($channel, $msg, $color, [extra...])
2547 $rmp->{origin_y} = $exit->y; 2715 $rmp->{origin_y} = $exit->y;
2548 } 2716 }
2549 2717
2550 $rmp->{random_seed} ||= $exit->random_seed; 2718 $rmp->{random_seed} ||= $exit->random_seed;
2551 2719
2552 my $data = cf::to_json $rmp; 2720 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2553 my $md5 = Digest::MD5::md5_hex $data; 2721 my $md5 = Digest::MD5::md5_hex $data;
2554 my $meta = "$RANDOMDIR/$md5.meta"; 2722 my $meta = "$RANDOMDIR/$md5.meta";
2555 2723
2556 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2724 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2557 aio_write $fh, 0, (length $data), $data, 0; 2725 aio_write $fh, 0, (length $data), $data, 0;
2630the message, with C<log> being the default. If C<$color> is negative, suppress 2798the message, with C<log> being the default. If C<$color> is negative, suppress
2631the message unless the client supports the msg packet. 2799the message unless the client supports the msg packet.
2632 2800
2633=cut 2801=cut
2634 2802
2803# non-persistent channels (usually the info channel)
2635our %CHANNEL = ( 2804our %CHANNEL = (
2636 "c/identify" => { 2805 "c/identify" => {
2637 id => "infobox", 2806 id => "infobox",
2638 title => "Identify", 2807 title => "Identify",
2639 reply => undef, 2808 reply => undef,
2643 id => "infobox", 2812 id => "infobox",
2644 title => "Examine", 2813 title => "Examine",
2645 reply => undef, 2814 reply => undef,
2646 tooltip => "Signs and other items you examined", 2815 tooltip => "Signs and other items you examined",
2647 }, 2816 },
2817 "c/book" => {
2818 id => "infobox",
2819 title => "Book",
2820 reply => undef,
2821 tooltip => "The contents of a note or book",
2822 },
2648 "c/lookat" => { 2823 "c/lookat" => {
2649 id => "infobox", 2824 id => "infobox",
2650 title => "Look", 2825 title => "Look",
2651 reply => undef, 2826 reply => undef,
2652 tooltip => "What you saw there", 2827 tooltip => "What you saw there",
2828 },
2829 "c/who" => {
2830 id => "infobox",
2831 title => "Players",
2832 reply => undef,
2833 tooltip => "Shows players who are currently online",
2834 },
2835 "c/body" => {
2836 id => "infobox",
2837 title => "Body Parts",
2838 reply => undef,
2839 tooltip => "Shows which body parts you posess and are available",
2840 },
2841 "c/uptime" => {
2842 id => "infobox",
2843 title => "Uptime",
2844 reply => undef,
2845 tooltip => "How long the server has been running since last restart",
2846 },
2847 "c/mapinfo" => {
2848 id => "infobox",
2849 title => "Map Info",
2850 reply => undef,
2851 tooltip => "Information related to the maps",
2852 },
2853 "c/party" => {
2854 id => "party",
2855 title => "Party",
2856 reply => "gsay ",
2857 tooltip => "Messages and chat related to your party",
2653 }, 2858 },
2654); 2859);
2655 2860
2656sub cf::client::send_msg { 2861sub cf::client::send_msg {
2657 my ($self, $channel, $msg, $color, @extra) = @_; 2862 my ($self, $channel, $msg, $color, @extra) = @_;
2894=pod 3099=pod
2895 3100
2896The following functions and methods are available within a safe environment: 3101The following functions and methods are available within a safe environment:
2897 3102
2898 cf::object 3103 cf::object
2899 contr pay_amount pay_player map x y force_find force_add 3104 contr pay_amount pay_player map x y force_find force_add destroy
2900 insert remove name archname title slaying race decrease_ob_nr 3105 insert remove name archname title slaying race decrease split
2901 3106
2902 cf::object::player 3107 cf::object::player
2903 player 3108 player
2904 3109
2905 cf::player 3110 cf::player
2911=cut 3116=cut
2912 3117
2913for ( 3118for (
2914 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3119 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2915 insert remove inv name archname title slaying race 3120 insert remove inv name archname title slaying race
2916 decrease_ob_nr)], 3121 decrease split destroy)],
2917 ["cf::object::player" => qw(player)], 3122 ["cf::object::player" => qw(player)],
2918 ["cf::player" => qw(peaceful)], 3123 ["cf::player" => qw(peaceful)],
2919 ["cf::map" => qw(trigger)], 3124 ["cf::map" => qw(trigger)],
2920) { 3125) {
2921 no strict 'refs'; 3126 no strict 'refs';
3026 { 3231 {
3027 my $faces = $facedata->{faceinfo}; 3232 my $faces = $facedata->{faceinfo};
3028 3233
3029 while (my ($face, $info) = each %$faces) { 3234 while (my ($face, $info) = each %$faces) {
3030 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3235 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3236
3031 cf::face::set_visibility $idx, $info->{visibility}; 3237 cf::face::set_visibility $idx, $info->{visibility};
3032 cf::face::set_magicmap $idx, $info->{magicmap}; 3238 cf::face::set_magicmap $idx, $info->{magicmap};
3033 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3239 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}; 3240 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3035 3241
3036 cf::cede_to_tick; 3242 cf::cede_to_tick;
3037 } 3243 }
3038 3244
3039 while (my ($face, $info) = each %$faces) { 3245 while (my ($face, $info) = each %$faces) {
3040 next unless $info->{smooth}; 3246 next unless $info->{smooth};
3247
3041 my $idx = cf::face::find $face 3248 my $idx = cf::face::find $face
3042 or next; 3249 or next;
3250
3043 if (my $smooth = cf::face::find $info->{smooth}) { 3251 if (my $smooth = cf::face::find $info->{smooth}) {
3044 cf::face::set_smooth $idx, $smooth; 3252 cf::face::set_smooth $idx, $smooth;
3045 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3253 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3046 } else { 3254 } else {
3047 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3255 warn "smooth face '$info->{smooth}' not found for face '$face'";
3065 { 3273 {
3066 # TODO: for gcfclient pleasure, we should give resources 3274 # TODO: for gcfclient pleasure, we should give resources
3067 # that gcfclient doesn't grok a >10000 face index. 3275 # that gcfclient doesn't grok a >10000 face index.
3068 my $res = $facedata->{resource}; 3276 my $res = $facedata->{resource};
3069 3277
3070 my $soundconf = delete $res->{"res/sound.conf"};
3071
3072 while (my ($name, $info) = each %$res) { 3278 while (my ($name, $info) = each %$res) {
3279 if (defined $info->{type}) {
3073 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3280 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3074 my $data; 3281 my $data;
3075 3282
3076 if ($info->{type} & 1) { 3283 if ($info->{type} & 1) {
3077 # prepend meta info 3284 # prepend meta info
3078 3285
3079 my $meta = $enc->encode ({ 3286 my $meta = $enc->encode ({
3080 name => $name, 3287 name => $name,
3081 %{ $info->{meta} || {} }, 3288 %{ $info->{meta} || {} },
3082 }); 3289 });
3083 3290
3084 $data = pack "(w/a*)*", $meta, $info->{data}; 3291 $data = pack "(w/a*)*", $meta, $info->{data};
3292 } else {
3293 $data = $info->{data};
3294 }
3295
3296 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3297 cf::face::set_type $idx, $info->{type};
3085 } else { 3298 } else {
3086 $data = $info->{data}; 3299 $RESOURCE{$name} = $info;
3087 } 3300 }
3088 3301
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; 3302 cf::cede_to_tick;
3093 } 3303 }
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 } 3304 }
3305
3306 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3113 3307
3114 1 3308 1
3115} 3309}
3310
3311cf::global->attach (on_resource_update => sub {
3312 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3313 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3314
3315 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3316 my $sound = $soundconf->{compat}[$_]
3317 or next;
3318
3319 my $face = cf::face::find "sound/$sound->[1]";
3320 cf::sound::set $sound->[0] => $face;
3321 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3322 }
3323
3324 while (my ($k, $v) = each %{$soundconf->{event}}) {
3325 my $face = cf::face::find "sound/$v";
3326 cf::sound::set $k => $face;
3327 }
3328 }
3329});
3116 3330
3117register_exticmd fx_want => sub { 3331register_exticmd fx_want => sub {
3118 my ($ns, $want) = @_; 3332 my ($ns, $want) = @_;
3119 3333
3120 while (my ($k, $v) = each %$want) { 3334 while (my ($k, $v) = each %$want) {
3121 $ns->fx_want ($k, $v); 3335 $ns->fx_want ($k, $v);
3122 } 3336 }
3123}; 3337};
3338
3339sub load_resource_file($) {
3340 my $guard = lock_acquire "load_resource_file";
3341
3342 my $status = load_resource_file_ $_[0];
3343 get_slot 0.1, 100;
3344 cf::arch::commit_load;
3345
3346 $status
3347}
3124 3348
3125sub reload_regions { 3349sub reload_regions {
3126 # HACK to clear player env face cache, we need some signal framework 3350 # HACK to clear player env face cache, we need some signal framework
3127 # for this (global event?) 3351 # for this (global event?)
3128 %ext::player_env::MUSIC_FACE_CACHE = (); 3352 %ext::player_env::MUSIC_FACE_CACHE = ();
3142} 3366}
3143 3367
3144sub reload_archetypes { 3368sub reload_archetypes {
3145 load_resource_file "$DATADIR/archetypes" 3369 load_resource_file "$DATADIR/archetypes"
3146 or die "unable to load archetypes\n"; 3370 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} 3371}
3153 3372
3154sub reload_treasures { 3373sub reload_treasures {
3155 load_resource_file "$DATADIR/treasures" 3374 load_resource_file "$DATADIR/treasures"
3156 or die "unable to load treasurelists\n"; 3375 or die "unable to load treasurelists\n";
3157} 3376}
3158 3377
3159sub reload_resources { 3378sub reload_resources {
3160 warn "reloading resource files...\n"; 3379 warn "reloading resource files...\n";
3161 3380
3381 reload_facedata;
3382 reload_archetypes;
3162 reload_regions; 3383 reload_regions;
3163 reload_facedata;
3164 #reload_archetypes;#d#
3165 reload_archetypes;
3166 reload_treasures; 3384 reload_treasures;
3167 3385
3168 warn "finished reloading resource files\n"; 3386 warn "finished reloading resource files\n";
3169} 3387}
3170 3388
3171sub init { 3389sub init {
3390 my $guard = freeze_mainloop;
3391
3172 reload_resources; 3392 reload_resources;
3173} 3393}
3174 3394
3175sub reload_config { 3395sub reload_config {
3176 open my $fh, "<:utf8", "$CONFDIR/config" 3396 open my $fh, "<:utf8", "$CONFDIR/config"
3177 or return; 3397 or return;
3178 3398
3179 local $/; 3399 local $/;
3180 *CFG = YAML::Syck::Load <$fh>; 3400 *CFG = YAML::Load <$fh>;
3181 3401
3182 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3402 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3183 3403
3184 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3404 $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}; 3405 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3197 # we must not ever block the main coroutine 3417 # we must not ever block the main coroutine
3198 local $Coro::idle = sub { 3418 local $Coro::idle = sub {
3199 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3419 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3200 (async { 3420 (async {
3201 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3421 $Coro::current->{desc} = "IDLE BUG HANDLER";
3202 Event::one_event; 3422 EV::loop EV::LOOP_ONESHOT;
3203 })->prio (Coro::PRIO_MAX); 3423 })->prio (Coro::PRIO_MAX);
3204 }; 3424 };
3205 3425
3426 {
3427 my $guard = freeze_mainloop;
3206 reload_config; 3428 reload_config;
3207 db_init; 3429 db_init;
3208 load_extensions; 3430 load_extensions;
3209 3431
3210 $TICK_WATCHER->start; 3432 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3433 evthread_start IO::AIO::poll_fileno;
3434 }
3435
3211 Event::loop; 3436 EV::loop;
3212} 3437}
3213 3438
3214############################################################################# 3439#############################################################################
3215# initialisation and cleanup 3440# initialisation and cleanup
3216 3441
3217# install some emergency cleanup handlers 3442# install some emergency cleanup handlers
3218BEGIN { 3443BEGIN {
3444 our %SIGWATCHER = ();
3219 for my $signal (qw(INT HUP TERM)) { 3445 for my $signal (qw(INT HUP TERM)) {
3220 Event->signal ( 3446 $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"; 3447 cf::cleanup "SIG$signal";
3227 },
3228 ); 3448 };
3229 } 3449 }
3230} 3450}
3231 3451
3232sub write_runtime { 3452sub write_runtime_sync {
3233 my $runtime = "$LOCALDIR/runtime"; 3453 my $runtime = "$LOCALDIR/runtime";
3234 3454
3235 # first touch the runtime file to show we are still running: 3455 # first touch the runtime file to show we are still running:
3236 # the fsync below can take a very very long time. 3456 # the fsync below can take a very very long time.
3237 3457
3263 and return; 3483 and return;
3264 3484
3265 warn "runtime file written.\n"; 3485 warn "runtime file written.\n";
3266 3486
3267 1 3487 1
3488}
3489
3490our $uuid_lock;
3491our $uuid_skip;
3492
3493sub write_uuid_sync($) {
3494 $uuid_skip ||= $_[0];
3495
3496 return if $uuid_lock;
3497 local $uuid_lock = 1;
3498
3499 my $uuid = "$LOCALDIR/uuid";
3500
3501 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3502 or return;
3503
3504 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3505 $uuid_skip = 0;
3506
3507 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3508 and return;
3509
3510 # always fsync - this file is important
3511 aio_fsync $fh
3512 and return;
3513
3514 close $fh
3515 or return;
3516
3517 aio_rename "$uuid~", $uuid
3518 and return;
3519
3520 warn "uuid file written ($value).\n";
3521
3522 1
3523
3524}
3525
3526sub write_uuid($$) {
3527 my ($skip, $sync) = @_;
3528
3529 $sync ? write_uuid_sync $skip
3530 : async { write_uuid_sync $skip };
3268} 3531}
3269 3532
3270sub emergency_save() { 3533sub emergency_save() {
3271 my $freeze_guard = cf::freeze_mainloop; 3534 my $freeze_guard = cf::freeze_mainloop;
3272 3535
3278 # and maps saved/destroyed asynchronously. 3541 # and maps saved/destroyed asynchronously.
3279 warn "begin emergency player save\n"; 3542 warn "begin emergency player save\n";
3280 for my $login (keys %cf::PLAYER) { 3543 for my $login (keys %cf::PLAYER) {
3281 my $pl = $cf::PLAYER{$login} or next; 3544 my $pl = $cf::PLAYER{$login} or next;
3282 $pl->valid or next; 3545 $pl->valid or next;
3546 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3283 $pl->save; 3547 $pl->save;
3284 } 3548 }
3285 warn "end emergency player save\n"; 3549 warn "end emergency player save\n";
3286 3550
3287 warn "begin emergency map save\n"; 3551 warn "begin emergency map save\n";
3293 warn "end emergency map save\n"; 3557 warn "end emergency map save\n";
3294 3558
3295 warn "begin emergency database checkpoint\n"; 3559 warn "begin emergency database checkpoint\n";
3296 BDB::db_env_txn_checkpoint $DB_ENV; 3560 BDB::db_env_txn_checkpoint $DB_ENV;
3297 warn "end emergency database checkpoint\n"; 3561 warn "end emergency database checkpoint\n";
3562
3563 warn "begin write uuid\n";
3564 write_uuid_sync 1;
3565 warn "end write uuid\n";
3298 }; 3566 };
3299 3567
3300 warn "leave emergency perl save\n"; 3568 warn "leave emergency perl save\n";
3301} 3569}
3302 3570
3317 warn "reloading..."; 3585 warn "reloading...";
3318 3586
3319 warn "entering sync_job"; 3587 warn "entering sync_job";
3320 3588
3321 cf::sync_job { 3589 cf::sync_job {
3322 cf::write_runtime; # external watchdog should not bark 3590 cf::write_runtime_sync; # external watchdog should not bark
3323 cf::emergency_save; 3591 cf::emergency_save;
3324 cf::write_runtime; # external watchdog should not bark 3592 cf::write_runtime_sync; # external watchdog should not bark
3325 3593
3326 warn "syncing database to disk"; 3594 warn "syncing database to disk";
3327 BDB::db_env_txn_checkpoint $DB_ENV; 3595 BDB::db_env_txn_checkpoint $DB_ENV;
3328 3596
3329 # if anything goes wrong in here, we should simply crash as we already saved 3597 # if anything goes wrong in here, we should simply crash as we already saved
3330
3331 warn "cancelling all WF_AUTOCANCEL watchers";
3332 for (Event::all_watchers) {
3333 $_->cancel if $_->data & WF_AUTOCANCEL;
3334 }
3335 3598
3336 warn "flushing outstanding aio requests"; 3599 warn "flushing outstanding aio requests";
3337 for (;;) { 3600 for (;;) {
3338 BDB::flush; 3601 BDB::flush;
3339 IO::AIO::flush; 3602 IO::AIO::flush;
3340 Coro::cede; 3603 Coro::cede_notself;
3341 last unless IO::AIO::nreqs || BDB::nreqs; 3604 last unless IO::AIO::nreqs || BDB::nreqs;
3342 warn "iterate..."; 3605 warn "iterate...";
3343 } 3606 }
3344 3607
3345 ++$RELOAD; 3608 ++$RELOAD;
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";
3431}; 3693};
3432 3694
3434 3696
3435sub reload_perl() { 3697sub reload_perl() {
3436 # doing reload synchronously and two reloads happen back-to-back, 3698 # doing reload synchronously and two reloads happen back-to-back,
3437 # coro crashes during coro_state_free->destroy here. 3699 # coro crashes during coro_state_free->destroy here.
3438 3700
3439 $RELOAD_WATCHER ||= Event->timer ( 3701 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3440 reentrant => 0,
3441 after => 0,
3442 data => WF_AUTOCANCEL,
3443 cb => sub {
3444 do_reload_perl; 3702 do_reload_perl;
3445 undef $RELOAD_WATCHER; 3703 undef $RELOAD_WATCHER;
3446 },
3447 ); 3704 };
3448} 3705}
3449 3706
3450register_command "reload" => sub { 3707register_command "reload" => sub {
3451 my ($who, $arg) = @_; 3708 my ($who, $arg) = @_;
3452 3709
3465 3722
3466our @WAIT_FOR_TICK; 3723our @WAIT_FOR_TICK;
3467our @WAIT_FOR_TICK_BEGIN; 3724our @WAIT_FOR_TICK_BEGIN;
3468 3725
3469sub wait_for_tick { 3726sub wait_for_tick {
3470 return unless $TICK_WATCHER->is_active;
3471 return if $Coro::current == $Coro::main; 3727 return if tick_inhibit || $Coro::current == $Coro::main;
3472 3728
3473 my $signal = new Coro::Signal; 3729 my $signal = new Coro::Signal;
3474 push @WAIT_FOR_TICK, $signal; 3730 push @WAIT_FOR_TICK, $signal;
3475 $signal->wait; 3731 $signal->wait;
3476} 3732}
3477 3733
3478sub wait_for_tick_begin { 3734sub wait_for_tick_begin {
3479 return unless $TICK_WATCHER->is_active;
3480 return if $Coro::current == $Coro::main; 3735 return if tick_inhibit || $Coro::current == $Coro::main;
3481 3736
3482 my $signal = new Coro::Signal; 3737 my $signal = new Coro::Signal;
3483 push @WAIT_FOR_TICK_BEGIN, $signal; 3738 push @WAIT_FOR_TICK_BEGIN, $signal;
3484 $signal->wait; 3739 $signal->wait;
3485} 3740}
3486 3741
3487$TICK_WATCHER = Event->timer ( 3742sub 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) { 3743 if ($Coro::current != $Coro::main) {
3495 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3744 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3496 unless ++$bug_warning > 10; 3745 unless ++$bug_warning > 10;
3497 return; 3746 return;
3498 } 3747 }
3499 3748
3500 $NOW = $tick_start = Event::time;
3501
3502 cf::server_tick; # one server iteration 3749 cf::server_tick; # one server iteration
3503 3750
3504 $RUNTIME += $TICK;
3505 $NEXT_TICK += $TICK;
3506
3507 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3751 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3508 $NEXT_RUNTIME_WRITE = $NOW + 10; 3752 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3509 Coro::async_pool { 3753 Coro::async_pool {
3510 $Coro::current->{desc} = "runtime saver"; 3754 $Coro::current->{desc} = "runtime saver";
3511 write_runtime 3755 write_runtime_sync
3512 or warn "ERROR: unable to write runtime file: $!"; 3756 or warn "ERROR: unable to write runtime file: $!";
3513 };
3514 } 3757 };
3758 }
3515 3759
3516 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3760 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3517 $sig->send; 3761 $sig->send;
3518 } 3762 }
3519 while (my $sig = shift @WAIT_FOR_TICK) { 3763 while (my $sig = shift @WAIT_FOR_TICK) {
3520 $sig->send; 3764 $sig->send;
3521 } 3765 }
3522 3766
3523 $NOW = Event::time; 3767 $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; 3768 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3533 3769
3534 _post_tick; 3770 if (0) {
3771 if ($NEXT_TICK) {
3772 my $jitter = $TICK_START - $NEXT_TICK;
3773 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3774 warn "jitter $JITTER\n";#d#
3775 }
3535 }, 3776 }
3536); 3777}
3537 3778
3538{ 3779{
3780 # configure BDB
3781
3539 BDB::min_parallel 8; 3782 BDB::min_parallel 8;
3540 BDB::max_poll_time $TICK * 0.1; 3783 BDB::max_poll_reqs $TICK * 0.1;
3541 $BDB_POLL_WATCHER = Event->io ( 3784 $Coro::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 3785
3565 unless ($DB_ENV) { 3786 unless ($DB_ENV) {
3566 $DB_ENV = BDB::db_env_create; 3787 $DB_ENV = BDB::db_env_create;
3567 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3788 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3568 | BDB::LOG_AUTOREMOVE, 1); 3789 | BDB::LOG_AUTOREMOVE, 1);
3583 3804
3584 cf::cleanup "db_env_open(db): $@" if $@; 3805 cf::cleanup "db_env_open(db): $@" if $@;
3585 }; 3806 };
3586 } 3807 }
3587 3808
3588 $BDB_DEADLOCK_WATCHER = Event->timer ( 3809 $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 { }; 3810 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3596 },
3597 ); 3811 };
3598 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3812 $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 { }; 3813 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3606 },
3607 ); 3814 };
3608 $BDB_TRICKLE_WATCHER = Event->timer ( 3815 $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 { }; 3816 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3616 },
3617 ); 3817 };
3618} 3818}
3619 3819
3620{ 3820{
3821 # configure IO::AIO
3822
3621 IO::AIO::min_parallel 8; 3823 IO::AIO::min_parallel 8;
3622
3623 undef $Coro::AIO::WATCHER;
3624 IO::AIO::max_poll_time $TICK * 0.1; 3824 IO::AIO::max_poll_time $TICK * 0.1;
3625 $AIO_POLL_WATCHER = Event->io ( 3825 $Coro::AIO::WATCHER->priority (1);
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} 3826}
3634 3827
3635my $_log_backtrace; 3828my $_log_backtrace;
3636 3829
3637sub _log_backtrace { 3830sub _log_backtrace {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines