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.414 by root, Thu Apr 10 09:10:45 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV 3.2;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
14 35
15use Coro 3.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;
462
463 my @res = eval { $cb->(@args) };
464
465 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
466 close $fh2;
467 };
468
469 warn $@ if $@;
470 _exit 0;
471 }
472} 552}
473 553
474=item $value = cf::db_get $family => $key 554=item $value = cf::db_get $family => $key
475 555
476Returns a single value from the environment database. 556Returns a single value from the environment database.
478=item cf::db_put $family => $key => $value 558=item cf::db_put $family => $key => $value
479 559
480Stores the given C<$value> in the family. It can currently store binary 560Stores 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). 561data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
482 562
563=item $db = cf::db_table "name"
564
565Create and/or open a new database table. The string must not be "db" and must be unique
566within each server.
567
483=cut 568=cut
569
570sub db_table($) {
571 my ($name) = @_;
572 my $db = BDB::db_create $DB_ENV;
573
574 eval {
575 $db->set_flags (BDB::CHKSUM);
576
577 utf8::encode $name;
578 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
579 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
580 cf::cleanup "db_open(db): $!" if $!;
581 };
582 cf::cleanup "db_open(db): $@" if $@;
583
584 $db
585}
484 586
485our $DB; 587our $DB;
486 588
487sub db_init { 589sub db_init {
488 unless ($DB) {
489 $DB = BDB::db_create $DB_ENV;
490
491 cf::sync_job { 590 cf::sync_job {
492 eval { 591 $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 } 592 };
502} 593}
503 594
504sub db_get($$) { 595sub db_get($$) {
505 my $key = "$_[0]/$_[1]"; 596 my $key = "$_[0]/$_[1]";
506 597
556 if (1) { 647 if (1) {
557 $md5 = 648 $md5 =
558 join "\x00", 649 join "\x00",
559 $processversion, 650 $processversion,
560 map { 651 map {
561 Coro::cede; 652 cf::cede_to_tick;
562 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 653 ($src->[$_], Digest::MD5::md5_hex $data[$_])
563 } 0.. $#$src; 654 } 0.. $#$src;
564 655
565 656
566 my $dbmd5 = db_get cache => "$id/md5"; 657 my $dbmd5 = db_get cache => "$id/md5";
610attach callbacks/event handlers (a collection of which is called an "attachment") 701attach callbacks/event handlers (a collection of which is called an "attachment")
611to it. All such attachable objects support the following methods. 702to it. All such attachable objects support the following methods.
612 703
613In the following description, CLASS can be any of C<global>, C<object> 704In 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 705C<player>, C<client> or C<map> (i.e. the attachable objects in
615Crossfire TRT). 706Deliantra).
616 707
617=over 4 708=over 4
618 709
619=item $attachable->attach ($attachment, key => $value...) 710=item $attachable->attach ($attachment, key => $value...)
620 711
902 } 993 }
903 994
904 0 995 0
905} 996}
906 997
907=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 998=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
908 999
909=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1000=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
910 1001
911Generate an object-specific event with the given arguments. 1002Generate an object-specific event with the given arguments.
912 1003
918 1009
919=cut 1010=cut
920 1011
921############################################################################# 1012#############################################################################
922# object support 1013# object support
1014
1015sub _object_equal($$);
1016sub _object_equal($$) {
1017 my ($a, $b) = @_;
1018
1019 return 0 unless (ref $a) eq (ref $b);
1020
1021 if ("HASH" eq ref $a) {
1022 my @ka = keys %$a;
1023 my @kb = keys %$b;
1024
1025 return 0 if @ka != @kb;
1026
1027 for (0 .. $#ka) {
1028 return 0 unless $ka[$_] eq $kb[$_];
1029 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1030 }
1031
1032 } elsif ("ARRAY" eq ref $a) {
1033
1034 return 0 if @$a != @$b;
1035
1036 for (0 .. $#$a) {
1037 return 0 unless _object_equal $a->[$_], $b->[$_];
1038 }
1039
1040 } elsif ($a ne $b) {
1041 return 0;
1042 }
1043
1044 1
1045}
1046
1047our $SLOW_MERGES;#d#
1048sub _can_merge {
1049 my ($ob1, $ob2) = @_;
1050
1051 ++$SLOW_MERGES;#d#
1052
1053 # we do the slow way here
1054 return _object_equal $ob1, $ob2
1055}
923 1056
924sub reattach { 1057sub reattach {
925 # basically do the same as instantiate, without calling instantiate 1058 # basically do the same as instantiate, without calling instantiate
926 my ($obj) = @_; 1059 my ($obj) = @_;
927 1060
948cf::attachable->attach ( 1081cf::attachable->attach (
949 prio => -1000000, 1082 prio => -1000000,
950 on_instantiate => sub { 1083 on_instantiate => sub {
951 my ($obj, $data) = @_; 1084 my ($obj, $data) = @_;
952 1085
953 $data = from_json $data; 1086 $data = decode_json $data;
954 1087
955 for (@$data) { 1088 for (@$data) {
956 my ($name, $args) = @$_; 1089 my ($name, $args) = @$_;
957 1090
958 $obj->attach ($name, %{$args || {} }); 1091 $obj->attach ($name, %{$args || {} });
974sub object_freezer_save { 1107sub object_freezer_save {
975 my ($filename, $rdata, $objs) = @_; 1108 my ($filename, $rdata, $objs) = @_;
976 1109
977 sync_job { 1110 sync_job {
978 if (length $$rdata) { 1111 if (length $$rdata) {
1112 utf8::decode (my $decname = $filename);
979 warn sprintf "saving %s (%d,%d)\n", 1113 warn sprintf "saving %s (%d,%d)\n",
980 $filename, length $$rdata, scalar @$objs; 1114 $decname, length $$rdata, scalar @$objs;
981 1115
982 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1116 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
983 chmod SAVE_MODE, $fh; 1117 chmod SAVE_MODE, $fh;
984 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1118 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
985 aio_fsync $fh if $cf::USE_FSYNC; 1119 aio_fsync $fh if $cf::USE_FSYNC;
986 close $fh; 1120 close $fh;
987 1121
988 if (@$objs) { 1122 if (@$objs) {
989 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1123 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
990 chmod SAVE_MODE, $fh; 1124 chmod SAVE_MODE, $fh;
991 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1125 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
992 aio_write $fh, 0, (length $data), $data, 0; 1126 aio_write $fh, 0, (length $data), $data, 0;
993 aio_fsync $fh if $cf::USE_FSYNC; 1127 aio_fsync $fh if $cf::USE_FSYNC;
994 close $fh; 1128 close $fh;
995 aio_rename "$filename.pst~", "$filename.pst"; 1129 aio_rename "$filename.pst~", "$filename.pst";
996 } 1130 }
1004 } 1138 }
1005 } else { 1139 } else {
1006 aio_unlink $filename; 1140 aio_unlink $filename;
1007 aio_unlink "$filename.pst"; 1141 aio_unlink "$filename.pst";
1008 } 1142 }
1009 } 1143 };
1010} 1144}
1011 1145
1012sub object_freezer_as_string { 1146sub object_freezer_as_string {
1013 my ($rdata, $objs) = @_; 1147 my ($rdata, $objs) = @_;
1014 1148
1026 or return; 1160 or return;
1027 1161
1028 unless (aio_stat "$filename.pst") { 1162 unless (aio_stat "$filename.pst") {
1029 (aio_load "$filename.pst", $av) >= 0 1163 (aio_load "$filename.pst", $av) >= 0
1030 or return; 1164 or return;
1165
1031 $av = eval { (Storable::thaw $av)->{objs} }; 1166 my $st = eval { Coro::Storable::thaw $av };
1167 $av = $st->{objs};
1032 } 1168 }
1033 1169
1170 utf8::decode (my $decname = $filename);
1034 warn sprintf "loading %s (%d)\n", 1171 warn sprintf "loading %s (%d,%d)\n",
1035 $filename, length $data, scalar @{$av || []}; 1172 $decname, length $data, scalar @{$av || []};
1173
1036 return ($data, $av); 1174 ($data, $av)
1037} 1175}
1038 1176
1039=head2 COMMAND CALLBACKS 1177=head2 COMMAND CALLBACKS
1040 1178
1041=over 4 1179=over 4
1114 my ($pl, $buf) = @_; 1252 my ($pl, $buf) = @_;
1115 1253
1116 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1254 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1117 1255
1118 if (ref $msg) { 1256 if (ref $msg) {
1257 my ($type, $reply, @payload) =
1258 "ARRAY" eq ref $msg
1259 ? @$msg
1260 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1261
1262 my @reply;
1263
1119 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1264 if (my $cb = $EXTCMD{$type}) {
1120 if (my %reply = $cb->($pl, $msg)) { 1265 @reply = $cb->($pl, @payload);
1121 $pl->ext_reply ($msg->{msgid}, %reply);
1122 }
1123 } 1266 }
1267
1268 $pl->ext_reply ($reply, @reply)
1269 if $reply;
1270
1124 } else { 1271 } else {
1125 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1272 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1126 } 1273 }
1127 1274
1128 cf::override; 1275 cf::override;
1181 my $msg = $@ ? "$v->{path}: $@\n" 1328 my $msg = $@ ? "$v->{path}: $@\n"
1182 : "$v->{base}: extension inactive.\n"; 1329 : "$v->{base}: extension inactive.\n";
1183 1330
1184 if (exists $v->{meta}{mandatory}) { 1331 if (exists $v->{meta}{mandatory}) {
1185 warn $msg; 1332 warn $msg;
1186 warn "mandatory extension failed to load, exiting.\n"; 1333 cf::cleanup "mandatory extension failed to load, exiting.";
1187 exit 1;
1188 } 1334 }
1189 1335
1190 warn $msg; 1336 warn $msg;
1191 } 1337 }
1192 1338
1217use Coro::AIO; 1363use Coro::AIO;
1218 1364
1219=head3 cf::player 1365=head3 cf::player
1220 1366
1221=over 4 1367=over 4
1368
1369=item cf::player::num_playing
1370
1371Returns the official number of playing players, as per the Crossfire metaserver rules.
1372
1373=cut
1374
1375sub num_playing {
1376 scalar grep
1377 $_->ob->map
1378 && !$_->hidden
1379 && !$_->ob->flag (cf::FLAG_WIZ),
1380 cf::player::list
1381}
1222 1382
1223=item cf::player::find $login 1383=item cf::player::find $login
1224 1384
1225Returns the given player object, loading it if necessary (might block). 1385Returns the given player object, loading it if necessary (might block).
1226 1386
1262 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1422 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1263 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1423 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1264 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1424 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1265 aio_unlink +(playerdir $login) . "/$login.pl"; 1425 aio_unlink +(playerdir $login) . "/$login.pl";
1266 1426
1267 my $pl = load_pl path $login 1427 my $f = new_from_file cf::object::thawer path $login
1268 or return; 1428 or return;
1429
1430 my $pl = cf::player::load_pl $f
1431 or return;
1432 local $cf::PLAYER_LOADING{$login} = $pl;
1433 $f->resolve_delayed_derefs;
1269 $cf::PLAYER{$login} = $pl 1434 $cf::PLAYER{$login} = $pl
1270 } 1435 }
1271 } 1436 }
1272} 1437}
1273 1438
1283 1448
1284 aio_mkdir playerdir $pl, 0770; 1449 aio_mkdir playerdir $pl, 0770;
1285 $pl->{last_save} = $cf::RUNTIME; 1450 $pl->{last_save} = $cf::RUNTIME;
1286 1451
1287 $pl->save_pl ($path); 1452 $pl->save_pl ($path);
1288 Coro::cede; 1453 cf::cede_to_tick;
1289} 1454}
1290 1455
1291sub new($) { 1456sub new($) {
1292 my ($login) = @_; 1457 my ($login) = @_;
1293 1458
1297 $self->{deny_save} = 1; 1462 $self->{deny_save} = 1;
1298 1463
1299 $cf::PLAYER{$login} = $self; 1464 $cf::PLAYER{$login} = $self;
1300 1465
1301 $self 1466 $self
1467}
1468
1469=item $player->send_msg ($channel, $msg, $color, [extra...])
1470
1471=cut
1472
1473sub send_msg {
1474 my $ns = shift->ns
1475 or return;
1476 $ns->send_msg (@_);
1302} 1477}
1303 1478
1304=item $pl->quit_character 1479=item $pl->quit_character
1305 1480
1306Nukes the player without looking back. If logged in, the connection will 1481Nukes the player without looking back. If logged in, the connection will
1361 or return []; 1536 or return [];
1362 1537
1363 my @logins; 1538 my @logins;
1364 1539
1365 for my $login (@$dirs) { 1540 for my $login (@$dirs) {
1541 my $path = path $login;
1542
1543 # a .pst is a dead give-away for a valid player
1544 unless (-e "$path.pst") {
1366 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1545 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1367 aio_read $fh, 0, 512, my $buf, 0 or next; 1546 aio_read $fh, 0, 512, my $buf, 0 or next;
1368 $buf !~ /^password -------------$/m or next; # official not-valid tag 1547 $buf !~ /^password -------------$/m or next; # official not-valid tag
1548 }
1369 1549
1370 utf8::decode $login; 1550 utf8::decode $login;
1371 push @logins, $login; 1551 push @logins, $login;
1372 } 1552 }
1373 1553
1406 1586
1407Expand crossfire pod fragments into protocol xml. 1587Expand crossfire pod fragments into protocol xml.
1408 1588
1409=cut 1589=cut
1410 1590
1591use re 'eval';
1592
1593my $group;
1594my $interior; $interior = qr{
1595 # match a pod interior sequence sans C<< >>
1596 (?:
1597 \ (.*?)\ (?{ $group = $^N })
1598 | < (??{$interior}) >
1599 )
1600}x;
1601
1411sub expand_cfpod { 1602sub expand_cfpod {
1412 ((my $self), (local $_)) = @_; 1603 my ($self, $pod) = @_;
1413 1604
1414 # escape & and < 1605 my $xml;
1415 s/&/&amp;/g;
1416 s/(?<![BIUGH])</&lt;/g;
1417 1606
1418 # this is buggy, it needs to properly take care of nested <'s 1607 while () {
1608 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1609 $group = $1;
1419 1610
1420 1 while 1611 $group =~ s/&/&amp;/g;
1421 # replace B<>, I<>, U<> etc. 1612 $group =~ s/</&lt;/g;
1422 s/B<([^\>]*)>/<b>$1<\/b>/ 1613
1423 || s/I<([^\>]*)>/<i>$1<\/i>/ 1614 $xml .= $group;
1424 || s/U<([^\>]*)>/<u>$1<\/u>/ 1615 } elsif ($pod =~ m%\G
1425 # replace G<male|female> tags 1616 ([BCGHITU])
1426 || s{G<([^>|]*)\|([^>]*)>}{ 1617 <
1427 $self->gender ? $2 : $1 1618 (?:
1428 }ge 1619 ([^<>]*) (?{ $group = $^N })
1429 # replace H<hint text> 1620 | < $interior >
1430 || s{H<([^\>]*)>} 1621 )
1622 >
1623 %gcsx
1431 { 1624 ) {
1625 my ($code, $data) = ($1, $group);
1626
1627 if ($code eq "B") {
1628 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1629 } elsif ($code eq "I") {
1630 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1631 } elsif ($code eq "U") {
1632 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1633 } elsif ($code eq "C") {
1634 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1635 } elsif ($code eq "T") {
1636 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1637 } elsif ($code eq "G") {
1638 my ($male, $female) = split /\|/, $data;
1639 $data = $self->gender ? $female : $male;
1640 $xml .= expand_cfpod ($self, $data);
1641 } elsif ($code eq "H") {
1432 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1642 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1433 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1643 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1434 "") 1644 "")
1435 [$self->{hintmode}] 1645 [$self->{hintmode}];
1646 } else {
1647 $xml .= "error processing '$code($data)' directive";
1436 }ge; 1648 }
1649 } else {
1650 if ($pod =~ /\G(.+)/) {
1651 warn "parse error while expanding $pod (at $1)";
1652 }
1653 last;
1654 }
1655 }
1437 1656
1657 for ($xml) {
1438 # create single paragraphs (very hackish) 1658 # create single paragraphs (very hackish)
1439 s/(?<=\S)\n(?=\w)/ /g; 1659 s/(?<=\S)\n(?=\w)/ /g;
1440 1660
1441 # compress some whitespace 1661 # compress some whitespace
1442 s/\s+\n/\n/g; # ws line-ends 1662 s/\s+\n/\n/g; # ws line-ends
1443 s/\n\n+/\n/g; # double lines 1663 s/\n\n+/\n/g; # double lines
1444 s/^\n+//; # beginning lines 1664 s/^\n+//; # beginning lines
1445 s/\n+$//; # ending lines 1665 s/\n+$//; # ending lines
1666 }
1446 1667
1447 $_ 1668 $xml
1448} 1669}
1670
1671no re 'eval';
1449 1672
1450sub hintmode { 1673sub hintmode {
1451 $_[0]{hintmode} = $_[1] if @_ > 1; 1674 $_[0]{hintmode} = $_[1] if @_ > 1;
1452 $_[0]{hintmode} 1675 $_[0]{hintmode}
1453} 1676}
1454 1677
1455=item $player->ext_reply ($msgid, %msg) 1678=item $player->ext_reply ($msgid, @msg)
1456 1679
1457Sends an ext reply to the player. 1680Sends an ext reply to the player.
1458 1681
1459=cut 1682=cut
1460 1683
1461sub ext_reply($$%) { 1684sub ext_reply($$@) {
1462 my ($self, $id, %msg) = @_; 1685 my ($self, $id, @msg) = @_;
1463 1686
1464 $msg{msgid} = $id; 1687 $self->ns->ext_reply ($id, @msg)
1465 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1466} 1688}
1467 1689
1468=item $player->ext_event ($type, %msg) 1690=item $player->ext_msg ($type, @msg)
1469 1691
1470Sends an ext event to the client. 1692Sends an ext event to the client.
1471 1693
1472=cut 1694=cut
1473 1695
1474sub ext_event($$%) { 1696sub ext_msg($$@) {
1475 my ($self, $type, %msg) = @_; 1697 my ($self, $type, @msg) = @_;
1476 1698
1477 $self->ns->ext_event ($type, %msg); 1699 $self->ns->ext_msg ($type, @msg);
1478} 1700}
1479 1701
1480=head3 cf::region 1702=head3 cf::region
1481 1703
1482=over 4 1704=over 4
1698 1920
1699sub load_header_from($) { 1921sub load_header_from($) {
1700 my ($self, $path) = @_; 1922 my ($self, $path) = @_;
1701 1923
1702 utf8::encode $path; 1924 utf8::encode $path;
1703 #aio_open $path, O_RDONLY, 0 1925 my $f = new_from_file cf::object::thawer $path
1704 # or return;
1705
1706 $self->_load_header ($path)
1707 or return; 1926 or return;
1927
1928 $self->_load_header ($f)
1929 or return;
1930
1931 local $MAP_LOADING{$self->{path}} = $self;
1932 $f->resolve_delayed_derefs;
1708 1933
1709 $self->{load_path} = $path; 1934 $self->{load_path} = $path;
1710 1935
1711 1 1936 1
1712} 1937}
1766sub find { 1991sub find {
1767 my ($path, $origin) = @_; 1992 my ($path, $origin) = @_;
1768 1993
1769 $path = normalise $path, $origin && $origin->path; 1994 $path = normalise $path, $origin && $origin->path;
1770 1995
1996 cf::lock_wait "map_data:$path";#d#remove
1771 cf::lock_wait "map_find:$path"; 1997 cf::lock_wait "map_find:$path";
1772 1998
1773 $cf::MAP{$path} || do { 1999 $cf::MAP{$path} || do {
1774 my $guard = cf::lock_acquire "map_find:$path"; 2000 my $guard1 = cf::lock_acquire "map_find:$path";
2001 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2002
1775 my $map = new_from_path cf::map $path 2003 my $map = new_from_path cf::map $path
1776 or return; 2004 or return;
1777 2005
1778 $map->{last_save} = $cf::RUNTIME; 2006 $map->{last_save} = $cf::RUNTIME;
1779 2007
1781 or return; 2009 or return;
1782 2010
1783 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2011 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1784 # doing this can freeze the server in a sync job, obviously 2012 # doing this can freeze the server in a sync job, obviously
1785 #$cf::WAIT_FOR_TICK->wait; 2013 #$cf::WAIT_FOR_TICK->wait;
2014 undef $guard1;
2015 undef $guard2;
1786 $map->reset; 2016 $map->reset;
1787 undef $guard;
1788 return find $path; 2017 return find $path;
1789 } 2018 }
1790 2019
1791 $cf::MAP{$path} = $map 2020 $cf::MAP{$path} = $map
1792 } 2021 }
1801 local $self->{deny_reset} = 1; # loading can take a long time 2030 local $self->{deny_reset} = 1; # loading can take a long time
1802 2031
1803 my $path = $self->{path}; 2032 my $path = $self->{path};
1804 2033
1805 { 2034 {
1806 my $guard = cf::lock_acquire "map_load:$path"; 2035 my $guard = cf::lock_acquire "map_data:$path";
1807 2036
2037 return unless $self->valid;
1808 return if $self->in_memory != cf::MAP_SWAPPED; 2038 return unless $self->in_memory == cf::MAP_SWAPPED;
1809 2039
1810 $self->in_memory (cf::MAP_LOADING); 2040 $self->in_memory (cf::MAP_LOADING);
1811 2041
1812 $self->alloc; 2042 $self->alloc;
1813 2043
1814 $self->pre_load; 2044 $self->pre_load;
1815 Coro::cede; 2045 cf::cede_to_tick;
1816 2046
2047 my $f = new_from_file cf::object::thawer $self->{load_path};
2048 $f->skip_block;
1817 $self->_load_objects ($self->{load_path}, 1) 2049 $self->_load_objects ($f)
1818 or return; 2050 or return;
1819 2051
1820 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2052 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1821 if delete $self->{load_original}; 2053 if delete $self->{load_original};
1822 2054
1823 if (my $uniq = $self->uniq_path) { 2055 if (my $uniq = $self->uniq_path) {
1824 utf8::encode $uniq; 2056 utf8::encode $uniq;
1825 if (aio_open $uniq, O_RDONLY, 0) { 2057 unless (aio_stat $uniq) {
2058 if (my $f = new_from_file cf::object::thawer $uniq) {
1826 $self->clear_unique_items; 2059 $self->clear_unique_items;
1827 $self->_load_objects ($uniq, 0); 2060 $self->_load_objects ($f);
2061 $f->resolve_delayed_derefs;
2062 }
1828 } 2063 }
1829 } 2064 }
1830 2065
1831 Coro::cede; 2066 $f->resolve_delayed_derefs;
2067
2068 cf::cede_to_tick;
1832 # now do the right thing for maps 2069 # now do the right thing for maps
1833 $self->link_multipart_objects; 2070 $self->link_multipart_objects;
1834 $self->difficulty ($self->estimate_difficulty) 2071 $self->difficulty ($self->estimate_difficulty)
1835 unless $self->difficulty; 2072 unless $self->difficulty;
1836 Coro::cede; 2073 cf::cede_to_tick;
1837 2074
1838 unless ($self->{deny_activate}) { 2075 unless ($self->{deny_activate}) {
1839 $self->decay_objects; 2076 $self->decay_objects;
1840 $self->fix_auto_apply; 2077 $self->fix_auto_apply;
1841 $self->update_buttons; 2078 $self->update_buttons;
1842 Coro::cede; 2079 cf::cede_to_tick;
1843 $self->set_darkness_map; 2080 $self->set_darkness_map;
1844 Coro::cede; 2081 cf::cede_to_tick;
1845 $self->activate; 2082 $self->activate;
1846 } 2083 }
2084
2085 $self->{last_save} = $cf::RUNTIME;
2086 $self->last_access ($cf::RUNTIME);
1847 2087
1848 $self->in_memory (cf::MAP_IN_MEMORY); 2088 $self->in_memory (cf::MAP_IN_MEMORY);
1849 } 2089 }
1850 2090
1851 $self->post_load; 2091 $self->post_load;
1862 2102
1863 $self 2103 $self
1864} 2104}
1865 2105
1866# find and load all maps in the 3x3 area around a map 2106# find and load all maps in the 3x3 area around a map
1867sub load_diag { 2107sub load_neighbours {
1868 my ($map) = @_; 2108 my ($map) = @_;
1869 2109
1870 my @diag; # diagonal neighbours 2110 my @neigh; # diagonal neighbours
1871 2111
1872 for (0 .. 3) { 2112 for (0 .. 3) {
1873 my $neigh = $map->tile_path ($_) 2113 my $neigh = $map->tile_path ($_)
1874 or next; 2114 or next;
1875 $neigh = find $neigh, $map 2115 $neigh = find $neigh, $map
1876 or next; 2116 or next;
1877 $neigh->load; 2117 $neigh->load;
1878 2118
2119 push @neigh,
1879 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2120 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1880 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2121 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1881 } 2122 }
1882 2123
1883 for (@diag) { 2124 for (grep defined $_->[0], @neigh) {
2125 my ($path, $origin) = @$_;
1884 my $neigh = find @$_ 2126 my $neigh = find $path, $origin
1885 or next; 2127 or next;
1886 $neigh->load; 2128 $neigh->load;
1887 } 2129 }
1888} 2130}
1889 2131
1894} 2136}
1895 2137
1896sub do_load_sync { 2138sub do_load_sync {
1897 my ($map) = @_; 2139 my ($map) = @_;
1898 2140
2141 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2142 if $Coro::current == $Coro::main;
2143
1899 cf::sync_job { $map->load }; 2144 cf::sync_job { $map->load };
1900} 2145}
1901 2146
1902our %MAP_PREFETCH; 2147our %MAP_PREFETCH;
1903our $MAP_PREFETCHER = undef; 2148our $MAP_PREFETCHER = undef;
1904 2149
1905sub find_async { 2150sub find_async {
1906 my ($path, $origin) = @_; 2151 my ($path, $origin, $load) = @_;
1907 2152
1908 $path = normalise $path, $origin && $origin->{path}; 2153 $path = normalise $path, $origin && $origin->{path};
1909 2154
1910 if (my $map = $cf::MAP{$path}) { 2155 if (my $map = $cf::MAP{$path}) {
1911 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2156 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1912 } 2157 }
1913 2158
1914 undef $MAP_PREFETCH{$path}; 2159 $MAP_PREFETCH{$path} |= $load;
2160
1915 $MAP_PREFETCHER ||= cf::async { 2161 $MAP_PREFETCHER ||= cf::async {
2162 $Coro::current->{desc} = "map prefetcher";
2163
1916 while (%MAP_PREFETCH) { 2164 while (%MAP_PREFETCH) {
1917 for my $path (keys %MAP_PREFETCH) { 2165 while (my ($k, $v) = each %MAP_PREFETCH) {
1918 if (my $map = find $path) { 2166 if (my $map = find $k) {
1919 $map->load; 2167 $map->load if $v;
1920 } 2168 }
1921 2169
1922 delete $MAP_PREFETCH{$path}; 2170 delete $MAP_PREFETCH{$k};
1923 } 2171 }
1924 } 2172 }
1925 undef $MAP_PREFETCHER; 2173 undef $MAP_PREFETCHER;
1926 }; 2174 };
1927 $MAP_PREFETCHER->prio (6); 2175 $MAP_PREFETCHER->prio (6);
1930} 2178}
1931 2179
1932sub save { 2180sub save {
1933 my ($self) = @_; 2181 my ($self) = @_;
1934 2182
1935 my $lock = cf::lock_acquire "map_data:" . $self->path; 2183 my $lock = cf::lock_acquire "map_data:$self->{path}";
1936 2184
1937 $self->{last_save} = $cf::RUNTIME; 2185 $self->{last_save} = $cf::RUNTIME;
1938 2186
1939 return unless $self->dirty; 2187 return unless $self->dirty;
1940 2188
1946 return if $self->{deny_save}; 2194 return if $self->{deny_save};
1947 2195
1948 local $self->{last_access} = $self->last_access;#d# 2196 local $self->{last_access} = $self->last_access;#d#
1949 2197
1950 cf::async { 2198 cf::async {
2199 $Coro::current->{desc} = "map player save";
1951 $_->contr->save for $self->players; 2200 $_->contr->save for $self->players;
1952 }; 2201 };
1953 2202
1954 if ($uniq) { 2203 if ($uniq) {
1955 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1963 my ($self) = @_; 2212 my ($self) = @_;
1964 2213
1965 # save first because save cedes 2214 # save first because save cedes
1966 $self->save; 2215 $self->save;
1967 2216
1968 my $lock = cf::lock_acquire "map_data:" . $self->path; 2217 my $lock = cf::lock_acquire "map_data:$self->{path}";
1969 2218
1970 return if $self->players; 2219 return if $self->players;
1971 return if $self->in_memory != cf::MAP_IN_MEMORY; 2220 return if $self->in_memory != cf::MAP_IN_MEMORY;
1972 return if $self->{deny_save}; 2221 return if $self->{deny_save};
1973 2222
2223 $self->in_memory (cf::MAP_SWAPPED);
2224
2225 $self->deactivate;
2226 $_->clear_links_to ($self) for values %cf::MAP;
1974 $self->clear; 2227 $self->clear;
1975 $self->in_memory (cf::MAP_SWAPPED);
1976} 2228}
1977 2229
1978sub reset_at { 2230sub reset_at {
1979 my ($self) = @_; 2231 my ($self) = @_;
1980 2232
2012 if $uniq; 2264 if $uniq;
2013 } 2265 }
2014 2266
2015 delete $cf::MAP{$self->path}; 2267 delete $cf::MAP{$self->path};
2016 2268
2269 $self->deactivate;
2270 $_->clear_links_to ($self) for values %cf::MAP;
2017 $self->clear; 2271 $self->clear;
2018
2019 $_->clear_links_to ($self) for values %cf::MAP;
2020 2272
2021 $self->unlink_save; 2273 $self->unlink_save;
2022 $self->destroy; 2274 $self->destroy;
2023} 2275}
2024 2276
2025my $nuke_counter = "aaaa"; 2277my $nuke_counter = "aaaa";
2026 2278
2027sub nuke { 2279sub nuke {
2028 my ($self) = @_; 2280 my ($self) = @_;
2029 2281
2282 {
2283 my $lock = cf::lock_acquire "map_data:$self->{path}";
2284
2030 delete $cf::MAP{$self->path}; 2285 delete $cf::MAP{$self->path};
2031 2286
2032 $self->unlink_save; 2287 $self->unlink_save;
2033 2288
2034 bless $self, "cf::map"; 2289 bless $self, "cf::map";
2035 delete $self->{deny_reset}; 2290 delete $self->{deny_reset};
2036 $self->{deny_save} = 1; 2291 $self->{deny_save} = 1;
2037 $self->reset_timeout (1); 2292 $self->reset_timeout (1);
2038 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2293 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2039 2294
2040 $cf::MAP{$self->path} = $self; 2295 $cf::MAP{$self->path} = $self;
2296 }
2041 2297
2042 $self->reset; # polite request, might not happen 2298 $self->reset; # polite request, might not happen
2043} 2299}
2044 2300
2045=item $maps = cf::map::tmp_maps 2301=item $maps = cf::map::tmp_maps
2121 2377
2122sub inv_recursive { 2378sub inv_recursive {
2123 inv_recursive_ inv $_[0] 2379 inv_recursive_ inv $_[0]
2124} 2380}
2125 2381
2382=item $ref = $ob->ref
2383
2384creates and returns a persistent reference to an objetc that can be stored as a string.
2385
2386=item $ob = cf::object::deref ($refstring)
2387
2388returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2389even if the object actually exists. May block.
2390
2391=cut
2392
2393sub deref {
2394 my ($ref) = @_;
2395
2396 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2397 my ($uuid, $name) = ($1, $2);
2398 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2399 or return;
2400 $pl->ob->uuid eq $uuid
2401 or return;
2402
2403 $pl->ob
2404 } else {
2405 warn "$ref: cannot resolve object reference\n";
2406 undef
2407 }
2408}
2409
2126package cf; 2410package cf;
2127 2411
2128=back 2412=back
2129 2413
2130=head3 cf::object::player 2414=head3 cf::object::player
2152 2436
2153 } else { 2437 } else {
2154 my $pl = $self->contr; 2438 my $pl = $self->contr;
2155 2439
2156 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2440 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2157 my $diag = $pl->{npc_dialog}; 2441 my $dialog = $pl->{npc_dialog};
2158 $diag->{pl}->ext_reply ( 2442 $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 2443
2165 } else { 2444 } else {
2166 $msg = $npc->name . " says: $msg" if $npc; 2445 $msg = $npc->name . " says: $msg" if $npc;
2167 $self->message ($msg, $flags); 2446 $self->message ($msg, $flags);
2168 } 2447 }
2169 } 2448 }
2449}
2450
2451=item $object->send_msg ($channel, $msg, $color, [extra...])
2452
2453=cut
2454
2455sub cf::object::send_msg {
2456 my $pl = shift->contr
2457 or return;
2458 $pl->send_msg (@_);
2170} 2459}
2171 2460
2172=item $player_object->may ("access") 2461=item $player_object->may ("access")
2173 2462
2174Returns wether the given player is authorized to access resource "access" 2463Returns wether the given player is authorized to access resource "access"
2253 # use -1 or undef as default coordinates, not 0, 0 2542 # use -1 or undef as default coordinates, not 0, 0
2254 ($x, $y) = ($map->enter_x, $map->enter_y) 2543 ($x, $y) = ($map->enter_x, $map->enter_y)
2255 if $x <=0 && $y <= 0; 2544 if $x <=0 && $y <= 0;
2256 2545
2257 $map->load; 2546 $map->load;
2258 $map->load_diag; 2547 $map->load_neighbours;
2259 2548
2260 return unless $self->contr->active; 2549 return unless $self->contr->active;
2261 $self->activate_recursive; 2550 $self->activate_recursive;
2262 2551
2263 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2552 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2283 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2572 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2284 2573
2285 $self->enter_link; 2574 $self->enter_link;
2286 2575
2287 (async { 2576 (async {
2577 $Coro::current->{desc} = "player::goto $path $x $y";
2578
2579 # *tag paths override both path and x|y
2580 if ($path =~ /^\*(.*)$/) {
2581 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2582 my $ob = $obs[rand @obs];
2583
2584 # see if we actually can go there
2585 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2586 $ob = $obs[rand @obs];
2587 } else {
2588 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2589 }
2590 # else put us there anyways for now #d#
2591
2592 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2593 } else {
2594 ($path, $x, $y) = (undef, undef, undef);
2595 }
2596 }
2597
2288 my $map = eval { 2598 my $map = eval {
2289 my $map = cf::map::find $path; 2599 my $map = defined $path ? cf::map::find $path : undef;
2290 2600
2291 if ($map) { 2601 if ($map) {
2292 $map = $map->customise_for ($self); 2602 $map = $map->customise_for ($self);
2293 $map = $check->($map) if $check && $map; 2603 $map = $check->($map) if $check && $map;
2294 } else { 2604 } else {
2295 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2605 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2296 } 2606 }
2297 2607
2298 $map 2608 $map
2299 }; 2609 };
2300 2610
2353 $rmp->{origin_y} = $exit->y; 2663 $rmp->{origin_y} = $exit->y;
2354 } 2664 }
2355 2665
2356 $rmp->{random_seed} ||= $exit->random_seed; 2666 $rmp->{random_seed} ||= $exit->random_seed;
2357 2667
2358 my $data = cf::to_json $rmp; 2668 my $data = cf::encode_json $rmp;
2359 my $md5 = Digest::MD5::md5_hex $data; 2669 my $md5 = Digest::MD5::md5_hex $data;
2360 my $meta = "$RANDOMDIR/$md5.meta"; 2670 my $meta = "$RANDOMDIR/$md5.meta";
2361 2671
2362 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2672 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2363 aio_write $fh, 0, (length $data), $data, 0; 2673 aio_write $fh, 0, (length $data), $data, 0;
2390 # if exit is damned, update players death & WoR home-position 2700 # if exit is damned, update players death & WoR home-position
2391 $self->contr->savebed ($slaying, $hp, $sp) 2701 $self->contr->savebed ($slaying, $hp, $sp)
2392 if $exit->flag (FLAG_DAMNED); 2702 if $exit->flag (FLAG_DAMNED);
2393 2703
2394 (async { 2704 (async {
2705 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2706
2395 $self->deactivate_recursive; # just to be sure 2707 $self->deactivate_recursive; # just to be sure
2396 unless (eval { 2708 unless (eval {
2397 $self->goto ($slaying, $hp, $sp); 2709 $self->goto ($slaying, $hp, $sp);
2398 2710
2399 1; 2711 1;
2434the message, with C<log> being the default. If C<$color> is negative, suppress 2746the message, with C<log> being the default. If C<$color> is negative, suppress
2435the message unless the client supports the msg packet. 2747the message unless the client supports the msg packet.
2436 2748
2437=cut 2749=cut
2438 2750
2751# non-persistent channels (usually the info channel)
2752our %CHANNEL = (
2753 "c/identify" => {
2754 id => "infobox",
2755 title => "Identify",
2756 reply => undef,
2757 tooltip => "Items recently identified",
2758 },
2759 "c/examine" => {
2760 id => "infobox",
2761 title => "Examine",
2762 reply => undef,
2763 tooltip => "Signs and other items you examined",
2764 },
2765 "c/book" => {
2766 id => "infobox",
2767 title => "Book",
2768 reply => undef,
2769 tooltip => "The contents of a note or book",
2770 },
2771 "c/lookat" => {
2772 id => "infobox",
2773 title => "Look",
2774 reply => undef,
2775 tooltip => "What you saw there",
2776 },
2777 "c/who" => {
2778 id => "infobox",
2779 title => "Players",
2780 reply => undef,
2781 tooltip => "Shows players who are currently online",
2782 },
2783 "c/body" => {
2784 id => "infobox",
2785 title => "Body Parts",
2786 reply => undef,
2787 tooltip => "Shows which body parts you posess and are available",
2788 },
2789 "c/uptime" => {
2790 id => "infobox",
2791 title => "Uptime",
2792 reply => undef,
2793 tooltip => "How long the server has been running since last restart",
2794 },
2795 "c/mapinfo" => {
2796 id => "infobox",
2797 title => "Map Info",
2798 reply => undef,
2799 tooltip => "Information related to the maps",
2800 },
2801);
2802
2439sub cf::client::send_msg { 2803sub cf::client::send_msg {
2440 my ($self, $channel, $msg, $color, @extra) = @_; 2804 my ($self, $channel, $msg, $color, @extra) = @_;
2441 2805
2442 $msg = $self->pl->expand_cfpod ($msg); 2806 $msg = $self->pl->expand_cfpod ($msg);
2443 2807
2444 return unless @extra || length $msg;
2445
2446 $color &= ~cf::NDI_UNIQUE; # just in case... 2808 $color &= cf::NDI_CLIENT_MASK; # just in case...
2447 2809
2810 # check predefined channels, for the benefit of C
2811 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel};
2813
2814 $self->ext_msg (channel_info => $channel)
2815 if $self->can_msg;
2816
2817 $channel = $channel->{id};
2818
2448 if (ref $channel) { 2819 } elsif (ref $channel) {
2449 # send meta info to client, if not yet sent 2820 # send meta info to client, if not yet sent
2450 unless (exists $self->{channel}{$channel->{id}}) { 2821 unless (exists $self->{channel}{$channel->{id}}) {
2451 $self->{channel}{$channel->{id}} = $channel; 2822 $self->{channel}{$channel->{id}} = $channel;
2452 $self->ext_event (channel_info => %$channel); 2823 $self->ext_msg (channel_info => $channel)
2824 if $self->can_msg;
2453 } 2825 }
2454 2826
2455 $channel = $channel->{id}; 2827 $channel = $channel->{id};
2456 } 2828 }
2457 2829
2830 return unless @extra || length $msg;
2831
2458 if ($self->can_msg) { 2832 if ($self->can_msg) {
2833 # default colour, mask it out
2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2835 if $color & cf::NDI_DEF;
2836
2459 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2837 $self->send_packet ("msg " . $self->{json_coder}->encode (
2838 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2460 } else { 2839 } 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) { 2840 if ($color >= 0) {
2841 # replace some tags by gcfclient-compatible ones
2842 for ($msg) {
2843 1 while
2844 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2845 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2846 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2847 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2848 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2849 }
2850
2851 $color &= cf::NDI_COLOR_MASK;
2852
2853 utf8::encode $msg;
2854
2472 if (0 && $msg =~ /\[/) { 2855 if (0 && $msg =~ /\[/) {
2856 # COMMAND/INFO
2473 $self->send_packet ("drawextinfo $color 4 0 $msg") 2857 $self->send_packet ("drawextinfo $color 10 8 $msg")
2474 } else { 2858 } else {
2475 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2859 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2476 $self->send_packet ("drawinfo $color $msg") 2860 $self->send_packet ("drawinfo $color $msg")
2477 } 2861 }
2478 } 2862 }
2479 } 2863 }
2480} 2864}
2481 2865
2482=item $client->ext_event ($type, %msg) 2866=item $client->ext_msg ($type, @msg)
2483 2867
2484Sends an ext event to the client. 2868Sends an ext event to the client.
2485 2869
2486=cut 2870=cut
2487 2871
2488sub cf::client::ext_event($$%) { 2872sub cf::client::ext_msg($$@) {
2489 my ($self, $type, %msg) = @_; 2873 my ($self, $type, @msg) = @_;
2490 2874
2491 return unless $self->extcmd; 2875 if ($self->extcmd == 2) {
2492 2876 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2877 } elsif ($self->extcmd == 1) { # TODO: remove
2493 $msg{msgtype} = "event_$type"; 2878 push @msg, msgtype => "event_$type";
2494 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2879 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2880 }
2881}
2882
2883=item $client->ext_reply ($msgid, @msg)
2884
2885Sends an ext reply to the client.
2886
2887=cut
2888
2889sub cf::client::ext_reply($$@) {
2890 my ($self, $id, @msg) = @_;
2891
2892 if ($self->extcmd == 2) {
2893 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2894 } elsif ($self->extcmd == 1) {
2895 #TODO: version 1, remove
2896 unshift @msg, msgtype => "reply", msgid => $id;
2897 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2898 }
2495} 2899}
2496 2900
2497=item $success = $client->query ($flags, "text", \&cb) 2901=item $success = $client->query ($flags, "text", \&cb)
2498 2902
2499Queues a query to the client, calling the given callback with 2903Queues a query to the client, calling the given callback with
2554 my ($ns, $buf) = @_; 2958 my ($ns, $buf) = @_;
2555 2959
2556 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2960 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2557 2961
2558 if (ref $msg) { 2962 if (ref $msg) {
2963 my ($type, $reply, @payload) =
2964 "ARRAY" eq ref $msg
2965 ? @$msg
2966 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2967
2968 my @reply;
2969
2559 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2970 if (my $cb = $EXTICMD{$type}) {
2560 if (my %reply = $cb->($ns, $msg)) { 2971 @reply = $cb->($ns, @payload);
2561 $reply{msgid} = $msg->{msgid};
2562 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2563 }
2564 } 2972 }
2973
2974 $ns->ext_reply ($reply, @reply)
2975 if $reply;
2976
2565 } else { 2977 } else {
2566 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2978 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2567 } 2979 }
2568 2980
2569 cf::override; 2981 cf::override;
2616our $safe = new Safe "safe"; 3028our $safe = new Safe "safe";
2617our $safe_hole = new Safe::Hole; 3029our $safe_hole = new Safe::Hole;
2618 3030
2619$SIG{FPE} = 'IGNORE'; 3031$SIG{FPE} = 'IGNORE';
2620 3032
2621$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3033$safe->permit_only (Opcode::opset qw(
3034 :base_core :base_mem :base_orig :base_math
3035 grepstart grepwhile mapstart mapwhile
3036 sort time
3037));
2622 3038
2623# here we export the classes and methods available to script code 3039# here we export the classes and methods available to script code
2624 3040
2625=pod 3041=pod
2626 3042
2627The following functions and methods are available within a safe environment: 3043The following functions and methods are available within a safe environment:
2628 3044
2629 cf::object 3045 cf::object
2630 contr pay_amount pay_player map x y force_find force_add 3046 contr pay_amount pay_player map x y force_find force_add destroy
2631 insert remove 3047 insert remove name archname title slaying race decrease_ob_nr
2632 3048
2633 cf::object::player 3049 cf::object::player
2634 player 3050 player
2635 3051
2636 cf::player 3052 cf::player
2641 3057
2642=cut 3058=cut
2643 3059
2644for ( 3060for (
2645 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3061 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3062 insert remove inv name archname title slaying race
2646 insert remove)], 3063 decrease_ob_nr destroy)],
2647 ["cf::object::player" => qw(player)], 3064 ["cf::object::player" => qw(player)],
2648 ["cf::player" => qw(peaceful)], 3065 ["cf::player" => qw(peaceful)],
2649 ["cf::map" => qw(trigger)], 3066 ["cf::map" => qw(trigger)],
2650) { 3067) {
2651 no strict 'refs'; 3068 no strict 'refs';
2727# the server's init and main functions 3144# the server's init and main functions
2728 3145
2729sub load_facedata($) { 3146sub load_facedata($) {
2730 my ($path) = @_; 3147 my ($path) = @_;
2731 3148
3149 # HACK to clear player env face cache, we need some signal framework
3150 # for this (global event?)
3151 %ext::player_env::MUSIC_FACE_CACHE = ();
3152
3153 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3154
2732 warn "loading facedata from $path\n"; 3155 warn "loading facedata from $path\n";
2733 3156
2734 my $facedata; 3157 my $facedata;
2735 0 < aio_load $path, $facedata 3158 0 < aio_load $path, $facedata
2736 or die "$path: $!"; 3159 or die "$path: $!";
2738 $facedata = Coro::Storable::thaw $facedata; 3161 $facedata = Coro::Storable::thaw $facedata;
2739 3162
2740 $facedata->{version} == 2 3163 $facedata->{version} == 2
2741 or cf::cleanup "$path: version mismatch, cannot proceed."; 3164 or cf::cleanup "$path: version mismatch, cannot proceed.";
2742 3165
3166 # patch in the exptable
3167 $facedata->{resource}{"res/exp_table"} = {
3168 type => FT_RSRC,
3169 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3170 };
3171 cf::cede_to_tick;
3172
2743 { 3173 {
2744 my $faces = $facedata->{faceinfo}; 3174 my $faces = $facedata->{faceinfo};
2745 3175
2746 while (my ($face, $info) = each %$faces) { 3176 while (my ($face, $info) = each %$faces) {
2747 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3177 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3178
2748 cf::face::set_visibility $idx, $info->{visibility}; 3179 cf::face::set_visibility $idx, $info->{visibility};
2749 cf::face::set_magicmap $idx, $info->{magicmap}; 3180 cf::face::set_magicmap $idx, $info->{magicmap};
2750 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3181 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2751 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3182 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2752 3183
2753 cf::cede_to_tick; 3184 cf::cede_to_tick;
2754 } 3185 }
2755 3186
2756 while (my ($face, $info) = each %$faces) { 3187 while (my ($face, $info) = each %$faces) {
2757 next unless $info->{smooth}; 3188 next unless $info->{smooth};
3189
2758 my $idx = cf::face::find $face 3190 my $idx = cf::face::find $face
2759 or next; 3191 or next;
3192
2760 if (my $smooth = cf::face::find $info->{smooth}) { 3193 if (my $smooth = cf::face::find $info->{smooth}) {
2761 cf::face::set_smooth $idx, $smooth; 3194 cf::face::set_smooth $idx, $smooth;
2762 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3195 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2763 } else { 3196 } else {
2764 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3197 warn "smooth face '$info->{smooth}' not found for face '$face'";
2781 3214
2782 { 3215 {
2783 # TODO: for gcfclient pleasure, we should give resources 3216 # TODO: for gcfclient pleasure, we should give resources
2784 # that gcfclient doesn't grok a >10000 face index. 3217 # that gcfclient doesn't grok a >10000 face index.
2785 my $res = $facedata->{resource}; 3218 my $res = $facedata->{resource};
2786 my $enc = JSON::XS->new->utf8->canonical;
2787 3219
2788 while (my ($name, $info) = each %$res) { 3220 while (my ($name, $info) = each %$res) {
2789 my $meta = $enc->encode ({ 3221 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; 3222 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3223 my $data;
2796 3224
2797 if ($name =~ /\.jpg$/) { 3225 if ($info->{type} & 1) {
2798 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3226 # prepend meta info
2799 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3227
3228 my $meta = $enc->encode ({
3229 name => $name,
3230 %{ $info->{meta} || {} },
3231 });
3232
3233 $data = pack "(w/a*)*", $meta, $info->{data};
3234 } else {
3235 $data = $info->{data};
3236 }
3237
3238 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3239 cf::face::set_type $idx, $info->{type};
2800 } else { 3240 } else {
2801 my $data = pack "(w/a*)*", $meta, $info->{data}; 3241 $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 } 3242 }
2807 3243
2808 cf::cede_to_tick; 3244 cf::cede_to_tick;
2809 } 3245 }
2810 } 3246 }
2811 3247
3248 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3249
2812 1 3250 1
2813} 3251}
2814 3252
3253cf::global->attach (on_resource_update => sub {
3254 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3255 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3256
3257 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3258 my $sound = $soundconf->{compat}[$_]
3259 or next;
3260
3261 my $face = cf::face::find "sound/$sound->[1]";
3262 cf::sound::set $sound->[0] => $face;
3263 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3264 }
3265
3266 while (my ($k, $v) = each %{$soundconf->{event}}) {
3267 my $face = cf::face::find "sound/$v";
3268 cf::sound::set $k => $face;
3269 }
3270 }
3271});
3272
3273register_exticmd fx_want => sub {
3274 my ($ns, $want) = @_;
3275
3276 while (my ($k, $v) = each %$want) {
3277 $ns->fx_want ($k, $v);
3278 }
3279};
3280
2815sub reload_regions { 3281sub reload_regions {
3282 # HACK to clear player env face cache, we need some signal framework
3283 # for this (global event?)
3284 %ext::player_env::MUSIC_FACE_CACHE = ();
3285
2816 load_resource_file "$MAPDIR/regions" 3286 load_resource_file "$MAPDIR/regions"
2817 or die "unable to load regions file\n"; 3287 or die "unable to load regions file\n";
2818 3288
2819 for (cf::region::list) { 3289 for (cf::region::list) {
2820 $_->{match} = qr/$_->{match}/ 3290 $_->{match} = qr/$_->{match}/
2856 3326
2857sub init { 3327sub init {
2858 reload_resources; 3328 reload_resources;
2859} 3329}
2860 3330
2861sub cfg_load { 3331sub reload_config {
2862 open my $fh, "<:utf8", "$CONFDIR/config" 3332 open my $fh, "<:utf8", "$CONFDIR/config"
2863 or return; 3333 or return;
2864 3334
2865 local $/; 3335 local $/;
2866 *CFG = YAML::Syck::Load <$fh>; 3336 *CFG = YAML::Load <$fh>;
2867 3337
2868 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3338 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2869 3339
2870 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3340 $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}; 3341 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2882sub main { 3352sub main {
2883 # we must not ever block the main coroutine 3353 # we must not ever block the main coroutine
2884 local $Coro::idle = sub { 3354 local $Coro::idle = sub {
2885 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3355 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2886 (async { 3356 (async {
2887 Event::one_event; 3357 $Coro::current->{desc} = "IDLE BUG HANDLER";
3358 EV::loop EV::LOOP_ONESHOT;
2888 })->prio (Coro::PRIO_MAX); 3359 })->prio (Coro::PRIO_MAX);
2889 }; 3360 };
2890 3361
2891 cfg_load; 3362 reload_config;
2892 db_init; 3363 db_init;
2893 load_extensions; 3364 load_extensions;
2894 3365
2895 $TICK_WATCHER->start; 3366 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3367 evthread_start IO::AIO::poll_fileno;
2896 Event::loop; 3368 EV::loop;
2897} 3369}
2898 3370
2899############################################################################# 3371#############################################################################
2900# initialisation and cleanup 3372# initialisation and cleanup
2901 3373
2902# install some emergency cleanup handlers 3374# install some emergency cleanup handlers
2903BEGIN { 3375BEGIN {
3376 our %SIGWATCHER = ();
2904 for my $signal (qw(INT HUP TERM)) { 3377 for my $signal (qw(INT HUP TERM)) {
2905 Event->signal ( 3378 $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"; 3379 cf::cleanup "SIG$signal";
2912 },
2913 ); 3380 };
2914 } 3381 }
2915} 3382}
2916 3383
2917sub write_runtime { 3384sub write_runtime {
2918 my $runtime = "$LOCALDIR/runtime"; 3385 my $runtime = "$LOCALDIR/runtime";
2963 # and maps saved/destroyed asynchronously. 3430 # and maps saved/destroyed asynchronously.
2964 warn "begin emergency player save\n"; 3431 warn "begin emergency player save\n";
2965 for my $login (keys %cf::PLAYER) { 3432 for my $login (keys %cf::PLAYER) {
2966 my $pl = $cf::PLAYER{$login} or next; 3433 my $pl = $cf::PLAYER{$login} or next;
2967 $pl->valid or next; 3434 $pl->valid or next;
3435 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2968 $pl->save; 3436 $pl->save;
2969 } 3437 }
2970 warn "end emergency player save\n"; 3438 warn "end emergency player save\n";
2971 3439
2972 warn "begin emergency map save\n"; 3440 warn "begin emergency map save\n";
3011 warn "syncing database to disk"; 3479 warn "syncing database to disk";
3012 BDB::db_env_txn_checkpoint $DB_ENV; 3480 BDB::db_env_txn_checkpoint $DB_ENV;
3013 3481
3014 # if anything goes wrong in here, we should simply crash as we already saved 3482 # if anything goes wrong in here, we should simply crash as we already saved
3015 3483
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"; 3484 warn "flushing outstanding aio requests";
3022 for (;;) { 3485 for (;;) {
3023 BDB::flush; 3486 BDB::flush;
3024 IO::AIO::flush; 3487 IO::AIO::flush;
3025 Coro::cede; 3488 Coro::cede_notself;
3026 last unless IO::AIO::nreqs || BDB::nreqs; 3489 last unless IO::AIO::nreqs || BDB::nreqs;
3027 warn "iterate..."; 3490 warn "iterate...";
3028 } 3491 }
3029 3492
3030 ++$RELOAD; 3493 ++$RELOAD;
3089 warn "reloading cf.pm"; 3552 warn "reloading cf.pm";
3090 require cf; 3553 require cf;
3091 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3554 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3092 3555
3093 warn "loading config and database again"; 3556 warn "loading config and database again";
3094 cf::cfg_load; 3557 cf::reload_config;
3095 3558
3096 warn "loading extensions"; 3559 warn "loading extensions";
3097 cf::load_extensions; 3560 cf::load_extensions;
3098 3561
3099 warn "reattaching attachments to objects/players"; 3562 warn "reattaching attachments to objects/players";
3106 warn "leaving sync_job"; 3569 warn "leaving sync_job";
3107 3570
3108 1 3571 1
3109 } or do { 3572 } or do {
3110 warn $@; 3573 warn $@;
3111 warn "error while reloading, exiting."; 3574 cf::cleanup "error while reloading, exiting.";
3112 exit 1;
3113 }; 3575 };
3114 3576
3115 warn "reloaded"; 3577 warn "reloaded";
3116}; 3578};
3117 3579
3119 3581
3120sub reload_perl() { 3582sub reload_perl() {
3121 # doing reload synchronously and two reloads happen back-to-back, 3583 # doing reload synchronously and two reloads happen back-to-back,
3122 # coro crashes during coro_state_free->destroy here. 3584 # coro crashes during coro_state_free->destroy here.
3123 3585
3124 $RELOAD_WATCHER ||= Event->timer ( 3586 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3125 reentrant => 0,
3126 after => 0,
3127 data => WF_AUTOCANCEL,
3128 cb => sub {
3129 do_reload_perl; 3587 do_reload_perl;
3130 undef $RELOAD_WATCHER; 3588 undef $RELOAD_WATCHER;
3131 },
3132 ); 3589 };
3133} 3590}
3134 3591
3135register_command "reload" => sub { 3592register_command "reload" => sub {
3136 my ($who, $arg) = @_; 3593 my ($who, $arg) = @_;
3137 3594
3138 if ($who->flag (FLAG_WIZ)) { 3595 if ($who->flag (FLAG_WIZ)) {
3139 $who->message ("reloading server."); 3596 $who->message ("reloading server.");
3597 async {
3598 $Coro::current->{desc} = "perl_reload";
3140 async { reload_perl }; 3599 reload_perl;
3600 };
3141 } 3601 }
3142}; 3602};
3143 3603
3144unshift @INC, $LIBDIR; 3604unshift @INC, $LIBDIR;
3145 3605
3147 3607
3148our @WAIT_FOR_TICK; 3608our @WAIT_FOR_TICK;
3149our @WAIT_FOR_TICK_BEGIN; 3609our @WAIT_FOR_TICK_BEGIN;
3150 3610
3151sub wait_for_tick { 3611sub wait_for_tick {
3152 return unless $TICK_WATCHER->is_active; 3612 return if tick_inhibit;
3153 return if $Coro::current == $Coro::main; 3613 return if $Coro::current == $Coro::main;
3154 3614
3155 my $signal = new Coro::Signal; 3615 my $signal = new Coro::Signal;
3156 push @WAIT_FOR_TICK, $signal; 3616 push @WAIT_FOR_TICK, $signal;
3157 $signal->wait; 3617 $signal->wait;
3158} 3618}
3159 3619
3160sub wait_for_tick_begin { 3620sub wait_for_tick_begin {
3161 return unless $TICK_WATCHER->is_active; 3621 return if tick_inhibit;
3162 return if $Coro::current == $Coro::main; 3622 return if $Coro::current == $Coro::main;
3163 3623
3164 my $signal = new Coro::Signal; 3624 my $signal = new Coro::Signal;
3165 push @WAIT_FOR_TICK_BEGIN, $signal; 3625 push @WAIT_FOR_TICK_BEGIN, $signal;
3166 $signal->wait; 3626 $signal->wait;
3167} 3627}
3168 3628
3169 my $min = 1e6;#d# 3629sub 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) { 3630 if ($Coro::current != $Coro::main) {
3179 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3631 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3180 unless ++$bug_warning > 10; 3632 unless ++$bug_warning > 10;
3181 return; 3633 return;
3182 } 3634 }
3183 3635
3184 $NOW = $tick_start = Event::time;
3185
3186 cf::server_tick; # one server iteration 3636 cf::server_tick; # one server iteration
3187 3637
3188 0 && sync_job {#d# 3638 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3189 for(1..10) { 3639 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3190 my $t = Event::time; 3640 Coro::async_pool {
3191 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3641 $Coro::current->{desc} = "runtime saver";
3192 or die; 3642 write_runtime
3193 3643 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 }; 3644 };
3645 }
3210 3646
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) { 3647 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3226 $sig->send; 3648 $sig->send;
3227 } 3649 }
3228 while (my $sig = shift @WAIT_FOR_TICK) { 3650 while (my $sig = shift @WAIT_FOR_TICK) {
3229 $sig->send; 3651 $sig->send;
3230 } 3652 }
3231 3653
3232 $NOW = Event::time; 3654 $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; 3655 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3242 3656
3243 _post_tick; 3657 if (0) {
3244 3658 if ($NEXT_TICK) {
3245 3659 my $jitter = $TICK_START - $NEXT_TICK;
3660 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3661 warn "jitter $JITTER\n";#d#
3662 }
3246 }, 3663 }
3247); 3664}
3248 3665
3249{ 3666{
3250 BDB::max_poll_time $TICK * 0.1; 3667 # configure BDB
3251 $BDB_POLL_WATCHER = Event->io ( 3668
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; 3669 BDB::min_parallel 8;
3260 3670 BDB::max_poll_reqs $TICK * 0.1;
3261 BDB::set_sync_prepare { 3671 $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 3672
3276 unless ($DB_ENV) { 3673 unless ($DB_ENV) {
3277 $DB_ENV = BDB::db_env_create; 3674 $DB_ENV = BDB::db_env_create;
3675 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3676 | BDB::LOG_AUTOREMOVE, 1);
3677 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3678 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3278 3679
3279 cf::sync_job { 3680 cf::sync_job {
3280 eval { 3681 eval {
3281 BDB::db_env_open 3682 BDB::db_env_open
3282 $DB_ENV, 3683 $DB_ENV,
3284 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3685 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3285 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3686 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3286 0666; 3687 0666;
3287 3688
3288 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3689 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 }; 3690 };
3293 3691
3294 cf::cleanup "db_env_open(db): $@" if $@; 3692 cf::cleanup "db_env_open(db): $@" if $@;
3295 }; 3693 };
3296 } 3694 }
3695
3696 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3697 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3698 };
3699 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3700 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3701 };
3702 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3703 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3704 };
3297} 3705}
3298 3706
3299{ 3707{
3708 # configure IO::AIO
3709
3300 IO::AIO::min_parallel 8; 3710 IO::AIO::min_parallel 8;
3301
3302 undef $Coro::AIO::WATCHER;
3303 IO::AIO::max_poll_time $TICK * 0.1; 3711 IO::AIO::max_poll_time $TICK * 0.1;
3304 $AIO_POLL_WATCHER = Event->io ( 3712 $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} 3713}
3313 3714
3314my $_log_backtrace; 3715my $_log_backtrace;
3315 3716
3316sub _log_backtrace { 3717sub _log_backtrace {
3320 3721
3321 # limit the # of concurrent backtraces 3722 # limit the # of concurrent backtraces
3322 if ($_log_backtrace < 2) { 3723 if ($_log_backtrace < 2) {
3323 ++$_log_backtrace; 3724 ++$_log_backtrace;
3324 async { 3725 async {
3726 $Coro::current->{desc} = "abt $msg";
3727
3325 my @bt = fork_call { 3728 my @bt = fork_call {
3326 @addr = map { sprintf "%x", $_ } @addr; 3729 @addr = map { sprintf "%x", $_ } @addr;
3327 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3730 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3328 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3731 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3329 or die "addr2line: $!"; 3732 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines