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.335 by root, Mon Aug 20 22:21:48 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
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
1462 local $cf::PLAYER_LOADING{$login} = $pl;
1463 $f->resolve_delayed_derefs;
1305 $cf::PLAYER{$login} = $pl 1464 $cf::PLAYER{$login} = $pl
1306 } 1465 }
1307 } 1466 }
1308} 1467}
1309 1468
1318 return if $pl->{deny_save}; 1477 return if $pl->{deny_save};
1319 1478
1320 aio_mkdir playerdir $pl, 0770; 1479 aio_mkdir playerdir $pl, 0770;
1321 $pl->{last_save} = $cf::RUNTIME; 1480 $pl->{last_save} = $cf::RUNTIME;
1322 1481
1482 cf::get_slot 0.01;
1483
1323 $pl->save_pl ($path); 1484 $pl->save_pl ($path);
1324 Coro::cede; 1485 cf::cede_to_tick;
1325} 1486}
1326 1487
1327sub new($) { 1488sub new($) {
1328 my ($login) = @_; 1489 my ($login) = @_;
1329 1490
1407 or return []; 1568 or return [];
1408 1569
1409 my @logins; 1570 my @logins;
1410 1571
1411 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") {
1412 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1578 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1413 aio_read $fh, 0, 512, my $buf, 0 or next; 1579 aio_read $fh, 0, 512, my $buf, 0 or next;
1414 $buf !~ /^password -------------$/m or next; # official not-valid tag 1580 $buf !~ /^password -------------$/m or next; # official not-valid tag
1581 }
1415 1582
1416 utf8::decode $login; 1583 utf8::decode $login;
1417 push @logins, $login; 1584 push @logins, $login;
1418 } 1585 }
1419 1586
1452 1619
1453Expand crossfire pod fragments into protocol xml. 1620Expand crossfire pod fragments into protocol xml.
1454 1621
1455=cut 1622=cut
1456 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
1457sub expand_cfpod { 1635sub expand_cfpod {
1458 ((my $self), (local $_)) = @_; 1636 my ($self, $pod) = @_;
1459 1637
1460 # escape & and < 1638 my $xml;
1461 s/&/&amp;/g;
1462 s/(?<![BIUGH])</&lt;/g;
1463 1639
1464 # this is buggy, it needs to properly take care of nested <'s 1640 while () {
1641 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1642 $group = $1;
1465 1643
1466 1 while 1644 $group =~ s/&/&amp;/g;
1467 # replace B<>, I<>, U<> etc. 1645 $group =~ s/</&lt;/g;
1468 s/B<([^\>]*)>/<b>$1<\/b>/ 1646
1469 || s/I<([^\>]*)>/<i>$1<\/i>/ 1647 $xml .= $group;
1470 || s/U<([^\>]*)>/<u>$1<\/u>/ 1648 } elsif ($pod =~ m%\G
1471 # replace G<male|female> tags 1649 ([BCGHITU])
1472 || s{G<([^>|]*)\|([^>]*)>}{ 1650 <
1473 $self->gender ? $2 : $1 1651 (?:
1474 }ge 1652 ([^<>]*) (?{ $group = $^N })
1475 # replace H<hint text> 1653 | < $interior >
1476 || s{H<([^\>]*)>} 1654 )
1655 >
1656 %gcsx
1477 { 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") {
1478 ("<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>",
1479 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1676 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1480 "") 1677 "")
1481 [$self->{hintmode}] 1678 [$self->{hintmode}];
1679 } else {
1680 $xml .= "error processing '$code($data)' directive";
1482 }ge; 1681 }
1682 } else {
1683 if ($pod =~ /\G(.+)/) {
1684 warn "parse error while expanding $pod (at $1)";
1685 }
1686 last;
1687 }
1688 }
1483 1689
1690 for ($xml) {
1484 # create single paragraphs (very hackish) 1691 # create single paragraphs (very hackish)
1485 s/(?<=\S)\n(?=\w)/ /g; 1692 s/(?<=\S)\n(?=\w)/ /g;
1486 1693
1487 # compress some whitespace 1694 # compress some whitespace
1488 s/\s+\n/\n/g; # ws line-ends 1695 s/\s+\n/\n/g; # ws line-ends
1489 s/\n\n+/\n/g; # double lines 1696 s/\n\n+/\n/g; # double lines
1490 s/^\n+//; # beginning lines 1697 s/^\n+//; # beginning lines
1491 s/\n+$//; # ending lines 1698 s/\n+$//; # ending lines
1699 }
1492 1700
1493 $_ 1701 $xml
1494} 1702}
1703
1704no re 'eval';
1495 1705
1496sub hintmode { 1706sub hintmode {
1497 $_[0]{hintmode} = $_[1] if @_ > 1; 1707 $_[0]{hintmode} = $_[1] if @_ > 1;
1498 $_[0]{hintmode} 1708 $_[0]{hintmode}
1499} 1709}
1505=cut 1715=cut
1506 1716
1507sub ext_reply($$@) { 1717sub ext_reply($$@) {
1508 my ($self, $id, @msg) = @_; 1718 my ($self, $id, @msg) = @_;
1509 1719
1510 if ($self->ns->extcmd == 2) { 1720 $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} 1721}
1518 1722
1519=item $player->ext_msg ($type, @msg) 1723=item $player->ext_msg ($type, @msg)
1520 1724
1521Sends an ext event to the client. 1725Sends an ext event to the client.
1577our $MAX_RESET = 3600; 1781our $MAX_RESET = 3600;
1578our $DEFAULT_RESET = 3000; 1782our $DEFAULT_RESET = 3000;
1579 1783
1580sub generate_random_map { 1784sub generate_random_map {
1581 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
1582 # mit "rum" bekleckern, nicht 1789 # mit "rum" bekleckern, nicht
1583 $self->_create_random_map ( 1790 $self->_create_random_map (
1584 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1791 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1585 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1792 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1586 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1793 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1708 1915
1709# the temporary/swap location 1916# the temporary/swap location
1710sub save_path { 1917sub save_path {
1711 my ($self) = @_; 1918 my ($self) = @_;
1712 1919
1713 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1920 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1714 "$TMPDIR/$path.map" 1921 "$TMPDIR/$path.map"
1715} 1922}
1716 1923
1717# the unique path, undef == no special unique path 1924# the unique path, undef == no special unique path
1718sub uniq_path { 1925sub uniq_path {
1719 my ($self) = @_; 1926 my ($self) = @_;
1720 1927
1721 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1722 "$UNIQUEDIR/$path" 1929 "$UNIQUEDIR/$path"
1723} 1930}
1724 1931
1725# and all this just because we cannot iterate over 1932# and all this just because we cannot iterate over
1726# all maps in C++... 1933# all maps in C++...
1749 1956
1750sub load_header_from($) { 1957sub load_header_from($) {
1751 my ($self, $path) = @_; 1958 my ($self, $path) = @_;
1752 1959
1753 utf8::encode $path; 1960 utf8::encode $path;
1754 #aio_open $path, O_RDONLY, 0 1961 my $f = new_from_file cf::object::thawer $path
1755 # or return;
1756
1757 $self->_load_header ($path)
1758 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;
1759 1969
1760 $self->{load_path} = $path; 1970 $self->{load_path} = $path;
1761 1971
1762 1 1972 1
1763} 1973}
1817sub find { 2027sub find {
1818 my ($path, $origin) = @_; 2028 my ($path, $origin) = @_;
1819 2029
1820 $path = normalise $path, $origin && $origin->path; 2030 $path = normalise $path, $origin && $origin->path;
1821 2031
2032 cf::lock_wait "map_data:$path";#d#remove
1822 cf::lock_wait "map_find:$path"; 2033 cf::lock_wait "map_find:$path";
1823 2034
1824 $cf::MAP{$path} || do { 2035 $cf::MAP{$path} || do {
1825 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
1826 my $map = new_from_path cf::map $path 2039 my $map = new_from_path cf::map $path
1827 or return; 2040 or return;
1828 2041
1829 $map->{last_save} = $cf::RUNTIME; 2042 $map->{last_save} = $cf::RUNTIME;
1830 2043
1832 or return; 2045 or return;
1833 2046
1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2047 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1835 # doing this can freeze the server in a sync job, obviously 2048 # doing this can freeze the server in a sync job, obviously
1836 #$cf::WAIT_FOR_TICK->wait; 2049 #$cf::WAIT_FOR_TICK->wait;
2050 undef $guard1;
2051 undef $guard2;
1837 $map->reset; 2052 $map->reset;
1838 undef $guard;
1839 return find $path; 2053 return find $path;
1840 } 2054 }
1841 2055
1842 $cf::MAP{$path} = $map 2056 $cf::MAP{$path} = $map
1843 } 2057 }
1852 local $self->{deny_reset} = 1; # loading can take a long time 2066 local $self->{deny_reset} = 1; # loading can take a long time
1853 2067
1854 my $path = $self->{path}; 2068 my $path = $self->{path};
1855 2069
1856 { 2070 {
1857 my $guard = cf::lock_acquire "map_load:$path"; 2071 my $guard = cf::lock_acquire "map_data:$path";
1858 2072
2073 return unless $self->valid;
1859 return if $self->in_memory != cf::MAP_SWAPPED; 2074 return unless $self->in_memory == cf::MAP_SWAPPED;
1860 2075
1861 $self->in_memory (cf::MAP_LOADING); 2076 $self->in_memory (cf::MAP_LOADING);
1862 2077
1863 $self->alloc; 2078 $self->alloc;
1864 2079
1865 $self->pre_load; 2080 $self->pre_load;
1866 Coro::cede; 2081 cf::cede_to_tick;
1867 2082
2083 my $f = new_from_file cf::object::thawer $self->{load_path};
2084 $f->skip_block;
1868 $self->_load_objects ($self->{load_path}, 1) 2085 $self->_load_objects ($f)
1869 or return; 2086 or return;
1870 2087
1871 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2088 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1872 if delete $self->{load_original}; 2089 if delete $self->{load_original};
1873 2090
1874 if (my $uniq = $self->uniq_path) { 2091 if (my $uniq = $self->uniq_path) {
1875 utf8::encode $uniq; 2092 utf8::encode $uniq;
1876 if (aio_open $uniq, O_RDONLY, 0) { 2093 unless (aio_stat $uniq) {
2094 if (my $f = new_from_file cf::object::thawer $uniq) {
1877 $self->clear_unique_items; 2095 $self->clear_unique_items;
1878 $self->_load_objects ($uniq, 0); 2096 $self->_load_objects ($f);
2097 $f->resolve_delayed_derefs;
2098 }
1879 } 2099 }
1880 } 2100 }
1881 2101
1882 Coro::cede; 2102 $f->resolve_delayed_derefs;
2103
2104 cf::cede_to_tick;
1883 # now do the right thing for maps 2105 # now do the right thing for maps
1884 $self->link_multipart_objects; 2106 $self->link_multipart_objects;
1885 $self->difficulty ($self->estimate_difficulty) 2107 $self->difficulty ($self->estimate_difficulty)
1886 unless $self->difficulty; 2108 unless $self->difficulty;
1887 Coro::cede; 2109 cf::cede_to_tick;
1888 2110
1889 unless ($self->{deny_activate}) { 2111 unless ($self->{deny_activate}) {
1890 $self->decay_objects; 2112 $self->decay_objects;
1891 $self->fix_auto_apply; 2113 $self->fix_auto_apply;
1892 $self->update_buttons; 2114 $self->update_buttons;
1893 Coro::cede; 2115 cf::cede_to_tick;
1894 $self->set_darkness_map; 2116 $self->set_darkness_map;
1895 Coro::cede; 2117 cf::cede_to_tick;
1896 $self->activate; 2118 $self->activate;
1897 } 2119 }
1898 2120
1899 $self->{last_save} = $cf::RUNTIME; 2121 $self->{last_save} = $cf::RUNTIME;
1900 $self->last_access ($cf::RUNTIME); 2122 $self->last_access ($cf::RUNTIME);
1901 2123
1902 $self->in_memory (cf::MAP_IN_MEMORY); 2124 $self->in_memory (cf::MAP_ACTIVE);
1903 } 2125 }
1904 2126
1905 $self->post_load; 2127 $self->post_load;
1906} 2128}
1907 2129
1950} 2172}
1951 2173
1952sub do_load_sync { 2174sub do_load_sync {
1953 my ($map) = @_; 2175 my ($map) = @_;
1954 2176
2177 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2178 if $Coro::current == $Coro::main;
2179
1955 cf::sync_job { $map->load }; 2180 cf::sync_job { $map->load };
1956} 2181}
1957 2182
1958our %MAP_PREFETCH; 2183our %MAP_PREFETCH;
1959our $MAP_PREFETCHER = undef; 2184our $MAP_PREFETCHER = undef;
1960 2185
1961sub find_async { 2186sub find_async {
1962 my ($path, $origin) = @_; 2187 my ($path, $origin, $load) = @_;
1963 2188
1964 $path = normalise $path, $origin && $origin->{path}; 2189 $path = normalise $path, $origin && $origin->{path};
1965 2190
1966 if (my $map = $cf::MAP{$path}) { 2191 if (my $map = $cf::MAP{$path}) {
1967 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2192 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1968 } 2193 }
1969 2194
1970 undef $MAP_PREFETCH{$path}; 2195 $MAP_PREFETCH{$path} |= $load;
2196
1971 $MAP_PREFETCHER ||= cf::async { 2197 $MAP_PREFETCHER ||= cf::async {
2198 $Coro::current->{desc} = "map prefetcher";
2199
1972 while (%MAP_PREFETCH) { 2200 while (%MAP_PREFETCH) {
1973 for my $path (keys %MAP_PREFETCH) { 2201 while (my ($k, $v) = each %MAP_PREFETCH) {
1974 if (my $map = find $path) { 2202 if (my $map = find $k) {
1975 $map->load; 2203 $map->load if $v;
1976 } 2204 }
1977 2205
1978 delete $MAP_PREFETCH{$path}; 2206 delete $MAP_PREFETCH{$k};
1979 } 2207 }
1980 } 2208 }
1981 undef $MAP_PREFETCHER; 2209 undef $MAP_PREFETCHER;
1982 }; 2210 };
1983 $MAP_PREFETCHER->prio (6); 2211 $MAP_PREFETCHER->prio (6);
1986} 2214}
1987 2215
1988sub save { 2216sub save {
1989 my ($self) = @_; 2217 my ($self) = @_;
1990 2218
1991 my $lock = cf::lock_acquire "map_data:" . $self->path; 2219 my $lock = cf::lock_acquire "map_data:$self->{path}";
1992 2220
1993 $self->{last_save} = $cf::RUNTIME; 2221 $self->{last_save} = $cf::RUNTIME;
1994 2222
1995 return unless $self->dirty; 2223 return unless $self->dirty;
1996 2224
2002 return if $self->{deny_save}; 2230 return if $self->{deny_save};
2003 2231
2004 local $self->{last_access} = $self->last_access;#d# 2232 local $self->{last_access} = $self->last_access;#d#
2005 2233
2006 cf::async { 2234 cf::async {
2235 $Coro::current->{desc} = "map player save";
2007 $_->contr->save for $self->players; 2236 $_->contr->save for $self->players;
2008 }; 2237 };
2238
2239 cf::get_slot 0.02;
2009 2240
2010 if ($uniq) { 2241 if ($uniq) {
2011 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2242 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2012 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2243 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2013 } else { 2244 } else {
2019 my ($self) = @_; 2250 my ($self) = @_;
2020 2251
2021 # save first because save cedes 2252 # save first because save cedes
2022 $self->save; 2253 $self->save;
2023 2254
2024 my $lock = cf::lock_acquire "map_data:" . $self->path; 2255 my $lock = cf::lock_acquire "map_data:$self->{path}";
2025 2256
2026 return if $self->players; 2257 return if $self->players;
2027 return if $self->in_memory != cf::MAP_IN_MEMORY; 2258 return if $self->in_memory != cf::MAP_ACTIVE;
2028 return if $self->{deny_save}; 2259 return if $self->{deny_save};
2029 2260
2261 $self->in_memory (cf::MAP_SWAPPED);
2262
2263 $self->deactivate;
2264 $_->clear_links_to ($self) for values %cf::MAP;
2030 $self->clear; 2265 $self->clear;
2031 $self->in_memory (cf::MAP_SWAPPED);
2032} 2266}
2033 2267
2034sub reset_at { 2268sub reset_at {
2035 my ($self) = @_; 2269 my ($self) = @_;
2036 2270
2068 if $uniq; 2302 if $uniq;
2069 } 2303 }
2070 2304
2071 delete $cf::MAP{$self->path}; 2305 delete $cf::MAP{$self->path};
2072 2306
2307 $self->deactivate;
2308 $_->clear_links_to ($self) for values %cf::MAP;
2073 $self->clear; 2309 $self->clear;
2074
2075 $_->clear_links_to ($self) for values %cf::MAP;
2076 2310
2077 $self->unlink_save; 2311 $self->unlink_save;
2078 $self->destroy; 2312 $self->destroy;
2079} 2313}
2080 2314
2081my $nuke_counter = "aaaa"; 2315my $nuke_counter = "aaaa";
2082 2316
2083sub nuke { 2317sub nuke {
2084 my ($self) = @_; 2318 my ($self) = @_;
2085 2319
2320 {
2321 my $lock = cf::lock_acquire "map_data:$self->{path}";
2322
2086 delete $cf::MAP{$self->path}; 2323 delete $cf::MAP{$self->path};
2087 2324
2088 $self->unlink_save; 2325 $self->unlink_save;
2089 2326
2090 bless $self, "cf::map"; 2327 bless $self, "cf::map";
2091 delete $self->{deny_reset}; 2328 delete $self->{deny_reset};
2092 $self->{deny_save} = 1; 2329 $self->{deny_save} = 1;
2093 $self->reset_timeout (1); 2330 $self->reset_timeout (1);
2094 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2331 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2095 2332
2096 $cf::MAP{$self->path} = $self; 2333 $cf::MAP{$self->path} = $self;
2334 }
2097 2335
2098 $self->reset; # polite request, might not happen 2336 $self->reset; # polite request, might not happen
2099} 2337}
2100 2338
2101=item $maps = cf::map::tmp_maps 2339=item $maps = cf::map::tmp_maps
2143 2381
2144sub unique_maps() { 2382sub unique_maps() {
2145 [ 2383 [
2146 map { 2384 map {
2147 utf8::decode $_; 2385 utf8::decode $_;
2148 /\.map$/ 2386 s/\.map$//; # TODO future compatibility hack
2387 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2388 ? ()
2149 ? normalise $_ 2389 : normalise $_
2150 : ()
2151 } @{ aio_readdir $UNIQUEDIR or [] } 2390 } @{ aio_readdir $UNIQUEDIR or [] }
2152 ] 2391 ]
2153} 2392}
2154 2393
2155package cf;
2156
2157=back 2394=back
2158 2395
2159=head3 cf::object 2396=head3 cf::object
2160 2397
2161=cut 2398=cut
2164 2401
2165=over 4 2402=over 4
2166 2403
2167=item $ob->inv_recursive 2404=item $ob->inv_recursive
2168 2405
2169Returns 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.
2170 2408
2171=cut 2409=cut
2172 2410
2173sub inv_recursive_; 2411sub inv_recursive_;
2174sub inv_recursive_ { 2412sub inv_recursive_ {
2175 map { $_, inv_recursive_ $_->inv } @_ 2413 map { $_, inv_recursive_ $_->inv } @_
2176} 2414}
2177 2415
2178sub inv_recursive { 2416sub inv_recursive {
2179 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 }
2180} 2446}
2181 2447
2182package cf; 2448package cf;
2183 2449
2184=back 2450=back
2344 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2610 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2345 2611
2346 $self->enter_link; 2612 $self->enter_link;
2347 2613
2348 (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
2349 my $map = eval { 2636 my $map = eval {
2350 my $map = cf::map::find $path; 2637 my $map = defined $path ? cf::map::find $path : undef;
2351 2638
2352 if ($map) { 2639 if ($map) {
2353 $map = $map->customise_for ($self); 2640 $map = $map->customise_for ($self);
2354 $map = $check->($map) if $check && $map; 2641 $map = $check->($map) if $check && $map;
2355 } else { 2642 } else {
2356 $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);
2357 } 2644 }
2358 2645
2359 $map 2646 $map
2360 }; 2647 };
2361 2648
2414 $rmp->{origin_y} = $exit->y; 2701 $rmp->{origin_y} = $exit->y;
2415 } 2702 }
2416 2703
2417 $rmp->{random_seed} ||= $exit->random_seed; 2704 $rmp->{random_seed} ||= $exit->random_seed;
2418 2705
2419 my $data = cf::to_json $rmp; 2706 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2420 my $md5 = Digest::MD5::md5_hex $data; 2707 my $md5 = Digest::MD5::md5_hex $data;
2421 my $meta = "$RANDOMDIR/$md5.meta"; 2708 my $meta = "$RANDOMDIR/$md5.meta";
2422 2709
2423 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2710 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2424 aio_write $fh, 0, (length $data), $data, 0; 2711 aio_write $fh, 0, (length $data), $data, 0;
2451 # if exit is damned, update players death & WoR home-position 2738 # if exit is damned, update players death & WoR home-position
2452 $self->contr->savebed ($slaying, $hp, $sp) 2739 $self->contr->savebed ($slaying, $hp, $sp)
2453 if $exit->flag (FLAG_DAMNED); 2740 if $exit->flag (FLAG_DAMNED);
2454 2741
2455 (async { 2742 (async {
2743 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2744
2456 $self->deactivate_recursive; # just to be sure 2745 $self->deactivate_recursive; # just to be sure
2457 unless (eval { 2746 unless (eval {
2458 $self->goto ($slaying, $hp, $sp); 2747 $self->goto ($slaying, $hp, $sp);
2459 2748
2460 1; 2749 1;
2495the 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
2496the message unless the client supports the msg packet. 2785the message unless the client supports the msg packet.
2497 2786
2498=cut 2787=cut
2499 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
2500sub cf::client::send_msg { 2847sub cf::client::send_msg {
2501 my ($self, $channel, $msg, $color, @extra) = @_; 2848 my ($self, $channel, $msg, $color, @extra) = @_;
2502 2849
2503 $msg = $self->pl->expand_cfpod ($msg); 2850 $msg = $self->pl->expand_cfpod ($msg);
2504 2851
2505 $color &= cf::NDI_CLIENT_MASK; # just in case... 2852 $color &= cf::NDI_CLIENT_MASK; # just in case...
2506 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
2507 if (ref $channel) { 2863 } elsif (ref $channel) {
2508 # send meta info to client, if not yet sent 2864 # send meta info to client, if not yet sent
2509 unless (exists $self->{channel}{$channel->{id}}) { 2865 unless (exists $self->{channel}{$channel->{id}}) {
2510 $self->{channel}{$channel->{id}} = $channel; 2866 $self->{channel}{$channel->{id}} = $channel;
2511 $self->ext_msg (channel_info => $channel); 2867 $self->ext_msg (channel_info => $channel)
2868 if $self->can_msg;
2512 } 2869 }
2513 2870
2514 $channel = $channel->{id}; 2871 $channel = $channel->{id};
2515 } 2872 }
2516 2873
2557=cut 2914=cut
2558 2915
2559sub cf::client::ext_msg($$@) { 2916sub cf::client::ext_msg($$@) {
2560 my ($self, $type, @msg) = @_; 2917 my ($self, $type, @msg) = @_;
2561 2918
2562 my $extcmd = $self->extcmd;
2563
2564 if ($extcmd == 2) { 2919 if ($self->extcmd == 2) {
2565 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2920 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2566 } elsif ($extcmd == 1) { # TODO: remove 2921 } elsif ($self->extcmd == 1) { # TODO: remove
2567 push @msg, msgtype => "event_$type"; 2922 push @msg, msgtype => "event_$type";
2923 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2924 }
2925}
2926
2927=item $client->ext_reply ($msgid, @msg)
2928
2929Sends an ext reply to the client.
2930
2931=cut
2932
2933sub cf::client::ext_reply($$@) {
2934 my ($self, $id, @msg) = @_;
2935
2936 if ($self->extcmd == 2) {
2937 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2938 } elsif ($self->extcmd == 1) {
2939 #TODO: version 1, remove
2940 unshift @msg, msgtype => "reply", msgid => $id;
2568 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2941 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2569 } 2942 }
2570} 2943}
2571 2944
2572=item $success = $client->query ($flags, "text", \&cb) 2945=item $success = $client->query ($flags, "text", \&cb)
2634 my ($type, $reply, @payload) = 3007 my ($type, $reply, @payload) =
2635 "ARRAY" eq ref $msg 3008 "ARRAY" eq ref $msg
2636 ? @$msg 3009 ? @$msg
2637 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 3010 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2638 3011
3012 my @reply;
3013
2639 if (my $cb = $EXTICMD{$type}) { 3014 if (my $cb = $EXTICMD{$type}) {
2640 my @reply = $cb->($ns, @payload); 3015 @reply = $cb->($ns, @payload);
2641
2642 $ns->ext_reply ($reply, @reply)
2643 if $reply;
2644 } 3016 }
3017
3018 $ns->ext_reply ($reply, @reply)
3019 if $reply;
3020
2645 } else { 3021 } else {
2646 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3022 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2647 } 3023 }
2648 3024
2649 cf::override; 3025 cf::override;
2709=pod 3085=pod
2710 3086
2711The following functions and methods are available within a safe environment: 3087The following functions and methods are available within a safe environment:
2712 3088
2713 cf::object 3089 cf::object
2714 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
2715 insert remove name archname title slaying race 3091 insert remove name archname title slaying race decrease split
2716 3092
2717 cf::object::player 3093 cf::object::player
2718 player 3094 player
2719 3095
2720 cf::player 3096 cf::player
2725 3101
2726=cut 3102=cut
2727 3103
2728for ( 3104for (
2729 ["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
2730 insert remove inv name archname title slaying race)], 3106 insert remove inv name archname title slaying race
3107 decrease split destroy)],
2731 ["cf::object::player" => qw(player)], 3108 ["cf::object::player" => qw(player)],
2732 ["cf::player" => qw(peaceful)], 3109 ["cf::player" => qw(peaceful)],
2733 ["cf::map" => qw(trigger)], 3110 ["cf::map" => qw(trigger)],
2734) { 3111) {
2735 no strict 'refs'; 3112 no strict 'refs';
2811# the server's init and main functions 3188# the server's init and main functions
2812 3189
2813sub load_facedata($) { 3190sub load_facedata($) {
2814 my ($path) = @_; 3191 my ($path) = @_;
2815 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
2816 my $enc = JSON::XS->new->utf8->canonical; 3197 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2817 3198
2818 warn "loading facedata from $path\n"; 3199 warn "loading facedata from $path\n";
2819 3200
2820 my $facedata; 3201 my $facedata;
2821 0 < aio_load $path, $facedata 3202 0 < aio_load $path, $facedata
2827 or cf::cleanup "$path: version mismatch, cannot proceed."; 3208 or cf::cleanup "$path: version mismatch, cannot proceed.";
2828 3209
2829 # patch in the exptable 3210 # patch in the exptable
2830 $facedata->{resource}{"res/exp_table"} = { 3211 $facedata->{resource}{"res/exp_table"} = {
2831 type => FT_RSRC, 3212 type => FT_RSRC,
2832 data => $enc->encode ([map cf::level_to_min_exp $_, 0 .. cf::settings->max_level]), 3213 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2833 }; 3214 };
2834 cf::cede_to_tick; 3215 cf::cede_to_tick;
2835 3216
2836 { 3217 {
2837 my $faces = $facedata->{faceinfo}; 3218 my $faces = $facedata->{faceinfo};
2838 3219
2839 while (my ($face, $info) = each %$faces) { 3220 while (my ($face, $info) = each %$faces) {
2840 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3221 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3222
2841 cf::face::set_visibility $idx, $info->{visibility}; 3223 cf::face::set_visibility $idx, $info->{visibility};
2842 cf::face::set_magicmap $idx, $info->{magicmap}; 3224 cf::face::set_magicmap $idx, $info->{magicmap};
2843 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};
2844 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};
2845 3227
2846 cf::cede_to_tick; 3228 cf::cede_to_tick;
2847 } 3229 }
2848 3230
2849 while (my ($face, $info) = each %$faces) { 3231 while (my ($face, $info) = each %$faces) {
2850 next unless $info->{smooth}; 3232 next unless $info->{smooth};
3233
2851 my $idx = cf::face::find $face 3234 my $idx = cf::face::find $face
2852 or next; 3235 or next;
3236
2853 if (my $smooth = cf::face::find $info->{smooth}) { 3237 if (my $smooth = cf::face::find $info->{smooth}) {
2854 cf::face::set_smooth $idx, $smooth; 3238 cf::face::set_smooth $idx, $smooth;
2855 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3239 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2856 } else { 3240 } else {
2857 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3241 warn "smooth face '$info->{smooth}' not found for face '$face'";
2875 { 3259 {
2876 # TODO: for gcfclient pleasure, we should give resources 3260 # TODO: for gcfclient pleasure, we should give resources
2877 # that gcfclient doesn't grok a >10000 face index. 3261 # that gcfclient doesn't grok a >10000 face index.
2878 my $res = $facedata->{resource}; 3262 my $res = $facedata->{resource};
2879 3263
2880 my $soundconf = delete $res->{"res/sound.conf"};
2881
2882 while (my ($name, $info) = each %$res) { 3264 while (my ($name, $info) = each %$res) {
3265 if (defined $info->{type}) {
2883 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3266 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2884 my $data; 3267 my $data;
2885 3268
2886 if ($info->{type} & 1) { 3269 if ($info->{type} & 1) {
2887 # prepend meta info 3270 # prepend meta info
2888 3271
2889 my $meta = $enc->encode ({ 3272 my $meta = $enc->encode ({
2890 name => $name, 3273 name => $name,
2891 %{ $info->{meta} || {} }, 3274 %{ $info->{meta} || {} },
2892 }); 3275 });
2893 3276
2894 $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};
3284 } else {
3285 $RESOURCE{$name} = $info;
2895 } 3286 }
2896 3287
2897 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2898 cf::face::set_type $idx, $info->{type};
2899
2900 cf::cede_to_tick; 3288 cf::cede_to_tick;
2901 } 3289 }
2902
2903 if ($soundconf) {
2904 $soundconf = $enc->decode (delete $soundconf->{data});
2905
2906 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2907 my $sound = $soundconf->{compat}[$_]
2908 or next;
2909
2910 my $face = cf::face::find "sound/$sound->[1]";
2911 cf::sound::set $sound->[0] => $face;
2912 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2913 }
2914
2915 while (my ($k, $v) = each %{$soundconf->{event}}) {
2916 my $face = cf::face::find "sound/$v";
2917 cf::sound::set $k => $face;
2918 }
2919 }
2920 } 3290 }
3291
3292 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2921 3293
2922 1 3294 1
2923} 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});
2924 3316
2925register_exticmd fx_want => sub { 3317register_exticmd fx_want => sub {
2926 my ($ns, $want) = @_; 3318 my ($ns, $want) = @_;
2927 3319
2928 while (my ($k, $v) = each %$want) { 3320 while (my ($k, $v) = each %$want) {
2929 $ns->fx_want ($k, $v); 3321 $ns->fx_want ($k, $v);
2930 } 3322 }
2931}; 3323};
2932 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
2933sub 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
2934 load_resource_file "$MAPDIR/regions" 3340 load_resource_file "$MAPDIR/regions"
2935 or die "unable to load regions file\n"; 3341 or die "unable to load regions file\n";
2936 3342
2937 for (cf::region::list) { 3343 for (cf::region::list) {
2938 $_->{match} = qr/$_->{match}/ 3344 $_->{match} = qr/$_->{match}/
2946} 3352}
2947 3353
2948sub reload_archetypes { 3354sub reload_archetypes {
2949 load_resource_file "$DATADIR/archetypes" 3355 load_resource_file "$DATADIR/archetypes"
2950 or die "unable to load archetypes\n"; 3356 or die "unable to load archetypes\n";
2951 #d# NEED to laod twice to resolve forward references
2952 # this really needs to be done in an extra post-pass
2953 # (which needs to be synchronous, so solve it differently)
2954 load_resource_file "$DATADIR/archetypes"
2955 or die "unable to load archetypes\n";
2956} 3357}
2957 3358
2958sub reload_treasures { 3359sub reload_treasures {
2959 load_resource_file "$DATADIR/treasures" 3360 load_resource_file "$DATADIR/treasures"
2960 or die "unable to load treasurelists\n"; 3361 or die "unable to load treasurelists\n";
2961} 3362}
2962 3363
2963sub reload_resources { 3364sub reload_resources {
2964 warn "reloading resource files...\n"; 3365 warn "reloading resource files...\n";
2965 3366
3367 reload_facedata;
3368 reload_archetypes;
2966 reload_regions; 3369 reload_regions;
2967 reload_facedata;
2968 #reload_archetypes;#d#
2969 reload_archetypes;
2970 reload_treasures; 3370 reload_treasures;
2971 3371
2972 warn "finished reloading resource files\n"; 3372 warn "finished reloading resource files\n";
2973} 3373}
2974 3374
2975sub init { 3375sub init {
3376 my $guard = freeze_mainloop;
3377
2976 reload_resources; 3378 reload_resources;
2977} 3379}
2978 3380
2979sub cfg_load { 3381sub reload_config {
2980 open my $fh, "<:utf8", "$CONFDIR/config" 3382 open my $fh, "<:utf8", "$CONFDIR/config"
2981 or return; 3383 or return;
2982 3384
2983 local $/; 3385 local $/;
2984 *CFG = YAML::Syck::Load <$fh>; 3386 *CFG = YAML::Load <$fh>;
2985 3387
2986 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3388 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2987 3389
2988 $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};
2989 $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};
3000sub main { 3402sub main {
3001 # we must not ever block the main coroutine 3403 # we must not ever block the main coroutine
3002 local $Coro::idle = sub { 3404 local $Coro::idle = sub {
3003 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#
3004 (async { 3406 (async {
3005 Event::one_event; 3407 $Coro::current->{desc} = "IDLE BUG HANDLER";
3408 EV::loop EV::LOOP_ONESHOT;
3006 })->prio (Coro::PRIO_MAX); 3409 })->prio (Coro::PRIO_MAX);
3007 }; 3410 };
3008 3411
3009 cfg_load; 3412 {
3413 my $guard = freeze_mainloop;
3414 reload_config;
3010 db_init; 3415 db_init;
3011 load_extensions; 3416 load_extensions;
3012 3417
3013 $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
3014 Event::loop; 3422 EV::loop;
3015} 3423}
3016 3424
3017############################################################################# 3425#############################################################################
3018# initialisation and cleanup 3426# initialisation and cleanup
3019 3427
3020# install some emergency cleanup handlers 3428# install some emergency cleanup handlers
3021BEGIN { 3429BEGIN {
3430 our %SIGWATCHER = ();
3022 for my $signal (qw(INT HUP TERM)) { 3431 for my $signal (qw(INT HUP TERM)) {
3023 Event->signal ( 3432 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3024 reentrant => 0,
3025 data => WF_AUTOCANCEL,
3026 signal => $signal,
3027 prio => 0,
3028 cb => sub {
3029 cf::cleanup "SIG$signal"; 3433 cf::cleanup "SIG$signal";
3030 },
3031 ); 3434 };
3032 } 3435 }
3033} 3436}
3034 3437
3035sub write_runtime { 3438sub write_runtime_sync {
3036 my $runtime = "$LOCALDIR/runtime"; 3439 my $runtime = "$LOCALDIR/runtime";
3037 3440
3038 # first touch the runtime file to show we are still running: 3441 # first touch the runtime file to show we are still running:
3039 # the fsync below can take a very very long time. 3442 # the fsync below can take a very very long time.
3040 3443
3066 and return; 3469 and return;
3067 3470
3068 warn "runtime file written.\n"; 3471 warn "runtime file written.\n";
3069 3472
3070 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 };
3071} 3517}
3072 3518
3073sub emergency_save() { 3519sub emergency_save() {
3074 my $freeze_guard = cf::freeze_mainloop; 3520 my $freeze_guard = cf::freeze_mainloop;
3075 3521
3081 # and maps saved/destroyed asynchronously. 3527 # and maps saved/destroyed asynchronously.
3082 warn "begin emergency player save\n"; 3528 warn "begin emergency player save\n";
3083 for my $login (keys %cf::PLAYER) { 3529 for my $login (keys %cf::PLAYER) {
3084 my $pl = $cf::PLAYER{$login} or next; 3530 my $pl = $cf::PLAYER{$login} or next;
3085 $pl->valid or next; 3531 $pl->valid or next;
3532 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3086 $pl->save; 3533 $pl->save;
3087 } 3534 }
3088 warn "end emergency player save\n"; 3535 warn "end emergency player save\n";
3089 3536
3090 warn "begin emergency map save\n"; 3537 warn "begin emergency map save\n";
3096 warn "end emergency map save\n"; 3543 warn "end emergency map save\n";
3097 3544
3098 warn "begin emergency database checkpoint\n"; 3545 warn "begin emergency database checkpoint\n";
3099 BDB::db_env_txn_checkpoint $DB_ENV; 3546 BDB::db_env_txn_checkpoint $DB_ENV;
3100 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";
3101 }; 3552 };
3102 3553
3103 warn "leave emergency perl save\n"; 3554 warn "leave emergency perl save\n";
3104} 3555}
3105 3556
3120 warn "reloading..."; 3571 warn "reloading...";
3121 3572
3122 warn "entering sync_job"; 3573 warn "entering sync_job";
3123 3574
3124 cf::sync_job { 3575 cf::sync_job {
3125 cf::write_runtime; # external watchdog should not bark 3576 cf::write_runtime_sync; # external watchdog should not bark
3126 cf::emergency_save; 3577 cf::emergency_save;
3127 cf::write_runtime; # external watchdog should not bark 3578 cf::write_runtime_sync; # external watchdog should not bark
3128 3579
3129 warn "syncing database to disk"; 3580 warn "syncing database to disk";
3130 BDB::db_env_txn_checkpoint $DB_ENV; 3581 BDB::db_env_txn_checkpoint $DB_ENV;
3131 3582
3132 # 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
3133
3134 warn "cancelling all WF_AUTOCANCEL watchers";
3135 for (Event::all_watchers) {
3136 $_->cancel if $_->data & WF_AUTOCANCEL;
3137 }
3138 3584
3139 warn "flushing outstanding aio requests"; 3585 warn "flushing outstanding aio requests";
3140 for (;;) { 3586 for (;;) {
3141 BDB::flush; 3587 BDB::flush;
3142 IO::AIO::flush; 3588 IO::AIO::flush;
3143 Coro::cede; 3589 Coro::cede_notself;
3144 last unless IO::AIO::nreqs || BDB::nreqs; 3590 last unless IO::AIO::nreqs || BDB::nreqs;
3145 warn "iterate..."; 3591 warn "iterate...";
3146 } 3592 }
3147 3593
3148 ++$RELOAD; 3594 ++$RELOAD;
3207 warn "reloading cf.pm"; 3653 warn "reloading cf.pm";
3208 require cf; 3654 require cf;
3209 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3655 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3210 3656
3211 warn "loading config and database again"; 3657 warn "loading config and database again";
3212 cf::cfg_load; 3658 cf::reload_config;
3213 3659
3214 warn "loading extensions"; 3660 warn "loading extensions";
3215 cf::load_extensions; 3661 cf::load_extensions;
3216 3662
3217 warn "reattaching attachments to objects/players"; 3663 warn "reattaching attachments to objects/players";
3224 warn "leaving sync_job"; 3670 warn "leaving sync_job";
3225 3671
3226 1 3672 1
3227 } or do { 3673 } or do {
3228 warn $@; 3674 warn $@;
3229 warn "error while reloading, exiting."; 3675 cf::cleanup "error while reloading, exiting.";
3230 exit 1;
3231 }; 3676 };
3232 3677
3233 warn "reloaded"; 3678 warn "reloaded";
3234}; 3679};
3235 3680
3237 3682
3238sub reload_perl() { 3683sub reload_perl() {
3239 # doing reload synchronously and two reloads happen back-to-back, 3684 # doing reload synchronously and two reloads happen back-to-back,
3240 # coro crashes during coro_state_free->destroy here. 3685 # coro crashes during coro_state_free->destroy here.
3241 3686
3242 $RELOAD_WATCHER ||= Event->timer ( 3687 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3243 reentrant => 0,
3244 after => 0,
3245 data => WF_AUTOCANCEL,
3246 cb => sub {
3247 do_reload_perl; 3688 do_reload_perl;
3248 undef $RELOAD_WATCHER; 3689 undef $RELOAD_WATCHER;
3249 },
3250 ); 3690 };
3251} 3691}
3252 3692
3253register_command "reload" => sub { 3693register_command "reload" => sub {
3254 my ($who, $arg) = @_; 3694 my ($who, $arg) = @_;
3255 3695
3256 if ($who->flag (FLAG_WIZ)) { 3696 if ($who->flag (FLAG_WIZ)) {
3257 $who->message ("reloading server."); 3697 $who->message ("reloading server.");
3698 async {
3699 $Coro::current->{desc} = "perl_reload";
3258 async { reload_perl }; 3700 reload_perl;
3701 };
3259 } 3702 }
3260}; 3703};
3261 3704
3262unshift @INC, $LIBDIR; 3705unshift @INC, $LIBDIR;
3263 3706
3265 3708
3266our @WAIT_FOR_TICK; 3709our @WAIT_FOR_TICK;
3267our @WAIT_FOR_TICK_BEGIN; 3710our @WAIT_FOR_TICK_BEGIN;
3268 3711
3269sub wait_for_tick { 3712sub wait_for_tick {
3270 return unless $TICK_WATCHER->is_active;
3271 return if $Coro::current == $Coro::main; 3713 return if tick_inhibit || $Coro::current == $Coro::main;
3272 3714
3273 my $signal = new Coro::Signal; 3715 my $signal = new Coro::Signal;
3274 push @WAIT_FOR_TICK, $signal; 3716 push @WAIT_FOR_TICK, $signal;
3275 $signal->wait; 3717 $signal->wait;
3276} 3718}
3277 3719
3278sub wait_for_tick_begin { 3720sub wait_for_tick_begin {
3279 return unless $TICK_WATCHER->is_active;
3280 return if $Coro::current == $Coro::main; 3721 return if tick_inhibit || $Coro::current == $Coro::main;
3281 3722
3282 my $signal = new Coro::Signal; 3723 my $signal = new Coro::Signal;
3283 push @WAIT_FOR_TICK_BEGIN, $signal; 3724 push @WAIT_FOR_TICK_BEGIN, $signal;
3284 $signal->wait; 3725 $signal->wait;
3285} 3726}
3286 3727
3287 my $min = 1e6;#d# 3728sub tick {
3288 my $avg = 10;
3289$TICK_WATCHER = Event->timer (
3290 reentrant => 0,
3291 parked => 1,
3292 prio => 0,
3293 at => $NEXT_TICK || $TICK,
3294 data => WF_AUTOCANCEL,
3295 cb => sub {
3296 if ($Coro::current != $Coro::main) { 3729 if ($Coro::current != $Coro::main) {
3297 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"
3298 unless ++$bug_warning > 10; 3731 unless ++$bug_warning > 10;
3299 return; 3732 return;
3300 } 3733 }
3301 3734
3302 $NOW = $tick_start = Event::time;
3303
3304 cf::server_tick; # one server iteration 3735 cf::server_tick; # one server iteration
3305 3736
3306 0 && sync_job {#d# 3737 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3307 for(1..10) { 3738 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3308 my $t = Event::time; 3739 Coro::async_pool {
3309 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3740 $Coro::current->{desc} = "runtime saver";
3310 or die; 3741 write_runtime_sync
3311 3742 or warn "ERROR: unable to write runtime file: $!";
3312 $map->width (50);
3313 $map->height (50);
3314 $map->alloc;
3315 $map->_load_objects ("/tmp/x.map", 1);
3316 my $t = Event::time - $t;
3317
3318 #next unless $t < 0.0013;#d#
3319 if ($t < $min) {
3320 $min = $t;
3321 }
3322 $avg = $avg * 0.99 + $t * 0.01;
3323 }
3324 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3325 exit 0;
3326 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3327 }; 3743 };
3744 }
3328 3745
3329 $RUNTIME += $TICK;
3330 $NEXT_TICK += $TICK;
3331
3332 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3333 $NEXT_RUNTIME_WRITE = $NOW + 10;
3334 Coro::async_pool {
3335 write_runtime
3336 or warn "ERROR: unable to write runtime file: $!";
3337 };
3338 }
3339
3340# my $AFTER = Event::time;
3341# warn $AFTER - $NOW;#d#
3342
3343 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3746 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3344 $sig->send; 3747 $sig->send;
3345 } 3748 }
3346 while (my $sig = shift @WAIT_FOR_TICK) { 3749 while (my $sig = shift @WAIT_FOR_TICK) {
3347 $sig->send; 3750 $sig->send;
3348 } 3751 }
3349 3752
3350 $NOW = Event::time; 3753 $LOAD = ($NOW - $TICK_START) / $TICK;
3351
3352 # if we are delayed by four ticks or more, skip them all
3353 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3354
3355 $TICK_WATCHER->at ($NEXT_TICK);
3356 $TICK_WATCHER->start;
3357
3358 $LOAD = ($NOW - $tick_start) / $TICK;
3359 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3754 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3360 3755
3361 _post_tick; 3756 if (0) {
3362 3757 if ($NEXT_TICK) {
3363 3758 my $jitter = $TICK_START - $NEXT_TICK;
3759 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3760 warn "jitter $JITTER\n";#d#
3761 }
3364 }, 3762 }
3365); 3763}
3366 3764
3367{ 3765{
3368 BDB::max_poll_time $TICK * 0.1; 3766 # configure BDB
3369 $BDB_POLL_WATCHER = Event->io ( 3767
3370 reentrant => 0,
3371 fd => BDB::poll_fileno,
3372 poll => 'r',
3373 prio => 0,
3374 data => WF_AUTOCANCEL,
3375 cb => \&BDB::poll_cb,
3376 );
3377 BDB::min_parallel 8; 3768 BDB::min_parallel 8;
3378 3769 BDB::max_poll_reqs $TICK * 0.1;
3379 BDB::set_sync_prepare { 3770 $Coro::BDB::WATCHER->priority (1);
3380 my $status;
3381 my $current = $Coro::current;
3382 (
3383 sub {
3384 $status = $!;
3385 $current->ready; undef $current;
3386 },
3387 sub {
3388 Coro::schedule while defined $current;
3389 $! = $status;
3390 },
3391 )
3392 };
3393 3771
3394 unless ($DB_ENV) { 3772 unless ($DB_ENV) {
3395 $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);
3396 3778
3397 cf::sync_job { 3779 cf::sync_job {
3398 eval { 3780 eval {
3399 BDB::db_env_open 3781 BDB::db_env_open
3400 $DB_ENV, 3782 $DB_ENV,
3402 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
3403 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3785 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3404 0666; 3786 0666;
3405 3787
3406 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3788 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3407
3408 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3409 $DB_ENV->set_lk_detect;
3410 }; 3789 };
3411 3790
3412 cf::cleanup "db_env_open(db): $@" if $@; 3791 cf::cleanup "db_env_open(db): $@" if $@;
3413 }; 3792 };
3414 } 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 };
3415} 3804}
3416 3805
3417{ 3806{
3807 # configure IO::AIO
3808
3418 IO::AIO::min_parallel 8; 3809 IO::AIO::min_parallel 8;
3419
3420 undef $Coro::AIO::WATCHER;
3421 IO::AIO::max_poll_time $TICK * 0.1; 3810 IO::AIO::max_poll_time $TICK * 0.1;
3422 $AIO_POLL_WATCHER = Event->io ( 3811 $Coro::AIO::WATCHER->priority (1);
3423 reentrant => 0,
3424 data => WF_AUTOCANCEL,
3425 fd => IO::AIO::poll_fileno,
3426 poll => 'r',
3427 prio => 6,
3428 cb => \&IO::AIO::poll_cb,
3429 );
3430} 3812}
3431 3813
3432my $_log_backtrace; 3814my $_log_backtrace;
3433 3815
3434sub _log_backtrace { 3816sub _log_backtrace {
3438 3820
3439 # limit the # of concurrent backtraces 3821 # limit the # of concurrent backtraces
3440 if ($_log_backtrace < 2) { 3822 if ($_log_backtrace < 2) {
3441 ++$_log_backtrace; 3823 ++$_log_backtrace;
3442 async { 3824 async {
3825 $Coro::current->{desc} = "abt $msg";
3826
3443 my @bt = fork_call { 3827 my @bt = fork_call {
3444 @addr = map { sprintf "%x", $_ } @addr; 3828 @addr = map { sprintf "%x", $_ } @addr;
3445 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3829 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3446 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 |"
3447 or die "addr2line: $!"; 3831 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines