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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines