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.265 by root, Fri May 11 08:00:00 2007 UTC vs.
Revision 1.404 by root, Mon Dec 17 07:27:58 2007 UTC

… …
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable; 9use EV 1.86;
10use Event;
11use Opcode; 10use Opcode;
12use Safe; 11use Safe;
13use Safe::Hole; 12use Safe::Hole;
13use Storable ();
14 14
15use Coro 3.61 (); 15use Coro 4.32 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::EV;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::BDB;
23use Coro::Storable; 24use Coro::Storable;
25use Coro::Util ();
24 26
27use JSON::XS 2.01 ();
25use BDB (); 28use BDB ();
26use Data::Dumper; 29use Data::Dumper;
27use Digest::MD5; 30use Digest::MD5;
28use Fcntl; 31use Fcntl;
29use YAML::Syck (); 32use YAML::Syck ();
30use IO::AIO 2.32 (); 33use IO::AIO 2.51 ();
31use Time::HiRes; 34use Time::HiRes;
32use Compress::LZF; 35use Compress::LZF;
36use Digest::MD5 ();
33 37
34# configure various modules to our taste 38# configure various modules to our taste
35# 39#
36$Storable::canonical = 1; # reduce rsync transfers 40$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39 43
40$Event::Eval = 1; # no idea why this is required, but it is
41
42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
43$YAML::Syck::ImplicitUnicode = 1; 45$YAML::Syck::ImplicitUnicode = 1;
44 46
45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46 48
… …
49our %COMMAND = (); 51our %COMMAND = ();
50our %COMMAND_TIME = (); 52our %COMMAND_TIME = ();
51 53
52our @EXTS = (); # list of extension package names 54our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 55our %EXTCMD = ();
56our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 57our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 58our %EXT_MAP = (); # pluggable maps
56 59
57our $RELOAD; # number of reloads so far 60our $RELOAD; # number of reloads so far
58our @EVENT; 61our @EVENT;
… …
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
73our $TICK_WATCHER; 76our $TICK_WATCHER;
74our $AIO_POLL_WATCHER; 77our $AIO_POLL_WATCHER;
75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
76our $NEXT_TICK; 79our $NEXT_TICK;
77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 80our $USE_FSYNC = 1; # use fsync to write maps - default off
79 81
80our $BDB_POLL_WATCHER; 82our $BDB_POLL_WATCHER;
83our $BDB_DEADLOCK_WATCHER;
84our $BDB_CHECKPOINT_WATCHER;
85our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 86our $DB_ENV;
82 87
83our %CFG; 88our %CFG;
84 89
85our $UPTIME; $UPTIME ||= time; 90our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 91our $RUNTIME;
92our $NOW;
87 93
88our %PLAYER; # all users 94our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 95our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 96our $LINK_MAP; # the special {link} map, which is always available
91 97
92# used to convert map paths into valid unix filenames by replacing / by ∕ 98# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 99our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 100
… …
155 161
156The raw value load value from the last tick. 162The raw value load value from the last tick.
157 163
158=item %cf::CFG 164=item %cf::CFG
159 165
160Configuration for the server, loaded from C</etc/crossfire/config>, or 166Configuration for the server, loaded from C</etc/deliantra-server/config>, or
161from wherever your confdir points to. 167from wherever your confdir points to.
162 168
163=item cf::wait_for_tick, cf::wait_for_tick_begin 169=item cf::wait_for_tick, cf::wait_for_tick_begin
164 170
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 171These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
166returns directly I<after> the tick processing (and consequently, can only wake one process 172returns directly I<after> the tick processing (and consequently, can only wake one process
167per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 173per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168 174
175=item @cf::INVOKE_RESULTS
176
177This array contains the results of the last C<invoke ()> call. When
178C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
179that call.
180
169=back 181=back
170 182
171=cut 183=cut
172 184
173BEGIN { 185BEGIN {
… …
177 $msg .= "\n" 189 $msg .= "\n"
178 unless $msg =~ /\n$/; 190 unless $msg =~ /\n$/;
179 191
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 192 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181 193
182 utf8::encode $msg;
183 LOG llevError, $msg; 194 LOG llevError, $msg;
184 }; 195 };
185} 196}
186 197
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 199@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 200@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 201@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
191@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 202@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
203@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
192@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 204@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
193 205
194# we bless all objects into (empty) derived classes to force a method lookup 206# we bless all objects into (empty) derived classes to force a method lookup
195# within the Safe compartment. 207# within the Safe compartment.
196for my $pkg (qw( 208for my $pkg (qw(
197 cf::global cf::attachable 209 cf::global cf::attachable
… …
202)) { 214)) {
203 no strict 'refs'; 215 no strict 'refs';
204 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
205} 217}
206 218
207$Event::DIED = sub { 219$EV::DIED = sub {
208 warn "error in event callback: @_"; 220 warn "error in event callback: @_";
209}; 221};
222
223#############################################################################
210 224
211=head2 UTILITY FUNCTIONS 225=head2 UTILITY FUNCTIONS
212 226
213=over 4 227=over 4
214 228
… …
233 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 247 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
234 $d 248 $d
235 } || "[unable to dump $_[0]: '$@']"; 249 } || "[unable to dump $_[0]: '$@']";
236} 250}
237 251
238use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
239
240=item $ref = cf::from_json $json 252=item $ref = cf::decode_json $json
241 253
242Converts a JSON string into the corresponding perl data structure. 254Converts a JSON string into the corresponding perl data structure.
243 255
244=item $json = cf::to_json $ref 256=item $json = cf::encode_json $ref
245 257
246Converts a perl data structure into its JSON representation. 258Converts a perl data structure into its JSON representation.
259
260=cut
261
262our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
263
264sub encode_json($) { $json_coder->encode ($_[0]) }
265sub decode_json($) { $json_coder->decode ($_[0]) }
247 266
248=item cf::lock_wait $string 267=item cf::lock_wait $string
249 268
250Wait until the given lock is available. See cf::lock_acquire. 269Wait until the given lock is available. See cf::lock_acquire.
251 270
… …
254Wait until the given lock is available and then acquires it and returns 273Wait until the given lock is available and then acquires it and returns
255a Coro::guard object. If the guard object gets destroyed (goes out of scope, 274a Coro::guard object. If the guard object gets destroyed (goes out of scope,
256for example when the coroutine gets canceled), the lock is automatically 275for example when the coroutine gets canceled), the lock is automatically
257returned. 276returned.
258 277
278Locks are *not* recursive, locking from the same coro twice results in a
279deadlocked coro.
280
259Lock names should begin with a unique identifier (for example, cf::map::find 281Lock names should begin with a unique identifier (for example, cf::map::find
260uses map_find and cf::map::load uses map_load). 282uses map_find and cf::map::load uses map_load).
261 283
262=item $locked = cf::lock_active $string 284=item $locked = cf::lock_active $string
263 285
264Return true if the lock is currently active, i.e. somebody has locked it. 286Return true if the lock is currently active, i.e. somebody has locked it.
265 287
266=cut 288=cut
267 289
268our %LOCK; 290our %LOCK;
291our %LOCKER;#d#
269 292
270sub lock_wait($) { 293sub lock_wait($) {
271 my ($key) = @_; 294 my ($key) = @_;
295
296 if ($LOCKER{$key} == $Coro::current) {#d#
297 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
298 return;#d#
299 }#d#
272 300
273 # wait for lock, if any 301 # wait for lock, if any
274 while ($LOCK{$key}) { 302 while ($LOCK{$key}) {
275 push @{ $LOCK{$key} }, $Coro::current; 303 push @{ $LOCK{$key} }, $Coro::current;
276 Coro::schedule; 304 Coro::schedule;
… …
282 310
283 # wait, to be sure we are not locked 311 # wait, to be sure we are not locked
284 lock_wait $key; 312 lock_wait $key;
285 313
286 $LOCK{$key} = []; 314 $LOCK{$key} = [];
315 $LOCKER{$key} = $Coro::current;#d#
287 316
288 Coro::guard { 317 Coro::guard {
318 delete $LOCKER{$key};#d#
289 # wake up all waiters, to be on the safe side 319 # wake up all waiters, to be on the safe side
290 $_->ready for @{ delete $LOCK{$key} }; 320 $_->ready for @{ delete $LOCK{$key} };
291 } 321 }
292} 322}
293 323
… …
305 }; 335 };
306 $TICK_WATCHER->stop; 336 $TICK_WATCHER->stop;
307 $guard 337 $guard
308} 338}
309 339
340=item cf::periodic $interval, $cb
341
342Like EV::periodic, but randomly selects a starting point so that the actions
343get spread over timer.
344
345=cut
346
347sub periodic($$) {
348 my ($interval, $cb) = @_;
349
350 my $start = rand List::Util::min 180, $interval;
351
352 EV::periodic $start, $interval, 0, $cb
353}
354
355=item cf::get_slot $time[, $priority[, $name]]
356
357Allocate $time seconds of blocking CPU time at priority C<$priority>:
358This call blocks and returns only when you have at least C<$time> seconds
359of cpu time till the next tick. The slot is only valid till the next cede.
360
361The optional C<$name> can be used to identify the job to run. It might be
362used for statistical purposes and should identify the same time-class.
363
364Useful for short background jobs.
365
366=cut
367
368our @SLOT_QUEUE;
369our $SLOT_QUEUE;
370
371$SLOT_QUEUE->cancel if $SLOT_QUEUE;
372$SLOT_QUEUE = Coro::async {
373 $Coro::current->desc ("timeslot manager");
374
375 my $signal = new Coro::Signal;
376
377 while () {
378 next_job:
379 my $avail = cf::till_tick;
380 if ($avail > 0.01) {
381 for (0 .. $#SLOT_QUEUE) {
382 if ($SLOT_QUEUE[$_][0] < $avail) {
383 my $job = splice @SLOT_QUEUE, $_, 1, ();
384 $job->[2]->send;
385 Coro::cede;
386 goto next_job;
387 }
388 }
389 }
390
391 if (@SLOT_QUEUE) {
392 # we do not use wait_for_tick() as it returns immediately when tick is inactive
393 push @cf::WAIT_FOR_TICK, $signal;
394 $signal->wait;
395 } else {
396 Coro::schedule;
397 }
398 }
399};
400
401sub get_slot($;$$) {
402 my ($time, $pri, $name) = @_;
403
404 $time = $TICK * .6 if $time > $TICK * .6;
405 my $sig = new Coro::Signal;
406
407 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
408 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
409 $SLOT_QUEUE->ready;
410 $sig->wait;
411}
412
310=item cf::async { BLOCK } 413=item cf::async { BLOCK }
311 414
312Currently the same as Coro::async_pool, meaning you cannot use 415Currently the same as Coro::async_pool, meaning you cannot use
313C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 416C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
314thing you are allowed to do is call C<prio> on it. 417thing you are allowed to do is call C<prio> on it.
… …
317 420
318BEGIN { *async = \&Coro::async_pool } 421BEGIN { *async = \&Coro::async_pool }
319 422
320=item cf::sync_job { BLOCK } 423=item cf::sync_job { BLOCK }
321 424
322The design of crossfire+ requires that the main coro ($Coro::main) is 425The design of Deliantra requires that the main coroutine ($Coro::main)
323always able to handle events or runnable, as crossfire+ is only partly 426is always able to handle events or runnable, as Deliantra is only
324reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 427partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
428acceptable.
325 429
326If it must be done, put the blocking parts into C<sync_job>. This will run 430If it must be done, put the blocking parts into C<sync_job>. This will run
327the given BLOCK in another coroutine while waiting for the result. The 431the given BLOCK in another coroutine while waiting for the result. The
328server will be frozen during this time, so the block should either finish 432server will be frozen during this time, so the block should either finish
329fast or be very important. 433fast or be very important.
… …
332 436
333sub sync_job(&) { 437sub sync_job(&) {
334 my ($job) = @_; 438 my ($job) = @_;
335 439
336 if ($Coro::current == $Coro::main) { 440 if ($Coro::current == $Coro::main) {
337 my $time = Event::time; 441 my $time = EV::time;
338 442
339 # this is the main coro, too bad, we have to block 443 # this is the main coro, too bad, we have to block
340 # till the operation succeeds, freezing the server :/ 444 # till the operation succeeds, freezing the server :/
341 445
446 LOG llevError, Carp::longmess "sync job";#d#
447
342 # TODO: use suspend/resume instead 448 # TODO: use suspend/resume instead
343 # (but this is cancel-safe) 449 # (but this is cancel-safe)
344 my $freeze_guard = freeze_mainloop; 450 my $freeze_guard = freeze_mainloop;
345 451
346 my $busy = 1; 452 my $busy = 1;
347 my @res; 453 my @res;
348 454
349 (async { 455 (async {
456 $Coro::current->desc ("sync job coro");
350 @res = eval { $job->() }; 457 @res = eval { $job->() };
351 warn $@ if $@; 458 warn $@ if $@;
352 undef $busy; 459 undef $busy;
353 })->prio (Coro::PRIO_MAX); 460 })->prio (Coro::PRIO_MAX);
354 461
355 while ($busy) { 462 while ($busy) {
356 Coro::cede or Event::one_event; 463 if (Coro::nready) {
464 Coro::cede_notself;
465 } else {
466 EV::loop EV::LOOP_ONESHOT;
357 } 467 }
468 }
358 469
359 $time = Event::time - $time; 470 $time = EV::time - $time;
360 471
361 LOG llevError | logBacktrace, "long sync job\n" 472 LOG llevError | logBacktrace, Carp::longmess "long sync job"
362 if $time > $TICK * 0.5; 473 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
363 474
364 $tick_start += $time; # do not account sync jobs to server load 475 $tick_start += $time; # do not account sync jobs to server load
365 476
366 wantarray ? @res : $res[0] 477 wantarray ? @res : $res[0]
367 } else { 478 } else {
… …
389 $EXT_CORO{$coro+0} = $coro; 500 $EXT_CORO{$coro+0} = $coro;
390 501
391 $coro 502 $coro
392} 503}
393 504
394sub write_runtime { 505=item fork_call { }, $args
395 my $runtime = "$LOCALDIR/runtime";
396 506
397 # first touch the runtime file to show we are still running: 507Executes the given code block with the given arguments in a seperate
398 # the fsync below can take a very very long time. 508process, returning the results. Everything must be serialisable with
509Coro::Storable. May, of course, block. Note that the executed sub may
510never block itself or use any form of event handling.
399 511
400 if (my $fh = aio_open $runtime, O_WRONLY, 0) { 512=cut
401 utime undef, undef, $fh; 513
514sub fork_call(&@) {
515 my ($cb, @args) = @_;
516
517 # we seemingly have to make a local copy of the whole thing,
518 # otherwise perl prematurely frees the stuff :/
519 # TODO: investigate and fix (likely this will be rather laborious)
520
521 my @res = Coro::Util::fork_eval {
522 reset_signals;
523 &$cb
524 }, @args;
525
526 wantarray ? @res : $res[-1]
527}
528
529=item $value = cf::db_get $family => $key
530
531Returns a single value from the environment database.
532
533=item cf::db_put $family => $key => $value
534
535Stores the given C<$value> in the family. It can currently store binary
536data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
537
538=item $db = cf::db_table "name"
539
540Create and/or open a new database table. The string must not be "db" and must be unique
541within each server.
542
543=cut
544
545sub db_table($) {
546 my ($name) = @_;
547 my $db = BDB::db_create $DB_ENV;
548
549 eval {
550 $db->set_flags (BDB::CHKSUM);
551
552 utf8::encode $name;
553 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
554 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
555 cf::cleanup "db_open(db): $!" if $!;
402 } 556 };
557 cf::cleanup "db_open(db): $@" if $@;
403 558
404 my $guard = cf::lock_acquire "write_runtime"; 559 $db
560}
405 561
406 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 562our $DB;
407 or return;
408 563
409 my $value = $cf::RUNTIME + 90 + 10; 564sub db_init {
410 # 10 is the runtime save interval, for a monotonic clock 565 cf::sync_job {
411 # 60 allows for the watchdog to kill the server. 566 $DB ||= db_table "db";
567 };
568}
412 569
413 (aio_write $fh, 0, (length $value), $value, 0) <= 0 570sub db_get($$) {
414 and return; 571 my $key = "$_[0]/$_[1]";
415 572
416 # always fsync - this file is important 573 cf::sync_job {
417 aio_fsync $fh 574 BDB::db_get $DB, undef, $key, my $data;
418 and return;
419 575
420 # touch it again to show we are up-to-date 576 $! ? ()
421 utime undef, undef, $fh; 577 : $data
422
423 close $fh
424 or return;
425
426 aio_rename "$runtime~", $runtime
427 and return;
428
429 warn "runtime file written.\n";#d#
430
431 1 578 }
579}
580
581sub db_put($$$) {
582 BDB::dbreq_pri 4;
583 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
584}
585
586=item cf::cache $id => [$paths...], $processversion => $process
587
588Generic caching function that returns the value of the resource $id,
589caching and regenerating as required.
590
591This function can block.
592
593=cut
594
595sub cache {
596 my ($id, $src, $processversion, $process) = @_;
597
598 my $meta =
599 join "\x00",
600 $processversion,
601 map {
602 aio_stat $_
603 and Carp::croak "$_: $!";
604
605 ($_, (stat _)[7,9])
606 } @$src;
607
608 my $dbmeta = db_get cache => "$id/meta";
609 if ($dbmeta ne $meta) {
610 # changed, we may need to process
611
612 my @data;
613 my $md5;
614
615 for (0 .. $#$src) {
616 0 <= aio_load $src->[$_], $data[$_]
617 or Carp::croak "$src->[$_]: $!";
618 }
619
620 # if processing is expensive, check
621 # checksum first
622 if (1) {
623 $md5 =
624 join "\x00",
625 $processversion,
626 map {
627 cf::cede_to_tick;
628 ($src->[$_], Digest::MD5::md5_hex $data[$_])
629 } 0.. $#$src;
630
631
632 my $dbmd5 = db_get cache => "$id/md5";
633 if ($dbmd5 eq $md5) {
634 db_put cache => "$id/meta", $meta;
635
636 return db_get cache => "$id/data";
637 }
638 }
639
640 my $t1 = Time::HiRes::time;
641 my $data = $process->(\@data);
642 my $t2 = Time::HiRes::time;
643
644 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
645
646 db_put cache => "$id/data", $data;
647 db_put cache => "$id/md5" , $md5;
648 db_put cache => "$id/meta", $meta;
649
650 return $data;
651 }
652
653 db_get cache => "$id/data"
432} 654}
433 655
434=item cf::datalog type => key => value, ... 656=item cf::datalog type => key => value, ...
435 657
436Log a datalog packet of the given type with the given key-value pairs. 658Log a datalog packet of the given type with the given key-value pairs.
… …
454attach callbacks/event handlers (a collection of which is called an "attachment") 676attach callbacks/event handlers (a collection of which is called an "attachment")
455to it. All such attachable objects support the following methods. 677to it. All such attachable objects support the following methods.
456 678
457In the following description, CLASS can be any of C<global>, C<object> 679In the following description, CLASS can be any of C<global>, C<object>
458C<player>, C<client> or C<map> (i.e. the attachable objects in 680C<player>, C<client> or C<map> (i.e. the attachable objects in
459crossfire+). 681Deliantra).
460 682
461=over 4 683=over 4
462 684
463=item $attachable->attach ($attachment, key => $value...) 685=item $attachable->attach ($attachment, key => $value...)
464 686
… …
627 $registry = $CB_TYPE[$object_type] ||= []; 849 $registry = $CB_TYPE[$object_type] ||= [];
628 850
629 } elsif ($type eq "subtype") { 851 } elsif ($type eq "subtype") {
630 defined $object_type or Carp::croak "subtype specified without type"; 852 defined $object_type or Carp::croak "subtype specified without type";
631 my $object_subtype = shift @arg; 853 my $object_subtype = shift @arg;
632 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 854 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
633 855
634 } elsif ($type eq "package") { 856 } elsif ($type eq "package") {
635 my $pkg = shift @arg; 857 my $pkg = shift @arg;
636 858
637 while (my ($name, $id) = each %cb_id) { 859 while (my ($name, $id) = each %cb_id) {
… …
666 _attach $registry, $klass, @attach; 888 _attach $registry, $klass, @attach;
667 } 889 }
668 890
669 $obj->{$name} = \%arg; 891 $obj->{$name} = \%arg;
670 } else { 892 } else {
671 warn "object uses attachment '$name' that is not available, postponing.\n"; 893 warn "object uses attachment '$name' which is not available, postponing.\n";
672 } 894 }
673 895
674 $obj->{_attachment}{$name} = undef; 896 $obj->{_attachment}{$name} = undef;
675} 897}
676 898
… …
678 if (ref $_[0]) { 900 if (ref $_[0]) {
679 _object_attach @_; 901 _object_attach @_;
680 } else { 902 } else {
681 _attach shift->_attach_registry, @_; 903 _attach shift->_attach_registry, @_;
682 } 904 }
905 _recalc_want;
683}; 906};
684 907
685# all those should be optimised 908# all those should be optimised
686sub cf::attachable::detach { 909sub cf::attachable::detach {
687 my ($obj, $name) = @_; 910 my ($obj, $name) = @_;
… …
690 delete $obj->{_attachment}{$name}; 913 delete $obj->{_attachment}{$name};
691 reattach ($obj); 914 reattach ($obj);
692 } else { 915 } else {
693 Carp::croak "cannot, currently, detach class attachments"; 916 Carp::croak "cannot, currently, detach class attachments";
694 } 917 }
918 _recalc_want;
695}; 919};
696 920
697sub cf::attachable::attached { 921sub cf::attachable::attached {
698 my ($obj, $name) = @_; 922 my ($obj, $name) = @_;
699 923
… …
714 "; 938 ";
715 die if $@; 939 die if $@;
716} 940}
717 941
718our $override; 942our $override;
719our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 943our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
720 944
721sub override { 945sub override {
722 $override = 1; 946 $override = 1;
723 @invoke_results = (); 947 @INVOKE_RESULTS = (@_);
724} 948}
725 949
726sub do_invoke { 950sub do_invoke {
727 my $event = shift; 951 my $event = shift;
728 my $callbacks = shift; 952 my $callbacks = shift;
729 953
730 @invoke_results = (); 954 @INVOKE_RESULTS = ();
731 955
732 local $override; 956 local $override;
733 957
734 for (@$callbacks) { 958 for (@$callbacks) {
735 eval { &{$_->[1]} }; 959 eval { &{$_->[1]} };
… …
752 976
753Generate an object-specific event with the given arguments. 977Generate an object-specific event with the given arguments.
754 978
755This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 979This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
756removed in future versions), and there is no public API to access override 980removed in future versions), and there is no public API to access override
757results (if you must, access C<@cf::invoke_results> directly). 981results (if you must, access C<@cf::INVOKE_RESULTS> directly).
758 982
759=back 983=back
760 984
761=cut 985=cut
762 986
763############################################################################# 987#############################################################################
764# object support 988# object support
989
990sub _object_equal($$);
991sub _object_equal($$) {
992 my ($a, $b) = @_;
993
994 return 0 unless (ref $a) eq (ref $b);
995
996 if ("HASH" eq ref $a) {
997 my @ka = keys %$a;
998 my @kb = keys %$b;
999
1000 return 0 if @ka != @kb;
1001
1002 for (0 .. $#ka) {
1003 return 0 unless $ka[$_] eq $kb[$_];
1004 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1005 }
1006
1007 } elsif ("ARRAY" eq ref $a) {
1008
1009 return 0 if @$a != @$b;
1010
1011 for (0 .. $#$a) {
1012 return 0 unless _object_equal $a->[$_], $b->[$_];
1013 }
1014
1015 } elsif ($a ne $b) {
1016 return 0;
1017 }
1018
1019 1
1020}
1021
1022our $SLOW_MERGES;#d#
1023sub _can_merge {
1024 my ($ob1, $ob2) = @_;
1025
1026 ++$SLOW_MERGES;#d#
1027
1028 # we do the slow way here
1029 return _object_equal $ob1, $ob2
1030}
765 1031
766sub reattach { 1032sub reattach {
767 # basically do the same as instantiate, without calling instantiate 1033 # basically do the same as instantiate, without calling instantiate
768 my ($obj) = @_; 1034 my ($obj) = @_;
769 1035
… …
790cf::attachable->attach ( 1056cf::attachable->attach (
791 prio => -1000000, 1057 prio => -1000000,
792 on_instantiate => sub { 1058 on_instantiate => sub {
793 my ($obj, $data) = @_; 1059 my ($obj, $data) = @_;
794 1060
795 $data = from_json $data; 1061 $data = decode_json $data;
796 1062
797 for (@$data) { 1063 for (@$data) {
798 my ($name, $args) = @$_; 1064 my ($name, $args) = @$_;
799 1065
800 $obj->attach ($name, %{$args || {} }); 1066 $obj->attach ($name, %{$args || {} });
… …
816sub object_freezer_save { 1082sub object_freezer_save {
817 my ($filename, $rdata, $objs) = @_; 1083 my ($filename, $rdata, $objs) = @_;
818 1084
819 sync_job { 1085 sync_job {
820 if (length $$rdata) { 1086 if (length $$rdata) {
1087 utf8::decode (my $decname = $filename);
821 warn sprintf "saving %s (%d,%d)\n", 1088 warn sprintf "saving %s (%d,%d)\n",
822 $filename, length $$rdata, scalar @$objs; 1089 $decname, length $$rdata, scalar @$objs;
823 1090
824 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1091 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
825 chmod SAVE_MODE, $fh; 1092 chmod SAVE_MODE, $fh;
826 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1093 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
827 aio_fsync $fh if $cf::USE_FSYNC; 1094 aio_fsync $fh if $cf::USE_FSYNC;
828 close $fh; 1095 close $fh;
829 1096
830 if (@$objs) { 1097 if (@$objs) {
831 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1098 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
832 chmod SAVE_MODE, $fh; 1099 chmod SAVE_MODE, $fh;
833 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1100 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
834 aio_write $fh, 0, (length $data), $data, 0; 1101 aio_write $fh, 0, (length $data), $data, 0;
835 aio_fsync $fh if $cf::USE_FSYNC; 1102 aio_fsync $fh if $cf::USE_FSYNC;
836 close $fh; 1103 close $fh;
837 aio_rename "$filename.pst~", "$filename.pst"; 1104 aio_rename "$filename.pst~", "$filename.pst";
838 } 1105 }
… …
846 } 1113 }
847 } else { 1114 } else {
848 aio_unlink $filename; 1115 aio_unlink $filename;
849 aio_unlink "$filename.pst"; 1116 aio_unlink "$filename.pst";
850 } 1117 }
851 } 1118 };
852} 1119}
853 1120
854sub object_freezer_as_string { 1121sub object_freezer_as_string {
855 my ($rdata, $objs) = @_; 1122 my ($rdata, $objs) = @_;
856 1123
… …
868 or return; 1135 or return;
869 1136
870 unless (aio_stat "$filename.pst") { 1137 unless (aio_stat "$filename.pst") {
871 (aio_load "$filename.pst", $av) >= 0 1138 (aio_load "$filename.pst", $av) >= 0
872 or return; 1139 or return;
1140
873 $av = eval { (Storable::thaw $av)->{objs} }; 1141 my $st = eval { Coro::Storable::thaw $av };
1142 $av = $st->{objs};
874 } 1143 }
875 1144
1145 utf8::decode (my $decname = $filename);
876 warn sprintf "loading %s (%d)\n", 1146 warn sprintf "loading %s (%d,%d)\n",
877 $filename, length $data, scalar @{$av || []};#d# 1147 $decname, length $data, scalar @{$av || []};
1148
878 return ($data, $av); 1149 ($data, $av)
879} 1150}
1151
1152=head2 COMMAND CALLBACKS
1153
1154=over 4
1155
1156=cut
880 1157
881############################################################################# 1158#############################################################################
882# command handling &c 1159# command handling &c
883 1160
884=item cf::register_command $name => \&callback($ob,$args); 1161=item cf::register_command $name => \&callback($ob,$args);
… …
897 push @{ $COMMAND{$name} }, [$caller, $cb]; 1174 push @{ $COMMAND{$name} }, [$caller, $cb];
898} 1175}
899 1176
900=item cf::register_extcmd $name => \&callback($pl,$packet); 1177=item cf::register_extcmd $name => \&callback($pl,$packet);
901 1178
902Register a callbackf ro execution when the client sends an extcmd packet. 1179Register a callback for execution when the client sends an (synchronous)
1180extcmd packet. Ext commands will be processed in the order they are
1181received by the server, like other user commands. The first argument is
1182the logged-in player. Ext commands can only be processed after a player
1183has logged in successfully.
903 1184
904If the callback returns something, it is sent back as if reply was being 1185If the callback returns something, it is sent back as if reply was being
905called. 1186called.
906 1187
1188=item cf::register_exticmd $name => \&callback($ns,$packet);
1189
1190Register a callback for execution when the client sends an (asynchronous)
1191exticmd packet. Exti commands are processed by the server as soon as they
1192are received, i.e. out of order w.r.t. other commands. The first argument
1193is a client socket. Exti commands can be received anytime, even before
1194log-in.
1195
1196If the callback returns something, it is sent back as if reply was being
1197called.
1198
907=cut 1199=cut
908 1200
909sub register_extcmd { 1201sub register_extcmd {
910 my ($name, $cb) = @_; 1202 my ($name, $cb) = @_;
911 1203
912 $EXTCMD{$name} = $cb; 1204 $EXTCMD{$name} = $cb;
1205}
1206
1207sub register_exticmd {
1208 my ($name, $cb) = @_;
1209
1210 $EXTICMD{$name} = $cb;
913} 1211}
914 1212
915cf::player->attach ( 1213cf::player->attach (
916 on_command => sub { 1214 on_command => sub {
917 my ($pl, $name, $params) = @_; 1215 my ($pl, $name, $params) = @_;
… …
926 cf::override; 1224 cf::override;
927 }, 1225 },
928 on_extcmd => sub { 1226 on_extcmd => sub {
929 my ($pl, $buf) = @_; 1227 my ($pl, $buf) = @_;
930 1228
931 my $msg = eval { from_json $buf }; 1229 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
932 1230
933 if (ref $msg) { 1231 if (ref $msg) {
1232 my ($type, $reply, @payload) =
1233 "ARRAY" eq ref $msg
1234 ? @$msg
1235 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1236
1237 my @reply;
1238
934 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1239 if (my $cb = $EXTCMD{$type}) {
935 if (my %reply = $cb->($pl, $msg)) { 1240 @reply = $cb->($pl, @payload);
936 $pl->ext_reply ($msg->{msgid}, %reply);
937 }
938 } 1241 }
1242
1243 $pl->ext_reply ($reply, @reply)
1244 if $reply;
1245
939 } else { 1246 } else {
940 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1247 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
941 } 1248 }
942 1249
943 cf::override; 1250 cf::override;
944 }, 1251 },
945); 1252);
946 1253
947sub load_extension {
948 my ($path) = @_;
949
950 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
951 my $base = $1;
952 my $pkg = $1;
953 $pkg =~ s/[^[:word:]]/_/g;
954 $pkg = "ext::$pkg";
955
956 warn "... loading '$path' into '$pkg'\n";
957
958 open my $fh, "<:utf8", $path
959 or die "$path: $!";
960
961 my $source =
962 "package $pkg; use strict; use utf8;\n"
963 . "#line 1 \"$path\"\n{\n"
964 . (do { local $/; <$fh> })
965 . "\n};\n1";
966
967 unless (eval $source) {
968 my $msg = $@ ? "$path: $@\n"
969 : "extension disabled.\n";
970 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
971 warn $@;
972 warn "mandatory extension failed to load, exiting.\n";
973 exit 1;
974 }
975 die $@;
976 }
977
978 push @EXTS, $pkg;
979}
980
981sub load_extensions { 1254sub load_extensions {
1255 cf::sync_job {
1256 my %todo;
1257
982 for my $ext (<$LIBDIR/*.ext>) { 1258 for my $path (<$LIBDIR/*.ext>) {
983 next unless -r $ext; 1259 next unless -r $path;
984 eval { 1260
985 load_extension $ext; 1261 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1262 my $base = $1;
1263 my $pkg = $1;
1264 $pkg =~ s/[^[:word:]]/_/g;
1265 $pkg = "ext::$pkg";
1266
1267 open my $fh, "<:utf8", $path
1268 or die "$path: $!";
1269
1270 my $source = do { local $/; <$fh> };
1271
1272 my %ext = (
1273 path => $path,
1274 base => $base,
1275 pkg => $pkg,
1276 );
1277
1278 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1279 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1280
1281 $ext{source} =
1282 "package $pkg; use strict; use utf8;\n"
1283 . "#line 1 \"$path\"\n{\n"
1284 . $source
1285 . "\n};\n1";
1286
1287 $todo{$base} = \%ext;
1288 }
1289
1290 my %done;
1291 while (%todo) {
1292 my $progress;
1293
1294 while (my ($k, $v) = each %todo) {
1295 for (split /,\s*/, $v->{meta}{depends}) {
1296 goto skip
1297 unless exists $done{$_};
1298 }
1299
1300 warn "... loading '$k' into '$v->{pkg}'\n";
1301
1302 unless (eval $v->{source}) {
1303 my $msg = $@ ? "$v->{path}: $@\n"
1304 : "$v->{base}: extension inactive.\n";
1305
1306 if (exists $v->{meta}{mandatory}) {
1307 warn $msg;
1308 warn "mandatory extension failed to load, exiting.\n";
1309 exit 1;
1310 }
1311
1312 warn $msg;
1313 }
1314
1315 $done{$k} = delete $todo{$k};
1316 push @EXTS, $v->{pkg};
1317 $progress = 1;
986 1 1318 }
987 } or warn "$ext not loaded: $@"; 1319
1320 skip:
1321 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1322 unless $progress;
1323 }
988 } 1324 };
989} 1325}
990 1326
991############################################################################# 1327#############################################################################
992 1328
1329=back
1330
993=head2 CORE EXTENSIONS 1331=head2 CORE EXTENSIONS
994 1332
995Functions and methods that extend core crossfire objects. 1333Functions and methods that extend core crossfire objects.
996 1334
997=cut 1335=cut
… …
1001use Coro::AIO; 1339use Coro::AIO;
1002 1340
1003=head3 cf::player 1341=head3 cf::player
1004 1342
1005=over 4 1343=over 4
1344
1345=item cf::player::num_playing
1346
1347Returns the official number of playing players, as per the Crossfire metaserver rules.
1348
1349=cut
1350
1351sub num_playing {
1352 scalar grep
1353 $_->ob->map
1354 && !$_->hidden
1355 && !$_->ob->flag (cf::FLAG_WIZ),
1356 cf::player::list
1357}
1006 1358
1007=item cf::player::find $login 1359=item cf::player::find $login
1008 1360
1009Returns the given player object, loading it if necessary (might block). 1361Returns the given player object, loading it if necessary (might block).
1010 1362
… …
1046 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1398 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1047 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1399 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1048 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1400 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1049 aio_unlink +(playerdir $login) . "/$login.pl"; 1401 aio_unlink +(playerdir $login) . "/$login.pl";
1050 1402
1051 my $pl = load_pl path $login 1403 my $f = new_from_file cf::object::thawer path $login
1052 or return; 1404 or return;
1405
1406 my $pl = cf::player::load_pl $f
1407 or return;
1408 local $cf::PLAYER_LOADING{$login} = $pl;
1409 $f->resolve_delayed_derefs;
1053 $cf::PLAYER{$login} = $pl 1410 $cf::PLAYER{$login} = $pl
1054 } 1411 }
1055 } 1412 }
1056} 1413}
1057 1414
… …
1067 1424
1068 aio_mkdir playerdir $pl, 0770; 1425 aio_mkdir playerdir $pl, 0770;
1069 $pl->{last_save} = $cf::RUNTIME; 1426 $pl->{last_save} = $cf::RUNTIME;
1070 1427
1071 $pl->save_pl ($path); 1428 $pl->save_pl ($path);
1072 Coro::cede; 1429 cf::cede_to_tick;
1073} 1430}
1074 1431
1075sub new($) { 1432sub new($) {
1076 my ($login) = @_; 1433 my ($login) = @_;
1077 1434
… …
1081 $self->{deny_save} = 1; 1438 $self->{deny_save} = 1;
1082 1439
1083 $cf::PLAYER{$login} = $self; 1440 $cf::PLAYER{$login} = $self;
1084 1441
1085 $self 1442 $self
1443}
1444
1445=item $player->send_msg ($channel, $msg, $color, [extra...])
1446
1447=cut
1448
1449sub send_msg {
1450 my $ns = shift->ns
1451 or return;
1452 $ns->send_msg (@_);
1086} 1453}
1087 1454
1088=item $pl->quit_character 1455=item $pl->quit_character
1089 1456
1090Nukes the player without looking back. If logged in, the connection will 1457Nukes the player without looking back. If logged in, the connection will
… …
1145 or return []; 1512 or return [];
1146 1513
1147 my @logins; 1514 my @logins;
1148 1515
1149 for my $login (@$dirs) { 1516 for my $login (@$dirs) {
1517 my $path = path $login;
1518
1519 # a .pst is a dead give-away for a valid player
1520 unless (-e "$path.pst") {
1150 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1521 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1151 aio_read $fh, 0, 512, my $buf, 0 or next; 1522 aio_read $fh, 0, 512, my $buf, 0 or next;
1152 $buf !~ /^password -------------$/m or next; # official not-valid tag 1523 $buf !~ /^password -------------$/m or next; # official not-valid tag
1524 }
1153 1525
1154 utf8::decode $login; 1526 utf8::decode $login;
1155 push @logins, $login; 1527 push @logins, $login;
1156 } 1528 }
1157 1529
… …
1184 } 1556 }
1185 1557
1186 \@paths 1558 \@paths
1187} 1559}
1188 1560
1561=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1562
1563Expand crossfire pod fragments into protocol xml.
1564
1565=cut
1566
1567use re 'eval';
1568
1569my $group;
1570my $interior; $interior = qr{
1571 # match a pod interior sequence sans C<< >>
1572 (?:
1573 \ (.*?)\ (?{ $group = $^N })
1574 | < (??{$interior}) >
1575 )
1576}x;
1577
1578sub expand_cfpod {
1579 my ($self, $pod) = @_;
1580
1581 my $xml;
1582
1583 while () {
1584 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1585 $group = $1;
1586
1587 $group =~ s/&/&amp;/g;
1588 $group =~ s/</&lt;/g;
1589
1590 $xml .= $group;
1591 } elsif ($pod =~ m%\G
1592 ([BCGHITU])
1593 <
1594 (?:
1595 ([^<>]*) (?{ $group = $^N })
1596 | < $interior >
1597 )
1598 >
1599 %gcsx
1600 ) {
1601 my ($code, $data) = ($1, $group);
1602
1603 if ($code eq "B") {
1604 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1605 } elsif ($code eq "I") {
1606 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1607 } elsif ($code eq "U") {
1608 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1609 } elsif ($code eq "C") {
1610 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1611 } elsif ($code eq "T") {
1612 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1613 } elsif ($code eq "G") {
1614 my ($male, $female) = split /\|/, $data;
1615 $data = $self->gender ? $female : $male;
1616 $xml .= expand_cfpod ($self, $data);
1617 } elsif ($code eq "H") {
1618 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1619 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1620 "")
1621 [$self->{hintmode}];
1622 } else {
1623 $xml .= "error processing '$code($data)' directive";
1624 }
1625 } else {
1626 if ($pod =~ /\G(.+)/) {
1627 warn "parse error while expanding $pod (at $1)";
1628 }
1629 last;
1630 }
1631 }
1632
1633 for ($xml) {
1634 # create single paragraphs (very hackish)
1635 s/(?<=\S)\n(?=\w)/ /g;
1636
1637 # compress some whitespace
1638 s/\s+\n/\n/g; # ws line-ends
1639 s/\n\n+/\n/g; # double lines
1640 s/^\n+//; # beginning lines
1641 s/\n+$//; # ending lines
1642 }
1643
1644 $xml
1645}
1646
1647no re 'eval';
1648
1649sub hintmode {
1650 $_[0]{hintmode} = $_[1] if @_ > 1;
1651 $_[0]{hintmode}
1652}
1653
1189=item $player->ext_reply ($msgid, %msg) 1654=item $player->ext_reply ($msgid, @msg)
1190 1655
1191Sends an ext reply to the player. 1656Sends an ext reply to the player.
1192 1657
1193=cut 1658=cut
1194 1659
1195sub ext_reply($$%) { 1660sub ext_reply($$@) {
1196 my ($self, $id, %msg) = @_; 1661 my ($self, $id, @msg) = @_;
1197 1662
1198 $msg{msgid} = $id; 1663 $self->ns->ext_reply ($id, @msg)
1199
1200 $self->send ("ext " . cf::to_json \%msg);
1201} 1664}
1202 1665
1203=item $player->ext_event ($type, %msg) 1666=item $player->ext_msg ($type, @msg)
1204 1667
1205Sends an ext event to the client. 1668Sends an ext event to the client.
1206 1669
1207=cut 1670=cut
1208 1671
1209sub ext_event($$%) { 1672sub ext_msg($$@) {
1210 my ($self, $type, %msg) = @_; 1673 my ($self, $type, @msg) = @_;
1211 1674
1212 $self->ns->ext_event ($type, %msg); 1675 $self->ns->ext_msg ($type, @msg);
1213} 1676}
1214 1677
1215=head3 cf::region 1678=head3 cf::region
1216 1679
1217=over 4 1680=over 4
… …
1220 1683
1221package cf::region; 1684package cf::region;
1222 1685
1223=item cf::region::find_by_path $path 1686=item cf::region::find_by_path $path
1224 1687
1225Tries to decuce the probable region for a map knowing only its path. 1688Tries to decuce the likely region for a map knowing only its path.
1226 1689
1227=cut 1690=cut
1228 1691
1229sub find_by_path($) { 1692sub find_by_path($) {
1230 my ($path) = @_; 1693 my ($path) = @_;
1231 1694
1232 my ($match, $specificity); 1695 my ($match, $specificity);
1233 1696
1234 for my $region (list) { 1697 for my $region (list) {
1235 if ($region->match && $path =~ $region->match) { 1698 if ($region->{match} && $path =~ $region->{match}) {
1236 ($match, $specificity) = ($region, $region->specificity) 1699 ($match, $specificity) = ($region, $region->specificity)
1237 if $region->specificity > $specificity; 1700 if $region->specificity > $specificity;
1238 } 1701 }
1239 } 1702 }
1240 1703
… …
1304 my ($self, $merge) = @_; 1767 my ($self, $merge) = @_;
1305 1768
1306 # we have to keep some variables in memory intact 1769 # we have to keep some variables in memory intact
1307 local $self->{path}; 1770 local $self->{path};
1308 local $self->{load_path}; 1771 local $self->{load_path};
1309 local $self->{deny_save};
1310 local $self->{deny_reset};
1311 1772
1312 $self->SUPER::thawer_merge ($merge); 1773 $self->SUPER::thawer_merge ($merge);
1313} 1774}
1314 1775
1315sub normalise { 1776sub normalise {
… …
1362 $self->init; # pass $1 etc. 1823 $self->init; # pass $1 etc.
1363 return $self; 1824 return $self;
1364 } 1825 }
1365 } 1826 }
1366 1827
1367 Carp::carp "unable to resolve path '$path' (base '$base')."; 1828 Carp::cluck "unable to resolve path '$path' (base '$base').";
1368 () 1829 ()
1369} 1830}
1370 1831
1371sub init { 1832sub init {
1372 my ($self) = @_; 1833 my ($self) = @_;
… …
1415 1876
1416 $_->change_map_light ($change) 1877 $_->change_map_light ($change)
1417 for grep $_->outdoor, values %cf::MAP; 1878 for grep $_->outdoor, values %cf::MAP;
1418} 1879}
1419 1880
1881sub decay_objects {
1882 my ($self) = @_;
1883
1884 return if $self->{deny_reset};
1885
1886 $self->do_decay_objects;
1887}
1888
1420sub unlink_save { 1889sub unlink_save {
1421 my ($self) = @_; 1890 my ($self) = @_;
1422 1891
1423 utf8::encode (my $save = $self->save_path); 1892 utf8::encode (my $save = $self->save_path);
1424 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1893 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
… …
1427 1896
1428sub load_header_from($) { 1897sub load_header_from($) {
1429 my ($self, $path) = @_; 1898 my ($self, $path) = @_;
1430 1899
1431 utf8::encode $path; 1900 utf8::encode $path;
1432 #aio_open $path, O_RDONLY, 0 1901 my $f = new_from_file cf::object::thawer $path
1433 # or return;
1434
1435 $self->_load_header ($path)
1436 or return; 1902 or return;
1903
1904 $self->_load_header ($f)
1905 or return;
1906
1907 local $MAP_LOADING{$self->{path}} = $self;
1908 $f->resolve_delayed_derefs;
1437 1909
1438 $self->{load_path} = $path; 1910 $self->{load_path} = $path;
1439 1911
1440 1 1912 1
1441} 1913}
… …
1480 $self->load_header_orig 1952 $self->load_header_orig
1481 or return; 1953 or return;
1482 $self->prepare_orig; 1954 $self->prepare_orig;
1483 } 1955 }
1484 1956
1957 $self->{deny_reset} = 1
1958 if $self->no_reset;
1959
1485 $self->default_region (cf::region::find_by_path $self->{path}) 1960 $self->default_region (cf::region::find_by_path $self->{path})
1486 unless $self->default_region; 1961 unless $self->default_region;
1487 1962
1488 1 1963 1
1489} 1964}
… …
1492sub find { 1967sub find {
1493 my ($path, $origin) = @_; 1968 my ($path, $origin) = @_;
1494 1969
1495 $path = normalise $path, $origin && $origin->path; 1970 $path = normalise $path, $origin && $origin->path;
1496 1971
1972 cf::lock_wait "map_data:$path";#d#remove
1497 cf::lock_wait "map_find:$path"; 1973 cf::lock_wait "map_find:$path";
1498 1974
1499 $cf::MAP{$path} || do { 1975 $cf::MAP{$path} || do {
1500 my $guard = cf::lock_acquire "map_find:$path"; 1976 my $guard1 = cf::lock_acquire "map_find:$path";
1977 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1978
1501 my $map = new_from_path cf::map $path 1979 my $map = new_from_path cf::map $path
1502 or return; 1980 or return;
1503 1981
1504 $map->{last_save} = $cf::RUNTIME; 1982 $map->{last_save} = $cf::RUNTIME;
1505 1983
1506 $map->load_header 1984 $map->load_header
1507 or return; 1985 or return;
1508 1986
1509 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1987 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1510 # doing this can freeze the server in a sync job, obviously 1988 # doing this can freeze the server in a sync job, obviously
1511 #$cf::WAIT_FOR_TICK->wait; 1989 #$cf::WAIT_FOR_TICK->wait;
1990 undef $guard1;
1991 undef $guard2;
1512 $map->reset; 1992 $map->reset;
1513 undef $guard;
1514 return find $path; 1993 return find $path;
1515 } 1994 }
1516 1995
1517 $cf::MAP{$path} = $map 1996 $cf::MAP{$path} = $map
1518 } 1997 }
… …
1527 local $self->{deny_reset} = 1; # loading can take a long time 2006 local $self->{deny_reset} = 1; # loading can take a long time
1528 2007
1529 my $path = $self->{path}; 2008 my $path = $self->{path};
1530 2009
1531 { 2010 {
1532 my $guard = cf::lock_acquire "map_load:$path"; 2011 my $guard = cf::lock_acquire "map_data:$path";
1533 2012
2013 return unless $self->valid;
1534 return if $self->in_memory != cf::MAP_SWAPPED; 2014 return unless $self->in_memory == cf::MAP_SWAPPED;
1535 2015
1536 $self->in_memory (cf::MAP_LOADING); 2016 $self->in_memory (cf::MAP_LOADING);
1537 2017
1538 $self->alloc; 2018 $self->alloc;
1539 2019
1540 $self->pre_load; 2020 $self->pre_load;
1541 Coro::cede; 2021 cf::cede_to_tick;
1542 2022
2023 my $f = new_from_file cf::object::thawer $self->{load_path};
2024 $f->skip_block;
1543 $self->_load_objects ($self->{load_path}, 1) 2025 $self->_load_objects ($f)
1544 or return; 2026 or return;
1545 2027
1546 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2028 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1547 if delete $self->{load_original}; 2029 if delete $self->{load_original};
1548 2030
1549 if (my $uniq = $self->uniq_path) { 2031 if (my $uniq = $self->uniq_path) {
1550 utf8::encode $uniq; 2032 utf8::encode $uniq;
1551 if (aio_open $uniq, O_RDONLY, 0) { 2033 unless (aio_stat $uniq) {
2034 if (my $f = new_from_file cf::object::thawer $uniq) {
1552 $self->clear_unique_items; 2035 $self->clear_unique_items;
1553 $self->_load_objects ($uniq, 0); 2036 $self->_load_objects ($f);
2037 $f->resolve_delayed_derefs;
2038 }
1554 } 2039 }
1555 } 2040 }
1556 2041
1557 Coro::cede; 2042 $f->resolve_delayed_derefs;
2043
2044 cf::cede_to_tick;
1558 # now do the right thing for maps 2045 # now do the right thing for maps
1559 $self->link_multipart_objects; 2046 $self->link_multipart_objects;
1560 $self->difficulty ($self->estimate_difficulty) 2047 $self->difficulty ($self->estimate_difficulty)
1561 unless $self->difficulty; 2048 unless $self->difficulty;
1562 Coro::cede; 2049 cf::cede_to_tick;
1563 2050
1564 unless ($self->{deny_activate}) { 2051 unless ($self->{deny_activate}) {
1565 $self->decay_objects; 2052 $self->decay_objects;
1566 $self->fix_auto_apply; 2053 $self->fix_auto_apply;
1567 $self->update_buttons; 2054 $self->update_buttons;
1568 Coro::cede; 2055 cf::cede_to_tick;
1569 $self->set_darkness_map; 2056 $self->set_darkness_map;
1570 Coro::cede; 2057 cf::cede_to_tick;
1571 $self->activate; 2058 $self->activate;
1572 } 2059 }
2060
2061 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME);
1573 2063
1574 $self->in_memory (cf::MAP_IN_MEMORY); 2064 $self->in_memory (cf::MAP_IN_MEMORY);
1575 } 2065 }
1576 2066
1577 $self->post_load; 2067 $self->post_load;
… …
1581 my ($self, $ob) = @_; 2071 my ($self, $ob) = @_;
1582 2072
1583 return find "~" . $ob->name . "/" . $self->{path} 2073 return find "~" . $ob->name . "/" . $self->{path}
1584 if $self->per_player; 2074 if $self->per_player;
1585 2075
2076# return find "?party/" . $ob->name . "/" . $self->{path}
2077# if $self->per_party;
2078
1586 $self 2079 $self
1587} 2080}
1588 2081
1589# find and load all maps in the 3x3 area around a map 2082# find and load all maps in the 3x3 area around a map
1590sub load_diag { 2083sub load_neighbours {
1591 my ($map) = @_; 2084 my ($map) = @_;
1592 2085
1593 my @diag; # diagonal neighbours 2086 my @neigh; # diagonal neighbours
1594 2087
1595 for (0 .. 3) { 2088 for (0 .. 3) {
1596 my $neigh = $map->tile_path ($_) 2089 my $neigh = $map->tile_path ($_)
1597 or next; 2090 or next;
1598 $neigh = find $neigh, $map 2091 $neigh = find $neigh, $map
1599 or next; 2092 or next;
1600 $neigh->load; 2093 $neigh->load;
1601 2094
2095 push @neigh,
1602 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2096 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1603 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2097 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1604 } 2098 }
1605 2099
1606 for (@diag) { 2100 for (grep defined $_->[0], @neigh) {
2101 my ($path, $origin) = @$_;
1607 my $neigh = find @$_ 2102 my $neigh = find $path, $origin
1608 or next; 2103 or next;
1609 $neigh->load; 2104 $neigh->load;
1610 } 2105 }
1611} 2106}
1612 2107
… …
1617} 2112}
1618 2113
1619sub do_load_sync { 2114sub do_load_sync {
1620 my ($map) = @_; 2115 my ($map) = @_;
1621 2116
2117 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2118 if $Coro::current == $Coro::main;
2119
1622 cf::sync_job { $map->load }; 2120 cf::sync_job { $map->load };
1623} 2121}
1624 2122
1625our %MAP_PREFETCH; 2123our %MAP_PREFETCH;
1626our $MAP_PREFETCHER = undef; 2124our $MAP_PREFETCHER = undef;
1627 2125
1628sub find_async { 2126sub find_async {
1629 my ($path, $origin) = @_; 2127 my ($path, $origin, $load) = @_;
1630 2128
1631 $path = normalise $path, $origin && $origin->{path}; 2129 $path = normalise $path, $origin && $origin->{path};
1632 2130
1633 if (my $map = $cf::MAP{$path}) { 2131 if (my $map = $cf::MAP{$path}) {
1634 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2132 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1635 } 2133 }
1636 2134
1637 undef $MAP_PREFETCH{$path}; 2135 $MAP_PREFETCH{$path} |= $load;
2136
1638 $MAP_PREFETCHER ||= cf::async { 2137 $MAP_PREFETCHER ||= cf::async {
2138 $Coro::current->{desc} = "map prefetcher";
2139
1639 while (%MAP_PREFETCH) { 2140 while (%MAP_PREFETCH) {
1640 for my $path (keys %MAP_PREFETCH) { 2141 while (my ($k, $v) = each %MAP_PREFETCH) {
1641 my $map = find $path 2142 if (my $map = find $k) {
1642 or next;
1643 $map->load; 2143 $map->load if $v;
2144 }
1644 2145
1645 delete $MAP_PREFETCH{$path}; 2146 delete $MAP_PREFETCH{$k};
1646 } 2147 }
1647 } 2148 }
1648 undef $MAP_PREFETCHER; 2149 undef $MAP_PREFETCHER;
1649 }; 2150 };
1650 $MAP_PREFETCHER->prio (6); 2151 $MAP_PREFETCHER->prio (6);
… …
1653} 2154}
1654 2155
1655sub save { 2156sub save {
1656 my ($self) = @_; 2157 my ($self) = @_;
1657 2158
1658 my $lock = cf::lock_acquire "map_data:" . $self->path; 2159 my $lock = cf::lock_acquire "map_data:$self->{path}";
1659 2160
1660 $self->{last_save} = $cf::RUNTIME; 2161 $self->{last_save} = $cf::RUNTIME;
1661 2162
1662 return unless $self->dirty; 2163 return unless $self->dirty;
1663 2164
… …
1669 return if $self->{deny_save}; 2170 return if $self->{deny_save};
1670 2171
1671 local $self->{last_access} = $self->last_access;#d# 2172 local $self->{last_access} = $self->last_access;#d#
1672 2173
1673 cf::async { 2174 cf::async {
2175 $Coro::current->{desc} = "map player save";
1674 $_->contr->save for $self->players; 2176 $_->contr->save for $self->players;
1675 }; 2177 };
1676 2178
1677 if ($uniq) { 2179 if ($uniq) {
1678 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2180 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
1686 my ($self) = @_; 2188 my ($self) = @_;
1687 2189
1688 # save first because save cedes 2190 # save first because save cedes
1689 $self->save; 2191 $self->save;
1690 2192
1691 my $lock = cf::lock_acquire "map_data:" . $self->path; 2193 my $lock = cf::lock_acquire "map_data:$self->{path}";
1692 2194
1693 return if $self->players; 2195 return if $self->players;
1694 return if $self->in_memory != cf::MAP_IN_MEMORY; 2196 return if $self->in_memory != cf::MAP_IN_MEMORY;
1695 return if $self->{deny_save}; 2197 return if $self->{deny_save};
1696 2198
2199 $self->in_memory (cf::MAP_SWAPPED);
2200
2201 $self->deactivate;
2202 $_->clear_links_to ($self) for values %cf::MAP;
1697 $self->clear; 2203 $self->clear;
1698 $self->in_memory (cf::MAP_SWAPPED);
1699} 2204}
1700 2205
1701sub reset_at { 2206sub reset_at {
1702 my ($self) = @_; 2207 my ($self) = @_;
1703 2208
1704 # TODO: safety, remove and allow resettable per-player maps 2209 # TODO: safety, remove and allow resettable per-player maps
1705 return 1e99 if $self->isa ("ext::map_per_player");#d#
1706 return 1e99 if $self->{deny_reset}; 2210 return 1e99 if $self->{deny_reset};
1707 2211
1708 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2212 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1709 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2213 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1710 2214
… …
1721 my ($self) = @_; 2225 my ($self) = @_;
1722 2226
1723 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2227 my $lock = cf::lock_acquire "map_data:$self->{path}";
1724 2228
1725 return if $self->players; 2229 return if $self->players;
1726 return if $self->isa ("ext::map_per_player");#d#
1727 2230
1728 warn "resetting map ", $self->path;#d# 2231 warn "resetting map ", $self->path;
1729 2232
1730 $self->in_memory (cf::MAP_SWAPPED); 2233 $self->in_memory (cf::MAP_SWAPPED);
1731 2234
1732 # need to save uniques path 2235 # need to save uniques path
1733 unless ($self->{deny_save}) { 2236 unless ($self->{deny_save}) {
… …
1737 if $uniq; 2240 if $uniq;
1738 } 2241 }
1739 2242
1740 delete $cf::MAP{$self->path}; 2243 delete $cf::MAP{$self->path};
1741 2244
2245 $self->deactivate;
2246 $_->clear_links_to ($self) for values %cf::MAP;
1742 $self->clear; 2247 $self->clear;
1743
1744 $_->clear_links_to ($self) for values %cf::MAP;
1745 2248
1746 $self->unlink_save; 2249 $self->unlink_save;
1747 $self->destroy; 2250 $self->destroy;
1748} 2251}
1749 2252
1750my $nuke_counter = "aaaa"; 2253my $nuke_counter = "aaaa";
1751 2254
1752sub nuke { 2255sub nuke {
1753 my ($self) = @_; 2256 my ($self) = @_;
1754 2257
2258 {
2259 my $lock = cf::lock_acquire "map_data:$self->{path}";
2260
1755 delete $cf::MAP{$self->path}; 2261 delete $cf::MAP{$self->path};
1756 2262
1757 $self->unlink_save; 2263 $self->unlink_save;
1758 2264
1759 bless $self, "cf::map"; 2265 bless $self, "cf::map";
1760 delete $self->{deny_reset}; 2266 delete $self->{deny_reset};
1761 $self->{deny_save} = 1; 2267 $self->{deny_save} = 1;
1762 $self->reset_timeout (1); 2268 $self->reset_timeout (1);
1763 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2269 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1764 2270
1765 $cf::MAP{$self->path} = $self; 2271 $cf::MAP{$self->path} = $self;
2272 }
1766 2273
1767 $self->reset; # polite request, might not happen 2274 $self->reset; # polite request, might not happen
2275}
2276
2277=item $maps = cf::map::tmp_maps
2278
2279Returns an arrayref with all map paths of currently instantiated and saved
2280maps. May block.
2281
2282=cut
2283
2284sub tmp_maps() {
2285 [
2286 map {
2287 utf8::decode $_;
2288 /\.map$/
2289 ? normalise $_
2290 : ()
2291 } @{ aio_readdir $TMPDIR or [] }
2292 ]
2293}
2294
2295=item $maps = cf::map::random_maps
2296
2297Returns an arrayref with all map paths of currently instantiated and saved
2298random maps. May block.
2299
2300=cut
2301
2302sub random_maps() {
2303 [
2304 map {
2305 utf8::decode $_;
2306 /\.map$/
2307 ? normalise "?random/$_"
2308 : ()
2309 } @{ aio_readdir $RANDOMDIR or [] }
2310 ]
1768} 2311}
1769 2312
1770=item cf::map::unique_maps 2313=item cf::map::unique_maps
1771 2314
1772Returns an arrayref of paths of all shared maps that have 2315Returns an arrayref of paths of all shared maps that have
1773instantiated unique items. May block. 2316instantiated unique items. May block.
1774 2317
1775=cut 2318=cut
1776 2319
1777sub unique_maps() { 2320sub unique_maps() {
1778 my $files = aio_readdir $UNIQUEDIR 2321 [
1779 or return; 2322 map {
1780
1781 my @paths;
1782
1783 for (@$files) {
1784 utf8::decode $_; 2323 utf8::decode $_;
1785 next if /\.pst$/; 2324 /\.map$/
1786 next unless /^$PATH_SEP/o; 2325 ? normalise $_
1787 2326 : ()
1788 push @paths, cf::map::normalise $_; 2327 } @{ aio_readdir $UNIQUEDIR or [] }
1789 } 2328 ]
1790
1791 \@paths
1792} 2329}
1793 2330
1794package cf; 2331package cf;
1795 2332
1796=back 2333=back
… …
1814 map { $_, inv_recursive_ $_->inv } @_ 2351 map { $_, inv_recursive_ $_->inv } @_
1815} 2352}
1816 2353
1817sub inv_recursive { 2354sub inv_recursive {
1818 inv_recursive_ inv $_[0] 2355 inv_recursive_ inv $_[0]
2356}
2357
2358=item $ref = $ob->ref
2359
2360creates and returns a persistent reference to an objetc that can be stored as a string.
2361
2362=item $ob = cf::object::deref ($refstring)
2363
2364returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2365even if the object actually exists. May block.
2366
2367=cut
2368
2369sub deref {
2370 my ($ref) = @_;
2371
2372 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2373 my ($uuid, $name) = ($1, $2);
2374 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2375 or return;
2376 $pl->ob->uuid eq $uuid
2377 or return;
2378
2379 $pl->ob
2380 } else {
2381 warn "$ref: cannot resolve object reference\n";
2382 undef
2383 }
1819} 2384}
1820 2385
1821package cf; 2386package cf;
1822 2387
1823=back 2388=back
… …
1842 2407
1843 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2408 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1844 2409
1845 if ($self->{record_replies}) { 2410 if ($self->{record_replies}) {
1846 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2411 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2412
1847 } else { 2413 } else {
2414 my $pl = $self->contr;
2415
2416 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2417 my $dialog = $pl->{npc_dialog};
2418 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2419
2420 } else {
1848 $msg = $npc->name . " says: $msg" if $npc; 2421 $msg = $npc->name . " says: $msg" if $npc;
1849 $self->message ($msg, $flags); 2422 $self->message ($msg, $flags);
2423 }
1850 } 2424 }
2425}
2426
2427=item $object->send_msg ($channel, $msg, $color, [extra...])
2428
2429=cut
2430
2431sub cf::object::send_msg {
2432 my $pl = shift->contr
2433 or return;
2434 $pl->send_msg (@_);
1851} 2435}
1852 2436
1853=item $player_object->may ("access") 2437=item $player_object->may ("access")
1854 2438
1855Returns wether the given player is authorized to access resource "access" 2439Returns wether the given player is authorized to access resource "access"
… …
1902 $self->deactivate_recursive; 2486 $self->deactivate_recursive;
1903 2487
1904 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2488 return if UNIVERSAL::isa $self->map, "ext::map_link";
1905 2489
1906 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2490 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1907 if $self->map; 2491 if $self->map && $self->map->{path} ne "{link}";
1908 2492
1909 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2493 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1910} 2494}
1911 2495
1912sub cf::object::player::leave_link { 2496sub cf::object::player::leave_link {
1913 my ($self, $map, $x, $y) = @_; 2497 my ($self, $map, $x, $y) = @_;
2498
2499 return unless $self->contr->active;
1914 2500
1915 my $link_pos = delete $self->{_link_pos}; 2501 my $link_pos = delete $self->{_link_pos};
1916 2502
1917 unless ($map) { 2503 unless ($map) {
1918 # restore original map position 2504 # restore original map position
… …
1932 # use -1 or undef as default coordinates, not 0, 0 2518 # use -1 or undef as default coordinates, not 0, 0
1933 ($x, $y) = ($map->enter_x, $map->enter_y) 2519 ($x, $y) = ($map->enter_x, $map->enter_y)
1934 if $x <=0 && $y <= 0; 2520 if $x <=0 && $y <= 0;
1935 2521
1936 $map->load; 2522 $map->load;
1937 $map->load_diag; 2523 $map->load_neighbours;
1938 2524
1939 return unless $self->contr->active; 2525 return unless $self->contr->active;
1940 $self->activate_recursive; 2526 $self->activate_recursive;
1941 2527
1942 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1943 $self->enter_map ($map, $x, $y); 2529 $self->enter_map ($map, $x, $y);
1944} 2530}
1945 2531
1946cf::player->attach ( 2532=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1947 on_logout => sub {
1948 my ($pl) = @_;
1949 2533
1950 # abort map switching before logout 2534Moves the player to the given map-path and coordinates by first freezing
1951 if ($pl->ob->{_link_pos}) { 2535her, loading and preparing them map, calling the provided $check callback
1952 cf::sync_job { 2536that has to return the map if sucecssful, and then unfreezes the player on
1953 $pl->ob->leave_link 2537the new (success) or old (failed) map position. In either case, $done will
1954 }; 2538be called at the end of this process.
1955 }
1956 },
1957 on_login => sub {
1958 my ($pl) = @_;
1959 2539
1960 # try to abort aborted map switching on player login :)
1961 # should happen only on crashes
1962 if ($pl->ob->{_link_pos}) {
1963 $pl->ob->enter_link;
1964 (async {
1965 $pl->ob->reply (undef,
1966 "There was an internal problem at your last logout, "
1967 . "the server will try to bring you to your intended destination in a second.",
1968 cf::NDI_RED);
1969 # we need this sleep as the login has a concurrent enter_exit running
1970 # and this sleep increases chances of the player not ending up in scorn
1971 Coro::Timer::sleep 1;
1972 $pl->ob->leave_link;
1973 })->prio (2);
1974 }
1975 },
1976);
1977
1978=item $player_object->goto ($path, $x, $y)
1979
1980=cut 2540=cut
2541
2542our $GOTOGEN;
1981 2543
1982sub cf::object::player::goto { 2544sub cf::object::player::goto {
1983 my ($self, $path, $x, $y) = @_; 2545 my ($self, $path, $x, $y, $check, $done) = @_;
2546
2547 # do generation counting so two concurrent goto's will be executed in-order
2548 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1984 2549
1985 $self->enter_link; 2550 $self->enter_link;
1986 2551
1987 (async { 2552 (async {
2553 $Coro::current->{desc} = "player::goto $path $x $y";
2554
2555 # *tag paths override both path and x|y
2556 if ($path =~ /^\*(.*)$/) {
2557 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2558 my $ob = $obs[rand @obs];
2559
2560 # see if we actually can go there
2561 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2562 $ob = $obs[rand @obs];
2563 } else {
2564 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2565 }
2566 # else put us there anyways for now #d#
2567
2568 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2569 } else {
2570 ($path, $x, $y) = (undef, undef, undef);
2571 }
2572 }
2573
1988 my $map = eval { 2574 my $map = eval {
1989 my $map = cf::map::find $path; 2575 my $map = defined $path ? cf::map::find $path : undef;
2576
2577 if ($map) {
1990 $map = $map->customise_for ($self) if $map; 2578 $map = $map->customise_for ($self);
2579 $map = $check->($map) if $check && $map;
2580 } else {
2581 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2582 }
2583
1991 $map 2584 $map
2585 };
2586
2587 if ($@) {
2588 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2589 LOG llevError | logBacktrace, Carp::longmess $@;
1992 } or 2590 }
1993 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1994 2591
2592 if ($gen == $self->{_goto_generation}) {
2593 delete $self->{_goto_generation};
1995 $self->leave_link ($map, $x, $y); 2594 $self->leave_link ($map, $x, $y);
2595 }
2596
2597 $done->() if $done;
1996 })->prio (1); 2598 })->prio (1);
1997} 2599}
1998 2600
1999=item $player_object->enter_exit ($exit_object) 2601=item $player_object->enter_exit ($exit_object)
2000 2602
… …
2037 $rmp->{origin_y} = $exit->y; 2639 $rmp->{origin_y} = $exit->y;
2038 } 2640 }
2039 2641
2040 $rmp->{random_seed} ||= $exit->random_seed; 2642 $rmp->{random_seed} ||= $exit->random_seed;
2041 2643
2042 my $data = cf::to_json $rmp; 2644 my $data = cf::encode_json $rmp;
2043 my $md5 = Digest::MD5::md5_hex $data; 2645 my $md5 = Digest::MD5::md5_hex $data;
2044 my $meta = "$RANDOMDIR/$md5.meta"; 2646 my $meta = "$RANDOMDIR/$md5.meta";
2045 2647
2046 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2648 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2047 aio_write $fh, 0, (length $data), $data, 0; 2649 aio_write $fh, 0, (length $data), $data, 0;
… …
2069 my $hp = $exit->stats->hp; 2671 my $hp = $exit->stats->hp;
2070 my $sp = $exit->stats->sp; 2672 my $sp = $exit->stats->sp;
2071 2673
2072 $self->enter_link; 2674 $self->enter_link;
2073 2675
2676 # if exit is damned, update players death & WoR home-position
2677 $self->contr->savebed ($slaying, $hp, $sp)
2678 if $exit->flag (FLAG_DAMNED);
2679
2074 (async { 2680 (async {
2681 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2682
2075 $self->deactivate_recursive; # just to be sure 2683 $self->deactivate_recursive; # just to be sure
2076 unless (eval { 2684 unless (eval {
2077 $self->goto ($slaying, $hp, $sp); 2685 $self->goto ($slaying, $hp, $sp);
2078 2686
2079 1; 2687 1;
… …
2105 2713
2106 utf8::encode $text; 2714 utf8::encode $text;
2107 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2715 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2108} 2716}
2109 2717
2718=item $client->send_msg ($channel, $msg, $color, [extra...])
2719
2720Send a drawinfo or msg packet to the client, formatting the msg for the
2721client if neccessary. C<$type> should be a string identifying the type of
2722the message, with C<log> being the default. If C<$color> is negative, suppress
2723the message unless the client supports the msg packet.
2724
2725=cut
2726
2727# non-persistent channels (usually the info channel)
2728our %CHANNEL = (
2729 "c/identify" => {
2730 id => "infobox",
2731 title => "Identify",
2732 reply => undef,
2733 tooltip => "Items recently identified",
2734 },
2735 "c/examine" => {
2736 id => "infobox",
2737 title => "Examine",
2738 reply => undef,
2739 tooltip => "Signs and other items you examined",
2740 },
2741 "c/book" => {
2742 id => "infobox",
2743 title => "Book",
2744 reply => undef,
2745 tooltip => "The contents of a note or book",
2746 },
2747 "c/lookat" => {
2748 id => "infobox",
2749 title => "Look",
2750 reply => undef,
2751 tooltip => "What you saw there",
2752 },
2753 "c/who" => {
2754 id => "infobox",
2755 title => "Players",
2756 reply => undef,
2757 tooltip => "Shows players who are currently online",
2758 },
2759 "c/body" => {
2760 id => "infobox",
2761 title => "Body Parts",
2762 reply => undef,
2763 tooltip => "Shows which body parts you posess and are available",
2764 },
2765 "c/uptime" => {
2766 id => "infobox",
2767 title => "Uptime",
2768 reply => undef,
2769 tooltip => "How long the server has been running since last restart",
2770 },
2771 "c/mapinfo" => {
2772 id => "infobox",
2773 title => "Map Info",
2774 reply => undef,
2775 tooltip => "Information related to the maps",
2776 },
2777);
2778
2779sub cf::client::send_msg {
2780 my ($self, $channel, $msg, $color, @extra) = @_;
2781
2782 $msg = $self->pl->expand_cfpod ($msg);
2783
2784 $color &= cf::NDI_CLIENT_MASK; # just in case...
2785
2786 # check predefined channels, for the benefit of C
2787 if ($CHANNEL{$channel}) {
2788 $channel = $CHANNEL{$channel};
2789
2790 $self->ext_msg (channel_info => $channel)
2791 if $self->can_msg;
2792
2793 $channel = $channel->{id};
2794
2795 } elsif (ref $channel) {
2796 # send meta info to client, if not yet sent
2797 unless (exists $self->{channel}{$channel->{id}}) {
2798 $self->{channel}{$channel->{id}} = $channel;
2799 $self->ext_msg (channel_info => $channel)
2800 if $self->can_msg;
2801 }
2802
2803 $channel = $channel->{id};
2804 }
2805
2806 return unless @extra || length $msg;
2807
2808 if ($self->can_msg) {
2809 # default colour, mask it out
2810 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2811 if $color & cf::NDI_DEF;
2812
2813 $self->send_packet ("msg " . $self->{json_coder}->encode (
2814 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2815 } else {
2816 if ($color >= 0) {
2817 # replace some tags by gcfclient-compatible ones
2818 for ($msg) {
2819 1 while
2820 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2821 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2822 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2823 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2824 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2825 }
2826
2827 $color &= cf::NDI_COLOR_MASK;
2828
2829 utf8::encode $msg;
2830
2831 if (0 && $msg =~ /\[/) {
2832 # COMMAND/INFO
2833 $self->send_packet ("drawextinfo $color 10 8 $msg")
2834 } else {
2835 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2836 $self->send_packet ("drawinfo $color $msg")
2837 }
2838 }
2839 }
2840}
2841
2110=item $client->ext_event ($type, %msg) 2842=item $client->ext_msg ($type, @msg)
2111 2843
2112Sends an exti event to the client. 2844Sends an ext event to the client.
2113 2845
2114=cut 2846=cut
2115 2847
2116sub cf::client::ext_event($$%) { 2848sub cf::client::ext_msg($$@) {
2117 my ($self, $type, %msg) = @_; 2849 my ($self, $type, @msg) = @_;
2118 2850
2851 if ($self->extcmd == 2) {
2852 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2853 } elsif ($self->extcmd == 1) { # TODO: remove
2119 $msg{msgtype} = "event_$type"; 2854 push @msg, msgtype => "event_$type";
2120 $self->send_packet ("ext " . cf::to_json \%msg); 2855 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2856 }
2857}
2858
2859=item $client->ext_reply ($msgid, @msg)
2860
2861Sends an ext reply to the client.
2862
2863=cut
2864
2865sub cf::client::ext_reply($$@) {
2866 my ($self, $id, @msg) = @_;
2867
2868 if ($self->extcmd == 2) {
2869 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2870 } elsif ($self->extcmd == 1) {
2871 #TODO: version 1, remove
2872 unshift @msg, msgtype => "reply", msgid => $id;
2873 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2874 }
2121} 2875}
2122 2876
2123=item $success = $client->query ($flags, "text", \&cb) 2877=item $success = $client->query ($flags, "text", \&cb)
2124 2878
2125Queues a query to the client, calling the given callback with 2879Queues a query to the client, calling the given callback with
2126the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2880the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2127C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2881C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2128 2882
2129Queries can fail, so check the return code. Or don't, as queries will become 2883Queries can fail, so check the return code. Or don't, as queries will
2130reliable at some point in the future. 2884become reliable at some point in the future.
2131 2885
2132=cut 2886=cut
2133 2887
2134sub cf::client::query { 2888sub cf::client::query {
2135 my ($self, $flags, $text, $cb) = @_; 2889 my ($self, $flags, $text, $cb) = @_;
… …
2143 utf8::encode $text; 2897 utf8::encode $text;
2144 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2898 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2145 2899
2146 $self->send_packet ($self->{query_queue}[0][0]) 2900 $self->send_packet ($self->{query_queue}[0][0])
2147 if @{ $self->{query_queue} } == 1; 2901 if @{ $self->{query_queue} } == 1;
2902
2903 1
2148} 2904}
2149 2905
2150cf::client->attach ( 2906cf::client->attach (
2907 on_connect => sub {
2908 my ($ns) = @_;
2909
2910 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2911 },
2151 on_reply => sub { 2912 on_reply => sub {
2152 my ($ns, $msg) = @_; 2913 my ($ns, $msg) = @_;
2153 2914
2154 # this weird shuffling is so that direct followup queries 2915 # this weird shuffling is so that direct followup queries
2155 # get handled first 2916 # get handled first
… …
2167 } else { 2928 } else {
2168 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2929 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2169 } 2930 }
2170 } 2931 }
2171 }, 2932 },
2933 on_exticmd => sub {
2934 my ($ns, $buf) = @_;
2935
2936 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2937
2938 if (ref $msg) {
2939 my ($type, $reply, @payload) =
2940 "ARRAY" eq ref $msg
2941 ? @$msg
2942 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2943
2944 my @reply;
2945
2946 if (my $cb = $EXTICMD{$type}) {
2947 @reply = $cb->($ns, @payload);
2948 }
2949
2950 $ns->ext_reply ($reply, @reply)
2951 if $reply;
2952
2953 } else {
2954 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2955 }
2956
2957 cf::override;
2958 },
2172); 2959);
2173 2960
2174=item $client->async (\&cb) 2961=item $client->async (\&cb)
2175 2962
2176Create a new coroutine, running the specified callback. The coroutine will 2963Create a new coroutine, running the specified callback. The coroutine will
… …
2217our $safe = new Safe "safe"; 3004our $safe = new Safe "safe";
2218our $safe_hole = new Safe::Hole; 3005our $safe_hole = new Safe::Hole;
2219 3006
2220$SIG{FPE} = 'IGNORE'; 3007$SIG{FPE} = 'IGNORE';
2221 3008
2222$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3009$safe->permit_only (Opcode::opset qw(
3010 :base_core :base_mem :base_orig :base_math
3011 grepstart grepwhile mapstart mapwhile
3012 sort time
3013));
2223 3014
2224# here we export the classes and methods available to script code 3015# here we export the classes and methods available to script code
2225 3016
2226=pod 3017=pod
2227 3018
2228The following functions and methods are available within a safe environment: 3019The following functions and methods are available within a safe environment:
2229 3020
2230 cf::object contr pay_amount pay_player map 3021 cf::object
3022 contr pay_amount pay_player map x y force_find force_add destroy
3023 insert remove name archname title slaying race decrease_ob_nr
3024
2231 cf::object::player player 3025 cf::object::player
2232 cf::player peaceful 3026 player
2233 cf::map trigger 3027
3028 cf::player
3029 peaceful
3030
3031 cf::map
3032 trigger
2234 3033
2235=cut 3034=cut
2236 3035
2237for ( 3036for (
2238 ["cf::object" => qw(contr pay_amount pay_player map)], 3037 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3038 insert remove inv name archname title slaying race
3039 decrease_ob_nr destroy)],
2239 ["cf::object::player" => qw(player)], 3040 ["cf::object::player" => qw(player)],
2240 ["cf::player" => qw(peaceful)], 3041 ["cf::player" => qw(peaceful)],
2241 ["cf::map" => qw(trigger)], 3042 ["cf::map" => qw(trigger)],
2242) { 3043) {
2243 no strict 'refs'; 3044 no strict 'refs';
… …
2314=back 3115=back
2315 3116
2316=cut 3117=cut
2317 3118
2318############################################################################# 3119#############################################################################
2319
2320=head2 EXTENSION DATABASE SUPPORT
2321
2322Crossfire maintains a very simple database for extension use. It can
2323currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2324convert to/from binary).
2325
2326The parameter C<$family> should best start with the name of the extension
2327using it, it should be unique.
2328
2329=over 4
2330
2331=item $value = cf::db_get $family => $key
2332
2333Returns a single value from the database.
2334
2335=item cf::db_put $family => $key => $value
2336
2337Stores the given C<$value> in the family.
2338
2339=cut
2340
2341our $DB;
2342
2343sub db_init {
2344 unless ($DB) {
2345 $DB = BDB::db_create $DB_ENV;
2346
2347 cf::sync_job {
2348 eval {
2349 $DB->set_flags (BDB::CHKSUM);
2350
2351 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2352 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2353 cf::cleanup "db_open(db): $!" if $!;
2354 };
2355 cf::cleanup "db_open(db): $@" if $@;
2356 };
2357 }
2358}
2359
2360sub db_get($$) {
2361 my $key = "$_[0]/$_[1]";
2362
2363 cf::sync_job {
2364 BDB::db_get $DB, undef, $key, my $data;
2365
2366 $! ? ()
2367 : $data
2368 }
2369}
2370
2371sub db_put($$$) {
2372 BDB::dbreq_pri 4;
2373 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2374}
2375
2376=item cf::cache $id => [$paths...], $processversion => $process
2377
2378Generic caching function that returns the value of the resource $id,
2379caching and regenerating as required.
2380
2381This function can block.
2382
2383=cut
2384
2385sub cache {
2386 my ($id, $src, $processversion, $process) = @_;
2387
2388 my $meta =
2389 join "\x00",
2390 $processversion,
2391 map {
2392 aio_stat $_
2393 and Carp::croak "$_: $!";
2394
2395 ($_, (stat _)[7,9])
2396 } @$src;
2397
2398 my $dbmeta = db_get cache => "$id/meta";
2399 if ($dbmeta ne $meta) {
2400 # changed, we may need to process
2401
2402 my @data;
2403 my $md5;
2404
2405 for (0 .. $#$src) {
2406 0 <= aio_load $src->[$_], $data[$_]
2407 or Carp::croak "$src->[$_]: $!";
2408 }
2409
2410 # if processing is expensive, check
2411 # checksum first
2412 if (1) {
2413 $md5 =
2414 join "\x00",
2415 $processversion,
2416 map {
2417 Coro::cede;
2418 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2419 } 0.. $#$src;
2420
2421
2422 my $dbmd5 = db_get cache => "$id/md5";
2423 if ($dbmd5 eq $md5) {
2424 db_put cache => "$id/meta", $meta;
2425
2426 return db_get cache => "$id/data";
2427 }
2428 }
2429
2430 my $t1 = Time::HiRes::time;
2431 my $data = $process->(\@data);
2432 my $t2 = Time::HiRes::time;
2433
2434 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2435
2436 db_put cache => "$id/data", $data;
2437 db_put cache => "$id/md5" , $md5;
2438 db_put cache => "$id/meta", $meta;
2439
2440 return $data;
2441 }
2442
2443 db_get cache => "$id/data"
2444}
2445
2446=item fork_call { }, $args
2447
2448Executes the given code block with the given arguments in a seperate
2449process, returning the results. Everything must be serialisable with
2450Coro::Storable. May, of course, block. Note that the executed sub may
2451never block itself or use any form of Event handling.
2452
2453=cut
2454
2455sub fork_call(&@) {
2456 my ($cb, @args) = @_;
2457
2458# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2459# or die "socketpair: $!";
2460 pipe my $fh1, my $fh2
2461 or die "pipe: $!";
2462
2463 if (my $pid = fork) {
2464 close $fh2;
2465
2466 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2467 $res = Coro::Storable::thaw $res;
2468
2469 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2470
2471 die $$res unless "ARRAY" eq ref $res;
2472
2473 return wantarray ? @$res : $res->[-1];
2474 } else {
2475 reset_signals;
2476 local $SIG{__WARN__};
2477 local $SIG{__DIE__};
2478 eval {
2479 close $fh1;
2480
2481 my @res = eval { $cb->(@args) };
2482 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2483 };
2484
2485 warn $@ if $@;
2486 _exit 0;
2487 }
2488}
2489
2490
2491
2492#############################################################################
2493# the server's init and main functions 3120# the server's init and main functions
2494 3121
2495sub load_facedata($) { 3122sub load_facedata($) {
2496 my ($path) = @_; 3123 my ($path) = @_;
3124
3125 # HACK to clear player env face cache, we need some signal framework
3126 # for this (global event?)
3127 %ext::player_env::MUSIC_FACE_CACHE = ();
3128
3129 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2497 3130
2498 warn "loading facedata from $path\n"; 3131 warn "loading facedata from $path\n";
2499 3132
2500 my $facedata; 3133 my $facedata;
2501 0 < aio_load $path, $facedata 3134 0 < aio_load $path, $facedata
… …
2504 $facedata = Coro::Storable::thaw $facedata; 3137 $facedata = Coro::Storable::thaw $facedata;
2505 3138
2506 $facedata->{version} == 2 3139 $facedata->{version} == 2
2507 or cf::cleanup "$path: version mismatch, cannot proceed."; 3140 or cf::cleanup "$path: version mismatch, cannot proceed.";
2508 3141
3142 # patch in the exptable
3143 $facedata->{resource}{"res/exp_table"} = {
3144 type => FT_RSRC,
3145 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3146 };
3147 cf::cede_to_tick;
3148
2509 { 3149 {
2510 my $faces = $facedata->{faceinfo}; 3150 my $faces = $facedata->{faceinfo};
2511 3151
2512 while (my ($face, $info) = each %$faces) { 3152 while (my ($face, $info) = each %$faces) {
2513 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3153 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2514 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3154 cf::face::set_visibility $idx, $info->{visibility};
3155 cf::face::set_magicmap $idx, $info->{magicmap};
2515 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3156 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2516 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3157 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2517 Coro::cede; 3158
3159 cf::cede_to_tick;
2518 } 3160 }
2519 3161
2520 while (my ($face, $info) = each %$faces) { 3162 while (my ($face, $info) = each %$faces) {
2521 next unless $info->{smooth}; 3163 next unless $info->{smooth};
2522 my $idx = cf::face::find $face 3164 my $idx = cf::face::find $face
2523 or next; 3165 or next;
2524 if (my $smooth = cf::face::find $info->{smooth}) { 3166 if (my $smooth = cf::face::find $info->{smooth}) {
3167 cf::face::set_smooth $idx, $smooth;
2525 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3168 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2526 } else { 3169 } else {
2527 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3170 warn "smooth face '$info->{smooth}' not found for face '$face'";
2528 } 3171 }
2529 Coro::cede; 3172
3173 cf::cede_to_tick;
2530 } 3174 }
2531 } 3175 }
2532 3176
2533 { 3177 {
2534 my $anims = $facedata->{animinfo}; 3178 my $anims = $facedata->{animinfo};
2535 3179
2536 while (my ($anim, $info) = each %$anims) { 3180 while (my ($anim, $info) = each %$anims) {
2537 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3181 cf::anim::set $anim, $info->{frames}, $info->{facings};
2538 Coro::cede; 3182 cf::cede_to_tick;
2539 } 3183 }
2540 3184
2541 cf::anim::invalidate_all; # d'oh 3185 cf::anim::invalidate_all; # d'oh
2542 } 3186 }
2543 3187
3188 {
3189 # TODO: for gcfclient pleasure, we should give resources
3190 # that gcfclient doesn't grok a >10000 face index.
3191 my $res = $facedata->{resource};
3192
3193 my $soundconf = delete $res->{"res/sound.conf"};
3194
3195 while (my ($name, $info) = each %$res) {
3196 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3197 my $data;
3198
3199 if ($info->{type} & 1) {
3200 # prepend meta info
3201
3202 my $meta = $enc->encode ({
3203 name => $name,
3204 %{ $info->{meta} || {} },
3205 });
3206
3207 $data = pack "(w/a*)*", $meta, $info->{data};
3208 } else {
3209 $data = $info->{data};
3210 }
3211
3212 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3213 cf::face::set_type $idx, $info->{type};
3214
3215 cf::cede_to_tick;
3216 }
3217
3218 if ($soundconf) {
3219 $soundconf = $enc->decode (delete $soundconf->{data});
3220
3221 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3222 my $sound = $soundconf->{compat}[$_]
3223 or next;
3224
3225 my $face = cf::face::find "sound/$sound->[1]";
3226 cf::sound::set $sound->[0] => $face;
3227 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3228 }
3229
3230 while (my ($k, $v) = each %{$soundconf->{event}}) {
3231 my $face = cf::face::find "sound/$v";
3232 cf::sound::set $k => $face;
3233 }
3234 }
3235 }
3236
2544 1 3237 1
2545} 3238}
2546 3239
3240register_exticmd fx_want => sub {
3241 my ($ns, $want) = @_;
3242
3243 while (my ($k, $v) = each %$want) {
3244 $ns->fx_want ($k, $v);
3245 }
3246};
3247
2547sub reload_regions { 3248sub reload_regions {
3249 # HACK to clear player env face cache, we need some signal framework
3250 # for this (global event?)
3251 %ext::player_env::MUSIC_FACE_CACHE = ();
3252
2548 load_resource_file "$MAPDIR/regions" 3253 load_resource_file "$MAPDIR/regions"
2549 or die "unable to load regions file\n"; 3254 or die "unable to load regions file\n";
3255
3256 for (cf::region::list) {
3257 $_->{match} = qr/$_->{match}/
3258 if exists $_->{match};
3259 }
2550} 3260}
2551 3261
2552sub reload_facedata { 3262sub reload_facedata {
2553 load_facedata "$DATADIR/facedata" 3263 load_facedata "$DATADIR/facedata"
2554 or die "unable to load facedata\n"; 3264 or die "unable to load facedata\n";
2555} 3265}
2556 3266
2557sub reload_archetypes { 3267sub reload_archetypes {
2558 load_resource_file "$DATADIR/archetypes" 3268 load_resource_file "$DATADIR/archetypes"
2559 or die "unable to load archetypes\n"; 3269 or die "unable to load archetypes\n";
3270 #d# NEED to laod twice to resolve forward references
3271 # this really needs to be done in an extra post-pass
3272 # (which needs to be synchronous, so solve it differently)
3273 load_resource_file "$DATADIR/archetypes"
3274 or die "unable to load archetypes\n";
2560} 3275}
2561 3276
2562sub reload_treasures { 3277sub reload_treasures {
2563 load_resource_file "$DATADIR/treasures" 3278 load_resource_file "$DATADIR/treasures"
2564 or die "unable to load treasurelists\n"; 3279 or die "unable to load treasurelists\n";
… …
2567sub reload_resources { 3282sub reload_resources {
2568 warn "reloading resource files...\n"; 3283 warn "reloading resource files...\n";
2569 3284
2570 reload_regions; 3285 reload_regions;
2571 reload_facedata; 3286 reload_facedata;
3287 #reload_archetypes;#d#
2572 reload_archetypes; 3288 reload_archetypes;
2573 reload_treasures; 3289 reload_treasures;
2574 3290
2575 warn "finished reloading resource files\n"; 3291 warn "finished reloading resource files\n";
2576} 3292}
2577 3293
2578sub init { 3294sub init {
2579 reload_resources; 3295 reload_resources;
2580} 3296}
2581 3297
2582sub cfg_load { 3298sub reload_config {
2583 open my $fh, "<:utf8", "$CONFDIR/config" 3299 open my $fh, "<:utf8", "$CONFDIR/config"
2584 or return; 3300 or return;
2585 3301
2586 local $/; 3302 local $/;
2587 *CFG = YAML::Syck::Load <$fh>; 3303 *CFG = YAML::Syck::Load <$fh>;
… …
2603sub main { 3319sub main {
2604 # we must not ever block the main coroutine 3320 # we must not ever block the main coroutine
2605 local $Coro::idle = sub { 3321 local $Coro::idle = sub {
2606 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3322 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2607 (async { 3323 (async {
2608 Event::one_event; 3324 $Coro::current->{desc} = "IDLE BUG HANDLER";
3325 EV::loop EV::LOOP_ONESHOT;
2609 })->prio (Coro::PRIO_MAX); 3326 })->prio (Coro::PRIO_MAX);
2610 }; 3327 };
2611 3328
2612 cfg_load; 3329 reload_config;
2613 db_init; 3330 db_init;
2614 load_extensions; 3331 load_extensions;
2615 3332
2616 $TICK_WATCHER->start; 3333 $TICK_WATCHER->start;
3334 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
2617 Event::loop; 3335 EV::loop;
2618} 3336}
2619 3337
2620############################################################################# 3338#############################################################################
2621# initialisation and cleanup 3339# initialisation and cleanup
2622 3340
2623# install some emergency cleanup handlers 3341# install some emergency cleanup handlers
2624BEGIN { 3342BEGIN {
3343 our %SIGWATCHER = ();
2625 for my $signal (qw(INT HUP TERM)) { 3344 for my $signal (qw(INT HUP TERM)) {
2626 Event->signal ( 3345 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2627 reentrant => 0,
2628 data => WF_AUTOCANCEL,
2629 signal => $signal,
2630 prio => 0,
2631 cb => sub {
2632 cf::cleanup "SIG$signal"; 3346 cf::cleanup "SIG$signal";
2633 },
2634 ); 3347 };
3348 }
3349}
3350
3351sub write_runtime {
3352 my $runtime = "$LOCALDIR/runtime";
3353
3354 # first touch the runtime file to show we are still running:
3355 # the fsync below can take a very very long time.
3356
3357 IO::AIO::aio_utime $runtime, undef, undef;
3358
3359 my $guard = cf::lock_acquire "write_runtime";
3360
3361 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3362 or return;
3363
3364 my $value = $cf::RUNTIME + 90 + 10;
3365 # 10 is the runtime save interval, for a monotonic clock
3366 # 60 allows for the watchdog to kill the server.
3367
3368 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3369 and return;
3370
3371 # always fsync - this file is important
3372 aio_fsync $fh
3373 and return;
3374
3375 # touch it again to show we are up-to-date
3376 aio_utime $fh, undef, undef;
3377
3378 close $fh
3379 or return;
3380
3381 aio_rename "$runtime~", $runtime
3382 and return;
3383
3384 warn "runtime file written.\n";
3385
2635 } 3386 1
2636} 3387}
2637 3388
2638sub emergency_save() { 3389sub emergency_save() {
2639 my $freeze_guard = cf::freeze_mainloop; 3390 my $freeze_guard = cf::freeze_mainloop;
2640 3391
… …
2646 # and maps saved/destroyed asynchronously. 3397 # and maps saved/destroyed asynchronously.
2647 warn "begin emergency player save\n"; 3398 warn "begin emergency player save\n";
2648 for my $login (keys %cf::PLAYER) { 3399 for my $login (keys %cf::PLAYER) {
2649 my $pl = $cf::PLAYER{$login} or next; 3400 my $pl = $cf::PLAYER{$login} or next;
2650 $pl->valid or next; 3401 $pl->valid or next;
3402 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2651 $pl->save; 3403 $pl->save;
2652 } 3404 }
2653 warn "end emergency player save\n"; 3405 warn "end emergency player save\n";
2654 3406
2655 warn "begin emergency map save\n"; 3407 warn "begin emergency map save\n";
… …
2694 warn "syncing database to disk"; 3446 warn "syncing database to disk";
2695 BDB::db_env_txn_checkpoint $DB_ENV; 3447 BDB::db_env_txn_checkpoint $DB_ENV;
2696 3448
2697 # if anything goes wrong in here, we should simply crash as we already saved 3449 # if anything goes wrong in here, we should simply crash as we already saved
2698 3450
2699 warn "cancelling all WF_AUTOCANCEL watchers";
2700 for (Event::all_watchers) {
2701 $_->cancel if $_->data & WF_AUTOCANCEL;
2702 }
2703
2704 warn "flushing outstanding aio requests"; 3451 warn "flushing outstanding aio requests";
2705 for (;;) { 3452 for (;;) {
2706 BDB::flush; 3453 BDB::flush;
2707 IO::AIO::flush; 3454 IO::AIO::flush;
2708 Coro::cede; 3455 Coro::cede_notself;
2709 last unless IO::AIO::nreqs || BDB::nreqs; 3456 last unless IO::AIO::nreqs || BDB::nreqs;
2710 warn "iterate..."; 3457 warn "iterate...";
2711 } 3458 }
2712 3459
2713 ++$RELOAD; 3460 ++$RELOAD;
… …
2717 %EXT_CORO = (); 3464 %EXT_CORO = ();
2718 3465
2719 warn "removing commands"; 3466 warn "removing commands";
2720 %COMMAND = (); 3467 %COMMAND = ();
2721 3468
2722 warn "removing ext commands"; 3469 warn "removing ext/exti commands";
2723 %EXTCMD = (); 3470 %EXTCMD = ();
3471 %EXTICMD = ();
2724 3472
2725 warn "unloading/nuking all extensions"; 3473 warn "unloading/nuking all extensions";
2726 for my $pkg (@EXTS) { 3474 for my $pkg (@EXTS) {
2727 warn "... unloading $pkg"; 3475 warn "... unloading $pkg";
2728 3476
… …
2771 warn "reloading cf.pm"; 3519 warn "reloading cf.pm";
2772 require cf; 3520 require cf;
2773 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3521 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2774 3522
2775 warn "loading config and database again"; 3523 warn "loading config and database again";
2776 cf::cfg_load; 3524 cf::reload_config;
2777 3525
2778 warn "loading extensions"; 3526 warn "loading extensions";
2779 cf::load_extensions; 3527 cf::load_extensions;
2780 3528
2781 warn "reattaching attachments to objects/players"; 3529 warn "reattaching attachments to objects/players";
… …
2801 3549
2802sub reload_perl() { 3550sub reload_perl() {
2803 # doing reload synchronously and two reloads happen back-to-back, 3551 # doing reload synchronously and two reloads happen back-to-back,
2804 # coro crashes during coro_state_free->destroy here. 3552 # coro crashes during coro_state_free->destroy here.
2805 3553
2806 $RELOAD_WATCHER ||= Event->timer ( 3554 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
2807 reentrant => 0,
2808 after => 0,
2809 data => WF_AUTOCANCEL,
2810 cb => sub {
2811 do_reload_perl;
2812 undef $RELOAD_WATCHER; 3555 undef $RELOAD_WATCHER;
2813 }, 3556 do_reload_perl;
2814 ); 3557 };
2815} 3558}
2816 3559
2817register_command "reload" => sub { 3560register_command "reload" => sub {
2818 my ($who, $arg) = @_; 3561 my ($who, $arg) = @_;
2819 3562
2820 if ($who->flag (FLAG_WIZ)) { 3563 if ($who->flag (FLAG_WIZ)) {
2821 $who->message ("reloading server."); 3564 $who->message ("reloading server.");
3565 async {
3566 $Coro::current->{desc} = "perl_reload";
2822 async { reload_perl }; 3567 reload_perl;
3568 };
2823 } 3569 }
2824}; 3570};
2825 3571
2826unshift @INC, $LIBDIR; 3572unshift @INC, $LIBDIR;
2827 3573
… …
2846 my $signal = new Coro::Signal; 3592 my $signal = new Coro::Signal;
2847 push @WAIT_FOR_TICK_BEGIN, $signal; 3593 push @WAIT_FOR_TICK_BEGIN, $signal;
2848 $signal->wait; 3594 $signal->wait;
2849} 3595}
2850 3596
2851$TICK_WATCHER = Event->timer ( 3597$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
2852 reentrant => 0,
2853 parked => 1,
2854 prio => 0,
2855 at => $NEXT_TICK || $TICK,
2856 data => WF_AUTOCANCEL,
2857 cb => sub {
2858 if ($Coro::current != $Coro::main) { 3598 if ($Coro::current != $Coro::main) {
2859 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3599 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2860 unless ++$bug_warning > 10; 3600 unless ++$bug_warning > 10;
2861 return; 3601 return;
2862 } 3602 }
2863 3603
2864 $NOW = $tick_start = Event::time; 3604 $NOW = $tick_start = EV::now;
2865 3605
2866 cf::server_tick; # one server iteration 3606 cf::server_tick; # one server iteration
2867 3607
2868 $RUNTIME += $TICK; 3608 $RUNTIME += $TICK;
2869 $NEXT_TICK += $TICK; 3609 $NEXT_TICK = $_[0]->at;
2870 3610
2871 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3611 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2872 $NEXT_RUNTIME_WRITE = $NOW + 10; 3612 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
2873 Coro::async_pool { 3613 Coro::async_pool {
3614 $Coro::current->{desc} = "runtime saver";
2874 write_runtime 3615 write_runtime
2875 or warn "ERROR: unable to write runtime file: $!"; 3616 or warn "ERROR: unable to write runtime file: $!";
2876 };
2877 } 3617 };
3618 }
2878 3619
2879# my $AFTER = Event::time;
2880# warn $AFTER - $NOW;#d#
2881
2882 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3620 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2883 $sig->send; 3621 $sig->send;
2884 } 3622 }
2885 while (my $sig = shift @WAIT_FOR_TICK) { 3623 while (my $sig = shift @WAIT_FOR_TICK) {
2886 $sig->send; 3624 $sig->send;
2887 } 3625 }
2888 3626
2889 $NOW = Event::time;
2890
2891 # if we are delayed by four ticks or more, skip them all
2892 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2893
2894 $TICK_WATCHER->at ($NEXT_TICK);
2895 $TICK_WATCHER->start;
2896
2897 $LOAD = ($NOW - $tick_start) / $TICK; 3627 $LOAD = ($NOW - $tick_start) / $TICK;
2898 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3628 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2899 3629
2900 _post_tick; 3630 _post_tick;
2901 3631};
2902 3632$TICK_WATCHER->priority (EV::MAXPRI);
2903 },
2904);
2905 3633
2906{ 3634{
2907 BDB::max_poll_time $TICK * 0.1; 3635 # configure BDB
2908 $BDB_POLL_WATCHER = Event->io ( 3636
2909 reentrant => 0,
2910 fd => BDB::poll_fileno,
2911 poll => 'r',
2912 prio => 0,
2913 data => WF_AUTOCANCEL,
2914 cb => \&BDB::poll_cb,
2915 );
2916 BDB::min_parallel 8; 3637 BDB::min_parallel 8;
2917 3638 BDB::max_poll_reqs $TICK * 0.1;
2918 BDB::set_sync_prepare { 3639 $Coro::BDB::WATCHER->priority (1);
2919 my $status;
2920 my $current = $Coro::current;
2921 (
2922 sub {
2923 $status = $!;
2924 $current->ready; undef $current;
2925 },
2926 sub {
2927 Coro::schedule while defined $current;
2928 $! = $status;
2929 },
2930 )
2931 };
2932 3640
2933 unless ($DB_ENV) { 3641 unless ($DB_ENV) {
2934 $DB_ENV = BDB::db_env_create; 3642 $DB_ENV = BDB::db_env_create;
3643 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3644 | BDB::LOG_AUTOREMOVE, 1);
3645 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3646 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
2935 3647
2936 cf::sync_job { 3648 cf::sync_job {
2937 eval { 3649 eval {
2938 BDB::db_env_open 3650 BDB::db_env_open
2939 $DB_ENV, 3651 $DB_ENV,
… …
2941 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3653 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2942 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3654 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2943 0666; 3655 0666;
2944 3656
2945 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3657 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2946
2947 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2948 $DB_ENV->set_lk_detect;
2949 }; 3658 };
2950 3659
2951 cf::cleanup "db_env_open(db): $@" if $@; 3660 cf::cleanup "db_env_open(db): $@" if $@;
2952 }; 3661 };
2953 } 3662 }
3663
3664 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3665 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3666 };
3667 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3668 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3669 };
3670 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3671 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3672 };
2954} 3673}
2955 3674
2956{ 3675{
3676 # configure IO::AIO
3677
2957 IO::AIO::min_parallel 8; 3678 IO::AIO::min_parallel 8;
2958
2959 undef $Coro::AIO::WATCHER;
2960 IO::AIO::max_poll_time $TICK * 0.1; 3679 IO::AIO::max_poll_time $TICK * 0.1;
2961 $AIO_POLL_WATCHER = Event->io ( 3680 $Coro::AIO::WATCHER->priority (1);
2962 reentrant => 0,
2963 data => WF_AUTOCANCEL,
2964 fd => IO::AIO::poll_fileno,
2965 poll => 'r',
2966 prio => 6,
2967 cb => \&IO::AIO::poll_cb,
2968 );
2969} 3681}
2970 3682
2971my $_log_backtrace; 3683my $_log_backtrace;
2972 3684
2973sub _log_backtrace { 3685sub _log_backtrace {
… …
2977 3689
2978 # limit the # of concurrent backtraces 3690 # limit the # of concurrent backtraces
2979 if ($_log_backtrace < 2) { 3691 if ($_log_backtrace < 2) {
2980 ++$_log_backtrace; 3692 ++$_log_backtrace;
2981 async { 3693 async {
3694 $Coro::current->{desc} = "abt $msg";
3695
2982 my @bt = fork_call { 3696 my @bt = fork_call {
2983 @addr = map { sprintf "%x", $_ } @addr; 3697 @addr = map { sprintf "%x", $_ } @addr;
2984 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3698 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
2985 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3699 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
2986 or die "addr2line: $!"; 3700 or die "addr2line: $!";

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines