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.304 by root, Wed Jul 11 16:55:18 2007 UTC vs.
Revision 1.408 by root, Mon Jan 14 10:12:12 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines