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.263 by root, Sat May 5 05:40:27 2007 UTC vs.
Revision 1.402 by root, Mon Dec 17 07:03:32 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;
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
100
101our $LOAD; # a number between 0 (idle) and 1 (too many objects)
102our $LOADAVG; # same thing, but with alpha-smoothing
103our $tick_start; # for load detecting purposes
94 104
95binmode STDOUT; 105binmode STDOUT;
96binmode STDERR; 106binmode STDERR;
97 107
98# read virtual server time, if available 108# read virtual server time, if available
… …
139 149
140=item $cf::TICK 150=item $cf::TICK
141 151
142The interval between server ticks, in seconds. 152The interval between server ticks, in seconds.
143 153
154=item $cf::LOADAVG
155
156The current CPU load on the server (alpha-smoothed), as a value between 0
157(none) and 1 (overloaded), indicating how much time is spent on processing
158objects per tick. Healthy values are < 0.5.
159
160=item $cf::LOAD
161
162The raw value load value from the last tick.
163
144=item %cf::CFG 164=item %cf::CFG
145 165
146Configuration for the server, loaded from C</etc/crossfire/config>, or 166Configuration for the server, loaded from C</etc/deliantra-server/config>, or
147from wherever your confdir points to. 167from wherever your confdir points to.
148 168
149=item cf::wait_for_tick, cf::wait_for_tick_begin 169=item cf::wait_for_tick, cf::wait_for_tick_begin
150 170
151These 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
152returns 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
153per 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.
154 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
155=back 181=back
156 182
157=cut 183=cut
158 184
159BEGIN { 185BEGIN {
… …
163 $msg .= "\n" 189 $msg .= "\n"
164 unless $msg =~ /\n$/; 190 unless $msg =~ /\n$/;
165 191
166 $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;
167 193
168 utf8::encode $msg;
169 LOG llevError, $msg; 194 LOG llevError, $msg;
170 }; 195 };
171} 196}
172 197
173@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
174@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 199@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
175@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 200@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
176@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 201@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
177@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';
178@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)
179 205
180# 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
181# within the Safe compartment. 207# within the Safe compartment.
182for my $pkg (qw( 208for my $pkg (qw(
183 cf::global cf::attachable 209 cf::global cf::attachable
… …
188)) { 214)) {
189 no strict 'refs'; 215 no strict 'refs';
190 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
191} 217}
192 218
193$Event::DIED = sub { 219$EV::DIED = sub {
194 warn "error in event callback: @_"; 220 warn "error in event callback: @_";
195}; 221};
222
223#############################################################################
196 224
197=head2 UTILITY FUNCTIONS 225=head2 UTILITY FUNCTIONS
198 226
199=over 4 227=over 4
200 228
… …
219 $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;
220 $d 248 $d
221 } || "[unable to dump $_[0]: '$@']"; 249 } || "[unable to dump $_[0]: '$@']";
222} 250}
223 251
224use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
225
226=item $ref = cf::from_json $json 252=item $ref = cf::decode_json $json
227 253
228Converts a JSON string into the corresponding perl data structure. 254Converts a JSON string into the corresponding perl data structure.
229 255
230=item $json = cf::to_json $ref 256=item $json = cf::encode_json $ref
231 257
232Converts 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]) }
233 266
234=item cf::lock_wait $string 267=item cf::lock_wait $string
235 268
236Wait until the given lock is available. See cf::lock_acquire. 269Wait until the given lock is available. See cf::lock_acquire.
237 270
… …
240Wait 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
241a 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,
242for example when the coroutine gets canceled), the lock is automatically 275for example when the coroutine gets canceled), the lock is automatically
243returned. 276returned.
244 277
278Locks are *not* recursive, locking from the same coro twice results in a
279deadlocked coro.
280
245Lock 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
246uses map_find and cf::map::load uses map_load). 282uses map_find and cf::map::load uses map_load).
247 283
248=item $locked = cf::lock_active $string 284=item $locked = cf::lock_active $string
249 285
250Return 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.
251 287
252=cut 288=cut
253 289
254our %LOCK; 290our %LOCK;
291our %LOCKER;#d#
255 292
256sub lock_wait($) { 293sub lock_wait($) {
257 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#
258 300
259 # wait for lock, if any 301 # wait for lock, if any
260 while ($LOCK{$key}) { 302 while ($LOCK{$key}) {
261 push @{ $LOCK{$key} }, $Coro::current; 303 push @{ $LOCK{$key} }, $Coro::current;
262 Coro::schedule; 304 Coro::schedule;
… …
268 310
269 # wait, to be sure we are not locked 311 # wait, to be sure we are not locked
270 lock_wait $key; 312 lock_wait $key;
271 313
272 $LOCK{$key} = []; 314 $LOCK{$key} = [];
315 $LOCKER{$key} = $Coro::current;#d#
273 316
274 Coro::guard { 317 Coro::guard {
318 delete $LOCKER{$key};#d#
275 # wake up all waiters, to be on the safe side 319 # wake up all waiters, to be on the safe side
276 $_->ready for @{ delete $LOCK{$key} }; 320 $_->ready for @{ delete $LOCK{$key} };
277 } 321 }
278} 322}
279 323
… …
291 }; 335 };
292 $TICK_WATCHER->stop; 336 $TICK_WATCHER->stop;
293 $guard 337 $guard
294} 338}
295 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
296=item cf::async { BLOCK } 413=item cf::async { BLOCK }
297 414
298Currently the same as Coro::async_pool, meaning you cannot use 415Currently the same as Coro::async_pool, meaning you cannot use
299C<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
300thing you are allowed to do is call C<prio> on it. 417thing you are allowed to do is call C<prio> on it.
… …
303 420
304BEGIN { *async = \&Coro::async_pool } 421BEGIN { *async = \&Coro::async_pool }
305 422
306=item cf::sync_job { BLOCK } 423=item cf::sync_job { BLOCK }
307 424
308The design of crossfire+ requires that the main coro ($Coro::main) is 425The design of Deliantra requires that the main coroutine ($Coro::main)
309always able to handle events or runnable, as crossfire+ is only partly 426is always able to handle events or runnable, as Deliantra is only
310reentrant. 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.
311 429
312If 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
313the given BLOCK in another coroutine while waiting for the result. The 431the given BLOCK in another coroutine while waiting for the result. The
314server 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
315fast or be very important. 433fast or be very important.
… …
318 436
319sub sync_job(&) { 437sub sync_job(&) {
320 my ($job) = @_; 438 my ($job) = @_;
321 439
322 if ($Coro::current == $Coro::main) { 440 if ($Coro::current == $Coro::main) {
441 my $time = EV::time;
442
323 # this is the main coro, too bad, we have to block 443 # this is the main coro, too bad, we have to block
324 # till the operation succeeds, freezing the server :/ 444 # till the operation succeeds, freezing the server :/
325 445
446 LOG llevError, Carp::longmess "sync job";#d#
447
326 # TODO: use suspend/resume instead 448 # TODO: use suspend/resume instead
327 # (but this is cancel-safe) 449 # (but this is cancel-safe)
328 my $freeze_guard = freeze_mainloop; 450 my $freeze_guard = freeze_mainloop;
329 451
330 my $busy = 1; 452 my $busy = 1;
331 my @res; 453 my @res;
332 454
333 (async { 455 (async {
456 $Coro::current->desc ("sync job coro");
334 @res = eval { $job->() }; 457 @res = eval { $job->() };
335 warn $@ if $@; 458 warn $@ if $@;
336 undef $busy; 459 undef $busy;
337 })->prio (Coro::PRIO_MAX); 460 })->prio (Coro::PRIO_MAX);
338 461
339 while ($busy) { 462 while ($busy) {
340 Coro::cede or Event::one_event; 463 if (Coro::nready) {
464 Coro::cede_notself;
465 } else {
466 EV::loop EV::LOOP_ONESHOT;
341 } 467 }
468 }
469
470 $time = EV::time - $time;
471
472 LOG llevError | logBacktrace, Carp::longmess "long sync job"
473 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
474
475 $tick_start += $time; # do not account sync jobs to server load
342 476
343 wantarray ? @res : $res[0] 477 wantarray ? @res : $res[0]
344 } else { 478 } else {
345 # we are in another coroutine, how wonderful, everything just works 479 # we are in another coroutine, how wonderful, everything just works
346 480
… …
366 $EXT_CORO{$coro+0} = $coro; 500 $EXT_CORO{$coro+0} = $coro;
367 501
368 $coro 502 $coro
369} 503}
370 504
371sub write_runtime { 505=item fork_call { }, $args
372 my $guard = cf::lock_acquire "write_runtime";
373 506
374 my $runtime = "$LOCALDIR/runtime"; 507Executes the given code block with the given arguments in a seperate
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.
375 511
376 warn "starting to write runtime...\n";#d# 512=cut
377 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
378 or return;
379 513
380 my $value = $cf::RUNTIME + 90 + 10; 514sub fork_call(&@) {
381 # 10 is the runtime save interval, for a monotonic clock 515 my ($cb, @args) = @_;
382 # 60 allows for the watchdog to kill the server.
383 516
384 (aio_write $fh, 0, (length $value), $value, 0) <= 0 517 # we seemingly have to make a local copy of the whole thing,
385 and return; 518 # otherwise perl prematurely frees the stuff :/
519 # TODO: investigate and fix (likely this will be rather laborious)
386 520
387 # always fsync - this file is important 521 my @res = Coro::Util::fork_eval {
388 aio_fsync $fh 522 reset_signals;
389 and return; 523 &$cb
524 }, @args;
390 525
391 close $fh 526 wantarray ? @res : $res[-1]
392 or return; 527}
393 528
394 aio_rename "$runtime~", $runtime 529=item $value = cf::db_get $family => $key
395 and return;
396 530
397 warn "... done writing runtime.\n";#d# 531Returns a single value from the environment database.
398 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 $!;
556 };
557 cf::cleanup "db_open(db): $@" if $@;
558
559 $db
560}
561
562our $DB;
563
564sub db_init {
565 cf::sync_job {
566 $DB ||= db_table "db";
567 };
568}
569
570sub db_get($$) {
571 my $key = "$_[0]/$_[1]";
572
573 cf::sync_job {
574 BDB::db_get $DB, undef, $key, my $data;
575
576 $! ? ()
577 : $data
399 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"
400} 654}
401 655
402=item cf::datalog type => key => value, ... 656=item cf::datalog type => key => value, ...
403 657
404Log 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.
… …
422attach callbacks/event handlers (a collection of which is called an "attachment") 676attach callbacks/event handlers (a collection of which is called an "attachment")
423to it. All such attachable objects support the following methods. 677to it. All such attachable objects support the following methods.
424 678
425In 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>
426C<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
427crossfire+). 681Deliantra).
428 682
429=over 4 683=over 4
430 684
431=item $attachable->attach ($attachment, key => $value...) 685=item $attachable->attach ($attachment, key => $value...)
432 686
… …
595 $registry = $CB_TYPE[$object_type] ||= []; 849 $registry = $CB_TYPE[$object_type] ||= [];
596 850
597 } elsif ($type eq "subtype") { 851 } elsif ($type eq "subtype") {
598 defined $object_type or Carp::croak "subtype specified without type"; 852 defined $object_type or Carp::croak "subtype specified without type";
599 my $object_subtype = shift @arg; 853 my $object_subtype = shift @arg;
600 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 854 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
601 855
602 } elsif ($type eq "package") { 856 } elsif ($type eq "package") {
603 my $pkg = shift @arg; 857 my $pkg = shift @arg;
604 858
605 while (my ($name, $id) = each %cb_id) { 859 while (my ($name, $id) = each %cb_id) {
… …
634 _attach $registry, $klass, @attach; 888 _attach $registry, $klass, @attach;
635 } 889 }
636 890
637 $obj->{$name} = \%arg; 891 $obj->{$name} = \%arg;
638 } else { 892 } else {
639 warn "object uses attachment '$name' that is not available, postponing.\n"; 893 warn "object uses attachment '$name' which is not available, postponing.\n";
640 } 894 }
641 895
642 $obj->{_attachment}{$name} = undef; 896 $obj->{_attachment}{$name} = undef;
643} 897}
644 898
… …
646 if (ref $_[0]) { 900 if (ref $_[0]) {
647 _object_attach @_; 901 _object_attach @_;
648 } else { 902 } else {
649 _attach shift->_attach_registry, @_; 903 _attach shift->_attach_registry, @_;
650 } 904 }
905 _recalc_want;
651}; 906};
652 907
653# all those should be optimised 908# all those should be optimised
654sub cf::attachable::detach { 909sub cf::attachable::detach {
655 my ($obj, $name) = @_; 910 my ($obj, $name) = @_;
… …
658 delete $obj->{_attachment}{$name}; 913 delete $obj->{_attachment}{$name};
659 reattach ($obj); 914 reattach ($obj);
660 } else { 915 } else {
661 Carp::croak "cannot, currently, detach class attachments"; 916 Carp::croak "cannot, currently, detach class attachments";
662 } 917 }
918 _recalc_want;
663}; 919};
664 920
665sub cf::attachable::attached { 921sub cf::attachable::attached {
666 my ($obj, $name) = @_; 922 my ($obj, $name) = @_;
667 923
… …
682 "; 938 ";
683 die if $@; 939 die if $@;
684} 940}
685 941
686our $override; 942our $override;
687our @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?
688 944
689sub override { 945sub override {
690 $override = 1; 946 $override = 1;
691 @invoke_results = (); 947 @INVOKE_RESULTS = (@_);
692} 948}
693 949
694sub do_invoke { 950sub do_invoke {
695 my $event = shift; 951 my $event = shift;
696 my $callbacks = shift; 952 my $callbacks = shift;
697 953
698 @invoke_results = (); 954 @INVOKE_RESULTS = ();
699 955
700 local $override; 956 local $override;
701 957
702 for (@$callbacks) { 958 for (@$callbacks) {
703 eval { &{$_->[1]} }; 959 eval { &{$_->[1]} };
… …
720 976
721Generate an object-specific event with the given arguments. 977Generate an object-specific event with the given arguments.
722 978
723This 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
724removed 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
725results (if you must, access C<@cf::invoke_results> directly). 981results (if you must, access C<@cf::INVOKE_RESULTS> directly).
726 982
727=back 983=back
728 984
729=cut 985=cut
730 986
731############################################################################# 987#############################################################################
732# 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}
733 1031
734sub reattach { 1032sub reattach {
735 # basically do the same as instantiate, without calling instantiate 1033 # basically do the same as instantiate, without calling instantiate
736 my ($obj) = @_; 1034 my ($obj) = @_;
737 1035
… …
758cf::attachable->attach ( 1056cf::attachable->attach (
759 prio => -1000000, 1057 prio => -1000000,
760 on_instantiate => sub { 1058 on_instantiate => sub {
761 my ($obj, $data) = @_; 1059 my ($obj, $data) = @_;
762 1060
763 $data = from_json $data; 1061 $data = decode_json $data;
764 1062
765 for (@$data) { 1063 for (@$data) {
766 my ($name, $args) = @$_; 1064 my ($name, $args) = @$_;
767 1065
768 $obj->attach ($name, %{$args || {} }); 1066 $obj->attach ($name, %{$args || {} });
… …
784sub object_freezer_save { 1082sub object_freezer_save {
785 my ($filename, $rdata, $objs) = @_; 1083 my ($filename, $rdata, $objs) = @_;
786 1084
787 sync_job { 1085 sync_job {
788 if (length $$rdata) { 1086 if (length $$rdata) {
1087 utf8::decode (my $decname = $filename);
789 warn sprintf "saving %s (%d,%d)\n", 1088 warn sprintf "saving %s (%d,%d)\n",
790 $filename, length $$rdata, scalar @$objs; 1089 $decname, length $$rdata, scalar @$objs;
791 1090
792 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1091 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
793 chmod SAVE_MODE, $fh; 1092 chmod SAVE_MODE, $fh;
794 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1093 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
795 aio_fsync $fh if $cf::USE_FSYNC; 1094 aio_fsync $fh if $cf::USE_FSYNC;
796 close $fh; 1095 close $fh;
797 1096
798 if (@$objs) { 1097 if (@$objs) {
799 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) {
800 chmod SAVE_MODE, $fh; 1099 chmod SAVE_MODE, $fh;
801 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1100 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
802 aio_write $fh, 0, (length $data), $data, 0; 1101 aio_write $fh, 0, (length $data), $data, 0;
803 aio_fsync $fh if $cf::USE_FSYNC; 1102 aio_fsync $fh if $cf::USE_FSYNC;
804 close $fh; 1103 close $fh;
805 aio_rename "$filename.pst~", "$filename.pst"; 1104 aio_rename "$filename.pst~", "$filename.pst";
806 } 1105 }
… …
814 } 1113 }
815 } else { 1114 } else {
816 aio_unlink $filename; 1115 aio_unlink $filename;
817 aio_unlink "$filename.pst"; 1116 aio_unlink "$filename.pst";
818 } 1117 }
819 } 1118 };
820} 1119}
821 1120
822sub object_freezer_as_string { 1121sub object_freezer_as_string {
823 my ($rdata, $objs) = @_; 1122 my ($rdata, $objs) = @_;
824 1123
… …
836 or return; 1135 or return;
837 1136
838 unless (aio_stat "$filename.pst") { 1137 unless (aio_stat "$filename.pst") {
839 (aio_load "$filename.pst", $av) >= 0 1138 (aio_load "$filename.pst", $av) >= 0
840 or return; 1139 or return;
1140
841 $av = eval { (Storable::thaw $av)->{objs} }; 1141 my $st = eval { Coro::Storable::thaw $av };
1142 $av = $st->{objs};
842 } 1143 }
843 1144
1145 utf8::decode (my $decname = $filename);
844 warn sprintf "loading %s (%d)\n", 1146 warn sprintf "loading %s (%d,%d)\n",
845 $filename, length $data, scalar @{$av || []};#d# 1147 $decname, length $data, scalar @{$av || []};
1148
846 return ($data, $av); 1149 ($data, $av)
847} 1150}
1151
1152=head2 COMMAND CALLBACKS
1153
1154=over 4
1155
1156=cut
848 1157
849############################################################################# 1158#############################################################################
850# command handling &c 1159# command handling &c
851 1160
852=item cf::register_command $name => \&callback($ob,$args); 1161=item cf::register_command $name => \&callback($ob,$args);
… …
865 push @{ $COMMAND{$name} }, [$caller, $cb]; 1174 push @{ $COMMAND{$name} }, [$caller, $cb];
866} 1175}
867 1176
868=item cf::register_extcmd $name => \&callback($pl,$packet); 1177=item cf::register_extcmd $name => \&callback($pl,$packet);
869 1178
870Register 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.
871 1184
872If 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
873called. 1186called.
874 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
875=cut 1199=cut
876 1200
877sub register_extcmd { 1201sub register_extcmd {
878 my ($name, $cb) = @_; 1202 my ($name, $cb) = @_;
879 1203
880 $EXTCMD{$name} = $cb; 1204 $EXTCMD{$name} = $cb;
1205}
1206
1207sub register_exticmd {
1208 my ($name, $cb) = @_;
1209
1210 $EXTICMD{$name} = $cb;
881} 1211}
882 1212
883cf::player->attach ( 1213cf::player->attach (
884 on_command => sub { 1214 on_command => sub {
885 my ($pl, $name, $params) = @_; 1215 my ($pl, $name, $params) = @_;
… …
894 cf::override; 1224 cf::override;
895 }, 1225 },
896 on_extcmd => sub { 1226 on_extcmd => sub {
897 my ($pl, $buf) = @_; 1227 my ($pl, $buf) = @_;
898 1228
899 my $msg = eval { from_json $buf }; 1229 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
900 1230
901 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
902 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1239 if (my $cb = $EXTCMD{$type}) {
903 if (my %reply = $cb->($pl, $msg)) { 1240 @reply = $cb->($pl, @payload);
904 $pl->ext_reply ($msg->{msgid}, %reply);
905 }
906 } 1241 }
1242
1243 $pl->ext_reply ($reply, @reply)
1244 if $reply;
1245
907 } else { 1246 } else {
908 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1247 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
909 } 1248 }
910 1249
911 cf::override; 1250 cf::override;
912 }, 1251 },
913); 1252);
914 1253
915sub load_extension {
916 my ($path) = @_;
917
918 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
919 my $base = $1;
920 my $pkg = $1;
921 $pkg =~ s/[^[:word:]]/_/g;
922 $pkg = "ext::$pkg";
923
924 warn "... loading '$path' into '$pkg'\n";
925
926 open my $fh, "<:utf8", $path
927 or die "$path: $!";
928
929 my $source =
930 "package $pkg; use strict; use utf8;\n"
931 . "#line 1 \"$path\"\n{\n"
932 . (do { local $/; <$fh> })
933 . "\n};\n1";
934
935 unless (eval $source) {
936 my $msg = $@ ? "$path: $@\n"
937 : "extension disabled.\n";
938 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
939 warn $@;
940 warn "mandatory extension failed to load, exiting.\n";
941 exit 1;
942 }
943 die $@;
944 }
945
946 push @EXTS, $pkg;
947}
948
949sub load_extensions { 1254sub load_extensions {
1255 cf::sync_job {
1256 my %todo;
1257
950 for my $ext (<$LIBDIR/*.ext>) { 1258 for my $path (<$LIBDIR/*.ext>) {
951 next unless -r $ext; 1259 next unless -r $path;
952 eval { 1260
953 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;
954 1 1318 }
955 } or warn "$ext not loaded: $@"; 1319
1320 skip:
1321 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1322 unless $progress;
1323 }
956 } 1324 };
957} 1325}
958 1326
959############################################################################# 1327#############################################################################
960 1328
1329=back
1330
961=head2 CORE EXTENSIONS 1331=head2 CORE EXTENSIONS
962 1332
963Functions and methods that extend core crossfire objects. 1333Functions and methods that extend core crossfire objects.
964 1334
965=cut 1335=cut
… …
969use Coro::AIO; 1339use Coro::AIO;
970 1340
971=head3 cf::player 1341=head3 cf::player
972 1342
973=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}
974 1358
975=item cf::player::find $login 1359=item cf::player::find $login
976 1360
977Returns the given player object, loading it if necessary (might block). 1361Returns the given player object, loading it if necessary (might block).
978 1362
… …
1014 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1398 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1015 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1399 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1016 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1400 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1017 aio_unlink +(playerdir $login) . "/$login.pl"; 1401 aio_unlink +(playerdir $login) . "/$login.pl";
1018 1402
1019 my $pl = load_pl path $login 1403 my $f = new_from_file cf::object::thawer path $login
1020 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;
1021 $cf::PLAYER{$login} = $pl 1410 $cf::PLAYER{$login} = $pl
1022 } 1411 }
1023 } 1412 }
1024} 1413}
1025 1414
… …
1035 1424
1036 aio_mkdir playerdir $pl, 0770; 1425 aio_mkdir playerdir $pl, 0770;
1037 $pl->{last_save} = $cf::RUNTIME; 1426 $pl->{last_save} = $cf::RUNTIME;
1038 1427
1039 $pl->save_pl ($path); 1428 $pl->save_pl ($path);
1040 Coro::cede; 1429 cf::cede_to_tick;
1041} 1430}
1042 1431
1043sub new($) { 1432sub new($) {
1044 my ($login) = @_; 1433 my ($login) = @_;
1045 1434
… …
1049 $self->{deny_save} = 1; 1438 $self->{deny_save} = 1;
1050 1439
1051 $cf::PLAYER{$login} = $self; 1440 $cf::PLAYER{$login} = $self;
1052 1441
1053 $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 (@_);
1054} 1453}
1055 1454
1056=item $pl->quit_character 1455=item $pl->quit_character
1057 1456
1058Nukes the player without looking back. If logged in, the connection will 1457Nukes the player without looking back. If logged in, the connection will
… …
1113 or return []; 1512 or return [];
1114 1513
1115 my @logins; 1514 my @logins;
1116 1515
1117 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") {
1118 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1521 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1119 aio_read $fh, 0, 512, my $buf, 0 or next; 1522 aio_read $fh, 0, 512, my $buf, 0 or next;
1120 $buf !~ /^password -------------$/m or next; # official not-valid tag 1523 $buf !~ /^password -------------$/m or next; # official not-valid tag
1524 }
1121 1525
1122 utf8::decode $login; 1526 utf8::decode $login;
1123 push @logins, $login; 1527 push @logins, $login;
1124 } 1528 }
1125 1529
… …
1152 } 1556 }
1153 1557
1154 \@paths 1558 \@paths
1155} 1559}
1156 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
1157=item $player->ext_reply ($msgid, %msg) 1654=item $player->ext_reply ($msgid, @msg)
1158 1655
1159Sends an ext reply to the player. 1656Sends an ext reply to the player.
1160 1657
1161=cut 1658=cut
1162 1659
1163sub ext_reply($$%) { 1660sub ext_reply($$@) {
1164 my ($self, $id, %msg) = @_; 1661 my ($self, $id, @msg) = @_;
1165 1662
1166 $msg{msgid} = $id; 1663 $self->ns->ext_reply ($id, @msg)
1167
1168 $self->send ("ext " . cf::to_json \%msg);
1169} 1664}
1170 1665
1171=item $player->ext_event ($type, %msg) 1666=item $player->ext_msg ($type, @msg)
1172 1667
1173Sends an ext event to the client. 1668Sends an ext event to the client.
1174 1669
1175=cut 1670=cut
1176 1671
1177sub ext_event($$%) { 1672sub ext_msg($$@) {
1178 my ($self, $type, %msg) = @_; 1673 my ($self, $type, @msg) = @_;
1179 1674
1180 $self->ns->ext_event ($type, %msg); 1675 $self->ns->ext_msg ($type, @msg);
1181} 1676}
1182 1677
1183=head3 cf::region 1678=head3 cf::region
1184 1679
1185=over 4 1680=over 4
… …
1188 1683
1189package cf::region; 1684package cf::region;
1190 1685
1191=item cf::region::find_by_path $path 1686=item cf::region::find_by_path $path
1192 1687
1193Tries 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.
1194 1689
1195=cut 1690=cut
1196 1691
1197sub find_by_path($) { 1692sub find_by_path($) {
1198 my ($path) = @_; 1693 my ($path) = @_;
1199 1694
1200 my ($match, $specificity); 1695 my ($match, $specificity);
1201 1696
1202 for my $region (list) { 1697 for my $region (list) {
1203 if ($region->match && $path =~ $region->match) { 1698 if ($region->{match} && $path =~ $region->{match}) {
1204 ($match, $specificity) = ($region, $region->specificity) 1699 ($match, $specificity) = ($region, $region->specificity)
1205 if $region->specificity > $specificity; 1700 if $region->specificity > $specificity;
1206 } 1701 }
1207 } 1702 }
1208 1703
… …
1272 my ($self, $merge) = @_; 1767 my ($self, $merge) = @_;
1273 1768
1274 # we have to keep some variables in memory intact 1769 # we have to keep some variables in memory intact
1275 local $self->{path}; 1770 local $self->{path};
1276 local $self->{load_path}; 1771 local $self->{load_path};
1277 local $self->{deny_save};
1278 local $self->{deny_reset};
1279 1772
1280 $self->SUPER::thawer_merge ($merge); 1773 $self->SUPER::thawer_merge ($merge);
1281} 1774}
1282 1775
1283sub normalise { 1776sub normalise {
… …
1330 $self->init; # pass $1 etc. 1823 $self->init; # pass $1 etc.
1331 return $self; 1824 return $self;
1332 } 1825 }
1333 } 1826 }
1334 1827
1335 Carp::carp "unable to resolve path '$path' (base '$base')."; 1828 Carp::cluck "unable to resolve path '$path' (base '$base').";
1336 () 1829 ()
1337} 1830}
1338 1831
1339sub init { 1832sub init {
1340 my ($self) = @_; 1833 my ($self) = @_;
… …
1383 1876
1384 $_->change_map_light ($change) 1877 $_->change_map_light ($change)
1385 for grep $_->outdoor, values %cf::MAP; 1878 for grep $_->outdoor, values %cf::MAP;
1386} 1879}
1387 1880
1881sub decay_objects {
1882 my ($self) = @_;
1883
1884 return if $self->{deny_reset};
1885
1886 $self->do_decay_objects;
1887}
1888
1388sub unlink_save { 1889sub unlink_save {
1389 my ($self) = @_; 1890 my ($self) = @_;
1390 1891
1391 utf8::encode (my $save = $self->save_path); 1892 utf8::encode (my $save = $self->save_path);
1392 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1893 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
… …
1395 1896
1396sub load_header_from($) { 1897sub load_header_from($) {
1397 my ($self, $path) = @_; 1898 my ($self, $path) = @_;
1398 1899
1399 utf8::encode $path; 1900 utf8::encode $path;
1400 #aio_open $path, O_RDONLY, 0 1901 my $f = new_from_file cf::object::thawer $path
1401 # or return;
1402
1403 $self->_load_header ($path)
1404 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;
1405 1909
1406 $self->{load_path} = $path; 1910 $self->{load_path} = $path;
1407 1911
1408 1 1912 1
1409} 1913}
… …
1448 $self->load_header_orig 1952 $self->load_header_orig
1449 or return; 1953 or return;
1450 $self->prepare_orig; 1954 $self->prepare_orig;
1451 } 1955 }
1452 1956
1957 $self->{deny_reset} = 1
1958 if $self->no_reset;
1959
1453 $self->default_region (cf::region::find_by_path $self->{path}) 1960 $self->default_region (cf::region::find_by_path $self->{path})
1454 unless $self->default_region; 1961 unless $self->default_region;
1455 1962
1456 1 1963 1
1457} 1964}
… …
1460sub find { 1967sub find {
1461 my ($path, $origin) = @_; 1968 my ($path, $origin) = @_;
1462 1969
1463 $path = normalise $path, $origin && $origin->path; 1970 $path = normalise $path, $origin && $origin->path;
1464 1971
1972 cf::lock_wait "map_data:$path";#d#remove
1465 cf::lock_wait "map_find:$path"; 1973 cf::lock_wait "map_find:$path";
1466 1974
1467 $cf::MAP{$path} || do { 1975 $cf::MAP{$path} || do {
1468 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
1469 my $map = new_from_path cf::map $path 1979 my $map = new_from_path cf::map $path
1470 or return; 1980 or return;
1471 1981
1472 $map->{last_save} = $cf::RUNTIME; 1982 $map->{last_save} = $cf::RUNTIME;
1473 1983
1474 $map->load_header 1984 $map->load_header
1475 or return; 1985 or return;
1476 1986
1477 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1987 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1478 # doing this can freeze the server in a sync job, obviously 1988 # doing this can freeze the server in a sync job, obviously
1479 #$cf::WAIT_FOR_TICK->wait; 1989 #$cf::WAIT_FOR_TICK->wait;
1990 undef $guard1;
1991 undef $guard2;
1480 $map->reset; 1992 $map->reset;
1481 undef $guard;
1482 return find $path; 1993 return find $path;
1483 } 1994 }
1484 1995
1485 $cf::MAP{$path} = $map 1996 $cf::MAP{$path} = $map
1486 } 1997 }
… …
1495 local $self->{deny_reset} = 1; # loading can take a long time 2006 local $self->{deny_reset} = 1; # loading can take a long time
1496 2007
1497 my $path = $self->{path}; 2008 my $path = $self->{path};
1498 2009
1499 { 2010 {
1500 my $guard = cf::lock_acquire "map_load:$path"; 2011 my $guard = cf::lock_acquire "map_data:$path";
1501 2012
2013 return unless $self->valid;
1502 return if $self->in_memory != cf::MAP_SWAPPED; 2014 return unless $self->in_memory == cf::MAP_SWAPPED;
1503 2015
1504 $self->in_memory (cf::MAP_LOADING); 2016 $self->in_memory (cf::MAP_LOADING);
1505 2017
1506 $self->alloc; 2018 $self->alloc;
1507 2019
1508 $self->pre_load; 2020 $self->pre_load;
1509 Coro::cede; 2021 cf::cede_to_tick;
1510 2022
2023 my $f = new_from_file cf::object::thawer $self->{load_path};
2024 $f->skip_block;
1511 $self->_load_objects ($self->{load_path}, 1) 2025 $self->_load_objects ($f)
1512 or return; 2026 or return;
1513 2027
1514 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2028 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1515 if delete $self->{load_original}; 2029 if delete $self->{load_original};
1516 2030
1517 if (my $uniq = $self->uniq_path) { 2031 if (my $uniq = $self->uniq_path) {
1518 utf8::encode $uniq; 2032 utf8::encode $uniq;
1519 if (aio_open $uniq, O_RDONLY, 0) { 2033 unless (aio_stat $uniq) {
2034 if (my $f = new_from_file cf::object::thawer $uniq) {
1520 $self->clear_unique_items; 2035 $self->clear_unique_items;
1521 $self->_load_objects ($uniq, 0); 2036 $self->_load_objects ($f);
2037 $f->resolve_delayed_derefs;
2038 }
1522 } 2039 }
1523 } 2040 }
1524 2041
1525 Coro::cede; 2042 $f->resolve_delayed_derefs;
2043
2044 cf::cede_to_tick;
1526 # now do the right thing for maps 2045 # now do the right thing for maps
1527 $self->link_multipart_objects; 2046 $self->link_multipart_objects;
1528 $self->difficulty ($self->estimate_difficulty) 2047 $self->difficulty ($self->estimate_difficulty)
1529 unless $self->difficulty; 2048 unless $self->difficulty;
1530 Coro::cede; 2049 cf::cede_to_tick;
1531 2050
1532 unless ($self->{deny_activate}) { 2051 unless ($self->{deny_activate}) {
1533 $self->decay_objects; 2052 $self->decay_objects;
1534 $self->fix_auto_apply; 2053 $self->fix_auto_apply;
1535 $self->update_buttons; 2054 $self->update_buttons;
1536 Coro::cede; 2055 cf::cede_to_tick;
1537 $self->set_darkness_map; 2056 $self->set_darkness_map;
1538 Coro::cede; 2057 cf::cede_to_tick;
1539 $self->activate; 2058 $self->activate;
1540 } 2059 }
2060
2061 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME);
1541 2063
1542 $self->in_memory (cf::MAP_IN_MEMORY); 2064 $self->in_memory (cf::MAP_IN_MEMORY);
1543 } 2065 }
1544 2066
1545 $self->post_load; 2067 $self->post_load;
… …
1549 my ($self, $ob) = @_; 2071 my ($self, $ob) = @_;
1550 2072
1551 return find "~" . $ob->name . "/" . $self->{path} 2073 return find "~" . $ob->name . "/" . $self->{path}
1552 if $self->per_player; 2074 if $self->per_player;
1553 2075
2076# return find "?party/" . $ob->name . "/" . $self->{path}
2077# if $self->per_party;
2078
1554 $self 2079 $self
1555} 2080}
1556 2081
1557# 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
1558sub load_diag { 2083sub load_neighbours {
1559 my ($map) = @_; 2084 my ($map) = @_;
1560 2085
1561 my @diag; # diagonal neighbours 2086 my @neigh; # diagonal neighbours
1562 2087
1563 for (0 .. 3) { 2088 for (0 .. 3) {
1564 my $neigh = $map->tile_path ($_) 2089 my $neigh = $map->tile_path ($_)
1565 or next; 2090 or next;
1566 $neigh = find $neigh, $map 2091 $neigh = find $neigh, $map
1567 or next; 2092 or next;
1568 $neigh->load; 2093 $neigh->load;
1569 2094
2095 push @neigh,
1570 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2096 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1571 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2097 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1572 } 2098 }
1573 2099
1574 for (@diag) { 2100 for (grep defined $_->[0], @neigh) {
2101 my ($path, $origin) = @$_;
1575 my $neigh = find @$_ 2102 my $neigh = find $path, $origin
1576 or next; 2103 or next;
1577 $neigh->load; 2104 $neigh->load;
1578 } 2105 }
1579} 2106}
1580 2107
… …
1585} 2112}
1586 2113
1587sub do_load_sync { 2114sub do_load_sync {
1588 my ($map) = @_; 2115 my ($map) = @_;
1589 2116
2117 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2118 if $Coro::current == $Coro::main;
2119
1590 cf::sync_job { $map->load }; 2120 cf::sync_job { $map->load };
1591} 2121}
1592 2122
1593our %MAP_PREFETCH; 2123our %MAP_PREFETCH;
1594our $MAP_PREFETCHER = undef; 2124our $MAP_PREFETCHER = undef;
1595 2125
1596sub find_async { 2126sub find_async {
1597 my ($path, $origin) = @_; 2127 my ($path, $origin, $load) = @_;
1598 2128
1599 $path = normalise $path, $origin && $origin->{path}; 2129 $path = normalise $path, $origin && $origin->{path};
1600 2130
1601 if (my $map = $cf::MAP{$path}) { 2131 if (my $map = $cf::MAP{$path}) {
1602 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2132 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1603 } 2133 }
1604 2134
1605 undef $MAP_PREFETCH{$path}; 2135 $MAP_PREFETCH{$path} |= $load;
2136
1606 $MAP_PREFETCHER ||= cf::async { 2137 $MAP_PREFETCHER ||= cf::async {
2138 $Coro::current->{desc} = "map prefetcher";
2139
1607 while (%MAP_PREFETCH) { 2140 while (%MAP_PREFETCH) {
1608 for my $path (keys %MAP_PREFETCH) { 2141 while (my ($k, $v) = each %MAP_PREFETCH) {
1609 my $map = find $path 2142 if (my $map = find $k) {
1610 or next;
1611 $map->load; 2143 $map->load if $v;
2144 }
1612 2145
1613 delete $MAP_PREFETCH{$path}; 2146 delete $MAP_PREFETCH{$k};
1614 } 2147 }
1615 } 2148 }
1616 undef $MAP_PREFETCHER; 2149 undef $MAP_PREFETCHER;
1617 }; 2150 };
1618 $MAP_PREFETCHER->prio (6); 2151 $MAP_PREFETCHER->prio (6);
… …
1621} 2154}
1622 2155
1623sub save { 2156sub save {
1624 my ($self) = @_; 2157 my ($self) = @_;
1625 2158
1626 my $lock = cf::lock_acquire "map_data:" . $self->path; 2159 my $lock = cf::lock_acquire "map_data:$self->{path}";
1627 2160
1628 $self->{last_save} = $cf::RUNTIME; 2161 $self->{last_save} = $cf::RUNTIME;
1629 2162
1630 return unless $self->dirty; 2163 return unless $self->dirty;
1631 2164
… …
1637 return if $self->{deny_save}; 2170 return if $self->{deny_save};
1638 2171
1639 local $self->{last_access} = $self->last_access;#d# 2172 local $self->{last_access} = $self->last_access;#d#
1640 2173
1641 cf::async { 2174 cf::async {
2175 $Coro::current->{desc} = "map player save";
1642 $_->contr->save for $self->players; 2176 $_->contr->save for $self->players;
1643 }; 2177 };
1644 2178
1645 if ($uniq) { 2179 if ($uniq) {
1646 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2180 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
1654 my ($self) = @_; 2188 my ($self) = @_;
1655 2189
1656 # save first because save cedes 2190 # save first because save cedes
1657 $self->save; 2191 $self->save;
1658 2192
1659 my $lock = cf::lock_acquire "map_data:" . $self->path; 2193 my $lock = cf::lock_acquire "map_data:$self->{path}";
1660 2194
1661 return if $self->players; 2195 return if $self->players;
1662 return if $self->in_memory != cf::MAP_IN_MEMORY; 2196 return if $self->in_memory != cf::MAP_IN_MEMORY;
1663 return if $self->{deny_save}; 2197 return if $self->{deny_save};
1664 2198
2199 $self->in_memory (cf::MAP_SWAPPED);
2200
2201 $self->deactivate;
2202 $_->clear_links_to ($self) for values %cf::MAP;
1665 $self->clear; 2203 $self->clear;
1666 $self->in_memory (cf::MAP_SWAPPED);
1667} 2204}
1668 2205
1669sub reset_at { 2206sub reset_at {
1670 my ($self) = @_; 2207 my ($self) = @_;
1671 2208
1672 # TODO: safety, remove and allow resettable per-player maps 2209 # TODO: safety, remove and allow resettable per-player maps
1673 return 1e99 if $self->isa ("ext::map_per_player");#d#
1674 return 1e99 if $self->{deny_reset}; 2210 return 1e99 if $self->{deny_reset};
1675 2211
1676 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2212 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1677 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;
1678 2214
… …
1689 my ($self) = @_; 2225 my ($self) = @_;
1690 2226
1691 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2227 my $lock = cf::lock_acquire "map_data:$self->{path}";
1692 2228
1693 return if $self->players; 2229 return if $self->players;
1694 return if $self->isa ("ext::map_per_player");#d#
1695 2230
1696 warn "resetting map ", $self->path;#d# 2231 warn "resetting map ", $self->path;
1697 2232
1698 $self->in_memory (cf::MAP_SWAPPED); 2233 $self->in_memory (cf::MAP_SWAPPED);
1699 2234
1700 # need to save uniques path 2235 # need to save uniques path
1701 unless ($self->{deny_save}) { 2236 unless ($self->{deny_save}) {
… …
1705 if $uniq; 2240 if $uniq;
1706 } 2241 }
1707 2242
1708 delete $cf::MAP{$self->path}; 2243 delete $cf::MAP{$self->path};
1709 2244
2245 $self->deactivate;
2246 $_->clear_links_to ($self) for values %cf::MAP;
1710 $self->clear; 2247 $self->clear;
1711
1712 $_->clear_links_to ($self) for values %cf::MAP;
1713 2248
1714 $self->unlink_save; 2249 $self->unlink_save;
1715 $self->destroy; 2250 $self->destroy;
1716} 2251}
1717 2252
1718my $nuke_counter = "aaaa"; 2253my $nuke_counter = "aaaa";
1719 2254
1720sub nuke { 2255sub nuke {
1721 my ($self) = @_; 2256 my ($self) = @_;
1722 2257
2258 {
2259 my $lock = cf::lock_acquire "map_data:$self->{path}";
2260
1723 delete $cf::MAP{$self->path}; 2261 delete $cf::MAP{$self->path};
1724 2262
1725 $self->unlink_save; 2263 $self->unlink_save;
1726 2264
1727 bless $self, "cf::map"; 2265 bless $self, "cf::map";
1728 delete $self->{deny_reset}; 2266 delete $self->{deny_reset};
1729 $self->{deny_save} = 1; 2267 $self->{deny_save} = 1;
1730 $self->reset_timeout (1); 2268 $self->reset_timeout (1);
1731 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2269 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1732 2270
1733 $cf::MAP{$self->path} = $self; 2271 $cf::MAP{$self->path} = $self;
2272 }
1734 2273
1735 $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 ]
1736} 2311}
1737 2312
1738=item cf::map::unique_maps 2313=item cf::map::unique_maps
1739 2314
1740Returns an arrayref of paths of all shared maps that have 2315Returns an arrayref of paths of all shared maps that have
1741instantiated unique items. May block. 2316instantiated unique items. May block.
1742 2317
1743=cut 2318=cut
1744 2319
1745sub unique_maps() { 2320sub unique_maps() {
1746 my $files = aio_readdir $UNIQUEDIR 2321 [
1747 or return; 2322 map {
1748
1749 my @paths;
1750
1751 for (@$files) {
1752 utf8::decode $_; 2323 utf8::decode $_;
1753 next if /\.pst$/; 2324 /\.map$/
1754 next unless /^$PATH_SEP/o; 2325 ? normalise $_
1755 2326 : ()
1756 push @paths, cf::map::normalise $_; 2327 } @{ aio_readdir $UNIQUEDIR or [] }
1757 } 2328 ]
1758
1759 \@paths
1760} 2329}
1761 2330
1762package cf; 2331package cf;
1763 2332
1764=back 2333=back
… …
1782 map { $_, inv_recursive_ $_->inv } @_ 2351 map { $_, inv_recursive_ $_->inv } @_
1783} 2352}
1784 2353
1785sub inv_recursive { 2354sub inv_recursive {
1786 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 }
1787} 2384}
1788 2385
1789package cf; 2386package cf;
1790 2387
1791=back 2388=back
… …
1810 2407
1811 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2408 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1812 2409
1813 if ($self->{record_replies}) { 2410 if ($self->{record_replies}) {
1814 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2411 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2412
1815 } 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 {
1816 $msg = $npc->name . " says: $msg" if $npc; 2421 $msg = $npc->name . " says: $msg" if $npc;
1817 $self->message ($msg, $flags); 2422 $self->message ($msg, $flags);
2423 }
1818 } 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 (@_);
1819} 2435}
1820 2436
1821=item $player_object->may ("access") 2437=item $player_object->may ("access")
1822 2438
1823Returns wether the given player is authorized to access resource "access" 2439Returns wether the given player is authorized to access resource "access"
… …
1870 $self->deactivate_recursive; 2486 $self->deactivate_recursive;
1871 2487
1872 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2488 return if UNIVERSAL::isa $self->map, "ext::map_link";
1873 2489
1874 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2490 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1875 if $self->map; 2491 if $self->map && $self->map->{path} ne "{link}";
1876 2492
1877 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2493 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1878} 2494}
1879 2495
1880sub cf::object::player::leave_link { 2496sub cf::object::player::leave_link {
1881 my ($self, $map, $x, $y) = @_; 2497 my ($self, $map, $x, $y) = @_;
2498
2499 return unless $self->contr->active;
1882 2500
1883 my $link_pos = delete $self->{_link_pos}; 2501 my $link_pos = delete $self->{_link_pos};
1884 2502
1885 unless ($map) { 2503 unless ($map) {
1886 # restore original map position 2504 # restore original map position
… …
1900 # use -1 or undef as default coordinates, not 0, 0 2518 # use -1 or undef as default coordinates, not 0, 0
1901 ($x, $y) = ($map->enter_x, $map->enter_y) 2519 ($x, $y) = ($map->enter_x, $map->enter_y)
1902 if $x <=0 && $y <= 0; 2520 if $x <=0 && $y <= 0;
1903 2521
1904 $map->load; 2522 $map->load;
1905 $map->load_diag; 2523 $map->load_neighbours;
1906 2524
1907 return unless $self->contr->active; 2525 return unless $self->contr->active;
1908 $self->activate_recursive; 2526 $self->activate_recursive;
1909 2527
1910 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1911 $self->enter_map ($map, $x, $y); 2529 $self->enter_map ($map, $x, $y);
1912} 2530}
1913 2531
1914cf::player->attach ( 2532=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1915 on_logout => sub {
1916 my ($pl) = @_;
1917 2533
1918 # abort map switching before logout 2534Moves the player to the given map-path and coordinates by first freezing
1919 if ($pl->ob->{_link_pos}) { 2535her, loading and preparing them map, calling the provided $check callback
1920 cf::sync_job { 2536that has to return the map if sucecssful, and then unfreezes the player on
1921 $pl->ob->leave_link 2537the new (success) or old (failed) map position. In either case, $done will
1922 }; 2538be called at the end of this process.
1923 }
1924 },
1925 on_login => sub {
1926 my ($pl) = @_;
1927 2539
1928 # try to abort aborted map switching on player login :)
1929 # should happen only on crashes
1930 if ($pl->ob->{_link_pos}) {
1931 $pl->ob->enter_link;
1932 (async {
1933 $pl->ob->reply (undef,
1934 "There was an internal problem at your last logout, "
1935 . "the server will try to bring you to your intended destination in a second.",
1936 cf::NDI_RED);
1937 # we need this sleep as the login has a concurrent enter_exit running
1938 # and this sleep increases chances of the player not ending up in scorn
1939 Coro::Timer::sleep 1;
1940 $pl->ob->leave_link;
1941 })->prio (2);
1942 }
1943 },
1944);
1945
1946=item $player_object->goto ($path, $x, $y)
1947
1948=cut 2540=cut
2541
2542our $GOTOGEN;
1949 2543
1950sub cf::object::player::goto { 2544sub cf::object::player::goto {
1951 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;
1952 2549
1953 $self->enter_link; 2550 $self->enter_link;
1954 2551
1955 (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
1956 my $map = eval { 2574 my $map = eval {
1957 my $map = cf::map::find $path; 2575 my $map = defined $path ? cf::map::find $path : undef;
2576
2577 if ($map) {
1958 $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
1959 $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 $@;
1960 } or 2590 }
1961 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1962 2591
2592 if ($gen == $self->{_goto_generation}) {
2593 delete $self->{_goto_generation};
1963 $self->leave_link ($map, $x, $y); 2594 $self->leave_link ($map, $x, $y);
2595 }
2596
2597 $done->() if $done;
1964 })->prio (1); 2598 })->prio (1);
1965} 2599}
1966 2600
1967=item $player_object->enter_exit ($exit_object) 2601=item $player_object->enter_exit ($exit_object)
1968 2602
… …
2005 $rmp->{origin_y} = $exit->y; 2639 $rmp->{origin_y} = $exit->y;
2006 } 2640 }
2007 2641
2008 $rmp->{random_seed} ||= $exit->random_seed; 2642 $rmp->{random_seed} ||= $exit->random_seed;
2009 2643
2010 my $data = cf::to_json $rmp; 2644 my $data = cf::encode_json $rmp;
2011 my $md5 = Digest::MD5::md5_hex $data; 2645 my $md5 = Digest::MD5::md5_hex $data;
2012 my $meta = "$RANDOMDIR/$md5.meta"; 2646 my $meta = "$RANDOMDIR/$md5.meta";
2013 2647
2014 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2648 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2015 aio_write $fh, 0, (length $data), $data, 0; 2649 aio_write $fh, 0, (length $data), $data, 0;
… …
2037 my $hp = $exit->stats->hp; 2671 my $hp = $exit->stats->hp;
2038 my $sp = $exit->stats->sp; 2672 my $sp = $exit->stats->sp;
2039 2673
2040 $self->enter_link; 2674 $self->enter_link;
2041 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
2042 (async { 2680 (async {
2681 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2682
2043 $self->deactivate_recursive; # just to be sure 2683 $self->deactivate_recursive; # just to be sure
2044 unless (eval { 2684 unless (eval {
2045 $self->goto ($slaying, $hp, $sp); 2685 $self->goto ($slaying, $hp, $sp);
2046 2686
2047 1; 2687 1;
… …
2073 2713
2074 utf8::encode $text; 2714 utf8::encode $text;
2075 $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);
2076} 2716}
2077 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
2078=item $client->ext_event ($type, %msg) 2842=item $client->ext_msg ($type, @msg)
2079 2843
2080Sends an exti event to the client. 2844Sends an ext event to the client.
2081 2845
2082=cut 2846=cut
2083 2847
2084sub cf::client::ext_event($$%) { 2848sub cf::client::ext_msg($$@) {
2085 my ($self, $type, %msg) = @_; 2849 my ($self, $type, @msg) = @_;
2086 2850
2851 if ($self->extcmd == 2) {
2852 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2853 } elsif ($self->extcmd == 1) { # TODO: remove
2087 $msg{msgtype} = "event_$type"; 2854 push @msg, msgtype => "event_$type";
2088 $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 }
2089} 2875}
2090 2876
2091=item $success = $client->query ($flags, "text", \&cb) 2877=item $success = $client->query ($flags, "text", \&cb)
2092 2878
2093Queues a query to the client, calling the given callback with 2879Queues a query to the client, calling the given callback with
2094the 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>,
2095C<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>.
2096 2882
2097Queries 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
2098reliable at some point in the future. 2884become reliable at some point in the future.
2099 2885
2100=cut 2886=cut
2101 2887
2102sub cf::client::query { 2888sub cf::client::query {
2103 my ($self, $flags, $text, $cb) = @_; 2889 my ($self, $flags, $text, $cb) = @_;
… …
2111 utf8::encode $text; 2897 utf8::encode $text;
2112 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2898 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2113 2899
2114 $self->send_packet ($self->{query_queue}[0][0]) 2900 $self->send_packet ($self->{query_queue}[0][0])
2115 if @{ $self->{query_queue} } == 1; 2901 if @{ $self->{query_queue} } == 1;
2902
2903 1
2116} 2904}
2117 2905
2118cf::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 },
2119 on_reply => sub { 2912 on_reply => sub {
2120 my ($ns, $msg) = @_; 2913 my ($ns, $msg) = @_;
2121 2914
2122 # this weird shuffling is so that direct followup queries 2915 # this weird shuffling is so that direct followup queries
2123 # get handled first 2916 # get handled first
… …
2135 } else { 2928 } else {
2136 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2929 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2137 } 2930 }
2138 } 2931 }
2139 }, 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 },
2140); 2959);
2141 2960
2142=item $client->async (\&cb) 2961=item $client->async (\&cb)
2143 2962
2144Create a new coroutine, running the specified callback. The coroutine will 2963Create a new coroutine, running the specified callback. The coroutine will
… …
2185our $safe = new Safe "safe"; 3004our $safe = new Safe "safe";
2186our $safe_hole = new Safe::Hole; 3005our $safe_hole = new Safe::Hole;
2187 3006
2188$SIG{FPE} = 'IGNORE'; 3007$SIG{FPE} = 'IGNORE';
2189 3008
2190$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));
2191 3014
2192# here we export the classes and methods available to script code 3015# here we export the classes and methods available to script code
2193 3016
2194=pod 3017=pod
2195 3018
2196The following functions and methods are available within a safe environment: 3019The following functions and methods are available within a safe environment:
2197 3020
2198 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
2199 cf::object::player player 3025 cf::object::player
2200 cf::player peaceful 3026 player
2201 cf::map trigger 3027
3028 cf::player
3029 peaceful
3030
3031 cf::map
3032 trigger
2202 3033
2203=cut 3034=cut
2204 3035
2205for ( 3036for (
2206 ["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)],
2207 ["cf::object::player" => qw(player)], 3040 ["cf::object::player" => qw(player)],
2208 ["cf::player" => qw(peaceful)], 3041 ["cf::player" => qw(peaceful)],
2209 ["cf::map" => qw(trigger)], 3042 ["cf::map" => qw(trigger)],
2210) { 3043) {
2211 no strict 'refs'; 3044 no strict 'refs';
… …
2282=back 3115=back
2283 3116
2284=cut 3117=cut
2285 3118
2286############################################################################# 3119#############################################################################
2287
2288=head2 EXTENSION DATABASE SUPPORT
2289
2290Crossfire maintains a very simple database for extension use. It can
2291currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2292convert to/from binary).
2293
2294The parameter C<$family> should best start with the name of the extension
2295using it, it should be unique.
2296
2297=over 4
2298
2299=item $value = cf::db_get $family => $key
2300
2301Returns a single value from the database.
2302
2303=item cf::db_put $family => $key => $value
2304
2305Stores the given C<$value> in the family.
2306
2307=cut
2308
2309our $DB;
2310
2311sub db_init {
2312 unless ($DB) {
2313 $DB = BDB::db_create $DB_ENV;
2314
2315 cf::sync_job {
2316 eval {
2317 $DB->set_flags (BDB::CHKSUM);
2318
2319 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2320 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2321 cf::cleanup "db_open(db): $!" if $!;
2322 };
2323 cf::cleanup "db_open(db): $@" if $@;
2324 };
2325 }
2326}
2327
2328sub db_get($$) {
2329 my $key = "$_[0]/$_[1]";
2330
2331 cf::sync_job {
2332 BDB::db_get $DB, undef, $key, my $data;
2333
2334 $! ? ()
2335 : $data
2336 }
2337}
2338
2339sub db_put($$$) {
2340 BDB::dbreq_pri 4;
2341 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2342}
2343
2344=item cf::cache $id => [$paths...], $processversion => $process
2345
2346Generic caching function that returns the value of the resource $id,
2347caching and regenerating as required.
2348
2349This function can block.
2350
2351=cut
2352
2353sub cache {
2354 my ($id, $src, $processversion, $process) = @_;
2355
2356 my $meta =
2357 join "\x00",
2358 $processversion,
2359 map {
2360 aio_stat $_
2361 and Carp::croak "$_: $!";
2362
2363 ($_, (stat _)[7,9])
2364 } @$src;
2365
2366 my $dbmeta = db_get cache => "$id/meta";
2367 if ($dbmeta ne $meta) {
2368 # changed, we may need to process
2369
2370 my @data;
2371 my $md5;
2372
2373 for (0 .. $#$src) {
2374 0 <= aio_load $src->[$_], $data[$_]
2375 or Carp::croak "$src->[$_]: $!";
2376 }
2377
2378 # if processing is expensive, check
2379 # checksum first
2380 if (1) {
2381 $md5 =
2382 join "\x00",
2383 $processversion,
2384 map {
2385 Coro::cede;
2386 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2387 } 0.. $#$src;
2388
2389
2390 my $dbmd5 = db_get cache => "$id/md5";
2391 if ($dbmd5 eq $md5) {
2392 db_put cache => "$id/meta", $meta;
2393
2394 return db_get cache => "$id/data";
2395 }
2396 }
2397
2398 my $t1 = Time::HiRes::time;
2399 my $data = $process->(\@data);
2400 my $t2 = Time::HiRes::time;
2401
2402 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2403
2404 db_put cache => "$id/data", $data;
2405 db_put cache => "$id/md5" , $md5;
2406 db_put cache => "$id/meta", $meta;
2407
2408 return $data;
2409 }
2410
2411 db_get cache => "$id/data"
2412}
2413
2414=item fork_call { }, $args
2415
2416Executes the given code block with the given arguments in a seperate
2417process, returning the results. Everything must be serialisable with
2418Coro::Storable. May, of course, block. Note that the executed sub may
2419never block itself or use any form of Event handling.
2420
2421=cut
2422
2423sub fork_call(&@) {
2424 my ($cb, @args) = @_;
2425
2426# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2427# or die "socketpair: $!";
2428 pipe my $fh1, my $fh2
2429 or die "pipe: $!";
2430
2431 if (my $pid = fork) {
2432 close $fh2;
2433
2434 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2435 $res = Coro::Storable::thaw $res;
2436
2437 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2438
2439 die $$res unless "ARRAY" eq ref $res;
2440
2441 return wantarray ? @$res : $res->[-1];
2442 } else {
2443 reset_signals;
2444 local $SIG{__WARN__};
2445 local $SIG{__DIE__};
2446 eval {
2447 close $fh1;
2448
2449 my @res = eval { $cb->(@args) };
2450 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2451 };
2452
2453 warn $@ if $@;
2454 _exit 0;
2455 }
2456}
2457
2458
2459
2460#############################################################################
2461# the server's init and main functions 3120# the server's init and main functions
2462 3121
2463sub load_facedata($) { 3122sub load_facedata($) {
2464 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;
2465 3130
2466 warn "loading facedata from $path\n"; 3131 warn "loading facedata from $path\n";
2467 3132
2468 my $facedata; 3133 my $facedata;
2469 0 < aio_load $path, $facedata 3134 0 < aio_load $path, $facedata
… …
2472 $facedata = Coro::Storable::thaw $facedata; 3137 $facedata = Coro::Storable::thaw $facedata;
2473 3138
2474 $facedata->{version} == 2 3139 $facedata->{version} == 2
2475 or cf::cleanup "$path: version mismatch, cannot proceed."; 3140 or cf::cleanup "$path: version mismatch, cannot proceed.";
2476 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
2477 { 3149 {
2478 my $faces = $facedata->{faceinfo}; 3150 my $faces = $facedata->{faceinfo};
2479 3151
2480 while (my ($face, $info) = each %$faces) { 3152 while (my ($face, $info) = each %$faces) {
2481 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3153 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2482 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3154 cf::face::set_visibility $idx, $info->{visibility};
3155 cf::face::set_magicmap $idx, $info->{magicmap};
2483 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3156 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2484 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3157 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2485 Coro::cede; 3158
3159 cf::cede_to_tick;
2486 } 3160 }
2487 3161
2488 while (my ($face, $info) = each %$faces) { 3162 while (my ($face, $info) = each %$faces) {
2489 next unless $info->{smooth}; 3163 next unless $info->{smooth};
2490 my $idx = cf::face::find $face 3164 my $idx = cf::face::find $face
2491 or next; 3165 or next;
2492 if (my $smooth = cf::face::find $info->{smooth}) { 3166 if (my $smooth = cf::face::find $info->{smooth}) {
3167 cf::face::set_smooth $idx, $smooth;
2493 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3168 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2494 } else { 3169 } else {
2495 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3170 warn "smooth face '$info->{smooth}' not found for face '$face'";
2496 } 3171 }
2497 Coro::cede; 3172
3173 cf::cede_to_tick;
2498 } 3174 }
2499 } 3175 }
2500 3176
2501 { 3177 {
2502 my $anims = $facedata->{animinfo}; 3178 my $anims = $facedata->{animinfo};
2503 3179
2504 while (my ($anim, $info) = each %$anims) { 3180 while (my ($anim, $info) = each %$anims) {
2505 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3181 cf::anim::set $anim, $info->{frames}, $info->{facings};
2506 Coro::cede; 3182 cf::cede_to_tick;
2507 } 3183 }
2508 3184
2509 cf::anim::invalidate_all; # d'oh 3185 cf::anim::invalidate_all; # d'oh
2510 } 3186 }
2511 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
2512 1 3237 1
2513} 3238}
2514 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
2515sub 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
2516 load_resource_file "$MAPDIR/regions" 3253 load_resource_file "$MAPDIR/regions"
2517 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 }
2518} 3260}
2519 3261
2520sub reload_facedata { 3262sub reload_facedata {
2521 load_facedata "$DATADIR/facedata" 3263 load_facedata "$DATADIR/facedata"
2522 or die "unable to load facedata\n"; 3264 or die "unable to load facedata\n";
2523} 3265}
2524 3266
2525sub reload_archetypes { 3267sub reload_archetypes {
2526 load_resource_file "$DATADIR/archetypes" 3268 load_resource_file "$DATADIR/archetypes"
2527 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";
2528} 3275}
2529 3276
2530sub reload_treasures { 3277sub reload_treasures {
2531 load_resource_file "$DATADIR/treasures" 3278 load_resource_file "$DATADIR/treasures"
2532 or die "unable to load treasurelists\n"; 3279 or die "unable to load treasurelists\n";
… …
2535sub reload_resources { 3282sub reload_resources {
2536 warn "reloading resource files...\n"; 3283 warn "reloading resource files...\n";
2537 3284
2538 reload_regions; 3285 reload_regions;
2539 reload_facedata; 3286 reload_facedata;
3287 #reload_archetypes;#d#
2540 reload_archetypes; 3288 reload_archetypes;
2541 reload_treasures; 3289 reload_treasures;
2542 3290
2543 warn "finished reloading resource files\n"; 3291 warn "finished reloading resource files\n";
2544} 3292}
2545 3293
2546sub init { 3294sub init {
2547 reload_resources; 3295 reload_resources;
2548} 3296}
2549 3297
2550sub cfg_load { 3298sub reload_config {
2551 open my $fh, "<:utf8", "$CONFDIR/config" 3299 open my $fh, "<:utf8", "$CONFDIR/config"
2552 or return; 3300 or return;
2553 3301
2554 local $/; 3302 local $/;
2555 *CFG = YAML::Syck::Load <$fh>; 3303 *CFG = YAML::Syck::Load <$fh>;
… …
2571sub main { 3319sub main {
2572 # we must not ever block the main coroutine 3320 # we must not ever block the main coroutine
2573 local $Coro::idle = sub { 3321 local $Coro::idle = sub {
2574 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#
2575 (async { 3323 (async {
2576 Event::one_event; 3324 $Coro::current->{desc} = "IDLE BUG HANDLER";
3325 EV::loop EV::LOOP_ONESHOT;
2577 })->prio (Coro::PRIO_MAX); 3326 })->prio (Coro::PRIO_MAX);
2578 }; 3327 };
2579 3328
2580 cfg_load; 3329 reload_config;
2581 db_init; 3330 db_init;
2582 load_extensions; 3331 load_extensions;
2583 3332
2584 $TICK_WATCHER->start; 3333 $TICK_WATCHER->start;
3334 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
2585 Event::loop; 3335 EV::loop;
2586} 3336}
2587 3337
2588############################################################################# 3338#############################################################################
2589# initialisation and cleanup 3339# initialisation and cleanup
2590 3340
2591# install some emergency cleanup handlers 3341# install some emergency cleanup handlers
2592BEGIN { 3342BEGIN {
3343 our %SIGWATCHER = ();
2593 for my $signal (qw(INT HUP TERM)) { 3344 for my $signal (qw(INT HUP TERM)) {
2594 Event->signal ( 3345 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2595 reentrant => 0,
2596 data => WF_AUTOCANCEL,
2597 signal => $signal,
2598 prio => 0,
2599 cb => sub {
2600 cf::cleanup "SIG$signal"; 3346 cf::cleanup "SIG$signal";
2601 },
2602 ); 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
2603 } 3386 1
2604} 3387}
2605 3388
2606sub emergency_save() { 3389sub emergency_save() {
2607 my $freeze_guard = cf::freeze_mainloop; 3390 my $freeze_guard = cf::freeze_mainloop;
2608 3391
… …
2614 # and maps saved/destroyed asynchronously. 3397 # and maps saved/destroyed asynchronously.
2615 warn "begin emergency player save\n"; 3398 warn "begin emergency player save\n";
2616 for my $login (keys %cf::PLAYER) { 3399 for my $login (keys %cf::PLAYER) {
2617 my $pl = $cf::PLAYER{$login} or next; 3400 my $pl = $cf::PLAYER{$login} or next;
2618 $pl->valid or next; 3401 $pl->valid or next;
3402 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2619 $pl->save; 3403 $pl->save;
2620 } 3404 }
2621 warn "end emergency player save\n"; 3405 warn "end emergency player save\n";
2622 3406
2623 warn "begin emergency map save\n"; 3407 warn "begin emergency map save\n";
… …
2662 warn "syncing database to disk"; 3446 warn "syncing database to disk";
2663 BDB::db_env_txn_checkpoint $DB_ENV; 3447 BDB::db_env_txn_checkpoint $DB_ENV;
2664 3448
2665 # 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
2666 3450
2667 warn "cancelling all WF_AUTOCANCEL watchers";
2668 for (Event::all_watchers) {
2669 $_->cancel if $_->data & WF_AUTOCANCEL;
2670 }
2671
2672 warn "flushing outstanding aio requests"; 3451 warn "flushing outstanding aio requests";
2673 for (;;) { 3452 for (;;) {
2674 BDB::flush; 3453 BDB::flush;
2675 IO::AIO::flush; 3454 IO::AIO::flush;
2676 Coro::cede; 3455 Coro::cede_notself;
2677 last unless IO::AIO::nreqs || BDB::nreqs; 3456 last unless IO::AIO::nreqs || BDB::nreqs;
2678 warn "iterate..."; 3457 warn "iterate...";
2679 } 3458 }
2680 3459
2681 ++$RELOAD; 3460 ++$RELOAD;
… …
2685 %EXT_CORO = (); 3464 %EXT_CORO = ();
2686 3465
2687 warn "removing commands"; 3466 warn "removing commands";
2688 %COMMAND = (); 3467 %COMMAND = ();
2689 3468
2690 warn "removing ext commands"; 3469 warn "removing ext/exti commands";
2691 %EXTCMD = (); 3470 %EXTCMD = ();
3471 %EXTICMD = ();
2692 3472
2693 warn "unloading/nuking all extensions"; 3473 warn "unloading/nuking all extensions";
2694 for my $pkg (@EXTS) { 3474 for my $pkg (@EXTS) {
2695 warn "... unloading $pkg"; 3475 warn "... unloading $pkg";
2696 3476
… …
2739 warn "reloading cf.pm"; 3519 warn "reloading cf.pm";
2740 require cf; 3520 require cf;
2741 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3521 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2742 3522
2743 warn "loading config and database again"; 3523 warn "loading config and database again";
2744 cf::cfg_load; 3524 cf::reload_config;
2745 3525
2746 warn "loading extensions"; 3526 warn "loading extensions";
2747 cf::load_extensions; 3527 cf::load_extensions;
2748 3528
2749 warn "reattaching attachments to objects/players"; 3529 warn "reattaching attachments to objects/players";
… …
2769 3549
2770sub reload_perl() { 3550sub reload_perl() {
2771 # doing reload synchronously and two reloads happen back-to-back, 3551 # doing reload synchronously and two reloads happen back-to-back,
2772 # coro crashes during coro_state_free->destroy here. 3552 # coro crashes during coro_state_free->destroy here.
2773 3553
2774 $RELOAD_WATCHER ||= Event->timer ( 3554 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
2775 reentrant => 0,
2776 after => 0,
2777 data => WF_AUTOCANCEL,
2778 cb => sub {
2779 do_reload_perl;
2780 undef $RELOAD_WATCHER; 3555 undef $RELOAD_WATCHER;
2781 }, 3556 do_reload_perl;
2782 ); 3557 };
2783} 3558}
2784 3559
2785register_command "reload" => sub { 3560register_command "reload" => sub {
2786 my ($who, $arg) = @_; 3561 my ($who, $arg) = @_;
2787 3562
2788 if ($who->flag (FLAG_WIZ)) { 3563 if ($who->flag (FLAG_WIZ)) {
2789 $who->message ("reloading server."); 3564 $who->message ("reloading server.");
3565 async {
3566 $Coro::current->{desc} = "perl_reload";
2790 async { reload_perl }; 3567 reload_perl;
3568 };
2791 } 3569 }
2792}; 3570};
2793 3571
2794unshift @INC, $LIBDIR; 3572unshift @INC, $LIBDIR;
2795 3573
… …
2814 my $signal = new Coro::Signal; 3592 my $signal = new Coro::Signal;
2815 push @WAIT_FOR_TICK_BEGIN, $signal; 3593 push @WAIT_FOR_TICK_BEGIN, $signal;
2816 $signal->wait; 3594 $signal->wait;
2817} 3595}
2818 3596
2819$TICK_WATCHER = Event->timer ( 3597$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
2820 reentrant => 0,
2821 parked => 1,
2822 prio => 0,
2823 at => $NEXT_TICK || $TICK,
2824 data => WF_AUTOCANCEL,
2825 cb => sub {
2826 if ($Coro::current != $Coro::main) { 3598 if ($Coro::current != $Coro::main) {
2827 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"
2828 unless ++$bug_warning > 10; 3600 unless ++$bug_warning > 10;
2829 return; 3601 return;
2830 } 3602 }
2831 3603
2832 $NOW = Event::time; 3604 $NOW = $tick_start = EV::now;
2833 3605
2834 cf::server_tick; # one server iteration 3606 cf::server_tick; # one server iteration
2835 3607
2836 $RUNTIME += $TICK; 3608 $RUNTIME += $TICK;
2837 $NEXT_TICK += $TICK; 3609 $NEXT_TICK += $TICK;
2838 3610
2839 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3611 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2840 $NEXT_RUNTIME_WRITE = $NOW + 10; 3612 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
2841 Coro::async_pool { 3613 Coro::async_pool {
3614 $Coro::current->{desc} = "runtime saver";
2842 write_runtime 3615 write_runtime
2843 or warn "ERROR: unable to write runtime file: $!"; 3616 or warn "ERROR: unable to write runtime file: $!";
2844 };
2845 } 3617 };
3618 }
2846 3619
2847# my $AFTER = Event::time;
2848# warn $AFTER - $NOW;#d#
2849
2850 # if we are delayed by four ticks or more, skip them all
2851 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2852
2853 $TICK_WATCHER->at ($NEXT_TICK);
2854 $TICK_WATCHER->start;
2855
2856 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3620 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2857 $sig->send; 3621 $sig->send;
2858 } 3622 }
2859 while (my $sig = shift @WAIT_FOR_TICK) { 3623 while (my $sig = shift @WAIT_FOR_TICK) {
2860 $sig->send; 3624 $sig->send;
2861 } 3625 }
2862 3626
3627 $LOAD = ($NOW - $tick_start) / $TICK;
3628 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3629
2863 _post_tick; 3630 _post_tick;
2864 }, 3631};
2865); 3632$TICK_WATCHER->priority (EV::MAXPRI);
2866 3633
2867{ 3634{
2868 BDB::max_poll_time $TICK * 0.1; 3635 # configure BDB
2869 $BDB_POLL_WATCHER = Event->io ( 3636
2870 reentrant => 0,
2871 fd => BDB::poll_fileno,
2872 poll => 'r',
2873 prio => 0,
2874 data => WF_AUTOCANCEL,
2875 cb => \&BDB::poll_cb,
2876 );
2877 BDB::min_parallel 8; 3637 BDB::min_parallel 8;
2878 3638 BDB::max_poll_reqs $TICK * 0.1;
2879 BDB::set_sync_prepare {
2880 my $status;
2881 my $current = $Coro::current;
2882 (
2883 sub {
2884 $status = $!;
2885 $current->ready; undef $current;
2886 },
2887 sub {
2888 Coro::schedule while defined $current;
2889 $! = $status;
2890 },
2891 )
2892 };
2893 3639
2894 unless ($DB_ENV) { 3640 unless ($DB_ENV) {
2895 $DB_ENV = BDB::db_env_create; 3641 $DB_ENV = BDB::db_env_create;
3642 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3643 | BDB::LOG_AUTOREMOVE, 1);
3644 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3645 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
2896 3646
2897 cf::sync_job { 3647 cf::sync_job {
2898 eval { 3648 eval {
2899 BDB::db_env_open 3649 BDB::db_env_open
2900 $DB_ENV, 3650 $DB_ENV,
… …
2902 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3652 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2903 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3653 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2904 0666; 3654 0666;
2905 3655
2906 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3656 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2907
2908 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2909 $DB_ENV->set_lk_detect;
2910 }; 3657 };
2911 3658
2912 cf::cleanup "db_env_open(db): $@" if $@; 3659 cf::cleanup "db_env_open(db): $@" if $@;
2913 }; 3660 };
2914 } 3661 }
3662
3663 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3664 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3665 };
3666 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3667 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3668 };
3669 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3670 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3671 };
2915} 3672}
2916 3673
2917{ 3674{
3675 # configure IO::AIO
3676
2918 IO::AIO::min_parallel 8; 3677 IO::AIO::min_parallel 8;
2919
2920 undef $Coro::AIO::WATCHER;
2921 IO::AIO::max_poll_time $TICK * 0.1; 3678 IO::AIO::max_poll_time $TICK * 0.1;
2922 $AIO_POLL_WATCHER = Event->io (
2923 reentrant => 0,
2924 data => WF_AUTOCANCEL,
2925 fd => IO::AIO::poll_fileno,
2926 poll => 'r',
2927 prio => 6,
2928 cb => \&IO::AIO::poll_cb,
2929 );
2930} 3679}
2931 3680
2932my $_log_backtrace; 3681my $_log_backtrace;
2933 3682
2934sub _log_backtrace { 3683sub _log_backtrace {
… …
2938 3687
2939 # limit the # of concurrent backtraces 3688 # limit the # of concurrent backtraces
2940 if ($_log_backtrace < 2) { 3689 if ($_log_backtrace < 2) {
2941 ++$_log_backtrace; 3690 ++$_log_backtrace;
2942 async { 3691 async {
3692 $Coro::current->{desc} = "abt $msg";
3693
2943 my @bt = fork_call { 3694 my @bt = fork_call {
2944 @addr = map { sprintf "%x", $_ } @addr; 3695 @addr = map { sprintf "%x", $_ } @addr;
2945 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3696 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
2946 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3697 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
2947 or die "addr2line: $!"; 3698 or die "addr2line: $!";

Diff Legend

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