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.277 by root, Sun Jun 10 04:24:50 2007 UTC vs.
Revision 1.316 by root, Mon Jul 23 21:02:50 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
944 cf::override; 1201 cf::override;
945 }, 1202 },
946); 1203);
947 1204
948sub load_extension {
949 my ($path) = @_;
950
951 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
952 my $base = $1;
953 my $pkg = $1;
954 $pkg =~ s/[^[:word:]]/_/g;
955 $pkg = "ext::$pkg";
956
957 warn "... loading '$path' into '$pkg'\n";
958
959 open my $fh, "<:utf8", $path
960 or die "$path: $!";
961
962 my $source =
963 "package $pkg; use strict; use utf8;\n"
964 . "#line 1 \"$path\"\n{\n"
965 . (do { local $/; <$fh> })
966 . "\n};\n1";
967
968 unless (eval $source) {
969 my $msg = $@ ? "$path: $@\n"
970 : "extension disabled.\n";
971 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
972 warn $@;
973 warn "mandatory extension failed to load, exiting.\n";
974 exit 1;
975 }
976 die $@;
977 }
978
979 push @EXTS, $pkg;
980}
981
982sub load_extensions { 1205sub load_extensions {
1206 cf::sync_job {
1207 my %todo;
1208
983 for my $ext (<$LIBDIR/*.ext>) { 1209 for my $path (<$LIBDIR/*.ext>) {
984 next unless -r $ext; 1210 next unless -r $path;
985 eval { 1211
986 load_extension $ext; 1212 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1213 my $base = $1;
1214 my $pkg = $1;
1215 $pkg =~ s/[^[:word:]]/_/g;
1216 $pkg = "ext::$pkg";
1217
1218 open my $fh, "<:utf8", $path
1219 or die "$path: $!";
1220
1221 my $source = do { local $/; <$fh> };
1222
1223 my %ext = (
1224 path => $path,
1225 base => $base,
1226 pkg => $pkg,
1227 );
1228
1229 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1230 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1231
1232 $ext{source} =
1233 "package $pkg; use strict; use utf8;\n"
1234 . "#line 1 \"$path\"\n{\n"
1235 . $source
1236 . "\n};\n1";
1237
1238 $todo{$base} = \%ext;
1239 }
1240
1241 my %done;
1242 while (%todo) {
1243 my $progress;
1244
1245 while (my ($k, $v) = each %todo) {
1246 for (split /,\s*/, $v->{meta}{depends}) {
1247 goto skip
1248 unless exists $done{$_};
1249 }
1250
1251 warn "... loading '$k' into '$v->{pkg}'\n";
1252
1253 unless (eval $v->{source}) {
1254 my $msg = $@ ? "$v->{path}: $@\n"
1255 : "$v->{base}: extension inactive.\n";
1256
1257 if (exists $v->{meta}{mandatory}) {
1258 warn $msg;
1259 warn "mandatory extension failed to load, exiting.\n";
1260 exit 1;
1261 }
1262
1263 warn $msg;
1264 }
1265
1266 $done{$k} = delete $todo{$k};
1267 push @EXTS, $v->{pkg};
1268 $progress = 1;
987 1 1269 }
988 } or warn "$ext not loaded: $@"; 1270
1271 skip:
1272 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1273 unless $progress;
1274 }
989 } 1275 };
990} 1276}
991 1277
992############################################################################# 1278#############################################################################
1279
1280=back
993 1281
994=head2 CORE EXTENSIONS 1282=head2 CORE EXTENSIONS
995 1283
996Functions and methods that extend core crossfire objects. 1284Functions and methods that extend core crossfire objects.
997 1285
1185 } 1473 }
1186 1474
1187 \@paths 1475 \@paths
1188} 1476}
1189 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
1190=item $player->ext_reply ($msgid, %msg) 1528=item $player->ext_reply ($msgid, @msg)
1191 1529
1192Sends an ext reply to the player. 1530Sends an ext reply to the player.
1193 1531
1194=cut 1532=cut
1195 1533
1196sub ext_reply($$%) { 1534sub ext_reply($$@) {
1197 my ($self, $id, %msg) = @_; 1535 my ($self, $id, @msg) = @_;
1198 1536
1199 $msg{msgid} = $id; 1537 if ($self->ns->extcmd == 2) {
1200 1538 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1201 $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 }
1202} 1544}
1203 1545
1204=item $player->ext_event ($type, %msg) 1546=item $player->ext_msg ($type, @msg)
1205 1547
1206Sends an ext event to the client. 1548Sends an ext event to the client.
1207 1549
1208=cut 1550=cut
1209 1551
1210sub ext_event($$%) { 1552sub ext_msg($$@) {
1211 my ($self, $type, %msg) = @_; 1553 my ($self, $type, @msg) = @_;
1212 1554
1213 $self->ns->ext_event ($type, %msg); 1555 $self->ns->ext_msg ($type, @msg);
1214} 1556}
1215 1557
1216=head3 cf::region 1558=head3 cf::region
1217 1559
1218=over 4 1560=over 4
1221 1563
1222package cf::region; 1564package cf::region;
1223 1565
1224=item cf::region::find_by_path $path 1566=item cf::region::find_by_path $path
1225 1567
1226Tries 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.
1227 1569
1228=cut 1570=cut
1229 1571
1230sub find_by_path($) { 1572sub find_by_path($) {
1231 my ($path) = @_; 1573 my ($path) = @_;
1232 1574
1233 my ($match, $specificity); 1575 my ($match, $specificity);
1234 1576
1235 for my $region (list) { 1577 for my $region (list) {
1236 if ($region->match && $path =~ $region->match) { 1578 if ($region->{match} && $path =~ $region->{match}) {
1237 ($match, $specificity) = ($region, $region->specificity) 1579 ($match, $specificity) = ($region, $region->specificity)
1238 if $region->specificity > $specificity; 1580 if $region->specificity > $specificity;
1239 } 1581 }
1240 } 1582 }
1241 1583
1361 $self->init; # pass $1 etc. 1703 $self->init; # pass $1 etc.
1362 return $self; 1704 return $self;
1363 } 1705 }
1364 } 1706 }
1365 1707
1366 Carp::carp "unable to resolve path '$path' (base '$base')."; 1708 Carp::cluck "unable to resolve path '$path' (base '$base').";
1367 () 1709 ()
1368} 1710}
1369 1711
1370sub init { 1712sub init {
1371 my ($self) = @_; 1713 my ($self) = @_;
1649 1991
1650 undef $MAP_PREFETCH{$path}; 1992 undef $MAP_PREFETCH{$path};
1651 $MAP_PREFETCHER ||= cf::async { 1993 $MAP_PREFETCHER ||= cf::async {
1652 while (%MAP_PREFETCH) { 1994 while (%MAP_PREFETCH) {
1653 for my $path (keys %MAP_PREFETCH) { 1995 for my $path (keys %MAP_PREFETCH) {
1654 my $map = find $path 1996 if (my $map = find $path) {
1655 or next;
1656 $map->load; 1997 $map->load;
1998 }
1657 1999
1658 delete $MAP_PREFETCH{$path}; 2000 delete $MAP_PREFETCH{$path};
1659 } 2001 }
1660 } 2002 }
1661 undef $MAP_PREFETCHER; 2003 undef $MAP_PREFETCHER;
1883 2225
1884 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2226 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1885 2227
1886 if ($self->{record_replies}) { 2228 if ($self->{record_replies}) {
1887 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2229 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2230
1888 } else { 2231 } else {
2232 my $pl = $self->contr;
2233
2234 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2235 my $dialog = $pl->{npc_dialog};
2236 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2237
2238 } else {
1889 $msg = $npc->name . " says: $msg" if $npc; 2239 $msg = $npc->name . " says: $msg" if $npc;
1890 $self->message ($msg, $flags); 2240 $self->message ($msg, $flags);
2241 }
1891 } 2242 }
1892} 2243}
1893 2244
1894=item $player_object->may ("access") 2245=item $player_object->may ("access")
1895 2246
1984 2335
1985 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2336 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1986 $self->enter_map ($map, $x, $y); 2337 $self->enter_map ($map, $x, $y);
1987} 2338}
1988 2339
1989=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2340=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1990 2341
1991Moves the player to the given map-path and coordinates by first freezing 2342Moves the player to the given map-path and coordinates by first freezing
1992her, loading and preparing them map, calling the provided $check callback 2343her, loading and preparing them map, calling the provided $check callback
1993that has to return the map if sucecssful, and then unfreezes the player on 2344that has to return the map if sucecssful, and then unfreezes the player on
1994the new (success) or old (failed) map position. 2345the new (success) or old (failed) map position. In either case, $done will
2346be called at the end of this process.
1995 2347
1996=cut 2348=cut
1997 2349
1998our $GOTOGEN; 2350our $GOTOGEN;
1999 2351
2000sub cf::object::player::goto { 2352sub cf::object::player::goto {
2001 my ($self, $path, $x, $y, $check) = @_; 2353 my ($self, $path, $x, $y, $check, $done) = @_;
2002 2354
2003 # do generation counting so two concurrent goto's will be executed in-order 2355 # do generation counting so two concurrent goto's will be executed in-order
2004 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2356 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2005 2357
2006 $self->enter_link; 2358 $self->enter_link;
2026 2378
2027 if ($gen == $self->{_goto_generation}) { 2379 if ($gen == $self->{_goto_generation}) {
2028 delete $self->{_goto_generation}; 2380 delete $self->{_goto_generation};
2029 $self->leave_link ($map, $x, $y); 2381 $self->leave_link ($map, $x, $y);
2030 } 2382 }
2383
2384 $done->() if $done;
2031 })->prio (1); 2385 })->prio (1);
2032} 2386}
2033 2387
2034=item $player_object->enter_exit ($exit_object) 2388=item $player_object->enter_exit ($exit_object)
2035 2389
2104 my $hp = $exit->stats->hp; 2458 my $hp = $exit->stats->hp;
2105 my $sp = $exit->stats->sp; 2459 my $sp = $exit->stats->sp;
2106 2460
2107 $self->enter_link; 2461 $self->enter_link;
2108 2462
2463 # if exit is damned, update players death & WoR home-position
2464 $self->contr->savebed ($slaying, $hp, $sp)
2465 if $exit->flag (FLAG_DAMNED);
2466
2109 (async { 2467 (async {
2110 $self->deactivate_recursive; # just to be sure 2468 $self->deactivate_recursive; # just to be sure
2111 unless (eval { 2469 unless (eval {
2112 $self->goto ($slaying, $hp, $sp); 2470 $self->goto ($slaying, $hp, $sp);
2113 2471
2140 2498
2141 utf8::encode $text; 2499 utf8::encode $text;
2142 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2500 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2143} 2501}
2144 2502
2503=item $client->send_msg ($channel, $msg, $color, [extra...])
2504
2505Send a drawinfo or msg packet to the client, formatting the msg for the
2506client if neccessary. C<$type> should be a string identifying the type of
2507the message, with C<log> being the default. If C<$color> is negative, suppress
2508the message unless the client supports the msg packet.
2509
2510=cut
2511
2512sub cf::client::send_msg {
2513 my ($self, $channel, $msg, $color, @extra) = @_;
2514
2515 $msg = $self->pl->expand_cfpod ($msg);
2516
2517 $color &= ~cf::NDI_UNIQUE; # just in case...
2518
2519 if (ref $channel) {
2520 # send meta info to client, if not yet sent
2521 unless (exists $self->{channel}{$channel->{id}}) {
2522 $self->{channel}{$channel->{id}} = $channel;
2523 $self->ext_msg (channel_info => %$channel);
2524 }
2525
2526 $channel = $channel->{id};
2527 }
2528
2529 return unless @extra || length $msg;
2530
2531 if ($self->can_msg) {
2532 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra]));
2533 } else {
2534 # replace some tags by gcfclient-compatible ones
2535 for ($msg) {
2536 1 while
2537 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2538 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2539 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2540 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2541 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2542 }
2543
2544 if ($color >= 0) {
2545 if (0 && $msg =~ /\[/) {
2546 $self->send_packet ("drawextinfo $color 4 0 $msg")
2547 } else {
2548 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2549 $self->send_packet ("drawinfo $color $msg")
2550 }
2551 }
2552 }
2553}
2554
2145=item $client->ext_event ($type, %msg) 2555=item $client->ext_msg ($type, @msg)
2146 2556
2147Sends an exti event to the client. 2557Sends an ext event to the client.
2148 2558
2149=cut 2559=cut
2150 2560
2151sub cf::client::ext_event($$%) { 2561sub cf::client::ext_msg($$@) {
2152 my ($self, $type, %msg) = @_; 2562 my ($self, $type, @msg) = @_;
2153 2563
2564 my $extcmd = $self->extcmd;
2565
2566 if ($extcmd == 2) {
2567 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2568 } elsif ($extcmd == 1) { # TODO: remove
2154 $msg{msgtype} = "event_$type"; 2569 push @msg, msgtype => "event_$type";
2155 $self->send_packet ("ext " . cf::to_json \%msg); 2570 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2571 }
2156} 2572}
2157 2573
2158=item $success = $client->query ($flags, "text", \&cb) 2574=item $success = $client->query ($flags, "text", \&cb)
2159 2575
2160Queues a query to the client, calling the given callback with 2576Queues a query to the client, calling the given callback with
2161the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2577the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2162C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2578C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2163 2579
2164Queries can fail, so check the return code. Or don't, as queries will become 2580Queries can fail, so check the return code. Or don't, as queries will
2165reliable at some point in the future. 2581become reliable at some point in the future.
2166 2582
2167=cut 2583=cut
2168 2584
2169sub cf::client::query { 2585sub cf::client::query {
2170 my ($self, $flags, $text, $cb) = @_; 2586 my ($self, $flags, $text, $cb) = @_;
2178 utf8::encode $text; 2594 utf8::encode $text;
2179 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2595 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2180 2596
2181 $self->send_packet ($self->{query_queue}[0][0]) 2597 $self->send_packet ($self->{query_queue}[0][0])
2182 if @{ $self->{query_queue} } == 1; 2598 if @{ $self->{query_queue} } == 1;
2599
2600 1
2183} 2601}
2184 2602
2185cf::client->attach ( 2603cf::client->attach (
2604 on_connect => sub {
2605 my ($ns) = @_;
2606
2607 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2608 },
2186 on_reply => sub { 2609 on_reply => sub {
2187 my ($ns, $msg) = @_; 2610 my ($ns, $msg) = @_;
2188 2611
2189 # this weird shuffling is so that direct followup queries 2612 # this weird shuffling is so that direct followup queries
2190 # get handled first 2613 # get handled first
2202 } else { 2625 } else {
2203 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2626 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2204 } 2627 }
2205 } 2628 }
2206 }, 2629 },
2630 on_exticmd => sub {
2631 my ($ns, $buf) = @_;
2632
2633 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2634
2635 if (ref $msg) {
2636 my ($type, $reply, @payload) =
2637 "ARRAY" eq ref $msg
2638 ? @$msg
2639 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2640
2641 if (my $cb = $EXTICMD{$type}) {
2642 my @reply = $cb->($ns, @payload);
2643
2644 $ns->ext_reply ($reply, @reply)
2645 if $reply;
2646 }
2647 } else {
2648 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2649 }
2650
2651 cf::override;
2652 },
2207); 2653);
2208 2654
2209=item $client->async (\&cb) 2655=item $client->async (\&cb)
2210 2656
2211Create a new coroutine, running the specified callback. The coroutine will 2657Create a new coroutine, running the specified callback. The coroutine will
2260 2706
2261=pod 2707=pod
2262 2708
2263The following functions and methods are available within a safe environment: 2709The following functions and methods are available within a safe environment:
2264 2710
2265 cf::object contr pay_amount pay_player map 2711 cf::object
2712 contr pay_amount pay_player map x y force_find force_add
2713 insert remove
2714
2266 cf::object::player player 2715 cf::object::player
2267 cf::player peaceful 2716 player
2268 cf::map trigger 2717
2718 cf::player
2719 peaceful
2720
2721 cf::map
2722 trigger
2269 2723
2270=cut 2724=cut
2271 2725
2272for ( 2726for (
2273 ["cf::object" => qw(contr pay_amount pay_player map)], 2727 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2728 insert remove)],
2274 ["cf::object::player" => qw(player)], 2729 ["cf::object::player" => qw(player)],
2275 ["cf::player" => qw(peaceful)], 2730 ["cf::player" => qw(peaceful)],
2276 ["cf::map" => qw(trigger)], 2731 ["cf::map" => qw(trigger)],
2277) { 2732) {
2278 no strict 'refs'; 2733 no strict 'refs';
2349=back 2804=back
2350 2805
2351=cut 2806=cut
2352 2807
2353############################################################################# 2808#############################################################################
2354
2355=head2 EXTENSION DATABASE SUPPORT
2356
2357Crossfire maintains a very simple database for extension use. It can
2358currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2359convert to/from binary).
2360
2361The parameter C<$family> should best start with the name of the extension
2362using it, it should be unique.
2363
2364=over 4
2365
2366=item $value = cf::db_get $family => $key
2367
2368Returns a single value from the database.
2369
2370=item cf::db_put $family => $key => $value
2371
2372Stores the given C<$value> in the family.
2373
2374=cut
2375
2376our $DB;
2377
2378sub db_init {
2379 unless ($DB) {
2380 $DB = BDB::db_create $DB_ENV;
2381
2382 cf::sync_job {
2383 eval {
2384 $DB->set_flags (BDB::CHKSUM);
2385
2386 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2387 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2388 cf::cleanup "db_open(db): $!" if $!;
2389 };
2390 cf::cleanup "db_open(db): $@" if $@;
2391 };
2392 }
2393}
2394
2395sub db_get($$) {
2396 my $key = "$_[0]/$_[1]";
2397
2398 cf::sync_job {
2399 BDB::db_get $DB, undef, $key, my $data;
2400
2401 $! ? ()
2402 : $data
2403 }
2404}
2405
2406sub db_put($$$) {
2407 BDB::dbreq_pri 4;
2408 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2409}
2410
2411=item cf::cache $id => [$paths...], $processversion => $process
2412
2413Generic caching function that returns the value of the resource $id,
2414caching and regenerating as required.
2415
2416This function can block.
2417
2418=cut
2419
2420sub cache {
2421 my ($id, $src, $processversion, $process) = @_;
2422
2423 my $meta =
2424 join "\x00",
2425 $processversion,
2426 map {
2427 aio_stat $_
2428 and Carp::croak "$_: $!";
2429
2430 ($_, (stat _)[7,9])
2431 } @$src;
2432
2433 my $dbmeta = db_get cache => "$id/meta";
2434 if ($dbmeta ne $meta) {
2435 # changed, we may need to process
2436
2437 my @data;
2438 my $md5;
2439
2440 for (0 .. $#$src) {
2441 0 <= aio_load $src->[$_], $data[$_]
2442 or Carp::croak "$src->[$_]: $!";
2443 }
2444
2445 # if processing is expensive, check
2446 # checksum first
2447 if (1) {
2448 $md5 =
2449 join "\x00",
2450 $processversion,
2451 map {
2452 Coro::cede;
2453 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2454 } 0.. $#$src;
2455
2456
2457 my $dbmd5 = db_get cache => "$id/md5";
2458 if ($dbmd5 eq $md5) {
2459 db_put cache => "$id/meta", $meta;
2460
2461 return db_get cache => "$id/data";
2462 }
2463 }
2464
2465 my $t1 = Time::HiRes::time;
2466 my $data = $process->(\@data);
2467 my $t2 = Time::HiRes::time;
2468
2469 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2470
2471 db_put cache => "$id/data", $data;
2472 db_put cache => "$id/md5" , $md5;
2473 db_put cache => "$id/meta", $meta;
2474
2475 return $data;
2476 }
2477
2478 db_get cache => "$id/data"
2479}
2480
2481=item fork_call { }, $args
2482
2483Executes the given code block with the given arguments in a seperate
2484process, returning the results. Everything must be serialisable with
2485Coro::Storable. May, of course, block. Note that the executed sub may
2486never block itself or use any form of Event handling.
2487
2488=cut
2489
2490sub fork_call(&@) {
2491 my ($cb, @args) = @_;
2492
2493# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2494# or die "socketpair: $!";
2495 pipe my $fh1, my $fh2
2496 or die "pipe: $!";
2497
2498 if (my $pid = fork) {
2499 close $fh2;
2500
2501 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2502 $res = Coro::Storable::thaw $res;
2503
2504 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2505
2506 die $$res unless "ARRAY" eq ref $res;
2507
2508 return wantarray ? @$res : $res->[-1];
2509 } else {
2510 reset_signals;
2511 local $SIG{__WARN__};
2512 local $SIG{__DIE__};
2513 eval {
2514 close $fh1;
2515
2516 my @res = eval { $cb->(@args) };
2517 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2518 };
2519
2520 warn $@ if $@;
2521 _exit 0;
2522 }
2523}
2524
2525#############################################################################
2526# the server's init and main functions 2809# the server's init and main functions
2527 2810
2528sub load_facedata($) { 2811sub load_facedata($) {
2529 my ($path) = @_; 2812 my ($path) = @_;
2530 2813
2542 { 2825 {
2543 my $faces = $facedata->{faceinfo}; 2826 my $faces = $facedata->{faceinfo};
2544 2827
2545 while (my ($face, $info) = each %$faces) { 2828 while (my ($face, $info) = each %$faces) {
2546 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2829 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2547 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2830 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap};
2548 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2549 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2550 Coro::cede; 2834
2835 cf::cede_to_tick;
2551 } 2836 }
2552 2837
2553 while (my ($face, $info) = each %$faces) { 2838 while (my ($face, $info) = each %$faces) {
2554 next unless $info->{smooth}; 2839 next unless $info->{smooth};
2555 my $idx = cf::face::find $face 2840 my $idx = cf::face::find $face
2556 or next; 2841 or next;
2557 if (my $smooth = cf::face::find $info->{smooth}) { 2842 if (my $smooth = cf::face::find $info->{smooth}) {
2843 cf::face::set_smooth $idx, $smooth;
2558 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2844 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2559 } else { 2845 } else {
2560 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2846 warn "smooth face '$info->{smooth}' not found for face '$face'";
2561 } 2847 }
2562 Coro::cede; 2848
2849 cf::cede_to_tick;
2563 } 2850 }
2564 } 2851 }
2565 2852
2566 { 2853 {
2567 my $anims = $facedata->{animinfo}; 2854 my $anims = $facedata->{animinfo};
2568 2855
2569 while (my ($anim, $info) = each %$anims) { 2856 while (my ($anim, $info) = each %$anims) {
2570 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2857 cf::anim::set $anim, $info->{frames}, $info->{facings};
2571 Coro::cede; 2858 cf::cede_to_tick;
2572 } 2859 }
2573 2860
2574 cf::anim::invalidate_all; # d'oh 2861 cf::anim::invalidate_all; # d'oh
2862 }
2863
2864 {
2865 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical;
2869
2870 while (my ($name, $info) = each %$res) {
2871 my $meta = $enc->encode ({
2872 name => $name,
2873 type => $info->{type},
2874 copyright => $info->{copyright}, #TODO#
2875 });
2876
2877 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2878
2879 if ($name =~ /\.jpg$/) {
2880 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack
2881 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack
2882 } else {
2883 my $data = pack "(w/a*)*", $meta, $info->{data};
2884 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2885
2886 cf::face::set_type $idx, 1;
2887 cf::face::set_data $idx, 0, $data, $chk;
2888 }
2889
2890 cf::cede_to_tick;
2891 }
2575 } 2892 }
2576 2893
2577 1 2894 1
2578} 2895}
2579 2896
2580sub reload_regions { 2897sub reload_regions {
2581 load_resource_file "$MAPDIR/regions" 2898 load_resource_file "$MAPDIR/regions"
2582 or die "unable to load regions file\n"; 2899 or die "unable to load regions file\n";
2900
2901 for (cf::region::list) {
2902 $_->{match} = qr/$_->{match}/
2903 if exists $_->{match};
2904 }
2583} 2905}
2584 2906
2585sub reload_facedata { 2907sub reload_facedata {
2586 load_facedata "$DATADIR/facedata" 2908 load_facedata "$DATADIR/facedata"
2587 or die "unable to load facedata\n"; 2909 or die "unable to load facedata\n";
2588} 2910}
2589 2911
2590sub reload_archetypes { 2912sub reload_archetypes {
2913 load_resource_file "$DATADIR/archetypes"
2914 or die "unable to load archetypes\n";
2915 #d# NEED to laod twice to resolve forward references
2916 # this really needs to be done in an extra post-pass
2917 # (which needs to be synchronous, so solve it differently)
2591 load_resource_file "$DATADIR/archetypes" 2918 load_resource_file "$DATADIR/archetypes"
2592 or die "unable to load archetypes\n"; 2919 or die "unable to load archetypes\n";
2593} 2920}
2594 2921
2595sub reload_treasures { 2922sub reload_treasures {
2667 }, 2994 },
2668 ); 2995 );
2669 } 2996 }
2670} 2997}
2671 2998
2999sub write_runtime {
3000 my $runtime = "$LOCALDIR/runtime";
3001
3002 # first touch the runtime file to show we are still running:
3003 # the fsync below can take a very very long time.
3004
3005 IO::AIO::aio_utime $runtime, undef, undef;
3006
3007 my $guard = cf::lock_acquire "write_runtime";
3008
3009 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3010 or return;
3011
3012 my $value = $cf::RUNTIME + 90 + 10;
3013 # 10 is the runtime save interval, for a monotonic clock
3014 # 60 allows for the watchdog to kill the server.
3015
3016 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3017 and return;
3018
3019 # always fsync - this file is important
3020 aio_fsync $fh
3021 and return;
3022
3023 # touch it again to show we are up-to-date
3024 aio_utime $fh, undef, undef;
3025
3026 close $fh
3027 or return;
3028
3029 aio_rename "$runtime~", $runtime
3030 and return;
3031
3032 warn "runtime file written.\n";
3033
3034 1
3035}
3036
2672sub emergency_save() { 3037sub emergency_save() {
2673 my $freeze_guard = cf::freeze_mainloop; 3038 my $freeze_guard = cf::freeze_mainloop;
2674 3039
2675 warn "enter emergency perl save\n"; 3040 warn "enter emergency perl save\n";
2676 3041
2751 %EXT_CORO = (); 3116 %EXT_CORO = ();
2752 3117
2753 warn "removing commands"; 3118 warn "removing commands";
2754 %COMMAND = (); 3119 %COMMAND = ();
2755 3120
2756 warn "removing ext commands"; 3121 warn "removing ext/exti commands";
2757 %EXTCMD = (); 3122 %EXTCMD = ();
3123 %EXTICMD = ();
2758 3124
2759 warn "unloading/nuking all extensions"; 3125 warn "unloading/nuking all extensions";
2760 for my $pkg (@EXTS) { 3126 for my $pkg (@EXTS) {
2761 warn "... unloading $pkg"; 3127 warn "... unloading $pkg";
2762 3128

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines