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.397 by root, Mon Nov 19 15:47:14 2007 UTC vs.
Revision 1.441 by root, Sat Aug 30 05:19:03 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict "vars", "subs";
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use EV; 31use EV;
10use Opcode; 32use Opcode;
11use Safe; 33use Safe;
12use Safe::Hole; 34use Safe::Hole;
13use Storable (); 35use Storable ();
14 36
15use Coro 4.1 (); 37use Coro ();
16use Coro::State; 38use Coro::State;
17use Coro::Handle; 39use Coro::Handle;
18use Coro::EV; 40use Coro::EV;
41use Coro::AnyEvent;
19use Coro::Timer; 42use Coro::Timer;
20use Coro::Signal; 43use Coro::Signal;
21use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
22use Coro::AIO; 46use Coro::AIO;
47use Coro::BDB 1.6;
23use Coro::Storable; 48use Coro::Storable;
24use Coro::Util (); 49use Coro::Util ();
25 50
26use JSON::XS (); 51use JSON::XS 2.01 ();
27use BDB (); 52use BDB ();
28use Data::Dumper; 53use Data::Dumper;
29use Digest::MD5; 54use Digest::MD5;
30use Fcntl; 55use Fcntl;
31use YAML::Syck (); 56use YAML ();
32use IO::AIO 2.51 (); 57use IO::AIO ();
33use Time::HiRes; 58use Time::HiRes;
34use Compress::LZF; 59use Compress::LZF;
35use Digest::MD5 (); 60use Digest::MD5 ();
61
62AnyEvent::detect;
36 63
37# configure various modules to our taste 64# configure various modules to our taste
38# 65#
39$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 68Compress::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 69
46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
47 71
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
49 73
… …
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 92our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 94our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 95our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db"; 96our $BDBDIR = "$LOCALDIR/db";
97our %RESOURCE;
73 98
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75our $TICK_WATCHER;
76our $AIO_POLL_WATCHER;
77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 101our $NEXT_TICK;
79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 102our $USE_FSYNC = 1; # use fsync to write maps - default off
81 103
82our $BDB_POLL_WATCHER;
83our $BDB_DEADLOCK_WATCHER; 104our $BDB_DEADLOCK_WATCHER;
84our $BDB_CHECKPOINT_WATCHER; 105our $BDB_CHECKPOINT_WATCHER;
85our $BDB_TRICKLE_WATCHER; 106our $BDB_TRICKLE_WATCHER;
86our $DB_ENV; 107our $DB_ENV;
87 108
88our %CFG; 109our %CFG;
89 110
90our $UPTIME; $UPTIME ||= time; 111our $UPTIME; $UPTIME ||= time;
91our $RUNTIME; 112our $RUNTIME;
113our $NOW;
92 114
93our (%PLAYER, %PLAYER_LOADING); # all users 115our (%PLAYER, %PLAYER_LOADING); # all users
94our (%MAP, %MAP_LOADING ); # all maps 116our (%MAP, %MAP_LOADING ); # all maps
95our $LINK_MAP; # the special {link} map, which is always available 117our $LINK_MAP; # the special {link} map, which is always available
96 118
97# used to convert map paths into valid unix filenames by replacing / by ∕ 119# used to convert map paths into valid unix filenames by replacing / by ∕
98our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 120our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
99 121
100our $LOAD; # a number between 0 (idle) and 1 (too many objects) 122our $LOAD; # a number between 0 (idle) and 1 (too many objects)
101our $LOADAVG; # same thing, but with alpha-smoothing 123our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter
102our $tick_start; # for load detecting purposes 125our $TICK_START; # for load detecting purposes
103 126
104binmode STDOUT; 127binmode STDOUT;
105binmode STDERR; 128binmode STDERR;
106 129
107# read virtual server time, if available 130# read virtual server time, if available
… …
191 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 214 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
192 215
193 LOG llevError, $msg; 216 LOG llevError, $msg;
194 }; 217 };
195} 218}
219
220$Coro::State::DIEHOOK = sub {
221 return unless $^S eq 0; # "eq", not "=="
222
223 if ($Coro::current == $Coro::main) {#d#
224 warn "DIEHOOK called in main context, Coro bug?\n";#d#
225 return;#d#
226 }#d#
227
228 # kill coroutine otherwise
229 warn Carp::longmess $_[0];
230 Coro::terminate
231};
232
233$SIG{__DIE__} = sub { }; #d#?
196 234
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
207for my $pkg (qw( 245for my $pkg (qw(
208 cf::global cf::attachable 246 cf::global cf::attachable
209 cf::object cf::object::player 247 cf::object cf::object::player
210 cf::client cf::player 248 cf::client cf::player
211 cf::arch cf::living 249 cf::arch cf::living
250 cf::map cf::mapspace
212 cf::map cf::party cf::region 251 cf::party cf::region
213)) { 252)) {
214 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 254}
217 255
218$EV::DIED = sub { 256$EV::DIED = sub {
219 warn "error in event callback: @_"; 257 warn "error in event callback: @_";
… …
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 284 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 285 $d
248 } || "[unable to dump $_[0]: '$@']"; 286 } || "[unable to dump $_[0]: '$@']";
249} 287}
250 288
251=item $ref = cf::from_json $json 289=item $ref = cf::decode_json $json
252 290
253Converts a JSON string into the corresponding perl data structure. 291Converts a JSON string into the corresponding perl data structure.
254 292
255=item $json = cf::to_json $ref 293=item $json = cf::encode_json $ref
256 294
257Converts a perl data structure into its JSON representation. 295Converts a perl data structure into its JSON representation.
258 296
259=cut 297=cut
260 298
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 299our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 300
263sub to_json ($) { $json_coder->encode ($_[0]) } 301sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 302sub decode_json($) { $json_coder->decode ($_[0]) }
265 303
266=item cf::lock_wait $string 304=item cf::lock_wait $string
267 305
268Wait until the given lock is available. See cf::lock_acquire. 306Wait until the given lock is available. See cf::lock_acquire.
269 307
… …
325 363
326 ! ! $LOCK{$key} 364 ! ! $LOCK{$key}
327} 365}
328 366
329sub freeze_mainloop { 367sub freeze_mainloop {
330 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
331 369
332 my $guard = Coro::guard { 370 Coro::guard \&tick_inhibit_dec;
333 $TICK_WATCHER->start;
334 };
335 $TICK_WATCHER->stop;
336 $guard
337} 371}
338 372
339=item cf::periodic $interval, $cb 373=item cf::periodic $interval, $cb
340 374
341Like EV::periodic, but randomly selects a starting point so that the actions 375Like EV::periodic, but randomly selects a starting point so that the actions
… …
396 } 430 }
397 } 431 }
398}; 432};
399 433
400sub get_slot($;$$) { 434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
401 my ($time, $pri, $name) = @_; 437 my ($time, $pri, $name) = @_;
402 438
403 $time = $TICK * .6 if $time > $TICK * .6; 439 $time = $TICK * .6 if $time > $TICK * .6;
404 my $sig = new Coro::Signal; 440 my $sig = new Coro::Signal;
405 441
… …
442 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
443 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
444 480
445 LOG llevError, Carp::longmess "sync job";#d# 481 LOG llevError, Carp::longmess "sync job";#d#
446 482
447 # TODO: use suspend/resume instead
448 # (but this is cancel-safe)
449 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
450 484
451 my $busy = 1; 485 my $busy = 1;
452 my @res; 486 my @res;
453 487
… …
464 } else { 498 } else {
465 EV::loop EV::LOOP_ONESHOT; 499 EV::loop EV::LOOP_ONESHOT;
466 } 500 }
467 } 501 }
468 502
469 $time = EV::time - $time; 503 my $time = EV::time - $time;
470 504
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 505 $TICK_START += $time; # do not account sync jobs to server load
475 506
476 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
477 } else { 508 } else {
478 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
479 510
… …
521 reset_signals; 552 reset_signals;
522 &$cb 553 &$cb
523 }, @args; 554 }, @args;
524 555
525 wantarray ? @res : $res[-1] 556 wantarray ? @res : $res[-1]
557}
558
559=item $coin = coin_from_name $name
560
561=cut
562
563our %coin_alias = (
564 "silver" => "silvercoin",
565 "silvercoin" => "silvercoin",
566 "silvercoins" => "silvercoin",
567 "gold" => "goldcoin",
568 "goldcoin" => "goldcoin",
569 "goldcoins" => "goldcoin",
570 "platinum" => "platinacoin",
571 "platinumcoin" => "platinacoin",
572 "platinumcoins" => "platinacoin",
573 "platina" => "platinacoin",
574 "platinacoin" => "platinacoin",
575 "platinacoins" => "platinacoin",
576 "royalty" => "royalty",
577 "royalties" => "royalty",
578);
579
580sub coin_from_name($) {
581 $coin_alias{$_[0]}
582 ? cf::arch::find $coin_alias{$_[0]}
583 : undef
526} 584}
527 585
528=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
529 587
530Returns a single value from the environment database. 588Returns a single value from the environment database.
… …
967 } 1025 }
968 1026
969 0 1027 0
970} 1028}
971 1029
972=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
973 1031
974=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1032=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
975 1033
976Generate an object-specific event with the given arguments. 1034Generate an object-specific event with the given arguments.
977 1035
… …
1030 1088
1031sub reattach { 1089sub reattach {
1032 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
1033 my ($obj) = @_; 1091 my ($obj) = @_;
1034 1092
1093 # no longer needed after getting rid of delete_package?
1035 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1094 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1036 1095
1037 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
1038 1097
1039 @$registry = (); 1098 @$registry = ();
1040 1099
… …
1055cf::attachable->attach ( 1114cf::attachable->attach (
1056 prio => -1000000, 1115 prio => -1000000,
1057 on_instantiate => sub { 1116 on_instantiate => sub {
1058 my ($obj, $data) = @_; 1117 my ($obj, $data) = @_;
1059 1118
1060 $data = from_json $data; 1119 $data = decode_json $data;
1061 1120
1062 for (@$data) { 1121 for (@$data) {
1063 my ($name, $args) = @$_; 1122 my ($name, $args) = @$_;
1064 1123
1065 $obj->attach ($name, %{$args || {} }); 1124 $obj->attach ($name, %{$args || {} });
… …
1086 utf8::decode (my $decname = $filename); 1145 utf8::decode (my $decname = $filename);
1087 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
1088 $decname, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
1089 1148
1090 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1091 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
1092 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1093 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
1094 close $fh; 1153 aio_close $fh;
1095 1154
1096 if (@$objs) { 1155 if (@$objs) {
1097 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1098 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
1099 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1100 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
1101 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
1102 close $fh; 1161 aio_close $fh;
1103 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
1104 } 1163 }
1105 } else { 1164 } else {
1106 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1107 } 1166 }
… …
1276 1335
1277 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1336 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1278 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1337 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1279 1338
1280 $ext{source} = 1339 $ext{source} =
1281 "package $pkg; use strict; use utf8;\n" 1340 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1282 . "#line 1 \"$path\"\n{\n" 1341 . "#line 1 \"$path\"\n{\n"
1283 . $source 1342 . $source
1284 . "\n};\n1"; 1343 . "\n};\n1";
1285 1344
1286 $todo{$base} = \%ext; 1345 $todo{$base} = \%ext;
… …
1302 my $msg = $@ ? "$v->{path}: $@\n" 1361 my $msg = $@ ? "$v->{path}: $@\n"
1303 : "$v->{base}: extension inactive.\n"; 1362 : "$v->{base}: extension inactive.\n";
1304 1363
1305 if (exists $v->{meta}{mandatory}) { 1364 if (exists $v->{meta}{mandatory}) {
1306 warn $msg; 1365 warn $msg;
1307 warn "mandatory extension failed to load, exiting.\n"; 1366 cf::cleanup "mandatory extension failed to load, exiting.";
1308 exit 1;
1309 } 1367 }
1310 1368
1311 warn $msg; 1369 warn $msg;
1312 } 1370 }
1313 1371
… …
1402 my $f = new_from_file cf::object::thawer path $login 1460 my $f = new_from_file cf::object::thawer path $login
1403 or return; 1461 or return;
1404 1462
1405 my $pl = cf::player::load_pl $f 1463 my $pl = cf::player::load_pl $f
1406 or return; 1464 or return;
1465
1407 local $cf::PLAYER_LOADING{$login} = $pl; 1466 local $cf::PLAYER_LOADING{$login} = $pl;
1408 $f->resolve_delayed_derefs; 1467 $f->resolve_delayed_derefs;
1409 $cf::PLAYER{$login} = $pl 1468 $cf::PLAYER{$login} = $pl
1410 } 1469 }
1411 } 1470 }
… …
1421 1480
1422 return if $pl->{deny_save}; 1481 return if $pl->{deny_save};
1423 1482
1424 aio_mkdir playerdir $pl, 0770; 1483 aio_mkdir playerdir $pl, 0770;
1425 $pl->{last_save} = $cf::RUNTIME; 1484 $pl->{last_save} = $cf::RUNTIME;
1485
1486 cf::get_slot 0.01;
1426 1487
1427 $pl->save_pl ($path); 1488 $pl->save_pl ($path);
1428 cf::cede_to_tick; 1489 cf::cede_to_tick;
1429} 1490}
1430 1491
… …
1466 $pl->{deny_save} = 1; 1527 $pl->{deny_save} = 1;
1467 $pl->password ("*"); # this should lock out the player until we nuked the dir 1528 $pl->password ("*"); # this should lock out the player until we nuked the dir
1468 1529
1469 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1470 $pl->deactivate; 1531 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1471 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1534 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1472 $pl->ns->destroy if $pl->ns; 1535 $pl->ns->destroy if $pl->ns;
1473 1536
1474 my $path = playerdir $pl; 1537 my $path = playerdir $pl;
1475 my $temp = "$path~$cf::RUNTIME~deleting~"; 1538 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1514 1577
1515 for my $login (@$dirs) { 1578 for my $login (@$dirs) {
1516 my $path = path $login; 1579 my $path = path $login;
1517 1580
1518 # a .pst is a dead give-away for a valid player 1581 # a .pst is a dead give-away for a valid player
1519 unless (-e "$path.pst") { 1582 # if no pst file found, open and chekc for blocked users
1583 if (aio_stat "$path.pst") {
1520 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1584 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1521 aio_read $fh, 0, 512, my $buf, 0 or next; 1585 aio_read $fh, 0, 512, my $buf, 0 or next;
1522 $buf !~ /^password -------------$/m or next; # official not-valid tag 1586 $buf !~ /^password -------------$/m or next; # official not-valid tag
1523 } 1587 }
1524 1588
… …
1723our $MAX_RESET = 3600; 1787our $MAX_RESET = 3600;
1724our $DEFAULT_RESET = 3000; 1788our $DEFAULT_RESET = 3000;
1725 1789
1726sub generate_random_map { 1790sub generate_random_map {
1727 my ($self, $rmp) = @_; 1791 my ($self, $rmp) = @_;
1792
1793 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1794
1728 # mit "rum" bekleckern, nicht 1795 # mit "rum" bekleckern, nicht
1729 $self->_create_random_map ( 1796 $self->_create_random_map (
1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1797 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1798 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1799 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1854 1921
1855# the temporary/swap location 1922# the temporary/swap location
1856sub save_path { 1923sub save_path {
1857 my ($self) = @_; 1924 my ($self) = @_;
1858 1925
1859 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1860 "$TMPDIR/$path.map" 1927 "$TMPDIR/$path.map"
1861} 1928}
1862 1929
1863# the unique path, undef == no special unique path 1930# the unique path, undef == no special unique path
1864sub uniq_path { 1931sub uniq_path {
1865 my ($self) = @_; 1932 my ($self) = @_;
1866 1933
1867 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1934 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1868 "$UNIQUEDIR/$path" 1935 "$UNIQUEDIR/$path"
1869} 1936}
1870 1937
1871# and all this just because we cannot iterate over 1938# and all this just because we cannot iterate over
1872# all maps in C++... 1939# all maps in C++...
… …
1970 2037
1971 cf::lock_wait "map_data:$path";#d#remove 2038 cf::lock_wait "map_data:$path";#d#remove
1972 cf::lock_wait "map_find:$path"; 2039 cf::lock_wait "map_find:$path";
1973 2040
1974 $cf::MAP{$path} || do { 2041 $cf::MAP{$path} || do {
1975 my $guard1 = cf::lock_acquire "map_find:$path";
1976 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 2042 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2043 my $guard2 = cf::lock_acquire "map_find:$path";
1977 2044
1978 my $map = new_from_path cf::map $path 2045 my $map = new_from_path cf::map $path
1979 or return; 2046 or return;
1980 2047
1981 $map->{last_save} = $cf::RUNTIME; 2048 $map->{last_save} = $cf::RUNTIME;
… …
1984 or return; 2051 or return;
1985 2052
1986 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2053 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1987 # doing this can freeze the server in a sync job, obviously 2054 # doing this can freeze the server in a sync job, obviously
1988 #$cf::WAIT_FOR_TICK->wait; 2055 #$cf::WAIT_FOR_TICK->wait;
2056 undef $guard2;
1989 undef $guard1; 2057 undef $guard1;
1990 undef $guard2;
1991 $map->reset; 2058 $map->reset;
1992 return find $path; 2059 return find $path;
1993 } 2060 }
1994 2061
1995 $cf::MAP{$path} = $map 2062 $cf::MAP{$path} = $map
… …
2022 my $f = new_from_file cf::object::thawer $self->{load_path}; 2089 my $f = new_from_file cf::object::thawer $self->{load_path};
2023 $f->skip_block; 2090 $f->skip_block;
2024 $self->_load_objects ($f) 2091 $self->_load_objects ($f)
2025 or return; 2092 or return;
2026 2093
2027 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2094 $self->post_load_original
2028 if delete $self->{load_original}; 2095 if delete $self->{load_original};
2029 2096
2030 if (my $uniq = $self->uniq_path) { 2097 if (my $uniq = $self->uniq_path) {
2031 utf8::encode $uniq; 2098 utf8::encode $uniq;
2032 unless (aio_stat $uniq) { 2099 unless (aio_stat $uniq) {
… …
2058 } 2125 }
2059 2126
2060 $self->{last_save} = $cf::RUNTIME; 2127 $self->{last_save} = $cf::RUNTIME;
2061 $self->last_access ($cf::RUNTIME); 2128 $self->last_access ($cf::RUNTIME);
2062 2129
2063 $self->in_memory (cf::MAP_IN_MEMORY); 2130 $self->in_memory (cf::MAP_ACTIVE);
2064 } 2131 }
2065 2132
2066 $self->post_load; 2133 $self->post_load;
2067} 2134}
2068 2135
… …
2126 my ($path, $origin, $load) = @_; 2193 my ($path, $origin, $load) = @_;
2127 2194
2128 $path = normalise $path, $origin && $origin->{path}; 2195 $path = normalise $path, $origin && $origin->{path};
2129 2196
2130 if (my $map = $cf::MAP{$path}) { 2197 if (my $map = $cf::MAP{$path}) {
2131 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2198 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2132 } 2199 }
2133 2200
2134 $MAP_PREFETCH{$path} |= $load; 2201 $MAP_PREFETCH{$path} |= $load;
2135 2202
2136 $MAP_PREFETCHER ||= cf::async { 2203 $MAP_PREFETCHER ||= cf::async {
… …
2173 cf::async { 2240 cf::async {
2174 $Coro::current->{desc} = "map player save"; 2241 $Coro::current->{desc} = "map player save";
2175 $_->contr->save for $self->players; 2242 $_->contr->save for $self->players;
2176 }; 2243 };
2177 2244
2245 cf::get_slot 0.02;
2246
2178 if ($uniq) { 2247 if ($uniq) {
2179 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2248 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2180 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2249 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2181 } else { 2250 } else {
2182 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2251 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
2190 $self->save; 2259 $self->save;
2191 2260
2192 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2261 my $lock = cf::lock_acquire "map_data:$self->{path}";
2193 2262
2194 return if $self->players; 2263 return if $self->players;
2195 return if $self->in_memory != cf::MAP_IN_MEMORY; 2264 return if $self->in_memory != cf::MAP_ACTIVE;
2196 return if $self->{deny_save}; 2265 return if $self->{deny_save};
2197 2266
2198 $self->in_memory (cf::MAP_SWAPPED); 2267 $self->in_memory (cf::MAP_SWAPPED);
2199 2268
2200 $self->deactivate; 2269 $self->deactivate;
… …
2318 2387
2319sub unique_maps() { 2388sub unique_maps() {
2320 [ 2389 [
2321 map { 2390 map {
2322 utf8::decode $_; 2391 utf8::decode $_;
2323 /\.map$/ 2392 s/\.map$//; # TODO future compatibility hack
2393 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2394 ? ()
2324 ? normalise $_ 2395 : normalise $_
2325 : ()
2326 } @{ aio_readdir $UNIQUEDIR or [] } 2396 } @{ aio_readdir $UNIQUEDIR or [] }
2327 ] 2397 ]
2328} 2398}
2329 2399
2330package cf;
2331
2332=back 2400=back
2333 2401
2334=head3 cf::object 2402=head3 cf::object
2335 2403
2336=cut 2404=cut
… …
2339 2407
2340=over 4 2408=over 4
2341 2409
2342=item $ob->inv_recursive 2410=item $ob->inv_recursive
2343 2411
2344Returns the inventory of the object _and_ their inventories, recursively. 2412Returns the inventory of the object I<and> their inventories, recursively,
2413but I<not> the object itself.
2345 2414
2346=cut 2415=cut
2347 2416
2348sub inv_recursive_; 2417sub inv_recursive_;
2349sub inv_recursive_ { 2418sub inv_recursive_ {
… …
2354 inv_recursive_ inv $_[0] 2423 inv_recursive_ inv $_[0]
2355} 2424}
2356 2425
2357=item $ref = $ob->ref 2426=item $ref = $ob->ref
2358 2427
2359creates and returns a persistent reference to an objetc that can be stored as a string. 2428Creates and returns a persistent reference to an object that can be stored as a string.
2360 2429
2361=item $ob = cf::object::deref ($refstring) 2430=item $ob = cf::object::deref ($refstring)
2362 2431
2363returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2432returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2364even if the object actually exists. May block. 2433even if the object actually exists. May block.
… …
2396can be C<undef>. Does the right thing when the player is currently in a 2465can be C<undef>. Does the right thing when the player is currently in a
2397dialogue with the given NPC character. 2466dialogue with the given NPC character.
2398 2467
2399=cut 2468=cut
2400 2469
2470our $SAY_CHANNEL = {
2471 id => "say",
2472 title => "Map",
2473 reply => "say ",
2474 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2475};
2476
2477our $CHAT_CHANNEL = {
2478 id => "chat",
2479 title => "Chat",
2480 reply => "chat ",
2481 tooltip => "Player chat and shouts, global to the server.",
2482};
2483
2401# rough implementation of a future "reply" method that works 2484# rough implementation of a future "reply" method that works
2402# with dialog boxes. 2485# with dialog boxes.
2403#TODO: the first argument must go, split into a $npc->reply_to ( method 2486#TODO: the first argument must go, split into a $npc->reply_to ( method
2404sub cf::object::player::reply($$$;$) { 2487sub cf::object::player::reply($$$;$) {
2405 my ($self, $npc, $msg, $flags) = @_; 2488 my ($self, $npc, $msg, $flags) = @_;
… …
2416 my $dialog = $pl->{npc_dialog}; 2499 my $dialog = $pl->{npc_dialog};
2417 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2500 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2418 2501
2419 } else { 2502 } else {
2420 $msg = $npc->name . " says: $msg" if $npc; 2503 $msg = $npc->name . " says: $msg" if $npc;
2421 $self->message ($msg, $flags); 2504 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2422 } 2505 }
2423 } 2506 }
2424} 2507}
2425 2508
2426=item $object->send_msg ($channel, $msg, $color, [extra...]) 2509=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2533Moves the player to the given map-path and coordinates by first freezing 2616Moves the player to the given map-path and coordinates by first freezing
2534her, loading and preparing them map, calling the provided $check callback 2617her, loading and preparing them map, calling the provided $check callback
2535that has to return the map if sucecssful, and then unfreezes the player on 2618that has to return the map if sucecssful, and then unfreezes the player on
2536the new (success) or old (failed) map position. In either case, $done will 2619the new (success) or old (failed) map position. In either case, $done will
2537be called at the end of this process. 2620be called at the end of this process.
2621
2622Note that $check will be called with a potentially non-loaded map, so if
2623it needs a loaded map it has to call C<< ->load >>.
2538 2624
2539=cut 2625=cut
2540 2626
2541our $GOTOGEN; 2627our $GOTOGEN;
2542 2628
… …
2621} 2707}
2622 2708
2623sub prepare_random_map { 2709sub prepare_random_map {
2624 my ($exit) = @_; 2710 my ($exit) = @_;
2625 2711
2626 my $guard = cf::lock_acquire "exit_prepare:$exit";
2627
2628 # all this does is basically replace the /! path by 2712 # all this does is basically replace the /! path by
2629 # a new random map path (?random/...) with a seed 2713 # a new random map path (?random/...) with a seed
2630 # that depends on the exit object 2714 # that depends on the exit object
2631 2715
2632 my $rmp = parse_random_map_params $exit->msg; 2716 my $rmp = parse_random_map_params $exit->msg;
… …
2634 if ($exit->map) { 2718 if ($exit->map) {
2635 $rmp->{region} = $exit->region->name; 2719 $rmp->{region} = $exit->region->name;
2636 $rmp->{origin_map} = $exit->map->path; 2720 $rmp->{origin_map} = $exit->map->path;
2637 $rmp->{origin_x} = $exit->x; 2721 $rmp->{origin_x} = $exit->x;
2638 $rmp->{origin_y} = $exit->y; 2722 $rmp->{origin_y} = $exit->y;
2723
2724 $exit->map->touch;
2639 } 2725 }
2640 2726
2641 $rmp->{random_seed} ||= $exit->random_seed; 2727 $rmp->{random_seed} ||= $exit->random_seed;
2642 2728
2643 my $data = cf::to_json $rmp; 2729 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2644 my $md5 = Digest::MD5::md5_hex $data; 2730 my $md5 = Digest::MD5::md5_hex $data;
2645 my $meta = "$RANDOMDIR/$md5.meta"; 2731 my $meta = "$RANDOMDIR/$md5.meta";
2646 2732
2647 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2733 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2648 aio_write $fh, 0, (length $data), $data, 0; 2734 aio_write $fh, 0, (length $data), $data, 0;
2649 undef $fh; 2735 undef $fh;
2650 aio_rename "$meta~", $meta; 2736 aio_rename "$meta~", $meta;
2651 2737
2738 my $slaying = "?random/$md5";
2739
2740 if ($exit->valid) {
2652 $exit->slaying ("?random/$md5"); 2741 $exit->slaying ("?random/$md5");
2653 $exit->msg (undef); 2742 $exit->msg (undef);
2743 }
2654 } 2744 }
2655} 2745}
2656 2746
2657sub cf::object::player::enter_exit { 2747sub cf::object::player::enter_exit {
2658 my ($self, $exit) = @_; 2748 my ($self, $exit) = @_;
2659 2749
2660 return unless $self->type == cf::PLAYER; 2750 return unless $self->type == cf::PLAYER;
2661 2751
2662 if ($exit->slaying eq "/!") {
2663 #TODO: this should de-fi-ni-te-ly not be a sync-job
2664 # the problem is that $exit might not survive long enough
2665 # so it needs to be done right now, right here
2666 cf::sync_job { prepare_random_map $exit };
2667 }
2668
2669 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2670 my $hp = $exit->stats->hp;
2671 my $sp = $exit->stats->sp;
2672
2673 $self->enter_link; 2752 $self->enter_link;
2674 2753
2675 # if exit is damned, update players death & WoR home-position
2676 $self->contr->savebed ($slaying, $hp, $sp)
2677 if $exit->flag (FLAG_DAMNED);
2678
2679 (async { 2754 (async {
2680 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2755 $Coro::current->{desc} = "enter_exit";
2681 2756
2682 $self->deactivate_recursive; # just to be sure
2683 unless (eval { 2757 unless (eval {
2758 $self->deactivate_recursive; # just to be sure
2759
2760 # random map handling
2761 {
2762 my $guard = cf::lock_acquire "exit_prepare:$exit";
2763
2764 prepare_random_map $exit
2765 if $exit->slaying eq "/!";
2766 }
2767
2768 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2769 my $x = $exit->stats->hp;
2770 my $y = $exit->stats->sp;
2771
2684 $self->goto ($slaying, $hp, $sp); 2772 $self->goto ($map, $x, $y);
2685 2773
2774 # if exit is damned, update players death & WoR home-position
2775 $self->contr->savebed ($map, $x, $y)
2776 if $exit->flag (cf::FLAG_DAMNED);
2777
2686 1; 2778 1
2687 }) { 2779 }) {
2688 $self->message ("Something went wrong deep within the crossfire server. " 2780 $self->message ("Something went wrong deep within the crossfire server. "
2689 . "I'll try to bring you back to the map you were before. " 2781 . "I'll try to bring you back to the map you were before. "
2690 . "Please report this to the dungeon master!", 2782 . "Please report this to the dungeon master!",
2691 cf::NDI_UNIQUE | cf::NDI_RED); 2783 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2771 id => "infobox", 2863 id => "infobox",
2772 title => "Map Info", 2864 title => "Map Info",
2773 reply => undef, 2865 reply => undef,
2774 tooltip => "Information related to the maps", 2866 tooltip => "Information related to the maps",
2775 }, 2867 },
2868 "c/party" => {
2869 id => "party",
2870 title => "Party",
2871 reply => "gsay ",
2872 tooltip => "Messages and chat related to your party",
2873 },
2776); 2874);
2777 2875
2778sub cf::client::send_msg { 2876sub cf::client::send_msg {
2779 my ($self, $channel, $msg, $color, @extra) = @_; 2877 my ($self, $channel, $msg, $color, @extra) = @_;
2780 2878
… …
3017 3115
3018The following functions and methods are available within a safe environment: 3116The following functions and methods are available within a safe environment:
3019 3117
3020 cf::object 3118 cf::object
3021 contr pay_amount pay_player map x y force_find force_add destroy 3119 contr pay_amount pay_player map x y force_find force_add destroy
3022 insert remove name archname title slaying race decrease_ob_nr 3120 insert remove name archname title slaying race decrease split
3023 3121
3024 cf::object::player 3122 cf::object::player
3025 player 3123 player
3026 3124
3027 cf::player 3125 cf::player
… …
3032 3130
3033=cut 3131=cut
3034 3132
3035for ( 3133for (
3036 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3134 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3037 insert remove inv name archname title slaying race 3135 insert remove inv nrof name archname title slaying race
3038 decrease_ob_nr destroy)], 3136 decrease split destroy change_exp)],
3039 ["cf::object::player" => qw(player)], 3137 ["cf::object::player" => qw(player)],
3040 ["cf::player" => qw(peaceful)], 3138 ["cf::player" => qw(peaceful)],
3041 ["cf::map" => qw(trigger)], 3139 ["cf::map" => qw(trigger)],
3042) { 3140) {
3043 no strict 'refs'; 3141 no strict 'refs';
… …
3148 { 3246 {
3149 my $faces = $facedata->{faceinfo}; 3247 my $faces = $facedata->{faceinfo};
3150 3248
3151 while (my ($face, $info) = each %$faces) { 3249 while (my ($face, $info) = each %$faces) {
3152 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3250 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3251
3153 cf::face::set_visibility $idx, $info->{visibility}; 3252 cf::face::set_visibility $idx, $info->{visibility};
3154 cf::face::set_magicmap $idx, $info->{magicmap}; 3253 cf::face::set_magicmap $idx, $info->{magicmap};
3155 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3254 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}; 3255 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3157 3256
3158 cf::cede_to_tick; 3257 cf::cede_to_tick;
3159 } 3258 }
3160 3259
3161 while (my ($face, $info) = each %$faces) { 3260 while (my ($face, $info) = each %$faces) {
3162 next unless $info->{smooth}; 3261 next unless $info->{smooth};
3262
3163 my $idx = cf::face::find $face 3263 my $idx = cf::face::find $face
3164 or next; 3264 or next;
3265
3165 if (my $smooth = cf::face::find $info->{smooth}) { 3266 if (my $smooth = cf::face::find $info->{smooth}) {
3166 cf::face::set_smooth $idx, $smooth; 3267 cf::face::set_smooth $idx, $smooth;
3167 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3268 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3168 } else { 3269 } else {
3169 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3270 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3187 { 3288 {
3188 # TODO: for gcfclient pleasure, we should give resources 3289 # TODO: for gcfclient pleasure, we should give resources
3189 # that gcfclient doesn't grok a >10000 face index. 3290 # that gcfclient doesn't grok a >10000 face index.
3190 my $res = $facedata->{resource}; 3291 my $res = $facedata->{resource};
3191 3292
3192 my $soundconf = delete $res->{"res/sound.conf"};
3193
3194 while (my ($name, $info) = each %$res) { 3293 while (my ($name, $info) = each %$res) {
3294 if (defined $info->{type}) {
3195 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3295 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3196 my $data; 3296 my $data;
3197 3297
3198 if ($info->{type} & 1) { 3298 if ($info->{type} & 1) {
3199 # prepend meta info 3299 # prepend meta info
3200 3300
3201 my $meta = $enc->encode ({ 3301 my $meta = $enc->encode ({
3202 name => $name, 3302 name => $name,
3203 %{ $info->{meta} || {} }, 3303 %{ $info->{meta} || {} },
3204 }); 3304 });
3205 3305
3206 $data = pack "(w/a*)*", $meta, $info->{data}; 3306 $data = pack "(w/a*)*", $meta, $info->{data};
3307 } else {
3308 $data = $info->{data};
3309 }
3310
3311 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3312 cf::face::set_type $idx, $info->{type};
3207 } else { 3313 } else {
3208 $data = $info->{data}; 3314 $RESOURCE{$name} = $info;
3209 } 3315 }
3210 3316
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; 3317 cf::cede_to_tick;
3215 } 3318 }
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 } 3319 }
3320
3321 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3235 3322
3236 1 3323 1
3237} 3324}
3325
3326cf::global->attach (on_resource_update => sub {
3327 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3328 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3329
3330 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3331 my $sound = $soundconf->{compat}[$_]
3332 or next;
3333
3334 my $face = cf::face::find "sound/$sound->[1]";
3335 cf::sound::set $sound->[0] => $face;
3336 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3337 }
3338
3339 while (my ($k, $v) = each %{$soundconf->{event}}) {
3340 my $face = cf::face::find "sound/$v";
3341 cf::sound::set $k => $face;
3342 }
3343 }
3344});
3238 3345
3239register_exticmd fx_want => sub { 3346register_exticmd fx_want => sub {
3240 my ($ns, $want) = @_; 3347 my ($ns, $want) = @_;
3241 3348
3242 while (my ($k, $v) = each %$want) { 3349 while (my ($k, $v) = each %$want) {
3243 $ns->fx_want ($k, $v); 3350 $ns->fx_want ($k, $v);
3244 } 3351 }
3245}; 3352};
3353
3354sub load_resource_file($) {
3355 my $guard = lock_acquire "load_resource_file";
3356
3357 my $status = load_resource_file_ $_[0];
3358 get_slot 0.1, 100;
3359 cf::arch::commit_load;
3360
3361 $status
3362}
3246 3363
3247sub reload_regions { 3364sub reload_regions {
3248 # HACK to clear player env face cache, we need some signal framework 3365 # HACK to clear player env face cache, we need some signal framework
3249 # for this (global event?) 3366 # for this (global event?)
3250 %ext::player_env::MUSIC_FACE_CACHE = (); 3367 %ext::player_env::MUSIC_FACE_CACHE = ();
… …
3264} 3381}
3265 3382
3266sub reload_archetypes { 3383sub reload_archetypes {
3267 load_resource_file "$DATADIR/archetypes" 3384 load_resource_file "$DATADIR/archetypes"
3268 or die "unable to load archetypes\n"; 3385 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} 3386}
3275 3387
3276sub reload_treasures { 3388sub reload_treasures {
3277 load_resource_file "$DATADIR/treasures" 3389 load_resource_file "$DATADIR/treasures"
3278 or die "unable to load treasurelists\n"; 3390 or die "unable to load treasurelists\n";
3279} 3391}
3280 3392
3281sub reload_resources { 3393sub reload_resources {
3282 warn "reloading resource files...\n"; 3394 warn "reloading resource files...\n";
3283 3395
3396 reload_facedata;
3397 reload_archetypes;
3284 reload_regions; 3398 reload_regions;
3285 reload_facedata;
3286 #reload_archetypes;#d#
3287 reload_archetypes;
3288 reload_treasures; 3399 reload_treasures;
3289 3400
3290 warn "finished reloading resource files\n"; 3401 warn "finished reloading resource files\n";
3291} 3402}
3292 3403
3293sub init { 3404sub init {
3405 my $guard = freeze_mainloop;
3406
3407 evthread_start IO::AIO::poll_fileno;
3408
3294 reload_resources; 3409 reload_resources;
3295} 3410}
3296 3411
3297sub reload_config { 3412sub reload_config {
3298 open my $fh, "<:utf8", "$CONFDIR/config" 3413 open my $fh, "<:utf8", "$CONFDIR/config"
3299 or return; 3414 or return;
3300 3415
3301 local $/; 3416 local $/;
3302 *CFG = YAML::Syck::Load <$fh>; 3417 *CFG = YAML::Load <$fh>;
3303 3418
3304 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3419 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3305 3420
3306 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3421 $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}; 3422 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3323 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3438 $Coro::current->{desc} = "IDLE BUG HANDLER";
3324 EV::loop EV::LOOP_ONESHOT; 3439 EV::loop EV::LOOP_ONESHOT;
3325 })->prio (Coro::PRIO_MAX); 3440 })->prio (Coro::PRIO_MAX);
3326 }; 3441 };
3327 3442
3443 {
3444 my $guard = freeze_mainloop;
3328 reload_config; 3445 reload_config;
3329 db_init; 3446 db_init;
3330 load_extensions; 3447 load_extensions;
3331 3448
3332 $TICK_WATCHER->start;
3333 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3449 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3450 }
3451
3334 EV::loop; 3452 EV::loop;
3335} 3453}
3336 3454
3337############################################################################# 3455#############################################################################
3338# initialisation and cleanup 3456# initialisation and cleanup
… …
3345 cf::cleanup "SIG$signal"; 3463 cf::cleanup "SIG$signal";
3346 }; 3464 };
3347 } 3465 }
3348} 3466}
3349 3467
3350sub write_runtime { 3468sub write_runtime_sync {
3351 my $runtime = "$LOCALDIR/runtime"; 3469 my $runtime = "$LOCALDIR/runtime";
3352 3470
3353 # first touch the runtime file to show we are still running: 3471 # first touch the runtime file to show we are still running:
3354 # the fsync below can take a very very long time. 3472 # the fsync below can take a very very long time.
3355 3473
… …
3381 and return; 3499 and return;
3382 3500
3383 warn "runtime file written.\n"; 3501 warn "runtime file written.\n";
3384 3502
3385 1 3503 1
3504}
3505
3506our $uuid_lock;
3507our $uuid_skip;
3508
3509sub write_uuid_sync($) {
3510 $uuid_skip ||= $_[0];
3511
3512 return if $uuid_lock;
3513 local $uuid_lock = 1;
3514
3515 my $uuid = "$LOCALDIR/uuid";
3516
3517 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3518 or return;
3519
3520 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3521 $uuid_skip = 0;
3522
3523 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3524 and return;
3525
3526 # always fsync - this file is important
3527 aio_fsync $fh
3528 and return;
3529
3530 close $fh
3531 or return;
3532
3533 aio_rename "$uuid~", $uuid
3534 and return;
3535
3536 warn "uuid file written ($value).\n";
3537
3538 1
3539
3540}
3541
3542sub write_uuid($$) {
3543 my ($skip, $sync) = @_;
3544
3545 $sync ? write_uuid_sync $skip
3546 : async { write_uuid_sync $skip };
3386} 3547}
3387 3548
3388sub emergency_save() { 3549sub emergency_save() {
3389 my $freeze_guard = cf::freeze_mainloop; 3550 my $freeze_guard = cf::freeze_mainloop;
3390 3551
… …
3412 warn "end emergency map save\n"; 3573 warn "end emergency map save\n";
3413 3574
3414 warn "begin emergency database checkpoint\n"; 3575 warn "begin emergency database checkpoint\n";
3415 BDB::db_env_txn_checkpoint $DB_ENV; 3576 BDB::db_env_txn_checkpoint $DB_ENV;
3416 warn "end emergency database checkpoint\n"; 3577 warn "end emergency database checkpoint\n";
3578
3579 warn "begin write uuid\n";
3580 write_uuid_sync 1;
3581 warn "end write uuid\n";
3417 }; 3582 };
3418 3583
3419 warn "leave emergency perl save\n"; 3584 warn "leave emergency perl save\n";
3420} 3585}
3421 3586
… …
3423 my ($make_core) = @_; 3588 my ($make_core) = @_;
3424 3589
3425 warn Carp::longmess "post_cleanup backtrace" 3590 warn Carp::longmess "post_cleanup backtrace"
3426 if $make_core; 3591 if $make_core;
3427} 3592}
3593
3594# a safer delete_package, copied from Symbol
3595sub clear_package($) {
3596 my $pkg = shift;
3597
3598 # expand to full symbol table name if needed
3599 unless ($pkg =~ /^main::.*::$/) {
3600 $pkg = "main$pkg" if $pkg =~ /^::/;
3601 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3602 $pkg .= '::' unless $pkg =~ /::$/;
3603 }
3604
3605 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3606 my $stem_symtab = *{$stem}{HASH};
3607
3608 defined $stem_symtab and exists $stem_symtab->{$leaf}
3609 or return;
3610
3611 # clear all symbols
3612 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3613 for my $name (keys %$leaf_symtab) {
3614 _gv_clear *{"$pkg$name"};
3615# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3616 }
3617 warn "cleared package #$pkg\n";#d#
3618}
3619
3620our $RELOAD; # how many times to reload
3428 3621
3429sub do_reload_perl() { 3622sub do_reload_perl() {
3430 # can/must only be called in main 3623 # can/must only be called in main
3431 if ($Coro::current != $Coro::main) { 3624 if ($Coro::current != $Coro::main) {
3432 warn "can only reload from main coroutine"; 3625 warn "can only reload from main coroutine";
3433 return; 3626 return;
3434 } 3627 }
3435 3628
3629 return if $RELOAD++;
3630
3631 while ($RELOAD) {
3436 warn "reloading..."; 3632 warn "reloading...";
3437 3633
3438 warn "entering sync_job"; 3634 warn "entering sync_job";
3439 3635
3440 cf::sync_job { 3636 cf::sync_job {
3441 cf::write_runtime; # external watchdog should not bark 3637 cf::write_runtime_sync; # external watchdog should not bark
3442 cf::emergency_save; 3638 cf::emergency_save;
3443 cf::write_runtime; # external watchdog should not bark 3639 cf::write_runtime_sync; # external watchdog should not bark
3444 3640
3445 warn "syncing database to disk"; 3641 warn "syncing database to disk";
3446 BDB::db_env_txn_checkpoint $DB_ENV; 3642 BDB::db_env_txn_checkpoint $DB_ENV;
3447 3643
3448 # if anything goes wrong in here, we should simply crash as we already saved 3644 # if anything goes wrong in here, we should simply crash as we already saved
3449 3645
3450 warn "flushing outstanding aio requests"; 3646 warn "flushing outstanding aio requests";
3451 for (;;) {
3452 BDB::flush;
3453 IO::AIO::flush;
3454 Coro::cede_notself;
3455 last unless IO::AIO::nreqs || BDB::nreqs; 3647 while (IO::AIO::nreqs || BDB::nreqs) {
3456 warn "iterate..."; 3648 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3457 }
3458
3459 ++$RELOAD;
3460
3461 warn "cancelling all extension coros";
3462 $_->cancel for values %EXT_CORO;
3463 %EXT_CORO = ();
3464
3465 warn "removing commands";
3466 %COMMAND = ();
3467
3468 warn "removing ext/exti commands";
3469 %EXTCMD = ();
3470 %EXTICMD = ();
3471
3472 warn "unloading/nuking all extensions";
3473 for my $pkg (@EXTS) {
3474 warn "... unloading $pkg";
3475
3476 if (my $cb = $pkg->can ("unload")) {
3477 eval {
3478 $cb->($pkg);
3479 1
3480 } or warn "$pkg unloaded, but with errors: $@";
3481 } 3649 }
3482 3650
3483 warn "... nuking $pkg"; 3651 warn "cancelling all extension coros";
3484 Symbol::delete_package $pkg; 3652 $_->cancel for values %EXT_CORO;
3485 } 3653 %EXT_CORO = ();
3486 3654
3487 warn "unloading all perl modules loaded from $LIBDIR"; 3655 warn "removing commands";
3488 while (my ($k, $v) = each %INC) { 3656 %COMMAND = ();
3489 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3490 3657
3658 warn "removing ext/exti commands";
3659 %EXTCMD = ();
3660 %EXTICMD = ();
3661
3662 warn "unloading/nuking all extensions";
3663 for my $pkg (@EXTS) {
3491 warn "... unloading $k"; 3664 warn "... unloading $pkg";
3492 delete $INC{$k};
3493 3665
3494 $k =~ s/\.pm$//;
3495 $k =~ s/\//::/g;
3496
3497 if (my $cb = $k->can ("unload_module")) { 3666 if (my $cb = $pkg->can ("unload")) {
3667 eval {
3498 $cb->(); 3668 $cb->($pkg);
3669 1
3670 } or warn "$pkg unloaded, but with errors: $@";
3671 }
3672
3673 warn "... clearing $pkg";
3674 clear_package $pkg;
3499 } 3675 }
3500 3676
3501 Symbol::delete_package $k; 3677 warn "unloading all perl modules loaded from $LIBDIR";
3678 while (my ($k, $v) = each %INC) {
3679 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3680
3681 warn "... unloading $k";
3682 delete $INC{$k};
3683
3684 $k =~ s/\.pm$//;
3685 $k =~ s/\//::/g;
3686
3687 if (my $cb = $k->can ("unload_module")) {
3688 $cb->();
3689 }
3690
3691 clear_package $k;
3502 } 3692 }
3503 3693
3504 warn "getting rid of safe::, as good as possible"; 3694 warn "getting rid of safe::, as good as possible";
3505 Symbol::delete_package "safe::$_" 3695 clear_package "safe::$_"
3506 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3696 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3507 3697
3508 warn "unloading cf.pm \"a bit\""; 3698 warn "unloading cf.pm \"a bit\"";
3509 delete $INC{"cf.pm"}; 3699 delete $INC{"cf.pm"};
3510 delete $INC{"cf/pod.pm"}; 3700 delete $INC{"cf/pod.pm"};
3511 3701
3512 # don't, removes xs symbols, too, 3702 # don't, removes xs symbols, too,
3513 # and global variables created in xs 3703 # and global variables created in xs
3514 #Symbol::delete_package __PACKAGE__; 3704 #clear_package __PACKAGE__;
3515 3705
3516 warn "unload completed, starting to reload now"; 3706 warn "unload completed, starting to reload now";
3517 3707
3518 warn "reloading cf.pm"; 3708 warn "reloading cf.pm";
3519 require cf; 3709 require cf;
3520 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3710 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3521 3711
3522 warn "loading config and database again"; 3712 warn "loading config and database again";
3523 cf::reload_config; 3713 cf::reload_config;
3524 3714
3525 warn "loading extensions"; 3715 warn "loading extensions";
3526 cf::load_extensions; 3716 cf::load_extensions;
3527 3717
3528 warn "reattaching attachments to objects/players"; 3718 warn "reattaching attachments to objects/players";
3529 _global_reattach; # objects, sockets 3719 _global_reattach; # objects, sockets
3530 warn "reattaching attachments to maps"; 3720 warn "reattaching attachments to maps";
3531 reattach $_ for values %MAP; 3721 reattach $_ for values %MAP;
3532 warn "reattaching attachments to players"; 3722 warn "reattaching attachments to players";
3533 reattach $_ for values %PLAYER; 3723 reattach $_ for values %PLAYER;
3534 3724
3535 warn "leaving sync_job"; 3725 warn "leaving sync_job";
3536 3726
3537 1 3727 1
3538 } or do { 3728 } or do {
3539 warn $@; 3729 warn $@;
3540 warn "error while reloading, exiting."; 3730 cf::cleanup "error while reloading, exiting.";
3541 exit 1;
3542 }; 3731 };
3543 3732
3544 warn "reloaded"; 3733 warn "reloaded";
3734 --$RELOAD;
3735 }
3545}; 3736};
3546 3737
3547our $RELOAD_WATCHER; # used only during reload 3738our $RELOAD_WATCHER; # used only during reload
3548 3739
3549sub reload_perl() { 3740sub reload_perl() {
3550 # doing reload synchronously and two reloads happen back-to-back, 3741 # doing reload synchronously and two reloads happen back-to-back,
3551 # coro crashes during coro_state_free->destroy here. 3742 # coro crashes during coro_state_free->destroy here.
3552 3743
3553 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3744 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3745 do_reload_perl;
3554 undef $RELOAD_WATCHER; 3746 undef $RELOAD_WATCHER;
3555 do_reload_perl;
3556 }; 3747 };
3557} 3748}
3558 3749
3559register_command "reload" => sub { 3750register_command "reload" => sub {
3560 my ($who, $arg) = @_; 3751 my ($who, $arg) = @_;
… …
3574 3765
3575our @WAIT_FOR_TICK; 3766our @WAIT_FOR_TICK;
3576our @WAIT_FOR_TICK_BEGIN; 3767our @WAIT_FOR_TICK_BEGIN;
3577 3768
3578sub wait_for_tick { 3769sub wait_for_tick {
3579 return unless $TICK_WATCHER->is_active;
3580 return if $Coro::current == $Coro::main; 3770 return if tick_inhibit || $Coro::current == $Coro::main;
3581 3771
3582 my $signal = new Coro::Signal; 3772 my $signal = new Coro::Signal;
3583 push @WAIT_FOR_TICK, $signal; 3773 push @WAIT_FOR_TICK, $signal;
3584 $signal->wait; 3774 $signal->wait;
3585} 3775}
3586 3776
3587sub wait_for_tick_begin { 3777sub wait_for_tick_begin {
3588 return unless $TICK_WATCHER->is_active;
3589 return if $Coro::current == $Coro::main; 3778 return if tick_inhibit || $Coro::current == $Coro::main;
3590 3779
3591 my $signal = new Coro::Signal; 3780 my $signal = new Coro::Signal;
3592 push @WAIT_FOR_TICK_BEGIN, $signal; 3781 push @WAIT_FOR_TICK_BEGIN, $signal;
3593 $signal->wait; 3782 $signal->wait;
3594} 3783}
3595 3784
3596$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3785sub tick {
3597 if ($Coro::current != $Coro::main) { 3786 if ($Coro::current != $Coro::main) {
3598 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3787 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3599 unless ++$bug_warning > 10; 3788 unless ++$bug_warning > 10;
3600 return; 3789 return;
3601 } 3790 }
3602 3791
3603 $NOW = $tick_start = EV::now;
3604
3605 cf::server_tick; # one server iteration 3792 cf::server_tick; # one server iteration
3606 3793
3607 $RUNTIME += $TICK;
3608 $NEXT_TICK += $TICK;
3609
3610 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3794 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3611 $NEXT_RUNTIME_WRITE = $NOW + 10; 3795 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3612 Coro::async_pool { 3796 Coro::async_pool {
3613 $Coro::current->{desc} = "runtime saver"; 3797 $Coro::current->{desc} = "runtime saver";
3614 write_runtime 3798 write_runtime_sync
3615 or warn "ERROR: unable to write runtime file: $!"; 3799 or warn "ERROR: unable to write runtime file: $!";
3616 }; 3800 };
3617 } 3801 }
3618 3802
3619 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3803 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3621 } 3805 }
3622 while (my $sig = shift @WAIT_FOR_TICK) { 3806 while (my $sig = shift @WAIT_FOR_TICK) {
3623 $sig->send; 3807 $sig->send;
3624 } 3808 }
3625 3809
3626 $LOAD = ($NOW - $tick_start) / $TICK; 3810 $LOAD = ($NOW - $TICK_START) / $TICK;
3627 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3811 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3628 3812
3629 _post_tick; 3813 if (0) {
3630}; 3814 if ($NEXT_TICK) {
3631$TICK_WATCHER->priority (EV::MAXPRI); 3815 my $jitter = $TICK_START - $NEXT_TICK;
3816 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3817 warn "jitter $JITTER\n";#d#
3818 }
3819 }
3820}
3632 3821
3633{ 3822{
3823 # configure BDB
3824
3634 BDB::min_parallel 8; 3825 BDB::min_parallel 8;
3635 BDB::max_poll_time $TICK * 0.1; 3826 BDB::max_poll_reqs $TICK * 0.1;
3636 $BDB_POLL_WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb; 3827 $AnyEvent::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 3828
3653 unless ($DB_ENV) { 3829 unless ($DB_ENV) {
3654 $DB_ENV = BDB::db_env_create; 3830 $DB_ENV = BDB::db_env_create;
3655 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3831 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3656 | BDB::LOG_AUTOREMOVE, 1); 3832 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3833 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3657 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3834 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3658 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3835 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3659 3836
3660 cf::sync_job { 3837 cf::sync_job {
3661 eval { 3838 eval {
… …
3683 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3860 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3684 }; 3861 };
3685} 3862}
3686 3863
3687{ 3864{
3865 # configure IO::AIO
3866
3688 IO::AIO::min_parallel 8; 3867 IO::AIO::min_parallel 8;
3689
3690 undef $Coro::AIO::WATCHER;
3691 IO::AIO::max_poll_time $TICK * 0.1; 3868 IO::AIO::max_poll_time $TICK * 0.1;
3692 $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb; 3869 undef $AnyEvent::AIO::WATCHER;
3693} 3870}
3694 3871
3695my $_log_backtrace; 3872my $_log_backtrace;
3696 3873
3697sub _log_backtrace { 3874sub _log_backtrace {

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines