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

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

Diff Legend

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