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.264 by root, Sun May 6 05:44:48 2007 UTC vs.
Revision 1.335 by root, Mon Aug 20 22:21:48 2007 UTC

10use Event; 10use Event;
11use Opcode; 11use Opcode;
12use Safe; 12use Safe;
13use Safe::Hole; 13use Safe::Hole;
14 14
15use Coro 3.61 (); 15use Coro 3.64 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
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::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
26use JSON::XS 1.4 ();
25use BDB (); 27use BDB ();
26use Data::Dumper; 28use Data::Dumper;
27use Digest::MD5; 29use Digest::MD5;
28use Fcntl; 30use Fcntl;
29use YAML::Syck (); 31use YAML::Syck ();
30use IO::AIO 2.32 (); 32use IO::AIO 2.32 ();
31use Time::HiRes; 33use Time::HiRes;
32use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
33 36
34# configure various modules to our taste 37# configure various modules to our taste
35# 38#
36$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
49our %COMMAND = (); 52our %COMMAND = ();
50our %COMMAND_TIME = (); 53our %COMMAND_TIME = ();
51 54
52our @EXTS = (); # list of extension package names 55our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 56our %EXTCMD = ();
57our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 58our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 59our %EXT_MAP = (); # pluggable maps
56 60
57our $RELOAD; # number of reloads so far 61our $RELOAD; # number of reloads so far
58our @EVENT; 62our @EVENT;
90our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
91 95
92# used to convert map paths into valid unix filenames by replacing / by ∕ 96# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 98
99our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing
101our $tick_start; # for load detecting purposes
102
95binmode STDOUT; 103binmode STDOUT;
96binmode STDERR; 104binmode STDERR;
97 105
98# read virtual server time, if available 106# read virtual server time, if available
99unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 107unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
139 147
140=item $cf::TICK 148=item $cf::TICK
141 149
142The interval between server ticks, in seconds. 150The interval between server ticks, in seconds.
143 151
152=item $cf::LOADAVG
153
154The current CPU load on the server (alpha-smoothed), as a value between 0
155(none) and 1 (overloaded), indicating how much time is spent on processing
156objects per tick. Healthy values are < 0.5.
157
158=item $cf::LOAD
159
160The raw value load value from the last tick.
161
144=item %cf::CFG 162=item %cf::CFG
145 163
146Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/crossfire/config>, or
147from wherever your confdir points to. 165from wherever your confdir points to.
148 166
149=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
150 168
151These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
152returns directly I<after> the tick processing (and consequently, can only wake one process 170returns directly I<after> the tick processing (and consequently, can only wake one process
153per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 171per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
172
173=item @cf::INVOKE_RESULTS
174
175This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call.
154 178
155=back 179=back
156 180
157=cut 181=cut
158 182
173@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
174@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
175@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
176@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
177@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 201@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
202@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
178@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 203@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
179 204
180# we bless all objects into (empty) derived classes to force a method lookup 205# we bless all objects into (empty) derived classes to force a method lookup
181# within the Safe compartment. 206# within the Safe compartment.
182for my $pkg (qw( 207for my $pkg (qw(
183 cf::global cf::attachable 208 cf::global cf::attachable
191} 216}
192 217
193$Event::DIED = sub { 218$Event::DIED = sub {
194 warn "error in event callback: @_"; 219 warn "error in event callback: @_";
195}; 220};
221
222#############################################################################
196 223
197=head2 UTILITY FUNCTIONS 224=head2 UTILITY FUNCTIONS
198 225
199=over 4 226=over 4
200 227
219 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
220 $d 247 $d
221 } || "[unable to dump $_[0]: '$@']"; 248 } || "[unable to dump $_[0]: '$@']";
222} 249}
223 250
224use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
225
226=item $ref = cf::from_json $json 251=item $ref = cf::from_json $json
227 252
228Converts a JSON string into the corresponding perl data structure. 253Converts a JSON string into the corresponding perl data structure.
229 254
230=item $json = cf::to_json $ref 255=item $json = cf::to_json $ref
231 256
232Converts a perl data structure into its JSON representation. 257Converts a perl data structure into its JSON representation.
258
259=cut
260
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262
263sub to_json ($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) }
233 265
234=item cf::lock_wait $string 266=item cf::lock_wait $string
235 267
236Wait until the given lock is available. See cf::lock_acquire. 268Wait until the given lock is available. See cf::lock_acquire.
237 269
291 }; 323 };
292 $TICK_WATCHER->stop; 324 $TICK_WATCHER->stop;
293 $guard 325 $guard
294} 326}
295 327
328=item cf::get_slot $time[, $priority[, $name]]
329
330Allocate $time seconds of blocking CPU time at priority C<$priority>:
331This call blocks and returns only when you have at least C<$time> seconds
332of cpu time till the next tick. The slot is only valid till the next cede.
333
334The optional C<$name> can be used to identify the job to run. It might be
335used for statistical purposes and should identify the same time-class.
336
337Useful for short background jobs.
338
339=cut
340
341our @SLOT_QUEUE;
342our $SLOT_QUEUE;
343
344$SLOT_QUEUE->cancel if $SLOT_QUEUE;
345$SLOT_QUEUE = Coro::async {
346 my $signal = new Coro::Signal;
347
348 while () {
349 next_job:
350 my $avail = cf::till_tick;
351 if ($avail > 0.01) {
352 for (0 .. $#SLOT_QUEUE) {
353 if ($SLOT_QUEUE[$_][0] < $avail) {
354 my $job = splice @SLOT_QUEUE, $_, 1, ();
355 $job->[2]->send;
356 Coro::cede;
357 goto next_job;
358 }
359 }
360 }
361
362 if (@SLOT_QUEUE) {
363 # we do not use wait_For_tick() as it returns immediately when tick is inactive
364 push @cf::WAIT_FOR_TICK, $signal;
365 $signal->wait;
366 } else {
367 Coro::schedule;
368 }
369 }
370};
371
372sub get_slot($;$$) {
373 my ($time, $pri, $name) = @_;
374
375 $time = $TICK * .6 if $time > $TICK * .6;
376 my $sig = new Coro::Signal;
377
378 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
379 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
380 $SLOT_QUEUE->ready;
381 $sig->wait;
382}
383
296=item cf::async { BLOCK } 384=item cf::async { BLOCK }
297 385
298Currently the same as Coro::async_pool, meaning you cannot use 386Currently the same as Coro::async_pool, meaning you cannot use
299C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 387C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
300thing you are allowed to do is call C<prio> on it. 388thing you are allowed to do is call C<prio> on it.
303 391
304BEGIN { *async = \&Coro::async_pool } 392BEGIN { *async = \&Coro::async_pool }
305 393
306=item cf::sync_job { BLOCK } 394=item cf::sync_job { BLOCK }
307 395
308The design of crossfire+ requires that the main coro ($Coro::main) is 396The design of Crossfire TRT requires that the main coroutine ($Coro::main)
309always able to handle events or runnable, as crossfire+ is only partly 397is always able to handle events or runnable, as Crossfire TRT is only
310reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 398partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
399acceptable.
311 400
312If it must be done, put the blocking parts into C<sync_job>. This will run 401If it must be done, put the blocking parts into C<sync_job>. This will run
313the given BLOCK in another coroutine while waiting for the result. The 402the given BLOCK in another coroutine while waiting for the result. The
314server will be frozen during this time, so the block should either finish 403server will be frozen during this time, so the block should either finish
315fast or be very important. 404fast or be very important.
318 407
319sub sync_job(&) { 408sub sync_job(&) {
320 my ($job) = @_; 409 my ($job) = @_;
321 410
322 if ($Coro::current == $Coro::main) { 411 if ($Coro::current == $Coro::main) {
412 my $time = Event::time;
413
323 # this is the main coro, too bad, we have to block 414 # this is the main coro, too bad, we have to block
324 # till the operation succeeds, freezing the server :/ 415 # till the operation succeeds, freezing the server :/
325 416
326 # TODO: use suspend/resume instead 417 # TODO: use suspend/resume instead
327 # (but this is cancel-safe) 418 # (but this is cancel-safe)
338 429
339 while ($busy) { 430 while ($busy) {
340 Coro::cede or Event::one_event; 431 Coro::cede or Event::one_event;
341 } 432 }
342 433
434 $time = Event::time - $time;
435
436 LOG llevError | logBacktrace, Carp::longmess "long sync job"
437 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
438
439 $tick_start += $time; # do not account sync jobs to server load
440
343 wantarray ? @res : $res[0] 441 wantarray ? @res : $res[0]
344 } else { 442 } else {
345 # we are in another coroutine, how wonderful, everything just works 443 # we are in another coroutine, how wonderful, everything just works
346 444
347 $job->() 445 $job->()
366 $EXT_CORO{$coro+0} = $coro; 464 $EXT_CORO{$coro+0} = $coro;
367 465
368 $coro 466 $coro
369} 467}
370 468
371sub write_runtime { 469=item fork_call { }, $args
372 my $runtime = "$LOCALDIR/runtime";
373 470
374 # first touch the runtime file to show we are still running: 471Executes the given code block with the given arguments in a seperate
375 # the fsync below can take a very very long time. 472process, returning the results. Everything must be serialisable with
473Coro::Storable. May, of course, block. Note that the executed sub may
474never block itself or use any form of Event handling.
376 475
377 warn "touching runtime...\n";#d# 476=cut
378 if (my $fh = aio_open $runtime, O_WRONLY, 0) {
379 utime undef, undef, $fh;
380 }
381 477
382 my $guard = cf::lock_acquire "write_runtime"; 478sub fork_call(&@) {
479 my ($cb, @args) = @_;
383 480
384 warn "starting to write runtime...\n";#d# 481 # we seemingly have to make a local copy of the whole thing,
385 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 482 # otherwise perl prematurely frees the stuff :/
386 or return; 483 # TODO: investigate and fix (liekly this will be rather laborious)
387 484
388 my $value = $cf::RUNTIME + 90 + 10; 485 my @res = Coro::Util::fork_eval {
389 # 10 is the runtime save interval, for a monotonic clock 486 reset_signals;
390 # 60 allows for the watchdog to kill the server. 487 &$cb
488 }, @args;
391 489
392 (aio_write $fh, 0, (length $value), $value, 0) <= 0 490 wantarray ? @res : $res[-1]
393 and return; 491}
394 492
395 # always fsync - this file is important 493=item $value = cf::db_get $family => $key
396 aio_fsync $fh
397 and return;
398 494
399 # touch it again to show we are up-to-date 495Returns a single value from the environment database.
400 utime undef, undef, $fh;
401 496
402 close $fh 497=item cf::db_put $family => $key => $value
403 or return;
404 498
405 aio_rename "$runtime~", $runtime 499Stores the given C<$value> in the family. It can currently store binary
406 and return; 500data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
407 501
408 warn "... done writing runtime.\n";#d# 502=cut
409 503
504our $DB;
505
506sub db_init {
507 unless ($DB) {
508 $DB = BDB::db_create $DB_ENV;
509
510 cf::sync_job {
511 eval {
512 $DB->set_flags (BDB::CHKSUM);
513
514 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
515 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
516 cf::cleanup "db_open(db): $!" if $!;
517 };
518 cf::cleanup "db_open(db): $@" if $@;
519 };
410 1 520 }
521}
522
523sub db_get($$) {
524 my $key = "$_[0]/$_[1]";
525
526 cf::sync_job {
527 BDB::db_get $DB, undef, $key, my $data;
528
529 $! ? ()
530 : $data
531 }
532}
533
534sub db_put($$$) {
535 BDB::dbreq_pri 4;
536 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
537}
538
539=item cf::cache $id => [$paths...], $processversion => $process
540
541Generic caching function that returns the value of the resource $id,
542caching and regenerating as required.
543
544This function can block.
545
546=cut
547
548sub cache {
549 my ($id, $src, $processversion, $process) = @_;
550
551 my $meta =
552 join "\x00",
553 $processversion,
554 map {
555 aio_stat $_
556 and Carp::croak "$_: $!";
557
558 ($_, (stat _)[7,9])
559 } @$src;
560
561 my $dbmeta = db_get cache => "$id/meta";
562 if ($dbmeta ne $meta) {
563 # changed, we may need to process
564
565 my @data;
566 my $md5;
567
568 for (0 .. $#$src) {
569 0 <= aio_load $src->[$_], $data[$_]
570 or Carp::croak "$src->[$_]: $!";
571 }
572
573 # if processing is expensive, check
574 # checksum first
575 if (1) {
576 $md5 =
577 join "\x00",
578 $processversion,
579 map {
580 Coro::cede;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src;
583
584
585 my $dbmd5 = db_get cache => "$id/md5";
586 if ($dbmd5 eq $md5) {
587 db_put cache => "$id/meta", $meta;
588
589 return db_get cache => "$id/data";
590 }
591 }
592
593 my $t1 = Time::HiRes::time;
594 my $data = $process->(\@data);
595 my $t2 = Time::HiRes::time;
596
597 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
598
599 db_put cache => "$id/data", $data;
600 db_put cache => "$id/md5" , $md5;
601 db_put cache => "$id/meta", $meta;
602
603 return $data;
604 }
605
606 db_get cache => "$id/data"
411} 607}
412 608
413=item cf::datalog type => key => value, ... 609=item cf::datalog type => key => value, ...
414 610
415Log a datalog packet of the given type with the given key-value pairs. 611Log a datalog packet of the given type with the given key-value pairs.
433attach callbacks/event handlers (a collection of which is called an "attachment") 629attach callbacks/event handlers (a collection of which is called an "attachment")
434to it. All such attachable objects support the following methods. 630to it. All such attachable objects support the following methods.
435 631
436In the following description, CLASS can be any of C<global>, C<object> 632In the following description, CLASS can be any of C<global>, C<object>
437C<player>, C<client> or C<map> (i.e. the attachable objects in 633C<player>, C<client> or C<map> (i.e. the attachable objects in
438crossfire+). 634Crossfire TRT).
439 635
440=over 4 636=over 4
441 637
442=item $attachable->attach ($attachment, key => $value...) 638=item $attachable->attach ($attachment, key => $value...)
443 639
606 $registry = $CB_TYPE[$object_type] ||= []; 802 $registry = $CB_TYPE[$object_type] ||= [];
607 803
608 } elsif ($type eq "subtype") { 804 } elsif ($type eq "subtype") {
609 defined $object_type or Carp::croak "subtype specified without type"; 805 defined $object_type or Carp::croak "subtype specified without type";
610 my $object_subtype = shift @arg; 806 my $object_subtype = shift @arg;
611 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 807 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
612 808
613 } elsif ($type eq "package") { 809 } elsif ($type eq "package") {
614 my $pkg = shift @arg; 810 my $pkg = shift @arg;
615 811
616 while (my ($name, $id) = each %cb_id) { 812 while (my ($name, $id) = each %cb_id) {
645 _attach $registry, $klass, @attach; 841 _attach $registry, $klass, @attach;
646 } 842 }
647 843
648 $obj->{$name} = \%arg; 844 $obj->{$name} = \%arg;
649 } else { 845 } else {
650 warn "object uses attachment '$name' that is not available, postponing.\n"; 846 warn "object uses attachment '$name' which is not available, postponing.\n";
651 } 847 }
652 848
653 $obj->{_attachment}{$name} = undef; 849 $obj->{_attachment}{$name} = undef;
654} 850}
655 851
657 if (ref $_[0]) { 853 if (ref $_[0]) {
658 _object_attach @_; 854 _object_attach @_;
659 } else { 855 } else {
660 _attach shift->_attach_registry, @_; 856 _attach shift->_attach_registry, @_;
661 } 857 }
858 _recalc_want;
662}; 859};
663 860
664# all those should be optimised 861# all those should be optimised
665sub cf::attachable::detach { 862sub cf::attachable::detach {
666 my ($obj, $name) = @_; 863 my ($obj, $name) = @_;
669 delete $obj->{_attachment}{$name}; 866 delete $obj->{_attachment}{$name};
670 reattach ($obj); 867 reattach ($obj);
671 } else { 868 } else {
672 Carp::croak "cannot, currently, detach class attachments"; 869 Carp::croak "cannot, currently, detach class attachments";
673 } 870 }
871 _recalc_want;
674}; 872};
675 873
676sub cf::attachable::attached { 874sub cf::attachable::attached {
677 my ($obj, $name) = @_; 875 my ($obj, $name) = @_;
678 876
693 "; 891 ";
694 die if $@; 892 die if $@;
695} 893}
696 894
697our $override; 895our $override;
698our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 896our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
699 897
700sub override { 898sub override {
701 $override = 1; 899 $override = 1;
702 @invoke_results = (); 900 @INVOKE_RESULTS = (@_);
703} 901}
704 902
705sub do_invoke { 903sub do_invoke {
706 my $event = shift; 904 my $event = shift;
707 my $callbacks = shift; 905 my $callbacks = shift;
708 906
709 @invoke_results = (); 907 @INVOKE_RESULTS = ();
710 908
711 local $override; 909 local $override;
712 910
713 for (@$callbacks) { 911 for (@$callbacks) {
714 eval { &{$_->[1]} }; 912 eval { &{$_->[1]} };
731 929
732Generate an object-specific event with the given arguments. 930Generate an object-specific event with the given arguments.
733 931
734This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 932This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
735removed in future versions), and there is no public API to access override 933removed in future versions), and there is no public API to access override
736results (if you must, access C<@cf::invoke_results> directly). 934results (if you must, access C<@cf::INVOKE_RESULTS> directly).
737 935
738=back 936=back
739 937
740=cut 938=cut
741 939
742############################################################################# 940#############################################################################
743# object support 941# object support
942#
943
944sub _can_merge {
945 my ($ob1, $ob2) = @_;
946
947 local $Storable::canonical = 1;
948 my $fob1 = Storable::freeze $ob1;
949 my $fob2 = Storable::freeze $ob2;
950
951 $fob1 eq $fob2
952}
744 953
745sub reattach { 954sub reattach {
746 # basically do the same as instantiate, without calling instantiate 955 # basically do the same as instantiate, without calling instantiate
747 my ($obj) = @_; 956 my ($obj) = @_;
748 957
851 or return; 1060 or return;
852 $av = eval { (Storable::thaw $av)->{objs} }; 1061 $av = eval { (Storable::thaw $av)->{objs} };
853 } 1062 }
854 1063
855 warn sprintf "loading %s (%d)\n", 1064 warn sprintf "loading %s (%d)\n",
856 $filename, length $data, scalar @{$av || []};#d# 1065 $filename, length $data, scalar @{$av || []};
857 return ($data, $av); 1066 return ($data, $av);
858} 1067}
1068
1069=head2 COMMAND CALLBACKS
1070
1071=over 4
1072
1073=cut
859 1074
860############################################################################# 1075#############################################################################
861# command handling &c 1076# command handling &c
862 1077
863=item cf::register_command $name => \&callback($ob,$args); 1078=item cf::register_command $name => \&callback($ob,$args);
876 push @{ $COMMAND{$name} }, [$caller, $cb]; 1091 push @{ $COMMAND{$name} }, [$caller, $cb];
877} 1092}
878 1093
879=item cf::register_extcmd $name => \&callback($pl,$packet); 1094=item cf::register_extcmd $name => \&callback($pl,$packet);
880 1095
881Register a callbackf ro execution when the client sends an extcmd packet. 1096Register a callback for execution when the client sends an (synchronous)
1097extcmd packet. Ext commands will be processed in the order they are
1098received by the server, like other user commands. The first argument is
1099the logged-in player. Ext commands can only be processed after a player
1100has logged in successfully.
882 1101
883If the callback returns something, it is sent back as if reply was being 1102If the callback returns something, it is sent back as if reply was being
884called. 1103called.
885 1104
1105=item cf::register_exticmd $name => \&callback($ns,$packet);
1106
1107Register a callback for execution when the client sends an (asynchronous)
1108exticmd packet. Exti commands are processed by the server as soon as they
1109are received, i.e. out of order w.r.t. other commands. The first argument
1110is a client socket. Exti commands can be received anytime, even before
1111log-in.
1112
1113If the callback returns something, it is sent back as if reply was being
1114called.
1115
886=cut 1116=cut
887 1117
888sub register_extcmd { 1118sub register_extcmd {
889 my ($name, $cb) = @_; 1119 my ($name, $cb) = @_;
890 1120
891 $EXTCMD{$name} = $cb; 1121 $EXTCMD{$name} = $cb;
1122}
1123
1124sub register_exticmd {
1125 my ($name, $cb) = @_;
1126
1127 $EXTICMD{$name} = $cb;
892} 1128}
893 1129
894cf::player->attach ( 1130cf::player->attach (
895 on_command => sub { 1131 on_command => sub {
896 my ($pl, $name, $params) = @_; 1132 my ($pl, $name, $params) = @_;
905 cf::override; 1141 cf::override;
906 }, 1142 },
907 on_extcmd => sub { 1143 on_extcmd => sub {
908 my ($pl, $buf) = @_; 1144 my ($pl, $buf) = @_;
909 1145
910 my $msg = eval { from_json $buf }; 1146 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
911 1147
912 if (ref $msg) { 1148 if (ref $msg) {
1149 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg
1151 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153
913 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1154 if (my $cb = $EXTCMD{$type}) {
914 if (my %reply = $cb->($pl, $msg)) { 1155 my @reply = $cb->($pl, @payload);
1156
915 $pl->ext_reply ($msg->{msgid}, %reply); 1157 $pl->ext_reply ($reply, @reply)
916 } 1158 if $reply;
917 } 1159 }
918 } else { 1160 } else {
919 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
920 } 1162 }
921 1163
922 cf::override; 1164 cf::override;
923 }, 1165 },
924); 1166);
925 1167
926sub load_extension {
927 my ($path) = @_;
928
929 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
930 my $base = $1;
931 my $pkg = $1;
932 $pkg =~ s/[^[:word:]]/_/g;
933 $pkg = "ext::$pkg";
934
935 warn "... loading '$path' into '$pkg'\n";
936
937 open my $fh, "<:utf8", $path
938 or die "$path: $!";
939
940 my $source =
941 "package $pkg; use strict; use utf8;\n"
942 . "#line 1 \"$path\"\n{\n"
943 . (do { local $/; <$fh> })
944 . "\n};\n1";
945
946 unless (eval $source) {
947 my $msg = $@ ? "$path: $@\n"
948 : "extension disabled.\n";
949 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
950 warn $@;
951 warn "mandatory extension failed to load, exiting.\n";
952 exit 1;
953 }
954 die $@;
955 }
956
957 push @EXTS, $pkg;
958}
959
960sub load_extensions { 1168sub load_extensions {
1169 cf::sync_job {
1170 my %todo;
1171
961 for my $ext (<$LIBDIR/*.ext>) { 1172 for my $path (<$LIBDIR/*.ext>) {
962 next unless -r $ext; 1173 next unless -r $path;
963 eval { 1174
964 load_extension $ext; 1175 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1176 my $base = $1;
1177 my $pkg = $1;
1178 $pkg =~ s/[^[:word:]]/_/g;
1179 $pkg = "ext::$pkg";
1180
1181 open my $fh, "<:utf8", $path
1182 or die "$path: $!";
1183
1184 my $source = do { local $/; <$fh> };
1185
1186 my %ext = (
1187 path => $path,
1188 base => $base,
1189 pkg => $pkg,
1190 );
1191
1192 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1193 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1194
1195 $ext{source} =
1196 "package $pkg; use strict; use utf8;\n"
1197 . "#line 1 \"$path\"\n{\n"
1198 . $source
1199 . "\n};\n1";
1200
1201 $todo{$base} = \%ext;
1202 }
1203
1204 my %done;
1205 while (%todo) {
1206 my $progress;
1207
1208 while (my ($k, $v) = each %todo) {
1209 for (split /,\s*/, $v->{meta}{depends}) {
1210 goto skip
1211 unless exists $done{$_};
1212 }
1213
1214 warn "... loading '$k' into '$v->{pkg}'\n";
1215
1216 unless (eval $v->{source}) {
1217 my $msg = $@ ? "$v->{path}: $@\n"
1218 : "$v->{base}: extension inactive.\n";
1219
1220 if (exists $v->{meta}{mandatory}) {
1221 warn $msg;
1222 warn "mandatory extension failed to load, exiting.\n";
1223 exit 1;
1224 }
1225
1226 warn $msg;
1227 }
1228
1229 $done{$k} = delete $todo{$k};
1230 push @EXTS, $v->{pkg};
1231 $progress = 1;
965 1 1232 }
966 } or warn "$ext not loaded: $@"; 1233
1234 skip:
1235 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1236 unless $progress;
1237 }
967 } 1238 };
968} 1239}
969 1240
970############################################################################# 1241#############################################################################
1242
1243=back
971 1244
972=head2 CORE EXTENSIONS 1245=head2 CORE EXTENSIONS
973 1246
974Functions and methods that extend core crossfire objects. 1247Functions and methods that extend core crossfire objects.
975 1248
1062 $cf::PLAYER{$login} = $self; 1335 $cf::PLAYER{$login} = $self;
1063 1336
1064 $self 1337 $self
1065} 1338}
1066 1339
1340=item $player->send_msg ($channel, $msg, $color, [extra...])
1341
1342=cut
1343
1344sub send_msg {
1345 my $ns = shift->ns
1346 or return;
1347 $ns->send_msg (@_);
1348}
1349
1067=item $pl->quit_character 1350=item $pl->quit_character
1068 1351
1069Nukes the player without looking back. If logged in, the connection will 1352Nukes the player without looking back. If logged in, the connection will
1070be destroyed. May block for a long time. 1353be destroyed. May block for a long time.
1071 1354
1163 } 1446 }
1164 1447
1165 \@paths 1448 \@paths
1166} 1449}
1167 1450
1451=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1452
1453Expand crossfire pod fragments into protocol xml.
1454
1455=cut
1456
1457sub expand_cfpod {
1458 ((my $self), (local $_)) = @_;
1459
1460 # escape & and <
1461 s/&/&amp;/g;
1462 s/(?<![BIUGH])</&lt;/g;
1463
1464 # this is buggy, it needs to properly take care of nested <'s
1465
1466 1 while
1467 # replace B<>, I<>, U<> etc.
1468 s/B<([^\>]*)>/<b>$1<\/b>/
1469 || s/I<([^\>]*)>/<i>$1<\/i>/
1470 || s/U<([^\>]*)>/<u>$1<\/u>/
1471 # replace G<male|female> tags
1472 || s{G<([^>|]*)\|([^>]*)>}{
1473 $self->gender ? $2 : $1
1474 }ge
1475 # replace H<hint text>
1476 || s{H<([^\>]*)>}
1477 {
1478 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1479 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1480 "")
1481 [$self->{hintmode}]
1482 }ge;
1483
1484 # create single paragraphs (very hackish)
1485 s/(?<=\S)\n(?=\w)/ /g;
1486
1487 # compress some whitespace
1488 s/\s+\n/\n/g; # ws line-ends
1489 s/\n\n+/\n/g; # double lines
1490 s/^\n+//; # beginning lines
1491 s/\n+$//; # ending lines
1492
1493 $_
1494}
1495
1496sub hintmode {
1497 $_[0]{hintmode} = $_[1] if @_ > 1;
1498 $_[0]{hintmode}
1499}
1500
1168=item $player->ext_reply ($msgid, %msg) 1501=item $player->ext_reply ($msgid, @msg)
1169 1502
1170Sends an ext reply to the player. 1503Sends an ext reply to the player.
1171 1504
1172=cut 1505=cut
1173 1506
1174sub ext_reply($$%) { 1507sub ext_reply($$@) {
1175 my ($self, $id, %msg) = @_; 1508 my ($self, $id, @msg) = @_;
1176 1509
1177 $msg{msgid} = $id; 1510 if ($self->ns->extcmd == 2) {
1178 1511 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1179 $self->send ("ext " . cf::to_json \%msg); 1512 } elsif ($self->ns->extcmd == 1) {
1513 #TODO: version 1, remove
1514 unshift @msg, msgtype => "reply", msgid => $id;
1515 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1516 }
1180} 1517}
1181 1518
1182=item $player->ext_event ($type, %msg) 1519=item $player->ext_msg ($type, @msg)
1183 1520
1184Sends an ext event to the client. 1521Sends an ext event to the client.
1185 1522
1186=cut 1523=cut
1187 1524
1188sub ext_event($$%) { 1525sub ext_msg($$@) {
1189 my ($self, $type, %msg) = @_; 1526 my ($self, $type, @msg) = @_;
1190 1527
1191 $self->ns->ext_event ($type, %msg); 1528 $self->ns->ext_msg ($type, @msg);
1192} 1529}
1193 1530
1194=head3 cf::region 1531=head3 cf::region
1195 1532
1196=over 4 1533=over 4
1199 1536
1200package cf::region; 1537package cf::region;
1201 1538
1202=item cf::region::find_by_path $path 1539=item cf::region::find_by_path $path
1203 1540
1204Tries to decuce the probable region for a map knowing only its path. 1541Tries to decuce the likely region for a map knowing only its path.
1205 1542
1206=cut 1543=cut
1207 1544
1208sub find_by_path($) { 1545sub find_by_path($) {
1209 my ($path) = @_; 1546 my ($path) = @_;
1210 1547
1211 my ($match, $specificity); 1548 my ($match, $specificity);
1212 1549
1213 for my $region (list) { 1550 for my $region (list) {
1214 if ($region->match && $path =~ $region->match) { 1551 if ($region->{match} && $path =~ $region->{match}) {
1215 ($match, $specificity) = ($region, $region->specificity) 1552 ($match, $specificity) = ($region, $region->specificity)
1216 if $region->specificity > $specificity; 1553 if $region->specificity > $specificity;
1217 } 1554 }
1218 } 1555 }
1219 1556
1283 my ($self, $merge) = @_; 1620 my ($self, $merge) = @_;
1284 1621
1285 # we have to keep some variables in memory intact 1622 # we have to keep some variables in memory intact
1286 local $self->{path}; 1623 local $self->{path};
1287 local $self->{load_path}; 1624 local $self->{load_path};
1288 local $self->{deny_save};
1289 local $self->{deny_reset};
1290 1625
1291 $self->SUPER::thawer_merge ($merge); 1626 $self->SUPER::thawer_merge ($merge);
1292} 1627}
1293 1628
1294sub normalise { 1629sub normalise {
1341 $self->init; # pass $1 etc. 1676 $self->init; # pass $1 etc.
1342 return $self; 1677 return $self;
1343 } 1678 }
1344 } 1679 }
1345 1680
1346 Carp::carp "unable to resolve path '$path' (base '$base')."; 1681 Carp::cluck "unable to resolve path '$path' (base '$base').";
1347 () 1682 ()
1348} 1683}
1349 1684
1350sub init { 1685sub init {
1351 my ($self) = @_; 1686 my ($self) = @_;
1392sub change_all_map_light { 1727sub change_all_map_light {
1393 my ($change) = @_; 1728 my ($change) = @_;
1394 1729
1395 $_->change_map_light ($change) 1730 $_->change_map_light ($change)
1396 for grep $_->outdoor, values %cf::MAP; 1731 for grep $_->outdoor, values %cf::MAP;
1732}
1733
1734sub decay_objects {
1735 my ($self) = @_;
1736
1737 return if $self->{deny_reset};
1738
1739 $self->do_decay_objects;
1397} 1740}
1398 1741
1399sub unlink_save { 1742sub unlink_save {
1400 my ($self) = @_; 1743 my ($self) = @_;
1401 1744
1459 $self->load_header_orig 1802 $self->load_header_orig
1460 or return; 1803 or return;
1461 $self->prepare_orig; 1804 $self->prepare_orig;
1462 } 1805 }
1463 1806
1807 $self->{deny_reset} = 1
1808 if $self->no_reset;
1809
1464 $self->default_region (cf::region::find_by_path $self->{path}) 1810 $self->default_region (cf::region::find_by_path $self->{path})
1465 unless $self->default_region; 1811 unless $self->default_region;
1466 1812
1467 1 1813 1
1468} 1814}
1483 $map->{last_save} = $cf::RUNTIME; 1829 $map->{last_save} = $cf::RUNTIME;
1484 1830
1485 $map->load_header 1831 $map->load_header
1486 or return; 1832 or return;
1487 1833
1488 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1489 # doing this can freeze the server in a sync job, obviously 1835 # doing this can freeze the server in a sync job, obviously
1490 #$cf::WAIT_FOR_TICK->wait; 1836 #$cf::WAIT_FOR_TICK->wait;
1491 $map->reset; 1837 $map->reset;
1492 undef $guard; 1838 undef $guard;
1493 return find $path; 1839 return find $path;
1548 $self->set_darkness_map; 1894 $self->set_darkness_map;
1549 Coro::cede; 1895 Coro::cede;
1550 $self->activate; 1896 $self->activate;
1551 } 1897 }
1552 1898
1899 $self->{last_save} = $cf::RUNTIME;
1900 $self->last_access ($cf::RUNTIME);
1901
1553 $self->in_memory (cf::MAP_IN_MEMORY); 1902 $self->in_memory (cf::MAP_IN_MEMORY);
1554 } 1903 }
1555 1904
1556 $self->post_load; 1905 $self->post_load;
1557} 1906}
1560 my ($self, $ob) = @_; 1909 my ($self, $ob) = @_;
1561 1910
1562 return find "~" . $ob->name . "/" . $self->{path} 1911 return find "~" . $ob->name . "/" . $self->{path}
1563 if $self->per_player; 1912 if $self->per_player;
1564 1913
1914# return find "?party/" . $ob->name . "/" . $self->{path}
1915# if $self->per_party;
1916
1565 $self 1917 $self
1566} 1918}
1567 1919
1568# find and load all maps in the 3x3 area around a map 1920# find and load all maps in the 3x3 area around a map
1569sub load_diag { 1921sub load_neighbours {
1570 my ($map) = @_; 1922 my ($map) = @_;
1571 1923
1572 my @diag; # diagonal neighbours 1924 my @neigh; # diagonal neighbours
1573 1925
1574 for (0 .. 3) { 1926 for (0 .. 3) {
1575 my $neigh = $map->tile_path ($_) 1927 my $neigh = $map->tile_path ($_)
1576 or next; 1928 or next;
1577 $neigh = find $neigh, $map 1929 $neigh = find $neigh, $map
1578 or next; 1930 or next;
1579 $neigh->load; 1931 $neigh->load;
1580 1932
1933 push @neigh,
1581 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1934 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1582 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1935 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1583 } 1936 }
1584 1937
1585 for (@diag) { 1938 for (grep defined $_->[0], @neigh) {
1939 my ($path, $origin) = @$_;
1586 my $neigh = find @$_ 1940 my $neigh = find $path, $origin
1587 or next; 1941 or next;
1588 $neigh->load; 1942 $neigh->load;
1589 } 1943 }
1590} 1944}
1591 1945
1615 1969
1616 undef $MAP_PREFETCH{$path}; 1970 undef $MAP_PREFETCH{$path};
1617 $MAP_PREFETCHER ||= cf::async { 1971 $MAP_PREFETCHER ||= cf::async {
1618 while (%MAP_PREFETCH) { 1972 while (%MAP_PREFETCH) {
1619 for my $path (keys %MAP_PREFETCH) { 1973 for my $path (keys %MAP_PREFETCH) {
1620 my $map = find $path 1974 if (my $map = find $path) {
1621 or next;
1622 $map->load; 1975 $map->load;
1976 }
1623 1977
1624 delete $MAP_PREFETCH{$path}; 1978 delete $MAP_PREFETCH{$path};
1625 } 1979 }
1626 } 1980 }
1627 undef $MAP_PREFETCHER; 1981 undef $MAP_PREFETCHER;
1679 2033
1680sub reset_at { 2034sub reset_at {
1681 my ($self) = @_; 2035 my ($self) = @_;
1682 2036
1683 # TODO: safety, remove and allow resettable per-player maps 2037 # TODO: safety, remove and allow resettable per-player maps
1684 return 1e99 if $self->isa ("ext::map_per_player");#d#
1685 return 1e99 if $self->{deny_reset}; 2038 return 1e99 if $self->{deny_reset};
1686 2039
1687 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2040 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1688 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2041 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1689 2042
1700 my ($self) = @_; 2053 my ($self) = @_;
1701 2054
1702 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2055 my $lock = cf::lock_acquire "map_data:$self->{path}";
1703 2056
1704 return if $self->players; 2057 return if $self->players;
1705 return if $self->isa ("ext::map_per_player");#d#
1706 2058
1707 warn "resetting map ", $self->path;#d# 2059 warn "resetting map ", $self->path;
1708 2060
1709 $self->in_memory (cf::MAP_SWAPPED); 2061 $self->in_memory (cf::MAP_SWAPPED);
1710 2062
1711 # need to save uniques path 2063 # need to save uniques path
1712 unless ($self->{deny_save}) { 2064 unless ($self->{deny_save}) {
1744 $cf::MAP{$self->path} = $self; 2096 $cf::MAP{$self->path} = $self;
1745 2097
1746 $self->reset; # polite request, might not happen 2098 $self->reset; # polite request, might not happen
1747} 2099}
1748 2100
2101=item $maps = cf::map::tmp_maps
2102
2103Returns an arrayref with all map paths of currently instantiated and saved
2104maps. May block.
2105
2106=cut
2107
2108sub tmp_maps() {
2109 [
2110 map {
2111 utf8::decode $_;
2112 /\.map$/
2113 ? normalise $_
2114 : ()
2115 } @{ aio_readdir $TMPDIR or [] }
2116 ]
2117}
2118
2119=item $maps = cf::map::random_maps
2120
2121Returns an arrayref with all map paths of currently instantiated and saved
2122random maps. May block.
2123
2124=cut
2125
2126sub random_maps() {
2127 [
2128 map {
2129 utf8::decode $_;
2130 /\.map$/
2131 ? normalise "?random/$_"
2132 : ()
2133 } @{ aio_readdir $RANDOMDIR or [] }
2134 ]
2135}
2136
1749=item cf::map::unique_maps 2137=item cf::map::unique_maps
1750 2138
1751Returns an arrayref of paths of all shared maps that have 2139Returns an arrayref of paths of all shared maps that have
1752instantiated unique items. May block. 2140instantiated unique items. May block.
1753 2141
1754=cut 2142=cut
1755 2143
1756sub unique_maps() { 2144sub unique_maps() {
1757 my $files = aio_readdir $UNIQUEDIR 2145 [
1758 or return; 2146 map {
1759
1760 my @paths;
1761
1762 for (@$files) {
1763 utf8::decode $_; 2147 utf8::decode $_;
1764 next if /\.pst$/; 2148 /\.map$/
1765 next unless /^$PATH_SEP/o; 2149 ? normalise $_
1766 2150 : ()
1767 push @paths, cf::map::normalise $_; 2151 } @{ aio_readdir $UNIQUEDIR or [] }
1768 } 2152 ]
1769
1770 \@paths
1771} 2153}
1772 2154
1773package cf; 2155package cf;
1774 2156
1775=back 2157=back
1821 2203
1822 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2204 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1823 2205
1824 if ($self->{record_replies}) { 2206 if ($self->{record_replies}) {
1825 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2207 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2208
1826 } else { 2209 } else {
2210 my $pl = $self->contr;
2211
2212 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2213 my $dialog = $pl->{npc_dialog};
2214 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2215
2216 } else {
1827 $msg = $npc->name . " says: $msg" if $npc; 2217 $msg = $npc->name . " says: $msg" if $npc;
1828 $self->message ($msg, $flags); 2218 $self->message ($msg, $flags);
2219 }
1829 } 2220 }
2221}
2222
2223=item $object->send_msg ($channel, $msg, $color, [extra...])
2224
2225=cut
2226
2227sub cf::object::send_msg {
2228 my $pl = shift->contr
2229 or return;
2230 $pl->send_msg (@_);
1830} 2231}
1831 2232
1832=item $player_object->may ("access") 2233=item $player_object->may ("access")
1833 2234
1834Returns wether the given player is authorized to access resource "access" 2235Returns wether the given player is authorized to access resource "access"
1881 $self->deactivate_recursive; 2282 $self->deactivate_recursive;
1882 2283
1883 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2284 return if UNIVERSAL::isa $self->map, "ext::map_link";
1884 2285
1885 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2286 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1886 if $self->map; 2287 if $self->map && $self->map->{path} ne "{link}";
1887 2288
1888 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2289 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1889} 2290}
1890 2291
1891sub cf::object::player::leave_link { 2292sub cf::object::player::leave_link {
1892 my ($self, $map, $x, $y) = @_; 2293 my ($self, $map, $x, $y) = @_;
2294
2295 return unless $self->contr->active;
1893 2296
1894 my $link_pos = delete $self->{_link_pos}; 2297 my $link_pos = delete $self->{_link_pos};
1895 2298
1896 unless ($map) { 2299 unless ($map) {
1897 # restore original map position 2300 # restore original map position
1911 # use -1 or undef as default coordinates, not 0, 0 2314 # use -1 or undef as default coordinates, not 0, 0
1912 ($x, $y) = ($map->enter_x, $map->enter_y) 2315 ($x, $y) = ($map->enter_x, $map->enter_y)
1913 if $x <=0 && $y <= 0; 2316 if $x <=0 && $y <= 0;
1914 2317
1915 $map->load; 2318 $map->load;
1916 $map->load_diag; 2319 $map->load_neighbours;
1917 2320
1918 return unless $self->contr->active; 2321 return unless $self->contr->active;
1919 $self->activate_recursive; 2322 $self->activate_recursive;
1920 2323
1921 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2324 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1922 $self->enter_map ($map, $x, $y); 2325 $self->enter_map ($map, $x, $y);
1923} 2326}
1924 2327
1925cf::player->attach ( 2328=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1926 on_logout => sub {
1927 my ($pl) = @_;
1928 2329
1929 # abort map switching before logout 2330Moves the player to the given map-path and coordinates by first freezing
1930 if ($pl->ob->{_link_pos}) { 2331her, loading and preparing them map, calling the provided $check callback
1931 cf::sync_job { 2332that has to return the map if sucecssful, and then unfreezes the player on
1932 $pl->ob->leave_link 2333the new (success) or old (failed) map position. In either case, $done will
1933 }; 2334be called at the end of this process.
1934 }
1935 },
1936 on_login => sub {
1937 my ($pl) = @_;
1938 2335
1939 # try to abort aborted map switching on player login :)
1940 # should happen only on crashes
1941 if ($pl->ob->{_link_pos}) {
1942 $pl->ob->enter_link;
1943 (async {
1944 $pl->ob->reply (undef,
1945 "There was an internal problem at your last logout, "
1946 . "the server will try to bring you to your intended destination in a second.",
1947 cf::NDI_RED);
1948 # we need this sleep as the login has a concurrent enter_exit running
1949 # and this sleep increases chances of the player not ending up in scorn
1950 Coro::Timer::sleep 1;
1951 $pl->ob->leave_link;
1952 })->prio (2);
1953 }
1954 },
1955);
1956
1957=item $player_object->goto ($path, $x, $y)
1958
1959=cut 2336=cut
2337
2338our $GOTOGEN;
1960 2339
1961sub cf::object::player::goto { 2340sub cf::object::player::goto {
1962 my ($self, $path, $x, $y) = @_; 2341 my ($self, $path, $x, $y, $check, $done) = @_;
2342
2343 # do generation counting so two concurrent goto's will be executed in-order
2344 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1963 2345
1964 $self->enter_link; 2346 $self->enter_link;
1965 2347
1966 (async { 2348 (async {
1967 my $map = eval { 2349 my $map = eval {
1968 my $map = cf::map::find $path; 2350 my $map = cf::map::find $path;
2351
2352 if ($map) {
1969 $map = $map->customise_for ($self) if $map; 2353 $map = $map->customise_for ($self);
2354 $map = $check->($map) if $check && $map;
2355 } else {
2356 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2357 }
2358
1970 $map 2359 $map
2360 };
2361
2362 if ($@) {
2363 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2364 LOG llevError | logBacktrace, Carp::longmess $@;
1971 } or 2365 }
1972 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1973 2366
2367 if ($gen == $self->{_goto_generation}) {
2368 delete $self->{_goto_generation};
1974 $self->leave_link ($map, $x, $y); 2369 $self->leave_link ($map, $x, $y);
2370 }
2371
2372 $done->() if $done;
1975 })->prio (1); 2373 })->prio (1);
1976} 2374}
1977 2375
1978=item $player_object->enter_exit ($exit_object) 2376=item $player_object->enter_exit ($exit_object)
1979 2377
2048 my $hp = $exit->stats->hp; 2446 my $hp = $exit->stats->hp;
2049 my $sp = $exit->stats->sp; 2447 my $sp = $exit->stats->sp;
2050 2448
2051 $self->enter_link; 2449 $self->enter_link;
2052 2450
2451 # if exit is damned, update players death & WoR home-position
2452 $self->contr->savebed ($slaying, $hp, $sp)
2453 if $exit->flag (FLAG_DAMNED);
2454
2053 (async { 2455 (async {
2054 $self->deactivate_recursive; # just to be sure 2456 $self->deactivate_recursive; # just to be sure
2055 unless (eval { 2457 unless (eval {
2056 $self->goto ($slaying, $hp, $sp); 2458 $self->goto ($slaying, $hp, $sp);
2057 2459
2084 2486
2085 utf8::encode $text; 2487 utf8::encode $text;
2086 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2488 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2087} 2489}
2088 2490
2491=item $client->send_msg ($channel, $msg, $color, [extra...])
2492
2493Send a drawinfo or msg packet to the client, formatting the msg for the
2494client if neccessary. C<$type> should be a string identifying the type of
2495the message, with C<log> being the default. If C<$color> is negative, suppress
2496the message unless the client supports the msg packet.
2497
2498=cut
2499
2500sub cf::client::send_msg {
2501 my ($self, $channel, $msg, $color, @extra) = @_;
2502
2503 $msg = $self->pl->expand_cfpod ($msg);
2504
2505 $color &= cf::NDI_CLIENT_MASK; # just in case...
2506
2507 if (ref $channel) {
2508 # send meta info to client, if not yet sent
2509 unless (exists $self->{channel}{$channel->{id}}) {
2510 $self->{channel}{$channel->{id}} = $channel;
2511 $self->ext_msg (channel_info => $channel);
2512 }
2513
2514 $channel = $channel->{id};
2515 }
2516
2517 return unless @extra || length $msg;
2518
2519 if ($self->can_msg) {
2520 # default colour, mask it out
2521 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2522 if $color & cf::NDI_DEF;
2523
2524 $self->send_packet ("msg " . $self->{json_coder}->encode (
2525 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2526 } else {
2527 if ($color >= 0) {
2528 # replace some tags by gcfclient-compatible ones
2529 for ($msg) {
2530 1 while
2531 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2532 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2533 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2534 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2535 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2536 }
2537
2538 $color &= cf::NDI_COLOR_MASK;
2539
2540 utf8::encode $msg;
2541
2542 if (0 && $msg =~ /\[/) {
2543 # COMMAND/INFO
2544 $self->send_packet ("drawextinfo $color 10 8 $msg")
2545 } else {
2546 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2547 $self->send_packet ("drawinfo $color $msg")
2548 }
2549 }
2550 }
2551}
2552
2089=item $client->ext_event ($type, %msg) 2553=item $client->ext_msg ($type, @msg)
2090 2554
2091Sends an exti event to the client. 2555Sends an ext event to the client.
2092 2556
2093=cut 2557=cut
2094 2558
2095sub cf::client::ext_event($$%) { 2559sub cf::client::ext_msg($$@) {
2096 my ($self, $type, %msg) = @_; 2560 my ($self, $type, @msg) = @_;
2097 2561
2562 my $extcmd = $self->extcmd;
2563
2564 if ($extcmd == 2) {
2565 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2566 } elsif ($extcmd == 1) { # TODO: remove
2098 $msg{msgtype} = "event_$type"; 2567 push @msg, msgtype => "event_$type";
2099 $self->send_packet ("ext " . cf::to_json \%msg); 2568 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2569 }
2100} 2570}
2101 2571
2102=item $success = $client->query ($flags, "text", \&cb) 2572=item $success = $client->query ($flags, "text", \&cb)
2103 2573
2104Queues a query to the client, calling the given callback with 2574Queues a query to the client, calling the given callback with
2105the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2575the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2106C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2576C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2107 2577
2108Queries can fail, so check the return code. Or don't, as queries will become 2578Queries can fail, so check the return code. Or don't, as queries will
2109reliable at some point in the future. 2579become reliable at some point in the future.
2110 2580
2111=cut 2581=cut
2112 2582
2113sub cf::client::query { 2583sub cf::client::query {
2114 my ($self, $flags, $text, $cb) = @_; 2584 my ($self, $flags, $text, $cb) = @_;
2122 utf8::encode $text; 2592 utf8::encode $text;
2123 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2593 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2124 2594
2125 $self->send_packet ($self->{query_queue}[0][0]) 2595 $self->send_packet ($self->{query_queue}[0][0])
2126 if @{ $self->{query_queue} } == 1; 2596 if @{ $self->{query_queue} } == 1;
2597
2598 1
2127} 2599}
2128 2600
2129cf::client->attach ( 2601cf::client->attach (
2602 on_connect => sub {
2603 my ($ns) = @_;
2604
2605 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2606 },
2130 on_reply => sub { 2607 on_reply => sub {
2131 my ($ns, $msg) = @_; 2608 my ($ns, $msg) = @_;
2132 2609
2133 # this weird shuffling is so that direct followup queries 2610 # this weird shuffling is so that direct followup queries
2134 # get handled first 2611 # get handled first
2146 } else { 2623 } else {
2147 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2624 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2148 } 2625 }
2149 } 2626 }
2150 }, 2627 },
2628 on_exticmd => sub {
2629 my ($ns, $buf) = @_;
2630
2631 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2632
2633 if (ref $msg) {
2634 my ($type, $reply, @payload) =
2635 "ARRAY" eq ref $msg
2636 ? @$msg
2637 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2638
2639 if (my $cb = $EXTICMD{$type}) {
2640 my @reply = $cb->($ns, @payload);
2641
2642 $ns->ext_reply ($reply, @reply)
2643 if $reply;
2644 }
2645 } else {
2646 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2647 }
2648
2649 cf::override;
2650 },
2151); 2651);
2152 2652
2153=item $client->async (\&cb) 2653=item $client->async (\&cb)
2154 2654
2155Create a new coroutine, running the specified callback. The coroutine will 2655Create a new coroutine, running the specified callback. The coroutine will
2196our $safe = new Safe "safe"; 2696our $safe = new Safe "safe";
2197our $safe_hole = new Safe::Hole; 2697our $safe_hole = new Safe::Hole;
2198 2698
2199$SIG{FPE} = 'IGNORE'; 2699$SIG{FPE} = 'IGNORE';
2200 2700
2201$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2701$safe->permit_only (Opcode::opset qw(
2702 :base_core :base_mem :base_orig :base_math
2703 grepstart grepwhile mapstart mapwhile
2704 sort time
2705));
2202 2706
2203# here we export the classes and methods available to script code 2707# here we export the classes and methods available to script code
2204 2708
2205=pod 2709=pod
2206 2710
2207The following functions and methods are available within a safe environment: 2711The following functions and methods are available within a safe environment:
2208 2712
2209 cf::object contr pay_amount pay_player map 2713 cf::object
2714 contr pay_amount pay_player map x y force_find force_add
2715 insert remove name archname title slaying race
2716
2210 cf::object::player player 2717 cf::object::player
2211 cf::player peaceful 2718 player
2212 cf::map trigger 2719
2720 cf::player
2721 peaceful
2722
2723 cf::map
2724 trigger
2213 2725
2214=cut 2726=cut
2215 2727
2216for ( 2728for (
2217 ["cf::object" => qw(contr pay_amount pay_player map)], 2729 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2730 insert remove inv name archname title slaying race)],
2218 ["cf::object::player" => qw(player)], 2731 ["cf::object::player" => qw(player)],
2219 ["cf::player" => qw(peaceful)], 2732 ["cf::player" => qw(peaceful)],
2220 ["cf::map" => qw(trigger)], 2733 ["cf::map" => qw(trigger)],
2221) { 2734) {
2222 no strict 'refs'; 2735 no strict 'refs';
2293=back 2806=back
2294 2807
2295=cut 2808=cut
2296 2809
2297############################################################################# 2810#############################################################################
2298
2299=head2 EXTENSION DATABASE SUPPORT
2300
2301Crossfire maintains a very simple database for extension use. It can
2302currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2303convert to/from binary).
2304
2305The parameter C<$family> should best start with the name of the extension
2306using it, it should be unique.
2307
2308=over 4
2309
2310=item $value = cf::db_get $family => $key
2311
2312Returns a single value from the database.
2313
2314=item cf::db_put $family => $key => $value
2315
2316Stores the given C<$value> in the family.
2317
2318=cut
2319
2320our $DB;
2321
2322sub db_init {
2323 unless ($DB) {
2324 $DB = BDB::db_create $DB_ENV;
2325
2326 cf::sync_job {
2327 eval {
2328 $DB->set_flags (BDB::CHKSUM);
2329
2330 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2331 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2332 cf::cleanup "db_open(db): $!" if $!;
2333 };
2334 cf::cleanup "db_open(db): $@" if $@;
2335 };
2336 }
2337}
2338
2339sub db_get($$) {
2340 my $key = "$_[0]/$_[1]";
2341
2342 cf::sync_job {
2343 BDB::db_get $DB, undef, $key, my $data;
2344
2345 $! ? ()
2346 : $data
2347 }
2348}
2349
2350sub db_put($$$) {
2351 BDB::dbreq_pri 4;
2352 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2353}
2354
2355=item cf::cache $id => [$paths...], $processversion => $process
2356
2357Generic caching function that returns the value of the resource $id,
2358caching and regenerating as required.
2359
2360This function can block.
2361
2362=cut
2363
2364sub cache {
2365 my ($id, $src, $processversion, $process) = @_;
2366
2367 my $meta =
2368 join "\x00",
2369 $processversion,
2370 map {
2371 aio_stat $_
2372 and Carp::croak "$_: $!";
2373
2374 ($_, (stat _)[7,9])
2375 } @$src;
2376
2377 my $dbmeta = db_get cache => "$id/meta";
2378 if ($dbmeta ne $meta) {
2379 # changed, we may need to process
2380
2381 my @data;
2382 my $md5;
2383
2384 for (0 .. $#$src) {
2385 0 <= aio_load $src->[$_], $data[$_]
2386 or Carp::croak "$src->[$_]: $!";
2387 }
2388
2389 # if processing is expensive, check
2390 # checksum first
2391 if (1) {
2392 $md5 =
2393 join "\x00",
2394 $processversion,
2395 map {
2396 Coro::cede;
2397 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2398 } 0.. $#$src;
2399
2400
2401 my $dbmd5 = db_get cache => "$id/md5";
2402 if ($dbmd5 eq $md5) {
2403 db_put cache => "$id/meta", $meta;
2404
2405 return db_get cache => "$id/data";
2406 }
2407 }
2408
2409 my $t1 = Time::HiRes::time;
2410 my $data = $process->(\@data);
2411 my $t2 = Time::HiRes::time;
2412
2413 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2414
2415 db_put cache => "$id/data", $data;
2416 db_put cache => "$id/md5" , $md5;
2417 db_put cache => "$id/meta", $meta;
2418
2419 return $data;
2420 }
2421
2422 db_get cache => "$id/data"
2423}
2424
2425=item fork_call { }, $args
2426
2427Executes the given code block with the given arguments in a seperate
2428process, returning the results. Everything must be serialisable with
2429Coro::Storable. May, of course, block. Note that the executed sub may
2430never block itself or use any form of Event handling.
2431
2432=cut
2433
2434sub fork_call(&@) {
2435 my ($cb, @args) = @_;
2436
2437# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2438# or die "socketpair: $!";
2439 pipe my $fh1, my $fh2
2440 or die "pipe: $!";
2441
2442 if (my $pid = fork) {
2443 close $fh2;
2444
2445 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2446 $res = Coro::Storable::thaw $res;
2447
2448 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2449
2450 die $$res unless "ARRAY" eq ref $res;
2451
2452 return wantarray ? @$res : $res->[-1];
2453 } else {
2454 reset_signals;
2455 local $SIG{__WARN__};
2456 local $SIG{__DIE__};
2457 eval {
2458 close $fh1;
2459
2460 my @res = eval { $cb->(@args) };
2461 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2462 };
2463
2464 warn $@ if $@;
2465 _exit 0;
2466 }
2467}
2468
2469
2470
2471#############################################################################
2472# the server's init and main functions 2811# the server's init and main functions
2473 2812
2474sub load_facedata($) { 2813sub load_facedata($) {
2475 my ($path) = @_; 2814 my ($path) = @_;
2815
2816 my $enc = JSON::XS->new->utf8->canonical;
2476 2817
2477 warn "loading facedata from $path\n"; 2818 warn "loading facedata from $path\n";
2478 2819
2479 my $facedata; 2820 my $facedata;
2480 0 < aio_load $path, $facedata 2821 0 < aio_load $path, $facedata
2483 $facedata = Coro::Storable::thaw $facedata; 2824 $facedata = Coro::Storable::thaw $facedata;
2484 2825
2485 $facedata->{version} == 2 2826 $facedata->{version} == 2
2486 or cf::cleanup "$path: version mismatch, cannot proceed."; 2827 or cf::cleanup "$path: version mismatch, cannot proceed.";
2487 2828
2829 # patch in the exptable
2830 $facedata->{resource}{"res/exp_table"} = {
2831 type => FT_RSRC,
2832 data => $enc->encode ([map cf::level_to_min_exp $_, 0 .. cf::settings->max_level]),
2833 };
2834 cf::cede_to_tick;
2835
2488 { 2836 {
2489 my $faces = $facedata->{faceinfo}; 2837 my $faces = $facedata->{faceinfo};
2490 2838
2491 while (my ($face, $info) = each %$faces) { 2839 while (my ($face, $info) = each %$faces) {
2492 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2840 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2493 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2841 cf::face::set_visibility $idx, $info->{visibility};
2842 cf::face::set_magicmap $idx, $info->{magicmap};
2494 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2843 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2495 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2844 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2496 Coro::cede; 2845
2846 cf::cede_to_tick;
2497 } 2847 }
2498 2848
2499 while (my ($face, $info) = each %$faces) { 2849 while (my ($face, $info) = each %$faces) {
2500 next unless $info->{smooth}; 2850 next unless $info->{smooth};
2501 my $idx = cf::face::find $face 2851 my $idx = cf::face::find $face
2502 or next; 2852 or next;
2503 if (my $smooth = cf::face::find $info->{smooth}) { 2853 if (my $smooth = cf::face::find $info->{smooth}) {
2854 cf::face::set_smooth $idx, $smooth;
2504 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2855 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2505 } else { 2856 } else {
2506 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2857 warn "smooth face '$info->{smooth}' not found for face '$face'";
2507 } 2858 }
2508 Coro::cede; 2859
2860 cf::cede_to_tick;
2509 } 2861 }
2510 } 2862 }
2511 2863
2512 { 2864 {
2513 my $anims = $facedata->{animinfo}; 2865 my $anims = $facedata->{animinfo};
2514 2866
2515 while (my ($anim, $info) = each %$anims) { 2867 while (my ($anim, $info) = each %$anims) {
2516 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2868 cf::anim::set $anim, $info->{frames}, $info->{facings};
2517 Coro::cede; 2869 cf::cede_to_tick;
2518 } 2870 }
2519 2871
2520 cf::anim::invalidate_all; # d'oh 2872 cf::anim::invalidate_all; # d'oh
2521 } 2873 }
2522 2874
2875 {
2876 # TODO: for gcfclient pleasure, we should give resources
2877 # that gcfclient doesn't grok a >10000 face index.
2878 my $res = $facedata->{resource};
2879
2880 my $soundconf = delete $res->{"res/sound.conf"};
2881
2882 while (my ($name, $info) = each %$res) {
2883 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2884 my $data;
2885
2886 if ($info->{type} & 1) {
2887 # prepend meta info
2888
2889 my $meta = $enc->encode ({
2890 name => $name,
2891 %{ $info->{meta} || {} },
2892 });
2893
2894 $data = pack "(w/a*)*", $meta, $info->{data};
2895 }
2896
2897 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2898 cf::face::set_type $idx, $info->{type};
2899
2900 cf::cede_to_tick;
2901 }
2902
2903 if ($soundconf) {
2904 $soundconf = $enc->decode (delete $soundconf->{data});
2905
2906 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2907 my $sound = $soundconf->{compat}[$_]
2908 or next;
2909
2910 my $face = cf::face::find "sound/$sound->[1]";
2911 cf::sound::set $sound->[0] => $face;
2912 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2913 }
2914
2915 while (my ($k, $v) = each %{$soundconf->{event}}) {
2916 my $face = cf::face::find "sound/$v";
2917 cf::sound::set $k => $face;
2918 }
2919 }
2920 }
2921
2523 1 2922 1
2524} 2923}
2924
2925register_exticmd fx_want => sub {
2926 my ($ns, $want) = @_;
2927
2928 while (my ($k, $v) = each %$want) {
2929 $ns->fx_want ($k, $v);
2930 }
2931};
2525 2932
2526sub reload_regions { 2933sub reload_regions {
2527 load_resource_file "$MAPDIR/regions" 2934 load_resource_file "$MAPDIR/regions"
2528 or die "unable to load regions file\n"; 2935 or die "unable to load regions file\n";
2936
2937 for (cf::region::list) {
2938 $_->{match} = qr/$_->{match}/
2939 if exists $_->{match};
2940 }
2529} 2941}
2530 2942
2531sub reload_facedata { 2943sub reload_facedata {
2532 load_facedata "$DATADIR/facedata" 2944 load_facedata "$DATADIR/facedata"
2533 or die "unable to load facedata\n"; 2945 or die "unable to load facedata\n";
2534} 2946}
2535 2947
2536sub reload_archetypes { 2948sub reload_archetypes {
2537 load_resource_file "$DATADIR/archetypes" 2949 load_resource_file "$DATADIR/archetypes"
2538 or die "unable to load archetypes\n"; 2950 or die "unable to load archetypes\n";
2951 #d# NEED to laod twice to resolve forward references
2952 # this really needs to be done in an extra post-pass
2953 # (which needs to be synchronous, so solve it differently)
2954 load_resource_file "$DATADIR/archetypes"
2955 or die "unable to load archetypes\n";
2539} 2956}
2540 2957
2541sub reload_treasures { 2958sub reload_treasures {
2542 load_resource_file "$DATADIR/treasures" 2959 load_resource_file "$DATADIR/treasures"
2543 or die "unable to load treasurelists\n"; 2960 or die "unable to load treasurelists\n";
2546sub reload_resources { 2963sub reload_resources {
2547 warn "reloading resource files...\n"; 2964 warn "reloading resource files...\n";
2548 2965
2549 reload_regions; 2966 reload_regions;
2550 reload_facedata; 2967 reload_facedata;
2968 #reload_archetypes;#d#
2551 reload_archetypes; 2969 reload_archetypes;
2552 reload_treasures; 2970 reload_treasures;
2553 2971
2554 warn "finished reloading resource files\n"; 2972 warn "finished reloading resource files\n";
2555} 2973}
2612 }, 3030 },
2613 ); 3031 );
2614 } 3032 }
2615} 3033}
2616 3034
3035sub write_runtime {
3036 my $runtime = "$LOCALDIR/runtime";
3037
3038 # first touch the runtime file to show we are still running:
3039 # the fsync below can take a very very long time.
3040
3041 IO::AIO::aio_utime $runtime, undef, undef;
3042
3043 my $guard = cf::lock_acquire "write_runtime";
3044
3045 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3046 or return;
3047
3048 my $value = $cf::RUNTIME + 90 + 10;
3049 # 10 is the runtime save interval, for a monotonic clock
3050 # 60 allows for the watchdog to kill the server.
3051
3052 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3053 and return;
3054
3055 # always fsync - this file is important
3056 aio_fsync $fh
3057 and return;
3058
3059 # touch it again to show we are up-to-date
3060 aio_utime $fh, undef, undef;
3061
3062 close $fh
3063 or return;
3064
3065 aio_rename "$runtime~", $runtime
3066 and return;
3067
3068 warn "runtime file written.\n";
3069
3070 1
3071}
3072
2617sub emergency_save() { 3073sub emergency_save() {
2618 my $freeze_guard = cf::freeze_mainloop; 3074 my $freeze_guard = cf::freeze_mainloop;
2619 3075
2620 warn "enter emergency perl save\n"; 3076 warn "enter emergency perl save\n";
2621 3077
2696 %EXT_CORO = (); 3152 %EXT_CORO = ();
2697 3153
2698 warn "removing commands"; 3154 warn "removing commands";
2699 %COMMAND = (); 3155 %COMMAND = ();
2700 3156
2701 warn "removing ext commands"; 3157 warn "removing ext/exti commands";
2702 %EXTCMD = (); 3158 %EXTCMD = ();
3159 %EXTICMD = ();
2703 3160
2704 warn "unloading/nuking all extensions"; 3161 warn "unloading/nuking all extensions";
2705 for my $pkg (@EXTS) { 3162 for my $pkg (@EXTS) {
2706 warn "... unloading $pkg"; 3163 warn "... unloading $pkg";
2707 3164
2825 my $signal = new Coro::Signal; 3282 my $signal = new Coro::Signal;
2826 push @WAIT_FOR_TICK_BEGIN, $signal; 3283 push @WAIT_FOR_TICK_BEGIN, $signal;
2827 $signal->wait; 3284 $signal->wait;
2828} 3285}
2829 3286
3287 my $min = 1e6;#d#
3288 my $avg = 10;
2830$TICK_WATCHER = Event->timer ( 3289$TICK_WATCHER = Event->timer (
2831 reentrant => 0, 3290 reentrant => 0,
2832 parked => 1, 3291 parked => 1,
2833 prio => 0, 3292 prio => 0,
2834 at => $NEXT_TICK || $TICK, 3293 at => $NEXT_TICK || $TICK,
2838 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3297 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2839 unless ++$bug_warning > 10; 3298 unless ++$bug_warning > 10;
2840 return; 3299 return;
2841 } 3300 }
2842 3301
2843 $NOW = Event::time; 3302 $NOW = $tick_start = Event::time;
2844 3303
2845 cf::server_tick; # one server iteration 3304 cf::server_tick; # one server iteration
3305
3306 0 && sync_job {#d#
3307 for(1..10) {
3308 my $t = Event::time;
3309 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3310 or die;
3311
3312 $map->width (50);
3313 $map->height (50);
3314 $map->alloc;
3315 $map->_load_objects ("/tmp/x.map", 1);
3316 my $t = Event::time - $t;
3317
3318 #next unless $t < 0.0013;#d#
3319 if ($t < $min) {
3320 $min = $t;
3321 }
3322 $avg = $avg * 0.99 + $t * 0.01;
3323 }
3324 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3325 exit 0;
3326 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3327 };
2846 3328
2847 $RUNTIME += $TICK; 3329 $RUNTIME += $TICK;
2848 $NEXT_TICK += $TICK; 3330 $NEXT_TICK += $TICK;
2849 3331
2850 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3332 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2856 } 3338 }
2857 3339
2858# my $AFTER = Event::time; 3340# my $AFTER = Event::time;
2859# warn $AFTER - $NOW;#d# 3341# warn $AFTER - $NOW;#d#
2860 3342
3343 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3344 $sig->send;
3345 }
3346 while (my $sig = shift @WAIT_FOR_TICK) {
3347 $sig->send;
3348 }
3349
3350 $NOW = Event::time;
3351
2861 # if we are delayed by four ticks or more, skip them all 3352 # if we are delayed by four ticks or more, skip them all
2862 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3353 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2863 3354
2864 $TICK_WATCHER->at ($NEXT_TICK); 3355 $TICK_WATCHER->at ($NEXT_TICK);
2865 $TICK_WATCHER->start; 3356 $TICK_WATCHER->start;
2866 3357
2867 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3358 $LOAD = ($NOW - $tick_start) / $TICK;
2868 $sig->send; 3359 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2869 }
2870 while (my $sig = shift @WAIT_FOR_TICK) {
2871 $sig->send;
2872 }
2873 3360
2874 _post_tick; 3361 _post_tick;
3362
3363
2875 }, 3364 },
2876); 3365);
2877 3366
2878{ 3367{
2879 BDB::max_poll_time $TICK * 0.1; 3368 BDB::max_poll_time $TICK * 0.1;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines