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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines