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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines