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.311 by root, Fri Jul 20 16:11:10 2007 UTC vs.
Revision 1.415 by root, Thu Apr 10 15:35:16 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}
369
370=item cf::periodic $interval, $cb
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
383}
384
385=item cf::get_slot $time[, $priority[, $name]]
386
387Allocate $time seconds of blocking CPU time at priority C<$priority>:
388This call blocks and returns only when you have at least C<$time> seconds
389of cpu time till the next tick. The slot is only valid till the next cede.
390
391The optional C<$name> can be used to identify the job to run. It might be
392used for statistical purposes and should identify the same time-class.
393
394Useful for short background jobs.
395
396=cut
397
398our @SLOT_QUEUE;
399our $SLOT_QUEUE;
400
401$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager");
404
405 my $signal = new Coro::Signal;
406
407 while () {
408 next_job:
409 my $avail = cf::till_tick;
410 if ($avail > 0.01) {
411 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) {
413 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send;
415 Coro::cede;
416 goto next_job;
417 }
418 }
419 }
420
421 if (@SLOT_QUEUE) {
422 # we do not use wait_for_tick() as it returns immediately when tick is inactive
423 push @cf::WAIT_FOR_TICK, $signal;
424 $signal->wait;
425 } else {
426 Coro::schedule;
427 }
322 }; 428 }
323 $TICK_WATCHER->stop; 429};
324 $guard 430
431sub get_slot($;$$) {
432 my ($time, $pri, $name) = @_;
433
434 $time = $TICK * .6 if $time > $TICK * .6;
435 my $sig = new Coro::Signal;
436
437 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
438 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
439 $SLOT_QUEUE->ready;
440 $sig->wait;
325} 441}
326 442
327=item cf::async { BLOCK } 443=item cf::async { BLOCK }
328 444
329Currently the same as Coro::async_pool, meaning you cannot use 445Currently the same as Coro::async_pool, meaning you cannot use
334 450
335BEGIN { *async = \&Coro::async_pool } 451BEGIN { *async = \&Coro::async_pool }
336 452
337=item cf::sync_job { BLOCK } 453=item cf::sync_job { BLOCK }
338 454
339The design of Crossfire TRT requires that the main coroutine ($Coro::main) 455The design of Deliantra requires that the main coroutine ($Coro::main)
340is always able to handle events or runnable, as Crossfire TRT is only 456is always able to handle events or runnable, as Deliantra is only
341partly 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
342acceptable. 458acceptable.
343 459
344If 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
345the given BLOCK in another coroutine while waiting for the result. The 461the given BLOCK in another coroutine while waiting for the result. The
350 466
351sub sync_job(&) { 467sub sync_job(&) {
352 my ($job) = @_; 468 my ($job) = @_;
353 469
354 if ($Coro::current == $Coro::main) { 470 if ($Coro::current == $Coro::main) {
355 my $time = Event::time; 471 my $time = EV::time;
356 472
357 # this is the main coro, too bad, we have to block 473 # this is the main coro, too bad, we have to block
358 # till the operation succeeds, freezing the server :/ 474 # till the operation succeeds, freezing the server :/
359 475
360 # TODO: use suspend/resume instead 476 LOG llevError, Carp::longmess "sync job";#d#
361 # (but this is cancel-safe) 477
362 my $freeze_guard = freeze_mainloop; 478 my $freeze_guard = freeze_mainloop;
363 479
364 my $busy = 1; 480 my $busy = 1;
365 my @res; 481 my @res;
366 482
367 (async { 483 (async {
484 $Coro::current->desc ("sync job coro");
368 @res = eval { $job->() }; 485 @res = eval { $job->() };
369 warn $@ if $@; 486 warn $@ if $@;
370 undef $busy; 487 undef $busy;
371 })->prio (Coro::PRIO_MAX); 488 })->prio (Coro::PRIO_MAX);
372 489
373 while ($busy) { 490 while ($busy) {
374 Coro::cede or Event::one_event; 491 if (Coro::nready) {
492 Coro::cede_notself;
493 } else {
494 EV::loop EV::LOOP_ONESHOT;
375 } 495 }
496 }
376 497
377 $time = Event::time - $time; 498 my $time = EV::time - $time;
378 499
379 LOG llevError | logBacktrace, Carp::longmess "long sync job"
380 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
381
382 $tick_start += $time; # do not account sync jobs to server load 500 $TICK_START += $time; # do not account sync jobs to server load
383 501
384 wantarray ? @res : $res[0] 502 wantarray ? @res : $res[0]
385 } else { 503 } else {
386 # we are in another coroutine, how wonderful, everything just works 504 # we are in another coroutine, how wonderful, everything just works
387 505
412=item fork_call { }, $args 530=item fork_call { }, $args
413 531
414Executes the given code block with the given arguments in a seperate 532Executes the given code block with the given arguments in a seperate
415process, returning the results. Everything must be serialisable with 533process, returning the results. Everything must be serialisable with
416Coro::Storable. May, of course, block. Note that the executed sub may 534Coro::Storable. May, of course, block. Note that the executed sub may
417never block itself or use any form of Event handling. 535never block itself or use any form of event handling.
418 536
419=cut 537=cut
420
421sub _store_scalar {
422 open my $fh, ">", \my $buf
423 or die "fork_call: cannot open fh-to-buf in child : $!";
424 Storable::store_fd $_[0], $fh;
425 close $fh;
426
427 $buf
428}
429 538
430sub fork_call(&@) { 539sub fork_call(&@) {
431 my ($cb, @args) = @_; 540 my ($cb, @args) = @_;
432 541
433# 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,
434# or die "socketpair: $!"; 543 # otherwise perl prematurely frees the stuff :/
435 pipe my $fh1, my $fh2 544 # TODO: investigate and fix (likely this will be rather laborious)
436 or die "pipe: $!";
437 545
438 if (my $pid = fork) { 546 my @res = Coro::Util::fork_eval {
439 close $fh2;
440
441 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
442 warn "pst<$res>" unless $res =~ /^pst/;
443 $res = Coro::Storable::thaw $res;
444
445 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
446
447 Carp::confess $$res unless "ARRAY" eq ref $res;
448
449 return wantarray ? @$res : $res->[-1];
450 } else {
451 reset_signals; 547 reset_signals;
452 local $SIG{__WARN__}; 548 &$cb
453 local $SIG{__DIE__}; 549 }, @args;
454 # just in case, this hack effectively disables event
455 # in the child. cleaner and slower would be canceling all watchers,
456 # but this works for the time being.
457 local $Coro::idle;
458 $Coro::current->prio (Coro::PRIO_MAX);
459 550
460 eval { 551 wantarray ? @res : $res[-1]
461 close $fh1; 552}
462 553
463 my @res = eval { $cb->(@args) }; 554=item $coin = coin_from_name $name
464 555
465 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res; 556=cut
466 close $fh2;
467 };
468 557
469 warn $@ if $@; 558our %coin_alias = (
470 _exit 0; 559 "silver" => "silvercoin",
471 } 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
472} 579}
473 580
474=item $value = cf::db_get $family => $key 581=item $value = cf::db_get $family => $key
475 582
476Returns a single value from the environment database. 583Returns a single value from the environment database.
478=item cf::db_put $family => $key => $value 585=item cf::db_put $family => $key => $value
479 586
480Stores 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
481data 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).
482 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
483=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}
484 613
485our $DB; 614our $DB;
486 615
487sub db_init { 616sub db_init {
488 unless ($DB) {
489 $DB = BDB::db_create $DB_ENV;
490
491 cf::sync_job { 617 cf::sync_job {
492 eval { 618 $DB ||= db_table "db";
493 $DB->set_flags (BDB::CHKSUM);
494
495 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
496 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
497 cf::cleanup "db_open(db): $!" if $!;
498 };
499 cf::cleanup "db_open(db): $@" if $@;
500 };
501 } 619 };
502} 620}
503 621
504sub db_get($$) { 622sub db_get($$) {
505 my $key = "$_[0]/$_[1]"; 623 my $key = "$_[0]/$_[1]";
506 624
556 if (1) { 674 if (1) {
557 $md5 = 675 $md5 =
558 join "\x00", 676 join "\x00",
559 $processversion, 677 $processversion,
560 map { 678 map {
561 Coro::cede; 679 cf::cede_to_tick;
562 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 680 ($src->[$_], Digest::MD5::md5_hex $data[$_])
563 } 0.. $#$src; 681 } 0.. $#$src;
564 682
565 683
566 my $dbmd5 = db_get cache => "$id/md5"; 684 my $dbmd5 = db_get cache => "$id/md5";
610attach callbacks/event handlers (a collection of which is called an "attachment") 728attach callbacks/event handlers (a collection of which is called an "attachment")
611to it. All such attachable objects support the following methods. 729to it. All such attachable objects support the following methods.
612 730
613In 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>
614C<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
615Crossfire TRT). 733Deliantra).
616 734
617=over 4 735=over 4
618 736
619=item $attachable->attach ($attachment, key => $value...) 737=item $attachable->attach ($attachment, key => $value...)
620 738
902 } 1020 }
903 1021
904 0 1022 0
905} 1023}
906 1024
907=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1025=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
908 1026
909=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1027=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
910 1028
911Generate an object-specific event with the given arguments. 1029Generate an object-specific event with the given arguments.
912 1030
918 1036
919=cut 1037=cut
920 1038
921############################################################################# 1039#############################################################################
922# object support 1040# object support
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#
1075sub _can_merge {
1076 my ($ob1, $ob2) = @_;
1077
1078 ++$SLOW_MERGES;#d#
1079
1080 # we do the slow way here
1081 return _object_equal $ob1, $ob2
1082}
923 1083
924sub reattach { 1084sub reattach {
925 # basically do the same as instantiate, without calling instantiate 1085 # basically do the same as instantiate, without calling instantiate
926 my ($obj) = @_; 1086 my ($obj) = @_;
927 1087
948cf::attachable->attach ( 1108cf::attachable->attach (
949 prio => -1000000, 1109 prio => -1000000,
950 on_instantiate => sub { 1110 on_instantiate => sub {
951 my ($obj, $data) = @_; 1111 my ($obj, $data) = @_;
952 1112
953 $data = from_json $data; 1113 $data = decode_json $data;
954 1114
955 for (@$data) { 1115 for (@$data) {
956 my ($name, $args) = @$_; 1116 my ($name, $args) = @$_;
957 1117
958 $obj->attach ($name, %{$args || {} }); 1118 $obj->attach ($name, %{$args || {} });
974sub object_freezer_save { 1134sub object_freezer_save {
975 my ($filename, $rdata, $objs) = @_; 1135 my ($filename, $rdata, $objs) = @_;
976 1136
977 sync_job { 1137 sync_job {
978 if (length $$rdata) { 1138 if (length $$rdata) {
1139 utf8::decode (my $decname = $filename);
979 warn sprintf "saving %s (%d,%d)\n", 1140 warn sprintf "saving %s (%d,%d)\n",
980 $filename, length $$rdata, scalar @$objs; 1141 $decname, length $$rdata, scalar @$objs;
981 1142
982 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
983 chmod SAVE_MODE, $fh; 1144 chmod SAVE_MODE, $fh;
984 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
985 aio_fsync $fh if $cf::USE_FSYNC; 1146 aio_fsync $fh if $cf::USE_FSYNC;
986 close $fh; 1147 close $fh;
987 1148
988 if (@$objs) { 1149 if (@$objs) {
989 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) {
990 chmod SAVE_MODE, $fh; 1151 chmod SAVE_MODE, $fh;
991 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
992 aio_write $fh, 0, (length $data), $data, 0; 1153 aio_write $fh, 0, (length $data), $data, 0;
993 aio_fsync $fh if $cf::USE_FSYNC; 1154 aio_fsync $fh if $cf::USE_FSYNC;
994 close $fh; 1155 close $fh;
995 aio_rename "$filename.pst~", "$filename.pst"; 1156 aio_rename "$filename.pst~", "$filename.pst";
996 } 1157 }
1004 } 1165 }
1005 } else { 1166 } else {
1006 aio_unlink $filename; 1167 aio_unlink $filename;
1007 aio_unlink "$filename.pst"; 1168 aio_unlink "$filename.pst";
1008 } 1169 }
1009 } 1170 };
1010} 1171}
1011 1172
1012sub object_freezer_as_string { 1173sub object_freezer_as_string {
1013 my ($rdata, $objs) = @_; 1174 my ($rdata, $objs) = @_;
1014 1175
1026 or return; 1187 or return;
1027 1188
1028 unless (aio_stat "$filename.pst") { 1189 unless (aio_stat "$filename.pst") {
1029 (aio_load "$filename.pst", $av) >= 0 1190 (aio_load "$filename.pst", $av) >= 0
1030 or return; 1191 or return;
1192
1031 $av = eval { (Storable::thaw $av)->{objs} }; 1193 my $st = eval { Coro::Storable::thaw $av };
1194 $av = $st->{objs};
1032 } 1195 }
1033 1196
1197 utf8::decode (my $decname = $filename);
1034 warn sprintf "loading %s (%d)\n", 1198 warn sprintf "loading %s (%d,%d)\n",
1035 $filename, length $data, scalar @{$av || []}; 1199 $decname, length $data, scalar @{$av || []};
1200
1036 return ($data, $av); 1201 ($data, $av)
1037} 1202}
1038 1203
1039=head2 COMMAND CALLBACKS 1204=head2 COMMAND CALLBACKS
1040 1205
1041=over 4 1206=over 4
1114 my ($pl, $buf) = @_; 1279 my ($pl, $buf) = @_;
1115 1280
1116 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1281 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1117 1282
1118 if (ref $msg) { 1283 if (ref $msg) {
1284 my ($type, $reply, @payload) =
1285 "ARRAY" eq ref $msg
1286 ? @$msg
1287 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1288
1289 my @reply;
1290
1119 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1291 if (my $cb = $EXTCMD{$type}) {
1120 if (my %reply = $cb->($pl, $msg)) { 1292 @reply = $cb->($pl, @payload);
1121 $pl->ext_reply ($msg->{msgid}, %reply);
1122 }
1123 } 1293 }
1294
1295 $pl->ext_reply ($reply, @reply)
1296 if $reply;
1297
1124 } else { 1298 } else {
1125 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1299 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1126 } 1300 }
1127 1301
1128 cf::override; 1302 cf::override;
1181 my $msg = $@ ? "$v->{path}: $@\n" 1355 my $msg = $@ ? "$v->{path}: $@\n"
1182 : "$v->{base}: extension inactive.\n"; 1356 : "$v->{base}: extension inactive.\n";
1183 1357
1184 if (exists $v->{meta}{mandatory}) { 1358 if (exists $v->{meta}{mandatory}) {
1185 warn $msg; 1359 warn $msg;
1186 warn "mandatory extension failed to load, exiting.\n"; 1360 cf::cleanup "mandatory extension failed to load, exiting.";
1187 exit 1;
1188 } 1361 }
1189 1362
1190 warn $msg; 1363 warn $msg;
1191 } 1364 }
1192 1365
1217use Coro::AIO; 1390use Coro::AIO;
1218 1391
1219=head3 cf::player 1392=head3 cf::player
1220 1393
1221=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}
1222 1409
1223=item cf::player::find $login 1410=item cf::player::find $login
1224 1411
1225Returns the given player object, loading it if necessary (might block). 1412Returns the given player object, loading it if necessary (might block).
1226 1413
1262 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1449 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1263 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1450 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1264 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1451 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1265 aio_unlink +(playerdir $login) . "/$login.pl"; 1452 aio_unlink +(playerdir $login) . "/$login.pl";
1266 1453
1267 my $pl = load_pl path $login 1454 my $f = new_from_file cf::object::thawer path $login
1268 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;
1269 $cf::PLAYER{$login} = $pl 1461 $cf::PLAYER{$login} = $pl
1270 } 1462 }
1271 } 1463 }
1272} 1464}
1273 1465
1283 1475
1284 aio_mkdir playerdir $pl, 0770; 1476 aio_mkdir playerdir $pl, 0770;
1285 $pl->{last_save} = $cf::RUNTIME; 1477 $pl->{last_save} = $cf::RUNTIME;
1286 1478
1287 $pl->save_pl ($path); 1479 $pl->save_pl ($path);
1288 Coro::cede; 1480 cf::cede_to_tick;
1289} 1481}
1290 1482
1291sub new($) { 1483sub new($) {
1292 my ($login) = @_; 1484 my ($login) = @_;
1293 1485
1297 $self->{deny_save} = 1; 1489 $self->{deny_save} = 1;
1298 1490
1299 $cf::PLAYER{$login} = $self; 1491 $cf::PLAYER{$login} = $self;
1300 1492
1301 $self 1493 $self
1494}
1495
1496=item $player->send_msg ($channel, $msg, $color, [extra...])
1497
1498=cut
1499
1500sub send_msg {
1501 my $ns = shift->ns
1502 or return;
1503 $ns->send_msg (@_);
1302} 1504}
1303 1505
1304=item $pl->quit_character 1506=item $pl->quit_character
1305 1507
1306Nukes the player without looking back. If logged in, the connection will 1508Nukes the player without looking back. If logged in, the connection will
1361 or return []; 1563 or return [];
1362 1564
1363 my @logins; 1565 my @logins;
1364 1566
1365 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") {
1366 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1367 aio_read $fh, 0, 512, my $buf, 0 or next; 1573 aio_read $fh, 0, 512, my $buf, 0 or next;
1368 $buf !~ /^password -------------$/m or next; # official not-valid tag 1574 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 }
1369 1576
1370 utf8::decode $login; 1577 utf8::decode $login;
1371 push @logins, $login; 1578 push @logins, $login;
1372 } 1579 }
1373 1580
1406 1613
1407Expand crossfire pod fragments into protocol xml. 1614Expand crossfire pod fragments into protocol xml.
1408 1615
1409=cut 1616=cut
1410 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
1411sub expand_cfpod { 1629sub expand_cfpod {
1412 ((my $self), (local $_)) = @_; 1630 my ($self, $pod) = @_;
1413 1631
1414 # escape & and < 1632 my $xml;
1415 s/&/&amp;/g;
1416 s/(?<![BIUGH])</&lt;/g;
1417 1633
1418 # this is buggy, it needs to properly take care of nested <'s 1634 while () {
1635 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1636 $group = $1;
1419 1637
1420 1 while 1638 $group =~ s/&/&amp;/g;
1421 # replace B<>, I<>, U<> etc. 1639 $group =~ s/</&lt;/g;
1422 s/B<([^\>]*)>/<b>$1<\/b>/ 1640
1423 || s/I<([^\>]*)>/<i>$1<\/i>/ 1641 $xml .= $group;
1424 || s/U<([^\>]*)>/<u>$1<\/u>/ 1642 } elsif ($pod =~ m%\G
1425 # replace G<male|female> tags 1643 ([BCGHITU])
1426 || s{G<([^>|]*)\|([^>]*)>}{ 1644 <
1427 $self->gender ? $2 : $1 1645 (?:
1428 }ge 1646 ([^<>]*) (?{ $group = $^N })
1429 # replace H<hint text> 1647 | < $interior >
1430 || s{H<([^\>]*)>} 1648 )
1649 >
1650 %gcsx
1431 { 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") {
1432 ("<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>",
1433 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1670 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1434 "") 1671 "")
1435 [$self->{hintmode}] 1672 [$self->{hintmode}];
1673 } else {
1674 $xml .= "error processing '$code($data)' directive";
1436 }ge; 1675 }
1676 } else {
1677 if ($pod =~ /\G(.+)/) {
1678 warn "parse error while expanding $pod (at $1)";
1679 }
1680 last;
1681 }
1682 }
1437 1683
1684 for ($xml) {
1438 # create single paragraphs (very hackish) 1685 # create single paragraphs (very hackish)
1439 s/(?<=\S)\n(?=\w)/ /g; 1686 s/(?<=\S)\n(?=\w)/ /g;
1440 1687
1441 # compress some whitespace 1688 # compress some whitespace
1442 s/\s+\n/\n/g; # ws line-ends 1689 s/\s+\n/\n/g; # ws line-ends
1443 s/\n\n+/\n/g; # double lines 1690 s/\n\n+/\n/g; # double lines
1444 s/^\n+//; # beginning lines 1691 s/^\n+//; # beginning lines
1445 s/\n+$//; # ending lines 1692 s/\n+$//; # ending lines
1693 }
1446 1694
1447 $_ 1695 $xml
1448} 1696}
1697
1698no re 'eval';
1449 1699
1450sub hintmode { 1700sub hintmode {
1451 $_[0]{hintmode} = $_[1] if @_ > 1; 1701 $_[0]{hintmode} = $_[1] if @_ > 1;
1452 $_[0]{hintmode} 1702 $_[0]{hintmode}
1453} 1703}
1454 1704
1455=item $player->ext_reply ($msgid, %msg) 1705=item $player->ext_reply ($msgid, @msg)
1456 1706
1457Sends an ext reply to the player. 1707Sends an ext reply to the player.
1458 1708
1459=cut 1709=cut
1460 1710
1461sub ext_reply($$%) { 1711sub ext_reply($$@) {
1462 my ($self, $id, %msg) = @_; 1712 my ($self, $id, @msg) = @_;
1463 1713
1464 $msg{msgid} = $id; 1714 $self->ns->ext_reply ($id, @msg)
1465 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1466} 1715}
1467 1716
1468=item $player->ext_event ($type, %msg) 1717=item $player->ext_msg ($type, @msg)
1469 1718
1470Sends an ext event to the client. 1719Sends an ext event to the client.
1471 1720
1472=cut 1721=cut
1473 1722
1474sub ext_event($$%) { 1723sub ext_msg($$@) {
1475 my ($self, $type, %msg) = @_; 1724 my ($self, $type, @msg) = @_;
1476 1725
1477 $self->ns->ext_event ($type, %msg); 1726 $self->ns->ext_msg ($type, @msg);
1478} 1727}
1479 1728
1480=head3 cf::region 1729=head3 cf::region
1481 1730
1482=over 4 1731=over 4
1698 1947
1699sub load_header_from($) { 1948sub load_header_from($) {
1700 my ($self, $path) = @_; 1949 my ($self, $path) = @_;
1701 1950
1702 utf8::encode $path; 1951 utf8::encode $path;
1703 #aio_open $path, O_RDONLY, 0 1952 my $f = new_from_file cf::object::thawer $path
1704 # or return;
1705
1706 $self->_load_header ($path)
1707 or return; 1953 or return;
1954
1955 $self->_load_header ($f)
1956 or return;
1957
1958 local $MAP_LOADING{$self->{path}} = $self;
1959 $f->resolve_delayed_derefs;
1708 1960
1709 $self->{load_path} = $path; 1961 $self->{load_path} = $path;
1710 1962
1711 1 1963 1
1712} 1964}
1766sub find { 2018sub find {
1767 my ($path, $origin) = @_; 2019 my ($path, $origin) = @_;
1768 2020
1769 $path = normalise $path, $origin && $origin->path; 2021 $path = normalise $path, $origin && $origin->path;
1770 2022
2023 cf::lock_wait "map_data:$path";#d#remove
1771 cf::lock_wait "map_find:$path"; 2024 cf::lock_wait "map_find:$path";
1772 2025
1773 $cf::MAP{$path} || do { 2026 $cf::MAP{$path} || do {
1774 my $guard = cf::lock_acquire "map_find:$path"; 2027 my $guard1 = cf::lock_acquire "map_find:$path";
2028 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2029
1775 my $map = new_from_path cf::map $path 2030 my $map = new_from_path cf::map $path
1776 or return; 2031 or return;
1777 2032
1778 $map->{last_save} = $cf::RUNTIME; 2033 $map->{last_save} = $cf::RUNTIME;
1779 2034
1781 or return; 2036 or return;
1782 2037
1783 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2038 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1784 # doing this can freeze the server in a sync job, obviously 2039 # doing this can freeze the server in a sync job, obviously
1785 #$cf::WAIT_FOR_TICK->wait; 2040 #$cf::WAIT_FOR_TICK->wait;
2041 undef $guard1;
2042 undef $guard2;
1786 $map->reset; 2043 $map->reset;
1787 undef $guard;
1788 return find $path; 2044 return find $path;
1789 } 2045 }
1790 2046
1791 $cf::MAP{$path} = $map 2047 $cf::MAP{$path} = $map
1792 } 2048 }
1801 local $self->{deny_reset} = 1; # loading can take a long time 2057 local $self->{deny_reset} = 1; # loading can take a long time
1802 2058
1803 my $path = $self->{path}; 2059 my $path = $self->{path};
1804 2060
1805 { 2061 {
1806 my $guard = cf::lock_acquire "map_load:$path"; 2062 my $guard = cf::lock_acquire "map_data:$path";
1807 2063
2064 return unless $self->valid;
1808 return if $self->in_memory != cf::MAP_SWAPPED; 2065 return unless $self->in_memory == cf::MAP_SWAPPED;
1809 2066
1810 $self->in_memory (cf::MAP_LOADING); 2067 $self->in_memory (cf::MAP_LOADING);
1811 2068
1812 $self->alloc; 2069 $self->alloc;
1813 2070
1814 $self->pre_load; 2071 $self->pre_load;
1815 Coro::cede; 2072 cf::cede_to_tick;
1816 2073
2074 my $f = new_from_file cf::object::thawer $self->{load_path};
2075 $f->skip_block;
1817 $self->_load_objects ($self->{load_path}, 1) 2076 $self->_load_objects ($f)
1818 or return; 2077 or return;
1819 2078
1820 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2079 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1821 if delete $self->{load_original}; 2080 if delete $self->{load_original};
1822 2081
1823 if (my $uniq = $self->uniq_path) { 2082 if (my $uniq = $self->uniq_path) {
1824 utf8::encode $uniq; 2083 utf8::encode $uniq;
1825 if (aio_open $uniq, O_RDONLY, 0) { 2084 unless (aio_stat $uniq) {
2085 if (my $f = new_from_file cf::object::thawer $uniq) {
1826 $self->clear_unique_items; 2086 $self->clear_unique_items;
1827 $self->_load_objects ($uniq, 0); 2087 $self->_load_objects ($f);
2088 $f->resolve_delayed_derefs;
2089 }
1828 } 2090 }
1829 } 2091 }
1830 2092
1831 Coro::cede; 2093 $f->resolve_delayed_derefs;
2094
2095 cf::cede_to_tick;
1832 # now do the right thing for maps 2096 # now do the right thing for maps
1833 $self->link_multipart_objects; 2097 $self->link_multipart_objects;
1834 $self->difficulty ($self->estimate_difficulty) 2098 $self->difficulty ($self->estimate_difficulty)
1835 unless $self->difficulty; 2099 unless $self->difficulty;
1836 Coro::cede; 2100 cf::cede_to_tick;
1837 2101
1838 unless ($self->{deny_activate}) { 2102 unless ($self->{deny_activate}) {
1839 $self->decay_objects; 2103 $self->decay_objects;
1840 $self->fix_auto_apply; 2104 $self->fix_auto_apply;
1841 $self->update_buttons; 2105 $self->update_buttons;
1842 Coro::cede; 2106 cf::cede_to_tick;
1843 $self->set_darkness_map; 2107 $self->set_darkness_map;
1844 Coro::cede; 2108 cf::cede_to_tick;
1845 $self->activate; 2109 $self->activate;
1846 } 2110 }
2111
2112 $self->{last_save} = $cf::RUNTIME;
2113 $self->last_access ($cf::RUNTIME);
1847 2114
1848 $self->in_memory (cf::MAP_IN_MEMORY); 2115 $self->in_memory (cf::MAP_IN_MEMORY);
1849 } 2116 }
1850 2117
1851 $self->post_load; 2118 $self->post_load;
1862 2129
1863 $self 2130 $self
1864} 2131}
1865 2132
1866# find and load all maps in the 3x3 area around a map 2133# find and load all maps in the 3x3 area around a map
1867sub load_diag { 2134sub load_neighbours {
1868 my ($map) = @_; 2135 my ($map) = @_;
1869 2136
1870 my @diag; # diagonal neighbours 2137 my @neigh; # diagonal neighbours
1871 2138
1872 for (0 .. 3) { 2139 for (0 .. 3) {
1873 my $neigh = $map->tile_path ($_) 2140 my $neigh = $map->tile_path ($_)
1874 or next; 2141 or next;
1875 $neigh = find $neigh, $map 2142 $neigh = find $neigh, $map
1876 or next; 2143 or next;
1877 $neigh->load; 2144 $neigh->load;
1878 2145
2146 push @neigh,
1879 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2147 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1880 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2148 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1881 } 2149 }
1882 2150
1883 for (@diag) { 2151 for (grep defined $_->[0], @neigh) {
2152 my ($path, $origin) = @$_;
1884 my $neigh = find @$_ 2153 my $neigh = find $path, $origin
1885 or next; 2154 or next;
1886 $neigh->load; 2155 $neigh->load;
1887 } 2156 }
1888} 2157}
1889 2158
1894} 2163}
1895 2164
1896sub do_load_sync { 2165sub do_load_sync {
1897 my ($map) = @_; 2166 my ($map) = @_;
1898 2167
2168 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2169 if $Coro::current == $Coro::main;
2170
1899 cf::sync_job { $map->load }; 2171 cf::sync_job { $map->load };
1900} 2172}
1901 2173
1902our %MAP_PREFETCH; 2174our %MAP_PREFETCH;
1903our $MAP_PREFETCHER = undef; 2175our $MAP_PREFETCHER = undef;
1904 2176
1905sub find_async { 2177sub find_async {
1906 my ($path, $origin) = @_; 2178 my ($path, $origin, $load) = @_;
1907 2179
1908 $path = normalise $path, $origin && $origin->{path}; 2180 $path = normalise $path, $origin && $origin->{path};
1909 2181
1910 if (my $map = $cf::MAP{$path}) { 2182 if (my $map = $cf::MAP{$path}) {
1911 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2183 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1912 } 2184 }
1913 2185
1914 undef $MAP_PREFETCH{$path}; 2186 $MAP_PREFETCH{$path} |= $load;
2187
1915 $MAP_PREFETCHER ||= cf::async { 2188 $MAP_PREFETCHER ||= cf::async {
2189 $Coro::current->{desc} = "map prefetcher";
2190
1916 while (%MAP_PREFETCH) { 2191 while (%MAP_PREFETCH) {
1917 for my $path (keys %MAP_PREFETCH) { 2192 while (my ($k, $v) = each %MAP_PREFETCH) {
1918 if (my $map = find $path) { 2193 if (my $map = find $k) {
1919 $map->load; 2194 $map->load if $v;
1920 } 2195 }
1921 2196
1922 delete $MAP_PREFETCH{$path}; 2197 delete $MAP_PREFETCH{$k};
1923 } 2198 }
1924 } 2199 }
1925 undef $MAP_PREFETCHER; 2200 undef $MAP_PREFETCHER;
1926 }; 2201 };
1927 $MAP_PREFETCHER->prio (6); 2202 $MAP_PREFETCHER->prio (6);
1930} 2205}
1931 2206
1932sub save { 2207sub save {
1933 my ($self) = @_; 2208 my ($self) = @_;
1934 2209
1935 my $lock = cf::lock_acquire "map_data:" . $self->path; 2210 my $lock = cf::lock_acquire "map_data:$self->{path}";
1936 2211
1937 $self->{last_save} = $cf::RUNTIME; 2212 $self->{last_save} = $cf::RUNTIME;
1938 2213
1939 return unless $self->dirty; 2214 return unless $self->dirty;
1940 2215
1946 return if $self->{deny_save}; 2221 return if $self->{deny_save};
1947 2222
1948 local $self->{last_access} = $self->last_access;#d# 2223 local $self->{last_access} = $self->last_access;#d#
1949 2224
1950 cf::async { 2225 cf::async {
2226 $Coro::current->{desc} = "map player save";
1951 $_->contr->save for $self->players; 2227 $_->contr->save for $self->players;
1952 }; 2228 };
1953 2229
1954 if ($uniq) { 2230 if ($uniq) {
1955 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2231 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1963 my ($self) = @_; 2239 my ($self) = @_;
1964 2240
1965 # save first because save cedes 2241 # save first because save cedes
1966 $self->save; 2242 $self->save;
1967 2243
1968 my $lock = cf::lock_acquire "map_data:" . $self->path; 2244 my $lock = cf::lock_acquire "map_data:$self->{path}";
1969 2245
1970 return if $self->players; 2246 return if $self->players;
1971 return if $self->in_memory != cf::MAP_IN_MEMORY; 2247 return if $self->in_memory != cf::MAP_IN_MEMORY;
1972 return if $self->{deny_save}; 2248 return if $self->{deny_save};
1973 2249
2250 $self->in_memory (cf::MAP_SWAPPED);
2251
2252 $self->deactivate;
2253 $_->clear_links_to ($self) for values %cf::MAP;
1974 $self->clear; 2254 $self->clear;
1975 $self->in_memory (cf::MAP_SWAPPED);
1976} 2255}
1977 2256
1978sub reset_at { 2257sub reset_at {
1979 my ($self) = @_; 2258 my ($self) = @_;
1980 2259
2012 if $uniq; 2291 if $uniq;
2013 } 2292 }
2014 2293
2015 delete $cf::MAP{$self->path}; 2294 delete $cf::MAP{$self->path};
2016 2295
2296 $self->deactivate;
2297 $_->clear_links_to ($self) for values %cf::MAP;
2017 $self->clear; 2298 $self->clear;
2018
2019 $_->clear_links_to ($self) for values %cf::MAP;
2020 2299
2021 $self->unlink_save; 2300 $self->unlink_save;
2022 $self->destroy; 2301 $self->destroy;
2023} 2302}
2024 2303
2025my $nuke_counter = "aaaa"; 2304my $nuke_counter = "aaaa";
2026 2305
2027sub nuke { 2306sub nuke {
2028 my ($self) = @_; 2307 my ($self) = @_;
2029 2308
2309 {
2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311
2030 delete $cf::MAP{$self->path}; 2312 delete $cf::MAP{$self->path};
2031 2313
2032 $self->unlink_save; 2314 $self->unlink_save;
2033 2315
2034 bless $self, "cf::map"; 2316 bless $self, "cf::map";
2035 delete $self->{deny_reset}; 2317 delete $self->{deny_reset};
2036 $self->{deny_save} = 1; 2318 $self->{deny_save} = 1;
2037 $self->reset_timeout (1); 2319 $self->reset_timeout (1);
2038 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2320 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2039 2321
2040 $cf::MAP{$self->path} = $self; 2322 $cf::MAP{$self->path} = $self;
2323 }
2041 2324
2042 $self->reset; # polite request, might not happen 2325 $self->reset; # polite request, might not happen
2043} 2326}
2044 2327
2045=item $maps = cf::map::tmp_maps 2328=item $maps = cf::map::tmp_maps
2094 : () 2377 : ()
2095 } @{ aio_readdir $UNIQUEDIR or [] } 2378 } @{ aio_readdir $UNIQUEDIR or [] }
2096 ] 2379 ]
2097} 2380}
2098 2381
2099package cf;
2100
2101=back 2382=back
2102 2383
2103=head3 cf::object 2384=head3 cf::object
2104 2385
2105=cut 2386=cut
2119 map { $_, inv_recursive_ $_->inv } @_ 2400 map { $_, inv_recursive_ $_->inv } @_
2120} 2401}
2121 2402
2122sub inv_recursive { 2403sub inv_recursive {
2123 inv_recursive_ inv $_[0] 2404 inv_recursive_ inv $_[0]
2405}
2406
2407=item $ref = $ob->ref
2408
2409creates and returns a persistent reference to an objetc that can be stored as a string.
2410
2411=item $ob = cf::object::deref ($refstring)
2412
2413returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2414even if the object actually exists. May block.
2415
2416=cut
2417
2418sub deref {
2419 my ($ref) = @_;
2420
2421 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2422 my ($uuid, $name) = ($1, $2);
2423 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2424 or return;
2425 $pl->ob->uuid eq $uuid
2426 or return;
2427
2428 $pl->ob
2429 } else {
2430 warn "$ref: cannot resolve object reference\n";
2431 undef
2432 }
2124} 2433}
2125 2434
2126package cf; 2435package cf;
2127 2436
2128=back 2437=back
2152 2461
2153 } else { 2462 } else {
2154 my $pl = $self->contr; 2463 my $pl = $self->contr;
2155 2464
2156 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2465 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2157 my $diag = $pl->{npc_dialog}; 2466 my $dialog = $pl->{npc_dialog};
2158 $diag->{pl}->ext_reply ( 2467 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2159 $diag->{id},
2160 msgtype => "reply",
2161 msg => $diag->{pl}->expand_cfpod ($msg),
2162 add_topics => []
2163 );
2164 2468
2165 } else { 2469 } else {
2166 $msg = $npc->name . " says: $msg" if $npc; 2470 $msg = $npc->name . " says: $msg" if $npc;
2167 $self->message ($msg, $flags); 2471 $self->message ($msg, $flags);
2168 } 2472 }
2169 } 2473 }
2474}
2475
2476=item $object->send_msg ($channel, $msg, $color, [extra...])
2477
2478=cut
2479
2480sub cf::object::send_msg {
2481 my $pl = shift->contr
2482 or return;
2483 $pl->send_msg (@_);
2170} 2484}
2171 2485
2172=item $player_object->may ("access") 2486=item $player_object->may ("access")
2173 2487
2174Returns wether the given player is authorized to access resource "access" 2488Returns wether the given player is authorized to access resource "access"
2253 # use -1 or undef as default coordinates, not 0, 0 2567 # use -1 or undef as default coordinates, not 0, 0
2254 ($x, $y) = ($map->enter_x, $map->enter_y) 2568 ($x, $y) = ($map->enter_x, $map->enter_y)
2255 if $x <=0 && $y <= 0; 2569 if $x <=0 && $y <= 0;
2256 2570
2257 $map->load; 2571 $map->load;
2258 $map->load_diag; 2572 $map->load_neighbours;
2259 2573
2260 return unless $self->contr->active; 2574 return unless $self->contr->active;
2261 $self->activate_recursive; 2575 $self->activate_recursive;
2262 2576
2263 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2577 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2283 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2597 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2284 2598
2285 $self->enter_link; 2599 $self->enter_link;
2286 2600
2287 (async { 2601 (async {
2602 $Coro::current->{desc} = "player::goto $path $x $y";
2603
2604 # *tag paths override both path and x|y
2605 if ($path =~ /^\*(.*)$/) {
2606 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2607 my $ob = $obs[rand @obs];
2608
2609 # see if we actually can go there
2610 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2611 $ob = $obs[rand @obs];
2612 } else {
2613 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2614 }
2615 # else put us there anyways for now #d#
2616
2617 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2618 } else {
2619 ($path, $x, $y) = (undef, undef, undef);
2620 }
2621 }
2622
2288 my $map = eval { 2623 my $map = eval {
2289 my $map = cf::map::find $path; 2624 my $map = defined $path ? cf::map::find $path : undef;
2290 2625
2291 if ($map) { 2626 if ($map) {
2292 $map = $map->customise_for ($self); 2627 $map = $map->customise_for ($self);
2293 $map = $check->($map) if $check && $map; 2628 $map = $check->($map) if $check && $map;
2294 } else { 2629 } else {
2295 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2630 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2296 } 2631 }
2297 2632
2298 $map 2633 $map
2299 }; 2634 };
2300 2635
2353 $rmp->{origin_y} = $exit->y; 2688 $rmp->{origin_y} = $exit->y;
2354 } 2689 }
2355 2690
2356 $rmp->{random_seed} ||= $exit->random_seed; 2691 $rmp->{random_seed} ||= $exit->random_seed;
2357 2692
2358 my $data = cf::to_json $rmp; 2693 my $data = cf::encode_json $rmp;
2359 my $md5 = Digest::MD5::md5_hex $data; 2694 my $md5 = Digest::MD5::md5_hex $data;
2360 my $meta = "$RANDOMDIR/$md5.meta"; 2695 my $meta = "$RANDOMDIR/$md5.meta";
2361 2696
2362 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2697 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2363 aio_write $fh, 0, (length $data), $data, 0; 2698 aio_write $fh, 0, (length $data), $data, 0;
2390 # if exit is damned, update players death & WoR home-position 2725 # if exit is damned, update players death & WoR home-position
2391 $self->contr->savebed ($slaying, $hp, $sp) 2726 $self->contr->savebed ($slaying, $hp, $sp)
2392 if $exit->flag (FLAG_DAMNED); 2727 if $exit->flag (FLAG_DAMNED);
2393 2728
2394 (async { 2729 (async {
2730 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2731
2395 $self->deactivate_recursive; # just to be sure 2732 $self->deactivate_recursive; # just to be sure
2396 unless (eval { 2733 unless (eval {
2397 $self->goto ($slaying, $hp, $sp); 2734 $self->goto ($slaying, $hp, $sp);
2398 2735
2399 1; 2736 1;
2434the message, with C<log> being the default. If C<$color> is negative, suppress 2771the message, with C<log> being the default. If C<$color> is negative, suppress
2435the message unless the client supports the msg packet. 2772the message unless the client supports the msg packet.
2436 2773
2437=cut 2774=cut
2438 2775
2776# non-persistent channels (usually the info channel)
2777our %CHANNEL = (
2778 "c/identify" => {
2779 id => "infobox",
2780 title => "Identify",
2781 reply => undef,
2782 tooltip => "Items recently identified",
2783 },
2784 "c/examine" => {
2785 id => "infobox",
2786 title => "Examine",
2787 reply => undef,
2788 tooltip => "Signs and other items you examined",
2789 },
2790 "c/book" => {
2791 id => "infobox",
2792 title => "Book",
2793 reply => undef,
2794 tooltip => "The contents of a note or book",
2795 },
2796 "c/lookat" => {
2797 id => "infobox",
2798 title => "Look",
2799 reply => undef,
2800 tooltip => "What you saw there",
2801 },
2802 "c/who" => {
2803 id => "infobox",
2804 title => "Players",
2805 reply => undef,
2806 tooltip => "Shows players who are currently online",
2807 },
2808 "c/body" => {
2809 id => "infobox",
2810 title => "Body Parts",
2811 reply => undef,
2812 tooltip => "Shows which body parts you posess and are available",
2813 },
2814 "c/uptime" => {
2815 id => "infobox",
2816 title => "Uptime",
2817 reply => undef,
2818 tooltip => "How long the server has been running since last restart",
2819 },
2820 "c/mapinfo" => {
2821 id => "infobox",
2822 title => "Map Info",
2823 reply => undef,
2824 tooltip => "Information related to the maps",
2825 },
2826);
2827
2439sub cf::client::send_msg { 2828sub cf::client::send_msg {
2440 my ($self, $channel, $msg, $color, @extra) = @_; 2829 my ($self, $channel, $msg, $color, @extra) = @_;
2441 2830
2442 $msg = $self->pl->expand_cfpod ($msg); 2831 $msg = $self->pl->expand_cfpod ($msg);
2443 2832
2444 return unless @extra || length $msg;
2445
2446 $color &= ~cf::NDI_UNIQUE; # just in case... 2833 $color &= cf::NDI_CLIENT_MASK; # just in case...
2447 2834
2835 # check predefined channels, for the benefit of C
2836 if ($CHANNEL{$channel}) {
2837 $channel = $CHANNEL{$channel};
2838
2839 $self->ext_msg (channel_info => $channel)
2840 if $self->can_msg;
2841
2842 $channel = $channel->{id};
2843
2448 if (ref $channel) { 2844 } elsif (ref $channel) {
2449 # send meta info to client, if not yet sent 2845 # send meta info to client, if not yet sent
2450 unless (exists $self->{channel}{$channel->{id}}) { 2846 unless (exists $self->{channel}{$channel->{id}}) {
2451 $self->{channel}{$channel->{id}} = $channel; 2847 $self->{channel}{$channel->{id}} = $channel;
2452 $self->ext_event (channel_info => %$channel); 2848 $self->ext_msg (channel_info => $channel)
2849 if $self->can_msg;
2453 } 2850 }
2454 2851
2455 $channel = $channel->{id}; 2852 $channel = $channel->{id};
2456 } 2853 }
2457 2854
2855 return unless @extra || length $msg;
2856
2458 if ($self->can_msg) { 2857 if ($self->can_msg) {
2858 # default colour, mask it out
2859 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2860 if $color & cf::NDI_DEF;
2861
2459 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2862 $self->send_packet ("msg " . $self->{json_coder}->encode (
2863 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2460 } else { 2864 } else {
2461 # replace some tags by gcfclient-compatible ones
2462 for ($msg) {
2463 1 while
2464 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2465 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2466 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2467 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2468 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2469 }
2470
2471 if ($color >= 0) { 2865 if ($color >= 0) {
2866 # replace some tags by gcfclient-compatible ones
2867 for ($msg) {
2868 1 while
2869 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2870 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2871 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2872 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2873 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2874 }
2875
2876 $color &= cf::NDI_COLOR_MASK;
2877
2878 utf8::encode $msg;
2879
2472 if (0 && $msg =~ /\[/) { 2880 if (0 && $msg =~ /\[/) {
2881 # COMMAND/INFO
2473 $self->send_packet ("drawextinfo $color 4 0 $msg") 2882 $self->send_packet ("drawextinfo $color 10 8 $msg")
2474 } else { 2883 } else {
2475 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2884 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2476 $self->send_packet ("drawinfo $color $msg") 2885 $self->send_packet ("drawinfo $color $msg")
2477 } 2886 }
2478 } 2887 }
2479 } 2888 }
2480} 2889}
2481 2890
2482=item $client->ext_event ($type, %msg) 2891=item $client->ext_msg ($type, @msg)
2483 2892
2484Sends an ext event to the client. 2893Sends an ext event to the client.
2485 2894
2486=cut 2895=cut
2487 2896
2488sub cf::client::ext_event($$%) { 2897sub cf::client::ext_msg($$@) {
2489 my ($self, $type, %msg) = @_; 2898 my ($self, $type, @msg) = @_;
2490 2899
2491 return unless $self->extcmd; 2900 if ($self->extcmd == 2) {
2492 2901 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2902 } elsif ($self->extcmd == 1) { # TODO: remove
2493 $msg{msgtype} = "event_$type"; 2903 push @msg, msgtype => "event_$type";
2494 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2904 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2905 }
2906}
2907
2908=item $client->ext_reply ($msgid, @msg)
2909
2910Sends an ext reply to the client.
2911
2912=cut
2913
2914sub cf::client::ext_reply($$@) {
2915 my ($self, $id, @msg) = @_;
2916
2917 if ($self->extcmd == 2) {
2918 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2919 } elsif ($self->extcmd == 1) {
2920 #TODO: version 1, remove
2921 unshift @msg, msgtype => "reply", msgid => $id;
2922 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2923 }
2495} 2924}
2496 2925
2497=item $success = $client->query ($flags, "text", \&cb) 2926=item $success = $client->query ($flags, "text", \&cb)
2498 2927
2499Queues a query to the client, calling the given callback with 2928Queues a query to the client, calling the given callback with
2554 my ($ns, $buf) = @_; 2983 my ($ns, $buf) = @_;
2555 2984
2556 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2985 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2557 2986
2558 if (ref $msg) { 2987 if (ref $msg) {
2988 my ($type, $reply, @payload) =
2989 "ARRAY" eq ref $msg
2990 ? @$msg
2991 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2992
2993 my @reply;
2994
2559 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2995 if (my $cb = $EXTICMD{$type}) {
2560 if (my %reply = $cb->($ns, $msg)) { 2996 @reply = $cb->($ns, @payload);
2561 $reply{msgid} = $msg->{msgid};
2562 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2563 }
2564 } 2997 }
2998
2999 $ns->ext_reply ($reply, @reply)
3000 if $reply;
3001
2565 } else { 3002 } else {
2566 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3003 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2567 } 3004 }
2568 3005
2569 cf::override; 3006 cf::override;
2616our $safe = new Safe "safe"; 3053our $safe = new Safe "safe";
2617our $safe_hole = new Safe::Hole; 3054our $safe_hole = new Safe::Hole;
2618 3055
2619$SIG{FPE} = 'IGNORE'; 3056$SIG{FPE} = 'IGNORE';
2620 3057
2621$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3058$safe->permit_only (Opcode::opset qw(
3059 :base_core :base_mem :base_orig :base_math
3060 grepstart grepwhile mapstart mapwhile
3061 sort time
3062));
2622 3063
2623# here we export the classes and methods available to script code 3064# here we export the classes and methods available to script code
2624 3065
2625=pod 3066=pod
2626 3067
2627The following functions and methods are available within a safe environment: 3068The following functions and methods are available within a safe environment:
2628 3069
2629 cf::object 3070 cf::object
2630 contr pay_amount pay_player map x y force_find force_add 3071 contr pay_amount pay_player map x y force_find force_add destroy
2631 insert remove 3072 insert remove name archname title slaying race decrease_ob_nr
2632 3073
2633 cf::object::player 3074 cf::object::player
2634 player 3075 player
2635 3076
2636 cf::player 3077 cf::player
2641 3082
2642=cut 3083=cut
2643 3084
2644for ( 3085for (
2645 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3086 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3087 insert remove inv name archname title slaying race
2646 insert remove)], 3088 decrease_ob_nr destroy)],
2647 ["cf::object::player" => qw(player)], 3089 ["cf::object::player" => qw(player)],
2648 ["cf::player" => qw(peaceful)], 3090 ["cf::player" => qw(peaceful)],
2649 ["cf::map" => qw(trigger)], 3091 ["cf::map" => qw(trigger)],
2650) { 3092) {
2651 no strict 'refs'; 3093 no strict 'refs';
2727# the server's init and main functions 3169# the server's init and main functions
2728 3170
2729sub load_facedata($) { 3171sub load_facedata($) {
2730 my ($path) = @_; 3172 my ($path) = @_;
2731 3173
3174 # HACK to clear player env face cache, we need some signal framework
3175 # for this (global event?)
3176 %ext::player_env::MUSIC_FACE_CACHE = ();
3177
3178 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3179
2732 warn "loading facedata from $path\n"; 3180 warn "loading facedata from $path\n";
2733 3181
2734 my $facedata; 3182 my $facedata;
2735 0 < aio_load $path, $facedata 3183 0 < aio_load $path, $facedata
2736 or die "$path: $!"; 3184 or die "$path: $!";
2738 $facedata = Coro::Storable::thaw $facedata; 3186 $facedata = Coro::Storable::thaw $facedata;
2739 3187
2740 $facedata->{version} == 2 3188 $facedata->{version} == 2
2741 or cf::cleanup "$path: version mismatch, cannot proceed."; 3189 or cf::cleanup "$path: version mismatch, cannot proceed.";
2742 3190
3191 # patch in the exptable
3192 $facedata->{resource}{"res/exp_table"} = {
3193 type => FT_RSRC,
3194 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3195 };
3196 cf::cede_to_tick;
3197
2743 { 3198 {
2744 my $faces = $facedata->{faceinfo}; 3199 my $faces = $facedata->{faceinfo};
2745 3200
2746 while (my ($face, $info) = each %$faces) { 3201 while (my ($face, $info) = each %$faces) {
2747 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3202 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3203
2748 cf::face::set_visibility $idx, $info->{visibility}; 3204 cf::face::set_visibility $idx, $info->{visibility};
2749 cf::face::set_magicmap $idx, $info->{magicmap}; 3205 cf::face::set_magicmap $idx, $info->{magicmap};
2750 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3206 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2751 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3207 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2752 3208
2753 cf::cede_to_tick; 3209 cf::cede_to_tick;
2754 } 3210 }
2755 3211
2756 while (my ($face, $info) = each %$faces) { 3212 while (my ($face, $info) = each %$faces) {
2757 next unless $info->{smooth}; 3213 next unless $info->{smooth};
3214
2758 my $idx = cf::face::find $face 3215 my $idx = cf::face::find $face
2759 or next; 3216 or next;
3217
2760 if (my $smooth = cf::face::find $info->{smooth}) { 3218 if (my $smooth = cf::face::find $info->{smooth}) {
2761 cf::face::set_smooth $idx, $smooth; 3219 cf::face::set_smooth $idx, $smooth;
2762 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3220 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2763 } else { 3221 } else {
2764 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3222 warn "smooth face '$info->{smooth}' not found for face '$face'";
2781 3239
2782 { 3240 {
2783 # TODO: for gcfclient pleasure, we should give resources 3241 # TODO: for gcfclient pleasure, we should give resources
2784 # that gcfclient doesn't grok a >10000 face index. 3242 # that gcfclient doesn't grok a >10000 face index.
2785 my $res = $facedata->{resource}; 3243 my $res = $facedata->{resource};
2786 my $enc = JSON::XS->new->utf8->canonical;
2787 3244
2788 while (my ($name, $info) = each %$res) { 3245 while (my ($name, $info) = each %$res) {
2789 my $meta = $enc->encode ({ 3246 if (defined $info->{type}) {
2790 name => $name,
2791 type => $info->{type},
2792 copyright => $info->{copyright}, #TODO#
2793 });
2794
2795 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3247 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3248 my $data;
2796 3249
2797 if ($name =~ /\.jpg$/) { 3250 if ($info->{type} & 1) {
2798 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3251 # prepend meta info
2799 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3252
3253 my $meta = $enc->encode ({
3254 name => $name,
3255 %{ $info->{meta} || {} },
3256 });
3257
3258 $data = pack "(w/a*)*", $meta, $info->{data};
3259 } else {
3260 $data = $info->{data};
3261 }
3262
3263 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3264 cf::face::set_type $idx, $info->{type};
2800 } else { 3265 } else {
2801 my $data = pack "(w/a*)*", $meta, $info->{data}; 3266 $RESOURCE{$name} = $info;
2802 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2803
2804 cf::face::set_type $idx, 1;
2805 cf::face::set_data $idx, 0, $data, $chk;
2806 } 3267 }
2807 3268
2808 cf::cede_to_tick; 3269 cf::cede_to_tick;
2809 } 3270 }
2810 } 3271 }
2811 3272
3273 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3274
2812 1 3275 1
2813} 3276}
2814 3277
3278cf::global->attach (on_resource_update => sub {
3279 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3280 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3281
3282 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3283 my $sound = $soundconf->{compat}[$_]
3284 or next;
3285
3286 my $face = cf::face::find "sound/$sound->[1]";
3287 cf::sound::set $sound->[0] => $face;
3288 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3289 }
3290
3291 while (my ($k, $v) = each %{$soundconf->{event}}) {
3292 my $face = cf::face::find "sound/$v";
3293 cf::sound::set $k => $face;
3294 }
3295 }
3296});
3297
3298register_exticmd fx_want => sub {
3299 my ($ns, $want) = @_;
3300
3301 while (my ($k, $v) = each %$want) {
3302 $ns->fx_want ($k, $v);
3303 }
3304};
3305
2815sub reload_regions { 3306sub reload_regions {
3307 # HACK to clear player env face cache, we need some signal framework
3308 # for this (global event?)
3309 %ext::player_env::MUSIC_FACE_CACHE = ();
3310
2816 load_resource_file "$MAPDIR/regions" 3311 load_resource_file "$MAPDIR/regions"
2817 or die "unable to load regions file\n"; 3312 or die "unable to load regions file\n";
2818 3313
2819 for (cf::region::list) { 3314 for (cf::region::list) {
2820 $_->{match} = qr/$_->{match}/ 3315 $_->{match} = qr/$_->{match}/
2856 3351
2857sub init { 3352sub init {
2858 reload_resources; 3353 reload_resources;
2859} 3354}
2860 3355
2861sub cfg_load { 3356sub reload_config {
2862 open my $fh, "<:utf8", "$CONFDIR/config" 3357 open my $fh, "<:utf8", "$CONFDIR/config"
2863 or return; 3358 or return;
2864 3359
2865 local $/; 3360 local $/;
2866 *CFG = YAML::Syck::Load <$fh>; 3361 *CFG = YAML::Load <$fh>;
2867 3362
2868 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3363 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2869 3364
2870 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3365 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2871 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3366 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2882sub main { 3377sub main {
2883 # we must not ever block the main coroutine 3378 # we must not ever block the main coroutine
2884 local $Coro::idle = sub { 3379 local $Coro::idle = sub {
2885 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3380 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2886 (async { 3381 (async {
2887 Event::one_event; 3382 $Coro::current->{desc} = "IDLE BUG HANDLER";
3383 EV::loop EV::LOOP_ONESHOT;
2888 })->prio (Coro::PRIO_MAX); 3384 })->prio (Coro::PRIO_MAX);
2889 }; 3385 };
2890 3386
2891 cfg_load; 3387 reload_config;
2892 db_init; 3388 db_init;
2893 load_extensions; 3389 load_extensions;
2894 3390
2895 $TICK_WATCHER->start; 3391 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3392 evthread_start IO::AIO::poll_fileno;
2896 Event::loop; 3393 EV::loop;
2897} 3394}
2898 3395
2899############################################################################# 3396#############################################################################
2900# initialisation and cleanup 3397# initialisation and cleanup
2901 3398
2902# install some emergency cleanup handlers 3399# install some emergency cleanup handlers
2903BEGIN { 3400BEGIN {
3401 our %SIGWATCHER = ();
2904 for my $signal (qw(INT HUP TERM)) { 3402 for my $signal (qw(INT HUP TERM)) {
2905 Event->signal ( 3403 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2906 reentrant => 0,
2907 data => WF_AUTOCANCEL,
2908 signal => $signal,
2909 prio => 0,
2910 cb => sub {
2911 cf::cleanup "SIG$signal"; 3404 cf::cleanup "SIG$signal";
2912 },
2913 ); 3405 };
2914 } 3406 }
2915} 3407}
2916 3408
2917sub write_runtime { 3409sub write_runtime {
2918 my $runtime = "$LOCALDIR/runtime"; 3410 my $runtime = "$LOCALDIR/runtime";
2963 # and maps saved/destroyed asynchronously. 3455 # and maps saved/destroyed asynchronously.
2964 warn "begin emergency player save\n"; 3456 warn "begin emergency player save\n";
2965 for my $login (keys %cf::PLAYER) { 3457 for my $login (keys %cf::PLAYER) {
2966 my $pl = $cf::PLAYER{$login} or next; 3458 my $pl = $cf::PLAYER{$login} or next;
2967 $pl->valid or next; 3459 $pl->valid or next;
3460 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2968 $pl->save; 3461 $pl->save;
2969 } 3462 }
2970 warn "end emergency player save\n"; 3463 warn "end emergency player save\n";
2971 3464
2972 warn "begin emergency map save\n"; 3465 warn "begin emergency map save\n";
3011 warn "syncing database to disk"; 3504 warn "syncing database to disk";
3012 BDB::db_env_txn_checkpoint $DB_ENV; 3505 BDB::db_env_txn_checkpoint $DB_ENV;
3013 3506
3014 # if anything goes wrong in here, we should simply crash as we already saved 3507 # if anything goes wrong in here, we should simply crash as we already saved
3015 3508
3016 warn "cancelling all WF_AUTOCANCEL watchers";
3017 for (Event::all_watchers) {
3018 $_->cancel if $_->data & WF_AUTOCANCEL;
3019 }
3020
3021 warn "flushing outstanding aio requests"; 3509 warn "flushing outstanding aio requests";
3022 for (;;) { 3510 for (;;) {
3023 BDB::flush; 3511 BDB::flush;
3024 IO::AIO::flush; 3512 IO::AIO::flush;
3025 Coro::cede; 3513 Coro::cede_notself;
3026 last unless IO::AIO::nreqs || BDB::nreqs; 3514 last unless IO::AIO::nreqs || BDB::nreqs;
3027 warn "iterate..."; 3515 warn "iterate...";
3028 } 3516 }
3029 3517
3030 ++$RELOAD; 3518 ++$RELOAD;
3089 warn "reloading cf.pm"; 3577 warn "reloading cf.pm";
3090 require cf; 3578 require cf;
3091 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3579 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3092 3580
3093 warn "loading config and database again"; 3581 warn "loading config and database again";
3094 cf::cfg_load; 3582 cf::reload_config;
3095 3583
3096 warn "loading extensions"; 3584 warn "loading extensions";
3097 cf::load_extensions; 3585 cf::load_extensions;
3098 3586
3099 warn "reattaching attachments to objects/players"; 3587 warn "reattaching attachments to objects/players";
3106 warn "leaving sync_job"; 3594 warn "leaving sync_job";
3107 3595
3108 1 3596 1
3109 } or do { 3597 } or do {
3110 warn $@; 3598 warn $@;
3111 warn "error while reloading, exiting."; 3599 cf::cleanup "error while reloading, exiting.";
3112 exit 1;
3113 }; 3600 };
3114 3601
3115 warn "reloaded"; 3602 warn "reloaded";
3116}; 3603};
3117 3604
3119 3606
3120sub reload_perl() { 3607sub reload_perl() {
3121 # doing reload synchronously and two reloads happen back-to-back, 3608 # doing reload synchronously and two reloads happen back-to-back,
3122 # coro crashes during coro_state_free->destroy here. 3609 # coro crashes during coro_state_free->destroy here.
3123 3610
3124 $RELOAD_WATCHER ||= Event->timer ( 3611 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3125 reentrant => 0,
3126 after => 0,
3127 data => WF_AUTOCANCEL,
3128 cb => sub {
3129 do_reload_perl; 3612 do_reload_perl;
3130 undef $RELOAD_WATCHER; 3613 undef $RELOAD_WATCHER;
3131 },
3132 ); 3614 };
3133} 3615}
3134 3616
3135register_command "reload" => sub { 3617register_command "reload" => sub {
3136 my ($who, $arg) = @_; 3618 my ($who, $arg) = @_;
3137 3619
3138 if ($who->flag (FLAG_WIZ)) { 3620 if ($who->flag (FLAG_WIZ)) {
3139 $who->message ("reloading server."); 3621 $who->message ("reloading server.");
3622 async {
3623 $Coro::current->{desc} = "perl_reload";
3140 async { reload_perl }; 3624 reload_perl;
3625 };
3141 } 3626 }
3142}; 3627};
3143 3628
3144unshift @INC, $LIBDIR; 3629unshift @INC, $LIBDIR;
3145 3630
3147 3632
3148our @WAIT_FOR_TICK; 3633our @WAIT_FOR_TICK;
3149our @WAIT_FOR_TICK_BEGIN; 3634our @WAIT_FOR_TICK_BEGIN;
3150 3635
3151sub wait_for_tick { 3636sub wait_for_tick {
3152 return unless $TICK_WATCHER->is_active; 3637 return if tick_inhibit;
3153 return if $Coro::current == $Coro::main; 3638 return if $Coro::current == $Coro::main;
3154 3639
3155 my $signal = new Coro::Signal; 3640 my $signal = new Coro::Signal;
3156 push @WAIT_FOR_TICK, $signal; 3641 push @WAIT_FOR_TICK, $signal;
3157 $signal->wait; 3642 $signal->wait;
3158} 3643}
3159 3644
3160sub wait_for_tick_begin { 3645sub wait_for_tick_begin {
3161 return unless $TICK_WATCHER->is_active; 3646 return if tick_inhibit;
3162 return if $Coro::current == $Coro::main; 3647 return if $Coro::current == $Coro::main;
3163 3648
3164 my $signal = new Coro::Signal; 3649 my $signal = new Coro::Signal;
3165 push @WAIT_FOR_TICK_BEGIN, $signal; 3650 push @WAIT_FOR_TICK_BEGIN, $signal;
3166 $signal->wait; 3651 $signal->wait;
3167} 3652}
3168 3653
3169 my $min = 1e6;#d# 3654sub tick {
3170 my $avg = 10;
3171$TICK_WATCHER = Event->timer (
3172 reentrant => 0,
3173 parked => 1,
3174 prio => 0,
3175 at => $NEXT_TICK || $TICK,
3176 data => WF_AUTOCANCEL,
3177 cb => sub {
3178 if ($Coro::current != $Coro::main) { 3655 if ($Coro::current != $Coro::main) {
3179 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3656 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3180 unless ++$bug_warning > 10; 3657 unless ++$bug_warning > 10;
3181 return; 3658 return;
3182 } 3659 }
3183 3660
3184 $NOW = $tick_start = Event::time;
3185
3186 cf::server_tick; # one server iteration 3661 cf::server_tick; # one server iteration
3187 3662
3188 0 && sync_job {#d# 3663 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3189 for(1..10) { 3664 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3190 my $t = Event::time; 3665 Coro::async_pool {
3191 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3666 $Coro::current->{desc} = "runtime saver";
3192 or die; 3667 write_runtime
3193 3668 or warn "ERROR: unable to write runtime file: $!";
3194 $map->width (50);
3195 $map->height (50);
3196 $map->alloc;
3197 $map->_load_objects ("/tmp/x.map", 1);
3198 my $t = Event::time - $t;
3199
3200 #next unless $t < 0.0013;#d#
3201 if ($t < $min) {
3202 $min = $t;
3203 }
3204 $avg = $avg * 0.99 + $t * 0.01;
3205 }
3206 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3207 exit 0;
3208 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3209 }; 3669 };
3670 }
3210 3671
3211 $RUNTIME += $TICK;
3212 $NEXT_TICK += $TICK;
3213
3214 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3215 $NEXT_RUNTIME_WRITE = $NOW + 10;
3216 Coro::async_pool {
3217 write_runtime
3218 or warn "ERROR: unable to write runtime file: $!";
3219 };
3220 }
3221
3222# my $AFTER = Event::time;
3223# warn $AFTER - $NOW;#d#
3224
3225 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3672 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3226 $sig->send; 3673 $sig->send;
3227 } 3674 }
3228 while (my $sig = shift @WAIT_FOR_TICK) { 3675 while (my $sig = shift @WAIT_FOR_TICK) {
3229 $sig->send; 3676 $sig->send;
3230 } 3677 }
3231 3678
3232 $NOW = Event::time; 3679 $LOAD = ($NOW - $TICK_START) / $TICK;
3233
3234 # if we are delayed by four ticks or more, skip them all
3235 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3236
3237 $TICK_WATCHER->at ($NEXT_TICK);
3238 $TICK_WATCHER->start;
3239
3240 $LOAD = ($NOW - $tick_start) / $TICK;
3241 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3680 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3242 3681
3243 _post_tick; 3682 if (0) {
3244 3683 if ($NEXT_TICK) {
3245 3684 my $jitter = $TICK_START - $NEXT_TICK;
3685 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3686 warn "jitter $JITTER\n";#d#
3687 }
3246 }, 3688 }
3247); 3689}
3248 3690
3249{ 3691{
3250 BDB::max_poll_time $TICK * 0.1; 3692 # configure BDB
3251 $BDB_POLL_WATCHER = Event->io ( 3693
3252 reentrant => 0,
3253 fd => BDB::poll_fileno,
3254 poll => 'r',
3255 prio => 0,
3256 data => WF_AUTOCANCEL,
3257 cb => \&BDB::poll_cb,
3258 );
3259 BDB::min_parallel 8; 3694 BDB::min_parallel 8;
3260 3695 BDB::max_poll_reqs $TICK * 0.1;
3261 BDB::set_sync_prepare { 3696 $Coro::BDB::WATCHER->priority (1);
3262 my $status;
3263 my $current = $Coro::current;
3264 (
3265 sub {
3266 $status = $!;
3267 $current->ready; undef $current;
3268 },
3269 sub {
3270 Coro::schedule while defined $current;
3271 $! = $status;
3272 },
3273 )
3274 };
3275 3697
3276 unless ($DB_ENV) { 3698 unless ($DB_ENV) {
3277 $DB_ENV = BDB::db_env_create; 3699 $DB_ENV = BDB::db_env_create;
3700 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3701 | BDB::LOG_AUTOREMOVE, 1);
3702 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3703 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3278 3704
3279 cf::sync_job { 3705 cf::sync_job {
3280 eval { 3706 eval {
3281 BDB::db_env_open 3707 BDB::db_env_open
3282 $DB_ENV, 3708 $DB_ENV,
3284 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3710 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3285 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3711 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3286 0666; 3712 0666;
3287 3713
3288 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3714 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3289
3290 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3291 $DB_ENV->set_lk_detect;
3292 }; 3715 };
3293 3716
3294 cf::cleanup "db_env_open(db): $@" if $@; 3717 cf::cleanup "db_env_open(db): $@" if $@;
3295 }; 3718 };
3296 } 3719 }
3720
3721 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3722 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3723 };
3724 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3725 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3726 };
3727 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3728 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3729 };
3297} 3730}
3298 3731
3299{ 3732{
3733 # configure IO::AIO
3734
3300 IO::AIO::min_parallel 8; 3735 IO::AIO::min_parallel 8;
3301
3302 undef $Coro::AIO::WATCHER;
3303 IO::AIO::max_poll_time $TICK * 0.1; 3736 IO::AIO::max_poll_time $TICK * 0.1;
3304 $AIO_POLL_WATCHER = Event->io ( 3737 $Coro::AIO::WATCHER->priority (1);
3305 reentrant => 0,
3306 data => WF_AUTOCANCEL,
3307 fd => IO::AIO::poll_fileno,
3308 poll => 'r',
3309 prio => 6,
3310 cb => \&IO::AIO::poll_cb,
3311 );
3312} 3738}
3313 3739
3314my $_log_backtrace; 3740my $_log_backtrace;
3315 3741
3316sub _log_backtrace { 3742sub _log_backtrace {
3320 3746
3321 # limit the # of concurrent backtraces 3747 # limit the # of concurrent backtraces
3322 if ($_log_backtrace < 2) { 3748 if ($_log_backtrace < 2) {
3323 ++$_log_backtrace; 3749 ++$_log_backtrace;
3324 async { 3750 async {
3751 $Coro::current->{desc} = "abt $msg";
3752
3325 my @bt = fork_call { 3753 my @bt = fork_call {
3326 @addr = map { sprintf "%x", $_ } @addr; 3754 @addr = map { sprintf "%x", $_ } @addr;
3327 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3755 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3328 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3756 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3329 or die "addr2line: $!"; 3757 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines