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.300 by root, Tue Jul 10 06:44:29 2007 UTC vs.
Revision 1.407 by root, Sun Jan 13 09:53:53 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines