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.274 by root, Tue Jun 5 13:05:02 2007 UTC vs.
Revision 1.409 by root, Mon Jan 14 11:41:48 2008 UTC

… …
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable; 9use EV 1.86;
10use Event;
11use Opcode; 10use Opcode;
12use Safe; 11use Safe;
13use Safe::Hole; 12use Safe::Hole;
13use Storable ();
14 14
15use Coro 3.61 (); 15use Coro 4.32 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::EV;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::BDB;
23use Coro::Storable; 24use Coro::Storable;
25use Coro::Util ();
24 26
27use JSON::XS 2.01 ();
25use BDB (); 28use BDB ();
26use Data::Dumper; 29use Data::Dumper;
27use Digest::MD5; 30use Digest::MD5;
28use Fcntl; 31use Fcntl;
29use YAML::Syck (); 32use YAML ();
30use IO::AIO 2.32 (); 33use IO::AIO 2.51 ();
31use Time::HiRes; 34use Time::HiRes;
32use Compress::LZF; 35use Compress::LZF;
36use Digest::MD5 ();
33 37
34# configure various modules to our taste 38# configure various modules to our taste
35# 39#
36$Storable::canonical = 1; # reduce rsync transfers 40$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39 43
40$Event::Eval = 1; # no idea why this is required, but it is
41
42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
43$YAML::Syck::ImplicitUnicode = 1;
44
45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 44$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46 45
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 46sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
48 47
49our %COMMAND = (); 48our %COMMAND = ();
50our %COMMAND_TIME = (); 49our %COMMAND_TIME = ();
51 50
52our @EXTS = (); # list of extension package names 51our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 52our %EXTCMD = ();
53our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 54our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 55our %EXT_MAP = (); # pluggable maps
56 56
57our $RELOAD; # number of reloads so far 57our $RELOAD; # number of reloads so far
58our @EVENT; 58our @EVENT;
… …
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 66our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 68our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 69our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 70our $BDBDIR = "$LOCALDIR/db";
71our %RESOURCE;
71 72
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
73our $TICK_WATCHER; 74our $TICK_WATCHER;
74our $AIO_POLL_WATCHER; 75our $AIO_POLL_WATCHER;
75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
76our $NEXT_TICK; 77our $NEXT_TICK;
77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 78our $USE_FSYNC = 1; # use fsync to write maps - default off
79 79
80our $BDB_POLL_WATCHER; 80our $BDB_POLL_WATCHER;
81our $BDB_DEADLOCK_WATCHER;
82our $BDB_CHECKPOINT_WATCHER;
83our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 84our $DB_ENV;
82 85
83our %CFG; 86our %CFG;
84 87
85our $UPTIME; $UPTIME ||= time; 88our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 89our $RUNTIME;
90our $NOW;
87 91
88our %PLAYER; # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 93our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
91 95
92# used to convert map paths into valid unix filenames by replacing / by ∕ 96# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 98
… …
155 159
156The raw value load value from the last tick. 160The raw value load value from the last tick.
157 161
158=item %cf::CFG 162=item %cf::CFG
159 163
160Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/deliantra-server/config>, or
161from wherever your confdir points to. 165from wherever your confdir points to.
162 166
163=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
164 168
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
166returns directly I<after> the tick processing (and consequently, can only wake one process 170returns directly I<after> the tick processing (and consequently, can only wake one process
167per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 171per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168 172
173=item @cf::INVOKE_RESULTS
174
175This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call.
178
169=back 179=back
170 180
171=cut 181=cut
172 182
173BEGIN { 183BEGIN {
… …
177 $msg .= "\n" 187 $msg .= "\n"
178 unless $msg =~ /\n$/; 188 unless $msg =~ /\n$/;
179 189
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181 191
182 utf8::encode $msg;
183 LOG llevError, $msg; 192 LOG llevError, $msg;
184 }; 193 };
185} 194}
195
196$Coro::State::DIEHOOK = sub {
197 warn Carp::longmess $_[0];
198 Coro::terminate;
199};
186 200
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 201@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 202@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 203@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 204@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
203)) { 217)) {
204 no strict 'refs'; 218 no strict 'refs';
205 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 219 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
206} 220}
207 221
208$Event::DIED = sub { 222$EV::DIED = sub {
209 warn "error in event callback: @_"; 223 warn "error in event callback: @_";
210}; 224};
225
226#############################################################################
211 227
212=head2 UTILITY FUNCTIONS 228=head2 UTILITY FUNCTIONS
213 229
214=over 4 230=over 4
215 231
… …
234 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 250 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
235 $d 251 $d
236 } || "[unable to dump $_[0]: '$@']"; 252 } || "[unable to dump $_[0]: '$@']";
237} 253}
238 254
239use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
240
241=item $ref = cf::from_json $json 255=item $ref = cf::decode_json $json
242 256
243Converts a JSON string into the corresponding perl data structure. 257Converts a JSON string into the corresponding perl data structure.
244 258
245=item $json = cf::to_json $ref 259=item $json = cf::encode_json $ref
246 260
247Converts a perl data structure into its JSON representation. 261Converts a perl data structure into its JSON representation.
262
263=cut
264
265our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
266
267sub encode_json($) { $json_coder->encode ($_[0]) }
268sub decode_json($) { $json_coder->decode ($_[0]) }
248 269
249=item cf::lock_wait $string 270=item cf::lock_wait $string
250 271
251Wait until the given lock is available. See cf::lock_acquire. 272Wait until the given lock is available. See cf::lock_acquire.
252 273
… …
255Wait until the given lock is available and then acquires it and returns 276Wait until the given lock is available and then acquires it and returns
256a Coro::guard object. If the guard object gets destroyed (goes out of scope, 277a Coro::guard object. If the guard object gets destroyed (goes out of scope,
257for example when the coroutine gets canceled), the lock is automatically 278for example when the coroutine gets canceled), the lock is automatically
258returned. 279returned.
259 280
281Locks are *not* recursive, locking from the same coro twice results in a
282deadlocked coro.
283
260Lock names should begin with a unique identifier (for example, cf::map::find 284Lock names should begin with a unique identifier (for example, cf::map::find
261uses map_find and cf::map::load uses map_load). 285uses map_find and cf::map::load uses map_load).
262 286
263=item $locked = cf::lock_active $string 287=item $locked = cf::lock_active $string
264 288
265Return true if the lock is currently active, i.e. somebody has locked it. 289Return true if the lock is currently active, i.e. somebody has locked it.
266 290
267=cut 291=cut
268 292
269our %LOCK; 293our %LOCK;
294our %LOCKER;#d#
270 295
271sub lock_wait($) { 296sub lock_wait($) {
272 my ($key) = @_; 297 my ($key) = @_;
298
299 if ($LOCKER{$key} == $Coro::current) {#d#
300 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
301 return;#d#
302 }#d#
273 303
274 # wait for lock, if any 304 # wait for lock, if any
275 while ($LOCK{$key}) { 305 while ($LOCK{$key}) {
276 push @{ $LOCK{$key} }, $Coro::current; 306 push @{ $LOCK{$key} }, $Coro::current;
277 Coro::schedule; 307 Coro::schedule;
… …
283 313
284 # wait, to be sure we are not locked 314 # wait, to be sure we are not locked
285 lock_wait $key; 315 lock_wait $key;
286 316
287 $LOCK{$key} = []; 317 $LOCK{$key} = [];
318 $LOCKER{$key} = $Coro::current;#d#
288 319
289 Coro::guard { 320 Coro::guard {
321 delete $LOCKER{$key};#d#
290 # wake up all waiters, to be on the safe side 322 # wake up all waiters, to be on the safe side
291 $_->ready for @{ delete $LOCK{$key} }; 323 $_->ready for @{ delete $LOCK{$key} };
292 } 324 }
293} 325}
294 326
… …
306 }; 338 };
307 $TICK_WATCHER->stop; 339 $TICK_WATCHER->stop;
308 $guard 340 $guard
309} 341}
310 342
343=item cf::periodic $interval, $cb
344
345Like EV::periodic, but randomly selects a starting point so that the actions
346get spread over timer.
347
348=cut
349
350sub periodic($$) {
351 my ($interval, $cb) = @_;
352
353 my $start = rand List::Util::min 180, $interval;
354
355 EV::periodic $start, $interval, 0, $cb
356}
357
358=item cf::get_slot $time[, $priority[, $name]]
359
360Allocate $time seconds of blocking CPU time at priority C<$priority>:
361This call blocks and returns only when you have at least C<$time> seconds
362of cpu time till the next tick. The slot is only valid till the next cede.
363
364The optional C<$name> can be used to identify the job to run. It might be
365used for statistical purposes and should identify the same time-class.
366
367Useful for short background jobs.
368
369=cut
370
371our @SLOT_QUEUE;
372our $SLOT_QUEUE;
373
374$SLOT_QUEUE->cancel if $SLOT_QUEUE;
375$SLOT_QUEUE = Coro::async {
376 $Coro::current->desc ("timeslot manager");
377
378 my $signal = new Coro::Signal;
379
380 while () {
381 next_job:
382 my $avail = cf::till_tick;
383 if ($avail > 0.01) {
384 for (0 .. $#SLOT_QUEUE) {
385 if ($SLOT_QUEUE[$_][0] < $avail) {
386 my $job = splice @SLOT_QUEUE, $_, 1, ();
387 $job->[2]->send;
388 Coro::cede;
389 goto next_job;
390 }
391 }
392 }
393
394 if (@SLOT_QUEUE) {
395 # we do not use wait_for_tick() as it returns immediately when tick is inactive
396 push @cf::WAIT_FOR_TICK, $signal;
397 $signal->wait;
398 } else {
399 Coro::schedule;
400 }
401 }
402};
403
404sub get_slot($;$$) {
405 my ($time, $pri, $name) = @_;
406
407 $time = $TICK * .6 if $time > $TICK * .6;
408 my $sig = new Coro::Signal;
409
410 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
411 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
412 $SLOT_QUEUE->ready;
413 $sig->wait;
414}
415
311=item cf::async { BLOCK } 416=item cf::async { BLOCK }
312 417
313Currently the same as Coro::async_pool, meaning you cannot use 418Currently the same as Coro::async_pool, meaning you cannot use
314C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 419C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
315thing you are allowed to do is call C<prio> on it. 420thing you are allowed to do is call C<prio> on it.
… …
318 423
319BEGIN { *async = \&Coro::async_pool } 424BEGIN { *async = \&Coro::async_pool }
320 425
321=item cf::sync_job { BLOCK } 426=item cf::sync_job { BLOCK }
322 427
323The design of crossfire+ requires that the main coro ($Coro::main) is 428The design of Deliantra requires that the main coroutine ($Coro::main)
324always able to handle events or runnable, as crossfire+ is only partly 429is always able to handle events or runnable, as Deliantra is only
325reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 430partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
431acceptable.
326 432
327If it must be done, put the blocking parts into C<sync_job>. This will run 433If it must be done, put the blocking parts into C<sync_job>. This will run
328the given BLOCK in another coroutine while waiting for the result. The 434the given BLOCK in another coroutine while waiting for the result. The
329server will be frozen during this time, so the block should either finish 435server will be frozen during this time, so the block should either finish
330fast or be very important. 436fast or be very important.
… …
333 439
334sub sync_job(&) { 440sub sync_job(&) {
335 my ($job) = @_; 441 my ($job) = @_;
336 442
337 if ($Coro::current == $Coro::main) { 443 if ($Coro::current == $Coro::main) {
338 my $time = Event::time; 444 my $time = EV::time;
339 445
340 # this is the main coro, too bad, we have to block 446 # this is the main coro, too bad, we have to block
341 # till the operation succeeds, freezing the server :/ 447 # till the operation succeeds, freezing the server :/
342 448
449 LOG llevError, Carp::longmess "sync job";#d#
450
343 # TODO: use suspend/resume instead 451 # TODO: use suspend/resume instead
344 # (but this is cancel-safe) 452 # (but this is cancel-safe)
345 my $freeze_guard = freeze_mainloop; 453 my $freeze_guard = freeze_mainloop;
346 454
347 my $busy = 1; 455 my $busy = 1;
348 my @res; 456 my @res;
349 457
350 (async { 458 (async {
459 $Coro::current->desc ("sync job coro");
351 @res = eval { $job->() }; 460 @res = eval { $job->() };
352 warn $@ if $@; 461 warn $@ if $@;
353 undef $busy; 462 undef $busy;
354 })->prio (Coro::PRIO_MAX); 463 })->prio (Coro::PRIO_MAX);
355 464
356 while ($busy) { 465 while ($busy) {
357 Coro::cede or Event::one_event; 466 if (Coro::nready) {
467 Coro::cede_notself;
468 } else {
469 EV::loop EV::LOOP_ONESHOT;
358 } 470 }
471 }
359 472
360 $time = Event::time - $time; 473 $time = EV::time - $time;
361 474
362 LOG llevError | logBacktrace, Carp::longmess "long sync job" 475 LOG llevError | logBacktrace, Carp::longmess "long sync job"
363 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 476 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
364 477
365 $tick_start += $time; # do not account sync jobs to server load 478 $tick_start += $time; # do not account sync jobs to server load
… …
390 $EXT_CORO{$coro+0} = $coro; 503 $EXT_CORO{$coro+0} = $coro;
391 504
392 $coro 505 $coro
393} 506}
394 507
395sub write_runtime { 508=item fork_call { }, $args
396 my $runtime = "$LOCALDIR/runtime";
397 509
398 # first touch the runtime file to show we are still running: 510Executes the given code block with the given arguments in a seperate
399 # the fsync below can take a very very long time. 511process, returning the results. Everything must be serialisable with
512Coro::Storable. May, of course, block. Note that the executed sub may
513never block itself or use any form of event handling.
400 514
401 IO::AIO::aio_utime $runtime, undef, undef; 515=cut
402 516
403 my $guard = cf::lock_acquire "write_runtime"; 517sub fork_call(&@) {
518 my ($cb, @args) = @_;
404 519
405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 520 # we seemingly have to make a local copy of the whole thing,
406 or return; 521 # otherwise perl prematurely frees the stuff :/
522 # TODO: investigate and fix (likely this will be rather laborious)
407 523
408 my $value = $cf::RUNTIME + 90 + 10; 524 my @res = Coro::Util::fork_eval {
409 # 10 is the runtime save interval, for a monotonic clock 525 reset_signals;
410 # 60 allows for the watchdog to kill the server. 526 &$cb
527 }, @args;
411 528
412 (aio_write $fh, 0, (length $value), $value, 0) <= 0 529 wantarray ? @res : $res[-1]
413 and return; 530}
414 531
415 # always fsync - this file is important 532=item $value = cf::db_get $family => $key
416 aio_fsync $fh
417 and return;
418 533
419 # touch it again to show we are up-to-date 534Returns a single value from the environment database.
420 aio_utime $fh, undef, undef;
421 535
422 close $fh 536=item cf::db_put $family => $key => $value
423 or return;
424 537
425 aio_rename "$runtime~", $runtime 538Stores the given C<$value> in the family. It can currently store binary
426 and return; 539data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
427 540
428 warn "runtime file written.\n"; 541=item $db = cf::db_table "name"
429 542
543Create and/or open a new database table. The string must not be "db" and must be unique
544within each server.
545
546=cut
547
548sub db_table($) {
549 my ($name) = @_;
550 my $db = BDB::db_create $DB_ENV;
551
552 eval {
553 $db->set_flags (BDB::CHKSUM);
554
555 utf8::encode $name;
556 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
557 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
558 cf::cleanup "db_open(db): $!" if $!;
559 };
560 cf::cleanup "db_open(db): $@" if $@;
561
562 $db
563}
564
565our $DB;
566
567sub db_init {
568 cf::sync_job {
569 $DB ||= db_table "db";
570 };
571}
572
573sub db_get($$) {
574 my $key = "$_[0]/$_[1]";
575
576 cf::sync_job {
577 BDB::db_get $DB, undef, $key, my $data;
578
579 $! ? ()
580 : $data
430 1 581 }
582}
583
584sub db_put($$$) {
585 BDB::dbreq_pri 4;
586 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
587}
588
589=item cf::cache $id => [$paths...], $processversion => $process
590
591Generic caching function that returns the value of the resource $id,
592caching and regenerating as required.
593
594This function can block.
595
596=cut
597
598sub cache {
599 my ($id, $src, $processversion, $process) = @_;
600
601 my $meta =
602 join "\x00",
603 $processversion,
604 map {
605 aio_stat $_
606 and Carp::croak "$_: $!";
607
608 ($_, (stat _)[7,9])
609 } @$src;
610
611 my $dbmeta = db_get cache => "$id/meta";
612 if ($dbmeta ne $meta) {
613 # changed, we may need to process
614
615 my @data;
616 my $md5;
617
618 for (0 .. $#$src) {
619 0 <= aio_load $src->[$_], $data[$_]
620 or Carp::croak "$src->[$_]: $!";
621 }
622
623 # if processing is expensive, check
624 # checksum first
625 if (1) {
626 $md5 =
627 join "\x00",
628 $processversion,
629 map {
630 cf::cede_to_tick;
631 ($src->[$_], Digest::MD5::md5_hex $data[$_])
632 } 0.. $#$src;
633
634
635 my $dbmd5 = db_get cache => "$id/md5";
636 if ($dbmd5 eq $md5) {
637 db_put cache => "$id/meta", $meta;
638
639 return db_get cache => "$id/data";
640 }
641 }
642
643 my $t1 = Time::HiRes::time;
644 my $data = $process->(\@data);
645 my $t2 = Time::HiRes::time;
646
647 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
648
649 db_put cache => "$id/data", $data;
650 db_put cache => "$id/md5" , $md5;
651 db_put cache => "$id/meta", $meta;
652
653 return $data;
654 }
655
656 db_get cache => "$id/data"
431} 657}
432 658
433=item cf::datalog type => key => value, ... 659=item cf::datalog type => key => value, ...
434 660
435Log a datalog packet of the given type with the given key-value pairs. 661Log a datalog packet of the given type with the given key-value pairs.
… …
453attach callbacks/event handlers (a collection of which is called an "attachment") 679attach callbacks/event handlers (a collection of which is called an "attachment")
454to it. All such attachable objects support the following methods. 680to it. All such attachable objects support the following methods.
455 681
456In the following description, CLASS can be any of C<global>, C<object> 682In the following description, CLASS can be any of C<global>, C<object>
457C<player>, C<client> or C<map> (i.e. the attachable objects in 683C<player>, C<client> or C<map> (i.e. the attachable objects in
458crossfire+). 684Deliantra).
459 685
460=over 4 686=over 4
461 687
462=item $attachable->attach ($attachment, key => $value...) 688=item $attachable->attach ($attachment, key => $value...)
463 689
… …
665 _attach $registry, $klass, @attach; 891 _attach $registry, $klass, @attach;
666 } 892 }
667 893
668 $obj->{$name} = \%arg; 894 $obj->{$name} = \%arg;
669 } else { 895 } else {
670 warn "object uses attachment '$name' that is not available, postponing.\n"; 896 warn "object uses attachment '$name' which is not available, postponing.\n";
671 } 897 }
672 898
673 $obj->{_attachment}{$name} = undef; 899 $obj->{_attachment}{$name} = undef;
674} 900}
675 901
… …
715 "; 941 ";
716 die if $@; 942 die if $@;
717} 943}
718 944
719our $override; 945our $override;
720our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 946our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
721 947
722sub override { 948sub override {
723 $override = 1; 949 $override = 1;
724 @invoke_results = (); 950 @INVOKE_RESULTS = (@_);
725} 951}
726 952
727sub do_invoke { 953sub do_invoke {
728 my $event = shift; 954 my $event = shift;
729 my $callbacks = shift; 955 my $callbacks = shift;
730 956
731 @invoke_results = (); 957 @INVOKE_RESULTS = ();
732 958
733 local $override; 959 local $override;
734 960
735 for (@$callbacks) { 961 for (@$callbacks) {
736 eval { &{$_->[1]} }; 962 eval { &{$_->[1]} };
… …
745 } 971 }
746 972
747 0 973 0
748} 974}
749 975
750=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 976=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
751 977
752=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 978=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
753 979
754Generate an object-specific event with the given arguments. 980Generate an object-specific event with the given arguments.
755 981
756This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 982This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
757removed in future versions), and there is no public API to access override 983removed in future versions), and there is no public API to access override
758results (if you must, access C<@cf::invoke_results> directly). 984results (if you must, access C<@cf::INVOKE_RESULTS> directly).
759 985
760=back 986=back
761 987
762=cut 988=cut
763 989
764############################################################################# 990#############################################################################
765# object support 991# object support
992
993sub _object_equal($$);
994sub _object_equal($$) {
995 my ($a, $b) = @_;
996
997 return 0 unless (ref $a) eq (ref $b);
998
999 if ("HASH" eq ref $a) {
1000 my @ka = keys %$a;
1001 my @kb = keys %$b;
1002
1003 return 0 if @ka != @kb;
1004
1005 for (0 .. $#ka) {
1006 return 0 unless $ka[$_] eq $kb[$_];
1007 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1008 }
1009
1010 } elsif ("ARRAY" eq ref $a) {
1011
1012 return 0 if @$a != @$b;
1013
1014 for (0 .. $#$a) {
1015 return 0 unless _object_equal $a->[$_], $b->[$_];
1016 }
1017
1018 } elsif ($a ne $b) {
1019 return 0;
1020 }
1021
1022 1
1023}
1024
1025our $SLOW_MERGES;#d#
1026sub _can_merge {
1027 my ($ob1, $ob2) = @_;
1028
1029 ++$SLOW_MERGES;#d#
1030
1031 # we do the slow way here
1032 return _object_equal $ob1, $ob2
1033}
766 1034
767sub reattach { 1035sub reattach {
768 # basically do the same as instantiate, without calling instantiate 1036 # basically do the same as instantiate, without calling instantiate
769 my ($obj) = @_; 1037 my ($obj) = @_;
770 1038
… …
791cf::attachable->attach ( 1059cf::attachable->attach (
792 prio => -1000000, 1060 prio => -1000000,
793 on_instantiate => sub { 1061 on_instantiate => sub {
794 my ($obj, $data) = @_; 1062 my ($obj, $data) = @_;
795 1063
796 $data = from_json $data; 1064 $data = decode_json $data;
797 1065
798 for (@$data) { 1066 for (@$data) {
799 my ($name, $args) = @$_; 1067 my ($name, $args) = @$_;
800 1068
801 $obj->attach ($name, %{$args || {} }); 1069 $obj->attach ($name, %{$args || {} });
… …
817sub object_freezer_save { 1085sub object_freezer_save {
818 my ($filename, $rdata, $objs) = @_; 1086 my ($filename, $rdata, $objs) = @_;
819 1087
820 sync_job { 1088 sync_job {
821 if (length $$rdata) { 1089 if (length $$rdata) {
1090 utf8::decode (my $decname = $filename);
822 warn sprintf "saving %s (%d,%d)\n", 1091 warn sprintf "saving %s (%d,%d)\n",
823 $filename, length $$rdata, scalar @$objs; 1092 $decname, length $$rdata, scalar @$objs;
824 1093
825 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1094 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
826 chmod SAVE_MODE, $fh; 1095 chmod SAVE_MODE, $fh;
827 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1096 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
828 aio_fsync $fh if $cf::USE_FSYNC; 1097 aio_fsync $fh if $cf::USE_FSYNC;
829 close $fh; 1098 close $fh;
830 1099
831 if (@$objs) { 1100 if (@$objs) {
832 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1101 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
833 chmod SAVE_MODE, $fh; 1102 chmod SAVE_MODE, $fh;
834 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1103 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
835 aio_write $fh, 0, (length $data), $data, 0; 1104 aio_write $fh, 0, (length $data), $data, 0;
836 aio_fsync $fh if $cf::USE_FSYNC; 1105 aio_fsync $fh if $cf::USE_FSYNC;
837 close $fh; 1106 close $fh;
838 aio_rename "$filename.pst~", "$filename.pst"; 1107 aio_rename "$filename.pst~", "$filename.pst";
839 } 1108 }
… …
847 } 1116 }
848 } else { 1117 } else {
849 aio_unlink $filename; 1118 aio_unlink $filename;
850 aio_unlink "$filename.pst"; 1119 aio_unlink "$filename.pst";
851 } 1120 }
852 } 1121 };
853} 1122}
854 1123
855sub object_freezer_as_string { 1124sub object_freezer_as_string {
856 my ($rdata, $objs) = @_; 1125 my ($rdata, $objs) = @_;
857 1126
… …
869 or return; 1138 or return;
870 1139
871 unless (aio_stat "$filename.pst") { 1140 unless (aio_stat "$filename.pst") {
872 (aio_load "$filename.pst", $av) >= 0 1141 (aio_load "$filename.pst", $av) >= 0
873 or return; 1142 or return;
1143
874 $av = eval { (Storable::thaw $av)->{objs} }; 1144 my $st = eval { Coro::Storable::thaw $av };
1145 $av = $st->{objs};
875 } 1146 }
876 1147
1148 utf8::decode (my $decname = $filename);
877 warn sprintf "loading %s (%d)\n", 1149 warn sprintf "loading %s (%d,%d)\n",
878 $filename, length $data, scalar @{$av || []}; 1150 $decname, length $data, scalar @{$av || []};
1151
879 return ($data, $av); 1152 ($data, $av)
880} 1153}
1154
1155=head2 COMMAND CALLBACKS
1156
1157=over 4
1158
1159=cut
881 1160
882############################################################################# 1161#############################################################################
883# command handling &c 1162# command handling &c
884 1163
885=item cf::register_command $name => \&callback($ob,$args); 1164=item cf::register_command $name => \&callback($ob,$args);
… …
898 push @{ $COMMAND{$name} }, [$caller, $cb]; 1177 push @{ $COMMAND{$name} }, [$caller, $cb];
899} 1178}
900 1179
901=item cf::register_extcmd $name => \&callback($pl,$packet); 1180=item cf::register_extcmd $name => \&callback($pl,$packet);
902 1181
903Register a callbackf ro execution when the client sends an extcmd packet. 1182Register a callback for execution when the client sends an (synchronous)
1183extcmd packet. Ext commands will be processed in the order they are
1184received by the server, like other user commands. The first argument is
1185the logged-in player. Ext commands can only be processed after a player
1186has logged in successfully.
904 1187
905If the callback returns something, it is sent back as if reply was being 1188If the callback returns something, it is sent back as if reply was being
906called. 1189called.
907 1190
1191=item cf::register_exticmd $name => \&callback($ns,$packet);
1192
1193Register a callback for execution when the client sends an (asynchronous)
1194exticmd packet. Exti commands are processed by the server as soon as they
1195are received, i.e. out of order w.r.t. other commands. The first argument
1196is a client socket. Exti commands can be received anytime, even before
1197log-in.
1198
1199If the callback returns something, it is sent back as if reply was being
1200called.
1201
908=cut 1202=cut
909 1203
910sub register_extcmd { 1204sub register_extcmd {
911 my ($name, $cb) = @_; 1205 my ($name, $cb) = @_;
912 1206
913 $EXTCMD{$name} = $cb; 1207 $EXTCMD{$name} = $cb;
1208}
1209
1210sub register_exticmd {
1211 my ($name, $cb) = @_;
1212
1213 $EXTICMD{$name} = $cb;
914} 1214}
915 1215
916cf::player->attach ( 1216cf::player->attach (
917 on_command => sub { 1217 on_command => sub {
918 my ($pl, $name, $params) = @_; 1218 my ($pl, $name, $params) = @_;
… …
927 cf::override; 1227 cf::override;
928 }, 1228 },
929 on_extcmd => sub { 1229 on_extcmd => sub {
930 my ($pl, $buf) = @_; 1230 my ($pl, $buf) = @_;
931 1231
932 my $msg = eval { from_json $buf }; 1232 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
933 1233
934 if (ref $msg) { 1234 if (ref $msg) {
1235 my ($type, $reply, @payload) =
1236 "ARRAY" eq ref $msg
1237 ? @$msg
1238 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1239
1240 my @reply;
1241
935 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1242 if (my $cb = $EXTCMD{$type}) {
936 if (my %reply = $cb->($pl, $msg)) { 1243 @reply = $cb->($pl, @payload);
937 $pl->ext_reply ($msg->{msgid}, %reply);
938 }
939 } 1244 }
1245
1246 $pl->ext_reply ($reply, @reply)
1247 if $reply;
1248
940 } else { 1249 } else {
941 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1250 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
942 } 1251 }
943 1252
944 cf::override; 1253 cf::override;
945 }, 1254 },
946); 1255);
947 1256
948sub load_extension {
949 my ($path) = @_;
950
951 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
952 my $base = $1;
953 my $pkg = $1;
954 $pkg =~ s/[^[:word:]]/_/g;
955 $pkg = "ext::$pkg";
956
957 warn "... loading '$path' into '$pkg'\n";
958
959 open my $fh, "<:utf8", $path
960 or die "$path: $!";
961
962 my $source =
963 "package $pkg; use strict; use utf8;\n"
964 . "#line 1 \"$path\"\n{\n"
965 . (do { local $/; <$fh> })
966 . "\n};\n1";
967
968 unless (eval $source) {
969 my $msg = $@ ? "$path: $@\n"
970 : "extension disabled.\n";
971 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
972 warn $@;
973 warn "mandatory extension failed to load, exiting.\n";
974 exit 1;
975 }
976 die $@;
977 }
978
979 push @EXTS, $pkg;
980}
981
982sub load_extensions { 1257sub load_extensions {
1258 cf::sync_job {
1259 my %todo;
1260
983 for my $ext (<$LIBDIR/*.ext>) { 1261 for my $path (<$LIBDIR/*.ext>) {
984 next unless -r $ext; 1262 next unless -r $path;
985 eval { 1263
986 load_extension $ext; 1264 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1265 my $base = $1;
1266 my $pkg = $1;
1267 $pkg =~ s/[^[:word:]]/_/g;
1268 $pkg = "ext::$pkg";
1269
1270 open my $fh, "<:utf8", $path
1271 or die "$path: $!";
1272
1273 my $source = do { local $/; <$fh> };
1274
1275 my %ext = (
1276 path => $path,
1277 base => $base,
1278 pkg => $pkg,
1279 );
1280
1281 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1282 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1283
1284 $ext{source} =
1285 "package $pkg; use strict; use utf8;\n"
1286 . "#line 1 \"$path\"\n{\n"
1287 . $source
1288 . "\n};\n1";
1289
1290 $todo{$base} = \%ext;
1291 }
1292
1293 my %done;
1294 while (%todo) {
1295 my $progress;
1296
1297 while (my ($k, $v) = each %todo) {
1298 for (split /,\s*/, $v->{meta}{depends}) {
1299 goto skip
1300 unless exists $done{$_};
1301 }
1302
1303 warn "... loading '$k' into '$v->{pkg}'\n";
1304
1305 unless (eval $v->{source}) {
1306 my $msg = $@ ? "$v->{path}: $@\n"
1307 : "$v->{base}: extension inactive.\n";
1308
1309 if (exists $v->{meta}{mandatory}) {
1310 warn $msg;
1311 warn "mandatory extension failed to load, exiting.\n";
1312 exit 1;
1313 }
1314
1315 warn $msg;
1316 }
1317
1318 $done{$k} = delete $todo{$k};
1319 push @EXTS, $v->{pkg};
1320 $progress = 1;
987 1 1321 }
988 } or warn "$ext not loaded: $@"; 1322
1323 skip:
1324 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1325 unless $progress;
1326 }
989 } 1327 };
990} 1328}
991 1329
992############################################################################# 1330#############################################################################
993 1331
1332=back
1333
994=head2 CORE EXTENSIONS 1334=head2 CORE EXTENSIONS
995 1335
996Functions and methods that extend core crossfire objects. 1336Functions and methods that extend core crossfire objects.
997 1337
998=cut 1338=cut
… …
1002use Coro::AIO; 1342use Coro::AIO;
1003 1343
1004=head3 cf::player 1344=head3 cf::player
1005 1345
1006=over 4 1346=over 4
1347
1348=item cf::player::num_playing
1349
1350Returns the official number of playing players, as per the Crossfire metaserver rules.
1351
1352=cut
1353
1354sub num_playing {
1355 scalar grep
1356 $_->ob->map
1357 && !$_->hidden
1358 && !$_->ob->flag (cf::FLAG_WIZ),
1359 cf::player::list
1360}
1007 1361
1008=item cf::player::find $login 1362=item cf::player::find $login
1009 1363
1010Returns the given player object, loading it if necessary (might block). 1364Returns the given player object, loading it if necessary (might block).
1011 1365
… …
1047 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1401 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1048 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1402 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1049 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1403 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1050 aio_unlink +(playerdir $login) . "/$login.pl"; 1404 aio_unlink +(playerdir $login) . "/$login.pl";
1051 1405
1052 my $pl = load_pl path $login 1406 my $f = new_from_file cf::object::thawer path $login
1053 or return; 1407 or return;
1408
1409 my $pl = cf::player::load_pl $f
1410 or return;
1411 local $cf::PLAYER_LOADING{$login} = $pl;
1412 $f->resolve_delayed_derefs;
1054 $cf::PLAYER{$login} = $pl 1413 $cf::PLAYER{$login} = $pl
1055 } 1414 }
1056 } 1415 }
1057} 1416}
1058 1417
… …
1068 1427
1069 aio_mkdir playerdir $pl, 0770; 1428 aio_mkdir playerdir $pl, 0770;
1070 $pl->{last_save} = $cf::RUNTIME; 1429 $pl->{last_save} = $cf::RUNTIME;
1071 1430
1072 $pl->save_pl ($path); 1431 $pl->save_pl ($path);
1073 Coro::cede; 1432 cf::cede_to_tick;
1074} 1433}
1075 1434
1076sub new($) { 1435sub new($) {
1077 my ($login) = @_; 1436 my ($login) = @_;
1078 1437
… …
1082 $self->{deny_save} = 1; 1441 $self->{deny_save} = 1;
1083 1442
1084 $cf::PLAYER{$login} = $self; 1443 $cf::PLAYER{$login} = $self;
1085 1444
1086 $self 1445 $self
1446}
1447
1448=item $player->send_msg ($channel, $msg, $color, [extra...])
1449
1450=cut
1451
1452sub send_msg {
1453 my $ns = shift->ns
1454 or return;
1455 $ns->send_msg (@_);
1087} 1456}
1088 1457
1089=item $pl->quit_character 1458=item $pl->quit_character
1090 1459
1091Nukes the player without looking back. If logged in, the connection will 1460Nukes the player without looking back. If logged in, the connection will
… …
1146 or return []; 1515 or return [];
1147 1516
1148 my @logins; 1517 my @logins;
1149 1518
1150 for my $login (@$dirs) { 1519 for my $login (@$dirs) {
1520 my $path = path $login;
1521
1522 # a .pst is a dead give-away for a valid player
1523 unless (-e "$path.pst") {
1151 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1524 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1152 aio_read $fh, 0, 512, my $buf, 0 or next; 1525 aio_read $fh, 0, 512, my $buf, 0 or next;
1153 $buf !~ /^password -------------$/m or next; # official not-valid tag 1526 $buf !~ /^password -------------$/m or next; # official not-valid tag
1527 }
1154 1528
1155 utf8::decode $login; 1529 utf8::decode $login;
1156 push @logins, $login; 1530 push @logins, $login;
1157 } 1531 }
1158 1532
… …
1185 } 1559 }
1186 1560
1187 \@paths 1561 \@paths
1188} 1562}
1189 1563
1564=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1565
1566Expand crossfire pod fragments into protocol xml.
1567
1568=cut
1569
1570use re 'eval';
1571
1572my $group;
1573my $interior; $interior = qr{
1574 # match a pod interior sequence sans C<< >>
1575 (?:
1576 \ (.*?)\ (?{ $group = $^N })
1577 | < (??{$interior}) >
1578 )
1579}x;
1580
1581sub expand_cfpod {
1582 my ($self, $pod) = @_;
1583
1584 my $xml;
1585
1586 while () {
1587 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1588 $group = $1;
1589
1590 $group =~ s/&/&amp;/g;
1591 $group =~ s/</&lt;/g;
1592
1593 $xml .= $group;
1594 } elsif ($pod =~ m%\G
1595 ([BCGHITU])
1596 <
1597 (?:
1598 ([^<>]*) (?{ $group = $^N })
1599 | < $interior >
1600 )
1601 >
1602 %gcsx
1603 ) {
1604 my ($code, $data) = ($1, $group);
1605
1606 if ($code eq "B") {
1607 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1608 } elsif ($code eq "I") {
1609 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1610 } elsif ($code eq "U") {
1611 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1612 } elsif ($code eq "C") {
1613 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1614 } elsif ($code eq "T") {
1615 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1616 } elsif ($code eq "G") {
1617 my ($male, $female) = split /\|/, $data;
1618 $data = $self->gender ? $female : $male;
1619 $xml .= expand_cfpod ($self, $data);
1620 } elsif ($code eq "H") {
1621 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1622 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1623 "")
1624 [$self->{hintmode}];
1625 } else {
1626 $xml .= "error processing '$code($data)' directive";
1627 }
1628 } else {
1629 if ($pod =~ /\G(.+)/) {
1630 warn "parse error while expanding $pod (at $1)";
1631 }
1632 last;
1633 }
1634 }
1635
1636 for ($xml) {
1637 # create single paragraphs (very hackish)
1638 s/(?<=\S)\n(?=\w)/ /g;
1639
1640 # compress some whitespace
1641 s/\s+\n/\n/g; # ws line-ends
1642 s/\n\n+/\n/g; # double lines
1643 s/^\n+//; # beginning lines
1644 s/\n+$//; # ending lines
1645 }
1646
1647 $xml
1648}
1649
1650no re 'eval';
1651
1652sub hintmode {
1653 $_[0]{hintmode} = $_[1] if @_ > 1;
1654 $_[0]{hintmode}
1655}
1656
1190=item $player->ext_reply ($msgid, %msg) 1657=item $player->ext_reply ($msgid, @msg)
1191 1658
1192Sends an ext reply to the player. 1659Sends an ext reply to the player.
1193 1660
1194=cut 1661=cut
1195 1662
1196sub ext_reply($$%) { 1663sub ext_reply($$@) {
1197 my ($self, $id, %msg) = @_; 1664 my ($self, $id, @msg) = @_;
1198 1665
1199 $msg{msgid} = $id; 1666 $self->ns->ext_reply ($id, @msg)
1200
1201 $self->send ("ext " . cf::to_json \%msg);
1202} 1667}
1203 1668
1204=item $player->ext_event ($type, %msg) 1669=item $player->ext_msg ($type, @msg)
1205 1670
1206Sends an ext event to the client. 1671Sends an ext event to the client.
1207 1672
1208=cut 1673=cut
1209 1674
1210sub ext_event($$%) { 1675sub ext_msg($$@) {
1211 my ($self, $type, %msg) = @_; 1676 my ($self, $type, @msg) = @_;
1212 1677
1213 $self->ns->ext_event ($type, %msg); 1678 $self->ns->ext_msg ($type, @msg);
1214} 1679}
1215 1680
1216=head3 cf::region 1681=head3 cf::region
1217 1682
1218=over 4 1683=over 4
… …
1221 1686
1222package cf::region; 1687package cf::region;
1223 1688
1224=item cf::region::find_by_path $path 1689=item cf::region::find_by_path $path
1225 1690
1226Tries to decuce the probable region for a map knowing only its path. 1691Tries to decuce the likely region for a map knowing only its path.
1227 1692
1228=cut 1693=cut
1229 1694
1230sub find_by_path($) { 1695sub find_by_path($) {
1231 my ($path) = @_; 1696 my ($path) = @_;
1232 1697
1233 my ($match, $specificity); 1698 my ($match, $specificity);
1234 1699
1235 for my $region (list) { 1700 for my $region (list) {
1236 if ($region->match && $path =~ $region->match) { 1701 if ($region->{match} && $path =~ $region->{match}) {
1237 ($match, $specificity) = ($region, $region->specificity) 1702 ($match, $specificity) = ($region, $region->specificity)
1238 if $region->specificity > $specificity; 1703 if $region->specificity > $specificity;
1239 } 1704 }
1240 } 1705 }
1241 1706
… …
1305 my ($self, $merge) = @_; 1770 my ($self, $merge) = @_;
1306 1771
1307 # we have to keep some variables in memory intact 1772 # we have to keep some variables in memory intact
1308 local $self->{path}; 1773 local $self->{path};
1309 local $self->{load_path}; 1774 local $self->{load_path};
1310 local $self->{deny_save};
1311 local $self->{deny_reset};
1312 1775
1313 $self->SUPER::thawer_merge ($merge); 1776 $self->SUPER::thawer_merge ($merge);
1314} 1777}
1315 1778
1316sub normalise { 1779sub normalise {
… …
1363 $self->init; # pass $1 etc. 1826 $self->init; # pass $1 etc.
1364 return $self; 1827 return $self;
1365 } 1828 }
1366 } 1829 }
1367 1830
1368 Carp::carp "unable to resolve path '$path' (base '$base')."; 1831 Carp::cluck "unable to resolve path '$path' (base '$base').";
1369 () 1832 ()
1370} 1833}
1371 1834
1372sub init { 1835sub init {
1373 my ($self) = @_; 1836 my ($self) = @_;
… …
1416 1879
1417 $_->change_map_light ($change) 1880 $_->change_map_light ($change)
1418 for grep $_->outdoor, values %cf::MAP; 1881 for grep $_->outdoor, values %cf::MAP;
1419} 1882}
1420 1883
1884sub decay_objects {
1885 my ($self) = @_;
1886
1887 return if $self->{deny_reset};
1888
1889 $self->do_decay_objects;
1890}
1891
1421sub unlink_save { 1892sub unlink_save {
1422 my ($self) = @_; 1893 my ($self) = @_;
1423 1894
1424 utf8::encode (my $save = $self->save_path); 1895 utf8::encode (my $save = $self->save_path);
1425 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1896 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
… …
1428 1899
1429sub load_header_from($) { 1900sub load_header_from($) {
1430 my ($self, $path) = @_; 1901 my ($self, $path) = @_;
1431 1902
1432 utf8::encode $path; 1903 utf8::encode $path;
1433 #aio_open $path, O_RDONLY, 0 1904 my $f = new_from_file cf::object::thawer $path
1434 # or return;
1435
1436 $self->_load_header ($path)
1437 or return; 1905 or return;
1906
1907 $self->_load_header ($f)
1908 or return;
1909
1910 local $MAP_LOADING{$self->{path}} = $self;
1911 $f->resolve_delayed_derefs;
1438 1912
1439 $self->{load_path} = $path; 1913 $self->{load_path} = $path;
1440 1914
1441 1 1915 1
1442} 1916}
… …
1481 $self->load_header_orig 1955 $self->load_header_orig
1482 or return; 1956 or return;
1483 $self->prepare_orig; 1957 $self->prepare_orig;
1484 } 1958 }
1485 1959
1960 $self->{deny_reset} = 1
1961 if $self->no_reset;
1962
1486 $self->default_region (cf::region::find_by_path $self->{path}) 1963 $self->default_region (cf::region::find_by_path $self->{path})
1487 unless $self->default_region; 1964 unless $self->default_region;
1488 1965
1489 1 1966 1
1490} 1967}
… …
1493sub find { 1970sub find {
1494 my ($path, $origin) = @_; 1971 my ($path, $origin) = @_;
1495 1972
1496 $path = normalise $path, $origin && $origin->path; 1973 $path = normalise $path, $origin && $origin->path;
1497 1974
1975 cf::lock_wait "map_data:$path";#d#remove
1498 cf::lock_wait "map_find:$path"; 1976 cf::lock_wait "map_find:$path";
1499 1977
1500 $cf::MAP{$path} || do { 1978 $cf::MAP{$path} || do {
1501 my $guard = cf::lock_acquire "map_find:$path"; 1979 my $guard1 = cf::lock_acquire "map_find:$path";
1980 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1981
1502 my $map = new_from_path cf::map $path 1982 my $map = new_from_path cf::map $path
1503 or return; 1983 or return;
1504 1984
1505 $map->{last_save} = $cf::RUNTIME; 1985 $map->{last_save} = $cf::RUNTIME;
1506 1986
1507 $map->load_header 1987 $map->load_header
1508 or return; 1988 or return;
1509 1989
1510 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1990 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1511 # doing this can freeze the server in a sync job, obviously 1991 # doing this can freeze the server in a sync job, obviously
1512 #$cf::WAIT_FOR_TICK->wait; 1992 #$cf::WAIT_FOR_TICK->wait;
1993 undef $guard1;
1994 undef $guard2;
1513 $map->reset; 1995 $map->reset;
1514 undef $guard;
1515 return find $path; 1996 return find $path;
1516 } 1997 }
1517 1998
1518 $cf::MAP{$path} = $map 1999 $cf::MAP{$path} = $map
1519 } 2000 }
… …
1528 local $self->{deny_reset} = 1; # loading can take a long time 2009 local $self->{deny_reset} = 1; # loading can take a long time
1529 2010
1530 my $path = $self->{path}; 2011 my $path = $self->{path};
1531 2012
1532 { 2013 {
1533 my $guard = cf::lock_acquire "map_load:$path"; 2014 my $guard = cf::lock_acquire "map_data:$path";
1534 2015
2016 return unless $self->valid;
1535 return if $self->in_memory != cf::MAP_SWAPPED; 2017 return unless $self->in_memory == cf::MAP_SWAPPED;
1536 2018
1537 $self->in_memory (cf::MAP_LOADING); 2019 $self->in_memory (cf::MAP_LOADING);
1538 2020
1539 $self->alloc; 2021 $self->alloc;
1540 2022
1541 $self->pre_load; 2023 $self->pre_load;
1542 Coro::cede; 2024 cf::cede_to_tick;
1543 2025
2026 my $f = new_from_file cf::object::thawer $self->{load_path};
2027 $f->skip_block;
1544 $self->_load_objects ($self->{load_path}, 1) 2028 $self->_load_objects ($f)
1545 or return; 2029 or return;
1546 2030
1547 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2031 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1548 if delete $self->{load_original}; 2032 if delete $self->{load_original};
1549 2033
1550 if (my $uniq = $self->uniq_path) { 2034 if (my $uniq = $self->uniq_path) {
1551 utf8::encode $uniq; 2035 utf8::encode $uniq;
1552 if (aio_open $uniq, O_RDONLY, 0) { 2036 unless (aio_stat $uniq) {
2037 if (my $f = new_from_file cf::object::thawer $uniq) {
1553 $self->clear_unique_items; 2038 $self->clear_unique_items;
1554 $self->_load_objects ($uniq, 0); 2039 $self->_load_objects ($f);
2040 $f->resolve_delayed_derefs;
2041 }
1555 } 2042 }
1556 } 2043 }
1557 2044
1558 Coro::cede; 2045 $f->resolve_delayed_derefs;
2046
2047 cf::cede_to_tick;
1559 # now do the right thing for maps 2048 # now do the right thing for maps
1560 $self->link_multipart_objects; 2049 $self->link_multipart_objects;
1561 $self->difficulty ($self->estimate_difficulty) 2050 $self->difficulty ($self->estimate_difficulty)
1562 unless $self->difficulty; 2051 unless $self->difficulty;
1563 Coro::cede; 2052 cf::cede_to_tick;
1564 2053
1565 unless ($self->{deny_activate}) { 2054 unless ($self->{deny_activate}) {
1566 $self->decay_objects; 2055 $self->decay_objects;
1567 $self->fix_auto_apply; 2056 $self->fix_auto_apply;
1568 $self->update_buttons; 2057 $self->update_buttons;
1569 Coro::cede; 2058 cf::cede_to_tick;
1570 $self->set_darkness_map; 2059 $self->set_darkness_map;
1571 Coro::cede; 2060 cf::cede_to_tick;
1572 $self->activate; 2061 $self->activate;
1573 } 2062 }
2063
2064 $self->{last_save} = $cf::RUNTIME;
2065 $self->last_access ($cf::RUNTIME);
1574 2066
1575 $self->in_memory (cf::MAP_IN_MEMORY); 2067 $self->in_memory (cf::MAP_IN_MEMORY);
1576 } 2068 }
1577 2069
1578 $self->post_load; 2070 $self->post_load;
… …
1582 my ($self, $ob) = @_; 2074 my ($self, $ob) = @_;
1583 2075
1584 return find "~" . $ob->name . "/" . $self->{path} 2076 return find "~" . $ob->name . "/" . $self->{path}
1585 if $self->per_player; 2077 if $self->per_player;
1586 2078
2079# return find "?party/" . $ob->name . "/" . $self->{path}
2080# if $self->per_party;
2081
1587 $self 2082 $self
1588} 2083}
1589 2084
1590# find and load all maps in the 3x3 area around a map 2085# find and load all maps in the 3x3 area around a map
1591sub load_diag { 2086sub load_neighbours {
1592 my ($map) = @_; 2087 my ($map) = @_;
1593 2088
1594 my @diag; # diagonal neighbours 2089 my @neigh; # diagonal neighbours
1595 2090
1596 for (0 .. 3) { 2091 for (0 .. 3) {
1597 my $neigh = $map->tile_path ($_) 2092 my $neigh = $map->tile_path ($_)
1598 or next; 2093 or next;
1599 $neigh = find $neigh, $map 2094 $neigh = find $neigh, $map
1600 or next; 2095 or next;
1601 $neigh->load; 2096 $neigh->load;
1602 2097
2098 push @neigh,
1603 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2099 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1604 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2100 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1605 } 2101 }
1606 2102
1607 for (@diag) { 2103 for (grep defined $_->[0], @neigh) {
2104 my ($path, $origin) = @$_;
1608 my $neigh = find @$_ 2105 my $neigh = find $path, $origin
1609 or next; 2106 or next;
1610 $neigh->load; 2107 $neigh->load;
1611 } 2108 }
1612} 2109}
1613 2110
… …
1618} 2115}
1619 2116
1620sub do_load_sync { 2117sub do_load_sync {
1621 my ($map) = @_; 2118 my ($map) = @_;
1622 2119
2120 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2121 if $Coro::current == $Coro::main;
2122
1623 cf::sync_job { $map->load }; 2123 cf::sync_job { $map->load };
1624} 2124}
1625 2125
1626our %MAP_PREFETCH; 2126our %MAP_PREFETCH;
1627our $MAP_PREFETCHER = undef; 2127our $MAP_PREFETCHER = undef;
1628 2128
1629sub find_async { 2129sub find_async {
1630 my ($path, $origin) = @_; 2130 my ($path, $origin, $load) = @_;
1631 2131
1632 $path = normalise $path, $origin && $origin->{path}; 2132 $path = normalise $path, $origin && $origin->{path};
1633 2133
1634 if (my $map = $cf::MAP{$path}) { 2134 if (my $map = $cf::MAP{$path}) {
1635 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2135 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1636 } 2136 }
1637 2137
1638 undef $MAP_PREFETCH{$path}; 2138 $MAP_PREFETCH{$path} |= $load;
2139
1639 $MAP_PREFETCHER ||= cf::async { 2140 $MAP_PREFETCHER ||= cf::async {
2141 $Coro::current->{desc} = "map prefetcher";
2142
1640 while (%MAP_PREFETCH) { 2143 while (%MAP_PREFETCH) {
1641 for my $path (keys %MAP_PREFETCH) { 2144 while (my ($k, $v) = each %MAP_PREFETCH) {
1642 my $map = find $path 2145 if (my $map = find $k) {
1643 or next;
1644 $map->load; 2146 $map->load if $v;
2147 }
1645 2148
1646 delete $MAP_PREFETCH{$path}; 2149 delete $MAP_PREFETCH{$k};
1647 } 2150 }
1648 } 2151 }
1649 undef $MAP_PREFETCHER; 2152 undef $MAP_PREFETCHER;
1650 }; 2153 };
1651 $MAP_PREFETCHER->prio (6); 2154 $MAP_PREFETCHER->prio (6);
… …
1654} 2157}
1655 2158
1656sub save { 2159sub save {
1657 my ($self) = @_; 2160 my ($self) = @_;
1658 2161
1659 my $lock = cf::lock_acquire "map_data:" . $self->path; 2162 my $lock = cf::lock_acquire "map_data:$self->{path}";
1660 2163
1661 $self->{last_save} = $cf::RUNTIME; 2164 $self->{last_save} = $cf::RUNTIME;
1662 2165
1663 return unless $self->dirty; 2166 return unless $self->dirty;
1664 2167
… …
1670 return if $self->{deny_save}; 2173 return if $self->{deny_save};
1671 2174
1672 local $self->{last_access} = $self->last_access;#d# 2175 local $self->{last_access} = $self->last_access;#d#
1673 2176
1674 cf::async { 2177 cf::async {
2178 $Coro::current->{desc} = "map player save";
1675 $_->contr->save for $self->players; 2179 $_->contr->save for $self->players;
1676 }; 2180 };
1677 2181
1678 if ($uniq) { 2182 if ($uniq) {
1679 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2183 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
1687 my ($self) = @_; 2191 my ($self) = @_;
1688 2192
1689 # save first because save cedes 2193 # save first because save cedes
1690 $self->save; 2194 $self->save;
1691 2195
1692 my $lock = cf::lock_acquire "map_data:" . $self->path; 2196 my $lock = cf::lock_acquire "map_data:$self->{path}";
1693 2197
1694 return if $self->players; 2198 return if $self->players;
1695 return if $self->in_memory != cf::MAP_IN_MEMORY; 2199 return if $self->in_memory != cf::MAP_IN_MEMORY;
1696 return if $self->{deny_save}; 2200 return if $self->{deny_save};
1697 2201
2202 $self->in_memory (cf::MAP_SWAPPED);
2203
2204 $self->deactivate;
2205 $_->clear_links_to ($self) for values %cf::MAP;
1698 $self->clear; 2206 $self->clear;
1699 $self->in_memory (cf::MAP_SWAPPED);
1700} 2207}
1701 2208
1702sub reset_at { 2209sub reset_at {
1703 my ($self) = @_; 2210 my ($self) = @_;
1704 2211
1705 # TODO: safety, remove and allow resettable per-player maps 2212 # TODO: safety, remove and allow resettable per-player maps
1706 return 1e99 if $self->isa ("ext::map_per_player");#d#
1707 return 1e99 if $self->{deny_reset}; 2213 return 1e99 if $self->{deny_reset};
1708 2214
1709 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2215 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1710 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2216 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1711 2217
… …
1722 my ($self) = @_; 2228 my ($self) = @_;
1723 2229
1724 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2230 my $lock = cf::lock_acquire "map_data:$self->{path}";
1725 2231
1726 return if $self->players; 2232 return if $self->players;
1727 return if $self->isa ("ext::map_per_player");#d#
1728 2233
1729 warn "resetting map ", $self->path; 2234 warn "resetting map ", $self->path;
1730 2235
1731 $self->in_memory (cf::MAP_SWAPPED); 2236 $self->in_memory (cf::MAP_SWAPPED);
1732 2237
… …
1738 if $uniq; 2243 if $uniq;
1739 } 2244 }
1740 2245
1741 delete $cf::MAP{$self->path}; 2246 delete $cf::MAP{$self->path};
1742 2247
2248 $self->deactivate;
2249 $_->clear_links_to ($self) for values %cf::MAP;
1743 $self->clear; 2250 $self->clear;
1744
1745 $_->clear_links_to ($self) for values %cf::MAP;
1746 2251
1747 $self->unlink_save; 2252 $self->unlink_save;
1748 $self->destroy; 2253 $self->destroy;
1749} 2254}
1750 2255
1751my $nuke_counter = "aaaa"; 2256my $nuke_counter = "aaaa";
1752 2257
1753sub nuke { 2258sub nuke {
1754 my ($self) = @_; 2259 my ($self) = @_;
1755 2260
2261 {
2262 my $lock = cf::lock_acquire "map_data:$self->{path}";
2263
1756 delete $cf::MAP{$self->path}; 2264 delete $cf::MAP{$self->path};
1757 2265
1758 $self->unlink_save; 2266 $self->unlink_save;
1759 2267
1760 bless $self, "cf::map"; 2268 bless $self, "cf::map";
1761 delete $self->{deny_reset}; 2269 delete $self->{deny_reset};
1762 $self->{deny_save} = 1; 2270 $self->{deny_save} = 1;
1763 $self->reset_timeout (1); 2271 $self->reset_timeout (1);
1764 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2272 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1765 2273
1766 $cf::MAP{$self->path} = $self; 2274 $cf::MAP{$self->path} = $self;
2275 }
1767 2276
1768 $self->reset; # polite request, might not happen 2277 $self->reset; # polite request, might not happen
2278}
2279
2280=item $maps = cf::map::tmp_maps
2281
2282Returns an arrayref with all map paths of currently instantiated and saved
2283maps. May block.
2284
2285=cut
2286
2287sub tmp_maps() {
2288 [
2289 map {
2290 utf8::decode $_;
2291 /\.map$/
2292 ? normalise $_
2293 : ()
2294 } @{ aio_readdir $TMPDIR or [] }
2295 ]
2296}
2297
2298=item $maps = cf::map::random_maps
2299
2300Returns an arrayref with all map paths of currently instantiated and saved
2301random maps. May block.
2302
2303=cut
2304
2305sub random_maps() {
2306 [
2307 map {
2308 utf8::decode $_;
2309 /\.map$/
2310 ? normalise "?random/$_"
2311 : ()
2312 } @{ aio_readdir $RANDOMDIR or [] }
2313 ]
1769} 2314}
1770 2315
1771=item cf::map::unique_maps 2316=item cf::map::unique_maps
1772 2317
1773Returns an arrayref of paths of all shared maps that have 2318Returns an arrayref of paths of all shared maps that have
1774instantiated unique items. May block. 2319instantiated unique items. May block.
1775 2320
1776=cut 2321=cut
1777 2322
1778sub unique_maps() { 2323sub unique_maps() {
1779 my $files = aio_readdir $UNIQUEDIR 2324 [
1780 or return; 2325 map {
1781
1782 my @paths;
1783
1784 for (@$files) {
1785 utf8::decode $_; 2326 utf8::decode $_;
1786 next if /\.pst$/; 2327 /\.map$/
1787 next unless /^$PATH_SEP/o; 2328 ? normalise $_
1788 2329 : ()
1789 push @paths, cf::map::normalise $_; 2330 } @{ aio_readdir $UNIQUEDIR or [] }
1790 } 2331 ]
1791
1792 \@paths
1793} 2332}
1794 2333
1795package cf; 2334package cf;
1796 2335
1797=back 2336=back
… …
1815 map { $_, inv_recursive_ $_->inv } @_ 2354 map { $_, inv_recursive_ $_->inv } @_
1816} 2355}
1817 2356
1818sub inv_recursive { 2357sub inv_recursive {
1819 inv_recursive_ inv $_[0] 2358 inv_recursive_ inv $_[0]
2359}
2360
2361=item $ref = $ob->ref
2362
2363creates and returns a persistent reference to an objetc that can be stored as a string.
2364
2365=item $ob = cf::object::deref ($refstring)
2366
2367returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2368even if the object actually exists. May block.
2369
2370=cut
2371
2372sub deref {
2373 my ($ref) = @_;
2374
2375 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2376 my ($uuid, $name) = ($1, $2);
2377 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2378 or return;
2379 $pl->ob->uuid eq $uuid
2380 or return;
2381
2382 $pl->ob
2383 } else {
2384 warn "$ref: cannot resolve object reference\n";
2385 undef
2386 }
1820} 2387}
1821 2388
1822package cf; 2389package cf;
1823 2390
1824=back 2391=back
… …
1843 2410
1844 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2411 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1845 2412
1846 if ($self->{record_replies}) { 2413 if ($self->{record_replies}) {
1847 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2414 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2415
1848 } else { 2416 } else {
2417 my $pl = $self->contr;
2418
2419 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2420 my $dialog = $pl->{npc_dialog};
2421 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2422
2423 } else {
1849 $msg = $npc->name . " says: $msg" if $npc; 2424 $msg = $npc->name . " says: $msg" if $npc;
1850 $self->message ($msg, $flags); 2425 $self->message ($msg, $flags);
2426 }
1851 } 2427 }
2428}
2429
2430=item $object->send_msg ($channel, $msg, $color, [extra...])
2431
2432=cut
2433
2434sub cf::object::send_msg {
2435 my $pl = shift->contr
2436 or return;
2437 $pl->send_msg (@_);
1852} 2438}
1853 2439
1854=item $player_object->may ("access") 2440=item $player_object->may ("access")
1855 2441
1856Returns wether the given player is authorized to access resource "access" 2442Returns wether the given player is authorized to access resource "access"
… …
1935 # use -1 or undef as default coordinates, not 0, 0 2521 # use -1 or undef as default coordinates, not 0, 0
1936 ($x, $y) = ($map->enter_x, $map->enter_y) 2522 ($x, $y) = ($map->enter_x, $map->enter_y)
1937 if $x <=0 && $y <= 0; 2523 if $x <=0 && $y <= 0;
1938 2524
1939 $map->load; 2525 $map->load;
1940 $map->load_diag; 2526 $map->load_neighbours;
1941 2527
1942 return unless $self->contr->active; 2528 return unless $self->contr->active;
1943 $self->activate_recursive; 2529 $self->activate_recursive;
1944 2530
1945 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2531 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1946 $self->enter_map ($map, $x, $y); 2532 $self->enter_map ($map, $x, $y);
1947} 2533}
1948 2534
1949=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2535=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1950 2536
1951Moves the player to the given map-path and coordinates by first freezing 2537Moves the player to the given map-path and coordinates by first freezing
1952her, loading and preparing them map, calling the provided $check callback 2538her, loading and preparing them map, calling the provided $check callback
1953that has to return the map if sucecssful, and then unfreezes the player on 2539that has to return the map if sucecssful, and then unfreezes the player on
1954the new (success) or old (failed) map position. 2540the new (success) or old (failed) map position. In either case, $done will
2541be called at the end of this process.
1955 2542
1956=cut 2543=cut
1957 2544
1958our $GOTOGEN; 2545our $GOTOGEN;
1959 2546
1960sub cf::object::player::goto { 2547sub cf::object::player::goto {
1961 my ($self, $path, $x, $y, $check) = @_; 2548 my ($self, $path, $x, $y, $check, $done) = @_;
1962 2549
1963 # do generation counting so two concurrent goto's will be executed in-order 2550 # do generation counting so two concurrent goto's will be executed in-order
1964 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2551 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1965 2552
1966 $self->enter_link; 2553 $self->enter_link;
1967 2554
1968 (async { 2555 (async {
2556 $Coro::current->{desc} = "player::goto $path $x $y";
2557
2558 # *tag paths override both path and x|y
2559 if ($path =~ /^\*(.*)$/) {
2560 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2561 my $ob = $obs[rand @obs];
2562
2563 # see if we actually can go there
2564 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2565 $ob = $obs[rand @obs];
2566 } else {
2567 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2568 }
2569 # else put us there anyways for now #d#
2570
2571 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2572 } else {
2573 ($path, $x, $y) = (undef, undef, undef);
2574 }
2575 }
2576
1969 my $map = eval { 2577 my $map = eval {
1970 my $map = cf::map::find $path; 2578 my $map = defined $path ? cf::map::find $path : undef;
1971 2579
1972 if ($map) { 2580 if ($map) {
1973 $map = $map->customise_for ($self); 2581 $map = $map->customise_for ($self);
1974 $map = $check->($map) if $check && $map; 2582 $map = $check->($map) if $check && $map;
1975 } else { 2583 } else {
1976 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2584 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
1977 } 2585 }
1978 2586
1979 $map 2587 $map
1980 }; 2588 };
1981 2589
… …
1986 2594
1987 if ($gen == $self->{_goto_generation}) { 2595 if ($gen == $self->{_goto_generation}) {
1988 delete $self->{_goto_generation}; 2596 delete $self->{_goto_generation};
1989 $self->leave_link ($map, $x, $y); 2597 $self->leave_link ($map, $x, $y);
1990 } 2598 }
2599
2600 $done->() if $done;
1991 })->prio (1); 2601 })->prio (1);
1992} 2602}
1993 2603
1994=item $player_object->enter_exit ($exit_object) 2604=item $player_object->enter_exit ($exit_object)
1995 2605
… …
2032 $rmp->{origin_y} = $exit->y; 2642 $rmp->{origin_y} = $exit->y;
2033 } 2643 }
2034 2644
2035 $rmp->{random_seed} ||= $exit->random_seed; 2645 $rmp->{random_seed} ||= $exit->random_seed;
2036 2646
2037 my $data = cf::to_json $rmp; 2647 my $data = cf::encode_json $rmp;
2038 my $md5 = Digest::MD5::md5_hex $data; 2648 my $md5 = Digest::MD5::md5_hex $data;
2039 my $meta = "$RANDOMDIR/$md5.meta"; 2649 my $meta = "$RANDOMDIR/$md5.meta";
2040 2650
2041 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2651 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2042 aio_write $fh, 0, (length $data), $data, 0; 2652 aio_write $fh, 0, (length $data), $data, 0;
… …
2064 my $hp = $exit->stats->hp; 2674 my $hp = $exit->stats->hp;
2065 my $sp = $exit->stats->sp; 2675 my $sp = $exit->stats->sp;
2066 2676
2067 $self->enter_link; 2677 $self->enter_link;
2068 2678
2679 # if exit is damned, update players death & WoR home-position
2680 $self->contr->savebed ($slaying, $hp, $sp)
2681 if $exit->flag (FLAG_DAMNED);
2682
2069 (async { 2683 (async {
2684 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2685
2070 $self->deactivate_recursive; # just to be sure 2686 $self->deactivate_recursive; # just to be sure
2071 unless (eval { 2687 unless (eval {
2072 $self->goto ($slaying, $hp, $sp); 2688 $self->goto ($slaying, $hp, $sp);
2073 2689
2074 1; 2690 1;
… …
2100 2716
2101 utf8::encode $text; 2717 utf8::encode $text;
2102 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2718 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2103} 2719}
2104 2720
2721=item $client->send_msg ($channel, $msg, $color, [extra...])
2722
2723Send a drawinfo or msg packet to the client, formatting the msg for the
2724client if neccessary. C<$type> should be a string identifying the type of
2725the message, with C<log> being the default. If C<$color> is negative, suppress
2726the message unless the client supports the msg packet.
2727
2728=cut
2729
2730# non-persistent channels (usually the info channel)
2731our %CHANNEL = (
2732 "c/identify" => {
2733 id => "infobox",
2734 title => "Identify",
2735 reply => undef,
2736 tooltip => "Items recently identified",
2737 },
2738 "c/examine" => {
2739 id => "infobox",
2740 title => "Examine",
2741 reply => undef,
2742 tooltip => "Signs and other items you examined",
2743 },
2744 "c/book" => {
2745 id => "infobox",
2746 title => "Book",
2747 reply => undef,
2748 tooltip => "The contents of a note or book",
2749 },
2750 "c/lookat" => {
2751 id => "infobox",
2752 title => "Look",
2753 reply => undef,
2754 tooltip => "What you saw there",
2755 },
2756 "c/who" => {
2757 id => "infobox",
2758 title => "Players",
2759 reply => undef,
2760 tooltip => "Shows players who are currently online",
2761 },
2762 "c/body" => {
2763 id => "infobox",
2764 title => "Body Parts",
2765 reply => undef,
2766 tooltip => "Shows which body parts you posess and are available",
2767 },
2768 "c/uptime" => {
2769 id => "infobox",
2770 title => "Uptime",
2771 reply => undef,
2772 tooltip => "How long the server has been running since last restart",
2773 },
2774 "c/mapinfo" => {
2775 id => "infobox",
2776 title => "Map Info",
2777 reply => undef,
2778 tooltip => "Information related to the maps",
2779 },
2780);
2781
2782sub cf::client::send_msg {
2783 my ($self, $channel, $msg, $color, @extra) = @_;
2784
2785 $msg = $self->pl->expand_cfpod ($msg);
2786
2787 $color &= cf::NDI_CLIENT_MASK; # just in case...
2788
2789 # check predefined channels, for the benefit of C
2790 if ($CHANNEL{$channel}) {
2791 $channel = $CHANNEL{$channel};
2792
2793 $self->ext_msg (channel_info => $channel)
2794 if $self->can_msg;
2795
2796 $channel = $channel->{id};
2797
2798 } elsif (ref $channel) {
2799 # send meta info to client, if not yet sent
2800 unless (exists $self->{channel}{$channel->{id}}) {
2801 $self->{channel}{$channel->{id}} = $channel;
2802 $self->ext_msg (channel_info => $channel)
2803 if $self->can_msg;
2804 }
2805
2806 $channel = $channel->{id};
2807 }
2808
2809 return unless @extra || length $msg;
2810
2811 if ($self->can_msg) {
2812 # default colour, mask it out
2813 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2814 if $color & cf::NDI_DEF;
2815
2816 $self->send_packet ("msg " . $self->{json_coder}->encode (
2817 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2818 } else {
2819 if ($color >= 0) {
2820 # replace some tags by gcfclient-compatible ones
2821 for ($msg) {
2822 1 while
2823 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2824 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2825 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2826 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2827 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2828 }
2829
2830 $color &= cf::NDI_COLOR_MASK;
2831
2832 utf8::encode $msg;
2833
2834 if (0 && $msg =~ /\[/) {
2835 # COMMAND/INFO
2836 $self->send_packet ("drawextinfo $color 10 8 $msg")
2837 } else {
2838 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2839 $self->send_packet ("drawinfo $color $msg")
2840 }
2841 }
2842 }
2843}
2844
2105=item $client->ext_event ($type, %msg) 2845=item $client->ext_msg ($type, @msg)
2106 2846
2107Sends an exti event to the client. 2847Sends an ext event to the client.
2108 2848
2109=cut 2849=cut
2110 2850
2111sub cf::client::ext_event($$%) { 2851sub cf::client::ext_msg($$@) {
2112 my ($self, $type, %msg) = @_; 2852 my ($self, $type, @msg) = @_;
2113 2853
2854 if ($self->extcmd == 2) {
2855 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2856 } elsif ($self->extcmd == 1) { # TODO: remove
2114 $msg{msgtype} = "event_$type"; 2857 push @msg, msgtype => "event_$type";
2115 $self->send_packet ("ext " . cf::to_json \%msg); 2858 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2859 }
2860}
2861
2862=item $client->ext_reply ($msgid, @msg)
2863
2864Sends an ext reply to the client.
2865
2866=cut
2867
2868sub cf::client::ext_reply($$@) {
2869 my ($self, $id, @msg) = @_;
2870
2871 if ($self->extcmd == 2) {
2872 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2873 } elsif ($self->extcmd == 1) {
2874 #TODO: version 1, remove
2875 unshift @msg, msgtype => "reply", msgid => $id;
2876 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2877 }
2116} 2878}
2117 2879
2118=item $success = $client->query ($flags, "text", \&cb) 2880=item $success = $client->query ($flags, "text", \&cb)
2119 2881
2120Queues a query to the client, calling the given callback with 2882Queues a query to the client, calling the given callback with
2121the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2883the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2122C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2884C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2123 2885
2124Queries can fail, so check the return code. Or don't, as queries will become 2886Queries can fail, so check the return code. Or don't, as queries will
2125reliable at some point in the future. 2887become reliable at some point in the future.
2126 2888
2127=cut 2889=cut
2128 2890
2129sub cf::client::query { 2891sub cf::client::query {
2130 my ($self, $flags, $text, $cb) = @_; 2892 my ($self, $flags, $text, $cb) = @_;
… …
2138 utf8::encode $text; 2900 utf8::encode $text;
2139 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2901 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2140 2902
2141 $self->send_packet ($self->{query_queue}[0][0]) 2903 $self->send_packet ($self->{query_queue}[0][0])
2142 if @{ $self->{query_queue} } == 1; 2904 if @{ $self->{query_queue} } == 1;
2905
2906 1
2143} 2907}
2144 2908
2145cf::client->attach ( 2909cf::client->attach (
2910 on_connect => sub {
2911 my ($ns) = @_;
2912
2913 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2914 },
2146 on_reply => sub { 2915 on_reply => sub {
2147 my ($ns, $msg) = @_; 2916 my ($ns, $msg) = @_;
2148 2917
2149 # this weird shuffling is so that direct followup queries 2918 # this weird shuffling is so that direct followup queries
2150 # get handled first 2919 # get handled first
… …
2162 } else { 2931 } else {
2163 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2932 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2164 } 2933 }
2165 } 2934 }
2166 }, 2935 },
2936 on_exticmd => sub {
2937 my ($ns, $buf) = @_;
2938
2939 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2940
2941 if (ref $msg) {
2942 my ($type, $reply, @payload) =
2943 "ARRAY" eq ref $msg
2944 ? @$msg
2945 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2946
2947 my @reply;
2948
2949 if (my $cb = $EXTICMD{$type}) {
2950 @reply = $cb->($ns, @payload);
2951 }
2952
2953 $ns->ext_reply ($reply, @reply)
2954 if $reply;
2955
2956 } else {
2957 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2958 }
2959
2960 cf::override;
2961 },
2167); 2962);
2168 2963
2169=item $client->async (\&cb) 2964=item $client->async (\&cb)
2170 2965
2171Create a new coroutine, running the specified callback. The coroutine will 2966Create a new coroutine, running the specified callback. The coroutine will
… …
2212our $safe = new Safe "safe"; 3007our $safe = new Safe "safe";
2213our $safe_hole = new Safe::Hole; 3008our $safe_hole = new Safe::Hole;
2214 3009
2215$SIG{FPE} = 'IGNORE'; 3010$SIG{FPE} = 'IGNORE';
2216 3011
2217$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3012$safe->permit_only (Opcode::opset qw(
3013 :base_core :base_mem :base_orig :base_math
3014 grepstart grepwhile mapstart mapwhile
3015 sort time
3016));
2218 3017
2219# here we export the classes and methods available to script code 3018# here we export the classes and methods available to script code
2220 3019
2221=pod 3020=pod
2222 3021
2223The following functions and methods are available within a safe environment: 3022The following functions and methods are available within a safe environment:
2224 3023
2225 cf::object contr pay_amount pay_player map 3024 cf::object
3025 contr pay_amount pay_player map x y force_find force_add destroy
3026 insert remove name archname title slaying race decrease_ob_nr
3027
2226 cf::object::player player 3028 cf::object::player
2227 cf::player peaceful 3029 player
2228 cf::map trigger 3030
3031 cf::player
3032 peaceful
3033
3034 cf::map
3035 trigger
2229 3036
2230=cut 3037=cut
2231 3038
2232for ( 3039for (
2233 ["cf::object" => qw(contr pay_amount pay_player map)], 3040 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3041 insert remove inv name archname title slaying race
3042 decrease_ob_nr destroy)],
2234 ["cf::object::player" => qw(player)], 3043 ["cf::object::player" => qw(player)],
2235 ["cf::player" => qw(peaceful)], 3044 ["cf::player" => qw(peaceful)],
2236 ["cf::map" => qw(trigger)], 3045 ["cf::map" => qw(trigger)],
2237) { 3046) {
2238 no strict 'refs'; 3047 no strict 'refs';
… …
2309=back 3118=back
2310 3119
2311=cut 3120=cut
2312 3121
2313############################################################################# 3122#############################################################################
2314
2315=head2 EXTENSION DATABASE SUPPORT
2316
2317Crossfire maintains a very simple database for extension use. It can
2318currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2319convert to/from binary).
2320
2321The parameter C<$family> should best start with the name of the extension
2322using it, it should be unique.
2323
2324=over 4
2325
2326=item $value = cf::db_get $family => $key
2327
2328Returns a single value from the database.
2329
2330=item cf::db_put $family => $key => $value
2331
2332Stores the given C<$value> in the family.
2333
2334=cut
2335
2336our $DB;
2337
2338sub db_init {
2339 unless ($DB) {
2340 $DB = BDB::db_create $DB_ENV;
2341
2342 cf::sync_job {
2343 eval {
2344 $DB->set_flags (BDB::CHKSUM);
2345
2346 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2347 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2348 cf::cleanup "db_open(db): $!" if $!;
2349 };
2350 cf::cleanup "db_open(db): $@" if $@;
2351 };
2352 }
2353}
2354
2355sub db_get($$) {
2356 my $key = "$_[0]/$_[1]";
2357
2358 cf::sync_job {
2359 BDB::db_get $DB, undef, $key, my $data;
2360
2361 $! ? ()
2362 : $data
2363 }
2364}
2365
2366sub db_put($$$) {
2367 BDB::dbreq_pri 4;
2368 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2369}
2370
2371=item cf::cache $id => [$paths...], $processversion => $process
2372
2373Generic caching function that returns the value of the resource $id,
2374caching and regenerating as required.
2375
2376This function can block.
2377
2378=cut
2379
2380sub cache {
2381 my ($id, $src, $processversion, $process) = @_;
2382
2383 my $meta =
2384 join "\x00",
2385 $processversion,
2386 map {
2387 aio_stat $_
2388 and Carp::croak "$_: $!";
2389
2390 ($_, (stat _)[7,9])
2391 } @$src;
2392
2393 my $dbmeta = db_get cache => "$id/meta";
2394 if ($dbmeta ne $meta) {
2395 # changed, we may need to process
2396
2397 my @data;
2398 my $md5;
2399
2400 for (0 .. $#$src) {
2401 0 <= aio_load $src->[$_], $data[$_]
2402 or Carp::croak "$src->[$_]: $!";
2403 }
2404
2405 # if processing is expensive, check
2406 # checksum first
2407 if (1) {
2408 $md5 =
2409 join "\x00",
2410 $processversion,
2411 map {
2412 Coro::cede;
2413 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2414 } 0.. $#$src;
2415
2416
2417 my $dbmd5 = db_get cache => "$id/md5";
2418 if ($dbmd5 eq $md5) {
2419 db_put cache => "$id/meta", $meta;
2420
2421 return db_get cache => "$id/data";
2422 }
2423 }
2424
2425 my $t1 = Time::HiRes::time;
2426 my $data = $process->(\@data);
2427 my $t2 = Time::HiRes::time;
2428
2429 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2430
2431 db_put cache => "$id/data", $data;
2432 db_put cache => "$id/md5" , $md5;
2433 db_put cache => "$id/meta", $meta;
2434
2435 return $data;
2436 }
2437
2438 db_get cache => "$id/data"
2439}
2440
2441=item fork_call { }, $args
2442
2443Executes the given code block with the given arguments in a seperate
2444process, returning the results. Everything must be serialisable with
2445Coro::Storable. May, of course, block. Note that the executed sub may
2446never block itself or use any form of Event handling.
2447
2448=cut
2449
2450sub fork_call(&@) {
2451 my ($cb, @args) = @_;
2452
2453# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2454# or die "socketpair: $!";
2455 pipe my $fh1, my $fh2
2456 or die "pipe: $!";
2457
2458 if (my $pid = fork) {
2459 close $fh2;
2460
2461 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2462 $res = Coro::Storable::thaw $res;
2463
2464 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2465
2466 die $$res unless "ARRAY" eq ref $res;
2467
2468 return wantarray ? @$res : $res->[-1];
2469 } else {
2470 reset_signals;
2471 local $SIG{__WARN__};
2472 local $SIG{__DIE__};
2473 eval {
2474 close $fh1;
2475
2476 my @res = eval { $cb->(@args) };
2477 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2478 };
2479
2480 warn $@ if $@;
2481 _exit 0;
2482 }
2483}
2484
2485#############################################################################
2486# the server's init and main functions 3123# the server's init and main functions
2487 3124
2488sub load_facedata($) { 3125sub load_facedata($) {
2489 my ($path) = @_; 3126 my ($path) = @_;
3127
3128 # HACK to clear player env face cache, we need some signal framework
3129 # for this (global event?)
3130 %ext::player_env::MUSIC_FACE_CACHE = ();
3131
3132 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2490 3133
2491 warn "loading facedata from $path\n"; 3134 warn "loading facedata from $path\n";
2492 3135
2493 my $facedata; 3136 my $facedata;
2494 0 < aio_load $path, $facedata 3137 0 < aio_load $path, $facedata
… …
2497 $facedata = Coro::Storable::thaw $facedata; 3140 $facedata = Coro::Storable::thaw $facedata;
2498 3141
2499 $facedata->{version} == 2 3142 $facedata->{version} == 2
2500 or cf::cleanup "$path: version mismatch, cannot proceed."; 3143 or cf::cleanup "$path: version mismatch, cannot proceed.";
2501 3144
3145 # patch in the exptable
3146 $facedata->{resource}{"res/exp_table"} = {
3147 type => FT_RSRC,
3148 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3149 };
3150 cf::cede_to_tick;
3151
2502 { 3152 {
2503 my $faces = $facedata->{faceinfo}; 3153 my $faces = $facedata->{faceinfo};
2504 3154
2505 while (my ($face, $info) = each %$faces) { 3155 while (my ($face, $info) = each %$faces) {
2506 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3156 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3157
2507 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3158 cf::face::set_visibility $idx, $info->{visibility};
3159 cf::face::set_magicmap $idx, $info->{magicmap};
2508 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3160 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2509 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3161 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2510 Coro::cede; 3162
3163 cf::cede_to_tick;
2511 } 3164 }
2512 3165
2513 while (my ($face, $info) = each %$faces) { 3166 while (my ($face, $info) = each %$faces) {
2514 next unless $info->{smooth}; 3167 next unless $info->{smooth};
3168
2515 my $idx = cf::face::find $face 3169 my $idx = cf::face::find $face
2516 or next; 3170 or next;
3171
2517 if (my $smooth = cf::face::find $info->{smooth}) { 3172 if (my $smooth = cf::face::find $info->{smooth}) {
3173 cf::face::set_smooth $idx, $smooth;
2518 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3174 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2519 } else { 3175 } else {
2520 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3176 warn "smooth face '$info->{smooth}' not found for face '$face'";
2521 } 3177 }
2522 Coro::cede; 3178
3179 cf::cede_to_tick;
2523 } 3180 }
2524 } 3181 }
2525 3182
2526 { 3183 {
2527 my $anims = $facedata->{animinfo}; 3184 my $anims = $facedata->{animinfo};
2528 3185
2529 while (my ($anim, $info) = each %$anims) { 3186 while (my ($anim, $info) = each %$anims) {
2530 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3187 cf::anim::set $anim, $info->{frames}, $info->{facings};
2531 Coro::cede; 3188 cf::cede_to_tick;
2532 } 3189 }
2533 3190
2534 cf::anim::invalidate_all; # d'oh 3191 cf::anim::invalidate_all; # d'oh
2535 } 3192 }
2536 3193
3194 {
3195 # TODO: for gcfclient pleasure, we should give resources
3196 # that gcfclient doesn't grok a >10000 face index.
3197 my $res = $facedata->{resource};
3198
3199 while (my ($name, $info) = each %$res) {
3200 if (defined $info->{type}) {
3201 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3202 my $data;
3203
3204 if ($info->{type} & 1) {
3205 # prepend meta info
3206
3207 my $meta = $enc->encode ({
3208 name => $name,
3209 %{ $info->{meta} || {} },
3210 });
3211
3212 $data = pack "(w/a*)*", $meta, $info->{data};
3213 } else {
3214 $data = $info->{data};
3215 }
3216
3217 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3218 cf::face::set_type $idx, $info->{type};
3219 } else {
3220 $RESOURCE{$name} = $info;
3221 }
3222
3223 cf::cede_to_tick;
3224 }
3225 }
3226
3227 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3228
2537 1 3229 1
2538} 3230}
2539 3231
3232cf::global->attach (on_resource_update => sub {
3233 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3234 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3235
3236 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3237 my $sound = $soundconf->{compat}[$_]
3238 or next;
3239
3240 my $face = cf::face::find "sound/$sound->[1]";
3241 cf::sound::set $sound->[0] => $face;
3242 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3243 }
3244
3245 while (my ($k, $v) = each %{$soundconf->{event}}) {
3246 my $face = cf::face::find "sound/$v";
3247 cf::sound::set $k => $face;
3248 }
3249 }
3250});
3251
3252register_exticmd fx_want => sub {
3253 my ($ns, $want) = @_;
3254
3255 while (my ($k, $v) = each %$want) {
3256 $ns->fx_want ($k, $v);
3257 }
3258};
3259
2540sub reload_regions { 3260sub reload_regions {
3261 # HACK to clear player env face cache, we need some signal framework
3262 # for this (global event?)
3263 %ext::player_env::MUSIC_FACE_CACHE = ();
3264
2541 load_resource_file "$MAPDIR/regions" 3265 load_resource_file "$MAPDIR/regions"
2542 or die "unable to load regions file\n"; 3266 or die "unable to load regions file\n";
3267
3268 for (cf::region::list) {
3269 $_->{match} = qr/$_->{match}/
3270 if exists $_->{match};
3271 }
2543} 3272}
2544 3273
2545sub reload_facedata { 3274sub reload_facedata {
2546 load_facedata "$DATADIR/facedata" 3275 load_facedata "$DATADIR/facedata"
2547 or die "unable to load facedata\n"; 3276 or die "unable to load facedata\n";
2548} 3277}
2549 3278
2550sub reload_archetypes { 3279sub reload_archetypes {
3280 load_resource_file "$DATADIR/archetypes"
3281 or die "unable to load archetypes\n";
3282 #d# NEED to laod twice to resolve forward references
3283 # this really needs to be done in an extra post-pass
3284 # (which needs to be synchronous, so solve it differently)
2551 load_resource_file "$DATADIR/archetypes" 3285 load_resource_file "$DATADIR/archetypes"
2552 or die "unable to load archetypes\n"; 3286 or die "unable to load archetypes\n";
2553} 3287}
2554 3288
2555sub reload_treasures { 3289sub reload_treasures {
… …
2571 3305
2572sub init { 3306sub init {
2573 reload_resources; 3307 reload_resources;
2574} 3308}
2575 3309
2576sub cfg_load { 3310sub reload_config {
2577 open my $fh, "<:utf8", "$CONFDIR/config" 3311 open my $fh, "<:utf8", "$CONFDIR/config"
2578 or return; 3312 or return;
2579 3313
2580 local $/; 3314 local $/;
2581 *CFG = YAML::Syck::Load <$fh>; 3315 *CFG = YAML::Load <$fh>;
2582 3316
2583 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3317 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2584 3318
2585 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3319 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2586 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3320 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
2597sub main { 3331sub main {
2598 # we must not ever block the main coroutine 3332 # we must not ever block the main coroutine
2599 local $Coro::idle = sub { 3333 local $Coro::idle = sub {
2600 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3334 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2601 (async { 3335 (async {
2602 Event::one_event; 3336 $Coro::current->{desc} = "IDLE BUG HANDLER";
3337 EV::loop EV::LOOP_ONESHOT;
2603 })->prio (Coro::PRIO_MAX); 3338 })->prio (Coro::PRIO_MAX);
2604 }; 3339 };
2605 3340
2606 cfg_load; 3341 reload_config;
2607 db_init; 3342 db_init;
2608 load_extensions; 3343 load_extensions;
2609 3344
2610 $TICK_WATCHER->start; 3345 $TICK_WATCHER->start;
3346 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
2611 Event::loop; 3347 EV::loop;
2612} 3348}
2613 3349
2614############################################################################# 3350#############################################################################
2615# initialisation and cleanup 3351# initialisation and cleanup
2616 3352
2617# install some emergency cleanup handlers 3353# install some emergency cleanup handlers
2618BEGIN { 3354BEGIN {
3355 our %SIGWATCHER = ();
2619 for my $signal (qw(INT HUP TERM)) { 3356 for my $signal (qw(INT HUP TERM)) {
2620 Event->signal ( 3357 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2621 reentrant => 0,
2622 data => WF_AUTOCANCEL,
2623 signal => $signal,
2624 prio => 0,
2625 cb => sub {
2626 cf::cleanup "SIG$signal"; 3358 cf::cleanup "SIG$signal";
2627 },
2628 ); 3359 };
3360 }
3361}
3362
3363sub write_runtime {
3364 my $runtime = "$LOCALDIR/runtime";
3365
3366 # first touch the runtime file to show we are still running:
3367 # the fsync below can take a very very long time.
3368
3369 IO::AIO::aio_utime $runtime, undef, undef;
3370
3371 my $guard = cf::lock_acquire "write_runtime";
3372
3373 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3374 or return;
3375
3376 my $value = $cf::RUNTIME + 90 + 10;
3377 # 10 is the runtime save interval, for a monotonic clock
3378 # 60 allows for the watchdog to kill the server.
3379
3380 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3381 and return;
3382
3383 # always fsync - this file is important
3384 aio_fsync $fh
3385 and return;
3386
3387 # touch it again to show we are up-to-date
3388 aio_utime $fh, undef, undef;
3389
3390 close $fh
3391 or return;
3392
3393 aio_rename "$runtime~", $runtime
3394 and return;
3395
3396 warn "runtime file written.\n";
3397
2629 } 3398 1
2630} 3399}
2631 3400
2632sub emergency_save() { 3401sub emergency_save() {
2633 my $freeze_guard = cf::freeze_mainloop; 3402 my $freeze_guard = cf::freeze_mainloop;
2634 3403
… …
2640 # and maps saved/destroyed asynchronously. 3409 # and maps saved/destroyed asynchronously.
2641 warn "begin emergency player save\n"; 3410 warn "begin emergency player save\n";
2642 for my $login (keys %cf::PLAYER) { 3411 for my $login (keys %cf::PLAYER) {
2643 my $pl = $cf::PLAYER{$login} or next; 3412 my $pl = $cf::PLAYER{$login} or next;
2644 $pl->valid or next; 3413 $pl->valid or next;
3414 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2645 $pl->save; 3415 $pl->save;
2646 } 3416 }
2647 warn "end emergency player save\n"; 3417 warn "end emergency player save\n";
2648 3418
2649 warn "begin emergency map save\n"; 3419 warn "begin emergency map save\n";
… …
2688 warn "syncing database to disk"; 3458 warn "syncing database to disk";
2689 BDB::db_env_txn_checkpoint $DB_ENV; 3459 BDB::db_env_txn_checkpoint $DB_ENV;
2690 3460
2691 # if anything goes wrong in here, we should simply crash as we already saved 3461 # if anything goes wrong in here, we should simply crash as we already saved
2692 3462
2693 warn "cancelling all WF_AUTOCANCEL watchers";
2694 for (Event::all_watchers) {
2695 $_->cancel if $_->data & WF_AUTOCANCEL;
2696 }
2697
2698 warn "flushing outstanding aio requests"; 3463 warn "flushing outstanding aio requests";
2699 for (;;) { 3464 for (;;) {
2700 BDB::flush; 3465 BDB::flush;
2701 IO::AIO::flush; 3466 IO::AIO::flush;
2702 Coro::cede; 3467 Coro::cede_notself;
2703 last unless IO::AIO::nreqs || BDB::nreqs; 3468 last unless IO::AIO::nreqs || BDB::nreqs;
2704 warn "iterate..."; 3469 warn "iterate...";
2705 } 3470 }
2706 3471
2707 ++$RELOAD; 3472 ++$RELOAD;
… …
2711 %EXT_CORO = (); 3476 %EXT_CORO = ();
2712 3477
2713 warn "removing commands"; 3478 warn "removing commands";
2714 %COMMAND = (); 3479 %COMMAND = ();
2715 3480
2716 warn "removing ext commands"; 3481 warn "removing ext/exti commands";
2717 %EXTCMD = (); 3482 %EXTCMD = ();
3483 %EXTICMD = ();
2718 3484
2719 warn "unloading/nuking all extensions"; 3485 warn "unloading/nuking all extensions";
2720 for my $pkg (@EXTS) { 3486 for my $pkg (@EXTS) {
2721 warn "... unloading $pkg"; 3487 warn "... unloading $pkg";
2722 3488
… …
2765 warn "reloading cf.pm"; 3531 warn "reloading cf.pm";
2766 require cf; 3532 require cf;
2767 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3533 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2768 3534
2769 warn "loading config and database again"; 3535 warn "loading config and database again";
2770 cf::cfg_load; 3536 cf::reload_config;
2771 3537
2772 warn "loading extensions"; 3538 warn "loading extensions";
2773 cf::load_extensions; 3539 cf::load_extensions;
2774 3540
2775 warn "reattaching attachments to objects/players"; 3541 warn "reattaching attachments to objects/players";
… …
2795 3561
2796sub reload_perl() { 3562sub reload_perl() {
2797 # doing reload synchronously and two reloads happen back-to-back, 3563 # doing reload synchronously and two reloads happen back-to-back,
2798 # coro crashes during coro_state_free->destroy here. 3564 # coro crashes during coro_state_free->destroy here.
2799 3565
2800 $RELOAD_WATCHER ||= Event->timer ( 3566 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
2801 reentrant => 0,
2802 after => 0,
2803 data => WF_AUTOCANCEL,
2804 cb => sub {
2805 do_reload_perl; 3567 do_reload_perl;
2806 undef $RELOAD_WATCHER; 3568 undef $RELOAD_WATCHER;
2807 },
2808 ); 3569 };
2809} 3570}
2810 3571
2811register_command "reload" => sub { 3572register_command "reload" => sub {
2812 my ($who, $arg) = @_; 3573 my ($who, $arg) = @_;
2813 3574
2814 if ($who->flag (FLAG_WIZ)) { 3575 if ($who->flag (FLAG_WIZ)) {
2815 $who->message ("reloading server."); 3576 $who->message ("reloading server.");
3577 async {
3578 $Coro::current->{desc} = "perl_reload";
2816 async { reload_perl }; 3579 reload_perl;
3580 };
2817 } 3581 }
2818}; 3582};
2819 3583
2820unshift @INC, $LIBDIR; 3584unshift @INC, $LIBDIR;
2821 3585
… …
2840 my $signal = new Coro::Signal; 3604 my $signal = new Coro::Signal;
2841 push @WAIT_FOR_TICK_BEGIN, $signal; 3605 push @WAIT_FOR_TICK_BEGIN, $signal;
2842 $signal->wait; 3606 $signal->wait;
2843} 3607}
2844 3608
2845 my $min = 1e6;#d# 3609$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
2846 my $avg = 10;
2847$TICK_WATCHER = Event->timer (
2848 reentrant => 0,
2849 parked => 1,
2850 prio => 0,
2851 at => $NEXT_TICK || $TICK,
2852 data => WF_AUTOCANCEL,
2853 cb => sub {
2854 if ($Coro::current != $Coro::main) { 3610 if ($Coro::current != $Coro::main) {
2855 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3611 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2856 unless ++$bug_warning > 10; 3612 unless ++$bug_warning > 10;
2857 return; 3613 return;
2858 } 3614 }
2859 3615
2860 $NOW = $tick_start = Event::time; 3616 $NOW = $tick_start = EV::now;
2861 3617
2862 cf::server_tick; # one server iteration 3618 cf::server_tick; # one server iteration
2863 3619
2864 0 && sync_job {#d# 3620 $RUNTIME += $TICK;
2865 for(1..10) { 3621 $NEXT_TICK = $_[0]->at;
2866 my $t = Event::time;
2867 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2868 or die;
2869 3622
2870 $map->width (50); 3623 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2871 $map->height (50); 3624 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
2872 $map->alloc; 3625 Coro::async_pool {
2873 $map->_load_objects ("/tmp/x.map", 1); 3626 $Coro::current->{desc} = "runtime saver";
2874 my $t = Event::time - $t; 3627 write_runtime
2875 3628 or warn "ERROR: unable to write runtime file: $!";
2876 #next unless $t < 0.0013;#d#
2877 if ($t < $min) {
2878 $min = $t;
2879 }
2880 $avg = $avg * 0.99 + $t * 0.01;
2881 }
2882 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2883 exit 0;
2884 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2885 }; 3629 };
3630 }
2886 3631
2887 $RUNTIME += $TICK;
2888 $NEXT_TICK += $TICK;
2889
2890 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2891 $NEXT_RUNTIME_WRITE = $NOW + 10;
2892 Coro::async_pool {
2893 write_runtime
2894 or warn "ERROR: unable to write runtime file: $!";
2895 };
2896 }
2897
2898# my $AFTER = Event::time;
2899# warn $AFTER - $NOW;#d#
2900
2901 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3632 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2902 $sig->send; 3633 $sig->send;
2903 } 3634 }
2904 while (my $sig = shift @WAIT_FOR_TICK) { 3635 while (my $sig = shift @WAIT_FOR_TICK) {
2905 $sig->send; 3636 $sig->send;
2906 } 3637 }
2907 3638
2908 $NOW = Event::time;
2909
2910 # if we are delayed by four ticks or more, skip them all
2911 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2912
2913 $TICK_WATCHER->at ($NEXT_TICK);
2914 $TICK_WATCHER->start;
2915
2916 $LOAD = ($NOW - $tick_start) / $TICK; 3639 $LOAD = ($NOW - $tick_start) / $TICK;
2917 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3640 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2918 3641
2919 _post_tick; 3642 _post_tick;
2920 3643};
2921 3644$TICK_WATCHER->priority (EV::MAXPRI);
2922 },
2923);
2924 3645
2925{ 3646{
2926 BDB::max_poll_time $TICK * 0.1; 3647 # configure BDB
2927 $BDB_POLL_WATCHER = Event->io ( 3648
2928 reentrant => 0,
2929 fd => BDB::poll_fileno,
2930 poll => 'r',
2931 prio => 0,
2932 data => WF_AUTOCANCEL,
2933 cb => \&BDB::poll_cb,
2934 );
2935 BDB::min_parallel 8; 3649 BDB::min_parallel 8;
2936 3650 BDB::max_poll_reqs $TICK * 0.1;
2937 BDB::set_sync_prepare { 3651 $Coro::BDB::WATCHER->priority (1);
2938 my $status;
2939 my $current = $Coro::current;
2940 (
2941 sub {
2942 $status = $!;
2943 $current->ready; undef $current;
2944 },
2945 sub {
2946 Coro::schedule while defined $current;
2947 $! = $status;
2948 },
2949 )
2950 };
2951 3652
2952 unless ($DB_ENV) { 3653 unless ($DB_ENV) {
2953 $DB_ENV = BDB::db_env_create; 3654 $DB_ENV = BDB::db_env_create;
3655 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3656 | BDB::LOG_AUTOREMOVE, 1);
3657 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3658 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
2954 3659
2955 cf::sync_job { 3660 cf::sync_job {
2956 eval { 3661 eval {
2957 BDB::db_env_open 3662 BDB::db_env_open
2958 $DB_ENV, 3663 $DB_ENV,
… …
2960 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3665 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2961 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3666 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2962 0666; 3667 0666;
2963 3668
2964 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3669 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2965
2966 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2967 $DB_ENV->set_lk_detect;
2968 }; 3670 };
2969 3671
2970 cf::cleanup "db_env_open(db): $@" if $@; 3672 cf::cleanup "db_env_open(db): $@" if $@;
2971 }; 3673 };
2972 } 3674 }
3675
3676 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3677 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3678 };
3679 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3680 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3681 };
3682 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3683 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3684 };
2973} 3685}
2974 3686
2975{ 3687{
3688 # configure IO::AIO
3689
2976 IO::AIO::min_parallel 8; 3690 IO::AIO::min_parallel 8;
2977
2978 undef $Coro::AIO::WATCHER;
2979 IO::AIO::max_poll_time $TICK * 0.1; 3691 IO::AIO::max_poll_time $TICK * 0.1;
2980 $AIO_POLL_WATCHER = Event->io ( 3692 $Coro::AIO::WATCHER->priority (1);
2981 reentrant => 0,
2982 data => WF_AUTOCANCEL,
2983 fd => IO::AIO::poll_fileno,
2984 poll => 'r',
2985 prio => 6,
2986 cb => \&IO::AIO::poll_cb,
2987 );
2988} 3693}
2989 3694
2990my $_log_backtrace; 3695my $_log_backtrace;
2991 3696
2992sub _log_backtrace { 3697sub _log_backtrace {
… …
2996 3701
2997 # limit the # of concurrent backtraces 3702 # limit the # of concurrent backtraces
2998 if ($_log_backtrace < 2) { 3703 if ($_log_backtrace < 2) {
2999 ++$_log_backtrace; 3704 ++$_log_backtrace;
3000 async { 3705 async {
3706 $Coro::current->{desc} = "abt $msg";
3707
3001 my @bt = fork_call { 3708 my @bt = fork_call {
3002 @addr = map { sprintf "%x", $_ } @addr; 3709 @addr = map { sprintf "%x", $_ } @addr;
3003 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3710 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3004 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3711 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3005 or die "addr2line: $!"; 3712 or die "addr2line: $!";

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines