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.287 by root, Mon Jun 25 05:43:45 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
27use JSON::XS 2.01 ();
25use BDB (); 28use BDB ();
26use Data::Dumper; 29use Data::Dumper;
27use Digest::MD5; 30use Digest::MD5;
28use Fcntl; 31use Fcntl;
29use YAML::Syck (); 32use YAML ();
30use IO::AIO 2.32 (); 33use IO::AIO 2.51 ();
31use Time::HiRes; 34use Time::HiRes;
32use Compress::LZF; 35use Compress::LZF;
36use Digest::MD5 ();
33 37
34# configure various modules to our taste 38# configure various modules to our taste
35# 39#
36$Storable::canonical = 1; # reduce rsync transfers 40$Storable::canonical = 1; # reduce rsync transfers
37Coro::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
38Compress::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
39
40$Event::Eval = 1; # no idea why this is required, but it is
41
42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
43$YAML::Syck::ImplicitUnicode = 1;
44 43
45$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
46 45
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 46sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
48 47
67our $TMPDIR = "$LOCALDIR/" . tmpdir; 66our $TMPDIR = "$LOCALDIR/" . tmpdir;
68our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
69our $PLAYERDIR = "$LOCALDIR/" . playerdir; 68our $PLAYERDIR = "$LOCALDIR/" . playerdir;
70our $RANDOMDIR = "$LOCALDIR/random"; 69our $RANDOMDIR = "$LOCALDIR/random";
71our $BDBDIR = "$LOCALDIR/db"; 70our $BDBDIR = "$LOCALDIR/db";
71our %RESOURCE;
72 72
73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
74our $TICK_WATCHER; 74our $TICK_WATCHER;
75our $AIO_POLL_WATCHER; 75our $AIO_POLL_WATCHER;
76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
77our $NEXT_TICK; 77our $NEXT_TICK;
78our $NOW;
79our $USE_FSYNC = 1; # use fsync to write maps - default off 78our $USE_FSYNC = 1; # use fsync to write maps - default off
80 79
81our $BDB_POLL_WATCHER; 80our $BDB_POLL_WATCHER;
81our $BDB_DEADLOCK_WATCHER;
82our $BDB_CHECKPOINT_WATCHER;
83our $BDB_TRICKLE_WATCHER;
82our $DB_ENV; 84our $DB_ENV;
83 85
84our %CFG; 86our %CFG;
85 87
86our $UPTIME; $UPTIME ||= time; 88our $UPTIME; $UPTIME ||= time;
87our $RUNTIME; 89our $RUNTIME;
90our $NOW;
88 91
89our %PLAYER; # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
90our %MAP; # all maps 93our (%MAP, %MAP_LOADING ); # all maps
91our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
92 95
93# 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 ∕
94our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
95 98
156 159
157The raw value load value from the last tick. 160The raw value load value from the last tick.
158 161
159=item %cf::CFG 162=item %cf::CFG
160 163
161Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/deliantra-server/config>, or
162from wherever your confdir points to. 165from wherever your confdir points to.
163 166
164=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
165 168
166These 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
167returns 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
168per 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.
169 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
170=back 179=back
171 180
172=cut 181=cut
173 182
174BEGIN { 183BEGIN {
178 $msg .= "\n" 187 $msg .= "\n"
179 unless $msg =~ /\n$/; 188 unless $msg =~ /\n$/;
180 189
181 $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;
182 191
183 utf8::encode $msg;
184 LOG llevError, $msg; 192 LOG llevError, $msg;
185 }; 193 };
186} 194}
195
196$Coro::State::DIEHOOK = sub {
197 warn Carp::longmess $_[0];
198 Coro::terminate;
199};
187 200
188@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 201@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
189@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 202@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
190@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 203@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
191@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 204@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
204)) { 217)) {
205 no strict 'refs'; 218 no strict 'refs';
206 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 219 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
207} 220}
208 221
209$Event::DIED = sub { 222$EV::DIED = sub {
210 warn "error in event callback: @_"; 223 warn "error in event callback: @_";
211}; 224};
212 225
213############################################################################# 226#############################################################################
214 227
237 $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;
238 $d 251 $d
239 } || "[unable to dump $_[0]: '$@']"; 252 } || "[unable to dump $_[0]: '$@']";
240} 253}
241 254
242use JSON::XS ();
243
244=item $ref = cf::from_json $json 255=item $ref = cf::decode_json $json
245 256
246Converts a JSON string into the corresponding perl data structure. 257Converts a JSON string into the corresponding perl data structure.
247 258
248=item $json = cf::to_json $ref 259=item $json = cf::encode_json $ref
249 260
250Converts a perl data structure into its JSON representation. 261Converts a perl data structure into its JSON representation.
251 262
252=cut 263=cut
253 264
254our $json_coder = JSON::XS->new->convert_blessed->utf8; 265our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
255 266
256sub to_json ($) { $json_coder->encode ($_[0]) } 267sub encode_json($) { $json_coder->encode ($_[0]) }
257sub from_json ($) { $json_coder->decode ($_[0]) } 268sub decode_json($) { $json_coder->decode ($_[0]) }
258 269
259=item cf::lock_wait $string 270=item cf::lock_wait $string
260 271
261Wait until the given lock is available. See cf::lock_acquire. 272Wait until the given lock is available. See cf::lock_acquire.
262 273
265Wait 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
266a 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,
267for example when the coroutine gets canceled), the lock is automatically 278for example when the coroutine gets canceled), the lock is automatically
268returned. 279returned.
269 280
281Locks are *not* recursive, locking from the same coro twice results in a
282deadlocked coro.
283
270Lock 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
271uses map_find and cf::map::load uses map_load). 285uses map_find and cf::map::load uses map_load).
272 286
273=item $locked = cf::lock_active $string 287=item $locked = cf::lock_active $string
274 288
275Return 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.
276 290
277=cut 291=cut
278 292
279our %LOCK; 293our %LOCK;
294our %LOCKER;#d#
280 295
281sub lock_wait($) { 296sub lock_wait($) {
282 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#
283 303
284 # wait for lock, if any 304 # wait for lock, if any
285 while ($LOCK{$key}) { 305 while ($LOCK{$key}) {
286 push @{ $LOCK{$key} }, $Coro::current; 306 push @{ $LOCK{$key} }, $Coro::current;
287 Coro::schedule; 307 Coro::schedule;
293 313
294 # wait, to be sure we are not locked 314 # wait, to be sure we are not locked
295 lock_wait $key; 315 lock_wait $key;
296 316
297 $LOCK{$key} = []; 317 $LOCK{$key} = [];
318 $LOCKER{$key} = $Coro::current;#d#
298 319
299 Coro::guard { 320 Coro::guard {
321 delete $LOCKER{$key};#d#
300 # wake up all waiters, to be on the safe side 322 # wake up all waiters, to be on the safe side
301 $_->ready for @{ delete $LOCK{$key} }; 323 $_->ready for @{ delete $LOCK{$key} };
302 } 324 }
303} 325}
304 326
316 }; 338 };
317 $TICK_WATCHER->stop; 339 $TICK_WATCHER->stop;
318 $guard 340 $guard
319} 341}
320 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
321=item cf::async { BLOCK } 416=item cf::async { BLOCK }
322 417
323Currently the same as Coro::async_pool, meaning you cannot use 418Currently the same as Coro::async_pool, meaning you cannot use
324C<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
325thing you are allowed to do is call C<prio> on it. 420thing you are allowed to do is call C<prio> on it.
328 423
329BEGIN { *async = \&Coro::async_pool } 424BEGIN { *async = \&Coro::async_pool }
330 425
331=item cf::sync_job { BLOCK } 426=item cf::sync_job { BLOCK }
332 427
333The design of Crossfire TRT requires that the main coroutine ($Coro::main) 428The design of Deliantra requires that the main coroutine ($Coro::main)
334is always able to handle events or runnable, as Crossfire TRT is only 429is always able to handle events or runnable, as Deliantra is only
335partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 430partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
336acceptable. 431acceptable.
337 432
338If 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
339the given BLOCK in another coroutine while waiting for the result. The 434the given BLOCK in another coroutine while waiting for the result. The
344 439
345sub sync_job(&) { 440sub sync_job(&) {
346 my ($job) = @_; 441 my ($job) = @_;
347 442
348 if ($Coro::current == $Coro::main) { 443 if ($Coro::current == $Coro::main) {
349 my $time = Event::time; 444 my $time = EV::time;
350 445
351 # this is the main coro, too bad, we have to block 446 # this is the main coro, too bad, we have to block
352 # till the operation succeeds, freezing the server :/ 447 # till the operation succeeds, freezing the server :/
353 448
449 LOG llevError, Carp::longmess "sync job";#d#
450
354 # TODO: use suspend/resume instead 451 # TODO: use suspend/resume instead
355 # (but this is cancel-safe) 452 # (but this is cancel-safe)
356 my $freeze_guard = freeze_mainloop; 453 my $freeze_guard = freeze_mainloop;
357 454
358 my $busy = 1; 455 my $busy = 1;
359 my @res; 456 my @res;
360 457
361 (async { 458 (async {
459 $Coro::current->desc ("sync job coro");
362 @res = eval { $job->() }; 460 @res = eval { $job->() };
363 warn $@ if $@; 461 warn $@ if $@;
364 undef $busy; 462 undef $busy;
365 })->prio (Coro::PRIO_MAX); 463 })->prio (Coro::PRIO_MAX);
366 464
367 while ($busy) { 465 while ($busy) {
368 Coro::cede or Event::one_event; 466 if (Coro::nready) {
467 Coro::cede_notself;
468 } else {
469 EV::loop EV::LOOP_ONESHOT;
369 } 470 }
471 }
370 472
371 $time = Event::time - $time; 473 $time = EV::time - $time;
372 474
373 LOG llevError | logBacktrace, Carp::longmess "long sync job" 475 LOG llevError | logBacktrace, Carp::longmess "long sync job"
374 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 476 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
375 477
376 $tick_start += $time; # do not account sync jobs to server load 478 $tick_start += $time; # do not account sync jobs to server load
406=item fork_call { }, $args 508=item fork_call { }, $args
407 509
408Executes the given code block with the given arguments in a seperate 510Executes the given code block with the given arguments in a seperate
409process, returning the results. Everything must be serialisable with 511process, returning the results. Everything must be serialisable with
410Coro::Storable. May, of course, block. Note that the executed sub may 512Coro::Storable. May, of course, block. Note that the executed sub may
411never block itself or use any form of Event handling. 513never block itself or use any form of event handling.
412 514
413=cut 515=cut
414 516
415sub fork_call(&@) { 517sub fork_call(&@) {
416 my ($cb, @args) = @_; 518 my ($cb, @args) = @_;
417 519
418# 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,
419# or die "socketpair: $!"; 521 # otherwise perl prematurely frees the stuff :/
420 pipe my $fh1, my $fh2 522 # TODO: investigate and fix (likely this will be rather laborious)
421 or die "pipe: $!";
422 523
423 if (my $pid = fork) { 524 my @res = Coro::Util::fork_eval {
424 close $fh2;
425
426 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
427 $res = Coro::Storable::thaw $res;
428
429 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
430
431 die $$res unless "ARRAY" eq ref $res;
432
433 return wantarray ? @$res : $res->[-1];
434 } else {
435 reset_signals; 525 reset_signals;
436 local $SIG{__WARN__}; 526 &$cb
437 local $SIG{__DIE__}; 527 }, @args;
438 eval {
439 close $fh1;
440 528
441 my @res = eval { $cb->(@args) }; 529 wantarray ? @res : $res[-1]
442 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
443 };
444
445 warn $@ if $@;
446 _exit 0;
447 }
448} 530}
449 531
450=item $value = cf::db_get $family => $key 532=item $value = cf::db_get $family => $key
451 533
452Returns a single value from the environment database. 534Returns a single value from the environment database.
454=item cf::db_put $family => $key => $value 536=item cf::db_put $family => $key => $value
455 537
456Stores 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
457data 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).
458 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
459=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}
460 564
461our $DB; 565our $DB;
462 566
463sub db_init { 567sub db_init {
464 unless ($DB) {
465 $DB = BDB::db_create $DB_ENV;
466
467 cf::sync_job { 568 cf::sync_job {
468 eval { 569 $DB ||= db_table "db";
469 $DB->set_flags (BDB::CHKSUM);
470
471 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
472 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
473 cf::cleanup "db_open(db): $!" if $!;
474 };
475 cf::cleanup "db_open(db): $@" if $@;
476 };
477 } 570 };
478} 571}
479 572
480sub db_get($$) { 573sub db_get($$) {
481 my $key = "$_[0]/$_[1]"; 574 my $key = "$_[0]/$_[1]";
482 575
532 if (1) { 625 if (1) {
533 $md5 = 626 $md5 =
534 join "\x00", 627 join "\x00",
535 $processversion, 628 $processversion,
536 map { 629 map {
537 Coro::cede; 630 cf::cede_to_tick;
538 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 631 ($src->[$_], Digest::MD5::md5_hex $data[$_])
539 } 0.. $#$src; 632 } 0.. $#$src;
540 633
541 634
542 my $dbmd5 = db_get cache => "$id/md5"; 635 my $dbmd5 = db_get cache => "$id/md5";
586attach callbacks/event handlers (a collection of which is called an "attachment") 679attach callbacks/event handlers (a collection of which is called an "attachment")
587to it. All such attachable objects support the following methods. 680to it. All such attachable objects support the following methods.
588 681
589In 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>
590C<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
591Crossfire TRT). 684Deliantra).
592 685
593=over 4 686=over 4
594 687
595=item $attachable->attach ($attachment, key => $value...) 688=item $attachable->attach ($attachment, key => $value...)
596 689
848 "; 941 ";
849 die if $@; 942 die if $@;
850} 943}
851 944
852our $override; 945our $override;
853our @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?
854 947
855sub override { 948sub override {
856 $override = 1; 949 $override = 1;
857 @invoke_results = (); 950 @INVOKE_RESULTS = (@_);
858} 951}
859 952
860sub do_invoke { 953sub do_invoke {
861 my $event = shift; 954 my $event = shift;
862 my $callbacks = shift; 955 my $callbacks = shift;
863 956
864 @invoke_results = (); 957 @INVOKE_RESULTS = ();
865 958
866 local $override; 959 local $override;
867 960
868 for (@$callbacks) { 961 for (@$callbacks) {
869 eval { &{$_->[1]} }; 962 eval { &{$_->[1]} };
878 } 971 }
879 972
880 0 973 0
881} 974}
882 975
883=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 976=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
884 977
885=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 978=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
886 979
887Generate an object-specific event with the given arguments. 980Generate an object-specific event with the given arguments.
888 981
889This 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
890removed 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
891results (if you must, access C<@cf::invoke_results> directly). 984results (if you must, access C<@cf::INVOKE_RESULTS> directly).
892 985
893=back 986=back
894 987
895=cut 988=cut
896 989
897############################################################################# 990#############################################################################
898# 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}
899 1034
900sub reattach { 1035sub reattach {
901 # basically do the same as instantiate, without calling instantiate 1036 # basically do the same as instantiate, without calling instantiate
902 my ($obj) = @_; 1037 my ($obj) = @_;
903 1038
924cf::attachable->attach ( 1059cf::attachable->attach (
925 prio => -1000000, 1060 prio => -1000000,
926 on_instantiate => sub { 1061 on_instantiate => sub {
927 my ($obj, $data) = @_; 1062 my ($obj, $data) = @_;
928 1063
929 $data = from_json $data; 1064 $data = decode_json $data;
930 1065
931 for (@$data) { 1066 for (@$data) {
932 my ($name, $args) = @$_; 1067 my ($name, $args) = @$_;
933 1068
934 $obj->attach ($name, %{$args || {} }); 1069 $obj->attach ($name, %{$args || {} });
950sub object_freezer_save { 1085sub object_freezer_save {
951 my ($filename, $rdata, $objs) = @_; 1086 my ($filename, $rdata, $objs) = @_;
952 1087
953 sync_job { 1088 sync_job {
954 if (length $$rdata) { 1089 if (length $$rdata) {
1090 utf8::decode (my $decname = $filename);
955 warn sprintf "saving %s (%d,%d)\n", 1091 warn sprintf "saving %s (%d,%d)\n",
956 $filename, length $$rdata, scalar @$objs; 1092 $decname, length $$rdata, scalar @$objs;
957 1093
958 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1094 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
959 chmod SAVE_MODE, $fh; 1095 chmod SAVE_MODE, $fh;
960 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1096 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
961 aio_fsync $fh if $cf::USE_FSYNC; 1097 aio_fsync $fh if $cf::USE_FSYNC;
962 close $fh; 1098 close $fh;
963 1099
964 if (@$objs) { 1100 if (@$objs) {
965 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) {
966 chmod SAVE_MODE, $fh; 1102 chmod SAVE_MODE, $fh;
967 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1103 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
968 aio_write $fh, 0, (length $data), $data, 0; 1104 aio_write $fh, 0, (length $data), $data, 0;
969 aio_fsync $fh if $cf::USE_FSYNC; 1105 aio_fsync $fh if $cf::USE_FSYNC;
970 close $fh; 1106 close $fh;
971 aio_rename "$filename.pst~", "$filename.pst"; 1107 aio_rename "$filename.pst~", "$filename.pst";
972 } 1108 }
980 } 1116 }
981 } else { 1117 } else {
982 aio_unlink $filename; 1118 aio_unlink $filename;
983 aio_unlink "$filename.pst"; 1119 aio_unlink "$filename.pst";
984 } 1120 }
985 } 1121 };
986} 1122}
987 1123
988sub object_freezer_as_string { 1124sub object_freezer_as_string {
989 my ($rdata, $objs) = @_; 1125 my ($rdata, $objs) = @_;
990 1126
1002 or return; 1138 or return;
1003 1139
1004 unless (aio_stat "$filename.pst") { 1140 unless (aio_stat "$filename.pst") {
1005 (aio_load "$filename.pst", $av) >= 0 1141 (aio_load "$filename.pst", $av) >= 0
1006 or return; 1142 or return;
1143
1007 $av = eval { (Storable::thaw $av)->{objs} }; 1144 my $st = eval { Coro::Storable::thaw $av };
1145 $av = $st->{objs};
1008 } 1146 }
1009 1147
1148 utf8::decode (my $decname = $filename);
1010 warn sprintf "loading %s (%d)\n", 1149 warn sprintf "loading %s (%d,%d)\n",
1011 $filename, length $data, scalar @{$av || []}; 1150 $decname, length $data, scalar @{$av || []};
1151
1012 return ($data, $av); 1152 ($data, $av)
1013} 1153}
1014 1154
1015=head2 COMMAND CALLBACKS 1155=head2 COMMAND CALLBACKS
1016 1156
1017=over 4 1157=over 4
1087 cf::override; 1227 cf::override;
1088 }, 1228 },
1089 on_extcmd => sub { 1229 on_extcmd => sub {
1090 my ($pl, $buf) = @_; 1230 my ($pl, $buf) = @_;
1091 1231
1092 my $msg = eval { from_json $buf }; 1232 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1093 1233
1094 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
1095 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1242 if (my $cb = $EXTCMD{$type}) {
1096 if (my %reply = $cb->($pl, $msg)) { 1243 @reply = $cb->($pl, @payload);
1097 $pl->ext_reply ($msg->{msgid}, %reply);
1098 }
1099 } 1244 }
1245
1246 $pl->ext_reply ($reply, @reply)
1247 if $reply;
1248
1100 } else { 1249 } else {
1101 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1250 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1102 } 1251 }
1103 1252
1104 cf::override; 1253 cf::override;
1194 1343
1195=head3 cf::player 1344=head3 cf::player
1196 1345
1197=over 4 1346=over 4
1198 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
1199=item cf::player::find $login 1362=item cf::player::find $login
1200 1363
1201Returns the given player object, loading it if necessary (might block). 1364Returns the given player object, loading it if necessary (might block).
1202 1365
1203=cut 1366=cut
1238 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1401 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1239 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1402 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1240 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1403 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1241 aio_unlink +(playerdir $login) . "/$login.pl"; 1404 aio_unlink +(playerdir $login) . "/$login.pl";
1242 1405
1243 my $pl = load_pl path $login 1406 my $f = new_from_file cf::object::thawer path $login
1244 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;
1245 $cf::PLAYER{$login} = $pl 1413 $cf::PLAYER{$login} = $pl
1246 } 1414 }
1247 } 1415 }
1248} 1416}
1249 1417
1259 1427
1260 aio_mkdir playerdir $pl, 0770; 1428 aio_mkdir playerdir $pl, 0770;
1261 $pl->{last_save} = $cf::RUNTIME; 1429 $pl->{last_save} = $cf::RUNTIME;
1262 1430
1263 $pl->save_pl ($path); 1431 $pl->save_pl ($path);
1264 Coro::cede; 1432 cf::cede_to_tick;
1265} 1433}
1266 1434
1267sub new($) { 1435sub new($) {
1268 my ($login) = @_; 1436 my ($login) = @_;
1269 1437
1273 $self->{deny_save} = 1; 1441 $self->{deny_save} = 1;
1274 1442
1275 $cf::PLAYER{$login} = $self; 1443 $cf::PLAYER{$login} = $self;
1276 1444
1277 $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 (@_);
1278} 1456}
1279 1457
1280=item $pl->quit_character 1458=item $pl->quit_character
1281 1459
1282Nukes the player without looking back. If logged in, the connection will 1460Nukes the player without looking back. If logged in, the connection will
1337 or return []; 1515 or return [];
1338 1516
1339 my @logins; 1517 my @logins;
1340 1518
1341 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") {
1342 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1524 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1343 aio_read $fh, 0, 512, my $buf, 0 or next; 1525 aio_read $fh, 0, 512, my $buf, 0 or next;
1344 $buf !~ /^password -------------$/m or next; # official not-valid tag 1526 $buf !~ /^password -------------$/m or next; # official not-valid tag
1527 }
1345 1528
1346 utf8::decode $login; 1529 utf8::decode $login;
1347 push @logins, $login; 1530 push @logins, $login;
1348 } 1531 }
1349 1532
1382 1565
1383Expand crossfire pod fragments into protocol xml. 1566Expand crossfire pod fragments into protocol xml.
1384 1567
1385=cut 1568=cut
1386 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
1387sub expand_cfpod { 1581sub expand_cfpod {
1388 ((my $self), (local $_)) = @_; 1582 my ($self, $pod) = @_;
1389 1583
1390 # escape & and < 1584 my $xml;
1391 s/&/&amp;/g;
1392 s/(?<![BIUGH])</&lt;/g;
1393 1585
1394 # this is buggy, it needs to properly take care of nested <'s 1586 while () {
1587 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1588 $group = $1;
1395 1589
1396 1 while 1590 $group =~ s/&/&amp;/g;
1397 # replace B<>, I<>, U<> etc. 1591 $group =~ s/</&lt;/g;
1398 s/B<([^\>]*)>/<b>$1<\/b>/ 1592
1399 || s/I<([^\>]*)>/<i>$1<\/i>/ 1593 $xml .= $group;
1400 || s/U<([^\>]*)>/<u>$1<\/u>/ 1594 } elsif ($pod =~ m%\G
1401 # replace G<male|female> tags 1595 ([BCGHITU])
1402 || s{G<([^>|]*)\|([^>]*)>}{ 1596 <
1403 $self->gender ? $2 : $1 1597 (?:
1598 ([^<>]*) (?{ $group = $^N })
1599 | < $interior >
1600 )
1601 >
1602 %gcsx
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") {
1621 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1622 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1623 "")
1624 [$self->{hintmode}];
1625 } else {
1626 $xml .= "error processing '$code($data)' directive";
1627 }
1628 } else {
1629 if ($pod =~ /\G(.+)/) {
1630 warn "parse error while expanding $pod (at $1)";
1631 }
1632 last;
1404 }ge 1633 }
1405 # replace H<hint text> 1634 }
1406 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;
1407 1635
1636 for ($xml) {
1408 # create single paragraphs (very hackish) 1637 # create single paragraphs (very hackish)
1409 s/(?<=\S)\n(?=\w)/ /g; 1638 s/(?<=\S)\n(?=\w)/ /g;
1410 1639
1411 $_ 1640 # compress some whitespace
1412} 1641 s/\s+\n/\n/g; # ws line-ends
1642 s/\n\n+/\n/g; # double lines
1643 s/^\n+//; # beginning lines
1644 s/\n+$//; # ending lines
1645 }
1413 1646
1647 $xml
1648}
1649
1650no re 'eval';
1651
1652sub hintmode {
1653 $_[0]{hintmode} = $_[1] if @_ > 1;
1654 $_[0]{hintmode}
1655}
1656
1414=item $player->ext_reply ($msgid, %msg) 1657=item $player->ext_reply ($msgid, @msg)
1415 1658
1416Sends an ext reply to the player. 1659Sends an ext reply to the player.
1417 1660
1418=cut 1661=cut
1419 1662
1420sub ext_reply($$%) { 1663sub ext_reply($$@) {
1421 my ($self, $id, %msg) = @_; 1664 my ($self, $id, @msg) = @_;
1422 1665
1423 $msg{msgid} = $id; 1666 $self->ns->ext_reply ($id, @msg)
1424 $self->send ("ext " . cf::to_json \%msg);
1425} 1667}
1426 1668
1427=item $player->ext_event ($type, %msg) 1669=item $player->ext_msg ($type, @msg)
1428 1670
1429Sends an ext event to the client. 1671Sends an ext event to the client.
1430 1672
1431=cut 1673=cut
1432 1674
1433sub ext_event($$%) { 1675sub ext_msg($$@) {
1434 my ($self, $type, %msg) = @_; 1676 my ($self, $type, @msg) = @_;
1435 1677
1436 $self->ns->ext_event ($type, %msg); 1678 $self->ns->ext_msg ($type, @msg);
1437} 1679}
1438 1680
1439=head3 cf::region 1681=head3 cf::region
1440 1682
1441=over 4 1683=over 4
1454 my ($path) = @_; 1696 my ($path) = @_;
1455 1697
1456 my ($match, $specificity); 1698 my ($match, $specificity);
1457 1699
1458 for my $region (list) { 1700 for my $region (list) {
1459 if ($region->match && $path =~ $region->match) { 1701 if ($region->{match} && $path =~ $region->{match}) {
1460 ($match, $specificity) = ($region, $region->specificity) 1702 ($match, $specificity) = ($region, $region->specificity)
1461 if $region->specificity > $specificity; 1703 if $region->specificity > $specificity;
1462 } 1704 }
1463 } 1705 }
1464 1706
1584 $self->init; # pass $1 etc. 1826 $self->init; # pass $1 etc.
1585 return $self; 1827 return $self;
1586 } 1828 }
1587 } 1829 }
1588 1830
1589 Carp::carp "unable to resolve path '$path' (base '$base')."; 1831 Carp::cluck "unable to resolve path '$path' (base '$base').";
1590 () 1832 ()
1591} 1833}
1592 1834
1593sub init { 1835sub init {
1594 my ($self) = @_; 1836 my ($self) = @_;
1657 1899
1658sub load_header_from($) { 1900sub load_header_from($) {
1659 my ($self, $path) = @_; 1901 my ($self, $path) = @_;
1660 1902
1661 utf8::encode $path; 1903 utf8::encode $path;
1662 #aio_open $path, O_RDONLY, 0 1904 my $f = new_from_file cf::object::thawer $path
1663 # or return;
1664
1665 $self->_load_header ($path)
1666 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;
1667 1912
1668 $self->{load_path} = $path; 1913 $self->{load_path} = $path;
1669 1914
1670 1 1915 1
1671} 1916}
1725sub find { 1970sub find {
1726 my ($path, $origin) = @_; 1971 my ($path, $origin) = @_;
1727 1972
1728 $path = normalise $path, $origin && $origin->path; 1973 $path = normalise $path, $origin && $origin->path;
1729 1974
1975 cf::lock_wait "map_data:$path";#d#remove
1730 cf::lock_wait "map_find:$path"; 1976 cf::lock_wait "map_find:$path";
1731 1977
1732 $cf::MAP{$path} || do { 1978 $cf::MAP{$path} || do {
1733 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
1734 my $map = new_from_path cf::map $path 1982 my $map = new_from_path cf::map $path
1735 or return; 1983 or return;
1736 1984
1737 $map->{last_save} = $cf::RUNTIME; 1985 $map->{last_save} = $cf::RUNTIME;
1738 1986
1740 or return; 1988 or return;
1741 1989
1742 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1990 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1743 # doing this can freeze the server in a sync job, obviously 1991 # doing this can freeze the server in a sync job, obviously
1744 #$cf::WAIT_FOR_TICK->wait; 1992 #$cf::WAIT_FOR_TICK->wait;
1993 undef $guard1;
1994 undef $guard2;
1745 $map->reset; 1995 $map->reset;
1746 undef $guard;
1747 return find $path; 1996 return find $path;
1748 } 1997 }
1749 1998
1750 $cf::MAP{$path} = $map 1999 $cf::MAP{$path} = $map
1751 } 2000 }
1760 local $self->{deny_reset} = 1; # loading can take a long time 2009 local $self->{deny_reset} = 1; # loading can take a long time
1761 2010
1762 my $path = $self->{path}; 2011 my $path = $self->{path};
1763 2012
1764 { 2013 {
1765 my $guard = cf::lock_acquire "map_load:$path"; 2014 my $guard = cf::lock_acquire "map_data:$path";
1766 2015
2016 return unless $self->valid;
1767 return if $self->in_memory != cf::MAP_SWAPPED; 2017 return unless $self->in_memory == cf::MAP_SWAPPED;
1768 2018
1769 $self->in_memory (cf::MAP_LOADING); 2019 $self->in_memory (cf::MAP_LOADING);
1770 2020
1771 $self->alloc; 2021 $self->alloc;
1772 2022
1773 $self->pre_load; 2023 $self->pre_load;
1774 Coro::cede; 2024 cf::cede_to_tick;
1775 2025
2026 my $f = new_from_file cf::object::thawer $self->{load_path};
2027 $f->skip_block;
1776 $self->_load_objects ($self->{load_path}, 1) 2028 $self->_load_objects ($f)
1777 or return; 2029 or return;
1778 2030
1779 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2031 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1780 if delete $self->{load_original}; 2032 if delete $self->{load_original};
1781 2033
1782 if (my $uniq = $self->uniq_path) { 2034 if (my $uniq = $self->uniq_path) {
1783 utf8::encode $uniq; 2035 utf8::encode $uniq;
1784 if (aio_open $uniq, O_RDONLY, 0) { 2036 unless (aio_stat $uniq) {
2037 if (my $f = new_from_file cf::object::thawer $uniq) {
1785 $self->clear_unique_items; 2038 $self->clear_unique_items;
1786 $self->_load_objects ($uniq, 0); 2039 $self->_load_objects ($f);
2040 $f->resolve_delayed_derefs;
2041 }
1787 } 2042 }
1788 } 2043 }
1789 2044
1790 Coro::cede; 2045 $f->resolve_delayed_derefs;
2046
2047 cf::cede_to_tick;
1791 # now do the right thing for maps 2048 # now do the right thing for maps
1792 $self->link_multipart_objects; 2049 $self->link_multipart_objects;
1793 $self->difficulty ($self->estimate_difficulty) 2050 $self->difficulty ($self->estimate_difficulty)
1794 unless $self->difficulty; 2051 unless $self->difficulty;
1795 Coro::cede; 2052 cf::cede_to_tick;
1796 2053
1797 unless ($self->{deny_activate}) { 2054 unless ($self->{deny_activate}) {
1798 $self->decay_objects; 2055 $self->decay_objects;
1799 $self->fix_auto_apply; 2056 $self->fix_auto_apply;
1800 $self->update_buttons; 2057 $self->update_buttons;
1801 Coro::cede; 2058 cf::cede_to_tick;
1802 $self->set_darkness_map; 2059 $self->set_darkness_map;
1803 Coro::cede; 2060 cf::cede_to_tick;
1804 $self->activate; 2061 $self->activate;
1805 } 2062 }
2063
2064 $self->{last_save} = $cf::RUNTIME;
2065 $self->last_access ($cf::RUNTIME);
1806 2066
1807 $self->in_memory (cf::MAP_IN_MEMORY); 2067 $self->in_memory (cf::MAP_IN_MEMORY);
1808 } 2068 }
1809 2069
1810 $self->post_load; 2070 $self->post_load;
1821 2081
1822 $self 2082 $self
1823} 2083}
1824 2084
1825# 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
1826sub load_diag { 2086sub load_neighbours {
1827 my ($map) = @_; 2087 my ($map) = @_;
1828 2088
1829 my @diag; # diagonal neighbours 2089 my @neigh; # diagonal neighbours
1830 2090
1831 for (0 .. 3) { 2091 for (0 .. 3) {
1832 my $neigh = $map->tile_path ($_) 2092 my $neigh = $map->tile_path ($_)
1833 or next; 2093 or next;
1834 $neigh = find $neigh, $map 2094 $neigh = find $neigh, $map
1835 or next; 2095 or next;
1836 $neigh->load; 2096 $neigh->load;
1837 2097
2098 push @neigh,
1838 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2099 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1839 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2100 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1840 } 2101 }
1841 2102
1842 for (@diag) { 2103 for (grep defined $_->[0], @neigh) {
2104 my ($path, $origin) = @$_;
1843 my $neigh = find @$_ 2105 my $neigh = find $path, $origin
1844 or next; 2106 or next;
1845 $neigh->load; 2107 $neigh->load;
1846 } 2108 }
1847} 2109}
1848 2110
1853} 2115}
1854 2116
1855sub do_load_sync { 2117sub do_load_sync {
1856 my ($map) = @_; 2118 my ($map) = @_;
1857 2119
2120 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2121 if $Coro::current == $Coro::main;
2122
1858 cf::sync_job { $map->load }; 2123 cf::sync_job { $map->load };
1859} 2124}
1860 2125
1861our %MAP_PREFETCH; 2126our %MAP_PREFETCH;
1862our $MAP_PREFETCHER = undef; 2127our $MAP_PREFETCHER = undef;
1863 2128
1864sub find_async { 2129sub find_async {
1865 my ($path, $origin) = @_; 2130 my ($path, $origin, $load) = @_;
1866 2131
1867 $path = normalise $path, $origin && $origin->{path}; 2132 $path = normalise $path, $origin && $origin->{path};
1868 2133
1869 if (my $map = $cf::MAP{$path}) { 2134 if (my $map = $cf::MAP{$path}) {
1870 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2135 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1871 } 2136 }
1872 2137
1873 undef $MAP_PREFETCH{$path}; 2138 $MAP_PREFETCH{$path} |= $load;
2139
1874 $MAP_PREFETCHER ||= cf::async { 2140 $MAP_PREFETCHER ||= cf::async {
2141 $Coro::current->{desc} = "map prefetcher";
2142
1875 while (%MAP_PREFETCH) { 2143 while (%MAP_PREFETCH) {
1876 for my $path (keys %MAP_PREFETCH) { 2144 while (my ($k, $v) = each %MAP_PREFETCH) {
1877 my $map = find $path 2145 if (my $map = find $k) {
1878 or next;
1879 $map->load; 2146 $map->load if $v;
2147 }
1880 2148
1881 delete $MAP_PREFETCH{$path}; 2149 delete $MAP_PREFETCH{$k};
1882 } 2150 }
1883 } 2151 }
1884 undef $MAP_PREFETCHER; 2152 undef $MAP_PREFETCHER;
1885 }; 2153 };
1886 $MAP_PREFETCHER->prio (6); 2154 $MAP_PREFETCHER->prio (6);
1889} 2157}
1890 2158
1891sub save { 2159sub save {
1892 my ($self) = @_; 2160 my ($self) = @_;
1893 2161
1894 my $lock = cf::lock_acquire "map_data:" . $self->path; 2162 my $lock = cf::lock_acquire "map_data:$self->{path}";
1895 2163
1896 $self->{last_save} = $cf::RUNTIME; 2164 $self->{last_save} = $cf::RUNTIME;
1897 2165
1898 return unless $self->dirty; 2166 return unless $self->dirty;
1899 2167
1905 return if $self->{deny_save}; 2173 return if $self->{deny_save};
1906 2174
1907 local $self->{last_access} = $self->last_access;#d# 2175 local $self->{last_access} = $self->last_access;#d#
1908 2176
1909 cf::async { 2177 cf::async {
2178 $Coro::current->{desc} = "map player save";
1910 $_->contr->save for $self->players; 2179 $_->contr->save for $self->players;
1911 }; 2180 };
1912 2181
1913 if ($uniq) { 2182 if ($uniq) {
1914 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2183 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1922 my ($self) = @_; 2191 my ($self) = @_;
1923 2192
1924 # save first because save cedes 2193 # save first because save cedes
1925 $self->save; 2194 $self->save;
1926 2195
1927 my $lock = cf::lock_acquire "map_data:" . $self->path; 2196 my $lock = cf::lock_acquire "map_data:$self->{path}";
1928 2197
1929 return if $self->players; 2198 return if $self->players;
1930 return if $self->in_memory != cf::MAP_IN_MEMORY; 2199 return if $self->in_memory != cf::MAP_IN_MEMORY;
1931 return if $self->{deny_save}; 2200 return if $self->{deny_save};
1932 2201
2202 $self->in_memory (cf::MAP_SWAPPED);
2203
2204 $self->deactivate;
2205 $_->clear_links_to ($self) for values %cf::MAP;
1933 $self->clear; 2206 $self->clear;
1934 $self->in_memory (cf::MAP_SWAPPED);
1935} 2207}
1936 2208
1937sub reset_at { 2209sub reset_at {
1938 my ($self) = @_; 2210 my ($self) = @_;
1939 2211
1971 if $uniq; 2243 if $uniq;
1972 } 2244 }
1973 2245
1974 delete $cf::MAP{$self->path}; 2246 delete $cf::MAP{$self->path};
1975 2247
2248 $self->deactivate;
2249 $_->clear_links_to ($self) for values %cf::MAP;
1976 $self->clear; 2250 $self->clear;
1977
1978 $_->clear_links_to ($self) for values %cf::MAP;
1979 2251
1980 $self->unlink_save; 2252 $self->unlink_save;
1981 $self->destroy; 2253 $self->destroy;
1982} 2254}
1983 2255
1984my $nuke_counter = "aaaa"; 2256my $nuke_counter = "aaaa";
1985 2257
1986sub nuke { 2258sub nuke {
1987 my ($self) = @_; 2259 my ($self) = @_;
1988 2260
2261 {
2262 my $lock = cf::lock_acquire "map_data:$self->{path}";
2263
1989 delete $cf::MAP{$self->path}; 2264 delete $cf::MAP{$self->path};
1990 2265
1991 $self->unlink_save; 2266 $self->unlink_save;
1992 2267
1993 bless $self, "cf::map"; 2268 bless $self, "cf::map";
1994 delete $self->{deny_reset}; 2269 delete $self->{deny_reset};
1995 $self->{deny_save} = 1; 2270 $self->{deny_save} = 1;
1996 $self->reset_timeout (1); 2271 $self->reset_timeout (1);
1997 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2272 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1998 2273
1999 $cf::MAP{$self->path} = $self; 2274 $cf::MAP{$self->path} = $self;
2275 }
2000 2276
2001 $self->reset; # polite request, might not happen 2277 $self->reset; # polite request, might not happen
2002} 2278}
2003 2279
2004=item $maps = cf::map::tmp_maps 2280=item $maps = cf::map::tmp_maps
2080 2356
2081sub inv_recursive { 2357sub inv_recursive {
2082 inv_recursive_ inv $_[0] 2358 inv_recursive_ inv $_[0]
2083} 2359}
2084 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
2085package cf; 2389package cf;
2086 2390
2087=back 2391=back
2088 2392
2089=head3 cf::object::player 2393=head3 cf::object::player
2111 2415
2112 } else { 2416 } else {
2113 my $pl = $self->contr; 2417 my $pl = $self->contr;
2114 2418
2115 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2419 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2116 my $diag = $pl->{npc_dialog}; 2420 my $dialog = $pl->{npc_dialog};
2117 $diag->{pl}->ext_reply ( 2421 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2118 $diag->{id},
2119 msgtype => "reply",
2120 msg => $diag->{pl}->expand_cfpod ($msg),
2121 add_topics => []
2122 );
2123 2422
2124 } else { 2423 } else {
2125 $msg = $npc->name . " says: $msg" if $npc; 2424 $msg = $npc->name . " says: $msg" if $npc;
2126 $self->message ($msg, $flags); 2425 $self->message ($msg, $flags);
2127 } 2426 }
2128 } 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 (@_);
2129} 2438}
2130 2439
2131=item $player_object->may ("access") 2440=item $player_object->may ("access")
2132 2441
2133Returns wether the given player is authorized to access resource "access" 2442Returns wether the given player is authorized to access resource "access"
2212 # use -1 or undef as default coordinates, not 0, 0 2521 # use -1 or undef as default coordinates, not 0, 0
2213 ($x, $y) = ($map->enter_x, $map->enter_y) 2522 ($x, $y) = ($map->enter_x, $map->enter_y)
2214 if $x <=0 && $y <= 0; 2523 if $x <=0 && $y <= 0;
2215 2524
2216 $map->load; 2525 $map->load;
2217 $map->load_diag; 2526 $map->load_neighbours;
2218 2527
2219 return unless $self->contr->active; 2528 return unless $self->contr->active;
2220 $self->activate_recursive; 2529 $self->activate_recursive;
2221 2530
2222 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2531 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2223 $self->enter_map ($map, $x, $y); 2532 $self->enter_map ($map, $x, $y);
2224} 2533}
2225 2534
2226=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2535=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2227 2536
2228Moves 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
2229her, loading and preparing them map, calling the provided $check callback 2538her, loading and preparing them map, calling the provided $check callback
2230that 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
2231the 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.
2232 2542
2233=cut 2543=cut
2234 2544
2235our $GOTOGEN; 2545our $GOTOGEN;
2236 2546
2237sub cf::object::player::goto { 2547sub cf::object::player::goto {
2238 my ($self, $path, $x, $y, $check) = @_; 2548 my ($self, $path, $x, $y, $check, $done) = @_;
2239 2549
2240 # 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
2241 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2551 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2242 2552
2243 $self->enter_link; 2553 $self->enter_link;
2244 2554
2245 (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
2246 my $map = eval { 2577 my $map = eval {
2247 my $map = cf::map::find $path; 2578 my $map = defined $path ? cf::map::find $path : undef;
2248 2579
2249 if ($map) { 2580 if ($map) {
2250 $map = $map->customise_for ($self); 2581 $map = $map->customise_for ($self);
2251 $map = $check->($map) if $check && $map; 2582 $map = $check->($map) if $check && $map;
2252 } else { 2583 } else {
2253 $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);
2254 } 2585 }
2255 2586
2256 $map 2587 $map
2257 }; 2588 };
2258 2589
2263 2594
2264 if ($gen == $self->{_goto_generation}) { 2595 if ($gen == $self->{_goto_generation}) {
2265 delete $self->{_goto_generation}; 2596 delete $self->{_goto_generation};
2266 $self->leave_link ($map, $x, $y); 2597 $self->leave_link ($map, $x, $y);
2267 } 2598 }
2599
2600 $done->() if $done;
2268 })->prio (1); 2601 })->prio (1);
2269} 2602}
2270 2603
2271=item $player_object->enter_exit ($exit_object) 2604=item $player_object->enter_exit ($exit_object)
2272 2605
2309 $rmp->{origin_y} = $exit->y; 2642 $rmp->{origin_y} = $exit->y;
2310 } 2643 }
2311 2644
2312 $rmp->{random_seed} ||= $exit->random_seed; 2645 $rmp->{random_seed} ||= $exit->random_seed;
2313 2646
2314 my $data = cf::to_json $rmp; 2647 my $data = cf::encode_json $rmp;
2315 my $md5 = Digest::MD5::md5_hex $data; 2648 my $md5 = Digest::MD5::md5_hex $data;
2316 my $meta = "$RANDOMDIR/$md5.meta"; 2649 my $meta = "$RANDOMDIR/$md5.meta";
2317 2650
2318 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2651 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2319 aio_write $fh, 0, (length $data), $data, 0; 2652 aio_write $fh, 0, (length $data), $data, 0;
2341 my $hp = $exit->stats->hp; 2674 my $hp = $exit->stats->hp;
2342 my $sp = $exit->stats->sp; 2675 my $sp = $exit->stats->sp;
2343 2676
2344 $self->enter_link; 2677 $self->enter_link;
2345 2678
2679 # if exit is damned, update players death & WoR home-position
2680 $self->contr->savebed ($slaying, $hp, $sp)
2681 if $exit->flag (FLAG_DAMNED);
2682
2346 (async { 2683 (async {
2684 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2685
2347 $self->deactivate_recursive; # just to be sure 2686 $self->deactivate_recursive; # just to be sure
2348 unless (eval { 2687 unless (eval {
2349 $self->goto ($slaying, $hp, $sp); 2688 $self->goto ($slaying, $hp, $sp);
2350 2689
2351 1; 2690 1;
2377 2716
2378 utf8::encode $text; 2717 utf8::encode $text;
2379 $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);
2380} 2719}
2381 2720
2382=item $client->send_msg ($color, $type, $msg, [extra...]) 2721=item $client->send_msg ($channel, $msg, $color, [extra...])
2383 2722
2384Send 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
2385client 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
2386the 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
2387the message unless the client supports the msg packet. 2726the message unless the client supports the msg packet.
2388 2727
2389=cut 2728=cut
2390 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
2391sub cf::client::send_msg { 2782sub cf::client::send_msg {
2392 my ($self, $color, $type, $msg, @extra) = @_; 2783 my ($self, $channel, $msg, $color, @extra) = @_;
2393 2784
2394 $msg = $self->pl->expand_cfpod ($msg); 2785 $msg = $self->pl->expand_cfpod ($msg);
2395 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
2809 return unless @extra || length $msg;
2810
2396 if ($self->can_msg) { 2811 if ($self->can_msg) {
2397 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); 2812 # default colour, mask it out
2813 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2814 if $color & cf::NDI_DEF;
2815
2816 $self->send_packet ("msg " . $self->{json_coder}->encode (
2817 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2398 } else { 2818 } else {
2399 # replace some tags by gcfclient-compatible ones
2400 for ($msg) {
2401 1 while
2402 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2403 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2404 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2405 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2406 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2407 }
2408
2409 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
2410 if (0 && $msg =~ /\[/) { 2834 if (0 && $msg =~ /\[/) {
2835 # COMMAND/INFO
2411 $self->send_packet ("drawextinfo $color 4 0 $msg") 2836 $self->send_packet ("drawextinfo $color 10 8 $msg")
2412 } else { 2837 } else {
2413 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2838 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2414 $self->send_packet ("drawinfo $color $msg") 2839 $self->send_packet ("drawinfo $color $msg")
2415 } 2840 }
2416 } 2841 }
2417 } 2842 }
2418} 2843}
2419 2844
2420=item $client->ext_event ($type, %msg) 2845=item $client->ext_msg ($type, @msg)
2421 2846
2422Sends an ext event to the client. 2847Sends an ext event to the client.
2423 2848
2424=cut 2849=cut
2425 2850
2426sub cf::client::ext_event($$%) { 2851sub cf::client::ext_msg($$@) {
2427 my ($self, $type, %msg) = @_; 2852 my ($self, $type, @msg) = @_;
2428 2853
2854 if ($self->extcmd == 2) {
2855 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2856 } elsif ($self->extcmd == 1) { # TODO: remove
2429 $msg{msgtype} = "event_$type"; 2857 push @msg, msgtype => "event_$type";
2430 $self->send_packet ("ext " . cf::to_json \%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 }
2431} 2878}
2432 2879
2433=item $success = $client->query ($flags, "text", \&cb) 2880=item $success = $client->query ($flags, "text", \&cb)
2434 2881
2435Queues a query to the client, calling the given callback with 2882Queues a query to the client, calling the given callback with
2458 2905
2459 1 2906 1
2460} 2907}
2461 2908
2462cf::client->attach ( 2909cf::client->attach (
2910 on_connect => sub {
2911 my ($ns) = @_;
2912
2913 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2914 },
2463 on_reply => sub { 2915 on_reply => sub {
2464 my ($ns, $msg) = @_; 2916 my ($ns, $msg) = @_;
2465 2917
2466 # this weird shuffling is so that direct followup queries 2918 # this weird shuffling is so that direct followup queries
2467 # get handled first 2919 # get handled first
2482 } 2934 }
2483 }, 2935 },
2484 on_exticmd => sub { 2936 on_exticmd => sub {
2485 my ($ns, $buf) = @_; 2937 my ($ns, $buf) = @_;
2486 2938
2487 my $msg = eval { from_json $buf }; 2939 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2488 2940
2489 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
2490 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2949 if (my $cb = $EXTICMD{$type}) {
2491 if (my %reply = $cb->($ns, $msg)) { 2950 @reply = $cb->($ns, @payload);
2492 $reply{msgid} = $msg->{msgid};
2493 $ns->send ("ext " . cf::to_json \%reply);
2494 }
2495 } 2951 }
2952
2953 $ns->ext_reply ($reply, @reply)
2954 if $reply;
2955
2496 } else { 2956 } else {
2497 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";
2498 } 2958 }
2499 2959
2500 cf::override; 2960 cf::override;
2547our $safe = new Safe "safe"; 3007our $safe = new Safe "safe";
2548our $safe_hole = new Safe::Hole; 3008our $safe_hole = new Safe::Hole;
2549 3009
2550$SIG{FPE} = 'IGNORE'; 3010$SIG{FPE} = 'IGNORE';
2551 3011
2552$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));
2553 3017
2554# here we export the classes and methods available to script code 3018# here we export the classes and methods available to script code
2555 3019
2556=pod 3020=pod
2557 3021
2558The following functions and methods are available within a safe environment: 3022The following functions and methods are available within a safe environment:
2559 3023
2560 cf::object contr pay_amount pay_player map 3024 cf::object
3025 contr pay_amount pay_player map x y force_find force_add destroy
3026 insert remove name archname title slaying race decrease_ob_nr
3027
2561 cf::object::player player 3028 cf::object::player
2562 cf::player peaceful 3029 player
2563 cf::map trigger 3030
3031 cf::player
3032 peaceful
3033
3034 cf::map
3035 trigger
2564 3036
2565=cut 3037=cut
2566 3038
2567for ( 3039for (
2568 ["cf::object" => qw(contr pay_amount pay_player map)], 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
3042 decrease_ob_nr destroy)],
2569 ["cf::object::player" => qw(player)], 3043 ["cf::object::player" => qw(player)],
2570 ["cf::player" => qw(peaceful)], 3044 ["cf::player" => qw(peaceful)],
2571 ["cf::map" => qw(trigger)], 3045 ["cf::map" => qw(trigger)],
2572) { 3046) {
2573 no strict 'refs'; 3047 no strict 'refs';
2649# the server's init and main functions 3123# the server's init and main functions
2650 3124
2651sub load_facedata($) { 3125sub load_facedata($) {
2652 my ($path) = @_; 3126 my ($path) = @_;
2653 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
2654 warn "loading facedata from $path\n"; 3134 warn "loading facedata from $path\n";
2655 3135
2656 my $facedata; 3136 my $facedata;
2657 0 < aio_load $path, $facedata 3137 0 < aio_load $path, $facedata
2658 or die "$path: $!"; 3138 or die "$path: $!";
2660 $facedata = Coro::Storable::thaw $facedata; 3140 $facedata = Coro::Storable::thaw $facedata;
2661 3141
2662 $facedata->{version} == 2 3142 $facedata->{version} == 2
2663 or cf::cleanup "$path: version mismatch, cannot proceed."; 3143 or cf::cleanup "$path: version mismatch, cannot proceed.";
2664 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
2665 { 3152 {
2666 my $faces = $facedata->{faceinfo}; 3153 my $faces = $facedata->{faceinfo};
2667 3154
2668 while (my ($face, $info) = each %$faces) { 3155 while (my ($face, $info) = each %$faces) {
2669 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3156 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3157
2670 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3158 cf::face::set_visibility $idx, $info->{visibility};
3159 cf::face::set_magicmap $idx, $info->{magicmap};
2671 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3160 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2672 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3161 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2673 Coro::cede; 3162
3163 cf::cede_to_tick;
2674 } 3164 }
2675 3165
2676 while (my ($face, $info) = each %$faces) { 3166 while (my ($face, $info) = each %$faces) {
2677 next unless $info->{smooth}; 3167 next unless $info->{smooth};
3168
2678 my $idx = cf::face::find $face 3169 my $idx = cf::face::find $face
2679 or next; 3170 or next;
3171
2680 if (my $smooth = cf::face::find $info->{smooth}) { 3172 if (my $smooth = cf::face::find $info->{smooth}) {
3173 cf::face::set_smooth $idx, $smooth;
2681 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3174 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2682 } else { 3175 } else {
2683 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3176 warn "smooth face '$info->{smooth}' not found for face '$face'";
2684 } 3177 }
2685 Coro::cede; 3178
3179 cf::cede_to_tick;
2686 } 3180 }
2687 } 3181 }
2688 3182
2689 { 3183 {
2690 my $anims = $facedata->{animinfo}; 3184 my $anims = $facedata->{animinfo};
2691 3185
2692 while (my ($anim, $info) = each %$anims) { 3186 while (my ($anim, $info) = each %$anims) {
2693 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3187 cf::anim::set $anim, $info->{frames}, $info->{facings};
2694 Coro::cede; 3188 cf::cede_to_tick;
2695 } 3189 }
2696 3190
2697 cf::anim::invalidate_all; # d'oh 3191 cf::anim::invalidate_all; # d'oh
2698 } 3192 }
2699 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
2700 1 3229 1
2701} 3230}
2702 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
2703sub 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
2704 load_resource_file "$MAPDIR/regions" 3265 load_resource_file "$MAPDIR/regions"
2705 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 }
2706} 3272}
2707 3273
2708sub reload_facedata { 3274sub reload_facedata {
2709 load_facedata "$DATADIR/facedata" 3275 load_facedata "$DATADIR/facedata"
2710 or die "unable to load facedata\n"; 3276 or die "unable to load facedata\n";
2711} 3277}
2712 3278
2713sub reload_archetypes { 3279sub reload_archetypes {
3280 load_resource_file "$DATADIR/archetypes"
3281 or die "unable to load archetypes\n";
3282 #d# NEED to laod twice to resolve forward references
3283 # this really needs to be done in an extra post-pass
3284 # (which needs to be synchronous, so solve it differently)
2714 load_resource_file "$DATADIR/archetypes" 3285 load_resource_file "$DATADIR/archetypes"
2715 or die "unable to load archetypes\n"; 3286 or die "unable to load archetypes\n";
2716} 3287}
2717 3288
2718sub reload_treasures { 3289sub reload_treasures {
2734 3305
2735sub init { 3306sub init {
2736 reload_resources; 3307 reload_resources;
2737} 3308}
2738 3309
2739sub cfg_load { 3310sub reload_config {
2740 open my $fh, "<:utf8", "$CONFDIR/config" 3311 open my $fh, "<:utf8", "$CONFDIR/config"
2741 or return; 3312 or return;
2742 3313
2743 local $/; 3314 local $/;
2744 *CFG = YAML::Syck::Load <$fh>; 3315 *CFG = YAML::Load <$fh>;
2745 3316
2746 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3317 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2747 3318
2748 $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};
2749 $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};
2760sub main { 3331sub main {
2761 # we must not ever block the main coroutine 3332 # we must not ever block the main coroutine
2762 local $Coro::idle = sub { 3333 local $Coro::idle = sub {
2763 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#
2764 (async { 3335 (async {
2765 Event::one_event; 3336 $Coro::current->{desc} = "IDLE BUG HANDLER";
3337 EV::loop EV::LOOP_ONESHOT;
2766 })->prio (Coro::PRIO_MAX); 3338 })->prio (Coro::PRIO_MAX);
2767 }; 3339 };
2768 3340
2769 cfg_load; 3341 reload_config;
2770 db_init; 3342 db_init;
2771 load_extensions; 3343 load_extensions;
2772 3344
2773 $TICK_WATCHER->start; 3345 $TICK_WATCHER->start;
3346 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
2774 Event::loop; 3347 EV::loop;
2775} 3348}
2776 3349
2777############################################################################# 3350#############################################################################
2778# initialisation and cleanup 3351# initialisation and cleanup
2779 3352
2780# install some emergency cleanup handlers 3353# install some emergency cleanup handlers
2781BEGIN { 3354BEGIN {
3355 our %SIGWATCHER = ();
2782 for my $signal (qw(INT HUP TERM)) { 3356 for my $signal (qw(INT HUP TERM)) {
2783 Event->signal ( 3357 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2784 reentrant => 0,
2785 data => WF_AUTOCANCEL,
2786 signal => $signal,
2787 prio => 0,
2788 cb => sub {
2789 cf::cleanup "SIG$signal"; 3358 cf::cleanup "SIG$signal";
2790 },
2791 ); 3359 };
2792 } 3360 }
2793} 3361}
2794 3362
2795sub write_runtime { 3363sub write_runtime {
2796 my $runtime = "$LOCALDIR/runtime"; 3364 my $runtime = "$LOCALDIR/runtime";
2841 # and maps saved/destroyed asynchronously. 3409 # and maps saved/destroyed asynchronously.
2842 warn "begin emergency player save\n"; 3410 warn "begin emergency player save\n";
2843 for my $login (keys %cf::PLAYER) { 3411 for my $login (keys %cf::PLAYER) {
2844 my $pl = $cf::PLAYER{$login} or next; 3412 my $pl = $cf::PLAYER{$login} or next;
2845 $pl->valid or next; 3413 $pl->valid or next;
3414 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2846 $pl->save; 3415 $pl->save;
2847 } 3416 }
2848 warn "end emergency player save\n"; 3417 warn "end emergency player save\n";
2849 3418
2850 warn "begin emergency map save\n"; 3419 warn "begin emergency map save\n";
2889 warn "syncing database to disk"; 3458 warn "syncing database to disk";
2890 BDB::db_env_txn_checkpoint $DB_ENV; 3459 BDB::db_env_txn_checkpoint $DB_ENV;
2891 3460
2892 # 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
2893 3462
2894 warn "cancelling all WF_AUTOCANCEL watchers";
2895 for (Event::all_watchers) {
2896 $_->cancel if $_->data & WF_AUTOCANCEL;
2897 }
2898
2899 warn "flushing outstanding aio requests"; 3463 warn "flushing outstanding aio requests";
2900 for (;;) { 3464 for (;;) {
2901 BDB::flush; 3465 BDB::flush;
2902 IO::AIO::flush; 3466 IO::AIO::flush;
2903 Coro::cede; 3467 Coro::cede_notself;
2904 last unless IO::AIO::nreqs || BDB::nreqs; 3468 last unless IO::AIO::nreqs || BDB::nreqs;
2905 warn "iterate..."; 3469 warn "iterate...";
2906 } 3470 }
2907 3471
2908 ++$RELOAD; 3472 ++$RELOAD;
2967 warn "reloading cf.pm"; 3531 warn "reloading cf.pm";
2968 require cf; 3532 require cf;
2969 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3533 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2970 3534
2971 warn "loading config and database again"; 3535 warn "loading config and database again";
2972 cf::cfg_load; 3536 cf::reload_config;
2973 3537
2974 warn "loading extensions"; 3538 warn "loading extensions";
2975 cf::load_extensions; 3539 cf::load_extensions;
2976 3540
2977 warn "reattaching attachments to objects/players"; 3541 warn "reattaching attachments to objects/players";
2997 3561
2998sub reload_perl() { 3562sub reload_perl() {
2999 # doing reload synchronously and two reloads happen back-to-back, 3563 # doing reload synchronously and two reloads happen back-to-back,
3000 # coro crashes during coro_state_free->destroy here. 3564 # coro crashes during coro_state_free->destroy here.
3001 3565
3002 $RELOAD_WATCHER ||= Event->timer ( 3566 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3003 reentrant => 0,
3004 after => 0,
3005 data => WF_AUTOCANCEL,
3006 cb => sub {
3007 do_reload_perl; 3567 do_reload_perl;
3008 undef $RELOAD_WATCHER; 3568 undef $RELOAD_WATCHER;
3009 },
3010 ); 3569 };
3011} 3570}
3012 3571
3013register_command "reload" => sub { 3572register_command "reload" => sub {
3014 my ($who, $arg) = @_; 3573 my ($who, $arg) = @_;
3015 3574
3016 if ($who->flag (FLAG_WIZ)) { 3575 if ($who->flag (FLAG_WIZ)) {
3017 $who->message ("reloading server."); 3576 $who->message ("reloading server.");
3577 async {
3578 $Coro::current->{desc} = "perl_reload";
3018 async { reload_perl }; 3579 reload_perl;
3580 };
3019 } 3581 }
3020}; 3582};
3021 3583
3022unshift @INC, $LIBDIR; 3584unshift @INC, $LIBDIR;
3023 3585
3042 my $signal = new Coro::Signal; 3604 my $signal = new Coro::Signal;
3043 push @WAIT_FOR_TICK_BEGIN, $signal; 3605 push @WAIT_FOR_TICK_BEGIN, $signal;
3044 $signal->wait; 3606 $signal->wait;
3045} 3607}
3046 3608
3047 my $min = 1e6;#d# 3609$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3048 my $avg = 10;
3049$TICK_WATCHER = Event->timer (
3050 reentrant => 0,
3051 parked => 1,
3052 prio => 0,
3053 at => $NEXT_TICK || $TICK,
3054 data => WF_AUTOCANCEL,
3055 cb => sub {
3056 if ($Coro::current != $Coro::main) { 3610 if ($Coro::current != $Coro::main) {
3057 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"
3058 unless ++$bug_warning > 10; 3612 unless ++$bug_warning > 10;
3059 return; 3613 return;
3060 } 3614 }
3061 3615
3062 $NOW = $tick_start = Event::time; 3616 $NOW = $tick_start = EV::now;
3063 3617
3064 cf::server_tick; # one server iteration 3618 cf::server_tick; # one server iteration
3065 3619
3066 0 && sync_job {#d# 3620 $RUNTIME += $TICK;
3067 for(1..10) { 3621 $NEXT_TICK = $_[0]->at;
3068 my $t = Event::time;
3069 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3070 or die;
3071 3622
3072 $map->width (50); 3623 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3073 $map->height (50); 3624 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3074 $map->alloc; 3625 Coro::async_pool {
3075 $map->_load_objects ("/tmp/x.map", 1); 3626 $Coro::current->{desc} = "runtime saver";
3076 my $t = Event::time - $t; 3627 write_runtime
3077 3628 or warn "ERROR: unable to write runtime file: $!";
3078 #next unless $t < 0.0013;#d#
3079 if ($t < $min) {
3080 $min = $t;
3081 }
3082 $avg = $avg * 0.99 + $t * 0.01;
3083 }
3084 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3085 exit 0;
3086 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3087 }; 3629 };
3630 }
3088 3631
3089 $RUNTIME += $TICK;
3090 $NEXT_TICK += $TICK;
3091
3092 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3093 $NEXT_RUNTIME_WRITE = $NOW + 10;
3094 Coro::async_pool {
3095 write_runtime
3096 or warn "ERROR: unable to write runtime file: $!";
3097 };
3098 }
3099
3100# my $AFTER = Event::time;
3101# warn $AFTER - $NOW;#d#
3102
3103 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3632 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3104 $sig->send; 3633 $sig->send;
3105 } 3634 }
3106 while (my $sig = shift @WAIT_FOR_TICK) { 3635 while (my $sig = shift @WAIT_FOR_TICK) {
3107 $sig->send; 3636 $sig->send;
3108 } 3637 }
3109 3638
3110 $NOW = Event::time;
3111
3112 # if we are delayed by four ticks or more, skip them all
3113 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3114
3115 $TICK_WATCHER->at ($NEXT_TICK);
3116 $TICK_WATCHER->start;
3117
3118 $LOAD = ($NOW - $tick_start) / $TICK; 3639 $LOAD = ($NOW - $tick_start) / $TICK;
3119 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3640 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3120 3641
3121 _post_tick; 3642 _post_tick;
3122 3643};
3123 3644$TICK_WATCHER->priority (EV::MAXPRI);
3124 },
3125);
3126 3645
3127{ 3646{
3128 BDB::max_poll_time $TICK * 0.1; 3647 # configure BDB
3129 $BDB_POLL_WATCHER = Event->io ( 3648
3130 reentrant => 0,
3131 fd => BDB::poll_fileno,
3132 poll => 'r',
3133 prio => 0,
3134 data => WF_AUTOCANCEL,
3135 cb => \&BDB::poll_cb,
3136 );
3137 BDB::min_parallel 8; 3649 BDB::min_parallel 8;
3138 3650 BDB::max_poll_reqs $TICK * 0.1;
3139 BDB::set_sync_prepare { 3651 $Coro::BDB::WATCHER->priority (1);
3140 my $status;
3141 my $current = $Coro::current;
3142 (
3143 sub {
3144 $status = $!;
3145 $current->ready; undef $current;
3146 },
3147 sub {
3148 Coro::schedule while defined $current;
3149 $! = $status;
3150 },
3151 )
3152 };
3153 3652
3154 unless ($DB_ENV) { 3653 unless ($DB_ENV) {
3155 $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);
3156 3659
3157 cf::sync_job { 3660 cf::sync_job {
3158 eval { 3661 eval {
3159 BDB::db_env_open 3662 BDB::db_env_open
3160 $DB_ENV, 3663 $DB_ENV,
3162 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
3163 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3666 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3164 0666; 3667 0666;
3165 3668
3166 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3669 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3167
3168 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3169 $DB_ENV->set_lk_detect;
3170 }; 3670 };
3171 3671
3172 cf::cleanup "db_env_open(db): $@" if $@; 3672 cf::cleanup "db_env_open(db): $@" if $@;
3173 }; 3673 };
3174 } 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 };
3175} 3685}
3176 3686
3177{ 3687{
3688 # configure IO::AIO
3689
3178 IO::AIO::min_parallel 8; 3690 IO::AIO::min_parallel 8;
3179
3180 undef $Coro::AIO::WATCHER;
3181 IO::AIO::max_poll_time $TICK * 0.1; 3691 IO::AIO::max_poll_time $TICK * 0.1;
3182 $AIO_POLL_WATCHER = Event->io ( 3692 $Coro::AIO::WATCHER->priority (1);
3183 reentrant => 0,
3184 data => WF_AUTOCANCEL,
3185 fd => IO::AIO::poll_fileno,
3186 poll => 'r',
3187 prio => 6,
3188 cb => \&IO::AIO::poll_cb,
3189 );
3190} 3693}
3191 3694
3192my $_log_backtrace; 3695my $_log_backtrace;
3193 3696
3194sub _log_backtrace { 3697sub _log_backtrace {
3198 3701
3199 # limit the # of concurrent backtraces 3702 # limit the # of concurrent backtraces
3200 if ($_log_backtrace < 2) { 3703 if ($_log_backtrace < 2) {
3201 ++$_log_backtrace; 3704 ++$_log_backtrace;
3202 async { 3705 async {
3706 $Coro::current->{desc} = "abt $msg";
3707
3203 my @bt = fork_call { 3708 my @bt = fork_call {
3204 @addr = map { sprintf "%x", $_ } @addr; 3709 @addr = map { sprintf "%x", $_ } @addr;
3205 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3710 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3206 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 |"
3207 or die "addr2line: $!"; 3712 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines