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.286 by root, Sun Jun 24 04:27:20 2007 UTC vs.
Revision 1.405 by root, Mon Dec 17 08:03:22 2007 UTC

4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable; 9use EV 1.86;
10use Event;
11use Opcode; 10use Opcode;
12use Safe; 11use Safe;
13use Safe::Hole; 12use Safe::Hole;
13use Storable ();
14 14
15use Coro 3.61 (); 15use Coro 4.32 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::EV;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::BDB;
23use Coro::Storable; 24use Coro::Storable;
25use Coro::Util ();
24 26
27use JSON::XS 2.01 ();
25use BDB (); 28use BDB ();
26use Data::Dumper; 29use Data::Dumper;
27use Digest::MD5; 30use Digest::MD5;
28use Fcntl; 31use Fcntl;
29use YAML::Syck (); 32use YAML::Syck ();
30use IO::AIO 2.32 (); 33use IO::AIO 2.51 ();
31use Time::HiRes; 34use Time::HiRes;
32use Compress::LZF; 35use Compress::LZF;
36use Digest::MD5 ();
33 37
34# configure various modules to our taste 38# configure various modules to our taste
35# 39#
36$Storable::canonical = 1; # reduce rsync transfers 40$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39 43
40$Event::Eval = 1; # no idea why this is required, but it is
41
42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
43$YAML::Syck::ImplicitUnicode = 1; 45$YAML::Syck::ImplicitUnicode = 1;
44 46
45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46 48
49our %COMMAND = (); 51our %COMMAND = ();
50our %COMMAND_TIME = (); 52our %COMMAND_TIME = ();
51 53
52our @EXTS = (); # list of extension package names 54our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 55our %EXTCMD = ();
56our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 57our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 58our %EXT_MAP = (); # pluggable maps
56 59
57our $RELOAD; # number of reloads so far 60our $RELOAD; # number of reloads so far
58our @EVENT; 61our @EVENT;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 69our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 71our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 72our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 73our $BDBDIR = "$LOCALDIR/db";
74our %RESOURCE;
71 75
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
73our $TICK_WATCHER; 77our $TICK_WATCHER;
74our $AIO_POLL_WATCHER; 78our $AIO_POLL_WATCHER;
75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
76our $NEXT_TICK; 80our $NEXT_TICK;
77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 81our $USE_FSYNC = 1; # use fsync to write maps - default off
79 82
80our $BDB_POLL_WATCHER; 83our $BDB_POLL_WATCHER;
84our $BDB_DEADLOCK_WATCHER;
85our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 87our $DB_ENV;
82 88
83our %CFG; 89our %CFG;
84 90
85our $UPTIME; $UPTIME ||= time; 91our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 92our $RUNTIME;
93our $NOW;
87 94
88our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
91 98
92# used to convert map paths into valid unix filenames by replacing / by ∕ 99# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 101
155 162
156The raw value load value from the last tick. 163The raw value load value from the last tick.
157 164
158=item %cf::CFG 165=item %cf::CFG
159 166
160Configuration for the server, loaded from C</etc/crossfire/config>, or 167Configuration for the server, loaded from C</etc/deliantra-server/config>, or
161from wherever your confdir points to. 168from wherever your confdir points to.
162 169
163=item cf::wait_for_tick, cf::wait_for_tick_begin 170=item cf::wait_for_tick, cf::wait_for_tick_begin
164 171
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
166returns directly I<after> the tick processing (and consequently, can only wake one process 173returns directly I<after> the tick processing (and consequently, can only wake one process
167per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 174per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168 175
176=item @cf::INVOKE_RESULTS
177
178This array contains the results of the last C<invoke ()> call. When
179C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call.
181
169=back 182=back
170 183
171=cut 184=cut
172 185
173BEGIN { 186BEGIN {
177 $msg .= "\n" 190 $msg .= "\n"
178 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
179 192
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181 194
182 utf8::encode $msg;
183 LOG llevError, $msg; 195 LOG llevError, $msg;
184 }; 196 };
185} 197}
186 198
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
203)) { 215)) {
204 no strict 'refs'; 216 no strict 'refs';
205 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
206} 218}
207 219
208$Event::DIED = sub { 220$EV::DIED = sub {
209 warn "error in event callback: @_"; 221 warn "error in event callback: @_";
210}; 222};
211 223
212############################################################################# 224#############################################################################
213 225
236 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
237 $d 249 $d
238 } || "[unable to dump $_[0]: '$@']"; 250 } || "[unable to dump $_[0]: '$@']";
239} 251}
240 252
241use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
242
243=item $ref = cf::from_json $json 253=item $ref = cf::decode_json $json
244 254
245Converts a JSON string into the corresponding perl data structure. 255Converts a JSON string into the corresponding perl data structure.
246 256
247=item $json = cf::to_json $ref 257=item $json = cf::encode_json $ref
248 258
249Converts a perl data structure into its JSON representation. 259Converts a perl data structure into its JSON representation.
260
261=cut
262
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264
265sub encode_json($) { $json_coder->encode ($_[0]) }
266sub decode_json($) { $json_coder->decode ($_[0]) }
250 267
251=item cf::lock_wait $string 268=item cf::lock_wait $string
252 269
253Wait until the given lock is available. See cf::lock_acquire. 270Wait until the given lock is available. See cf::lock_acquire.
254 271
257Wait until the given lock is available and then acquires it and returns 274Wait until the given lock is available and then acquires it and returns
258a Coro::guard object. If the guard object gets destroyed (goes out of scope, 275a Coro::guard object. If the guard object gets destroyed (goes out of scope,
259for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
260returned. 277returned.
261 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
262Lock names should begin with a unique identifier (for example, cf::map::find 282Lock names should begin with a unique identifier (for example, cf::map::find
263uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
264 284
265=item $locked = cf::lock_active $string 285=item $locked = cf::lock_active $string
266 286
267Return true if the lock is currently active, i.e. somebody has locked it. 287Return true if the lock is currently active, i.e. somebody has locked it.
268 288
269=cut 289=cut
270 290
271our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
272 293
273sub lock_wait($) { 294sub lock_wait($) {
274 my ($key) = @_; 295 my ($key) = @_;
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
275 301
276 # wait for lock, if any 302 # wait for lock, if any
277 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
278 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
279 Coro::schedule; 305 Coro::schedule;
285 311
286 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
287 lock_wait $key; 313 lock_wait $key;
288 314
289 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
290 317
291 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
292 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
293 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
294 } 322 }
295} 323}
296 324
308 }; 336 };
309 $TICK_WATCHER->stop; 337 $TICK_WATCHER->stop;
310 $guard 338 $guard
311} 339}
312 340
341=item cf::periodic $interval, $cb
342
343Like EV::periodic, but randomly selects a starting point so that the actions
344get spread over timer.
345
346=cut
347
348sub periodic($$) {
349 my ($interval, $cb) = @_;
350
351 my $start = rand List::Util::min 180, $interval;
352
353 EV::periodic $start, $interval, 0, $cb
354}
355
356=item cf::get_slot $time[, $priority[, $name]]
357
358Allocate $time seconds of blocking CPU time at priority C<$priority>:
359This call blocks and returns only when you have at least C<$time> seconds
360of cpu time till the next tick. The slot is only valid till the next cede.
361
362The optional C<$name> can be used to identify the job to run. It might be
363used for statistical purposes and should identify the same time-class.
364
365Useful for short background jobs.
366
367=cut
368
369our @SLOT_QUEUE;
370our $SLOT_QUEUE;
371
372$SLOT_QUEUE->cancel if $SLOT_QUEUE;
373$SLOT_QUEUE = Coro::async {
374 $Coro::current->desc ("timeslot manager");
375
376 my $signal = new Coro::Signal;
377
378 while () {
379 next_job:
380 my $avail = cf::till_tick;
381 if ($avail > 0.01) {
382 for (0 .. $#SLOT_QUEUE) {
383 if ($SLOT_QUEUE[$_][0] < $avail) {
384 my $job = splice @SLOT_QUEUE, $_, 1, ();
385 $job->[2]->send;
386 Coro::cede;
387 goto next_job;
388 }
389 }
390 }
391
392 if (@SLOT_QUEUE) {
393 # we do not use wait_for_tick() as it returns immediately when tick is inactive
394 push @cf::WAIT_FOR_TICK, $signal;
395 $signal->wait;
396 } else {
397 Coro::schedule;
398 }
399 }
400};
401
402sub get_slot($;$$) {
403 my ($time, $pri, $name) = @_;
404
405 $time = $TICK * .6 if $time > $TICK * .6;
406 my $sig = new Coro::Signal;
407
408 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
409 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
410 $SLOT_QUEUE->ready;
411 $sig->wait;
412}
413
313=item cf::async { BLOCK } 414=item cf::async { BLOCK }
314 415
315Currently the same as Coro::async_pool, meaning you cannot use 416Currently the same as Coro::async_pool, meaning you cannot use
316C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 417C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
317thing you are allowed to do is call C<prio> on it. 418thing you are allowed to do is call C<prio> on it.
320 421
321BEGIN { *async = \&Coro::async_pool } 422BEGIN { *async = \&Coro::async_pool }
322 423
323=item cf::sync_job { BLOCK } 424=item cf::sync_job { BLOCK }
324 425
325The design of Crossfire TRT requires that the main coroutine ($Coro::main) 426The design of Deliantra requires that the main coroutine ($Coro::main)
326is always able to handle events or runnable, as Crossfire TRT is only 427is always able to handle events or runnable, as Deliantra is only
327partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 428partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
328acceptable. 429acceptable.
329 430
330If it must be done, put the blocking parts into C<sync_job>. This will run 431If it must be done, put the blocking parts into C<sync_job>. This will run
331the given BLOCK in another coroutine while waiting for the result. The 432the given BLOCK in another coroutine while waiting for the result. The
336 437
337sub sync_job(&) { 438sub sync_job(&) {
338 my ($job) = @_; 439 my ($job) = @_;
339 440
340 if ($Coro::current == $Coro::main) { 441 if ($Coro::current == $Coro::main) {
341 my $time = Event::time; 442 my $time = EV::time;
342 443
343 # this is the main coro, too bad, we have to block 444 # this is the main coro, too bad, we have to block
344 # till the operation succeeds, freezing the server :/ 445 # till the operation succeeds, freezing the server :/
345 446
447 LOG llevError, Carp::longmess "sync job";#d#
448
346 # TODO: use suspend/resume instead 449 # TODO: use suspend/resume instead
347 # (but this is cancel-safe) 450 # (but this is cancel-safe)
348 my $freeze_guard = freeze_mainloop; 451 my $freeze_guard = freeze_mainloop;
349 452
350 my $busy = 1; 453 my $busy = 1;
351 my @res; 454 my @res;
352 455
353 (async { 456 (async {
457 $Coro::current->desc ("sync job coro");
354 @res = eval { $job->() }; 458 @res = eval { $job->() };
355 warn $@ if $@; 459 warn $@ if $@;
356 undef $busy; 460 undef $busy;
357 })->prio (Coro::PRIO_MAX); 461 })->prio (Coro::PRIO_MAX);
358 462
359 while ($busy) { 463 while ($busy) {
360 Coro::cede or Event::one_event; 464 if (Coro::nready) {
465 Coro::cede_notself;
466 } else {
467 EV::loop EV::LOOP_ONESHOT;
361 } 468 }
469 }
362 470
363 $time = Event::time - $time; 471 $time = EV::time - $time;
364 472
365 LOG llevError | logBacktrace, Carp::longmess "long sync job" 473 LOG llevError | logBacktrace, Carp::longmess "long sync job"
366 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 474 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
367 475
368 $tick_start += $time; # do not account sync jobs to server load 476 $tick_start += $time; # do not account sync jobs to server load
398=item fork_call { }, $args 506=item fork_call { }, $args
399 507
400Executes the given code block with the given arguments in a seperate 508Executes the given code block with the given arguments in a seperate
401process, returning the results. Everything must be serialisable with 509process, returning the results. Everything must be serialisable with
402Coro::Storable. May, of course, block. Note that the executed sub may 510Coro::Storable. May, of course, block. Note that the executed sub may
403never block itself or use any form of Event handling. 511never block itself or use any form of event handling.
404 512
405=cut 513=cut
406 514
407sub fork_call(&@) { 515sub fork_call(&@) {
408 my ($cb, @args) = @_; 516 my ($cb, @args) = @_;
409 517
410# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 518 # we seemingly have to make a local copy of the whole thing,
411# or die "socketpair: $!"; 519 # otherwise perl prematurely frees the stuff :/
412 pipe my $fh1, my $fh2 520 # TODO: investigate and fix (likely this will be rather laborious)
413 or die "pipe: $!";
414 521
415 if (my $pid = fork) { 522 my @res = Coro::Util::fork_eval {
416 close $fh2;
417
418 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
419 $res = Coro::Storable::thaw $res;
420
421 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
422
423 die $$res unless "ARRAY" eq ref $res;
424
425 return wantarray ? @$res : $res->[-1];
426 } else {
427 reset_signals; 523 reset_signals;
428 local $SIG{__WARN__}; 524 &$cb
429 local $SIG{__DIE__}; 525 }, @args;
430 eval {
431 close $fh1;
432 526
433 my @res = eval { $cb->(@args) }; 527 wantarray ? @res : $res[-1]
434 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
435 };
436
437 warn $@ if $@;
438 _exit 0;
439 }
440} 528}
441 529
442=item $value = cf::db_get $family => $key 530=item $value = cf::db_get $family => $key
443 531
444Returns a single value from the environment database. 532Returns a single value from the environment database.
446=item cf::db_put $family => $key => $value 534=item cf::db_put $family => $key => $value
447 535
448Stores the given C<$value> in the family. It can currently store binary 536Stores the given C<$value> in the family. It can currently store binary
449data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 537data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
450 538
539=item $db = cf::db_table "name"
540
541Create and/or open a new database table. The string must not be "db" and must be unique
542within each server.
543
451=cut 544=cut
545
546sub db_table($) {
547 my ($name) = @_;
548 my $db = BDB::db_create $DB_ENV;
549
550 eval {
551 $db->set_flags (BDB::CHKSUM);
552
553 utf8::encode $name;
554 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
555 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
556 cf::cleanup "db_open(db): $!" if $!;
557 };
558 cf::cleanup "db_open(db): $@" if $@;
559
560 $db
561}
452 562
453our $DB; 563our $DB;
454 564
455sub db_init { 565sub db_init {
456 unless ($DB) {
457 $DB = BDB::db_create $DB_ENV;
458
459 cf::sync_job { 566 cf::sync_job {
460 eval { 567 $DB ||= db_table "db";
461 $DB->set_flags (BDB::CHKSUM);
462
463 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
464 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
465 cf::cleanup "db_open(db): $!" if $!;
466 };
467 cf::cleanup "db_open(db): $@" if $@;
468 };
469 } 568 };
470} 569}
471 570
472sub db_get($$) { 571sub db_get($$) {
473 my $key = "$_[0]/$_[1]"; 572 my $key = "$_[0]/$_[1]";
474 573
524 if (1) { 623 if (1) {
525 $md5 = 624 $md5 =
526 join "\x00", 625 join "\x00",
527 $processversion, 626 $processversion,
528 map { 627 map {
529 Coro::cede; 628 cf::cede_to_tick;
530 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 629 ($src->[$_], Digest::MD5::md5_hex $data[$_])
531 } 0.. $#$src; 630 } 0.. $#$src;
532 631
533 632
534 my $dbmd5 = db_get cache => "$id/md5"; 633 my $dbmd5 = db_get cache => "$id/md5";
578attach callbacks/event handlers (a collection of which is called an "attachment") 677attach callbacks/event handlers (a collection of which is called an "attachment")
579to it. All such attachable objects support the following methods. 678to it. All such attachable objects support the following methods.
580 679
581In the following description, CLASS can be any of C<global>, C<object> 680In the following description, CLASS can be any of C<global>, C<object>
582C<player>, C<client> or C<map> (i.e. the attachable objects in 681C<player>, C<client> or C<map> (i.e. the attachable objects in
583Crossfire TRT). 682Deliantra).
584 683
585=over 4 684=over 4
586 685
587=item $attachable->attach ($attachment, key => $value...) 686=item $attachable->attach ($attachment, key => $value...)
588 687
840 "; 939 ";
841 die if $@; 940 die if $@;
842} 941}
843 942
844our $override; 943our $override;
845our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 944our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
846 945
847sub override { 946sub override {
848 $override = 1; 947 $override = 1;
849 @invoke_results = (); 948 @INVOKE_RESULTS = (@_);
850} 949}
851 950
852sub do_invoke { 951sub do_invoke {
853 my $event = shift; 952 my $event = shift;
854 my $callbacks = shift; 953 my $callbacks = shift;
855 954
856 @invoke_results = (); 955 @INVOKE_RESULTS = ();
857 956
858 local $override; 957 local $override;
859 958
860 for (@$callbacks) { 959 for (@$callbacks) {
861 eval { &{$_->[1]} }; 960 eval { &{$_->[1]} };
878 977
879Generate an object-specific event with the given arguments. 978Generate an object-specific event with the given arguments.
880 979
881This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 980This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
882removed in future versions), and there is no public API to access override 981removed in future versions), and there is no public API to access override
883results (if you must, access C<@cf::invoke_results> directly). 982results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884 983
885=back 984=back
886 985
887=cut 986=cut
888 987
889############################################################################# 988#############################################################################
890# object support 989# object support
990
991sub _object_equal($$);
992sub _object_equal($$) {
993 my ($a, $b) = @_;
994
995 return 0 unless (ref $a) eq (ref $b);
996
997 if ("HASH" eq ref $a) {
998 my @ka = keys %$a;
999 my @kb = keys %$b;
1000
1001 return 0 if @ka != @kb;
1002
1003 for (0 .. $#ka) {
1004 return 0 unless $ka[$_] eq $kb[$_];
1005 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1006 }
1007
1008 } elsif ("ARRAY" eq ref $a) {
1009
1010 return 0 if @$a != @$b;
1011
1012 for (0 .. $#$a) {
1013 return 0 unless _object_equal $a->[$_], $b->[$_];
1014 }
1015
1016 } elsif ($a ne $b) {
1017 return 0;
1018 }
1019
1020 1
1021}
1022
1023our $SLOW_MERGES;#d#
1024sub _can_merge {
1025 my ($ob1, $ob2) = @_;
1026
1027 ++$SLOW_MERGES;#d#
1028
1029 # we do the slow way here
1030 return _object_equal $ob1, $ob2
1031}
891 1032
892sub reattach { 1033sub reattach {
893 # basically do the same as instantiate, without calling instantiate 1034 # basically do the same as instantiate, without calling instantiate
894 my ($obj) = @_; 1035 my ($obj) = @_;
895 1036
916cf::attachable->attach ( 1057cf::attachable->attach (
917 prio => -1000000, 1058 prio => -1000000,
918 on_instantiate => sub { 1059 on_instantiate => sub {
919 my ($obj, $data) = @_; 1060 my ($obj, $data) = @_;
920 1061
921 $data = from_json $data; 1062 $data = decode_json $data;
922 1063
923 for (@$data) { 1064 for (@$data) {
924 my ($name, $args) = @$_; 1065 my ($name, $args) = @$_;
925 1066
926 $obj->attach ($name, %{$args || {} }); 1067 $obj->attach ($name, %{$args || {} });
942sub object_freezer_save { 1083sub object_freezer_save {
943 my ($filename, $rdata, $objs) = @_; 1084 my ($filename, $rdata, $objs) = @_;
944 1085
945 sync_job { 1086 sync_job {
946 if (length $$rdata) { 1087 if (length $$rdata) {
1088 utf8::decode (my $decname = $filename);
947 warn sprintf "saving %s (%d,%d)\n", 1089 warn sprintf "saving %s (%d,%d)\n",
948 $filename, length $$rdata, scalar @$objs; 1090 $decname, length $$rdata, scalar @$objs;
949 1091
950 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1092 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
951 chmod SAVE_MODE, $fh; 1093 chmod SAVE_MODE, $fh;
952 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1094 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
953 aio_fsync $fh if $cf::USE_FSYNC; 1095 aio_fsync $fh if $cf::USE_FSYNC;
954 close $fh; 1096 close $fh;
955 1097
956 if (@$objs) { 1098 if (@$objs) {
957 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1099 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
958 chmod SAVE_MODE, $fh; 1100 chmod SAVE_MODE, $fh;
959 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1101 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
960 aio_write $fh, 0, (length $data), $data, 0; 1102 aio_write $fh, 0, (length $data), $data, 0;
961 aio_fsync $fh if $cf::USE_FSYNC; 1103 aio_fsync $fh if $cf::USE_FSYNC;
962 close $fh; 1104 close $fh;
963 aio_rename "$filename.pst~", "$filename.pst"; 1105 aio_rename "$filename.pst~", "$filename.pst";
964 } 1106 }
972 } 1114 }
973 } else { 1115 } else {
974 aio_unlink $filename; 1116 aio_unlink $filename;
975 aio_unlink "$filename.pst"; 1117 aio_unlink "$filename.pst";
976 } 1118 }
977 } 1119 };
978} 1120}
979 1121
980sub object_freezer_as_string { 1122sub object_freezer_as_string {
981 my ($rdata, $objs) = @_; 1123 my ($rdata, $objs) = @_;
982 1124
994 or return; 1136 or return;
995 1137
996 unless (aio_stat "$filename.pst") { 1138 unless (aio_stat "$filename.pst") {
997 (aio_load "$filename.pst", $av) >= 0 1139 (aio_load "$filename.pst", $av) >= 0
998 or return; 1140 or return;
1141
999 $av = eval { (Storable::thaw $av)->{objs} }; 1142 my $st = eval { Coro::Storable::thaw $av };
1143 $av = $st->{objs};
1000 } 1144 }
1001 1145
1146 utf8::decode (my $decname = $filename);
1002 warn sprintf "loading %s (%d)\n", 1147 warn sprintf "loading %s (%d,%d)\n",
1003 $filename, length $data, scalar @{$av || []}; 1148 $decname, length $data, scalar @{$av || []};
1149
1004 return ($data, $av); 1150 ($data, $av)
1005} 1151}
1006 1152
1007=head2 COMMAND CALLBACKS 1153=head2 COMMAND CALLBACKS
1008 1154
1009=over 4 1155=over 4
1029 push @{ $COMMAND{$name} }, [$caller, $cb]; 1175 push @{ $COMMAND{$name} }, [$caller, $cb];
1030} 1176}
1031 1177
1032=item cf::register_extcmd $name => \&callback($pl,$packet); 1178=item cf::register_extcmd $name => \&callback($pl,$packet);
1033 1179
1034Register a callback fro execution when the client sends an extcmd packet. 1180Register a callback for execution when the client sends an (synchronous)
1181extcmd packet. Ext commands will be processed in the order they are
1182received by the server, like other user commands. The first argument is
1183the logged-in player. Ext commands can only be processed after a player
1184has logged in successfully.
1035 1185
1036If the callback returns something, it is sent back as if reply was being 1186If the callback returns something, it is sent back as if reply was being
1037called. 1187called.
1038 1188
1189=item cf::register_exticmd $name => \&callback($ns,$packet);
1190
1191Register a callback for execution when the client sends an (asynchronous)
1192exticmd packet. Exti commands are processed by the server as soon as they
1193are received, i.e. out of order w.r.t. other commands. The first argument
1194is a client socket. Exti commands can be received anytime, even before
1195log-in.
1196
1197If the callback returns something, it is sent back as if reply was being
1198called.
1199
1039=cut 1200=cut
1040 1201
1041sub register_extcmd { 1202sub register_extcmd {
1042 my ($name, $cb) = @_; 1203 my ($name, $cb) = @_;
1043 1204
1044 $EXTCMD{$name} = $cb; 1205 $EXTCMD{$name} = $cb;
1206}
1207
1208sub register_exticmd {
1209 my ($name, $cb) = @_;
1210
1211 $EXTICMD{$name} = $cb;
1045} 1212}
1046 1213
1047cf::player->attach ( 1214cf::player->attach (
1048 on_command => sub { 1215 on_command => sub {
1049 my ($pl, $name, $params) = @_; 1216 my ($pl, $name, $params) = @_;
1058 cf::override; 1225 cf::override;
1059 }, 1226 },
1060 on_extcmd => sub { 1227 on_extcmd => sub {
1061 my ($pl, $buf) = @_; 1228 my ($pl, $buf) = @_;
1062 1229
1063 my $msg = eval { from_json $buf }; 1230 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064 1231
1065 if (ref $msg) { 1232 if (ref $msg) {
1233 my ($type, $reply, @payload) =
1234 "ARRAY" eq ref $msg
1235 ? @$msg
1236 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1237
1238 my @reply;
1239
1066 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1240 if (my $cb = $EXTCMD{$type}) {
1067 if (my %reply = $cb->($pl, $msg)) { 1241 @reply = $cb->($pl, @payload);
1068 $pl->ext_reply ($msg->{msgid}, %reply);
1069 }
1070 } 1242 }
1243
1244 $pl->ext_reply ($reply, @reply)
1245 if $reply;
1246
1071 } else { 1247 } else {
1072 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1248 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1073 } 1249 }
1074 1250
1075 cf::override; 1251 cf::override;
1165 1341
1166=head3 cf::player 1342=head3 cf::player
1167 1343
1168=over 4 1344=over 4
1169 1345
1346=item cf::player::num_playing
1347
1348Returns the official number of playing players, as per the Crossfire metaserver rules.
1349
1350=cut
1351
1352sub num_playing {
1353 scalar grep
1354 $_->ob->map
1355 && !$_->hidden
1356 && !$_->ob->flag (cf::FLAG_WIZ),
1357 cf::player::list
1358}
1359
1170=item cf::player::find $login 1360=item cf::player::find $login
1171 1361
1172Returns the given player object, loading it if necessary (might block). 1362Returns the given player object, loading it if necessary (might block).
1173 1363
1174=cut 1364=cut
1209 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1399 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1210 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1400 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1211 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1401 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1212 aio_unlink +(playerdir $login) . "/$login.pl"; 1402 aio_unlink +(playerdir $login) . "/$login.pl";
1213 1403
1214 my $pl = load_pl path $login 1404 my $f = new_from_file cf::object::thawer path $login
1215 or return; 1405 or return;
1406
1407 my $pl = cf::player::load_pl $f
1408 or return;
1409 local $cf::PLAYER_LOADING{$login} = $pl;
1410 $f->resolve_delayed_derefs;
1216 $cf::PLAYER{$login} = $pl 1411 $cf::PLAYER{$login} = $pl
1217 } 1412 }
1218 } 1413 }
1219} 1414}
1220 1415
1230 1425
1231 aio_mkdir playerdir $pl, 0770; 1426 aio_mkdir playerdir $pl, 0770;
1232 $pl->{last_save} = $cf::RUNTIME; 1427 $pl->{last_save} = $cf::RUNTIME;
1233 1428
1234 $pl->save_pl ($path); 1429 $pl->save_pl ($path);
1235 Coro::cede; 1430 cf::cede_to_tick;
1236} 1431}
1237 1432
1238sub new($) { 1433sub new($) {
1239 my ($login) = @_; 1434 my ($login) = @_;
1240 1435
1244 $self->{deny_save} = 1; 1439 $self->{deny_save} = 1;
1245 1440
1246 $cf::PLAYER{$login} = $self; 1441 $cf::PLAYER{$login} = $self;
1247 1442
1248 $self 1443 $self
1444}
1445
1446=item $player->send_msg ($channel, $msg, $color, [extra...])
1447
1448=cut
1449
1450sub send_msg {
1451 my $ns = shift->ns
1452 or return;
1453 $ns->send_msg (@_);
1249} 1454}
1250 1455
1251=item $pl->quit_character 1456=item $pl->quit_character
1252 1457
1253Nukes the player without looking back. If logged in, the connection will 1458Nukes the player without looking back. If logged in, the connection will
1308 or return []; 1513 or return [];
1309 1514
1310 my @logins; 1515 my @logins;
1311 1516
1312 for my $login (@$dirs) { 1517 for my $login (@$dirs) {
1518 my $path = path $login;
1519
1520 # a .pst is a dead give-away for a valid player
1521 unless (-e "$path.pst") {
1313 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1522 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1314 aio_read $fh, 0, 512, my $buf, 0 or next; 1523 aio_read $fh, 0, 512, my $buf, 0 or next;
1315 $buf !~ /^password -------------$/m or next; # official not-valid tag 1524 $buf !~ /^password -------------$/m or next; # official not-valid tag
1525 }
1316 1526
1317 utf8::decode $login; 1527 utf8::decode $login;
1318 push @logins, $login; 1528 push @logins, $login;
1319 } 1529 }
1320 1530
1353 1563
1354Expand crossfire pod fragments into protocol xml. 1564Expand crossfire pod fragments into protocol xml.
1355 1565
1356=cut 1566=cut
1357 1567
1568use re 'eval';
1569
1570my $group;
1571my $interior; $interior = qr{
1572 # match a pod interior sequence sans C<< >>
1573 (?:
1574 \ (.*?)\ (?{ $group = $^N })
1575 | < (??{$interior}) >
1576 )
1577}x;
1578
1358sub expand_cfpod { 1579sub expand_cfpod {
1359 ((my $self), (local $_)) = @_; 1580 my ($self, $pod) = @_;
1360 1581
1361 # escape & and < 1582 my $xml;
1362 s/&/&amp;/g;
1363 s/(?<![BIUGH])</&lt;/g;
1364 1583
1365 # this is buggy, it needs to properly take care of nested <'s 1584 while () {
1585 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1586 $group = $1;
1366 1587
1367 1 while 1588 $group =~ s/&/&amp;/g;
1368 # replace B<>, I<>, U<> etc. 1589 $group =~ s/</&lt;/g;
1369 s/B<([^\>]*)>/<b>$1<\/b>/ 1590
1370 || s/I<([^\>]*)>/<i>$1<\/i>/ 1591 $xml .= $group;
1371 || s/U<([^\>]*)>/<u>$1<\/u>/ 1592 } elsif ($pod =~ m%\G
1372 # replace G<male|female> tags 1593 ([BCGHITU])
1373 || s{G<([^>|]*)\|([^>]*)>}{ 1594 <
1374 $self->gender ? $2 : $1 1595 (?:
1596 ([^<>]*) (?{ $group = $^N })
1597 | < $interior >
1598 )
1599 >
1600 %gcsx
1601 ) {
1602 my ($code, $data) = ($1, $group);
1603
1604 if ($code eq "B") {
1605 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1606 } elsif ($code eq "I") {
1607 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1608 } elsif ($code eq "U") {
1609 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1610 } elsif ($code eq "C") {
1611 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1612 } elsif ($code eq "T") {
1613 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1614 } elsif ($code eq "G") {
1615 my ($male, $female) = split /\|/, $data;
1616 $data = $self->gender ? $female : $male;
1617 $xml .= expand_cfpod ($self, $data);
1618 } elsif ($code eq "H") {
1619 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1620 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1621 "")
1622 [$self->{hintmode}];
1623 } else {
1624 $xml .= "error processing '$code($data)' directive";
1625 }
1626 } else {
1627 if ($pod =~ /\G(.+)/) {
1628 warn "parse error while expanding $pod (at $1)";
1629 }
1630 last;
1375 }ge 1631 }
1376 # replace H<hint text> 1632 }
1377 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;
1378 1633
1634 for ($xml) {
1379 # create single paragraphs (very hackish) 1635 # create single paragraphs (very hackish)
1380 s/(?<=\S)\n(?=\w)/ /g; 1636 s/(?<=\S)\n(?=\w)/ /g;
1381 1637
1382 $_ 1638 # compress some whitespace
1383} 1639 s/\s+\n/\n/g; # ws line-ends
1640 s/\n\n+/\n/g; # double lines
1641 s/^\n+//; # beginning lines
1642 s/\n+$//; # ending lines
1643 }
1384 1644
1645 $xml
1646}
1647
1648no re 'eval';
1649
1650sub hintmode {
1651 $_[0]{hintmode} = $_[1] if @_ > 1;
1652 $_[0]{hintmode}
1653}
1654
1385=item $player->ext_reply ($msgid, %msg) 1655=item $player->ext_reply ($msgid, @msg)
1386 1656
1387Sends an ext reply to the player. 1657Sends an ext reply to the player.
1388 1658
1389=cut 1659=cut
1390 1660
1391sub ext_reply($$%) { 1661sub ext_reply($$@) {
1392 my ($self, $id, %msg) = @_; 1662 my ($self, $id, @msg) = @_;
1393 1663
1394 $msg{msgid} = $id; 1664 $self->ns->ext_reply ($id, @msg)
1395
1396 $self->send ("ext " . cf::to_json \%msg);
1397} 1665}
1398 1666
1399=item $player->ext_event ($type, %msg) 1667=item $player->ext_msg ($type, @msg)
1400 1668
1401Sends an ext event to the client. 1669Sends an ext event to the client.
1402 1670
1403=cut 1671=cut
1404 1672
1405sub ext_event($$%) { 1673sub ext_msg($$@) {
1406 my ($self, $type, %msg) = @_; 1674 my ($self, $type, @msg) = @_;
1407 1675
1408 $self->ns->ext_event ($type, %msg); 1676 $self->ns->ext_msg ($type, @msg);
1409} 1677}
1410 1678
1411=head3 cf::region 1679=head3 cf::region
1412 1680
1413=over 4 1681=over 4
1426 my ($path) = @_; 1694 my ($path) = @_;
1427 1695
1428 my ($match, $specificity); 1696 my ($match, $specificity);
1429 1697
1430 for my $region (list) { 1698 for my $region (list) {
1431 if ($region->match && $path =~ $region->match) { 1699 if ($region->{match} && $path =~ $region->{match}) {
1432 ($match, $specificity) = ($region, $region->specificity) 1700 ($match, $specificity) = ($region, $region->specificity)
1433 if $region->specificity > $specificity; 1701 if $region->specificity > $specificity;
1434 } 1702 }
1435 } 1703 }
1436 1704
1556 $self->init; # pass $1 etc. 1824 $self->init; # pass $1 etc.
1557 return $self; 1825 return $self;
1558 } 1826 }
1559 } 1827 }
1560 1828
1561 Carp::carp "unable to resolve path '$path' (base '$base')."; 1829 Carp::cluck "unable to resolve path '$path' (base '$base').";
1562 () 1830 ()
1563} 1831}
1564 1832
1565sub init { 1833sub init {
1566 my ($self) = @_; 1834 my ($self) = @_;
1629 1897
1630sub load_header_from($) { 1898sub load_header_from($) {
1631 my ($self, $path) = @_; 1899 my ($self, $path) = @_;
1632 1900
1633 utf8::encode $path; 1901 utf8::encode $path;
1634 #aio_open $path, O_RDONLY, 0 1902 my $f = new_from_file cf::object::thawer $path
1635 # or return;
1636
1637 $self->_load_header ($path)
1638 or return; 1903 or return;
1904
1905 $self->_load_header ($f)
1906 or return;
1907
1908 local $MAP_LOADING{$self->{path}} = $self;
1909 $f->resolve_delayed_derefs;
1639 1910
1640 $self->{load_path} = $path; 1911 $self->{load_path} = $path;
1641 1912
1642 1 1913 1
1643} 1914}
1697sub find { 1968sub find {
1698 my ($path, $origin) = @_; 1969 my ($path, $origin) = @_;
1699 1970
1700 $path = normalise $path, $origin && $origin->path; 1971 $path = normalise $path, $origin && $origin->path;
1701 1972
1973 cf::lock_wait "map_data:$path";#d#remove
1702 cf::lock_wait "map_find:$path"; 1974 cf::lock_wait "map_find:$path";
1703 1975
1704 $cf::MAP{$path} || do { 1976 $cf::MAP{$path} || do {
1705 my $guard = cf::lock_acquire "map_find:$path"; 1977 my $guard1 = cf::lock_acquire "map_find:$path";
1978 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1979
1706 my $map = new_from_path cf::map $path 1980 my $map = new_from_path cf::map $path
1707 or return; 1981 or return;
1708 1982
1709 $map->{last_save} = $cf::RUNTIME; 1983 $map->{last_save} = $cf::RUNTIME;
1710 1984
1712 or return; 1986 or return;
1713 1987
1714 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1988 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1715 # doing this can freeze the server in a sync job, obviously 1989 # doing this can freeze the server in a sync job, obviously
1716 #$cf::WAIT_FOR_TICK->wait; 1990 #$cf::WAIT_FOR_TICK->wait;
1991 undef $guard1;
1992 undef $guard2;
1717 $map->reset; 1993 $map->reset;
1718 undef $guard;
1719 return find $path; 1994 return find $path;
1720 } 1995 }
1721 1996
1722 $cf::MAP{$path} = $map 1997 $cf::MAP{$path} = $map
1723 } 1998 }
1732 local $self->{deny_reset} = 1; # loading can take a long time 2007 local $self->{deny_reset} = 1; # loading can take a long time
1733 2008
1734 my $path = $self->{path}; 2009 my $path = $self->{path};
1735 2010
1736 { 2011 {
1737 my $guard = cf::lock_acquire "map_load:$path"; 2012 my $guard = cf::lock_acquire "map_data:$path";
1738 2013
2014 return unless $self->valid;
1739 return if $self->in_memory != cf::MAP_SWAPPED; 2015 return unless $self->in_memory == cf::MAP_SWAPPED;
1740 2016
1741 $self->in_memory (cf::MAP_LOADING); 2017 $self->in_memory (cf::MAP_LOADING);
1742 2018
1743 $self->alloc; 2019 $self->alloc;
1744 2020
1745 $self->pre_load; 2021 $self->pre_load;
1746 Coro::cede; 2022 cf::cede_to_tick;
1747 2023
2024 my $f = new_from_file cf::object::thawer $self->{load_path};
2025 $f->skip_block;
1748 $self->_load_objects ($self->{load_path}, 1) 2026 $self->_load_objects ($f)
1749 or return; 2027 or return;
1750 2028
1751 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2029 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1752 if delete $self->{load_original}; 2030 if delete $self->{load_original};
1753 2031
1754 if (my $uniq = $self->uniq_path) { 2032 if (my $uniq = $self->uniq_path) {
1755 utf8::encode $uniq; 2033 utf8::encode $uniq;
1756 if (aio_open $uniq, O_RDONLY, 0) { 2034 unless (aio_stat $uniq) {
2035 if (my $f = new_from_file cf::object::thawer $uniq) {
1757 $self->clear_unique_items; 2036 $self->clear_unique_items;
1758 $self->_load_objects ($uniq, 0); 2037 $self->_load_objects ($f);
2038 $f->resolve_delayed_derefs;
2039 }
1759 } 2040 }
1760 } 2041 }
1761 2042
1762 Coro::cede; 2043 $f->resolve_delayed_derefs;
2044
2045 cf::cede_to_tick;
1763 # now do the right thing for maps 2046 # now do the right thing for maps
1764 $self->link_multipart_objects; 2047 $self->link_multipart_objects;
1765 $self->difficulty ($self->estimate_difficulty) 2048 $self->difficulty ($self->estimate_difficulty)
1766 unless $self->difficulty; 2049 unless $self->difficulty;
1767 Coro::cede; 2050 cf::cede_to_tick;
1768 2051
1769 unless ($self->{deny_activate}) { 2052 unless ($self->{deny_activate}) {
1770 $self->decay_objects; 2053 $self->decay_objects;
1771 $self->fix_auto_apply; 2054 $self->fix_auto_apply;
1772 $self->update_buttons; 2055 $self->update_buttons;
1773 Coro::cede; 2056 cf::cede_to_tick;
1774 $self->set_darkness_map; 2057 $self->set_darkness_map;
1775 Coro::cede; 2058 cf::cede_to_tick;
1776 $self->activate; 2059 $self->activate;
1777 } 2060 }
2061
2062 $self->{last_save} = $cf::RUNTIME;
2063 $self->last_access ($cf::RUNTIME);
1778 2064
1779 $self->in_memory (cf::MAP_IN_MEMORY); 2065 $self->in_memory (cf::MAP_IN_MEMORY);
1780 } 2066 }
1781 2067
1782 $self->post_load; 2068 $self->post_load;
1793 2079
1794 $self 2080 $self
1795} 2081}
1796 2082
1797# find and load all maps in the 3x3 area around a map 2083# find and load all maps in the 3x3 area around a map
1798sub load_diag { 2084sub load_neighbours {
1799 my ($map) = @_; 2085 my ($map) = @_;
1800 2086
1801 my @diag; # diagonal neighbours 2087 my @neigh; # diagonal neighbours
1802 2088
1803 for (0 .. 3) { 2089 for (0 .. 3) {
1804 my $neigh = $map->tile_path ($_) 2090 my $neigh = $map->tile_path ($_)
1805 or next; 2091 or next;
1806 $neigh = find $neigh, $map 2092 $neigh = find $neigh, $map
1807 or next; 2093 or next;
1808 $neigh->load; 2094 $neigh->load;
1809 2095
2096 push @neigh,
1810 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2097 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1811 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2098 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1812 } 2099 }
1813 2100
1814 for (@diag) { 2101 for (grep defined $_->[0], @neigh) {
2102 my ($path, $origin) = @$_;
1815 my $neigh = find @$_ 2103 my $neigh = find $path, $origin
1816 or next; 2104 or next;
1817 $neigh->load; 2105 $neigh->load;
1818 } 2106 }
1819} 2107}
1820 2108
1825} 2113}
1826 2114
1827sub do_load_sync { 2115sub do_load_sync {
1828 my ($map) = @_; 2116 my ($map) = @_;
1829 2117
2118 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2119 if $Coro::current == $Coro::main;
2120
1830 cf::sync_job { $map->load }; 2121 cf::sync_job { $map->load };
1831} 2122}
1832 2123
1833our %MAP_PREFETCH; 2124our %MAP_PREFETCH;
1834our $MAP_PREFETCHER = undef; 2125our $MAP_PREFETCHER = undef;
1835 2126
1836sub find_async { 2127sub find_async {
1837 my ($path, $origin) = @_; 2128 my ($path, $origin, $load) = @_;
1838 2129
1839 $path = normalise $path, $origin && $origin->{path}; 2130 $path = normalise $path, $origin && $origin->{path};
1840 2131
1841 if (my $map = $cf::MAP{$path}) { 2132 if (my $map = $cf::MAP{$path}) {
1842 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2133 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1843 } 2134 }
1844 2135
1845 undef $MAP_PREFETCH{$path}; 2136 $MAP_PREFETCH{$path} |= $load;
2137
1846 $MAP_PREFETCHER ||= cf::async { 2138 $MAP_PREFETCHER ||= cf::async {
2139 $Coro::current->{desc} = "map prefetcher";
2140
1847 while (%MAP_PREFETCH) { 2141 while (%MAP_PREFETCH) {
1848 for my $path (keys %MAP_PREFETCH) { 2142 while (my ($k, $v) = each %MAP_PREFETCH) {
1849 my $map = find $path 2143 if (my $map = find $k) {
1850 or next;
1851 $map->load; 2144 $map->load if $v;
2145 }
1852 2146
1853 delete $MAP_PREFETCH{$path}; 2147 delete $MAP_PREFETCH{$k};
1854 } 2148 }
1855 } 2149 }
1856 undef $MAP_PREFETCHER; 2150 undef $MAP_PREFETCHER;
1857 }; 2151 };
1858 $MAP_PREFETCHER->prio (6); 2152 $MAP_PREFETCHER->prio (6);
1861} 2155}
1862 2156
1863sub save { 2157sub save {
1864 my ($self) = @_; 2158 my ($self) = @_;
1865 2159
1866 my $lock = cf::lock_acquire "map_data:" . $self->path; 2160 my $lock = cf::lock_acquire "map_data:$self->{path}";
1867 2161
1868 $self->{last_save} = $cf::RUNTIME; 2162 $self->{last_save} = $cf::RUNTIME;
1869 2163
1870 return unless $self->dirty; 2164 return unless $self->dirty;
1871 2165
1877 return if $self->{deny_save}; 2171 return if $self->{deny_save};
1878 2172
1879 local $self->{last_access} = $self->last_access;#d# 2173 local $self->{last_access} = $self->last_access;#d#
1880 2174
1881 cf::async { 2175 cf::async {
2176 $Coro::current->{desc} = "map player save";
1882 $_->contr->save for $self->players; 2177 $_->contr->save for $self->players;
1883 }; 2178 };
1884 2179
1885 if ($uniq) { 2180 if ($uniq) {
1886 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2181 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1894 my ($self) = @_; 2189 my ($self) = @_;
1895 2190
1896 # save first because save cedes 2191 # save first because save cedes
1897 $self->save; 2192 $self->save;
1898 2193
1899 my $lock = cf::lock_acquire "map_data:" . $self->path; 2194 my $lock = cf::lock_acquire "map_data:$self->{path}";
1900 2195
1901 return if $self->players; 2196 return if $self->players;
1902 return if $self->in_memory != cf::MAP_IN_MEMORY; 2197 return if $self->in_memory != cf::MAP_IN_MEMORY;
1903 return if $self->{deny_save}; 2198 return if $self->{deny_save};
1904 2199
2200 $self->in_memory (cf::MAP_SWAPPED);
2201
2202 $self->deactivate;
2203 $_->clear_links_to ($self) for values %cf::MAP;
1905 $self->clear; 2204 $self->clear;
1906 $self->in_memory (cf::MAP_SWAPPED);
1907} 2205}
1908 2206
1909sub reset_at { 2207sub reset_at {
1910 my ($self) = @_; 2208 my ($self) = @_;
1911 2209
1943 if $uniq; 2241 if $uniq;
1944 } 2242 }
1945 2243
1946 delete $cf::MAP{$self->path}; 2244 delete $cf::MAP{$self->path};
1947 2245
2246 $self->deactivate;
2247 $_->clear_links_to ($self) for values %cf::MAP;
1948 $self->clear; 2248 $self->clear;
1949
1950 $_->clear_links_to ($self) for values %cf::MAP;
1951 2249
1952 $self->unlink_save; 2250 $self->unlink_save;
1953 $self->destroy; 2251 $self->destroy;
1954} 2252}
1955 2253
1956my $nuke_counter = "aaaa"; 2254my $nuke_counter = "aaaa";
1957 2255
1958sub nuke { 2256sub nuke {
1959 my ($self) = @_; 2257 my ($self) = @_;
1960 2258
2259 {
2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2261
1961 delete $cf::MAP{$self->path}; 2262 delete $cf::MAP{$self->path};
1962 2263
1963 $self->unlink_save; 2264 $self->unlink_save;
1964 2265
1965 bless $self, "cf::map"; 2266 bless $self, "cf::map";
1966 delete $self->{deny_reset}; 2267 delete $self->{deny_reset};
1967 $self->{deny_save} = 1; 2268 $self->{deny_save} = 1;
1968 $self->reset_timeout (1); 2269 $self->reset_timeout (1);
1969 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2270 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1970 2271
1971 $cf::MAP{$self->path} = $self; 2272 $cf::MAP{$self->path} = $self;
2273 }
1972 2274
1973 $self->reset; # polite request, might not happen 2275 $self->reset; # polite request, might not happen
1974} 2276}
1975 2277
1976=item $maps = cf::map::tmp_maps 2278=item $maps = cf::map::tmp_maps
2052 2354
2053sub inv_recursive { 2355sub inv_recursive {
2054 inv_recursive_ inv $_[0] 2356 inv_recursive_ inv $_[0]
2055} 2357}
2056 2358
2359=item $ref = $ob->ref
2360
2361creates and returns a persistent reference to an objetc that can be stored as a string.
2362
2363=item $ob = cf::object::deref ($refstring)
2364
2365returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2366even if the object actually exists. May block.
2367
2368=cut
2369
2370sub deref {
2371 my ($ref) = @_;
2372
2373 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2374 my ($uuid, $name) = ($1, $2);
2375 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2376 or return;
2377 $pl->ob->uuid eq $uuid
2378 or return;
2379
2380 $pl->ob
2381 } else {
2382 warn "$ref: cannot resolve object reference\n";
2383 undef
2384 }
2385}
2386
2057package cf; 2387package cf;
2058 2388
2059=back 2389=back
2060 2390
2061=head3 cf::object::player 2391=head3 cf::object::player
2083 2413
2084 } else { 2414 } else {
2085 my $pl = $self->contr; 2415 my $pl = $self->contr;
2086 2416
2087 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2417 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2088 my $diag = $pl->{npc_dialog}; 2418 my $dialog = $pl->{npc_dialog};
2089 $diag->{pl}->ext_reply ( 2419 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2090 $diag->{id},
2091 msgtype => "reply",
2092 msg => $diag->{pl}->expand_cfpod ($msg),
2093 add_topics => []
2094 );
2095 2420
2096 } else { 2421 } else {
2097 $msg = $npc->name . " says: $msg" if $npc; 2422 $msg = $npc->name . " says: $msg" if $npc;
2098 $self->message ($msg, $flags); 2423 $self->message ($msg, $flags);
2099 } 2424 }
2100 } 2425 }
2426}
2427
2428=item $object->send_msg ($channel, $msg, $color, [extra...])
2429
2430=cut
2431
2432sub cf::object::send_msg {
2433 my $pl = shift->contr
2434 or return;
2435 $pl->send_msg (@_);
2101} 2436}
2102 2437
2103=item $player_object->may ("access") 2438=item $player_object->may ("access")
2104 2439
2105Returns wether the given player is authorized to access resource "access" 2440Returns wether the given player is authorized to access resource "access"
2184 # use -1 or undef as default coordinates, not 0, 0 2519 # use -1 or undef as default coordinates, not 0, 0
2185 ($x, $y) = ($map->enter_x, $map->enter_y) 2520 ($x, $y) = ($map->enter_x, $map->enter_y)
2186 if $x <=0 && $y <= 0; 2521 if $x <=0 && $y <= 0;
2187 2522
2188 $map->load; 2523 $map->load;
2189 $map->load_diag; 2524 $map->load_neighbours;
2190 2525
2191 return unless $self->contr->active; 2526 return unless $self->contr->active;
2192 $self->activate_recursive; 2527 $self->activate_recursive;
2193 2528
2194 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2529 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2195 $self->enter_map ($map, $x, $y); 2530 $self->enter_map ($map, $x, $y);
2196} 2531}
2197 2532
2198=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2533=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2199 2534
2200Moves the player to the given map-path and coordinates by first freezing 2535Moves the player to the given map-path and coordinates by first freezing
2201her, loading and preparing them map, calling the provided $check callback 2536her, loading and preparing them map, calling the provided $check callback
2202that has to return the map if sucecssful, and then unfreezes the player on 2537that has to return the map if sucecssful, and then unfreezes the player on
2203the new (success) or old (failed) map position. 2538the new (success) or old (failed) map position. In either case, $done will
2539be called at the end of this process.
2204 2540
2205=cut 2541=cut
2206 2542
2207our $GOTOGEN; 2543our $GOTOGEN;
2208 2544
2209sub cf::object::player::goto { 2545sub cf::object::player::goto {
2210 my ($self, $path, $x, $y, $check) = @_; 2546 my ($self, $path, $x, $y, $check, $done) = @_;
2211 2547
2212 # do generation counting so two concurrent goto's will be executed in-order 2548 # do generation counting so two concurrent goto's will be executed in-order
2213 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2549 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2214 2550
2215 $self->enter_link; 2551 $self->enter_link;
2216 2552
2217 (async { 2553 (async {
2554 $Coro::current->{desc} = "player::goto $path $x $y";
2555
2556 # *tag paths override both path and x|y
2557 if ($path =~ /^\*(.*)$/) {
2558 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2559 my $ob = $obs[rand @obs];
2560
2561 # see if we actually can go there
2562 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2563 $ob = $obs[rand @obs];
2564 } else {
2565 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2566 }
2567 # else put us there anyways for now #d#
2568
2569 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2570 } else {
2571 ($path, $x, $y) = (undef, undef, undef);
2572 }
2573 }
2574
2218 my $map = eval { 2575 my $map = eval {
2219 my $map = cf::map::find $path; 2576 my $map = defined $path ? cf::map::find $path : undef;
2220 2577
2221 if ($map) { 2578 if ($map) {
2222 $map = $map->customise_for ($self); 2579 $map = $map->customise_for ($self);
2223 $map = $check->($map) if $check && $map; 2580 $map = $check->($map) if $check && $map;
2224 } else { 2581 } else {
2225 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2582 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2226 } 2583 }
2227 2584
2228 $map 2585 $map
2229 }; 2586 };
2230 2587
2235 2592
2236 if ($gen == $self->{_goto_generation}) { 2593 if ($gen == $self->{_goto_generation}) {
2237 delete $self->{_goto_generation}; 2594 delete $self->{_goto_generation};
2238 $self->leave_link ($map, $x, $y); 2595 $self->leave_link ($map, $x, $y);
2239 } 2596 }
2597
2598 $done->() if $done;
2240 })->prio (1); 2599 })->prio (1);
2241} 2600}
2242 2601
2243=item $player_object->enter_exit ($exit_object) 2602=item $player_object->enter_exit ($exit_object)
2244 2603
2281 $rmp->{origin_y} = $exit->y; 2640 $rmp->{origin_y} = $exit->y;
2282 } 2641 }
2283 2642
2284 $rmp->{random_seed} ||= $exit->random_seed; 2643 $rmp->{random_seed} ||= $exit->random_seed;
2285 2644
2286 my $data = cf::to_json $rmp; 2645 my $data = cf::encode_json $rmp;
2287 my $md5 = Digest::MD5::md5_hex $data; 2646 my $md5 = Digest::MD5::md5_hex $data;
2288 my $meta = "$RANDOMDIR/$md5.meta"; 2647 my $meta = "$RANDOMDIR/$md5.meta";
2289 2648
2290 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2649 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2291 aio_write $fh, 0, (length $data), $data, 0; 2650 aio_write $fh, 0, (length $data), $data, 0;
2313 my $hp = $exit->stats->hp; 2672 my $hp = $exit->stats->hp;
2314 my $sp = $exit->stats->sp; 2673 my $sp = $exit->stats->sp;
2315 2674
2316 $self->enter_link; 2675 $self->enter_link;
2317 2676
2677 # if exit is damned, update players death & WoR home-position
2678 $self->contr->savebed ($slaying, $hp, $sp)
2679 if $exit->flag (FLAG_DAMNED);
2680
2318 (async { 2681 (async {
2682 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2683
2319 $self->deactivate_recursive; # just to be sure 2684 $self->deactivate_recursive; # just to be sure
2320 unless (eval { 2685 unless (eval {
2321 $self->goto ($slaying, $hp, $sp); 2686 $self->goto ($slaying, $hp, $sp);
2322 2687
2323 1; 2688 1;
2349 2714
2350 utf8::encode $text; 2715 utf8::encode $text;
2351 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2716 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2352} 2717}
2353 2718
2354=item $client->send_msg ($color, $type, $msg, [extra...]) 2719=item $client->send_msg ($channel, $msg, $color, [extra...])
2355 2720
2356Send a drawinfo or msg packet to the client, formatting the msg for the 2721Send a drawinfo or msg packet to the client, formatting the msg for the
2357client if neccessary. C<$type> should be a string identifying the type of 2722client if neccessary. C<$type> should be a string identifying the type of
2358the message, with C<log> being the default. If C<$color> is negative, suppress 2723the message, with C<log> being the default. If C<$color> is negative, suppress
2359the message unless the client supports the msg packet. 2724the message unless the client supports the msg packet.
2360 2725
2361=cut 2726=cut
2362 2727
2728# non-persistent channels (usually the info channel)
2729our %CHANNEL = (
2730 "c/identify" => {
2731 id => "infobox",
2732 title => "Identify",
2733 reply => undef,
2734 tooltip => "Items recently identified",
2735 },
2736 "c/examine" => {
2737 id => "infobox",
2738 title => "Examine",
2739 reply => undef,
2740 tooltip => "Signs and other items you examined",
2741 },
2742 "c/book" => {
2743 id => "infobox",
2744 title => "Book",
2745 reply => undef,
2746 tooltip => "The contents of a note or book",
2747 },
2748 "c/lookat" => {
2749 id => "infobox",
2750 title => "Look",
2751 reply => undef,
2752 tooltip => "What you saw there",
2753 },
2754 "c/who" => {
2755 id => "infobox",
2756 title => "Players",
2757 reply => undef,
2758 tooltip => "Shows players who are currently online",
2759 },
2760 "c/body" => {
2761 id => "infobox",
2762 title => "Body Parts",
2763 reply => undef,
2764 tooltip => "Shows which body parts you posess and are available",
2765 },
2766 "c/uptime" => {
2767 id => "infobox",
2768 title => "Uptime",
2769 reply => undef,
2770 tooltip => "How long the server has been running since last restart",
2771 },
2772 "c/mapinfo" => {
2773 id => "infobox",
2774 title => "Map Info",
2775 reply => undef,
2776 tooltip => "Information related to the maps",
2777 },
2778);
2779
2363sub cf::client::send_msg { 2780sub cf::client::send_msg {
2364 my ($self, $color, $type, $msg, @extra) = @_; 2781 my ($self, $channel, $msg, $color, @extra) = @_;
2365 2782
2366 $msg = $self->pl->expand_cfpod ($msg); 2783 $msg = $self->pl->expand_cfpod ($msg);
2367 2784
2785 $color &= cf::NDI_CLIENT_MASK; # just in case...
2786
2787 # check predefined channels, for the benefit of C
2788 if ($CHANNEL{$channel}) {
2789 $channel = $CHANNEL{$channel};
2790
2791 $self->ext_msg (channel_info => $channel)
2792 if $self->can_msg;
2793
2794 $channel = $channel->{id};
2795
2796 } elsif (ref $channel) {
2797 # send meta info to client, if not yet sent
2798 unless (exists $self->{channel}{$channel->{id}}) {
2799 $self->{channel}{$channel->{id}} = $channel;
2800 $self->ext_msg (channel_info => $channel)
2801 if $self->can_msg;
2802 }
2803
2804 $channel = $channel->{id};
2805 }
2806
2807 return unless @extra || length $msg;
2808
2368 if ($self->can_msg) { 2809 if ($self->can_msg) {
2369 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); 2810 # default colour, mask it out
2811 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2812 if $color & cf::NDI_DEF;
2813
2814 $self->send_packet ("msg " . $self->{json_coder}->encode (
2815 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2370 } else { 2816 } else {
2371 # replace some tags by gcfclient-compatible ones
2372 for ($msg) {
2373 1 while
2374 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2375 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2376 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2377 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2378 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2379 }
2380
2381 if ($color >= 0) { 2817 if ($color >= 0) {
2818 # replace some tags by gcfclient-compatible ones
2819 for ($msg) {
2820 1 while
2821 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2822 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2823 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2824 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2825 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2826 }
2827
2828 $color &= cf::NDI_COLOR_MASK;
2829
2830 utf8::encode $msg;
2831
2382 if (0 && $msg =~ /\[/) { 2832 if (0 && $msg =~ /\[/) {
2833 # COMMAND/INFO
2383 $self->send_packet ("drawextinfo $color 4 0 $msg") 2834 $self->send_packet ("drawextinfo $color 10 8 $msg")
2384 } else { 2835 } else {
2385 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2836 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2386 $self->send_packet ("drawinfo $color $msg") 2837 $self->send_packet ("drawinfo $color $msg")
2387 } 2838 }
2388 } 2839 }
2389 } 2840 }
2390} 2841}
2391 2842
2392=item $client->ext_event ($type, %msg) 2843=item $client->ext_msg ($type, @msg)
2393 2844
2394Sends an exti event to the client. 2845Sends an ext event to the client.
2395 2846
2396=cut 2847=cut
2397 2848
2398sub cf::client::ext_event($$%) { 2849sub cf::client::ext_msg($$@) {
2399 my ($self, $type, %msg) = @_; 2850 my ($self, $type, @msg) = @_;
2400 2851
2852 if ($self->extcmd == 2) {
2853 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2854 } elsif ($self->extcmd == 1) { # TODO: remove
2401 $msg{msgtype} = "event_$type"; 2855 push @msg, msgtype => "event_$type";
2402 $self->send_packet ("ext " . cf::to_json \%msg); 2856 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2857 }
2858}
2859
2860=item $client->ext_reply ($msgid, @msg)
2861
2862Sends an ext reply to the client.
2863
2864=cut
2865
2866sub cf::client::ext_reply($$@) {
2867 my ($self, $id, @msg) = @_;
2868
2869 if ($self->extcmd == 2) {
2870 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2871 } elsif ($self->extcmd == 1) {
2872 #TODO: version 1, remove
2873 unshift @msg, msgtype => "reply", msgid => $id;
2874 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2875 }
2403} 2876}
2404 2877
2405=item $success = $client->query ($flags, "text", \&cb) 2878=item $success = $client->query ($flags, "text", \&cb)
2406 2879
2407Queues a query to the client, calling the given callback with 2880Queues a query to the client, calling the given callback with
2408the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2881the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2409C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2882C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2410 2883
2411Queries can fail, so check the return code. Or don't, as queries will become 2884Queries can fail, so check the return code. Or don't, as queries will
2412reliable at some point in the future. 2885become reliable at some point in the future.
2413 2886
2414=cut 2887=cut
2415 2888
2416sub cf::client::query { 2889sub cf::client::query {
2417 my ($self, $flags, $text, $cb) = @_; 2890 my ($self, $flags, $text, $cb) = @_;
2425 utf8::encode $text; 2898 utf8::encode $text;
2426 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2899 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2427 2900
2428 $self->send_packet ($self->{query_queue}[0][0]) 2901 $self->send_packet ($self->{query_queue}[0][0])
2429 if @{ $self->{query_queue} } == 1; 2902 if @{ $self->{query_queue} } == 1;
2903
2904 1
2430} 2905}
2431 2906
2432cf::client->attach ( 2907cf::client->attach (
2908 on_connect => sub {
2909 my ($ns) = @_;
2910
2911 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2912 },
2433 on_reply => sub { 2913 on_reply => sub {
2434 my ($ns, $msg) = @_; 2914 my ($ns, $msg) = @_;
2435 2915
2436 # this weird shuffling is so that direct followup queries 2916 # this weird shuffling is so that direct followup queries
2437 # get handled first 2917 # get handled first
2449 } else { 2929 } else {
2450 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2930 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2451 } 2931 }
2452 } 2932 }
2453 }, 2933 },
2934 on_exticmd => sub {
2935 my ($ns, $buf) = @_;
2936
2937 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2938
2939 if (ref $msg) {
2940 my ($type, $reply, @payload) =
2941 "ARRAY" eq ref $msg
2942 ? @$msg
2943 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2944
2945 my @reply;
2946
2947 if (my $cb = $EXTICMD{$type}) {
2948 @reply = $cb->($ns, @payload);
2949 }
2950
2951 $ns->ext_reply ($reply, @reply)
2952 if $reply;
2953
2954 } else {
2955 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2956 }
2957
2958 cf::override;
2959 },
2454); 2960);
2455 2961
2456=item $client->async (\&cb) 2962=item $client->async (\&cb)
2457 2963
2458Create a new coroutine, running the specified callback. The coroutine will 2964Create a new coroutine, running the specified callback. The coroutine will
2499our $safe = new Safe "safe"; 3005our $safe = new Safe "safe";
2500our $safe_hole = new Safe::Hole; 3006our $safe_hole = new Safe::Hole;
2501 3007
2502$SIG{FPE} = 'IGNORE'; 3008$SIG{FPE} = 'IGNORE';
2503 3009
2504$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3010$safe->permit_only (Opcode::opset qw(
3011 :base_core :base_mem :base_orig :base_math
3012 grepstart grepwhile mapstart mapwhile
3013 sort time
3014));
2505 3015
2506# here we export the classes and methods available to script code 3016# here we export the classes and methods available to script code
2507 3017
2508=pod 3018=pod
2509 3019
2510The following functions and methods are available within a safe environment: 3020The following functions and methods are available within a safe environment:
2511 3021
2512 cf::object contr pay_amount pay_player map 3022 cf::object
3023 contr pay_amount pay_player map x y force_find force_add destroy
3024 insert remove name archname title slaying race decrease_ob_nr
3025
2513 cf::object::player player 3026 cf::object::player
2514 cf::player peaceful 3027 player
2515 cf::map trigger 3028
3029 cf::player
3030 peaceful
3031
3032 cf::map
3033 trigger
2516 3034
2517=cut 3035=cut
2518 3036
2519for ( 3037for (
2520 ["cf::object" => qw(contr pay_amount pay_player map)], 3038 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3039 insert remove inv name archname title slaying race
3040 decrease_ob_nr destroy)],
2521 ["cf::object::player" => qw(player)], 3041 ["cf::object::player" => qw(player)],
2522 ["cf::player" => qw(peaceful)], 3042 ["cf::player" => qw(peaceful)],
2523 ["cf::map" => qw(trigger)], 3043 ["cf::map" => qw(trigger)],
2524) { 3044) {
2525 no strict 'refs'; 3045 no strict 'refs';
2601# the server's init and main functions 3121# the server's init and main functions
2602 3122
2603sub load_facedata($) { 3123sub load_facedata($) {
2604 my ($path) = @_; 3124 my ($path) = @_;
2605 3125
3126 # HACK to clear player env face cache, we need some signal framework
3127 # for this (global event?)
3128 %ext::player_env::MUSIC_FACE_CACHE = ();
3129
3130 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3131
2606 warn "loading facedata from $path\n"; 3132 warn "loading facedata from $path\n";
2607 3133
2608 my $facedata; 3134 my $facedata;
2609 0 < aio_load $path, $facedata 3135 0 < aio_load $path, $facedata
2610 or die "$path: $!"; 3136 or die "$path: $!";
2612 $facedata = Coro::Storable::thaw $facedata; 3138 $facedata = Coro::Storable::thaw $facedata;
2613 3139
2614 $facedata->{version} == 2 3140 $facedata->{version} == 2
2615 or cf::cleanup "$path: version mismatch, cannot proceed."; 3141 or cf::cleanup "$path: version mismatch, cannot proceed.";
2616 3142
3143 # patch in the exptable
3144 $facedata->{resource}{"res/exp_table"} = {
3145 type => FT_RSRC,
3146 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3147 };
3148 cf::cede_to_tick;
3149
2617 { 3150 {
2618 my $faces = $facedata->{faceinfo}; 3151 my $faces = $facedata->{faceinfo};
2619 3152
2620 while (my ($face, $info) = each %$faces) { 3153 while (my ($face, $info) = each %$faces) {
2621 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3154 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3155
2622 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3156 cf::face::set_visibility $idx, $info->{visibility};
3157 cf::face::set_magicmap $idx, $info->{magicmap};
2623 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3158 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2624 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3159 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2625 Coro::cede; 3160
3161 cf::cede_to_tick;
2626 } 3162 }
2627 3163
2628 while (my ($face, $info) = each %$faces) { 3164 while (my ($face, $info) = each %$faces) {
2629 next unless $info->{smooth}; 3165 next unless $info->{smooth};
3166
2630 my $idx = cf::face::find $face 3167 my $idx = cf::face::find $face
2631 or next; 3168 or next;
3169
2632 if (my $smooth = cf::face::find $info->{smooth}) { 3170 if (my $smooth = cf::face::find $info->{smooth}) {
3171 cf::face::set_smooth $idx, $smooth;
2633 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3172 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2634 } else { 3173 } else {
2635 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3174 warn "smooth face '$info->{smooth}' not found for face '$face'";
2636 } 3175 }
2637 Coro::cede; 3176
3177 cf::cede_to_tick;
2638 } 3178 }
2639 } 3179 }
2640 3180
2641 { 3181 {
2642 my $anims = $facedata->{animinfo}; 3182 my $anims = $facedata->{animinfo};
2643 3183
2644 while (my ($anim, $info) = each %$anims) { 3184 while (my ($anim, $info) = each %$anims) {
2645 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3185 cf::anim::set $anim, $info->{frames}, $info->{facings};
2646 Coro::cede; 3186 cf::cede_to_tick;
2647 } 3187 }
2648 3188
2649 cf::anim::invalidate_all; # d'oh 3189 cf::anim::invalidate_all; # d'oh
2650 } 3190 }
2651 3191
3192 {
3193 # TODO: for gcfclient pleasure, we should give resources
3194 # that gcfclient doesn't grok a >10000 face index.
3195 my $res = $facedata->{resource};
3196
3197 while (my ($name, $info) = each %$res) {
3198 if (defined $info->{type}) {
3199 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3200 my $data;
3201
3202 if ($info->{type} & 1) {
3203 # prepend meta info
3204
3205 my $meta = $enc->encode ({
3206 name => $name,
3207 %{ $info->{meta} || {} },
3208 });
3209
3210 $data = pack "(w/a*)*", $meta, $info->{data};
3211 } else {
3212 $data = $info->{data};
3213 }
3214
3215 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3216 cf::face::set_type $idx, $info->{type};
3217 } else {
3218 $RESOURCE{$name} = $info;
3219 }
3220
3221 cf::cede_to_tick;
3222 }
3223
3224 if (my $soundconf = delete $res->{"res/sound.conf"}) {
3225 $soundconf = $enc->decode (delete $soundconf->{data});
3226
3227 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3228 my $sound = $soundconf->{compat}[$_]
3229 or next;
3230
3231 my $face = cf::face::find "sound/$sound->[1]";
3232 cf::sound::set $sound->[0] => $face;
3233 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3234 }
3235
3236 while (my ($k, $v) = each %{$soundconf->{event}}) {
3237 my $face = cf::face::find "sound/$v";
3238 cf::sound::set $k => $face;
3239 }
3240 }
3241 }
3242
2652 1 3243 1
2653} 3244}
2654 3245
3246register_exticmd fx_want => sub {
3247 my ($ns, $want) = @_;
3248
3249 while (my ($k, $v) = each %$want) {
3250 $ns->fx_want ($k, $v);
3251 }
3252};
3253
2655sub reload_regions { 3254sub reload_regions {
3255 # HACK to clear player env face cache, we need some signal framework
3256 # for this (global event?)
3257 %ext::player_env::MUSIC_FACE_CACHE = ();
3258
2656 load_resource_file "$MAPDIR/regions" 3259 load_resource_file "$MAPDIR/regions"
2657 or die "unable to load regions file\n"; 3260 or die "unable to load regions file\n";
3261
3262 for (cf::region::list) {
3263 $_->{match} = qr/$_->{match}/
3264 if exists $_->{match};
3265 }
2658} 3266}
2659 3267
2660sub reload_facedata { 3268sub reload_facedata {
2661 load_facedata "$DATADIR/facedata" 3269 load_facedata "$DATADIR/facedata"
2662 or die "unable to load facedata\n"; 3270 or die "unable to load facedata\n";
2663} 3271}
2664 3272
2665sub reload_archetypes { 3273sub reload_archetypes {
3274 load_resource_file "$DATADIR/archetypes"
3275 or die "unable to load archetypes\n";
3276 #d# NEED to laod twice to resolve forward references
3277 # this really needs to be done in an extra post-pass
3278 # (which needs to be synchronous, so solve it differently)
2666 load_resource_file "$DATADIR/archetypes" 3279 load_resource_file "$DATADIR/archetypes"
2667 or die "unable to load archetypes\n"; 3280 or die "unable to load archetypes\n";
2668} 3281}
2669 3282
2670sub reload_treasures { 3283sub reload_treasures {
2686 3299
2687sub init { 3300sub init {
2688 reload_resources; 3301 reload_resources;
2689} 3302}
2690 3303
2691sub cfg_load { 3304sub reload_config {
2692 open my $fh, "<:utf8", "$CONFDIR/config" 3305 open my $fh, "<:utf8", "$CONFDIR/config"
2693 or return; 3306 or return;
2694 3307
2695 local $/; 3308 local $/;
2696 *CFG = YAML::Syck::Load <$fh>; 3309 *CFG = YAML::Syck::Load <$fh>;
2712sub main { 3325sub main {
2713 # we must not ever block the main coroutine 3326 # we must not ever block the main coroutine
2714 local $Coro::idle = sub { 3327 local $Coro::idle = sub {
2715 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3328 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2716 (async { 3329 (async {
2717 Event::one_event; 3330 $Coro::current->{desc} = "IDLE BUG HANDLER";
3331 EV::loop EV::LOOP_ONESHOT;
2718 })->prio (Coro::PRIO_MAX); 3332 })->prio (Coro::PRIO_MAX);
2719 }; 3333 };
2720 3334
2721 cfg_load; 3335 reload_config;
2722 db_init; 3336 db_init;
2723 load_extensions; 3337 load_extensions;
2724 3338
2725 $TICK_WATCHER->start; 3339 $TICK_WATCHER->start;
3340 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
2726 Event::loop; 3341 EV::loop;
2727} 3342}
2728 3343
2729############################################################################# 3344#############################################################################
2730# initialisation and cleanup 3345# initialisation and cleanup
2731 3346
2732# install some emergency cleanup handlers 3347# install some emergency cleanup handlers
2733BEGIN { 3348BEGIN {
3349 our %SIGWATCHER = ();
2734 for my $signal (qw(INT HUP TERM)) { 3350 for my $signal (qw(INT HUP TERM)) {
2735 Event->signal ( 3351 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2736 reentrant => 0,
2737 data => WF_AUTOCANCEL,
2738 signal => $signal,
2739 prio => 0,
2740 cb => sub {
2741 cf::cleanup "SIG$signal"; 3352 cf::cleanup "SIG$signal";
2742 },
2743 ); 3353 };
2744 } 3354 }
2745} 3355}
2746 3356
2747sub write_runtime { 3357sub write_runtime {
2748 my $runtime = "$LOCALDIR/runtime"; 3358 my $runtime = "$LOCALDIR/runtime";
2793 # and maps saved/destroyed asynchronously. 3403 # and maps saved/destroyed asynchronously.
2794 warn "begin emergency player save\n"; 3404 warn "begin emergency player save\n";
2795 for my $login (keys %cf::PLAYER) { 3405 for my $login (keys %cf::PLAYER) {
2796 my $pl = $cf::PLAYER{$login} or next; 3406 my $pl = $cf::PLAYER{$login} or next;
2797 $pl->valid or next; 3407 $pl->valid or next;
3408 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2798 $pl->save; 3409 $pl->save;
2799 } 3410 }
2800 warn "end emergency player save\n"; 3411 warn "end emergency player save\n";
2801 3412
2802 warn "begin emergency map save\n"; 3413 warn "begin emergency map save\n";
2841 warn "syncing database to disk"; 3452 warn "syncing database to disk";
2842 BDB::db_env_txn_checkpoint $DB_ENV; 3453 BDB::db_env_txn_checkpoint $DB_ENV;
2843 3454
2844 # if anything goes wrong in here, we should simply crash as we already saved 3455 # if anything goes wrong in here, we should simply crash as we already saved
2845 3456
2846 warn "cancelling all WF_AUTOCANCEL watchers";
2847 for (Event::all_watchers) {
2848 $_->cancel if $_->data & WF_AUTOCANCEL;
2849 }
2850
2851 warn "flushing outstanding aio requests"; 3457 warn "flushing outstanding aio requests";
2852 for (;;) { 3458 for (;;) {
2853 BDB::flush; 3459 BDB::flush;
2854 IO::AIO::flush; 3460 IO::AIO::flush;
2855 Coro::cede; 3461 Coro::cede_notself;
2856 last unless IO::AIO::nreqs || BDB::nreqs; 3462 last unless IO::AIO::nreqs || BDB::nreqs;
2857 warn "iterate..."; 3463 warn "iterate...";
2858 } 3464 }
2859 3465
2860 ++$RELOAD; 3466 ++$RELOAD;
2864 %EXT_CORO = (); 3470 %EXT_CORO = ();
2865 3471
2866 warn "removing commands"; 3472 warn "removing commands";
2867 %COMMAND = (); 3473 %COMMAND = ();
2868 3474
2869 warn "removing ext commands"; 3475 warn "removing ext/exti commands";
2870 %EXTCMD = (); 3476 %EXTCMD = ();
3477 %EXTICMD = ();
2871 3478
2872 warn "unloading/nuking all extensions"; 3479 warn "unloading/nuking all extensions";
2873 for my $pkg (@EXTS) { 3480 for my $pkg (@EXTS) {
2874 warn "... unloading $pkg"; 3481 warn "... unloading $pkg";
2875 3482
2918 warn "reloading cf.pm"; 3525 warn "reloading cf.pm";
2919 require cf; 3526 require cf;
2920 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3527 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2921 3528
2922 warn "loading config and database again"; 3529 warn "loading config and database again";
2923 cf::cfg_load; 3530 cf::reload_config;
2924 3531
2925 warn "loading extensions"; 3532 warn "loading extensions";
2926 cf::load_extensions; 3533 cf::load_extensions;
2927 3534
2928 warn "reattaching attachments to objects/players"; 3535 warn "reattaching attachments to objects/players";
2948 3555
2949sub reload_perl() { 3556sub reload_perl() {
2950 # doing reload synchronously and two reloads happen back-to-back, 3557 # doing reload synchronously and two reloads happen back-to-back,
2951 # coro crashes during coro_state_free->destroy here. 3558 # coro crashes during coro_state_free->destroy here.
2952 3559
2953 $RELOAD_WATCHER ||= Event->timer ( 3560 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
2954 reentrant => 0,
2955 after => 0,
2956 data => WF_AUTOCANCEL,
2957 cb => sub {
2958 do_reload_perl;
2959 undef $RELOAD_WATCHER; 3561 undef $RELOAD_WATCHER;
2960 }, 3562 do_reload_perl;
2961 ); 3563 };
2962} 3564}
2963 3565
2964register_command "reload" => sub { 3566register_command "reload" => sub {
2965 my ($who, $arg) = @_; 3567 my ($who, $arg) = @_;
2966 3568
2967 if ($who->flag (FLAG_WIZ)) { 3569 if ($who->flag (FLAG_WIZ)) {
2968 $who->message ("reloading server."); 3570 $who->message ("reloading server.");
3571 async {
3572 $Coro::current->{desc} = "perl_reload";
2969 async { reload_perl }; 3573 reload_perl;
3574 };
2970 } 3575 }
2971}; 3576};
2972 3577
2973unshift @INC, $LIBDIR; 3578unshift @INC, $LIBDIR;
2974 3579
2993 my $signal = new Coro::Signal; 3598 my $signal = new Coro::Signal;
2994 push @WAIT_FOR_TICK_BEGIN, $signal; 3599 push @WAIT_FOR_TICK_BEGIN, $signal;
2995 $signal->wait; 3600 $signal->wait;
2996} 3601}
2997 3602
2998 my $min = 1e6;#d# 3603$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
2999 my $avg = 10;
3000$TICK_WATCHER = Event->timer (
3001 reentrant => 0,
3002 parked => 1,
3003 prio => 0,
3004 at => $NEXT_TICK || $TICK,
3005 data => WF_AUTOCANCEL,
3006 cb => sub {
3007 if ($Coro::current != $Coro::main) { 3604 if ($Coro::current != $Coro::main) {
3008 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3605 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3009 unless ++$bug_warning > 10; 3606 unless ++$bug_warning > 10;
3010 return; 3607 return;
3011 } 3608 }
3012 3609
3013 $NOW = $tick_start = Event::time; 3610 $NOW = $tick_start = EV::now;
3014 3611
3015 cf::server_tick; # one server iteration 3612 cf::server_tick; # one server iteration
3016 3613
3017 0 && sync_job {#d# 3614 $RUNTIME += $TICK;
3018 for(1..10) { 3615 $NEXT_TICK = $_[0]->at;
3019 my $t = Event::time;
3020 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3021 or die;
3022 3616
3023 $map->width (50); 3617 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3024 $map->height (50); 3618 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3025 $map->alloc; 3619 Coro::async_pool {
3026 $map->_load_objects ("/tmp/x.map", 1); 3620 $Coro::current->{desc} = "runtime saver";
3027 my $t = Event::time - $t; 3621 write_runtime
3028 3622 or warn "ERROR: unable to write runtime file: $!";
3029 #next unless $t < 0.0013;#d#
3030 if ($t < $min) {
3031 $min = $t;
3032 }
3033 $avg = $avg * 0.99 + $t * 0.01;
3034 }
3035 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3036 exit 0;
3037 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3038 }; 3623 };
3624 }
3039 3625
3040 $RUNTIME += $TICK;
3041 $NEXT_TICK += $TICK;
3042
3043 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3044 $NEXT_RUNTIME_WRITE = $NOW + 10;
3045 Coro::async_pool {
3046 write_runtime
3047 or warn "ERROR: unable to write runtime file: $!";
3048 };
3049 }
3050
3051# my $AFTER = Event::time;
3052# warn $AFTER - $NOW;#d#
3053
3054 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3626 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3055 $sig->send; 3627 $sig->send;
3056 } 3628 }
3057 while (my $sig = shift @WAIT_FOR_TICK) { 3629 while (my $sig = shift @WAIT_FOR_TICK) {
3058 $sig->send; 3630 $sig->send;
3059 } 3631 }
3060 3632
3061 $NOW = Event::time;
3062
3063 # if we are delayed by four ticks or more, skip them all
3064 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3065
3066 $TICK_WATCHER->at ($NEXT_TICK);
3067 $TICK_WATCHER->start;
3068
3069 $LOAD = ($NOW - $tick_start) / $TICK; 3633 $LOAD = ($NOW - $tick_start) / $TICK;
3070 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3634 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3071 3635
3072 _post_tick; 3636 _post_tick;
3073 3637};
3074 3638$TICK_WATCHER->priority (EV::MAXPRI);
3075 },
3076);
3077 3639
3078{ 3640{
3079 BDB::max_poll_time $TICK * 0.1; 3641 # configure BDB
3080 $BDB_POLL_WATCHER = Event->io ( 3642
3081 reentrant => 0,
3082 fd => BDB::poll_fileno,
3083 poll => 'r',
3084 prio => 0,
3085 data => WF_AUTOCANCEL,
3086 cb => \&BDB::poll_cb,
3087 );
3088 BDB::min_parallel 8; 3643 BDB::min_parallel 8;
3089 3644 BDB::max_poll_reqs $TICK * 0.1;
3090 BDB::set_sync_prepare { 3645 $Coro::BDB::WATCHER->priority (1);
3091 my $status;
3092 my $current = $Coro::current;
3093 (
3094 sub {
3095 $status = $!;
3096 $current->ready; undef $current;
3097 },
3098 sub {
3099 Coro::schedule while defined $current;
3100 $! = $status;
3101 },
3102 )
3103 };
3104 3646
3105 unless ($DB_ENV) { 3647 unless ($DB_ENV) {
3106 $DB_ENV = BDB::db_env_create; 3648 $DB_ENV = BDB::db_env_create;
3649 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3650 | BDB::LOG_AUTOREMOVE, 1);
3651 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3652 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3107 3653
3108 cf::sync_job { 3654 cf::sync_job {
3109 eval { 3655 eval {
3110 BDB::db_env_open 3656 BDB::db_env_open
3111 $DB_ENV, 3657 $DB_ENV,
3113 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3659 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3114 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3660 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3115 0666; 3661 0666;
3116 3662
3117 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3663 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3118
3119 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3120 $DB_ENV->set_lk_detect;
3121 }; 3664 };
3122 3665
3123 cf::cleanup "db_env_open(db): $@" if $@; 3666 cf::cleanup "db_env_open(db): $@" if $@;
3124 }; 3667 };
3125 } 3668 }
3669
3670 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3671 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3672 };
3673 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3674 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3675 };
3676 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3677 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3678 };
3126} 3679}
3127 3680
3128{ 3681{
3682 # configure IO::AIO
3683
3129 IO::AIO::min_parallel 8; 3684 IO::AIO::min_parallel 8;
3130
3131 undef $Coro::AIO::WATCHER;
3132 IO::AIO::max_poll_time $TICK * 0.1; 3685 IO::AIO::max_poll_time $TICK * 0.1;
3133 $AIO_POLL_WATCHER = Event->io ( 3686 $Coro::AIO::WATCHER->priority (1);
3134 reentrant => 0,
3135 data => WF_AUTOCANCEL,
3136 fd => IO::AIO::poll_fileno,
3137 poll => 'r',
3138 prio => 6,
3139 cb => \&IO::AIO::poll_cb,
3140 );
3141} 3687}
3142 3688
3143my $_log_backtrace; 3689my $_log_backtrace;
3144 3690
3145sub _log_backtrace { 3691sub _log_backtrace {
3149 3695
3150 # limit the # of concurrent backtraces 3696 # limit the # of concurrent backtraces
3151 if ($_log_backtrace < 2) { 3697 if ($_log_backtrace < 2) {
3152 ++$_log_backtrace; 3698 ++$_log_backtrace;
3153 async { 3699 async {
3700 $Coro::current->{desc} = "abt $msg";
3701
3154 my @bt = fork_call { 3702 my @bt = fork_call {
3155 @addr = map { sprintf "%x", $_ } @addr; 3703 @addr = map { sprintf "%x", $_ } @addr;
3156 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3704 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3157 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3705 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3158 or die "addr2line: $!"; 3706 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines