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.256 by root, Sat Apr 21 16:56:32 2007 UTC vs.
Revision 1.344 by root, Mon Aug 27 02:43:38 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 ();
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 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 476=cut
377 or return;
378 477
379 my $value = $cf::RUNTIME + 90 + 10; 478sub fork_call(&@) {
380 # 10 is the runtime save interval, for a monotonic clock 479 my ($cb, @args) = @_;
381 # 60 allows for the watchdog to kill the server.
382 480
383 (aio_write $fh, 0, (length $value), $value, 0) <= 0 481 # we seemingly have to make a local copy of the whole thing,
384 and return; 482 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious)
385 484
386 # always fsync - this file is important 485 my @res = Coro::Util::fork_eval {
387 aio_fsync $fh 486 reset_signals;
388 and return; 487 &$cb
488 }, @args;
389 489
390 close $fh 490 wantarray ? @res : $res[-1]
391 or return; 491}
392 492
393 aio_rename "$runtime~", $runtime 493=item $value = cf::db_get $family => $key
394 and return;
395 494
495Returns a single value from the environment database.
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 };
396 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"
397} 607}
398 608
399=item cf::datalog type => key => value, ... 609=item cf::datalog type => key => value, ...
400 610
401Log 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.
419attach callbacks/event handlers (a collection of which is called an "attachment") 629attach callbacks/event handlers (a collection of which is called an "attachment")
420to it. All such attachable objects support the following methods. 630to it. All such attachable objects support the following methods.
421 631
422In 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>
423C<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
424crossfire+). 634Crossfire TRT).
425 635
426=over 4 636=over 4
427 637
428=item $attachable->attach ($attachment, key => $value...) 638=item $attachable->attach ($attachment, key => $value...)
429 639
592 $registry = $CB_TYPE[$object_type] ||= []; 802 $registry = $CB_TYPE[$object_type] ||= [];
593 803
594 } elsif ($type eq "subtype") { 804 } elsif ($type eq "subtype") {
595 defined $object_type or Carp::croak "subtype specified without type"; 805 defined $object_type or Carp::croak "subtype specified without type";
596 my $object_subtype = shift @arg; 806 my $object_subtype = shift @arg;
597 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 807 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
598 808
599 } elsif ($type eq "package") { 809 } elsif ($type eq "package") {
600 my $pkg = shift @arg; 810 my $pkg = shift @arg;
601 811
602 while (my ($name, $id) = each %cb_id) { 812 while (my ($name, $id) = each %cb_id) {
631 _attach $registry, $klass, @attach; 841 _attach $registry, $klass, @attach;
632 } 842 }
633 843
634 $obj->{$name} = \%arg; 844 $obj->{$name} = \%arg;
635 } else { 845 } else {
636 warn "object uses attachment '$name' that is not available, postponing.\n"; 846 warn "object uses attachment '$name' which is not available, postponing.\n";
637 } 847 }
638 848
639 $obj->{_attachment}{$name} = undef; 849 $obj->{_attachment}{$name} = undef;
640} 850}
641 851
643 if (ref $_[0]) { 853 if (ref $_[0]) {
644 _object_attach @_; 854 _object_attach @_;
645 } else { 855 } else {
646 _attach shift->_attach_registry, @_; 856 _attach shift->_attach_registry, @_;
647 } 857 }
858 _recalc_want;
648}; 859};
649 860
650# all those should be optimised 861# all those should be optimised
651sub cf::attachable::detach { 862sub cf::attachable::detach {
652 my ($obj, $name) = @_; 863 my ($obj, $name) = @_;
655 delete $obj->{_attachment}{$name}; 866 delete $obj->{_attachment}{$name};
656 reattach ($obj); 867 reattach ($obj);
657 } else { 868 } else {
658 Carp::croak "cannot, currently, detach class attachments"; 869 Carp::croak "cannot, currently, detach class attachments";
659 } 870 }
871 _recalc_want;
660}; 872};
661 873
662sub cf::attachable::attached { 874sub cf::attachable::attached {
663 my ($obj, $name) = @_; 875 my ($obj, $name) = @_;
664 876
679 "; 891 ";
680 die if $@; 892 die if $@;
681} 893}
682 894
683our $override; 895our $override;
684our @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?
685 897
686sub override { 898sub override {
687 $override = 1; 899 $override = 1;
688 @invoke_results = (); 900 @INVOKE_RESULTS = (@_);
689} 901}
690 902
691sub do_invoke { 903sub do_invoke {
692 my $event = shift; 904 my $event = shift;
693 my $callbacks = shift; 905 my $callbacks = shift;
694 906
695 @invoke_results = (); 907 @INVOKE_RESULTS = ();
696 908
697 local $override; 909 local $override;
698 910
699 for (@$callbacks) { 911 for (@$callbacks) {
700 eval { &{$_->[1]} }; 912 eval { &{$_->[1]} };
717 929
718Generate an object-specific event with the given arguments. 930Generate an object-specific event with the given arguments.
719 931
720This 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
721removed 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
722results (if you must, access C<@cf::invoke_results> directly). 934results (if you must, access C<@cf::INVOKE_RESULTS> directly).
723 935
724=back 936=back
725 937
726=cut 938=cut
727 939
728############################################################################# 940#############################################################################
729# 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}
730 953
731sub reattach { 954sub reattach {
732 # basically do the same as instantiate, without calling instantiate 955 # basically do the same as instantiate, without calling instantiate
733 my ($obj) = @_; 956 my ($obj) = @_;
734 957
837 or return; 1060 or return;
838 $av = eval { (Storable::thaw $av)->{objs} }; 1061 $av = eval { (Storable::thaw $av)->{objs} };
839 } 1062 }
840 1063
841 warn sprintf "loading %s (%d)\n", 1064 warn sprintf "loading %s (%d)\n",
842 $filename, length $data, scalar @{$av || []};#d# 1065 $filename, length $data, scalar @{$av || []};
843 return ($data, $av); 1066 return ($data, $av);
844} 1067}
1068
1069=head2 COMMAND CALLBACKS
1070
1071=over 4
1072
1073=cut
845 1074
846############################################################################# 1075#############################################################################
847# command handling &c 1076# command handling &c
848 1077
849=item cf::register_command $name => \&callback($ob,$args); 1078=item cf::register_command $name => \&callback($ob,$args);
862 push @{ $COMMAND{$name} }, [$caller, $cb]; 1091 push @{ $COMMAND{$name} }, [$caller, $cb];
863} 1092}
864 1093
865=item cf::register_extcmd $name => \&callback($pl,$packet); 1094=item cf::register_extcmd $name => \&callback($pl,$packet);
866 1095
867Register 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.
868 1101
869If 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
870called. 1103called.
871 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
872=cut 1116=cut
873 1117
874sub register_extcmd { 1118sub register_extcmd {
875 my ($name, $cb) = @_; 1119 my ($name, $cb) = @_;
876 1120
877 $EXTCMD{$name} = $cb; 1121 $EXTCMD{$name} = $cb;
1122}
1123
1124sub register_exticmd {
1125 my ($name, $cb) = @_;
1126
1127 $EXTICMD{$name} = $cb;
878} 1128}
879 1129
880cf::player->attach ( 1130cf::player->attach (
881 on_command => sub { 1131 on_command => sub {
882 my ($pl, $name, $params) = @_; 1132 my ($pl, $name, $params) = @_;
891 cf::override; 1141 cf::override;
892 }, 1142 },
893 on_extcmd => sub { 1143 on_extcmd => sub {
894 my ($pl, $buf) = @_; 1144 my ($pl, $buf) = @_;
895 1145
896 my $msg = eval { from_json $buf }; 1146 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
897 1147
898 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
1154 my @reply;
1155
899 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1156 if (my $cb = $EXTCMD{$type}) {
900 if (my %reply = $cb->($pl, $msg)) { 1157 @reply = $cb->($pl, @payload);
901 $pl->ext_reply ($msg->{msgid}, %reply);
902 }
903 } 1158 }
1159
1160 $pl->ext_reply ($reply, @reply)
1161 if $reply;
1162
904 } else { 1163 } else {
905 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1164 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
906 } 1165 }
907 1166
908 cf::override; 1167 cf::override;
909 }, 1168 },
910); 1169);
911 1170
912sub load_extension {
913 my ($path) = @_;
914
915 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
916 my $base = $1;
917 my $pkg = $1;
918 $pkg =~ s/[^[:word:]]/_/g;
919 $pkg = "ext::$pkg";
920
921 warn "... loading '$path' into '$pkg'\n";
922
923 open my $fh, "<:utf8", $path
924 or die "$path: $!";
925
926 my $source =
927 "package $pkg; use strict; use utf8;\n"
928 . "#line 1 \"$path\"\n{\n"
929 . (do { local $/; <$fh> })
930 . "\n};\n1";
931
932 unless (eval $source) {
933 my $msg = $@ ? "$path: $@\n"
934 : "extension disabled.\n";
935 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
936 warn $@;
937 warn "mandatory extension failed to load, exiting.\n";
938 exit 1;
939 }
940 die $@;
941 }
942
943 push @EXTS, $pkg;
944}
945
946sub load_extensions { 1171sub load_extensions {
1172 cf::sync_job {
1173 my %todo;
1174
947 for my $ext (<$LIBDIR/*.ext>) { 1175 for my $path (<$LIBDIR/*.ext>) {
948 next unless -r $ext; 1176 next unless -r $path;
949 eval { 1177
950 load_extension $ext; 1178 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1179 my $base = $1;
1180 my $pkg = $1;
1181 $pkg =~ s/[^[:word:]]/_/g;
1182 $pkg = "ext::$pkg";
1183
1184 open my $fh, "<:utf8", $path
1185 or die "$path: $!";
1186
1187 my $source = do { local $/; <$fh> };
1188
1189 my %ext = (
1190 path => $path,
1191 base => $base,
1192 pkg => $pkg,
1193 );
1194
1195 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1196 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1197
1198 $ext{source} =
1199 "package $pkg; use strict; use utf8;\n"
1200 . "#line 1 \"$path\"\n{\n"
1201 . $source
1202 . "\n};\n1";
1203
1204 $todo{$base} = \%ext;
1205 }
1206
1207 my %done;
1208 while (%todo) {
1209 my $progress;
1210
1211 while (my ($k, $v) = each %todo) {
1212 for (split /,\s*/, $v->{meta}{depends}) {
1213 goto skip
1214 unless exists $done{$_};
1215 }
1216
1217 warn "... loading '$k' into '$v->{pkg}'\n";
1218
1219 unless (eval $v->{source}) {
1220 my $msg = $@ ? "$v->{path}: $@\n"
1221 : "$v->{base}: extension inactive.\n";
1222
1223 if (exists $v->{meta}{mandatory}) {
1224 warn $msg;
1225 warn "mandatory extension failed to load, exiting.\n";
1226 exit 1;
1227 }
1228
1229 warn $msg;
1230 }
1231
1232 $done{$k} = delete $todo{$k};
1233 push @EXTS, $v->{pkg};
1234 $progress = 1;
951 1 1235 }
952 } or warn "$ext not loaded: $@"; 1236
1237 skip:
1238 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1239 unless $progress;
1240 }
953 } 1241 };
954} 1242}
955 1243
956############################################################################# 1244#############################################################################
1245
1246=back
957 1247
958=head2 CORE EXTENSIONS 1248=head2 CORE EXTENSIONS
959 1249
960Functions and methods that extend core crossfire objects. 1250Functions and methods that extend core crossfire objects.
961 1251
1048 $cf::PLAYER{$login} = $self; 1338 $cf::PLAYER{$login} = $self;
1049 1339
1050 $self 1340 $self
1051} 1341}
1052 1342
1343=item $player->send_msg ($channel, $msg, $color, [extra...])
1344
1345=cut
1346
1347sub send_msg {
1348 my $ns = shift->ns
1349 or return;
1350 $ns->send_msg (@_);
1351}
1352
1053=item $pl->quit_character 1353=item $pl->quit_character
1054 1354
1055Nukes the player without looking back. If logged in, the connection will 1355Nukes the player without looking back. If logged in, the connection will
1056be destroyed. May block for a long time. 1356be destroyed. May block for a long time.
1057 1357
1149 } 1449 }
1150 1450
1151 \@paths 1451 \@paths
1152} 1452}
1153 1453
1454=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1455
1456Expand crossfire pod fragments into protocol xml.
1457
1458=cut
1459
1460sub expand_cfpod {
1461 ((my $self), (local $_)) = @_;
1462
1463 # escape & and <
1464 s/&/&amp;/g;
1465 s/(?<![BIUGH])</&lt;/g;
1466
1467 # this is buggy, it needs to properly take care of nested <'s
1468
1469 1 while
1470 # replace B<>, I<>, U<> etc.
1471 s/B<([^\>]*)>/<b>$1<\/b>/
1472 || s/I<([^\>]*)>/<i>$1<\/i>/
1473 || s/U<([^\>]*)>/<u>$1<\/u>/
1474 # replace G<male|female> tags
1475 || s{G<([^>|]*)\|([^>]*)>}{
1476 $self->gender ? $2 : $1
1477 }ge
1478 # replace H<hint text>
1479 || s{H<([^\>]*)>}
1480 {
1481 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1482 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1483 "")
1484 [$self->{hintmode}]
1485 }ge;
1486
1487 # create single paragraphs (very hackish)
1488 s/(?<=\S)\n(?=\w)/ /g;
1489
1490 # compress some whitespace
1491 s/\s+\n/\n/g; # ws line-ends
1492 s/\n\n+/\n/g; # double lines
1493 s/^\n+//; # beginning lines
1494 s/\n+$//; # ending lines
1495
1496 $_
1497}
1498
1499sub hintmode {
1500 $_[0]{hintmode} = $_[1] if @_ > 1;
1501 $_[0]{hintmode}
1502}
1503
1154=item $player->ext_reply ($msgid, %msg) 1504=item $player->ext_reply ($msgid, @msg)
1155 1505
1156Sends an ext reply to the player. 1506Sends an ext reply to the player.
1157 1507
1158=cut 1508=cut
1159 1509
1160sub ext_reply($$%) { 1510sub ext_reply($$@) {
1161 my ($self, $id, %msg) = @_; 1511 my ($self, $id, @msg) = @_;
1162 1512
1163 $msg{msgid} = $id; 1513 $self->ns->ext_reply ($id, @msg)
1164
1165 $self->send ("ext " . cf::to_json \%msg);
1166} 1514}
1167 1515
1168=item $player->ext_event ($type, %msg) 1516=item $player->ext_msg ($type, @msg)
1169 1517
1170Sends an ext event to the client. 1518Sends an ext event to the client.
1171 1519
1172=cut 1520=cut
1173 1521
1174sub ext_event($$%) { 1522sub ext_msg($$@) {
1175 my ($self, $type, %msg) = @_; 1523 my ($self, $type, @msg) = @_;
1176 1524
1177 $self->ns->ext_event ($type, %msg); 1525 $self->ns->ext_msg ($type, @msg);
1178} 1526}
1179 1527
1180=head3 cf::region 1528=head3 cf::region
1181 1529
1182=over 4 1530=over 4
1185 1533
1186package cf::region; 1534package cf::region;
1187 1535
1188=item cf::region::find_by_path $path 1536=item cf::region::find_by_path $path
1189 1537
1190Tries to decuce the probable region for a map knowing only its path. 1538Tries to decuce the likely region for a map knowing only its path.
1191 1539
1192=cut 1540=cut
1193 1541
1194sub find_by_path($) { 1542sub find_by_path($) {
1195 my ($path) = @_; 1543 my ($path) = @_;
1196 1544
1197 my ($match, $specificity); 1545 my ($match, $specificity);
1198 1546
1199 for my $region (list) { 1547 for my $region (list) {
1200 if ($region->match && $path =~ $region->match) { 1548 if ($region->{match} && $path =~ $region->{match}) {
1201 ($match, $specificity) = ($region, $region->specificity) 1549 ($match, $specificity) = ($region, $region->specificity)
1202 if $region->specificity > $specificity; 1550 if $region->specificity > $specificity;
1203 } 1551 }
1204 } 1552 }
1205 1553
1269 my ($self, $merge) = @_; 1617 my ($self, $merge) = @_;
1270 1618
1271 # we have to keep some variables in memory intact 1619 # we have to keep some variables in memory intact
1272 local $self->{path}; 1620 local $self->{path};
1273 local $self->{load_path}; 1621 local $self->{load_path};
1274 local $self->{deny_save};
1275 local $self->{deny_reset};
1276 1622
1277 $self->SUPER::thawer_merge ($merge); 1623 $self->SUPER::thawer_merge ($merge);
1278} 1624}
1279 1625
1280sub normalise { 1626sub normalise {
1327 $self->init; # pass $1 etc. 1673 $self->init; # pass $1 etc.
1328 return $self; 1674 return $self;
1329 } 1675 }
1330 } 1676 }
1331 1677
1332 Carp::carp "unable to resolve path '$path' (base '$base')."; 1678 Carp::cluck "unable to resolve path '$path' (base '$base').";
1333 () 1679 ()
1334} 1680}
1335 1681
1336sub init { 1682sub init {
1337 my ($self) = @_; 1683 my ($self) = @_;
1378sub change_all_map_light { 1724sub change_all_map_light {
1379 my ($change) = @_; 1725 my ($change) = @_;
1380 1726
1381 $_->change_map_light ($change) 1727 $_->change_map_light ($change)
1382 for grep $_->outdoor, values %cf::MAP; 1728 for grep $_->outdoor, values %cf::MAP;
1729}
1730
1731sub decay_objects {
1732 my ($self) = @_;
1733
1734 return if $self->{deny_reset};
1735
1736 $self->do_decay_objects;
1383} 1737}
1384 1738
1385sub unlink_save { 1739sub unlink_save {
1386 my ($self) = @_; 1740 my ($self) = @_;
1387 1741
1445 $self->load_header_orig 1799 $self->load_header_orig
1446 or return; 1800 or return;
1447 $self->prepare_orig; 1801 $self->prepare_orig;
1448 } 1802 }
1449 1803
1804 $self->{deny_reset} = 1
1805 if $self->no_reset;
1806
1450 $self->default_region (cf::region::find_by_path $self->{path}) 1807 $self->default_region (cf::region::find_by_path $self->{path})
1451 unless $self->default_region; 1808 unless $self->default_region;
1452 1809
1453 1 1810 1
1454} 1811}
1469 $map->{last_save} = $cf::RUNTIME; 1826 $map->{last_save} = $cf::RUNTIME;
1470 1827
1471 $map->load_header 1828 $map->load_header
1472 or return; 1829 or return;
1473 1830
1474 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1831 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1475 # doing this can freeze the server in a sync job, obviously 1832 # doing this can freeze the server in a sync job, obviously
1476 #$cf::WAIT_FOR_TICK->wait; 1833 #$cf::WAIT_FOR_TICK->wait;
1477 $map->reset; 1834 $map->reset;
1478 undef $guard; 1835 undef $guard;
1479 return find $path; 1836 return find $path;
1534 $self->set_darkness_map; 1891 $self->set_darkness_map;
1535 Coro::cede; 1892 Coro::cede;
1536 $self->activate; 1893 $self->activate;
1537 } 1894 }
1538 1895
1896 $self->{last_save} = $cf::RUNTIME;
1897 $self->last_access ($cf::RUNTIME);
1898
1539 $self->in_memory (cf::MAP_IN_MEMORY); 1899 $self->in_memory (cf::MAP_IN_MEMORY);
1540
1541 undef $guard;
1542 } 1900 }
1543 1901
1544 $self->post_load; 1902 $self->post_load;
1545} 1903}
1546 1904
1548 my ($self, $ob) = @_; 1906 my ($self, $ob) = @_;
1549 1907
1550 return find "~" . $ob->name . "/" . $self->{path} 1908 return find "~" . $ob->name . "/" . $self->{path}
1551 if $self->per_player; 1909 if $self->per_player;
1552 1910
1911# return find "?party/" . $ob->name . "/" . $self->{path}
1912# if $self->per_party;
1913
1553 $self 1914 $self
1554} 1915}
1555 1916
1556# find and load all maps in the 3x3 area around a map 1917# find and load all maps in the 3x3 area around a map
1557sub load_diag { 1918sub load_neighbours {
1558 my ($map) = @_; 1919 my ($map) = @_;
1559 1920
1560 my @diag; # diagonal neighbours 1921 my @neigh; # diagonal neighbours
1561 1922
1562 for (0 .. 3) { 1923 for (0 .. 3) {
1563 my $neigh = $map->tile_path ($_) 1924 my $neigh = $map->tile_path ($_)
1564 or next; 1925 or next;
1565 $neigh = find $neigh, $map 1926 $neigh = find $neigh, $map
1566 or next; 1927 or next;
1567 $neigh->load; 1928 $neigh->load;
1568 1929
1930 push @neigh,
1569 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1931 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1570 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1932 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1571 } 1933 }
1572 1934
1573 for (@diag) { 1935 for (grep defined $_->[0], @neigh) {
1936 my ($path, $origin) = @$_;
1574 my $neigh = find @$_ 1937 my $neigh = find $path, $origin
1575 or next; 1938 or next;
1576 $neigh->load; 1939 $neigh->load;
1577 } 1940 }
1578} 1941}
1579 1942
1584} 1947}
1585 1948
1586sub do_load_sync { 1949sub do_load_sync {
1587 my ($map) = @_; 1950 my ($map) = @_;
1588 1951
1952 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1953 if $Coro::current == $Coro::main;
1954
1589 cf::sync_job { $map->load }; 1955 cf::sync_job { $map->load };
1590} 1956}
1591 1957
1592our %MAP_PREFETCH; 1958our %MAP_PREFETCH;
1593our $MAP_PREFETCHER = undef; 1959our $MAP_PREFETCHER = undef;
1594 1960
1595sub find_async { 1961sub find_async {
1596 my ($path, $origin) = @_; 1962 my ($path, $origin, $load) = @_;
1597 1963
1598 $path = normalise $path, $origin && $origin->{path}; 1964 $path = normalise $path, $origin && $origin->{path};
1599 1965
1600 if (my $map = $cf::MAP{$path}) { 1966 if (my $map = $cf::MAP{$path}) {
1601 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1967 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1602 } 1968 }
1603 1969
1604 undef $MAP_PREFETCH{$path}; 1970 $MAP_PREFETCH{$path} |= $load;
1971
1605 $MAP_PREFETCHER ||= cf::async { 1972 $MAP_PREFETCHER ||= cf::async {
1606 while (%MAP_PREFETCH) { 1973 while (%MAP_PREFETCH) {
1607 for my $path (keys %MAP_PREFETCH) { 1974 while (my ($k, $v) = each %MAP_PREFETCH) {
1608 my $map = find $path 1975 if (my $map = find $k) {
1609 or next;
1610 $map->load; 1976 $map->load if $v;
1977 }
1611 1978
1612 delete $MAP_PREFETCH{$path}; 1979 delete $MAP_PREFETCH{$k};
1613 } 1980 }
1614 } 1981 }
1615 undef $MAP_PREFETCHER; 1982 undef $MAP_PREFETCHER;
1616 }; 1983 };
1617 $MAP_PREFETCHER->prio (6); 1984 $MAP_PREFETCHER->prio (6);
1667 2034
1668sub reset_at { 2035sub reset_at {
1669 my ($self) = @_; 2036 my ($self) = @_;
1670 2037
1671 # TODO: safety, remove and allow resettable per-player maps 2038 # TODO: safety, remove and allow resettable per-player maps
1672 return 1e99 if $self->isa ("ext::map_per_player");#d#
1673 return 1e99 if $self->{deny_reset}; 2039 return 1e99 if $self->{deny_reset};
1674 2040
1675 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2041 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1676 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2042 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1677 2043
1688 my ($self) = @_; 2054 my ($self) = @_;
1689 2055
1690 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2056 my $lock = cf::lock_acquire "map_data:$self->{path}";
1691 2057
1692 return if $self->players; 2058 return if $self->players;
1693 return if $self->isa ("ext::map_per_player");#d#
1694 2059
1695 warn "resetting map ", $self->path;#d# 2060 warn "resetting map ", $self->path;
1696 2061
1697 $self->in_memory (cf::MAP_SWAPPED); 2062 $self->in_memory (cf::MAP_SWAPPED);
1698 2063
1699 # need to save uniques path 2064 # need to save uniques path
1700 unless ($self->{deny_save}) { 2065 unless ($self->{deny_save}) {
1732 $cf::MAP{$self->path} = $self; 2097 $cf::MAP{$self->path} = $self;
1733 2098
1734 $self->reset; # polite request, might not happen 2099 $self->reset; # polite request, might not happen
1735} 2100}
1736 2101
2102=item $maps = cf::map::tmp_maps
2103
2104Returns an arrayref with all map paths of currently instantiated and saved
2105maps. May block.
2106
2107=cut
2108
2109sub tmp_maps() {
2110 [
2111 map {
2112 utf8::decode $_;
2113 /\.map$/
2114 ? normalise $_
2115 : ()
2116 } @{ aio_readdir $TMPDIR or [] }
2117 ]
2118}
2119
2120=item $maps = cf::map::random_maps
2121
2122Returns an arrayref with all map paths of currently instantiated and saved
2123random maps. May block.
2124
2125=cut
2126
2127sub random_maps() {
2128 [
2129 map {
2130 utf8::decode $_;
2131 /\.map$/
2132 ? normalise "?random/$_"
2133 : ()
2134 } @{ aio_readdir $RANDOMDIR or [] }
2135 ]
2136}
2137
1737=item cf::map::unique_maps 2138=item cf::map::unique_maps
1738 2139
1739Returns an arrayref of paths of all shared maps that have 2140Returns an arrayref of paths of all shared maps that have
1740instantiated unique items. May block. 2141instantiated unique items. May block.
1741 2142
1742=cut 2143=cut
1743 2144
1744sub unique_maps() { 2145sub unique_maps() {
1745 my $files = aio_readdir $UNIQUEDIR 2146 [
1746 or return; 2147 map {
1747
1748 my @paths;
1749
1750 for (@$files) {
1751 utf8::decode $_; 2148 utf8::decode $_;
1752 next if /\.pst$/; 2149 /\.map$/
1753 next unless /^$PATH_SEP/o; 2150 ? normalise $_
1754 2151 : ()
1755 push @paths, cf::map::normalise $_; 2152 } @{ aio_readdir $UNIQUEDIR or [] }
1756 } 2153 ]
1757
1758 \@paths
1759} 2154}
1760 2155
1761package cf; 2156package cf;
1762 2157
1763=back 2158=back
1809 2204
1810 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2205 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1811 2206
1812 if ($self->{record_replies}) { 2207 if ($self->{record_replies}) {
1813 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2208 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2209
1814 } else { 2210 } else {
2211 my $pl = $self->contr;
2212
2213 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2214 my $dialog = $pl->{npc_dialog};
2215 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2216
2217 } else {
1815 $msg = $npc->name . " says: $msg" if $npc; 2218 $msg = $npc->name . " says: $msg" if $npc;
1816 $self->message ($msg, $flags); 2219 $self->message ($msg, $flags);
2220 }
1817 } 2221 }
2222}
2223
2224=item $object->send_msg ($channel, $msg, $color, [extra...])
2225
2226=cut
2227
2228sub cf::object::send_msg {
2229 my $pl = shift->contr
2230 or return;
2231 $pl->send_msg (@_);
1818} 2232}
1819 2233
1820=item $player_object->may ("access") 2234=item $player_object->may ("access")
1821 2235
1822Returns wether the given player is authorized to access resource "access" 2236Returns wether the given player is authorized to access resource "access"
1869 $self->deactivate_recursive; 2283 $self->deactivate_recursive;
1870 2284
1871 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2285 return if UNIVERSAL::isa $self->map, "ext::map_link";
1872 2286
1873 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2287 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1874 if $self->map; 2288 if $self->map && $self->map->{path} ne "{link}";
1875 2289
1876 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2290 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1877} 2291}
1878 2292
1879sub cf::object::player::leave_link { 2293sub cf::object::player::leave_link {
1880 my ($self, $map, $x, $y) = @_; 2294 my ($self, $map, $x, $y) = @_;
2295
2296 return unless $self->contr->active;
1881 2297
1882 my $link_pos = delete $self->{_link_pos}; 2298 my $link_pos = delete $self->{_link_pos};
1883 2299
1884 unless ($map) { 2300 unless ($map) {
1885 # restore original map position 2301 # restore original map position
1899 # use -1 or undef as default coordinates, not 0, 0 2315 # use -1 or undef as default coordinates, not 0, 0
1900 ($x, $y) = ($map->enter_x, $map->enter_y) 2316 ($x, $y) = ($map->enter_x, $map->enter_y)
1901 if $x <=0 && $y <= 0; 2317 if $x <=0 && $y <= 0;
1902 2318
1903 $map->load; 2319 $map->load;
1904 $map->load_diag; 2320 $map->load_neighbours;
1905 2321
1906 return unless $self->contr->active; 2322 return unless $self->contr->active;
1907 $self->activate_recursive; 2323 $self->activate_recursive;
1908 2324
1909 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2325 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1910 $self->enter_map ($map, $x, $y); 2326 $self->enter_map ($map, $x, $y);
1911} 2327}
1912 2328
1913cf::player->attach ( 2329=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1914 on_logout => sub {
1915 my ($pl) = @_;
1916 2330
1917 # abort map switching before logout 2331Moves the player to the given map-path and coordinates by first freezing
1918 if ($pl->ob->{_link_pos}) { 2332her, loading and preparing them map, calling the provided $check callback
1919 cf::sync_job { 2333that has to return the map if sucecssful, and then unfreezes the player on
1920 $pl->ob->leave_link 2334the new (success) or old (failed) map position. In either case, $done will
1921 }; 2335be called at the end of this process.
1922 }
1923 },
1924 on_login => sub {
1925 my ($pl) = @_;
1926 2336
1927 # try to abort aborted map switching on player login :)
1928 # should happen only on crashes
1929 if ($pl->ob->{_link_pos}) {
1930 $pl->ob->enter_link;
1931 (async {
1932 $pl->ob->reply (undef,
1933 "There was an internal problem at your last logout, "
1934 . "the server will try to bring you to your intended destination in a second.",
1935 cf::NDI_RED);
1936 # we need this sleep as the login has a concurrent enter_exit running
1937 # and this sleep increases chances of the player not ending up in scorn
1938 Coro::Timer::sleep 1;
1939 $pl->ob->leave_link;
1940 })->prio (2);
1941 }
1942 },
1943);
1944
1945=item $player_object->goto ($path, $x, $y)
1946
1947=cut 2337=cut
2338
2339our $GOTOGEN;
1948 2340
1949sub cf::object::player::goto { 2341sub cf::object::player::goto {
1950 my ($self, $path, $x, $y) = @_; 2342 my ($self, $path, $x, $y, $check, $done) = @_;
2343
2344 # do generation counting so two concurrent goto's will be executed in-order
2345 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1951 2346
1952 $self->enter_link; 2347 $self->enter_link;
1953 2348
1954 (async { 2349 (async {
1955 my $map = eval { 2350 my $map = eval {
1956 my $map = cf::map::find $path; 2351 my $map = cf::map::find $path;
2352
2353 if ($map) {
1957 $map = $map->customise_for ($self) if $map; 2354 $map = $map->customise_for ($self);
2355 $map = $check->($map) if $check && $map;
2356 } else {
2357 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2358 }
2359
1958 $map 2360 $map
2361 };
2362
2363 if ($@) {
2364 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2365 LOG llevError | logBacktrace, Carp::longmess $@;
1959 } or 2366 }
1960 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1961 2367
2368 if ($gen == $self->{_goto_generation}) {
2369 delete $self->{_goto_generation};
1962 $self->leave_link ($map, $x, $y); 2370 $self->leave_link ($map, $x, $y);
2371 }
2372
2373 $done->() if $done;
1963 })->prio (1); 2374 })->prio (1);
1964} 2375}
1965 2376
1966=item $player_object->enter_exit ($exit_object) 2377=item $player_object->enter_exit ($exit_object)
1967 2378
2036 my $hp = $exit->stats->hp; 2447 my $hp = $exit->stats->hp;
2037 my $sp = $exit->stats->sp; 2448 my $sp = $exit->stats->sp;
2038 2449
2039 $self->enter_link; 2450 $self->enter_link;
2040 2451
2452 # if exit is damned, update players death & WoR home-position
2453 $self->contr->savebed ($slaying, $hp, $sp)
2454 if $exit->flag (FLAG_DAMNED);
2455
2041 (async { 2456 (async {
2042 $self->deactivate_recursive; # just to be sure 2457 $self->deactivate_recursive; # just to be sure
2043 unless (eval { 2458 unless (eval {
2044 $self->goto ($slaying, $hp, $sp); 2459 $self->goto ($slaying, $hp, $sp);
2045 2460
2072 2487
2073 utf8::encode $text; 2488 utf8::encode $text;
2074 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2489 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2075} 2490}
2076 2491
2492=item $client->send_msg ($channel, $msg, $color, [extra...])
2493
2494Send a drawinfo or msg packet to the client, formatting the msg for the
2495client if neccessary. C<$type> should be a string identifying the type of
2496the message, with C<log> being the default. If C<$color> is negative, suppress
2497the message unless the client supports the msg packet.
2498
2499=cut
2500
2501sub cf::client::send_msg {
2502 my ($self, $channel, $msg, $color, @extra) = @_;
2503
2504 $msg = $self->pl->expand_cfpod ($msg);
2505
2506 $color &= cf::NDI_CLIENT_MASK; # just in case...
2507
2508 if (ref $channel) {
2509 # send meta info to client, if not yet sent
2510 unless (exists $self->{channel}{$channel->{id}}) {
2511 $self->{channel}{$channel->{id}} = $channel;
2512 $self->ext_msg (channel_info => $channel);
2513 }
2514
2515 $channel = $channel->{id};
2516 }
2517
2518 return unless @extra || length $msg;
2519
2520 if ($self->can_msg) {
2521 # default colour, mask it out
2522 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2523 if $color & cf::NDI_DEF;
2524
2525 $self->send_packet ("msg " . $self->{json_coder}->encode (
2526 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2527 } else {
2528 if ($color >= 0) {
2529 # replace some tags by gcfclient-compatible ones
2530 for ($msg) {
2531 1 while
2532 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2533 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2534 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2535 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2536 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2537 }
2538
2539 $color &= cf::NDI_COLOR_MASK;
2540
2541 utf8::encode $msg;
2542
2543 if (0 && $msg =~ /\[/) {
2544 # COMMAND/INFO
2545 $self->send_packet ("drawextinfo $color 10 8 $msg")
2546 } else {
2547 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2548 $self->send_packet ("drawinfo $color $msg")
2549 }
2550 }
2551 }
2552}
2553
2077=item $client->ext_event ($type, %msg) 2554=item $client->ext_msg ($type, @msg)
2078 2555
2079Sends an exti event to the client. 2556Sends an ext event to the client.
2080 2557
2081=cut 2558=cut
2082 2559
2083sub cf::client::ext_event($$%) { 2560sub cf::client::ext_msg($$@) {
2084 my ($self, $type, %msg) = @_; 2561 my ($self, $type, @msg) = @_;
2085 2562
2563 if ($self->extcmd == 2) {
2564 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2565 } elsif ($self->extcmd == 1) { # TODO: remove
2086 $msg{msgtype} = "event_$type"; 2566 push @msg, msgtype => "event_$type";
2087 $self->send_packet ("ext " . cf::to_json \%msg); 2567 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2568 }
2569}
2570
2571=item $client->ext_reply ($msgid, @msg)
2572
2573Sends an ext reply to the client.
2574
2575=cut
2576
2577sub cf::client::ext_reply($$@) {
2578 my ($self, $id, @msg) = @_;
2579
2580 if ($self->extcmd == 2) {
2581 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2582 } elsif ($self->extcmd == 1) {
2583 #TODO: version 1, remove
2584 unshift @msg, msgtype => "reply", msgid => $id;
2585 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2586 }
2088} 2587}
2089 2588
2090=item $success = $client->query ($flags, "text", \&cb) 2589=item $success = $client->query ($flags, "text", \&cb)
2091 2590
2092Queues a query to the client, calling the given callback with 2591Queues a query to the client, calling the given callback with
2093the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2592the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2094C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2593C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2095 2594
2096Queries can fail, so check the return code. Or don't, as queries will become 2595Queries can fail, so check the return code. Or don't, as queries will
2097reliable at some point in the future. 2596become reliable at some point in the future.
2098 2597
2099=cut 2598=cut
2100 2599
2101sub cf::client::query { 2600sub cf::client::query {
2102 my ($self, $flags, $text, $cb) = @_; 2601 my ($self, $flags, $text, $cb) = @_;
2110 utf8::encode $text; 2609 utf8::encode $text;
2111 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2610 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2112 2611
2113 $self->send_packet ($self->{query_queue}[0][0]) 2612 $self->send_packet ($self->{query_queue}[0][0])
2114 if @{ $self->{query_queue} } == 1; 2613 if @{ $self->{query_queue} } == 1;
2614
2615 1
2115} 2616}
2116 2617
2117cf::client->attach ( 2618cf::client->attach (
2619 on_connect => sub {
2620 my ($ns) = @_;
2621
2622 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2623 },
2118 on_reply => sub { 2624 on_reply => sub {
2119 my ($ns, $msg) = @_; 2625 my ($ns, $msg) = @_;
2120 2626
2121 # this weird shuffling is so that direct followup queries 2627 # this weird shuffling is so that direct followup queries
2122 # get handled first 2628 # get handled first
2134 } else { 2640 } else {
2135 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2641 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2136 } 2642 }
2137 } 2643 }
2138 }, 2644 },
2645 on_exticmd => sub {
2646 my ($ns, $buf) = @_;
2647
2648 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2649
2650 if (ref $msg) {
2651 my ($type, $reply, @payload) =
2652 "ARRAY" eq ref $msg
2653 ? @$msg
2654 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2655
2656 my @reply;
2657
2658 if (my $cb = $EXTICMD{$type}) {
2659 @reply = $cb->($ns, @payload);
2660 }
2661
2662 $ns->ext_reply ($reply, @reply)
2663 if $reply;
2664
2665 } else {
2666 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2667 }
2668
2669 cf::override;
2670 },
2139); 2671);
2140 2672
2141=item $client->async (\&cb) 2673=item $client->async (\&cb)
2142 2674
2143Create a new coroutine, running the specified callback. The coroutine will 2675Create a new coroutine, running the specified callback. The coroutine will
2184our $safe = new Safe "safe"; 2716our $safe = new Safe "safe";
2185our $safe_hole = new Safe::Hole; 2717our $safe_hole = new Safe::Hole;
2186 2718
2187$SIG{FPE} = 'IGNORE'; 2719$SIG{FPE} = 'IGNORE';
2188 2720
2189$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2721$safe->permit_only (Opcode::opset qw(
2722 :base_core :base_mem :base_orig :base_math
2723 grepstart grepwhile mapstart mapwhile
2724 sort time
2725));
2190 2726
2191# here we export the classes and methods available to script code 2727# here we export the classes and methods available to script code
2192 2728
2193=pod 2729=pod
2194 2730
2195The following functions and methods are available within a safe environment: 2731The following functions and methods are available within a safe environment:
2196 2732
2197 cf::object contr pay_amount pay_player map 2733 cf::object
2734 contr pay_amount pay_player map x y force_find force_add
2735 insert remove name archname title slaying race decrease_ob_nr
2736
2198 cf::object::player player 2737 cf::object::player
2199 cf::player peaceful 2738 player
2200 cf::map trigger 2739
2740 cf::player
2741 peaceful
2742
2743 cf::map
2744 trigger
2201 2745
2202=cut 2746=cut
2203 2747
2204for ( 2748for (
2205 ["cf::object" => qw(contr pay_amount pay_player map)], 2749 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2750 insert remove inv name archname title slaying race
2751 decrease_ob_nr)],
2206 ["cf::object::player" => qw(player)], 2752 ["cf::object::player" => qw(player)],
2207 ["cf::player" => qw(peaceful)], 2753 ["cf::player" => qw(peaceful)],
2208 ["cf::map" => qw(trigger)], 2754 ["cf::map" => qw(trigger)],
2209) { 2755) {
2210 no strict 'refs'; 2756 no strict 'refs';
2281=back 2827=back
2282 2828
2283=cut 2829=cut
2284 2830
2285############################################################################# 2831#############################################################################
2286
2287=head2 EXTENSION DATABASE SUPPORT
2288
2289Crossfire maintains a very simple database for extension use. It can
2290currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2291convert to/from binary).
2292
2293The parameter C<$family> should best start with the name of the extension
2294using it, it should be unique.
2295
2296=over 4
2297
2298=item $value = cf::db_get $family => $key
2299
2300Returns a single value from the database.
2301
2302=item cf::db_put $family => $key => $value
2303
2304Stores the given C<$value> in the family.
2305
2306=cut
2307
2308our $DB;
2309
2310sub db_init {
2311 unless ($DB) {
2312 $DB = BDB::db_create $DB_ENV;
2313
2314 cf::sync_job {
2315 eval {
2316 $DB->set_flags (BDB::CHKSUM);
2317
2318 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2319 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2320 cf::cleanup "db_open(db): $!" if $!;
2321 };
2322 cf::cleanup "db_open(db): $@" if $@;
2323 };
2324 }
2325}
2326
2327sub db_get($$) {
2328 my $key = "$_[0]/$_[1]";
2329
2330 cf::sync_job {
2331 BDB::db_get $DB, undef, $key, my $data;
2332
2333 $! ? ()
2334 : $data
2335 }
2336}
2337
2338sub db_put($$$) {
2339 BDB::dbreq_pri 4;
2340 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2341}
2342
2343=item cf::cache $id => [$paths...], $processversion => $process
2344
2345Generic caching function that returns the value of the resource $id,
2346caching and regenerating as required.
2347
2348This function can block.
2349
2350=cut
2351
2352sub cache {
2353 my ($id, $src, $processversion, $process) = @_;
2354
2355 my $meta =
2356 join "\x00",
2357 $processversion,
2358 map {
2359 aio_stat $_
2360 and Carp::croak "$_: $!";
2361
2362 ($_, (stat _)[7,9])
2363 } @$src;
2364
2365 my $dbmeta = db_get cache => "$id/meta";
2366 if ($dbmeta ne $meta) {
2367 # changed, we may need to process
2368
2369 my @data;
2370 my $md5;
2371
2372 for (0 .. $#$src) {
2373 0 <= aio_load $src->[$_], $data[$_]
2374 or Carp::croak "$src->[$_]: $!";
2375 }
2376
2377 # if processing is expensive, check
2378 # checksum first
2379 if (1) {
2380 $md5 =
2381 join "\x00",
2382 $processversion,
2383 map {
2384 Coro::cede;
2385 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2386 } 0.. $#$src;
2387
2388
2389 my $dbmd5 = db_get cache => "$id/md5";
2390 if ($dbmd5 eq $md5) {
2391 db_put cache => "$id/meta", $meta;
2392
2393 return db_get cache => "$id/data";
2394 }
2395 }
2396
2397 my $t1 = Time::HiRes::time;
2398 my $data = $process->(\@data);
2399 my $t2 = Time::HiRes::time;
2400
2401 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2402
2403 db_put cache => "$id/data", $data;
2404 db_put cache => "$id/md5" , $md5;
2405 db_put cache => "$id/meta", $meta;
2406
2407 return $data;
2408 }
2409
2410 db_get cache => "$id/data"
2411}
2412
2413=item fork_call { }, $args
2414
2415Executes the given code block with the given arguments in a seperate
2416process, returning the results. Everything must be serialisable with
2417Coro::Storable. May, of course, block. Note that the executed sub may
2418never block itself or use any form of Event handling.
2419
2420=cut
2421
2422sub fork_call(&@) {
2423 my ($cb, @args) = @_;
2424
2425# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2426# or die "socketpair: $!";
2427 pipe my $fh1, my $fh2
2428 or die "pipe: $!";
2429
2430 if (my $pid = fork) {
2431 close $fh2;
2432
2433 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2434 $res = Coro::Storable::thaw $res;
2435
2436 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2437
2438 die $$res unless "ARRAY" eq ref $res;
2439
2440 return wantarray ? @$res : $res->[-1];
2441 } else {
2442 local $SIG{__WARN__};
2443 eval {
2444 local $SIG{__DIE__};
2445 close $fh1;
2446
2447 my @res = eval { $cb->(@args) };
2448 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2449 };
2450
2451 warn $@ if $@;
2452 _exit 0;
2453 }
2454}
2455
2456
2457
2458#############################################################################
2459# the server's init and main functions 2832# the server's init and main functions
2460 2833
2461sub load_facedata($) { 2834sub load_facedata($) {
2462 my ($path) = @_; 2835 my ($path) = @_;
2836
2837 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2463 2838
2464 warn "loading facedata from $path\n"; 2839 warn "loading facedata from $path\n";
2465 2840
2466 my $facedata; 2841 my $facedata;
2467 0 < aio_load $path, $facedata 2842 0 < aio_load $path, $facedata
2470 $facedata = Coro::Storable::thaw $facedata; 2845 $facedata = Coro::Storable::thaw $facedata;
2471 2846
2472 $facedata->{version} == 2 2847 $facedata->{version} == 2
2473 or cf::cleanup "$path: version mismatch, cannot proceed."; 2848 or cf::cleanup "$path: version mismatch, cannot proceed.";
2474 2849
2850 # patch in the exptable
2851 $facedata->{resource}{"res/exp_table"} = {
2852 type => FT_RSRC,
2853 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2854 };
2855 cf::cede_to_tick;
2856
2475 { 2857 {
2476 my $faces = $facedata->{faceinfo}; 2858 my $faces = $facedata->{faceinfo};
2477 2859
2478 while (my ($face, $info) = each %$faces) { 2860 while (my ($face, $info) = each %$faces) {
2479 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2861 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2480 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2862 cf::face::set_visibility $idx, $info->{visibility};
2863 cf::face::set_magicmap $idx, $info->{magicmap};
2481 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2864 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2482 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2865 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2483 Coro::cede; 2866
2867 cf::cede_to_tick;
2484 } 2868 }
2485 2869
2486 while (my ($face, $info) = each %$faces) { 2870 while (my ($face, $info) = each %$faces) {
2487 next unless $info->{smooth}; 2871 next unless $info->{smooth};
2488 my $idx = cf::face::find $face 2872 my $idx = cf::face::find $face
2489 or next; 2873 or next;
2490 if (my $smooth = cf::face::find $info->{smooth}) { 2874 if (my $smooth = cf::face::find $info->{smooth}) {
2875 cf::face::set_smooth $idx, $smooth;
2491 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2876 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2492 } else { 2877 } else {
2493 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2878 warn "smooth face '$info->{smooth}' not found for face '$face'";
2494 } 2879 }
2495 Coro::cede; 2880
2881 cf::cede_to_tick;
2496 } 2882 }
2497 } 2883 }
2498 2884
2499 { 2885 {
2500 my $anims = $facedata->{animinfo}; 2886 my $anims = $facedata->{animinfo};
2501 2887
2502 while (my ($anim, $info) = each %$anims) { 2888 while (my ($anim, $info) = each %$anims) {
2503 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2889 cf::anim::set $anim, $info->{frames}, $info->{facings};
2504 Coro::cede; 2890 cf::cede_to_tick;
2505 } 2891 }
2506 2892
2507 cf::anim::invalidate_all; # d'oh 2893 cf::anim::invalidate_all; # d'oh
2508 } 2894 }
2509 2895
2896 {
2897 # TODO: for gcfclient pleasure, we should give resources
2898 # that gcfclient doesn't grok a >10000 face index.
2899 my $res = $facedata->{resource};
2900
2901 my $soundconf = delete $res->{"res/sound.conf"};
2902
2903 while (my ($name, $info) = each %$res) {
2904 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2905 my $data;
2906
2907 if ($info->{type} & 1) {
2908 # prepend meta info
2909
2910 my $meta = $enc->encode ({
2911 name => $name,
2912 %{ $info->{meta} || {} },
2913 });
2914
2915 $data = pack "(w/a*)*", $meta, $info->{data};
2916 } else {
2917 $data = $info->{data};
2918 }
2919
2920 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2921 cf::face::set_type $idx, $info->{type};
2922
2923 cf::cede_to_tick;
2924 }
2925
2926 if ($soundconf) {
2927 $soundconf = $enc->decode (delete $soundconf->{data});
2928
2929 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2930 my $sound = $soundconf->{compat}[$_]
2931 or next;
2932
2933 my $face = cf::face::find "sound/$sound->[1]";
2934 cf::sound::set $sound->[0] => $face;
2935 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2936 }
2937
2938 while (my ($k, $v) = each %{$soundconf->{event}}) {
2939 my $face = cf::face::find "sound/$v";
2940 cf::sound::set $k => $face;
2941 }
2942 }
2943 }
2944
2510 1 2945 1
2511} 2946}
2947
2948register_exticmd fx_want => sub {
2949 my ($ns, $want) = @_;
2950
2951 while (my ($k, $v) = each %$want) {
2952 $ns->fx_want ($k, $v);
2953 }
2954};
2512 2955
2513sub reload_regions { 2956sub reload_regions {
2514 load_resource_file "$MAPDIR/regions" 2957 load_resource_file "$MAPDIR/regions"
2515 or die "unable to load regions file\n"; 2958 or die "unable to load regions file\n";
2959
2960 for (cf::region::list) {
2961 $_->{match} = qr/$_->{match}/
2962 if exists $_->{match};
2963 }
2516} 2964}
2517 2965
2518sub reload_facedata { 2966sub reload_facedata {
2519 load_facedata "$DATADIR/facedata" 2967 load_facedata "$DATADIR/facedata"
2520 or die "unable to load facedata\n"; 2968 or die "unable to load facedata\n";
2521} 2969}
2522 2970
2523sub reload_archetypes { 2971sub reload_archetypes {
2524 load_resource_file "$DATADIR/archetypes" 2972 load_resource_file "$DATADIR/archetypes"
2525 or die "unable to load archetypes\n"; 2973 or die "unable to load archetypes\n";
2974 #d# NEED to laod twice to resolve forward references
2975 # this really needs to be done in an extra post-pass
2976 # (which needs to be synchronous, so solve it differently)
2977 load_resource_file "$DATADIR/archetypes"
2978 or die "unable to load archetypes\n";
2526} 2979}
2527 2980
2528sub reload_treasures { 2981sub reload_treasures {
2529 load_resource_file "$DATADIR/treasures" 2982 load_resource_file "$DATADIR/treasures"
2530 or die "unable to load treasurelists\n"; 2983 or die "unable to load treasurelists\n";
2533sub reload_resources { 2986sub reload_resources {
2534 warn "reloading resource files...\n"; 2987 warn "reloading resource files...\n";
2535 2988
2536 reload_regions; 2989 reload_regions;
2537 reload_facedata; 2990 reload_facedata;
2991 #reload_archetypes;#d#
2538 reload_archetypes; 2992 reload_archetypes;
2539 reload_treasures; 2993 reload_treasures;
2540 2994
2541 warn "finished reloading resource files\n"; 2995 warn "finished reloading resource files\n";
2542} 2996}
2599 }, 3053 },
2600 ); 3054 );
2601 } 3055 }
2602} 3056}
2603 3057
3058sub write_runtime {
3059 my $runtime = "$LOCALDIR/runtime";
3060
3061 # first touch the runtime file to show we are still running:
3062 # the fsync below can take a very very long time.
3063
3064 IO::AIO::aio_utime $runtime, undef, undef;
3065
3066 my $guard = cf::lock_acquire "write_runtime";
3067
3068 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3069 or return;
3070
3071 my $value = $cf::RUNTIME + 90 + 10;
3072 # 10 is the runtime save interval, for a monotonic clock
3073 # 60 allows for the watchdog to kill the server.
3074
3075 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3076 and return;
3077
3078 # always fsync - this file is important
3079 aio_fsync $fh
3080 and return;
3081
3082 # touch it again to show we are up-to-date
3083 aio_utime $fh, undef, undef;
3084
3085 close $fh
3086 or return;
3087
3088 aio_rename "$runtime~", $runtime
3089 and return;
3090
3091 warn "runtime file written.\n";
3092
3093 1
3094}
3095
2604sub emergency_save() { 3096sub emergency_save() {
2605 my $freeze_guard = cf::freeze_mainloop; 3097 my $freeze_guard = cf::freeze_mainloop;
2606 3098
2607 warn "enter emergency perl save\n"; 3099 warn "enter emergency perl save\n";
2608 3100
2683 %EXT_CORO = (); 3175 %EXT_CORO = ();
2684 3176
2685 warn "removing commands"; 3177 warn "removing commands";
2686 %COMMAND = (); 3178 %COMMAND = ();
2687 3179
2688 warn "removing ext commands"; 3180 warn "removing ext/exti commands";
2689 %EXTCMD = (); 3181 %EXTCMD = ();
3182 %EXTICMD = ();
2690 3183
2691 warn "unloading/nuking all extensions"; 3184 warn "unloading/nuking all extensions";
2692 for my $pkg (@EXTS) { 3185 for my $pkg (@EXTS) {
2693 warn "... unloading $pkg"; 3186 warn "... unloading $pkg";
2694 3187
2812 my $signal = new Coro::Signal; 3305 my $signal = new Coro::Signal;
2813 push @WAIT_FOR_TICK_BEGIN, $signal; 3306 push @WAIT_FOR_TICK_BEGIN, $signal;
2814 $signal->wait; 3307 $signal->wait;
2815} 3308}
2816 3309
3310 my $min = 1e6;#d#
3311 my $avg = 10;
2817$TICK_WATCHER = Event->timer ( 3312$TICK_WATCHER = Event->timer (
2818 reentrant => 0, 3313 reentrant => 0,
2819 parked => 1, 3314 parked => 1,
2820 prio => 0, 3315 prio => 0,
2821 at => $NEXT_TICK || $TICK, 3316 at => $NEXT_TICK || $TICK,
2825 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3320 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2826 unless ++$bug_warning > 10; 3321 unless ++$bug_warning > 10;
2827 return; 3322 return;
2828 } 3323 }
2829 3324
2830 $NOW = Event::time; 3325 $NOW = $tick_start = Event::time;
2831 3326
2832 cf::server_tick; # one server iteration 3327 cf::server_tick; # one server iteration
3328
3329 0 && sync_job {#d#
3330 for(1..10) {
3331 my $t = Event::time;
3332 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3333 or die;
3334
3335 $map->width (50);
3336 $map->height (50);
3337 $map->alloc;
3338 $map->_load_objects ("/tmp/x.map", 1);
3339 my $t = Event::time - $t;
3340
3341 #next unless $t < 0.0013;#d#
3342 if ($t < $min) {
3343 $min = $t;
3344 }
3345 $avg = $avg * 0.99 + $t * 0.01;
3346 }
3347 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3348 exit 0;
3349 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3350 };
2833 3351
2834 $RUNTIME += $TICK; 3352 $RUNTIME += $TICK;
2835 $NEXT_TICK += $TICK; 3353 $NEXT_TICK += $TICK;
2836 3354
2837 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3355 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2843 } 3361 }
2844 3362
2845# my $AFTER = Event::time; 3363# my $AFTER = Event::time;
2846# warn $AFTER - $NOW;#d# 3364# warn $AFTER - $NOW;#d#
2847 3365
3366 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3367 $sig->send;
3368 }
3369 while (my $sig = shift @WAIT_FOR_TICK) {
3370 $sig->send;
3371 }
3372
3373 $NOW = Event::time;
3374
2848 # if we are delayed by four ticks or more, skip them all 3375 # if we are delayed by four ticks or more, skip them all
2849 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3376 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2850 3377
2851 $TICK_WATCHER->at ($NEXT_TICK); 3378 $TICK_WATCHER->at ($NEXT_TICK);
2852 $TICK_WATCHER->start; 3379 $TICK_WATCHER->start;
2853 3380
2854 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3381 $LOAD = ($NOW - $tick_start) / $TICK;
2855 $sig->send; 3382 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2856 }
2857 while (my $sig = shift @WAIT_FOR_TICK) {
2858 $sig->send;
2859 }
2860 3383
2861 _post_tick; 3384 _post_tick;
3385
3386
2862 }, 3387 },
2863); 3388);
2864 3389
2865{ 3390{
2866 BDB::max_poll_time $TICK * 0.1; 3391 BDB::max_poll_time $TICK * 0.1;
2925 prio => 6, 3450 prio => 6,
2926 cb => \&IO::AIO::poll_cb, 3451 cb => \&IO::AIO::poll_cb,
2927 ); 3452 );
2928} 3453}
2929 3454
3455my $_log_backtrace;
3456
3457sub _log_backtrace {
3458 my ($msg, @addr) = @_;
3459
3460 $msg =~ s/\n//;
3461
3462 # limit the # of concurrent backtraces
3463 if ($_log_backtrace < 2) {
3464 ++$_log_backtrace;
3465 async {
3466 my @bt = fork_call {
3467 @addr = map { sprintf "%x", $_ } @addr;
3468 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3469 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3470 or die "addr2line: $!";
3471
3472 my @funcs;
3473 my @res = <$fh>;
3474 chomp for @res;
3475 while (@res) {
3476 my ($func, $line) = splice @res, 0, 2, ();
3477 push @funcs, "[$func] $line";
3478 }
3479
3480 @funcs
3481 };
3482
3483 LOG llevInfo, "[ABT] $msg\n";
3484 LOG llevInfo, "[ABT] $_\n" for @bt;
3485 --$_log_backtrace;
3486 };
3487 } else {
3488 LOG llevInfo, "[ABT] $msg\n";
3489 LOG llevInfo, "[ABT] [suppressed]\n";
3490 }
3491}
3492
2930# load additional modules 3493# load additional modules
2931use cf::pod; 3494use cf::pod;
2932 3495
2933END { cf::emergency_save } 3496END { cf::emergency_save }
2934 3497

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines