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.313 by root, Sun Jul 22 14:17:58 2007 UTC vs.
Revision 1.413 by root, Sun Apr 6 16:13:20 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.32 ();
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
923#
924 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#
925sub _can_merge { 1048sub _can_merge {
926 my ($ob1, $ob2) = @_; 1049 my ($ob1, $ob2) = @_;
927 1050
928 local $Storable::canonical = 1; 1051 ++$SLOW_MERGES;#d#
929 my $fob1 = Storable::freeze $ob1;
930 my $fob2 = Storable::freeze $ob2;
931 1052
932 $fob1 eq $fob2 1053 # we do the slow way here
1054 return _object_equal $ob1, $ob2
933} 1055}
934 1056
935sub reattach { 1057sub reattach {
936 # basically do the same as instantiate, without calling instantiate 1058 # basically do the same as instantiate, without calling instantiate
937 my ($obj) = @_; 1059 my ($obj) = @_;
959cf::attachable->attach ( 1081cf::attachable->attach (
960 prio => -1000000, 1082 prio => -1000000,
961 on_instantiate => sub { 1083 on_instantiate => sub {
962 my ($obj, $data) = @_; 1084 my ($obj, $data) = @_;
963 1085
964 $data = from_json $data; 1086 $data = decode_json $data;
965 1087
966 for (@$data) { 1088 for (@$data) {
967 my ($name, $args) = @$_; 1089 my ($name, $args) = @$_;
968 1090
969 $obj->attach ($name, %{$args || {} }); 1091 $obj->attach ($name, %{$args || {} });
985sub object_freezer_save { 1107sub object_freezer_save {
986 my ($filename, $rdata, $objs) = @_; 1108 my ($filename, $rdata, $objs) = @_;
987 1109
988 sync_job { 1110 sync_job {
989 if (length $$rdata) { 1111 if (length $$rdata) {
1112 utf8::decode (my $decname = $filename);
990 warn sprintf "saving %s (%d,%d)\n", 1113 warn sprintf "saving %s (%d,%d)\n",
991 $filename, length $$rdata, scalar @$objs; 1114 $decname, length $$rdata, scalar @$objs;
992 1115
993 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1116 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
994 chmod SAVE_MODE, $fh; 1117 chmod SAVE_MODE, $fh;
995 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1118 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
996 aio_fsync $fh if $cf::USE_FSYNC; 1119 aio_fsync $fh if $cf::USE_FSYNC;
997 close $fh; 1120 close $fh;
998 1121
999 if (@$objs) { 1122 if (@$objs) {
1000 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) {
1001 chmod SAVE_MODE, $fh; 1124 chmod SAVE_MODE, $fh;
1002 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1125 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1003 aio_write $fh, 0, (length $data), $data, 0; 1126 aio_write $fh, 0, (length $data), $data, 0;
1004 aio_fsync $fh if $cf::USE_FSYNC; 1127 aio_fsync $fh if $cf::USE_FSYNC;
1005 close $fh; 1128 close $fh;
1006 aio_rename "$filename.pst~", "$filename.pst"; 1129 aio_rename "$filename.pst~", "$filename.pst";
1007 } 1130 }
1015 } 1138 }
1016 } else { 1139 } else {
1017 aio_unlink $filename; 1140 aio_unlink $filename;
1018 aio_unlink "$filename.pst"; 1141 aio_unlink "$filename.pst";
1019 } 1142 }
1020 } 1143 };
1021} 1144}
1022 1145
1023sub object_freezer_as_string { 1146sub object_freezer_as_string {
1024 my ($rdata, $objs) = @_; 1147 my ($rdata, $objs) = @_;
1025 1148
1037 or return; 1160 or return;
1038 1161
1039 unless (aio_stat "$filename.pst") { 1162 unless (aio_stat "$filename.pst") {
1040 (aio_load "$filename.pst", $av) >= 0 1163 (aio_load "$filename.pst", $av) >= 0
1041 or return; 1164 or return;
1165
1042 $av = eval { (Storable::thaw $av)->{objs} }; 1166 my $st = eval { Coro::Storable::thaw $av };
1167 $av = $st->{objs};
1043 } 1168 }
1044 1169
1170 utf8::decode (my $decname = $filename);
1045 warn sprintf "loading %s (%d)\n", 1171 warn sprintf "loading %s (%d,%d)\n",
1046 $filename, length $data, scalar @{$av || []}; 1172 $decname, length $data, scalar @{$av || []};
1173
1047 return ($data, $av); 1174 ($data, $av)
1048} 1175}
1049 1176
1050=head2 COMMAND CALLBACKS 1177=head2 COMMAND CALLBACKS
1051 1178
1052=over 4 1179=over 4
1125 my ($pl, $buf) = @_; 1252 my ($pl, $buf) = @_;
1126 1253
1127 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1254 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1128 1255
1129 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
1130 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1264 if (my $cb = $EXTCMD{$type}) {
1131 if (my %reply = $cb->($pl, $msg)) { 1265 @reply = $cb->($pl, @payload);
1132 $pl->ext_reply ($msg->{msgid}, %reply);
1133 }
1134 } 1266 }
1267
1268 $pl->ext_reply ($reply, @reply)
1269 if $reply;
1270
1135 } else { 1271 } else {
1136 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1272 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1137 } 1273 }
1138 1274
1139 cf::override; 1275 cf::override;
1192 my $msg = $@ ? "$v->{path}: $@\n" 1328 my $msg = $@ ? "$v->{path}: $@\n"
1193 : "$v->{base}: extension inactive.\n"; 1329 : "$v->{base}: extension inactive.\n";
1194 1330
1195 if (exists $v->{meta}{mandatory}) { 1331 if (exists $v->{meta}{mandatory}) {
1196 warn $msg; 1332 warn $msg;
1197 warn "mandatory extension failed to load, exiting.\n"; 1333 cf::cleanup "mandatory extension failed to load, exiting.";
1198 exit 1;
1199 } 1334 }
1200 1335
1201 warn $msg; 1336 warn $msg;
1202 } 1337 }
1203 1338
1228use Coro::AIO; 1363use Coro::AIO;
1229 1364
1230=head3 cf::player 1365=head3 cf::player
1231 1366
1232=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}
1233 1382
1234=item cf::player::find $login 1383=item cf::player::find $login
1235 1384
1236Returns the given player object, loading it if necessary (might block). 1385Returns the given player object, loading it if necessary (might block).
1237 1386
1273 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1422 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1274 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1423 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1275 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1424 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1276 aio_unlink +(playerdir $login) . "/$login.pl"; 1425 aio_unlink +(playerdir $login) . "/$login.pl";
1277 1426
1278 my $pl = load_pl path $login 1427 my $f = new_from_file cf::object::thawer path $login
1279 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;
1280 $cf::PLAYER{$login} = $pl 1434 $cf::PLAYER{$login} = $pl
1281 } 1435 }
1282 } 1436 }
1283} 1437}
1284 1438
1294 1448
1295 aio_mkdir playerdir $pl, 0770; 1449 aio_mkdir playerdir $pl, 0770;
1296 $pl->{last_save} = $cf::RUNTIME; 1450 $pl->{last_save} = $cf::RUNTIME;
1297 1451
1298 $pl->save_pl ($path); 1452 $pl->save_pl ($path);
1299 Coro::cede; 1453 cf::cede_to_tick;
1300} 1454}
1301 1455
1302sub new($) { 1456sub new($) {
1303 my ($login) = @_; 1457 my ($login) = @_;
1304 1458
1308 $self->{deny_save} = 1; 1462 $self->{deny_save} = 1;
1309 1463
1310 $cf::PLAYER{$login} = $self; 1464 $cf::PLAYER{$login} = $self;
1311 1465
1312 $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 (@_);
1313} 1477}
1314 1478
1315=item $pl->quit_character 1479=item $pl->quit_character
1316 1480
1317Nukes the player without looking back. If logged in, the connection will 1481Nukes the player without looking back. If logged in, the connection will
1372 or return []; 1536 or return [];
1373 1537
1374 my @logins; 1538 my @logins;
1375 1539
1376 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") {
1377 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1545 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1378 aio_read $fh, 0, 512, my $buf, 0 or next; 1546 aio_read $fh, 0, 512, my $buf, 0 or next;
1379 $buf !~ /^password -------------$/m or next; # official not-valid tag 1547 $buf !~ /^password -------------$/m or next; # official not-valid tag
1548 }
1380 1549
1381 utf8::decode $login; 1550 utf8::decode $login;
1382 push @logins, $login; 1551 push @logins, $login;
1383 } 1552 }
1384 1553
1417 1586
1418Expand crossfire pod fragments into protocol xml. 1587Expand crossfire pod fragments into protocol xml.
1419 1588
1420=cut 1589=cut
1421 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
1422sub expand_cfpod { 1602sub expand_cfpod {
1423 ((my $self), (local $_)) = @_; 1603 my ($self, $pod) = @_;
1424 1604
1425 # escape & and < 1605 my $xml;
1426 s/&/&amp;/g;
1427 s/(?<![BIUGH])</&lt;/g;
1428 1606
1429 # this is buggy, it needs to properly take care of nested <'s 1607 while () {
1608 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1609 $group = $1;
1430 1610
1431 1 while 1611 $group =~ s/&/&amp;/g;
1432 # replace B<>, I<>, U<> etc. 1612 $group =~ s/</&lt;/g;
1433 s/B<([^\>]*)>/<b>$1<\/b>/ 1613
1434 || s/I<([^\>]*)>/<i>$1<\/i>/ 1614 $xml .= $group;
1435 || s/U<([^\>]*)>/<u>$1<\/u>/ 1615 } elsif ($pod =~ m%\G
1436 # replace G<male|female> tags 1616 ([BCGHITU])
1437 || s{G<([^>|]*)\|([^>]*)>}{ 1617 <
1438 $self->gender ? $2 : $1 1618 (?:
1439 }ge 1619 ([^<>]*) (?{ $group = $^N })
1440 # replace H<hint text> 1620 | < $interior >
1441 || s{H<([^\>]*)>} 1621 )
1622 >
1623 %gcsx
1442 { 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") {
1443 ("<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>",
1444 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1643 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1445 "") 1644 "")
1446 [$self->{hintmode}] 1645 [$self->{hintmode}];
1646 } else {
1647 $xml .= "error processing '$code($data)' directive";
1447 }ge; 1648 }
1649 } else {
1650 if ($pod =~ /\G(.+)/) {
1651 warn "parse error while expanding $pod (at $1)";
1652 }
1653 last;
1654 }
1655 }
1448 1656
1657 for ($xml) {
1449 # create single paragraphs (very hackish) 1658 # create single paragraphs (very hackish)
1450 s/(?<=\S)\n(?=\w)/ /g; 1659 s/(?<=\S)\n(?=\w)/ /g;
1451 1660
1452 # compress some whitespace 1661 # compress some whitespace
1453 s/\s+\n/\n/g; # ws line-ends 1662 s/\s+\n/\n/g; # ws line-ends
1454 s/\n\n+/\n/g; # double lines 1663 s/\n\n+/\n/g; # double lines
1455 s/^\n+//; # beginning lines 1664 s/^\n+//; # beginning lines
1456 s/\n+$//; # ending lines 1665 s/\n+$//; # ending lines
1666 }
1457 1667
1458 $_ 1668 $xml
1459} 1669}
1670
1671no re 'eval';
1460 1672
1461sub hintmode { 1673sub hintmode {
1462 $_[0]{hintmode} = $_[1] if @_ > 1; 1674 $_[0]{hintmode} = $_[1] if @_ > 1;
1463 $_[0]{hintmode} 1675 $_[0]{hintmode}
1464} 1676}
1465 1677
1466=item $player->ext_reply ($msgid, %msg) 1678=item $player->ext_reply ($msgid, @msg)
1467 1679
1468Sends an ext reply to the player. 1680Sends an ext reply to the player.
1469 1681
1470=cut 1682=cut
1471 1683
1472sub ext_reply($$%) { 1684sub ext_reply($$@) {
1473 my ($self, $id, %msg) = @_; 1685 my ($self, $id, @msg) = @_;
1474 1686
1475 $msg{msgid} = $id; 1687 $self->ns->ext_reply ($id, @msg)
1476 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1477} 1688}
1478 1689
1479=item $player->ext_event ($type, %msg) 1690=item $player->ext_msg ($type, @msg)
1480 1691
1481Sends an ext event to the client. 1692Sends an ext event to the client.
1482 1693
1483=cut 1694=cut
1484 1695
1485sub ext_event($$%) { 1696sub ext_msg($$@) {
1486 my ($self, $type, %msg) = @_; 1697 my ($self, $type, @msg) = @_;
1487 1698
1488 $self->ns->ext_event ($type, %msg); 1699 $self->ns->ext_msg ($type, @msg);
1489} 1700}
1490 1701
1491=head3 cf::region 1702=head3 cf::region
1492 1703
1493=over 4 1704=over 4
1709 1920
1710sub load_header_from($) { 1921sub load_header_from($) {
1711 my ($self, $path) = @_; 1922 my ($self, $path) = @_;
1712 1923
1713 utf8::encode $path; 1924 utf8::encode $path;
1714 #aio_open $path, O_RDONLY, 0 1925 my $f = new_from_file cf::object::thawer $path
1715 # or return;
1716
1717 $self->_load_header ($path)
1718 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;
1719 1933
1720 $self->{load_path} = $path; 1934 $self->{load_path} = $path;
1721 1935
1722 1 1936 1
1723} 1937}
1777sub find { 1991sub find {
1778 my ($path, $origin) = @_; 1992 my ($path, $origin) = @_;
1779 1993
1780 $path = normalise $path, $origin && $origin->path; 1994 $path = normalise $path, $origin && $origin->path;
1781 1995
1996 cf::lock_wait "map_data:$path";#d#remove
1782 cf::lock_wait "map_find:$path"; 1997 cf::lock_wait "map_find:$path";
1783 1998
1784 $cf::MAP{$path} || do { 1999 $cf::MAP{$path} || do {
1785 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
1786 my $map = new_from_path cf::map $path 2003 my $map = new_from_path cf::map $path
1787 or return; 2004 or return;
1788 2005
1789 $map->{last_save} = $cf::RUNTIME; 2006 $map->{last_save} = $cf::RUNTIME;
1790 2007
1792 or return; 2009 or return;
1793 2010
1794 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2011 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1795 # doing this can freeze the server in a sync job, obviously 2012 # doing this can freeze the server in a sync job, obviously
1796 #$cf::WAIT_FOR_TICK->wait; 2013 #$cf::WAIT_FOR_TICK->wait;
2014 undef $guard1;
2015 undef $guard2;
1797 $map->reset; 2016 $map->reset;
1798 undef $guard;
1799 return find $path; 2017 return find $path;
1800 } 2018 }
1801 2019
1802 $cf::MAP{$path} = $map 2020 $cf::MAP{$path} = $map
1803 } 2021 }
1812 local $self->{deny_reset} = 1; # loading can take a long time 2030 local $self->{deny_reset} = 1; # loading can take a long time
1813 2031
1814 my $path = $self->{path}; 2032 my $path = $self->{path};
1815 2033
1816 { 2034 {
1817 my $guard = cf::lock_acquire "map_load:$path"; 2035 my $guard = cf::lock_acquire "map_data:$path";
1818 2036
2037 return unless $self->valid;
1819 return if $self->in_memory != cf::MAP_SWAPPED; 2038 return unless $self->in_memory == cf::MAP_SWAPPED;
1820 2039
1821 $self->in_memory (cf::MAP_LOADING); 2040 $self->in_memory (cf::MAP_LOADING);
1822 2041
1823 $self->alloc; 2042 $self->alloc;
1824 2043
1825 $self->pre_load; 2044 $self->pre_load;
1826 Coro::cede; 2045 cf::cede_to_tick;
1827 2046
2047 my $f = new_from_file cf::object::thawer $self->{load_path};
2048 $f->skip_block;
1828 $self->_load_objects ($self->{load_path}, 1) 2049 $self->_load_objects ($f)
1829 or return; 2050 or return;
1830 2051
1831 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2052 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1832 if delete $self->{load_original}; 2053 if delete $self->{load_original};
1833 2054
1834 if (my $uniq = $self->uniq_path) { 2055 if (my $uniq = $self->uniq_path) {
1835 utf8::encode $uniq; 2056 utf8::encode $uniq;
1836 if (aio_open $uniq, O_RDONLY, 0) { 2057 unless (aio_stat $uniq) {
2058 if (my $f = new_from_file cf::object::thawer $uniq) {
1837 $self->clear_unique_items; 2059 $self->clear_unique_items;
1838 $self->_load_objects ($uniq, 0); 2060 $self->_load_objects ($f);
2061 $f->resolve_delayed_derefs;
2062 }
1839 } 2063 }
1840 } 2064 }
1841 2065
1842 Coro::cede; 2066 $f->resolve_delayed_derefs;
2067
2068 cf::cede_to_tick;
1843 # now do the right thing for maps 2069 # now do the right thing for maps
1844 $self->link_multipart_objects; 2070 $self->link_multipart_objects;
1845 $self->difficulty ($self->estimate_difficulty) 2071 $self->difficulty ($self->estimate_difficulty)
1846 unless $self->difficulty; 2072 unless $self->difficulty;
1847 Coro::cede; 2073 cf::cede_to_tick;
1848 2074
1849 unless ($self->{deny_activate}) { 2075 unless ($self->{deny_activate}) {
1850 $self->decay_objects; 2076 $self->decay_objects;
1851 $self->fix_auto_apply; 2077 $self->fix_auto_apply;
1852 $self->update_buttons; 2078 $self->update_buttons;
1853 Coro::cede; 2079 cf::cede_to_tick;
1854 $self->set_darkness_map; 2080 $self->set_darkness_map;
1855 Coro::cede; 2081 cf::cede_to_tick;
1856 $self->activate; 2082 $self->activate;
1857 } 2083 }
2084
2085 $self->{last_save} = $cf::RUNTIME;
2086 $self->last_access ($cf::RUNTIME);
1858 2087
1859 $self->in_memory (cf::MAP_IN_MEMORY); 2088 $self->in_memory (cf::MAP_IN_MEMORY);
1860 } 2089 }
1861 2090
1862 $self->post_load; 2091 $self->post_load;
1873 2102
1874 $self 2103 $self
1875} 2104}
1876 2105
1877# 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
1878sub load_diag { 2107sub load_neighbours {
1879 my ($map) = @_; 2108 my ($map) = @_;
1880 2109
1881 my @diag; # diagonal neighbours 2110 my @neigh; # diagonal neighbours
1882 2111
1883 for (0 .. 3) { 2112 for (0 .. 3) {
1884 my $neigh = $map->tile_path ($_) 2113 my $neigh = $map->tile_path ($_)
1885 or next; 2114 or next;
1886 $neigh = find $neigh, $map 2115 $neigh = find $neigh, $map
1887 or next; 2116 or next;
1888 $neigh->load; 2117 $neigh->load;
1889 2118
2119 push @neigh,
1890 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2120 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1891 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2121 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1892 } 2122 }
1893 2123
1894 for (@diag) { 2124 for (grep defined $_->[0], @neigh) {
2125 my ($path, $origin) = @$_;
1895 my $neigh = find @$_ 2126 my $neigh = find $path, $origin
1896 or next; 2127 or next;
1897 $neigh->load; 2128 $neigh->load;
1898 } 2129 }
1899} 2130}
1900 2131
1905} 2136}
1906 2137
1907sub do_load_sync { 2138sub do_load_sync {
1908 my ($map) = @_; 2139 my ($map) = @_;
1909 2140
2141 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2142 if $Coro::current == $Coro::main;
2143
1910 cf::sync_job { $map->load }; 2144 cf::sync_job { $map->load };
1911} 2145}
1912 2146
1913our %MAP_PREFETCH; 2147our %MAP_PREFETCH;
1914our $MAP_PREFETCHER = undef; 2148our $MAP_PREFETCHER = undef;
1915 2149
1916sub find_async { 2150sub find_async {
1917 my ($path, $origin) = @_; 2151 my ($path, $origin, $load) = @_;
1918 2152
1919 $path = normalise $path, $origin && $origin->{path}; 2153 $path = normalise $path, $origin && $origin->{path};
1920 2154
1921 if (my $map = $cf::MAP{$path}) { 2155 if (my $map = $cf::MAP{$path}) {
1922 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2156 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1923 } 2157 }
1924 2158
1925 undef $MAP_PREFETCH{$path}; 2159 $MAP_PREFETCH{$path} |= $load;
2160
1926 $MAP_PREFETCHER ||= cf::async { 2161 $MAP_PREFETCHER ||= cf::async {
2162 $Coro::current->{desc} = "map prefetcher";
2163
1927 while (%MAP_PREFETCH) { 2164 while (%MAP_PREFETCH) {
1928 for my $path (keys %MAP_PREFETCH) { 2165 while (my ($k, $v) = each %MAP_PREFETCH) {
1929 if (my $map = find $path) { 2166 if (my $map = find $k) {
1930 $map->load; 2167 $map->load if $v;
1931 } 2168 }
1932 2169
1933 delete $MAP_PREFETCH{$path}; 2170 delete $MAP_PREFETCH{$k};
1934 } 2171 }
1935 } 2172 }
1936 undef $MAP_PREFETCHER; 2173 undef $MAP_PREFETCHER;
1937 }; 2174 };
1938 $MAP_PREFETCHER->prio (6); 2175 $MAP_PREFETCHER->prio (6);
1941} 2178}
1942 2179
1943sub save { 2180sub save {
1944 my ($self) = @_; 2181 my ($self) = @_;
1945 2182
1946 my $lock = cf::lock_acquire "map_data:" . $self->path; 2183 my $lock = cf::lock_acquire "map_data:$self->{path}";
1947 2184
1948 $self->{last_save} = $cf::RUNTIME; 2185 $self->{last_save} = $cf::RUNTIME;
1949 2186
1950 return unless $self->dirty; 2187 return unless $self->dirty;
1951 2188
1957 return if $self->{deny_save}; 2194 return if $self->{deny_save};
1958 2195
1959 local $self->{last_access} = $self->last_access;#d# 2196 local $self->{last_access} = $self->last_access;#d#
1960 2197
1961 cf::async { 2198 cf::async {
2199 $Coro::current->{desc} = "map player save";
1962 $_->contr->save for $self->players; 2200 $_->contr->save for $self->players;
1963 }; 2201 };
1964 2202
1965 if ($uniq) { 2203 if ($uniq) {
1966 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1974 my ($self) = @_; 2212 my ($self) = @_;
1975 2213
1976 # save first because save cedes 2214 # save first because save cedes
1977 $self->save; 2215 $self->save;
1978 2216
1979 my $lock = cf::lock_acquire "map_data:" . $self->path; 2217 my $lock = cf::lock_acquire "map_data:$self->{path}";
1980 2218
1981 return if $self->players; 2219 return if $self->players;
1982 return if $self->in_memory != cf::MAP_IN_MEMORY; 2220 return if $self->in_memory != cf::MAP_IN_MEMORY;
1983 return if $self->{deny_save}; 2221 return if $self->{deny_save};
1984 2222
2223 $self->in_memory (cf::MAP_SWAPPED);
2224
2225 $self->deactivate;
2226 $_->clear_links_to ($self) for values %cf::MAP;
1985 $self->clear; 2227 $self->clear;
1986 $self->in_memory (cf::MAP_SWAPPED);
1987} 2228}
1988 2229
1989sub reset_at { 2230sub reset_at {
1990 my ($self) = @_; 2231 my ($self) = @_;
1991 2232
2023 if $uniq; 2264 if $uniq;
2024 } 2265 }
2025 2266
2026 delete $cf::MAP{$self->path}; 2267 delete $cf::MAP{$self->path};
2027 2268
2269 $self->deactivate;
2270 $_->clear_links_to ($self) for values %cf::MAP;
2028 $self->clear; 2271 $self->clear;
2029
2030 $_->clear_links_to ($self) for values %cf::MAP;
2031 2272
2032 $self->unlink_save; 2273 $self->unlink_save;
2033 $self->destroy; 2274 $self->destroy;
2034} 2275}
2035 2276
2036my $nuke_counter = "aaaa"; 2277my $nuke_counter = "aaaa";
2037 2278
2038sub nuke { 2279sub nuke {
2039 my ($self) = @_; 2280 my ($self) = @_;
2040 2281
2282 {
2283 my $lock = cf::lock_acquire "map_data:$self->{path}";
2284
2041 delete $cf::MAP{$self->path}; 2285 delete $cf::MAP{$self->path};
2042 2286
2043 $self->unlink_save; 2287 $self->unlink_save;
2044 2288
2045 bless $self, "cf::map"; 2289 bless $self, "cf::map";
2046 delete $self->{deny_reset}; 2290 delete $self->{deny_reset};
2047 $self->{deny_save} = 1; 2291 $self->{deny_save} = 1;
2048 $self->reset_timeout (1); 2292 $self->reset_timeout (1);
2049 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2293 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2050 2294
2051 $cf::MAP{$self->path} = $self; 2295 $cf::MAP{$self->path} = $self;
2296 }
2052 2297
2053 $self->reset; # polite request, might not happen 2298 $self->reset; # polite request, might not happen
2054} 2299}
2055 2300
2056=item $maps = cf::map::tmp_maps 2301=item $maps = cf::map::tmp_maps
2132 2377
2133sub inv_recursive { 2378sub inv_recursive {
2134 inv_recursive_ inv $_[0] 2379 inv_recursive_ inv $_[0]
2135} 2380}
2136 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
2137package cf; 2410package cf;
2138 2411
2139=back 2412=back
2140 2413
2141=head3 cf::object::player 2414=head3 cf::object::player
2163 2436
2164 } else { 2437 } else {
2165 my $pl = $self->contr; 2438 my $pl = $self->contr;
2166 2439
2167 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2440 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2168 my $diag = $pl->{npc_dialog}; 2441 my $dialog = $pl->{npc_dialog};
2169 $diag->{pl}->ext_reply ( 2442 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2170 $diag->{id},
2171 msgtype => "reply",
2172 msg => $diag->{pl}->expand_cfpod ($msg),
2173 add_topics => []
2174 );
2175 2443
2176 } else { 2444 } else {
2177 $msg = $npc->name . " says: $msg" if $npc; 2445 $msg = $npc->name . " says: $msg" if $npc;
2178 $self->message ($msg, $flags); 2446 $self->message ($msg, $flags);
2179 } 2447 }
2180 } 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 (@_);
2181} 2459}
2182 2460
2183=item $player_object->may ("access") 2461=item $player_object->may ("access")
2184 2462
2185Returns wether the given player is authorized to access resource "access" 2463Returns wether the given player is authorized to access resource "access"
2264 # use -1 or undef as default coordinates, not 0, 0 2542 # use -1 or undef as default coordinates, not 0, 0
2265 ($x, $y) = ($map->enter_x, $map->enter_y) 2543 ($x, $y) = ($map->enter_x, $map->enter_y)
2266 if $x <=0 && $y <= 0; 2544 if $x <=0 && $y <= 0;
2267 2545
2268 $map->load; 2546 $map->load;
2269 $map->load_diag; 2547 $map->load_neighbours;
2270 2548
2271 return unless $self->contr->active; 2549 return unless $self->contr->active;
2272 $self->activate_recursive; 2550 $self->activate_recursive;
2273 2551
2274 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2552 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2294 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2572 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2295 2573
2296 $self->enter_link; 2574 $self->enter_link;
2297 2575
2298 (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
2299 my $map = eval { 2598 my $map = eval {
2300 my $map = cf::map::find $path; 2599 my $map = defined $path ? cf::map::find $path : undef;
2301 2600
2302 if ($map) { 2601 if ($map) {
2303 $map = $map->customise_for ($self); 2602 $map = $map->customise_for ($self);
2304 $map = $check->($map) if $check && $map; 2603 $map = $check->($map) if $check && $map;
2305 } else { 2604 } else {
2306 $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);
2307 } 2606 }
2308 2607
2309 $map 2608 $map
2310 }; 2609 };
2311 2610
2364 $rmp->{origin_y} = $exit->y; 2663 $rmp->{origin_y} = $exit->y;
2365 } 2664 }
2366 2665
2367 $rmp->{random_seed} ||= $exit->random_seed; 2666 $rmp->{random_seed} ||= $exit->random_seed;
2368 2667
2369 my $data = cf::to_json $rmp; 2668 my $data = cf::encode_json $rmp;
2370 my $md5 = Digest::MD5::md5_hex $data; 2669 my $md5 = Digest::MD5::md5_hex $data;
2371 my $meta = "$RANDOMDIR/$md5.meta"; 2670 my $meta = "$RANDOMDIR/$md5.meta";
2372 2671
2373 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2672 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2374 aio_write $fh, 0, (length $data), $data, 0; 2673 aio_write $fh, 0, (length $data), $data, 0;
2401 # if exit is damned, update players death & WoR home-position 2700 # if exit is damned, update players death & WoR home-position
2402 $self->contr->savebed ($slaying, $hp, $sp) 2701 $self->contr->savebed ($slaying, $hp, $sp)
2403 if $exit->flag (FLAG_DAMNED); 2702 if $exit->flag (FLAG_DAMNED);
2404 2703
2405 (async { 2704 (async {
2705 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2706
2406 $self->deactivate_recursive; # just to be sure 2707 $self->deactivate_recursive; # just to be sure
2407 unless (eval { 2708 unless (eval {
2408 $self->goto ($slaying, $hp, $sp); 2709 $self->goto ($slaying, $hp, $sp);
2409 2710
2410 1; 2711 1;
2445the 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
2446the message unless the client supports the msg packet. 2747the message unless the client supports the msg packet.
2447 2748
2448=cut 2749=cut
2449 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
2450sub cf::client::send_msg { 2803sub cf::client::send_msg {
2451 my ($self, $channel, $msg, $color, @extra) = @_; 2804 my ($self, $channel, $msg, $color, @extra) = @_;
2452 2805
2453 $msg = $self->pl->expand_cfpod ($msg); 2806 $msg = $self->pl->expand_cfpod ($msg);
2454 2807
2455 $color &= ~cf::NDI_UNIQUE; # just in case... 2808 $color &= cf::NDI_CLIENT_MASK; # just in case...
2456 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
2457 if (ref $channel) { 2819 } elsif (ref $channel) {
2458 # send meta info to client, if not yet sent 2820 # send meta info to client, if not yet sent
2459 unless (exists $self->{channel}{$channel->{id}}) { 2821 unless (exists $self->{channel}{$channel->{id}}) {
2460 $self->{channel}{$channel->{id}} = $channel; 2822 $self->{channel}{$channel->{id}} = $channel;
2461 $self->ext_event (channel_info => %$channel); 2823 $self->ext_msg (channel_info => $channel)
2824 if $self->can_msg;
2462 } 2825 }
2463 2826
2464 $channel = $channel->{id}; 2827 $channel = $channel->{id};
2465 } 2828 }
2466 2829
2467 return unless @extra || length $msg; 2830 return unless @extra || length $msg;
2468 2831
2469 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
2470 $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]));
2471 } else { 2839 } else {
2472 # replace some tags by gcfclient-compatible ones
2473 for ($msg) {
2474 1 while
2475 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2476 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2477 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2478 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2479 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2480 }
2481
2482 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
2483 if (0 && $msg =~ /\[/) { 2855 if (0 && $msg =~ /\[/) {
2856 # COMMAND/INFO
2484 $self->send_packet ("drawextinfo $color 4 0 $msg") 2857 $self->send_packet ("drawextinfo $color 10 8 $msg")
2485 } else { 2858 } else {
2486 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2859 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2487 $self->send_packet ("drawinfo $color $msg") 2860 $self->send_packet ("drawinfo $color $msg")
2488 } 2861 }
2489 } 2862 }
2490 } 2863 }
2491} 2864}
2492 2865
2493=item $client->ext_event ($type, %msg) 2866=item $client->ext_msg ($type, @msg)
2494 2867
2495Sends an ext event to the client. 2868Sends an ext event to the client.
2496 2869
2497=cut 2870=cut
2498 2871
2499sub cf::client::ext_event($$%) { 2872sub cf::client::ext_msg($$@) {
2500 my ($self, $type, %msg) = @_; 2873 my ($self, $type, @msg) = @_;
2501 2874
2502 return unless $self->extcmd; 2875 if ($self->extcmd == 2) {
2503 2876 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2877 } elsif ($self->extcmd == 1) { # TODO: remove
2504 $msg{msgtype} = "event_$type"; 2878 push @msg, msgtype => "event_$type";
2505 $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 }
2506} 2899}
2507 2900
2508=item $success = $client->query ($flags, "text", \&cb) 2901=item $success = $client->query ($flags, "text", \&cb)
2509 2902
2510Queues a query to the client, calling the given callback with 2903Queues a query to the client, calling the given callback with
2565 my ($ns, $buf) = @_; 2958 my ($ns, $buf) = @_;
2566 2959
2567 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2960 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2568 2961
2569 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
2570 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2970 if (my $cb = $EXTICMD{$type}) {
2571 if (my %reply = $cb->($ns, $msg)) { 2971 @reply = $cb->($ns, @payload);
2572 $reply{msgid} = $msg->{msgid};
2573 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2574 }
2575 } 2972 }
2973
2974 $ns->ext_reply ($reply, @reply)
2975 if $reply;
2976
2576 } else { 2977 } else {
2577 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";
2578 } 2979 }
2579 2980
2580 cf::override; 2981 cf::override;
2627our $safe = new Safe "safe"; 3028our $safe = new Safe "safe";
2628our $safe_hole = new Safe::Hole; 3029our $safe_hole = new Safe::Hole;
2629 3030
2630$SIG{FPE} = 'IGNORE'; 3031$SIG{FPE} = 'IGNORE';
2631 3032
2632$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));
2633 3038
2634# here we export the classes and methods available to script code 3039# here we export the classes and methods available to script code
2635 3040
2636=pod 3041=pod
2637 3042
2638The following functions and methods are available within a safe environment: 3043The following functions and methods are available within a safe environment:
2639 3044
2640 cf::object 3045 cf::object
2641 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
2642 insert remove 3047 insert remove name archname title slaying race decrease_ob_nr
2643 3048
2644 cf::object::player 3049 cf::object::player
2645 player 3050 player
2646 3051
2647 cf::player 3052 cf::player
2652 3057
2653=cut 3058=cut
2654 3059
2655for ( 3060for (
2656 ["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
2657 insert remove)], 3063 decrease_ob_nr destroy)],
2658 ["cf::object::player" => qw(player)], 3064 ["cf::object::player" => qw(player)],
2659 ["cf::player" => qw(peaceful)], 3065 ["cf::player" => qw(peaceful)],
2660 ["cf::map" => qw(trigger)], 3066 ["cf::map" => qw(trigger)],
2661) { 3067) {
2662 no strict 'refs'; 3068 no strict 'refs';
2738# the server's init and main functions 3144# the server's init and main functions
2739 3145
2740sub load_facedata($) { 3146sub load_facedata($) {
2741 my ($path) = @_; 3147 my ($path) = @_;
2742 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
2743 warn "loading facedata from $path\n"; 3155 warn "loading facedata from $path\n";
2744 3156
2745 my $facedata; 3157 my $facedata;
2746 0 < aio_load $path, $facedata 3158 0 < aio_load $path, $facedata
2747 or die "$path: $!"; 3159 or die "$path: $!";
2749 $facedata = Coro::Storable::thaw $facedata; 3161 $facedata = Coro::Storable::thaw $facedata;
2750 3162
2751 $facedata->{version} == 2 3163 $facedata->{version} == 2
2752 or cf::cleanup "$path: version mismatch, cannot proceed."; 3164 or cf::cleanup "$path: version mismatch, cannot proceed.";
2753 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
2754 { 3173 {
2755 my $faces = $facedata->{faceinfo}; 3174 my $faces = $facedata->{faceinfo};
2756 3175
2757 while (my ($face, $info) = each %$faces) { 3176 while (my ($face, $info) = each %$faces) {
2758 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3177 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3178
2759 cf::face::set_visibility $idx, $info->{visibility}; 3179 cf::face::set_visibility $idx, $info->{visibility};
2760 cf::face::set_magicmap $idx, $info->{magicmap}; 3180 cf::face::set_magicmap $idx, $info->{magicmap};
2761 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3181 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2762 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3182 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2763 3183
2764 cf::cede_to_tick; 3184 cf::cede_to_tick;
2765 } 3185 }
2766 3186
2767 while (my ($face, $info) = each %$faces) { 3187 while (my ($face, $info) = each %$faces) {
2768 next unless $info->{smooth}; 3188 next unless $info->{smooth};
3189
2769 my $idx = cf::face::find $face 3190 my $idx = cf::face::find $face
2770 or next; 3191 or next;
3192
2771 if (my $smooth = cf::face::find $info->{smooth}) { 3193 if (my $smooth = cf::face::find $info->{smooth}) {
2772 cf::face::set_smooth $idx, $smooth; 3194 cf::face::set_smooth $idx, $smooth;
2773 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3195 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2774 } else { 3196 } else {
2775 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3197 warn "smooth face '$info->{smooth}' not found for face '$face'";
2792 3214
2793 { 3215 {
2794 # TODO: for gcfclient pleasure, we should give resources 3216 # TODO: for gcfclient pleasure, we should give resources
2795 # that gcfclient doesn't grok a >10000 face index. 3217 # that gcfclient doesn't grok a >10000 face index.
2796 my $res = $facedata->{resource}; 3218 my $res = $facedata->{resource};
2797 my $enc = JSON::XS->new->utf8->canonical;
2798 3219
2799 while (my ($name, $info) = each %$res) { 3220 while (my ($name, $info) = each %$res) {
2800 my $meta = $enc->encode ({ 3221 if (defined $info->{type}) {
2801 name => $name,
2802 type => $info->{type},
2803 copyright => $info->{copyright}, #TODO#
2804 });
2805
2806 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3222 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3223 my $data;
2807 3224
2808 if ($name =~ /\.jpg$/) { 3225 if ($info->{type} & 1) {
2809 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3226 # prepend meta info
2810 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};
2811 } else { 3240 } else {
2812 my $data = pack "(w/a*)*", $meta, $info->{data}; 3241 $RESOURCE{$name} = $info;
2813 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2814
2815 cf::face::set_type $idx, 1;
2816 cf::face::set_data $idx, 0, $data, $chk;
2817 } 3242 }
2818 3243
2819 cf::cede_to_tick; 3244 cf::cede_to_tick;
2820 } 3245 }
2821 } 3246 }
2822 3247
3248 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3249
2823 1 3250 1
2824} 3251}
2825 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
2826sub 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
2827 load_resource_file "$MAPDIR/regions" 3286 load_resource_file "$MAPDIR/regions"
2828 or die "unable to load regions file\n"; 3287 or die "unable to load regions file\n";
2829 3288
2830 for (cf::region::list) { 3289 for (cf::region::list) {
2831 $_->{match} = qr/$_->{match}/ 3290 $_->{match} = qr/$_->{match}/
2867 3326
2868sub init { 3327sub init {
2869 reload_resources; 3328 reload_resources;
2870} 3329}
2871 3330
2872sub cfg_load { 3331sub reload_config {
2873 open my $fh, "<:utf8", "$CONFDIR/config" 3332 open my $fh, "<:utf8", "$CONFDIR/config"
2874 or return; 3333 or return;
2875 3334
2876 local $/; 3335 local $/;
2877 *CFG = YAML::Syck::Load <$fh>; 3336 *CFG = YAML::Load <$fh>;
2878 3337
2879 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3338 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2880 3339
2881 $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};
2882 $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};
2893sub main { 3352sub main {
2894 # we must not ever block the main coroutine 3353 # we must not ever block the main coroutine
2895 local $Coro::idle = sub { 3354 local $Coro::idle = sub {
2896 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#
2897 (async { 3356 (async {
2898 Event::one_event; 3357 $Coro::current->{desc} = "IDLE BUG HANDLER";
3358 EV::loop EV::LOOP_ONESHOT;
2899 })->prio (Coro::PRIO_MAX); 3359 })->prio (Coro::PRIO_MAX);
2900 }; 3360 };
2901 3361
2902 cfg_load; 3362 reload_config;
2903 db_init; 3363 db_init;
2904 load_extensions; 3364 load_extensions;
2905 3365
2906 $TICK_WATCHER->start; 3366 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3367 evthread_start IO::AIO::poll_fileno;
2907 Event::loop; 3368 EV::loop;
2908} 3369}
2909 3370
2910############################################################################# 3371#############################################################################
2911# initialisation and cleanup 3372# initialisation and cleanup
2912 3373
2913# install some emergency cleanup handlers 3374# install some emergency cleanup handlers
2914BEGIN { 3375BEGIN {
3376 our %SIGWATCHER = ();
2915 for my $signal (qw(INT HUP TERM)) { 3377 for my $signal (qw(INT HUP TERM)) {
2916 Event->signal ( 3378 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2917 reentrant => 0,
2918 data => WF_AUTOCANCEL,
2919 signal => $signal,
2920 prio => 0,
2921 cb => sub {
2922 cf::cleanup "SIG$signal"; 3379 cf::cleanup "SIG$signal";
2923 },
2924 ); 3380 };
2925 } 3381 }
2926} 3382}
2927 3383
2928sub write_runtime { 3384sub write_runtime {
2929 my $runtime = "$LOCALDIR/runtime"; 3385 my $runtime = "$LOCALDIR/runtime";
2974 # and maps saved/destroyed asynchronously. 3430 # and maps saved/destroyed asynchronously.
2975 warn "begin emergency player save\n"; 3431 warn "begin emergency player save\n";
2976 for my $login (keys %cf::PLAYER) { 3432 for my $login (keys %cf::PLAYER) {
2977 my $pl = $cf::PLAYER{$login} or next; 3433 my $pl = $cf::PLAYER{$login} or next;
2978 $pl->valid or next; 3434 $pl->valid or next;
3435 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2979 $pl->save; 3436 $pl->save;
2980 } 3437 }
2981 warn "end emergency player save\n"; 3438 warn "end emergency player save\n";
2982 3439
2983 warn "begin emergency map save\n"; 3440 warn "begin emergency map save\n";
3022 warn "syncing database to disk"; 3479 warn "syncing database to disk";
3023 BDB::db_env_txn_checkpoint $DB_ENV; 3480 BDB::db_env_txn_checkpoint $DB_ENV;
3024 3481
3025 # 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
3026 3483
3027 warn "cancelling all WF_AUTOCANCEL watchers";
3028 for (Event::all_watchers) {
3029 $_->cancel if $_->data & WF_AUTOCANCEL;
3030 }
3031
3032 warn "flushing outstanding aio requests"; 3484 warn "flushing outstanding aio requests";
3033 for (;;) { 3485 for (;;) {
3034 BDB::flush; 3486 BDB::flush;
3035 IO::AIO::flush; 3487 IO::AIO::flush;
3036 Coro::cede; 3488 Coro::cede_notself;
3037 last unless IO::AIO::nreqs || BDB::nreqs; 3489 last unless IO::AIO::nreqs || BDB::nreqs;
3038 warn "iterate..."; 3490 warn "iterate...";
3039 } 3491 }
3040 3492
3041 ++$RELOAD; 3493 ++$RELOAD;
3100 warn "reloading cf.pm"; 3552 warn "reloading cf.pm";
3101 require cf; 3553 require cf;
3102 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3554 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3103 3555
3104 warn "loading config and database again"; 3556 warn "loading config and database again";
3105 cf::cfg_load; 3557 cf::reload_config;
3106 3558
3107 warn "loading extensions"; 3559 warn "loading extensions";
3108 cf::load_extensions; 3560 cf::load_extensions;
3109 3561
3110 warn "reattaching attachments to objects/players"; 3562 warn "reattaching attachments to objects/players";
3117 warn "leaving sync_job"; 3569 warn "leaving sync_job";
3118 3570
3119 1 3571 1
3120 } or do { 3572 } or do {
3121 warn $@; 3573 warn $@;
3122 warn "error while reloading, exiting."; 3574 cf::cleanup "error while reloading, exiting.";
3123 exit 1;
3124 }; 3575 };
3125 3576
3126 warn "reloaded"; 3577 warn "reloaded";
3127}; 3578};
3128 3579
3130 3581
3131sub reload_perl() { 3582sub reload_perl() {
3132 # doing reload synchronously and two reloads happen back-to-back, 3583 # doing reload synchronously and two reloads happen back-to-back,
3133 # coro crashes during coro_state_free->destroy here. 3584 # coro crashes during coro_state_free->destroy here.
3134 3585
3135 $RELOAD_WATCHER ||= Event->timer ( 3586 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3136 reentrant => 0,
3137 after => 0,
3138 data => WF_AUTOCANCEL,
3139 cb => sub {
3140 do_reload_perl; 3587 do_reload_perl;
3141 undef $RELOAD_WATCHER; 3588 undef $RELOAD_WATCHER;
3142 },
3143 ); 3589 };
3144} 3590}
3145 3591
3146register_command "reload" => sub { 3592register_command "reload" => sub {
3147 my ($who, $arg) = @_; 3593 my ($who, $arg) = @_;
3148 3594
3149 if ($who->flag (FLAG_WIZ)) { 3595 if ($who->flag (FLAG_WIZ)) {
3150 $who->message ("reloading server."); 3596 $who->message ("reloading server.");
3597 async {
3598 $Coro::current->{desc} = "perl_reload";
3151 async { reload_perl }; 3599 reload_perl;
3600 };
3152 } 3601 }
3153}; 3602};
3154 3603
3155unshift @INC, $LIBDIR; 3604unshift @INC, $LIBDIR;
3156 3605
3158 3607
3159our @WAIT_FOR_TICK; 3608our @WAIT_FOR_TICK;
3160our @WAIT_FOR_TICK_BEGIN; 3609our @WAIT_FOR_TICK_BEGIN;
3161 3610
3162sub wait_for_tick { 3611sub wait_for_tick {
3163 return unless $TICK_WATCHER->is_active; 3612 return if tick_inhibit;
3164 return if $Coro::current == $Coro::main; 3613 return if $Coro::current == $Coro::main;
3165 3614
3166 my $signal = new Coro::Signal; 3615 my $signal = new Coro::Signal;
3167 push @WAIT_FOR_TICK, $signal; 3616 push @WAIT_FOR_TICK, $signal;
3168 $signal->wait; 3617 $signal->wait;
3169} 3618}
3170 3619
3171sub wait_for_tick_begin { 3620sub wait_for_tick_begin {
3172 return unless $TICK_WATCHER->is_active; 3621 return if tick_inhibit;
3173 return if $Coro::current == $Coro::main; 3622 return if $Coro::current == $Coro::main;
3174 3623
3175 my $signal = new Coro::Signal; 3624 my $signal = new Coro::Signal;
3176 push @WAIT_FOR_TICK_BEGIN, $signal; 3625 push @WAIT_FOR_TICK_BEGIN, $signal;
3177 $signal->wait; 3626 $signal->wait;
3178} 3627}
3179 3628
3180 my $min = 1e6;#d# 3629sub tick {
3181 my $avg = 10;
3182$TICK_WATCHER = Event->timer (
3183 reentrant => 0,
3184 parked => 1,
3185 prio => 0,
3186 at => $NEXT_TICK || $TICK,
3187 data => WF_AUTOCANCEL,
3188 cb => sub {
3189 if ($Coro::current != $Coro::main) { 3630 if ($Coro::current != $Coro::main) {
3190 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"
3191 unless ++$bug_warning > 10; 3632 unless ++$bug_warning > 10;
3192 return; 3633 return;
3193 } 3634 }
3194 3635
3195 $NOW = $tick_start = Event::time;
3196
3197 cf::server_tick; # one server iteration 3636 cf::server_tick; # one server iteration
3198 3637
3199 0 && sync_job {#d# 3638 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3200 for(1..10) { 3639 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3201 my $t = Event::time; 3640 Coro::async_pool {
3202 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3641 $Coro::current->{desc} = "runtime saver";
3203 or die; 3642 write_runtime
3204 3643 or warn "ERROR: unable to write runtime file: $!";
3205 $map->width (50);
3206 $map->height (50);
3207 $map->alloc;
3208 $map->_load_objects ("/tmp/x.map", 1);
3209 my $t = Event::time - $t;
3210
3211 #next unless $t < 0.0013;#d#
3212 if ($t < $min) {
3213 $min = $t;
3214 }
3215 $avg = $avg * 0.99 + $t * 0.01;
3216 }
3217 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3218 exit 0;
3219 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3220 }; 3644 };
3645 }
3221 3646
3222 $RUNTIME += $TICK;
3223 $NEXT_TICK += $TICK;
3224
3225 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3226 $NEXT_RUNTIME_WRITE = $NOW + 10;
3227 Coro::async_pool {
3228 write_runtime
3229 or warn "ERROR: unable to write runtime file: $!";
3230 };
3231 }
3232
3233# my $AFTER = Event::time;
3234# warn $AFTER - $NOW;#d#
3235
3236 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3647 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3237 $sig->send; 3648 $sig->send;
3238 } 3649 }
3239 while (my $sig = shift @WAIT_FOR_TICK) { 3650 while (my $sig = shift @WAIT_FOR_TICK) {
3240 $sig->send; 3651 $sig->send;
3241 } 3652 }
3242 3653
3243 $NOW = Event::time; 3654 $LOAD = ($NOW - $TICK_START) / $TICK;
3244
3245 # if we are delayed by four ticks or more, skip them all
3246 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3247
3248 $TICK_WATCHER->at ($NEXT_TICK);
3249 $TICK_WATCHER->start;
3250
3251 $LOAD = ($NOW - $tick_start) / $TICK;
3252 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3655 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3253 3656
3254 _post_tick; 3657 if (0) {
3255 3658 if ($NEXT_TICK) {
3256 3659 my $jitter = $TICK_START - $NEXT_TICK;
3660 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3661 warn "jitter $JITTER\n";#d#
3662 }
3257 }, 3663 }
3258); 3664}
3259 3665
3260{ 3666{
3261 BDB::max_poll_time $TICK * 0.1; 3667 # configure BDB
3262 $BDB_POLL_WATCHER = Event->io ( 3668
3263 reentrant => 0,
3264 fd => BDB::poll_fileno,
3265 poll => 'r',
3266 prio => 0,
3267 data => WF_AUTOCANCEL,
3268 cb => \&BDB::poll_cb,
3269 );
3270 BDB::min_parallel 8; 3669 BDB::min_parallel 8;
3271 3670 BDB::max_poll_reqs $TICK * 0.1;
3272 BDB::set_sync_prepare { 3671 $Coro::BDB::WATCHER->priority (1);
3273 my $status;
3274 my $current = $Coro::current;
3275 (
3276 sub {
3277 $status = $!;
3278 $current->ready; undef $current;
3279 },
3280 sub {
3281 Coro::schedule while defined $current;
3282 $! = $status;
3283 },
3284 )
3285 };
3286 3672
3287 unless ($DB_ENV) { 3673 unless ($DB_ENV) {
3288 $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);
3289 3679
3290 cf::sync_job { 3680 cf::sync_job {
3291 eval { 3681 eval {
3292 BDB::db_env_open 3682 BDB::db_env_open
3293 $DB_ENV, 3683 $DB_ENV,
3295 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
3296 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3686 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3297 0666; 3687 0666;
3298 3688
3299 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3689 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3300
3301 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3302 $DB_ENV->set_lk_detect;
3303 }; 3690 };
3304 3691
3305 cf::cleanup "db_env_open(db): $@" if $@; 3692 cf::cleanup "db_env_open(db): $@" if $@;
3306 }; 3693 };
3307 } 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 };
3308} 3705}
3309 3706
3310{ 3707{
3708 # configure IO::AIO
3709
3311 IO::AIO::min_parallel 8; 3710 IO::AIO::min_parallel 8;
3312
3313 undef $Coro::AIO::WATCHER;
3314 IO::AIO::max_poll_time $TICK * 0.1; 3711 IO::AIO::max_poll_time $TICK * 0.1;
3315 $AIO_POLL_WATCHER = Event->io ( 3712 $Coro::AIO::WATCHER->priority (1);
3316 reentrant => 0,
3317 data => WF_AUTOCANCEL,
3318 fd => IO::AIO::poll_fileno,
3319 poll => 'r',
3320 prio => 6,
3321 cb => \&IO::AIO::poll_cb,
3322 );
3323} 3713}
3324 3714
3325my $_log_backtrace; 3715my $_log_backtrace;
3326 3716
3327sub _log_backtrace { 3717sub _log_backtrace {
3331 3721
3332 # limit the # of concurrent backtraces 3722 # limit the # of concurrent backtraces
3333 if ($_log_backtrace < 2) { 3723 if ($_log_backtrace < 2) {
3334 ++$_log_backtrace; 3724 ++$_log_backtrace;
3335 async { 3725 async {
3726 $Coro::current->{desc} = "abt $msg";
3727
3336 my @bt = fork_call { 3728 my @bt = fork_call {
3337 @addr = map { sprintf "%x", $_ } @addr; 3729 @addr = map { sprintf "%x", $_ } @addr;
3338 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3730 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3339 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 |"
3340 or die "addr2line: $!"; 3732 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines