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.266 by root, Fri May 18 01:01:02 2007 UTC vs.
Revision 1.356 by root, Tue Sep 4 05:43:21 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;
83our %CFG; 87our %CFG;
84 88
85our $UPTIME; $UPTIME ||= time; 89our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 90our $RUNTIME;
87 91
88our %PLAYER; # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 93our (%MAP, %MAP_LOADING ); # all maps
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
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
253 271
254Wait until the given lock is available and then acquires it and returns 272Wait until the given lock is available and then acquires it and returns
255a Coro::guard object. If the guard object gets destroyed (goes out of scope, 273a Coro::guard object. If the guard object gets destroyed (goes out of scope,
256for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
257returned. 275returned.
276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
258 279
259Lock names should begin with a unique identifier (for example, cf::map::find 280Lock names should begin with a unique identifier (for example, cf::map::find
260uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
261 282
262=item $locked = cf::lock_active $string 283=item $locked = cf::lock_active $string
305 }; 326 };
306 $TICK_WATCHER->stop; 327 $TICK_WATCHER->stop;
307 $guard 328 $guard
308} 329}
309 330
331=item cf::get_slot $time[, $priority[, $name]]
332
333Allocate $time seconds of blocking CPU time at priority C<$priority>:
334This call blocks and returns only when you have at least C<$time> seconds
335of cpu time till the next tick. The slot is only valid till the next cede.
336
337The optional C<$name> can be used to identify the job to run. It might be
338used for statistical purposes and should identify the same time-class.
339
340Useful for short background jobs.
341
342=cut
343
344our @SLOT_QUEUE;
345our $SLOT_QUEUE;
346
347$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async {
349 my $signal = new Coro::Signal;
350
351 while () {
352 next_job:
353 my $avail = cf::till_tick;
354 if ($avail > 0.01) {
355 for (0 .. $#SLOT_QUEUE) {
356 if ($SLOT_QUEUE[$_][0] < $avail) {
357 my $job = splice @SLOT_QUEUE, $_, 1, ();
358 $job->[2]->send;
359 Coro::cede;
360 goto next_job;
361 }
362 }
363 }
364
365 if (@SLOT_QUEUE) {
366 # we do not use wait_For_tick() as it returns immediately when tick is inactive
367 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait;
369 } else {
370 Coro::schedule;
371 }
372 }
373};
374
375sub get_slot($;$$) {
376 my ($time, $pri, $name) = @_;
377
378 $time = $TICK * .6 if $time > $TICK * .6;
379 my $sig = new Coro::Signal;
380
381 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
382 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
383 $SLOT_QUEUE->ready;
384 $sig->wait;
385}
386
310=item cf::async { BLOCK } 387=item cf::async { BLOCK }
311 388
312Currently the same as Coro::async_pool, meaning you cannot use 389Currently the same as Coro::async_pool, meaning you cannot use
313C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 390C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
314thing you are allowed to do is call C<prio> on it. 391thing you are allowed to do is call C<prio> on it.
317 394
318BEGIN { *async = \&Coro::async_pool } 395BEGIN { *async = \&Coro::async_pool }
319 396
320=item cf::sync_job { BLOCK } 397=item cf::sync_job { BLOCK }
321 398
322The design of crossfire+ requires that the main coro ($Coro::main) is 399The design of Crossfire TRT requires that the main coroutine ($Coro::main)
323always able to handle events or runnable, as crossfire+ is only partly 400is 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. 401partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
402acceptable.
325 403
326If it must be done, put the blocking parts into C<sync_job>. This will run 404If 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 405the given BLOCK in another coroutine while waiting for the result. The
328server will be frozen during this time, so the block should either finish 406server will be frozen during this time, so the block should either finish
329fast or be very important. 407fast or be very important.
389 $EXT_CORO{$coro+0} = $coro; 467 $EXT_CORO{$coro+0} = $coro;
390 468
391 $coro 469 $coro
392} 470}
393 471
394sub write_runtime { 472=item fork_call { }, $args
395 my $runtime = "$LOCALDIR/runtime";
396 473
397 # first touch the runtime file to show we are still running: 474Executes the given code block with the given arguments in a seperate
398 # the fsync below can take a very very long time. 475process, returning the results. Everything must be serialisable with
476Coro::Storable. May, of course, block. Note that the executed sub may
477never block itself or use any form of Event handling.
399 478
400 if (my $fh = aio_open $runtime, O_WRONLY, 0) { 479=cut
401 utime undef, undef, $fh;
402 }
403 480
404 my $guard = cf::lock_acquire "write_runtime"; 481sub fork_call(&@) {
482 my ($cb, @args) = @_;
405 483
406 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 484 # we seemingly have to make a local copy of the whole thing,
407 or return; 485 # otherwise perl prematurely frees the stuff :/
486 # TODO: investigate and fix (likely this will be rather laborious)
408 487
409 my $value = $cf::RUNTIME + 90 + 10; 488 my @res = Coro::Util::fork_eval {
410 # 10 is the runtime save interval, for a monotonic clock 489 reset_signals;
411 # 60 allows for the watchdog to kill the server. 490 &$cb
491 }, @args;
412 492
413 (aio_write $fh, 0, (length $value), $value, 0) <= 0 493 wantarray ? @res : $res[-1]
414 and return; 494}
415 495
416 # always fsync - this file is important 496=item $value = cf::db_get $family => $key
417 aio_fsync $fh
418 and return;
419 497
420 # touch it again to show we are up-to-date 498Returns a single value from the environment database.
421 utime undef, undef, $fh;
422 499
423 close $fh 500=item cf::db_put $family => $key => $value
424 or return;
425 501
426 aio_rename "$runtime~", $runtime 502Stores the given C<$value> in the family. It can currently store binary
427 and return; 503data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
428 504
429 warn "runtime file written.\n";#d# 505=cut
430 506
507our $DB;
508
509sub db_init {
510 unless ($DB) {
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job {
514 eval {
515 $DB->set_flags (BDB::CHKSUM);
516
517 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
518 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
519 cf::cleanup "db_open(db): $!" if $!;
520 };
521 cf::cleanup "db_open(db): $@" if $@;
522 };
431 1 523 }
524}
525
526sub db_get($$) {
527 my $key = "$_[0]/$_[1]";
528
529 cf::sync_job {
530 BDB::db_get $DB, undef, $key, my $data;
531
532 $! ? ()
533 : $data
534 }
535}
536
537sub db_put($$$) {
538 BDB::dbreq_pri 4;
539 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
540}
541
542=item cf::cache $id => [$paths...], $processversion => $process
543
544Generic caching function that returns the value of the resource $id,
545caching and regenerating as required.
546
547This function can block.
548
549=cut
550
551sub cache {
552 my ($id, $src, $processversion, $process) = @_;
553
554 my $meta =
555 join "\x00",
556 $processversion,
557 map {
558 aio_stat $_
559 and Carp::croak "$_: $!";
560
561 ($_, (stat _)[7,9])
562 } @$src;
563
564 my $dbmeta = db_get cache => "$id/meta";
565 if ($dbmeta ne $meta) {
566 # changed, we may need to process
567
568 my @data;
569 my $md5;
570
571 for (0 .. $#$src) {
572 0 <= aio_load $src->[$_], $data[$_]
573 or Carp::croak "$src->[$_]: $!";
574 }
575
576 # if processing is expensive, check
577 # checksum first
578 if (1) {
579 $md5 =
580 join "\x00",
581 $processversion,
582 map {
583 cf::cede_to_tick;
584 ($src->[$_], Digest::MD5::md5_hex $data[$_])
585 } 0.. $#$src;
586
587
588 my $dbmd5 = db_get cache => "$id/md5";
589 if ($dbmd5 eq $md5) {
590 db_put cache => "$id/meta", $meta;
591
592 return db_get cache => "$id/data";
593 }
594 }
595
596 my $t1 = Time::HiRes::time;
597 my $data = $process->(\@data);
598 my $t2 = Time::HiRes::time;
599
600 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
601
602 db_put cache => "$id/data", $data;
603 db_put cache => "$id/md5" , $md5;
604 db_put cache => "$id/meta", $meta;
605
606 return $data;
607 }
608
609 db_get cache => "$id/data"
432} 610}
433 611
434=item cf::datalog type => key => value, ... 612=item cf::datalog type => key => value, ...
435 613
436Log a datalog packet of the given type with the given key-value pairs. 614Log 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") 632attach callbacks/event handlers (a collection of which is called an "attachment")
455to it. All such attachable objects support the following methods. 633to it. All such attachable objects support the following methods.
456 634
457In the following description, CLASS can be any of C<global>, C<object> 635In 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 636C<player>, C<client> or C<map> (i.e. the attachable objects in
459crossfire+). 637Crossfire TRT).
460 638
461=over 4 639=over 4
462 640
463=item $attachable->attach ($attachment, key => $value...) 641=item $attachable->attach ($attachment, key => $value...)
464 642
627 $registry = $CB_TYPE[$object_type] ||= []; 805 $registry = $CB_TYPE[$object_type] ||= [];
628 806
629 } elsif ($type eq "subtype") { 807 } elsif ($type eq "subtype") {
630 defined $object_type or Carp::croak "subtype specified without type"; 808 defined $object_type or Carp::croak "subtype specified without type";
631 my $object_subtype = shift @arg; 809 my $object_subtype = shift @arg;
632 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 810 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
633 811
634 } elsif ($type eq "package") { 812 } elsif ($type eq "package") {
635 my $pkg = shift @arg; 813 my $pkg = shift @arg;
636 814
637 while (my ($name, $id) = each %cb_id) { 815 while (my ($name, $id) = each %cb_id) {
666 _attach $registry, $klass, @attach; 844 _attach $registry, $klass, @attach;
667 } 845 }
668 846
669 $obj->{$name} = \%arg; 847 $obj->{$name} = \%arg;
670 } else { 848 } else {
671 warn "object uses attachment '$name' that is not available, postponing.\n"; 849 warn "object uses attachment '$name' which is not available, postponing.\n";
672 } 850 }
673 851
674 $obj->{_attachment}{$name} = undef; 852 $obj->{_attachment}{$name} = undef;
675} 853}
676 854
678 if (ref $_[0]) { 856 if (ref $_[0]) {
679 _object_attach @_; 857 _object_attach @_;
680 } else { 858 } else {
681 _attach shift->_attach_registry, @_; 859 _attach shift->_attach_registry, @_;
682 } 860 }
861 _recalc_want;
683}; 862};
684 863
685# all those should be optimised 864# all those should be optimised
686sub cf::attachable::detach { 865sub cf::attachable::detach {
687 my ($obj, $name) = @_; 866 my ($obj, $name) = @_;
690 delete $obj->{_attachment}{$name}; 869 delete $obj->{_attachment}{$name};
691 reattach ($obj); 870 reattach ($obj);
692 } else { 871 } else {
693 Carp::croak "cannot, currently, detach class attachments"; 872 Carp::croak "cannot, currently, detach class attachments";
694 } 873 }
874 _recalc_want;
695}; 875};
696 876
697sub cf::attachable::attached { 877sub cf::attachable::attached {
698 my ($obj, $name) = @_; 878 my ($obj, $name) = @_;
699 879
714 "; 894 ";
715 die if $@; 895 die if $@;
716} 896}
717 897
718our $override; 898our $override;
719our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 899our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
720 900
721sub override { 901sub override {
722 $override = 1; 902 $override = 1;
723 @invoke_results = (); 903 @INVOKE_RESULTS = (@_);
724} 904}
725 905
726sub do_invoke { 906sub do_invoke {
727 my $event = shift; 907 my $event = shift;
728 my $callbacks = shift; 908 my $callbacks = shift;
729 909
730 @invoke_results = (); 910 @INVOKE_RESULTS = ();
731 911
732 local $override; 912 local $override;
733 913
734 for (@$callbacks) { 914 for (@$callbacks) {
735 eval { &{$_->[1]} }; 915 eval { &{$_->[1]} };
752 932
753Generate an object-specific event with the given arguments. 933Generate an object-specific event with the given arguments.
754 934
755This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 935This 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 936removed in future versions), and there is no public API to access override
757results (if you must, access C<@cf::invoke_results> directly). 937results (if you must, access C<@cf::INVOKE_RESULTS> directly).
758 938
759=back 939=back
760 940
761=cut 941=cut
762 942
763############################################################################# 943#############################################################################
764# object support 944# object support
945#
946
947sub _can_merge {
948 my ($ob1, $ob2) = @_;
949
950 local $Storable::canonical = 1;
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953
954 $fob1 eq $fob2
955}
765 956
766sub reattach { 957sub reattach {
767 # basically do the same as instantiate, without calling instantiate 958 # basically do the same as instantiate, without calling instantiate
768 my ($obj) = @_; 959 my ($obj) = @_;
769 960
813 }, 1004 },
814); 1005);
815 1006
816sub object_freezer_save { 1007sub object_freezer_save {
817 my ($filename, $rdata, $objs) = @_; 1008 my ($filename, $rdata, $objs) = @_;
1009
1010 my $guard = cf::lock_acquire "io";
818 1011
819 sync_job { 1012 sync_job {
820 if (length $$rdata) { 1013 if (length $$rdata) {
821 warn sprintf "saving %s (%d,%d)\n", 1014 warn sprintf "saving %s (%d,%d)\n",
822 $filename, length $$rdata, scalar @$objs; 1015 $filename, length $$rdata, scalar @$objs;
846 } 1039 }
847 } else { 1040 } else {
848 aio_unlink $filename; 1041 aio_unlink $filename;
849 aio_unlink "$filename.pst"; 1042 aio_unlink "$filename.pst";
850 } 1043 }
851 } 1044 };
1045
1046 undef $guard;
852} 1047}
853 1048
854sub object_freezer_as_string { 1049sub object_freezer_as_string {
855 my ($rdata, $objs) = @_; 1050 my ($rdata, $objs) = @_;
856 1051
861 1056
862sub object_thawer_load { 1057sub object_thawer_load {
863 my ($filename) = @_; 1058 my ($filename) = @_;
864 1059
865 my ($data, $av); 1060 my ($data, $av);
1061
1062 my $guard = cf::lock_acquire "io";
866 1063
867 (aio_load $filename, $data) >= 0 1064 (aio_load $filename, $data) >= 0
868 or return; 1065 or return;
869 1066
870 unless (aio_stat "$filename.pst") { 1067 unless (aio_stat "$filename.pst") {
871 (aio_load "$filename.pst", $av) >= 0 1068 (aio_load "$filename.pst", $av) >= 0
872 or return; 1069 or return;
1070
1071 undef $guard;
873 $av = eval { (Storable::thaw $av)->{objs} }; 1072 $av = eval { (Storable::thaw $av)->{objs} };
874 } 1073 }
875 1074
876 warn sprintf "loading %s (%d)\n", 1075 warn sprintf "loading %s (%d)\n",
877 $filename, length $data, scalar @{$av || []};#d# 1076 $filename, length $data, scalar @{$av || []};
1077
878 return ($data, $av); 1078 ($data, $av)
879} 1079}
1080
1081=head2 COMMAND CALLBACKS
1082
1083=over 4
1084
1085=cut
880 1086
881############################################################################# 1087#############################################################################
882# command handling &c 1088# command handling &c
883 1089
884=item cf::register_command $name => \&callback($ob,$args); 1090=item cf::register_command $name => \&callback($ob,$args);
897 push @{ $COMMAND{$name} }, [$caller, $cb]; 1103 push @{ $COMMAND{$name} }, [$caller, $cb];
898} 1104}
899 1105
900=item cf::register_extcmd $name => \&callback($pl,$packet); 1106=item cf::register_extcmd $name => \&callback($pl,$packet);
901 1107
902Register a callbackf ro execution when the client sends an extcmd packet. 1108Register a callback for execution when the client sends an (synchronous)
1109extcmd packet. Ext commands will be processed in the order they are
1110received by the server, like other user commands. The first argument is
1111the logged-in player. Ext commands can only be processed after a player
1112has logged in successfully.
903 1113
904If the callback returns something, it is sent back as if reply was being 1114If the callback returns something, it is sent back as if reply was being
905called. 1115called.
906 1116
1117=item cf::register_exticmd $name => \&callback($ns,$packet);
1118
1119Register a callback for execution when the client sends an (asynchronous)
1120exticmd packet. Exti commands are processed by the server as soon as they
1121are received, i.e. out of order w.r.t. other commands. The first argument
1122is a client socket. Exti commands can be received anytime, even before
1123log-in.
1124
1125If the callback returns something, it is sent back as if reply was being
1126called.
1127
907=cut 1128=cut
908 1129
909sub register_extcmd { 1130sub register_extcmd {
910 my ($name, $cb) = @_; 1131 my ($name, $cb) = @_;
911 1132
912 $EXTCMD{$name} = $cb; 1133 $EXTCMD{$name} = $cb;
1134}
1135
1136sub register_exticmd {
1137 my ($name, $cb) = @_;
1138
1139 $EXTICMD{$name} = $cb;
913} 1140}
914 1141
915cf::player->attach ( 1142cf::player->attach (
916 on_command => sub { 1143 on_command => sub {
917 my ($pl, $name, $params) = @_; 1144 my ($pl, $name, $params) = @_;
926 cf::override; 1153 cf::override;
927 }, 1154 },
928 on_extcmd => sub { 1155 on_extcmd => sub {
929 my ($pl, $buf) = @_; 1156 my ($pl, $buf) = @_;
930 1157
931 my $msg = eval { from_json $buf }; 1158 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
932 1159
933 if (ref $msg) { 1160 if (ref $msg) {
1161 my ($type, $reply, @payload) =
1162 "ARRAY" eq ref $msg
1163 ? @$msg
1164 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1165
1166 my @reply;
1167
934 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1168 if (my $cb = $EXTCMD{$type}) {
935 if (my %reply = $cb->($pl, $msg)) { 1169 @reply = $cb->($pl, @payload);
936 $pl->ext_reply ($msg->{msgid}, %reply);
937 }
938 } 1170 }
1171
1172 $pl->ext_reply ($reply, @reply)
1173 if $reply;
1174
939 } else { 1175 } else {
940 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1176 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
941 } 1177 }
942 1178
943 cf::override; 1179 cf::override;
944 }, 1180 },
945); 1181);
946 1182
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 { 1183sub load_extensions {
1184 cf::sync_job {
1185 my %todo;
1186
982 for my $ext (<$LIBDIR/*.ext>) { 1187 for my $path (<$LIBDIR/*.ext>) {
983 next unless -r $ext; 1188 next unless -r $path;
984 eval { 1189
985 load_extension $ext; 1190 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1191 my $base = $1;
1192 my $pkg = $1;
1193 $pkg =~ s/[^[:word:]]/_/g;
1194 $pkg = "ext::$pkg";
1195
1196 open my $fh, "<:utf8", $path
1197 or die "$path: $!";
1198
1199 my $source = do { local $/; <$fh> };
1200
1201 my %ext = (
1202 path => $path,
1203 base => $base,
1204 pkg => $pkg,
1205 );
1206
1207 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1208 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1209
1210 $ext{source} =
1211 "package $pkg; use strict; use utf8;\n"
1212 . "#line 1 \"$path\"\n{\n"
1213 . $source
1214 . "\n};\n1";
1215
1216 $todo{$base} = \%ext;
1217 }
1218
1219 my %done;
1220 while (%todo) {
1221 my $progress;
1222
1223 while (my ($k, $v) = each %todo) {
1224 for (split /,\s*/, $v->{meta}{depends}) {
1225 goto skip
1226 unless exists $done{$_};
1227 }
1228
1229 warn "... loading '$k' into '$v->{pkg}'\n";
1230
1231 unless (eval $v->{source}) {
1232 my $msg = $@ ? "$v->{path}: $@\n"
1233 : "$v->{base}: extension inactive.\n";
1234
1235 if (exists $v->{meta}{mandatory}) {
1236 warn $msg;
1237 warn "mandatory extension failed to load, exiting.\n";
1238 exit 1;
1239 }
1240
1241 warn $msg;
1242 }
1243
1244 $done{$k} = delete $todo{$k};
1245 push @EXTS, $v->{pkg};
1246 $progress = 1;
986 1 1247 }
987 } or warn "$ext not loaded: $@"; 1248
1249 skip:
1250 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1251 unless $progress;
1252 }
988 } 1253 };
989} 1254}
990 1255
991############################################################################# 1256#############################################################################
1257
1258=back
992 1259
993=head2 CORE EXTENSIONS 1260=head2 CORE EXTENSIONS
994 1261
995Functions and methods that extend core crossfire objects. 1262Functions and methods that extend core crossfire objects.
996 1263
1046 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1313 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1047 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1314 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1048 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1315 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1049 aio_unlink +(playerdir $login) . "/$login.pl"; 1316 aio_unlink +(playerdir $login) . "/$login.pl";
1050 1317
1051 my $pl = load_pl path $login 1318 my $f = new_from_file cf::object::thawer path $login
1052 or return; 1319 or return;
1320
1321 $f->next;
1322 my $pl = cf::player::load_pl $f
1323 or return;
1324 local $cf::PLAYER_LOADING{$login} = $pl;
1325 $f->resolve_delayed_derefs;
1053 $cf::PLAYER{$login} = $pl 1326 $cf::PLAYER{$login} = $pl
1054 } 1327 }
1055 } 1328 }
1056} 1329}
1057 1330
1067 1340
1068 aio_mkdir playerdir $pl, 0770; 1341 aio_mkdir playerdir $pl, 0770;
1069 $pl->{last_save} = $cf::RUNTIME; 1342 $pl->{last_save} = $cf::RUNTIME;
1070 1343
1071 $pl->save_pl ($path); 1344 $pl->save_pl ($path);
1072 Coro::cede; 1345 cf::cede_to_tick;
1073} 1346}
1074 1347
1075sub new($) { 1348sub new($) {
1076 my ($login) = @_; 1349 my ($login) = @_;
1077 1350
1081 $self->{deny_save} = 1; 1354 $self->{deny_save} = 1;
1082 1355
1083 $cf::PLAYER{$login} = $self; 1356 $cf::PLAYER{$login} = $self;
1084 1357
1085 $self 1358 $self
1359}
1360
1361=item $player->send_msg ($channel, $msg, $color, [extra...])
1362
1363=cut
1364
1365sub send_msg {
1366 my $ns = shift->ns
1367 or return;
1368 $ns->send_msg (@_);
1086} 1369}
1087 1370
1088=item $pl->quit_character 1371=item $pl->quit_character
1089 1372
1090Nukes the player without looking back. If logged in, the connection will 1373Nukes the player without looking back. If logged in, the connection will
1145 or return []; 1428 or return [];
1146 1429
1147 my @logins; 1430 my @logins;
1148 1431
1149 for my $login (@$dirs) { 1432 for my $login (@$dirs) {
1433 my $path = path $login;
1434
1435 # a .pst is a dead give-away for a valid player
1436 unless (-e "$path.pst") {
1150 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1437 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1151 aio_read $fh, 0, 512, my $buf, 0 or next; 1438 aio_read $fh, 0, 512, my $buf, 0 or next;
1152 $buf !~ /^password -------------$/m or next; # official not-valid tag 1439 $buf !~ /^password -------------$/m or next; # official not-valid tag
1440 }
1153 1441
1154 utf8::decode $login; 1442 utf8::decode $login;
1155 push @logins, $login; 1443 push @logins, $login;
1156 } 1444 }
1157 1445
1184 } 1472 }
1185 1473
1186 \@paths 1474 \@paths
1187} 1475}
1188 1476
1477=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1478
1479Expand crossfire pod fragments into protocol xml.
1480
1481=cut
1482
1483sub expand_cfpod {
1484 ((my $self), (local $_)) = @_;
1485
1486 # escape & and <
1487 s/&/&amp;/g;
1488 s/(?<![BIUGHT])</&lt;/g;
1489
1490 # this is buggy, it needs to properly take care of nested <'s
1491
1492 1 while
1493 # replace B<>, I<>, U<> etc.
1494 s/B<([^\>]*)>/<b>$1<\/b>/
1495 || s/I<([^\>]*)>/<i>$1<\/i>/
1496 || s/U<([^\>]*)>/<u>$1<\/u>/
1497 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1498 # replace G<male|female> tags
1499 || s{G<([^>|]*)\|([^>]*)>}{
1500 $self->gender ? $2 : $1
1501 }ge
1502 # replace H<hint text>
1503 || s{H<([^\>]*)>}
1504 {
1505 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1506 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1507 "")
1508 [$self->{hintmode}]
1509 }ge;
1510
1511 # create single paragraphs (very hackish)
1512 s/(?<=\S)\n(?=\w)/ /g;
1513
1514 # compress some whitespace
1515 s/\s+\n/\n/g; # ws line-ends
1516 s/\n\n+/\n/g; # double lines
1517 s/^\n+//; # beginning lines
1518 s/\n+$//; # ending lines
1519
1520 $_
1521}
1522
1523sub hintmode {
1524 $_[0]{hintmode} = $_[1] if @_ > 1;
1525 $_[0]{hintmode}
1526}
1527
1189=item $player->ext_reply ($msgid, %msg) 1528=item $player->ext_reply ($msgid, @msg)
1190 1529
1191Sends an ext reply to the player. 1530Sends an ext reply to the player.
1192 1531
1193=cut 1532=cut
1194 1533
1195sub ext_reply($$%) { 1534sub ext_reply($$@) {
1196 my ($self, $id, %msg) = @_; 1535 my ($self, $id, @msg) = @_;
1197 1536
1198 $msg{msgid} = $id; 1537 $self->ns->ext_reply ($id, @msg)
1199
1200 $self->send ("ext " . cf::to_json \%msg);
1201} 1538}
1202 1539
1203=item $player->ext_event ($type, %msg) 1540=item $player->ext_msg ($type, @msg)
1204 1541
1205Sends an ext event to the client. 1542Sends an ext event to the client.
1206 1543
1207=cut 1544=cut
1208 1545
1209sub ext_event($$%) { 1546sub ext_msg($$@) {
1210 my ($self, $type, %msg) = @_; 1547 my ($self, $type, @msg) = @_;
1211 1548
1212 $self->ns->ext_event ($type, %msg); 1549 $self->ns->ext_msg ($type, @msg);
1213} 1550}
1214 1551
1215=head3 cf::region 1552=head3 cf::region
1216 1553
1217=over 4 1554=over 4
1220 1557
1221package cf::region; 1558package cf::region;
1222 1559
1223=item cf::region::find_by_path $path 1560=item cf::region::find_by_path $path
1224 1561
1225Tries to decuce the probable region for a map knowing only its path. 1562Tries to decuce the likely region for a map knowing only its path.
1226 1563
1227=cut 1564=cut
1228 1565
1229sub find_by_path($) { 1566sub find_by_path($) {
1230 my ($path) = @_; 1567 my ($path) = @_;
1231 1568
1232 my ($match, $specificity); 1569 my ($match, $specificity);
1233 1570
1234 for my $region (list) { 1571 for my $region (list) {
1235 if ($region->match && $path =~ $region->match) { 1572 if ($region->{match} && $path =~ $region->{match}) {
1236 ($match, $specificity) = ($region, $region->specificity) 1573 ($match, $specificity) = ($region, $region->specificity)
1237 if $region->specificity > $specificity; 1574 if $region->specificity > $specificity;
1238 } 1575 }
1239 } 1576 }
1240 1577
1304 my ($self, $merge) = @_; 1641 my ($self, $merge) = @_;
1305 1642
1306 # we have to keep some variables in memory intact 1643 # we have to keep some variables in memory intact
1307 local $self->{path}; 1644 local $self->{path};
1308 local $self->{load_path}; 1645 local $self->{load_path};
1309 local $self->{deny_save};
1310 local $self->{deny_reset};
1311 1646
1312 $self->SUPER::thawer_merge ($merge); 1647 $self->SUPER::thawer_merge ($merge);
1313} 1648}
1314 1649
1315sub normalise { 1650sub normalise {
1362 $self->init; # pass $1 etc. 1697 $self->init; # pass $1 etc.
1363 return $self; 1698 return $self;
1364 } 1699 }
1365 } 1700 }
1366 1701
1367 Carp::carp "unable to resolve path '$path' (base '$base')."; 1702 Carp::cluck "unable to resolve path '$path' (base '$base').";
1368 () 1703 ()
1369} 1704}
1370 1705
1371sub init { 1706sub init {
1372 my ($self) = @_; 1707 my ($self) = @_;
1415 1750
1416 $_->change_map_light ($change) 1751 $_->change_map_light ($change)
1417 for grep $_->outdoor, values %cf::MAP; 1752 for grep $_->outdoor, values %cf::MAP;
1418} 1753}
1419 1754
1755sub decay_objects {
1756 my ($self) = @_;
1757
1758 return if $self->{deny_reset};
1759
1760 $self->do_decay_objects;
1761}
1762
1420sub unlink_save { 1763sub unlink_save {
1421 my ($self) = @_; 1764 my ($self) = @_;
1422 1765
1423 utf8::encode (my $save = $self->save_path); 1766 utf8::encode (my $save = $self->save_path);
1424 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1767 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1427 1770
1428sub load_header_from($) { 1771sub load_header_from($) {
1429 my ($self, $path) = @_; 1772 my ($self, $path) = @_;
1430 1773
1431 utf8::encode $path; 1774 utf8::encode $path;
1432 #aio_open $path, O_RDONLY, 0 1775 my $f = new_from_file cf::object::thawer $path
1433 # or return;
1434
1435 $self->_load_header ($path)
1436 or return; 1776 or return;
1777
1778 $self->_load_header ($f)
1779 or return;
1780
1781 local $MAP_LOADING{$self->{path}} = $self;
1782 $f->resolve_delayed_derefs;
1437 1783
1438 $self->{load_path} = $path; 1784 $self->{load_path} = $path;
1439 1785
1440 1 1786 1
1441} 1787}
1480 $self->load_header_orig 1826 $self->load_header_orig
1481 or return; 1827 or return;
1482 $self->prepare_orig; 1828 $self->prepare_orig;
1483 } 1829 }
1484 1830
1831 $self->{deny_reset} = 1
1832 if $self->no_reset;
1833
1485 $self->default_region (cf::region::find_by_path $self->{path}) 1834 $self->default_region (cf::region::find_by_path $self->{path})
1486 unless $self->default_region; 1835 unless $self->default_region;
1487 1836
1488 1 1837 1
1489} 1838}
1504 $map->{last_save} = $cf::RUNTIME; 1853 $map->{last_save} = $cf::RUNTIME;
1505 1854
1506 $map->load_header 1855 $map->load_header
1507 or return; 1856 or return;
1508 1857
1509 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1858 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1510 # doing this can freeze the server in a sync job, obviously 1859 # doing this can freeze the server in a sync job, obviously
1511 #$cf::WAIT_FOR_TICK->wait; 1860 #$cf::WAIT_FOR_TICK->wait;
1512 $map->reset; 1861 $map->reset;
1513 undef $guard; 1862 undef $guard;
1514 return find $path; 1863 return find $path;
1527 local $self->{deny_reset} = 1; # loading can take a long time 1876 local $self->{deny_reset} = 1; # loading can take a long time
1528 1877
1529 my $path = $self->{path}; 1878 my $path = $self->{path};
1530 1879
1531 { 1880 {
1881 my $guard1 = cf::lock_acquire "map_data:$path";
1532 my $guard = cf::lock_acquire "map_load:$path"; 1882 my $guard2 = cf::lock_acquire "map_load:$path";
1533 1883
1534 return if $self->in_memory != cf::MAP_SWAPPED; 1884 return if $self->in_memory != cf::MAP_SWAPPED;
1535 1885
1536 $self->in_memory (cf::MAP_LOADING); 1886 $self->in_memory (cf::MAP_LOADING);
1537 1887
1538 $self->alloc; 1888 $self->alloc;
1539 1889
1540 $self->pre_load; 1890 $self->pre_load;
1541 Coro::cede; 1891 cf::cede_to_tick;
1542 1892
1893 my $f = new_from_file cf::object::thawer $self->{load_path};
1894 $f->skip_block;
1543 $self->_load_objects ($self->{load_path}, 1) 1895 $self->_load_objects ($f)
1544 or return; 1896 or return;
1545 1897
1546 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1547 if delete $self->{load_original}; 1899 if delete $self->{load_original};
1548 1900
1549 if (my $uniq = $self->uniq_path) { 1901 if (my $uniq = $self->uniq_path) {
1550 utf8::encode $uniq; 1902 utf8::encode $uniq;
1551 if (aio_open $uniq, O_RDONLY, 0) { 1903 unless (aio_stat $uniq) {
1904 if (my $f = new_from_file cf::object::thawer $uniq) {
1552 $self->clear_unique_items; 1905 $self->clear_unique_items;
1553 $self->_load_objects ($uniq, 0); 1906 $self->_load_objects ($f);
1907 $f->resolve_delayed_derefs;
1908 }
1554 } 1909 }
1555 } 1910 }
1556 1911
1557 Coro::cede; 1912 $f->resolve_delayed_derefs;
1913
1914 cf::cede_to_tick;
1558 # now do the right thing for maps 1915 # now do the right thing for maps
1559 $self->link_multipart_objects; 1916 $self->link_multipart_objects;
1560 $self->difficulty ($self->estimate_difficulty) 1917 $self->difficulty ($self->estimate_difficulty)
1561 unless $self->difficulty; 1918 unless $self->difficulty;
1562 Coro::cede; 1919 cf::cede_to_tick;
1563 1920
1564 unless ($self->{deny_activate}) { 1921 unless ($self->{deny_activate}) {
1565 $self->decay_objects; 1922 $self->decay_objects;
1566 $self->fix_auto_apply; 1923 $self->fix_auto_apply;
1567 $self->update_buttons; 1924 $self->update_buttons;
1568 Coro::cede; 1925 cf::cede_to_tick;
1569 $self->set_darkness_map; 1926 $self->set_darkness_map;
1570 Coro::cede; 1927 cf::cede_to_tick;
1571 $self->activate; 1928 $self->activate;
1572 } 1929 }
1930
1931 $self->{last_save} = $cf::RUNTIME;
1932 $self->last_access ($cf::RUNTIME);
1573 1933
1574 $self->in_memory (cf::MAP_IN_MEMORY); 1934 $self->in_memory (cf::MAP_IN_MEMORY);
1575 } 1935 }
1576 1936
1577 $self->post_load; 1937 $self->post_load;
1581 my ($self, $ob) = @_; 1941 my ($self, $ob) = @_;
1582 1942
1583 return find "~" . $ob->name . "/" . $self->{path} 1943 return find "~" . $ob->name . "/" . $self->{path}
1584 if $self->per_player; 1944 if $self->per_player;
1585 1945
1946# return find "?party/" . $ob->name . "/" . $self->{path}
1947# if $self->per_party;
1948
1586 $self 1949 $self
1587} 1950}
1588 1951
1589# find and load all maps in the 3x3 area around a map 1952# find and load all maps in the 3x3 area around a map
1590sub load_diag { 1953sub load_neighbours {
1591 my ($map) = @_; 1954 my ($map) = @_;
1592 1955
1593 my @diag; # diagonal neighbours 1956 my @neigh; # diagonal neighbours
1594 1957
1595 for (0 .. 3) { 1958 for (0 .. 3) {
1596 my $neigh = $map->tile_path ($_) 1959 my $neigh = $map->tile_path ($_)
1597 or next; 1960 or next;
1598 $neigh = find $neigh, $map 1961 $neigh = find $neigh, $map
1599 or next; 1962 or next;
1600 $neigh->load; 1963 $neigh->load;
1601 1964
1965 push @neigh,
1602 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1966 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1603 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1967 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1604 } 1968 }
1605 1969
1606 for (@diag) { 1970 for (grep defined $_->[0], @neigh) {
1971 my ($path, $origin) = @$_;
1607 my $neigh = find @$_ 1972 my $neigh = find $path, $origin
1608 or next; 1973 or next;
1609 $neigh->load; 1974 $neigh->load;
1610 } 1975 }
1611} 1976}
1612 1977
1617} 1982}
1618 1983
1619sub do_load_sync { 1984sub do_load_sync {
1620 my ($map) = @_; 1985 my ($map) = @_;
1621 1986
1987 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1988 if $Coro::current == $Coro::main;
1989
1622 cf::sync_job { $map->load }; 1990 cf::sync_job { $map->load };
1623} 1991}
1624 1992
1625our %MAP_PREFETCH; 1993our %MAP_PREFETCH;
1626our $MAP_PREFETCHER = undef; 1994our $MAP_PREFETCHER = undef;
1627 1995
1628sub find_async { 1996sub find_async {
1629 my ($path, $origin) = @_; 1997 my ($path, $origin, $load) = @_;
1630 1998
1631 $path = normalise $path, $origin && $origin->{path}; 1999 $path = normalise $path, $origin && $origin->{path};
1632 2000
1633 if (my $map = $cf::MAP{$path}) { 2001 if (my $map = $cf::MAP{$path}) {
1634 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2002 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1635 } 2003 }
1636 2004
1637 undef $MAP_PREFETCH{$path}; 2005 $MAP_PREFETCH{$path} |= $load;
2006
1638 $MAP_PREFETCHER ||= cf::async { 2007 $MAP_PREFETCHER ||= cf::async {
1639 while (%MAP_PREFETCH) { 2008 while (%MAP_PREFETCH) {
1640 for my $path (keys %MAP_PREFETCH) { 2009 while (my ($k, $v) = each %MAP_PREFETCH) {
1641 my $map = find $path 2010 if (my $map = find $k) {
1642 or next;
1643 $map->load; 2011 $map->load if $v;
2012 }
1644 2013
1645 delete $MAP_PREFETCH{$path}; 2014 delete $MAP_PREFETCH{$k};
1646 } 2015 }
1647 } 2016 }
1648 undef $MAP_PREFETCHER; 2017 undef $MAP_PREFETCHER;
1649 }; 2018 };
1650 $MAP_PREFETCHER->prio (6); 2019 $MAP_PREFETCHER->prio (6);
1653} 2022}
1654 2023
1655sub save { 2024sub save {
1656 my ($self) = @_; 2025 my ($self) = @_;
1657 2026
1658 my $lock = cf::lock_acquire "map_data:" . $self->path; 2027 my $lock = cf::lock_acquire "map_data:$self->{path}";
1659 2028
1660 $self->{last_save} = $cf::RUNTIME; 2029 $self->{last_save} = $cf::RUNTIME;
1661 2030
1662 return unless $self->dirty; 2031 return unless $self->dirty;
1663 2032
1686 my ($self) = @_; 2055 my ($self) = @_;
1687 2056
1688 # save first because save cedes 2057 # save first because save cedes
1689 $self->save; 2058 $self->save;
1690 2059
1691 my $lock = cf::lock_acquire "map_data:" . $self->path; 2060 my $lock = cf::lock_acquire "map_data:$self->{path}";
1692 2061
1693 return if $self->players; 2062 return if $self->players;
1694 return if $self->in_memory != cf::MAP_IN_MEMORY; 2063 return if $self->in_memory != cf::MAP_IN_MEMORY;
1695 return if $self->{deny_save}; 2064 return if $self->{deny_save};
1696 2065
1700 2069
1701sub reset_at { 2070sub reset_at {
1702 my ($self) = @_; 2071 my ($self) = @_;
1703 2072
1704 # TODO: safety, remove and allow resettable per-player maps 2073 # 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}; 2074 return 1e99 if $self->{deny_reset};
1707 2075
1708 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2076 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1709 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2077 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1710 2078
1721 my ($self) = @_; 2089 my ($self) = @_;
1722 2090
1723 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2091 my $lock = cf::lock_acquire "map_data:$self->{path}";
1724 2092
1725 return if $self->players; 2093 return if $self->players;
1726 return if $self->isa ("ext::map_per_player");#d#
1727 2094
1728 warn "resetting map ", $self->path;#d# 2095 warn "resetting map ", $self->path;
1729 2096
1730 $self->in_memory (cf::MAP_SWAPPED); 2097 $self->in_memory (cf::MAP_SWAPPED);
1731 2098
1732 # need to save uniques path 2099 # need to save uniques path
1733 unless ($self->{deny_save}) { 2100 unless ($self->{deny_save}) {
1750my $nuke_counter = "aaaa"; 2117my $nuke_counter = "aaaa";
1751 2118
1752sub nuke { 2119sub nuke {
1753 my ($self) = @_; 2120 my ($self) = @_;
1754 2121
2122 {
2123 my $lock = cf::lock_acquire "map_data:$self->{path}";
2124
1755 delete $cf::MAP{$self->path}; 2125 delete $cf::MAP{$self->path};
1756 2126
1757 $self->unlink_save; 2127 $self->unlink_save;
1758 2128
1759 bless $self, "cf::map"; 2129 bless $self, "cf::map";
1760 delete $self->{deny_reset}; 2130 delete $self->{deny_reset};
1761 $self->{deny_save} = 1; 2131 $self->{deny_save} = 1;
1762 $self->reset_timeout (1); 2132 $self->reset_timeout (1);
1763 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2133 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1764 2134
1765 $cf::MAP{$self->path} = $self; 2135 $cf::MAP{$self->path} = $self;
2136 }
1766 2137
1767 $self->reset; # polite request, might not happen 2138 $self->reset; # polite request, might not happen
2139}
2140
2141=item $maps = cf::map::tmp_maps
2142
2143Returns an arrayref with all map paths of currently instantiated and saved
2144maps. May block.
2145
2146=cut
2147
2148sub tmp_maps() {
2149 [
2150 map {
2151 utf8::decode $_;
2152 /\.map$/
2153 ? normalise $_
2154 : ()
2155 } @{ aio_readdir $TMPDIR or [] }
2156 ]
2157}
2158
2159=item $maps = cf::map::random_maps
2160
2161Returns an arrayref with all map paths of currently instantiated and saved
2162random maps. May block.
2163
2164=cut
2165
2166sub random_maps() {
2167 [
2168 map {
2169 utf8::decode $_;
2170 /\.map$/
2171 ? normalise "?random/$_"
2172 : ()
2173 } @{ aio_readdir $RANDOMDIR or [] }
2174 ]
1768} 2175}
1769 2176
1770=item cf::map::unique_maps 2177=item cf::map::unique_maps
1771 2178
1772Returns an arrayref of paths of all shared maps that have 2179Returns an arrayref of paths of all shared maps that have
1773instantiated unique items. May block. 2180instantiated unique items. May block.
1774 2181
1775=cut 2182=cut
1776 2183
1777sub unique_maps() { 2184sub unique_maps() {
1778 my $files = aio_readdir $UNIQUEDIR 2185 [
1779 or return; 2186 map {
1780
1781 my @paths;
1782
1783 for (@$files) {
1784 utf8::decode $_; 2187 utf8::decode $_;
1785 next if /\.pst$/; 2188 /\.map$/
1786 next unless /^$PATH_SEP/o; 2189 ? normalise $_
1787 2190 : ()
1788 push @paths, cf::map::normalise $_; 2191 } @{ aio_readdir $UNIQUEDIR or [] }
1789 } 2192 ]
1790
1791 \@paths
1792} 2193}
1793 2194
1794package cf; 2195package cf;
1795 2196
1796=back 2197=back
1814 map { $_, inv_recursive_ $_->inv } @_ 2215 map { $_, inv_recursive_ $_->inv } @_
1815} 2216}
1816 2217
1817sub inv_recursive { 2218sub inv_recursive {
1818 inv_recursive_ inv $_[0] 2219 inv_recursive_ inv $_[0]
2220}
2221
2222=item $ref = $ob->ref
2223
2224creates and returns a persistent reference to an objetc that can be stored as a string.
2225
2226=item $ob = cf::object::deref ($refstring)
2227
2228returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2229even if the object actually exists. May block.
2230
2231=cut
2232
2233sub deref {
2234 my ($ref) = @_;
2235
2236 # temporary compatibility#TODO#remove
2237 $ref =~ s{^<}{player/<};
2238
2239 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2240 my ($uuid, $name) = ($1, $2);
2241 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2242 or return;
2243 $pl->ob->uuid eq $uuid
2244 or return;
2245
2246 $pl->ob
2247 } else {
2248 warn "$ref: cannot resolve object reference\n";
2249 undef
2250 }
1819} 2251}
1820 2252
1821package cf; 2253package cf;
1822 2254
1823=back 2255=back
1842 2274
1843 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2275 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1844 2276
1845 if ($self->{record_replies}) { 2277 if ($self->{record_replies}) {
1846 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2278 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2279
1847 } else { 2280 } else {
2281 my $pl = $self->contr;
2282
2283 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2284 my $dialog = $pl->{npc_dialog};
2285 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2286
2287 } else {
1848 $msg = $npc->name . " says: $msg" if $npc; 2288 $msg = $npc->name . " says: $msg" if $npc;
1849 $self->message ($msg, $flags); 2289 $self->message ($msg, $flags);
2290 }
1850 } 2291 }
2292}
2293
2294=item $object->send_msg ($channel, $msg, $color, [extra...])
2295
2296=cut
2297
2298sub cf::object::send_msg {
2299 my $pl = shift->contr
2300 or return;
2301 $pl->send_msg (@_);
1851} 2302}
1852 2303
1853=item $player_object->may ("access") 2304=item $player_object->may ("access")
1854 2305
1855Returns wether the given player is authorized to access resource "access" 2306Returns wether the given player is authorized to access resource "access"
1902 $self->deactivate_recursive; 2353 $self->deactivate_recursive;
1903 2354
1904 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2355 return if UNIVERSAL::isa $self->map, "ext::map_link";
1905 2356
1906 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2357 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1907 if $self->map; 2358 if $self->map && $self->map->{path} ne "{link}";
1908 2359
1909 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2360 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1910} 2361}
1911 2362
1912sub cf::object::player::leave_link { 2363sub cf::object::player::leave_link {
1913 my ($self, $map, $x, $y) = @_; 2364 my ($self, $map, $x, $y) = @_;
2365
2366 return unless $self->contr->active;
1914 2367
1915 my $link_pos = delete $self->{_link_pos}; 2368 my $link_pos = delete $self->{_link_pos};
1916 2369
1917 unless ($map) { 2370 unless ($map) {
1918 # restore original map position 2371 # restore original map position
1932 # use -1 or undef as default coordinates, not 0, 0 2385 # use -1 or undef as default coordinates, not 0, 0
1933 ($x, $y) = ($map->enter_x, $map->enter_y) 2386 ($x, $y) = ($map->enter_x, $map->enter_y)
1934 if $x <=0 && $y <= 0; 2387 if $x <=0 && $y <= 0;
1935 2388
1936 $map->load; 2389 $map->load;
1937 $map->load_diag; 2390 $map->load_neighbours;
1938 2391
1939 return unless $self->contr->active; 2392 return unless $self->contr->active;
1940 $self->activate_recursive; 2393 $self->activate_recursive;
1941 2394
1942 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2395 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1943 $self->enter_map ($map, $x, $y); 2396 $self->enter_map ($map, $x, $y);
1944} 2397}
1945 2398
1946cf::player->attach ( 2399=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1947 on_logout => sub {
1948 my ($pl) = @_;
1949 2400
1950 # abort map switching before logout 2401Moves the player to the given map-path and coordinates by first freezing
1951 if ($pl->ob->{_link_pos}) { 2402her, loading and preparing them map, calling the provided $check callback
1952 cf::sync_job { 2403that has to return the map if sucecssful, and then unfreezes the player on
1953 $pl->ob->leave_link 2404the new (success) or old (failed) map position. In either case, $done will
1954 }; 2405be called at the end of this process.
1955 }
1956 },
1957 on_login => sub {
1958 my ($pl) = @_;
1959 2406
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 2407=cut
2408
2409our $GOTOGEN;
1981 2410
1982sub cf::object::player::goto { 2411sub cf::object::player::goto {
1983 my ($self, $path, $x, $y) = @_; 2412 my ($self, $path, $x, $y, $check, $done) = @_;
2413
2414 # do generation counting so two concurrent goto's will be executed in-order
2415 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1984 2416
1985 $self->enter_link; 2417 $self->enter_link;
1986 2418
1987 (async { 2419 (async {
1988 my $map = eval { 2420 my $map = eval {
1989 my $map = cf::map::find $path; 2421 my $map = cf::map::find $path;
2422
2423 if ($map) {
1990 $map = $map->customise_for ($self) if $map; 2424 $map = $map->customise_for ($self);
2425 $map = $check->($map) if $check && $map;
2426 } else {
2427 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2428 }
2429
1991 $map 2430 $map
2431 };
2432
2433 if ($@) {
2434 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2435 LOG llevError | logBacktrace, Carp::longmess $@;
1992 } or 2436 }
1993 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1994 2437
2438 if ($gen == $self->{_goto_generation}) {
2439 delete $self->{_goto_generation};
1995 $self->leave_link ($map, $x, $y); 2440 $self->leave_link ($map, $x, $y);
2441 }
2442
2443 $done->() if $done;
1996 })->prio (1); 2444 })->prio (1);
1997} 2445}
1998 2446
1999=item $player_object->enter_exit ($exit_object) 2447=item $player_object->enter_exit ($exit_object)
2000 2448
2069 my $hp = $exit->stats->hp; 2517 my $hp = $exit->stats->hp;
2070 my $sp = $exit->stats->sp; 2518 my $sp = $exit->stats->sp;
2071 2519
2072 $self->enter_link; 2520 $self->enter_link;
2073 2521
2522 # if exit is damned, update players death & WoR home-position
2523 $self->contr->savebed ($slaying, $hp, $sp)
2524 if $exit->flag (FLAG_DAMNED);
2525
2074 (async { 2526 (async {
2075 $self->deactivate_recursive; # just to be sure 2527 $self->deactivate_recursive; # just to be sure
2076 unless (eval { 2528 unless (eval {
2077 $self->goto ($slaying, $hp, $sp); 2529 $self->goto ($slaying, $hp, $sp);
2078 2530
2105 2557
2106 utf8::encode $text; 2558 utf8::encode $text;
2107 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2559 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2108} 2560}
2109 2561
2562=item $client->send_msg ($channel, $msg, $color, [extra...])
2563
2564Send a drawinfo or msg packet to the client, formatting the msg for the
2565client if neccessary. C<$type> should be a string identifying the type of
2566the message, with C<log> being the default. If C<$color> is negative, suppress
2567the message unless the client supports the msg packet.
2568
2569=cut
2570
2571our %CHANNEL = (
2572 "c/identify" => {
2573 id => "identify",
2574 title => "Identify",
2575 reply => undef,
2576 tooltip => "Items recently identified",
2577 },
2578 "c/examine" => {
2579 id => "examine",
2580 title => "Examine",
2581 reply => undef,
2582 tooltip => "Signs and other items you examined",
2583 },
2584);
2585
2586sub cf::client::send_msg {
2587 my ($self, $channel, $msg, $color, @extra) = @_;
2588
2589 $msg = $self->pl->expand_cfpod ($msg);
2590
2591 $color &= cf::NDI_CLIENT_MASK; # just in case...
2592
2593 # check predefined channels, for the benefit of C
2594 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2595
2596 if (ref $channel) {
2597 # send meta info to client, if not yet sent
2598 unless (exists $self->{channel}{$channel->{id}}) {
2599 $self->{channel}{$channel->{id}} = $channel;
2600 $self->ext_msg (channel_info => $channel)
2601 if $self->can_msg;
2602 }
2603
2604 $channel = $channel->{id};
2605 }
2606
2607 return unless @extra || length $msg;
2608
2609 if ($self->can_msg) {
2610 # default colour, mask it out
2611 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2612 if $color & cf::NDI_DEF;
2613
2614 $self->send_packet ("msg " . $self->{json_coder}->encode (
2615 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2616 } else {
2617 if ($color >= 0) {
2618 # replace some tags by gcfclient-compatible ones
2619 for ($msg) {
2620 1 while
2621 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2622 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2623 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2624 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2625 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2626 }
2627
2628 $color &= cf::NDI_COLOR_MASK;
2629
2630 utf8::encode $msg;
2631
2632 if (0 && $msg =~ /\[/) {
2633 # COMMAND/INFO
2634 $self->send_packet ("drawextinfo $color 10 8 $msg")
2635 } else {
2636 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2637 $self->send_packet ("drawinfo $color $msg")
2638 }
2639 }
2640 }
2641}
2642
2110=item $client->ext_event ($type, %msg) 2643=item $client->ext_msg ($type, @msg)
2111 2644
2112Sends an exti event to the client. 2645Sends an ext event to the client.
2113 2646
2114=cut 2647=cut
2115 2648
2116sub cf::client::ext_event($$%) { 2649sub cf::client::ext_msg($$@) {
2117 my ($self, $type, %msg) = @_; 2650 my ($self, $type, @msg) = @_;
2118 2651
2652 if ($self->extcmd == 2) {
2653 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2654 } elsif ($self->extcmd == 1) { # TODO: remove
2119 $msg{msgtype} = "event_$type"; 2655 push @msg, msgtype => "event_$type";
2120 $self->send_packet ("ext " . cf::to_json \%msg); 2656 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2657 }
2658}
2659
2660=item $client->ext_reply ($msgid, @msg)
2661
2662Sends an ext reply to the client.
2663
2664=cut
2665
2666sub cf::client::ext_reply($$@) {
2667 my ($self, $id, @msg) = @_;
2668
2669 if ($self->extcmd == 2) {
2670 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2671 } elsif ($self->extcmd == 1) {
2672 #TODO: version 1, remove
2673 unshift @msg, msgtype => "reply", msgid => $id;
2674 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2675 }
2121} 2676}
2122 2677
2123=item $success = $client->query ($flags, "text", \&cb) 2678=item $success = $client->query ($flags, "text", \&cb)
2124 2679
2125Queues a query to the client, calling the given callback with 2680Queues a query to the client, calling the given callback with
2126the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2681the 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>. 2682C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2128 2683
2129Queries can fail, so check the return code. Or don't, as queries will become 2684Queries can fail, so check the return code. Or don't, as queries will
2130reliable at some point in the future. 2685become reliable at some point in the future.
2131 2686
2132=cut 2687=cut
2133 2688
2134sub cf::client::query { 2689sub cf::client::query {
2135 my ($self, $flags, $text, $cb) = @_; 2690 my ($self, $flags, $text, $cb) = @_;
2143 utf8::encode $text; 2698 utf8::encode $text;
2144 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2699 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2145 2700
2146 $self->send_packet ($self->{query_queue}[0][0]) 2701 $self->send_packet ($self->{query_queue}[0][0])
2147 if @{ $self->{query_queue} } == 1; 2702 if @{ $self->{query_queue} } == 1;
2703
2704 1
2148} 2705}
2149 2706
2150cf::client->attach ( 2707cf::client->attach (
2708 on_connect => sub {
2709 my ($ns) = @_;
2710
2711 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2712 },
2151 on_reply => sub { 2713 on_reply => sub {
2152 my ($ns, $msg) = @_; 2714 my ($ns, $msg) = @_;
2153 2715
2154 # this weird shuffling is so that direct followup queries 2716 # this weird shuffling is so that direct followup queries
2155 # get handled first 2717 # get handled first
2167 } else { 2729 } else {
2168 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2730 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2169 } 2731 }
2170 } 2732 }
2171 }, 2733 },
2734 on_exticmd => sub {
2735 my ($ns, $buf) = @_;
2736
2737 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2738
2739 if (ref $msg) {
2740 my ($type, $reply, @payload) =
2741 "ARRAY" eq ref $msg
2742 ? @$msg
2743 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2744
2745 my @reply;
2746
2747 if (my $cb = $EXTICMD{$type}) {
2748 @reply = $cb->($ns, @payload);
2749 }
2750
2751 $ns->ext_reply ($reply, @reply)
2752 if $reply;
2753
2754 } else {
2755 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2756 }
2757
2758 cf::override;
2759 },
2172); 2760);
2173 2761
2174=item $client->async (\&cb) 2762=item $client->async (\&cb)
2175 2763
2176Create a new coroutine, running the specified callback. The coroutine will 2764Create a new coroutine, running the specified callback. The coroutine will
2217our $safe = new Safe "safe"; 2805our $safe = new Safe "safe";
2218our $safe_hole = new Safe::Hole; 2806our $safe_hole = new Safe::Hole;
2219 2807
2220$SIG{FPE} = 'IGNORE'; 2808$SIG{FPE} = 'IGNORE';
2221 2809
2222$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2810$safe->permit_only (Opcode::opset qw(
2811 :base_core :base_mem :base_orig :base_math
2812 grepstart grepwhile mapstart mapwhile
2813 sort time
2814));
2223 2815
2224# here we export the classes and methods available to script code 2816# here we export the classes and methods available to script code
2225 2817
2226=pod 2818=pod
2227 2819
2228The following functions and methods are available within a safe environment: 2820The following functions and methods are available within a safe environment:
2229 2821
2230 cf::object contr pay_amount pay_player map 2822 cf::object
2823 contr pay_amount pay_player map x y force_find force_add
2824 insert remove name archname title slaying race decrease_ob_nr
2825
2231 cf::object::player player 2826 cf::object::player
2232 cf::player peaceful 2827 player
2233 cf::map trigger 2828
2829 cf::player
2830 peaceful
2831
2832 cf::map
2833 trigger
2234 2834
2235=cut 2835=cut
2236 2836
2237for ( 2837for (
2238 ["cf::object" => qw(contr pay_amount pay_player map)], 2838 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2839 insert remove inv name archname title slaying race
2840 decrease_ob_nr)],
2239 ["cf::object::player" => qw(player)], 2841 ["cf::object::player" => qw(player)],
2240 ["cf::player" => qw(peaceful)], 2842 ["cf::player" => qw(peaceful)],
2241 ["cf::map" => qw(trigger)], 2843 ["cf::map" => qw(trigger)],
2242) { 2844) {
2243 no strict 'refs'; 2845 no strict 'refs';
2314=back 2916=back
2315 2917
2316=cut 2918=cut
2317 2919
2318############################################################################# 2920#############################################################################
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 2921# the server's init and main functions
2494 2922
2495sub load_facedata($) { 2923sub load_facedata($) {
2496 my ($path) = @_; 2924 my ($path) = @_;
2925
2926 # HACK to clear player env face cache, we need some signal framework
2927 # for this (global event?)
2928 %ext::player_env::MUSIC_FACE_CACHE = ();
2929
2930 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2497 2931
2498 warn "loading facedata from $path\n"; 2932 warn "loading facedata from $path\n";
2499 2933
2500 my $facedata; 2934 my $facedata;
2501 0 < aio_load $path, $facedata 2935 0 < aio_load $path, $facedata
2504 $facedata = Coro::Storable::thaw $facedata; 2938 $facedata = Coro::Storable::thaw $facedata;
2505 2939
2506 $facedata->{version} == 2 2940 $facedata->{version} == 2
2507 or cf::cleanup "$path: version mismatch, cannot proceed."; 2941 or cf::cleanup "$path: version mismatch, cannot proceed.";
2508 2942
2943 # patch in the exptable
2944 $facedata->{resource}{"res/exp_table"} = {
2945 type => FT_RSRC,
2946 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2947 };
2948 cf::cede_to_tick;
2949
2509 { 2950 {
2510 my $faces = $facedata->{faceinfo}; 2951 my $faces = $facedata->{faceinfo};
2511 2952
2512 while (my ($face, $info) = each %$faces) { 2953 while (my ($face, $info) = each %$faces) {
2513 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2954 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2514 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2955 cf::face::set_visibility $idx, $info->{visibility};
2956 cf::face::set_magicmap $idx, $info->{magicmap};
2515 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2957 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2516 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2958 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2517 Coro::cede; 2959
2960 cf::cede_to_tick;
2518 } 2961 }
2519 2962
2520 while (my ($face, $info) = each %$faces) { 2963 while (my ($face, $info) = each %$faces) {
2521 next unless $info->{smooth}; 2964 next unless $info->{smooth};
2522 my $idx = cf::face::find $face 2965 my $idx = cf::face::find $face
2523 or next; 2966 or next;
2524 if (my $smooth = cf::face::find $info->{smooth}) { 2967 if (my $smooth = cf::face::find $info->{smooth}) {
2968 cf::face::set_smooth $idx, $smooth;
2525 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2969 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2526 } else { 2970 } else {
2527 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2971 warn "smooth face '$info->{smooth}' not found for face '$face'";
2528 } 2972 }
2529 Coro::cede; 2973
2974 cf::cede_to_tick;
2530 } 2975 }
2531 } 2976 }
2532 2977
2533 { 2978 {
2534 my $anims = $facedata->{animinfo}; 2979 my $anims = $facedata->{animinfo};
2535 2980
2536 while (my ($anim, $info) = each %$anims) { 2981 while (my ($anim, $info) = each %$anims) {
2537 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2982 cf::anim::set $anim, $info->{frames}, $info->{facings};
2538 Coro::cede; 2983 cf::cede_to_tick;
2539 } 2984 }
2540 2985
2541 cf::anim::invalidate_all; # d'oh 2986 cf::anim::invalidate_all; # d'oh
2542 } 2987 }
2543 2988
2989 {
2990 # TODO: for gcfclient pleasure, we should give resources
2991 # that gcfclient doesn't grok a >10000 face index.
2992 my $res = $facedata->{resource};
2993
2994 my $soundconf = delete $res->{"res/sound.conf"};
2995
2996 while (my ($name, $info) = each %$res) {
2997 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2998 my $data;
2999
3000 if ($info->{type} & 1) {
3001 # prepend meta info
3002
3003 my $meta = $enc->encode ({
3004 name => $name,
3005 %{ $info->{meta} || {} },
3006 });
3007
3008 $data = pack "(w/a*)*", $meta, $info->{data};
3009 } else {
3010 $data = $info->{data};
3011 }
3012
3013 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3014 cf::face::set_type $idx, $info->{type};
3015
3016 cf::cede_to_tick;
3017 }
3018
3019 if ($soundconf) {
3020 $soundconf = $enc->decode (delete $soundconf->{data});
3021
3022 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3023 my $sound = $soundconf->{compat}[$_]
3024 or next;
3025
3026 my $face = cf::face::find "sound/$sound->[1]";
3027 cf::sound::set $sound->[0] => $face;
3028 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3029 }
3030
3031 while (my ($k, $v) = each %{$soundconf->{event}}) {
3032 my $face = cf::face::find "sound/$v";
3033 cf::sound::set $k => $face;
3034 }
3035 }
3036 }
3037
2544 1 3038 1
2545} 3039}
2546 3040
3041register_exticmd fx_want => sub {
3042 my ($ns, $want) = @_;
3043
3044 while (my ($k, $v) = each %$want) {
3045 $ns->fx_want ($k, $v);
3046 }
3047};
3048
2547sub reload_regions { 3049sub reload_regions {
3050 # HACK to clear player env face cache, we need some signal framework
3051 # for this (global event?)
3052 %ext::player_env::MUSIC_FACE_CACHE = ();
3053
2548 load_resource_file "$MAPDIR/regions" 3054 load_resource_file "$MAPDIR/regions"
2549 or die "unable to load regions file\n"; 3055 or die "unable to load regions file\n";
3056
3057 for (cf::region::list) {
3058 $_->{match} = qr/$_->{match}/
3059 if exists $_->{match};
3060 }
2550} 3061}
2551 3062
2552sub reload_facedata { 3063sub reload_facedata {
2553 load_facedata "$DATADIR/facedata" 3064 load_facedata "$DATADIR/facedata"
2554 or die "unable to load facedata\n"; 3065 or die "unable to load facedata\n";
2555} 3066}
2556 3067
2557sub reload_archetypes { 3068sub reload_archetypes {
2558 load_resource_file "$DATADIR/archetypes" 3069 load_resource_file "$DATADIR/archetypes"
2559 or die "unable to load archetypes\n"; 3070 or die "unable to load archetypes\n";
3071 #d# NEED to laod twice to resolve forward references
3072 # this really needs to be done in an extra post-pass
3073 # (which needs to be synchronous, so solve it differently)
3074 load_resource_file "$DATADIR/archetypes"
3075 or die "unable to load archetypes\n";
2560} 3076}
2561 3077
2562sub reload_treasures { 3078sub reload_treasures {
2563 load_resource_file "$DATADIR/treasures" 3079 load_resource_file "$DATADIR/treasures"
2564 or die "unable to load treasurelists\n"; 3080 or die "unable to load treasurelists\n";
2567sub reload_resources { 3083sub reload_resources {
2568 warn "reloading resource files...\n"; 3084 warn "reloading resource files...\n";
2569 3085
2570 reload_regions; 3086 reload_regions;
2571 reload_facedata; 3087 reload_facedata;
3088 #reload_archetypes;#d#
2572 reload_archetypes; 3089 reload_archetypes;
2573 reload_treasures; 3090 reload_treasures;
2574 3091
2575 warn "finished reloading resource files\n"; 3092 warn "finished reloading resource files\n";
2576} 3093}
2577 3094
2578sub init { 3095sub init {
2579 reload_resources; 3096 reload_resources;
2580} 3097}
2581 3098
2582sub cfg_load { 3099sub reload_config {
2583 open my $fh, "<:utf8", "$CONFDIR/config" 3100 open my $fh, "<:utf8", "$CONFDIR/config"
2584 or return; 3101 or return;
2585 3102
2586 local $/; 3103 local $/;
2587 *CFG = YAML::Syck::Load <$fh>; 3104 *CFG = YAML::Syck::Load <$fh>;
2607 (async { 3124 (async {
2608 Event::one_event; 3125 Event::one_event;
2609 })->prio (Coro::PRIO_MAX); 3126 })->prio (Coro::PRIO_MAX);
2610 }; 3127 };
2611 3128
2612 cfg_load; 3129 reload_config;
2613 db_init; 3130 db_init;
2614 load_extensions; 3131 load_extensions;
2615 3132
2616 $TICK_WATCHER->start; 3133 $TICK_WATCHER->start;
2617 Event::loop; 3134 Event::loop;
2633 }, 3150 },
2634 ); 3151 );
2635 } 3152 }
2636} 3153}
2637 3154
3155sub write_runtime {
3156 my $runtime = "$LOCALDIR/runtime";
3157
3158 # first touch the runtime file to show we are still running:
3159 # the fsync below can take a very very long time.
3160
3161 IO::AIO::aio_utime $runtime, undef, undef;
3162
3163 my $guard = cf::lock_acquire "write_runtime";
3164
3165 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3166 or return;
3167
3168 my $value = $cf::RUNTIME + 90 + 10;
3169 # 10 is the runtime save interval, for a monotonic clock
3170 # 60 allows for the watchdog to kill the server.
3171
3172 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3173 and return;
3174
3175 # always fsync - this file is important
3176 aio_fsync $fh
3177 and return;
3178
3179 # touch it again to show we are up-to-date
3180 aio_utime $fh, undef, undef;
3181
3182 close $fh
3183 or return;
3184
3185 aio_rename "$runtime~", $runtime
3186 and return;
3187
3188 warn "runtime file written.\n";
3189
3190 1
3191}
3192
2638sub emergency_save() { 3193sub emergency_save() {
2639 my $freeze_guard = cf::freeze_mainloop; 3194 my $freeze_guard = cf::freeze_mainloop;
2640 3195
2641 warn "enter emergency perl save\n"; 3196 warn "enter emergency perl save\n";
2642 3197
2717 %EXT_CORO = (); 3272 %EXT_CORO = ();
2718 3273
2719 warn "removing commands"; 3274 warn "removing commands";
2720 %COMMAND = (); 3275 %COMMAND = ();
2721 3276
2722 warn "removing ext commands"; 3277 warn "removing ext/exti commands";
2723 %EXTCMD = (); 3278 %EXTCMD = ();
3279 %EXTICMD = ();
2724 3280
2725 warn "unloading/nuking all extensions"; 3281 warn "unloading/nuking all extensions";
2726 for my $pkg (@EXTS) { 3282 for my $pkg (@EXTS) {
2727 warn "... unloading $pkg"; 3283 warn "... unloading $pkg";
2728 3284
2771 warn "reloading cf.pm"; 3327 warn "reloading cf.pm";
2772 require cf; 3328 require cf;
2773 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3329 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2774 3330
2775 warn "loading config and database again"; 3331 warn "loading config and database again";
2776 cf::cfg_load; 3332 cf::reload_config;
2777 3333
2778 warn "loading extensions"; 3334 warn "loading extensions";
2779 cf::load_extensions; 3335 cf::load_extensions;
2780 3336
2781 warn "reattaching attachments to objects/players"; 3337 warn "reattaching attachments to objects/players";
2846 my $signal = new Coro::Signal; 3402 my $signal = new Coro::Signal;
2847 push @WAIT_FOR_TICK_BEGIN, $signal; 3403 push @WAIT_FOR_TICK_BEGIN, $signal;
2848 $signal->wait; 3404 $signal->wait;
2849} 3405}
2850 3406
3407 my $min = 1e6;#d#
3408 my $avg = 10;
2851$TICK_WATCHER = Event->timer ( 3409$TICK_WATCHER = Event->timer (
2852 reentrant => 0, 3410 reentrant => 0,
2853 parked => 1, 3411 parked => 1,
2854 prio => 0, 3412 prio => 0,
2855 at => $NEXT_TICK || $TICK, 3413 at => $NEXT_TICK || $TICK,
2862 } 3420 }
2863 3421
2864 $NOW = $tick_start = Event::time; 3422 $NOW = $tick_start = Event::time;
2865 3423
2866 cf::server_tick; # one server iteration 3424 cf::server_tick; # one server iteration
3425
3426 0 && sync_job {#d#
3427 for(1..10) {
3428 my $t = Event::time;
3429 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3430 or die;
3431
3432 $map->width (50);
3433 $map->height (50);
3434 $map->alloc;
3435 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3436 my $t = Event::time - $t;
3437
3438 #next unless $t < 0.0013;#d#
3439 if ($t < $min) {
3440 $min = $t;
3441 }
3442 $avg = $avg * 0.99 + $t * 0.01;
3443 }
3444 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3445 exit 0;
3446 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3447 };
2867 3448
2868 $RUNTIME += $TICK; 3449 $RUNTIME += $TICK;
2869 $NEXT_TICK += $TICK; 3450 $NEXT_TICK += $TICK;
2870 3451
2871 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3452 if ($NOW >= $NEXT_RUNTIME_WRITE) {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines