ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.265 by root, Fri May 11 08:00:00 2007 UTC vs.
Revision 1.405 by root, Mon Dec 17 08:03:22 2007 UTC

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

Diff Legend

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