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.265 by root, Fri May 11 08:00:00 2007 UTC vs.
Revision 1.346 by root, Tue Aug 28 19:38:40 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;
164 168
165These 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
166returns 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
167per 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.
168 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.
178
169=back 179=back
170 180
171=cut 181=cut
172 182
173BEGIN { 183BEGIN {
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
191@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';
192@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)
193 204
194# 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
195# within the Safe compartment. 206# within the Safe compartment.
196for my $pkg (qw( 207for my $pkg (qw(
197 cf::global cf::attachable 208 cf::global cf::attachable
205} 216}
206 217
207$Event::DIED = sub { 218$Event::DIED = sub {
208 warn "error in event callback: @_"; 219 warn "error in event callback: @_";
209}; 220};
221
222#############################################################################
210 223
211=head2 UTILITY FUNCTIONS 224=head2 UTILITY FUNCTIONS
212 225
213=over 4 226=over 4
214 227
233 $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;
234 $d 247 $d
235 } || "[unable to dump $_[0]: '$@']"; 248 } || "[unable to dump $_[0]: '$@']";
236} 249}
237 250
238use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
239
240=item $ref = cf::from_json $json 251=item $ref = cf::from_json $json
241 252
242Converts a JSON string into the corresponding perl data structure. 253Converts a JSON string into the corresponding perl data structure.
243 254
244=item $json = cf::to_json $ref 255=item $json = cf::to_json $ref
245 256
246Converts 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]) }
247 265
248=item cf::lock_wait $string 266=item cf::lock_wait $string
249 267
250Wait until the given lock is available. See cf::lock_acquire. 268Wait until the given lock is available. See cf::lock_acquire.
251 269
305 }; 323 };
306 $TICK_WATCHER->stop; 324 $TICK_WATCHER->stop;
307 $guard 325 $guard
308} 326}
309 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
310=item cf::async { BLOCK } 384=item cf::async { BLOCK }
311 385
312Currently the same as Coro::async_pool, meaning you cannot use 386Currently the same as Coro::async_pool, meaning you cannot use
313C<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
314thing you are allowed to do is call C<prio> on it. 388thing you are allowed to do is call C<prio> on it.
317 391
318BEGIN { *async = \&Coro::async_pool } 392BEGIN { *async = \&Coro::async_pool }
319 393
320=item cf::sync_job { BLOCK } 394=item cf::sync_job { BLOCK }
321 395
322The design of crossfire+ requires that the main coro ($Coro::main) is 396The design of Crossfire TRT requires that the main coroutine ($Coro::main)
323always able to handle events or runnable, as crossfire+ is only partly 397is always able to handle events or runnable, as Crossfire TRT is only
324reentrant. 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.
325 400
326If 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
327the given BLOCK in another coroutine while waiting for the result. The 402the given BLOCK in another coroutine while waiting for the result. The
328server 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
329fast or be very important. 404fast or be very important.
356 Coro::cede or Event::one_event; 431 Coro::cede or Event::one_event;
357 } 432 }
358 433
359 $time = Event::time - $time; 434 $time = Event::time - $time;
360 435
361 LOG llevError | logBacktrace, "long sync job\n" 436 LOG llevError | logBacktrace, Carp::longmess "long sync job"
362 if $time > $TICK * 0.5; 437 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
363 438
364 $tick_start += $time; # do not account sync jobs to server load 439 $tick_start += $time; # do not account sync jobs to server load
365 440
366 wantarray ? @res : $res[0] 441 wantarray ? @res : $res[0]
367 } else { 442 } else {
389 $EXT_CORO{$coro+0} = $coro; 464 $EXT_CORO{$coro+0} = $coro;
390 465
391 $coro 466 $coro
392} 467}
393 468
394sub write_runtime { 469=item fork_call { }, $args
395 my $runtime = "$LOCALDIR/runtime";
396 470
397 # first touch the runtime file to show we are still running: 471Executes the given code block with the given arguments in a seperate
398 # the fsync below can take a very very long time. 472process, returning the results. Everything must be serialisable with
473Coro::Storable. May, of course, block. Note that the executed sub may
474never block itself or use any form of Event handling.
399 475
400 if (my $fh = aio_open $runtime, O_WRONLY, 0) { 476=cut
401 utime undef, undef, $fh;
402 }
403 477
404 my $guard = cf::lock_acquire "write_runtime"; 478sub fork_call(&@) {
479 my ($cb, @args) = @_;
405 480
406 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 481 # we seemingly have to make a local copy of the whole thing,
407 or return; 482 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious)
408 484
409 my $value = $cf::RUNTIME + 90 + 10; 485 my @res = Coro::Util::fork_eval {
410 # 10 is the runtime save interval, for a monotonic clock 486 reset_signals;
411 # 60 allows for the watchdog to kill the server. 487 &$cb
488 }, @args;
412 489
413 (aio_write $fh, 0, (length $value), $value, 0) <= 0 490 wantarray ? @res : $res[-1]
414 and return; 491}
415 492
416 # always fsync - this file is important 493=item $value = cf::db_get $family => $key
417 aio_fsync $fh
418 and return;
419 494
420 # touch it again to show we are up-to-date 495Returns a single value from the environment database.
421 utime undef, undef, $fh;
422 496
423 close $fh 497=item cf::db_put $family => $key => $value
424 or return;
425 498
426 aio_rename "$runtime~", $runtime 499Stores the given C<$value> in the family. It can currently store binary
427 and return; 500data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
428 501
429 warn "runtime file written.\n";#d# 502=cut
430 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 };
431 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 cf::cede_to_tick;
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"
432} 607}
433 608
434=item cf::datalog type => key => value, ... 609=item cf::datalog type => key => value, ...
435 610
436Log 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.
454attach callbacks/event handlers (a collection of which is called an "attachment") 629attach callbacks/event handlers (a collection of which is called an "attachment")
455to it. All such attachable objects support the following methods. 630to it. All such attachable objects support the following methods.
456 631
457In 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>
458C<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
459crossfire+). 634Crossfire TRT).
460 635
461=over 4 636=over 4
462 637
463=item $attachable->attach ($attachment, key => $value...) 638=item $attachable->attach ($attachment, key => $value...)
464 639
627 $registry = $CB_TYPE[$object_type] ||= []; 802 $registry = $CB_TYPE[$object_type] ||= [];
628 803
629 } elsif ($type eq "subtype") { 804 } elsif ($type eq "subtype") {
630 defined $object_type or Carp::croak "subtype specified without type"; 805 defined $object_type or Carp::croak "subtype specified without type";
631 my $object_subtype = shift @arg; 806 my $object_subtype = shift @arg;
632 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 807 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
633 808
634 } elsif ($type eq "package") { 809 } elsif ($type eq "package") {
635 my $pkg = shift @arg; 810 my $pkg = shift @arg;
636 811
637 while (my ($name, $id) = each %cb_id) { 812 while (my ($name, $id) = each %cb_id) {
666 _attach $registry, $klass, @attach; 841 _attach $registry, $klass, @attach;
667 } 842 }
668 843
669 $obj->{$name} = \%arg; 844 $obj->{$name} = \%arg;
670 } else { 845 } else {
671 warn "object uses attachment '$name' that is not available, postponing.\n"; 846 warn "object uses attachment '$name' which is not available, postponing.\n";
672 } 847 }
673 848
674 $obj->{_attachment}{$name} = undef; 849 $obj->{_attachment}{$name} = undef;
675} 850}
676 851
678 if (ref $_[0]) { 853 if (ref $_[0]) {
679 _object_attach @_; 854 _object_attach @_;
680 } else { 855 } else {
681 _attach shift->_attach_registry, @_; 856 _attach shift->_attach_registry, @_;
682 } 857 }
858 _recalc_want;
683}; 859};
684 860
685# all those should be optimised 861# all those should be optimised
686sub cf::attachable::detach { 862sub cf::attachable::detach {
687 my ($obj, $name) = @_; 863 my ($obj, $name) = @_;
690 delete $obj->{_attachment}{$name}; 866 delete $obj->{_attachment}{$name};
691 reattach ($obj); 867 reattach ($obj);
692 } else { 868 } else {
693 Carp::croak "cannot, currently, detach class attachments"; 869 Carp::croak "cannot, currently, detach class attachments";
694 } 870 }
871 _recalc_want;
695}; 872};
696 873
697sub cf::attachable::attached { 874sub cf::attachable::attached {
698 my ($obj, $name) = @_; 875 my ($obj, $name) = @_;
699 876
714 "; 891 ";
715 die if $@; 892 die if $@;
716} 893}
717 894
718our $override; 895our $override;
719our @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?
720 897
721sub override { 898sub override {
722 $override = 1; 899 $override = 1;
723 @invoke_results = (); 900 @INVOKE_RESULTS = (@_);
724} 901}
725 902
726sub do_invoke { 903sub do_invoke {
727 my $event = shift; 904 my $event = shift;
728 my $callbacks = shift; 905 my $callbacks = shift;
729 906
730 @invoke_results = (); 907 @INVOKE_RESULTS = ();
731 908
732 local $override; 909 local $override;
733 910
734 for (@$callbacks) { 911 for (@$callbacks) {
735 eval { &{$_->[1]} }; 912 eval { &{$_->[1]} };
752 929
753Generate an object-specific event with the given arguments. 930Generate an object-specific event with the given arguments.
754 931
755This 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
756removed 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
757results (if you must, access C<@cf::invoke_results> directly). 934results (if you must, access C<@cf::INVOKE_RESULTS> directly).
758 935
759=back 936=back
760 937
761=cut 938=cut
762 939
763############################################################################# 940#############################################################################
764# 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}
765 953
766sub reattach { 954sub reattach {
767 # basically do the same as instantiate, without calling instantiate 955 # basically do the same as instantiate, without calling instantiate
768 my ($obj) = @_; 956 my ($obj) = @_;
769 957
872 or return; 1060 or return;
873 $av = eval { (Storable::thaw $av)->{objs} }; 1061 $av = eval { (Storable::thaw $av)->{objs} };
874 } 1062 }
875 1063
876 warn sprintf "loading %s (%d)\n", 1064 warn sprintf "loading %s (%d)\n",
877 $filename, length $data, scalar @{$av || []};#d# 1065 $filename, length $data, scalar @{$av || []};
878 return ($data, $av); 1066 return ($data, $av);
879} 1067}
1068
1069=head2 COMMAND CALLBACKS
1070
1071=over 4
1072
1073=cut
880 1074
881############################################################################# 1075#############################################################################
882# command handling &c 1076# command handling &c
883 1077
884=item cf::register_command $name => \&callback($ob,$args); 1078=item cf::register_command $name => \&callback($ob,$args);
897 push @{ $COMMAND{$name} }, [$caller, $cb]; 1091 push @{ $COMMAND{$name} }, [$caller, $cb];
898} 1092}
899 1093
900=item cf::register_extcmd $name => \&callback($pl,$packet); 1094=item cf::register_extcmd $name => \&callback($pl,$packet);
901 1095
902Register 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.
903 1101
904If 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
905called. 1103called.
906 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
907=cut 1116=cut
908 1117
909sub register_extcmd { 1118sub register_extcmd {
910 my ($name, $cb) = @_; 1119 my ($name, $cb) = @_;
911 1120
912 $EXTCMD{$name} = $cb; 1121 $EXTCMD{$name} = $cb;
1122}
1123
1124sub register_exticmd {
1125 my ($name, $cb) = @_;
1126
1127 $EXTICMD{$name} = $cb;
913} 1128}
914 1129
915cf::player->attach ( 1130cf::player->attach (
916 on_command => sub { 1131 on_command => sub {
917 my ($pl, $name, $params) = @_; 1132 my ($pl, $name, $params) = @_;
926 cf::override; 1141 cf::override;
927 }, 1142 },
928 on_extcmd => sub { 1143 on_extcmd => sub {
929 my ($pl, $buf) = @_; 1144 my ($pl, $buf) = @_;
930 1145
931 my $msg = eval { from_json $buf }; 1146 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
932 1147
933 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
934 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1156 if (my $cb = $EXTCMD{$type}) {
935 if (my %reply = $cb->($pl, $msg)) { 1157 @reply = $cb->($pl, @payload);
936 $pl->ext_reply ($msg->{msgid}, %reply);
937 }
938 } 1158 }
1159
1160 $pl->ext_reply ($reply, @reply)
1161 if $reply;
1162
939 } else { 1163 } else {
940 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1164 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
941 } 1165 }
942 1166
943 cf::override; 1167 cf::override;
944 }, 1168 },
945); 1169);
946 1170
947sub load_extension {
948 my ($path) = @_;
949
950 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
951 my $base = $1;
952 my $pkg = $1;
953 $pkg =~ s/[^[:word:]]/_/g;
954 $pkg = "ext::$pkg";
955
956 warn "... loading '$path' into '$pkg'\n";
957
958 open my $fh, "<:utf8", $path
959 or die "$path: $!";
960
961 my $source =
962 "package $pkg; use strict; use utf8;\n"
963 . "#line 1 \"$path\"\n{\n"
964 . (do { local $/; <$fh> })
965 . "\n};\n1";
966
967 unless (eval $source) {
968 my $msg = $@ ? "$path: $@\n"
969 : "extension disabled.\n";
970 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
971 warn $@;
972 warn "mandatory extension failed to load, exiting.\n";
973 exit 1;
974 }
975 die $@;
976 }
977
978 push @EXTS, $pkg;
979}
980
981sub load_extensions { 1171sub load_extensions {
1172 cf::sync_job {
1173 my %todo;
1174
982 for my $ext (<$LIBDIR/*.ext>) { 1175 for my $path (<$LIBDIR/*.ext>) {
983 next unless -r $ext; 1176 next unless -r $path;
984 eval { 1177
985 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;
986 1 1235 }
987 } or warn "$ext not loaded: $@"; 1236
1237 skip:
1238 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1239 unless $progress;
1240 }
988 } 1241 };
989} 1242}
990 1243
991############################################################################# 1244#############################################################################
1245
1246=back
992 1247
993=head2 CORE EXTENSIONS 1248=head2 CORE EXTENSIONS
994 1249
995Functions and methods that extend core crossfire objects. 1250Functions and methods that extend core crossfire objects.
996 1251
1067 1322
1068 aio_mkdir playerdir $pl, 0770; 1323 aio_mkdir playerdir $pl, 0770;
1069 $pl->{last_save} = $cf::RUNTIME; 1324 $pl->{last_save} = $cf::RUNTIME;
1070 1325
1071 $pl->save_pl ($path); 1326 $pl->save_pl ($path);
1072 Coro::cede; 1327 cf::cede_to_tick;
1073} 1328}
1074 1329
1075sub new($) { 1330sub new($) {
1076 my ($login) = @_; 1331 my ($login) = @_;
1077 1332
1081 $self->{deny_save} = 1; 1336 $self->{deny_save} = 1;
1082 1337
1083 $cf::PLAYER{$login} = $self; 1338 $cf::PLAYER{$login} = $self;
1084 1339
1085 $self 1340 $self
1341}
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 (@_);
1086} 1351}
1087 1352
1088=item $pl->quit_character 1353=item $pl->quit_character
1089 1354
1090Nukes the player without looking back. If logged in, the connection will 1355Nukes the player without looking back. If logged in, the connection will
1184 } 1449 }
1185 1450
1186 \@paths 1451 \@paths
1187} 1452}
1188 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
1189=item $player->ext_reply ($msgid, %msg) 1504=item $player->ext_reply ($msgid, @msg)
1190 1505
1191Sends an ext reply to the player. 1506Sends an ext reply to the player.
1192 1507
1193=cut 1508=cut
1194 1509
1195sub ext_reply($$%) { 1510sub ext_reply($$@) {
1196 my ($self, $id, %msg) = @_; 1511 my ($self, $id, @msg) = @_;
1197 1512
1198 $msg{msgid} = $id; 1513 $self->ns->ext_reply ($id, @msg)
1199
1200 $self->send ("ext " . cf::to_json \%msg);
1201} 1514}
1202 1515
1203=item $player->ext_event ($type, %msg) 1516=item $player->ext_msg ($type, @msg)
1204 1517
1205Sends an ext event to the client. 1518Sends an ext event to the client.
1206 1519
1207=cut 1520=cut
1208 1521
1209sub ext_event($$%) { 1522sub ext_msg($$@) {
1210 my ($self, $type, %msg) = @_; 1523 my ($self, $type, @msg) = @_;
1211 1524
1212 $self->ns->ext_event ($type, %msg); 1525 $self->ns->ext_msg ($type, @msg);
1213} 1526}
1214 1527
1215=head3 cf::region 1528=head3 cf::region
1216 1529
1217=over 4 1530=over 4
1220 1533
1221package cf::region; 1534package cf::region;
1222 1535
1223=item cf::region::find_by_path $path 1536=item cf::region::find_by_path $path
1224 1537
1225Tries 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.
1226 1539
1227=cut 1540=cut
1228 1541
1229sub find_by_path($) { 1542sub find_by_path($) {
1230 my ($path) = @_; 1543 my ($path) = @_;
1231 1544
1232 my ($match, $specificity); 1545 my ($match, $specificity);
1233 1546
1234 for my $region (list) { 1547 for my $region (list) {
1235 if ($region->match && $path =~ $region->match) { 1548 if ($region->{match} && $path =~ $region->{match}) {
1236 ($match, $specificity) = ($region, $region->specificity) 1549 ($match, $specificity) = ($region, $region->specificity)
1237 if $region->specificity > $specificity; 1550 if $region->specificity > $specificity;
1238 } 1551 }
1239 } 1552 }
1240 1553
1304 my ($self, $merge) = @_; 1617 my ($self, $merge) = @_;
1305 1618
1306 # we have to keep some variables in memory intact 1619 # we have to keep some variables in memory intact
1307 local $self->{path}; 1620 local $self->{path};
1308 local $self->{load_path}; 1621 local $self->{load_path};
1309 local $self->{deny_save};
1310 local $self->{deny_reset};
1311 1622
1312 $self->SUPER::thawer_merge ($merge); 1623 $self->SUPER::thawer_merge ($merge);
1313} 1624}
1314 1625
1315sub normalise { 1626sub normalise {
1362 $self->init; # pass $1 etc. 1673 $self->init; # pass $1 etc.
1363 return $self; 1674 return $self;
1364 } 1675 }
1365 } 1676 }
1366 1677
1367 Carp::carp "unable to resolve path '$path' (base '$base')."; 1678 Carp::cluck "unable to resolve path '$path' (base '$base').";
1368 () 1679 ()
1369} 1680}
1370 1681
1371sub init { 1682sub init {
1372 my ($self) = @_; 1683 my ($self) = @_;
1413sub change_all_map_light { 1724sub change_all_map_light {
1414 my ($change) = @_; 1725 my ($change) = @_;
1415 1726
1416 $_->change_map_light ($change) 1727 $_->change_map_light ($change)
1417 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;
1418} 1737}
1419 1738
1420sub unlink_save { 1739sub unlink_save {
1421 my ($self) = @_; 1740 my ($self) = @_;
1422 1741
1480 $self->load_header_orig 1799 $self->load_header_orig
1481 or return; 1800 or return;
1482 $self->prepare_orig; 1801 $self->prepare_orig;
1483 } 1802 }
1484 1803
1804 $self->{deny_reset} = 1
1805 if $self->no_reset;
1806
1485 $self->default_region (cf::region::find_by_path $self->{path}) 1807 $self->default_region (cf::region::find_by_path $self->{path})
1486 unless $self->default_region; 1808 unless $self->default_region;
1487 1809
1488 1 1810 1
1489} 1811}
1504 $map->{last_save} = $cf::RUNTIME; 1826 $map->{last_save} = $cf::RUNTIME;
1505 1827
1506 $map->load_header 1828 $map->load_header
1507 or return; 1829 or return;
1508 1830
1509 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1831 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1510 # doing this can freeze the server in a sync job, obviously 1832 # doing this can freeze the server in a sync job, obviously
1511 #$cf::WAIT_FOR_TICK->wait; 1833 #$cf::WAIT_FOR_TICK->wait;
1512 $map->reset; 1834 $map->reset;
1513 undef $guard; 1835 undef $guard;
1514 return find $path; 1836 return find $path;
1527 local $self->{deny_reset} = 1; # loading can take a long time 1849 local $self->{deny_reset} = 1; # loading can take a long time
1528 1850
1529 my $path = $self->{path}; 1851 my $path = $self->{path};
1530 1852
1531 { 1853 {
1854 my $guard1 = cf::lock_acquire "map_data:$path";
1532 my $guard = cf::lock_acquire "map_load:$path"; 1855 my $guard2 = cf::lock_acquire "map_load:$path";
1533 1856
1534 return if $self->in_memory != cf::MAP_SWAPPED; 1857 return if $self->in_memory != cf::MAP_SWAPPED;
1535 1858
1536 $self->in_memory (cf::MAP_LOADING); 1859 $self->in_memory (cf::MAP_LOADING);
1537 1860
1538 $self->alloc; 1861 $self->alloc;
1539 1862
1540 $self->pre_load; 1863 $self->pre_load;
1541 Coro::cede; 1864 cf::cede_to_tick;
1542 1865
1543 $self->_load_objects ($self->{load_path}, 1) 1866 $self->_load_objects ($self->{load_path}, 1)
1544 or return; 1867 or return;
1545 1868
1546 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1869 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1552 $self->clear_unique_items; 1875 $self->clear_unique_items;
1553 $self->_load_objects ($uniq, 0); 1876 $self->_load_objects ($uniq, 0);
1554 } 1877 }
1555 } 1878 }
1556 1879
1557 Coro::cede; 1880 cf::cede_to_tick;
1558 # now do the right thing for maps 1881 # now do the right thing for maps
1559 $self->link_multipart_objects; 1882 $self->link_multipart_objects;
1560 $self->difficulty ($self->estimate_difficulty) 1883 $self->difficulty ($self->estimate_difficulty)
1561 unless $self->difficulty; 1884 unless $self->difficulty;
1562 Coro::cede; 1885 cf::cede_to_tick;
1563 1886
1564 unless ($self->{deny_activate}) { 1887 unless ($self->{deny_activate}) {
1565 $self->decay_objects; 1888 $self->decay_objects;
1566 $self->fix_auto_apply; 1889 $self->fix_auto_apply;
1567 $self->update_buttons; 1890 $self->update_buttons;
1568 Coro::cede; 1891 cf::cede_to_tick;
1569 $self->set_darkness_map; 1892 $self->set_darkness_map;
1570 Coro::cede; 1893 cf::cede_to_tick;
1571 $self->activate; 1894 $self->activate;
1572 } 1895 }
1896
1897 $self->{last_save} = $cf::RUNTIME;
1898 $self->last_access ($cf::RUNTIME);
1573 1899
1574 $self->in_memory (cf::MAP_IN_MEMORY); 1900 $self->in_memory (cf::MAP_IN_MEMORY);
1575 } 1901 }
1576 1902
1577 $self->post_load; 1903 $self->post_load;
1581 my ($self, $ob) = @_; 1907 my ($self, $ob) = @_;
1582 1908
1583 return find "~" . $ob->name . "/" . $self->{path} 1909 return find "~" . $ob->name . "/" . $self->{path}
1584 if $self->per_player; 1910 if $self->per_player;
1585 1911
1912# return find "?party/" . $ob->name . "/" . $self->{path}
1913# if $self->per_party;
1914
1586 $self 1915 $self
1587} 1916}
1588 1917
1589# find and load all maps in the 3x3 area around a map 1918# find and load all maps in the 3x3 area around a map
1590sub load_diag { 1919sub load_neighbours {
1591 my ($map) = @_; 1920 my ($map) = @_;
1592 1921
1593 my @diag; # diagonal neighbours 1922 my @neigh; # diagonal neighbours
1594 1923
1595 for (0 .. 3) { 1924 for (0 .. 3) {
1596 my $neigh = $map->tile_path ($_) 1925 my $neigh = $map->tile_path ($_)
1597 or next; 1926 or next;
1598 $neigh = find $neigh, $map 1927 $neigh = find $neigh, $map
1599 or next; 1928 or next;
1600 $neigh->load; 1929 $neigh->load;
1601 1930
1931 push @neigh,
1602 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1932 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1603 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1933 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1604 } 1934 }
1605 1935
1606 for (@diag) { 1936 for (grep defined $_->[0], @neigh) {
1937 my ($path, $origin) = @$_;
1607 my $neigh = find @$_ 1938 my $neigh = find $path, $origin
1608 or next; 1939 or next;
1609 $neigh->load; 1940 $neigh->load;
1610 } 1941 }
1611} 1942}
1612 1943
1617} 1948}
1618 1949
1619sub do_load_sync { 1950sub do_load_sync {
1620 my ($map) = @_; 1951 my ($map) = @_;
1621 1952
1953 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1954 if $Coro::current == $Coro::main;
1955
1622 cf::sync_job { $map->load }; 1956 cf::sync_job { $map->load };
1623} 1957}
1624 1958
1625our %MAP_PREFETCH; 1959our %MAP_PREFETCH;
1626our $MAP_PREFETCHER = undef; 1960our $MAP_PREFETCHER = undef;
1627 1961
1628sub find_async { 1962sub find_async {
1629 my ($path, $origin) = @_; 1963 my ($path, $origin, $load) = @_;
1630 1964
1631 $path = normalise $path, $origin && $origin->{path}; 1965 $path = normalise $path, $origin && $origin->{path};
1632 1966
1633 if (my $map = $cf::MAP{$path}) { 1967 if (my $map = $cf::MAP{$path}) {
1634 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1968 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1635 } 1969 }
1636 1970
1637 undef $MAP_PREFETCH{$path}; 1971 $MAP_PREFETCH{$path} |= $load;
1972
1638 $MAP_PREFETCHER ||= cf::async { 1973 $MAP_PREFETCHER ||= cf::async {
1639 while (%MAP_PREFETCH) { 1974 while (%MAP_PREFETCH) {
1640 for my $path (keys %MAP_PREFETCH) { 1975 while (my ($k, $v) = each %MAP_PREFETCH) {
1641 my $map = find $path 1976 if (my $map = find $k) {
1642 or next;
1643 $map->load; 1977 $map->load if $v;
1978 }
1644 1979
1645 delete $MAP_PREFETCH{$path}; 1980 delete $MAP_PREFETCH{$k};
1646 } 1981 }
1647 } 1982 }
1648 undef $MAP_PREFETCHER; 1983 undef $MAP_PREFETCHER;
1649 }; 1984 };
1650 $MAP_PREFETCHER->prio (6); 1985 $MAP_PREFETCHER->prio (6);
1653} 1988}
1654 1989
1655sub save { 1990sub save {
1656 my ($self) = @_; 1991 my ($self) = @_;
1657 1992
1658 my $lock = cf::lock_acquire "map_data:" . $self->path; 1993 my $lock = cf::lock_acquire "map_data:$self->{path}";
1659 1994
1660 $self->{last_save} = $cf::RUNTIME; 1995 $self->{last_save} = $cf::RUNTIME;
1661 1996
1662 return unless $self->dirty; 1997 return unless $self->dirty;
1663 1998
1686 my ($self) = @_; 2021 my ($self) = @_;
1687 2022
1688 # save first because save cedes 2023 # save first because save cedes
1689 $self->save; 2024 $self->save;
1690 2025
1691 my $lock = cf::lock_acquire "map_data:" . $self->path; 2026 my $lock = cf::lock_acquire "map_data:$self->{path}";
1692 2027
1693 return if $self->players; 2028 return if $self->players;
1694 return if $self->in_memory != cf::MAP_IN_MEMORY; 2029 return if $self->in_memory != cf::MAP_IN_MEMORY;
1695 return if $self->{deny_save}; 2030 return if $self->{deny_save};
1696 2031
1700 2035
1701sub reset_at { 2036sub reset_at {
1702 my ($self) = @_; 2037 my ($self) = @_;
1703 2038
1704 # TODO: safety, remove and allow resettable per-player maps 2039 # TODO: safety, remove and allow resettable per-player maps
1705 return 1e99 if $self->isa ("ext::map_per_player");#d#
1706 return 1e99 if $self->{deny_reset}; 2040 return 1e99 if $self->{deny_reset};
1707 2041
1708 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2042 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1709 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2043 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1710 2044
1721 my ($self) = @_; 2055 my ($self) = @_;
1722 2056
1723 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2057 my $lock = cf::lock_acquire "map_data:$self->{path}";
1724 2058
1725 return if $self->players; 2059 return if $self->players;
1726 return if $self->isa ("ext::map_per_player");#d#
1727 2060
1728 warn "resetting map ", $self->path;#d# 2061 warn "resetting map ", $self->path;
1729 2062
1730 $self->in_memory (cf::MAP_SWAPPED); 2063 $self->in_memory (cf::MAP_SWAPPED);
1731 2064
1732 # need to save uniques path 2065 # need to save uniques path
1733 unless ($self->{deny_save}) { 2066 unless ($self->{deny_save}) {
1765 $cf::MAP{$self->path} = $self; 2098 $cf::MAP{$self->path} = $self;
1766 2099
1767 $self->reset; # polite request, might not happen 2100 $self->reset; # polite request, might not happen
1768} 2101}
1769 2102
2103=item $maps = cf::map::tmp_maps
2104
2105Returns an arrayref with all map paths of currently instantiated and saved
2106maps. May block.
2107
2108=cut
2109
2110sub tmp_maps() {
2111 [
2112 map {
2113 utf8::decode $_;
2114 /\.map$/
2115 ? normalise $_
2116 : ()
2117 } @{ aio_readdir $TMPDIR or [] }
2118 ]
2119}
2120
2121=item $maps = cf::map::random_maps
2122
2123Returns an arrayref with all map paths of currently instantiated and saved
2124random maps. May block.
2125
2126=cut
2127
2128sub random_maps() {
2129 [
2130 map {
2131 utf8::decode $_;
2132 /\.map$/
2133 ? normalise "?random/$_"
2134 : ()
2135 } @{ aio_readdir $RANDOMDIR or [] }
2136 ]
2137}
2138
1770=item cf::map::unique_maps 2139=item cf::map::unique_maps
1771 2140
1772Returns an arrayref of paths of all shared maps that have 2141Returns an arrayref of paths of all shared maps that have
1773instantiated unique items. May block. 2142instantiated unique items. May block.
1774 2143
1775=cut 2144=cut
1776 2145
1777sub unique_maps() { 2146sub unique_maps() {
1778 my $files = aio_readdir $UNIQUEDIR 2147 [
1779 or return; 2148 map {
1780
1781 my @paths;
1782
1783 for (@$files) {
1784 utf8::decode $_; 2149 utf8::decode $_;
1785 next if /\.pst$/; 2150 /\.map$/
1786 next unless /^$PATH_SEP/o; 2151 ? normalise $_
1787 2152 : ()
1788 push @paths, cf::map::normalise $_; 2153 } @{ aio_readdir $UNIQUEDIR or [] }
1789 } 2154 ]
1790
1791 \@paths
1792} 2155}
1793 2156
1794package cf; 2157package cf;
1795 2158
1796=back 2159=back
1842 2205
1843 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2206 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1844 2207
1845 if ($self->{record_replies}) { 2208 if ($self->{record_replies}) {
1846 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2209 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2210
1847 } else { 2211 } else {
2212 my $pl = $self->contr;
2213
2214 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2215 my $dialog = $pl->{npc_dialog};
2216 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2217
2218 } else {
1848 $msg = $npc->name . " says: $msg" if $npc; 2219 $msg = $npc->name . " says: $msg" if $npc;
1849 $self->message ($msg, $flags); 2220 $self->message ($msg, $flags);
2221 }
1850 } 2222 }
2223}
2224
2225=item $object->send_msg ($channel, $msg, $color, [extra...])
2226
2227=cut
2228
2229sub cf::object::send_msg {
2230 my $pl = shift->contr
2231 or return;
2232 $pl->send_msg (@_);
1851} 2233}
1852 2234
1853=item $player_object->may ("access") 2235=item $player_object->may ("access")
1854 2236
1855Returns wether the given player is authorized to access resource "access" 2237Returns wether the given player is authorized to access resource "access"
1902 $self->deactivate_recursive; 2284 $self->deactivate_recursive;
1903 2285
1904 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2286 return if UNIVERSAL::isa $self->map, "ext::map_link";
1905 2287
1906 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2288 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1907 if $self->map; 2289 if $self->map && $self->map->{path} ne "{link}";
1908 2290
1909 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2291 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1910} 2292}
1911 2293
1912sub cf::object::player::leave_link { 2294sub cf::object::player::leave_link {
1913 my ($self, $map, $x, $y) = @_; 2295 my ($self, $map, $x, $y) = @_;
2296
2297 return unless $self->contr->active;
1914 2298
1915 my $link_pos = delete $self->{_link_pos}; 2299 my $link_pos = delete $self->{_link_pos};
1916 2300
1917 unless ($map) { 2301 unless ($map) {
1918 # restore original map position 2302 # restore original map position
1932 # use -1 or undef as default coordinates, not 0, 0 2316 # use -1 or undef as default coordinates, not 0, 0
1933 ($x, $y) = ($map->enter_x, $map->enter_y) 2317 ($x, $y) = ($map->enter_x, $map->enter_y)
1934 if $x <=0 && $y <= 0; 2318 if $x <=0 && $y <= 0;
1935 2319
1936 $map->load; 2320 $map->load;
1937 $map->load_diag; 2321 $map->load_neighbours;
1938 2322
1939 return unless $self->contr->active; 2323 return unless $self->contr->active;
1940 $self->activate_recursive; 2324 $self->activate_recursive;
1941 2325
1942 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2326 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1943 $self->enter_map ($map, $x, $y); 2327 $self->enter_map ($map, $x, $y);
1944} 2328}
1945 2329
1946cf::player->attach ( 2330=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1947 on_logout => sub {
1948 my ($pl) = @_;
1949 2331
1950 # abort map switching before logout 2332Moves the player to the given map-path and coordinates by first freezing
1951 if ($pl->ob->{_link_pos}) { 2333her, loading and preparing them map, calling the provided $check callback
1952 cf::sync_job { 2334that has to return the map if sucecssful, and then unfreezes the player on
1953 $pl->ob->leave_link 2335the new (success) or old (failed) map position. In either case, $done will
1954 }; 2336be called at the end of this process.
1955 }
1956 },
1957 on_login => sub {
1958 my ($pl) = @_;
1959 2337
1960 # try to abort aborted map switching on player login :)
1961 # should happen only on crashes
1962 if ($pl->ob->{_link_pos}) {
1963 $pl->ob->enter_link;
1964 (async {
1965 $pl->ob->reply (undef,
1966 "There was an internal problem at your last logout, "
1967 . "the server will try to bring you to your intended destination in a second.",
1968 cf::NDI_RED);
1969 # we need this sleep as the login has a concurrent enter_exit running
1970 # and this sleep increases chances of the player not ending up in scorn
1971 Coro::Timer::sleep 1;
1972 $pl->ob->leave_link;
1973 })->prio (2);
1974 }
1975 },
1976);
1977
1978=item $player_object->goto ($path, $x, $y)
1979
1980=cut 2338=cut
2339
2340our $GOTOGEN;
1981 2341
1982sub cf::object::player::goto { 2342sub cf::object::player::goto {
1983 my ($self, $path, $x, $y) = @_; 2343 my ($self, $path, $x, $y, $check, $done) = @_;
2344
2345 # do generation counting so two concurrent goto's will be executed in-order
2346 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1984 2347
1985 $self->enter_link; 2348 $self->enter_link;
1986 2349
1987 (async { 2350 (async {
1988 my $map = eval { 2351 my $map = eval {
1989 my $map = cf::map::find $path; 2352 my $map = cf::map::find $path;
2353
2354 if ($map) {
1990 $map = $map->customise_for ($self) if $map; 2355 $map = $map->customise_for ($self);
2356 $map = $check->($map) if $check && $map;
2357 } else {
2358 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2359 }
2360
1991 $map 2361 $map
2362 };
2363
2364 if ($@) {
2365 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2366 LOG llevError | logBacktrace, Carp::longmess $@;
1992 } or 2367 }
1993 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1994 2368
2369 if ($gen == $self->{_goto_generation}) {
2370 delete $self->{_goto_generation};
1995 $self->leave_link ($map, $x, $y); 2371 $self->leave_link ($map, $x, $y);
2372 }
2373
2374 $done->() if $done;
1996 })->prio (1); 2375 })->prio (1);
1997} 2376}
1998 2377
1999=item $player_object->enter_exit ($exit_object) 2378=item $player_object->enter_exit ($exit_object)
2000 2379
2069 my $hp = $exit->stats->hp; 2448 my $hp = $exit->stats->hp;
2070 my $sp = $exit->stats->sp; 2449 my $sp = $exit->stats->sp;
2071 2450
2072 $self->enter_link; 2451 $self->enter_link;
2073 2452
2453 # if exit is damned, update players death & WoR home-position
2454 $self->contr->savebed ($slaying, $hp, $sp)
2455 if $exit->flag (FLAG_DAMNED);
2456
2074 (async { 2457 (async {
2075 $self->deactivate_recursive; # just to be sure 2458 $self->deactivate_recursive; # just to be sure
2076 unless (eval { 2459 unless (eval {
2077 $self->goto ($slaying, $hp, $sp); 2460 $self->goto ($slaying, $hp, $sp);
2078 2461
2105 2488
2106 utf8::encode $text; 2489 utf8::encode $text;
2107 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2490 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2108} 2491}
2109 2492
2493=item $client->send_msg ($channel, $msg, $color, [extra...])
2494
2495Send a drawinfo or msg packet to the client, formatting the msg for the
2496client if neccessary. C<$type> should be a string identifying the type of
2497the message, with C<log> being the default. If C<$color> is negative, suppress
2498the message unless the client supports the msg packet.
2499
2500=cut
2501
2502sub cf::client::send_msg {
2503 my ($self, $channel, $msg, $color, @extra) = @_;
2504
2505 $msg = $self->pl->expand_cfpod ($msg);
2506
2507 $color &= cf::NDI_CLIENT_MASK; # just in case...
2508
2509 if (ref $channel) {
2510 # send meta info to client, if not yet sent
2511 unless (exists $self->{channel}{$channel->{id}}) {
2512 $self->{channel}{$channel->{id}} = $channel;
2513 $self->ext_msg (channel_info => $channel);
2514 }
2515
2516 $channel = $channel->{id};
2517 }
2518
2519 return unless @extra || length $msg;
2520
2521 if ($self->can_msg) {
2522 # default colour, mask it out
2523 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2524 if $color & cf::NDI_DEF;
2525
2526 $self->send_packet ("msg " . $self->{json_coder}->encode (
2527 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2528 } else {
2529 if ($color >= 0) {
2530 # replace some tags by gcfclient-compatible ones
2531 for ($msg) {
2532 1 while
2533 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2534 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2535 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2536 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2537 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2538 }
2539
2540 $color &= cf::NDI_COLOR_MASK;
2541
2542 utf8::encode $msg;
2543
2544 if (0 && $msg =~ /\[/) {
2545 # COMMAND/INFO
2546 $self->send_packet ("drawextinfo $color 10 8 $msg")
2547 } else {
2548 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2549 $self->send_packet ("drawinfo $color $msg")
2550 }
2551 }
2552 }
2553}
2554
2110=item $client->ext_event ($type, %msg) 2555=item $client->ext_msg ($type, @msg)
2111 2556
2112Sends an exti event to the client. 2557Sends an ext event to the client.
2113 2558
2114=cut 2559=cut
2115 2560
2116sub cf::client::ext_event($$%) { 2561sub cf::client::ext_msg($$@) {
2117 my ($self, $type, %msg) = @_; 2562 my ($self, $type, @msg) = @_;
2118 2563
2564 if ($self->extcmd == 2) {
2565 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2566 } elsif ($self->extcmd == 1) { # TODO: remove
2119 $msg{msgtype} = "event_$type"; 2567 push @msg, msgtype => "event_$type";
2120 $self->send_packet ("ext " . cf::to_json \%msg); 2568 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2569 }
2570}
2571
2572=item $client->ext_reply ($msgid, @msg)
2573
2574Sends an ext reply to the client.
2575
2576=cut
2577
2578sub cf::client::ext_reply($$@) {
2579 my ($self, $id, @msg) = @_;
2580
2581 if ($self->extcmd == 2) {
2582 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2583 } elsif ($self->extcmd == 1) {
2584 #TODO: version 1, remove
2585 unshift @msg, msgtype => "reply", msgid => $id;
2586 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2587 }
2121} 2588}
2122 2589
2123=item $success = $client->query ($flags, "text", \&cb) 2590=item $success = $client->query ($flags, "text", \&cb)
2124 2591
2125Queues a query to the client, calling the given callback with 2592Queues a query to the client, calling the given callback with
2126the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2593the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2127C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2594C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2128 2595
2129Queries can fail, so check the return code. Or don't, as queries will become 2596Queries can fail, so check the return code. Or don't, as queries will
2130reliable at some point in the future. 2597become reliable at some point in the future.
2131 2598
2132=cut 2599=cut
2133 2600
2134sub cf::client::query { 2601sub cf::client::query {
2135 my ($self, $flags, $text, $cb) = @_; 2602 my ($self, $flags, $text, $cb) = @_;
2143 utf8::encode $text; 2610 utf8::encode $text;
2144 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2611 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2145 2612
2146 $self->send_packet ($self->{query_queue}[0][0]) 2613 $self->send_packet ($self->{query_queue}[0][0])
2147 if @{ $self->{query_queue} } == 1; 2614 if @{ $self->{query_queue} } == 1;
2615
2616 1
2148} 2617}
2149 2618
2150cf::client->attach ( 2619cf::client->attach (
2620 on_connect => sub {
2621 my ($ns) = @_;
2622
2623 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2624 },
2151 on_reply => sub { 2625 on_reply => sub {
2152 my ($ns, $msg) = @_; 2626 my ($ns, $msg) = @_;
2153 2627
2154 # this weird shuffling is so that direct followup queries 2628 # this weird shuffling is so that direct followup queries
2155 # get handled first 2629 # get handled first
2167 } else { 2641 } else {
2168 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2642 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2169 } 2643 }
2170 } 2644 }
2171 }, 2645 },
2646 on_exticmd => sub {
2647 my ($ns, $buf) = @_;
2648
2649 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2650
2651 if (ref $msg) {
2652 my ($type, $reply, @payload) =
2653 "ARRAY" eq ref $msg
2654 ? @$msg
2655 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2656
2657 my @reply;
2658
2659 if (my $cb = $EXTICMD{$type}) {
2660 @reply = $cb->($ns, @payload);
2661 }
2662
2663 $ns->ext_reply ($reply, @reply)
2664 if $reply;
2665
2666 } else {
2667 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2668 }
2669
2670 cf::override;
2671 },
2172); 2672);
2173 2673
2174=item $client->async (\&cb) 2674=item $client->async (\&cb)
2175 2675
2176Create a new coroutine, running the specified callback. The coroutine will 2676Create a new coroutine, running the specified callback. The coroutine will
2217our $safe = new Safe "safe"; 2717our $safe = new Safe "safe";
2218our $safe_hole = new Safe::Hole; 2718our $safe_hole = new Safe::Hole;
2219 2719
2220$SIG{FPE} = 'IGNORE'; 2720$SIG{FPE} = 'IGNORE';
2221 2721
2222$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2722$safe->permit_only (Opcode::opset qw(
2723 :base_core :base_mem :base_orig :base_math
2724 grepstart grepwhile mapstart mapwhile
2725 sort time
2726));
2223 2727
2224# here we export the classes and methods available to script code 2728# here we export the classes and methods available to script code
2225 2729
2226=pod 2730=pod
2227 2731
2228The following functions and methods are available within a safe environment: 2732The following functions and methods are available within a safe environment:
2229 2733
2230 cf::object contr pay_amount pay_player map 2734 cf::object
2735 contr pay_amount pay_player map x y force_find force_add
2736 insert remove name archname title slaying race decrease_ob_nr
2737
2231 cf::object::player player 2738 cf::object::player
2232 cf::player peaceful 2739 player
2233 cf::map trigger 2740
2741 cf::player
2742 peaceful
2743
2744 cf::map
2745 trigger
2234 2746
2235=cut 2747=cut
2236 2748
2237for ( 2749for (
2238 ["cf::object" => qw(contr pay_amount pay_player map)], 2750 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2751 insert remove inv name archname title slaying race
2752 decrease_ob_nr)],
2239 ["cf::object::player" => qw(player)], 2753 ["cf::object::player" => qw(player)],
2240 ["cf::player" => qw(peaceful)], 2754 ["cf::player" => qw(peaceful)],
2241 ["cf::map" => qw(trigger)], 2755 ["cf::map" => qw(trigger)],
2242) { 2756) {
2243 no strict 'refs'; 2757 no strict 'refs';
2314=back 2828=back
2315 2829
2316=cut 2830=cut
2317 2831
2318############################################################################# 2832#############################################################################
2319
2320=head2 EXTENSION DATABASE SUPPORT
2321
2322Crossfire maintains a very simple database for extension use. It can
2323currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2324convert to/from binary).
2325
2326The parameter C<$family> should best start with the name of the extension
2327using it, it should be unique.
2328
2329=over 4
2330
2331=item $value = cf::db_get $family => $key
2332
2333Returns a single value from the database.
2334
2335=item cf::db_put $family => $key => $value
2336
2337Stores the given C<$value> in the family.
2338
2339=cut
2340
2341our $DB;
2342
2343sub db_init {
2344 unless ($DB) {
2345 $DB = BDB::db_create $DB_ENV;
2346
2347 cf::sync_job {
2348 eval {
2349 $DB->set_flags (BDB::CHKSUM);
2350
2351 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2352 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2353 cf::cleanup "db_open(db): $!" if $!;
2354 };
2355 cf::cleanup "db_open(db): $@" if $@;
2356 };
2357 }
2358}
2359
2360sub db_get($$) {
2361 my $key = "$_[0]/$_[1]";
2362
2363 cf::sync_job {
2364 BDB::db_get $DB, undef, $key, my $data;
2365
2366 $! ? ()
2367 : $data
2368 }
2369}
2370
2371sub db_put($$$) {
2372 BDB::dbreq_pri 4;
2373 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2374}
2375
2376=item cf::cache $id => [$paths...], $processversion => $process
2377
2378Generic caching function that returns the value of the resource $id,
2379caching and regenerating as required.
2380
2381This function can block.
2382
2383=cut
2384
2385sub cache {
2386 my ($id, $src, $processversion, $process) = @_;
2387
2388 my $meta =
2389 join "\x00",
2390 $processversion,
2391 map {
2392 aio_stat $_
2393 and Carp::croak "$_: $!";
2394
2395 ($_, (stat _)[7,9])
2396 } @$src;
2397
2398 my $dbmeta = db_get cache => "$id/meta";
2399 if ($dbmeta ne $meta) {
2400 # changed, we may need to process
2401
2402 my @data;
2403 my $md5;
2404
2405 for (0 .. $#$src) {
2406 0 <= aio_load $src->[$_], $data[$_]
2407 or Carp::croak "$src->[$_]: $!";
2408 }
2409
2410 # if processing is expensive, check
2411 # checksum first
2412 if (1) {
2413 $md5 =
2414 join "\x00",
2415 $processversion,
2416 map {
2417 Coro::cede;
2418 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2419 } 0.. $#$src;
2420
2421
2422 my $dbmd5 = db_get cache => "$id/md5";
2423 if ($dbmd5 eq $md5) {
2424 db_put cache => "$id/meta", $meta;
2425
2426 return db_get cache => "$id/data";
2427 }
2428 }
2429
2430 my $t1 = Time::HiRes::time;
2431 my $data = $process->(\@data);
2432 my $t2 = Time::HiRes::time;
2433
2434 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2435
2436 db_put cache => "$id/data", $data;
2437 db_put cache => "$id/md5" , $md5;
2438 db_put cache => "$id/meta", $meta;
2439
2440 return $data;
2441 }
2442
2443 db_get cache => "$id/data"
2444}
2445
2446=item fork_call { }, $args
2447
2448Executes the given code block with the given arguments in a seperate
2449process, returning the results. Everything must be serialisable with
2450Coro::Storable. May, of course, block. Note that the executed sub may
2451never block itself or use any form of Event handling.
2452
2453=cut
2454
2455sub fork_call(&@) {
2456 my ($cb, @args) = @_;
2457
2458# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2459# or die "socketpair: $!";
2460 pipe my $fh1, my $fh2
2461 or die "pipe: $!";
2462
2463 if (my $pid = fork) {
2464 close $fh2;
2465
2466 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2467 $res = Coro::Storable::thaw $res;
2468
2469 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2470
2471 die $$res unless "ARRAY" eq ref $res;
2472
2473 return wantarray ? @$res : $res->[-1];
2474 } else {
2475 reset_signals;
2476 local $SIG{__WARN__};
2477 local $SIG{__DIE__};
2478 eval {
2479 close $fh1;
2480
2481 my @res = eval { $cb->(@args) };
2482 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2483 };
2484
2485 warn $@ if $@;
2486 _exit 0;
2487 }
2488}
2489
2490
2491
2492#############################################################################
2493# the server's init and main functions 2833# the server's init and main functions
2494 2834
2495sub load_facedata($) { 2835sub load_facedata($) {
2496 my ($path) = @_; 2836 my ($path) = @_;
2837
2838 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2497 2839
2498 warn "loading facedata from $path\n"; 2840 warn "loading facedata from $path\n";
2499 2841
2500 my $facedata; 2842 my $facedata;
2501 0 < aio_load $path, $facedata 2843 0 < aio_load $path, $facedata
2504 $facedata = Coro::Storable::thaw $facedata; 2846 $facedata = Coro::Storable::thaw $facedata;
2505 2847
2506 $facedata->{version} == 2 2848 $facedata->{version} == 2
2507 or cf::cleanup "$path: version mismatch, cannot proceed."; 2849 or cf::cleanup "$path: version mismatch, cannot proceed.";
2508 2850
2851 # patch in the exptable
2852 $facedata->{resource}{"res/exp_table"} = {
2853 type => FT_RSRC,
2854 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2855 };
2856 cf::cede_to_tick;
2857
2509 { 2858 {
2510 my $faces = $facedata->{faceinfo}; 2859 my $faces = $facedata->{faceinfo};
2511 2860
2512 while (my ($face, $info) = each %$faces) { 2861 while (my ($face, $info) = each %$faces) {
2513 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2862 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2514 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2863 cf::face::set_visibility $idx, $info->{visibility};
2864 cf::face::set_magicmap $idx, $info->{magicmap};
2515 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2865 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2516 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2866 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2517 Coro::cede; 2867
2868 cf::cede_to_tick;
2518 } 2869 }
2519 2870
2520 while (my ($face, $info) = each %$faces) { 2871 while (my ($face, $info) = each %$faces) {
2521 next unless $info->{smooth}; 2872 next unless $info->{smooth};
2522 my $idx = cf::face::find $face 2873 my $idx = cf::face::find $face
2523 or next; 2874 or next;
2524 if (my $smooth = cf::face::find $info->{smooth}) { 2875 if (my $smooth = cf::face::find $info->{smooth}) {
2876 cf::face::set_smooth $idx, $smooth;
2525 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2877 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2526 } else { 2878 } else {
2527 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2879 warn "smooth face '$info->{smooth}' not found for face '$face'";
2528 } 2880 }
2529 Coro::cede; 2881
2882 cf::cede_to_tick;
2530 } 2883 }
2531 } 2884 }
2532 2885
2533 { 2886 {
2534 my $anims = $facedata->{animinfo}; 2887 my $anims = $facedata->{animinfo};
2535 2888
2536 while (my ($anim, $info) = each %$anims) { 2889 while (my ($anim, $info) = each %$anims) {
2537 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2890 cf::anim::set $anim, $info->{frames}, $info->{facings};
2538 Coro::cede; 2891 cf::cede_to_tick;
2539 } 2892 }
2540 2893
2541 cf::anim::invalidate_all; # d'oh 2894 cf::anim::invalidate_all; # d'oh
2542 } 2895 }
2543 2896
2897 {
2898 # TODO: for gcfclient pleasure, we should give resources
2899 # that gcfclient doesn't grok a >10000 face index.
2900 my $res = $facedata->{resource};
2901
2902 my $soundconf = delete $res->{"res/sound.conf"};
2903
2904 while (my ($name, $info) = each %$res) {
2905 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2906 my $data;
2907
2908 if ($info->{type} & 1) {
2909 # prepend meta info
2910
2911 my $meta = $enc->encode ({
2912 name => $name,
2913 %{ $info->{meta} || {} },
2914 });
2915
2916 $data = pack "(w/a*)*", $meta, $info->{data};
2917 } else {
2918 $data = $info->{data};
2919 }
2920
2921 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2922 cf::face::set_type $idx, $info->{type};
2923
2924 cf::cede_to_tick;
2925 }
2926
2927 if ($soundconf) {
2928 $soundconf = $enc->decode (delete $soundconf->{data});
2929
2930 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2931 my $sound = $soundconf->{compat}[$_]
2932 or next;
2933
2934 my $face = cf::face::find "sound/$sound->[1]";
2935 cf::sound::set $sound->[0] => $face;
2936 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2937 }
2938
2939 while (my ($k, $v) = each %{$soundconf->{event}}) {
2940 my $face = cf::face::find "sound/$v";
2941 cf::sound::set $k => $face;
2942 }
2943 }
2944 }
2945
2544 1 2946 1
2545} 2947}
2948
2949register_exticmd fx_want => sub {
2950 my ($ns, $want) = @_;
2951
2952 while (my ($k, $v) = each %$want) {
2953 $ns->fx_want ($k, $v);
2954 }
2955};
2546 2956
2547sub reload_regions { 2957sub reload_regions {
2548 load_resource_file "$MAPDIR/regions" 2958 load_resource_file "$MAPDIR/regions"
2549 or die "unable to load regions file\n"; 2959 or die "unable to load regions file\n";
2960
2961 for (cf::region::list) {
2962 $_->{match} = qr/$_->{match}/
2963 if exists $_->{match};
2964 }
2550} 2965}
2551 2966
2552sub reload_facedata { 2967sub reload_facedata {
2553 load_facedata "$DATADIR/facedata" 2968 load_facedata "$DATADIR/facedata"
2554 or die "unable to load facedata\n"; 2969 or die "unable to load facedata\n";
2555} 2970}
2556 2971
2557sub reload_archetypes { 2972sub reload_archetypes {
2558 load_resource_file "$DATADIR/archetypes" 2973 load_resource_file "$DATADIR/archetypes"
2559 or die "unable to load archetypes\n"; 2974 or die "unable to load archetypes\n";
2975 #d# NEED to laod twice to resolve forward references
2976 # this really needs to be done in an extra post-pass
2977 # (which needs to be synchronous, so solve it differently)
2978 load_resource_file "$DATADIR/archetypes"
2979 or die "unable to load archetypes\n";
2560} 2980}
2561 2981
2562sub reload_treasures { 2982sub reload_treasures {
2563 load_resource_file "$DATADIR/treasures" 2983 load_resource_file "$DATADIR/treasures"
2564 or die "unable to load treasurelists\n"; 2984 or die "unable to load treasurelists\n";
2567sub reload_resources { 2987sub reload_resources {
2568 warn "reloading resource files...\n"; 2988 warn "reloading resource files...\n";
2569 2989
2570 reload_regions; 2990 reload_regions;
2571 reload_facedata; 2991 reload_facedata;
2992 #reload_archetypes;#d#
2572 reload_archetypes; 2993 reload_archetypes;
2573 reload_treasures; 2994 reload_treasures;
2574 2995
2575 warn "finished reloading resource files\n"; 2996 warn "finished reloading resource files\n";
2576} 2997}
2577 2998
2578sub init { 2999sub init {
2579 reload_resources; 3000 reload_resources;
2580} 3001}
2581 3002
2582sub cfg_load { 3003sub reload_config {
2583 open my $fh, "<:utf8", "$CONFDIR/config" 3004 open my $fh, "<:utf8", "$CONFDIR/config"
2584 or return; 3005 or return;
2585 3006
2586 local $/; 3007 local $/;
2587 *CFG = YAML::Syck::Load <$fh>; 3008 *CFG = YAML::Syck::Load <$fh>;
2607 (async { 3028 (async {
2608 Event::one_event; 3029 Event::one_event;
2609 })->prio (Coro::PRIO_MAX); 3030 })->prio (Coro::PRIO_MAX);
2610 }; 3031 };
2611 3032
2612 cfg_load; 3033 reload_config;
2613 db_init; 3034 db_init;
2614 load_extensions; 3035 load_extensions;
2615 3036
2616 $TICK_WATCHER->start; 3037 $TICK_WATCHER->start;
2617 Event::loop; 3038 Event::loop;
2633 }, 3054 },
2634 ); 3055 );
2635 } 3056 }
2636} 3057}
2637 3058
3059sub write_runtime {
3060 my $runtime = "$LOCALDIR/runtime";
3061
3062 # first touch the runtime file to show we are still running:
3063 # the fsync below can take a very very long time.
3064
3065 IO::AIO::aio_utime $runtime, undef, undef;
3066
3067 my $guard = cf::lock_acquire "write_runtime";
3068
3069 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3070 or return;
3071
3072 my $value = $cf::RUNTIME + 90 + 10;
3073 # 10 is the runtime save interval, for a monotonic clock
3074 # 60 allows for the watchdog to kill the server.
3075
3076 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3077 and return;
3078
3079 # always fsync - this file is important
3080 aio_fsync $fh
3081 and return;
3082
3083 # touch it again to show we are up-to-date
3084 aio_utime $fh, undef, undef;
3085
3086 close $fh
3087 or return;
3088
3089 aio_rename "$runtime~", $runtime
3090 and return;
3091
3092 warn "runtime file written.\n";
3093
3094 1
3095}
3096
2638sub emergency_save() { 3097sub emergency_save() {
2639 my $freeze_guard = cf::freeze_mainloop; 3098 my $freeze_guard = cf::freeze_mainloop;
2640 3099
2641 warn "enter emergency perl save\n"; 3100 warn "enter emergency perl save\n";
2642 3101
2717 %EXT_CORO = (); 3176 %EXT_CORO = ();
2718 3177
2719 warn "removing commands"; 3178 warn "removing commands";
2720 %COMMAND = (); 3179 %COMMAND = ();
2721 3180
2722 warn "removing ext commands"; 3181 warn "removing ext/exti commands";
2723 %EXTCMD = (); 3182 %EXTCMD = ();
3183 %EXTICMD = ();
2724 3184
2725 warn "unloading/nuking all extensions"; 3185 warn "unloading/nuking all extensions";
2726 for my $pkg (@EXTS) { 3186 for my $pkg (@EXTS) {
2727 warn "... unloading $pkg"; 3187 warn "... unloading $pkg";
2728 3188
2771 warn "reloading cf.pm"; 3231 warn "reloading cf.pm";
2772 require cf; 3232 require cf;
2773 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3233 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2774 3234
2775 warn "loading config and database again"; 3235 warn "loading config and database again";
2776 cf::cfg_load; 3236 cf::reload_config;
2777 3237
2778 warn "loading extensions"; 3238 warn "loading extensions";
2779 cf::load_extensions; 3239 cf::load_extensions;
2780 3240
2781 warn "reattaching attachments to objects/players"; 3241 warn "reattaching attachments to objects/players";
2846 my $signal = new Coro::Signal; 3306 my $signal = new Coro::Signal;
2847 push @WAIT_FOR_TICK_BEGIN, $signal; 3307 push @WAIT_FOR_TICK_BEGIN, $signal;
2848 $signal->wait; 3308 $signal->wait;
2849} 3309}
2850 3310
3311 my $min = 1e6;#d#
3312 my $avg = 10;
2851$TICK_WATCHER = Event->timer ( 3313$TICK_WATCHER = Event->timer (
2852 reentrant => 0, 3314 reentrant => 0,
2853 parked => 1, 3315 parked => 1,
2854 prio => 0, 3316 prio => 0,
2855 at => $NEXT_TICK || $TICK, 3317 at => $NEXT_TICK || $TICK,
2862 } 3324 }
2863 3325
2864 $NOW = $tick_start = Event::time; 3326 $NOW = $tick_start = Event::time;
2865 3327
2866 cf::server_tick; # one server iteration 3328 cf::server_tick; # one server iteration
3329
3330 0 && sync_job {#d#
3331 for(1..10) {
3332 my $t = Event::time;
3333 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3334 or die;
3335
3336 $map->width (50);
3337 $map->height (50);
3338 $map->alloc;
3339 $map->_load_objects ("/tmp/x.map", 1);
3340 my $t = Event::time - $t;
3341
3342 #next unless $t < 0.0013;#d#
3343 if ($t < $min) {
3344 $min = $t;
3345 }
3346 $avg = $avg * 0.99 + $t * 0.01;
3347 }
3348 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3349 exit 0;
3350 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3351 };
2867 3352
2868 $RUNTIME += $TICK; 3353 $RUNTIME += $TICK;
2869 $NEXT_TICK += $TICK; 3354 $NEXT_TICK += $TICK;
2870 3355
2871 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3356 if ($NOW >= $NEXT_RUNTIME_WRITE) {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines