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.292 by root, Tue Jul 3 00:54:57 2007 UTC vs.
Revision 1.411 by root, Fri Feb 1 15:54:07 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;
1156 my $msg = $@ ? "$v->{path}: $@\n" 1316 my $msg = $@ ? "$v->{path}: $@\n"
1157 : "$v->{base}: extension inactive.\n"; 1317 : "$v->{base}: extension inactive.\n";
1158 1318
1159 if (exists $v->{meta}{mandatory}) { 1319 if (exists $v->{meta}{mandatory}) {
1160 warn $msg; 1320 warn $msg;
1161 warn "mandatory extension failed to load, exiting.\n"; 1321 cf::cleanup "mandatory extension failed to load, exiting.";
1162 exit 1;
1163 } 1322 }
1164 1323
1165 warn $msg; 1324 warn $msg;
1166 } 1325 }
1167 1326
1192use Coro::AIO; 1351use Coro::AIO;
1193 1352
1194=head3 cf::player 1353=head3 cf::player
1195 1354
1196=over 4 1355=over 4
1356
1357=item cf::player::num_playing
1358
1359Returns the official number of playing players, as per the Crossfire metaserver rules.
1360
1361=cut
1362
1363sub num_playing {
1364 scalar grep
1365 $_->ob->map
1366 && !$_->hidden
1367 && !$_->ob->flag (cf::FLAG_WIZ),
1368 cf::player::list
1369}
1197 1370
1198=item cf::player::find $login 1371=item cf::player::find $login
1199 1372
1200Returns the given player object, loading it if necessary (might block). 1373Returns the given player object, loading it if necessary (might block).
1201 1374
1237 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1410 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1238 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1411 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1239 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1412 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1240 aio_unlink +(playerdir $login) . "/$login.pl"; 1413 aio_unlink +(playerdir $login) . "/$login.pl";
1241 1414
1242 my $pl = load_pl path $login 1415 my $f = new_from_file cf::object::thawer path $login
1243 or return; 1416 or return;
1417
1418 my $pl = cf::player::load_pl $f
1419 or return;
1420 local $cf::PLAYER_LOADING{$login} = $pl;
1421 $f->resolve_delayed_derefs;
1244 $cf::PLAYER{$login} = $pl 1422 $cf::PLAYER{$login} = $pl
1245 } 1423 }
1246 } 1424 }
1247} 1425}
1248 1426
1258 1436
1259 aio_mkdir playerdir $pl, 0770; 1437 aio_mkdir playerdir $pl, 0770;
1260 $pl->{last_save} = $cf::RUNTIME; 1438 $pl->{last_save} = $cf::RUNTIME;
1261 1439
1262 $pl->save_pl ($path); 1440 $pl->save_pl ($path);
1263 Coro::cede; 1441 cf::cede_to_tick;
1264} 1442}
1265 1443
1266sub new($) { 1444sub new($) {
1267 my ($login) = @_; 1445 my ($login) = @_;
1268 1446
1272 $self->{deny_save} = 1; 1450 $self->{deny_save} = 1;
1273 1451
1274 $cf::PLAYER{$login} = $self; 1452 $cf::PLAYER{$login} = $self;
1275 1453
1276 $self 1454 $self
1455}
1456
1457=item $player->send_msg ($channel, $msg, $color, [extra...])
1458
1459=cut
1460
1461sub send_msg {
1462 my $ns = shift->ns
1463 or return;
1464 $ns->send_msg (@_);
1277} 1465}
1278 1466
1279=item $pl->quit_character 1467=item $pl->quit_character
1280 1468
1281Nukes the player without looking back. If logged in, the connection will 1469Nukes the player without looking back. If logged in, the connection will
1336 or return []; 1524 or return [];
1337 1525
1338 my @logins; 1526 my @logins;
1339 1527
1340 for my $login (@$dirs) { 1528 for my $login (@$dirs) {
1529 my $path = path $login;
1530
1531 # a .pst is a dead give-away for a valid player
1532 unless (-e "$path.pst") {
1341 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1533 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1342 aio_read $fh, 0, 512, my $buf, 0 or next; 1534 aio_read $fh, 0, 512, my $buf, 0 or next;
1343 $buf !~ /^password -------------$/m or next; # official not-valid tag 1535 $buf !~ /^password -------------$/m or next; # official not-valid tag
1536 }
1344 1537
1345 utf8::decode $login; 1538 utf8::decode $login;
1346 push @logins, $login; 1539 push @logins, $login;
1347 } 1540 }
1348 1541
1381 1574
1382Expand crossfire pod fragments into protocol xml. 1575Expand crossfire pod fragments into protocol xml.
1383 1576
1384=cut 1577=cut
1385 1578
1579use re 'eval';
1580
1581my $group;
1582my $interior; $interior = qr{
1583 # match a pod interior sequence sans C<< >>
1584 (?:
1585 \ (.*?)\ (?{ $group = $^N })
1586 | < (??{$interior}) >
1587 )
1588}x;
1589
1386sub expand_cfpod { 1590sub expand_cfpod {
1387 ((my $self), (local $_)) = @_; 1591 my ($self, $pod) = @_;
1388 1592
1389 # escape & and < 1593 my $xml;
1390 s/&/&amp;/g;
1391 s/(?<![BIUGH])</&lt;/g;
1392 1594
1393 # this is buggy, it needs to properly take care of nested <'s 1595 while () {
1596 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1597 $group = $1;
1394 1598
1395 1 while 1599 $group =~ s/&/&amp;/g;
1396 # replace B<>, I<>, U<> etc. 1600 $group =~ s/</&lt;/g;
1397 s/B<([^\>]*)>/<b>$1<\/b>/ 1601
1398 || s/I<([^\>]*)>/<i>$1<\/i>/ 1602 $xml .= $group;
1399 || s/U<([^\>]*)>/<u>$1<\/u>/ 1603 } elsif ($pod =~ m%\G
1400 # replace G<male|female> tags 1604 ([BCGHITU])
1401 || s{G<([^>|]*)\|([^>]*)>}{ 1605 <
1402 $self->gender ? $2 : $1 1606 (?:
1403 }ge 1607 ([^<>]*) (?{ $group = $^N })
1404 # replace H<hint text> 1608 | < $interior >
1405 || s{H<([^\>]*)>} 1609 )
1610 >
1611 %gcsx
1406 { 1612 ) {
1613 my ($code, $data) = ($1, $group);
1614
1615 if ($code eq "B") {
1616 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1617 } elsif ($code eq "I") {
1618 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1619 } elsif ($code eq "U") {
1620 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1621 } elsif ($code eq "C") {
1622 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1623 } elsif ($code eq "T") {
1624 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1625 } elsif ($code eq "G") {
1626 my ($male, $female) = split /\|/, $data;
1627 $data = $self->gender ? $female : $male;
1628 $xml .= expand_cfpod ($self, $data);
1629 } elsif ($code eq "H") {
1407 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1630 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1408 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1631 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1409 "") 1632 "")
1410 [$self->{hintmode}] 1633 [$self->{hintmode}];
1634 } else {
1635 $xml .= "error processing '$code($data)' directive";
1411 }ge; 1636 }
1637 } else {
1638 if ($pod =~ /\G(.+)/) {
1639 warn "parse error while expanding $pod (at $1)";
1640 }
1641 last;
1642 }
1643 }
1412 1644
1645 for ($xml) {
1413 # create single paragraphs (very hackish) 1646 # create single paragraphs (very hackish)
1414 s/(?<=\S)\n(?=\w)/ /g; 1647 s/(?<=\S)\n(?=\w)/ /g;
1415 1648
1416 # compress some whitespace 1649 # compress some whitespace
1417 1 while s/\s*\n\s*\n\s*/\n/; 1650 s/\s+\n/\n/g; # ws line-ends
1651 s/\n\n+/\n/g; # double lines
1652 s/^\n+//; # beginning lines
1653 s/\n+$//; # ending lines
1654 }
1418 1655
1419 $_ 1656 $xml
1420} 1657}
1658
1659no re 'eval';
1421 1660
1422sub hintmode { 1661sub hintmode {
1423 $_[0]{hintmode} = $_[1] if @_ > 1; 1662 $_[0]{hintmode} = $_[1] if @_ > 1;
1424 $_[0]{hintmode} 1663 $_[0]{hintmode}
1425} 1664}
1426 1665
1427=item $player->ext_reply ($msgid, %msg) 1666=item $player->ext_reply ($msgid, @msg)
1428 1667
1429Sends an ext reply to the player. 1668Sends an ext reply to the player.
1430 1669
1431=cut 1670=cut
1432 1671
1433sub ext_reply($$%) { 1672sub ext_reply($$@) {
1434 my ($self, $id, %msg) = @_; 1673 my ($self, $id, @msg) = @_;
1435 1674
1436 $msg{msgid} = $id; 1675 $self->ns->ext_reply ($id, @msg)
1437 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1438} 1676}
1439 1677
1440=item $player->ext_event ($type, %msg) 1678=item $player->ext_msg ($type, @msg)
1441 1679
1442Sends an ext event to the client. 1680Sends an ext event to the client.
1443 1681
1444=cut 1682=cut
1445 1683
1446sub ext_event($$%) { 1684sub ext_msg($$@) {
1447 my ($self, $type, %msg) = @_; 1685 my ($self, $type, @msg) = @_;
1448 1686
1449 $self->ns->ext_event ($type, %msg); 1687 $self->ns->ext_msg ($type, @msg);
1450} 1688}
1451 1689
1452=head3 cf::region 1690=head3 cf::region
1453 1691
1454=over 4 1692=over 4
1467 my ($path) = @_; 1705 my ($path) = @_;
1468 1706
1469 my ($match, $specificity); 1707 my ($match, $specificity);
1470 1708
1471 for my $region (list) { 1709 for my $region (list) {
1472 if ($region->match && $path =~ $region->match) { 1710 if ($region->{match} && $path =~ $region->{match}) {
1473 ($match, $specificity) = ($region, $region->specificity) 1711 ($match, $specificity) = ($region, $region->specificity)
1474 if $region->specificity > $specificity; 1712 if $region->specificity > $specificity;
1475 } 1713 }
1476 } 1714 }
1477 1715
1597 $self->init; # pass $1 etc. 1835 $self->init; # pass $1 etc.
1598 return $self; 1836 return $self;
1599 } 1837 }
1600 } 1838 }
1601 1839
1602 Carp::carp "unable to resolve path '$path' (base '$base')."; 1840 Carp::cluck "unable to resolve path '$path' (base '$base').";
1603 () 1841 ()
1604} 1842}
1605 1843
1606sub init { 1844sub init {
1607 my ($self) = @_; 1845 my ($self) = @_;
1670 1908
1671sub load_header_from($) { 1909sub load_header_from($) {
1672 my ($self, $path) = @_; 1910 my ($self, $path) = @_;
1673 1911
1674 utf8::encode $path; 1912 utf8::encode $path;
1675 #aio_open $path, O_RDONLY, 0 1913 my $f = new_from_file cf::object::thawer $path
1676 # or return;
1677
1678 $self->_load_header ($path)
1679 or return; 1914 or return;
1915
1916 $self->_load_header ($f)
1917 or return;
1918
1919 local $MAP_LOADING{$self->{path}} = $self;
1920 $f->resolve_delayed_derefs;
1680 1921
1681 $self->{load_path} = $path; 1922 $self->{load_path} = $path;
1682 1923
1683 1 1924 1
1684} 1925}
1738sub find { 1979sub find {
1739 my ($path, $origin) = @_; 1980 my ($path, $origin) = @_;
1740 1981
1741 $path = normalise $path, $origin && $origin->path; 1982 $path = normalise $path, $origin && $origin->path;
1742 1983
1984 cf::lock_wait "map_data:$path";#d#remove
1743 cf::lock_wait "map_find:$path"; 1985 cf::lock_wait "map_find:$path";
1744 1986
1745 $cf::MAP{$path} || do { 1987 $cf::MAP{$path} || do {
1746 my $guard = cf::lock_acquire "map_find:$path"; 1988 my $guard1 = cf::lock_acquire "map_find:$path";
1989 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1990
1747 my $map = new_from_path cf::map $path 1991 my $map = new_from_path cf::map $path
1748 or return; 1992 or return;
1749 1993
1750 $map->{last_save} = $cf::RUNTIME; 1994 $map->{last_save} = $cf::RUNTIME;
1751 1995
1753 or return; 1997 or return;
1754 1998
1755 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1999 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1756 # doing this can freeze the server in a sync job, obviously 2000 # doing this can freeze the server in a sync job, obviously
1757 #$cf::WAIT_FOR_TICK->wait; 2001 #$cf::WAIT_FOR_TICK->wait;
2002 undef $guard1;
2003 undef $guard2;
1758 $map->reset; 2004 $map->reset;
1759 undef $guard;
1760 return find $path; 2005 return find $path;
1761 } 2006 }
1762 2007
1763 $cf::MAP{$path} = $map 2008 $cf::MAP{$path} = $map
1764 } 2009 }
1773 local $self->{deny_reset} = 1; # loading can take a long time 2018 local $self->{deny_reset} = 1; # loading can take a long time
1774 2019
1775 my $path = $self->{path}; 2020 my $path = $self->{path};
1776 2021
1777 { 2022 {
1778 my $guard = cf::lock_acquire "map_load:$path"; 2023 my $guard = cf::lock_acquire "map_data:$path";
1779 2024
2025 return unless $self->valid;
1780 return if $self->in_memory != cf::MAP_SWAPPED; 2026 return unless $self->in_memory == cf::MAP_SWAPPED;
1781 2027
1782 $self->in_memory (cf::MAP_LOADING); 2028 $self->in_memory (cf::MAP_LOADING);
1783 2029
1784 $self->alloc; 2030 $self->alloc;
1785 2031
1786 $self->pre_load; 2032 $self->pre_load;
1787 Coro::cede; 2033 cf::cede_to_tick;
1788 2034
2035 my $f = new_from_file cf::object::thawer $self->{load_path};
2036 $f->skip_block;
1789 $self->_load_objects ($self->{load_path}, 1) 2037 $self->_load_objects ($f)
1790 or return; 2038 or return;
1791 2039
1792 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2040 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1793 if delete $self->{load_original}; 2041 if delete $self->{load_original};
1794 2042
1795 if (my $uniq = $self->uniq_path) { 2043 if (my $uniq = $self->uniq_path) {
1796 utf8::encode $uniq; 2044 utf8::encode $uniq;
1797 if (aio_open $uniq, O_RDONLY, 0) { 2045 unless (aio_stat $uniq) {
2046 if (my $f = new_from_file cf::object::thawer $uniq) {
1798 $self->clear_unique_items; 2047 $self->clear_unique_items;
1799 $self->_load_objects ($uniq, 0); 2048 $self->_load_objects ($f);
2049 $f->resolve_delayed_derefs;
2050 }
1800 } 2051 }
1801 } 2052 }
1802 2053
1803 Coro::cede; 2054 $f->resolve_delayed_derefs;
2055
2056 cf::cede_to_tick;
1804 # now do the right thing for maps 2057 # now do the right thing for maps
1805 $self->link_multipart_objects; 2058 $self->link_multipart_objects;
1806 $self->difficulty ($self->estimate_difficulty) 2059 $self->difficulty ($self->estimate_difficulty)
1807 unless $self->difficulty; 2060 unless $self->difficulty;
1808 Coro::cede; 2061 cf::cede_to_tick;
1809 2062
1810 unless ($self->{deny_activate}) { 2063 unless ($self->{deny_activate}) {
1811 $self->decay_objects; 2064 $self->decay_objects;
1812 $self->fix_auto_apply; 2065 $self->fix_auto_apply;
1813 $self->update_buttons; 2066 $self->update_buttons;
1814 Coro::cede; 2067 cf::cede_to_tick;
1815 $self->set_darkness_map; 2068 $self->set_darkness_map;
1816 Coro::cede; 2069 cf::cede_to_tick;
1817 $self->activate; 2070 $self->activate;
1818 } 2071 }
2072
2073 $self->{last_save} = $cf::RUNTIME;
2074 $self->last_access ($cf::RUNTIME);
1819 2075
1820 $self->in_memory (cf::MAP_IN_MEMORY); 2076 $self->in_memory (cf::MAP_IN_MEMORY);
1821 } 2077 }
1822 2078
1823 $self->post_load; 2079 $self->post_load;
1834 2090
1835 $self 2091 $self
1836} 2092}
1837 2093
1838# find and load all maps in the 3x3 area around a map 2094# find and load all maps in the 3x3 area around a map
1839sub load_diag { 2095sub load_neighbours {
1840 my ($map) = @_; 2096 my ($map) = @_;
1841 2097
1842 my @diag; # diagonal neighbours 2098 my @neigh; # diagonal neighbours
1843 2099
1844 for (0 .. 3) { 2100 for (0 .. 3) {
1845 my $neigh = $map->tile_path ($_) 2101 my $neigh = $map->tile_path ($_)
1846 or next; 2102 or next;
1847 $neigh = find $neigh, $map 2103 $neigh = find $neigh, $map
1848 or next; 2104 or next;
1849 $neigh->load; 2105 $neigh->load;
1850 2106
2107 push @neigh,
1851 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2108 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1852 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2109 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1853 } 2110 }
1854 2111
1855 for (@diag) { 2112 for (grep defined $_->[0], @neigh) {
2113 my ($path, $origin) = @$_;
1856 my $neigh = find @$_ 2114 my $neigh = find $path, $origin
1857 or next; 2115 or next;
1858 $neigh->load; 2116 $neigh->load;
1859 } 2117 }
1860} 2118}
1861 2119
1866} 2124}
1867 2125
1868sub do_load_sync { 2126sub do_load_sync {
1869 my ($map) = @_; 2127 my ($map) = @_;
1870 2128
2129 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2130 if $Coro::current == $Coro::main;
2131
1871 cf::sync_job { $map->load }; 2132 cf::sync_job { $map->load };
1872} 2133}
1873 2134
1874our %MAP_PREFETCH; 2135our %MAP_PREFETCH;
1875our $MAP_PREFETCHER = undef; 2136our $MAP_PREFETCHER = undef;
1876 2137
1877sub find_async { 2138sub find_async {
1878 my ($path, $origin) = @_; 2139 my ($path, $origin, $load) = @_;
1879 2140
1880 $path = normalise $path, $origin && $origin->{path}; 2141 $path = normalise $path, $origin && $origin->{path};
1881 2142
1882 if (my $map = $cf::MAP{$path}) { 2143 if (my $map = $cf::MAP{$path}) {
1883 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2144 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1884 } 2145 }
1885 2146
1886 undef $MAP_PREFETCH{$path}; 2147 $MAP_PREFETCH{$path} |= $load;
2148
1887 $MAP_PREFETCHER ||= cf::async { 2149 $MAP_PREFETCHER ||= cf::async {
2150 $Coro::current->{desc} = "map prefetcher";
2151
1888 while (%MAP_PREFETCH) { 2152 while (%MAP_PREFETCH) {
1889 for my $path (keys %MAP_PREFETCH) { 2153 while (my ($k, $v) = each %MAP_PREFETCH) {
1890 my $map = find $path 2154 if (my $map = find $k) {
1891 or next;
1892 $map->load; 2155 $map->load if $v;
2156 }
1893 2157
1894 delete $MAP_PREFETCH{$path}; 2158 delete $MAP_PREFETCH{$k};
1895 } 2159 }
1896 } 2160 }
1897 undef $MAP_PREFETCHER; 2161 undef $MAP_PREFETCHER;
1898 }; 2162 };
1899 $MAP_PREFETCHER->prio (6); 2163 $MAP_PREFETCHER->prio (6);
1902} 2166}
1903 2167
1904sub save { 2168sub save {
1905 my ($self) = @_; 2169 my ($self) = @_;
1906 2170
1907 my $lock = cf::lock_acquire "map_data:" . $self->path; 2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
1908 2172
1909 $self->{last_save} = $cf::RUNTIME; 2173 $self->{last_save} = $cf::RUNTIME;
1910 2174
1911 return unless $self->dirty; 2175 return unless $self->dirty;
1912 2176
1918 return if $self->{deny_save}; 2182 return if $self->{deny_save};
1919 2183
1920 local $self->{last_access} = $self->last_access;#d# 2184 local $self->{last_access} = $self->last_access;#d#
1921 2185
1922 cf::async { 2186 cf::async {
2187 $Coro::current->{desc} = "map player save";
1923 $_->contr->save for $self->players; 2188 $_->contr->save for $self->players;
1924 }; 2189 };
1925 2190
1926 if ($uniq) { 2191 if ($uniq) {
1927 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2192 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1935 my ($self) = @_; 2200 my ($self) = @_;
1936 2201
1937 # save first because save cedes 2202 # save first because save cedes
1938 $self->save; 2203 $self->save;
1939 2204
1940 my $lock = cf::lock_acquire "map_data:" . $self->path; 2205 my $lock = cf::lock_acquire "map_data:$self->{path}";
1941 2206
1942 return if $self->players; 2207 return if $self->players;
1943 return if $self->in_memory != cf::MAP_IN_MEMORY; 2208 return if $self->in_memory != cf::MAP_IN_MEMORY;
1944 return if $self->{deny_save}; 2209 return if $self->{deny_save};
1945 2210
2211 $self->in_memory (cf::MAP_SWAPPED);
2212
2213 $self->deactivate;
2214 $_->clear_links_to ($self) for values %cf::MAP;
1946 $self->clear; 2215 $self->clear;
1947 $self->in_memory (cf::MAP_SWAPPED);
1948} 2216}
1949 2217
1950sub reset_at { 2218sub reset_at {
1951 my ($self) = @_; 2219 my ($self) = @_;
1952 2220
1984 if $uniq; 2252 if $uniq;
1985 } 2253 }
1986 2254
1987 delete $cf::MAP{$self->path}; 2255 delete $cf::MAP{$self->path};
1988 2256
2257 $self->deactivate;
2258 $_->clear_links_to ($self) for values %cf::MAP;
1989 $self->clear; 2259 $self->clear;
1990
1991 $_->clear_links_to ($self) for values %cf::MAP;
1992 2260
1993 $self->unlink_save; 2261 $self->unlink_save;
1994 $self->destroy; 2262 $self->destroy;
1995} 2263}
1996 2264
1997my $nuke_counter = "aaaa"; 2265my $nuke_counter = "aaaa";
1998 2266
1999sub nuke { 2267sub nuke {
2000 my ($self) = @_; 2268 my ($self) = @_;
2001 2269
2270 {
2271 my $lock = cf::lock_acquire "map_data:$self->{path}";
2272
2002 delete $cf::MAP{$self->path}; 2273 delete $cf::MAP{$self->path};
2003 2274
2004 $self->unlink_save; 2275 $self->unlink_save;
2005 2276
2006 bless $self, "cf::map"; 2277 bless $self, "cf::map";
2007 delete $self->{deny_reset}; 2278 delete $self->{deny_reset};
2008 $self->{deny_save} = 1; 2279 $self->{deny_save} = 1;
2009 $self->reset_timeout (1); 2280 $self->reset_timeout (1);
2010 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2281 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2011 2282
2012 $cf::MAP{$self->path} = $self; 2283 $cf::MAP{$self->path} = $self;
2284 }
2013 2285
2014 $self->reset; # polite request, might not happen 2286 $self->reset; # polite request, might not happen
2015} 2287}
2016 2288
2017=item $maps = cf::map::tmp_maps 2289=item $maps = cf::map::tmp_maps
2093 2365
2094sub inv_recursive { 2366sub inv_recursive {
2095 inv_recursive_ inv $_[0] 2367 inv_recursive_ inv $_[0]
2096} 2368}
2097 2369
2370=item $ref = $ob->ref
2371
2372creates and returns a persistent reference to an objetc that can be stored as a string.
2373
2374=item $ob = cf::object::deref ($refstring)
2375
2376returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2377even if the object actually exists. May block.
2378
2379=cut
2380
2381sub deref {
2382 my ($ref) = @_;
2383
2384 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2385 my ($uuid, $name) = ($1, $2);
2386 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2387 or return;
2388 $pl->ob->uuid eq $uuid
2389 or return;
2390
2391 $pl->ob
2392 } else {
2393 warn "$ref: cannot resolve object reference\n";
2394 undef
2395 }
2396}
2397
2098package cf; 2398package cf;
2099 2399
2100=back 2400=back
2101 2401
2102=head3 cf::object::player 2402=head3 cf::object::player
2124 2424
2125 } else { 2425 } else {
2126 my $pl = $self->contr; 2426 my $pl = $self->contr;
2127 2427
2128 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2428 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2129 my $diag = $pl->{npc_dialog}; 2429 my $dialog = $pl->{npc_dialog};
2130 $diag->{pl}->ext_reply ( 2430 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2131 $diag->{id},
2132 msgtype => "reply",
2133 msg => $diag->{pl}->expand_cfpod ($msg),
2134 add_topics => []
2135 );
2136 2431
2137 } else { 2432 } else {
2138 $msg = $npc->name . " says: $msg" if $npc; 2433 $msg = $npc->name . " says: $msg" if $npc;
2139 $self->message ($msg, $flags); 2434 $self->message ($msg, $flags);
2140 } 2435 }
2141 } 2436 }
2437}
2438
2439=item $object->send_msg ($channel, $msg, $color, [extra...])
2440
2441=cut
2442
2443sub cf::object::send_msg {
2444 my $pl = shift->contr
2445 or return;
2446 $pl->send_msg (@_);
2142} 2447}
2143 2448
2144=item $player_object->may ("access") 2449=item $player_object->may ("access")
2145 2450
2146Returns wether the given player is authorized to access resource "access" 2451Returns wether the given player is authorized to access resource "access"
2225 # use -1 or undef as default coordinates, not 0, 0 2530 # use -1 or undef as default coordinates, not 0, 0
2226 ($x, $y) = ($map->enter_x, $map->enter_y) 2531 ($x, $y) = ($map->enter_x, $map->enter_y)
2227 if $x <=0 && $y <= 0; 2532 if $x <=0 && $y <= 0;
2228 2533
2229 $map->load; 2534 $map->load;
2230 $map->load_diag; 2535 $map->load_neighbours;
2231 2536
2232 return unless $self->contr->active; 2537 return unless $self->contr->active;
2233 $self->activate_recursive; 2538 $self->activate_recursive;
2234 2539
2235 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2540 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2236 $self->enter_map ($map, $x, $y); 2541 $self->enter_map ($map, $x, $y);
2237} 2542}
2238 2543
2239=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2544=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2240 2545
2241Moves the player to the given map-path and coordinates by first freezing 2546Moves the player to the given map-path and coordinates by first freezing
2242her, loading and preparing them map, calling the provided $check callback 2547her, loading and preparing them map, calling the provided $check callback
2243that has to return the map if sucecssful, and then unfreezes the player on 2548that has to return the map if sucecssful, and then unfreezes the player on
2244the new (success) or old (failed) map position. 2549the new (success) or old (failed) map position. In either case, $done will
2550be called at the end of this process.
2245 2551
2246=cut 2552=cut
2247 2553
2248our $GOTOGEN; 2554our $GOTOGEN;
2249 2555
2250sub cf::object::player::goto { 2556sub cf::object::player::goto {
2251 my ($self, $path, $x, $y, $check) = @_; 2557 my ($self, $path, $x, $y, $check, $done) = @_;
2252 2558
2253 # do generation counting so two concurrent goto's will be executed in-order 2559 # do generation counting so two concurrent goto's will be executed in-order
2254 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2560 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2255 2561
2256 $self->enter_link; 2562 $self->enter_link;
2257 2563
2258 (async { 2564 (async {
2565 $Coro::current->{desc} = "player::goto $path $x $y";
2566
2567 # *tag paths override both path and x|y
2568 if ($path =~ /^\*(.*)$/) {
2569 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2570 my $ob = $obs[rand @obs];
2571
2572 # see if we actually can go there
2573 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2574 $ob = $obs[rand @obs];
2575 } else {
2576 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2577 }
2578 # else put us there anyways for now #d#
2579
2580 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2581 } else {
2582 ($path, $x, $y) = (undef, undef, undef);
2583 }
2584 }
2585
2259 my $map = eval { 2586 my $map = eval {
2260 my $map = cf::map::find $path; 2587 my $map = defined $path ? cf::map::find $path : undef;
2261 2588
2262 if ($map) { 2589 if ($map) {
2263 $map = $map->customise_for ($self); 2590 $map = $map->customise_for ($self);
2264 $map = $check->($map) if $check && $map; 2591 $map = $check->($map) if $check && $map;
2265 } else { 2592 } else {
2266 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2593 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2267 } 2594 }
2268 2595
2269 $map 2596 $map
2270 }; 2597 };
2271 2598
2276 2603
2277 if ($gen == $self->{_goto_generation}) { 2604 if ($gen == $self->{_goto_generation}) {
2278 delete $self->{_goto_generation}; 2605 delete $self->{_goto_generation};
2279 $self->leave_link ($map, $x, $y); 2606 $self->leave_link ($map, $x, $y);
2280 } 2607 }
2608
2609 $done->() if $done;
2281 })->prio (1); 2610 })->prio (1);
2282} 2611}
2283 2612
2284=item $player_object->enter_exit ($exit_object) 2613=item $player_object->enter_exit ($exit_object)
2285 2614
2322 $rmp->{origin_y} = $exit->y; 2651 $rmp->{origin_y} = $exit->y;
2323 } 2652 }
2324 2653
2325 $rmp->{random_seed} ||= $exit->random_seed; 2654 $rmp->{random_seed} ||= $exit->random_seed;
2326 2655
2327 my $data = cf::to_json $rmp; 2656 my $data = cf::encode_json $rmp;
2328 my $md5 = Digest::MD5::md5_hex $data; 2657 my $md5 = Digest::MD5::md5_hex $data;
2329 my $meta = "$RANDOMDIR/$md5.meta"; 2658 my $meta = "$RANDOMDIR/$md5.meta";
2330 2659
2331 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2660 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2332 aio_write $fh, 0, (length $data), $data, 0; 2661 aio_write $fh, 0, (length $data), $data, 0;
2354 my $hp = $exit->stats->hp; 2683 my $hp = $exit->stats->hp;
2355 my $sp = $exit->stats->sp; 2684 my $sp = $exit->stats->sp;
2356 2685
2357 $self->enter_link; 2686 $self->enter_link;
2358 2687
2688 # if exit is damned, update players death & WoR home-position
2689 $self->contr->savebed ($slaying, $hp, $sp)
2690 if $exit->flag (FLAG_DAMNED);
2691
2359 (async { 2692 (async {
2693 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2694
2360 $self->deactivate_recursive; # just to be sure 2695 $self->deactivate_recursive; # just to be sure
2361 unless (eval { 2696 unless (eval {
2362 $self->goto ($slaying, $hp, $sp); 2697 $self->goto ($slaying, $hp, $sp);
2363 2698
2364 1; 2699 1;
2390 2725
2391 utf8::encode $text; 2726 utf8::encode $text;
2392 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2727 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2393} 2728}
2394 2729
2395=item $client->send_msg ($color, $type, $msg, [extra...]) 2730=item $client->send_msg ($channel, $msg, $color, [extra...])
2396 2731
2397Send a drawinfo or msg packet to the client, formatting the msg for the 2732Send a drawinfo or msg packet to the client, formatting the msg for the
2398client if neccessary. C<$type> should be a string identifying the type of 2733client if neccessary. C<$type> should be a string identifying the type of
2399the message, with C<log> being the default. If C<$color> is negative, suppress 2734the message, with C<log> being the default. If C<$color> is negative, suppress
2400the message unless the client supports the msg packet. 2735the message unless the client supports the msg packet.
2401 2736
2402=cut 2737=cut
2403 2738
2739# non-persistent channels (usually the info channel)
2740our %CHANNEL = (
2741 "c/identify" => {
2742 id => "infobox",
2743 title => "Identify",
2744 reply => undef,
2745 tooltip => "Items recently identified",
2746 },
2747 "c/examine" => {
2748 id => "infobox",
2749 title => "Examine",
2750 reply => undef,
2751 tooltip => "Signs and other items you examined",
2752 },
2753 "c/book" => {
2754 id => "infobox",
2755 title => "Book",
2756 reply => undef,
2757 tooltip => "The contents of a note or book",
2758 },
2759 "c/lookat" => {
2760 id => "infobox",
2761 title => "Look",
2762 reply => undef,
2763 tooltip => "What you saw there",
2764 },
2765 "c/who" => {
2766 id => "infobox",
2767 title => "Players",
2768 reply => undef,
2769 tooltip => "Shows players who are currently online",
2770 },
2771 "c/body" => {
2772 id => "infobox",
2773 title => "Body Parts",
2774 reply => undef,
2775 tooltip => "Shows which body parts you posess and are available",
2776 },
2777 "c/uptime" => {
2778 id => "infobox",
2779 title => "Uptime",
2780 reply => undef,
2781 tooltip => "How long the server has been running since last restart",
2782 },
2783 "c/mapinfo" => {
2784 id => "infobox",
2785 title => "Map Info",
2786 reply => undef,
2787 tooltip => "Information related to the maps",
2788 },
2789);
2790
2404sub cf::client::send_msg { 2791sub cf::client::send_msg {
2405 my ($self, $color, $type, $msg, @extra) = @_; 2792 my ($self, $channel, $msg, $color, @extra) = @_;
2406 2793
2407 $msg = $self->pl->expand_cfpod ($msg); 2794 $msg = $self->pl->expand_cfpod ($msg);
2408 2795
2796 $color &= cf::NDI_CLIENT_MASK; # just in case...
2797
2798 # check predefined channels, for the benefit of C
2799 if ($CHANNEL{$channel}) {
2800 $channel = $CHANNEL{$channel};
2801
2802 $self->ext_msg (channel_info => $channel)
2803 if $self->can_msg;
2804
2805 $channel = $channel->{id};
2806
2807 } elsif (ref $channel) {
2808 # send meta info to client, if not yet sent
2809 unless (exists $self->{channel}{$channel->{id}}) {
2810 $self->{channel}{$channel->{id}} = $channel;
2811 $self->ext_msg (channel_info => $channel)
2812 if $self->can_msg;
2813 }
2814
2815 $channel = $channel->{id};
2816 }
2817
2818 return unless @extra || length $msg;
2819
2409 if ($self->can_msg) { 2820 if ($self->can_msg) {
2821 # default colour, mask it out
2822 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2823 if $color & cf::NDI_DEF;
2824
2410 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2825 $self->send_packet ("msg " . $self->{json_coder}->encode (
2826 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2411 } else { 2827 } else {
2412 # replace some tags by gcfclient-compatible ones
2413 for ($msg) {
2414 1 while
2415 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2416 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2417 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2418 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2419 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2420 }
2421
2422 if ($color >= 0) { 2828 if ($color >= 0) {
2829 # replace some tags by gcfclient-compatible ones
2830 for ($msg) {
2831 1 while
2832 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2833 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2834 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2835 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2836 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2837 }
2838
2839 $color &= cf::NDI_COLOR_MASK;
2840
2841 utf8::encode $msg;
2842
2423 if (0 && $msg =~ /\[/) { 2843 if (0 && $msg =~ /\[/) {
2844 # COMMAND/INFO
2424 $self->send_packet ("drawextinfo $color 4 0 $msg") 2845 $self->send_packet ("drawextinfo $color 10 8 $msg")
2425 } else { 2846 } else {
2426 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2847 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2427 $self->send_packet ("drawinfo $color $msg") 2848 $self->send_packet ("drawinfo $color $msg")
2428 } 2849 }
2429 } 2850 }
2430 } 2851 }
2431} 2852}
2432 2853
2433=item $client->ext_event ($type, %msg) 2854=item $client->ext_msg ($type, @msg)
2434 2855
2435Sends an ext event to the client. 2856Sends an ext event to the client.
2436 2857
2437=cut 2858=cut
2438 2859
2439sub cf::client::ext_event($$%) { 2860sub cf::client::ext_msg($$@) {
2440 my ($self, $type, %msg) = @_; 2861 my ($self, $type, @msg) = @_;
2441 2862
2863 if ($self->extcmd == 2) {
2864 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2865 } elsif ($self->extcmd == 1) { # TODO: remove
2442 $msg{msgtype} = "event_$type"; 2866 push @msg, msgtype => "event_$type";
2443 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2867 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2868 }
2869}
2870
2871=item $client->ext_reply ($msgid, @msg)
2872
2873Sends an ext reply to the client.
2874
2875=cut
2876
2877sub cf::client::ext_reply($$@) {
2878 my ($self, $id, @msg) = @_;
2879
2880 if ($self->extcmd == 2) {
2881 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2882 } elsif ($self->extcmd == 1) {
2883 #TODO: version 1, remove
2884 unshift @msg, msgtype => "reply", msgid => $id;
2885 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2886 }
2444} 2887}
2445 2888
2446=item $success = $client->query ($flags, "text", \&cb) 2889=item $success = $client->query ($flags, "text", \&cb)
2447 2890
2448Queues a query to the client, calling the given callback with 2891Queues a query to the client, calling the given callback with
2503 my ($ns, $buf) = @_; 2946 my ($ns, $buf) = @_;
2504 2947
2505 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2948 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2506 2949
2507 if (ref $msg) { 2950 if (ref $msg) {
2951 my ($type, $reply, @payload) =
2952 "ARRAY" eq ref $msg
2953 ? @$msg
2954 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2955
2956 my @reply;
2957
2508 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2958 if (my $cb = $EXTICMD{$type}) {
2509 if (my %reply = $cb->($ns, $msg)) { 2959 @reply = $cb->($ns, @payload);
2510 $reply{msgid} = $msg->{msgid};
2511 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2512 }
2513 } 2960 }
2961
2962 $ns->ext_reply ($reply, @reply)
2963 if $reply;
2964
2514 } else { 2965 } else {
2515 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2966 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2516 } 2967 }
2517 2968
2518 cf::override; 2969 cf::override;
2565our $safe = new Safe "safe"; 3016our $safe = new Safe "safe";
2566our $safe_hole = new Safe::Hole; 3017our $safe_hole = new Safe::Hole;
2567 3018
2568$SIG{FPE} = 'IGNORE'; 3019$SIG{FPE} = 'IGNORE';
2569 3020
2570$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3021$safe->permit_only (Opcode::opset qw(
3022 :base_core :base_mem :base_orig :base_math
3023 grepstart grepwhile mapstart mapwhile
3024 sort time
3025));
2571 3026
2572# here we export the classes and methods available to script code 3027# here we export the classes and methods available to script code
2573 3028
2574=pod 3029=pod
2575 3030
2576The following functions and methods are available within a safe environment: 3031The following functions and methods are available within a safe environment:
2577 3032
2578 cf::object contr pay_amount pay_player map 3033 cf::object
3034 contr pay_amount pay_player map x y force_find force_add destroy
3035 insert remove name archname title slaying race decrease_ob_nr
3036
2579 cf::object::player player 3037 cf::object::player
2580 cf::player peaceful 3038 player
2581 cf::map trigger 3039
3040 cf::player
3041 peaceful
3042
3043 cf::map
3044 trigger
2582 3045
2583=cut 3046=cut
2584 3047
2585for ( 3048for (
2586 ["cf::object" => qw(contr pay_amount pay_player map)], 3049 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3050 insert remove inv name archname title slaying race
3051 decrease_ob_nr destroy)],
2587 ["cf::object::player" => qw(player)], 3052 ["cf::object::player" => qw(player)],
2588 ["cf::player" => qw(peaceful)], 3053 ["cf::player" => qw(peaceful)],
2589 ["cf::map" => qw(trigger)], 3054 ["cf::map" => qw(trigger)],
2590) { 3055) {
2591 no strict 'refs'; 3056 no strict 'refs';
2667# the server's init and main functions 3132# the server's init and main functions
2668 3133
2669sub load_facedata($) { 3134sub load_facedata($) {
2670 my ($path) = @_; 3135 my ($path) = @_;
2671 3136
3137 # HACK to clear player env face cache, we need some signal framework
3138 # for this (global event?)
3139 %ext::player_env::MUSIC_FACE_CACHE = ();
3140
3141 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3142
2672 warn "loading facedata from $path\n"; 3143 warn "loading facedata from $path\n";
2673 3144
2674 my $facedata; 3145 my $facedata;
2675 0 < aio_load $path, $facedata 3146 0 < aio_load $path, $facedata
2676 or die "$path: $!"; 3147 or die "$path: $!";
2678 $facedata = Coro::Storable::thaw $facedata; 3149 $facedata = Coro::Storable::thaw $facedata;
2679 3150
2680 $facedata->{version} == 2 3151 $facedata->{version} == 2
2681 or cf::cleanup "$path: version mismatch, cannot proceed."; 3152 or cf::cleanup "$path: version mismatch, cannot proceed.";
2682 3153
3154 # patch in the exptable
3155 $facedata->{resource}{"res/exp_table"} = {
3156 type => FT_RSRC,
3157 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3158 };
3159 cf::cede_to_tick;
3160
2683 { 3161 {
2684 my $faces = $facedata->{faceinfo}; 3162 my $faces = $facedata->{faceinfo};
2685 3163
2686 while (my ($face, $info) = each %$faces) { 3164 while (my ($face, $info) = each %$faces) {
2687 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3165 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3166
2688 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3167 cf::face::set_visibility $idx, $info->{visibility};
3168 cf::face::set_magicmap $idx, $info->{magicmap};
2689 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3169 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2690 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3170 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2691 Coro::cede; 3171
3172 cf::cede_to_tick;
2692 } 3173 }
2693 3174
2694 while (my ($face, $info) = each %$faces) { 3175 while (my ($face, $info) = each %$faces) {
2695 next unless $info->{smooth}; 3176 next unless $info->{smooth};
3177
2696 my $idx = cf::face::find $face 3178 my $idx = cf::face::find $face
2697 or next; 3179 or next;
3180
2698 if (my $smooth = cf::face::find $info->{smooth}) { 3181 if (my $smooth = cf::face::find $info->{smooth}) {
3182 cf::face::set_smooth $idx, $smooth;
2699 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3183 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2700 } else { 3184 } else {
2701 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3185 warn "smooth face '$info->{smooth}' not found for face '$face'";
2702 } 3186 }
2703 Coro::cede; 3187
3188 cf::cede_to_tick;
2704 } 3189 }
2705 } 3190 }
2706 3191
2707 { 3192 {
2708 my $anims = $facedata->{animinfo}; 3193 my $anims = $facedata->{animinfo};
2709 3194
2710 while (my ($anim, $info) = each %$anims) { 3195 while (my ($anim, $info) = each %$anims) {
2711 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3196 cf::anim::set $anim, $info->{frames}, $info->{facings};
2712 Coro::cede; 3197 cf::cede_to_tick;
2713 } 3198 }
2714 3199
2715 cf::anim::invalidate_all; # d'oh 3200 cf::anim::invalidate_all; # d'oh
2716 } 3201 }
2717 3202
3203 {
3204 # TODO: for gcfclient pleasure, we should give resources
3205 # that gcfclient doesn't grok a >10000 face index.
3206 my $res = $facedata->{resource};
3207
3208 while (my ($name, $info) = each %$res) {
3209 if (defined $info->{type}) {
3210 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3211 my $data;
3212
3213 if ($info->{type} & 1) {
3214 # prepend meta info
3215
3216 my $meta = $enc->encode ({
3217 name => $name,
3218 %{ $info->{meta} || {} },
3219 });
3220
3221 $data = pack "(w/a*)*", $meta, $info->{data};
3222 } else {
3223 $data = $info->{data};
3224 }
3225
3226 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3227 cf::face::set_type $idx, $info->{type};
3228 } else {
3229 $RESOURCE{$name} = $info;
3230 }
3231
3232 cf::cede_to_tick;
3233 }
3234 }
3235
3236 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3237
2718 1 3238 1
2719} 3239}
2720 3240
3241cf::global->attach (on_resource_update => sub {
3242 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3243 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3244
3245 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3246 my $sound = $soundconf->{compat}[$_]
3247 or next;
3248
3249 my $face = cf::face::find "sound/$sound->[1]";
3250 cf::sound::set $sound->[0] => $face;
3251 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3252 }
3253
3254 while (my ($k, $v) = each %{$soundconf->{event}}) {
3255 my $face = cf::face::find "sound/$v";
3256 cf::sound::set $k => $face;
3257 }
3258 }
3259});
3260
3261register_exticmd fx_want => sub {
3262 my ($ns, $want) = @_;
3263
3264 while (my ($k, $v) = each %$want) {
3265 $ns->fx_want ($k, $v);
3266 }
3267};
3268
2721sub reload_regions { 3269sub reload_regions {
3270 # HACK to clear player env face cache, we need some signal framework
3271 # for this (global event?)
3272 %ext::player_env::MUSIC_FACE_CACHE = ();
3273
2722 load_resource_file "$MAPDIR/regions" 3274 load_resource_file "$MAPDIR/regions"
2723 or die "unable to load regions file\n"; 3275 or die "unable to load regions file\n";
3276
3277 for (cf::region::list) {
3278 $_->{match} = qr/$_->{match}/
3279 if exists $_->{match};
3280 }
2724} 3281}
2725 3282
2726sub reload_facedata { 3283sub reload_facedata {
2727 load_facedata "$DATADIR/facedata" 3284 load_facedata "$DATADIR/facedata"
2728 or die "unable to load facedata\n"; 3285 or die "unable to load facedata\n";
2757 3314
2758sub init { 3315sub init {
2759 reload_resources; 3316 reload_resources;
2760} 3317}
2761 3318
2762sub cfg_load { 3319sub reload_config {
2763 open my $fh, "<:utf8", "$CONFDIR/config" 3320 open my $fh, "<:utf8", "$CONFDIR/config"
2764 or return; 3321 or return;
2765 3322
2766 local $/; 3323 local $/;
2767 *CFG = YAML::Syck::Load <$fh>; 3324 *CFG = YAML::Load <$fh>;
2768 3325
2769 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3326 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2770 3327
2771 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3328 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2772 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3329 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2783sub main { 3340sub main {
2784 # we must not ever block the main coroutine 3341 # we must not ever block the main coroutine
2785 local $Coro::idle = sub { 3342 local $Coro::idle = sub {
2786 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3343 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2787 (async { 3344 (async {
2788 Event::one_event; 3345 $Coro::current->{desc} = "IDLE BUG HANDLER";
3346 EV::loop EV::LOOP_ONESHOT;
2789 })->prio (Coro::PRIO_MAX); 3347 })->prio (Coro::PRIO_MAX);
2790 }; 3348 };
2791 3349
2792 cfg_load; 3350 reload_config;
2793 db_init; 3351 db_init;
2794 load_extensions; 3352 load_extensions;
2795 3353
2796 $TICK_WATCHER->start; 3354 $TICK_WATCHER->start;
3355 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
2797 Event::loop; 3356 EV::loop;
2798} 3357}
2799 3358
2800############################################################################# 3359#############################################################################
2801# initialisation and cleanup 3360# initialisation and cleanup
2802 3361
2803# install some emergency cleanup handlers 3362# install some emergency cleanup handlers
2804BEGIN { 3363BEGIN {
3364 our %SIGWATCHER = ();
2805 for my $signal (qw(INT HUP TERM)) { 3365 for my $signal (qw(INT HUP TERM)) {
2806 Event->signal ( 3366 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2807 reentrant => 0,
2808 data => WF_AUTOCANCEL,
2809 signal => $signal,
2810 prio => 0,
2811 cb => sub {
2812 cf::cleanup "SIG$signal"; 3367 cf::cleanup "SIG$signal";
2813 },
2814 ); 3368 };
2815 } 3369 }
2816} 3370}
2817 3371
2818sub write_runtime { 3372sub write_runtime {
2819 my $runtime = "$LOCALDIR/runtime"; 3373 my $runtime = "$LOCALDIR/runtime";
2864 # and maps saved/destroyed asynchronously. 3418 # and maps saved/destroyed asynchronously.
2865 warn "begin emergency player save\n"; 3419 warn "begin emergency player save\n";
2866 for my $login (keys %cf::PLAYER) { 3420 for my $login (keys %cf::PLAYER) {
2867 my $pl = $cf::PLAYER{$login} or next; 3421 my $pl = $cf::PLAYER{$login} or next;
2868 $pl->valid or next; 3422 $pl->valid or next;
3423 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2869 $pl->save; 3424 $pl->save;
2870 } 3425 }
2871 warn "end emergency player save\n"; 3426 warn "end emergency player save\n";
2872 3427
2873 warn "begin emergency map save\n"; 3428 warn "begin emergency map save\n";
2912 warn "syncing database to disk"; 3467 warn "syncing database to disk";
2913 BDB::db_env_txn_checkpoint $DB_ENV; 3468 BDB::db_env_txn_checkpoint $DB_ENV;
2914 3469
2915 # if anything goes wrong in here, we should simply crash as we already saved 3470 # if anything goes wrong in here, we should simply crash as we already saved
2916 3471
2917 warn "cancelling all WF_AUTOCANCEL watchers";
2918 for (Event::all_watchers) {
2919 $_->cancel if $_->data & WF_AUTOCANCEL;
2920 }
2921
2922 warn "flushing outstanding aio requests"; 3472 warn "flushing outstanding aio requests";
2923 for (;;) { 3473 for (;;) {
2924 BDB::flush; 3474 BDB::flush;
2925 IO::AIO::flush; 3475 IO::AIO::flush;
2926 Coro::cede; 3476 Coro::cede_notself;
2927 last unless IO::AIO::nreqs || BDB::nreqs; 3477 last unless IO::AIO::nreqs || BDB::nreqs;
2928 warn "iterate..."; 3478 warn "iterate...";
2929 } 3479 }
2930 3480
2931 ++$RELOAD; 3481 ++$RELOAD;
2990 warn "reloading cf.pm"; 3540 warn "reloading cf.pm";
2991 require cf; 3541 require cf;
2992 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3542 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2993 3543
2994 warn "loading config and database again"; 3544 warn "loading config and database again";
2995 cf::cfg_load; 3545 cf::reload_config;
2996 3546
2997 warn "loading extensions"; 3547 warn "loading extensions";
2998 cf::load_extensions; 3548 cf::load_extensions;
2999 3549
3000 warn "reattaching attachments to objects/players"; 3550 warn "reattaching attachments to objects/players";
3007 warn "leaving sync_job"; 3557 warn "leaving sync_job";
3008 3558
3009 1 3559 1
3010 } or do { 3560 } or do {
3011 warn $@; 3561 warn $@;
3012 warn "error while reloading, exiting."; 3562 cf::cleanup "error while reloading, exiting.";
3013 exit 1;
3014 }; 3563 };
3015 3564
3016 warn "reloaded"; 3565 warn "reloaded";
3017}; 3566};
3018 3567
3020 3569
3021sub reload_perl() { 3570sub reload_perl() {
3022 # doing reload synchronously and two reloads happen back-to-back, 3571 # doing reload synchronously and two reloads happen back-to-back,
3023 # coro crashes during coro_state_free->destroy here. 3572 # coro crashes during coro_state_free->destroy here.
3024 3573
3025 $RELOAD_WATCHER ||= Event->timer ( 3574 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3026 reentrant => 0,
3027 after => 0,
3028 data => WF_AUTOCANCEL,
3029 cb => sub {
3030 do_reload_perl; 3575 do_reload_perl;
3031 undef $RELOAD_WATCHER; 3576 undef $RELOAD_WATCHER;
3032 },
3033 ); 3577 };
3034} 3578}
3035 3579
3036register_command "reload" => sub { 3580register_command "reload" => sub {
3037 my ($who, $arg) = @_; 3581 my ($who, $arg) = @_;
3038 3582
3039 if ($who->flag (FLAG_WIZ)) { 3583 if ($who->flag (FLAG_WIZ)) {
3040 $who->message ("reloading server."); 3584 $who->message ("reloading server.");
3585 async {
3586 $Coro::current->{desc} = "perl_reload";
3041 async { reload_perl }; 3587 reload_perl;
3588 };
3042 } 3589 }
3043}; 3590};
3044 3591
3045unshift @INC, $LIBDIR; 3592unshift @INC, $LIBDIR;
3046 3593
3065 my $signal = new Coro::Signal; 3612 my $signal = new Coro::Signal;
3066 push @WAIT_FOR_TICK_BEGIN, $signal; 3613 push @WAIT_FOR_TICK_BEGIN, $signal;
3067 $signal->wait; 3614 $signal->wait;
3068} 3615}
3069 3616
3070 my $min = 1e6;#d# 3617$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3071 my $avg = 10;
3072$TICK_WATCHER = Event->timer (
3073 reentrant => 0,
3074 parked => 1,
3075 prio => 0,
3076 at => $NEXT_TICK || $TICK,
3077 data => WF_AUTOCANCEL,
3078 cb => sub {
3079 if ($Coro::current != $Coro::main) { 3618 if ($Coro::current != $Coro::main) {
3080 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3619 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3081 unless ++$bug_warning > 10; 3620 unless ++$bug_warning > 10;
3082 return; 3621 return;
3083 } 3622 }
3084 3623
3085 $NOW = $tick_start = Event::time; 3624 $NOW = $tick_start = EV::now;
3086 3625
3087 cf::server_tick; # one server iteration 3626 cf::server_tick; # one server iteration
3088 3627
3089 0 && sync_job {#d# 3628 $RUNTIME += $TICK;
3090 for(1..10) { 3629 $NEXT_TICK = $_[0]->at;
3091 my $t = Event::time;
3092 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3093 or die;
3094 3630
3095 $map->width (50); 3631 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3096 $map->height (50); 3632 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3097 $map->alloc; 3633 Coro::async_pool {
3098 $map->_load_objects ("/tmp/x.map", 1); 3634 $Coro::current->{desc} = "runtime saver";
3099 my $t = Event::time - $t; 3635 write_runtime
3100 3636 or warn "ERROR: unable to write runtime file: $!";
3101 #next unless $t < 0.0013;#d#
3102 if ($t < $min) {
3103 $min = $t;
3104 }
3105 $avg = $avg * 0.99 + $t * 0.01;
3106 }
3107 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3108 exit 0;
3109 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3110 }; 3637 };
3638 }
3111 3639
3112 $RUNTIME += $TICK;
3113 $NEXT_TICK += $TICK;
3114
3115 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3116 $NEXT_RUNTIME_WRITE = $NOW + 10;
3117 Coro::async_pool {
3118 write_runtime
3119 or warn "ERROR: unable to write runtime file: $!";
3120 };
3121 }
3122
3123# my $AFTER = Event::time;
3124# warn $AFTER - $NOW;#d#
3125
3126 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3640 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3127 $sig->send; 3641 $sig->send;
3128 } 3642 }
3129 while (my $sig = shift @WAIT_FOR_TICK) { 3643 while (my $sig = shift @WAIT_FOR_TICK) {
3130 $sig->send; 3644 $sig->send;
3131 } 3645 }
3132 3646
3133 $NOW = Event::time;
3134
3135 # if we are delayed by four ticks or more, skip them all
3136 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3137
3138 $TICK_WATCHER->at ($NEXT_TICK);
3139 $TICK_WATCHER->start;
3140
3141 $LOAD = ($NOW - $tick_start) / $TICK; 3647 $LOAD = ($NOW - $tick_start) / $TICK;
3142 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3648 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3143 3649
3144 _post_tick; 3650 _post_tick;
3145 3651};
3146 3652$TICK_WATCHER->priority (EV::MAXPRI);
3147 },
3148);
3149 3653
3150{ 3654{
3151 BDB::max_poll_time $TICK * 0.1; 3655 # configure BDB
3152 $BDB_POLL_WATCHER = Event->io ( 3656
3153 reentrant => 0,
3154 fd => BDB::poll_fileno,
3155 poll => 'r',
3156 prio => 0,
3157 data => WF_AUTOCANCEL,
3158 cb => \&BDB::poll_cb,
3159 );
3160 BDB::min_parallel 8; 3657 BDB::min_parallel 8;
3161 3658 BDB::max_poll_reqs $TICK * 0.1;
3162 BDB::set_sync_prepare { 3659 $Coro::BDB::WATCHER->priority (1);
3163 my $status;
3164 my $current = $Coro::current;
3165 (
3166 sub {
3167 $status = $!;
3168 $current->ready; undef $current;
3169 },
3170 sub {
3171 Coro::schedule while defined $current;
3172 $! = $status;
3173 },
3174 )
3175 };
3176 3660
3177 unless ($DB_ENV) { 3661 unless ($DB_ENV) {
3178 $DB_ENV = BDB::db_env_create; 3662 $DB_ENV = BDB::db_env_create;
3663 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3664 | BDB::LOG_AUTOREMOVE, 1);
3665 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3666 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3179 3667
3180 cf::sync_job { 3668 cf::sync_job {
3181 eval { 3669 eval {
3182 BDB::db_env_open 3670 BDB::db_env_open
3183 $DB_ENV, 3671 $DB_ENV,
3185 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3673 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3186 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3674 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3187 0666; 3675 0666;
3188 3676
3189 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3677 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3190
3191 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3192 $DB_ENV->set_lk_detect;
3193 }; 3678 };
3194 3679
3195 cf::cleanup "db_env_open(db): $@" if $@; 3680 cf::cleanup "db_env_open(db): $@" if $@;
3196 }; 3681 };
3197 } 3682 }
3683
3684 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3685 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3686 };
3687 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3688 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3689 };
3690 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3691 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3692 };
3198} 3693}
3199 3694
3200{ 3695{
3696 # configure IO::AIO
3697
3201 IO::AIO::min_parallel 8; 3698 IO::AIO::min_parallel 8;
3202
3203 undef $Coro::AIO::WATCHER;
3204 IO::AIO::max_poll_time $TICK * 0.1; 3699 IO::AIO::max_poll_time $TICK * 0.1;
3205 $AIO_POLL_WATCHER = Event->io ( 3700 $Coro::AIO::WATCHER->priority (1);
3206 reentrant => 0,
3207 data => WF_AUTOCANCEL,
3208 fd => IO::AIO::poll_fileno,
3209 poll => 'r',
3210 prio => 6,
3211 cb => \&IO::AIO::poll_cb,
3212 );
3213} 3701}
3214 3702
3215my $_log_backtrace; 3703my $_log_backtrace;
3216 3704
3217sub _log_backtrace { 3705sub _log_backtrace {
3221 3709
3222 # limit the # of concurrent backtraces 3710 # limit the # of concurrent backtraces
3223 if ($_log_backtrace < 2) { 3711 if ($_log_backtrace < 2) {
3224 ++$_log_backtrace; 3712 ++$_log_backtrace;
3225 async { 3713 async {
3714 $Coro::current->{desc} = "abt $msg";
3715
3226 my @bt = fork_call { 3716 my @bt = fork_call {
3227 @addr = map { sprintf "%x", $_ } @addr; 3717 @addr = map { sprintf "%x", $_ } @addr;
3228 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3718 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3229 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3719 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3230 or die "addr2line: $!"; 3720 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines