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.399 by root, Sun Dec 16 02:50:33 2007 UTC vs.
Revision 1.427 by root, Sat Apr 26 12:25:45 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
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 EV; 30use EV 3.2;
10use Opcode; 31use Opcode;
11use Safe; 32use Safe;
12use Safe::Hole; 33use Safe::Hole;
13use Storable (); 34use Storable ();
14 35
15use Coro 4.1 (); 36use Coro 4.50 ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::EV; 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 2.01 (); 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.51 (); 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# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
44$YAML::Syck::ImplicitUnicode = 1;
45 64
46$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
47 66
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
49 68
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 87our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 89our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 90our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db"; 91our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE;
73 93
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75our $TICK_WATCHER;
76our $AIO_POLL_WATCHER; 95our $AIO_POLL_WATCHER;
77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 97our $NEXT_TICK;
79our $USE_FSYNC = 1; # use fsync to write maps - default off 98our $USE_FSYNC = 1; # use fsync to write maps - default off
80 99
97# 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 ∕
98our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
99 118
100our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
101our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
102our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
103 123
104binmode STDOUT; 124binmode STDOUT;
105binmode STDERR; 125binmode STDERR;
106 126
107# read virtual server time, if available 127# read virtual server time, if available
191 $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;
192 212
193 LOG llevError, $msg; 213 LOG llevError, $msg;
194 }; 214 };
195} 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#?
196 231
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
325 360
326 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
327} 362}
328 363
329sub freeze_mainloop { 364sub freeze_mainloop {
330 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
331 366
332 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
333 $TICK_WATCHER->start;
334 };
335 $TICK_WATCHER->stop;
336 $guard
337} 368}
338 369
339=item cf::periodic $interval, $cb 370=item cf::periodic $interval, $cb
340 371
341Like EV::periodic, but randomly selects a starting point so that the actions 372Like EV::periodic, but randomly selects a starting point so that the actions
396 } 427 }
397 } 428 }
398}; 429};
399 430
400sub get_slot($;$$) { 431sub get_slot($;$$) {
432 return if tick_inhibit || $Coro::current == $Coro::main;
433
401 my ($time, $pri, $name) = @_; 434 my ($time, $pri, $name) = @_;
402 435
403 $time = $TICK * .6 if $time > $TICK * .6; 436 $time = $TICK * .6 if $time > $TICK * .6;
404 my $sig = new Coro::Signal; 437 my $sig = new Coro::Signal;
405 438
442 # this is the main coro, too bad, we have to block 475 # this is the main coro, too bad, we have to block
443 # till the operation succeeds, freezing the server :/ 476 # till the operation succeeds, freezing the server :/
444 477
445 LOG llevError, Carp::longmess "sync job";#d# 478 LOG llevError, Carp::longmess "sync job";#d#
446 479
447 # TODO: use suspend/resume instead
448 # (but this is cancel-safe)
449 my $freeze_guard = freeze_mainloop; 480 my $freeze_guard = freeze_mainloop;
450 481
451 my $busy = 1; 482 my $busy = 1;
452 my @res; 483 my @res;
453 484
464 } else { 495 } else {
465 EV::loop EV::LOOP_ONESHOT; 496 EV::loop EV::LOOP_ONESHOT;
466 } 497 }
467 } 498 }
468 499
469 $time = EV::time - $time; 500 my $time = EV::time - $time;
470 501
471 LOG llevError | logBacktrace, Carp::longmess "long sync job"
472 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
473
474 $tick_start += $time; # do not account sync jobs to server load 502 $TICK_START += $time; # do not account sync jobs to server load
475 503
476 wantarray ? @res : $res[0] 504 wantarray ? @res : $res[0]
477 } else { 505 } else {
478 # we are in another coroutine, how wonderful, everything just works 506 # we are in another coroutine, how wonderful, everything just works
479 507
521 reset_signals; 549 reset_signals;
522 &$cb 550 &$cb
523 }, @args; 551 }, @args;
524 552
525 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
526} 581}
527 582
528=item $value = cf::db_get $family => $key 583=item $value = cf::db_get $family => $key
529 584
530Returns a single value from the environment database. 585Returns a single value from the environment database.
967 } 1022 }
968 1023
969 0 1024 0
970} 1025}
971 1026
972=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1027=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
973 1028
974=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1029=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
975 1030
976Generate an object-specific event with the given arguments. 1031Generate an object-specific event with the given arguments.
977 1032
1086 utf8::decode (my $decname = $filename); 1141 utf8::decode (my $decname = $filename);
1087 warn sprintf "saving %s (%d,%d)\n", 1142 warn sprintf "saving %s (%d,%d)\n",
1088 $decname, length $$rdata, scalar @$objs; 1143 $decname, length $$rdata, scalar @$objs;
1089 1144
1090 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1091 chmod SAVE_MODE, $fh; 1146 aio_chmod $fh, SAVE_MODE;
1092 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1093 aio_fsync $fh if $cf::USE_FSYNC; 1148 aio_fsync $fh if $cf::USE_FSYNC;
1094 close $fh; 1149 aio_close $fh;
1095 1150
1096 if (@$objs) { 1151 if (@$objs) {
1097 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) {
1098 chmod SAVE_MODE, $fh; 1153 aio_chmod $fh, SAVE_MODE;
1099 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1100 aio_write $fh, 0, (length $data), $data, 0; 1155 aio_write $fh, 0, (length $data), $data, 0;
1101 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
1102 close $fh; 1157 aio_close $fh;
1103 aio_rename "$filename.pst~", "$filename.pst"; 1158 aio_rename "$filename.pst~", "$filename.pst";
1104 } 1159 }
1105 } else { 1160 } else {
1106 aio_unlink "$filename.pst"; 1161 aio_unlink "$filename.pst";
1107 } 1162 }
1302 my $msg = $@ ? "$v->{path}: $@\n" 1357 my $msg = $@ ? "$v->{path}: $@\n"
1303 : "$v->{base}: extension inactive.\n"; 1358 : "$v->{base}: extension inactive.\n";
1304 1359
1305 if (exists $v->{meta}{mandatory}) { 1360 if (exists $v->{meta}{mandatory}) {
1306 warn $msg; 1361 warn $msg;
1307 warn "mandatory extension failed to load, exiting.\n"; 1362 cf::cleanup "mandatory extension failed to load, exiting.";
1308 exit 1;
1309 } 1363 }
1310 1364
1311 warn $msg; 1365 warn $msg;
1312 } 1366 }
1313 1367
1402 my $f = new_from_file cf::object::thawer path $login 1456 my $f = new_from_file cf::object::thawer path $login
1403 or return; 1457 or return;
1404 1458
1405 my $pl = cf::player::load_pl $f 1459 my $pl = cf::player::load_pl $f
1406 or return; 1460 or return;
1461
1407 local $cf::PLAYER_LOADING{$login} = $pl; 1462 local $cf::PLAYER_LOADING{$login} = $pl;
1408 $f->resolve_delayed_derefs; 1463 $f->resolve_delayed_derefs;
1409 $cf::PLAYER{$login} = $pl 1464 $cf::PLAYER{$login} = $pl
1410 } 1465 }
1411 } 1466 }
1421 1476
1422 return if $pl->{deny_save}; 1477 return if $pl->{deny_save};
1423 1478
1424 aio_mkdir playerdir $pl, 0770; 1479 aio_mkdir playerdir $pl, 0770;
1425 $pl->{last_save} = $cf::RUNTIME; 1480 $pl->{last_save} = $cf::RUNTIME;
1481
1482 cf::get_slot 0.01;
1426 1483
1427 $pl->save_pl ($path); 1484 $pl->save_pl ($path);
1428 cf::cede_to_tick; 1485 cf::cede_to_tick;
1429} 1486}
1430 1487
1514 1571
1515 for my $login (@$dirs) { 1572 for my $login (@$dirs) {
1516 my $path = path $login; 1573 my $path = path $login;
1517 1574
1518 # a .pst is a dead give-away for a valid player 1575 # a .pst is a dead give-away for a valid player
1519 unless (-e "$path.pst") { 1576 # if no pst file found, open and chekc for blocked users
1577 if (aio_stat "$path.pst") {
1520 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1578 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1521 aio_read $fh, 0, 512, my $buf, 0 or next; 1579 aio_read $fh, 0, 512, my $buf, 0 or next;
1522 $buf !~ /^password -------------$/m or next; # official not-valid tag 1580 $buf !~ /^password -------------$/m or next; # official not-valid tag
1523 } 1581 }
1524 1582
1723our $MAX_RESET = 3600; 1781our $MAX_RESET = 3600;
1724our $DEFAULT_RESET = 3000; 1782our $DEFAULT_RESET = 3000;
1725 1783
1726sub generate_random_map { 1784sub generate_random_map {
1727 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
1728 # mit "rum" bekleckern, nicht 1789 # mit "rum" bekleckern, nicht
1729 $self->_create_random_map ( 1790 $self->_create_random_map (
1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1791 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1792 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1793 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1854 1915
1855# the temporary/swap location 1916# the temporary/swap location
1856sub save_path { 1917sub save_path {
1857 my ($self) = @_; 1918 my ($self) = @_;
1858 1919
1859 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1920 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1860 "$TMPDIR/$path.map" 1921 "$TMPDIR/$path.map"
1861} 1922}
1862 1923
1863# the unique path, undef == no special unique path 1924# the unique path, undef == no special unique path
1864sub uniq_path { 1925sub uniq_path {
1865 my ($self) = @_; 1926 my ($self) = @_;
1866 1927
1867 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1868 "$UNIQUEDIR/$path" 1929 "$UNIQUEDIR/$path"
1869} 1930}
1870 1931
1871# and all this just because we cannot iterate over 1932# and all this just because we cannot iterate over
1872# all maps in C++... 1933# all maps in C++...
2058 } 2119 }
2059 2120
2060 $self->{last_save} = $cf::RUNTIME; 2121 $self->{last_save} = $cf::RUNTIME;
2061 $self->last_access ($cf::RUNTIME); 2122 $self->last_access ($cf::RUNTIME);
2062 2123
2063 $self->in_memory (cf::MAP_IN_MEMORY); 2124 $self->in_memory (cf::MAP_ACTIVE);
2064 } 2125 }
2065 2126
2066 $self->post_load; 2127 $self->post_load;
2067} 2128}
2068 2129
2126 my ($path, $origin, $load) = @_; 2187 my ($path, $origin, $load) = @_;
2127 2188
2128 $path = normalise $path, $origin && $origin->{path}; 2189 $path = normalise $path, $origin && $origin->{path};
2129 2190
2130 if (my $map = $cf::MAP{$path}) { 2191 if (my $map = $cf::MAP{$path}) {
2131 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2192 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2132 } 2193 }
2133 2194
2134 $MAP_PREFETCH{$path} |= $load; 2195 $MAP_PREFETCH{$path} |= $load;
2135 2196
2136 $MAP_PREFETCHER ||= cf::async { 2197 $MAP_PREFETCHER ||= cf::async {
2173 cf::async { 2234 cf::async {
2174 $Coro::current->{desc} = "map player save"; 2235 $Coro::current->{desc} = "map player save";
2175 $_->contr->save for $self->players; 2236 $_->contr->save for $self->players;
2176 }; 2237 };
2177 2238
2239 cf::get_slot 0.02;
2240
2178 if ($uniq) { 2241 if ($uniq) {
2179 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2242 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2180 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2243 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2181 } else { 2244 } else {
2182 $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);
2190 $self->save; 2253 $self->save;
2191 2254
2192 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2255 my $lock = cf::lock_acquire "map_data:$self->{path}";
2193 2256
2194 return if $self->players; 2257 return if $self->players;
2195 return if $self->in_memory != cf::MAP_IN_MEMORY; 2258 return if $self->in_memory != cf::MAP_ACTIVE;
2196 return if $self->{deny_save}; 2259 return if $self->{deny_save};
2197 2260
2198 $self->in_memory (cf::MAP_SWAPPED); 2261 $self->in_memory (cf::MAP_SWAPPED);
2199 2262
2200 $self->deactivate; 2263 $self->deactivate;
2318 2381
2319sub unique_maps() { 2382sub unique_maps() {
2320 [ 2383 [
2321 map { 2384 map {
2322 utf8::decode $_; 2385 utf8::decode $_;
2323 /\.map$/ 2386 s/\.map$//; # TODO future compatibility hack
2387 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2388 ? ()
2324 ? normalise $_ 2389 : normalise $_
2325 : ()
2326 } @{ aio_readdir $UNIQUEDIR or [] } 2390 } @{ aio_readdir $UNIQUEDIR or [] }
2327 ] 2391 ]
2328} 2392}
2329 2393
2330package cf;
2331
2332=back 2394=back
2333 2395
2334=head3 cf::object 2396=head3 cf::object
2335 2397
2336=cut 2398=cut
2339 2401
2340=over 4 2402=over 4
2341 2403
2342=item $ob->inv_recursive 2404=item $ob->inv_recursive
2343 2405
2344Returns 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.
2345 2408
2346=cut 2409=cut
2347 2410
2348sub inv_recursive_; 2411sub inv_recursive_;
2349sub inv_recursive_ { 2412sub inv_recursive_ {
2354 inv_recursive_ inv $_[0] 2417 inv_recursive_ inv $_[0]
2355} 2418}
2356 2419
2357=item $ref = $ob->ref 2420=item $ref = $ob->ref
2358 2421
2359creates 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.
2360 2423
2361=item $ob = cf::object::deref ($refstring) 2424=item $ob = cf::object::deref ($refstring)
2362 2425
2363returns 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,
2364even if the object actually exists. May block. 2427even if the object actually exists. May block.
2638 $rmp->{origin_y} = $exit->y; 2701 $rmp->{origin_y} = $exit->y;
2639 } 2702 }
2640 2703
2641 $rmp->{random_seed} ||= $exit->random_seed; 2704 $rmp->{random_seed} ||= $exit->random_seed;
2642 2705
2643 my $data = cf::encode_json $rmp; 2706 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2644 my $md5 = Digest::MD5::md5_hex $data; 2707 my $md5 = Digest::MD5::md5_hex $data;
2645 my $meta = "$RANDOMDIR/$md5.meta"; 2708 my $meta = "$RANDOMDIR/$md5.meta";
2646 2709
2647 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2710 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2648 aio_write $fh, 0, (length $data), $data, 0; 2711 aio_write $fh, 0, (length $data), $data, 0;
2771 id => "infobox", 2834 id => "infobox",
2772 title => "Map Info", 2835 title => "Map Info",
2773 reply => undef, 2836 reply => undef,
2774 tooltip => "Information related to the maps", 2837 tooltip => "Information related to the maps",
2775 }, 2838 },
2839 "c/party" => {
2840 id => "party",
2841 title => "Party",
2842 reply => "gsay ",
2843 tooltip => "Messages and chat related to your party",
2844 },
2776); 2845);
2777 2846
2778sub cf::client::send_msg { 2847sub cf::client::send_msg {
2779 my ($self, $channel, $msg, $color, @extra) = @_; 2848 my ($self, $channel, $msg, $color, @extra) = @_;
2780 2849
3017 3086
3018The following functions and methods are available within a safe environment: 3087The following functions and methods are available within a safe environment:
3019 3088
3020 cf::object 3089 cf::object
3021 contr pay_amount pay_player map x y force_find force_add destroy 3090 contr pay_amount pay_player map x y force_find force_add destroy
3022 insert remove name archname title slaying race decrease_ob_nr 3091 insert remove name archname title slaying race decrease split
3023 3092
3024 cf::object::player 3093 cf::object::player
3025 player 3094 player
3026 3095
3027 cf::player 3096 cf::player
3033=cut 3102=cut
3034 3103
3035for ( 3104for (
3036 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3105 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3037 insert remove inv name archname title slaying race 3106 insert remove inv name archname title slaying race
3038 decrease_ob_nr destroy)], 3107 decrease split destroy)],
3039 ["cf::object::player" => qw(player)], 3108 ["cf::object::player" => qw(player)],
3040 ["cf::player" => qw(peaceful)], 3109 ["cf::player" => qw(peaceful)],
3041 ["cf::map" => qw(trigger)], 3110 ["cf::map" => qw(trigger)],
3042) { 3111) {
3043 no strict 'refs'; 3112 no strict 'refs';
3148 { 3217 {
3149 my $faces = $facedata->{faceinfo}; 3218 my $faces = $facedata->{faceinfo};
3150 3219
3151 while (my ($face, $info) = each %$faces) { 3220 while (my ($face, $info) = each %$faces) {
3152 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3221 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3222
3153 cf::face::set_visibility $idx, $info->{visibility}; 3223 cf::face::set_visibility $idx, $info->{visibility};
3154 cf::face::set_magicmap $idx, $info->{magicmap}; 3224 cf::face::set_magicmap $idx, $info->{magicmap};
3155 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3225 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3156 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3226 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3157 3227
3158 cf::cede_to_tick; 3228 cf::cede_to_tick;
3159 } 3229 }
3160 3230
3161 while (my ($face, $info) = each %$faces) { 3231 while (my ($face, $info) = each %$faces) {
3162 next unless $info->{smooth}; 3232 next unless $info->{smooth};
3233
3163 my $idx = cf::face::find $face 3234 my $idx = cf::face::find $face
3164 or next; 3235 or next;
3236
3165 if (my $smooth = cf::face::find $info->{smooth}) { 3237 if (my $smooth = cf::face::find $info->{smooth}) {
3166 cf::face::set_smooth $idx, $smooth; 3238 cf::face::set_smooth $idx, $smooth;
3167 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3239 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3168 } else { 3240 } else {
3169 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3241 warn "smooth face '$info->{smooth}' not found for face '$face'";
3187 { 3259 {
3188 # TODO: for gcfclient pleasure, we should give resources 3260 # TODO: for gcfclient pleasure, we should give resources
3189 # that gcfclient doesn't grok a >10000 face index. 3261 # that gcfclient doesn't grok a >10000 face index.
3190 my $res = $facedata->{resource}; 3262 my $res = $facedata->{resource};
3191 3263
3192 my $soundconf = delete $res->{"res/sound.conf"};
3193
3194 while (my ($name, $info) = each %$res) { 3264 while (my ($name, $info) = each %$res) {
3265 if (defined $info->{type}) {
3195 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3266 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3196 my $data; 3267 my $data;
3197 3268
3198 if ($info->{type} & 1) { 3269 if ($info->{type} & 1) {
3199 # prepend meta info 3270 # prepend meta info
3200 3271
3201 my $meta = $enc->encode ({ 3272 my $meta = $enc->encode ({
3202 name => $name, 3273 name => $name,
3203 %{ $info->{meta} || {} }, 3274 %{ $info->{meta} || {} },
3204 }); 3275 });
3205 3276
3206 $data = pack "(w/a*)*", $meta, $info->{data}; 3277 $data = pack "(w/a*)*", $meta, $info->{data};
3278 } else {
3279 $data = $info->{data};
3280 }
3281
3282 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3283 cf::face::set_type $idx, $info->{type};
3207 } else { 3284 } else {
3208 $data = $info->{data}; 3285 $RESOURCE{$name} = $info;
3209 } 3286 }
3210 3287
3211 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3212 cf::face::set_type $idx, $info->{type};
3213
3214 cf::cede_to_tick; 3288 cf::cede_to_tick;
3215 } 3289 }
3216
3217 if ($soundconf) {
3218 $soundconf = $enc->decode (delete $soundconf->{data});
3219
3220 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3221 my $sound = $soundconf->{compat}[$_]
3222 or next;
3223
3224 my $face = cf::face::find "sound/$sound->[1]";
3225 cf::sound::set $sound->[0] => $face;
3226 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3227 }
3228
3229 while (my ($k, $v) = each %{$soundconf->{event}}) {
3230 my $face = cf::face::find "sound/$v";
3231 cf::sound::set $k => $face;
3232 }
3233 }
3234 } 3290 }
3291
3292 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3235 3293
3236 1 3294 1
3237} 3295}
3296
3297cf::global->attach (on_resource_update => sub {
3298 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3299 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3300
3301 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3302 my $sound = $soundconf->{compat}[$_]
3303 or next;
3304
3305 my $face = cf::face::find "sound/$sound->[1]";
3306 cf::sound::set $sound->[0] => $face;
3307 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3308 }
3309
3310 while (my ($k, $v) = each %{$soundconf->{event}}) {
3311 my $face = cf::face::find "sound/$v";
3312 cf::sound::set $k => $face;
3313 }
3314 }
3315});
3238 3316
3239register_exticmd fx_want => sub { 3317register_exticmd fx_want => sub {
3240 my ($ns, $want) = @_; 3318 my ($ns, $want) = @_;
3241 3319
3242 while (my ($k, $v) = each %$want) { 3320 while (my ($k, $v) = each %$want) {
3243 $ns->fx_want ($k, $v); 3321 $ns->fx_want ($k, $v);
3244 } 3322 }
3245}; 3323};
3324
3325sub load_resource_file($) {
3326 my $guard = lock_acquire "load_resource_file";
3327
3328 my $status = load_resource_file_ $_[0];
3329 get_slot 0.1, 100;
3330 cf::arch::commit_load;
3331
3332 $status
3333}
3246 3334
3247sub reload_regions { 3335sub reload_regions {
3248 # HACK to clear player env face cache, we need some signal framework 3336 # HACK to clear player env face cache, we need some signal framework
3249 # for this (global event?) 3337 # for this (global event?)
3250 %ext::player_env::MUSIC_FACE_CACHE = (); 3338 %ext::player_env::MUSIC_FACE_CACHE = ();
3264} 3352}
3265 3353
3266sub reload_archetypes { 3354sub reload_archetypes {
3267 load_resource_file "$DATADIR/archetypes" 3355 load_resource_file "$DATADIR/archetypes"
3268 or die "unable to load archetypes\n"; 3356 or die "unable to load archetypes\n";
3269 #d# NEED to laod twice to resolve forward references
3270 # this really needs to be done in an extra post-pass
3271 # (which needs to be synchronous, so solve it differently)
3272 load_resource_file "$DATADIR/archetypes"
3273 or die "unable to load archetypes\n";
3274} 3357}
3275 3358
3276sub reload_treasures { 3359sub reload_treasures {
3277 load_resource_file "$DATADIR/treasures" 3360 load_resource_file "$DATADIR/treasures"
3278 or die "unable to load treasurelists\n"; 3361 or die "unable to load treasurelists\n";
3279} 3362}
3280 3363
3281sub reload_resources { 3364sub reload_resources {
3282 warn "reloading resource files...\n"; 3365 warn "reloading resource files...\n";
3283 3366
3367 reload_facedata;
3368 reload_archetypes;
3284 reload_regions; 3369 reload_regions;
3285 reload_facedata;
3286 #reload_archetypes;#d#
3287 reload_archetypes;
3288 reload_treasures; 3370 reload_treasures;
3289 3371
3290 warn "finished reloading resource files\n"; 3372 warn "finished reloading resource files\n";
3291} 3373}
3292 3374
3293sub init { 3375sub init {
3376 my $guard = freeze_mainloop;
3377
3294 reload_resources; 3378 reload_resources;
3295} 3379}
3296 3380
3297sub reload_config { 3381sub reload_config {
3298 open my $fh, "<:utf8", "$CONFDIR/config" 3382 open my $fh, "<:utf8", "$CONFDIR/config"
3299 or return; 3383 or return;
3300 3384
3301 local $/; 3385 local $/;
3302 *CFG = YAML::Syck::Load <$fh>; 3386 *CFG = YAML::Load <$fh>;
3303 3387
3304 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3388 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3305 3389
3306 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3390 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3307 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3391 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3323 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3407 $Coro::current->{desc} = "IDLE BUG HANDLER";
3324 EV::loop EV::LOOP_ONESHOT; 3408 EV::loop EV::LOOP_ONESHOT;
3325 })->prio (Coro::PRIO_MAX); 3409 })->prio (Coro::PRIO_MAX);
3326 }; 3410 };
3327 3411
3412 {
3413 my $guard = freeze_mainloop;
3328 reload_config; 3414 reload_config;
3329 db_init; 3415 db_init;
3330 load_extensions; 3416 load_extensions;
3331 3417
3332 $TICK_WATCHER->start;
3333 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3419 evthread_start IO::AIO::poll_fileno;
3420 }
3421
3334 EV::loop; 3422 EV::loop;
3335} 3423}
3336 3424
3337############################################################################# 3425#############################################################################
3338# initialisation and cleanup 3426# initialisation and cleanup
3345 cf::cleanup "SIG$signal"; 3433 cf::cleanup "SIG$signal";
3346 }; 3434 };
3347 } 3435 }
3348} 3436}
3349 3437
3350sub write_runtime { 3438sub write_runtime_sync {
3351 my $runtime = "$LOCALDIR/runtime"; 3439 my $runtime = "$LOCALDIR/runtime";
3352 3440
3353 # first touch the runtime file to show we are still running: 3441 # first touch the runtime file to show we are still running:
3354 # the fsync below can take a very very long time. 3442 # the fsync below can take a very very long time.
3355 3443
3381 and return; 3469 and return;
3382 3470
3383 warn "runtime file written.\n"; 3471 warn "runtime file written.\n";
3384 3472
3385 1 3473 1
3474}
3475
3476our $uuid_lock;
3477our $uuid_skip;
3478
3479sub write_uuid_sync($) {
3480 $uuid_skip ||= $_[0];
3481
3482 return if $uuid_lock;
3483 local $uuid_lock = 1;
3484
3485 my $uuid = "$LOCALDIR/uuid";
3486
3487 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3488 or return;
3489
3490 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3491 $uuid_skip = 0;
3492
3493 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3494 and return;
3495
3496 # always fsync - this file is important
3497 aio_fsync $fh
3498 and return;
3499
3500 close $fh
3501 or return;
3502
3503 aio_rename "$uuid~", $uuid
3504 and return;
3505
3506 warn "uuid file written ($value).\n";
3507
3508 1
3509
3510}
3511
3512sub write_uuid($$) {
3513 my ($skip, $sync) = @_;
3514
3515 $sync ? write_uuid_sync $skip
3516 : async { write_uuid_sync $skip };
3386} 3517}
3387 3518
3388sub emergency_save() { 3519sub emergency_save() {
3389 my $freeze_guard = cf::freeze_mainloop; 3520 my $freeze_guard = cf::freeze_mainloop;
3390 3521
3412 warn "end emergency map save\n"; 3543 warn "end emergency map save\n";
3413 3544
3414 warn "begin emergency database checkpoint\n"; 3545 warn "begin emergency database checkpoint\n";
3415 BDB::db_env_txn_checkpoint $DB_ENV; 3546 BDB::db_env_txn_checkpoint $DB_ENV;
3416 warn "end emergency database checkpoint\n"; 3547 warn "end emergency database checkpoint\n";
3548
3549 warn "begin write uuid\n";
3550 write_uuid_sync 1;
3551 warn "end write uuid\n";
3417 }; 3552 };
3418 3553
3419 warn "leave emergency perl save\n"; 3554 warn "leave emergency perl save\n";
3420} 3555}
3421 3556
3436 warn "reloading..."; 3571 warn "reloading...";
3437 3572
3438 warn "entering sync_job"; 3573 warn "entering sync_job";
3439 3574
3440 cf::sync_job { 3575 cf::sync_job {
3441 cf::write_runtime; # external watchdog should not bark 3576 cf::write_runtime_sync; # external watchdog should not bark
3442 cf::emergency_save; 3577 cf::emergency_save;
3443 cf::write_runtime; # external watchdog should not bark 3578 cf::write_runtime_sync; # external watchdog should not bark
3444 3579
3445 warn "syncing database to disk"; 3580 warn "syncing database to disk";
3446 BDB::db_env_txn_checkpoint $DB_ENV; 3581 BDB::db_env_txn_checkpoint $DB_ENV;
3447 3582
3448 # if anything goes wrong in here, we should simply crash as we already saved 3583 # if anything goes wrong in here, we should simply crash as we already saved
3535 warn "leaving sync_job"; 3670 warn "leaving sync_job";
3536 3671
3537 1 3672 1
3538 } or do { 3673 } or do {
3539 warn $@; 3674 warn $@;
3540 warn "error while reloading, exiting."; 3675 cf::cleanup "error while reloading, exiting.";
3541 exit 1;
3542 }; 3676 };
3543 3677
3544 warn "reloaded"; 3678 warn "reloaded";
3545}; 3679};
3546 3680
3549sub reload_perl() { 3683sub reload_perl() {
3550 # doing reload synchronously and two reloads happen back-to-back, 3684 # doing reload synchronously and two reloads happen back-to-back,
3551 # coro crashes during coro_state_free->destroy here. 3685 # coro crashes during coro_state_free->destroy here.
3552 3686
3553 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3687 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3688 do_reload_perl;
3554 undef $RELOAD_WATCHER; 3689 undef $RELOAD_WATCHER;
3555 do_reload_perl;
3556 }; 3690 };
3557} 3691}
3558 3692
3559register_command "reload" => sub { 3693register_command "reload" => sub {
3560 my ($who, $arg) = @_; 3694 my ($who, $arg) = @_;
3574 3708
3575our @WAIT_FOR_TICK; 3709our @WAIT_FOR_TICK;
3576our @WAIT_FOR_TICK_BEGIN; 3710our @WAIT_FOR_TICK_BEGIN;
3577 3711
3578sub wait_for_tick { 3712sub wait_for_tick {
3579 return unless $TICK_WATCHER->is_active;
3580 return if $Coro::current == $Coro::main; 3713 return if tick_inhibit || $Coro::current == $Coro::main;
3581 3714
3582 my $signal = new Coro::Signal; 3715 my $signal = new Coro::Signal;
3583 push @WAIT_FOR_TICK, $signal; 3716 push @WAIT_FOR_TICK, $signal;
3584 $signal->wait; 3717 $signal->wait;
3585} 3718}
3586 3719
3587sub wait_for_tick_begin { 3720sub wait_for_tick_begin {
3588 return unless $TICK_WATCHER->is_active;
3589 return if $Coro::current == $Coro::main; 3721 return if tick_inhibit || $Coro::current == $Coro::main;
3590 3722
3591 my $signal = new Coro::Signal; 3723 my $signal = new Coro::Signal;
3592 push @WAIT_FOR_TICK_BEGIN, $signal; 3724 push @WAIT_FOR_TICK_BEGIN, $signal;
3593 $signal->wait; 3725 $signal->wait;
3594} 3726}
3595 3727
3596$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3728sub tick {
3597 if ($Coro::current != $Coro::main) { 3729 if ($Coro::current != $Coro::main) {
3598 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3730 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3599 unless ++$bug_warning > 10; 3731 unless ++$bug_warning > 10;
3600 return; 3732 return;
3601 } 3733 }
3602 3734
3603 $NOW = $tick_start = EV::now;
3604
3605 cf::server_tick; # one server iteration 3735 cf::server_tick; # one server iteration
3606 3736
3607 $RUNTIME += $TICK;
3608 $NEXT_TICK += $TICK;
3609
3610 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3737 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3611 $NEXT_RUNTIME_WRITE = $NOW + 10; 3738 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3612 Coro::async_pool { 3739 Coro::async_pool {
3613 $Coro::current->{desc} = "runtime saver"; 3740 $Coro::current->{desc} = "runtime saver";
3614 write_runtime 3741 write_runtime_sync
3615 or warn "ERROR: unable to write runtime file: $!"; 3742 or warn "ERROR: unable to write runtime file: $!";
3616 }; 3743 };
3617 } 3744 }
3618 3745
3619 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3746 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3621 } 3748 }
3622 while (my $sig = shift @WAIT_FOR_TICK) { 3749 while (my $sig = shift @WAIT_FOR_TICK) {
3623 $sig->send; 3750 $sig->send;
3624 } 3751 }
3625 3752
3626 $LOAD = ($NOW - $tick_start) / $TICK; 3753 $LOAD = ($NOW - $TICK_START) / $TICK;
3627 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3754 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3628 3755
3629 _post_tick; 3756 if (0) {
3630}; 3757 if ($NEXT_TICK) {
3631$TICK_WATCHER->priority (EV::MAXPRI); 3758 my $jitter = $TICK_START - $NEXT_TICK;
3759 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3760 warn "jitter $JITTER\n";#d#
3761 }
3762 }
3763}
3632 3764
3633{ 3765{
3766 # configure BDB
3767
3634 BDB::min_parallel 8; 3768 BDB::min_parallel 8;
3635 BDB::max_poll_time $TICK * 0.1; 3769 BDB::max_poll_reqs $TICK * 0.1;
3636 $BDB_POLL_WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb; 3770 $Coro::BDB::WATCHER->priority (1);
3637
3638 BDB::set_sync_prepare {
3639 my $status;
3640 my $current = $Coro::current;
3641 (
3642 sub {
3643 $status = $!;
3644 $current->ready; undef $current;
3645 },
3646 sub {
3647 Coro::schedule while defined $current;
3648 $! = $status;
3649 },
3650 )
3651 };
3652 3771
3653 unless ($DB_ENV) { 3772 unless ($DB_ENV) {
3654 $DB_ENV = BDB::db_env_create; 3773 $DB_ENV = BDB::db_env_create;
3655 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3774 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3656 | BDB::LOG_AUTOREMOVE, 1); 3775 | BDB::LOG_AUTOREMOVE, 1);
3683 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3802 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3684 }; 3803 };
3685} 3804}
3686 3805
3687{ 3806{
3807 # configure IO::AIO
3808
3688 IO::AIO::min_parallel 8; 3809 IO::AIO::min_parallel 8;
3689
3690 undef $Coro::AIO::WATCHER;
3691 IO::AIO::max_poll_time $TICK * 0.1; 3810 IO::AIO::max_poll_time $TICK * 0.1;
3692 $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb; 3811 $Coro::AIO::WATCHER->priority (1);
3693} 3812}
3694 3813
3695my $_log_backtrace; 3814my $_log_backtrace;
3696 3815
3697sub _log_backtrace { 3816sub _log_backtrace {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines