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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines