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.289 by root, Sat Jun 30 03:00:54 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
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::Syck ();
31use IO::AIO 2.32 (); 33use IO::AIO 2.51 ();
32use Time::HiRes; 34use Time::HiRes;
33use Compress::LZF; 35use Compress::LZF;
36use Digest::MD5 ();
34 37
35# configure various modules to our taste 38# configure various modules to our taste
36# 39#
37$Storable::canonical = 1; # reduce rsync transfers 40$Storable::canonical = 1; # reduce rsync transfers
38Coro::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
39Compress::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
40
41$Event::Eval = 1; # no idea why this is required, but it is
42 43
43# 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?
44$YAML::Syck::ImplicitUnicode = 1; 45$YAML::Syck::ImplicitUnicode = 1;
45 46
46$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
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 69our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 71our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 72our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db"; 73our $BDBDIR = "$LOCALDIR/db";
74our %RESOURCE;
73 75
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75our $TICK_WATCHER; 77our $TICK_WATCHER;
76our $AIO_POLL_WATCHER; 78our $AIO_POLL_WATCHER;
77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 80our $NEXT_TICK;
79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 81our $USE_FSYNC = 1; # use fsync to write maps - default off
81 82
82our $BDB_POLL_WATCHER; 83our $BDB_POLL_WATCHER;
84our $BDB_DEADLOCK_WATCHER;
85our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER;
83our $DB_ENV; 87our $DB_ENV;
84 88
85our %CFG; 89our %CFG;
86 90
87our $UPTIME; $UPTIME ||= time; 91our $UPTIME; $UPTIME ||= time;
88our $RUNTIME; 92our $RUNTIME;
93our $NOW;
89 94
90our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
91our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
92our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
93 98
94# 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 ∕
95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96 101
157 162
158The raw value load value from the last tick. 163The raw value load value from the last tick.
159 164
160=item %cf::CFG 165=item %cf::CFG
161 166
162Configuration for the server, loaded from C</etc/crossfire/config>, or 167Configuration for the server, loaded from C</etc/deliantra-server/config>, or
163from wherever your confdir points to. 168from wherever your confdir points to.
164 169
165=item cf::wait_for_tick, cf::wait_for_tick_begin 170=item cf::wait_for_tick, cf::wait_for_tick_begin
166 171
167These 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
168returns 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
169per 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.
170 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
171=back 182=back
172 183
173=cut 184=cut
174 185
175BEGIN { 186BEGIN {
179 $msg .= "\n" 190 $msg .= "\n"
180 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
181 192
182 $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;
183 194
184 utf8::encode $msg;
185 LOG llevError, $msg; 195 LOG llevError, $msg;
186 }; 196 };
187} 197}
198
199$Coro::State::DIEHOOK = sub {
200 warn Carp::longmess $_[0];
201 Coro::terminate;
202};
188 203
189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 204@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
190@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 205@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
191@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 206@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
192@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 207@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
205)) { 220)) {
206 no strict 'refs'; 221 no strict 'refs';
207 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 222 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
208} 223}
209 224
210$Event::DIED = sub { 225$EV::DIED = sub {
211 warn "error in event callback: @_"; 226 warn "error in event callback: @_";
212}; 227};
213 228
214############################################################################# 229#############################################################################
215 230
238 $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;
239 $d 254 $d
240 } || "[unable to dump $_[0]: '$@']"; 255 } || "[unable to dump $_[0]: '$@']";
241} 256}
242 257
243=item $ref = cf::from_json $json 258=item $ref = cf::decode_json $json
244 259
245Converts a JSON string into the corresponding perl data structure. 260Converts a JSON string into the corresponding perl data structure.
246 261
247=item $json = cf::to_json $ref 262=item $json = cf::encode_json $ref
248 263
249Converts a perl data structure into its JSON representation. 264Converts a perl data structure into its JSON representation.
250 265
251=cut 266=cut
252 267
253our $json_coder = JSON::XS->new->convert_blessed->utf8->max_size (1e6); # accept ~1mb max 268our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
254 269
255sub to_json ($) { $json_coder->encode ($_[0]) } 270sub encode_json($) { $json_coder->encode ($_[0]) }
256sub from_json ($) { $json_coder->decode ($_[0]) } 271sub decode_json($) { $json_coder->decode ($_[0]) }
257 272
258=item cf::lock_wait $string 273=item cf::lock_wait $string
259 274
260Wait until the given lock is available. See cf::lock_acquire. 275Wait until the given lock is available. See cf::lock_acquire.
261 276
264Wait 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
265a 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,
266for example when the coroutine gets canceled), the lock is automatically 281for example when the coroutine gets canceled), the lock is automatically
267returned. 282returned.
268 283
284Locks are *not* recursive, locking from the same coro twice results in a
285deadlocked coro.
286
269Lock 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
270uses map_find and cf::map::load uses map_load). 288uses map_find and cf::map::load uses map_load).
271 289
272=item $locked = cf::lock_active $string 290=item $locked = cf::lock_active $string
273 291
274Return 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.
275 293
276=cut 294=cut
277 295
278our %LOCK; 296our %LOCK;
297our %LOCKER;#d#
279 298
280sub lock_wait($) { 299sub lock_wait($) {
281 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#
282 306
283 # wait for lock, if any 307 # wait for lock, if any
284 while ($LOCK{$key}) { 308 while ($LOCK{$key}) {
285 push @{ $LOCK{$key} }, $Coro::current; 309 push @{ $LOCK{$key} }, $Coro::current;
286 Coro::schedule; 310 Coro::schedule;
292 316
293 # wait, to be sure we are not locked 317 # wait, to be sure we are not locked
294 lock_wait $key; 318 lock_wait $key;
295 319
296 $LOCK{$key} = []; 320 $LOCK{$key} = [];
321 $LOCKER{$key} = $Coro::current;#d#
297 322
298 Coro::guard { 323 Coro::guard {
324 delete $LOCKER{$key};#d#
299 # wake up all waiters, to be on the safe side 325 # wake up all waiters, to be on the safe side
300 $_->ready for @{ delete $LOCK{$key} }; 326 $_->ready for @{ delete $LOCK{$key} };
301 } 327 }
302} 328}
303 329
315 }; 341 };
316 $TICK_WATCHER->stop; 342 $TICK_WATCHER->stop;
317 $guard 343 $guard
318} 344}
319 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
320=item cf::async { BLOCK } 419=item cf::async { BLOCK }
321 420
322Currently the same as Coro::async_pool, meaning you cannot use 421Currently the same as Coro::async_pool, meaning you cannot use
323C<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
324thing you are allowed to do is call C<prio> on it. 423thing you are allowed to do is call C<prio> on it.
327 426
328BEGIN { *async = \&Coro::async_pool } 427BEGIN { *async = \&Coro::async_pool }
329 428
330=item cf::sync_job { BLOCK } 429=item cf::sync_job { BLOCK }
331 430
332The design of Crossfire TRT requires that the main coroutine ($Coro::main) 431The design of Deliantra requires that the main coroutine ($Coro::main)
333is always able to handle events or runnable, as Crossfire TRT is only 432is always able to handle events or runnable, as Deliantra is only
334partly 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
335acceptable. 434acceptable.
336 435
337If 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
338the given BLOCK in another coroutine while waiting for the result. The 437the given BLOCK in another coroutine while waiting for the result. The
343 442
344sub sync_job(&) { 443sub sync_job(&) {
345 my ($job) = @_; 444 my ($job) = @_;
346 445
347 if ($Coro::current == $Coro::main) { 446 if ($Coro::current == $Coro::main) {
348 my $time = Event::time; 447 my $time = EV::time;
349 448
350 # this is the main coro, too bad, we have to block 449 # this is the main coro, too bad, we have to block
351 # till the operation succeeds, freezing the server :/ 450 # till the operation succeeds, freezing the server :/
352 451
452 LOG llevError, Carp::longmess "sync job";#d#
453
353 # TODO: use suspend/resume instead 454 # TODO: use suspend/resume instead
354 # (but this is cancel-safe) 455 # (but this is cancel-safe)
355 my $freeze_guard = freeze_mainloop; 456 my $freeze_guard = freeze_mainloop;
356 457
357 my $busy = 1; 458 my $busy = 1;
358 my @res; 459 my @res;
359 460
360 (async { 461 (async {
462 $Coro::current->desc ("sync job coro");
361 @res = eval { $job->() }; 463 @res = eval { $job->() };
362 warn $@ if $@; 464 warn $@ if $@;
363 undef $busy; 465 undef $busy;
364 })->prio (Coro::PRIO_MAX); 466 })->prio (Coro::PRIO_MAX);
365 467
366 while ($busy) { 468 while ($busy) {
367 Coro::cede or Event::one_event; 469 if (Coro::nready) {
470 Coro::cede_notself;
471 } else {
472 EV::loop EV::LOOP_ONESHOT;
368 } 473 }
474 }
369 475
370 $time = Event::time - $time; 476 $time = EV::time - $time;
371 477
372 LOG llevError | logBacktrace, Carp::longmess "long sync job" 478 LOG llevError | logBacktrace, Carp::longmess "long sync job"
373 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 479 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
374 480
375 $tick_start += $time; # do not account sync jobs to server load 481 $tick_start += $time; # do not account sync jobs to server load
405=item fork_call { }, $args 511=item fork_call { }, $args
406 512
407Executes the given code block with the given arguments in a seperate 513Executes the given code block with the given arguments in a seperate
408process, returning the results. Everything must be serialisable with 514process, returning the results. Everything must be serialisable with
409Coro::Storable. May, of course, block. Note that the executed sub may 515Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 516never block itself or use any form of event handling.
411 517
412=cut 518=cut
413 519
414sub fork_call(&@) { 520sub fork_call(&@) {
415 my ($cb, @args) = @_; 521 my ($cb, @args) = @_;
416 522
417# 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,
418# or die "socketpair: $!"; 524 # otherwise perl prematurely frees the stuff :/
419 pipe my $fh1, my $fh2 525 # TODO: investigate and fix (likely this will be rather laborious)
420 or die "pipe: $!";
421 526
422 if (my $pid = fork) { 527 my @res = Coro::Util::fork_eval {
423 close $fh2;
424
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
426 $res = Coro::Storable::thaw $res;
427
428 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
429
430 die $$res unless "ARRAY" eq ref $res;
431
432 return wantarray ? @$res : $res->[-1];
433 } else {
434 reset_signals; 528 reset_signals;
435 local $SIG{__WARN__}; 529 &$cb
436 local $SIG{__DIE__}; 530 }, @args;
437 eval {
438 close $fh1;
439 531
440 my @res = eval { $cb->(@args) }; 532 wantarray ? @res : $res[-1]
441 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
442 };
443
444 warn $@ if $@;
445 _exit 0;
446 }
447} 533}
448 534
449=item $value = cf::db_get $family => $key 535=item $value = cf::db_get $family => $key
450 536
451Returns a single value from the environment database. 537Returns a single value from the environment database.
453=item cf::db_put $family => $key => $value 539=item cf::db_put $family => $key => $value
454 540
455Stores 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
456data 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).
457 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
458=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}
459 567
460our $DB; 568our $DB;
461 569
462sub db_init { 570sub db_init {
463 unless ($DB) {
464 $DB = BDB::db_create $DB_ENV;
465
466 cf::sync_job { 571 cf::sync_job {
467 eval { 572 $DB ||= db_table "db";
468 $DB->set_flags (BDB::CHKSUM);
469
470 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
471 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
472 cf::cleanup "db_open(db): $!" if $!;
473 };
474 cf::cleanup "db_open(db): $@" if $@;
475 };
476 } 573 };
477} 574}
478 575
479sub db_get($$) { 576sub db_get($$) {
480 my $key = "$_[0]/$_[1]"; 577 my $key = "$_[0]/$_[1]";
481 578
531 if (1) { 628 if (1) {
532 $md5 = 629 $md5 =
533 join "\x00", 630 join "\x00",
534 $processversion, 631 $processversion,
535 map { 632 map {
536 Coro::cede; 633 cf::cede_to_tick;
537 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 634 ($src->[$_], Digest::MD5::md5_hex $data[$_])
538 } 0.. $#$src; 635 } 0.. $#$src;
539 636
540 637
541 my $dbmd5 = db_get cache => "$id/md5"; 638 my $dbmd5 = db_get cache => "$id/md5";
585attach callbacks/event handlers (a collection of which is called an "attachment") 682attach callbacks/event handlers (a collection of which is called an "attachment")
586to it. All such attachable objects support the following methods. 683to it. All such attachable objects support the following methods.
587 684
588In 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>
589C<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
590Crossfire TRT). 687Deliantra).
591 688
592=over 4 689=over 4
593 690
594=item $attachable->attach ($attachment, key => $value...) 691=item $attachable->attach ($attachment, key => $value...)
595 692
847 "; 944 ";
848 die if $@; 945 die if $@;
849} 946}
850 947
851our $override; 948our $override;
852our @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?
853 950
854sub override { 951sub override {
855 $override = 1; 952 $override = 1;
856 @invoke_results = (); 953 @INVOKE_RESULTS = (@_);
857} 954}
858 955
859sub do_invoke { 956sub do_invoke {
860 my $event = shift; 957 my $event = shift;
861 my $callbacks = shift; 958 my $callbacks = shift;
862 959
863 @invoke_results = (); 960 @INVOKE_RESULTS = ();
864 961
865 local $override; 962 local $override;
866 963
867 for (@$callbacks) { 964 for (@$callbacks) {
868 eval { &{$_->[1]} }; 965 eval { &{$_->[1]} };
877 } 974 }
878 975
879 0 976 0
880} 977}
881 978
882=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 979=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
883 980
884=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 981=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
885 982
886Generate an object-specific event with the given arguments. 983Generate an object-specific event with the given arguments.
887 984
888This 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
889removed 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
890results (if you must, access C<@cf::invoke_results> directly). 987results (if you must, access C<@cf::INVOKE_RESULTS> directly).
891 988
892=back 989=back
893 990
894=cut 991=cut
895 992
896############################################################################# 993#############################################################################
897# 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}
898 1037
899sub reattach { 1038sub reattach {
900 # basically do the same as instantiate, without calling instantiate 1039 # basically do the same as instantiate, without calling instantiate
901 my ($obj) = @_; 1040 my ($obj) = @_;
902 1041
923cf::attachable->attach ( 1062cf::attachable->attach (
924 prio => -1000000, 1063 prio => -1000000,
925 on_instantiate => sub { 1064 on_instantiate => sub {
926 my ($obj, $data) = @_; 1065 my ($obj, $data) = @_;
927 1066
928 $data = from_json $data; 1067 $data = decode_json $data;
929 1068
930 for (@$data) { 1069 for (@$data) {
931 my ($name, $args) = @$_; 1070 my ($name, $args) = @$_;
932 1071
933 $obj->attach ($name, %{$args || {} }); 1072 $obj->attach ($name, %{$args || {} });
949sub object_freezer_save { 1088sub object_freezer_save {
950 my ($filename, $rdata, $objs) = @_; 1089 my ($filename, $rdata, $objs) = @_;
951 1090
952 sync_job { 1091 sync_job {
953 if (length $$rdata) { 1092 if (length $$rdata) {
1093 utf8::decode (my $decname = $filename);
954 warn sprintf "saving %s (%d,%d)\n", 1094 warn sprintf "saving %s (%d,%d)\n",
955 $filename, length $$rdata, scalar @$objs; 1095 $decname, length $$rdata, scalar @$objs;
956 1096
957 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1097 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
958 chmod SAVE_MODE, $fh; 1098 chmod SAVE_MODE, $fh;
959 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1099 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
960 aio_fsync $fh if $cf::USE_FSYNC; 1100 aio_fsync $fh if $cf::USE_FSYNC;
961 close $fh; 1101 close $fh;
962 1102
963 if (@$objs) { 1103 if (@$objs) {
964 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) {
965 chmod SAVE_MODE, $fh; 1105 chmod SAVE_MODE, $fh;
966 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1106 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
967 aio_write $fh, 0, (length $data), $data, 0; 1107 aio_write $fh, 0, (length $data), $data, 0;
968 aio_fsync $fh if $cf::USE_FSYNC; 1108 aio_fsync $fh if $cf::USE_FSYNC;
969 close $fh; 1109 close $fh;
970 aio_rename "$filename.pst~", "$filename.pst"; 1110 aio_rename "$filename.pst~", "$filename.pst";
971 } 1111 }
979 } 1119 }
980 } else { 1120 } else {
981 aio_unlink $filename; 1121 aio_unlink $filename;
982 aio_unlink "$filename.pst"; 1122 aio_unlink "$filename.pst";
983 } 1123 }
984 } 1124 };
985} 1125}
986 1126
987sub object_freezer_as_string { 1127sub object_freezer_as_string {
988 my ($rdata, $objs) = @_; 1128 my ($rdata, $objs) = @_;
989 1129
1001 or return; 1141 or return;
1002 1142
1003 unless (aio_stat "$filename.pst") { 1143 unless (aio_stat "$filename.pst") {
1004 (aio_load "$filename.pst", $av) >= 0 1144 (aio_load "$filename.pst", $av) >= 0
1005 or return; 1145 or return;
1146
1006 $av = eval { (Storable::thaw $av)->{objs} }; 1147 my $st = eval { Coro::Storable::thaw $av };
1148 $av = $st->{objs};
1007 } 1149 }
1008 1150
1151 utf8::decode (my $decname = $filename);
1009 warn sprintf "loading %s (%d)\n", 1152 warn sprintf "loading %s (%d,%d)\n",
1010 $filename, length $data, scalar @{$av || []}; 1153 $decname, length $data, scalar @{$av || []};
1154
1011 return ($data, $av); 1155 ($data, $av)
1012} 1156}
1013 1157
1014=head2 COMMAND CALLBACKS 1158=head2 COMMAND CALLBACKS
1015 1159
1016=over 4 1160=over 4
1086 cf::override; 1230 cf::override;
1087 }, 1231 },
1088 on_extcmd => sub { 1232 on_extcmd => sub {
1089 my ($pl, $buf) = @_; 1233 my ($pl, $buf) = @_;
1090 1234
1091 my $msg = eval { from_json $buf }; 1235 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1092 1236
1093 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
1094 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1245 if (my $cb = $EXTCMD{$type}) {
1095 if (my %reply = $cb->($pl, $msg)) { 1246 @reply = $cb->($pl, @payload);
1096 $pl->ext_reply ($msg->{msgid}, %reply);
1097 }
1098 } 1247 }
1248
1249 $pl->ext_reply ($reply, @reply)
1250 if $reply;
1251
1099 } else { 1252 } else {
1100 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1253 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1101 } 1254 }
1102 1255
1103 cf::override; 1256 cf::override;
1193 1346
1194=head3 cf::player 1347=head3 cf::player
1195 1348
1196=over 4 1349=over 4
1197 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
1198=item cf::player::find $login 1365=item cf::player::find $login
1199 1366
1200Returns the given player object, loading it if necessary (might block). 1367Returns the given player object, loading it if necessary (might block).
1201 1368
1202=cut 1369=cut
1237 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1404 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1238 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1405 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1239 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1406 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1240 aio_unlink +(playerdir $login) . "/$login.pl"; 1407 aio_unlink +(playerdir $login) . "/$login.pl";
1241 1408
1242 my $pl = load_pl path $login 1409 my $f = new_from_file cf::object::thawer path $login
1243 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;
1244 $cf::PLAYER{$login} = $pl 1416 $cf::PLAYER{$login} = $pl
1245 } 1417 }
1246 } 1418 }
1247} 1419}
1248 1420
1258 1430
1259 aio_mkdir playerdir $pl, 0770; 1431 aio_mkdir playerdir $pl, 0770;
1260 $pl->{last_save} = $cf::RUNTIME; 1432 $pl->{last_save} = $cf::RUNTIME;
1261 1433
1262 $pl->save_pl ($path); 1434 $pl->save_pl ($path);
1263 Coro::cede; 1435 cf::cede_to_tick;
1264} 1436}
1265 1437
1266sub new($) { 1438sub new($) {
1267 my ($login) = @_; 1439 my ($login) = @_;
1268 1440
1272 $self->{deny_save} = 1; 1444 $self->{deny_save} = 1;
1273 1445
1274 $cf::PLAYER{$login} = $self; 1446 $cf::PLAYER{$login} = $self;
1275 1447
1276 $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 (@_);
1277} 1459}
1278 1460
1279=item $pl->quit_character 1461=item $pl->quit_character
1280 1462
1281Nukes the player without looking back. If logged in, the connection will 1463Nukes the player without looking back. If logged in, the connection will
1336 or return []; 1518 or return [];
1337 1519
1338 my @logins; 1520 my @logins;
1339 1521
1340 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") {
1341 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1527 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1342 aio_read $fh, 0, 512, my $buf, 0 or next; 1528 aio_read $fh, 0, 512, my $buf, 0 or next;
1343 $buf !~ /^password -------------$/m or next; # official not-valid tag 1529 $buf !~ /^password -------------$/m or next; # official not-valid tag
1530 }
1344 1531
1345 utf8::decode $login; 1532 utf8::decode $login;
1346 push @logins, $login; 1533 push @logins, $login;
1347 } 1534 }
1348 1535
1381 1568
1382Expand crossfire pod fragments into protocol xml. 1569Expand crossfire pod fragments into protocol xml.
1383 1570
1384=cut 1571=cut
1385 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
1386sub expand_cfpod { 1584sub expand_cfpod {
1387 ((my $self), (local $_)) = @_; 1585 my ($self, $pod) = @_;
1388 1586
1389 # escape & and < 1587 my $xml;
1390 s/&/&amp;/g;
1391 s/(?<![BIUGH])</&lt;/g;
1392 1588
1393 # this is buggy, it needs to properly take care of nested <'s 1589 while () {
1590 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1591 $group = $1;
1394 1592
1395 1 while 1593 $group =~ s/&/&amp;/g;
1396 # replace B<>, I<>, U<> etc. 1594 $group =~ s/</&lt;/g;
1397 s/B<([^\>]*)>/<b>$1<\/b>/ 1595
1398 || s/I<([^\>]*)>/<i>$1<\/i>/ 1596 $xml .= $group;
1399 || s/U<([^\>]*)>/<u>$1<\/u>/ 1597 } elsif ($pod =~ m%\G
1400 # replace G<male|female> tags 1598 ([BCGHITU])
1401 || s{G<([^>|]*)\|([^>]*)>}{ 1599 <
1402 $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;
1403 }ge 1636 }
1404 # replace H<hint text> 1637 }
1405 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;
1406 1638
1639 for ($xml) {
1407 # create single paragraphs (very hackish) 1640 # create single paragraphs (very hackish)
1408 s/(?<=\S)\n(?=\w)/ /g; 1641 s/(?<=\S)\n(?=\w)/ /g;
1409 1642
1410 $_ 1643 # compress some whitespace
1411} 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 }
1412 1649
1650 $xml
1651}
1652
1653no re 'eval';
1654
1655sub hintmode {
1656 $_[0]{hintmode} = $_[1] if @_ > 1;
1657 $_[0]{hintmode}
1658}
1659
1413=item $player->ext_reply ($msgid, %msg) 1660=item $player->ext_reply ($msgid, @msg)
1414 1661
1415Sends an ext reply to the player. 1662Sends an ext reply to the player.
1416 1663
1417=cut 1664=cut
1418 1665
1419sub ext_reply($$%) { 1666sub ext_reply($$@) {
1420 my ($self, $id, %msg) = @_; 1667 my ($self, $id, @msg) = @_;
1421 1668
1422 $msg{msgid} = $id; 1669 $self->ns->ext_reply ($id, @msg)
1423 $self->send ("ext " . cf::to_json \%msg);
1424} 1670}
1425 1671
1426=item $player->ext_event ($type, %msg) 1672=item $player->ext_msg ($type, @msg)
1427 1673
1428Sends an ext event to the client. 1674Sends an ext event to the client.
1429 1675
1430=cut 1676=cut
1431 1677
1432sub ext_event($$%) { 1678sub ext_msg($$@) {
1433 my ($self, $type, %msg) = @_; 1679 my ($self, $type, @msg) = @_;
1434 1680
1435 $self->ns->ext_event ($type, %msg); 1681 $self->ns->ext_msg ($type, @msg);
1436} 1682}
1437 1683
1438=head3 cf::region 1684=head3 cf::region
1439 1685
1440=over 4 1686=over 4
1453 my ($path) = @_; 1699 my ($path) = @_;
1454 1700
1455 my ($match, $specificity); 1701 my ($match, $specificity);
1456 1702
1457 for my $region (list) { 1703 for my $region (list) {
1458 if ($region->match && $path =~ $region->match) { 1704 if ($region->{match} && $path =~ $region->{match}) {
1459 ($match, $specificity) = ($region, $region->specificity) 1705 ($match, $specificity) = ($region, $region->specificity)
1460 if $region->specificity > $specificity; 1706 if $region->specificity > $specificity;
1461 } 1707 }
1462 } 1708 }
1463 1709
1583 $self->init; # pass $1 etc. 1829 $self->init; # pass $1 etc.
1584 return $self; 1830 return $self;
1585 } 1831 }
1586 } 1832 }
1587 1833
1588 Carp::carp "unable to resolve path '$path' (base '$base')."; 1834 Carp::cluck "unable to resolve path '$path' (base '$base').";
1589 () 1835 ()
1590} 1836}
1591 1837
1592sub init { 1838sub init {
1593 my ($self) = @_; 1839 my ($self) = @_;
1656 1902
1657sub load_header_from($) { 1903sub load_header_from($) {
1658 my ($self, $path) = @_; 1904 my ($self, $path) = @_;
1659 1905
1660 utf8::encode $path; 1906 utf8::encode $path;
1661 #aio_open $path, O_RDONLY, 0 1907 my $f = new_from_file cf::object::thawer $path
1662 # or return;
1663
1664 $self->_load_header ($path)
1665 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;
1666 1915
1667 $self->{load_path} = $path; 1916 $self->{load_path} = $path;
1668 1917
1669 1 1918 1
1670} 1919}
1724sub find { 1973sub find {
1725 my ($path, $origin) = @_; 1974 my ($path, $origin) = @_;
1726 1975
1727 $path = normalise $path, $origin && $origin->path; 1976 $path = normalise $path, $origin && $origin->path;
1728 1977
1978 cf::lock_wait "map_data:$path";#d#remove
1729 cf::lock_wait "map_find:$path"; 1979 cf::lock_wait "map_find:$path";
1730 1980
1731 $cf::MAP{$path} || do { 1981 $cf::MAP{$path} || do {
1732 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
1733 my $map = new_from_path cf::map $path 1985 my $map = new_from_path cf::map $path
1734 or return; 1986 or return;
1735 1987
1736 $map->{last_save} = $cf::RUNTIME; 1988 $map->{last_save} = $cf::RUNTIME;
1737 1989
1739 or return; 1991 or return;
1740 1992
1741 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1993 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1742 # doing this can freeze the server in a sync job, obviously 1994 # doing this can freeze the server in a sync job, obviously
1743 #$cf::WAIT_FOR_TICK->wait; 1995 #$cf::WAIT_FOR_TICK->wait;
1996 undef $guard1;
1997 undef $guard2;
1744 $map->reset; 1998 $map->reset;
1745 undef $guard;
1746 return find $path; 1999 return find $path;
1747 } 2000 }
1748 2001
1749 $cf::MAP{$path} = $map 2002 $cf::MAP{$path} = $map
1750 } 2003 }
1759 local $self->{deny_reset} = 1; # loading can take a long time 2012 local $self->{deny_reset} = 1; # loading can take a long time
1760 2013
1761 my $path = $self->{path}; 2014 my $path = $self->{path};
1762 2015
1763 { 2016 {
1764 my $guard = cf::lock_acquire "map_load:$path"; 2017 my $guard = cf::lock_acquire "map_data:$path";
1765 2018
2019 return unless $self->valid;
1766 return if $self->in_memory != cf::MAP_SWAPPED; 2020 return unless $self->in_memory == cf::MAP_SWAPPED;
1767 2021
1768 $self->in_memory (cf::MAP_LOADING); 2022 $self->in_memory (cf::MAP_LOADING);
1769 2023
1770 $self->alloc; 2024 $self->alloc;
1771 2025
1772 $self->pre_load; 2026 $self->pre_load;
1773 Coro::cede; 2027 cf::cede_to_tick;
1774 2028
2029 my $f = new_from_file cf::object::thawer $self->{load_path};
2030 $f->skip_block;
1775 $self->_load_objects ($self->{load_path}, 1) 2031 $self->_load_objects ($f)
1776 or return; 2032 or return;
1777 2033
1778 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2034 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1779 if delete $self->{load_original}; 2035 if delete $self->{load_original};
1780 2036
1781 if (my $uniq = $self->uniq_path) { 2037 if (my $uniq = $self->uniq_path) {
1782 utf8::encode $uniq; 2038 utf8::encode $uniq;
1783 if (aio_open $uniq, O_RDONLY, 0) { 2039 unless (aio_stat $uniq) {
2040 if (my $f = new_from_file cf::object::thawer $uniq) {
1784 $self->clear_unique_items; 2041 $self->clear_unique_items;
1785 $self->_load_objects ($uniq, 0); 2042 $self->_load_objects ($f);
2043 $f->resolve_delayed_derefs;
2044 }
1786 } 2045 }
1787 } 2046 }
1788 2047
1789 Coro::cede; 2048 $f->resolve_delayed_derefs;
2049
2050 cf::cede_to_tick;
1790 # now do the right thing for maps 2051 # now do the right thing for maps
1791 $self->link_multipart_objects; 2052 $self->link_multipart_objects;
1792 $self->difficulty ($self->estimate_difficulty) 2053 $self->difficulty ($self->estimate_difficulty)
1793 unless $self->difficulty; 2054 unless $self->difficulty;
1794 Coro::cede; 2055 cf::cede_to_tick;
1795 2056
1796 unless ($self->{deny_activate}) { 2057 unless ($self->{deny_activate}) {
1797 $self->decay_objects; 2058 $self->decay_objects;
1798 $self->fix_auto_apply; 2059 $self->fix_auto_apply;
1799 $self->update_buttons; 2060 $self->update_buttons;
1800 Coro::cede; 2061 cf::cede_to_tick;
1801 $self->set_darkness_map; 2062 $self->set_darkness_map;
1802 Coro::cede; 2063 cf::cede_to_tick;
1803 $self->activate; 2064 $self->activate;
1804 } 2065 }
2066
2067 $self->{last_save} = $cf::RUNTIME;
2068 $self->last_access ($cf::RUNTIME);
1805 2069
1806 $self->in_memory (cf::MAP_IN_MEMORY); 2070 $self->in_memory (cf::MAP_IN_MEMORY);
1807 } 2071 }
1808 2072
1809 $self->post_load; 2073 $self->post_load;
1820 2084
1821 $self 2085 $self
1822} 2086}
1823 2087
1824# 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
1825sub load_diag { 2089sub load_neighbours {
1826 my ($map) = @_; 2090 my ($map) = @_;
1827 2091
1828 my @diag; # diagonal neighbours 2092 my @neigh; # diagonal neighbours
1829 2093
1830 for (0 .. 3) { 2094 for (0 .. 3) {
1831 my $neigh = $map->tile_path ($_) 2095 my $neigh = $map->tile_path ($_)
1832 or next; 2096 or next;
1833 $neigh = find $neigh, $map 2097 $neigh = find $neigh, $map
1834 or next; 2098 or next;
1835 $neigh->load; 2099 $neigh->load;
1836 2100
2101 push @neigh,
1837 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2102 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1838 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2103 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1839 } 2104 }
1840 2105
1841 for (@diag) { 2106 for (grep defined $_->[0], @neigh) {
2107 my ($path, $origin) = @$_;
1842 my $neigh = find @$_ 2108 my $neigh = find $path, $origin
1843 or next; 2109 or next;
1844 $neigh->load; 2110 $neigh->load;
1845 } 2111 }
1846} 2112}
1847 2113
1852} 2118}
1853 2119
1854sub do_load_sync { 2120sub do_load_sync {
1855 my ($map) = @_; 2121 my ($map) = @_;
1856 2122
2123 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2124 if $Coro::current == $Coro::main;
2125
1857 cf::sync_job { $map->load }; 2126 cf::sync_job { $map->load };
1858} 2127}
1859 2128
1860our %MAP_PREFETCH; 2129our %MAP_PREFETCH;
1861our $MAP_PREFETCHER = undef; 2130our $MAP_PREFETCHER = undef;
1862 2131
1863sub find_async { 2132sub find_async {
1864 my ($path, $origin) = @_; 2133 my ($path, $origin, $load) = @_;
1865 2134
1866 $path = normalise $path, $origin && $origin->{path}; 2135 $path = normalise $path, $origin && $origin->{path};
1867 2136
1868 if (my $map = $cf::MAP{$path}) { 2137 if (my $map = $cf::MAP{$path}) {
1869 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2138 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1870 } 2139 }
1871 2140
1872 undef $MAP_PREFETCH{$path}; 2141 $MAP_PREFETCH{$path} |= $load;
2142
1873 $MAP_PREFETCHER ||= cf::async { 2143 $MAP_PREFETCHER ||= cf::async {
2144 $Coro::current->{desc} = "map prefetcher";
2145
1874 while (%MAP_PREFETCH) { 2146 while (%MAP_PREFETCH) {
1875 for my $path (keys %MAP_PREFETCH) { 2147 while (my ($k, $v) = each %MAP_PREFETCH) {
1876 my $map = find $path 2148 if (my $map = find $k) {
1877 or next;
1878 $map->load; 2149 $map->load if $v;
2150 }
1879 2151
1880 delete $MAP_PREFETCH{$path}; 2152 delete $MAP_PREFETCH{$k};
1881 } 2153 }
1882 } 2154 }
1883 undef $MAP_PREFETCHER; 2155 undef $MAP_PREFETCHER;
1884 }; 2156 };
1885 $MAP_PREFETCHER->prio (6); 2157 $MAP_PREFETCHER->prio (6);
1888} 2160}
1889 2161
1890sub save { 2162sub save {
1891 my ($self) = @_; 2163 my ($self) = @_;
1892 2164
1893 my $lock = cf::lock_acquire "map_data:" . $self->path; 2165 my $lock = cf::lock_acquire "map_data:$self->{path}";
1894 2166
1895 $self->{last_save} = $cf::RUNTIME; 2167 $self->{last_save} = $cf::RUNTIME;
1896 2168
1897 return unless $self->dirty; 2169 return unless $self->dirty;
1898 2170
1904 return if $self->{deny_save}; 2176 return if $self->{deny_save};
1905 2177
1906 local $self->{last_access} = $self->last_access;#d# 2178 local $self->{last_access} = $self->last_access;#d#
1907 2179
1908 cf::async { 2180 cf::async {
2181 $Coro::current->{desc} = "map player save";
1909 $_->contr->save for $self->players; 2182 $_->contr->save for $self->players;
1910 }; 2183 };
1911 2184
1912 if ($uniq) { 2185 if ($uniq) {
1913 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2186 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1921 my ($self) = @_; 2194 my ($self) = @_;
1922 2195
1923 # save first because save cedes 2196 # save first because save cedes
1924 $self->save; 2197 $self->save;
1925 2198
1926 my $lock = cf::lock_acquire "map_data:" . $self->path; 2199 my $lock = cf::lock_acquire "map_data:$self->{path}";
1927 2200
1928 return if $self->players; 2201 return if $self->players;
1929 return if $self->in_memory != cf::MAP_IN_MEMORY; 2202 return if $self->in_memory != cf::MAP_IN_MEMORY;
1930 return if $self->{deny_save}; 2203 return if $self->{deny_save};
1931 2204
2205 $self->in_memory (cf::MAP_SWAPPED);
2206
2207 $self->deactivate;
2208 $_->clear_links_to ($self) for values %cf::MAP;
1932 $self->clear; 2209 $self->clear;
1933 $self->in_memory (cf::MAP_SWAPPED);
1934} 2210}
1935 2211
1936sub reset_at { 2212sub reset_at {
1937 my ($self) = @_; 2213 my ($self) = @_;
1938 2214
1970 if $uniq; 2246 if $uniq;
1971 } 2247 }
1972 2248
1973 delete $cf::MAP{$self->path}; 2249 delete $cf::MAP{$self->path};
1974 2250
2251 $self->deactivate;
2252 $_->clear_links_to ($self) for values %cf::MAP;
1975 $self->clear; 2253 $self->clear;
1976
1977 $_->clear_links_to ($self) for values %cf::MAP;
1978 2254
1979 $self->unlink_save; 2255 $self->unlink_save;
1980 $self->destroy; 2256 $self->destroy;
1981} 2257}
1982 2258
1983my $nuke_counter = "aaaa"; 2259my $nuke_counter = "aaaa";
1984 2260
1985sub nuke { 2261sub nuke {
1986 my ($self) = @_; 2262 my ($self) = @_;
1987 2263
2264 {
2265 my $lock = cf::lock_acquire "map_data:$self->{path}";
2266
1988 delete $cf::MAP{$self->path}; 2267 delete $cf::MAP{$self->path};
1989 2268
1990 $self->unlink_save; 2269 $self->unlink_save;
1991 2270
1992 bless $self, "cf::map"; 2271 bless $self, "cf::map";
1993 delete $self->{deny_reset}; 2272 delete $self->{deny_reset};
1994 $self->{deny_save} = 1; 2273 $self->{deny_save} = 1;
1995 $self->reset_timeout (1); 2274 $self->reset_timeout (1);
1996 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2275 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1997 2276
1998 $cf::MAP{$self->path} = $self; 2277 $cf::MAP{$self->path} = $self;
2278 }
1999 2279
2000 $self->reset; # polite request, might not happen 2280 $self->reset; # polite request, might not happen
2001} 2281}
2002 2282
2003=item $maps = cf::map::tmp_maps 2283=item $maps = cf::map::tmp_maps
2079 2359
2080sub inv_recursive { 2360sub inv_recursive {
2081 inv_recursive_ inv $_[0] 2361 inv_recursive_ inv $_[0]
2082} 2362}
2083 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
2084package cf; 2392package cf;
2085 2393
2086=back 2394=back
2087 2395
2088=head3 cf::object::player 2396=head3 cf::object::player
2110 2418
2111 } else { 2419 } else {
2112 my $pl = $self->contr; 2420 my $pl = $self->contr;
2113 2421
2114 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2422 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2115 my $diag = $pl->{npc_dialog}; 2423 my $dialog = $pl->{npc_dialog};
2116 $diag->{pl}->ext_reply ( 2424 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2117 $diag->{id},
2118 msgtype => "reply",
2119 msg => $diag->{pl}->expand_cfpod ($msg),
2120 add_topics => []
2121 );
2122 2425
2123 } else { 2426 } else {
2124 $msg = $npc->name . " says: $msg" if $npc; 2427 $msg = $npc->name . " says: $msg" if $npc;
2125 $self->message ($msg, $flags); 2428 $self->message ($msg, $flags);
2126 } 2429 }
2127 } 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 (@_);
2128} 2441}
2129 2442
2130=item $player_object->may ("access") 2443=item $player_object->may ("access")
2131 2444
2132Returns wether the given player is authorized to access resource "access" 2445Returns wether the given player is authorized to access resource "access"
2211 # use -1 or undef as default coordinates, not 0, 0 2524 # use -1 or undef as default coordinates, not 0, 0
2212 ($x, $y) = ($map->enter_x, $map->enter_y) 2525 ($x, $y) = ($map->enter_x, $map->enter_y)
2213 if $x <=0 && $y <= 0; 2526 if $x <=0 && $y <= 0;
2214 2527
2215 $map->load; 2528 $map->load;
2216 $map->load_diag; 2529 $map->load_neighbours;
2217 2530
2218 return unless $self->contr->active; 2531 return unless $self->contr->active;
2219 $self->activate_recursive; 2532 $self->activate_recursive;
2220 2533
2221 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2534 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2222 $self->enter_map ($map, $x, $y); 2535 $self->enter_map ($map, $x, $y);
2223} 2536}
2224 2537
2225=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2538=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2226 2539
2227Moves 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
2228her, loading and preparing them map, calling the provided $check callback 2541her, loading and preparing them map, calling the provided $check callback
2229that 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
2230the 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.
2231 2545
2232=cut 2546=cut
2233 2547
2234our $GOTOGEN; 2548our $GOTOGEN;
2235 2549
2236sub cf::object::player::goto { 2550sub cf::object::player::goto {
2237 my ($self, $path, $x, $y, $check) = @_; 2551 my ($self, $path, $x, $y, $check, $done) = @_;
2238 2552
2239 # 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
2240 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2554 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2241 2555
2242 $self->enter_link; 2556 $self->enter_link;
2243 2557
2244 (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
2245 my $map = eval { 2580 my $map = eval {
2246 my $map = cf::map::find $path; 2581 my $map = defined $path ? cf::map::find $path : undef;
2247 2582
2248 if ($map) { 2583 if ($map) {
2249 $map = $map->customise_for ($self); 2584 $map = $map->customise_for ($self);
2250 $map = $check->($map) if $check && $map; 2585 $map = $check->($map) if $check && $map;
2251 } else { 2586 } else {
2252 $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);
2253 } 2588 }
2254 2589
2255 $map 2590 $map
2256 }; 2591 };
2257 2592
2262 2597
2263 if ($gen == $self->{_goto_generation}) { 2598 if ($gen == $self->{_goto_generation}) {
2264 delete $self->{_goto_generation}; 2599 delete $self->{_goto_generation};
2265 $self->leave_link ($map, $x, $y); 2600 $self->leave_link ($map, $x, $y);
2266 } 2601 }
2602
2603 $done->() if $done;
2267 })->prio (1); 2604 })->prio (1);
2268} 2605}
2269 2606
2270=item $player_object->enter_exit ($exit_object) 2607=item $player_object->enter_exit ($exit_object)
2271 2608
2308 $rmp->{origin_y} = $exit->y; 2645 $rmp->{origin_y} = $exit->y;
2309 } 2646 }
2310 2647
2311 $rmp->{random_seed} ||= $exit->random_seed; 2648 $rmp->{random_seed} ||= $exit->random_seed;
2312 2649
2313 my $data = cf::to_json $rmp; 2650 my $data = cf::encode_json $rmp;
2314 my $md5 = Digest::MD5::md5_hex $data; 2651 my $md5 = Digest::MD5::md5_hex $data;
2315 my $meta = "$RANDOMDIR/$md5.meta"; 2652 my $meta = "$RANDOMDIR/$md5.meta";
2316 2653
2317 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2654 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2318 aio_write $fh, 0, (length $data), $data, 0; 2655 aio_write $fh, 0, (length $data), $data, 0;
2340 my $hp = $exit->stats->hp; 2677 my $hp = $exit->stats->hp;
2341 my $sp = $exit->stats->sp; 2678 my $sp = $exit->stats->sp;
2342 2679
2343 $self->enter_link; 2680 $self->enter_link;
2344 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
2345 (async { 2686 (async {
2687 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2688
2346 $self->deactivate_recursive; # just to be sure 2689 $self->deactivate_recursive; # just to be sure
2347 unless (eval { 2690 unless (eval {
2348 $self->goto ($slaying, $hp, $sp); 2691 $self->goto ($slaying, $hp, $sp);
2349 2692
2350 1; 2693 1;
2376 2719
2377 utf8::encode $text; 2720 utf8::encode $text;
2378 $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);
2379} 2722}
2380 2723
2381=item $client->send_msg ($color, $type, $msg, [extra...]) 2724=item $client->send_msg ($channel, $msg, $color, [extra...])
2382 2725
2383Send 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
2384client 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
2385the 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
2386the message unless the client supports the msg packet. 2729the message unless the client supports the msg packet.
2387 2730
2388=cut 2731=cut
2389 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
2390sub cf::client::send_msg { 2785sub cf::client::send_msg {
2391 my ($self, $color, $type, $msg, @extra) = @_; 2786 my ($self, $channel, $msg, $color, @extra) = @_;
2392 2787
2393 $msg = $self->pl->expand_cfpod ($msg); 2788 $msg = $self->pl->expand_cfpod ($msg);
2394 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
2395 if ($self->can_msg) { 2814 if ($self->can_msg) {
2396 $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]));
2397 } else { 2821 } else {
2398 # replace some tags by gcfclient-compatible ones
2399 for ($msg) {
2400 1 while
2401 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2402 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2403 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2404 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2405 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2406 }
2407
2408 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
2409 if (0 && $msg =~ /\[/) { 2837 if (0 && $msg =~ /\[/) {
2838 # COMMAND/INFO
2410 $self->send_packet ("drawextinfo $color 4 0 $msg") 2839 $self->send_packet ("drawextinfo $color 10 8 $msg")
2411 } else { 2840 } else {
2412 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2841 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2413 $self->send_packet ("drawinfo $color $msg") 2842 $self->send_packet ("drawinfo $color $msg")
2414 } 2843 }
2415 } 2844 }
2416 } 2845 }
2417} 2846}
2418 2847
2419=item $client->ext_event ($type, %msg) 2848=item $client->ext_msg ($type, @msg)
2420 2849
2421Sends an ext event to the client. 2850Sends an ext event to the client.
2422 2851
2423=cut 2852=cut
2424 2853
2425sub cf::client::ext_event($$%) { 2854sub cf::client::ext_msg($$@) {
2426 my ($self, $type, %msg) = @_; 2855 my ($self, $type, @msg) = @_;
2427 2856
2857 if ($self->extcmd == 2) {
2858 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2859 } elsif ($self->extcmd == 1) { # TODO: remove
2428 $msg{msgtype} = "event_$type"; 2860 push @msg, msgtype => "event_$type";
2429 $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 }
2430} 2881}
2431 2882
2432=item $success = $client->query ($flags, "text", \&cb) 2883=item $success = $client->query ($flags, "text", \&cb)
2433 2884
2434Queues a query to the client, calling the given callback with 2885Queues a query to the client, calling the given callback with
2457 2908
2458 1 2909 1
2459} 2910}
2460 2911
2461cf::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 },
2462 on_reply => sub { 2918 on_reply => sub {
2463 my ($ns, $msg) = @_; 2919 my ($ns, $msg) = @_;
2464 2920
2465 # this weird shuffling is so that direct followup queries 2921 # this weird shuffling is so that direct followup queries
2466 # get handled first 2922 # get handled first
2481 } 2937 }
2482 }, 2938 },
2483 on_exticmd => sub { 2939 on_exticmd => sub {
2484 my ($ns, $buf) = @_; 2940 my ($ns, $buf) = @_;
2485 2941
2486 my $msg = eval { from_json $buf }; 2942 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2487 2943
2488 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
2489 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2952 if (my $cb = $EXTICMD{$type}) {
2490 if (my %reply = $cb->($ns, $msg)) { 2953 @reply = $cb->($ns, @payload);
2491 $reply{msgid} = $msg->{msgid};
2492 $ns->send ("ext " . cf::to_json \%reply);
2493 }
2494 } 2954 }
2955
2956 $ns->ext_reply ($reply, @reply)
2957 if $reply;
2958
2495 } else { 2959 } else {
2496 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";
2497 } 2961 }
2498 2962
2499 cf::override; 2963 cf::override;
2546our $safe = new Safe "safe"; 3010our $safe = new Safe "safe";
2547our $safe_hole = new Safe::Hole; 3011our $safe_hole = new Safe::Hole;
2548 3012
2549$SIG{FPE} = 'IGNORE'; 3013$SIG{FPE} = 'IGNORE';
2550 3014
2551$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));
2552 3020
2553# here we export the classes and methods available to script code 3021# here we export the classes and methods available to script code
2554 3022
2555=pod 3023=pod
2556 3024
2557The following functions and methods are available within a safe environment: 3025The following functions and methods are available within a safe environment:
2558 3026
2559 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
2560 cf::object::player player 3031 cf::object::player
2561 cf::player peaceful 3032 player
2562 cf::map trigger 3033
3034 cf::player
3035 peaceful
3036
3037 cf::map
3038 trigger
2563 3039
2564=cut 3040=cut
2565 3041
2566for ( 3042for (
2567 ["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)],
2568 ["cf::object::player" => qw(player)], 3046 ["cf::object::player" => qw(player)],
2569 ["cf::player" => qw(peaceful)], 3047 ["cf::player" => qw(peaceful)],
2570 ["cf::map" => qw(trigger)], 3048 ["cf::map" => qw(trigger)],
2571) { 3049) {
2572 no strict 'refs'; 3050 no strict 'refs';
2648# the server's init and main functions 3126# the server's init and main functions
2649 3127
2650sub load_facedata($) { 3128sub load_facedata($) {
2651 my ($path) = @_; 3129 my ($path) = @_;
2652 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
2653 warn "loading facedata from $path\n"; 3137 warn "loading facedata from $path\n";
2654 3138
2655 my $facedata; 3139 my $facedata;
2656 0 < aio_load $path, $facedata 3140 0 < aio_load $path, $facedata
2657 or die "$path: $!"; 3141 or die "$path: $!";
2659 $facedata = Coro::Storable::thaw $facedata; 3143 $facedata = Coro::Storable::thaw $facedata;
2660 3144
2661 $facedata->{version} == 2 3145 $facedata->{version} == 2
2662 or cf::cleanup "$path: version mismatch, cannot proceed."; 3146 or cf::cleanup "$path: version mismatch, cannot proceed.";
2663 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
2664 { 3155 {
2665 my $faces = $facedata->{faceinfo}; 3156 my $faces = $facedata->{faceinfo};
2666 3157
2667 while (my ($face, $info) = each %$faces) { 3158 while (my ($face, $info) = each %$faces) {
2668 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3159 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3160
2669 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3161 cf::face::set_visibility $idx, $info->{visibility};
3162 cf::face::set_magicmap $idx, $info->{magicmap};
2670 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3163 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2671 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3164 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2672 Coro::cede; 3165
3166 cf::cede_to_tick;
2673 } 3167 }
2674 3168
2675 while (my ($face, $info) = each %$faces) { 3169 while (my ($face, $info) = each %$faces) {
2676 next unless $info->{smooth}; 3170 next unless $info->{smooth};
3171
2677 my $idx = cf::face::find $face 3172 my $idx = cf::face::find $face
2678 or next; 3173 or next;
3174
2679 if (my $smooth = cf::face::find $info->{smooth}) { 3175 if (my $smooth = cf::face::find $info->{smooth}) {
3176 cf::face::set_smooth $idx, $smooth;
2680 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3177 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2681 } else { 3178 } else {
2682 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3179 warn "smooth face '$info->{smooth}' not found for face '$face'";
2683 } 3180 }
2684 Coro::cede; 3181
3182 cf::cede_to_tick;
2685 } 3183 }
2686 } 3184 }
2687 3185
2688 { 3186 {
2689 my $anims = $facedata->{animinfo}; 3187 my $anims = $facedata->{animinfo};
2690 3188
2691 while (my ($anim, $info) = each %$anims) { 3189 while (my ($anim, $info) = each %$anims) {
2692 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3190 cf::anim::set $anim, $info->{frames}, $info->{facings};
2693 Coro::cede; 3191 cf::cede_to_tick;
2694 } 3192 }
2695 3193
2696 cf::anim::invalidate_all; # d'oh 3194 cf::anim::invalidate_all; # d'oh
2697 } 3195 }
2698 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
2699 1 3232 1
2700} 3233}
2701 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
2702sub 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
2703 load_resource_file "$MAPDIR/regions" 3268 load_resource_file "$MAPDIR/regions"
2704 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 }
2705} 3275}
2706 3276
2707sub reload_facedata { 3277sub reload_facedata {
2708 load_facedata "$DATADIR/facedata" 3278 load_facedata "$DATADIR/facedata"
2709 or die "unable to load facedata\n"; 3279 or die "unable to load facedata\n";
2738 3308
2739sub init { 3309sub init {
2740 reload_resources; 3310 reload_resources;
2741} 3311}
2742 3312
2743sub cfg_load { 3313sub reload_config {
2744 open my $fh, "<:utf8", "$CONFDIR/config" 3314 open my $fh, "<:utf8", "$CONFDIR/config"
2745 or return; 3315 or return;
2746 3316
2747 local $/; 3317 local $/;
2748 *CFG = YAML::Syck::Load <$fh>; 3318 *CFG = YAML::Syck::Load <$fh>;
2764sub main { 3334sub main {
2765 # we must not ever block the main coroutine 3335 # we must not ever block the main coroutine
2766 local $Coro::idle = sub { 3336 local $Coro::idle = sub {
2767 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#
2768 (async { 3338 (async {
2769 Event::one_event; 3339 $Coro::current->{desc} = "IDLE BUG HANDLER";
3340 EV::loop EV::LOOP_ONESHOT;
2770 })->prio (Coro::PRIO_MAX); 3341 })->prio (Coro::PRIO_MAX);
2771 }; 3342 };
2772 3343
2773 cfg_load; 3344 reload_config;
2774 db_init; 3345 db_init;
2775 load_extensions; 3346 load_extensions;
2776 3347
2777 $TICK_WATCHER->start; 3348 $TICK_WATCHER->start;
3349 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
2778 Event::loop; 3350 EV::loop;
2779} 3351}
2780 3352
2781############################################################################# 3353#############################################################################
2782# initialisation and cleanup 3354# initialisation and cleanup
2783 3355
2784# install some emergency cleanup handlers 3356# install some emergency cleanup handlers
2785BEGIN { 3357BEGIN {
3358 our %SIGWATCHER = ();
2786 for my $signal (qw(INT HUP TERM)) { 3359 for my $signal (qw(INT HUP TERM)) {
2787 Event->signal ( 3360 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2788 reentrant => 0,
2789 data => WF_AUTOCANCEL,
2790 signal => $signal,
2791 prio => 0,
2792 cb => sub {
2793 cf::cleanup "SIG$signal"; 3361 cf::cleanup "SIG$signal";
2794 },
2795 ); 3362 };
2796 } 3363 }
2797} 3364}
2798 3365
2799sub write_runtime { 3366sub write_runtime {
2800 my $runtime = "$LOCALDIR/runtime"; 3367 my $runtime = "$LOCALDIR/runtime";
2845 # and maps saved/destroyed asynchronously. 3412 # and maps saved/destroyed asynchronously.
2846 warn "begin emergency player save\n"; 3413 warn "begin emergency player save\n";
2847 for my $login (keys %cf::PLAYER) { 3414 for my $login (keys %cf::PLAYER) {
2848 my $pl = $cf::PLAYER{$login} or next; 3415 my $pl = $cf::PLAYER{$login} or next;
2849 $pl->valid or next; 3416 $pl->valid or next;
3417 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2850 $pl->save; 3418 $pl->save;
2851 } 3419 }
2852 warn "end emergency player save\n"; 3420 warn "end emergency player save\n";
2853 3421
2854 warn "begin emergency map save\n"; 3422 warn "begin emergency map save\n";
2893 warn "syncing database to disk"; 3461 warn "syncing database to disk";
2894 BDB::db_env_txn_checkpoint $DB_ENV; 3462 BDB::db_env_txn_checkpoint $DB_ENV;
2895 3463
2896 # 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
2897 3465
2898 warn "cancelling all WF_AUTOCANCEL watchers";
2899 for (Event::all_watchers) {
2900 $_->cancel if $_->data & WF_AUTOCANCEL;
2901 }
2902
2903 warn "flushing outstanding aio requests"; 3466 warn "flushing outstanding aio requests";
2904 for (;;) { 3467 for (;;) {
2905 BDB::flush; 3468 BDB::flush;
2906 IO::AIO::flush; 3469 IO::AIO::flush;
2907 Coro::cede; 3470 Coro::cede_notself;
2908 last unless IO::AIO::nreqs || BDB::nreqs; 3471 last unless IO::AIO::nreqs || BDB::nreqs;
2909 warn "iterate..."; 3472 warn "iterate...";
2910 } 3473 }
2911 3474
2912 ++$RELOAD; 3475 ++$RELOAD;
2971 warn "reloading cf.pm"; 3534 warn "reloading cf.pm";
2972 require cf; 3535 require cf;
2973 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3536 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2974 3537
2975 warn "loading config and database again"; 3538 warn "loading config and database again";
2976 cf::cfg_load; 3539 cf::reload_config;
2977 3540
2978 warn "loading extensions"; 3541 warn "loading extensions";
2979 cf::load_extensions; 3542 cf::load_extensions;
2980 3543
2981 warn "reattaching attachments to objects/players"; 3544 warn "reattaching attachments to objects/players";
3001 3564
3002sub reload_perl() { 3565sub reload_perl() {
3003 # doing reload synchronously and two reloads happen back-to-back, 3566 # doing reload synchronously and two reloads happen back-to-back,
3004 # coro crashes during coro_state_free->destroy here. 3567 # coro crashes during coro_state_free->destroy here.
3005 3568
3006 $RELOAD_WATCHER ||= Event->timer ( 3569 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3007 reentrant => 0,
3008 after => 0,
3009 data => WF_AUTOCANCEL,
3010 cb => sub {
3011 do_reload_perl;
3012 undef $RELOAD_WATCHER; 3570 undef $RELOAD_WATCHER;
3013 }, 3571 do_reload_perl;
3014 ); 3572 };
3015} 3573}
3016 3574
3017register_command "reload" => sub { 3575register_command "reload" => sub {
3018 my ($who, $arg) = @_; 3576 my ($who, $arg) = @_;
3019 3577
3020 if ($who->flag (FLAG_WIZ)) { 3578 if ($who->flag (FLAG_WIZ)) {
3021 $who->message ("reloading server."); 3579 $who->message ("reloading server.");
3580 async {
3581 $Coro::current->{desc} = "perl_reload";
3022 async { reload_perl }; 3582 reload_perl;
3583 };
3023 } 3584 }
3024}; 3585};
3025 3586
3026unshift @INC, $LIBDIR; 3587unshift @INC, $LIBDIR;
3027 3588
3046 my $signal = new Coro::Signal; 3607 my $signal = new Coro::Signal;
3047 push @WAIT_FOR_TICK_BEGIN, $signal; 3608 push @WAIT_FOR_TICK_BEGIN, $signal;
3048 $signal->wait; 3609 $signal->wait;
3049} 3610}
3050 3611
3051 my $min = 1e6;#d# 3612$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3052 my $avg = 10;
3053$TICK_WATCHER = Event->timer (
3054 reentrant => 0,
3055 parked => 1,
3056 prio => 0,
3057 at => $NEXT_TICK || $TICK,
3058 data => WF_AUTOCANCEL,
3059 cb => sub {
3060 if ($Coro::current != $Coro::main) { 3613 if ($Coro::current != $Coro::main) {
3061 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"
3062 unless ++$bug_warning > 10; 3615 unless ++$bug_warning > 10;
3063 return; 3616 return;
3064 } 3617 }
3065 3618
3066 $NOW = $tick_start = Event::time; 3619 $NOW = $tick_start = EV::now;
3067 3620
3068 cf::server_tick; # one server iteration 3621 cf::server_tick; # one server iteration
3069 3622
3070 0 && sync_job {#d# 3623 $RUNTIME += $TICK;
3071 for(1..10) { 3624 $NEXT_TICK = $_[0]->at;
3072 my $t = Event::time;
3073 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3074 or die;
3075 3625
3076 $map->width (50); 3626 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3077 $map->height (50); 3627 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3078 $map->alloc; 3628 Coro::async_pool {
3079 $map->_load_objects ("/tmp/x.map", 1); 3629 $Coro::current->{desc} = "runtime saver";
3080 my $t = Event::time - $t; 3630 write_runtime
3081 3631 or warn "ERROR: unable to write runtime file: $!";
3082 #next unless $t < 0.0013;#d#
3083 if ($t < $min) {
3084 $min = $t;
3085 }
3086 $avg = $avg * 0.99 + $t * 0.01;
3087 }
3088 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3089 exit 0;
3090 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3091 }; 3632 };
3633 }
3092 3634
3093 $RUNTIME += $TICK;
3094 $NEXT_TICK += $TICK;
3095
3096 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3097 $NEXT_RUNTIME_WRITE = $NOW + 10;
3098 Coro::async_pool {
3099 write_runtime
3100 or warn "ERROR: unable to write runtime file: $!";
3101 };
3102 }
3103
3104# my $AFTER = Event::time;
3105# warn $AFTER - $NOW;#d#
3106
3107 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3635 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3108 $sig->send; 3636 $sig->send;
3109 } 3637 }
3110 while (my $sig = shift @WAIT_FOR_TICK) { 3638 while (my $sig = shift @WAIT_FOR_TICK) {
3111 $sig->send; 3639 $sig->send;
3112 } 3640 }
3113 3641
3114 $NOW = Event::time;
3115
3116 # if we are delayed by four ticks or more, skip them all
3117 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3118
3119 $TICK_WATCHER->at ($NEXT_TICK);
3120 $TICK_WATCHER->start;
3121
3122 $LOAD = ($NOW - $tick_start) / $TICK; 3642 $LOAD = ($NOW - $tick_start) / $TICK;
3123 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3643 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3124 3644
3125 _post_tick; 3645 _post_tick;
3126 3646};
3127 3647$TICK_WATCHER->priority (EV::MAXPRI);
3128 },
3129);
3130 3648
3131{ 3649{
3132 BDB::max_poll_time $TICK * 0.1; 3650 # configure BDB
3133 $BDB_POLL_WATCHER = Event->io ( 3651
3134 reentrant => 0,
3135 fd => BDB::poll_fileno,
3136 poll => 'r',
3137 prio => 0,
3138 data => WF_AUTOCANCEL,
3139 cb => \&BDB::poll_cb,
3140 );
3141 BDB::min_parallel 8; 3652 BDB::min_parallel 8;
3142 3653 BDB::max_poll_reqs $TICK * 0.1;
3143 BDB::set_sync_prepare { 3654 $Coro::BDB::WATCHER->priority (1);
3144 my $status;
3145 my $current = $Coro::current;
3146 (
3147 sub {
3148 $status = $!;
3149 $current->ready; undef $current;
3150 },
3151 sub {
3152 Coro::schedule while defined $current;
3153 $! = $status;
3154 },
3155 )
3156 };
3157 3655
3158 unless ($DB_ENV) { 3656 unless ($DB_ENV) {
3159 $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);
3160 3662
3161 cf::sync_job { 3663 cf::sync_job {
3162 eval { 3664 eval {
3163 BDB::db_env_open 3665 BDB::db_env_open
3164 $DB_ENV, 3666 $DB_ENV,
3166 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
3167 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3669 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3168 0666; 3670 0666;
3169 3671
3170 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3672 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3171
3172 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3173 $DB_ENV->set_lk_detect;
3174 }; 3673 };
3175 3674
3176 cf::cleanup "db_env_open(db): $@" if $@; 3675 cf::cleanup "db_env_open(db): $@" if $@;
3177 }; 3676 };
3178 } 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 };
3179} 3688}
3180 3689
3181{ 3690{
3691 # configure IO::AIO
3692
3182 IO::AIO::min_parallel 8; 3693 IO::AIO::min_parallel 8;
3183
3184 undef $Coro::AIO::WATCHER;
3185 IO::AIO::max_poll_time $TICK * 0.1; 3694 IO::AIO::max_poll_time $TICK * 0.1;
3186 $AIO_POLL_WATCHER = Event->io ( 3695 $Coro::AIO::WATCHER->priority (1);
3187 reentrant => 0,
3188 data => WF_AUTOCANCEL,
3189 fd => IO::AIO::poll_fileno,
3190 poll => 'r',
3191 prio => 6,
3192 cb => \&IO::AIO::poll_cb,
3193 );
3194} 3696}
3195 3697
3196my $_log_backtrace; 3698my $_log_backtrace;
3197 3699
3198sub _log_backtrace { 3700sub _log_backtrace {
3202 3704
3203 # limit the # of concurrent backtraces 3705 # limit the # of concurrent backtraces
3204 if ($_log_backtrace < 2) { 3706 if ($_log_backtrace < 2) {
3205 ++$_log_backtrace; 3707 ++$_log_backtrace;
3206 async { 3708 async {
3709 $Coro::current->{desc} = "abt $msg";
3710
3207 my @bt = fork_call { 3711 my @bt = fork_call {
3208 @addr = map { sprintf "%x", $_ } @addr; 3712 @addr = map { sprintf "%x", $_ } @addr;
3209 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3713 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3210 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 |"
3211 or die "addr2line: $!"; 3715 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines