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.283 by root, Sun Jun 24 04:09:29 2007 UTC vs.
Revision 1.397 by root, Mon Nov 19 15:47:14 2007 UTC

4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable; 9use EV;
10use Event;
11use Opcode; 10use Opcode;
12use Safe; 11use Safe;
13use Safe::Hole; 12use Safe::Hole;
13use Storable ();
14 14
15use Coro 3.61 (); 15use Coro 4.1 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::EV;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
26use JSON::XS ();
25use BDB (); 27use BDB ();
26use Data::Dumper; 28use Data::Dumper;
27use Digest::MD5; 29use Digest::MD5;
28use Fcntl; 30use Fcntl;
29use YAML::Syck (); 31use YAML::Syck ();
30use IO::AIO 2.32 (); 32use IO::AIO 2.51 ();
31use Time::HiRes; 33use Time::HiRes;
32use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
33 36
34# configure various modules to our taste 37# configure various modules to our taste
35# 38#
36$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39 42
40$Event::Eval = 1; # no idea why this is required, but it is
41
42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
43$YAML::Syck::ImplicitUnicode = 1; 44$YAML::Syck::ImplicitUnicode = 1;
44 45
45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46 47
49our %COMMAND = (); 50our %COMMAND = ();
50our %COMMAND_TIME = (); 51our %COMMAND_TIME = ();
51 52
52our @EXTS = (); # list of extension package names 53our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 54our %EXTCMD = ();
55our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 56our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 57our %EXT_MAP = (); # pluggable maps
56 58
57our $RELOAD; # number of reloads so far 59our $RELOAD; # number of reloads so far
58our @EVENT; 60our @EVENT;
76our $NEXT_TICK; 78our $NEXT_TICK;
77our $NOW; 79our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 80our $USE_FSYNC = 1; # use fsync to write maps - default off
79 81
80our $BDB_POLL_WATCHER; 82our $BDB_POLL_WATCHER;
83our $BDB_DEADLOCK_WATCHER;
84our $BDB_CHECKPOINT_WATCHER;
85our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 86our $DB_ENV;
82 87
83our %CFG; 88our %CFG;
84 89
85our $UPTIME; $UPTIME ||= time; 90our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 91our $RUNTIME;
87 92
88our %PLAYER; # all users 93our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 94our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 95our $LINK_MAP; # the special {link} map, which is always available
91 96
92# used to convert map paths into valid unix filenames by replacing / by ∕ 97# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 98our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 99
155 160
156The raw value load value from the last tick. 161The raw value load value from the last tick.
157 162
158=item %cf::CFG 163=item %cf::CFG
159 164
160Configuration for the server, loaded from C</etc/crossfire/config>, or 165Configuration for the server, loaded from C</etc/deliantra-server/config>, or
161from wherever your confdir points to. 166from wherever your confdir points to.
162 167
163=item cf::wait_for_tick, cf::wait_for_tick_begin 168=item cf::wait_for_tick, cf::wait_for_tick_begin
164 169
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 170These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
166returns directly I<after> the tick processing (and consequently, can only wake one process 171returns directly I<after> the tick processing (and consequently, can only wake one process
167per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 172per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168 173
174=item @cf::INVOKE_RESULTS
175
176This array contains the results of the last C<invoke ()> call. When
177C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
178that call.
179
169=back 180=back
170 181
171=cut 182=cut
172 183
173BEGIN { 184BEGIN {
177 $msg .= "\n" 188 $msg .= "\n"
178 unless $msg =~ /\n$/; 189 unless $msg =~ /\n$/;
179 190
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 191 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181 192
182 utf8::encode $msg;
183 LOG llevError, $msg; 193 LOG llevError, $msg;
184 }; 194 };
185} 195}
186 196
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
203)) { 213)) {
204 no strict 'refs'; 214 no strict 'refs';
205 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
206} 216}
207 217
208$Event::DIED = sub { 218$EV::DIED = sub {
209 warn "error in event callback: @_"; 219 warn "error in event callback: @_";
210}; 220};
211 221
212############################################################################# 222#############################################################################
213 223
236 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
237 $d 247 $d
238 } || "[unable to dump $_[0]: '$@']"; 248 } || "[unable to dump $_[0]: '$@']";
239} 249}
240 250
241use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
242
243=item $ref = cf::from_json $json 251=item $ref = cf::from_json $json
244 252
245Converts a JSON string into the corresponding perl data structure. 253Converts a JSON string into the corresponding perl data structure.
246 254
247=item $json = cf::to_json $ref 255=item $json = cf::to_json $ref
248 256
249Converts a perl data structure into its JSON representation. 257Converts a perl data structure into its JSON representation.
258
259=cut
260
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262
263sub to_json ($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) }
250 265
251=item cf::lock_wait $string 266=item cf::lock_wait $string
252 267
253Wait until the given lock is available. See cf::lock_acquire. 268Wait until the given lock is available. See cf::lock_acquire.
254 269
257Wait until the given lock is available and then acquires it and returns 272Wait until the given lock is available and then acquires it and returns
258a Coro::guard object. If the guard object gets destroyed (goes out of scope, 273a Coro::guard object. If the guard object gets destroyed (goes out of scope,
259for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
260returned. 275returned.
261 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
262Lock names should begin with a unique identifier (for example, cf::map::find 280Lock names should begin with a unique identifier (for example, cf::map::find
263uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
264 282
265=item $locked = cf::lock_active $string 283=item $locked = cf::lock_active $string
266 284
267Return true if the lock is currently active, i.e. somebody has locked it. 285Return true if the lock is currently active, i.e. somebody has locked it.
268 286
269=cut 287=cut
270 288
271our %LOCK; 289our %LOCK;
290our %LOCKER;#d#
272 291
273sub lock_wait($) { 292sub lock_wait($) {
274 my ($key) = @_; 293 my ($key) = @_;
294
295 if ($LOCKER{$key} == $Coro::current) {#d#
296 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
297 return;#d#
298 }#d#
275 299
276 # wait for lock, if any 300 # wait for lock, if any
277 while ($LOCK{$key}) { 301 while ($LOCK{$key}) {
278 push @{ $LOCK{$key} }, $Coro::current; 302 push @{ $LOCK{$key} }, $Coro::current;
279 Coro::schedule; 303 Coro::schedule;
285 309
286 # wait, to be sure we are not locked 310 # wait, to be sure we are not locked
287 lock_wait $key; 311 lock_wait $key;
288 312
289 $LOCK{$key} = []; 313 $LOCK{$key} = [];
314 $LOCKER{$key} = $Coro::current;#d#
290 315
291 Coro::guard { 316 Coro::guard {
317 delete $LOCKER{$key};#d#
292 # wake up all waiters, to be on the safe side 318 # wake up all waiters, to be on the safe side
293 $_->ready for @{ delete $LOCK{$key} }; 319 $_->ready for @{ delete $LOCK{$key} };
294 } 320 }
295} 321}
296 322
308 }; 334 };
309 $TICK_WATCHER->stop; 335 $TICK_WATCHER->stop;
310 $guard 336 $guard
311} 337}
312 338
339=item cf::periodic $interval, $cb
340
341Like EV::periodic, but randomly selects a starting point so that the actions
342get spread over timer.
343
344=cut
345
346sub periodic($$) {
347 my ($interval, $cb) = @_;
348
349 my $start = rand List::Util::min 180, $interval;
350
351 EV::periodic $start, $interval, 0, $cb
352}
353
354=item cf::get_slot $time[, $priority[, $name]]
355
356Allocate $time seconds of blocking CPU time at priority C<$priority>:
357This call blocks and returns only when you have at least C<$time> seconds
358of cpu time till the next tick. The slot is only valid till the next cede.
359
360The optional C<$name> can be used to identify the job to run. It might be
361used for statistical purposes and should identify the same time-class.
362
363Useful for short background jobs.
364
365=cut
366
367our @SLOT_QUEUE;
368our $SLOT_QUEUE;
369
370$SLOT_QUEUE->cancel if $SLOT_QUEUE;
371$SLOT_QUEUE = Coro::async {
372 $Coro::current->desc ("timeslot manager");
373
374 my $signal = new Coro::Signal;
375
376 while () {
377 next_job:
378 my $avail = cf::till_tick;
379 if ($avail > 0.01) {
380 for (0 .. $#SLOT_QUEUE) {
381 if ($SLOT_QUEUE[$_][0] < $avail) {
382 my $job = splice @SLOT_QUEUE, $_, 1, ();
383 $job->[2]->send;
384 Coro::cede;
385 goto next_job;
386 }
387 }
388 }
389
390 if (@SLOT_QUEUE) {
391 # we do not use wait_for_tick() as it returns immediately when tick is inactive
392 push @cf::WAIT_FOR_TICK, $signal;
393 $signal->wait;
394 } else {
395 Coro::schedule;
396 }
397 }
398};
399
400sub get_slot($;$$) {
401 my ($time, $pri, $name) = @_;
402
403 $time = $TICK * .6 if $time > $TICK * .6;
404 my $sig = new Coro::Signal;
405
406 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
407 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
408 $SLOT_QUEUE->ready;
409 $sig->wait;
410}
411
313=item cf::async { BLOCK } 412=item cf::async { BLOCK }
314 413
315Currently the same as Coro::async_pool, meaning you cannot use 414Currently the same as Coro::async_pool, meaning you cannot use
316C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 415C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
317thing you are allowed to do is call C<prio> on it. 416thing you are allowed to do is call C<prio> on it.
320 419
321BEGIN { *async = \&Coro::async_pool } 420BEGIN { *async = \&Coro::async_pool }
322 421
323=item cf::sync_job { BLOCK } 422=item cf::sync_job { BLOCK }
324 423
325The design of Crossfire TRT requires that the main coroutine ($Coro::main) 424The design of Deliantra requires that the main coroutine ($Coro::main)
326is always able to handle events or runnable, as Crossfire TRT is only 425is always able to handle events or runnable, as Deliantra is only
327partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 426partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
328acceptable. 427acceptable.
329 428
330If it must be done, put the blocking parts into C<sync_job>. This will run 429If it must be done, put the blocking parts into C<sync_job>. This will run
331the given BLOCK in another coroutine while waiting for the result. The 430the given BLOCK in another coroutine while waiting for the result. The
336 435
337sub sync_job(&) { 436sub sync_job(&) {
338 my ($job) = @_; 437 my ($job) = @_;
339 438
340 if ($Coro::current == $Coro::main) { 439 if ($Coro::current == $Coro::main) {
341 my $time = Event::time; 440 my $time = EV::time;
342 441
343 # this is the main coro, too bad, we have to block 442 # this is the main coro, too bad, we have to block
344 # till the operation succeeds, freezing the server :/ 443 # till the operation succeeds, freezing the server :/
345 444
445 LOG llevError, Carp::longmess "sync job";#d#
446
346 # TODO: use suspend/resume instead 447 # TODO: use suspend/resume instead
347 # (but this is cancel-safe) 448 # (but this is cancel-safe)
348 my $freeze_guard = freeze_mainloop; 449 my $freeze_guard = freeze_mainloop;
349 450
350 my $busy = 1; 451 my $busy = 1;
351 my @res; 452 my @res;
352 453
353 (async { 454 (async {
455 $Coro::current->desc ("sync job coro");
354 @res = eval { $job->() }; 456 @res = eval { $job->() };
355 warn $@ if $@; 457 warn $@ if $@;
356 undef $busy; 458 undef $busy;
357 })->prio (Coro::PRIO_MAX); 459 })->prio (Coro::PRIO_MAX);
358 460
359 while ($busy) { 461 while ($busy) {
360 Coro::cede or Event::one_event; 462 if (Coro::nready) {
463 Coro::cede_notself;
464 } else {
465 EV::loop EV::LOOP_ONESHOT;
361 } 466 }
467 }
362 468
363 $time = Event::time - $time; 469 $time = EV::time - $time;
364 470
365 LOG llevError | logBacktrace, Carp::longmess "long sync job" 471 LOG llevError | logBacktrace, Carp::longmess "long sync job"
366 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 472 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
367 473
368 $tick_start += $time; # do not account sync jobs to server load 474 $tick_start += $time; # do not account sync jobs to server load
398=item fork_call { }, $args 504=item fork_call { }, $args
399 505
400Executes the given code block with the given arguments in a seperate 506Executes the given code block with the given arguments in a seperate
401process, returning the results. Everything must be serialisable with 507process, returning the results. Everything must be serialisable with
402Coro::Storable. May, of course, block. Note that the executed sub may 508Coro::Storable. May, of course, block. Note that the executed sub may
403never block itself or use any form of Event handling. 509never block itself or use any form of event handling.
404 510
405=cut 511=cut
406 512
407sub fork_call(&@) { 513sub fork_call(&@) {
408 my ($cb, @args) = @_; 514 my ($cb, @args) = @_;
409 515
410# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 516 # we seemingly have to make a local copy of the whole thing,
411# or die "socketpair: $!"; 517 # otherwise perl prematurely frees the stuff :/
412 pipe my $fh1, my $fh2 518 # TODO: investigate and fix (likely this will be rather laborious)
413 or die "pipe: $!";
414 519
415 if (my $pid = fork) { 520 my @res = Coro::Util::fork_eval {
416 close $fh2;
417
418 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
419 $res = Coro::Storable::thaw $res;
420
421 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
422
423 die $$res unless "ARRAY" eq ref $res;
424
425 return wantarray ? @$res : $res->[-1];
426 } else {
427 reset_signals; 521 reset_signals;
428 local $SIG{__WARN__}; 522 &$cb
429 local $SIG{__DIE__}; 523 }, @args;
430 eval {
431 close $fh1;
432 524
433 my @res = eval { $cb->(@args) }; 525 wantarray ? @res : $res[-1]
434 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
435 };
436
437 warn $@ if $@;
438 _exit 0;
439 }
440} 526}
441 527
442=item $value = cf::db_get $family => $key 528=item $value = cf::db_get $family => $key
443 529
444Returns a single value from the environment database. 530Returns a single value from the environment database.
446=item cf::db_put $family => $key => $value 532=item cf::db_put $family => $key => $value
447 533
448Stores the given C<$value> in the family. It can currently store binary 534Stores the given C<$value> in the family. It can currently store binary
449data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 535data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
450 536
537=item $db = cf::db_table "name"
538
539Create and/or open a new database table. The string must not be "db" and must be unique
540within each server.
541
451=cut 542=cut
543
544sub db_table($) {
545 my ($name) = @_;
546 my $db = BDB::db_create $DB_ENV;
547
548 eval {
549 $db->set_flags (BDB::CHKSUM);
550
551 utf8::encode $name;
552 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
553 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
554 cf::cleanup "db_open(db): $!" if $!;
555 };
556 cf::cleanup "db_open(db): $@" if $@;
557
558 $db
559}
452 560
453our $DB; 561our $DB;
454 562
455sub db_init { 563sub db_init {
456 unless ($DB) {
457 $DB = BDB::db_create $DB_ENV;
458
459 cf::sync_job { 564 cf::sync_job {
460 eval { 565 $DB ||= db_table "db";
461 $DB->set_flags (BDB::CHKSUM);
462
463 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
464 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
465 cf::cleanup "db_open(db): $!" if $!;
466 };
467 cf::cleanup "db_open(db): $@" if $@;
468 };
469 } 566 };
470} 567}
471 568
472sub db_get($$) { 569sub db_get($$) {
473 my $key = "$_[0]/$_[1]"; 570 my $key = "$_[0]/$_[1]";
474 571
524 if (1) { 621 if (1) {
525 $md5 = 622 $md5 =
526 join "\x00", 623 join "\x00",
527 $processversion, 624 $processversion,
528 map { 625 map {
529 Coro::cede; 626 cf::cede_to_tick;
530 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 627 ($src->[$_], Digest::MD5::md5_hex $data[$_])
531 } 0.. $#$src; 628 } 0.. $#$src;
532 629
533 630
534 my $dbmd5 = db_get cache => "$id/md5"; 631 my $dbmd5 = db_get cache => "$id/md5";
578attach callbacks/event handlers (a collection of which is called an "attachment") 675attach callbacks/event handlers (a collection of which is called an "attachment")
579to it. All such attachable objects support the following methods. 676to it. All such attachable objects support the following methods.
580 677
581In the following description, CLASS can be any of C<global>, C<object> 678In the following description, CLASS can be any of C<global>, C<object>
582C<player>, C<client> or C<map> (i.e. the attachable objects in 679C<player>, C<client> or C<map> (i.e. the attachable objects in
583Crossfire TRT). 680Deliantra).
584 681
585=over 4 682=over 4
586 683
587=item $attachable->attach ($attachment, key => $value...) 684=item $attachable->attach ($attachment, key => $value...)
588 685
840 "; 937 ";
841 die if $@; 938 die if $@;
842} 939}
843 940
844our $override; 941our $override;
845our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 942our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
846 943
847sub override { 944sub override {
848 $override = 1; 945 $override = 1;
849 @invoke_results = (); 946 @INVOKE_RESULTS = (@_);
850} 947}
851 948
852sub do_invoke { 949sub do_invoke {
853 my $event = shift; 950 my $event = shift;
854 my $callbacks = shift; 951 my $callbacks = shift;
855 952
856 @invoke_results = (); 953 @INVOKE_RESULTS = ();
857 954
858 local $override; 955 local $override;
859 956
860 for (@$callbacks) { 957 for (@$callbacks) {
861 eval { &{$_->[1]} }; 958 eval { &{$_->[1]} };
878 975
879Generate an object-specific event with the given arguments. 976Generate an object-specific event with the given arguments.
880 977
881This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 978This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
882removed in future versions), and there is no public API to access override 979removed in future versions), and there is no public API to access override
883results (if you must, access C<@cf::invoke_results> directly). 980results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884 981
885=back 982=back
886 983
887=cut 984=cut
888 985
889############################################################################# 986#############################################################################
890# object support 987# object support
988
989sub _object_equal($$);
990sub _object_equal($$) {
991 my ($a, $b) = @_;
992
993 return 0 unless (ref $a) eq (ref $b);
994
995 if ("HASH" eq ref $a) {
996 my @ka = keys %$a;
997 my @kb = keys %$b;
998
999 return 0 if @ka != @kb;
1000
1001 for (0 .. $#ka) {
1002 return 0 unless $ka[$_] eq $kb[$_];
1003 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1004 }
1005
1006 } elsif ("ARRAY" eq ref $a) {
1007
1008 return 0 if @$a != @$b;
1009
1010 for (0 .. $#$a) {
1011 return 0 unless _object_equal $a->[$_], $b->[$_];
1012 }
1013
1014 } elsif ($a ne $b) {
1015 return 0;
1016 }
1017
1018 1
1019}
1020
1021our $SLOW_MERGES;#d#
1022sub _can_merge {
1023 my ($ob1, $ob2) = @_;
1024
1025 ++$SLOW_MERGES;#d#
1026
1027 # we do the slow way here
1028 return _object_equal $ob1, $ob2
1029}
891 1030
892sub reattach { 1031sub reattach {
893 # basically do the same as instantiate, without calling instantiate 1032 # basically do the same as instantiate, without calling instantiate
894 my ($obj) = @_; 1033 my ($obj) = @_;
895 1034
942sub object_freezer_save { 1081sub object_freezer_save {
943 my ($filename, $rdata, $objs) = @_; 1082 my ($filename, $rdata, $objs) = @_;
944 1083
945 sync_job { 1084 sync_job {
946 if (length $$rdata) { 1085 if (length $$rdata) {
1086 utf8::decode (my $decname = $filename);
947 warn sprintf "saving %s (%d,%d)\n", 1087 warn sprintf "saving %s (%d,%d)\n",
948 $filename, length $$rdata, scalar @$objs; 1088 $decname, length $$rdata, scalar @$objs;
949 1089
950 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1090 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
951 chmod SAVE_MODE, $fh; 1091 chmod SAVE_MODE, $fh;
952 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1092 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
953 aio_fsync $fh if $cf::USE_FSYNC; 1093 aio_fsync $fh if $cf::USE_FSYNC;
954 close $fh; 1094 close $fh;
955 1095
956 if (@$objs) { 1096 if (@$objs) {
957 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1097 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
958 chmod SAVE_MODE, $fh; 1098 chmod SAVE_MODE, $fh;
959 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1099 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
960 aio_write $fh, 0, (length $data), $data, 0; 1100 aio_write $fh, 0, (length $data), $data, 0;
961 aio_fsync $fh if $cf::USE_FSYNC; 1101 aio_fsync $fh if $cf::USE_FSYNC;
962 close $fh; 1102 close $fh;
963 aio_rename "$filename.pst~", "$filename.pst"; 1103 aio_rename "$filename.pst~", "$filename.pst";
964 } 1104 }
972 } 1112 }
973 } else { 1113 } else {
974 aio_unlink $filename; 1114 aio_unlink $filename;
975 aio_unlink "$filename.pst"; 1115 aio_unlink "$filename.pst";
976 } 1116 }
977 } 1117 };
978} 1118}
979 1119
980sub object_freezer_as_string { 1120sub object_freezer_as_string {
981 my ($rdata, $objs) = @_; 1121 my ($rdata, $objs) = @_;
982 1122
994 or return; 1134 or return;
995 1135
996 unless (aio_stat "$filename.pst") { 1136 unless (aio_stat "$filename.pst") {
997 (aio_load "$filename.pst", $av) >= 0 1137 (aio_load "$filename.pst", $av) >= 0
998 or return; 1138 or return;
1139
999 $av = eval { (Storable::thaw $av)->{objs} }; 1140 my $st = eval { Coro::Storable::thaw $av };
1141 $av = $st->{objs};
1000 } 1142 }
1001 1143
1144 utf8::decode (my $decname = $filename);
1002 warn sprintf "loading %s (%d)\n", 1145 warn sprintf "loading %s (%d,%d)\n",
1003 $filename, length $data, scalar @{$av || []}; 1146 $decname, length $data, scalar @{$av || []};
1147
1004 return ($data, $av); 1148 ($data, $av)
1005} 1149}
1006 1150
1007=head2 COMMAND CALLBACKS 1151=head2 COMMAND CALLBACKS
1008 1152
1009=over 4 1153=over 4
1029 push @{ $COMMAND{$name} }, [$caller, $cb]; 1173 push @{ $COMMAND{$name} }, [$caller, $cb];
1030} 1174}
1031 1175
1032=item cf::register_extcmd $name => \&callback($pl,$packet); 1176=item cf::register_extcmd $name => \&callback($pl,$packet);
1033 1177
1034Register a callback fro execution when the client sends an extcmd packet. 1178Register a callback for execution when the client sends an (synchronous)
1179extcmd packet. Ext commands will be processed in the order they are
1180received by the server, like other user commands. The first argument is
1181the logged-in player. Ext commands can only be processed after a player
1182has logged in successfully.
1035 1183
1036If the callback returns something, it is sent back as if reply was being 1184If the callback returns something, it is sent back as if reply was being
1037called. 1185called.
1038 1186
1187=item cf::register_exticmd $name => \&callback($ns,$packet);
1188
1189Register a callback for execution when the client sends an (asynchronous)
1190exticmd packet. Exti commands are processed by the server as soon as they
1191are received, i.e. out of order w.r.t. other commands. The first argument
1192is a client socket. Exti commands can be received anytime, even before
1193log-in.
1194
1195If the callback returns something, it is sent back as if reply was being
1196called.
1197
1039=cut 1198=cut
1040 1199
1041sub register_extcmd { 1200sub register_extcmd {
1042 my ($name, $cb) = @_; 1201 my ($name, $cb) = @_;
1043 1202
1044 $EXTCMD{$name} = $cb; 1203 $EXTCMD{$name} = $cb;
1204}
1205
1206sub register_exticmd {
1207 my ($name, $cb) = @_;
1208
1209 $EXTICMD{$name} = $cb;
1045} 1210}
1046 1211
1047cf::player->attach ( 1212cf::player->attach (
1048 on_command => sub { 1213 on_command => sub {
1049 my ($pl, $name, $params) = @_; 1214 my ($pl, $name, $params) = @_;
1058 cf::override; 1223 cf::override;
1059 }, 1224 },
1060 on_extcmd => sub { 1225 on_extcmd => sub {
1061 my ($pl, $buf) = @_; 1226 my ($pl, $buf) = @_;
1062 1227
1063 my $msg = eval { from_json $buf }; 1228 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064 1229
1065 if (ref $msg) { 1230 if (ref $msg) {
1231 my ($type, $reply, @payload) =
1232 "ARRAY" eq ref $msg
1233 ? @$msg
1234 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1235
1236 my @reply;
1237
1066 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1238 if (my $cb = $EXTCMD{$type}) {
1067 if (my %reply = $cb->($pl, $msg)) { 1239 @reply = $cb->($pl, @payload);
1068 $pl->ext_reply ($msg->{msgid}, %reply);
1069 }
1070 } 1240 }
1241
1242 $pl->ext_reply ($reply, @reply)
1243 if $reply;
1244
1071 } else { 1245 } else {
1072 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1246 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1073 } 1247 }
1074 1248
1075 cf::override; 1249 cf::override;
1165 1339
1166=head3 cf::player 1340=head3 cf::player
1167 1341
1168=over 4 1342=over 4
1169 1343
1344=item cf::player::num_playing
1345
1346Returns the official number of playing players, as per the Crossfire metaserver rules.
1347
1348=cut
1349
1350sub num_playing {
1351 scalar grep
1352 $_->ob->map
1353 && !$_->hidden
1354 && !$_->ob->flag (cf::FLAG_WIZ),
1355 cf::player::list
1356}
1357
1170=item cf::player::find $login 1358=item cf::player::find $login
1171 1359
1172Returns the given player object, loading it if necessary (might block). 1360Returns the given player object, loading it if necessary (might block).
1173 1361
1174=cut 1362=cut
1209 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1397 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1210 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1398 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1211 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1399 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1212 aio_unlink +(playerdir $login) . "/$login.pl"; 1400 aio_unlink +(playerdir $login) . "/$login.pl";
1213 1401
1214 my $pl = load_pl path $login 1402 my $f = new_from_file cf::object::thawer path $login
1215 or return; 1403 or return;
1404
1405 my $pl = cf::player::load_pl $f
1406 or return;
1407 local $cf::PLAYER_LOADING{$login} = $pl;
1408 $f->resolve_delayed_derefs;
1216 $cf::PLAYER{$login} = $pl 1409 $cf::PLAYER{$login} = $pl
1217 } 1410 }
1218 } 1411 }
1219} 1412}
1220 1413
1230 1423
1231 aio_mkdir playerdir $pl, 0770; 1424 aio_mkdir playerdir $pl, 0770;
1232 $pl->{last_save} = $cf::RUNTIME; 1425 $pl->{last_save} = $cf::RUNTIME;
1233 1426
1234 $pl->save_pl ($path); 1427 $pl->save_pl ($path);
1235 Coro::cede; 1428 cf::cede_to_tick;
1236} 1429}
1237 1430
1238sub new($) { 1431sub new($) {
1239 my ($login) = @_; 1432 my ($login) = @_;
1240 1433
1244 $self->{deny_save} = 1; 1437 $self->{deny_save} = 1;
1245 1438
1246 $cf::PLAYER{$login} = $self; 1439 $cf::PLAYER{$login} = $self;
1247 1440
1248 $self 1441 $self
1442}
1443
1444=item $player->send_msg ($channel, $msg, $color, [extra...])
1445
1446=cut
1447
1448sub send_msg {
1449 my $ns = shift->ns
1450 or return;
1451 $ns->send_msg (@_);
1249} 1452}
1250 1453
1251=item $pl->quit_character 1454=item $pl->quit_character
1252 1455
1253Nukes the player without looking back. If logged in, the connection will 1456Nukes the player without looking back. If logged in, the connection will
1308 or return []; 1511 or return [];
1309 1512
1310 my @logins; 1513 my @logins;
1311 1514
1312 for my $login (@$dirs) { 1515 for my $login (@$dirs) {
1516 my $path = path $login;
1517
1518 # a .pst is a dead give-away for a valid player
1519 unless (-e "$path.pst") {
1313 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1520 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1314 aio_read $fh, 0, 512, my $buf, 0 or next; 1521 aio_read $fh, 0, 512, my $buf, 0 or next;
1315 $buf !~ /^password -------------$/m or next; # official not-valid tag 1522 $buf !~ /^password -------------$/m or next; # official not-valid tag
1523 }
1316 1524
1317 utf8::decode $login; 1525 utf8::decode $login;
1318 push @logins, $login; 1526 push @logins, $login;
1319 } 1527 }
1320 1528
1353 1561
1354Expand crossfire pod fragments into protocol xml. 1562Expand crossfire pod fragments into protocol xml.
1355 1563
1356=cut 1564=cut
1357 1565
1566use re 'eval';
1567
1568my $group;
1569my $interior; $interior = qr{
1570 # match a pod interior sequence sans C<< >>
1571 (?:
1572 \ (.*?)\ (?{ $group = $^N })
1573 | < (??{$interior}) >
1574 )
1575}x;
1576
1358sub expand_cfpod { 1577sub expand_cfpod {
1359 ((my $self), (local $_)) = @_; 1578 my ($self, $pod) = @_;
1360 1579
1361 # escape & and < 1580 my $xml;
1362 s/&/&amp;/g;
1363 s/(?<![BIUGH])</&lt;/g;
1364 1581
1365 # this is buggy, it needs to properly take care of nested <'s 1582 while () {
1583 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1584 $group = $1;
1366 1585
1367 1 while 1586 $group =~ s/&/&amp;/g;
1368 # replace B<>, I<>, U<> etc. 1587 $group =~ s/</&lt;/g;
1369 s/B<([^\>]*)>/<b>$1<\/b>/ 1588
1370 || s/I<([^\>]*)>/<i>$1<\/i>/ 1589 $xml .= $group;
1371 || s/U<([^\>]*)>/<u>$1<\/u>/ 1590 } elsif ($pod =~ m%\G
1372 # replace G<male|female> tags 1591 ([BCGHITU])
1373 || s{G<([^>|]*)\|([^>]*)>}{ 1592 <
1374 $self->gender ? $2 : $1 1593 (?:
1594 ([^<>]*) (?{ $group = $^N })
1595 | < $interior >
1596 )
1597 >
1598 %gcsx
1599 ) {
1600 my ($code, $data) = ($1, $group);
1601
1602 if ($code eq "B") {
1603 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1604 } elsif ($code eq "I") {
1605 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1606 } elsif ($code eq "U") {
1607 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1608 } elsif ($code eq "C") {
1609 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1610 } elsif ($code eq "T") {
1611 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1612 } elsif ($code eq "G") {
1613 my ($male, $female) = split /\|/, $data;
1614 $data = $self->gender ? $female : $male;
1615 $xml .= expand_cfpod ($self, $data);
1616 } elsif ($code eq "H") {
1617 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1618 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1619 "")
1620 [$self->{hintmode}];
1621 } else {
1622 $xml .= "error processing '$code($data)' directive";
1623 }
1624 } else {
1625 if ($pod =~ /\G(.+)/) {
1626 warn "parse error while expanding $pod (at $1)";
1627 }
1628 last;
1375 }ge 1629 }
1376 # replace H<hint text> 1630 }
1377 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;
1378 1631
1632 for ($xml) {
1379 # create single paragraphs (very hackish) 1633 # create single paragraphs (very hackish)
1380 s/(?<=\S)\n(?=\w)/ /g; 1634 s/(?<=\S)\n(?=\w)/ /g;
1381 1635
1382 $_ 1636 # compress some whitespace
1383} 1637 s/\s+\n/\n/g; # ws line-ends
1638 s/\n\n+/\n/g; # double lines
1639 s/^\n+//; # beginning lines
1640 s/\n+$//; # ending lines
1641 }
1384 1642
1643 $xml
1644}
1645
1646no re 'eval';
1647
1648sub hintmode {
1649 $_[0]{hintmode} = $_[1] if @_ > 1;
1650 $_[0]{hintmode}
1651}
1652
1385=item $player->ext_reply ($msgid, %msg) 1653=item $player->ext_reply ($msgid, @msg)
1386 1654
1387Sends an ext reply to the player. 1655Sends an ext reply to the player.
1388 1656
1389=cut 1657=cut
1390 1658
1391sub ext_reply($$%) { 1659sub ext_reply($$@) {
1392 my ($self, $id, %msg) = @_; 1660 my ($self, $id, @msg) = @_;
1393 1661
1394 $msg{msgid} = $id; 1662 $self->ns->ext_reply ($id, @msg)
1395
1396 $self->send ("ext " . cf::to_json \%msg);
1397} 1663}
1398 1664
1399=item $player->ext_event ($type, %msg) 1665=item $player->ext_msg ($type, @msg)
1400 1666
1401Sends an ext event to the client. 1667Sends an ext event to the client.
1402 1668
1403=cut 1669=cut
1404 1670
1405sub ext_event($$%) { 1671sub ext_msg($$@) {
1406 my ($self, $type, %msg) = @_; 1672 my ($self, $type, @msg) = @_;
1407 1673
1408 $self->ns->ext_event ($type, %msg); 1674 $self->ns->ext_msg ($type, @msg);
1409} 1675}
1410 1676
1411=head3 cf::region 1677=head3 cf::region
1412 1678
1413=over 4 1679=over 4
1426 my ($path) = @_; 1692 my ($path) = @_;
1427 1693
1428 my ($match, $specificity); 1694 my ($match, $specificity);
1429 1695
1430 for my $region (list) { 1696 for my $region (list) {
1431 if ($region->match && $path =~ $region->match) { 1697 if ($region->{match} && $path =~ $region->{match}) {
1432 ($match, $specificity) = ($region, $region->specificity) 1698 ($match, $specificity) = ($region, $region->specificity)
1433 if $region->specificity > $specificity; 1699 if $region->specificity > $specificity;
1434 } 1700 }
1435 } 1701 }
1436 1702
1556 $self->init; # pass $1 etc. 1822 $self->init; # pass $1 etc.
1557 return $self; 1823 return $self;
1558 } 1824 }
1559 } 1825 }
1560 1826
1561 Carp::carp "unable to resolve path '$path' (base '$base')."; 1827 Carp::cluck "unable to resolve path '$path' (base '$base').";
1562 () 1828 ()
1563} 1829}
1564 1830
1565sub init { 1831sub init {
1566 my ($self) = @_; 1832 my ($self) = @_;
1629 1895
1630sub load_header_from($) { 1896sub load_header_from($) {
1631 my ($self, $path) = @_; 1897 my ($self, $path) = @_;
1632 1898
1633 utf8::encode $path; 1899 utf8::encode $path;
1634 #aio_open $path, O_RDONLY, 0 1900 my $f = new_from_file cf::object::thawer $path
1635 # or return;
1636
1637 $self->_load_header ($path)
1638 or return; 1901 or return;
1902
1903 $self->_load_header ($f)
1904 or return;
1905
1906 local $MAP_LOADING{$self->{path}} = $self;
1907 $f->resolve_delayed_derefs;
1639 1908
1640 $self->{load_path} = $path; 1909 $self->{load_path} = $path;
1641 1910
1642 1 1911 1
1643} 1912}
1697sub find { 1966sub find {
1698 my ($path, $origin) = @_; 1967 my ($path, $origin) = @_;
1699 1968
1700 $path = normalise $path, $origin && $origin->path; 1969 $path = normalise $path, $origin && $origin->path;
1701 1970
1971 cf::lock_wait "map_data:$path";#d#remove
1702 cf::lock_wait "map_find:$path"; 1972 cf::lock_wait "map_find:$path";
1703 1973
1704 $cf::MAP{$path} || do { 1974 $cf::MAP{$path} || do {
1705 my $guard = cf::lock_acquire "map_find:$path"; 1975 my $guard1 = cf::lock_acquire "map_find:$path";
1976 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1977
1706 my $map = new_from_path cf::map $path 1978 my $map = new_from_path cf::map $path
1707 or return; 1979 or return;
1708 1980
1709 $map->{last_save} = $cf::RUNTIME; 1981 $map->{last_save} = $cf::RUNTIME;
1710 1982
1712 or return; 1984 or return;
1713 1985
1714 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1986 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1715 # doing this can freeze the server in a sync job, obviously 1987 # doing this can freeze the server in a sync job, obviously
1716 #$cf::WAIT_FOR_TICK->wait; 1988 #$cf::WAIT_FOR_TICK->wait;
1989 undef $guard1;
1990 undef $guard2;
1717 $map->reset; 1991 $map->reset;
1718 undef $guard;
1719 return find $path; 1992 return find $path;
1720 } 1993 }
1721 1994
1722 $cf::MAP{$path} = $map 1995 $cf::MAP{$path} = $map
1723 } 1996 }
1732 local $self->{deny_reset} = 1; # loading can take a long time 2005 local $self->{deny_reset} = 1; # loading can take a long time
1733 2006
1734 my $path = $self->{path}; 2007 my $path = $self->{path};
1735 2008
1736 { 2009 {
1737 my $guard = cf::lock_acquire "map_load:$path"; 2010 my $guard = cf::lock_acquire "map_data:$path";
1738 2011
2012 return unless $self->valid;
1739 return if $self->in_memory != cf::MAP_SWAPPED; 2013 return unless $self->in_memory == cf::MAP_SWAPPED;
1740 2014
1741 $self->in_memory (cf::MAP_LOADING); 2015 $self->in_memory (cf::MAP_LOADING);
1742 2016
1743 $self->alloc; 2017 $self->alloc;
1744 2018
1745 $self->pre_load; 2019 $self->pre_load;
1746 Coro::cede; 2020 cf::cede_to_tick;
1747 2021
2022 my $f = new_from_file cf::object::thawer $self->{load_path};
2023 $f->skip_block;
1748 $self->_load_objects ($self->{load_path}, 1) 2024 $self->_load_objects ($f)
1749 or return; 2025 or return;
1750 2026
1751 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2027 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1752 if delete $self->{load_original}; 2028 if delete $self->{load_original};
1753 2029
1754 if (my $uniq = $self->uniq_path) { 2030 if (my $uniq = $self->uniq_path) {
1755 utf8::encode $uniq; 2031 utf8::encode $uniq;
1756 if (aio_open $uniq, O_RDONLY, 0) { 2032 unless (aio_stat $uniq) {
2033 if (my $f = new_from_file cf::object::thawer $uniq) {
1757 $self->clear_unique_items; 2034 $self->clear_unique_items;
1758 $self->_load_objects ($uniq, 0); 2035 $self->_load_objects ($f);
2036 $f->resolve_delayed_derefs;
2037 }
1759 } 2038 }
1760 } 2039 }
1761 2040
1762 Coro::cede; 2041 $f->resolve_delayed_derefs;
2042
2043 cf::cede_to_tick;
1763 # now do the right thing for maps 2044 # now do the right thing for maps
1764 $self->link_multipart_objects; 2045 $self->link_multipart_objects;
1765 $self->difficulty ($self->estimate_difficulty) 2046 $self->difficulty ($self->estimate_difficulty)
1766 unless $self->difficulty; 2047 unless $self->difficulty;
1767 Coro::cede; 2048 cf::cede_to_tick;
1768 2049
1769 unless ($self->{deny_activate}) { 2050 unless ($self->{deny_activate}) {
1770 $self->decay_objects; 2051 $self->decay_objects;
1771 $self->fix_auto_apply; 2052 $self->fix_auto_apply;
1772 $self->update_buttons; 2053 $self->update_buttons;
1773 Coro::cede; 2054 cf::cede_to_tick;
1774 $self->set_darkness_map; 2055 $self->set_darkness_map;
1775 Coro::cede; 2056 cf::cede_to_tick;
1776 $self->activate; 2057 $self->activate;
1777 } 2058 }
2059
2060 $self->{last_save} = $cf::RUNTIME;
2061 $self->last_access ($cf::RUNTIME);
1778 2062
1779 $self->in_memory (cf::MAP_IN_MEMORY); 2063 $self->in_memory (cf::MAP_IN_MEMORY);
1780 } 2064 }
1781 2065
1782 $self->post_load; 2066 $self->post_load;
1793 2077
1794 $self 2078 $self
1795} 2079}
1796 2080
1797# find and load all maps in the 3x3 area around a map 2081# find and load all maps in the 3x3 area around a map
1798sub load_diag { 2082sub load_neighbours {
1799 my ($map) = @_; 2083 my ($map) = @_;
1800 2084
1801 my @diag; # diagonal neighbours 2085 my @neigh; # diagonal neighbours
1802 2086
1803 for (0 .. 3) { 2087 for (0 .. 3) {
1804 my $neigh = $map->tile_path ($_) 2088 my $neigh = $map->tile_path ($_)
1805 or next; 2089 or next;
1806 $neigh = find $neigh, $map 2090 $neigh = find $neigh, $map
1807 or next; 2091 or next;
1808 $neigh->load; 2092 $neigh->load;
1809 2093
2094 push @neigh,
1810 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2095 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1811 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2096 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1812 } 2097 }
1813 2098
1814 for (@diag) { 2099 for (grep defined $_->[0], @neigh) {
2100 my ($path, $origin) = @$_;
1815 my $neigh = find @$_ 2101 my $neigh = find $path, $origin
1816 or next; 2102 or next;
1817 $neigh->load; 2103 $neigh->load;
1818 } 2104 }
1819} 2105}
1820 2106
1825} 2111}
1826 2112
1827sub do_load_sync { 2113sub do_load_sync {
1828 my ($map) = @_; 2114 my ($map) = @_;
1829 2115
2116 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2117 if $Coro::current == $Coro::main;
2118
1830 cf::sync_job { $map->load }; 2119 cf::sync_job { $map->load };
1831} 2120}
1832 2121
1833our %MAP_PREFETCH; 2122our %MAP_PREFETCH;
1834our $MAP_PREFETCHER = undef; 2123our $MAP_PREFETCHER = undef;
1835 2124
1836sub find_async { 2125sub find_async {
1837 my ($path, $origin) = @_; 2126 my ($path, $origin, $load) = @_;
1838 2127
1839 $path = normalise $path, $origin && $origin->{path}; 2128 $path = normalise $path, $origin && $origin->{path};
1840 2129
1841 if (my $map = $cf::MAP{$path}) { 2130 if (my $map = $cf::MAP{$path}) {
1842 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2131 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1843 } 2132 }
1844 2133
1845 undef $MAP_PREFETCH{$path}; 2134 $MAP_PREFETCH{$path} |= $load;
2135
1846 $MAP_PREFETCHER ||= cf::async { 2136 $MAP_PREFETCHER ||= cf::async {
2137 $Coro::current->{desc} = "map prefetcher";
2138
1847 while (%MAP_PREFETCH) { 2139 while (%MAP_PREFETCH) {
1848 for my $path (keys %MAP_PREFETCH) { 2140 while (my ($k, $v) = each %MAP_PREFETCH) {
1849 my $map = find $path 2141 if (my $map = find $k) {
1850 or next;
1851 $map->load; 2142 $map->load if $v;
2143 }
1852 2144
1853 delete $MAP_PREFETCH{$path}; 2145 delete $MAP_PREFETCH{$k};
1854 } 2146 }
1855 } 2147 }
1856 undef $MAP_PREFETCHER; 2148 undef $MAP_PREFETCHER;
1857 }; 2149 };
1858 $MAP_PREFETCHER->prio (6); 2150 $MAP_PREFETCHER->prio (6);
1861} 2153}
1862 2154
1863sub save { 2155sub save {
1864 my ($self) = @_; 2156 my ($self) = @_;
1865 2157
1866 my $lock = cf::lock_acquire "map_data:" . $self->path; 2158 my $lock = cf::lock_acquire "map_data:$self->{path}";
1867 2159
1868 $self->{last_save} = $cf::RUNTIME; 2160 $self->{last_save} = $cf::RUNTIME;
1869 2161
1870 return unless $self->dirty; 2162 return unless $self->dirty;
1871 2163
1877 return if $self->{deny_save}; 2169 return if $self->{deny_save};
1878 2170
1879 local $self->{last_access} = $self->last_access;#d# 2171 local $self->{last_access} = $self->last_access;#d#
1880 2172
1881 cf::async { 2173 cf::async {
2174 $Coro::current->{desc} = "map player save";
1882 $_->contr->save for $self->players; 2175 $_->contr->save for $self->players;
1883 }; 2176 };
1884 2177
1885 if ($uniq) { 2178 if ($uniq) {
1886 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2179 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1894 my ($self) = @_; 2187 my ($self) = @_;
1895 2188
1896 # save first because save cedes 2189 # save first because save cedes
1897 $self->save; 2190 $self->save;
1898 2191
1899 my $lock = cf::lock_acquire "map_data:" . $self->path; 2192 my $lock = cf::lock_acquire "map_data:$self->{path}";
1900 2193
1901 return if $self->players; 2194 return if $self->players;
1902 return if $self->in_memory != cf::MAP_IN_MEMORY; 2195 return if $self->in_memory != cf::MAP_IN_MEMORY;
1903 return if $self->{deny_save}; 2196 return if $self->{deny_save};
1904 2197
2198 $self->in_memory (cf::MAP_SWAPPED);
2199
2200 $self->deactivate;
2201 $_->clear_links_to ($self) for values %cf::MAP;
1905 $self->clear; 2202 $self->clear;
1906 $self->in_memory (cf::MAP_SWAPPED);
1907} 2203}
1908 2204
1909sub reset_at { 2205sub reset_at {
1910 my ($self) = @_; 2206 my ($self) = @_;
1911 2207
1943 if $uniq; 2239 if $uniq;
1944 } 2240 }
1945 2241
1946 delete $cf::MAP{$self->path}; 2242 delete $cf::MAP{$self->path};
1947 2243
2244 $self->deactivate;
2245 $_->clear_links_to ($self) for values %cf::MAP;
1948 $self->clear; 2246 $self->clear;
1949
1950 $_->clear_links_to ($self) for values %cf::MAP;
1951 2247
1952 $self->unlink_save; 2248 $self->unlink_save;
1953 $self->destroy; 2249 $self->destroy;
1954} 2250}
1955 2251
1956my $nuke_counter = "aaaa"; 2252my $nuke_counter = "aaaa";
1957 2253
1958sub nuke { 2254sub nuke {
1959 my ($self) = @_; 2255 my ($self) = @_;
1960 2256
2257 {
2258 my $lock = cf::lock_acquire "map_data:$self->{path}";
2259
1961 delete $cf::MAP{$self->path}; 2260 delete $cf::MAP{$self->path};
1962 2261
1963 $self->unlink_save; 2262 $self->unlink_save;
1964 2263
1965 bless $self, "cf::map"; 2264 bless $self, "cf::map";
1966 delete $self->{deny_reset}; 2265 delete $self->{deny_reset};
1967 $self->{deny_save} = 1; 2266 $self->{deny_save} = 1;
1968 $self->reset_timeout (1); 2267 $self->reset_timeout (1);
1969 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2268 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1970 2269
1971 $cf::MAP{$self->path} = $self; 2270 $cf::MAP{$self->path} = $self;
2271 }
1972 2272
1973 $self->reset; # polite request, might not happen 2273 $self->reset; # polite request, might not happen
1974} 2274}
1975 2275
1976=item $maps = cf::map::tmp_maps 2276=item $maps = cf::map::tmp_maps
2052 2352
2053sub inv_recursive { 2353sub inv_recursive {
2054 inv_recursive_ inv $_[0] 2354 inv_recursive_ inv $_[0]
2055} 2355}
2056 2356
2357=item $ref = $ob->ref
2358
2359creates and returns a persistent reference to an objetc that can be stored as a string.
2360
2361=item $ob = cf::object::deref ($refstring)
2362
2363returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2364even if the object actually exists. May block.
2365
2366=cut
2367
2368sub deref {
2369 my ($ref) = @_;
2370
2371 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2372 my ($uuid, $name) = ($1, $2);
2373 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2374 or return;
2375 $pl->ob->uuid eq $uuid
2376 or return;
2377
2378 $pl->ob
2379 } else {
2380 warn "$ref: cannot resolve object reference\n";
2381 undef
2382 }
2383}
2384
2057package cf; 2385package cf;
2058 2386
2059=back 2387=back
2060 2388
2061=head3 cf::object::player 2389=head3 cf::object::player
2083 2411
2084 } else { 2412 } else {
2085 my $pl = $self->contr; 2413 my $pl = $self->contr;
2086 2414
2087 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2415 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2088 my $diag = $pl->{npc_dialog}; 2416 my $dialog = $pl->{npc_dialog};
2089 $diag->{pl}->ext_reply ( 2417 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2090 $diag->{id},
2091 msgtype => "reply",
2092 msg => $diag->{pl}->expand_cfpod ($msg),
2093 add_topics => []
2094 );
2095 2418
2096 } else { 2419 } else {
2097 $msg = $npc->name . " says: $msg" if $npc; 2420 $msg = $npc->name . " says: $msg" if $npc;
2098 $self->message ($msg, $flags); 2421 $self->message ($msg, $flags);
2099 } 2422 }
2100 } 2423 }
2424}
2425
2426=item $object->send_msg ($channel, $msg, $color, [extra...])
2427
2428=cut
2429
2430sub cf::object::send_msg {
2431 my $pl = shift->contr
2432 or return;
2433 $pl->send_msg (@_);
2101} 2434}
2102 2435
2103=item $player_object->may ("access") 2436=item $player_object->may ("access")
2104 2437
2105Returns wether the given player is authorized to access resource "access" 2438Returns wether the given player is authorized to access resource "access"
2184 # use -1 or undef as default coordinates, not 0, 0 2517 # use -1 or undef as default coordinates, not 0, 0
2185 ($x, $y) = ($map->enter_x, $map->enter_y) 2518 ($x, $y) = ($map->enter_x, $map->enter_y)
2186 if $x <=0 && $y <= 0; 2519 if $x <=0 && $y <= 0;
2187 2520
2188 $map->load; 2521 $map->load;
2189 $map->load_diag; 2522 $map->load_neighbours;
2190 2523
2191 return unless $self->contr->active; 2524 return unless $self->contr->active;
2192 $self->activate_recursive; 2525 $self->activate_recursive;
2193 2526
2194 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2527 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2195 $self->enter_map ($map, $x, $y); 2528 $self->enter_map ($map, $x, $y);
2196} 2529}
2197 2530
2198=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2531=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2199 2532
2200Moves the player to the given map-path and coordinates by first freezing 2533Moves the player to the given map-path and coordinates by first freezing
2201her, loading and preparing them map, calling the provided $check callback 2534her, loading and preparing them map, calling the provided $check callback
2202that has to return the map if sucecssful, and then unfreezes the player on 2535that has to return the map if sucecssful, and then unfreezes the player on
2203the new (success) or old (failed) map position. 2536the new (success) or old (failed) map position. In either case, $done will
2537be called at the end of this process.
2204 2538
2205=cut 2539=cut
2206 2540
2207our $GOTOGEN; 2541our $GOTOGEN;
2208 2542
2209sub cf::object::player::goto { 2543sub cf::object::player::goto {
2210 my ($self, $path, $x, $y, $check) = @_; 2544 my ($self, $path, $x, $y, $check, $done) = @_;
2211 2545
2212 # do generation counting so two concurrent goto's will be executed in-order 2546 # do generation counting so two concurrent goto's will be executed in-order
2213 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2547 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2214 2548
2215 $self->enter_link; 2549 $self->enter_link;
2216 2550
2217 (async { 2551 (async {
2552 $Coro::current->{desc} = "player::goto $path $x $y";
2553
2554 # *tag paths override both path and x|y
2555 if ($path =~ /^\*(.*)$/) {
2556 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2557 my $ob = $obs[rand @obs];
2558
2559 # see if we actually can go there
2560 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2561 $ob = $obs[rand @obs];
2562 } else {
2563 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2564 }
2565 # else put us there anyways for now #d#
2566
2567 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2568 } else {
2569 ($path, $x, $y) = (undef, undef, undef);
2570 }
2571 }
2572
2218 my $map = eval { 2573 my $map = eval {
2219 my $map = cf::map::find $path; 2574 my $map = defined $path ? cf::map::find $path : undef;
2220 2575
2221 if ($map) { 2576 if ($map) {
2222 $map = $map->customise_for ($self); 2577 $map = $map->customise_for ($self);
2223 $map = $check->($map) if $check && $map; 2578 $map = $check->($map) if $check && $map;
2224 } else { 2579 } else {
2225 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2580 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2226 } 2581 }
2227 2582
2228 $map 2583 $map
2229 }; 2584 };
2230 2585
2235 2590
2236 if ($gen == $self->{_goto_generation}) { 2591 if ($gen == $self->{_goto_generation}) {
2237 delete $self->{_goto_generation}; 2592 delete $self->{_goto_generation};
2238 $self->leave_link ($map, $x, $y); 2593 $self->leave_link ($map, $x, $y);
2239 } 2594 }
2595
2596 $done->() if $done;
2240 })->prio (1); 2597 })->prio (1);
2241} 2598}
2242 2599
2243=item $player_object->enter_exit ($exit_object) 2600=item $player_object->enter_exit ($exit_object)
2244 2601
2313 my $hp = $exit->stats->hp; 2670 my $hp = $exit->stats->hp;
2314 my $sp = $exit->stats->sp; 2671 my $sp = $exit->stats->sp;
2315 2672
2316 $self->enter_link; 2673 $self->enter_link;
2317 2674
2675 # if exit is damned, update players death & WoR home-position
2676 $self->contr->savebed ($slaying, $hp, $sp)
2677 if $exit->flag (FLAG_DAMNED);
2678
2318 (async { 2679 (async {
2680 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2681
2319 $self->deactivate_recursive; # just to be sure 2682 $self->deactivate_recursive; # just to be sure
2320 unless (eval { 2683 unless (eval {
2321 $self->goto ($slaying, $hp, $sp); 2684 $self->goto ($slaying, $hp, $sp);
2322 2685
2323 1; 2686 1;
2349 2712
2350 utf8::encode $text; 2713 utf8::encode $text;
2351 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2714 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2352} 2715}
2353 2716
2354=item $client->send_msg ($color, $type, $msg, [extra...]) 2717=item $client->send_msg ($channel, $msg, $color, [extra...])
2355 2718
2356Send a drawinfo or msg packet to the client, formatting the msg for the 2719Send a drawinfo or msg packet to the client, formatting the msg for the
2357client if neccessary. C<$type> should be a string identifying the type of 2720client if neccessary. C<$type> should be a string identifying the type of
2358the message, with C<log> being the default. If C<$color> is negative, suppress 2721the message, with C<log> being the default. If C<$color> is negative, suppress
2359the message unless the client supports the msg packet. 2722the message unless the client supports the msg packet.
2360 2723
2361=cut 2724=cut
2362 2725
2726# non-persistent channels (usually the info channel)
2727our %CHANNEL = (
2728 "c/identify" => {
2729 id => "infobox",
2730 title => "Identify",
2731 reply => undef,
2732 tooltip => "Items recently identified",
2733 },
2734 "c/examine" => {
2735 id => "infobox",
2736 title => "Examine",
2737 reply => undef,
2738 tooltip => "Signs and other items you examined",
2739 },
2740 "c/book" => {
2741 id => "infobox",
2742 title => "Book",
2743 reply => undef,
2744 tooltip => "The contents of a note or book",
2745 },
2746 "c/lookat" => {
2747 id => "infobox",
2748 title => "Look",
2749 reply => undef,
2750 tooltip => "What you saw there",
2751 },
2752 "c/who" => {
2753 id => "infobox",
2754 title => "Players",
2755 reply => undef,
2756 tooltip => "Shows players who are currently online",
2757 },
2758 "c/body" => {
2759 id => "infobox",
2760 title => "Body Parts",
2761 reply => undef,
2762 tooltip => "Shows which body parts you posess and are available",
2763 },
2764 "c/uptime" => {
2765 id => "infobox",
2766 title => "Uptime",
2767 reply => undef,
2768 tooltip => "How long the server has been running since last restart",
2769 },
2770 "c/mapinfo" => {
2771 id => "infobox",
2772 title => "Map Info",
2773 reply => undef,
2774 tooltip => "Information related to the maps",
2775 },
2776);
2777
2363sub cf::client::send_msg { 2778sub cf::client::send_msg {
2364 my ($self, $color, $type, $msg, @extra) = @_; 2779 my ($self, $channel, $msg, $color, @extra) = @_;
2365 2780
2366 $msg = $self->pl->expand_cfpod ($msg); 2781 $msg = $self->pl->expand_cfpod ($msg);
2367 2782
2783 $color &= cf::NDI_CLIENT_MASK; # just in case...
2784
2785 # check predefined channels, for the benefit of C
2786 if ($CHANNEL{$channel}) {
2787 $channel = $CHANNEL{$channel};
2788
2789 $self->ext_msg (channel_info => $channel)
2790 if $self->can_msg;
2791
2792 $channel = $channel->{id};
2793
2794 } elsif (ref $channel) {
2795 # send meta info to client, if not yet sent
2796 unless (exists $self->{channel}{$channel->{id}}) {
2797 $self->{channel}{$channel->{id}} = $channel;
2798 $self->ext_msg (channel_info => $channel)
2799 if $self->can_msg;
2800 }
2801
2802 $channel = $channel->{id};
2803 }
2804
2805 return unless @extra || length $msg;
2806
2368 if ($self->can_msg) { 2807 if ($self->can_msg) {
2369 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); 2808 # default colour, mask it out
2809 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2810 if $color & cf::NDI_DEF;
2811
2812 $self->send_packet ("msg " . $self->{json_coder}->encode (
2813 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2370 } else { 2814 } else {
2371 # replace some tags by gcfclient-compatible ones
2372 for ($msg) {
2373 1 while
2374 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2375 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2376 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2377 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2378 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${1}[\/color]/;
2379 }
2380
2381 if ($color >= 0) { 2815 if ($color >= 0) {
2816 # replace some tags by gcfclient-compatible ones
2817 for ($msg) {
2818 1 while
2819 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2820 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2821 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2822 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2823 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2824 }
2825
2826 $color &= cf::NDI_COLOR_MASK;
2827
2828 utf8::encode $msg;
2829
2382 if ($msg =~ /\[/) { 2830 if (0 && $msg =~ /\[/) {
2831 # COMMAND/INFO
2383 $self->send_packet ("drawextinfo $color 4 0 $msg") 2832 $self->send_packet ("drawextinfo $color 10 8 $msg")
2384 } else { 2833 } else {
2834 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2385 $self->send_packet ("drawinfo $color $msg") 2835 $self->send_packet ("drawinfo $color $msg")
2386 } 2836 }
2387 } 2837 }
2388 } 2838 }
2389} 2839}
2390 2840
2391=item $client->ext_event ($type, %msg) 2841=item $client->ext_msg ($type, @msg)
2392 2842
2393Sends an exti event to the client. 2843Sends an ext event to the client.
2394 2844
2395=cut 2845=cut
2396 2846
2397sub cf::client::ext_event($$%) { 2847sub cf::client::ext_msg($$@) {
2398 my ($self, $type, %msg) = @_; 2848 my ($self, $type, @msg) = @_;
2399 2849
2850 if ($self->extcmd == 2) {
2851 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2852 } elsif ($self->extcmd == 1) { # TODO: remove
2400 $msg{msgtype} = "event_$type"; 2853 push @msg, msgtype => "event_$type";
2401 $self->send_packet ("ext " . cf::to_json \%msg); 2854 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2855 }
2856}
2857
2858=item $client->ext_reply ($msgid, @msg)
2859
2860Sends an ext reply to the client.
2861
2862=cut
2863
2864sub cf::client::ext_reply($$@) {
2865 my ($self, $id, @msg) = @_;
2866
2867 if ($self->extcmd == 2) {
2868 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2869 } elsif ($self->extcmd == 1) {
2870 #TODO: version 1, remove
2871 unshift @msg, msgtype => "reply", msgid => $id;
2872 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2873 }
2402} 2874}
2403 2875
2404=item $success = $client->query ($flags, "text", \&cb) 2876=item $success = $client->query ($flags, "text", \&cb)
2405 2877
2406Queues a query to the client, calling the given callback with 2878Queues a query to the client, calling the given callback with
2407the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2879the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2408C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2880C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2409 2881
2410Queries can fail, so check the return code. Or don't, as queries will become 2882Queries can fail, so check the return code. Or don't, as queries will
2411reliable at some point in the future. 2883become reliable at some point in the future.
2412 2884
2413=cut 2885=cut
2414 2886
2415sub cf::client::query { 2887sub cf::client::query {
2416 my ($self, $flags, $text, $cb) = @_; 2888 my ($self, $flags, $text, $cb) = @_;
2424 utf8::encode $text; 2896 utf8::encode $text;
2425 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2897 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2426 2898
2427 $self->send_packet ($self->{query_queue}[0][0]) 2899 $self->send_packet ($self->{query_queue}[0][0])
2428 if @{ $self->{query_queue} } == 1; 2900 if @{ $self->{query_queue} } == 1;
2901
2902 1
2429} 2903}
2430 2904
2431cf::client->attach ( 2905cf::client->attach (
2906 on_connect => sub {
2907 my ($ns) = @_;
2908
2909 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2910 },
2432 on_reply => sub { 2911 on_reply => sub {
2433 my ($ns, $msg) = @_; 2912 my ($ns, $msg) = @_;
2434 2913
2435 # this weird shuffling is so that direct followup queries 2914 # this weird shuffling is so that direct followup queries
2436 # get handled first 2915 # get handled first
2448 } else { 2927 } else {
2449 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2928 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2450 } 2929 }
2451 } 2930 }
2452 }, 2931 },
2932 on_exticmd => sub {
2933 my ($ns, $buf) = @_;
2934
2935 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2936
2937 if (ref $msg) {
2938 my ($type, $reply, @payload) =
2939 "ARRAY" eq ref $msg
2940 ? @$msg
2941 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2942
2943 my @reply;
2944
2945 if (my $cb = $EXTICMD{$type}) {
2946 @reply = $cb->($ns, @payload);
2947 }
2948
2949 $ns->ext_reply ($reply, @reply)
2950 if $reply;
2951
2952 } else {
2953 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2954 }
2955
2956 cf::override;
2957 },
2453); 2958);
2454 2959
2455=item $client->async (\&cb) 2960=item $client->async (\&cb)
2456 2961
2457Create a new coroutine, running the specified callback. The coroutine will 2962Create a new coroutine, running the specified callback. The coroutine will
2498our $safe = new Safe "safe"; 3003our $safe = new Safe "safe";
2499our $safe_hole = new Safe::Hole; 3004our $safe_hole = new Safe::Hole;
2500 3005
2501$SIG{FPE} = 'IGNORE'; 3006$SIG{FPE} = 'IGNORE';
2502 3007
2503$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3008$safe->permit_only (Opcode::opset qw(
3009 :base_core :base_mem :base_orig :base_math
3010 grepstart grepwhile mapstart mapwhile
3011 sort time
3012));
2504 3013
2505# here we export the classes and methods available to script code 3014# here we export the classes and methods available to script code
2506 3015
2507=pod 3016=pod
2508 3017
2509The following functions and methods are available within a safe environment: 3018The following functions and methods are available within a safe environment:
2510 3019
2511 cf::object contr pay_amount pay_player map 3020 cf::object
3021 contr pay_amount pay_player map x y force_find force_add destroy
3022 insert remove name archname title slaying race decrease_ob_nr
3023
2512 cf::object::player player 3024 cf::object::player
2513 cf::player peaceful 3025 player
2514 cf::map trigger 3026
3027 cf::player
3028 peaceful
3029
3030 cf::map
3031 trigger
2515 3032
2516=cut 3033=cut
2517 3034
2518for ( 3035for (
2519 ["cf::object" => qw(contr pay_amount pay_player map)], 3036 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3037 insert remove inv name archname title slaying race
3038 decrease_ob_nr destroy)],
2520 ["cf::object::player" => qw(player)], 3039 ["cf::object::player" => qw(player)],
2521 ["cf::player" => qw(peaceful)], 3040 ["cf::player" => qw(peaceful)],
2522 ["cf::map" => qw(trigger)], 3041 ["cf::map" => qw(trigger)],
2523) { 3042) {
2524 no strict 'refs'; 3043 no strict 'refs';
2600# the server's init and main functions 3119# the server's init and main functions
2601 3120
2602sub load_facedata($) { 3121sub load_facedata($) {
2603 my ($path) = @_; 3122 my ($path) = @_;
2604 3123
3124 # HACK to clear player env face cache, we need some signal framework
3125 # for this (global event?)
3126 %ext::player_env::MUSIC_FACE_CACHE = ();
3127
3128 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3129
2605 warn "loading facedata from $path\n"; 3130 warn "loading facedata from $path\n";
2606 3131
2607 my $facedata; 3132 my $facedata;
2608 0 < aio_load $path, $facedata 3133 0 < aio_load $path, $facedata
2609 or die "$path: $!"; 3134 or die "$path: $!";
2611 $facedata = Coro::Storable::thaw $facedata; 3136 $facedata = Coro::Storable::thaw $facedata;
2612 3137
2613 $facedata->{version} == 2 3138 $facedata->{version} == 2
2614 or cf::cleanup "$path: version mismatch, cannot proceed."; 3139 or cf::cleanup "$path: version mismatch, cannot proceed.";
2615 3140
3141 # patch in the exptable
3142 $facedata->{resource}{"res/exp_table"} = {
3143 type => FT_RSRC,
3144 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3145 };
3146 cf::cede_to_tick;
3147
2616 { 3148 {
2617 my $faces = $facedata->{faceinfo}; 3149 my $faces = $facedata->{faceinfo};
2618 3150
2619 while (my ($face, $info) = each %$faces) { 3151 while (my ($face, $info) = each %$faces) {
2620 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3152 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2621 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3153 cf::face::set_visibility $idx, $info->{visibility};
3154 cf::face::set_magicmap $idx, $info->{magicmap};
2622 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3155 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2623 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3156 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2624 Coro::cede; 3157
3158 cf::cede_to_tick;
2625 } 3159 }
2626 3160
2627 while (my ($face, $info) = each %$faces) { 3161 while (my ($face, $info) = each %$faces) {
2628 next unless $info->{smooth}; 3162 next unless $info->{smooth};
2629 my $idx = cf::face::find $face 3163 my $idx = cf::face::find $face
2630 or next; 3164 or next;
2631 if (my $smooth = cf::face::find $info->{smooth}) { 3165 if (my $smooth = cf::face::find $info->{smooth}) {
3166 cf::face::set_smooth $idx, $smooth;
2632 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3167 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2633 } else { 3168 } else {
2634 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3169 warn "smooth face '$info->{smooth}' not found for face '$face'";
2635 } 3170 }
2636 Coro::cede; 3171
3172 cf::cede_to_tick;
2637 } 3173 }
2638 } 3174 }
2639 3175
2640 { 3176 {
2641 my $anims = $facedata->{animinfo}; 3177 my $anims = $facedata->{animinfo};
2642 3178
2643 while (my ($anim, $info) = each %$anims) { 3179 while (my ($anim, $info) = each %$anims) {
2644 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3180 cf::anim::set $anim, $info->{frames}, $info->{facings};
2645 Coro::cede; 3181 cf::cede_to_tick;
2646 } 3182 }
2647 3183
2648 cf::anim::invalidate_all; # d'oh 3184 cf::anim::invalidate_all; # d'oh
2649 } 3185 }
2650 3186
3187 {
3188 # TODO: for gcfclient pleasure, we should give resources
3189 # that gcfclient doesn't grok a >10000 face index.
3190 my $res = $facedata->{resource};
3191
3192 my $soundconf = delete $res->{"res/sound.conf"};
3193
3194 while (my ($name, $info) = each %$res) {
3195 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3196 my $data;
3197
3198 if ($info->{type} & 1) {
3199 # prepend meta info
3200
3201 my $meta = $enc->encode ({
3202 name => $name,
3203 %{ $info->{meta} || {} },
3204 });
3205
3206 $data = pack "(w/a*)*", $meta, $info->{data};
3207 } else {
3208 $data = $info->{data};
3209 }
3210
3211 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3212 cf::face::set_type $idx, $info->{type};
3213
3214 cf::cede_to_tick;
3215 }
3216
3217 if ($soundconf) {
3218 $soundconf = $enc->decode (delete $soundconf->{data});
3219
3220 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3221 my $sound = $soundconf->{compat}[$_]
3222 or next;
3223
3224 my $face = cf::face::find "sound/$sound->[1]";
3225 cf::sound::set $sound->[0] => $face;
3226 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3227 }
3228
3229 while (my ($k, $v) = each %{$soundconf->{event}}) {
3230 my $face = cf::face::find "sound/$v";
3231 cf::sound::set $k => $face;
3232 }
3233 }
3234 }
3235
2651 1 3236 1
2652} 3237}
2653 3238
3239register_exticmd fx_want => sub {
3240 my ($ns, $want) = @_;
3241
3242 while (my ($k, $v) = each %$want) {
3243 $ns->fx_want ($k, $v);
3244 }
3245};
3246
2654sub reload_regions { 3247sub reload_regions {
3248 # HACK to clear player env face cache, we need some signal framework
3249 # for this (global event?)
3250 %ext::player_env::MUSIC_FACE_CACHE = ();
3251
2655 load_resource_file "$MAPDIR/regions" 3252 load_resource_file "$MAPDIR/regions"
2656 or die "unable to load regions file\n"; 3253 or die "unable to load regions file\n";
3254
3255 for (cf::region::list) {
3256 $_->{match} = qr/$_->{match}/
3257 if exists $_->{match};
3258 }
2657} 3259}
2658 3260
2659sub reload_facedata { 3261sub reload_facedata {
2660 load_facedata "$DATADIR/facedata" 3262 load_facedata "$DATADIR/facedata"
2661 or die "unable to load facedata\n"; 3263 or die "unable to load facedata\n";
2662} 3264}
2663 3265
2664sub reload_archetypes { 3266sub reload_archetypes {
3267 load_resource_file "$DATADIR/archetypes"
3268 or die "unable to load archetypes\n";
3269 #d# NEED to laod twice to resolve forward references
3270 # this really needs to be done in an extra post-pass
3271 # (which needs to be synchronous, so solve it differently)
2665 load_resource_file "$DATADIR/archetypes" 3272 load_resource_file "$DATADIR/archetypes"
2666 or die "unable to load archetypes\n"; 3273 or die "unable to load archetypes\n";
2667} 3274}
2668 3275
2669sub reload_treasures { 3276sub reload_treasures {
2685 3292
2686sub init { 3293sub init {
2687 reload_resources; 3294 reload_resources;
2688} 3295}
2689 3296
2690sub cfg_load { 3297sub reload_config {
2691 open my $fh, "<:utf8", "$CONFDIR/config" 3298 open my $fh, "<:utf8", "$CONFDIR/config"
2692 or return; 3299 or return;
2693 3300
2694 local $/; 3301 local $/;
2695 *CFG = YAML::Syck::Load <$fh>; 3302 *CFG = YAML::Syck::Load <$fh>;
2711sub main { 3318sub main {
2712 # we must not ever block the main coroutine 3319 # we must not ever block the main coroutine
2713 local $Coro::idle = sub { 3320 local $Coro::idle = sub {
2714 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3321 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2715 (async { 3322 (async {
2716 Event::one_event; 3323 $Coro::current->{desc} = "IDLE BUG HANDLER";
3324 EV::loop EV::LOOP_ONESHOT;
2717 })->prio (Coro::PRIO_MAX); 3325 })->prio (Coro::PRIO_MAX);
2718 }; 3326 };
2719 3327
2720 cfg_load; 3328 reload_config;
2721 db_init; 3329 db_init;
2722 load_extensions; 3330 load_extensions;
2723 3331
2724 $TICK_WATCHER->start; 3332 $TICK_WATCHER->start;
3333 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
2725 Event::loop; 3334 EV::loop;
2726} 3335}
2727 3336
2728############################################################################# 3337#############################################################################
2729# initialisation and cleanup 3338# initialisation and cleanup
2730 3339
2731# install some emergency cleanup handlers 3340# install some emergency cleanup handlers
2732BEGIN { 3341BEGIN {
3342 our %SIGWATCHER = ();
2733 for my $signal (qw(INT HUP TERM)) { 3343 for my $signal (qw(INT HUP TERM)) {
2734 Event->signal ( 3344 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2735 reentrant => 0,
2736 data => WF_AUTOCANCEL,
2737 signal => $signal,
2738 prio => 0,
2739 cb => sub {
2740 cf::cleanup "SIG$signal"; 3345 cf::cleanup "SIG$signal";
2741 },
2742 ); 3346 };
2743 } 3347 }
2744} 3348}
2745 3349
2746sub write_runtime { 3350sub write_runtime {
2747 my $runtime = "$LOCALDIR/runtime"; 3351 my $runtime = "$LOCALDIR/runtime";
2792 # and maps saved/destroyed asynchronously. 3396 # and maps saved/destroyed asynchronously.
2793 warn "begin emergency player save\n"; 3397 warn "begin emergency player save\n";
2794 for my $login (keys %cf::PLAYER) { 3398 for my $login (keys %cf::PLAYER) {
2795 my $pl = $cf::PLAYER{$login} or next; 3399 my $pl = $cf::PLAYER{$login} or next;
2796 $pl->valid or next; 3400 $pl->valid or next;
3401 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2797 $pl->save; 3402 $pl->save;
2798 } 3403 }
2799 warn "end emergency player save\n"; 3404 warn "end emergency player save\n";
2800 3405
2801 warn "begin emergency map save\n"; 3406 warn "begin emergency map save\n";
2840 warn "syncing database to disk"; 3445 warn "syncing database to disk";
2841 BDB::db_env_txn_checkpoint $DB_ENV; 3446 BDB::db_env_txn_checkpoint $DB_ENV;
2842 3447
2843 # if anything goes wrong in here, we should simply crash as we already saved 3448 # if anything goes wrong in here, we should simply crash as we already saved
2844 3449
2845 warn "cancelling all WF_AUTOCANCEL watchers";
2846 for (Event::all_watchers) {
2847 $_->cancel if $_->data & WF_AUTOCANCEL;
2848 }
2849
2850 warn "flushing outstanding aio requests"; 3450 warn "flushing outstanding aio requests";
2851 for (;;) { 3451 for (;;) {
2852 BDB::flush; 3452 BDB::flush;
2853 IO::AIO::flush; 3453 IO::AIO::flush;
2854 Coro::cede; 3454 Coro::cede_notself;
2855 last unless IO::AIO::nreqs || BDB::nreqs; 3455 last unless IO::AIO::nreqs || BDB::nreqs;
2856 warn "iterate..."; 3456 warn "iterate...";
2857 } 3457 }
2858 3458
2859 ++$RELOAD; 3459 ++$RELOAD;
2863 %EXT_CORO = (); 3463 %EXT_CORO = ();
2864 3464
2865 warn "removing commands"; 3465 warn "removing commands";
2866 %COMMAND = (); 3466 %COMMAND = ();
2867 3467
2868 warn "removing ext commands"; 3468 warn "removing ext/exti commands";
2869 %EXTCMD = (); 3469 %EXTCMD = ();
3470 %EXTICMD = ();
2870 3471
2871 warn "unloading/nuking all extensions"; 3472 warn "unloading/nuking all extensions";
2872 for my $pkg (@EXTS) { 3473 for my $pkg (@EXTS) {
2873 warn "... unloading $pkg"; 3474 warn "... unloading $pkg";
2874 3475
2917 warn "reloading cf.pm"; 3518 warn "reloading cf.pm";
2918 require cf; 3519 require cf;
2919 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3520 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2920 3521
2921 warn "loading config and database again"; 3522 warn "loading config and database again";
2922 cf::cfg_load; 3523 cf::reload_config;
2923 3524
2924 warn "loading extensions"; 3525 warn "loading extensions";
2925 cf::load_extensions; 3526 cf::load_extensions;
2926 3527
2927 warn "reattaching attachments to objects/players"; 3528 warn "reattaching attachments to objects/players";
2947 3548
2948sub reload_perl() { 3549sub reload_perl() {
2949 # doing reload synchronously and two reloads happen back-to-back, 3550 # doing reload synchronously and two reloads happen back-to-back,
2950 # coro crashes during coro_state_free->destroy here. 3551 # coro crashes during coro_state_free->destroy here.
2951 3552
2952 $RELOAD_WATCHER ||= Event->timer ( 3553 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
2953 reentrant => 0,
2954 after => 0,
2955 data => WF_AUTOCANCEL,
2956 cb => sub {
2957 do_reload_perl;
2958 undef $RELOAD_WATCHER; 3554 undef $RELOAD_WATCHER;
2959 }, 3555 do_reload_perl;
2960 ); 3556 };
2961} 3557}
2962 3558
2963register_command "reload" => sub { 3559register_command "reload" => sub {
2964 my ($who, $arg) = @_; 3560 my ($who, $arg) = @_;
2965 3561
2966 if ($who->flag (FLAG_WIZ)) { 3562 if ($who->flag (FLAG_WIZ)) {
2967 $who->message ("reloading server."); 3563 $who->message ("reloading server.");
3564 async {
3565 $Coro::current->{desc} = "perl_reload";
2968 async { reload_perl }; 3566 reload_perl;
3567 };
2969 } 3568 }
2970}; 3569};
2971 3570
2972unshift @INC, $LIBDIR; 3571unshift @INC, $LIBDIR;
2973 3572
2992 my $signal = new Coro::Signal; 3591 my $signal = new Coro::Signal;
2993 push @WAIT_FOR_TICK_BEGIN, $signal; 3592 push @WAIT_FOR_TICK_BEGIN, $signal;
2994 $signal->wait; 3593 $signal->wait;
2995} 3594}
2996 3595
2997 my $min = 1e6;#d# 3596$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
2998 my $avg = 10;
2999$TICK_WATCHER = Event->timer (
3000 reentrant => 0,
3001 parked => 1,
3002 prio => 0,
3003 at => $NEXT_TICK || $TICK,
3004 data => WF_AUTOCANCEL,
3005 cb => sub {
3006 if ($Coro::current != $Coro::main) { 3597 if ($Coro::current != $Coro::main) {
3007 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3598 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3008 unless ++$bug_warning > 10; 3599 unless ++$bug_warning > 10;
3009 return; 3600 return;
3010 } 3601 }
3011 3602
3012 $NOW = $tick_start = Event::time; 3603 $NOW = $tick_start = EV::now;
3013 3604
3014 cf::server_tick; # one server iteration 3605 cf::server_tick; # one server iteration
3015 3606
3016 0 && sync_job {#d# 3607 $RUNTIME += $TICK;
3017 for(1..10) { 3608 $NEXT_TICK += $TICK;
3018 my $t = Event::time;
3019 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3020 or die;
3021 3609
3022 $map->width (50); 3610 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3023 $map->height (50); 3611 $NEXT_RUNTIME_WRITE = $NOW + 10;
3024 $map->alloc; 3612 Coro::async_pool {
3025 $map->_load_objects ("/tmp/x.map", 1); 3613 $Coro::current->{desc} = "runtime saver";
3026 my $t = Event::time - $t; 3614 write_runtime
3027 3615 or warn "ERROR: unable to write runtime file: $!";
3028 #next unless $t < 0.0013;#d#
3029 if ($t < $min) {
3030 $min = $t;
3031 }
3032 $avg = $avg * 0.99 + $t * 0.01;
3033 }
3034 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3035 exit 0;
3036 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3037 }; 3616 };
3617 }
3038 3618
3039 $RUNTIME += $TICK;
3040 $NEXT_TICK += $TICK;
3041
3042 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3043 $NEXT_RUNTIME_WRITE = $NOW + 10;
3044 Coro::async_pool {
3045 write_runtime
3046 or warn "ERROR: unable to write runtime file: $!";
3047 };
3048 }
3049
3050# my $AFTER = Event::time;
3051# warn $AFTER - $NOW;#d#
3052
3053 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3619 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3054 $sig->send; 3620 $sig->send;
3055 } 3621 }
3056 while (my $sig = shift @WAIT_FOR_TICK) { 3622 while (my $sig = shift @WAIT_FOR_TICK) {
3057 $sig->send; 3623 $sig->send;
3058 } 3624 }
3059 3625
3060 $NOW = Event::time;
3061
3062 # if we are delayed by four ticks or more, skip them all
3063 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3064
3065 $TICK_WATCHER->at ($NEXT_TICK);
3066 $TICK_WATCHER->start;
3067
3068 $LOAD = ($NOW - $tick_start) / $TICK; 3626 $LOAD = ($NOW - $tick_start) / $TICK;
3069 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3627 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3070 3628
3071 _post_tick; 3629 _post_tick;
3072 3630};
3073 3631$TICK_WATCHER->priority (EV::MAXPRI);
3074 },
3075);
3076 3632
3077{ 3633{
3634 BDB::min_parallel 8;
3078 BDB::max_poll_time $TICK * 0.1; 3635 BDB::max_poll_time $TICK * 0.1;
3079 $BDB_POLL_WATCHER = Event->io ( 3636 $BDB_POLL_WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb;
3080 reentrant => 0,
3081 fd => BDB::poll_fileno,
3082 poll => 'r',
3083 prio => 0,
3084 data => WF_AUTOCANCEL,
3085 cb => \&BDB::poll_cb,
3086 );
3087 BDB::min_parallel 8;
3088 3637
3089 BDB::set_sync_prepare { 3638 BDB::set_sync_prepare {
3090 my $status; 3639 my $status;
3091 my $current = $Coro::current; 3640 my $current = $Coro::current;
3092 ( 3641 (
3101 ) 3650 )
3102 }; 3651 };
3103 3652
3104 unless ($DB_ENV) { 3653 unless ($DB_ENV) {
3105 $DB_ENV = BDB::db_env_create; 3654 $DB_ENV = BDB::db_env_create;
3655 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3656 | BDB::LOG_AUTOREMOVE, 1);
3657 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3658 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3106 3659
3107 cf::sync_job { 3660 cf::sync_job {
3108 eval { 3661 eval {
3109 BDB::db_env_open 3662 BDB::db_env_open
3110 $DB_ENV, 3663 $DB_ENV,
3112 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3665 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3113 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3666 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3114 0666; 3667 0666;
3115 3668
3116 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3669 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3117
3118 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3119 $DB_ENV->set_lk_detect;
3120 }; 3670 };
3121 3671
3122 cf::cleanup "db_env_open(db): $@" if $@; 3672 cf::cleanup "db_env_open(db): $@" if $@;
3123 }; 3673 };
3124 } 3674 }
3675
3676 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3677 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3678 };
3679 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3680 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3681 };
3682 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3683 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3684 };
3125} 3685}
3126 3686
3127{ 3687{
3128 IO::AIO::min_parallel 8; 3688 IO::AIO::min_parallel 8;
3129 3689
3130 undef $Coro::AIO::WATCHER; 3690 undef $Coro::AIO::WATCHER;
3131 IO::AIO::max_poll_time $TICK * 0.1; 3691 IO::AIO::max_poll_time $TICK * 0.1;
3132 $AIO_POLL_WATCHER = Event->io ( 3692 $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb;
3133 reentrant => 0,
3134 data => WF_AUTOCANCEL,
3135 fd => IO::AIO::poll_fileno,
3136 poll => 'r',
3137 prio => 6,
3138 cb => \&IO::AIO::poll_cb,
3139 );
3140} 3693}
3141 3694
3142my $_log_backtrace; 3695my $_log_backtrace;
3143 3696
3144sub _log_backtrace { 3697sub _log_backtrace {
3148 3701
3149 # limit the # of concurrent backtraces 3702 # limit the # of concurrent backtraces
3150 if ($_log_backtrace < 2) { 3703 if ($_log_backtrace < 2) {
3151 ++$_log_backtrace; 3704 ++$_log_backtrace;
3152 async { 3705 async {
3706 $Coro::current->{desc} = "abt $msg";
3707
3153 my @bt = fork_call { 3708 my @bt = fork_call {
3154 @addr = map { sprintf "%x", $_ } @addr; 3709 @addr = map { sprintf "%x", $_ } @addr;
3155 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3710 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3156 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3711 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3157 or die "addr2line: $!"; 3712 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines