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.298 by root, Sun Jul 8 14:50:07 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 warn "pst<$res>" unless $res =~ /^pst/;
427 $res = Coro::Storable::thaw $res;
428
429 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
430
431 Carp::confess $$res unless "ARRAY" eq ref $res;
432
433 return wantarray ? @$res : $res->[-1];
434 } else {
435 reset_signals; 523 reset_signals;
436 local $SIG{__WARN__}; 524 &$cb
437 local $SIG{__DIE__}; 525 }, @args;
438 local $Coro::idle;
439 $Coro::current->prio (Coro::PRIO_MAX);
440 eval {
441 close $fh1;
442 526
443 my @res = eval { $cb->(@args) }; 527 wantarray ? @res : $res[-1]
444
445 open my $fh, ">", \my $buf
446 or die "fork_call: cannot open fh-to-buf in child : $!";
447 Storable::store_fd +($@ ? \"$@" : \@res), $fh;
448 close $fh;
449
450 warn "writing ", length $buf;
451 my $x;
452 (length $buf) == ($x = syswrite $fh2, $buf)
453 or warn "error writing ".(length $buf)." != $x\n";
454 close $fh2;
455 };
456
457 warn $@ if $@;
458 _exit 0;
459 }
460} 528}
461 529
462=item $value = cf::db_get $family => $key 530=item $value = cf::db_get $family => $key
463 531
464Returns a single value from the environment database. 532Returns a single value from the environment database.
466=item cf::db_put $family => $key => $value 534=item cf::db_put $family => $key => $value
467 535
468Stores 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
469data 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).
470 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
471=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}
472 562
473our $DB; 563our $DB;
474 564
475sub db_init { 565sub db_init {
476 unless ($DB) {
477 $DB = BDB::db_create $DB_ENV;
478
479 cf::sync_job { 566 cf::sync_job {
480 eval { 567 $DB ||= db_table "db";
481 $DB->set_flags (BDB::CHKSUM);
482
483 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
484 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
485 cf::cleanup "db_open(db): $!" if $!;
486 };
487 cf::cleanup "db_open(db): $@" if $@;
488 };
489 } 568 };
490} 569}
491 570
492sub db_get($$) { 571sub db_get($$) {
493 my $key = "$_[0]/$_[1]"; 572 my $key = "$_[0]/$_[1]";
494 573
544 if (1) { 623 if (1) {
545 $md5 = 624 $md5 =
546 join "\x00", 625 join "\x00",
547 $processversion, 626 $processversion,
548 map { 627 map {
549 Coro::cede; 628 cf::cede_to_tick;
550 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 629 ($src->[$_], Digest::MD5::md5_hex $data[$_])
551 } 0.. $#$src; 630 } 0.. $#$src;
552 631
553 632
554 my $dbmd5 = db_get cache => "$id/md5"; 633 my $dbmd5 = db_get cache => "$id/md5";
598attach callbacks/event handlers (a collection of which is called an "attachment") 677attach callbacks/event handlers (a collection of which is called an "attachment")
599to it. All such attachable objects support the following methods. 678to it. All such attachable objects support the following methods.
600 679
601In 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>
602C<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
603Crossfire TRT). 682Deliantra).
604 683
605=over 4 684=over 4
606 685
607=item $attachable->attach ($attachment, key => $value...) 686=item $attachable->attach ($attachment, key => $value...)
608 687
860 "; 939 ";
861 die if $@; 940 die if $@;
862} 941}
863 942
864our $override; 943our $override;
865our @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?
866 945
867sub override { 946sub override {
868 $override = 1; 947 $override = 1;
869 @invoke_results = (); 948 @INVOKE_RESULTS = (@_);
870} 949}
871 950
872sub do_invoke { 951sub do_invoke {
873 my $event = shift; 952 my $event = shift;
874 my $callbacks = shift; 953 my $callbacks = shift;
875 954
876 @invoke_results = (); 955 @INVOKE_RESULTS = ();
877 956
878 local $override; 957 local $override;
879 958
880 for (@$callbacks) { 959 for (@$callbacks) {
881 eval { &{$_->[1]} }; 960 eval { &{$_->[1]} };
890 } 969 }
891 970
892 0 971 0
893} 972}
894 973
895=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 974=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
896 975
897=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 976=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
898 977
899Generate an object-specific event with the given arguments. 978Generate an object-specific event with the given arguments.
900 979
901This 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
902removed 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
903results (if you must, access C<@cf::invoke_results> directly). 982results (if you must, access C<@cf::INVOKE_RESULTS> directly).
904 983
905=back 984=back
906 985
907=cut 986=cut
908 987
909############################################################################# 988#############################################################################
910# 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}
911 1032
912sub reattach { 1033sub reattach {
913 # basically do the same as instantiate, without calling instantiate 1034 # basically do the same as instantiate, without calling instantiate
914 my ($obj) = @_; 1035 my ($obj) = @_;
915 1036
936cf::attachable->attach ( 1057cf::attachable->attach (
937 prio => -1000000, 1058 prio => -1000000,
938 on_instantiate => sub { 1059 on_instantiate => sub {
939 my ($obj, $data) = @_; 1060 my ($obj, $data) = @_;
940 1061
941 $data = from_json $data; 1062 $data = decode_json $data;
942 1063
943 for (@$data) { 1064 for (@$data) {
944 my ($name, $args) = @$_; 1065 my ($name, $args) = @$_;
945 1066
946 $obj->attach ($name, %{$args || {} }); 1067 $obj->attach ($name, %{$args || {} });
962sub object_freezer_save { 1083sub object_freezer_save {
963 my ($filename, $rdata, $objs) = @_; 1084 my ($filename, $rdata, $objs) = @_;
964 1085
965 sync_job { 1086 sync_job {
966 if (length $$rdata) { 1087 if (length $$rdata) {
1088 utf8::decode (my $decname = $filename);
967 warn sprintf "saving %s (%d,%d)\n", 1089 warn sprintf "saving %s (%d,%d)\n",
968 $filename, length $$rdata, scalar @$objs; 1090 $decname, length $$rdata, scalar @$objs;
969 1091
970 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1092 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
971 chmod SAVE_MODE, $fh; 1093 chmod SAVE_MODE, $fh;
972 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1094 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
973 aio_fsync $fh if $cf::USE_FSYNC; 1095 aio_fsync $fh if $cf::USE_FSYNC;
974 close $fh; 1096 close $fh;
975 1097
976 if (@$objs) { 1098 if (@$objs) {
977 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) {
978 chmod SAVE_MODE, $fh; 1100 chmod SAVE_MODE, $fh;
979 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1101 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
980 aio_write $fh, 0, (length $data), $data, 0; 1102 aio_write $fh, 0, (length $data), $data, 0;
981 aio_fsync $fh if $cf::USE_FSYNC; 1103 aio_fsync $fh if $cf::USE_FSYNC;
982 close $fh; 1104 close $fh;
983 aio_rename "$filename.pst~", "$filename.pst"; 1105 aio_rename "$filename.pst~", "$filename.pst";
984 } 1106 }
992 } 1114 }
993 } else { 1115 } else {
994 aio_unlink $filename; 1116 aio_unlink $filename;
995 aio_unlink "$filename.pst"; 1117 aio_unlink "$filename.pst";
996 } 1118 }
997 } 1119 };
998} 1120}
999 1121
1000sub object_freezer_as_string { 1122sub object_freezer_as_string {
1001 my ($rdata, $objs) = @_; 1123 my ($rdata, $objs) = @_;
1002 1124
1014 or return; 1136 or return;
1015 1137
1016 unless (aio_stat "$filename.pst") { 1138 unless (aio_stat "$filename.pst") {
1017 (aio_load "$filename.pst", $av) >= 0 1139 (aio_load "$filename.pst", $av) >= 0
1018 or return; 1140 or return;
1141
1019 $av = eval { (Storable::thaw $av)->{objs} }; 1142 my $st = eval { Coro::Storable::thaw $av };
1143 $av = $st->{objs};
1020 } 1144 }
1021 1145
1146 utf8::decode (my $decname = $filename);
1022 warn sprintf "loading %s (%d)\n", 1147 warn sprintf "loading %s (%d,%d)\n",
1023 $filename, length $data, scalar @{$av || []}; 1148 $decname, length $data, scalar @{$av || []};
1149
1024 return ($data, $av); 1150 ($data, $av)
1025} 1151}
1026 1152
1027=head2 COMMAND CALLBACKS 1153=head2 COMMAND CALLBACKS
1028 1154
1029=over 4 1155=over 4
1102 my ($pl, $buf) = @_; 1228 my ($pl, $buf) = @_;
1103 1229
1104 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1230 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1105 1231
1106 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
1107 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1240 if (my $cb = $EXTCMD{$type}) {
1108 if (my %reply = $cb->($pl, $msg)) { 1241 @reply = $cb->($pl, @payload);
1109 $pl->ext_reply ($msg->{msgid}, %reply);
1110 }
1111 } 1242 }
1243
1244 $pl->ext_reply ($reply, @reply)
1245 if $reply;
1246
1112 } else { 1247 } else {
1113 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1248 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1114 } 1249 }
1115 1250
1116 cf::override; 1251 cf::override;
1206 1341
1207=head3 cf::player 1342=head3 cf::player
1208 1343
1209=over 4 1344=over 4
1210 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
1211=item cf::player::find $login 1360=item cf::player::find $login
1212 1361
1213Returns the given player object, loading it if necessary (might block). 1362Returns the given player object, loading it if necessary (might block).
1214 1363
1215=cut 1364=cut
1250 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1399 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1251 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1400 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1252 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1401 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1253 aio_unlink +(playerdir $login) . "/$login.pl"; 1402 aio_unlink +(playerdir $login) . "/$login.pl";
1254 1403
1255 my $pl = load_pl path $login 1404 my $f = new_from_file cf::object::thawer path $login
1256 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;
1257 $cf::PLAYER{$login} = $pl 1411 $cf::PLAYER{$login} = $pl
1258 } 1412 }
1259 } 1413 }
1260} 1414}
1261 1415
1271 1425
1272 aio_mkdir playerdir $pl, 0770; 1426 aio_mkdir playerdir $pl, 0770;
1273 $pl->{last_save} = $cf::RUNTIME; 1427 $pl->{last_save} = $cf::RUNTIME;
1274 1428
1275 $pl->save_pl ($path); 1429 $pl->save_pl ($path);
1276 Coro::cede; 1430 cf::cede_to_tick;
1277} 1431}
1278 1432
1279sub new($) { 1433sub new($) {
1280 my ($login) = @_; 1434 my ($login) = @_;
1281 1435
1285 $self->{deny_save} = 1; 1439 $self->{deny_save} = 1;
1286 1440
1287 $cf::PLAYER{$login} = $self; 1441 $cf::PLAYER{$login} = $self;
1288 1442
1289 $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 (@_);
1290} 1454}
1291 1455
1292=item $pl->quit_character 1456=item $pl->quit_character
1293 1457
1294Nukes the player without looking back. If logged in, the connection will 1458Nukes the player without looking back. If logged in, the connection will
1349 or return []; 1513 or return [];
1350 1514
1351 my @logins; 1515 my @logins;
1352 1516
1353 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") {
1354 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1522 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1355 aio_read $fh, 0, 512, my $buf, 0 or next; 1523 aio_read $fh, 0, 512, my $buf, 0 or next;
1356 $buf !~ /^password -------------$/m or next; # official not-valid tag 1524 $buf !~ /^password -------------$/m or next; # official not-valid tag
1525 }
1357 1526
1358 utf8::decode $login; 1527 utf8::decode $login;
1359 push @logins, $login; 1528 push @logins, $login;
1360 } 1529 }
1361 1530
1394 1563
1395Expand crossfire pod fragments into protocol xml. 1564Expand crossfire pod fragments into protocol xml.
1396 1565
1397=cut 1566=cut
1398 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
1399sub expand_cfpod { 1579sub expand_cfpod {
1400 ((my $self), (local $_)) = @_; 1580 my ($self, $pod) = @_;
1401 1581
1402 # escape & and < 1582 my $xml;
1403 s/&/&amp;/g;
1404 s/(?<![BIUGH])</&lt;/g;
1405 1583
1406 # this is buggy, it needs to properly take care of nested <'s 1584 while () {
1585 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1586 $group = $1;
1407 1587
1408 1 while 1588 $group =~ s/&/&amp;/g;
1409 # replace B<>, I<>, U<> etc. 1589 $group =~ s/</&lt;/g;
1410 s/B<([^\>]*)>/<b>$1<\/b>/ 1590
1411 || s/I<([^\>]*)>/<i>$1<\/i>/ 1591 $xml .= $group;
1412 || s/U<([^\>]*)>/<u>$1<\/u>/ 1592 } elsif ($pod =~ m%\G
1413 # replace G<male|female> tags 1593 ([BCGHITU])
1414 || s{G<([^>|]*)\|([^>]*)>}{ 1594 <
1415 $self->gender ? $2 : $1 1595 (?:
1416 }ge 1596 ([^<>]*) (?{ $group = $^N })
1417 # replace H<hint text> 1597 | < $interior >
1418 || s{H<([^\>]*)>} 1598 )
1599 >
1600 %gcsx
1419 { 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") {
1420 ("<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>",
1421 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1620 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1422 "") 1621 "")
1423 [$self->{hintmode}] 1622 [$self->{hintmode}];
1623 } else {
1624 $xml .= "error processing '$code($data)' directive";
1424 }ge; 1625 }
1626 } else {
1627 if ($pod =~ /\G(.+)/) {
1628 warn "parse error while expanding $pod (at $1)";
1629 }
1630 last;
1631 }
1632 }
1425 1633
1634 for ($xml) {
1426 # create single paragraphs (very hackish) 1635 # create single paragraphs (very hackish)
1427 s/(?<=\S)\n(?=\w)/ /g; 1636 s/(?<=\S)\n(?=\w)/ /g;
1428 1637
1429 # compress some whitespace 1638 # compress some whitespace
1430 s/\s+\n/\n/g; # ws line-ends 1639 s/\s+\n/\n/g; # ws line-ends
1431 s/\n\n+/\n/g; # double lines 1640 s/\n\n+/\n/g; # double lines
1432 s/^\n+//; # beginning lines 1641 s/^\n+//; # beginning lines
1433 s/\n+$//; # ending lines 1642 s/\n+$//; # ending lines
1643 }
1434 1644
1435 $_ 1645 $xml
1436} 1646}
1647
1648no re 'eval';
1437 1649
1438sub hintmode { 1650sub hintmode {
1439 $_[0]{hintmode} = $_[1] if @_ > 1; 1651 $_[0]{hintmode} = $_[1] if @_ > 1;
1440 $_[0]{hintmode} 1652 $_[0]{hintmode}
1441} 1653}
1442 1654
1443=item $player->ext_reply ($msgid, %msg) 1655=item $player->ext_reply ($msgid, @msg)
1444 1656
1445Sends an ext reply to the player. 1657Sends an ext reply to the player.
1446 1658
1447=cut 1659=cut
1448 1660
1449sub ext_reply($$%) { 1661sub ext_reply($$@) {
1450 my ($self, $id, %msg) = @_; 1662 my ($self, $id, @msg) = @_;
1451 1663
1452 $msg{msgid} = $id; 1664 $self->ns->ext_reply ($id, @msg)
1453 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1454} 1665}
1455 1666
1456=item $player->ext_event ($type, %msg) 1667=item $player->ext_msg ($type, @msg)
1457 1668
1458Sends an ext event to the client. 1669Sends an ext event to the client.
1459 1670
1460=cut 1671=cut
1461 1672
1462sub ext_event($$%) { 1673sub ext_msg($$@) {
1463 my ($self, $type, %msg) = @_; 1674 my ($self, $type, @msg) = @_;
1464 1675
1465 $self->ns->ext_event ($type, %msg); 1676 $self->ns->ext_msg ($type, @msg);
1466} 1677}
1467 1678
1468=head3 cf::region 1679=head3 cf::region
1469 1680
1470=over 4 1681=over 4
1483 my ($path) = @_; 1694 my ($path) = @_;
1484 1695
1485 my ($match, $specificity); 1696 my ($match, $specificity);
1486 1697
1487 for my $region (list) { 1698 for my $region (list) {
1488 if ($region->match && $path =~ $region->match) { 1699 if ($region->{match} && $path =~ $region->{match}) {
1489 ($match, $specificity) = ($region, $region->specificity) 1700 ($match, $specificity) = ($region, $region->specificity)
1490 if $region->specificity > $specificity; 1701 if $region->specificity > $specificity;
1491 } 1702 }
1492 } 1703 }
1493 1704
1613 $self->init; # pass $1 etc. 1824 $self->init; # pass $1 etc.
1614 return $self; 1825 return $self;
1615 } 1826 }
1616 } 1827 }
1617 1828
1618 Carp::carp "unable to resolve path '$path' (base '$base')."; 1829 Carp::cluck "unable to resolve path '$path' (base '$base').";
1619 () 1830 ()
1620} 1831}
1621 1832
1622sub init { 1833sub init {
1623 my ($self) = @_; 1834 my ($self) = @_;
1686 1897
1687sub load_header_from($) { 1898sub load_header_from($) {
1688 my ($self, $path) = @_; 1899 my ($self, $path) = @_;
1689 1900
1690 utf8::encode $path; 1901 utf8::encode $path;
1691 #aio_open $path, O_RDONLY, 0 1902 my $f = new_from_file cf::object::thawer $path
1692 # or return;
1693
1694 $self->_load_header ($path)
1695 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;
1696 1910
1697 $self->{load_path} = $path; 1911 $self->{load_path} = $path;
1698 1912
1699 1 1913 1
1700} 1914}
1754sub find { 1968sub find {
1755 my ($path, $origin) = @_; 1969 my ($path, $origin) = @_;
1756 1970
1757 $path = normalise $path, $origin && $origin->path; 1971 $path = normalise $path, $origin && $origin->path;
1758 1972
1973 cf::lock_wait "map_data:$path";#d#remove
1759 cf::lock_wait "map_find:$path"; 1974 cf::lock_wait "map_find:$path";
1760 1975
1761 $cf::MAP{$path} || do { 1976 $cf::MAP{$path} || do {
1762 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
1763 my $map = new_from_path cf::map $path 1980 my $map = new_from_path cf::map $path
1764 or return; 1981 or return;
1765 1982
1766 $map->{last_save} = $cf::RUNTIME; 1983 $map->{last_save} = $cf::RUNTIME;
1767 1984
1769 or return; 1986 or return;
1770 1987
1771 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1988 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1772 # doing this can freeze the server in a sync job, obviously 1989 # doing this can freeze the server in a sync job, obviously
1773 #$cf::WAIT_FOR_TICK->wait; 1990 #$cf::WAIT_FOR_TICK->wait;
1991 undef $guard1;
1992 undef $guard2;
1774 $map->reset; 1993 $map->reset;
1775 undef $guard;
1776 return find $path; 1994 return find $path;
1777 } 1995 }
1778 1996
1779 $cf::MAP{$path} = $map 1997 $cf::MAP{$path} = $map
1780 } 1998 }
1789 local $self->{deny_reset} = 1; # loading can take a long time 2007 local $self->{deny_reset} = 1; # loading can take a long time
1790 2008
1791 my $path = $self->{path}; 2009 my $path = $self->{path};
1792 2010
1793 { 2011 {
1794 my $guard = cf::lock_acquire "map_load:$path"; 2012 my $guard = cf::lock_acquire "map_data:$path";
1795 2013
2014 return unless $self->valid;
1796 return if $self->in_memory != cf::MAP_SWAPPED; 2015 return unless $self->in_memory == cf::MAP_SWAPPED;
1797 2016
1798 $self->in_memory (cf::MAP_LOADING); 2017 $self->in_memory (cf::MAP_LOADING);
1799 2018
1800 $self->alloc; 2019 $self->alloc;
1801 2020
1802 $self->pre_load; 2021 $self->pre_load;
1803 Coro::cede; 2022 cf::cede_to_tick;
1804 2023
2024 my $f = new_from_file cf::object::thawer $self->{load_path};
2025 $f->skip_block;
1805 $self->_load_objects ($self->{load_path}, 1) 2026 $self->_load_objects ($f)
1806 or return; 2027 or return;
1807 2028
1808 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2029 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1809 if delete $self->{load_original}; 2030 if delete $self->{load_original};
1810 2031
1811 if (my $uniq = $self->uniq_path) { 2032 if (my $uniq = $self->uniq_path) {
1812 utf8::encode $uniq; 2033 utf8::encode $uniq;
1813 if (aio_open $uniq, O_RDONLY, 0) { 2034 unless (aio_stat $uniq) {
2035 if (my $f = new_from_file cf::object::thawer $uniq) {
1814 $self->clear_unique_items; 2036 $self->clear_unique_items;
1815 $self->_load_objects ($uniq, 0); 2037 $self->_load_objects ($f);
2038 $f->resolve_delayed_derefs;
2039 }
1816 } 2040 }
1817 } 2041 }
1818 2042
1819 Coro::cede; 2043 $f->resolve_delayed_derefs;
2044
2045 cf::cede_to_tick;
1820 # now do the right thing for maps 2046 # now do the right thing for maps
1821 $self->link_multipart_objects; 2047 $self->link_multipart_objects;
1822 $self->difficulty ($self->estimate_difficulty) 2048 $self->difficulty ($self->estimate_difficulty)
1823 unless $self->difficulty; 2049 unless $self->difficulty;
1824 Coro::cede; 2050 cf::cede_to_tick;
1825 2051
1826 unless ($self->{deny_activate}) { 2052 unless ($self->{deny_activate}) {
1827 $self->decay_objects; 2053 $self->decay_objects;
1828 $self->fix_auto_apply; 2054 $self->fix_auto_apply;
1829 $self->update_buttons; 2055 $self->update_buttons;
1830 Coro::cede; 2056 cf::cede_to_tick;
1831 $self->set_darkness_map; 2057 $self->set_darkness_map;
1832 Coro::cede; 2058 cf::cede_to_tick;
1833 $self->activate; 2059 $self->activate;
1834 } 2060 }
2061
2062 $self->{last_save} = $cf::RUNTIME;
2063 $self->last_access ($cf::RUNTIME);
1835 2064
1836 $self->in_memory (cf::MAP_IN_MEMORY); 2065 $self->in_memory (cf::MAP_IN_MEMORY);
1837 } 2066 }
1838 2067
1839 $self->post_load; 2068 $self->post_load;
1850 2079
1851 $self 2080 $self
1852} 2081}
1853 2082
1854# 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
1855sub load_diag { 2084sub load_neighbours {
1856 my ($map) = @_; 2085 my ($map) = @_;
1857 2086
1858 my @diag; # diagonal neighbours 2087 my @neigh; # diagonal neighbours
1859 2088
1860 for (0 .. 3) { 2089 for (0 .. 3) {
1861 my $neigh = $map->tile_path ($_) 2090 my $neigh = $map->tile_path ($_)
1862 or next; 2091 or next;
1863 $neigh = find $neigh, $map 2092 $neigh = find $neigh, $map
1864 or next; 2093 or next;
1865 $neigh->load; 2094 $neigh->load;
1866 2095
2096 push @neigh,
1867 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2097 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1868 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2098 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1869 } 2099 }
1870 2100
1871 for (@diag) { 2101 for (grep defined $_->[0], @neigh) {
2102 my ($path, $origin) = @$_;
1872 my $neigh = find @$_ 2103 my $neigh = find $path, $origin
1873 or next; 2104 or next;
1874 $neigh->load; 2105 $neigh->load;
1875 } 2106 }
1876} 2107}
1877 2108
1882} 2113}
1883 2114
1884sub do_load_sync { 2115sub do_load_sync {
1885 my ($map) = @_; 2116 my ($map) = @_;
1886 2117
2118 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2119 if $Coro::current == $Coro::main;
2120
1887 cf::sync_job { $map->load }; 2121 cf::sync_job { $map->load };
1888} 2122}
1889 2123
1890our %MAP_PREFETCH; 2124our %MAP_PREFETCH;
1891our $MAP_PREFETCHER = undef; 2125our $MAP_PREFETCHER = undef;
1892 2126
1893sub find_async { 2127sub find_async {
1894 my ($path, $origin) = @_; 2128 my ($path, $origin, $load) = @_;
1895 2129
1896 $path = normalise $path, $origin && $origin->{path}; 2130 $path = normalise $path, $origin && $origin->{path};
1897 2131
1898 if (my $map = $cf::MAP{$path}) { 2132 if (my $map = $cf::MAP{$path}) {
1899 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2133 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1900 } 2134 }
1901 2135
1902 undef $MAP_PREFETCH{$path}; 2136 $MAP_PREFETCH{$path} |= $load;
2137
1903 $MAP_PREFETCHER ||= cf::async { 2138 $MAP_PREFETCHER ||= cf::async {
2139 $Coro::current->{desc} = "map prefetcher";
2140
1904 while (%MAP_PREFETCH) { 2141 while (%MAP_PREFETCH) {
1905 for my $path (keys %MAP_PREFETCH) { 2142 while (my ($k, $v) = each %MAP_PREFETCH) {
1906 my $map = find $path 2143 if (my $map = find $k) {
1907 or next;
1908 $map->load; 2144 $map->load if $v;
2145 }
1909 2146
1910 delete $MAP_PREFETCH{$path}; 2147 delete $MAP_PREFETCH{$k};
1911 } 2148 }
1912 } 2149 }
1913 undef $MAP_PREFETCHER; 2150 undef $MAP_PREFETCHER;
1914 }; 2151 };
1915 $MAP_PREFETCHER->prio (6); 2152 $MAP_PREFETCHER->prio (6);
1918} 2155}
1919 2156
1920sub save { 2157sub save {
1921 my ($self) = @_; 2158 my ($self) = @_;
1922 2159
1923 my $lock = cf::lock_acquire "map_data:" . $self->path; 2160 my $lock = cf::lock_acquire "map_data:$self->{path}";
1924 2161
1925 $self->{last_save} = $cf::RUNTIME; 2162 $self->{last_save} = $cf::RUNTIME;
1926 2163
1927 return unless $self->dirty; 2164 return unless $self->dirty;
1928 2165
1934 return if $self->{deny_save}; 2171 return if $self->{deny_save};
1935 2172
1936 local $self->{last_access} = $self->last_access;#d# 2173 local $self->{last_access} = $self->last_access;#d#
1937 2174
1938 cf::async { 2175 cf::async {
2176 $Coro::current->{desc} = "map player save";
1939 $_->contr->save for $self->players; 2177 $_->contr->save for $self->players;
1940 }; 2178 };
1941 2179
1942 if ($uniq) { 2180 if ($uniq) {
1943 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2181 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1951 my ($self) = @_; 2189 my ($self) = @_;
1952 2190
1953 # save first because save cedes 2191 # save first because save cedes
1954 $self->save; 2192 $self->save;
1955 2193
1956 my $lock = cf::lock_acquire "map_data:" . $self->path; 2194 my $lock = cf::lock_acquire "map_data:$self->{path}";
1957 2195
1958 return if $self->players; 2196 return if $self->players;
1959 return if $self->in_memory != cf::MAP_IN_MEMORY; 2197 return if $self->in_memory != cf::MAP_IN_MEMORY;
1960 return if $self->{deny_save}; 2198 return if $self->{deny_save};
1961 2199
2200 $self->in_memory (cf::MAP_SWAPPED);
2201
2202 $self->deactivate;
2203 $_->clear_links_to ($self) for values %cf::MAP;
1962 $self->clear; 2204 $self->clear;
1963 $self->in_memory (cf::MAP_SWAPPED);
1964} 2205}
1965 2206
1966sub reset_at { 2207sub reset_at {
1967 my ($self) = @_; 2208 my ($self) = @_;
1968 2209
2000 if $uniq; 2241 if $uniq;
2001 } 2242 }
2002 2243
2003 delete $cf::MAP{$self->path}; 2244 delete $cf::MAP{$self->path};
2004 2245
2246 $self->deactivate;
2247 $_->clear_links_to ($self) for values %cf::MAP;
2005 $self->clear; 2248 $self->clear;
2006
2007 $_->clear_links_to ($self) for values %cf::MAP;
2008 2249
2009 $self->unlink_save; 2250 $self->unlink_save;
2010 $self->destroy; 2251 $self->destroy;
2011} 2252}
2012 2253
2013my $nuke_counter = "aaaa"; 2254my $nuke_counter = "aaaa";
2014 2255
2015sub nuke { 2256sub nuke {
2016 my ($self) = @_; 2257 my ($self) = @_;
2017 2258
2259 {
2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2261
2018 delete $cf::MAP{$self->path}; 2262 delete $cf::MAP{$self->path};
2019 2263
2020 $self->unlink_save; 2264 $self->unlink_save;
2021 2265
2022 bless $self, "cf::map"; 2266 bless $self, "cf::map";
2023 delete $self->{deny_reset}; 2267 delete $self->{deny_reset};
2024 $self->{deny_save} = 1; 2268 $self->{deny_save} = 1;
2025 $self->reset_timeout (1); 2269 $self->reset_timeout (1);
2026 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2270 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2027 2271
2028 $cf::MAP{$self->path} = $self; 2272 $cf::MAP{$self->path} = $self;
2273 }
2029 2274
2030 $self->reset; # polite request, might not happen 2275 $self->reset; # polite request, might not happen
2031} 2276}
2032 2277
2033=item $maps = cf::map::tmp_maps 2278=item $maps = cf::map::tmp_maps
2109 2354
2110sub inv_recursive { 2355sub inv_recursive {
2111 inv_recursive_ inv $_[0] 2356 inv_recursive_ inv $_[0]
2112} 2357}
2113 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
2114package cf; 2387package cf;
2115 2388
2116=back 2389=back
2117 2390
2118=head3 cf::object::player 2391=head3 cf::object::player
2140 2413
2141 } else { 2414 } else {
2142 my $pl = $self->contr; 2415 my $pl = $self->contr;
2143 2416
2144 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2417 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2145 my $diag = $pl->{npc_dialog}; 2418 my $dialog = $pl->{npc_dialog};
2146 $diag->{pl}->ext_reply ( 2419 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2147 $diag->{id},
2148 msgtype => "reply",
2149 msg => $diag->{pl}->expand_cfpod ($msg),
2150 add_topics => []
2151 );
2152 2420
2153 } else { 2421 } else {
2154 $msg = $npc->name . " says: $msg" if $npc; 2422 $msg = $npc->name . " says: $msg" if $npc;
2155 $self->message ($msg, $flags); 2423 $self->message ($msg, $flags);
2156 } 2424 }
2157 } 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 (@_);
2158} 2436}
2159 2437
2160=item $player_object->may ("access") 2438=item $player_object->may ("access")
2161 2439
2162Returns wether the given player is authorized to access resource "access" 2440Returns wether the given player is authorized to access resource "access"
2241 # use -1 or undef as default coordinates, not 0, 0 2519 # use -1 or undef as default coordinates, not 0, 0
2242 ($x, $y) = ($map->enter_x, $map->enter_y) 2520 ($x, $y) = ($map->enter_x, $map->enter_y)
2243 if $x <=0 && $y <= 0; 2521 if $x <=0 && $y <= 0;
2244 2522
2245 $map->load; 2523 $map->load;
2246 $map->load_diag; 2524 $map->load_neighbours;
2247 2525
2248 return unless $self->contr->active; 2526 return unless $self->contr->active;
2249 $self->activate_recursive; 2527 $self->activate_recursive;
2250 2528
2251 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2529 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2252 $self->enter_map ($map, $x, $y); 2530 $self->enter_map ($map, $x, $y);
2253} 2531}
2254 2532
2255=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2533=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2256 2534
2257Moves 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
2258her, loading and preparing them map, calling the provided $check callback 2536her, loading and preparing them map, calling the provided $check callback
2259that 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
2260the 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.
2261 2540
2262=cut 2541=cut
2263 2542
2264our $GOTOGEN; 2543our $GOTOGEN;
2265 2544
2266sub cf::object::player::goto { 2545sub cf::object::player::goto {
2267 my ($self, $path, $x, $y, $check) = @_; 2546 my ($self, $path, $x, $y, $check, $done) = @_;
2268 2547
2269 # 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
2270 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2549 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2271 2550
2272 $self->enter_link; 2551 $self->enter_link;
2273 2552
2274 (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
2275 my $map = eval { 2575 my $map = eval {
2276 my $map = cf::map::find $path; 2576 my $map = defined $path ? cf::map::find $path : undef;
2277 2577
2278 if ($map) { 2578 if ($map) {
2279 $map = $map->customise_for ($self); 2579 $map = $map->customise_for ($self);
2280 $map = $check->($map) if $check && $map; 2580 $map = $check->($map) if $check && $map;
2281 } else { 2581 } else {
2282 $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);
2283 } 2583 }
2284 2584
2285 $map 2585 $map
2286 }; 2586 };
2287 2587
2292 2592
2293 if ($gen == $self->{_goto_generation}) { 2593 if ($gen == $self->{_goto_generation}) {
2294 delete $self->{_goto_generation}; 2594 delete $self->{_goto_generation};
2295 $self->leave_link ($map, $x, $y); 2595 $self->leave_link ($map, $x, $y);
2296 } 2596 }
2597
2598 $done->() if $done;
2297 })->prio (1); 2599 })->prio (1);
2298} 2600}
2299 2601
2300=item $player_object->enter_exit ($exit_object) 2602=item $player_object->enter_exit ($exit_object)
2301 2603
2338 $rmp->{origin_y} = $exit->y; 2640 $rmp->{origin_y} = $exit->y;
2339 } 2641 }
2340 2642
2341 $rmp->{random_seed} ||= $exit->random_seed; 2643 $rmp->{random_seed} ||= $exit->random_seed;
2342 2644
2343 my $data = cf::to_json $rmp; 2645 my $data = cf::encode_json $rmp;
2344 my $md5 = Digest::MD5::md5_hex $data; 2646 my $md5 = Digest::MD5::md5_hex $data;
2345 my $meta = "$RANDOMDIR/$md5.meta"; 2647 my $meta = "$RANDOMDIR/$md5.meta";
2346 2648
2347 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2649 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2348 aio_write $fh, 0, (length $data), $data, 0; 2650 aio_write $fh, 0, (length $data), $data, 0;
2375 # if exit is damned, update players death & WoR home-position 2677 # if exit is damned, update players death & WoR home-position
2376 $self->contr->savebed ($slaying, $hp, $sp) 2678 $self->contr->savebed ($slaying, $hp, $sp)
2377 if $exit->flag (FLAG_DAMNED); 2679 if $exit->flag (FLAG_DAMNED);
2378 2680
2379 (async { 2681 (async {
2682 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2683
2380 $self->deactivate_recursive; # just to be sure 2684 $self->deactivate_recursive; # just to be sure
2381 unless (eval { 2685 unless (eval {
2382 $self->goto ($slaying, $hp, $sp); 2686 $self->goto ($slaying, $hp, $sp);
2383 2687
2384 1; 2688 1;
2410 2714
2411 utf8::encode $text; 2715 utf8::encode $text;
2412 $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);
2413} 2717}
2414 2718
2415=item $client->send_msg ($color, $type, $msg, [extra...]) 2719=item $client->send_msg ($channel, $msg, $color, [extra...])
2416 2720
2417Send 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
2418client 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
2419the 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
2420the message unless the client supports the msg packet. 2724the message unless the client supports the msg packet.
2421 2725
2422=cut 2726=cut
2423 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
2424sub cf::client::send_msg { 2780sub cf::client::send_msg {
2425 my ($self, $color, $type, $msg, @extra) = @_; 2781 my ($self, $channel, $msg, $color, @extra) = @_;
2426 2782
2427 $msg = $self->pl->expand_cfpod ($msg); 2783 $msg = $self->pl->expand_cfpod ($msg);
2428 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
2429 return unless @extra || length $msg; 2807 return unless @extra || length $msg;
2430 2808
2431 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
2432 $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]));
2433 } else { 2816 } else {
2434 # replace some tags by gcfclient-compatible ones
2435 for ($msg) {
2436 1 while
2437 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2438 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2439 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2440 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2441 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2442 }
2443
2444 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
2445 if (0 && $msg =~ /\[/) { 2832 if (0 && $msg =~ /\[/) {
2833 # COMMAND/INFO
2446 $self->send_packet ("drawextinfo $color 4 0 $msg") 2834 $self->send_packet ("drawextinfo $color 10 8 $msg")
2447 } else { 2835 } else {
2448 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2836 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2449 $self->send_packet ("drawinfo $color $msg") 2837 $self->send_packet ("drawinfo $color $msg")
2450 } 2838 }
2451 } 2839 }
2452 } 2840 }
2453} 2841}
2454 2842
2455=item $client->ext_event ($type, %msg) 2843=item $client->ext_msg ($type, @msg)
2456 2844
2457Sends an ext event to the client. 2845Sends an ext event to the client.
2458 2846
2459=cut 2847=cut
2460 2848
2461sub cf::client::ext_event($$%) { 2849sub cf::client::ext_msg($$@) {
2462 my ($self, $type, %msg) = @_; 2850 my ($self, $type, @msg) = @_;
2463 2851
2852 if ($self->extcmd == 2) {
2853 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2854 } elsif ($self->extcmd == 1) { # TODO: remove
2464 $msg{msgtype} = "event_$type"; 2855 push @msg, msgtype => "event_$type";
2465 $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 }
2466} 2876}
2467 2877
2468=item $success = $client->query ($flags, "text", \&cb) 2878=item $success = $client->query ($flags, "text", \&cb)
2469 2879
2470Queues a query to the client, calling the given callback with 2880Queues a query to the client, calling the given callback with
2525 my ($ns, $buf) = @_; 2935 my ($ns, $buf) = @_;
2526 2936
2527 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2937 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2528 2938
2529 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
2530 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2947 if (my $cb = $EXTICMD{$type}) {
2531 if (my %reply = $cb->($ns, $msg)) { 2948 @reply = $cb->($ns, @payload);
2532 $reply{msgid} = $msg->{msgid};
2533 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2534 }
2535 } 2949 }
2950
2951 $ns->ext_reply ($reply, @reply)
2952 if $reply;
2953
2536 } else { 2954 } else {
2537 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";
2538 } 2956 }
2539 2957
2540 cf::override; 2958 cf::override;
2587our $safe = new Safe "safe"; 3005our $safe = new Safe "safe";
2588our $safe_hole = new Safe::Hole; 3006our $safe_hole = new Safe::Hole;
2589 3007
2590$SIG{FPE} = 'IGNORE'; 3008$SIG{FPE} = 'IGNORE';
2591 3009
2592$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));
2593 3015
2594# here we export the classes and methods available to script code 3016# here we export the classes and methods available to script code
2595 3017
2596=pod 3018=pod
2597 3019
2598The following functions and methods are available within a safe environment: 3020The following functions and methods are available within a safe environment:
2599 3021
2600 cf::object 3022 cf::object
2601 contr pay_amount pay_player map x y force_find force_add 3023 contr pay_amount pay_player map x y force_find force_add destroy
2602 insert remove 3024 insert remove name archname title slaying race decrease_ob_nr
2603 3025
2604 cf::object::player 3026 cf::object::player
2605 player 3027 player
2606 3028
2607 cf::player 3029 cf::player
2612 3034
2613=cut 3035=cut
2614 3036
2615for ( 3037for (
2616 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 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
2617 insert remove)], 3040 decrease_ob_nr destroy)],
2618 ["cf::object::player" => qw(player)], 3041 ["cf::object::player" => qw(player)],
2619 ["cf::player" => qw(peaceful)], 3042 ["cf::player" => qw(peaceful)],
2620 ["cf::map" => qw(trigger)], 3043 ["cf::map" => qw(trigger)],
2621) { 3044) {
2622 no strict 'refs'; 3045 no strict 'refs';
2698# the server's init and main functions 3121# the server's init and main functions
2699 3122
2700sub load_facedata($) { 3123sub load_facedata($) {
2701 my ($path) = @_; 3124 my ($path) = @_;
2702 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
2703 warn "loading facedata from $path\n"; 3132 warn "loading facedata from $path\n";
2704 3133
2705 my $facedata; 3134 my $facedata;
2706 0 < aio_load $path, $facedata 3135 0 < aio_load $path, $facedata
2707 or die "$path: $!"; 3136 or die "$path: $!";
2709 $facedata = Coro::Storable::thaw $facedata; 3138 $facedata = Coro::Storable::thaw $facedata;
2710 3139
2711 $facedata->{version} == 2 3140 $facedata->{version} == 2
2712 or cf::cleanup "$path: version mismatch, cannot proceed."; 3141 or cf::cleanup "$path: version mismatch, cannot proceed.";
2713 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
2714 { 3150 {
2715 my $faces = $facedata->{faceinfo}; 3151 my $faces = $facedata->{faceinfo};
2716 3152
2717 while (my ($face, $info) = each %$faces) { 3153 while (my ($face, $info) = each %$faces) {
2718 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3154 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3155
2719 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3156 cf::face::set_visibility $idx, $info->{visibility};
3157 cf::face::set_magicmap $idx, $info->{magicmap};
2720 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3158 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2721 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3159 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2722 Coro::cede; 3160
3161 cf::cede_to_tick;
2723 } 3162 }
2724 3163
2725 while (my ($face, $info) = each %$faces) { 3164 while (my ($face, $info) = each %$faces) {
2726 next unless $info->{smooth}; 3165 next unless $info->{smooth};
3166
2727 my $idx = cf::face::find $face 3167 my $idx = cf::face::find $face
2728 or next; 3168 or next;
3169
2729 if (my $smooth = cf::face::find $info->{smooth}) { 3170 if (my $smooth = cf::face::find $info->{smooth}) {
3171 cf::face::set_smooth $idx, $smooth;
2730 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3172 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2731 } else { 3173 } else {
2732 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3174 warn "smooth face '$info->{smooth}' not found for face '$face'";
2733 } 3175 }
2734 Coro::cede; 3176
3177 cf::cede_to_tick;
2735 } 3178 }
2736 } 3179 }
2737 3180
2738 { 3181 {
2739 my $anims = $facedata->{animinfo}; 3182 my $anims = $facedata->{animinfo};
2740 3183
2741 while (my ($anim, $info) = each %$anims) { 3184 while (my ($anim, $info) = each %$anims) {
2742 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3185 cf::anim::set $anim, $info->{frames}, $info->{facings};
2743 Coro::cede; 3186 cf::cede_to_tick;
2744 } 3187 }
2745 3188
2746 cf::anim::invalidate_all; # d'oh 3189 cf::anim::invalidate_all; # d'oh
2747 } 3190 }
2748 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
2749 1 3227 1
2750} 3228}
2751 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
2752sub 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
2753 load_resource_file "$MAPDIR/regions" 3263 load_resource_file "$MAPDIR/regions"
2754 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 }
2755} 3270}
2756 3271
2757sub reload_facedata { 3272sub reload_facedata {
2758 load_facedata "$DATADIR/facedata" 3273 load_facedata "$DATADIR/facedata"
2759 or die "unable to load facedata\n"; 3274 or die "unable to load facedata\n";
2788 3303
2789sub init { 3304sub init {
2790 reload_resources; 3305 reload_resources;
2791} 3306}
2792 3307
2793sub cfg_load { 3308sub reload_config {
2794 open my $fh, "<:utf8", "$CONFDIR/config" 3309 open my $fh, "<:utf8", "$CONFDIR/config"
2795 or return; 3310 or return;
2796 3311
2797 local $/; 3312 local $/;
2798 *CFG = YAML::Syck::Load <$fh>; 3313 *CFG = YAML::Syck::Load <$fh>;
2814sub main { 3329sub main {
2815 # we must not ever block the main coroutine 3330 # we must not ever block the main coroutine
2816 local $Coro::idle = sub { 3331 local $Coro::idle = sub {
2817 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#
2818 (async { 3333 (async {
2819 Event::one_event; 3334 $Coro::current->{desc} = "IDLE BUG HANDLER";
3335 EV::loop EV::LOOP_ONESHOT;
2820 })->prio (Coro::PRIO_MAX); 3336 })->prio (Coro::PRIO_MAX);
2821 }; 3337 };
2822 3338
2823 cfg_load; 3339 reload_config;
2824 db_init; 3340 db_init;
2825 load_extensions; 3341 load_extensions;
2826 3342
2827 $TICK_WATCHER->start; 3343 $TICK_WATCHER->start;
3344 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
2828 Event::loop; 3345 EV::loop;
2829} 3346}
2830 3347
2831############################################################################# 3348#############################################################################
2832# initialisation and cleanup 3349# initialisation and cleanup
2833 3350
2834# install some emergency cleanup handlers 3351# install some emergency cleanup handlers
2835BEGIN { 3352BEGIN {
3353 our %SIGWATCHER = ();
2836 for my $signal (qw(INT HUP TERM)) { 3354 for my $signal (qw(INT HUP TERM)) {
2837 Event->signal ( 3355 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2838 reentrant => 0,
2839 data => WF_AUTOCANCEL,
2840 signal => $signal,
2841 prio => 0,
2842 cb => sub {
2843 cf::cleanup "SIG$signal"; 3356 cf::cleanup "SIG$signal";
2844 },
2845 ); 3357 };
2846 } 3358 }
2847} 3359}
2848 3360
2849sub write_runtime { 3361sub write_runtime {
2850 my $runtime = "$LOCALDIR/runtime"; 3362 my $runtime = "$LOCALDIR/runtime";
2895 # and maps saved/destroyed asynchronously. 3407 # and maps saved/destroyed asynchronously.
2896 warn "begin emergency player save\n"; 3408 warn "begin emergency player save\n";
2897 for my $login (keys %cf::PLAYER) { 3409 for my $login (keys %cf::PLAYER) {
2898 my $pl = $cf::PLAYER{$login} or next; 3410 my $pl = $cf::PLAYER{$login} or next;
2899 $pl->valid or next; 3411 $pl->valid or next;
3412 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2900 $pl->save; 3413 $pl->save;
2901 } 3414 }
2902 warn "end emergency player save\n"; 3415 warn "end emergency player save\n";
2903 3416
2904 warn "begin emergency map save\n"; 3417 warn "begin emergency map save\n";
2943 warn "syncing database to disk"; 3456 warn "syncing database to disk";
2944 BDB::db_env_txn_checkpoint $DB_ENV; 3457 BDB::db_env_txn_checkpoint $DB_ENV;
2945 3458
2946 # 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
2947 3460
2948 warn "cancelling all WF_AUTOCANCEL watchers";
2949 for (Event::all_watchers) {
2950 $_->cancel if $_->data & WF_AUTOCANCEL;
2951 }
2952
2953 warn "flushing outstanding aio requests"; 3461 warn "flushing outstanding aio requests";
2954 for (;;) { 3462 for (;;) {
2955 BDB::flush; 3463 BDB::flush;
2956 IO::AIO::flush; 3464 IO::AIO::flush;
2957 Coro::cede; 3465 Coro::cede_notself;
2958 last unless IO::AIO::nreqs || BDB::nreqs; 3466 last unless IO::AIO::nreqs || BDB::nreqs;
2959 warn "iterate..."; 3467 warn "iterate...";
2960 } 3468 }
2961 3469
2962 ++$RELOAD; 3470 ++$RELOAD;
3021 warn "reloading cf.pm"; 3529 warn "reloading cf.pm";
3022 require cf; 3530 require cf;
3023 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3531 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3024 3532
3025 warn "loading config and database again"; 3533 warn "loading config and database again";
3026 cf::cfg_load; 3534 cf::reload_config;
3027 3535
3028 warn "loading extensions"; 3536 warn "loading extensions";
3029 cf::load_extensions; 3537 cf::load_extensions;
3030 3538
3031 warn "reattaching attachments to objects/players"; 3539 warn "reattaching attachments to objects/players";
3051 3559
3052sub reload_perl() { 3560sub reload_perl() {
3053 # doing reload synchronously and two reloads happen back-to-back, 3561 # doing reload synchronously and two reloads happen back-to-back,
3054 # coro crashes during coro_state_free->destroy here. 3562 # coro crashes during coro_state_free->destroy here.
3055 3563
3056 $RELOAD_WATCHER ||= Event->timer ( 3564 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3057 reentrant => 0,
3058 after => 0,
3059 data => WF_AUTOCANCEL,
3060 cb => sub {
3061 do_reload_perl;
3062 undef $RELOAD_WATCHER; 3565 undef $RELOAD_WATCHER;
3063 }, 3566 do_reload_perl;
3064 ); 3567 };
3065} 3568}
3066 3569
3067register_command "reload" => sub { 3570register_command "reload" => sub {
3068 my ($who, $arg) = @_; 3571 my ($who, $arg) = @_;
3069 3572
3070 if ($who->flag (FLAG_WIZ)) { 3573 if ($who->flag (FLAG_WIZ)) {
3071 $who->message ("reloading server."); 3574 $who->message ("reloading server.");
3575 async {
3576 $Coro::current->{desc} = "perl_reload";
3072 async { reload_perl }; 3577 reload_perl;
3578 };
3073 } 3579 }
3074}; 3580};
3075 3581
3076unshift @INC, $LIBDIR; 3582unshift @INC, $LIBDIR;
3077 3583
3096 my $signal = new Coro::Signal; 3602 my $signal = new Coro::Signal;
3097 push @WAIT_FOR_TICK_BEGIN, $signal; 3603 push @WAIT_FOR_TICK_BEGIN, $signal;
3098 $signal->wait; 3604 $signal->wait;
3099} 3605}
3100 3606
3101 my $min = 1e6;#d# 3607$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3102 my $avg = 10;
3103$TICK_WATCHER = Event->timer (
3104 reentrant => 0,
3105 parked => 1,
3106 prio => 0,
3107 at => $NEXT_TICK || $TICK,
3108 data => WF_AUTOCANCEL,
3109 cb => sub {
3110 if ($Coro::current != $Coro::main) { 3608 if ($Coro::current != $Coro::main) {
3111 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"
3112 unless ++$bug_warning > 10; 3610 unless ++$bug_warning > 10;
3113 return; 3611 return;
3114 } 3612 }
3115 3613
3116 $NOW = $tick_start = Event::time; 3614 $NOW = $tick_start = EV::now;
3117 3615
3118 cf::server_tick; # one server iteration 3616 cf::server_tick; # one server iteration
3119 3617
3120 0 && sync_job {#d# 3618 $RUNTIME += $TICK;
3121 for(1..10) { 3619 $NEXT_TICK = $_[0]->at;
3122 my $t = Event::time;
3123 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3124 or die;
3125 3620
3126 $map->width (50); 3621 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3127 $map->height (50); 3622 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3128 $map->alloc; 3623 Coro::async_pool {
3129 $map->_load_objects ("/tmp/x.map", 1); 3624 $Coro::current->{desc} = "runtime saver";
3130 my $t = Event::time - $t; 3625 write_runtime
3131 3626 or warn "ERROR: unable to write runtime file: $!";
3132 #next unless $t < 0.0013;#d#
3133 if ($t < $min) {
3134 $min = $t;
3135 }
3136 $avg = $avg * 0.99 + $t * 0.01;
3137 }
3138 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3139 exit 0;
3140 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3141 }; 3627 };
3628 }
3142 3629
3143 $RUNTIME += $TICK;
3144 $NEXT_TICK += $TICK;
3145
3146 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3147 $NEXT_RUNTIME_WRITE = $NOW + 10;
3148 Coro::async_pool {
3149 write_runtime
3150 or warn "ERROR: unable to write runtime file: $!";
3151 };
3152 }
3153
3154# my $AFTER = Event::time;
3155# warn $AFTER - $NOW;#d#
3156
3157 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3630 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3158 $sig->send; 3631 $sig->send;
3159 } 3632 }
3160 while (my $sig = shift @WAIT_FOR_TICK) { 3633 while (my $sig = shift @WAIT_FOR_TICK) {
3161 $sig->send; 3634 $sig->send;
3162 } 3635 }
3163 3636
3164 $NOW = Event::time;
3165
3166 # if we are delayed by four ticks or more, skip them all
3167 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3168
3169 $TICK_WATCHER->at ($NEXT_TICK);
3170 $TICK_WATCHER->start;
3171
3172 $LOAD = ($NOW - $tick_start) / $TICK; 3637 $LOAD = ($NOW - $tick_start) / $TICK;
3173 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3638 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3174 3639
3175 _post_tick; 3640 _post_tick;
3176 3641};
3177 3642$TICK_WATCHER->priority (EV::MAXPRI);
3178 },
3179);
3180 3643
3181{ 3644{
3182 BDB::max_poll_time $TICK * 0.1; 3645 # configure BDB
3183 $BDB_POLL_WATCHER = Event->io ( 3646
3184 reentrant => 0,
3185 fd => BDB::poll_fileno,
3186 poll => 'r',
3187 prio => 0,
3188 data => WF_AUTOCANCEL,
3189 cb => \&BDB::poll_cb,
3190 );
3191 BDB::min_parallel 8; 3647 BDB::min_parallel 8;
3192 3648 BDB::max_poll_reqs $TICK * 0.1;
3193 BDB::set_sync_prepare { 3649 $Coro::BDB::WATCHER->priority (1);
3194 my $status;
3195 my $current = $Coro::current;
3196 (
3197 sub {
3198 $status = $!;
3199 $current->ready; undef $current;
3200 },
3201 sub {
3202 Coro::schedule while defined $current;
3203 $! = $status;
3204 },
3205 )
3206 };
3207 3650
3208 unless ($DB_ENV) { 3651 unless ($DB_ENV) {
3209 $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);
3210 3657
3211 cf::sync_job { 3658 cf::sync_job {
3212 eval { 3659 eval {
3213 BDB::db_env_open 3660 BDB::db_env_open
3214 $DB_ENV, 3661 $DB_ENV,
3216 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
3217 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3664 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3218 0666; 3665 0666;
3219 3666
3220 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3667 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3221
3222 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3223 $DB_ENV->set_lk_detect;
3224 }; 3668 };
3225 3669
3226 cf::cleanup "db_env_open(db): $@" if $@; 3670 cf::cleanup "db_env_open(db): $@" if $@;
3227 }; 3671 };
3228 } 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 };
3229} 3683}
3230 3684
3231{ 3685{
3686 # configure IO::AIO
3687
3232 IO::AIO::min_parallel 8; 3688 IO::AIO::min_parallel 8;
3233
3234 undef $Coro::AIO::WATCHER;
3235 IO::AIO::max_poll_time $TICK * 0.1; 3689 IO::AIO::max_poll_time $TICK * 0.1;
3236 $AIO_POLL_WATCHER = Event->io ( 3690 $Coro::AIO::WATCHER->priority (1);
3237 reentrant => 0,
3238 data => WF_AUTOCANCEL,
3239 fd => IO::AIO::poll_fileno,
3240 poll => 'r',
3241 prio => 6,
3242 cb => \&IO::AIO::poll_cb,
3243 );
3244} 3691}
3245 3692
3246my $_log_backtrace; 3693my $_log_backtrace;
3247 3694
3248sub _log_backtrace { 3695sub _log_backtrace {
3252 3699
3253 # limit the # of concurrent backtraces 3700 # limit the # of concurrent backtraces
3254 if ($_log_backtrace < 2) { 3701 if ($_log_backtrace < 2) {
3255 ++$_log_backtrace; 3702 ++$_log_backtrace;
3256 async { 3703 async {
3704 $Coro::current->{desc} = "abt $msg";
3705
3257 my @bt = fork_call { 3706 my @bt = fork_call {
3258 @addr = map { sprintf "%x", $_ } @addr; 3707 @addr = map { sprintf "%x", $_ } @addr;
3259 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3708 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3260 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 |"
3261 or die "addr2line: $!"; 3710 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines