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.402 by root, Mon Dec 17 07:03:32 2007 UTC vs.
Revision 1.465 by root, Thu Jan 8 00:54:55 2009 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
37use Guard ();
15use Coro 4.32 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
18use Coro::EV; 41use Coro::EV;
42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
23use Coro::BDB; 49use Coro::BDB 1.6;
24use Coro::Storable; 50use Coro::Storable;
25use Coro::Util (); 51use Coro::Util ();
26 52
27use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
28use BDB (); 54use BDB ();
29use Data::Dumper; 55use Data::Dumper;
30use Digest::MD5; 56use Digest::MD5;
31use Fcntl; 57use Fcntl;
32use YAML::Syck (); 58use YAML ();
33use IO::AIO 2.51 (); 59use IO::AIO ();
34use Time::HiRes; 60use Time::HiRes;
35use Compress::LZF; 61use Compress::LZF;
36use Digest::MD5 (); 62use Digest::MD5 ();
63
64AnyEvent::detect;
37 65
38# configure various modules to our taste 66# configure various modules to our taste
39# 67#
40$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 69Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
70
71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72
73# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
43
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 76
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 78
51our %COMMAND = (); 79our %COMMAND = ();
52our %COMMAND_TIME = (); 80our %COMMAND_TIME = ();
55our %EXTCMD = (); 83our %EXTCMD = ();
56our %EXTICMD = (); 84our %EXTICMD = ();
57our %EXT_CORO = (); # coroutines bound to extensions 85our %EXT_CORO = (); # coroutines bound to extensions
58our %EXT_MAP = (); # pluggable maps 86our %EXT_MAP = (); # pluggable maps
59 87
60our $RELOAD; # number of reloads so far 88our $RELOAD; # number of reloads so far, non-zero while in reload
61our @EVENT; 89our @EVENT;
62 90
63our $CONFDIR = confdir; 91our $CONFDIR = confdir;
64our $DATADIR = datadir; 92our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext"; 93our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod"; 94our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir; 95our $MAPDIR = "$DATADIR/" . mapdir;
68our $LOCALDIR = localdir; 96our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 97our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 99our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 100our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 101our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime";
104
105our %RESOURCE;
74 106
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 109our $NEXT_TICK;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 110our $USE_FSYNC = 1; # use fsync to write maps - default off
81 111
82our $BDB_POLL_WATCHER;
83our $BDB_DEADLOCK_WATCHER; 112our $BDB_DEADLOCK_WATCHER;
84our $BDB_CHECKPOINT_WATCHER; 113our $BDB_CHECKPOINT_WATCHER;
85our $BDB_TRICKLE_WATCHER; 114our $BDB_TRICKLE_WATCHER;
86our $DB_ENV; 115our $DB_ENV;
87 116
98# used to convert map paths into valid unix filenames by replacing / by ∕ 127# used to convert map paths into valid unix filenames by replacing / by ∕
99our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 128our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
100 129
101our $LOAD; # a number between 0 (idle) and 1 (too many objects) 130our $LOAD; # a number between 0 (idle) and 1 (too many objects)
102our $LOADAVG; # same thing, but with alpha-smoothing 131our $LOADAVG; # same thing, but with alpha-smoothing
132our $JITTER; # average jitter
103our $tick_start; # for load detecting purposes 133our $TICK_START; # for load detecting purposes
134
135our @POST_INIT;
136
137our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
104 138
105binmode STDOUT; 139binmode STDOUT;
106binmode STDERR; 140binmode STDERR;
107 141
108# read virtual server time, if available 142# read virtual server time, if available
109unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 143unless ($RUNTIME || !-e $RUNTIMEFILE) {
110 open my $fh, "<", "$LOCALDIR/runtime" 144 open my $fh, "<", $RUNTIMEFILE
111 or die "unable to read runtime file: $!"; 145 or die "unable to read $RUNTIMEFILE file: $!";
112 $RUNTIME = <$fh> + 0.; 146 $RUNTIME = <$fh> + 0.;
113} 147}
114 148
115mkdir $_ 149mkdir $_
116 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 150 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
192 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 226 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
193 227
194 LOG llevError, $msg; 228 LOG llevError, $msg;
195 }; 229 };
196} 230}
231
232$Coro::State::DIEHOOK = sub {
233 return unless $^S eq 0; # "eq", not "=="
234
235 if ($Coro::current == $Coro::main) {#d#
236 warn "DIEHOOK called in main context, Coro bug?\n";#d#
237 return;#d#
238 }#d#
239
240 # kill coroutine otherwise
241 warn Carp::longmess $_[0];
242 Coro::terminate
243};
244
245$SIG{__DIE__} = sub { }; #d#?
197 246
198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 247@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
199@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 248@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
200@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 249@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
201@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 250@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
208for my $pkg (qw( 257for my $pkg (qw(
209 cf::global cf::attachable 258 cf::global cf::attachable
210 cf::object cf::object::player 259 cf::object cf::object::player
211 cf::client cf::player 260 cf::client cf::player
212 cf::arch cf::living 261 cf::arch cf::living
262 cf::map cf::mapspace
213 cf::map cf::party cf::region 263 cf::party cf::region
214)) { 264)) {
215 no strict 'refs';
216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 265 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
217} 266}
218 267
219$EV::DIED = sub { 268$EV::DIED = sub {
220 warn "error in event callback: @_"; 269 warn "error in event callback: @_";
262our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 311our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
263 312
264sub encode_json($) { $json_coder->encode ($_[0]) } 313sub encode_json($) { $json_coder->encode ($_[0]) }
265sub decode_json($) { $json_coder->decode ($_[0]) } 314sub decode_json($) { $json_coder->decode ($_[0]) }
266 315
316=item cf::post_init { BLOCK }
317
318Execute the given codeblock, I<after> all extensions have been (re-)loaded,
319but I<before> the server starts ticking again.
320
321The cdoeblock will have a single boolean argument to indicate whether this
322is a reload or not.
323
324=cut
325
326sub post_init(&) {
327 push @POST_INIT, shift;
328}
329
267=item cf::lock_wait $string 330=item cf::lock_wait $string
268 331
269Wait until the given lock is available. See cf::lock_acquire. 332Wait until the given lock is available. See cf::lock_acquire.
270 333
271=item my $lock = cf::lock_acquire $string 334=item my $lock = cf::lock_acquire $string
272 335
273Wait until the given lock is available and then acquires it and returns 336Wait until the given lock is available and then acquires it and returns
274a Coro::guard object. If the guard object gets destroyed (goes out of scope, 337a L<Guard> object. If the guard object gets destroyed (goes out of scope,
275for example when the coroutine gets canceled), the lock is automatically 338for example when the coroutine gets canceled), the lock is automatically
276returned. 339returned.
277 340
278Locks are *not* recursive, locking from the same coro twice results in a 341Locks are *not* recursive, locking from the same coro twice results in a
279deadlocked coro. 342deadlocked coro.
285 348
286Return true if the lock is currently active, i.e. somebody has locked it. 349Return true if the lock is currently active, i.e. somebody has locked it.
287 350
288=cut 351=cut
289 352
290our %LOCK; 353our $LOCKS = new Coro::SemaphoreSet;
291our %LOCKER;#d#
292 354
293sub lock_wait($) { 355sub lock_wait($) {
294 my ($key) = @_; 356 $LOCKS->wait ($_[0]);
295
296 if ($LOCKER{$key} == $Coro::current) {#d#
297 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
298 return;#d#
299 }#d#
300
301 # wait for lock, if any
302 while ($LOCK{$key}) {
303 push @{ $LOCK{$key} }, $Coro::current;
304 Coro::schedule;
305 }
306} 357}
307 358
308sub lock_acquire($) { 359sub lock_acquire($) {
309 my ($key) = @_; 360 $LOCKS->guard ($_[0])
310
311 # wait, to be sure we are not locked
312 lock_wait $key;
313
314 $LOCK{$key} = [];
315 $LOCKER{$key} = $Coro::current;#d#
316
317 Coro::guard {
318 delete $LOCKER{$key};#d#
319 # wake up all waiters, to be on the safe side
320 $_->ready for @{ delete $LOCK{$key} };
321 }
322} 361}
323 362
324sub lock_active($) { 363sub lock_active($) {
325 my ($key) = @_; 364 $LOCKS->count ($_[0]) < 1
326
327 ! ! $LOCK{$key}
328} 365}
329 366
330sub freeze_mainloop { 367sub freeze_mainloop {
331 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
332 369
333 my $guard = Coro::guard { 370 &Guard::guard (\&tick_inhibit_dec);
334 $TICK_WATCHER->start;
335 };
336 $TICK_WATCHER->stop;
337 $guard
338} 371}
339 372
340=item cf::periodic $interval, $cb 373=item cf::periodic $interval, $cb
341 374
342Like 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
397 } 430 }
398 } 431 }
399}; 432};
400 433
401sub get_slot($;$$) { 434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
402 my ($time, $pri, $name) = @_; 437 my ($time, $pri, $name) = @_;
403 438
404 $time = $TICK * .6 if $time > $TICK * .6; 439 $time = $TICK * .6 if $time > $TICK * .6;
405 my $sig = new Coro::Signal; 440 my $sig = new Coro::Signal;
406 441
443 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
444 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
445 480
446 LOG llevError, Carp::longmess "sync job";#d# 481 LOG llevError, Carp::longmess "sync job";#d#
447 482
448 # TODO: use suspend/resume instead
449 # (but this is cancel-safe)
450 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
451 484
452 my $busy = 1; 485 my $busy = 1;
453 my @res; 486 my @res;
454 487
465 } else { 498 } else {
466 EV::loop EV::LOOP_ONESHOT; 499 EV::loop EV::LOOP_ONESHOT;
467 } 500 }
468 } 501 }
469 502
470 $time = EV::time - $time; 503 my $time = EV::time - $time;
471 504
472 LOG llevError | logBacktrace, Carp::longmess "long sync job"
473 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
474
475 $tick_start += $time; # do not account sync jobs to server load 505 $TICK_START += $time; # do not account sync jobs to server load
476 506
477 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
478 } else { 508 } else {
479 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
480 510
522 reset_signals; 552 reset_signals;
523 &$cb 553 &$cb
524 }, @args; 554 }, @args;
525 555
526 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
527} 584}
528 585
529=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
530 587
531Returns a single value from the environment database. 588Returns a single value from the environment database.
670 727
671############################################################################# 728#############################################################################
672 729
673=head2 ATTACHABLE OBJECTS 730=head2 ATTACHABLE OBJECTS
674 731
675Many objects in crossfire are so-called attachable objects. That means you can 732Many objects in deliantra are so-called attachable objects. That means you can
676attach callbacks/event handlers (a collection of which is called an "attachment") 733attach callbacks/event handlers (a collection of which is called an "attachment")
677to it. All such attachable objects support the following methods. 734to it. All such attachable objects support the following methods.
678 735
679In the following description, CLASS can be any of C<global>, C<object> 736In the following description, CLASS can be any of C<global>, C<object>
680C<player>, C<client> or C<map> (i.e. the attachable objects in 737C<player>, C<client> or C<map> (i.e. the attachable objects in
730=item cf::CLASS::attachment $name, ... 787=item cf::CLASS::attachment $name, ...
731 788
732Register an attachment by C<$name> through which attachable objects of the 789Register an attachment by C<$name> through which attachable objects of the
733given CLASS can refer to this attachment. 790given CLASS can refer to this attachment.
734 791
735Some classes such as crossfire maps and objects can specify attachments 792Some classes such as deliantra maps and objects can specify attachments
736that are attached at load/instantiate time, thus the need for a name. 793that are attached at load/instantiate time, thus the need for a name.
737 794
738These calls expect any number of the following handler/hook descriptions: 795These calls expect any number of the following handler/hook descriptions:
739 796
740=over 4 797=over 4
968 } 1025 }
969 1026
970 0 1027 0
971} 1028}
972 1029
973=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
974 1031
975=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1032=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
976 1033
977Generate an object-specific event with the given arguments. 1034Generate an object-specific event with the given arguments.
978 1035
1031 1088
1032sub reattach { 1089sub reattach {
1033 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
1034 my ($obj) = @_; 1091 my ($obj) = @_;
1035 1092
1093 # no longer needed after getting rid of delete_package?
1036 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
1037 1095
1038 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
1039 1097
1040 @$registry = (); 1098 @$registry = ();
1041 1099
1087 utf8::decode (my $decname = $filename); 1145 utf8::decode (my $decname = $filename);
1088 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
1089 $decname, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
1090 1148
1091 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1092 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
1093 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1094 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
1095 close $fh; 1153 aio_close $fh;
1096 1154
1097 if (@$objs) { 1155 if (@$objs) {
1098 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) {
1099 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
1100 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1101 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
1102 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
1103 close $fh; 1161 aio_close $fh;
1104 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
1105 } 1163 }
1106 } else { 1164 } else {
1107 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1108 } 1166 }
1109 1167
1110 aio_rename "$filename~", $filename; 1168 aio_rename "$filename~", $filename;
1169
1170 $filename =~ s%/[^/]+$%%;
1171 aio_pathsync $filename if $cf::USE_FSYNC;
1111 } else { 1172 } else {
1112 warn "FATAL: $filename~: $!\n"; 1173 warn "unable to save objects: $filename~: $!\n";
1113 } 1174 }
1114 } else { 1175 } else {
1115 aio_unlink $filename; 1176 aio_unlink $filename;
1116 aio_unlink "$filename.pst"; 1177 aio_unlink "$filename.pst";
1117 } 1178 }
1208 my ($name, $cb) = @_; 1269 my ($name, $cb) = @_;
1209 1270
1210 $EXTICMD{$name} = $cb; 1271 $EXTICMD{$name} = $cb;
1211} 1272}
1212 1273
1274use File::Glob ();
1275
1213cf::player->attach ( 1276cf::player->attach (
1214 on_command => sub { 1277 on_command => sub {
1215 my ($pl, $name, $params) = @_; 1278 my ($pl, $name, $params) = @_;
1216 1279
1217 my $cb = $COMMAND{$name} 1280 my $cb = $COMMAND{$name}
1249 1312
1250 cf::override; 1313 cf::override;
1251 }, 1314 },
1252); 1315);
1253 1316
1317# "readahead" all extensions
1318sub cache_extensions {
1319 my $grp = IO::AIO::aio_group;
1320
1321 add $grp IO::AIO::aio_readdir $LIBDIR, sub {
1322 for (grep /\.ext$/, @{$_[0]}) {
1323 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1324 }
1325 };
1326
1327 $grp
1328}
1329
1254sub load_extensions { 1330sub load_extensions {
1255 cf::sync_job { 1331 cf::sync_job {
1256 my %todo; 1332 my %todo;
1257 1333
1258 for my $path (<$LIBDIR/*.ext>) { 1334 for my $path (<$LIBDIR/*.ext>) {
1277 1353
1278 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1354 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1279 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1355 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1280 1356
1281 $ext{source} = 1357 $ext{source} =
1282 "package $pkg; use strict; use utf8;\n" 1358 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1283 . "#line 1 \"$path\"\n{\n" 1359 . "#line 1 \"$path\"\n{\n"
1284 . $source 1360 . $source
1285 . "\n};\n1"; 1361 . "\n};\n1";
1286 1362
1287 $todo{$base} = \%ext; 1363 $todo{$base} = \%ext;
1303 my $msg = $@ ? "$v->{path}: $@\n" 1379 my $msg = $@ ? "$v->{path}: $@\n"
1304 : "$v->{base}: extension inactive.\n"; 1380 : "$v->{base}: extension inactive.\n";
1305 1381
1306 if (exists $v->{meta}{mandatory}) { 1382 if (exists $v->{meta}{mandatory}) {
1307 warn $msg; 1383 warn $msg;
1308 warn "mandatory extension failed to load, exiting.\n"; 1384 cf::cleanup "mandatory extension failed to load, exiting.";
1309 exit 1;
1310 } 1385 }
1311 1386
1312 warn $msg; 1387 warn $msg;
1313 } 1388 }
1314 1389
1328 1403
1329=back 1404=back
1330 1405
1331=head2 CORE EXTENSIONS 1406=head2 CORE EXTENSIONS
1332 1407
1333Functions and methods that extend core crossfire objects. 1408Functions and methods that extend core deliantra objects.
1334 1409
1335=cut 1410=cut
1336 1411
1337package cf::player; 1412package cf::player;
1338 1413
1381 1456
1382sub exists($) { 1457sub exists($) {
1383 my ($login) = @_; 1458 my ($login) = @_;
1384 1459
1385 $cf::PLAYER{$login} 1460 $cf::PLAYER{$login}
1386 or cf::sync_job { !aio_stat path $login } 1461 or !aio_stat path $login
1387} 1462}
1388 1463
1389sub find($) { 1464sub find($) {
1390 return $cf::PLAYER{$_[0]} || do { 1465 return $cf::PLAYER{$_[0]} || do {
1391 my $login = $_[0]; 1466 my $login = $_[0];
1403 my $f = new_from_file cf::object::thawer path $login 1478 my $f = new_from_file cf::object::thawer path $login
1404 or return; 1479 or return;
1405 1480
1406 my $pl = cf::player::load_pl $f 1481 my $pl = cf::player::load_pl $f
1407 or return; 1482 or return;
1483
1408 local $cf::PLAYER_LOADING{$login} = $pl; 1484 local $cf::PLAYER_LOADING{$login} = $pl;
1409 $f->resolve_delayed_derefs; 1485 $f->resolve_delayed_derefs;
1410 $cf::PLAYER{$login} = $pl 1486 $cf::PLAYER{$login} = $pl
1411 } 1487 }
1412 } 1488 }
1422 1498
1423 return if $pl->{deny_save}; 1499 return if $pl->{deny_save};
1424 1500
1425 aio_mkdir playerdir $pl, 0770; 1501 aio_mkdir playerdir $pl, 0770;
1426 $pl->{last_save} = $cf::RUNTIME; 1502 $pl->{last_save} = $cf::RUNTIME;
1503
1504 cf::get_slot 0.01;
1427 1505
1428 $pl->save_pl ($path); 1506 $pl->save_pl ($path);
1429 cf::cede_to_tick; 1507 cf::cede_to_tick;
1430} 1508}
1431 1509
1463 my ($pl) = @_; 1541 my ($pl) = @_;
1464 1542
1465 my $name = $pl->ob->name; 1543 my $name = $pl->ob->name;
1466 1544
1467 $pl->{deny_save} = 1; 1545 $pl->{deny_save} = 1;
1468 $pl->password ("*"); # this should lock out the player until we nuked the dir 1546 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1469 1547
1470 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1548 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1471 $pl->deactivate; 1549 $pl->deactivate;
1550 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1551 $pl->ob->check_score;
1472 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1552 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1473 $pl->ns->destroy if $pl->ns; 1553 $pl->ns->destroy if $pl->ns;
1474 1554
1475 my $path = playerdir $pl; 1555 my $path = playerdir $pl;
1476 my $temp = "$path~$cf::RUNTIME~deleting~"; 1556 my $temp = "$path~$cf::RUNTIME~deleting~";
1515 1595
1516 for my $login (@$dirs) { 1596 for my $login (@$dirs) {
1517 my $path = path $login; 1597 my $path = path $login;
1518 1598
1519 # a .pst is a dead give-away for a valid player 1599 # a .pst is a dead give-away for a valid player
1520 unless (-e "$path.pst") { 1600 # if no pst file found, open and chekc for blocked users
1601 if (aio_stat "$path.pst") {
1521 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1602 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1522 aio_read $fh, 0, 512, my $buf, 0 or next; 1603 aio_read $fh, 0, 512, my $buf, 0 or next;
1523 $buf !~ /^password -------------$/m or next; # official not-valid tag 1604 $buf !~ /^password -------------$/m or next; # official not-valid tag
1524 } 1605 }
1525 1606
1556 } 1637 }
1557 1638
1558 \@paths 1639 \@paths
1559} 1640}
1560 1641
1561=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1642=item $protocol_xml = $player->expand_cfpod ($cfpod)
1562 1643
1563Expand crossfire pod fragments into protocol xml. 1644Expand deliantra pod fragments into protocol xml.
1564
1565=cut
1566
1567use re 'eval';
1568
1569my $group;
1570my $interior; $interior = qr{
1571 # match a pod interior sequence sans C<< >>
1572 (?:
1573 \ (.*?)\ (?{ $group = $^N })
1574 | < (??{$interior}) >
1575 )
1576}x;
1577
1578sub expand_cfpod {
1579 my ($self, $pod) = @_;
1580
1581 my $xml;
1582
1583 while () {
1584 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1585 $group = $1;
1586
1587 $group =~ s/&/&amp;/g;
1588 $group =~ s/</&lt;/g;
1589
1590 $xml .= $group;
1591 } elsif ($pod =~ m%\G
1592 ([BCGHITU])
1593 <
1594 (?:
1595 ([^<>]*) (?{ $group = $^N })
1596 | < $interior >
1597 )
1598 >
1599 %gcsx
1600 ) {
1601 my ($code, $data) = ($1, $group);
1602
1603 if ($code eq "B") {
1604 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1605 } elsif ($code eq "I") {
1606 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1607 } elsif ($code eq "U") {
1608 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1609 } elsif ($code eq "C") {
1610 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1611 } elsif ($code eq "T") {
1612 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1613 } elsif ($code eq "G") {
1614 my ($male, $female) = split /\|/, $data;
1615 $data = $self->gender ? $female : $male;
1616 $xml .= expand_cfpod ($self, $data);
1617 } elsif ($code eq "H") {
1618 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1619 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1620 "")
1621 [$self->{hintmode}];
1622 } else {
1623 $xml .= "error processing '$code($data)' directive";
1624 }
1625 } else {
1626 if ($pod =~ /\G(.+)/) {
1627 warn "parse error while expanding $pod (at $1)";
1628 }
1629 last;
1630 }
1631 }
1632
1633 for ($xml) {
1634 # create single paragraphs (very hackish)
1635 s/(?<=\S)\n(?=\w)/ /g;
1636
1637 # compress some whitespace
1638 s/\s+\n/\n/g; # ws line-ends
1639 s/\n\n+/\n/g; # double lines
1640 s/^\n+//; # beginning lines
1641 s/\n+$//; # ending lines
1642 }
1643
1644 $xml
1645}
1646
1647no re 'eval';
1648
1649sub hintmode {
1650 $_[0]{hintmode} = $_[1] if @_ > 1;
1651 $_[0]{hintmode}
1652}
1653 1645
1654=item $player->ext_reply ($msgid, @msg) 1646=item $player->ext_reply ($msgid, @msg)
1655 1647
1656Sends an ext reply to the player. 1648Sends an ext reply to the player.
1657 1649
1724our $MAX_RESET = 3600; 1716our $MAX_RESET = 3600;
1725our $DEFAULT_RESET = 3000; 1717our $DEFAULT_RESET = 3000;
1726 1718
1727sub generate_random_map { 1719sub generate_random_map {
1728 my ($self, $rmp) = @_; 1720 my ($self, $rmp) = @_;
1721
1722 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1723
1729 # mit "rum" bekleckern, nicht 1724 # mit "rum" bekleckern, nicht
1730 $self->_create_random_map ( 1725 $self->_create_random_map (
1731 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1726 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1732 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1727 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1733 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1728 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1855 1850
1856# the temporary/swap location 1851# the temporary/swap location
1857sub save_path { 1852sub save_path {
1858 my ($self) = @_; 1853 my ($self) = @_;
1859 1854
1860 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1855 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1861 "$TMPDIR/$path.map" 1856 "$TMPDIR/$path.map"
1862} 1857}
1863 1858
1864# the unique path, undef == no special unique path 1859# the unique path, undef == no special unique path
1865sub uniq_path { 1860sub uniq_path {
1866 my ($self) = @_; 1861 my ($self) = @_;
1867 1862
1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1869 "$UNIQUEDIR/$path" 1864 "$UNIQUEDIR/$path"
1870}
1871
1872# and all this just because we cannot iterate over
1873# all maps in C++...
1874sub change_all_map_light {
1875 my ($change) = @_;
1876
1877 $_->change_map_light ($change)
1878 for grep $_->outdoor, values %cf::MAP;
1879} 1865}
1880 1866
1881sub decay_objects { 1867sub decay_objects {
1882 my ($self) = @_; 1868 my ($self) = @_;
1883 1869
1967sub find { 1953sub find {
1968 my ($path, $origin) = @_; 1954 my ($path, $origin) = @_;
1969 1955
1970 $path = normalise $path, $origin && $origin->path; 1956 $path = normalise $path, $origin && $origin->path;
1971 1957
1972 cf::lock_wait "map_data:$path";#d#remove 1958 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973 cf::lock_wait "map_find:$path"; 1959 my $guard2 = cf::lock_acquire "map_find:$path";
1974 1960
1975 $cf::MAP{$path} || do { 1961 $cf::MAP{$path} || do {
1976 my $guard1 = cf::lock_acquire "map_find:$path";
1977 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1978
1979 my $map = new_from_path cf::map $path 1962 my $map = new_from_path cf::map $path
1980 or return; 1963 or return;
1981 1964
1982 $map->{last_save} = $cf::RUNTIME; 1965 $map->{last_save} = $cf::RUNTIME;
1983 1966
1985 or return; 1968 or return;
1986 1969
1987 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1970 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1988 # doing this can freeze the server in a sync job, obviously 1971 # doing this can freeze the server in a sync job, obviously
1989 #$cf::WAIT_FOR_TICK->wait; 1972 #$cf::WAIT_FOR_TICK->wait;
1973 undef $guard2;
1990 undef $guard1; 1974 undef $guard1;
1991 undef $guard2;
1992 $map->reset; 1975 $map->reset;
1993 return find $path; 1976 return find $path;
1994 } 1977 }
1995 1978
1996 $cf::MAP{$path} = $map 1979 $cf::MAP{$path} = $map
2023 my $f = new_from_file cf::object::thawer $self->{load_path}; 2006 my $f = new_from_file cf::object::thawer $self->{load_path};
2024 $f->skip_block; 2007 $f->skip_block;
2025 $self->_load_objects ($f) 2008 $self->_load_objects ($f)
2026 or return; 2009 or return;
2027 2010
2028 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2011 $self->post_load_original
2029 if delete $self->{load_original}; 2012 if delete $self->{load_original};
2030 2013
2031 if (my $uniq = $self->uniq_path) { 2014 if (my $uniq = $self->uniq_path) {
2032 utf8::encode $uniq; 2015 utf8::encode $uniq;
2033 unless (aio_stat $uniq) { 2016 unless (aio_stat $uniq) {
2051 unless ($self->{deny_activate}) { 2034 unless ($self->{deny_activate}) {
2052 $self->decay_objects; 2035 $self->decay_objects;
2053 $self->fix_auto_apply; 2036 $self->fix_auto_apply;
2054 $self->update_buttons; 2037 $self->update_buttons;
2055 cf::cede_to_tick; 2038 cf::cede_to_tick;
2056 $self->set_darkness_map;
2057 cf::cede_to_tick;
2058 $self->activate; 2039 $self->activate;
2059 } 2040 }
2060 2041
2061 $self->{last_save} = $cf::RUNTIME; 2042 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME); 2043 $self->last_access ($cf::RUNTIME);
2063 2044
2064 $self->in_memory (cf::MAP_IN_MEMORY); 2045 $self->in_memory (cf::MAP_ACTIVE);
2065 } 2046 }
2066 2047
2067 $self->post_load; 2048 $self->post_load;
2068} 2049}
2069 2050
2127 my ($path, $origin, $load) = @_; 2108 my ($path, $origin, $load) = @_;
2128 2109
2129 $path = normalise $path, $origin && $origin->{path}; 2110 $path = normalise $path, $origin && $origin->{path};
2130 2111
2131 if (my $map = $cf::MAP{$path}) { 2112 if (my $map = $cf::MAP{$path}) {
2132 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2113 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2133 } 2114 }
2134 2115
2135 $MAP_PREFETCH{$path} |= $load; 2116 $MAP_PREFETCH{$path} |= $load;
2136 2117
2137 $MAP_PREFETCHER ||= cf::async { 2118 $MAP_PREFETCHER ||= cf::async {
2174 cf::async { 2155 cf::async {
2175 $Coro::current->{desc} = "map player save"; 2156 $Coro::current->{desc} = "map player save";
2176 $_->contr->save for $self->players; 2157 $_->contr->save for $self->players;
2177 }; 2158 };
2178 2159
2160 cf::get_slot 0.02;
2161
2179 if ($uniq) { 2162 if ($uniq) {
2180 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2163 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2181 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2164 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2182 } else { 2165 } else {
2183 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2191 $self->save; 2174 $self->save;
2192 2175
2193 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2176 my $lock = cf::lock_acquire "map_data:$self->{path}";
2194 2177
2195 return if $self->players; 2178 return if $self->players;
2196 return if $self->in_memory != cf::MAP_IN_MEMORY; 2179 return if $self->in_memory != cf::MAP_ACTIVE;
2197 return if $self->{deny_save}; 2180 return if $self->{deny_save};
2198 2181
2199 $self->in_memory (cf::MAP_SWAPPED); 2182 $self->in_memory (cf::MAP_SWAPPED);
2200 2183
2201 $self->deactivate; 2184 $self->deactivate;
2319 2302
2320sub unique_maps() { 2303sub unique_maps() {
2321 [ 2304 [
2322 map { 2305 map {
2323 utf8::decode $_; 2306 utf8::decode $_;
2324 /\.map$/ 2307 s/\.map$//; # TODO future compatibility hack
2308 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2309 ? ()
2325 ? normalise $_ 2310 : normalise $_
2326 : ()
2327 } @{ aio_readdir $UNIQUEDIR or [] } 2311 } @{ aio_readdir $UNIQUEDIR or [] }
2328 ] 2312 ]
2329} 2313}
2330 2314
2331package cf;
2332
2333=back 2315=back
2334 2316
2335=head3 cf::object 2317=head3 cf::object
2336 2318
2337=cut 2319=cut
2340 2322
2341=over 4 2323=over 4
2342 2324
2343=item $ob->inv_recursive 2325=item $ob->inv_recursive
2344 2326
2345Returns the inventory of the object _and_ their inventories, recursively. 2327Returns the inventory of the object I<and> their inventories, recursively,
2328but I<not> the object itself.
2346 2329
2347=cut 2330=cut
2348 2331
2349sub inv_recursive_; 2332sub inv_recursive_;
2350sub inv_recursive_ { 2333sub inv_recursive_ {
2355 inv_recursive_ inv $_[0] 2338 inv_recursive_ inv $_[0]
2356} 2339}
2357 2340
2358=item $ref = $ob->ref 2341=item $ref = $ob->ref
2359 2342
2360creates and returns a persistent reference to an objetc that can be stored as a string. 2343Creates and returns a persistent reference to an object that can be stored as a string.
2361 2344
2362=item $ob = cf::object::deref ($refstring) 2345=item $ob = cf::object::deref ($refstring)
2363 2346
2364returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2347returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2365even if the object actually exists. May block. 2348even if the object actually exists. May block.
2397can be C<undef>. Does the right thing when the player is currently in a 2380can be C<undef>. Does the right thing when the player is currently in a
2398dialogue with the given NPC character. 2381dialogue with the given NPC character.
2399 2382
2400=cut 2383=cut
2401 2384
2385our $SAY_CHANNEL = {
2386 id => "say",
2387 title => "Map",
2388 reply => "say ",
2389 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2390};
2391
2392our $CHAT_CHANNEL = {
2393 id => "chat",
2394 title => "Chat",
2395 reply => "chat ",
2396 tooltip => "Player chat and shouts, global to the server.",
2397};
2398
2402# rough implementation of a future "reply" method that works 2399# rough implementation of a future "reply" method that works
2403# with dialog boxes. 2400# with dialog boxes.
2404#TODO: the first argument must go, split into a $npc->reply_to ( method 2401#TODO: the first argument must go, split into a $npc->reply_to ( method
2405sub cf::object::player::reply($$$;$) { 2402sub cf::object::player::reply($$$;$) {
2406 my ($self, $npc, $msg, $flags) = @_; 2403 my ($self, $npc, $msg, $flags) = @_;
2417 my $dialog = $pl->{npc_dialog}; 2414 my $dialog = $pl->{npc_dialog};
2418 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2415 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2419 2416
2420 } else { 2417 } else {
2421 $msg = $npc->name . " says: $msg" if $npc; 2418 $msg = $npc->name . " says: $msg" if $npc;
2422 $self->message ($msg, $flags); 2419 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2423 } 2420 }
2424 } 2421 }
2425} 2422}
2426 2423
2427=item $object->send_msg ($channel, $msg, $color, [extra...]) 2424=item $object->send_msg ($channel, $msg, $color, [extra...])
2452 2449
2453=item $player_object->enter_link 2450=item $player_object->enter_link
2454 2451
2455Freezes the player and moves him/her to a special map (C<{link}>). 2452Freezes the player and moves him/her to a special map (C<{link}>).
2456 2453
2457The player should be reasonably safe there for short amounts of time. You 2454The player should be reasonably safe there for short amounts of time (e.g.
2458I<MUST> call C<leave_link> as soon as possible, though. 2455for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2456though, as the palyer cannot control the character while it is on the link
2457map.
2459 2458
2460Will never block. 2459Will never block.
2461 2460
2462=item $player_object->leave_link ($map, $x, $y) 2461=item $player_object->leave_link ($map, $x, $y)
2463 2462
2521 2520
2522 $map->load; 2521 $map->load;
2523 $map->load_neighbours; 2522 $map->load_neighbours;
2524 2523
2525 return unless $self->contr->active; 2524 return unless $self->contr->active;
2525 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2526 $self->activate_recursive; 2526 $self->activate_recursive;
2527 2527
2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2529 $self->enter_map ($map, $x, $y); 2529 $self->enter_map ($map, $x, $y);
2530} 2530}
2534Moves the player to the given map-path and coordinates by first freezing 2534Moves the player to the given map-path and coordinates by first freezing
2535her, loading and preparing them map, calling the provided $check callback 2535her, loading and preparing them map, calling the provided $check callback
2536that has to return the map if sucecssful, and then unfreezes the player on 2536that has to return the map if sucecssful, and then unfreezes the player on
2537the new (success) or old (failed) map position. In either case, $done will 2537the new (success) or old (failed) map position. In either case, $done will
2538be called at the end of this process. 2538be called at the end of this process.
2539
2540Note that $check will be called with a potentially non-loaded map, so if
2541it needs a loaded map it has to call C<< ->load >>.
2539 2542
2540=cut 2543=cut
2541 2544
2542our $GOTOGEN; 2545our $GOTOGEN;
2543 2546
2622} 2625}
2623 2626
2624sub prepare_random_map { 2627sub prepare_random_map {
2625 my ($exit) = @_; 2628 my ($exit) = @_;
2626 2629
2627 my $guard = cf::lock_acquire "exit_prepare:$exit";
2628
2629 # all this does is basically replace the /! path by 2630 # all this does is basically replace the /! path by
2630 # a new random map path (?random/...) with a seed 2631 # a new random map path (?random/...) with a seed
2631 # that depends on the exit object 2632 # that depends on the exit object
2632 2633
2633 my $rmp = parse_random_map_params $exit->msg; 2634 my $rmp = parse_random_map_params $exit->msg;
2635 if ($exit->map) { 2636 if ($exit->map) {
2636 $rmp->{region} = $exit->region->name; 2637 $rmp->{region} = $exit->region->name;
2637 $rmp->{origin_map} = $exit->map->path; 2638 $rmp->{origin_map} = $exit->map->path;
2638 $rmp->{origin_x} = $exit->x; 2639 $rmp->{origin_x} = $exit->x;
2639 $rmp->{origin_y} = $exit->y; 2640 $rmp->{origin_y} = $exit->y;
2641
2642 $exit->map->touch;
2640 } 2643 }
2641 2644
2642 $rmp->{random_seed} ||= $exit->random_seed; 2645 $rmp->{random_seed} ||= $exit->random_seed;
2643 2646
2644 my $data = cf::encode_json $rmp; 2647 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2645 my $md5 = Digest::MD5::md5_hex $data; 2648 my $md5 = Digest::MD5::md5_hex $data;
2646 my $meta = "$RANDOMDIR/$md5.meta"; 2649 my $meta = "$RANDOMDIR/$md5.meta";
2647 2650
2648 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2651 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2649 aio_write $fh, 0, (length $data), $data, 0; 2652 aio_write $fh, 0, (length $data), $data, 0;
2650 undef $fh; 2653 undef $fh;
2651 aio_rename "$meta~", $meta; 2654 aio_rename "$meta~", $meta;
2652 2655
2656 my $slaying = "?random/$md5";
2657
2658 if ($exit->valid) {
2653 $exit->slaying ("?random/$md5"); 2659 $exit->slaying ("?random/$md5");
2654 $exit->msg (undef); 2660 $exit->msg (undef);
2661 }
2655 } 2662 }
2656} 2663}
2657 2664
2658sub cf::object::player::enter_exit { 2665sub cf::object::player::enter_exit {
2659 my ($self, $exit) = @_; 2666 my ($self, $exit) = @_;
2660 2667
2661 return unless $self->type == cf::PLAYER; 2668 return unless $self->type == cf::PLAYER;
2662 2669
2663 if ($exit->slaying eq "/!") {
2664 #TODO: this should de-fi-ni-te-ly not be a sync-job
2665 # the problem is that $exit might not survive long enough
2666 # so it needs to be done right now, right here
2667 cf::sync_job { prepare_random_map $exit };
2668 }
2669
2670 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2671 my $hp = $exit->stats->hp;
2672 my $sp = $exit->stats->sp;
2673
2674 $self->enter_link; 2670 $self->enter_link;
2675 2671
2676 # if exit is damned, update players death & WoR home-position
2677 $self->contr->savebed ($slaying, $hp, $sp)
2678 if $exit->flag (FLAG_DAMNED);
2679
2680 (async { 2672 (async {
2681 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2673 $Coro::current->{desc} = "enter_exit";
2682 2674
2683 $self->deactivate_recursive; # just to be sure
2684 unless (eval { 2675 unless (eval {
2676 $self->deactivate_recursive; # just to be sure
2677
2678 # random map handling
2679 {
2680 my $guard = cf::lock_acquire "exit_prepare:$exit";
2681
2682 prepare_random_map $exit
2683 if $exit->slaying eq "/!";
2684 }
2685
2686 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2687 my $x = $exit->stats->hp;
2688 my $y = $exit->stats->sp;
2689
2685 $self->goto ($slaying, $hp, $sp); 2690 $self->goto ($map, $x, $y);
2686 2691
2692 # if exit is damned, update players death & WoR home-position
2693 $self->contr->savebed ($map, $x, $y)
2694 if $exit->flag (cf::FLAG_DAMNED);
2695
2687 1; 2696 1
2688 }) { 2697 }) {
2689 $self->message ("Something went wrong deep within the crossfire server. " 2698 $self->message ("Something went wrong deep within the deliantra server. "
2690 . "I'll try to bring you back to the map you were before. " 2699 . "I'll try to bring you back to the map you were before. "
2691 . "Please report this to the dungeon master!", 2700 . "Please report this to the dungeon master!",
2692 cf::NDI_UNIQUE | cf::NDI_RED); 2701 cf::NDI_UNIQUE | cf::NDI_RED);
2693 2702
2694 warn "ERROR in enter_exit: $@"; 2703 warn "ERROR in enter_exit: $@";
2760 id => "infobox", 2769 id => "infobox",
2761 title => "Body Parts", 2770 title => "Body Parts",
2762 reply => undef, 2771 reply => undef,
2763 tooltip => "Shows which body parts you posess and are available", 2772 tooltip => "Shows which body parts you posess and are available",
2764 }, 2773 },
2774 "c/statistics" => {
2775 id => "infobox",
2776 title => "Statistics",
2777 reply => undef,
2778 tooltip => "Shows your primary statistics",
2779 },
2780 "c/skills" => {
2781 id => "infobox",
2782 title => "Skills",
2783 reply => undef,
2784 tooltip => "Shows your experience per skill and item power",
2785 },
2786 "c/resistances" => {
2787 id => "infobox",
2788 title => "Resistances",
2789 reply => undef,
2790 tooltip => "Shows your resistances",
2791 },
2792 "c/pets" => {
2793 id => "infobox",
2794 title => "Pets",
2795 reply => undef,
2796 tooltip => "Shows information abotu your pets/a specific pet",
2797 },
2765 "c/uptime" => { 2798 "c/uptime" => {
2766 id => "infobox", 2799 id => "infobox",
2767 title => "Uptime", 2800 title => "Uptime",
2768 reply => undef, 2801 reply => undef,
2769 tooltip => "How long the server has been running since last restart", 2802 tooltip => "How long the server has been running since last restart",
2772 id => "infobox", 2805 id => "infobox",
2773 title => "Map Info", 2806 title => "Map Info",
2774 reply => undef, 2807 reply => undef,
2775 tooltip => "Information related to the maps", 2808 tooltip => "Information related to the maps",
2776 }, 2809 },
2810 "c/party" => {
2811 id => "party",
2812 title => "Party",
2813 reply => "gsay ",
2814 tooltip => "Messages and chat related to your party",
2815 },
2816 "c/death" => {
2817 id => "death",
2818 title => "Death",
2819 reply => undef,
2820 tooltip => "Reason for and more info about your most recent death",
2821 },
2822 "c/say" => $SAY_CHANNEL,
2823 "c/chat" => $CHAT_CHANNEL,
2777); 2824);
2778 2825
2779sub cf::client::send_msg { 2826sub cf::client::send_msg {
2780 my ($self, $channel, $msg, $color, @extra) = @_; 2827 my ($self, $channel, $msg, $color, @extra) = @_;
2781 2828
2782 $msg = $self->pl->expand_cfpod ($msg); 2829 $msg = $self->pl->expand_cfpod ($msg)
2830 unless $color & cf::NDI_VERBATIM;
2783 2831
2784 $color &= cf::NDI_CLIENT_MASK; # just in case... 2832 $color &= cf::NDI_CLIENT_MASK; # just in case...
2785 2833
2786 # check predefined channels, for the benefit of C 2834 # check predefined channels, for the benefit of C
2787 if ($CHANNEL{$channel}) { 2835 if ($CHANNEL{$channel}) {
2788 $channel = $CHANNEL{$channel}; 2836 $channel = $CHANNEL{$channel};
2789 2837
2790 $self->ext_msg (channel_info => $channel) 2838 $self->ext_msg (channel_info => $channel);
2791 if $self->can_msg;
2792
2793 $channel = $channel->{id}; 2839 $channel = $channel->{id};
2794 2840
2795 } elsif (ref $channel) { 2841 } elsif (ref $channel) {
2796 # send meta info to client, if not yet sent 2842 # send meta info to client, if not yet sent
2797 unless (exists $self->{channel}{$channel->{id}}) { 2843 unless (exists $self->{channel}{$channel->{id}}) {
2798 $self->{channel}{$channel->{id}} = $channel; 2844 $self->{channel}{$channel->{id}} = $channel;
2799 $self->ext_msg (channel_info => $channel) 2845 $self->ext_msg (channel_info => $channel);
2800 if $self->can_msg;
2801 } 2846 }
2802 2847
2803 $channel = $channel->{id}; 2848 $channel = $channel->{id};
2804 } 2849 }
2805 2850
2806 return unless @extra || length $msg; 2851 return unless @extra || length $msg;
2807 2852
2808 if ($self->can_msg) {
2809 # default colour, mask it out 2853 # default colour, mask it out
2810 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2854 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2811 if $color & cf::NDI_DEF; 2855 if $color & cf::NDI_DEF;
2812 2856
2813 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2857 my $pkt = "msg "
2858 . $self->{json_coder}->encode (
2814 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2859 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2815 } else { 2860 );
2816 if ($color >= 0) {
2817 # replace some tags by gcfclient-compatible ones
2818 for ($msg) {
2819 1 while
2820 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2821 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2822 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2823 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2824 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2825 }
2826 2861
2827 $color &= cf::NDI_COLOR_MASK; 2862 # try lzf for large packets
2863 $pkt = "lzf " . Compress::LZF::compress $pkt
2864 if 1024 <= length $pkt and $self->{can_lzf};
2828 2865
2829 utf8::encode $msg; 2866 # split very large packets
2830 2867 if (8192 < length $pkt and $self->{can_lzf}) {
2831 if (0 && $msg =~ /\[/) { 2868 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2832 # COMMAND/INFO 2869 $pkt = "frag";
2833 $self->send_packet ("drawextinfo $color 10 8 $msg")
2834 } else {
2835 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2836 $self->send_packet ("drawinfo $color $msg")
2837 }
2838 }
2839 } 2870 }
2871
2872 $self->send_packet ($pkt);
2840} 2873}
2841 2874
2842=item $client->ext_msg ($type, @msg) 2875=item $client->ext_msg ($type, @msg)
2843 2876
2844Sends an ext event to the client. 2877Sends an ext event to the client.
3018 3051
3019The following functions and methods are available within a safe environment: 3052The following functions and methods are available within a safe environment:
3020 3053
3021 cf::object 3054 cf::object
3022 contr pay_amount pay_player map x y force_find force_add destroy 3055 contr pay_amount pay_player map x y force_find force_add destroy
3023 insert remove name archname title slaying race decrease_ob_nr 3056 insert remove name archname title slaying race decrease split
3024 3057
3025 cf::object::player 3058 cf::object::player
3026 player 3059 player
3027 3060
3028 cf::player 3061 cf::player
3033 3066
3034=cut 3067=cut
3035 3068
3036for ( 3069for (
3037 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3070 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3038 insert remove inv name archname title slaying race 3071 insert remove inv nrof name archname title slaying race
3039 decrease_ob_nr destroy)], 3072 decrease split destroy change_exp)],
3040 ["cf::object::player" => qw(player)], 3073 ["cf::object::player" => qw(player)],
3041 ["cf::player" => qw(peaceful)], 3074 ["cf::player" => qw(peaceful)],
3042 ["cf::map" => qw(trigger)], 3075 ["cf::map" => qw(trigger)],
3043) { 3076) {
3044 no strict 'refs'; 3077 no strict 'refs';
3149 { 3182 {
3150 my $faces = $facedata->{faceinfo}; 3183 my $faces = $facedata->{faceinfo};
3151 3184
3152 while (my ($face, $info) = each %$faces) { 3185 while (my ($face, $info) = each %$faces) {
3153 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3186 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3187
3154 cf::face::set_visibility $idx, $info->{visibility}; 3188 cf::face::set_visibility $idx, $info->{visibility};
3155 cf::face::set_magicmap $idx, $info->{magicmap}; 3189 cf::face::set_magicmap $idx, $info->{magicmap};
3156 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3190 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3157 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3191 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3158 3192
3159 cf::cede_to_tick; 3193 cf::cede_to_tick;
3160 } 3194 }
3161 3195
3162 while (my ($face, $info) = each %$faces) { 3196 while (my ($face, $info) = each %$faces) {
3163 next unless $info->{smooth}; 3197 next unless $info->{smooth};
3198
3164 my $idx = cf::face::find $face 3199 my $idx = cf::face::find $face
3165 or next; 3200 or next;
3201
3166 if (my $smooth = cf::face::find $info->{smooth}) { 3202 if (my $smooth = cf::face::find $info->{smooth}) {
3167 cf::face::set_smooth $idx, $smooth; 3203 cf::face::set_smooth $idx, $smooth;
3168 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3204 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3169 } else { 3205 } else {
3170 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3206 warn "smooth face '$info->{smooth}' not found for face '$face'";
3188 { 3224 {
3189 # TODO: for gcfclient pleasure, we should give resources 3225 # TODO: for gcfclient pleasure, we should give resources
3190 # that gcfclient doesn't grok a >10000 face index. 3226 # that gcfclient doesn't grok a >10000 face index.
3191 my $res = $facedata->{resource}; 3227 my $res = $facedata->{resource};
3192 3228
3193 my $soundconf = delete $res->{"res/sound.conf"};
3194
3195 while (my ($name, $info) = each %$res) { 3229 while (my ($name, $info) = each %$res) {
3230 if (defined $info->{type}) {
3196 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3231 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3197 my $data; 3232 my $data;
3198 3233
3199 if ($info->{type} & 1) { 3234 if ($info->{type} & 1) {
3200 # prepend meta info 3235 # prepend meta info
3201 3236
3202 my $meta = $enc->encode ({ 3237 my $meta = $enc->encode ({
3203 name => $name, 3238 name => $name,
3204 %{ $info->{meta} || {} }, 3239 %{ $info->{meta} || {} },
3205 }); 3240 });
3206 3241
3207 $data = pack "(w/a*)*", $meta, $info->{data}; 3242 $data = pack "(w/a*)*", $meta, $info->{data};
3243 } else {
3244 $data = $info->{data};
3245 }
3246
3247 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3248 cf::face::set_type $idx, $info->{type};
3208 } else { 3249 } else {
3209 $data = $info->{data}; 3250 $RESOURCE{$name} = $info;
3210 } 3251 }
3211 3252
3212 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3213 cf::face::set_type $idx, $info->{type};
3214
3215 cf::cede_to_tick; 3253 cf::cede_to_tick;
3216 } 3254 }
3217
3218 if ($soundconf) {
3219 $soundconf = $enc->decode (delete $soundconf->{data});
3220
3221 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3222 my $sound = $soundconf->{compat}[$_]
3223 or next;
3224
3225 my $face = cf::face::find "sound/$sound->[1]";
3226 cf::sound::set $sound->[0] => $face;
3227 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3228 }
3229
3230 while (my ($k, $v) = each %{$soundconf->{event}}) {
3231 my $face = cf::face::find "sound/$v";
3232 cf::sound::set $k => $face;
3233 }
3234 }
3235 } 3255 }
3256
3257 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3236 3258
3237 1 3259 1
3238} 3260}
3261
3262cf::global->attach (on_resource_update => sub {
3263 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3264 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3265
3266 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3267 my $sound = $soundconf->{compat}[$_]
3268 or next;
3269
3270 my $face = cf::face::find "sound/$sound->[1]";
3271 cf::sound::set $sound->[0] => $face;
3272 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3273 }
3274
3275 while (my ($k, $v) = each %{$soundconf->{event}}) {
3276 my $face = cf::face::find "sound/$v";
3277 cf::sound::set $k => $face;
3278 }
3279 }
3280});
3239 3281
3240register_exticmd fx_want => sub { 3282register_exticmd fx_want => sub {
3241 my ($ns, $want) = @_; 3283 my ($ns, $want) = @_;
3242 3284
3243 while (my ($k, $v) = each %$want) { 3285 while (my ($k, $v) = each %$want) {
3244 $ns->fx_want ($k, $v); 3286 $ns->fx_want ($k, $v);
3245 } 3287 }
3246}; 3288};
3289
3290sub load_resource_file($) {
3291 my $guard = lock_acquire "load_resource_file";
3292
3293 my $status = load_resource_file_ $_[0];
3294 get_slot 0.1, 100;
3295 cf::arch::commit_load;
3296
3297 $status
3298}
3247 3299
3248sub reload_regions { 3300sub reload_regions {
3249 # HACK to clear player env face cache, we need some signal framework 3301 # HACK to clear player env face cache, we need some signal framework
3250 # for this (global event?) 3302 # for this (global event?)
3251 %ext::player_env::MUSIC_FACE_CACHE = (); 3303 %ext::player_env::MUSIC_FACE_CACHE = ();
3265} 3317}
3266 3318
3267sub reload_archetypes { 3319sub reload_archetypes {
3268 load_resource_file "$DATADIR/archetypes" 3320 load_resource_file "$DATADIR/archetypes"
3269 or die "unable to load archetypes\n"; 3321 or die "unable to load archetypes\n";
3270 #d# NEED to laod twice to resolve forward references
3271 # this really needs to be done in an extra post-pass
3272 # (which needs to be synchronous, so solve it differently)
3273 load_resource_file "$DATADIR/archetypes"
3274 or die "unable to load archetypes\n";
3275} 3322}
3276 3323
3277sub reload_treasures { 3324sub reload_treasures {
3278 load_resource_file "$DATADIR/treasures" 3325 load_resource_file "$DATADIR/treasures"
3279 or die "unable to load treasurelists\n"; 3326 or die "unable to load treasurelists\n";
3280} 3327}
3281 3328
3282sub reload_resources { 3329sub reload_resources {
3283 warn "reloading resource files...\n"; 3330 warn "reloading resource files...\n";
3284 3331
3332 reload_facedata;
3333 reload_archetypes;
3285 reload_regions; 3334 reload_regions;
3286 reload_facedata;
3287 #reload_archetypes;#d#
3288 reload_archetypes;
3289 reload_treasures; 3335 reload_treasures;
3290 3336
3291 warn "finished reloading resource files\n"; 3337 warn "finished reloading resource files\n";
3292}
3293
3294sub init {
3295 reload_resources;
3296} 3338}
3297 3339
3298sub reload_config { 3340sub reload_config {
3299 open my $fh, "<:utf8", "$CONFDIR/config" 3341 open my $fh, "<:utf8", "$CONFDIR/config"
3300 or return; 3342 or return;
3301 3343
3302 local $/; 3344 local $/;
3303 *CFG = YAML::Syck::Load <$fh>; 3345 *CFG = YAML::Load <$fh>;
3304 3346
3305 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3347 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3306 3348
3307 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3349 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3308 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3350 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3314 }; 3356 };
3315 warn $@ if $@; 3357 warn $@ if $@;
3316 } 3358 }
3317} 3359}
3318 3360
3361sub pidfile() {
3362 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3363 or die "$PIDFILE: $!";
3364 flock $fh, &Fcntl::LOCK_EX
3365 or die "$PIDFILE: flock: $!";
3366 $fh
3367}
3368
3369# make sure only one server instance is running at any one time
3370sub atomic {
3371 my $fh = pidfile;
3372
3373 my $pid = <$fh>;
3374 kill 9, $pid if $pid > 0;
3375
3376 seek $fh, 0, 0;
3377 print $fh $$;
3378}
3379
3319sub main { 3380sub main {
3381 cf::init_globals; # initialise logging
3382
3383 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3384 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3385 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3386 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3387
3388 cf::init_experience;
3389 cf::init_anim;
3390 cf::init_attackmess;
3391 cf::init_dynamic;
3392
3393 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3394
3320 # we must not ever block the main coroutine 3395 # we must not ever block the main coroutine
3321 local $Coro::idle = sub { 3396 local $Coro::idle = sub {
3322 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3397 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3323 (async { 3398 (async {
3324 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3399 $Coro::current->{desc} = "IDLE BUG HANDLER";
3325 EV::loop EV::LOOP_ONESHOT; 3400 EV::loop EV::LOOP_ONESHOT;
3326 })->prio (Coro::PRIO_MAX); 3401 })->prio (Coro::PRIO_MAX);
3327 }; 3402 };
3328 3403
3404 evthread_start IO::AIO::poll_fileno;
3405
3406 cf::sync_job {
3407 reload_resources;
3329 reload_config; 3408 reload_config;
3330 db_init; 3409 db_init;
3410
3411 cf::load_settings;
3412 cf::load_materials;
3413 cf::init_uuid;
3414 cf::init_signals;
3415 cf::init_commands;
3416 cf::init_skills;
3417
3418 cf::init_beforeplay;
3419
3420 atomic;
3421
3331 load_extensions; 3422 load_extensions;
3332 3423
3333 $TICK_WATCHER->start; 3424 utime time, time, $RUNTIMEFILE;
3334 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3425
3426 # no (long-running) fork's whatsoever before this point(!)
3427 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3428
3429 (pop @POST_INIT)->(0) while @POST_INIT;
3430 };
3431
3335 EV::loop; 3432 EV::loop;
3336} 3433}
3337 3434
3338############################################################################# 3435#############################################################################
3339# initialisation and cleanup 3436# initialisation and cleanup
3346 cf::cleanup "SIG$signal"; 3443 cf::cleanup "SIG$signal";
3347 }; 3444 };
3348 } 3445 }
3349} 3446}
3350 3447
3351sub write_runtime { 3448sub write_runtime_sync {
3352 my $runtime = "$LOCALDIR/runtime";
3353
3354 # first touch the runtime file to show we are still running: 3449 # first touch the runtime file to show we are still running:
3355 # the fsync below can take a very very long time. 3450 # the fsync below can take a very very long time.
3356 3451
3357 IO::AIO::aio_utime $runtime, undef, undef; 3452 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3358 3453
3359 my $guard = cf::lock_acquire "write_runtime"; 3454 my $guard = cf::lock_acquire "write_runtime";
3360 3455
3361 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3456 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3362 or return; 3457 or return;
3363 3458
3364 my $value = $cf::RUNTIME + 90 + 10; 3459 my $value = $cf::RUNTIME + 90 + 10;
3365 # 10 is the runtime save interval, for a monotonic clock 3460 # 10 is the runtime save interval, for a monotonic clock
3366 # 60 allows for the watchdog to kill the server. 3461 # 60 allows for the watchdog to kill the server.
3376 aio_utime $fh, undef, undef; 3471 aio_utime $fh, undef, undef;
3377 3472
3378 close $fh 3473 close $fh
3379 or return; 3474 or return;
3380 3475
3381 aio_rename "$runtime~", $runtime 3476 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3382 and return; 3477 and return;
3383 3478
3384 warn "runtime file written.\n"; 3479 warn "runtime file written.\n";
3385 3480
3386 1 3481 1
3482}
3483
3484our $uuid_lock;
3485our $uuid_skip;
3486
3487sub write_uuid_sync($) {
3488 $uuid_skip ||= $_[0];
3489
3490 return if $uuid_lock;
3491 local $uuid_lock = 1;
3492
3493 my $uuid = "$LOCALDIR/uuid";
3494
3495 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3496 or return;
3497
3498 my $value = uuid_seq uuid_cur;
3499
3500 unless ($value) {
3501 warn "cowardly refusing to write zero uuid value!\n";
3502 return;
3503 }
3504
3505 my $value = uuid_str $value + $uuid_skip;
3506 $uuid_skip = 0;
3507
3508 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3509 and return;
3510
3511 # always fsync - this file is important
3512 aio_fsync $fh
3513 and return;
3514
3515 close $fh
3516 or return;
3517
3518 aio_rename "$uuid~", $uuid
3519 and return;
3520
3521 warn "uuid file written ($value).\n";
3522
3523 1
3524
3525}
3526
3527sub write_uuid($$) {
3528 my ($skip, $sync) = @_;
3529
3530 $sync ? write_uuid_sync $skip
3531 : async { write_uuid_sync $skip };
3387} 3532}
3388 3533
3389sub emergency_save() { 3534sub emergency_save() {
3390 my $freeze_guard = cf::freeze_mainloop; 3535 my $freeze_guard = cf::freeze_mainloop;
3391 3536
3392 warn "enter emergency perl save\n"; 3537 warn "emergency_perl_save: enter\n";
3393 3538
3394 cf::sync_job { 3539 cf::sync_job {
3540 # this is a trade-off: we want to be very quick here, so
3541 # save all maps without fsync, and later call a global sync
3542 # (which in turn might be very very slow)
3543 local $USE_FSYNC = 0;
3544
3395 # use a peculiar iteration method to avoid tripping on perl 3545 # use a peculiar iteration method to avoid tripping on perl
3396 # refcount bugs in for. also avoids problems with players 3546 # refcount bugs in for. also avoids problems with players
3397 # and maps saved/destroyed asynchronously. 3547 # and maps saved/destroyed asynchronously.
3398 warn "begin emergency player save\n"; 3548 warn "emergency_perl_save: begin player save\n";
3399 for my $login (keys %cf::PLAYER) { 3549 for my $login (keys %cf::PLAYER) {
3400 my $pl = $cf::PLAYER{$login} or next; 3550 my $pl = $cf::PLAYER{$login} or next;
3401 $pl->valid or next; 3551 $pl->valid or next;
3402 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3552 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3403 $pl->save; 3553 $pl->save;
3404 } 3554 }
3405 warn "end emergency player save\n"; 3555 warn "emergency_perl_save: end player save\n";
3406 3556
3407 warn "begin emergency map save\n"; 3557 warn "emergency_perl_save: begin map save\n";
3408 for my $path (keys %cf::MAP) { 3558 for my $path (keys %cf::MAP) {
3409 my $map = $cf::MAP{$path} or next; 3559 my $map = $cf::MAP{$path} or next;
3410 $map->valid or next; 3560 $map->valid or next;
3411 $map->save; 3561 $map->save;
3412 } 3562 }
3413 warn "end emergency map save\n"; 3563 warn "emergency_perl_save: end map save\n";
3414 3564
3415 warn "begin emergency database checkpoint\n"; 3565 warn "emergency_perl_save: begin database checkpoint\n";
3416 BDB::db_env_txn_checkpoint $DB_ENV; 3566 BDB::db_env_txn_checkpoint $DB_ENV;
3417 warn "end emergency database checkpoint\n"; 3567 warn "emergency_perl_save: end database checkpoint\n";
3568
3569 warn "emergency_perl_save: begin write uuid\n";
3570 write_uuid_sync 1;
3571 warn "emergency_perl_save: end write uuid\n";
3418 }; 3572 };
3419 3573
3574 warn "emergency_perl_save: starting sync()\n";
3575 IO::AIO::aio_sync sub {
3576 warn "emergency_perl_save: finished sync()\n";
3577 };
3578
3420 warn "leave emergency perl save\n"; 3579 warn "emergency_perl_save: leave\n";
3421} 3580}
3422 3581
3423sub post_cleanup { 3582sub post_cleanup {
3424 my ($make_core) = @_; 3583 my ($make_core) = @_;
3425 3584
3426 warn Carp::longmess "post_cleanup backtrace" 3585 warn Carp::longmess "post_cleanup backtrace"
3427 if $make_core; 3586 if $make_core;
3587
3588 my $fh = pidfile;
3589 unlink $PIDFILE if <$fh> == $$;
3590}
3591
3592# a safer delete_package, copied from Symbol
3593sub clear_package($) {
3594 my $pkg = shift;
3595
3596 # expand to full symbol table name if needed
3597 unless ($pkg =~ /^main::.*::$/) {
3598 $pkg = "main$pkg" if $pkg =~ /^::/;
3599 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3600 $pkg .= '::' unless $pkg =~ /::$/;
3601 }
3602
3603 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3604 my $stem_symtab = *{$stem}{HASH};
3605
3606 defined $stem_symtab and exists $stem_symtab->{$leaf}
3607 or return;
3608
3609 # clear all symbols
3610 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3611 for my $name (keys %$leaf_symtab) {
3612 _gv_clear *{"$pkg$name"};
3613# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3614 }
3615 warn "cleared package $pkg\n";#d#
3428} 3616}
3429 3617
3430sub do_reload_perl() { 3618sub do_reload_perl() {
3431 # can/must only be called in main 3619 # can/must only be called in main
3432 if ($Coro::current != $Coro::main) { 3620 if ($Coro::current != $Coro::main) {
3433 warn "can only reload from main coroutine"; 3621 warn "can only reload from main coroutine";
3434 return; 3622 return;
3435 } 3623 }
3436 3624
3625 return if $RELOAD++;
3626
3627 my $t1 = EV::time;
3628
3629 while ($RELOAD) {
3437 warn "reloading..."; 3630 warn "reloading...";
3438 3631
3439 warn "entering sync_job"; 3632 warn "entering sync_job";
3440 3633
3441 cf::sync_job { 3634 cf::sync_job {
3442 cf::write_runtime; # external watchdog should not bark 3635 cf::write_runtime_sync; # external watchdog should not bark
3443 cf::emergency_save; 3636 cf::emergency_save;
3444 cf::write_runtime; # external watchdog should not bark 3637 cf::write_runtime_sync; # external watchdog should not bark
3445 3638
3446 warn "syncing database to disk"; 3639 warn "syncing database to disk";
3447 BDB::db_env_txn_checkpoint $DB_ENV; 3640 BDB::db_env_txn_checkpoint $DB_ENV;
3448 3641
3449 # if anything goes wrong in here, we should simply crash as we already saved 3642 # if anything goes wrong in here, we should simply crash as we already saved
3450 3643
3451 warn "flushing outstanding aio requests"; 3644 warn "flushing outstanding aio requests";
3452 for (;;) {
3453 BDB::flush;
3454 IO::AIO::flush;
3455 Coro::cede_notself;
3456 last unless IO::AIO::nreqs || BDB::nreqs; 3645 while (IO::AIO::nreqs || BDB::nreqs) {
3457 warn "iterate..."; 3646 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3458 }
3459
3460 ++$RELOAD;
3461
3462 warn "cancelling all extension coros";
3463 $_->cancel for values %EXT_CORO;
3464 %EXT_CORO = ();
3465
3466 warn "removing commands";
3467 %COMMAND = ();
3468
3469 warn "removing ext/exti commands";
3470 %EXTCMD = ();
3471 %EXTICMD = ();
3472
3473 warn "unloading/nuking all extensions";
3474 for my $pkg (@EXTS) {
3475 warn "... unloading $pkg";
3476
3477 if (my $cb = $pkg->can ("unload")) {
3478 eval {
3479 $cb->($pkg);
3480 1
3481 } or warn "$pkg unloaded, but with errors: $@";
3482 } 3647 }
3483 3648
3484 warn "... nuking $pkg"; 3649 warn "cancelling all extension coros";
3485 Symbol::delete_package $pkg; 3650 $_->cancel for values %EXT_CORO;
3486 } 3651 %EXT_CORO = ();
3487 3652
3488 warn "unloading all perl modules loaded from $LIBDIR"; 3653 warn "removing commands";
3489 while (my ($k, $v) = each %INC) { 3654 %COMMAND = ();
3490 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3491 3655
3656 warn "removing ext/exti commands";
3657 %EXTCMD = ();
3658 %EXTICMD = ();
3659
3660 warn "unloading/nuking all extensions";
3661 for my $pkg (@EXTS) {
3492 warn "... unloading $k"; 3662 warn "... unloading $pkg";
3493 delete $INC{$k};
3494 3663
3495 $k =~ s/\.pm$//;
3496 $k =~ s/\//::/g;
3497
3498 if (my $cb = $k->can ("unload_module")) { 3664 if (my $cb = $pkg->can ("unload")) {
3665 eval {
3499 $cb->(); 3666 $cb->($pkg);
3667 1
3668 } or warn "$pkg unloaded, but with errors: $@";
3669 }
3670
3671 warn "... clearing $pkg";
3672 clear_package $pkg;
3500 } 3673 }
3501 3674
3502 Symbol::delete_package $k; 3675 warn "unloading all perl modules loaded from $LIBDIR";
3676 while (my ($k, $v) = each %INC) {
3677 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3678
3679 warn "... unloading $k";
3680 delete $INC{$k};
3681
3682 $k =~ s/\.pm$//;
3683 $k =~ s/\//::/g;
3684
3685 if (my $cb = $k->can ("unload_module")) {
3686 $cb->();
3687 }
3688
3689 clear_package $k;
3503 } 3690 }
3504 3691
3505 warn "getting rid of safe::, as good as possible"; 3692 warn "getting rid of safe::, as good as possible";
3506 Symbol::delete_package "safe::$_" 3693 clear_package "safe::$_"
3507 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3694 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3508 3695
3509 warn "unloading cf.pm \"a bit\""; 3696 warn "unloading cf.pm \"a bit\"";
3510 delete $INC{"cf.pm"}; 3697 delete $INC{"cf.pm"};
3511 delete $INC{"cf/pod.pm"}; 3698 delete $INC{"cf/pod.pm"};
3512 3699
3513 # don't, removes xs symbols, too, 3700 # don't, removes xs symbols, too,
3514 # and global variables created in xs 3701 # and global variables created in xs
3515 #Symbol::delete_package __PACKAGE__; 3702 #clear_package __PACKAGE__;
3516 3703
3517 warn "unload completed, starting to reload now"; 3704 warn "unload completed, starting to reload now";
3518 3705
3519 warn "reloading cf.pm"; 3706 warn "reloading cf.pm";
3520 require cf; 3707 require cf;
3521 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3708 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3522 3709
3523 warn "loading config and database again"; 3710 warn "loading config and database again";
3524 cf::reload_config; 3711 cf::reload_config;
3525 3712
3526 warn "loading extensions"; 3713 warn "loading extensions";
3527 cf::load_extensions; 3714 cf::load_extensions;
3528 3715
3716 if ($REATTACH_ON_RELOAD) {
3529 warn "reattaching attachments to objects/players"; 3717 warn "reattaching attachments to objects/players";
3530 _global_reattach; # objects, sockets 3718 _global_reattach; # objects, sockets
3531 warn "reattaching attachments to maps"; 3719 warn "reattaching attachments to maps";
3532 reattach $_ for values %MAP; 3720 reattach $_ for values %MAP;
3533 warn "reattaching attachments to players"; 3721 warn "reattaching attachments to players";
3534 reattach $_ for values %PLAYER; 3722 reattach $_ for values %PLAYER;
3723 }
3535 3724
3725 warn "running post_init jobs";
3726 (pop @POST_INIT)->(1) while @POST_INIT;
3727
3536 warn "leaving sync_job"; 3728 warn "leaving sync_job";
3537 3729
3538 1 3730 1
3539 } or do { 3731 } or do {
3540 warn $@; 3732 warn $@;
3541 warn "error while reloading, exiting."; 3733 cf::cleanup "error while reloading, exiting.";
3542 exit 1;
3543 }; 3734 };
3544 3735
3545 warn "reloaded"; 3736 warn "reloaded";
3737 --$RELOAD;
3738 }
3739
3740 $t1 = EV::time - $t1;
3741 warn "reload completed in ${t1}s\n";
3546}; 3742};
3547 3743
3548our $RELOAD_WATCHER; # used only during reload 3744our $RELOAD_WATCHER; # used only during reload
3549 3745
3550sub reload_perl() { 3746sub reload_perl() {
3551 # doing reload synchronously and two reloads happen back-to-back, 3747 # doing reload synchronously and two reloads happen back-to-back,
3552 # coro crashes during coro_state_free->destroy here. 3748 # coro crashes during coro_state_free->destroy here.
3553 3749
3750 $RELOAD_WATCHER ||= cf::async {
3751 Coro::AIO::aio_wait cache_extensions;
3752
3554 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3753 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3754 do_reload_perl;
3555 undef $RELOAD_WATCHER; 3755 undef $RELOAD_WATCHER;
3556 do_reload_perl; 3756 };
3557 }; 3757 };
3558} 3758}
3559 3759
3560register_command "reload" => sub { 3760register_command "reload" => sub {
3561 my ($who, $arg) = @_; 3761 my ($who, $arg) = @_;
3575 3775
3576our @WAIT_FOR_TICK; 3776our @WAIT_FOR_TICK;
3577our @WAIT_FOR_TICK_BEGIN; 3777our @WAIT_FOR_TICK_BEGIN;
3578 3778
3579sub wait_for_tick { 3779sub wait_for_tick {
3580 return unless $TICK_WATCHER->is_active;
3581 return if $Coro::current == $Coro::main; 3780 return if tick_inhibit || $Coro::current == $Coro::main;
3582 3781
3583 my $signal = new Coro::Signal; 3782 my $signal = new Coro::Signal;
3584 push @WAIT_FOR_TICK, $signal; 3783 push @WAIT_FOR_TICK, $signal;
3585 $signal->wait; 3784 $signal->wait;
3586} 3785}
3587 3786
3588sub wait_for_tick_begin { 3787sub wait_for_tick_begin {
3589 return unless $TICK_WATCHER->is_active;
3590 return if $Coro::current == $Coro::main; 3788 return if tick_inhibit || $Coro::current == $Coro::main;
3591 3789
3592 my $signal = new Coro::Signal; 3790 my $signal = new Coro::Signal;
3593 push @WAIT_FOR_TICK_BEGIN, $signal; 3791 push @WAIT_FOR_TICK_BEGIN, $signal;
3594 $signal->wait; 3792 $signal->wait;
3595} 3793}
3596 3794
3597$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3795sub tick {
3598 if ($Coro::current != $Coro::main) { 3796 if ($Coro::current != $Coro::main) {
3599 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3797 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3600 unless ++$bug_warning > 10; 3798 unless ++$bug_warning > 10;
3601 return; 3799 return;
3602 } 3800 }
3603 3801
3604 $NOW = $tick_start = EV::now;
3605
3606 cf::server_tick; # one server iteration 3802 cf::server_tick; # one server iteration
3607
3608 $RUNTIME += $TICK;
3609 $NEXT_TICK += $TICK;
3610 3803
3611 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3804 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3612 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3805 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3613 Coro::async_pool { 3806 Coro::async_pool {
3614 $Coro::current->{desc} = "runtime saver"; 3807 $Coro::current->{desc} = "runtime saver";
3615 write_runtime 3808 write_runtime_sync
3616 or warn "ERROR: unable to write runtime file: $!"; 3809 or warn "ERROR: unable to write runtime file: $!";
3617 }; 3810 };
3618 } 3811 }
3619 3812
3620 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3813 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3622 } 3815 }
3623 while (my $sig = shift @WAIT_FOR_TICK) { 3816 while (my $sig = shift @WAIT_FOR_TICK) {
3624 $sig->send; 3817 $sig->send;
3625 } 3818 }
3626 3819
3627 $LOAD = ($NOW - $tick_start) / $TICK; 3820 $LOAD = ($NOW - $TICK_START) / $TICK;
3628 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3821 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3629 3822
3630 _post_tick; 3823 if (0) {
3631}; 3824 if ($NEXT_TICK) {
3632$TICK_WATCHER->priority (EV::MAXPRI); 3825 my $jitter = $TICK_START - $NEXT_TICK;
3826 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3827 warn "jitter $JITTER\n";#d#
3828 }
3829 }
3830}
3633 3831
3634{ 3832{
3635 # configure BDB 3833 # configure BDB
3636 3834
3637 BDB::min_parallel 8; 3835 BDB::min_parallel 8;
3638 BDB::max_poll_reqs $TICK * 0.1; 3836 BDB::max_poll_reqs $TICK * 0.1;
3837 $AnyEvent::BDB::WATCHER->priority (1);
3639 3838
3640 unless ($DB_ENV) { 3839 unless ($DB_ENV) {
3641 $DB_ENV = BDB::db_env_create; 3840 $DB_ENV = BDB::db_env_create;
3642 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3841 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3643 | BDB::LOG_AUTOREMOVE, 1); 3842 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3843 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3644 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3844 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3645 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3845 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3646 3846
3647 cf::sync_job { 3847 cf::sync_job {
3648 eval { 3848 eval {
3674{ 3874{
3675 # configure IO::AIO 3875 # configure IO::AIO
3676 3876
3677 IO::AIO::min_parallel 8; 3877 IO::AIO::min_parallel 8;
3678 IO::AIO::max_poll_time $TICK * 0.1; 3878 IO::AIO::max_poll_time $TICK * 0.1;
3879 undef $AnyEvent::AIO::WATCHER;
3679} 3880}
3680 3881
3681my $_log_backtrace; 3882my $_log_backtrace;
3682 3883
3683sub _log_backtrace { 3884sub _log_backtrace {
3686 $msg =~ s/\n//; 3887 $msg =~ s/\n//;
3687 3888
3688 # limit the # of concurrent backtraces 3889 # limit the # of concurrent backtraces
3689 if ($_log_backtrace < 2) { 3890 if ($_log_backtrace < 2) {
3690 ++$_log_backtrace; 3891 ++$_log_backtrace;
3892 my $perl_bt = Carp::longmess $msg;
3691 async { 3893 async {
3692 $Coro::current->{desc} = "abt $msg"; 3894 $Coro::current->{desc} = "abt $msg";
3693 3895
3694 my @bt = fork_call { 3896 my @bt = fork_call {
3695 @addr = map { sprintf "%x", $_ } @addr; 3897 @addr = map { sprintf "%x", $_ } @addr;
3706 } 3908 }
3707 3909
3708 @funcs 3910 @funcs
3709 }; 3911 };
3710 3912
3711 LOG llevInfo, "[ABT] $msg\n"; 3913 LOG llevInfo, "[ABT] $perl_bt\n";
3914 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3712 LOG llevInfo, "[ABT] $_\n" for @bt; 3915 LOG llevInfo, "[ABT] $_\n" for @bt;
3713 --$_log_backtrace; 3916 --$_log_backtrace;
3714 }; 3917 };
3715 } else { 3918 } else {
3716 LOG llevInfo, "[ABT] $msg\n"; 3919 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines