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.282 by elmex, Tue Jun 19 18:15:34 2007 UTC vs.
Revision 1.432 by root, Mon May 5 22:38:47 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV 3.2;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
14 35
15use Coro 3.61 (); 36use Coro 4.50 ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::Event; 39use Coro::EV;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
22use Coro::AIO; 43use Coro::AIO;
44use Coro::BDB;
23use Coro::Storable; 45use Coro::Storable;
46use Coro::Util ();
24 47
48use JSON::XS 2.01 ();
25use BDB (); 49use BDB ();
26use Data::Dumper; 50use Data::Dumper;
27use Digest::MD5; 51use Digest::MD5;
28use Fcntl; 52use Fcntl;
29use YAML::Syck (); 53use YAML ();
30use IO::AIO 2.32 (); 54use IO::AIO 2.51 ();
31use Time::HiRes; 55use Time::HiRes;
32use Compress::LZF; 56use Compress::LZF;
57use Digest::MD5 ();
33 58
34# configure various modules to our taste 59# configure various modules to our taste
35# 60#
36$Storable::canonical = 1; # reduce rsync transfers 61$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39 64
40$Event::Eval = 1; # no idea why this is required, but it is
41
42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
43$YAML::Syck::ImplicitUnicode = 1;
44
45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46 66
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
48 68
49our %COMMAND = (); 69our %COMMAND = ();
50our %COMMAND_TIME = (); 70our %COMMAND_TIME = ();
51 71
52our @EXTS = (); # list of extension package names 72our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 73our %EXTCMD = ();
74our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 75our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 76our %EXT_MAP = (); # pluggable maps
56 77
57our $RELOAD; # number of reloads so far 78our $RELOAD; # number of reloads so far
58our @EVENT; 79our @EVENT;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 87our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 89our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 90our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 91our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE;
71 93
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
73our $TICK_WATCHER;
74our $AIO_POLL_WATCHER; 95our $AIO_POLL_WATCHER;
75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
76our $NEXT_TICK; 97our $NEXT_TICK;
77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 98our $USE_FSYNC = 1; # use fsync to write maps - default off
79 99
80our $BDB_POLL_WATCHER; 100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 104our $DB_ENV;
82 105
83our %CFG; 106our %CFG;
84 107
85our $UPTIME; $UPTIME ||= time; 108our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 109our $RUNTIME;
110our $NOW;
87 111
88our %PLAYER; # all users 112our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 113our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 114our $LINK_MAP; # the special {link} map, which is always available
91 115
92# used to convert map paths into valid unix filenames by replacing / by ∕ 116# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 118
95our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
96our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
97our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
98 123
99binmode STDOUT; 124binmode STDOUT;
100binmode STDERR; 125binmode STDERR;
101 126
102# read virtual server time, if available 127# read virtual server time, if available
155 180
156The raw value load value from the last tick. 181The raw value load value from the last tick.
157 182
158=item %cf::CFG 183=item %cf::CFG
159 184
160Configuration for the server, loaded from C</etc/crossfire/config>, or 185Configuration for the server, loaded from C</etc/deliantra-server/config>, or
161from wherever your confdir points to. 186from wherever your confdir points to.
162 187
163=item cf::wait_for_tick, cf::wait_for_tick_begin 188=item cf::wait_for_tick, cf::wait_for_tick_begin
164 189
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 190These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
166returns directly I<after> the tick processing (and consequently, can only wake one process 191returns directly I<after> the tick processing (and consequently, can only wake one process
167per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 192per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168 193
194=item @cf::INVOKE_RESULTS
195
196This array contains the results of the last C<invoke ()> call. When
197C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
198that call.
199
169=back 200=back
170 201
171=cut 202=cut
172 203
173BEGIN { 204BEGIN {
177 $msg .= "\n" 208 $msg .= "\n"
178 unless $msg =~ /\n$/; 209 unless $msg =~ /\n$/;
179 210
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181 212
182 utf8::encode $msg;
183 LOG llevError, $msg; 213 LOG llevError, $msg;
184 }; 214 };
185} 215}
216
217$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "=="
219
220 if ($Coro::current == $Coro::main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d#
223 }#d#
224
225 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate
228};
229
230$SIG{__DIE__} = sub { }; #d#?
186 231
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
203)) { 248)) {
204 no strict 'refs'; 249 no strict 'refs';
205 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
206} 251}
207 252
208$Event::DIED = sub { 253$EV::DIED = sub {
209 warn "error in event callback: @_"; 254 warn "error in event callback: @_";
210}; 255};
211 256
212############################################################################# 257#############################################################################
213 258
236 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 281 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
237 $d 282 $d
238 } || "[unable to dump $_[0]: '$@']"; 283 } || "[unable to dump $_[0]: '$@']";
239} 284}
240 285
241use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
242
243=item $ref = cf::from_json $json 286=item $ref = cf::decode_json $json
244 287
245Converts a JSON string into the corresponding perl data structure. 288Converts a JSON string into the corresponding perl data structure.
246 289
247=item $json = cf::to_json $ref 290=item $json = cf::encode_json $ref
248 291
249Converts a perl data structure into its JSON representation. 292Converts a perl data structure into its JSON representation.
293
294=cut
295
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297
298sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) }
250 300
251=item cf::lock_wait $string 301=item cf::lock_wait $string
252 302
253Wait until the given lock is available. See cf::lock_acquire. 303Wait until the given lock is available. See cf::lock_acquire.
254 304
257Wait until the given lock is available and then acquires it and returns 307Wait until the given lock is available and then acquires it and returns
258a Coro::guard object. If the guard object gets destroyed (goes out of scope, 308a Coro::guard object. If the guard object gets destroyed (goes out of scope,
259for example when the coroutine gets canceled), the lock is automatically 309for example when the coroutine gets canceled), the lock is automatically
260returned. 310returned.
261 311
312Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro.
314
262Lock names should begin with a unique identifier (for example, cf::map::find 315Lock names should begin with a unique identifier (for example, cf::map::find
263uses map_find and cf::map::load uses map_load). 316uses map_find and cf::map::load uses map_load).
264 317
265=item $locked = cf::lock_active $string 318=item $locked = cf::lock_active $string
266 319
267Return true if the lock is currently active, i.e. somebody has locked it. 320Return true if the lock is currently active, i.e. somebody has locked it.
268 321
269=cut 322=cut
270 323
271our %LOCK; 324our %LOCK;
325our %LOCKER;#d#
272 326
273sub lock_wait($) { 327sub lock_wait($) {
274 my ($key) = @_; 328 my ($key) = @_;
329
330 if ($LOCKER{$key} == $Coro::current) {#d#
331 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332 return;#d#
333 }#d#
275 334
276 # wait for lock, if any 335 # wait for lock, if any
277 while ($LOCK{$key}) { 336 while ($LOCK{$key}) {
278 push @{ $LOCK{$key} }, $Coro::current; 337 push @{ $LOCK{$key} }, $Coro::current;
279 Coro::schedule; 338 Coro::schedule;
285 344
286 # wait, to be sure we are not locked 345 # wait, to be sure we are not locked
287 lock_wait $key; 346 lock_wait $key;
288 347
289 $LOCK{$key} = []; 348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
290 350
291 Coro::guard { 351 Coro::guard {
352 delete $LOCKER{$key};#d#
292 # wake up all waiters, to be on the safe side 353 # wake up all waiters, to be on the safe side
293 $_->ready for @{ delete $LOCK{$key} }; 354 $_->ready for @{ delete $LOCK{$key} };
294 } 355 }
295} 356}
296 357
299 360
300 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
301} 362}
302 363
303sub freeze_mainloop { 364sub freeze_mainloop {
304 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
305 366
306 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
307 $TICK_WATCHER->start; 368}
369
370=item cf::periodic $interval, $cb
371
372Like EV::periodic, but randomly selects a starting point so that the actions
373get spread over timer.
374
375=cut
376
377sub periodic($$) {
378 my ($interval, $cb) = @_;
379
380 my $start = rand List::Util::min 180, $interval;
381
382 EV::periodic $start, $interval, 0, $cb
383}
384
385=item cf::get_slot $time[, $priority[, $name]]
386
387Allocate $time seconds of blocking CPU time at priority C<$priority>:
388This call blocks and returns only when you have at least C<$time> seconds
389of cpu time till the next tick. The slot is only valid till the next cede.
390
391The optional C<$name> can be used to identify the job to run. It might be
392used for statistical purposes and should identify the same time-class.
393
394Useful for short background jobs.
395
396=cut
397
398our @SLOT_QUEUE;
399our $SLOT_QUEUE;
400
401$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager");
404
405 my $signal = new Coro::Signal;
406
407 while () {
408 next_job:
409 my $avail = cf::till_tick;
410 if ($avail > 0.01) {
411 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) {
413 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send;
415 Coro::cede;
416 goto next_job;
417 }
418 }
419 }
420
421 if (@SLOT_QUEUE) {
422 # we do not use wait_for_tick() as it returns immediately when tick is inactive
423 push @cf::WAIT_FOR_TICK, $signal;
424 $signal->wait;
425 } else {
426 Coro::schedule;
427 }
308 }; 428 }
309 $TICK_WATCHER->stop; 429};
310 $guard 430
431sub get_slot($;$$) {
432 return if tick_inhibit || $Coro::current == $Coro::main;
433
434 my ($time, $pri, $name) = @_;
435
436 $time = $TICK * .6 if $time > $TICK * .6;
437 my $sig = new Coro::Signal;
438
439 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
440 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
441 $SLOT_QUEUE->ready;
442 $sig->wait;
311} 443}
312 444
313=item cf::async { BLOCK } 445=item cf::async { BLOCK }
314 446
315Currently the same as Coro::async_pool, meaning you cannot use 447Currently the same as Coro::async_pool, meaning you cannot use
320 452
321BEGIN { *async = \&Coro::async_pool } 453BEGIN { *async = \&Coro::async_pool }
322 454
323=item cf::sync_job { BLOCK } 455=item cf::sync_job { BLOCK }
324 456
325The design of Crossfire TRT requires that the main coroutine ($Coro::main) 457The design of Deliantra requires that the main coroutine ($Coro::main)
326is always able to handle events or runnable, as Crossfire TRT is only 458is always able to handle events or runnable, as Deliantra is only
327partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 459partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
328acceptable. 460acceptable.
329 461
330If it must be done, put the blocking parts into C<sync_job>. This will run 462If it must be done, put the blocking parts into C<sync_job>. This will run
331the given BLOCK in another coroutine while waiting for the result. The 463the given BLOCK in another coroutine while waiting for the result. The
336 468
337sub sync_job(&) { 469sub sync_job(&) {
338 my ($job) = @_; 470 my ($job) = @_;
339 471
340 if ($Coro::current == $Coro::main) { 472 if ($Coro::current == $Coro::main) {
341 my $time = Event::time; 473 my $time = EV::time;
342 474
343 # this is the main coro, too bad, we have to block 475 # this is the main coro, too bad, we have to block
344 # till the operation succeeds, freezing the server :/ 476 # till the operation succeeds, freezing the server :/
345 477
346 # TODO: use suspend/resume instead 478 LOG llevError, Carp::longmess "sync job";#d#
347 # (but this is cancel-safe) 479
348 my $freeze_guard = freeze_mainloop; 480 my $freeze_guard = freeze_mainloop;
349 481
350 my $busy = 1; 482 my $busy = 1;
351 my @res; 483 my @res;
352 484
353 (async { 485 (async {
486 $Coro::current->desc ("sync job coro");
354 @res = eval { $job->() }; 487 @res = eval { $job->() };
355 warn $@ if $@; 488 warn $@ if $@;
356 undef $busy; 489 undef $busy;
357 })->prio (Coro::PRIO_MAX); 490 })->prio (Coro::PRIO_MAX);
358 491
359 while ($busy) { 492 while ($busy) {
360 Coro::cede or Event::one_event; 493 if (Coro::nready) {
494 Coro::cede_notself;
495 } else {
496 EV::loop EV::LOOP_ONESHOT;
361 } 497 }
498 }
362 499
363 $time = Event::time - $time; 500 my $time = EV::time - $time;
364 501
365 LOG llevError | logBacktrace, Carp::longmess "long sync job"
366 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
367
368 $tick_start += $time; # do not account sync jobs to server load 502 $TICK_START += $time; # do not account sync jobs to server load
369 503
370 wantarray ? @res : $res[0] 504 wantarray ? @res : $res[0]
371 } else { 505 } else {
372 # we are in another coroutine, how wonderful, everything just works 506 # we are in another coroutine, how wonderful, everything just works
373 507
398=item fork_call { }, $args 532=item fork_call { }, $args
399 533
400Executes the given code block with the given arguments in a seperate 534Executes the given code block with the given arguments in a seperate
401process, returning the results. Everything must be serialisable with 535process, returning the results. Everything must be serialisable with
402Coro::Storable. May, of course, block. Note that the executed sub may 536Coro::Storable. May, of course, block. Note that the executed sub may
403never block itself or use any form of Event handling. 537never block itself or use any form of event handling.
404 538
405=cut 539=cut
406 540
407sub fork_call(&@) { 541sub fork_call(&@) {
408 my ($cb, @args) = @_; 542 my ($cb, @args) = @_;
409 543
410# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 544 # we seemingly have to make a local copy of the whole thing,
411# or die "socketpair: $!"; 545 # otherwise perl prematurely frees the stuff :/
412 pipe my $fh1, my $fh2 546 # TODO: investigate and fix (likely this will be rather laborious)
413 or die "pipe: $!";
414 547
415 if (my $pid = fork) { 548 my @res = Coro::Util::fork_eval {
416 close $fh2;
417
418 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
419 $res = Coro::Storable::thaw $res;
420
421 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
422
423 die $$res unless "ARRAY" eq ref $res;
424
425 return wantarray ? @$res : $res->[-1];
426 } else {
427 reset_signals; 549 reset_signals;
428 local $SIG{__WARN__}; 550 &$cb
429 local $SIG{__DIE__}; 551 }, @args;
430 eval {
431 close $fh1;
432 552
433 my @res = eval { $cb->(@args) }; 553 wantarray ? @res : $res[-1]
434 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 554}
435 };
436 555
437 warn $@ if $@; 556=item $coin = coin_from_name $name
438 _exit 0; 557
439 } 558=cut
559
560our %coin_alias = (
561 "silver" => "silvercoin",
562 "silvercoin" => "silvercoin",
563 "silvercoins" => "silvercoin",
564 "gold" => "goldcoin",
565 "goldcoin" => "goldcoin",
566 "goldcoins" => "goldcoin",
567 "platinum" => "platinacoin",
568 "platinumcoin" => "platinacoin",
569 "platinumcoins" => "platinacoin",
570 "platina" => "platinacoin",
571 "platinacoin" => "platinacoin",
572 "platinacoins" => "platinacoin",
573 "royalty" => "royalty",
574 "royalties" => "royalty",
575);
576
577sub coin_from_name($) {
578 $coin_alias{$_[0]}
579 ? cf::arch::find $coin_alias{$_[0]}
580 : undef
440} 581}
441 582
442=item $value = cf::db_get $family => $key 583=item $value = cf::db_get $family => $key
443 584
444Returns a single value from the environment database. 585Returns a single value from the environment database.
446=item cf::db_put $family => $key => $value 587=item cf::db_put $family => $key => $value
447 588
448Stores the given C<$value> in the family. It can currently store binary 589Stores the given C<$value> in the family. It can currently store binary
449data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 590data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
450 591
592=item $db = cf::db_table "name"
593
594Create and/or open a new database table. The string must not be "db" and must be unique
595within each server.
596
451=cut 597=cut
598
599sub db_table($) {
600 my ($name) = @_;
601 my $db = BDB::db_create $DB_ENV;
602
603 eval {
604 $db->set_flags (BDB::CHKSUM);
605
606 utf8::encode $name;
607 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
608 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
609 cf::cleanup "db_open(db): $!" if $!;
610 };
611 cf::cleanup "db_open(db): $@" if $@;
612
613 $db
614}
452 615
453our $DB; 616our $DB;
454 617
455sub db_init { 618sub db_init {
456 unless ($DB) {
457 $DB = BDB::db_create $DB_ENV;
458
459 cf::sync_job { 619 cf::sync_job {
460 eval { 620 $DB ||= db_table "db";
461 $DB->set_flags (BDB::CHKSUM);
462
463 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
464 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
465 cf::cleanup "db_open(db): $!" if $!;
466 };
467 cf::cleanup "db_open(db): $@" if $@;
468 };
469 } 621 };
470} 622}
471 623
472sub db_get($$) { 624sub db_get($$) {
473 my $key = "$_[0]/$_[1]"; 625 my $key = "$_[0]/$_[1]";
474 626
524 if (1) { 676 if (1) {
525 $md5 = 677 $md5 =
526 join "\x00", 678 join "\x00",
527 $processversion, 679 $processversion,
528 map { 680 map {
529 Coro::cede; 681 cf::cede_to_tick;
530 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 682 ($src->[$_], Digest::MD5::md5_hex $data[$_])
531 } 0.. $#$src; 683 } 0.. $#$src;
532 684
533 685
534 my $dbmd5 = db_get cache => "$id/md5"; 686 my $dbmd5 = db_get cache => "$id/md5";
578attach callbacks/event handlers (a collection of which is called an "attachment") 730attach callbacks/event handlers (a collection of which is called an "attachment")
579to it. All such attachable objects support the following methods. 731to it. All such attachable objects support the following methods.
580 732
581In the following description, CLASS can be any of C<global>, C<object> 733In the following description, CLASS can be any of C<global>, C<object>
582C<player>, C<client> or C<map> (i.e. the attachable objects in 734C<player>, C<client> or C<map> (i.e. the attachable objects in
583Crossfire TRT). 735Deliantra).
584 736
585=over 4 737=over 4
586 738
587=item $attachable->attach ($attachment, key => $value...) 739=item $attachable->attach ($attachment, key => $value...)
588 740
840 "; 992 ";
841 die if $@; 993 die if $@;
842} 994}
843 995
844our $override; 996our $override;
845our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 997our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
846 998
847sub override { 999sub override {
848 $override = 1; 1000 $override = 1;
849 @invoke_results = (); 1001 @INVOKE_RESULTS = (@_);
850} 1002}
851 1003
852sub do_invoke { 1004sub do_invoke {
853 my $event = shift; 1005 my $event = shift;
854 my $callbacks = shift; 1006 my $callbacks = shift;
855 1007
856 @invoke_results = (); 1008 @INVOKE_RESULTS = ();
857 1009
858 local $override; 1010 local $override;
859 1011
860 for (@$callbacks) { 1012 for (@$callbacks) {
861 eval { &{$_->[1]} }; 1013 eval { &{$_->[1]} };
870 } 1022 }
871 1023
872 0 1024 0
873} 1025}
874 1026
875=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1027=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
876 1028
877=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1029=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
878 1030
879Generate an object-specific event with the given arguments. 1031Generate an object-specific event with the given arguments.
880 1032
881This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1033This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
882removed in future versions), and there is no public API to access override 1034removed in future versions), and there is no public API to access override
883results (if you must, access C<@cf::invoke_results> directly). 1035results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884 1036
885=back 1037=back
886 1038
887=cut 1039=cut
888 1040
889############################################################################# 1041#############################################################################
890# object support 1042# object support
1043
1044sub _object_equal($$);
1045sub _object_equal($$) {
1046 my ($a, $b) = @_;
1047
1048 return 0 unless (ref $a) eq (ref $b);
1049
1050 if ("HASH" eq ref $a) {
1051 my @ka = keys %$a;
1052 my @kb = keys %$b;
1053
1054 return 0 if @ka != @kb;
1055
1056 for (0 .. $#ka) {
1057 return 0 unless $ka[$_] eq $kb[$_];
1058 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1059 }
1060
1061 } elsif ("ARRAY" eq ref $a) {
1062
1063 return 0 if @$a != @$b;
1064
1065 for (0 .. $#$a) {
1066 return 0 unless _object_equal $a->[$_], $b->[$_];
1067 }
1068
1069 } elsif ($a ne $b) {
1070 return 0;
1071 }
1072
1073 1
1074}
1075
1076our $SLOW_MERGES;#d#
1077sub _can_merge {
1078 my ($ob1, $ob2) = @_;
1079
1080 ++$SLOW_MERGES;#d#
1081
1082 # we do the slow way here
1083 return _object_equal $ob1, $ob2
1084}
891 1085
892sub reattach { 1086sub reattach {
893 # basically do the same as instantiate, without calling instantiate 1087 # basically do the same as instantiate, without calling instantiate
894 my ($obj) = @_; 1088 my ($obj) = @_;
895 1089
916cf::attachable->attach ( 1110cf::attachable->attach (
917 prio => -1000000, 1111 prio => -1000000,
918 on_instantiate => sub { 1112 on_instantiate => sub {
919 my ($obj, $data) = @_; 1113 my ($obj, $data) = @_;
920 1114
921 $data = from_json $data; 1115 $data = decode_json $data;
922 1116
923 for (@$data) { 1117 for (@$data) {
924 my ($name, $args) = @$_; 1118 my ($name, $args) = @$_;
925 1119
926 $obj->attach ($name, %{$args || {} }); 1120 $obj->attach ($name, %{$args || {} });
942sub object_freezer_save { 1136sub object_freezer_save {
943 my ($filename, $rdata, $objs) = @_; 1137 my ($filename, $rdata, $objs) = @_;
944 1138
945 sync_job { 1139 sync_job {
946 if (length $$rdata) { 1140 if (length $$rdata) {
1141 utf8::decode (my $decname = $filename);
947 warn sprintf "saving %s (%d,%d)\n", 1142 warn sprintf "saving %s (%d,%d)\n",
948 $filename, length $$rdata, scalar @$objs; 1143 $decname, length $$rdata, scalar @$objs;
949 1144
950 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
951 chmod SAVE_MODE, $fh; 1146 aio_chmod $fh, SAVE_MODE;
952 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
953 aio_fsync $fh if $cf::USE_FSYNC; 1148 aio_fsync $fh if $cf::USE_FSYNC;
954 close $fh; 1149 aio_close $fh;
955 1150
956 if (@$objs) { 1151 if (@$objs) {
957 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1152 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
958 chmod SAVE_MODE, $fh; 1153 aio_chmod $fh, SAVE_MODE;
959 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
960 aio_write $fh, 0, (length $data), $data, 0; 1155 aio_write $fh, 0, (length $data), $data, 0;
961 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
962 close $fh; 1157 aio_close $fh;
963 aio_rename "$filename.pst~", "$filename.pst"; 1158 aio_rename "$filename.pst~", "$filename.pst";
964 } 1159 }
965 } else { 1160 } else {
966 aio_unlink "$filename.pst"; 1161 aio_unlink "$filename.pst";
967 } 1162 }
972 } 1167 }
973 } else { 1168 } else {
974 aio_unlink $filename; 1169 aio_unlink $filename;
975 aio_unlink "$filename.pst"; 1170 aio_unlink "$filename.pst";
976 } 1171 }
977 } 1172 };
978} 1173}
979 1174
980sub object_freezer_as_string { 1175sub object_freezer_as_string {
981 my ($rdata, $objs) = @_; 1176 my ($rdata, $objs) = @_;
982 1177
994 or return; 1189 or return;
995 1190
996 unless (aio_stat "$filename.pst") { 1191 unless (aio_stat "$filename.pst") {
997 (aio_load "$filename.pst", $av) >= 0 1192 (aio_load "$filename.pst", $av) >= 0
998 or return; 1193 or return;
1194
999 $av = eval { (Storable::thaw $av)->{objs} }; 1195 my $st = eval { Coro::Storable::thaw $av };
1196 $av = $st->{objs};
1000 } 1197 }
1001 1198
1199 utf8::decode (my $decname = $filename);
1002 warn sprintf "loading %s (%d)\n", 1200 warn sprintf "loading %s (%d,%d)\n",
1003 $filename, length $data, scalar @{$av || []}; 1201 $decname, length $data, scalar @{$av || []};
1202
1004 return ($data, $av); 1203 ($data, $av)
1005} 1204}
1006 1205
1007=head2 COMMAND CALLBACKS 1206=head2 COMMAND CALLBACKS
1008 1207
1009=over 4 1208=over 4
1029 push @{ $COMMAND{$name} }, [$caller, $cb]; 1228 push @{ $COMMAND{$name} }, [$caller, $cb];
1030} 1229}
1031 1230
1032=item cf::register_extcmd $name => \&callback($pl,$packet); 1231=item cf::register_extcmd $name => \&callback($pl,$packet);
1033 1232
1034Register a callback fro execution when the client sends an extcmd packet. 1233Register a callback for execution when the client sends an (synchronous)
1234extcmd packet. Ext commands will be processed in the order they are
1235received by the server, like other user commands. The first argument is
1236the logged-in player. Ext commands can only be processed after a player
1237has logged in successfully.
1035 1238
1036If the callback returns something, it is sent back as if reply was being 1239If the callback returns something, it is sent back as if reply was being
1037called. 1240called.
1038 1241
1242=item cf::register_exticmd $name => \&callback($ns,$packet);
1243
1244Register a callback for execution when the client sends an (asynchronous)
1245exticmd packet. Exti commands are processed by the server as soon as they
1246are received, i.e. out of order w.r.t. other commands. The first argument
1247is a client socket. Exti commands can be received anytime, even before
1248log-in.
1249
1250If the callback returns something, it is sent back as if reply was being
1251called.
1252
1039=cut 1253=cut
1040 1254
1041sub register_extcmd { 1255sub register_extcmd {
1042 my ($name, $cb) = @_; 1256 my ($name, $cb) = @_;
1043 1257
1044 $EXTCMD{$name} = $cb; 1258 $EXTCMD{$name} = $cb;
1259}
1260
1261sub register_exticmd {
1262 my ($name, $cb) = @_;
1263
1264 $EXTICMD{$name} = $cb;
1045} 1265}
1046 1266
1047cf::player->attach ( 1267cf::player->attach (
1048 on_command => sub { 1268 on_command => sub {
1049 my ($pl, $name, $params) = @_; 1269 my ($pl, $name, $params) = @_;
1058 cf::override; 1278 cf::override;
1059 }, 1279 },
1060 on_extcmd => sub { 1280 on_extcmd => sub {
1061 my ($pl, $buf) = @_; 1281 my ($pl, $buf) = @_;
1062 1282
1063 my $msg = eval { from_json $buf }; 1283 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064 1284
1065 if (ref $msg) { 1285 if (ref $msg) {
1286 my ($type, $reply, @payload) =
1287 "ARRAY" eq ref $msg
1288 ? @$msg
1289 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1290
1291 my @reply;
1292
1066 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1293 if (my $cb = $EXTCMD{$type}) {
1067 if (my %reply = $cb->($pl, $msg)) { 1294 @reply = $cb->($pl, @payload);
1068 $pl->ext_reply ($msg->{msgid}, %reply);
1069 }
1070 } 1295 }
1296
1297 $pl->ext_reply ($reply, @reply)
1298 if $reply;
1299
1071 } else { 1300 } else {
1072 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1301 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1073 } 1302 }
1074 1303
1075 cf::override; 1304 cf::override;
1128 my $msg = $@ ? "$v->{path}: $@\n" 1357 my $msg = $@ ? "$v->{path}: $@\n"
1129 : "$v->{base}: extension inactive.\n"; 1358 : "$v->{base}: extension inactive.\n";
1130 1359
1131 if (exists $v->{meta}{mandatory}) { 1360 if (exists $v->{meta}{mandatory}) {
1132 warn $msg; 1361 warn $msg;
1133 warn "mandatory extension failed to load, exiting.\n"; 1362 cf::cleanup "mandatory extension failed to load, exiting.";
1134 exit 1;
1135 } 1363 }
1136 1364
1137 warn $msg; 1365 warn $msg;
1138 } 1366 }
1139 1367
1164use Coro::AIO; 1392use Coro::AIO;
1165 1393
1166=head3 cf::player 1394=head3 cf::player
1167 1395
1168=over 4 1396=over 4
1397
1398=item cf::player::num_playing
1399
1400Returns the official number of playing players, as per the Crossfire metaserver rules.
1401
1402=cut
1403
1404sub num_playing {
1405 scalar grep
1406 $_->ob->map
1407 && !$_->hidden
1408 && !$_->ob->flag (cf::FLAG_WIZ),
1409 cf::player::list
1410}
1169 1411
1170=item cf::player::find $login 1412=item cf::player::find $login
1171 1413
1172Returns the given player object, loading it if necessary (might block). 1414Returns the given player object, loading it if necessary (might block).
1173 1415
1209 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1451 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1210 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1452 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1211 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1453 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1212 aio_unlink +(playerdir $login) . "/$login.pl"; 1454 aio_unlink +(playerdir $login) . "/$login.pl";
1213 1455
1214 my $pl = load_pl path $login 1456 my $f = new_from_file cf::object::thawer path $login
1215 or return; 1457 or return;
1458
1459 my $pl = cf::player::load_pl $f
1460 or return;
1461
1462 local $cf::PLAYER_LOADING{$login} = $pl;
1463 $f->resolve_delayed_derefs;
1216 $cf::PLAYER{$login} = $pl 1464 $cf::PLAYER{$login} = $pl
1217 } 1465 }
1218 } 1466 }
1219} 1467}
1220 1468
1229 return if $pl->{deny_save}; 1477 return if $pl->{deny_save};
1230 1478
1231 aio_mkdir playerdir $pl, 0770; 1479 aio_mkdir playerdir $pl, 0770;
1232 $pl->{last_save} = $cf::RUNTIME; 1480 $pl->{last_save} = $cf::RUNTIME;
1233 1481
1482 cf::get_slot 0.01;
1483
1234 $pl->save_pl ($path); 1484 $pl->save_pl ($path);
1235 Coro::cede; 1485 cf::cede_to_tick;
1236} 1486}
1237 1487
1238sub new($) { 1488sub new($) {
1239 my ($login) = @_; 1489 my ($login) = @_;
1240 1490
1246 $cf::PLAYER{$login} = $self; 1496 $cf::PLAYER{$login} = $self;
1247 1497
1248 $self 1498 $self
1249} 1499}
1250 1500
1501=item $player->send_msg ($channel, $msg, $color, [extra...])
1502
1503=cut
1504
1505sub send_msg {
1506 my $ns = shift->ns
1507 or return;
1508 $ns->send_msg (@_);
1509}
1510
1251=item $pl->quit_character 1511=item $pl->quit_character
1252 1512
1253Nukes the player without looking back. If logged in, the connection will 1513Nukes the player without looking back. If logged in, the connection will
1254be destroyed. May block for a long time. 1514be destroyed. May block for a long time.
1255 1515
1263 $pl->{deny_save} = 1; 1523 $pl->{deny_save} = 1;
1264 $pl->password ("*"); # this should lock out the player until we nuked the dir 1524 $pl->password ("*"); # this should lock out the player until we nuked the dir
1265 1525
1266 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1526 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1267 $pl->deactivate; 1527 $pl->deactivate;
1528 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1529 $pl->ob->check_score;
1268 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1530 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1269 $pl->ns->destroy if $pl->ns; 1531 $pl->ns->destroy if $pl->ns;
1270 1532
1271 my $path = playerdir $pl; 1533 my $path = playerdir $pl;
1272 my $temp = "$path~$cf::RUNTIME~deleting~"; 1534 my $temp = "$path~$cf::RUNTIME~deleting~";
1308 or return []; 1570 or return [];
1309 1571
1310 my @logins; 1572 my @logins;
1311 1573
1312 for my $login (@$dirs) { 1574 for my $login (@$dirs) {
1575 my $path = path $login;
1576
1577 # a .pst is a dead give-away for a valid player
1578 # if no pst file found, open and chekc for blocked users
1579 if (aio_stat "$path.pst") {
1313 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1580 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1314 aio_read $fh, 0, 512, my $buf, 0 or next; 1581 aio_read $fh, 0, 512, my $buf, 0 or next;
1315 $buf !~ /^password -------------$/m or next; # official not-valid tag 1582 $buf !~ /^password -------------$/m or next; # official not-valid tag
1583 }
1316 1584
1317 utf8::decode $login; 1585 utf8::decode $login;
1318 push @logins, $login; 1586 push @logins, $login;
1319 } 1587 }
1320 1588
1347 } 1615 }
1348 1616
1349 \@paths 1617 \@paths
1350} 1618}
1351 1619
1620=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1621
1622Expand crossfire pod fragments into protocol xml.
1623
1624=cut
1625
1626use re 'eval';
1627
1628my $group;
1629my $interior; $interior = qr{
1630 # match a pod interior sequence sans C<< >>
1631 (?:
1632 \ (.*?)\ (?{ $group = $^N })
1633 | < (??{$interior}) >
1634 )
1635}x;
1636
1637sub expand_cfpod {
1638 my ($self, $pod) = @_;
1639
1640 my $xml;
1641
1642 while () {
1643 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1644 $group = $1;
1645
1646 $group =~ s/&/&amp;/g;
1647 $group =~ s/</&lt;/g;
1648
1649 $xml .= $group;
1650 } elsif ($pod =~ m%\G
1651 ([BCGHITU])
1652 <
1653 (?:
1654 ([^<>]*) (?{ $group = $^N })
1655 | < $interior >
1656 )
1657 >
1658 %gcsx
1659 ) {
1660 my ($code, $data) = ($1, $group);
1661
1662 if ($code eq "B") {
1663 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1664 } elsif ($code eq "I") {
1665 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1666 } elsif ($code eq "U") {
1667 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1668 } elsif ($code eq "C") {
1669 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1670 } elsif ($code eq "T") {
1671 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1672 } elsif ($code eq "G") {
1673 my ($male, $female) = split /\|/, $data;
1674 $data = $self->gender ? $female : $male;
1675 $xml .= expand_cfpod ($self, $data);
1676 } elsif ($code eq "H") {
1677 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1678 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1679 "")
1680 [$self->{hintmode}];
1681 } else {
1682 $xml .= "error processing '$code($data)' directive";
1683 }
1684 } else {
1685 if ($pod =~ /\G(.+)/) {
1686 warn "parse error while expanding $pod (at $1)";
1687 }
1688 last;
1689 }
1690 }
1691
1692 for ($xml) {
1693 # create single paragraphs (very hackish)
1694 s/(?<=\S)\n(?=\w)/ /g;
1695
1696 # compress some whitespace
1697 s/\s+\n/\n/g; # ws line-ends
1698 s/\n\n+/\n/g; # double lines
1699 s/^\n+//; # beginning lines
1700 s/\n+$//; # ending lines
1701 }
1702
1703 $xml
1704}
1705
1706no re 'eval';
1707
1708sub hintmode {
1709 $_[0]{hintmode} = $_[1] if @_ > 1;
1710 $_[0]{hintmode}
1711}
1712
1352=item $player->ext_reply ($msgid, %msg) 1713=item $player->ext_reply ($msgid, @msg)
1353 1714
1354Sends an ext reply to the player. 1715Sends an ext reply to the player.
1355 1716
1356=cut 1717=cut
1357 1718
1358sub ext_reply($$%) { 1719sub ext_reply($$@) {
1359 my ($self, $id, %msg) = @_; 1720 my ($self, $id, @msg) = @_;
1360 1721
1361 $msg{msgid} = $id; 1722 $self->ns->ext_reply ($id, @msg)
1362
1363 $self->send ("ext " . cf::to_json \%msg);
1364} 1723}
1365 1724
1366=item $player->ext_event ($type, %msg) 1725=item $player->ext_msg ($type, @msg)
1367 1726
1368Sends an ext event to the client. 1727Sends an ext event to the client.
1369 1728
1370=cut 1729=cut
1371 1730
1372sub ext_event($$%) { 1731sub ext_msg($$@) {
1373 my ($self, $type, %msg) = @_; 1732 my ($self, $type, @msg) = @_;
1374 1733
1375 $self->ns->ext_event ($type, %msg); 1734 $self->ns->ext_msg ($type, @msg);
1376} 1735}
1377 1736
1378=head3 cf::region 1737=head3 cf::region
1379 1738
1380=over 4 1739=over 4
1393 my ($path) = @_; 1752 my ($path) = @_;
1394 1753
1395 my ($match, $specificity); 1754 my ($match, $specificity);
1396 1755
1397 for my $region (list) { 1756 for my $region (list) {
1398 if ($region->match && $path =~ $region->match) { 1757 if ($region->{match} && $path =~ $region->{match}) {
1399 ($match, $specificity) = ($region, $region->specificity) 1758 ($match, $specificity) = ($region, $region->specificity)
1400 if $region->specificity > $specificity; 1759 if $region->specificity > $specificity;
1401 } 1760 }
1402 } 1761 }
1403 1762
1424our $MAX_RESET = 3600; 1783our $MAX_RESET = 3600;
1425our $DEFAULT_RESET = 3000; 1784our $DEFAULT_RESET = 3000;
1426 1785
1427sub generate_random_map { 1786sub generate_random_map {
1428 my ($self, $rmp) = @_; 1787 my ($self, $rmp) = @_;
1788
1789 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1790
1429 # mit "rum" bekleckern, nicht 1791 # mit "rum" bekleckern, nicht
1430 $self->_create_random_map ( 1792 $self->_create_random_map (
1431 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1793 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1432 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1794 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1433 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1795 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1523 $self->init; # pass $1 etc. 1885 $self->init; # pass $1 etc.
1524 return $self; 1886 return $self;
1525 } 1887 }
1526 } 1888 }
1527 1889
1528 Carp::carp "unable to resolve path '$path' (base '$base')."; 1890 Carp::cluck "unable to resolve path '$path' (base '$base').";
1529 () 1891 ()
1530} 1892}
1531 1893
1532sub init { 1894sub init {
1533 my ($self) = @_; 1895 my ($self) = @_;
1555 1917
1556# the temporary/swap location 1918# the temporary/swap location
1557sub save_path { 1919sub save_path {
1558 my ($self) = @_; 1920 my ($self) = @_;
1559 1921
1560 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1922 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1561 "$TMPDIR/$path.map" 1923 "$TMPDIR/$path.map"
1562} 1924}
1563 1925
1564# the unique path, undef == no special unique path 1926# the unique path, undef == no special unique path
1565sub uniq_path { 1927sub uniq_path {
1566 my ($self) = @_; 1928 my ($self) = @_;
1567 1929
1568 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1930 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1569 "$UNIQUEDIR/$path" 1931 "$UNIQUEDIR/$path"
1570} 1932}
1571 1933
1572# and all this just because we cannot iterate over 1934# and all this just because we cannot iterate over
1573# all maps in C++... 1935# all maps in C++...
1596 1958
1597sub load_header_from($) { 1959sub load_header_from($) {
1598 my ($self, $path) = @_; 1960 my ($self, $path) = @_;
1599 1961
1600 utf8::encode $path; 1962 utf8::encode $path;
1601 #aio_open $path, O_RDONLY, 0 1963 my $f = new_from_file cf::object::thawer $path
1602 # or return;
1603
1604 $self->_load_header ($path)
1605 or return; 1964 or return;
1965
1966 $self->_load_header ($f)
1967 or return;
1968
1969 local $MAP_LOADING{$self->{path}} = $self;
1970 $f->resolve_delayed_derefs;
1606 1971
1607 $self->{load_path} = $path; 1972 $self->{load_path} = $path;
1608 1973
1609 1 1974 1
1610} 1975}
1664sub find { 2029sub find {
1665 my ($path, $origin) = @_; 2030 my ($path, $origin) = @_;
1666 2031
1667 $path = normalise $path, $origin && $origin->path; 2032 $path = normalise $path, $origin && $origin->path;
1668 2033
2034 cf::lock_wait "map_data:$path";#d#remove
1669 cf::lock_wait "map_find:$path"; 2035 cf::lock_wait "map_find:$path";
1670 2036
1671 $cf::MAP{$path} || do { 2037 $cf::MAP{$path} || do {
2038 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1672 my $guard = cf::lock_acquire "map_find:$path"; 2039 my $guard2 = cf::lock_acquire "map_find:$path";
2040
1673 my $map = new_from_path cf::map $path 2041 my $map = new_from_path cf::map $path
1674 or return; 2042 or return;
1675 2043
1676 $map->{last_save} = $cf::RUNTIME; 2044 $map->{last_save} = $cf::RUNTIME;
1677 2045
1679 or return; 2047 or return;
1680 2048
1681 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2049 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1682 # doing this can freeze the server in a sync job, obviously 2050 # doing this can freeze the server in a sync job, obviously
1683 #$cf::WAIT_FOR_TICK->wait; 2051 #$cf::WAIT_FOR_TICK->wait;
2052 undef $guard2;
2053 undef $guard1;
1684 $map->reset; 2054 $map->reset;
1685 undef $guard;
1686 return find $path; 2055 return find $path;
1687 } 2056 }
1688 2057
1689 $cf::MAP{$path} = $map 2058 $cf::MAP{$path} = $map
1690 } 2059 }
1699 local $self->{deny_reset} = 1; # loading can take a long time 2068 local $self->{deny_reset} = 1; # loading can take a long time
1700 2069
1701 my $path = $self->{path}; 2070 my $path = $self->{path};
1702 2071
1703 { 2072 {
1704 my $guard = cf::lock_acquire "map_load:$path"; 2073 my $guard = cf::lock_acquire "map_data:$path";
1705 2074
2075 return unless $self->valid;
1706 return if $self->in_memory != cf::MAP_SWAPPED; 2076 return unless $self->in_memory == cf::MAP_SWAPPED;
1707 2077
1708 $self->in_memory (cf::MAP_LOADING); 2078 $self->in_memory (cf::MAP_LOADING);
1709 2079
1710 $self->alloc; 2080 $self->alloc;
1711 2081
1712 $self->pre_load; 2082 $self->pre_load;
1713 Coro::cede; 2083 cf::cede_to_tick;
1714 2084
2085 my $f = new_from_file cf::object::thawer $self->{load_path};
2086 $f->skip_block;
1715 $self->_load_objects ($self->{load_path}, 1) 2087 $self->_load_objects ($f)
1716 or return; 2088 or return;
1717 2089
1718 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2090 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1719 if delete $self->{load_original}; 2091 if delete $self->{load_original};
1720 2092
1721 if (my $uniq = $self->uniq_path) { 2093 if (my $uniq = $self->uniq_path) {
1722 utf8::encode $uniq; 2094 utf8::encode $uniq;
1723 if (aio_open $uniq, O_RDONLY, 0) { 2095 unless (aio_stat $uniq) {
2096 if (my $f = new_from_file cf::object::thawer $uniq) {
1724 $self->clear_unique_items; 2097 $self->clear_unique_items;
1725 $self->_load_objects ($uniq, 0); 2098 $self->_load_objects ($f);
2099 $f->resolve_delayed_derefs;
2100 }
1726 } 2101 }
1727 } 2102 }
1728 2103
1729 Coro::cede; 2104 $f->resolve_delayed_derefs;
2105
2106 cf::cede_to_tick;
1730 # now do the right thing for maps 2107 # now do the right thing for maps
1731 $self->link_multipart_objects; 2108 $self->link_multipart_objects;
1732 $self->difficulty ($self->estimate_difficulty) 2109 $self->difficulty ($self->estimate_difficulty)
1733 unless $self->difficulty; 2110 unless $self->difficulty;
1734 Coro::cede; 2111 cf::cede_to_tick;
1735 2112
1736 unless ($self->{deny_activate}) { 2113 unless ($self->{deny_activate}) {
1737 $self->decay_objects; 2114 $self->decay_objects;
1738 $self->fix_auto_apply; 2115 $self->fix_auto_apply;
1739 $self->update_buttons; 2116 $self->update_buttons;
1740 Coro::cede; 2117 cf::cede_to_tick;
1741 $self->set_darkness_map; 2118 $self->set_darkness_map;
1742 Coro::cede; 2119 cf::cede_to_tick;
1743 $self->activate; 2120 $self->activate;
1744 } 2121 }
1745 2122
2123 $self->{last_save} = $cf::RUNTIME;
2124 $self->last_access ($cf::RUNTIME);
2125
1746 $self->in_memory (cf::MAP_IN_MEMORY); 2126 $self->in_memory (cf::MAP_ACTIVE);
1747 } 2127 }
1748 2128
1749 $self->post_load; 2129 $self->post_load;
1750} 2130}
1751 2131
1760 2140
1761 $self 2141 $self
1762} 2142}
1763 2143
1764# find and load all maps in the 3x3 area around a map 2144# find and load all maps in the 3x3 area around a map
1765sub load_diag { 2145sub load_neighbours {
1766 my ($map) = @_; 2146 my ($map) = @_;
1767 2147
1768 my @diag; # diagonal neighbours 2148 my @neigh; # diagonal neighbours
1769 2149
1770 for (0 .. 3) { 2150 for (0 .. 3) {
1771 my $neigh = $map->tile_path ($_) 2151 my $neigh = $map->tile_path ($_)
1772 or next; 2152 or next;
1773 $neigh = find $neigh, $map 2153 $neigh = find $neigh, $map
1774 or next; 2154 or next;
1775 $neigh->load; 2155 $neigh->load;
1776 2156
2157 push @neigh,
1777 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2158 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1778 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2159 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1779 } 2160 }
1780 2161
1781 for (@diag) { 2162 for (grep defined $_->[0], @neigh) {
2163 my ($path, $origin) = @$_;
1782 my $neigh = find @$_ 2164 my $neigh = find $path, $origin
1783 or next; 2165 or next;
1784 $neigh->load; 2166 $neigh->load;
1785 } 2167 }
1786} 2168}
1787 2169
1792} 2174}
1793 2175
1794sub do_load_sync { 2176sub do_load_sync {
1795 my ($map) = @_; 2177 my ($map) = @_;
1796 2178
2179 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2180 if $Coro::current == $Coro::main;
2181
1797 cf::sync_job { $map->load }; 2182 cf::sync_job { $map->load };
1798} 2183}
1799 2184
1800our %MAP_PREFETCH; 2185our %MAP_PREFETCH;
1801our $MAP_PREFETCHER = undef; 2186our $MAP_PREFETCHER = undef;
1802 2187
1803sub find_async { 2188sub find_async {
1804 my ($path, $origin) = @_; 2189 my ($path, $origin, $load) = @_;
1805 2190
1806 $path = normalise $path, $origin && $origin->{path}; 2191 $path = normalise $path, $origin && $origin->{path};
1807 2192
1808 if (my $map = $cf::MAP{$path}) { 2193 if (my $map = $cf::MAP{$path}) {
1809 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2194 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1810 } 2195 }
1811 2196
1812 undef $MAP_PREFETCH{$path}; 2197 $MAP_PREFETCH{$path} |= $load;
2198
1813 $MAP_PREFETCHER ||= cf::async { 2199 $MAP_PREFETCHER ||= cf::async {
2200 $Coro::current->{desc} = "map prefetcher";
2201
1814 while (%MAP_PREFETCH) { 2202 while (%MAP_PREFETCH) {
1815 for my $path (keys %MAP_PREFETCH) { 2203 while (my ($k, $v) = each %MAP_PREFETCH) {
1816 my $map = find $path 2204 if (my $map = find $k) {
1817 or next;
1818 $map->load; 2205 $map->load if $v;
2206 }
1819 2207
1820 delete $MAP_PREFETCH{$path}; 2208 delete $MAP_PREFETCH{$k};
1821 } 2209 }
1822 } 2210 }
1823 undef $MAP_PREFETCHER; 2211 undef $MAP_PREFETCHER;
1824 }; 2212 };
1825 $MAP_PREFETCHER->prio (6); 2213 $MAP_PREFETCHER->prio (6);
1828} 2216}
1829 2217
1830sub save { 2218sub save {
1831 my ($self) = @_; 2219 my ($self) = @_;
1832 2220
1833 my $lock = cf::lock_acquire "map_data:" . $self->path; 2221 my $lock = cf::lock_acquire "map_data:$self->{path}";
1834 2222
1835 $self->{last_save} = $cf::RUNTIME; 2223 $self->{last_save} = $cf::RUNTIME;
1836 2224
1837 return unless $self->dirty; 2225 return unless $self->dirty;
1838 2226
1844 return if $self->{deny_save}; 2232 return if $self->{deny_save};
1845 2233
1846 local $self->{last_access} = $self->last_access;#d# 2234 local $self->{last_access} = $self->last_access;#d#
1847 2235
1848 cf::async { 2236 cf::async {
2237 $Coro::current->{desc} = "map player save";
1849 $_->contr->save for $self->players; 2238 $_->contr->save for $self->players;
1850 }; 2239 };
2240
2241 cf::get_slot 0.02;
1851 2242
1852 if ($uniq) { 2243 if ($uniq) {
1853 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2244 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1854 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2245 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1855 } else { 2246 } else {
1861 my ($self) = @_; 2252 my ($self) = @_;
1862 2253
1863 # save first because save cedes 2254 # save first because save cedes
1864 $self->save; 2255 $self->save;
1865 2256
1866 my $lock = cf::lock_acquire "map_data:" . $self->path; 2257 my $lock = cf::lock_acquire "map_data:$self->{path}";
1867 2258
1868 return if $self->players; 2259 return if $self->players;
1869 return if $self->in_memory != cf::MAP_IN_MEMORY; 2260 return if $self->in_memory != cf::MAP_ACTIVE;
1870 return if $self->{deny_save}; 2261 return if $self->{deny_save};
1871 2262
2263 $self->in_memory (cf::MAP_SWAPPED);
2264
2265 $self->deactivate;
2266 $_->clear_links_to ($self) for values %cf::MAP;
1872 $self->clear; 2267 $self->clear;
1873 $self->in_memory (cf::MAP_SWAPPED);
1874} 2268}
1875 2269
1876sub reset_at { 2270sub reset_at {
1877 my ($self) = @_; 2271 my ($self) = @_;
1878 2272
1910 if $uniq; 2304 if $uniq;
1911 } 2305 }
1912 2306
1913 delete $cf::MAP{$self->path}; 2307 delete $cf::MAP{$self->path};
1914 2308
2309 $self->deactivate;
2310 $_->clear_links_to ($self) for values %cf::MAP;
1915 $self->clear; 2311 $self->clear;
1916
1917 $_->clear_links_to ($self) for values %cf::MAP;
1918 2312
1919 $self->unlink_save; 2313 $self->unlink_save;
1920 $self->destroy; 2314 $self->destroy;
1921} 2315}
1922 2316
1923my $nuke_counter = "aaaa"; 2317my $nuke_counter = "aaaa";
1924 2318
1925sub nuke { 2319sub nuke {
1926 my ($self) = @_; 2320 my ($self) = @_;
1927 2321
2322 {
2323 my $lock = cf::lock_acquire "map_data:$self->{path}";
2324
1928 delete $cf::MAP{$self->path}; 2325 delete $cf::MAP{$self->path};
1929 2326
1930 $self->unlink_save; 2327 $self->unlink_save;
1931 2328
1932 bless $self, "cf::map"; 2329 bless $self, "cf::map";
1933 delete $self->{deny_reset}; 2330 delete $self->{deny_reset};
1934 $self->{deny_save} = 1; 2331 $self->{deny_save} = 1;
1935 $self->reset_timeout (1); 2332 $self->reset_timeout (1);
1936 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2333 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1937 2334
1938 $cf::MAP{$self->path} = $self; 2335 $cf::MAP{$self->path} = $self;
2336 }
1939 2337
1940 $self->reset; # polite request, might not happen 2338 $self->reset; # polite request, might not happen
1941} 2339}
1942 2340
1943=item $maps = cf::map::tmp_maps 2341=item $maps = cf::map::tmp_maps
1985 2383
1986sub unique_maps() { 2384sub unique_maps() {
1987 [ 2385 [
1988 map { 2386 map {
1989 utf8::decode $_; 2387 utf8::decode $_;
1990 /\.map$/ 2388 s/\.map$//; # TODO future compatibility hack
2389 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2390 ? ()
1991 ? normalise $_ 2391 : normalise $_
1992 : ()
1993 } @{ aio_readdir $UNIQUEDIR or [] } 2392 } @{ aio_readdir $UNIQUEDIR or [] }
1994 ] 2393 ]
1995} 2394}
1996 2395
1997package cf;
1998
1999=back 2396=back
2000 2397
2001=head3 cf::object 2398=head3 cf::object
2002 2399
2003=cut 2400=cut
2006 2403
2007=over 4 2404=over 4
2008 2405
2009=item $ob->inv_recursive 2406=item $ob->inv_recursive
2010 2407
2011Returns the inventory of the object _and_ their inventories, recursively. 2408Returns the inventory of the object I<and> their inventories, recursively,
2409but I<not> the object itself.
2012 2410
2013=cut 2411=cut
2014 2412
2015sub inv_recursive_; 2413sub inv_recursive_;
2016sub inv_recursive_ { 2414sub inv_recursive_ {
2019 2417
2020sub inv_recursive { 2418sub inv_recursive {
2021 inv_recursive_ inv $_[0] 2419 inv_recursive_ inv $_[0]
2022} 2420}
2023 2421
2422=item $ref = $ob->ref
2423
2424Creates and returns a persistent reference to an object that can be stored as a string.
2425
2426=item $ob = cf::object::deref ($refstring)
2427
2428returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2429even if the object actually exists. May block.
2430
2431=cut
2432
2433sub deref {
2434 my ($ref) = @_;
2435
2436 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2437 my ($uuid, $name) = ($1, $2);
2438 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2439 or return;
2440 $pl->ob->uuid eq $uuid
2441 or return;
2442
2443 $pl->ob
2444 } else {
2445 warn "$ref: cannot resolve object reference\n";
2446 undef
2447 }
2448}
2449
2024package cf; 2450package cf;
2025 2451
2026=back 2452=back
2027 2453
2028=head3 cf::object::player 2454=head3 cf::object::player
2034Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2460Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2035can be C<undef>. Does the right thing when the player is currently in a 2461can be C<undef>. Does the right thing when the player is currently in a
2036dialogue with the given NPC character. 2462dialogue with the given NPC character.
2037 2463
2038=cut 2464=cut
2465
2466our $SAY_CHANNEL = {
2467 id => "say",
2468 title => "Map",
2469 reply => "say ",
2470 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2471};
2472
2473our $CHAT_CHANNEL = {
2474 id => "chat",
2475 title => "Chat",
2476 reply => "chat ",
2477 tooltip => "Player chat and shouts, global to the server.",
2478};
2039 2479
2040# rough implementation of a future "reply" method that works 2480# rough implementation of a future "reply" method that works
2041# with dialog boxes. 2481# with dialog boxes.
2042#TODO: the first argument must go, split into a $npc->reply_to ( method 2482#TODO: the first argument must go, split into a $npc->reply_to ( method
2043sub cf::object::player::reply($$$;$) { 2483sub cf::object::player::reply($$$;$) {
2050 2490
2051 } else { 2491 } else {
2052 my $pl = $self->contr; 2492 my $pl = $self->contr;
2053 2493
2054 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2494 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2055 my $diag = $pl->{npc_dialog}; 2495 my $dialog = $pl->{npc_dialog};
2056 $diag->{pl}->ext_reply ( 2496 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2057 $diag->{id}, msgtype => "reply", msg => $msg, add_topics => []
2058 );
2059 2497
2060 } else { 2498 } else {
2061 $msg = $npc->name . " says: $msg" if $npc; 2499 $msg = $npc->name . " says: $msg" if $npc;
2062 $self->message ($msg, $flags); 2500 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2063 } 2501 }
2064 } 2502 }
2503}
2504
2505=item $object->send_msg ($channel, $msg, $color, [extra...])
2506
2507=cut
2508
2509sub cf::object::send_msg {
2510 my $pl = shift->contr
2511 or return;
2512 $pl->send_msg (@_);
2065} 2513}
2066 2514
2067=item $player_object->may ("access") 2515=item $player_object->may ("access")
2068 2516
2069Returns wether the given player is authorized to access resource "access" 2517Returns wether the given player is authorized to access resource "access"
2148 # use -1 or undef as default coordinates, not 0, 0 2596 # use -1 or undef as default coordinates, not 0, 0
2149 ($x, $y) = ($map->enter_x, $map->enter_y) 2597 ($x, $y) = ($map->enter_x, $map->enter_y)
2150 if $x <=0 && $y <= 0; 2598 if $x <=0 && $y <= 0;
2151 2599
2152 $map->load; 2600 $map->load;
2153 $map->load_diag; 2601 $map->load_neighbours;
2154 2602
2155 return unless $self->contr->active; 2603 return unless $self->contr->active;
2156 $self->activate_recursive; 2604 $self->activate_recursive;
2157 2605
2158 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2606 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2159 $self->enter_map ($map, $x, $y); 2607 $self->enter_map ($map, $x, $y);
2160} 2608}
2161 2609
2162=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2610=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2163 2611
2164Moves the player to the given map-path and coordinates by first freezing 2612Moves the player to the given map-path and coordinates by first freezing
2165her, loading and preparing them map, calling the provided $check callback 2613her, loading and preparing them map, calling the provided $check callback
2166that has to return the map if sucecssful, and then unfreezes the player on 2614that has to return the map if sucecssful, and then unfreezes the player on
2167the new (success) or old (failed) map position. 2615the new (success) or old (failed) map position. In either case, $done will
2616be called at the end of this process.
2168 2617
2169=cut 2618=cut
2170 2619
2171our $GOTOGEN; 2620our $GOTOGEN;
2172 2621
2173sub cf::object::player::goto { 2622sub cf::object::player::goto {
2174 my ($self, $path, $x, $y, $check) = @_; 2623 my ($self, $path, $x, $y, $check, $done) = @_;
2175 2624
2176 # do generation counting so two concurrent goto's will be executed in-order 2625 # do generation counting so two concurrent goto's will be executed in-order
2177 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2626 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2178 2627
2179 $self->enter_link; 2628 $self->enter_link;
2180 2629
2181 (async { 2630 (async {
2631 $Coro::current->{desc} = "player::goto $path $x $y";
2632
2633 # *tag paths override both path and x|y
2634 if ($path =~ /^\*(.*)$/) {
2635 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2636 my $ob = $obs[rand @obs];
2637
2638 # see if we actually can go there
2639 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2640 $ob = $obs[rand @obs];
2641 } else {
2642 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2643 }
2644 # else put us there anyways for now #d#
2645
2646 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2647 } else {
2648 ($path, $x, $y) = (undef, undef, undef);
2649 }
2650 }
2651
2182 my $map = eval { 2652 my $map = eval {
2183 my $map = cf::map::find $path; 2653 my $map = defined $path ? cf::map::find $path : undef;
2184 2654
2185 if ($map) { 2655 if ($map) {
2186 $map = $map->customise_for ($self); 2656 $map = $map->customise_for ($self);
2187 $map = $check->($map) if $check && $map; 2657 $map = $check->($map) if $check && $map;
2188 } else { 2658 } else {
2189 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2659 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2190 } 2660 }
2191 2661
2192 $map 2662 $map
2193 }; 2663 };
2194 2664
2199 2669
2200 if ($gen == $self->{_goto_generation}) { 2670 if ($gen == $self->{_goto_generation}) {
2201 delete $self->{_goto_generation}; 2671 delete $self->{_goto_generation};
2202 $self->leave_link ($map, $x, $y); 2672 $self->leave_link ($map, $x, $y);
2203 } 2673 }
2674
2675 $done->() if $done;
2204 })->prio (1); 2676 })->prio (1);
2205} 2677}
2206 2678
2207=item $player_object->enter_exit ($exit_object) 2679=item $player_object->enter_exit ($exit_object)
2208 2680
2228} 2700}
2229 2701
2230sub prepare_random_map { 2702sub prepare_random_map {
2231 my ($exit) = @_; 2703 my ($exit) = @_;
2232 2704
2233 my $guard = cf::lock_acquire "exit_prepare:$exit";
2234
2235 # all this does is basically replace the /! path by 2705 # all this does is basically replace the /! path by
2236 # a new random map path (?random/...) with a seed 2706 # a new random map path (?random/...) with a seed
2237 # that depends on the exit object 2707 # that depends on the exit object
2238 2708
2239 my $rmp = parse_random_map_params $exit->msg; 2709 my $rmp = parse_random_map_params $exit->msg;
2241 if ($exit->map) { 2711 if ($exit->map) {
2242 $rmp->{region} = $exit->region->name; 2712 $rmp->{region} = $exit->region->name;
2243 $rmp->{origin_map} = $exit->map->path; 2713 $rmp->{origin_map} = $exit->map->path;
2244 $rmp->{origin_x} = $exit->x; 2714 $rmp->{origin_x} = $exit->x;
2245 $rmp->{origin_y} = $exit->y; 2715 $rmp->{origin_y} = $exit->y;
2716
2717 $exit->map->touch;
2246 } 2718 }
2247 2719
2248 $rmp->{random_seed} ||= $exit->random_seed; 2720 $rmp->{random_seed} ||= $exit->random_seed;
2249 2721
2250 my $data = cf::to_json $rmp; 2722 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2251 my $md5 = Digest::MD5::md5_hex $data; 2723 my $md5 = Digest::MD5::md5_hex $data;
2252 my $meta = "$RANDOMDIR/$md5.meta"; 2724 my $meta = "$RANDOMDIR/$md5.meta";
2253 2725
2254 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2726 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2255 aio_write $fh, 0, (length $data), $data, 0; 2727 aio_write $fh, 0, (length $data), $data, 0;
2256 undef $fh; 2728 undef $fh;
2257 aio_rename "$meta~", $meta; 2729 aio_rename "$meta~", $meta;
2258 2730
2731 my $slaying = "?random/$md5";
2732
2733 if ($exit->valid) {
2259 $exit->slaying ("?random/$md5"); 2734 $exit->slaying ("?random/$md5");
2260 $exit->msg (undef); 2735 $exit->msg (undef);
2736 }
2261 } 2737 }
2262} 2738}
2263 2739
2264sub cf::object::player::enter_exit { 2740sub cf::object::player::enter_exit {
2265 my ($self, $exit) = @_; 2741 my ($self, $exit) = @_;
2266 2742
2267 return unless $self->type == cf::PLAYER; 2743 return unless $self->type == cf::PLAYER;
2268 2744
2269 if ($exit->slaying eq "/!") {
2270 #TODO: this should de-fi-ni-te-ly not be a sync-job
2271 # the problem is that $exit might not survive long enough
2272 # so it needs to be done right now, right here
2273 cf::sync_job { prepare_random_map $exit };
2274 }
2275
2276 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2277 my $hp = $exit->stats->hp;
2278 my $sp = $exit->stats->sp;
2279
2280 $self->enter_link; 2745 $self->enter_link;
2281 2746
2282 (async { 2747 (async {
2283 $self->deactivate_recursive; # just to be sure 2748 $Coro::current->{desc} = "enter_exit";
2749
2284 unless (eval { 2750 unless (eval {
2751 $self->deactivate_recursive; # just to be sure
2752
2753 # random map handling
2754 {
2755 my $guard = cf::lock_acquire "exit_prepare:$exit";
2756
2757 prepare_random_map $exit
2758 if $exit->slaying eq "/!";
2759 }
2760
2761 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2762 my $x = $exit->stats->hp;
2763 my $y = $exit->stats->sp;
2764
2285 $self->goto ($slaying, $hp, $sp); 2765 $self->goto ($map, $x, $y);
2286 2766
2767 # if exit is damned, update players death & WoR home-position
2768 $self->contr->savebed ($map, $x, $y)
2769 if $exit->flag (cf::FLAG_DAMNED);
2770
2287 1; 2771 1
2288 }) { 2772 }) {
2289 $self->message ("Something went wrong deep within the crossfire server. " 2773 $self->message ("Something went wrong deep within the crossfire server. "
2290 . "I'll try to bring you back to the map you were before. " 2774 . "I'll try to bring you back to the map you were before. "
2291 . "Please report this to the dungeon master!", 2775 . "Please report this to the dungeon master!",
2292 cf::NDI_UNIQUE | cf::NDI_RED); 2776 cf::NDI_UNIQUE | cf::NDI_RED);
2313 2797
2314 utf8::encode $text; 2798 utf8::encode $text;
2315 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2799 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2316} 2800}
2317 2801
2802=item $client->send_msg ($channel, $msg, $color, [extra...])
2803
2804Send a drawinfo or msg packet to the client, formatting the msg for the
2805client if neccessary. C<$type> should be a string identifying the type of
2806the message, with C<log> being the default. If C<$color> is negative, suppress
2807the message unless the client supports the msg packet.
2808
2809=cut
2810
2811# non-persistent channels (usually the info channel)
2812our %CHANNEL = (
2813 "c/identify" => {
2814 id => "infobox",
2815 title => "Identify",
2816 reply => undef,
2817 tooltip => "Items recently identified",
2818 },
2819 "c/examine" => {
2820 id => "infobox",
2821 title => "Examine",
2822 reply => undef,
2823 tooltip => "Signs and other items you examined",
2824 },
2825 "c/book" => {
2826 id => "infobox",
2827 title => "Book",
2828 reply => undef,
2829 tooltip => "The contents of a note or book",
2830 },
2831 "c/lookat" => {
2832 id => "infobox",
2833 title => "Look",
2834 reply => undef,
2835 tooltip => "What you saw there",
2836 },
2837 "c/who" => {
2838 id => "infobox",
2839 title => "Players",
2840 reply => undef,
2841 tooltip => "Shows players who are currently online",
2842 },
2843 "c/body" => {
2844 id => "infobox",
2845 title => "Body Parts",
2846 reply => undef,
2847 tooltip => "Shows which body parts you posess and are available",
2848 },
2849 "c/uptime" => {
2850 id => "infobox",
2851 title => "Uptime",
2852 reply => undef,
2853 tooltip => "How long the server has been running since last restart",
2854 },
2855 "c/mapinfo" => {
2856 id => "infobox",
2857 title => "Map Info",
2858 reply => undef,
2859 tooltip => "Information related to the maps",
2860 },
2861 "c/party" => {
2862 id => "party",
2863 title => "Party",
2864 reply => "gsay ",
2865 tooltip => "Messages and chat related to your party",
2866 },
2867);
2868
2869sub cf::client::send_msg {
2870 my ($self, $channel, $msg, $color, @extra) = @_;
2871
2872 $msg = $self->pl->expand_cfpod ($msg);
2873
2874 $color &= cf::NDI_CLIENT_MASK; # just in case...
2875
2876 # check predefined channels, for the benefit of C
2877 if ($CHANNEL{$channel}) {
2878 $channel = $CHANNEL{$channel};
2879
2880 $self->ext_msg (channel_info => $channel)
2881 if $self->can_msg;
2882
2883 $channel = $channel->{id};
2884
2885 } elsif (ref $channel) {
2886 # send meta info to client, if not yet sent
2887 unless (exists $self->{channel}{$channel->{id}}) {
2888 $self->{channel}{$channel->{id}} = $channel;
2889 $self->ext_msg (channel_info => $channel)
2890 if $self->can_msg;
2891 }
2892
2893 $channel = $channel->{id};
2894 }
2895
2896 return unless @extra || length $msg;
2897
2898 if ($self->can_msg) {
2899 # default colour, mask it out
2900 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2901 if $color & cf::NDI_DEF;
2902
2903 $self->send_packet ("msg " . $self->{json_coder}->encode (
2904 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2905 } else {
2906 if ($color >= 0) {
2907 # replace some tags by gcfclient-compatible ones
2908 for ($msg) {
2909 1 while
2910 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2911 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2912 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2913 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2914 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2915 }
2916
2917 $color &= cf::NDI_COLOR_MASK;
2918
2919 utf8::encode $msg;
2920
2921 if (0 && $msg =~ /\[/) {
2922 # COMMAND/INFO
2923 $self->send_packet ("drawextinfo $color 10 8 $msg")
2924 } else {
2925 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2926 $self->send_packet ("drawinfo $color $msg")
2927 }
2928 }
2929 }
2930}
2931
2318=item $client->ext_event ($type, %msg) 2932=item $client->ext_msg ($type, @msg)
2319 2933
2320Sends an exti event to the client. 2934Sends an ext event to the client.
2321 2935
2322=cut 2936=cut
2323 2937
2324sub cf::client::ext_event($$%) { 2938sub cf::client::ext_msg($$@) {
2325 my ($self, $type, %msg) = @_; 2939 my ($self, $type, @msg) = @_;
2326 2940
2941 if ($self->extcmd == 2) {
2942 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2943 } elsif ($self->extcmd == 1) { # TODO: remove
2327 $msg{msgtype} = "event_$type"; 2944 push @msg, msgtype => "event_$type";
2328 $self->send_packet ("ext " . cf::to_json \%msg); 2945 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2946 }
2947}
2948
2949=item $client->ext_reply ($msgid, @msg)
2950
2951Sends an ext reply to the client.
2952
2953=cut
2954
2955sub cf::client::ext_reply($$@) {
2956 my ($self, $id, @msg) = @_;
2957
2958 if ($self->extcmd == 2) {
2959 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2960 } elsif ($self->extcmd == 1) {
2961 #TODO: version 1, remove
2962 unshift @msg, msgtype => "reply", msgid => $id;
2963 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2964 }
2329} 2965}
2330 2966
2331=item $success = $client->query ($flags, "text", \&cb) 2967=item $success = $client->query ($flags, "text", \&cb)
2332 2968
2333Queues a query to the client, calling the given callback with 2969Queues a query to the client, calling the given callback with
2334the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2970the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2335C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2971C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2336 2972
2337Queries can fail, so check the return code. Or don't, as queries will become 2973Queries can fail, so check the return code. Or don't, as queries will
2338reliable at some point in the future. 2974become reliable at some point in the future.
2339 2975
2340=cut 2976=cut
2341 2977
2342sub cf::client::query { 2978sub cf::client::query {
2343 my ($self, $flags, $text, $cb) = @_; 2979 my ($self, $flags, $text, $cb) = @_;
2351 utf8::encode $text; 2987 utf8::encode $text;
2352 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2988 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2353 2989
2354 $self->send_packet ($self->{query_queue}[0][0]) 2990 $self->send_packet ($self->{query_queue}[0][0])
2355 if @{ $self->{query_queue} } == 1; 2991 if @{ $self->{query_queue} } == 1;
2992
2993 1
2356} 2994}
2357 2995
2358cf::client->attach ( 2996cf::client->attach (
2997 on_connect => sub {
2998 my ($ns) = @_;
2999
3000 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
3001 },
2359 on_reply => sub { 3002 on_reply => sub {
2360 my ($ns, $msg) = @_; 3003 my ($ns, $msg) = @_;
2361 3004
2362 # this weird shuffling is so that direct followup queries 3005 # this weird shuffling is so that direct followup queries
2363 # get handled first 3006 # get handled first
2375 } else { 3018 } else {
2376 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 3019 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2377 } 3020 }
2378 } 3021 }
2379 }, 3022 },
3023 on_exticmd => sub {
3024 my ($ns, $buf) = @_;
3025
3026 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3027
3028 if (ref $msg) {
3029 my ($type, $reply, @payload) =
3030 "ARRAY" eq ref $msg
3031 ? @$msg
3032 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3033
3034 my @reply;
3035
3036 if (my $cb = $EXTICMD{$type}) {
3037 @reply = $cb->($ns, @payload);
3038 }
3039
3040 $ns->ext_reply ($reply, @reply)
3041 if $reply;
3042
3043 } else {
3044 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3045 }
3046
3047 cf::override;
3048 },
2380); 3049);
2381 3050
2382=item $client->async (\&cb) 3051=item $client->async (\&cb)
2383 3052
2384Create a new coroutine, running the specified callback. The coroutine will 3053Create a new coroutine, running the specified callback. The coroutine will
2425our $safe = new Safe "safe"; 3094our $safe = new Safe "safe";
2426our $safe_hole = new Safe::Hole; 3095our $safe_hole = new Safe::Hole;
2427 3096
2428$SIG{FPE} = 'IGNORE'; 3097$SIG{FPE} = 'IGNORE';
2429 3098
2430$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3099$safe->permit_only (Opcode::opset qw(
3100 :base_core :base_mem :base_orig :base_math
3101 grepstart grepwhile mapstart mapwhile
3102 sort time
3103));
2431 3104
2432# here we export the classes and methods available to script code 3105# here we export the classes and methods available to script code
2433 3106
2434=pod 3107=pod
2435 3108
2436The following functions and methods are available within a safe environment: 3109The following functions and methods are available within a safe environment:
2437 3110
2438 cf::object contr pay_amount pay_player map 3111 cf::object
3112 contr pay_amount pay_player map x y force_find force_add destroy
3113 insert remove name archname title slaying race decrease split
3114
2439 cf::object::player player 3115 cf::object::player
2440 cf::player peaceful 3116 player
2441 cf::map trigger 3117
3118 cf::player
3119 peaceful
3120
3121 cf::map
3122 trigger
2442 3123
2443=cut 3124=cut
2444 3125
2445for ( 3126for (
2446 ["cf::object" => qw(contr pay_amount pay_player map)], 3127 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3128 insert remove inv nrof name archname title slaying race
3129 decrease split destroy)],
2447 ["cf::object::player" => qw(player)], 3130 ["cf::object::player" => qw(player)],
2448 ["cf::player" => qw(peaceful)], 3131 ["cf::player" => qw(peaceful)],
2449 ["cf::map" => qw(trigger)], 3132 ["cf::map" => qw(trigger)],
2450) { 3133) {
2451 no strict 'refs'; 3134 no strict 'refs';
2527# the server's init and main functions 3210# the server's init and main functions
2528 3211
2529sub load_facedata($) { 3212sub load_facedata($) {
2530 my ($path) = @_; 3213 my ($path) = @_;
2531 3214
3215 # HACK to clear player env face cache, we need some signal framework
3216 # for this (global event?)
3217 %ext::player_env::MUSIC_FACE_CACHE = ();
3218
3219 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3220
2532 warn "loading facedata from $path\n"; 3221 warn "loading facedata from $path\n";
2533 3222
2534 my $facedata; 3223 my $facedata;
2535 0 < aio_load $path, $facedata 3224 0 < aio_load $path, $facedata
2536 or die "$path: $!"; 3225 or die "$path: $!";
2538 $facedata = Coro::Storable::thaw $facedata; 3227 $facedata = Coro::Storable::thaw $facedata;
2539 3228
2540 $facedata->{version} == 2 3229 $facedata->{version} == 2
2541 or cf::cleanup "$path: version mismatch, cannot proceed."; 3230 or cf::cleanup "$path: version mismatch, cannot proceed.";
2542 3231
3232 # patch in the exptable
3233 $facedata->{resource}{"res/exp_table"} = {
3234 type => FT_RSRC,
3235 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3236 };
3237 cf::cede_to_tick;
3238
2543 { 3239 {
2544 my $faces = $facedata->{faceinfo}; 3240 my $faces = $facedata->{faceinfo};
2545 3241
2546 while (my ($face, $info) = each %$faces) { 3242 while (my ($face, $info) = each %$faces) {
2547 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3243 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3244
2548 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3245 cf::face::set_visibility $idx, $info->{visibility};
3246 cf::face::set_magicmap $idx, $info->{magicmap};
2549 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3247 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2550 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3248 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2551 Coro::cede; 3249
3250 cf::cede_to_tick;
2552 } 3251 }
2553 3252
2554 while (my ($face, $info) = each %$faces) { 3253 while (my ($face, $info) = each %$faces) {
2555 next unless $info->{smooth}; 3254 next unless $info->{smooth};
3255
2556 my $idx = cf::face::find $face 3256 my $idx = cf::face::find $face
2557 or next; 3257 or next;
3258
2558 if (my $smooth = cf::face::find $info->{smooth}) { 3259 if (my $smooth = cf::face::find $info->{smooth}) {
3260 cf::face::set_smooth $idx, $smooth;
2559 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3261 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2560 } else { 3262 } else {
2561 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3263 warn "smooth face '$info->{smooth}' not found for face '$face'";
2562 } 3264 }
2563 Coro::cede; 3265
3266 cf::cede_to_tick;
2564 } 3267 }
2565 } 3268 }
2566 3269
2567 { 3270 {
2568 my $anims = $facedata->{animinfo}; 3271 my $anims = $facedata->{animinfo};
2569 3272
2570 while (my ($anim, $info) = each %$anims) { 3273 while (my ($anim, $info) = each %$anims) {
2571 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3274 cf::anim::set $anim, $info->{frames}, $info->{facings};
2572 Coro::cede; 3275 cf::cede_to_tick;
2573 } 3276 }
2574 3277
2575 cf::anim::invalidate_all; # d'oh 3278 cf::anim::invalidate_all; # d'oh
2576 } 3279 }
2577 3280
3281 {
3282 # TODO: for gcfclient pleasure, we should give resources
3283 # that gcfclient doesn't grok a >10000 face index.
3284 my $res = $facedata->{resource};
3285
3286 while (my ($name, $info) = each %$res) {
3287 if (defined $info->{type}) {
3288 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3289 my $data;
3290
3291 if ($info->{type} & 1) {
3292 # prepend meta info
3293
3294 my $meta = $enc->encode ({
3295 name => $name,
3296 %{ $info->{meta} || {} },
3297 });
3298
3299 $data = pack "(w/a*)*", $meta, $info->{data};
3300 } else {
3301 $data = $info->{data};
3302 }
3303
3304 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3305 cf::face::set_type $idx, $info->{type};
3306 } else {
3307 $RESOURCE{$name} = $info;
3308 }
3309
3310 cf::cede_to_tick;
3311 }
3312 }
3313
3314 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3315
2578 1 3316 1
2579} 3317}
2580 3318
3319cf::global->attach (on_resource_update => sub {
3320 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3321 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3322
3323 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3324 my $sound = $soundconf->{compat}[$_]
3325 or next;
3326
3327 my $face = cf::face::find "sound/$sound->[1]";
3328 cf::sound::set $sound->[0] => $face;
3329 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3330 }
3331
3332 while (my ($k, $v) = each %{$soundconf->{event}}) {
3333 my $face = cf::face::find "sound/$v";
3334 cf::sound::set $k => $face;
3335 }
3336 }
3337});
3338
3339register_exticmd fx_want => sub {
3340 my ($ns, $want) = @_;
3341
3342 while (my ($k, $v) = each %$want) {
3343 $ns->fx_want ($k, $v);
3344 }
3345};
3346
3347sub load_resource_file($) {
3348 my $guard = lock_acquire "load_resource_file";
3349
3350 my $status = load_resource_file_ $_[0];
3351 get_slot 0.1, 100;
3352 cf::arch::commit_load;
3353
3354 $status
3355}
3356
2581sub reload_regions { 3357sub reload_regions {
3358 # HACK to clear player env face cache, we need some signal framework
3359 # for this (global event?)
3360 %ext::player_env::MUSIC_FACE_CACHE = ();
3361
2582 load_resource_file "$MAPDIR/regions" 3362 load_resource_file "$MAPDIR/regions"
2583 or die "unable to load regions file\n"; 3363 or die "unable to load regions file\n";
3364
3365 for (cf::region::list) {
3366 $_->{match} = qr/$_->{match}/
3367 if exists $_->{match};
3368 }
2584} 3369}
2585 3370
2586sub reload_facedata { 3371sub reload_facedata {
2587 load_facedata "$DATADIR/facedata" 3372 load_facedata "$DATADIR/facedata"
2588 or die "unable to load facedata\n"; 3373 or die "unable to load facedata\n";
2599} 3384}
2600 3385
2601sub reload_resources { 3386sub reload_resources {
2602 warn "reloading resource files...\n"; 3387 warn "reloading resource files...\n";
2603 3388
3389 reload_facedata;
3390 reload_archetypes;
2604 reload_regions; 3391 reload_regions;
2605 reload_facedata;
2606 #reload_archetypes;#d#
2607 reload_archetypes;
2608 reload_treasures; 3392 reload_treasures;
2609 3393
2610 warn "finished reloading resource files\n"; 3394 warn "finished reloading resource files\n";
2611} 3395}
2612 3396
2613sub init { 3397sub init {
3398 my $guard = freeze_mainloop;
3399
2614 reload_resources; 3400 reload_resources;
2615} 3401}
2616 3402
2617sub cfg_load { 3403sub reload_config {
2618 open my $fh, "<:utf8", "$CONFDIR/config" 3404 open my $fh, "<:utf8", "$CONFDIR/config"
2619 or return; 3405 or return;
2620 3406
2621 local $/; 3407 local $/;
2622 *CFG = YAML::Syck::Load <$fh>; 3408 *CFG = YAML::Load <$fh>;
2623 3409
2624 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3410 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2625 3411
2626 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3412 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2627 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3413 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2638sub main { 3424sub main {
2639 # we must not ever block the main coroutine 3425 # we must not ever block the main coroutine
2640 local $Coro::idle = sub { 3426 local $Coro::idle = sub {
2641 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3427 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2642 (async { 3428 (async {
2643 Event::one_event; 3429 $Coro::current->{desc} = "IDLE BUG HANDLER";
3430 EV::loop EV::LOOP_ONESHOT;
2644 })->prio (Coro::PRIO_MAX); 3431 })->prio (Coro::PRIO_MAX);
2645 }; 3432 };
2646 3433
2647 cfg_load; 3434 {
3435 my $guard = freeze_mainloop;
3436 reload_config;
2648 db_init; 3437 db_init;
2649 load_extensions; 3438 load_extensions;
2650 3439
2651 $TICK_WATCHER->start; 3440 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3441 evthread_start IO::AIO::poll_fileno;
3442 }
3443
2652 Event::loop; 3444 EV::loop;
2653} 3445}
2654 3446
2655############################################################################# 3447#############################################################################
2656# initialisation and cleanup 3448# initialisation and cleanup
2657 3449
2658# install some emergency cleanup handlers 3450# install some emergency cleanup handlers
2659BEGIN { 3451BEGIN {
3452 our %SIGWATCHER = ();
2660 for my $signal (qw(INT HUP TERM)) { 3453 for my $signal (qw(INT HUP TERM)) {
2661 Event->signal ( 3454 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2662 reentrant => 0,
2663 data => WF_AUTOCANCEL,
2664 signal => $signal,
2665 prio => 0,
2666 cb => sub {
2667 cf::cleanup "SIG$signal"; 3455 cf::cleanup "SIG$signal";
2668 },
2669 ); 3456 };
2670 } 3457 }
2671} 3458}
2672 3459
2673sub write_runtime { 3460sub write_runtime_sync {
2674 my $runtime = "$LOCALDIR/runtime"; 3461 my $runtime = "$LOCALDIR/runtime";
2675 3462
2676 # first touch the runtime file to show we are still running: 3463 # first touch the runtime file to show we are still running:
2677 # the fsync below can take a very very long time. 3464 # the fsync below can take a very very long time.
2678 3465
2704 and return; 3491 and return;
2705 3492
2706 warn "runtime file written.\n"; 3493 warn "runtime file written.\n";
2707 3494
2708 1 3495 1
3496}
3497
3498our $uuid_lock;
3499our $uuid_skip;
3500
3501sub write_uuid_sync($) {
3502 $uuid_skip ||= $_[0];
3503
3504 return if $uuid_lock;
3505 local $uuid_lock = 1;
3506
3507 my $uuid = "$LOCALDIR/uuid";
3508
3509 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3510 or return;
3511
3512 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3513 $uuid_skip = 0;
3514
3515 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3516 and return;
3517
3518 # always fsync - this file is important
3519 aio_fsync $fh
3520 and return;
3521
3522 close $fh
3523 or return;
3524
3525 aio_rename "$uuid~", $uuid
3526 and return;
3527
3528 warn "uuid file written ($value).\n";
3529
3530 1
3531
3532}
3533
3534sub write_uuid($$) {
3535 my ($skip, $sync) = @_;
3536
3537 $sync ? write_uuid_sync $skip
3538 : async { write_uuid_sync $skip };
2709} 3539}
2710 3540
2711sub emergency_save() { 3541sub emergency_save() {
2712 my $freeze_guard = cf::freeze_mainloop; 3542 my $freeze_guard = cf::freeze_mainloop;
2713 3543
2719 # and maps saved/destroyed asynchronously. 3549 # and maps saved/destroyed asynchronously.
2720 warn "begin emergency player save\n"; 3550 warn "begin emergency player save\n";
2721 for my $login (keys %cf::PLAYER) { 3551 for my $login (keys %cf::PLAYER) {
2722 my $pl = $cf::PLAYER{$login} or next; 3552 my $pl = $cf::PLAYER{$login} or next;
2723 $pl->valid or next; 3553 $pl->valid or next;
3554 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2724 $pl->save; 3555 $pl->save;
2725 } 3556 }
2726 warn "end emergency player save\n"; 3557 warn "end emergency player save\n";
2727 3558
2728 warn "begin emergency map save\n"; 3559 warn "begin emergency map save\n";
2734 warn "end emergency map save\n"; 3565 warn "end emergency map save\n";
2735 3566
2736 warn "begin emergency database checkpoint\n"; 3567 warn "begin emergency database checkpoint\n";
2737 BDB::db_env_txn_checkpoint $DB_ENV; 3568 BDB::db_env_txn_checkpoint $DB_ENV;
2738 warn "end emergency database checkpoint\n"; 3569 warn "end emergency database checkpoint\n";
3570
3571 warn "begin write uuid\n";
3572 write_uuid_sync 1;
3573 warn "end write uuid\n";
2739 }; 3574 };
2740 3575
2741 warn "leave emergency perl save\n"; 3576 warn "leave emergency perl save\n";
2742} 3577}
2743 3578
2758 warn "reloading..."; 3593 warn "reloading...";
2759 3594
2760 warn "entering sync_job"; 3595 warn "entering sync_job";
2761 3596
2762 cf::sync_job { 3597 cf::sync_job {
2763 cf::write_runtime; # external watchdog should not bark 3598 cf::write_runtime_sync; # external watchdog should not bark
2764 cf::emergency_save; 3599 cf::emergency_save;
2765 cf::write_runtime; # external watchdog should not bark 3600 cf::write_runtime_sync; # external watchdog should not bark
2766 3601
2767 warn "syncing database to disk"; 3602 warn "syncing database to disk";
2768 BDB::db_env_txn_checkpoint $DB_ENV; 3603 BDB::db_env_txn_checkpoint $DB_ENV;
2769 3604
2770 # if anything goes wrong in here, we should simply crash as we already saved 3605 # if anything goes wrong in here, we should simply crash as we already saved
2771
2772 warn "cancelling all WF_AUTOCANCEL watchers";
2773 for (Event::all_watchers) {
2774 $_->cancel if $_->data & WF_AUTOCANCEL;
2775 }
2776 3606
2777 warn "flushing outstanding aio requests"; 3607 warn "flushing outstanding aio requests";
2778 for (;;) { 3608 for (;;) {
2779 BDB::flush; 3609 BDB::flush;
2780 IO::AIO::flush; 3610 IO::AIO::flush;
2781 Coro::cede; 3611 Coro::cede_notself;
2782 last unless IO::AIO::nreqs || BDB::nreqs; 3612 last unless IO::AIO::nreqs || BDB::nreqs;
2783 warn "iterate..."; 3613 warn "iterate...";
2784 } 3614 }
2785 3615
2786 ++$RELOAD; 3616 ++$RELOAD;
2790 %EXT_CORO = (); 3620 %EXT_CORO = ();
2791 3621
2792 warn "removing commands"; 3622 warn "removing commands";
2793 %COMMAND = (); 3623 %COMMAND = ();
2794 3624
2795 warn "removing ext commands"; 3625 warn "removing ext/exti commands";
2796 %EXTCMD = (); 3626 %EXTCMD = ();
3627 %EXTICMD = ();
2797 3628
2798 warn "unloading/nuking all extensions"; 3629 warn "unloading/nuking all extensions";
2799 for my $pkg (@EXTS) { 3630 for my $pkg (@EXTS) {
2800 warn "... unloading $pkg"; 3631 warn "... unloading $pkg";
2801 3632
2844 warn "reloading cf.pm"; 3675 warn "reloading cf.pm";
2845 require cf; 3676 require cf;
2846 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3677 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2847 3678
2848 warn "loading config and database again"; 3679 warn "loading config and database again";
2849 cf::cfg_load; 3680 cf::reload_config;
2850 3681
2851 warn "loading extensions"; 3682 warn "loading extensions";
2852 cf::load_extensions; 3683 cf::load_extensions;
2853 3684
2854 warn "reattaching attachments to objects/players"; 3685 warn "reattaching attachments to objects/players";
2861 warn "leaving sync_job"; 3692 warn "leaving sync_job";
2862 3693
2863 1 3694 1
2864 } or do { 3695 } or do {
2865 warn $@; 3696 warn $@;
2866 warn "error while reloading, exiting."; 3697 cf::cleanup "error while reloading, exiting.";
2867 exit 1;
2868 }; 3698 };
2869 3699
2870 warn "reloaded"; 3700 warn "reloaded";
2871}; 3701};
2872 3702
2874 3704
2875sub reload_perl() { 3705sub reload_perl() {
2876 # doing reload synchronously and two reloads happen back-to-back, 3706 # doing reload synchronously and two reloads happen back-to-back,
2877 # coro crashes during coro_state_free->destroy here. 3707 # coro crashes during coro_state_free->destroy here.
2878 3708
2879 $RELOAD_WATCHER ||= Event->timer ( 3709 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
2880 reentrant => 0,
2881 after => 0,
2882 data => WF_AUTOCANCEL,
2883 cb => sub {
2884 do_reload_perl; 3710 do_reload_perl;
2885 undef $RELOAD_WATCHER; 3711 undef $RELOAD_WATCHER;
2886 },
2887 ); 3712 };
2888} 3713}
2889 3714
2890register_command "reload" => sub { 3715register_command "reload" => sub {
2891 my ($who, $arg) = @_; 3716 my ($who, $arg) = @_;
2892 3717
2893 if ($who->flag (FLAG_WIZ)) { 3718 if ($who->flag (FLAG_WIZ)) {
2894 $who->message ("reloading server."); 3719 $who->message ("reloading server.");
3720 async {
3721 $Coro::current->{desc} = "perl_reload";
2895 async { reload_perl }; 3722 reload_perl;
3723 };
2896 } 3724 }
2897}; 3725};
2898 3726
2899unshift @INC, $LIBDIR; 3727unshift @INC, $LIBDIR;
2900 3728
2902 3730
2903our @WAIT_FOR_TICK; 3731our @WAIT_FOR_TICK;
2904our @WAIT_FOR_TICK_BEGIN; 3732our @WAIT_FOR_TICK_BEGIN;
2905 3733
2906sub wait_for_tick { 3734sub wait_for_tick {
2907 return unless $TICK_WATCHER->is_active;
2908 return if $Coro::current == $Coro::main; 3735 return if tick_inhibit || $Coro::current == $Coro::main;
2909 3736
2910 my $signal = new Coro::Signal; 3737 my $signal = new Coro::Signal;
2911 push @WAIT_FOR_TICK, $signal; 3738 push @WAIT_FOR_TICK, $signal;
2912 $signal->wait; 3739 $signal->wait;
2913} 3740}
2914 3741
2915sub wait_for_tick_begin { 3742sub wait_for_tick_begin {
2916 return unless $TICK_WATCHER->is_active;
2917 return if $Coro::current == $Coro::main; 3743 return if tick_inhibit || $Coro::current == $Coro::main;
2918 3744
2919 my $signal = new Coro::Signal; 3745 my $signal = new Coro::Signal;
2920 push @WAIT_FOR_TICK_BEGIN, $signal; 3746 push @WAIT_FOR_TICK_BEGIN, $signal;
2921 $signal->wait; 3747 $signal->wait;
2922} 3748}
2923 3749
2924 my $min = 1e6;#d# 3750sub tick {
2925 my $avg = 10;
2926$TICK_WATCHER = Event->timer (
2927 reentrant => 0,
2928 parked => 1,
2929 prio => 0,
2930 at => $NEXT_TICK || $TICK,
2931 data => WF_AUTOCANCEL,
2932 cb => sub {
2933 if ($Coro::current != $Coro::main) { 3751 if ($Coro::current != $Coro::main) {
2934 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3752 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2935 unless ++$bug_warning > 10; 3753 unless ++$bug_warning > 10;
2936 return; 3754 return;
2937 } 3755 }
2938 3756
2939 $NOW = $tick_start = Event::time;
2940
2941 cf::server_tick; # one server iteration 3757 cf::server_tick; # one server iteration
2942 3758
2943 0 && sync_job {#d# 3759 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2944 for(1..10) { 3760 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
2945 my $t = Event::time; 3761 Coro::async_pool {
2946 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3762 $Coro::current->{desc} = "runtime saver";
2947 or die; 3763 write_runtime_sync
2948 3764 or warn "ERROR: unable to write runtime file: $!";
2949 $map->width (50);
2950 $map->height (50);
2951 $map->alloc;
2952 $map->_load_objects ("/tmp/x.map", 1);
2953 my $t = Event::time - $t;
2954
2955 #next unless $t < 0.0013;#d#
2956 if ($t < $min) {
2957 $min = $t;
2958 }
2959 $avg = $avg * 0.99 + $t * 0.01;
2960 }
2961 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2962 exit 0;
2963 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2964 }; 3765 };
3766 }
2965 3767
2966 $RUNTIME += $TICK;
2967 $NEXT_TICK += $TICK;
2968
2969 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2970 $NEXT_RUNTIME_WRITE = $NOW + 10;
2971 Coro::async_pool {
2972 write_runtime
2973 or warn "ERROR: unable to write runtime file: $!";
2974 };
2975 }
2976
2977# my $AFTER = Event::time;
2978# warn $AFTER - $NOW;#d#
2979
2980 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3768 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2981 $sig->send; 3769 $sig->send;
2982 } 3770 }
2983 while (my $sig = shift @WAIT_FOR_TICK) { 3771 while (my $sig = shift @WAIT_FOR_TICK) {
2984 $sig->send; 3772 $sig->send;
2985 } 3773 }
2986 3774
2987 $NOW = Event::time; 3775 $LOAD = ($NOW - $TICK_START) / $TICK;
2988
2989 # if we are delayed by four ticks or more, skip them all
2990 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2991
2992 $TICK_WATCHER->at ($NEXT_TICK);
2993 $TICK_WATCHER->start;
2994
2995 $LOAD = ($NOW - $tick_start) / $TICK;
2996 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3776 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2997 3777
2998 _post_tick; 3778 if (0) {
2999 3779 if ($NEXT_TICK) {
3000 3780 my $jitter = $TICK_START - $NEXT_TICK;
3781 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3782 warn "jitter $JITTER\n";#d#
3783 }
3001 }, 3784 }
3002); 3785}
3003 3786
3004{ 3787{
3005 BDB::max_poll_time $TICK * 0.1; 3788 # configure BDB
3006 $BDB_POLL_WATCHER = Event->io ( 3789
3007 reentrant => 0,
3008 fd => BDB::poll_fileno,
3009 poll => 'r',
3010 prio => 0,
3011 data => WF_AUTOCANCEL,
3012 cb => \&BDB::poll_cb,
3013 );
3014 BDB::min_parallel 8; 3790 BDB::min_parallel 8;
3015 3791 BDB::max_poll_reqs $TICK * 0.1;
3016 BDB::set_sync_prepare { 3792 $Coro::BDB::WATCHER->priority (1);
3017 my $status;
3018 my $current = $Coro::current;
3019 (
3020 sub {
3021 $status = $!;
3022 $current->ready; undef $current;
3023 },
3024 sub {
3025 Coro::schedule while defined $current;
3026 $! = $status;
3027 },
3028 )
3029 };
3030 3793
3031 unless ($DB_ENV) { 3794 unless ($DB_ENV) {
3032 $DB_ENV = BDB::db_env_create; 3795 $DB_ENV = BDB::db_env_create;
3796 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3797 | BDB::LOG_AUTOREMOVE, 1);
3798 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3799 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3033 3800
3034 cf::sync_job { 3801 cf::sync_job {
3035 eval { 3802 eval {
3036 BDB::db_env_open 3803 BDB::db_env_open
3037 $DB_ENV, 3804 $DB_ENV,
3039 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3806 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3040 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3807 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3041 0666; 3808 0666;
3042 3809
3043 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3810 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3044
3045 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3046 $DB_ENV->set_lk_detect;
3047 }; 3811 };
3048 3812
3049 cf::cleanup "db_env_open(db): $@" if $@; 3813 cf::cleanup "db_env_open(db): $@" if $@;
3050 }; 3814 };
3051 } 3815 }
3816
3817 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3818 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3819 };
3820 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3821 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3822 };
3823 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3824 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3825 };
3052} 3826}
3053 3827
3054{ 3828{
3829 # configure IO::AIO
3830
3055 IO::AIO::min_parallel 8; 3831 IO::AIO::min_parallel 8;
3056
3057 undef $Coro::AIO::WATCHER;
3058 IO::AIO::max_poll_time $TICK * 0.1; 3832 IO::AIO::max_poll_time $TICK * 0.1;
3059 $AIO_POLL_WATCHER = Event->io ( 3833 $Coro::AIO::WATCHER->priority (1);
3060 reentrant => 0,
3061 data => WF_AUTOCANCEL,
3062 fd => IO::AIO::poll_fileno,
3063 poll => 'r',
3064 prio => 6,
3065 cb => \&IO::AIO::poll_cb,
3066 );
3067} 3834}
3068 3835
3069my $_log_backtrace; 3836my $_log_backtrace;
3070 3837
3071sub _log_backtrace { 3838sub _log_backtrace {
3075 3842
3076 # limit the # of concurrent backtraces 3843 # limit the # of concurrent backtraces
3077 if ($_log_backtrace < 2) { 3844 if ($_log_backtrace < 2) {
3078 ++$_log_backtrace; 3845 ++$_log_backtrace;
3079 async { 3846 async {
3847 $Coro::current->{desc} = "abt $msg";
3848
3080 my @bt = fork_call { 3849 my @bt = fork_call {
3081 @addr = map { sprintf "%x", $_ } @addr; 3850 @addr = map { sprintf "%x", $_ } @addr;
3082 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3851 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3083 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3852 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3084 or die "addr2line: $!"; 3853 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines