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.278 by root, Mon Jun 11 21:38:14 2007 UTC vs.
Revision 1.357 by root, Tue Sep 4 08:42:58 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
163=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
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.
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.
168 178
169=back 179=back
170 180
171=cut 181=cut
172 182
206} 216}
207 217
208$Event::DIED = sub { 218$Event::DIED = sub {
209 warn "error in event callback: @_"; 219 warn "error in event callback: @_";
210}; 220};
221
222#############################################################################
211 223
212=head2 UTILITY FUNCTIONS 224=head2 UTILITY FUNCTIONS
213 225
214=over 4 226=over 4
215 227
234 $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;
235 $d 247 $d
236 } || "[unable to dump $_[0]: '$@']"; 248 } || "[unable to dump $_[0]: '$@']";
237} 249}
238 250
239use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
240
241=item $ref = cf::from_json $json 251=item $ref = cf::from_json $json
242 252
243Converts a JSON string into the corresponding perl data structure. 253Converts a JSON string into the corresponding perl data structure.
244 254
245=item $json = cf::to_json $ref 255=item $json = cf::to_json $ref
246 256
247Converts 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]) }
248 265
249=item cf::lock_wait $string 266=item cf::lock_wait $string
250 267
251Wait until the given lock is available. See cf::lock_acquire. 268Wait until the given lock is available. See cf::lock_acquire.
252 269
254 271
255Wait 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
256a 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,
257for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
258returned. 275returned.
276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
259 279
260Lock 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
261uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
262 282
263=item $locked = cf::lock_active $string 283=item $locked = cf::lock_active $string
306 }; 326 };
307 $TICK_WATCHER->stop; 327 $TICK_WATCHER->stop;
308 $guard 328 $guard
309} 329}
310 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
311=item cf::async { BLOCK } 387=item cf::async { BLOCK }
312 388
313Currently the same as Coro::async_pool, meaning you cannot use 389Currently the same as Coro::async_pool, meaning you cannot use
314C<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
315thing you are allowed to do is call C<prio> on it. 391thing you are allowed to do is call C<prio> on it.
318 394
319BEGIN { *async = \&Coro::async_pool } 395BEGIN { *async = \&Coro::async_pool }
320 396
321=item cf::sync_job { BLOCK } 397=item cf::sync_job { BLOCK }
322 398
323The design of crossfire+ requires that the main coro ($Coro::main) is 399The design of Crossfire TRT requires that the main coroutine ($Coro::main)
324always able to handle events or runnable, as crossfire+ is only partly 400is always able to handle events or runnable, as Crossfire TRT is only
325reentrant. 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.
326 403
327If 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
328the given BLOCK in another coroutine while waiting for the result. The 405the given BLOCK in another coroutine while waiting for the result. The
329server 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
330fast or be very important. 407fast or be very important.
390 $EXT_CORO{$coro+0} = $coro; 467 $EXT_CORO{$coro+0} = $coro;
391 468
392 $coro 469 $coro
393} 470}
394 471
395sub write_runtime { 472=item fork_call { }, $args
396 my $runtime = "$LOCALDIR/runtime";
397 473
398 # first touch the runtime file to show we are still running: 474Executes the given code block with the given arguments in a seperate
399 # 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.
400 478
401 IO::AIO::aio_utime $runtime, undef, undef; 479=cut
402 480
403 my $guard = cf::lock_acquire "write_runtime"; 481sub fork_call(&@) {
482 my ($cb, @args) = @_;
404 483
405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 484 # we seemingly have to make a local copy of the whole thing,
406 or return; 485 # otherwise perl prematurely frees the stuff :/
486 # TODO: investigate and fix (likely this will be rather laborious)
407 487
408 my $value = $cf::RUNTIME + 90 + 10; 488 my @res = Coro::Util::fork_eval {
409 # 10 is the runtime save interval, for a monotonic clock 489 reset_signals;
410 # 60 allows for the watchdog to kill the server. 490 &$cb
491 }, @args;
411 492
412 (aio_write $fh, 0, (length $value), $value, 0) <= 0 493 wantarray ? @res : $res[-1]
413 and return; 494}
414 495
415 # always fsync - this file is important 496=item $value = cf::db_get $family => $key
416 aio_fsync $fh
417 and return;
418 497
419 # touch it again to show we are up-to-date 498Returns a single value from the environment database.
420 aio_utime $fh, undef, undef;
421 499
422 close $fh 500=item cf::db_put $family => $key => $value
423 or return;
424 501
425 aio_rename "$runtime~", $runtime 502Stores the given C<$value> in the family. It can currently store binary
426 and return; 503data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
427 504
428 warn "runtime file written.\n"; 505=cut
429 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 };
430 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"
431} 610}
432 611
433=item cf::datalog type => key => value, ... 612=item cf::datalog type => key => value, ...
434 613
435Log 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.
453attach callbacks/event handlers (a collection of which is called an "attachment") 632attach callbacks/event handlers (a collection of which is called an "attachment")
454to it. All such attachable objects support the following methods. 633to it. All such attachable objects support the following methods.
455 634
456In 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>
457C<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
458crossfire+). 637Crossfire TRT).
459 638
460=over 4 639=over 4
461 640
462=item $attachable->attach ($attachment, key => $value...) 641=item $attachable->attach ($attachment, key => $value...)
463 642
665 _attach $registry, $klass, @attach; 844 _attach $registry, $klass, @attach;
666 } 845 }
667 846
668 $obj->{$name} = \%arg; 847 $obj->{$name} = \%arg;
669 } else { 848 } else {
670 warn "object uses attachment '$name' that is not available, postponing.\n"; 849 warn "object uses attachment '$name' which is not available, postponing.\n";
671 } 850 }
672 851
673 $obj->{_attachment}{$name} = undef; 852 $obj->{_attachment}{$name} = undef;
674} 853}
675 854
715 "; 894 ";
716 die if $@; 895 die if $@;
717} 896}
718 897
719our $override; 898our $override;
720our @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?
721 900
722sub override { 901sub override {
723 $override = 1; 902 $override = 1;
724 @invoke_results = (); 903 @INVOKE_RESULTS = (@_);
725} 904}
726 905
727sub do_invoke { 906sub do_invoke {
728 my $event = shift; 907 my $event = shift;
729 my $callbacks = shift; 908 my $callbacks = shift;
730 909
731 @invoke_results = (); 910 @INVOKE_RESULTS = ();
732 911
733 local $override; 912 local $override;
734 913
735 for (@$callbacks) { 914 for (@$callbacks) {
736 eval { &{$_->[1]} }; 915 eval { &{$_->[1]} };
753 932
754Generate an object-specific event with the given arguments. 933Generate an object-specific event with the given arguments.
755 934
756This 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
757removed 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
758results (if you must, access C<@cf::invoke_results> directly). 937results (if you must, access C<@cf::INVOKE_RESULTS> directly).
759 938
760=back 939=back
761 940
762=cut 941=cut
763 942
764############################################################################# 943#############################################################################
765# 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}
766 956
767sub reattach { 957sub reattach {
768 # basically do the same as instantiate, without calling instantiate 958 # basically do the same as instantiate, without calling instantiate
769 my ($obj) = @_; 959 my ($obj) = @_;
770 960
814 }, 1004 },
815); 1005);
816 1006
817sub object_freezer_save { 1007sub object_freezer_save {
818 my ($filename, $rdata, $objs) = @_; 1008 my ($filename, $rdata, $objs) = @_;
1009
1010 my $guard = cf::lock_acquire "io";
819 1011
820 sync_job { 1012 sync_job {
821 if (length $$rdata) { 1013 if (length $$rdata) {
822 warn sprintf "saving %s (%d,%d)\n", 1014 warn sprintf "saving %s (%d,%d)\n",
823 $filename, length $$rdata, scalar @$objs; 1015 $filename, length $$rdata, scalar @$objs;
847 } 1039 }
848 } else { 1040 } else {
849 aio_unlink $filename; 1041 aio_unlink $filename;
850 aio_unlink "$filename.pst"; 1042 aio_unlink "$filename.pst";
851 } 1043 }
852 } 1044 };
1045
1046 undef $guard;
853} 1047}
854 1048
855sub object_freezer_as_string { 1049sub object_freezer_as_string {
856 my ($rdata, $objs) = @_; 1050 my ($rdata, $objs) = @_;
857 1051
862 1056
863sub object_thawer_load { 1057sub object_thawer_load {
864 my ($filename) = @_; 1058 my ($filename) = @_;
865 1059
866 my ($data, $av); 1060 my ($data, $av);
1061
1062 my $guard = cf::lock_acquire "io";
867 1063
868 (aio_load $filename, $data) >= 0 1064 (aio_load $filename, $data) >= 0
869 or return; 1065 or return;
870 1066
871 unless (aio_stat "$filename.pst") { 1067 unless (aio_stat "$filename.pst") {
872 (aio_load "$filename.pst", $av) >= 0 1068 (aio_load "$filename.pst", $av) >= 0
873 or return; 1069 or return;
1070
1071 undef $guard;
874 $av = eval { (Storable::thaw $av)->{objs} }; 1072 $av = eval { (Storable::thaw $av)->{objs} };
875 } 1073 }
876 1074
877 warn sprintf "loading %s (%d)\n", 1075 warn sprintf "loading %s (%d)\n",
878 $filename, length $data, scalar @{$av || []}; 1076 $filename, length $data, scalar @{$av || []};
1077
879 return ($data, $av); 1078 ($data, $av)
880} 1079}
1080
1081=head2 COMMAND CALLBACKS
1082
1083=over 4
1084
1085=cut
881 1086
882############################################################################# 1087#############################################################################
883# command handling &c 1088# command handling &c
884 1089
885=item cf::register_command $name => \&callback($ob,$args); 1090=item cf::register_command $name => \&callback($ob,$args);
898 push @{ $COMMAND{$name} }, [$caller, $cb]; 1103 push @{ $COMMAND{$name} }, [$caller, $cb];
899} 1104}
900 1105
901=item cf::register_extcmd $name => \&callback($pl,$packet); 1106=item cf::register_extcmd $name => \&callback($pl,$packet);
902 1107
903Register 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.
904 1113
905If 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
906called. 1115called.
907 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
908=cut 1128=cut
909 1129
910sub register_extcmd { 1130sub register_extcmd {
911 my ($name, $cb) = @_; 1131 my ($name, $cb) = @_;
912 1132
913 $EXTCMD{$name} = $cb; 1133 $EXTCMD{$name} = $cb;
1134}
1135
1136sub register_exticmd {
1137 my ($name, $cb) = @_;
1138
1139 $EXTICMD{$name} = $cb;
914} 1140}
915 1141
916cf::player->attach ( 1142cf::player->attach (
917 on_command => sub { 1143 on_command => sub {
918 my ($pl, $name, $params) = @_; 1144 my ($pl, $name, $params) = @_;
927 cf::override; 1153 cf::override;
928 }, 1154 },
929 on_extcmd => sub { 1155 on_extcmd => sub {
930 my ($pl, $buf) = @_; 1156 my ($pl, $buf) = @_;
931 1157
932 my $msg = eval { from_json $buf }; 1158 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
933 1159
934 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
935 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1168 if (my $cb = $EXTCMD{$type}) {
936 if (my %reply = $cb->($pl, $msg)) { 1169 @reply = $cb->($pl, @payload);
937 $pl->ext_reply ($msg->{msgid}, %reply);
938 }
939 } 1170 }
1171
1172 $pl->ext_reply ($reply, @reply)
1173 if $reply;
1174
940 } else { 1175 } else {
941 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1176 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
942 } 1177 }
943 1178
944 cf::override; 1179 cf::override;
967 path => $path, 1202 path => $path,
968 base => $base, 1203 base => $base,
969 pkg => $pkg, 1204 pkg => $pkg,
970 ); 1205 );
971 1206
972 $ext{meta} = { map { split /=/, $_, 2 } split /\s+/, $1 } 1207 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
973 if $source =~ /^#!.*?perl.*?#\s*(.*)$/; 1208 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
974 1209
975 $ext{source} = 1210 $ext{source} =
976 "package $pkg; use strict; use utf8;\n" 1211 "package $pkg; use strict; use utf8;\n"
977 . "#line 1 \"$path\"\n{\n" 1212 . "#line 1 \"$path\"\n{\n"
978 . $source 1213 . $source
984 my %done; 1219 my %done;
985 while (%todo) { 1220 while (%todo) {
986 my $progress; 1221 my $progress;
987 1222
988 while (my ($k, $v) = each %todo) { 1223 while (my ($k, $v) = each %todo) {
989 for (split /,\s*/, $ext{meta}{depends}) { 1224 for (split /,\s*/, $v->{meta}{depends}) {
990 goto skip 1225 goto skip
991 unless exists $done{$_}; 1226 unless exists $done{$_};
992 } 1227 }
993 1228
994 warn "... loading '$k' into '$v->{pkg}'\n"; 1229 warn "... loading '$k' into '$v->{pkg}'\n";
995 1230
996 unless (eval $v->{source}) { 1231 unless (eval $v->{source}) {
997 my $msg = $@ ? "$v->{path}: $@\n" 1232 my $msg = $@ ? "$v->{path}: $@\n"
998 : "extension disabled.\n"; 1233 : "$v->{base}: extension inactive.\n";
999 1234
1000 if (exists $v->{meta}{mandatory}) { 1235 if (exists $v->{meta}{mandatory}) {
1001 warn $msg; 1236 warn $msg;
1002 warn "mandatory extension failed to load, exiting.\n"; 1237 warn "mandatory extension failed to load, exiting.\n";
1003 exit 1; 1238 exit 1;
1004 } 1239 }
1005 1240
1006 die $msg; 1241 warn $msg;
1007 } 1242 }
1008 1243
1009 $done{$k} = delete $todo{$k}; 1244 $done{$k} = delete $todo{$k};
1010 push @EXTS, $v->{pkg}; 1245 push @EXTS, $v->{pkg};
1246 $progress = 1;
1011 } 1247 }
1012 1248
1013 skip: 1249 skip:
1014 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1250 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1015 unless $progress; 1251 unless $progress;
1016 } 1252 }
1017 }; 1253 };
1018} 1254}
1019 1255
1020############################################################################# 1256#############################################################################
1257
1258=back
1021 1259
1022=head2 CORE EXTENSIONS 1260=head2 CORE EXTENSIONS
1023 1261
1024Functions and methods that extend core crossfire objects. 1262Functions and methods that extend core crossfire objects.
1025 1263
1075 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1313 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1076 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1314 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1077 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1315 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1078 aio_unlink +(playerdir $login) . "/$login.pl"; 1316 aio_unlink +(playerdir $login) . "/$login.pl";
1079 1317
1080 my $pl = load_pl path $login 1318 my $f = new_from_file cf::object::thawer path $login
1081 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;
1082 $cf::PLAYER{$login} = $pl 1326 $cf::PLAYER{$login} = $pl
1083 } 1327 }
1084 } 1328 }
1085} 1329}
1086 1330
1096 1340
1097 aio_mkdir playerdir $pl, 0770; 1341 aio_mkdir playerdir $pl, 0770;
1098 $pl->{last_save} = $cf::RUNTIME; 1342 $pl->{last_save} = $cf::RUNTIME;
1099 1343
1100 $pl->save_pl ($path); 1344 $pl->save_pl ($path);
1101 Coro::cede; 1345 cf::cede_to_tick;
1102} 1346}
1103 1347
1104sub new($) { 1348sub new($) {
1105 my ($login) = @_; 1349 my ($login) = @_;
1106 1350
1110 $self->{deny_save} = 1; 1354 $self->{deny_save} = 1;
1111 1355
1112 $cf::PLAYER{$login} = $self; 1356 $cf::PLAYER{$login} = $self;
1113 1357
1114 $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 (@_);
1115} 1369}
1116 1370
1117=item $pl->quit_character 1371=item $pl->quit_character
1118 1372
1119Nukes the player without looking back. If logged in, the connection will 1373Nukes the player without looking back. If logged in, the connection will
1174 or return []; 1428 or return [];
1175 1429
1176 my @logins; 1430 my @logins;
1177 1431
1178 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") {
1179 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1437 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1180 aio_read $fh, 0, 512, my $buf, 0 or next; 1438 aio_read $fh, 0, 512, my $buf, 0 or next;
1181 $buf !~ /^password -------------$/m or next; # official not-valid tag 1439 $buf !~ /^password -------------$/m or next; # official not-valid tag
1440 }
1182 1441
1183 utf8::decode $login; 1442 utf8::decode $login;
1184 push @logins, $login; 1443 push @logins, $login;
1185 } 1444 }
1186 1445
1213 } 1472 }
1214 1473
1215 \@paths 1474 \@paths
1216} 1475}
1217 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
1218=item $player->ext_reply ($msgid, %msg) 1528=item $player->ext_reply ($msgid, @msg)
1219 1529
1220Sends an ext reply to the player. 1530Sends an ext reply to the player.
1221 1531
1222=cut 1532=cut
1223 1533
1224sub ext_reply($$%) { 1534sub ext_reply($$@) {
1225 my ($self, $id, %msg) = @_; 1535 my ($self, $id, @msg) = @_;
1226 1536
1227 $msg{msgid} = $id; 1537 $self->ns->ext_reply ($id, @msg)
1228
1229 $self->send ("ext " . cf::to_json \%msg);
1230} 1538}
1231 1539
1232=item $player->ext_event ($type, %msg) 1540=item $player->ext_msg ($type, @msg)
1233 1541
1234Sends an ext event to the client. 1542Sends an ext event to the client.
1235 1543
1236=cut 1544=cut
1237 1545
1238sub ext_event($$%) { 1546sub ext_msg($$@) {
1239 my ($self, $type, %msg) = @_; 1547 my ($self, $type, @msg) = @_;
1240 1548
1241 $self->ns->ext_event ($type, %msg); 1549 $self->ns->ext_msg ($type, @msg);
1242} 1550}
1243 1551
1244=head3 cf::region 1552=head3 cf::region
1245 1553
1246=over 4 1554=over 4
1249 1557
1250package cf::region; 1558package cf::region;
1251 1559
1252=item cf::region::find_by_path $path 1560=item cf::region::find_by_path $path
1253 1561
1254Tries 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.
1255 1563
1256=cut 1564=cut
1257 1565
1258sub find_by_path($) { 1566sub find_by_path($) {
1259 my ($path) = @_; 1567 my ($path) = @_;
1260 1568
1261 my ($match, $specificity); 1569 my ($match, $specificity);
1262 1570
1263 for my $region (list) { 1571 for my $region (list) {
1264 if ($region->match && $path =~ $region->match) { 1572 if ($region->{match} && $path =~ $region->{match}) {
1265 ($match, $specificity) = ($region, $region->specificity) 1573 ($match, $specificity) = ($region, $region->specificity)
1266 if $region->specificity > $specificity; 1574 if $region->specificity > $specificity;
1267 } 1575 }
1268 } 1576 }
1269 1577
1389 $self->init; # pass $1 etc. 1697 $self->init; # pass $1 etc.
1390 return $self; 1698 return $self;
1391 } 1699 }
1392 } 1700 }
1393 1701
1394 Carp::carp "unable to resolve path '$path' (base '$base')."; 1702 Carp::cluck "unable to resolve path '$path' (base '$base').";
1395 () 1703 ()
1396} 1704}
1397 1705
1398sub init { 1706sub init {
1399 my ($self) = @_; 1707 my ($self) = @_;
1462 1770
1463sub load_header_from($) { 1771sub load_header_from($) {
1464 my ($self, $path) = @_; 1772 my ($self, $path) = @_;
1465 1773
1466 utf8::encode $path; 1774 utf8::encode $path;
1467 #aio_open $path, O_RDONLY, 0 1775 my $f = new_from_file cf::object::thawer $path
1468 # or return;
1469
1470 $self->_load_header ($path)
1471 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;
1472 1783
1473 $self->{load_path} = $path; 1784 $self->{load_path} = $path;
1474 1785
1475 1 1786 1
1476} 1787}
1565 local $self->{deny_reset} = 1; # loading can take a long time 1876 local $self->{deny_reset} = 1; # loading can take a long time
1566 1877
1567 my $path = $self->{path}; 1878 my $path = $self->{path};
1568 1879
1569 { 1880 {
1570 my $guard = cf::lock_acquire "map_load:$path"; 1881 my $guard = cf::lock_acquire "map_data:$path";
1571 1882
1883 return unless $self->valid;
1572 return if $self->in_memory != cf::MAP_SWAPPED; 1884 return if $self->in_memory != cf::MAP_SWAPPED;
1573 1885
1574 $self->in_memory (cf::MAP_LOADING); 1886 $self->in_memory (cf::MAP_LOADING);
1575 1887
1576 $self->alloc; 1888 $self->alloc;
1577 1889
1578 $self->pre_load; 1890 $self->pre_load;
1579 Coro::cede; 1891 cf::cede_to_tick;
1580 1892
1893 my $f = new_from_file cf::object::thawer $self->{load_path};
1894 $f->skip_block;
1581 $self->_load_objects ($self->{load_path}, 1) 1895 $self->_load_objects ($f)
1582 or return; 1896 or return;
1583 1897
1584 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1585 if delete $self->{load_original}; 1899 if delete $self->{load_original};
1586 1900
1587 if (my $uniq = $self->uniq_path) { 1901 if (my $uniq = $self->uniq_path) {
1588 utf8::encode $uniq; 1902 utf8::encode $uniq;
1589 if (aio_open $uniq, O_RDONLY, 0) { 1903 unless (aio_stat $uniq) {
1904 if (my $f = new_from_file cf::object::thawer $uniq) {
1590 $self->clear_unique_items; 1905 $self->clear_unique_items;
1591 $self->_load_objects ($uniq, 0); 1906 $self->_load_objects ($f);
1907 $f->resolve_delayed_derefs;
1908 }
1592 } 1909 }
1593 } 1910 }
1594 1911
1595 Coro::cede; 1912 $f->resolve_delayed_derefs;
1913
1914 cf::cede_to_tick;
1596 # now do the right thing for maps 1915 # now do the right thing for maps
1597 $self->link_multipart_objects; 1916 $self->link_multipart_objects;
1598 $self->difficulty ($self->estimate_difficulty) 1917 $self->difficulty ($self->estimate_difficulty)
1599 unless $self->difficulty; 1918 unless $self->difficulty;
1600 Coro::cede; 1919 cf::cede_to_tick;
1601 1920
1602 unless ($self->{deny_activate}) { 1921 unless ($self->{deny_activate}) {
1603 $self->decay_objects; 1922 $self->decay_objects;
1604 $self->fix_auto_apply; 1923 $self->fix_auto_apply;
1605 $self->update_buttons; 1924 $self->update_buttons;
1606 Coro::cede; 1925 cf::cede_to_tick;
1607 $self->set_darkness_map; 1926 $self->set_darkness_map;
1608 Coro::cede; 1927 cf::cede_to_tick;
1609 $self->activate; 1928 $self->activate;
1610 } 1929 }
1930
1931 $self->{last_save} = $cf::RUNTIME;
1932 $self->last_access ($cf::RUNTIME);
1611 1933
1612 $self->in_memory (cf::MAP_IN_MEMORY); 1934 $self->in_memory (cf::MAP_IN_MEMORY);
1613 } 1935 }
1614 1936
1615 $self->post_load; 1937 $self->post_load;
1626 1948
1627 $self 1949 $self
1628} 1950}
1629 1951
1630# 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
1631sub load_diag { 1953sub load_neighbours {
1632 my ($map) = @_; 1954 my ($map) = @_;
1633 1955
1634 my @diag; # diagonal neighbours 1956 my @neigh; # diagonal neighbours
1635 1957
1636 for (0 .. 3) { 1958 for (0 .. 3) {
1637 my $neigh = $map->tile_path ($_) 1959 my $neigh = $map->tile_path ($_)
1638 or next; 1960 or next;
1639 $neigh = find $neigh, $map 1961 $neigh = find $neigh, $map
1640 or next; 1962 or next;
1641 $neigh->load; 1963 $neigh->load;
1642 1964
1965 push @neigh,
1643 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1966 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1644 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1967 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1645 } 1968 }
1646 1969
1647 for (@diag) { 1970 for (grep defined $_->[0], @neigh) {
1971 my ($path, $origin) = @$_;
1648 my $neigh = find @$_ 1972 my $neigh = find $path, $origin
1649 or next; 1973 or next;
1650 $neigh->load; 1974 $neigh->load;
1651 } 1975 }
1652} 1976}
1653 1977
1658} 1982}
1659 1983
1660sub do_load_sync { 1984sub do_load_sync {
1661 my ($map) = @_; 1985 my ($map) = @_;
1662 1986
1987 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1988 if $Coro::current == $Coro::main;
1989
1663 cf::sync_job { $map->load }; 1990 cf::sync_job { $map->load };
1664} 1991}
1665 1992
1666our %MAP_PREFETCH; 1993our %MAP_PREFETCH;
1667our $MAP_PREFETCHER = undef; 1994our $MAP_PREFETCHER = undef;
1668 1995
1669sub find_async { 1996sub find_async {
1670 my ($path, $origin) = @_; 1997 my ($path, $origin, $load) = @_;
1671 1998
1672 $path = normalise $path, $origin && $origin->{path}; 1999 $path = normalise $path, $origin && $origin->{path};
1673 2000
1674 if (my $map = $cf::MAP{$path}) { 2001 if (my $map = $cf::MAP{$path}) {
1675 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2002 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1676 } 2003 }
1677 2004
1678 undef $MAP_PREFETCH{$path}; 2005 $MAP_PREFETCH{$path} |= $load;
2006
1679 $MAP_PREFETCHER ||= cf::async { 2007 $MAP_PREFETCHER ||= cf::async {
1680 while (%MAP_PREFETCH) { 2008 while (%MAP_PREFETCH) {
1681 for my $path (keys %MAP_PREFETCH) { 2009 while (my ($k, $v) = each %MAP_PREFETCH) {
1682 my $map = find $path 2010 if (my $map = find $k) {
1683 or next;
1684 $map->load; 2011 $map->load if $v;
2012 }
1685 2013
1686 delete $MAP_PREFETCH{$path}; 2014 delete $MAP_PREFETCH{$k};
1687 } 2015 }
1688 } 2016 }
1689 undef $MAP_PREFETCHER; 2017 undef $MAP_PREFETCHER;
1690 }; 2018 };
1691 $MAP_PREFETCHER->prio (6); 2019 $MAP_PREFETCHER->prio (6);
1694} 2022}
1695 2023
1696sub save { 2024sub save {
1697 my ($self) = @_; 2025 my ($self) = @_;
1698 2026
1699 my $lock = cf::lock_acquire "map_data:" . $self->path; 2027 my $lock = cf::lock_acquire "map_data:$self->{path}";
1700 2028
1701 $self->{last_save} = $cf::RUNTIME; 2029 $self->{last_save} = $cf::RUNTIME;
1702 2030
1703 return unless $self->dirty; 2031 return unless $self->dirty;
1704 2032
1727 my ($self) = @_; 2055 my ($self) = @_;
1728 2056
1729 # save first because save cedes 2057 # save first because save cedes
1730 $self->save; 2058 $self->save;
1731 2059
1732 my $lock = cf::lock_acquire "map_data:" . $self->path; 2060 my $lock = cf::lock_acquire "map_data:$self->{path}";
1733 2061
1734 return if $self->players; 2062 return if $self->players;
1735 return if $self->in_memory != cf::MAP_IN_MEMORY; 2063 return if $self->in_memory != cf::MAP_IN_MEMORY;
1736 return if $self->{deny_save}; 2064 return if $self->{deny_save};
1737 2065
1789my $nuke_counter = "aaaa"; 2117my $nuke_counter = "aaaa";
1790 2118
1791sub nuke { 2119sub nuke {
1792 my ($self) = @_; 2120 my ($self) = @_;
1793 2121
2122 {
2123 my $lock = cf::lock_acquire "map_data:$self->{path}";
2124
1794 delete $cf::MAP{$self->path}; 2125 delete $cf::MAP{$self->path};
1795 2126
1796 $self->unlink_save; 2127 $self->unlink_save;
1797 2128
1798 bless $self, "cf::map"; 2129 bless $self, "cf::map";
1799 delete $self->{deny_reset}; 2130 delete $self->{deny_reset};
1800 $self->{deny_save} = 1; 2131 $self->{deny_save} = 1;
1801 $self->reset_timeout (1); 2132 $self->reset_timeout (1);
1802 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2133 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1803 2134
1804 $cf::MAP{$self->path} = $self; 2135 $cf::MAP{$self->path} = $self;
2136 }
1805 2137
1806 $self->reset; # polite request, might not happen 2138 $self->reset; # polite request, might not happen
1807} 2139}
1808 2140
1809=item $maps = cf::map::tmp_maps 2141=item $maps = cf::map::tmp_maps
1885 2217
1886sub inv_recursive { 2218sub inv_recursive {
1887 inv_recursive_ inv $_[0] 2219 inv_recursive_ inv $_[0]
1888} 2220}
1889 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 }
2251}
2252
1890package cf; 2253package cf;
1891 2254
1892=back 2255=back
1893 2256
1894=head3 cf::object::player 2257=head3 cf::object::player
1911 2274
1912 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2275 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1913 2276
1914 if ($self->{record_replies}) { 2277 if ($self->{record_replies}) {
1915 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2278 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2279
1916 } 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 {
1917 $msg = $npc->name . " says: $msg" if $npc; 2288 $msg = $npc->name . " says: $msg" if $npc;
1918 $self->message ($msg, $flags); 2289 $self->message ($msg, $flags);
2290 }
1919 } 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 (@_);
1920} 2302}
1921 2303
1922=item $player_object->may ("access") 2304=item $player_object->may ("access")
1923 2305
1924Returns wether the given player is authorized to access resource "access" 2306Returns wether the given player is authorized to access resource "access"
2003 # use -1 or undef as default coordinates, not 0, 0 2385 # use -1 or undef as default coordinates, not 0, 0
2004 ($x, $y) = ($map->enter_x, $map->enter_y) 2386 ($x, $y) = ($map->enter_x, $map->enter_y)
2005 if $x <=0 && $y <= 0; 2387 if $x <=0 && $y <= 0;
2006 2388
2007 $map->load; 2389 $map->load;
2008 $map->load_diag; 2390 $map->load_neighbours;
2009 2391
2010 return unless $self->contr->active; 2392 return unless $self->contr->active;
2011 $self->activate_recursive; 2393 $self->activate_recursive;
2012 2394
2013 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2395 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2014 $self->enter_map ($map, $x, $y); 2396 $self->enter_map ($map, $x, $y);
2015} 2397}
2016 2398
2017=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2399=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2018 2400
2019Moves the player to the given map-path and coordinates by first freezing 2401Moves the player to the given map-path and coordinates by first freezing
2020her, loading and preparing them map, calling the provided $check callback 2402her, loading and preparing them map, calling the provided $check callback
2021that has to return the map if sucecssful, and then unfreezes the player on 2403that has to return the map if sucecssful, and then unfreezes the player on
2022the new (success) or old (failed) map position. 2404the new (success) or old (failed) map position. In either case, $done will
2405be called at the end of this process.
2023 2406
2024=cut 2407=cut
2025 2408
2026our $GOTOGEN; 2409our $GOTOGEN;
2027 2410
2028sub cf::object::player::goto { 2411sub cf::object::player::goto {
2029 my ($self, $path, $x, $y, $check) = @_; 2412 my ($self, $path, $x, $y, $check, $done) = @_;
2030 2413
2031 # do generation counting so two concurrent goto's will be executed in-order 2414 # do generation counting so two concurrent goto's will be executed in-order
2032 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2415 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2033 2416
2034 $self->enter_link; 2417 $self->enter_link;
2054 2437
2055 if ($gen == $self->{_goto_generation}) { 2438 if ($gen == $self->{_goto_generation}) {
2056 delete $self->{_goto_generation}; 2439 delete $self->{_goto_generation};
2057 $self->leave_link ($map, $x, $y); 2440 $self->leave_link ($map, $x, $y);
2058 } 2441 }
2442
2443 $done->() if $done;
2059 })->prio (1); 2444 })->prio (1);
2060} 2445}
2061 2446
2062=item $player_object->enter_exit ($exit_object) 2447=item $player_object->enter_exit ($exit_object)
2063 2448
2132 my $hp = $exit->stats->hp; 2517 my $hp = $exit->stats->hp;
2133 my $sp = $exit->stats->sp; 2518 my $sp = $exit->stats->sp;
2134 2519
2135 $self->enter_link; 2520 $self->enter_link;
2136 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
2137 (async { 2526 (async {
2138 $self->deactivate_recursive; # just to be sure 2527 $self->deactivate_recursive; # just to be sure
2139 unless (eval { 2528 unless (eval {
2140 $self->goto ($slaying, $hp, $sp); 2529 $self->goto ($slaying, $hp, $sp);
2141 2530
2168 2557
2169 utf8::encode $text; 2558 utf8::encode $text;
2170 $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);
2171} 2560}
2172 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
2173=item $client->ext_event ($type, %msg) 2643=item $client->ext_msg ($type, @msg)
2174 2644
2175Sends an exti event to the client. 2645Sends an ext event to the client.
2176 2646
2177=cut 2647=cut
2178 2648
2179sub cf::client::ext_event($$%) { 2649sub cf::client::ext_msg($$@) {
2180 my ($self, $type, %msg) = @_; 2650 my ($self, $type, @msg) = @_;
2181 2651
2652 if ($self->extcmd == 2) {
2653 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2654 } elsif ($self->extcmd == 1) { # TODO: remove
2182 $msg{msgtype} = "event_$type"; 2655 push @msg, msgtype => "event_$type";
2183 $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 }
2184} 2676}
2185 2677
2186=item $success = $client->query ($flags, "text", \&cb) 2678=item $success = $client->query ($flags, "text", \&cb)
2187 2679
2188Queues a query to the client, calling the given callback with 2680Queues a query to the client, calling the given callback with
2189the 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>,
2190C<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>.
2191 2683
2192Queries 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
2193reliable at some point in the future. 2685become reliable at some point in the future.
2194 2686
2195=cut 2687=cut
2196 2688
2197sub cf::client::query { 2689sub cf::client::query {
2198 my ($self, $flags, $text, $cb) = @_; 2690 my ($self, $flags, $text, $cb) = @_;
2206 utf8::encode $text; 2698 utf8::encode $text;
2207 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2699 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2208 2700
2209 $self->send_packet ($self->{query_queue}[0][0]) 2701 $self->send_packet ($self->{query_queue}[0][0])
2210 if @{ $self->{query_queue} } == 1; 2702 if @{ $self->{query_queue} } == 1;
2703
2704 1
2211} 2705}
2212 2706
2213cf::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 },
2214 on_reply => sub { 2713 on_reply => sub {
2215 my ($ns, $msg) = @_; 2714 my ($ns, $msg) = @_;
2216 2715
2217 # this weird shuffling is so that direct followup queries 2716 # this weird shuffling is so that direct followup queries
2218 # get handled first 2717 # get handled first
2230 } else { 2729 } else {
2231 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2730 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2232 } 2731 }
2233 } 2732 }
2234 }, 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 },
2235); 2760);
2236 2761
2237=item $client->async (\&cb) 2762=item $client->async (\&cb)
2238 2763
2239Create a new coroutine, running the specified callback. The coroutine will 2764Create a new coroutine, running the specified callback. The coroutine will
2280our $safe = new Safe "safe"; 2805our $safe = new Safe "safe";
2281our $safe_hole = new Safe::Hole; 2806our $safe_hole = new Safe::Hole;
2282 2807
2283$SIG{FPE} = 'IGNORE'; 2808$SIG{FPE} = 'IGNORE';
2284 2809
2285$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));
2286 2815
2287# here we export the classes and methods available to script code 2816# here we export the classes and methods available to script code
2288 2817
2289=pod 2818=pod
2290 2819
2291The following functions and methods are available within a safe environment: 2820The following functions and methods are available within a safe environment:
2292 2821
2293 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
2294 cf::object::player player 2826 cf::object::player
2295 cf::player peaceful 2827 player
2296 cf::map trigger 2828
2829 cf::player
2830 peaceful
2831
2832 cf::map
2833 trigger
2297 2834
2298=cut 2835=cut
2299 2836
2300for ( 2837for (
2301 ["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)],
2302 ["cf::object::player" => qw(player)], 2841 ["cf::object::player" => qw(player)],
2303 ["cf::player" => qw(peaceful)], 2842 ["cf::player" => qw(peaceful)],
2304 ["cf::map" => qw(trigger)], 2843 ["cf::map" => qw(trigger)],
2305) { 2844) {
2306 no strict 'refs'; 2845 no strict 'refs';
2377=back 2916=back
2378 2917
2379=cut 2918=cut
2380 2919
2381############################################################################# 2920#############################################################################
2382
2383=head2 EXTENSION DATABASE SUPPORT
2384
2385Crossfire maintains a very simple database for extension use. It can
2386currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2387convert to/from binary).
2388
2389The parameter C<$family> should best start with the name of the extension
2390using it, it should be unique.
2391
2392=over 4
2393
2394=item $value = cf::db_get $family => $key
2395
2396Returns a single value from the database.
2397
2398=item cf::db_put $family => $key => $value
2399
2400Stores the given C<$value> in the family.
2401
2402=cut
2403
2404our $DB;
2405
2406sub db_init {
2407 unless ($DB) {
2408 $DB = BDB::db_create $DB_ENV;
2409
2410 cf::sync_job {
2411 eval {
2412 $DB->set_flags (BDB::CHKSUM);
2413
2414 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2415 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2416 cf::cleanup "db_open(db): $!" if $!;
2417 };
2418 cf::cleanup "db_open(db): $@" if $@;
2419 };
2420 }
2421}
2422
2423sub db_get($$) {
2424 my $key = "$_[0]/$_[1]";
2425
2426 cf::sync_job {
2427 BDB::db_get $DB, undef, $key, my $data;
2428
2429 $! ? ()
2430 : $data
2431 }
2432}
2433
2434sub db_put($$$) {
2435 BDB::dbreq_pri 4;
2436 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2437}
2438
2439=item cf::cache $id => [$paths...], $processversion => $process
2440
2441Generic caching function that returns the value of the resource $id,
2442caching and regenerating as required.
2443
2444This function can block.
2445
2446=cut
2447
2448sub cache {
2449 my ($id, $src, $processversion, $process) = @_;
2450
2451 my $meta =
2452 join "\x00",
2453 $processversion,
2454 map {
2455 aio_stat $_
2456 and Carp::croak "$_: $!";
2457
2458 ($_, (stat _)[7,9])
2459 } @$src;
2460
2461 my $dbmeta = db_get cache => "$id/meta";
2462 if ($dbmeta ne $meta) {
2463 # changed, we may need to process
2464
2465 my @data;
2466 my $md5;
2467
2468 for (0 .. $#$src) {
2469 0 <= aio_load $src->[$_], $data[$_]
2470 or Carp::croak "$src->[$_]: $!";
2471 }
2472
2473 # if processing is expensive, check
2474 # checksum first
2475 if (1) {
2476 $md5 =
2477 join "\x00",
2478 $processversion,
2479 map {
2480 Coro::cede;
2481 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2482 } 0.. $#$src;
2483
2484
2485 my $dbmd5 = db_get cache => "$id/md5";
2486 if ($dbmd5 eq $md5) {
2487 db_put cache => "$id/meta", $meta;
2488
2489 return db_get cache => "$id/data";
2490 }
2491 }
2492
2493 my $t1 = Time::HiRes::time;
2494 my $data = $process->(\@data);
2495 my $t2 = Time::HiRes::time;
2496
2497 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2498
2499 db_put cache => "$id/data", $data;
2500 db_put cache => "$id/md5" , $md5;
2501 db_put cache => "$id/meta", $meta;
2502
2503 return $data;
2504 }
2505
2506 db_get cache => "$id/data"
2507}
2508
2509=item fork_call { }, $args
2510
2511Executes the given code block with the given arguments in a seperate
2512process, returning the results. Everything must be serialisable with
2513Coro::Storable. May, of course, block. Note that the executed sub may
2514never block itself or use any form of Event handling.
2515
2516=cut
2517
2518sub fork_call(&@) {
2519 my ($cb, @args) = @_;
2520
2521# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2522# or die "socketpair: $!";
2523 pipe my $fh1, my $fh2
2524 or die "pipe: $!";
2525
2526 if (my $pid = fork) {
2527 close $fh2;
2528
2529 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2530 $res = Coro::Storable::thaw $res;
2531
2532 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2533
2534 die $$res unless "ARRAY" eq ref $res;
2535
2536 return wantarray ? @$res : $res->[-1];
2537 } else {
2538 reset_signals;
2539 local $SIG{__WARN__};
2540 local $SIG{__DIE__};
2541 eval {
2542 close $fh1;
2543
2544 my @res = eval { $cb->(@args) };
2545 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2546 };
2547
2548 warn $@ if $@;
2549 _exit 0;
2550 }
2551}
2552
2553#############################################################################
2554# the server's init and main functions 2921# the server's init and main functions
2555 2922
2556sub load_facedata($) { 2923sub load_facedata($) {
2557 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;
2558 2931
2559 warn "loading facedata from $path\n"; 2932 warn "loading facedata from $path\n";
2560 2933
2561 my $facedata; 2934 my $facedata;
2562 0 < aio_load $path, $facedata 2935 0 < aio_load $path, $facedata
2565 $facedata = Coro::Storable::thaw $facedata; 2938 $facedata = Coro::Storable::thaw $facedata;
2566 2939
2567 $facedata->{version} == 2 2940 $facedata->{version} == 2
2568 or cf::cleanup "$path: version mismatch, cannot proceed."; 2941 or cf::cleanup "$path: version mismatch, cannot proceed.";
2569 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
2570 { 2950 {
2571 my $faces = $facedata->{faceinfo}; 2951 my $faces = $facedata->{faceinfo};
2572 2952
2573 while (my ($face, $info) = each %$faces) { 2953 while (my ($face, $info) = each %$faces) {
2574 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2954 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2575 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2955 cf::face::set_visibility $idx, $info->{visibility};
2956 cf::face::set_magicmap $idx, $info->{magicmap};
2576 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2957 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2577 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2958 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2578 Coro::cede; 2959
2960 cf::cede_to_tick;
2579 } 2961 }
2580 2962
2581 while (my ($face, $info) = each %$faces) { 2963 while (my ($face, $info) = each %$faces) {
2582 next unless $info->{smooth}; 2964 next unless $info->{smooth};
2583 my $idx = cf::face::find $face 2965 my $idx = cf::face::find $face
2584 or next; 2966 or next;
2585 if (my $smooth = cf::face::find $info->{smooth}) { 2967 if (my $smooth = cf::face::find $info->{smooth}) {
2968 cf::face::set_smooth $idx, $smooth;
2586 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2969 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2587 } else { 2970 } else {
2588 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2971 warn "smooth face '$info->{smooth}' not found for face '$face'";
2589 } 2972 }
2590 Coro::cede; 2973
2974 cf::cede_to_tick;
2591 } 2975 }
2592 } 2976 }
2593 2977
2594 { 2978 {
2595 my $anims = $facedata->{animinfo}; 2979 my $anims = $facedata->{animinfo};
2596 2980
2597 while (my ($anim, $info) = each %$anims) { 2981 while (my ($anim, $info) = each %$anims) {
2598 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2982 cf::anim::set $anim, $info->{frames}, $info->{facings};
2599 Coro::cede; 2983 cf::cede_to_tick;
2600 } 2984 }
2601 2985
2602 cf::anim::invalidate_all; # d'oh 2986 cf::anim::invalidate_all; # d'oh
2603 } 2987 }
2604 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
2605 1 3038 1
2606} 3039}
2607 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
2608sub 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
2609 load_resource_file "$MAPDIR/regions" 3054 load_resource_file "$MAPDIR/regions"
2610 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 }
2611} 3061}
2612 3062
2613sub reload_facedata { 3063sub reload_facedata {
2614 load_facedata "$DATADIR/facedata" 3064 load_facedata "$DATADIR/facedata"
2615 or die "unable to load facedata\n"; 3065 or die "unable to load facedata\n";
2616} 3066}
2617 3067
2618sub reload_archetypes { 3068sub reload_archetypes {
3069 load_resource_file "$DATADIR/archetypes"
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)
2619 load_resource_file "$DATADIR/archetypes" 3074 load_resource_file "$DATADIR/archetypes"
2620 or die "unable to load archetypes\n"; 3075 or die "unable to load archetypes\n";
2621} 3076}
2622 3077
2623sub reload_treasures { 3078sub reload_treasures {
2639 3094
2640sub init { 3095sub init {
2641 reload_resources; 3096 reload_resources;
2642} 3097}
2643 3098
2644sub cfg_load { 3099sub reload_config {
2645 open my $fh, "<:utf8", "$CONFDIR/config" 3100 open my $fh, "<:utf8", "$CONFDIR/config"
2646 or return; 3101 or return;
2647 3102
2648 local $/; 3103 local $/;
2649 *CFG = YAML::Syck::Load <$fh>; 3104 *CFG = YAML::Syck::Load <$fh>;
2669 (async { 3124 (async {
2670 Event::one_event; 3125 Event::one_event;
2671 })->prio (Coro::PRIO_MAX); 3126 })->prio (Coro::PRIO_MAX);
2672 }; 3127 };
2673 3128
2674 cfg_load; 3129 reload_config;
2675 db_init; 3130 db_init;
2676 load_extensions; 3131 load_extensions;
2677 3132
2678 $TICK_WATCHER->start; 3133 $TICK_WATCHER->start;
2679 Event::loop; 3134 Event::loop;
2695 }, 3150 },
2696 ); 3151 );
2697 } 3152 }
2698} 3153}
2699 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
2700sub emergency_save() { 3193sub emergency_save() {
2701 my $freeze_guard = cf::freeze_mainloop; 3194 my $freeze_guard = cf::freeze_mainloop;
2702 3195
2703 warn "enter emergency perl save\n"; 3196 warn "enter emergency perl save\n";
2704 3197
2779 %EXT_CORO = (); 3272 %EXT_CORO = ();
2780 3273
2781 warn "removing commands"; 3274 warn "removing commands";
2782 %COMMAND = (); 3275 %COMMAND = ();
2783 3276
2784 warn "removing ext commands"; 3277 warn "removing ext/exti commands";
2785 %EXTCMD = (); 3278 %EXTCMD = ();
3279 %EXTICMD = ();
2786 3280
2787 warn "unloading/nuking all extensions"; 3281 warn "unloading/nuking all extensions";
2788 for my $pkg (@EXTS) { 3282 for my $pkg (@EXTS) {
2789 warn "... unloading $pkg"; 3283 warn "... unloading $pkg";
2790 3284
2833 warn "reloading cf.pm"; 3327 warn "reloading cf.pm";
2834 require cf; 3328 require cf;
2835 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3329 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2836 3330
2837 warn "loading config and database again"; 3331 warn "loading config and database again";
2838 cf::cfg_load; 3332 cf::reload_config;
2839 3333
2840 warn "loading extensions"; 3334 warn "loading extensions";
2841 cf::load_extensions; 3335 cf::load_extensions;
2842 3336
2843 warn "reattaching attachments to objects/players"; 3337 warn "reattaching attachments to objects/players";
2936 or die; 3430 or die;
2937 3431
2938 $map->width (50); 3432 $map->width (50);
2939 $map->height (50); 3433 $map->height (50);
2940 $map->alloc; 3434 $map->alloc;
2941 $map->_load_objects ("/tmp/x.map", 1); 3435 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
2942 my $t = Event::time - $t; 3436 my $t = Event::time - $t;
2943 3437
2944 #next unless $t < 0.0013;#d# 3438 #next unless $t < 0.0013;#d#
2945 if ($t < $min) { 3439 if ($t < $min) {
2946 $min = $t; 3440 $min = $t;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines