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.333 by root, Sun Aug 19 09:14:50 2007 UTC vs.
Revision 1.426 by root, Thu Apr 24 04:40:31 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 chmod SAVE_MODE, $fh;
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 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 chmod SAVE_MODE, $fh;
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 close $fh;
1025 aio_rename "$filename.pst~", "$filename.pst"; 1158 aio_rename "$filename.pst~", "$filename.pst";
1026 } 1159 }
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
1149 my ($type, $reply, @payload) = 1286 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg 1287 "ARRAY" eq ref $msg
1151 ? @$msg 1288 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1289 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153 1290
1291 my @reply;
1292
1154 if (my $cb = $EXTCMD{$type}) { 1293 if (my $cb = $EXTCMD{$type}) {
1155 my @reply = $cb->($pl, @payload); 1294 @reply = $cb->($pl, @payload);
1156
1157 $pl->ext_reply ($reply, @reply)
1158 if $reply;
1159 } 1295 }
1296
1297 $pl->ext_reply ($reply, @reply)
1298 if $reply;
1299
1160 } else { 1300 } else {
1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1301 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1162 } 1302 }
1163 1303
1164 cf::override; 1304 cf::override;
1217 my $msg = $@ ? "$v->{path}: $@\n" 1357 my $msg = $@ ? "$v->{path}: $@\n"
1218 : "$v->{base}: extension inactive.\n"; 1358 : "$v->{base}: extension inactive.\n";
1219 1359
1220 if (exists $v->{meta}{mandatory}) { 1360 if (exists $v->{meta}{mandatory}) {
1221 warn $msg; 1361 warn $msg;
1222 warn "mandatory extension failed to load, exiting.\n"; 1362 cf::cleanup "mandatory extension failed to load, exiting.";
1223 exit 1;
1224 } 1363 }
1225 1364
1226 warn $msg; 1365 warn $msg;
1227 } 1366 }
1228 1367
1253use Coro::AIO; 1392use Coro::AIO;
1254 1393
1255=head3 cf::player 1394=head3 cf::player
1256 1395
1257=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}
1258 1411
1259=item cf::player::find $login 1412=item cf::player::find $login
1260 1413
1261Returns the given player object, loading it if necessary (might block). 1414Returns the given player object, loading it if necessary (might block).
1262 1415
1298 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1451 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1299 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1452 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1300 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1453 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1301 aio_unlink +(playerdir $login) . "/$login.pl"; 1454 aio_unlink +(playerdir $login) . "/$login.pl";
1302 1455
1303 my $pl = load_pl path $login 1456 my $f = new_from_file cf::object::thawer path $login
1304 or return; 1457 or return;
1458
1459 my $pl = cf::player::load_pl $f
1460 or return;
1461 local $cf::PLAYER_LOADING{$login} = $pl;
1462 $f->resolve_delayed_derefs;
1305 $cf::PLAYER{$login} = $pl 1463 $cf::PLAYER{$login} = $pl
1306 } 1464 }
1307 } 1465 }
1308} 1466}
1309 1467
1318 return if $pl->{deny_save}; 1476 return if $pl->{deny_save};
1319 1477
1320 aio_mkdir playerdir $pl, 0770; 1478 aio_mkdir playerdir $pl, 0770;
1321 $pl->{last_save} = $cf::RUNTIME; 1479 $pl->{last_save} = $cf::RUNTIME;
1322 1480
1481 cf::get_slot 0.01;
1482
1323 $pl->save_pl ($path); 1483 $pl->save_pl ($path);
1324 Coro::cede; 1484 cf::cede_to_tick;
1325} 1485}
1326 1486
1327sub new($) { 1487sub new($) {
1328 my ($login) = @_; 1488 my ($login) = @_;
1329 1489
1407 or return []; 1567 or return [];
1408 1568
1409 my @logins; 1569 my @logins;
1410 1570
1411 for my $login (@$dirs) { 1571 for my $login (@$dirs) {
1572 my $path = path $login;
1573
1574 # a .pst is a dead give-away for a valid player
1575 unless (-e "$path.pst") {
1412 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1576 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1413 aio_read $fh, 0, 512, my $buf, 0 or next; 1577 aio_read $fh, 0, 512, my $buf, 0 or next;
1414 $buf !~ /^password -------------$/m or next; # official not-valid tag 1578 $buf !~ /^password -------------$/m or next; # official not-valid tag
1579 }
1415 1580
1416 utf8::decode $login; 1581 utf8::decode $login;
1417 push @logins, $login; 1582 push @logins, $login;
1418 } 1583 }
1419 1584
1452 1617
1453Expand crossfire pod fragments into protocol xml. 1618Expand crossfire pod fragments into protocol xml.
1454 1619
1455=cut 1620=cut
1456 1621
1622use re 'eval';
1623
1624my $group;
1625my $interior; $interior = qr{
1626 # match a pod interior sequence sans C<< >>
1627 (?:
1628 \ (.*?)\ (?{ $group = $^N })
1629 | < (??{$interior}) >
1630 )
1631}x;
1632
1457sub expand_cfpod { 1633sub expand_cfpod {
1458 ((my $self), (local $_)) = @_; 1634 my ($self, $pod) = @_;
1459 1635
1460 # escape & and < 1636 my $xml;
1461 s/&/&amp;/g;
1462 s/(?<![BIUGH])</&lt;/g;
1463 1637
1464 # this is buggy, it needs to properly take care of nested <'s 1638 while () {
1639 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1640 $group = $1;
1465 1641
1466 1 while 1642 $group =~ s/&/&amp;/g;
1467 # replace B<>, I<>, U<> etc. 1643 $group =~ s/</&lt;/g;
1468 s/B<([^\>]*)>/<b>$1<\/b>/ 1644
1469 || s/I<([^\>]*)>/<i>$1<\/i>/ 1645 $xml .= $group;
1470 || s/U<([^\>]*)>/<u>$1<\/u>/ 1646 } elsif ($pod =~ m%\G
1471 # replace G<male|female> tags 1647 ([BCGHITU])
1472 || s{G<([^>|]*)\|([^>]*)>}{ 1648 <
1473 $self->gender ? $2 : $1 1649 (?:
1474 }ge 1650 ([^<>]*) (?{ $group = $^N })
1475 # replace H<hint text> 1651 | < $interior >
1476 || s{H<([^\>]*)>} 1652 )
1653 >
1654 %gcsx
1477 { 1655 ) {
1656 my ($code, $data) = ($1, $group);
1657
1658 if ($code eq "B") {
1659 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1660 } elsif ($code eq "I") {
1661 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1662 } elsif ($code eq "U") {
1663 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1664 } elsif ($code eq "C") {
1665 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1666 } elsif ($code eq "T") {
1667 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1668 } elsif ($code eq "G") {
1669 my ($male, $female) = split /\|/, $data;
1670 $data = $self->gender ? $female : $male;
1671 $xml .= expand_cfpod ($self, $data);
1672 } elsif ($code eq "H") {
1478 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1673 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1479 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1674 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1480 "") 1675 "")
1481 [$self->{hintmode}] 1676 [$self->{hintmode}];
1677 } else {
1678 $xml .= "error processing '$code($data)' directive";
1482 }ge; 1679 }
1680 } else {
1681 if ($pod =~ /\G(.+)/) {
1682 warn "parse error while expanding $pod (at $1)";
1683 }
1684 last;
1685 }
1686 }
1483 1687
1688 for ($xml) {
1484 # create single paragraphs (very hackish) 1689 # create single paragraphs (very hackish)
1485 s/(?<=\S)\n(?=\w)/ /g; 1690 s/(?<=\S)\n(?=\w)/ /g;
1486 1691
1487 # compress some whitespace 1692 # compress some whitespace
1488 s/\s+\n/\n/g; # ws line-ends 1693 s/\s+\n/\n/g; # ws line-ends
1489 s/\n\n+/\n/g; # double lines 1694 s/\n\n+/\n/g; # double lines
1490 s/^\n+//; # beginning lines 1695 s/^\n+//; # beginning lines
1491 s/\n+$//; # ending lines 1696 s/\n+$//; # ending lines
1697 }
1492 1698
1493 $_ 1699 $xml
1494} 1700}
1701
1702no re 'eval';
1495 1703
1496sub hintmode { 1704sub hintmode {
1497 $_[0]{hintmode} = $_[1] if @_ > 1; 1705 $_[0]{hintmode} = $_[1] if @_ > 1;
1498 $_[0]{hintmode} 1706 $_[0]{hintmode}
1499} 1707}
1505=cut 1713=cut
1506 1714
1507sub ext_reply($$@) { 1715sub ext_reply($$@) {
1508 my ($self, $id, @msg) = @_; 1716 my ($self, $id, @msg) = @_;
1509 1717
1510 if ($self->ns->extcmd == 2) { 1718 $self->ns->ext_reply ($id, @msg)
1511 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1512 } elsif ($self->ns->extcmd == 1) {
1513 #TODO: version 1, remove
1514 unshift @msg, msgtype => "reply", msgid => $id;
1515 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1516 }
1517} 1719}
1518 1720
1519=item $player->ext_msg ($type, @msg) 1721=item $player->ext_msg ($type, @msg)
1520 1722
1521Sends an ext event to the client. 1723Sends an ext event to the client.
1577our $MAX_RESET = 3600; 1779our $MAX_RESET = 3600;
1578our $DEFAULT_RESET = 3000; 1780our $DEFAULT_RESET = 3000;
1579 1781
1580sub generate_random_map { 1782sub generate_random_map {
1581 my ($self, $rmp) = @_; 1783 my ($self, $rmp) = @_;
1784
1785 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1786
1582 # mit "rum" bekleckern, nicht 1787 # mit "rum" bekleckern, nicht
1583 $self->_create_random_map ( 1788 $self->_create_random_map (
1584 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1585 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1586 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1708 1913
1709# the temporary/swap location 1914# the temporary/swap location
1710sub save_path { 1915sub save_path {
1711 my ($self) = @_; 1916 my ($self) = @_;
1712 1917
1713 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1918 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1714 "$TMPDIR/$path.map" 1919 "$TMPDIR/$path.map"
1715} 1920}
1716 1921
1717# the unique path, undef == no special unique path 1922# the unique path, undef == no special unique path
1718sub uniq_path { 1923sub uniq_path {
1719 my ($self) = @_; 1924 my ($self) = @_;
1720 1925
1721 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1722 "$UNIQUEDIR/$path" 1927 "$UNIQUEDIR/$path"
1723} 1928}
1724 1929
1725# and all this just because we cannot iterate over 1930# and all this just because we cannot iterate over
1726# all maps in C++... 1931# all maps in C++...
1749 1954
1750sub load_header_from($) { 1955sub load_header_from($) {
1751 my ($self, $path) = @_; 1956 my ($self, $path) = @_;
1752 1957
1753 utf8::encode $path; 1958 utf8::encode $path;
1754 #aio_open $path, O_RDONLY, 0 1959 my $f = new_from_file cf::object::thawer $path
1755 # or return;
1756
1757 $self->_load_header ($path)
1758 or return; 1960 or return;
1961
1962 $self->_load_header ($f)
1963 or return;
1964
1965 local $MAP_LOADING{$self->{path}} = $self;
1966 $f->resolve_delayed_derefs;
1759 1967
1760 $self->{load_path} = $path; 1968 $self->{load_path} = $path;
1761 1969
1762 1 1970 1
1763} 1971}
1817sub find { 2025sub find {
1818 my ($path, $origin) = @_; 2026 my ($path, $origin) = @_;
1819 2027
1820 $path = normalise $path, $origin && $origin->path; 2028 $path = normalise $path, $origin && $origin->path;
1821 2029
2030 cf::lock_wait "map_data:$path";#d#remove
1822 cf::lock_wait "map_find:$path"; 2031 cf::lock_wait "map_find:$path";
1823 2032
1824 $cf::MAP{$path} || do { 2033 $cf::MAP{$path} || do {
1825 my $guard = cf::lock_acquire "map_find:$path"; 2034 my $guard1 = cf::lock_acquire "map_find:$path";
2035 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2036
1826 my $map = new_from_path cf::map $path 2037 my $map = new_from_path cf::map $path
1827 or return; 2038 or return;
1828 2039
1829 $map->{last_save} = $cf::RUNTIME; 2040 $map->{last_save} = $cf::RUNTIME;
1830 2041
1832 or return; 2043 or return;
1833 2044
1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2045 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1835 # doing this can freeze the server in a sync job, obviously 2046 # doing this can freeze the server in a sync job, obviously
1836 #$cf::WAIT_FOR_TICK->wait; 2047 #$cf::WAIT_FOR_TICK->wait;
2048 undef $guard1;
2049 undef $guard2;
1837 $map->reset; 2050 $map->reset;
1838 undef $guard;
1839 return find $path; 2051 return find $path;
1840 } 2052 }
1841 2053
1842 $cf::MAP{$path} = $map 2054 $cf::MAP{$path} = $map
1843 } 2055 }
1852 local $self->{deny_reset} = 1; # loading can take a long time 2064 local $self->{deny_reset} = 1; # loading can take a long time
1853 2065
1854 my $path = $self->{path}; 2066 my $path = $self->{path};
1855 2067
1856 { 2068 {
1857 my $guard = cf::lock_acquire "map_load:$path"; 2069 my $guard = cf::lock_acquire "map_data:$path";
1858 2070
2071 return unless $self->valid;
1859 return if $self->in_memory != cf::MAP_SWAPPED; 2072 return unless $self->in_memory == cf::MAP_SWAPPED;
1860 2073
1861 $self->in_memory (cf::MAP_LOADING); 2074 $self->in_memory (cf::MAP_LOADING);
1862 2075
1863 $self->alloc; 2076 $self->alloc;
1864 2077
1865 $self->pre_load; 2078 $self->pre_load;
1866 Coro::cede; 2079 cf::cede_to_tick;
1867 2080
2081 my $f = new_from_file cf::object::thawer $self->{load_path};
2082 $f->skip_block;
1868 $self->_load_objects ($self->{load_path}, 1) 2083 $self->_load_objects ($f)
1869 or return; 2084 or return;
1870 2085
1871 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2086 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1872 if delete $self->{load_original}; 2087 if delete $self->{load_original};
1873 2088
1874 if (my $uniq = $self->uniq_path) { 2089 if (my $uniq = $self->uniq_path) {
1875 utf8::encode $uniq; 2090 utf8::encode $uniq;
1876 if (aio_open $uniq, O_RDONLY, 0) { 2091 unless (aio_stat $uniq) {
2092 if (my $f = new_from_file cf::object::thawer $uniq) {
1877 $self->clear_unique_items; 2093 $self->clear_unique_items;
1878 $self->_load_objects ($uniq, 0); 2094 $self->_load_objects ($f);
2095 $f->resolve_delayed_derefs;
2096 }
1879 } 2097 }
1880 } 2098 }
1881 2099
1882 Coro::cede; 2100 $f->resolve_delayed_derefs;
2101
2102 cf::cede_to_tick;
1883 # now do the right thing for maps 2103 # now do the right thing for maps
1884 $self->link_multipart_objects; 2104 $self->link_multipart_objects;
1885 $self->difficulty ($self->estimate_difficulty) 2105 $self->difficulty ($self->estimate_difficulty)
1886 unless $self->difficulty; 2106 unless $self->difficulty;
1887 Coro::cede; 2107 cf::cede_to_tick;
1888 2108
1889 unless ($self->{deny_activate}) { 2109 unless ($self->{deny_activate}) {
1890 $self->decay_objects; 2110 $self->decay_objects;
1891 $self->fix_auto_apply; 2111 $self->fix_auto_apply;
1892 $self->update_buttons; 2112 $self->update_buttons;
1893 Coro::cede; 2113 cf::cede_to_tick;
1894 $self->set_darkness_map; 2114 $self->set_darkness_map;
1895 Coro::cede; 2115 cf::cede_to_tick;
1896 $self->activate; 2116 $self->activate;
1897 } 2117 }
1898 2118
1899 $self->{last_save} = $cf::RUNTIME; 2119 $self->{last_save} = $cf::RUNTIME;
1900 $self->last_access ($cf::RUNTIME); 2120 $self->last_access ($cf::RUNTIME);
1901 2121
1902 $self->in_memory (cf::MAP_IN_MEMORY); 2122 $self->in_memory (cf::MAP_ACTIVE);
1903 } 2123 }
1904 2124
1905 $self->post_load; 2125 $self->post_load;
1906} 2126}
1907 2127
1950} 2170}
1951 2171
1952sub do_load_sync { 2172sub do_load_sync {
1953 my ($map) = @_; 2173 my ($map) = @_;
1954 2174
2175 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2176 if $Coro::current == $Coro::main;
2177
1955 cf::sync_job { $map->load }; 2178 cf::sync_job { $map->load };
1956} 2179}
1957 2180
1958our %MAP_PREFETCH; 2181our %MAP_PREFETCH;
1959our $MAP_PREFETCHER = undef; 2182our $MAP_PREFETCHER = undef;
1960 2183
1961sub find_async { 2184sub find_async {
1962 my ($path, $origin) = @_; 2185 my ($path, $origin, $load) = @_;
1963 2186
1964 $path = normalise $path, $origin && $origin->{path}; 2187 $path = normalise $path, $origin && $origin->{path};
1965 2188
1966 if (my $map = $cf::MAP{$path}) { 2189 if (my $map = $cf::MAP{$path}) {
1967 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2190 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1968 } 2191 }
1969 2192
1970 undef $MAP_PREFETCH{$path}; 2193 $MAP_PREFETCH{$path} |= $load;
2194
1971 $MAP_PREFETCHER ||= cf::async { 2195 $MAP_PREFETCHER ||= cf::async {
2196 $Coro::current->{desc} = "map prefetcher";
2197
1972 while (%MAP_PREFETCH) { 2198 while (%MAP_PREFETCH) {
1973 for my $path (keys %MAP_PREFETCH) { 2199 while (my ($k, $v) = each %MAP_PREFETCH) {
1974 if (my $map = find $path) { 2200 if (my $map = find $k) {
1975 $map->load; 2201 $map->load if $v;
1976 } 2202 }
1977 2203
1978 delete $MAP_PREFETCH{$path}; 2204 delete $MAP_PREFETCH{$k};
1979 } 2205 }
1980 } 2206 }
1981 undef $MAP_PREFETCHER; 2207 undef $MAP_PREFETCHER;
1982 }; 2208 };
1983 $MAP_PREFETCHER->prio (6); 2209 $MAP_PREFETCHER->prio (6);
1986} 2212}
1987 2213
1988sub save { 2214sub save {
1989 my ($self) = @_; 2215 my ($self) = @_;
1990 2216
1991 my $lock = cf::lock_acquire "map_data:" . $self->path; 2217 my $lock = cf::lock_acquire "map_data:$self->{path}";
1992 2218
1993 $self->{last_save} = $cf::RUNTIME; 2219 $self->{last_save} = $cf::RUNTIME;
1994 2220
1995 return unless $self->dirty; 2221 return unless $self->dirty;
1996 2222
2002 return if $self->{deny_save}; 2228 return if $self->{deny_save};
2003 2229
2004 local $self->{last_access} = $self->last_access;#d# 2230 local $self->{last_access} = $self->last_access;#d#
2005 2231
2006 cf::async { 2232 cf::async {
2233 $Coro::current->{desc} = "map player save";
2007 $_->contr->save for $self->players; 2234 $_->contr->save for $self->players;
2008 }; 2235 };
2236
2237 cf::get_slot 0.02;
2009 2238
2010 if ($uniq) { 2239 if ($uniq) {
2011 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2240 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2012 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2241 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2013 } else { 2242 } else {
2019 my ($self) = @_; 2248 my ($self) = @_;
2020 2249
2021 # save first because save cedes 2250 # save first because save cedes
2022 $self->save; 2251 $self->save;
2023 2252
2024 my $lock = cf::lock_acquire "map_data:" . $self->path; 2253 my $lock = cf::lock_acquire "map_data:$self->{path}";
2025 2254
2026 return if $self->players; 2255 return if $self->players;
2027 return if $self->in_memory != cf::MAP_IN_MEMORY; 2256 return if $self->in_memory != cf::MAP_ACTIVE;
2028 return if $self->{deny_save}; 2257 return if $self->{deny_save};
2029 2258
2259 $self->in_memory (cf::MAP_SWAPPED);
2260
2261 $self->deactivate;
2262 $_->clear_links_to ($self) for values %cf::MAP;
2030 $self->clear; 2263 $self->clear;
2031 $self->in_memory (cf::MAP_SWAPPED);
2032} 2264}
2033 2265
2034sub reset_at { 2266sub reset_at {
2035 my ($self) = @_; 2267 my ($self) = @_;
2036 2268
2068 if $uniq; 2300 if $uniq;
2069 } 2301 }
2070 2302
2071 delete $cf::MAP{$self->path}; 2303 delete $cf::MAP{$self->path};
2072 2304
2305 $self->deactivate;
2306 $_->clear_links_to ($self) for values %cf::MAP;
2073 $self->clear; 2307 $self->clear;
2074
2075 $_->clear_links_to ($self) for values %cf::MAP;
2076 2308
2077 $self->unlink_save; 2309 $self->unlink_save;
2078 $self->destroy; 2310 $self->destroy;
2079} 2311}
2080 2312
2081my $nuke_counter = "aaaa"; 2313my $nuke_counter = "aaaa";
2082 2314
2083sub nuke { 2315sub nuke {
2084 my ($self) = @_; 2316 my ($self) = @_;
2085 2317
2318 {
2319 my $lock = cf::lock_acquire "map_data:$self->{path}";
2320
2086 delete $cf::MAP{$self->path}; 2321 delete $cf::MAP{$self->path};
2087 2322
2088 $self->unlink_save; 2323 $self->unlink_save;
2089 2324
2090 bless $self, "cf::map"; 2325 bless $self, "cf::map";
2091 delete $self->{deny_reset}; 2326 delete $self->{deny_reset};
2092 $self->{deny_save} = 1; 2327 $self->{deny_save} = 1;
2093 $self->reset_timeout (1); 2328 $self->reset_timeout (1);
2094 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2329 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2095 2330
2096 $cf::MAP{$self->path} = $self; 2331 $cf::MAP{$self->path} = $self;
2332 }
2097 2333
2098 $self->reset; # polite request, might not happen 2334 $self->reset; # polite request, might not happen
2099} 2335}
2100 2336
2101=item $maps = cf::map::tmp_maps 2337=item $maps = cf::map::tmp_maps
2143 2379
2144sub unique_maps() { 2380sub unique_maps() {
2145 [ 2381 [
2146 map { 2382 map {
2147 utf8::decode $_; 2383 utf8::decode $_;
2148 /\.map$/ 2384 s/\.map$//; # TODO future compatibility hack
2385 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2386 ? ()
2149 ? normalise $_ 2387 : normalise $_
2150 : ()
2151 } @{ aio_readdir $UNIQUEDIR or [] } 2388 } @{ aio_readdir $UNIQUEDIR or [] }
2152 ] 2389 ]
2153} 2390}
2154 2391
2155package cf;
2156
2157=back 2392=back
2158 2393
2159=head3 cf::object 2394=head3 cf::object
2160 2395
2161=cut 2396=cut
2164 2399
2165=over 4 2400=over 4
2166 2401
2167=item $ob->inv_recursive 2402=item $ob->inv_recursive
2168 2403
2169Returns the inventory of the object _and_ their inventories, recursively. 2404Returns the inventory of the object I<and> their inventories, recursively,
2405but I<not> the object itself.
2170 2406
2171=cut 2407=cut
2172 2408
2173sub inv_recursive_; 2409sub inv_recursive_;
2174sub inv_recursive_ { 2410sub inv_recursive_ {
2175 map { $_, inv_recursive_ $_->inv } @_ 2411 map { $_, inv_recursive_ $_->inv } @_
2176} 2412}
2177 2413
2178sub inv_recursive { 2414sub inv_recursive {
2179 inv_recursive_ inv $_[0] 2415 inv_recursive_ inv $_[0]
2416}
2417
2418=item $ref = $ob->ref
2419
2420Creates and returns a persistent reference to an object that can be stored as a string.
2421
2422=item $ob = cf::object::deref ($refstring)
2423
2424returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2425even if the object actually exists. May block.
2426
2427=cut
2428
2429sub deref {
2430 my ($ref) = @_;
2431
2432 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2433 my ($uuid, $name) = ($1, $2);
2434 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2435 or return;
2436 $pl->ob->uuid eq $uuid
2437 or return;
2438
2439 $pl->ob
2440 } else {
2441 warn "$ref: cannot resolve object reference\n";
2442 undef
2443 }
2180} 2444}
2181 2445
2182package cf; 2446package cf;
2183 2447
2184=back 2448=back
2344 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2608 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2345 2609
2346 $self->enter_link; 2610 $self->enter_link;
2347 2611
2348 (async { 2612 (async {
2613 $Coro::current->{desc} = "player::goto $path $x $y";
2614
2615 # *tag paths override both path and x|y
2616 if ($path =~ /^\*(.*)$/) {
2617 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2618 my $ob = $obs[rand @obs];
2619
2620 # see if we actually can go there
2621 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2622 $ob = $obs[rand @obs];
2623 } else {
2624 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2625 }
2626 # else put us there anyways for now #d#
2627
2628 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2629 } else {
2630 ($path, $x, $y) = (undef, undef, undef);
2631 }
2632 }
2633
2349 my $map = eval { 2634 my $map = eval {
2350 my $map = cf::map::find $path; 2635 my $map = defined $path ? cf::map::find $path : undef;
2351 2636
2352 if ($map) { 2637 if ($map) {
2353 $map = $map->customise_for ($self); 2638 $map = $map->customise_for ($self);
2354 $map = $check->($map) if $check && $map; 2639 $map = $check->($map) if $check && $map;
2355 } else { 2640 } else {
2356 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2641 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2357 } 2642 }
2358 2643
2359 $map 2644 $map
2360 }; 2645 };
2361 2646
2414 $rmp->{origin_y} = $exit->y; 2699 $rmp->{origin_y} = $exit->y;
2415 } 2700 }
2416 2701
2417 $rmp->{random_seed} ||= $exit->random_seed; 2702 $rmp->{random_seed} ||= $exit->random_seed;
2418 2703
2419 my $data = cf::to_json $rmp; 2704 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2420 my $md5 = Digest::MD5::md5_hex $data; 2705 my $md5 = Digest::MD5::md5_hex $data;
2421 my $meta = "$RANDOMDIR/$md5.meta"; 2706 my $meta = "$RANDOMDIR/$md5.meta";
2422 2707
2423 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2424 aio_write $fh, 0, (length $data), $data, 0; 2709 aio_write $fh, 0, (length $data), $data, 0;
2451 # if exit is damned, update players death & WoR home-position 2736 # if exit is damned, update players death & WoR home-position
2452 $self->contr->savebed ($slaying, $hp, $sp) 2737 $self->contr->savebed ($slaying, $hp, $sp)
2453 if $exit->flag (FLAG_DAMNED); 2738 if $exit->flag (FLAG_DAMNED);
2454 2739
2455 (async { 2740 (async {
2741 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2742
2456 $self->deactivate_recursive; # just to be sure 2743 $self->deactivate_recursive; # just to be sure
2457 unless (eval { 2744 unless (eval {
2458 $self->goto ($slaying, $hp, $sp); 2745 $self->goto ($slaying, $hp, $sp);
2459 2746
2460 1; 2747 1;
2495the message, with C<log> being the default. If C<$color> is negative, suppress 2782the message, with C<log> being the default. If C<$color> is negative, suppress
2496the message unless the client supports the msg packet. 2783the message unless the client supports the msg packet.
2497 2784
2498=cut 2785=cut
2499 2786
2787# non-persistent channels (usually the info channel)
2788our %CHANNEL = (
2789 "c/identify" => {
2790 id => "infobox",
2791 title => "Identify",
2792 reply => undef,
2793 tooltip => "Items recently identified",
2794 },
2795 "c/examine" => {
2796 id => "infobox",
2797 title => "Examine",
2798 reply => undef,
2799 tooltip => "Signs and other items you examined",
2800 },
2801 "c/book" => {
2802 id => "infobox",
2803 title => "Book",
2804 reply => undef,
2805 tooltip => "The contents of a note or book",
2806 },
2807 "c/lookat" => {
2808 id => "infobox",
2809 title => "Look",
2810 reply => undef,
2811 tooltip => "What you saw there",
2812 },
2813 "c/who" => {
2814 id => "infobox",
2815 title => "Players",
2816 reply => undef,
2817 tooltip => "Shows players who are currently online",
2818 },
2819 "c/body" => {
2820 id => "infobox",
2821 title => "Body Parts",
2822 reply => undef,
2823 tooltip => "Shows which body parts you posess and are available",
2824 },
2825 "c/uptime" => {
2826 id => "infobox",
2827 title => "Uptime",
2828 reply => undef,
2829 tooltip => "How long the server has been running since last restart",
2830 },
2831 "c/mapinfo" => {
2832 id => "infobox",
2833 title => "Map Info",
2834 reply => undef,
2835 tooltip => "Information related to the maps",
2836 },
2837 "c/party" => {
2838 id => "party",
2839 title => "Party",
2840 reply => "gsay ",
2841 tooltip => "Messages and chat related to your party",
2842 },
2843);
2844
2500sub cf::client::send_msg { 2845sub cf::client::send_msg {
2501 my ($self, $channel, $msg, $color, @extra) = @_; 2846 my ($self, $channel, $msg, $color, @extra) = @_;
2502 2847
2503 $msg = $self->pl->expand_cfpod ($msg); 2848 $msg = $self->pl->expand_cfpod ($msg);
2504 2849
2505 $color &= cf::NDI_CLIENT_MASK; # just in case... 2850 $color &= cf::NDI_CLIENT_MASK; # just in case...
2506 2851
2852 # check predefined channels, for the benefit of C
2853 if ($CHANNEL{$channel}) {
2854 $channel = $CHANNEL{$channel};
2855
2856 $self->ext_msg (channel_info => $channel)
2857 if $self->can_msg;
2858
2859 $channel = $channel->{id};
2860
2507 if (ref $channel) { 2861 } elsif (ref $channel) {
2508 # send meta info to client, if not yet sent 2862 # send meta info to client, if not yet sent
2509 unless (exists $self->{channel}{$channel->{id}}) { 2863 unless (exists $self->{channel}{$channel->{id}}) {
2510 $self->{channel}{$channel->{id}} = $channel; 2864 $self->{channel}{$channel->{id}} = $channel;
2511 $self->ext_msg (channel_info => $channel); 2865 $self->ext_msg (channel_info => $channel)
2866 if $self->can_msg;
2512 } 2867 }
2513 2868
2514 $channel = $channel->{id}; 2869 $channel = $channel->{id};
2515 } 2870 }
2516 2871
2557=cut 2912=cut
2558 2913
2559sub cf::client::ext_msg($$@) { 2914sub cf::client::ext_msg($$@) {
2560 my ($self, $type, @msg) = @_; 2915 my ($self, $type, @msg) = @_;
2561 2916
2562 my $extcmd = $self->extcmd;
2563
2564 if ($extcmd == 2) { 2917 if ($self->extcmd == 2) {
2565 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2918 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2566 } elsif ($extcmd == 1) { # TODO: remove 2919 } elsif ($self->extcmd == 1) { # TODO: remove
2567 push @msg, msgtype => "event_$type"; 2920 push @msg, msgtype => "event_$type";
2921 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2922 }
2923}
2924
2925=item $client->ext_reply ($msgid, @msg)
2926
2927Sends an ext reply to the client.
2928
2929=cut
2930
2931sub cf::client::ext_reply($$@) {
2932 my ($self, $id, @msg) = @_;
2933
2934 if ($self->extcmd == 2) {
2935 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2936 } elsif ($self->extcmd == 1) {
2937 #TODO: version 1, remove
2938 unshift @msg, msgtype => "reply", msgid => $id;
2568 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2939 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2569 } 2940 }
2570} 2941}
2571 2942
2572=item $success = $client->query ($flags, "text", \&cb) 2943=item $success = $client->query ($flags, "text", \&cb)
2634 my ($type, $reply, @payload) = 3005 my ($type, $reply, @payload) =
2635 "ARRAY" eq ref $msg 3006 "ARRAY" eq ref $msg
2636 ? @$msg 3007 ? @$msg
2637 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 3008 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2638 3009
3010 my @reply;
3011
2639 if (my $cb = $EXTICMD{$type}) { 3012 if (my $cb = $EXTICMD{$type}) {
2640 my @reply = $cb->($ns, @payload); 3013 @reply = $cb->($ns, @payload);
2641
2642 $ns->ext_reply ($reply, @reply)
2643 if $reply;
2644 } 3014 }
3015
3016 $ns->ext_reply ($reply, @reply)
3017 if $reply;
3018
2645 } else { 3019 } else {
2646 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3020 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2647 } 3021 }
2648 3022
2649 cf::override; 3023 cf::override;
2709=pod 3083=pod
2710 3084
2711The following functions and methods are available within a safe environment: 3085The following functions and methods are available within a safe environment:
2712 3086
2713 cf::object 3087 cf::object
2714 contr pay_amount pay_player map x y force_find force_add 3088 contr pay_amount pay_player map x y force_find force_add destroy
2715 insert remove name archname title slaying race 3089 insert remove name archname title slaying race decrease split
2716 3090
2717 cf::object::player 3091 cf::object::player
2718 player 3092 player
2719 3093
2720 cf::player 3094 cf::player
2725 3099
2726=cut 3100=cut
2727 3101
2728for ( 3102for (
2729 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3103 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2730 insert remove inv name archname title slaying race)], 3104 insert remove inv name archname title slaying race
3105 decrease split destroy)],
2731 ["cf::object::player" => qw(player)], 3106 ["cf::object::player" => qw(player)],
2732 ["cf::player" => qw(peaceful)], 3107 ["cf::player" => qw(peaceful)],
2733 ["cf::map" => qw(trigger)], 3108 ["cf::map" => qw(trigger)],
2734) { 3109) {
2735 no strict 'refs'; 3110 no strict 'refs';
2811# the server's init and main functions 3186# the server's init and main functions
2812 3187
2813sub load_facedata($) { 3188sub load_facedata($) {
2814 my ($path) = @_; 3189 my ($path) = @_;
2815 3190
3191 # HACK to clear player env face cache, we need some signal framework
3192 # for this (global event?)
3193 %ext::player_env::MUSIC_FACE_CACHE = ();
3194
3195 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3196
2816 warn "loading facedata from $path\n"; 3197 warn "loading facedata from $path\n";
2817 3198
2818 my $facedata; 3199 my $facedata;
2819 0 < aio_load $path, $facedata 3200 0 < aio_load $path, $facedata
2820 or die "$path: $!"; 3201 or die "$path: $!";
2822 $facedata = Coro::Storable::thaw $facedata; 3203 $facedata = Coro::Storable::thaw $facedata;
2823 3204
2824 $facedata->{version} == 2 3205 $facedata->{version} == 2
2825 or cf::cleanup "$path: version mismatch, cannot proceed."; 3206 or cf::cleanup "$path: version mismatch, cannot proceed.";
2826 3207
3208 # patch in the exptable
3209 $facedata->{resource}{"res/exp_table"} = {
3210 type => FT_RSRC,
3211 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3212 };
3213 cf::cede_to_tick;
3214
2827 { 3215 {
2828 my $faces = $facedata->{faceinfo}; 3216 my $faces = $facedata->{faceinfo};
2829 3217
2830 while (my ($face, $info) = each %$faces) { 3218 while (my ($face, $info) = each %$faces) {
2831 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3219 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3220
2832 cf::face::set_visibility $idx, $info->{visibility}; 3221 cf::face::set_visibility $idx, $info->{visibility};
2833 cf::face::set_magicmap $idx, $info->{magicmap}; 3222 cf::face::set_magicmap $idx, $info->{magicmap};
2834 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3223 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2835 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3224 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2836 3225
2837 cf::cede_to_tick; 3226 cf::cede_to_tick;
2838 } 3227 }
2839 3228
2840 while (my ($face, $info) = each %$faces) { 3229 while (my ($face, $info) = each %$faces) {
2841 next unless $info->{smooth}; 3230 next unless $info->{smooth};
3231
2842 my $idx = cf::face::find $face 3232 my $idx = cf::face::find $face
2843 or next; 3233 or next;
3234
2844 if (my $smooth = cf::face::find $info->{smooth}) { 3235 if (my $smooth = cf::face::find $info->{smooth}) {
2845 cf::face::set_smooth $idx, $smooth; 3236 cf::face::set_smooth $idx, $smooth;
2846 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3237 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2847 } else { 3238 } else {
2848 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3239 warn "smooth face '$info->{smooth}' not found for face '$face'";
2865 3256
2866 { 3257 {
2867 # TODO: for gcfclient pleasure, we should give resources 3258 # TODO: for gcfclient pleasure, we should give resources
2868 # that gcfclient doesn't grok a >10000 face index. 3259 # that gcfclient doesn't grok a >10000 face index.
2869 my $res = $facedata->{resource}; 3260 my $res = $facedata->{resource};
2870 my $enc = JSON::XS->new->utf8->canonical;
2871
2872 my $soundconf = delete $res->{"res/sound.conf"};
2873 3261
2874 while (my ($name, $info) = each %$res) { 3262 while (my ($name, $info) = each %$res) {
2875 my $meta = $enc->encode ({ 3263 if (defined $info->{type}) {
2876 name => $name,
2877 %{ $info->{meta} || {} },
2878 });
2879
2880 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3264 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3265 my $data;
2881 3266
2882 if ($info->{type} & 1) { 3267 if ($info->{type} & 1) {
2883 # prepend meta info 3268 # prepend meta info
2884 3269
3270 my $meta = $enc->encode ({
3271 name => $name,
3272 %{ $info->{meta} || {} },
3273 });
3274
2885 my $data = pack "(w/a*)*", $meta, $info->{data}; 3275 $data = pack "(w/a*)*", $meta, $info->{data};
2886 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata 3276 } else {
3277 $data = $info->{data};
3278 }
2887 3279
2888 cf::face::set_data $idx, 0, $data, $chk; 3280 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3281 cf::face::set_type $idx, $info->{type};
2889 } else { 3282 } else {
2890 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3283 $RESOURCE{$name} = $info;
2891 } 3284 }
2892 3285
2893 cf::face::set_type $idx, $info->{type};
2894
2895 cf::cede_to_tick; 3286 cf::cede_to_tick;
2896 } 3287 }
2897
2898 if ($soundconf) {
2899 $soundconf = $enc->decode (delete $soundconf->{data});
2900
2901 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2902 my $sound = $soundconf->{compat}[$_]
2903 or next;
2904
2905 my $face = cf::face::find "sound/$sound->[1]";
2906 cf::sound::set $sound->[0] => $face;
2907 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2908 }
2909
2910 while (my ($k, $v) = each %{$soundconf->{event}}) {
2911 my $face = cf::face::find "sound/$v";
2912 cf::sound::set $k => $face;
2913 }
2914 }
2915 } 3288 }
3289
3290 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2916 3291
2917 1 3292 1
2918} 3293}
3294
3295cf::global->attach (on_resource_update => sub {
3296 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3297 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3298
3299 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3300 my $sound = $soundconf->{compat}[$_]
3301 or next;
3302
3303 my $face = cf::face::find "sound/$sound->[1]";
3304 cf::sound::set $sound->[0] => $face;
3305 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3306 }
3307
3308 while (my ($k, $v) = each %{$soundconf->{event}}) {
3309 my $face = cf::face::find "sound/$v";
3310 cf::sound::set $k => $face;
3311 }
3312 }
3313});
2919 3314
2920register_exticmd fx_want => sub { 3315register_exticmd fx_want => sub {
2921 my ($ns, $want) = @_; 3316 my ($ns, $want) = @_;
2922 3317
2923 while (my ($k, $v) = each %$want) { 3318 while (my ($k, $v) = each %$want) {
2924 $ns->fx_want ($k, $v); 3319 $ns->fx_want ($k, $v);
2925 } 3320 }
2926}; 3321};
2927 3322
3323sub load_resource_file($) {
3324 my $guard = lock_acquire "load_resource_file";
3325
3326 my $status = load_resource_file_ $_[0];
3327 get_slot 0.1, 100;
3328 cf::arch::commit_load;
3329
3330 $status
3331}
3332
2928sub reload_regions { 3333sub reload_regions {
3334 # HACK to clear player env face cache, we need some signal framework
3335 # for this (global event?)
3336 %ext::player_env::MUSIC_FACE_CACHE = ();
3337
2929 load_resource_file "$MAPDIR/regions" 3338 load_resource_file "$MAPDIR/regions"
2930 or die "unable to load regions file\n"; 3339 or die "unable to load regions file\n";
2931 3340
2932 for (cf::region::list) { 3341 for (cf::region::list) {
2933 $_->{match} = qr/$_->{match}/ 3342 $_->{match} = qr/$_->{match}/
2941} 3350}
2942 3351
2943sub reload_archetypes { 3352sub reload_archetypes {
2944 load_resource_file "$DATADIR/archetypes" 3353 load_resource_file "$DATADIR/archetypes"
2945 or die "unable to load archetypes\n"; 3354 or die "unable to load archetypes\n";
2946 #d# NEED to laod twice to resolve forward references
2947 # this really needs to be done in an extra post-pass
2948 # (which needs to be synchronous, so solve it differently)
2949 load_resource_file "$DATADIR/archetypes"
2950 or die "unable to load archetypes\n";
2951} 3355}
2952 3356
2953sub reload_treasures { 3357sub reload_treasures {
2954 load_resource_file "$DATADIR/treasures" 3358 load_resource_file "$DATADIR/treasures"
2955 or die "unable to load treasurelists\n"; 3359 or die "unable to load treasurelists\n";
2956} 3360}
2957 3361
2958sub reload_resources { 3362sub reload_resources {
2959 warn "reloading resource files...\n"; 3363 warn "reloading resource files...\n";
2960 3364
3365 reload_facedata;
3366 reload_archetypes;
2961 reload_regions; 3367 reload_regions;
2962 reload_facedata;
2963 #reload_archetypes;#d#
2964 reload_archetypes;
2965 reload_treasures; 3368 reload_treasures;
2966 3369
2967 warn "finished reloading resource files\n"; 3370 warn "finished reloading resource files\n";
2968} 3371}
2969 3372
2970sub init { 3373sub init {
3374 my $guard = freeze_mainloop;
3375
2971 reload_resources; 3376 reload_resources;
2972} 3377}
2973 3378
2974sub cfg_load { 3379sub reload_config {
2975 open my $fh, "<:utf8", "$CONFDIR/config" 3380 open my $fh, "<:utf8", "$CONFDIR/config"
2976 or return; 3381 or return;
2977 3382
2978 local $/; 3383 local $/;
2979 *CFG = YAML::Syck::Load <$fh>; 3384 *CFG = YAML::Load <$fh>;
2980 3385
2981 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3386 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2982 3387
2983 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3388 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2984 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3389 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2995sub main { 3400sub main {
2996 # we must not ever block the main coroutine 3401 # we must not ever block the main coroutine
2997 local $Coro::idle = sub { 3402 local $Coro::idle = sub {
2998 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3403 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2999 (async { 3404 (async {
3000 Event::one_event; 3405 $Coro::current->{desc} = "IDLE BUG HANDLER";
3406 EV::loop EV::LOOP_ONESHOT;
3001 })->prio (Coro::PRIO_MAX); 3407 })->prio (Coro::PRIO_MAX);
3002 }; 3408 };
3003 3409
3004 cfg_load; 3410 {
3411 my $guard = freeze_mainloop;
3412 reload_config;
3005 db_init; 3413 db_init;
3006 load_extensions; 3414 load_extensions;
3007 3415
3008 $TICK_WATCHER->start; 3416 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3417 evthread_start IO::AIO::poll_fileno;
3418 }
3419
3009 Event::loop; 3420 EV::loop;
3010} 3421}
3011 3422
3012############################################################################# 3423#############################################################################
3013# initialisation and cleanup 3424# initialisation and cleanup
3014 3425
3015# install some emergency cleanup handlers 3426# install some emergency cleanup handlers
3016BEGIN { 3427BEGIN {
3428 our %SIGWATCHER = ();
3017 for my $signal (qw(INT HUP TERM)) { 3429 for my $signal (qw(INT HUP TERM)) {
3018 Event->signal ( 3430 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3019 reentrant => 0,
3020 data => WF_AUTOCANCEL,
3021 signal => $signal,
3022 prio => 0,
3023 cb => sub {
3024 cf::cleanup "SIG$signal"; 3431 cf::cleanup "SIG$signal";
3025 },
3026 ); 3432 };
3027 } 3433 }
3028} 3434}
3029 3435
3030sub write_runtime { 3436sub write_runtime_sync {
3031 my $runtime = "$LOCALDIR/runtime"; 3437 my $runtime = "$LOCALDIR/runtime";
3032 3438
3033 # first touch the runtime file to show we are still running: 3439 # first touch the runtime file to show we are still running:
3034 # the fsync below can take a very very long time. 3440 # the fsync below can take a very very long time.
3035 3441
3061 and return; 3467 and return;
3062 3468
3063 warn "runtime file written.\n"; 3469 warn "runtime file written.\n";
3064 3470
3065 1 3471 1
3472}
3473
3474our $uuid_lock;
3475our $uuid_skip;
3476
3477sub write_uuid_sync($) {
3478 $uuid_skip ||= $_[0];
3479
3480 return if $uuid_lock;
3481 local $uuid_lock = 1;
3482
3483 my $uuid = "$LOCALDIR/uuid";
3484
3485 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3486 or return;
3487
3488 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3489 $uuid_skip = 0;
3490
3491 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3492 and return;
3493
3494 # always fsync - this file is important
3495 aio_fsync $fh
3496 and return;
3497
3498 close $fh
3499 or return;
3500
3501 aio_rename "$uuid~", $uuid
3502 and return;
3503
3504 warn "uuid file written ($value).\n";
3505
3506 1
3507
3508}
3509
3510sub write_uuid($$) {
3511 my ($skip, $sync) = @_;
3512
3513 $sync ? write_uuid_sync $skip
3514 : async { write_uuid_sync $skip };
3066} 3515}
3067 3516
3068sub emergency_save() { 3517sub emergency_save() {
3069 my $freeze_guard = cf::freeze_mainloop; 3518 my $freeze_guard = cf::freeze_mainloop;
3070 3519
3076 # and maps saved/destroyed asynchronously. 3525 # and maps saved/destroyed asynchronously.
3077 warn "begin emergency player save\n"; 3526 warn "begin emergency player save\n";
3078 for my $login (keys %cf::PLAYER) { 3527 for my $login (keys %cf::PLAYER) {
3079 my $pl = $cf::PLAYER{$login} or next; 3528 my $pl = $cf::PLAYER{$login} or next;
3080 $pl->valid or next; 3529 $pl->valid or next;
3530 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3081 $pl->save; 3531 $pl->save;
3082 } 3532 }
3083 warn "end emergency player save\n"; 3533 warn "end emergency player save\n";
3084 3534
3085 warn "begin emergency map save\n"; 3535 warn "begin emergency map save\n";
3091 warn "end emergency map save\n"; 3541 warn "end emergency map save\n";
3092 3542
3093 warn "begin emergency database checkpoint\n"; 3543 warn "begin emergency database checkpoint\n";
3094 BDB::db_env_txn_checkpoint $DB_ENV; 3544 BDB::db_env_txn_checkpoint $DB_ENV;
3095 warn "end emergency database checkpoint\n"; 3545 warn "end emergency database checkpoint\n";
3546
3547 warn "begin write uuid\n";
3548 write_uuid_sync 1;
3549 warn "end write uuid\n";
3096 }; 3550 };
3097 3551
3098 warn "leave emergency perl save\n"; 3552 warn "leave emergency perl save\n";
3099} 3553}
3100 3554
3115 warn "reloading..."; 3569 warn "reloading...";
3116 3570
3117 warn "entering sync_job"; 3571 warn "entering sync_job";
3118 3572
3119 cf::sync_job { 3573 cf::sync_job {
3120 cf::write_runtime; # external watchdog should not bark 3574 cf::write_runtime_sync; # external watchdog should not bark
3121 cf::emergency_save; 3575 cf::emergency_save;
3122 cf::write_runtime; # external watchdog should not bark 3576 cf::write_runtime_sync; # external watchdog should not bark
3123 3577
3124 warn "syncing database to disk"; 3578 warn "syncing database to disk";
3125 BDB::db_env_txn_checkpoint $DB_ENV; 3579 BDB::db_env_txn_checkpoint $DB_ENV;
3126 3580
3127 # if anything goes wrong in here, we should simply crash as we already saved 3581 # if anything goes wrong in here, we should simply crash as we already saved
3128
3129 warn "cancelling all WF_AUTOCANCEL watchers";
3130 for (Event::all_watchers) {
3131 $_->cancel if $_->data & WF_AUTOCANCEL;
3132 }
3133 3582
3134 warn "flushing outstanding aio requests"; 3583 warn "flushing outstanding aio requests";
3135 for (;;) { 3584 for (;;) {
3136 BDB::flush; 3585 BDB::flush;
3137 IO::AIO::flush; 3586 IO::AIO::flush;
3138 Coro::cede; 3587 Coro::cede_notself;
3139 last unless IO::AIO::nreqs || BDB::nreqs; 3588 last unless IO::AIO::nreqs || BDB::nreqs;
3140 warn "iterate..."; 3589 warn "iterate...";
3141 } 3590 }
3142 3591
3143 ++$RELOAD; 3592 ++$RELOAD;
3202 warn "reloading cf.pm"; 3651 warn "reloading cf.pm";
3203 require cf; 3652 require cf;
3204 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3653 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3205 3654
3206 warn "loading config and database again"; 3655 warn "loading config and database again";
3207 cf::cfg_load; 3656 cf::reload_config;
3208 3657
3209 warn "loading extensions"; 3658 warn "loading extensions";
3210 cf::load_extensions; 3659 cf::load_extensions;
3211 3660
3212 warn "reattaching attachments to objects/players"; 3661 warn "reattaching attachments to objects/players";
3219 warn "leaving sync_job"; 3668 warn "leaving sync_job";
3220 3669
3221 1 3670 1
3222 } or do { 3671 } or do {
3223 warn $@; 3672 warn $@;
3224 warn "error while reloading, exiting."; 3673 cf::cleanup "error while reloading, exiting.";
3225 exit 1;
3226 }; 3674 };
3227 3675
3228 warn "reloaded"; 3676 warn "reloaded";
3229}; 3677};
3230 3678
3232 3680
3233sub reload_perl() { 3681sub reload_perl() {
3234 # doing reload synchronously and two reloads happen back-to-back, 3682 # doing reload synchronously and two reloads happen back-to-back,
3235 # coro crashes during coro_state_free->destroy here. 3683 # coro crashes during coro_state_free->destroy here.
3236 3684
3237 $RELOAD_WATCHER ||= Event->timer ( 3685 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3238 reentrant => 0,
3239 after => 0,
3240 data => WF_AUTOCANCEL,
3241 cb => sub {
3242 do_reload_perl; 3686 do_reload_perl;
3243 undef $RELOAD_WATCHER; 3687 undef $RELOAD_WATCHER;
3244 },
3245 ); 3688 };
3246} 3689}
3247 3690
3248register_command "reload" => sub { 3691register_command "reload" => sub {
3249 my ($who, $arg) = @_; 3692 my ($who, $arg) = @_;
3250 3693
3251 if ($who->flag (FLAG_WIZ)) { 3694 if ($who->flag (FLAG_WIZ)) {
3252 $who->message ("reloading server."); 3695 $who->message ("reloading server.");
3696 async {
3697 $Coro::current->{desc} = "perl_reload";
3253 async { reload_perl }; 3698 reload_perl;
3699 };
3254 } 3700 }
3255}; 3701};
3256 3702
3257unshift @INC, $LIBDIR; 3703unshift @INC, $LIBDIR;
3258 3704
3260 3706
3261our @WAIT_FOR_TICK; 3707our @WAIT_FOR_TICK;
3262our @WAIT_FOR_TICK_BEGIN; 3708our @WAIT_FOR_TICK_BEGIN;
3263 3709
3264sub wait_for_tick { 3710sub wait_for_tick {
3265 return unless $TICK_WATCHER->is_active;
3266 return if $Coro::current == $Coro::main; 3711 return if tick_inhibit || $Coro::current == $Coro::main;
3267 3712
3268 my $signal = new Coro::Signal; 3713 my $signal = new Coro::Signal;
3269 push @WAIT_FOR_TICK, $signal; 3714 push @WAIT_FOR_TICK, $signal;
3270 $signal->wait; 3715 $signal->wait;
3271} 3716}
3272 3717
3273sub wait_for_tick_begin { 3718sub wait_for_tick_begin {
3274 return unless $TICK_WATCHER->is_active;
3275 return if $Coro::current == $Coro::main; 3719 return if tick_inhibit || $Coro::current == $Coro::main;
3276 3720
3277 my $signal = new Coro::Signal; 3721 my $signal = new Coro::Signal;
3278 push @WAIT_FOR_TICK_BEGIN, $signal; 3722 push @WAIT_FOR_TICK_BEGIN, $signal;
3279 $signal->wait; 3723 $signal->wait;
3280} 3724}
3281 3725
3282 my $min = 1e6;#d# 3726sub tick {
3283 my $avg = 10;
3284$TICK_WATCHER = Event->timer (
3285 reentrant => 0,
3286 parked => 1,
3287 prio => 0,
3288 at => $NEXT_TICK || $TICK,
3289 data => WF_AUTOCANCEL,
3290 cb => sub {
3291 if ($Coro::current != $Coro::main) { 3727 if ($Coro::current != $Coro::main) {
3292 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3728 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3293 unless ++$bug_warning > 10; 3729 unless ++$bug_warning > 10;
3294 return; 3730 return;
3295 } 3731 }
3296 3732
3297 $NOW = $tick_start = Event::time;
3298
3299 cf::server_tick; # one server iteration 3733 cf::server_tick; # one server iteration
3300 3734
3301 0 && sync_job {#d# 3735 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3302 for(1..10) { 3736 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3303 my $t = Event::time; 3737 Coro::async_pool {
3304 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3738 $Coro::current->{desc} = "runtime saver";
3305 or die; 3739 write_runtime_sync
3306 3740 or warn "ERROR: unable to write runtime file: $!";
3307 $map->width (50);
3308 $map->height (50);
3309 $map->alloc;
3310 $map->_load_objects ("/tmp/x.map", 1);
3311 my $t = Event::time - $t;
3312
3313 #next unless $t < 0.0013;#d#
3314 if ($t < $min) {
3315 $min = $t;
3316 }
3317 $avg = $avg * 0.99 + $t * 0.01;
3318 }
3319 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3320 exit 0;
3321 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3322 }; 3741 };
3742 }
3323 3743
3324 $RUNTIME += $TICK;
3325 $NEXT_TICK += $TICK;
3326
3327 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3328 $NEXT_RUNTIME_WRITE = $NOW + 10;
3329 Coro::async_pool {
3330 write_runtime
3331 or warn "ERROR: unable to write runtime file: $!";
3332 };
3333 }
3334
3335# my $AFTER = Event::time;
3336# warn $AFTER - $NOW;#d#
3337
3338 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3744 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3339 $sig->send; 3745 $sig->send;
3340 } 3746 }
3341 while (my $sig = shift @WAIT_FOR_TICK) { 3747 while (my $sig = shift @WAIT_FOR_TICK) {
3342 $sig->send; 3748 $sig->send;
3343 } 3749 }
3344 3750
3345 $NOW = Event::time; 3751 $LOAD = ($NOW - $TICK_START) / $TICK;
3346
3347 # if we are delayed by four ticks or more, skip them all
3348 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3349
3350 $TICK_WATCHER->at ($NEXT_TICK);
3351 $TICK_WATCHER->start;
3352
3353 $LOAD = ($NOW - $tick_start) / $TICK;
3354 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3752 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3355 3753
3356 _post_tick; 3754 if (0) {
3357 3755 if ($NEXT_TICK) {
3358 3756 my $jitter = $TICK_START - $NEXT_TICK;
3757 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3758 warn "jitter $JITTER\n";#d#
3759 }
3359 }, 3760 }
3360); 3761}
3361 3762
3362{ 3763{
3363 BDB::max_poll_time $TICK * 0.1; 3764 # configure BDB
3364 $BDB_POLL_WATCHER = Event->io ( 3765
3365 reentrant => 0,
3366 fd => BDB::poll_fileno,
3367 poll => 'r',
3368 prio => 0,
3369 data => WF_AUTOCANCEL,
3370 cb => \&BDB::poll_cb,
3371 );
3372 BDB::min_parallel 8; 3766 BDB::min_parallel 8;
3373 3767 BDB::max_poll_reqs $TICK * 0.1;
3374 BDB::set_sync_prepare { 3768 $Coro::BDB::WATCHER->priority (1);
3375 my $status;
3376 my $current = $Coro::current;
3377 (
3378 sub {
3379 $status = $!;
3380 $current->ready; undef $current;
3381 },
3382 sub {
3383 Coro::schedule while defined $current;
3384 $! = $status;
3385 },
3386 )
3387 };
3388 3769
3389 unless ($DB_ENV) { 3770 unless ($DB_ENV) {
3390 $DB_ENV = BDB::db_env_create; 3771 $DB_ENV = BDB::db_env_create;
3772 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3773 | BDB::LOG_AUTOREMOVE, 1);
3774 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3775 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3391 3776
3392 cf::sync_job { 3777 cf::sync_job {
3393 eval { 3778 eval {
3394 BDB::db_env_open 3779 BDB::db_env_open
3395 $DB_ENV, 3780 $DB_ENV,
3397 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3782 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3398 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3783 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3399 0666; 3784 0666;
3400 3785
3401 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3786 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3402
3403 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3404 $DB_ENV->set_lk_detect;
3405 }; 3787 };
3406 3788
3407 cf::cleanup "db_env_open(db): $@" if $@; 3789 cf::cleanup "db_env_open(db): $@" if $@;
3408 }; 3790 };
3409 } 3791 }
3792
3793 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3794 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3795 };
3796 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3797 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3798 };
3799 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3800 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3801 };
3410} 3802}
3411 3803
3412{ 3804{
3805 # configure IO::AIO
3806
3413 IO::AIO::min_parallel 8; 3807 IO::AIO::min_parallel 8;
3414
3415 undef $Coro::AIO::WATCHER;
3416 IO::AIO::max_poll_time $TICK * 0.1; 3808 IO::AIO::max_poll_time $TICK * 0.1;
3417 $AIO_POLL_WATCHER = Event->io ( 3809 $Coro::AIO::WATCHER->priority (1);
3418 reentrant => 0,
3419 data => WF_AUTOCANCEL,
3420 fd => IO::AIO::poll_fileno,
3421 poll => 'r',
3422 prio => 6,
3423 cb => \&IO::AIO::poll_cb,
3424 );
3425} 3810}
3426 3811
3427my $_log_backtrace; 3812my $_log_backtrace;
3428 3813
3429sub _log_backtrace { 3814sub _log_backtrace {
3433 3818
3434 # limit the # of concurrent backtraces 3819 # limit the # of concurrent backtraces
3435 if ($_log_backtrace < 2) { 3820 if ($_log_backtrace < 2) {
3436 ++$_log_backtrace; 3821 ++$_log_backtrace;
3437 async { 3822 async {
3823 $Coro::current->{desc} = "abt $msg";
3824
3438 my @bt = fork_call { 3825 my @bt = fork_call {
3439 @addr = map { sprintf "%x", $_ } @addr; 3826 @addr = map { sprintf "%x", $_ } @addr;
3440 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3827 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3441 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3828 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3442 or die "addr2line: $!"; 3829 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines