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.303 by root, Wed Jul 11 15:57:31 2007 UTC vs.
Revision 1.410 by root, Tue Jan 15 12:02:24 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines