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.290 by root, Mon Jul 2 03:15:30 2007 UTC vs.
Revision 1.410 by root, Tue Jan 15 12:02:24 2008 UTC

4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable; 9use EV 1.86;
10use Event;
11use Opcode; 10use Opcode;
12use Safe; 11use Safe;
13use Safe::Hole; 12use Safe::Hole;
13use Storable ();
14 14
15use Coro 3.61 (); 15use Coro 4.32 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::EV;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::BDB;
23use Coro::Storable; 24use Coro::Storable;
25use Coro::Util ();
24 26
25use JSON::XS 1.4 (); 27use JSON::XS 2.01 ();
26use BDB (); 28use BDB ();
27use Data::Dumper; 29use Data::Dumper;
28use Digest::MD5; 30use Digest::MD5;
29use Fcntl; 31use Fcntl;
30use YAML::Syck (); 32use YAML ();
31use IO::AIO 2.32 (); 33use IO::AIO 2.51 ();
32use Time::HiRes; 34use Time::HiRes;
33use Compress::LZF; 35use Compress::LZF;
36use Digest::MD5 ();
34 37
35# configure various modules to our taste 38# configure various modules to our taste
36# 39#
37$Storable::canonical = 1; # reduce rsync transfers 40$Storable::canonical = 1; # reduce rsync transfers
38Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
39Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
40
41$Event::Eval = 1; # no idea why this is required, but it is
42
43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
44$YAML::Syck::ImplicitUnicode = 1;
45 43
46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 44$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
47 45
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 46sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
49 47
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 66our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 68our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 69our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db"; 70our $BDBDIR = "$LOCALDIR/db";
71our %RESOURCE;
73 72
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75our $TICK_WATCHER; 74our $TICK_WATCHER;
76our $AIO_POLL_WATCHER; 75our $AIO_POLL_WATCHER;
77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 77our $NEXT_TICK;
79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 78our $USE_FSYNC = 1; # use fsync to write maps - default off
81 79
82our $BDB_POLL_WATCHER; 80our $BDB_POLL_WATCHER;
81our $BDB_DEADLOCK_WATCHER;
82our $BDB_CHECKPOINT_WATCHER;
83our $BDB_TRICKLE_WATCHER;
83our $DB_ENV; 84our $DB_ENV;
84 85
85our %CFG; 86our %CFG;
86 87
87our $UPTIME; $UPTIME ||= time; 88our $UPTIME; $UPTIME ||= time;
88our $RUNTIME; 89our $RUNTIME;
90our $NOW;
89 91
90our %PLAYER; # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
91our %MAP; # all maps 93our (%MAP, %MAP_LOADING ); # all maps
92our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
93 95
94# used to convert map paths into valid unix filenames by replacing / by ∕ 96# used to convert map paths into valid unix filenames by replacing / by ∕
95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96 98
157 159
158The raw value load value from the last tick. 160The raw value load value from the last tick.
159 161
160=item %cf::CFG 162=item %cf::CFG
161 163
162Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/deliantra-server/config>, or
163from wherever your confdir points to. 165from wherever your confdir points to.
164 166
165=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
166 168
167These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
168returns directly I<after> the tick processing (and consequently, can only wake one process 170returns directly I<after> the tick processing (and consequently, can only wake one process
169per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 171per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
170 172
173=item @cf::INVOKE_RESULTS
174
175This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call.
178
171=back 179=back
172 180
173=cut 181=cut
174 182
175BEGIN { 183BEGIN {
179 $msg .= "\n" 187 $msg .= "\n"
180 unless $msg =~ /\n$/; 188 unless $msg =~ /\n$/;
181 189
182 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
183 191
184 utf8::encode $msg;
185 LOG llevError, $msg; 192 LOG llevError, $msg;
186 }; 193 };
187} 194}
195
196$Coro::State::DIEHOOK = sub {
197 return unless $^S eq 0; # "eq", not "=="
198
199 if ($Coro::current == $Coro::main) {#d#
200 warn "DIEHOOK called in main context, Coro bug?\n";#d#
201 return;#d#
202 }#d#
203
204 # kill coroutine otherwise
205 warn Carp::longmess $_[0];
206 Coro::terminate
207};
208
209$SIG{__DIE__} = sub { }; #d#?
188 210
189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 211@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
190@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 212@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
191@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 213@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
192@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 214@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
205)) { 227)) {
206 no strict 'refs'; 228 no strict 'refs';
207 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 229 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
208} 230}
209 231
210$Event::DIED = sub { 232$EV::DIED = sub {
211 warn "error in event callback: @_"; 233 warn "error in event callback: @_";
212}; 234};
213 235
214############################################################################# 236#############################################################################
215 237
238 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 260 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
239 $d 261 $d
240 } || "[unable to dump $_[0]: '$@']"; 262 } || "[unable to dump $_[0]: '$@']";
241} 263}
242 264
243=item $ref = cf::from_json $json 265=item $ref = cf::decode_json $json
244 266
245Converts a JSON string into the corresponding perl data structure. 267Converts a JSON string into the corresponding perl data structure.
246 268
247=item $json = cf::to_json $ref 269=item $json = cf::encode_json $ref
248 270
249Converts a perl data structure into its JSON representation. 271Converts a perl data structure into its JSON representation.
250 272
251=cut 273=cut
252 274
253our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 275our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
254 276
255sub to_json ($) { $json_coder->encode ($_[0]) } 277sub encode_json($) { $json_coder->encode ($_[0]) }
256sub from_json ($) { $json_coder->decode ($_[0]) } 278sub decode_json($) { $json_coder->decode ($_[0]) }
257 279
258=item cf::lock_wait $string 280=item cf::lock_wait $string
259 281
260Wait until the given lock is available. See cf::lock_acquire. 282Wait until the given lock is available. See cf::lock_acquire.
261 283
264Wait until the given lock is available and then acquires it and returns 286Wait until the given lock is available and then acquires it and returns
265a Coro::guard object. If the guard object gets destroyed (goes out of scope, 287a Coro::guard object. If the guard object gets destroyed (goes out of scope,
266for example when the coroutine gets canceled), the lock is automatically 288for example when the coroutine gets canceled), the lock is automatically
267returned. 289returned.
268 290
291Locks are *not* recursive, locking from the same coro twice results in a
292deadlocked coro.
293
269Lock names should begin with a unique identifier (for example, cf::map::find 294Lock names should begin with a unique identifier (for example, cf::map::find
270uses map_find and cf::map::load uses map_load). 295uses map_find and cf::map::load uses map_load).
271 296
272=item $locked = cf::lock_active $string 297=item $locked = cf::lock_active $string
273 298
274Return true if the lock is currently active, i.e. somebody has locked it. 299Return true if the lock is currently active, i.e. somebody has locked it.
275 300
276=cut 301=cut
277 302
278our %LOCK; 303our %LOCK;
304our %LOCKER;#d#
279 305
280sub lock_wait($) { 306sub lock_wait($) {
281 my ($key) = @_; 307 my ($key) = @_;
308
309 if ($LOCKER{$key} == $Coro::current) {#d#
310 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
311 return;#d#
312 }#d#
282 313
283 # wait for lock, if any 314 # wait for lock, if any
284 while ($LOCK{$key}) { 315 while ($LOCK{$key}) {
285 push @{ $LOCK{$key} }, $Coro::current; 316 push @{ $LOCK{$key} }, $Coro::current;
286 Coro::schedule; 317 Coro::schedule;
292 323
293 # wait, to be sure we are not locked 324 # wait, to be sure we are not locked
294 lock_wait $key; 325 lock_wait $key;
295 326
296 $LOCK{$key} = []; 327 $LOCK{$key} = [];
328 $LOCKER{$key} = $Coro::current;#d#
297 329
298 Coro::guard { 330 Coro::guard {
331 delete $LOCKER{$key};#d#
299 # wake up all waiters, to be on the safe side 332 # wake up all waiters, to be on the safe side
300 $_->ready for @{ delete $LOCK{$key} }; 333 $_->ready for @{ delete $LOCK{$key} };
301 } 334 }
302} 335}
303 336
315 }; 348 };
316 $TICK_WATCHER->stop; 349 $TICK_WATCHER->stop;
317 $guard 350 $guard
318} 351}
319 352
353=item cf::periodic $interval, $cb
354
355Like EV::periodic, but randomly selects a starting point so that the actions
356get spread over timer.
357
358=cut
359
360sub periodic($$) {
361 my ($interval, $cb) = @_;
362
363 my $start = rand List::Util::min 180, $interval;
364
365 EV::periodic $start, $interval, 0, $cb
366}
367
368=item cf::get_slot $time[, $priority[, $name]]
369
370Allocate $time seconds of blocking CPU time at priority C<$priority>:
371This call blocks and returns only when you have at least C<$time> seconds
372of cpu time till the next tick. The slot is only valid till the next cede.
373
374The optional C<$name> can be used to identify the job to run. It might be
375used for statistical purposes and should identify the same time-class.
376
377Useful for short background jobs.
378
379=cut
380
381our @SLOT_QUEUE;
382our $SLOT_QUEUE;
383
384$SLOT_QUEUE->cancel if $SLOT_QUEUE;
385$SLOT_QUEUE = Coro::async {
386 $Coro::current->desc ("timeslot manager");
387
388 my $signal = new Coro::Signal;
389
390 while () {
391 next_job:
392 my $avail = cf::till_tick;
393 if ($avail > 0.01) {
394 for (0 .. $#SLOT_QUEUE) {
395 if ($SLOT_QUEUE[$_][0] < $avail) {
396 my $job = splice @SLOT_QUEUE, $_, 1, ();
397 $job->[2]->send;
398 Coro::cede;
399 goto next_job;
400 }
401 }
402 }
403
404 if (@SLOT_QUEUE) {
405 # we do not use wait_for_tick() as it returns immediately when tick is inactive
406 push @cf::WAIT_FOR_TICK, $signal;
407 $signal->wait;
408 } else {
409 Coro::schedule;
410 }
411 }
412};
413
414sub get_slot($;$$) {
415 my ($time, $pri, $name) = @_;
416
417 $time = $TICK * .6 if $time > $TICK * .6;
418 my $sig = new Coro::Signal;
419
420 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
421 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
422 $SLOT_QUEUE->ready;
423 $sig->wait;
424}
425
320=item cf::async { BLOCK } 426=item cf::async { BLOCK }
321 427
322Currently the same as Coro::async_pool, meaning you cannot use 428Currently the same as Coro::async_pool, meaning you cannot use
323C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 429C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
324thing you are allowed to do is call C<prio> on it. 430thing you are allowed to do is call C<prio> on it.
327 433
328BEGIN { *async = \&Coro::async_pool } 434BEGIN { *async = \&Coro::async_pool }
329 435
330=item cf::sync_job { BLOCK } 436=item cf::sync_job { BLOCK }
331 437
332The design of Crossfire TRT requires that the main coroutine ($Coro::main) 438The design of Deliantra requires that the main coroutine ($Coro::main)
333is always able to handle events or runnable, as Crossfire TRT is only 439is always able to handle events or runnable, as Deliantra is only
334partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 440partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
335acceptable. 441acceptable.
336 442
337If it must be done, put the blocking parts into C<sync_job>. This will run 443If it must be done, put the blocking parts into C<sync_job>. This will run
338the given BLOCK in another coroutine while waiting for the result. The 444the given BLOCK in another coroutine while waiting for the result. The
343 449
344sub sync_job(&) { 450sub sync_job(&) {
345 my ($job) = @_; 451 my ($job) = @_;
346 452
347 if ($Coro::current == $Coro::main) { 453 if ($Coro::current == $Coro::main) {
348 my $time = Event::time; 454 my $time = EV::time;
349 455
350 # this is the main coro, too bad, we have to block 456 # this is the main coro, too bad, we have to block
351 # till the operation succeeds, freezing the server :/ 457 # till the operation succeeds, freezing the server :/
352 458
459 LOG llevError, Carp::longmess "sync job";#d#
460
353 # TODO: use suspend/resume instead 461 # TODO: use suspend/resume instead
354 # (but this is cancel-safe) 462 # (but this is cancel-safe)
355 my $freeze_guard = freeze_mainloop; 463 my $freeze_guard = freeze_mainloop;
356 464
357 my $busy = 1; 465 my $busy = 1;
358 my @res; 466 my @res;
359 467
360 (async { 468 (async {
469 $Coro::current->desc ("sync job coro");
361 @res = eval { $job->() }; 470 @res = eval { $job->() };
362 warn $@ if $@; 471 warn $@ if $@;
363 undef $busy; 472 undef $busy;
364 })->prio (Coro::PRIO_MAX); 473 })->prio (Coro::PRIO_MAX);
365 474
366 while ($busy) { 475 while ($busy) {
367 Coro::cede or Event::one_event; 476 if (Coro::nready) {
477 Coro::cede_notself;
478 } else {
479 EV::loop EV::LOOP_ONESHOT;
368 } 480 }
481 }
369 482
370 $time = Event::time - $time; 483 $time = EV::time - $time;
371 484
372 LOG llevError | logBacktrace, Carp::longmess "long sync job" 485 LOG llevError | logBacktrace, Carp::longmess "long sync job"
373 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 486 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
374 487
375 $tick_start += $time; # do not account sync jobs to server load 488 $tick_start += $time; # do not account sync jobs to server load
405=item fork_call { }, $args 518=item fork_call { }, $args
406 519
407Executes the given code block with the given arguments in a seperate 520Executes the given code block with the given arguments in a seperate
408process, returning the results. Everything must be serialisable with 521process, returning the results. Everything must be serialisable with
409Coro::Storable. May, of course, block. Note that the executed sub may 522Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 523never block itself or use any form of event handling.
411 524
412=cut 525=cut
413 526
414sub fork_call(&@) { 527sub fork_call(&@) {
415 my ($cb, @args) = @_; 528 my ($cb, @args) = @_;
416 529
417# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 530 # we seemingly have to make a local copy of the whole thing,
418# or die "socketpair: $!"; 531 # otherwise perl prematurely frees the stuff :/
419 pipe my $fh1, my $fh2 532 # TODO: investigate and fix (likely this will be rather laborious)
420 or die "pipe: $!";
421 533
422 if (my $pid = fork) { 534 my @res = Coro::Util::fork_eval {
423 close $fh2;
424
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
426 $res = Coro::Storable::thaw $res;
427
428 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
429
430 die $$res unless "ARRAY" eq ref $res;
431
432 return wantarray ? @$res : $res->[-1];
433 } else {
434 reset_signals; 535 reset_signals;
435 local $SIG{__WARN__}; 536 &$cb
436 local $SIG{__DIE__}; 537 }, @args;
437 eval {
438 close $fh1;
439 538
440 my @res = eval { $cb->(@args) }; 539 wantarray ? @res : $res[-1]
441 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
442 };
443
444 warn $@ if $@;
445 _exit 0;
446 }
447} 540}
448 541
449=item $value = cf::db_get $family => $key 542=item $value = cf::db_get $family => $key
450 543
451Returns a single value from the environment database. 544Returns a single value from the environment database.
453=item cf::db_put $family => $key => $value 546=item cf::db_put $family => $key => $value
454 547
455Stores the given C<$value> in the family. It can currently store binary 548Stores the given C<$value> in the family. It can currently store binary
456data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 549data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
457 550
551=item $db = cf::db_table "name"
552
553Create and/or open a new database table. The string must not be "db" and must be unique
554within each server.
555
458=cut 556=cut
557
558sub db_table($) {
559 my ($name) = @_;
560 my $db = BDB::db_create $DB_ENV;
561
562 eval {
563 $db->set_flags (BDB::CHKSUM);
564
565 utf8::encode $name;
566 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
567 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
568 cf::cleanup "db_open(db): $!" if $!;
569 };
570 cf::cleanup "db_open(db): $@" if $@;
571
572 $db
573}
459 574
460our $DB; 575our $DB;
461 576
462sub db_init { 577sub db_init {
463 unless ($DB) {
464 $DB = BDB::db_create $DB_ENV;
465
466 cf::sync_job { 578 cf::sync_job {
467 eval { 579 $DB ||= db_table "db";
468 $DB->set_flags (BDB::CHKSUM);
469
470 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
471 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
472 cf::cleanup "db_open(db): $!" if $!;
473 };
474 cf::cleanup "db_open(db): $@" if $@;
475 };
476 } 580 };
477} 581}
478 582
479sub db_get($$) { 583sub db_get($$) {
480 my $key = "$_[0]/$_[1]"; 584 my $key = "$_[0]/$_[1]";
481 585
531 if (1) { 635 if (1) {
532 $md5 = 636 $md5 =
533 join "\x00", 637 join "\x00",
534 $processversion, 638 $processversion,
535 map { 639 map {
536 Coro::cede; 640 cf::cede_to_tick;
537 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 641 ($src->[$_], Digest::MD5::md5_hex $data[$_])
538 } 0.. $#$src; 642 } 0.. $#$src;
539 643
540 644
541 my $dbmd5 = db_get cache => "$id/md5"; 645 my $dbmd5 = db_get cache => "$id/md5";
585attach callbacks/event handlers (a collection of which is called an "attachment") 689attach callbacks/event handlers (a collection of which is called an "attachment")
586to it. All such attachable objects support the following methods. 690to it. All such attachable objects support the following methods.
587 691
588In the following description, CLASS can be any of C<global>, C<object> 692In the following description, CLASS can be any of C<global>, C<object>
589C<player>, C<client> or C<map> (i.e. the attachable objects in 693C<player>, C<client> or C<map> (i.e. the attachable objects in
590Crossfire TRT). 694Deliantra).
591 695
592=over 4 696=over 4
593 697
594=item $attachable->attach ($attachment, key => $value...) 698=item $attachable->attach ($attachment, key => $value...)
595 699
847 "; 951 ";
848 die if $@; 952 die if $@;
849} 953}
850 954
851our $override; 955our $override;
852our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 956our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
853 957
854sub override { 958sub override {
855 $override = 1; 959 $override = 1;
856 @invoke_results = (); 960 @INVOKE_RESULTS = (@_);
857} 961}
858 962
859sub do_invoke { 963sub do_invoke {
860 my $event = shift; 964 my $event = shift;
861 my $callbacks = shift; 965 my $callbacks = shift;
862 966
863 @invoke_results = (); 967 @INVOKE_RESULTS = ();
864 968
865 local $override; 969 local $override;
866 970
867 for (@$callbacks) { 971 for (@$callbacks) {
868 eval { &{$_->[1]} }; 972 eval { &{$_->[1]} };
877 } 981 }
878 982
879 0 983 0
880} 984}
881 985
882=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 986=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
883 987
884=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 988=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
885 989
886Generate an object-specific event with the given arguments. 990Generate an object-specific event with the given arguments.
887 991
888This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 992This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
889removed in future versions), and there is no public API to access override 993removed in future versions), and there is no public API to access override
890results (if you must, access C<@cf::invoke_results> directly). 994results (if you must, access C<@cf::INVOKE_RESULTS> directly).
891 995
892=back 996=back
893 997
894=cut 998=cut
895 999
896############################################################################# 1000#############################################################################
897# object support 1001# object support
1002
1003sub _object_equal($$);
1004sub _object_equal($$) {
1005 my ($a, $b) = @_;
1006
1007 return 0 unless (ref $a) eq (ref $b);
1008
1009 if ("HASH" eq ref $a) {
1010 my @ka = keys %$a;
1011 my @kb = keys %$b;
1012
1013 return 0 if @ka != @kb;
1014
1015 for (0 .. $#ka) {
1016 return 0 unless $ka[$_] eq $kb[$_];
1017 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1018 }
1019
1020 } elsif ("ARRAY" eq ref $a) {
1021
1022 return 0 if @$a != @$b;
1023
1024 for (0 .. $#$a) {
1025 return 0 unless _object_equal $a->[$_], $b->[$_];
1026 }
1027
1028 } elsif ($a ne $b) {
1029 return 0;
1030 }
1031
1032 1
1033}
1034
1035our $SLOW_MERGES;#d#
1036sub _can_merge {
1037 my ($ob1, $ob2) = @_;
1038
1039 ++$SLOW_MERGES;#d#
1040
1041 # we do the slow way here
1042 return _object_equal $ob1, $ob2
1043}
898 1044
899sub reattach { 1045sub reattach {
900 # basically do the same as instantiate, without calling instantiate 1046 # basically do the same as instantiate, without calling instantiate
901 my ($obj) = @_; 1047 my ($obj) = @_;
902 1048
923cf::attachable->attach ( 1069cf::attachable->attach (
924 prio => -1000000, 1070 prio => -1000000,
925 on_instantiate => sub { 1071 on_instantiate => sub {
926 my ($obj, $data) = @_; 1072 my ($obj, $data) = @_;
927 1073
928 $data = from_json $data; 1074 $data = decode_json $data;
929 1075
930 for (@$data) { 1076 for (@$data) {
931 my ($name, $args) = @$_; 1077 my ($name, $args) = @$_;
932 1078
933 $obj->attach ($name, %{$args || {} }); 1079 $obj->attach ($name, %{$args || {} });
949sub object_freezer_save { 1095sub object_freezer_save {
950 my ($filename, $rdata, $objs) = @_; 1096 my ($filename, $rdata, $objs) = @_;
951 1097
952 sync_job { 1098 sync_job {
953 if (length $$rdata) { 1099 if (length $$rdata) {
1100 utf8::decode (my $decname = $filename);
954 warn sprintf "saving %s (%d,%d)\n", 1101 warn sprintf "saving %s (%d,%d)\n",
955 $filename, length $$rdata, scalar @$objs; 1102 $decname, length $$rdata, scalar @$objs;
956 1103
957 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1104 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
958 chmod SAVE_MODE, $fh; 1105 chmod SAVE_MODE, $fh;
959 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1106 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
960 aio_fsync $fh if $cf::USE_FSYNC; 1107 aio_fsync $fh if $cf::USE_FSYNC;
961 close $fh; 1108 close $fh;
962 1109
963 if (@$objs) { 1110 if (@$objs) {
964 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1111 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
965 chmod SAVE_MODE, $fh; 1112 chmod SAVE_MODE, $fh;
966 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1113 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
967 aio_write $fh, 0, (length $data), $data, 0; 1114 aio_write $fh, 0, (length $data), $data, 0;
968 aio_fsync $fh if $cf::USE_FSYNC; 1115 aio_fsync $fh if $cf::USE_FSYNC;
969 close $fh; 1116 close $fh;
970 aio_rename "$filename.pst~", "$filename.pst"; 1117 aio_rename "$filename.pst~", "$filename.pst";
971 } 1118 }
979 } 1126 }
980 } else { 1127 } else {
981 aio_unlink $filename; 1128 aio_unlink $filename;
982 aio_unlink "$filename.pst"; 1129 aio_unlink "$filename.pst";
983 } 1130 }
984 } 1131 };
985} 1132}
986 1133
987sub object_freezer_as_string { 1134sub object_freezer_as_string {
988 my ($rdata, $objs) = @_; 1135 my ($rdata, $objs) = @_;
989 1136
1001 or return; 1148 or return;
1002 1149
1003 unless (aio_stat "$filename.pst") { 1150 unless (aio_stat "$filename.pst") {
1004 (aio_load "$filename.pst", $av) >= 0 1151 (aio_load "$filename.pst", $av) >= 0
1005 or return; 1152 or return;
1153
1006 $av = eval { (Storable::thaw $av)->{objs} }; 1154 my $st = eval { Coro::Storable::thaw $av };
1155 $av = $st->{objs};
1007 } 1156 }
1008 1157
1158 utf8::decode (my $decname = $filename);
1009 warn sprintf "loading %s (%d)\n", 1159 warn sprintf "loading %s (%d,%d)\n",
1010 $filename, length $data, scalar @{$av || []}; 1160 $decname, length $data, scalar @{$av || []};
1161
1011 return ($data, $av); 1162 ($data, $av)
1012} 1163}
1013 1164
1014=head2 COMMAND CALLBACKS 1165=head2 COMMAND CALLBACKS
1015 1166
1016=over 4 1167=over 4
1089 my ($pl, $buf) = @_; 1240 my ($pl, $buf) = @_;
1090 1241
1091 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1242 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1092 1243
1093 if (ref $msg) { 1244 if (ref $msg) {
1245 my ($type, $reply, @payload) =
1246 "ARRAY" eq ref $msg
1247 ? @$msg
1248 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1249
1250 my @reply;
1251
1094 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1252 if (my $cb = $EXTCMD{$type}) {
1095 if (my %reply = $cb->($pl, $msg)) { 1253 @reply = $cb->($pl, @payload);
1096 $pl->ext_reply ($msg->{msgid}, %reply);
1097 }
1098 } 1254 }
1255
1256 $pl->ext_reply ($reply, @reply)
1257 if $reply;
1258
1099 } else { 1259 } else {
1100 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1260 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1101 } 1261 }
1102 1262
1103 cf::override; 1263 cf::override;
1193 1353
1194=head3 cf::player 1354=head3 cf::player
1195 1355
1196=over 4 1356=over 4
1197 1357
1358=item cf::player::num_playing
1359
1360Returns the official number of playing players, as per the Crossfire metaserver rules.
1361
1362=cut
1363
1364sub num_playing {
1365 scalar grep
1366 $_->ob->map
1367 && !$_->hidden
1368 && !$_->ob->flag (cf::FLAG_WIZ),
1369 cf::player::list
1370}
1371
1198=item cf::player::find $login 1372=item cf::player::find $login
1199 1373
1200Returns the given player object, loading it if necessary (might block). 1374Returns the given player object, loading it if necessary (might block).
1201 1375
1202=cut 1376=cut
1237 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1411 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1238 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1412 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1239 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1413 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1240 aio_unlink +(playerdir $login) . "/$login.pl"; 1414 aio_unlink +(playerdir $login) . "/$login.pl";
1241 1415
1242 my $pl = load_pl path $login 1416 my $f = new_from_file cf::object::thawer path $login
1243 or return; 1417 or return;
1418
1419 my $pl = cf::player::load_pl $f
1420 or return;
1421 local $cf::PLAYER_LOADING{$login} = $pl;
1422 $f->resolve_delayed_derefs;
1244 $cf::PLAYER{$login} = $pl 1423 $cf::PLAYER{$login} = $pl
1245 } 1424 }
1246 } 1425 }
1247} 1426}
1248 1427
1258 1437
1259 aio_mkdir playerdir $pl, 0770; 1438 aio_mkdir playerdir $pl, 0770;
1260 $pl->{last_save} = $cf::RUNTIME; 1439 $pl->{last_save} = $cf::RUNTIME;
1261 1440
1262 $pl->save_pl ($path); 1441 $pl->save_pl ($path);
1263 Coro::cede; 1442 cf::cede_to_tick;
1264} 1443}
1265 1444
1266sub new($) { 1445sub new($) {
1267 my ($login) = @_; 1446 my ($login) = @_;
1268 1447
1272 $self->{deny_save} = 1; 1451 $self->{deny_save} = 1;
1273 1452
1274 $cf::PLAYER{$login} = $self; 1453 $cf::PLAYER{$login} = $self;
1275 1454
1276 $self 1455 $self
1456}
1457
1458=item $player->send_msg ($channel, $msg, $color, [extra...])
1459
1460=cut
1461
1462sub send_msg {
1463 my $ns = shift->ns
1464 or return;
1465 $ns->send_msg (@_);
1277} 1466}
1278 1467
1279=item $pl->quit_character 1468=item $pl->quit_character
1280 1469
1281Nukes the player without looking back. If logged in, the connection will 1470Nukes the player without looking back. If logged in, the connection will
1336 or return []; 1525 or return [];
1337 1526
1338 my @logins; 1527 my @logins;
1339 1528
1340 for my $login (@$dirs) { 1529 for my $login (@$dirs) {
1530 my $path = path $login;
1531
1532 # a .pst is a dead give-away for a valid player
1533 unless (-e "$path.pst") {
1341 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1534 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1342 aio_read $fh, 0, 512, my $buf, 0 or next; 1535 aio_read $fh, 0, 512, my $buf, 0 or next;
1343 $buf !~ /^password -------------$/m or next; # official not-valid tag 1536 $buf !~ /^password -------------$/m or next; # official not-valid tag
1537 }
1344 1538
1345 utf8::decode $login; 1539 utf8::decode $login;
1346 push @logins, $login; 1540 push @logins, $login;
1347 } 1541 }
1348 1542
1381 1575
1382Expand crossfire pod fragments into protocol xml. 1576Expand crossfire pod fragments into protocol xml.
1383 1577
1384=cut 1578=cut
1385 1579
1580use re 'eval';
1581
1582my $group;
1583my $interior; $interior = qr{
1584 # match a pod interior sequence sans C<< >>
1585 (?:
1586 \ (.*?)\ (?{ $group = $^N })
1587 | < (??{$interior}) >
1588 )
1589}x;
1590
1386sub expand_cfpod { 1591sub expand_cfpod {
1387 ((my $self), (local $_)) = @_; 1592 my ($self, $pod) = @_;
1388 1593
1389 # escape & and < 1594 my $xml;
1390 s/&/&amp;/g;
1391 s/(?<![BIUGH])</&lt;/g;
1392 1595
1393 # this is buggy, it needs to properly take care of nested <'s 1596 while () {
1597 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1598 $group = $1;
1394 1599
1395 1 while 1600 $group =~ s/&/&amp;/g;
1396 # replace B<>, I<>, U<> etc. 1601 $group =~ s/</&lt;/g;
1397 s/B<([^\>]*)>/<b>$1<\/b>/ 1602
1398 || s/I<([^\>]*)>/<i>$1<\/i>/ 1603 $xml .= $group;
1399 || s/U<([^\>]*)>/<u>$1<\/u>/ 1604 } elsif ($pod =~ m%\G
1400 # replace G<male|female> tags 1605 ([BCGHITU])
1401 || s{G<([^>|]*)\|([^>]*)>}{ 1606 <
1402 $self->gender ? $2 : $1 1607 (?:
1608 ([^<>]*) (?{ $group = $^N })
1609 | < $interior >
1610 )
1611 >
1612 %gcsx
1613 ) {
1614 my ($code, $data) = ($1, $group);
1615
1616 if ($code eq "B") {
1617 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1618 } elsif ($code eq "I") {
1619 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1620 } elsif ($code eq "U") {
1621 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1622 } elsif ($code eq "C") {
1623 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1624 } elsif ($code eq "T") {
1625 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1626 } elsif ($code eq "G") {
1627 my ($male, $female) = split /\|/, $data;
1628 $data = $self->gender ? $female : $male;
1629 $xml .= expand_cfpod ($self, $data);
1630 } elsif ($code eq "H") {
1631 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1632 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1633 "")
1634 [$self->{hintmode}];
1635 } else {
1636 $xml .= "error processing '$code($data)' directive";
1637 }
1638 } else {
1639 if ($pod =~ /\G(.+)/) {
1640 warn "parse error while expanding $pod (at $1)";
1641 }
1642 last;
1403 }ge 1643 }
1404 # replace H<hint text> 1644 }
1405 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;
1406 1645
1646 for ($xml) {
1407 # create single paragraphs (very hackish) 1647 # create single paragraphs (very hackish)
1408 s/(?<=\S)\n(?=\w)/ /g; 1648 s/(?<=\S)\n(?=\w)/ /g;
1409 1649
1410 $_ 1650 # compress some whitespace
1411} 1651 s/\s+\n/\n/g; # ws line-ends
1652 s/\n\n+/\n/g; # double lines
1653 s/^\n+//; # beginning lines
1654 s/\n+$//; # ending lines
1655 }
1412 1656
1657 $xml
1658}
1659
1660no re 'eval';
1661
1662sub hintmode {
1663 $_[0]{hintmode} = $_[1] if @_ > 1;
1664 $_[0]{hintmode}
1665}
1666
1413=item $player->ext_reply ($msgid, %msg) 1667=item $player->ext_reply ($msgid, @msg)
1414 1668
1415Sends an ext reply to the player. 1669Sends an ext reply to the player.
1416 1670
1417=cut 1671=cut
1418 1672
1419sub ext_reply($$%) { 1673sub ext_reply($$@) {
1420 my ($self, $id, %msg) = @_; 1674 my ($self, $id, @msg) = @_;
1421 1675
1422 $msg{msgid} = $id; 1676 $self->ns->ext_reply ($id, @msg)
1423 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1424} 1677}
1425 1678
1426=item $player->ext_event ($type, %msg) 1679=item $player->ext_msg ($type, @msg)
1427 1680
1428Sends an ext event to the client. 1681Sends an ext event to the client.
1429 1682
1430=cut 1683=cut
1431 1684
1432sub ext_event($$%) { 1685sub ext_msg($$@) {
1433 my ($self, $type, %msg) = @_; 1686 my ($self, $type, @msg) = @_;
1434 1687
1435 $self->ns->ext_event ($type, %msg); 1688 $self->ns->ext_msg ($type, @msg);
1436} 1689}
1437 1690
1438=head3 cf::region 1691=head3 cf::region
1439 1692
1440=over 4 1693=over 4
1453 my ($path) = @_; 1706 my ($path) = @_;
1454 1707
1455 my ($match, $specificity); 1708 my ($match, $specificity);
1456 1709
1457 for my $region (list) { 1710 for my $region (list) {
1458 if ($region->match && $path =~ $region->match) { 1711 if ($region->{match} && $path =~ $region->{match}) {
1459 ($match, $specificity) = ($region, $region->specificity) 1712 ($match, $specificity) = ($region, $region->specificity)
1460 if $region->specificity > $specificity; 1713 if $region->specificity > $specificity;
1461 } 1714 }
1462 } 1715 }
1463 1716
1583 $self->init; # pass $1 etc. 1836 $self->init; # pass $1 etc.
1584 return $self; 1837 return $self;
1585 } 1838 }
1586 } 1839 }
1587 1840
1588 Carp::carp "unable to resolve path '$path' (base '$base')."; 1841 Carp::cluck "unable to resolve path '$path' (base '$base').";
1589 () 1842 ()
1590} 1843}
1591 1844
1592sub init { 1845sub init {
1593 my ($self) = @_; 1846 my ($self) = @_;
1656 1909
1657sub load_header_from($) { 1910sub load_header_from($) {
1658 my ($self, $path) = @_; 1911 my ($self, $path) = @_;
1659 1912
1660 utf8::encode $path; 1913 utf8::encode $path;
1661 #aio_open $path, O_RDONLY, 0 1914 my $f = new_from_file cf::object::thawer $path
1662 # or return;
1663
1664 $self->_load_header ($path)
1665 or return; 1915 or return;
1916
1917 $self->_load_header ($f)
1918 or return;
1919
1920 local $MAP_LOADING{$self->{path}} = $self;
1921 $f->resolve_delayed_derefs;
1666 1922
1667 $self->{load_path} = $path; 1923 $self->{load_path} = $path;
1668 1924
1669 1 1925 1
1670} 1926}
1724sub find { 1980sub find {
1725 my ($path, $origin) = @_; 1981 my ($path, $origin) = @_;
1726 1982
1727 $path = normalise $path, $origin && $origin->path; 1983 $path = normalise $path, $origin && $origin->path;
1728 1984
1985 cf::lock_wait "map_data:$path";#d#remove
1729 cf::lock_wait "map_find:$path"; 1986 cf::lock_wait "map_find:$path";
1730 1987
1731 $cf::MAP{$path} || do { 1988 $cf::MAP{$path} || do {
1732 my $guard = cf::lock_acquire "map_find:$path"; 1989 my $guard1 = cf::lock_acquire "map_find:$path";
1990 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1991
1733 my $map = new_from_path cf::map $path 1992 my $map = new_from_path cf::map $path
1734 or return; 1993 or return;
1735 1994
1736 $map->{last_save} = $cf::RUNTIME; 1995 $map->{last_save} = $cf::RUNTIME;
1737 1996
1739 or return; 1998 or return;
1740 1999
1741 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2000 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1742 # doing this can freeze the server in a sync job, obviously 2001 # doing this can freeze the server in a sync job, obviously
1743 #$cf::WAIT_FOR_TICK->wait; 2002 #$cf::WAIT_FOR_TICK->wait;
2003 undef $guard1;
2004 undef $guard2;
1744 $map->reset; 2005 $map->reset;
1745 undef $guard;
1746 return find $path; 2006 return find $path;
1747 } 2007 }
1748 2008
1749 $cf::MAP{$path} = $map 2009 $cf::MAP{$path} = $map
1750 } 2010 }
1759 local $self->{deny_reset} = 1; # loading can take a long time 2019 local $self->{deny_reset} = 1; # loading can take a long time
1760 2020
1761 my $path = $self->{path}; 2021 my $path = $self->{path};
1762 2022
1763 { 2023 {
1764 my $guard = cf::lock_acquire "map_load:$path"; 2024 my $guard = cf::lock_acquire "map_data:$path";
1765 2025
2026 return unless $self->valid;
1766 return if $self->in_memory != cf::MAP_SWAPPED; 2027 return unless $self->in_memory == cf::MAP_SWAPPED;
1767 2028
1768 $self->in_memory (cf::MAP_LOADING); 2029 $self->in_memory (cf::MAP_LOADING);
1769 2030
1770 $self->alloc; 2031 $self->alloc;
1771 2032
1772 $self->pre_load; 2033 $self->pre_load;
1773 Coro::cede; 2034 cf::cede_to_tick;
1774 2035
2036 my $f = new_from_file cf::object::thawer $self->{load_path};
2037 $f->skip_block;
1775 $self->_load_objects ($self->{load_path}, 1) 2038 $self->_load_objects ($f)
1776 or return; 2039 or return;
1777 2040
1778 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2041 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1779 if delete $self->{load_original}; 2042 if delete $self->{load_original};
1780 2043
1781 if (my $uniq = $self->uniq_path) { 2044 if (my $uniq = $self->uniq_path) {
1782 utf8::encode $uniq; 2045 utf8::encode $uniq;
1783 if (aio_open $uniq, O_RDONLY, 0) { 2046 unless (aio_stat $uniq) {
2047 if (my $f = new_from_file cf::object::thawer $uniq) {
1784 $self->clear_unique_items; 2048 $self->clear_unique_items;
1785 $self->_load_objects ($uniq, 0); 2049 $self->_load_objects ($f);
2050 $f->resolve_delayed_derefs;
2051 }
1786 } 2052 }
1787 } 2053 }
1788 2054
1789 Coro::cede; 2055 $f->resolve_delayed_derefs;
2056
2057 cf::cede_to_tick;
1790 # now do the right thing for maps 2058 # now do the right thing for maps
1791 $self->link_multipart_objects; 2059 $self->link_multipart_objects;
1792 $self->difficulty ($self->estimate_difficulty) 2060 $self->difficulty ($self->estimate_difficulty)
1793 unless $self->difficulty; 2061 unless $self->difficulty;
1794 Coro::cede; 2062 cf::cede_to_tick;
1795 2063
1796 unless ($self->{deny_activate}) { 2064 unless ($self->{deny_activate}) {
1797 $self->decay_objects; 2065 $self->decay_objects;
1798 $self->fix_auto_apply; 2066 $self->fix_auto_apply;
1799 $self->update_buttons; 2067 $self->update_buttons;
1800 Coro::cede; 2068 cf::cede_to_tick;
1801 $self->set_darkness_map; 2069 $self->set_darkness_map;
1802 Coro::cede; 2070 cf::cede_to_tick;
1803 $self->activate; 2071 $self->activate;
1804 } 2072 }
2073
2074 $self->{last_save} = $cf::RUNTIME;
2075 $self->last_access ($cf::RUNTIME);
1805 2076
1806 $self->in_memory (cf::MAP_IN_MEMORY); 2077 $self->in_memory (cf::MAP_IN_MEMORY);
1807 } 2078 }
1808 2079
1809 $self->post_load; 2080 $self->post_load;
1820 2091
1821 $self 2092 $self
1822} 2093}
1823 2094
1824# find and load all maps in the 3x3 area around a map 2095# find and load all maps in the 3x3 area around a map
1825sub load_diag { 2096sub load_neighbours {
1826 my ($map) = @_; 2097 my ($map) = @_;
1827 2098
1828 my @diag; # diagonal neighbours 2099 my @neigh; # diagonal neighbours
1829 2100
1830 for (0 .. 3) { 2101 for (0 .. 3) {
1831 my $neigh = $map->tile_path ($_) 2102 my $neigh = $map->tile_path ($_)
1832 or next; 2103 or next;
1833 $neigh = find $neigh, $map 2104 $neigh = find $neigh, $map
1834 or next; 2105 or next;
1835 $neigh->load; 2106 $neigh->load;
1836 2107
2108 push @neigh,
1837 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2109 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1838 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2110 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1839 } 2111 }
1840 2112
1841 for (@diag) { 2113 for (grep defined $_->[0], @neigh) {
2114 my ($path, $origin) = @$_;
1842 my $neigh = find @$_ 2115 my $neigh = find $path, $origin
1843 or next; 2116 or next;
1844 $neigh->load; 2117 $neigh->load;
1845 } 2118 }
1846} 2119}
1847 2120
1852} 2125}
1853 2126
1854sub do_load_sync { 2127sub do_load_sync {
1855 my ($map) = @_; 2128 my ($map) = @_;
1856 2129
2130 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2131 if $Coro::current == $Coro::main;
2132
1857 cf::sync_job { $map->load }; 2133 cf::sync_job { $map->load };
1858} 2134}
1859 2135
1860our %MAP_PREFETCH; 2136our %MAP_PREFETCH;
1861our $MAP_PREFETCHER = undef; 2137our $MAP_PREFETCHER = undef;
1862 2138
1863sub find_async { 2139sub find_async {
1864 my ($path, $origin) = @_; 2140 my ($path, $origin, $load) = @_;
1865 2141
1866 $path = normalise $path, $origin && $origin->{path}; 2142 $path = normalise $path, $origin && $origin->{path};
1867 2143
1868 if (my $map = $cf::MAP{$path}) { 2144 if (my $map = $cf::MAP{$path}) {
1869 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2145 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1870 } 2146 }
1871 2147
1872 undef $MAP_PREFETCH{$path}; 2148 $MAP_PREFETCH{$path} |= $load;
2149
1873 $MAP_PREFETCHER ||= cf::async { 2150 $MAP_PREFETCHER ||= cf::async {
2151 $Coro::current->{desc} = "map prefetcher";
2152
1874 while (%MAP_PREFETCH) { 2153 while (%MAP_PREFETCH) {
1875 for my $path (keys %MAP_PREFETCH) { 2154 while (my ($k, $v) = each %MAP_PREFETCH) {
1876 my $map = find $path 2155 if (my $map = find $k) {
1877 or next;
1878 $map->load; 2156 $map->load if $v;
2157 }
1879 2158
1880 delete $MAP_PREFETCH{$path}; 2159 delete $MAP_PREFETCH{$k};
1881 } 2160 }
1882 } 2161 }
1883 undef $MAP_PREFETCHER; 2162 undef $MAP_PREFETCHER;
1884 }; 2163 };
1885 $MAP_PREFETCHER->prio (6); 2164 $MAP_PREFETCHER->prio (6);
1888} 2167}
1889 2168
1890sub save { 2169sub save {
1891 my ($self) = @_; 2170 my ($self) = @_;
1892 2171
1893 my $lock = cf::lock_acquire "map_data:" . $self->path; 2172 my $lock = cf::lock_acquire "map_data:$self->{path}";
1894 2173
1895 $self->{last_save} = $cf::RUNTIME; 2174 $self->{last_save} = $cf::RUNTIME;
1896 2175
1897 return unless $self->dirty; 2176 return unless $self->dirty;
1898 2177
1904 return if $self->{deny_save}; 2183 return if $self->{deny_save};
1905 2184
1906 local $self->{last_access} = $self->last_access;#d# 2185 local $self->{last_access} = $self->last_access;#d#
1907 2186
1908 cf::async { 2187 cf::async {
2188 $Coro::current->{desc} = "map player save";
1909 $_->contr->save for $self->players; 2189 $_->contr->save for $self->players;
1910 }; 2190 };
1911 2191
1912 if ($uniq) { 2192 if ($uniq) {
1913 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2193 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1921 my ($self) = @_; 2201 my ($self) = @_;
1922 2202
1923 # save first because save cedes 2203 # save first because save cedes
1924 $self->save; 2204 $self->save;
1925 2205
1926 my $lock = cf::lock_acquire "map_data:" . $self->path; 2206 my $lock = cf::lock_acquire "map_data:$self->{path}";
1927 2207
1928 return if $self->players; 2208 return if $self->players;
1929 return if $self->in_memory != cf::MAP_IN_MEMORY; 2209 return if $self->in_memory != cf::MAP_IN_MEMORY;
1930 return if $self->{deny_save}; 2210 return if $self->{deny_save};
1931 2211
2212 $self->in_memory (cf::MAP_SWAPPED);
2213
2214 $self->deactivate;
2215 $_->clear_links_to ($self) for values %cf::MAP;
1932 $self->clear; 2216 $self->clear;
1933 $self->in_memory (cf::MAP_SWAPPED);
1934} 2217}
1935 2218
1936sub reset_at { 2219sub reset_at {
1937 my ($self) = @_; 2220 my ($self) = @_;
1938 2221
1970 if $uniq; 2253 if $uniq;
1971 } 2254 }
1972 2255
1973 delete $cf::MAP{$self->path}; 2256 delete $cf::MAP{$self->path};
1974 2257
2258 $self->deactivate;
2259 $_->clear_links_to ($self) for values %cf::MAP;
1975 $self->clear; 2260 $self->clear;
1976
1977 $_->clear_links_to ($self) for values %cf::MAP;
1978 2261
1979 $self->unlink_save; 2262 $self->unlink_save;
1980 $self->destroy; 2263 $self->destroy;
1981} 2264}
1982 2265
1983my $nuke_counter = "aaaa"; 2266my $nuke_counter = "aaaa";
1984 2267
1985sub nuke { 2268sub nuke {
1986 my ($self) = @_; 2269 my ($self) = @_;
1987 2270
2271 {
2272 my $lock = cf::lock_acquire "map_data:$self->{path}";
2273
1988 delete $cf::MAP{$self->path}; 2274 delete $cf::MAP{$self->path};
1989 2275
1990 $self->unlink_save; 2276 $self->unlink_save;
1991 2277
1992 bless $self, "cf::map"; 2278 bless $self, "cf::map";
1993 delete $self->{deny_reset}; 2279 delete $self->{deny_reset};
1994 $self->{deny_save} = 1; 2280 $self->{deny_save} = 1;
1995 $self->reset_timeout (1); 2281 $self->reset_timeout (1);
1996 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2282 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1997 2283
1998 $cf::MAP{$self->path} = $self; 2284 $cf::MAP{$self->path} = $self;
2285 }
1999 2286
2000 $self->reset; # polite request, might not happen 2287 $self->reset; # polite request, might not happen
2001} 2288}
2002 2289
2003=item $maps = cf::map::tmp_maps 2290=item $maps = cf::map::tmp_maps
2079 2366
2080sub inv_recursive { 2367sub inv_recursive {
2081 inv_recursive_ inv $_[0] 2368 inv_recursive_ inv $_[0]
2082} 2369}
2083 2370
2371=item $ref = $ob->ref
2372
2373creates and returns a persistent reference to an objetc that can be stored as a string.
2374
2375=item $ob = cf::object::deref ($refstring)
2376
2377returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2378even if the object actually exists. May block.
2379
2380=cut
2381
2382sub deref {
2383 my ($ref) = @_;
2384
2385 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2386 my ($uuid, $name) = ($1, $2);
2387 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2388 or return;
2389 $pl->ob->uuid eq $uuid
2390 or return;
2391
2392 $pl->ob
2393 } else {
2394 warn "$ref: cannot resolve object reference\n";
2395 undef
2396 }
2397}
2398
2084package cf; 2399package cf;
2085 2400
2086=back 2401=back
2087 2402
2088=head3 cf::object::player 2403=head3 cf::object::player
2110 2425
2111 } else { 2426 } else {
2112 my $pl = $self->contr; 2427 my $pl = $self->contr;
2113 2428
2114 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2429 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2115 my $diag = $pl->{npc_dialog}; 2430 my $dialog = $pl->{npc_dialog};
2116 $diag->{pl}->ext_reply ( 2431 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2117 $diag->{id},
2118 msgtype => "reply",
2119 msg => $diag->{pl}->expand_cfpod ($msg),
2120 add_topics => []
2121 );
2122 2432
2123 } else { 2433 } else {
2124 $msg = $npc->name . " says: $msg" if $npc; 2434 $msg = $npc->name . " says: $msg" if $npc;
2125 $self->message ($msg, $flags); 2435 $self->message ($msg, $flags);
2126 } 2436 }
2127 } 2437 }
2438}
2439
2440=item $object->send_msg ($channel, $msg, $color, [extra...])
2441
2442=cut
2443
2444sub cf::object::send_msg {
2445 my $pl = shift->contr
2446 or return;
2447 $pl->send_msg (@_);
2128} 2448}
2129 2449
2130=item $player_object->may ("access") 2450=item $player_object->may ("access")
2131 2451
2132Returns wether the given player is authorized to access resource "access" 2452Returns wether the given player is authorized to access resource "access"
2211 # use -1 or undef as default coordinates, not 0, 0 2531 # use -1 or undef as default coordinates, not 0, 0
2212 ($x, $y) = ($map->enter_x, $map->enter_y) 2532 ($x, $y) = ($map->enter_x, $map->enter_y)
2213 if $x <=0 && $y <= 0; 2533 if $x <=0 && $y <= 0;
2214 2534
2215 $map->load; 2535 $map->load;
2216 $map->load_diag; 2536 $map->load_neighbours;
2217 2537
2218 return unless $self->contr->active; 2538 return unless $self->contr->active;
2219 $self->activate_recursive; 2539 $self->activate_recursive;
2220 2540
2221 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2541 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2222 $self->enter_map ($map, $x, $y); 2542 $self->enter_map ($map, $x, $y);
2223} 2543}
2224 2544
2225=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2545=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2226 2546
2227Moves the player to the given map-path and coordinates by first freezing 2547Moves the player to the given map-path and coordinates by first freezing
2228her, loading and preparing them map, calling the provided $check callback 2548her, loading and preparing them map, calling the provided $check callback
2229that has to return the map if sucecssful, and then unfreezes the player on 2549that has to return the map if sucecssful, and then unfreezes the player on
2230the new (success) or old (failed) map position. 2550the new (success) or old (failed) map position. In either case, $done will
2551be called at the end of this process.
2231 2552
2232=cut 2553=cut
2233 2554
2234our $GOTOGEN; 2555our $GOTOGEN;
2235 2556
2236sub cf::object::player::goto { 2557sub cf::object::player::goto {
2237 my ($self, $path, $x, $y, $check) = @_; 2558 my ($self, $path, $x, $y, $check, $done) = @_;
2238 2559
2239 # do generation counting so two concurrent goto's will be executed in-order 2560 # do generation counting so two concurrent goto's will be executed in-order
2240 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2561 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2241 2562
2242 $self->enter_link; 2563 $self->enter_link;
2243 2564
2244 (async { 2565 (async {
2566 $Coro::current->{desc} = "player::goto $path $x $y";
2567
2568 # *tag paths override both path and x|y
2569 if ($path =~ /^\*(.*)$/) {
2570 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2571 my $ob = $obs[rand @obs];
2572
2573 # see if we actually can go there
2574 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2575 $ob = $obs[rand @obs];
2576 } else {
2577 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2578 }
2579 # else put us there anyways for now #d#
2580
2581 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2582 } else {
2583 ($path, $x, $y) = (undef, undef, undef);
2584 }
2585 }
2586
2245 my $map = eval { 2587 my $map = eval {
2246 my $map = cf::map::find $path; 2588 my $map = defined $path ? cf::map::find $path : undef;
2247 2589
2248 if ($map) { 2590 if ($map) {
2249 $map = $map->customise_for ($self); 2591 $map = $map->customise_for ($self);
2250 $map = $check->($map) if $check && $map; 2592 $map = $check->($map) if $check && $map;
2251 } else { 2593 } else {
2252 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2594 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2253 } 2595 }
2254 2596
2255 $map 2597 $map
2256 }; 2598 };
2257 2599
2262 2604
2263 if ($gen == $self->{_goto_generation}) { 2605 if ($gen == $self->{_goto_generation}) {
2264 delete $self->{_goto_generation}; 2606 delete $self->{_goto_generation};
2265 $self->leave_link ($map, $x, $y); 2607 $self->leave_link ($map, $x, $y);
2266 } 2608 }
2609
2610 $done->() if $done;
2267 })->prio (1); 2611 })->prio (1);
2268} 2612}
2269 2613
2270=item $player_object->enter_exit ($exit_object) 2614=item $player_object->enter_exit ($exit_object)
2271 2615
2308 $rmp->{origin_y} = $exit->y; 2652 $rmp->{origin_y} = $exit->y;
2309 } 2653 }
2310 2654
2311 $rmp->{random_seed} ||= $exit->random_seed; 2655 $rmp->{random_seed} ||= $exit->random_seed;
2312 2656
2313 my $data = cf::to_json $rmp; 2657 my $data = cf::encode_json $rmp;
2314 my $md5 = Digest::MD5::md5_hex $data; 2658 my $md5 = Digest::MD5::md5_hex $data;
2315 my $meta = "$RANDOMDIR/$md5.meta"; 2659 my $meta = "$RANDOMDIR/$md5.meta";
2316 2660
2317 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2661 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2318 aio_write $fh, 0, (length $data), $data, 0; 2662 aio_write $fh, 0, (length $data), $data, 0;
2340 my $hp = $exit->stats->hp; 2684 my $hp = $exit->stats->hp;
2341 my $sp = $exit->stats->sp; 2685 my $sp = $exit->stats->sp;
2342 2686
2343 $self->enter_link; 2687 $self->enter_link;
2344 2688
2689 # if exit is damned, update players death & WoR home-position
2690 $self->contr->savebed ($slaying, $hp, $sp)
2691 if $exit->flag (FLAG_DAMNED);
2692
2345 (async { 2693 (async {
2694 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2695
2346 $self->deactivate_recursive; # just to be sure 2696 $self->deactivate_recursive; # just to be sure
2347 unless (eval { 2697 unless (eval {
2348 $self->goto ($slaying, $hp, $sp); 2698 $self->goto ($slaying, $hp, $sp);
2349 2699
2350 1; 2700 1;
2376 2726
2377 utf8::encode $text; 2727 utf8::encode $text;
2378 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2728 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2379} 2729}
2380 2730
2381=item $client->send_msg ($color, $type, $msg, [extra...]) 2731=item $client->send_msg ($channel, $msg, $color, [extra...])
2382 2732
2383Send a drawinfo or msg packet to the client, formatting the msg for the 2733Send a drawinfo or msg packet to the client, formatting the msg for the
2384client if neccessary. C<$type> should be a string identifying the type of 2734client if neccessary. C<$type> should be a string identifying the type of
2385the message, with C<log> being the default. If C<$color> is negative, suppress 2735the message, with C<log> being the default. If C<$color> is negative, suppress
2386the message unless the client supports the msg packet. 2736the message unless the client supports the msg packet.
2387 2737
2388=cut 2738=cut
2389 2739
2740# non-persistent channels (usually the info channel)
2741our %CHANNEL = (
2742 "c/identify" => {
2743 id => "infobox",
2744 title => "Identify",
2745 reply => undef,
2746 tooltip => "Items recently identified",
2747 },
2748 "c/examine" => {
2749 id => "infobox",
2750 title => "Examine",
2751 reply => undef,
2752 tooltip => "Signs and other items you examined",
2753 },
2754 "c/book" => {
2755 id => "infobox",
2756 title => "Book",
2757 reply => undef,
2758 tooltip => "The contents of a note or book",
2759 },
2760 "c/lookat" => {
2761 id => "infobox",
2762 title => "Look",
2763 reply => undef,
2764 tooltip => "What you saw there",
2765 },
2766 "c/who" => {
2767 id => "infobox",
2768 title => "Players",
2769 reply => undef,
2770 tooltip => "Shows players who are currently online",
2771 },
2772 "c/body" => {
2773 id => "infobox",
2774 title => "Body Parts",
2775 reply => undef,
2776 tooltip => "Shows which body parts you posess and are available",
2777 },
2778 "c/uptime" => {
2779 id => "infobox",
2780 title => "Uptime",
2781 reply => undef,
2782 tooltip => "How long the server has been running since last restart",
2783 },
2784 "c/mapinfo" => {
2785 id => "infobox",
2786 title => "Map Info",
2787 reply => undef,
2788 tooltip => "Information related to the maps",
2789 },
2790);
2791
2390sub cf::client::send_msg { 2792sub cf::client::send_msg {
2391 my ($self, $color, $type, $msg, @extra) = @_; 2793 my ($self, $channel, $msg, $color, @extra) = @_;
2392 2794
2393 $msg = $self->pl->expand_cfpod ($msg); 2795 $msg = $self->pl->expand_cfpod ($msg);
2394 2796
2797 $color &= cf::NDI_CLIENT_MASK; # just in case...
2798
2799 # check predefined channels, for the benefit of C
2800 if ($CHANNEL{$channel}) {
2801 $channel = $CHANNEL{$channel};
2802
2803 $self->ext_msg (channel_info => $channel)
2804 if $self->can_msg;
2805
2806 $channel = $channel->{id};
2807
2808 } elsif (ref $channel) {
2809 # send meta info to client, if not yet sent
2810 unless (exists $self->{channel}{$channel->{id}}) {
2811 $self->{channel}{$channel->{id}} = $channel;
2812 $self->ext_msg (channel_info => $channel)
2813 if $self->can_msg;
2814 }
2815
2816 $channel = $channel->{id};
2817 }
2818
2819 return unless @extra || length $msg;
2820
2395 if ($self->can_msg) { 2821 if ($self->can_msg) {
2822 # default colour, mask it out
2823 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2824 if $color & cf::NDI_DEF;
2825
2396 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2826 $self->send_packet ("msg " . $self->{json_coder}->encode (
2827 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2397 } else { 2828 } else {
2398 # replace some tags by gcfclient-compatible ones
2399 for ($msg) {
2400 1 while
2401 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2402 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2403 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2404 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2405 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2406 }
2407
2408 if ($color >= 0) { 2829 if ($color >= 0) {
2830 # replace some tags by gcfclient-compatible ones
2831 for ($msg) {
2832 1 while
2833 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2834 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2835 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2836 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2837 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2838 }
2839
2840 $color &= cf::NDI_COLOR_MASK;
2841
2842 utf8::encode $msg;
2843
2409 if (0 && $msg =~ /\[/) { 2844 if (0 && $msg =~ /\[/) {
2845 # COMMAND/INFO
2410 $self->send_packet ("drawextinfo $color 4 0 $msg") 2846 $self->send_packet ("drawextinfo $color 10 8 $msg")
2411 } else { 2847 } else {
2412 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2848 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2413 $self->send_packet ("drawinfo $color $msg") 2849 $self->send_packet ("drawinfo $color $msg")
2414 } 2850 }
2415 } 2851 }
2416 } 2852 }
2417} 2853}
2418 2854
2419=item $client->ext_event ($type, %msg) 2855=item $client->ext_msg ($type, @msg)
2420 2856
2421Sends an ext event to the client. 2857Sends an ext event to the client.
2422 2858
2423=cut 2859=cut
2424 2860
2425sub cf::client::ext_event($$%) { 2861sub cf::client::ext_msg($$@) {
2426 my ($self, $type, %msg) = @_; 2862 my ($self, $type, @msg) = @_;
2427 2863
2864 if ($self->extcmd == 2) {
2865 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2866 } elsif ($self->extcmd == 1) { # TODO: remove
2428 $msg{msgtype} = "event_$type"; 2867 push @msg, msgtype => "event_$type";
2429 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2868 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2869 }
2870}
2871
2872=item $client->ext_reply ($msgid, @msg)
2873
2874Sends an ext reply to the client.
2875
2876=cut
2877
2878sub cf::client::ext_reply($$@) {
2879 my ($self, $id, @msg) = @_;
2880
2881 if ($self->extcmd == 2) {
2882 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2883 } elsif ($self->extcmd == 1) {
2884 #TODO: version 1, remove
2885 unshift @msg, msgtype => "reply", msgid => $id;
2886 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2887 }
2430} 2888}
2431 2889
2432=item $success = $client->query ($flags, "text", \&cb) 2890=item $success = $client->query ($flags, "text", \&cb)
2433 2891
2434Queues a query to the client, calling the given callback with 2892Queues a query to the client, calling the given callback with
2489 my ($ns, $buf) = @_; 2947 my ($ns, $buf) = @_;
2490 2948
2491 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2949 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2492 2950
2493 if (ref $msg) { 2951 if (ref $msg) {
2952 my ($type, $reply, @payload) =
2953 "ARRAY" eq ref $msg
2954 ? @$msg
2955 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2956
2957 my @reply;
2958
2494 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2959 if (my $cb = $EXTICMD{$type}) {
2495 if (my %reply = $cb->($ns, $msg)) { 2960 @reply = $cb->($ns, @payload);
2496 $reply{msgid} = $msg->{msgid};
2497 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2498 }
2499 } 2961 }
2962
2963 $ns->ext_reply ($reply, @reply)
2964 if $reply;
2965
2500 } else { 2966 } else {
2501 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2967 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2502 } 2968 }
2503 2969
2504 cf::override; 2970 cf::override;
2551our $safe = new Safe "safe"; 3017our $safe = new Safe "safe";
2552our $safe_hole = new Safe::Hole; 3018our $safe_hole = new Safe::Hole;
2553 3019
2554$SIG{FPE} = 'IGNORE'; 3020$SIG{FPE} = 'IGNORE';
2555 3021
2556$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3022$safe->permit_only (Opcode::opset qw(
3023 :base_core :base_mem :base_orig :base_math
3024 grepstart grepwhile mapstart mapwhile
3025 sort time
3026));
2557 3027
2558# here we export the classes and methods available to script code 3028# here we export the classes and methods available to script code
2559 3029
2560=pod 3030=pod
2561 3031
2562The following functions and methods are available within a safe environment: 3032The following functions and methods are available within a safe environment:
2563 3033
2564 cf::object contr pay_amount pay_player map 3034 cf::object
3035 contr pay_amount pay_player map x y force_find force_add destroy
3036 insert remove name archname title slaying race decrease_ob_nr
3037
2565 cf::object::player player 3038 cf::object::player
2566 cf::player peaceful 3039 player
2567 cf::map trigger 3040
3041 cf::player
3042 peaceful
3043
3044 cf::map
3045 trigger
2568 3046
2569=cut 3047=cut
2570 3048
2571for ( 3049for (
2572 ["cf::object" => qw(contr pay_amount pay_player map)], 3050 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3051 insert remove inv name archname title slaying race
3052 decrease_ob_nr destroy)],
2573 ["cf::object::player" => qw(player)], 3053 ["cf::object::player" => qw(player)],
2574 ["cf::player" => qw(peaceful)], 3054 ["cf::player" => qw(peaceful)],
2575 ["cf::map" => qw(trigger)], 3055 ["cf::map" => qw(trigger)],
2576) { 3056) {
2577 no strict 'refs'; 3057 no strict 'refs';
2653# the server's init and main functions 3133# the server's init and main functions
2654 3134
2655sub load_facedata($) { 3135sub load_facedata($) {
2656 my ($path) = @_; 3136 my ($path) = @_;
2657 3137
3138 # HACK to clear player env face cache, we need some signal framework
3139 # for this (global event?)
3140 %ext::player_env::MUSIC_FACE_CACHE = ();
3141
3142 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3143
2658 warn "loading facedata from $path\n"; 3144 warn "loading facedata from $path\n";
2659 3145
2660 my $facedata; 3146 my $facedata;
2661 0 < aio_load $path, $facedata 3147 0 < aio_load $path, $facedata
2662 or die "$path: $!"; 3148 or die "$path: $!";
2664 $facedata = Coro::Storable::thaw $facedata; 3150 $facedata = Coro::Storable::thaw $facedata;
2665 3151
2666 $facedata->{version} == 2 3152 $facedata->{version} == 2
2667 or cf::cleanup "$path: version mismatch, cannot proceed."; 3153 or cf::cleanup "$path: version mismatch, cannot proceed.";
2668 3154
3155 # patch in the exptable
3156 $facedata->{resource}{"res/exp_table"} = {
3157 type => FT_RSRC,
3158 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3159 };
3160 cf::cede_to_tick;
3161
2669 { 3162 {
2670 my $faces = $facedata->{faceinfo}; 3163 my $faces = $facedata->{faceinfo};
2671 3164
2672 while (my ($face, $info) = each %$faces) { 3165 while (my ($face, $info) = each %$faces) {
2673 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3166 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3167
2674 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3168 cf::face::set_visibility $idx, $info->{visibility};
3169 cf::face::set_magicmap $idx, $info->{magicmap};
2675 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3170 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2676 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3171 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2677 Coro::cede; 3172
3173 cf::cede_to_tick;
2678 } 3174 }
2679 3175
2680 while (my ($face, $info) = each %$faces) { 3176 while (my ($face, $info) = each %$faces) {
2681 next unless $info->{smooth}; 3177 next unless $info->{smooth};
3178
2682 my $idx = cf::face::find $face 3179 my $idx = cf::face::find $face
2683 or next; 3180 or next;
3181
2684 if (my $smooth = cf::face::find $info->{smooth}) { 3182 if (my $smooth = cf::face::find $info->{smooth}) {
3183 cf::face::set_smooth $idx, $smooth;
2685 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3184 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2686 } else { 3185 } else {
2687 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3186 warn "smooth face '$info->{smooth}' not found for face '$face'";
2688 } 3187 }
2689 Coro::cede; 3188
3189 cf::cede_to_tick;
2690 } 3190 }
2691 } 3191 }
2692 3192
2693 { 3193 {
2694 my $anims = $facedata->{animinfo}; 3194 my $anims = $facedata->{animinfo};
2695 3195
2696 while (my ($anim, $info) = each %$anims) { 3196 while (my ($anim, $info) = each %$anims) {
2697 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3197 cf::anim::set $anim, $info->{frames}, $info->{facings};
2698 Coro::cede; 3198 cf::cede_to_tick;
2699 } 3199 }
2700 3200
2701 cf::anim::invalidate_all; # d'oh 3201 cf::anim::invalidate_all; # d'oh
2702 } 3202 }
2703 3203
3204 {
3205 # TODO: for gcfclient pleasure, we should give resources
3206 # that gcfclient doesn't grok a >10000 face index.
3207 my $res = $facedata->{resource};
3208
3209 while (my ($name, $info) = each %$res) {
3210 if (defined $info->{type}) {
3211 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3212 my $data;
3213
3214 if ($info->{type} & 1) {
3215 # prepend meta info
3216
3217 my $meta = $enc->encode ({
3218 name => $name,
3219 %{ $info->{meta} || {} },
3220 });
3221
3222 $data = pack "(w/a*)*", $meta, $info->{data};
3223 } else {
3224 $data = $info->{data};
3225 }
3226
3227 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3228 cf::face::set_type $idx, $info->{type};
3229 } else {
3230 $RESOURCE{$name} = $info;
3231 }
3232
3233 cf::cede_to_tick;
3234 }
3235 }
3236
3237 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3238
2704 1 3239 1
2705} 3240}
2706 3241
3242cf::global->attach (on_resource_update => sub {
3243 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3244 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3245
3246 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3247 my $sound = $soundconf->{compat}[$_]
3248 or next;
3249
3250 my $face = cf::face::find "sound/$sound->[1]";
3251 cf::sound::set $sound->[0] => $face;
3252 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3253 }
3254
3255 while (my ($k, $v) = each %{$soundconf->{event}}) {
3256 my $face = cf::face::find "sound/$v";
3257 cf::sound::set $k => $face;
3258 }
3259 }
3260});
3261
3262register_exticmd fx_want => sub {
3263 my ($ns, $want) = @_;
3264
3265 while (my ($k, $v) = each %$want) {
3266 $ns->fx_want ($k, $v);
3267 }
3268};
3269
2707sub reload_regions { 3270sub reload_regions {
3271 # HACK to clear player env face cache, we need some signal framework
3272 # for this (global event?)
3273 %ext::player_env::MUSIC_FACE_CACHE = ();
3274
2708 load_resource_file "$MAPDIR/regions" 3275 load_resource_file "$MAPDIR/regions"
2709 or die "unable to load regions file\n"; 3276 or die "unable to load regions file\n";
3277
3278 for (cf::region::list) {
3279 $_->{match} = qr/$_->{match}/
3280 if exists $_->{match};
3281 }
2710} 3282}
2711 3283
2712sub reload_facedata { 3284sub reload_facedata {
2713 load_facedata "$DATADIR/facedata" 3285 load_facedata "$DATADIR/facedata"
2714 or die "unable to load facedata\n"; 3286 or die "unable to load facedata\n";
2743 3315
2744sub init { 3316sub init {
2745 reload_resources; 3317 reload_resources;
2746} 3318}
2747 3319
2748sub cfg_load { 3320sub reload_config {
2749 open my $fh, "<:utf8", "$CONFDIR/config" 3321 open my $fh, "<:utf8", "$CONFDIR/config"
2750 or return; 3322 or return;
2751 3323
2752 local $/; 3324 local $/;
2753 *CFG = YAML::Syck::Load <$fh>; 3325 *CFG = YAML::Load <$fh>;
2754 3326
2755 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3327 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2756 3328
2757 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3329 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2758 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3330 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2769sub main { 3341sub main {
2770 # we must not ever block the main coroutine 3342 # we must not ever block the main coroutine
2771 local $Coro::idle = sub { 3343 local $Coro::idle = sub {
2772 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3344 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2773 (async { 3345 (async {
2774 Event::one_event; 3346 $Coro::current->{desc} = "IDLE BUG HANDLER";
3347 EV::loop EV::LOOP_ONESHOT;
2775 })->prio (Coro::PRIO_MAX); 3348 })->prio (Coro::PRIO_MAX);
2776 }; 3349 };
2777 3350
2778 cfg_load; 3351 reload_config;
2779 db_init; 3352 db_init;
2780 load_extensions; 3353 load_extensions;
2781 3354
2782 $TICK_WATCHER->start; 3355 $TICK_WATCHER->start;
3356 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
2783 Event::loop; 3357 EV::loop;
2784} 3358}
2785 3359
2786############################################################################# 3360#############################################################################
2787# initialisation and cleanup 3361# initialisation and cleanup
2788 3362
2789# install some emergency cleanup handlers 3363# install some emergency cleanup handlers
2790BEGIN { 3364BEGIN {
3365 our %SIGWATCHER = ();
2791 for my $signal (qw(INT HUP TERM)) { 3366 for my $signal (qw(INT HUP TERM)) {
2792 Event->signal ( 3367 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2793 reentrant => 0,
2794 data => WF_AUTOCANCEL,
2795 signal => $signal,
2796 prio => 0,
2797 cb => sub {
2798 cf::cleanup "SIG$signal"; 3368 cf::cleanup "SIG$signal";
2799 },
2800 ); 3369 };
2801 } 3370 }
2802} 3371}
2803 3372
2804sub write_runtime { 3373sub write_runtime {
2805 my $runtime = "$LOCALDIR/runtime"; 3374 my $runtime = "$LOCALDIR/runtime";
2850 # and maps saved/destroyed asynchronously. 3419 # and maps saved/destroyed asynchronously.
2851 warn "begin emergency player save\n"; 3420 warn "begin emergency player save\n";
2852 for my $login (keys %cf::PLAYER) { 3421 for my $login (keys %cf::PLAYER) {
2853 my $pl = $cf::PLAYER{$login} or next; 3422 my $pl = $cf::PLAYER{$login} or next;
2854 $pl->valid or next; 3423 $pl->valid or next;
3424 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2855 $pl->save; 3425 $pl->save;
2856 } 3426 }
2857 warn "end emergency player save\n"; 3427 warn "end emergency player save\n";
2858 3428
2859 warn "begin emergency map save\n"; 3429 warn "begin emergency map save\n";
2898 warn "syncing database to disk"; 3468 warn "syncing database to disk";
2899 BDB::db_env_txn_checkpoint $DB_ENV; 3469 BDB::db_env_txn_checkpoint $DB_ENV;
2900 3470
2901 # if anything goes wrong in here, we should simply crash as we already saved 3471 # if anything goes wrong in here, we should simply crash as we already saved
2902 3472
2903 warn "cancelling all WF_AUTOCANCEL watchers";
2904 for (Event::all_watchers) {
2905 $_->cancel if $_->data & WF_AUTOCANCEL;
2906 }
2907
2908 warn "flushing outstanding aio requests"; 3473 warn "flushing outstanding aio requests";
2909 for (;;) { 3474 for (;;) {
2910 BDB::flush; 3475 BDB::flush;
2911 IO::AIO::flush; 3476 IO::AIO::flush;
2912 Coro::cede; 3477 Coro::cede_notself;
2913 last unless IO::AIO::nreqs || BDB::nreqs; 3478 last unless IO::AIO::nreqs || BDB::nreqs;
2914 warn "iterate..."; 3479 warn "iterate...";
2915 } 3480 }
2916 3481
2917 ++$RELOAD; 3482 ++$RELOAD;
2976 warn "reloading cf.pm"; 3541 warn "reloading cf.pm";
2977 require cf; 3542 require cf;
2978 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3543 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2979 3544
2980 warn "loading config and database again"; 3545 warn "loading config and database again";
2981 cf::cfg_load; 3546 cf::reload_config;
2982 3547
2983 warn "loading extensions"; 3548 warn "loading extensions";
2984 cf::load_extensions; 3549 cf::load_extensions;
2985 3550
2986 warn "reattaching attachments to objects/players"; 3551 warn "reattaching attachments to objects/players";
3006 3571
3007sub reload_perl() { 3572sub reload_perl() {
3008 # doing reload synchronously and two reloads happen back-to-back, 3573 # doing reload synchronously and two reloads happen back-to-back,
3009 # coro crashes during coro_state_free->destroy here. 3574 # coro crashes during coro_state_free->destroy here.
3010 3575
3011 $RELOAD_WATCHER ||= Event->timer ( 3576 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3012 reentrant => 0,
3013 after => 0,
3014 data => WF_AUTOCANCEL,
3015 cb => sub {
3016 do_reload_perl; 3577 do_reload_perl;
3017 undef $RELOAD_WATCHER; 3578 undef $RELOAD_WATCHER;
3018 },
3019 ); 3579 };
3020} 3580}
3021 3581
3022register_command "reload" => sub { 3582register_command "reload" => sub {
3023 my ($who, $arg) = @_; 3583 my ($who, $arg) = @_;
3024 3584
3025 if ($who->flag (FLAG_WIZ)) { 3585 if ($who->flag (FLAG_WIZ)) {
3026 $who->message ("reloading server."); 3586 $who->message ("reloading server.");
3587 async {
3588 $Coro::current->{desc} = "perl_reload";
3027 async { reload_perl }; 3589 reload_perl;
3590 };
3028 } 3591 }
3029}; 3592};
3030 3593
3031unshift @INC, $LIBDIR; 3594unshift @INC, $LIBDIR;
3032 3595
3051 my $signal = new Coro::Signal; 3614 my $signal = new Coro::Signal;
3052 push @WAIT_FOR_TICK_BEGIN, $signal; 3615 push @WAIT_FOR_TICK_BEGIN, $signal;
3053 $signal->wait; 3616 $signal->wait;
3054} 3617}
3055 3618
3056 my $min = 1e6;#d# 3619$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3057 my $avg = 10;
3058$TICK_WATCHER = Event->timer (
3059 reentrant => 0,
3060 parked => 1,
3061 prio => 0,
3062 at => $NEXT_TICK || $TICK,
3063 data => WF_AUTOCANCEL,
3064 cb => sub {
3065 if ($Coro::current != $Coro::main) { 3620 if ($Coro::current != $Coro::main) {
3066 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3621 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3067 unless ++$bug_warning > 10; 3622 unless ++$bug_warning > 10;
3068 return; 3623 return;
3069 } 3624 }
3070 3625
3071 $NOW = $tick_start = Event::time; 3626 $NOW = $tick_start = EV::now;
3072 3627
3073 cf::server_tick; # one server iteration 3628 cf::server_tick; # one server iteration
3074 3629
3075 0 && sync_job {#d# 3630 $RUNTIME += $TICK;
3076 for(1..10) { 3631 $NEXT_TICK = $_[0]->at;
3077 my $t = Event::time;
3078 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3079 or die;
3080 3632
3081 $map->width (50); 3633 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3082 $map->height (50); 3634 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3083 $map->alloc; 3635 Coro::async_pool {
3084 $map->_load_objects ("/tmp/x.map", 1); 3636 $Coro::current->{desc} = "runtime saver";
3085 my $t = Event::time - $t; 3637 write_runtime
3086 3638 or warn "ERROR: unable to write runtime file: $!";
3087 #next unless $t < 0.0013;#d#
3088 if ($t < $min) {
3089 $min = $t;
3090 }
3091 $avg = $avg * 0.99 + $t * 0.01;
3092 }
3093 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3094 exit 0;
3095 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3096 }; 3639 };
3640 }
3097 3641
3098 $RUNTIME += $TICK;
3099 $NEXT_TICK += $TICK;
3100
3101 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3102 $NEXT_RUNTIME_WRITE = $NOW + 10;
3103 Coro::async_pool {
3104 write_runtime
3105 or warn "ERROR: unable to write runtime file: $!";
3106 };
3107 }
3108
3109# my $AFTER = Event::time;
3110# warn $AFTER - $NOW;#d#
3111
3112 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3642 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3113 $sig->send; 3643 $sig->send;
3114 } 3644 }
3115 while (my $sig = shift @WAIT_FOR_TICK) { 3645 while (my $sig = shift @WAIT_FOR_TICK) {
3116 $sig->send; 3646 $sig->send;
3117 } 3647 }
3118 3648
3119 $NOW = Event::time;
3120
3121 # if we are delayed by four ticks or more, skip them all
3122 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3123
3124 $TICK_WATCHER->at ($NEXT_TICK);
3125 $TICK_WATCHER->start;
3126
3127 $LOAD = ($NOW - $tick_start) / $TICK; 3649 $LOAD = ($NOW - $tick_start) / $TICK;
3128 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3650 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3129 3651
3130 _post_tick; 3652 _post_tick;
3131 3653};
3132 3654$TICK_WATCHER->priority (EV::MAXPRI);
3133 },
3134);
3135 3655
3136{ 3656{
3137 BDB::max_poll_time $TICK * 0.1; 3657 # configure BDB
3138 $BDB_POLL_WATCHER = Event->io ( 3658
3139 reentrant => 0,
3140 fd => BDB::poll_fileno,
3141 poll => 'r',
3142 prio => 0,
3143 data => WF_AUTOCANCEL,
3144 cb => \&BDB::poll_cb,
3145 );
3146 BDB::min_parallel 8; 3659 BDB::min_parallel 8;
3147 3660 BDB::max_poll_reqs $TICK * 0.1;
3148 BDB::set_sync_prepare { 3661 $Coro::BDB::WATCHER->priority (1);
3149 my $status;
3150 my $current = $Coro::current;
3151 (
3152 sub {
3153 $status = $!;
3154 $current->ready; undef $current;
3155 },
3156 sub {
3157 Coro::schedule while defined $current;
3158 $! = $status;
3159 },
3160 )
3161 };
3162 3662
3163 unless ($DB_ENV) { 3663 unless ($DB_ENV) {
3164 $DB_ENV = BDB::db_env_create; 3664 $DB_ENV = BDB::db_env_create;
3665 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3666 | BDB::LOG_AUTOREMOVE, 1);
3667 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3668 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3165 3669
3166 cf::sync_job { 3670 cf::sync_job {
3167 eval { 3671 eval {
3168 BDB::db_env_open 3672 BDB::db_env_open
3169 $DB_ENV, 3673 $DB_ENV,
3171 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3675 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3172 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3676 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3173 0666; 3677 0666;
3174 3678
3175 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3679 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3176
3177 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3178 $DB_ENV->set_lk_detect;
3179 }; 3680 };
3180 3681
3181 cf::cleanup "db_env_open(db): $@" if $@; 3682 cf::cleanup "db_env_open(db): $@" if $@;
3182 }; 3683 };
3183 } 3684 }
3685
3686 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3687 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3688 };
3689 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3690 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3691 };
3692 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3693 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3694 };
3184} 3695}
3185 3696
3186{ 3697{
3698 # configure IO::AIO
3699
3187 IO::AIO::min_parallel 8; 3700 IO::AIO::min_parallel 8;
3188
3189 undef $Coro::AIO::WATCHER;
3190 IO::AIO::max_poll_time $TICK * 0.1; 3701 IO::AIO::max_poll_time $TICK * 0.1;
3191 $AIO_POLL_WATCHER = Event->io ( 3702 $Coro::AIO::WATCHER->priority (1);
3192 reentrant => 0,
3193 data => WF_AUTOCANCEL,
3194 fd => IO::AIO::poll_fileno,
3195 poll => 'r',
3196 prio => 6,
3197 cb => \&IO::AIO::poll_cb,
3198 );
3199} 3703}
3200 3704
3201my $_log_backtrace; 3705my $_log_backtrace;
3202 3706
3203sub _log_backtrace { 3707sub _log_backtrace {
3207 3711
3208 # limit the # of concurrent backtraces 3712 # limit the # of concurrent backtraces
3209 if ($_log_backtrace < 2) { 3713 if ($_log_backtrace < 2) {
3210 ++$_log_backtrace; 3714 ++$_log_backtrace;
3211 async { 3715 async {
3716 $Coro::current->{desc} = "abt $msg";
3717
3212 my @bt = fork_call { 3718 my @bt = fork_call {
3213 @addr = map { sprintf "%x", $_ } @addr; 3719 @addr = map { sprintf "%x", $_ } @addr;
3214 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3720 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3215 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3721 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3216 or die "addr2line: $!"; 3722 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines