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.258 by root, Sat Apr 21 17:43:42 2007 UTC vs.
Revision 1.399 by root, Sun Dec 16 02:50:33 2007 UTC

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

Diff Legend

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