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.292 by root, Tue Jul 3 00:54:57 2007 UTC vs.
Revision 1.406 by root, Mon Dec 17 08:27:44 2007 UTC

4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable; 9use EV 1.86;
10use Event;
11use Opcode; 10use Opcode;
12use Safe; 11use Safe;
13use Safe::Hole; 12use Safe::Hole;
13use Storable ();
14 14
15use Coro 3.61 (); 15use Coro 4.32 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::EV;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::BDB;
23use Coro::Storable; 24use Coro::Storable;
25use Coro::Util ();
24 26
25use JSON::XS 1.4 (); 27use JSON::XS 2.01 ();
26use BDB (); 28use BDB ();
27use Data::Dumper; 29use Data::Dumper;
28use Digest::MD5; 30use Digest::MD5;
29use Fcntl; 31use Fcntl;
30use YAML::Syck (); 32use YAML::Syck ();
31use IO::AIO 2.32 (); 33use IO::AIO 2.51 ();
32use Time::HiRes; 34use Time::HiRes;
33use Compress::LZF; 35use Compress::LZF;
36use Digest::MD5 ();
34 37
35# configure various modules to our taste 38# configure various modules to our taste
36# 39#
37$Storable::canonical = 1; # reduce rsync transfers 40$Storable::canonical = 1; # reduce rsync transfers
38Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
39Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
40
41$Event::Eval = 1; # no idea why this is required, but it is
42 43
43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
44$YAML::Syck::ImplicitUnicode = 1; 45$YAML::Syck::ImplicitUnicode = 1;
45 46
46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 69our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 71our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 72our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db"; 73our $BDBDIR = "$LOCALDIR/db";
74our %RESOURCE;
73 75
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75our $TICK_WATCHER; 77our $TICK_WATCHER;
76our $AIO_POLL_WATCHER; 78our $AIO_POLL_WATCHER;
77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 80our $NEXT_TICK;
79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 81our $USE_FSYNC = 1; # use fsync to write maps - default off
81 82
82our $BDB_POLL_WATCHER; 83our $BDB_POLL_WATCHER;
84our $BDB_DEADLOCK_WATCHER;
85our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER;
83our $DB_ENV; 87our $DB_ENV;
84 88
85our %CFG; 89our %CFG;
86 90
87our $UPTIME; $UPTIME ||= time; 91our $UPTIME; $UPTIME ||= time;
88our $RUNTIME; 92our $RUNTIME;
93our $NOW;
89 94
90our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
91our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
92our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
93 98
94# used to convert map paths into valid unix filenames by replacing / by ∕ 99# used to convert map paths into valid unix filenames by replacing / by ∕
95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96 101
157 162
158The raw value load value from the last tick. 163The raw value load value from the last tick.
159 164
160=item %cf::CFG 165=item %cf::CFG
161 166
162Configuration for the server, loaded from C</etc/crossfire/config>, or 167Configuration for the server, loaded from C</etc/deliantra-server/config>, or
163from wherever your confdir points to. 168from wherever your confdir points to.
164 169
165=item cf::wait_for_tick, cf::wait_for_tick_begin 170=item cf::wait_for_tick, cf::wait_for_tick_begin
166 171
167These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
168returns directly I<after> the tick processing (and consequently, can only wake one process 173returns directly I<after> the tick processing (and consequently, can only wake one process
169per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 174per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
170 175
176=item @cf::INVOKE_RESULTS
177
178This array contains the results of the last C<invoke ()> call. When
179C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call.
181
171=back 182=back
172 183
173=cut 184=cut
174 185
175BEGIN { 186BEGIN {
179 $msg .= "\n" 190 $msg .= "\n"
180 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
181 192
182 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
183 194
184 utf8::encode $msg;
185 LOG llevError, $msg; 195 LOG llevError, $msg;
186 }; 196 };
187} 197}
188 198
189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
205)) { 215)) {
206 no strict 'refs'; 216 no strict 'refs';
207 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
208} 218}
209 219
210$Event::DIED = sub { 220$EV::DIED = sub {
211 warn "error in event callback: @_"; 221 warn "error in event callback: @_";
212}; 222};
213 223
214############################################################################# 224#############################################################################
215 225
238 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
239 $d 249 $d
240 } || "[unable to dump $_[0]: '$@']"; 250 } || "[unable to dump $_[0]: '$@']";
241} 251}
242 252
243=item $ref = cf::from_json $json 253=item $ref = cf::decode_json $json
244 254
245Converts a JSON string into the corresponding perl data structure. 255Converts a JSON string into the corresponding perl data structure.
246 256
247=item $json = cf::to_json $ref 257=item $json = cf::encode_json $ref
248 258
249Converts a perl data structure into its JSON representation. 259Converts a perl data structure into its JSON representation.
250 260
251=cut 261=cut
252 262
253our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
254 264
255sub to_json ($) { $json_coder->encode ($_[0]) } 265sub encode_json($) { $json_coder->encode ($_[0]) }
256sub from_json ($) { $json_coder->decode ($_[0]) } 266sub decode_json($) { $json_coder->decode ($_[0]) }
257 267
258=item cf::lock_wait $string 268=item cf::lock_wait $string
259 269
260Wait until the given lock is available. See cf::lock_acquire. 270Wait until the given lock is available. See cf::lock_acquire.
261 271
264Wait until the given lock is available and then acquires it and returns 274Wait until the given lock is available and then acquires it and returns
265a Coro::guard object. If the guard object gets destroyed (goes out of scope, 275a Coro::guard object. If the guard object gets destroyed (goes out of scope,
266for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
267returned. 277returned.
268 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
269Lock names should begin with a unique identifier (for example, cf::map::find 282Lock names should begin with a unique identifier (for example, cf::map::find
270uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
271 284
272=item $locked = cf::lock_active $string 285=item $locked = cf::lock_active $string
273 286
274Return true if the lock is currently active, i.e. somebody has locked it. 287Return true if the lock is currently active, i.e. somebody has locked it.
275 288
276=cut 289=cut
277 290
278our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
279 293
280sub lock_wait($) { 294sub lock_wait($) {
281 my ($key) = @_; 295 my ($key) = @_;
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
282 301
283 # wait for lock, if any 302 # wait for lock, if any
284 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
285 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
286 Coro::schedule; 305 Coro::schedule;
292 311
293 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
294 lock_wait $key; 313 lock_wait $key;
295 314
296 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
297 317
298 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
299 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
300 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
301 } 322 }
302} 323}
303 324
315 }; 336 };
316 $TICK_WATCHER->stop; 337 $TICK_WATCHER->stop;
317 $guard 338 $guard
318} 339}
319 340
341=item cf::periodic $interval, $cb
342
343Like EV::periodic, but randomly selects a starting point so that the actions
344get spread over timer.
345
346=cut
347
348sub periodic($$) {
349 my ($interval, $cb) = @_;
350
351 my $start = rand List::Util::min 180, $interval;
352
353 EV::periodic $start, $interval, 0, $cb
354}
355
356=item cf::get_slot $time[, $priority[, $name]]
357
358Allocate $time seconds of blocking CPU time at priority C<$priority>:
359This call blocks and returns only when you have at least C<$time> seconds
360of cpu time till the next tick. The slot is only valid till the next cede.
361
362The optional C<$name> can be used to identify the job to run. It might be
363used for statistical purposes and should identify the same time-class.
364
365Useful for short background jobs.
366
367=cut
368
369our @SLOT_QUEUE;
370our $SLOT_QUEUE;
371
372$SLOT_QUEUE->cancel if $SLOT_QUEUE;
373$SLOT_QUEUE = Coro::async {
374 $Coro::current->desc ("timeslot manager");
375
376 my $signal = new Coro::Signal;
377
378 while () {
379 next_job:
380 my $avail = cf::till_tick;
381 if ($avail > 0.01) {
382 for (0 .. $#SLOT_QUEUE) {
383 if ($SLOT_QUEUE[$_][0] < $avail) {
384 my $job = splice @SLOT_QUEUE, $_, 1, ();
385 $job->[2]->send;
386 Coro::cede;
387 goto next_job;
388 }
389 }
390 }
391
392 if (@SLOT_QUEUE) {
393 # we do not use wait_for_tick() as it returns immediately when tick is inactive
394 push @cf::WAIT_FOR_TICK, $signal;
395 $signal->wait;
396 } else {
397 Coro::schedule;
398 }
399 }
400};
401
402sub get_slot($;$$) {
403 my ($time, $pri, $name) = @_;
404
405 $time = $TICK * .6 if $time > $TICK * .6;
406 my $sig = new Coro::Signal;
407
408 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
409 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
410 $SLOT_QUEUE->ready;
411 $sig->wait;
412}
413
320=item cf::async { BLOCK } 414=item cf::async { BLOCK }
321 415
322Currently the same as Coro::async_pool, meaning you cannot use 416Currently the same as Coro::async_pool, meaning you cannot use
323C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 417C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
324thing you are allowed to do is call C<prio> on it. 418thing you are allowed to do is call C<prio> on it.
327 421
328BEGIN { *async = \&Coro::async_pool } 422BEGIN { *async = \&Coro::async_pool }
329 423
330=item cf::sync_job { BLOCK } 424=item cf::sync_job { BLOCK }
331 425
332The design of Crossfire TRT requires that the main coroutine ($Coro::main) 426The design of Deliantra requires that the main coroutine ($Coro::main)
333is always able to handle events or runnable, as Crossfire TRT is only 427is always able to handle events or runnable, as Deliantra is only
334partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 428partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
335acceptable. 429acceptable.
336 430
337If it must be done, put the blocking parts into C<sync_job>. This will run 431If it must be done, put the blocking parts into C<sync_job>. This will run
338the given BLOCK in another coroutine while waiting for the result. The 432the given BLOCK in another coroutine while waiting for the result. The
343 437
344sub sync_job(&) { 438sub sync_job(&) {
345 my ($job) = @_; 439 my ($job) = @_;
346 440
347 if ($Coro::current == $Coro::main) { 441 if ($Coro::current == $Coro::main) {
348 my $time = Event::time; 442 my $time = EV::time;
349 443
350 # this is the main coro, too bad, we have to block 444 # this is the main coro, too bad, we have to block
351 # till the operation succeeds, freezing the server :/ 445 # till the operation succeeds, freezing the server :/
352 446
447 LOG llevError, Carp::longmess "sync job";#d#
448
353 # TODO: use suspend/resume instead 449 # TODO: use suspend/resume instead
354 # (but this is cancel-safe) 450 # (but this is cancel-safe)
355 my $freeze_guard = freeze_mainloop; 451 my $freeze_guard = freeze_mainloop;
356 452
357 my $busy = 1; 453 my $busy = 1;
358 my @res; 454 my @res;
359 455
360 (async { 456 (async {
457 $Coro::current->desc ("sync job coro");
361 @res = eval { $job->() }; 458 @res = eval { $job->() };
362 warn $@ if $@; 459 warn $@ if $@;
363 undef $busy; 460 undef $busy;
364 })->prio (Coro::PRIO_MAX); 461 })->prio (Coro::PRIO_MAX);
365 462
366 while ($busy) { 463 while ($busy) {
367 Coro::cede or Event::one_event; 464 if (Coro::nready) {
465 Coro::cede_notself;
466 } else {
467 EV::loop EV::LOOP_ONESHOT;
368 } 468 }
469 }
369 470
370 $time = Event::time - $time; 471 $time = EV::time - $time;
371 472
372 LOG llevError | logBacktrace, Carp::longmess "long sync job" 473 LOG llevError | logBacktrace, Carp::longmess "long sync job"
373 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 474 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
374 475
375 $tick_start += $time; # do not account sync jobs to server load 476 $tick_start += $time; # do not account sync jobs to server load
405=item fork_call { }, $args 506=item fork_call { }, $args
406 507
407Executes the given code block with the given arguments in a seperate 508Executes the given code block with the given arguments in a seperate
408process, returning the results. Everything must be serialisable with 509process, returning the results. Everything must be serialisable with
409Coro::Storable. May, of course, block. Note that the executed sub may 510Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 511never block itself or use any form of event handling.
411 512
412=cut 513=cut
413 514
414sub fork_call(&@) { 515sub fork_call(&@) {
415 my ($cb, @args) = @_; 516 my ($cb, @args) = @_;
416 517
417# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 518 # we seemingly have to make a local copy of the whole thing,
418# or die "socketpair: $!"; 519 # otherwise perl prematurely frees the stuff :/
419 pipe my $fh1, my $fh2 520 # TODO: investigate and fix (likely this will be rather laborious)
420 or die "pipe: $!";
421 521
422 if (my $pid = fork) { 522 my @res = Coro::Util::fork_eval {
423 close $fh2;
424
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
426 $res = Coro::Storable::thaw $res;
427
428 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
429
430 die $$res unless "ARRAY" eq ref $res;
431
432 return wantarray ? @$res : $res->[-1];
433 } else {
434 reset_signals; 523 reset_signals;
435 local $SIG{__WARN__}; 524 &$cb
436 local $SIG{__DIE__}; 525 }, @args;
437 eval {
438 close $fh1;
439 526
440 my @res = eval { $cb->(@args) }; 527 wantarray ? @res : $res[-1]
441 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
442 };
443
444 warn $@ if $@;
445 _exit 0;
446 }
447} 528}
448 529
449=item $value = cf::db_get $family => $key 530=item $value = cf::db_get $family => $key
450 531
451Returns a single value from the environment database. 532Returns a single value from the environment database.
453=item cf::db_put $family => $key => $value 534=item cf::db_put $family => $key => $value
454 535
455Stores the given C<$value> in the family. It can currently store binary 536Stores the given C<$value> in the family. It can currently store binary
456data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 537data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
457 538
539=item $db = cf::db_table "name"
540
541Create and/or open a new database table. The string must not be "db" and must be unique
542within each server.
543
458=cut 544=cut
545
546sub db_table($) {
547 my ($name) = @_;
548 my $db = BDB::db_create $DB_ENV;
549
550 eval {
551 $db->set_flags (BDB::CHKSUM);
552
553 utf8::encode $name;
554 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
555 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
556 cf::cleanup "db_open(db): $!" if $!;
557 };
558 cf::cleanup "db_open(db): $@" if $@;
559
560 $db
561}
459 562
460our $DB; 563our $DB;
461 564
462sub db_init { 565sub db_init {
463 unless ($DB) {
464 $DB = BDB::db_create $DB_ENV;
465
466 cf::sync_job { 566 cf::sync_job {
467 eval { 567 $DB ||= db_table "db";
468 $DB->set_flags (BDB::CHKSUM);
469
470 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
471 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
472 cf::cleanup "db_open(db): $!" if $!;
473 };
474 cf::cleanup "db_open(db): $@" if $@;
475 };
476 } 568 };
477} 569}
478 570
479sub db_get($$) { 571sub db_get($$) {
480 my $key = "$_[0]/$_[1]"; 572 my $key = "$_[0]/$_[1]";
481 573
531 if (1) { 623 if (1) {
532 $md5 = 624 $md5 =
533 join "\x00", 625 join "\x00",
534 $processversion, 626 $processversion,
535 map { 627 map {
536 Coro::cede; 628 cf::cede_to_tick;
537 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 629 ($src->[$_], Digest::MD5::md5_hex $data[$_])
538 } 0.. $#$src; 630 } 0.. $#$src;
539 631
540 632
541 my $dbmd5 = db_get cache => "$id/md5"; 633 my $dbmd5 = db_get cache => "$id/md5";
585attach callbacks/event handlers (a collection of which is called an "attachment") 677attach callbacks/event handlers (a collection of which is called an "attachment")
586to it. All such attachable objects support the following methods. 678to it. All such attachable objects support the following methods.
587 679
588In the following description, CLASS can be any of C<global>, C<object> 680In the following description, CLASS can be any of C<global>, C<object>
589C<player>, C<client> or C<map> (i.e. the attachable objects in 681C<player>, C<client> or C<map> (i.e. the attachable objects in
590Crossfire TRT). 682Deliantra).
591 683
592=over 4 684=over 4
593 685
594=item $attachable->attach ($attachment, key => $value...) 686=item $attachable->attach ($attachment, key => $value...)
595 687
847 "; 939 ";
848 die if $@; 940 die if $@;
849} 941}
850 942
851our $override; 943our $override;
852our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 944our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
853 945
854sub override { 946sub override {
855 $override = 1; 947 $override = 1;
856 @invoke_results = (); 948 @INVOKE_RESULTS = (@_);
857} 949}
858 950
859sub do_invoke { 951sub do_invoke {
860 my $event = shift; 952 my $event = shift;
861 my $callbacks = shift; 953 my $callbacks = shift;
862 954
863 @invoke_results = (); 955 @INVOKE_RESULTS = ();
864 956
865 local $override; 957 local $override;
866 958
867 for (@$callbacks) { 959 for (@$callbacks) {
868 eval { &{$_->[1]} }; 960 eval { &{$_->[1]} };
877 } 969 }
878 970
879 0 971 0
880} 972}
881 973
882=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 974=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
883 975
884=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 976=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
885 977
886Generate an object-specific event with the given arguments. 978Generate an object-specific event with the given arguments.
887 979
888This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 980This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
889removed in future versions), and there is no public API to access override 981removed in future versions), and there is no public API to access override
890results (if you must, access C<@cf::invoke_results> directly). 982results (if you must, access C<@cf::INVOKE_RESULTS> directly).
891 983
892=back 984=back
893 985
894=cut 986=cut
895 987
896############################################################################# 988#############################################################################
897# object support 989# object support
990
991sub _object_equal($$);
992sub _object_equal($$) {
993 my ($a, $b) = @_;
994
995 return 0 unless (ref $a) eq (ref $b);
996
997 if ("HASH" eq ref $a) {
998 my @ka = keys %$a;
999 my @kb = keys %$b;
1000
1001 return 0 if @ka != @kb;
1002
1003 for (0 .. $#ka) {
1004 return 0 unless $ka[$_] eq $kb[$_];
1005 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1006 }
1007
1008 } elsif ("ARRAY" eq ref $a) {
1009
1010 return 0 if @$a != @$b;
1011
1012 for (0 .. $#$a) {
1013 return 0 unless _object_equal $a->[$_], $b->[$_];
1014 }
1015
1016 } elsif ($a ne $b) {
1017 return 0;
1018 }
1019
1020 1
1021}
1022
1023our $SLOW_MERGES;#d#
1024sub _can_merge {
1025 my ($ob1, $ob2) = @_;
1026
1027 ++$SLOW_MERGES;#d#
1028
1029 # we do the slow way here
1030 return _object_equal $ob1, $ob2
1031}
898 1032
899sub reattach { 1033sub reattach {
900 # basically do the same as instantiate, without calling instantiate 1034 # basically do the same as instantiate, without calling instantiate
901 my ($obj) = @_; 1035 my ($obj) = @_;
902 1036
923cf::attachable->attach ( 1057cf::attachable->attach (
924 prio => -1000000, 1058 prio => -1000000,
925 on_instantiate => sub { 1059 on_instantiate => sub {
926 my ($obj, $data) = @_; 1060 my ($obj, $data) = @_;
927 1061
928 $data = from_json $data; 1062 $data = decode_json $data;
929 1063
930 for (@$data) { 1064 for (@$data) {
931 my ($name, $args) = @$_; 1065 my ($name, $args) = @$_;
932 1066
933 $obj->attach ($name, %{$args || {} }); 1067 $obj->attach ($name, %{$args || {} });
949sub object_freezer_save { 1083sub object_freezer_save {
950 my ($filename, $rdata, $objs) = @_; 1084 my ($filename, $rdata, $objs) = @_;
951 1085
952 sync_job { 1086 sync_job {
953 if (length $$rdata) { 1087 if (length $$rdata) {
1088 utf8::decode (my $decname = $filename);
954 warn sprintf "saving %s (%d,%d)\n", 1089 warn sprintf "saving %s (%d,%d)\n",
955 $filename, length $$rdata, scalar @$objs; 1090 $decname, length $$rdata, scalar @$objs;
956 1091
957 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1092 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
958 chmod SAVE_MODE, $fh; 1093 chmod SAVE_MODE, $fh;
959 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1094 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
960 aio_fsync $fh if $cf::USE_FSYNC; 1095 aio_fsync $fh if $cf::USE_FSYNC;
961 close $fh; 1096 close $fh;
962 1097
963 if (@$objs) { 1098 if (@$objs) {
964 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1099 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
965 chmod SAVE_MODE, $fh; 1100 chmod SAVE_MODE, $fh;
966 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1101 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
967 aio_write $fh, 0, (length $data), $data, 0; 1102 aio_write $fh, 0, (length $data), $data, 0;
968 aio_fsync $fh if $cf::USE_FSYNC; 1103 aio_fsync $fh if $cf::USE_FSYNC;
969 close $fh; 1104 close $fh;
970 aio_rename "$filename.pst~", "$filename.pst"; 1105 aio_rename "$filename.pst~", "$filename.pst";
971 } 1106 }
979 } 1114 }
980 } else { 1115 } else {
981 aio_unlink $filename; 1116 aio_unlink $filename;
982 aio_unlink "$filename.pst"; 1117 aio_unlink "$filename.pst";
983 } 1118 }
984 } 1119 };
985} 1120}
986 1121
987sub object_freezer_as_string { 1122sub object_freezer_as_string {
988 my ($rdata, $objs) = @_; 1123 my ($rdata, $objs) = @_;
989 1124
1001 or return; 1136 or return;
1002 1137
1003 unless (aio_stat "$filename.pst") { 1138 unless (aio_stat "$filename.pst") {
1004 (aio_load "$filename.pst", $av) >= 0 1139 (aio_load "$filename.pst", $av) >= 0
1005 or return; 1140 or return;
1141
1006 $av = eval { (Storable::thaw $av)->{objs} }; 1142 my $st = eval { Coro::Storable::thaw $av };
1143 $av = $st->{objs};
1007 } 1144 }
1008 1145
1146 utf8::decode (my $decname = $filename);
1009 warn sprintf "loading %s (%d)\n", 1147 warn sprintf "loading %s (%d,%d)\n",
1010 $filename, length $data, scalar @{$av || []}; 1148 $decname, length $data, scalar @{$av || []};
1149
1011 return ($data, $av); 1150 ($data, $av)
1012} 1151}
1013 1152
1014=head2 COMMAND CALLBACKS 1153=head2 COMMAND CALLBACKS
1015 1154
1016=over 4 1155=over 4
1089 my ($pl, $buf) = @_; 1228 my ($pl, $buf) = @_;
1090 1229
1091 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1230 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1092 1231
1093 if (ref $msg) { 1232 if (ref $msg) {
1233 my ($type, $reply, @payload) =
1234 "ARRAY" eq ref $msg
1235 ? @$msg
1236 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1237
1238 my @reply;
1239
1094 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1240 if (my $cb = $EXTCMD{$type}) {
1095 if (my %reply = $cb->($pl, $msg)) { 1241 @reply = $cb->($pl, @payload);
1096 $pl->ext_reply ($msg->{msgid}, %reply);
1097 }
1098 } 1242 }
1243
1244 $pl->ext_reply ($reply, @reply)
1245 if $reply;
1246
1099 } else { 1247 } else {
1100 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1248 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1101 } 1249 }
1102 1250
1103 cf::override; 1251 cf::override;
1193 1341
1194=head3 cf::player 1342=head3 cf::player
1195 1343
1196=over 4 1344=over 4
1197 1345
1346=item cf::player::num_playing
1347
1348Returns the official number of playing players, as per the Crossfire metaserver rules.
1349
1350=cut
1351
1352sub num_playing {
1353 scalar grep
1354 $_->ob->map
1355 && !$_->hidden
1356 && !$_->ob->flag (cf::FLAG_WIZ),
1357 cf::player::list
1358}
1359
1198=item cf::player::find $login 1360=item cf::player::find $login
1199 1361
1200Returns the given player object, loading it if necessary (might block). 1362Returns the given player object, loading it if necessary (might block).
1201 1363
1202=cut 1364=cut
1237 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1399 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1238 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1400 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1239 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1401 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1240 aio_unlink +(playerdir $login) . "/$login.pl"; 1402 aio_unlink +(playerdir $login) . "/$login.pl";
1241 1403
1242 my $pl = load_pl path $login 1404 my $f = new_from_file cf::object::thawer path $login
1243 or return; 1405 or return;
1406
1407 my $pl = cf::player::load_pl $f
1408 or return;
1409 local $cf::PLAYER_LOADING{$login} = $pl;
1410 $f->resolve_delayed_derefs;
1244 $cf::PLAYER{$login} = $pl 1411 $cf::PLAYER{$login} = $pl
1245 } 1412 }
1246 } 1413 }
1247} 1414}
1248 1415
1258 1425
1259 aio_mkdir playerdir $pl, 0770; 1426 aio_mkdir playerdir $pl, 0770;
1260 $pl->{last_save} = $cf::RUNTIME; 1427 $pl->{last_save} = $cf::RUNTIME;
1261 1428
1262 $pl->save_pl ($path); 1429 $pl->save_pl ($path);
1263 Coro::cede; 1430 cf::cede_to_tick;
1264} 1431}
1265 1432
1266sub new($) { 1433sub new($) {
1267 my ($login) = @_; 1434 my ($login) = @_;
1268 1435
1272 $self->{deny_save} = 1; 1439 $self->{deny_save} = 1;
1273 1440
1274 $cf::PLAYER{$login} = $self; 1441 $cf::PLAYER{$login} = $self;
1275 1442
1276 $self 1443 $self
1444}
1445
1446=item $player->send_msg ($channel, $msg, $color, [extra...])
1447
1448=cut
1449
1450sub send_msg {
1451 my $ns = shift->ns
1452 or return;
1453 $ns->send_msg (@_);
1277} 1454}
1278 1455
1279=item $pl->quit_character 1456=item $pl->quit_character
1280 1457
1281Nukes the player without looking back. If logged in, the connection will 1458Nukes the player without looking back. If logged in, the connection will
1336 or return []; 1513 or return [];
1337 1514
1338 my @logins; 1515 my @logins;
1339 1516
1340 for my $login (@$dirs) { 1517 for my $login (@$dirs) {
1518 my $path = path $login;
1519
1520 # a .pst is a dead give-away for a valid player
1521 unless (-e "$path.pst") {
1341 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1522 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1342 aio_read $fh, 0, 512, my $buf, 0 or next; 1523 aio_read $fh, 0, 512, my $buf, 0 or next;
1343 $buf !~ /^password -------------$/m or next; # official not-valid tag 1524 $buf !~ /^password -------------$/m or next; # official not-valid tag
1525 }
1344 1526
1345 utf8::decode $login; 1527 utf8::decode $login;
1346 push @logins, $login; 1528 push @logins, $login;
1347 } 1529 }
1348 1530
1381 1563
1382Expand crossfire pod fragments into protocol xml. 1564Expand crossfire pod fragments into protocol xml.
1383 1565
1384=cut 1566=cut
1385 1567
1568use re 'eval';
1569
1570my $group;
1571my $interior; $interior = qr{
1572 # match a pod interior sequence sans C<< >>
1573 (?:
1574 \ (.*?)\ (?{ $group = $^N })
1575 | < (??{$interior}) >
1576 )
1577}x;
1578
1386sub expand_cfpod { 1579sub expand_cfpod {
1387 ((my $self), (local $_)) = @_; 1580 my ($self, $pod) = @_;
1388 1581
1389 # escape & and < 1582 my $xml;
1390 s/&/&amp;/g;
1391 s/(?<![BIUGH])</&lt;/g;
1392 1583
1393 # this is buggy, it needs to properly take care of nested <'s 1584 while () {
1585 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1586 $group = $1;
1394 1587
1395 1 while 1588 $group =~ s/&/&amp;/g;
1396 # replace B<>, I<>, U<> etc. 1589 $group =~ s/</&lt;/g;
1397 s/B<([^\>]*)>/<b>$1<\/b>/ 1590
1398 || s/I<([^\>]*)>/<i>$1<\/i>/ 1591 $xml .= $group;
1399 || s/U<([^\>]*)>/<u>$1<\/u>/ 1592 } elsif ($pod =~ m%\G
1400 # replace G<male|female> tags 1593 ([BCGHITU])
1401 || s{G<([^>|]*)\|([^>]*)>}{ 1594 <
1402 $self->gender ? $2 : $1 1595 (?:
1403 }ge 1596 ([^<>]*) (?{ $group = $^N })
1404 # replace H<hint text> 1597 | < $interior >
1405 || s{H<([^\>]*)>} 1598 )
1599 >
1600 %gcsx
1406 { 1601 ) {
1602 my ($code, $data) = ($1, $group);
1603
1604 if ($code eq "B") {
1605 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1606 } elsif ($code eq "I") {
1607 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1608 } elsif ($code eq "U") {
1609 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1610 } elsif ($code eq "C") {
1611 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1612 } elsif ($code eq "T") {
1613 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1614 } elsif ($code eq "G") {
1615 my ($male, $female) = split /\|/, $data;
1616 $data = $self->gender ? $female : $male;
1617 $xml .= expand_cfpod ($self, $data);
1618 } elsif ($code eq "H") {
1407 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1619 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1408 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1620 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1409 "") 1621 "")
1410 [$self->{hintmode}] 1622 [$self->{hintmode}];
1623 } else {
1624 $xml .= "error processing '$code($data)' directive";
1411 }ge; 1625 }
1626 } else {
1627 if ($pod =~ /\G(.+)/) {
1628 warn "parse error while expanding $pod (at $1)";
1629 }
1630 last;
1631 }
1632 }
1412 1633
1634 for ($xml) {
1413 # create single paragraphs (very hackish) 1635 # create single paragraphs (very hackish)
1414 s/(?<=\S)\n(?=\w)/ /g; 1636 s/(?<=\S)\n(?=\w)/ /g;
1415 1637
1416 # compress some whitespace 1638 # compress some whitespace
1417 1 while s/\s*\n\s*\n\s*/\n/; 1639 s/\s+\n/\n/g; # ws line-ends
1640 s/\n\n+/\n/g; # double lines
1641 s/^\n+//; # beginning lines
1642 s/\n+$//; # ending lines
1643 }
1418 1644
1419 $_ 1645 $xml
1420} 1646}
1647
1648no re 'eval';
1421 1649
1422sub hintmode { 1650sub hintmode {
1423 $_[0]{hintmode} = $_[1] if @_ > 1; 1651 $_[0]{hintmode} = $_[1] if @_ > 1;
1424 $_[0]{hintmode} 1652 $_[0]{hintmode}
1425} 1653}
1426 1654
1427=item $player->ext_reply ($msgid, %msg) 1655=item $player->ext_reply ($msgid, @msg)
1428 1656
1429Sends an ext reply to the player. 1657Sends an ext reply to the player.
1430 1658
1431=cut 1659=cut
1432 1660
1433sub ext_reply($$%) { 1661sub ext_reply($$@) {
1434 my ($self, $id, %msg) = @_; 1662 my ($self, $id, @msg) = @_;
1435 1663
1436 $msg{msgid} = $id; 1664 $self->ns->ext_reply ($id, @msg)
1437 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1438} 1665}
1439 1666
1440=item $player->ext_event ($type, %msg) 1667=item $player->ext_msg ($type, @msg)
1441 1668
1442Sends an ext event to the client. 1669Sends an ext event to the client.
1443 1670
1444=cut 1671=cut
1445 1672
1446sub ext_event($$%) { 1673sub ext_msg($$@) {
1447 my ($self, $type, %msg) = @_; 1674 my ($self, $type, @msg) = @_;
1448 1675
1449 $self->ns->ext_event ($type, %msg); 1676 $self->ns->ext_msg ($type, @msg);
1450} 1677}
1451 1678
1452=head3 cf::region 1679=head3 cf::region
1453 1680
1454=over 4 1681=over 4
1467 my ($path) = @_; 1694 my ($path) = @_;
1468 1695
1469 my ($match, $specificity); 1696 my ($match, $specificity);
1470 1697
1471 for my $region (list) { 1698 for my $region (list) {
1472 if ($region->match && $path =~ $region->match) { 1699 if ($region->{match} && $path =~ $region->{match}) {
1473 ($match, $specificity) = ($region, $region->specificity) 1700 ($match, $specificity) = ($region, $region->specificity)
1474 if $region->specificity > $specificity; 1701 if $region->specificity > $specificity;
1475 } 1702 }
1476 } 1703 }
1477 1704
1597 $self->init; # pass $1 etc. 1824 $self->init; # pass $1 etc.
1598 return $self; 1825 return $self;
1599 } 1826 }
1600 } 1827 }
1601 1828
1602 Carp::carp "unable to resolve path '$path' (base '$base')."; 1829 Carp::cluck "unable to resolve path '$path' (base '$base').";
1603 () 1830 ()
1604} 1831}
1605 1832
1606sub init { 1833sub init {
1607 my ($self) = @_; 1834 my ($self) = @_;
1670 1897
1671sub load_header_from($) { 1898sub load_header_from($) {
1672 my ($self, $path) = @_; 1899 my ($self, $path) = @_;
1673 1900
1674 utf8::encode $path; 1901 utf8::encode $path;
1675 #aio_open $path, O_RDONLY, 0 1902 my $f = new_from_file cf::object::thawer $path
1676 # or return;
1677
1678 $self->_load_header ($path)
1679 or return; 1903 or return;
1904
1905 $self->_load_header ($f)
1906 or return;
1907
1908 local $MAP_LOADING{$self->{path}} = $self;
1909 $f->resolve_delayed_derefs;
1680 1910
1681 $self->{load_path} = $path; 1911 $self->{load_path} = $path;
1682 1912
1683 1 1913 1
1684} 1914}
1738sub find { 1968sub find {
1739 my ($path, $origin) = @_; 1969 my ($path, $origin) = @_;
1740 1970
1741 $path = normalise $path, $origin && $origin->path; 1971 $path = normalise $path, $origin && $origin->path;
1742 1972
1973 cf::lock_wait "map_data:$path";#d#remove
1743 cf::lock_wait "map_find:$path"; 1974 cf::lock_wait "map_find:$path";
1744 1975
1745 $cf::MAP{$path} || do { 1976 $cf::MAP{$path} || do {
1746 my $guard = cf::lock_acquire "map_find:$path"; 1977 my $guard1 = cf::lock_acquire "map_find:$path";
1978 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1979
1747 my $map = new_from_path cf::map $path 1980 my $map = new_from_path cf::map $path
1748 or return; 1981 or return;
1749 1982
1750 $map->{last_save} = $cf::RUNTIME; 1983 $map->{last_save} = $cf::RUNTIME;
1751 1984
1753 or return; 1986 or return;
1754 1987
1755 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1988 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1756 # doing this can freeze the server in a sync job, obviously 1989 # doing this can freeze the server in a sync job, obviously
1757 #$cf::WAIT_FOR_TICK->wait; 1990 #$cf::WAIT_FOR_TICK->wait;
1991 undef $guard1;
1992 undef $guard2;
1758 $map->reset; 1993 $map->reset;
1759 undef $guard;
1760 return find $path; 1994 return find $path;
1761 } 1995 }
1762 1996
1763 $cf::MAP{$path} = $map 1997 $cf::MAP{$path} = $map
1764 } 1998 }
1773 local $self->{deny_reset} = 1; # loading can take a long time 2007 local $self->{deny_reset} = 1; # loading can take a long time
1774 2008
1775 my $path = $self->{path}; 2009 my $path = $self->{path};
1776 2010
1777 { 2011 {
1778 my $guard = cf::lock_acquire "map_load:$path"; 2012 my $guard = cf::lock_acquire "map_data:$path";
1779 2013
2014 return unless $self->valid;
1780 return if $self->in_memory != cf::MAP_SWAPPED; 2015 return unless $self->in_memory == cf::MAP_SWAPPED;
1781 2016
1782 $self->in_memory (cf::MAP_LOADING); 2017 $self->in_memory (cf::MAP_LOADING);
1783 2018
1784 $self->alloc; 2019 $self->alloc;
1785 2020
1786 $self->pre_load; 2021 $self->pre_load;
1787 Coro::cede; 2022 cf::cede_to_tick;
1788 2023
2024 my $f = new_from_file cf::object::thawer $self->{load_path};
2025 $f->skip_block;
1789 $self->_load_objects ($self->{load_path}, 1) 2026 $self->_load_objects ($f)
1790 or return; 2027 or return;
1791 2028
1792 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2029 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1793 if delete $self->{load_original}; 2030 if delete $self->{load_original};
1794 2031
1795 if (my $uniq = $self->uniq_path) { 2032 if (my $uniq = $self->uniq_path) {
1796 utf8::encode $uniq; 2033 utf8::encode $uniq;
1797 if (aio_open $uniq, O_RDONLY, 0) { 2034 unless (aio_stat $uniq) {
2035 if (my $f = new_from_file cf::object::thawer $uniq) {
1798 $self->clear_unique_items; 2036 $self->clear_unique_items;
1799 $self->_load_objects ($uniq, 0); 2037 $self->_load_objects ($f);
2038 $f->resolve_delayed_derefs;
2039 }
1800 } 2040 }
1801 } 2041 }
1802 2042
1803 Coro::cede; 2043 $f->resolve_delayed_derefs;
2044
2045 cf::cede_to_tick;
1804 # now do the right thing for maps 2046 # now do the right thing for maps
1805 $self->link_multipart_objects; 2047 $self->link_multipart_objects;
1806 $self->difficulty ($self->estimate_difficulty) 2048 $self->difficulty ($self->estimate_difficulty)
1807 unless $self->difficulty; 2049 unless $self->difficulty;
1808 Coro::cede; 2050 cf::cede_to_tick;
1809 2051
1810 unless ($self->{deny_activate}) { 2052 unless ($self->{deny_activate}) {
1811 $self->decay_objects; 2053 $self->decay_objects;
1812 $self->fix_auto_apply; 2054 $self->fix_auto_apply;
1813 $self->update_buttons; 2055 $self->update_buttons;
1814 Coro::cede; 2056 cf::cede_to_tick;
1815 $self->set_darkness_map; 2057 $self->set_darkness_map;
1816 Coro::cede; 2058 cf::cede_to_tick;
1817 $self->activate; 2059 $self->activate;
1818 } 2060 }
2061
2062 $self->{last_save} = $cf::RUNTIME;
2063 $self->last_access ($cf::RUNTIME);
1819 2064
1820 $self->in_memory (cf::MAP_IN_MEMORY); 2065 $self->in_memory (cf::MAP_IN_MEMORY);
1821 } 2066 }
1822 2067
1823 $self->post_load; 2068 $self->post_load;
1834 2079
1835 $self 2080 $self
1836} 2081}
1837 2082
1838# find and load all maps in the 3x3 area around a map 2083# find and load all maps in the 3x3 area around a map
1839sub load_diag { 2084sub load_neighbours {
1840 my ($map) = @_; 2085 my ($map) = @_;
1841 2086
1842 my @diag; # diagonal neighbours 2087 my @neigh; # diagonal neighbours
1843 2088
1844 for (0 .. 3) { 2089 for (0 .. 3) {
1845 my $neigh = $map->tile_path ($_) 2090 my $neigh = $map->tile_path ($_)
1846 or next; 2091 or next;
1847 $neigh = find $neigh, $map 2092 $neigh = find $neigh, $map
1848 or next; 2093 or next;
1849 $neigh->load; 2094 $neigh->load;
1850 2095
2096 push @neigh,
1851 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2097 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1852 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2098 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1853 } 2099 }
1854 2100
1855 for (@diag) { 2101 for (grep defined $_->[0], @neigh) {
2102 my ($path, $origin) = @$_;
1856 my $neigh = find @$_ 2103 my $neigh = find $path, $origin
1857 or next; 2104 or next;
1858 $neigh->load; 2105 $neigh->load;
1859 } 2106 }
1860} 2107}
1861 2108
1866} 2113}
1867 2114
1868sub do_load_sync { 2115sub do_load_sync {
1869 my ($map) = @_; 2116 my ($map) = @_;
1870 2117
2118 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2119 if $Coro::current == $Coro::main;
2120
1871 cf::sync_job { $map->load }; 2121 cf::sync_job { $map->load };
1872} 2122}
1873 2123
1874our %MAP_PREFETCH; 2124our %MAP_PREFETCH;
1875our $MAP_PREFETCHER = undef; 2125our $MAP_PREFETCHER = undef;
1876 2126
1877sub find_async { 2127sub find_async {
1878 my ($path, $origin) = @_; 2128 my ($path, $origin, $load) = @_;
1879 2129
1880 $path = normalise $path, $origin && $origin->{path}; 2130 $path = normalise $path, $origin && $origin->{path};
1881 2131
1882 if (my $map = $cf::MAP{$path}) { 2132 if (my $map = $cf::MAP{$path}) {
1883 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2133 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1884 } 2134 }
1885 2135
1886 undef $MAP_PREFETCH{$path}; 2136 $MAP_PREFETCH{$path} |= $load;
2137
1887 $MAP_PREFETCHER ||= cf::async { 2138 $MAP_PREFETCHER ||= cf::async {
2139 $Coro::current->{desc} = "map prefetcher";
2140
1888 while (%MAP_PREFETCH) { 2141 while (%MAP_PREFETCH) {
1889 for my $path (keys %MAP_PREFETCH) { 2142 while (my ($k, $v) = each %MAP_PREFETCH) {
1890 my $map = find $path 2143 if (my $map = find $k) {
1891 or next;
1892 $map->load; 2144 $map->load if $v;
2145 }
1893 2146
1894 delete $MAP_PREFETCH{$path}; 2147 delete $MAP_PREFETCH{$k};
1895 } 2148 }
1896 } 2149 }
1897 undef $MAP_PREFETCHER; 2150 undef $MAP_PREFETCHER;
1898 }; 2151 };
1899 $MAP_PREFETCHER->prio (6); 2152 $MAP_PREFETCHER->prio (6);
1902} 2155}
1903 2156
1904sub save { 2157sub save {
1905 my ($self) = @_; 2158 my ($self) = @_;
1906 2159
1907 my $lock = cf::lock_acquire "map_data:" . $self->path; 2160 my $lock = cf::lock_acquire "map_data:$self->{path}";
1908 2161
1909 $self->{last_save} = $cf::RUNTIME; 2162 $self->{last_save} = $cf::RUNTIME;
1910 2163
1911 return unless $self->dirty; 2164 return unless $self->dirty;
1912 2165
1918 return if $self->{deny_save}; 2171 return if $self->{deny_save};
1919 2172
1920 local $self->{last_access} = $self->last_access;#d# 2173 local $self->{last_access} = $self->last_access;#d#
1921 2174
1922 cf::async { 2175 cf::async {
2176 $Coro::current->{desc} = "map player save";
1923 $_->contr->save for $self->players; 2177 $_->contr->save for $self->players;
1924 }; 2178 };
1925 2179
1926 if ($uniq) { 2180 if ($uniq) {
1927 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2181 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1935 my ($self) = @_; 2189 my ($self) = @_;
1936 2190
1937 # save first because save cedes 2191 # save first because save cedes
1938 $self->save; 2192 $self->save;
1939 2193
1940 my $lock = cf::lock_acquire "map_data:" . $self->path; 2194 my $lock = cf::lock_acquire "map_data:$self->{path}";
1941 2195
1942 return if $self->players; 2196 return if $self->players;
1943 return if $self->in_memory != cf::MAP_IN_MEMORY; 2197 return if $self->in_memory != cf::MAP_IN_MEMORY;
1944 return if $self->{deny_save}; 2198 return if $self->{deny_save};
1945 2199
2200 $self->in_memory (cf::MAP_SWAPPED);
2201
2202 $self->deactivate;
2203 $_->clear_links_to ($self) for values %cf::MAP;
1946 $self->clear; 2204 $self->clear;
1947 $self->in_memory (cf::MAP_SWAPPED);
1948} 2205}
1949 2206
1950sub reset_at { 2207sub reset_at {
1951 my ($self) = @_; 2208 my ($self) = @_;
1952 2209
1984 if $uniq; 2241 if $uniq;
1985 } 2242 }
1986 2243
1987 delete $cf::MAP{$self->path}; 2244 delete $cf::MAP{$self->path};
1988 2245
2246 $self->deactivate;
2247 $_->clear_links_to ($self) for values %cf::MAP;
1989 $self->clear; 2248 $self->clear;
1990
1991 $_->clear_links_to ($self) for values %cf::MAP;
1992 2249
1993 $self->unlink_save; 2250 $self->unlink_save;
1994 $self->destroy; 2251 $self->destroy;
1995} 2252}
1996 2253
1997my $nuke_counter = "aaaa"; 2254my $nuke_counter = "aaaa";
1998 2255
1999sub nuke { 2256sub nuke {
2000 my ($self) = @_; 2257 my ($self) = @_;
2001 2258
2259 {
2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2261
2002 delete $cf::MAP{$self->path}; 2262 delete $cf::MAP{$self->path};
2003 2263
2004 $self->unlink_save; 2264 $self->unlink_save;
2005 2265
2006 bless $self, "cf::map"; 2266 bless $self, "cf::map";
2007 delete $self->{deny_reset}; 2267 delete $self->{deny_reset};
2008 $self->{deny_save} = 1; 2268 $self->{deny_save} = 1;
2009 $self->reset_timeout (1); 2269 $self->reset_timeout (1);
2010 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2270 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2011 2271
2012 $cf::MAP{$self->path} = $self; 2272 $cf::MAP{$self->path} = $self;
2273 }
2013 2274
2014 $self->reset; # polite request, might not happen 2275 $self->reset; # polite request, might not happen
2015} 2276}
2016 2277
2017=item $maps = cf::map::tmp_maps 2278=item $maps = cf::map::tmp_maps
2093 2354
2094sub inv_recursive { 2355sub inv_recursive {
2095 inv_recursive_ inv $_[0] 2356 inv_recursive_ inv $_[0]
2096} 2357}
2097 2358
2359=item $ref = $ob->ref
2360
2361creates and returns a persistent reference to an objetc that can be stored as a string.
2362
2363=item $ob = cf::object::deref ($refstring)
2364
2365returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2366even if the object actually exists. May block.
2367
2368=cut
2369
2370sub deref {
2371 my ($ref) = @_;
2372
2373 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2374 my ($uuid, $name) = ($1, $2);
2375 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2376 or return;
2377 $pl->ob->uuid eq $uuid
2378 or return;
2379
2380 $pl->ob
2381 } else {
2382 warn "$ref: cannot resolve object reference\n";
2383 undef
2384 }
2385}
2386
2098package cf; 2387package cf;
2099 2388
2100=back 2389=back
2101 2390
2102=head3 cf::object::player 2391=head3 cf::object::player
2124 2413
2125 } else { 2414 } else {
2126 my $pl = $self->contr; 2415 my $pl = $self->contr;
2127 2416
2128 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2417 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2129 my $diag = $pl->{npc_dialog}; 2418 my $dialog = $pl->{npc_dialog};
2130 $diag->{pl}->ext_reply ( 2419 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2131 $diag->{id},
2132 msgtype => "reply",
2133 msg => $diag->{pl}->expand_cfpod ($msg),
2134 add_topics => []
2135 );
2136 2420
2137 } else { 2421 } else {
2138 $msg = $npc->name . " says: $msg" if $npc; 2422 $msg = $npc->name . " says: $msg" if $npc;
2139 $self->message ($msg, $flags); 2423 $self->message ($msg, $flags);
2140 } 2424 }
2141 } 2425 }
2426}
2427
2428=item $object->send_msg ($channel, $msg, $color, [extra...])
2429
2430=cut
2431
2432sub cf::object::send_msg {
2433 my $pl = shift->contr
2434 or return;
2435 $pl->send_msg (@_);
2142} 2436}
2143 2437
2144=item $player_object->may ("access") 2438=item $player_object->may ("access")
2145 2439
2146Returns wether the given player is authorized to access resource "access" 2440Returns wether the given player is authorized to access resource "access"
2225 # use -1 or undef as default coordinates, not 0, 0 2519 # use -1 or undef as default coordinates, not 0, 0
2226 ($x, $y) = ($map->enter_x, $map->enter_y) 2520 ($x, $y) = ($map->enter_x, $map->enter_y)
2227 if $x <=0 && $y <= 0; 2521 if $x <=0 && $y <= 0;
2228 2522
2229 $map->load; 2523 $map->load;
2230 $map->load_diag; 2524 $map->load_neighbours;
2231 2525
2232 return unless $self->contr->active; 2526 return unless $self->contr->active;
2233 $self->activate_recursive; 2527 $self->activate_recursive;
2234 2528
2235 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2529 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2236 $self->enter_map ($map, $x, $y); 2530 $self->enter_map ($map, $x, $y);
2237} 2531}
2238 2532
2239=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2533=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2240 2534
2241Moves the player to the given map-path and coordinates by first freezing 2535Moves the player to the given map-path and coordinates by first freezing
2242her, loading and preparing them map, calling the provided $check callback 2536her, loading and preparing them map, calling the provided $check callback
2243that has to return the map if sucecssful, and then unfreezes the player on 2537that has to return the map if sucecssful, and then unfreezes the player on
2244the new (success) or old (failed) map position. 2538the new (success) or old (failed) map position. In either case, $done will
2539be called at the end of this process.
2245 2540
2246=cut 2541=cut
2247 2542
2248our $GOTOGEN; 2543our $GOTOGEN;
2249 2544
2250sub cf::object::player::goto { 2545sub cf::object::player::goto {
2251 my ($self, $path, $x, $y, $check) = @_; 2546 my ($self, $path, $x, $y, $check, $done) = @_;
2252 2547
2253 # do generation counting so two concurrent goto's will be executed in-order 2548 # do generation counting so two concurrent goto's will be executed in-order
2254 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2549 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2255 2550
2256 $self->enter_link; 2551 $self->enter_link;
2257 2552
2258 (async { 2553 (async {
2554 $Coro::current->{desc} = "player::goto $path $x $y";
2555
2556 # *tag paths override both path and x|y
2557 if ($path =~ /^\*(.*)$/) {
2558 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2559 my $ob = $obs[rand @obs];
2560
2561 # see if we actually can go there
2562 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2563 $ob = $obs[rand @obs];
2564 } else {
2565 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2566 }
2567 # else put us there anyways for now #d#
2568
2569 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2570 } else {
2571 ($path, $x, $y) = (undef, undef, undef);
2572 }
2573 }
2574
2259 my $map = eval { 2575 my $map = eval {
2260 my $map = cf::map::find $path; 2576 my $map = defined $path ? cf::map::find $path : undef;
2261 2577
2262 if ($map) { 2578 if ($map) {
2263 $map = $map->customise_for ($self); 2579 $map = $map->customise_for ($self);
2264 $map = $check->($map) if $check && $map; 2580 $map = $check->($map) if $check && $map;
2265 } else { 2581 } else {
2266 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2582 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2267 } 2583 }
2268 2584
2269 $map 2585 $map
2270 }; 2586 };
2271 2587
2276 2592
2277 if ($gen == $self->{_goto_generation}) { 2593 if ($gen == $self->{_goto_generation}) {
2278 delete $self->{_goto_generation}; 2594 delete $self->{_goto_generation};
2279 $self->leave_link ($map, $x, $y); 2595 $self->leave_link ($map, $x, $y);
2280 } 2596 }
2597
2598 $done->() if $done;
2281 })->prio (1); 2599 })->prio (1);
2282} 2600}
2283 2601
2284=item $player_object->enter_exit ($exit_object) 2602=item $player_object->enter_exit ($exit_object)
2285 2603
2322 $rmp->{origin_y} = $exit->y; 2640 $rmp->{origin_y} = $exit->y;
2323 } 2641 }
2324 2642
2325 $rmp->{random_seed} ||= $exit->random_seed; 2643 $rmp->{random_seed} ||= $exit->random_seed;
2326 2644
2327 my $data = cf::to_json $rmp; 2645 my $data = cf::encode_json $rmp;
2328 my $md5 = Digest::MD5::md5_hex $data; 2646 my $md5 = Digest::MD5::md5_hex $data;
2329 my $meta = "$RANDOMDIR/$md5.meta"; 2647 my $meta = "$RANDOMDIR/$md5.meta";
2330 2648
2331 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2649 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2332 aio_write $fh, 0, (length $data), $data, 0; 2650 aio_write $fh, 0, (length $data), $data, 0;
2354 my $hp = $exit->stats->hp; 2672 my $hp = $exit->stats->hp;
2355 my $sp = $exit->stats->sp; 2673 my $sp = $exit->stats->sp;
2356 2674
2357 $self->enter_link; 2675 $self->enter_link;
2358 2676
2677 # if exit is damned, update players death & WoR home-position
2678 $self->contr->savebed ($slaying, $hp, $sp)
2679 if $exit->flag (FLAG_DAMNED);
2680
2359 (async { 2681 (async {
2682 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2683
2360 $self->deactivate_recursive; # just to be sure 2684 $self->deactivate_recursive; # just to be sure
2361 unless (eval { 2685 unless (eval {
2362 $self->goto ($slaying, $hp, $sp); 2686 $self->goto ($slaying, $hp, $sp);
2363 2687
2364 1; 2688 1;
2390 2714
2391 utf8::encode $text; 2715 utf8::encode $text;
2392 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2716 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2393} 2717}
2394 2718
2395=item $client->send_msg ($color, $type, $msg, [extra...]) 2719=item $client->send_msg ($channel, $msg, $color, [extra...])
2396 2720
2397Send a drawinfo or msg packet to the client, formatting the msg for the 2721Send a drawinfo or msg packet to the client, formatting the msg for the
2398client if neccessary. C<$type> should be a string identifying the type of 2722client if neccessary. C<$type> should be a string identifying the type of
2399the message, with C<log> being the default. If C<$color> is negative, suppress 2723the message, with C<log> being the default. If C<$color> is negative, suppress
2400the message unless the client supports the msg packet. 2724the message unless the client supports the msg packet.
2401 2725
2402=cut 2726=cut
2403 2727
2728# non-persistent channels (usually the info channel)
2729our %CHANNEL = (
2730 "c/identify" => {
2731 id => "infobox",
2732 title => "Identify",
2733 reply => undef,
2734 tooltip => "Items recently identified",
2735 },
2736 "c/examine" => {
2737 id => "infobox",
2738 title => "Examine",
2739 reply => undef,
2740 tooltip => "Signs and other items you examined",
2741 },
2742 "c/book" => {
2743 id => "infobox",
2744 title => "Book",
2745 reply => undef,
2746 tooltip => "The contents of a note or book",
2747 },
2748 "c/lookat" => {
2749 id => "infobox",
2750 title => "Look",
2751 reply => undef,
2752 tooltip => "What you saw there",
2753 },
2754 "c/who" => {
2755 id => "infobox",
2756 title => "Players",
2757 reply => undef,
2758 tooltip => "Shows players who are currently online",
2759 },
2760 "c/body" => {
2761 id => "infobox",
2762 title => "Body Parts",
2763 reply => undef,
2764 tooltip => "Shows which body parts you posess and are available",
2765 },
2766 "c/uptime" => {
2767 id => "infobox",
2768 title => "Uptime",
2769 reply => undef,
2770 tooltip => "How long the server has been running since last restart",
2771 },
2772 "c/mapinfo" => {
2773 id => "infobox",
2774 title => "Map Info",
2775 reply => undef,
2776 tooltip => "Information related to the maps",
2777 },
2778);
2779
2404sub cf::client::send_msg { 2780sub cf::client::send_msg {
2405 my ($self, $color, $type, $msg, @extra) = @_; 2781 my ($self, $channel, $msg, $color, @extra) = @_;
2406 2782
2407 $msg = $self->pl->expand_cfpod ($msg); 2783 $msg = $self->pl->expand_cfpod ($msg);
2408 2784
2785 $color &= cf::NDI_CLIENT_MASK; # just in case...
2786
2787 # check predefined channels, for the benefit of C
2788 if ($CHANNEL{$channel}) {
2789 $channel = $CHANNEL{$channel};
2790
2791 $self->ext_msg (channel_info => $channel)
2792 if $self->can_msg;
2793
2794 $channel = $channel->{id};
2795
2796 } elsif (ref $channel) {
2797 # send meta info to client, if not yet sent
2798 unless (exists $self->{channel}{$channel->{id}}) {
2799 $self->{channel}{$channel->{id}} = $channel;
2800 $self->ext_msg (channel_info => $channel)
2801 if $self->can_msg;
2802 }
2803
2804 $channel = $channel->{id};
2805 }
2806
2807 return unless @extra || length $msg;
2808
2409 if ($self->can_msg) { 2809 if ($self->can_msg) {
2810 # default colour, mask it out
2811 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2812 if $color & cf::NDI_DEF;
2813
2410 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2814 $self->send_packet ("msg " . $self->{json_coder}->encode (
2815 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2411 } else { 2816 } else {
2412 # replace some tags by gcfclient-compatible ones
2413 for ($msg) {
2414 1 while
2415 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2416 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2417 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2418 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2419 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2420 }
2421
2422 if ($color >= 0) { 2817 if ($color >= 0) {
2818 # replace some tags by gcfclient-compatible ones
2819 for ($msg) {
2820 1 while
2821 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2822 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2823 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2824 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2825 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2826 }
2827
2828 $color &= cf::NDI_COLOR_MASK;
2829
2830 utf8::encode $msg;
2831
2423 if (0 && $msg =~ /\[/) { 2832 if (0 && $msg =~ /\[/) {
2833 # COMMAND/INFO
2424 $self->send_packet ("drawextinfo $color 4 0 $msg") 2834 $self->send_packet ("drawextinfo $color 10 8 $msg")
2425 } else { 2835 } else {
2426 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2836 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2427 $self->send_packet ("drawinfo $color $msg") 2837 $self->send_packet ("drawinfo $color $msg")
2428 } 2838 }
2429 } 2839 }
2430 } 2840 }
2431} 2841}
2432 2842
2433=item $client->ext_event ($type, %msg) 2843=item $client->ext_msg ($type, @msg)
2434 2844
2435Sends an ext event to the client. 2845Sends an ext event to the client.
2436 2846
2437=cut 2847=cut
2438 2848
2439sub cf::client::ext_event($$%) { 2849sub cf::client::ext_msg($$@) {
2440 my ($self, $type, %msg) = @_; 2850 my ($self, $type, @msg) = @_;
2441 2851
2852 if ($self->extcmd == 2) {
2853 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2854 } elsif ($self->extcmd == 1) { # TODO: remove
2442 $msg{msgtype} = "event_$type"; 2855 push @msg, msgtype => "event_$type";
2443 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2856 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2857 }
2858}
2859
2860=item $client->ext_reply ($msgid, @msg)
2861
2862Sends an ext reply to the client.
2863
2864=cut
2865
2866sub cf::client::ext_reply($$@) {
2867 my ($self, $id, @msg) = @_;
2868
2869 if ($self->extcmd == 2) {
2870 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2871 } elsif ($self->extcmd == 1) {
2872 #TODO: version 1, remove
2873 unshift @msg, msgtype => "reply", msgid => $id;
2874 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2875 }
2444} 2876}
2445 2877
2446=item $success = $client->query ($flags, "text", \&cb) 2878=item $success = $client->query ($flags, "text", \&cb)
2447 2879
2448Queues a query to the client, calling the given callback with 2880Queues a query to the client, calling the given callback with
2503 my ($ns, $buf) = @_; 2935 my ($ns, $buf) = @_;
2504 2936
2505 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2937 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2506 2938
2507 if (ref $msg) { 2939 if (ref $msg) {
2940 my ($type, $reply, @payload) =
2941 "ARRAY" eq ref $msg
2942 ? @$msg
2943 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2944
2945 my @reply;
2946
2508 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2947 if (my $cb = $EXTICMD{$type}) {
2509 if (my %reply = $cb->($ns, $msg)) { 2948 @reply = $cb->($ns, @payload);
2510 $reply{msgid} = $msg->{msgid};
2511 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2512 }
2513 } 2949 }
2950
2951 $ns->ext_reply ($reply, @reply)
2952 if $reply;
2953
2514 } else { 2954 } else {
2515 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2955 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2516 } 2956 }
2517 2957
2518 cf::override; 2958 cf::override;
2565our $safe = new Safe "safe"; 3005our $safe = new Safe "safe";
2566our $safe_hole = new Safe::Hole; 3006our $safe_hole = new Safe::Hole;
2567 3007
2568$SIG{FPE} = 'IGNORE'; 3008$SIG{FPE} = 'IGNORE';
2569 3009
2570$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3010$safe->permit_only (Opcode::opset qw(
3011 :base_core :base_mem :base_orig :base_math
3012 grepstart grepwhile mapstart mapwhile
3013 sort time
3014));
2571 3015
2572# here we export the classes and methods available to script code 3016# here we export the classes and methods available to script code
2573 3017
2574=pod 3018=pod
2575 3019
2576The following functions and methods are available within a safe environment: 3020The following functions and methods are available within a safe environment:
2577 3021
2578 cf::object contr pay_amount pay_player map 3022 cf::object
3023 contr pay_amount pay_player map x y force_find force_add destroy
3024 insert remove name archname title slaying race decrease_ob_nr
3025
2579 cf::object::player player 3026 cf::object::player
2580 cf::player peaceful 3027 player
2581 cf::map trigger 3028
3029 cf::player
3030 peaceful
3031
3032 cf::map
3033 trigger
2582 3034
2583=cut 3035=cut
2584 3036
2585for ( 3037for (
2586 ["cf::object" => qw(contr pay_amount pay_player map)], 3038 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3039 insert remove inv name archname title slaying race
3040 decrease_ob_nr destroy)],
2587 ["cf::object::player" => qw(player)], 3041 ["cf::object::player" => qw(player)],
2588 ["cf::player" => qw(peaceful)], 3042 ["cf::player" => qw(peaceful)],
2589 ["cf::map" => qw(trigger)], 3043 ["cf::map" => qw(trigger)],
2590) { 3044) {
2591 no strict 'refs'; 3045 no strict 'refs';
2667# the server's init and main functions 3121# the server's init and main functions
2668 3122
2669sub load_facedata($) { 3123sub load_facedata($) {
2670 my ($path) = @_; 3124 my ($path) = @_;
2671 3125
3126 # HACK to clear player env face cache, we need some signal framework
3127 # for this (global event?)
3128 %ext::player_env::MUSIC_FACE_CACHE = ();
3129
3130 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3131
2672 warn "loading facedata from $path\n"; 3132 warn "loading facedata from $path\n";
2673 3133
2674 my $facedata; 3134 my $facedata;
2675 0 < aio_load $path, $facedata 3135 0 < aio_load $path, $facedata
2676 or die "$path: $!"; 3136 or die "$path: $!";
2678 $facedata = Coro::Storable::thaw $facedata; 3138 $facedata = Coro::Storable::thaw $facedata;
2679 3139
2680 $facedata->{version} == 2 3140 $facedata->{version} == 2
2681 or cf::cleanup "$path: version mismatch, cannot proceed."; 3141 or cf::cleanup "$path: version mismatch, cannot proceed.";
2682 3142
3143 # patch in the exptable
3144 $facedata->{resource}{"res/exp_table"} = {
3145 type => FT_RSRC,
3146 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3147 };
3148 cf::cede_to_tick;
3149
2683 { 3150 {
2684 my $faces = $facedata->{faceinfo}; 3151 my $faces = $facedata->{faceinfo};
2685 3152
2686 while (my ($face, $info) = each %$faces) { 3153 while (my ($face, $info) = each %$faces) {
2687 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3154 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3155
2688 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3156 cf::face::set_visibility $idx, $info->{visibility};
3157 cf::face::set_magicmap $idx, $info->{magicmap};
2689 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3158 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2690 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3159 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2691 Coro::cede; 3160
3161 cf::cede_to_tick;
2692 } 3162 }
2693 3163
2694 while (my ($face, $info) = each %$faces) { 3164 while (my ($face, $info) = each %$faces) {
2695 next unless $info->{smooth}; 3165 next unless $info->{smooth};
3166
2696 my $idx = cf::face::find $face 3167 my $idx = cf::face::find $face
2697 or next; 3168 or next;
3169
2698 if (my $smooth = cf::face::find $info->{smooth}) { 3170 if (my $smooth = cf::face::find $info->{smooth}) {
3171 cf::face::set_smooth $idx, $smooth;
2699 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3172 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2700 } else { 3173 } else {
2701 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3174 warn "smooth face '$info->{smooth}' not found for face '$face'";
2702 } 3175 }
2703 Coro::cede; 3176
3177 cf::cede_to_tick;
2704 } 3178 }
2705 } 3179 }
2706 3180
2707 { 3181 {
2708 my $anims = $facedata->{animinfo}; 3182 my $anims = $facedata->{animinfo};
2709 3183
2710 while (my ($anim, $info) = each %$anims) { 3184 while (my ($anim, $info) = each %$anims) {
2711 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3185 cf::anim::set $anim, $info->{frames}, $info->{facings};
2712 Coro::cede; 3186 cf::cede_to_tick;
2713 } 3187 }
2714 3188
2715 cf::anim::invalidate_all; # d'oh 3189 cf::anim::invalidate_all; # d'oh
2716 } 3190 }
2717 3191
3192 {
3193 # TODO: for gcfclient pleasure, we should give resources
3194 # that gcfclient doesn't grok a >10000 face index.
3195 my $res = $facedata->{resource};
3196
3197 while (my ($name, $info) = each %$res) {
3198 if (defined $info->{type}) {
3199 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3200 my $data;
3201
3202 if ($info->{type} & 1) {
3203 # prepend meta info
3204
3205 my $meta = $enc->encode ({
3206 name => $name,
3207 %{ $info->{meta} || {} },
3208 });
3209
3210 $data = pack "(w/a*)*", $meta, $info->{data};
3211 } else {
3212 $data = $info->{data};
3213 }
3214
3215 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3216 cf::face::set_type $idx, $info->{type};
3217 } else {
3218 $RESOURCE{$name} = $info;
3219 }
3220
3221 cf::cede_to_tick;
3222 }
3223 }
3224
3225 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3226
2718 1 3227 1
2719} 3228}
2720 3229
3230cf::global->attach (on_resource_update => sub {
3231 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3232 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3233
3234 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3235 my $sound = $soundconf->{compat}[$_]
3236 or next;
3237
3238 my $face = cf::face::find "sound/$sound->[1]";
3239 cf::sound::set $sound->[0] => $face;
3240 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3241 }
3242
3243 while (my ($k, $v) = each %{$soundconf->{event}}) {
3244 my $face = cf::face::find "sound/$v";
3245 cf::sound::set $k => $face;
3246 }
3247 }
3248});
3249
3250register_exticmd fx_want => sub {
3251 my ($ns, $want) = @_;
3252
3253 while (my ($k, $v) = each %$want) {
3254 $ns->fx_want ($k, $v);
3255 }
3256};
3257
2721sub reload_regions { 3258sub reload_regions {
3259 # HACK to clear player env face cache, we need some signal framework
3260 # for this (global event?)
3261 %ext::player_env::MUSIC_FACE_CACHE = ();
3262
2722 load_resource_file "$MAPDIR/regions" 3263 load_resource_file "$MAPDIR/regions"
2723 or die "unable to load regions file\n"; 3264 or die "unable to load regions file\n";
3265
3266 for (cf::region::list) {
3267 $_->{match} = qr/$_->{match}/
3268 if exists $_->{match};
3269 }
2724} 3270}
2725 3271
2726sub reload_facedata { 3272sub reload_facedata {
2727 load_facedata "$DATADIR/facedata" 3273 load_facedata "$DATADIR/facedata"
2728 or die "unable to load facedata\n"; 3274 or die "unable to load facedata\n";
2757 3303
2758sub init { 3304sub init {
2759 reload_resources; 3305 reload_resources;
2760} 3306}
2761 3307
2762sub cfg_load { 3308sub reload_config {
2763 open my $fh, "<:utf8", "$CONFDIR/config" 3309 open my $fh, "<:utf8", "$CONFDIR/config"
2764 or return; 3310 or return;
2765 3311
2766 local $/; 3312 local $/;
2767 *CFG = YAML::Syck::Load <$fh>; 3313 *CFG = YAML::Syck::Load <$fh>;
2783sub main { 3329sub main {
2784 # we must not ever block the main coroutine 3330 # we must not ever block the main coroutine
2785 local $Coro::idle = sub { 3331 local $Coro::idle = sub {
2786 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3332 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2787 (async { 3333 (async {
2788 Event::one_event; 3334 $Coro::current->{desc} = "IDLE BUG HANDLER";
3335 EV::loop EV::LOOP_ONESHOT;
2789 })->prio (Coro::PRIO_MAX); 3336 })->prio (Coro::PRIO_MAX);
2790 }; 3337 };
2791 3338
2792 cfg_load; 3339 reload_config;
2793 db_init; 3340 db_init;
2794 load_extensions; 3341 load_extensions;
2795 3342
2796 $TICK_WATCHER->start; 3343 $TICK_WATCHER->start;
3344 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
2797 Event::loop; 3345 EV::loop;
2798} 3346}
2799 3347
2800############################################################################# 3348#############################################################################
2801# initialisation and cleanup 3349# initialisation and cleanup
2802 3350
2803# install some emergency cleanup handlers 3351# install some emergency cleanup handlers
2804BEGIN { 3352BEGIN {
3353 our %SIGWATCHER = ();
2805 for my $signal (qw(INT HUP TERM)) { 3354 for my $signal (qw(INT HUP TERM)) {
2806 Event->signal ( 3355 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2807 reentrant => 0,
2808 data => WF_AUTOCANCEL,
2809 signal => $signal,
2810 prio => 0,
2811 cb => sub {
2812 cf::cleanup "SIG$signal"; 3356 cf::cleanup "SIG$signal";
2813 },
2814 ); 3357 };
2815 } 3358 }
2816} 3359}
2817 3360
2818sub write_runtime { 3361sub write_runtime {
2819 my $runtime = "$LOCALDIR/runtime"; 3362 my $runtime = "$LOCALDIR/runtime";
2864 # and maps saved/destroyed asynchronously. 3407 # and maps saved/destroyed asynchronously.
2865 warn "begin emergency player save\n"; 3408 warn "begin emergency player save\n";
2866 for my $login (keys %cf::PLAYER) { 3409 for my $login (keys %cf::PLAYER) {
2867 my $pl = $cf::PLAYER{$login} or next; 3410 my $pl = $cf::PLAYER{$login} or next;
2868 $pl->valid or next; 3411 $pl->valid or next;
3412 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2869 $pl->save; 3413 $pl->save;
2870 } 3414 }
2871 warn "end emergency player save\n"; 3415 warn "end emergency player save\n";
2872 3416
2873 warn "begin emergency map save\n"; 3417 warn "begin emergency map save\n";
2912 warn "syncing database to disk"; 3456 warn "syncing database to disk";
2913 BDB::db_env_txn_checkpoint $DB_ENV; 3457 BDB::db_env_txn_checkpoint $DB_ENV;
2914 3458
2915 # if anything goes wrong in here, we should simply crash as we already saved 3459 # if anything goes wrong in here, we should simply crash as we already saved
2916 3460
2917 warn "cancelling all WF_AUTOCANCEL watchers";
2918 for (Event::all_watchers) {
2919 $_->cancel if $_->data & WF_AUTOCANCEL;
2920 }
2921
2922 warn "flushing outstanding aio requests"; 3461 warn "flushing outstanding aio requests";
2923 for (;;) { 3462 for (;;) {
2924 BDB::flush; 3463 BDB::flush;
2925 IO::AIO::flush; 3464 IO::AIO::flush;
2926 Coro::cede; 3465 Coro::cede_notself;
2927 last unless IO::AIO::nreqs || BDB::nreqs; 3466 last unless IO::AIO::nreqs || BDB::nreqs;
2928 warn "iterate..."; 3467 warn "iterate...";
2929 } 3468 }
2930 3469
2931 ++$RELOAD; 3470 ++$RELOAD;
2990 warn "reloading cf.pm"; 3529 warn "reloading cf.pm";
2991 require cf; 3530 require cf;
2992 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3531 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2993 3532
2994 warn "loading config and database again"; 3533 warn "loading config and database again";
2995 cf::cfg_load; 3534 cf::reload_config;
2996 3535
2997 warn "loading extensions"; 3536 warn "loading extensions";
2998 cf::load_extensions; 3537 cf::load_extensions;
2999 3538
3000 warn "reattaching attachments to objects/players"; 3539 warn "reattaching attachments to objects/players";
3020 3559
3021sub reload_perl() { 3560sub reload_perl() {
3022 # doing reload synchronously and two reloads happen back-to-back, 3561 # doing reload synchronously and two reloads happen back-to-back,
3023 # coro crashes during coro_state_free->destroy here. 3562 # coro crashes during coro_state_free->destroy here.
3024 3563
3025 $RELOAD_WATCHER ||= Event->timer ( 3564 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3026 reentrant => 0,
3027 after => 0,
3028 data => WF_AUTOCANCEL,
3029 cb => sub {
3030 do_reload_perl;
3031 undef $RELOAD_WATCHER; 3565 undef $RELOAD_WATCHER;
3032 }, 3566 do_reload_perl;
3033 ); 3567 };
3034} 3568}
3035 3569
3036register_command "reload" => sub { 3570register_command "reload" => sub {
3037 my ($who, $arg) = @_; 3571 my ($who, $arg) = @_;
3038 3572
3039 if ($who->flag (FLAG_WIZ)) { 3573 if ($who->flag (FLAG_WIZ)) {
3040 $who->message ("reloading server."); 3574 $who->message ("reloading server.");
3575 async {
3576 $Coro::current->{desc} = "perl_reload";
3041 async { reload_perl }; 3577 reload_perl;
3578 };
3042 } 3579 }
3043}; 3580};
3044 3581
3045unshift @INC, $LIBDIR; 3582unshift @INC, $LIBDIR;
3046 3583
3065 my $signal = new Coro::Signal; 3602 my $signal = new Coro::Signal;
3066 push @WAIT_FOR_TICK_BEGIN, $signal; 3603 push @WAIT_FOR_TICK_BEGIN, $signal;
3067 $signal->wait; 3604 $signal->wait;
3068} 3605}
3069 3606
3070 my $min = 1e6;#d# 3607$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3071 my $avg = 10;
3072$TICK_WATCHER = Event->timer (
3073 reentrant => 0,
3074 parked => 1,
3075 prio => 0,
3076 at => $NEXT_TICK || $TICK,
3077 data => WF_AUTOCANCEL,
3078 cb => sub {
3079 if ($Coro::current != $Coro::main) { 3608 if ($Coro::current != $Coro::main) {
3080 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3609 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3081 unless ++$bug_warning > 10; 3610 unless ++$bug_warning > 10;
3082 return; 3611 return;
3083 } 3612 }
3084 3613
3085 $NOW = $tick_start = Event::time; 3614 $NOW = $tick_start = EV::now;
3086 3615
3087 cf::server_tick; # one server iteration 3616 cf::server_tick; # one server iteration
3088 3617
3089 0 && sync_job {#d# 3618 $RUNTIME += $TICK;
3090 for(1..10) { 3619 $NEXT_TICK = $_[0]->at;
3091 my $t = Event::time;
3092 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3093 or die;
3094 3620
3095 $map->width (50); 3621 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3096 $map->height (50); 3622 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3097 $map->alloc; 3623 Coro::async_pool {
3098 $map->_load_objects ("/tmp/x.map", 1); 3624 $Coro::current->{desc} = "runtime saver";
3099 my $t = Event::time - $t; 3625 write_runtime
3100 3626 or warn "ERROR: unable to write runtime file: $!";
3101 #next unless $t < 0.0013;#d#
3102 if ($t < $min) {
3103 $min = $t;
3104 }
3105 $avg = $avg * 0.99 + $t * 0.01;
3106 }
3107 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3108 exit 0;
3109 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3110 }; 3627 };
3628 }
3111 3629
3112 $RUNTIME += $TICK;
3113 $NEXT_TICK += $TICK;
3114
3115 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3116 $NEXT_RUNTIME_WRITE = $NOW + 10;
3117 Coro::async_pool {
3118 write_runtime
3119 or warn "ERROR: unable to write runtime file: $!";
3120 };
3121 }
3122
3123# my $AFTER = Event::time;
3124# warn $AFTER - $NOW;#d#
3125
3126 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3630 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3127 $sig->send; 3631 $sig->send;
3128 } 3632 }
3129 while (my $sig = shift @WAIT_FOR_TICK) { 3633 while (my $sig = shift @WAIT_FOR_TICK) {
3130 $sig->send; 3634 $sig->send;
3131 } 3635 }
3132 3636
3133 $NOW = Event::time;
3134
3135 # if we are delayed by four ticks or more, skip them all
3136 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3137
3138 $TICK_WATCHER->at ($NEXT_TICK);
3139 $TICK_WATCHER->start;
3140
3141 $LOAD = ($NOW - $tick_start) / $TICK; 3637 $LOAD = ($NOW - $tick_start) / $TICK;
3142 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3638 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3143 3639
3144 _post_tick; 3640 _post_tick;
3145 3641};
3146 3642$TICK_WATCHER->priority (EV::MAXPRI);
3147 },
3148);
3149 3643
3150{ 3644{
3151 BDB::max_poll_time $TICK * 0.1; 3645 # configure BDB
3152 $BDB_POLL_WATCHER = Event->io ( 3646
3153 reentrant => 0,
3154 fd => BDB::poll_fileno,
3155 poll => 'r',
3156 prio => 0,
3157 data => WF_AUTOCANCEL,
3158 cb => \&BDB::poll_cb,
3159 );
3160 BDB::min_parallel 8; 3647 BDB::min_parallel 8;
3161 3648 BDB::max_poll_reqs $TICK * 0.1;
3162 BDB::set_sync_prepare { 3649 $Coro::BDB::WATCHER->priority (1);
3163 my $status;
3164 my $current = $Coro::current;
3165 (
3166 sub {
3167 $status = $!;
3168 $current->ready; undef $current;
3169 },
3170 sub {
3171 Coro::schedule while defined $current;
3172 $! = $status;
3173 },
3174 )
3175 };
3176 3650
3177 unless ($DB_ENV) { 3651 unless ($DB_ENV) {
3178 $DB_ENV = BDB::db_env_create; 3652 $DB_ENV = BDB::db_env_create;
3653 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3654 | BDB::LOG_AUTOREMOVE, 1);
3655 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3656 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3179 3657
3180 cf::sync_job { 3658 cf::sync_job {
3181 eval { 3659 eval {
3182 BDB::db_env_open 3660 BDB::db_env_open
3183 $DB_ENV, 3661 $DB_ENV,
3185 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3663 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3186 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3664 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3187 0666; 3665 0666;
3188 3666
3189 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3667 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3190
3191 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3192 $DB_ENV->set_lk_detect;
3193 }; 3668 };
3194 3669
3195 cf::cleanup "db_env_open(db): $@" if $@; 3670 cf::cleanup "db_env_open(db): $@" if $@;
3196 }; 3671 };
3197 } 3672 }
3673
3674 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3675 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3676 };
3677 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3678 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3679 };
3680 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3681 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3682 };
3198} 3683}
3199 3684
3200{ 3685{
3686 # configure IO::AIO
3687
3201 IO::AIO::min_parallel 8; 3688 IO::AIO::min_parallel 8;
3202
3203 undef $Coro::AIO::WATCHER;
3204 IO::AIO::max_poll_time $TICK * 0.1; 3689 IO::AIO::max_poll_time $TICK * 0.1;
3205 $AIO_POLL_WATCHER = Event->io ( 3690 $Coro::AIO::WATCHER->priority (1);
3206 reentrant => 0,
3207 data => WF_AUTOCANCEL,
3208 fd => IO::AIO::poll_fileno,
3209 poll => 'r',
3210 prio => 6,
3211 cb => \&IO::AIO::poll_cb,
3212 );
3213} 3691}
3214 3692
3215my $_log_backtrace; 3693my $_log_backtrace;
3216 3694
3217sub _log_backtrace { 3695sub _log_backtrace {
3221 3699
3222 # limit the # of concurrent backtraces 3700 # limit the # of concurrent backtraces
3223 if ($_log_backtrace < 2) { 3701 if ($_log_backtrace < 2) {
3224 ++$_log_backtrace; 3702 ++$_log_backtrace;
3225 async { 3703 async {
3704 $Coro::current->{desc} = "abt $msg";
3705
3226 my @bt = fork_call { 3706 my @bt = fork_call {
3227 @addr = map { sprintf "%x", $_ } @addr; 3707 @addr = map { sprintf "%x", $_ } @addr;
3228 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3708 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3229 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3709 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3230 or die "addr2line: $!"; 3710 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines