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.263 by root, Sat May 5 05:40:27 2007 UTC vs.
Revision 1.334 by root, Mon Aug 20 22:09:04 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 $guard = cf::lock_acquire "write_runtime";
373 470
374 my $runtime = "$LOCALDIR/runtime"; 471Executes the given code block with the given arguments in a seperate
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.
375 475
376 warn "starting to write runtime...\n";#d# 476=cut
377 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
378 or return;
379 477
380 my $value = $cf::RUNTIME + 90 + 10; 478sub fork_call(&@) {
381 # 10 is the runtime save interval, for a monotonic clock 479 my ($cb, @args) = @_;
382 # 60 allows for the watchdog to kill the server.
383 480
384 (aio_write $fh, 0, (length $value), $value, 0) <= 0 481 # we seemingly have to make a local copy of the whole thing,
385 and return; 482 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious)
386 484
387 # always fsync - this file is important 485 my @res = Coro::Util::fork_eval {
388 aio_fsync $fh 486 reset_signals;
389 and return; 487 &$cb
488 }, @args;
390 489
391 close $fh 490 wantarray ? @res : $res[-1]
392 or return; 491}
393 492
394 aio_rename "$runtime~", $runtime 493=item $value = cf::db_get $family => $key
395 and return;
396 494
397 warn "... done writing runtime.\n";#d# 495Returns a single value from the environment database.
398 496
497=item cf::db_put $family => $key => $value
498
499Stores the given C<$value> in the family. It can currently store binary
500data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
501
502=cut
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 };
399 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"
400} 607}
401 608
402=item cf::datalog type => key => value, ... 609=item cf::datalog type => key => value, ...
403 610
404Log 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.
422attach callbacks/event handlers (a collection of which is called an "attachment") 629attach callbacks/event handlers (a collection of which is called an "attachment")
423to it. All such attachable objects support the following methods. 630to it. All such attachable objects support the following methods.
424 631
425In 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>
426C<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
427crossfire+). 634Crossfire TRT).
428 635
429=over 4 636=over 4
430 637
431=item $attachable->attach ($attachment, key => $value...) 638=item $attachable->attach ($attachment, key => $value...)
432 639
595 $registry = $CB_TYPE[$object_type] ||= []; 802 $registry = $CB_TYPE[$object_type] ||= [];
596 803
597 } elsif ($type eq "subtype") { 804 } elsif ($type eq "subtype") {
598 defined $object_type or Carp::croak "subtype specified without type"; 805 defined $object_type or Carp::croak "subtype specified without type";
599 my $object_subtype = shift @arg; 806 my $object_subtype = shift @arg;
600 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 807 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
601 808
602 } elsif ($type eq "package") { 809 } elsif ($type eq "package") {
603 my $pkg = shift @arg; 810 my $pkg = shift @arg;
604 811
605 while (my ($name, $id) = each %cb_id) { 812 while (my ($name, $id) = each %cb_id) {
634 _attach $registry, $klass, @attach; 841 _attach $registry, $klass, @attach;
635 } 842 }
636 843
637 $obj->{$name} = \%arg; 844 $obj->{$name} = \%arg;
638 } else { 845 } else {
639 warn "object uses attachment '$name' that is not available, postponing.\n"; 846 warn "object uses attachment '$name' which is not available, postponing.\n";
640 } 847 }
641 848
642 $obj->{_attachment}{$name} = undef; 849 $obj->{_attachment}{$name} = undef;
643} 850}
644 851
646 if (ref $_[0]) { 853 if (ref $_[0]) {
647 _object_attach @_; 854 _object_attach @_;
648 } else { 855 } else {
649 _attach shift->_attach_registry, @_; 856 _attach shift->_attach_registry, @_;
650 } 857 }
858 _recalc_want;
651}; 859};
652 860
653# all those should be optimised 861# all those should be optimised
654sub cf::attachable::detach { 862sub cf::attachable::detach {
655 my ($obj, $name) = @_; 863 my ($obj, $name) = @_;
658 delete $obj->{_attachment}{$name}; 866 delete $obj->{_attachment}{$name};
659 reattach ($obj); 867 reattach ($obj);
660 } else { 868 } else {
661 Carp::croak "cannot, currently, detach class attachments"; 869 Carp::croak "cannot, currently, detach class attachments";
662 } 870 }
871 _recalc_want;
663}; 872};
664 873
665sub cf::attachable::attached { 874sub cf::attachable::attached {
666 my ($obj, $name) = @_; 875 my ($obj, $name) = @_;
667 876
682 "; 891 ";
683 die if $@; 892 die if $@;
684} 893}
685 894
686our $override; 895our $override;
687our @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?
688 897
689sub override { 898sub override {
690 $override = 1; 899 $override = 1;
691 @invoke_results = (); 900 @INVOKE_RESULTS = (@_);
692} 901}
693 902
694sub do_invoke { 903sub do_invoke {
695 my $event = shift; 904 my $event = shift;
696 my $callbacks = shift; 905 my $callbacks = shift;
697 906
698 @invoke_results = (); 907 @INVOKE_RESULTS = ();
699 908
700 local $override; 909 local $override;
701 910
702 for (@$callbacks) { 911 for (@$callbacks) {
703 eval { &{$_->[1]} }; 912 eval { &{$_->[1]} };
720 929
721Generate an object-specific event with the given arguments. 930Generate an object-specific event with the given arguments.
722 931
723This 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
724removed 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
725results (if you must, access C<@cf::invoke_results> directly). 934results (if you must, access C<@cf::INVOKE_RESULTS> directly).
726 935
727=back 936=back
728 937
729=cut 938=cut
730 939
731############################################################################# 940#############################################################################
732# 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}
733 953
734sub reattach { 954sub reattach {
735 # basically do the same as instantiate, without calling instantiate 955 # basically do the same as instantiate, without calling instantiate
736 my ($obj) = @_; 956 my ($obj) = @_;
737 957
840 or return; 1060 or return;
841 $av = eval { (Storable::thaw $av)->{objs} }; 1061 $av = eval { (Storable::thaw $av)->{objs} };
842 } 1062 }
843 1063
844 warn sprintf "loading %s (%d)\n", 1064 warn sprintf "loading %s (%d)\n",
845 $filename, length $data, scalar @{$av || []};#d# 1065 $filename, length $data, scalar @{$av || []};
846 return ($data, $av); 1066 return ($data, $av);
847} 1067}
1068
1069=head2 COMMAND CALLBACKS
1070
1071=over 4
1072
1073=cut
848 1074
849############################################################################# 1075#############################################################################
850# command handling &c 1076# command handling &c
851 1077
852=item cf::register_command $name => \&callback($ob,$args); 1078=item cf::register_command $name => \&callback($ob,$args);
865 push @{ $COMMAND{$name} }, [$caller, $cb]; 1091 push @{ $COMMAND{$name} }, [$caller, $cb];
866} 1092}
867 1093
868=item cf::register_extcmd $name => \&callback($pl,$packet); 1094=item cf::register_extcmd $name => \&callback($pl,$packet);
869 1095
870Register 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.
871 1101
872If 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
873called. 1103called.
874 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
875=cut 1116=cut
876 1117
877sub register_extcmd { 1118sub register_extcmd {
878 my ($name, $cb) = @_; 1119 my ($name, $cb) = @_;
879 1120
880 $EXTCMD{$name} = $cb; 1121 $EXTCMD{$name} = $cb;
1122}
1123
1124sub register_exticmd {
1125 my ($name, $cb) = @_;
1126
1127 $EXTICMD{$name} = $cb;
881} 1128}
882 1129
883cf::player->attach ( 1130cf::player->attach (
884 on_command => sub { 1131 on_command => sub {
885 my ($pl, $name, $params) = @_; 1132 my ($pl, $name, $params) = @_;
894 cf::override; 1141 cf::override;
895 }, 1142 },
896 on_extcmd => sub { 1143 on_extcmd => sub {
897 my ($pl, $buf) = @_; 1144 my ($pl, $buf) = @_;
898 1145
899 my $msg = eval { from_json $buf }; 1146 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
900 1147
901 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
902 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1154 if (my $cb = $EXTCMD{$type}) {
903 if (my %reply = $cb->($pl, $msg)) { 1155 my @reply = $cb->($pl, @payload);
1156
904 $pl->ext_reply ($msg->{msgid}, %reply); 1157 $pl->ext_reply ($reply, @reply)
905 } 1158 if $reply;
906 } 1159 }
907 } else { 1160 } else {
908 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
909 } 1162 }
910 1163
911 cf::override; 1164 cf::override;
912 }, 1165 },
913); 1166);
914 1167
915sub load_extension {
916 my ($path) = @_;
917
918 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
919 my $base = $1;
920 my $pkg = $1;
921 $pkg =~ s/[^[:word:]]/_/g;
922 $pkg = "ext::$pkg";
923
924 warn "... loading '$path' into '$pkg'\n";
925
926 open my $fh, "<:utf8", $path
927 or die "$path: $!";
928
929 my $source =
930 "package $pkg; use strict; use utf8;\n"
931 . "#line 1 \"$path\"\n{\n"
932 . (do { local $/; <$fh> })
933 . "\n};\n1";
934
935 unless (eval $source) {
936 my $msg = $@ ? "$path: $@\n"
937 : "extension disabled.\n";
938 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
939 warn $@;
940 warn "mandatory extension failed to load, exiting.\n";
941 exit 1;
942 }
943 die $@;
944 }
945
946 push @EXTS, $pkg;
947}
948
949sub load_extensions { 1168sub load_extensions {
1169 cf::sync_job {
1170 my %todo;
1171
950 for my $ext (<$LIBDIR/*.ext>) { 1172 for my $path (<$LIBDIR/*.ext>) {
951 next unless -r $ext; 1173 next unless -r $path;
952 eval { 1174
953 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;
954 1 1232 }
955 } or warn "$ext not loaded: $@"; 1233
1234 skip:
1235 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1236 unless $progress;
1237 }
956 } 1238 };
957} 1239}
958 1240
959############################################################################# 1241#############################################################################
1242
1243=back
960 1244
961=head2 CORE EXTENSIONS 1245=head2 CORE EXTENSIONS
962 1246
963Functions and methods that extend core crossfire objects. 1247Functions and methods that extend core crossfire objects.
964 1248
1051 $cf::PLAYER{$login} = $self; 1335 $cf::PLAYER{$login} = $self;
1052 1336
1053 $self 1337 $self
1054} 1338}
1055 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
1056=item $pl->quit_character 1350=item $pl->quit_character
1057 1351
1058Nukes the player without looking back. If logged in, the connection will 1352Nukes the player without looking back. If logged in, the connection will
1059be destroyed. May block for a long time. 1353be destroyed. May block for a long time.
1060 1354
1152 } 1446 }
1153 1447
1154 \@paths 1448 \@paths
1155} 1449}
1156 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
1157=item $player->ext_reply ($msgid, %msg) 1501=item $player->ext_reply ($msgid, @msg)
1158 1502
1159Sends an ext reply to the player. 1503Sends an ext reply to the player.
1160 1504
1161=cut 1505=cut
1162 1506
1163sub ext_reply($$%) { 1507sub ext_reply($$@) {
1164 my ($self, $id, %msg) = @_; 1508 my ($self, $id, @msg) = @_;
1165 1509
1166 $msg{msgid} = $id; 1510 if ($self->ns->extcmd == 2) {
1167 1511 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1168 $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 }
1169} 1517}
1170 1518
1171=item $player->ext_event ($type, %msg) 1519=item $player->ext_msg ($type, @msg)
1172 1520
1173Sends an ext event to the client. 1521Sends an ext event to the client.
1174 1522
1175=cut 1523=cut
1176 1524
1177sub ext_event($$%) { 1525sub ext_msg($$@) {
1178 my ($self, $type, %msg) = @_; 1526 my ($self, $type, @msg) = @_;
1179 1527
1180 $self->ns->ext_event ($type, %msg); 1528 $self->ns->ext_msg ($type, @msg);
1181} 1529}
1182 1530
1183=head3 cf::region 1531=head3 cf::region
1184 1532
1185=over 4 1533=over 4
1188 1536
1189package cf::region; 1537package cf::region;
1190 1538
1191=item cf::region::find_by_path $path 1539=item cf::region::find_by_path $path
1192 1540
1193Tries 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.
1194 1542
1195=cut 1543=cut
1196 1544
1197sub find_by_path($) { 1545sub find_by_path($) {
1198 my ($path) = @_; 1546 my ($path) = @_;
1199 1547
1200 my ($match, $specificity); 1548 my ($match, $specificity);
1201 1549
1202 for my $region (list) { 1550 for my $region (list) {
1203 if ($region->match && $path =~ $region->match) { 1551 if ($region->{match} && $path =~ $region->{match}) {
1204 ($match, $specificity) = ($region, $region->specificity) 1552 ($match, $specificity) = ($region, $region->specificity)
1205 if $region->specificity > $specificity; 1553 if $region->specificity > $specificity;
1206 } 1554 }
1207 } 1555 }
1208 1556
1272 my ($self, $merge) = @_; 1620 my ($self, $merge) = @_;
1273 1621
1274 # we have to keep some variables in memory intact 1622 # we have to keep some variables in memory intact
1275 local $self->{path}; 1623 local $self->{path};
1276 local $self->{load_path}; 1624 local $self->{load_path};
1277 local $self->{deny_save};
1278 local $self->{deny_reset};
1279 1625
1280 $self->SUPER::thawer_merge ($merge); 1626 $self->SUPER::thawer_merge ($merge);
1281} 1627}
1282 1628
1283sub normalise { 1629sub normalise {
1330 $self->init; # pass $1 etc. 1676 $self->init; # pass $1 etc.
1331 return $self; 1677 return $self;
1332 } 1678 }
1333 } 1679 }
1334 1680
1335 Carp::carp "unable to resolve path '$path' (base '$base')."; 1681 Carp::cluck "unable to resolve path '$path' (base '$base').";
1336 () 1682 ()
1337} 1683}
1338 1684
1339sub init { 1685sub init {
1340 my ($self) = @_; 1686 my ($self) = @_;
1381sub change_all_map_light { 1727sub change_all_map_light {
1382 my ($change) = @_; 1728 my ($change) = @_;
1383 1729
1384 $_->change_map_light ($change) 1730 $_->change_map_light ($change)
1385 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;
1386} 1740}
1387 1741
1388sub unlink_save { 1742sub unlink_save {
1389 my ($self) = @_; 1743 my ($self) = @_;
1390 1744
1448 $self->load_header_orig 1802 $self->load_header_orig
1449 or return; 1803 or return;
1450 $self->prepare_orig; 1804 $self->prepare_orig;
1451 } 1805 }
1452 1806
1807 $self->{deny_reset} = 1
1808 if $self->no_reset;
1809
1453 $self->default_region (cf::region::find_by_path $self->{path}) 1810 $self->default_region (cf::region::find_by_path $self->{path})
1454 unless $self->default_region; 1811 unless $self->default_region;
1455 1812
1456 1 1813 1
1457} 1814}
1472 $map->{last_save} = $cf::RUNTIME; 1829 $map->{last_save} = $cf::RUNTIME;
1473 1830
1474 $map->load_header 1831 $map->load_header
1475 or return; 1832 or return;
1476 1833
1477 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1478 # doing this can freeze the server in a sync job, obviously 1835 # doing this can freeze the server in a sync job, obviously
1479 #$cf::WAIT_FOR_TICK->wait; 1836 #$cf::WAIT_FOR_TICK->wait;
1480 $map->reset; 1837 $map->reset;
1481 undef $guard; 1838 undef $guard;
1482 return find $path; 1839 return find $path;
1537 $self->set_darkness_map; 1894 $self->set_darkness_map;
1538 Coro::cede; 1895 Coro::cede;
1539 $self->activate; 1896 $self->activate;
1540 } 1897 }
1541 1898
1899 $self->{last_save} = $cf::RUNTIME;
1900 $self->last_access ($cf::RUNTIME);
1901
1542 $self->in_memory (cf::MAP_IN_MEMORY); 1902 $self->in_memory (cf::MAP_IN_MEMORY);
1543 } 1903 }
1544 1904
1545 $self->post_load; 1905 $self->post_load;
1546} 1906}
1549 my ($self, $ob) = @_; 1909 my ($self, $ob) = @_;
1550 1910
1551 return find "~" . $ob->name . "/" . $self->{path} 1911 return find "~" . $ob->name . "/" . $self->{path}
1552 if $self->per_player; 1912 if $self->per_player;
1553 1913
1914# return find "?party/" . $ob->name . "/" . $self->{path}
1915# if $self->per_party;
1916
1554 $self 1917 $self
1555} 1918}
1556 1919
1557# 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
1558sub load_diag { 1921sub load_neighbours {
1559 my ($map) = @_; 1922 my ($map) = @_;
1560 1923
1561 my @diag; # diagonal neighbours 1924 my @neigh; # diagonal neighbours
1562 1925
1563 for (0 .. 3) { 1926 for (0 .. 3) {
1564 my $neigh = $map->tile_path ($_) 1927 my $neigh = $map->tile_path ($_)
1565 or next; 1928 or next;
1566 $neigh = find $neigh, $map 1929 $neigh = find $neigh, $map
1567 or next; 1930 or next;
1568 $neigh->load; 1931 $neigh->load;
1569 1932
1933 push @neigh,
1570 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1934 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1571 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1935 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1572 } 1936 }
1573 1937
1574 for (@diag) { 1938 for (grep defined $_->[0], @neigh) {
1939 my ($path, $origin) = @$_;
1575 my $neigh = find @$_ 1940 my $neigh = find $path, $origin
1576 or next; 1941 or next;
1577 $neigh->load; 1942 $neigh->load;
1578 } 1943 }
1579} 1944}
1580 1945
1604 1969
1605 undef $MAP_PREFETCH{$path}; 1970 undef $MAP_PREFETCH{$path};
1606 $MAP_PREFETCHER ||= cf::async { 1971 $MAP_PREFETCHER ||= cf::async {
1607 while (%MAP_PREFETCH) { 1972 while (%MAP_PREFETCH) {
1608 for my $path (keys %MAP_PREFETCH) { 1973 for my $path (keys %MAP_PREFETCH) {
1609 my $map = find $path 1974 if (my $map = find $path) {
1610 or next;
1611 $map->load; 1975 $map->load;
1976 }
1612 1977
1613 delete $MAP_PREFETCH{$path}; 1978 delete $MAP_PREFETCH{$path};
1614 } 1979 }
1615 } 1980 }
1616 undef $MAP_PREFETCHER; 1981 undef $MAP_PREFETCHER;
1668 2033
1669sub reset_at { 2034sub reset_at {
1670 my ($self) = @_; 2035 my ($self) = @_;
1671 2036
1672 # TODO: safety, remove and allow resettable per-player maps 2037 # TODO: safety, remove and allow resettable per-player maps
1673 return 1e99 if $self->isa ("ext::map_per_player");#d#
1674 return 1e99 if $self->{deny_reset}; 2038 return 1e99 if $self->{deny_reset};
1675 2039
1676 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2040 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1677 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;
1678 2042
1689 my ($self) = @_; 2053 my ($self) = @_;
1690 2054
1691 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2055 my $lock = cf::lock_acquire "map_data:$self->{path}";
1692 2056
1693 return if $self->players; 2057 return if $self->players;
1694 return if $self->isa ("ext::map_per_player");#d#
1695 2058
1696 warn "resetting map ", $self->path;#d# 2059 warn "resetting map ", $self->path;
1697 2060
1698 $self->in_memory (cf::MAP_SWAPPED); 2061 $self->in_memory (cf::MAP_SWAPPED);
1699 2062
1700 # need to save uniques path 2063 # need to save uniques path
1701 unless ($self->{deny_save}) { 2064 unless ($self->{deny_save}) {
1733 $cf::MAP{$self->path} = $self; 2096 $cf::MAP{$self->path} = $self;
1734 2097
1735 $self->reset; # polite request, might not happen 2098 $self->reset; # polite request, might not happen
1736} 2099}
1737 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
1738=item cf::map::unique_maps 2137=item cf::map::unique_maps
1739 2138
1740Returns an arrayref of paths of all shared maps that have 2139Returns an arrayref of paths of all shared maps that have
1741instantiated unique items. May block. 2140instantiated unique items. May block.
1742 2141
1743=cut 2142=cut
1744 2143
1745sub unique_maps() { 2144sub unique_maps() {
1746 my $files = aio_readdir $UNIQUEDIR 2145 [
1747 or return; 2146 map {
1748
1749 my @paths;
1750
1751 for (@$files) {
1752 utf8::decode $_; 2147 utf8::decode $_;
1753 next if /\.pst$/; 2148 /\.map$/
1754 next unless /^$PATH_SEP/o; 2149 ? normalise $_
1755 2150 : ()
1756 push @paths, cf::map::normalise $_; 2151 } @{ aio_readdir $UNIQUEDIR or [] }
1757 } 2152 ]
1758
1759 \@paths
1760} 2153}
1761 2154
1762package cf; 2155package cf;
1763 2156
1764=back 2157=back
1810 2203
1811 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2204 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1812 2205
1813 if ($self->{record_replies}) { 2206 if ($self->{record_replies}) {
1814 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2207 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2208
1815 } 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 {
1816 $msg = $npc->name . " says: $msg" if $npc; 2217 $msg = $npc->name . " says: $msg" if $npc;
1817 $self->message ($msg, $flags); 2218 $self->message ($msg, $flags);
2219 }
1818 } 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 (@_);
1819} 2231}
1820 2232
1821=item $player_object->may ("access") 2233=item $player_object->may ("access")
1822 2234
1823Returns wether the given player is authorized to access resource "access" 2235Returns wether the given player is authorized to access resource "access"
1870 $self->deactivate_recursive; 2282 $self->deactivate_recursive;
1871 2283
1872 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2284 return if UNIVERSAL::isa $self->map, "ext::map_link";
1873 2285
1874 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2286 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1875 if $self->map; 2287 if $self->map && $self->map->{path} ne "{link}";
1876 2288
1877 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2289 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1878} 2290}
1879 2291
1880sub cf::object::player::leave_link { 2292sub cf::object::player::leave_link {
1881 my ($self, $map, $x, $y) = @_; 2293 my ($self, $map, $x, $y) = @_;
2294
2295 return unless $self->contr->active;
1882 2296
1883 my $link_pos = delete $self->{_link_pos}; 2297 my $link_pos = delete $self->{_link_pos};
1884 2298
1885 unless ($map) { 2299 unless ($map) {
1886 # restore original map position 2300 # restore original map position
1900 # use -1 or undef as default coordinates, not 0, 0 2314 # use -1 or undef as default coordinates, not 0, 0
1901 ($x, $y) = ($map->enter_x, $map->enter_y) 2315 ($x, $y) = ($map->enter_x, $map->enter_y)
1902 if $x <=0 && $y <= 0; 2316 if $x <=0 && $y <= 0;
1903 2317
1904 $map->load; 2318 $map->load;
1905 $map->load_diag; 2319 $map->load_neighbours;
1906 2320
1907 return unless $self->contr->active; 2321 return unless $self->contr->active;
1908 $self->activate_recursive; 2322 $self->activate_recursive;
1909 2323
1910 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2324 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1911 $self->enter_map ($map, $x, $y); 2325 $self->enter_map ($map, $x, $y);
1912} 2326}
1913 2327
1914cf::player->attach ( 2328=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1915 on_logout => sub {
1916 my ($pl) = @_;
1917 2329
1918 # abort map switching before logout 2330Moves the player to the given map-path and coordinates by first freezing
1919 if ($pl->ob->{_link_pos}) { 2331her, loading and preparing them map, calling the provided $check callback
1920 cf::sync_job { 2332that has to return the map if sucecssful, and then unfreezes the player on
1921 $pl->ob->leave_link 2333the new (success) or old (failed) map position. In either case, $done will
1922 }; 2334be called at the end of this process.
1923 }
1924 },
1925 on_login => sub {
1926 my ($pl) = @_;
1927 2335
1928 # try to abort aborted map switching on player login :)
1929 # should happen only on crashes
1930 if ($pl->ob->{_link_pos}) {
1931 $pl->ob->enter_link;
1932 (async {
1933 $pl->ob->reply (undef,
1934 "There was an internal problem at your last logout, "
1935 . "the server will try to bring you to your intended destination in a second.",
1936 cf::NDI_RED);
1937 # we need this sleep as the login has a concurrent enter_exit running
1938 # and this sleep increases chances of the player not ending up in scorn
1939 Coro::Timer::sleep 1;
1940 $pl->ob->leave_link;
1941 })->prio (2);
1942 }
1943 },
1944);
1945
1946=item $player_object->goto ($path, $x, $y)
1947
1948=cut 2336=cut
2337
2338our $GOTOGEN;
1949 2339
1950sub cf::object::player::goto { 2340sub cf::object::player::goto {
1951 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;
1952 2345
1953 $self->enter_link; 2346 $self->enter_link;
1954 2347
1955 (async { 2348 (async {
1956 my $map = eval { 2349 my $map = eval {
1957 my $map = cf::map::find $path; 2350 my $map = cf::map::find $path;
2351
2352 if ($map) {
1958 $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
1959 $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 $@;
1960 } or 2365 }
1961 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1962 2366
2367 if ($gen == $self->{_goto_generation}) {
2368 delete $self->{_goto_generation};
1963 $self->leave_link ($map, $x, $y); 2369 $self->leave_link ($map, $x, $y);
2370 }
2371
2372 $done->() if $done;
1964 })->prio (1); 2373 })->prio (1);
1965} 2374}
1966 2375
1967=item $player_object->enter_exit ($exit_object) 2376=item $player_object->enter_exit ($exit_object)
1968 2377
2037 my $hp = $exit->stats->hp; 2446 my $hp = $exit->stats->hp;
2038 my $sp = $exit->stats->sp; 2447 my $sp = $exit->stats->sp;
2039 2448
2040 $self->enter_link; 2449 $self->enter_link;
2041 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
2042 (async { 2455 (async {
2043 $self->deactivate_recursive; # just to be sure 2456 $self->deactivate_recursive; # just to be sure
2044 unless (eval { 2457 unless (eval {
2045 $self->goto ($slaying, $hp, $sp); 2458 $self->goto ($slaying, $hp, $sp);
2046 2459
2073 2486
2074 utf8::encode $text; 2487 utf8::encode $text;
2075 $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);
2076} 2489}
2077 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
2078=item $client->ext_event ($type, %msg) 2553=item $client->ext_msg ($type, @msg)
2079 2554
2080Sends an exti event to the client. 2555Sends an ext event to the client.
2081 2556
2082=cut 2557=cut
2083 2558
2084sub cf::client::ext_event($$%) { 2559sub cf::client::ext_msg($$@) {
2085 my ($self, $type, %msg) = @_; 2560 my ($self, $type, @msg) = @_;
2086 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
2087 $msg{msgtype} = "event_$type"; 2567 push @msg, msgtype => "event_$type";
2088 $self->send_packet ("ext " . cf::to_json \%msg); 2568 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2569 }
2089} 2570}
2090 2571
2091=item $success = $client->query ($flags, "text", \&cb) 2572=item $success = $client->query ($flags, "text", \&cb)
2092 2573
2093Queues a query to the client, calling the given callback with 2574Queues a query to the client, calling the given callback with
2094the 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>,
2095C<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>.
2096 2577
2097Queries 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
2098reliable at some point in the future. 2579become reliable at some point in the future.
2099 2580
2100=cut 2581=cut
2101 2582
2102sub cf::client::query { 2583sub cf::client::query {
2103 my ($self, $flags, $text, $cb) = @_; 2584 my ($self, $flags, $text, $cb) = @_;
2111 utf8::encode $text; 2592 utf8::encode $text;
2112 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2593 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2113 2594
2114 $self->send_packet ($self->{query_queue}[0][0]) 2595 $self->send_packet ($self->{query_queue}[0][0])
2115 if @{ $self->{query_queue} } == 1; 2596 if @{ $self->{query_queue} } == 1;
2597
2598 1
2116} 2599}
2117 2600
2118cf::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 },
2119 on_reply => sub { 2607 on_reply => sub {
2120 my ($ns, $msg) = @_; 2608 my ($ns, $msg) = @_;
2121 2609
2122 # this weird shuffling is so that direct followup queries 2610 # this weird shuffling is so that direct followup queries
2123 # get handled first 2611 # get handled first
2135 } else { 2623 } else {
2136 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2624 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2137 } 2625 }
2138 } 2626 }
2139 }, 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 },
2140); 2651);
2141 2652
2142=item $client->async (\&cb) 2653=item $client->async (\&cb)
2143 2654
2144Create a new coroutine, running the specified callback. The coroutine will 2655Create a new coroutine, running the specified callback. The coroutine will
2185our $safe = new Safe "safe"; 2696our $safe = new Safe "safe";
2186our $safe_hole = new Safe::Hole; 2697our $safe_hole = new Safe::Hole;
2187 2698
2188$SIG{FPE} = 'IGNORE'; 2699$SIG{FPE} = 'IGNORE';
2189 2700
2190$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));
2191 2706
2192# here we export the classes and methods available to script code 2707# here we export the classes and methods available to script code
2193 2708
2194=pod 2709=pod
2195 2710
2196The following functions and methods are available within a safe environment: 2711The following functions and methods are available within a safe environment:
2197 2712
2198 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
2199 cf::object::player player 2717 cf::object::player
2200 cf::player peaceful 2718 player
2201 cf::map trigger 2719
2720 cf::player
2721 peaceful
2722
2723 cf::map
2724 trigger
2202 2725
2203=cut 2726=cut
2204 2727
2205for ( 2728for (
2206 ["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)],
2207 ["cf::object::player" => qw(player)], 2731 ["cf::object::player" => qw(player)],
2208 ["cf::player" => qw(peaceful)], 2732 ["cf::player" => qw(peaceful)],
2209 ["cf::map" => qw(trigger)], 2733 ["cf::map" => qw(trigger)],
2210) { 2734) {
2211 no strict 'refs'; 2735 no strict 'refs';
2282=back 2806=back
2283 2807
2284=cut 2808=cut
2285 2809
2286############################################################################# 2810#############################################################################
2287
2288=head2 EXTENSION DATABASE SUPPORT
2289
2290Crossfire maintains a very simple database for extension use. It can
2291currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2292convert to/from binary).
2293
2294The parameter C<$family> should best start with the name of the extension
2295using it, it should be unique.
2296
2297=over 4
2298
2299=item $value = cf::db_get $family => $key
2300
2301Returns a single value from the database.
2302
2303=item cf::db_put $family => $key => $value
2304
2305Stores the given C<$value> in the family.
2306
2307=cut
2308
2309our $DB;
2310
2311sub db_init {
2312 unless ($DB) {
2313 $DB = BDB::db_create $DB_ENV;
2314
2315 cf::sync_job {
2316 eval {
2317 $DB->set_flags (BDB::CHKSUM);
2318
2319 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2320 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2321 cf::cleanup "db_open(db): $!" if $!;
2322 };
2323 cf::cleanup "db_open(db): $@" if $@;
2324 };
2325 }
2326}
2327
2328sub db_get($$) {
2329 my $key = "$_[0]/$_[1]";
2330
2331 cf::sync_job {
2332 BDB::db_get $DB, undef, $key, my $data;
2333
2334 $! ? ()
2335 : $data
2336 }
2337}
2338
2339sub db_put($$$) {
2340 BDB::dbreq_pri 4;
2341 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2342}
2343
2344=item cf::cache $id => [$paths...], $processversion => $process
2345
2346Generic caching function that returns the value of the resource $id,
2347caching and regenerating as required.
2348
2349This function can block.
2350
2351=cut
2352
2353sub cache {
2354 my ($id, $src, $processversion, $process) = @_;
2355
2356 my $meta =
2357 join "\x00",
2358 $processversion,
2359 map {
2360 aio_stat $_
2361 and Carp::croak "$_: $!";
2362
2363 ($_, (stat _)[7,9])
2364 } @$src;
2365
2366 my $dbmeta = db_get cache => "$id/meta";
2367 if ($dbmeta ne $meta) {
2368 # changed, we may need to process
2369
2370 my @data;
2371 my $md5;
2372
2373 for (0 .. $#$src) {
2374 0 <= aio_load $src->[$_], $data[$_]
2375 or Carp::croak "$src->[$_]: $!";
2376 }
2377
2378 # if processing is expensive, check
2379 # checksum first
2380 if (1) {
2381 $md5 =
2382 join "\x00",
2383 $processversion,
2384 map {
2385 Coro::cede;
2386 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2387 } 0.. $#$src;
2388
2389
2390 my $dbmd5 = db_get cache => "$id/md5";
2391 if ($dbmd5 eq $md5) {
2392 db_put cache => "$id/meta", $meta;
2393
2394 return db_get cache => "$id/data";
2395 }
2396 }
2397
2398 my $t1 = Time::HiRes::time;
2399 my $data = $process->(\@data);
2400 my $t2 = Time::HiRes::time;
2401
2402 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2403
2404 db_put cache => "$id/data", $data;
2405 db_put cache => "$id/md5" , $md5;
2406 db_put cache => "$id/meta", $meta;
2407
2408 return $data;
2409 }
2410
2411 db_get cache => "$id/data"
2412}
2413
2414=item fork_call { }, $args
2415
2416Executes the given code block with the given arguments in a seperate
2417process, returning the results. Everything must be serialisable with
2418Coro::Storable. May, of course, block. Note that the executed sub may
2419never block itself or use any form of Event handling.
2420
2421=cut
2422
2423sub fork_call(&@) {
2424 my ($cb, @args) = @_;
2425
2426# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2427# or die "socketpair: $!";
2428 pipe my $fh1, my $fh2
2429 or die "pipe: $!";
2430
2431 if (my $pid = fork) {
2432 close $fh2;
2433
2434 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2435 $res = Coro::Storable::thaw $res;
2436
2437 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2438
2439 die $$res unless "ARRAY" eq ref $res;
2440
2441 return wantarray ? @$res : $res->[-1];
2442 } else {
2443 reset_signals;
2444 local $SIG{__WARN__};
2445 local $SIG{__DIE__};
2446 eval {
2447 close $fh1;
2448
2449 my @res = eval { $cb->(@args) };
2450 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2451 };
2452
2453 warn $@ if $@;
2454 _exit 0;
2455 }
2456}
2457
2458
2459
2460#############################################################################
2461# the server's init and main functions 2811# the server's init and main functions
2462 2812
2463sub load_facedata($) { 2813sub load_facedata($) {
2464 my ($path) = @_; 2814 my ($path) = @_;
2815
2816 my $enc = JSON::XS->new->utf8->canonical;
2465 2817
2466 warn "loading facedata from $path\n"; 2818 warn "loading facedata from $path\n";
2467 2819
2468 my $facedata; 2820 my $facedata;
2469 0 < aio_load $path, $facedata 2821 0 < aio_load $path, $facedata
2472 $facedata = Coro::Storable::thaw $facedata; 2824 $facedata = Coro::Storable::thaw $facedata;
2473 2825
2474 $facedata->{version} == 2 2826 $facedata->{version} == 2
2475 or cf::cleanup "$path: version mismatch, cannot proceed."; 2827 or cf::cleanup "$path: version mismatch, cannot proceed.";
2476 2828
2829 # patch in the exptable
2830 cf::cede_to_tick;
2831 $facedata->{resource}{"res/exp_table"} = {
2832 type => FT_RSRC,
2833 data => $enc->encode ([map cf::level_to_min_exp $_, 0 .. cf::settings->max_level]),
2834 };
2835 cf::cede_to_tick;
2836
2477 { 2837 {
2478 my $faces = $facedata->{faceinfo}; 2838 my $faces = $facedata->{faceinfo};
2479 2839
2480 while (my ($face, $info) = each %$faces) { 2840 while (my ($face, $info) = each %$faces) {
2481 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2841 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2482 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2842 cf::face::set_visibility $idx, $info->{visibility};
2843 cf::face::set_magicmap $idx, $info->{magicmap};
2483 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2844 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2484 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2845 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2485 Coro::cede; 2846
2847 cf::cede_to_tick;
2486 } 2848 }
2487 2849
2488 while (my ($face, $info) = each %$faces) { 2850 while (my ($face, $info) = each %$faces) {
2489 next unless $info->{smooth}; 2851 next unless $info->{smooth};
2490 my $idx = cf::face::find $face 2852 my $idx = cf::face::find $face
2491 or next; 2853 or next;
2492 if (my $smooth = cf::face::find $info->{smooth}) { 2854 if (my $smooth = cf::face::find $info->{smooth}) {
2855 cf::face::set_smooth $idx, $smooth;
2493 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2856 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2494 } else { 2857 } else {
2495 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2858 warn "smooth face '$info->{smooth}' not found for face '$face'";
2496 } 2859 }
2497 Coro::cede; 2860
2861 cf::cede_to_tick;
2498 } 2862 }
2499 } 2863 }
2500 2864
2501 { 2865 {
2502 my $anims = $facedata->{animinfo}; 2866 my $anims = $facedata->{animinfo};
2503 2867
2504 while (my ($anim, $info) = each %$anims) { 2868 while (my ($anim, $info) = each %$anims) {
2505 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2869 cf::anim::set $anim, $info->{frames}, $info->{facings};
2506 Coro::cede; 2870 cf::cede_to_tick;
2507 } 2871 }
2508 2872
2509 cf::anim::invalidate_all; # d'oh 2873 cf::anim::invalidate_all; # d'oh
2510 } 2874 }
2511 2875
2876 {
2877 # TODO: for gcfclient pleasure, we should give resources
2878 # that gcfclient doesn't grok a >10000 face index.
2879 my $res = $facedata->{resource};
2880
2881 my $soundconf = delete $res->{"res/sound.conf"};
2882
2883 while (my ($name, $info) = each %$res) {
2884 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2885 my $data;
2886
2887 if ($info->{type} & 1) {
2888 # prepend meta info
2889
2890 my $meta = $enc->encode ({
2891 name => $name,
2892 %{ $info->{meta} || {} },
2893 });
2894
2895 $data = pack "(w/a*)*", $meta, $info->{data};
2896 }
2897
2898 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2899 cf::face::set_type $idx, $info->{type};
2900
2901 cf::cede_to_tick;
2902 }
2903
2904 if ($soundconf) {
2905 $soundconf = $enc->decode (delete $soundconf->{data});
2906
2907 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2908 my $sound = $soundconf->{compat}[$_]
2909 or next;
2910
2911 my $face = cf::face::find "sound/$sound->[1]";
2912 cf::sound::set $sound->[0] => $face;
2913 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2914 }
2915
2916 while (my ($k, $v) = each %{$soundconf->{event}}) {
2917 my $face = cf::face::find "sound/$v";
2918 cf::sound::set $k => $face;
2919 }
2920 }
2921 }
2922
2512 1 2923 1
2513} 2924}
2925
2926register_exticmd fx_want => sub {
2927 my ($ns, $want) = @_;
2928
2929 while (my ($k, $v) = each %$want) {
2930 $ns->fx_want ($k, $v);
2931 }
2932};
2514 2933
2515sub reload_regions { 2934sub reload_regions {
2516 load_resource_file "$MAPDIR/regions" 2935 load_resource_file "$MAPDIR/regions"
2517 or die "unable to load regions file\n"; 2936 or die "unable to load regions file\n";
2937
2938 for (cf::region::list) {
2939 $_->{match} = qr/$_->{match}/
2940 if exists $_->{match};
2941 }
2518} 2942}
2519 2943
2520sub reload_facedata { 2944sub reload_facedata {
2521 load_facedata "$DATADIR/facedata" 2945 load_facedata "$DATADIR/facedata"
2522 or die "unable to load facedata\n"; 2946 or die "unable to load facedata\n";
2523} 2947}
2524 2948
2525sub reload_archetypes { 2949sub reload_archetypes {
2526 load_resource_file "$DATADIR/archetypes" 2950 load_resource_file "$DATADIR/archetypes"
2527 or die "unable to load archetypes\n"; 2951 or die "unable to load archetypes\n";
2952 #d# NEED to laod twice to resolve forward references
2953 # this really needs to be done in an extra post-pass
2954 # (which needs to be synchronous, so solve it differently)
2955 load_resource_file "$DATADIR/archetypes"
2956 or die "unable to load archetypes\n";
2528} 2957}
2529 2958
2530sub reload_treasures { 2959sub reload_treasures {
2531 load_resource_file "$DATADIR/treasures" 2960 load_resource_file "$DATADIR/treasures"
2532 or die "unable to load treasurelists\n"; 2961 or die "unable to load treasurelists\n";
2535sub reload_resources { 2964sub reload_resources {
2536 warn "reloading resource files...\n"; 2965 warn "reloading resource files...\n";
2537 2966
2538 reload_regions; 2967 reload_regions;
2539 reload_facedata; 2968 reload_facedata;
2969 #reload_archetypes;#d#
2540 reload_archetypes; 2970 reload_archetypes;
2541 reload_treasures; 2971 reload_treasures;
2542 2972
2543 warn "finished reloading resource files\n"; 2973 warn "finished reloading resource files\n";
2544} 2974}
2601 }, 3031 },
2602 ); 3032 );
2603 } 3033 }
2604} 3034}
2605 3035
3036sub write_runtime {
3037 my $runtime = "$LOCALDIR/runtime";
3038
3039 # first touch the runtime file to show we are still running:
3040 # the fsync below can take a very very long time.
3041
3042 IO::AIO::aio_utime $runtime, undef, undef;
3043
3044 my $guard = cf::lock_acquire "write_runtime";
3045
3046 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3047 or return;
3048
3049 my $value = $cf::RUNTIME + 90 + 10;
3050 # 10 is the runtime save interval, for a monotonic clock
3051 # 60 allows for the watchdog to kill the server.
3052
3053 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3054 and return;
3055
3056 # always fsync - this file is important
3057 aio_fsync $fh
3058 and return;
3059
3060 # touch it again to show we are up-to-date
3061 aio_utime $fh, undef, undef;
3062
3063 close $fh
3064 or return;
3065
3066 aio_rename "$runtime~", $runtime
3067 and return;
3068
3069 warn "runtime file written.\n";
3070
3071 1
3072}
3073
2606sub emergency_save() { 3074sub emergency_save() {
2607 my $freeze_guard = cf::freeze_mainloop; 3075 my $freeze_guard = cf::freeze_mainloop;
2608 3076
2609 warn "enter emergency perl save\n"; 3077 warn "enter emergency perl save\n";
2610 3078
2685 %EXT_CORO = (); 3153 %EXT_CORO = ();
2686 3154
2687 warn "removing commands"; 3155 warn "removing commands";
2688 %COMMAND = (); 3156 %COMMAND = ();
2689 3157
2690 warn "removing ext commands"; 3158 warn "removing ext/exti commands";
2691 %EXTCMD = (); 3159 %EXTCMD = ();
3160 %EXTICMD = ();
2692 3161
2693 warn "unloading/nuking all extensions"; 3162 warn "unloading/nuking all extensions";
2694 for my $pkg (@EXTS) { 3163 for my $pkg (@EXTS) {
2695 warn "... unloading $pkg"; 3164 warn "... unloading $pkg";
2696 3165
2814 my $signal = new Coro::Signal; 3283 my $signal = new Coro::Signal;
2815 push @WAIT_FOR_TICK_BEGIN, $signal; 3284 push @WAIT_FOR_TICK_BEGIN, $signal;
2816 $signal->wait; 3285 $signal->wait;
2817} 3286}
2818 3287
3288 my $min = 1e6;#d#
3289 my $avg = 10;
2819$TICK_WATCHER = Event->timer ( 3290$TICK_WATCHER = Event->timer (
2820 reentrant => 0, 3291 reentrant => 0,
2821 parked => 1, 3292 parked => 1,
2822 prio => 0, 3293 prio => 0,
2823 at => $NEXT_TICK || $TICK, 3294 at => $NEXT_TICK || $TICK,
2827 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3298 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2828 unless ++$bug_warning > 10; 3299 unless ++$bug_warning > 10;
2829 return; 3300 return;
2830 } 3301 }
2831 3302
2832 $NOW = Event::time; 3303 $NOW = $tick_start = Event::time;
2833 3304
2834 cf::server_tick; # one server iteration 3305 cf::server_tick; # one server iteration
3306
3307 0 && sync_job {#d#
3308 for(1..10) {
3309 my $t = Event::time;
3310 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3311 or die;
3312
3313 $map->width (50);
3314 $map->height (50);
3315 $map->alloc;
3316 $map->_load_objects ("/tmp/x.map", 1);
3317 my $t = Event::time - $t;
3318
3319 #next unless $t < 0.0013;#d#
3320 if ($t < $min) {
3321 $min = $t;
3322 }
3323 $avg = $avg * 0.99 + $t * 0.01;
3324 }
3325 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3326 exit 0;
3327 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3328 };
2835 3329
2836 $RUNTIME += $TICK; 3330 $RUNTIME += $TICK;
2837 $NEXT_TICK += $TICK; 3331 $NEXT_TICK += $TICK;
2838 3332
2839 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3333 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2845 } 3339 }
2846 3340
2847# my $AFTER = Event::time; 3341# my $AFTER = Event::time;
2848# warn $AFTER - $NOW;#d# 3342# warn $AFTER - $NOW;#d#
2849 3343
3344 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3345 $sig->send;
3346 }
3347 while (my $sig = shift @WAIT_FOR_TICK) {
3348 $sig->send;
3349 }
3350
3351 $NOW = Event::time;
3352
2850 # if we are delayed by four ticks or more, skip them all 3353 # if we are delayed by four ticks or more, skip them all
2851 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3354 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2852 3355
2853 $TICK_WATCHER->at ($NEXT_TICK); 3356 $TICK_WATCHER->at ($NEXT_TICK);
2854 $TICK_WATCHER->start; 3357 $TICK_WATCHER->start;
2855 3358
2856 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3359 $LOAD = ($NOW - $tick_start) / $TICK;
2857 $sig->send; 3360 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2858 }
2859 while (my $sig = shift @WAIT_FOR_TICK) {
2860 $sig->send;
2861 }
2862 3361
2863 _post_tick; 3362 _post_tick;
3363
3364
2864 }, 3365 },
2865); 3366);
2866 3367
2867{ 3368{
2868 BDB::max_poll_time $TICK * 0.1; 3369 BDB::max_poll_time $TICK * 0.1;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines