ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.287 by root, Mon Jun 25 05:43:45 2007 UTC vs.
Revision 1.407 by root, Sun Jan 13 09:53:53 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
27use JSON::XS 2.01 ();
25use BDB (); 28use BDB ();
26use Data::Dumper; 29use Data::Dumper;
27use Digest::MD5; 30use Digest::MD5;
28use Fcntl; 31use Fcntl;
29use YAML::Syck (); 32use YAML::Syck ();
30use IO::AIO 2.32 (); 33use IO::AIO 2.51 ();
31use Time::HiRes; 34use Time::HiRes;
32use Compress::LZF; 35use Compress::LZF;
36use Digest::MD5 ();
33 37
34# configure various modules to our taste 38# configure various modules to our taste
35# 39#
36$Storable::canonical = 1; # reduce rsync transfers 40$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39
40$Event::Eval = 1; # no idea why this is required, but it is
41 43
42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
43$YAML::Syck::ImplicitUnicode = 1; 45$YAML::Syck::ImplicitUnicode = 1;
44 46
45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
67our $TMPDIR = "$LOCALDIR/" . tmpdir; 69our $TMPDIR = "$LOCALDIR/" . tmpdir;
68our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
69our $PLAYERDIR = "$LOCALDIR/" . playerdir; 71our $PLAYERDIR = "$LOCALDIR/" . playerdir;
70our $RANDOMDIR = "$LOCALDIR/random"; 72our $RANDOMDIR = "$LOCALDIR/random";
71our $BDBDIR = "$LOCALDIR/db"; 73our $BDBDIR = "$LOCALDIR/db";
74our %RESOURCE;
72 75
73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
74our $TICK_WATCHER; 77our $TICK_WATCHER;
75our $AIO_POLL_WATCHER; 78our $AIO_POLL_WATCHER;
76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
77our $NEXT_TICK; 80our $NEXT_TICK;
78our $NOW;
79our $USE_FSYNC = 1; # use fsync to write maps - default off 81our $USE_FSYNC = 1; # use fsync to write maps - default off
80 82
81our $BDB_POLL_WATCHER; 83our $BDB_POLL_WATCHER;
84our $BDB_DEADLOCK_WATCHER;
85our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER;
82our $DB_ENV; 87our $DB_ENV;
83 88
84our %CFG; 89our %CFG;
85 90
86our $UPTIME; $UPTIME ||= time; 91our $UPTIME; $UPTIME ||= time;
87our $RUNTIME; 92our $RUNTIME;
93our $NOW;
88 94
89our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
90our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
91our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
92 98
93# used to convert map paths into valid unix filenames by replacing / by ∕ 99# used to convert map paths into valid unix filenames by replacing / by ∕
94our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
95 101
156 162
157The raw value load value from the last tick. 163The raw value load value from the last tick.
158 164
159=item %cf::CFG 165=item %cf::CFG
160 166
161Configuration for the server, loaded from C</etc/crossfire/config>, or 167Configuration for the server, loaded from C</etc/deliantra-server/config>, or
162from wherever your confdir points to. 168from wherever your confdir points to.
163 169
164=item cf::wait_for_tick, cf::wait_for_tick_begin 170=item cf::wait_for_tick, cf::wait_for_tick_begin
165 171
166These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
167returns directly I<after> the tick processing (and consequently, can only wake one process 173returns directly I<after> the tick processing (and consequently, can only wake one process
168per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 174per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
169 175
176=item @cf::INVOKE_RESULTS
177
178This array contains the results of the last C<invoke ()> call. When
179C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call.
181
170=back 182=back
171 183
172=cut 184=cut
173 185
174BEGIN { 186BEGIN {
178 $msg .= "\n" 190 $msg .= "\n"
179 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
180 192
181 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
182 194
183 utf8::encode $msg;
184 LOG llevError, $msg; 195 LOG llevError, $msg;
185 }; 196 };
186} 197}
198
199$Coro::State::DIEHOOK = sub {
200 warn Carp::longmess $_[0];
201 Coro::terminate;
202};
187 203
188@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 204@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
189@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 205@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
190@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 206@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
191@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 207@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
204)) { 220)) {
205 no strict 'refs'; 221 no strict 'refs';
206 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 222 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
207} 223}
208 224
209$Event::DIED = sub { 225$EV::DIED = sub {
210 warn "error in event callback: @_"; 226 warn "error in event callback: @_";
211}; 227};
212 228
213############################################################################# 229#############################################################################
214 230
237 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 253 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
238 $d 254 $d
239 } || "[unable to dump $_[0]: '$@']"; 255 } || "[unable to dump $_[0]: '$@']";
240} 256}
241 257
242use JSON::XS ();
243
244=item $ref = cf::from_json $json 258=item $ref = cf::decode_json $json
245 259
246Converts a JSON string into the corresponding perl data structure. 260Converts a JSON string into the corresponding perl data structure.
247 261
248=item $json = cf::to_json $ref 262=item $json = cf::encode_json $ref
249 263
250Converts a perl data structure into its JSON representation. 264Converts a perl data structure into its JSON representation.
251 265
252=cut 266=cut
253 267
254our $json_coder = JSON::XS->new->convert_blessed->utf8; 268our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
255 269
256sub to_json ($) { $json_coder->encode ($_[0]) } 270sub encode_json($) { $json_coder->encode ($_[0]) }
257sub from_json ($) { $json_coder->decode ($_[0]) } 271sub decode_json($) { $json_coder->decode ($_[0]) }
258 272
259=item cf::lock_wait $string 273=item cf::lock_wait $string
260 274
261Wait until the given lock is available. See cf::lock_acquire. 275Wait until the given lock is available. See cf::lock_acquire.
262 276
265Wait until the given lock is available and then acquires it and returns 279Wait 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, 280a Coro::guard object. If the guard object gets destroyed (goes out of scope,
267for example when the coroutine gets canceled), the lock is automatically 281for example when the coroutine gets canceled), the lock is automatically
268returned. 282returned.
269 283
284Locks are *not* recursive, locking from the same coro twice results in a
285deadlocked coro.
286
270Lock names should begin with a unique identifier (for example, cf::map::find 287Lock names should begin with a unique identifier (for example, cf::map::find
271uses map_find and cf::map::load uses map_load). 288uses map_find and cf::map::load uses map_load).
272 289
273=item $locked = cf::lock_active $string 290=item $locked = cf::lock_active $string
274 291
275Return true if the lock is currently active, i.e. somebody has locked it. 292Return true if the lock is currently active, i.e. somebody has locked it.
276 293
277=cut 294=cut
278 295
279our %LOCK; 296our %LOCK;
297our %LOCKER;#d#
280 298
281sub lock_wait($) { 299sub lock_wait($) {
282 my ($key) = @_; 300 my ($key) = @_;
301
302 if ($LOCKER{$key} == $Coro::current) {#d#
303 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
304 return;#d#
305 }#d#
283 306
284 # wait for lock, if any 307 # wait for lock, if any
285 while ($LOCK{$key}) { 308 while ($LOCK{$key}) {
286 push @{ $LOCK{$key} }, $Coro::current; 309 push @{ $LOCK{$key} }, $Coro::current;
287 Coro::schedule; 310 Coro::schedule;
293 316
294 # wait, to be sure we are not locked 317 # wait, to be sure we are not locked
295 lock_wait $key; 318 lock_wait $key;
296 319
297 $LOCK{$key} = []; 320 $LOCK{$key} = [];
321 $LOCKER{$key} = $Coro::current;#d#
298 322
299 Coro::guard { 323 Coro::guard {
324 delete $LOCKER{$key};#d#
300 # wake up all waiters, to be on the safe side 325 # wake up all waiters, to be on the safe side
301 $_->ready for @{ delete $LOCK{$key} }; 326 $_->ready for @{ delete $LOCK{$key} };
302 } 327 }
303} 328}
304 329
316 }; 341 };
317 $TICK_WATCHER->stop; 342 $TICK_WATCHER->stop;
318 $guard 343 $guard
319} 344}
320 345
346=item cf::periodic $interval, $cb
347
348Like EV::periodic, but randomly selects a starting point so that the actions
349get spread over timer.
350
351=cut
352
353sub periodic($$) {
354 my ($interval, $cb) = @_;
355
356 my $start = rand List::Util::min 180, $interval;
357
358 EV::periodic $start, $interval, 0, $cb
359}
360
361=item cf::get_slot $time[, $priority[, $name]]
362
363Allocate $time seconds of blocking CPU time at priority C<$priority>:
364This call blocks and returns only when you have at least C<$time> seconds
365of cpu time till the next tick. The slot is only valid till the next cede.
366
367The optional C<$name> can be used to identify the job to run. It might be
368used for statistical purposes and should identify the same time-class.
369
370Useful for short background jobs.
371
372=cut
373
374our @SLOT_QUEUE;
375our $SLOT_QUEUE;
376
377$SLOT_QUEUE->cancel if $SLOT_QUEUE;
378$SLOT_QUEUE = Coro::async {
379 $Coro::current->desc ("timeslot manager");
380
381 my $signal = new Coro::Signal;
382
383 while () {
384 next_job:
385 my $avail = cf::till_tick;
386 if ($avail > 0.01) {
387 for (0 .. $#SLOT_QUEUE) {
388 if ($SLOT_QUEUE[$_][0] < $avail) {
389 my $job = splice @SLOT_QUEUE, $_, 1, ();
390 $job->[2]->send;
391 Coro::cede;
392 goto next_job;
393 }
394 }
395 }
396
397 if (@SLOT_QUEUE) {
398 # we do not use wait_for_tick() as it returns immediately when tick is inactive
399 push @cf::WAIT_FOR_TICK, $signal;
400 $signal->wait;
401 } else {
402 Coro::schedule;
403 }
404 }
405};
406
407sub get_slot($;$$) {
408 my ($time, $pri, $name) = @_;
409
410 $time = $TICK * .6 if $time > $TICK * .6;
411 my $sig = new Coro::Signal;
412
413 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
414 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
415 $SLOT_QUEUE->ready;
416 $sig->wait;
417}
418
321=item cf::async { BLOCK } 419=item cf::async { BLOCK }
322 420
323Currently the same as Coro::async_pool, meaning you cannot use 421Currently the same as Coro::async_pool, meaning you cannot use
324C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 422C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
325thing you are allowed to do is call C<prio> on it. 423thing you are allowed to do is call C<prio> on it.
328 426
329BEGIN { *async = \&Coro::async_pool } 427BEGIN { *async = \&Coro::async_pool }
330 428
331=item cf::sync_job { BLOCK } 429=item cf::sync_job { BLOCK }
332 430
333The design of Crossfire TRT requires that the main coroutine ($Coro::main) 431The design of Deliantra requires that the main coroutine ($Coro::main)
334is always able to handle events or runnable, as Crossfire TRT is only 432is 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 433partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
336acceptable. 434acceptable.
337 435
338If it must be done, put the blocking parts into C<sync_job>. This will run 436If 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 437the given BLOCK in another coroutine while waiting for the result. The
344 442
345sub sync_job(&) { 443sub sync_job(&) {
346 my ($job) = @_; 444 my ($job) = @_;
347 445
348 if ($Coro::current == $Coro::main) { 446 if ($Coro::current == $Coro::main) {
349 my $time = Event::time; 447 my $time = EV::time;
350 448
351 # this is the main coro, too bad, we have to block 449 # this is the main coro, too bad, we have to block
352 # till the operation succeeds, freezing the server :/ 450 # till the operation succeeds, freezing the server :/
353 451
452 LOG llevError, Carp::longmess "sync job";#d#
453
354 # TODO: use suspend/resume instead 454 # TODO: use suspend/resume instead
355 # (but this is cancel-safe) 455 # (but this is cancel-safe)
356 my $freeze_guard = freeze_mainloop; 456 my $freeze_guard = freeze_mainloop;
357 457
358 my $busy = 1; 458 my $busy = 1;
359 my @res; 459 my @res;
360 460
361 (async { 461 (async {
462 $Coro::current->desc ("sync job coro");
362 @res = eval { $job->() }; 463 @res = eval { $job->() };
363 warn $@ if $@; 464 warn $@ if $@;
364 undef $busy; 465 undef $busy;
365 })->prio (Coro::PRIO_MAX); 466 })->prio (Coro::PRIO_MAX);
366 467
367 while ($busy) { 468 while ($busy) {
368 Coro::cede or Event::one_event; 469 if (Coro::nready) {
470 Coro::cede_notself;
471 } else {
472 EV::loop EV::LOOP_ONESHOT;
369 } 473 }
474 }
370 475
371 $time = Event::time - $time; 476 $time = EV::time - $time;
372 477
373 LOG llevError | logBacktrace, Carp::longmess "long sync job" 478 LOG llevError | logBacktrace, Carp::longmess "long sync job"
374 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 479 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
375 480
376 $tick_start += $time; # do not account sync jobs to server load 481 $tick_start += $time; # do not account sync jobs to server load
406=item fork_call { }, $args 511=item fork_call { }, $args
407 512
408Executes the given code block with the given arguments in a seperate 513Executes the given code block with the given arguments in a seperate
409process, returning the results. Everything must be serialisable with 514process, returning the results. Everything must be serialisable with
410Coro::Storable. May, of course, block. Note that the executed sub may 515Coro::Storable. May, of course, block. Note that the executed sub may
411never block itself or use any form of Event handling. 516never block itself or use any form of event handling.
412 517
413=cut 518=cut
414 519
415sub fork_call(&@) { 520sub fork_call(&@) {
416 my ($cb, @args) = @_; 521 my ($cb, @args) = @_;
417 522
418# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 523 # we seemingly have to make a local copy of the whole thing,
419# or die "socketpair: $!"; 524 # otherwise perl prematurely frees the stuff :/
420 pipe my $fh1, my $fh2 525 # TODO: investigate and fix (likely this will be rather laborious)
421 or die "pipe: $!";
422 526
423 if (my $pid = fork) { 527 my @res = Coro::Util::fork_eval {
424 close $fh2;
425
426 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
427 $res = Coro::Storable::thaw $res;
428
429 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
430
431 die $$res unless "ARRAY" eq ref $res;
432
433 return wantarray ? @$res : $res->[-1];
434 } else {
435 reset_signals; 528 reset_signals;
436 local $SIG{__WARN__}; 529 &$cb
437 local $SIG{__DIE__}; 530 }, @args;
438 eval {
439 close $fh1;
440 531
441 my @res = eval { $cb->(@args) }; 532 wantarray ? @res : $res[-1]
442 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
443 };
444
445 warn $@ if $@;
446 _exit 0;
447 }
448} 533}
449 534
450=item $value = cf::db_get $family => $key 535=item $value = cf::db_get $family => $key
451 536
452Returns a single value from the environment database. 537Returns a single value from the environment database.
454=item cf::db_put $family => $key => $value 539=item cf::db_put $family => $key => $value
455 540
456Stores the given C<$value> in the family. It can currently store binary 541Stores the given C<$value> in the family. It can currently store binary
457data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 542data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
458 543
544=item $db = cf::db_table "name"
545
546Create and/or open a new database table. The string must not be "db" and must be unique
547within each server.
548
459=cut 549=cut
550
551sub db_table($) {
552 my ($name) = @_;
553 my $db = BDB::db_create $DB_ENV;
554
555 eval {
556 $db->set_flags (BDB::CHKSUM);
557
558 utf8::encode $name;
559 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
560 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
561 cf::cleanup "db_open(db): $!" if $!;
562 };
563 cf::cleanup "db_open(db): $@" if $@;
564
565 $db
566}
460 567
461our $DB; 568our $DB;
462 569
463sub db_init { 570sub db_init {
464 unless ($DB) {
465 $DB = BDB::db_create $DB_ENV;
466
467 cf::sync_job { 571 cf::sync_job {
468 eval { 572 $DB ||= db_table "db";
469 $DB->set_flags (BDB::CHKSUM);
470
471 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
472 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
473 cf::cleanup "db_open(db): $!" if $!;
474 };
475 cf::cleanup "db_open(db): $@" if $@;
476 };
477 } 573 };
478} 574}
479 575
480sub db_get($$) { 576sub db_get($$) {
481 my $key = "$_[0]/$_[1]"; 577 my $key = "$_[0]/$_[1]";
482 578
532 if (1) { 628 if (1) {
533 $md5 = 629 $md5 =
534 join "\x00", 630 join "\x00",
535 $processversion, 631 $processversion,
536 map { 632 map {
537 Coro::cede; 633 cf::cede_to_tick;
538 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 634 ($src->[$_], Digest::MD5::md5_hex $data[$_])
539 } 0.. $#$src; 635 } 0.. $#$src;
540 636
541 637
542 my $dbmd5 = db_get cache => "$id/md5"; 638 my $dbmd5 = db_get cache => "$id/md5";
586attach callbacks/event handlers (a collection of which is called an "attachment") 682attach callbacks/event handlers (a collection of which is called an "attachment")
587to it. All such attachable objects support the following methods. 683to it. All such attachable objects support the following methods.
588 684
589In the following description, CLASS can be any of C<global>, C<object> 685In the following description, CLASS can be any of C<global>, C<object>
590C<player>, C<client> or C<map> (i.e. the attachable objects in 686C<player>, C<client> or C<map> (i.e. the attachable objects in
591Crossfire TRT). 687Deliantra).
592 688
593=over 4 689=over 4
594 690
595=item $attachable->attach ($attachment, key => $value...) 691=item $attachable->attach ($attachment, key => $value...)
596 692
848 "; 944 ";
849 die if $@; 945 die if $@;
850} 946}
851 947
852our $override; 948our $override;
853our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 949our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
854 950
855sub override { 951sub override {
856 $override = 1; 952 $override = 1;
857 @invoke_results = (); 953 @INVOKE_RESULTS = (@_);
858} 954}
859 955
860sub do_invoke { 956sub do_invoke {
861 my $event = shift; 957 my $event = shift;
862 my $callbacks = shift; 958 my $callbacks = shift;
863 959
864 @invoke_results = (); 960 @INVOKE_RESULTS = ();
865 961
866 local $override; 962 local $override;
867 963
868 for (@$callbacks) { 964 for (@$callbacks) {
869 eval { &{$_->[1]} }; 965 eval { &{$_->[1]} };
878 } 974 }
879 975
880 0 976 0
881} 977}
882 978
883=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 979=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
884 980
885=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 981=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
886 982
887Generate an object-specific event with the given arguments. 983Generate an object-specific event with the given arguments.
888 984
889This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 985This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
890removed in future versions), and there is no public API to access override 986removed in future versions), and there is no public API to access override
891results (if you must, access C<@cf::invoke_results> directly). 987results (if you must, access C<@cf::INVOKE_RESULTS> directly).
892 988
893=back 989=back
894 990
895=cut 991=cut
896 992
897############################################################################# 993#############################################################################
898# object support 994# object support
995
996sub _object_equal($$);
997sub _object_equal($$) {
998 my ($a, $b) = @_;
999
1000 return 0 unless (ref $a) eq (ref $b);
1001
1002 if ("HASH" eq ref $a) {
1003 my @ka = keys %$a;
1004 my @kb = keys %$b;
1005
1006 return 0 if @ka != @kb;
1007
1008 for (0 .. $#ka) {
1009 return 0 unless $ka[$_] eq $kb[$_];
1010 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1011 }
1012
1013 } elsif ("ARRAY" eq ref $a) {
1014
1015 return 0 if @$a != @$b;
1016
1017 for (0 .. $#$a) {
1018 return 0 unless _object_equal $a->[$_], $b->[$_];
1019 }
1020
1021 } elsif ($a ne $b) {
1022 return 0;
1023 }
1024
1025 1
1026}
1027
1028our $SLOW_MERGES;#d#
1029sub _can_merge {
1030 my ($ob1, $ob2) = @_;
1031
1032 ++$SLOW_MERGES;#d#
1033
1034 # we do the slow way here
1035 return _object_equal $ob1, $ob2
1036}
899 1037
900sub reattach { 1038sub reattach {
901 # basically do the same as instantiate, without calling instantiate 1039 # basically do the same as instantiate, without calling instantiate
902 my ($obj) = @_; 1040 my ($obj) = @_;
903 1041
924cf::attachable->attach ( 1062cf::attachable->attach (
925 prio => -1000000, 1063 prio => -1000000,
926 on_instantiate => sub { 1064 on_instantiate => sub {
927 my ($obj, $data) = @_; 1065 my ($obj, $data) = @_;
928 1066
929 $data = from_json $data; 1067 $data = decode_json $data;
930 1068
931 for (@$data) { 1069 for (@$data) {
932 my ($name, $args) = @$_; 1070 my ($name, $args) = @$_;
933 1071
934 $obj->attach ($name, %{$args || {} }); 1072 $obj->attach ($name, %{$args || {} });
950sub object_freezer_save { 1088sub object_freezer_save {
951 my ($filename, $rdata, $objs) = @_; 1089 my ($filename, $rdata, $objs) = @_;
952 1090
953 sync_job { 1091 sync_job {
954 if (length $$rdata) { 1092 if (length $$rdata) {
1093 utf8::decode (my $decname = $filename);
955 warn sprintf "saving %s (%d,%d)\n", 1094 warn sprintf "saving %s (%d,%d)\n",
956 $filename, length $$rdata, scalar @$objs; 1095 $decname, length $$rdata, scalar @$objs;
957 1096
958 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1097 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
959 chmod SAVE_MODE, $fh; 1098 chmod SAVE_MODE, $fh;
960 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1099 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
961 aio_fsync $fh if $cf::USE_FSYNC; 1100 aio_fsync $fh if $cf::USE_FSYNC;
962 close $fh; 1101 close $fh;
963 1102
964 if (@$objs) { 1103 if (@$objs) {
965 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1104 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
966 chmod SAVE_MODE, $fh; 1105 chmod SAVE_MODE, $fh;
967 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1106 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
968 aio_write $fh, 0, (length $data), $data, 0; 1107 aio_write $fh, 0, (length $data), $data, 0;
969 aio_fsync $fh if $cf::USE_FSYNC; 1108 aio_fsync $fh if $cf::USE_FSYNC;
970 close $fh; 1109 close $fh;
971 aio_rename "$filename.pst~", "$filename.pst"; 1110 aio_rename "$filename.pst~", "$filename.pst";
972 } 1111 }
980 } 1119 }
981 } else { 1120 } else {
982 aio_unlink $filename; 1121 aio_unlink $filename;
983 aio_unlink "$filename.pst"; 1122 aio_unlink "$filename.pst";
984 } 1123 }
985 } 1124 };
986} 1125}
987 1126
988sub object_freezer_as_string { 1127sub object_freezer_as_string {
989 my ($rdata, $objs) = @_; 1128 my ($rdata, $objs) = @_;
990 1129
1002 or return; 1141 or return;
1003 1142
1004 unless (aio_stat "$filename.pst") { 1143 unless (aio_stat "$filename.pst") {
1005 (aio_load "$filename.pst", $av) >= 0 1144 (aio_load "$filename.pst", $av) >= 0
1006 or return; 1145 or return;
1146
1007 $av = eval { (Storable::thaw $av)->{objs} }; 1147 my $st = eval { Coro::Storable::thaw $av };
1148 $av = $st->{objs};
1008 } 1149 }
1009 1150
1151 utf8::decode (my $decname = $filename);
1010 warn sprintf "loading %s (%d)\n", 1152 warn sprintf "loading %s (%d,%d)\n",
1011 $filename, length $data, scalar @{$av || []}; 1153 $decname, length $data, scalar @{$av || []};
1154
1012 return ($data, $av); 1155 ($data, $av)
1013} 1156}
1014 1157
1015=head2 COMMAND CALLBACKS 1158=head2 COMMAND CALLBACKS
1016 1159
1017=over 4 1160=over 4
1087 cf::override; 1230 cf::override;
1088 }, 1231 },
1089 on_extcmd => sub { 1232 on_extcmd => sub {
1090 my ($pl, $buf) = @_; 1233 my ($pl, $buf) = @_;
1091 1234
1092 my $msg = eval { from_json $buf }; 1235 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1093 1236
1094 if (ref $msg) { 1237 if (ref $msg) {
1238 my ($type, $reply, @payload) =
1239 "ARRAY" eq ref $msg
1240 ? @$msg
1241 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1242
1243 my @reply;
1244
1095 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1245 if (my $cb = $EXTCMD{$type}) {
1096 if (my %reply = $cb->($pl, $msg)) { 1246 @reply = $cb->($pl, @payload);
1097 $pl->ext_reply ($msg->{msgid}, %reply);
1098 }
1099 } 1247 }
1248
1249 $pl->ext_reply ($reply, @reply)
1250 if $reply;
1251
1100 } else { 1252 } else {
1101 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1253 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1102 } 1254 }
1103 1255
1104 cf::override; 1256 cf::override;
1194 1346
1195=head3 cf::player 1347=head3 cf::player
1196 1348
1197=over 4 1349=over 4
1198 1350
1351=item cf::player::num_playing
1352
1353Returns the official number of playing players, as per the Crossfire metaserver rules.
1354
1355=cut
1356
1357sub num_playing {
1358 scalar grep
1359 $_->ob->map
1360 && !$_->hidden
1361 && !$_->ob->flag (cf::FLAG_WIZ),
1362 cf::player::list
1363}
1364
1199=item cf::player::find $login 1365=item cf::player::find $login
1200 1366
1201Returns the given player object, loading it if necessary (might block). 1367Returns the given player object, loading it if necessary (might block).
1202 1368
1203=cut 1369=cut
1238 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1404 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1239 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1405 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1240 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1406 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1241 aio_unlink +(playerdir $login) . "/$login.pl"; 1407 aio_unlink +(playerdir $login) . "/$login.pl";
1242 1408
1243 my $pl = load_pl path $login 1409 my $f = new_from_file cf::object::thawer path $login
1244 or return; 1410 or return;
1411
1412 my $pl = cf::player::load_pl $f
1413 or return;
1414 local $cf::PLAYER_LOADING{$login} = $pl;
1415 $f->resolve_delayed_derefs;
1245 $cf::PLAYER{$login} = $pl 1416 $cf::PLAYER{$login} = $pl
1246 } 1417 }
1247 } 1418 }
1248} 1419}
1249 1420
1259 1430
1260 aio_mkdir playerdir $pl, 0770; 1431 aio_mkdir playerdir $pl, 0770;
1261 $pl->{last_save} = $cf::RUNTIME; 1432 $pl->{last_save} = $cf::RUNTIME;
1262 1433
1263 $pl->save_pl ($path); 1434 $pl->save_pl ($path);
1264 Coro::cede; 1435 cf::cede_to_tick;
1265} 1436}
1266 1437
1267sub new($) { 1438sub new($) {
1268 my ($login) = @_; 1439 my ($login) = @_;
1269 1440
1273 $self->{deny_save} = 1; 1444 $self->{deny_save} = 1;
1274 1445
1275 $cf::PLAYER{$login} = $self; 1446 $cf::PLAYER{$login} = $self;
1276 1447
1277 $self 1448 $self
1449}
1450
1451=item $player->send_msg ($channel, $msg, $color, [extra...])
1452
1453=cut
1454
1455sub send_msg {
1456 my $ns = shift->ns
1457 or return;
1458 $ns->send_msg (@_);
1278} 1459}
1279 1460
1280=item $pl->quit_character 1461=item $pl->quit_character
1281 1462
1282Nukes the player without looking back. If logged in, the connection will 1463Nukes the player without looking back. If logged in, the connection will
1337 or return []; 1518 or return [];
1338 1519
1339 my @logins; 1520 my @logins;
1340 1521
1341 for my $login (@$dirs) { 1522 for my $login (@$dirs) {
1523 my $path = path $login;
1524
1525 # a .pst is a dead give-away for a valid player
1526 unless (-e "$path.pst") {
1342 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1527 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1343 aio_read $fh, 0, 512, my $buf, 0 or next; 1528 aio_read $fh, 0, 512, my $buf, 0 or next;
1344 $buf !~ /^password -------------$/m or next; # official not-valid tag 1529 $buf !~ /^password -------------$/m or next; # official not-valid tag
1530 }
1345 1531
1346 utf8::decode $login; 1532 utf8::decode $login;
1347 push @logins, $login; 1533 push @logins, $login;
1348 } 1534 }
1349 1535
1382 1568
1383Expand crossfire pod fragments into protocol xml. 1569Expand crossfire pod fragments into protocol xml.
1384 1570
1385=cut 1571=cut
1386 1572
1573use re 'eval';
1574
1575my $group;
1576my $interior; $interior = qr{
1577 # match a pod interior sequence sans C<< >>
1578 (?:
1579 \ (.*?)\ (?{ $group = $^N })
1580 | < (??{$interior}) >
1581 )
1582}x;
1583
1387sub expand_cfpod { 1584sub expand_cfpod {
1388 ((my $self), (local $_)) = @_; 1585 my ($self, $pod) = @_;
1389 1586
1390 # escape & and < 1587 my $xml;
1391 s/&/&amp;/g;
1392 s/(?<![BIUGH])</&lt;/g;
1393 1588
1394 # this is buggy, it needs to properly take care of nested <'s 1589 while () {
1590 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1591 $group = $1;
1395 1592
1396 1 while 1593 $group =~ s/&/&amp;/g;
1397 # replace B<>, I<>, U<> etc. 1594 $group =~ s/</&lt;/g;
1398 s/B<([^\>]*)>/<b>$1<\/b>/ 1595
1399 || s/I<([^\>]*)>/<i>$1<\/i>/ 1596 $xml .= $group;
1400 || s/U<([^\>]*)>/<u>$1<\/u>/ 1597 } elsif ($pod =~ m%\G
1401 # replace G<male|female> tags 1598 ([BCGHITU])
1402 || s{G<([^>|]*)\|([^>]*)>}{ 1599 <
1403 $self->gender ? $2 : $1 1600 (?:
1601 ([^<>]*) (?{ $group = $^N })
1602 | < $interior >
1603 )
1604 >
1605 %gcsx
1606 ) {
1607 my ($code, $data) = ($1, $group);
1608
1609 if ($code eq "B") {
1610 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1611 } elsif ($code eq "I") {
1612 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1613 } elsif ($code eq "U") {
1614 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1615 } elsif ($code eq "C") {
1616 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1617 } elsif ($code eq "T") {
1618 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1619 } elsif ($code eq "G") {
1620 my ($male, $female) = split /\|/, $data;
1621 $data = $self->gender ? $female : $male;
1622 $xml .= expand_cfpod ($self, $data);
1623 } elsif ($code eq "H") {
1624 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1625 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1626 "")
1627 [$self->{hintmode}];
1628 } else {
1629 $xml .= "error processing '$code($data)' directive";
1630 }
1631 } else {
1632 if ($pod =~ /\G(.+)/) {
1633 warn "parse error while expanding $pod (at $1)";
1634 }
1635 last;
1404 }ge 1636 }
1405 # replace H<hint text> 1637 }
1406 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;
1407 1638
1639 for ($xml) {
1408 # create single paragraphs (very hackish) 1640 # create single paragraphs (very hackish)
1409 s/(?<=\S)\n(?=\w)/ /g; 1641 s/(?<=\S)\n(?=\w)/ /g;
1410 1642
1411 $_ 1643 # compress some whitespace
1412} 1644 s/\s+\n/\n/g; # ws line-ends
1645 s/\n\n+/\n/g; # double lines
1646 s/^\n+//; # beginning lines
1647 s/\n+$//; # ending lines
1648 }
1413 1649
1650 $xml
1651}
1652
1653no re 'eval';
1654
1655sub hintmode {
1656 $_[0]{hintmode} = $_[1] if @_ > 1;
1657 $_[0]{hintmode}
1658}
1659
1414=item $player->ext_reply ($msgid, %msg) 1660=item $player->ext_reply ($msgid, @msg)
1415 1661
1416Sends an ext reply to the player. 1662Sends an ext reply to the player.
1417 1663
1418=cut 1664=cut
1419 1665
1420sub ext_reply($$%) { 1666sub ext_reply($$@) {
1421 my ($self, $id, %msg) = @_; 1667 my ($self, $id, @msg) = @_;
1422 1668
1423 $msg{msgid} = $id; 1669 $self->ns->ext_reply ($id, @msg)
1424 $self->send ("ext " . cf::to_json \%msg);
1425} 1670}
1426 1671
1427=item $player->ext_event ($type, %msg) 1672=item $player->ext_msg ($type, @msg)
1428 1673
1429Sends an ext event to the client. 1674Sends an ext event to the client.
1430 1675
1431=cut 1676=cut
1432 1677
1433sub ext_event($$%) { 1678sub ext_msg($$@) {
1434 my ($self, $type, %msg) = @_; 1679 my ($self, $type, @msg) = @_;
1435 1680
1436 $self->ns->ext_event ($type, %msg); 1681 $self->ns->ext_msg ($type, @msg);
1437} 1682}
1438 1683
1439=head3 cf::region 1684=head3 cf::region
1440 1685
1441=over 4 1686=over 4
1454 my ($path) = @_; 1699 my ($path) = @_;
1455 1700
1456 my ($match, $specificity); 1701 my ($match, $specificity);
1457 1702
1458 for my $region (list) { 1703 for my $region (list) {
1459 if ($region->match && $path =~ $region->match) { 1704 if ($region->{match} && $path =~ $region->{match}) {
1460 ($match, $specificity) = ($region, $region->specificity) 1705 ($match, $specificity) = ($region, $region->specificity)
1461 if $region->specificity > $specificity; 1706 if $region->specificity > $specificity;
1462 } 1707 }
1463 } 1708 }
1464 1709
1584 $self->init; # pass $1 etc. 1829 $self->init; # pass $1 etc.
1585 return $self; 1830 return $self;
1586 } 1831 }
1587 } 1832 }
1588 1833
1589 Carp::carp "unable to resolve path '$path' (base '$base')."; 1834 Carp::cluck "unable to resolve path '$path' (base '$base').";
1590 () 1835 ()
1591} 1836}
1592 1837
1593sub init { 1838sub init {
1594 my ($self) = @_; 1839 my ($self) = @_;
1657 1902
1658sub load_header_from($) { 1903sub load_header_from($) {
1659 my ($self, $path) = @_; 1904 my ($self, $path) = @_;
1660 1905
1661 utf8::encode $path; 1906 utf8::encode $path;
1662 #aio_open $path, O_RDONLY, 0 1907 my $f = new_from_file cf::object::thawer $path
1663 # or return;
1664
1665 $self->_load_header ($path)
1666 or return; 1908 or return;
1909
1910 $self->_load_header ($f)
1911 or return;
1912
1913 local $MAP_LOADING{$self->{path}} = $self;
1914 $f->resolve_delayed_derefs;
1667 1915
1668 $self->{load_path} = $path; 1916 $self->{load_path} = $path;
1669 1917
1670 1 1918 1
1671} 1919}
1725sub find { 1973sub find {
1726 my ($path, $origin) = @_; 1974 my ($path, $origin) = @_;
1727 1975
1728 $path = normalise $path, $origin && $origin->path; 1976 $path = normalise $path, $origin && $origin->path;
1729 1977
1978 cf::lock_wait "map_data:$path";#d#remove
1730 cf::lock_wait "map_find:$path"; 1979 cf::lock_wait "map_find:$path";
1731 1980
1732 $cf::MAP{$path} || do { 1981 $cf::MAP{$path} || do {
1733 my $guard = cf::lock_acquire "map_find:$path"; 1982 my $guard1 = cf::lock_acquire "map_find:$path";
1983 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1984
1734 my $map = new_from_path cf::map $path 1985 my $map = new_from_path cf::map $path
1735 or return; 1986 or return;
1736 1987
1737 $map->{last_save} = $cf::RUNTIME; 1988 $map->{last_save} = $cf::RUNTIME;
1738 1989
1740 or return; 1991 or return;
1741 1992
1742 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1993 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1743 # doing this can freeze the server in a sync job, obviously 1994 # doing this can freeze the server in a sync job, obviously
1744 #$cf::WAIT_FOR_TICK->wait; 1995 #$cf::WAIT_FOR_TICK->wait;
1996 undef $guard1;
1997 undef $guard2;
1745 $map->reset; 1998 $map->reset;
1746 undef $guard;
1747 return find $path; 1999 return find $path;
1748 } 2000 }
1749 2001
1750 $cf::MAP{$path} = $map 2002 $cf::MAP{$path} = $map
1751 } 2003 }
1760 local $self->{deny_reset} = 1; # loading can take a long time 2012 local $self->{deny_reset} = 1; # loading can take a long time
1761 2013
1762 my $path = $self->{path}; 2014 my $path = $self->{path};
1763 2015
1764 { 2016 {
1765 my $guard = cf::lock_acquire "map_load:$path"; 2017 my $guard = cf::lock_acquire "map_data:$path";
1766 2018
2019 return unless $self->valid;
1767 return if $self->in_memory != cf::MAP_SWAPPED; 2020 return unless $self->in_memory == cf::MAP_SWAPPED;
1768 2021
1769 $self->in_memory (cf::MAP_LOADING); 2022 $self->in_memory (cf::MAP_LOADING);
1770 2023
1771 $self->alloc; 2024 $self->alloc;
1772 2025
1773 $self->pre_load; 2026 $self->pre_load;
1774 Coro::cede; 2027 cf::cede_to_tick;
1775 2028
2029 my $f = new_from_file cf::object::thawer $self->{load_path};
2030 $f->skip_block;
1776 $self->_load_objects ($self->{load_path}, 1) 2031 $self->_load_objects ($f)
1777 or return; 2032 or return;
1778 2033
1779 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2034 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1780 if delete $self->{load_original}; 2035 if delete $self->{load_original};
1781 2036
1782 if (my $uniq = $self->uniq_path) { 2037 if (my $uniq = $self->uniq_path) {
1783 utf8::encode $uniq; 2038 utf8::encode $uniq;
1784 if (aio_open $uniq, O_RDONLY, 0) { 2039 unless (aio_stat $uniq) {
2040 if (my $f = new_from_file cf::object::thawer $uniq) {
1785 $self->clear_unique_items; 2041 $self->clear_unique_items;
1786 $self->_load_objects ($uniq, 0); 2042 $self->_load_objects ($f);
2043 $f->resolve_delayed_derefs;
2044 }
1787 } 2045 }
1788 } 2046 }
1789 2047
1790 Coro::cede; 2048 $f->resolve_delayed_derefs;
2049
2050 cf::cede_to_tick;
1791 # now do the right thing for maps 2051 # now do the right thing for maps
1792 $self->link_multipart_objects; 2052 $self->link_multipart_objects;
1793 $self->difficulty ($self->estimate_difficulty) 2053 $self->difficulty ($self->estimate_difficulty)
1794 unless $self->difficulty; 2054 unless $self->difficulty;
1795 Coro::cede; 2055 cf::cede_to_tick;
1796 2056
1797 unless ($self->{deny_activate}) { 2057 unless ($self->{deny_activate}) {
1798 $self->decay_objects; 2058 $self->decay_objects;
1799 $self->fix_auto_apply; 2059 $self->fix_auto_apply;
1800 $self->update_buttons; 2060 $self->update_buttons;
1801 Coro::cede; 2061 cf::cede_to_tick;
1802 $self->set_darkness_map; 2062 $self->set_darkness_map;
1803 Coro::cede; 2063 cf::cede_to_tick;
1804 $self->activate; 2064 $self->activate;
1805 } 2065 }
2066
2067 $self->{last_save} = $cf::RUNTIME;
2068 $self->last_access ($cf::RUNTIME);
1806 2069
1807 $self->in_memory (cf::MAP_IN_MEMORY); 2070 $self->in_memory (cf::MAP_IN_MEMORY);
1808 } 2071 }
1809 2072
1810 $self->post_load; 2073 $self->post_load;
1821 2084
1822 $self 2085 $self
1823} 2086}
1824 2087
1825# find and load all maps in the 3x3 area around a map 2088# find and load all maps in the 3x3 area around a map
1826sub load_diag { 2089sub load_neighbours {
1827 my ($map) = @_; 2090 my ($map) = @_;
1828 2091
1829 my @diag; # diagonal neighbours 2092 my @neigh; # diagonal neighbours
1830 2093
1831 for (0 .. 3) { 2094 for (0 .. 3) {
1832 my $neigh = $map->tile_path ($_) 2095 my $neigh = $map->tile_path ($_)
1833 or next; 2096 or next;
1834 $neigh = find $neigh, $map 2097 $neigh = find $neigh, $map
1835 or next; 2098 or next;
1836 $neigh->load; 2099 $neigh->load;
1837 2100
2101 push @neigh,
1838 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2102 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1839 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2103 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1840 } 2104 }
1841 2105
1842 for (@diag) { 2106 for (grep defined $_->[0], @neigh) {
2107 my ($path, $origin) = @$_;
1843 my $neigh = find @$_ 2108 my $neigh = find $path, $origin
1844 or next; 2109 or next;
1845 $neigh->load; 2110 $neigh->load;
1846 } 2111 }
1847} 2112}
1848 2113
1853} 2118}
1854 2119
1855sub do_load_sync { 2120sub do_load_sync {
1856 my ($map) = @_; 2121 my ($map) = @_;
1857 2122
2123 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2124 if $Coro::current == $Coro::main;
2125
1858 cf::sync_job { $map->load }; 2126 cf::sync_job { $map->load };
1859} 2127}
1860 2128
1861our %MAP_PREFETCH; 2129our %MAP_PREFETCH;
1862our $MAP_PREFETCHER = undef; 2130our $MAP_PREFETCHER = undef;
1863 2131
1864sub find_async { 2132sub find_async {
1865 my ($path, $origin) = @_; 2133 my ($path, $origin, $load) = @_;
1866 2134
1867 $path = normalise $path, $origin && $origin->{path}; 2135 $path = normalise $path, $origin && $origin->{path};
1868 2136
1869 if (my $map = $cf::MAP{$path}) { 2137 if (my $map = $cf::MAP{$path}) {
1870 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2138 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1871 } 2139 }
1872 2140
1873 undef $MAP_PREFETCH{$path}; 2141 $MAP_PREFETCH{$path} |= $load;
2142
1874 $MAP_PREFETCHER ||= cf::async { 2143 $MAP_PREFETCHER ||= cf::async {
2144 $Coro::current->{desc} = "map prefetcher";
2145
1875 while (%MAP_PREFETCH) { 2146 while (%MAP_PREFETCH) {
1876 for my $path (keys %MAP_PREFETCH) { 2147 while (my ($k, $v) = each %MAP_PREFETCH) {
1877 my $map = find $path 2148 if (my $map = find $k) {
1878 or next;
1879 $map->load; 2149 $map->load if $v;
2150 }
1880 2151
1881 delete $MAP_PREFETCH{$path}; 2152 delete $MAP_PREFETCH{$k};
1882 } 2153 }
1883 } 2154 }
1884 undef $MAP_PREFETCHER; 2155 undef $MAP_PREFETCHER;
1885 }; 2156 };
1886 $MAP_PREFETCHER->prio (6); 2157 $MAP_PREFETCHER->prio (6);
1889} 2160}
1890 2161
1891sub save { 2162sub save {
1892 my ($self) = @_; 2163 my ($self) = @_;
1893 2164
1894 my $lock = cf::lock_acquire "map_data:" . $self->path; 2165 my $lock = cf::lock_acquire "map_data:$self->{path}";
1895 2166
1896 $self->{last_save} = $cf::RUNTIME; 2167 $self->{last_save} = $cf::RUNTIME;
1897 2168
1898 return unless $self->dirty; 2169 return unless $self->dirty;
1899 2170
1905 return if $self->{deny_save}; 2176 return if $self->{deny_save};
1906 2177
1907 local $self->{last_access} = $self->last_access;#d# 2178 local $self->{last_access} = $self->last_access;#d#
1908 2179
1909 cf::async { 2180 cf::async {
2181 $Coro::current->{desc} = "map player save";
1910 $_->contr->save for $self->players; 2182 $_->contr->save for $self->players;
1911 }; 2183 };
1912 2184
1913 if ($uniq) { 2185 if ($uniq) {
1914 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2186 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1922 my ($self) = @_; 2194 my ($self) = @_;
1923 2195
1924 # save first because save cedes 2196 # save first because save cedes
1925 $self->save; 2197 $self->save;
1926 2198
1927 my $lock = cf::lock_acquire "map_data:" . $self->path; 2199 my $lock = cf::lock_acquire "map_data:$self->{path}";
1928 2200
1929 return if $self->players; 2201 return if $self->players;
1930 return if $self->in_memory != cf::MAP_IN_MEMORY; 2202 return if $self->in_memory != cf::MAP_IN_MEMORY;
1931 return if $self->{deny_save}; 2203 return if $self->{deny_save};
1932 2204
2205 $self->in_memory (cf::MAP_SWAPPED);
2206
2207 $self->deactivate;
2208 $_->clear_links_to ($self) for values %cf::MAP;
1933 $self->clear; 2209 $self->clear;
1934 $self->in_memory (cf::MAP_SWAPPED);
1935} 2210}
1936 2211
1937sub reset_at { 2212sub reset_at {
1938 my ($self) = @_; 2213 my ($self) = @_;
1939 2214
1971 if $uniq; 2246 if $uniq;
1972 } 2247 }
1973 2248
1974 delete $cf::MAP{$self->path}; 2249 delete $cf::MAP{$self->path};
1975 2250
2251 $self->deactivate;
2252 $_->clear_links_to ($self) for values %cf::MAP;
1976 $self->clear; 2253 $self->clear;
1977
1978 $_->clear_links_to ($self) for values %cf::MAP;
1979 2254
1980 $self->unlink_save; 2255 $self->unlink_save;
1981 $self->destroy; 2256 $self->destroy;
1982} 2257}
1983 2258
1984my $nuke_counter = "aaaa"; 2259my $nuke_counter = "aaaa";
1985 2260
1986sub nuke { 2261sub nuke {
1987 my ($self) = @_; 2262 my ($self) = @_;
1988 2263
2264 {
2265 my $lock = cf::lock_acquire "map_data:$self->{path}";
2266
1989 delete $cf::MAP{$self->path}; 2267 delete $cf::MAP{$self->path};
1990 2268
1991 $self->unlink_save; 2269 $self->unlink_save;
1992 2270
1993 bless $self, "cf::map"; 2271 bless $self, "cf::map";
1994 delete $self->{deny_reset}; 2272 delete $self->{deny_reset};
1995 $self->{deny_save} = 1; 2273 $self->{deny_save} = 1;
1996 $self->reset_timeout (1); 2274 $self->reset_timeout (1);
1997 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2275 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1998 2276
1999 $cf::MAP{$self->path} = $self; 2277 $cf::MAP{$self->path} = $self;
2278 }
2000 2279
2001 $self->reset; # polite request, might not happen 2280 $self->reset; # polite request, might not happen
2002} 2281}
2003 2282
2004=item $maps = cf::map::tmp_maps 2283=item $maps = cf::map::tmp_maps
2080 2359
2081sub inv_recursive { 2360sub inv_recursive {
2082 inv_recursive_ inv $_[0] 2361 inv_recursive_ inv $_[0]
2083} 2362}
2084 2363
2364=item $ref = $ob->ref
2365
2366creates and returns a persistent reference to an objetc that can be stored as a string.
2367
2368=item $ob = cf::object::deref ($refstring)
2369
2370returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2371even if the object actually exists. May block.
2372
2373=cut
2374
2375sub deref {
2376 my ($ref) = @_;
2377
2378 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2379 my ($uuid, $name) = ($1, $2);
2380 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2381 or return;
2382 $pl->ob->uuid eq $uuid
2383 or return;
2384
2385 $pl->ob
2386 } else {
2387 warn "$ref: cannot resolve object reference\n";
2388 undef
2389 }
2390}
2391
2085package cf; 2392package cf;
2086 2393
2087=back 2394=back
2088 2395
2089=head3 cf::object::player 2396=head3 cf::object::player
2111 2418
2112 } else { 2419 } else {
2113 my $pl = $self->contr; 2420 my $pl = $self->contr;
2114 2421
2115 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2422 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2116 my $diag = $pl->{npc_dialog}; 2423 my $dialog = $pl->{npc_dialog};
2117 $diag->{pl}->ext_reply ( 2424 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2118 $diag->{id},
2119 msgtype => "reply",
2120 msg => $diag->{pl}->expand_cfpod ($msg),
2121 add_topics => []
2122 );
2123 2425
2124 } else { 2426 } else {
2125 $msg = $npc->name . " says: $msg" if $npc; 2427 $msg = $npc->name . " says: $msg" if $npc;
2126 $self->message ($msg, $flags); 2428 $self->message ($msg, $flags);
2127 } 2429 }
2128 } 2430 }
2431}
2432
2433=item $object->send_msg ($channel, $msg, $color, [extra...])
2434
2435=cut
2436
2437sub cf::object::send_msg {
2438 my $pl = shift->contr
2439 or return;
2440 $pl->send_msg (@_);
2129} 2441}
2130 2442
2131=item $player_object->may ("access") 2443=item $player_object->may ("access")
2132 2444
2133Returns wether the given player is authorized to access resource "access" 2445Returns wether the given player is authorized to access resource "access"
2212 # use -1 or undef as default coordinates, not 0, 0 2524 # use -1 or undef as default coordinates, not 0, 0
2213 ($x, $y) = ($map->enter_x, $map->enter_y) 2525 ($x, $y) = ($map->enter_x, $map->enter_y)
2214 if $x <=0 && $y <= 0; 2526 if $x <=0 && $y <= 0;
2215 2527
2216 $map->load; 2528 $map->load;
2217 $map->load_diag; 2529 $map->load_neighbours;
2218 2530
2219 return unless $self->contr->active; 2531 return unless $self->contr->active;
2220 $self->activate_recursive; 2532 $self->activate_recursive;
2221 2533
2222 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2534 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2223 $self->enter_map ($map, $x, $y); 2535 $self->enter_map ($map, $x, $y);
2224} 2536}
2225 2537
2226=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2538=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2227 2539
2228Moves the player to the given map-path and coordinates by first freezing 2540Moves the player to the given map-path and coordinates by first freezing
2229her, loading and preparing them map, calling the provided $check callback 2541her, loading and preparing them map, calling the provided $check callback
2230that has to return the map if sucecssful, and then unfreezes the player on 2542that has to return the map if sucecssful, and then unfreezes the player on
2231the new (success) or old (failed) map position. 2543the new (success) or old (failed) map position. In either case, $done will
2544be called at the end of this process.
2232 2545
2233=cut 2546=cut
2234 2547
2235our $GOTOGEN; 2548our $GOTOGEN;
2236 2549
2237sub cf::object::player::goto { 2550sub cf::object::player::goto {
2238 my ($self, $path, $x, $y, $check) = @_; 2551 my ($self, $path, $x, $y, $check, $done) = @_;
2239 2552
2240 # do generation counting so two concurrent goto's will be executed in-order 2553 # do generation counting so two concurrent goto's will be executed in-order
2241 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2554 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2242 2555
2243 $self->enter_link; 2556 $self->enter_link;
2244 2557
2245 (async { 2558 (async {
2559 $Coro::current->{desc} = "player::goto $path $x $y";
2560
2561 # *tag paths override both path and x|y
2562 if ($path =~ /^\*(.*)$/) {
2563 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2564 my $ob = $obs[rand @obs];
2565
2566 # see if we actually can go there
2567 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2568 $ob = $obs[rand @obs];
2569 } else {
2570 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2571 }
2572 # else put us there anyways for now #d#
2573
2574 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2575 } else {
2576 ($path, $x, $y) = (undef, undef, undef);
2577 }
2578 }
2579
2246 my $map = eval { 2580 my $map = eval {
2247 my $map = cf::map::find $path; 2581 my $map = defined $path ? cf::map::find $path : undef;
2248 2582
2249 if ($map) { 2583 if ($map) {
2250 $map = $map->customise_for ($self); 2584 $map = $map->customise_for ($self);
2251 $map = $check->($map) if $check && $map; 2585 $map = $check->($map) if $check && $map;
2252 } else { 2586 } else {
2253 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2587 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2254 } 2588 }
2255 2589
2256 $map 2590 $map
2257 }; 2591 };
2258 2592
2263 2597
2264 if ($gen == $self->{_goto_generation}) { 2598 if ($gen == $self->{_goto_generation}) {
2265 delete $self->{_goto_generation}; 2599 delete $self->{_goto_generation};
2266 $self->leave_link ($map, $x, $y); 2600 $self->leave_link ($map, $x, $y);
2267 } 2601 }
2602
2603 $done->() if $done;
2268 })->prio (1); 2604 })->prio (1);
2269} 2605}
2270 2606
2271=item $player_object->enter_exit ($exit_object) 2607=item $player_object->enter_exit ($exit_object)
2272 2608
2309 $rmp->{origin_y} = $exit->y; 2645 $rmp->{origin_y} = $exit->y;
2310 } 2646 }
2311 2647
2312 $rmp->{random_seed} ||= $exit->random_seed; 2648 $rmp->{random_seed} ||= $exit->random_seed;
2313 2649
2314 my $data = cf::to_json $rmp; 2650 my $data = cf::encode_json $rmp;
2315 my $md5 = Digest::MD5::md5_hex $data; 2651 my $md5 = Digest::MD5::md5_hex $data;
2316 my $meta = "$RANDOMDIR/$md5.meta"; 2652 my $meta = "$RANDOMDIR/$md5.meta";
2317 2653
2318 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2654 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2319 aio_write $fh, 0, (length $data), $data, 0; 2655 aio_write $fh, 0, (length $data), $data, 0;
2341 my $hp = $exit->stats->hp; 2677 my $hp = $exit->stats->hp;
2342 my $sp = $exit->stats->sp; 2678 my $sp = $exit->stats->sp;
2343 2679
2344 $self->enter_link; 2680 $self->enter_link;
2345 2681
2682 # if exit is damned, update players death & WoR home-position
2683 $self->contr->savebed ($slaying, $hp, $sp)
2684 if $exit->flag (FLAG_DAMNED);
2685
2346 (async { 2686 (async {
2687 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2688
2347 $self->deactivate_recursive; # just to be sure 2689 $self->deactivate_recursive; # just to be sure
2348 unless (eval { 2690 unless (eval {
2349 $self->goto ($slaying, $hp, $sp); 2691 $self->goto ($slaying, $hp, $sp);
2350 2692
2351 1; 2693 1;
2377 2719
2378 utf8::encode $text; 2720 utf8::encode $text;
2379 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2721 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2380} 2722}
2381 2723
2382=item $client->send_msg ($color, $type, $msg, [extra...]) 2724=item $client->send_msg ($channel, $msg, $color, [extra...])
2383 2725
2384Send a drawinfo or msg packet to the client, formatting the msg for the 2726Send a drawinfo or msg packet to the client, formatting the msg for the
2385client if neccessary. C<$type> should be a string identifying the type of 2727client if neccessary. C<$type> should be a string identifying the type of
2386the message, with C<log> being the default. If C<$color> is negative, suppress 2728the message, with C<log> being the default. If C<$color> is negative, suppress
2387the message unless the client supports the msg packet. 2729the message unless the client supports the msg packet.
2388 2730
2389=cut 2731=cut
2390 2732
2733# non-persistent channels (usually the info channel)
2734our %CHANNEL = (
2735 "c/identify" => {
2736 id => "infobox",
2737 title => "Identify",
2738 reply => undef,
2739 tooltip => "Items recently identified",
2740 },
2741 "c/examine" => {
2742 id => "infobox",
2743 title => "Examine",
2744 reply => undef,
2745 tooltip => "Signs and other items you examined",
2746 },
2747 "c/book" => {
2748 id => "infobox",
2749 title => "Book",
2750 reply => undef,
2751 tooltip => "The contents of a note or book",
2752 },
2753 "c/lookat" => {
2754 id => "infobox",
2755 title => "Look",
2756 reply => undef,
2757 tooltip => "What you saw there",
2758 },
2759 "c/who" => {
2760 id => "infobox",
2761 title => "Players",
2762 reply => undef,
2763 tooltip => "Shows players who are currently online",
2764 },
2765 "c/body" => {
2766 id => "infobox",
2767 title => "Body Parts",
2768 reply => undef,
2769 tooltip => "Shows which body parts you posess and are available",
2770 },
2771 "c/uptime" => {
2772 id => "infobox",
2773 title => "Uptime",
2774 reply => undef,
2775 tooltip => "How long the server has been running since last restart",
2776 },
2777 "c/mapinfo" => {
2778 id => "infobox",
2779 title => "Map Info",
2780 reply => undef,
2781 tooltip => "Information related to the maps",
2782 },
2783);
2784
2391sub cf::client::send_msg { 2785sub cf::client::send_msg {
2392 my ($self, $color, $type, $msg, @extra) = @_; 2786 my ($self, $channel, $msg, $color, @extra) = @_;
2393 2787
2394 $msg = $self->pl->expand_cfpod ($msg); 2788 $msg = $self->pl->expand_cfpod ($msg);
2395 2789
2790 $color &= cf::NDI_CLIENT_MASK; # just in case...
2791
2792 # check predefined channels, for the benefit of C
2793 if ($CHANNEL{$channel}) {
2794 $channel = $CHANNEL{$channel};
2795
2796 $self->ext_msg (channel_info => $channel)
2797 if $self->can_msg;
2798
2799 $channel = $channel->{id};
2800
2801 } elsif (ref $channel) {
2802 # send meta info to client, if not yet sent
2803 unless (exists $self->{channel}{$channel->{id}}) {
2804 $self->{channel}{$channel->{id}} = $channel;
2805 $self->ext_msg (channel_info => $channel)
2806 if $self->can_msg;
2807 }
2808
2809 $channel = $channel->{id};
2810 }
2811
2812 return unless @extra || length $msg;
2813
2396 if ($self->can_msg) { 2814 if ($self->can_msg) {
2397 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); 2815 # default colour, mask it out
2816 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2817 if $color & cf::NDI_DEF;
2818
2819 $self->send_packet ("msg " . $self->{json_coder}->encode (
2820 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2398 } else { 2821 } else {
2399 # replace some tags by gcfclient-compatible ones
2400 for ($msg) {
2401 1 while
2402 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2403 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2404 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2405 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2406 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2407 }
2408
2409 if ($color >= 0) { 2822 if ($color >= 0) {
2823 # replace some tags by gcfclient-compatible ones
2824 for ($msg) {
2825 1 while
2826 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2827 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2828 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2829 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2830 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2831 }
2832
2833 $color &= cf::NDI_COLOR_MASK;
2834
2835 utf8::encode $msg;
2836
2410 if (0 && $msg =~ /\[/) { 2837 if (0 && $msg =~ /\[/) {
2838 # COMMAND/INFO
2411 $self->send_packet ("drawextinfo $color 4 0 $msg") 2839 $self->send_packet ("drawextinfo $color 10 8 $msg")
2412 } else { 2840 } else {
2413 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2841 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2414 $self->send_packet ("drawinfo $color $msg") 2842 $self->send_packet ("drawinfo $color $msg")
2415 } 2843 }
2416 } 2844 }
2417 } 2845 }
2418} 2846}
2419 2847
2420=item $client->ext_event ($type, %msg) 2848=item $client->ext_msg ($type, @msg)
2421 2849
2422Sends an ext event to the client. 2850Sends an ext event to the client.
2423 2851
2424=cut 2852=cut
2425 2853
2426sub cf::client::ext_event($$%) { 2854sub cf::client::ext_msg($$@) {
2427 my ($self, $type, %msg) = @_; 2855 my ($self, $type, @msg) = @_;
2428 2856
2857 if ($self->extcmd == 2) {
2858 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2859 } elsif ($self->extcmd == 1) { # TODO: remove
2429 $msg{msgtype} = "event_$type"; 2860 push @msg, msgtype => "event_$type";
2430 $self->send_packet ("ext " . cf::to_json \%msg); 2861 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2862 }
2863}
2864
2865=item $client->ext_reply ($msgid, @msg)
2866
2867Sends an ext reply to the client.
2868
2869=cut
2870
2871sub cf::client::ext_reply($$@) {
2872 my ($self, $id, @msg) = @_;
2873
2874 if ($self->extcmd == 2) {
2875 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2876 } elsif ($self->extcmd == 1) {
2877 #TODO: version 1, remove
2878 unshift @msg, msgtype => "reply", msgid => $id;
2879 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2880 }
2431} 2881}
2432 2882
2433=item $success = $client->query ($flags, "text", \&cb) 2883=item $success = $client->query ($flags, "text", \&cb)
2434 2884
2435Queues a query to the client, calling the given callback with 2885Queues a query to the client, calling the given callback with
2458 2908
2459 1 2909 1
2460} 2910}
2461 2911
2462cf::client->attach ( 2912cf::client->attach (
2913 on_connect => sub {
2914 my ($ns) = @_;
2915
2916 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2917 },
2463 on_reply => sub { 2918 on_reply => sub {
2464 my ($ns, $msg) = @_; 2919 my ($ns, $msg) = @_;
2465 2920
2466 # this weird shuffling is so that direct followup queries 2921 # this weird shuffling is so that direct followup queries
2467 # get handled first 2922 # get handled first
2482 } 2937 }
2483 }, 2938 },
2484 on_exticmd => sub { 2939 on_exticmd => sub {
2485 my ($ns, $buf) = @_; 2940 my ($ns, $buf) = @_;
2486 2941
2487 my $msg = eval { from_json $buf }; 2942 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2488 2943
2489 if (ref $msg) { 2944 if (ref $msg) {
2945 my ($type, $reply, @payload) =
2946 "ARRAY" eq ref $msg
2947 ? @$msg
2948 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2949
2950 my @reply;
2951
2490 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2952 if (my $cb = $EXTICMD{$type}) {
2491 if (my %reply = $cb->($ns, $msg)) { 2953 @reply = $cb->($ns, @payload);
2492 $reply{msgid} = $msg->{msgid};
2493 $ns->send ("ext " . cf::to_json \%reply);
2494 }
2495 } 2954 }
2955
2956 $ns->ext_reply ($reply, @reply)
2957 if $reply;
2958
2496 } else { 2959 } else {
2497 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2960 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2498 } 2961 }
2499 2962
2500 cf::override; 2963 cf::override;
2547our $safe = new Safe "safe"; 3010our $safe = new Safe "safe";
2548our $safe_hole = new Safe::Hole; 3011our $safe_hole = new Safe::Hole;
2549 3012
2550$SIG{FPE} = 'IGNORE'; 3013$SIG{FPE} = 'IGNORE';
2551 3014
2552$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3015$safe->permit_only (Opcode::opset qw(
3016 :base_core :base_mem :base_orig :base_math
3017 grepstart grepwhile mapstart mapwhile
3018 sort time
3019));
2553 3020
2554# here we export the classes and methods available to script code 3021# here we export the classes and methods available to script code
2555 3022
2556=pod 3023=pod
2557 3024
2558The following functions and methods are available within a safe environment: 3025The following functions and methods are available within a safe environment:
2559 3026
2560 cf::object contr pay_amount pay_player map 3027 cf::object
3028 contr pay_amount pay_player map x y force_find force_add destroy
3029 insert remove name archname title slaying race decrease_ob_nr
3030
2561 cf::object::player player 3031 cf::object::player
2562 cf::player peaceful 3032 player
2563 cf::map trigger 3033
3034 cf::player
3035 peaceful
3036
3037 cf::map
3038 trigger
2564 3039
2565=cut 3040=cut
2566 3041
2567for ( 3042for (
2568 ["cf::object" => qw(contr pay_amount pay_player map)], 3043 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3044 insert remove inv name archname title slaying race
3045 decrease_ob_nr destroy)],
2569 ["cf::object::player" => qw(player)], 3046 ["cf::object::player" => qw(player)],
2570 ["cf::player" => qw(peaceful)], 3047 ["cf::player" => qw(peaceful)],
2571 ["cf::map" => qw(trigger)], 3048 ["cf::map" => qw(trigger)],
2572) { 3049) {
2573 no strict 'refs'; 3050 no strict 'refs';
2649# the server's init and main functions 3126# the server's init and main functions
2650 3127
2651sub load_facedata($) { 3128sub load_facedata($) {
2652 my ($path) = @_; 3129 my ($path) = @_;
2653 3130
3131 # HACK to clear player env face cache, we need some signal framework
3132 # for this (global event?)
3133 %ext::player_env::MUSIC_FACE_CACHE = ();
3134
3135 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3136
2654 warn "loading facedata from $path\n"; 3137 warn "loading facedata from $path\n";
2655 3138
2656 my $facedata; 3139 my $facedata;
2657 0 < aio_load $path, $facedata 3140 0 < aio_load $path, $facedata
2658 or die "$path: $!"; 3141 or die "$path: $!";
2660 $facedata = Coro::Storable::thaw $facedata; 3143 $facedata = Coro::Storable::thaw $facedata;
2661 3144
2662 $facedata->{version} == 2 3145 $facedata->{version} == 2
2663 or cf::cleanup "$path: version mismatch, cannot proceed."; 3146 or cf::cleanup "$path: version mismatch, cannot proceed.";
2664 3147
3148 # patch in the exptable
3149 $facedata->{resource}{"res/exp_table"} = {
3150 type => FT_RSRC,
3151 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3152 };
3153 cf::cede_to_tick;
3154
2665 { 3155 {
2666 my $faces = $facedata->{faceinfo}; 3156 my $faces = $facedata->{faceinfo};
2667 3157
2668 while (my ($face, $info) = each %$faces) { 3158 while (my ($face, $info) = each %$faces) {
2669 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3159 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3160
2670 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3161 cf::face::set_visibility $idx, $info->{visibility};
3162 cf::face::set_magicmap $idx, $info->{magicmap};
2671 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3163 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2672 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3164 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2673 Coro::cede; 3165
3166 cf::cede_to_tick;
2674 } 3167 }
2675 3168
2676 while (my ($face, $info) = each %$faces) { 3169 while (my ($face, $info) = each %$faces) {
2677 next unless $info->{smooth}; 3170 next unless $info->{smooth};
3171
2678 my $idx = cf::face::find $face 3172 my $idx = cf::face::find $face
2679 or next; 3173 or next;
3174
2680 if (my $smooth = cf::face::find $info->{smooth}) { 3175 if (my $smooth = cf::face::find $info->{smooth}) {
3176 cf::face::set_smooth $idx, $smooth;
2681 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3177 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2682 } else { 3178 } else {
2683 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3179 warn "smooth face '$info->{smooth}' not found for face '$face'";
2684 } 3180 }
2685 Coro::cede; 3181
3182 cf::cede_to_tick;
2686 } 3183 }
2687 } 3184 }
2688 3185
2689 { 3186 {
2690 my $anims = $facedata->{animinfo}; 3187 my $anims = $facedata->{animinfo};
2691 3188
2692 while (my ($anim, $info) = each %$anims) { 3189 while (my ($anim, $info) = each %$anims) {
2693 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3190 cf::anim::set $anim, $info->{frames}, $info->{facings};
2694 Coro::cede; 3191 cf::cede_to_tick;
2695 } 3192 }
2696 3193
2697 cf::anim::invalidate_all; # d'oh 3194 cf::anim::invalidate_all; # d'oh
2698 } 3195 }
2699 3196
3197 {
3198 # TODO: for gcfclient pleasure, we should give resources
3199 # that gcfclient doesn't grok a >10000 face index.
3200 my $res = $facedata->{resource};
3201
3202 while (my ($name, $info) = each %$res) {
3203 if (defined $info->{type}) {
3204 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3205 my $data;
3206
3207 if ($info->{type} & 1) {
3208 # prepend meta info
3209
3210 my $meta = $enc->encode ({
3211 name => $name,
3212 %{ $info->{meta} || {} },
3213 });
3214
3215 $data = pack "(w/a*)*", $meta, $info->{data};
3216 } else {
3217 $data = $info->{data};
3218 }
3219
3220 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3221 cf::face::set_type $idx, $info->{type};
3222 } else {
3223 $RESOURCE{$name} = $info;
3224 }
3225
3226 cf::cede_to_tick;
3227 }
3228 }
3229
3230 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3231
2700 1 3232 1
2701} 3233}
2702 3234
3235cf::global->attach (on_resource_update => sub {
3236 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3237 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3238
3239 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3240 my $sound = $soundconf->{compat}[$_]
3241 or next;
3242
3243 my $face = cf::face::find "sound/$sound->[1]";
3244 cf::sound::set $sound->[0] => $face;
3245 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3246 }
3247
3248 while (my ($k, $v) = each %{$soundconf->{event}}) {
3249 my $face = cf::face::find "sound/$v";
3250 cf::sound::set $k => $face;
3251 }
3252 }
3253});
3254
3255register_exticmd fx_want => sub {
3256 my ($ns, $want) = @_;
3257
3258 while (my ($k, $v) = each %$want) {
3259 $ns->fx_want ($k, $v);
3260 }
3261};
3262
2703sub reload_regions { 3263sub reload_regions {
3264 # HACK to clear player env face cache, we need some signal framework
3265 # for this (global event?)
3266 %ext::player_env::MUSIC_FACE_CACHE = ();
3267
2704 load_resource_file "$MAPDIR/regions" 3268 load_resource_file "$MAPDIR/regions"
2705 or die "unable to load regions file\n"; 3269 or die "unable to load regions file\n";
3270
3271 for (cf::region::list) {
3272 $_->{match} = qr/$_->{match}/
3273 if exists $_->{match};
3274 }
2706} 3275}
2707 3276
2708sub reload_facedata { 3277sub reload_facedata {
2709 load_facedata "$DATADIR/facedata" 3278 load_facedata "$DATADIR/facedata"
2710 or die "unable to load facedata\n"; 3279 or die "unable to load facedata\n";
2711} 3280}
2712 3281
2713sub reload_archetypes { 3282sub reload_archetypes {
3283 load_resource_file "$DATADIR/archetypes"
3284 or die "unable to load archetypes\n";
3285 #d# NEED to laod twice to resolve forward references
3286 # this really needs to be done in an extra post-pass
3287 # (which needs to be synchronous, so solve it differently)
2714 load_resource_file "$DATADIR/archetypes" 3288 load_resource_file "$DATADIR/archetypes"
2715 or die "unable to load archetypes\n"; 3289 or die "unable to load archetypes\n";
2716} 3290}
2717 3291
2718sub reload_treasures { 3292sub reload_treasures {
2734 3308
2735sub init { 3309sub init {
2736 reload_resources; 3310 reload_resources;
2737} 3311}
2738 3312
2739sub cfg_load { 3313sub reload_config {
2740 open my $fh, "<:utf8", "$CONFDIR/config" 3314 open my $fh, "<:utf8", "$CONFDIR/config"
2741 or return; 3315 or return;
2742 3316
2743 local $/; 3317 local $/;
2744 *CFG = YAML::Syck::Load <$fh>; 3318 *CFG = YAML::Syck::Load <$fh>;
2760sub main { 3334sub main {
2761 # we must not ever block the main coroutine 3335 # we must not ever block the main coroutine
2762 local $Coro::idle = sub { 3336 local $Coro::idle = sub {
2763 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3337 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2764 (async { 3338 (async {
2765 Event::one_event; 3339 $Coro::current->{desc} = "IDLE BUG HANDLER";
3340 EV::loop EV::LOOP_ONESHOT;
2766 })->prio (Coro::PRIO_MAX); 3341 })->prio (Coro::PRIO_MAX);
2767 }; 3342 };
2768 3343
2769 cfg_load; 3344 reload_config;
2770 db_init; 3345 db_init;
2771 load_extensions; 3346 load_extensions;
2772 3347
2773 $TICK_WATCHER->start; 3348 $TICK_WATCHER->start;
3349 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
2774 Event::loop; 3350 EV::loop;
2775} 3351}
2776 3352
2777############################################################################# 3353#############################################################################
2778# initialisation and cleanup 3354# initialisation and cleanup
2779 3355
2780# install some emergency cleanup handlers 3356# install some emergency cleanup handlers
2781BEGIN { 3357BEGIN {
3358 our %SIGWATCHER = ();
2782 for my $signal (qw(INT HUP TERM)) { 3359 for my $signal (qw(INT HUP TERM)) {
2783 Event->signal ( 3360 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2784 reentrant => 0,
2785 data => WF_AUTOCANCEL,
2786 signal => $signal,
2787 prio => 0,
2788 cb => sub {
2789 cf::cleanup "SIG$signal"; 3361 cf::cleanup "SIG$signal";
2790 },
2791 ); 3362 };
2792 } 3363 }
2793} 3364}
2794 3365
2795sub write_runtime { 3366sub write_runtime {
2796 my $runtime = "$LOCALDIR/runtime"; 3367 my $runtime = "$LOCALDIR/runtime";
2841 # and maps saved/destroyed asynchronously. 3412 # and maps saved/destroyed asynchronously.
2842 warn "begin emergency player save\n"; 3413 warn "begin emergency player save\n";
2843 for my $login (keys %cf::PLAYER) { 3414 for my $login (keys %cf::PLAYER) {
2844 my $pl = $cf::PLAYER{$login} or next; 3415 my $pl = $cf::PLAYER{$login} or next;
2845 $pl->valid or next; 3416 $pl->valid or next;
3417 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2846 $pl->save; 3418 $pl->save;
2847 } 3419 }
2848 warn "end emergency player save\n"; 3420 warn "end emergency player save\n";
2849 3421
2850 warn "begin emergency map save\n"; 3422 warn "begin emergency map save\n";
2889 warn "syncing database to disk"; 3461 warn "syncing database to disk";
2890 BDB::db_env_txn_checkpoint $DB_ENV; 3462 BDB::db_env_txn_checkpoint $DB_ENV;
2891 3463
2892 # if anything goes wrong in here, we should simply crash as we already saved 3464 # if anything goes wrong in here, we should simply crash as we already saved
2893 3465
2894 warn "cancelling all WF_AUTOCANCEL watchers";
2895 for (Event::all_watchers) {
2896 $_->cancel if $_->data & WF_AUTOCANCEL;
2897 }
2898
2899 warn "flushing outstanding aio requests"; 3466 warn "flushing outstanding aio requests";
2900 for (;;) { 3467 for (;;) {
2901 BDB::flush; 3468 BDB::flush;
2902 IO::AIO::flush; 3469 IO::AIO::flush;
2903 Coro::cede; 3470 Coro::cede_notself;
2904 last unless IO::AIO::nreqs || BDB::nreqs; 3471 last unless IO::AIO::nreqs || BDB::nreqs;
2905 warn "iterate..."; 3472 warn "iterate...";
2906 } 3473 }
2907 3474
2908 ++$RELOAD; 3475 ++$RELOAD;
2967 warn "reloading cf.pm"; 3534 warn "reloading cf.pm";
2968 require cf; 3535 require cf;
2969 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3536 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2970 3537
2971 warn "loading config and database again"; 3538 warn "loading config and database again";
2972 cf::cfg_load; 3539 cf::reload_config;
2973 3540
2974 warn "loading extensions"; 3541 warn "loading extensions";
2975 cf::load_extensions; 3542 cf::load_extensions;
2976 3543
2977 warn "reattaching attachments to objects/players"; 3544 warn "reattaching attachments to objects/players";
2997 3564
2998sub reload_perl() { 3565sub reload_perl() {
2999 # doing reload synchronously and two reloads happen back-to-back, 3566 # doing reload synchronously and two reloads happen back-to-back,
3000 # coro crashes during coro_state_free->destroy here. 3567 # coro crashes during coro_state_free->destroy here.
3001 3568
3002 $RELOAD_WATCHER ||= Event->timer ( 3569 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3003 reentrant => 0,
3004 after => 0,
3005 data => WF_AUTOCANCEL,
3006 cb => sub {
3007 do_reload_perl;
3008 undef $RELOAD_WATCHER; 3570 undef $RELOAD_WATCHER;
3009 }, 3571 do_reload_perl;
3010 ); 3572 };
3011} 3573}
3012 3574
3013register_command "reload" => sub { 3575register_command "reload" => sub {
3014 my ($who, $arg) = @_; 3576 my ($who, $arg) = @_;
3015 3577
3016 if ($who->flag (FLAG_WIZ)) { 3578 if ($who->flag (FLAG_WIZ)) {
3017 $who->message ("reloading server."); 3579 $who->message ("reloading server.");
3580 async {
3581 $Coro::current->{desc} = "perl_reload";
3018 async { reload_perl }; 3582 reload_perl;
3583 };
3019 } 3584 }
3020}; 3585};
3021 3586
3022unshift @INC, $LIBDIR; 3587unshift @INC, $LIBDIR;
3023 3588
3042 my $signal = new Coro::Signal; 3607 my $signal = new Coro::Signal;
3043 push @WAIT_FOR_TICK_BEGIN, $signal; 3608 push @WAIT_FOR_TICK_BEGIN, $signal;
3044 $signal->wait; 3609 $signal->wait;
3045} 3610}
3046 3611
3047 my $min = 1e6;#d# 3612$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3048 my $avg = 10;
3049$TICK_WATCHER = Event->timer (
3050 reentrant => 0,
3051 parked => 1,
3052 prio => 0,
3053 at => $NEXT_TICK || $TICK,
3054 data => WF_AUTOCANCEL,
3055 cb => sub {
3056 if ($Coro::current != $Coro::main) { 3613 if ($Coro::current != $Coro::main) {
3057 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3614 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3058 unless ++$bug_warning > 10; 3615 unless ++$bug_warning > 10;
3059 return; 3616 return;
3060 } 3617 }
3061 3618
3062 $NOW = $tick_start = Event::time; 3619 $NOW = $tick_start = EV::now;
3063 3620
3064 cf::server_tick; # one server iteration 3621 cf::server_tick; # one server iteration
3065 3622
3066 0 && sync_job {#d# 3623 $RUNTIME += $TICK;
3067 for(1..10) { 3624 $NEXT_TICK = $_[0]->at;
3068 my $t = Event::time;
3069 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3070 or die;
3071 3625
3072 $map->width (50); 3626 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3073 $map->height (50); 3627 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3074 $map->alloc; 3628 Coro::async_pool {
3075 $map->_load_objects ("/tmp/x.map", 1); 3629 $Coro::current->{desc} = "runtime saver";
3076 my $t = Event::time - $t; 3630 write_runtime
3077 3631 or warn "ERROR: unable to write runtime file: $!";
3078 #next unless $t < 0.0013;#d#
3079 if ($t < $min) {
3080 $min = $t;
3081 }
3082 $avg = $avg * 0.99 + $t * 0.01;
3083 }
3084 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3085 exit 0;
3086 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3087 }; 3632 };
3633 }
3088 3634
3089 $RUNTIME += $TICK;
3090 $NEXT_TICK += $TICK;
3091
3092 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3093 $NEXT_RUNTIME_WRITE = $NOW + 10;
3094 Coro::async_pool {
3095 write_runtime
3096 or warn "ERROR: unable to write runtime file: $!";
3097 };
3098 }
3099
3100# my $AFTER = Event::time;
3101# warn $AFTER - $NOW;#d#
3102
3103 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3635 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3104 $sig->send; 3636 $sig->send;
3105 } 3637 }
3106 while (my $sig = shift @WAIT_FOR_TICK) { 3638 while (my $sig = shift @WAIT_FOR_TICK) {
3107 $sig->send; 3639 $sig->send;
3108 } 3640 }
3109 3641
3110 $NOW = Event::time;
3111
3112 # if we are delayed by four ticks or more, skip them all
3113 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3114
3115 $TICK_WATCHER->at ($NEXT_TICK);
3116 $TICK_WATCHER->start;
3117
3118 $LOAD = ($NOW - $tick_start) / $TICK; 3642 $LOAD = ($NOW - $tick_start) / $TICK;
3119 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3643 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3120 3644
3121 _post_tick; 3645 _post_tick;
3122 3646};
3123 3647$TICK_WATCHER->priority (EV::MAXPRI);
3124 },
3125);
3126 3648
3127{ 3649{
3128 BDB::max_poll_time $TICK * 0.1; 3650 # configure BDB
3129 $BDB_POLL_WATCHER = Event->io ( 3651
3130 reentrant => 0,
3131 fd => BDB::poll_fileno,
3132 poll => 'r',
3133 prio => 0,
3134 data => WF_AUTOCANCEL,
3135 cb => \&BDB::poll_cb,
3136 );
3137 BDB::min_parallel 8; 3652 BDB::min_parallel 8;
3138 3653 BDB::max_poll_reqs $TICK * 0.1;
3139 BDB::set_sync_prepare { 3654 $Coro::BDB::WATCHER->priority (1);
3140 my $status;
3141 my $current = $Coro::current;
3142 (
3143 sub {
3144 $status = $!;
3145 $current->ready; undef $current;
3146 },
3147 sub {
3148 Coro::schedule while defined $current;
3149 $! = $status;
3150 },
3151 )
3152 };
3153 3655
3154 unless ($DB_ENV) { 3656 unless ($DB_ENV) {
3155 $DB_ENV = BDB::db_env_create; 3657 $DB_ENV = BDB::db_env_create;
3658 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3659 | BDB::LOG_AUTOREMOVE, 1);
3660 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3661 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3156 3662
3157 cf::sync_job { 3663 cf::sync_job {
3158 eval { 3664 eval {
3159 BDB::db_env_open 3665 BDB::db_env_open
3160 $DB_ENV, 3666 $DB_ENV,
3162 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3668 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3163 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3669 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3164 0666; 3670 0666;
3165 3671
3166 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3672 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3167
3168 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3169 $DB_ENV->set_lk_detect;
3170 }; 3673 };
3171 3674
3172 cf::cleanup "db_env_open(db): $@" if $@; 3675 cf::cleanup "db_env_open(db): $@" if $@;
3173 }; 3676 };
3174 } 3677 }
3678
3679 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3680 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3681 };
3682 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3683 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3684 };
3685 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3686 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3687 };
3175} 3688}
3176 3689
3177{ 3690{
3691 # configure IO::AIO
3692
3178 IO::AIO::min_parallel 8; 3693 IO::AIO::min_parallel 8;
3179
3180 undef $Coro::AIO::WATCHER;
3181 IO::AIO::max_poll_time $TICK * 0.1; 3694 IO::AIO::max_poll_time $TICK * 0.1;
3182 $AIO_POLL_WATCHER = Event->io ( 3695 $Coro::AIO::WATCHER->priority (1);
3183 reentrant => 0,
3184 data => WF_AUTOCANCEL,
3185 fd => IO::AIO::poll_fileno,
3186 poll => 'r',
3187 prio => 6,
3188 cb => \&IO::AIO::poll_cb,
3189 );
3190} 3696}
3191 3697
3192my $_log_backtrace; 3698my $_log_backtrace;
3193 3699
3194sub _log_backtrace { 3700sub _log_backtrace {
3198 3704
3199 # limit the # of concurrent backtraces 3705 # limit the # of concurrent backtraces
3200 if ($_log_backtrace < 2) { 3706 if ($_log_backtrace < 2) {
3201 ++$_log_backtrace; 3707 ++$_log_backtrace;
3202 async { 3708 async {
3709 $Coro::current->{desc} = "abt $msg";
3710
3203 my @bt = fork_call { 3711 my @bt = fork_call {
3204 @addr = map { sprintf "%x", $_ } @addr; 3712 @addr = map { sprintf "%x", $_ } @addr;
3205 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3713 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3206 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3714 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3207 or die "addr2line: $!"; 3715 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines