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.338 by root, Tue Aug 21 01:07:47 2007 UTC vs.
Revision 1.427 by root, Sat Apr 26 12:25:45 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 3.2;
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 4.50 ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::Event; 39use Coro::EV;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
22use Coro::AIO; 43use Coro::AIO;
44use Coro::BDB;
23use Coro::Storable; 45use Coro::Storable;
24use Coro::Util (); 46use Coro::Util ();
25 47
26use JSON::XS 1.4 (); 48use JSON::XS 2.01 ();
27use BDB (); 49use BDB ();
28use Data::Dumper; 50use Data::Dumper;
29use Digest::MD5; 51use Digest::MD5;
30use Fcntl; 52use Fcntl;
31use YAML::Syck (); 53use YAML ();
32use IO::AIO 2.32 (); 54use IO::AIO 2.51 ();
33use Time::HiRes; 55use Time::HiRes;
34use Compress::LZF; 56use Compress::LZF;
35use Digest::MD5 (); 57use Digest::MD5 ();
36 58
37# configure various modules to our taste 59# configure various modules to our taste
38# 60#
39$Storable::canonical = 1; # reduce rsync transfers 61$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 62Coro::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 63Compress::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 64
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 66
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 68
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 87our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 89our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 90our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 91our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE;
75 93
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER; 95our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 97our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 98our $USE_FSYNC = 1; # use fsync to write maps - default off
83 99
84our $BDB_POLL_WATCHER; 100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 104our $DB_ENV;
86 105
87our %CFG; 106our %CFG;
88 107
89our $UPTIME; $UPTIME ||= time; 108our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 109our $RUNTIME;
110our $NOW;
91 111
92our %PLAYER; # all users 112our (%PLAYER, %PLAYER_LOADING); # all users
93our %MAP; # all maps 113our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 114our $LINK_MAP; # the special {link} map, which is always available
95 115
96# used to convert map paths into valid unix filenames by replacing / by ∕ 116# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 118
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
102 123
103binmode STDOUT; 124binmode STDOUT;
104binmode STDERR; 125binmode STDERR;
105 126
106# read virtual server time, if available 127# read virtual server time, if available
159 180
160The raw value load value from the last tick. 181The raw value load value from the last tick.
161 182
162=item %cf::CFG 183=item %cf::CFG
163 184
164Configuration for the server, loaded from C</etc/crossfire/config>, or 185Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 186from wherever your confdir points to.
166 187
167=item cf::wait_for_tick, cf::wait_for_tick_begin 188=item cf::wait_for_tick, cf::wait_for_tick_begin
168 189
169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 190These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
187 $msg .= "\n" 208 $msg .= "\n"
188 unless $msg =~ /\n$/; 209 unless $msg =~ /\n$/;
189 210
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 212
192 utf8::encode $msg;
193 LOG llevError, $msg; 213 LOG llevError, $msg;
194 }; 214 };
195} 215}
216
217$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "=="
219
220 if ($Coro::current == $Coro::main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d#
223 }#d#
224
225 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate
228};
229
230$SIG{__DIE__} = sub { }; #d#?
196 231
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
213)) { 248)) {
214 no strict 'refs'; 249 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 251}
217 252
218$Event::DIED = sub { 253$EV::DIED = sub {
219 warn "error in event callback: @_"; 254 warn "error in event callback: @_";
220}; 255};
221 256
222############################################################################# 257#############################################################################
223 258
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 281 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 282 $d
248 } || "[unable to dump $_[0]: '$@']"; 283 } || "[unable to dump $_[0]: '$@']";
249} 284}
250 285
251=item $ref = cf::from_json $json 286=item $ref = cf::decode_json $json
252 287
253Converts a JSON string into the corresponding perl data structure. 288Converts a JSON string into the corresponding perl data structure.
254 289
255=item $json = cf::to_json $ref 290=item $json = cf::encode_json $ref
256 291
257Converts a perl data structure into its JSON representation. 292Converts a perl data structure into its JSON representation.
258 293
259=cut 294=cut
260 295
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 297
263sub to_json ($) { $json_coder->encode ($_[0]) } 298sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 299sub decode_json($) { $json_coder->decode ($_[0]) }
265 300
266=item cf::lock_wait $string 301=item cf::lock_wait $string
267 302
268Wait until the given lock is available. See cf::lock_acquire. 303Wait until the given lock is available. See cf::lock_acquire.
269 304
272Wait until the given lock is available and then acquires it and returns 307Wait until the given lock is available and then acquires it and returns
273a Coro::guard object. If the guard object gets destroyed (goes out of scope, 308a Coro::guard object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 309for example when the coroutine gets canceled), the lock is automatically
275returned. 310returned.
276 311
312Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro.
314
277Lock names should begin with a unique identifier (for example, cf::map::find 315Lock names should begin with a unique identifier (for example, cf::map::find
278uses map_find and cf::map::load uses map_load). 316uses map_find and cf::map::load uses map_load).
279 317
280=item $locked = cf::lock_active $string 318=item $locked = cf::lock_active $string
281 319
282Return true if the lock is currently active, i.e. somebody has locked it. 320Return true if the lock is currently active, i.e. somebody has locked it.
283 321
284=cut 322=cut
285 323
286our %LOCK; 324our %LOCK;
325our %LOCKER;#d#
287 326
288sub lock_wait($) { 327sub lock_wait($) {
289 my ($key) = @_; 328 my ($key) = @_;
329
330 if ($LOCKER{$key} == $Coro::current) {#d#
331 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332 return;#d#
333 }#d#
290 334
291 # wait for lock, if any 335 # wait for lock, if any
292 while ($LOCK{$key}) { 336 while ($LOCK{$key}) {
293 push @{ $LOCK{$key} }, $Coro::current; 337 push @{ $LOCK{$key} }, $Coro::current;
294 Coro::schedule; 338 Coro::schedule;
300 344
301 # wait, to be sure we are not locked 345 # wait, to be sure we are not locked
302 lock_wait $key; 346 lock_wait $key;
303 347
304 $LOCK{$key} = []; 348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
305 350
306 Coro::guard { 351 Coro::guard {
352 delete $LOCKER{$key};#d#
307 # wake up all waiters, to be on the safe side 353 # wake up all waiters, to be on the safe side
308 $_->ready for @{ delete $LOCK{$key} }; 354 $_->ready for @{ delete $LOCK{$key} };
309 } 355 }
310} 356}
311 357
314 360
315 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
316} 362}
317 363
318sub freeze_mainloop { 364sub freeze_mainloop {
319 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
320 366
321 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
322 $TICK_WATCHER->start; 368}
323 }; 369
324 $TICK_WATCHER->stop; 370=item cf::periodic $interval, $cb
325 $guard 371
372Like EV::periodic, but randomly selects a starting point so that the actions
373get spread over timer.
374
375=cut
376
377sub periodic($$) {
378 my ($interval, $cb) = @_;
379
380 my $start = rand List::Util::min 180, $interval;
381
382 EV::periodic $start, $interval, 0, $cb
326} 383}
327 384
328=item cf::get_slot $time[, $priority[, $name]] 385=item cf::get_slot $time[, $priority[, $name]]
329 386
330Allocate $time seconds of blocking CPU time at priority C<$priority>: 387Allocate $time seconds of blocking CPU time at priority C<$priority>:
341our @SLOT_QUEUE; 398our @SLOT_QUEUE;
342our $SLOT_QUEUE; 399our $SLOT_QUEUE;
343 400
344$SLOT_QUEUE->cancel if $SLOT_QUEUE; 401$SLOT_QUEUE->cancel if $SLOT_QUEUE;
345$SLOT_QUEUE = Coro::async { 402$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager");
404
346 my $signal = new Coro::Signal; 405 my $signal = new Coro::Signal;
347 406
348 while () { 407 while () {
349 next_job: 408 next_job:
350 my $avail = cf::till_tick; 409 my $avail = cf::till_tick;
358 } 417 }
359 } 418 }
360 } 419 }
361 420
362 if (@SLOT_QUEUE) { 421 if (@SLOT_QUEUE) {
363 # we do not use wait_For_tick() as it returns immediately when tick is inactive 422 # we do not use wait_for_tick() as it returns immediately when tick is inactive
364 push @cf::WAIT_FOR_TICK, $signal; 423 push @cf::WAIT_FOR_TICK, $signal;
365 $signal->wait; 424 $signal->wait;
366 } else { 425 } else {
367 Coro::schedule; 426 Coro::schedule;
368 } 427 }
369 } 428 }
370}; 429};
371 430
372sub get_slot($;$$) { 431sub get_slot($;$$) {
432 return if tick_inhibit || $Coro::current == $Coro::main;
433
373 my ($time, $pri, $name) = @_; 434 my ($time, $pri, $name) = @_;
374 435
375 $time = $TICK * .6 if $time > $TICK * .6; 436 $time = $TICK * .6 if $time > $TICK * .6;
376 my $sig = new Coro::Signal; 437 my $sig = new Coro::Signal;
377 438
391 452
392BEGIN { *async = \&Coro::async_pool } 453BEGIN { *async = \&Coro::async_pool }
393 454
394=item cf::sync_job { BLOCK } 455=item cf::sync_job { BLOCK }
395 456
396The design of Crossfire TRT requires that the main coroutine ($Coro::main) 457The design of Deliantra requires that the main coroutine ($Coro::main)
397is always able to handle events or runnable, as Crossfire TRT is only 458is always able to handle events or runnable, as Deliantra is only
398partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 459partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
399acceptable. 460acceptable.
400 461
401If it must be done, put the blocking parts into C<sync_job>. This will run 462If it must be done, put the blocking parts into C<sync_job>. This will run
402the given BLOCK in another coroutine while waiting for the result. The 463the given BLOCK in another coroutine while waiting for the result. The
407 468
408sub sync_job(&) { 469sub sync_job(&) {
409 my ($job) = @_; 470 my ($job) = @_;
410 471
411 if ($Coro::current == $Coro::main) { 472 if ($Coro::current == $Coro::main) {
412 my $time = Event::time; 473 my $time = EV::time;
413 474
414 # this is the main coro, too bad, we have to block 475 # this is the main coro, too bad, we have to block
415 # till the operation succeeds, freezing the server :/ 476 # till the operation succeeds, freezing the server :/
416 477
417 # TODO: use suspend/resume instead 478 LOG llevError, Carp::longmess "sync job";#d#
418 # (but this is cancel-safe) 479
419 my $freeze_guard = freeze_mainloop; 480 my $freeze_guard = freeze_mainloop;
420 481
421 my $busy = 1; 482 my $busy = 1;
422 my @res; 483 my @res;
423 484
424 (async { 485 (async {
486 $Coro::current->desc ("sync job coro");
425 @res = eval { $job->() }; 487 @res = eval { $job->() };
426 warn $@ if $@; 488 warn $@ if $@;
427 undef $busy; 489 undef $busy;
428 })->prio (Coro::PRIO_MAX); 490 })->prio (Coro::PRIO_MAX);
429 491
430 while ($busy) { 492 while ($busy) {
431 Coro::cede or Event::one_event; 493 if (Coro::nready) {
494 Coro::cede_notself;
495 } else {
496 EV::loop EV::LOOP_ONESHOT;
432 } 497 }
498 }
433 499
434 $time = Event::time - $time; 500 my $time = EV::time - $time;
435 501
436 LOG llevError | logBacktrace, Carp::longmess "long sync job"
437 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
438
439 $tick_start += $time; # do not account sync jobs to server load 502 $TICK_START += $time; # do not account sync jobs to server load
440 503
441 wantarray ? @res : $res[0] 504 wantarray ? @res : $res[0]
442 } else { 505 } else {
443 # we are in another coroutine, how wonderful, everything just works 506 # we are in another coroutine, how wonderful, everything just works
444 507
469=item fork_call { }, $args 532=item fork_call { }, $args
470 533
471Executes the given code block with the given arguments in a seperate 534Executes the given code block with the given arguments in a seperate
472process, returning the results. Everything must be serialisable with 535process, returning the results. Everything must be serialisable with
473Coro::Storable. May, of course, block. Note that the executed sub may 536Coro::Storable. May, of course, block. Note that the executed sub may
474never block itself or use any form of Event handling. 537never block itself or use any form of event handling.
475 538
476=cut 539=cut
477 540
478sub fork_call(&@) { 541sub fork_call(&@) {
479 my ($cb, @args) = @_; 542 my ($cb, @args) = @_;
480 543
481 # we seemingly have to make a local copy of the whole thing, 544 # we seemingly have to make a local copy of the whole thing,
482 # otherwise perl prematurely frees the stuff :/ 545 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious) 546 # TODO: investigate and fix (likely this will be rather laborious)
484 547
485 my @res = Coro::Util::fork_eval { 548 my @res = Coro::Util::fork_eval {
486 reset_signals; 549 reset_signals;
487 &$cb 550 &$cb
488 }, @args; 551 }, @args;
489 552
490 wantarray ? @res : $res[-1] 553 wantarray ? @res : $res[-1]
491} 554}
492 555
556=item $coin = coin_from_name $name
557
558=cut
559
560our %coin_alias = (
561 "silver" => "silvercoin",
562 "silvercoin" => "silvercoin",
563 "silvercoins" => "silvercoin",
564 "gold" => "goldcoin",
565 "goldcoin" => "goldcoin",
566 "goldcoins" => "goldcoin",
567 "platinum" => "platinacoin",
568 "platinumcoin" => "platinacoin",
569 "platinumcoins" => "platinacoin",
570 "platina" => "platinacoin",
571 "platinacoin" => "platinacoin",
572 "platinacoins" => "platinacoin",
573 "royalty" => "royalty",
574 "royalties" => "royalty",
575);
576
577sub coin_from_name($) {
578 $coin_alias{$_[0]}
579 ? cf::arch::find $coin_alias{$_[0]}
580 : undef
581}
582
493=item $value = cf::db_get $family => $key 583=item $value = cf::db_get $family => $key
494 584
495Returns a single value from the environment database. 585Returns a single value from the environment database.
496 586
497=item cf::db_put $family => $key => $value 587=item cf::db_put $family => $key => $value
498 588
499Stores the given C<$value> in the family. It can currently store binary 589Stores the given C<$value> in the family. It can currently store binary
500data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 590data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
501 591
592=item $db = cf::db_table "name"
593
594Create and/or open a new database table. The string must not be "db" and must be unique
595within each server.
596
502=cut 597=cut
598
599sub db_table($) {
600 my ($name) = @_;
601 my $db = BDB::db_create $DB_ENV;
602
603 eval {
604 $db->set_flags (BDB::CHKSUM);
605
606 utf8::encode $name;
607 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
608 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
609 cf::cleanup "db_open(db): $!" if $!;
610 };
611 cf::cleanup "db_open(db): $@" if $@;
612
613 $db
614}
503 615
504our $DB; 616our $DB;
505 617
506sub db_init { 618sub db_init {
507 unless ($DB) {
508 $DB = BDB::db_create $DB_ENV;
509
510 cf::sync_job { 619 cf::sync_job {
511 eval { 620 $DB ||= db_table "db";
512 $DB->set_flags (BDB::CHKSUM);
513
514 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
515 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
516 cf::cleanup "db_open(db): $!" if $!;
517 };
518 cf::cleanup "db_open(db): $@" if $@;
519 };
520 } 621 };
521} 622}
522 623
523sub db_get($$) { 624sub db_get($$) {
524 my $key = "$_[0]/$_[1]"; 625 my $key = "$_[0]/$_[1]";
525 626
575 if (1) { 676 if (1) {
576 $md5 = 677 $md5 =
577 join "\x00", 678 join "\x00",
578 $processversion, 679 $processversion,
579 map { 680 map {
580 Coro::cede; 681 cf::cede_to_tick;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 682 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src; 683 } 0.. $#$src;
583 684
584 685
585 my $dbmd5 = db_get cache => "$id/md5"; 686 my $dbmd5 = db_get cache => "$id/md5";
629attach callbacks/event handlers (a collection of which is called an "attachment") 730attach callbacks/event handlers (a collection of which is called an "attachment")
630to it. All such attachable objects support the following methods. 731to it. All such attachable objects support the following methods.
631 732
632In the following description, CLASS can be any of C<global>, C<object> 733In the following description, CLASS can be any of C<global>, C<object>
633C<player>, C<client> or C<map> (i.e. the attachable objects in 734C<player>, C<client> or C<map> (i.e. the attachable objects in
634Crossfire TRT). 735Deliantra).
635 736
636=over 4 737=over 4
637 738
638=item $attachable->attach ($attachment, key => $value...) 739=item $attachable->attach ($attachment, key => $value...)
639 740
921 } 1022 }
922 1023
923 0 1024 0
924} 1025}
925 1026
926=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1027=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
927 1028
928=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1029=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
929 1030
930Generate an object-specific event with the given arguments. 1031Generate an object-specific event with the given arguments.
931 1032
937 1038
938=cut 1039=cut
939 1040
940############################################################################# 1041#############################################################################
941# object support 1042# object support
942#
943 1043
1044sub _object_equal($$);
1045sub _object_equal($$) {
1046 my ($a, $b) = @_;
1047
1048 return 0 unless (ref $a) eq (ref $b);
1049
1050 if ("HASH" eq ref $a) {
1051 my @ka = keys %$a;
1052 my @kb = keys %$b;
1053
1054 return 0 if @ka != @kb;
1055
1056 for (0 .. $#ka) {
1057 return 0 unless $ka[$_] eq $kb[$_];
1058 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1059 }
1060
1061 } elsif ("ARRAY" eq ref $a) {
1062
1063 return 0 if @$a != @$b;
1064
1065 for (0 .. $#$a) {
1066 return 0 unless _object_equal $a->[$_], $b->[$_];
1067 }
1068
1069 } elsif ($a ne $b) {
1070 return 0;
1071 }
1072
1073 1
1074}
1075
1076our $SLOW_MERGES;#d#
944sub _can_merge { 1077sub _can_merge {
945 my ($ob1, $ob2) = @_; 1078 my ($ob1, $ob2) = @_;
946 1079
947 local $Storable::canonical = 1; 1080 ++$SLOW_MERGES;#d#
948 my $fob1 = Storable::freeze $ob1;
949 my $fob2 = Storable::freeze $ob2;
950 1081
951 $fob1 eq $fob2 1082 # we do the slow way here
1083 return _object_equal $ob1, $ob2
952} 1084}
953 1085
954sub reattach { 1086sub reattach {
955 # basically do the same as instantiate, without calling instantiate 1087 # basically do the same as instantiate, without calling instantiate
956 my ($obj) = @_; 1088 my ($obj) = @_;
978cf::attachable->attach ( 1110cf::attachable->attach (
979 prio => -1000000, 1111 prio => -1000000,
980 on_instantiate => sub { 1112 on_instantiate => sub {
981 my ($obj, $data) = @_; 1113 my ($obj, $data) = @_;
982 1114
983 $data = from_json $data; 1115 $data = decode_json $data;
984 1116
985 for (@$data) { 1117 for (@$data) {
986 my ($name, $args) = @$_; 1118 my ($name, $args) = @$_;
987 1119
988 $obj->attach ($name, %{$args || {} }); 1120 $obj->attach ($name, %{$args || {} });
1004sub object_freezer_save { 1136sub object_freezer_save {
1005 my ($filename, $rdata, $objs) = @_; 1137 my ($filename, $rdata, $objs) = @_;
1006 1138
1007 sync_job { 1139 sync_job {
1008 if (length $$rdata) { 1140 if (length $$rdata) {
1141 utf8::decode (my $decname = $filename);
1009 warn sprintf "saving %s (%d,%d)\n", 1142 warn sprintf "saving %s (%d,%d)\n",
1010 $filename, length $$rdata, scalar @$objs; 1143 $decname, length $$rdata, scalar @$objs;
1011 1144
1012 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1013 chmod SAVE_MODE, $fh; 1146 aio_chmod $fh, SAVE_MODE;
1014 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1015 aio_fsync $fh if $cf::USE_FSYNC; 1148 aio_fsync $fh if $cf::USE_FSYNC;
1016 close $fh; 1149 aio_close $fh;
1017 1150
1018 if (@$objs) { 1151 if (@$objs) {
1019 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1152 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1020 chmod SAVE_MODE, $fh; 1153 aio_chmod $fh, SAVE_MODE;
1021 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1022 aio_write $fh, 0, (length $data), $data, 0; 1155 aio_write $fh, 0, (length $data), $data, 0;
1023 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
1024 close $fh; 1157 aio_close $fh;
1025 aio_rename "$filename.pst~", "$filename.pst"; 1158 aio_rename "$filename.pst~", "$filename.pst";
1026 } 1159 }
1027 } else { 1160 } else {
1028 aio_unlink "$filename.pst"; 1161 aio_unlink "$filename.pst";
1029 } 1162 }
1034 } 1167 }
1035 } else { 1168 } else {
1036 aio_unlink $filename; 1169 aio_unlink $filename;
1037 aio_unlink "$filename.pst"; 1170 aio_unlink "$filename.pst";
1038 } 1171 }
1039 } 1172 };
1040} 1173}
1041 1174
1042sub object_freezer_as_string { 1175sub object_freezer_as_string {
1043 my ($rdata, $objs) = @_; 1176 my ($rdata, $objs) = @_;
1044 1177
1056 or return; 1189 or return;
1057 1190
1058 unless (aio_stat "$filename.pst") { 1191 unless (aio_stat "$filename.pst") {
1059 (aio_load "$filename.pst", $av) >= 0 1192 (aio_load "$filename.pst", $av) >= 0
1060 or return; 1193 or return;
1194
1061 $av = eval { (Storable::thaw $av)->{objs} }; 1195 my $st = eval { Coro::Storable::thaw $av };
1196 $av = $st->{objs};
1062 } 1197 }
1063 1198
1199 utf8::decode (my $decname = $filename);
1064 warn sprintf "loading %s (%d)\n", 1200 warn sprintf "loading %s (%d,%d)\n",
1065 $filename, length $data, scalar @{$av || []}; 1201 $decname, length $data, scalar @{$av || []};
1202
1066 return ($data, $av); 1203 ($data, $av)
1067} 1204}
1068 1205
1069=head2 COMMAND CALLBACKS 1206=head2 COMMAND CALLBACKS
1070 1207
1071=over 4 1208=over 4
1220 my $msg = $@ ? "$v->{path}: $@\n" 1357 my $msg = $@ ? "$v->{path}: $@\n"
1221 : "$v->{base}: extension inactive.\n"; 1358 : "$v->{base}: extension inactive.\n";
1222 1359
1223 if (exists $v->{meta}{mandatory}) { 1360 if (exists $v->{meta}{mandatory}) {
1224 warn $msg; 1361 warn $msg;
1225 warn "mandatory extension failed to load, exiting.\n"; 1362 cf::cleanup "mandatory extension failed to load, exiting.";
1226 exit 1;
1227 } 1363 }
1228 1364
1229 warn $msg; 1365 warn $msg;
1230 } 1366 }
1231 1367
1256use Coro::AIO; 1392use Coro::AIO;
1257 1393
1258=head3 cf::player 1394=head3 cf::player
1259 1395
1260=over 4 1396=over 4
1397
1398=item cf::player::num_playing
1399
1400Returns the official number of playing players, as per the Crossfire metaserver rules.
1401
1402=cut
1403
1404sub num_playing {
1405 scalar grep
1406 $_->ob->map
1407 && !$_->hidden
1408 && !$_->ob->flag (cf::FLAG_WIZ),
1409 cf::player::list
1410}
1261 1411
1262=item cf::player::find $login 1412=item cf::player::find $login
1263 1413
1264Returns the given player object, loading it if necessary (might block). 1414Returns the given player object, loading it if necessary (might block).
1265 1415
1301 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1451 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1302 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1452 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1303 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1453 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1304 aio_unlink +(playerdir $login) . "/$login.pl"; 1454 aio_unlink +(playerdir $login) . "/$login.pl";
1305 1455
1306 my $pl = load_pl path $login 1456 my $f = new_from_file cf::object::thawer path $login
1307 or return; 1457 or return;
1458
1459 my $pl = cf::player::load_pl $f
1460 or return;
1461
1462 local $cf::PLAYER_LOADING{$login} = $pl;
1463 $f->resolve_delayed_derefs;
1308 $cf::PLAYER{$login} = $pl 1464 $cf::PLAYER{$login} = $pl
1309 } 1465 }
1310 } 1466 }
1311} 1467}
1312 1468
1321 return if $pl->{deny_save}; 1477 return if $pl->{deny_save};
1322 1478
1323 aio_mkdir playerdir $pl, 0770; 1479 aio_mkdir playerdir $pl, 0770;
1324 $pl->{last_save} = $cf::RUNTIME; 1480 $pl->{last_save} = $cf::RUNTIME;
1325 1481
1482 cf::get_slot 0.01;
1483
1326 $pl->save_pl ($path); 1484 $pl->save_pl ($path);
1327 Coro::cede; 1485 cf::cede_to_tick;
1328} 1486}
1329 1487
1330sub new($) { 1488sub new($) {
1331 my ($login) = @_; 1489 my ($login) = @_;
1332 1490
1410 or return []; 1568 or return [];
1411 1569
1412 my @logins; 1570 my @logins;
1413 1571
1414 for my $login (@$dirs) { 1572 for my $login (@$dirs) {
1573 my $path = path $login;
1574
1575 # a .pst is a dead give-away for a valid player
1576 # if no pst file found, open and chekc for blocked users
1577 if (aio_stat "$path.pst") {
1415 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1578 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1416 aio_read $fh, 0, 512, my $buf, 0 or next; 1579 aio_read $fh, 0, 512, my $buf, 0 or next;
1417 $buf !~ /^password -------------$/m or next; # official not-valid tag 1580 $buf !~ /^password -------------$/m or next; # official not-valid tag
1581 }
1418 1582
1419 utf8::decode $login; 1583 utf8::decode $login;
1420 push @logins, $login; 1584 push @logins, $login;
1421 } 1585 }
1422 1586
1455 1619
1456Expand crossfire pod fragments into protocol xml. 1620Expand crossfire pod fragments into protocol xml.
1457 1621
1458=cut 1622=cut
1459 1623
1624use re 'eval';
1625
1626my $group;
1627my $interior; $interior = qr{
1628 # match a pod interior sequence sans C<< >>
1629 (?:
1630 \ (.*?)\ (?{ $group = $^N })
1631 | < (??{$interior}) >
1632 )
1633}x;
1634
1460sub expand_cfpod { 1635sub expand_cfpod {
1461 ((my $self), (local $_)) = @_; 1636 my ($self, $pod) = @_;
1462 1637
1463 # escape & and < 1638 my $xml;
1464 s/&/&amp;/g;
1465 s/(?<![BIUGH])</&lt;/g;
1466 1639
1467 # this is buggy, it needs to properly take care of nested <'s 1640 while () {
1641 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1642 $group = $1;
1468 1643
1469 1 while 1644 $group =~ s/&/&amp;/g;
1470 # replace B<>, I<>, U<> etc. 1645 $group =~ s/</&lt;/g;
1471 s/B<([^\>]*)>/<b>$1<\/b>/ 1646
1472 || s/I<([^\>]*)>/<i>$1<\/i>/ 1647 $xml .= $group;
1473 || s/U<([^\>]*)>/<u>$1<\/u>/ 1648 } elsif ($pod =~ m%\G
1474 # replace G<male|female> tags 1649 ([BCGHITU])
1475 || s{G<([^>|]*)\|([^>]*)>}{ 1650 <
1476 $self->gender ? $2 : $1 1651 (?:
1477 }ge 1652 ([^<>]*) (?{ $group = $^N })
1478 # replace H<hint text> 1653 | < $interior >
1479 || s{H<([^\>]*)>} 1654 )
1655 >
1656 %gcsx
1480 { 1657 ) {
1658 my ($code, $data) = ($1, $group);
1659
1660 if ($code eq "B") {
1661 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1662 } elsif ($code eq "I") {
1663 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1664 } elsif ($code eq "U") {
1665 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1666 } elsif ($code eq "C") {
1667 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1668 } elsif ($code eq "T") {
1669 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1670 } elsif ($code eq "G") {
1671 my ($male, $female) = split /\|/, $data;
1672 $data = $self->gender ? $female : $male;
1673 $xml .= expand_cfpod ($self, $data);
1674 } elsif ($code eq "H") {
1481 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1675 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1482 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1676 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1483 "") 1677 "")
1484 [$self->{hintmode}] 1678 [$self->{hintmode}];
1679 } else {
1680 $xml .= "error processing '$code($data)' directive";
1485 }ge; 1681 }
1682 } else {
1683 if ($pod =~ /\G(.+)/) {
1684 warn "parse error while expanding $pod (at $1)";
1685 }
1686 last;
1687 }
1688 }
1486 1689
1690 for ($xml) {
1487 # create single paragraphs (very hackish) 1691 # create single paragraphs (very hackish)
1488 s/(?<=\S)\n(?=\w)/ /g; 1692 s/(?<=\S)\n(?=\w)/ /g;
1489 1693
1490 # compress some whitespace 1694 # compress some whitespace
1491 s/\s+\n/\n/g; # ws line-ends 1695 s/\s+\n/\n/g; # ws line-ends
1492 s/\n\n+/\n/g; # double lines 1696 s/\n\n+/\n/g; # double lines
1493 s/^\n+//; # beginning lines 1697 s/^\n+//; # beginning lines
1494 s/\n+$//; # ending lines 1698 s/\n+$//; # ending lines
1699 }
1495 1700
1496 $_ 1701 $xml
1497} 1702}
1703
1704no re 'eval';
1498 1705
1499sub hintmode { 1706sub hintmode {
1500 $_[0]{hintmode} = $_[1] if @_ > 1; 1707 $_[0]{hintmode} = $_[1] if @_ > 1;
1501 $_[0]{hintmode} 1708 $_[0]{hintmode}
1502} 1709}
1574our $MAX_RESET = 3600; 1781our $MAX_RESET = 3600;
1575our $DEFAULT_RESET = 3000; 1782our $DEFAULT_RESET = 3000;
1576 1783
1577sub generate_random_map { 1784sub generate_random_map {
1578 my ($self, $rmp) = @_; 1785 my ($self, $rmp) = @_;
1786
1787 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1788
1579 # mit "rum" bekleckern, nicht 1789 # mit "rum" bekleckern, nicht
1580 $self->_create_random_map ( 1790 $self->_create_random_map (
1581 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1791 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1582 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1792 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1583 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1793 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1705 1915
1706# the temporary/swap location 1916# the temporary/swap location
1707sub save_path { 1917sub save_path {
1708 my ($self) = @_; 1918 my ($self) = @_;
1709 1919
1710 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1920 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1711 "$TMPDIR/$path.map" 1921 "$TMPDIR/$path.map"
1712} 1922}
1713 1923
1714# the unique path, undef == no special unique path 1924# the unique path, undef == no special unique path
1715sub uniq_path { 1925sub uniq_path {
1716 my ($self) = @_; 1926 my ($self) = @_;
1717 1927
1718 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1719 "$UNIQUEDIR/$path" 1929 "$UNIQUEDIR/$path"
1720} 1930}
1721 1931
1722# and all this just because we cannot iterate over 1932# and all this just because we cannot iterate over
1723# all maps in C++... 1933# all maps in C++...
1746 1956
1747sub load_header_from($) { 1957sub load_header_from($) {
1748 my ($self, $path) = @_; 1958 my ($self, $path) = @_;
1749 1959
1750 utf8::encode $path; 1960 utf8::encode $path;
1751 #aio_open $path, O_RDONLY, 0 1961 my $f = new_from_file cf::object::thawer $path
1752 # or return;
1753
1754 $self->_load_header ($path)
1755 or return; 1962 or return;
1963
1964 $self->_load_header ($f)
1965 or return;
1966
1967 local $MAP_LOADING{$self->{path}} = $self;
1968 $f->resolve_delayed_derefs;
1756 1969
1757 $self->{load_path} = $path; 1970 $self->{load_path} = $path;
1758 1971
1759 1 1972 1
1760} 1973}
1814sub find { 2027sub find {
1815 my ($path, $origin) = @_; 2028 my ($path, $origin) = @_;
1816 2029
1817 $path = normalise $path, $origin && $origin->path; 2030 $path = normalise $path, $origin && $origin->path;
1818 2031
2032 cf::lock_wait "map_data:$path";#d#remove
1819 cf::lock_wait "map_find:$path"; 2033 cf::lock_wait "map_find:$path";
1820 2034
1821 $cf::MAP{$path} || do { 2035 $cf::MAP{$path} || do {
1822 my $guard = cf::lock_acquire "map_find:$path"; 2036 my $guard1 = cf::lock_acquire "map_find:$path";
2037 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2038
1823 my $map = new_from_path cf::map $path 2039 my $map = new_from_path cf::map $path
1824 or return; 2040 or return;
1825 2041
1826 $map->{last_save} = $cf::RUNTIME; 2042 $map->{last_save} = $cf::RUNTIME;
1827 2043
1829 or return; 2045 or return;
1830 2046
1831 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2047 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1832 # doing this can freeze the server in a sync job, obviously 2048 # doing this can freeze the server in a sync job, obviously
1833 #$cf::WAIT_FOR_TICK->wait; 2049 #$cf::WAIT_FOR_TICK->wait;
2050 undef $guard1;
2051 undef $guard2;
1834 $map->reset; 2052 $map->reset;
1835 undef $guard;
1836 return find $path; 2053 return find $path;
1837 } 2054 }
1838 2055
1839 $cf::MAP{$path} = $map 2056 $cf::MAP{$path} = $map
1840 } 2057 }
1849 local $self->{deny_reset} = 1; # loading can take a long time 2066 local $self->{deny_reset} = 1; # loading can take a long time
1850 2067
1851 my $path = $self->{path}; 2068 my $path = $self->{path};
1852 2069
1853 { 2070 {
1854 my $guard = cf::lock_acquire "map_load:$path"; 2071 my $guard = cf::lock_acquire "map_data:$path";
1855 2072
2073 return unless $self->valid;
1856 return if $self->in_memory != cf::MAP_SWAPPED; 2074 return unless $self->in_memory == cf::MAP_SWAPPED;
1857 2075
1858 $self->in_memory (cf::MAP_LOADING); 2076 $self->in_memory (cf::MAP_LOADING);
1859 2077
1860 $self->alloc; 2078 $self->alloc;
1861 2079
1862 $self->pre_load; 2080 $self->pre_load;
1863 Coro::cede; 2081 cf::cede_to_tick;
1864 2082
2083 my $f = new_from_file cf::object::thawer $self->{load_path};
2084 $f->skip_block;
1865 $self->_load_objects ($self->{load_path}, 1) 2085 $self->_load_objects ($f)
1866 or return; 2086 or return;
1867 2087
1868 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2088 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1869 if delete $self->{load_original}; 2089 if delete $self->{load_original};
1870 2090
1871 if (my $uniq = $self->uniq_path) { 2091 if (my $uniq = $self->uniq_path) {
1872 utf8::encode $uniq; 2092 utf8::encode $uniq;
1873 if (aio_open $uniq, O_RDONLY, 0) { 2093 unless (aio_stat $uniq) {
2094 if (my $f = new_from_file cf::object::thawer $uniq) {
1874 $self->clear_unique_items; 2095 $self->clear_unique_items;
1875 $self->_load_objects ($uniq, 0); 2096 $self->_load_objects ($f);
2097 $f->resolve_delayed_derefs;
2098 }
1876 } 2099 }
1877 } 2100 }
1878 2101
1879 Coro::cede; 2102 $f->resolve_delayed_derefs;
2103
2104 cf::cede_to_tick;
1880 # now do the right thing for maps 2105 # now do the right thing for maps
1881 $self->link_multipart_objects; 2106 $self->link_multipart_objects;
1882 $self->difficulty ($self->estimate_difficulty) 2107 $self->difficulty ($self->estimate_difficulty)
1883 unless $self->difficulty; 2108 unless $self->difficulty;
1884 Coro::cede; 2109 cf::cede_to_tick;
1885 2110
1886 unless ($self->{deny_activate}) { 2111 unless ($self->{deny_activate}) {
1887 $self->decay_objects; 2112 $self->decay_objects;
1888 $self->fix_auto_apply; 2113 $self->fix_auto_apply;
1889 $self->update_buttons; 2114 $self->update_buttons;
1890 Coro::cede; 2115 cf::cede_to_tick;
1891 $self->set_darkness_map; 2116 $self->set_darkness_map;
1892 Coro::cede; 2117 cf::cede_to_tick;
1893 $self->activate; 2118 $self->activate;
1894 } 2119 }
1895 2120
1896 $self->{last_save} = $cf::RUNTIME; 2121 $self->{last_save} = $cf::RUNTIME;
1897 $self->last_access ($cf::RUNTIME); 2122 $self->last_access ($cf::RUNTIME);
1898 2123
1899 $self->in_memory (cf::MAP_IN_MEMORY); 2124 $self->in_memory (cf::MAP_ACTIVE);
1900 } 2125 }
1901 2126
1902 $self->post_load; 2127 $self->post_load;
1903} 2128}
1904 2129
1947} 2172}
1948 2173
1949sub do_load_sync { 2174sub do_load_sync {
1950 my ($map) = @_; 2175 my ($map) = @_;
1951 2176
2177 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2178 if $Coro::current == $Coro::main;
2179
1952 cf::sync_job { $map->load }; 2180 cf::sync_job { $map->load };
1953} 2181}
1954 2182
1955our %MAP_PREFETCH; 2183our %MAP_PREFETCH;
1956our $MAP_PREFETCHER = undef; 2184our $MAP_PREFETCHER = undef;
1957 2185
1958sub find_async { 2186sub find_async {
1959 my ($path, $origin) = @_; 2187 my ($path, $origin, $load) = @_;
1960 2188
1961 $path = normalise $path, $origin && $origin->{path}; 2189 $path = normalise $path, $origin && $origin->{path};
1962 2190
1963 if (my $map = $cf::MAP{$path}) { 2191 if (my $map = $cf::MAP{$path}) {
1964 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2192 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1965 } 2193 }
1966 2194
1967 undef $MAP_PREFETCH{$path}; 2195 $MAP_PREFETCH{$path} |= $load;
2196
1968 $MAP_PREFETCHER ||= cf::async { 2197 $MAP_PREFETCHER ||= cf::async {
2198 $Coro::current->{desc} = "map prefetcher";
2199
1969 while (%MAP_PREFETCH) { 2200 while (%MAP_PREFETCH) {
1970 for my $path (keys %MAP_PREFETCH) { 2201 while (my ($k, $v) = each %MAP_PREFETCH) {
1971 if (my $map = find $path) { 2202 if (my $map = find $k) {
1972 $map->load; 2203 $map->load if $v;
1973 } 2204 }
1974 2205
1975 delete $MAP_PREFETCH{$path}; 2206 delete $MAP_PREFETCH{$k};
1976 } 2207 }
1977 } 2208 }
1978 undef $MAP_PREFETCHER; 2209 undef $MAP_PREFETCHER;
1979 }; 2210 };
1980 $MAP_PREFETCHER->prio (6); 2211 $MAP_PREFETCHER->prio (6);
1983} 2214}
1984 2215
1985sub save { 2216sub save {
1986 my ($self) = @_; 2217 my ($self) = @_;
1987 2218
1988 my $lock = cf::lock_acquire "map_data:" . $self->path; 2219 my $lock = cf::lock_acquire "map_data:$self->{path}";
1989 2220
1990 $self->{last_save} = $cf::RUNTIME; 2221 $self->{last_save} = $cf::RUNTIME;
1991 2222
1992 return unless $self->dirty; 2223 return unless $self->dirty;
1993 2224
1999 return if $self->{deny_save}; 2230 return if $self->{deny_save};
2000 2231
2001 local $self->{last_access} = $self->last_access;#d# 2232 local $self->{last_access} = $self->last_access;#d#
2002 2233
2003 cf::async { 2234 cf::async {
2235 $Coro::current->{desc} = "map player save";
2004 $_->contr->save for $self->players; 2236 $_->contr->save for $self->players;
2005 }; 2237 };
2238
2239 cf::get_slot 0.02;
2006 2240
2007 if ($uniq) { 2241 if ($uniq) {
2008 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2242 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2009 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2243 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2010 } else { 2244 } else {
2016 my ($self) = @_; 2250 my ($self) = @_;
2017 2251
2018 # save first because save cedes 2252 # save first because save cedes
2019 $self->save; 2253 $self->save;
2020 2254
2021 my $lock = cf::lock_acquire "map_data:" . $self->path; 2255 my $lock = cf::lock_acquire "map_data:$self->{path}";
2022 2256
2023 return if $self->players; 2257 return if $self->players;
2024 return if $self->in_memory != cf::MAP_IN_MEMORY; 2258 return if $self->in_memory != cf::MAP_ACTIVE;
2025 return if $self->{deny_save}; 2259 return if $self->{deny_save};
2026 2260
2261 $self->in_memory (cf::MAP_SWAPPED);
2262
2263 $self->deactivate;
2264 $_->clear_links_to ($self) for values %cf::MAP;
2027 $self->clear; 2265 $self->clear;
2028 $self->in_memory (cf::MAP_SWAPPED);
2029} 2266}
2030 2267
2031sub reset_at { 2268sub reset_at {
2032 my ($self) = @_; 2269 my ($self) = @_;
2033 2270
2065 if $uniq; 2302 if $uniq;
2066 } 2303 }
2067 2304
2068 delete $cf::MAP{$self->path}; 2305 delete $cf::MAP{$self->path};
2069 2306
2307 $self->deactivate;
2308 $_->clear_links_to ($self) for values %cf::MAP;
2070 $self->clear; 2309 $self->clear;
2071
2072 $_->clear_links_to ($self) for values %cf::MAP;
2073 2310
2074 $self->unlink_save; 2311 $self->unlink_save;
2075 $self->destroy; 2312 $self->destroy;
2076} 2313}
2077 2314
2078my $nuke_counter = "aaaa"; 2315my $nuke_counter = "aaaa";
2079 2316
2080sub nuke { 2317sub nuke {
2081 my ($self) = @_; 2318 my ($self) = @_;
2082 2319
2320 {
2321 my $lock = cf::lock_acquire "map_data:$self->{path}";
2322
2083 delete $cf::MAP{$self->path}; 2323 delete $cf::MAP{$self->path};
2084 2324
2085 $self->unlink_save; 2325 $self->unlink_save;
2086 2326
2087 bless $self, "cf::map"; 2327 bless $self, "cf::map";
2088 delete $self->{deny_reset}; 2328 delete $self->{deny_reset};
2089 $self->{deny_save} = 1; 2329 $self->{deny_save} = 1;
2090 $self->reset_timeout (1); 2330 $self->reset_timeout (1);
2091 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2331 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2092 2332
2093 $cf::MAP{$self->path} = $self; 2333 $cf::MAP{$self->path} = $self;
2334 }
2094 2335
2095 $self->reset; # polite request, might not happen 2336 $self->reset; # polite request, might not happen
2096} 2337}
2097 2338
2098=item $maps = cf::map::tmp_maps 2339=item $maps = cf::map::tmp_maps
2140 2381
2141sub unique_maps() { 2382sub unique_maps() {
2142 [ 2383 [
2143 map { 2384 map {
2144 utf8::decode $_; 2385 utf8::decode $_;
2145 /\.map$/ 2386 s/\.map$//; # TODO future compatibility hack
2387 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2388 ? ()
2146 ? normalise $_ 2389 : normalise $_
2147 : ()
2148 } @{ aio_readdir $UNIQUEDIR or [] } 2390 } @{ aio_readdir $UNIQUEDIR or [] }
2149 ] 2391 ]
2150} 2392}
2151 2393
2152package cf;
2153
2154=back 2394=back
2155 2395
2156=head3 cf::object 2396=head3 cf::object
2157 2397
2158=cut 2398=cut
2161 2401
2162=over 4 2402=over 4
2163 2403
2164=item $ob->inv_recursive 2404=item $ob->inv_recursive
2165 2405
2166Returns the inventory of the object _and_ their inventories, recursively. 2406Returns the inventory of the object I<and> their inventories, recursively,
2407but I<not> the object itself.
2167 2408
2168=cut 2409=cut
2169 2410
2170sub inv_recursive_; 2411sub inv_recursive_;
2171sub inv_recursive_ { 2412sub inv_recursive_ {
2172 map { $_, inv_recursive_ $_->inv } @_ 2413 map { $_, inv_recursive_ $_->inv } @_
2173} 2414}
2174 2415
2175sub inv_recursive { 2416sub inv_recursive {
2176 inv_recursive_ inv $_[0] 2417 inv_recursive_ inv $_[0]
2418}
2419
2420=item $ref = $ob->ref
2421
2422Creates and returns a persistent reference to an object that can be stored as a string.
2423
2424=item $ob = cf::object::deref ($refstring)
2425
2426returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2427even if the object actually exists. May block.
2428
2429=cut
2430
2431sub deref {
2432 my ($ref) = @_;
2433
2434 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2435 my ($uuid, $name) = ($1, $2);
2436 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2437 or return;
2438 $pl->ob->uuid eq $uuid
2439 or return;
2440
2441 $pl->ob
2442 } else {
2443 warn "$ref: cannot resolve object reference\n";
2444 undef
2445 }
2177} 2446}
2178 2447
2179package cf; 2448package cf;
2180 2449
2181=back 2450=back
2341 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2610 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2342 2611
2343 $self->enter_link; 2612 $self->enter_link;
2344 2613
2345 (async { 2614 (async {
2615 $Coro::current->{desc} = "player::goto $path $x $y";
2616
2617 # *tag paths override both path and x|y
2618 if ($path =~ /^\*(.*)$/) {
2619 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2620 my $ob = $obs[rand @obs];
2621
2622 # see if we actually can go there
2623 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2624 $ob = $obs[rand @obs];
2625 } else {
2626 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2627 }
2628 # else put us there anyways for now #d#
2629
2630 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2631 } else {
2632 ($path, $x, $y) = (undef, undef, undef);
2633 }
2634 }
2635
2346 my $map = eval { 2636 my $map = eval {
2347 my $map = cf::map::find $path; 2637 my $map = defined $path ? cf::map::find $path : undef;
2348 2638
2349 if ($map) { 2639 if ($map) {
2350 $map = $map->customise_for ($self); 2640 $map = $map->customise_for ($self);
2351 $map = $check->($map) if $check && $map; 2641 $map = $check->($map) if $check && $map;
2352 } else { 2642 } else {
2353 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2643 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2354 } 2644 }
2355 2645
2356 $map 2646 $map
2357 }; 2647 };
2358 2648
2411 $rmp->{origin_y} = $exit->y; 2701 $rmp->{origin_y} = $exit->y;
2412 } 2702 }
2413 2703
2414 $rmp->{random_seed} ||= $exit->random_seed; 2704 $rmp->{random_seed} ||= $exit->random_seed;
2415 2705
2416 my $data = cf::to_json $rmp; 2706 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2417 my $md5 = Digest::MD5::md5_hex $data; 2707 my $md5 = Digest::MD5::md5_hex $data;
2418 my $meta = "$RANDOMDIR/$md5.meta"; 2708 my $meta = "$RANDOMDIR/$md5.meta";
2419 2709
2420 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2710 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2421 aio_write $fh, 0, (length $data), $data, 0; 2711 aio_write $fh, 0, (length $data), $data, 0;
2448 # if exit is damned, update players death & WoR home-position 2738 # if exit is damned, update players death & WoR home-position
2449 $self->contr->savebed ($slaying, $hp, $sp) 2739 $self->contr->savebed ($slaying, $hp, $sp)
2450 if $exit->flag (FLAG_DAMNED); 2740 if $exit->flag (FLAG_DAMNED);
2451 2741
2452 (async { 2742 (async {
2743 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2744
2453 $self->deactivate_recursive; # just to be sure 2745 $self->deactivate_recursive; # just to be sure
2454 unless (eval { 2746 unless (eval {
2455 $self->goto ($slaying, $hp, $sp); 2747 $self->goto ($slaying, $hp, $sp);
2456 2748
2457 1; 2749 1;
2492the message, with C<log> being the default. If C<$color> is negative, suppress 2784the message, with C<log> being the default. If C<$color> is negative, suppress
2493the message unless the client supports the msg packet. 2785the message unless the client supports the msg packet.
2494 2786
2495=cut 2787=cut
2496 2788
2789# non-persistent channels (usually the info channel)
2790our %CHANNEL = (
2791 "c/identify" => {
2792 id => "infobox",
2793 title => "Identify",
2794 reply => undef,
2795 tooltip => "Items recently identified",
2796 },
2797 "c/examine" => {
2798 id => "infobox",
2799 title => "Examine",
2800 reply => undef,
2801 tooltip => "Signs and other items you examined",
2802 },
2803 "c/book" => {
2804 id => "infobox",
2805 title => "Book",
2806 reply => undef,
2807 tooltip => "The contents of a note or book",
2808 },
2809 "c/lookat" => {
2810 id => "infobox",
2811 title => "Look",
2812 reply => undef,
2813 tooltip => "What you saw there",
2814 },
2815 "c/who" => {
2816 id => "infobox",
2817 title => "Players",
2818 reply => undef,
2819 tooltip => "Shows players who are currently online",
2820 },
2821 "c/body" => {
2822 id => "infobox",
2823 title => "Body Parts",
2824 reply => undef,
2825 tooltip => "Shows which body parts you posess and are available",
2826 },
2827 "c/uptime" => {
2828 id => "infobox",
2829 title => "Uptime",
2830 reply => undef,
2831 tooltip => "How long the server has been running since last restart",
2832 },
2833 "c/mapinfo" => {
2834 id => "infobox",
2835 title => "Map Info",
2836 reply => undef,
2837 tooltip => "Information related to the maps",
2838 },
2839 "c/party" => {
2840 id => "party",
2841 title => "Party",
2842 reply => "gsay ",
2843 tooltip => "Messages and chat related to your party",
2844 },
2845);
2846
2497sub cf::client::send_msg { 2847sub cf::client::send_msg {
2498 my ($self, $channel, $msg, $color, @extra) = @_; 2848 my ($self, $channel, $msg, $color, @extra) = @_;
2499 2849
2500 $msg = $self->pl->expand_cfpod ($msg); 2850 $msg = $self->pl->expand_cfpod ($msg);
2501 2851
2502 $color &= cf::NDI_CLIENT_MASK; # just in case... 2852 $color &= cf::NDI_CLIENT_MASK; # just in case...
2503 2853
2854 # check predefined channels, for the benefit of C
2855 if ($CHANNEL{$channel}) {
2856 $channel = $CHANNEL{$channel};
2857
2858 $self->ext_msg (channel_info => $channel)
2859 if $self->can_msg;
2860
2861 $channel = $channel->{id};
2862
2504 if (ref $channel) { 2863 } elsif (ref $channel) {
2505 # send meta info to client, if not yet sent 2864 # send meta info to client, if not yet sent
2506 unless (exists $self->{channel}{$channel->{id}}) { 2865 unless (exists $self->{channel}{$channel->{id}}) {
2507 $self->{channel}{$channel->{id}} = $channel; 2866 $self->{channel}{$channel->{id}} = $channel;
2508 $self->ext_msg (channel_info => $channel); 2867 $self->ext_msg (channel_info => $channel)
2868 if $self->can_msg;
2509 } 2869 }
2510 2870
2511 $channel = $channel->{id}; 2871 $channel = $channel->{id};
2512 } 2872 }
2513 2873
2554=cut 2914=cut
2555 2915
2556sub cf::client::ext_msg($$@) { 2916sub cf::client::ext_msg($$@) {
2557 my ($self, $type, @msg) = @_; 2917 my ($self, $type, @msg) = @_;
2558 2918
2559 my $extcmd = $self->extcmd;
2560
2561 if ($extcmd == 2) { 2919 if ($self->extcmd == 2) {
2562 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2920 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2563 } elsif ($extcmd == 1) { # TODO: remove 2921 } elsif ($self->extcmd == 1) { # TODO: remove
2564 push @msg, msgtype => "event_$type"; 2922 push @msg, msgtype => "event_$type";
2565 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2923 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2566 } 2924 }
2567} 2925}
2568 2926
2575sub cf::client::ext_reply($$@) { 2933sub cf::client::ext_reply($$@) {
2576 my ($self, $id, @msg) = @_; 2934 my ($self, $id, @msg) = @_;
2577 2935
2578 if ($self->extcmd == 2) { 2936 if ($self->extcmd == 2) {
2579 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 2937 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2580 } elsif ($self->ns->extcmd == 1) { 2938 } elsif ($self->extcmd == 1) {
2581 #TODO: version 1, remove 2939 #TODO: version 1, remove
2582 unshift @msg, msgtype => "reply", msgid => $id; 2940 unshift @msg, msgtype => "reply", msgid => $id;
2583 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2941 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2584 } 2942 }
2585} 2943}
2727=pod 3085=pod
2728 3086
2729The following functions and methods are available within a safe environment: 3087The following functions and methods are available within a safe environment:
2730 3088
2731 cf::object 3089 cf::object
2732 contr pay_amount pay_player map x y force_find force_add 3090 contr pay_amount pay_player map x y force_find force_add destroy
2733 insert remove name archname title slaying race 3091 insert remove name archname title slaying race decrease split
2734 3092
2735 cf::object::player 3093 cf::object::player
2736 player 3094 player
2737 3095
2738 cf::player 3096 cf::player
2743 3101
2744=cut 3102=cut
2745 3103
2746for ( 3104for (
2747 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3105 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2748 insert remove inv name archname title slaying race)], 3106 insert remove inv name archname title slaying race
3107 decrease split destroy)],
2749 ["cf::object::player" => qw(player)], 3108 ["cf::object::player" => qw(player)],
2750 ["cf::player" => qw(peaceful)], 3109 ["cf::player" => qw(peaceful)],
2751 ["cf::map" => qw(trigger)], 3110 ["cf::map" => qw(trigger)],
2752) { 3111) {
2753 no strict 'refs'; 3112 no strict 'refs';
2829# the server's init and main functions 3188# the server's init and main functions
2830 3189
2831sub load_facedata($) { 3190sub load_facedata($) {
2832 my ($path) = @_; 3191 my ($path) = @_;
2833 3192
3193 # HACK to clear player env face cache, we need some signal framework
3194 # for this (global event?)
3195 %ext::player_env::MUSIC_FACE_CACHE = ();
3196
2834 my $enc = JSON::XS->new->utf8->canonical; 3197 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2835 3198
2836 warn "loading facedata from $path\n"; 3199 warn "loading facedata from $path\n";
2837 3200
2838 my $facedata; 3201 my $facedata;
2839 0 < aio_load $path, $facedata 3202 0 < aio_load $path, $facedata
2854 { 3217 {
2855 my $faces = $facedata->{faceinfo}; 3218 my $faces = $facedata->{faceinfo};
2856 3219
2857 while (my ($face, $info) = each %$faces) { 3220 while (my ($face, $info) = each %$faces) {
2858 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3221 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3222
2859 cf::face::set_visibility $idx, $info->{visibility}; 3223 cf::face::set_visibility $idx, $info->{visibility};
2860 cf::face::set_magicmap $idx, $info->{magicmap}; 3224 cf::face::set_magicmap $idx, $info->{magicmap};
2861 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3225 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2862 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3226 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2863 3227
2864 cf::cede_to_tick; 3228 cf::cede_to_tick;
2865 } 3229 }
2866 3230
2867 while (my ($face, $info) = each %$faces) { 3231 while (my ($face, $info) = each %$faces) {
2868 next unless $info->{smooth}; 3232 next unless $info->{smooth};
3233
2869 my $idx = cf::face::find $face 3234 my $idx = cf::face::find $face
2870 or next; 3235 or next;
3236
2871 if (my $smooth = cf::face::find $info->{smooth}) { 3237 if (my $smooth = cf::face::find $info->{smooth}) {
2872 cf::face::set_smooth $idx, $smooth; 3238 cf::face::set_smooth $idx, $smooth;
2873 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3239 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2874 } else { 3240 } else {
2875 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3241 warn "smooth face '$info->{smooth}' not found for face '$face'";
2893 { 3259 {
2894 # TODO: for gcfclient pleasure, we should give resources 3260 # TODO: for gcfclient pleasure, we should give resources
2895 # that gcfclient doesn't grok a >10000 face index. 3261 # that gcfclient doesn't grok a >10000 face index.
2896 my $res = $facedata->{resource}; 3262 my $res = $facedata->{resource};
2897 3263
2898 my $soundconf = delete $res->{"res/sound.conf"};
2899
2900 while (my ($name, $info) = each %$res) { 3264 while (my ($name, $info) = each %$res) {
3265 if (defined $info->{type}) {
2901 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3266 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2902 my $data; 3267 my $data;
2903 3268
2904 if ($info->{type} & 1) { 3269 if ($info->{type} & 1) {
2905 # prepend meta info 3270 # prepend meta info
2906 3271
2907 my $meta = $enc->encode ({ 3272 my $meta = $enc->encode ({
2908 name => $name, 3273 name => $name,
2909 %{ $info->{meta} || {} }, 3274 %{ $info->{meta} || {} },
2910 }); 3275 });
2911 3276
2912 $data = pack "(w/a*)*", $meta, $info->{data}; 3277 $data = pack "(w/a*)*", $meta, $info->{data};
3278 } else {
3279 $data = $info->{data};
3280 }
3281
3282 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3283 cf::face::set_type $idx, $info->{type};
2913 } else { 3284 } else {
2914 $data = $info->{data}; 3285 $RESOURCE{$name} = $info;
2915 } 3286 }
2916 3287
2917 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2918 cf::face::set_type $idx, $info->{type};
2919
2920 cf::cede_to_tick; 3288 cf::cede_to_tick;
2921 } 3289 }
2922
2923 if ($soundconf) {
2924 $soundconf = $enc->decode (delete $soundconf->{data});
2925
2926 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2927 my $sound = $soundconf->{compat}[$_]
2928 or next;
2929
2930 my $face = cf::face::find "sound/$sound->[1]";
2931 cf::sound::set $sound->[0] => $face;
2932 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2933 }
2934
2935 while (my ($k, $v) = each %{$soundconf->{event}}) {
2936 my $face = cf::face::find "sound/$v";
2937 cf::sound::set $k => $face;
2938 }
2939 }
2940 } 3290 }
3291
3292 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2941 3293
2942 1 3294 1
2943} 3295}
3296
3297cf::global->attach (on_resource_update => sub {
3298 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3299 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3300
3301 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3302 my $sound = $soundconf->{compat}[$_]
3303 or next;
3304
3305 my $face = cf::face::find "sound/$sound->[1]";
3306 cf::sound::set $sound->[0] => $face;
3307 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3308 }
3309
3310 while (my ($k, $v) = each %{$soundconf->{event}}) {
3311 my $face = cf::face::find "sound/$v";
3312 cf::sound::set $k => $face;
3313 }
3314 }
3315});
2944 3316
2945register_exticmd fx_want => sub { 3317register_exticmd fx_want => sub {
2946 my ($ns, $want) = @_; 3318 my ($ns, $want) = @_;
2947 3319
2948 while (my ($k, $v) = each %$want) { 3320 while (my ($k, $v) = each %$want) {
2949 $ns->fx_want ($k, $v); 3321 $ns->fx_want ($k, $v);
2950 } 3322 }
2951}; 3323};
2952 3324
3325sub load_resource_file($) {
3326 my $guard = lock_acquire "load_resource_file";
3327
3328 my $status = load_resource_file_ $_[0];
3329 get_slot 0.1, 100;
3330 cf::arch::commit_load;
3331
3332 $status
3333}
3334
2953sub reload_regions { 3335sub reload_regions {
3336 # HACK to clear player env face cache, we need some signal framework
3337 # for this (global event?)
3338 %ext::player_env::MUSIC_FACE_CACHE = ();
3339
2954 load_resource_file "$MAPDIR/regions" 3340 load_resource_file "$MAPDIR/regions"
2955 or die "unable to load regions file\n"; 3341 or die "unable to load regions file\n";
2956 3342
2957 for (cf::region::list) { 3343 for (cf::region::list) {
2958 $_->{match} = qr/$_->{match}/ 3344 $_->{match} = qr/$_->{match}/
2966} 3352}
2967 3353
2968sub reload_archetypes { 3354sub reload_archetypes {
2969 load_resource_file "$DATADIR/archetypes" 3355 load_resource_file "$DATADIR/archetypes"
2970 or die "unable to load archetypes\n"; 3356 or die "unable to load archetypes\n";
2971 #d# NEED to laod twice to resolve forward references
2972 # this really needs to be done in an extra post-pass
2973 # (which needs to be synchronous, so solve it differently)
2974 load_resource_file "$DATADIR/archetypes"
2975 or die "unable to load archetypes\n";
2976} 3357}
2977 3358
2978sub reload_treasures { 3359sub reload_treasures {
2979 load_resource_file "$DATADIR/treasures" 3360 load_resource_file "$DATADIR/treasures"
2980 or die "unable to load treasurelists\n"; 3361 or die "unable to load treasurelists\n";
2981} 3362}
2982 3363
2983sub reload_resources { 3364sub reload_resources {
2984 warn "reloading resource files...\n"; 3365 warn "reloading resource files...\n";
2985 3366
3367 reload_facedata;
3368 reload_archetypes;
2986 reload_regions; 3369 reload_regions;
2987 reload_facedata;
2988 #reload_archetypes;#d#
2989 reload_archetypes;
2990 reload_treasures; 3370 reload_treasures;
2991 3371
2992 warn "finished reloading resource files\n"; 3372 warn "finished reloading resource files\n";
2993} 3373}
2994 3374
2995sub init { 3375sub init {
3376 my $guard = freeze_mainloop;
3377
2996 reload_resources; 3378 reload_resources;
2997} 3379}
2998 3380
2999sub cfg_load { 3381sub reload_config {
3000 open my $fh, "<:utf8", "$CONFDIR/config" 3382 open my $fh, "<:utf8", "$CONFDIR/config"
3001 or return; 3383 or return;
3002 3384
3003 local $/; 3385 local $/;
3004 *CFG = YAML::Syck::Load <$fh>; 3386 *CFG = YAML::Load <$fh>;
3005 3387
3006 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3388 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3007 3389
3008 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3390 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3009 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3391 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3020sub main { 3402sub main {
3021 # we must not ever block the main coroutine 3403 # we must not ever block the main coroutine
3022 local $Coro::idle = sub { 3404 local $Coro::idle = sub {
3023 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3405 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3024 (async { 3406 (async {
3025 Event::one_event; 3407 $Coro::current->{desc} = "IDLE BUG HANDLER";
3408 EV::loop EV::LOOP_ONESHOT;
3026 })->prio (Coro::PRIO_MAX); 3409 })->prio (Coro::PRIO_MAX);
3027 }; 3410 };
3028 3411
3029 cfg_load; 3412 {
3413 my $guard = freeze_mainloop;
3414 reload_config;
3030 db_init; 3415 db_init;
3031 load_extensions; 3416 load_extensions;
3032 3417
3033 $TICK_WATCHER->start; 3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3419 evthread_start IO::AIO::poll_fileno;
3420 }
3421
3034 Event::loop; 3422 EV::loop;
3035} 3423}
3036 3424
3037############################################################################# 3425#############################################################################
3038# initialisation and cleanup 3426# initialisation and cleanup
3039 3427
3040# install some emergency cleanup handlers 3428# install some emergency cleanup handlers
3041BEGIN { 3429BEGIN {
3430 our %SIGWATCHER = ();
3042 for my $signal (qw(INT HUP TERM)) { 3431 for my $signal (qw(INT HUP TERM)) {
3043 Event->signal ( 3432 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3044 reentrant => 0,
3045 data => WF_AUTOCANCEL,
3046 signal => $signal,
3047 prio => 0,
3048 cb => sub {
3049 cf::cleanup "SIG$signal"; 3433 cf::cleanup "SIG$signal";
3050 },
3051 ); 3434 };
3052 } 3435 }
3053} 3436}
3054 3437
3055sub write_runtime { 3438sub write_runtime_sync {
3056 my $runtime = "$LOCALDIR/runtime"; 3439 my $runtime = "$LOCALDIR/runtime";
3057 3440
3058 # first touch the runtime file to show we are still running: 3441 # first touch the runtime file to show we are still running:
3059 # the fsync below can take a very very long time. 3442 # the fsync below can take a very very long time.
3060 3443
3086 and return; 3469 and return;
3087 3470
3088 warn "runtime file written.\n"; 3471 warn "runtime file written.\n";
3089 3472
3090 1 3473 1
3474}
3475
3476our $uuid_lock;
3477our $uuid_skip;
3478
3479sub write_uuid_sync($) {
3480 $uuid_skip ||= $_[0];
3481
3482 return if $uuid_lock;
3483 local $uuid_lock = 1;
3484
3485 my $uuid = "$LOCALDIR/uuid";
3486
3487 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3488 or return;
3489
3490 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3491 $uuid_skip = 0;
3492
3493 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3494 and return;
3495
3496 # always fsync - this file is important
3497 aio_fsync $fh
3498 and return;
3499
3500 close $fh
3501 or return;
3502
3503 aio_rename "$uuid~", $uuid
3504 and return;
3505
3506 warn "uuid file written ($value).\n";
3507
3508 1
3509
3510}
3511
3512sub write_uuid($$) {
3513 my ($skip, $sync) = @_;
3514
3515 $sync ? write_uuid_sync $skip
3516 : async { write_uuid_sync $skip };
3091} 3517}
3092 3518
3093sub emergency_save() { 3519sub emergency_save() {
3094 my $freeze_guard = cf::freeze_mainloop; 3520 my $freeze_guard = cf::freeze_mainloop;
3095 3521
3101 # and maps saved/destroyed asynchronously. 3527 # and maps saved/destroyed asynchronously.
3102 warn "begin emergency player save\n"; 3528 warn "begin emergency player save\n";
3103 for my $login (keys %cf::PLAYER) { 3529 for my $login (keys %cf::PLAYER) {
3104 my $pl = $cf::PLAYER{$login} or next; 3530 my $pl = $cf::PLAYER{$login} or next;
3105 $pl->valid or next; 3531 $pl->valid or next;
3532 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3106 $pl->save; 3533 $pl->save;
3107 } 3534 }
3108 warn "end emergency player save\n"; 3535 warn "end emergency player save\n";
3109 3536
3110 warn "begin emergency map save\n"; 3537 warn "begin emergency map save\n";
3116 warn "end emergency map save\n"; 3543 warn "end emergency map save\n";
3117 3544
3118 warn "begin emergency database checkpoint\n"; 3545 warn "begin emergency database checkpoint\n";
3119 BDB::db_env_txn_checkpoint $DB_ENV; 3546 BDB::db_env_txn_checkpoint $DB_ENV;
3120 warn "end emergency database checkpoint\n"; 3547 warn "end emergency database checkpoint\n";
3548
3549 warn "begin write uuid\n";
3550 write_uuid_sync 1;
3551 warn "end write uuid\n";
3121 }; 3552 };
3122 3553
3123 warn "leave emergency perl save\n"; 3554 warn "leave emergency perl save\n";
3124} 3555}
3125 3556
3140 warn "reloading..."; 3571 warn "reloading...";
3141 3572
3142 warn "entering sync_job"; 3573 warn "entering sync_job";
3143 3574
3144 cf::sync_job { 3575 cf::sync_job {
3145 cf::write_runtime; # external watchdog should not bark 3576 cf::write_runtime_sync; # external watchdog should not bark
3146 cf::emergency_save; 3577 cf::emergency_save;
3147 cf::write_runtime; # external watchdog should not bark 3578 cf::write_runtime_sync; # external watchdog should not bark
3148 3579
3149 warn "syncing database to disk"; 3580 warn "syncing database to disk";
3150 BDB::db_env_txn_checkpoint $DB_ENV; 3581 BDB::db_env_txn_checkpoint $DB_ENV;
3151 3582
3152 # if anything goes wrong in here, we should simply crash as we already saved 3583 # if anything goes wrong in here, we should simply crash as we already saved
3153
3154 warn "cancelling all WF_AUTOCANCEL watchers";
3155 for (Event::all_watchers) {
3156 $_->cancel if $_->data & WF_AUTOCANCEL;
3157 }
3158 3584
3159 warn "flushing outstanding aio requests"; 3585 warn "flushing outstanding aio requests";
3160 for (;;) { 3586 for (;;) {
3161 BDB::flush; 3587 BDB::flush;
3162 IO::AIO::flush; 3588 IO::AIO::flush;
3163 Coro::cede; 3589 Coro::cede_notself;
3164 last unless IO::AIO::nreqs || BDB::nreqs; 3590 last unless IO::AIO::nreqs || BDB::nreqs;
3165 warn "iterate..."; 3591 warn "iterate...";
3166 } 3592 }
3167 3593
3168 ++$RELOAD; 3594 ++$RELOAD;
3227 warn "reloading cf.pm"; 3653 warn "reloading cf.pm";
3228 require cf; 3654 require cf;
3229 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3655 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3230 3656
3231 warn "loading config and database again"; 3657 warn "loading config and database again";
3232 cf::cfg_load; 3658 cf::reload_config;
3233 3659
3234 warn "loading extensions"; 3660 warn "loading extensions";
3235 cf::load_extensions; 3661 cf::load_extensions;
3236 3662
3237 warn "reattaching attachments to objects/players"; 3663 warn "reattaching attachments to objects/players";
3244 warn "leaving sync_job"; 3670 warn "leaving sync_job";
3245 3671
3246 1 3672 1
3247 } or do { 3673 } or do {
3248 warn $@; 3674 warn $@;
3249 warn "error while reloading, exiting."; 3675 cf::cleanup "error while reloading, exiting.";
3250 exit 1;
3251 }; 3676 };
3252 3677
3253 warn "reloaded"; 3678 warn "reloaded";
3254}; 3679};
3255 3680
3257 3682
3258sub reload_perl() { 3683sub reload_perl() {
3259 # doing reload synchronously and two reloads happen back-to-back, 3684 # doing reload synchronously and two reloads happen back-to-back,
3260 # coro crashes during coro_state_free->destroy here. 3685 # coro crashes during coro_state_free->destroy here.
3261 3686
3262 $RELOAD_WATCHER ||= Event->timer ( 3687 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3263 reentrant => 0,
3264 after => 0,
3265 data => WF_AUTOCANCEL,
3266 cb => sub {
3267 do_reload_perl; 3688 do_reload_perl;
3268 undef $RELOAD_WATCHER; 3689 undef $RELOAD_WATCHER;
3269 },
3270 ); 3690 };
3271} 3691}
3272 3692
3273register_command "reload" => sub { 3693register_command "reload" => sub {
3274 my ($who, $arg) = @_; 3694 my ($who, $arg) = @_;
3275 3695
3276 if ($who->flag (FLAG_WIZ)) { 3696 if ($who->flag (FLAG_WIZ)) {
3277 $who->message ("reloading server."); 3697 $who->message ("reloading server.");
3698 async {
3699 $Coro::current->{desc} = "perl_reload";
3278 async { reload_perl }; 3700 reload_perl;
3701 };
3279 } 3702 }
3280}; 3703};
3281 3704
3282unshift @INC, $LIBDIR; 3705unshift @INC, $LIBDIR;
3283 3706
3285 3708
3286our @WAIT_FOR_TICK; 3709our @WAIT_FOR_TICK;
3287our @WAIT_FOR_TICK_BEGIN; 3710our @WAIT_FOR_TICK_BEGIN;
3288 3711
3289sub wait_for_tick { 3712sub wait_for_tick {
3290 return unless $TICK_WATCHER->is_active;
3291 return if $Coro::current == $Coro::main; 3713 return if tick_inhibit || $Coro::current == $Coro::main;
3292 3714
3293 my $signal = new Coro::Signal; 3715 my $signal = new Coro::Signal;
3294 push @WAIT_FOR_TICK, $signal; 3716 push @WAIT_FOR_TICK, $signal;
3295 $signal->wait; 3717 $signal->wait;
3296} 3718}
3297 3719
3298sub wait_for_tick_begin { 3720sub wait_for_tick_begin {
3299 return unless $TICK_WATCHER->is_active;
3300 return if $Coro::current == $Coro::main; 3721 return if tick_inhibit || $Coro::current == $Coro::main;
3301 3722
3302 my $signal = new Coro::Signal; 3723 my $signal = new Coro::Signal;
3303 push @WAIT_FOR_TICK_BEGIN, $signal; 3724 push @WAIT_FOR_TICK_BEGIN, $signal;
3304 $signal->wait; 3725 $signal->wait;
3305} 3726}
3306 3727
3307 my $min = 1e6;#d# 3728sub tick {
3308 my $avg = 10;
3309$TICK_WATCHER = Event->timer (
3310 reentrant => 0,
3311 parked => 1,
3312 prio => 0,
3313 at => $NEXT_TICK || $TICK,
3314 data => WF_AUTOCANCEL,
3315 cb => sub {
3316 if ($Coro::current != $Coro::main) { 3729 if ($Coro::current != $Coro::main) {
3317 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3730 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3318 unless ++$bug_warning > 10; 3731 unless ++$bug_warning > 10;
3319 return; 3732 return;
3320 } 3733 }
3321 3734
3322 $NOW = $tick_start = Event::time;
3323
3324 cf::server_tick; # one server iteration 3735 cf::server_tick; # one server iteration
3325 3736
3326 0 && sync_job {#d# 3737 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3327 for(1..10) { 3738 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3328 my $t = Event::time; 3739 Coro::async_pool {
3329 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3740 $Coro::current->{desc} = "runtime saver";
3330 or die; 3741 write_runtime_sync
3331 3742 or warn "ERROR: unable to write runtime file: $!";
3332 $map->width (50);
3333 $map->height (50);
3334 $map->alloc;
3335 $map->_load_objects ("/tmp/x.map", 1);
3336 my $t = Event::time - $t;
3337
3338 #next unless $t < 0.0013;#d#
3339 if ($t < $min) {
3340 $min = $t;
3341 }
3342 $avg = $avg * 0.99 + $t * 0.01;
3343 }
3344 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3345 exit 0;
3346 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3347 }; 3743 };
3744 }
3348 3745
3349 $RUNTIME += $TICK;
3350 $NEXT_TICK += $TICK;
3351
3352 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3353 $NEXT_RUNTIME_WRITE = $NOW + 10;
3354 Coro::async_pool {
3355 write_runtime
3356 or warn "ERROR: unable to write runtime file: $!";
3357 };
3358 }
3359
3360# my $AFTER = Event::time;
3361# warn $AFTER - $NOW;#d#
3362
3363 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3746 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3364 $sig->send; 3747 $sig->send;
3365 } 3748 }
3366 while (my $sig = shift @WAIT_FOR_TICK) { 3749 while (my $sig = shift @WAIT_FOR_TICK) {
3367 $sig->send; 3750 $sig->send;
3368 } 3751 }
3369 3752
3370 $NOW = Event::time; 3753 $LOAD = ($NOW - $TICK_START) / $TICK;
3371
3372 # if we are delayed by four ticks or more, skip them all
3373 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3374
3375 $TICK_WATCHER->at ($NEXT_TICK);
3376 $TICK_WATCHER->start;
3377
3378 $LOAD = ($NOW - $tick_start) / $TICK;
3379 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3754 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3380 3755
3381 _post_tick; 3756 if (0) {
3382 3757 if ($NEXT_TICK) {
3383 3758 my $jitter = $TICK_START - $NEXT_TICK;
3759 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3760 warn "jitter $JITTER\n";#d#
3761 }
3384 }, 3762 }
3385); 3763}
3386 3764
3387{ 3765{
3388 BDB::max_poll_time $TICK * 0.1; 3766 # configure BDB
3389 $BDB_POLL_WATCHER = Event->io ( 3767
3390 reentrant => 0,
3391 fd => BDB::poll_fileno,
3392 poll => 'r',
3393 prio => 0,
3394 data => WF_AUTOCANCEL,
3395 cb => \&BDB::poll_cb,
3396 );
3397 BDB::min_parallel 8; 3768 BDB::min_parallel 8;
3398 3769 BDB::max_poll_reqs $TICK * 0.1;
3399 BDB::set_sync_prepare { 3770 $Coro::BDB::WATCHER->priority (1);
3400 my $status;
3401 my $current = $Coro::current;
3402 (
3403 sub {
3404 $status = $!;
3405 $current->ready; undef $current;
3406 },
3407 sub {
3408 Coro::schedule while defined $current;
3409 $! = $status;
3410 },
3411 )
3412 };
3413 3771
3414 unless ($DB_ENV) { 3772 unless ($DB_ENV) {
3415 $DB_ENV = BDB::db_env_create; 3773 $DB_ENV = BDB::db_env_create;
3774 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3775 | BDB::LOG_AUTOREMOVE, 1);
3776 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3777 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3416 3778
3417 cf::sync_job { 3779 cf::sync_job {
3418 eval { 3780 eval {
3419 BDB::db_env_open 3781 BDB::db_env_open
3420 $DB_ENV, 3782 $DB_ENV,
3422 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3784 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3423 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3785 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3424 0666; 3786 0666;
3425 3787
3426 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3788 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3427
3428 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3429 $DB_ENV->set_lk_detect;
3430 }; 3789 };
3431 3790
3432 cf::cleanup "db_env_open(db): $@" if $@; 3791 cf::cleanup "db_env_open(db): $@" if $@;
3433 }; 3792 };
3434 } 3793 }
3794
3795 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3796 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3797 };
3798 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3799 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3800 };
3801 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3802 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3803 };
3435} 3804}
3436 3805
3437{ 3806{
3807 # configure IO::AIO
3808
3438 IO::AIO::min_parallel 8; 3809 IO::AIO::min_parallel 8;
3439
3440 undef $Coro::AIO::WATCHER;
3441 IO::AIO::max_poll_time $TICK * 0.1; 3810 IO::AIO::max_poll_time $TICK * 0.1;
3442 $AIO_POLL_WATCHER = Event->io ( 3811 $Coro::AIO::WATCHER->priority (1);
3443 reentrant => 0,
3444 data => WF_AUTOCANCEL,
3445 fd => IO::AIO::poll_fileno,
3446 poll => 'r',
3447 prio => 6,
3448 cb => \&IO::AIO::poll_cb,
3449 );
3450} 3812}
3451 3813
3452my $_log_backtrace; 3814my $_log_backtrace;
3453 3815
3454sub _log_backtrace { 3816sub _log_backtrace {
3458 3820
3459 # limit the # of concurrent backtraces 3821 # limit the # of concurrent backtraces
3460 if ($_log_backtrace < 2) { 3822 if ($_log_backtrace < 2) {
3461 ++$_log_backtrace; 3823 ++$_log_backtrace;
3462 async { 3824 async {
3825 $Coro::current->{desc} = "abt $msg";
3826
3463 my @bt = fork_call { 3827 my @bt = fork_call {
3464 @addr = map { sprintf "%x", $_ } @addr; 3828 @addr = map { sprintf "%x", $_ } @addr;
3465 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3829 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3466 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3830 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3467 or die "addr2line: $!"; 3831 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines