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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines