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.345 by root, Tue Aug 28 19:30:11 2007 UTC vs.
Revision 1.434 by root, Thu May 29 03:27:37 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines