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.315 by root, Mon Jul 23 17:53:55 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
25use JSON::XS 1.4 (); 27use JSON::XS 2.01 ();
26use BDB (); 28use BDB ();
27use Data::Dumper; 29use Data::Dumper;
28use Digest::MD5; 30use Digest::MD5;
29use Fcntl; 31use Fcntl;
30use YAML::Syck (); 32use YAML ();
31use IO::AIO 2.32 (); 33use IO::AIO 2.51 ();
32use Time::HiRes; 34use Time::HiRes;
33use Compress::LZF; 35use Compress::LZF;
34use Digest::MD5 (); 36use Digest::MD5 ();
35 37
36# configure various modules to our taste 38# configure various modules to our taste
37# 39#
38$Storable::canonical = 1; # reduce rsync transfers 40$Storable::canonical = 1; # reduce rsync transfers
39Coro::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
40Compress::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
41
42$Event::Eval = 1; # no idea why this is required, but it is
43
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46 43
47$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
48 45
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 46sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 47
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 66our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 68our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 69our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 70our $BDBDIR = "$LOCALDIR/db";
71our %RESOURCE;
74 72
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER; 74our $TICK_WATCHER;
77our $AIO_POLL_WATCHER; 75our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 77our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 78our $USE_FSYNC = 1; # use fsync to write maps - default off
82 79
83our $BDB_POLL_WATCHER; 80our $BDB_POLL_WATCHER;
81our $BDB_DEADLOCK_WATCHER;
82our $BDB_CHECKPOINT_WATCHER;
83our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 84our $DB_ENV;
85 85
86our %CFG; 86our %CFG;
87 87
88our $UPTIME; $UPTIME ||= time; 88our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 89our $RUNTIME;
90our $NOW;
90 91
91our %PLAYER; # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 93our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
94 95
95# 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 ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 98
158 159
159The raw value load value from the last tick. 160The raw value load value from the last tick.
160 161
161=item %cf::CFG 162=item %cf::CFG
162 163
163Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 165from wherever your confdir points to.
165 166
166=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
167 168
168These 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
186 $msg .= "\n" 187 $msg .= "\n"
187 unless $msg =~ /\n$/; 188 unless $msg =~ /\n$/;
188 189
189 $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;
190 191
191 utf8::encode $msg;
192 LOG llevError, $msg; 192 LOG llevError, $msg;
193 }; 193 };
194} 194}
195
196$Coro::State::DIEHOOK = sub {
197 warn Carp::longmess $_[0];
198 Coro::terminate;
199};
195 200
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 201@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 202@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 203@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 204@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
212)) { 217)) {
213 no strict 'refs'; 218 no strict 'refs';
214 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 219 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215} 220}
216 221
217$Event::DIED = sub { 222$EV::DIED = sub {
218 warn "error in event callback: @_"; 223 warn "error in event callback: @_";
219}; 224};
220 225
221############################################################################# 226#############################################################################
222 227
245 $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;
246 $d 251 $d
247 } || "[unable to dump $_[0]: '$@']"; 252 } || "[unable to dump $_[0]: '$@']";
248} 253}
249 254
250=item $ref = cf::from_json $json 255=item $ref = cf::decode_json $json
251 256
252Converts a JSON string into the corresponding perl data structure. 257Converts a JSON string into the corresponding perl data structure.
253 258
254=item $json = cf::to_json $ref 259=item $json = cf::encode_json $ref
255 260
256Converts a perl data structure into its JSON representation. 261Converts a perl data structure into its JSON representation.
257 262
258=cut 263=cut
259 264
260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 265our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261 266
262sub to_json ($) { $json_coder->encode ($_[0]) } 267sub encode_json($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) } 268sub decode_json($) { $json_coder->decode ($_[0]) }
264 269
265=item cf::lock_wait $string 270=item cf::lock_wait $string
266 271
267Wait until the given lock is available. See cf::lock_acquire. 272Wait until the given lock is available. See cf::lock_acquire.
268 273
271Wait 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
272a 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,
273for example when the coroutine gets canceled), the lock is automatically 278for example when the coroutine gets canceled), the lock is automatically
274returned. 279returned.
275 280
281Locks are *not* recursive, locking from the same coro twice results in a
282deadlocked coro.
283
276Lock 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
277uses map_find and cf::map::load uses map_load). 285uses map_find and cf::map::load uses map_load).
278 286
279=item $locked = cf::lock_active $string 287=item $locked = cf::lock_active $string
280 288
281Return 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.
282 290
283=cut 291=cut
284 292
285our %LOCK; 293our %LOCK;
294our %LOCKER;#d#
286 295
287sub lock_wait($) { 296sub lock_wait($) {
288 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#
289 303
290 # wait for lock, if any 304 # wait for lock, if any
291 while ($LOCK{$key}) { 305 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current; 306 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 307 Coro::schedule;
299 313
300 # wait, to be sure we are not locked 314 # wait, to be sure we are not locked
301 lock_wait $key; 315 lock_wait $key;
302 316
303 $LOCK{$key} = []; 317 $LOCK{$key} = [];
318 $LOCKER{$key} = $Coro::current;#d#
304 319
305 Coro::guard { 320 Coro::guard {
321 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 322 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 323 $_->ready for @{ delete $LOCK{$key} };
308 } 324 }
309} 325}
310 326
322 }; 338 };
323 $TICK_WATCHER->stop; 339 $TICK_WATCHER->stop;
324 $guard 340 $guard
325} 341}
326 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
327=item cf::get_slot $time[, $priority[, $name]] 358=item cf::get_slot $time[, $priority[, $name]]
328 359
329Allocate $time seconds of blocking CPU time at priority C<$priority>: 360Allocate $time seconds of blocking CPU time at priority C<$priority>:
330This call blocks and returns only when you have at least C<$time> seconds 361This call blocks and returns only when you have at least C<$time> seconds
331of cpu time till the next tick. The slot is only valid till the next cede. 362of cpu time till the next tick. The slot is only valid till the next cede.
340our @SLOT_QUEUE; 371our @SLOT_QUEUE;
341our $SLOT_QUEUE; 372our $SLOT_QUEUE;
342 373
343$SLOT_QUEUE->cancel if $SLOT_QUEUE; 374$SLOT_QUEUE->cancel if $SLOT_QUEUE;
344$SLOT_QUEUE = Coro::async { 375$SLOT_QUEUE = Coro::async {
376 $Coro::current->desc ("timeslot manager");
377
345 my $signal = new Coro::Signal; 378 my $signal = new Coro::Signal;
346 379
347 while () { 380 while () {
348 next_job: 381 next_job:
349 my $avail = cf::till_tick; 382 my $avail = cf::till_tick;
357 } 390 }
358 } 391 }
359 } 392 }
360 393
361 if (@SLOT_QUEUE) { 394 if (@SLOT_QUEUE) {
362 # we do not use wait_For_tick() as it returns immediately when tick is inactive 395 # we do not use wait_for_tick() as it returns immediately when tick is inactive
363 push @cf::WAIT_FOR_TICK, $signal; 396 push @cf::WAIT_FOR_TICK, $signal;
364 $signal->wait; 397 $signal->wait;
365 } else { 398 } else {
366 Coro::schedule; 399 Coro::schedule;
367 } 400 }
390 423
391BEGIN { *async = \&Coro::async_pool } 424BEGIN { *async = \&Coro::async_pool }
392 425
393=item cf::sync_job { BLOCK } 426=item cf::sync_job { BLOCK }
394 427
395The design of Crossfire TRT requires that the main coroutine ($Coro::main) 428The design of Deliantra requires that the main coroutine ($Coro::main)
396is always able to handle events or runnable, as Crossfire TRT is only 429is always able to handle events or runnable, as Deliantra is only
397partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 430partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
398acceptable. 431acceptable.
399 432
400If 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
401the given BLOCK in another coroutine while waiting for the result. The 434the given BLOCK in another coroutine while waiting for the result. The
406 439
407sub sync_job(&) { 440sub sync_job(&) {
408 my ($job) = @_; 441 my ($job) = @_;
409 442
410 if ($Coro::current == $Coro::main) { 443 if ($Coro::current == $Coro::main) {
411 my $time = Event::time; 444 my $time = EV::time;
412 445
413 # this is the main coro, too bad, we have to block 446 # this is the main coro, too bad, we have to block
414 # till the operation succeeds, freezing the server :/ 447 # till the operation succeeds, freezing the server :/
415 448
449 LOG llevError, Carp::longmess "sync job";#d#
450
416 # TODO: use suspend/resume instead 451 # TODO: use suspend/resume instead
417 # (but this is cancel-safe) 452 # (but this is cancel-safe)
418 my $freeze_guard = freeze_mainloop; 453 my $freeze_guard = freeze_mainloop;
419 454
420 my $busy = 1; 455 my $busy = 1;
421 my @res; 456 my @res;
422 457
423 (async { 458 (async {
459 $Coro::current->desc ("sync job coro");
424 @res = eval { $job->() }; 460 @res = eval { $job->() };
425 warn $@ if $@; 461 warn $@ if $@;
426 undef $busy; 462 undef $busy;
427 })->prio (Coro::PRIO_MAX); 463 })->prio (Coro::PRIO_MAX);
428 464
429 while ($busy) { 465 while ($busy) {
430 Coro::cede or Event::one_event; 466 if (Coro::nready) {
467 Coro::cede_notself;
468 } else {
469 EV::loop EV::LOOP_ONESHOT;
431 } 470 }
471 }
432 472
433 $time = Event::time - $time; 473 $time = EV::time - $time;
434 474
435 LOG llevError | logBacktrace, Carp::longmess "long sync job" 475 LOG llevError | logBacktrace, Carp::longmess "long sync job"
436 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 476 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
437 477
438 $tick_start += $time; # do not account sync jobs to server load 478 $tick_start += $time; # do not account sync jobs to server load
468=item fork_call { }, $args 508=item fork_call { }, $args
469 509
470Executes the given code block with the given arguments in a seperate 510Executes the given code block with the given arguments in a seperate
471process, returning the results. Everything must be serialisable with 511process, returning the results. Everything must be serialisable with
472Coro::Storable. May, of course, block. Note that the executed sub may 512Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 513never block itself or use any form of event handling.
474 514
475=cut 515=cut
476
477sub _store_scalar {
478 open my $fh, ">", \my $buf
479 or die "fork_call: cannot open fh-to-buf in child : $!";
480 Storable::store_fd $_[0], $fh;
481 close $fh;
482
483 $buf
484}
485 516
486sub fork_call(&@) { 517sub fork_call(&@) {
487 my ($cb, @args) = @_; 518 my ($cb, @args) = @_;
488 519
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 520 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 521 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 522 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 523
494 if (my $pid = fork) { 524 my @res = Coro::Util::fork_eval {
495 close $fh2;
496
497 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498 warn "pst<$res>" unless $res =~ /^pst/;
499 $res = Coro::Storable::thaw $res;
500
501 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
502
503 Carp::confess $$res unless "ARRAY" eq ref $res;
504
505 return wantarray ? @$res : $res->[-1];
506 } else {
507 reset_signals; 525 reset_signals;
508 local $SIG{__WARN__}; 526 &$cb
509 local $SIG{__DIE__}; 527 }, @args;
510 # just in case, this hack effectively disables event
511 # in the child. cleaner and slower would be canceling all watchers,
512 # but this works for the time being.
513 local $Coro::idle;
514 $Coro::current->prio (Coro::PRIO_MAX);
515 528
516 eval { 529 wantarray ? @res : $res[-1]
517 close $fh1;
518
519 my @res = eval { $cb->(@args) };
520
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
522 close $fh2;
523 };
524
525 warn $@ if $@;
526 _exit 0;
527 }
528} 530}
529 531
530=item $value = cf::db_get $family => $key 532=item $value = cf::db_get $family => $key
531 533
532Returns a single value from the environment database. 534Returns a single value from the environment database.
534=item cf::db_put $family => $key => $value 536=item cf::db_put $family => $key => $value
535 537
536Stores the given C<$value> in the family. It can currently store binary 538Stores the given C<$value> in the family. It can currently store binary
537data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 539data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
538 540
541=item $db = cf::db_table "name"
542
543Create and/or open a new database table. The string must not be "db" and must be unique
544within each server.
545
539=cut 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}
540 564
541our $DB; 565our $DB;
542 566
543sub db_init { 567sub db_init {
544 unless ($DB) {
545 $DB = BDB::db_create $DB_ENV;
546
547 cf::sync_job { 568 cf::sync_job {
548 eval { 569 $DB ||= db_table "db";
549 $DB->set_flags (BDB::CHKSUM);
550
551 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
552 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
553 cf::cleanup "db_open(db): $!" if $!;
554 };
555 cf::cleanup "db_open(db): $@" if $@;
556 };
557 } 570 };
558} 571}
559 572
560sub db_get($$) { 573sub db_get($$) {
561 my $key = "$_[0]/$_[1]"; 574 my $key = "$_[0]/$_[1]";
562 575
612 if (1) { 625 if (1) {
613 $md5 = 626 $md5 =
614 join "\x00", 627 join "\x00",
615 $processversion, 628 $processversion,
616 map { 629 map {
617 Coro::cede; 630 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 631 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 632 } 0.. $#$src;
620 633
621 634
622 my $dbmd5 = db_get cache => "$id/md5"; 635 my $dbmd5 = db_get cache => "$id/md5";
666attach callbacks/event handlers (a collection of which is called an "attachment") 679attach callbacks/event handlers (a collection of which is called an "attachment")
667to it. All such attachable objects support the following methods. 680to it. All such attachable objects support the following methods.
668 681
669In 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>
670C<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
671Crossfire TRT). 684Deliantra).
672 685
673=over 4 686=over 4
674 687
675=item $attachable->attach ($attachment, key => $value...) 688=item $attachable->attach ($attachment, key => $value...)
676 689
958 } 971 }
959 972
960 0 973 0
961} 974}
962 975
963=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 976=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
964 977
965=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 978=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
966 979
967Generate an object-specific event with the given arguments. 980Generate an object-specific event with the given arguments.
968 981
974 987
975=cut 988=cut
976 989
977############################################################################# 990#############################################################################
978# object support 991# object support
979#
980 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#
981sub _can_merge { 1026sub _can_merge {
982 my ($ob1, $ob2) = @_; 1027 my ($ob1, $ob2) = @_;
983 1028
984 local $Storable::canonical = 1; 1029 ++$SLOW_MERGES;#d#
985 my $fob1 = Storable::freeze $ob1;
986 my $fob2 = Storable::freeze $ob2;
987 1030
988 $fob1 eq $fob2 1031 # we do the slow way here
1032 return _object_equal $ob1, $ob2
989} 1033}
990 1034
991sub reattach { 1035sub reattach {
992 # basically do the same as instantiate, without calling instantiate 1036 # basically do the same as instantiate, without calling instantiate
993 my ($obj) = @_; 1037 my ($obj) = @_;
1015cf::attachable->attach ( 1059cf::attachable->attach (
1016 prio => -1000000, 1060 prio => -1000000,
1017 on_instantiate => sub { 1061 on_instantiate => sub {
1018 my ($obj, $data) = @_; 1062 my ($obj, $data) = @_;
1019 1063
1020 $data = from_json $data; 1064 $data = decode_json $data;
1021 1065
1022 for (@$data) { 1066 for (@$data) {
1023 my ($name, $args) = @$_; 1067 my ($name, $args) = @$_;
1024 1068
1025 $obj->attach ($name, %{$args || {} }); 1069 $obj->attach ($name, %{$args || {} });
1041sub object_freezer_save { 1085sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1086 my ($filename, $rdata, $objs) = @_;
1043 1087
1044 sync_job { 1088 sync_job {
1045 if (length $$rdata) { 1089 if (length $$rdata) {
1090 utf8::decode (my $decname = $filename);
1046 warn sprintf "saving %s (%d,%d)\n", 1091 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1092 $decname, length $$rdata, scalar @$objs;
1048 1093
1049 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1094 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1095 chmod SAVE_MODE, $fh;
1051 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1096 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052 aio_fsync $fh if $cf::USE_FSYNC; 1097 aio_fsync $fh if $cf::USE_FSYNC;
1053 close $fh; 1098 close $fh;
1054 1099
1055 if (@$objs) { 1100 if (@$objs) {
1056 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) {
1057 chmod SAVE_MODE, $fh; 1102 chmod SAVE_MODE, $fh;
1058 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1103 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1059 aio_write $fh, 0, (length $data), $data, 0; 1104 aio_write $fh, 0, (length $data), $data, 0;
1060 aio_fsync $fh if $cf::USE_FSYNC; 1105 aio_fsync $fh if $cf::USE_FSYNC;
1061 close $fh; 1106 close $fh;
1062 aio_rename "$filename.pst~", "$filename.pst"; 1107 aio_rename "$filename.pst~", "$filename.pst";
1063 } 1108 }
1071 } 1116 }
1072 } else { 1117 } else {
1073 aio_unlink $filename; 1118 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1119 aio_unlink "$filename.pst";
1075 } 1120 }
1076 } 1121 };
1077} 1122}
1078 1123
1079sub object_freezer_as_string { 1124sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1125 my ($rdata, $objs) = @_;
1081 1126
1093 or return; 1138 or return;
1094 1139
1095 unless (aio_stat "$filename.pst") { 1140 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1141 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1142 or return;
1143
1098 $av = eval { (Storable::thaw $av)->{objs} }; 1144 my $st = eval { Coro::Storable::thaw $av };
1145 $av = $st->{objs};
1099 } 1146 }
1100 1147
1148 utf8::decode (my $decname = $filename);
1101 warn sprintf "loading %s (%d)\n", 1149 warn sprintf "loading %s (%d,%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1150 $decname, length $data, scalar @{$av || []};
1151
1103 return ($data, $av); 1152 ($data, $av)
1104} 1153}
1105 1154
1106=head2 COMMAND CALLBACKS 1155=head2 COMMAND CALLBACKS
1107 1156
1108=over 4 1157=over 4
1181 my ($pl, $buf) = @_; 1230 my ($pl, $buf) = @_;
1182 1231
1183 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1232 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1184 1233
1185 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
1186 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1242 if (my $cb = $EXTCMD{$type}) {
1187 if (my %reply = $cb->($pl, $msg)) { 1243 @reply = $cb->($pl, @payload);
1188 $pl->ext_reply ($msg->{msgid}, %reply);
1189 }
1190 } 1244 }
1245
1246 $pl->ext_reply ($reply, @reply)
1247 if $reply;
1248
1191 } else { 1249 } else {
1192 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1250 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1193 } 1251 }
1194 1252
1195 cf::override; 1253 cf::override;
1285 1343
1286=head3 cf::player 1344=head3 cf::player
1287 1345
1288=over 4 1346=over 4
1289 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}
1361
1290=item cf::player::find $login 1362=item cf::player::find $login
1291 1363
1292Returns the given player object, loading it if necessary (might block). 1364Returns the given player object, loading it if necessary (might block).
1293 1365
1294=cut 1366=cut
1329 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1401 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1330 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1402 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1331 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1403 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1332 aio_unlink +(playerdir $login) . "/$login.pl"; 1404 aio_unlink +(playerdir $login) . "/$login.pl";
1333 1405
1334 my $pl = load_pl path $login 1406 my $f = new_from_file cf::object::thawer path $login
1335 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;
1336 $cf::PLAYER{$login} = $pl 1413 $cf::PLAYER{$login} = $pl
1337 } 1414 }
1338 } 1415 }
1339} 1416}
1340 1417
1350 1427
1351 aio_mkdir playerdir $pl, 0770; 1428 aio_mkdir playerdir $pl, 0770;
1352 $pl->{last_save} = $cf::RUNTIME; 1429 $pl->{last_save} = $cf::RUNTIME;
1353 1430
1354 $pl->save_pl ($path); 1431 $pl->save_pl ($path);
1355 Coro::cede; 1432 cf::cede_to_tick;
1356} 1433}
1357 1434
1358sub new($) { 1435sub new($) {
1359 my ($login) = @_; 1436 my ($login) = @_;
1360 1437
1364 $self->{deny_save} = 1; 1441 $self->{deny_save} = 1;
1365 1442
1366 $cf::PLAYER{$login} = $self; 1443 $cf::PLAYER{$login} = $self;
1367 1444
1368 $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 (@_);
1369} 1456}
1370 1457
1371=item $pl->quit_character 1458=item $pl->quit_character
1372 1459
1373Nukes the player without looking back. If logged in, the connection will 1460Nukes the player without looking back. If logged in, the connection will
1428 or return []; 1515 or return [];
1429 1516
1430 my @logins; 1517 my @logins;
1431 1518
1432 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") {
1433 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1524 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1434 aio_read $fh, 0, 512, my $buf, 0 or next; 1525 aio_read $fh, 0, 512, my $buf, 0 or next;
1435 $buf !~ /^password -------------$/m or next; # official not-valid tag 1526 $buf !~ /^password -------------$/m or next; # official not-valid tag
1527 }
1436 1528
1437 utf8::decode $login; 1529 utf8::decode $login;
1438 push @logins, $login; 1530 push @logins, $login;
1439 } 1531 }
1440 1532
1473 1565
1474Expand crossfire pod fragments into protocol xml. 1566Expand crossfire pod fragments into protocol xml.
1475 1567
1476=cut 1568=cut
1477 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
1478sub expand_cfpod { 1581sub expand_cfpod {
1479 ((my $self), (local $_)) = @_; 1582 my ($self, $pod) = @_;
1480 1583
1481 # escape & and < 1584 my $xml;
1482 s/&/&amp;/g;
1483 s/(?<![BIUGH])</&lt;/g;
1484 1585
1485 # this is buggy, it needs to properly take care of nested <'s 1586 while () {
1587 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1588 $group = $1;
1486 1589
1487 1 while 1590 $group =~ s/&/&amp;/g;
1488 # replace B<>, I<>, U<> etc. 1591 $group =~ s/</&lt;/g;
1489 s/B<([^\>]*)>/<b>$1<\/b>/ 1592
1490 || s/I<([^\>]*)>/<i>$1<\/i>/ 1593 $xml .= $group;
1491 || s/U<([^\>]*)>/<u>$1<\/u>/ 1594 } elsif ($pod =~ m%\G
1492 # replace G<male|female> tags 1595 ([BCGHITU])
1493 || s{G<([^>|]*)\|([^>]*)>}{ 1596 <
1494 $self->gender ? $2 : $1 1597 (?:
1495 }ge 1598 ([^<>]*) (?{ $group = $^N })
1496 # replace H<hint text> 1599 | < $interior >
1497 || s{H<([^\>]*)>} 1600 )
1601 >
1602 %gcsx
1498 { 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") {
1499 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1621 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1500 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1622 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1501 "") 1623 "")
1502 [$self->{hintmode}] 1624 [$self->{hintmode}];
1625 } else {
1626 $xml .= "error processing '$code($data)' directive";
1503 }ge; 1627 }
1628 } else {
1629 if ($pod =~ /\G(.+)/) {
1630 warn "parse error while expanding $pod (at $1)";
1631 }
1632 last;
1633 }
1634 }
1504 1635
1636 for ($xml) {
1505 # create single paragraphs (very hackish) 1637 # create single paragraphs (very hackish)
1506 s/(?<=\S)\n(?=\w)/ /g; 1638 s/(?<=\S)\n(?=\w)/ /g;
1507 1639
1508 # compress some whitespace 1640 # compress some whitespace
1509 s/\s+\n/\n/g; # ws line-ends 1641 s/\s+\n/\n/g; # ws line-ends
1510 s/\n\n+/\n/g; # double lines 1642 s/\n\n+/\n/g; # double lines
1511 s/^\n+//; # beginning lines 1643 s/^\n+//; # beginning lines
1512 s/\n+$//; # ending lines 1644 s/\n+$//; # ending lines
1645 }
1513 1646
1514 $_ 1647 $xml
1515} 1648}
1649
1650no re 'eval';
1516 1651
1517sub hintmode { 1652sub hintmode {
1518 $_[0]{hintmode} = $_[1] if @_ > 1; 1653 $_[0]{hintmode} = $_[1] if @_ > 1;
1519 $_[0]{hintmode} 1654 $_[0]{hintmode}
1520} 1655}
1521 1656
1522=item $player->ext_reply ($msgid, %msg) 1657=item $player->ext_reply ($msgid, @msg)
1523 1658
1524Sends an ext reply to the player. 1659Sends an ext reply to the player.
1525 1660
1526=cut 1661=cut
1527 1662
1528sub ext_reply($$%) { 1663sub ext_reply($$@) {
1529 my ($self, $id, %msg) = @_; 1664 my ($self, $id, @msg) = @_;
1530 1665
1531 $msg{msgid} = $id; 1666 $self->ns->ext_reply ($id, @msg)
1532 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1533} 1667}
1534 1668
1535=item $player->ext_event ($type, %msg) 1669=item $player->ext_msg ($type, @msg)
1536 1670
1537Sends an ext event to the client. 1671Sends an ext event to the client.
1538 1672
1539=cut 1673=cut
1540 1674
1541sub ext_event($$%) { 1675sub ext_msg($$@) {
1542 my ($self, $type, %msg) = @_; 1676 my ($self, $type, @msg) = @_;
1543 1677
1544 $self->ns->ext_event ($type, %msg); 1678 $self->ns->ext_msg ($type, @msg);
1545} 1679}
1546 1680
1547=head3 cf::region 1681=head3 cf::region
1548 1682
1549=over 4 1683=over 4
1765 1899
1766sub load_header_from($) { 1900sub load_header_from($) {
1767 my ($self, $path) = @_; 1901 my ($self, $path) = @_;
1768 1902
1769 utf8::encode $path; 1903 utf8::encode $path;
1770 #aio_open $path, O_RDONLY, 0 1904 my $f = new_from_file cf::object::thawer $path
1771 # or return;
1772
1773 $self->_load_header ($path)
1774 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;
1775 1912
1776 $self->{load_path} = $path; 1913 $self->{load_path} = $path;
1777 1914
1778 1 1915 1
1779} 1916}
1833sub find { 1970sub find {
1834 my ($path, $origin) = @_; 1971 my ($path, $origin) = @_;
1835 1972
1836 $path = normalise $path, $origin && $origin->path; 1973 $path = normalise $path, $origin && $origin->path;
1837 1974
1975 cf::lock_wait "map_data:$path";#d#remove
1838 cf::lock_wait "map_find:$path"; 1976 cf::lock_wait "map_find:$path";
1839 1977
1840 $cf::MAP{$path} || do { 1978 $cf::MAP{$path} || do {
1841 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
1842 my $map = new_from_path cf::map $path 1982 my $map = new_from_path cf::map $path
1843 or return; 1983 or return;
1844 1984
1845 $map->{last_save} = $cf::RUNTIME; 1985 $map->{last_save} = $cf::RUNTIME;
1846 1986
1848 or return; 1988 or return;
1849 1989
1850 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1990 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1851 # doing this can freeze the server in a sync job, obviously 1991 # doing this can freeze the server in a sync job, obviously
1852 #$cf::WAIT_FOR_TICK->wait; 1992 #$cf::WAIT_FOR_TICK->wait;
1993 undef $guard1;
1994 undef $guard2;
1853 $map->reset; 1995 $map->reset;
1854 undef $guard;
1855 return find $path; 1996 return find $path;
1856 } 1997 }
1857 1998
1858 $cf::MAP{$path} = $map 1999 $cf::MAP{$path} = $map
1859 } 2000 }
1868 local $self->{deny_reset} = 1; # loading can take a long time 2009 local $self->{deny_reset} = 1; # loading can take a long time
1869 2010
1870 my $path = $self->{path}; 2011 my $path = $self->{path};
1871 2012
1872 { 2013 {
1873 my $guard = cf::lock_acquire "map_load:$path"; 2014 my $guard = cf::lock_acquire "map_data:$path";
1874 2015
2016 return unless $self->valid;
1875 return if $self->in_memory != cf::MAP_SWAPPED; 2017 return unless $self->in_memory == cf::MAP_SWAPPED;
1876 2018
1877 $self->in_memory (cf::MAP_LOADING); 2019 $self->in_memory (cf::MAP_LOADING);
1878 2020
1879 $self->alloc; 2021 $self->alloc;
1880 2022
1881 $self->pre_load; 2023 $self->pre_load;
1882 Coro::cede; 2024 cf::cede_to_tick;
1883 2025
2026 my $f = new_from_file cf::object::thawer $self->{load_path};
2027 $f->skip_block;
1884 $self->_load_objects ($self->{load_path}, 1) 2028 $self->_load_objects ($f)
1885 or return; 2029 or return;
1886 2030
1887 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2031 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1888 if delete $self->{load_original}; 2032 if delete $self->{load_original};
1889 2033
1890 if (my $uniq = $self->uniq_path) { 2034 if (my $uniq = $self->uniq_path) {
1891 utf8::encode $uniq; 2035 utf8::encode $uniq;
1892 if (aio_open $uniq, O_RDONLY, 0) { 2036 unless (aio_stat $uniq) {
2037 if (my $f = new_from_file cf::object::thawer $uniq) {
1893 $self->clear_unique_items; 2038 $self->clear_unique_items;
1894 $self->_load_objects ($uniq, 0); 2039 $self->_load_objects ($f);
2040 $f->resolve_delayed_derefs;
2041 }
1895 } 2042 }
1896 } 2043 }
1897 2044
1898 Coro::cede; 2045 $f->resolve_delayed_derefs;
2046
2047 cf::cede_to_tick;
1899 # now do the right thing for maps 2048 # now do the right thing for maps
1900 $self->link_multipart_objects; 2049 $self->link_multipart_objects;
1901 $self->difficulty ($self->estimate_difficulty) 2050 $self->difficulty ($self->estimate_difficulty)
1902 unless $self->difficulty; 2051 unless $self->difficulty;
1903 Coro::cede; 2052 cf::cede_to_tick;
1904 2053
1905 unless ($self->{deny_activate}) { 2054 unless ($self->{deny_activate}) {
1906 $self->decay_objects; 2055 $self->decay_objects;
1907 $self->fix_auto_apply; 2056 $self->fix_auto_apply;
1908 $self->update_buttons; 2057 $self->update_buttons;
1909 Coro::cede; 2058 cf::cede_to_tick;
1910 $self->set_darkness_map; 2059 $self->set_darkness_map;
1911 Coro::cede; 2060 cf::cede_to_tick;
1912 $self->activate; 2061 $self->activate;
1913 } 2062 }
2063
2064 $self->{last_save} = $cf::RUNTIME;
2065 $self->last_access ($cf::RUNTIME);
1914 2066
1915 $self->in_memory (cf::MAP_IN_MEMORY); 2067 $self->in_memory (cf::MAP_IN_MEMORY);
1916 } 2068 }
1917 2069
1918 $self->post_load; 2070 $self->post_load;
1929 2081
1930 $self 2082 $self
1931} 2083}
1932 2084
1933# 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
1934sub load_diag { 2086sub load_neighbours {
1935 my ($map) = @_; 2087 my ($map) = @_;
1936 2088
1937 my @diag; # diagonal neighbours 2089 my @neigh; # diagonal neighbours
1938 2090
1939 for (0 .. 3) { 2091 for (0 .. 3) {
1940 my $neigh = $map->tile_path ($_) 2092 my $neigh = $map->tile_path ($_)
1941 or next; 2093 or next;
1942 $neigh = find $neigh, $map 2094 $neigh = find $neigh, $map
1943 or next; 2095 or next;
1944 $neigh->load; 2096 $neigh->load;
1945 2097
2098 push @neigh,
1946 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2099 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1947 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2100 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1948 } 2101 }
1949 2102
1950 for (@diag) { 2103 for (grep defined $_->[0], @neigh) {
2104 my ($path, $origin) = @$_;
1951 my $neigh = find @$_ 2105 my $neigh = find $path, $origin
1952 or next; 2106 or next;
1953 $neigh->load; 2107 $neigh->load;
1954 } 2108 }
1955} 2109}
1956 2110
1961} 2115}
1962 2116
1963sub do_load_sync { 2117sub do_load_sync {
1964 my ($map) = @_; 2118 my ($map) = @_;
1965 2119
2120 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2121 if $Coro::current == $Coro::main;
2122
1966 cf::sync_job { $map->load }; 2123 cf::sync_job { $map->load };
1967} 2124}
1968 2125
1969our %MAP_PREFETCH; 2126our %MAP_PREFETCH;
1970our $MAP_PREFETCHER = undef; 2127our $MAP_PREFETCHER = undef;
1971 2128
1972sub find_async { 2129sub find_async {
1973 my ($path, $origin) = @_; 2130 my ($path, $origin, $load) = @_;
1974 2131
1975 $path = normalise $path, $origin && $origin->{path}; 2132 $path = normalise $path, $origin && $origin->{path};
1976 2133
1977 if (my $map = $cf::MAP{$path}) { 2134 if (my $map = $cf::MAP{$path}) {
1978 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2135 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1979 } 2136 }
1980 2137
1981 undef $MAP_PREFETCH{$path}; 2138 $MAP_PREFETCH{$path} |= $load;
2139
1982 $MAP_PREFETCHER ||= cf::async { 2140 $MAP_PREFETCHER ||= cf::async {
2141 $Coro::current->{desc} = "map prefetcher";
2142
1983 while (%MAP_PREFETCH) { 2143 while (%MAP_PREFETCH) {
1984 for my $path (keys %MAP_PREFETCH) { 2144 while (my ($k, $v) = each %MAP_PREFETCH) {
1985 if (my $map = find $path) { 2145 if (my $map = find $k) {
1986 $map->load; 2146 $map->load if $v;
1987 } 2147 }
1988 2148
1989 delete $MAP_PREFETCH{$path}; 2149 delete $MAP_PREFETCH{$k};
1990 } 2150 }
1991 } 2151 }
1992 undef $MAP_PREFETCHER; 2152 undef $MAP_PREFETCHER;
1993 }; 2153 };
1994 $MAP_PREFETCHER->prio (6); 2154 $MAP_PREFETCHER->prio (6);
1997} 2157}
1998 2158
1999sub save { 2159sub save {
2000 my ($self) = @_; 2160 my ($self) = @_;
2001 2161
2002 my $lock = cf::lock_acquire "map_data:" . $self->path; 2162 my $lock = cf::lock_acquire "map_data:$self->{path}";
2003 2163
2004 $self->{last_save} = $cf::RUNTIME; 2164 $self->{last_save} = $cf::RUNTIME;
2005 2165
2006 return unless $self->dirty; 2166 return unless $self->dirty;
2007 2167
2013 return if $self->{deny_save}; 2173 return if $self->{deny_save};
2014 2174
2015 local $self->{last_access} = $self->last_access;#d# 2175 local $self->{last_access} = $self->last_access;#d#
2016 2176
2017 cf::async { 2177 cf::async {
2178 $Coro::current->{desc} = "map player save";
2018 $_->contr->save for $self->players; 2179 $_->contr->save for $self->players;
2019 }; 2180 };
2020 2181
2021 if ($uniq) { 2182 if ($uniq) {
2022 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2183 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2030 my ($self) = @_; 2191 my ($self) = @_;
2031 2192
2032 # save first because save cedes 2193 # save first because save cedes
2033 $self->save; 2194 $self->save;
2034 2195
2035 my $lock = cf::lock_acquire "map_data:" . $self->path; 2196 my $lock = cf::lock_acquire "map_data:$self->{path}";
2036 2197
2037 return if $self->players; 2198 return if $self->players;
2038 return if $self->in_memory != cf::MAP_IN_MEMORY; 2199 return if $self->in_memory != cf::MAP_IN_MEMORY;
2039 return if $self->{deny_save}; 2200 return if $self->{deny_save};
2040 2201
2202 $self->in_memory (cf::MAP_SWAPPED);
2203
2204 $self->deactivate;
2205 $_->clear_links_to ($self) for values %cf::MAP;
2041 $self->clear; 2206 $self->clear;
2042 $self->in_memory (cf::MAP_SWAPPED);
2043} 2207}
2044 2208
2045sub reset_at { 2209sub reset_at {
2046 my ($self) = @_; 2210 my ($self) = @_;
2047 2211
2079 if $uniq; 2243 if $uniq;
2080 } 2244 }
2081 2245
2082 delete $cf::MAP{$self->path}; 2246 delete $cf::MAP{$self->path};
2083 2247
2248 $self->deactivate;
2249 $_->clear_links_to ($self) for values %cf::MAP;
2084 $self->clear; 2250 $self->clear;
2085
2086 $_->clear_links_to ($self) for values %cf::MAP;
2087 2251
2088 $self->unlink_save; 2252 $self->unlink_save;
2089 $self->destroy; 2253 $self->destroy;
2090} 2254}
2091 2255
2092my $nuke_counter = "aaaa"; 2256my $nuke_counter = "aaaa";
2093 2257
2094sub nuke { 2258sub nuke {
2095 my ($self) = @_; 2259 my ($self) = @_;
2096 2260
2261 {
2262 my $lock = cf::lock_acquire "map_data:$self->{path}";
2263
2097 delete $cf::MAP{$self->path}; 2264 delete $cf::MAP{$self->path};
2098 2265
2099 $self->unlink_save; 2266 $self->unlink_save;
2100 2267
2101 bless $self, "cf::map"; 2268 bless $self, "cf::map";
2102 delete $self->{deny_reset}; 2269 delete $self->{deny_reset};
2103 $self->{deny_save} = 1; 2270 $self->{deny_save} = 1;
2104 $self->reset_timeout (1); 2271 $self->reset_timeout (1);
2105 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2272 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2106 2273
2107 $cf::MAP{$self->path} = $self; 2274 $cf::MAP{$self->path} = $self;
2275 }
2108 2276
2109 $self->reset; # polite request, might not happen 2277 $self->reset; # polite request, might not happen
2110} 2278}
2111 2279
2112=item $maps = cf::map::tmp_maps 2280=item $maps = cf::map::tmp_maps
2188 2356
2189sub inv_recursive { 2357sub inv_recursive {
2190 inv_recursive_ inv $_[0] 2358 inv_recursive_ inv $_[0]
2191} 2359}
2192 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 }
2387}
2388
2193package cf; 2389package cf;
2194 2390
2195=back 2391=back
2196 2392
2197=head3 cf::object::player 2393=head3 cf::object::player
2219 2415
2220 } else { 2416 } else {
2221 my $pl = $self->contr; 2417 my $pl = $self->contr;
2222 2418
2223 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2419 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2224 my $diag = $pl->{npc_dialog}; 2420 my $dialog = $pl->{npc_dialog};
2225 $diag->{pl}->ext_reply ( 2421 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2226 $diag->{id},
2227 msgtype => "reply",
2228 msg => $diag->{pl}->expand_cfpod ($msg),
2229 add_topics => []
2230 );
2231 2422
2232 } else { 2423 } else {
2233 $msg = $npc->name . " says: $msg" if $npc; 2424 $msg = $npc->name . " says: $msg" if $npc;
2234 $self->message ($msg, $flags); 2425 $self->message ($msg, $flags);
2235 } 2426 }
2236 } 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 (@_);
2237} 2438}
2238 2439
2239=item $player_object->may ("access") 2440=item $player_object->may ("access")
2240 2441
2241Returns wether the given player is authorized to access resource "access" 2442Returns wether the given player is authorized to access resource "access"
2320 # use -1 or undef as default coordinates, not 0, 0 2521 # use -1 or undef as default coordinates, not 0, 0
2321 ($x, $y) = ($map->enter_x, $map->enter_y) 2522 ($x, $y) = ($map->enter_x, $map->enter_y)
2322 if $x <=0 && $y <= 0; 2523 if $x <=0 && $y <= 0;
2323 2524
2324 $map->load; 2525 $map->load;
2325 $map->load_diag; 2526 $map->load_neighbours;
2326 2527
2327 return unless $self->contr->active; 2528 return unless $self->contr->active;
2328 $self->activate_recursive; 2529 $self->activate_recursive;
2329 2530
2330 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2531 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2350 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2551 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2351 2552
2352 $self->enter_link; 2553 $self->enter_link;
2353 2554
2354 (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
2355 my $map = eval { 2577 my $map = eval {
2356 my $map = cf::map::find $path; 2578 my $map = defined $path ? cf::map::find $path : undef;
2357 2579
2358 if ($map) { 2580 if ($map) {
2359 $map = $map->customise_for ($self); 2581 $map = $map->customise_for ($self);
2360 $map = $check->($map) if $check && $map; 2582 $map = $check->($map) if $check && $map;
2361 } else { 2583 } else {
2362 $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);
2363 } 2585 }
2364 2586
2365 $map 2587 $map
2366 }; 2588 };
2367 2589
2420 $rmp->{origin_y} = $exit->y; 2642 $rmp->{origin_y} = $exit->y;
2421 } 2643 }
2422 2644
2423 $rmp->{random_seed} ||= $exit->random_seed; 2645 $rmp->{random_seed} ||= $exit->random_seed;
2424 2646
2425 my $data = cf::to_json $rmp; 2647 my $data = cf::encode_json $rmp;
2426 my $md5 = Digest::MD5::md5_hex $data; 2648 my $md5 = Digest::MD5::md5_hex $data;
2427 my $meta = "$RANDOMDIR/$md5.meta"; 2649 my $meta = "$RANDOMDIR/$md5.meta";
2428 2650
2429 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2651 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2430 aio_write $fh, 0, (length $data), $data, 0; 2652 aio_write $fh, 0, (length $data), $data, 0;
2457 # if exit is damned, update players death & WoR home-position 2679 # if exit is damned, update players death & WoR home-position
2458 $self->contr->savebed ($slaying, $hp, $sp) 2680 $self->contr->savebed ($slaying, $hp, $sp)
2459 if $exit->flag (FLAG_DAMNED); 2681 if $exit->flag (FLAG_DAMNED);
2460 2682
2461 (async { 2683 (async {
2684 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2685
2462 $self->deactivate_recursive; # just to be sure 2686 $self->deactivate_recursive; # just to be sure
2463 unless (eval { 2687 unless (eval {
2464 $self->goto ($slaying, $hp, $sp); 2688 $self->goto ($slaying, $hp, $sp);
2465 2689
2466 1; 2690 1;
2501the message, with C<log> being the default. If C<$color> is negative, suppress 2725the message, with C<log> being the default. If C<$color> is negative, suppress
2502the message unless the client supports the msg packet. 2726the message unless the client supports the msg packet.
2503 2727
2504=cut 2728=cut
2505 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
2506sub cf::client::send_msg { 2782sub cf::client::send_msg {
2507 my ($self, $channel, $msg, $color, @extra) = @_; 2783 my ($self, $channel, $msg, $color, @extra) = @_;
2508 2784
2509 $msg = $self->pl->expand_cfpod ($msg); 2785 $msg = $self->pl->expand_cfpod ($msg);
2510 2786
2511 $color &= ~cf::NDI_UNIQUE; # just in case... 2787 $color &= cf::NDI_CLIENT_MASK; # just in case...
2512 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
2513 if (ref $channel) { 2798 } elsif (ref $channel) {
2514 # send meta info to client, if not yet sent 2799 # send meta info to client, if not yet sent
2515 unless (exists $self->{channel}{$channel->{id}}) { 2800 unless (exists $self->{channel}{$channel->{id}}) {
2516 $self->{channel}{$channel->{id}} = $channel; 2801 $self->{channel}{$channel->{id}} = $channel;
2517 $self->ext_event (channel_info => %$channel); 2802 $self->ext_msg (channel_info => $channel)
2803 if $self->can_msg;
2518 } 2804 }
2519 2805
2520 $channel = $channel->{id}; 2806 $channel = $channel->{id};
2521 } 2807 }
2522 2808
2523 return unless @extra || length $msg; 2809 return unless @extra || length $msg;
2524 2810
2525 if ($self->can_msg) { 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
2526 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2816 $self->send_packet ("msg " . $self->{json_coder}->encode (
2817 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2527 } else { 2818 } else {
2528 # replace some tags by gcfclient-compatible ones
2529 for ($msg) {
2530 1 while
2531 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2532 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2533 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2534 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2535 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2536 }
2537
2538 if ($color >= 0) { 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
2539 if (0 && $msg =~ /\[/) { 2834 if (0 && $msg =~ /\[/) {
2835 # COMMAND/INFO
2540 $self->send_packet ("drawextinfo $color 4 0 $msg") 2836 $self->send_packet ("drawextinfo $color 10 8 $msg")
2541 } else { 2837 } else {
2542 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2838 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2543 $self->send_packet ("drawinfo $color $msg") 2839 $self->send_packet ("drawinfo $color $msg")
2544 } 2840 }
2545 } 2841 }
2546 } 2842 }
2547} 2843}
2548 2844
2549=item $client->ext_event ($type, %msg) 2845=item $client->ext_msg ($type, @msg)
2550 2846
2551Sends an ext event to the client. 2847Sends an ext event to the client.
2552 2848
2553=cut 2849=cut
2554 2850
2555sub cf::client::ext_event($$%) { 2851sub cf::client::ext_msg($$@) {
2556 my ($self, $type, %msg) = @_; 2852 my ($self, $type, @msg) = @_;
2557 2853
2558 return unless $self->extcmd; 2854 if ($self->extcmd == 2) {
2559 2855 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2856 } elsif ($self->extcmd == 1) { # TODO: remove
2560 $msg{msgtype} = "event_$type"; 2857 push @msg, msgtype => "event_$type";
2561 $self->send_packet ("ext " . $self->{json_coder}->encode (\%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 }
2562} 2878}
2563 2879
2564=item $success = $client->query ($flags, "text", \&cb) 2880=item $success = $client->query ($flags, "text", \&cb)
2565 2881
2566Queues a query to the client, calling the given callback with 2882Queues a query to the client, calling the given callback with
2621 my ($ns, $buf) = @_; 2937 my ($ns, $buf) = @_;
2622 2938
2623 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2939 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2624 2940
2625 if (ref $msg) { 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
2626 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2949 if (my $cb = $EXTICMD{$type}) {
2627 if (my %reply = $cb->($ns, $msg)) { 2950 @reply = $cb->($ns, @payload);
2628 $reply{msgid} = $msg->{msgid};
2629 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2630 }
2631 } 2951 }
2952
2953 $ns->ext_reply ($reply, @reply)
2954 if $reply;
2955
2632 } else { 2956 } else {
2633 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2957 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2634 } 2958 }
2635 2959
2636 cf::override; 2960 cf::override;
2683our $safe = new Safe "safe"; 3007our $safe = new Safe "safe";
2684our $safe_hole = new Safe::Hole; 3008our $safe_hole = new Safe::Hole;
2685 3009
2686$SIG{FPE} = 'IGNORE'; 3010$SIG{FPE} = 'IGNORE';
2687 3011
2688$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));
2689 3017
2690# here we export the classes and methods available to script code 3018# here we export the classes and methods available to script code
2691 3019
2692=pod 3020=pod
2693 3021
2694The following functions and methods are available within a safe environment: 3022The following functions and methods are available within a safe environment:
2695 3023
2696 cf::object 3024 cf::object
2697 contr pay_amount pay_player map x y force_find force_add 3025 contr pay_amount pay_player map x y force_find force_add destroy
2698 insert remove 3026 insert remove name archname title slaying race decrease_ob_nr
2699 3027
2700 cf::object::player 3028 cf::object::player
2701 player 3029 player
2702 3030
2703 cf::player 3031 cf::player
2708 3036
2709=cut 3037=cut
2710 3038
2711for ( 3039for (
2712 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 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
2713 insert remove)], 3042 decrease_ob_nr destroy)],
2714 ["cf::object::player" => qw(player)], 3043 ["cf::object::player" => qw(player)],
2715 ["cf::player" => qw(peaceful)], 3044 ["cf::player" => qw(peaceful)],
2716 ["cf::map" => qw(trigger)], 3045 ["cf::map" => qw(trigger)],
2717) { 3046) {
2718 no strict 'refs'; 3047 no strict 'refs';
2794# the server's init and main functions 3123# the server's init and main functions
2795 3124
2796sub load_facedata($) { 3125sub load_facedata($) {
2797 my ($path) = @_; 3126 my ($path) = @_;
2798 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;
3133
2799 warn "loading facedata from $path\n"; 3134 warn "loading facedata from $path\n";
2800 3135
2801 my $facedata; 3136 my $facedata;
2802 0 < aio_load $path, $facedata 3137 0 < aio_load $path, $facedata
2803 or die "$path: $!"; 3138 or die "$path: $!";
2805 $facedata = Coro::Storable::thaw $facedata; 3140 $facedata = Coro::Storable::thaw $facedata;
2806 3141
2807 $facedata->{version} == 2 3142 $facedata->{version} == 2
2808 or cf::cleanup "$path: version mismatch, cannot proceed."; 3143 or cf::cleanup "$path: version mismatch, cannot proceed.";
2809 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
2810 { 3152 {
2811 my $faces = $facedata->{faceinfo}; 3153 my $faces = $facedata->{faceinfo};
2812 3154
2813 while (my ($face, $info) = each %$faces) { 3155 while (my ($face, $info) = each %$faces) {
2814 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3156 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3157
2815 cf::face::set_visibility $idx, $info->{visibility}; 3158 cf::face::set_visibility $idx, $info->{visibility};
2816 cf::face::set_magicmap $idx, $info->{magicmap}; 3159 cf::face::set_magicmap $idx, $info->{magicmap};
2817 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3160 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2818 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3161 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2819 3162
2820 cf::cede_to_tick; 3163 cf::cede_to_tick;
2821 } 3164 }
2822 3165
2823 while (my ($face, $info) = each %$faces) { 3166 while (my ($face, $info) = each %$faces) {
2824 next unless $info->{smooth}; 3167 next unless $info->{smooth};
3168
2825 my $idx = cf::face::find $face 3169 my $idx = cf::face::find $face
2826 or next; 3170 or next;
3171
2827 if (my $smooth = cf::face::find $info->{smooth}) { 3172 if (my $smooth = cf::face::find $info->{smooth}) {
2828 cf::face::set_smooth $idx, $smooth; 3173 cf::face::set_smooth $idx, $smooth;
2829 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3174 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2830 } else { 3175 } else {
2831 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3176 warn "smooth face '$info->{smooth}' not found for face '$face'";
2848 3193
2849 { 3194 {
2850 # TODO: for gcfclient pleasure, we should give resources 3195 # TODO: for gcfclient pleasure, we should give resources
2851 # that gcfclient doesn't grok a >10000 face index. 3196 # that gcfclient doesn't grok a >10000 face index.
2852 my $res = $facedata->{resource}; 3197 my $res = $facedata->{resource};
2853 my $enc = JSON::XS->new->utf8->canonical;
2854 3198
2855 while (my ($name, $info) = each %$res) { 3199 while (my ($name, $info) = each %$res) {
2856 my $meta = $enc->encode ({ 3200 if (defined $info->{type}) {
2857 name => $name,
2858 type => $info->{type},
2859 copyright => $info->{copyright}, #TODO#
2860 });
2861
2862 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3201 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3202 my $data;
2863 3203
2864 if ($name =~ /\.jpg$/) { 3204 if ($info->{type} & 1) {
2865 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3205 # prepend meta info
2866 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 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};
2867 } else { 3219 } else {
2868 my $data = pack "(w/a*)*", $meta, $info->{data}; 3220 $RESOURCE{$name} = $info;
2869 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2870
2871 cf::face::set_type $idx, 1;
2872 cf::face::set_data $idx, 0, $data, $chk;
2873 } 3221 }
2874 3222
2875 cf::cede_to_tick; 3223 cf::cede_to_tick;
2876 } 3224 }
2877 } 3225 }
2878 3226
3227 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3228
2879 1 3229 1
2880} 3230}
2881 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
2882sub 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
2883 load_resource_file "$MAPDIR/regions" 3265 load_resource_file "$MAPDIR/regions"
2884 or die "unable to load regions file\n"; 3266 or die "unable to load regions file\n";
2885 3267
2886 for (cf::region::list) { 3268 for (cf::region::list) {
2887 $_->{match} = qr/$_->{match}/ 3269 $_->{match} = qr/$_->{match}/
2923 3305
2924sub init { 3306sub init {
2925 reload_resources; 3307 reload_resources;
2926} 3308}
2927 3309
2928sub cfg_load { 3310sub reload_config {
2929 open my $fh, "<:utf8", "$CONFDIR/config" 3311 open my $fh, "<:utf8", "$CONFDIR/config"
2930 or return; 3312 or return;
2931 3313
2932 local $/; 3314 local $/;
2933 *CFG = YAML::Syck::Load <$fh>; 3315 *CFG = YAML::Load <$fh>;
2934 3316
2935 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3317 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2936 3318
2937 $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};
2938 $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};
2949sub main { 3331sub main {
2950 # we must not ever block the main coroutine 3332 # we must not ever block the main coroutine
2951 local $Coro::idle = sub { 3333 local $Coro::idle = sub {
2952 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#
2953 (async { 3335 (async {
2954 Event::one_event; 3336 $Coro::current->{desc} = "IDLE BUG HANDLER";
3337 EV::loop EV::LOOP_ONESHOT;
2955 })->prio (Coro::PRIO_MAX); 3338 })->prio (Coro::PRIO_MAX);
2956 }; 3339 };
2957 3340
2958 cfg_load; 3341 reload_config;
2959 db_init; 3342 db_init;
2960 load_extensions; 3343 load_extensions;
2961 3344
2962 $TICK_WATCHER->start; 3345 $TICK_WATCHER->start;
3346 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
2963 Event::loop; 3347 EV::loop;
2964} 3348}
2965 3349
2966############################################################################# 3350#############################################################################
2967# initialisation and cleanup 3351# initialisation and cleanup
2968 3352
2969# install some emergency cleanup handlers 3353# install some emergency cleanup handlers
2970BEGIN { 3354BEGIN {
3355 our %SIGWATCHER = ();
2971 for my $signal (qw(INT HUP TERM)) { 3356 for my $signal (qw(INT HUP TERM)) {
2972 Event->signal ( 3357 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2973 reentrant => 0,
2974 data => WF_AUTOCANCEL,
2975 signal => $signal,
2976 prio => 0,
2977 cb => sub {
2978 cf::cleanup "SIG$signal"; 3358 cf::cleanup "SIG$signal";
2979 },
2980 ); 3359 };
2981 } 3360 }
2982} 3361}
2983 3362
2984sub write_runtime { 3363sub write_runtime {
2985 my $runtime = "$LOCALDIR/runtime"; 3364 my $runtime = "$LOCALDIR/runtime";
3030 # and maps saved/destroyed asynchronously. 3409 # and maps saved/destroyed asynchronously.
3031 warn "begin emergency player save\n"; 3410 warn "begin emergency player save\n";
3032 for my $login (keys %cf::PLAYER) { 3411 for my $login (keys %cf::PLAYER) {
3033 my $pl = $cf::PLAYER{$login} or next; 3412 my $pl = $cf::PLAYER{$login} or next;
3034 $pl->valid or next; 3413 $pl->valid or next;
3414 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3035 $pl->save; 3415 $pl->save;
3036 } 3416 }
3037 warn "end emergency player save\n"; 3417 warn "end emergency player save\n";
3038 3418
3039 warn "begin emergency map save\n"; 3419 warn "begin emergency map save\n";
3078 warn "syncing database to disk"; 3458 warn "syncing database to disk";
3079 BDB::db_env_txn_checkpoint $DB_ENV; 3459 BDB::db_env_txn_checkpoint $DB_ENV;
3080 3460
3081 # 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
3082 3462
3083 warn "cancelling all WF_AUTOCANCEL watchers";
3084 for (Event::all_watchers) {
3085 $_->cancel if $_->data & WF_AUTOCANCEL;
3086 }
3087
3088 warn "flushing outstanding aio requests"; 3463 warn "flushing outstanding aio requests";
3089 for (;;) { 3464 for (;;) {
3090 BDB::flush; 3465 BDB::flush;
3091 IO::AIO::flush; 3466 IO::AIO::flush;
3092 Coro::cede; 3467 Coro::cede_notself;
3093 last unless IO::AIO::nreqs || BDB::nreqs; 3468 last unless IO::AIO::nreqs || BDB::nreqs;
3094 warn "iterate..."; 3469 warn "iterate...";
3095 } 3470 }
3096 3471
3097 ++$RELOAD; 3472 ++$RELOAD;
3156 warn "reloading cf.pm"; 3531 warn "reloading cf.pm";
3157 require cf; 3532 require cf;
3158 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3533 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3159 3534
3160 warn "loading config and database again"; 3535 warn "loading config and database again";
3161 cf::cfg_load; 3536 cf::reload_config;
3162 3537
3163 warn "loading extensions"; 3538 warn "loading extensions";
3164 cf::load_extensions; 3539 cf::load_extensions;
3165 3540
3166 warn "reattaching attachments to objects/players"; 3541 warn "reattaching attachments to objects/players";
3186 3561
3187sub reload_perl() { 3562sub reload_perl() {
3188 # doing reload synchronously and two reloads happen back-to-back, 3563 # doing reload synchronously and two reloads happen back-to-back,
3189 # coro crashes during coro_state_free->destroy here. 3564 # coro crashes during coro_state_free->destroy here.
3190 3565
3191 $RELOAD_WATCHER ||= Event->timer ( 3566 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3192 reentrant => 0,
3193 after => 0,
3194 data => WF_AUTOCANCEL,
3195 cb => sub {
3196 do_reload_perl; 3567 do_reload_perl;
3197 undef $RELOAD_WATCHER; 3568 undef $RELOAD_WATCHER;
3198 },
3199 ); 3569 };
3200} 3570}
3201 3571
3202register_command "reload" => sub { 3572register_command "reload" => sub {
3203 my ($who, $arg) = @_; 3573 my ($who, $arg) = @_;
3204 3574
3205 if ($who->flag (FLAG_WIZ)) { 3575 if ($who->flag (FLAG_WIZ)) {
3206 $who->message ("reloading server."); 3576 $who->message ("reloading server.");
3577 async {
3578 $Coro::current->{desc} = "perl_reload";
3207 async { reload_perl }; 3579 reload_perl;
3580 };
3208 } 3581 }
3209}; 3582};
3210 3583
3211unshift @INC, $LIBDIR; 3584unshift @INC, $LIBDIR;
3212 3585
3231 my $signal = new Coro::Signal; 3604 my $signal = new Coro::Signal;
3232 push @WAIT_FOR_TICK_BEGIN, $signal; 3605 push @WAIT_FOR_TICK_BEGIN, $signal;
3233 $signal->wait; 3606 $signal->wait;
3234} 3607}
3235 3608
3236 my $min = 1e6;#d# 3609$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3237 my $avg = 10;
3238$TICK_WATCHER = Event->timer (
3239 reentrant => 0,
3240 parked => 1,
3241 prio => 0,
3242 at => $NEXT_TICK || $TICK,
3243 data => WF_AUTOCANCEL,
3244 cb => sub {
3245 if ($Coro::current != $Coro::main) { 3610 if ($Coro::current != $Coro::main) {
3246 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"
3247 unless ++$bug_warning > 10; 3612 unless ++$bug_warning > 10;
3248 return; 3613 return;
3249 } 3614 }
3250 3615
3251 $NOW = $tick_start = Event::time; 3616 $NOW = $tick_start = EV::now;
3252 3617
3253 cf::server_tick; # one server iteration 3618 cf::server_tick; # one server iteration
3254 3619
3255 0 && sync_job {#d# 3620 $RUNTIME += $TICK;
3256 for(1..10) { 3621 $NEXT_TICK = $_[0]->at;
3257 my $t = Event::time;
3258 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3259 or die;
3260 3622
3261 $map->width (50); 3623 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3262 $map->height (50); 3624 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3263 $map->alloc; 3625 Coro::async_pool {
3264 $map->_load_objects ("/tmp/x.map", 1); 3626 $Coro::current->{desc} = "runtime saver";
3265 my $t = Event::time - $t; 3627 write_runtime
3266 3628 or warn "ERROR: unable to write runtime file: $!";
3267 #next unless $t < 0.0013;#d#
3268 if ($t < $min) {
3269 $min = $t;
3270 }
3271 $avg = $avg * 0.99 + $t * 0.01;
3272 }
3273 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3274 exit 0;
3275 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3276 }; 3629 };
3630 }
3277 3631
3278 $RUNTIME += $TICK;
3279 $NEXT_TICK += $TICK;
3280
3281 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3282 $NEXT_RUNTIME_WRITE = $NOW + 10;
3283 Coro::async_pool {
3284 write_runtime
3285 or warn "ERROR: unable to write runtime file: $!";
3286 };
3287 }
3288
3289# my $AFTER = Event::time;
3290# warn $AFTER - $NOW;#d#
3291
3292 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3632 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3293 $sig->send; 3633 $sig->send;
3294 } 3634 }
3295 while (my $sig = shift @WAIT_FOR_TICK) { 3635 while (my $sig = shift @WAIT_FOR_TICK) {
3296 $sig->send; 3636 $sig->send;
3297 } 3637 }
3298 3638
3299 $NOW = Event::time;
3300
3301 # if we are delayed by four ticks or more, skip them all
3302 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3303
3304 $TICK_WATCHER->at ($NEXT_TICK);
3305 $TICK_WATCHER->start;
3306
3307 $LOAD = ($NOW - $tick_start) / $TICK; 3639 $LOAD = ($NOW - $tick_start) / $TICK;
3308 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3640 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3309 3641
3310 _post_tick; 3642 _post_tick;
3311 3643};
3312 3644$TICK_WATCHER->priority (EV::MAXPRI);
3313 },
3314);
3315 3645
3316{ 3646{
3317 BDB::max_poll_time $TICK * 0.1; 3647 # configure BDB
3318 $BDB_POLL_WATCHER = Event->io ( 3648
3319 reentrant => 0,
3320 fd => BDB::poll_fileno,
3321 poll => 'r',
3322 prio => 0,
3323 data => WF_AUTOCANCEL,
3324 cb => \&BDB::poll_cb,
3325 );
3326 BDB::min_parallel 8; 3649 BDB::min_parallel 8;
3327 3650 BDB::max_poll_reqs $TICK * 0.1;
3328 BDB::set_sync_prepare { 3651 $Coro::BDB::WATCHER->priority (1);
3329 my $status;
3330 my $current = $Coro::current;
3331 (
3332 sub {
3333 $status = $!;
3334 $current->ready; undef $current;
3335 },
3336 sub {
3337 Coro::schedule while defined $current;
3338 $! = $status;
3339 },
3340 )
3341 };
3342 3652
3343 unless ($DB_ENV) { 3653 unless ($DB_ENV) {
3344 $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);
3345 3659
3346 cf::sync_job { 3660 cf::sync_job {
3347 eval { 3661 eval {
3348 BDB::db_env_open 3662 BDB::db_env_open
3349 $DB_ENV, 3663 $DB_ENV,
3351 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
3352 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3666 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3353 0666; 3667 0666;
3354 3668
3355 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3669 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3356
3357 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3358 $DB_ENV->set_lk_detect;
3359 }; 3670 };
3360 3671
3361 cf::cleanup "db_env_open(db): $@" if $@; 3672 cf::cleanup "db_env_open(db): $@" if $@;
3362 }; 3673 };
3363 } 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 };
3364} 3685}
3365 3686
3366{ 3687{
3688 # configure IO::AIO
3689
3367 IO::AIO::min_parallel 8; 3690 IO::AIO::min_parallel 8;
3368
3369 undef $Coro::AIO::WATCHER;
3370 IO::AIO::max_poll_time $TICK * 0.1; 3691 IO::AIO::max_poll_time $TICK * 0.1;
3371 $AIO_POLL_WATCHER = Event->io ( 3692 $Coro::AIO::WATCHER->priority (1);
3372 reentrant => 0,
3373 data => WF_AUTOCANCEL,
3374 fd => IO::AIO::poll_fileno,
3375 poll => 'r',
3376 prio => 6,
3377 cb => \&IO::AIO::poll_cb,
3378 );
3379} 3693}
3380 3694
3381my $_log_backtrace; 3695my $_log_backtrace;
3382 3696
3383sub _log_backtrace { 3697sub _log_backtrace {
3387 3701
3388 # limit the # of concurrent backtraces 3702 # limit the # of concurrent backtraces
3389 if ($_log_backtrace < 2) { 3703 if ($_log_backtrace < 2) {
3390 ++$_log_backtrace; 3704 ++$_log_backtrace;
3391 async { 3705 async {
3706 $Coro::current->{desc} = "abt $msg";
3707
3392 my @bt = fork_call { 3708 my @bt = fork_call {
3393 @addr = map { sprintf "%x", $_ } @addr; 3709 @addr = map { sprintf "%x", $_ } @addr;
3394 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3710 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3395 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 |"
3396 or die "addr2line: $!"; 3712 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines