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.301 by root, Tue Jul 10 07:01:51 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;
36use Digest::MD5 ();
34 37
35# configure various modules to our taste 38# configure various modules to our taste
36# 39#
37$Storable::canonical = 1; # reduce rsync transfers 40$Storable::canonical = 1; # reduce rsync transfers
38Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
39Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
40
41$Event::Eval = 1; # no idea why this is required, but it is
42
43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
44$YAML::Syck::ImplicitUnicode = 1;
45 43
46$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
47 45
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 46sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
49 47
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 66our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 68our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 69our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db"; 70our $BDBDIR = "$LOCALDIR/db";
71our %RESOURCE;
73 72
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75our $TICK_WATCHER; 74our $TICK_WATCHER;
76our $AIO_POLL_WATCHER; 75our $AIO_POLL_WATCHER;
77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 77our $NEXT_TICK;
79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 78our $USE_FSYNC = 1; # use fsync to write maps - default off
81 79
82our $BDB_POLL_WATCHER; 80our $BDB_POLL_WATCHER;
81our $BDB_DEADLOCK_WATCHER;
82our $BDB_CHECKPOINT_WATCHER;
83our $BDB_TRICKLE_WATCHER;
83our $DB_ENV; 84our $DB_ENV;
84 85
85our %CFG; 86our %CFG;
86 87
87our $UPTIME; $UPTIME ||= time; 88our $UPTIME; $UPTIME ||= time;
88our $RUNTIME; 89our $RUNTIME;
90our $NOW;
89 91
90our %PLAYER; # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
91our %MAP; # all maps 93our (%MAP, %MAP_LOADING ); # all maps
92our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
93 95
94# 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 ∕
95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96 98
157 159
158The raw value load value from the last tick. 160The raw value load value from the last tick.
159 161
160=item %cf::CFG 162=item %cf::CFG
161 163
162Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/deliantra-server/config>, or
163from wherever your confdir points to. 165from wherever your confdir points to.
164 166
165=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
166 168
167These 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
168returns 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
169per 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.
170 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
171=back 179=back
172 180
173=cut 181=cut
174 182
175BEGIN { 183BEGIN {
179 $msg .= "\n" 187 $msg .= "\n"
180 unless $msg =~ /\n$/; 188 unless $msg =~ /\n$/;
181 189
182 $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;
183 191
184 utf8::encode $msg;
185 LOG llevError, $msg; 192 LOG llevError, $msg;
186 }; 193 };
187} 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#?
188 210
189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 211@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
190@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 212@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
191@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 213@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
192@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 214@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
205)) { 227)) {
206 no strict 'refs'; 228 no strict 'refs';
207 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 229 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
208} 230}
209 231
210$Event::DIED = sub { 232$EV::DIED = sub {
211 warn "error in event callback: @_"; 233 warn "error in event callback: @_";
212}; 234};
213 235
214############################################################################# 236#############################################################################
215 237
238 $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;
239 $d 261 $d
240 } || "[unable to dump $_[0]: '$@']"; 262 } || "[unable to dump $_[0]: '$@']";
241} 263}
242 264
243=item $ref = cf::from_json $json 265=item $ref = cf::decode_json $json
244 266
245Converts a JSON string into the corresponding perl data structure. 267Converts a JSON string into the corresponding perl data structure.
246 268
247=item $json = cf::to_json $ref 269=item $json = cf::encode_json $ref
248 270
249Converts a perl data structure into its JSON representation. 271Converts a perl data structure into its JSON representation.
250 272
251=cut 273=cut
252 274
253our $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
254 276
255sub to_json ($) { $json_coder->encode ($_[0]) } 277sub encode_json($) { $json_coder->encode ($_[0]) }
256sub from_json ($) { $json_coder->decode ($_[0]) } 278sub decode_json($) { $json_coder->decode ($_[0]) }
257 279
258=item cf::lock_wait $string 280=item cf::lock_wait $string
259 281
260Wait until the given lock is available. See cf::lock_acquire. 282Wait until the given lock is available. See cf::lock_acquire.
261 283
264Wait 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
265a 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,
266for example when the coroutine gets canceled), the lock is automatically 288for example when the coroutine gets canceled), the lock is automatically
267returned. 289returned.
268 290
291Locks are *not* recursive, locking from the same coro twice results in a
292deadlocked coro.
293
269Lock 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
270uses map_find and cf::map::load uses map_load). 295uses map_find and cf::map::load uses map_load).
271 296
272=item $locked = cf::lock_active $string 297=item $locked = cf::lock_active $string
273 298
274Return 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.
275 300
276=cut 301=cut
277 302
278our %LOCK; 303our %LOCK;
304our %LOCKER;#d#
279 305
280sub lock_wait($) { 306sub lock_wait($) {
281 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#
282 313
283 # wait for lock, if any 314 # wait for lock, if any
284 while ($LOCK{$key}) { 315 while ($LOCK{$key}) {
285 push @{ $LOCK{$key} }, $Coro::current; 316 push @{ $LOCK{$key} }, $Coro::current;
286 Coro::schedule; 317 Coro::schedule;
292 323
293 # wait, to be sure we are not locked 324 # wait, to be sure we are not locked
294 lock_wait $key; 325 lock_wait $key;
295 326
296 $LOCK{$key} = []; 327 $LOCK{$key} = [];
328 $LOCKER{$key} = $Coro::current;#d#
297 329
298 Coro::guard { 330 Coro::guard {
331 delete $LOCKER{$key};#d#
299 # wake up all waiters, to be on the safe side 332 # wake up all waiters, to be on the safe side
300 $_->ready for @{ delete $LOCK{$key} }; 333 $_->ready for @{ delete $LOCK{$key} };
301 } 334 }
302} 335}
303 336
315 }; 348 };
316 $TICK_WATCHER->stop; 349 $TICK_WATCHER->stop;
317 $guard 350 $guard
318} 351}
319 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
320=item cf::async { BLOCK } 426=item cf::async { BLOCK }
321 427
322Currently the same as Coro::async_pool, meaning you cannot use 428Currently the same as Coro::async_pool, meaning you cannot use
323C<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
324thing you are allowed to do is call C<prio> on it. 430thing you are allowed to do is call C<prio> on it.
327 433
328BEGIN { *async = \&Coro::async_pool } 434BEGIN { *async = \&Coro::async_pool }
329 435
330=item cf::sync_job { BLOCK } 436=item cf::sync_job { BLOCK }
331 437
332The design of Crossfire TRT requires that the main coroutine ($Coro::main) 438The design of Deliantra requires that the main coroutine ($Coro::main)
333is always able to handle events or runnable, as Crossfire TRT is only 439is always able to handle events or runnable, as Deliantra is only
334partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 440partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
335acceptable. 441acceptable.
336 442
337If 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
338the given BLOCK in another coroutine while waiting for the result. The 444the given BLOCK in another coroutine while waiting for the result. The
343 449
344sub sync_job(&) { 450sub sync_job(&) {
345 my ($job) = @_; 451 my ($job) = @_;
346 452
347 if ($Coro::current == $Coro::main) { 453 if ($Coro::current == $Coro::main) {
348 my $time = Event::time; 454 my $time = EV::time;
349 455
350 # this is the main coro, too bad, we have to block 456 # this is the main coro, too bad, we have to block
351 # till the operation succeeds, freezing the server :/ 457 # till the operation succeeds, freezing the server :/
352 458
459 LOG llevError, Carp::longmess "sync job";#d#
460
353 # TODO: use suspend/resume instead 461 # TODO: use suspend/resume instead
354 # (but this is cancel-safe) 462 # (but this is cancel-safe)
355 my $freeze_guard = freeze_mainloop; 463 my $freeze_guard = freeze_mainloop;
356 464
357 my $busy = 1; 465 my $busy = 1;
358 my @res; 466 my @res;
359 467
360 (async { 468 (async {
469 $Coro::current->desc ("sync job coro");
361 @res = eval { $job->() }; 470 @res = eval { $job->() };
362 warn $@ if $@; 471 warn $@ if $@;
363 undef $busy; 472 undef $busy;
364 })->prio (Coro::PRIO_MAX); 473 })->prio (Coro::PRIO_MAX);
365 474
366 while ($busy) { 475 while ($busy) {
367 Coro::cede or Event::one_event; 476 if (Coro::nready) {
477 Coro::cede_notself;
478 } else {
479 EV::loop EV::LOOP_ONESHOT;
368 } 480 }
481 }
369 482
370 $time = Event::time - $time; 483 $time = EV::time - $time;
371 484
372 LOG llevError | logBacktrace, Carp::longmess "long sync job" 485 LOG llevError | logBacktrace, Carp::longmess "long sync job"
373 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 486 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
374 487
375 $tick_start += $time; # do not account sync jobs to server load 488 $tick_start += $time; # do not account sync jobs to server load
405=item fork_call { }, $args 518=item fork_call { }, $args
406 519
407Executes the given code block with the given arguments in a seperate 520Executes the given code block with the given arguments in a seperate
408process, returning the results. Everything must be serialisable with 521process, returning the results. Everything must be serialisable with
409Coro::Storable. May, of course, block. Note that the executed sub may 522Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 523never block itself or use any form of event handling.
411 524
412=cut 525=cut
413
414sub _store_scalar {
415 open my $fh, ">", \my $buf
416 or die "fork_call: cannot open fh-to-buf in child : $!";
417 Storable::store_fd $_[0], $fh;
418 close $fh;
419
420 $buf
421}
422 526
423sub fork_call(&@) { 527sub fork_call(&@) {
424 my ($cb, @args) = @_; 528 my ($cb, @args) = @_;
425 529
426# 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,
427# or die "socketpair: $!"; 531 # otherwise perl prematurely frees the stuff :/
428 pipe my $fh1, my $fh2 532 # TODO: investigate and fix (likely this will be rather laborious)
429 or die "pipe: $!";
430 533
431 if (my $pid = fork) { 534 my @res = Coro::Util::fork_eval {
432 close $fh2;
433
434 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
435 warn "pst<$res>" unless $res =~ /^pst/;
436 $res = Coro::Storable::thaw $res;
437
438 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
439
440 Carp::confess $$res unless "ARRAY" eq ref $res;
441
442 return wantarray ? @$res : $res->[-1];
443 } else {
444 reset_signals; 535 reset_signals;
445 local $SIG{__WARN__}; 536 &$cb
446 local $SIG{__DIE__}; 537 }, @args;
447 # just in case, this hack effectively disables event
448 # in the child. cleaner and slower would be canceling all watchers,
449 # but this works for the time being.
450 local $Coro::idle;
451 $Coro::current->prio (Coro::PRIO_MAX);
452 538
453 eval { 539 wantarray ? @res : $res[-1]
454 close $fh1;
455
456 my @res = eval { $cb->(@args) };
457
458 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
459 close $fh2;
460 };
461
462 warn $@ if $@;
463 _exit 0;
464 }
465} 540}
466 541
467=item $value = cf::db_get $family => $key 542=item $value = cf::db_get $family => $key
468 543
469Returns a single value from the environment database. 544Returns a single value from the environment database.
471=item cf::db_put $family => $key => $value 546=item cf::db_put $family => $key => $value
472 547
473Stores 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
474data 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).
475 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
476=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}
477 574
478our $DB; 575our $DB;
479 576
480sub db_init { 577sub db_init {
481 unless ($DB) {
482 $DB = BDB::db_create $DB_ENV;
483
484 cf::sync_job { 578 cf::sync_job {
485 eval { 579 $DB ||= db_table "db";
486 $DB->set_flags (BDB::CHKSUM);
487
488 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
489 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
490 cf::cleanup "db_open(db): $!" if $!;
491 };
492 cf::cleanup "db_open(db): $@" if $@;
493 };
494 } 580 };
495} 581}
496 582
497sub db_get($$) { 583sub db_get($$) {
498 my $key = "$_[0]/$_[1]"; 584 my $key = "$_[0]/$_[1]";
499 585
549 if (1) { 635 if (1) {
550 $md5 = 636 $md5 =
551 join "\x00", 637 join "\x00",
552 $processversion, 638 $processversion,
553 map { 639 map {
554 Coro::cede; 640 cf::cede_to_tick;
555 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 641 ($src->[$_], Digest::MD5::md5_hex $data[$_])
556 } 0.. $#$src; 642 } 0.. $#$src;
557 643
558 644
559 my $dbmd5 = db_get cache => "$id/md5"; 645 my $dbmd5 = db_get cache => "$id/md5";
603attach callbacks/event handlers (a collection of which is called an "attachment") 689attach callbacks/event handlers (a collection of which is called an "attachment")
604to it. All such attachable objects support the following methods. 690to it. All such attachable objects support the following methods.
605 691
606In 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>
607C<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
608Crossfire TRT). 694Deliantra).
609 695
610=over 4 696=over 4
611 697
612=item $attachable->attach ($attachment, key => $value...) 698=item $attachable->attach ($attachment, key => $value...)
613 699
865 "; 951 ";
866 die if $@; 952 die if $@;
867} 953}
868 954
869our $override; 955our $override;
870our @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?
871 957
872sub override { 958sub override {
873 $override = 1; 959 $override = 1;
874 @invoke_results = (); 960 @INVOKE_RESULTS = (@_);
875} 961}
876 962
877sub do_invoke { 963sub do_invoke {
878 my $event = shift; 964 my $event = shift;
879 my $callbacks = shift; 965 my $callbacks = shift;
880 966
881 @invoke_results = (); 967 @INVOKE_RESULTS = ();
882 968
883 local $override; 969 local $override;
884 970
885 for (@$callbacks) { 971 for (@$callbacks) {
886 eval { &{$_->[1]} }; 972 eval { &{$_->[1]} };
895 } 981 }
896 982
897 0 983 0
898} 984}
899 985
900=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 986=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
901 987
902=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 988=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
903 989
904Generate an object-specific event with the given arguments. 990Generate an object-specific event with the given arguments.
905 991
906This 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
907removed 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
908results (if you must, access C<@cf::invoke_results> directly). 994results (if you must, access C<@cf::INVOKE_RESULTS> directly).
909 995
910=back 996=back
911 997
912=cut 998=cut
913 999
914############################################################################# 1000#############################################################################
915# 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}
916 1044
917sub reattach { 1045sub reattach {
918 # basically do the same as instantiate, without calling instantiate 1046 # basically do the same as instantiate, without calling instantiate
919 my ($obj) = @_; 1047 my ($obj) = @_;
920 1048
941cf::attachable->attach ( 1069cf::attachable->attach (
942 prio => -1000000, 1070 prio => -1000000,
943 on_instantiate => sub { 1071 on_instantiate => sub {
944 my ($obj, $data) = @_; 1072 my ($obj, $data) = @_;
945 1073
946 $data = from_json $data; 1074 $data = decode_json $data;
947 1075
948 for (@$data) { 1076 for (@$data) {
949 my ($name, $args) = @$_; 1077 my ($name, $args) = @$_;
950 1078
951 $obj->attach ($name, %{$args || {} }); 1079 $obj->attach ($name, %{$args || {} });
967sub object_freezer_save { 1095sub object_freezer_save {
968 my ($filename, $rdata, $objs) = @_; 1096 my ($filename, $rdata, $objs) = @_;
969 1097
970 sync_job { 1098 sync_job {
971 if (length $$rdata) { 1099 if (length $$rdata) {
1100 utf8::decode (my $decname = $filename);
972 warn sprintf "saving %s (%d,%d)\n", 1101 warn sprintf "saving %s (%d,%d)\n",
973 $filename, length $$rdata, scalar @$objs; 1102 $decname, length $$rdata, scalar @$objs;
974 1103
975 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1104 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
976 chmod SAVE_MODE, $fh; 1105 chmod SAVE_MODE, $fh;
977 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1106 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
978 aio_fsync $fh if $cf::USE_FSYNC; 1107 aio_fsync $fh if $cf::USE_FSYNC;
979 close $fh; 1108 close $fh;
980 1109
981 if (@$objs) { 1110 if (@$objs) {
982 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) {
983 chmod SAVE_MODE, $fh; 1112 chmod SAVE_MODE, $fh;
984 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1113 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
985 aio_write $fh, 0, (length $data), $data, 0; 1114 aio_write $fh, 0, (length $data), $data, 0;
986 aio_fsync $fh if $cf::USE_FSYNC; 1115 aio_fsync $fh if $cf::USE_FSYNC;
987 close $fh; 1116 close $fh;
988 aio_rename "$filename.pst~", "$filename.pst"; 1117 aio_rename "$filename.pst~", "$filename.pst";
989 } 1118 }
997 } 1126 }
998 } else { 1127 } else {
999 aio_unlink $filename; 1128 aio_unlink $filename;
1000 aio_unlink "$filename.pst"; 1129 aio_unlink "$filename.pst";
1001 } 1130 }
1002 } 1131 };
1003} 1132}
1004 1133
1005sub object_freezer_as_string { 1134sub object_freezer_as_string {
1006 my ($rdata, $objs) = @_; 1135 my ($rdata, $objs) = @_;
1007 1136
1019 or return; 1148 or return;
1020 1149
1021 unless (aio_stat "$filename.pst") { 1150 unless (aio_stat "$filename.pst") {
1022 (aio_load "$filename.pst", $av) >= 0 1151 (aio_load "$filename.pst", $av) >= 0
1023 or return; 1152 or return;
1153
1024 $av = eval { (Storable::thaw $av)->{objs} }; 1154 my $st = eval { Coro::Storable::thaw $av };
1155 $av = $st->{objs};
1025 } 1156 }
1026 1157
1158 utf8::decode (my $decname = $filename);
1027 warn sprintf "loading %s (%d)\n", 1159 warn sprintf "loading %s (%d,%d)\n",
1028 $filename, length $data, scalar @{$av || []}; 1160 $decname, length $data, scalar @{$av || []};
1161
1029 return ($data, $av); 1162 ($data, $av)
1030} 1163}
1031 1164
1032=head2 COMMAND CALLBACKS 1165=head2 COMMAND CALLBACKS
1033 1166
1034=over 4 1167=over 4
1107 my ($pl, $buf) = @_; 1240 my ($pl, $buf) = @_;
1108 1241
1109 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1242 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1110 1243
1111 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
1112 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1252 if (my $cb = $EXTCMD{$type}) {
1113 if (my %reply = $cb->($pl, $msg)) { 1253 @reply = $cb->($pl, @payload);
1114 $pl->ext_reply ($msg->{msgid}, %reply);
1115 }
1116 } 1254 }
1255
1256 $pl->ext_reply ($reply, @reply)
1257 if $reply;
1258
1117 } else { 1259 } else {
1118 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1260 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1119 } 1261 }
1120 1262
1121 cf::override; 1263 cf::override;
1211 1353
1212=head3 cf::player 1354=head3 cf::player
1213 1355
1214=over 4 1356=over 4
1215 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
1216=item cf::player::find $login 1372=item cf::player::find $login
1217 1373
1218Returns the given player object, loading it if necessary (might block). 1374Returns the given player object, loading it if necessary (might block).
1219 1375
1220=cut 1376=cut
1255 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1411 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1256 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1412 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1257 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1413 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1258 aio_unlink +(playerdir $login) . "/$login.pl"; 1414 aio_unlink +(playerdir $login) . "/$login.pl";
1259 1415
1260 my $pl = load_pl path $login 1416 my $f = new_from_file cf::object::thawer path $login
1261 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;
1262 $cf::PLAYER{$login} = $pl 1423 $cf::PLAYER{$login} = $pl
1263 } 1424 }
1264 } 1425 }
1265} 1426}
1266 1427
1276 1437
1277 aio_mkdir playerdir $pl, 0770; 1438 aio_mkdir playerdir $pl, 0770;
1278 $pl->{last_save} = $cf::RUNTIME; 1439 $pl->{last_save} = $cf::RUNTIME;
1279 1440
1280 $pl->save_pl ($path); 1441 $pl->save_pl ($path);
1281 Coro::cede; 1442 cf::cede_to_tick;
1282} 1443}
1283 1444
1284sub new($) { 1445sub new($) {
1285 my ($login) = @_; 1446 my ($login) = @_;
1286 1447
1290 $self->{deny_save} = 1; 1451 $self->{deny_save} = 1;
1291 1452
1292 $cf::PLAYER{$login} = $self; 1453 $cf::PLAYER{$login} = $self;
1293 1454
1294 $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 (@_);
1295} 1466}
1296 1467
1297=item $pl->quit_character 1468=item $pl->quit_character
1298 1469
1299Nukes the player without looking back. If logged in, the connection will 1470Nukes the player without looking back. If logged in, the connection will
1354 or return []; 1525 or return [];
1355 1526
1356 my @logins; 1527 my @logins;
1357 1528
1358 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") {
1359 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1534 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1360 aio_read $fh, 0, 512, my $buf, 0 or next; 1535 aio_read $fh, 0, 512, my $buf, 0 or next;
1361 $buf !~ /^password -------------$/m or next; # official not-valid tag 1536 $buf !~ /^password -------------$/m or next; # official not-valid tag
1537 }
1362 1538
1363 utf8::decode $login; 1539 utf8::decode $login;
1364 push @logins, $login; 1540 push @logins, $login;
1365 } 1541 }
1366 1542
1399 1575
1400Expand crossfire pod fragments into protocol xml. 1576Expand crossfire pod fragments into protocol xml.
1401 1577
1402=cut 1578=cut
1403 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
1404sub expand_cfpod { 1591sub expand_cfpod {
1405 ((my $self), (local $_)) = @_; 1592 my ($self, $pod) = @_;
1406 1593
1407 # escape & and < 1594 my $xml;
1408 s/&/&amp;/g;
1409 s/(?<![BIUGH])</&lt;/g;
1410 1595
1411 # this is buggy, it needs to properly take care of nested <'s 1596 while () {
1597 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1598 $group = $1;
1412 1599
1413 1 while 1600 $group =~ s/&/&amp;/g;
1414 # replace B<>, I<>, U<> etc. 1601 $group =~ s/</&lt;/g;
1415 s/B<([^\>]*)>/<b>$1<\/b>/ 1602
1416 || s/I<([^\>]*)>/<i>$1<\/i>/ 1603 $xml .= $group;
1417 || s/U<([^\>]*)>/<u>$1<\/u>/ 1604 } elsif ($pod =~ m%\G
1418 # replace G<male|female> tags 1605 ([BCGHITU])
1419 || s{G<([^>|]*)\|([^>]*)>}{ 1606 <
1420 $self->gender ? $2 : $1 1607 (?:
1421 }ge 1608 ([^<>]*) (?{ $group = $^N })
1422 # replace H<hint text> 1609 | < $interior >
1423 || s{H<([^\>]*)>} 1610 )
1611 >
1612 %gcsx
1424 { 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") {
1425 ("<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>",
1426 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1632 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1427 "") 1633 "")
1428 [$self->{hintmode}] 1634 [$self->{hintmode}];
1635 } else {
1636 $xml .= "error processing '$code($data)' directive";
1429 }ge; 1637 }
1638 } else {
1639 if ($pod =~ /\G(.+)/) {
1640 warn "parse error while expanding $pod (at $1)";
1641 }
1642 last;
1643 }
1644 }
1430 1645
1646 for ($xml) {
1431 # create single paragraphs (very hackish) 1647 # create single paragraphs (very hackish)
1432 s/(?<=\S)\n(?=\w)/ /g; 1648 s/(?<=\S)\n(?=\w)/ /g;
1433 1649
1434 # compress some whitespace 1650 # compress some whitespace
1435 s/\s+\n/\n/g; # ws line-ends 1651 s/\s+\n/\n/g; # ws line-ends
1436 s/\n\n+/\n/g; # double lines 1652 s/\n\n+/\n/g; # double lines
1437 s/^\n+//; # beginning lines 1653 s/^\n+//; # beginning lines
1438 s/\n+$//; # ending lines 1654 s/\n+$//; # ending lines
1655 }
1439 1656
1440 $_ 1657 $xml
1441} 1658}
1659
1660no re 'eval';
1442 1661
1443sub hintmode { 1662sub hintmode {
1444 $_[0]{hintmode} = $_[1] if @_ > 1; 1663 $_[0]{hintmode} = $_[1] if @_ > 1;
1445 $_[0]{hintmode} 1664 $_[0]{hintmode}
1446} 1665}
1447 1666
1448=item $player->ext_reply ($msgid, %msg) 1667=item $player->ext_reply ($msgid, @msg)
1449 1668
1450Sends an ext reply to the player. 1669Sends an ext reply to the player.
1451 1670
1452=cut 1671=cut
1453 1672
1454sub ext_reply($$%) { 1673sub ext_reply($$@) {
1455 my ($self, $id, %msg) = @_; 1674 my ($self, $id, @msg) = @_;
1456 1675
1457 $msg{msgid} = $id; 1676 $self->ns->ext_reply ($id, @msg)
1458 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1459} 1677}
1460 1678
1461=item $player->ext_event ($type, %msg) 1679=item $player->ext_msg ($type, @msg)
1462 1680
1463Sends an ext event to the client. 1681Sends an ext event to the client.
1464 1682
1465=cut 1683=cut
1466 1684
1467sub ext_event($$%) { 1685sub ext_msg($$@) {
1468 my ($self, $type, %msg) = @_; 1686 my ($self, $type, @msg) = @_;
1469 1687
1470 $self->ns->ext_event ($type, %msg); 1688 $self->ns->ext_msg ($type, @msg);
1471} 1689}
1472 1690
1473=head3 cf::region 1691=head3 cf::region
1474 1692
1475=over 4 1693=over 4
1488 my ($path) = @_; 1706 my ($path) = @_;
1489 1707
1490 my ($match, $specificity); 1708 my ($match, $specificity);
1491 1709
1492 for my $region (list) { 1710 for my $region (list) {
1493 if ($region->match && $path =~ $region->match) { 1711 if ($region->{match} && $path =~ $region->{match}) {
1494 ($match, $specificity) = ($region, $region->specificity) 1712 ($match, $specificity) = ($region, $region->specificity)
1495 if $region->specificity > $specificity; 1713 if $region->specificity > $specificity;
1496 } 1714 }
1497 } 1715 }
1498 1716
1618 $self->init; # pass $1 etc. 1836 $self->init; # pass $1 etc.
1619 return $self; 1837 return $self;
1620 } 1838 }
1621 } 1839 }
1622 1840
1623 Carp::carp "unable to resolve path '$path' (base '$base')."; 1841 Carp::cluck "unable to resolve path '$path' (base '$base').";
1624 () 1842 ()
1625} 1843}
1626 1844
1627sub init { 1845sub init {
1628 my ($self) = @_; 1846 my ($self) = @_;
1691 1909
1692sub load_header_from($) { 1910sub load_header_from($) {
1693 my ($self, $path) = @_; 1911 my ($self, $path) = @_;
1694 1912
1695 utf8::encode $path; 1913 utf8::encode $path;
1696 #aio_open $path, O_RDONLY, 0 1914 my $f = new_from_file cf::object::thawer $path
1697 # or return;
1698
1699 $self->_load_header ($path)
1700 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;
1701 1922
1702 $self->{load_path} = $path; 1923 $self->{load_path} = $path;
1703 1924
1704 1 1925 1
1705} 1926}
1759sub find { 1980sub find {
1760 my ($path, $origin) = @_; 1981 my ($path, $origin) = @_;
1761 1982
1762 $path = normalise $path, $origin && $origin->path; 1983 $path = normalise $path, $origin && $origin->path;
1763 1984
1985 cf::lock_wait "map_data:$path";#d#remove
1764 cf::lock_wait "map_find:$path"; 1986 cf::lock_wait "map_find:$path";
1765 1987
1766 $cf::MAP{$path} || do { 1988 $cf::MAP{$path} || do {
1767 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
1768 my $map = new_from_path cf::map $path 1992 my $map = new_from_path cf::map $path
1769 or return; 1993 or return;
1770 1994
1771 $map->{last_save} = $cf::RUNTIME; 1995 $map->{last_save} = $cf::RUNTIME;
1772 1996
1774 or return; 1998 or return;
1775 1999
1776 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2000 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1777 # doing this can freeze the server in a sync job, obviously 2001 # doing this can freeze the server in a sync job, obviously
1778 #$cf::WAIT_FOR_TICK->wait; 2002 #$cf::WAIT_FOR_TICK->wait;
2003 undef $guard1;
2004 undef $guard2;
1779 $map->reset; 2005 $map->reset;
1780 undef $guard;
1781 return find $path; 2006 return find $path;
1782 } 2007 }
1783 2008
1784 $cf::MAP{$path} = $map 2009 $cf::MAP{$path} = $map
1785 } 2010 }
1794 local $self->{deny_reset} = 1; # loading can take a long time 2019 local $self->{deny_reset} = 1; # loading can take a long time
1795 2020
1796 my $path = $self->{path}; 2021 my $path = $self->{path};
1797 2022
1798 { 2023 {
1799 my $guard = cf::lock_acquire "map_load:$path"; 2024 my $guard = cf::lock_acquire "map_data:$path";
1800 2025
2026 return unless $self->valid;
1801 return if $self->in_memory != cf::MAP_SWAPPED; 2027 return unless $self->in_memory == cf::MAP_SWAPPED;
1802 2028
1803 $self->in_memory (cf::MAP_LOADING); 2029 $self->in_memory (cf::MAP_LOADING);
1804 2030
1805 $self->alloc; 2031 $self->alloc;
1806 2032
1807 $self->pre_load; 2033 $self->pre_load;
1808 Coro::cede; 2034 cf::cede_to_tick;
1809 2035
2036 my $f = new_from_file cf::object::thawer $self->{load_path};
2037 $f->skip_block;
1810 $self->_load_objects ($self->{load_path}, 1) 2038 $self->_load_objects ($f)
1811 or return; 2039 or return;
1812 2040
1813 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2041 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1814 if delete $self->{load_original}; 2042 if delete $self->{load_original};
1815 2043
1816 if (my $uniq = $self->uniq_path) { 2044 if (my $uniq = $self->uniq_path) {
1817 utf8::encode $uniq; 2045 utf8::encode $uniq;
1818 if (aio_open $uniq, O_RDONLY, 0) { 2046 unless (aio_stat $uniq) {
2047 if (my $f = new_from_file cf::object::thawer $uniq) {
1819 $self->clear_unique_items; 2048 $self->clear_unique_items;
1820 $self->_load_objects ($uniq, 0); 2049 $self->_load_objects ($f);
2050 $f->resolve_delayed_derefs;
2051 }
1821 } 2052 }
1822 } 2053 }
1823 2054
1824 Coro::cede; 2055 $f->resolve_delayed_derefs;
2056
2057 cf::cede_to_tick;
1825 # now do the right thing for maps 2058 # now do the right thing for maps
1826 $self->link_multipart_objects; 2059 $self->link_multipart_objects;
1827 $self->difficulty ($self->estimate_difficulty) 2060 $self->difficulty ($self->estimate_difficulty)
1828 unless $self->difficulty; 2061 unless $self->difficulty;
1829 Coro::cede; 2062 cf::cede_to_tick;
1830 2063
1831 unless ($self->{deny_activate}) { 2064 unless ($self->{deny_activate}) {
1832 $self->decay_objects; 2065 $self->decay_objects;
1833 $self->fix_auto_apply; 2066 $self->fix_auto_apply;
1834 $self->update_buttons; 2067 $self->update_buttons;
1835 Coro::cede; 2068 cf::cede_to_tick;
1836 $self->set_darkness_map; 2069 $self->set_darkness_map;
1837 Coro::cede; 2070 cf::cede_to_tick;
1838 $self->activate; 2071 $self->activate;
1839 } 2072 }
2073
2074 $self->{last_save} = $cf::RUNTIME;
2075 $self->last_access ($cf::RUNTIME);
1840 2076
1841 $self->in_memory (cf::MAP_IN_MEMORY); 2077 $self->in_memory (cf::MAP_IN_MEMORY);
1842 } 2078 }
1843 2079
1844 $self->post_load; 2080 $self->post_load;
1855 2091
1856 $self 2092 $self
1857} 2093}
1858 2094
1859# 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
1860sub load_diag { 2096sub load_neighbours {
1861 my ($map) = @_; 2097 my ($map) = @_;
1862 2098
1863 my @diag; # diagonal neighbours 2099 my @neigh; # diagonal neighbours
1864 2100
1865 for (0 .. 3) { 2101 for (0 .. 3) {
1866 my $neigh = $map->tile_path ($_) 2102 my $neigh = $map->tile_path ($_)
1867 or next; 2103 or next;
1868 $neigh = find $neigh, $map 2104 $neigh = find $neigh, $map
1869 or next; 2105 or next;
1870 $neigh->load; 2106 $neigh->load;
1871 2107
2108 push @neigh,
1872 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2109 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1873 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2110 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1874 } 2111 }
1875 2112
1876 for (@diag) { 2113 for (grep defined $_->[0], @neigh) {
2114 my ($path, $origin) = @$_;
1877 my $neigh = find @$_ 2115 my $neigh = find $path, $origin
1878 or next; 2116 or next;
1879 $neigh->load; 2117 $neigh->load;
1880 } 2118 }
1881} 2119}
1882 2120
1887} 2125}
1888 2126
1889sub do_load_sync { 2127sub do_load_sync {
1890 my ($map) = @_; 2128 my ($map) = @_;
1891 2129
2130 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2131 if $Coro::current == $Coro::main;
2132
1892 cf::sync_job { $map->load }; 2133 cf::sync_job { $map->load };
1893} 2134}
1894 2135
1895our %MAP_PREFETCH; 2136our %MAP_PREFETCH;
1896our $MAP_PREFETCHER = undef; 2137our $MAP_PREFETCHER = undef;
1897 2138
1898sub find_async { 2139sub find_async {
1899 my ($path, $origin) = @_; 2140 my ($path, $origin, $load) = @_;
1900 2141
1901 $path = normalise $path, $origin && $origin->{path}; 2142 $path = normalise $path, $origin && $origin->{path};
1902 2143
1903 if (my $map = $cf::MAP{$path}) { 2144 if (my $map = $cf::MAP{$path}) {
1904 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2145 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1905 } 2146 }
1906 2147
1907 undef $MAP_PREFETCH{$path}; 2148 $MAP_PREFETCH{$path} |= $load;
2149
1908 $MAP_PREFETCHER ||= cf::async { 2150 $MAP_PREFETCHER ||= cf::async {
2151 $Coro::current->{desc} = "map prefetcher";
2152
1909 while (%MAP_PREFETCH) { 2153 while (%MAP_PREFETCH) {
1910 for my $path (keys %MAP_PREFETCH) { 2154 while (my ($k, $v) = each %MAP_PREFETCH) {
1911 my $map = find $path 2155 if (my $map = find $k) {
1912 or next;
1913 $map->load; 2156 $map->load if $v;
2157 }
1914 2158
1915 delete $MAP_PREFETCH{$path}; 2159 delete $MAP_PREFETCH{$k};
1916 } 2160 }
1917 } 2161 }
1918 undef $MAP_PREFETCHER; 2162 undef $MAP_PREFETCHER;
1919 }; 2163 };
1920 $MAP_PREFETCHER->prio (6); 2164 $MAP_PREFETCHER->prio (6);
1923} 2167}
1924 2168
1925sub save { 2169sub save {
1926 my ($self) = @_; 2170 my ($self) = @_;
1927 2171
1928 my $lock = cf::lock_acquire "map_data:" . $self->path; 2172 my $lock = cf::lock_acquire "map_data:$self->{path}";
1929 2173
1930 $self->{last_save} = $cf::RUNTIME; 2174 $self->{last_save} = $cf::RUNTIME;
1931 2175
1932 return unless $self->dirty; 2176 return unless $self->dirty;
1933 2177
1939 return if $self->{deny_save}; 2183 return if $self->{deny_save};
1940 2184
1941 local $self->{last_access} = $self->last_access;#d# 2185 local $self->{last_access} = $self->last_access;#d#
1942 2186
1943 cf::async { 2187 cf::async {
2188 $Coro::current->{desc} = "map player save";
1944 $_->contr->save for $self->players; 2189 $_->contr->save for $self->players;
1945 }; 2190 };
1946 2191
1947 if ($uniq) { 2192 if ($uniq) {
1948 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2193 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1956 my ($self) = @_; 2201 my ($self) = @_;
1957 2202
1958 # save first because save cedes 2203 # save first because save cedes
1959 $self->save; 2204 $self->save;
1960 2205
1961 my $lock = cf::lock_acquire "map_data:" . $self->path; 2206 my $lock = cf::lock_acquire "map_data:$self->{path}";
1962 2207
1963 return if $self->players; 2208 return if $self->players;
1964 return if $self->in_memory != cf::MAP_IN_MEMORY; 2209 return if $self->in_memory != cf::MAP_IN_MEMORY;
1965 return if $self->{deny_save}; 2210 return if $self->{deny_save};
1966 2211
2212 $self->in_memory (cf::MAP_SWAPPED);
2213
2214 $self->deactivate;
2215 $_->clear_links_to ($self) for values %cf::MAP;
1967 $self->clear; 2216 $self->clear;
1968 $self->in_memory (cf::MAP_SWAPPED);
1969} 2217}
1970 2218
1971sub reset_at { 2219sub reset_at {
1972 my ($self) = @_; 2220 my ($self) = @_;
1973 2221
2005 if $uniq; 2253 if $uniq;
2006 } 2254 }
2007 2255
2008 delete $cf::MAP{$self->path}; 2256 delete $cf::MAP{$self->path};
2009 2257
2258 $self->deactivate;
2259 $_->clear_links_to ($self) for values %cf::MAP;
2010 $self->clear; 2260 $self->clear;
2011
2012 $_->clear_links_to ($self) for values %cf::MAP;
2013 2261
2014 $self->unlink_save; 2262 $self->unlink_save;
2015 $self->destroy; 2263 $self->destroy;
2016} 2264}
2017 2265
2018my $nuke_counter = "aaaa"; 2266my $nuke_counter = "aaaa";
2019 2267
2020sub nuke { 2268sub nuke {
2021 my ($self) = @_; 2269 my ($self) = @_;
2022 2270
2271 {
2272 my $lock = cf::lock_acquire "map_data:$self->{path}";
2273
2023 delete $cf::MAP{$self->path}; 2274 delete $cf::MAP{$self->path};
2024 2275
2025 $self->unlink_save; 2276 $self->unlink_save;
2026 2277
2027 bless $self, "cf::map"; 2278 bless $self, "cf::map";
2028 delete $self->{deny_reset}; 2279 delete $self->{deny_reset};
2029 $self->{deny_save} = 1; 2280 $self->{deny_save} = 1;
2030 $self->reset_timeout (1); 2281 $self->reset_timeout (1);
2031 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2282 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2032 2283
2033 $cf::MAP{$self->path} = $self; 2284 $cf::MAP{$self->path} = $self;
2285 }
2034 2286
2035 $self->reset; # polite request, might not happen 2287 $self->reset; # polite request, might not happen
2036} 2288}
2037 2289
2038=item $maps = cf::map::tmp_maps 2290=item $maps = cf::map::tmp_maps
2114 2366
2115sub inv_recursive { 2367sub inv_recursive {
2116 inv_recursive_ inv $_[0] 2368 inv_recursive_ inv $_[0]
2117} 2369}
2118 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
2119package cf; 2399package cf;
2120 2400
2121=back 2401=back
2122 2402
2123=head3 cf::object::player 2403=head3 cf::object::player
2145 2425
2146 } else { 2426 } else {
2147 my $pl = $self->contr; 2427 my $pl = $self->contr;
2148 2428
2149 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2429 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2150 my $diag = $pl->{npc_dialog}; 2430 my $dialog = $pl->{npc_dialog};
2151 $diag->{pl}->ext_reply ( 2431 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2152 $diag->{id},
2153 msgtype => "reply",
2154 msg => $diag->{pl}->expand_cfpod ($msg),
2155 add_topics => []
2156 );
2157 2432
2158 } else { 2433 } else {
2159 $msg = $npc->name . " says: $msg" if $npc; 2434 $msg = $npc->name . " says: $msg" if $npc;
2160 $self->message ($msg, $flags); 2435 $self->message ($msg, $flags);
2161 } 2436 }
2162 } 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 (@_);
2163} 2448}
2164 2449
2165=item $player_object->may ("access") 2450=item $player_object->may ("access")
2166 2451
2167Returns wether the given player is authorized to access resource "access" 2452Returns wether the given player is authorized to access resource "access"
2246 # use -1 or undef as default coordinates, not 0, 0 2531 # use -1 or undef as default coordinates, not 0, 0
2247 ($x, $y) = ($map->enter_x, $map->enter_y) 2532 ($x, $y) = ($map->enter_x, $map->enter_y)
2248 if $x <=0 && $y <= 0; 2533 if $x <=0 && $y <= 0;
2249 2534
2250 $map->load; 2535 $map->load;
2251 $map->load_diag; 2536 $map->load_neighbours;
2252 2537
2253 return unless $self->contr->active; 2538 return unless $self->contr->active;
2254 $self->activate_recursive; 2539 $self->activate_recursive;
2255 2540
2256 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2541 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2257 $self->enter_map ($map, $x, $y); 2542 $self->enter_map ($map, $x, $y);
2258} 2543}
2259 2544
2260=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2545=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2261 2546
2262Moves 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
2263her, loading and preparing them map, calling the provided $check callback 2548her, loading and preparing them map, calling the provided $check callback
2264that 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
2265the 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.
2266 2552
2267=cut 2553=cut
2268 2554
2269our $GOTOGEN; 2555our $GOTOGEN;
2270 2556
2271sub cf::object::player::goto { 2557sub cf::object::player::goto {
2272 my ($self, $path, $x, $y, $check) = @_; 2558 my ($self, $path, $x, $y, $check, $done) = @_;
2273 2559
2274 # 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
2275 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2561 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2276 2562
2277 $self->enter_link; 2563 $self->enter_link;
2278 2564
2279 (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
2280 my $map = eval { 2587 my $map = eval {
2281 my $map = cf::map::find $path; 2588 my $map = defined $path ? cf::map::find $path : undef;
2282 2589
2283 if ($map) { 2590 if ($map) {
2284 $map = $map->customise_for ($self); 2591 $map = $map->customise_for ($self);
2285 $map = $check->($map) if $check && $map; 2592 $map = $check->($map) if $check && $map;
2286 } else { 2593 } else {
2287 $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);
2288 } 2595 }
2289 2596
2290 $map 2597 $map
2291 }; 2598 };
2292 2599
2297 2604
2298 if ($gen == $self->{_goto_generation}) { 2605 if ($gen == $self->{_goto_generation}) {
2299 delete $self->{_goto_generation}; 2606 delete $self->{_goto_generation};
2300 $self->leave_link ($map, $x, $y); 2607 $self->leave_link ($map, $x, $y);
2301 } 2608 }
2609
2610 $done->() if $done;
2302 })->prio (1); 2611 })->prio (1);
2303} 2612}
2304 2613
2305=item $player_object->enter_exit ($exit_object) 2614=item $player_object->enter_exit ($exit_object)
2306 2615
2343 $rmp->{origin_y} = $exit->y; 2652 $rmp->{origin_y} = $exit->y;
2344 } 2653 }
2345 2654
2346 $rmp->{random_seed} ||= $exit->random_seed; 2655 $rmp->{random_seed} ||= $exit->random_seed;
2347 2656
2348 my $data = cf::to_json $rmp; 2657 my $data = cf::encode_json $rmp;
2349 my $md5 = Digest::MD5::md5_hex $data; 2658 my $md5 = Digest::MD5::md5_hex $data;
2350 my $meta = "$RANDOMDIR/$md5.meta"; 2659 my $meta = "$RANDOMDIR/$md5.meta";
2351 2660
2352 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2661 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2353 aio_write $fh, 0, (length $data), $data, 0; 2662 aio_write $fh, 0, (length $data), $data, 0;
2380 # if exit is damned, update players death & WoR home-position 2689 # if exit is damned, update players death & WoR home-position
2381 $self->contr->savebed ($slaying, $hp, $sp) 2690 $self->contr->savebed ($slaying, $hp, $sp)
2382 if $exit->flag (FLAG_DAMNED); 2691 if $exit->flag (FLAG_DAMNED);
2383 2692
2384 (async { 2693 (async {
2694 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2695
2385 $self->deactivate_recursive; # just to be sure 2696 $self->deactivate_recursive; # just to be sure
2386 unless (eval { 2697 unless (eval {
2387 $self->goto ($slaying, $hp, $sp); 2698 $self->goto ($slaying, $hp, $sp);
2388 2699
2389 1; 2700 1;
2415 2726
2416 utf8::encode $text; 2727 utf8::encode $text;
2417 $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);
2418} 2729}
2419 2730
2420=item $client->send_msg ($color, $type, $msg, [extra...]) 2731=item $client->send_msg ($channel, $msg, $color, [extra...])
2421 2732
2422Send 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
2423client 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
2424the 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
2425the message unless the client supports the msg packet. 2736the message unless the client supports the msg packet.
2426 2737
2427=cut 2738=cut
2428 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
2429sub cf::client::send_msg { 2792sub cf::client::send_msg {
2430 my ($self, $color, $type, $msg, @extra) = @_; 2793 my ($self, $channel, $msg, $color, @extra) = @_;
2431 2794
2432 $msg = $self->pl->expand_cfpod ($msg); 2795 $msg = $self->pl->expand_cfpod ($msg);
2433 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
2434 return unless @extra || length $msg; 2819 return unless @extra || length $msg;
2435 2820
2436 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
2437 $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]));
2438 } else { 2828 } else {
2439 # replace some tags by gcfclient-compatible ones
2440 for ($msg) {
2441 1 while
2442 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2443 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2444 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2445 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2446 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2447 }
2448
2449 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
2450 if (0 && $msg =~ /\[/) { 2844 if (0 && $msg =~ /\[/) {
2845 # COMMAND/INFO
2451 $self->send_packet ("drawextinfo $color 4 0 $msg") 2846 $self->send_packet ("drawextinfo $color 10 8 $msg")
2452 } else { 2847 } else {
2453 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2848 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2454 $self->send_packet ("drawinfo $color $msg") 2849 $self->send_packet ("drawinfo $color $msg")
2455 } 2850 }
2456 } 2851 }
2457 } 2852 }
2458} 2853}
2459 2854
2460=item $client->ext_event ($type, %msg) 2855=item $client->ext_msg ($type, @msg)
2461 2856
2462Sends an ext event to the client. 2857Sends an ext event to the client.
2463 2858
2464=cut 2859=cut
2465 2860
2466sub cf::client::ext_event($$%) { 2861sub cf::client::ext_msg($$@) {
2467 my ($self, $type, %msg) = @_; 2862 my ($self, $type, @msg) = @_;
2468 2863
2864 if ($self->extcmd == 2) {
2865 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2866 } elsif ($self->extcmd == 1) { # TODO: remove
2469 $msg{msgtype} = "event_$type"; 2867 push @msg, msgtype => "event_$type";
2470 $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 }
2471} 2888}
2472 2889
2473=item $success = $client->query ($flags, "text", \&cb) 2890=item $success = $client->query ($flags, "text", \&cb)
2474 2891
2475Queues a query to the client, calling the given callback with 2892Queues a query to the client, calling the given callback with
2530 my ($ns, $buf) = @_; 2947 my ($ns, $buf) = @_;
2531 2948
2532 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2949 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2533 2950
2534 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
2535 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2959 if (my $cb = $EXTICMD{$type}) {
2536 if (my %reply = $cb->($ns, $msg)) { 2960 @reply = $cb->($ns, @payload);
2537 $reply{msgid} = $msg->{msgid};
2538 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2539 }
2540 } 2961 }
2962
2963 $ns->ext_reply ($reply, @reply)
2964 if $reply;
2965
2541 } else { 2966 } else {
2542 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";
2543 } 2968 }
2544 2969
2545 cf::override; 2970 cf::override;
2592our $safe = new Safe "safe"; 3017our $safe = new Safe "safe";
2593our $safe_hole = new Safe::Hole; 3018our $safe_hole = new Safe::Hole;
2594 3019
2595$SIG{FPE} = 'IGNORE'; 3020$SIG{FPE} = 'IGNORE';
2596 3021
2597$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));
2598 3027
2599# here we export the classes and methods available to script code 3028# here we export the classes and methods available to script code
2600 3029
2601=pod 3030=pod
2602 3031
2603The following functions and methods are available within a safe environment: 3032The following functions and methods are available within a safe environment:
2604 3033
2605 cf::object 3034 cf::object
2606 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
2607 insert remove 3036 insert remove name archname title slaying race decrease_ob_nr
2608 3037
2609 cf::object::player 3038 cf::object::player
2610 player 3039 player
2611 3040
2612 cf::player 3041 cf::player
2617 3046
2618=cut 3047=cut
2619 3048
2620for ( 3049for (
2621 ["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
2622 insert remove)], 3052 decrease_ob_nr destroy)],
2623 ["cf::object::player" => qw(player)], 3053 ["cf::object::player" => qw(player)],
2624 ["cf::player" => qw(peaceful)], 3054 ["cf::player" => qw(peaceful)],
2625 ["cf::map" => qw(trigger)], 3055 ["cf::map" => qw(trigger)],
2626) { 3056) {
2627 no strict 'refs'; 3057 no strict 'refs';
2703# the server's init and main functions 3133# the server's init and main functions
2704 3134
2705sub load_facedata($) { 3135sub load_facedata($) {
2706 my ($path) = @_; 3136 my ($path) = @_;
2707 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
2708 warn "loading facedata from $path\n"; 3144 warn "loading facedata from $path\n";
2709 3145
2710 my $facedata; 3146 my $facedata;
2711 0 < aio_load $path, $facedata 3147 0 < aio_load $path, $facedata
2712 or die "$path: $!"; 3148 or die "$path: $!";
2714 $facedata = Coro::Storable::thaw $facedata; 3150 $facedata = Coro::Storable::thaw $facedata;
2715 3151
2716 $facedata->{version} == 2 3152 $facedata->{version} == 2
2717 or cf::cleanup "$path: version mismatch, cannot proceed."; 3153 or cf::cleanup "$path: version mismatch, cannot proceed.";
2718 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
2719 { 3162 {
2720 my $faces = $facedata->{faceinfo}; 3163 my $faces = $facedata->{faceinfo};
2721 3164
2722 while (my ($face, $info) = each %$faces) { 3165 while (my ($face, $info) = each %$faces) {
2723 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3166 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3167
2724 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3168 cf::face::set_visibility $idx, $info->{visibility};
3169 cf::face::set_magicmap $idx, $info->{magicmap};
2725 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3170 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2726 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3171 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2727 Coro::cede; 3172
3173 cf::cede_to_tick;
2728 } 3174 }
2729 3175
2730 while (my ($face, $info) = each %$faces) { 3176 while (my ($face, $info) = each %$faces) {
2731 next unless $info->{smooth}; 3177 next unless $info->{smooth};
3178
2732 my $idx = cf::face::find $face 3179 my $idx = cf::face::find $face
2733 or next; 3180 or next;
3181
2734 if (my $smooth = cf::face::find $info->{smooth}) { 3182 if (my $smooth = cf::face::find $info->{smooth}) {
3183 cf::face::set_smooth $idx, $smooth;
2735 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3184 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2736 } else { 3185 } else {
2737 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3186 warn "smooth face '$info->{smooth}' not found for face '$face'";
2738 } 3187 }
2739 Coro::cede; 3188
3189 cf::cede_to_tick;
2740 } 3190 }
2741 } 3191 }
2742 3192
2743 { 3193 {
2744 my $anims = $facedata->{animinfo}; 3194 my $anims = $facedata->{animinfo};
2745 3195
2746 while (my ($anim, $info) = each %$anims) { 3196 while (my ($anim, $info) = each %$anims) {
2747 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3197 cf::anim::set $anim, $info->{frames}, $info->{facings};
2748 Coro::cede; 3198 cf::cede_to_tick;
2749 } 3199 }
2750 3200
2751 cf::anim::invalidate_all; # d'oh 3201 cf::anim::invalidate_all; # d'oh
2752 } 3202 }
2753 3203
3204 {
3205 # TODO: for gcfclient pleasure, we should give resources
3206 # that gcfclient doesn't grok a >10000 face index.
3207 my $res = $facedata->{resource};
3208
3209 while (my ($name, $info) = each %$res) {
3210 if (defined $info->{type}) {
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;
3228 cf::face::set_type $idx, $info->{type};
3229 } else {
3230 $RESOURCE{$name} = $info;
3231 }
3232
3233 cf::cede_to_tick;
3234 }
3235 }
3236
3237 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3238
2754 1 3239 1
2755} 3240}
2756 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
2757sub 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
2758 load_resource_file "$MAPDIR/regions" 3275 load_resource_file "$MAPDIR/regions"
2759 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 }
2760} 3282}
2761 3283
2762sub reload_facedata { 3284sub reload_facedata {
2763 load_facedata "$DATADIR/facedata" 3285 load_facedata "$DATADIR/facedata"
2764 or die "unable to load facedata\n"; 3286 or die "unable to load facedata\n";
2793 3315
2794sub init { 3316sub init {
2795 reload_resources; 3317 reload_resources;
2796} 3318}
2797 3319
2798sub cfg_load { 3320sub reload_config {
2799 open my $fh, "<:utf8", "$CONFDIR/config" 3321 open my $fh, "<:utf8", "$CONFDIR/config"
2800 or return; 3322 or return;
2801 3323
2802 local $/; 3324 local $/;
2803 *CFG = YAML::Syck::Load <$fh>; 3325 *CFG = YAML::Load <$fh>;
2804 3326
2805 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3327 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2806 3328
2807 $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};
2808 $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};
2819sub main { 3341sub main {
2820 # we must not ever block the main coroutine 3342 # we must not ever block the main coroutine
2821 local $Coro::idle = sub { 3343 local $Coro::idle = sub {
2822 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#
2823 (async { 3345 (async {
2824 Event::one_event; 3346 $Coro::current->{desc} = "IDLE BUG HANDLER";
3347 EV::loop EV::LOOP_ONESHOT;
2825 })->prio (Coro::PRIO_MAX); 3348 })->prio (Coro::PRIO_MAX);
2826 }; 3349 };
2827 3350
2828 cfg_load; 3351 reload_config;
2829 db_init; 3352 db_init;
2830 load_extensions; 3353 load_extensions;
2831 3354
2832 $TICK_WATCHER->start; 3355 $TICK_WATCHER->start;
3356 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
2833 Event::loop; 3357 EV::loop;
2834} 3358}
2835 3359
2836############################################################################# 3360#############################################################################
2837# initialisation and cleanup 3361# initialisation and cleanup
2838 3362
2839# install some emergency cleanup handlers 3363# install some emergency cleanup handlers
2840BEGIN { 3364BEGIN {
3365 our %SIGWATCHER = ();
2841 for my $signal (qw(INT HUP TERM)) { 3366 for my $signal (qw(INT HUP TERM)) {
2842 Event->signal ( 3367 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2843 reentrant => 0,
2844 data => WF_AUTOCANCEL,
2845 signal => $signal,
2846 prio => 0,
2847 cb => sub {
2848 cf::cleanup "SIG$signal"; 3368 cf::cleanup "SIG$signal";
2849 },
2850 ); 3369 };
2851 } 3370 }
2852} 3371}
2853 3372
2854sub write_runtime { 3373sub write_runtime {
2855 my $runtime = "$LOCALDIR/runtime"; 3374 my $runtime = "$LOCALDIR/runtime";
2900 # and maps saved/destroyed asynchronously. 3419 # and maps saved/destroyed asynchronously.
2901 warn "begin emergency player save\n"; 3420 warn "begin emergency player save\n";
2902 for my $login (keys %cf::PLAYER) { 3421 for my $login (keys %cf::PLAYER) {
2903 my $pl = $cf::PLAYER{$login} or next; 3422 my $pl = $cf::PLAYER{$login} or next;
2904 $pl->valid or next; 3423 $pl->valid or next;
3424 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2905 $pl->save; 3425 $pl->save;
2906 } 3426 }
2907 warn "end emergency player save\n"; 3427 warn "end emergency player save\n";
2908 3428
2909 warn "begin emergency map save\n"; 3429 warn "begin emergency map save\n";
2948 warn "syncing database to disk"; 3468 warn "syncing database to disk";
2949 BDB::db_env_txn_checkpoint $DB_ENV; 3469 BDB::db_env_txn_checkpoint $DB_ENV;
2950 3470
2951 # 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
2952 3472
2953 warn "cancelling all WF_AUTOCANCEL watchers";
2954 for (Event::all_watchers) {
2955 $_->cancel if $_->data & WF_AUTOCANCEL;
2956 }
2957
2958 warn "flushing outstanding aio requests"; 3473 warn "flushing outstanding aio requests";
2959 for (;;) { 3474 for (;;) {
2960 BDB::flush; 3475 BDB::flush;
2961 IO::AIO::flush; 3476 IO::AIO::flush;
2962 Coro::cede; 3477 Coro::cede_notself;
2963 last unless IO::AIO::nreqs || BDB::nreqs; 3478 last unless IO::AIO::nreqs || BDB::nreqs;
2964 warn "iterate..."; 3479 warn "iterate...";
2965 } 3480 }
2966 3481
2967 ++$RELOAD; 3482 ++$RELOAD;
3026 warn "reloading cf.pm"; 3541 warn "reloading cf.pm";
3027 require cf; 3542 require cf;
3028 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3543 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3029 3544
3030 warn "loading config and database again"; 3545 warn "loading config and database again";
3031 cf::cfg_load; 3546 cf::reload_config;
3032 3547
3033 warn "loading extensions"; 3548 warn "loading extensions";
3034 cf::load_extensions; 3549 cf::load_extensions;
3035 3550
3036 warn "reattaching attachments to objects/players"; 3551 warn "reattaching attachments to objects/players";
3056 3571
3057sub reload_perl() { 3572sub reload_perl() {
3058 # doing reload synchronously and two reloads happen back-to-back, 3573 # doing reload synchronously and two reloads happen back-to-back,
3059 # coro crashes during coro_state_free->destroy here. 3574 # coro crashes during coro_state_free->destroy here.
3060 3575
3061 $RELOAD_WATCHER ||= Event->timer ( 3576 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3062 reentrant => 0,
3063 after => 0,
3064 data => WF_AUTOCANCEL,
3065 cb => sub {
3066 do_reload_perl; 3577 do_reload_perl;
3067 undef $RELOAD_WATCHER; 3578 undef $RELOAD_WATCHER;
3068 },
3069 ); 3579 };
3070} 3580}
3071 3581
3072register_command "reload" => sub { 3582register_command "reload" => sub {
3073 my ($who, $arg) = @_; 3583 my ($who, $arg) = @_;
3074 3584
3075 if ($who->flag (FLAG_WIZ)) { 3585 if ($who->flag (FLAG_WIZ)) {
3076 $who->message ("reloading server."); 3586 $who->message ("reloading server.");
3587 async {
3588 $Coro::current->{desc} = "perl_reload";
3077 async { reload_perl }; 3589 reload_perl;
3590 };
3078 } 3591 }
3079}; 3592};
3080 3593
3081unshift @INC, $LIBDIR; 3594unshift @INC, $LIBDIR;
3082 3595
3101 my $signal = new Coro::Signal; 3614 my $signal = new Coro::Signal;
3102 push @WAIT_FOR_TICK_BEGIN, $signal; 3615 push @WAIT_FOR_TICK_BEGIN, $signal;
3103 $signal->wait; 3616 $signal->wait;
3104} 3617}
3105 3618
3106 my $min = 1e6;#d# 3619$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3107 my $avg = 10;
3108$TICK_WATCHER = Event->timer (
3109 reentrant => 0,
3110 parked => 1,
3111 prio => 0,
3112 at => $NEXT_TICK || $TICK,
3113 data => WF_AUTOCANCEL,
3114 cb => sub {
3115 if ($Coro::current != $Coro::main) { 3620 if ($Coro::current != $Coro::main) {
3116 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"
3117 unless ++$bug_warning > 10; 3622 unless ++$bug_warning > 10;
3118 return; 3623 return;
3119 } 3624 }
3120 3625
3121 $NOW = $tick_start = Event::time; 3626 $NOW = $tick_start = EV::now;
3122 3627
3123 cf::server_tick; # one server iteration 3628 cf::server_tick; # one server iteration
3124 3629
3125 0 && sync_job {#d# 3630 $RUNTIME += $TICK;
3126 for(1..10) { 3631 $NEXT_TICK = $_[0]->at;
3127 my $t = Event::time;
3128 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3129 or die;
3130 3632
3131 $map->width (50); 3633 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3132 $map->height (50); 3634 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3133 $map->alloc; 3635 Coro::async_pool {
3134 $map->_load_objects ("/tmp/x.map", 1); 3636 $Coro::current->{desc} = "runtime saver";
3135 my $t = Event::time - $t; 3637 write_runtime
3136 3638 or warn "ERROR: unable to write runtime file: $!";
3137 #next unless $t < 0.0013;#d#
3138 if ($t < $min) {
3139 $min = $t;
3140 }
3141 $avg = $avg * 0.99 + $t * 0.01;
3142 }
3143 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3144 exit 0;
3145 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3146 }; 3639 };
3640 }
3147 3641
3148 $RUNTIME += $TICK;
3149 $NEXT_TICK += $TICK;
3150
3151 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3152 $NEXT_RUNTIME_WRITE = $NOW + 10;
3153 Coro::async_pool {
3154 write_runtime
3155 or warn "ERROR: unable to write runtime file: $!";
3156 };
3157 }
3158
3159# my $AFTER = Event::time;
3160# warn $AFTER - $NOW;#d#
3161
3162 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3642 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3163 $sig->send; 3643 $sig->send;
3164 } 3644 }
3165 while (my $sig = shift @WAIT_FOR_TICK) { 3645 while (my $sig = shift @WAIT_FOR_TICK) {
3166 $sig->send; 3646 $sig->send;
3167 } 3647 }
3168 3648
3169 $NOW = Event::time;
3170
3171 # if we are delayed by four ticks or more, skip them all
3172 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3173
3174 $TICK_WATCHER->at ($NEXT_TICK);
3175 $TICK_WATCHER->start;
3176
3177 $LOAD = ($NOW - $tick_start) / $TICK; 3649 $LOAD = ($NOW - $tick_start) / $TICK;
3178 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3650 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3179 3651
3180 _post_tick; 3652 _post_tick;
3181 3653};
3182 3654$TICK_WATCHER->priority (EV::MAXPRI);
3183 },
3184);
3185 3655
3186{ 3656{
3187 BDB::max_poll_time $TICK * 0.1; 3657 # configure BDB
3188 $BDB_POLL_WATCHER = Event->io ( 3658
3189 reentrant => 0,
3190 fd => BDB::poll_fileno,
3191 poll => 'r',
3192 prio => 0,
3193 data => WF_AUTOCANCEL,
3194 cb => \&BDB::poll_cb,
3195 );
3196 BDB::min_parallel 8; 3659 BDB::min_parallel 8;
3197 3660 BDB::max_poll_reqs $TICK * 0.1;
3198 BDB::set_sync_prepare { 3661 $Coro::BDB::WATCHER->priority (1);
3199 my $status;
3200 my $current = $Coro::current;
3201 (
3202 sub {
3203 $status = $!;
3204 $current->ready; undef $current;
3205 },
3206 sub {
3207 Coro::schedule while defined $current;
3208 $! = $status;
3209 },
3210 )
3211 };
3212 3662
3213 unless ($DB_ENV) { 3663 unless ($DB_ENV) {
3214 $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);
3215 3669
3216 cf::sync_job { 3670 cf::sync_job {
3217 eval { 3671 eval {
3218 BDB::db_env_open 3672 BDB::db_env_open
3219 $DB_ENV, 3673 $DB_ENV,
3221 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
3222 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3676 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3223 0666; 3677 0666;
3224 3678
3225 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3679 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3226
3227 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3228 $DB_ENV->set_lk_detect;
3229 }; 3680 };
3230 3681
3231 cf::cleanup "db_env_open(db): $@" if $@; 3682 cf::cleanup "db_env_open(db): $@" if $@;
3232 }; 3683 };
3233 } 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 };
3234} 3695}
3235 3696
3236{ 3697{
3698 # configure IO::AIO
3699
3237 IO::AIO::min_parallel 8; 3700 IO::AIO::min_parallel 8;
3238
3239 undef $Coro::AIO::WATCHER;
3240 IO::AIO::max_poll_time $TICK * 0.1; 3701 IO::AIO::max_poll_time $TICK * 0.1;
3241 $AIO_POLL_WATCHER = Event->io ( 3702 $Coro::AIO::WATCHER->priority (1);
3242 reentrant => 0,
3243 data => WF_AUTOCANCEL,
3244 fd => IO::AIO::poll_fileno,
3245 poll => 'r',
3246 prio => 6,
3247 cb => \&IO::AIO::poll_cb,
3248 );
3249} 3703}
3250 3704
3251my $_log_backtrace; 3705my $_log_backtrace;
3252 3706
3253sub _log_backtrace { 3707sub _log_backtrace {
3257 3711
3258 # limit the # of concurrent backtraces 3712 # limit the # of concurrent backtraces
3259 if ($_log_backtrace < 2) { 3713 if ($_log_backtrace < 2) {
3260 ++$_log_backtrace; 3714 ++$_log_backtrace;
3261 async { 3715 async {
3716 $Coro::current->{desc} = "abt $msg";
3717
3262 my @bt = fork_call { 3718 my @bt = fork_call {
3263 @addr = map { sprintf "%x", $_ } @addr; 3719 @addr = map { sprintf "%x", $_ } @addr;
3264 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3720 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3265 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 |"
3266 or die "addr2line: $!"; 3722 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines