ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.299 by root, Sun Jul 8 14:56:05 2007 UTC vs.
Revision 1.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
414sub _store_scalar {
415 open my $fh, ">", \my $buf
416 or die "fork_call: cannot open fh-to-buf in child : $!";
417 Storable::store_fd $_[0], $fh;
418 close $fh;
419
420 $buf
421}
422 526
423sub fork_call(&@) { 527sub fork_call(&@) {
424 my ($cb, @args) = @_; 528 my ($cb, @args) = @_;
425 529
426# 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,
427# or die "socketpair: $!"; 531 # otherwise perl prematurely frees the stuff :/
428 pipe my $fh1, my $fh2 532 # TODO: investigate and fix (likely this will be rather laborious)
429 or die "pipe: $!";
430 533
431 if (my $pid = fork) { 534 my @res = Coro::Util::fork_eval {
432 close $fh2;
433
434 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
435 warn "pst<$res>" unless $res =~ /^pst/;
436 $res = Coro::Storable::thaw $res;
437
438 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
439
440 Carp::confess $$res unless "ARRAY" eq ref $res;
441
442 return wantarray ? @$res : $res->[-1];
443 } else {
444 reset_signals; 535 reset_signals;
445 local $SIG{__WARN__}; 536 &$cb
446 local $SIG{__DIE__}; 537 }, @args;
447 # just in case, this hack effectively disables event
448 # in the child. cleaner and slower would be canceling all watchers,
449 # but this works for the time being.
450 local $Coro::idle;
451 $Coro::current->prio (Coro::PRIO_MAX);
452 538
453 eval { 539 wantarray ? @res : $res[-1]
454 close $fh1;
455
456 my @res = eval { $cb->(@args) };
457
458 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
459 close $fh2;
460 };
461
462 warn $@ if $@;
463 _exit 0;
464 }
465} 540}
466 541
467=item $value = cf::db_get $family => $key 542=item $value = cf::db_get $family => $key
468 543
469Returns a single value from the environment database. 544Returns a single value from the environment database.
471=item cf::db_put $family => $key => $value 546=item cf::db_put $family => $key => $value
472 547
473Stores 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
474data 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).
475 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
476=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}
477 574
478our $DB; 575our $DB;
479 576
480sub db_init { 577sub db_init {
481 unless ($DB) {
482 $DB = BDB::db_create $DB_ENV;
483
484 cf::sync_job { 578 cf::sync_job {
485 eval { 579 $DB ||= db_table "db";
486 $DB->set_flags (BDB::CHKSUM);
487
488 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
489 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
490 cf::cleanup "db_open(db): $!" if $!;
491 };
492 cf::cleanup "db_open(db): $@" if $@;
493 };
494 } 580 };
495} 581}
496 582
497sub db_get($$) { 583sub db_get($$) {
498 my $key = "$_[0]/$_[1]"; 584 my $key = "$_[0]/$_[1]";
499 585
549 if (1) { 635 if (1) {
550 $md5 = 636 $md5 =
551 join "\x00", 637 join "\x00",
552 $processversion, 638 $processversion,
553 map { 639 map {
554 Coro::cede; 640 cf::cede_to_tick;
555 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 641 ($src->[$_], Digest::MD5::md5_hex $data[$_])
556 } 0.. $#$src; 642 } 0.. $#$src;
557 643
558 644
559 my $dbmd5 = db_get cache => "$id/md5"; 645 my $dbmd5 = db_get cache => "$id/md5";
603attach callbacks/event handlers (a collection of which is called an "attachment") 689attach callbacks/event handlers (a collection of which is called an "attachment")
604to it. All such attachable objects support the following methods. 690to it. All such attachable objects support the following methods.
605 691
606In 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>
607C<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
608Crossfire TRT). 694Deliantra).
609 695
610=over 4 696=over 4
611 697
612=item $attachable->attach ($attachment, key => $value...) 698=item $attachable->attach ($attachment, key => $value...)
613 699
865 "; 951 ";
866 die if $@; 952 die if $@;
867} 953}
868 954
869our $override; 955our $override;
870our @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?
871 957
872sub override { 958sub override {
873 $override = 1; 959 $override = 1;
874 @invoke_results = (); 960 @INVOKE_RESULTS = (@_);
875} 961}
876 962
877sub do_invoke { 963sub do_invoke {
878 my $event = shift; 964 my $event = shift;
879 my $callbacks = shift; 965 my $callbacks = shift;
880 966
881 @invoke_results = (); 967 @INVOKE_RESULTS = ();
882 968
883 local $override; 969 local $override;
884 970
885 for (@$callbacks) { 971 for (@$callbacks) {
886 eval { &{$_->[1]} }; 972 eval { &{$_->[1]} };
895 } 981 }
896 982
897 0 983 0
898} 984}
899 985
900=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 986=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
901 987
902=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 988=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
903 989
904Generate an object-specific event with the given arguments. 990Generate an object-specific event with the given arguments.
905 991
906This 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
907removed 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
908results (if you must, access C<@cf::invoke_results> directly). 994results (if you must, access C<@cf::INVOKE_RESULTS> directly).
909 995
910=back 996=back
911 997
912=cut 998=cut
913 999
914############################################################################# 1000#############################################################################
915# 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}
916 1044
917sub reattach { 1045sub reattach {
918 # basically do the same as instantiate, without calling instantiate 1046 # basically do the same as instantiate, without calling instantiate
919 my ($obj) = @_; 1047 my ($obj) = @_;
920 1048
941cf::attachable->attach ( 1069cf::attachable->attach (
942 prio => -1000000, 1070 prio => -1000000,
943 on_instantiate => sub { 1071 on_instantiate => sub {
944 my ($obj, $data) = @_; 1072 my ($obj, $data) = @_;
945 1073
946 $data = from_json $data; 1074 $data = decode_json $data;
947 1075
948 for (@$data) { 1076 for (@$data) {
949 my ($name, $args) = @$_; 1077 my ($name, $args) = @$_;
950 1078
951 $obj->attach ($name, %{$args || {} }); 1079 $obj->attach ($name, %{$args || {} });
967sub object_freezer_save { 1095sub object_freezer_save {
968 my ($filename, $rdata, $objs) = @_; 1096 my ($filename, $rdata, $objs) = @_;
969 1097
970 sync_job { 1098 sync_job {
971 if (length $$rdata) { 1099 if (length $$rdata) {
1100 utf8::decode (my $decname = $filename);
972 warn sprintf "saving %s (%d,%d)\n", 1101 warn sprintf "saving %s (%d,%d)\n",
973 $filename, length $$rdata, scalar @$objs; 1102 $decname, length $$rdata, scalar @$objs;
974 1103
975 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1104 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
976 chmod SAVE_MODE, $fh; 1105 chmod SAVE_MODE, $fh;
977 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1106 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
978 aio_fsync $fh if $cf::USE_FSYNC; 1107 aio_fsync $fh if $cf::USE_FSYNC;
979 close $fh; 1108 close $fh;
980 1109
981 if (@$objs) { 1110 if (@$objs) {
982 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) {
983 chmod SAVE_MODE, $fh; 1112 chmod SAVE_MODE, $fh;
984 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1113 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
985 aio_write $fh, 0, (length $data), $data, 0; 1114 aio_write $fh, 0, (length $data), $data, 0;
986 aio_fsync $fh if $cf::USE_FSYNC; 1115 aio_fsync $fh if $cf::USE_FSYNC;
987 close $fh; 1116 close $fh;
988 aio_rename "$filename.pst~", "$filename.pst"; 1117 aio_rename "$filename.pst~", "$filename.pst";
989 } 1118 }
997 } 1126 }
998 } else { 1127 } else {
999 aio_unlink $filename; 1128 aio_unlink $filename;
1000 aio_unlink "$filename.pst"; 1129 aio_unlink "$filename.pst";
1001 } 1130 }
1002 } 1131 };
1003} 1132}
1004 1133
1005sub object_freezer_as_string { 1134sub object_freezer_as_string {
1006 my ($rdata, $objs) = @_; 1135 my ($rdata, $objs) = @_;
1007 1136
1019 or return; 1148 or return;
1020 1149
1021 unless (aio_stat "$filename.pst") { 1150 unless (aio_stat "$filename.pst") {
1022 (aio_load "$filename.pst", $av) >= 0 1151 (aio_load "$filename.pst", $av) >= 0
1023 or return; 1152 or return;
1153
1024 $av = eval { (Storable::thaw $av)->{objs} }; 1154 my $st = eval { Coro::Storable::thaw $av };
1155 $av = $st->{objs};
1025 } 1156 }
1026 1157
1158 utf8::decode (my $decname = $filename);
1027 warn sprintf "loading %s (%d)\n", 1159 warn sprintf "loading %s (%d,%d)\n",
1028 $filename, length $data, scalar @{$av || []}; 1160 $decname, length $data, scalar @{$av || []};
1161
1029 return ($data, $av); 1162 ($data, $av)
1030} 1163}
1031 1164
1032=head2 COMMAND CALLBACKS 1165=head2 COMMAND CALLBACKS
1033 1166
1034=over 4 1167=over 4
1107 my ($pl, $buf) = @_; 1240 my ($pl, $buf) = @_;
1108 1241
1109 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1242 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1110 1243
1111 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
1112 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1252 if (my $cb = $EXTCMD{$type}) {
1113 if (my %reply = $cb->($pl, $msg)) { 1253 @reply = $cb->($pl, @payload);
1114 $pl->ext_reply ($msg->{msgid}, %reply);
1115 }
1116 } 1254 }
1255
1256 $pl->ext_reply ($reply, @reply)
1257 if $reply;
1258
1117 } else { 1259 } else {
1118 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1260 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1119 } 1261 }
1120 1262
1121 cf::override; 1263 cf::override;
1174 my $msg = $@ ? "$v->{path}: $@\n" 1316 my $msg = $@ ? "$v->{path}: $@\n"
1175 : "$v->{base}: extension inactive.\n"; 1317 : "$v->{base}: extension inactive.\n";
1176 1318
1177 if (exists $v->{meta}{mandatory}) { 1319 if (exists $v->{meta}{mandatory}) {
1178 warn $msg; 1320 warn $msg;
1179 warn "mandatory extension failed to load, exiting.\n"; 1321 cf::cleanup "mandatory extension failed to load, exiting.";
1180 exit 1;
1181 } 1322 }
1182 1323
1183 warn $msg; 1324 warn $msg;
1184 } 1325 }
1185 1326
1210use Coro::AIO; 1351use Coro::AIO;
1211 1352
1212=head3 cf::player 1353=head3 cf::player
1213 1354
1214=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}
1215 1370
1216=item cf::player::find $login 1371=item cf::player::find $login
1217 1372
1218Returns the given player object, loading it if necessary (might block). 1373Returns the given player object, loading it if necessary (might block).
1219 1374
1255 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1410 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1256 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1411 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1257 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1412 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1258 aio_unlink +(playerdir $login) . "/$login.pl"; 1413 aio_unlink +(playerdir $login) . "/$login.pl";
1259 1414
1260 my $pl = load_pl path $login 1415 my $f = new_from_file cf::object::thawer path $login
1261 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;
1262 $cf::PLAYER{$login} = $pl 1422 $cf::PLAYER{$login} = $pl
1263 } 1423 }
1264 } 1424 }
1265} 1425}
1266 1426
1276 1436
1277 aio_mkdir playerdir $pl, 0770; 1437 aio_mkdir playerdir $pl, 0770;
1278 $pl->{last_save} = $cf::RUNTIME; 1438 $pl->{last_save} = $cf::RUNTIME;
1279 1439
1280 $pl->save_pl ($path); 1440 $pl->save_pl ($path);
1281 Coro::cede; 1441 cf::cede_to_tick;
1282} 1442}
1283 1443
1284sub new($) { 1444sub new($) {
1285 my ($login) = @_; 1445 my ($login) = @_;
1286 1446
1290 $self->{deny_save} = 1; 1450 $self->{deny_save} = 1;
1291 1451
1292 $cf::PLAYER{$login} = $self; 1452 $cf::PLAYER{$login} = $self;
1293 1453
1294 $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 (@_);
1295} 1465}
1296 1466
1297=item $pl->quit_character 1467=item $pl->quit_character
1298 1468
1299Nukes the player without looking back. If logged in, the connection will 1469Nukes the player without looking back. If logged in, the connection will
1354 or return []; 1524 or return [];
1355 1525
1356 my @logins; 1526 my @logins;
1357 1527
1358 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") {
1359 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1533 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1360 aio_read $fh, 0, 512, my $buf, 0 or next; 1534 aio_read $fh, 0, 512, my $buf, 0 or next;
1361 $buf !~ /^password -------------$/m or next; # official not-valid tag 1535 $buf !~ /^password -------------$/m or next; # official not-valid tag
1536 }
1362 1537
1363 utf8::decode $login; 1538 utf8::decode $login;
1364 push @logins, $login; 1539 push @logins, $login;
1365 } 1540 }
1366 1541
1399 1574
1400Expand crossfire pod fragments into protocol xml. 1575Expand crossfire pod fragments into protocol xml.
1401 1576
1402=cut 1577=cut
1403 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
1404sub expand_cfpod { 1590sub expand_cfpod {
1405 ((my $self), (local $_)) = @_; 1591 my ($self, $pod) = @_;
1406 1592
1407 # escape & and < 1593 my $xml;
1408 s/&/&amp;/g;
1409 s/(?<![BIUGH])</&lt;/g;
1410 1594
1411 # this is buggy, it needs to properly take care of nested <'s 1595 while () {
1596 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1597 $group = $1;
1412 1598
1413 1 while 1599 $group =~ s/&/&amp;/g;
1414 # replace B<>, I<>, U<> etc. 1600 $group =~ s/</&lt;/g;
1415 s/B<([^\>]*)>/<b>$1<\/b>/ 1601
1416 || s/I<([^\>]*)>/<i>$1<\/i>/ 1602 $xml .= $group;
1417 || s/U<([^\>]*)>/<u>$1<\/u>/ 1603 } elsif ($pod =~ m%\G
1418 # replace G<male|female> tags 1604 ([BCGHITU])
1419 || s{G<([^>|]*)\|([^>]*)>}{ 1605 <
1420 $self->gender ? $2 : $1 1606 (?:
1421 }ge 1607 ([^<>]*) (?{ $group = $^N })
1422 # replace H<hint text> 1608 | < $interior >
1423 || s{H<([^\>]*)>} 1609 )
1610 >
1611 %gcsx
1424 { 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") {
1425 ("<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>",
1426 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1631 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1427 "") 1632 "")
1428 [$self->{hintmode}] 1633 [$self->{hintmode}];
1634 } else {
1635 $xml .= "error processing '$code($data)' directive";
1429 }ge; 1636 }
1637 } else {
1638 if ($pod =~ /\G(.+)/) {
1639 warn "parse error while expanding $pod (at $1)";
1640 }
1641 last;
1642 }
1643 }
1430 1644
1645 for ($xml) {
1431 # create single paragraphs (very hackish) 1646 # create single paragraphs (very hackish)
1432 s/(?<=\S)\n(?=\w)/ /g; 1647 s/(?<=\S)\n(?=\w)/ /g;
1433 1648
1434 # compress some whitespace 1649 # compress some whitespace
1435 s/\s+\n/\n/g; # ws line-ends 1650 s/\s+\n/\n/g; # ws line-ends
1436 s/\n\n+/\n/g; # double lines 1651 s/\n\n+/\n/g; # double lines
1437 s/^\n+//; # beginning lines 1652 s/^\n+//; # beginning lines
1438 s/\n+$//; # ending lines 1653 s/\n+$//; # ending lines
1654 }
1439 1655
1440 $_ 1656 $xml
1441} 1657}
1658
1659no re 'eval';
1442 1660
1443sub hintmode { 1661sub hintmode {
1444 $_[0]{hintmode} = $_[1] if @_ > 1; 1662 $_[0]{hintmode} = $_[1] if @_ > 1;
1445 $_[0]{hintmode} 1663 $_[0]{hintmode}
1446} 1664}
1447 1665
1448=item $player->ext_reply ($msgid, %msg) 1666=item $player->ext_reply ($msgid, @msg)
1449 1667
1450Sends an ext reply to the player. 1668Sends an ext reply to the player.
1451 1669
1452=cut 1670=cut
1453 1671
1454sub ext_reply($$%) { 1672sub ext_reply($$@) {
1455 my ($self, $id, %msg) = @_; 1673 my ($self, $id, @msg) = @_;
1456 1674
1457 $msg{msgid} = $id; 1675 $self->ns->ext_reply ($id, @msg)
1458 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1459} 1676}
1460 1677
1461=item $player->ext_event ($type, %msg) 1678=item $player->ext_msg ($type, @msg)
1462 1679
1463Sends an ext event to the client. 1680Sends an ext event to the client.
1464 1681
1465=cut 1682=cut
1466 1683
1467sub ext_event($$%) { 1684sub ext_msg($$@) {
1468 my ($self, $type, %msg) = @_; 1685 my ($self, $type, @msg) = @_;
1469 1686
1470 $self->ns->ext_event ($type, %msg); 1687 $self->ns->ext_msg ($type, @msg);
1471} 1688}
1472 1689
1473=head3 cf::region 1690=head3 cf::region
1474 1691
1475=over 4 1692=over 4
1488 my ($path) = @_; 1705 my ($path) = @_;
1489 1706
1490 my ($match, $specificity); 1707 my ($match, $specificity);
1491 1708
1492 for my $region (list) { 1709 for my $region (list) {
1493 if ($region->match && $path =~ $region->match) { 1710 if ($region->{match} && $path =~ $region->{match}) {
1494 ($match, $specificity) = ($region, $region->specificity) 1711 ($match, $specificity) = ($region, $region->specificity)
1495 if $region->specificity > $specificity; 1712 if $region->specificity > $specificity;
1496 } 1713 }
1497 } 1714 }
1498 1715
1618 $self->init; # pass $1 etc. 1835 $self->init; # pass $1 etc.
1619 return $self; 1836 return $self;
1620 } 1837 }
1621 } 1838 }
1622 1839
1623 Carp::carp "unable to resolve path '$path' (base '$base')."; 1840 Carp::cluck "unable to resolve path '$path' (base '$base').";
1624 () 1841 ()
1625} 1842}
1626 1843
1627sub init { 1844sub init {
1628 my ($self) = @_; 1845 my ($self) = @_;
1691 1908
1692sub load_header_from($) { 1909sub load_header_from($) {
1693 my ($self, $path) = @_; 1910 my ($self, $path) = @_;
1694 1911
1695 utf8::encode $path; 1912 utf8::encode $path;
1696 #aio_open $path, O_RDONLY, 0 1913 my $f = new_from_file cf::object::thawer $path
1697 # or return;
1698
1699 $self->_load_header ($path)
1700 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;
1701 1921
1702 $self->{load_path} = $path; 1922 $self->{load_path} = $path;
1703 1923
1704 1 1924 1
1705} 1925}
1759sub find { 1979sub find {
1760 my ($path, $origin) = @_; 1980 my ($path, $origin) = @_;
1761 1981
1762 $path = normalise $path, $origin && $origin->path; 1982 $path = normalise $path, $origin && $origin->path;
1763 1983
1984 cf::lock_wait "map_data:$path";#d#remove
1764 cf::lock_wait "map_find:$path"; 1985 cf::lock_wait "map_find:$path";
1765 1986
1766 $cf::MAP{$path} || do { 1987 $cf::MAP{$path} || do {
1767 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
1768 my $map = new_from_path cf::map $path 1991 my $map = new_from_path cf::map $path
1769 or return; 1992 or return;
1770 1993
1771 $map->{last_save} = $cf::RUNTIME; 1994 $map->{last_save} = $cf::RUNTIME;
1772 1995
1774 or return; 1997 or return;
1775 1998
1776 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1999 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1777 # doing this can freeze the server in a sync job, obviously 2000 # doing this can freeze the server in a sync job, obviously
1778 #$cf::WAIT_FOR_TICK->wait; 2001 #$cf::WAIT_FOR_TICK->wait;
2002 undef $guard1;
2003 undef $guard2;
1779 $map->reset; 2004 $map->reset;
1780 undef $guard;
1781 return find $path; 2005 return find $path;
1782 } 2006 }
1783 2007
1784 $cf::MAP{$path} = $map 2008 $cf::MAP{$path} = $map
1785 } 2009 }
1794 local $self->{deny_reset} = 1; # loading can take a long time 2018 local $self->{deny_reset} = 1; # loading can take a long time
1795 2019
1796 my $path = $self->{path}; 2020 my $path = $self->{path};
1797 2021
1798 { 2022 {
1799 my $guard = cf::lock_acquire "map_load:$path"; 2023 my $guard = cf::lock_acquire "map_data:$path";
1800 2024
2025 return unless $self->valid;
1801 return if $self->in_memory != cf::MAP_SWAPPED; 2026 return unless $self->in_memory == cf::MAP_SWAPPED;
1802 2027
1803 $self->in_memory (cf::MAP_LOADING); 2028 $self->in_memory (cf::MAP_LOADING);
1804 2029
1805 $self->alloc; 2030 $self->alloc;
1806 2031
1807 $self->pre_load; 2032 $self->pre_load;
1808 Coro::cede; 2033 cf::cede_to_tick;
1809 2034
2035 my $f = new_from_file cf::object::thawer $self->{load_path};
2036 $f->skip_block;
1810 $self->_load_objects ($self->{load_path}, 1) 2037 $self->_load_objects ($f)
1811 or return; 2038 or return;
1812 2039
1813 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2040 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1814 if delete $self->{load_original}; 2041 if delete $self->{load_original};
1815 2042
1816 if (my $uniq = $self->uniq_path) { 2043 if (my $uniq = $self->uniq_path) {
1817 utf8::encode $uniq; 2044 utf8::encode $uniq;
1818 if (aio_open $uniq, O_RDONLY, 0) { 2045 unless (aio_stat $uniq) {
2046 if (my $f = new_from_file cf::object::thawer $uniq) {
1819 $self->clear_unique_items; 2047 $self->clear_unique_items;
1820 $self->_load_objects ($uniq, 0); 2048 $self->_load_objects ($f);
2049 $f->resolve_delayed_derefs;
2050 }
1821 } 2051 }
1822 } 2052 }
1823 2053
1824 Coro::cede; 2054 $f->resolve_delayed_derefs;
2055
2056 cf::cede_to_tick;
1825 # now do the right thing for maps 2057 # now do the right thing for maps
1826 $self->link_multipart_objects; 2058 $self->link_multipart_objects;
1827 $self->difficulty ($self->estimate_difficulty) 2059 $self->difficulty ($self->estimate_difficulty)
1828 unless $self->difficulty; 2060 unless $self->difficulty;
1829 Coro::cede; 2061 cf::cede_to_tick;
1830 2062
1831 unless ($self->{deny_activate}) { 2063 unless ($self->{deny_activate}) {
1832 $self->decay_objects; 2064 $self->decay_objects;
1833 $self->fix_auto_apply; 2065 $self->fix_auto_apply;
1834 $self->update_buttons; 2066 $self->update_buttons;
1835 Coro::cede; 2067 cf::cede_to_tick;
1836 $self->set_darkness_map; 2068 $self->set_darkness_map;
1837 Coro::cede; 2069 cf::cede_to_tick;
1838 $self->activate; 2070 $self->activate;
1839 } 2071 }
2072
2073 $self->{last_save} = $cf::RUNTIME;
2074 $self->last_access ($cf::RUNTIME);
1840 2075
1841 $self->in_memory (cf::MAP_IN_MEMORY); 2076 $self->in_memory (cf::MAP_IN_MEMORY);
1842 } 2077 }
1843 2078
1844 $self->post_load; 2079 $self->post_load;
1855 2090
1856 $self 2091 $self
1857} 2092}
1858 2093
1859# 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
1860sub load_diag { 2095sub load_neighbours {
1861 my ($map) = @_; 2096 my ($map) = @_;
1862 2097
1863 my @diag; # diagonal neighbours 2098 my @neigh; # diagonal neighbours
1864 2099
1865 for (0 .. 3) { 2100 for (0 .. 3) {
1866 my $neigh = $map->tile_path ($_) 2101 my $neigh = $map->tile_path ($_)
1867 or next; 2102 or next;
1868 $neigh = find $neigh, $map 2103 $neigh = find $neigh, $map
1869 or next; 2104 or next;
1870 $neigh->load; 2105 $neigh->load;
1871 2106
2107 push @neigh,
1872 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2108 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1873 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2109 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1874 } 2110 }
1875 2111
1876 for (@diag) { 2112 for (grep defined $_->[0], @neigh) {
2113 my ($path, $origin) = @$_;
1877 my $neigh = find @$_ 2114 my $neigh = find $path, $origin
1878 or next; 2115 or next;
1879 $neigh->load; 2116 $neigh->load;
1880 } 2117 }
1881} 2118}
1882 2119
1887} 2124}
1888 2125
1889sub do_load_sync { 2126sub do_load_sync {
1890 my ($map) = @_; 2127 my ($map) = @_;
1891 2128
2129 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2130 if $Coro::current == $Coro::main;
2131
1892 cf::sync_job { $map->load }; 2132 cf::sync_job { $map->load };
1893} 2133}
1894 2134
1895our %MAP_PREFETCH; 2135our %MAP_PREFETCH;
1896our $MAP_PREFETCHER = undef; 2136our $MAP_PREFETCHER = undef;
1897 2137
1898sub find_async { 2138sub find_async {
1899 my ($path, $origin) = @_; 2139 my ($path, $origin, $load) = @_;
1900 2140
1901 $path = normalise $path, $origin && $origin->{path}; 2141 $path = normalise $path, $origin && $origin->{path};
1902 2142
1903 if (my $map = $cf::MAP{$path}) { 2143 if (my $map = $cf::MAP{$path}) {
1904 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2144 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1905 } 2145 }
1906 2146
1907 undef $MAP_PREFETCH{$path}; 2147 $MAP_PREFETCH{$path} |= $load;
2148
1908 $MAP_PREFETCHER ||= cf::async { 2149 $MAP_PREFETCHER ||= cf::async {
2150 $Coro::current->{desc} = "map prefetcher";
2151
1909 while (%MAP_PREFETCH) { 2152 while (%MAP_PREFETCH) {
1910 for my $path (keys %MAP_PREFETCH) { 2153 while (my ($k, $v) = each %MAP_PREFETCH) {
1911 my $map = find $path 2154 if (my $map = find $k) {
1912 or next;
1913 $map->load; 2155 $map->load if $v;
2156 }
1914 2157
1915 delete $MAP_PREFETCH{$path}; 2158 delete $MAP_PREFETCH{$k};
1916 } 2159 }
1917 } 2160 }
1918 undef $MAP_PREFETCHER; 2161 undef $MAP_PREFETCHER;
1919 }; 2162 };
1920 $MAP_PREFETCHER->prio (6); 2163 $MAP_PREFETCHER->prio (6);
1923} 2166}
1924 2167
1925sub save { 2168sub save {
1926 my ($self) = @_; 2169 my ($self) = @_;
1927 2170
1928 my $lock = cf::lock_acquire "map_data:" . $self->path; 2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
1929 2172
1930 $self->{last_save} = $cf::RUNTIME; 2173 $self->{last_save} = $cf::RUNTIME;
1931 2174
1932 return unless $self->dirty; 2175 return unless $self->dirty;
1933 2176
1939 return if $self->{deny_save}; 2182 return if $self->{deny_save};
1940 2183
1941 local $self->{last_access} = $self->last_access;#d# 2184 local $self->{last_access} = $self->last_access;#d#
1942 2185
1943 cf::async { 2186 cf::async {
2187 $Coro::current->{desc} = "map player save";
1944 $_->contr->save for $self->players; 2188 $_->contr->save for $self->players;
1945 }; 2189 };
1946 2190
1947 if ($uniq) { 2191 if ($uniq) {
1948 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2192 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1956 my ($self) = @_; 2200 my ($self) = @_;
1957 2201
1958 # save first because save cedes 2202 # save first because save cedes
1959 $self->save; 2203 $self->save;
1960 2204
1961 my $lock = cf::lock_acquire "map_data:" . $self->path; 2205 my $lock = cf::lock_acquire "map_data:$self->{path}";
1962 2206
1963 return if $self->players; 2207 return if $self->players;
1964 return if $self->in_memory != cf::MAP_IN_MEMORY; 2208 return if $self->in_memory != cf::MAP_IN_MEMORY;
1965 return if $self->{deny_save}; 2209 return if $self->{deny_save};
1966 2210
2211 $self->in_memory (cf::MAP_SWAPPED);
2212
2213 $self->deactivate;
2214 $_->clear_links_to ($self) for values %cf::MAP;
1967 $self->clear; 2215 $self->clear;
1968 $self->in_memory (cf::MAP_SWAPPED);
1969} 2216}
1970 2217
1971sub reset_at { 2218sub reset_at {
1972 my ($self) = @_; 2219 my ($self) = @_;
1973 2220
2005 if $uniq; 2252 if $uniq;
2006 } 2253 }
2007 2254
2008 delete $cf::MAP{$self->path}; 2255 delete $cf::MAP{$self->path};
2009 2256
2257 $self->deactivate;
2258 $_->clear_links_to ($self) for values %cf::MAP;
2010 $self->clear; 2259 $self->clear;
2011
2012 $_->clear_links_to ($self) for values %cf::MAP;
2013 2260
2014 $self->unlink_save; 2261 $self->unlink_save;
2015 $self->destroy; 2262 $self->destroy;
2016} 2263}
2017 2264
2018my $nuke_counter = "aaaa"; 2265my $nuke_counter = "aaaa";
2019 2266
2020sub nuke { 2267sub nuke {
2021 my ($self) = @_; 2268 my ($self) = @_;
2022 2269
2270 {
2271 my $lock = cf::lock_acquire "map_data:$self->{path}";
2272
2023 delete $cf::MAP{$self->path}; 2273 delete $cf::MAP{$self->path};
2024 2274
2025 $self->unlink_save; 2275 $self->unlink_save;
2026 2276
2027 bless $self, "cf::map"; 2277 bless $self, "cf::map";
2028 delete $self->{deny_reset}; 2278 delete $self->{deny_reset};
2029 $self->{deny_save} = 1; 2279 $self->{deny_save} = 1;
2030 $self->reset_timeout (1); 2280 $self->reset_timeout (1);
2031 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2281 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2032 2282
2033 $cf::MAP{$self->path} = $self; 2283 $cf::MAP{$self->path} = $self;
2284 }
2034 2285
2035 $self->reset; # polite request, might not happen 2286 $self->reset; # polite request, might not happen
2036} 2287}
2037 2288
2038=item $maps = cf::map::tmp_maps 2289=item $maps = cf::map::tmp_maps
2114 2365
2115sub inv_recursive { 2366sub inv_recursive {
2116 inv_recursive_ inv $_[0] 2367 inv_recursive_ inv $_[0]
2117} 2368}
2118 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
2119package cf; 2398package cf;
2120 2399
2121=back 2400=back
2122 2401
2123=head3 cf::object::player 2402=head3 cf::object::player
2145 2424
2146 } else { 2425 } else {
2147 my $pl = $self->contr; 2426 my $pl = $self->contr;
2148 2427
2149 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2428 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2150 my $diag = $pl->{npc_dialog}; 2429 my $dialog = $pl->{npc_dialog};
2151 $diag->{pl}->ext_reply ( 2430 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2152 $diag->{id},
2153 msgtype => "reply",
2154 msg => $diag->{pl}->expand_cfpod ($msg),
2155 add_topics => []
2156 );
2157 2431
2158 } else { 2432 } else {
2159 $msg = $npc->name . " says: $msg" if $npc; 2433 $msg = $npc->name . " says: $msg" if $npc;
2160 $self->message ($msg, $flags); 2434 $self->message ($msg, $flags);
2161 } 2435 }
2162 } 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 (@_);
2163} 2447}
2164 2448
2165=item $player_object->may ("access") 2449=item $player_object->may ("access")
2166 2450
2167Returns wether the given player is authorized to access resource "access" 2451Returns wether the given player is authorized to access resource "access"
2246 # use -1 or undef as default coordinates, not 0, 0 2530 # use -1 or undef as default coordinates, not 0, 0
2247 ($x, $y) = ($map->enter_x, $map->enter_y) 2531 ($x, $y) = ($map->enter_x, $map->enter_y)
2248 if $x <=0 && $y <= 0; 2532 if $x <=0 && $y <= 0;
2249 2533
2250 $map->load; 2534 $map->load;
2251 $map->load_diag; 2535 $map->load_neighbours;
2252 2536
2253 return unless $self->contr->active; 2537 return unless $self->contr->active;
2254 $self->activate_recursive; 2538 $self->activate_recursive;
2255 2539
2256 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2540 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2257 $self->enter_map ($map, $x, $y); 2541 $self->enter_map ($map, $x, $y);
2258} 2542}
2259 2543
2260=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2544=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2261 2545
2262Moves 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
2263her, loading and preparing them map, calling the provided $check callback 2547her, loading and preparing them map, calling the provided $check callback
2264that 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
2265the 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.
2266 2551
2267=cut 2552=cut
2268 2553
2269our $GOTOGEN; 2554our $GOTOGEN;
2270 2555
2271sub cf::object::player::goto { 2556sub cf::object::player::goto {
2272 my ($self, $path, $x, $y, $check) = @_; 2557 my ($self, $path, $x, $y, $check, $done) = @_;
2273 2558
2274 # 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
2275 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2560 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2276 2561
2277 $self->enter_link; 2562 $self->enter_link;
2278 2563
2279 (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
2280 my $map = eval { 2586 my $map = eval {
2281 my $map = cf::map::find $path; 2587 my $map = defined $path ? cf::map::find $path : undef;
2282 2588
2283 if ($map) { 2589 if ($map) {
2284 $map = $map->customise_for ($self); 2590 $map = $map->customise_for ($self);
2285 $map = $check->($map) if $check && $map; 2591 $map = $check->($map) if $check && $map;
2286 } else { 2592 } else {
2287 $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);
2288 } 2594 }
2289 2595
2290 $map 2596 $map
2291 }; 2597 };
2292 2598
2297 2603
2298 if ($gen == $self->{_goto_generation}) { 2604 if ($gen == $self->{_goto_generation}) {
2299 delete $self->{_goto_generation}; 2605 delete $self->{_goto_generation};
2300 $self->leave_link ($map, $x, $y); 2606 $self->leave_link ($map, $x, $y);
2301 } 2607 }
2608
2609 $done->() if $done;
2302 })->prio (1); 2610 })->prio (1);
2303} 2611}
2304 2612
2305=item $player_object->enter_exit ($exit_object) 2613=item $player_object->enter_exit ($exit_object)
2306 2614
2343 $rmp->{origin_y} = $exit->y; 2651 $rmp->{origin_y} = $exit->y;
2344 } 2652 }
2345 2653
2346 $rmp->{random_seed} ||= $exit->random_seed; 2654 $rmp->{random_seed} ||= $exit->random_seed;
2347 2655
2348 my $data = cf::to_json $rmp; 2656 my $data = cf::encode_json $rmp;
2349 my $md5 = Digest::MD5::md5_hex $data; 2657 my $md5 = Digest::MD5::md5_hex $data;
2350 my $meta = "$RANDOMDIR/$md5.meta"; 2658 my $meta = "$RANDOMDIR/$md5.meta";
2351 2659
2352 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2660 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2353 aio_write $fh, 0, (length $data), $data, 0; 2661 aio_write $fh, 0, (length $data), $data, 0;
2380 # if exit is damned, update players death & WoR home-position 2688 # if exit is damned, update players death & WoR home-position
2381 $self->contr->savebed ($slaying, $hp, $sp) 2689 $self->contr->savebed ($slaying, $hp, $sp)
2382 if $exit->flag (FLAG_DAMNED); 2690 if $exit->flag (FLAG_DAMNED);
2383 2691
2384 (async { 2692 (async {
2693 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2694
2385 $self->deactivate_recursive; # just to be sure 2695 $self->deactivate_recursive; # just to be sure
2386 unless (eval { 2696 unless (eval {
2387 $self->goto ($slaying, $hp, $sp); 2697 $self->goto ($slaying, $hp, $sp);
2388 2698
2389 1; 2699 1;
2415 2725
2416 utf8::encode $text; 2726 utf8::encode $text;
2417 $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);
2418} 2728}
2419 2729
2420=item $client->send_msg ($color, $type, $msg, [extra...]) 2730=item $client->send_msg ($channel, $msg, $color, [extra...])
2421 2731
2422Send 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
2423client 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
2424the 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
2425the message unless the client supports the msg packet. 2735the message unless the client supports the msg packet.
2426 2736
2427=cut 2737=cut
2428 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
2429sub cf::client::send_msg { 2791sub cf::client::send_msg {
2430 my ($self, $color, $type, $msg, @extra) = @_; 2792 my ($self, $channel, $msg, $color, @extra) = @_;
2431 2793
2432 $msg = $self->pl->expand_cfpod ($msg); 2794 $msg = $self->pl->expand_cfpod ($msg);
2433 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
2434 return unless @extra || length $msg; 2818 return unless @extra || length $msg;
2435 2819
2436 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
2437 $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]));
2438 } else { 2827 } else {
2439 # replace some tags by gcfclient-compatible ones
2440 for ($msg) {
2441 1 while
2442 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2443 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2444 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2445 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2446 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2447 }
2448
2449 if ($color >= 0) { 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
2450 if (0 && $msg =~ /\[/) { 2843 if (0 && $msg =~ /\[/) {
2844 # COMMAND/INFO
2451 $self->send_packet ("drawextinfo $color 4 0 $msg") 2845 $self->send_packet ("drawextinfo $color 10 8 $msg")
2452 } else { 2846 } else {
2453 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2847 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2454 $self->send_packet ("drawinfo $color $msg") 2848 $self->send_packet ("drawinfo $color $msg")
2455 } 2849 }
2456 } 2850 }
2457 } 2851 }
2458} 2852}
2459 2853
2460=item $client->ext_event ($type, %msg) 2854=item $client->ext_msg ($type, @msg)
2461 2855
2462Sends an ext event to the client. 2856Sends an ext event to the client.
2463 2857
2464=cut 2858=cut
2465 2859
2466sub cf::client::ext_event($$%) { 2860sub cf::client::ext_msg($$@) {
2467 my ($self, $type, %msg) = @_; 2861 my ($self, $type, @msg) = @_;
2468 2862
2863 if ($self->extcmd == 2) {
2864 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2865 } elsif ($self->extcmd == 1) { # TODO: remove
2469 $msg{msgtype} = "event_$type"; 2866 push @msg, msgtype => "event_$type";
2470 $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 }
2471} 2887}
2472 2888
2473=item $success = $client->query ($flags, "text", \&cb) 2889=item $success = $client->query ($flags, "text", \&cb)
2474 2890
2475Queues a query to the client, calling the given callback with 2891Queues a query to the client, calling the given callback with
2530 my ($ns, $buf) = @_; 2946 my ($ns, $buf) = @_;
2531 2947
2532 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2948 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2533 2949
2534 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
2535 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2958 if (my $cb = $EXTICMD{$type}) {
2536 if (my %reply = $cb->($ns, $msg)) { 2959 @reply = $cb->($ns, @payload);
2537 $reply{msgid} = $msg->{msgid};
2538 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2539 }
2540 } 2960 }
2961
2962 $ns->ext_reply ($reply, @reply)
2963 if $reply;
2964
2541 } else { 2965 } else {
2542 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";
2543 } 2967 }
2544 2968
2545 cf::override; 2969 cf::override;
2592our $safe = new Safe "safe"; 3016our $safe = new Safe "safe";
2593our $safe_hole = new Safe::Hole; 3017our $safe_hole = new Safe::Hole;
2594 3018
2595$SIG{FPE} = 'IGNORE'; 3019$SIG{FPE} = 'IGNORE';
2596 3020
2597$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));
2598 3026
2599# here we export the classes and methods available to script code 3027# here we export the classes and methods available to script code
2600 3028
2601=pod 3029=pod
2602 3030
2603The following functions and methods are available within a safe environment: 3031The following functions and methods are available within a safe environment:
2604 3032
2605 cf::object 3033 cf::object
2606 contr pay_amount pay_player map x y force_find force_add 3034 contr pay_amount pay_player map x y force_find force_add destroy
2607 insert remove 3035 insert remove name archname title slaying race decrease_ob_nr
2608 3036
2609 cf::object::player 3037 cf::object::player
2610 player 3038 player
2611 3039
2612 cf::player 3040 cf::player
2617 3045
2618=cut 3046=cut
2619 3047
2620for ( 3048for (
2621 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 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
2622 insert remove)], 3051 decrease_ob_nr destroy)],
2623 ["cf::object::player" => qw(player)], 3052 ["cf::object::player" => qw(player)],
2624 ["cf::player" => qw(peaceful)], 3053 ["cf::player" => qw(peaceful)],
2625 ["cf::map" => qw(trigger)], 3054 ["cf::map" => qw(trigger)],
2626) { 3055) {
2627 no strict 'refs'; 3056 no strict 'refs';
2703# the server's init and main functions 3132# the server's init and main functions
2704 3133
2705sub load_facedata($) { 3134sub load_facedata($) {
2706 my ($path) = @_; 3135 my ($path) = @_;
2707 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
2708 warn "loading facedata from $path\n"; 3143 warn "loading facedata from $path\n";
2709 3144
2710 my $facedata; 3145 my $facedata;
2711 0 < aio_load $path, $facedata 3146 0 < aio_load $path, $facedata
2712 or die "$path: $!"; 3147 or die "$path: $!";
2714 $facedata = Coro::Storable::thaw $facedata; 3149 $facedata = Coro::Storable::thaw $facedata;
2715 3150
2716 $facedata->{version} == 2 3151 $facedata->{version} == 2
2717 or cf::cleanup "$path: version mismatch, cannot proceed."; 3152 or cf::cleanup "$path: version mismatch, cannot proceed.";
2718 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
2719 { 3161 {
2720 my $faces = $facedata->{faceinfo}; 3162 my $faces = $facedata->{faceinfo};
2721 3163
2722 while (my ($face, $info) = each %$faces) { 3164 while (my ($face, $info) = each %$faces) {
2723 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3165 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3166
2724 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3167 cf::face::set_visibility $idx, $info->{visibility};
3168 cf::face::set_magicmap $idx, $info->{magicmap};
2725 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3169 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2726 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3170 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2727 Coro::cede; 3171
3172 cf::cede_to_tick;
2728 } 3173 }
2729 3174
2730 while (my ($face, $info) = each %$faces) { 3175 while (my ($face, $info) = each %$faces) {
2731 next unless $info->{smooth}; 3176 next unless $info->{smooth};
3177
2732 my $idx = cf::face::find $face 3178 my $idx = cf::face::find $face
2733 or next; 3179 or next;
3180
2734 if (my $smooth = cf::face::find $info->{smooth}) { 3181 if (my $smooth = cf::face::find $info->{smooth}) {
3182 cf::face::set_smooth $idx, $smooth;
2735 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3183 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2736 } else { 3184 } else {
2737 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3185 warn "smooth face '$info->{smooth}' not found for face '$face'";
2738 } 3186 }
2739 Coro::cede; 3187
3188 cf::cede_to_tick;
2740 } 3189 }
2741 } 3190 }
2742 3191
2743 { 3192 {
2744 my $anims = $facedata->{animinfo}; 3193 my $anims = $facedata->{animinfo};
2745 3194
2746 while (my ($anim, $info) = each %$anims) { 3195 while (my ($anim, $info) = each %$anims) {
2747 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3196 cf::anim::set $anim, $info->{frames}, $info->{facings};
2748 Coro::cede; 3197 cf::cede_to_tick;
2749 } 3198 }
2750 3199
2751 cf::anim::invalidate_all; # d'oh 3200 cf::anim::invalidate_all; # d'oh
2752 } 3201 }
2753 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
2754 1 3238 1
2755} 3239}
2756 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
2757sub 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
2758 load_resource_file "$MAPDIR/regions" 3274 load_resource_file "$MAPDIR/regions"
2759 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 }
2760} 3281}
2761 3282
2762sub reload_facedata { 3283sub reload_facedata {
2763 load_facedata "$DATADIR/facedata" 3284 load_facedata "$DATADIR/facedata"
2764 or die "unable to load facedata\n"; 3285 or die "unable to load facedata\n";
2793 3314
2794sub init { 3315sub init {
2795 reload_resources; 3316 reload_resources;
2796} 3317}
2797 3318
2798sub cfg_load { 3319sub reload_config {
2799 open my $fh, "<:utf8", "$CONFDIR/config" 3320 open my $fh, "<:utf8", "$CONFDIR/config"
2800 or return; 3321 or return;
2801 3322
2802 local $/; 3323 local $/;
2803 *CFG = YAML::Syck::Load <$fh>; 3324 *CFG = YAML::Load <$fh>;
2804 3325
2805 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3326 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2806 3327
2807 $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};
2808 $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};
2819sub main { 3340sub main {
2820 # we must not ever block the main coroutine 3341 # we must not ever block the main coroutine
2821 local $Coro::idle = sub { 3342 local $Coro::idle = sub {
2822 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#
2823 (async { 3344 (async {
2824 Event::one_event; 3345 $Coro::current->{desc} = "IDLE BUG HANDLER";
3346 EV::loop EV::LOOP_ONESHOT;
2825 })->prio (Coro::PRIO_MAX); 3347 })->prio (Coro::PRIO_MAX);
2826 }; 3348 };
2827 3349
2828 cfg_load; 3350 reload_config;
2829 db_init; 3351 db_init;
2830 load_extensions; 3352 load_extensions;
2831 3353
2832 $TICK_WATCHER->start; 3354 $TICK_WATCHER->start;
3355 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
2833 Event::loop; 3356 EV::loop;
2834} 3357}
2835 3358
2836############################################################################# 3359#############################################################################
2837# initialisation and cleanup 3360# initialisation and cleanup
2838 3361
2839# install some emergency cleanup handlers 3362# install some emergency cleanup handlers
2840BEGIN { 3363BEGIN {
3364 our %SIGWATCHER = ();
2841 for my $signal (qw(INT HUP TERM)) { 3365 for my $signal (qw(INT HUP TERM)) {
2842 Event->signal ( 3366 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2843 reentrant => 0,
2844 data => WF_AUTOCANCEL,
2845 signal => $signal,
2846 prio => 0,
2847 cb => sub {
2848 cf::cleanup "SIG$signal"; 3367 cf::cleanup "SIG$signal";
2849 },
2850 ); 3368 };
2851 } 3369 }
2852} 3370}
2853 3371
2854sub write_runtime { 3372sub write_runtime {
2855 my $runtime = "$LOCALDIR/runtime"; 3373 my $runtime = "$LOCALDIR/runtime";
2900 # and maps saved/destroyed asynchronously. 3418 # and maps saved/destroyed asynchronously.
2901 warn "begin emergency player save\n"; 3419 warn "begin emergency player save\n";
2902 for my $login (keys %cf::PLAYER) { 3420 for my $login (keys %cf::PLAYER) {
2903 my $pl = $cf::PLAYER{$login} or next; 3421 my $pl = $cf::PLAYER{$login} or next;
2904 $pl->valid or next; 3422 $pl->valid or next;
3423 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2905 $pl->save; 3424 $pl->save;
2906 } 3425 }
2907 warn "end emergency player save\n"; 3426 warn "end emergency player save\n";
2908 3427
2909 warn "begin emergency map save\n"; 3428 warn "begin emergency map save\n";
2948 warn "syncing database to disk"; 3467 warn "syncing database to disk";
2949 BDB::db_env_txn_checkpoint $DB_ENV; 3468 BDB::db_env_txn_checkpoint $DB_ENV;
2950 3469
2951 # 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
2952 3471
2953 warn "cancelling all WF_AUTOCANCEL watchers";
2954 for (Event::all_watchers) {
2955 $_->cancel if $_->data & WF_AUTOCANCEL;
2956 }
2957
2958 warn "flushing outstanding aio requests"; 3472 warn "flushing outstanding aio requests";
2959 for (;;) { 3473 for (;;) {
2960 BDB::flush; 3474 BDB::flush;
2961 IO::AIO::flush; 3475 IO::AIO::flush;
2962 Coro::cede; 3476 Coro::cede_notself;
2963 last unless IO::AIO::nreqs || BDB::nreqs; 3477 last unless IO::AIO::nreqs || BDB::nreqs;
2964 warn "iterate..."; 3478 warn "iterate...";
2965 } 3479 }
2966 3480
2967 ++$RELOAD; 3481 ++$RELOAD;
3026 warn "reloading cf.pm"; 3540 warn "reloading cf.pm";
3027 require cf; 3541 require cf;
3028 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3542 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3029 3543
3030 warn "loading config and database again"; 3544 warn "loading config and database again";
3031 cf::cfg_load; 3545 cf::reload_config;
3032 3546
3033 warn "loading extensions"; 3547 warn "loading extensions";
3034 cf::load_extensions; 3548 cf::load_extensions;
3035 3549
3036 warn "reattaching attachments to objects/players"; 3550 warn "reattaching attachments to objects/players";
3043 warn "leaving sync_job"; 3557 warn "leaving sync_job";
3044 3558
3045 1 3559 1
3046 } or do { 3560 } or do {
3047 warn $@; 3561 warn $@;
3048 warn "error while reloading, exiting."; 3562 cf::cleanup "error while reloading, exiting.";
3049 exit 1;
3050 }; 3563 };
3051 3564
3052 warn "reloaded"; 3565 warn "reloaded";
3053}; 3566};
3054 3567
3056 3569
3057sub reload_perl() { 3570sub reload_perl() {
3058 # doing reload synchronously and two reloads happen back-to-back, 3571 # doing reload synchronously and two reloads happen back-to-back,
3059 # coro crashes during coro_state_free->destroy here. 3572 # coro crashes during coro_state_free->destroy here.
3060 3573
3061 $RELOAD_WATCHER ||= Event->timer ( 3574 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3062 reentrant => 0,
3063 after => 0,
3064 data => WF_AUTOCANCEL,
3065 cb => sub {
3066 do_reload_perl; 3575 do_reload_perl;
3067 undef $RELOAD_WATCHER; 3576 undef $RELOAD_WATCHER;
3068 },
3069 ); 3577 };
3070} 3578}
3071 3579
3072register_command "reload" => sub { 3580register_command "reload" => sub {
3073 my ($who, $arg) = @_; 3581 my ($who, $arg) = @_;
3074 3582
3075 if ($who->flag (FLAG_WIZ)) { 3583 if ($who->flag (FLAG_WIZ)) {
3076 $who->message ("reloading server."); 3584 $who->message ("reloading server.");
3585 async {
3586 $Coro::current->{desc} = "perl_reload";
3077 async { reload_perl }; 3587 reload_perl;
3588 };
3078 } 3589 }
3079}; 3590};
3080 3591
3081unshift @INC, $LIBDIR; 3592unshift @INC, $LIBDIR;
3082 3593
3101 my $signal = new Coro::Signal; 3612 my $signal = new Coro::Signal;
3102 push @WAIT_FOR_TICK_BEGIN, $signal; 3613 push @WAIT_FOR_TICK_BEGIN, $signal;
3103 $signal->wait; 3614 $signal->wait;
3104} 3615}
3105 3616
3106 my $min = 1e6;#d# 3617$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3107 my $avg = 10;
3108$TICK_WATCHER = Event->timer (
3109 reentrant => 0,
3110 parked => 1,
3111 prio => 0,
3112 at => $NEXT_TICK || $TICK,
3113 data => WF_AUTOCANCEL,
3114 cb => sub {
3115 if ($Coro::current != $Coro::main) { 3618 if ($Coro::current != $Coro::main) {
3116 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"
3117 unless ++$bug_warning > 10; 3620 unless ++$bug_warning > 10;
3118 return; 3621 return;
3119 } 3622 }
3120 3623
3121 $NOW = $tick_start = Event::time; 3624 $NOW = $tick_start = EV::now;
3122 3625
3123 cf::server_tick; # one server iteration 3626 cf::server_tick; # one server iteration
3124 3627
3125 0 && sync_job {#d# 3628 $RUNTIME += $TICK;
3126 for(1..10) { 3629 $NEXT_TICK = $_[0]->at;
3127 my $t = Event::time;
3128 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3129 or die;
3130 3630
3131 $map->width (50); 3631 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3132 $map->height (50); 3632 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3133 $map->alloc; 3633 Coro::async_pool {
3134 $map->_load_objects ("/tmp/x.map", 1); 3634 $Coro::current->{desc} = "runtime saver";
3135 my $t = Event::time - $t; 3635 write_runtime
3136 3636 or warn "ERROR: unable to write runtime file: $!";
3137 #next unless $t < 0.0013;#d#
3138 if ($t < $min) {
3139 $min = $t;
3140 }
3141 $avg = $avg * 0.99 + $t * 0.01;
3142 }
3143 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3144 exit 0;
3145 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3146 }; 3637 };
3638 }
3147 3639
3148 $RUNTIME += $TICK;
3149 $NEXT_TICK += $TICK;
3150
3151 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3152 $NEXT_RUNTIME_WRITE = $NOW + 10;
3153 Coro::async_pool {
3154 write_runtime
3155 or warn "ERROR: unable to write runtime file: $!";
3156 };
3157 }
3158
3159# my $AFTER = Event::time;
3160# warn $AFTER - $NOW;#d#
3161
3162 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3640 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3163 $sig->send; 3641 $sig->send;
3164 } 3642 }
3165 while (my $sig = shift @WAIT_FOR_TICK) { 3643 while (my $sig = shift @WAIT_FOR_TICK) {
3166 $sig->send; 3644 $sig->send;
3167 } 3645 }
3168 3646
3169 $NOW = Event::time;
3170
3171 # if we are delayed by four ticks or more, skip them all
3172 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3173
3174 $TICK_WATCHER->at ($NEXT_TICK);
3175 $TICK_WATCHER->start;
3176
3177 $LOAD = ($NOW - $tick_start) / $TICK; 3647 $LOAD = ($NOW - $tick_start) / $TICK;
3178 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3648 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3179 3649
3180 _post_tick; 3650 _post_tick;
3181 3651};
3182 3652$TICK_WATCHER->priority (EV::MAXPRI);
3183 },
3184);
3185 3653
3186{ 3654{
3187 BDB::max_poll_time $TICK * 0.1; 3655 # configure BDB
3188 $BDB_POLL_WATCHER = Event->io ( 3656
3189 reentrant => 0,
3190 fd => BDB::poll_fileno,
3191 poll => 'r',
3192 prio => 0,
3193 data => WF_AUTOCANCEL,
3194 cb => \&BDB::poll_cb,
3195 );
3196 BDB::min_parallel 8; 3657 BDB::min_parallel 8;
3197 3658 BDB::max_poll_reqs $TICK * 0.1;
3198 BDB::set_sync_prepare { 3659 $Coro::BDB::WATCHER->priority (1);
3199 my $status;
3200 my $current = $Coro::current;
3201 (
3202 sub {
3203 $status = $!;
3204 $current->ready; undef $current;
3205 },
3206 sub {
3207 Coro::schedule while defined $current;
3208 $! = $status;
3209 },
3210 )
3211 };
3212 3660
3213 unless ($DB_ENV) { 3661 unless ($DB_ENV) {
3214 $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);
3215 3667
3216 cf::sync_job { 3668 cf::sync_job {
3217 eval { 3669 eval {
3218 BDB::db_env_open 3670 BDB::db_env_open
3219 $DB_ENV, 3671 $DB_ENV,
3221 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
3222 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3674 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3223 0666; 3675 0666;
3224 3676
3225 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3677 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3226
3227 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3228 $DB_ENV->set_lk_detect;
3229 }; 3678 };
3230 3679
3231 cf::cleanup "db_env_open(db): $@" if $@; 3680 cf::cleanup "db_env_open(db): $@" if $@;
3232 }; 3681 };
3233 } 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 };
3234} 3693}
3235 3694
3236{ 3695{
3696 # configure IO::AIO
3697
3237 IO::AIO::min_parallel 8; 3698 IO::AIO::min_parallel 8;
3238
3239 undef $Coro::AIO::WATCHER;
3240 IO::AIO::max_poll_time $TICK * 0.1; 3699 IO::AIO::max_poll_time $TICK * 0.1;
3241 $AIO_POLL_WATCHER = Event->io ( 3700 $Coro::AIO::WATCHER->priority (1);
3242 reentrant => 0,
3243 data => WF_AUTOCANCEL,
3244 fd => IO::AIO::poll_fileno,
3245 poll => 'r',
3246 prio => 6,
3247 cb => \&IO::AIO::poll_cb,
3248 );
3249} 3701}
3250 3702
3251my $_log_backtrace; 3703my $_log_backtrace;
3252 3704
3253sub _log_backtrace { 3705sub _log_backtrace {
3257 3709
3258 # limit the # of concurrent backtraces 3710 # limit the # of concurrent backtraces
3259 if ($_log_backtrace < 2) { 3711 if ($_log_backtrace < 2) {
3260 ++$_log_backtrace; 3712 ++$_log_backtrace;
3261 async { 3713 async {
3714 $Coro::current->{desc} = "abt $msg";
3715
3262 my @bt = fork_call { 3716 my @bt = fork_call {
3263 @addr = map { sprintf "%x", $_ } @addr; 3717 @addr = map { sprintf "%x", $_ } @addr;
3264 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3718 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3265 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 |"
3266 or die "addr2line: $!"; 3720 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines