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.298 by root, Sun Jul 8 14:50:07 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
25use JSON::XS 1.4 (); 48use JSON::XS 2.01 ();
26use BDB (); 49use BDB ();
27use Data::Dumper; 50use Data::Dumper;
28use Digest::MD5; 51use Digest::MD5;
29use Fcntl; 52use Fcntl;
30use YAML::Syck (); 53use YAML ();
31use IO::AIO 2.32 (); 54use IO::AIO 2.51 ();
32use Time::HiRes; 55use Time::HiRes;
33use Compress::LZF; 56use Compress::LZF;
57use Digest::MD5 ();
34 58
35# configure various modules to our taste 59# configure various modules to our taste
36# 60#
37$Storable::canonical = 1; # reduce rsync transfers 61$Storable::canonical = 1; # reduce rsync transfers
38Coro::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
39Compress::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
40
41$Event::Eval = 1; # no idea why this is required, but it is
42
43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
44$YAML::Syck::ImplicitUnicode = 1;
45 64
46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
47 66
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
49 68
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 87our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 89our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 90our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db"; 91our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE;
73 93
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75our $TICK_WATCHER;
76our $AIO_POLL_WATCHER; 95our $AIO_POLL_WATCHER;
77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 97our $NEXT_TICK;
79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 98our $USE_FSYNC = 1; # use fsync to write maps - default off
81 99
82our $BDB_POLL_WATCHER; 100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER;
83our $DB_ENV; 104our $DB_ENV;
84 105
85our %CFG; 106our %CFG;
86 107
87our $UPTIME; $UPTIME ||= time; 108our $UPTIME; $UPTIME ||= time;
88our $RUNTIME; 109our $RUNTIME;
110our $NOW;
89 111
90our %PLAYER; # all users 112our (%PLAYER, %PLAYER_LOADING); # all users
91our %MAP; # all maps 113our (%MAP, %MAP_LOADING ); # all maps
92our $LINK_MAP; # the special {link} map, which is always available 114our $LINK_MAP; # the special {link} map, which is always available
93 115
94# 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 ∕
95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96 118
97our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
98our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
99our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
100 123
101binmode STDOUT; 124binmode STDOUT;
102binmode STDERR; 125binmode STDERR;
103 126
104# read virtual server time, if available 127# read virtual server time, if available
157 180
158The raw value load value from the last tick. 181The raw value load value from the last tick.
159 182
160=item %cf::CFG 183=item %cf::CFG
161 184
162Configuration for the server, loaded from C</etc/crossfire/config>, or 185Configuration for the server, loaded from C</etc/deliantra-server/config>, or
163from wherever your confdir points to. 186from wherever your confdir points to.
164 187
165=item cf::wait_for_tick, cf::wait_for_tick_begin 188=item cf::wait_for_tick, cf::wait_for_tick_begin
166 189
167These 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
168returns 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
169per 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.
170 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
171=back 200=back
172 201
173=cut 202=cut
174 203
175BEGIN { 204BEGIN {
179 $msg .= "\n" 208 $msg .= "\n"
180 unless $msg =~ /\n$/; 209 unless $msg =~ /\n$/;
181 210
182 $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;
183 212
184 utf8::encode $msg;
185 LOG llevError, $msg; 213 LOG llevError, $msg;
186 }; 214 };
187} 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#?
188 231
189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
190@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
191@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
192@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
205)) { 248)) {
206 no strict 'refs'; 249 no strict 'refs';
207 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
208} 251}
209 252
210$Event::DIED = sub { 253$EV::DIED = sub {
211 warn "error in event callback: @_"; 254 warn "error in event callback: @_";
212}; 255};
213 256
214############################################################################# 257#############################################################################
215 258
238 $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;
239 $d 282 $d
240 } || "[unable to dump $_[0]: '$@']"; 283 } || "[unable to dump $_[0]: '$@']";
241} 284}
242 285
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.
250 293
251=cut 294=cut
252 295
253our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
254 297
255sub to_json ($) { $json_coder->encode ($_[0]) } 298sub encode_json($) { $json_coder->encode ($_[0]) }
256sub from_json ($) { $json_coder->decode ($_[0]) } 299sub decode_json($) { $json_coder->decode ($_[0]) }
257 300
258=item cf::lock_wait $string 301=item cf::lock_wait $string
259 302
260Wait until the given lock is available. See cf::lock_acquire. 303Wait until the given lock is available. See cf::lock_acquire.
261 304
264Wait 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
265a 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,
266for example when the coroutine gets canceled), the lock is automatically 309for example when the coroutine gets canceled), the lock is automatically
267returned. 310returned.
268 311
312Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro.
314
269Lock 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
270uses map_find and cf::map::load uses map_load). 316uses map_find and cf::map::load uses map_load).
271 317
272=item $locked = cf::lock_active $string 318=item $locked = cf::lock_active $string
273 319
274Return 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.
275 321
276=cut 322=cut
277 323
278our %LOCK; 324our %LOCK;
325our %LOCKER;#d#
279 326
280sub lock_wait($) { 327sub lock_wait($) {
281 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#
282 334
283 # wait for lock, if any 335 # wait for lock, if any
284 while ($LOCK{$key}) { 336 while ($LOCK{$key}) {
285 push @{ $LOCK{$key} }, $Coro::current; 337 push @{ $LOCK{$key} }, $Coro::current;
286 Coro::schedule; 338 Coro::schedule;
292 344
293 # wait, to be sure we are not locked 345 # wait, to be sure we are not locked
294 lock_wait $key; 346 lock_wait $key;
295 347
296 $LOCK{$key} = []; 348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
297 350
298 Coro::guard { 351 Coro::guard {
352 delete $LOCKER{$key};#d#
299 # wake up all waiters, to be on the safe side 353 # wake up all waiters, to be on the safe side
300 $_->ready for @{ delete $LOCK{$key} }; 354 $_->ready for @{ delete $LOCK{$key} };
301 } 355 }
302} 356}
303 357
306 360
307 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
308} 362}
309 363
310sub freeze_mainloop { 364sub freeze_mainloop {
311 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
312 366
313 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
314 $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 }
315 }; 428 }
316 $TICK_WATCHER->stop; 429};
317 $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;
318} 443}
319 444
320=item cf::async { BLOCK } 445=item cf::async { BLOCK }
321 446
322Currently the same as Coro::async_pool, meaning you cannot use 447Currently the same as Coro::async_pool, meaning you cannot use
327 452
328BEGIN { *async = \&Coro::async_pool } 453BEGIN { *async = \&Coro::async_pool }
329 454
330=item cf::sync_job { BLOCK } 455=item cf::sync_job { BLOCK }
331 456
332The design of Crossfire TRT requires that the main coroutine ($Coro::main) 457The design of Deliantra requires that the main coroutine ($Coro::main)
333is always able to handle events or runnable, as Crossfire TRT is only 458is always able to handle events or runnable, as Deliantra is only
334partly 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
335acceptable. 460acceptable.
336 461
337If 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
338the given BLOCK in another coroutine while waiting for the result. The 463the given BLOCK in another coroutine while waiting for the result. The
343 468
344sub sync_job(&) { 469sub sync_job(&) {
345 my ($job) = @_; 470 my ($job) = @_;
346 471
347 if ($Coro::current == $Coro::main) { 472 if ($Coro::current == $Coro::main) {
348 my $time = Event::time; 473 my $time = EV::time;
349 474
350 # this is the main coro, too bad, we have to block 475 # this is the main coro, too bad, we have to block
351 # till the operation succeeds, freezing the server :/ 476 # till the operation succeeds, freezing the server :/
352 477
353 # TODO: use suspend/resume instead 478 LOG llevError, Carp::longmess "sync job";#d#
354 # (but this is cancel-safe) 479
355 my $freeze_guard = freeze_mainloop; 480 my $freeze_guard = freeze_mainloop;
356 481
357 my $busy = 1; 482 my $busy = 1;
358 my @res; 483 my @res;
359 484
360 (async { 485 (async {
486 $Coro::current->desc ("sync job coro");
361 @res = eval { $job->() }; 487 @res = eval { $job->() };
362 warn $@ if $@; 488 warn $@ if $@;
363 undef $busy; 489 undef $busy;
364 })->prio (Coro::PRIO_MAX); 490 })->prio (Coro::PRIO_MAX);
365 491
366 while ($busy) { 492 while ($busy) {
367 Coro::cede or Event::one_event; 493 if (Coro::nready) {
494 Coro::cede_notself;
495 } else {
496 EV::loop EV::LOOP_ONESHOT;
368 } 497 }
498 }
369 499
370 $time = Event::time - $time; 500 my $time = EV::time - $time;
371 501
372 LOG llevError | logBacktrace, Carp::longmess "long sync job"
373 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
374
375 $tick_start += $time; # do not account sync jobs to server load 502 $TICK_START += $time; # do not account sync jobs to server load
376 503
377 wantarray ? @res : $res[0] 504 wantarray ? @res : $res[0]
378 } else { 505 } else {
379 # we are in another coroutine, how wonderful, everything just works 506 # we are in another coroutine, how wonderful, everything just works
380 507
405=item fork_call { }, $args 532=item fork_call { }, $args
406 533
407Executes the given code block with the given arguments in a seperate 534Executes the given code block with the given arguments in a seperate
408process, returning the results. Everything must be serialisable with 535process, returning the results. Everything must be serialisable with
409Coro::Storable. May, of course, block. Note that the executed sub may 536Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 537never block itself or use any form of event handling.
411 538
412=cut 539=cut
413 540
414sub fork_call(&@) { 541sub fork_call(&@) {
415 my ($cb, @args) = @_; 542 my ($cb, @args) = @_;
416 543
417# 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,
418# or die "socketpair: $!"; 545 # otherwise perl prematurely frees the stuff :/
419 pipe my $fh1, my $fh2 546 # TODO: investigate and fix (likely this will be rather laborious)
420 or die "pipe: $!";
421 547
422 if (my $pid = fork) { 548 my @res = Coro::Util::fork_eval {
423 close $fh2;
424
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
426 warn "pst<$res>" unless $res =~ /^pst/;
427 $res = Coro::Storable::thaw $res;
428
429 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
430
431 Carp::confess $$res unless "ARRAY" eq ref $res;
432
433 return wantarray ? @$res : $res->[-1];
434 } else {
435 reset_signals; 549 reset_signals;
436 local $SIG{__WARN__}; 550 &$cb
437 local $SIG{__DIE__}; 551 }, @args;
438 local $Coro::idle;
439 $Coro::current->prio (Coro::PRIO_MAX);
440 eval {
441 close $fh1;
442 552
443 my @res = eval { $cb->(@args) }; 553 wantarray ? @res : $res[-1]
554}
444 555
445 open my $fh, ">", \my $buf 556=item $coin = coin_from_name $name
446 or die "fork_call: cannot open fh-to-buf in child : $!";
447 Storable::store_fd +($@ ? \"$@" : \@res), $fh;
448 close $fh;
449 557
450 warn "writing ", length $buf; 558=cut
451 my $x;
452 (length $buf) == ($x = syswrite $fh2, $buf)
453 or warn "error writing ".(length $buf)." != $x\n";
454 close $fh2;
455 };
456 559
457 warn $@ if $@; 560our %coin_alias = (
458 _exit 0; 561 "silver" => "silvercoin",
459 } 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
460} 581}
461 582
462=item $value = cf::db_get $family => $key 583=item $value = cf::db_get $family => $key
463 584
464Returns a single value from the environment database. 585Returns a single value from the environment database.
466=item cf::db_put $family => $key => $value 587=item cf::db_put $family => $key => $value
467 588
468Stores 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
469data 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).
470 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
471=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}
472 615
473our $DB; 616our $DB;
474 617
475sub db_init { 618sub db_init {
476 unless ($DB) {
477 $DB = BDB::db_create $DB_ENV;
478
479 cf::sync_job { 619 cf::sync_job {
480 eval { 620 $DB ||= db_table "db";
481 $DB->set_flags (BDB::CHKSUM);
482
483 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
484 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
485 cf::cleanup "db_open(db): $!" if $!;
486 };
487 cf::cleanup "db_open(db): $@" if $@;
488 };
489 } 621 };
490} 622}
491 623
492sub db_get($$) { 624sub db_get($$) {
493 my $key = "$_[0]/$_[1]"; 625 my $key = "$_[0]/$_[1]";
494 626
544 if (1) { 676 if (1) {
545 $md5 = 677 $md5 =
546 join "\x00", 678 join "\x00",
547 $processversion, 679 $processversion,
548 map { 680 map {
549 Coro::cede; 681 cf::cede_to_tick;
550 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 682 ($src->[$_], Digest::MD5::md5_hex $data[$_])
551 } 0.. $#$src; 683 } 0.. $#$src;
552 684
553 685
554 my $dbmd5 = db_get cache => "$id/md5"; 686 my $dbmd5 = db_get cache => "$id/md5";
598attach callbacks/event handlers (a collection of which is called an "attachment") 730attach callbacks/event handlers (a collection of which is called an "attachment")
599to it. All such attachable objects support the following methods. 731to it. All such attachable objects support the following methods.
600 732
601In 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>
602C<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
603Crossfire TRT). 735Deliantra).
604 736
605=over 4 737=over 4
606 738
607=item $attachable->attach ($attachment, key => $value...) 739=item $attachable->attach ($attachment, key => $value...)
608 740
860 "; 992 ";
861 die if $@; 993 die if $@;
862} 994}
863 995
864our $override; 996our $override;
865our @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?
866 998
867sub override { 999sub override {
868 $override = 1; 1000 $override = 1;
869 @invoke_results = (); 1001 @INVOKE_RESULTS = (@_);
870} 1002}
871 1003
872sub do_invoke { 1004sub do_invoke {
873 my $event = shift; 1005 my $event = shift;
874 my $callbacks = shift; 1006 my $callbacks = shift;
875 1007
876 @invoke_results = (); 1008 @INVOKE_RESULTS = ();
877 1009
878 local $override; 1010 local $override;
879 1011
880 for (@$callbacks) { 1012 for (@$callbacks) {
881 eval { &{$_->[1]} }; 1013 eval { &{$_->[1]} };
890 } 1022 }
891 1023
892 0 1024 0
893} 1025}
894 1026
895=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1027=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
896 1028
897=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1029=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
898 1030
899Generate an object-specific event with the given arguments. 1031Generate an object-specific event with the given arguments.
900 1032
901This 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
902removed 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
903results (if you must, access C<@cf::invoke_results> directly). 1035results (if you must, access C<@cf::INVOKE_RESULTS> directly).
904 1036
905=back 1037=back
906 1038
907=cut 1039=cut
908 1040
909############################################################################# 1041#############################################################################
910# 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}
911 1085
912sub reattach { 1086sub reattach {
913 # basically do the same as instantiate, without calling instantiate 1087 # basically do the same as instantiate, without calling instantiate
914 my ($obj) = @_; 1088 my ($obj) = @_;
915 1089
936cf::attachable->attach ( 1110cf::attachable->attach (
937 prio => -1000000, 1111 prio => -1000000,
938 on_instantiate => sub { 1112 on_instantiate => sub {
939 my ($obj, $data) = @_; 1113 my ($obj, $data) = @_;
940 1114
941 $data = from_json $data; 1115 $data = decode_json $data;
942 1116
943 for (@$data) { 1117 for (@$data) {
944 my ($name, $args) = @$_; 1118 my ($name, $args) = @$_;
945 1119
946 $obj->attach ($name, %{$args || {} }); 1120 $obj->attach ($name, %{$args || {} });
962sub object_freezer_save { 1136sub object_freezer_save {
963 my ($filename, $rdata, $objs) = @_; 1137 my ($filename, $rdata, $objs) = @_;
964 1138
965 sync_job { 1139 sync_job {
966 if (length $$rdata) { 1140 if (length $$rdata) {
1141 utf8::decode (my $decname = $filename);
967 warn sprintf "saving %s (%d,%d)\n", 1142 warn sprintf "saving %s (%d,%d)\n",
968 $filename, length $$rdata, scalar @$objs; 1143 $decname, length $$rdata, scalar @$objs;
969 1144
970 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
971 chmod SAVE_MODE, $fh; 1146 aio_chmod $fh, SAVE_MODE;
972 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
973 aio_fsync $fh if $cf::USE_FSYNC; 1148 aio_fsync $fh if $cf::USE_FSYNC;
974 close $fh; 1149 aio_close $fh;
975 1150
976 if (@$objs) { 1151 if (@$objs) {
977 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) {
978 chmod SAVE_MODE, $fh; 1153 aio_chmod $fh, SAVE_MODE;
979 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
980 aio_write $fh, 0, (length $data), $data, 0; 1155 aio_write $fh, 0, (length $data), $data, 0;
981 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
982 close $fh; 1157 aio_close $fh;
983 aio_rename "$filename.pst~", "$filename.pst"; 1158 aio_rename "$filename.pst~", "$filename.pst";
984 } 1159 }
985 } else { 1160 } else {
986 aio_unlink "$filename.pst"; 1161 aio_unlink "$filename.pst";
987 } 1162 }
992 } 1167 }
993 } else { 1168 } else {
994 aio_unlink $filename; 1169 aio_unlink $filename;
995 aio_unlink "$filename.pst"; 1170 aio_unlink "$filename.pst";
996 } 1171 }
997 } 1172 };
998} 1173}
999 1174
1000sub object_freezer_as_string { 1175sub object_freezer_as_string {
1001 my ($rdata, $objs) = @_; 1176 my ($rdata, $objs) = @_;
1002 1177
1014 or return; 1189 or return;
1015 1190
1016 unless (aio_stat "$filename.pst") { 1191 unless (aio_stat "$filename.pst") {
1017 (aio_load "$filename.pst", $av) >= 0 1192 (aio_load "$filename.pst", $av) >= 0
1018 or return; 1193 or return;
1194
1019 $av = eval { (Storable::thaw $av)->{objs} }; 1195 my $st = eval { Coro::Storable::thaw $av };
1196 $av = $st->{objs};
1020 } 1197 }
1021 1198
1199 utf8::decode (my $decname = $filename);
1022 warn sprintf "loading %s (%d)\n", 1200 warn sprintf "loading %s (%d,%d)\n",
1023 $filename, length $data, scalar @{$av || []}; 1201 $decname, length $data, scalar @{$av || []};
1202
1024 return ($data, $av); 1203 ($data, $av)
1025} 1204}
1026 1205
1027=head2 COMMAND CALLBACKS 1206=head2 COMMAND CALLBACKS
1028 1207
1029=over 4 1208=over 4
1102 my ($pl, $buf) = @_; 1281 my ($pl, $buf) = @_;
1103 1282
1104 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1283 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1105 1284
1106 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
1107 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1293 if (my $cb = $EXTCMD{$type}) {
1108 if (my %reply = $cb->($pl, $msg)) { 1294 @reply = $cb->($pl, @payload);
1109 $pl->ext_reply ($msg->{msgid}, %reply);
1110 }
1111 } 1295 }
1296
1297 $pl->ext_reply ($reply, @reply)
1298 if $reply;
1299
1112 } else { 1300 } else {
1113 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1301 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1114 } 1302 }
1115 1303
1116 cf::override; 1304 cf::override;
1169 my $msg = $@ ? "$v->{path}: $@\n" 1357 my $msg = $@ ? "$v->{path}: $@\n"
1170 : "$v->{base}: extension inactive.\n"; 1358 : "$v->{base}: extension inactive.\n";
1171 1359
1172 if (exists $v->{meta}{mandatory}) { 1360 if (exists $v->{meta}{mandatory}) {
1173 warn $msg; 1361 warn $msg;
1174 warn "mandatory extension failed to load, exiting.\n"; 1362 cf::cleanup "mandatory extension failed to load, exiting.";
1175 exit 1;
1176 } 1363 }
1177 1364
1178 warn $msg; 1365 warn $msg;
1179 } 1366 }
1180 1367
1205use Coro::AIO; 1392use Coro::AIO;
1206 1393
1207=head3 cf::player 1394=head3 cf::player
1208 1395
1209=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}
1210 1411
1211=item cf::player::find $login 1412=item cf::player::find $login
1212 1413
1213Returns the given player object, loading it if necessary (might block). 1414Returns the given player object, loading it if necessary (might block).
1214 1415
1250 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1451 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1251 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1452 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1252 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1453 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1253 aio_unlink +(playerdir $login) . "/$login.pl"; 1454 aio_unlink +(playerdir $login) . "/$login.pl";
1254 1455
1255 my $pl = load_pl path $login 1456 my $f = new_from_file cf::object::thawer path $login
1256 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;
1257 $cf::PLAYER{$login} = $pl 1464 $cf::PLAYER{$login} = $pl
1258 } 1465 }
1259 } 1466 }
1260} 1467}
1261 1468
1270 return if $pl->{deny_save}; 1477 return if $pl->{deny_save};
1271 1478
1272 aio_mkdir playerdir $pl, 0770; 1479 aio_mkdir playerdir $pl, 0770;
1273 $pl->{last_save} = $cf::RUNTIME; 1480 $pl->{last_save} = $cf::RUNTIME;
1274 1481
1482 cf::get_slot 0.01;
1483
1275 $pl->save_pl ($path); 1484 $pl->save_pl ($path);
1276 Coro::cede; 1485 cf::cede_to_tick;
1277} 1486}
1278 1487
1279sub new($) { 1488sub new($) {
1280 my ($login) = @_; 1489 my ($login) = @_;
1281 1490
1287 $cf::PLAYER{$login} = $self; 1496 $cf::PLAYER{$login} = $self;
1288 1497
1289 $self 1498 $self
1290} 1499}
1291 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
1292=item $pl->quit_character 1511=item $pl->quit_character
1293 1512
1294Nukes the player without looking back. If logged in, the connection will 1513Nukes the player without looking back. If logged in, the connection will
1295be destroyed. May block for a long time. 1514be destroyed. May block for a long time.
1296 1515
1304 $pl->{deny_save} = 1; 1523 $pl->{deny_save} = 1;
1305 $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
1306 1525
1307 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1526 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1308 $pl->deactivate; 1527 $pl->deactivate;
1528 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1529 $pl->ob->check_score;
1309 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1530 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1310 $pl->ns->destroy if $pl->ns; 1531 $pl->ns->destroy if $pl->ns;
1311 1532
1312 my $path = playerdir $pl; 1533 my $path = playerdir $pl;
1313 my $temp = "$path~$cf::RUNTIME~deleting~"; 1534 my $temp = "$path~$cf::RUNTIME~deleting~";
1349 or return []; 1570 or return [];
1350 1571
1351 my @logins; 1572 my @logins;
1352 1573
1353 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") {
1354 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1580 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1355 aio_read $fh, 0, 512, my $buf, 0 or next; 1581 aio_read $fh, 0, 512, my $buf, 0 or next;
1356 $buf !~ /^password -------------$/m or next; # official not-valid tag 1582 $buf !~ /^password -------------$/m or next; # official not-valid tag
1583 }
1357 1584
1358 utf8::decode $login; 1585 utf8::decode $login;
1359 push @logins, $login; 1586 push @logins, $login;
1360 } 1587 }
1361 1588
1394 1621
1395Expand crossfire pod fragments into protocol xml. 1622Expand crossfire pod fragments into protocol xml.
1396 1623
1397=cut 1624=cut
1398 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
1399sub expand_cfpod { 1637sub expand_cfpod {
1400 ((my $self), (local $_)) = @_; 1638 my ($self, $pod) = @_;
1401 1639
1402 # escape & and < 1640 my $xml;
1403 s/&/&amp;/g;
1404 s/(?<![BIUGH])</&lt;/g;
1405 1641
1406 # this is buggy, it needs to properly take care of nested <'s 1642 while () {
1643 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1644 $group = $1;
1407 1645
1408 1 while 1646 $group =~ s/&/&amp;/g;
1409 # replace B<>, I<>, U<> etc. 1647 $group =~ s/</&lt;/g;
1410 s/B<([^\>]*)>/<b>$1<\/b>/ 1648
1411 || s/I<([^\>]*)>/<i>$1<\/i>/ 1649 $xml .= $group;
1412 || s/U<([^\>]*)>/<u>$1<\/u>/ 1650 } elsif ($pod =~ m%\G
1413 # replace G<male|female> tags 1651 ([BCGHITU])
1414 || s{G<([^>|]*)\|([^>]*)>}{ 1652 <
1415 $self->gender ? $2 : $1 1653 (?:
1416 }ge 1654 ([^<>]*) (?{ $group = $^N })
1417 # replace H<hint text> 1655 | < $interior >
1418 || s{H<([^\>]*)>} 1656 )
1657 >
1658 %gcsx
1419 { 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") {
1420 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1677 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1421 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1678 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1422 "") 1679 "")
1423 [$self->{hintmode}] 1680 [$self->{hintmode}];
1681 } else {
1682 $xml .= "error processing '$code($data)' directive";
1424 }ge; 1683 }
1684 } else {
1685 if ($pod =~ /\G(.+)/) {
1686 warn "parse error while expanding $pod (at $1)";
1687 }
1688 last;
1689 }
1690 }
1425 1691
1692 for ($xml) {
1426 # create single paragraphs (very hackish) 1693 # create single paragraphs (very hackish)
1427 s/(?<=\S)\n(?=\w)/ /g; 1694 s/(?<=\S)\n(?=\w)/ /g;
1428 1695
1429 # compress some whitespace 1696 # compress some whitespace
1430 s/\s+\n/\n/g; # ws line-ends 1697 s/\s+\n/\n/g; # ws line-ends
1431 s/\n\n+/\n/g; # double lines 1698 s/\n\n+/\n/g; # double lines
1432 s/^\n+//; # beginning lines 1699 s/^\n+//; # beginning lines
1433 s/\n+$//; # ending lines 1700 s/\n+$//; # ending lines
1701 }
1434 1702
1435 $_ 1703 $xml
1436} 1704}
1705
1706no re 'eval';
1437 1707
1438sub hintmode { 1708sub hintmode {
1439 $_[0]{hintmode} = $_[1] if @_ > 1; 1709 $_[0]{hintmode} = $_[1] if @_ > 1;
1440 $_[0]{hintmode} 1710 $_[0]{hintmode}
1441} 1711}
1442 1712
1443=item $player->ext_reply ($msgid, %msg) 1713=item $player->ext_reply ($msgid, @msg)
1444 1714
1445Sends an ext reply to the player. 1715Sends an ext reply to the player.
1446 1716
1447=cut 1717=cut
1448 1718
1449sub ext_reply($$%) { 1719sub ext_reply($$@) {
1450 my ($self, $id, %msg) = @_; 1720 my ($self, $id, @msg) = @_;
1451 1721
1452 $msg{msgid} = $id; 1722 $self->ns->ext_reply ($id, @msg)
1453 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1454} 1723}
1455 1724
1456=item $player->ext_event ($type, %msg) 1725=item $player->ext_msg ($type, @msg)
1457 1726
1458Sends an ext event to the client. 1727Sends an ext event to the client.
1459 1728
1460=cut 1729=cut
1461 1730
1462sub ext_event($$%) { 1731sub ext_msg($$@) {
1463 my ($self, $type, %msg) = @_; 1732 my ($self, $type, @msg) = @_;
1464 1733
1465 $self->ns->ext_event ($type, %msg); 1734 $self->ns->ext_msg ($type, @msg);
1466} 1735}
1467 1736
1468=head3 cf::region 1737=head3 cf::region
1469 1738
1470=over 4 1739=over 4
1483 my ($path) = @_; 1752 my ($path) = @_;
1484 1753
1485 my ($match, $specificity); 1754 my ($match, $specificity);
1486 1755
1487 for my $region (list) { 1756 for my $region (list) {
1488 if ($region->match && $path =~ $region->match) { 1757 if ($region->{match} && $path =~ $region->{match}) {
1489 ($match, $specificity) = ($region, $region->specificity) 1758 ($match, $specificity) = ($region, $region->specificity)
1490 if $region->specificity > $specificity; 1759 if $region->specificity > $specificity;
1491 } 1760 }
1492 } 1761 }
1493 1762
1514our $MAX_RESET = 3600; 1783our $MAX_RESET = 3600;
1515our $DEFAULT_RESET = 3000; 1784our $DEFAULT_RESET = 3000;
1516 1785
1517sub generate_random_map { 1786sub generate_random_map {
1518 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
1519 # mit "rum" bekleckern, nicht 1791 # mit "rum" bekleckern, nicht
1520 $self->_create_random_map ( 1792 $self->_create_random_map (
1521 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1793 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1522 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1794 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1523 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1795 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1613 $self->init; # pass $1 etc. 1885 $self->init; # pass $1 etc.
1614 return $self; 1886 return $self;
1615 } 1887 }
1616 } 1888 }
1617 1889
1618 Carp::carp "unable to resolve path '$path' (base '$base')."; 1890 Carp::cluck "unable to resolve path '$path' (base '$base').";
1619 () 1891 ()
1620} 1892}
1621 1893
1622sub init { 1894sub init {
1623 my ($self) = @_; 1895 my ($self) = @_;
1645 1917
1646# the temporary/swap location 1918# the temporary/swap location
1647sub save_path { 1919sub save_path {
1648 my ($self) = @_; 1920 my ($self) = @_;
1649 1921
1650 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1922 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1651 "$TMPDIR/$path.map" 1923 "$TMPDIR/$path.map"
1652} 1924}
1653 1925
1654# the unique path, undef == no special unique path 1926# the unique path, undef == no special unique path
1655sub uniq_path { 1927sub uniq_path {
1656 my ($self) = @_; 1928 my ($self) = @_;
1657 1929
1658 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1930 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1659 "$UNIQUEDIR/$path" 1931 "$UNIQUEDIR/$path"
1660} 1932}
1661 1933
1662# and all this just because we cannot iterate over 1934# and all this just because we cannot iterate over
1663# all maps in C++... 1935# all maps in C++...
1686 1958
1687sub load_header_from($) { 1959sub load_header_from($) {
1688 my ($self, $path) = @_; 1960 my ($self, $path) = @_;
1689 1961
1690 utf8::encode $path; 1962 utf8::encode $path;
1691 #aio_open $path, O_RDONLY, 0 1963 my $f = new_from_file cf::object::thawer $path
1692 # or return;
1693
1694 $self->_load_header ($path)
1695 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;
1696 1971
1697 $self->{load_path} = $path; 1972 $self->{load_path} = $path;
1698 1973
1699 1 1974 1
1700} 1975}
1754sub find { 2029sub find {
1755 my ($path, $origin) = @_; 2030 my ($path, $origin) = @_;
1756 2031
1757 $path = normalise $path, $origin && $origin->path; 2032 $path = normalise $path, $origin && $origin->path;
1758 2033
2034 cf::lock_wait "map_data:$path";#d#remove
1759 cf::lock_wait "map_find:$path"; 2035 cf::lock_wait "map_find:$path";
1760 2036
1761 $cf::MAP{$path} || do { 2037 $cf::MAP{$path} || do {
2038 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1762 my $guard = cf::lock_acquire "map_find:$path"; 2039 my $guard2 = cf::lock_acquire "map_find:$path";
2040
1763 my $map = new_from_path cf::map $path 2041 my $map = new_from_path cf::map $path
1764 or return; 2042 or return;
1765 2043
1766 $map->{last_save} = $cf::RUNTIME; 2044 $map->{last_save} = $cf::RUNTIME;
1767 2045
1769 or return; 2047 or return;
1770 2048
1771 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2049 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1772 # doing this can freeze the server in a sync job, obviously 2050 # doing this can freeze the server in a sync job, obviously
1773 #$cf::WAIT_FOR_TICK->wait; 2051 #$cf::WAIT_FOR_TICK->wait;
2052 undef $guard2;
2053 undef $guard1;
1774 $map->reset; 2054 $map->reset;
1775 undef $guard;
1776 return find $path; 2055 return find $path;
1777 } 2056 }
1778 2057
1779 $cf::MAP{$path} = $map 2058 $cf::MAP{$path} = $map
1780 } 2059 }
1789 local $self->{deny_reset} = 1; # loading can take a long time 2068 local $self->{deny_reset} = 1; # loading can take a long time
1790 2069
1791 my $path = $self->{path}; 2070 my $path = $self->{path};
1792 2071
1793 { 2072 {
1794 my $guard = cf::lock_acquire "map_load:$path"; 2073 my $guard = cf::lock_acquire "map_data:$path";
1795 2074
2075 return unless $self->valid;
1796 return if $self->in_memory != cf::MAP_SWAPPED; 2076 return unless $self->in_memory == cf::MAP_SWAPPED;
1797 2077
1798 $self->in_memory (cf::MAP_LOADING); 2078 $self->in_memory (cf::MAP_LOADING);
1799 2079
1800 $self->alloc; 2080 $self->alloc;
1801 2081
1802 $self->pre_load; 2082 $self->pre_load;
1803 Coro::cede; 2083 cf::cede_to_tick;
1804 2084
2085 my $f = new_from_file cf::object::thawer $self->{load_path};
2086 $f->skip_block;
1805 $self->_load_objects ($self->{load_path}, 1) 2087 $self->_load_objects ($f)
1806 or return; 2088 or return;
1807 2089
1808 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2090 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1809 if delete $self->{load_original}; 2091 if delete $self->{load_original};
1810 2092
1811 if (my $uniq = $self->uniq_path) { 2093 if (my $uniq = $self->uniq_path) {
1812 utf8::encode $uniq; 2094 utf8::encode $uniq;
1813 if (aio_open $uniq, O_RDONLY, 0) { 2095 unless (aio_stat $uniq) {
2096 if (my $f = new_from_file cf::object::thawer $uniq) {
1814 $self->clear_unique_items; 2097 $self->clear_unique_items;
1815 $self->_load_objects ($uniq, 0); 2098 $self->_load_objects ($f);
2099 $f->resolve_delayed_derefs;
2100 }
1816 } 2101 }
1817 } 2102 }
1818 2103
1819 Coro::cede; 2104 $f->resolve_delayed_derefs;
2105
2106 cf::cede_to_tick;
1820 # now do the right thing for maps 2107 # now do the right thing for maps
1821 $self->link_multipart_objects; 2108 $self->link_multipart_objects;
1822 $self->difficulty ($self->estimate_difficulty) 2109 $self->difficulty ($self->estimate_difficulty)
1823 unless $self->difficulty; 2110 unless $self->difficulty;
1824 Coro::cede; 2111 cf::cede_to_tick;
1825 2112
1826 unless ($self->{deny_activate}) { 2113 unless ($self->{deny_activate}) {
1827 $self->decay_objects; 2114 $self->decay_objects;
1828 $self->fix_auto_apply; 2115 $self->fix_auto_apply;
1829 $self->update_buttons; 2116 $self->update_buttons;
1830 Coro::cede; 2117 cf::cede_to_tick;
1831 $self->set_darkness_map; 2118 $self->set_darkness_map;
1832 Coro::cede; 2119 cf::cede_to_tick;
1833 $self->activate; 2120 $self->activate;
1834 } 2121 }
1835 2122
2123 $self->{last_save} = $cf::RUNTIME;
2124 $self->last_access ($cf::RUNTIME);
2125
1836 $self->in_memory (cf::MAP_IN_MEMORY); 2126 $self->in_memory (cf::MAP_ACTIVE);
1837 } 2127 }
1838 2128
1839 $self->post_load; 2129 $self->post_load;
1840} 2130}
1841 2131
1850 2140
1851 $self 2141 $self
1852} 2142}
1853 2143
1854# 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
1855sub load_diag { 2145sub load_neighbours {
1856 my ($map) = @_; 2146 my ($map) = @_;
1857 2147
1858 my @diag; # diagonal neighbours 2148 my @neigh; # diagonal neighbours
1859 2149
1860 for (0 .. 3) { 2150 for (0 .. 3) {
1861 my $neigh = $map->tile_path ($_) 2151 my $neigh = $map->tile_path ($_)
1862 or next; 2152 or next;
1863 $neigh = find $neigh, $map 2153 $neigh = find $neigh, $map
1864 or next; 2154 or next;
1865 $neigh->load; 2155 $neigh->load;
1866 2156
2157 push @neigh,
1867 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2158 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1868 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2159 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1869 } 2160 }
1870 2161
1871 for (@diag) { 2162 for (grep defined $_->[0], @neigh) {
2163 my ($path, $origin) = @$_;
1872 my $neigh = find @$_ 2164 my $neigh = find $path, $origin
1873 or next; 2165 or next;
1874 $neigh->load; 2166 $neigh->load;
1875 } 2167 }
1876} 2168}
1877 2169
1882} 2174}
1883 2175
1884sub do_load_sync { 2176sub do_load_sync {
1885 my ($map) = @_; 2177 my ($map) = @_;
1886 2178
2179 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2180 if $Coro::current == $Coro::main;
2181
1887 cf::sync_job { $map->load }; 2182 cf::sync_job { $map->load };
1888} 2183}
1889 2184
1890our %MAP_PREFETCH; 2185our %MAP_PREFETCH;
1891our $MAP_PREFETCHER = undef; 2186our $MAP_PREFETCHER = undef;
1892 2187
1893sub find_async { 2188sub find_async {
1894 my ($path, $origin) = @_; 2189 my ($path, $origin, $load) = @_;
1895 2190
1896 $path = normalise $path, $origin && $origin->{path}; 2191 $path = normalise $path, $origin && $origin->{path};
1897 2192
1898 if (my $map = $cf::MAP{$path}) { 2193 if (my $map = $cf::MAP{$path}) {
1899 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2194 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1900 } 2195 }
1901 2196
1902 undef $MAP_PREFETCH{$path}; 2197 $MAP_PREFETCH{$path} |= $load;
2198
1903 $MAP_PREFETCHER ||= cf::async { 2199 $MAP_PREFETCHER ||= cf::async {
2200 $Coro::current->{desc} = "map prefetcher";
2201
1904 while (%MAP_PREFETCH) { 2202 while (%MAP_PREFETCH) {
1905 for my $path (keys %MAP_PREFETCH) { 2203 while (my ($k, $v) = each %MAP_PREFETCH) {
1906 my $map = find $path 2204 if (my $map = find $k) {
1907 or next;
1908 $map->load; 2205 $map->load if $v;
2206 }
1909 2207
1910 delete $MAP_PREFETCH{$path}; 2208 delete $MAP_PREFETCH{$k};
1911 } 2209 }
1912 } 2210 }
1913 undef $MAP_PREFETCHER; 2211 undef $MAP_PREFETCHER;
1914 }; 2212 };
1915 $MAP_PREFETCHER->prio (6); 2213 $MAP_PREFETCHER->prio (6);
1918} 2216}
1919 2217
1920sub save { 2218sub save {
1921 my ($self) = @_; 2219 my ($self) = @_;
1922 2220
1923 my $lock = cf::lock_acquire "map_data:" . $self->path; 2221 my $lock = cf::lock_acquire "map_data:$self->{path}";
1924 2222
1925 $self->{last_save} = $cf::RUNTIME; 2223 $self->{last_save} = $cf::RUNTIME;
1926 2224
1927 return unless $self->dirty; 2225 return unless $self->dirty;
1928 2226
1934 return if $self->{deny_save}; 2232 return if $self->{deny_save};
1935 2233
1936 local $self->{last_access} = $self->last_access;#d# 2234 local $self->{last_access} = $self->last_access;#d#
1937 2235
1938 cf::async { 2236 cf::async {
2237 $Coro::current->{desc} = "map player save";
1939 $_->contr->save for $self->players; 2238 $_->contr->save for $self->players;
1940 }; 2239 };
2240
2241 cf::get_slot 0.02;
1941 2242
1942 if ($uniq) { 2243 if ($uniq) {
1943 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2244 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1944 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2245 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1945 } else { 2246 } else {
1951 my ($self) = @_; 2252 my ($self) = @_;
1952 2253
1953 # save first because save cedes 2254 # save first because save cedes
1954 $self->save; 2255 $self->save;
1955 2256
1956 my $lock = cf::lock_acquire "map_data:" . $self->path; 2257 my $lock = cf::lock_acquire "map_data:$self->{path}";
1957 2258
1958 return if $self->players; 2259 return if $self->players;
1959 return if $self->in_memory != cf::MAP_IN_MEMORY; 2260 return if $self->in_memory != cf::MAP_ACTIVE;
1960 return if $self->{deny_save}; 2261 return if $self->{deny_save};
1961 2262
2263 $self->in_memory (cf::MAP_SWAPPED);
2264
2265 $self->deactivate;
2266 $_->clear_links_to ($self) for values %cf::MAP;
1962 $self->clear; 2267 $self->clear;
1963 $self->in_memory (cf::MAP_SWAPPED);
1964} 2268}
1965 2269
1966sub reset_at { 2270sub reset_at {
1967 my ($self) = @_; 2271 my ($self) = @_;
1968 2272
2000 if $uniq; 2304 if $uniq;
2001 } 2305 }
2002 2306
2003 delete $cf::MAP{$self->path}; 2307 delete $cf::MAP{$self->path};
2004 2308
2309 $self->deactivate;
2310 $_->clear_links_to ($self) for values %cf::MAP;
2005 $self->clear; 2311 $self->clear;
2006
2007 $_->clear_links_to ($self) for values %cf::MAP;
2008 2312
2009 $self->unlink_save; 2313 $self->unlink_save;
2010 $self->destroy; 2314 $self->destroy;
2011} 2315}
2012 2316
2013my $nuke_counter = "aaaa"; 2317my $nuke_counter = "aaaa";
2014 2318
2015sub nuke { 2319sub nuke {
2016 my ($self) = @_; 2320 my ($self) = @_;
2017 2321
2322 {
2323 my $lock = cf::lock_acquire "map_data:$self->{path}";
2324
2018 delete $cf::MAP{$self->path}; 2325 delete $cf::MAP{$self->path};
2019 2326
2020 $self->unlink_save; 2327 $self->unlink_save;
2021 2328
2022 bless $self, "cf::map"; 2329 bless $self, "cf::map";
2023 delete $self->{deny_reset}; 2330 delete $self->{deny_reset};
2024 $self->{deny_save} = 1; 2331 $self->{deny_save} = 1;
2025 $self->reset_timeout (1); 2332 $self->reset_timeout (1);
2026 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2333 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2027 2334
2028 $cf::MAP{$self->path} = $self; 2335 $cf::MAP{$self->path} = $self;
2336 }
2029 2337
2030 $self->reset; # polite request, might not happen 2338 $self->reset; # polite request, might not happen
2031} 2339}
2032 2340
2033=item $maps = cf::map::tmp_maps 2341=item $maps = cf::map::tmp_maps
2075 2383
2076sub unique_maps() { 2384sub unique_maps() {
2077 [ 2385 [
2078 map { 2386 map {
2079 utf8::decode $_; 2387 utf8::decode $_;
2080 /\.map$/ 2388 s/\.map$//; # TODO future compatibility hack
2389 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2390 ? ()
2081 ? normalise $_ 2391 : normalise $_
2082 : ()
2083 } @{ aio_readdir $UNIQUEDIR or [] } 2392 } @{ aio_readdir $UNIQUEDIR or [] }
2084 ] 2393 ]
2085} 2394}
2086 2395
2087package cf;
2088
2089=back 2396=back
2090 2397
2091=head3 cf::object 2398=head3 cf::object
2092 2399
2093=cut 2400=cut
2096 2403
2097=over 4 2404=over 4
2098 2405
2099=item $ob->inv_recursive 2406=item $ob->inv_recursive
2100 2407
2101Returns 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.
2102 2410
2103=cut 2411=cut
2104 2412
2105sub inv_recursive_; 2413sub inv_recursive_;
2106sub inv_recursive_ { 2414sub inv_recursive_ {
2109 2417
2110sub inv_recursive { 2418sub inv_recursive {
2111 inv_recursive_ inv $_[0] 2419 inv_recursive_ inv $_[0]
2112} 2420}
2113 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
2114package cf; 2450package cf;
2115 2451
2116=back 2452=back
2117 2453
2118=head3 cf::object::player 2454=head3 cf::object::player
2124Sends 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>
2125can 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
2126dialogue with the given NPC character. 2462dialogue with the given NPC character.
2127 2463
2128=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};
2129 2479
2130# rough implementation of a future "reply" method that works 2480# rough implementation of a future "reply" method that works
2131# with dialog boxes. 2481# with dialog boxes.
2132#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
2133sub cf::object::player::reply($$$;$) { 2483sub cf::object::player::reply($$$;$) {
2140 2490
2141 } else { 2491 } else {
2142 my $pl = $self->contr; 2492 my $pl = $self->contr;
2143 2493
2144 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2494 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2145 my $diag = $pl->{npc_dialog}; 2495 my $dialog = $pl->{npc_dialog};
2146 $diag->{pl}->ext_reply ( 2496 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2147 $diag->{id},
2148 msgtype => "reply",
2149 msg => $diag->{pl}->expand_cfpod ($msg),
2150 add_topics => []
2151 );
2152 2497
2153 } else { 2498 } else {
2154 $msg = $npc->name . " says: $msg" if $npc; 2499 $msg = $npc->name . " says: $msg" if $npc;
2155 $self->message ($msg, $flags); 2500 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2156 } 2501 }
2157 } 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 (@_);
2158} 2513}
2159 2514
2160=item $player_object->may ("access") 2515=item $player_object->may ("access")
2161 2516
2162Returns wether the given player is authorized to access resource "access" 2517Returns wether the given player is authorized to access resource "access"
2241 # use -1 or undef as default coordinates, not 0, 0 2596 # use -1 or undef as default coordinates, not 0, 0
2242 ($x, $y) = ($map->enter_x, $map->enter_y) 2597 ($x, $y) = ($map->enter_x, $map->enter_y)
2243 if $x <=0 && $y <= 0; 2598 if $x <=0 && $y <= 0;
2244 2599
2245 $map->load; 2600 $map->load;
2246 $map->load_diag; 2601 $map->load_neighbours;
2247 2602
2248 return unless $self->contr->active; 2603 return unless $self->contr->active;
2249 $self->activate_recursive; 2604 $self->activate_recursive;
2250 2605
2251 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2606 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2252 $self->enter_map ($map, $x, $y); 2607 $self->enter_map ($map, $x, $y);
2253} 2608}
2254 2609
2255=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2610=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2256 2611
2257Moves 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
2258her, loading and preparing them map, calling the provided $check callback 2613her, loading and preparing them map, calling the provided $check callback
2259that 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
2260the 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.
2261 2617
2262=cut 2618=cut
2263 2619
2264our $GOTOGEN; 2620our $GOTOGEN;
2265 2621
2266sub cf::object::player::goto { 2622sub cf::object::player::goto {
2267 my ($self, $path, $x, $y, $check) = @_; 2623 my ($self, $path, $x, $y, $check, $done) = @_;
2268 2624
2269 # 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
2270 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2626 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2271 2627
2272 $self->enter_link; 2628 $self->enter_link;
2273 2629
2274 (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
2275 my $map = eval { 2652 my $map = eval {
2276 my $map = cf::map::find $path; 2653 my $map = defined $path ? cf::map::find $path : undef;
2277 2654
2278 if ($map) { 2655 if ($map) {
2279 $map = $map->customise_for ($self); 2656 $map = $map->customise_for ($self);
2280 $map = $check->($map) if $check && $map; 2657 $map = $check->($map) if $check && $map;
2281 } else { 2658 } else {
2282 $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);
2283 } 2660 }
2284 2661
2285 $map 2662 $map
2286 }; 2663 };
2287 2664
2292 2669
2293 if ($gen == $self->{_goto_generation}) { 2670 if ($gen == $self->{_goto_generation}) {
2294 delete $self->{_goto_generation}; 2671 delete $self->{_goto_generation};
2295 $self->leave_link ($map, $x, $y); 2672 $self->leave_link ($map, $x, $y);
2296 } 2673 }
2674
2675 $done->() if $done;
2297 })->prio (1); 2676 })->prio (1);
2298} 2677}
2299 2678
2300=item $player_object->enter_exit ($exit_object) 2679=item $player_object->enter_exit ($exit_object)
2301 2680
2321} 2700}
2322 2701
2323sub prepare_random_map { 2702sub prepare_random_map {
2324 my ($exit) = @_; 2703 my ($exit) = @_;
2325 2704
2326 my $guard = cf::lock_acquire "exit_prepare:$exit";
2327
2328 # all this does is basically replace the /! path by 2705 # all this does is basically replace the /! path by
2329 # a new random map path (?random/...) with a seed 2706 # a new random map path (?random/...) with a seed
2330 # that depends on the exit object 2707 # that depends on the exit object
2331 2708
2332 my $rmp = parse_random_map_params $exit->msg; 2709 my $rmp = parse_random_map_params $exit->msg;
2334 if ($exit->map) { 2711 if ($exit->map) {
2335 $rmp->{region} = $exit->region->name; 2712 $rmp->{region} = $exit->region->name;
2336 $rmp->{origin_map} = $exit->map->path; 2713 $rmp->{origin_map} = $exit->map->path;
2337 $rmp->{origin_x} = $exit->x; 2714 $rmp->{origin_x} = $exit->x;
2338 $rmp->{origin_y} = $exit->y; 2715 $rmp->{origin_y} = $exit->y;
2716
2717 $exit->map->touch;
2339 } 2718 }
2340 2719
2341 $rmp->{random_seed} ||= $exit->random_seed; 2720 $rmp->{random_seed} ||= $exit->random_seed;
2342 2721
2343 my $data = cf::to_json $rmp; 2722 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2344 my $md5 = Digest::MD5::md5_hex $data; 2723 my $md5 = Digest::MD5::md5_hex $data;
2345 my $meta = "$RANDOMDIR/$md5.meta"; 2724 my $meta = "$RANDOMDIR/$md5.meta";
2346 2725
2347 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2726 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2348 aio_write $fh, 0, (length $data), $data, 0; 2727 aio_write $fh, 0, (length $data), $data, 0;
2349 undef $fh; 2728 undef $fh;
2350 aio_rename "$meta~", $meta; 2729 aio_rename "$meta~", $meta;
2351 2730
2731 my $slaying = "?random/$md5";
2732
2733 if ($exit->valid) {
2352 $exit->slaying ("?random/$md5"); 2734 $exit->slaying ("?random/$md5");
2353 $exit->msg (undef); 2735 $exit->msg (undef);
2736 }
2354 } 2737 }
2355} 2738}
2356 2739
2357sub cf::object::player::enter_exit { 2740sub cf::object::player::enter_exit {
2358 my ($self, $exit) = @_; 2741 my ($self, $exit) = @_;
2359 2742
2360 return unless $self->type == cf::PLAYER; 2743 return unless $self->type == cf::PLAYER;
2361 2744
2362 if ($exit->slaying eq "/!") {
2363 #TODO: this should de-fi-ni-te-ly not be a sync-job
2364 # the problem is that $exit might not survive long enough
2365 # so it needs to be done right now, right here
2366 cf::sync_job { prepare_random_map $exit };
2367 }
2368
2369 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2370 my $hp = $exit->stats->hp;
2371 my $sp = $exit->stats->sp;
2372
2373 $self->enter_link; 2745 $self->enter_link;
2374 2746
2375 # if exit is damned, update players death & WoR home-position
2376 $self->contr->savebed ($slaying, $hp, $sp)
2377 if $exit->flag (FLAG_DAMNED);
2378
2379 (async { 2747 (async {
2380 $self->deactivate_recursive; # just to be sure 2748 $Coro::current->{desc} = "enter_exit";
2749
2381 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
2382 $self->goto ($slaying, $hp, $sp); 2765 $self->goto ($map, $x, $y);
2383 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
2384 1; 2771 1
2385 }) { 2772 }) {
2386 $self->message ("Something went wrong deep within the crossfire server. " 2773 $self->message ("Something went wrong deep within the crossfire server. "
2387 . "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. "
2388 . "Please report this to the dungeon master!", 2775 . "Please report this to the dungeon master!",
2389 cf::NDI_UNIQUE | cf::NDI_RED); 2776 cf::NDI_UNIQUE | cf::NDI_RED);
2410 2797
2411 utf8::encode $text; 2798 utf8::encode $text;
2412 $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);
2413} 2800}
2414 2801
2415=item $client->send_msg ($color, $type, $msg, [extra...]) 2802=item $client->send_msg ($channel, $msg, $color, [extra...])
2416 2803
2417Send a drawinfo or msg packet to the client, formatting the msg for the 2804Send a drawinfo or msg packet to the client, formatting the msg for the
2418client if neccessary. C<$type> should be a string identifying the type of 2805client if neccessary. C<$type> should be a string identifying the type of
2419the message, with C<log> being the default. If C<$color> is negative, suppress 2806the message, with C<log> being the default. If C<$color> is negative, suppress
2420the message unless the client supports the msg packet. 2807the message unless the client supports the msg packet.
2421 2808
2422=cut 2809=cut
2423 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
2424sub cf::client::send_msg { 2869sub cf::client::send_msg {
2425 my ($self, $color, $type, $msg, @extra) = @_; 2870 my ($self, $channel, $msg, $color, @extra) = @_;
2426 2871
2427 $msg = $self->pl->expand_cfpod ($msg); 2872 $msg = $self->pl->expand_cfpod ($msg);
2428 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
2429 return unless @extra || length $msg; 2896 return unless @extra || length $msg;
2430 2897
2431 if ($self->can_msg) { 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
2432 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2903 $self->send_packet ("msg " . $self->{json_coder}->encode (
2904 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2433 } else { 2905 } else {
2434 # replace some tags by gcfclient-compatible ones
2435 for ($msg) {
2436 1 while
2437 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2438 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2439 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2440 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2441 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2442 }
2443
2444 if ($color >= 0) { 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
2445 if (0 && $msg =~ /\[/) { 2921 if (0 && $msg =~ /\[/) {
2922 # COMMAND/INFO
2446 $self->send_packet ("drawextinfo $color 4 0 $msg") 2923 $self->send_packet ("drawextinfo $color 10 8 $msg")
2447 } else { 2924 } else {
2448 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2925 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2449 $self->send_packet ("drawinfo $color $msg") 2926 $self->send_packet ("drawinfo $color $msg")
2450 } 2927 }
2451 } 2928 }
2452 } 2929 }
2453} 2930}
2454 2931
2455=item $client->ext_event ($type, %msg) 2932=item $client->ext_msg ($type, @msg)
2456 2933
2457Sends an ext event to the client. 2934Sends an ext event to the client.
2458 2935
2459=cut 2936=cut
2460 2937
2461sub cf::client::ext_event($$%) { 2938sub cf::client::ext_msg($$@) {
2462 my ($self, $type, %msg) = @_; 2939 my ($self, $type, @msg) = @_;
2463 2940
2941 if ($self->extcmd == 2) {
2942 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2943 } elsif ($self->extcmd == 1) { # TODO: remove
2464 $msg{msgtype} = "event_$type"; 2944 push @msg, msgtype => "event_$type";
2465 $self->send_packet ("ext " . $self->{json_coder}->encode (\%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 }
2466} 2965}
2467 2966
2468=item $success = $client->query ($flags, "text", \&cb) 2967=item $success = $client->query ($flags, "text", \&cb)
2469 2968
2470Queues a query to the client, calling the given callback with 2969Queues a query to the client, calling the given callback with
2525 my ($ns, $buf) = @_; 3024 my ($ns, $buf) = @_;
2526 3025
2527 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3026 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2528 3027
2529 if (ref $msg) { 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
2530 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3036 if (my $cb = $EXTICMD{$type}) {
2531 if (my %reply = $cb->($ns, $msg)) { 3037 @reply = $cb->($ns, @payload);
2532 $reply{msgid} = $msg->{msgid};
2533 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2534 }
2535 } 3038 }
3039
3040 $ns->ext_reply ($reply, @reply)
3041 if $reply;
3042
2536 } else { 3043 } else {
2537 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3044 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2538 } 3045 }
2539 3046
2540 cf::override; 3047 cf::override;
2587our $safe = new Safe "safe"; 3094our $safe = new Safe "safe";
2588our $safe_hole = new Safe::Hole; 3095our $safe_hole = new Safe::Hole;
2589 3096
2590$SIG{FPE} = 'IGNORE'; 3097$SIG{FPE} = 'IGNORE';
2591 3098
2592$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));
2593 3104
2594# here we export the classes and methods available to script code 3105# here we export the classes and methods available to script code
2595 3106
2596=pod 3107=pod
2597 3108
2598The following functions and methods are available within a safe environment: 3109The following functions and methods are available within a safe environment:
2599 3110
2600 cf::object 3111 cf::object
2601 contr pay_amount pay_player map x y force_find force_add 3112 contr pay_amount pay_player map x y force_find force_add destroy
2602 insert remove 3113 insert remove name archname title slaying race decrease split
2603 3114
2604 cf::object::player 3115 cf::object::player
2605 player 3116 player
2606 3117
2607 cf::player 3118 cf::player
2612 3123
2613=cut 3124=cut
2614 3125
2615for ( 3126for (
2616 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3127 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2617 insert remove)], 3128 insert remove inv nrof name archname title slaying race
3129 decrease split destroy)],
2618 ["cf::object::player" => qw(player)], 3130 ["cf::object::player" => qw(player)],
2619 ["cf::player" => qw(peaceful)], 3131 ["cf::player" => qw(peaceful)],
2620 ["cf::map" => qw(trigger)], 3132 ["cf::map" => qw(trigger)],
2621) { 3133) {
2622 no strict 'refs'; 3134 no strict 'refs';
2698# the server's init and main functions 3210# the server's init and main functions
2699 3211
2700sub load_facedata($) { 3212sub load_facedata($) {
2701 my ($path) = @_; 3213 my ($path) = @_;
2702 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
2703 warn "loading facedata from $path\n"; 3221 warn "loading facedata from $path\n";
2704 3222
2705 my $facedata; 3223 my $facedata;
2706 0 < aio_load $path, $facedata 3224 0 < aio_load $path, $facedata
2707 or die "$path: $!"; 3225 or die "$path: $!";
2709 $facedata = Coro::Storable::thaw $facedata; 3227 $facedata = Coro::Storable::thaw $facedata;
2710 3228
2711 $facedata->{version} == 2 3229 $facedata->{version} == 2
2712 or cf::cleanup "$path: version mismatch, cannot proceed."; 3230 or cf::cleanup "$path: version mismatch, cannot proceed.";
2713 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
2714 { 3239 {
2715 my $faces = $facedata->{faceinfo}; 3240 my $faces = $facedata->{faceinfo};
2716 3241
2717 while (my ($face, $info) = each %$faces) { 3242 while (my ($face, $info) = each %$faces) {
2718 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3243 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3244
2719 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3245 cf::face::set_visibility $idx, $info->{visibility};
3246 cf::face::set_magicmap $idx, $info->{magicmap};
2720 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3247 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2721 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3248 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2722 Coro::cede; 3249
3250 cf::cede_to_tick;
2723 } 3251 }
2724 3252
2725 while (my ($face, $info) = each %$faces) { 3253 while (my ($face, $info) = each %$faces) {
2726 next unless $info->{smooth}; 3254 next unless $info->{smooth};
3255
2727 my $idx = cf::face::find $face 3256 my $idx = cf::face::find $face
2728 or next; 3257 or next;
3258
2729 if (my $smooth = cf::face::find $info->{smooth}) { 3259 if (my $smooth = cf::face::find $info->{smooth}) {
3260 cf::face::set_smooth $idx, $smooth;
2730 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3261 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2731 } else { 3262 } else {
2732 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3263 warn "smooth face '$info->{smooth}' not found for face '$face'";
2733 } 3264 }
2734 Coro::cede; 3265
3266 cf::cede_to_tick;
2735 } 3267 }
2736 } 3268 }
2737 3269
2738 { 3270 {
2739 my $anims = $facedata->{animinfo}; 3271 my $anims = $facedata->{animinfo};
2740 3272
2741 while (my ($anim, $info) = each %$anims) { 3273 while (my ($anim, $info) = each %$anims) {
2742 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3274 cf::anim::set $anim, $info->{frames}, $info->{facings};
2743 Coro::cede; 3275 cf::cede_to_tick;
2744 } 3276 }
2745 3277
2746 cf::anim::invalidate_all; # d'oh 3278 cf::anim::invalidate_all; # d'oh
2747 } 3279 }
2748 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
2749 1 3316 1
2750} 3317}
2751 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
2752sub 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
2753 load_resource_file "$MAPDIR/regions" 3362 load_resource_file "$MAPDIR/regions"
2754 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 }
2755} 3369}
2756 3370
2757sub reload_facedata { 3371sub reload_facedata {
2758 load_facedata "$DATADIR/facedata" 3372 load_facedata "$DATADIR/facedata"
2759 or die "unable to load facedata\n"; 3373 or die "unable to load facedata\n";
2760} 3374}
2761 3375
2762sub reload_archetypes { 3376sub reload_archetypes {
2763 load_resource_file "$DATADIR/archetypes" 3377 load_resource_file "$DATADIR/archetypes"
2764 or die "unable to load archetypes\n"; 3378 or die "unable to load archetypes\n";
2765 #d# NEED to laod twice to resolve forward references
2766 # this really needs to be done in an extra post-pass
2767 # (which needs to be synchronous, so solve it differently)
2768 load_resource_file "$DATADIR/archetypes"
2769 or die "unable to load archetypes\n";
2770} 3379}
2771 3380
2772sub reload_treasures { 3381sub reload_treasures {
2773 load_resource_file "$DATADIR/treasures" 3382 load_resource_file "$DATADIR/treasures"
2774 or die "unable to load treasurelists\n"; 3383 or die "unable to load treasurelists\n";
2775} 3384}
2776 3385
2777sub reload_resources { 3386sub reload_resources {
2778 warn "reloading resource files...\n"; 3387 warn "reloading resource files...\n";
2779 3388
3389 reload_facedata;
3390 reload_archetypes;
2780 reload_regions; 3391 reload_regions;
2781 reload_facedata;
2782 #reload_archetypes;#d#
2783 reload_archetypes;
2784 reload_treasures; 3392 reload_treasures;
2785 3393
2786 warn "finished reloading resource files\n"; 3394 warn "finished reloading resource files\n";
2787} 3395}
2788 3396
2789sub init { 3397sub init {
3398 my $guard = freeze_mainloop;
3399
2790 reload_resources; 3400 reload_resources;
2791} 3401}
2792 3402
2793sub cfg_load { 3403sub reload_config {
2794 open my $fh, "<:utf8", "$CONFDIR/config" 3404 open my $fh, "<:utf8", "$CONFDIR/config"
2795 or return; 3405 or return;
2796 3406
2797 local $/; 3407 local $/;
2798 *CFG = YAML::Syck::Load <$fh>; 3408 *CFG = YAML::Load <$fh>;
2799 3409
2800 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3410 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2801 3411
2802 $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};
2803 $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};
2814sub main { 3424sub main {
2815 # we must not ever block the main coroutine 3425 # we must not ever block the main coroutine
2816 local $Coro::idle = sub { 3426 local $Coro::idle = sub {
2817 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#
2818 (async { 3428 (async {
2819 Event::one_event; 3429 $Coro::current->{desc} = "IDLE BUG HANDLER";
3430 EV::loop EV::LOOP_ONESHOT;
2820 })->prio (Coro::PRIO_MAX); 3431 })->prio (Coro::PRIO_MAX);
2821 }; 3432 };
2822 3433
2823 cfg_load; 3434 {
3435 my $guard = freeze_mainloop;
3436 reload_config;
2824 db_init; 3437 db_init;
2825 load_extensions; 3438 load_extensions;
2826 3439
2827 $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
2828 Event::loop; 3444 EV::loop;
2829} 3445}
2830 3446
2831############################################################################# 3447#############################################################################
2832# initialisation and cleanup 3448# initialisation and cleanup
2833 3449
2834# install some emergency cleanup handlers 3450# install some emergency cleanup handlers
2835BEGIN { 3451BEGIN {
3452 our %SIGWATCHER = ();
2836 for my $signal (qw(INT HUP TERM)) { 3453 for my $signal (qw(INT HUP TERM)) {
2837 Event->signal ( 3454 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2838 reentrant => 0,
2839 data => WF_AUTOCANCEL,
2840 signal => $signal,
2841 prio => 0,
2842 cb => sub {
2843 cf::cleanup "SIG$signal"; 3455 cf::cleanup "SIG$signal";
2844 },
2845 ); 3456 };
2846 } 3457 }
2847} 3458}
2848 3459
2849sub write_runtime { 3460sub write_runtime_sync {
2850 my $runtime = "$LOCALDIR/runtime"; 3461 my $runtime = "$LOCALDIR/runtime";
2851 3462
2852 # first touch the runtime file to show we are still running: 3463 # first touch the runtime file to show we are still running:
2853 # the fsync below can take a very very long time. 3464 # the fsync below can take a very very long time.
2854 3465
2880 and return; 3491 and return;
2881 3492
2882 warn "runtime file written.\n"; 3493 warn "runtime file written.\n";
2883 3494
2884 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 };
2885} 3539}
2886 3540
2887sub emergency_save() { 3541sub emergency_save() {
2888 my $freeze_guard = cf::freeze_mainloop; 3542 my $freeze_guard = cf::freeze_mainloop;
2889 3543
2895 # and maps saved/destroyed asynchronously. 3549 # and maps saved/destroyed asynchronously.
2896 warn "begin emergency player save\n"; 3550 warn "begin emergency player save\n";
2897 for my $login (keys %cf::PLAYER) { 3551 for my $login (keys %cf::PLAYER) {
2898 my $pl = $cf::PLAYER{$login} or next; 3552 my $pl = $cf::PLAYER{$login} or next;
2899 $pl->valid or next; 3553 $pl->valid or next;
3554 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2900 $pl->save; 3555 $pl->save;
2901 } 3556 }
2902 warn "end emergency player save\n"; 3557 warn "end emergency player save\n";
2903 3558
2904 warn "begin emergency map save\n"; 3559 warn "begin emergency map save\n";
2910 warn "end emergency map save\n"; 3565 warn "end emergency map save\n";
2911 3566
2912 warn "begin emergency database checkpoint\n"; 3567 warn "begin emergency database checkpoint\n";
2913 BDB::db_env_txn_checkpoint $DB_ENV; 3568 BDB::db_env_txn_checkpoint $DB_ENV;
2914 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";
2915 }; 3574 };
2916 3575
2917 warn "leave emergency perl save\n"; 3576 warn "leave emergency perl save\n";
2918} 3577}
2919 3578
2934 warn "reloading..."; 3593 warn "reloading...";
2935 3594
2936 warn "entering sync_job"; 3595 warn "entering sync_job";
2937 3596
2938 cf::sync_job { 3597 cf::sync_job {
2939 cf::write_runtime; # external watchdog should not bark 3598 cf::write_runtime_sync; # external watchdog should not bark
2940 cf::emergency_save; 3599 cf::emergency_save;
2941 cf::write_runtime; # external watchdog should not bark 3600 cf::write_runtime_sync; # external watchdog should not bark
2942 3601
2943 warn "syncing database to disk"; 3602 warn "syncing database to disk";
2944 BDB::db_env_txn_checkpoint $DB_ENV; 3603 BDB::db_env_txn_checkpoint $DB_ENV;
2945 3604
2946 # 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
2947
2948 warn "cancelling all WF_AUTOCANCEL watchers";
2949 for (Event::all_watchers) {
2950 $_->cancel if $_->data & WF_AUTOCANCEL;
2951 }
2952 3606
2953 warn "flushing outstanding aio requests"; 3607 warn "flushing outstanding aio requests";
2954 for (;;) { 3608 for (;;) {
2955 BDB::flush; 3609 BDB::flush;
2956 IO::AIO::flush; 3610 IO::AIO::flush;
2957 Coro::cede; 3611 Coro::cede_notself;
2958 last unless IO::AIO::nreqs || BDB::nreqs; 3612 last unless IO::AIO::nreqs || BDB::nreqs;
2959 warn "iterate..."; 3613 warn "iterate...";
2960 } 3614 }
2961 3615
2962 ++$RELOAD; 3616 ++$RELOAD;
3021 warn "reloading cf.pm"; 3675 warn "reloading cf.pm";
3022 require cf; 3676 require cf;
3023 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3677 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3024 3678
3025 warn "loading config and database again"; 3679 warn "loading config and database again";
3026 cf::cfg_load; 3680 cf::reload_config;
3027 3681
3028 warn "loading extensions"; 3682 warn "loading extensions";
3029 cf::load_extensions; 3683 cf::load_extensions;
3030 3684
3031 warn "reattaching attachments to objects/players"; 3685 warn "reattaching attachments to objects/players";
3038 warn "leaving sync_job"; 3692 warn "leaving sync_job";
3039 3693
3040 1 3694 1
3041 } or do { 3695 } or do {
3042 warn $@; 3696 warn $@;
3043 warn "error while reloading, exiting."; 3697 cf::cleanup "error while reloading, exiting.";
3044 exit 1;
3045 }; 3698 };
3046 3699
3047 warn "reloaded"; 3700 warn "reloaded";
3048}; 3701};
3049 3702
3051 3704
3052sub reload_perl() { 3705sub reload_perl() {
3053 # doing reload synchronously and two reloads happen back-to-back, 3706 # doing reload synchronously and two reloads happen back-to-back,
3054 # coro crashes during coro_state_free->destroy here. 3707 # coro crashes during coro_state_free->destroy here.
3055 3708
3056 $RELOAD_WATCHER ||= Event->timer ( 3709 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3057 reentrant => 0,
3058 after => 0,
3059 data => WF_AUTOCANCEL,
3060 cb => sub {
3061 do_reload_perl; 3710 do_reload_perl;
3062 undef $RELOAD_WATCHER; 3711 undef $RELOAD_WATCHER;
3063 },
3064 ); 3712 };
3065} 3713}
3066 3714
3067register_command "reload" => sub { 3715register_command "reload" => sub {
3068 my ($who, $arg) = @_; 3716 my ($who, $arg) = @_;
3069 3717
3070 if ($who->flag (FLAG_WIZ)) { 3718 if ($who->flag (FLAG_WIZ)) {
3071 $who->message ("reloading server."); 3719 $who->message ("reloading server.");
3720 async {
3721 $Coro::current->{desc} = "perl_reload";
3072 async { reload_perl }; 3722 reload_perl;
3723 };
3073 } 3724 }
3074}; 3725};
3075 3726
3076unshift @INC, $LIBDIR; 3727unshift @INC, $LIBDIR;
3077 3728
3079 3730
3080our @WAIT_FOR_TICK; 3731our @WAIT_FOR_TICK;
3081our @WAIT_FOR_TICK_BEGIN; 3732our @WAIT_FOR_TICK_BEGIN;
3082 3733
3083sub wait_for_tick { 3734sub wait_for_tick {
3084 return unless $TICK_WATCHER->is_active;
3085 return if $Coro::current == $Coro::main; 3735 return if tick_inhibit || $Coro::current == $Coro::main;
3086 3736
3087 my $signal = new Coro::Signal; 3737 my $signal = new Coro::Signal;
3088 push @WAIT_FOR_TICK, $signal; 3738 push @WAIT_FOR_TICK, $signal;
3089 $signal->wait; 3739 $signal->wait;
3090} 3740}
3091 3741
3092sub wait_for_tick_begin { 3742sub wait_for_tick_begin {
3093 return unless $TICK_WATCHER->is_active;
3094 return if $Coro::current == $Coro::main; 3743 return if tick_inhibit || $Coro::current == $Coro::main;
3095 3744
3096 my $signal = new Coro::Signal; 3745 my $signal = new Coro::Signal;
3097 push @WAIT_FOR_TICK_BEGIN, $signal; 3746 push @WAIT_FOR_TICK_BEGIN, $signal;
3098 $signal->wait; 3747 $signal->wait;
3099} 3748}
3100 3749
3101 my $min = 1e6;#d# 3750sub tick {
3102 my $avg = 10;
3103$TICK_WATCHER = Event->timer (
3104 reentrant => 0,
3105 parked => 1,
3106 prio => 0,
3107 at => $NEXT_TICK || $TICK,
3108 data => WF_AUTOCANCEL,
3109 cb => sub {
3110 if ($Coro::current != $Coro::main) { 3751 if ($Coro::current != $Coro::main) {
3111 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"
3112 unless ++$bug_warning > 10; 3753 unless ++$bug_warning > 10;
3113 return; 3754 return;
3114 } 3755 }
3115 3756
3116 $NOW = $tick_start = Event::time;
3117
3118 cf::server_tick; # one server iteration 3757 cf::server_tick; # one server iteration
3119 3758
3120 0 && sync_job {#d# 3759 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3121 for(1..10) { 3760 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3122 my $t = Event::time; 3761 Coro::async_pool {
3123 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3762 $Coro::current->{desc} = "runtime saver";
3124 or die; 3763 write_runtime_sync
3125 3764 or warn "ERROR: unable to write runtime file: $!";
3126 $map->width (50);
3127 $map->height (50);
3128 $map->alloc;
3129 $map->_load_objects ("/tmp/x.map", 1);
3130 my $t = Event::time - $t;
3131
3132 #next unless $t < 0.0013;#d#
3133 if ($t < $min) {
3134 $min = $t;
3135 }
3136 $avg = $avg * 0.99 + $t * 0.01;
3137 }
3138 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3139 exit 0;
3140 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3141 }; 3765 };
3766 }
3142 3767
3143 $RUNTIME += $TICK;
3144 $NEXT_TICK += $TICK;
3145
3146 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3147 $NEXT_RUNTIME_WRITE = $NOW + 10;
3148 Coro::async_pool {
3149 write_runtime
3150 or warn "ERROR: unable to write runtime file: $!";
3151 };
3152 }
3153
3154# my $AFTER = Event::time;
3155# warn $AFTER - $NOW;#d#
3156
3157 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3768 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3158 $sig->send; 3769 $sig->send;
3159 } 3770 }
3160 while (my $sig = shift @WAIT_FOR_TICK) { 3771 while (my $sig = shift @WAIT_FOR_TICK) {
3161 $sig->send; 3772 $sig->send;
3162 } 3773 }
3163 3774
3164 $NOW = Event::time; 3775 $LOAD = ($NOW - $TICK_START) / $TICK;
3165
3166 # if we are delayed by four ticks or more, skip them all
3167 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3168
3169 $TICK_WATCHER->at ($NEXT_TICK);
3170 $TICK_WATCHER->start;
3171
3172 $LOAD = ($NOW - $tick_start) / $TICK;
3173 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3776 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3174 3777
3175 _post_tick; 3778 if (0) {
3176 3779 if ($NEXT_TICK) {
3177 3780 my $jitter = $TICK_START - $NEXT_TICK;
3781 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3782 warn "jitter $JITTER\n";#d#
3783 }
3178 }, 3784 }
3179); 3785}
3180 3786
3181{ 3787{
3182 BDB::max_poll_time $TICK * 0.1; 3788 # configure BDB
3183 $BDB_POLL_WATCHER = Event->io ( 3789
3184 reentrant => 0,
3185 fd => BDB::poll_fileno,
3186 poll => 'r',
3187 prio => 0,
3188 data => WF_AUTOCANCEL,
3189 cb => \&BDB::poll_cb,
3190 );
3191 BDB::min_parallel 8; 3790 BDB::min_parallel 8;
3192 3791 BDB::max_poll_reqs $TICK * 0.1;
3193 BDB::set_sync_prepare { 3792 $Coro::BDB::WATCHER->priority (1);
3194 my $status;
3195 my $current = $Coro::current;
3196 (
3197 sub {
3198 $status = $!;
3199 $current->ready; undef $current;
3200 },
3201 sub {
3202 Coro::schedule while defined $current;
3203 $! = $status;
3204 },
3205 )
3206 };
3207 3793
3208 unless ($DB_ENV) { 3794 unless ($DB_ENV) {
3209 $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);
3210 3800
3211 cf::sync_job { 3801 cf::sync_job {
3212 eval { 3802 eval {
3213 BDB::db_env_open 3803 BDB::db_env_open
3214 $DB_ENV, 3804 $DB_ENV,
3216 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
3217 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3807 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3218 0666; 3808 0666;
3219 3809
3220 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3810 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3221
3222 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3223 $DB_ENV->set_lk_detect;
3224 }; 3811 };
3225 3812
3226 cf::cleanup "db_env_open(db): $@" if $@; 3813 cf::cleanup "db_env_open(db): $@" if $@;
3227 }; 3814 };
3228 } 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 };
3229} 3826}
3230 3827
3231{ 3828{
3829 # configure IO::AIO
3830
3232 IO::AIO::min_parallel 8; 3831 IO::AIO::min_parallel 8;
3233
3234 undef $Coro::AIO::WATCHER;
3235 IO::AIO::max_poll_time $TICK * 0.1; 3832 IO::AIO::max_poll_time $TICK * 0.1;
3236 $AIO_POLL_WATCHER = Event->io ( 3833 $Coro::AIO::WATCHER->priority (1);
3237 reentrant => 0,
3238 data => WF_AUTOCANCEL,
3239 fd => IO::AIO::poll_fileno,
3240 poll => 'r',
3241 prio => 6,
3242 cb => \&IO::AIO::poll_cb,
3243 );
3244} 3834}
3245 3835
3246my $_log_backtrace; 3836my $_log_backtrace;
3247 3837
3248sub _log_backtrace { 3838sub _log_backtrace {
3252 3842
3253 # limit the # of concurrent backtraces 3843 # limit the # of concurrent backtraces
3254 if ($_log_backtrace < 2) { 3844 if ($_log_backtrace < 2) {
3255 ++$_log_backtrace; 3845 ++$_log_backtrace;
3256 async { 3846 async {
3847 $Coro::current->{desc} = "abt $msg";
3848
3257 my @bt = fork_call { 3849 my @bt = fork_call {
3258 @addr = map { sprintf "%x", $_ } @addr; 3850 @addr = map { sprintf "%x", $_ } @addr;
3259 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3851 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3260 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 |"
3261 or die "addr2line: $!"; 3853 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines