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.302 by root, Tue Jul 10 16:23:59 2007 UTC vs.
Revision 1.411 by root, Fri Feb 1 15:54:07 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;
1175 my $msg = $@ ? "$v->{path}: $@\n" 1316 my $msg = $@ ? "$v->{path}: $@\n"
1176 : "$v->{base}: extension inactive.\n"; 1317 : "$v->{base}: extension inactive.\n";
1177 1318
1178 if (exists $v->{meta}{mandatory}) { 1319 if (exists $v->{meta}{mandatory}) {
1179 warn $msg; 1320 warn $msg;
1180 warn "mandatory extension failed to load, exiting.\n"; 1321 cf::cleanup "mandatory extension failed to load, exiting.";
1181 exit 1;
1182 } 1322 }
1183 1323
1184 warn $msg; 1324 warn $msg;
1185 } 1325 }
1186 1326
1211use Coro::AIO; 1351use Coro::AIO;
1212 1352
1213=head3 cf::player 1353=head3 cf::player
1214 1354
1215=over 4 1355=over 4
1356
1357=item cf::player::num_playing
1358
1359Returns the official number of playing players, as per the Crossfire metaserver rules.
1360
1361=cut
1362
1363sub num_playing {
1364 scalar grep
1365 $_->ob->map
1366 && !$_->hidden
1367 && !$_->ob->flag (cf::FLAG_WIZ),
1368 cf::player::list
1369}
1216 1370
1217=item cf::player::find $login 1371=item cf::player::find $login
1218 1372
1219Returns the given player object, loading it if necessary (might block). 1373Returns the given player object, loading it if necessary (might block).
1220 1374
1256 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1410 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1257 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1411 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1258 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1412 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1259 aio_unlink +(playerdir $login) . "/$login.pl"; 1413 aio_unlink +(playerdir $login) . "/$login.pl";
1260 1414
1261 my $pl = load_pl path $login 1415 my $f = new_from_file cf::object::thawer path $login
1262 or return; 1416 or return;
1417
1418 my $pl = cf::player::load_pl $f
1419 or return;
1420 local $cf::PLAYER_LOADING{$login} = $pl;
1421 $f->resolve_delayed_derefs;
1263 $cf::PLAYER{$login} = $pl 1422 $cf::PLAYER{$login} = $pl
1264 } 1423 }
1265 } 1424 }
1266} 1425}
1267 1426
1277 1436
1278 aio_mkdir playerdir $pl, 0770; 1437 aio_mkdir playerdir $pl, 0770;
1279 $pl->{last_save} = $cf::RUNTIME; 1438 $pl->{last_save} = $cf::RUNTIME;
1280 1439
1281 $pl->save_pl ($path); 1440 $pl->save_pl ($path);
1282 Coro::cede; 1441 cf::cede_to_tick;
1283} 1442}
1284 1443
1285sub new($) { 1444sub new($) {
1286 my ($login) = @_; 1445 my ($login) = @_;
1287 1446
1291 $self->{deny_save} = 1; 1450 $self->{deny_save} = 1;
1292 1451
1293 $cf::PLAYER{$login} = $self; 1452 $cf::PLAYER{$login} = $self;
1294 1453
1295 $self 1454 $self
1455}
1456
1457=item $player->send_msg ($channel, $msg, $color, [extra...])
1458
1459=cut
1460
1461sub send_msg {
1462 my $ns = shift->ns
1463 or return;
1464 $ns->send_msg (@_);
1296} 1465}
1297 1466
1298=item $pl->quit_character 1467=item $pl->quit_character
1299 1468
1300Nukes the player without looking back. If logged in, the connection will 1469Nukes the player without looking back. If logged in, the connection will
1355 or return []; 1524 or return [];
1356 1525
1357 my @logins; 1526 my @logins;
1358 1527
1359 for my $login (@$dirs) { 1528 for my $login (@$dirs) {
1529 my $path = path $login;
1530
1531 # a .pst is a dead give-away for a valid player
1532 unless (-e "$path.pst") {
1360 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1533 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1361 aio_read $fh, 0, 512, my $buf, 0 or next; 1534 aio_read $fh, 0, 512, my $buf, 0 or next;
1362 $buf !~ /^password -------------$/m or next; # official not-valid tag 1535 $buf !~ /^password -------------$/m or next; # official not-valid tag
1536 }
1363 1537
1364 utf8::decode $login; 1538 utf8::decode $login;
1365 push @logins, $login; 1539 push @logins, $login;
1366 } 1540 }
1367 1541
1400 1574
1401Expand crossfire pod fragments into protocol xml. 1575Expand crossfire pod fragments into protocol xml.
1402 1576
1403=cut 1577=cut
1404 1578
1579use re 'eval';
1580
1581my $group;
1582my $interior; $interior = qr{
1583 # match a pod interior sequence sans C<< >>
1584 (?:
1585 \ (.*?)\ (?{ $group = $^N })
1586 | < (??{$interior}) >
1587 )
1588}x;
1589
1405sub expand_cfpod { 1590sub expand_cfpod {
1406 ((my $self), (local $_)) = @_; 1591 my ($self, $pod) = @_;
1407 1592
1408 # escape & and < 1593 my $xml;
1409 s/&/&amp;/g;
1410 s/(?<![BIUGH])</&lt;/g;
1411 1594
1412 # this is buggy, it needs to properly take care of nested <'s 1595 while () {
1596 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1597 $group = $1;
1413 1598
1414 1 while 1599 $group =~ s/&/&amp;/g;
1415 # replace B<>, I<>, U<> etc. 1600 $group =~ s/</&lt;/g;
1416 s/B<([^\>]*)>/<b>$1<\/b>/ 1601
1417 || s/I<([^\>]*)>/<i>$1<\/i>/ 1602 $xml .= $group;
1418 || s/U<([^\>]*)>/<u>$1<\/u>/ 1603 } elsif ($pod =~ m%\G
1419 # replace G<male|female> tags 1604 ([BCGHITU])
1420 || s{G<([^>|]*)\|([^>]*)>}{ 1605 <
1421 $self->gender ? $2 : $1 1606 (?:
1422 }ge 1607 ([^<>]*) (?{ $group = $^N })
1423 # replace H<hint text> 1608 | < $interior >
1424 || s{H<([^\>]*)>} 1609 )
1610 >
1611 %gcsx
1425 { 1612 ) {
1613 my ($code, $data) = ($1, $group);
1614
1615 if ($code eq "B") {
1616 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1617 } elsif ($code eq "I") {
1618 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1619 } elsif ($code eq "U") {
1620 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1621 } elsif ($code eq "C") {
1622 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1623 } elsif ($code eq "T") {
1624 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1625 } elsif ($code eq "G") {
1626 my ($male, $female) = split /\|/, $data;
1627 $data = $self->gender ? $female : $male;
1628 $xml .= expand_cfpod ($self, $data);
1629 } elsif ($code eq "H") {
1426 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1630 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1427 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1631 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1428 "") 1632 "")
1429 [$self->{hintmode}] 1633 [$self->{hintmode}];
1634 } else {
1635 $xml .= "error processing '$code($data)' directive";
1430 }ge; 1636 }
1637 } else {
1638 if ($pod =~ /\G(.+)/) {
1639 warn "parse error while expanding $pod (at $1)";
1640 }
1641 last;
1642 }
1643 }
1431 1644
1645 for ($xml) {
1432 # create single paragraphs (very hackish) 1646 # create single paragraphs (very hackish)
1433 s/(?<=\S)\n(?=\w)/ /g; 1647 s/(?<=\S)\n(?=\w)/ /g;
1434 1648
1435 # compress some whitespace 1649 # compress some whitespace
1436 s/\s+\n/\n/g; # ws line-ends 1650 s/\s+\n/\n/g; # ws line-ends
1437 s/\n\n+/\n/g; # double lines 1651 s/\n\n+/\n/g; # double lines
1438 s/^\n+//; # beginning lines 1652 s/^\n+//; # beginning lines
1439 s/\n+$//; # ending lines 1653 s/\n+$//; # ending lines
1654 }
1440 1655
1441 $_ 1656 $xml
1442} 1657}
1658
1659no re 'eval';
1443 1660
1444sub hintmode { 1661sub hintmode {
1445 $_[0]{hintmode} = $_[1] if @_ > 1; 1662 $_[0]{hintmode} = $_[1] if @_ > 1;
1446 $_[0]{hintmode} 1663 $_[0]{hintmode}
1447} 1664}
1448 1665
1449=item $player->ext_reply ($msgid, %msg) 1666=item $player->ext_reply ($msgid, @msg)
1450 1667
1451Sends an ext reply to the player. 1668Sends an ext reply to the player.
1452 1669
1453=cut 1670=cut
1454 1671
1455sub ext_reply($$%) { 1672sub ext_reply($$@) {
1456 my ($self, $id, %msg) = @_; 1673 my ($self, $id, @msg) = @_;
1457 1674
1458 $msg{msgid} = $id; 1675 $self->ns->ext_reply ($id, @msg)
1459 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1460} 1676}
1461 1677
1462=item $player->ext_event ($type, %msg) 1678=item $player->ext_msg ($type, @msg)
1463 1679
1464Sends an ext event to the client. 1680Sends an ext event to the client.
1465 1681
1466=cut 1682=cut
1467 1683
1468sub ext_event($$%) { 1684sub ext_msg($$@) {
1469 my ($self, $type, %msg) = @_; 1685 my ($self, $type, @msg) = @_;
1470 1686
1471 $self->ns->ext_event ($type, %msg); 1687 $self->ns->ext_msg ($type, @msg);
1472} 1688}
1473 1689
1474=head3 cf::region 1690=head3 cf::region
1475 1691
1476=over 4 1692=over 4
1489 my ($path) = @_; 1705 my ($path) = @_;
1490 1706
1491 my ($match, $specificity); 1707 my ($match, $specificity);
1492 1708
1493 for my $region (list) { 1709 for my $region (list) {
1494 if ($region->match && $path =~ $region->match) { 1710 if ($region->{match} && $path =~ $region->{match}) {
1495 ($match, $specificity) = ($region, $region->specificity) 1711 ($match, $specificity) = ($region, $region->specificity)
1496 if $region->specificity > $specificity; 1712 if $region->specificity > $specificity;
1497 } 1713 }
1498 } 1714 }
1499 1715
1619 $self->init; # pass $1 etc. 1835 $self->init; # pass $1 etc.
1620 return $self; 1836 return $self;
1621 } 1837 }
1622 } 1838 }
1623 1839
1624 Carp::carp "unable to resolve path '$path' (base '$base')."; 1840 Carp::cluck "unable to resolve path '$path' (base '$base').";
1625 () 1841 ()
1626} 1842}
1627 1843
1628sub init { 1844sub init {
1629 my ($self) = @_; 1845 my ($self) = @_;
1692 1908
1693sub load_header_from($) { 1909sub load_header_from($) {
1694 my ($self, $path) = @_; 1910 my ($self, $path) = @_;
1695 1911
1696 utf8::encode $path; 1912 utf8::encode $path;
1697 #aio_open $path, O_RDONLY, 0 1913 my $f = new_from_file cf::object::thawer $path
1698 # or return;
1699
1700 $self->_load_header ($path)
1701 or return; 1914 or return;
1915
1916 $self->_load_header ($f)
1917 or return;
1918
1919 local $MAP_LOADING{$self->{path}} = $self;
1920 $f->resolve_delayed_derefs;
1702 1921
1703 $self->{load_path} = $path; 1922 $self->{load_path} = $path;
1704 1923
1705 1 1924 1
1706} 1925}
1760sub find { 1979sub find {
1761 my ($path, $origin) = @_; 1980 my ($path, $origin) = @_;
1762 1981
1763 $path = normalise $path, $origin && $origin->path; 1982 $path = normalise $path, $origin && $origin->path;
1764 1983
1984 cf::lock_wait "map_data:$path";#d#remove
1765 cf::lock_wait "map_find:$path"; 1985 cf::lock_wait "map_find:$path";
1766 1986
1767 $cf::MAP{$path} || do { 1987 $cf::MAP{$path} || do {
1768 my $guard = cf::lock_acquire "map_find:$path"; 1988 my $guard1 = cf::lock_acquire "map_find:$path";
1989 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1990
1769 my $map = new_from_path cf::map $path 1991 my $map = new_from_path cf::map $path
1770 or return; 1992 or return;
1771 1993
1772 $map->{last_save} = $cf::RUNTIME; 1994 $map->{last_save} = $cf::RUNTIME;
1773 1995
1775 or return; 1997 or return;
1776 1998
1777 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1999 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1778 # doing this can freeze the server in a sync job, obviously 2000 # doing this can freeze the server in a sync job, obviously
1779 #$cf::WAIT_FOR_TICK->wait; 2001 #$cf::WAIT_FOR_TICK->wait;
2002 undef $guard1;
2003 undef $guard2;
1780 $map->reset; 2004 $map->reset;
1781 undef $guard;
1782 return find $path; 2005 return find $path;
1783 } 2006 }
1784 2007
1785 $cf::MAP{$path} = $map 2008 $cf::MAP{$path} = $map
1786 } 2009 }
1795 local $self->{deny_reset} = 1; # loading can take a long time 2018 local $self->{deny_reset} = 1; # loading can take a long time
1796 2019
1797 my $path = $self->{path}; 2020 my $path = $self->{path};
1798 2021
1799 { 2022 {
1800 my $guard = cf::lock_acquire "map_load:$path"; 2023 my $guard = cf::lock_acquire "map_data:$path";
1801 2024
2025 return unless $self->valid;
1802 return if $self->in_memory != cf::MAP_SWAPPED; 2026 return unless $self->in_memory == cf::MAP_SWAPPED;
1803 2027
1804 $self->in_memory (cf::MAP_LOADING); 2028 $self->in_memory (cf::MAP_LOADING);
1805 2029
1806 $self->alloc; 2030 $self->alloc;
1807 2031
1808 $self->pre_load; 2032 $self->pre_load;
1809 Coro::cede; 2033 cf::cede_to_tick;
1810 2034
2035 my $f = new_from_file cf::object::thawer $self->{load_path};
2036 $f->skip_block;
1811 $self->_load_objects ($self->{load_path}, 1) 2037 $self->_load_objects ($f)
1812 or return; 2038 or return;
1813 2039
1814 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2040 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1815 if delete $self->{load_original}; 2041 if delete $self->{load_original};
1816 2042
1817 if (my $uniq = $self->uniq_path) { 2043 if (my $uniq = $self->uniq_path) {
1818 utf8::encode $uniq; 2044 utf8::encode $uniq;
1819 if (aio_open $uniq, O_RDONLY, 0) { 2045 unless (aio_stat $uniq) {
2046 if (my $f = new_from_file cf::object::thawer $uniq) {
1820 $self->clear_unique_items; 2047 $self->clear_unique_items;
1821 $self->_load_objects ($uniq, 0); 2048 $self->_load_objects ($f);
2049 $f->resolve_delayed_derefs;
2050 }
1822 } 2051 }
1823 } 2052 }
1824 2053
1825 Coro::cede; 2054 $f->resolve_delayed_derefs;
2055
2056 cf::cede_to_tick;
1826 # now do the right thing for maps 2057 # now do the right thing for maps
1827 $self->link_multipart_objects; 2058 $self->link_multipart_objects;
1828 $self->difficulty ($self->estimate_difficulty) 2059 $self->difficulty ($self->estimate_difficulty)
1829 unless $self->difficulty; 2060 unless $self->difficulty;
1830 Coro::cede; 2061 cf::cede_to_tick;
1831 2062
1832 unless ($self->{deny_activate}) { 2063 unless ($self->{deny_activate}) {
1833 $self->decay_objects; 2064 $self->decay_objects;
1834 $self->fix_auto_apply; 2065 $self->fix_auto_apply;
1835 $self->update_buttons; 2066 $self->update_buttons;
1836 Coro::cede; 2067 cf::cede_to_tick;
1837 $self->set_darkness_map; 2068 $self->set_darkness_map;
1838 Coro::cede; 2069 cf::cede_to_tick;
1839 $self->activate; 2070 $self->activate;
1840 } 2071 }
2072
2073 $self->{last_save} = $cf::RUNTIME;
2074 $self->last_access ($cf::RUNTIME);
1841 2075
1842 $self->in_memory (cf::MAP_IN_MEMORY); 2076 $self->in_memory (cf::MAP_IN_MEMORY);
1843 } 2077 }
1844 2078
1845 $self->post_load; 2079 $self->post_load;
1856 2090
1857 $self 2091 $self
1858} 2092}
1859 2093
1860# find and load all maps in the 3x3 area around a map 2094# find and load all maps in the 3x3 area around a map
1861sub load_diag { 2095sub load_neighbours {
1862 my ($map) = @_; 2096 my ($map) = @_;
1863 2097
1864 my @diag; # diagonal neighbours 2098 my @neigh; # diagonal neighbours
1865 2099
1866 for (0 .. 3) { 2100 for (0 .. 3) {
1867 my $neigh = $map->tile_path ($_) 2101 my $neigh = $map->tile_path ($_)
1868 or next; 2102 or next;
1869 $neigh = find $neigh, $map 2103 $neigh = find $neigh, $map
1870 or next; 2104 or next;
1871 $neigh->load; 2105 $neigh->load;
1872 2106
2107 push @neigh,
1873 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2108 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1874 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2109 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1875 } 2110 }
1876 2111
1877 for (@diag) { 2112 for (grep defined $_->[0], @neigh) {
2113 my ($path, $origin) = @$_;
1878 my $neigh = find @$_ 2114 my $neigh = find $path, $origin
1879 or next; 2115 or next;
1880 $neigh->load; 2116 $neigh->load;
1881 } 2117 }
1882} 2118}
1883 2119
1888} 2124}
1889 2125
1890sub do_load_sync { 2126sub do_load_sync {
1891 my ($map) = @_; 2127 my ($map) = @_;
1892 2128
2129 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2130 if $Coro::current == $Coro::main;
2131
1893 cf::sync_job { $map->load }; 2132 cf::sync_job { $map->load };
1894} 2133}
1895 2134
1896our %MAP_PREFETCH; 2135our %MAP_PREFETCH;
1897our $MAP_PREFETCHER = undef; 2136our $MAP_PREFETCHER = undef;
1898 2137
1899sub find_async { 2138sub find_async {
1900 my ($path, $origin) = @_; 2139 my ($path, $origin, $load) = @_;
1901 2140
1902 $path = normalise $path, $origin && $origin->{path}; 2141 $path = normalise $path, $origin && $origin->{path};
1903 2142
1904 if (my $map = $cf::MAP{$path}) { 2143 if (my $map = $cf::MAP{$path}) {
1905 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2144 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1906 } 2145 }
1907 2146
1908 undef $MAP_PREFETCH{$path}; 2147 $MAP_PREFETCH{$path} |= $load;
2148
1909 $MAP_PREFETCHER ||= cf::async { 2149 $MAP_PREFETCHER ||= cf::async {
2150 $Coro::current->{desc} = "map prefetcher";
2151
1910 while (%MAP_PREFETCH) { 2152 while (%MAP_PREFETCH) {
1911 for my $path (keys %MAP_PREFETCH) { 2153 while (my ($k, $v) = each %MAP_PREFETCH) {
1912 my $map = find $path 2154 if (my $map = find $k) {
1913 or next;
1914 $map->load; 2155 $map->load if $v;
2156 }
1915 2157
1916 delete $MAP_PREFETCH{$path}; 2158 delete $MAP_PREFETCH{$k};
1917 } 2159 }
1918 } 2160 }
1919 undef $MAP_PREFETCHER; 2161 undef $MAP_PREFETCHER;
1920 }; 2162 };
1921 $MAP_PREFETCHER->prio (6); 2163 $MAP_PREFETCHER->prio (6);
1924} 2166}
1925 2167
1926sub save { 2168sub save {
1927 my ($self) = @_; 2169 my ($self) = @_;
1928 2170
1929 my $lock = cf::lock_acquire "map_data:" . $self->path; 2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
1930 2172
1931 $self->{last_save} = $cf::RUNTIME; 2173 $self->{last_save} = $cf::RUNTIME;
1932 2174
1933 return unless $self->dirty; 2175 return unless $self->dirty;
1934 2176
1940 return if $self->{deny_save}; 2182 return if $self->{deny_save};
1941 2183
1942 local $self->{last_access} = $self->last_access;#d# 2184 local $self->{last_access} = $self->last_access;#d#
1943 2185
1944 cf::async { 2186 cf::async {
2187 $Coro::current->{desc} = "map player save";
1945 $_->contr->save for $self->players; 2188 $_->contr->save for $self->players;
1946 }; 2189 };
1947 2190
1948 if ($uniq) { 2191 if ($uniq) {
1949 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2192 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1957 my ($self) = @_; 2200 my ($self) = @_;
1958 2201
1959 # save first because save cedes 2202 # save first because save cedes
1960 $self->save; 2203 $self->save;
1961 2204
1962 my $lock = cf::lock_acquire "map_data:" . $self->path; 2205 my $lock = cf::lock_acquire "map_data:$self->{path}";
1963 2206
1964 return if $self->players; 2207 return if $self->players;
1965 return if $self->in_memory != cf::MAP_IN_MEMORY; 2208 return if $self->in_memory != cf::MAP_IN_MEMORY;
1966 return if $self->{deny_save}; 2209 return if $self->{deny_save};
1967 2210
2211 $self->in_memory (cf::MAP_SWAPPED);
2212
2213 $self->deactivate;
2214 $_->clear_links_to ($self) for values %cf::MAP;
1968 $self->clear; 2215 $self->clear;
1969 $self->in_memory (cf::MAP_SWAPPED);
1970} 2216}
1971 2217
1972sub reset_at { 2218sub reset_at {
1973 my ($self) = @_; 2219 my ($self) = @_;
1974 2220
2006 if $uniq; 2252 if $uniq;
2007 } 2253 }
2008 2254
2009 delete $cf::MAP{$self->path}; 2255 delete $cf::MAP{$self->path};
2010 2256
2257 $self->deactivate;
2258 $_->clear_links_to ($self) for values %cf::MAP;
2011 $self->clear; 2259 $self->clear;
2012
2013 $_->clear_links_to ($self) for values %cf::MAP;
2014 2260
2015 $self->unlink_save; 2261 $self->unlink_save;
2016 $self->destroy; 2262 $self->destroy;
2017} 2263}
2018 2264
2019my $nuke_counter = "aaaa"; 2265my $nuke_counter = "aaaa";
2020 2266
2021sub nuke { 2267sub nuke {
2022 my ($self) = @_; 2268 my ($self) = @_;
2023 2269
2270 {
2271 my $lock = cf::lock_acquire "map_data:$self->{path}";
2272
2024 delete $cf::MAP{$self->path}; 2273 delete $cf::MAP{$self->path};
2025 2274
2026 $self->unlink_save; 2275 $self->unlink_save;
2027 2276
2028 bless $self, "cf::map"; 2277 bless $self, "cf::map";
2029 delete $self->{deny_reset}; 2278 delete $self->{deny_reset};
2030 $self->{deny_save} = 1; 2279 $self->{deny_save} = 1;
2031 $self->reset_timeout (1); 2280 $self->reset_timeout (1);
2032 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2281 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2033 2282
2034 $cf::MAP{$self->path} = $self; 2283 $cf::MAP{$self->path} = $self;
2284 }
2035 2285
2036 $self->reset; # polite request, might not happen 2286 $self->reset; # polite request, might not happen
2037} 2287}
2038 2288
2039=item $maps = cf::map::tmp_maps 2289=item $maps = cf::map::tmp_maps
2115 2365
2116sub inv_recursive { 2366sub inv_recursive {
2117 inv_recursive_ inv $_[0] 2367 inv_recursive_ inv $_[0]
2118} 2368}
2119 2369
2370=item $ref = $ob->ref
2371
2372creates and returns a persistent reference to an objetc that can be stored as a string.
2373
2374=item $ob = cf::object::deref ($refstring)
2375
2376returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2377even if the object actually exists. May block.
2378
2379=cut
2380
2381sub deref {
2382 my ($ref) = @_;
2383
2384 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2385 my ($uuid, $name) = ($1, $2);
2386 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2387 or return;
2388 $pl->ob->uuid eq $uuid
2389 or return;
2390
2391 $pl->ob
2392 } else {
2393 warn "$ref: cannot resolve object reference\n";
2394 undef
2395 }
2396}
2397
2120package cf; 2398package cf;
2121 2399
2122=back 2400=back
2123 2401
2124=head3 cf::object::player 2402=head3 cf::object::player
2146 2424
2147 } else { 2425 } else {
2148 my $pl = $self->contr; 2426 my $pl = $self->contr;
2149 2427
2150 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2428 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151 my $diag = $pl->{npc_dialog}; 2429 my $dialog = $pl->{npc_dialog};
2152 $diag->{pl}->ext_reply ( 2430 $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 2431
2159 } else { 2432 } else {
2160 $msg = $npc->name . " says: $msg" if $npc; 2433 $msg = $npc->name . " says: $msg" if $npc;
2161 $self->message ($msg, $flags); 2434 $self->message ($msg, $flags);
2162 } 2435 }
2163 } 2436 }
2437}
2438
2439=item $object->send_msg ($channel, $msg, $color, [extra...])
2440
2441=cut
2442
2443sub cf::object::send_msg {
2444 my $pl = shift->contr
2445 or return;
2446 $pl->send_msg (@_);
2164} 2447}
2165 2448
2166=item $player_object->may ("access") 2449=item $player_object->may ("access")
2167 2450
2168Returns wether the given player is authorized to access resource "access" 2451Returns wether the given player is authorized to access resource "access"
2247 # use -1 or undef as default coordinates, not 0, 0 2530 # use -1 or undef as default coordinates, not 0, 0
2248 ($x, $y) = ($map->enter_x, $map->enter_y) 2531 ($x, $y) = ($map->enter_x, $map->enter_y)
2249 if $x <=0 && $y <= 0; 2532 if $x <=0 && $y <= 0;
2250 2533
2251 $map->load; 2534 $map->load;
2252 $map->load_diag; 2535 $map->load_neighbours;
2253 2536
2254 return unless $self->contr->active; 2537 return unless $self->contr->active;
2255 $self->activate_recursive; 2538 $self->activate_recursive;
2256 2539
2257 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2540 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2258 $self->enter_map ($map, $x, $y); 2541 $self->enter_map ($map, $x, $y);
2259} 2542}
2260 2543
2261=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2544=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2262 2545
2263Moves the player to the given map-path and coordinates by first freezing 2546Moves the player to the given map-path and coordinates by first freezing
2264her, loading and preparing them map, calling the provided $check callback 2547her, loading and preparing them map, calling the provided $check callback
2265that has to return the map if sucecssful, and then unfreezes the player on 2548that has to return the map if sucecssful, and then unfreezes the player on
2266the new (success) or old (failed) map position. 2549the new (success) or old (failed) map position. In either case, $done will
2550be called at the end of this process.
2267 2551
2268=cut 2552=cut
2269 2553
2270our $GOTOGEN; 2554our $GOTOGEN;
2271 2555
2272sub cf::object::player::goto { 2556sub cf::object::player::goto {
2273 my ($self, $path, $x, $y, $check) = @_; 2557 my ($self, $path, $x, $y, $check, $done) = @_;
2274 2558
2275 # do generation counting so two concurrent goto's will be executed in-order 2559 # do generation counting so two concurrent goto's will be executed in-order
2276 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2560 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2277 2561
2278 $self->enter_link; 2562 $self->enter_link;
2279 2563
2280 (async { 2564 (async {
2565 $Coro::current->{desc} = "player::goto $path $x $y";
2566
2567 # *tag paths override both path and x|y
2568 if ($path =~ /^\*(.*)$/) {
2569 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2570 my $ob = $obs[rand @obs];
2571
2572 # see if we actually can go there
2573 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2574 $ob = $obs[rand @obs];
2575 } else {
2576 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2577 }
2578 # else put us there anyways for now #d#
2579
2580 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2581 } else {
2582 ($path, $x, $y) = (undef, undef, undef);
2583 }
2584 }
2585
2281 my $map = eval { 2586 my $map = eval {
2282 my $map = cf::map::find $path; 2587 my $map = defined $path ? cf::map::find $path : undef;
2283 2588
2284 if ($map) { 2589 if ($map) {
2285 $map = $map->customise_for ($self); 2590 $map = $map->customise_for ($self);
2286 $map = $check->($map) if $check && $map; 2591 $map = $check->($map) if $check && $map;
2287 } else { 2592 } else {
2288 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2593 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2289 } 2594 }
2290 2595
2291 $map 2596 $map
2292 }; 2597 };
2293 2598
2298 2603
2299 if ($gen == $self->{_goto_generation}) { 2604 if ($gen == $self->{_goto_generation}) {
2300 delete $self->{_goto_generation}; 2605 delete $self->{_goto_generation};
2301 $self->leave_link ($map, $x, $y); 2606 $self->leave_link ($map, $x, $y);
2302 } 2607 }
2608
2609 $done->() if $done;
2303 })->prio (1); 2610 })->prio (1);
2304} 2611}
2305 2612
2306=item $player_object->enter_exit ($exit_object) 2613=item $player_object->enter_exit ($exit_object)
2307 2614
2344 $rmp->{origin_y} = $exit->y; 2651 $rmp->{origin_y} = $exit->y;
2345 } 2652 }
2346 2653
2347 $rmp->{random_seed} ||= $exit->random_seed; 2654 $rmp->{random_seed} ||= $exit->random_seed;
2348 2655
2349 my $data = cf::to_json $rmp; 2656 my $data = cf::encode_json $rmp;
2350 my $md5 = Digest::MD5::md5_hex $data; 2657 my $md5 = Digest::MD5::md5_hex $data;
2351 my $meta = "$RANDOMDIR/$md5.meta"; 2658 my $meta = "$RANDOMDIR/$md5.meta";
2352 2659
2353 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2660 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2354 aio_write $fh, 0, (length $data), $data, 0; 2661 aio_write $fh, 0, (length $data), $data, 0;
2381 # if exit is damned, update players death & WoR home-position 2688 # if exit is damned, update players death & WoR home-position
2382 $self->contr->savebed ($slaying, $hp, $sp) 2689 $self->contr->savebed ($slaying, $hp, $sp)
2383 if $exit->flag (FLAG_DAMNED); 2690 if $exit->flag (FLAG_DAMNED);
2384 2691
2385 (async { 2692 (async {
2693 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2694
2386 $self->deactivate_recursive; # just to be sure 2695 $self->deactivate_recursive; # just to be sure
2387 unless (eval { 2696 unless (eval {
2388 $self->goto ($slaying, $hp, $sp); 2697 $self->goto ($slaying, $hp, $sp);
2389 2698
2390 1; 2699 1;
2416 2725
2417 utf8::encode $text; 2726 utf8::encode $text;
2418 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2727 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2419} 2728}
2420 2729
2421=item $client->send_msg ($color, $type, $msg, [extra...]) 2730=item $client->send_msg ($channel, $msg, $color, [extra...])
2422 2731
2423Send a drawinfo or msg packet to the client, formatting the msg for the 2732Send 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 2733client 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 2734the message, with C<log> being the default. If C<$color> is negative, suppress
2426the message unless the client supports the msg packet. 2735the message unless the client supports the msg packet.
2427 2736
2428=cut 2737=cut
2429 2738
2739# non-persistent channels (usually the info channel)
2740our %CHANNEL = (
2741 "c/identify" => {
2742 id => "infobox",
2743 title => "Identify",
2744 reply => undef,
2745 tooltip => "Items recently identified",
2746 },
2747 "c/examine" => {
2748 id => "infobox",
2749 title => "Examine",
2750 reply => undef,
2751 tooltip => "Signs and other items you examined",
2752 },
2753 "c/book" => {
2754 id => "infobox",
2755 title => "Book",
2756 reply => undef,
2757 tooltip => "The contents of a note or book",
2758 },
2759 "c/lookat" => {
2760 id => "infobox",
2761 title => "Look",
2762 reply => undef,
2763 tooltip => "What you saw there",
2764 },
2765 "c/who" => {
2766 id => "infobox",
2767 title => "Players",
2768 reply => undef,
2769 tooltip => "Shows players who are currently online",
2770 },
2771 "c/body" => {
2772 id => "infobox",
2773 title => "Body Parts",
2774 reply => undef,
2775 tooltip => "Shows which body parts you posess and are available",
2776 },
2777 "c/uptime" => {
2778 id => "infobox",
2779 title => "Uptime",
2780 reply => undef,
2781 tooltip => "How long the server has been running since last restart",
2782 },
2783 "c/mapinfo" => {
2784 id => "infobox",
2785 title => "Map Info",
2786 reply => undef,
2787 tooltip => "Information related to the maps",
2788 },
2789);
2790
2430sub cf::client::send_msg { 2791sub cf::client::send_msg {
2431 my ($self, $color, $type, $msg, @extra) = @_; 2792 my ($self, $channel, $msg, $color, @extra) = @_;
2432 2793
2433 $msg = $self->pl->expand_cfpod ($msg); 2794 $msg = $self->pl->expand_cfpod ($msg);
2434 2795
2796 $color &= cf::NDI_CLIENT_MASK; # just in case...
2797
2798 # check predefined channels, for the benefit of C
2799 if ($CHANNEL{$channel}) {
2800 $channel = $CHANNEL{$channel};
2801
2802 $self->ext_msg (channel_info => $channel)
2803 if $self->can_msg;
2804
2805 $channel = $channel->{id};
2806
2807 } elsif (ref $channel) {
2808 # send meta info to client, if not yet sent
2809 unless (exists $self->{channel}{$channel->{id}}) {
2810 $self->{channel}{$channel->{id}} = $channel;
2811 $self->ext_msg (channel_info => $channel)
2812 if $self->can_msg;
2813 }
2814
2815 $channel = $channel->{id};
2816 }
2817
2435 return unless @extra || length $msg; 2818 return unless @extra || length $msg;
2436 2819
2437 if ($self->can_msg) { 2820 if ($self->can_msg) {
2821 # default colour, mask it out
2822 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2823 if $color & cf::NDI_DEF;
2824
2438 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2825 $self->send_packet ("msg " . $self->{json_coder}->encode (
2826 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2439 } else { 2827 } 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) { 2828 if ($color >= 0) {
2829 # replace some tags by gcfclient-compatible ones
2830 for ($msg) {
2831 1 while
2832 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2833 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2834 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2835 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2836 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2837 }
2838
2839 $color &= cf::NDI_COLOR_MASK;
2840
2841 utf8::encode $msg;
2842
2451 if (0 && $msg =~ /\[/) { 2843 if (0 && $msg =~ /\[/) {
2844 # COMMAND/INFO
2452 $self->send_packet ("drawextinfo $color 4 0 $msg") 2845 $self->send_packet ("drawextinfo $color 10 8 $msg")
2453 } else { 2846 } else {
2454 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2847 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2455 $self->send_packet ("drawinfo $color $msg") 2848 $self->send_packet ("drawinfo $color $msg")
2456 } 2849 }
2457 } 2850 }
2458 } 2851 }
2459} 2852}
2460 2853
2461=item $client->ext_event ($type, %msg) 2854=item $client->ext_msg ($type, @msg)
2462 2855
2463Sends an ext event to the client. 2856Sends an ext event to the client.
2464 2857
2465=cut 2858=cut
2466 2859
2467sub cf::client::ext_event($$%) { 2860sub cf::client::ext_msg($$@) {
2468 my ($self, $type, %msg) = @_; 2861 my ($self, $type, @msg) = @_;
2469 2862
2863 if ($self->extcmd == 2) {
2864 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2865 } elsif ($self->extcmd == 1) { # TODO: remove
2470 $msg{msgtype} = "event_$type"; 2866 push @msg, msgtype => "event_$type";
2471 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2867 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2868 }
2869}
2870
2871=item $client->ext_reply ($msgid, @msg)
2872
2873Sends an ext reply to the client.
2874
2875=cut
2876
2877sub cf::client::ext_reply($$@) {
2878 my ($self, $id, @msg) = @_;
2879
2880 if ($self->extcmd == 2) {
2881 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2882 } elsif ($self->extcmd == 1) {
2883 #TODO: version 1, remove
2884 unshift @msg, msgtype => "reply", msgid => $id;
2885 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2886 }
2472} 2887}
2473 2888
2474=item $success = $client->query ($flags, "text", \&cb) 2889=item $success = $client->query ($flags, "text", \&cb)
2475 2890
2476Queues a query to the client, calling the given callback with 2891Queues a query to the client, calling the given callback with
2531 my ($ns, $buf) = @_; 2946 my ($ns, $buf) = @_;
2532 2947
2533 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2948 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2534 2949
2535 if (ref $msg) { 2950 if (ref $msg) {
2951 my ($type, $reply, @payload) =
2952 "ARRAY" eq ref $msg
2953 ? @$msg
2954 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2955
2956 my @reply;
2957
2536 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2958 if (my $cb = $EXTICMD{$type}) {
2537 if (my %reply = $cb->($ns, $msg)) { 2959 @reply = $cb->($ns, @payload);
2538 $reply{msgid} = $msg->{msgid};
2539 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2540 }
2541 } 2960 }
2961
2962 $ns->ext_reply ($reply, @reply)
2963 if $reply;
2964
2542 } else { 2965 } else {
2543 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2966 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2544 } 2967 }
2545 2968
2546 cf::override; 2969 cf::override;
2593our $safe = new Safe "safe"; 3016our $safe = new Safe "safe";
2594our $safe_hole = new Safe::Hole; 3017our $safe_hole = new Safe::Hole;
2595 3018
2596$SIG{FPE} = 'IGNORE'; 3019$SIG{FPE} = 'IGNORE';
2597 3020
2598$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3021$safe->permit_only (Opcode::opset qw(
3022 :base_core :base_mem :base_orig :base_math
3023 grepstart grepwhile mapstart mapwhile
3024 sort time
3025));
2599 3026
2600# here we export the classes and methods available to script code 3027# here we export the classes and methods available to script code
2601 3028
2602=pod 3029=pod
2603 3030
2604The following functions and methods are available within a safe environment: 3031The following functions and methods are available within a safe environment:
2605 3032
2606 cf::object 3033 cf::object
2607 contr pay_amount pay_player map x y force_find force_add 3034 contr pay_amount pay_player map x y force_find force_add destroy
2608 insert remove 3035 insert remove name archname title slaying race decrease_ob_nr
2609 3036
2610 cf::object::player 3037 cf::object::player
2611 player 3038 player
2612 3039
2613 cf::player 3040 cf::player
2618 3045
2619=cut 3046=cut
2620 3047
2621for ( 3048for (
2622 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3049 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3050 insert remove inv name archname title slaying race
2623 insert remove)], 3051 decrease_ob_nr destroy)],
2624 ["cf::object::player" => qw(player)], 3052 ["cf::object::player" => qw(player)],
2625 ["cf::player" => qw(peaceful)], 3053 ["cf::player" => qw(peaceful)],
2626 ["cf::map" => qw(trigger)], 3054 ["cf::map" => qw(trigger)],
2627) { 3055) {
2628 no strict 'refs'; 3056 no strict 'refs';
2704# the server's init and main functions 3132# the server's init and main functions
2705 3133
2706sub load_facedata($) { 3134sub load_facedata($) {
2707 my ($path) = @_; 3135 my ($path) = @_;
2708 3136
3137 # HACK to clear player env face cache, we need some signal framework
3138 # for this (global event?)
3139 %ext::player_env::MUSIC_FACE_CACHE = ();
3140
3141 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3142
2709 warn "loading facedata from $path\n"; 3143 warn "loading facedata from $path\n";
2710 3144
2711 my $facedata; 3145 my $facedata;
2712 0 < aio_load $path, $facedata 3146 0 < aio_load $path, $facedata
2713 or die "$path: $!"; 3147 or die "$path: $!";
2715 $facedata = Coro::Storable::thaw $facedata; 3149 $facedata = Coro::Storable::thaw $facedata;
2716 3150
2717 $facedata->{version} == 2 3151 $facedata->{version} == 2
2718 or cf::cleanup "$path: version mismatch, cannot proceed."; 3152 or cf::cleanup "$path: version mismatch, cannot proceed.";
2719 3153
3154 # patch in the exptable
3155 $facedata->{resource}{"res/exp_table"} = {
3156 type => FT_RSRC,
3157 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3158 };
3159 cf::cede_to_tick;
3160
2720 { 3161 {
2721 my $faces = $facedata->{faceinfo}; 3162 my $faces = $facedata->{faceinfo};
2722 3163
2723 while (my ($face, $info) = each %$faces) { 3164 while (my ($face, $info) = each %$faces) {
2724 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3165 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3166
2725 cf::face::set_visibility $idx, $info->{visibility}; 3167 cf::face::set_visibility $idx, $info->{visibility};
2726 cf::face::set_magicmap $idx, $info->{magicmap}; 3168 cf::face::set_magicmap $idx, $info->{magicmap};
2727 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3169 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2728 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3170 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2729 3171
2730 cf::cede_to_tick; 3172 cf::cede_to_tick;
2731 } 3173 }
2732 3174
2733 while (my ($face, $info) = each %$faces) { 3175 while (my ($face, $info) = each %$faces) {
2734 next unless $info->{smooth}; 3176 next unless $info->{smooth};
3177
2735 my $idx = cf::face::find $face 3178 my $idx = cf::face::find $face
2736 or next; 3179 or next;
3180
2737 if (my $smooth = cf::face::find $info->{smooth}) { 3181 if (my $smooth = cf::face::find $info->{smooth}) {
2738 cf::face::set_smooth $idx, $smooth; 3182 cf::face::set_smooth $idx, $smooth;
2739 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3183 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2740 } else { 3184 } else {
2741 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3185 warn "smooth face '$info->{smooth}' not found for face '$face'";
2758 3202
2759 { 3203 {
2760 # TODO: for gcfclient pleasure, we should give resources 3204 # TODO: for gcfclient pleasure, we should give resources
2761 # that gcfclient doesn't grok a >10000 face index. 3205 # that gcfclient doesn't grok a >10000 face index.
2762 my $res = $facedata->{resource}; 3206 my $res = $facedata->{resource};
2763 my $enc = JSON::XS->new->utf8->canonical;
2764 3207
2765 while (my ($name, $info) = each %$res) { 3208 while (my ($name, $info) = each %$res) {
2766 my $meta = $enc->encode ({ 3209 if (defined $info->{type}) {
2767 name => $name,
2768 type => $info->{type},
2769 copyright => $info->{copyright},
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 use Data::Dumper; warn Dumper substr $data, 0, 100;#d#
2775
2776 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3210 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3211 my $data;
3212
3213 if ($info->{type} & 1) {
3214 # prepend meta info
3215
3216 my $meta = $enc->encode ({
3217 name => $name,
3218 %{ $info->{meta} || {} },
3219 });
3220
3221 $data = pack "(w/a*)*", $meta, $info->{data};
3222 } else {
3223 $data = $info->{data};
3224 }
3225
3226 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2777 cf::face::set_type $idx, 1; 3227 cf::face::set_type $idx, $info->{type};
2778 cf::face::set_data $idx, 0, $data, $chk; 3228 } else {
3229 $RESOURCE{$name} = $info;
3230 }
2779 3231
2780 # TODO
2781 cf::cede_to_tick; 3232 cf::cede_to_tick;
2782 } 3233 }
2783 } 3234 }
2784 3235
3236 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3237
2785 1 3238 1
2786} 3239}
2787 3240
3241cf::global->attach (on_resource_update => sub {
3242 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3243 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3244
3245 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3246 my $sound = $soundconf->{compat}[$_]
3247 or next;
3248
3249 my $face = cf::face::find "sound/$sound->[1]";
3250 cf::sound::set $sound->[0] => $face;
3251 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3252 }
3253
3254 while (my ($k, $v) = each %{$soundconf->{event}}) {
3255 my $face = cf::face::find "sound/$v";
3256 cf::sound::set $k => $face;
3257 }
3258 }
3259});
3260
3261register_exticmd fx_want => sub {
3262 my ($ns, $want) = @_;
3263
3264 while (my ($k, $v) = each %$want) {
3265 $ns->fx_want ($k, $v);
3266 }
3267};
3268
2788sub reload_regions { 3269sub reload_regions {
3270 # HACK to clear player env face cache, we need some signal framework
3271 # for this (global event?)
3272 %ext::player_env::MUSIC_FACE_CACHE = ();
3273
2789 load_resource_file "$MAPDIR/regions" 3274 load_resource_file "$MAPDIR/regions"
2790 or die "unable to load regions file\n"; 3275 or die "unable to load regions file\n";
3276
3277 for (cf::region::list) {
3278 $_->{match} = qr/$_->{match}/
3279 if exists $_->{match};
3280 }
2791} 3281}
2792 3282
2793sub reload_facedata { 3283sub reload_facedata {
2794 load_facedata "$DATADIR/facedata" 3284 load_facedata "$DATADIR/facedata"
2795 or die "unable to load facedata\n"; 3285 or die "unable to load facedata\n";
2824 3314
2825sub init { 3315sub init {
2826 reload_resources; 3316 reload_resources;
2827} 3317}
2828 3318
2829sub cfg_load { 3319sub reload_config {
2830 open my $fh, "<:utf8", "$CONFDIR/config" 3320 open my $fh, "<:utf8", "$CONFDIR/config"
2831 or return; 3321 or return;
2832 3322
2833 local $/; 3323 local $/;
2834 *CFG = YAML::Syck::Load <$fh>; 3324 *CFG = YAML::Load <$fh>;
2835 3325
2836 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3326 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2837 3327
2838 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3328 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2839 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3329 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2850sub main { 3340sub main {
2851 # we must not ever block the main coroutine 3341 # we must not ever block the main coroutine
2852 local $Coro::idle = sub { 3342 local $Coro::idle = sub {
2853 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3343 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2854 (async { 3344 (async {
2855 Event::one_event; 3345 $Coro::current->{desc} = "IDLE BUG HANDLER";
3346 EV::loop EV::LOOP_ONESHOT;
2856 })->prio (Coro::PRIO_MAX); 3347 })->prio (Coro::PRIO_MAX);
2857 }; 3348 };
2858 3349
2859 cfg_load; 3350 reload_config;
2860 db_init; 3351 db_init;
2861 load_extensions; 3352 load_extensions;
2862 3353
2863 $TICK_WATCHER->start; 3354 $TICK_WATCHER->start;
3355 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
2864 Event::loop; 3356 EV::loop;
2865} 3357}
2866 3358
2867############################################################################# 3359#############################################################################
2868# initialisation and cleanup 3360# initialisation and cleanup
2869 3361
2870# install some emergency cleanup handlers 3362# install some emergency cleanup handlers
2871BEGIN { 3363BEGIN {
3364 our %SIGWATCHER = ();
2872 for my $signal (qw(INT HUP TERM)) { 3365 for my $signal (qw(INT HUP TERM)) {
2873 Event->signal ( 3366 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2874 reentrant => 0,
2875 data => WF_AUTOCANCEL,
2876 signal => $signal,
2877 prio => 0,
2878 cb => sub {
2879 cf::cleanup "SIG$signal"; 3367 cf::cleanup "SIG$signal";
2880 },
2881 ); 3368 };
2882 } 3369 }
2883} 3370}
2884 3371
2885sub write_runtime { 3372sub write_runtime {
2886 my $runtime = "$LOCALDIR/runtime"; 3373 my $runtime = "$LOCALDIR/runtime";
2931 # and maps saved/destroyed asynchronously. 3418 # and maps saved/destroyed asynchronously.
2932 warn "begin emergency player save\n"; 3419 warn "begin emergency player save\n";
2933 for my $login (keys %cf::PLAYER) { 3420 for my $login (keys %cf::PLAYER) {
2934 my $pl = $cf::PLAYER{$login} or next; 3421 my $pl = $cf::PLAYER{$login} or next;
2935 $pl->valid or next; 3422 $pl->valid or next;
3423 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2936 $pl->save; 3424 $pl->save;
2937 } 3425 }
2938 warn "end emergency player save\n"; 3426 warn "end emergency player save\n";
2939 3427
2940 warn "begin emergency map save\n"; 3428 warn "begin emergency map save\n";
2979 warn "syncing database to disk"; 3467 warn "syncing database to disk";
2980 BDB::db_env_txn_checkpoint $DB_ENV; 3468 BDB::db_env_txn_checkpoint $DB_ENV;
2981 3469
2982 # if anything goes wrong in here, we should simply crash as we already saved 3470 # if anything goes wrong in here, we should simply crash as we already saved
2983 3471
2984 warn "cancelling all WF_AUTOCANCEL watchers";
2985 for (Event::all_watchers) {
2986 $_->cancel if $_->data & WF_AUTOCANCEL;
2987 }
2988
2989 warn "flushing outstanding aio requests"; 3472 warn "flushing outstanding aio requests";
2990 for (;;) { 3473 for (;;) {
2991 BDB::flush; 3474 BDB::flush;
2992 IO::AIO::flush; 3475 IO::AIO::flush;
2993 Coro::cede; 3476 Coro::cede_notself;
2994 last unless IO::AIO::nreqs || BDB::nreqs; 3477 last unless IO::AIO::nreqs || BDB::nreqs;
2995 warn "iterate..."; 3478 warn "iterate...";
2996 } 3479 }
2997 3480
2998 ++$RELOAD; 3481 ++$RELOAD;
3057 warn "reloading cf.pm"; 3540 warn "reloading cf.pm";
3058 require cf; 3541 require cf;
3059 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3542 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3060 3543
3061 warn "loading config and database again"; 3544 warn "loading config and database again";
3062 cf::cfg_load; 3545 cf::reload_config;
3063 3546
3064 warn "loading extensions"; 3547 warn "loading extensions";
3065 cf::load_extensions; 3548 cf::load_extensions;
3066 3549
3067 warn "reattaching attachments to objects/players"; 3550 warn "reattaching attachments to objects/players";
3074 warn "leaving sync_job"; 3557 warn "leaving sync_job";
3075 3558
3076 1 3559 1
3077 } or do { 3560 } or do {
3078 warn $@; 3561 warn $@;
3079 warn "error while reloading, exiting."; 3562 cf::cleanup "error while reloading, exiting.";
3080 exit 1;
3081 }; 3563 };
3082 3564
3083 warn "reloaded"; 3565 warn "reloaded";
3084}; 3566};
3085 3567
3087 3569
3088sub reload_perl() { 3570sub reload_perl() {
3089 # doing reload synchronously and two reloads happen back-to-back, 3571 # doing reload synchronously and two reloads happen back-to-back,
3090 # coro crashes during coro_state_free->destroy here. 3572 # coro crashes during coro_state_free->destroy here.
3091 3573
3092 $RELOAD_WATCHER ||= Event->timer ( 3574 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3093 reentrant => 0,
3094 after => 0,
3095 data => WF_AUTOCANCEL,
3096 cb => sub {
3097 do_reload_perl; 3575 do_reload_perl;
3098 undef $RELOAD_WATCHER; 3576 undef $RELOAD_WATCHER;
3099 },
3100 ); 3577 };
3101} 3578}
3102 3579
3103register_command "reload" => sub { 3580register_command "reload" => sub {
3104 my ($who, $arg) = @_; 3581 my ($who, $arg) = @_;
3105 3582
3106 if ($who->flag (FLAG_WIZ)) { 3583 if ($who->flag (FLAG_WIZ)) {
3107 $who->message ("reloading server."); 3584 $who->message ("reloading server.");
3585 async {
3586 $Coro::current->{desc} = "perl_reload";
3108 async { reload_perl }; 3587 reload_perl;
3588 };
3109 } 3589 }
3110}; 3590};
3111 3591
3112unshift @INC, $LIBDIR; 3592unshift @INC, $LIBDIR;
3113 3593
3132 my $signal = new Coro::Signal; 3612 my $signal = new Coro::Signal;
3133 push @WAIT_FOR_TICK_BEGIN, $signal; 3613 push @WAIT_FOR_TICK_BEGIN, $signal;
3134 $signal->wait; 3614 $signal->wait;
3135} 3615}
3136 3616
3137 my $min = 1e6;#d# 3617$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3138 my $avg = 10;
3139$TICK_WATCHER = Event->timer (
3140 reentrant => 0,
3141 parked => 1,
3142 prio => 0,
3143 at => $NEXT_TICK || $TICK,
3144 data => WF_AUTOCANCEL,
3145 cb => sub {
3146 if ($Coro::current != $Coro::main) { 3618 if ($Coro::current != $Coro::main) {
3147 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3619 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3148 unless ++$bug_warning > 10; 3620 unless ++$bug_warning > 10;
3149 return; 3621 return;
3150 } 3622 }
3151 3623
3152 $NOW = $tick_start = Event::time; 3624 $NOW = $tick_start = EV::now;
3153 3625
3154 cf::server_tick; # one server iteration 3626 cf::server_tick; # one server iteration
3155 3627
3156 0 && sync_job {#d# 3628 $RUNTIME += $TICK;
3157 for(1..10) { 3629 $NEXT_TICK = $_[0]->at;
3158 my $t = Event::time;
3159 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3160 or die;
3161 3630
3162 $map->width (50); 3631 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3163 $map->height (50); 3632 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3164 $map->alloc; 3633 Coro::async_pool {
3165 $map->_load_objects ("/tmp/x.map", 1); 3634 $Coro::current->{desc} = "runtime saver";
3166 my $t = Event::time - $t; 3635 write_runtime
3167 3636 or warn "ERROR: unable to write runtime file: $!";
3168 #next unless $t < 0.0013;#d#
3169 if ($t < $min) {
3170 $min = $t;
3171 }
3172 $avg = $avg * 0.99 + $t * 0.01;
3173 }
3174 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3175 exit 0;
3176 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3177 }; 3637 };
3638 }
3178 3639
3179 $RUNTIME += $TICK;
3180 $NEXT_TICK += $TICK;
3181
3182 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3183 $NEXT_RUNTIME_WRITE = $NOW + 10;
3184 Coro::async_pool {
3185 write_runtime
3186 or warn "ERROR: unable to write runtime file: $!";
3187 };
3188 }
3189
3190# my $AFTER = Event::time;
3191# warn $AFTER - $NOW;#d#
3192
3193 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3640 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3194 $sig->send; 3641 $sig->send;
3195 } 3642 }
3196 while (my $sig = shift @WAIT_FOR_TICK) { 3643 while (my $sig = shift @WAIT_FOR_TICK) {
3197 $sig->send; 3644 $sig->send;
3198 } 3645 }
3199 3646
3200 $NOW = Event::time;
3201
3202 # if we are delayed by four ticks or more, skip them all
3203 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3204
3205 $TICK_WATCHER->at ($NEXT_TICK);
3206 $TICK_WATCHER->start;
3207
3208 $LOAD = ($NOW - $tick_start) / $TICK; 3647 $LOAD = ($NOW - $tick_start) / $TICK;
3209 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3648 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3210 3649
3211 _post_tick; 3650 _post_tick;
3212 3651};
3213 3652$TICK_WATCHER->priority (EV::MAXPRI);
3214 },
3215);
3216 3653
3217{ 3654{
3218 BDB::max_poll_time $TICK * 0.1; 3655 # configure BDB
3219 $BDB_POLL_WATCHER = Event->io ( 3656
3220 reentrant => 0,
3221 fd => BDB::poll_fileno,
3222 poll => 'r',
3223 prio => 0,
3224 data => WF_AUTOCANCEL,
3225 cb => \&BDB::poll_cb,
3226 );
3227 BDB::min_parallel 8; 3657 BDB::min_parallel 8;
3228 3658 BDB::max_poll_reqs $TICK * 0.1;
3229 BDB::set_sync_prepare { 3659 $Coro::BDB::WATCHER->priority (1);
3230 my $status;
3231 my $current = $Coro::current;
3232 (
3233 sub {
3234 $status = $!;
3235 $current->ready; undef $current;
3236 },
3237 sub {
3238 Coro::schedule while defined $current;
3239 $! = $status;
3240 },
3241 )
3242 };
3243 3660
3244 unless ($DB_ENV) { 3661 unless ($DB_ENV) {
3245 $DB_ENV = BDB::db_env_create; 3662 $DB_ENV = BDB::db_env_create;
3663 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3664 | BDB::LOG_AUTOREMOVE, 1);
3665 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3666 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3246 3667
3247 cf::sync_job { 3668 cf::sync_job {
3248 eval { 3669 eval {
3249 BDB::db_env_open 3670 BDB::db_env_open
3250 $DB_ENV, 3671 $DB_ENV,
3252 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3673 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3253 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3674 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3254 0666; 3675 0666;
3255 3676
3256 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3677 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3257
3258 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3259 $DB_ENV->set_lk_detect;
3260 }; 3678 };
3261 3679
3262 cf::cleanup "db_env_open(db): $@" if $@; 3680 cf::cleanup "db_env_open(db): $@" if $@;
3263 }; 3681 };
3264 } 3682 }
3683
3684 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3685 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3686 };
3687 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3688 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3689 };
3690 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3691 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3692 };
3265} 3693}
3266 3694
3267{ 3695{
3696 # configure IO::AIO
3697
3268 IO::AIO::min_parallel 8; 3698 IO::AIO::min_parallel 8;
3269
3270 undef $Coro::AIO::WATCHER;
3271 IO::AIO::max_poll_time $TICK * 0.1; 3699 IO::AIO::max_poll_time $TICK * 0.1;
3272 $AIO_POLL_WATCHER = Event->io ( 3700 $Coro::AIO::WATCHER->priority (1);
3273 reentrant => 0,
3274 data => WF_AUTOCANCEL,
3275 fd => IO::AIO::poll_fileno,
3276 poll => 'r',
3277 prio => 6,
3278 cb => \&IO::AIO::poll_cb,
3279 );
3280} 3701}
3281 3702
3282my $_log_backtrace; 3703my $_log_backtrace;
3283 3704
3284sub _log_backtrace { 3705sub _log_backtrace {
3288 3709
3289 # limit the # of concurrent backtraces 3710 # limit the # of concurrent backtraces
3290 if ($_log_backtrace < 2) { 3711 if ($_log_backtrace < 2) {
3291 ++$_log_backtrace; 3712 ++$_log_backtrace;
3292 async { 3713 async {
3714 $Coro::current->{desc} = "abt $msg";
3715
3293 my @bt = fork_call { 3716 my @bt = fork_call {
3294 @addr = map { sprintf "%x", $_ } @addr; 3717 @addr = map { sprintf "%x", $_ } @addr;
3295 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3718 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3296 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3719 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3297 or die "addr2line: $!"; 3720 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines