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.330 by elmex, Fri Aug 10 10:35:07 2007 UTC vs.
Revision 1.418 by root, Fri Apr 11 21:09:53 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.61 (); 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;
46use Coro::Util ();
24 47
25use JSON::XS 1.4 (); 48use JSON::XS 2.01 ();
26use BDB (); 49use BDB ();
27use Data::Dumper; 50use Data::Dumper;
28use Digest::MD5; 51use Digest::MD5;
29use Fcntl; 52use Fcntl;
30use YAML::Syck (); 53use YAML ();
31use IO::AIO 2.32 (); 54use IO::AIO 2.51 ();
32use Time::HiRes; 55use Time::HiRes;
33use Compress::LZF; 56use Compress::LZF;
34use Digest::MD5 (); 57use Digest::MD5 ();
35 58
36# configure various modules to our taste 59# configure various modules to our taste
37# 60#
38$Storable::canonical = 1; # reduce rsync transfers 61$Storable::canonical = 1; # reduce rsync transfers
39Coro::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
40Compress::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
41
42$Event::Eval = 1; # no idea why this is required, but it is
43
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46 64
47$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
48 66
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 68
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 87our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 89our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 90our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 91our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE;
74 93
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER; 95our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 97our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 98our $USE_FSYNC = 1; # use fsync to write maps - default off
82 99
83our $BDB_POLL_WATCHER; 100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 104our $DB_ENV;
85 105
86our %CFG; 106our %CFG;
87 107
88our $UPTIME; $UPTIME ||= time; 108our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 109our $RUNTIME;
110our $NOW;
90 111
91our %PLAYER; # all users 112our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 113our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 114our $LINK_MAP; # the special {link} map, which is always available
94 115
95# 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 ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 118
98our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
100our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
101 123
102binmode STDOUT; 124binmode STDOUT;
103binmode STDERR; 125binmode STDERR;
104 126
105# read virtual server time, if available 127# read virtual server time, if available
158 180
159The raw value load value from the last tick. 181The raw value load value from the last tick.
160 182
161=item %cf::CFG 183=item %cf::CFG
162 184
163Configuration for the server, loaded from C</etc/crossfire/config>, or 185Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 186from wherever your confdir points to.
165 187
166=item cf::wait_for_tick, cf::wait_for_tick_begin 188=item cf::wait_for_tick, cf::wait_for_tick_begin
167 189
168These 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
186 $msg .= "\n" 208 $msg .= "\n"
187 unless $msg =~ /\n$/; 209 unless $msg =~ /\n$/;
188 210
189 $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;
190 212
191 utf8::encode $msg;
192 LOG llevError, $msg; 213 LOG llevError, $msg;
193 }; 214 };
194} 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#?
195 231
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
212)) { 248)) {
213 no strict 'refs'; 249 no strict 'refs';
214 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215} 251}
216 252
217$Event::DIED = sub { 253$EV::DIED = sub {
218 warn "error in event callback: @_"; 254 warn "error in event callback: @_";
219}; 255};
220 256
221############################################################################# 257#############################################################################
222 258
245 $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;
246 $d 282 $d
247 } || "[unable to dump $_[0]: '$@']"; 283 } || "[unable to dump $_[0]: '$@']";
248} 284}
249 285
250=item $ref = cf::from_json $json 286=item $ref = cf::decode_json $json
251 287
252Converts a JSON string into the corresponding perl data structure. 288Converts a JSON string into the corresponding perl data structure.
253 289
254=item $json = cf::to_json $ref 290=item $json = cf::encode_json $ref
255 291
256Converts a perl data structure into its JSON representation. 292Converts a perl data structure into its JSON representation.
257 293
258=cut 294=cut
259 295
260our $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
261 297
262sub to_json ($) { $json_coder->encode ($_[0]) } 298sub encode_json($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) } 299sub decode_json($) { $json_coder->decode ($_[0]) }
264 300
265=item cf::lock_wait $string 301=item cf::lock_wait $string
266 302
267Wait until the given lock is available. See cf::lock_acquire. 303Wait until the given lock is available. See cf::lock_acquire.
268 304
271Wait 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
272a 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,
273for example when the coroutine gets canceled), the lock is automatically 309for example when the coroutine gets canceled), the lock is automatically
274returned. 310returned.
275 311
312Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro.
314
276Lock 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
277uses map_find and cf::map::load uses map_load). 316uses map_find and cf::map::load uses map_load).
278 317
279=item $locked = cf::lock_active $string 318=item $locked = cf::lock_active $string
280 319
281Return 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.
282 321
283=cut 322=cut
284 323
285our %LOCK; 324our %LOCK;
325our %LOCKER;#d#
286 326
287sub lock_wait($) { 327sub lock_wait($) {
288 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#
289 334
290 # wait for lock, if any 335 # wait for lock, if any
291 while ($LOCK{$key}) { 336 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current; 337 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 338 Coro::schedule;
299 344
300 # wait, to be sure we are not locked 345 # wait, to be sure we are not locked
301 lock_wait $key; 346 lock_wait $key;
302 347
303 $LOCK{$key} = []; 348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
304 350
305 Coro::guard { 351 Coro::guard {
352 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 353 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 354 $_->ready for @{ delete $LOCK{$key} };
308 } 355 }
309} 356}
310 357
313 360
314 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
315} 362}
316 363
317sub freeze_mainloop { 364sub freeze_mainloop {
318 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
319 366
320 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
321 $TICK_WATCHER->start; 368}
322 }; 369
323 $TICK_WATCHER->stop; 370=item cf::periodic $interval, $cb
324 $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
325} 383}
326 384
327=item cf::get_slot $time[, $priority[, $name]] 385=item cf::get_slot $time[, $priority[, $name]]
328 386
329Allocate $time seconds of blocking CPU time at priority C<$priority>: 387Allocate $time seconds of blocking CPU time at priority C<$priority>:
340our @SLOT_QUEUE; 398our @SLOT_QUEUE;
341our $SLOT_QUEUE; 399our $SLOT_QUEUE;
342 400
343$SLOT_QUEUE->cancel if $SLOT_QUEUE; 401$SLOT_QUEUE->cancel if $SLOT_QUEUE;
344$SLOT_QUEUE = Coro::async { 402$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager");
404
345 my $signal = new Coro::Signal; 405 my $signal = new Coro::Signal;
346 406
347 while () { 407 while () {
348 next_job: 408 next_job:
349 my $avail = cf::till_tick; 409 my $avail = cf::till_tick;
357 } 417 }
358 } 418 }
359 } 419 }
360 420
361 if (@SLOT_QUEUE) { 421 if (@SLOT_QUEUE) {
362 # 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
363 push @cf::WAIT_FOR_TICK, $signal; 423 push @cf::WAIT_FOR_TICK, $signal;
364 $signal->wait; 424 $signal->wait;
365 } else { 425 } else {
366 Coro::schedule; 426 Coro::schedule;
367 } 427 }
390 450
391BEGIN { *async = \&Coro::async_pool } 451BEGIN { *async = \&Coro::async_pool }
392 452
393=item cf::sync_job { BLOCK } 453=item cf::sync_job { BLOCK }
394 454
395The design of Crossfire TRT requires that the main coroutine ($Coro::main) 455The design of Deliantra requires that the main coroutine ($Coro::main)
396is always able to handle events or runnable, as Crossfire TRT is only 456is always able to handle events or runnable, as Deliantra is only
397partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 457partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
398acceptable. 458acceptable.
399 459
400If it must be done, put the blocking parts into C<sync_job>. This will run 460If it must be done, put the blocking parts into C<sync_job>. This will run
401the given BLOCK in another coroutine while waiting for the result. The 461the given BLOCK in another coroutine while waiting for the result. The
406 466
407sub sync_job(&) { 467sub sync_job(&) {
408 my ($job) = @_; 468 my ($job) = @_;
409 469
410 if ($Coro::current == $Coro::main) { 470 if ($Coro::current == $Coro::main) {
411 my $time = Event::time; 471 my $time = EV::time;
412 472
413 # this is the main coro, too bad, we have to block 473 # this is the main coro, too bad, we have to block
414 # till the operation succeeds, freezing the server :/ 474 # till the operation succeeds, freezing the server :/
415 475
416 # TODO: use suspend/resume instead 476 LOG llevError, Carp::longmess "sync job";#d#
417 # (but this is cancel-safe) 477
418 my $freeze_guard = freeze_mainloop; 478 my $freeze_guard = freeze_mainloop;
419 479
420 my $busy = 1; 480 my $busy = 1;
421 my @res; 481 my @res;
422 482
423 (async { 483 (async {
484 $Coro::current->desc ("sync job coro");
424 @res = eval { $job->() }; 485 @res = eval { $job->() };
425 warn $@ if $@; 486 warn $@ if $@;
426 undef $busy; 487 undef $busy;
427 })->prio (Coro::PRIO_MAX); 488 })->prio (Coro::PRIO_MAX);
428 489
429 while ($busy) { 490 while ($busy) {
430 Coro::cede or Event::one_event; 491 if (Coro::nready) {
492 Coro::cede_notself;
493 } else {
494 EV::loop EV::LOOP_ONESHOT;
431 } 495 }
496 }
432 497
433 $time = Event::time - $time; 498 my $time = EV::time - $time;
434 499
435 LOG llevError | logBacktrace, Carp::longmess "long sync job"
436 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
437
438 $tick_start += $time; # do not account sync jobs to server load 500 $TICK_START += $time; # do not account sync jobs to server load
439 501
440 wantarray ? @res : $res[0] 502 wantarray ? @res : $res[0]
441 } else { 503 } else {
442 # we are in another coroutine, how wonderful, everything just works 504 # we are in another coroutine, how wonderful, everything just works
443 505
468=item fork_call { }, $args 530=item fork_call { }, $args
469 531
470Executes the given code block with the given arguments in a seperate 532Executes the given code block with the given arguments in a seperate
471process, returning the results. Everything must be serialisable with 533process, returning the results. Everything must be serialisable with
472Coro::Storable. May, of course, block. Note that the executed sub may 534Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 535never block itself or use any form of event handling.
474 536
475=cut 537=cut
476
477sub _store_scalar {
478 open my $fh, ">", \my $buf
479 or die "fork_call: cannot open fh-to-buf in child : $!";
480 Storable::store_fd $_[0], $fh;
481 close $fh;
482
483 $buf
484}
485 538
486sub fork_call(&@) { 539sub fork_call(&@) {
487 my ($cb, @args) = @_; 540 my ($cb, @args) = @_;
488 541
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 542 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 543 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 544 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 545
494 if (my $pid = fork) { 546 my @res = Coro::Util::fork_eval {
495 close $fh2;
496
497 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498 warn "pst<$res>" unless $res =~ /^pst/;
499 $res = Coro::Storable::thaw $res;
500
501 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
502
503 Carp::confess $$res unless "ARRAY" eq ref $res;
504
505 return wantarray ? @$res : $res->[-1];
506 } else {
507 reset_signals; 547 reset_signals;
508 local $SIG{__WARN__}; 548 &$cb
509 local $SIG{__DIE__}; 549 }, @args;
510 # just in case, this hack effectively disables event
511 # in the child. cleaner and slower would be canceling all watchers,
512 # but this works for the time being.
513 local $Coro::idle;
514 $Coro::current->prio (Coro::PRIO_MAX);
515 550
516 eval { 551 wantarray ? @res : $res[-1]
517 close $fh1; 552}
518 553
519 my @res = eval { $cb->(@args) }; 554=item $coin = coin_from_name $name
520 555
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res; 556=cut
522 close $fh2;
523 };
524 557
525 warn $@ if $@; 558our %coin_alias = (
526 _exit 0; 559 "silver" => "silvercoin",
527 } 560 "silvercoin" => "silvercoin",
561 "silvercoins" => "silvercoin",
562 "gold" => "goldcoin",
563 "goldcoin" => "goldcoin",
564 "goldcoins" => "goldcoin",
565 "platinum" => "platinacoin",
566 "platinumcoin" => "platinacoin",
567 "platinumcoins" => "platinacoin",
568 "platina" => "platinacoin",
569 "platinacoin" => "platinacoin",
570 "platinacoins" => "platinacoin",
571 "royalty" => "royalty",
572 "royalties" => "royalty",
573);
574
575sub coin_from_name($) {
576 $coin_alias{$_[0]}
577 ? cf::arch::find $coin_alias{$_[0]}
578 : undef
528} 579}
529 580
530=item $value = cf::db_get $family => $key 581=item $value = cf::db_get $family => $key
531 582
532Returns a single value from the environment database. 583Returns a single value from the environment database.
534=item cf::db_put $family => $key => $value 585=item cf::db_put $family => $key => $value
535 586
536Stores the given C<$value> in the family. It can currently store binary 587Stores the given C<$value> in the family. It can currently store binary
537data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 588data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
538 589
590=item $db = cf::db_table "name"
591
592Create and/or open a new database table. The string must not be "db" and must be unique
593within each server.
594
539=cut 595=cut
596
597sub db_table($) {
598 my ($name) = @_;
599 my $db = BDB::db_create $DB_ENV;
600
601 eval {
602 $db->set_flags (BDB::CHKSUM);
603
604 utf8::encode $name;
605 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
606 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
607 cf::cleanup "db_open(db): $!" if $!;
608 };
609 cf::cleanup "db_open(db): $@" if $@;
610
611 $db
612}
540 613
541our $DB; 614our $DB;
542 615
543sub db_init { 616sub db_init {
544 unless ($DB) {
545 $DB = BDB::db_create $DB_ENV;
546
547 cf::sync_job { 617 cf::sync_job {
548 eval { 618 $DB ||= db_table "db";
549 $DB->set_flags (BDB::CHKSUM);
550
551 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
552 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
553 cf::cleanup "db_open(db): $!" if $!;
554 };
555 cf::cleanup "db_open(db): $@" if $@;
556 };
557 } 619 };
558} 620}
559 621
560sub db_get($$) { 622sub db_get($$) {
561 my $key = "$_[0]/$_[1]"; 623 my $key = "$_[0]/$_[1]";
562 624
612 if (1) { 674 if (1) {
613 $md5 = 675 $md5 =
614 join "\x00", 676 join "\x00",
615 $processversion, 677 $processversion,
616 map { 678 map {
617 Coro::cede; 679 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 680 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 681 } 0.. $#$src;
620 682
621 683
622 my $dbmd5 = db_get cache => "$id/md5"; 684 my $dbmd5 = db_get cache => "$id/md5";
666attach callbacks/event handlers (a collection of which is called an "attachment") 728attach callbacks/event handlers (a collection of which is called an "attachment")
667to it. All such attachable objects support the following methods. 729to it. All such attachable objects support the following methods.
668 730
669In the following description, CLASS can be any of C<global>, C<object> 731In the following description, CLASS can be any of C<global>, C<object>
670C<player>, C<client> or C<map> (i.e. the attachable objects in 732C<player>, C<client> or C<map> (i.e. the attachable objects in
671Crossfire TRT). 733Deliantra).
672 734
673=over 4 735=over 4
674 736
675=item $attachable->attach ($attachment, key => $value...) 737=item $attachable->attach ($attachment, key => $value...)
676 738
958 } 1020 }
959 1021
960 0 1022 0
961} 1023}
962 1024
963=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1025=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
964 1026
965=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1027=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
966 1028
967Generate an object-specific event with the given arguments. 1029Generate an object-specific event with the given arguments.
968 1030
974 1036
975=cut 1037=cut
976 1038
977############################################################################# 1039#############################################################################
978# object support 1040# object support
979#
980 1041
1042sub _object_equal($$);
1043sub _object_equal($$) {
1044 my ($a, $b) = @_;
1045
1046 return 0 unless (ref $a) eq (ref $b);
1047
1048 if ("HASH" eq ref $a) {
1049 my @ka = keys %$a;
1050 my @kb = keys %$b;
1051
1052 return 0 if @ka != @kb;
1053
1054 for (0 .. $#ka) {
1055 return 0 unless $ka[$_] eq $kb[$_];
1056 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1057 }
1058
1059 } elsif ("ARRAY" eq ref $a) {
1060
1061 return 0 if @$a != @$b;
1062
1063 for (0 .. $#$a) {
1064 return 0 unless _object_equal $a->[$_], $b->[$_];
1065 }
1066
1067 } elsif ($a ne $b) {
1068 return 0;
1069 }
1070
1071 1
1072}
1073
1074our $SLOW_MERGES;#d#
981sub _can_merge { 1075sub _can_merge {
982 my ($ob1, $ob2) = @_; 1076 my ($ob1, $ob2) = @_;
983 1077
984 local $Storable::canonical = 1; 1078 ++$SLOW_MERGES;#d#
985 my $fob1 = Storable::freeze $ob1;
986 my $fob2 = Storable::freeze $ob2;
987 1079
988 $fob1 eq $fob2 1080 # we do the slow way here
1081 return _object_equal $ob1, $ob2
989} 1082}
990 1083
991sub reattach { 1084sub reattach {
992 # basically do the same as instantiate, without calling instantiate 1085 # basically do the same as instantiate, without calling instantiate
993 my ($obj) = @_; 1086 my ($obj) = @_;
1015cf::attachable->attach ( 1108cf::attachable->attach (
1016 prio => -1000000, 1109 prio => -1000000,
1017 on_instantiate => sub { 1110 on_instantiate => sub {
1018 my ($obj, $data) = @_; 1111 my ($obj, $data) = @_;
1019 1112
1020 $data = from_json $data; 1113 $data = decode_json $data;
1021 1114
1022 for (@$data) { 1115 for (@$data) {
1023 my ($name, $args) = @$_; 1116 my ($name, $args) = @$_;
1024 1117
1025 $obj->attach ($name, %{$args || {} }); 1118 $obj->attach ($name, %{$args || {} });
1041sub object_freezer_save { 1134sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1135 my ($filename, $rdata, $objs) = @_;
1043 1136
1044 sync_job { 1137 sync_job {
1045 if (length $$rdata) { 1138 if (length $$rdata) {
1139 utf8::decode (my $decname = $filename);
1046 warn sprintf "saving %s (%d,%d)\n", 1140 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1141 $decname, length $$rdata, scalar @$objs;
1048 1142
1049 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1144 chmod SAVE_MODE, $fh;
1051 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052 aio_fsync $fh if $cf::USE_FSYNC; 1146 aio_fsync $fh if $cf::USE_FSYNC;
1053 close $fh; 1147 close $fh;
1054 1148
1055 if (@$objs) { 1149 if (@$objs) {
1056 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1150 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1057 chmod SAVE_MODE, $fh; 1151 chmod SAVE_MODE, $fh;
1058 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1059 aio_write $fh, 0, (length $data), $data, 0; 1153 aio_write $fh, 0, (length $data), $data, 0;
1060 aio_fsync $fh if $cf::USE_FSYNC; 1154 aio_fsync $fh if $cf::USE_FSYNC;
1061 close $fh; 1155 close $fh;
1062 aio_rename "$filename.pst~", "$filename.pst"; 1156 aio_rename "$filename.pst~", "$filename.pst";
1063 } 1157 }
1071 } 1165 }
1072 } else { 1166 } else {
1073 aio_unlink $filename; 1167 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1168 aio_unlink "$filename.pst";
1075 } 1169 }
1076 } 1170 };
1077} 1171}
1078 1172
1079sub object_freezer_as_string { 1173sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1174 my ($rdata, $objs) = @_;
1081 1175
1093 or return; 1187 or return;
1094 1188
1095 unless (aio_stat "$filename.pst") { 1189 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1190 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1191 or return;
1192
1098 $av = eval { (Storable::thaw $av)->{objs} }; 1193 my $st = eval { Coro::Storable::thaw $av };
1194 $av = $st->{objs};
1099 } 1195 }
1100 1196
1197 utf8::decode (my $decname = $filename);
1101 warn sprintf "loading %s (%d)\n", 1198 warn sprintf "loading %s (%d,%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1199 $decname, length $data, scalar @{$av || []};
1200
1103 return ($data, $av); 1201 ($data, $av)
1104} 1202}
1105 1203
1106=head2 COMMAND CALLBACKS 1204=head2 COMMAND CALLBACKS
1107 1205
1108=over 4 1206=over 4
1186 my ($type, $reply, @payload) = 1284 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg 1285 "ARRAY" eq ref $msg
1188 ? @$msg 1286 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1287 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190 1288
1289 my @reply;
1290
1191 if (my $cb = $EXTCMD{$type}) { 1291 if (my $cb = $EXTCMD{$type}) {
1192 my @reply = $cb->($pl, @payload); 1292 @reply = $cb->($pl, @payload);
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196 } 1293 }
1294
1295 $pl->ext_reply ($reply, @reply)
1296 if $reply;
1297
1197 } else { 1298 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1299 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1300 }
1200 1301
1201 cf::override; 1302 cf::override;
1254 my $msg = $@ ? "$v->{path}: $@\n" 1355 my $msg = $@ ? "$v->{path}: $@\n"
1255 : "$v->{base}: extension inactive.\n"; 1356 : "$v->{base}: extension inactive.\n";
1256 1357
1257 if (exists $v->{meta}{mandatory}) { 1358 if (exists $v->{meta}{mandatory}) {
1258 warn $msg; 1359 warn $msg;
1259 warn "mandatory extension failed to load, exiting.\n"; 1360 cf::cleanup "mandatory extension failed to load, exiting.";
1260 exit 1;
1261 } 1361 }
1262 1362
1263 warn $msg; 1363 warn $msg;
1264 } 1364 }
1265 1365
1290use Coro::AIO; 1390use Coro::AIO;
1291 1391
1292=head3 cf::player 1392=head3 cf::player
1293 1393
1294=over 4 1394=over 4
1395
1396=item cf::player::num_playing
1397
1398Returns the official number of playing players, as per the Crossfire metaserver rules.
1399
1400=cut
1401
1402sub num_playing {
1403 scalar grep
1404 $_->ob->map
1405 && !$_->hidden
1406 && !$_->ob->flag (cf::FLAG_WIZ),
1407 cf::player::list
1408}
1295 1409
1296=item cf::player::find $login 1410=item cf::player::find $login
1297 1411
1298Returns the given player object, loading it if necessary (might block). 1412Returns the given player object, loading it if necessary (might block).
1299 1413
1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1449 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1450 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1337 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1451 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1452 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1453
1340 my $pl = load_pl path $login 1454 my $f = new_from_file cf::object::thawer path $login
1341 or return; 1455 or return;
1456
1457 my $pl = cf::player::load_pl $f
1458 or return;
1459 local $cf::PLAYER_LOADING{$login} = $pl;
1460 $f->resolve_delayed_derefs;
1342 $cf::PLAYER{$login} = $pl 1461 $cf::PLAYER{$login} = $pl
1343 } 1462 }
1344 } 1463 }
1345} 1464}
1346 1465
1356 1475
1357 aio_mkdir playerdir $pl, 0770; 1476 aio_mkdir playerdir $pl, 0770;
1358 $pl->{last_save} = $cf::RUNTIME; 1477 $pl->{last_save} = $cf::RUNTIME;
1359 1478
1360 $pl->save_pl ($path); 1479 $pl->save_pl ($path);
1361 Coro::cede; 1480 cf::cede_to_tick;
1362} 1481}
1363 1482
1364sub new($) { 1483sub new($) {
1365 my ($login) = @_; 1484 my ($login) = @_;
1366 1485
1444 or return []; 1563 or return [];
1445 1564
1446 my @logins; 1565 my @logins;
1447 1566
1448 for my $login (@$dirs) { 1567 for my $login (@$dirs) {
1568 my $path = path $login;
1569
1570 # a .pst is a dead give-away for a valid player
1571 unless (-e "$path.pst") {
1449 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1450 aio_read $fh, 0, 512, my $buf, 0 or next; 1573 aio_read $fh, 0, 512, my $buf, 0 or next;
1451 $buf !~ /^password -------------$/m or next; # official not-valid tag 1574 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 }
1452 1576
1453 utf8::decode $login; 1577 utf8::decode $login;
1454 push @logins, $login; 1578 push @logins, $login;
1455 } 1579 }
1456 1580
1489 1613
1490Expand crossfire pod fragments into protocol xml. 1614Expand crossfire pod fragments into protocol xml.
1491 1615
1492=cut 1616=cut
1493 1617
1618use re 'eval';
1619
1620my $group;
1621my $interior; $interior = qr{
1622 # match a pod interior sequence sans C<< >>
1623 (?:
1624 \ (.*?)\ (?{ $group = $^N })
1625 | < (??{$interior}) >
1626 )
1627}x;
1628
1494sub expand_cfpod { 1629sub expand_cfpod {
1495 ((my $self), (local $_)) = @_; 1630 my ($self, $pod) = @_;
1496 1631
1497 # escape & and < 1632 my $xml;
1498 s/&/&amp;/g;
1499 s/(?<![BIUGH])</&lt;/g;
1500 1633
1501 # this is buggy, it needs to properly take care of nested <'s 1634 while () {
1635 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1636 $group = $1;
1502 1637
1503 1 while 1638 $group =~ s/&/&amp;/g;
1504 # replace B<>, I<>, U<> etc. 1639 $group =~ s/</&lt;/g;
1505 s/B<([^\>]*)>/<b>$1<\/b>/ 1640
1506 || s/I<([^\>]*)>/<i>$1<\/i>/ 1641 $xml .= $group;
1507 || s/U<([^\>]*)>/<u>$1<\/u>/ 1642 } elsif ($pod =~ m%\G
1508 # replace G<male|female> tags 1643 ([BCGHITU])
1509 || s{G<([^>|]*)\|([^>]*)>}{ 1644 <
1510 $self->gender ? $2 : $1 1645 (?:
1511 }ge 1646 ([^<>]*) (?{ $group = $^N })
1512 # replace H<hint text> 1647 | < $interior >
1513 || s{H<([^\>]*)>} 1648 )
1649 >
1650 %gcsx
1514 { 1651 ) {
1652 my ($code, $data) = ($1, $group);
1653
1654 if ($code eq "B") {
1655 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1656 } elsif ($code eq "I") {
1657 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1658 } elsif ($code eq "U") {
1659 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1660 } elsif ($code eq "C") {
1661 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1662 } elsif ($code eq "T") {
1663 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1664 } elsif ($code eq "G") {
1665 my ($male, $female) = split /\|/, $data;
1666 $data = $self->gender ? $female : $male;
1667 $xml .= expand_cfpod ($self, $data);
1668 } elsif ($code eq "H") {
1515 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1669 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1516 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1670 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1517 "") 1671 "")
1518 [$self->{hintmode}] 1672 [$self->{hintmode}];
1673 } else {
1674 $xml .= "error processing '$code($data)' directive";
1519 }ge; 1675 }
1676 } else {
1677 if ($pod =~ /\G(.+)/) {
1678 warn "parse error while expanding $pod (at $1)";
1679 }
1680 last;
1681 }
1682 }
1520 1683
1684 for ($xml) {
1521 # create single paragraphs (very hackish) 1685 # create single paragraphs (very hackish)
1522 s/(?<=\S)\n(?=\w)/ /g; 1686 s/(?<=\S)\n(?=\w)/ /g;
1523 1687
1524 # compress some whitespace 1688 # compress some whitespace
1525 s/\s+\n/\n/g; # ws line-ends 1689 s/\s+\n/\n/g; # ws line-ends
1526 s/\n\n+/\n/g; # double lines 1690 s/\n\n+/\n/g; # double lines
1527 s/^\n+//; # beginning lines 1691 s/^\n+//; # beginning lines
1528 s/\n+$//; # ending lines 1692 s/\n+$//; # ending lines
1693 }
1529 1694
1530 $_ 1695 $xml
1531} 1696}
1697
1698no re 'eval';
1532 1699
1533sub hintmode { 1700sub hintmode {
1534 $_[0]{hintmode} = $_[1] if @_ > 1; 1701 $_[0]{hintmode} = $_[1] if @_ > 1;
1535 $_[0]{hintmode} 1702 $_[0]{hintmode}
1536} 1703}
1542=cut 1709=cut
1543 1710
1544sub ext_reply($$@) { 1711sub ext_reply($$@) {
1545 my ($self, $id, @msg) = @_; 1712 my ($self, $id, @msg) = @_;
1546 1713
1547 if ($self->ns->extcmd == 2) { 1714 $self->ns->ext_reply ($id, @msg)
1548 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1549 } elsif ($self->ns->extcmd == 1) {
1550 #TODO: version 1, remove
1551 unshift @msg, msgtype => "reply", msgid => $id;
1552 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1553 }
1554} 1715}
1555 1716
1556=item $player->ext_msg ($type, @msg) 1717=item $player->ext_msg ($type, @msg)
1557 1718
1558Sends an ext event to the client. 1719Sends an ext event to the client.
1614our $MAX_RESET = 3600; 1775our $MAX_RESET = 3600;
1615our $DEFAULT_RESET = 3000; 1776our $DEFAULT_RESET = 3000;
1616 1777
1617sub generate_random_map { 1778sub generate_random_map {
1618 my ($self, $rmp) = @_; 1779 my ($self, $rmp) = @_;
1780
1781 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1782
1619 # mit "rum" bekleckern, nicht 1783 # mit "rum" bekleckern, nicht
1620 $self->_create_random_map ( 1784 $self->_create_random_map (
1621 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1785 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1622 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1786 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1623 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1787 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1786 1950
1787sub load_header_from($) { 1951sub load_header_from($) {
1788 my ($self, $path) = @_; 1952 my ($self, $path) = @_;
1789 1953
1790 utf8::encode $path; 1954 utf8::encode $path;
1791 #aio_open $path, O_RDONLY, 0 1955 my $f = new_from_file cf::object::thawer $path
1792 # or return;
1793
1794 $self->_load_header ($path)
1795 or return; 1956 or return;
1957
1958 $self->_load_header ($f)
1959 or return;
1960
1961 local $MAP_LOADING{$self->{path}} = $self;
1962 $f->resolve_delayed_derefs;
1796 1963
1797 $self->{load_path} = $path; 1964 $self->{load_path} = $path;
1798 1965
1799 1 1966 1
1800} 1967}
1854sub find { 2021sub find {
1855 my ($path, $origin) = @_; 2022 my ($path, $origin) = @_;
1856 2023
1857 $path = normalise $path, $origin && $origin->path; 2024 $path = normalise $path, $origin && $origin->path;
1858 2025
2026 cf::lock_wait "map_data:$path";#d#remove
1859 cf::lock_wait "map_find:$path"; 2027 cf::lock_wait "map_find:$path";
1860 2028
1861 $cf::MAP{$path} || do { 2029 $cf::MAP{$path} || do {
1862 my $guard = cf::lock_acquire "map_find:$path"; 2030 my $guard1 = cf::lock_acquire "map_find:$path";
2031 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2032
1863 my $map = new_from_path cf::map $path 2033 my $map = new_from_path cf::map $path
1864 or return; 2034 or return;
1865 2035
1866 $map->{last_save} = $cf::RUNTIME; 2036 $map->{last_save} = $cf::RUNTIME;
1867 2037
1869 or return; 2039 or return;
1870 2040
1871 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2041 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1872 # doing this can freeze the server in a sync job, obviously 2042 # doing this can freeze the server in a sync job, obviously
1873 #$cf::WAIT_FOR_TICK->wait; 2043 #$cf::WAIT_FOR_TICK->wait;
2044 undef $guard1;
2045 undef $guard2;
1874 $map->reset; 2046 $map->reset;
1875 undef $guard;
1876 return find $path; 2047 return find $path;
1877 } 2048 }
1878 2049
1879 $cf::MAP{$path} = $map 2050 $cf::MAP{$path} = $map
1880 } 2051 }
1889 local $self->{deny_reset} = 1; # loading can take a long time 2060 local $self->{deny_reset} = 1; # loading can take a long time
1890 2061
1891 my $path = $self->{path}; 2062 my $path = $self->{path};
1892 2063
1893 { 2064 {
1894 my $guard = cf::lock_acquire "map_load:$path"; 2065 my $guard = cf::lock_acquire "map_data:$path";
1895 2066
2067 return unless $self->valid;
1896 return if $self->in_memory != cf::MAP_SWAPPED; 2068 return unless $self->in_memory == cf::MAP_SWAPPED;
1897 2069
1898 $self->in_memory (cf::MAP_LOADING); 2070 $self->in_memory (cf::MAP_LOADING);
1899 2071
1900 $self->alloc; 2072 $self->alloc;
1901 2073
1902 $self->pre_load; 2074 $self->pre_load;
1903 Coro::cede; 2075 cf::cede_to_tick;
1904 2076
2077 my $f = new_from_file cf::object::thawer $self->{load_path};
2078 $f->skip_block;
1905 $self->_load_objects ($self->{load_path}, 1) 2079 $self->_load_objects ($f)
1906 or return; 2080 or return;
1907 2081
1908 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2082 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1909 if delete $self->{load_original}; 2083 if delete $self->{load_original};
1910 2084
1911 if (my $uniq = $self->uniq_path) { 2085 if (my $uniq = $self->uniq_path) {
1912 utf8::encode $uniq; 2086 utf8::encode $uniq;
1913 if (aio_open $uniq, O_RDONLY, 0) { 2087 unless (aio_stat $uniq) {
2088 if (my $f = new_from_file cf::object::thawer $uniq) {
1914 $self->clear_unique_items; 2089 $self->clear_unique_items;
1915 $self->_load_objects ($uniq, 0); 2090 $self->_load_objects ($f);
2091 $f->resolve_delayed_derefs;
2092 }
1916 } 2093 }
1917 } 2094 }
1918 2095
1919 Coro::cede; 2096 $f->resolve_delayed_derefs;
2097
2098 cf::cede_to_tick;
1920 # now do the right thing for maps 2099 # now do the right thing for maps
1921 $self->link_multipart_objects; 2100 $self->link_multipart_objects;
1922 $self->difficulty ($self->estimate_difficulty) 2101 $self->difficulty ($self->estimate_difficulty)
1923 unless $self->difficulty; 2102 unless $self->difficulty;
1924 Coro::cede; 2103 cf::cede_to_tick;
1925 2104
1926 unless ($self->{deny_activate}) { 2105 unless ($self->{deny_activate}) {
1927 $self->decay_objects; 2106 $self->decay_objects;
1928 $self->fix_auto_apply; 2107 $self->fix_auto_apply;
1929 $self->update_buttons; 2108 $self->update_buttons;
1930 Coro::cede; 2109 cf::cede_to_tick;
1931 $self->set_darkness_map; 2110 $self->set_darkness_map;
1932 Coro::cede; 2111 cf::cede_to_tick;
1933 $self->activate; 2112 $self->activate;
1934 } 2113 }
1935 2114
1936 $self->{last_save} = $cf::RUNTIME; 2115 $self->{last_save} = $cf::RUNTIME;
1937 $self->last_access ($cf::RUNTIME); 2116 $self->last_access ($cf::RUNTIME);
1953 2132
1954 $self 2133 $self
1955} 2134}
1956 2135
1957# find and load all maps in the 3x3 area around a map 2136# find and load all maps in the 3x3 area around a map
1958sub load_diag { 2137sub load_neighbours {
1959 my ($map) = @_; 2138 my ($map) = @_;
1960 2139
1961 my @diag; # diagonal neighbours 2140 my @neigh; # diagonal neighbours
1962 2141
1963 for (0 .. 3) { 2142 for (0 .. 3) {
1964 my $neigh = $map->tile_path ($_) 2143 my $neigh = $map->tile_path ($_)
1965 or next; 2144 or next;
1966 $neigh = find $neigh, $map 2145 $neigh = find $neigh, $map
1967 or next; 2146 or next;
1968 $neigh->load; 2147 $neigh->load;
1969 2148
2149 push @neigh,
1970 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2150 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1971 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2151 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1972 } 2152 }
1973 2153
1974 for (@diag) { 2154 for (grep defined $_->[0], @neigh) {
2155 my ($path, $origin) = @$_;
1975 my $neigh = find @$_ 2156 my $neigh = find $path, $origin
1976 or next; 2157 or next;
1977 $neigh->load; 2158 $neigh->load;
1978 } 2159 }
1979} 2160}
1980 2161
1985} 2166}
1986 2167
1987sub do_load_sync { 2168sub do_load_sync {
1988 my ($map) = @_; 2169 my ($map) = @_;
1989 2170
2171 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2172 if $Coro::current == $Coro::main;
2173
1990 cf::sync_job { $map->load }; 2174 cf::sync_job { $map->load };
1991} 2175}
1992 2176
1993our %MAP_PREFETCH; 2177our %MAP_PREFETCH;
1994our $MAP_PREFETCHER = undef; 2178our $MAP_PREFETCHER = undef;
1995 2179
1996sub find_async { 2180sub find_async {
1997 my ($path, $origin) = @_; 2181 my ($path, $origin, $load) = @_;
1998 2182
1999 $path = normalise $path, $origin && $origin->{path}; 2183 $path = normalise $path, $origin && $origin->{path};
2000 2184
2001 if (my $map = $cf::MAP{$path}) { 2185 if (my $map = $cf::MAP{$path}) {
2002 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2186 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
2003 } 2187 }
2004 2188
2005 undef $MAP_PREFETCH{$path}; 2189 $MAP_PREFETCH{$path} |= $load;
2190
2006 $MAP_PREFETCHER ||= cf::async { 2191 $MAP_PREFETCHER ||= cf::async {
2192 $Coro::current->{desc} = "map prefetcher";
2193
2007 while (%MAP_PREFETCH) { 2194 while (%MAP_PREFETCH) {
2008 for my $path (keys %MAP_PREFETCH) { 2195 while (my ($k, $v) = each %MAP_PREFETCH) {
2009 if (my $map = find $path) { 2196 if (my $map = find $k) {
2010 $map->load; 2197 $map->load if $v;
2011 } 2198 }
2012 2199
2013 delete $MAP_PREFETCH{$path}; 2200 delete $MAP_PREFETCH{$k};
2014 } 2201 }
2015 } 2202 }
2016 undef $MAP_PREFETCHER; 2203 undef $MAP_PREFETCHER;
2017 }; 2204 };
2018 $MAP_PREFETCHER->prio (6); 2205 $MAP_PREFETCHER->prio (6);
2021} 2208}
2022 2209
2023sub save { 2210sub save {
2024 my ($self) = @_; 2211 my ($self) = @_;
2025 2212
2026 my $lock = cf::lock_acquire "map_data:" . $self->path; 2213 my $lock = cf::lock_acquire "map_data:$self->{path}";
2027 2214
2028 $self->{last_save} = $cf::RUNTIME; 2215 $self->{last_save} = $cf::RUNTIME;
2029 2216
2030 return unless $self->dirty; 2217 return unless $self->dirty;
2031 2218
2037 return if $self->{deny_save}; 2224 return if $self->{deny_save};
2038 2225
2039 local $self->{last_access} = $self->last_access;#d# 2226 local $self->{last_access} = $self->last_access;#d#
2040 2227
2041 cf::async { 2228 cf::async {
2229 $Coro::current->{desc} = "map player save";
2042 $_->contr->save for $self->players; 2230 $_->contr->save for $self->players;
2043 }; 2231 };
2044 2232
2045 if ($uniq) { 2233 if ($uniq) {
2046 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2234 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2054 my ($self) = @_; 2242 my ($self) = @_;
2055 2243
2056 # save first because save cedes 2244 # save first because save cedes
2057 $self->save; 2245 $self->save;
2058 2246
2059 my $lock = cf::lock_acquire "map_data:" . $self->path; 2247 my $lock = cf::lock_acquire "map_data:$self->{path}";
2060 2248
2061 return if $self->players; 2249 return if $self->players;
2062 return if $self->in_memory != cf::MAP_IN_MEMORY; 2250 return if $self->in_memory != cf::MAP_IN_MEMORY;
2063 return if $self->{deny_save}; 2251 return if $self->{deny_save};
2064 2252
2253 $self->in_memory (cf::MAP_SWAPPED);
2254
2255 $self->deactivate;
2256 $_->clear_links_to ($self) for values %cf::MAP;
2065 $self->clear; 2257 $self->clear;
2066 $self->in_memory (cf::MAP_SWAPPED);
2067} 2258}
2068 2259
2069sub reset_at { 2260sub reset_at {
2070 my ($self) = @_; 2261 my ($self) = @_;
2071 2262
2103 if $uniq; 2294 if $uniq;
2104 } 2295 }
2105 2296
2106 delete $cf::MAP{$self->path}; 2297 delete $cf::MAP{$self->path};
2107 2298
2299 $self->deactivate;
2300 $_->clear_links_to ($self) for values %cf::MAP;
2108 $self->clear; 2301 $self->clear;
2109
2110 $_->clear_links_to ($self) for values %cf::MAP;
2111 2302
2112 $self->unlink_save; 2303 $self->unlink_save;
2113 $self->destroy; 2304 $self->destroy;
2114} 2305}
2115 2306
2116my $nuke_counter = "aaaa"; 2307my $nuke_counter = "aaaa";
2117 2308
2118sub nuke { 2309sub nuke {
2119 my ($self) = @_; 2310 my ($self) = @_;
2120 2311
2312 {
2313 my $lock = cf::lock_acquire "map_data:$self->{path}";
2314
2121 delete $cf::MAP{$self->path}; 2315 delete $cf::MAP{$self->path};
2122 2316
2123 $self->unlink_save; 2317 $self->unlink_save;
2124 2318
2125 bless $self, "cf::map"; 2319 bless $self, "cf::map";
2126 delete $self->{deny_reset}; 2320 delete $self->{deny_reset};
2127 $self->{deny_save} = 1; 2321 $self->{deny_save} = 1;
2128 $self->reset_timeout (1); 2322 $self->reset_timeout (1);
2129 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2323 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2130 2324
2131 $cf::MAP{$self->path} = $self; 2325 $cf::MAP{$self->path} = $self;
2326 }
2132 2327
2133 $self->reset; # polite request, might not happen 2328 $self->reset; # polite request, might not happen
2134} 2329}
2135 2330
2136=item $maps = cf::map::tmp_maps 2331=item $maps = cf::map::tmp_maps
2185 : () 2380 : ()
2186 } @{ aio_readdir $UNIQUEDIR or [] } 2381 } @{ aio_readdir $UNIQUEDIR or [] }
2187 ] 2382 ]
2188} 2383}
2189 2384
2190package cf;
2191
2192=back 2385=back
2193 2386
2194=head3 cf::object 2387=head3 cf::object
2195 2388
2196=cut 2389=cut
2210 map { $_, inv_recursive_ $_->inv } @_ 2403 map { $_, inv_recursive_ $_->inv } @_
2211} 2404}
2212 2405
2213sub inv_recursive { 2406sub inv_recursive {
2214 inv_recursive_ inv $_[0] 2407 inv_recursive_ inv $_[0]
2408}
2409
2410=item $ref = $ob->ref
2411
2412creates and returns a persistent reference to an objetc that can be stored as a string.
2413
2414=item $ob = cf::object::deref ($refstring)
2415
2416returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2417even if the object actually exists. May block.
2418
2419=cut
2420
2421sub deref {
2422 my ($ref) = @_;
2423
2424 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2425 my ($uuid, $name) = ($1, $2);
2426 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2427 or return;
2428 $pl->ob->uuid eq $uuid
2429 or return;
2430
2431 $pl->ob
2432 } else {
2433 warn "$ref: cannot resolve object reference\n";
2434 undef
2435 }
2215} 2436}
2216 2437
2217package cf; 2438package cf;
2218 2439
2219=back 2440=back
2349 # use -1 or undef as default coordinates, not 0, 0 2570 # use -1 or undef as default coordinates, not 0, 0
2350 ($x, $y) = ($map->enter_x, $map->enter_y) 2571 ($x, $y) = ($map->enter_x, $map->enter_y)
2351 if $x <=0 && $y <= 0; 2572 if $x <=0 && $y <= 0;
2352 2573
2353 $map->load; 2574 $map->load;
2354 $map->load_diag; 2575 $map->load_neighbours;
2355 2576
2356 return unless $self->contr->active; 2577 return unless $self->contr->active;
2357 $self->activate_recursive; 2578 $self->activate_recursive;
2358 2579
2359 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2580 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2379 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2600 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2380 2601
2381 $self->enter_link; 2602 $self->enter_link;
2382 2603
2383 (async { 2604 (async {
2605 $Coro::current->{desc} = "player::goto $path $x $y";
2606
2607 # *tag paths override both path and x|y
2608 if ($path =~ /^\*(.*)$/) {
2609 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2610 my $ob = $obs[rand @obs];
2611
2612 # see if we actually can go there
2613 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2614 $ob = $obs[rand @obs];
2615 } else {
2616 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2617 }
2618 # else put us there anyways for now #d#
2619
2620 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2621 } else {
2622 ($path, $x, $y) = (undef, undef, undef);
2623 }
2624 }
2625
2384 my $map = eval { 2626 my $map = eval {
2385 my $map = cf::map::find $path; 2627 my $map = defined $path ? cf::map::find $path : undef;
2386 2628
2387 if ($map) { 2629 if ($map) {
2388 $map = $map->customise_for ($self); 2630 $map = $map->customise_for ($self);
2389 $map = $check->($map) if $check && $map; 2631 $map = $check->($map) if $check && $map;
2390 } else { 2632 } else {
2391 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2633 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2392 } 2634 }
2393 2635
2394 $map 2636 $map
2395 }; 2637 };
2396 2638
2449 $rmp->{origin_y} = $exit->y; 2691 $rmp->{origin_y} = $exit->y;
2450 } 2692 }
2451 2693
2452 $rmp->{random_seed} ||= $exit->random_seed; 2694 $rmp->{random_seed} ||= $exit->random_seed;
2453 2695
2454 my $data = cf::to_json $rmp; 2696 my $data = cf::encode_json $rmp;
2455 my $md5 = Digest::MD5::md5_hex $data; 2697 my $md5 = Digest::MD5::md5_hex $data;
2456 my $meta = "$RANDOMDIR/$md5.meta"; 2698 my $meta = "$RANDOMDIR/$md5.meta";
2457 2699
2458 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2700 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2459 aio_write $fh, 0, (length $data), $data, 0; 2701 aio_write $fh, 0, (length $data), $data, 0;
2486 # if exit is damned, update players death & WoR home-position 2728 # if exit is damned, update players death & WoR home-position
2487 $self->contr->savebed ($slaying, $hp, $sp) 2729 $self->contr->savebed ($slaying, $hp, $sp)
2488 if $exit->flag (FLAG_DAMNED); 2730 if $exit->flag (FLAG_DAMNED);
2489 2731
2490 (async { 2732 (async {
2733 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2734
2491 $self->deactivate_recursive; # just to be sure 2735 $self->deactivate_recursive; # just to be sure
2492 unless (eval { 2736 unless (eval {
2493 $self->goto ($slaying, $hp, $sp); 2737 $self->goto ($slaying, $hp, $sp);
2494 2738
2495 1; 2739 1;
2530the message, with C<log> being the default. If C<$color> is negative, suppress 2774the message, with C<log> being the default. If C<$color> is negative, suppress
2531the message unless the client supports the msg packet. 2775the message unless the client supports the msg packet.
2532 2776
2533=cut 2777=cut
2534 2778
2779# non-persistent channels (usually the info channel)
2780our %CHANNEL = (
2781 "c/identify" => {
2782 id => "infobox",
2783 title => "Identify",
2784 reply => undef,
2785 tooltip => "Items recently identified",
2786 },
2787 "c/examine" => {
2788 id => "infobox",
2789 title => "Examine",
2790 reply => undef,
2791 tooltip => "Signs and other items you examined",
2792 },
2793 "c/book" => {
2794 id => "infobox",
2795 title => "Book",
2796 reply => undef,
2797 tooltip => "The contents of a note or book",
2798 },
2799 "c/lookat" => {
2800 id => "infobox",
2801 title => "Look",
2802 reply => undef,
2803 tooltip => "What you saw there",
2804 },
2805 "c/who" => {
2806 id => "infobox",
2807 title => "Players",
2808 reply => undef,
2809 tooltip => "Shows players who are currently online",
2810 },
2811 "c/body" => {
2812 id => "infobox",
2813 title => "Body Parts",
2814 reply => undef,
2815 tooltip => "Shows which body parts you posess and are available",
2816 },
2817 "c/uptime" => {
2818 id => "infobox",
2819 title => "Uptime",
2820 reply => undef,
2821 tooltip => "How long the server has been running since last restart",
2822 },
2823 "c/mapinfo" => {
2824 id => "infobox",
2825 title => "Map Info",
2826 reply => undef,
2827 tooltip => "Information related to the maps",
2828 },
2829);
2830
2535sub cf::client::send_msg { 2831sub cf::client::send_msg {
2536 my ($self, $channel, $msg, $color, @extra) = @_; 2832 my ($self, $channel, $msg, $color, @extra) = @_;
2537 2833
2538 $msg = $self->pl->expand_cfpod ($msg); 2834 $msg = $self->pl->expand_cfpod ($msg);
2539 2835
2540 $color &= cf::NDI_CLIENT_MASK; # just in case... 2836 $color &= cf::NDI_CLIENT_MASK; # just in case...
2541 2837
2838 # check predefined channels, for the benefit of C
2839 if ($CHANNEL{$channel}) {
2840 $channel = $CHANNEL{$channel};
2841
2842 $self->ext_msg (channel_info => $channel)
2843 if $self->can_msg;
2844
2845 $channel = $channel->{id};
2846
2542 if (ref $channel) { 2847 } elsif (ref $channel) {
2543 # send meta info to client, if not yet sent 2848 # send meta info to client, if not yet sent
2544 unless (exists $self->{channel}{$channel->{id}}) { 2849 unless (exists $self->{channel}{$channel->{id}}) {
2545 $self->{channel}{$channel->{id}} = $channel; 2850 $self->{channel}{$channel->{id}} = $channel;
2546 $self->ext_msg (channel_info => $channel); 2851 $self->ext_msg (channel_info => $channel)
2852 if $self->can_msg;
2547 } 2853 }
2548 2854
2549 $channel = $channel->{id}; 2855 $channel = $channel->{id};
2550 } 2856 }
2551 2857
2573 $color &= cf::NDI_COLOR_MASK; 2879 $color &= cf::NDI_COLOR_MASK;
2574 2880
2575 utf8::encode $msg; 2881 utf8::encode $msg;
2576 2882
2577 if (0 && $msg =~ /\[/) { 2883 if (0 && $msg =~ /\[/) {
2884 # COMMAND/INFO
2578 $self->send_packet ("drawextinfo $color 4 0 $msg") 2885 $self->send_packet ("drawextinfo $color 10 8 $msg")
2579 } else { 2886 } else {
2580 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2887 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2581 $self->send_packet ("drawinfo $color $msg") 2888 $self->send_packet ("drawinfo $color $msg")
2582 } 2889 }
2583 } 2890 }
2591=cut 2898=cut
2592 2899
2593sub cf::client::ext_msg($$@) { 2900sub cf::client::ext_msg($$@) {
2594 my ($self, $type, @msg) = @_; 2901 my ($self, $type, @msg) = @_;
2595 2902
2596 my $extcmd = $self->extcmd;
2597
2598 if ($extcmd == 2) { 2903 if ($self->extcmd == 2) {
2599 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2904 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2600 } elsif ($extcmd == 1) { # TODO: remove 2905 } elsif ($self->extcmd == 1) { # TODO: remove
2601 push @msg, msgtype => "event_$type"; 2906 push @msg, msgtype => "event_$type";
2907 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2908 }
2909}
2910
2911=item $client->ext_reply ($msgid, @msg)
2912
2913Sends an ext reply to the client.
2914
2915=cut
2916
2917sub cf::client::ext_reply($$@) {
2918 my ($self, $id, @msg) = @_;
2919
2920 if ($self->extcmd == 2) {
2921 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2922 } elsif ($self->extcmd == 1) {
2923 #TODO: version 1, remove
2924 unshift @msg, msgtype => "reply", msgid => $id;
2602 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2925 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2603 } 2926 }
2604} 2927}
2605 2928
2606=item $success = $client->query ($flags, "text", \&cb) 2929=item $success = $client->query ($flags, "text", \&cb)
2668 my ($type, $reply, @payload) = 2991 my ($type, $reply, @payload) =
2669 "ARRAY" eq ref $msg 2992 "ARRAY" eq ref $msg
2670 ? @$msg 2993 ? @$msg
2671 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2994 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2672 2995
2996 my @reply;
2997
2673 if (my $cb = $EXTICMD{$type}) { 2998 if (my $cb = $EXTICMD{$type}) {
2674 my @reply = $cb->($ns, @payload); 2999 @reply = $cb->($ns, @payload);
2675
2676 $ns->ext_reply ($reply, @reply)
2677 if $reply;
2678 } 3000 }
3001
3002 $ns->ext_reply ($reply, @reply)
3003 if $reply;
3004
2679 } else { 3005 } else {
2680 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3006 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2681 } 3007 }
2682 3008
2683 cf::override; 3009 cf::override;
2743=pod 3069=pod
2744 3070
2745The following functions and methods are available within a safe environment: 3071The following functions and methods are available within a safe environment:
2746 3072
2747 cf::object 3073 cf::object
2748 contr pay_amount pay_player map x y force_find force_add 3074 contr pay_amount pay_player map x y force_find force_add destroy
2749 insert remove name archname title slaying race 3075 insert remove name archname title slaying race decrease_ob_nr
2750 3076
2751 cf::object::player 3077 cf::object::player
2752 player 3078 player
2753 3079
2754 cf::player 3080 cf::player
2759 3085
2760=cut 3086=cut
2761 3087
2762for ( 3088for (
2763 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3089 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2764 insert remove inv name archname title slaying race)], 3090 insert remove inv name archname title slaying race
3091 decrease_ob_nr destroy)],
2765 ["cf::object::player" => qw(player)], 3092 ["cf::object::player" => qw(player)],
2766 ["cf::player" => qw(peaceful)], 3093 ["cf::player" => qw(peaceful)],
2767 ["cf::map" => qw(trigger)], 3094 ["cf::map" => qw(trigger)],
2768) { 3095) {
2769 no strict 'refs'; 3096 no strict 'refs';
2845# the server's init and main functions 3172# the server's init and main functions
2846 3173
2847sub load_facedata($) { 3174sub load_facedata($) {
2848 my ($path) = @_; 3175 my ($path) = @_;
2849 3176
3177 # HACK to clear player env face cache, we need some signal framework
3178 # for this (global event?)
3179 %ext::player_env::MUSIC_FACE_CACHE = ();
3180
3181 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3182
2850 warn "loading facedata from $path\n"; 3183 warn "loading facedata from $path\n";
2851 3184
2852 my $facedata; 3185 my $facedata;
2853 0 < aio_load $path, $facedata 3186 0 < aio_load $path, $facedata
2854 or die "$path: $!"; 3187 or die "$path: $!";
2856 $facedata = Coro::Storable::thaw $facedata; 3189 $facedata = Coro::Storable::thaw $facedata;
2857 3190
2858 $facedata->{version} == 2 3191 $facedata->{version} == 2
2859 or cf::cleanup "$path: version mismatch, cannot proceed."; 3192 or cf::cleanup "$path: version mismatch, cannot proceed.";
2860 3193
3194 # patch in the exptable
3195 $facedata->{resource}{"res/exp_table"} = {
3196 type => FT_RSRC,
3197 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3198 };
3199 cf::cede_to_tick;
3200
2861 { 3201 {
2862 my $faces = $facedata->{faceinfo}; 3202 my $faces = $facedata->{faceinfo};
2863 3203
2864 while (my ($face, $info) = each %$faces) { 3204 while (my ($face, $info) = each %$faces) {
2865 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3205 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3206
2866 cf::face::set_visibility $idx, $info->{visibility}; 3207 cf::face::set_visibility $idx, $info->{visibility};
2867 cf::face::set_magicmap $idx, $info->{magicmap}; 3208 cf::face::set_magicmap $idx, $info->{magicmap};
2868 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3209 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2869 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3210 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2870 3211
2871 cf::cede_to_tick; 3212 cf::cede_to_tick;
2872 } 3213 }
2873 3214
2874 while (my ($face, $info) = each %$faces) { 3215 while (my ($face, $info) = each %$faces) {
2875 next unless $info->{smooth}; 3216 next unless $info->{smooth};
3217
2876 my $idx = cf::face::find $face 3218 my $idx = cf::face::find $face
2877 or next; 3219 or next;
3220
2878 if (my $smooth = cf::face::find $info->{smooth}) { 3221 if (my $smooth = cf::face::find $info->{smooth}) {
2879 cf::face::set_smooth $idx, $smooth; 3222 cf::face::set_smooth $idx, $smooth;
2880 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3223 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2881 } else { 3224 } else {
2882 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3225 warn "smooth face '$info->{smooth}' not found for face '$face'";
2899 3242
2900 { 3243 {
2901 # TODO: for gcfclient pleasure, we should give resources 3244 # TODO: for gcfclient pleasure, we should give resources
2902 # that gcfclient doesn't grok a >10000 face index. 3245 # that gcfclient doesn't grok a >10000 face index.
2903 my $res = $facedata->{resource}; 3246 my $res = $facedata->{resource};
2904 my $enc = JSON::XS->new->utf8->canonical;
2905
2906 my $soundconf = delete $res->{"res/sound.conf"};
2907 3247
2908 while (my ($name, $info) = each %$res) { 3248 while (my ($name, $info) = each %$res) {
2909 my $meta = $enc->encode ({ 3249 if (defined $info->{type}) {
2910 name => $name,
2911 %{ $info->{meta} || {} },
2912 });
2913
2914 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3250 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3251 my $data;
2915 3252
2916 if ($info->{type} & 1) { 3253 if ($info->{type} & 1) {
2917 # prepend meta info 3254 # prepend meta info
2918 3255
3256 my $meta = $enc->encode ({
3257 name => $name,
3258 %{ $info->{meta} || {} },
3259 });
3260
2919 my $data = pack "(w/a*)*", $meta, $info->{data}; 3261 $data = pack "(w/a*)*", $meta, $info->{data};
2920 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata 3262 } else {
3263 $data = $info->{data};
3264 }
2921 3265
2922 cf::face::set_data $idx, 0, $data, $chk; 3266 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3267 cf::face::set_type $idx, $info->{type};
2923 } else { 3268 } else {
2924 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3269 $RESOURCE{$name} = $info;
2925 } 3270 }
2926 3271
2927 cf::face::set_type $idx, $info->{type};
2928
2929 cf::cede_to_tick; 3272 cf::cede_to_tick;
2930 } 3273 }
2931
2932 if ($soundconf) {
2933 $soundconf = $enc->decode (delete $soundconf->{data});
2934
2935 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2936 my $sound = $soundconf->{compat}[$_]
2937 or next;
2938
2939 my $face = cf::face::find "sound/$sound->[1]";
2940 cf::sound::set $sound->[0] => $face;
2941 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2942 }
2943
2944 while (my ($k, $v) = each %{$soundconf->{event}}) {
2945 my $face = cf::face::find "sound/$v";
2946 cf::sound::set $k => $face;
2947 }
2948 }
2949 } 3274 }
3275
3276 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2950 3277
2951 1 3278 1
2952} 3279}
3280
3281cf::global->attach (on_resource_update => sub {
3282 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3283 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3284
3285 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3286 my $sound = $soundconf->{compat}[$_]
3287 or next;
3288
3289 my $face = cf::face::find "sound/$sound->[1]";
3290 cf::sound::set $sound->[0] => $face;
3291 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3292 }
3293
3294 while (my ($k, $v) = each %{$soundconf->{event}}) {
3295 my $face = cf::face::find "sound/$v";
3296 cf::sound::set $k => $face;
3297 }
3298 }
3299});
2953 3300
2954register_exticmd fx_want => sub { 3301register_exticmd fx_want => sub {
2955 my ($ns, $want) = @_; 3302 my ($ns, $want) = @_;
2956 3303
2957 while (my ($k, $v) = each %$want) { 3304 while (my ($k, $v) = each %$want) {
2958 $ns->fx_want ($k, $v); 3305 $ns->fx_want ($k, $v);
2959 } 3306 }
2960}; 3307};
2961 3308
2962sub reload_regions { 3309sub reload_regions {
3310 # HACK to clear player env face cache, we need some signal framework
3311 # for this (global event?)
3312 %ext::player_env::MUSIC_FACE_CACHE = ();
3313
2963 load_resource_file "$MAPDIR/regions" 3314 load_resource_file "$MAPDIR/regions"
2964 or die "unable to load regions file\n"; 3315 or die "unable to load regions file\n";
2965 3316
2966 for (cf::region::list) { 3317 for (cf::region::list) {
2967 $_->{match} = qr/$_->{match}/ 3318 $_->{match} = qr/$_->{match}/
3003 3354
3004sub init { 3355sub init {
3005 reload_resources; 3356 reload_resources;
3006} 3357}
3007 3358
3008sub cfg_load { 3359sub reload_config {
3009 open my $fh, "<:utf8", "$CONFDIR/config" 3360 open my $fh, "<:utf8", "$CONFDIR/config"
3010 or return; 3361 or return;
3011 3362
3012 local $/; 3363 local $/;
3013 *CFG = YAML::Syck::Load <$fh>; 3364 *CFG = YAML::Load <$fh>;
3014 3365
3015 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3366 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3016 3367
3017 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3368 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3018 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3369 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3029sub main { 3380sub main {
3030 # we must not ever block the main coroutine 3381 # we must not ever block the main coroutine
3031 local $Coro::idle = sub { 3382 local $Coro::idle = sub {
3032 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3383 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3033 (async { 3384 (async {
3034 Event::one_event; 3385 $Coro::current->{desc} = "IDLE BUG HANDLER";
3386 EV::loop EV::LOOP_ONESHOT;
3035 })->prio (Coro::PRIO_MAX); 3387 })->prio (Coro::PRIO_MAX);
3036 }; 3388 };
3037 3389
3038 cfg_load; 3390 reload_config;
3039 db_init; 3391 db_init;
3040 load_extensions; 3392 load_extensions;
3041 3393
3042 $TICK_WATCHER->start; 3394 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3395 evthread_start IO::AIO::poll_fileno;
3043 Event::loop; 3396 EV::loop;
3044} 3397}
3045 3398
3046############################################################################# 3399#############################################################################
3047# initialisation and cleanup 3400# initialisation and cleanup
3048 3401
3049# install some emergency cleanup handlers 3402# install some emergency cleanup handlers
3050BEGIN { 3403BEGIN {
3404 our %SIGWATCHER = ();
3051 for my $signal (qw(INT HUP TERM)) { 3405 for my $signal (qw(INT HUP TERM)) {
3052 Event->signal ( 3406 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3053 reentrant => 0,
3054 data => WF_AUTOCANCEL,
3055 signal => $signal,
3056 prio => 0,
3057 cb => sub {
3058 cf::cleanup "SIG$signal"; 3407 cf::cleanup "SIG$signal";
3059 },
3060 ); 3408 };
3061 } 3409 }
3062} 3410}
3063 3411
3064sub write_runtime { 3412sub write_runtime_sync {
3065 my $runtime = "$LOCALDIR/runtime"; 3413 my $runtime = "$LOCALDIR/runtime";
3066 3414
3067 # first touch the runtime file to show we are still running: 3415 # first touch the runtime file to show we are still running:
3068 # the fsync below can take a very very long time. 3416 # the fsync below can take a very very long time.
3069 3417
3095 and return; 3443 and return;
3096 3444
3097 warn "runtime file written.\n"; 3445 warn "runtime file written.\n";
3098 3446
3099 1 3447 1
3448}
3449
3450our $uuid_lock;
3451our $uuid_skip;
3452
3453sub write_uuid_sync($) {
3454 $uuid_skip ||= $_[0];
3455
3456 return if $uuid_lock;
3457 local $uuid_lock = 1;
3458
3459 my $uuid = "$LOCALDIR/uuid";
3460
3461 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3462 or return;
3463
3464 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3465 $uuid_skip = 0;
3466
3467 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3468 and return;
3469
3470 # always fsync - this file is important
3471 aio_fsync $fh
3472 and return;
3473
3474 close $fh
3475 or return;
3476
3477 aio_rename "$uuid~", $uuid
3478 and return;
3479
3480 warn "uuid file written ($value).\n";
3481
3482 1
3483
3484}
3485
3486sub write_uuid($$) {
3487 my ($skip, $sync) = @_;
3488
3489 $sync ? write_uuid_sync $skip
3490 : async { write_uuid_sync $skip };
3100} 3491}
3101 3492
3102sub emergency_save() { 3493sub emergency_save() {
3103 my $freeze_guard = cf::freeze_mainloop; 3494 my $freeze_guard = cf::freeze_mainloop;
3104 3495
3110 # and maps saved/destroyed asynchronously. 3501 # and maps saved/destroyed asynchronously.
3111 warn "begin emergency player save\n"; 3502 warn "begin emergency player save\n";
3112 for my $login (keys %cf::PLAYER) { 3503 for my $login (keys %cf::PLAYER) {
3113 my $pl = $cf::PLAYER{$login} or next; 3504 my $pl = $cf::PLAYER{$login} or next;
3114 $pl->valid or next; 3505 $pl->valid or next;
3506 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3115 $pl->save; 3507 $pl->save;
3116 } 3508 }
3117 warn "end emergency player save\n"; 3509 warn "end emergency player save\n";
3118 3510
3119 warn "begin emergency map save\n"; 3511 warn "begin emergency map save\n";
3125 warn "end emergency map save\n"; 3517 warn "end emergency map save\n";
3126 3518
3127 warn "begin emergency database checkpoint\n"; 3519 warn "begin emergency database checkpoint\n";
3128 BDB::db_env_txn_checkpoint $DB_ENV; 3520 BDB::db_env_txn_checkpoint $DB_ENV;
3129 warn "end emergency database checkpoint\n"; 3521 warn "end emergency database checkpoint\n";
3522
3523 warn "begin write uuid\n";
3524 write_uuid_sync 1;
3525 warn "end write uuid\n";
3130 }; 3526 };
3131 3527
3132 warn "leave emergency perl save\n"; 3528 warn "leave emergency perl save\n";
3133} 3529}
3134 3530
3149 warn "reloading..."; 3545 warn "reloading...";
3150 3546
3151 warn "entering sync_job"; 3547 warn "entering sync_job";
3152 3548
3153 cf::sync_job { 3549 cf::sync_job {
3154 cf::write_runtime; # external watchdog should not bark 3550 cf::write_runtime_sync; # external watchdog should not bark
3155 cf::emergency_save; 3551 cf::emergency_save;
3156 cf::write_runtime; # external watchdog should not bark 3552 cf::write_runtime_sync; # external watchdog should not bark
3157 3553
3158 warn "syncing database to disk"; 3554 warn "syncing database to disk";
3159 BDB::db_env_txn_checkpoint $DB_ENV; 3555 BDB::db_env_txn_checkpoint $DB_ENV;
3160 3556
3161 # if anything goes wrong in here, we should simply crash as we already saved 3557 # if anything goes wrong in here, we should simply crash as we already saved
3162
3163 warn "cancelling all WF_AUTOCANCEL watchers";
3164 for (Event::all_watchers) {
3165 $_->cancel if $_->data & WF_AUTOCANCEL;
3166 }
3167 3558
3168 warn "flushing outstanding aio requests"; 3559 warn "flushing outstanding aio requests";
3169 for (;;) { 3560 for (;;) {
3170 BDB::flush; 3561 BDB::flush;
3171 IO::AIO::flush; 3562 IO::AIO::flush;
3172 Coro::cede; 3563 Coro::cede_notself;
3173 last unless IO::AIO::nreqs || BDB::nreqs; 3564 last unless IO::AIO::nreqs || BDB::nreqs;
3174 warn "iterate..."; 3565 warn "iterate...";
3175 } 3566 }
3176 3567
3177 ++$RELOAD; 3568 ++$RELOAD;
3236 warn "reloading cf.pm"; 3627 warn "reloading cf.pm";
3237 require cf; 3628 require cf;
3238 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3629 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3239 3630
3240 warn "loading config and database again"; 3631 warn "loading config and database again";
3241 cf::cfg_load; 3632 cf::reload_config;
3242 3633
3243 warn "loading extensions"; 3634 warn "loading extensions";
3244 cf::load_extensions; 3635 cf::load_extensions;
3245 3636
3246 warn "reattaching attachments to objects/players"; 3637 warn "reattaching attachments to objects/players";
3253 warn "leaving sync_job"; 3644 warn "leaving sync_job";
3254 3645
3255 1 3646 1
3256 } or do { 3647 } or do {
3257 warn $@; 3648 warn $@;
3258 warn "error while reloading, exiting."; 3649 cf::cleanup "error while reloading, exiting.";
3259 exit 1;
3260 }; 3650 };
3261 3651
3262 warn "reloaded"; 3652 warn "reloaded";
3263}; 3653};
3264 3654
3266 3656
3267sub reload_perl() { 3657sub reload_perl() {
3268 # doing reload synchronously and two reloads happen back-to-back, 3658 # doing reload synchronously and two reloads happen back-to-back,
3269 # coro crashes during coro_state_free->destroy here. 3659 # coro crashes during coro_state_free->destroy here.
3270 3660
3271 $RELOAD_WATCHER ||= Event->timer ( 3661 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3272 reentrant => 0,
3273 after => 0,
3274 data => WF_AUTOCANCEL,
3275 cb => sub {
3276 do_reload_perl; 3662 do_reload_perl;
3277 undef $RELOAD_WATCHER; 3663 undef $RELOAD_WATCHER;
3278 },
3279 ); 3664 };
3280} 3665}
3281 3666
3282register_command "reload" => sub { 3667register_command "reload" => sub {
3283 my ($who, $arg) = @_; 3668 my ($who, $arg) = @_;
3284 3669
3285 if ($who->flag (FLAG_WIZ)) { 3670 if ($who->flag (FLAG_WIZ)) {
3286 $who->message ("reloading server."); 3671 $who->message ("reloading server.");
3672 async {
3673 $Coro::current->{desc} = "perl_reload";
3287 async { reload_perl }; 3674 reload_perl;
3675 };
3288 } 3676 }
3289}; 3677};
3290 3678
3291unshift @INC, $LIBDIR; 3679unshift @INC, $LIBDIR;
3292 3680
3294 3682
3295our @WAIT_FOR_TICK; 3683our @WAIT_FOR_TICK;
3296our @WAIT_FOR_TICK_BEGIN; 3684our @WAIT_FOR_TICK_BEGIN;
3297 3685
3298sub wait_for_tick { 3686sub wait_for_tick {
3299 return unless $TICK_WATCHER->is_active; 3687 return if tick_inhibit;
3300 return if $Coro::current == $Coro::main; 3688 return if $Coro::current == $Coro::main;
3301 3689
3302 my $signal = new Coro::Signal; 3690 my $signal = new Coro::Signal;
3303 push @WAIT_FOR_TICK, $signal; 3691 push @WAIT_FOR_TICK, $signal;
3304 $signal->wait; 3692 $signal->wait;
3305} 3693}
3306 3694
3307sub wait_for_tick_begin { 3695sub wait_for_tick_begin {
3308 return unless $TICK_WATCHER->is_active; 3696 return if tick_inhibit;
3309 return if $Coro::current == $Coro::main; 3697 return if $Coro::current == $Coro::main;
3310 3698
3311 my $signal = new Coro::Signal; 3699 my $signal = new Coro::Signal;
3312 push @WAIT_FOR_TICK_BEGIN, $signal; 3700 push @WAIT_FOR_TICK_BEGIN, $signal;
3313 $signal->wait; 3701 $signal->wait;
3314} 3702}
3315 3703
3316 my $min = 1e6;#d# 3704sub tick {
3317 my $avg = 10;
3318$TICK_WATCHER = Event->timer (
3319 reentrant => 0,
3320 parked => 1,
3321 prio => 0,
3322 at => $NEXT_TICK || $TICK,
3323 data => WF_AUTOCANCEL,
3324 cb => sub {
3325 if ($Coro::current != $Coro::main) { 3705 if ($Coro::current != $Coro::main) {
3326 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3706 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3327 unless ++$bug_warning > 10; 3707 unless ++$bug_warning > 10;
3328 return; 3708 return;
3329 } 3709 }
3330 3710
3331 $NOW = $tick_start = Event::time;
3332
3333 cf::server_tick; # one server iteration 3711 cf::server_tick; # one server iteration
3334 3712
3335 0 && sync_job {#d# 3713 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3336 for(1..10) { 3714 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3337 my $t = Event::time; 3715 Coro::async_pool {
3338 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3716 $Coro::current->{desc} = "runtime saver";
3339 or die; 3717 write_runtime_sync
3340 3718 or warn "ERROR: unable to write runtime file: $!";
3341 $map->width (50);
3342 $map->height (50);
3343 $map->alloc;
3344 $map->_load_objects ("/tmp/x.map", 1);
3345 my $t = Event::time - $t;
3346
3347 #next unless $t < 0.0013;#d#
3348 if ($t < $min) {
3349 $min = $t;
3350 }
3351 $avg = $avg * 0.99 + $t * 0.01;
3352 }
3353 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3354 exit 0;
3355 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3356 }; 3719 };
3720 }
3357 3721
3358 $RUNTIME += $TICK;
3359 $NEXT_TICK += $TICK;
3360
3361 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3362 $NEXT_RUNTIME_WRITE = $NOW + 10;
3363 Coro::async_pool {
3364 write_runtime
3365 or warn "ERROR: unable to write runtime file: $!";
3366 };
3367 }
3368
3369# my $AFTER = Event::time;
3370# warn $AFTER - $NOW;#d#
3371
3372 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3722 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3373 $sig->send; 3723 $sig->send;
3374 } 3724 }
3375 while (my $sig = shift @WAIT_FOR_TICK) { 3725 while (my $sig = shift @WAIT_FOR_TICK) {
3376 $sig->send; 3726 $sig->send;
3377 } 3727 }
3378 3728
3379 $NOW = Event::time; 3729 $LOAD = ($NOW - $TICK_START) / $TICK;
3380
3381 # if we are delayed by four ticks or more, skip them all
3382 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3383
3384 $TICK_WATCHER->at ($NEXT_TICK);
3385 $TICK_WATCHER->start;
3386
3387 $LOAD = ($NOW - $tick_start) / $TICK;
3388 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3730 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3389 3731
3390 _post_tick; 3732 if (0) {
3391 3733 if ($NEXT_TICK) {
3392 3734 my $jitter = $TICK_START - $NEXT_TICK;
3735 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3736 warn "jitter $JITTER\n";#d#
3737 }
3393 }, 3738 }
3394); 3739}
3395 3740
3396{ 3741{
3397 BDB::max_poll_time $TICK * 0.1; 3742 # configure BDB
3398 $BDB_POLL_WATCHER = Event->io ( 3743
3399 reentrant => 0,
3400 fd => BDB::poll_fileno,
3401 poll => 'r',
3402 prio => 0,
3403 data => WF_AUTOCANCEL,
3404 cb => \&BDB::poll_cb,
3405 );
3406 BDB::min_parallel 8; 3744 BDB::min_parallel 8;
3407 3745 BDB::max_poll_reqs $TICK * 0.1;
3408 BDB::set_sync_prepare { 3746 $Coro::BDB::WATCHER->priority (1);
3409 my $status;
3410 my $current = $Coro::current;
3411 (
3412 sub {
3413 $status = $!;
3414 $current->ready; undef $current;
3415 },
3416 sub {
3417 Coro::schedule while defined $current;
3418 $! = $status;
3419 },
3420 )
3421 };
3422 3747
3423 unless ($DB_ENV) { 3748 unless ($DB_ENV) {
3424 $DB_ENV = BDB::db_env_create; 3749 $DB_ENV = BDB::db_env_create;
3750 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3751 | BDB::LOG_AUTOREMOVE, 1);
3752 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3753 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3425 3754
3426 cf::sync_job { 3755 cf::sync_job {
3427 eval { 3756 eval {
3428 BDB::db_env_open 3757 BDB::db_env_open
3429 $DB_ENV, 3758 $DB_ENV,
3431 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3760 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3432 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3761 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3433 0666; 3762 0666;
3434 3763
3435 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3764 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3436
3437 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3438 $DB_ENV->set_lk_detect;
3439 }; 3765 };
3440 3766
3441 cf::cleanup "db_env_open(db): $@" if $@; 3767 cf::cleanup "db_env_open(db): $@" if $@;
3442 }; 3768 };
3443 } 3769 }
3770
3771 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3772 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3773 };
3774 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3775 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3776 };
3777 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3778 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3779 };
3444} 3780}
3445 3781
3446{ 3782{
3783 # configure IO::AIO
3784
3447 IO::AIO::min_parallel 8; 3785 IO::AIO::min_parallel 8;
3448
3449 undef $Coro::AIO::WATCHER;
3450 IO::AIO::max_poll_time $TICK * 0.1; 3786 IO::AIO::max_poll_time $TICK * 0.1;
3451 $AIO_POLL_WATCHER = Event->io ( 3787 $Coro::AIO::WATCHER->priority (1);
3452 reentrant => 0,
3453 data => WF_AUTOCANCEL,
3454 fd => IO::AIO::poll_fileno,
3455 poll => 'r',
3456 prio => 6,
3457 cb => \&IO::AIO::poll_cb,
3458 );
3459} 3788}
3460 3789
3461my $_log_backtrace; 3790my $_log_backtrace;
3462 3791
3463sub _log_backtrace { 3792sub _log_backtrace {
3467 3796
3468 # limit the # of concurrent backtraces 3797 # limit the # of concurrent backtraces
3469 if ($_log_backtrace < 2) { 3798 if ($_log_backtrace < 2) {
3470 ++$_log_backtrace; 3799 ++$_log_backtrace;
3471 async { 3800 async {
3801 $Coro::current->{desc} = "abt $msg";
3802
3472 my @bt = fork_call { 3803 my @bt = fork_call {
3473 @addr = map { sprintf "%x", $_ } @addr; 3804 @addr = map { sprintf "%x", $_ } @addr;
3474 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3805 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3475 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3806 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3476 or die "addr2line: $!"; 3807 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines