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.287 by root, Mon Jun 25 05:43:45 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
27use JSON::XS 2.01 ();
25use BDB (); 28use BDB ();
26use Data::Dumper; 29use Data::Dumper;
27use Digest::MD5; 30use Digest::MD5;
28use Fcntl; 31use Fcntl;
29use YAML::Syck (); 32use YAML::Syck ();
30use IO::AIO 2.32 (); 33use IO::AIO 2.51 ();
31use Time::HiRes; 34use Time::HiRes;
32use Compress::LZF; 35use Compress::LZF;
36use Digest::MD5 ();
33 37
34# configure various modules to our taste 38# configure various modules to our taste
35# 39#
36$Storable::canonical = 1; # reduce rsync transfers 40$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39
40$Event::Eval = 1; # no idea why this is required, but it is
41 43
42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
43$YAML::Syck::ImplicitUnicode = 1; 45$YAML::Syck::ImplicitUnicode = 1;
44 46
45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
67our $TMPDIR = "$LOCALDIR/" . tmpdir; 69our $TMPDIR = "$LOCALDIR/" . tmpdir;
68our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
69our $PLAYERDIR = "$LOCALDIR/" . playerdir; 71our $PLAYERDIR = "$LOCALDIR/" . playerdir;
70our $RANDOMDIR = "$LOCALDIR/random"; 72our $RANDOMDIR = "$LOCALDIR/random";
71our $BDBDIR = "$LOCALDIR/db"; 73our $BDBDIR = "$LOCALDIR/db";
74our %RESOURCE;
72 75
73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
74our $TICK_WATCHER; 77our $TICK_WATCHER;
75our $AIO_POLL_WATCHER; 78our $AIO_POLL_WATCHER;
76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
77our $NEXT_TICK; 80our $NEXT_TICK;
78our $NOW;
79our $USE_FSYNC = 1; # use fsync to write maps - default off 81our $USE_FSYNC = 1; # use fsync to write maps - default off
80 82
81our $BDB_POLL_WATCHER; 83our $BDB_POLL_WATCHER;
84our $BDB_DEADLOCK_WATCHER;
85our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER;
82our $DB_ENV; 87our $DB_ENV;
83 88
84our %CFG; 89our %CFG;
85 90
86our $UPTIME; $UPTIME ||= time; 91our $UPTIME; $UPTIME ||= time;
87our $RUNTIME; 92our $RUNTIME;
93our $NOW;
88 94
89our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
90our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
91our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
92 98
93# 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 ∕
94our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
95 101
156 162
157The raw value load value from the last tick. 163The raw value load value from the last tick.
158 164
159=item %cf::CFG 165=item %cf::CFG
160 166
161Configuration for the server, loaded from C</etc/crossfire/config>, or 167Configuration for the server, loaded from C</etc/deliantra-server/config>, or
162from wherever your confdir points to. 168from wherever your confdir points to.
163 169
164=item cf::wait_for_tick, cf::wait_for_tick_begin 170=item cf::wait_for_tick, cf::wait_for_tick_begin
165 171
166These 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
167returns 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
168per 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.
169 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
170=back 182=back
171 183
172=cut 184=cut
173 185
174BEGIN { 186BEGIN {
178 $msg .= "\n" 190 $msg .= "\n"
179 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
180 192
181 $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;
182 194
183 utf8::encode $msg;
184 LOG llevError, $msg; 195 LOG llevError, $msg;
185 }; 196 };
186} 197}
187 198
188@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
204)) { 215)) {
205 no strict 'refs'; 216 no strict 'refs';
206 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
207} 218}
208 219
209$Event::DIED = sub { 220$EV::DIED = sub {
210 warn "error in event callback: @_"; 221 warn "error in event callback: @_";
211}; 222};
212 223
213############################################################################# 224#############################################################################
214 225
237 $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;
238 $d 249 $d
239 } || "[unable to dump $_[0]: '$@']"; 250 } || "[unable to dump $_[0]: '$@']";
240} 251}
241 252
242use JSON::XS ();
243
244=item $ref = cf::from_json $json 253=item $ref = cf::decode_json $json
245 254
246Converts a JSON string into the corresponding perl data structure. 255Converts a JSON string into the corresponding perl data structure.
247 256
248=item $json = cf::to_json $ref 257=item $json = cf::encode_json $ref
249 258
250Converts a perl data structure into its JSON representation. 259Converts a perl data structure into its JSON representation.
251 260
252=cut 261=cut
253 262
254our $json_coder = JSON::XS->new->convert_blessed->utf8; 263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
255 264
256sub to_json ($) { $json_coder->encode ($_[0]) } 265sub encode_json($) { $json_coder->encode ($_[0]) }
257sub from_json ($) { $json_coder->decode ($_[0]) } 266sub decode_json($) { $json_coder->decode ($_[0]) }
258 267
259=item cf::lock_wait $string 268=item cf::lock_wait $string
260 269
261Wait until the given lock is available. See cf::lock_acquire. 270Wait until the given lock is available. See cf::lock_acquire.
262 271
265Wait 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
266a 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,
267for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
268returned. 277returned.
269 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
270Lock 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
271uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
272 284
273=item $locked = cf::lock_active $string 285=item $locked = cf::lock_active $string
274 286
275Return 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.
276 288
277=cut 289=cut
278 290
279our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
280 293
281sub lock_wait($) { 294sub lock_wait($) {
282 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#
283 301
284 # wait for lock, if any 302 # wait for lock, if any
285 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
286 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
287 Coro::schedule; 305 Coro::schedule;
293 311
294 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
295 lock_wait $key; 313 lock_wait $key;
296 314
297 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
298 317
299 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
300 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
301 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
302 } 322 }
303} 323}
304 324
316 }; 336 };
317 $TICK_WATCHER->stop; 337 $TICK_WATCHER->stop;
318 $guard 338 $guard
319} 339}
320 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
321=item cf::async { BLOCK } 414=item cf::async { BLOCK }
322 415
323Currently the same as Coro::async_pool, meaning you cannot use 416Currently the same as Coro::async_pool, meaning you cannot use
324C<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
325thing you are allowed to do is call C<prio> on it. 418thing you are allowed to do is call C<prio> on it.
328 421
329BEGIN { *async = \&Coro::async_pool } 422BEGIN { *async = \&Coro::async_pool }
330 423
331=item cf::sync_job { BLOCK } 424=item cf::sync_job { BLOCK }
332 425
333The design of Crossfire TRT requires that the main coroutine ($Coro::main) 426The design of Deliantra requires that the main coroutine ($Coro::main)
334is always able to handle events or runnable, as Crossfire TRT is only 427is always able to handle events or runnable, as Deliantra is only
335partly 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
336acceptable. 429acceptable.
337 430
338If 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
339the given BLOCK in another coroutine while waiting for the result. The 432the given BLOCK in another coroutine while waiting for the result. The
344 437
345sub sync_job(&) { 438sub sync_job(&) {
346 my ($job) = @_; 439 my ($job) = @_;
347 440
348 if ($Coro::current == $Coro::main) { 441 if ($Coro::current == $Coro::main) {
349 my $time = Event::time; 442 my $time = EV::time;
350 443
351 # this is the main coro, too bad, we have to block 444 # this is the main coro, too bad, we have to block
352 # till the operation succeeds, freezing the server :/ 445 # till the operation succeeds, freezing the server :/
353 446
447 LOG llevError, Carp::longmess "sync job";#d#
448
354 # TODO: use suspend/resume instead 449 # TODO: use suspend/resume instead
355 # (but this is cancel-safe) 450 # (but this is cancel-safe)
356 my $freeze_guard = freeze_mainloop; 451 my $freeze_guard = freeze_mainloop;
357 452
358 my $busy = 1; 453 my $busy = 1;
359 my @res; 454 my @res;
360 455
361 (async { 456 (async {
457 $Coro::current->desc ("sync job coro");
362 @res = eval { $job->() }; 458 @res = eval { $job->() };
363 warn $@ if $@; 459 warn $@ if $@;
364 undef $busy; 460 undef $busy;
365 })->prio (Coro::PRIO_MAX); 461 })->prio (Coro::PRIO_MAX);
366 462
367 while ($busy) { 463 while ($busy) {
368 Coro::cede or Event::one_event; 464 if (Coro::nready) {
465 Coro::cede_notself;
466 } else {
467 EV::loop EV::LOOP_ONESHOT;
369 } 468 }
469 }
370 470
371 $time = Event::time - $time; 471 $time = EV::time - $time;
372 472
373 LOG llevError | logBacktrace, Carp::longmess "long sync job" 473 LOG llevError | logBacktrace, Carp::longmess "long sync job"
374 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 474 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
375 475
376 $tick_start += $time; # do not account sync jobs to server load 476 $tick_start += $time; # do not account sync jobs to server load
406=item fork_call { }, $args 506=item fork_call { }, $args
407 507
408Executes the given code block with the given arguments in a seperate 508Executes the given code block with the given arguments in a seperate
409process, returning the results. Everything must be serialisable with 509process, returning the results. Everything must be serialisable with
410Coro::Storable. May, of course, block. Note that the executed sub may 510Coro::Storable. May, of course, block. Note that the executed sub may
411never block itself or use any form of Event handling. 511never block itself or use any form of event handling.
412 512
413=cut 513=cut
414 514
415sub fork_call(&@) { 515sub fork_call(&@) {
416 my ($cb, @args) = @_; 516 my ($cb, @args) = @_;
417 517
418# 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,
419# or die "socketpair: $!"; 519 # otherwise perl prematurely frees the stuff :/
420 pipe my $fh1, my $fh2 520 # TODO: investigate and fix (likely this will be rather laborious)
421 or die "pipe: $!";
422 521
423 if (my $pid = fork) { 522 my @res = Coro::Util::fork_eval {
424 close $fh2;
425
426 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
427 $res = Coro::Storable::thaw $res;
428
429 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
430
431 die $$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 eval {
439 close $fh1;
440 526
441 my @res = eval { $cb->(@args) }; 527 wantarray ? @res : $res[-1]
442 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
443 };
444
445 warn $@ if $@;
446 _exit 0;
447 }
448} 528}
449 529
450=item $value = cf::db_get $family => $key 530=item $value = cf::db_get $family => $key
451 531
452Returns a single value from the environment database. 532Returns a single value from the environment database.
454=item cf::db_put $family => $key => $value 534=item cf::db_put $family => $key => $value
455 535
456Stores 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
457data 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).
458 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
459=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}
460 562
461our $DB; 563our $DB;
462 564
463sub db_init { 565sub db_init {
464 unless ($DB) {
465 $DB = BDB::db_create $DB_ENV;
466
467 cf::sync_job { 566 cf::sync_job {
468 eval { 567 $DB ||= db_table "db";
469 $DB->set_flags (BDB::CHKSUM);
470
471 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
472 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
473 cf::cleanup "db_open(db): $!" if $!;
474 };
475 cf::cleanup "db_open(db): $@" if $@;
476 };
477 } 568 };
478} 569}
479 570
480sub db_get($$) { 571sub db_get($$) {
481 my $key = "$_[0]/$_[1]"; 572 my $key = "$_[0]/$_[1]";
482 573
532 if (1) { 623 if (1) {
533 $md5 = 624 $md5 =
534 join "\x00", 625 join "\x00",
535 $processversion, 626 $processversion,
536 map { 627 map {
537 Coro::cede; 628 cf::cede_to_tick;
538 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 629 ($src->[$_], Digest::MD5::md5_hex $data[$_])
539 } 0.. $#$src; 630 } 0.. $#$src;
540 631
541 632
542 my $dbmd5 = db_get cache => "$id/md5"; 633 my $dbmd5 = db_get cache => "$id/md5";
586attach callbacks/event handlers (a collection of which is called an "attachment") 677attach callbacks/event handlers (a collection of which is called an "attachment")
587to it. All such attachable objects support the following methods. 678to it. All such attachable objects support the following methods.
588 679
589In 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>
590C<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
591Crossfire TRT). 682Deliantra).
592 683
593=over 4 684=over 4
594 685
595=item $attachable->attach ($attachment, key => $value...) 686=item $attachable->attach ($attachment, key => $value...)
596 687
848 "; 939 ";
849 die if $@; 940 die if $@;
850} 941}
851 942
852our $override; 943our $override;
853our @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?
854 945
855sub override { 946sub override {
856 $override = 1; 947 $override = 1;
857 @invoke_results = (); 948 @INVOKE_RESULTS = (@_);
858} 949}
859 950
860sub do_invoke { 951sub do_invoke {
861 my $event = shift; 952 my $event = shift;
862 my $callbacks = shift; 953 my $callbacks = shift;
863 954
864 @invoke_results = (); 955 @INVOKE_RESULTS = ();
865 956
866 local $override; 957 local $override;
867 958
868 for (@$callbacks) { 959 for (@$callbacks) {
869 eval { &{$_->[1]} }; 960 eval { &{$_->[1]} };
878 } 969 }
879 970
880 0 971 0
881} 972}
882 973
883=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 974=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
884 975
885=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 976=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
886 977
887Generate an object-specific event with the given arguments. 978Generate an object-specific event with the given arguments.
888 979
889This 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
890removed 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
891results (if you must, access C<@cf::invoke_results> directly). 982results (if you must, access C<@cf::INVOKE_RESULTS> directly).
892 983
893=back 984=back
894 985
895=cut 986=cut
896 987
897############################################################################# 988#############################################################################
898# 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}
899 1032
900sub reattach { 1033sub reattach {
901 # basically do the same as instantiate, without calling instantiate 1034 # basically do the same as instantiate, without calling instantiate
902 my ($obj) = @_; 1035 my ($obj) = @_;
903 1036
924cf::attachable->attach ( 1057cf::attachable->attach (
925 prio => -1000000, 1058 prio => -1000000,
926 on_instantiate => sub { 1059 on_instantiate => sub {
927 my ($obj, $data) = @_; 1060 my ($obj, $data) = @_;
928 1061
929 $data = from_json $data; 1062 $data = decode_json $data;
930 1063
931 for (@$data) { 1064 for (@$data) {
932 my ($name, $args) = @$_; 1065 my ($name, $args) = @$_;
933 1066
934 $obj->attach ($name, %{$args || {} }); 1067 $obj->attach ($name, %{$args || {} });
950sub object_freezer_save { 1083sub object_freezer_save {
951 my ($filename, $rdata, $objs) = @_; 1084 my ($filename, $rdata, $objs) = @_;
952 1085
953 sync_job { 1086 sync_job {
954 if (length $$rdata) { 1087 if (length $$rdata) {
1088 utf8::decode (my $decname = $filename);
955 warn sprintf "saving %s (%d,%d)\n", 1089 warn sprintf "saving %s (%d,%d)\n",
956 $filename, length $$rdata, scalar @$objs; 1090 $decname, length $$rdata, scalar @$objs;
957 1091
958 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1092 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
959 chmod SAVE_MODE, $fh; 1093 chmod SAVE_MODE, $fh;
960 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1094 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
961 aio_fsync $fh if $cf::USE_FSYNC; 1095 aio_fsync $fh if $cf::USE_FSYNC;
962 close $fh; 1096 close $fh;
963 1097
964 if (@$objs) { 1098 if (@$objs) {
965 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) {
966 chmod SAVE_MODE, $fh; 1100 chmod SAVE_MODE, $fh;
967 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1101 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
968 aio_write $fh, 0, (length $data), $data, 0; 1102 aio_write $fh, 0, (length $data), $data, 0;
969 aio_fsync $fh if $cf::USE_FSYNC; 1103 aio_fsync $fh if $cf::USE_FSYNC;
970 close $fh; 1104 close $fh;
971 aio_rename "$filename.pst~", "$filename.pst"; 1105 aio_rename "$filename.pst~", "$filename.pst";
972 } 1106 }
980 } 1114 }
981 } else { 1115 } else {
982 aio_unlink $filename; 1116 aio_unlink $filename;
983 aio_unlink "$filename.pst"; 1117 aio_unlink "$filename.pst";
984 } 1118 }
985 } 1119 };
986} 1120}
987 1121
988sub object_freezer_as_string { 1122sub object_freezer_as_string {
989 my ($rdata, $objs) = @_; 1123 my ($rdata, $objs) = @_;
990 1124
1002 or return; 1136 or return;
1003 1137
1004 unless (aio_stat "$filename.pst") { 1138 unless (aio_stat "$filename.pst") {
1005 (aio_load "$filename.pst", $av) >= 0 1139 (aio_load "$filename.pst", $av) >= 0
1006 or return; 1140 or return;
1141
1007 $av = eval { (Storable::thaw $av)->{objs} }; 1142 my $st = eval { Coro::Storable::thaw $av };
1143 $av = $st->{objs};
1008 } 1144 }
1009 1145
1146 utf8::decode (my $decname = $filename);
1010 warn sprintf "loading %s (%d)\n", 1147 warn sprintf "loading %s (%d,%d)\n",
1011 $filename, length $data, scalar @{$av || []}; 1148 $decname, length $data, scalar @{$av || []};
1149
1012 return ($data, $av); 1150 ($data, $av)
1013} 1151}
1014 1152
1015=head2 COMMAND CALLBACKS 1153=head2 COMMAND CALLBACKS
1016 1154
1017=over 4 1155=over 4
1087 cf::override; 1225 cf::override;
1088 }, 1226 },
1089 on_extcmd => sub { 1227 on_extcmd => sub {
1090 my ($pl, $buf) = @_; 1228 my ($pl, $buf) = @_;
1091 1229
1092 my $msg = eval { from_json $buf }; 1230 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1093 1231
1094 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
1095 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1240 if (my $cb = $EXTCMD{$type}) {
1096 if (my %reply = $cb->($pl, $msg)) { 1241 @reply = $cb->($pl, @payload);
1097 $pl->ext_reply ($msg->{msgid}, %reply);
1098 }
1099 } 1242 }
1243
1244 $pl->ext_reply ($reply, @reply)
1245 if $reply;
1246
1100 } else { 1247 } else {
1101 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1248 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1102 } 1249 }
1103 1250
1104 cf::override; 1251 cf::override;
1194 1341
1195=head3 cf::player 1342=head3 cf::player
1196 1343
1197=over 4 1344=over 4
1198 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
1199=item cf::player::find $login 1360=item cf::player::find $login
1200 1361
1201Returns the given player object, loading it if necessary (might block). 1362Returns the given player object, loading it if necessary (might block).
1202 1363
1203=cut 1364=cut
1238 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1399 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1239 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1400 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1240 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1401 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1241 aio_unlink +(playerdir $login) . "/$login.pl"; 1402 aio_unlink +(playerdir $login) . "/$login.pl";
1242 1403
1243 my $pl = load_pl path $login 1404 my $f = new_from_file cf::object::thawer path $login
1244 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;
1245 $cf::PLAYER{$login} = $pl 1411 $cf::PLAYER{$login} = $pl
1246 } 1412 }
1247 } 1413 }
1248} 1414}
1249 1415
1259 1425
1260 aio_mkdir playerdir $pl, 0770; 1426 aio_mkdir playerdir $pl, 0770;
1261 $pl->{last_save} = $cf::RUNTIME; 1427 $pl->{last_save} = $cf::RUNTIME;
1262 1428
1263 $pl->save_pl ($path); 1429 $pl->save_pl ($path);
1264 Coro::cede; 1430 cf::cede_to_tick;
1265} 1431}
1266 1432
1267sub new($) { 1433sub new($) {
1268 my ($login) = @_; 1434 my ($login) = @_;
1269 1435
1273 $self->{deny_save} = 1; 1439 $self->{deny_save} = 1;
1274 1440
1275 $cf::PLAYER{$login} = $self; 1441 $cf::PLAYER{$login} = $self;
1276 1442
1277 $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 (@_);
1278} 1454}
1279 1455
1280=item $pl->quit_character 1456=item $pl->quit_character
1281 1457
1282Nukes the player without looking back. If logged in, the connection will 1458Nukes the player without looking back. If logged in, the connection will
1337 or return []; 1513 or return [];
1338 1514
1339 my @logins; 1515 my @logins;
1340 1516
1341 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") {
1342 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1522 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1343 aio_read $fh, 0, 512, my $buf, 0 or next; 1523 aio_read $fh, 0, 512, my $buf, 0 or next;
1344 $buf !~ /^password -------------$/m or next; # official not-valid tag 1524 $buf !~ /^password -------------$/m or next; # official not-valid tag
1525 }
1345 1526
1346 utf8::decode $login; 1527 utf8::decode $login;
1347 push @logins, $login; 1528 push @logins, $login;
1348 } 1529 }
1349 1530
1382 1563
1383Expand crossfire pod fragments into protocol xml. 1564Expand crossfire pod fragments into protocol xml.
1384 1565
1385=cut 1566=cut
1386 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
1387sub expand_cfpod { 1579sub expand_cfpod {
1388 ((my $self), (local $_)) = @_; 1580 my ($self, $pod) = @_;
1389 1581
1390 # escape & and < 1582 my $xml;
1391 s/&/&amp;/g;
1392 s/(?<![BIUGH])</&lt;/g;
1393 1583
1394 # this is buggy, it needs to properly take care of nested <'s 1584 while () {
1585 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1586 $group = $1;
1395 1587
1396 1 while 1588 $group =~ s/&/&amp;/g;
1397 # replace B<>, I<>, U<> etc. 1589 $group =~ s/</&lt;/g;
1398 s/B<([^\>]*)>/<b>$1<\/b>/ 1590
1399 || s/I<([^\>]*)>/<i>$1<\/i>/ 1591 $xml .= $group;
1400 || s/U<([^\>]*)>/<u>$1<\/u>/ 1592 } elsif ($pod =~ m%\G
1401 # replace G<male|female> tags 1593 ([BCGHITU])
1402 || s{G<([^>|]*)\|([^>]*)>}{ 1594 <
1403 $self->gender ? $2 : $1 1595 (?:
1596 ([^<>]*) (?{ $group = $^N })
1597 | < $interior >
1598 )
1599 >
1600 %gcsx
1601 ) {
1602 my ($code, $data) = ($1, $group);
1603
1604 if ($code eq "B") {
1605 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1606 } elsif ($code eq "I") {
1607 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1608 } elsif ($code eq "U") {
1609 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1610 } elsif ($code eq "C") {
1611 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1612 } elsif ($code eq "T") {
1613 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1614 } elsif ($code eq "G") {
1615 my ($male, $female) = split /\|/, $data;
1616 $data = $self->gender ? $female : $male;
1617 $xml .= expand_cfpod ($self, $data);
1618 } elsif ($code eq "H") {
1619 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1620 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1621 "")
1622 [$self->{hintmode}];
1623 } else {
1624 $xml .= "error processing '$code($data)' directive";
1625 }
1626 } else {
1627 if ($pod =~ /\G(.+)/) {
1628 warn "parse error while expanding $pod (at $1)";
1629 }
1630 last;
1404 }ge 1631 }
1405 # replace H<hint text> 1632 }
1406 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;
1407 1633
1634 for ($xml) {
1408 # create single paragraphs (very hackish) 1635 # create single paragraphs (very hackish)
1409 s/(?<=\S)\n(?=\w)/ /g; 1636 s/(?<=\S)\n(?=\w)/ /g;
1410 1637
1411 $_ 1638 # compress some whitespace
1412} 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 }
1413 1644
1645 $xml
1646}
1647
1648no re 'eval';
1649
1650sub hintmode {
1651 $_[0]{hintmode} = $_[1] if @_ > 1;
1652 $_[0]{hintmode}
1653}
1654
1414=item $player->ext_reply ($msgid, %msg) 1655=item $player->ext_reply ($msgid, @msg)
1415 1656
1416Sends an ext reply to the player. 1657Sends an ext reply to the player.
1417 1658
1418=cut 1659=cut
1419 1660
1420sub ext_reply($$%) { 1661sub ext_reply($$@) {
1421 my ($self, $id, %msg) = @_; 1662 my ($self, $id, @msg) = @_;
1422 1663
1423 $msg{msgid} = $id; 1664 $self->ns->ext_reply ($id, @msg)
1424 $self->send ("ext " . cf::to_json \%msg);
1425} 1665}
1426 1666
1427=item $player->ext_event ($type, %msg) 1667=item $player->ext_msg ($type, @msg)
1428 1668
1429Sends an ext event to the client. 1669Sends an ext event to the client.
1430 1670
1431=cut 1671=cut
1432 1672
1433sub ext_event($$%) { 1673sub ext_msg($$@) {
1434 my ($self, $type, %msg) = @_; 1674 my ($self, $type, @msg) = @_;
1435 1675
1436 $self->ns->ext_event ($type, %msg); 1676 $self->ns->ext_msg ($type, @msg);
1437} 1677}
1438 1678
1439=head3 cf::region 1679=head3 cf::region
1440 1680
1441=over 4 1681=over 4
1454 my ($path) = @_; 1694 my ($path) = @_;
1455 1695
1456 my ($match, $specificity); 1696 my ($match, $specificity);
1457 1697
1458 for my $region (list) { 1698 for my $region (list) {
1459 if ($region->match && $path =~ $region->match) { 1699 if ($region->{match} && $path =~ $region->{match}) {
1460 ($match, $specificity) = ($region, $region->specificity) 1700 ($match, $specificity) = ($region, $region->specificity)
1461 if $region->specificity > $specificity; 1701 if $region->specificity > $specificity;
1462 } 1702 }
1463 } 1703 }
1464 1704
1584 $self->init; # pass $1 etc. 1824 $self->init; # pass $1 etc.
1585 return $self; 1825 return $self;
1586 } 1826 }
1587 } 1827 }
1588 1828
1589 Carp::carp "unable to resolve path '$path' (base '$base')."; 1829 Carp::cluck "unable to resolve path '$path' (base '$base').";
1590 () 1830 ()
1591} 1831}
1592 1832
1593sub init { 1833sub init {
1594 my ($self) = @_; 1834 my ($self) = @_;
1657 1897
1658sub load_header_from($) { 1898sub load_header_from($) {
1659 my ($self, $path) = @_; 1899 my ($self, $path) = @_;
1660 1900
1661 utf8::encode $path; 1901 utf8::encode $path;
1662 #aio_open $path, O_RDONLY, 0 1902 my $f = new_from_file cf::object::thawer $path
1663 # or return;
1664
1665 $self->_load_header ($path)
1666 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;
1667 1910
1668 $self->{load_path} = $path; 1911 $self->{load_path} = $path;
1669 1912
1670 1 1913 1
1671} 1914}
1725sub find { 1968sub find {
1726 my ($path, $origin) = @_; 1969 my ($path, $origin) = @_;
1727 1970
1728 $path = normalise $path, $origin && $origin->path; 1971 $path = normalise $path, $origin && $origin->path;
1729 1972
1973 cf::lock_wait "map_data:$path";#d#remove
1730 cf::lock_wait "map_find:$path"; 1974 cf::lock_wait "map_find:$path";
1731 1975
1732 $cf::MAP{$path} || do { 1976 $cf::MAP{$path} || do {
1733 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
1734 my $map = new_from_path cf::map $path 1980 my $map = new_from_path cf::map $path
1735 or return; 1981 or return;
1736 1982
1737 $map->{last_save} = $cf::RUNTIME; 1983 $map->{last_save} = $cf::RUNTIME;
1738 1984
1740 or return; 1986 or return;
1741 1987
1742 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1988 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1743 # doing this can freeze the server in a sync job, obviously 1989 # doing this can freeze the server in a sync job, obviously
1744 #$cf::WAIT_FOR_TICK->wait; 1990 #$cf::WAIT_FOR_TICK->wait;
1991 undef $guard1;
1992 undef $guard2;
1745 $map->reset; 1993 $map->reset;
1746 undef $guard;
1747 return find $path; 1994 return find $path;
1748 } 1995 }
1749 1996
1750 $cf::MAP{$path} = $map 1997 $cf::MAP{$path} = $map
1751 } 1998 }
1760 local $self->{deny_reset} = 1; # loading can take a long time 2007 local $self->{deny_reset} = 1; # loading can take a long time
1761 2008
1762 my $path = $self->{path}; 2009 my $path = $self->{path};
1763 2010
1764 { 2011 {
1765 my $guard = cf::lock_acquire "map_load:$path"; 2012 my $guard = cf::lock_acquire "map_data:$path";
1766 2013
2014 return unless $self->valid;
1767 return if $self->in_memory != cf::MAP_SWAPPED; 2015 return unless $self->in_memory == cf::MAP_SWAPPED;
1768 2016
1769 $self->in_memory (cf::MAP_LOADING); 2017 $self->in_memory (cf::MAP_LOADING);
1770 2018
1771 $self->alloc; 2019 $self->alloc;
1772 2020
1773 $self->pre_load; 2021 $self->pre_load;
1774 Coro::cede; 2022 cf::cede_to_tick;
1775 2023
2024 my $f = new_from_file cf::object::thawer $self->{load_path};
2025 $f->skip_block;
1776 $self->_load_objects ($self->{load_path}, 1) 2026 $self->_load_objects ($f)
1777 or return; 2027 or return;
1778 2028
1779 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2029 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1780 if delete $self->{load_original}; 2030 if delete $self->{load_original};
1781 2031
1782 if (my $uniq = $self->uniq_path) { 2032 if (my $uniq = $self->uniq_path) {
1783 utf8::encode $uniq; 2033 utf8::encode $uniq;
1784 if (aio_open $uniq, O_RDONLY, 0) { 2034 unless (aio_stat $uniq) {
2035 if (my $f = new_from_file cf::object::thawer $uniq) {
1785 $self->clear_unique_items; 2036 $self->clear_unique_items;
1786 $self->_load_objects ($uniq, 0); 2037 $self->_load_objects ($f);
2038 $f->resolve_delayed_derefs;
2039 }
1787 } 2040 }
1788 } 2041 }
1789 2042
1790 Coro::cede; 2043 $f->resolve_delayed_derefs;
2044
2045 cf::cede_to_tick;
1791 # now do the right thing for maps 2046 # now do the right thing for maps
1792 $self->link_multipart_objects; 2047 $self->link_multipart_objects;
1793 $self->difficulty ($self->estimate_difficulty) 2048 $self->difficulty ($self->estimate_difficulty)
1794 unless $self->difficulty; 2049 unless $self->difficulty;
1795 Coro::cede; 2050 cf::cede_to_tick;
1796 2051
1797 unless ($self->{deny_activate}) { 2052 unless ($self->{deny_activate}) {
1798 $self->decay_objects; 2053 $self->decay_objects;
1799 $self->fix_auto_apply; 2054 $self->fix_auto_apply;
1800 $self->update_buttons; 2055 $self->update_buttons;
1801 Coro::cede; 2056 cf::cede_to_tick;
1802 $self->set_darkness_map; 2057 $self->set_darkness_map;
1803 Coro::cede; 2058 cf::cede_to_tick;
1804 $self->activate; 2059 $self->activate;
1805 } 2060 }
2061
2062 $self->{last_save} = $cf::RUNTIME;
2063 $self->last_access ($cf::RUNTIME);
1806 2064
1807 $self->in_memory (cf::MAP_IN_MEMORY); 2065 $self->in_memory (cf::MAP_IN_MEMORY);
1808 } 2066 }
1809 2067
1810 $self->post_load; 2068 $self->post_load;
1821 2079
1822 $self 2080 $self
1823} 2081}
1824 2082
1825# 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
1826sub load_diag { 2084sub load_neighbours {
1827 my ($map) = @_; 2085 my ($map) = @_;
1828 2086
1829 my @diag; # diagonal neighbours 2087 my @neigh; # diagonal neighbours
1830 2088
1831 for (0 .. 3) { 2089 for (0 .. 3) {
1832 my $neigh = $map->tile_path ($_) 2090 my $neigh = $map->tile_path ($_)
1833 or next; 2091 or next;
1834 $neigh = find $neigh, $map 2092 $neigh = find $neigh, $map
1835 or next; 2093 or next;
1836 $neigh->load; 2094 $neigh->load;
1837 2095
2096 push @neigh,
1838 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2097 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1839 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2098 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1840 } 2099 }
1841 2100
1842 for (@diag) { 2101 for (grep defined $_->[0], @neigh) {
2102 my ($path, $origin) = @$_;
1843 my $neigh = find @$_ 2103 my $neigh = find $path, $origin
1844 or next; 2104 or next;
1845 $neigh->load; 2105 $neigh->load;
1846 } 2106 }
1847} 2107}
1848 2108
1853} 2113}
1854 2114
1855sub do_load_sync { 2115sub do_load_sync {
1856 my ($map) = @_; 2116 my ($map) = @_;
1857 2117
2118 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2119 if $Coro::current == $Coro::main;
2120
1858 cf::sync_job { $map->load }; 2121 cf::sync_job { $map->load };
1859} 2122}
1860 2123
1861our %MAP_PREFETCH; 2124our %MAP_PREFETCH;
1862our $MAP_PREFETCHER = undef; 2125our $MAP_PREFETCHER = undef;
1863 2126
1864sub find_async { 2127sub find_async {
1865 my ($path, $origin) = @_; 2128 my ($path, $origin, $load) = @_;
1866 2129
1867 $path = normalise $path, $origin && $origin->{path}; 2130 $path = normalise $path, $origin && $origin->{path};
1868 2131
1869 if (my $map = $cf::MAP{$path}) { 2132 if (my $map = $cf::MAP{$path}) {
1870 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2133 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1871 } 2134 }
1872 2135
1873 undef $MAP_PREFETCH{$path}; 2136 $MAP_PREFETCH{$path} |= $load;
2137
1874 $MAP_PREFETCHER ||= cf::async { 2138 $MAP_PREFETCHER ||= cf::async {
2139 $Coro::current->{desc} = "map prefetcher";
2140
1875 while (%MAP_PREFETCH) { 2141 while (%MAP_PREFETCH) {
1876 for my $path (keys %MAP_PREFETCH) { 2142 while (my ($k, $v) = each %MAP_PREFETCH) {
1877 my $map = find $path 2143 if (my $map = find $k) {
1878 or next;
1879 $map->load; 2144 $map->load if $v;
2145 }
1880 2146
1881 delete $MAP_PREFETCH{$path}; 2147 delete $MAP_PREFETCH{$k};
1882 } 2148 }
1883 } 2149 }
1884 undef $MAP_PREFETCHER; 2150 undef $MAP_PREFETCHER;
1885 }; 2151 };
1886 $MAP_PREFETCHER->prio (6); 2152 $MAP_PREFETCHER->prio (6);
1889} 2155}
1890 2156
1891sub save { 2157sub save {
1892 my ($self) = @_; 2158 my ($self) = @_;
1893 2159
1894 my $lock = cf::lock_acquire "map_data:" . $self->path; 2160 my $lock = cf::lock_acquire "map_data:$self->{path}";
1895 2161
1896 $self->{last_save} = $cf::RUNTIME; 2162 $self->{last_save} = $cf::RUNTIME;
1897 2163
1898 return unless $self->dirty; 2164 return unless $self->dirty;
1899 2165
1905 return if $self->{deny_save}; 2171 return if $self->{deny_save};
1906 2172
1907 local $self->{last_access} = $self->last_access;#d# 2173 local $self->{last_access} = $self->last_access;#d#
1908 2174
1909 cf::async { 2175 cf::async {
2176 $Coro::current->{desc} = "map player save";
1910 $_->contr->save for $self->players; 2177 $_->contr->save for $self->players;
1911 }; 2178 };
1912 2179
1913 if ($uniq) { 2180 if ($uniq) {
1914 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2181 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1922 my ($self) = @_; 2189 my ($self) = @_;
1923 2190
1924 # save first because save cedes 2191 # save first because save cedes
1925 $self->save; 2192 $self->save;
1926 2193
1927 my $lock = cf::lock_acquire "map_data:" . $self->path; 2194 my $lock = cf::lock_acquire "map_data:$self->{path}";
1928 2195
1929 return if $self->players; 2196 return if $self->players;
1930 return if $self->in_memory != cf::MAP_IN_MEMORY; 2197 return if $self->in_memory != cf::MAP_IN_MEMORY;
1931 return if $self->{deny_save}; 2198 return if $self->{deny_save};
1932 2199
2200 $self->in_memory (cf::MAP_SWAPPED);
2201
2202 $self->deactivate;
2203 $_->clear_links_to ($self) for values %cf::MAP;
1933 $self->clear; 2204 $self->clear;
1934 $self->in_memory (cf::MAP_SWAPPED);
1935} 2205}
1936 2206
1937sub reset_at { 2207sub reset_at {
1938 my ($self) = @_; 2208 my ($self) = @_;
1939 2209
1971 if $uniq; 2241 if $uniq;
1972 } 2242 }
1973 2243
1974 delete $cf::MAP{$self->path}; 2244 delete $cf::MAP{$self->path};
1975 2245
2246 $self->deactivate;
2247 $_->clear_links_to ($self) for values %cf::MAP;
1976 $self->clear; 2248 $self->clear;
1977
1978 $_->clear_links_to ($self) for values %cf::MAP;
1979 2249
1980 $self->unlink_save; 2250 $self->unlink_save;
1981 $self->destroy; 2251 $self->destroy;
1982} 2252}
1983 2253
1984my $nuke_counter = "aaaa"; 2254my $nuke_counter = "aaaa";
1985 2255
1986sub nuke { 2256sub nuke {
1987 my ($self) = @_; 2257 my ($self) = @_;
1988 2258
2259 {
2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2261
1989 delete $cf::MAP{$self->path}; 2262 delete $cf::MAP{$self->path};
1990 2263
1991 $self->unlink_save; 2264 $self->unlink_save;
1992 2265
1993 bless $self, "cf::map"; 2266 bless $self, "cf::map";
1994 delete $self->{deny_reset}; 2267 delete $self->{deny_reset};
1995 $self->{deny_save} = 1; 2268 $self->{deny_save} = 1;
1996 $self->reset_timeout (1); 2269 $self->reset_timeout (1);
1997 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2270 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1998 2271
1999 $cf::MAP{$self->path} = $self; 2272 $cf::MAP{$self->path} = $self;
2273 }
2000 2274
2001 $self->reset; # polite request, might not happen 2275 $self->reset; # polite request, might not happen
2002} 2276}
2003 2277
2004=item $maps = cf::map::tmp_maps 2278=item $maps = cf::map::tmp_maps
2080 2354
2081sub inv_recursive { 2355sub inv_recursive {
2082 inv_recursive_ inv $_[0] 2356 inv_recursive_ inv $_[0]
2083} 2357}
2084 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
2085package cf; 2387package cf;
2086 2388
2087=back 2389=back
2088 2390
2089=head3 cf::object::player 2391=head3 cf::object::player
2111 2413
2112 } else { 2414 } else {
2113 my $pl = $self->contr; 2415 my $pl = $self->contr;
2114 2416
2115 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2417 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2116 my $diag = $pl->{npc_dialog}; 2418 my $dialog = $pl->{npc_dialog};
2117 $diag->{pl}->ext_reply ( 2419 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2118 $diag->{id},
2119 msgtype => "reply",
2120 msg => $diag->{pl}->expand_cfpod ($msg),
2121 add_topics => []
2122 );
2123 2420
2124 } else { 2421 } else {
2125 $msg = $npc->name . " says: $msg" if $npc; 2422 $msg = $npc->name . " says: $msg" if $npc;
2126 $self->message ($msg, $flags); 2423 $self->message ($msg, $flags);
2127 } 2424 }
2128 } 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 (@_);
2129} 2436}
2130 2437
2131=item $player_object->may ("access") 2438=item $player_object->may ("access")
2132 2439
2133Returns wether the given player is authorized to access resource "access" 2440Returns wether the given player is authorized to access resource "access"
2212 # use -1 or undef as default coordinates, not 0, 0 2519 # use -1 or undef as default coordinates, not 0, 0
2213 ($x, $y) = ($map->enter_x, $map->enter_y) 2520 ($x, $y) = ($map->enter_x, $map->enter_y)
2214 if $x <=0 && $y <= 0; 2521 if $x <=0 && $y <= 0;
2215 2522
2216 $map->load; 2523 $map->load;
2217 $map->load_diag; 2524 $map->load_neighbours;
2218 2525
2219 return unless $self->contr->active; 2526 return unless $self->contr->active;
2220 $self->activate_recursive; 2527 $self->activate_recursive;
2221 2528
2222 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2529 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2223 $self->enter_map ($map, $x, $y); 2530 $self->enter_map ($map, $x, $y);
2224} 2531}
2225 2532
2226=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2533=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2227 2534
2228Moves 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
2229her, loading and preparing them map, calling the provided $check callback 2536her, loading and preparing them map, calling the provided $check callback
2230that 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
2231the 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.
2232 2540
2233=cut 2541=cut
2234 2542
2235our $GOTOGEN; 2543our $GOTOGEN;
2236 2544
2237sub cf::object::player::goto { 2545sub cf::object::player::goto {
2238 my ($self, $path, $x, $y, $check) = @_; 2546 my ($self, $path, $x, $y, $check, $done) = @_;
2239 2547
2240 # 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
2241 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2549 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2242 2550
2243 $self->enter_link; 2551 $self->enter_link;
2244 2552
2245 (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
2246 my $map = eval { 2575 my $map = eval {
2247 my $map = cf::map::find $path; 2576 my $map = defined $path ? cf::map::find $path : undef;
2248 2577
2249 if ($map) { 2578 if ($map) {
2250 $map = $map->customise_for ($self); 2579 $map = $map->customise_for ($self);
2251 $map = $check->($map) if $check && $map; 2580 $map = $check->($map) if $check && $map;
2252 } else { 2581 } else {
2253 $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);
2254 } 2583 }
2255 2584
2256 $map 2585 $map
2257 }; 2586 };
2258 2587
2263 2592
2264 if ($gen == $self->{_goto_generation}) { 2593 if ($gen == $self->{_goto_generation}) {
2265 delete $self->{_goto_generation}; 2594 delete $self->{_goto_generation};
2266 $self->leave_link ($map, $x, $y); 2595 $self->leave_link ($map, $x, $y);
2267 } 2596 }
2597
2598 $done->() if $done;
2268 })->prio (1); 2599 })->prio (1);
2269} 2600}
2270 2601
2271=item $player_object->enter_exit ($exit_object) 2602=item $player_object->enter_exit ($exit_object)
2272 2603
2309 $rmp->{origin_y} = $exit->y; 2640 $rmp->{origin_y} = $exit->y;
2310 } 2641 }
2311 2642
2312 $rmp->{random_seed} ||= $exit->random_seed; 2643 $rmp->{random_seed} ||= $exit->random_seed;
2313 2644
2314 my $data = cf::to_json $rmp; 2645 my $data = cf::encode_json $rmp;
2315 my $md5 = Digest::MD5::md5_hex $data; 2646 my $md5 = Digest::MD5::md5_hex $data;
2316 my $meta = "$RANDOMDIR/$md5.meta"; 2647 my $meta = "$RANDOMDIR/$md5.meta";
2317 2648
2318 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2649 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2319 aio_write $fh, 0, (length $data), $data, 0; 2650 aio_write $fh, 0, (length $data), $data, 0;
2341 my $hp = $exit->stats->hp; 2672 my $hp = $exit->stats->hp;
2342 my $sp = $exit->stats->sp; 2673 my $sp = $exit->stats->sp;
2343 2674
2344 $self->enter_link; 2675 $self->enter_link;
2345 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
2346 (async { 2681 (async {
2682 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2683
2347 $self->deactivate_recursive; # just to be sure 2684 $self->deactivate_recursive; # just to be sure
2348 unless (eval { 2685 unless (eval {
2349 $self->goto ($slaying, $hp, $sp); 2686 $self->goto ($slaying, $hp, $sp);
2350 2687
2351 1; 2688 1;
2377 2714
2378 utf8::encode $text; 2715 utf8::encode $text;
2379 $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);
2380} 2717}
2381 2718
2382=item $client->send_msg ($color, $type, $msg, [extra...]) 2719=item $client->send_msg ($channel, $msg, $color, [extra...])
2383 2720
2384Send 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
2385client 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
2386the 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
2387the message unless the client supports the msg packet. 2724the message unless the client supports the msg packet.
2388 2725
2389=cut 2726=cut
2390 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
2391sub cf::client::send_msg { 2780sub cf::client::send_msg {
2392 my ($self, $color, $type, $msg, @extra) = @_; 2781 my ($self, $channel, $msg, $color, @extra) = @_;
2393 2782
2394 $msg = $self->pl->expand_cfpod ($msg); 2783 $msg = $self->pl->expand_cfpod ($msg);
2395 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
2396 if ($self->can_msg) { 2809 if ($self->can_msg) {
2397 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); 2810 # default colour, mask it out
2811 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2812 if $color & cf::NDI_DEF;
2813
2814 $self->send_packet ("msg " . $self->{json_coder}->encode (
2815 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2398 } else { 2816 } else {
2399 # replace some tags by gcfclient-compatible ones
2400 for ($msg) {
2401 1 while
2402 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2403 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2404 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2405 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2406 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2407 }
2408
2409 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
2410 if (0 && $msg =~ /\[/) { 2832 if (0 && $msg =~ /\[/) {
2833 # COMMAND/INFO
2411 $self->send_packet ("drawextinfo $color 4 0 $msg") 2834 $self->send_packet ("drawextinfo $color 10 8 $msg")
2412 } else { 2835 } else {
2413 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2836 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2414 $self->send_packet ("drawinfo $color $msg") 2837 $self->send_packet ("drawinfo $color $msg")
2415 } 2838 }
2416 } 2839 }
2417 } 2840 }
2418} 2841}
2419 2842
2420=item $client->ext_event ($type, %msg) 2843=item $client->ext_msg ($type, @msg)
2421 2844
2422Sends an ext event to the client. 2845Sends an ext event to the client.
2423 2846
2424=cut 2847=cut
2425 2848
2426sub cf::client::ext_event($$%) { 2849sub cf::client::ext_msg($$@) {
2427 my ($self, $type, %msg) = @_; 2850 my ($self, $type, @msg) = @_;
2428 2851
2852 if ($self->extcmd == 2) {
2853 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2854 } elsif ($self->extcmd == 1) { # TODO: remove
2429 $msg{msgtype} = "event_$type"; 2855 push @msg, msgtype => "event_$type";
2430 $self->send_packet ("ext " . cf::to_json \%msg); 2856 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2857 }
2858}
2859
2860=item $client->ext_reply ($msgid, @msg)
2861
2862Sends an ext reply to the client.
2863
2864=cut
2865
2866sub cf::client::ext_reply($$@) {
2867 my ($self, $id, @msg) = @_;
2868
2869 if ($self->extcmd == 2) {
2870 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2871 } elsif ($self->extcmd == 1) {
2872 #TODO: version 1, remove
2873 unshift @msg, msgtype => "reply", msgid => $id;
2874 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2875 }
2431} 2876}
2432 2877
2433=item $success = $client->query ($flags, "text", \&cb) 2878=item $success = $client->query ($flags, "text", \&cb)
2434 2879
2435Queues a query to the client, calling the given callback with 2880Queues a query to the client, calling the given callback with
2458 2903
2459 1 2904 1
2460} 2905}
2461 2906
2462cf::client->attach ( 2907cf::client->attach (
2908 on_connect => sub {
2909 my ($ns) = @_;
2910
2911 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2912 },
2463 on_reply => sub { 2913 on_reply => sub {
2464 my ($ns, $msg) = @_; 2914 my ($ns, $msg) = @_;
2465 2915
2466 # this weird shuffling is so that direct followup queries 2916 # this weird shuffling is so that direct followup queries
2467 # get handled first 2917 # get handled first
2482 } 2932 }
2483 }, 2933 },
2484 on_exticmd => sub { 2934 on_exticmd => sub {
2485 my ($ns, $buf) = @_; 2935 my ($ns, $buf) = @_;
2486 2936
2487 my $msg = eval { from_json $buf }; 2937 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2488 2938
2489 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
2490 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2947 if (my $cb = $EXTICMD{$type}) {
2491 if (my %reply = $cb->($ns, $msg)) { 2948 @reply = $cb->($ns, @payload);
2492 $reply{msgid} = $msg->{msgid};
2493 $ns->send ("ext " . cf::to_json \%reply);
2494 }
2495 } 2949 }
2950
2951 $ns->ext_reply ($reply, @reply)
2952 if $reply;
2953
2496 } else { 2954 } else {
2497 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";
2498 } 2956 }
2499 2957
2500 cf::override; 2958 cf::override;
2547our $safe = new Safe "safe"; 3005our $safe = new Safe "safe";
2548our $safe_hole = new Safe::Hole; 3006our $safe_hole = new Safe::Hole;
2549 3007
2550$SIG{FPE} = 'IGNORE'; 3008$SIG{FPE} = 'IGNORE';
2551 3009
2552$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));
2553 3015
2554# here we export the classes and methods available to script code 3016# here we export the classes and methods available to script code
2555 3017
2556=pod 3018=pod
2557 3019
2558The following functions and methods are available within a safe environment: 3020The following functions and methods are available within a safe environment:
2559 3021
2560 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
2561 cf::object::player player 3026 cf::object::player
2562 cf::player peaceful 3027 player
2563 cf::map trigger 3028
3029 cf::player
3030 peaceful
3031
3032 cf::map
3033 trigger
2564 3034
2565=cut 3035=cut
2566 3036
2567for ( 3037for (
2568 ["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)],
2569 ["cf::object::player" => qw(player)], 3041 ["cf::object::player" => qw(player)],
2570 ["cf::player" => qw(peaceful)], 3042 ["cf::player" => qw(peaceful)],
2571 ["cf::map" => qw(trigger)], 3043 ["cf::map" => qw(trigger)],
2572) { 3044) {
2573 no strict 'refs'; 3045 no strict 'refs';
2649# the server's init and main functions 3121# the server's init and main functions
2650 3122
2651sub load_facedata($) { 3123sub load_facedata($) {
2652 my ($path) = @_; 3124 my ($path) = @_;
2653 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
2654 warn "loading facedata from $path\n"; 3132 warn "loading facedata from $path\n";
2655 3133
2656 my $facedata; 3134 my $facedata;
2657 0 < aio_load $path, $facedata 3135 0 < aio_load $path, $facedata
2658 or die "$path: $!"; 3136 or die "$path: $!";
2660 $facedata = Coro::Storable::thaw $facedata; 3138 $facedata = Coro::Storable::thaw $facedata;
2661 3139
2662 $facedata->{version} == 2 3140 $facedata->{version} == 2
2663 or cf::cleanup "$path: version mismatch, cannot proceed."; 3141 or cf::cleanup "$path: version mismatch, cannot proceed.";
2664 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
2665 { 3150 {
2666 my $faces = $facedata->{faceinfo}; 3151 my $faces = $facedata->{faceinfo};
2667 3152
2668 while (my ($face, $info) = each %$faces) { 3153 while (my ($face, $info) = each %$faces) {
2669 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3154 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3155
2670 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3156 cf::face::set_visibility $idx, $info->{visibility};
3157 cf::face::set_magicmap $idx, $info->{magicmap};
2671 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3158 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2672 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3159 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2673 Coro::cede; 3160
3161 cf::cede_to_tick;
2674 } 3162 }
2675 3163
2676 while (my ($face, $info) = each %$faces) { 3164 while (my ($face, $info) = each %$faces) {
2677 next unless $info->{smooth}; 3165 next unless $info->{smooth};
3166
2678 my $idx = cf::face::find $face 3167 my $idx = cf::face::find $face
2679 or next; 3168 or next;
3169
2680 if (my $smooth = cf::face::find $info->{smooth}) { 3170 if (my $smooth = cf::face::find $info->{smooth}) {
3171 cf::face::set_smooth $idx, $smooth;
2681 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3172 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2682 } else { 3173 } else {
2683 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3174 warn "smooth face '$info->{smooth}' not found for face '$face'";
2684 } 3175 }
2685 Coro::cede; 3176
3177 cf::cede_to_tick;
2686 } 3178 }
2687 } 3179 }
2688 3180
2689 { 3181 {
2690 my $anims = $facedata->{animinfo}; 3182 my $anims = $facedata->{animinfo};
2691 3183
2692 while (my ($anim, $info) = each %$anims) { 3184 while (my ($anim, $info) = each %$anims) {
2693 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3185 cf::anim::set $anim, $info->{frames}, $info->{facings};
2694 Coro::cede; 3186 cf::cede_to_tick;
2695 } 3187 }
2696 3188
2697 cf::anim::invalidate_all; # d'oh 3189 cf::anim::invalidate_all; # d'oh
2698 } 3190 }
2699 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
2700 1 3227 1
2701} 3228}
2702 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
2703sub 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
2704 load_resource_file "$MAPDIR/regions" 3263 load_resource_file "$MAPDIR/regions"
2705 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 }
2706} 3270}
2707 3271
2708sub reload_facedata { 3272sub reload_facedata {
2709 load_facedata "$DATADIR/facedata" 3273 load_facedata "$DATADIR/facedata"
2710 or die "unable to load facedata\n"; 3274 or die "unable to load facedata\n";
2711} 3275}
2712 3276
2713sub reload_archetypes { 3277sub reload_archetypes {
3278 load_resource_file "$DATADIR/archetypes"
3279 or die "unable to load archetypes\n";
3280 #d# NEED to laod twice to resolve forward references
3281 # this really needs to be done in an extra post-pass
3282 # (which needs to be synchronous, so solve it differently)
2714 load_resource_file "$DATADIR/archetypes" 3283 load_resource_file "$DATADIR/archetypes"
2715 or die "unable to load archetypes\n"; 3284 or die "unable to load archetypes\n";
2716} 3285}
2717 3286
2718sub reload_treasures { 3287sub reload_treasures {
2734 3303
2735sub init { 3304sub init {
2736 reload_resources; 3305 reload_resources;
2737} 3306}
2738 3307
2739sub cfg_load { 3308sub reload_config {
2740 open my $fh, "<:utf8", "$CONFDIR/config" 3309 open my $fh, "<:utf8", "$CONFDIR/config"
2741 or return; 3310 or return;
2742 3311
2743 local $/; 3312 local $/;
2744 *CFG = YAML::Syck::Load <$fh>; 3313 *CFG = YAML::Syck::Load <$fh>;
2760sub main { 3329sub main {
2761 # we must not ever block the main coroutine 3330 # we must not ever block the main coroutine
2762 local $Coro::idle = sub { 3331 local $Coro::idle = sub {
2763 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#
2764 (async { 3333 (async {
2765 Event::one_event; 3334 $Coro::current->{desc} = "IDLE BUG HANDLER";
3335 EV::loop EV::LOOP_ONESHOT;
2766 })->prio (Coro::PRIO_MAX); 3336 })->prio (Coro::PRIO_MAX);
2767 }; 3337 };
2768 3338
2769 cfg_load; 3339 reload_config;
2770 db_init; 3340 db_init;
2771 load_extensions; 3341 load_extensions;
2772 3342
2773 $TICK_WATCHER->start; 3343 $TICK_WATCHER->start;
3344 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
2774 Event::loop; 3345 EV::loop;
2775} 3346}
2776 3347
2777############################################################################# 3348#############################################################################
2778# initialisation and cleanup 3349# initialisation and cleanup
2779 3350
2780# install some emergency cleanup handlers 3351# install some emergency cleanup handlers
2781BEGIN { 3352BEGIN {
3353 our %SIGWATCHER = ();
2782 for my $signal (qw(INT HUP TERM)) { 3354 for my $signal (qw(INT HUP TERM)) {
2783 Event->signal ( 3355 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2784 reentrant => 0,
2785 data => WF_AUTOCANCEL,
2786 signal => $signal,
2787 prio => 0,
2788 cb => sub {
2789 cf::cleanup "SIG$signal"; 3356 cf::cleanup "SIG$signal";
2790 },
2791 ); 3357 };
2792 } 3358 }
2793} 3359}
2794 3360
2795sub write_runtime { 3361sub write_runtime {
2796 my $runtime = "$LOCALDIR/runtime"; 3362 my $runtime = "$LOCALDIR/runtime";
2841 # and maps saved/destroyed asynchronously. 3407 # and maps saved/destroyed asynchronously.
2842 warn "begin emergency player save\n"; 3408 warn "begin emergency player save\n";
2843 for my $login (keys %cf::PLAYER) { 3409 for my $login (keys %cf::PLAYER) {
2844 my $pl = $cf::PLAYER{$login} or next; 3410 my $pl = $cf::PLAYER{$login} or next;
2845 $pl->valid or next; 3411 $pl->valid or next;
3412 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2846 $pl->save; 3413 $pl->save;
2847 } 3414 }
2848 warn "end emergency player save\n"; 3415 warn "end emergency player save\n";
2849 3416
2850 warn "begin emergency map save\n"; 3417 warn "begin emergency map save\n";
2889 warn "syncing database to disk"; 3456 warn "syncing database to disk";
2890 BDB::db_env_txn_checkpoint $DB_ENV; 3457 BDB::db_env_txn_checkpoint $DB_ENV;
2891 3458
2892 # 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
2893 3460
2894 warn "cancelling all WF_AUTOCANCEL watchers";
2895 for (Event::all_watchers) {
2896 $_->cancel if $_->data & WF_AUTOCANCEL;
2897 }
2898
2899 warn "flushing outstanding aio requests"; 3461 warn "flushing outstanding aio requests";
2900 for (;;) { 3462 for (;;) {
2901 BDB::flush; 3463 BDB::flush;
2902 IO::AIO::flush; 3464 IO::AIO::flush;
2903 Coro::cede; 3465 Coro::cede_notself;
2904 last unless IO::AIO::nreqs || BDB::nreqs; 3466 last unless IO::AIO::nreqs || BDB::nreqs;
2905 warn "iterate..."; 3467 warn "iterate...";
2906 } 3468 }
2907 3469
2908 ++$RELOAD; 3470 ++$RELOAD;
2967 warn "reloading cf.pm"; 3529 warn "reloading cf.pm";
2968 require cf; 3530 require cf;
2969 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3531 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2970 3532
2971 warn "loading config and database again"; 3533 warn "loading config and database again";
2972 cf::cfg_load; 3534 cf::reload_config;
2973 3535
2974 warn "loading extensions"; 3536 warn "loading extensions";
2975 cf::load_extensions; 3537 cf::load_extensions;
2976 3538
2977 warn "reattaching attachments to objects/players"; 3539 warn "reattaching attachments to objects/players";
2997 3559
2998sub reload_perl() { 3560sub reload_perl() {
2999 # doing reload synchronously and two reloads happen back-to-back, 3561 # doing reload synchronously and two reloads happen back-to-back,
3000 # coro crashes during coro_state_free->destroy here. 3562 # coro crashes during coro_state_free->destroy here.
3001 3563
3002 $RELOAD_WATCHER ||= Event->timer ( 3564 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3003 reentrant => 0,
3004 after => 0,
3005 data => WF_AUTOCANCEL,
3006 cb => sub {
3007 do_reload_perl;
3008 undef $RELOAD_WATCHER; 3565 undef $RELOAD_WATCHER;
3009 }, 3566 do_reload_perl;
3010 ); 3567 };
3011} 3568}
3012 3569
3013register_command "reload" => sub { 3570register_command "reload" => sub {
3014 my ($who, $arg) = @_; 3571 my ($who, $arg) = @_;
3015 3572
3016 if ($who->flag (FLAG_WIZ)) { 3573 if ($who->flag (FLAG_WIZ)) {
3017 $who->message ("reloading server."); 3574 $who->message ("reloading server.");
3575 async {
3576 $Coro::current->{desc} = "perl_reload";
3018 async { reload_perl }; 3577 reload_perl;
3578 };
3019 } 3579 }
3020}; 3580};
3021 3581
3022unshift @INC, $LIBDIR; 3582unshift @INC, $LIBDIR;
3023 3583
3042 my $signal = new Coro::Signal; 3602 my $signal = new Coro::Signal;
3043 push @WAIT_FOR_TICK_BEGIN, $signal; 3603 push @WAIT_FOR_TICK_BEGIN, $signal;
3044 $signal->wait; 3604 $signal->wait;
3045} 3605}
3046 3606
3047 my $min = 1e6;#d# 3607$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3048 my $avg = 10;
3049$TICK_WATCHER = Event->timer (
3050 reentrant => 0,
3051 parked => 1,
3052 prio => 0,
3053 at => $NEXT_TICK || $TICK,
3054 data => WF_AUTOCANCEL,
3055 cb => sub {
3056 if ($Coro::current != $Coro::main) { 3608 if ($Coro::current != $Coro::main) {
3057 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"
3058 unless ++$bug_warning > 10; 3610 unless ++$bug_warning > 10;
3059 return; 3611 return;
3060 } 3612 }
3061 3613
3062 $NOW = $tick_start = Event::time; 3614 $NOW = $tick_start = EV::now;
3063 3615
3064 cf::server_tick; # one server iteration 3616 cf::server_tick; # one server iteration
3065 3617
3066 0 && sync_job {#d# 3618 $RUNTIME += $TICK;
3067 for(1..10) { 3619 $NEXT_TICK = $_[0]->at;
3068 my $t = Event::time;
3069 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3070 or die;
3071 3620
3072 $map->width (50); 3621 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3073 $map->height (50); 3622 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3074 $map->alloc; 3623 Coro::async_pool {
3075 $map->_load_objects ("/tmp/x.map", 1); 3624 $Coro::current->{desc} = "runtime saver";
3076 my $t = Event::time - $t; 3625 write_runtime
3077 3626 or warn "ERROR: unable to write runtime file: $!";
3078 #next unless $t < 0.0013;#d#
3079 if ($t < $min) {
3080 $min = $t;
3081 }
3082 $avg = $avg * 0.99 + $t * 0.01;
3083 }
3084 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3085 exit 0;
3086 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3087 }; 3627 };
3628 }
3088 3629
3089 $RUNTIME += $TICK;
3090 $NEXT_TICK += $TICK;
3091
3092 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3093 $NEXT_RUNTIME_WRITE = $NOW + 10;
3094 Coro::async_pool {
3095 write_runtime
3096 or warn "ERROR: unable to write runtime file: $!";
3097 };
3098 }
3099
3100# my $AFTER = Event::time;
3101# warn $AFTER - $NOW;#d#
3102
3103 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3630 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3104 $sig->send; 3631 $sig->send;
3105 } 3632 }
3106 while (my $sig = shift @WAIT_FOR_TICK) { 3633 while (my $sig = shift @WAIT_FOR_TICK) {
3107 $sig->send; 3634 $sig->send;
3108 } 3635 }
3109 3636
3110 $NOW = Event::time;
3111
3112 # if we are delayed by four ticks or more, skip them all
3113 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3114
3115 $TICK_WATCHER->at ($NEXT_TICK);
3116 $TICK_WATCHER->start;
3117
3118 $LOAD = ($NOW - $tick_start) / $TICK; 3637 $LOAD = ($NOW - $tick_start) / $TICK;
3119 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3638 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3120 3639
3121 _post_tick; 3640 _post_tick;
3122 3641};
3123 3642$TICK_WATCHER->priority (EV::MAXPRI);
3124 },
3125);
3126 3643
3127{ 3644{
3128 BDB::max_poll_time $TICK * 0.1; 3645 # configure BDB
3129 $BDB_POLL_WATCHER = Event->io ( 3646
3130 reentrant => 0,
3131 fd => BDB::poll_fileno,
3132 poll => 'r',
3133 prio => 0,
3134 data => WF_AUTOCANCEL,
3135 cb => \&BDB::poll_cb,
3136 );
3137 BDB::min_parallel 8; 3647 BDB::min_parallel 8;
3138 3648 BDB::max_poll_reqs $TICK * 0.1;
3139 BDB::set_sync_prepare { 3649 $Coro::BDB::WATCHER->priority (1);
3140 my $status;
3141 my $current = $Coro::current;
3142 (
3143 sub {
3144 $status = $!;
3145 $current->ready; undef $current;
3146 },
3147 sub {
3148 Coro::schedule while defined $current;
3149 $! = $status;
3150 },
3151 )
3152 };
3153 3650
3154 unless ($DB_ENV) { 3651 unless ($DB_ENV) {
3155 $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);
3156 3657
3157 cf::sync_job { 3658 cf::sync_job {
3158 eval { 3659 eval {
3159 BDB::db_env_open 3660 BDB::db_env_open
3160 $DB_ENV, 3661 $DB_ENV,
3162 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
3163 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3664 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3164 0666; 3665 0666;
3165 3666
3166 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3667 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3167
3168 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3169 $DB_ENV->set_lk_detect;
3170 }; 3668 };
3171 3669
3172 cf::cleanup "db_env_open(db): $@" if $@; 3670 cf::cleanup "db_env_open(db): $@" if $@;
3173 }; 3671 };
3174 } 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 };
3175} 3683}
3176 3684
3177{ 3685{
3686 # configure IO::AIO
3687
3178 IO::AIO::min_parallel 8; 3688 IO::AIO::min_parallel 8;
3179
3180 undef $Coro::AIO::WATCHER;
3181 IO::AIO::max_poll_time $TICK * 0.1; 3689 IO::AIO::max_poll_time $TICK * 0.1;
3182 $AIO_POLL_WATCHER = Event->io ( 3690 $Coro::AIO::WATCHER->priority (1);
3183 reentrant => 0,
3184 data => WF_AUTOCANCEL,
3185 fd => IO::AIO::poll_fileno,
3186 poll => 'r',
3187 prio => 6,
3188 cb => \&IO::AIO::poll_cb,
3189 );
3190} 3691}
3191 3692
3192my $_log_backtrace; 3693my $_log_backtrace;
3193 3694
3194sub _log_backtrace { 3695sub _log_backtrace {
3198 3699
3199 # limit the # of concurrent backtraces 3700 # limit the # of concurrent backtraces
3200 if ($_log_backtrace < 2) { 3701 if ($_log_backtrace < 2) {
3201 ++$_log_backtrace; 3702 ++$_log_backtrace;
3202 async { 3703 async {
3704 $Coro::current->{desc} = "abt $msg";
3705
3203 my @bt = fork_call { 3706 my @bt = fork_call {
3204 @addr = map { sprintf "%x", $_ } @addr; 3707 @addr = map { sprintf "%x", $_ } @addr;
3205 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3708 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3206 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 |"
3207 or die "addr2line: $!"; 3710 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines