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.353 by root, Sun Sep 2 08:43:46 2007 UTC vs.
Revision 1.434 by root, Thu May 29 03:27:37 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
14 35
15use Coro 3.64 (); 36use Coro ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::Event; 39use Coro::AnyEvent;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
43use Coro::AnyEvent;
22use Coro::AIO; 44use Coro::AIO;
45use Coro::BDB;
23use Coro::Storable; 46use Coro::Storable;
24use Coro::Util (); 47use Coro::Util ();
25 48
26use JSON::XS (); 49use JSON::XS 2.01 ();
27use BDB (); 50use BDB ();
28use Data::Dumper; 51use Data::Dumper;
29use Digest::MD5; 52use Digest::MD5;
30use Fcntl; 53use Fcntl;
31use YAML::Syck (); 54use YAML ();
32use IO::AIO 2.32 (); 55use IO::AIO ();
33use Time::HiRes; 56use Time::HiRes;
34use Compress::LZF; 57use Compress::LZF;
35use Digest::MD5 (); 58use Digest::MD5 ();
59
60AnyEvent::detect;
61
62IO::AIO::max_poll_reqs 1;#d#
36 63
37# configure various modules to our taste 64# configure various modules to our taste
38# 65#
39$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 68Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
43$Event::Eval = 1; # no idea why this is required, but it is
44
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47 69
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 71
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 73
… …
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 92our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 94our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 95our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 96our $BDBDIR = "$LOCALDIR/db";
97our %RESOURCE;
75 98
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 101our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 102our $USE_FSYNC = 1; # use fsync to write maps - default off
83 103
104our $BDB_DEADLOCK_WATCHER;
105our $BDB_CHECKPOINT_WATCHER;
84our $BDB_POLL_WATCHER; 106our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 107our $DB_ENV;
86 108
87our %CFG; 109our %CFG;
88 110
89our $UPTIME; $UPTIME ||= time; 111our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 112our $RUNTIME;
113our $NOW;
91 114
92our %PLAYER; # all users 115our (%PLAYER, %PLAYER_LOADING); # all users
93our %MAP; # all maps 116our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 117our $LINK_MAP; # the special {link} map, which is always available
95 118
96# used to convert map paths into valid unix filenames by replacing / by ∕ 119# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 120our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 121
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 122our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 123our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 125our $TICK_START; # for load detecting purposes
102 126
103binmode STDOUT; 127binmode STDOUT;
104binmode STDERR; 128binmode STDERR;
105 129
106# read virtual server time, if available 130# read virtual server time, if available
… …
159 183
160The raw value load value from the last tick. 184The raw value load value from the last tick.
161 185
162=item %cf::CFG 186=item %cf::CFG
163 187
164Configuration for the server, loaded from C</etc/crossfire/config>, or 188Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 189from wherever your confdir points to.
166 190
167=item cf::wait_for_tick, cf::wait_for_tick_begin 191=item cf::wait_for_tick, cf::wait_for_tick_begin
168 192
169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 193These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
… …
187 $msg .= "\n" 211 $msg .= "\n"
188 unless $msg =~ /\n$/; 212 unless $msg =~ /\n$/;
189 213
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 214 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 215
192 utf8::encode $msg;
193 LOG llevError, $msg; 216 LOG llevError, $msg;
194 }; 217 };
195} 218}
219
220$Coro::State::DIEHOOK = sub {
221 return unless $^S eq 0; # "eq", not "=="
222
223 if ($Coro::current == $Coro::main) {#d#
224 warn "DIEHOOK called in main context, Coro bug?\n";#d#
225 return;#d#
226 }#d#
227
228 # kill coroutine otherwise
229 warn Carp::longmess $_[0];
230 Coro::terminate
231};
232
233$SIG{__DIE__} = sub { }; #d#?
196 234
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
213)) { 251)) {
214 no strict 'refs'; 252 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 254}
217 255
218$Event::DIED = sub { 256$EV::DIED = sub {
219 warn "error in event callback: @_"; 257 warn "error in event callback: @_";
220}; 258};
221 259
222############################################################################# 260#############################################################################
223 261
… …
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 284 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 285 $d
248 } || "[unable to dump $_[0]: '$@']"; 286 } || "[unable to dump $_[0]: '$@']";
249} 287}
250 288
251=item $ref = cf::from_json $json 289=item $ref = cf::decode_json $json
252 290
253Converts a JSON string into the corresponding perl data structure. 291Converts a JSON string into the corresponding perl data structure.
254 292
255=item $json = cf::to_json $ref 293=item $json = cf::encode_json $ref
256 294
257Converts a perl data structure into its JSON representation. 295Converts a perl data structure into its JSON representation.
258 296
259=cut 297=cut
260 298
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 299our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 300
263sub to_json ($) { $json_coder->encode ($_[0]) } 301sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 302sub decode_json($) { $json_coder->decode ($_[0]) }
265 303
266=item cf::lock_wait $string 304=item cf::lock_wait $string
267 305
268Wait until the given lock is available. See cf::lock_acquire. 306Wait until the given lock is available. See cf::lock_acquire.
269 307
… …
285Return true if the lock is currently active, i.e. somebody has locked it. 323Return true if the lock is currently active, i.e. somebody has locked it.
286 324
287=cut 325=cut
288 326
289our %LOCK; 327our %LOCK;
328our %LOCKER;#d#
290 329
291sub lock_wait($) { 330sub lock_wait($) {
292 my ($key) = @_; 331 my ($key) = @_;
332
333 if ($LOCKER{$key} == $Coro::current) {#d#
334 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
335 return;#d#
336 }#d#
293 337
294 # wait for lock, if any 338 # wait for lock, if any
295 while ($LOCK{$key}) { 339 while ($LOCK{$key}) {
296 push @{ $LOCK{$key} }, $Coro::current; 340 push @{ $LOCK{$key} }, $Coro::current;
297 Coro::schedule; 341 Coro::schedule;
… …
303 347
304 # wait, to be sure we are not locked 348 # wait, to be sure we are not locked
305 lock_wait $key; 349 lock_wait $key;
306 350
307 $LOCK{$key} = []; 351 $LOCK{$key} = [];
352 $LOCKER{$key} = $Coro::current;#d#
308 353
309 Coro::guard { 354 Coro::guard {
355 delete $LOCKER{$key};#d#
310 # wake up all waiters, to be on the safe side 356 # wake up all waiters, to be on the safe side
311 $_->ready for @{ delete $LOCK{$key} }; 357 $_->ready for @{ delete $LOCK{$key} };
312 } 358 }
313} 359}
314 360
… …
317 363
318 ! ! $LOCK{$key} 364 ! ! $LOCK{$key}
319} 365}
320 366
321sub freeze_mainloop { 367sub freeze_mainloop {
322 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
323 369
324 my $guard = Coro::guard { 370 Coro::guard \&tick_inhibit_dec;
325 $TICK_WATCHER->start; 371}
326 }; 372
327 $TICK_WATCHER->stop; 373=item cf::periodic $interval, $cb
328 $guard 374
375Like EV::periodic, but randomly selects a starting point so that the actions
376get spread over timer.
377
378=cut
379
380sub periodic($$) {
381 my ($interval, $cb) = @_;
382
383 my $start = rand List::Util::min 180, $interval;
384
385 EV::periodic $start, $interval, 0, $cb
329} 386}
330 387
331=item cf::get_slot $time[, $priority[, $name]] 388=item cf::get_slot $time[, $priority[, $name]]
332 389
333Allocate $time seconds of blocking CPU time at priority C<$priority>: 390Allocate $time seconds of blocking CPU time at priority C<$priority>:
… …
344our @SLOT_QUEUE; 401our @SLOT_QUEUE;
345our $SLOT_QUEUE; 402our $SLOT_QUEUE;
346 403
347$SLOT_QUEUE->cancel if $SLOT_QUEUE; 404$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async { 405$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager");
407
349 my $signal = new Coro::Signal; 408 my $signal = new Coro::Signal;
350 409
351 while () { 410 while () {
352 next_job: 411 next_job:
353 my $avail = cf::till_tick; 412 my $avail = cf::till_tick;
… …
361 } 420 }
362 } 421 }
363 } 422 }
364 423
365 if (@SLOT_QUEUE) { 424 if (@SLOT_QUEUE) {
366 # we do not use wait_For_tick() as it returns immediately when tick is inactive 425 # we do not use wait_for_tick() as it returns immediately when tick is inactive
367 push @cf::WAIT_FOR_TICK, $signal; 426 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait; 427 $signal->wait;
369 } else { 428 } else {
370 Coro::schedule; 429 Coro::schedule;
371 } 430 }
372 } 431 }
373}; 432};
374 433
375sub get_slot($;$$) { 434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
376 my ($time, $pri, $name) = @_; 437 my ($time, $pri, $name) = @_;
377 438
378 $time = $TICK * .6 if $time > $TICK * .6; 439 $time = $TICK * .6 if $time > $TICK * .6;
379 my $sig = new Coro::Signal; 440 my $sig = new Coro::Signal;
380 441
… …
394 455
395BEGIN { *async = \&Coro::async_pool } 456BEGIN { *async = \&Coro::async_pool }
396 457
397=item cf::sync_job { BLOCK } 458=item cf::sync_job { BLOCK }
398 459
399The design of Crossfire TRT requires that the main coroutine ($Coro::main) 460The design of Deliantra requires that the main coroutine ($Coro::main)
400is always able to handle events or runnable, as Crossfire TRT is only 461is always able to handle events or runnable, as Deliantra is only
401partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 462partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
402acceptable. 463acceptable.
403 464
404If it must be done, put the blocking parts into C<sync_job>. This will run 465If it must be done, put the blocking parts into C<sync_job>. This will run
405the given BLOCK in another coroutine while waiting for the result. The 466the given BLOCK in another coroutine while waiting for the result. The
… …
410 471
411sub sync_job(&) { 472sub sync_job(&) {
412 my ($job) = @_; 473 my ($job) = @_;
413 474
414 if ($Coro::current == $Coro::main) { 475 if ($Coro::current == $Coro::main) {
415 my $time = Event::time; 476 my $time = EV::time;
416 477
417 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
418 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
419 480
420 # TODO: use suspend/resume instead 481 LOG llevError, Carp::longmess "sync job";#d#
421 # (but this is cancel-safe) 482
422 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
423 484
424 my $busy = 1; 485 my $busy = 1;
425 my @res; 486 my @res;
426 487
427 (async { 488 (async {
489 $Coro::current->desc ("sync job coro");
428 @res = eval { $job->() }; 490 @res = eval { $job->() };
429 warn $@ if $@; 491 warn $@ if $@;
430 undef $busy; 492 undef $busy;
431 })->prio (Coro::PRIO_MAX); 493 })->prio (Coro::PRIO_MAX);
432 494
433 while ($busy) { 495 while ($busy) {
434 Coro::cede or Event::one_event; 496 if (Coro::nready) {
497 Coro::cede_notself;
498 } else {
499 EV::loop EV::LOOP_ONESHOT;
435 } 500 }
501 }
436 502
437 $time = Event::time - $time; 503 my $time = EV::time - $time;
438 504
439 LOG llevError | logBacktrace, Carp::longmess "long sync job"
440 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
441
442 $tick_start += $time; # do not account sync jobs to server load 505 $TICK_START += $time; # do not account sync jobs to server load
443 506
444 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
445 } else { 508 } else {
446 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
447 510
… …
472=item fork_call { }, $args 535=item fork_call { }, $args
473 536
474Executes the given code block with the given arguments in a seperate 537Executes the given code block with the given arguments in a seperate
475process, returning the results. Everything must be serialisable with 538process, returning the results. Everything must be serialisable with
476Coro::Storable. May, of course, block. Note that the executed sub may 539Coro::Storable. May, of course, block. Note that the executed sub may
477never block itself or use any form of Event handling. 540never block itself or use any form of event handling.
478 541
479=cut 542=cut
480 543
481sub fork_call(&@) { 544sub fork_call(&@) {
482 my ($cb, @args) = @_; 545 my ($cb, @args) = @_;
483 546
484 # we seemingly have to make a local copy of the whole thing, 547 # we seemingly have to make a local copy of the whole thing,
485 # otherwise perl prematurely frees the stuff :/ 548 # otherwise perl prematurely frees the stuff :/
486 # TODO: investigate and fix (liekly this will be rather laborious) 549 # TODO: investigate and fix (likely this will be rather laborious)
487 550
488 my @res = Coro::Util::fork_eval { 551 my @res = Coro::Util::fork_eval {
489 reset_signals; 552 reset_signals;
490 &$cb 553 &$cb
491 }, @args; 554 }, @args;
492 555
493 wantarray ? @res : $res[-1] 556 wantarray ? @res : $res[-1]
494} 557}
495 558
559=item $coin = coin_from_name $name
560
561=cut
562
563our %coin_alias = (
564 "silver" => "silvercoin",
565 "silvercoin" => "silvercoin",
566 "silvercoins" => "silvercoin",
567 "gold" => "goldcoin",
568 "goldcoin" => "goldcoin",
569 "goldcoins" => "goldcoin",
570 "platinum" => "platinacoin",
571 "platinumcoin" => "platinacoin",
572 "platinumcoins" => "platinacoin",
573 "platina" => "platinacoin",
574 "platinacoin" => "platinacoin",
575 "platinacoins" => "platinacoin",
576 "royalty" => "royalty",
577 "royalties" => "royalty",
578);
579
580sub coin_from_name($) {
581 $coin_alias{$_[0]}
582 ? cf::arch::find $coin_alias{$_[0]}
583 : undef
584}
585
496=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
497 587
498Returns a single value from the environment database. 588Returns a single value from the environment database.
499 589
500=item cf::db_put $family => $key => $value 590=item cf::db_put $family => $key => $value
501 591
502Stores the given C<$value> in the family. It can currently store binary 592Stores the given C<$value> in the family. It can currently store binary
503data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 593data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
504 594
595=item $db = cf::db_table "name"
596
597Create and/or open a new database table. The string must not be "db" and must be unique
598within each server.
599
505=cut 600=cut
601
602sub db_table($) {
603 my ($name) = @_;
604 my $db = BDB::db_create $DB_ENV;
605
606 eval {
607 $db->set_flags (BDB::CHKSUM);
608
609 utf8::encode $name;
610 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
611 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
612 cf::cleanup "db_open(db): $!" if $!;
613 };
614 cf::cleanup "db_open(db): $@" if $@;
615
616 $db
617}
506 618
507our $DB; 619our $DB;
508 620
509sub db_init { 621sub db_init {
510 unless ($DB) {
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job { 622 cf::sync_job {
514 eval { 623 $DB ||= db_table "db";
515 $DB->set_flags (BDB::CHKSUM);
516
517 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
518 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
519 cf::cleanup "db_open(db): $!" if $!;
520 };
521 cf::cleanup "db_open(db): $@" if $@;
522 };
523 } 624 };
524} 625}
525 626
526sub db_get($$) { 627sub db_get($$) {
527 my $key = "$_[0]/$_[1]"; 628 my $key = "$_[0]/$_[1]";
528 629
… …
632attach callbacks/event handlers (a collection of which is called an "attachment") 733attach callbacks/event handlers (a collection of which is called an "attachment")
633to it. All such attachable objects support the following methods. 734to it. All such attachable objects support the following methods.
634 735
635In the following description, CLASS can be any of C<global>, C<object> 736In the following description, CLASS can be any of C<global>, C<object>
636C<player>, C<client> or C<map> (i.e. the attachable objects in 737C<player>, C<client> or C<map> (i.e. the attachable objects in
637Crossfire TRT). 738Deliantra).
638 739
639=over 4 740=over 4
640 741
641=item $attachable->attach ($attachment, key => $value...) 742=item $attachable->attach ($attachment, key => $value...)
642 743
… …
924 } 1025 }
925 1026
926 0 1027 0
927} 1028}
928 1029
929=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
930 1031
931=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1032=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
932 1033
933Generate an object-specific event with the given arguments. 1034Generate an object-specific event with the given arguments.
934 1035
… …
940 1041
941=cut 1042=cut
942 1043
943############################################################################# 1044#############################################################################
944# object support 1045# object support
945#
946 1046
1047sub _object_equal($$);
1048sub _object_equal($$) {
1049 my ($a, $b) = @_;
1050
1051 return 0 unless (ref $a) eq (ref $b);
1052
1053 if ("HASH" eq ref $a) {
1054 my @ka = keys %$a;
1055 my @kb = keys %$b;
1056
1057 return 0 if @ka != @kb;
1058
1059 for (0 .. $#ka) {
1060 return 0 unless $ka[$_] eq $kb[$_];
1061 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1062 }
1063
1064 } elsif ("ARRAY" eq ref $a) {
1065
1066 return 0 if @$a != @$b;
1067
1068 for (0 .. $#$a) {
1069 return 0 unless _object_equal $a->[$_], $b->[$_];
1070 }
1071
1072 } elsif ($a ne $b) {
1073 return 0;
1074 }
1075
1076 1
1077}
1078
1079our $SLOW_MERGES;#d#
947sub _can_merge { 1080sub _can_merge {
948 my ($ob1, $ob2) = @_; 1081 my ($ob1, $ob2) = @_;
949 1082
950 local $Storable::canonical = 1; 1083 ++$SLOW_MERGES;#d#
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953 1084
954 $fob1 eq $fob2 1085 # we do the slow way here
1086 return _object_equal $ob1, $ob2
955} 1087}
956 1088
957sub reattach { 1089sub reattach {
958 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
959 my ($obj) = @_; 1091 my ($obj) = @_;
… …
981cf::attachable->attach ( 1113cf::attachable->attach (
982 prio => -1000000, 1114 prio => -1000000,
983 on_instantiate => sub { 1115 on_instantiate => sub {
984 my ($obj, $data) = @_; 1116 my ($obj, $data) = @_;
985 1117
986 $data = from_json $data; 1118 $data = decode_json $data;
987 1119
988 for (@$data) { 1120 for (@$data) {
989 my ($name, $args) = @$_; 1121 my ($name, $args) = @$_;
990 1122
991 $obj->attach ($name, %{$args || {} }); 1123 $obj->attach ($name, %{$args || {} });
… …
1007sub object_freezer_save { 1139sub object_freezer_save {
1008 my ($filename, $rdata, $objs) = @_; 1140 my ($filename, $rdata, $objs) = @_;
1009 1141
1010 sync_job { 1142 sync_job {
1011 if (length $$rdata) { 1143 if (length $$rdata) {
1144 utf8::decode (my $decname = $filename);
1012 warn sprintf "saving %s (%d,%d)\n", 1145 warn sprintf "saving %s (%d,%d)\n",
1013 $filename, length $$rdata, scalar @$objs; 1146 $decname, length $$rdata, scalar @$objs;
1014 1147
1015 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1148 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1016 chmod SAVE_MODE, $fh; 1149 aio_chmod $fh, SAVE_MODE;
1017 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1150 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1018 aio_fsync $fh if $cf::USE_FSYNC; 1151 aio_fsync $fh if $cf::USE_FSYNC;
1019 close $fh; 1152 aio_close $fh;
1020 1153
1021 if (@$objs) { 1154 if (@$objs) {
1022 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1155 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1023 chmod SAVE_MODE, $fh; 1156 aio_chmod $fh, SAVE_MODE;
1024 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1157 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1025 aio_write $fh, 0, (length $data), $data, 0; 1158 aio_write $fh, 0, (length $data), $data, 0;
1026 aio_fsync $fh if $cf::USE_FSYNC; 1159 aio_fsync $fh if $cf::USE_FSYNC;
1027 close $fh; 1160 aio_close $fh;
1028 aio_rename "$filename.pst~", "$filename.pst"; 1161 aio_rename "$filename.pst~", "$filename.pst";
1029 } 1162 }
1030 } else { 1163 } else {
1031 aio_unlink "$filename.pst"; 1164 aio_unlink "$filename.pst";
1032 } 1165 }
… …
1037 } 1170 }
1038 } else { 1171 } else {
1039 aio_unlink $filename; 1172 aio_unlink $filename;
1040 aio_unlink "$filename.pst"; 1173 aio_unlink "$filename.pst";
1041 } 1174 }
1042 } 1175 };
1043} 1176}
1044 1177
1045sub object_freezer_as_string { 1178sub object_freezer_as_string {
1046 my ($rdata, $objs) = @_; 1179 my ($rdata, $objs) = @_;
1047 1180
… …
1059 or return; 1192 or return;
1060 1193
1061 unless (aio_stat "$filename.pst") { 1194 unless (aio_stat "$filename.pst") {
1062 (aio_load "$filename.pst", $av) >= 0 1195 (aio_load "$filename.pst", $av) >= 0
1063 or return; 1196 or return;
1197
1064 $av = eval { (Storable::thaw $av)->{objs} }; 1198 my $st = eval { Coro::Storable::thaw $av };
1199 $av = $st->{objs};
1065 } 1200 }
1066 1201
1202 utf8::decode (my $decname = $filename);
1067 warn sprintf "loading %s (%d)\n", 1203 warn sprintf "loading %s (%d,%d)\n",
1068 $filename, length $data, scalar @{$av || []}; 1204 $decname, length $data, scalar @{$av || []};
1205
1069 return ($data, $av); 1206 ($data, $av)
1070} 1207}
1071 1208
1072=head2 COMMAND CALLBACKS 1209=head2 COMMAND CALLBACKS
1073 1210
1074=over 4 1211=over 4
… …
1223 my $msg = $@ ? "$v->{path}: $@\n" 1360 my $msg = $@ ? "$v->{path}: $@\n"
1224 : "$v->{base}: extension inactive.\n"; 1361 : "$v->{base}: extension inactive.\n";
1225 1362
1226 if (exists $v->{meta}{mandatory}) { 1363 if (exists $v->{meta}{mandatory}) {
1227 warn $msg; 1364 warn $msg;
1228 warn "mandatory extension failed to load, exiting.\n"; 1365 cf::cleanup "mandatory extension failed to load, exiting.";
1229 exit 1;
1230 } 1366 }
1231 1367
1232 warn $msg; 1368 warn $msg;
1233 } 1369 }
1234 1370
… …
1259use Coro::AIO; 1395use Coro::AIO;
1260 1396
1261=head3 cf::player 1397=head3 cf::player
1262 1398
1263=over 4 1399=over 4
1400
1401=item cf::player::num_playing
1402
1403Returns the official number of playing players, as per the Crossfire metaserver rules.
1404
1405=cut
1406
1407sub num_playing {
1408 scalar grep
1409 $_->ob->map
1410 && !$_->hidden
1411 && !$_->ob->flag (cf::FLAG_WIZ),
1412 cf::player::list
1413}
1264 1414
1265=item cf::player::find $login 1415=item cf::player::find $login
1266 1416
1267Returns the given player object, loading it if necessary (might block). 1417Returns the given player object, loading it if necessary (might block).
1268 1418
… …
1304 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1454 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1305 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1455 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1306 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1456 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1307 aio_unlink +(playerdir $login) . "/$login.pl"; 1457 aio_unlink +(playerdir $login) . "/$login.pl";
1308 1458
1309 my $pl = load_pl path $login 1459 my $f = new_from_file cf::object::thawer path $login
1310 or return; 1460 or return;
1461
1462 my $pl = cf::player::load_pl $f
1463 or return;
1464
1465 local $cf::PLAYER_LOADING{$login} = $pl;
1466 $f->resolve_delayed_derefs;
1311 $cf::PLAYER{$login} = $pl 1467 $cf::PLAYER{$login} = $pl
1312 } 1468 }
1313 } 1469 }
1314} 1470}
1315 1471
… …
1323 1479
1324 return if $pl->{deny_save}; 1480 return if $pl->{deny_save};
1325 1481
1326 aio_mkdir playerdir $pl, 0770; 1482 aio_mkdir playerdir $pl, 0770;
1327 $pl->{last_save} = $cf::RUNTIME; 1483 $pl->{last_save} = $cf::RUNTIME;
1484
1485 cf::get_slot 0.01;
1328 1486
1329 $pl->save_pl ($path); 1487 $pl->save_pl ($path);
1330 cf::cede_to_tick; 1488 cf::cede_to_tick;
1331} 1489}
1332 1490
… …
1368 $pl->{deny_save} = 1; 1526 $pl->{deny_save} = 1;
1369 $pl->password ("*"); # this should lock out the player until we nuked the dir 1527 $pl->password ("*"); # this should lock out the player until we nuked the dir
1370 1528
1371 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1529 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1372 $pl->deactivate; 1530 $pl->deactivate;
1531 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1532 $pl->ob->check_score;
1373 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1533 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1374 $pl->ns->destroy if $pl->ns; 1534 $pl->ns->destroy if $pl->ns;
1375 1535
1376 my $path = playerdir $pl; 1536 my $path = playerdir $pl;
1377 my $temp = "$path~$cf::RUNTIME~deleting~"; 1537 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1413 or return []; 1573 or return [];
1414 1574
1415 my @logins; 1575 my @logins;
1416 1576
1417 for my $login (@$dirs) { 1577 for my $login (@$dirs) {
1578 my $path = path $login;
1579
1580 # a .pst is a dead give-away for a valid player
1581 # if no pst file found, open and chekc for blocked users
1582 if (aio_stat "$path.pst") {
1418 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1583 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1419 aio_read $fh, 0, 512, my $buf, 0 or next; 1584 aio_read $fh, 0, 512, my $buf, 0 or next;
1420 $buf !~ /^password -------------$/m or next; # official not-valid tag 1585 $buf !~ /^password -------------$/m or next; # official not-valid tag
1586 }
1421 1587
1422 utf8::decode $login; 1588 utf8::decode $login;
1423 push @logins, $login; 1589 push @logins, $login;
1424 } 1590 }
1425 1591
… …
1458 1624
1459Expand crossfire pod fragments into protocol xml. 1625Expand crossfire pod fragments into protocol xml.
1460 1626
1461=cut 1627=cut
1462 1628
1629use re 'eval';
1630
1631my $group;
1632my $interior; $interior = qr{
1633 # match a pod interior sequence sans C<< >>
1634 (?:
1635 \ (.*?)\ (?{ $group = $^N })
1636 | < (??{$interior}) >
1637 )
1638}x;
1639
1463sub expand_cfpod { 1640sub expand_cfpod {
1464 ((my $self), (local $_)) = @_; 1641 my ($self, $pod) = @_;
1465 1642
1466 # escape & and < 1643 my $xml;
1467 s/&/&amp;/g;
1468 s/(?<![BIUGHT])</&lt;/g;
1469 1644
1470 # this is buggy, it needs to properly take care of nested <'s 1645 while () {
1646 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1647 $group = $1;
1471 1648
1472 1 while 1649 $group =~ s/&/&amp;/g;
1473 # replace B<>, I<>, U<> etc. 1650 $group =~ s/</&lt;/g;
1474 s/B<([^\>]*)>/<b>$1<\/b>/ 1651
1475 || s/I<([^\>]*)>/<i>$1<\/i>/ 1652 $xml .= $group;
1476 || s/U<([^\>]*)>/<u>$1<\/u>/ 1653 } elsif ($pod =~ m%\G
1477 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1654 ([BCGHITU])
1478 # replace G<male|female> tags 1655 <
1479 || s{G<([^>|]*)\|([^>]*)>}{ 1656 (?:
1480 $self->gender ? $2 : $1 1657 ([^<>]*) (?{ $group = $^N })
1481 }ge 1658 | < $interior >
1482 # replace H<hint text> 1659 )
1483 || s{H<([^\>]*)>} 1660 >
1661 %gcsx
1484 { 1662 ) {
1663 my ($code, $data) = ($1, $group);
1664
1665 if ($code eq "B") {
1666 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1667 } elsif ($code eq "I") {
1668 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1669 } elsif ($code eq "U") {
1670 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1671 } elsif ($code eq "C") {
1672 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1673 } elsif ($code eq "T") {
1674 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1675 } elsif ($code eq "G") {
1676 my ($male, $female) = split /\|/, $data;
1677 $data = $self->gender ? $female : $male;
1678 $xml .= expand_cfpod ($self, $data);
1679 } elsif ($code eq "H") {
1485 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1680 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1486 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1681 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1487 "") 1682 "")
1488 [$self->{hintmode}] 1683 [$self->{hintmode}];
1684 } else {
1685 $xml .= "error processing '$code($data)' directive";
1489 }ge; 1686 }
1687 } else {
1688 if ($pod =~ /\G(.+)/) {
1689 warn "parse error while expanding $pod (at $1)";
1690 }
1691 last;
1692 }
1693 }
1490 1694
1695 for ($xml) {
1491 # create single paragraphs (very hackish) 1696 # create single paragraphs (very hackish)
1492 s/(?<=\S)\n(?=\w)/ /g; 1697 s/(?<=\S)\n(?=\w)/ /g;
1493 1698
1494 # compress some whitespace 1699 # compress some whitespace
1495 s/\s+\n/\n/g; # ws line-ends 1700 s/\s+\n/\n/g; # ws line-ends
1496 s/\n\n+/\n/g; # double lines 1701 s/\n\n+/\n/g; # double lines
1497 s/^\n+//; # beginning lines 1702 s/^\n+//; # beginning lines
1498 s/\n+$//; # ending lines 1703 s/\n+$//; # ending lines
1704 }
1499 1705
1500 $_ 1706 $xml
1501} 1707}
1708
1709no re 'eval';
1502 1710
1503sub hintmode { 1711sub hintmode {
1504 $_[0]{hintmode} = $_[1] if @_ > 1; 1712 $_[0]{hintmode} = $_[1] if @_ > 1;
1505 $_[0]{hintmode} 1713 $_[0]{hintmode}
1506} 1714}
… …
1578our $MAX_RESET = 3600; 1786our $MAX_RESET = 3600;
1579our $DEFAULT_RESET = 3000; 1787our $DEFAULT_RESET = 3000;
1580 1788
1581sub generate_random_map { 1789sub generate_random_map {
1582 my ($self, $rmp) = @_; 1790 my ($self, $rmp) = @_;
1791
1792 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1793
1583 # mit "rum" bekleckern, nicht 1794 # mit "rum" bekleckern, nicht
1584 $self->_create_random_map ( 1795 $self->_create_random_map (
1585 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1796 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1586 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1797 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1587 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1798 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1709 1920
1710# the temporary/swap location 1921# the temporary/swap location
1711sub save_path { 1922sub save_path {
1712 my ($self) = @_; 1923 my ($self) = @_;
1713 1924
1714 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1925 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1715 "$TMPDIR/$path.map" 1926 "$TMPDIR/$path.map"
1716} 1927}
1717 1928
1718# the unique path, undef == no special unique path 1929# the unique path, undef == no special unique path
1719sub uniq_path { 1930sub uniq_path {
1720 my ($self) = @_; 1931 my ($self) = @_;
1721 1932
1722 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1933 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1723 "$UNIQUEDIR/$path" 1934 "$UNIQUEDIR/$path"
1724} 1935}
1725 1936
1726# and all this just because we cannot iterate over 1937# and all this just because we cannot iterate over
1727# all maps in C++... 1938# all maps in C++...
… …
1750 1961
1751sub load_header_from($) { 1962sub load_header_from($) {
1752 my ($self, $path) = @_; 1963 my ($self, $path) = @_;
1753 1964
1754 utf8::encode $path; 1965 utf8::encode $path;
1755 #aio_open $path, O_RDONLY, 0 1966 my $f = new_from_file cf::object::thawer $path
1756 # or return;
1757
1758 $self->_load_header ($path)
1759 or return; 1967 or return;
1968
1969 $self->_load_header ($f)
1970 or return;
1971
1972 local $MAP_LOADING{$self->{path}} = $self;
1973 $f->resolve_delayed_derefs;
1760 1974
1761 $self->{load_path} = $path; 1975 $self->{load_path} = $path;
1762 1976
1763 1 1977 1
1764} 1978}
… …
1818sub find { 2032sub find {
1819 my ($path, $origin) = @_; 2033 my ($path, $origin) = @_;
1820 2034
1821 $path = normalise $path, $origin && $origin->path; 2035 $path = normalise $path, $origin && $origin->path;
1822 2036
2037 cf::lock_wait "map_data:$path";#d#remove
1823 cf::lock_wait "map_find:$path"; 2038 cf::lock_wait "map_find:$path";
1824 2039
1825 $cf::MAP{$path} || do { 2040 $cf::MAP{$path} || do {
2041 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1826 my $guard = cf::lock_acquire "map_find:$path"; 2042 my $guard2 = cf::lock_acquire "map_find:$path";
2043
1827 my $map = new_from_path cf::map $path 2044 my $map = new_from_path cf::map $path
1828 or return; 2045 or return;
1829 2046
1830 $map->{last_save} = $cf::RUNTIME; 2047 $map->{last_save} = $cf::RUNTIME;
1831 2048
… …
1833 or return; 2050 or return;
1834 2051
1835 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2052 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1836 # doing this can freeze the server in a sync job, obviously 2053 # doing this can freeze the server in a sync job, obviously
1837 #$cf::WAIT_FOR_TICK->wait; 2054 #$cf::WAIT_FOR_TICK->wait;
2055 undef $guard2;
2056 undef $guard1;
1838 $map->reset; 2057 $map->reset;
1839 undef $guard;
1840 return find $path; 2058 return find $path;
1841 } 2059 }
1842 2060
1843 $cf::MAP{$path} = $map 2061 $cf::MAP{$path} = $map
1844 } 2062 }
… …
1853 local $self->{deny_reset} = 1; # loading can take a long time 2071 local $self->{deny_reset} = 1; # loading can take a long time
1854 2072
1855 my $path = $self->{path}; 2073 my $path = $self->{path};
1856 2074
1857 { 2075 {
1858 my $guard1 = cf::lock_acquire "map_data:$path"; 2076 my $guard = cf::lock_acquire "map_data:$path";
1859 my $guard2 = cf::lock_acquire "map_load:$path";
1860 2077
2078 return unless $self->valid;
1861 return if $self->in_memory != cf::MAP_SWAPPED; 2079 return unless $self->in_memory == cf::MAP_SWAPPED;
1862 2080
1863 $self->in_memory (cf::MAP_LOADING); 2081 $self->in_memory (cf::MAP_LOADING);
1864 2082
1865 $self->alloc; 2083 $self->alloc;
1866 2084
1867 $self->pre_load; 2085 $self->pre_load;
1868 cf::cede_to_tick; 2086 cf::cede_to_tick;
1869 2087
2088 my $f = new_from_file cf::object::thawer $self->{load_path};
2089 $f->skip_block;
1870 $self->_load_objects ($self->{load_path}, 1) 2090 $self->_load_objects ($f)
1871 or return; 2091 or return;
1872 2092
1873 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2093 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1874 if delete $self->{load_original}; 2094 if delete $self->{load_original};
1875 2095
1876 if (my $uniq = $self->uniq_path) { 2096 if (my $uniq = $self->uniq_path) {
1877 utf8::encode $uniq; 2097 utf8::encode $uniq;
1878 if (aio_open $uniq, O_RDONLY, 0) { 2098 unless (aio_stat $uniq) {
2099 if (my $f = new_from_file cf::object::thawer $uniq) {
1879 $self->clear_unique_items; 2100 $self->clear_unique_items;
1880 $self->_load_objects ($uniq, 0); 2101 $self->_load_objects ($f);
2102 $f->resolve_delayed_derefs;
2103 }
1881 } 2104 }
1882 } 2105 }
2106
2107 $f->resolve_delayed_derefs;
1883 2108
1884 cf::cede_to_tick; 2109 cf::cede_to_tick;
1885 # now do the right thing for maps 2110 # now do the right thing for maps
1886 $self->link_multipart_objects; 2111 $self->link_multipart_objects;
1887 $self->difficulty ($self->estimate_difficulty) 2112 $self->difficulty ($self->estimate_difficulty)
… …
1899 } 2124 }
1900 2125
1901 $self->{last_save} = $cf::RUNTIME; 2126 $self->{last_save} = $cf::RUNTIME;
1902 $self->last_access ($cf::RUNTIME); 2127 $self->last_access ($cf::RUNTIME);
1903 2128
1904 $self->in_memory (cf::MAP_IN_MEMORY); 2129 $self->in_memory (cf::MAP_ACTIVE);
1905 } 2130 }
1906 2131
1907 $self->post_load; 2132 $self->post_load;
1908} 2133}
1909 2134
… …
1967 my ($path, $origin, $load) = @_; 2192 my ($path, $origin, $load) = @_;
1968 2193
1969 $path = normalise $path, $origin && $origin->{path}; 2194 $path = normalise $path, $origin && $origin->{path};
1970 2195
1971 if (my $map = $cf::MAP{$path}) { 2196 if (my $map = $cf::MAP{$path}) {
1972 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2197 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1973 } 2198 }
1974 2199
1975 $MAP_PREFETCH{$path} |= $load; 2200 $MAP_PREFETCH{$path} |= $load;
1976 2201
1977 $MAP_PREFETCHER ||= cf::async { 2202 $MAP_PREFETCHER ||= cf::async {
2203 $Coro::current->{desc} = "map prefetcher";
2204
1978 while (%MAP_PREFETCH) { 2205 while (%MAP_PREFETCH) {
1979 while (my ($k, $v) = each %MAP_PREFETCH) { 2206 while (my ($k, $v) = each %MAP_PREFETCH) {
1980 if (my $map = find $k) { 2207 if (my $map = find $k) {
1981 $map->load if $v; 2208 $map->load if $v;
1982 } 2209 }
… …
2008 return if $self->{deny_save}; 2235 return if $self->{deny_save};
2009 2236
2010 local $self->{last_access} = $self->last_access;#d# 2237 local $self->{last_access} = $self->last_access;#d#
2011 2238
2012 cf::async { 2239 cf::async {
2240 $Coro::current->{desc} = "map player save";
2013 $_->contr->save for $self->players; 2241 $_->contr->save for $self->players;
2014 }; 2242 };
2243
2244 cf::get_slot 0.02;
2015 2245
2016 if ($uniq) { 2246 if ($uniq) {
2017 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2247 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2018 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2248 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2019 } else { 2249 } else {
… …
2028 $self->save; 2258 $self->save;
2029 2259
2030 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2031 2261
2032 return if $self->players; 2262 return if $self->players;
2033 return if $self->in_memory != cf::MAP_IN_MEMORY; 2263 return if $self->in_memory != cf::MAP_ACTIVE;
2034 return if $self->{deny_save}; 2264 return if $self->{deny_save};
2035 2265
2266 $self->in_memory (cf::MAP_SWAPPED);
2267
2268 $self->deactivate;
2269 $_->clear_links_to ($self) for values %cf::MAP;
2036 $self->clear; 2270 $self->clear;
2037 $self->in_memory (cf::MAP_SWAPPED);
2038} 2271}
2039 2272
2040sub reset_at { 2273sub reset_at {
2041 my ($self) = @_; 2274 my ($self) = @_;
2042 2275
… …
2074 if $uniq; 2307 if $uniq;
2075 } 2308 }
2076 2309
2077 delete $cf::MAP{$self->path}; 2310 delete $cf::MAP{$self->path};
2078 2311
2312 $self->deactivate;
2313 $_->clear_links_to ($self) for values %cf::MAP;
2079 $self->clear; 2314 $self->clear;
2080
2081 $_->clear_links_to ($self) for values %cf::MAP;
2082 2315
2083 $self->unlink_save; 2316 $self->unlink_save;
2084 $self->destroy; 2317 $self->destroy;
2085} 2318}
2086 2319
… …
2153 2386
2154sub unique_maps() { 2387sub unique_maps() {
2155 [ 2388 [
2156 map { 2389 map {
2157 utf8::decode $_; 2390 utf8::decode $_;
2158 /\.map$/ 2391 s/\.map$//; # TODO future compatibility hack
2392 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2393 ? ()
2159 ? normalise $_ 2394 : normalise $_
2160 : ()
2161 } @{ aio_readdir $UNIQUEDIR or [] } 2395 } @{ aio_readdir $UNIQUEDIR or [] }
2162 ] 2396 ]
2163} 2397}
2164 2398
2165package cf;
2166
2167=back 2399=back
2168 2400
2169=head3 cf::object 2401=head3 cf::object
2170 2402
2171=cut 2403=cut
… …
2174 2406
2175=over 4 2407=over 4
2176 2408
2177=item $ob->inv_recursive 2409=item $ob->inv_recursive
2178 2410
2179Returns the inventory of the object _and_ their inventories, recursively. 2411Returns the inventory of the object I<and> their inventories, recursively,
2412but I<not> the object itself.
2180 2413
2181=cut 2414=cut
2182 2415
2183sub inv_recursive_; 2416sub inv_recursive_;
2184sub inv_recursive_ { 2417sub inv_recursive_ {
… …
2187 2420
2188sub inv_recursive { 2421sub inv_recursive {
2189 inv_recursive_ inv $_[0] 2422 inv_recursive_ inv $_[0]
2190} 2423}
2191 2424
2425=item $ref = $ob->ref
2426
2427Creates and returns a persistent reference to an object that can be stored as a string.
2428
2429=item $ob = cf::object::deref ($refstring)
2430
2431returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2432even if the object actually exists. May block.
2433
2434=cut
2435
2436sub deref {
2437 my ($ref) = @_;
2438
2439 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2440 my ($uuid, $name) = ($1, $2);
2441 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2442 or return;
2443 $pl->ob->uuid eq $uuid
2444 or return;
2445
2446 $pl->ob
2447 } else {
2448 warn "$ref: cannot resolve object reference\n";
2449 undef
2450 }
2451}
2452
2192package cf; 2453package cf;
2193 2454
2194=back 2455=back
2195 2456
2196=head3 cf::object::player 2457=head3 cf::object::player
… …
2202Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2463Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2203can be C<undef>. Does the right thing when the player is currently in a 2464can be C<undef>. Does the right thing when the player is currently in a
2204dialogue with the given NPC character. 2465dialogue with the given NPC character.
2205 2466
2206=cut 2467=cut
2468
2469our $SAY_CHANNEL = {
2470 id => "say",
2471 title => "Map",
2472 reply => "say ",
2473 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2474};
2475
2476our $CHAT_CHANNEL = {
2477 id => "chat",
2478 title => "Chat",
2479 reply => "chat ",
2480 tooltip => "Player chat and shouts, global to the server.",
2481};
2207 2482
2208# rough implementation of a future "reply" method that works 2483# rough implementation of a future "reply" method that works
2209# with dialog boxes. 2484# with dialog boxes.
2210#TODO: the first argument must go, split into a $npc->reply_to ( method 2485#TODO: the first argument must go, split into a $npc->reply_to ( method
2211sub cf::object::player::reply($$$;$) { 2486sub cf::object::player::reply($$$;$) {
… …
2223 my $dialog = $pl->{npc_dialog}; 2498 my $dialog = $pl->{npc_dialog};
2224 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2499 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2225 2500
2226 } else { 2501 } else {
2227 $msg = $npc->name . " says: $msg" if $npc; 2502 $msg = $npc->name . " says: $msg" if $npc;
2228 $self->message ($msg, $flags); 2503 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2229 } 2504 }
2230 } 2505 }
2231} 2506}
2232 2507
2233=item $object->send_msg ($channel, $msg, $color, [extra...]) 2508=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2354 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2629 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2355 2630
2356 $self->enter_link; 2631 $self->enter_link;
2357 2632
2358 (async { 2633 (async {
2634 $Coro::current->{desc} = "player::goto $path $x $y";
2635
2636 # *tag paths override both path and x|y
2637 if ($path =~ /^\*(.*)$/) {
2638 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2639 my $ob = $obs[rand @obs];
2640
2641 # see if we actually can go there
2642 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2643 $ob = $obs[rand @obs];
2644 } else {
2645 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2646 }
2647 # else put us there anyways for now #d#
2648
2649 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2650 } else {
2651 ($path, $x, $y) = (undef, undef, undef);
2652 }
2653 }
2654
2359 my $map = eval { 2655 my $map = eval {
2360 my $map = cf::map::find $path; 2656 my $map = defined $path ? cf::map::find $path : undef;
2361 2657
2362 if ($map) { 2658 if ($map) {
2363 $map = $map->customise_for ($self); 2659 $map = $map->customise_for ($self);
2364 $map = $check->($map) if $check && $map; 2660 $map = $check->($map) if $check && $map;
2365 } else { 2661 } else {
2366 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2662 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2367 } 2663 }
2368 2664
2369 $map 2665 $map
2370 }; 2666 };
2371 2667
… …
2407} 2703}
2408 2704
2409sub prepare_random_map { 2705sub prepare_random_map {
2410 my ($exit) = @_; 2706 my ($exit) = @_;
2411 2707
2412 my $guard = cf::lock_acquire "exit_prepare:$exit";
2413
2414 # all this does is basically replace the /! path by 2708 # all this does is basically replace the /! path by
2415 # a new random map path (?random/...) with a seed 2709 # a new random map path (?random/...) with a seed
2416 # that depends on the exit object 2710 # that depends on the exit object
2417 2711
2418 my $rmp = parse_random_map_params $exit->msg; 2712 my $rmp = parse_random_map_params $exit->msg;
… …
2420 if ($exit->map) { 2714 if ($exit->map) {
2421 $rmp->{region} = $exit->region->name; 2715 $rmp->{region} = $exit->region->name;
2422 $rmp->{origin_map} = $exit->map->path; 2716 $rmp->{origin_map} = $exit->map->path;
2423 $rmp->{origin_x} = $exit->x; 2717 $rmp->{origin_x} = $exit->x;
2424 $rmp->{origin_y} = $exit->y; 2718 $rmp->{origin_y} = $exit->y;
2719
2720 $exit->map->touch;
2425 } 2721 }
2426 2722
2427 $rmp->{random_seed} ||= $exit->random_seed; 2723 $rmp->{random_seed} ||= $exit->random_seed;
2428 2724
2429 my $data = cf::to_json $rmp; 2725 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2430 my $md5 = Digest::MD5::md5_hex $data; 2726 my $md5 = Digest::MD5::md5_hex $data;
2431 my $meta = "$RANDOMDIR/$md5.meta"; 2727 my $meta = "$RANDOMDIR/$md5.meta";
2432 2728
2433 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2729 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2434 aio_write $fh, 0, (length $data), $data, 0; 2730 aio_write $fh, 0, (length $data), $data, 0;
2435 undef $fh; 2731 undef $fh;
2436 aio_rename "$meta~", $meta; 2732 aio_rename "$meta~", $meta;
2437 2733
2734 my $slaying = "?random/$md5";
2735
2736 if ($exit->valid) {
2438 $exit->slaying ("?random/$md5"); 2737 $exit->slaying ("?random/$md5");
2439 $exit->msg (undef); 2738 $exit->msg (undef);
2739 }
2440 } 2740 }
2441} 2741}
2442 2742
2443sub cf::object::player::enter_exit { 2743sub cf::object::player::enter_exit {
2444 my ($self, $exit) = @_; 2744 my ($self, $exit) = @_;
2445 2745
2446 return unless $self->type == cf::PLAYER; 2746 return unless $self->type == cf::PLAYER;
2447 2747
2448 if ($exit->slaying eq "/!") {
2449 #TODO: this should de-fi-ni-te-ly not be a sync-job
2450 # the problem is that $exit might not survive long enough
2451 # so it needs to be done right now, right here
2452 cf::sync_job { prepare_random_map $exit };
2453 }
2454
2455 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2456 my $hp = $exit->stats->hp;
2457 my $sp = $exit->stats->sp;
2458
2459 $self->enter_link; 2748 $self->enter_link;
2460 2749
2461 # if exit is damned, update players death & WoR home-position
2462 $self->contr->savebed ($slaying, $hp, $sp)
2463 if $exit->flag (FLAG_DAMNED);
2464
2465 (async { 2750 (async {
2466 $self->deactivate_recursive; # just to be sure 2751 $Coro::current->{desc} = "enter_exit";
2752
2467 unless (eval { 2753 unless (eval {
2754 $self->deactivate_recursive; # just to be sure
2755
2756 # random map handling
2757 {
2758 my $guard = cf::lock_acquire "exit_prepare:$exit";
2759
2760 prepare_random_map $exit
2761 if $exit->slaying eq "/!";
2762 }
2763
2764 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2765 my $x = $exit->stats->hp;
2766 my $y = $exit->stats->sp;
2767
2468 $self->goto ($slaying, $hp, $sp); 2768 $self->goto ($map, $x, $y);
2469 2769
2770 # if exit is damned, update players death & WoR home-position
2771 $self->contr->savebed ($map, $x, $y)
2772 if $exit->flag (cf::FLAG_DAMNED);
2773
2470 1; 2774 1
2471 }) { 2775 }) {
2472 $self->message ("Something went wrong deep within the crossfire server. " 2776 $self->message ("Something went wrong deep within the crossfire server. "
2473 . "I'll try to bring you back to the map you were before. " 2777 . "I'll try to bring you back to the map you were before. "
2474 . "Please report this to the dungeon master!", 2778 . "Please report this to the dungeon master!",
2475 cf::NDI_UNIQUE | cf::NDI_RED); 2779 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2505the message, with C<log> being the default. If C<$color> is negative, suppress 2809the message, with C<log> being the default. If C<$color> is negative, suppress
2506the message unless the client supports the msg packet. 2810the message unless the client supports the msg packet.
2507 2811
2508=cut 2812=cut
2509 2813
2814# non-persistent channels (usually the info channel)
2510our %CHANNEL = ( 2815our %CHANNEL = (
2511 "c/identify" => { 2816 "c/identify" => {
2512 id => "identify", 2817 id => "infobox",
2513 title => "Identify", 2818 title => "Identify",
2514 reply => undef, 2819 reply => undef,
2515 tooltip => "Items recently identified", 2820 tooltip => "Items recently identified",
2516 }, 2821 },
2517 "c/examine" => { 2822 "c/examine" => {
2518 id => "examine", 2823 id => "infobox",
2519 title => "Examine", 2824 title => "Examine",
2520 reply => undef, 2825 reply => undef,
2521 tooltip => "Signs and other items you examined", 2826 tooltip => "Signs and other items you examined",
2522 }, 2827 },
2828 "c/book" => {
2829 id => "infobox",
2830 title => "Book",
2831 reply => undef,
2832 tooltip => "The contents of a note or book",
2833 },
2834 "c/lookat" => {
2835 id => "infobox",
2836 title => "Look",
2837 reply => undef,
2838 tooltip => "What you saw there",
2839 },
2840 "c/who" => {
2841 id => "infobox",
2842 title => "Players",
2843 reply => undef,
2844 tooltip => "Shows players who are currently online",
2845 },
2846 "c/body" => {
2847 id => "infobox",
2848 title => "Body Parts",
2849 reply => undef,
2850 tooltip => "Shows which body parts you posess and are available",
2851 },
2852 "c/uptime" => {
2853 id => "infobox",
2854 title => "Uptime",
2855 reply => undef,
2856 tooltip => "How long the server has been running since last restart",
2857 },
2858 "c/mapinfo" => {
2859 id => "infobox",
2860 title => "Map Info",
2861 reply => undef,
2862 tooltip => "Information related to the maps",
2863 },
2864 "c/party" => {
2865 id => "party",
2866 title => "Party",
2867 reply => "gsay ",
2868 tooltip => "Messages and chat related to your party",
2869 },
2523); 2870);
2524 2871
2525sub cf::client::send_msg { 2872sub cf::client::send_msg {
2526 my ($self, $channel, $msg, $color, @extra) = @_; 2873 my ($self, $channel, $msg, $color, @extra) = @_;
2527 2874
2528 $msg = $self->pl->expand_cfpod ($msg); 2875 $msg = $self->pl->expand_cfpod ($msg);
2529 2876
2530 $color &= cf::NDI_CLIENT_MASK; # just in case... 2877 $color &= cf::NDI_CLIENT_MASK; # just in case...
2531 2878
2532 # check predefined channels, for the benefit of C 2879 # check predefined channels, for the benefit of C
2533 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2880 if ($CHANNEL{$channel}) {
2881 $channel = $CHANNEL{$channel};
2534 2882
2883 $self->ext_msg (channel_info => $channel)
2884 if $self->can_msg;
2885
2886 $channel = $channel->{id};
2887
2535 if (ref $channel) { 2888 } elsif (ref $channel) {
2536 # send meta info to client, if not yet sent 2889 # send meta info to client, if not yet sent
2537 unless (exists $self->{channel}{$channel->{id}}) { 2890 unless (exists $self->{channel}{$channel->{id}}) {
2538 $self->{channel}{$channel->{id}} = $channel; 2891 $self->{channel}{$channel->{id}} = $channel;
2539 $self->ext_msg (channel_info => $channel) 2892 $self->ext_msg (channel_info => $channel)
2540 if $self->can_msg; 2893 if $self->can_msg;
… …
2757=pod 3110=pod
2758 3111
2759The following functions and methods are available within a safe environment: 3112The following functions and methods are available within a safe environment:
2760 3113
2761 cf::object 3114 cf::object
2762 contr pay_amount pay_player map x y force_find force_add 3115 contr pay_amount pay_player map x y force_find force_add destroy
2763 insert remove name archname title slaying race decrease_ob_nr 3116 insert remove name archname title slaying race decrease split
2764 3117
2765 cf::object::player 3118 cf::object::player
2766 player 3119 player
2767 3120
2768 cf::player 3121 cf::player
… …
2773 3126
2774=cut 3127=cut
2775 3128
2776for ( 3129for (
2777 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3130 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2778 insert remove inv name archname title slaying race 3131 insert remove inv nrof name archname title slaying race
2779 decrease_ob_nr)], 3132 decrease split destroy)],
2780 ["cf::object::player" => qw(player)], 3133 ["cf::object::player" => qw(player)],
2781 ["cf::player" => qw(peaceful)], 3134 ["cf::player" => qw(peaceful)],
2782 ["cf::map" => qw(trigger)], 3135 ["cf::map" => qw(trigger)],
2783) { 3136) {
2784 no strict 'refs'; 3137 no strict 'refs';
… …
2889 { 3242 {
2890 my $faces = $facedata->{faceinfo}; 3243 my $faces = $facedata->{faceinfo};
2891 3244
2892 while (my ($face, $info) = each %$faces) { 3245 while (my ($face, $info) = each %$faces) {
2893 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3246 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3247
2894 cf::face::set_visibility $idx, $info->{visibility}; 3248 cf::face::set_visibility $idx, $info->{visibility};
2895 cf::face::set_magicmap $idx, $info->{magicmap}; 3249 cf::face::set_magicmap $idx, $info->{magicmap};
2896 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3250 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2897 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3251 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2898 3252
2899 cf::cede_to_tick; 3253 cf::cede_to_tick;
2900 } 3254 }
2901 3255
2902 while (my ($face, $info) = each %$faces) { 3256 while (my ($face, $info) = each %$faces) {
2903 next unless $info->{smooth}; 3257 next unless $info->{smooth};
3258
2904 my $idx = cf::face::find $face 3259 my $idx = cf::face::find $face
2905 or next; 3260 or next;
3261
2906 if (my $smooth = cf::face::find $info->{smooth}) { 3262 if (my $smooth = cf::face::find $info->{smooth}) {
2907 cf::face::set_smooth $idx, $smooth; 3263 cf::face::set_smooth $idx, $smooth;
2908 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3264 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2909 } else { 3265 } else {
2910 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3266 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
2928 { 3284 {
2929 # TODO: for gcfclient pleasure, we should give resources 3285 # TODO: for gcfclient pleasure, we should give resources
2930 # that gcfclient doesn't grok a >10000 face index. 3286 # that gcfclient doesn't grok a >10000 face index.
2931 my $res = $facedata->{resource}; 3287 my $res = $facedata->{resource};
2932 3288
2933 my $soundconf = delete $res->{"res/sound.conf"};
2934
2935 while (my ($name, $info) = each %$res) { 3289 while (my ($name, $info) = each %$res) {
3290 if (defined $info->{type}) {
2936 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3291 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2937 my $data; 3292 my $data;
2938 3293
2939 if ($info->{type} & 1) { 3294 if ($info->{type} & 1) {
2940 # prepend meta info 3295 # prepend meta info
2941 3296
2942 my $meta = $enc->encode ({ 3297 my $meta = $enc->encode ({
2943 name => $name, 3298 name => $name,
2944 %{ $info->{meta} || {} }, 3299 %{ $info->{meta} || {} },
2945 }); 3300 });
2946 3301
2947 $data = pack "(w/a*)*", $meta, $info->{data}; 3302 $data = pack "(w/a*)*", $meta, $info->{data};
3303 } else {
3304 $data = $info->{data};
3305 }
3306
3307 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3308 cf::face::set_type $idx, $info->{type};
2948 } else { 3309 } else {
2949 $data = $info->{data}; 3310 $RESOURCE{$name} = $info;
2950 } 3311 }
2951 3312
2952 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2953 cf::face::set_type $idx, $info->{type};
2954
2955 cf::cede_to_tick; 3313 cf::cede_to_tick;
2956 } 3314 }
2957
2958 if ($soundconf) {
2959 $soundconf = $enc->decode (delete $soundconf->{data});
2960
2961 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2962 my $sound = $soundconf->{compat}[$_]
2963 or next;
2964
2965 my $face = cf::face::find "sound/$sound->[1]";
2966 cf::sound::set $sound->[0] => $face;
2967 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2968 }
2969
2970 while (my ($k, $v) = each %{$soundconf->{event}}) {
2971 my $face = cf::face::find "sound/$v";
2972 cf::sound::set $k => $face;
2973 }
2974 }
2975 } 3315 }
3316
3317 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2976 3318
2977 1 3319 1
2978} 3320}
3321
3322cf::global->attach (on_resource_update => sub {
3323 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3324 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3325
3326 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3327 my $sound = $soundconf->{compat}[$_]
3328 or next;
3329
3330 my $face = cf::face::find "sound/$sound->[1]";
3331 cf::sound::set $sound->[0] => $face;
3332 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3333 }
3334
3335 while (my ($k, $v) = each %{$soundconf->{event}}) {
3336 my $face = cf::face::find "sound/$v";
3337 cf::sound::set $k => $face;
3338 }
3339 }
3340});
2979 3341
2980register_exticmd fx_want => sub { 3342register_exticmd fx_want => sub {
2981 my ($ns, $want) = @_; 3343 my ($ns, $want) = @_;
2982 3344
2983 while (my ($k, $v) = each %$want) { 3345 while (my ($k, $v) = each %$want) {
2984 $ns->fx_want ($k, $v); 3346 $ns->fx_want ($k, $v);
2985 } 3347 }
2986}; 3348};
3349
3350sub load_resource_file($) {
3351 my $guard = lock_acquire "load_resource_file";
3352
3353 my $status = load_resource_file_ $_[0];
3354 get_slot 0.1, 100;
3355 cf::arch::commit_load;
3356
3357 $status
3358}
2987 3359
2988sub reload_regions { 3360sub reload_regions {
2989 # HACK to clear player env face cache, we need some signal framework 3361 # HACK to clear player env face cache, we need some signal framework
2990 # for this (global event?) 3362 # for this (global event?)
2991 %ext::player_env::MUSIC_FACE_CACHE = (); 3363 %ext::player_env::MUSIC_FACE_CACHE = ();
… …
3005} 3377}
3006 3378
3007sub reload_archetypes { 3379sub reload_archetypes {
3008 load_resource_file "$DATADIR/archetypes" 3380 load_resource_file "$DATADIR/archetypes"
3009 or die "unable to load archetypes\n"; 3381 or die "unable to load archetypes\n";
3010 #d# NEED to laod twice to resolve forward references
3011 # this really needs to be done in an extra post-pass
3012 # (which needs to be synchronous, so solve it differently)
3013 load_resource_file "$DATADIR/archetypes"
3014 or die "unable to load archetypes\n";
3015} 3382}
3016 3383
3017sub reload_treasures { 3384sub reload_treasures {
3018 load_resource_file "$DATADIR/treasures" 3385 load_resource_file "$DATADIR/treasures"
3019 or die "unable to load treasurelists\n"; 3386 or die "unable to load treasurelists\n";
3020} 3387}
3021 3388
3022sub reload_resources { 3389sub reload_resources {
3023 warn "reloading resource files...\n"; 3390 warn "reloading resource files...\n";
3024 3391
3392 reload_facedata;
3393 reload_archetypes;
3025 reload_regions; 3394 reload_regions;
3026 reload_facedata;
3027 #reload_archetypes;#d#
3028 reload_archetypes;
3029 reload_treasures; 3395 reload_treasures;
3030 3396
3031 warn "finished reloading resource files\n"; 3397 warn "finished reloading resource files\n";
3032} 3398}
3033 3399
3034sub init { 3400sub init {
3401 my $guard = freeze_mainloop;
3402
3035 reload_resources; 3403 reload_resources;
3036} 3404}
3037 3405
3038sub reload_config { 3406sub reload_config {
3039 open my $fh, "<:utf8", "$CONFDIR/config" 3407 open my $fh, "<:utf8", "$CONFDIR/config"
3040 or return; 3408 or return;
3041 3409
3042 local $/; 3410 local $/;
3043 *CFG = YAML::Syck::Load <$fh>; 3411 *CFG = YAML::Load <$fh>;
3044 3412
3045 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3413 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3046 3414
3047 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3415 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3048 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3416 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3059sub main { 3427sub main {
3060 # we must not ever block the main coroutine 3428 # we must not ever block the main coroutine
3061 local $Coro::idle = sub { 3429 local $Coro::idle = sub {
3062 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3430 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3063 (async { 3431 (async {
3064 Event::one_event; 3432 $Coro::current->{desc} = "IDLE BUG HANDLER";
3433 EV::loop EV::LOOP_ONESHOT;
3065 })->prio (Coro::PRIO_MAX); 3434 })->prio (Coro::PRIO_MAX);
3066 }; 3435 };
3067 3436
3437 {
3438 my $guard = freeze_mainloop;
3068 reload_config; 3439 reload_config;
3069 db_init; 3440 db_init;
3070 load_extensions; 3441 load_extensions;
3071 3442
3072 $TICK_WATCHER->start; 3443 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3444 }
3445
3073 Event::loop; 3446 EV::loop;
3074} 3447}
3075 3448
3076############################################################################# 3449#############################################################################
3077# initialisation and cleanup 3450# initialisation and cleanup
3078 3451
3079# install some emergency cleanup handlers 3452# install some emergency cleanup handlers
3080BEGIN { 3453BEGIN {
3454 our %SIGWATCHER = ();
3081 for my $signal (qw(INT HUP TERM)) { 3455 for my $signal (qw(INT HUP TERM)) {
3082 Event->signal ( 3456 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3083 reentrant => 0,
3084 data => WF_AUTOCANCEL,
3085 signal => $signal,
3086 prio => 0,
3087 cb => sub {
3088 cf::cleanup "SIG$signal"; 3457 cf::cleanup "SIG$signal";
3089 },
3090 ); 3458 };
3091 } 3459 }
3092} 3460}
3093 3461
3094sub write_runtime { 3462sub write_runtime_sync {
3095 my $runtime = "$LOCALDIR/runtime"; 3463 my $runtime = "$LOCALDIR/runtime";
3096 3464
3097 # first touch the runtime file to show we are still running: 3465 # first touch the runtime file to show we are still running:
3098 # the fsync below can take a very very long time. 3466 # the fsync below can take a very very long time.
3099 3467
… …
3125 and return; 3493 and return;
3126 3494
3127 warn "runtime file written.\n"; 3495 warn "runtime file written.\n";
3128 3496
3129 1 3497 1
3498}
3499
3500our $uuid_lock;
3501our $uuid_skip;
3502
3503sub write_uuid_sync($) {
3504 $uuid_skip ||= $_[0];
3505
3506 return if $uuid_lock;
3507 local $uuid_lock = 1;
3508
3509 my $uuid = "$LOCALDIR/uuid";
3510
3511 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3512 or return;
3513
3514 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3515 $uuid_skip = 0;
3516
3517 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3518 and return;
3519
3520 # always fsync - this file is important
3521 aio_fsync $fh
3522 and return;
3523
3524 close $fh
3525 or return;
3526
3527 aio_rename "$uuid~", $uuid
3528 and return;
3529
3530 warn "uuid file written ($value).\n";
3531
3532 1
3533
3534}
3535
3536sub write_uuid($$) {
3537 my ($skip, $sync) = @_;
3538
3539 $sync ? write_uuid_sync $skip
3540 : async { write_uuid_sync $skip };
3130} 3541}
3131 3542
3132sub emergency_save() { 3543sub emergency_save() {
3133 my $freeze_guard = cf::freeze_mainloop; 3544 my $freeze_guard = cf::freeze_mainloop;
3134 3545
… …
3140 # and maps saved/destroyed asynchronously. 3551 # and maps saved/destroyed asynchronously.
3141 warn "begin emergency player save\n"; 3552 warn "begin emergency player save\n";
3142 for my $login (keys %cf::PLAYER) { 3553 for my $login (keys %cf::PLAYER) {
3143 my $pl = $cf::PLAYER{$login} or next; 3554 my $pl = $cf::PLAYER{$login} or next;
3144 $pl->valid or next; 3555 $pl->valid or next;
3556 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3145 $pl->save; 3557 $pl->save;
3146 } 3558 }
3147 warn "end emergency player save\n"; 3559 warn "end emergency player save\n";
3148 3560
3149 warn "begin emergency map save\n"; 3561 warn "begin emergency map save\n";
… …
3155 warn "end emergency map save\n"; 3567 warn "end emergency map save\n";
3156 3568
3157 warn "begin emergency database checkpoint\n"; 3569 warn "begin emergency database checkpoint\n";
3158 BDB::db_env_txn_checkpoint $DB_ENV; 3570 BDB::db_env_txn_checkpoint $DB_ENV;
3159 warn "end emergency database checkpoint\n"; 3571 warn "end emergency database checkpoint\n";
3572
3573 warn "begin write uuid\n";
3574 write_uuid_sync 1;
3575 warn "end write uuid\n";
3160 }; 3576 };
3161 3577
3162 warn "leave emergency perl save\n"; 3578 warn "leave emergency perl save\n";
3163} 3579}
3164 3580
… …
3179 warn "reloading..."; 3595 warn "reloading...";
3180 3596
3181 warn "entering sync_job"; 3597 warn "entering sync_job";
3182 3598
3183 cf::sync_job { 3599 cf::sync_job {
3184 cf::write_runtime; # external watchdog should not bark 3600 cf::write_runtime_sync; # external watchdog should not bark
3185 cf::emergency_save; 3601 cf::emergency_save;
3186 cf::write_runtime; # external watchdog should not bark 3602 cf::write_runtime_sync; # external watchdog should not bark
3187 3603
3188 warn "syncing database to disk"; 3604 warn "syncing database to disk";
3189 BDB::db_env_txn_checkpoint $DB_ENV; 3605 BDB::db_env_txn_checkpoint $DB_ENV;
3190 3606
3191 # if anything goes wrong in here, we should simply crash as we already saved 3607 # if anything goes wrong in here, we should simply crash as we already saved
3192
3193 warn "cancelling all WF_AUTOCANCEL watchers";
3194 for (Event::all_watchers) {
3195 $_->cancel if $_->data & WF_AUTOCANCEL;
3196 }
3197 3608
3198 warn "flushing outstanding aio requests"; 3609 warn "flushing outstanding aio requests";
3199 for (;;) { 3610 for (;;) {
3200 BDB::flush; 3611 BDB::flush;
3201 IO::AIO::flush; 3612 IO::AIO::flush;
3202 Coro::cede; 3613 Coro::cede_notself;
3203 last unless IO::AIO::nreqs || BDB::nreqs; 3614 last unless IO::AIO::nreqs || BDB::nreqs;
3204 warn "iterate..."; 3615 warn "iterate...";
3205 } 3616 }
3206 3617
3207 ++$RELOAD; 3618 ++$RELOAD;
… …
3283 warn "leaving sync_job"; 3694 warn "leaving sync_job";
3284 3695
3285 1 3696 1
3286 } or do { 3697 } or do {
3287 warn $@; 3698 warn $@;
3288 warn "error while reloading, exiting."; 3699 cf::cleanup "error while reloading, exiting.";
3289 exit 1;
3290 }; 3700 };
3291 3701
3292 warn "reloaded"; 3702 warn "reloaded";
3293}; 3703};
3294 3704
… …
3296 3706
3297sub reload_perl() { 3707sub reload_perl() {
3298 # doing reload synchronously and two reloads happen back-to-back, 3708 # doing reload synchronously and two reloads happen back-to-back,
3299 # coro crashes during coro_state_free->destroy here. 3709 # coro crashes during coro_state_free->destroy here.
3300 3710
3301 $RELOAD_WATCHER ||= Event->timer ( 3711 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3302 reentrant => 0,
3303 after => 0,
3304 data => WF_AUTOCANCEL,
3305 cb => sub {
3306 do_reload_perl; 3712 do_reload_perl;
3307 undef $RELOAD_WATCHER; 3713 undef $RELOAD_WATCHER;
3308 },
3309 ); 3714 };
3310} 3715}
3311 3716
3312register_command "reload" => sub { 3717register_command "reload" => sub {
3313 my ($who, $arg) = @_; 3718 my ($who, $arg) = @_;
3314 3719
3315 if ($who->flag (FLAG_WIZ)) { 3720 if ($who->flag (FLAG_WIZ)) {
3316 $who->message ("reloading server."); 3721 $who->message ("reloading server.");
3722 async {
3723 $Coro::current->{desc} = "perl_reload";
3317 async { reload_perl }; 3724 reload_perl;
3725 };
3318 } 3726 }
3319}; 3727};
3320 3728
3321unshift @INC, $LIBDIR; 3729unshift @INC, $LIBDIR;
3322 3730
… …
3324 3732
3325our @WAIT_FOR_TICK; 3733our @WAIT_FOR_TICK;
3326our @WAIT_FOR_TICK_BEGIN; 3734our @WAIT_FOR_TICK_BEGIN;
3327 3735
3328sub wait_for_tick { 3736sub wait_for_tick {
3329 return unless $TICK_WATCHER->is_active;
3330 return if $Coro::current == $Coro::main; 3737 return if tick_inhibit || $Coro::current == $Coro::main;
3331 3738
3332 my $signal = new Coro::Signal; 3739 my $signal = new Coro::Signal;
3333 push @WAIT_FOR_TICK, $signal; 3740 push @WAIT_FOR_TICK, $signal;
3334 $signal->wait; 3741 $signal->wait;
3335} 3742}
3336 3743
3337sub wait_for_tick_begin { 3744sub wait_for_tick_begin {
3338 return unless $TICK_WATCHER->is_active;
3339 return if $Coro::current == $Coro::main; 3745 return if tick_inhibit || $Coro::current == $Coro::main;
3340 3746
3341 my $signal = new Coro::Signal; 3747 my $signal = new Coro::Signal;
3342 push @WAIT_FOR_TICK_BEGIN, $signal; 3748 push @WAIT_FOR_TICK_BEGIN, $signal;
3343 $signal->wait; 3749 $signal->wait;
3344} 3750}
3345 3751
3346 my $min = 1e6;#d# 3752sub tick {
3347 my $avg = 10;
3348$TICK_WATCHER = Event->timer (
3349 reentrant => 0,
3350 parked => 1,
3351 prio => 0,
3352 at => $NEXT_TICK || $TICK,
3353 data => WF_AUTOCANCEL,
3354 cb => sub {
3355 if ($Coro::current != $Coro::main) { 3753 if ($Coro::current != $Coro::main) {
3356 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3754 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3357 unless ++$bug_warning > 10; 3755 unless ++$bug_warning > 10;
3358 return; 3756 return;
3359 } 3757 }
3360 3758
3361 $NOW = $tick_start = Event::time;
3362
3363 cf::server_tick; # one server iteration 3759 cf::server_tick; # one server iteration
3364 3760
3365 0 && sync_job {#d# 3761 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3366 for(1..10) { 3762 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3367 my $t = Event::time; 3763 Coro::async_pool {
3368 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3764 $Coro::current->{desc} = "runtime saver";
3369 or die; 3765 write_runtime_sync
3370 3766 or warn "ERROR: unable to write runtime file: $!";
3371 $map->width (50);
3372 $map->height (50);
3373 $map->alloc;
3374 $map->_load_objects ("/tmp/x.map", 1);
3375 my $t = Event::time - $t;
3376
3377 #next unless $t < 0.0013;#d#
3378 if ($t < $min) {
3379 $min = $t;
3380 }
3381 $avg = $avg * 0.99 + $t * 0.01;
3382 }
3383 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3384 exit 0;
3385 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3386 }; 3767 };
3768 }
3387 3769
3388 $RUNTIME += $TICK;
3389 $NEXT_TICK += $TICK;
3390
3391 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3392 $NEXT_RUNTIME_WRITE = $NOW + 10;
3393 Coro::async_pool {
3394 write_runtime
3395 or warn "ERROR: unable to write runtime file: $!";
3396 };
3397 }
3398
3399# my $AFTER = Event::time;
3400# warn $AFTER - $NOW;#d#
3401
3402 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3770 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3403 $sig->send; 3771 $sig->send;
3404 } 3772 }
3405 while (my $sig = shift @WAIT_FOR_TICK) { 3773 while (my $sig = shift @WAIT_FOR_TICK) {
3406 $sig->send; 3774 $sig->send;
3407 } 3775 }
3408 3776
3409 $NOW = Event::time; 3777 $LOAD = ($NOW - $TICK_START) / $TICK;
3410
3411 # if we are delayed by four ticks or more, skip them all
3412 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3413
3414 $TICK_WATCHER->at ($NEXT_TICK);
3415 $TICK_WATCHER->start;
3416
3417 $LOAD = ($NOW - $tick_start) / $TICK;
3418 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3778 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3419 3779
3420 _post_tick; 3780 if (0) {
3421 3781 if ($NEXT_TICK) {
3422 3782 my $jitter = $TICK_START - $NEXT_TICK;
3783 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3784 warn "jitter $JITTER\n";#d#
3785 }
3423 }, 3786 }
3424); 3787}
3425 3788
3426{ 3789{
3427 BDB::max_poll_time $TICK * 0.1; 3790 # configure BDB
3428 $BDB_POLL_WATCHER = Event->io ( 3791
3429 reentrant => 0,
3430 fd => BDB::poll_fileno,
3431 poll => 'r',
3432 prio => 0,
3433 data => WF_AUTOCANCEL,
3434 cb => \&BDB::poll_cb,
3435 );
3436 BDB::min_parallel 8; 3792 BDB::min_parallel 8;
3437 3793 BDB::max_poll_reqs $TICK * 0.1;
3438 BDB::set_sync_prepare { 3794 $AnyEvent::BDB::WATCHER->priority (1);
3439 my $status;
3440 my $current = $Coro::current;
3441 (
3442 sub {
3443 $status = $!;
3444 $current->ready; undef $current;
3445 },
3446 sub {
3447 Coro::schedule while defined $current;
3448 $! = $status;
3449 },
3450 )
3451 };
3452 3795
3453 unless ($DB_ENV) { 3796 unless ($DB_ENV) {
3454 $DB_ENV = BDB::db_env_create; 3797 $DB_ENV = BDB::db_env_create;
3798 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3799 | BDB::LOG_AUTOREMOVE, 1);
3800 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3801 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3455 3802
3456 cf::sync_job { 3803 cf::sync_job {
3457 eval { 3804 eval {
3458 BDB::db_env_open 3805 BDB::db_env_open
3459 $DB_ENV, 3806 $DB_ENV,
… …
3461 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3808 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3462 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3809 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3463 0666; 3810 0666;
3464 3811
3465 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3812 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3466
3467 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3468 $DB_ENV->set_lk_detect;
3469 }; 3813 };
3470 3814
3471 cf::cleanup "db_env_open(db): $@" if $@; 3815 cf::cleanup "db_env_open(db): $@" if $@;
3472 }; 3816 };
3473 } 3817 }
3818
3819 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3820 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3821 };
3822 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3823 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3824 };
3825 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3826 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3827 };
3474} 3828}
3475 3829
3476{ 3830{
3831 # configure IO::AIO
3832
3477 IO::AIO::min_parallel 8; 3833 IO::AIO::min_parallel 8;
3478
3479 undef $Coro::AIO::WATCHER;
3480 IO::AIO::max_poll_time $TICK * 0.1; 3834 IO::AIO::max_poll_time $TICK * 0.1;
3481 $AIO_POLL_WATCHER = Event->io ( 3835 #undef $AnyEvent::AIO::WATCHER;
3482 reentrant => 0,
3483 data => WF_AUTOCANCEL,
3484 fd => IO::AIO::poll_fileno,
3485 poll => 'r',
3486 prio => 6,
3487 cb => \&IO::AIO::poll_cb,
3488 );
3489} 3836}
3490 3837
3491my $_log_backtrace; 3838my $_log_backtrace;
3492 3839
3493sub _log_backtrace { 3840sub _log_backtrace {
… …
3497 3844
3498 # limit the # of concurrent backtraces 3845 # limit the # of concurrent backtraces
3499 if ($_log_backtrace < 2) { 3846 if ($_log_backtrace < 2) {
3500 ++$_log_backtrace; 3847 ++$_log_backtrace;
3501 async { 3848 async {
3849 $Coro::current->{desc} = "abt $msg";
3850
3502 my @bt = fork_call { 3851 my @bt = fork_call {
3503 @addr = map { sprintf "%x", $_ } @addr; 3852 @addr = map { sprintf "%x", $_ } @addr;
3504 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3853 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3505 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3854 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3506 or die "addr2line: $!"; 3855 or die "addr2line: $!";
… …
3529# load additional modules 3878# load additional modules
3530use cf::pod; 3879use cf::pod;
3531 3880
3532END { cf::emergency_save } 3881END { cf::emergency_save }
3533 3882
3883evthread_start IO::AIO::poll_fileno;
3884
35341 38851
3535 3886

Diff Legend

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