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.325 by root, Sat Jul 28 14:32:22 2007 UTC

20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24 24
25use JSON::XS 1.4 ();
25use BDB (); 26use BDB ();
26use Data::Dumper; 27use Data::Dumper;
27use Digest::MD5; 28use Digest::MD5;
28use Fcntl; 29use Fcntl;
29use YAML::Syck (); 30use YAML::Syck ();
30use IO::AIO 2.32 (); 31use IO::AIO 2.32 ();
31use Time::HiRes; 32use Time::HiRes;
32use Compress::LZF; 33use Compress::LZF;
34use Digest::MD5 ();
33 35
34# configure various modules to our taste 36# configure various modules to our taste
35# 37#
36$Storable::canonical = 1; # reduce rsync transfers 38$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 39Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
49our %COMMAND = (); 51our %COMMAND = ();
50our %COMMAND_TIME = (); 52our %COMMAND_TIME = ();
51 53
52our @EXTS = (); # list of extension package names 54our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 55our %EXTCMD = ();
56our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 57our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 58our %EXT_MAP = (); # pluggable maps
56 59
57our $RELOAD; # number of reloads so far 60our $RELOAD; # number of reloads so far
58our @EVENT; 61our @EVENT;
164 167
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 168These 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 169returns 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. 170per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168 171
172=item @cf::INVOKE_RESULTS
173
174This array contains the results of the last C<invoke ()> call. When
175C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
176that call.
177
169=back 178=back
170 179
171=cut 180=cut
172 181
173BEGIN { 182BEGIN {
206} 215}
207 216
208$Event::DIED = sub { 217$Event::DIED = sub {
209 warn "error in event callback: @_"; 218 warn "error in event callback: @_";
210}; 219};
220
221#############################################################################
211 222
212=head2 UTILITY FUNCTIONS 223=head2 UTILITY FUNCTIONS
213 224
214=over 4 225=over 4
215 226
234 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 245 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
235 $d 246 $d
236 } || "[unable to dump $_[0]: '$@']"; 247 } || "[unable to dump $_[0]: '$@']";
237} 248}
238 249
239use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
240
241=item $ref = cf::from_json $json 250=item $ref = cf::from_json $json
242 251
243Converts a JSON string into the corresponding perl data structure. 252Converts a JSON string into the corresponding perl data structure.
244 253
245=item $json = cf::to_json $ref 254=item $json = cf::to_json $ref
246 255
247Converts a perl data structure into its JSON representation. 256Converts a perl data structure into its JSON representation.
257
258=cut
259
260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261
262sub to_json ($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) }
248 264
249=item cf::lock_wait $string 265=item cf::lock_wait $string
250 266
251Wait until the given lock is available. See cf::lock_acquire. 267Wait until the given lock is available. See cf::lock_acquire.
252 268
306 }; 322 };
307 $TICK_WATCHER->stop; 323 $TICK_WATCHER->stop;
308 $guard 324 $guard
309} 325}
310 326
327=item cf::get_slot $time[, $priority[, $name]]
328
329Allocate $time seconds of blocking CPU time at priority C<$priority>:
330This call blocks and returns only when you have at least C<$time> seconds
331of cpu time till the next tick. The slot is only valid till the next cede.
332
333The optional C<$name> can be used to identify the job to run. It might be
334used for statistical purposes and should identify the same time-class.
335
336Useful for short background jobs.
337
338=cut
339
340our @SLOT_QUEUE;
341our $SLOT_QUEUE;
342
343$SLOT_QUEUE->cancel if $SLOT_QUEUE;
344$SLOT_QUEUE = Coro::async {
345 my $signal = new Coro::Signal;
346
347 while () {
348 next_job:
349 my $avail = cf::till_tick;
350 if ($avail > 0.01) {
351 for (0 .. $#SLOT_QUEUE) {
352 if ($SLOT_QUEUE[$_][0] < $avail) {
353 my $job = splice @SLOT_QUEUE, $_, 1, ();
354 $job->[2]->send;
355 Coro::cede;
356 goto next_job;
357 }
358 }
359 }
360
361 if (@SLOT_QUEUE) {
362 # we do not use wait_For_tick() as it returns immediately when tick is inactive
363 push @cf::WAIT_FOR_TICK, $signal;
364 $signal->wait;
365 } else {
366 Coro::schedule;
367 }
368 }
369};
370
371sub get_slot($;$$) {
372 my ($time, $pri, $name) = @_;
373
374 $time = $TICK * .6 if $time > $TICK * .6;
375 my $sig = new Coro::Signal;
376
377 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
378 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
379 $SLOT_QUEUE->ready;
380 $sig->wait;
381}
382
311=item cf::async { BLOCK } 383=item cf::async { BLOCK }
312 384
313Currently the same as Coro::async_pool, meaning you cannot use 385Currently the same as Coro::async_pool, meaning you cannot use
314C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 386C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
315thing you are allowed to do is call C<prio> on it. 387thing you are allowed to do is call C<prio> on it.
318 390
319BEGIN { *async = \&Coro::async_pool } 391BEGIN { *async = \&Coro::async_pool }
320 392
321=item cf::sync_job { BLOCK } 393=item cf::sync_job { BLOCK }
322 394
323The design of crossfire+ requires that the main coro ($Coro::main) is 395The design of Crossfire TRT requires that the main coroutine ($Coro::main)
324always able to handle events or runnable, as crossfire+ is only partly 396is 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. 397partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
398acceptable.
326 399
327If it must be done, put the blocking parts into C<sync_job>. This will run 400If 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 401the given BLOCK in another coroutine while waiting for the result. The
329server will be frozen during this time, so the block should either finish 402server will be frozen during this time, so the block should either finish
330fast or be very important. 403fast or be very important.
390 $EXT_CORO{$coro+0} = $coro; 463 $EXT_CORO{$coro+0} = $coro;
391 464
392 $coro 465 $coro
393} 466}
394 467
395sub write_runtime { 468=item fork_call { }, $args
396 my $runtime = "$LOCALDIR/runtime";
397 469
398 # first touch the runtime file to show we are still running: 470Executes the given code block with the given arguments in a seperate
399 # the fsync below can take a very very long time. 471process, returning the results. Everything must be serialisable with
472Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling.
400 474
401 IO::AIO::aio_utime $runtime, undef, undef; 475=cut
402 476
403 my $guard = cf::lock_acquire "write_runtime"; 477sub _store_scalar {
404 478 open my $fh, ">", \my $buf
405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 479 or die "fork_call: cannot open fh-to-buf in child : $!";
406 or return; 480 Storable::store_fd $_[0], $fh;
407
408 my $value = $cf::RUNTIME + 90 + 10;
409 # 10 is the runtime save interval, for a monotonic clock
410 # 60 allows for the watchdog to kill the server.
411
412 (aio_write $fh, 0, (length $value), $value, 0) <= 0
413 and return;
414
415 # always fsync - this file is important
416 aio_fsync $fh
417 and return;
418
419 # touch it again to show we are up-to-date
420 aio_utime $fh, undef, undef;
421
422 close $fh 481 close $fh;
423 or return;
424 482
425 aio_rename "$runtime~", $runtime 483 $buf
426 and return; 484}
427 485
428 warn "runtime file written.\n"; 486sub fork_call(&@) {
487 my ($cb, @args) = @_;
429 488
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
490# or die "socketpair: $!";
491 pipe my $fh1, my $fh2
492 or die "pipe: $!";
493
494 if (my $pid = fork) {
495 close $fh2;
496
497 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498 warn "pst<$res>" unless $res =~ /^pst/;
499 $res = Coro::Storable::thaw $res;
500
501 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
502
503 Carp::confess $$res unless "ARRAY" eq ref $res;
504
505 return wantarray ? @$res : $res->[-1];
506 } else {
507 reset_signals;
508 local $SIG{__WARN__};
509 local $SIG{__DIE__};
510 # just in case, this hack effectively disables event
511 # in the child. cleaner and slower would be canceling all watchers,
512 # but this works for the time being.
513 local $Coro::idle;
514 $Coro::current->prio (Coro::PRIO_MAX);
515
516 eval {
517 close $fh1;
518
519 my @res = eval { $cb->(@args) };
520
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
522 close $fh2;
523 };
524
525 warn $@ if $@;
526 _exit 0;
430 1 527 }
528}
529
530=item $value = cf::db_get $family => $key
531
532Returns a single value from the environment database.
533
534=item cf::db_put $family => $key => $value
535
536Stores the given C<$value> in the family. It can currently store binary
537data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
538
539=cut
540
541our $DB;
542
543sub db_init {
544 unless ($DB) {
545 $DB = BDB::db_create $DB_ENV;
546
547 cf::sync_job {
548 eval {
549 $DB->set_flags (BDB::CHKSUM);
550
551 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
552 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
553 cf::cleanup "db_open(db): $!" if $!;
554 };
555 cf::cleanup "db_open(db): $@" if $@;
556 };
557 }
558}
559
560sub db_get($$) {
561 my $key = "$_[0]/$_[1]";
562
563 cf::sync_job {
564 BDB::db_get $DB, undef, $key, my $data;
565
566 $! ? ()
567 : $data
568 }
569}
570
571sub db_put($$$) {
572 BDB::dbreq_pri 4;
573 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
574}
575
576=item cf::cache $id => [$paths...], $processversion => $process
577
578Generic caching function that returns the value of the resource $id,
579caching and regenerating as required.
580
581This function can block.
582
583=cut
584
585sub cache {
586 my ($id, $src, $processversion, $process) = @_;
587
588 my $meta =
589 join "\x00",
590 $processversion,
591 map {
592 aio_stat $_
593 and Carp::croak "$_: $!";
594
595 ($_, (stat _)[7,9])
596 } @$src;
597
598 my $dbmeta = db_get cache => "$id/meta";
599 if ($dbmeta ne $meta) {
600 # changed, we may need to process
601
602 my @data;
603 my $md5;
604
605 for (0 .. $#$src) {
606 0 <= aio_load $src->[$_], $data[$_]
607 or Carp::croak "$src->[$_]: $!";
608 }
609
610 # if processing is expensive, check
611 # checksum first
612 if (1) {
613 $md5 =
614 join "\x00",
615 $processversion,
616 map {
617 Coro::cede;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src;
620
621
622 my $dbmd5 = db_get cache => "$id/md5";
623 if ($dbmd5 eq $md5) {
624 db_put cache => "$id/meta", $meta;
625
626 return db_get cache => "$id/data";
627 }
628 }
629
630 my $t1 = Time::HiRes::time;
631 my $data = $process->(\@data);
632 my $t2 = Time::HiRes::time;
633
634 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
635
636 db_put cache => "$id/data", $data;
637 db_put cache => "$id/md5" , $md5;
638 db_put cache => "$id/meta", $meta;
639
640 return $data;
641 }
642
643 db_get cache => "$id/data"
431} 644}
432 645
433=item cf::datalog type => key => value, ... 646=item cf::datalog type => key => value, ...
434 647
435Log a datalog packet of the given type with the given key-value pairs. 648Log 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") 666attach callbacks/event handlers (a collection of which is called an "attachment")
454to it. All such attachable objects support the following methods. 667to it. All such attachable objects support the following methods.
455 668
456In the following description, CLASS can be any of C<global>, C<object> 669In 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 670C<player>, C<client> or C<map> (i.e. the attachable objects in
458crossfire+). 671Crossfire TRT).
459 672
460=over 4 673=over 4
461 674
462=item $attachable->attach ($attachment, key => $value...) 675=item $attachable->attach ($attachment, key => $value...)
463 676
665 _attach $registry, $klass, @attach; 878 _attach $registry, $klass, @attach;
666 } 879 }
667 880
668 $obj->{$name} = \%arg; 881 $obj->{$name} = \%arg;
669 } else { 882 } else {
670 warn "object uses attachment '$name' that is not available, postponing.\n"; 883 warn "object uses attachment '$name' which is not available, postponing.\n";
671 } 884 }
672 885
673 $obj->{_attachment}{$name} = undef; 886 $obj->{_attachment}{$name} = undef;
674} 887}
675 888
715 "; 928 ";
716 die if $@; 929 die if $@;
717} 930}
718 931
719our $override; 932our $override;
720our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 933our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
721 934
722sub override { 935sub override {
723 $override = 1; 936 $override = 1;
724 @invoke_results = (); 937 @INVOKE_RESULTS = (@_);
725} 938}
726 939
727sub do_invoke { 940sub do_invoke {
728 my $event = shift; 941 my $event = shift;
729 my $callbacks = shift; 942 my $callbacks = shift;
730 943
731 @invoke_results = (); 944 @INVOKE_RESULTS = ();
732 945
733 local $override; 946 local $override;
734 947
735 for (@$callbacks) { 948 for (@$callbacks) {
736 eval { &{$_->[1]} }; 949 eval { &{$_->[1]} };
753 966
754Generate an object-specific event with the given arguments. 967Generate an object-specific event with the given arguments.
755 968
756This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 969This 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 970removed in future versions), and there is no public API to access override
758results (if you must, access C<@cf::invoke_results> directly). 971results (if you must, access C<@cf::INVOKE_RESULTS> directly).
759 972
760=back 973=back
761 974
762=cut 975=cut
763 976
764############################################################################# 977#############################################################################
765# object support 978# object support
979#
980
981sub _can_merge {
982 my ($ob1, $ob2) = @_;
983
984 local $Storable::canonical = 1;
985 my $fob1 = Storable::freeze $ob1;
986 my $fob2 = Storable::freeze $ob2;
987
988 $fob1 eq $fob2
989}
766 990
767sub reattach { 991sub reattach {
768 # basically do the same as instantiate, without calling instantiate 992 # basically do the same as instantiate, without calling instantiate
769 my ($obj) = @_; 993 my ($obj) = @_;
770 994
877 warn sprintf "loading %s (%d)\n", 1101 warn sprintf "loading %s (%d)\n",
878 $filename, length $data, scalar @{$av || []}; 1102 $filename, length $data, scalar @{$av || []};
879 return ($data, $av); 1103 return ($data, $av);
880} 1104}
881 1105
1106=head2 COMMAND CALLBACKS
1107
1108=over 4
1109
1110=cut
1111
882############################################################################# 1112#############################################################################
883# command handling &c 1113# command handling &c
884 1114
885=item cf::register_command $name => \&callback($ob,$args); 1115=item cf::register_command $name => \&callback($ob,$args);
886 1116
898 push @{ $COMMAND{$name} }, [$caller, $cb]; 1128 push @{ $COMMAND{$name} }, [$caller, $cb];
899} 1129}
900 1130
901=item cf::register_extcmd $name => \&callback($pl,$packet); 1131=item cf::register_extcmd $name => \&callback($pl,$packet);
902 1132
903Register a callbackf ro execution when the client sends an extcmd packet. 1133Register a callback for execution when the client sends an (synchronous)
1134extcmd packet. Ext commands will be processed in the order they are
1135received by the server, like other user commands. The first argument is
1136the logged-in player. Ext commands can only be processed after a player
1137has logged in successfully.
904 1138
905If the callback returns something, it is sent back as if reply was being 1139If the callback returns something, it is sent back as if reply was being
906called. 1140called.
907 1141
1142=item cf::register_exticmd $name => \&callback($ns,$packet);
1143
1144Register a callback for execution when the client sends an (asynchronous)
1145exticmd packet. Exti commands are processed by the server as soon as they
1146are received, i.e. out of order w.r.t. other commands. The first argument
1147is a client socket. Exti commands can be received anytime, even before
1148log-in.
1149
1150If the callback returns something, it is sent back as if reply was being
1151called.
1152
908=cut 1153=cut
909 1154
910sub register_extcmd { 1155sub register_extcmd {
911 my ($name, $cb) = @_; 1156 my ($name, $cb) = @_;
912 1157
913 $EXTCMD{$name} = $cb; 1158 $EXTCMD{$name} = $cb;
1159}
1160
1161sub register_exticmd {
1162 my ($name, $cb) = @_;
1163
1164 $EXTICMD{$name} = $cb;
914} 1165}
915 1166
916cf::player->attach ( 1167cf::player->attach (
917 on_command => sub { 1168 on_command => sub {
918 my ($pl, $name, $params) = @_; 1169 my ($pl, $name, $params) = @_;
927 cf::override; 1178 cf::override;
928 }, 1179 },
929 on_extcmd => sub { 1180 on_extcmd => sub {
930 my ($pl, $buf) = @_; 1181 my ($pl, $buf) = @_;
931 1182
932 my $msg = eval { from_json $buf }; 1183 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
933 1184
934 if (ref $msg) { 1185 if (ref $msg) {
1186 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg
1188 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190
935 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1191 if (my $cb = $EXTCMD{$type}) {
936 if (my %reply = $cb->($pl, $msg)) { 1192 my @reply = $cb->($pl, @payload);
1193
937 $pl->ext_reply ($msg->{msgid}, %reply); 1194 $pl->ext_reply ($reply, @reply)
938 } 1195 if $reply;
939 } 1196 }
940 } else { 1197 } else {
941 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
942 } 1199 }
943 1200
967 path => $path, 1224 path => $path,
968 base => $base, 1225 base => $base,
969 pkg => $pkg, 1226 pkg => $pkg,
970 ); 1227 );
971 1228
972 $ext{meta} = { map { split /=/, $_, 2 } split /\s+/, $1 } 1229 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
973 if $source =~ /^#!.*?perl.*?#\s*(.*)$/; 1230 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
974 1231
975 $ext{source} = 1232 $ext{source} =
976 "package $pkg; use strict; use utf8;\n" 1233 "package $pkg; use strict; use utf8;\n"
977 . "#line 1 \"$path\"\n{\n" 1234 . "#line 1 \"$path\"\n{\n"
978 . $source 1235 . $source
984 my %done; 1241 my %done;
985 while (%todo) { 1242 while (%todo) {
986 my $progress; 1243 my $progress;
987 1244
988 while (my ($k, $v) = each %todo) { 1245 while (my ($k, $v) = each %todo) {
989 for (split /,\s*/, $ext{meta}{depends}) { 1246 for (split /,\s*/, $v->{meta}{depends}) {
990 goto skip 1247 goto skip
991 unless exists $done{$_}; 1248 unless exists $done{$_};
992 } 1249 }
993 1250
994 warn "... loading '$k' into '$v->{pkg}'\n"; 1251 warn "... loading '$k' into '$v->{pkg}'\n";
995 1252
996 unless (eval $v->{source}) { 1253 unless (eval $v->{source}) {
997 my $msg = $@ ? "$v->{path}: $@\n" 1254 my $msg = $@ ? "$v->{path}: $@\n"
998 : "extension disabled.\n"; 1255 : "$v->{base}: extension inactive.\n";
999 1256
1000 if (exists $v->{meta}{mandatory}) { 1257 if (exists $v->{meta}{mandatory}) {
1001 warn $msg; 1258 warn $msg;
1002 warn "mandatory extension failed to load, exiting.\n"; 1259 warn "mandatory extension failed to load, exiting.\n";
1003 exit 1; 1260 exit 1;
1004 } 1261 }
1005 1262
1006 die $msg; 1263 warn $msg;
1007 } 1264 }
1008 1265
1009 $done{$k} = delete $todo{$k}; 1266 $done{$k} = delete $todo{$k};
1010 push @EXTS, $v->{pkg}; 1267 push @EXTS, $v->{pkg};
1268 $progress = 1;
1011 } 1269 }
1012 1270
1013 skip: 1271 skip:
1014 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1272 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1015 unless $progress; 1273 unless $progress;
1016 } 1274 }
1017 }; 1275 };
1018} 1276}
1019 1277
1020############################################################################# 1278#############################################################################
1279
1280=back
1021 1281
1022=head2 CORE EXTENSIONS 1282=head2 CORE EXTENSIONS
1023 1283
1024Functions and methods that extend core crossfire objects. 1284Functions and methods that extend core crossfire objects.
1025 1285
1213 } 1473 }
1214 1474
1215 \@paths 1475 \@paths
1216} 1476}
1217 1477
1478=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1479
1480Expand crossfire pod fragments into protocol xml.
1481
1482=cut
1483
1484sub expand_cfpod {
1485 ((my $self), (local $_)) = @_;
1486
1487 # escape & and <
1488 s/&/&amp;/g;
1489 s/(?<![BIUGH])</&lt;/g;
1490
1491 # this is buggy, it needs to properly take care of nested <'s
1492
1493 1 while
1494 # replace B<>, I<>, U<> etc.
1495 s/B<([^\>]*)>/<b>$1<\/b>/
1496 || s/I<([^\>]*)>/<i>$1<\/i>/
1497 || s/U<([^\>]*)>/<u>$1<\/u>/
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 if ($self->ns->extcmd == 2) {
1228 1538 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1229 $self->send ("ext " . cf::to_json \%msg); 1539 } elsif ($self->ns->extcmd == 1) {
1540 #TODO: version 1, remove
1541 unshift @msg, msgtype => "reply", msgid => $id;
1542 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1543 }
1230} 1544}
1231 1545
1232=item $player->ext_event ($type, %msg) 1546=item $player->ext_msg ($type, @msg)
1233 1547
1234Sends an ext event to the client. 1548Sends an ext event to the client.
1235 1549
1236=cut 1550=cut
1237 1551
1238sub ext_event($$%) { 1552sub ext_msg($$@) {
1239 my ($self, $type, %msg) = @_; 1553 my ($self, $type, @msg) = @_;
1240 1554
1241 $self->ns->ext_event ($type, %msg); 1555 $self->ns->ext_msg ($type, @msg);
1242} 1556}
1243 1557
1244=head3 cf::region 1558=head3 cf::region
1245 1559
1246=over 4 1560=over 4
1249 1563
1250package cf::region; 1564package cf::region;
1251 1565
1252=item cf::region::find_by_path $path 1566=item cf::region::find_by_path $path
1253 1567
1254Tries to decuce the probable region for a map knowing only its path. 1568Tries to decuce the likely region for a map knowing only its path.
1255 1569
1256=cut 1570=cut
1257 1571
1258sub find_by_path($) { 1572sub find_by_path($) {
1259 my ($path) = @_; 1573 my ($path) = @_;
1260 1574
1261 my ($match, $specificity); 1575 my ($match, $specificity);
1262 1576
1263 for my $region (list) { 1577 for my $region (list) {
1264 if ($region->match && $path =~ $region->match) { 1578 if ($region->{match} && $path =~ $region->{match}) {
1265 ($match, $specificity) = ($region, $region->specificity) 1579 ($match, $specificity) = ($region, $region->specificity)
1266 if $region->specificity > $specificity; 1580 if $region->specificity > $specificity;
1267 } 1581 }
1268 } 1582 }
1269 1583
1389 $self->init; # pass $1 etc. 1703 $self->init; # pass $1 etc.
1390 return $self; 1704 return $self;
1391 } 1705 }
1392 } 1706 }
1393 1707
1394 Carp::carp "unable to resolve path '$path' (base '$base')."; 1708 Carp::cluck "unable to resolve path '$path' (base '$base').";
1395 () 1709 ()
1396} 1710}
1397 1711
1398sub init { 1712sub init {
1399 my ($self) = @_; 1713 my ($self) = @_;
1607 $self->set_darkness_map; 1921 $self->set_darkness_map;
1608 Coro::cede; 1922 Coro::cede;
1609 $self->activate; 1923 $self->activate;
1610 } 1924 }
1611 1925
1926 $self->{last_save} = $cf::RUNTIME;
1927 $self->last_access ($cf::RUNTIME);
1928
1612 $self->in_memory (cf::MAP_IN_MEMORY); 1929 $self->in_memory (cf::MAP_IN_MEMORY);
1613 } 1930 }
1614 1931
1615 $self->post_load; 1932 $self->post_load;
1616} 1933}
1677 1994
1678 undef $MAP_PREFETCH{$path}; 1995 undef $MAP_PREFETCH{$path};
1679 $MAP_PREFETCHER ||= cf::async { 1996 $MAP_PREFETCHER ||= cf::async {
1680 while (%MAP_PREFETCH) { 1997 while (%MAP_PREFETCH) {
1681 for my $path (keys %MAP_PREFETCH) { 1998 for my $path (keys %MAP_PREFETCH) {
1682 my $map = find $path 1999 if (my $map = find $path) {
1683 or next;
1684 $map->load; 2000 $map->load;
2001 }
1685 2002
1686 delete $MAP_PREFETCH{$path}; 2003 delete $MAP_PREFETCH{$path};
1687 } 2004 }
1688 } 2005 }
1689 undef $MAP_PREFETCHER; 2006 undef $MAP_PREFETCHER;
1911 2228
1912 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2229 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1913 2230
1914 if ($self->{record_replies}) { 2231 if ($self->{record_replies}) {
1915 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2232 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2233
1916 } else { 2234 } else {
2235 my $pl = $self->contr;
2236
2237 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2238 my $dialog = $pl->{npc_dialog};
2239 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2240
2241 } else {
1917 $msg = $npc->name . " says: $msg" if $npc; 2242 $msg = $npc->name . " says: $msg" if $npc;
1918 $self->message ($msg, $flags); 2243 $self->message ($msg, $flags);
2244 }
1919 } 2245 }
1920} 2246}
1921 2247
1922=item $player_object->may ("access") 2248=item $player_object->may ("access")
1923 2249
2012 2338
2013 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2339 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2014 $self->enter_map ($map, $x, $y); 2340 $self->enter_map ($map, $x, $y);
2015} 2341}
2016 2342
2017=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2343=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2018 2344
2019Moves the player to the given map-path and coordinates by first freezing 2345Moves the player to the given map-path and coordinates by first freezing
2020her, loading and preparing them map, calling the provided $check callback 2346her, loading and preparing them map, calling the provided $check callback
2021that has to return the map if sucecssful, and then unfreezes the player on 2347that has to return the map if sucecssful, and then unfreezes the player on
2022the new (success) or old (failed) map position. 2348the new (success) or old (failed) map position. In either case, $done will
2349be called at the end of this process.
2023 2350
2024=cut 2351=cut
2025 2352
2026our $GOTOGEN; 2353our $GOTOGEN;
2027 2354
2028sub cf::object::player::goto { 2355sub cf::object::player::goto {
2029 my ($self, $path, $x, $y, $check) = @_; 2356 my ($self, $path, $x, $y, $check, $done) = @_;
2030 2357
2031 # do generation counting so two concurrent goto's will be executed in-order 2358 # do generation counting so two concurrent goto's will be executed in-order
2032 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2359 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2033 2360
2034 $self->enter_link; 2361 $self->enter_link;
2054 2381
2055 if ($gen == $self->{_goto_generation}) { 2382 if ($gen == $self->{_goto_generation}) {
2056 delete $self->{_goto_generation}; 2383 delete $self->{_goto_generation};
2057 $self->leave_link ($map, $x, $y); 2384 $self->leave_link ($map, $x, $y);
2058 } 2385 }
2386
2387 $done->() if $done;
2059 })->prio (1); 2388 })->prio (1);
2060} 2389}
2061 2390
2062=item $player_object->enter_exit ($exit_object) 2391=item $player_object->enter_exit ($exit_object)
2063 2392
2132 my $hp = $exit->stats->hp; 2461 my $hp = $exit->stats->hp;
2133 my $sp = $exit->stats->sp; 2462 my $sp = $exit->stats->sp;
2134 2463
2135 $self->enter_link; 2464 $self->enter_link;
2136 2465
2466 # if exit is damned, update players death & WoR home-position
2467 $self->contr->savebed ($slaying, $hp, $sp)
2468 if $exit->flag (FLAG_DAMNED);
2469
2137 (async { 2470 (async {
2138 $self->deactivate_recursive; # just to be sure 2471 $self->deactivate_recursive; # just to be sure
2139 unless (eval { 2472 unless (eval {
2140 $self->goto ($slaying, $hp, $sp); 2473 $self->goto ($slaying, $hp, $sp);
2141 2474
2168 2501
2169 utf8::encode $text; 2502 utf8::encode $text;
2170 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2503 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2171} 2504}
2172 2505
2506=item $client->send_msg ($channel, $msg, $color, [extra...])
2507
2508Send a drawinfo or msg packet to the client, formatting the msg for the
2509client if neccessary. C<$type> should be a string identifying the type of
2510the message, with C<log> being the default. If C<$color> is negative, suppress
2511the message unless the client supports the msg packet.
2512
2513=cut
2514
2515sub cf::client::send_msg {
2516 my ($self, $channel, $msg, $color, @extra) = @_;
2517
2518 $msg = $self->pl->expand_cfpod ($msg);
2519
2520 $color &= cf::NDI_CLIENT_MASK; # just in case...
2521
2522 if (ref $channel) {
2523 # send meta info to client, if not yet sent
2524 unless (exists $self->{channel}{$channel->{id}}) {
2525 $self->{channel}{$channel->{id}} = $channel;
2526 $self->ext_msg (channel_info => $channel);
2527 }
2528
2529 $channel = $channel->{id};
2530 }
2531
2532 return unless @extra || length $msg;
2533
2534 if ($self->can_msg) {
2535 # default colour, mask it out
2536 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2537 if $color & cf::NDI_DEF;
2538
2539 $self->send_packet ("msg " . $self->{json_coder}->encode (
2540 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2541 } else {
2542 if ($color >= 0) {
2543 # replace some tags by gcfclient-compatible ones
2544 for ($msg) {
2545 1 while
2546 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2547 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2548 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2549 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2550 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2551 }
2552
2553 $color &= cf::NDI_COLOR_MASK;
2554
2555 if (0 && $msg =~ /\[/) {
2556 $self->send_packet ("drawextinfo $color 4 0 $msg")
2557 } else {
2558 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2559 $self->send_packet ("drawinfo $color $msg")
2560 }
2561 }
2562 }
2563}
2564
2173=item $client->ext_event ($type, %msg) 2565=item $client->ext_msg ($type, @msg)
2174 2566
2175Sends an exti event to the client. 2567Sends an ext event to the client.
2176 2568
2177=cut 2569=cut
2178 2570
2179sub cf::client::ext_event($$%) { 2571sub cf::client::ext_msg($$@) {
2180 my ($self, $type, %msg) = @_; 2572 my ($self, $type, @msg) = @_;
2181 2573
2574 my $extcmd = $self->extcmd;
2575
2576 if ($extcmd == 2) {
2577 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2578 } elsif ($extcmd == 1) { # TODO: remove
2182 $msg{msgtype} = "event_$type"; 2579 push @msg, msgtype => "event_$type";
2183 $self->send_packet ("ext " . cf::to_json \%msg); 2580 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2581 }
2184} 2582}
2185 2583
2186=item $success = $client->query ($flags, "text", \&cb) 2584=item $success = $client->query ($flags, "text", \&cb)
2187 2585
2188Queues a query to the client, calling the given callback with 2586Queues a query to the client, calling the given callback with
2189the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2587the 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>. 2588C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2191 2589
2192Queries can fail, so check the return code. Or don't, as queries will become 2590Queries can fail, so check the return code. Or don't, as queries will
2193reliable at some point in the future. 2591become reliable at some point in the future.
2194 2592
2195=cut 2593=cut
2196 2594
2197sub cf::client::query { 2595sub cf::client::query {
2198 my ($self, $flags, $text, $cb) = @_; 2596 my ($self, $flags, $text, $cb) = @_;
2206 utf8::encode $text; 2604 utf8::encode $text;
2207 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2605 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2208 2606
2209 $self->send_packet ($self->{query_queue}[0][0]) 2607 $self->send_packet ($self->{query_queue}[0][0])
2210 if @{ $self->{query_queue} } == 1; 2608 if @{ $self->{query_queue} } == 1;
2609
2610 1
2211} 2611}
2212 2612
2213cf::client->attach ( 2613cf::client->attach (
2614 on_connect => sub {
2615 my ($ns) = @_;
2616
2617 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2618 },
2214 on_reply => sub { 2619 on_reply => sub {
2215 my ($ns, $msg) = @_; 2620 my ($ns, $msg) = @_;
2216 2621
2217 # this weird shuffling is so that direct followup queries 2622 # this weird shuffling is so that direct followup queries
2218 # get handled first 2623 # get handled first
2230 } else { 2635 } else {
2231 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2636 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2232 } 2637 }
2233 } 2638 }
2234 }, 2639 },
2640 on_exticmd => sub {
2641 my ($ns, $buf) = @_;
2642
2643 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2644
2645 if (ref $msg) {
2646 my ($type, $reply, @payload) =
2647 "ARRAY" eq ref $msg
2648 ? @$msg
2649 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2650
2651 if (my $cb = $EXTICMD{$type}) {
2652 my @reply = $cb->($ns, @payload);
2653
2654 $ns->ext_reply ($reply, @reply)
2655 if $reply;
2656 }
2657 } else {
2658 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2659 }
2660
2661 cf::override;
2662 },
2235); 2663);
2236 2664
2237=item $client->async (\&cb) 2665=item $client->async (\&cb)
2238 2666
2239Create a new coroutine, running the specified callback. The coroutine will 2667Create a new coroutine, running the specified callback. The coroutine will
2288 2716
2289=pod 2717=pod
2290 2718
2291The following functions and methods are available within a safe environment: 2719The following functions and methods are available within a safe environment:
2292 2720
2293 cf::object contr pay_amount pay_player map 2721 cf::object
2722 contr pay_amount pay_player map x y force_find force_add
2723 insert remove
2724
2294 cf::object::player player 2725 cf::object::player
2295 cf::player peaceful 2726 player
2296 cf::map trigger 2727
2728 cf::player
2729 peaceful
2730
2731 cf::map
2732 trigger
2297 2733
2298=cut 2734=cut
2299 2735
2300for ( 2736for (
2301 ["cf::object" => qw(contr pay_amount pay_player map)], 2737 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2738 insert remove)],
2302 ["cf::object::player" => qw(player)], 2739 ["cf::object::player" => qw(player)],
2303 ["cf::player" => qw(peaceful)], 2740 ["cf::player" => qw(peaceful)],
2304 ["cf::map" => qw(trigger)], 2741 ["cf::map" => qw(trigger)],
2305) { 2742) {
2306 no strict 'refs'; 2743 no strict 'refs';
2377=back 2814=back
2378 2815
2379=cut 2816=cut
2380 2817
2381############################################################################# 2818#############################################################################
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 2819# the server's init and main functions
2555 2820
2556sub load_facedata($) { 2821sub load_facedata($) {
2557 my ($path) = @_; 2822 my ($path) = @_;
2558 2823
2570 { 2835 {
2571 my $faces = $facedata->{faceinfo}; 2836 my $faces = $facedata->{faceinfo};
2572 2837
2573 while (my ($face, $info) = each %$faces) { 2838 while (my ($face, $info) = each %$faces) {
2574 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2839 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2575 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2840 cf::face::set_visibility $idx, $info->{visibility};
2841 cf::face::set_magicmap $idx, $info->{magicmap};
2576 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2842 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2577 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2843 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2578 Coro::cede; 2844
2845 cf::cede_to_tick;
2579 } 2846 }
2580 2847
2581 while (my ($face, $info) = each %$faces) { 2848 while (my ($face, $info) = each %$faces) {
2582 next unless $info->{smooth}; 2849 next unless $info->{smooth};
2583 my $idx = cf::face::find $face 2850 my $idx = cf::face::find $face
2584 or next; 2851 or next;
2585 if (my $smooth = cf::face::find $info->{smooth}) { 2852 if (my $smooth = cf::face::find $info->{smooth}) {
2853 cf::face::set_smooth $idx, $smooth;
2586 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2854 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2587 } else { 2855 } else {
2588 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2856 warn "smooth face '$info->{smooth}' not found for face '$face'";
2589 } 2857 }
2590 Coro::cede; 2858
2859 cf::cede_to_tick;
2591 } 2860 }
2592 } 2861 }
2593 2862
2594 { 2863 {
2595 my $anims = $facedata->{animinfo}; 2864 my $anims = $facedata->{animinfo};
2596 2865
2597 while (my ($anim, $info) = each %$anims) { 2866 while (my ($anim, $info) = each %$anims) {
2598 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2867 cf::anim::set $anim, $info->{frames}, $info->{facings};
2599 Coro::cede; 2868 cf::cede_to_tick;
2600 } 2869 }
2601 2870
2602 cf::anim::invalidate_all; # d'oh 2871 cf::anim::invalidate_all; # d'oh
2603 } 2872 }
2604 2873
2874 {
2875 # TODO: for gcfclient pleasure, we should give resources
2876 # that gcfclient doesn't grok a >10000 face index.
2877 my $res = $facedata->{resource};
2878 my $enc = JSON::XS->new->utf8->canonical;
2879
2880 my $soundconf = delete $res->{"res/sound.conf"};
2881
2882 while (my ($name, $info) = each %$res) {
2883 my $meta = $enc->encode ({
2884 name => $name,
2885 %{ $info->{meta} || {} },
2886 });
2887
2888 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2889
2890 if ($info->{type} & 1) {
2891 # prepend meta info
2892
2893 my $data = pack "(w/a*)*", $meta, $info->{data};
2894 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2895
2896 cf::face::set_data $idx, 0, $data, $chk;
2897 } else {
2898 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};
2899 }
2900
2901 cf::face::set_type $idx, $info->{type};
2902
2903 cf::cede_to_tick;
2904 }
2905
2906 if ($soundconf) {
2907 $soundconf = $enc->decode (delete $soundconf->{data});
2908
2909 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2910 my $sound = $soundconf->{compat}[$_]
2911 or next;
2912
2913 my $face = cf::face::find "sound/$sound->[1]";
2914
2915 cf::sound::set $sound->[0] => $face;
2916 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2917 }
2918
2919 #TODO
2920 }
2921 }
2922
2605 1 2923 1
2606} 2924}
2925
2926register_exticmd fx_want => sub {
2927 my ($ns, $want) = @_;
2928
2929 while (my ($k, $v) = each %$want) {
2930 $ns->fx_want ($k, $v);
2931 }
2932};
2607 2933
2608sub reload_regions { 2934sub reload_regions {
2609 load_resource_file "$MAPDIR/regions" 2935 load_resource_file "$MAPDIR/regions"
2610 or die "unable to load regions file\n"; 2936 or die "unable to load regions file\n";
2937
2938 for (cf::region::list) {
2939 $_->{match} = qr/$_->{match}/
2940 if exists $_->{match};
2941 }
2611} 2942}
2612 2943
2613sub reload_facedata { 2944sub reload_facedata {
2614 load_facedata "$DATADIR/facedata" 2945 load_facedata "$DATADIR/facedata"
2615 or die "unable to load facedata\n"; 2946 or die "unable to load facedata\n";
2616} 2947}
2617 2948
2618sub reload_archetypes { 2949sub reload_archetypes {
2950 load_resource_file "$DATADIR/archetypes"
2951 or die "unable to load archetypes\n";
2952 #d# NEED to laod twice to resolve forward references
2953 # this really needs to be done in an extra post-pass
2954 # (which needs to be synchronous, so solve it differently)
2619 load_resource_file "$DATADIR/archetypes" 2955 load_resource_file "$DATADIR/archetypes"
2620 or die "unable to load archetypes\n"; 2956 or die "unable to load archetypes\n";
2621} 2957}
2622 2958
2623sub reload_treasures { 2959sub reload_treasures {
2695 }, 3031 },
2696 ); 3032 );
2697 } 3033 }
2698} 3034}
2699 3035
3036sub write_runtime {
3037 my $runtime = "$LOCALDIR/runtime";
3038
3039 # first touch the runtime file to show we are still running:
3040 # the fsync below can take a very very long time.
3041
3042 IO::AIO::aio_utime $runtime, undef, undef;
3043
3044 my $guard = cf::lock_acquire "write_runtime";
3045
3046 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3047 or return;
3048
3049 my $value = $cf::RUNTIME + 90 + 10;
3050 # 10 is the runtime save interval, for a monotonic clock
3051 # 60 allows for the watchdog to kill the server.
3052
3053 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3054 and return;
3055
3056 # always fsync - this file is important
3057 aio_fsync $fh
3058 and return;
3059
3060 # touch it again to show we are up-to-date
3061 aio_utime $fh, undef, undef;
3062
3063 close $fh
3064 or return;
3065
3066 aio_rename "$runtime~", $runtime
3067 and return;
3068
3069 warn "runtime file written.\n";
3070
3071 1
3072}
3073
2700sub emergency_save() { 3074sub emergency_save() {
2701 my $freeze_guard = cf::freeze_mainloop; 3075 my $freeze_guard = cf::freeze_mainloop;
2702 3076
2703 warn "enter emergency perl save\n"; 3077 warn "enter emergency perl save\n";
2704 3078
2779 %EXT_CORO = (); 3153 %EXT_CORO = ();
2780 3154
2781 warn "removing commands"; 3155 warn "removing commands";
2782 %COMMAND = (); 3156 %COMMAND = ();
2783 3157
2784 warn "removing ext commands"; 3158 warn "removing ext/exti commands";
2785 %EXTCMD = (); 3159 %EXTCMD = ();
3160 %EXTICMD = ();
2786 3161
2787 warn "unloading/nuking all extensions"; 3162 warn "unloading/nuking all extensions";
2788 for my $pkg (@EXTS) { 3163 for my $pkg (@EXTS) {
2789 warn "... unloading $pkg"; 3164 warn "... unloading $pkg";
2790 3165

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines