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.314 by root, Mon Jul 23 16:53:15 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;
322 };
323 $TICK_WATCHER->stop;
324 $guard
325} 368}
326 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
327=item cf::get_slot $time[, $priority] 385=item cf::get_slot $time[, $priority[, $name]]
328 386
329Allocate $time seconds of blocking CPU time at priority C<$priority>: 387Allocate $time seconds of blocking CPU time at priority C<$priority>:
330This call blocks and returns only when you have at least C<$time> seconds 388This call blocks and returns only when you have at least C<$time> seconds
331of cpu time till the next tick. The slot is only valid till the next cede. 389of cpu time till the next tick. The slot is only valid till the next cede.
332 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
333Useful for short background jobs. 394Useful for short background jobs.
334 395
335=cut 396=cut
336 397
337our @SLOT_QUEUE; 398our @SLOT_QUEUE;
338our $SLOT_QUEUE; 399our $SLOT_QUEUE;
339 400
340$SLOT_QUEUE->cancel if $SLOT_QUEUE; 401$SLOT_QUEUE->cancel if $SLOT_QUEUE;
341$SLOT_QUEUE = Coro::async { 402$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager");
404
342 my $signal = new Coro::Signal; 405 my $signal = new Coro::Signal;
343 406
344 while () { 407 while () {
345 next_job: 408 next_job:
346 my $avail = cf::till_tick; 409 my $avail = cf::till_tick;
354 } 417 }
355 } 418 }
356 } 419 }
357 420
358 if (@SLOT_QUEUE) { 421 if (@SLOT_QUEUE) {
359 # we do not use wait_For_tick() as it returns immediately when tick is inactive 422 # we do not use wait_for_tick() as it returns immediately when tick is inactive
360 push @cf::WAIT_FOR_TICK, $signal; 423 push @cf::WAIT_FOR_TICK, $signal;
361 $signal->wait; 424 $signal->wait;
362 } else { 425 } else {
363 Coro::schedule; 426 Coro::schedule;
364 } 427 }
365 } 428 }
366}; 429};
367 430
368sub get_slot($;$) { 431sub get_slot($;$$) {
369 my ($time, $pri) = @_; 432 my ($time, $pri, $name) = @_;
370 433
434 $time = $TICK * .6 if $time > $TICK * .6;
435 my $sig = new Coro::Signal;
436
371 push @SLOT_QUEUE, [$time, $pri, my $sig = new Coro::Signal]; 437 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
372 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 438 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
373 $SLOT_QUEUE->ready; 439 $SLOT_QUEUE->ready;
374 $sig->wait; 440 $sig->wait;
375} 441}
376 442
384 450
385BEGIN { *async = \&Coro::async_pool } 451BEGIN { *async = \&Coro::async_pool }
386 452
387=item cf::sync_job { BLOCK } 453=item cf::sync_job { BLOCK }
388 454
389The design of Crossfire TRT requires that the main coroutine ($Coro::main) 455The design of Deliantra requires that the main coroutine ($Coro::main)
390is always able to handle events or runnable, as Crossfire TRT is only 456is always able to handle events or runnable, as Deliantra is only
391partly 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
392acceptable. 458acceptable.
393 459
394If 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
395the given BLOCK in another coroutine while waiting for the result. The 461the given BLOCK in another coroutine while waiting for the result. The
400 466
401sub sync_job(&) { 467sub sync_job(&) {
402 my ($job) = @_; 468 my ($job) = @_;
403 469
404 if ($Coro::current == $Coro::main) { 470 if ($Coro::current == $Coro::main) {
405 my $time = Event::time; 471 my $time = EV::time;
406 472
407 # this is the main coro, too bad, we have to block 473 # this is the main coro, too bad, we have to block
408 # till the operation succeeds, freezing the server :/ 474 # till the operation succeeds, freezing the server :/
409 475
410 # TODO: use suspend/resume instead 476 LOG llevError, Carp::longmess "sync job";#d#
411 # (but this is cancel-safe) 477
412 my $freeze_guard = freeze_mainloop; 478 my $freeze_guard = freeze_mainloop;
413 479
414 my $busy = 1; 480 my $busy = 1;
415 my @res; 481 my @res;
416 482
417 (async { 483 (async {
484 $Coro::current->desc ("sync job coro");
418 @res = eval { $job->() }; 485 @res = eval { $job->() };
419 warn $@ if $@; 486 warn $@ if $@;
420 undef $busy; 487 undef $busy;
421 })->prio (Coro::PRIO_MAX); 488 })->prio (Coro::PRIO_MAX);
422 489
423 while ($busy) { 490 while ($busy) {
424 Coro::cede or Event::one_event; 491 if (Coro::nready) {
492 Coro::cede_notself;
493 } else {
494 EV::loop EV::LOOP_ONESHOT;
425 } 495 }
496 }
426 497
427 $time = Event::time - $time; 498 my $time = EV::time - $time;
428 499
429 LOG llevError | logBacktrace, Carp::longmess "long sync job"
430 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
431
432 $tick_start += $time; # do not account sync jobs to server load 500 $TICK_START += $time; # do not account sync jobs to server load
433 501
434 wantarray ? @res : $res[0] 502 wantarray ? @res : $res[0]
435 } else { 503 } else {
436 # we are in another coroutine, how wonderful, everything just works 504 # we are in another coroutine, how wonderful, everything just works
437 505
462=item fork_call { }, $args 530=item fork_call { }, $args
463 531
464Executes the given code block with the given arguments in a seperate 532Executes the given code block with the given arguments in a seperate
465process, returning the results. Everything must be serialisable with 533process, returning the results. Everything must be serialisable with
466Coro::Storable. May, of course, block. Note that the executed sub may 534Coro::Storable. May, of course, block. Note that the executed sub may
467never block itself or use any form of Event handling. 535never block itself or use any form of event handling.
468 536
469=cut 537=cut
470
471sub _store_scalar {
472 open my $fh, ">", \my $buf
473 or die "fork_call: cannot open fh-to-buf in child : $!";
474 Storable::store_fd $_[0], $fh;
475 close $fh;
476
477 $buf
478}
479 538
480sub fork_call(&@) { 539sub fork_call(&@) {
481 my ($cb, @args) = @_; 540 my ($cb, @args) = @_;
482 541
483# 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,
484# or die "socketpair: $!"; 543 # otherwise perl prematurely frees the stuff :/
485 pipe my $fh1, my $fh2 544 # TODO: investigate and fix (likely this will be rather laborious)
486 or die "pipe: $!";
487 545
488 if (my $pid = fork) { 546 my @res = Coro::Util::fork_eval {
489 close $fh2;
490
491 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
492 warn "pst<$res>" unless $res =~ /^pst/;
493 $res = Coro::Storable::thaw $res;
494
495 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
496
497 Carp::confess $$res unless "ARRAY" eq ref $res;
498
499 return wantarray ? @$res : $res->[-1];
500 } else {
501 reset_signals; 547 reset_signals;
502 local $SIG{__WARN__}; 548 &$cb
503 local $SIG{__DIE__}; 549 }, @args;
504 # just in case, this hack effectively disables event
505 # in the child. cleaner and slower would be canceling all watchers,
506 # but this works for the time being.
507 local $Coro::idle;
508 $Coro::current->prio (Coro::PRIO_MAX);
509 550
510 eval { 551 wantarray ? @res : $res[-1]
511 close $fh1;
512
513 my @res = eval { $cb->(@args) };
514
515 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
516 close $fh2;
517 };
518
519 warn $@ if $@;
520 _exit 0;
521 }
522} 552}
523 553
524=item $value = cf::db_get $family => $key 554=item $value = cf::db_get $family => $key
525 555
526Returns a single value from the environment database. 556Returns a single value from the environment database.
528=item cf::db_put $family => $key => $value 558=item cf::db_put $family => $key => $value
529 559
530Stores 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
531data 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).
532 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
533=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}
534 586
535our $DB; 587our $DB;
536 588
537sub db_init { 589sub db_init {
538 unless ($DB) {
539 $DB = BDB::db_create $DB_ENV;
540
541 cf::sync_job { 590 cf::sync_job {
542 eval { 591 $DB ||= db_table "db";
543 $DB->set_flags (BDB::CHKSUM);
544
545 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
546 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
547 cf::cleanup "db_open(db): $!" if $!;
548 };
549 cf::cleanup "db_open(db): $@" if $@;
550 };
551 } 592 };
552} 593}
553 594
554sub db_get($$) { 595sub db_get($$) {
555 my $key = "$_[0]/$_[1]"; 596 my $key = "$_[0]/$_[1]";
556 597
606 if (1) { 647 if (1) {
607 $md5 = 648 $md5 =
608 join "\x00", 649 join "\x00",
609 $processversion, 650 $processversion,
610 map { 651 map {
611 Coro::cede; 652 cf::cede_to_tick;
612 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 653 ($src->[$_], Digest::MD5::md5_hex $data[$_])
613 } 0.. $#$src; 654 } 0.. $#$src;
614 655
615 656
616 my $dbmd5 = db_get cache => "$id/md5"; 657 my $dbmd5 = db_get cache => "$id/md5";
660attach callbacks/event handlers (a collection of which is called an "attachment") 701attach callbacks/event handlers (a collection of which is called an "attachment")
661to it. All such attachable objects support the following methods. 702to it. All such attachable objects support the following methods.
662 703
663In 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>
664C<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
665Crossfire TRT). 706Deliantra).
666 707
667=over 4 708=over 4
668 709
669=item $attachable->attach ($attachment, key => $value...) 710=item $attachable->attach ($attachment, key => $value...)
670 711
952 } 993 }
953 994
954 0 995 0
955} 996}
956 997
957=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 998=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
958 999
959=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1000=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
960 1001
961Generate an object-specific event with the given arguments. 1002Generate an object-specific event with the given arguments.
962 1003
968 1009
969=cut 1010=cut
970 1011
971############################################################################# 1012#############################################################################
972# object support 1013# object support
973#
974 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#
975sub _can_merge { 1048sub _can_merge {
976 my ($ob1, $ob2) = @_; 1049 my ($ob1, $ob2) = @_;
977 1050
978 local $Storable::canonical = 1; 1051 ++$SLOW_MERGES;#d#
979 my $fob1 = Storable::freeze $ob1;
980 my $fob2 = Storable::freeze $ob2;
981 1052
982 $fob1 eq $fob2 1053 # we do the slow way here
1054 return _object_equal $ob1, $ob2
983} 1055}
984 1056
985sub reattach { 1057sub reattach {
986 # basically do the same as instantiate, without calling instantiate 1058 # basically do the same as instantiate, without calling instantiate
987 my ($obj) = @_; 1059 my ($obj) = @_;
1009cf::attachable->attach ( 1081cf::attachable->attach (
1010 prio => -1000000, 1082 prio => -1000000,
1011 on_instantiate => sub { 1083 on_instantiate => sub {
1012 my ($obj, $data) = @_; 1084 my ($obj, $data) = @_;
1013 1085
1014 $data = from_json $data; 1086 $data = decode_json $data;
1015 1087
1016 for (@$data) { 1088 for (@$data) {
1017 my ($name, $args) = @$_; 1089 my ($name, $args) = @$_;
1018 1090
1019 $obj->attach ($name, %{$args || {} }); 1091 $obj->attach ($name, %{$args || {} });
1035sub object_freezer_save { 1107sub object_freezer_save {
1036 my ($filename, $rdata, $objs) = @_; 1108 my ($filename, $rdata, $objs) = @_;
1037 1109
1038 sync_job { 1110 sync_job {
1039 if (length $$rdata) { 1111 if (length $$rdata) {
1112 utf8::decode (my $decname = $filename);
1040 warn sprintf "saving %s (%d,%d)\n", 1113 warn sprintf "saving %s (%d,%d)\n",
1041 $filename, length $$rdata, scalar @$objs; 1114 $decname, length $$rdata, scalar @$objs;
1042 1115
1043 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1116 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1044 chmod SAVE_MODE, $fh; 1117 chmod SAVE_MODE, $fh;
1045 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1118 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1046 aio_fsync $fh if $cf::USE_FSYNC; 1119 aio_fsync $fh if $cf::USE_FSYNC;
1047 close $fh; 1120 close $fh;
1048 1121
1049 if (@$objs) { 1122 if (@$objs) {
1050 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) {
1051 chmod SAVE_MODE, $fh; 1124 chmod SAVE_MODE, $fh;
1052 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1125 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1053 aio_write $fh, 0, (length $data), $data, 0; 1126 aio_write $fh, 0, (length $data), $data, 0;
1054 aio_fsync $fh if $cf::USE_FSYNC; 1127 aio_fsync $fh if $cf::USE_FSYNC;
1055 close $fh; 1128 close $fh;
1056 aio_rename "$filename.pst~", "$filename.pst"; 1129 aio_rename "$filename.pst~", "$filename.pst";
1057 } 1130 }
1065 } 1138 }
1066 } else { 1139 } else {
1067 aio_unlink $filename; 1140 aio_unlink $filename;
1068 aio_unlink "$filename.pst"; 1141 aio_unlink "$filename.pst";
1069 } 1142 }
1070 } 1143 };
1071} 1144}
1072 1145
1073sub object_freezer_as_string { 1146sub object_freezer_as_string {
1074 my ($rdata, $objs) = @_; 1147 my ($rdata, $objs) = @_;
1075 1148
1087 or return; 1160 or return;
1088 1161
1089 unless (aio_stat "$filename.pst") { 1162 unless (aio_stat "$filename.pst") {
1090 (aio_load "$filename.pst", $av) >= 0 1163 (aio_load "$filename.pst", $av) >= 0
1091 or return; 1164 or return;
1165
1092 $av = eval { (Storable::thaw $av)->{objs} }; 1166 my $st = eval { Coro::Storable::thaw $av };
1167 $av = $st->{objs};
1093 } 1168 }
1094 1169
1170 utf8::decode (my $decname = $filename);
1095 warn sprintf "loading %s (%d)\n", 1171 warn sprintf "loading %s (%d,%d)\n",
1096 $filename, length $data, scalar @{$av || []}; 1172 $decname, length $data, scalar @{$av || []};
1173
1097 return ($data, $av); 1174 ($data, $av)
1098} 1175}
1099 1176
1100=head2 COMMAND CALLBACKS 1177=head2 COMMAND CALLBACKS
1101 1178
1102=over 4 1179=over 4
1175 my ($pl, $buf) = @_; 1252 my ($pl, $buf) = @_;
1176 1253
1177 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1254 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1178 1255
1179 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
1180 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1264 if (my $cb = $EXTCMD{$type}) {
1181 if (my %reply = $cb->($pl, $msg)) { 1265 @reply = $cb->($pl, @payload);
1182 $pl->ext_reply ($msg->{msgid}, %reply);
1183 }
1184 } 1266 }
1267
1268 $pl->ext_reply ($reply, @reply)
1269 if $reply;
1270
1185 } else { 1271 } else {
1186 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1272 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1187 } 1273 }
1188 1274
1189 cf::override; 1275 cf::override;
1242 my $msg = $@ ? "$v->{path}: $@\n" 1328 my $msg = $@ ? "$v->{path}: $@\n"
1243 : "$v->{base}: extension inactive.\n"; 1329 : "$v->{base}: extension inactive.\n";
1244 1330
1245 if (exists $v->{meta}{mandatory}) { 1331 if (exists $v->{meta}{mandatory}) {
1246 warn $msg; 1332 warn $msg;
1247 warn "mandatory extension failed to load, exiting.\n"; 1333 cf::cleanup "mandatory extension failed to load, exiting.";
1248 exit 1;
1249 } 1334 }
1250 1335
1251 warn $msg; 1336 warn $msg;
1252 } 1337 }
1253 1338
1278use Coro::AIO; 1363use Coro::AIO;
1279 1364
1280=head3 cf::player 1365=head3 cf::player
1281 1366
1282=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}
1283 1382
1284=item cf::player::find $login 1383=item cf::player::find $login
1285 1384
1286Returns the given player object, loading it if necessary (might block). 1385Returns the given player object, loading it if necessary (might block).
1287 1386
1323 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1422 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1324 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1423 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1325 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1424 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1326 aio_unlink +(playerdir $login) . "/$login.pl"; 1425 aio_unlink +(playerdir $login) . "/$login.pl";
1327 1426
1328 my $pl = load_pl path $login 1427 my $f = new_from_file cf::object::thawer path $login
1329 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;
1330 $cf::PLAYER{$login} = $pl 1434 $cf::PLAYER{$login} = $pl
1331 } 1435 }
1332 } 1436 }
1333} 1437}
1334 1438
1344 1448
1345 aio_mkdir playerdir $pl, 0770; 1449 aio_mkdir playerdir $pl, 0770;
1346 $pl->{last_save} = $cf::RUNTIME; 1450 $pl->{last_save} = $cf::RUNTIME;
1347 1451
1348 $pl->save_pl ($path); 1452 $pl->save_pl ($path);
1349 Coro::cede; 1453 cf::cede_to_tick;
1350} 1454}
1351 1455
1352sub new($) { 1456sub new($) {
1353 my ($login) = @_; 1457 my ($login) = @_;
1354 1458
1358 $self->{deny_save} = 1; 1462 $self->{deny_save} = 1;
1359 1463
1360 $cf::PLAYER{$login} = $self; 1464 $cf::PLAYER{$login} = $self;
1361 1465
1362 $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 (@_);
1363} 1477}
1364 1478
1365=item $pl->quit_character 1479=item $pl->quit_character
1366 1480
1367Nukes the player without looking back. If logged in, the connection will 1481Nukes the player without looking back. If logged in, the connection will
1422 or return []; 1536 or return [];
1423 1537
1424 my @logins; 1538 my @logins;
1425 1539
1426 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") {
1427 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1545 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1428 aio_read $fh, 0, 512, my $buf, 0 or next; 1546 aio_read $fh, 0, 512, my $buf, 0 or next;
1429 $buf !~ /^password -------------$/m or next; # official not-valid tag 1547 $buf !~ /^password -------------$/m or next; # official not-valid tag
1548 }
1430 1549
1431 utf8::decode $login; 1550 utf8::decode $login;
1432 push @logins, $login; 1551 push @logins, $login;
1433 } 1552 }
1434 1553
1467 1586
1468Expand crossfire pod fragments into protocol xml. 1587Expand crossfire pod fragments into protocol xml.
1469 1588
1470=cut 1589=cut
1471 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
1472sub expand_cfpod { 1602sub expand_cfpod {
1473 ((my $self), (local $_)) = @_; 1603 my ($self, $pod) = @_;
1474 1604
1475 # escape & and < 1605 my $xml;
1476 s/&/&amp;/g;
1477 s/(?<![BIUGH])</&lt;/g;
1478 1606
1479 # this is buggy, it needs to properly take care of nested <'s 1607 while () {
1608 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1609 $group = $1;
1480 1610
1481 1 while 1611 $group =~ s/&/&amp;/g;
1482 # replace B<>, I<>, U<> etc. 1612 $group =~ s/</&lt;/g;
1483 s/B<([^\>]*)>/<b>$1<\/b>/ 1613
1484 || s/I<([^\>]*)>/<i>$1<\/i>/ 1614 $xml .= $group;
1485 || s/U<([^\>]*)>/<u>$1<\/u>/ 1615 } elsif ($pod =~ m%\G
1486 # replace G<male|female> tags 1616 ([BCGHITU])
1487 || s{G<([^>|]*)\|([^>]*)>}{ 1617 <
1488 $self->gender ? $2 : $1 1618 (?:
1489 }ge 1619 ([^<>]*) (?{ $group = $^N })
1490 # replace H<hint text> 1620 | < $interior >
1491 || s{H<([^\>]*)>} 1621 )
1622 >
1623 %gcsx
1492 { 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") {
1493 ("<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>",
1494 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1643 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1495 "") 1644 "")
1496 [$self->{hintmode}] 1645 [$self->{hintmode}];
1646 } else {
1647 $xml .= "error processing '$code($data)' directive";
1497 }ge; 1648 }
1649 } else {
1650 if ($pod =~ /\G(.+)/) {
1651 warn "parse error while expanding $pod (at $1)";
1652 }
1653 last;
1654 }
1655 }
1498 1656
1657 for ($xml) {
1499 # create single paragraphs (very hackish) 1658 # create single paragraphs (very hackish)
1500 s/(?<=\S)\n(?=\w)/ /g; 1659 s/(?<=\S)\n(?=\w)/ /g;
1501 1660
1502 # compress some whitespace 1661 # compress some whitespace
1503 s/\s+\n/\n/g; # ws line-ends 1662 s/\s+\n/\n/g; # ws line-ends
1504 s/\n\n+/\n/g; # double lines 1663 s/\n\n+/\n/g; # double lines
1505 s/^\n+//; # beginning lines 1664 s/^\n+//; # beginning lines
1506 s/\n+$//; # ending lines 1665 s/\n+$//; # ending lines
1666 }
1507 1667
1508 $_ 1668 $xml
1509} 1669}
1670
1671no re 'eval';
1510 1672
1511sub hintmode { 1673sub hintmode {
1512 $_[0]{hintmode} = $_[1] if @_ > 1; 1674 $_[0]{hintmode} = $_[1] if @_ > 1;
1513 $_[0]{hintmode} 1675 $_[0]{hintmode}
1514} 1676}
1515 1677
1516=item $player->ext_reply ($msgid, %msg) 1678=item $player->ext_reply ($msgid, @msg)
1517 1679
1518Sends an ext reply to the player. 1680Sends an ext reply to the player.
1519 1681
1520=cut 1682=cut
1521 1683
1522sub ext_reply($$%) { 1684sub ext_reply($$@) {
1523 my ($self, $id, %msg) = @_; 1685 my ($self, $id, @msg) = @_;
1524 1686
1525 $msg{msgid} = $id; 1687 $self->ns->ext_reply ($id, @msg)
1526 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1527} 1688}
1528 1689
1529=item $player->ext_event ($type, %msg) 1690=item $player->ext_msg ($type, @msg)
1530 1691
1531Sends an ext event to the client. 1692Sends an ext event to the client.
1532 1693
1533=cut 1694=cut
1534 1695
1535sub ext_event($$%) { 1696sub ext_msg($$@) {
1536 my ($self, $type, %msg) = @_; 1697 my ($self, $type, @msg) = @_;
1537 1698
1538 $self->ns->ext_event ($type, %msg); 1699 $self->ns->ext_msg ($type, @msg);
1539} 1700}
1540 1701
1541=head3 cf::region 1702=head3 cf::region
1542 1703
1543=over 4 1704=over 4
1759 1920
1760sub load_header_from($) { 1921sub load_header_from($) {
1761 my ($self, $path) = @_; 1922 my ($self, $path) = @_;
1762 1923
1763 utf8::encode $path; 1924 utf8::encode $path;
1764 #aio_open $path, O_RDONLY, 0 1925 my $f = new_from_file cf::object::thawer $path
1765 # or return;
1766
1767 $self->_load_header ($path)
1768 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;
1769 1933
1770 $self->{load_path} = $path; 1934 $self->{load_path} = $path;
1771 1935
1772 1 1936 1
1773} 1937}
1827sub find { 1991sub find {
1828 my ($path, $origin) = @_; 1992 my ($path, $origin) = @_;
1829 1993
1830 $path = normalise $path, $origin && $origin->path; 1994 $path = normalise $path, $origin && $origin->path;
1831 1995
1996 cf::lock_wait "map_data:$path";#d#remove
1832 cf::lock_wait "map_find:$path"; 1997 cf::lock_wait "map_find:$path";
1833 1998
1834 $cf::MAP{$path} || do { 1999 $cf::MAP{$path} || do {
1835 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
1836 my $map = new_from_path cf::map $path 2003 my $map = new_from_path cf::map $path
1837 or return; 2004 or return;
1838 2005
1839 $map->{last_save} = $cf::RUNTIME; 2006 $map->{last_save} = $cf::RUNTIME;
1840 2007
1842 or return; 2009 or return;
1843 2010
1844 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2011 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1845 # doing this can freeze the server in a sync job, obviously 2012 # doing this can freeze the server in a sync job, obviously
1846 #$cf::WAIT_FOR_TICK->wait; 2013 #$cf::WAIT_FOR_TICK->wait;
2014 undef $guard1;
2015 undef $guard2;
1847 $map->reset; 2016 $map->reset;
1848 undef $guard;
1849 return find $path; 2017 return find $path;
1850 } 2018 }
1851 2019
1852 $cf::MAP{$path} = $map 2020 $cf::MAP{$path} = $map
1853 } 2021 }
1862 local $self->{deny_reset} = 1; # loading can take a long time 2030 local $self->{deny_reset} = 1; # loading can take a long time
1863 2031
1864 my $path = $self->{path}; 2032 my $path = $self->{path};
1865 2033
1866 { 2034 {
1867 my $guard = cf::lock_acquire "map_load:$path"; 2035 my $guard = cf::lock_acquire "map_data:$path";
1868 2036
2037 return unless $self->valid;
1869 return if $self->in_memory != cf::MAP_SWAPPED; 2038 return unless $self->in_memory == cf::MAP_SWAPPED;
1870 2039
1871 $self->in_memory (cf::MAP_LOADING); 2040 $self->in_memory (cf::MAP_LOADING);
1872 2041
1873 $self->alloc; 2042 $self->alloc;
1874 2043
1875 $self->pre_load; 2044 $self->pre_load;
1876 Coro::cede; 2045 cf::cede_to_tick;
1877 2046
2047 my $f = new_from_file cf::object::thawer $self->{load_path};
2048 $f->skip_block;
1878 $self->_load_objects ($self->{load_path}, 1) 2049 $self->_load_objects ($f)
1879 or return; 2050 or return;
1880 2051
1881 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2052 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1882 if delete $self->{load_original}; 2053 if delete $self->{load_original};
1883 2054
1884 if (my $uniq = $self->uniq_path) { 2055 if (my $uniq = $self->uniq_path) {
1885 utf8::encode $uniq; 2056 utf8::encode $uniq;
1886 if (aio_open $uniq, O_RDONLY, 0) { 2057 unless (aio_stat $uniq) {
2058 if (my $f = new_from_file cf::object::thawer $uniq) {
1887 $self->clear_unique_items; 2059 $self->clear_unique_items;
1888 $self->_load_objects ($uniq, 0); 2060 $self->_load_objects ($f);
2061 $f->resolve_delayed_derefs;
2062 }
1889 } 2063 }
1890 } 2064 }
1891 2065
1892 Coro::cede; 2066 $f->resolve_delayed_derefs;
2067
2068 cf::cede_to_tick;
1893 # now do the right thing for maps 2069 # now do the right thing for maps
1894 $self->link_multipart_objects; 2070 $self->link_multipart_objects;
1895 $self->difficulty ($self->estimate_difficulty) 2071 $self->difficulty ($self->estimate_difficulty)
1896 unless $self->difficulty; 2072 unless $self->difficulty;
1897 Coro::cede; 2073 cf::cede_to_tick;
1898 2074
1899 unless ($self->{deny_activate}) { 2075 unless ($self->{deny_activate}) {
1900 $self->decay_objects; 2076 $self->decay_objects;
1901 $self->fix_auto_apply; 2077 $self->fix_auto_apply;
1902 $self->update_buttons; 2078 $self->update_buttons;
1903 Coro::cede; 2079 cf::cede_to_tick;
1904 $self->set_darkness_map; 2080 $self->set_darkness_map;
1905 Coro::cede; 2081 cf::cede_to_tick;
1906 $self->activate; 2082 $self->activate;
1907 } 2083 }
2084
2085 $self->{last_save} = $cf::RUNTIME;
2086 $self->last_access ($cf::RUNTIME);
1908 2087
1909 $self->in_memory (cf::MAP_IN_MEMORY); 2088 $self->in_memory (cf::MAP_IN_MEMORY);
1910 } 2089 }
1911 2090
1912 $self->post_load; 2091 $self->post_load;
1923 2102
1924 $self 2103 $self
1925} 2104}
1926 2105
1927# 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
1928sub load_diag { 2107sub load_neighbours {
1929 my ($map) = @_; 2108 my ($map) = @_;
1930 2109
1931 my @diag; # diagonal neighbours 2110 my @neigh; # diagonal neighbours
1932 2111
1933 for (0 .. 3) { 2112 for (0 .. 3) {
1934 my $neigh = $map->tile_path ($_) 2113 my $neigh = $map->tile_path ($_)
1935 or next; 2114 or next;
1936 $neigh = find $neigh, $map 2115 $neigh = find $neigh, $map
1937 or next; 2116 or next;
1938 $neigh->load; 2117 $neigh->load;
1939 2118
2119 push @neigh,
1940 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2120 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1941 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2121 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1942 } 2122 }
1943 2123
1944 for (@diag) { 2124 for (grep defined $_->[0], @neigh) {
2125 my ($path, $origin) = @$_;
1945 my $neigh = find @$_ 2126 my $neigh = find $path, $origin
1946 or next; 2127 or next;
1947 $neigh->load; 2128 $neigh->load;
1948 } 2129 }
1949} 2130}
1950 2131
1955} 2136}
1956 2137
1957sub do_load_sync { 2138sub do_load_sync {
1958 my ($map) = @_; 2139 my ($map) = @_;
1959 2140
2141 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2142 if $Coro::current == $Coro::main;
2143
1960 cf::sync_job { $map->load }; 2144 cf::sync_job { $map->load };
1961} 2145}
1962 2146
1963our %MAP_PREFETCH; 2147our %MAP_PREFETCH;
1964our $MAP_PREFETCHER = undef; 2148our $MAP_PREFETCHER = undef;
1965 2149
1966sub find_async { 2150sub find_async {
1967 my ($path, $origin) = @_; 2151 my ($path, $origin, $load) = @_;
1968 2152
1969 $path = normalise $path, $origin && $origin->{path}; 2153 $path = normalise $path, $origin && $origin->{path};
1970 2154
1971 if (my $map = $cf::MAP{$path}) { 2155 if (my $map = $cf::MAP{$path}) {
1972 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2156 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1973 } 2157 }
1974 2158
1975 undef $MAP_PREFETCH{$path}; 2159 $MAP_PREFETCH{$path} |= $load;
2160
1976 $MAP_PREFETCHER ||= cf::async { 2161 $MAP_PREFETCHER ||= cf::async {
2162 $Coro::current->{desc} = "map prefetcher";
2163
1977 while (%MAP_PREFETCH) { 2164 while (%MAP_PREFETCH) {
1978 for my $path (keys %MAP_PREFETCH) { 2165 while (my ($k, $v) = each %MAP_PREFETCH) {
1979 if (my $map = find $path) { 2166 if (my $map = find $k) {
1980 $map->load; 2167 $map->load if $v;
1981 } 2168 }
1982 2169
1983 delete $MAP_PREFETCH{$path}; 2170 delete $MAP_PREFETCH{$k};
1984 } 2171 }
1985 } 2172 }
1986 undef $MAP_PREFETCHER; 2173 undef $MAP_PREFETCHER;
1987 }; 2174 };
1988 $MAP_PREFETCHER->prio (6); 2175 $MAP_PREFETCHER->prio (6);
1991} 2178}
1992 2179
1993sub save { 2180sub save {
1994 my ($self) = @_; 2181 my ($self) = @_;
1995 2182
1996 my $lock = cf::lock_acquire "map_data:" . $self->path; 2183 my $lock = cf::lock_acquire "map_data:$self->{path}";
1997 2184
1998 $self->{last_save} = $cf::RUNTIME; 2185 $self->{last_save} = $cf::RUNTIME;
1999 2186
2000 return unless $self->dirty; 2187 return unless $self->dirty;
2001 2188
2007 return if $self->{deny_save}; 2194 return if $self->{deny_save};
2008 2195
2009 local $self->{last_access} = $self->last_access;#d# 2196 local $self->{last_access} = $self->last_access;#d#
2010 2197
2011 cf::async { 2198 cf::async {
2199 $Coro::current->{desc} = "map player save";
2012 $_->contr->save for $self->players; 2200 $_->contr->save for $self->players;
2013 }; 2201 };
2014 2202
2015 if ($uniq) { 2203 if ($uniq) {
2016 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2024 my ($self) = @_; 2212 my ($self) = @_;
2025 2213
2026 # save first because save cedes 2214 # save first because save cedes
2027 $self->save; 2215 $self->save;
2028 2216
2029 my $lock = cf::lock_acquire "map_data:" . $self->path; 2217 my $lock = cf::lock_acquire "map_data:$self->{path}";
2030 2218
2031 return if $self->players; 2219 return if $self->players;
2032 return if $self->in_memory != cf::MAP_IN_MEMORY; 2220 return if $self->in_memory != cf::MAP_IN_MEMORY;
2033 return if $self->{deny_save}; 2221 return if $self->{deny_save};
2034 2222
2223 $self->in_memory (cf::MAP_SWAPPED);
2224
2225 $self->deactivate;
2226 $_->clear_links_to ($self) for values %cf::MAP;
2035 $self->clear; 2227 $self->clear;
2036 $self->in_memory (cf::MAP_SWAPPED);
2037} 2228}
2038 2229
2039sub reset_at { 2230sub reset_at {
2040 my ($self) = @_; 2231 my ($self) = @_;
2041 2232
2073 if $uniq; 2264 if $uniq;
2074 } 2265 }
2075 2266
2076 delete $cf::MAP{$self->path}; 2267 delete $cf::MAP{$self->path};
2077 2268
2269 $self->deactivate;
2270 $_->clear_links_to ($self) for values %cf::MAP;
2078 $self->clear; 2271 $self->clear;
2079
2080 $_->clear_links_to ($self) for values %cf::MAP;
2081 2272
2082 $self->unlink_save; 2273 $self->unlink_save;
2083 $self->destroy; 2274 $self->destroy;
2084} 2275}
2085 2276
2086my $nuke_counter = "aaaa"; 2277my $nuke_counter = "aaaa";
2087 2278
2088sub nuke { 2279sub nuke {
2089 my ($self) = @_; 2280 my ($self) = @_;
2090 2281
2282 {
2283 my $lock = cf::lock_acquire "map_data:$self->{path}";
2284
2091 delete $cf::MAP{$self->path}; 2285 delete $cf::MAP{$self->path};
2092 2286
2093 $self->unlink_save; 2287 $self->unlink_save;
2094 2288
2095 bless $self, "cf::map"; 2289 bless $self, "cf::map";
2096 delete $self->{deny_reset}; 2290 delete $self->{deny_reset};
2097 $self->{deny_save} = 1; 2291 $self->{deny_save} = 1;
2098 $self->reset_timeout (1); 2292 $self->reset_timeout (1);
2099 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2293 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2100 2294
2101 $cf::MAP{$self->path} = $self; 2295 $cf::MAP{$self->path} = $self;
2296 }
2102 2297
2103 $self->reset; # polite request, might not happen 2298 $self->reset; # polite request, might not happen
2104} 2299}
2105 2300
2106=item $maps = cf::map::tmp_maps 2301=item $maps = cf::map::tmp_maps
2182 2377
2183sub inv_recursive { 2378sub inv_recursive {
2184 inv_recursive_ inv $_[0] 2379 inv_recursive_ inv $_[0]
2185} 2380}
2186 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
2187package cf; 2410package cf;
2188 2411
2189=back 2412=back
2190 2413
2191=head3 cf::object::player 2414=head3 cf::object::player
2213 2436
2214 } else { 2437 } else {
2215 my $pl = $self->contr; 2438 my $pl = $self->contr;
2216 2439
2217 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2440 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2218 my $diag = $pl->{npc_dialog}; 2441 my $dialog = $pl->{npc_dialog};
2219 $diag->{pl}->ext_reply ( 2442 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2220 $diag->{id},
2221 msgtype => "reply",
2222 msg => $diag->{pl}->expand_cfpod ($msg),
2223 add_topics => []
2224 );
2225 2443
2226 } else { 2444 } else {
2227 $msg = $npc->name . " says: $msg" if $npc; 2445 $msg = $npc->name . " says: $msg" if $npc;
2228 $self->message ($msg, $flags); 2446 $self->message ($msg, $flags);
2229 } 2447 }
2230 } 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 (@_);
2231} 2459}
2232 2460
2233=item $player_object->may ("access") 2461=item $player_object->may ("access")
2234 2462
2235Returns wether the given player is authorized to access resource "access" 2463Returns wether the given player is authorized to access resource "access"
2314 # use -1 or undef as default coordinates, not 0, 0 2542 # use -1 or undef as default coordinates, not 0, 0
2315 ($x, $y) = ($map->enter_x, $map->enter_y) 2543 ($x, $y) = ($map->enter_x, $map->enter_y)
2316 if $x <=0 && $y <= 0; 2544 if $x <=0 && $y <= 0;
2317 2545
2318 $map->load; 2546 $map->load;
2319 $map->load_diag; 2547 $map->load_neighbours;
2320 2548
2321 return unless $self->contr->active; 2549 return unless $self->contr->active;
2322 $self->activate_recursive; 2550 $self->activate_recursive;
2323 2551
2324 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2552 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2344 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2572 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2345 2573
2346 $self->enter_link; 2574 $self->enter_link;
2347 2575
2348 (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
2349 my $map = eval { 2598 my $map = eval {
2350 my $map = cf::map::find $path; 2599 my $map = defined $path ? cf::map::find $path : undef;
2351 2600
2352 if ($map) { 2601 if ($map) {
2353 $map = $map->customise_for ($self); 2602 $map = $map->customise_for ($self);
2354 $map = $check->($map) if $check && $map; 2603 $map = $check->($map) if $check && $map;
2355 } else { 2604 } else {
2356 $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);
2357 } 2606 }
2358 2607
2359 $map 2608 $map
2360 }; 2609 };
2361 2610
2414 $rmp->{origin_y} = $exit->y; 2663 $rmp->{origin_y} = $exit->y;
2415 } 2664 }
2416 2665
2417 $rmp->{random_seed} ||= $exit->random_seed; 2666 $rmp->{random_seed} ||= $exit->random_seed;
2418 2667
2419 my $data = cf::to_json $rmp; 2668 my $data = cf::encode_json $rmp;
2420 my $md5 = Digest::MD5::md5_hex $data; 2669 my $md5 = Digest::MD5::md5_hex $data;
2421 my $meta = "$RANDOMDIR/$md5.meta"; 2670 my $meta = "$RANDOMDIR/$md5.meta";
2422 2671
2423 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2672 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2424 aio_write $fh, 0, (length $data), $data, 0; 2673 aio_write $fh, 0, (length $data), $data, 0;
2451 # if exit is damned, update players death & WoR home-position 2700 # if exit is damned, update players death & WoR home-position
2452 $self->contr->savebed ($slaying, $hp, $sp) 2701 $self->contr->savebed ($slaying, $hp, $sp)
2453 if $exit->flag (FLAG_DAMNED); 2702 if $exit->flag (FLAG_DAMNED);
2454 2703
2455 (async { 2704 (async {
2705 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2706
2456 $self->deactivate_recursive; # just to be sure 2707 $self->deactivate_recursive; # just to be sure
2457 unless (eval { 2708 unless (eval {
2458 $self->goto ($slaying, $hp, $sp); 2709 $self->goto ($slaying, $hp, $sp);
2459 2710
2460 1; 2711 1;
2495the 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
2496the message unless the client supports the msg packet. 2747the message unless the client supports the msg packet.
2497 2748
2498=cut 2749=cut
2499 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
2500sub cf::client::send_msg { 2803sub cf::client::send_msg {
2501 my ($self, $channel, $msg, $color, @extra) = @_; 2804 my ($self, $channel, $msg, $color, @extra) = @_;
2502 2805
2503 $msg = $self->pl->expand_cfpod ($msg); 2806 $msg = $self->pl->expand_cfpod ($msg);
2504 2807
2505 $color &= ~cf::NDI_UNIQUE; # just in case... 2808 $color &= cf::NDI_CLIENT_MASK; # just in case...
2506 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
2507 if (ref $channel) { 2819 } elsif (ref $channel) {
2508 # send meta info to client, if not yet sent 2820 # send meta info to client, if not yet sent
2509 unless (exists $self->{channel}{$channel->{id}}) { 2821 unless (exists $self->{channel}{$channel->{id}}) {
2510 $self->{channel}{$channel->{id}} = $channel; 2822 $self->{channel}{$channel->{id}} = $channel;
2511 $self->ext_event (channel_info => %$channel); 2823 $self->ext_msg (channel_info => $channel)
2824 if $self->can_msg;
2512 } 2825 }
2513 2826
2514 $channel = $channel->{id}; 2827 $channel = $channel->{id};
2515 } 2828 }
2516 2829
2517 return unless @extra || length $msg; 2830 return unless @extra || length $msg;
2518 2831
2519 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
2520 $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]));
2521 } else { 2839 } else {
2522 # replace some tags by gcfclient-compatible ones
2523 for ($msg) {
2524 1 while
2525 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2526 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2527 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2528 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2529 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2530 }
2531
2532 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
2533 if (0 && $msg =~ /\[/) { 2855 if (0 && $msg =~ /\[/) {
2856 # COMMAND/INFO
2534 $self->send_packet ("drawextinfo $color 4 0 $msg") 2857 $self->send_packet ("drawextinfo $color 10 8 $msg")
2535 } else { 2858 } else {
2536 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2859 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2537 $self->send_packet ("drawinfo $color $msg") 2860 $self->send_packet ("drawinfo $color $msg")
2538 } 2861 }
2539 } 2862 }
2540 } 2863 }
2541} 2864}
2542 2865
2543=item $client->ext_event ($type, %msg) 2866=item $client->ext_msg ($type, @msg)
2544 2867
2545Sends an ext event to the client. 2868Sends an ext event to the client.
2546 2869
2547=cut 2870=cut
2548 2871
2549sub cf::client::ext_event($$%) { 2872sub cf::client::ext_msg($$@) {
2550 my ($self, $type, %msg) = @_; 2873 my ($self, $type, @msg) = @_;
2551 2874
2552 return unless $self->extcmd; 2875 if ($self->extcmd == 2) {
2553 2876 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2877 } elsif ($self->extcmd == 1) { # TODO: remove
2554 $msg{msgtype} = "event_$type"; 2878 push @msg, msgtype => "event_$type";
2555 $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 }
2556} 2899}
2557 2900
2558=item $success = $client->query ($flags, "text", \&cb) 2901=item $success = $client->query ($flags, "text", \&cb)
2559 2902
2560Queues a query to the client, calling the given callback with 2903Queues a query to the client, calling the given callback with
2615 my ($ns, $buf) = @_; 2958 my ($ns, $buf) = @_;
2616 2959
2617 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2960 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2618 2961
2619 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
2620 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2970 if (my $cb = $EXTICMD{$type}) {
2621 if (my %reply = $cb->($ns, $msg)) { 2971 @reply = $cb->($ns, @payload);
2622 $reply{msgid} = $msg->{msgid};
2623 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2624 }
2625 } 2972 }
2973
2974 $ns->ext_reply ($reply, @reply)
2975 if $reply;
2976
2626 } else { 2977 } else {
2627 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";
2628 } 2979 }
2629 2980
2630 cf::override; 2981 cf::override;
2677our $safe = new Safe "safe"; 3028our $safe = new Safe "safe";
2678our $safe_hole = new Safe::Hole; 3029our $safe_hole = new Safe::Hole;
2679 3030
2680$SIG{FPE} = 'IGNORE'; 3031$SIG{FPE} = 'IGNORE';
2681 3032
2682$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));
2683 3038
2684# here we export the classes and methods available to script code 3039# here we export the classes and methods available to script code
2685 3040
2686=pod 3041=pod
2687 3042
2688The following functions and methods are available within a safe environment: 3043The following functions and methods are available within a safe environment:
2689 3044
2690 cf::object 3045 cf::object
2691 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
2692 insert remove 3047 insert remove name archname title slaying race decrease_ob_nr
2693 3048
2694 cf::object::player 3049 cf::object::player
2695 player 3050 player
2696 3051
2697 cf::player 3052 cf::player
2702 3057
2703=cut 3058=cut
2704 3059
2705for ( 3060for (
2706 ["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
2707 insert remove)], 3063 decrease_ob_nr destroy)],
2708 ["cf::object::player" => qw(player)], 3064 ["cf::object::player" => qw(player)],
2709 ["cf::player" => qw(peaceful)], 3065 ["cf::player" => qw(peaceful)],
2710 ["cf::map" => qw(trigger)], 3066 ["cf::map" => qw(trigger)],
2711) { 3067) {
2712 no strict 'refs'; 3068 no strict 'refs';
2788# the server's init and main functions 3144# the server's init and main functions
2789 3145
2790sub load_facedata($) { 3146sub load_facedata($) {
2791 my ($path) = @_; 3147 my ($path) = @_;
2792 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
2793 warn "loading facedata from $path\n"; 3155 warn "loading facedata from $path\n";
2794 3156
2795 my $facedata; 3157 my $facedata;
2796 0 < aio_load $path, $facedata 3158 0 < aio_load $path, $facedata
2797 or die "$path: $!"; 3159 or die "$path: $!";
2799 $facedata = Coro::Storable::thaw $facedata; 3161 $facedata = Coro::Storable::thaw $facedata;
2800 3162
2801 $facedata->{version} == 2 3163 $facedata->{version} == 2
2802 or cf::cleanup "$path: version mismatch, cannot proceed."; 3164 or cf::cleanup "$path: version mismatch, cannot proceed.";
2803 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
2804 { 3173 {
2805 my $faces = $facedata->{faceinfo}; 3174 my $faces = $facedata->{faceinfo};
2806 3175
2807 while (my ($face, $info) = each %$faces) { 3176 while (my ($face, $info) = each %$faces) {
2808 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3177 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3178
2809 cf::face::set_visibility $idx, $info->{visibility}; 3179 cf::face::set_visibility $idx, $info->{visibility};
2810 cf::face::set_magicmap $idx, $info->{magicmap}; 3180 cf::face::set_magicmap $idx, $info->{magicmap};
2811 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3181 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2812 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3182 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2813 3183
2814 cf::cede_to_tick; 3184 cf::cede_to_tick;
2815 } 3185 }
2816 3186
2817 while (my ($face, $info) = each %$faces) { 3187 while (my ($face, $info) = each %$faces) {
2818 next unless $info->{smooth}; 3188 next unless $info->{smooth};
3189
2819 my $idx = cf::face::find $face 3190 my $idx = cf::face::find $face
2820 or next; 3191 or next;
3192
2821 if (my $smooth = cf::face::find $info->{smooth}) { 3193 if (my $smooth = cf::face::find $info->{smooth}) {
2822 cf::face::set_smooth $idx, $smooth; 3194 cf::face::set_smooth $idx, $smooth;
2823 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3195 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2824 } else { 3196 } else {
2825 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3197 warn "smooth face '$info->{smooth}' not found for face '$face'";
2842 3214
2843 { 3215 {
2844 # TODO: for gcfclient pleasure, we should give resources 3216 # TODO: for gcfclient pleasure, we should give resources
2845 # that gcfclient doesn't grok a >10000 face index. 3217 # that gcfclient doesn't grok a >10000 face index.
2846 my $res = $facedata->{resource}; 3218 my $res = $facedata->{resource};
2847 my $enc = JSON::XS->new->utf8->canonical;
2848 3219
2849 while (my ($name, $info) = each %$res) { 3220 while (my ($name, $info) = each %$res) {
2850 my $meta = $enc->encode ({ 3221 if (defined $info->{type}) {
2851 name => $name,
2852 type => $info->{type},
2853 copyright => $info->{copyright}, #TODO#
2854 });
2855
2856 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3222 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3223 my $data;
2857 3224
2858 if ($name =~ /\.jpg$/) { 3225 if ($info->{type} & 1) {
2859 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3226 # prepend meta info
2860 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};
2861 } else { 3240 } else {
2862 my $data = pack "(w/a*)*", $meta, $info->{data}; 3241 $RESOURCE{$name} = $info;
2863 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2864
2865 cf::face::set_type $idx, 1;
2866 cf::face::set_data $idx, 0, $data, $chk;
2867 } 3242 }
2868 3243
2869 cf::cede_to_tick; 3244 cf::cede_to_tick;
2870 } 3245 }
2871 } 3246 }
2872 3247
3248 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3249
2873 1 3250 1
2874} 3251}
2875 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
2876sub 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
2877 load_resource_file "$MAPDIR/regions" 3286 load_resource_file "$MAPDIR/regions"
2878 or die "unable to load regions file\n"; 3287 or die "unable to load regions file\n";
2879 3288
2880 for (cf::region::list) { 3289 for (cf::region::list) {
2881 $_->{match} = qr/$_->{match}/ 3290 $_->{match} = qr/$_->{match}/
2917 3326
2918sub init { 3327sub init {
2919 reload_resources; 3328 reload_resources;
2920} 3329}
2921 3330
2922sub cfg_load { 3331sub reload_config {
2923 open my $fh, "<:utf8", "$CONFDIR/config" 3332 open my $fh, "<:utf8", "$CONFDIR/config"
2924 or return; 3333 or return;
2925 3334
2926 local $/; 3335 local $/;
2927 *CFG = YAML::Syck::Load <$fh>; 3336 *CFG = YAML::Load <$fh>;
2928 3337
2929 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3338 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2930 3339
2931 $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};
2932 $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};
2943sub main { 3352sub main {
2944 # we must not ever block the main coroutine 3353 # we must not ever block the main coroutine
2945 local $Coro::idle = sub { 3354 local $Coro::idle = sub {
2946 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#
2947 (async { 3356 (async {
2948 Event::one_event; 3357 $Coro::current->{desc} = "IDLE BUG HANDLER";
3358 EV::loop EV::LOOP_ONESHOT;
2949 })->prio (Coro::PRIO_MAX); 3359 })->prio (Coro::PRIO_MAX);
2950 }; 3360 };
2951 3361
2952 cfg_load; 3362 reload_config;
2953 db_init; 3363 db_init;
2954 load_extensions; 3364 load_extensions;
2955 3365
2956 $TICK_WATCHER->start; 3366 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3367 evthread_start IO::AIO::poll_fileno;
2957 Event::loop; 3368 EV::loop;
2958} 3369}
2959 3370
2960############################################################################# 3371#############################################################################
2961# initialisation and cleanup 3372# initialisation and cleanup
2962 3373
2963# install some emergency cleanup handlers 3374# install some emergency cleanup handlers
2964BEGIN { 3375BEGIN {
3376 our %SIGWATCHER = ();
2965 for my $signal (qw(INT HUP TERM)) { 3377 for my $signal (qw(INT HUP TERM)) {
2966 Event->signal ( 3378 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2967 reentrant => 0,
2968 data => WF_AUTOCANCEL,
2969 signal => $signal,
2970 prio => 0,
2971 cb => sub {
2972 cf::cleanup "SIG$signal"; 3379 cf::cleanup "SIG$signal";
2973 },
2974 ); 3380 };
2975 } 3381 }
2976} 3382}
2977 3383
2978sub write_runtime { 3384sub write_runtime {
2979 my $runtime = "$LOCALDIR/runtime"; 3385 my $runtime = "$LOCALDIR/runtime";
3024 # and maps saved/destroyed asynchronously. 3430 # and maps saved/destroyed asynchronously.
3025 warn "begin emergency player save\n"; 3431 warn "begin emergency player save\n";
3026 for my $login (keys %cf::PLAYER) { 3432 for my $login (keys %cf::PLAYER) {
3027 my $pl = $cf::PLAYER{$login} or next; 3433 my $pl = $cf::PLAYER{$login} or next;
3028 $pl->valid or next; 3434 $pl->valid or next;
3435 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3029 $pl->save; 3436 $pl->save;
3030 } 3437 }
3031 warn "end emergency player save\n"; 3438 warn "end emergency player save\n";
3032 3439
3033 warn "begin emergency map save\n"; 3440 warn "begin emergency map save\n";
3072 warn "syncing database to disk"; 3479 warn "syncing database to disk";
3073 BDB::db_env_txn_checkpoint $DB_ENV; 3480 BDB::db_env_txn_checkpoint $DB_ENV;
3074 3481
3075 # 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
3076 3483
3077 warn "cancelling all WF_AUTOCANCEL watchers";
3078 for (Event::all_watchers) {
3079 $_->cancel if $_->data & WF_AUTOCANCEL;
3080 }
3081
3082 warn "flushing outstanding aio requests"; 3484 warn "flushing outstanding aio requests";
3083 for (;;) { 3485 for (;;) {
3084 BDB::flush; 3486 BDB::flush;
3085 IO::AIO::flush; 3487 IO::AIO::flush;
3086 Coro::cede; 3488 Coro::cede_notself;
3087 last unless IO::AIO::nreqs || BDB::nreqs; 3489 last unless IO::AIO::nreqs || BDB::nreqs;
3088 warn "iterate..."; 3490 warn "iterate...";
3089 } 3491 }
3090 3492
3091 ++$RELOAD; 3493 ++$RELOAD;
3150 warn "reloading cf.pm"; 3552 warn "reloading cf.pm";
3151 require cf; 3553 require cf;
3152 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3554 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3153 3555
3154 warn "loading config and database again"; 3556 warn "loading config and database again";
3155 cf::cfg_load; 3557 cf::reload_config;
3156 3558
3157 warn "loading extensions"; 3559 warn "loading extensions";
3158 cf::load_extensions; 3560 cf::load_extensions;
3159 3561
3160 warn "reattaching attachments to objects/players"; 3562 warn "reattaching attachments to objects/players";
3167 warn "leaving sync_job"; 3569 warn "leaving sync_job";
3168 3570
3169 1 3571 1
3170 } or do { 3572 } or do {
3171 warn $@; 3573 warn $@;
3172 warn "error while reloading, exiting."; 3574 cf::cleanup "error while reloading, exiting.";
3173 exit 1;
3174 }; 3575 };
3175 3576
3176 warn "reloaded"; 3577 warn "reloaded";
3177}; 3578};
3178 3579
3180 3581
3181sub reload_perl() { 3582sub reload_perl() {
3182 # doing reload synchronously and two reloads happen back-to-back, 3583 # doing reload synchronously and two reloads happen back-to-back,
3183 # coro crashes during coro_state_free->destroy here. 3584 # coro crashes during coro_state_free->destroy here.
3184 3585
3185 $RELOAD_WATCHER ||= Event->timer ( 3586 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3186 reentrant => 0,
3187 after => 0,
3188 data => WF_AUTOCANCEL,
3189 cb => sub {
3190 do_reload_perl; 3587 do_reload_perl;
3191 undef $RELOAD_WATCHER; 3588 undef $RELOAD_WATCHER;
3192 },
3193 ); 3589 };
3194} 3590}
3195 3591
3196register_command "reload" => sub { 3592register_command "reload" => sub {
3197 my ($who, $arg) = @_; 3593 my ($who, $arg) = @_;
3198 3594
3199 if ($who->flag (FLAG_WIZ)) { 3595 if ($who->flag (FLAG_WIZ)) {
3200 $who->message ("reloading server."); 3596 $who->message ("reloading server.");
3597 async {
3598 $Coro::current->{desc} = "perl_reload";
3201 async { reload_perl }; 3599 reload_perl;
3600 };
3202 } 3601 }
3203}; 3602};
3204 3603
3205unshift @INC, $LIBDIR; 3604unshift @INC, $LIBDIR;
3206 3605
3208 3607
3209our @WAIT_FOR_TICK; 3608our @WAIT_FOR_TICK;
3210our @WAIT_FOR_TICK_BEGIN; 3609our @WAIT_FOR_TICK_BEGIN;
3211 3610
3212sub wait_for_tick { 3611sub wait_for_tick {
3213 return unless $TICK_WATCHER->is_active; 3612 return if tick_inhibit;
3214 return if $Coro::current == $Coro::main; 3613 return if $Coro::current == $Coro::main;
3215 3614
3216 my $signal = new Coro::Signal; 3615 my $signal = new Coro::Signal;
3217 push @WAIT_FOR_TICK, $signal; 3616 push @WAIT_FOR_TICK, $signal;
3218 $signal->wait; 3617 $signal->wait;
3219} 3618}
3220 3619
3221sub wait_for_tick_begin { 3620sub wait_for_tick_begin {
3222 return unless $TICK_WATCHER->is_active; 3621 return if tick_inhibit;
3223 return if $Coro::current == $Coro::main; 3622 return if $Coro::current == $Coro::main;
3224 3623
3225 my $signal = new Coro::Signal; 3624 my $signal = new Coro::Signal;
3226 push @WAIT_FOR_TICK_BEGIN, $signal; 3625 push @WAIT_FOR_TICK_BEGIN, $signal;
3227 $signal->wait; 3626 $signal->wait;
3228} 3627}
3229 3628
3230 my $min = 1e6;#d# 3629sub tick {
3231 my $avg = 10;
3232$TICK_WATCHER = Event->timer (
3233 reentrant => 0,
3234 parked => 1,
3235 prio => 0,
3236 at => $NEXT_TICK || $TICK,
3237 data => WF_AUTOCANCEL,
3238 cb => sub {
3239 if ($Coro::current != $Coro::main) { 3630 if ($Coro::current != $Coro::main) {
3240 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"
3241 unless ++$bug_warning > 10; 3632 unless ++$bug_warning > 10;
3242 return; 3633 return;
3243 } 3634 }
3244 3635
3245 $NOW = $tick_start = Event::time;
3246
3247 cf::server_tick; # one server iteration 3636 cf::server_tick; # one server iteration
3248 3637
3249 0 && sync_job {#d# 3638 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3250 for(1..10) { 3639 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3251 my $t = Event::time; 3640 Coro::async_pool {
3252 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3641 $Coro::current->{desc} = "runtime saver";
3253 or die; 3642 write_runtime
3254 3643 or warn "ERROR: unable to write runtime file: $!";
3255 $map->width (50);
3256 $map->height (50);
3257 $map->alloc;
3258 $map->_load_objects ("/tmp/x.map", 1);
3259 my $t = Event::time - $t;
3260
3261 #next unless $t < 0.0013;#d#
3262 if ($t < $min) {
3263 $min = $t;
3264 }
3265 $avg = $avg * 0.99 + $t * 0.01;
3266 }
3267 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3268 exit 0;
3269 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3270 }; 3644 };
3645 }
3271 3646
3272 $RUNTIME += $TICK;
3273 $NEXT_TICK += $TICK;
3274
3275 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3276 $NEXT_RUNTIME_WRITE = $NOW + 10;
3277 Coro::async_pool {
3278 write_runtime
3279 or warn "ERROR: unable to write runtime file: $!";
3280 };
3281 }
3282
3283# my $AFTER = Event::time;
3284# warn $AFTER - $NOW;#d#
3285
3286 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3647 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3287 $sig->send; 3648 $sig->send;
3288 } 3649 }
3289 while (my $sig = shift @WAIT_FOR_TICK) { 3650 while (my $sig = shift @WAIT_FOR_TICK) {
3290 $sig->send; 3651 $sig->send;
3291 } 3652 }
3292 3653
3293 $NOW = Event::time; 3654 $LOAD = ($NOW - $TICK_START) / $TICK;
3294
3295 # if we are delayed by four ticks or more, skip them all
3296 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3297
3298 $TICK_WATCHER->at ($NEXT_TICK);
3299 $TICK_WATCHER->start;
3300
3301 $LOAD = ($NOW - $tick_start) / $TICK;
3302 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3655 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3303 3656
3304 _post_tick; 3657 if (0) {
3305 3658 if ($NEXT_TICK) {
3306 3659 my $jitter = $TICK_START - $NEXT_TICK;
3660 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3661 warn "jitter $JITTER\n";#d#
3662 }
3307 }, 3663 }
3308); 3664}
3309 3665
3310{ 3666{
3311 BDB::max_poll_time $TICK * 0.1; 3667 # configure BDB
3312 $BDB_POLL_WATCHER = Event->io ( 3668
3313 reentrant => 0,
3314 fd => BDB::poll_fileno,
3315 poll => 'r',
3316 prio => 0,
3317 data => WF_AUTOCANCEL,
3318 cb => \&BDB::poll_cb,
3319 );
3320 BDB::min_parallel 8; 3669 BDB::min_parallel 8;
3321 3670 BDB::max_poll_reqs $TICK * 0.1;
3322 BDB::set_sync_prepare { 3671 $Coro::BDB::WATCHER->priority (1);
3323 my $status;
3324 my $current = $Coro::current;
3325 (
3326 sub {
3327 $status = $!;
3328 $current->ready; undef $current;
3329 },
3330 sub {
3331 Coro::schedule while defined $current;
3332 $! = $status;
3333 },
3334 )
3335 };
3336 3672
3337 unless ($DB_ENV) { 3673 unless ($DB_ENV) {
3338 $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);
3339 3679
3340 cf::sync_job { 3680 cf::sync_job {
3341 eval { 3681 eval {
3342 BDB::db_env_open 3682 BDB::db_env_open
3343 $DB_ENV, 3683 $DB_ENV,
3345 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
3346 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3686 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3347 0666; 3687 0666;
3348 3688
3349 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3689 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3350
3351 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3352 $DB_ENV->set_lk_detect;
3353 }; 3690 };
3354 3691
3355 cf::cleanup "db_env_open(db): $@" if $@; 3692 cf::cleanup "db_env_open(db): $@" if $@;
3356 }; 3693 };
3357 } 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 };
3358} 3705}
3359 3706
3360{ 3707{
3708 # configure IO::AIO
3709
3361 IO::AIO::min_parallel 8; 3710 IO::AIO::min_parallel 8;
3362
3363 undef $Coro::AIO::WATCHER;
3364 IO::AIO::max_poll_time $TICK * 0.1; 3711 IO::AIO::max_poll_time $TICK * 0.1;
3365 $AIO_POLL_WATCHER = Event->io ( 3712 $Coro::AIO::WATCHER->priority (1);
3366 reentrant => 0,
3367 data => WF_AUTOCANCEL,
3368 fd => IO::AIO::poll_fileno,
3369 poll => 'r',
3370 prio => 6,
3371 cb => \&IO::AIO::poll_cb,
3372 );
3373} 3713}
3374 3714
3375my $_log_backtrace; 3715my $_log_backtrace;
3376 3716
3377sub _log_backtrace { 3717sub _log_backtrace {
3381 3721
3382 # limit the # of concurrent backtraces 3722 # limit the # of concurrent backtraces
3383 if ($_log_backtrace < 2) { 3723 if ($_log_backtrace < 2) {
3384 ++$_log_backtrace; 3724 ++$_log_backtrace;
3385 async { 3725 async {
3726 $Coro::current->{desc} = "abt $msg";
3727
3386 my @bt = fork_call { 3728 my @bt = fork_call {
3387 @addr = map { sprintf "%x", $_ } @addr; 3729 @addr = map { sprintf "%x", $_ } @addr;
3388 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3730 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3389 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 |"
3390 or die "addr2line: $!"; 3732 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines