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.280 by root, Sat Jun 16 14:35:41 2007 UTC vs.
Revision 1.401 by root, Mon Dec 17 06:45:53 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;
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;
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
73our $TICK_WATCHER; 76our $TICK_WATCHER;
74our $AIO_POLL_WATCHER; 77our $AIO_POLL_WATCHER;
75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
76our $NEXT_TICK; 79our $NEXT_TICK;
77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 80our $USE_FSYNC = 1; # use fsync to write maps - default off
79 81
80our $BDB_POLL_WATCHER; 82our $BDB_POLL_WATCHER;
83our $BDB_DEADLOCK_WATCHER;
84our $BDB_CHECKPOINT_WATCHER;
85our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 86our $DB_ENV;
82 87
83our %CFG; 88our %CFG;
84 89
85our $UPTIME; $UPTIME ||= time; 90our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 91our $RUNTIME;
92our $NOW;
87 93
88our %PLAYER; # all users 94our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 95our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 96our $LINK_MAP; # the special {link} map, which is always available
91 97
92# used to convert map paths into valid unix filenames by replacing / by ∕ 98# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 99our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 100
155 161
156The raw value load value from the last tick. 162The raw value load value from the last tick.
157 163
158=item %cf::CFG 164=item %cf::CFG
159 165
160Configuration for the server, loaded from C</etc/crossfire/config>, or 166Configuration for the server, loaded from C</etc/deliantra-server/config>, or
161from wherever your confdir points to. 167from wherever your confdir points to.
162 168
163=item cf::wait_for_tick, cf::wait_for_tick_begin 169=item cf::wait_for_tick, cf::wait_for_tick_begin
164 170
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 171These 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 172returns 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. 173per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168 174
175=item @cf::INVOKE_RESULTS
176
177This array contains the results of the last C<invoke ()> call. When
178C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
179that call.
180
169=back 181=back
170 182
171=cut 183=cut
172 184
173BEGIN { 185BEGIN {
177 $msg .= "\n" 189 $msg .= "\n"
178 unless $msg =~ /\n$/; 190 unless $msg =~ /\n$/;
179 191
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 192 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181 193
182 utf8::encode $msg;
183 LOG llevError, $msg; 194 LOG llevError, $msg;
184 }; 195 };
185} 196}
186 197
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
203)) { 214)) {
204 no strict 'refs'; 215 no strict 'refs';
205 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
206} 217}
207 218
208$Event::DIED = sub { 219$EV::DIED = sub {
209 warn "error in event callback: @_"; 220 warn "error in event callback: @_";
210}; 221};
222
223#############################################################################
211 224
212=head2 UTILITY FUNCTIONS 225=head2 UTILITY FUNCTIONS
213 226
214=over 4 227=over 4
215 228
234 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 247 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
235 $d 248 $d
236 } || "[unable to dump $_[0]: '$@']"; 249 } || "[unable to dump $_[0]: '$@']";
237} 250}
238 251
239use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
240
241=item $ref = cf::from_json $json 252=item $ref = cf::decode_json $json
242 253
243Converts a JSON string into the corresponding perl data structure. 254Converts a JSON string into the corresponding perl data structure.
244 255
245=item $json = cf::to_json $ref 256=item $json = cf::encode_json $ref
246 257
247Converts a perl data structure into its JSON representation. 258Converts a perl data structure into its JSON representation.
259
260=cut
261
262our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
263
264sub encode_json($) { $json_coder->encode ($_[0]) }
265sub decode_json($) { $json_coder->decode ($_[0]) }
248 266
249=item cf::lock_wait $string 267=item cf::lock_wait $string
250 268
251Wait until the given lock is available. See cf::lock_acquire. 269Wait until the given lock is available. See cf::lock_acquire.
252 270
255Wait until the given lock is available and then acquires it and returns 273Wait until the given lock is available and then acquires it and returns
256a Coro::guard object. If the guard object gets destroyed (goes out of scope, 274a Coro::guard object. If the guard object gets destroyed (goes out of scope,
257for example when the coroutine gets canceled), the lock is automatically 275for example when the coroutine gets canceled), the lock is automatically
258returned. 276returned.
259 277
278Locks are *not* recursive, locking from the same coro twice results in a
279deadlocked coro.
280
260Lock names should begin with a unique identifier (for example, cf::map::find 281Lock names should begin with a unique identifier (for example, cf::map::find
261uses map_find and cf::map::load uses map_load). 282uses map_find and cf::map::load uses map_load).
262 283
263=item $locked = cf::lock_active $string 284=item $locked = cf::lock_active $string
264 285
265Return true if the lock is currently active, i.e. somebody has locked it. 286Return true if the lock is currently active, i.e. somebody has locked it.
266 287
267=cut 288=cut
268 289
269our %LOCK; 290our %LOCK;
291our %LOCKER;#d#
270 292
271sub lock_wait($) { 293sub lock_wait($) {
272 my ($key) = @_; 294 my ($key) = @_;
295
296 if ($LOCKER{$key} == $Coro::current) {#d#
297 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
298 return;#d#
299 }#d#
273 300
274 # wait for lock, if any 301 # wait for lock, if any
275 while ($LOCK{$key}) { 302 while ($LOCK{$key}) {
276 push @{ $LOCK{$key} }, $Coro::current; 303 push @{ $LOCK{$key} }, $Coro::current;
277 Coro::schedule; 304 Coro::schedule;
283 310
284 # wait, to be sure we are not locked 311 # wait, to be sure we are not locked
285 lock_wait $key; 312 lock_wait $key;
286 313
287 $LOCK{$key} = []; 314 $LOCK{$key} = [];
315 $LOCKER{$key} = $Coro::current;#d#
288 316
289 Coro::guard { 317 Coro::guard {
318 delete $LOCKER{$key};#d#
290 # wake up all waiters, to be on the safe side 319 # wake up all waiters, to be on the safe side
291 $_->ready for @{ delete $LOCK{$key} }; 320 $_->ready for @{ delete $LOCK{$key} };
292 } 321 }
293} 322}
294 323
306 }; 335 };
307 $TICK_WATCHER->stop; 336 $TICK_WATCHER->stop;
308 $guard 337 $guard
309} 338}
310 339
340=item cf::periodic $interval, $cb
341
342Like EV::periodic, but randomly selects a starting point so that the actions
343get spread over timer.
344
345=cut
346
347sub periodic($$) {
348 my ($interval, $cb) = @_;
349
350 my $start = rand List::Util::min 180, $interval;
351
352 EV::periodic $start, $interval, 0, $cb
353}
354
355=item cf::get_slot $time[, $priority[, $name]]
356
357Allocate $time seconds of blocking CPU time at priority C<$priority>:
358This call blocks and returns only when you have at least C<$time> seconds
359of cpu time till the next tick. The slot is only valid till the next cede.
360
361The optional C<$name> can be used to identify the job to run. It might be
362used for statistical purposes and should identify the same time-class.
363
364Useful for short background jobs.
365
366=cut
367
368our @SLOT_QUEUE;
369our $SLOT_QUEUE;
370
371$SLOT_QUEUE->cancel if $SLOT_QUEUE;
372$SLOT_QUEUE = Coro::async {
373 $Coro::current->desc ("timeslot manager");
374
375 my $signal = new Coro::Signal;
376
377 while () {
378 next_job:
379 my $avail = cf::till_tick;
380 if ($avail > 0.01) {
381 for (0 .. $#SLOT_QUEUE) {
382 if ($SLOT_QUEUE[$_][0] < $avail) {
383 my $job = splice @SLOT_QUEUE, $_, 1, ();
384 $job->[2]->send;
385 Coro::cede;
386 goto next_job;
387 }
388 }
389 }
390
391 if (@SLOT_QUEUE) {
392 # we do not use wait_for_tick() as it returns immediately when tick is inactive
393 push @cf::WAIT_FOR_TICK, $signal;
394 $signal->wait;
395 } else {
396 Coro::schedule;
397 }
398 }
399};
400
401sub get_slot($;$$) {
402 my ($time, $pri, $name) = @_;
403
404 $time = $TICK * .6 if $time > $TICK * .6;
405 my $sig = new Coro::Signal;
406
407 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
408 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
409 $SLOT_QUEUE->ready;
410 $sig->wait;
411}
412
311=item cf::async { BLOCK } 413=item cf::async { BLOCK }
312 414
313Currently the same as Coro::async_pool, meaning you cannot use 415Currently the same as Coro::async_pool, meaning you cannot use
314C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 416C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
315thing you are allowed to do is call C<prio> on it. 417thing you are allowed to do is call C<prio> on it.
318 420
319BEGIN { *async = \&Coro::async_pool } 421BEGIN { *async = \&Coro::async_pool }
320 422
321=item cf::sync_job { BLOCK } 423=item cf::sync_job { BLOCK }
322 424
323The design of crossfire+ requires that the main coro ($Coro::main) is 425The design of Deliantra requires that the main coroutine ($Coro::main)
324always able to handle events or runnable, as crossfire+ is only partly 426is always able to handle events or runnable, as Deliantra is only
325reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 427partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
428acceptable.
326 429
327If it must be done, put the blocking parts into C<sync_job>. This will run 430If it must be done, put the blocking parts into C<sync_job>. This will run
328the given BLOCK in another coroutine while waiting for the result. The 431the given BLOCK in another coroutine while waiting for the result. The
329server will be frozen during this time, so the block should either finish 432server will be frozen during this time, so the block should either finish
330fast or be very important. 433fast or be very important.
333 436
334sub sync_job(&) { 437sub sync_job(&) {
335 my ($job) = @_; 438 my ($job) = @_;
336 439
337 if ($Coro::current == $Coro::main) { 440 if ($Coro::current == $Coro::main) {
338 my $time = Event::time; 441 my $time = EV::time;
339 442
340 # this is the main coro, too bad, we have to block 443 # this is the main coro, too bad, we have to block
341 # till the operation succeeds, freezing the server :/ 444 # till the operation succeeds, freezing the server :/
342 445
446 LOG llevError, Carp::longmess "sync job";#d#
447
343 # TODO: use suspend/resume instead 448 # TODO: use suspend/resume instead
344 # (but this is cancel-safe) 449 # (but this is cancel-safe)
345 my $freeze_guard = freeze_mainloop; 450 my $freeze_guard = freeze_mainloop;
346 451
347 my $busy = 1; 452 my $busy = 1;
348 my @res; 453 my @res;
349 454
350 (async { 455 (async {
456 $Coro::current->desc ("sync job coro");
351 @res = eval { $job->() }; 457 @res = eval { $job->() };
352 warn $@ if $@; 458 warn $@ if $@;
353 undef $busy; 459 undef $busy;
354 })->prio (Coro::PRIO_MAX); 460 })->prio (Coro::PRIO_MAX);
355 461
356 while ($busy) { 462 while ($busy) {
357 Coro::cede or Event::one_event; 463 if (Coro::nready) {
464 Coro::cede_notself;
465 } else {
466 EV::loop EV::LOOP_ONESHOT;
358 } 467 }
468 }
359 469
360 $time = Event::time - $time; 470 $time = EV::time - $time;
361 471
362 LOG llevError | logBacktrace, Carp::longmess "long sync job" 472 LOG llevError | logBacktrace, Carp::longmess "long sync job"
363 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 473 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
364 474
365 $tick_start += $time; # do not account sync jobs to server load 475 $tick_start += $time; # do not account sync jobs to server load
390 $EXT_CORO{$coro+0} = $coro; 500 $EXT_CORO{$coro+0} = $coro;
391 501
392 $coro 502 $coro
393} 503}
394 504
395sub write_runtime { 505=item fork_call { }, $args
396 my $runtime = "$LOCALDIR/runtime";
397 506
398 # first touch the runtime file to show we are still running: 507Executes the given code block with the given arguments in a seperate
399 # the fsync below can take a very very long time. 508process, returning the results. Everything must be serialisable with
509Coro::Storable. May, of course, block. Note that the executed sub may
510never block itself or use any form of event handling.
400 511
401 IO::AIO::aio_utime $runtime, undef, undef; 512=cut
402 513
403 my $guard = cf::lock_acquire "write_runtime"; 514sub fork_call(&@) {
515 my ($cb, @args) = @_;
404 516
405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 517 # we seemingly have to make a local copy of the whole thing,
406 or return; 518 # otherwise perl prematurely frees the stuff :/
519 # TODO: investigate and fix (likely this will be rather laborious)
407 520
408 my $value = $cf::RUNTIME + 90 + 10; 521 my @res = Coro::Util::fork_eval {
409 # 10 is the runtime save interval, for a monotonic clock 522 reset_signals;
410 # 60 allows for the watchdog to kill the server. 523 &$cb
524 }, @args;
411 525
412 (aio_write $fh, 0, (length $value), $value, 0) <= 0 526 wantarray ? @res : $res[-1]
413 and return; 527}
414 528
415 # always fsync - this file is important 529=item $value = cf::db_get $family => $key
416 aio_fsync $fh
417 and return;
418 530
419 # touch it again to show we are up-to-date 531Returns a single value from the environment database.
420 aio_utime $fh, undef, undef;
421 532
422 close $fh 533=item cf::db_put $family => $key => $value
423 or return;
424 534
425 aio_rename "$runtime~", $runtime 535Stores the given C<$value> in the family. It can currently store binary
426 and return; 536data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
427 537
428 warn "runtime file written.\n"; 538=item $db = cf::db_table "name"
429 539
540Create and/or open a new database table. The string must not be "db" and must be unique
541within each server.
542
543=cut
544
545sub db_table($) {
546 my ($name) = @_;
547 my $db = BDB::db_create $DB_ENV;
548
549 eval {
550 $db->set_flags (BDB::CHKSUM);
551
552 utf8::encode $name;
553 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
554 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
555 cf::cleanup "db_open(db): $!" if $!;
556 };
557 cf::cleanup "db_open(db): $@" if $@;
558
559 $db
560}
561
562our $DB;
563
564sub db_init {
565 cf::sync_job {
566 $DB ||= db_table "db";
567 };
568}
569
570sub db_get($$) {
571 my $key = "$_[0]/$_[1]";
572
573 cf::sync_job {
574 BDB::db_get $DB, undef, $key, my $data;
575
576 $! ? ()
577 : $data
430 1 578 }
579}
580
581sub db_put($$$) {
582 BDB::dbreq_pri 4;
583 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
584}
585
586=item cf::cache $id => [$paths...], $processversion => $process
587
588Generic caching function that returns the value of the resource $id,
589caching and regenerating as required.
590
591This function can block.
592
593=cut
594
595sub cache {
596 my ($id, $src, $processversion, $process) = @_;
597
598 my $meta =
599 join "\x00",
600 $processversion,
601 map {
602 aio_stat $_
603 and Carp::croak "$_: $!";
604
605 ($_, (stat _)[7,9])
606 } @$src;
607
608 my $dbmeta = db_get cache => "$id/meta";
609 if ($dbmeta ne $meta) {
610 # changed, we may need to process
611
612 my @data;
613 my $md5;
614
615 for (0 .. $#$src) {
616 0 <= aio_load $src->[$_], $data[$_]
617 or Carp::croak "$src->[$_]: $!";
618 }
619
620 # if processing is expensive, check
621 # checksum first
622 if (1) {
623 $md5 =
624 join "\x00",
625 $processversion,
626 map {
627 cf::cede_to_tick;
628 ($src->[$_], Digest::MD5::md5_hex $data[$_])
629 } 0.. $#$src;
630
631
632 my $dbmd5 = db_get cache => "$id/md5";
633 if ($dbmd5 eq $md5) {
634 db_put cache => "$id/meta", $meta;
635
636 return db_get cache => "$id/data";
637 }
638 }
639
640 my $t1 = Time::HiRes::time;
641 my $data = $process->(\@data);
642 my $t2 = Time::HiRes::time;
643
644 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
645
646 db_put cache => "$id/data", $data;
647 db_put cache => "$id/md5" , $md5;
648 db_put cache => "$id/meta", $meta;
649
650 return $data;
651 }
652
653 db_get cache => "$id/data"
431} 654}
432 655
433=item cf::datalog type => key => value, ... 656=item cf::datalog type => key => value, ...
434 657
435Log a datalog packet of the given type with the given key-value pairs. 658Log a datalog packet of the given type with the given key-value pairs.
453attach callbacks/event handlers (a collection of which is called an "attachment") 676attach callbacks/event handlers (a collection of which is called an "attachment")
454to it. All such attachable objects support the following methods. 677to it. All such attachable objects support the following methods.
455 678
456In the following description, CLASS can be any of C<global>, C<object> 679In the following description, CLASS can be any of C<global>, C<object>
457C<player>, C<client> or C<map> (i.e. the attachable objects in 680C<player>, C<client> or C<map> (i.e. the attachable objects in
458crossfire+). 681Deliantra).
459 682
460=over 4 683=over 4
461 684
462=item $attachable->attach ($attachment, key => $value...) 685=item $attachable->attach ($attachment, key => $value...)
463 686
715 "; 938 ";
716 die if $@; 939 die if $@;
717} 940}
718 941
719our $override; 942our $override;
720our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 943our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
721 944
722sub override { 945sub override {
723 $override = 1; 946 $override = 1;
724 @invoke_results = (); 947 @INVOKE_RESULTS = (@_);
725} 948}
726 949
727sub do_invoke { 950sub do_invoke {
728 my $event = shift; 951 my $event = shift;
729 my $callbacks = shift; 952 my $callbacks = shift;
730 953
731 @invoke_results = (); 954 @INVOKE_RESULTS = ();
732 955
733 local $override; 956 local $override;
734 957
735 for (@$callbacks) { 958 for (@$callbacks) {
736 eval { &{$_->[1]} }; 959 eval { &{$_->[1]} };
753 976
754Generate an object-specific event with the given arguments. 977Generate an object-specific event with the given arguments.
755 978
756This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 979This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
757removed in future versions), and there is no public API to access override 980removed in future versions), and there is no public API to access override
758results (if you must, access C<@cf::invoke_results> directly). 981results (if you must, access C<@cf::INVOKE_RESULTS> directly).
759 982
760=back 983=back
761 984
762=cut 985=cut
763 986
764############################################################################# 987#############################################################################
765# object support 988# object support
989
990sub _object_equal($$);
991sub _object_equal($$) {
992 my ($a, $b) = @_;
993
994 return 0 unless (ref $a) eq (ref $b);
995
996 if ("HASH" eq ref $a) {
997 my @ka = keys %$a;
998 my @kb = keys %$b;
999
1000 return 0 if @ka != @kb;
1001
1002 for (0 .. $#ka) {
1003 return 0 unless $ka[$_] eq $kb[$_];
1004 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1005 }
1006
1007 } elsif ("ARRAY" eq ref $a) {
1008
1009 return 0 if @$a != @$b;
1010
1011 for (0 .. $#$a) {
1012 return 0 unless _object_equal $a->[$_], $b->[$_];
1013 }
1014
1015 } elsif ($a ne $b) {
1016 return 0;
1017 }
1018
1019 1
1020}
1021
1022our $SLOW_MERGES;#d#
1023sub _can_merge {
1024 my ($ob1, $ob2) = @_;
1025
1026 ++$SLOW_MERGES;#d#
1027
1028 # we do the slow way here
1029 return _object_equal $ob1, $ob2
1030}
766 1031
767sub reattach { 1032sub reattach {
768 # basically do the same as instantiate, without calling instantiate 1033 # basically do the same as instantiate, without calling instantiate
769 my ($obj) = @_; 1034 my ($obj) = @_;
770 1035
791cf::attachable->attach ( 1056cf::attachable->attach (
792 prio => -1000000, 1057 prio => -1000000,
793 on_instantiate => sub { 1058 on_instantiate => sub {
794 my ($obj, $data) = @_; 1059 my ($obj, $data) = @_;
795 1060
796 $data = from_json $data; 1061 $data = decode_json $data;
797 1062
798 for (@$data) { 1063 for (@$data) {
799 my ($name, $args) = @$_; 1064 my ($name, $args) = @$_;
800 1065
801 $obj->attach ($name, %{$args || {} }); 1066 $obj->attach ($name, %{$args || {} });
817sub object_freezer_save { 1082sub object_freezer_save {
818 my ($filename, $rdata, $objs) = @_; 1083 my ($filename, $rdata, $objs) = @_;
819 1084
820 sync_job { 1085 sync_job {
821 if (length $$rdata) { 1086 if (length $$rdata) {
1087 utf8::decode (my $decname = $filename);
822 warn sprintf "saving %s (%d,%d)\n", 1088 warn sprintf "saving %s (%d,%d)\n",
823 $filename, length $$rdata, scalar @$objs; 1089 $decname, length $$rdata, scalar @$objs;
824 1090
825 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1091 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
826 chmod SAVE_MODE, $fh; 1092 chmod SAVE_MODE, $fh;
827 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1093 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
828 aio_fsync $fh if $cf::USE_FSYNC; 1094 aio_fsync $fh if $cf::USE_FSYNC;
829 close $fh; 1095 close $fh;
830 1096
831 if (@$objs) { 1097 if (@$objs) {
832 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1098 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
833 chmod SAVE_MODE, $fh; 1099 chmod SAVE_MODE, $fh;
834 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1100 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
835 aio_write $fh, 0, (length $data), $data, 0; 1101 aio_write $fh, 0, (length $data), $data, 0;
836 aio_fsync $fh if $cf::USE_FSYNC; 1102 aio_fsync $fh if $cf::USE_FSYNC;
837 close $fh; 1103 close $fh;
838 aio_rename "$filename.pst~", "$filename.pst"; 1104 aio_rename "$filename.pst~", "$filename.pst";
839 } 1105 }
847 } 1113 }
848 } else { 1114 } else {
849 aio_unlink $filename; 1115 aio_unlink $filename;
850 aio_unlink "$filename.pst"; 1116 aio_unlink "$filename.pst";
851 } 1117 }
852 } 1118 };
853} 1119}
854 1120
855sub object_freezer_as_string { 1121sub object_freezer_as_string {
856 my ($rdata, $objs) = @_; 1122 my ($rdata, $objs) = @_;
857 1123
869 or return; 1135 or return;
870 1136
871 unless (aio_stat "$filename.pst") { 1137 unless (aio_stat "$filename.pst") {
872 (aio_load "$filename.pst", $av) >= 0 1138 (aio_load "$filename.pst", $av) >= 0
873 or return; 1139 or return;
1140
874 $av = eval { (Storable::thaw $av)->{objs} }; 1141 my $st = eval { Coro::Storable::thaw $av };
1142 $av = $st->{objs};
875 } 1143 }
876 1144
1145 utf8::decode (my $decname = $filename);
877 warn sprintf "loading %s (%d)\n", 1146 warn sprintf "loading %s (%d,%d)\n",
878 $filename, length $data, scalar @{$av || []}; 1147 $decname, length $data, scalar @{$av || []};
1148
879 return ($data, $av); 1149 ($data, $av)
880} 1150}
1151
1152=head2 COMMAND CALLBACKS
1153
1154=over 4
1155
1156=cut
881 1157
882############################################################################# 1158#############################################################################
883# command handling &c 1159# command handling &c
884 1160
885=item cf::register_command $name => \&callback($ob,$args); 1161=item cf::register_command $name => \&callback($ob,$args);
898 push @{ $COMMAND{$name} }, [$caller, $cb]; 1174 push @{ $COMMAND{$name} }, [$caller, $cb];
899} 1175}
900 1176
901=item cf::register_extcmd $name => \&callback($pl,$packet); 1177=item cf::register_extcmd $name => \&callback($pl,$packet);
902 1178
903Register a callbackf ro execution when the client sends an extcmd packet. 1179Register a callback for execution when the client sends an (synchronous)
1180extcmd packet. Ext commands will be processed in the order they are
1181received by the server, like other user commands. The first argument is
1182the logged-in player. Ext commands can only be processed after a player
1183has logged in successfully.
904 1184
905If the callback returns something, it is sent back as if reply was being 1185If the callback returns something, it is sent back as if reply was being
906called. 1186called.
907 1187
1188=item cf::register_exticmd $name => \&callback($ns,$packet);
1189
1190Register a callback for execution when the client sends an (asynchronous)
1191exticmd packet. Exti commands are processed by the server as soon as they
1192are received, i.e. out of order w.r.t. other commands. The first argument
1193is a client socket. Exti commands can be received anytime, even before
1194log-in.
1195
1196If the callback returns something, it is sent back as if reply was being
1197called.
1198
908=cut 1199=cut
909 1200
910sub register_extcmd { 1201sub register_extcmd {
911 my ($name, $cb) = @_; 1202 my ($name, $cb) = @_;
912 1203
913 $EXTCMD{$name} = $cb; 1204 $EXTCMD{$name} = $cb;
1205}
1206
1207sub register_exticmd {
1208 my ($name, $cb) = @_;
1209
1210 $EXTICMD{$name} = $cb;
914} 1211}
915 1212
916cf::player->attach ( 1213cf::player->attach (
917 on_command => sub { 1214 on_command => sub {
918 my ($pl, $name, $params) = @_; 1215 my ($pl, $name, $params) = @_;
927 cf::override; 1224 cf::override;
928 }, 1225 },
929 on_extcmd => sub { 1226 on_extcmd => sub {
930 my ($pl, $buf) = @_; 1227 my ($pl, $buf) = @_;
931 1228
932 my $msg = eval { from_json $buf }; 1229 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
933 1230
934 if (ref $msg) { 1231 if (ref $msg) {
1232 my ($type, $reply, @payload) =
1233 "ARRAY" eq ref $msg
1234 ? @$msg
1235 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1236
1237 my @reply;
1238
935 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1239 if (my $cb = $EXTCMD{$type}) {
936 if (my %reply = $cb->($pl, $msg)) { 1240 @reply = $cb->($pl, @payload);
937 $pl->ext_reply ($msg->{msgid}, %reply);
938 }
939 } 1241 }
1242
1243 $pl->ext_reply ($reply, @reply)
1244 if $reply;
1245
940 } else { 1246 } else {
941 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1247 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
942 } 1248 }
943 1249
944 cf::override; 1250 cf::override;
1018 }; 1324 };
1019} 1325}
1020 1326
1021############################################################################# 1327#############################################################################
1022 1328
1329=back
1330
1023=head2 CORE EXTENSIONS 1331=head2 CORE EXTENSIONS
1024 1332
1025Functions and methods that extend core crossfire objects. 1333Functions and methods that extend core crossfire objects.
1026 1334
1027=cut 1335=cut
1031use Coro::AIO; 1339use Coro::AIO;
1032 1340
1033=head3 cf::player 1341=head3 cf::player
1034 1342
1035=over 4 1343=over 4
1344
1345=item cf::player::num_playing
1346
1347Returns the official number of playing players, as per the Crossfire metaserver rules.
1348
1349=cut
1350
1351sub num_playing {
1352 scalar grep
1353 $_->ob->map
1354 && !$_->hidden
1355 && !$_->ob->flag (cf::FLAG_WIZ),
1356 cf::player::list
1357}
1036 1358
1037=item cf::player::find $login 1359=item cf::player::find $login
1038 1360
1039Returns the given player object, loading it if necessary (might block). 1361Returns the given player object, loading it if necessary (might block).
1040 1362
1076 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1398 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1077 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1399 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1078 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1400 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1079 aio_unlink +(playerdir $login) . "/$login.pl"; 1401 aio_unlink +(playerdir $login) . "/$login.pl";
1080 1402
1081 my $pl = load_pl path $login 1403 my $f = new_from_file cf::object::thawer path $login
1082 or return; 1404 or return;
1405
1406 my $pl = cf::player::load_pl $f
1407 or return;
1408 local $cf::PLAYER_LOADING{$login} = $pl;
1409 $f->resolve_delayed_derefs;
1083 $cf::PLAYER{$login} = $pl 1410 $cf::PLAYER{$login} = $pl
1084 } 1411 }
1085 } 1412 }
1086} 1413}
1087 1414
1097 1424
1098 aio_mkdir playerdir $pl, 0770; 1425 aio_mkdir playerdir $pl, 0770;
1099 $pl->{last_save} = $cf::RUNTIME; 1426 $pl->{last_save} = $cf::RUNTIME;
1100 1427
1101 $pl->save_pl ($path); 1428 $pl->save_pl ($path);
1102 Coro::cede; 1429 cf::cede_to_tick;
1103} 1430}
1104 1431
1105sub new($) { 1432sub new($) {
1106 my ($login) = @_; 1433 my ($login) = @_;
1107 1434
1111 $self->{deny_save} = 1; 1438 $self->{deny_save} = 1;
1112 1439
1113 $cf::PLAYER{$login} = $self; 1440 $cf::PLAYER{$login} = $self;
1114 1441
1115 $self 1442 $self
1443}
1444
1445=item $player->send_msg ($channel, $msg, $color, [extra...])
1446
1447=cut
1448
1449sub send_msg {
1450 my $ns = shift->ns
1451 or return;
1452 $ns->send_msg (@_);
1116} 1453}
1117 1454
1118=item $pl->quit_character 1455=item $pl->quit_character
1119 1456
1120Nukes the player without looking back. If logged in, the connection will 1457Nukes the player without looking back. If logged in, the connection will
1175 or return []; 1512 or return [];
1176 1513
1177 my @logins; 1514 my @logins;
1178 1515
1179 for my $login (@$dirs) { 1516 for my $login (@$dirs) {
1517 my $path = path $login;
1518
1519 # a .pst is a dead give-away for a valid player
1520 unless (-e "$path.pst") {
1180 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1521 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1181 aio_read $fh, 0, 512, my $buf, 0 or next; 1522 aio_read $fh, 0, 512, my $buf, 0 or next;
1182 $buf !~ /^password -------------$/m or next; # official not-valid tag 1523 $buf !~ /^password -------------$/m or next; # official not-valid tag
1524 }
1183 1525
1184 utf8::decode $login; 1526 utf8::decode $login;
1185 push @logins, $login; 1527 push @logins, $login;
1186 } 1528 }
1187 1529
1214 } 1556 }
1215 1557
1216 \@paths 1558 \@paths
1217} 1559}
1218 1560
1561=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1562
1563Expand crossfire pod fragments into protocol xml.
1564
1565=cut
1566
1567use re 'eval';
1568
1569my $group;
1570my $interior; $interior = qr{
1571 # match a pod interior sequence sans C<< >>
1572 (?:
1573 \ (.*?)\ (?{ $group = $^N })
1574 | < (??{$interior}) >
1575 )
1576}x;
1577
1578sub expand_cfpod {
1579 my ($self, $pod) = @_;
1580
1581 my $xml;
1582
1583 while () {
1584 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1585 $group = $1;
1586
1587 $group =~ s/&/&amp;/g;
1588 $group =~ s/</&lt;/g;
1589
1590 $xml .= $group;
1591 } elsif ($pod =~ m%\G
1592 ([BCGHITU])
1593 <
1594 (?:
1595 ([^<>]*) (?{ $group = $^N })
1596 | < $interior >
1597 )
1598 >
1599 %gcsx
1600 ) {
1601 my ($code, $data) = ($1, $group);
1602
1603 if ($code eq "B") {
1604 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1605 } elsif ($code eq "I") {
1606 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1607 } elsif ($code eq "U") {
1608 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1609 } elsif ($code eq "C") {
1610 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1611 } elsif ($code eq "T") {
1612 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1613 } elsif ($code eq "G") {
1614 my ($male, $female) = split /\|/, $data;
1615 $data = $self->gender ? $female : $male;
1616 $xml .= expand_cfpod ($self, $data);
1617 } elsif ($code eq "H") {
1618 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1619 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1620 "")
1621 [$self->{hintmode}];
1622 } else {
1623 $xml .= "error processing '$code($data)' directive";
1624 }
1625 } else {
1626 if ($pod =~ /\G(.+)/) {
1627 warn "parse error while expanding $pod (at $1)";
1628 }
1629 last;
1630 }
1631 }
1632
1633 for ($xml) {
1634 # create single paragraphs (very hackish)
1635 s/(?<=\S)\n(?=\w)/ /g;
1636
1637 # compress some whitespace
1638 s/\s+\n/\n/g; # ws line-ends
1639 s/\n\n+/\n/g; # double lines
1640 s/^\n+//; # beginning lines
1641 s/\n+$//; # ending lines
1642 }
1643
1644 $xml
1645}
1646
1647no re 'eval';
1648
1649sub hintmode {
1650 $_[0]{hintmode} = $_[1] if @_ > 1;
1651 $_[0]{hintmode}
1652}
1653
1219=item $player->ext_reply ($msgid, %msg) 1654=item $player->ext_reply ($msgid, @msg)
1220 1655
1221Sends an ext reply to the player. 1656Sends an ext reply to the player.
1222 1657
1223=cut 1658=cut
1224 1659
1225sub ext_reply($$%) { 1660sub ext_reply($$@) {
1226 my ($self, $id, %msg) = @_; 1661 my ($self, $id, @msg) = @_;
1227 1662
1228 $msg{msgid} = $id; 1663 $self->ns->ext_reply ($id, @msg)
1229
1230 $self->send ("ext " . cf::to_json \%msg);
1231} 1664}
1232 1665
1233=item $player->ext_event ($type, %msg) 1666=item $player->ext_msg ($type, @msg)
1234 1667
1235Sends an ext event to the client. 1668Sends an ext event to the client.
1236 1669
1237=cut 1670=cut
1238 1671
1239sub ext_event($$%) { 1672sub ext_msg($$@) {
1240 my ($self, $type, %msg) = @_; 1673 my ($self, $type, @msg) = @_;
1241 1674
1242 $self->ns->ext_event ($type, %msg); 1675 $self->ns->ext_msg ($type, @msg);
1243} 1676}
1244 1677
1245=head3 cf::region 1678=head3 cf::region
1246 1679
1247=over 4 1680=over 4
1250 1683
1251package cf::region; 1684package cf::region;
1252 1685
1253=item cf::region::find_by_path $path 1686=item cf::region::find_by_path $path
1254 1687
1255Tries to decuce the probable region for a map knowing only its path. 1688Tries to decuce the likely region for a map knowing only its path.
1256 1689
1257=cut 1690=cut
1258 1691
1259sub find_by_path($) { 1692sub find_by_path($) {
1260 my ($path) = @_; 1693 my ($path) = @_;
1261 1694
1262 my ($match, $specificity); 1695 my ($match, $specificity);
1263 1696
1264 for my $region (list) { 1697 for my $region (list) {
1265 if ($region->match && $path =~ $region->match) { 1698 if ($region->{match} && $path =~ $region->{match}) {
1266 ($match, $specificity) = ($region, $region->specificity) 1699 ($match, $specificity) = ($region, $region->specificity)
1267 if $region->specificity > $specificity; 1700 if $region->specificity > $specificity;
1268 } 1701 }
1269 } 1702 }
1270 1703
1390 $self->init; # pass $1 etc. 1823 $self->init; # pass $1 etc.
1391 return $self; 1824 return $self;
1392 } 1825 }
1393 } 1826 }
1394 1827
1395 Carp::carp "unable to resolve path '$path' (base '$base')."; 1828 Carp::cluck "unable to resolve path '$path' (base '$base').";
1396 () 1829 ()
1397} 1830}
1398 1831
1399sub init { 1832sub init {
1400 my ($self) = @_; 1833 my ($self) = @_;
1463 1896
1464sub load_header_from($) { 1897sub load_header_from($) {
1465 my ($self, $path) = @_; 1898 my ($self, $path) = @_;
1466 1899
1467 utf8::encode $path; 1900 utf8::encode $path;
1468 #aio_open $path, O_RDONLY, 0 1901 my $f = new_from_file cf::object::thawer $path
1469 # or return;
1470
1471 $self->_load_header ($path)
1472 or return; 1902 or return;
1903
1904 $self->_load_header ($f)
1905 or return;
1906
1907 local $MAP_LOADING{$self->{path}} = $self;
1908 $f->resolve_delayed_derefs;
1473 1909
1474 $self->{load_path} = $path; 1910 $self->{load_path} = $path;
1475 1911
1476 1 1912 1
1477} 1913}
1531sub find { 1967sub find {
1532 my ($path, $origin) = @_; 1968 my ($path, $origin) = @_;
1533 1969
1534 $path = normalise $path, $origin && $origin->path; 1970 $path = normalise $path, $origin && $origin->path;
1535 1971
1972 cf::lock_wait "map_data:$path";#d#remove
1536 cf::lock_wait "map_find:$path"; 1973 cf::lock_wait "map_find:$path";
1537 1974
1538 $cf::MAP{$path} || do { 1975 $cf::MAP{$path} || do {
1539 my $guard = cf::lock_acquire "map_find:$path"; 1976 my $guard1 = cf::lock_acquire "map_find:$path";
1977 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1978
1540 my $map = new_from_path cf::map $path 1979 my $map = new_from_path cf::map $path
1541 or return; 1980 or return;
1542 1981
1543 $map->{last_save} = $cf::RUNTIME; 1982 $map->{last_save} = $cf::RUNTIME;
1544 1983
1546 or return; 1985 or return;
1547 1986
1548 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1987 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1549 # doing this can freeze the server in a sync job, obviously 1988 # doing this can freeze the server in a sync job, obviously
1550 #$cf::WAIT_FOR_TICK->wait; 1989 #$cf::WAIT_FOR_TICK->wait;
1990 undef $guard1;
1991 undef $guard2;
1551 $map->reset; 1992 $map->reset;
1552 undef $guard;
1553 return find $path; 1993 return find $path;
1554 } 1994 }
1555 1995
1556 $cf::MAP{$path} = $map 1996 $cf::MAP{$path} = $map
1557 } 1997 }
1566 local $self->{deny_reset} = 1; # loading can take a long time 2006 local $self->{deny_reset} = 1; # loading can take a long time
1567 2007
1568 my $path = $self->{path}; 2008 my $path = $self->{path};
1569 2009
1570 { 2010 {
1571 my $guard = cf::lock_acquire "map_load:$path"; 2011 my $guard = cf::lock_acquire "map_data:$path";
1572 2012
2013 return unless $self->valid;
1573 return if $self->in_memory != cf::MAP_SWAPPED; 2014 return unless $self->in_memory == cf::MAP_SWAPPED;
1574 2015
1575 $self->in_memory (cf::MAP_LOADING); 2016 $self->in_memory (cf::MAP_LOADING);
1576 2017
1577 $self->alloc; 2018 $self->alloc;
1578 2019
1579 $self->pre_load; 2020 $self->pre_load;
1580 Coro::cede; 2021 cf::cede_to_tick;
1581 2022
2023 my $f = new_from_file cf::object::thawer $self->{load_path};
2024 $f->skip_block;
1582 $self->_load_objects ($self->{load_path}, 1) 2025 $self->_load_objects ($f)
1583 or return; 2026 or return;
1584 2027
1585 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2028 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1586 if delete $self->{load_original}; 2029 if delete $self->{load_original};
1587 2030
1588 if (my $uniq = $self->uniq_path) { 2031 if (my $uniq = $self->uniq_path) {
1589 utf8::encode $uniq; 2032 utf8::encode $uniq;
1590 if (aio_open $uniq, O_RDONLY, 0) { 2033 unless (aio_stat $uniq) {
2034 if (my $f = new_from_file cf::object::thawer $uniq) {
1591 $self->clear_unique_items; 2035 $self->clear_unique_items;
1592 $self->_load_objects ($uniq, 0); 2036 $self->_load_objects ($f);
2037 $f->resolve_delayed_derefs;
2038 }
1593 } 2039 }
1594 } 2040 }
1595 2041
1596 Coro::cede; 2042 $f->resolve_delayed_derefs;
2043
2044 cf::cede_to_tick;
1597 # now do the right thing for maps 2045 # now do the right thing for maps
1598 $self->link_multipart_objects; 2046 $self->link_multipart_objects;
1599 $self->difficulty ($self->estimate_difficulty) 2047 $self->difficulty ($self->estimate_difficulty)
1600 unless $self->difficulty; 2048 unless $self->difficulty;
1601 Coro::cede; 2049 cf::cede_to_tick;
1602 2050
1603 unless ($self->{deny_activate}) { 2051 unless ($self->{deny_activate}) {
1604 $self->decay_objects; 2052 $self->decay_objects;
1605 $self->fix_auto_apply; 2053 $self->fix_auto_apply;
1606 $self->update_buttons; 2054 $self->update_buttons;
1607 Coro::cede; 2055 cf::cede_to_tick;
1608 $self->set_darkness_map; 2056 $self->set_darkness_map;
1609 Coro::cede; 2057 cf::cede_to_tick;
1610 $self->activate; 2058 $self->activate;
1611 } 2059 }
2060
2061 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME);
1612 2063
1613 $self->in_memory (cf::MAP_IN_MEMORY); 2064 $self->in_memory (cf::MAP_IN_MEMORY);
1614 } 2065 }
1615 2066
1616 $self->post_load; 2067 $self->post_load;
1627 2078
1628 $self 2079 $self
1629} 2080}
1630 2081
1631# find and load all maps in the 3x3 area around a map 2082# find and load all maps in the 3x3 area around a map
1632sub load_diag { 2083sub load_neighbours {
1633 my ($map) = @_; 2084 my ($map) = @_;
1634 2085
1635 my @diag; # diagonal neighbours 2086 my @neigh; # diagonal neighbours
1636 2087
1637 for (0 .. 3) { 2088 for (0 .. 3) {
1638 my $neigh = $map->tile_path ($_) 2089 my $neigh = $map->tile_path ($_)
1639 or next; 2090 or next;
1640 $neigh = find $neigh, $map 2091 $neigh = find $neigh, $map
1641 or next; 2092 or next;
1642 $neigh->load; 2093 $neigh->load;
1643 2094
2095 push @neigh,
1644 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2096 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1645 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2097 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1646 } 2098 }
1647 2099
1648 for (@diag) { 2100 for (grep defined $_->[0], @neigh) {
2101 my ($path, $origin) = @$_;
1649 my $neigh = find @$_ 2102 my $neigh = find $path, $origin
1650 or next; 2103 or next;
1651 $neigh->load; 2104 $neigh->load;
1652 } 2105 }
1653} 2106}
1654 2107
1659} 2112}
1660 2113
1661sub do_load_sync { 2114sub do_load_sync {
1662 my ($map) = @_; 2115 my ($map) = @_;
1663 2116
2117 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2118 if $Coro::current == $Coro::main;
2119
1664 cf::sync_job { $map->load }; 2120 cf::sync_job { $map->load };
1665} 2121}
1666 2122
1667our %MAP_PREFETCH; 2123our %MAP_PREFETCH;
1668our $MAP_PREFETCHER = undef; 2124our $MAP_PREFETCHER = undef;
1669 2125
1670sub find_async { 2126sub find_async {
1671 my ($path, $origin) = @_; 2127 my ($path, $origin, $load) = @_;
1672 2128
1673 $path = normalise $path, $origin && $origin->{path}; 2129 $path = normalise $path, $origin && $origin->{path};
1674 2130
1675 if (my $map = $cf::MAP{$path}) { 2131 if (my $map = $cf::MAP{$path}) {
1676 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2132 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1677 } 2133 }
1678 2134
1679 undef $MAP_PREFETCH{$path}; 2135 $MAP_PREFETCH{$path} |= $load;
2136
1680 $MAP_PREFETCHER ||= cf::async { 2137 $MAP_PREFETCHER ||= cf::async {
2138 $Coro::current->{desc} = "map prefetcher";
2139
1681 while (%MAP_PREFETCH) { 2140 while (%MAP_PREFETCH) {
1682 for my $path (keys %MAP_PREFETCH) { 2141 while (my ($k, $v) = each %MAP_PREFETCH) {
1683 my $map = find $path 2142 if (my $map = find $k) {
1684 or next;
1685 $map->load; 2143 $map->load if $v;
2144 }
1686 2145
1687 delete $MAP_PREFETCH{$path}; 2146 delete $MAP_PREFETCH{$k};
1688 } 2147 }
1689 } 2148 }
1690 undef $MAP_PREFETCHER; 2149 undef $MAP_PREFETCHER;
1691 }; 2150 };
1692 $MAP_PREFETCHER->prio (6); 2151 $MAP_PREFETCHER->prio (6);
1695} 2154}
1696 2155
1697sub save { 2156sub save {
1698 my ($self) = @_; 2157 my ($self) = @_;
1699 2158
1700 my $lock = cf::lock_acquire "map_data:" . $self->path; 2159 my $lock = cf::lock_acquire "map_data:$self->{path}";
1701 2160
1702 $self->{last_save} = $cf::RUNTIME; 2161 $self->{last_save} = $cf::RUNTIME;
1703 2162
1704 return unless $self->dirty; 2163 return unless $self->dirty;
1705 2164
1711 return if $self->{deny_save}; 2170 return if $self->{deny_save};
1712 2171
1713 local $self->{last_access} = $self->last_access;#d# 2172 local $self->{last_access} = $self->last_access;#d#
1714 2173
1715 cf::async { 2174 cf::async {
2175 $Coro::current->{desc} = "map player save";
1716 $_->contr->save for $self->players; 2176 $_->contr->save for $self->players;
1717 }; 2177 };
1718 2178
1719 if ($uniq) { 2179 if ($uniq) {
1720 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2180 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1728 my ($self) = @_; 2188 my ($self) = @_;
1729 2189
1730 # save first because save cedes 2190 # save first because save cedes
1731 $self->save; 2191 $self->save;
1732 2192
1733 my $lock = cf::lock_acquire "map_data:" . $self->path; 2193 my $lock = cf::lock_acquire "map_data:$self->{path}";
1734 2194
1735 return if $self->players; 2195 return if $self->players;
1736 return if $self->in_memory != cf::MAP_IN_MEMORY; 2196 return if $self->in_memory != cf::MAP_IN_MEMORY;
1737 return if $self->{deny_save}; 2197 return if $self->{deny_save};
1738 2198
2199 $self->in_memory (cf::MAP_SWAPPED);
2200
2201 $self->deactivate;
2202 $_->clear_links_to ($self) for values %cf::MAP;
1739 $self->clear; 2203 $self->clear;
1740 $self->in_memory (cf::MAP_SWAPPED);
1741} 2204}
1742 2205
1743sub reset_at { 2206sub reset_at {
1744 my ($self) = @_; 2207 my ($self) = @_;
1745 2208
1777 if $uniq; 2240 if $uniq;
1778 } 2241 }
1779 2242
1780 delete $cf::MAP{$self->path}; 2243 delete $cf::MAP{$self->path};
1781 2244
2245 $self->deactivate;
2246 $_->clear_links_to ($self) for values %cf::MAP;
1782 $self->clear; 2247 $self->clear;
1783
1784 $_->clear_links_to ($self) for values %cf::MAP;
1785 2248
1786 $self->unlink_save; 2249 $self->unlink_save;
1787 $self->destroy; 2250 $self->destroy;
1788} 2251}
1789 2252
1790my $nuke_counter = "aaaa"; 2253my $nuke_counter = "aaaa";
1791 2254
1792sub nuke { 2255sub nuke {
1793 my ($self) = @_; 2256 my ($self) = @_;
1794 2257
2258 {
2259 my $lock = cf::lock_acquire "map_data:$self->{path}";
2260
1795 delete $cf::MAP{$self->path}; 2261 delete $cf::MAP{$self->path};
1796 2262
1797 $self->unlink_save; 2263 $self->unlink_save;
1798 2264
1799 bless $self, "cf::map"; 2265 bless $self, "cf::map";
1800 delete $self->{deny_reset}; 2266 delete $self->{deny_reset};
1801 $self->{deny_save} = 1; 2267 $self->{deny_save} = 1;
1802 $self->reset_timeout (1); 2268 $self->reset_timeout (1);
1803 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2269 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1804 2270
1805 $cf::MAP{$self->path} = $self; 2271 $cf::MAP{$self->path} = $self;
2272 }
1806 2273
1807 $self->reset; # polite request, might not happen 2274 $self->reset; # polite request, might not happen
1808} 2275}
1809 2276
1810=item $maps = cf::map::tmp_maps 2277=item $maps = cf::map::tmp_maps
1886 2353
1887sub inv_recursive { 2354sub inv_recursive {
1888 inv_recursive_ inv $_[0] 2355 inv_recursive_ inv $_[0]
1889} 2356}
1890 2357
2358=item $ref = $ob->ref
2359
2360creates and returns a persistent reference to an objetc that can be stored as a string.
2361
2362=item $ob = cf::object::deref ($refstring)
2363
2364returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2365even if the object actually exists. May block.
2366
2367=cut
2368
2369sub deref {
2370 my ($ref) = @_;
2371
2372 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2373 my ($uuid, $name) = ($1, $2);
2374 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2375 or return;
2376 $pl->ob->uuid eq $uuid
2377 or return;
2378
2379 $pl->ob
2380 } else {
2381 warn "$ref: cannot resolve object reference\n";
2382 undef
2383 }
2384}
2385
1891package cf; 2386package cf;
1892 2387
1893=back 2388=back
1894 2389
1895=head3 cf::object::player 2390=head3 cf::object::player
1912 2407
1913 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2408 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1914 2409
1915 if ($self->{record_replies}) { 2410 if ($self->{record_replies}) {
1916 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2411 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2412
1917 } else { 2413 } else {
2414 my $pl = $self->contr;
2415
2416 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2417 my $dialog = $pl->{npc_dialog};
2418 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2419
2420 } else {
1918 $msg = $npc->name . " says: $msg" if $npc; 2421 $msg = $npc->name . " says: $msg" if $npc;
1919 $self->message ($msg, $flags); 2422 $self->message ($msg, $flags);
2423 }
1920 } 2424 }
2425}
2426
2427=item $object->send_msg ($channel, $msg, $color, [extra...])
2428
2429=cut
2430
2431sub cf::object::send_msg {
2432 my $pl = shift->contr
2433 or return;
2434 $pl->send_msg (@_);
1921} 2435}
1922 2436
1923=item $player_object->may ("access") 2437=item $player_object->may ("access")
1924 2438
1925Returns wether the given player is authorized to access resource "access" 2439Returns wether the given player is authorized to access resource "access"
2004 # use -1 or undef as default coordinates, not 0, 0 2518 # use -1 or undef as default coordinates, not 0, 0
2005 ($x, $y) = ($map->enter_x, $map->enter_y) 2519 ($x, $y) = ($map->enter_x, $map->enter_y)
2006 if $x <=0 && $y <= 0; 2520 if $x <=0 && $y <= 0;
2007 2521
2008 $map->load; 2522 $map->load;
2009 $map->load_diag; 2523 $map->load_neighbours;
2010 2524
2011 return unless $self->contr->active; 2525 return unless $self->contr->active;
2012 $self->activate_recursive; 2526 $self->activate_recursive;
2013 2527
2014 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2015 $self->enter_map ($map, $x, $y); 2529 $self->enter_map ($map, $x, $y);
2016} 2530}
2017 2531
2018=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2532=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2019 2533
2020Moves the player to the given map-path and coordinates by first freezing 2534Moves the player to the given map-path and coordinates by first freezing
2021her, loading and preparing them map, calling the provided $check callback 2535her, loading and preparing them map, calling the provided $check callback
2022that has to return the map if sucecssful, and then unfreezes the player on 2536that has to return the map if sucecssful, and then unfreezes the player on
2023the new (success) or old (failed) map position. 2537the new (success) or old (failed) map position. In either case, $done will
2538be called at the end of this process.
2024 2539
2025=cut 2540=cut
2026 2541
2027our $GOTOGEN; 2542our $GOTOGEN;
2028 2543
2029sub cf::object::player::goto { 2544sub cf::object::player::goto {
2030 my ($self, $path, $x, $y, $check) = @_; 2545 my ($self, $path, $x, $y, $check, $done) = @_;
2031 2546
2032 # do generation counting so two concurrent goto's will be executed in-order 2547 # do generation counting so two concurrent goto's will be executed in-order
2033 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2548 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2034 2549
2035 $self->enter_link; 2550 $self->enter_link;
2036 2551
2037 (async { 2552 (async {
2553 $Coro::current->{desc} = "player::goto $path $x $y";
2554
2555 # *tag paths override both path and x|y
2556 if ($path =~ /^\*(.*)$/) {
2557 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2558 my $ob = $obs[rand @obs];
2559
2560 # see if we actually can go there
2561 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2562 $ob = $obs[rand @obs];
2563 } else {
2564 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2565 }
2566 # else put us there anyways for now #d#
2567
2568 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2569 } else {
2570 ($path, $x, $y) = (undef, undef, undef);
2571 }
2572 }
2573
2038 my $map = eval { 2574 my $map = eval {
2039 my $map = cf::map::find $path; 2575 my $map = defined $path ? cf::map::find $path : undef;
2040 2576
2041 if ($map) { 2577 if ($map) {
2042 $map = $map->customise_for ($self); 2578 $map = $map->customise_for ($self);
2043 $map = $check->($map) if $check && $map; 2579 $map = $check->($map) if $check && $map;
2044 } else { 2580 } else {
2045 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2581 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2046 } 2582 }
2047 2583
2048 $map 2584 $map
2049 }; 2585 };
2050 2586
2055 2591
2056 if ($gen == $self->{_goto_generation}) { 2592 if ($gen == $self->{_goto_generation}) {
2057 delete $self->{_goto_generation}; 2593 delete $self->{_goto_generation};
2058 $self->leave_link ($map, $x, $y); 2594 $self->leave_link ($map, $x, $y);
2059 } 2595 }
2596
2597 $done->() if $done;
2060 })->prio (1); 2598 })->prio (1);
2061} 2599}
2062 2600
2063=item $player_object->enter_exit ($exit_object) 2601=item $player_object->enter_exit ($exit_object)
2064 2602
2101 $rmp->{origin_y} = $exit->y; 2639 $rmp->{origin_y} = $exit->y;
2102 } 2640 }
2103 2641
2104 $rmp->{random_seed} ||= $exit->random_seed; 2642 $rmp->{random_seed} ||= $exit->random_seed;
2105 2643
2106 my $data = cf::to_json $rmp; 2644 my $data = cf::encode_json $rmp;
2107 my $md5 = Digest::MD5::md5_hex $data; 2645 my $md5 = Digest::MD5::md5_hex $data;
2108 my $meta = "$RANDOMDIR/$md5.meta"; 2646 my $meta = "$RANDOMDIR/$md5.meta";
2109 2647
2110 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2648 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2111 aio_write $fh, 0, (length $data), $data, 0; 2649 aio_write $fh, 0, (length $data), $data, 0;
2133 my $hp = $exit->stats->hp; 2671 my $hp = $exit->stats->hp;
2134 my $sp = $exit->stats->sp; 2672 my $sp = $exit->stats->sp;
2135 2673
2136 $self->enter_link; 2674 $self->enter_link;
2137 2675
2676 # if exit is damned, update players death & WoR home-position
2677 $self->contr->savebed ($slaying, $hp, $sp)
2678 if $exit->flag (FLAG_DAMNED);
2679
2138 (async { 2680 (async {
2681 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2682
2139 $self->deactivate_recursive; # just to be sure 2683 $self->deactivate_recursive; # just to be sure
2140 unless (eval { 2684 unless (eval {
2141 $self->goto ($slaying, $hp, $sp); 2685 $self->goto ($slaying, $hp, $sp);
2142 2686
2143 1; 2687 1;
2169 2713
2170 utf8::encode $text; 2714 utf8::encode $text;
2171 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2715 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2172} 2716}
2173 2717
2718=item $client->send_msg ($channel, $msg, $color, [extra...])
2719
2720Send a drawinfo or msg packet to the client, formatting the msg for the
2721client if neccessary. C<$type> should be a string identifying the type of
2722the message, with C<log> being the default. If C<$color> is negative, suppress
2723the message unless the client supports the msg packet.
2724
2725=cut
2726
2727# non-persistent channels (usually the info channel)
2728our %CHANNEL = (
2729 "c/identify" => {
2730 id => "infobox",
2731 title => "Identify",
2732 reply => undef,
2733 tooltip => "Items recently identified",
2734 },
2735 "c/examine" => {
2736 id => "infobox",
2737 title => "Examine",
2738 reply => undef,
2739 tooltip => "Signs and other items you examined",
2740 },
2741 "c/book" => {
2742 id => "infobox",
2743 title => "Book",
2744 reply => undef,
2745 tooltip => "The contents of a note or book",
2746 },
2747 "c/lookat" => {
2748 id => "infobox",
2749 title => "Look",
2750 reply => undef,
2751 tooltip => "What you saw there",
2752 },
2753 "c/who" => {
2754 id => "infobox",
2755 title => "Players",
2756 reply => undef,
2757 tooltip => "Shows players who are currently online",
2758 },
2759 "c/body" => {
2760 id => "infobox",
2761 title => "Body Parts",
2762 reply => undef,
2763 tooltip => "Shows which body parts you posess and are available",
2764 },
2765 "c/uptime" => {
2766 id => "infobox",
2767 title => "Uptime",
2768 reply => undef,
2769 tooltip => "How long the server has been running since last restart",
2770 },
2771 "c/mapinfo" => {
2772 id => "infobox",
2773 title => "Map Info",
2774 reply => undef,
2775 tooltip => "Information related to the maps",
2776 },
2777);
2778
2779sub cf::client::send_msg {
2780 my ($self, $channel, $msg, $color, @extra) = @_;
2781
2782 $msg = $self->pl->expand_cfpod ($msg);
2783
2784 $color &= cf::NDI_CLIENT_MASK; # just in case...
2785
2786 # check predefined channels, for the benefit of C
2787 if ($CHANNEL{$channel}) {
2788 $channel = $CHANNEL{$channel};
2789
2790 $self->ext_msg (channel_info => $channel)
2791 if $self->can_msg;
2792
2793 $channel = $channel->{id};
2794
2795 } elsif (ref $channel) {
2796 # send meta info to client, if not yet sent
2797 unless (exists $self->{channel}{$channel->{id}}) {
2798 $self->{channel}{$channel->{id}} = $channel;
2799 $self->ext_msg (channel_info => $channel)
2800 if $self->can_msg;
2801 }
2802
2803 $channel = $channel->{id};
2804 }
2805
2806 return unless @extra || length $msg;
2807
2808 if ($self->can_msg) {
2809 # default colour, mask it out
2810 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2811 if $color & cf::NDI_DEF;
2812
2813 $self->send_packet ("msg " . $self->{json_coder}->encode (
2814 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2815 } else {
2816 if ($color >= 0) {
2817 # replace some tags by gcfclient-compatible ones
2818 for ($msg) {
2819 1 while
2820 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2821 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2822 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2823 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2824 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2825 }
2826
2827 $color &= cf::NDI_COLOR_MASK;
2828
2829 utf8::encode $msg;
2830
2831 if (0 && $msg =~ /\[/) {
2832 # COMMAND/INFO
2833 $self->send_packet ("drawextinfo $color 10 8 $msg")
2834 } else {
2835 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2836 $self->send_packet ("drawinfo $color $msg")
2837 }
2838 }
2839 }
2840}
2841
2174=item $client->ext_event ($type, %msg) 2842=item $client->ext_msg ($type, @msg)
2175 2843
2176Sends an exti event to the client. 2844Sends an ext event to the client.
2177 2845
2178=cut 2846=cut
2179 2847
2180sub cf::client::ext_event($$%) { 2848sub cf::client::ext_msg($$@) {
2181 my ($self, $type, %msg) = @_; 2849 my ($self, $type, @msg) = @_;
2182 2850
2851 if ($self->extcmd == 2) {
2852 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2853 } elsif ($self->extcmd == 1) { # TODO: remove
2183 $msg{msgtype} = "event_$type"; 2854 push @msg, msgtype => "event_$type";
2184 $self->send_packet ("ext " . cf::to_json \%msg); 2855 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2856 }
2857}
2858
2859=item $client->ext_reply ($msgid, @msg)
2860
2861Sends an ext reply to the client.
2862
2863=cut
2864
2865sub cf::client::ext_reply($$@) {
2866 my ($self, $id, @msg) = @_;
2867
2868 if ($self->extcmd == 2) {
2869 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2870 } elsif ($self->extcmd == 1) {
2871 #TODO: version 1, remove
2872 unshift @msg, msgtype => "reply", msgid => $id;
2873 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2874 }
2185} 2875}
2186 2876
2187=item $success = $client->query ($flags, "text", \&cb) 2877=item $success = $client->query ($flags, "text", \&cb)
2188 2878
2189Queues a query to the client, calling the given callback with 2879Queues a query to the client, calling the given callback with
2190the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2880the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2191C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2881C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2192 2882
2193Queries can fail, so check the return code. Or don't, as queries will become 2883Queries can fail, so check the return code. Or don't, as queries will
2194reliable at some point in the future. 2884become reliable at some point in the future.
2195 2885
2196=cut 2886=cut
2197 2887
2198sub cf::client::query { 2888sub cf::client::query {
2199 my ($self, $flags, $text, $cb) = @_; 2889 my ($self, $flags, $text, $cb) = @_;
2207 utf8::encode $text; 2897 utf8::encode $text;
2208 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2898 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2209 2899
2210 $self->send_packet ($self->{query_queue}[0][0]) 2900 $self->send_packet ($self->{query_queue}[0][0])
2211 if @{ $self->{query_queue} } == 1; 2901 if @{ $self->{query_queue} } == 1;
2902
2903 1
2212} 2904}
2213 2905
2214cf::client->attach ( 2906cf::client->attach (
2907 on_connect => sub {
2908 my ($ns) = @_;
2909
2910 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2911 },
2215 on_reply => sub { 2912 on_reply => sub {
2216 my ($ns, $msg) = @_; 2913 my ($ns, $msg) = @_;
2217 2914
2218 # this weird shuffling is so that direct followup queries 2915 # this weird shuffling is so that direct followup queries
2219 # get handled first 2916 # get handled first
2231 } else { 2928 } else {
2232 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2929 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2233 } 2930 }
2234 } 2931 }
2235 }, 2932 },
2933 on_exticmd => sub {
2934 my ($ns, $buf) = @_;
2935
2936 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2937
2938 if (ref $msg) {
2939 my ($type, $reply, @payload) =
2940 "ARRAY" eq ref $msg
2941 ? @$msg
2942 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2943
2944 my @reply;
2945
2946 if (my $cb = $EXTICMD{$type}) {
2947 @reply = $cb->($ns, @payload);
2948 }
2949
2950 $ns->ext_reply ($reply, @reply)
2951 if $reply;
2952
2953 } else {
2954 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2955 }
2956
2957 cf::override;
2958 },
2236); 2959);
2237 2960
2238=item $client->async (\&cb) 2961=item $client->async (\&cb)
2239 2962
2240Create a new coroutine, running the specified callback. The coroutine will 2963Create a new coroutine, running the specified callback. The coroutine will
2281our $safe = new Safe "safe"; 3004our $safe = new Safe "safe";
2282our $safe_hole = new Safe::Hole; 3005our $safe_hole = new Safe::Hole;
2283 3006
2284$SIG{FPE} = 'IGNORE'; 3007$SIG{FPE} = 'IGNORE';
2285 3008
2286$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3009$safe->permit_only (Opcode::opset qw(
3010 :base_core :base_mem :base_orig :base_math
3011 grepstart grepwhile mapstart mapwhile
3012 sort time
3013));
2287 3014
2288# here we export the classes and methods available to script code 3015# here we export the classes and methods available to script code
2289 3016
2290=pod 3017=pod
2291 3018
2292The following functions and methods are available within a safe environment: 3019The following functions and methods are available within a safe environment:
2293 3020
2294 cf::object contr pay_amount pay_player map 3021 cf::object
3022 contr pay_amount pay_player map x y force_find force_add destroy
3023 insert remove name archname title slaying race decrease_ob_nr
3024
2295 cf::object::player player 3025 cf::object::player
2296 cf::player peaceful 3026 player
2297 cf::map trigger 3027
3028 cf::player
3029 peaceful
3030
3031 cf::map
3032 trigger
2298 3033
2299=cut 3034=cut
2300 3035
2301for ( 3036for (
2302 ["cf::object" => qw(contr pay_amount pay_player map)], 3037 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3038 insert remove inv name archname title slaying race
3039 decrease_ob_nr destroy)],
2303 ["cf::object::player" => qw(player)], 3040 ["cf::object::player" => qw(player)],
2304 ["cf::player" => qw(peaceful)], 3041 ["cf::player" => qw(peaceful)],
2305 ["cf::map" => qw(trigger)], 3042 ["cf::map" => qw(trigger)],
2306) { 3043) {
2307 no strict 'refs'; 3044 no strict 'refs';
2378=back 3115=back
2379 3116
2380=cut 3117=cut
2381 3118
2382############################################################################# 3119#############################################################################
2383
2384=head2 EXTENSION DATABASE SUPPORT
2385
2386Crossfire maintains a very simple database for extension use. It can
2387currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2388convert to/from binary).
2389
2390The parameter C<$family> should best start with the name of the extension
2391using it, it should be unique.
2392
2393=over 4
2394
2395=item $value = cf::db_get $family => $key
2396
2397Returns a single value from the database.
2398
2399=item cf::db_put $family => $key => $value
2400
2401Stores the given C<$value> in the family.
2402
2403=cut
2404
2405our $DB;
2406
2407sub db_init {
2408 unless ($DB) {
2409 $DB = BDB::db_create $DB_ENV;
2410
2411 cf::sync_job {
2412 eval {
2413 $DB->set_flags (BDB::CHKSUM);
2414
2415 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2416 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2417 cf::cleanup "db_open(db): $!" if $!;
2418 };
2419 cf::cleanup "db_open(db): $@" if $@;
2420 };
2421 }
2422}
2423
2424sub db_get($$) {
2425 my $key = "$_[0]/$_[1]";
2426
2427 cf::sync_job {
2428 BDB::db_get $DB, undef, $key, my $data;
2429
2430 $! ? ()
2431 : $data
2432 }
2433}
2434
2435sub db_put($$$) {
2436 BDB::dbreq_pri 4;
2437 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2438}
2439
2440=item cf::cache $id => [$paths...], $processversion => $process
2441
2442Generic caching function that returns the value of the resource $id,
2443caching and regenerating as required.
2444
2445This function can block.
2446
2447=cut
2448
2449sub cache {
2450 my ($id, $src, $processversion, $process) = @_;
2451
2452 my $meta =
2453 join "\x00",
2454 $processversion,
2455 map {
2456 aio_stat $_
2457 and Carp::croak "$_: $!";
2458
2459 ($_, (stat _)[7,9])
2460 } @$src;
2461
2462 my $dbmeta = db_get cache => "$id/meta";
2463 if ($dbmeta ne $meta) {
2464 # changed, we may need to process
2465
2466 my @data;
2467 my $md5;
2468
2469 for (0 .. $#$src) {
2470 0 <= aio_load $src->[$_], $data[$_]
2471 or Carp::croak "$src->[$_]: $!";
2472 }
2473
2474 # if processing is expensive, check
2475 # checksum first
2476 if (1) {
2477 $md5 =
2478 join "\x00",
2479 $processversion,
2480 map {
2481 Coro::cede;
2482 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2483 } 0.. $#$src;
2484
2485
2486 my $dbmd5 = db_get cache => "$id/md5";
2487 if ($dbmd5 eq $md5) {
2488 db_put cache => "$id/meta", $meta;
2489
2490 return db_get cache => "$id/data";
2491 }
2492 }
2493
2494 my $t1 = Time::HiRes::time;
2495 my $data = $process->(\@data);
2496 my $t2 = Time::HiRes::time;
2497
2498 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2499
2500 db_put cache => "$id/data", $data;
2501 db_put cache => "$id/md5" , $md5;
2502 db_put cache => "$id/meta", $meta;
2503
2504 return $data;
2505 }
2506
2507 db_get cache => "$id/data"
2508}
2509
2510=item fork_call { }, $args
2511
2512Executes the given code block with the given arguments in a seperate
2513process, returning the results. Everything must be serialisable with
2514Coro::Storable. May, of course, block. Note that the executed sub may
2515never block itself or use any form of Event handling.
2516
2517=cut
2518
2519sub fork_call(&@) {
2520 my ($cb, @args) = @_;
2521
2522# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2523# or die "socketpair: $!";
2524 pipe my $fh1, my $fh2
2525 or die "pipe: $!";
2526
2527 if (my $pid = fork) {
2528 close $fh2;
2529
2530 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2531 $res = Coro::Storable::thaw $res;
2532
2533 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2534
2535 die $$res unless "ARRAY" eq ref $res;
2536
2537 return wantarray ? @$res : $res->[-1];
2538 } else {
2539 reset_signals;
2540 local $SIG{__WARN__};
2541 local $SIG{__DIE__};
2542 eval {
2543 close $fh1;
2544
2545 my @res = eval { $cb->(@args) };
2546 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2547 };
2548
2549 warn $@ if $@;
2550 _exit 0;
2551 }
2552}
2553
2554#############################################################################
2555# the server's init and main functions 3120# the server's init and main functions
2556 3121
2557sub load_facedata($) { 3122sub load_facedata($) {
2558 my ($path) = @_; 3123 my ($path) = @_;
3124
3125 # HACK to clear player env face cache, we need some signal framework
3126 # for this (global event?)
3127 %ext::player_env::MUSIC_FACE_CACHE = ();
3128
3129 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2559 3130
2560 warn "loading facedata from $path\n"; 3131 warn "loading facedata from $path\n";
2561 3132
2562 my $facedata; 3133 my $facedata;
2563 0 < aio_load $path, $facedata 3134 0 < aio_load $path, $facedata
2566 $facedata = Coro::Storable::thaw $facedata; 3137 $facedata = Coro::Storable::thaw $facedata;
2567 3138
2568 $facedata->{version} == 2 3139 $facedata->{version} == 2
2569 or cf::cleanup "$path: version mismatch, cannot proceed."; 3140 or cf::cleanup "$path: version mismatch, cannot proceed.";
2570 3141
3142 # patch in the exptable
3143 $facedata->{resource}{"res/exp_table"} = {
3144 type => FT_RSRC,
3145 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3146 };
3147 cf::cede_to_tick;
3148
2571 { 3149 {
2572 my $faces = $facedata->{faceinfo}; 3150 my $faces = $facedata->{faceinfo};
2573 3151
2574 while (my ($face, $info) = each %$faces) { 3152 while (my ($face, $info) = each %$faces) {
2575 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3153 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2576 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3154 cf::face::set_visibility $idx, $info->{visibility};
3155 cf::face::set_magicmap $idx, $info->{magicmap};
2577 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3156 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2578 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3157 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2579 Coro::cede; 3158
3159 cf::cede_to_tick;
2580 } 3160 }
2581 3161
2582 while (my ($face, $info) = each %$faces) { 3162 while (my ($face, $info) = each %$faces) {
2583 next unless $info->{smooth}; 3163 next unless $info->{smooth};
2584 my $idx = cf::face::find $face 3164 my $idx = cf::face::find $face
2585 or next; 3165 or next;
2586 if (my $smooth = cf::face::find $info->{smooth}) { 3166 if (my $smooth = cf::face::find $info->{smooth}) {
3167 cf::face::set_smooth $idx, $smooth;
2587 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3168 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2588 } else { 3169 } else {
2589 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3170 warn "smooth face '$info->{smooth}' not found for face '$face'";
2590 } 3171 }
2591 Coro::cede; 3172
3173 cf::cede_to_tick;
2592 } 3174 }
2593 } 3175 }
2594 3176
2595 { 3177 {
2596 my $anims = $facedata->{animinfo}; 3178 my $anims = $facedata->{animinfo};
2597 3179
2598 while (my ($anim, $info) = each %$anims) { 3180 while (my ($anim, $info) = each %$anims) {
2599 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3181 cf::anim::set $anim, $info->{frames}, $info->{facings};
2600 Coro::cede; 3182 cf::cede_to_tick;
2601 } 3183 }
2602 3184
2603 cf::anim::invalidate_all; # d'oh 3185 cf::anim::invalidate_all; # d'oh
2604 } 3186 }
2605 3187
3188 {
3189 # TODO: for gcfclient pleasure, we should give resources
3190 # that gcfclient doesn't grok a >10000 face index.
3191 my $res = $facedata->{resource};
3192
3193 my $soundconf = delete $res->{"res/sound.conf"};
3194
3195 while (my ($name, $info) = each %$res) {
3196 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3197 my $data;
3198
3199 if ($info->{type} & 1) {
3200 # prepend meta info
3201
3202 my $meta = $enc->encode ({
3203 name => $name,
3204 %{ $info->{meta} || {} },
3205 });
3206
3207 $data = pack "(w/a*)*", $meta, $info->{data};
3208 } else {
3209 $data = $info->{data};
3210 }
3211
3212 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3213 cf::face::set_type $idx, $info->{type};
3214
3215 cf::cede_to_tick;
3216 }
3217
3218 if ($soundconf) {
3219 $soundconf = $enc->decode (delete $soundconf->{data});
3220
3221 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3222 my $sound = $soundconf->{compat}[$_]
3223 or next;
3224
3225 my $face = cf::face::find "sound/$sound->[1]";
3226 cf::sound::set $sound->[0] => $face;
3227 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3228 }
3229
3230 while (my ($k, $v) = each %{$soundconf->{event}}) {
3231 my $face = cf::face::find "sound/$v";
3232 cf::sound::set $k => $face;
3233 }
3234 }
3235 }
3236
2606 1 3237 1
2607} 3238}
2608 3239
3240register_exticmd fx_want => sub {
3241 my ($ns, $want) = @_;
3242
3243 while (my ($k, $v) = each %$want) {
3244 $ns->fx_want ($k, $v);
3245 }
3246};
3247
2609sub reload_regions { 3248sub reload_regions {
3249 # HACK to clear player env face cache, we need some signal framework
3250 # for this (global event?)
3251 %ext::player_env::MUSIC_FACE_CACHE = ();
3252
2610 load_resource_file "$MAPDIR/regions" 3253 load_resource_file "$MAPDIR/regions"
2611 or die "unable to load regions file\n"; 3254 or die "unable to load regions file\n";
3255
3256 for (cf::region::list) {
3257 $_->{match} = qr/$_->{match}/
3258 if exists $_->{match};
3259 }
2612} 3260}
2613 3261
2614sub reload_facedata { 3262sub reload_facedata {
2615 load_facedata "$DATADIR/facedata" 3263 load_facedata "$DATADIR/facedata"
2616 or die "unable to load facedata\n"; 3264 or die "unable to load facedata\n";
2617} 3265}
2618 3266
2619sub reload_archetypes { 3267sub reload_archetypes {
3268 load_resource_file "$DATADIR/archetypes"
3269 or die "unable to load archetypes\n";
3270 #d# NEED to laod twice to resolve forward references
3271 # this really needs to be done in an extra post-pass
3272 # (which needs to be synchronous, so solve it differently)
2620 load_resource_file "$DATADIR/archetypes" 3273 load_resource_file "$DATADIR/archetypes"
2621 or die "unable to load archetypes\n"; 3274 or die "unable to load archetypes\n";
2622} 3275}
2623 3276
2624sub reload_treasures { 3277sub reload_treasures {
2640 3293
2641sub init { 3294sub init {
2642 reload_resources; 3295 reload_resources;
2643} 3296}
2644 3297
2645sub cfg_load { 3298sub reload_config {
2646 open my $fh, "<:utf8", "$CONFDIR/config" 3299 open my $fh, "<:utf8", "$CONFDIR/config"
2647 or return; 3300 or return;
2648 3301
2649 local $/; 3302 local $/;
2650 *CFG = YAML::Syck::Load <$fh>; 3303 *CFG = YAML::Syck::Load <$fh>;
2666sub main { 3319sub main {
2667 # we must not ever block the main coroutine 3320 # we must not ever block the main coroutine
2668 local $Coro::idle = sub { 3321 local $Coro::idle = sub {
2669 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3322 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2670 (async { 3323 (async {
2671 Event::one_event; 3324 $Coro::current->{desc} = "IDLE BUG HANDLER";
3325 EV::loop EV::LOOP_ONESHOT;
2672 })->prio (Coro::PRIO_MAX); 3326 })->prio (Coro::PRIO_MAX);
2673 }; 3327 };
2674 3328
2675 cfg_load; 3329 reload_config;
2676 db_init; 3330 db_init;
2677 load_extensions; 3331 load_extensions;
2678 3332
2679 $TICK_WATCHER->start; 3333 $TICK_WATCHER->start;
3334 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
2680 Event::loop; 3335 EV::loop;
2681} 3336}
2682 3337
2683############################################################################# 3338#############################################################################
2684# initialisation and cleanup 3339# initialisation and cleanup
2685 3340
2686# install some emergency cleanup handlers 3341# install some emergency cleanup handlers
2687BEGIN { 3342BEGIN {
3343 our %SIGWATCHER = ();
2688 for my $signal (qw(INT HUP TERM)) { 3344 for my $signal (qw(INT HUP TERM)) {
2689 Event->signal ( 3345 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2690 reentrant => 0,
2691 data => WF_AUTOCANCEL,
2692 signal => $signal,
2693 prio => 0,
2694 cb => sub {
2695 cf::cleanup "SIG$signal"; 3346 cf::cleanup "SIG$signal";
2696 },
2697 ); 3347 };
3348 }
3349}
3350
3351sub write_runtime {
3352 my $runtime = "$LOCALDIR/runtime";
3353
3354 # first touch the runtime file to show we are still running:
3355 # the fsync below can take a very very long time.
3356
3357 IO::AIO::aio_utime $runtime, undef, undef;
3358
3359 my $guard = cf::lock_acquire "write_runtime";
3360
3361 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3362 or return;
3363
3364 my $value = $cf::RUNTIME + 90 + 10;
3365 # 10 is the runtime save interval, for a monotonic clock
3366 # 60 allows for the watchdog to kill the server.
3367
3368 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3369 and return;
3370
3371 # always fsync - this file is important
3372 aio_fsync $fh
3373 and return;
3374
3375 # touch it again to show we are up-to-date
3376 aio_utime $fh, undef, undef;
3377
3378 close $fh
3379 or return;
3380
3381 aio_rename "$runtime~", $runtime
3382 and return;
3383
3384 warn "runtime file written.\n";
3385
2698 } 3386 1
2699} 3387}
2700 3388
2701sub emergency_save() { 3389sub emergency_save() {
2702 my $freeze_guard = cf::freeze_mainloop; 3390 my $freeze_guard = cf::freeze_mainloop;
2703 3391
2709 # and maps saved/destroyed asynchronously. 3397 # and maps saved/destroyed asynchronously.
2710 warn "begin emergency player save\n"; 3398 warn "begin emergency player save\n";
2711 for my $login (keys %cf::PLAYER) { 3399 for my $login (keys %cf::PLAYER) {
2712 my $pl = $cf::PLAYER{$login} or next; 3400 my $pl = $cf::PLAYER{$login} or next;
2713 $pl->valid or next; 3401 $pl->valid or next;
3402 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2714 $pl->save; 3403 $pl->save;
2715 } 3404 }
2716 warn "end emergency player save\n"; 3405 warn "end emergency player save\n";
2717 3406
2718 warn "begin emergency map save\n"; 3407 warn "begin emergency map save\n";
2757 warn "syncing database to disk"; 3446 warn "syncing database to disk";
2758 BDB::db_env_txn_checkpoint $DB_ENV; 3447 BDB::db_env_txn_checkpoint $DB_ENV;
2759 3448
2760 # if anything goes wrong in here, we should simply crash as we already saved 3449 # if anything goes wrong in here, we should simply crash as we already saved
2761 3450
2762 warn "cancelling all WF_AUTOCANCEL watchers";
2763 for (Event::all_watchers) {
2764 $_->cancel if $_->data & WF_AUTOCANCEL;
2765 }
2766
2767 warn "flushing outstanding aio requests"; 3451 warn "flushing outstanding aio requests";
2768 for (;;) { 3452 for (;;) {
2769 BDB::flush; 3453 BDB::flush;
2770 IO::AIO::flush; 3454 IO::AIO::flush;
2771 Coro::cede; 3455 Coro::cede_notself;
2772 last unless IO::AIO::nreqs || BDB::nreqs; 3456 last unless IO::AIO::nreqs || BDB::nreqs;
2773 warn "iterate..."; 3457 warn "iterate...";
2774 } 3458 }
2775 3459
2776 ++$RELOAD; 3460 ++$RELOAD;
2780 %EXT_CORO = (); 3464 %EXT_CORO = ();
2781 3465
2782 warn "removing commands"; 3466 warn "removing commands";
2783 %COMMAND = (); 3467 %COMMAND = ();
2784 3468
2785 warn "removing ext commands"; 3469 warn "removing ext/exti commands";
2786 %EXTCMD = (); 3470 %EXTCMD = ();
3471 %EXTICMD = ();
2787 3472
2788 warn "unloading/nuking all extensions"; 3473 warn "unloading/nuking all extensions";
2789 for my $pkg (@EXTS) { 3474 for my $pkg (@EXTS) {
2790 warn "... unloading $pkg"; 3475 warn "... unloading $pkg";
2791 3476
2834 warn "reloading cf.pm"; 3519 warn "reloading cf.pm";
2835 require cf; 3520 require cf;
2836 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3521 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2837 3522
2838 warn "loading config and database again"; 3523 warn "loading config and database again";
2839 cf::cfg_load; 3524 cf::reload_config;
2840 3525
2841 warn "loading extensions"; 3526 warn "loading extensions";
2842 cf::load_extensions; 3527 cf::load_extensions;
2843 3528
2844 warn "reattaching attachments to objects/players"; 3529 warn "reattaching attachments to objects/players";
2864 3549
2865sub reload_perl() { 3550sub reload_perl() {
2866 # doing reload synchronously and two reloads happen back-to-back, 3551 # doing reload synchronously and two reloads happen back-to-back,
2867 # coro crashes during coro_state_free->destroy here. 3552 # coro crashes during coro_state_free->destroy here.
2868 3553
2869 $RELOAD_WATCHER ||= Event->timer ( 3554 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
2870 reentrant => 0,
2871 after => 0,
2872 data => WF_AUTOCANCEL,
2873 cb => sub {
2874 do_reload_perl;
2875 undef $RELOAD_WATCHER; 3555 undef $RELOAD_WATCHER;
2876 }, 3556 do_reload_perl;
2877 ); 3557 };
2878} 3558}
2879 3559
2880register_command "reload" => sub { 3560register_command "reload" => sub {
2881 my ($who, $arg) = @_; 3561 my ($who, $arg) = @_;
2882 3562
2883 if ($who->flag (FLAG_WIZ)) { 3563 if ($who->flag (FLAG_WIZ)) {
2884 $who->message ("reloading server."); 3564 $who->message ("reloading server.");
3565 async {
3566 $Coro::current->{desc} = "perl_reload";
2885 async { reload_perl }; 3567 reload_perl;
3568 };
2886 } 3569 }
2887}; 3570};
2888 3571
2889unshift @INC, $LIBDIR; 3572unshift @INC, $LIBDIR;
2890 3573
2909 my $signal = new Coro::Signal; 3592 my $signal = new Coro::Signal;
2910 push @WAIT_FOR_TICK_BEGIN, $signal; 3593 push @WAIT_FOR_TICK_BEGIN, $signal;
2911 $signal->wait; 3594 $signal->wait;
2912} 3595}
2913 3596
2914 my $min = 1e6;#d# 3597$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
2915 my $avg = 10;
2916$TICK_WATCHER = Event->timer (
2917 reentrant => 0,
2918 parked => 1,
2919 prio => 0,
2920 at => $NEXT_TICK || $TICK,
2921 data => WF_AUTOCANCEL,
2922 cb => sub {
2923 if ($Coro::current != $Coro::main) { 3598 if ($Coro::current != $Coro::main) {
2924 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3599 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2925 unless ++$bug_warning > 10; 3600 unless ++$bug_warning > 10;
2926 return; 3601 return;
2927 } 3602 }
2928 3603
2929 $NOW = $tick_start = Event::time; 3604 $NOW = $tick_start = EV::now;
2930 3605
2931 cf::server_tick; # one server iteration 3606 cf::server_tick; # one server iteration
2932 3607
2933 0 && sync_job {#d# 3608 $RUNTIME += $TICK;
2934 for(1..10) { 3609 $NEXT_TICK += $TICK;
2935 my $t = Event::time;
2936 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2937 or die;
2938 3610
2939 $map->width (50); 3611 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2940 $map->height (50); 3612 $NEXT_RUNTIME_WRITE = $NOW + 10;
2941 $map->alloc; 3613 Coro::async_pool {
2942 $map->_load_objects ("/tmp/x.map", 1); 3614 $Coro::current->{desc} = "runtime saver";
2943 my $t = Event::time - $t; 3615 write_runtime
2944 3616 or warn "ERROR: unable to write runtime file: $!";
2945 #next unless $t < 0.0013;#d#
2946 if ($t < $min) {
2947 $min = $t;
2948 }
2949 $avg = $avg * 0.99 + $t * 0.01;
2950 }
2951 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2952 exit 0;
2953 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2954 }; 3617 };
3618 }
2955 3619
2956 $RUNTIME += $TICK;
2957 $NEXT_TICK += $TICK;
2958
2959 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2960 $NEXT_RUNTIME_WRITE = $NOW + 10;
2961 Coro::async_pool {
2962 write_runtime
2963 or warn "ERROR: unable to write runtime file: $!";
2964 };
2965 }
2966
2967# my $AFTER = Event::time;
2968# warn $AFTER - $NOW;#d#
2969
2970 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3620 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2971 $sig->send; 3621 $sig->send;
2972 } 3622 }
2973 while (my $sig = shift @WAIT_FOR_TICK) { 3623 while (my $sig = shift @WAIT_FOR_TICK) {
2974 $sig->send; 3624 $sig->send;
2975 } 3625 }
2976 3626
2977 $NOW = Event::time;
2978
2979 # if we are delayed by four ticks or more, skip them all
2980 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2981
2982 $TICK_WATCHER->at ($NEXT_TICK);
2983 $TICK_WATCHER->start;
2984
2985 $LOAD = ($NOW - $tick_start) / $TICK; 3627 $LOAD = ($NOW - $tick_start) / $TICK;
2986 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3628 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2987 3629
2988 _post_tick; 3630 _post_tick;
2989 3631};
2990 3632$TICK_WATCHER->priority (EV::MAXPRI);
2991 },
2992);
2993 3633
2994{ 3634{
2995 BDB::max_poll_time $TICK * 0.1; 3635 # configure BDB
2996 $BDB_POLL_WATCHER = Event->io ( 3636
2997 reentrant => 0,
2998 fd => BDB::poll_fileno,
2999 poll => 'r',
3000 prio => 0,
3001 data => WF_AUTOCANCEL,
3002 cb => \&BDB::poll_cb,
3003 );
3004 BDB::min_parallel 8; 3637 BDB::min_parallel 8;
3005 3638 BDB::max_poll_reqs $TICK * 0.1;
3006 BDB::set_sync_prepare {
3007 my $status;
3008 my $current = $Coro::current;
3009 (
3010 sub {
3011 $status = $!;
3012 $current->ready; undef $current;
3013 },
3014 sub {
3015 Coro::schedule while defined $current;
3016 $! = $status;
3017 },
3018 )
3019 };
3020 3639
3021 unless ($DB_ENV) { 3640 unless ($DB_ENV) {
3022 $DB_ENV = BDB::db_env_create; 3641 $DB_ENV = BDB::db_env_create;
3642 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3643 | BDB::LOG_AUTOREMOVE, 1);
3644 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3645 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3023 3646
3024 cf::sync_job { 3647 cf::sync_job {
3025 eval { 3648 eval {
3026 BDB::db_env_open 3649 BDB::db_env_open
3027 $DB_ENV, 3650 $DB_ENV,
3029 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3652 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3030 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3653 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3031 0666; 3654 0666;
3032 3655
3033 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3656 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3034
3035 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3036 $DB_ENV->set_lk_detect;
3037 }; 3657 };
3038 3658
3039 cf::cleanup "db_env_open(db): $@" if $@; 3659 cf::cleanup "db_env_open(db): $@" if $@;
3040 }; 3660 };
3041 } 3661 }
3662
3663 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3664 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3665 };
3666 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3667 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3668 };
3669 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3670 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3671 };
3042} 3672}
3043 3673
3044{ 3674{
3675 # configure IO::AIO
3676
3045 IO::AIO::min_parallel 8; 3677 IO::AIO::min_parallel 8;
3046
3047 undef $Coro::AIO::WATCHER;
3048 IO::AIO::max_poll_time $TICK * 0.1; 3678 IO::AIO::max_poll_time $TICK * 0.1;
3049 $AIO_POLL_WATCHER = Event->io (
3050 reentrant => 0,
3051 data => WF_AUTOCANCEL,
3052 fd => IO::AIO::poll_fileno,
3053 poll => 'r',
3054 prio => 6,
3055 cb => \&IO::AIO::poll_cb,
3056 );
3057} 3679}
3058 3680
3059my $_log_backtrace; 3681my $_log_backtrace;
3060 3682
3061sub _log_backtrace { 3683sub _log_backtrace {
3065 3687
3066 # limit the # of concurrent backtraces 3688 # limit the # of concurrent backtraces
3067 if ($_log_backtrace < 2) { 3689 if ($_log_backtrace < 2) {
3068 ++$_log_backtrace; 3690 ++$_log_backtrace;
3069 async { 3691 async {
3692 $Coro::current->{desc} = "abt $msg";
3693
3070 my @bt = fork_call { 3694 my @bt = fork_call {
3071 @addr = map { sprintf "%x", $_ } @addr; 3695 @addr = map { sprintf "%x", $_ } @addr;
3072 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3696 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3073 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3697 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3074 or die "addr2line: $!"; 3698 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines