ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.282 by elmex, Tue Jun 19 18:15:34 2007 UTC vs.
Revision 1.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
49use JSON::XS 2.01 ();
25use BDB (); 50use BDB ();
26use Data::Dumper; 51use Data::Dumper;
27use Digest::MD5; 52use Digest::MD5;
28use Fcntl; 53use Fcntl;
29use YAML::Syck (); 54use YAML ();
30use IO::AIO 2.32 (); 55use IO::AIO ();
31use Time::HiRes; 56use Time::HiRes;
32use Compress::LZF; 57use Compress::LZF;
58use Digest::MD5 ();
59
60AnyEvent::detect;
33 61
34# configure various modules to our taste 62# configure various modules to our taste
35# 63#
36$Storable::canonical = 1; # reduce rsync transfers 64$Storable::canonical = 1; # reduce rsync transfers
37Coro::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
38Compress::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
39 67
40$Event::Eval = 1; # no idea why this is required, but it is
41
42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
43$YAML::Syck::ImplicitUnicode = 1;
44
45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 68$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46 69
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 70sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
48 71
49our %COMMAND = (); 72our %COMMAND = ();
50our %COMMAND_TIME = (); 73our %COMMAND_TIME = ();
51 74
52our @EXTS = (); # list of extension package names 75our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 76our %EXTCMD = ();
77our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 78our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 79our %EXT_MAP = (); # pluggable maps
56 80
57our $RELOAD; # number of reloads so far 81our $RELOAD; # number of reloads so far
58our @EVENT; 82our @EVENT;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 90our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 91our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 92our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 93our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 94our $BDBDIR = "$LOCALDIR/db";
95our %RESOURCE;
71 96
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 97our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
73our $TICK_WATCHER;
74our $AIO_POLL_WATCHER;
75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 98our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
76our $NEXT_TICK; 99our $NEXT_TICK;
77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 100our $USE_FSYNC = 1; # use fsync to write maps - default off
79 101
102our $BDB_DEADLOCK_WATCHER;
103our $BDB_CHECKPOINT_WATCHER;
80our $BDB_POLL_WATCHER; 104our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 105our $DB_ENV;
82 106
83our %CFG; 107our %CFG;
84 108
85our $UPTIME; $UPTIME ||= time; 109our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 110our $RUNTIME;
111our $NOW;
87 112
88our %PLAYER; # all users 113our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 114our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 115our $LINK_MAP; # the special {link} map, which is always available
91 116
92# 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 ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 118our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 119
95our $LOAD; # a number between 0 (idle) and 1 (too many objects) 120our $LOAD; # a number between 0 (idle) and 1 (too many objects)
96our $LOADAVG; # same thing, but with alpha-smoothing 121our $LOADAVG; # same thing, but with alpha-smoothing
122our $JITTER; # average jitter
97our $tick_start; # for load detecting purposes 123our $TICK_START; # for load detecting purposes
98 124
99binmode STDOUT; 125binmode STDOUT;
100binmode STDERR; 126binmode STDERR;
101 127
102# read virtual server time, if available 128# read virtual server time, if available
155 181
156The raw value load value from the last tick. 182The raw value load value from the last tick.
157 183
158=item %cf::CFG 184=item %cf::CFG
159 185
160Configuration for the server, loaded from C</etc/crossfire/config>, or 186Configuration for the server, loaded from C</etc/deliantra-server/config>, or
161from wherever your confdir points to. 187from wherever your confdir points to.
162 188
163=item cf::wait_for_tick, cf::wait_for_tick_begin 189=item cf::wait_for_tick, cf::wait_for_tick_begin
164 190
165These 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
166returns 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
167per 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.
168 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
169=back 201=back
170 202
171=cut 203=cut
172 204
173BEGIN { 205BEGIN {
177 $msg .= "\n" 209 $msg .= "\n"
178 unless $msg =~ /\n$/; 210 unless $msg =~ /\n$/;
179 211
180 $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;
181 213
182 utf8::encode $msg;
183 LOG llevError, $msg; 214 LOG llevError, $msg;
184 }; 215 };
185} 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#?
186 232
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 233@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 234@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 235@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 236@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
203)) { 249)) {
204 no strict 'refs'; 250 no strict 'refs';
205 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 251 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
206} 252}
207 253
208$Event::DIED = sub { 254$EV::DIED = sub {
209 warn "error in event callback: @_"; 255 warn "error in event callback: @_";
210}; 256};
211 257
212############################################################################# 258#############################################################################
213 259
236 $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;
237 $d 283 $d
238 } || "[unable to dump $_[0]: '$@']"; 284 } || "[unable to dump $_[0]: '$@']";
239} 285}
240 286
241use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
242
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.
294
295=cut
296
297our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
298
299sub encode_json($) { $json_coder->encode ($_[0]) }
300sub decode_json($) { $json_coder->decode ($_[0]) }
250 301
251=item cf::lock_wait $string 302=item cf::lock_wait $string
252 303
253Wait until the given lock is available. See cf::lock_acquire. 304Wait until the given lock is available. See cf::lock_acquire.
254 305
257Wait 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
258a 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,
259for example when the coroutine gets canceled), the lock is automatically 310for example when the coroutine gets canceled), the lock is automatically
260returned. 311returned.
261 312
313Locks are *not* recursive, locking from the same coro twice results in a
314deadlocked coro.
315
262Lock 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
263uses map_find and cf::map::load uses map_load). 317uses map_find and cf::map::load uses map_load).
264 318
265=item $locked = cf::lock_active $string 319=item $locked = cf::lock_active $string
266 320
267Return 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.
268 322
269=cut 323=cut
270 324
271our %LOCK; 325our %LOCK;
326our %LOCKER;#d#
272 327
273sub lock_wait($) { 328sub lock_wait($) {
274 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#
275 335
276 # wait for lock, if any 336 # wait for lock, if any
277 while ($LOCK{$key}) { 337 while ($LOCK{$key}) {
278 push @{ $LOCK{$key} }, $Coro::current; 338 push @{ $LOCK{$key} }, $Coro::current;
279 Coro::schedule; 339 Coro::schedule;
285 345
286 # wait, to be sure we are not locked 346 # wait, to be sure we are not locked
287 lock_wait $key; 347 lock_wait $key;
288 348
289 $LOCK{$key} = []; 349 $LOCK{$key} = [];
350 $LOCKER{$key} = $Coro::current;#d#
290 351
291 Coro::guard { 352 Coro::guard {
353 delete $LOCKER{$key};#d#
292 # wake up all waiters, to be on the safe side 354 # wake up all waiters, to be on the safe side
293 $_->ready for @{ delete $LOCK{$key} }; 355 $_->ready for @{ delete $LOCK{$key} };
294 } 356 }
295} 357}
296 358
299 361
300 ! ! $LOCK{$key} 362 ! ! $LOCK{$key}
301} 363}
302 364
303sub freeze_mainloop { 365sub freeze_mainloop {
304 return unless $TICK_WATCHER->is_active; 366 tick_inhibit_inc;
305 367
306 my $guard = Coro::guard { 368 Coro::guard \&tick_inhibit_dec;
307 $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 }
308 }; 429 }
309 $TICK_WATCHER->stop; 430};
310 $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;
311} 444}
312 445
313=item cf::async { BLOCK } 446=item cf::async { BLOCK }
314 447
315Currently the same as Coro::async_pool, meaning you cannot use 448Currently the same as Coro::async_pool, meaning you cannot use
320 453
321BEGIN { *async = \&Coro::async_pool } 454BEGIN { *async = \&Coro::async_pool }
322 455
323=item cf::sync_job { BLOCK } 456=item cf::sync_job { BLOCK }
324 457
325The design of Crossfire TRT requires that the main coroutine ($Coro::main) 458The design of Deliantra requires that the main coroutine ($Coro::main)
326is always able to handle events or runnable, as Crossfire TRT is only 459is always able to handle events or runnable, as Deliantra is only
327partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 460partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
328acceptable. 461acceptable.
329 462
330If 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
331the given BLOCK in another coroutine while waiting for the result. The 464the given BLOCK in another coroutine while waiting for the result. The
336 469
337sub sync_job(&) { 470sub sync_job(&) {
338 my ($job) = @_; 471 my ($job) = @_;
339 472
340 if ($Coro::current == $Coro::main) { 473 if ($Coro::current == $Coro::main) {
341 my $time = Event::time; 474 my $time = EV::time;
342 475
343 # this is the main coro, too bad, we have to block 476 # this is the main coro, too bad, we have to block
344 # till the operation succeeds, freezing the server :/ 477 # till the operation succeeds, freezing the server :/
345 478
346 # TODO: use suspend/resume instead 479 LOG llevError, Carp::longmess "sync job";#d#
347 # (but this is cancel-safe) 480
348 my $freeze_guard = freeze_mainloop; 481 my $freeze_guard = freeze_mainloop;
349 482
350 my $busy = 1; 483 my $busy = 1;
351 my @res; 484 my @res;
352 485
353 (async { 486 (async {
487 $Coro::current->desc ("sync job coro");
354 @res = eval { $job->() }; 488 @res = eval { $job->() };
355 warn $@ if $@; 489 warn $@ if $@;
356 undef $busy; 490 undef $busy;
357 })->prio (Coro::PRIO_MAX); 491 })->prio (Coro::PRIO_MAX);
358 492
359 while ($busy) { 493 while ($busy) {
360 Coro::cede or Event::one_event; 494 if (Coro::nready) {
495 Coro::cede_notself;
496 } else {
497 EV::loop EV::LOOP_ONESHOT;
361 } 498 }
499 }
362 500
363 $time = Event::time - $time; 501 my $time = EV::time - $time;
364 502
365 LOG llevError | logBacktrace, Carp::longmess "long sync job"
366 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
367
368 $tick_start += $time; # do not account sync jobs to server load 503 $TICK_START += $time; # do not account sync jobs to server load
369 504
370 wantarray ? @res : $res[0] 505 wantarray ? @res : $res[0]
371 } else { 506 } else {
372 # we are in another coroutine, how wonderful, everything just works 507 # we are in another coroutine, how wonderful, everything just works
373 508
398=item fork_call { }, $args 533=item fork_call { }, $args
399 534
400Executes the given code block with the given arguments in a seperate 535Executes the given code block with the given arguments in a seperate
401process, returning the results. Everything must be serialisable with 536process, returning the results. Everything must be serialisable with
402Coro::Storable. May, of course, block. Note that the executed sub may 537Coro::Storable. May, of course, block. Note that the executed sub may
403never block itself or use any form of Event handling. 538never block itself or use any form of event handling.
404 539
405=cut 540=cut
406 541
407sub fork_call(&@) { 542sub fork_call(&@) {
408 my ($cb, @args) = @_; 543 my ($cb, @args) = @_;
409 544
410# 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,
411# or die "socketpair: $!"; 546 # otherwise perl prematurely frees the stuff :/
412 pipe my $fh1, my $fh2 547 # TODO: investigate and fix (likely this will be rather laborious)
413 or die "pipe: $!";
414 548
415 if (my $pid = fork) { 549 my @res = Coro::Util::fork_eval {
416 close $fh2;
417
418 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
419 $res = Coro::Storable::thaw $res;
420
421 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
422
423 die $$res unless "ARRAY" eq ref $res;
424
425 return wantarray ? @$res : $res->[-1];
426 } else {
427 reset_signals; 550 reset_signals;
428 local $SIG{__WARN__}; 551 &$cb
429 local $SIG{__DIE__}; 552 }, @args;
430 eval {
431 close $fh1;
432 553
433 my @res = eval { $cb->(@args) }; 554 wantarray ? @res : $res[-1]
434 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 555}
435 };
436 556
437 warn $@ if $@; 557=item $coin = coin_from_name $name
438 _exit 0; 558
439 } 559=cut
560
561our %coin_alias = (
562 "silver" => "silvercoin",
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
440} 582}
441 583
442=item $value = cf::db_get $family => $key 584=item $value = cf::db_get $family => $key
443 585
444Returns a single value from the environment database. 586Returns a single value from the environment database.
446=item cf::db_put $family => $key => $value 588=item cf::db_put $family => $key => $value
447 589
448Stores 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
449data 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).
450 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
451=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}
452 616
453our $DB; 617our $DB;
454 618
455sub db_init { 619sub db_init {
456 unless ($DB) {
457 $DB = BDB::db_create $DB_ENV;
458
459 cf::sync_job { 620 cf::sync_job {
460 eval { 621 $DB ||= db_table "db";
461 $DB->set_flags (BDB::CHKSUM);
462
463 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
464 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
465 cf::cleanup "db_open(db): $!" if $!;
466 };
467 cf::cleanup "db_open(db): $@" if $@;
468 };
469 } 622 };
470} 623}
471 624
472sub db_get($$) { 625sub db_get($$) {
473 my $key = "$_[0]/$_[1]"; 626 my $key = "$_[0]/$_[1]";
474 627
524 if (1) { 677 if (1) {
525 $md5 = 678 $md5 =
526 join "\x00", 679 join "\x00",
527 $processversion, 680 $processversion,
528 map { 681 map {
529 Coro::cede; 682 cf::cede_to_tick;
530 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 683 ($src->[$_], Digest::MD5::md5_hex $data[$_])
531 } 0.. $#$src; 684 } 0.. $#$src;
532 685
533 686
534 my $dbmd5 = db_get cache => "$id/md5"; 687 my $dbmd5 = db_get cache => "$id/md5";
578attach callbacks/event handlers (a collection of which is called an "attachment") 731attach callbacks/event handlers (a collection of which is called an "attachment")
579to it. All such attachable objects support the following methods. 732to it. All such attachable objects support the following methods.
580 733
581In 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>
582C<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
583Crossfire TRT). 736Deliantra).
584 737
585=over 4 738=over 4
586 739
587=item $attachable->attach ($attachment, key => $value...) 740=item $attachable->attach ($attachment, key => $value...)
588 741
840 "; 993 ";
841 die if $@; 994 die if $@;
842} 995}
843 996
844our $override; 997our $override;
845our @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?
846 999
847sub override { 1000sub override {
848 $override = 1; 1001 $override = 1;
849 @invoke_results = (); 1002 @INVOKE_RESULTS = (@_);
850} 1003}
851 1004
852sub do_invoke { 1005sub do_invoke {
853 my $event = shift; 1006 my $event = shift;
854 my $callbacks = shift; 1007 my $callbacks = shift;
855 1008
856 @invoke_results = (); 1009 @INVOKE_RESULTS = ();
857 1010
858 local $override; 1011 local $override;
859 1012
860 for (@$callbacks) { 1013 for (@$callbacks) {
861 eval { &{$_->[1]} }; 1014 eval { &{$_->[1]} };
870 } 1023 }
871 1024
872 0 1025 0
873} 1026}
874 1027
875=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1028=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
876 1029
877=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
878 1031
879Generate an object-specific event with the given arguments. 1032Generate an object-specific event with the given arguments.
880 1033
881This 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
882removed 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
883results (if you must, access C<@cf::invoke_results> directly). 1036results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884 1037
885=back 1038=back
886 1039
887=cut 1040=cut
888 1041
889############################################################################# 1042#############################################################################
890# 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}
891 1086
892sub reattach { 1087sub reattach {
893 # basically do the same as instantiate, without calling instantiate 1088 # basically do the same as instantiate, without calling instantiate
894 my ($obj) = @_; 1089 my ($obj) = @_;
895 1090
916cf::attachable->attach ( 1111cf::attachable->attach (
917 prio => -1000000, 1112 prio => -1000000,
918 on_instantiate => sub { 1113 on_instantiate => sub {
919 my ($obj, $data) = @_; 1114 my ($obj, $data) = @_;
920 1115
921 $data = from_json $data; 1116 $data = decode_json $data;
922 1117
923 for (@$data) { 1118 for (@$data) {
924 my ($name, $args) = @$_; 1119 my ($name, $args) = @$_;
925 1120
926 $obj->attach ($name, %{$args || {} }); 1121 $obj->attach ($name, %{$args || {} });
942sub object_freezer_save { 1137sub object_freezer_save {
943 my ($filename, $rdata, $objs) = @_; 1138 my ($filename, $rdata, $objs) = @_;
944 1139
945 sync_job { 1140 sync_job {
946 if (length $$rdata) { 1141 if (length $$rdata) {
1142 utf8::decode (my $decname = $filename);
947 warn sprintf "saving %s (%d,%d)\n", 1143 warn sprintf "saving %s (%d,%d)\n",
948 $filename, length $$rdata, scalar @$objs; 1144 $decname, length $$rdata, scalar @$objs;
949 1145
950 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1146 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
951 chmod SAVE_MODE, $fh; 1147 aio_chmod $fh, SAVE_MODE;
952 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1148 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
953 aio_fsync $fh if $cf::USE_FSYNC; 1149 aio_fsync $fh if $cf::USE_FSYNC;
954 close $fh; 1150 aio_close $fh;
955 1151
956 if (@$objs) { 1152 if (@$objs) {
957 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) {
958 chmod SAVE_MODE, $fh; 1154 aio_chmod $fh, SAVE_MODE;
959 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1155 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
960 aio_write $fh, 0, (length $data), $data, 0; 1156 aio_write $fh, 0, (length $data), $data, 0;
961 aio_fsync $fh if $cf::USE_FSYNC; 1157 aio_fsync $fh if $cf::USE_FSYNC;
962 close $fh; 1158 aio_close $fh;
963 aio_rename "$filename.pst~", "$filename.pst"; 1159 aio_rename "$filename.pst~", "$filename.pst";
964 } 1160 }
965 } else { 1161 } else {
966 aio_unlink "$filename.pst"; 1162 aio_unlink "$filename.pst";
967 } 1163 }
972 } 1168 }
973 } else { 1169 } else {
974 aio_unlink $filename; 1170 aio_unlink $filename;
975 aio_unlink "$filename.pst"; 1171 aio_unlink "$filename.pst";
976 } 1172 }
977 } 1173 };
978} 1174}
979 1175
980sub object_freezer_as_string { 1176sub object_freezer_as_string {
981 my ($rdata, $objs) = @_; 1177 my ($rdata, $objs) = @_;
982 1178
994 or return; 1190 or return;
995 1191
996 unless (aio_stat "$filename.pst") { 1192 unless (aio_stat "$filename.pst") {
997 (aio_load "$filename.pst", $av) >= 0 1193 (aio_load "$filename.pst", $av) >= 0
998 or return; 1194 or return;
1195
999 $av = eval { (Storable::thaw $av)->{objs} }; 1196 my $st = eval { Coro::Storable::thaw $av };
1197 $av = $st->{objs};
1000 } 1198 }
1001 1199
1200 utf8::decode (my $decname = $filename);
1002 warn sprintf "loading %s (%d)\n", 1201 warn sprintf "loading %s (%d,%d)\n",
1003 $filename, length $data, scalar @{$av || []}; 1202 $decname, length $data, scalar @{$av || []};
1203
1004 return ($data, $av); 1204 ($data, $av)
1005} 1205}
1006 1206
1007=head2 COMMAND CALLBACKS 1207=head2 COMMAND CALLBACKS
1008 1208
1009=over 4 1209=over 4
1029 push @{ $COMMAND{$name} }, [$caller, $cb]; 1229 push @{ $COMMAND{$name} }, [$caller, $cb];
1030} 1230}
1031 1231
1032=item cf::register_extcmd $name => \&callback($pl,$packet); 1232=item cf::register_extcmd $name => \&callback($pl,$packet);
1033 1233
1034Register a callback fro execution when the client sends an extcmd packet. 1234Register a callback for execution when the client sends an (synchronous)
1235extcmd packet. Ext commands will be processed in the order they are
1236received by the server, like other user commands. The first argument is
1237the logged-in player. Ext commands can only be processed after a player
1238has logged in successfully.
1035 1239
1036If the callback returns something, it is sent back as if reply was being 1240If the callback returns something, it is sent back as if reply was being
1037called. 1241called.
1038 1242
1243=item cf::register_exticmd $name => \&callback($ns,$packet);
1244
1245Register a callback for execution when the client sends an (asynchronous)
1246exticmd packet. Exti commands are processed by the server as soon as they
1247are received, i.e. out of order w.r.t. other commands. The first argument
1248is a client socket. Exti commands can be received anytime, even before
1249log-in.
1250
1251If the callback returns something, it is sent back as if reply was being
1252called.
1253
1039=cut 1254=cut
1040 1255
1041sub register_extcmd { 1256sub register_extcmd {
1042 my ($name, $cb) = @_; 1257 my ($name, $cb) = @_;
1043 1258
1044 $EXTCMD{$name} = $cb; 1259 $EXTCMD{$name} = $cb;
1260}
1261
1262sub register_exticmd {
1263 my ($name, $cb) = @_;
1264
1265 $EXTICMD{$name} = $cb;
1045} 1266}
1046 1267
1047cf::player->attach ( 1268cf::player->attach (
1048 on_command => sub { 1269 on_command => sub {
1049 my ($pl, $name, $params) = @_; 1270 my ($pl, $name, $params) = @_;
1058 cf::override; 1279 cf::override;
1059 }, 1280 },
1060 on_extcmd => sub { 1281 on_extcmd => sub {
1061 my ($pl, $buf) = @_; 1282 my ($pl, $buf) = @_;
1062 1283
1063 my $msg = eval { from_json $buf }; 1284 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064 1285
1065 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
1066 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1294 if (my $cb = $EXTCMD{$type}) {
1067 if (my %reply = $cb->($pl, $msg)) { 1295 @reply = $cb->($pl, @payload);
1068 $pl->ext_reply ($msg->{msgid}, %reply);
1069 }
1070 } 1296 }
1297
1298 $pl->ext_reply ($reply, @reply)
1299 if $reply;
1300
1071 } else { 1301 } else {
1072 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1302 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1073 } 1303 }
1074 1304
1075 cf::override; 1305 cf::override;
1128 my $msg = $@ ? "$v->{path}: $@\n" 1358 my $msg = $@ ? "$v->{path}: $@\n"
1129 : "$v->{base}: extension inactive.\n"; 1359 : "$v->{base}: extension inactive.\n";
1130 1360
1131 if (exists $v->{meta}{mandatory}) { 1361 if (exists $v->{meta}{mandatory}) {
1132 warn $msg; 1362 warn $msg;
1133 warn "mandatory extension failed to load, exiting.\n"; 1363 cf::cleanup "mandatory extension failed to load, exiting.";
1134 exit 1;
1135 } 1364 }
1136 1365
1137 warn $msg; 1366 warn $msg;
1138 } 1367 }
1139 1368
1164use Coro::AIO; 1393use Coro::AIO;
1165 1394
1166=head3 cf::player 1395=head3 cf::player
1167 1396
1168=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}
1169 1412
1170=item cf::player::find $login 1413=item cf::player::find $login
1171 1414
1172Returns the given player object, loading it if necessary (might block). 1415Returns the given player object, loading it if necessary (might block).
1173 1416
1209 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1452 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1210 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1453 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1211 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1454 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1212 aio_unlink +(playerdir $login) . "/$login.pl"; 1455 aio_unlink +(playerdir $login) . "/$login.pl";
1213 1456
1214 my $pl = load_pl path $login 1457 my $f = new_from_file cf::object::thawer path $login
1215 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;
1216 $cf::PLAYER{$login} = $pl 1465 $cf::PLAYER{$login} = $pl
1217 } 1466 }
1218 } 1467 }
1219} 1468}
1220 1469
1229 return if $pl->{deny_save}; 1478 return if $pl->{deny_save};
1230 1479
1231 aio_mkdir playerdir $pl, 0770; 1480 aio_mkdir playerdir $pl, 0770;
1232 $pl->{last_save} = $cf::RUNTIME; 1481 $pl->{last_save} = $cf::RUNTIME;
1233 1482
1483 cf::get_slot 0.01;
1484
1234 $pl->save_pl ($path); 1485 $pl->save_pl ($path);
1235 Coro::cede; 1486 cf::cede_to_tick;
1236} 1487}
1237 1488
1238sub new($) { 1489sub new($) {
1239 my ($login) = @_; 1490 my ($login) = @_;
1240 1491
1246 $cf::PLAYER{$login} = $self; 1497 $cf::PLAYER{$login} = $self;
1247 1498
1248 $self 1499 $self
1249} 1500}
1250 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
1251=item $pl->quit_character 1512=item $pl->quit_character
1252 1513
1253Nukes the player without looking back. If logged in, the connection will 1514Nukes the player without looking back. If logged in, the connection will
1254be destroyed. May block for a long time. 1515be destroyed. May block for a long time.
1255 1516
1263 $pl->{deny_save} = 1; 1524 $pl->{deny_save} = 1;
1264 $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
1265 1526
1266 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1267 $pl->deactivate; 1528 $pl->deactivate;
1529 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1530 $pl->ob->check_score;
1268 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1531 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1269 $pl->ns->destroy if $pl->ns; 1532 $pl->ns->destroy if $pl->ns;
1270 1533
1271 my $path = playerdir $pl; 1534 my $path = playerdir $pl;
1272 my $temp = "$path~$cf::RUNTIME~deleting~"; 1535 my $temp = "$path~$cf::RUNTIME~deleting~";
1308 or return []; 1571 or return [];
1309 1572
1310 my @logins; 1573 my @logins;
1311 1574
1312 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") {
1313 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1581 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1314 aio_read $fh, 0, 512, my $buf, 0 or next; 1582 aio_read $fh, 0, 512, my $buf, 0 or next;
1315 $buf !~ /^password -------------$/m or next; # official not-valid tag 1583 $buf !~ /^password -------------$/m or next; # official not-valid tag
1584 }
1316 1585
1317 utf8::decode $login; 1586 utf8::decode $login;
1318 push @logins, $login; 1587 push @logins, $login;
1319 } 1588 }
1320 1589
1347 } 1616 }
1348 1617
1349 \@paths 1618 \@paths
1350} 1619}
1351 1620
1621=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1622
1623Expand crossfire pod fragments into protocol xml.
1624
1625=cut
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
1638sub expand_cfpod {
1639 my ($self, $pod) = @_;
1640
1641 my $xml;
1642
1643 while () {
1644 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1645 $group = $1;
1646
1647 $group =~ s/&/&amp;/g;
1648 $group =~ s/</&lt;/g;
1649
1650 $xml .= $group;
1651 } elsif ($pod =~ m%\G
1652 ([BCGHITU])
1653 <
1654 (?:
1655 ([^<>]*) (?{ $group = $^N })
1656 | < $interior >
1657 )
1658 >
1659 %gcsx
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") {
1678 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1679 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1680 "")
1681 [$self->{hintmode}];
1682 } else {
1683 $xml .= "error processing '$code($data)' directive";
1684 }
1685 } else {
1686 if ($pod =~ /\G(.+)/) {
1687 warn "parse error while expanding $pod (at $1)";
1688 }
1689 last;
1690 }
1691 }
1692
1693 for ($xml) {
1694 # create single paragraphs (very hackish)
1695 s/(?<=\S)\n(?=\w)/ /g;
1696
1697 # compress some whitespace
1698 s/\s+\n/\n/g; # ws line-ends
1699 s/\n\n+/\n/g; # double lines
1700 s/^\n+//; # beginning lines
1701 s/\n+$//; # ending lines
1702 }
1703
1704 $xml
1705}
1706
1707no re 'eval';
1708
1709sub hintmode {
1710 $_[0]{hintmode} = $_[1] if @_ > 1;
1711 $_[0]{hintmode}
1712}
1713
1352=item $player->ext_reply ($msgid, %msg) 1714=item $player->ext_reply ($msgid, @msg)
1353 1715
1354Sends an ext reply to the player. 1716Sends an ext reply to the player.
1355 1717
1356=cut 1718=cut
1357 1719
1358sub ext_reply($$%) { 1720sub ext_reply($$@) {
1359 my ($self, $id, %msg) = @_; 1721 my ($self, $id, @msg) = @_;
1360 1722
1361 $msg{msgid} = $id; 1723 $self->ns->ext_reply ($id, @msg)
1362
1363 $self->send ("ext " . cf::to_json \%msg);
1364} 1724}
1365 1725
1366=item $player->ext_event ($type, %msg) 1726=item $player->ext_msg ($type, @msg)
1367 1727
1368Sends an ext event to the client. 1728Sends an ext event to the client.
1369 1729
1370=cut 1730=cut
1371 1731
1372sub ext_event($$%) { 1732sub ext_msg($$@) {
1373 my ($self, $type, %msg) = @_; 1733 my ($self, $type, @msg) = @_;
1374 1734
1375 $self->ns->ext_event ($type, %msg); 1735 $self->ns->ext_msg ($type, @msg);
1376} 1736}
1377 1737
1378=head3 cf::region 1738=head3 cf::region
1379 1739
1380=over 4 1740=over 4
1393 my ($path) = @_; 1753 my ($path) = @_;
1394 1754
1395 my ($match, $specificity); 1755 my ($match, $specificity);
1396 1756
1397 for my $region (list) { 1757 for my $region (list) {
1398 if ($region->match && $path =~ $region->match) { 1758 if ($region->{match} && $path =~ $region->{match}) {
1399 ($match, $specificity) = ($region, $region->specificity) 1759 ($match, $specificity) = ($region, $region->specificity)
1400 if $region->specificity > $specificity; 1760 if $region->specificity > $specificity;
1401 } 1761 }
1402 } 1762 }
1403 1763
1424our $MAX_RESET = 3600; 1784our $MAX_RESET = 3600;
1425our $DEFAULT_RESET = 3000; 1785our $DEFAULT_RESET = 3000;
1426 1786
1427sub generate_random_map { 1787sub generate_random_map {
1428 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
1429 # mit "rum" bekleckern, nicht 1792 # mit "rum" bekleckern, nicht
1430 $self->_create_random_map ( 1793 $self->_create_random_map (
1431 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1794 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1432 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1795 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1433 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1796 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1523 $self->init; # pass $1 etc. 1886 $self->init; # pass $1 etc.
1524 return $self; 1887 return $self;
1525 } 1888 }
1526 } 1889 }
1527 1890
1528 Carp::carp "unable to resolve path '$path' (base '$base')."; 1891 Carp::cluck "unable to resolve path '$path' (base '$base').";
1529 () 1892 ()
1530} 1893}
1531 1894
1532sub init { 1895sub init {
1533 my ($self) = @_; 1896 my ($self) = @_;
1555 1918
1556# the temporary/swap location 1919# the temporary/swap location
1557sub save_path { 1920sub save_path {
1558 my ($self) = @_; 1921 my ($self) = @_;
1559 1922
1560 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1923 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1561 "$TMPDIR/$path.map" 1924 "$TMPDIR/$path.map"
1562} 1925}
1563 1926
1564# the unique path, undef == no special unique path 1927# the unique path, undef == no special unique path
1565sub uniq_path { 1928sub uniq_path {
1566 my ($self) = @_; 1929 my ($self) = @_;
1567 1930
1568 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1931 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1569 "$UNIQUEDIR/$path" 1932 "$UNIQUEDIR/$path"
1570} 1933}
1571 1934
1572# and all this just because we cannot iterate over 1935# and all this just because we cannot iterate over
1573# all maps in C++... 1936# all maps in C++...
1596 1959
1597sub load_header_from($) { 1960sub load_header_from($) {
1598 my ($self, $path) = @_; 1961 my ($self, $path) = @_;
1599 1962
1600 utf8::encode $path; 1963 utf8::encode $path;
1601 #aio_open $path, O_RDONLY, 0 1964 my $f = new_from_file cf::object::thawer $path
1602 # or return;
1603
1604 $self->_load_header ($path)
1605 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;
1606 1972
1607 $self->{load_path} = $path; 1973 $self->{load_path} = $path;
1608 1974
1609 1 1975 1
1610} 1976}
1664sub find { 2030sub find {
1665 my ($path, $origin) = @_; 2031 my ($path, $origin) = @_;
1666 2032
1667 $path = normalise $path, $origin && $origin->path; 2033 $path = normalise $path, $origin && $origin->path;
1668 2034
2035 cf::lock_wait "map_data:$path";#d#remove
1669 cf::lock_wait "map_find:$path"; 2036 cf::lock_wait "map_find:$path";
1670 2037
1671 $cf::MAP{$path} || do { 2038 $cf::MAP{$path} || do {
2039 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1672 my $guard = cf::lock_acquire "map_find:$path"; 2040 my $guard2 = cf::lock_acquire "map_find:$path";
2041
1673 my $map = new_from_path cf::map $path 2042 my $map = new_from_path cf::map $path
1674 or return; 2043 or return;
1675 2044
1676 $map->{last_save} = $cf::RUNTIME; 2045 $map->{last_save} = $cf::RUNTIME;
1677 2046
1679 or return; 2048 or return;
1680 2049
1681 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2050 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1682 # doing this can freeze the server in a sync job, obviously 2051 # doing this can freeze the server in a sync job, obviously
1683 #$cf::WAIT_FOR_TICK->wait; 2052 #$cf::WAIT_FOR_TICK->wait;
2053 undef $guard2;
2054 undef $guard1;
1684 $map->reset; 2055 $map->reset;
1685 undef $guard;
1686 return find $path; 2056 return find $path;
1687 } 2057 }
1688 2058
1689 $cf::MAP{$path} = $map 2059 $cf::MAP{$path} = $map
1690 } 2060 }
1699 local $self->{deny_reset} = 1; # loading can take a long time 2069 local $self->{deny_reset} = 1; # loading can take a long time
1700 2070
1701 my $path = $self->{path}; 2071 my $path = $self->{path};
1702 2072
1703 { 2073 {
1704 my $guard = cf::lock_acquire "map_load:$path"; 2074 my $guard = cf::lock_acquire "map_data:$path";
1705 2075
2076 return unless $self->valid;
1706 return if $self->in_memory != cf::MAP_SWAPPED; 2077 return unless $self->in_memory == cf::MAP_SWAPPED;
1707 2078
1708 $self->in_memory (cf::MAP_LOADING); 2079 $self->in_memory (cf::MAP_LOADING);
1709 2080
1710 $self->alloc; 2081 $self->alloc;
1711 2082
1712 $self->pre_load; 2083 $self->pre_load;
1713 Coro::cede; 2084 cf::cede_to_tick;
1714 2085
2086 my $f = new_from_file cf::object::thawer $self->{load_path};
2087 $f->skip_block;
1715 $self->_load_objects ($self->{load_path}, 1) 2088 $self->_load_objects ($f)
1716 or return; 2089 or return;
1717 2090
1718 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2091 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1719 if delete $self->{load_original}; 2092 if delete $self->{load_original};
1720 2093
1721 if (my $uniq = $self->uniq_path) { 2094 if (my $uniq = $self->uniq_path) {
1722 utf8::encode $uniq; 2095 utf8::encode $uniq;
1723 if (aio_open $uniq, O_RDONLY, 0) { 2096 unless (aio_stat $uniq) {
2097 if (my $f = new_from_file cf::object::thawer $uniq) {
1724 $self->clear_unique_items; 2098 $self->clear_unique_items;
1725 $self->_load_objects ($uniq, 0); 2099 $self->_load_objects ($f);
2100 $f->resolve_delayed_derefs;
2101 }
1726 } 2102 }
1727 } 2103 }
1728 2104
1729 Coro::cede; 2105 $f->resolve_delayed_derefs;
2106
2107 cf::cede_to_tick;
1730 # now do the right thing for maps 2108 # now do the right thing for maps
1731 $self->link_multipart_objects; 2109 $self->link_multipart_objects;
1732 $self->difficulty ($self->estimate_difficulty) 2110 $self->difficulty ($self->estimate_difficulty)
1733 unless $self->difficulty; 2111 unless $self->difficulty;
1734 Coro::cede; 2112 cf::cede_to_tick;
1735 2113
1736 unless ($self->{deny_activate}) { 2114 unless ($self->{deny_activate}) {
1737 $self->decay_objects; 2115 $self->decay_objects;
1738 $self->fix_auto_apply; 2116 $self->fix_auto_apply;
1739 $self->update_buttons; 2117 $self->update_buttons;
1740 Coro::cede; 2118 cf::cede_to_tick;
1741 $self->set_darkness_map; 2119 $self->set_darkness_map;
1742 Coro::cede; 2120 cf::cede_to_tick;
1743 $self->activate; 2121 $self->activate;
1744 } 2122 }
1745 2123
2124 $self->{last_save} = $cf::RUNTIME;
2125 $self->last_access ($cf::RUNTIME);
2126
1746 $self->in_memory (cf::MAP_IN_MEMORY); 2127 $self->in_memory (cf::MAP_ACTIVE);
1747 } 2128 }
1748 2129
1749 $self->post_load; 2130 $self->post_load;
1750} 2131}
1751 2132
1760 2141
1761 $self 2142 $self
1762} 2143}
1763 2144
1764# 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
1765sub load_diag { 2146sub load_neighbours {
1766 my ($map) = @_; 2147 my ($map) = @_;
1767 2148
1768 my @diag; # diagonal neighbours 2149 my @neigh; # diagonal neighbours
1769 2150
1770 for (0 .. 3) { 2151 for (0 .. 3) {
1771 my $neigh = $map->tile_path ($_) 2152 my $neigh = $map->tile_path ($_)
1772 or next; 2153 or next;
1773 $neigh = find $neigh, $map 2154 $neigh = find $neigh, $map
1774 or next; 2155 or next;
1775 $neigh->load; 2156 $neigh->load;
1776 2157
2158 push @neigh,
1777 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2159 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1778 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2160 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1779 } 2161 }
1780 2162
1781 for (@diag) { 2163 for (grep defined $_->[0], @neigh) {
2164 my ($path, $origin) = @$_;
1782 my $neigh = find @$_ 2165 my $neigh = find $path, $origin
1783 or next; 2166 or next;
1784 $neigh->load; 2167 $neigh->load;
1785 } 2168 }
1786} 2169}
1787 2170
1792} 2175}
1793 2176
1794sub do_load_sync { 2177sub do_load_sync {
1795 my ($map) = @_; 2178 my ($map) = @_;
1796 2179
2180 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2181 if $Coro::current == $Coro::main;
2182
1797 cf::sync_job { $map->load }; 2183 cf::sync_job { $map->load };
1798} 2184}
1799 2185
1800our %MAP_PREFETCH; 2186our %MAP_PREFETCH;
1801our $MAP_PREFETCHER = undef; 2187our $MAP_PREFETCHER = undef;
1802 2188
1803sub find_async { 2189sub find_async {
1804 my ($path, $origin) = @_; 2190 my ($path, $origin, $load) = @_;
1805 2191
1806 $path = normalise $path, $origin && $origin->{path}; 2192 $path = normalise $path, $origin && $origin->{path};
1807 2193
1808 if (my $map = $cf::MAP{$path}) { 2194 if (my $map = $cf::MAP{$path}) {
1809 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2195 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1810 } 2196 }
1811 2197
1812 undef $MAP_PREFETCH{$path}; 2198 $MAP_PREFETCH{$path} |= $load;
2199
1813 $MAP_PREFETCHER ||= cf::async { 2200 $MAP_PREFETCHER ||= cf::async {
2201 $Coro::current->{desc} = "map prefetcher";
2202
1814 while (%MAP_PREFETCH) { 2203 while (%MAP_PREFETCH) {
1815 for my $path (keys %MAP_PREFETCH) { 2204 while (my ($k, $v) = each %MAP_PREFETCH) {
1816 my $map = find $path 2205 if (my $map = find $k) {
1817 or next;
1818 $map->load; 2206 $map->load if $v;
2207 }
1819 2208
1820 delete $MAP_PREFETCH{$path}; 2209 delete $MAP_PREFETCH{$k};
1821 } 2210 }
1822 } 2211 }
1823 undef $MAP_PREFETCHER; 2212 undef $MAP_PREFETCHER;
1824 }; 2213 };
1825 $MAP_PREFETCHER->prio (6); 2214 $MAP_PREFETCHER->prio (6);
1828} 2217}
1829 2218
1830sub save { 2219sub save {
1831 my ($self) = @_; 2220 my ($self) = @_;
1832 2221
1833 my $lock = cf::lock_acquire "map_data:" . $self->path; 2222 my $lock = cf::lock_acquire "map_data:$self->{path}";
1834 2223
1835 $self->{last_save} = $cf::RUNTIME; 2224 $self->{last_save} = $cf::RUNTIME;
1836 2225
1837 return unless $self->dirty; 2226 return unless $self->dirty;
1838 2227
1844 return if $self->{deny_save}; 2233 return if $self->{deny_save};
1845 2234
1846 local $self->{last_access} = $self->last_access;#d# 2235 local $self->{last_access} = $self->last_access;#d#
1847 2236
1848 cf::async { 2237 cf::async {
2238 $Coro::current->{desc} = "map player save";
1849 $_->contr->save for $self->players; 2239 $_->contr->save for $self->players;
1850 }; 2240 };
2241
2242 cf::get_slot 0.02;
1851 2243
1852 if ($uniq) { 2244 if ($uniq) {
1853 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1854 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2246 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1855 } else { 2247 } else {
1861 my ($self) = @_; 2253 my ($self) = @_;
1862 2254
1863 # save first because save cedes 2255 # save first because save cedes
1864 $self->save; 2256 $self->save;
1865 2257
1866 my $lock = cf::lock_acquire "map_data:" . $self->path; 2258 my $lock = cf::lock_acquire "map_data:$self->{path}";
1867 2259
1868 return if $self->players; 2260 return if $self->players;
1869 return if $self->in_memory != cf::MAP_IN_MEMORY; 2261 return if $self->in_memory != cf::MAP_ACTIVE;
1870 return if $self->{deny_save}; 2262 return if $self->{deny_save};
1871 2263
2264 $self->in_memory (cf::MAP_SWAPPED);
2265
2266 $self->deactivate;
2267 $_->clear_links_to ($self) for values %cf::MAP;
1872 $self->clear; 2268 $self->clear;
1873 $self->in_memory (cf::MAP_SWAPPED);
1874} 2269}
1875 2270
1876sub reset_at { 2271sub reset_at {
1877 my ($self) = @_; 2272 my ($self) = @_;
1878 2273
1910 if $uniq; 2305 if $uniq;
1911 } 2306 }
1912 2307
1913 delete $cf::MAP{$self->path}; 2308 delete $cf::MAP{$self->path};
1914 2309
2310 $self->deactivate;
2311 $_->clear_links_to ($self) for values %cf::MAP;
1915 $self->clear; 2312 $self->clear;
1916
1917 $_->clear_links_to ($self) for values %cf::MAP;
1918 2313
1919 $self->unlink_save; 2314 $self->unlink_save;
1920 $self->destroy; 2315 $self->destroy;
1921} 2316}
1922 2317
1923my $nuke_counter = "aaaa"; 2318my $nuke_counter = "aaaa";
1924 2319
1925sub nuke { 2320sub nuke {
1926 my ($self) = @_; 2321 my ($self) = @_;
1927 2322
2323 {
2324 my $lock = cf::lock_acquire "map_data:$self->{path}";
2325
1928 delete $cf::MAP{$self->path}; 2326 delete $cf::MAP{$self->path};
1929 2327
1930 $self->unlink_save; 2328 $self->unlink_save;
1931 2329
1932 bless $self, "cf::map"; 2330 bless $self, "cf::map";
1933 delete $self->{deny_reset}; 2331 delete $self->{deny_reset};
1934 $self->{deny_save} = 1; 2332 $self->{deny_save} = 1;
1935 $self->reset_timeout (1); 2333 $self->reset_timeout (1);
1936 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2334 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1937 2335
1938 $cf::MAP{$self->path} = $self; 2336 $cf::MAP{$self->path} = $self;
2337 }
1939 2338
1940 $self->reset; # polite request, might not happen 2339 $self->reset; # polite request, might not happen
1941} 2340}
1942 2341
1943=item $maps = cf::map::tmp_maps 2342=item $maps = cf::map::tmp_maps
1985 2384
1986sub unique_maps() { 2385sub unique_maps() {
1987 [ 2386 [
1988 map { 2387 map {
1989 utf8::decode $_; 2388 utf8::decode $_;
1990 /\.map$/ 2389 s/\.map$//; # TODO future compatibility hack
2390 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2391 ? ()
1991 ? normalise $_ 2392 : normalise $_
1992 : ()
1993 } @{ aio_readdir $UNIQUEDIR or [] } 2393 } @{ aio_readdir $UNIQUEDIR or [] }
1994 ] 2394 ]
1995} 2395}
1996 2396
1997package cf;
1998
1999=back 2397=back
2000 2398
2001=head3 cf::object 2399=head3 cf::object
2002 2400
2003=cut 2401=cut
2006 2404
2007=over 4 2405=over 4
2008 2406
2009=item $ob->inv_recursive 2407=item $ob->inv_recursive
2010 2408
2011Returns 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.
2012 2411
2013=cut 2412=cut
2014 2413
2015sub inv_recursive_; 2414sub inv_recursive_;
2016sub inv_recursive_ { 2415sub inv_recursive_ {
2019 2418
2020sub inv_recursive { 2419sub inv_recursive {
2021 inv_recursive_ inv $_[0] 2420 inv_recursive_ inv $_[0]
2022} 2421}
2023 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
2024package cf; 2451package cf;
2025 2452
2026=back 2453=back
2027 2454
2028=head3 cf::object::player 2455=head3 cf::object::player
2034Sends 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>
2035can 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
2036dialogue with the given NPC character. 2463dialogue with the given NPC character.
2037 2464
2038=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};
2039 2480
2040# rough implementation of a future "reply" method that works 2481# rough implementation of a future "reply" method that works
2041# with dialog boxes. 2482# with dialog boxes.
2042#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
2043sub cf::object::player::reply($$$;$) { 2484sub cf::object::player::reply($$$;$) {
2050 2491
2051 } else { 2492 } else {
2052 my $pl = $self->contr; 2493 my $pl = $self->contr;
2053 2494
2054 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2495 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2055 my $diag = $pl->{npc_dialog}; 2496 my $dialog = $pl->{npc_dialog};
2056 $diag->{pl}->ext_reply ( 2497 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2057 $diag->{id}, msgtype => "reply", msg => $msg, add_topics => []
2058 );
2059 2498
2060 } else { 2499 } else {
2061 $msg = $npc->name . " says: $msg" if $npc; 2500 $msg = $npc->name . " says: $msg" if $npc;
2062 $self->message ($msg, $flags); 2501 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2063 } 2502 }
2064 } 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 (@_);
2065} 2514}
2066 2515
2067=item $player_object->may ("access") 2516=item $player_object->may ("access")
2068 2517
2069Returns wether the given player is authorized to access resource "access" 2518Returns wether the given player is authorized to access resource "access"
2148 # use -1 or undef as default coordinates, not 0, 0 2597 # use -1 or undef as default coordinates, not 0, 0
2149 ($x, $y) = ($map->enter_x, $map->enter_y) 2598 ($x, $y) = ($map->enter_x, $map->enter_y)
2150 if $x <=0 && $y <= 0; 2599 if $x <=0 && $y <= 0;
2151 2600
2152 $map->load; 2601 $map->load;
2153 $map->load_diag; 2602 $map->load_neighbours;
2154 2603
2155 return unless $self->contr->active; 2604 return unless $self->contr->active;
2156 $self->activate_recursive; 2605 $self->activate_recursive;
2157 2606
2158 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2607 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2159 $self->enter_map ($map, $x, $y); 2608 $self->enter_map ($map, $x, $y);
2160} 2609}
2161 2610
2162=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2611=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2163 2612
2164Moves 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
2165her, loading and preparing them map, calling the provided $check callback 2614her, loading and preparing them map, calling the provided $check callback
2166that 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
2167the 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.
2168 2618
2169=cut 2619=cut
2170 2620
2171our $GOTOGEN; 2621our $GOTOGEN;
2172 2622
2173sub cf::object::player::goto { 2623sub cf::object::player::goto {
2174 my ($self, $path, $x, $y, $check) = @_; 2624 my ($self, $path, $x, $y, $check, $done) = @_;
2175 2625
2176 # 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
2177 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2627 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2178 2628
2179 $self->enter_link; 2629 $self->enter_link;
2180 2630
2181 (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
2182 my $map = eval { 2653 my $map = eval {
2183 my $map = cf::map::find $path; 2654 my $map = defined $path ? cf::map::find $path : undef;
2184 2655
2185 if ($map) { 2656 if ($map) {
2186 $map = $map->customise_for ($self); 2657 $map = $map->customise_for ($self);
2187 $map = $check->($map) if $check && $map; 2658 $map = $check->($map) if $check && $map;
2188 } else { 2659 } else {
2189 $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);
2190 } 2661 }
2191 2662
2192 $map 2663 $map
2193 }; 2664 };
2194 2665
2199 2670
2200 if ($gen == $self->{_goto_generation}) { 2671 if ($gen == $self->{_goto_generation}) {
2201 delete $self->{_goto_generation}; 2672 delete $self->{_goto_generation};
2202 $self->leave_link ($map, $x, $y); 2673 $self->leave_link ($map, $x, $y);
2203 } 2674 }
2675
2676 $done->() if $done;
2204 })->prio (1); 2677 })->prio (1);
2205} 2678}
2206 2679
2207=item $player_object->enter_exit ($exit_object) 2680=item $player_object->enter_exit ($exit_object)
2208 2681
2228} 2701}
2229 2702
2230sub prepare_random_map { 2703sub prepare_random_map {
2231 my ($exit) = @_; 2704 my ($exit) = @_;
2232 2705
2233 my $guard = cf::lock_acquire "exit_prepare:$exit";
2234
2235 # all this does is basically replace the /! path by 2706 # all this does is basically replace the /! path by
2236 # a new random map path (?random/...) with a seed 2707 # a new random map path (?random/...) with a seed
2237 # that depends on the exit object 2708 # that depends on the exit object
2238 2709
2239 my $rmp = parse_random_map_params $exit->msg; 2710 my $rmp = parse_random_map_params $exit->msg;
2241 if ($exit->map) { 2712 if ($exit->map) {
2242 $rmp->{region} = $exit->region->name; 2713 $rmp->{region} = $exit->region->name;
2243 $rmp->{origin_map} = $exit->map->path; 2714 $rmp->{origin_map} = $exit->map->path;
2244 $rmp->{origin_x} = $exit->x; 2715 $rmp->{origin_x} = $exit->x;
2245 $rmp->{origin_y} = $exit->y; 2716 $rmp->{origin_y} = $exit->y;
2717
2718 $exit->map->touch;
2246 } 2719 }
2247 2720
2248 $rmp->{random_seed} ||= $exit->random_seed; 2721 $rmp->{random_seed} ||= $exit->random_seed;
2249 2722
2250 my $data = cf::to_json $rmp; 2723 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2251 my $md5 = Digest::MD5::md5_hex $data; 2724 my $md5 = Digest::MD5::md5_hex $data;
2252 my $meta = "$RANDOMDIR/$md5.meta"; 2725 my $meta = "$RANDOMDIR/$md5.meta";
2253 2726
2254 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2727 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2255 aio_write $fh, 0, (length $data), $data, 0; 2728 aio_write $fh, 0, (length $data), $data, 0;
2256 undef $fh; 2729 undef $fh;
2257 aio_rename "$meta~", $meta; 2730 aio_rename "$meta~", $meta;
2258 2731
2732 my $slaying = "?random/$md5";
2733
2734 if ($exit->valid) {
2259 $exit->slaying ("?random/$md5"); 2735 $exit->slaying ("?random/$md5");
2260 $exit->msg (undef); 2736 $exit->msg (undef);
2737 }
2261 } 2738 }
2262} 2739}
2263 2740
2264sub cf::object::player::enter_exit { 2741sub cf::object::player::enter_exit {
2265 my ($self, $exit) = @_; 2742 my ($self, $exit) = @_;
2266 2743
2267 return unless $self->type == cf::PLAYER; 2744 return unless $self->type == cf::PLAYER;
2268 2745
2269 if ($exit->slaying eq "/!") {
2270 #TODO: this should de-fi-ni-te-ly not be a sync-job
2271 # the problem is that $exit might not survive long enough
2272 # so it needs to be done right now, right here
2273 cf::sync_job { prepare_random_map $exit };
2274 }
2275
2276 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2277 my $hp = $exit->stats->hp;
2278 my $sp = $exit->stats->sp;
2279
2280 $self->enter_link; 2746 $self->enter_link;
2281 2747
2282 (async { 2748 (async {
2283 $self->deactivate_recursive; # just to be sure 2749 $Coro::current->{desc} = "enter_exit";
2750
2284 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
2285 $self->goto ($slaying, $hp, $sp); 2766 $self->goto ($map, $x, $y);
2286 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
2287 1; 2772 1
2288 }) { 2773 }) {
2289 $self->message ("Something went wrong deep within the crossfire server. " 2774 $self->message ("Something went wrong deep within the crossfire server. "
2290 . "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. "
2291 . "Please report this to the dungeon master!", 2776 . "Please report this to the dungeon master!",
2292 cf::NDI_UNIQUE | cf::NDI_RED); 2777 cf::NDI_UNIQUE | cf::NDI_RED);
2313 2798
2314 utf8::encode $text; 2799 utf8::encode $text;
2315 $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);
2316} 2801}
2317 2802
2803=item $client->send_msg ($channel, $msg, $color, [extra...])
2804
2805Send a drawinfo or msg packet to the client, formatting the msg for the
2806client if neccessary. C<$type> should be a string identifying the type of
2807the message, with C<log> being the default. If C<$color> is negative, suppress
2808the message unless the client supports the msg packet.
2809
2810=cut
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
2870sub cf::client::send_msg {
2871 my ($self, $channel, $msg, $color, @extra) = @_;
2872
2873 $msg = $self->pl->expand_cfpod ($msg);
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
2897 return unless @extra || length $msg;
2898
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
2904 $self->send_packet ("msg " . $self->{json_coder}->encode (
2905 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2906 } else {
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
2922 if (0 && $msg =~ /\[/) {
2923 # COMMAND/INFO
2924 $self->send_packet ("drawextinfo $color 10 8 $msg")
2925 } else {
2926 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2927 $self->send_packet ("drawinfo $color $msg")
2928 }
2929 }
2930 }
2931}
2932
2318=item $client->ext_event ($type, %msg) 2933=item $client->ext_msg ($type, @msg)
2319 2934
2320Sends an exti event to the client. 2935Sends an ext event to the client.
2321 2936
2322=cut 2937=cut
2323 2938
2324sub cf::client::ext_event($$%) { 2939sub cf::client::ext_msg($$@) {
2325 my ($self, $type, %msg) = @_; 2940 my ($self, $type, @msg) = @_;
2326 2941
2942 if ($self->extcmd == 2) {
2943 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2944 } elsif ($self->extcmd == 1) { # TODO: remove
2327 $msg{msgtype} = "event_$type"; 2945 push @msg, msgtype => "event_$type";
2328 $self->send_packet ("ext " . cf::to_json \%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 }
2329} 2966}
2330 2967
2331=item $success = $client->query ($flags, "text", \&cb) 2968=item $success = $client->query ($flags, "text", \&cb)
2332 2969
2333Queues a query to the client, calling the given callback with 2970Queues a query to the client, calling the given callback with
2334the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2971the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2335C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2972C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2336 2973
2337Queries can fail, so check the return code. Or don't, as queries will become 2974Queries can fail, so check the return code. Or don't, as queries will
2338reliable at some point in the future. 2975become reliable at some point in the future.
2339 2976
2340=cut 2977=cut
2341 2978
2342sub cf::client::query { 2979sub cf::client::query {
2343 my ($self, $flags, $text, $cb) = @_; 2980 my ($self, $flags, $text, $cb) = @_;
2351 utf8::encode $text; 2988 utf8::encode $text;
2352 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2989 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2353 2990
2354 $self->send_packet ($self->{query_queue}[0][0]) 2991 $self->send_packet ($self->{query_queue}[0][0])
2355 if @{ $self->{query_queue} } == 1; 2992 if @{ $self->{query_queue} } == 1;
2993
2994 1
2356} 2995}
2357 2996
2358cf::client->attach ( 2997cf::client->attach (
2998 on_connect => sub {
2999 my ($ns) = @_;
3000
3001 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
3002 },
2359 on_reply => sub { 3003 on_reply => sub {
2360 my ($ns, $msg) = @_; 3004 my ($ns, $msg) = @_;
2361 3005
2362 # this weird shuffling is so that direct followup queries 3006 # this weird shuffling is so that direct followup queries
2363 # get handled first 3007 # get handled first
2375 } else { 3019 } else {
2376 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 3020 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2377 } 3021 }
2378 } 3022 }
2379 }, 3023 },
3024 on_exticmd => sub {
3025 my ($ns, $buf) = @_;
3026
3027 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3028
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
3037 if (my $cb = $EXTICMD{$type}) {
3038 @reply = $cb->($ns, @payload);
3039 }
3040
3041 $ns->ext_reply ($reply, @reply)
3042 if $reply;
3043
3044 } else {
3045 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3046 }
3047
3048 cf::override;
3049 },
2380); 3050);
2381 3051
2382=item $client->async (\&cb) 3052=item $client->async (\&cb)
2383 3053
2384Create a new coroutine, running the specified callback. The coroutine will 3054Create a new coroutine, running the specified callback. The coroutine will
2425our $safe = new Safe "safe"; 3095our $safe = new Safe "safe";
2426our $safe_hole = new Safe::Hole; 3096our $safe_hole = new Safe::Hole;
2427 3097
2428$SIG{FPE} = 'IGNORE'; 3098$SIG{FPE} = 'IGNORE';
2429 3099
2430$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));
2431 3105
2432# here we export the classes and methods available to script code 3106# here we export the classes and methods available to script code
2433 3107
2434=pod 3108=pod
2435 3109
2436The following functions and methods are available within a safe environment: 3110The following functions and methods are available within a safe environment:
2437 3111
2438 cf::object contr pay_amount pay_player map 3112 cf::object
3113 contr pay_amount pay_player map x y force_find force_add destroy
3114 insert remove name archname title slaying race decrease split
3115
2439 cf::object::player player 3116 cf::object::player
2440 cf::player peaceful 3117 player
2441 cf::map trigger 3118
3119 cf::player
3120 peaceful
3121
3122 cf::map
3123 trigger
2442 3124
2443=cut 3125=cut
2444 3126
2445for ( 3127for (
2446 ["cf::object" => qw(contr pay_amount pay_player map)], 3128 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3129 insert remove inv nrof name archname title slaying race
3130 decrease split destroy)],
2447 ["cf::object::player" => qw(player)], 3131 ["cf::object::player" => qw(player)],
2448 ["cf::player" => qw(peaceful)], 3132 ["cf::player" => qw(peaceful)],
2449 ["cf::map" => qw(trigger)], 3133 ["cf::map" => qw(trigger)],
2450) { 3134) {
2451 no strict 'refs'; 3135 no strict 'refs';
2527# the server's init and main functions 3211# the server's init and main functions
2528 3212
2529sub load_facedata($) { 3213sub load_facedata($) {
2530 my ($path) = @_; 3214 my ($path) = @_;
2531 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
2532 warn "loading facedata from $path\n"; 3222 warn "loading facedata from $path\n";
2533 3223
2534 my $facedata; 3224 my $facedata;
2535 0 < aio_load $path, $facedata 3225 0 < aio_load $path, $facedata
2536 or die "$path: $!"; 3226 or die "$path: $!";
2538 $facedata = Coro::Storable::thaw $facedata; 3228 $facedata = Coro::Storable::thaw $facedata;
2539 3229
2540 $facedata->{version} == 2 3230 $facedata->{version} == 2
2541 or cf::cleanup "$path: version mismatch, cannot proceed."; 3231 or cf::cleanup "$path: version mismatch, cannot proceed.";
2542 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
2543 { 3240 {
2544 my $faces = $facedata->{faceinfo}; 3241 my $faces = $facedata->{faceinfo};
2545 3242
2546 while (my ($face, $info) = each %$faces) { 3243 while (my ($face, $info) = each %$faces) {
2547 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3244 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3245
2548 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3246 cf::face::set_visibility $idx, $info->{visibility};
3247 cf::face::set_magicmap $idx, $info->{magicmap};
2549 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3248 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2550 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3249 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2551 Coro::cede; 3250
3251 cf::cede_to_tick;
2552 } 3252 }
2553 3253
2554 while (my ($face, $info) = each %$faces) { 3254 while (my ($face, $info) = each %$faces) {
2555 next unless $info->{smooth}; 3255 next unless $info->{smooth};
3256
2556 my $idx = cf::face::find $face 3257 my $idx = cf::face::find $face
2557 or next; 3258 or next;
3259
2558 if (my $smooth = cf::face::find $info->{smooth}) { 3260 if (my $smooth = cf::face::find $info->{smooth}) {
3261 cf::face::set_smooth $idx, $smooth;
2559 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3262 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2560 } else { 3263 } else {
2561 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3264 warn "smooth face '$info->{smooth}' not found for face '$face'";
2562 } 3265 }
2563 Coro::cede; 3266
3267 cf::cede_to_tick;
2564 } 3268 }
2565 } 3269 }
2566 3270
2567 { 3271 {
2568 my $anims = $facedata->{animinfo}; 3272 my $anims = $facedata->{animinfo};
2569 3273
2570 while (my ($anim, $info) = each %$anims) { 3274 while (my ($anim, $info) = each %$anims) {
2571 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3275 cf::anim::set $anim, $info->{frames}, $info->{facings};
2572 Coro::cede; 3276 cf::cede_to_tick;
2573 } 3277 }
2574 3278
2575 cf::anim::invalidate_all; # d'oh 3279 cf::anim::invalidate_all; # d'oh
2576 } 3280 }
2577 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
2578 1 3317 1
2579} 3318}
2580 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
2581sub 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
2582 load_resource_file "$MAPDIR/regions" 3363 load_resource_file "$MAPDIR/regions"
2583 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 }
2584} 3370}
2585 3371
2586sub reload_facedata { 3372sub reload_facedata {
2587 load_facedata "$DATADIR/facedata" 3373 load_facedata "$DATADIR/facedata"
2588 or die "unable to load facedata\n"; 3374 or die "unable to load facedata\n";
2599} 3385}
2600 3386
2601sub reload_resources { 3387sub reload_resources {
2602 warn "reloading resource files...\n"; 3388 warn "reloading resource files...\n";
2603 3389
3390 reload_facedata;
3391 reload_archetypes;
2604 reload_regions; 3392 reload_regions;
2605 reload_facedata;
2606 #reload_archetypes;#d#
2607 reload_archetypes;
2608 reload_treasures; 3393 reload_treasures;
2609 3394
2610 warn "finished reloading resource files\n"; 3395 warn "finished reloading resource files\n";
2611} 3396}
2612 3397
2613sub init { 3398sub init {
3399 my $guard = freeze_mainloop;
3400
3401 evthread_start IO::AIO::poll_fileno;
3402
2614 reload_resources; 3403 reload_resources;
2615} 3404}
2616 3405
2617sub cfg_load { 3406sub reload_config {
2618 open my $fh, "<:utf8", "$CONFDIR/config" 3407 open my $fh, "<:utf8", "$CONFDIR/config"
2619 or return; 3408 or return;
2620 3409
2621 local $/; 3410 local $/;
2622 *CFG = YAML::Syck::Load <$fh>; 3411 *CFG = YAML::Load <$fh>;
2623 3412
2624 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3413 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2625 3414
2626 $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};
2627 $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};
2638sub main { 3427sub main {
2639 # we must not ever block the main coroutine 3428 # we must not ever block the main coroutine
2640 local $Coro::idle = sub { 3429 local $Coro::idle = sub {
2641 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#
2642 (async { 3431 (async {
2643 Event::one_event; 3432 $Coro::current->{desc} = "IDLE BUG HANDLER";
3433 EV::loop EV::LOOP_ONESHOT;
2644 })->prio (Coro::PRIO_MAX); 3434 })->prio (Coro::PRIO_MAX);
2645 }; 3435 };
2646 3436
2647 cfg_load; 3437 {
3438 my $guard = freeze_mainloop;
3439 reload_config;
2648 db_init; 3440 db_init;
2649 load_extensions; 3441 load_extensions;
2650 3442
2651 $TICK_WATCHER->start; 3443 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3444 }
3445
2652 Event::loop; 3446 EV::loop;
2653} 3447}
2654 3448
2655############################################################################# 3449#############################################################################
2656# initialisation and cleanup 3450# initialisation and cleanup
2657 3451
2658# install some emergency cleanup handlers 3452# install some emergency cleanup handlers
2659BEGIN { 3453BEGIN {
3454 our %SIGWATCHER = ();
2660 for my $signal (qw(INT HUP TERM)) { 3455 for my $signal (qw(INT HUP TERM)) {
2661 Event->signal ( 3456 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2662 reentrant => 0,
2663 data => WF_AUTOCANCEL,
2664 signal => $signal,
2665 prio => 0,
2666 cb => sub {
2667 cf::cleanup "SIG$signal"; 3457 cf::cleanup "SIG$signal";
2668 },
2669 ); 3458 };
2670 } 3459 }
2671} 3460}
2672 3461
2673sub write_runtime { 3462sub write_runtime_sync {
2674 my $runtime = "$LOCALDIR/runtime"; 3463 my $runtime = "$LOCALDIR/runtime";
2675 3464
2676 # first touch the runtime file to show we are still running: 3465 # first touch the runtime file to show we are still running:
2677 # the fsync below can take a very very long time. 3466 # the fsync below can take a very very long time.
2678 3467
2704 and return; 3493 and return;
2705 3494
2706 warn "runtime file written.\n"; 3495 warn "runtime file written.\n";
2707 3496
2708 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 };
2709} 3541}
2710 3542
2711sub emergency_save() { 3543sub emergency_save() {
2712 my $freeze_guard = cf::freeze_mainloop; 3544 my $freeze_guard = cf::freeze_mainloop;
2713 3545
2719 # and maps saved/destroyed asynchronously. 3551 # and maps saved/destroyed asynchronously.
2720 warn "begin emergency player save\n"; 3552 warn "begin emergency player save\n";
2721 for my $login (keys %cf::PLAYER) { 3553 for my $login (keys %cf::PLAYER) {
2722 my $pl = $cf::PLAYER{$login} or next; 3554 my $pl = $cf::PLAYER{$login} or next;
2723 $pl->valid or next; 3555 $pl->valid or next;
3556 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2724 $pl->save; 3557 $pl->save;
2725 } 3558 }
2726 warn "end emergency player save\n"; 3559 warn "end emergency player save\n";
2727 3560
2728 warn "begin emergency map save\n"; 3561 warn "begin emergency map save\n";
2734 warn "end emergency map save\n"; 3567 warn "end emergency map save\n";
2735 3568
2736 warn "begin emergency database checkpoint\n"; 3569 warn "begin emergency database checkpoint\n";
2737 BDB::db_env_txn_checkpoint $DB_ENV; 3570 BDB::db_env_txn_checkpoint $DB_ENV;
2738 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";
2739 }; 3576 };
2740 3577
2741 warn "leave emergency perl save\n"; 3578 warn "leave emergency perl save\n";
2742} 3579}
2743 3580
2758 warn "reloading..."; 3595 warn "reloading...";
2759 3596
2760 warn "entering sync_job"; 3597 warn "entering sync_job";
2761 3598
2762 cf::sync_job { 3599 cf::sync_job {
2763 cf::write_runtime; # external watchdog should not bark 3600 cf::write_runtime_sync; # external watchdog should not bark
2764 cf::emergency_save; 3601 cf::emergency_save;
2765 cf::write_runtime; # external watchdog should not bark 3602 cf::write_runtime_sync; # external watchdog should not bark
2766 3603
2767 warn "syncing database to disk"; 3604 warn "syncing database to disk";
2768 BDB::db_env_txn_checkpoint $DB_ENV; 3605 BDB::db_env_txn_checkpoint $DB_ENV;
2769 3606
2770 # 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
2771
2772 warn "cancelling all WF_AUTOCANCEL watchers";
2773 for (Event::all_watchers) {
2774 $_->cancel if $_->data & WF_AUTOCANCEL;
2775 }
2776 3608
2777 warn "flushing outstanding aio requests"; 3609 warn "flushing outstanding aio requests";
2778 for (;;) { 3610 for (;;) {
2779 BDB::flush; 3611 BDB::flush;
2780 IO::AIO::flush; 3612 IO::AIO::flush;
2781 Coro::cede; 3613 Coro::cede_notself;
2782 last unless IO::AIO::nreqs || BDB::nreqs; 3614 last unless IO::AIO::nreqs || BDB::nreqs;
2783 warn "iterate..."; 3615 warn "iterate...";
2784 } 3616 }
2785 3617
2786 ++$RELOAD; 3618 ++$RELOAD;
2790 %EXT_CORO = (); 3622 %EXT_CORO = ();
2791 3623
2792 warn "removing commands"; 3624 warn "removing commands";
2793 %COMMAND = (); 3625 %COMMAND = ();
2794 3626
2795 warn "removing ext commands"; 3627 warn "removing ext/exti commands";
2796 %EXTCMD = (); 3628 %EXTCMD = ();
3629 %EXTICMD = ();
2797 3630
2798 warn "unloading/nuking all extensions"; 3631 warn "unloading/nuking all extensions";
2799 for my $pkg (@EXTS) { 3632 for my $pkg (@EXTS) {
2800 warn "... unloading $pkg"; 3633 warn "... unloading $pkg";
2801 3634
2844 warn "reloading cf.pm"; 3677 warn "reloading cf.pm";
2845 require cf; 3678 require cf;
2846 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3679 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2847 3680
2848 warn "loading config and database again"; 3681 warn "loading config and database again";
2849 cf::cfg_load; 3682 cf::reload_config;
2850 3683
2851 warn "loading extensions"; 3684 warn "loading extensions";
2852 cf::load_extensions; 3685 cf::load_extensions;
2853 3686
2854 warn "reattaching attachments to objects/players"; 3687 warn "reattaching attachments to objects/players";
2861 warn "leaving sync_job"; 3694 warn "leaving sync_job";
2862 3695
2863 1 3696 1
2864 } or do { 3697 } or do {
2865 warn $@; 3698 warn $@;
2866 warn "error while reloading, exiting."; 3699 cf::cleanup "error while reloading, exiting.";
2867 exit 1;
2868 }; 3700 };
2869 3701
2870 warn "reloaded"; 3702 warn "reloaded";
2871}; 3703};
2872 3704
2874 3706
2875sub reload_perl() { 3707sub reload_perl() {
2876 # doing reload synchronously and two reloads happen back-to-back, 3708 # doing reload synchronously and two reloads happen back-to-back,
2877 # coro crashes during coro_state_free->destroy here. 3709 # coro crashes during coro_state_free->destroy here.
2878 3710
2879 $RELOAD_WATCHER ||= Event->timer ( 3711 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
2880 reentrant => 0,
2881 after => 0,
2882 data => WF_AUTOCANCEL,
2883 cb => sub {
2884 do_reload_perl; 3712 do_reload_perl;
2885 undef $RELOAD_WATCHER; 3713 undef $RELOAD_WATCHER;
2886 },
2887 ); 3714 };
2888} 3715}
2889 3716
2890register_command "reload" => sub { 3717register_command "reload" => sub {
2891 my ($who, $arg) = @_; 3718 my ($who, $arg) = @_;
2892 3719
2893 if ($who->flag (FLAG_WIZ)) { 3720 if ($who->flag (FLAG_WIZ)) {
2894 $who->message ("reloading server."); 3721 $who->message ("reloading server.");
3722 async {
3723 $Coro::current->{desc} = "perl_reload";
2895 async { reload_perl }; 3724 reload_perl;
3725 };
2896 } 3726 }
2897}; 3727};
2898 3728
2899unshift @INC, $LIBDIR; 3729unshift @INC, $LIBDIR;
2900 3730
2902 3732
2903our @WAIT_FOR_TICK; 3733our @WAIT_FOR_TICK;
2904our @WAIT_FOR_TICK_BEGIN; 3734our @WAIT_FOR_TICK_BEGIN;
2905 3735
2906sub wait_for_tick { 3736sub wait_for_tick {
2907 return unless $TICK_WATCHER->is_active;
2908 return if $Coro::current == $Coro::main; 3737 return if tick_inhibit || $Coro::current == $Coro::main;
2909 3738
2910 my $signal = new Coro::Signal; 3739 my $signal = new Coro::Signal;
2911 push @WAIT_FOR_TICK, $signal; 3740 push @WAIT_FOR_TICK, $signal;
2912 $signal->wait; 3741 $signal->wait;
2913} 3742}
2914 3743
2915sub wait_for_tick_begin { 3744sub wait_for_tick_begin {
2916 return unless $TICK_WATCHER->is_active;
2917 return if $Coro::current == $Coro::main; 3745 return if tick_inhibit || $Coro::current == $Coro::main;
2918 3746
2919 my $signal = new Coro::Signal; 3747 my $signal = new Coro::Signal;
2920 push @WAIT_FOR_TICK_BEGIN, $signal; 3748 push @WAIT_FOR_TICK_BEGIN, $signal;
2921 $signal->wait; 3749 $signal->wait;
2922} 3750}
2923 3751
2924 my $min = 1e6;#d# 3752sub tick {
2925 my $avg = 10;
2926$TICK_WATCHER = Event->timer (
2927 reentrant => 0,
2928 parked => 1,
2929 prio => 0,
2930 at => $NEXT_TICK || $TICK,
2931 data => WF_AUTOCANCEL,
2932 cb => sub {
2933 if ($Coro::current != $Coro::main) { 3753 if ($Coro::current != $Coro::main) {
2934 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"
2935 unless ++$bug_warning > 10; 3755 unless ++$bug_warning > 10;
2936 return; 3756 return;
2937 } 3757 }
2938 3758
2939 $NOW = $tick_start = Event::time;
2940
2941 cf::server_tick; # one server iteration 3759 cf::server_tick; # one server iteration
2942 3760
2943 0 && sync_job {#d# 3761 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2944 for(1..10) { 3762 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
2945 my $t = Event::time; 3763 Coro::async_pool {
2946 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3764 $Coro::current->{desc} = "runtime saver";
2947 or die; 3765 write_runtime_sync
2948 3766 or warn "ERROR: unable to write runtime file: $!";
2949 $map->width (50);
2950 $map->height (50);
2951 $map->alloc;
2952 $map->_load_objects ("/tmp/x.map", 1);
2953 my $t = Event::time - $t;
2954
2955 #next unless $t < 0.0013;#d#
2956 if ($t < $min) {
2957 $min = $t;
2958 }
2959 $avg = $avg * 0.99 + $t * 0.01;
2960 }
2961 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2962 exit 0;
2963 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2964 }; 3767 };
3768 }
2965 3769
2966 $RUNTIME += $TICK;
2967 $NEXT_TICK += $TICK;
2968
2969 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2970 $NEXT_RUNTIME_WRITE = $NOW + 10;
2971 Coro::async_pool {
2972 write_runtime
2973 or warn "ERROR: unable to write runtime file: $!";
2974 };
2975 }
2976
2977# my $AFTER = Event::time;
2978# warn $AFTER - $NOW;#d#
2979
2980 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3770 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2981 $sig->send; 3771 $sig->send;
2982 } 3772 }
2983 while (my $sig = shift @WAIT_FOR_TICK) { 3773 while (my $sig = shift @WAIT_FOR_TICK) {
2984 $sig->send; 3774 $sig->send;
2985 } 3775 }
2986 3776
2987 $NOW = Event::time; 3777 $LOAD = ($NOW - $TICK_START) / $TICK;
2988
2989 # if we are delayed by four ticks or more, skip them all
2990 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2991
2992 $TICK_WATCHER->at ($NEXT_TICK);
2993 $TICK_WATCHER->start;
2994
2995 $LOAD = ($NOW - $tick_start) / $TICK;
2996 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3778 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2997 3779
2998 _post_tick; 3780 if (0) {
2999 3781 if ($NEXT_TICK) {
3000 3782 my $jitter = $TICK_START - $NEXT_TICK;
3783 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3784 warn "jitter $JITTER\n";#d#
3785 }
3001 }, 3786 }
3002); 3787}
3003 3788
3004{ 3789{
3005 BDB::max_poll_time $TICK * 0.1; 3790 # configure BDB
3006 $BDB_POLL_WATCHER = Event->io ( 3791
3007 reentrant => 0,
3008 fd => BDB::poll_fileno,
3009 poll => 'r',
3010 prio => 0,
3011 data => WF_AUTOCANCEL,
3012 cb => \&BDB::poll_cb,
3013 );
3014 BDB::min_parallel 8; 3792 BDB::min_parallel 8;
3015 3793 BDB::max_poll_reqs $TICK * 0.1;
3016 BDB::set_sync_prepare { 3794 $AnyEvent::BDB::WATCHER->priority (1);
3017 my $status;
3018 my $current = $Coro::current;
3019 (
3020 sub {
3021 $status = $!;
3022 $current->ready; undef $current;
3023 },
3024 sub {
3025 Coro::schedule while defined $current;
3026 $! = $status;
3027 },
3028 )
3029 };
3030 3795
3031 unless ($DB_ENV) { 3796 unless ($DB_ENV) {
3032 $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);
3033 3802
3034 cf::sync_job { 3803 cf::sync_job {
3035 eval { 3804 eval {
3036 BDB::db_env_open 3805 BDB::db_env_open
3037 $DB_ENV, 3806 $DB_ENV,
3039 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
3040 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3809 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3041 0666; 3810 0666;
3042 3811
3043 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3812 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3044
3045 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3046 $DB_ENV->set_lk_detect;
3047 }; 3813 };
3048 3814
3049 cf::cleanup "db_env_open(db): $@" if $@; 3815 cf::cleanup "db_env_open(db): $@" if $@;
3050 }; 3816 };
3051 } 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 };
3052} 3828}
3053 3829
3054{ 3830{
3831 # configure IO::AIO
3832
3055 IO::AIO::min_parallel 8; 3833 IO::AIO::min_parallel 8;
3056
3057 undef $Coro::AIO::WATCHER;
3058 IO::AIO::max_poll_time $TICK * 0.1; 3834 IO::AIO::max_poll_time $TICK * 0.1;
3059 $AIO_POLL_WATCHER = Event->io ( 3835 undef $AnyEvent::AIO::WATCHER;
3060 reentrant => 0,
3061 data => WF_AUTOCANCEL,
3062 fd => IO::AIO::poll_fileno,
3063 poll => 'r',
3064 prio => 6,
3065 cb => \&IO::AIO::poll_cb,
3066 );
3067} 3836}
3068 3837
3069my $_log_backtrace; 3838my $_log_backtrace;
3070 3839
3071sub _log_backtrace { 3840sub _log_backtrace {
3075 3844
3076 # limit the # of concurrent backtraces 3845 # limit the # of concurrent backtraces
3077 if ($_log_backtrace < 2) { 3846 if ($_log_backtrace < 2) {
3078 ++$_log_backtrace; 3847 ++$_log_backtrace;
3079 async { 3848 async {
3849 $Coro::current->{desc} = "abt $msg";
3850
3080 my @bt = fork_call { 3851 my @bt = fork_call {
3081 @addr = map { sprintf "%x", $_ } @addr; 3852 @addr = map { sprintf "%x", $_ } @addr;
3082 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3853 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3083 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 |"
3084 or die "addr2line: $!"; 3855 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines