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.337 by root, Tue Aug 21 00:54:01 2007 UTC vs.
Revision 1.428 by root, Thu May 1 06:33:19 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}
1571our $MAX_RESET = 3600; 1781our $MAX_RESET = 3600;
1572our $DEFAULT_RESET = 3000; 1782our $DEFAULT_RESET = 3000;
1573 1783
1574sub generate_random_map { 1784sub generate_random_map {
1575 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
1576 # mit "rum" bekleckern, nicht 1789 # mit "rum" bekleckern, nicht
1577 $self->_create_random_map ( 1790 $self->_create_random_map (
1578 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1791 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1579 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1792 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1580 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1793 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1702 1915
1703# the temporary/swap location 1916# the temporary/swap location
1704sub save_path { 1917sub save_path {
1705 my ($self) = @_; 1918 my ($self) = @_;
1706 1919
1707 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1920 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1708 "$TMPDIR/$path.map" 1921 "$TMPDIR/$path.map"
1709} 1922}
1710 1923
1711# the unique path, undef == no special unique path 1924# the unique path, undef == no special unique path
1712sub uniq_path { 1925sub uniq_path {
1713 my ($self) = @_; 1926 my ($self) = @_;
1714 1927
1715 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1716 "$UNIQUEDIR/$path" 1929 "$UNIQUEDIR/$path"
1717} 1930}
1718 1931
1719# and all this just because we cannot iterate over 1932# and all this just because we cannot iterate over
1720# all maps in C++... 1933# all maps in C++...
1743 1956
1744sub load_header_from($) { 1957sub load_header_from($) {
1745 my ($self, $path) = @_; 1958 my ($self, $path) = @_;
1746 1959
1747 utf8::encode $path; 1960 utf8::encode $path;
1748 #aio_open $path, O_RDONLY, 0 1961 my $f = new_from_file cf::object::thawer $path
1749 # or return;
1750
1751 $self->_load_header ($path)
1752 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;
1753 1969
1754 $self->{load_path} = $path; 1970 $self->{load_path} = $path;
1755 1971
1756 1 1972 1
1757} 1973}
1811sub find { 2027sub find {
1812 my ($path, $origin) = @_; 2028 my ($path, $origin) = @_;
1813 2029
1814 $path = normalise $path, $origin && $origin->path; 2030 $path = normalise $path, $origin && $origin->path;
1815 2031
2032 cf::lock_wait "map_data:$path";#d#remove
1816 cf::lock_wait "map_find:$path"; 2033 cf::lock_wait "map_find:$path";
1817 2034
1818 $cf::MAP{$path} || do { 2035 $cf::MAP{$path} || do {
1819 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
1820 my $map = new_from_path cf::map $path 2039 my $map = new_from_path cf::map $path
1821 or return; 2040 or return;
1822 2041
1823 $map->{last_save} = $cf::RUNTIME; 2042 $map->{last_save} = $cf::RUNTIME;
1824 2043
1826 or return; 2045 or return;
1827 2046
1828 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2047 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1829 # doing this can freeze the server in a sync job, obviously 2048 # doing this can freeze the server in a sync job, obviously
1830 #$cf::WAIT_FOR_TICK->wait; 2049 #$cf::WAIT_FOR_TICK->wait;
2050 undef $guard1;
2051 undef $guard2;
1831 $map->reset; 2052 $map->reset;
1832 undef $guard;
1833 return find $path; 2053 return find $path;
1834 } 2054 }
1835 2055
1836 $cf::MAP{$path} = $map 2056 $cf::MAP{$path} = $map
1837 } 2057 }
1846 local $self->{deny_reset} = 1; # loading can take a long time 2066 local $self->{deny_reset} = 1; # loading can take a long time
1847 2067
1848 my $path = $self->{path}; 2068 my $path = $self->{path};
1849 2069
1850 { 2070 {
1851 my $guard = cf::lock_acquire "map_load:$path"; 2071 my $guard = cf::lock_acquire "map_data:$path";
1852 2072
2073 return unless $self->valid;
1853 return if $self->in_memory != cf::MAP_SWAPPED; 2074 return unless $self->in_memory == cf::MAP_SWAPPED;
1854 2075
1855 $self->in_memory (cf::MAP_LOADING); 2076 $self->in_memory (cf::MAP_LOADING);
1856 2077
1857 $self->alloc; 2078 $self->alloc;
1858 2079
1859 $self->pre_load; 2080 $self->pre_load;
1860 Coro::cede; 2081 cf::cede_to_tick;
1861 2082
2083 my $f = new_from_file cf::object::thawer $self->{load_path};
2084 $f->skip_block;
1862 $self->_load_objects ($self->{load_path}, 1) 2085 $self->_load_objects ($f)
1863 or return; 2086 or return;
1864 2087
1865 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2088 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1866 if delete $self->{load_original}; 2089 if delete $self->{load_original};
1867 2090
1868 if (my $uniq = $self->uniq_path) { 2091 if (my $uniq = $self->uniq_path) {
1869 utf8::encode $uniq; 2092 utf8::encode $uniq;
1870 if (aio_open $uniq, O_RDONLY, 0) { 2093 unless (aio_stat $uniq) {
2094 if (my $f = new_from_file cf::object::thawer $uniq) {
1871 $self->clear_unique_items; 2095 $self->clear_unique_items;
1872 $self->_load_objects ($uniq, 0); 2096 $self->_load_objects ($f);
2097 $f->resolve_delayed_derefs;
2098 }
1873 } 2099 }
1874 } 2100 }
1875 2101
1876 Coro::cede; 2102 $f->resolve_delayed_derefs;
2103
2104 cf::cede_to_tick;
1877 # now do the right thing for maps 2105 # now do the right thing for maps
1878 $self->link_multipart_objects; 2106 $self->link_multipart_objects;
1879 $self->difficulty ($self->estimate_difficulty) 2107 $self->difficulty ($self->estimate_difficulty)
1880 unless $self->difficulty; 2108 unless $self->difficulty;
1881 Coro::cede; 2109 cf::cede_to_tick;
1882 2110
1883 unless ($self->{deny_activate}) { 2111 unless ($self->{deny_activate}) {
1884 $self->decay_objects; 2112 $self->decay_objects;
1885 $self->fix_auto_apply; 2113 $self->fix_auto_apply;
1886 $self->update_buttons; 2114 $self->update_buttons;
1887 Coro::cede; 2115 cf::cede_to_tick;
1888 $self->set_darkness_map; 2116 $self->set_darkness_map;
1889 Coro::cede; 2117 cf::cede_to_tick;
1890 $self->activate; 2118 $self->activate;
1891 } 2119 }
1892 2120
1893 $self->{last_save} = $cf::RUNTIME; 2121 $self->{last_save} = $cf::RUNTIME;
1894 $self->last_access ($cf::RUNTIME); 2122 $self->last_access ($cf::RUNTIME);
1895 2123
1896 $self->in_memory (cf::MAP_IN_MEMORY); 2124 $self->in_memory (cf::MAP_ACTIVE);
1897 } 2125 }
1898 2126
1899 $self->post_load; 2127 $self->post_load;
1900} 2128}
1901 2129
1944} 2172}
1945 2173
1946sub do_load_sync { 2174sub do_load_sync {
1947 my ($map) = @_; 2175 my ($map) = @_;
1948 2176
2177 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2178 if $Coro::current == $Coro::main;
2179
1949 cf::sync_job { $map->load }; 2180 cf::sync_job { $map->load };
1950} 2181}
1951 2182
1952our %MAP_PREFETCH; 2183our %MAP_PREFETCH;
1953our $MAP_PREFETCHER = undef; 2184our $MAP_PREFETCHER = undef;
1954 2185
1955sub find_async { 2186sub find_async {
1956 my ($path, $origin) = @_; 2187 my ($path, $origin, $load) = @_;
1957 2188
1958 $path = normalise $path, $origin && $origin->{path}; 2189 $path = normalise $path, $origin && $origin->{path};
1959 2190
1960 if (my $map = $cf::MAP{$path}) { 2191 if (my $map = $cf::MAP{$path}) {
1961 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2192 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1962 } 2193 }
1963 2194
1964 undef $MAP_PREFETCH{$path}; 2195 $MAP_PREFETCH{$path} |= $load;
2196
1965 $MAP_PREFETCHER ||= cf::async { 2197 $MAP_PREFETCHER ||= cf::async {
2198 $Coro::current->{desc} = "map prefetcher";
2199
1966 while (%MAP_PREFETCH) { 2200 while (%MAP_PREFETCH) {
1967 for my $path (keys %MAP_PREFETCH) { 2201 while (my ($k, $v) = each %MAP_PREFETCH) {
1968 if (my $map = find $path) { 2202 if (my $map = find $k) {
1969 $map->load; 2203 $map->load if $v;
1970 } 2204 }
1971 2205
1972 delete $MAP_PREFETCH{$path}; 2206 delete $MAP_PREFETCH{$k};
1973 } 2207 }
1974 } 2208 }
1975 undef $MAP_PREFETCHER; 2209 undef $MAP_PREFETCHER;
1976 }; 2210 };
1977 $MAP_PREFETCHER->prio (6); 2211 $MAP_PREFETCHER->prio (6);
1980} 2214}
1981 2215
1982sub save { 2216sub save {
1983 my ($self) = @_; 2217 my ($self) = @_;
1984 2218
1985 my $lock = cf::lock_acquire "map_data:" . $self->path; 2219 my $lock = cf::lock_acquire "map_data:$self->{path}";
1986 2220
1987 $self->{last_save} = $cf::RUNTIME; 2221 $self->{last_save} = $cf::RUNTIME;
1988 2222
1989 return unless $self->dirty; 2223 return unless $self->dirty;
1990 2224
1996 return if $self->{deny_save}; 2230 return if $self->{deny_save};
1997 2231
1998 local $self->{last_access} = $self->last_access;#d# 2232 local $self->{last_access} = $self->last_access;#d#
1999 2233
2000 cf::async { 2234 cf::async {
2235 $Coro::current->{desc} = "map player save";
2001 $_->contr->save for $self->players; 2236 $_->contr->save for $self->players;
2002 }; 2237 };
2238
2239 cf::get_slot 0.02;
2003 2240
2004 if ($uniq) { 2241 if ($uniq) {
2005 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2242 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2006 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2243 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2007 } else { 2244 } else {
2013 my ($self) = @_; 2250 my ($self) = @_;
2014 2251
2015 # save first because save cedes 2252 # save first because save cedes
2016 $self->save; 2253 $self->save;
2017 2254
2018 my $lock = cf::lock_acquire "map_data:" . $self->path; 2255 my $lock = cf::lock_acquire "map_data:$self->{path}";
2019 2256
2020 return if $self->players; 2257 return if $self->players;
2021 return if $self->in_memory != cf::MAP_IN_MEMORY; 2258 return if $self->in_memory != cf::MAP_ACTIVE;
2022 return if $self->{deny_save}; 2259 return if $self->{deny_save};
2023 2260
2261 $self->in_memory (cf::MAP_SWAPPED);
2262
2263 $self->deactivate;
2264 $_->clear_links_to ($self) for values %cf::MAP;
2024 $self->clear; 2265 $self->clear;
2025 $self->in_memory (cf::MAP_SWAPPED);
2026} 2266}
2027 2267
2028sub reset_at { 2268sub reset_at {
2029 my ($self) = @_; 2269 my ($self) = @_;
2030 2270
2062 if $uniq; 2302 if $uniq;
2063 } 2303 }
2064 2304
2065 delete $cf::MAP{$self->path}; 2305 delete $cf::MAP{$self->path};
2066 2306
2307 $self->deactivate;
2308 $_->clear_links_to ($self) for values %cf::MAP;
2067 $self->clear; 2309 $self->clear;
2068
2069 $_->clear_links_to ($self) for values %cf::MAP;
2070 2310
2071 $self->unlink_save; 2311 $self->unlink_save;
2072 $self->destroy; 2312 $self->destroy;
2073} 2313}
2074 2314
2075my $nuke_counter = "aaaa"; 2315my $nuke_counter = "aaaa";
2076 2316
2077sub nuke { 2317sub nuke {
2078 my ($self) = @_; 2318 my ($self) = @_;
2079 2319
2320 {
2321 my $lock = cf::lock_acquire "map_data:$self->{path}";
2322
2080 delete $cf::MAP{$self->path}; 2323 delete $cf::MAP{$self->path};
2081 2324
2082 $self->unlink_save; 2325 $self->unlink_save;
2083 2326
2084 bless $self, "cf::map"; 2327 bless $self, "cf::map";
2085 delete $self->{deny_reset}; 2328 delete $self->{deny_reset};
2086 $self->{deny_save} = 1; 2329 $self->{deny_save} = 1;
2087 $self->reset_timeout (1); 2330 $self->reset_timeout (1);
2088 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2331 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2089 2332
2090 $cf::MAP{$self->path} = $self; 2333 $cf::MAP{$self->path} = $self;
2334 }
2091 2335
2092 $self->reset; # polite request, might not happen 2336 $self->reset; # polite request, might not happen
2093} 2337}
2094 2338
2095=item $maps = cf::map::tmp_maps 2339=item $maps = cf::map::tmp_maps
2137 2381
2138sub unique_maps() { 2382sub unique_maps() {
2139 [ 2383 [
2140 map { 2384 map {
2141 utf8::decode $_; 2385 utf8::decode $_;
2142 /\.map$/ 2386 s/\.map$//; # TODO future compatibility hack
2387 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2388 ? ()
2143 ? normalise $_ 2389 : normalise $_
2144 : ()
2145 } @{ aio_readdir $UNIQUEDIR or [] } 2390 } @{ aio_readdir $UNIQUEDIR or [] }
2146 ] 2391 ]
2147} 2392}
2148 2393
2149package cf;
2150
2151=back 2394=back
2152 2395
2153=head3 cf::object 2396=head3 cf::object
2154 2397
2155=cut 2398=cut
2158 2401
2159=over 4 2402=over 4
2160 2403
2161=item $ob->inv_recursive 2404=item $ob->inv_recursive
2162 2405
2163Returns 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.
2164 2408
2165=cut 2409=cut
2166 2410
2167sub inv_recursive_; 2411sub inv_recursive_;
2168sub inv_recursive_ { 2412sub inv_recursive_ {
2171 2415
2172sub inv_recursive { 2416sub inv_recursive {
2173 inv_recursive_ inv $_[0] 2417 inv_recursive_ inv $_[0]
2174} 2418}
2175 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 }
2446}
2447
2176package cf; 2448package cf;
2177 2449
2178=back 2450=back
2179 2451
2180=head3 cf::object::player 2452=head3 cf::object::player
2186Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2458Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2187can be C<undef>. Does the right thing when the player is currently in a 2459can be C<undef>. Does the right thing when the player is currently in a
2188dialogue with the given NPC character. 2460dialogue with the given NPC character.
2189 2461
2190=cut 2462=cut
2463
2464our $SAY_CHANNEL = {
2465 id => "say",
2466 title => "Map",
2467 reply => "say ",
2468 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2469};
2470
2471our $CHAT_CHANNEL = {
2472 id => "chat",
2473 title => "Chat",
2474 reply => "chat ",
2475 tooltip => "Player chat and shouts, global to the server.",
2476};
2191 2477
2192# rough implementation of a future "reply" method that works 2478# rough implementation of a future "reply" method that works
2193# with dialog boxes. 2479# with dialog boxes.
2194#TODO: the first argument must go, split into a $npc->reply_to ( method 2480#TODO: the first argument must go, split into a $npc->reply_to ( method
2195sub cf::object::player::reply($$$;$) { 2481sub cf::object::player::reply($$$;$) {
2207 my $dialog = $pl->{npc_dialog}; 2493 my $dialog = $pl->{npc_dialog};
2208 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2494 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2209 2495
2210 } else { 2496 } else {
2211 $msg = $npc->name . " says: $msg" if $npc; 2497 $msg = $npc->name . " says: $msg" if $npc;
2212 $self->message ($msg, $flags); 2498 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2213 } 2499 }
2214 } 2500 }
2215} 2501}
2216 2502
2217=item $object->send_msg ($channel, $msg, $color, [extra...]) 2503=item $object->send_msg ($channel, $msg, $color, [extra...])
2338 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2624 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2339 2625
2340 $self->enter_link; 2626 $self->enter_link;
2341 2627
2342 (async { 2628 (async {
2629 $Coro::current->{desc} = "player::goto $path $x $y";
2630
2631 # *tag paths override both path and x|y
2632 if ($path =~ /^\*(.*)$/) {
2633 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2634 my $ob = $obs[rand @obs];
2635
2636 # see if we actually can go there
2637 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2638 $ob = $obs[rand @obs];
2639 } else {
2640 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2641 }
2642 # else put us there anyways for now #d#
2643
2644 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2645 } else {
2646 ($path, $x, $y) = (undef, undef, undef);
2647 }
2648 }
2649
2343 my $map = eval { 2650 my $map = eval {
2344 my $map = cf::map::find $path; 2651 my $map = defined $path ? cf::map::find $path : undef;
2345 2652
2346 if ($map) { 2653 if ($map) {
2347 $map = $map->customise_for ($self); 2654 $map = $map->customise_for ($self);
2348 $map = $check->($map) if $check && $map; 2655 $map = $check->($map) if $check && $map;
2349 } else { 2656 } else {
2350 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2657 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2351 } 2658 }
2352 2659
2353 $map 2660 $map
2354 }; 2661 };
2355 2662
2408 $rmp->{origin_y} = $exit->y; 2715 $rmp->{origin_y} = $exit->y;
2409 } 2716 }
2410 2717
2411 $rmp->{random_seed} ||= $exit->random_seed; 2718 $rmp->{random_seed} ||= $exit->random_seed;
2412 2719
2413 my $data = cf::to_json $rmp; 2720 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2414 my $md5 = Digest::MD5::md5_hex $data; 2721 my $md5 = Digest::MD5::md5_hex $data;
2415 my $meta = "$RANDOMDIR/$md5.meta"; 2722 my $meta = "$RANDOMDIR/$md5.meta";
2416 2723
2417 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2724 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2418 aio_write $fh, 0, (length $data), $data, 0; 2725 aio_write $fh, 0, (length $data), $data, 0;
2445 # if exit is damned, update players death & WoR home-position 2752 # if exit is damned, update players death & WoR home-position
2446 $self->contr->savebed ($slaying, $hp, $sp) 2753 $self->contr->savebed ($slaying, $hp, $sp)
2447 if $exit->flag (FLAG_DAMNED); 2754 if $exit->flag (FLAG_DAMNED);
2448 2755
2449 (async { 2756 (async {
2757 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2758
2450 $self->deactivate_recursive; # just to be sure 2759 $self->deactivate_recursive; # just to be sure
2451 unless (eval { 2760 unless (eval {
2452 $self->goto ($slaying, $hp, $sp); 2761 $self->goto ($slaying, $hp, $sp);
2453 2762
2454 1; 2763 1;
2489the message, with C<log> being the default. If C<$color> is negative, suppress 2798the message, with C<log> being the default. If C<$color> is negative, suppress
2490the message unless the client supports the msg packet. 2799the message unless the client supports the msg packet.
2491 2800
2492=cut 2801=cut
2493 2802
2803# non-persistent channels (usually the info channel)
2804our %CHANNEL = (
2805 "c/identify" => {
2806 id => "infobox",
2807 title => "Identify",
2808 reply => undef,
2809 tooltip => "Items recently identified",
2810 },
2811 "c/examine" => {
2812 id => "infobox",
2813 title => "Examine",
2814 reply => undef,
2815 tooltip => "Signs and other items you examined",
2816 },
2817 "c/book" => {
2818 id => "infobox",
2819 title => "Book",
2820 reply => undef,
2821 tooltip => "The contents of a note or book",
2822 },
2823 "c/lookat" => {
2824 id => "infobox",
2825 title => "Look",
2826 reply => undef,
2827 tooltip => "What you saw there",
2828 },
2829 "c/who" => {
2830 id => "infobox",
2831 title => "Players",
2832 reply => undef,
2833 tooltip => "Shows players who are currently online",
2834 },
2835 "c/body" => {
2836 id => "infobox",
2837 title => "Body Parts",
2838 reply => undef,
2839 tooltip => "Shows which body parts you posess and are available",
2840 },
2841 "c/uptime" => {
2842 id => "infobox",
2843 title => "Uptime",
2844 reply => undef,
2845 tooltip => "How long the server has been running since last restart",
2846 },
2847 "c/mapinfo" => {
2848 id => "infobox",
2849 title => "Map Info",
2850 reply => undef,
2851 tooltip => "Information related to the maps",
2852 },
2853 "c/party" => {
2854 id => "party",
2855 title => "Party",
2856 reply => "gsay ",
2857 tooltip => "Messages and chat related to your party",
2858 },
2859);
2860
2494sub cf::client::send_msg { 2861sub cf::client::send_msg {
2495 my ($self, $channel, $msg, $color, @extra) = @_; 2862 my ($self, $channel, $msg, $color, @extra) = @_;
2496 2863
2497 $msg = $self->pl->expand_cfpod ($msg); 2864 $msg = $self->pl->expand_cfpod ($msg);
2498 2865
2499 $color &= cf::NDI_CLIENT_MASK; # just in case... 2866 $color &= cf::NDI_CLIENT_MASK; # just in case...
2500 2867
2868 # check predefined channels, for the benefit of C
2869 if ($CHANNEL{$channel}) {
2870 $channel = $CHANNEL{$channel};
2871
2872 $self->ext_msg (channel_info => $channel)
2873 if $self->can_msg;
2874
2875 $channel = $channel->{id};
2876
2501 if (ref $channel) { 2877 } elsif (ref $channel) {
2502 # send meta info to client, if not yet sent 2878 # send meta info to client, if not yet sent
2503 unless (exists $self->{channel}{$channel->{id}}) { 2879 unless (exists $self->{channel}{$channel->{id}}) {
2504 $self->{channel}{$channel->{id}} = $channel; 2880 $self->{channel}{$channel->{id}} = $channel;
2505 $self->ext_msg (channel_info => $channel); 2881 $self->ext_msg (channel_info => $channel)
2882 if $self->can_msg;
2506 } 2883 }
2507 2884
2508 $channel = $channel->{id}; 2885 $channel = $channel->{id};
2509 } 2886 }
2510 2887
2551=cut 2928=cut
2552 2929
2553sub cf::client::ext_msg($$@) { 2930sub cf::client::ext_msg($$@) {
2554 my ($self, $type, @msg) = @_; 2931 my ($self, $type, @msg) = @_;
2555 2932
2556 my $extcmd = $self->extcmd;
2557
2558 if ($extcmd == 2) { 2933 if ($self->extcmd == 2) {
2559 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2934 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2560 } elsif ($extcmd == 1) { # TODO: remove 2935 } elsif ($self->extcmd == 1) { # TODO: remove
2561 push @msg, msgtype => "event_$type"; 2936 push @msg, msgtype => "event_$type";
2562 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2937 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2563 } 2938 }
2564} 2939}
2565 2940
2572sub cf::client::ext_reply($$@) { 2947sub cf::client::ext_reply($$@) {
2573 my ($self, $id, @msg) = @_; 2948 my ($self, $id, @msg) = @_;
2574 2949
2575 if ($self->extcmd == 2) { 2950 if ($self->extcmd == 2) {
2576 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 2951 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2577 } elsif ($self->ns->extcmd == 1) { 2952 } elsif ($self->extcmd == 1) {
2578 #TODO: version 1, remove 2953 #TODO: version 1, remove
2579 unshift @msg, msgtype => "reply", msgid => $id; 2954 unshift @msg, msgtype => "reply", msgid => $id;
2580 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2955 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2581 } 2956 }
2582} 2957}
2646 my ($type, $reply, @payload) = 3021 my ($type, $reply, @payload) =
2647 "ARRAY" eq ref $msg 3022 "ARRAY" eq ref $msg
2648 ? @$msg 3023 ? @$msg
2649 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 3024 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2650 3025
3026 my @reply;
3027
2651 if (my $cb = $EXTICMD{$type}) { 3028 if (my $cb = $EXTICMD{$type}) {
2652 my @reply = $cb->($ns, @payload); 3029 @reply = $cb->($ns, @payload);
2653
2654 $ns->ext_reply ($reply, @reply)
2655 if $reply;
2656 } 3030 }
3031
3032 $ns->ext_reply ($reply, @reply)
3033 if $reply;
3034
2657 } else { 3035 } else {
2658 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3036 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2659 } 3037 }
2660 3038
2661 cf::override; 3039 cf::override;
2721=pod 3099=pod
2722 3100
2723The following functions and methods are available within a safe environment: 3101The following functions and methods are available within a safe environment:
2724 3102
2725 cf::object 3103 cf::object
2726 contr pay_amount pay_player map x y force_find force_add 3104 contr pay_amount pay_player map x y force_find force_add destroy
2727 insert remove name archname title slaying race 3105 insert remove name archname title slaying race decrease split
2728 3106
2729 cf::object::player 3107 cf::object::player
2730 player 3108 player
2731 3109
2732 cf::player 3110 cf::player
2737 3115
2738=cut 3116=cut
2739 3117
2740for ( 3118for (
2741 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3119 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2742 insert remove inv name archname title slaying race)], 3120 insert remove inv name archname title slaying race
3121 decrease split destroy)],
2743 ["cf::object::player" => qw(player)], 3122 ["cf::object::player" => qw(player)],
2744 ["cf::player" => qw(peaceful)], 3123 ["cf::player" => qw(peaceful)],
2745 ["cf::map" => qw(trigger)], 3124 ["cf::map" => qw(trigger)],
2746) { 3125) {
2747 no strict 'refs'; 3126 no strict 'refs';
2823# the server's init and main functions 3202# the server's init and main functions
2824 3203
2825sub load_facedata($) { 3204sub load_facedata($) {
2826 my ($path) = @_; 3205 my ($path) = @_;
2827 3206
3207 # HACK to clear player env face cache, we need some signal framework
3208 # for this (global event?)
3209 %ext::player_env::MUSIC_FACE_CACHE = ();
3210
2828 my $enc = JSON::XS->new->utf8->canonical; 3211 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2829 3212
2830 warn "loading facedata from $path\n"; 3213 warn "loading facedata from $path\n";
2831 3214
2832 my $facedata; 3215 my $facedata;
2833 0 < aio_load $path, $facedata 3216 0 < aio_load $path, $facedata
2848 { 3231 {
2849 my $faces = $facedata->{faceinfo}; 3232 my $faces = $facedata->{faceinfo};
2850 3233
2851 while (my ($face, $info) = each %$faces) { 3234 while (my ($face, $info) = each %$faces) {
2852 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3235 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3236
2853 cf::face::set_visibility $idx, $info->{visibility}; 3237 cf::face::set_visibility $idx, $info->{visibility};
2854 cf::face::set_magicmap $idx, $info->{magicmap}; 3238 cf::face::set_magicmap $idx, $info->{magicmap};
2855 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3239 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2856 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3240 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2857 3241
2858 cf::cede_to_tick; 3242 cf::cede_to_tick;
2859 } 3243 }
2860 3244
2861 while (my ($face, $info) = each %$faces) { 3245 while (my ($face, $info) = each %$faces) {
2862 next unless $info->{smooth}; 3246 next unless $info->{smooth};
3247
2863 my $idx = cf::face::find $face 3248 my $idx = cf::face::find $face
2864 or next; 3249 or next;
3250
2865 if (my $smooth = cf::face::find $info->{smooth}) { 3251 if (my $smooth = cf::face::find $info->{smooth}) {
2866 cf::face::set_smooth $idx, $smooth; 3252 cf::face::set_smooth $idx, $smooth;
2867 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3253 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2868 } else { 3254 } else {
2869 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3255 warn "smooth face '$info->{smooth}' not found for face '$face'";
2887 { 3273 {
2888 # TODO: for gcfclient pleasure, we should give resources 3274 # TODO: for gcfclient pleasure, we should give resources
2889 # that gcfclient doesn't grok a >10000 face index. 3275 # that gcfclient doesn't grok a >10000 face index.
2890 my $res = $facedata->{resource}; 3276 my $res = $facedata->{resource};
2891 3277
2892 my $soundconf = delete $res->{"res/sound.conf"};
2893
2894 while (my ($name, $info) = each %$res) { 3278 while (my ($name, $info) = each %$res) {
3279 if (defined $info->{type}) {
2895 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3280 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2896 my $data; 3281 my $data;
2897 3282
2898 if ($info->{type} & 1) { 3283 if ($info->{type} & 1) {
2899 # prepend meta info 3284 # prepend meta info
2900 3285
2901 my $meta = $enc->encode ({ 3286 my $meta = $enc->encode ({
2902 name => $name, 3287 name => $name,
2903 %{ $info->{meta} || {} }, 3288 %{ $info->{meta} || {} },
2904 }); 3289 });
2905 3290
2906 $data = pack "(w/a*)*", $meta, $info->{data}; 3291 $data = pack "(w/a*)*", $meta, $info->{data};
3292 } else {
3293 $data = $info->{data};
3294 }
3295
3296 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3297 cf::face::set_type $idx, $info->{type};
2907 } else { 3298 } else {
2908 $data = $info->{data}; 3299 $RESOURCE{$name} = $info;
2909 } 3300 }
2910 3301
2911 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2912 cf::face::set_type $idx, $info->{type};
2913
2914 cf::cede_to_tick; 3302 cf::cede_to_tick;
2915 } 3303 }
2916
2917 if ($soundconf) {
2918 $soundconf = $enc->decode (delete $soundconf->{data});
2919
2920 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2921 my $sound = $soundconf->{compat}[$_]
2922 or next;
2923
2924 my $face = cf::face::find "sound/$sound->[1]";
2925 cf::sound::set $sound->[0] => $face;
2926 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2927 }
2928
2929 while (my ($k, $v) = each %{$soundconf->{event}}) {
2930 my $face = cf::face::find "sound/$v";
2931 cf::sound::set $k => $face;
2932 }
2933 }
2934 } 3304 }
3305
3306 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2935 3307
2936 1 3308 1
2937} 3309}
3310
3311cf::global->attach (on_resource_update => sub {
3312 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3313 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3314
3315 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3316 my $sound = $soundconf->{compat}[$_]
3317 or next;
3318
3319 my $face = cf::face::find "sound/$sound->[1]";
3320 cf::sound::set $sound->[0] => $face;
3321 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3322 }
3323
3324 while (my ($k, $v) = each %{$soundconf->{event}}) {
3325 my $face = cf::face::find "sound/$v";
3326 cf::sound::set $k => $face;
3327 }
3328 }
3329});
2938 3330
2939register_exticmd fx_want => sub { 3331register_exticmd fx_want => sub {
2940 my ($ns, $want) = @_; 3332 my ($ns, $want) = @_;
2941 3333
2942 while (my ($k, $v) = each %$want) { 3334 while (my ($k, $v) = each %$want) {
2943 $ns->fx_want ($k, $v); 3335 $ns->fx_want ($k, $v);
2944 } 3336 }
2945}; 3337};
2946 3338
3339sub load_resource_file($) {
3340 my $guard = lock_acquire "load_resource_file";
3341
3342 my $status = load_resource_file_ $_[0];
3343 get_slot 0.1, 100;
3344 cf::arch::commit_load;
3345
3346 $status
3347}
3348
2947sub reload_regions { 3349sub reload_regions {
3350 # HACK to clear player env face cache, we need some signal framework
3351 # for this (global event?)
3352 %ext::player_env::MUSIC_FACE_CACHE = ();
3353
2948 load_resource_file "$MAPDIR/regions" 3354 load_resource_file "$MAPDIR/regions"
2949 or die "unable to load regions file\n"; 3355 or die "unable to load regions file\n";
2950 3356
2951 for (cf::region::list) { 3357 for (cf::region::list) {
2952 $_->{match} = qr/$_->{match}/ 3358 $_->{match} = qr/$_->{match}/
2960} 3366}
2961 3367
2962sub reload_archetypes { 3368sub reload_archetypes {
2963 load_resource_file "$DATADIR/archetypes" 3369 load_resource_file "$DATADIR/archetypes"
2964 or die "unable to load archetypes\n"; 3370 or die "unable to load archetypes\n";
2965 #d# NEED to laod twice to resolve forward references
2966 # this really needs to be done in an extra post-pass
2967 # (which needs to be synchronous, so solve it differently)
2968 load_resource_file "$DATADIR/archetypes"
2969 or die "unable to load archetypes\n";
2970} 3371}
2971 3372
2972sub reload_treasures { 3373sub reload_treasures {
2973 load_resource_file "$DATADIR/treasures" 3374 load_resource_file "$DATADIR/treasures"
2974 or die "unable to load treasurelists\n"; 3375 or die "unable to load treasurelists\n";
2975} 3376}
2976 3377
2977sub reload_resources { 3378sub reload_resources {
2978 warn "reloading resource files...\n"; 3379 warn "reloading resource files...\n";
2979 3380
3381 reload_facedata;
3382 reload_archetypes;
2980 reload_regions; 3383 reload_regions;
2981 reload_facedata;
2982 #reload_archetypes;#d#
2983 reload_archetypes;
2984 reload_treasures; 3384 reload_treasures;
2985 3385
2986 warn "finished reloading resource files\n"; 3386 warn "finished reloading resource files\n";
2987} 3387}
2988 3388
2989sub init { 3389sub init {
3390 my $guard = freeze_mainloop;
3391
2990 reload_resources; 3392 reload_resources;
2991} 3393}
2992 3394
2993sub cfg_load { 3395sub reload_config {
2994 open my $fh, "<:utf8", "$CONFDIR/config" 3396 open my $fh, "<:utf8", "$CONFDIR/config"
2995 or return; 3397 or return;
2996 3398
2997 local $/; 3399 local $/;
2998 *CFG = YAML::Syck::Load <$fh>; 3400 *CFG = YAML::Load <$fh>;
2999 3401
3000 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3402 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3001 3403
3002 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3404 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3003 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3405 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3014sub main { 3416sub main {
3015 # we must not ever block the main coroutine 3417 # we must not ever block the main coroutine
3016 local $Coro::idle = sub { 3418 local $Coro::idle = sub {
3017 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3419 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3018 (async { 3420 (async {
3019 Event::one_event; 3421 $Coro::current->{desc} = "IDLE BUG HANDLER";
3422 EV::loop EV::LOOP_ONESHOT;
3020 })->prio (Coro::PRIO_MAX); 3423 })->prio (Coro::PRIO_MAX);
3021 }; 3424 };
3022 3425
3023 cfg_load; 3426 {
3427 my $guard = freeze_mainloop;
3428 reload_config;
3024 db_init; 3429 db_init;
3025 load_extensions; 3430 load_extensions;
3026 3431
3027 $TICK_WATCHER->start; 3432 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3433 evthread_start IO::AIO::poll_fileno;
3434 }
3435
3028 Event::loop; 3436 EV::loop;
3029} 3437}
3030 3438
3031############################################################################# 3439#############################################################################
3032# initialisation and cleanup 3440# initialisation and cleanup
3033 3441
3034# install some emergency cleanup handlers 3442# install some emergency cleanup handlers
3035BEGIN { 3443BEGIN {
3444 our %SIGWATCHER = ();
3036 for my $signal (qw(INT HUP TERM)) { 3445 for my $signal (qw(INT HUP TERM)) {
3037 Event->signal ( 3446 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3038 reentrant => 0,
3039 data => WF_AUTOCANCEL,
3040 signal => $signal,
3041 prio => 0,
3042 cb => sub {
3043 cf::cleanup "SIG$signal"; 3447 cf::cleanup "SIG$signal";
3044 },
3045 ); 3448 };
3046 } 3449 }
3047} 3450}
3048 3451
3049sub write_runtime { 3452sub write_runtime_sync {
3050 my $runtime = "$LOCALDIR/runtime"; 3453 my $runtime = "$LOCALDIR/runtime";
3051 3454
3052 # first touch the runtime file to show we are still running: 3455 # first touch the runtime file to show we are still running:
3053 # the fsync below can take a very very long time. 3456 # the fsync below can take a very very long time.
3054 3457
3080 and return; 3483 and return;
3081 3484
3082 warn "runtime file written.\n"; 3485 warn "runtime file written.\n";
3083 3486
3084 1 3487 1
3488}
3489
3490our $uuid_lock;
3491our $uuid_skip;
3492
3493sub write_uuid_sync($) {
3494 $uuid_skip ||= $_[0];
3495
3496 return if $uuid_lock;
3497 local $uuid_lock = 1;
3498
3499 my $uuid = "$LOCALDIR/uuid";
3500
3501 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3502 or return;
3503
3504 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3505 $uuid_skip = 0;
3506
3507 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3508 and return;
3509
3510 # always fsync - this file is important
3511 aio_fsync $fh
3512 and return;
3513
3514 close $fh
3515 or return;
3516
3517 aio_rename "$uuid~", $uuid
3518 and return;
3519
3520 warn "uuid file written ($value).\n";
3521
3522 1
3523
3524}
3525
3526sub write_uuid($$) {
3527 my ($skip, $sync) = @_;
3528
3529 $sync ? write_uuid_sync $skip
3530 : async { write_uuid_sync $skip };
3085} 3531}
3086 3532
3087sub emergency_save() { 3533sub emergency_save() {
3088 my $freeze_guard = cf::freeze_mainloop; 3534 my $freeze_guard = cf::freeze_mainloop;
3089 3535
3095 # and maps saved/destroyed asynchronously. 3541 # and maps saved/destroyed asynchronously.
3096 warn "begin emergency player save\n"; 3542 warn "begin emergency player save\n";
3097 for my $login (keys %cf::PLAYER) { 3543 for my $login (keys %cf::PLAYER) {
3098 my $pl = $cf::PLAYER{$login} or next; 3544 my $pl = $cf::PLAYER{$login} or next;
3099 $pl->valid or next; 3545 $pl->valid or next;
3546 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3100 $pl->save; 3547 $pl->save;
3101 } 3548 }
3102 warn "end emergency player save\n"; 3549 warn "end emergency player save\n";
3103 3550
3104 warn "begin emergency map save\n"; 3551 warn "begin emergency map save\n";
3110 warn "end emergency map save\n"; 3557 warn "end emergency map save\n";
3111 3558
3112 warn "begin emergency database checkpoint\n"; 3559 warn "begin emergency database checkpoint\n";
3113 BDB::db_env_txn_checkpoint $DB_ENV; 3560 BDB::db_env_txn_checkpoint $DB_ENV;
3114 warn "end emergency database checkpoint\n"; 3561 warn "end emergency database checkpoint\n";
3562
3563 warn "begin write uuid\n";
3564 write_uuid_sync 1;
3565 warn "end write uuid\n";
3115 }; 3566 };
3116 3567
3117 warn "leave emergency perl save\n"; 3568 warn "leave emergency perl save\n";
3118} 3569}
3119 3570
3134 warn "reloading..."; 3585 warn "reloading...";
3135 3586
3136 warn "entering sync_job"; 3587 warn "entering sync_job";
3137 3588
3138 cf::sync_job { 3589 cf::sync_job {
3139 cf::write_runtime; # external watchdog should not bark 3590 cf::write_runtime_sync; # external watchdog should not bark
3140 cf::emergency_save; 3591 cf::emergency_save;
3141 cf::write_runtime; # external watchdog should not bark 3592 cf::write_runtime_sync; # external watchdog should not bark
3142 3593
3143 warn "syncing database to disk"; 3594 warn "syncing database to disk";
3144 BDB::db_env_txn_checkpoint $DB_ENV; 3595 BDB::db_env_txn_checkpoint $DB_ENV;
3145 3596
3146 # if anything goes wrong in here, we should simply crash as we already saved 3597 # if anything goes wrong in here, we should simply crash as we already saved
3147
3148 warn "cancelling all WF_AUTOCANCEL watchers";
3149 for (Event::all_watchers) {
3150 $_->cancel if $_->data & WF_AUTOCANCEL;
3151 }
3152 3598
3153 warn "flushing outstanding aio requests"; 3599 warn "flushing outstanding aio requests";
3154 for (;;) { 3600 for (;;) {
3155 BDB::flush; 3601 BDB::flush;
3156 IO::AIO::flush; 3602 IO::AIO::flush;
3157 Coro::cede; 3603 Coro::cede_notself;
3158 last unless IO::AIO::nreqs || BDB::nreqs; 3604 last unless IO::AIO::nreqs || BDB::nreqs;
3159 warn "iterate..."; 3605 warn "iterate...";
3160 } 3606 }
3161 3607
3162 ++$RELOAD; 3608 ++$RELOAD;
3221 warn "reloading cf.pm"; 3667 warn "reloading cf.pm";
3222 require cf; 3668 require cf;
3223 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3669 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3224 3670
3225 warn "loading config and database again"; 3671 warn "loading config and database again";
3226 cf::cfg_load; 3672 cf::reload_config;
3227 3673
3228 warn "loading extensions"; 3674 warn "loading extensions";
3229 cf::load_extensions; 3675 cf::load_extensions;
3230 3676
3231 warn "reattaching attachments to objects/players"; 3677 warn "reattaching attachments to objects/players";
3238 warn "leaving sync_job"; 3684 warn "leaving sync_job";
3239 3685
3240 1 3686 1
3241 } or do { 3687 } or do {
3242 warn $@; 3688 warn $@;
3243 warn "error while reloading, exiting."; 3689 cf::cleanup "error while reloading, exiting.";
3244 exit 1;
3245 }; 3690 };
3246 3691
3247 warn "reloaded"; 3692 warn "reloaded";
3248}; 3693};
3249 3694
3251 3696
3252sub reload_perl() { 3697sub reload_perl() {
3253 # doing reload synchronously and two reloads happen back-to-back, 3698 # doing reload synchronously and two reloads happen back-to-back,
3254 # coro crashes during coro_state_free->destroy here. 3699 # coro crashes during coro_state_free->destroy here.
3255 3700
3256 $RELOAD_WATCHER ||= Event->timer ( 3701 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3257 reentrant => 0,
3258 after => 0,
3259 data => WF_AUTOCANCEL,
3260 cb => sub {
3261 do_reload_perl; 3702 do_reload_perl;
3262 undef $RELOAD_WATCHER; 3703 undef $RELOAD_WATCHER;
3263 },
3264 ); 3704 };
3265} 3705}
3266 3706
3267register_command "reload" => sub { 3707register_command "reload" => sub {
3268 my ($who, $arg) = @_; 3708 my ($who, $arg) = @_;
3269 3709
3270 if ($who->flag (FLAG_WIZ)) { 3710 if ($who->flag (FLAG_WIZ)) {
3271 $who->message ("reloading server."); 3711 $who->message ("reloading server.");
3712 async {
3713 $Coro::current->{desc} = "perl_reload";
3272 async { reload_perl }; 3714 reload_perl;
3715 };
3273 } 3716 }
3274}; 3717};
3275 3718
3276unshift @INC, $LIBDIR; 3719unshift @INC, $LIBDIR;
3277 3720
3279 3722
3280our @WAIT_FOR_TICK; 3723our @WAIT_FOR_TICK;
3281our @WAIT_FOR_TICK_BEGIN; 3724our @WAIT_FOR_TICK_BEGIN;
3282 3725
3283sub wait_for_tick { 3726sub wait_for_tick {
3284 return unless $TICK_WATCHER->is_active;
3285 return if $Coro::current == $Coro::main; 3727 return if tick_inhibit || $Coro::current == $Coro::main;
3286 3728
3287 my $signal = new Coro::Signal; 3729 my $signal = new Coro::Signal;
3288 push @WAIT_FOR_TICK, $signal; 3730 push @WAIT_FOR_TICK, $signal;
3289 $signal->wait; 3731 $signal->wait;
3290} 3732}
3291 3733
3292sub wait_for_tick_begin { 3734sub wait_for_tick_begin {
3293 return unless $TICK_WATCHER->is_active;
3294 return if $Coro::current == $Coro::main; 3735 return if tick_inhibit || $Coro::current == $Coro::main;
3295 3736
3296 my $signal = new Coro::Signal; 3737 my $signal = new Coro::Signal;
3297 push @WAIT_FOR_TICK_BEGIN, $signal; 3738 push @WAIT_FOR_TICK_BEGIN, $signal;
3298 $signal->wait; 3739 $signal->wait;
3299} 3740}
3300 3741
3301 my $min = 1e6;#d# 3742sub tick {
3302 my $avg = 10;
3303$TICK_WATCHER = Event->timer (
3304 reentrant => 0,
3305 parked => 1,
3306 prio => 0,
3307 at => $NEXT_TICK || $TICK,
3308 data => WF_AUTOCANCEL,
3309 cb => sub {
3310 if ($Coro::current != $Coro::main) { 3743 if ($Coro::current != $Coro::main) {
3311 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3744 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3312 unless ++$bug_warning > 10; 3745 unless ++$bug_warning > 10;
3313 return; 3746 return;
3314 } 3747 }
3315 3748
3316 $NOW = $tick_start = Event::time;
3317
3318 cf::server_tick; # one server iteration 3749 cf::server_tick; # one server iteration
3319 3750
3320 0 && sync_job {#d# 3751 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3321 for(1..10) { 3752 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3322 my $t = Event::time; 3753 Coro::async_pool {
3323 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3754 $Coro::current->{desc} = "runtime saver";
3324 or die; 3755 write_runtime_sync
3325 3756 or warn "ERROR: unable to write runtime file: $!";
3326 $map->width (50);
3327 $map->height (50);
3328 $map->alloc;
3329 $map->_load_objects ("/tmp/x.map", 1);
3330 my $t = Event::time - $t;
3331
3332 #next unless $t < 0.0013;#d#
3333 if ($t < $min) {
3334 $min = $t;
3335 }
3336 $avg = $avg * 0.99 + $t * 0.01;
3337 }
3338 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3339 exit 0;
3340 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3341 }; 3757 };
3758 }
3342 3759
3343 $RUNTIME += $TICK;
3344 $NEXT_TICK += $TICK;
3345
3346 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3347 $NEXT_RUNTIME_WRITE = $NOW + 10;
3348 Coro::async_pool {
3349 write_runtime
3350 or warn "ERROR: unable to write runtime file: $!";
3351 };
3352 }
3353
3354# my $AFTER = Event::time;
3355# warn $AFTER - $NOW;#d#
3356
3357 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3760 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3358 $sig->send; 3761 $sig->send;
3359 } 3762 }
3360 while (my $sig = shift @WAIT_FOR_TICK) { 3763 while (my $sig = shift @WAIT_FOR_TICK) {
3361 $sig->send; 3764 $sig->send;
3362 } 3765 }
3363 3766
3364 $NOW = Event::time; 3767 $LOAD = ($NOW - $TICK_START) / $TICK;
3365
3366 # if we are delayed by four ticks or more, skip them all
3367 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3368
3369 $TICK_WATCHER->at ($NEXT_TICK);
3370 $TICK_WATCHER->start;
3371
3372 $LOAD = ($NOW - $tick_start) / $TICK;
3373 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3768 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3374 3769
3375 _post_tick; 3770 if (0) {
3376 3771 if ($NEXT_TICK) {
3377 3772 my $jitter = $TICK_START - $NEXT_TICK;
3773 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3774 warn "jitter $JITTER\n";#d#
3775 }
3378 }, 3776 }
3379); 3777}
3380 3778
3381{ 3779{
3382 BDB::max_poll_time $TICK * 0.1; 3780 # configure BDB
3383 $BDB_POLL_WATCHER = Event->io ( 3781
3384 reentrant => 0,
3385 fd => BDB::poll_fileno,
3386 poll => 'r',
3387 prio => 0,
3388 data => WF_AUTOCANCEL,
3389 cb => \&BDB::poll_cb,
3390 );
3391 BDB::min_parallel 8; 3782 BDB::min_parallel 8;
3392 3783 BDB::max_poll_reqs $TICK * 0.1;
3393 BDB::set_sync_prepare { 3784 $Coro::BDB::WATCHER->priority (1);
3394 my $status;
3395 my $current = $Coro::current;
3396 (
3397 sub {
3398 $status = $!;
3399 $current->ready; undef $current;
3400 },
3401 sub {
3402 Coro::schedule while defined $current;
3403 $! = $status;
3404 },
3405 )
3406 };
3407 3785
3408 unless ($DB_ENV) { 3786 unless ($DB_ENV) {
3409 $DB_ENV = BDB::db_env_create; 3787 $DB_ENV = BDB::db_env_create;
3788 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3789 | BDB::LOG_AUTOREMOVE, 1);
3790 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3791 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3410 3792
3411 cf::sync_job { 3793 cf::sync_job {
3412 eval { 3794 eval {
3413 BDB::db_env_open 3795 BDB::db_env_open
3414 $DB_ENV, 3796 $DB_ENV,
3416 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3798 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3417 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3799 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3418 0666; 3800 0666;
3419 3801
3420 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3802 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3421
3422 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3423 $DB_ENV->set_lk_detect;
3424 }; 3803 };
3425 3804
3426 cf::cleanup "db_env_open(db): $@" if $@; 3805 cf::cleanup "db_env_open(db): $@" if $@;
3427 }; 3806 };
3428 } 3807 }
3808
3809 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3810 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3811 };
3812 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3813 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3814 };
3815 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3816 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3817 };
3429} 3818}
3430 3819
3431{ 3820{
3821 # configure IO::AIO
3822
3432 IO::AIO::min_parallel 8; 3823 IO::AIO::min_parallel 8;
3433
3434 undef $Coro::AIO::WATCHER;
3435 IO::AIO::max_poll_time $TICK * 0.1; 3824 IO::AIO::max_poll_time $TICK * 0.1;
3436 $AIO_POLL_WATCHER = Event->io ( 3825 $Coro::AIO::WATCHER->priority (1);
3437 reentrant => 0,
3438 data => WF_AUTOCANCEL,
3439 fd => IO::AIO::poll_fileno,
3440 poll => 'r',
3441 prio => 6,
3442 cb => \&IO::AIO::poll_cb,
3443 );
3444} 3826}
3445 3827
3446my $_log_backtrace; 3828my $_log_backtrace;
3447 3829
3448sub _log_backtrace { 3830sub _log_backtrace {
3452 3834
3453 # limit the # of concurrent backtraces 3835 # limit the # of concurrent backtraces
3454 if ($_log_backtrace < 2) { 3836 if ($_log_backtrace < 2) {
3455 ++$_log_backtrace; 3837 ++$_log_backtrace;
3456 async { 3838 async {
3839 $Coro::current->{desc} = "abt $msg";
3840
3457 my @bt = fork_call { 3841 my @bt = fork_call {
3458 @addr = map { sprintf "%x", $_ } @addr; 3842 @addr = map { sprintf "%x", $_ } @addr;
3459 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3843 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3460 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3844 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3461 or die "addr2line: $!"; 3845 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines