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.296 by root, Wed Jul 4 07:09:06 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 s/\s+\n/\n/g; # ws line-ends 1650 s/\s+\n/\n/g; # ws line-ends
1418 s/\n\n+/\n/g; # double lines 1651 s/\n\n+/\n/g; # double lines
1419 s/^\n+//; # beginning lines 1652 s/^\n+//; # beginning lines
1420 s/\n+$//; # ending lines 1653 s/\n+$//; # ending lines
1654 }
1421 1655
1422 $_ 1656 $xml
1423} 1657}
1658
1659no re 'eval';
1424 1660
1425sub hintmode { 1661sub hintmode {
1426 $_[0]{hintmode} = $_[1] if @_ > 1; 1662 $_[0]{hintmode} = $_[1] if @_ > 1;
1427 $_[0]{hintmode} 1663 $_[0]{hintmode}
1428} 1664}
1429 1665
1430=item $player->ext_reply ($msgid, %msg) 1666=item $player->ext_reply ($msgid, @msg)
1431 1667
1432Sends an ext reply to the player. 1668Sends an ext reply to the player.
1433 1669
1434=cut 1670=cut
1435 1671
1436sub ext_reply($$%) { 1672sub ext_reply($$@) {
1437 my ($self, $id, %msg) = @_; 1673 my ($self, $id, @msg) = @_;
1438 1674
1439 $msg{msgid} = $id; 1675 $self->ns->ext_reply ($id, @msg)
1440 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1441} 1676}
1442 1677
1443=item $player->ext_event ($type, %msg) 1678=item $player->ext_msg ($type, @msg)
1444 1679
1445Sends an ext event to the client. 1680Sends an ext event to the client.
1446 1681
1447=cut 1682=cut
1448 1683
1449sub ext_event($$%) { 1684sub ext_msg($$@) {
1450 my ($self, $type, %msg) = @_; 1685 my ($self, $type, @msg) = @_;
1451 1686
1452 $self->ns->ext_event ($type, %msg); 1687 $self->ns->ext_msg ($type, @msg);
1453} 1688}
1454 1689
1455=head3 cf::region 1690=head3 cf::region
1456 1691
1457=over 4 1692=over 4
1470 my ($path) = @_; 1705 my ($path) = @_;
1471 1706
1472 my ($match, $specificity); 1707 my ($match, $specificity);
1473 1708
1474 for my $region (list) { 1709 for my $region (list) {
1475 if ($region->match && $path =~ $region->match) { 1710 if ($region->{match} && $path =~ $region->{match}) {
1476 ($match, $specificity) = ($region, $region->specificity) 1711 ($match, $specificity) = ($region, $region->specificity)
1477 if $region->specificity > $specificity; 1712 if $region->specificity > $specificity;
1478 } 1713 }
1479 } 1714 }
1480 1715
1600 $self->init; # pass $1 etc. 1835 $self->init; # pass $1 etc.
1601 return $self; 1836 return $self;
1602 } 1837 }
1603 } 1838 }
1604 1839
1605 Carp::carp "unable to resolve path '$path' (base '$base')."; 1840 Carp::cluck "unable to resolve path '$path' (base '$base').";
1606 () 1841 ()
1607} 1842}
1608 1843
1609sub init { 1844sub init {
1610 my ($self) = @_; 1845 my ($self) = @_;
1673 1908
1674sub load_header_from($) { 1909sub load_header_from($) {
1675 my ($self, $path) = @_; 1910 my ($self, $path) = @_;
1676 1911
1677 utf8::encode $path; 1912 utf8::encode $path;
1678 #aio_open $path, O_RDONLY, 0 1913 my $f = new_from_file cf::object::thawer $path
1679 # or return;
1680
1681 $self->_load_header ($path)
1682 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;
1683 1921
1684 $self->{load_path} = $path; 1922 $self->{load_path} = $path;
1685 1923
1686 1 1924 1
1687} 1925}
1741sub find { 1979sub find {
1742 my ($path, $origin) = @_; 1980 my ($path, $origin) = @_;
1743 1981
1744 $path = normalise $path, $origin && $origin->path; 1982 $path = normalise $path, $origin && $origin->path;
1745 1983
1984 cf::lock_wait "map_data:$path";#d#remove
1746 cf::lock_wait "map_find:$path"; 1985 cf::lock_wait "map_find:$path";
1747 1986
1748 $cf::MAP{$path} || do { 1987 $cf::MAP{$path} || do {
1749 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
1750 my $map = new_from_path cf::map $path 1991 my $map = new_from_path cf::map $path
1751 or return; 1992 or return;
1752 1993
1753 $map->{last_save} = $cf::RUNTIME; 1994 $map->{last_save} = $cf::RUNTIME;
1754 1995
1756 or return; 1997 or return;
1757 1998
1758 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1999 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1759 # doing this can freeze the server in a sync job, obviously 2000 # doing this can freeze the server in a sync job, obviously
1760 #$cf::WAIT_FOR_TICK->wait; 2001 #$cf::WAIT_FOR_TICK->wait;
2002 undef $guard1;
2003 undef $guard2;
1761 $map->reset; 2004 $map->reset;
1762 undef $guard;
1763 return find $path; 2005 return find $path;
1764 } 2006 }
1765 2007
1766 $cf::MAP{$path} = $map 2008 $cf::MAP{$path} = $map
1767 } 2009 }
1776 local $self->{deny_reset} = 1; # loading can take a long time 2018 local $self->{deny_reset} = 1; # loading can take a long time
1777 2019
1778 my $path = $self->{path}; 2020 my $path = $self->{path};
1779 2021
1780 { 2022 {
1781 my $guard = cf::lock_acquire "map_load:$path"; 2023 my $guard = cf::lock_acquire "map_data:$path";
1782 2024
2025 return unless $self->valid;
1783 return if $self->in_memory != cf::MAP_SWAPPED; 2026 return unless $self->in_memory == cf::MAP_SWAPPED;
1784 2027
1785 $self->in_memory (cf::MAP_LOADING); 2028 $self->in_memory (cf::MAP_LOADING);
1786 2029
1787 $self->alloc; 2030 $self->alloc;
1788 2031
1789 $self->pre_load; 2032 $self->pre_load;
1790 Coro::cede; 2033 cf::cede_to_tick;
1791 2034
2035 my $f = new_from_file cf::object::thawer $self->{load_path};
2036 $f->skip_block;
1792 $self->_load_objects ($self->{load_path}, 1) 2037 $self->_load_objects ($f)
1793 or return; 2038 or return;
1794 2039
1795 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2040 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1796 if delete $self->{load_original}; 2041 if delete $self->{load_original};
1797 2042
1798 if (my $uniq = $self->uniq_path) { 2043 if (my $uniq = $self->uniq_path) {
1799 utf8::encode $uniq; 2044 utf8::encode $uniq;
1800 if (aio_open $uniq, O_RDONLY, 0) { 2045 unless (aio_stat $uniq) {
2046 if (my $f = new_from_file cf::object::thawer $uniq) {
1801 $self->clear_unique_items; 2047 $self->clear_unique_items;
1802 $self->_load_objects ($uniq, 0); 2048 $self->_load_objects ($f);
2049 $f->resolve_delayed_derefs;
2050 }
1803 } 2051 }
1804 } 2052 }
1805 2053
1806 Coro::cede; 2054 $f->resolve_delayed_derefs;
2055
2056 cf::cede_to_tick;
1807 # now do the right thing for maps 2057 # now do the right thing for maps
1808 $self->link_multipart_objects; 2058 $self->link_multipart_objects;
1809 $self->difficulty ($self->estimate_difficulty) 2059 $self->difficulty ($self->estimate_difficulty)
1810 unless $self->difficulty; 2060 unless $self->difficulty;
1811 Coro::cede; 2061 cf::cede_to_tick;
1812 2062
1813 unless ($self->{deny_activate}) { 2063 unless ($self->{deny_activate}) {
1814 $self->decay_objects; 2064 $self->decay_objects;
1815 $self->fix_auto_apply; 2065 $self->fix_auto_apply;
1816 $self->update_buttons; 2066 $self->update_buttons;
1817 Coro::cede; 2067 cf::cede_to_tick;
1818 $self->set_darkness_map; 2068 $self->set_darkness_map;
1819 Coro::cede; 2069 cf::cede_to_tick;
1820 $self->activate; 2070 $self->activate;
1821 } 2071 }
2072
2073 $self->{last_save} = $cf::RUNTIME;
2074 $self->last_access ($cf::RUNTIME);
1822 2075
1823 $self->in_memory (cf::MAP_IN_MEMORY); 2076 $self->in_memory (cf::MAP_IN_MEMORY);
1824 } 2077 }
1825 2078
1826 $self->post_load; 2079 $self->post_load;
1837 2090
1838 $self 2091 $self
1839} 2092}
1840 2093
1841# 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
1842sub load_diag { 2095sub load_neighbours {
1843 my ($map) = @_; 2096 my ($map) = @_;
1844 2097
1845 my @diag; # diagonal neighbours 2098 my @neigh; # diagonal neighbours
1846 2099
1847 for (0 .. 3) { 2100 for (0 .. 3) {
1848 my $neigh = $map->tile_path ($_) 2101 my $neigh = $map->tile_path ($_)
1849 or next; 2102 or next;
1850 $neigh = find $neigh, $map 2103 $neigh = find $neigh, $map
1851 or next; 2104 or next;
1852 $neigh->load; 2105 $neigh->load;
1853 2106
2107 push @neigh,
1854 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2108 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1855 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2109 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1856 } 2110 }
1857 2111
1858 for (@diag) { 2112 for (grep defined $_->[0], @neigh) {
2113 my ($path, $origin) = @$_;
1859 my $neigh = find @$_ 2114 my $neigh = find $path, $origin
1860 or next; 2115 or next;
1861 $neigh->load; 2116 $neigh->load;
1862 } 2117 }
1863} 2118}
1864 2119
1869} 2124}
1870 2125
1871sub do_load_sync { 2126sub do_load_sync {
1872 my ($map) = @_; 2127 my ($map) = @_;
1873 2128
2129 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2130 if $Coro::current == $Coro::main;
2131
1874 cf::sync_job { $map->load }; 2132 cf::sync_job { $map->load };
1875} 2133}
1876 2134
1877our %MAP_PREFETCH; 2135our %MAP_PREFETCH;
1878our $MAP_PREFETCHER = undef; 2136our $MAP_PREFETCHER = undef;
1879 2137
1880sub find_async { 2138sub find_async {
1881 my ($path, $origin) = @_; 2139 my ($path, $origin, $load) = @_;
1882 2140
1883 $path = normalise $path, $origin && $origin->{path}; 2141 $path = normalise $path, $origin && $origin->{path};
1884 2142
1885 if (my $map = $cf::MAP{$path}) { 2143 if (my $map = $cf::MAP{$path}) {
1886 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2144 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1887 } 2145 }
1888 2146
1889 undef $MAP_PREFETCH{$path}; 2147 $MAP_PREFETCH{$path} |= $load;
2148
1890 $MAP_PREFETCHER ||= cf::async { 2149 $MAP_PREFETCHER ||= cf::async {
2150 $Coro::current->{desc} = "map prefetcher";
2151
1891 while (%MAP_PREFETCH) { 2152 while (%MAP_PREFETCH) {
1892 for my $path (keys %MAP_PREFETCH) { 2153 while (my ($k, $v) = each %MAP_PREFETCH) {
1893 my $map = find $path 2154 if (my $map = find $k) {
1894 or next;
1895 $map->load; 2155 $map->load if $v;
2156 }
1896 2157
1897 delete $MAP_PREFETCH{$path}; 2158 delete $MAP_PREFETCH{$k};
1898 } 2159 }
1899 } 2160 }
1900 undef $MAP_PREFETCHER; 2161 undef $MAP_PREFETCHER;
1901 }; 2162 };
1902 $MAP_PREFETCHER->prio (6); 2163 $MAP_PREFETCHER->prio (6);
1905} 2166}
1906 2167
1907sub save { 2168sub save {
1908 my ($self) = @_; 2169 my ($self) = @_;
1909 2170
1910 my $lock = cf::lock_acquire "map_data:" . $self->path; 2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
1911 2172
1912 $self->{last_save} = $cf::RUNTIME; 2173 $self->{last_save} = $cf::RUNTIME;
1913 2174
1914 return unless $self->dirty; 2175 return unless $self->dirty;
1915 2176
1921 return if $self->{deny_save}; 2182 return if $self->{deny_save};
1922 2183
1923 local $self->{last_access} = $self->last_access;#d# 2184 local $self->{last_access} = $self->last_access;#d#
1924 2185
1925 cf::async { 2186 cf::async {
2187 $Coro::current->{desc} = "map player save";
1926 $_->contr->save for $self->players; 2188 $_->contr->save for $self->players;
1927 }; 2189 };
1928 2190
1929 if ($uniq) { 2191 if ($uniq) {
1930 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2192 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1938 my ($self) = @_; 2200 my ($self) = @_;
1939 2201
1940 # save first because save cedes 2202 # save first because save cedes
1941 $self->save; 2203 $self->save;
1942 2204
1943 my $lock = cf::lock_acquire "map_data:" . $self->path; 2205 my $lock = cf::lock_acquire "map_data:$self->{path}";
1944 2206
1945 return if $self->players; 2207 return if $self->players;
1946 return if $self->in_memory != cf::MAP_IN_MEMORY; 2208 return if $self->in_memory != cf::MAP_IN_MEMORY;
1947 return if $self->{deny_save}; 2209 return if $self->{deny_save};
1948 2210
2211 $self->in_memory (cf::MAP_SWAPPED);
2212
2213 $self->deactivate;
2214 $_->clear_links_to ($self) for values %cf::MAP;
1949 $self->clear; 2215 $self->clear;
1950 $self->in_memory (cf::MAP_SWAPPED);
1951} 2216}
1952 2217
1953sub reset_at { 2218sub reset_at {
1954 my ($self) = @_; 2219 my ($self) = @_;
1955 2220
1987 if $uniq; 2252 if $uniq;
1988 } 2253 }
1989 2254
1990 delete $cf::MAP{$self->path}; 2255 delete $cf::MAP{$self->path};
1991 2256
2257 $self->deactivate;
2258 $_->clear_links_to ($self) for values %cf::MAP;
1992 $self->clear; 2259 $self->clear;
1993
1994 $_->clear_links_to ($self) for values %cf::MAP;
1995 2260
1996 $self->unlink_save; 2261 $self->unlink_save;
1997 $self->destroy; 2262 $self->destroy;
1998} 2263}
1999 2264
2000my $nuke_counter = "aaaa"; 2265my $nuke_counter = "aaaa";
2001 2266
2002sub nuke { 2267sub nuke {
2003 my ($self) = @_; 2268 my ($self) = @_;
2004 2269
2270 {
2271 my $lock = cf::lock_acquire "map_data:$self->{path}";
2272
2005 delete $cf::MAP{$self->path}; 2273 delete $cf::MAP{$self->path};
2006 2274
2007 $self->unlink_save; 2275 $self->unlink_save;
2008 2276
2009 bless $self, "cf::map"; 2277 bless $self, "cf::map";
2010 delete $self->{deny_reset}; 2278 delete $self->{deny_reset};
2011 $self->{deny_save} = 1; 2279 $self->{deny_save} = 1;
2012 $self->reset_timeout (1); 2280 $self->reset_timeout (1);
2013 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2281 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2014 2282
2015 $cf::MAP{$self->path} = $self; 2283 $cf::MAP{$self->path} = $self;
2284 }
2016 2285
2017 $self->reset; # polite request, might not happen 2286 $self->reset; # polite request, might not happen
2018} 2287}
2019 2288
2020=item $maps = cf::map::tmp_maps 2289=item $maps = cf::map::tmp_maps
2096 2365
2097sub inv_recursive { 2366sub inv_recursive {
2098 inv_recursive_ inv $_[0] 2367 inv_recursive_ inv $_[0]
2099} 2368}
2100 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
2101package cf; 2398package cf;
2102 2399
2103=back 2400=back
2104 2401
2105=head3 cf::object::player 2402=head3 cf::object::player
2127 2424
2128 } else { 2425 } else {
2129 my $pl = $self->contr; 2426 my $pl = $self->contr;
2130 2427
2131 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2428 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2132 my $diag = $pl->{npc_dialog}; 2429 my $dialog = $pl->{npc_dialog};
2133 $diag->{pl}->ext_reply ( 2430 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2134 $diag->{id},
2135 msgtype => "reply",
2136 msg => $diag->{pl}->expand_cfpod ($msg),
2137 add_topics => []
2138 );
2139 2431
2140 } else { 2432 } else {
2141 $msg = $npc->name . " says: $msg" if $npc; 2433 $msg = $npc->name . " says: $msg" if $npc;
2142 $self->message ($msg, $flags); 2434 $self->message ($msg, $flags);
2143 } 2435 }
2144 } 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 (@_);
2145} 2447}
2146 2448
2147=item $player_object->may ("access") 2449=item $player_object->may ("access")
2148 2450
2149Returns wether the given player is authorized to access resource "access" 2451Returns wether the given player is authorized to access resource "access"
2228 # use -1 or undef as default coordinates, not 0, 0 2530 # use -1 or undef as default coordinates, not 0, 0
2229 ($x, $y) = ($map->enter_x, $map->enter_y) 2531 ($x, $y) = ($map->enter_x, $map->enter_y)
2230 if $x <=0 && $y <= 0; 2532 if $x <=0 && $y <= 0;
2231 2533
2232 $map->load; 2534 $map->load;
2233 $map->load_diag; 2535 $map->load_neighbours;
2234 2536
2235 return unless $self->contr->active; 2537 return unless $self->contr->active;
2236 $self->activate_recursive; 2538 $self->activate_recursive;
2237 2539
2238 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2540 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2239 $self->enter_map ($map, $x, $y); 2541 $self->enter_map ($map, $x, $y);
2240} 2542}
2241 2543
2242=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2544=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2243 2545
2244Moves 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
2245her, loading and preparing them map, calling the provided $check callback 2547her, loading and preparing them map, calling the provided $check callback
2246that 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
2247the 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.
2248 2551
2249=cut 2552=cut
2250 2553
2251our $GOTOGEN; 2554our $GOTOGEN;
2252 2555
2253sub cf::object::player::goto { 2556sub cf::object::player::goto {
2254 my ($self, $path, $x, $y, $check) = @_; 2557 my ($self, $path, $x, $y, $check, $done) = @_;
2255 2558
2256 # 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
2257 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2560 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2258 2561
2259 $self->enter_link; 2562 $self->enter_link;
2260 2563
2261 (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
2262 my $map = eval { 2586 my $map = eval {
2263 my $map = cf::map::find $path; 2587 my $map = defined $path ? cf::map::find $path : undef;
2264 2588
2265 if ($map) { 2589 if ($map) {
2266 $map = $map->customise_for ($self); 2590 $map = $map->customise_for ($self);
2267 $map = $check->($map) if $check && $map; 2591 $map = $check->($map) if $check && $map;
2268 } else { 2592 } else {
2269 $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);
2270 } 2594 }
2271 2595
2272 $map 2596 $map
2273 }; 2597 };
2274 2598
2279 2603
2280 if ($gen == $self->{_goto_generation}) { 2604 if ($gen == $self->{_goto_generation}) {
2281 delete $self->{_goto_generation}; 2605 delete $self->{_goto_generation};
2282 $self->leave_link ($map, $x, $y); 2606 $self->leave_link ($map, $x, $y);
2283 } 2607 }
2608
2609 $done->() if $done;
2284 })->prio (1); 2610 })->prio (1);
2285} 2611}
2286 2612
2287=item $player_object->enter_exit ($exit_object) 2613=item $player_object->enter_exit ($exit_object)
2288 2614
2325 $rmp->{origin_y} = $exit->y; 2651 $rmp->{origin_y} = $exit->y;
2326 } 2652 }
2327 2653
2328 $rmp->{random_seed} ||= $exit->random_seed; 2654 $rmp->{random_seed} ||= $exit->random_seed;
2329 2655
2330 my $data = cf::to_json $rmp; 2656 my $data = cf::encode_json $rmp;
2331 my $md5 = Digest::MD5::md5_hex $data; 2657 my $md5 = Digest::MD5::md5_hex $data;
2332 my $meta = "$RANDOMDIR/$md5.meta"; 2658 my $meta = "$RANDOMDIR/$md5.meta";
2333 2659
2334 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2660 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2335 aio_write $fh, 0, (length $data), $data, 0; 2661 aio_write $fh, 0, (length $data), $data, 0;
2362 # if exit is damned, update players death & WoR home-position 2688 # if exit is damned, update players death & WoR home-position
2363 $self->contr->savebed ($slaying, $hp, $sp) 2689 $self->contr->savebed ($slaying, $hp, $sp)
2364 if $exit->flag (FLAG_DAMNED); 2690 if $exit->flag (FLAG_DAMNED);
2365 2691
2366 (async { 2692 (async {
2693 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2694
2367 $self->deactivate_recursive; # just to be sure 2695 $self->deactivate_recursive; # just to be sure
2368 unless (eval { 2696 unless (eval {
2369 $self->goto ($slaying, $hp, $sp); 2697 $self->goto ($slaying, $hp, $sp);
2370 2698
2371 1; 2699 1;
2397 2725
2398 utf8::encode $text; 2726 utf8::encode $text;
2399 $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);
2400} 2728}
2401 2729
2402=item $client->send_msg ($color, $type, $msg, [extra...]) 2730=item $client->send_msg ($channel, $msg, $color, [extra...])
2403 2731
2404Send 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
2405client 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
2406the 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
2407the message unless the client supports the msg packet. 2735the message unless the client supports the msg packet.
2408 2736
2409=cut 2737=cut
2410 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
2411sub cf::client::send_msg { 2791sub cf::client::send_msg {
2412 my ($self, $color, $type, $msg, @extra) = @_; 2792 my ($self, $channel, $msg, $color, @extra) = @_;
2413 2793
2414 $msg = $self->pl->expand_cfpod ($msg); 2794 $msg = $self->pl->expand_cfpod ($msg);
2415 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
2416 return unless @extra || length $msg; 2818 return unless @extra || length $msg;
2417 2819
2418 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
2419 $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]));
2420 } else { 2827 } else {
2421 # replace some tags by gcfclient-compatible ones
2422 for ($msg) {
2423 1 while
2424 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2425 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2426 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2427 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2428 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2429 }
2430
2431 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
2432 if (0 && $msg =~ /\[/) { 2843 if (0 && $msg =~ /\[/) {
2844 # COMMAND/INFO
2433 $self->send_packet ("drawextinfo $color 4 0 $msg") 2845 $self->send_packet ("drawextinfo $color 10 8 $msg")
2434 } else { 2846 } else {
2435 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2847 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2436 $self->send_packet ("drawinfo $color $msg") 2848 $self->send_packet ("drawinfo $color $msg")
2437 } 2849 }
2438 } 2850 }
2439 } 2851 }
2440} 2852}
2441 2853
2442=item $client->ext_event ($type, %msg) 2854=item $client->ext_msg ($type, @msg)
2443 2855
2444Sends an ext event to the client. 2856Sends an ext event to the client.
2445 2857
2446=cut 2858=cut
2447 2859
2448sub cf::client::ext_event($$%) { 2860sub cf::client::ext_msg($$@) {
2449 my ($self, $type, %msg) = @_; 2861 my ($self, $type, @msg) = @_;
2450 2862
2863 if ($self->extcmd == 2) {
2864 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2865 } elsif ($self->extcmd == 1) { # TODO: remove
2451 $msg{msgtype} = "event_$type"; 2866 push @msg, msgtype => "event_$type";
2452 $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 }
2453} 2887}
2454 2888
2455=item $success = $client->query ($flags, "text", \&cb) 2889=item $success = $client->query ($flags, "text", \&cb)
2456 2890
2457Queues a query to the client, calling the given callback with 2891Queues a query to the client, calling the given callback with
2512 my ($ns, $buf) = @_; 2946 my ($ns, $buf) = @_;
2513 2947
2514 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2948 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2515 2949
2516 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
2517 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2958 if (my $cb = $EXTICMD{$type}) {
2518 if (my %reply = $cb->($ns, $msg)) { 2959 @reply = $cb->($ns, @payload);
2519 $reply{msgid} = $msg->{msgid};
2520 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2521 }
2522 } 2960 }
2961
2962 $ns->ext_reply ($reply, @reply)
2963 if $reply;
2964
2523 } else { 2965 } else {
2524 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";
2525 } 2967 }
2526 2968
2527 cf::override; 2969 cf::override;
2574our $safe = new Safe "safe"; 3016our $safe = new Safe "safe";
2575our $safe_hole = new Safe::Hole; 3017our $safe_hole = new Safe::Hole;
2576 3018
2577$SIG{FPE} = 'IGNORE'; 3019$SIG{FPE} = 'IGNORE';
2578 3020
2579$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));
2580 3026
2581# here we export the classes and methods available to script code 3027# here we export the classes and methods available to script code
2582 3028
2583=pod 3029=pod
2584 3030
2585The following functions and methods are available within a safe environment: 3031The following functions and methods are available within a safe environment:
2586 3032
2587 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
2588 cf::object::player player 3037 cf::object::player
2589 cf::player peaceful 3038 player
2590 cf::map trigger 3039
3040 cf::player
3041 peaceful
3042
3043 cf::map
3044 trigger
2591 3045
2592=cut 3046=cut
2593 3047
2594for ( 3048for (
2595 ["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)],
2596 ["cf::object::player" => qw(player)], 3052 ["cf::object::player" => qw(player)],
2597 ["cf::player" => qw(peaceful)], 3053 ["cf::player" => qw(peaceful)],
2598 ["cf::map" => qw(trigger)], 3054 ["cf::map" => qw(trigger)],
2599) { 3055) {
2600 no strict 'refs'; 3056 no strict 'refs';
2676# the server's init and main functions 3132# the server's init and main functions
2677 3133
2678sub load_facedata($) { 3134sub load_facedata($) {
2679 my ($path) = @_; 3135 my ($path) = @_;
2680 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
2681 warn "loading facedata from $path\n"; 3143 warn "loading facedata from $path\n";
2682 3144
2683 my $facedata; 3145 my $facedata;
2684 0 < aio_load $path, $facedata 3146 0 < aio_load $path, $facedata
2685 or die "$path: $!"; 3147 or die "$path: $!";
2687 $facedata = Coro::Storable::thaw $facedata; 3149 $facedata = Coro::Storable::thaw $facedata;
2688 3150
2689 $facedata->{version} == 2 3151 $facedata->{version} == 2
2690 or cf::cleanup "$path: version mismatch, cannot proceed."; 3152 or cf::cleanup "$path: version mismatch, cannot proceed.";
2691 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
2692 { 3161 {
2693 my $faces = $facedata->{faceinfo}; 3162 my $faces = $facedata->{faceinfo};
2694 3163
2695 while (my ($face, $info) = each %$faces) { 3164 while (my ($face, $info) = each %$faces) {
2696 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3165 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3166
2697 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3167 cf::face::set_visibility $idx, $info->{visibility};
3168 cf::face::set_magicmap $idx, $info->{magicmap};
2698 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3169 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2699 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3170 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2700 Coro::cede; 3171
3172 cf::cede_to_tick;
2701 } 3173 }
2702 3174
2703 while (my ($face, $info) = each %$faces) { 3175 while (my ($face, $info) = each %$faces) {
2704 next unless $info->{smooth}; 3176 next unless $info->{smooth};
3177
2705 my $idx = cf::face::find $face 3178 my $idx = cf::face::find $face
2706 or next; 3179 or next;
3180
2707 if (my $smooth = cf::face::find $info->{smooth}) { 3181 if (my $smooth = cf::face::find $info->{smooth}) {
3182 cf::face::set_smooth $idx, $smooth;
2708 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3183 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2709 } else { 3184 } else {
2710 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3185 warn "smooth face '$info->{smooth}' not found for face '$face'";
2711 } 3186 }
2712 Coro::cede; 3187
3188 cf::cede_to_tick;
2713 } 3189 }
2714 } 3190 }
2715 3191
2716 { 3192 {
2717 my $anims = $facedata->{animinfo}; 3193 my $anims = $facedata->{animinfo};
2718 3194
2719 while (my ($anim, $info) = each %$anims) { 3195 while (my ($anim, $info) = each %$anims) {
2720 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3196 cf::anim::set $anim, $info->{frames}, $info->{facings};
2721 Coro::cede; 3197 cf::cede_to_tick;
2722 } 3198 }
2723 3199
2724 cf::anim::invalidate_all; # d'oh 3200 cf::anim::invalidate_all; # d'oh
2725 } 3201 }
2726 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
2727 1 3238 1
2728} 3239}
2729 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
2730sub 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
2731 load_resource_file "$MAPDIR/regions" 3274 load_resource_file "$MAPDIR/regions"
2732 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 }
2733} 3281}
2734 3282
2735sub reload_facedata { 3283sub reload_facedata {
2736 load_facedata "$DATADIR/facedata" 3284 load_facedata "$DATADIR/facedata"
2737 or die "unable to load facedata\n"; 3285 or die "unable to load facedata\n";
2766 3314
2767sub init { 3315sub init {
2768 reload_resources; 3316 reload_resources;
2769} 3317}
2770 3318
2771sub cfg_load { 3319sub reload_config {
2772 open my $fh, "<:utf8", "$CONFDIR/config" 3320 open my $fh, "<:utf8", "$CONFDIR/config"
2773 or return; 3321 or return;
2774 3322
2775 local $/; 3323 local $/;
2776 *CFG = YAML::Syck::Load <$fh>; 3324 *CFG = YAML::Load <$fh>;
2777 3325
2778 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3326 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2779 3327
2780 $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};
2781 $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};
2792sub main { 3340sub main {
2793 # we must not ever block the main coroutine 3341 # we must not ever block the main coroutine
2794 local $Coro::idle = sub { 3342 local $Coro::idle = sub {
2795 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#
2796 (async { 3344 (async {
2797 Event::one_event; 3345 $Coro::current->{desc} = "IDLE BUG HANDLER";
3346 EV::loop EV::LOOP_ONESHOT;
2798 })->prio (Coro::PRIO_MAX); 3347 })->prio (Coro::PRIO_MAX);
2799 }; 3348 };
2800 3349
2801 cfg_load; 3350 reload_config;
2802 db_init; 3351 db_init;
2803 load_extensions; 3352 load_extensions;
2804 3353
2805 $TICK_WATCHER->start; 3354 $TICK_WATCHER->start;
3355 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
2806 Event::loop; 3356 EV::loop;
2807} 3357}
2808 3358
2809############################################################################# 3359#############################################################################
2810# initialisation and cleanup 3360# initialisation and cleanup
2811 3361
2812# install some emergency cleanup handlers 3362# install some emergency cleanup handlers
2813BEGIN { 3363BEGIN {
3364 our %SIGWATCHER = ();
2814 for my $signal (qw(INT HUP TERM)) { 3365 for my $signal (qw(INT HUP TERM)) {
2815 Event->signal ( 3366 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2816 reentrant => 0,
2817 data => WF_AUTOCANCEL,
2818 signal => $signal,
2819 prio => 0,
2820 cb => sub {
2821 cf::cleanup "SIG$signal"; 3367 cf::cleanup "SIG$signal";
2822 },
2823 ); 3368 };
2824 } 3369 }
2825} 3370}
2826 3371
2827sub write_runtime { 3372sub write_runtime {
2828 my $runtime = "$LOCALDIR/runtime"; 3373 my $runtime = "$LOCALDIR/runtime";
2873 # and maps saved/destroyed asynchronously. 3418 # and maps saved/destroyed asynchronously.
2874 warn "begin emergency player save\n"; 3419 warn "begin emergency player save\n";
2875 for my $login (keys %cf::PLAYER) { 3420 for my $login (keys %cf::PLAYER) {
2876 my $pl = $cf::PLAYER{$login} or next; 3421 my $pl = $cf::PLAYER{$login} or next;
2877 $pl->valid or next; 3422 $pl->valid or next;
3423 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2878 $pl->save; 3424 $pl->save;
2879 } 3425 }
2880 warn "end emergency player save\n"; 3426 warn "end emergency player save\n";
2881 3427
2882 warn "begin emergency map save\n"; 3428 warn "begin emergency map save\n";
2921 warn "syncing database to disk"; 3467 warn "syncing database to disk";
2922 BDB::db_env_txn_checkpoint $DB_ENV; 3468 BDB::db_env_txn_checkpoint $DB_ENV;
2923 3469
2924 # 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
2925 3471
2926 warn "cancelling all WF_AUTOCANCEL watchers";
2927 for (Event::all_watchers) {
2928 $_->cancel if $_->data & WF_AUTOCANCEL;
2929 }
2930
2931 warn "flushing outstanding aio requests"; 3472 warn "flushing outstanding aio requests";
2932 for (;;) { 3473 for (;;) {
2933 BDB::flush; 3474 BDB::flush;
2934 IO::AIO::flush; 3475 IO::AIO::flush;
2935 Coro::cede; 3476 Coro::cede_notself;
2936 last unless IO::AIO::nreqs || BDB::nreqs; 3477 last unless IO::AIO::nreqs || BDB::nreqs;
2937 warn "iterate..."; 3478 warn "iterate...";
2938 } 3479 }
2939 3480
2940 ++$RELOAD; 3481 ++$RELOAD;
2999 warn "reloading cf.pm"; 3540 warn "reloading cf.pm";
3000 require cf; 3541 require cf;
3001 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3542 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3002 3543
3003 warn "loading config and database again"; 3544 warn "loading config and database again";
3004 cf::cfg_load; 3545 cf::reload_config;
3005 3546
3006 warn "loading extensions"; 3547 warn "loading extensions";
3007 cf::load_extensions; 3548 cf::load_extensions;
3008 3549
3009 warn "reattaching attachments to objects/players"; 3550 warn "reattaching attachments to objects/players";
3016 warn "leaving sync_job"; 3557 warn "leaving sync_job";
3017 3558
3018 1 3559 1
3019 } or do { 3560 } or do {
3020 warn $@; 3561 warn $@;
3021 warn "error while reloading, exiting."; 3562 cf::cleanup "error while reloading, exiting.";
3022 exit 1;
3023 }; 3563 };
3024 3564
3025 warn "reloaded"; 3565 warn "reloaded";
3026}; 3566};
3027 3567
3029 3569
3030sub reload_perl() { 3570sub reload_perl() {
3031 # doing reload synchronously and two reloads happen back-to-back, 3571 # doing reload synchronously and two reloads happen back-to-back,
3032 # coro crashes during coro_state_free->destroy here. 3572 # coro crashes during coro_state_free->destroy here.
3033 3573
3034 $RELOAD_WATCHER ||= Event->timer ( 3574 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3035 reentrant => 0,
3036 after => 0,
3037 data => WF_AUTOCANCEL,
3038 cb => sub {
3039 do_reload_perl; 3575 do_reload_perl;
3040 undef $RELOAD_WATCHER; 3576 undef $RELOAD_WATCHER;
3041 },
3042 ); 3577 };
3043} 3578}
3044 3579
3045register_command "reload" => sub { 3580register_command "reload" => sub {
3046 my ($who, $arg) = @_; 3581 my ($who, $arg) = @_;
3047 3582
3048 if ($who->flag (FLAG_WIZ)) { 3583 if ($who->flag (FLAG_WIZ)) {
3049 $who->message ("reloading server."); 3584 $who->message ("reloading server.");
3585 async {
3586 $Coro::current->{desc} = "perl_reload";
3050 async { reload_perl }; 3587 reload_perl;
3588 };
3051 } 3589 }
3052}; 3590};
3053 3591
3054unshift @INC, $LIBDIR; 3592unshift @INC, $LIBDIR;
3055 3593
3074 my $signal = new Coro::Signal; 3612 my $signal = new Coro::Signal;
3075 push @WAIT_FOR_TICK_BEGIN, $signal; 3613 push @WAIT_FOR_TICK_BEGIN, $signal;
3076 $signal->wait; 3614 $signal->wait;
3077} 3615}
3078 3616
3079 my $min = 1e6;#d# 3617$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3080 my $avg = 10;
3081$TICK_WATCHER = Event->timer (
3082 reentrant => 0,
3083 parked => 1,
3084 prio => 0,
3085 at => $NEXT_TICK || $TICK,
3086 data => WF_AUTOCANCEL,
3087 cb => sub {
3088 if ($Coro::current != $Coro::main) { 3618 if ($Coro::current != $Coro::main) {
3089 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"
3090 unless ++$bug_warning > 10; 3620 unless ++$bug_warning > 10;
3091 return; 3621 return;
3092 } 3622 }
3093 3623
3094 $NOW = $tick_start = Event::time; 3624 $NOW = $tick_start = EV::now;
3095 3625
3096 cf::server_tick; # one server iteration 3626 cf::server_tick; # one server iteration
3097 3627
3098 0 && sync_job {#d# 3628 $RUNTIME += $TICK;
3099 for(1..10) { 3629 $NEXT_TICK = $_[0]->at;
3100 my $t = Event::time;
3101 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3102 or die;
3103 3630
3104 $map->width (50); 3631 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3105 $map->height (50); 3632 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3106 $map->alloc; 3633 Coro::async_pool {
3107 $map->_load_objects ("/tmp/x.map", 1); 3634 $Coro::current->{desc} = "runtime saver";
3108 my $t = Event::time - $t; 3635 write_runtime
3109 3636 or warn "ERROR: unable to write runtime file: $!";
3110 #next unless $t < 0.0013;#d#
3111 if ($t < $min) {
3112 $min = $t;
3113 }
3114 $avg = $avg * 0.99 + $t * 0.01;
3115 }
3116 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3117 exit 0;
3118 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3119 }; 3637 };
3638 }
3120 3639
3121 $RUNTIME += $TICK;
3122 $NEXT_TICK += $TICK;
3123
3124 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3125 $NEXT_RUNTIME_WRITE = $NOW + 10;
3126 Coro::async_pool {
3127 write_runtime
3128 or warn "ERROR: unable to write runtime file: $!";
3129 };
3130 }
3131
3132# my $AFTER = Event::time;
3133# warn $AFTER - $NOW;#d#
3134
3135 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3640 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3136 $sig->send; 3641 $sig->send;
3137 } 3642 }
3138 while (my $sig = shift @WAIT_FOR_TICK) { 3643 while (my $sig = shift @WAIT_FOR_TICK) {
3139 $sig->send; 3644 $sig->send;
3140 } 3645 }
3141 3646
3142 $NOW = Event::time;
3143
3144 # if we are delayed by four ticks or more, skip them all
3145 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3146
3147 $TICK_WATCHER->at ($NEXT_TICK);
3148 $TICK_WATCHER->start;
3149
3150 $LOAD = ($NOW - $tick_start) / $TICK; 3647 $LOAD = ($NOW - $tick_start) / $TICK;
3151 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3648 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3152 3649
3153 _post_tick; 3650 _post_tick;
3154 3651};
3155 3652$TICK_WATCHER->priority (EV::MAXPRI);
3156 },
3157);
3158 3653
3159{ 3654{
3160 BDB::max_poll_time $TICK * 0.1; 3655 # configure BDB
3161 $BDB_POLL_WATCHER = Event->io ( 3656
3162 reentrant => 0,
3163 fd => BDB::poll_fileno,
3164 poll => 'r',
3165 prio => 0,
3166 data => WF_AUTOCANCEL,
3167 cb => \&BDB::poll_cb,
3168 );
3169 BDB::min_parallel 8; 3657 BDB::min_parallel 8;
3170 3658 BDB::max_poll_reqs $TICK * 0.1;
3171 BDB::set_sync_prepare { 3659 $Coro::BDB::WATCHER->priority (1);
3172 my $status;
3173 my $current = $Coro::current;
3174 (
3175 sub {
3176 $status = $!;
3177 $current->ready; undef $current;
3178 },
3179 sub {
3180 Coro::schedule while defined $current;
3181 $! = $status;
3182 },
3183 )
3184 };
3185 3660
3186 unless ($DB_ENV) { 3661 unless ($DB_ENV) {
3187 $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);
3188 3667
3189 cf::sync_job { 3668 cf::sync_job {
3190 eval { 3669 eval {
3191 BDB::db_env_open 3670 BDB::db_env_open
3192 $DB_ENV, 3671 $DB_ENV,
3194 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
3195 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3674 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3196 0666; 3675 0666;
3197 3676
3198 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3677 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3199
3200 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3201 $DB_ENV->set_lk_detect;
3202 }; 3678 };
3203 3679
3204 cf::cleanup "db_env_open(db): $@" if $@; 3680 cf::cleanup "db_env_open(db): $@" if $@;
3205 }; 3681 };
3206 } 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 };
3207} 3693}
3208 3694
3209{ 3695{
3696 # configure IO::AIO
3697
3210 IO::AIO::min_parallel 8; 3698 IO::AIO::min_parallel 8;
3211
3212 undef $Coro::AIO::WATCHER;
3213 IO::AIO::max_poll_time $TICK * 0.1; 3699 IO::AIO::max_poll_time $TICK * 0.1;
3214 $AIO_POLL_WATCHER = Event->io ( 3700 $Coro::AIO::WATCHER->priority (1);
3215 reentrant => 0,
3216 data => WF_AUTOCANCEL,
3217 fd => IO::AIO::poll_fileno,
3218 poll => 'r',
3219 prio => 6,
3220 cb => \&IO::AIO::poll_cb,
3221 );
3222} 3701}
3223 3702
3224my $_log_backtrace; 3703my $_log_backtrace;
3225 3704
3226sub _log_backtrace { 3705sub _log_backtrace {
3230 3709
3231 # limit the # of concurrent backtraces 3710 # limit the # of concurrent backtraces
3232 if ($_log_backtrace < 2) { 3711 if ($_log_backtrace < 2) {
3233 ++$_log_backtrace; 3712 ++$_log_backtrace;
3234 async { 3713 async {
3714 $Coro::current->{desc} = "abt $msg";
3715
3235 my @bt = fork_call { 3716 my @bt = fork_call {
3236 @addr = map { sprintf "%x", $_ } @addr; 3717 @addr = map { sprintf "%x", $_ } @addr;
3237 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3718 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3238 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 |"
3239 or die "addr2line: $!"; 3720 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines