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.314 by root, Mon Jul 23 16:53:15 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]
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
333Useful for short background jobs.
334
335=cut
336
337our @SLOT_QUEUE;
338our $SLOT_QUEUE;
339
340$SLOT_QUEUE->cancel if $SLOT_QUEUE;
341$SLOT_QUEUE = Coro::async {
342 my $signal = new Coro::Signal;
343
344 while () {
345 next_job:
346 my $avail = cf::till_tick;
347 if ($avail > 0.01) {
348 for (0 .. $#SLOT_QUEUE) {
349 if ($SLOT_QUEUE[$_][0] < $avail) {
350 my $job = splice @SLOT_QUEUE, $_, 1, ();
351 $job->[2]->send;
352 Coro::cede;
353 goto next_job;
354 }
355 }
356 }
357
358 if (@SLOT_QUEUE) {
359 # we do not use wait_For_tick() as it returns immediately when tick is inactive
360 push @cf::WAIT_FOR_TICK, $signal;
361 $signal->wait;
362 } else {
363 Coro::schedule;
364 }
365 }
366};
367
368sub get_slot($;$) {
369 my ($time, $pri) = @_;
370
371 push @SLOT_QUEUE, [$time, $pri, my $sig = new Coro::Signal];
372 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
373 $SLOT_QUEUE->ready;
374 $sig->wait;
375}
376
311=item cf::async { BLOCK } 377=item cf::async { BLOCK }
312 378
313Currently the same as Coro::async_pool, meaning you cannot use 379Currently the same as Coro::async_pool, meaning you cannot use
314C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 380C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
315thing you are allowed to do is call C<prio> on it. 381thing you are allowed to do is call C<prio> on it.
318 384
319BEGIN { *async = \&Coro::async_pool } 385BEGIN { *async = \&Coro::async_pool }
320 386
321=item cf::sync_job { BLOCK } 387=item cf::sync_job { BLOCK }
322 388
323The design of crossfire+ requires that the main coro ($Coro::main) is 389The design of Crossfire TRT requires that the main coroutine ($Coro::main)
324always able to handle events or runnable, as crossfire+ is only partly 390is 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. 391partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
392acceptable.
326 393
327If it must be done, put the blocking parts into C<sync_job>. This will run 394If 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 395the given BLOCK in another coroutine while waiting for the result. The
329server will be frozen during this time, so the block should either finish 396server will be frozen during this time, so the block should either finish
330fast or be very important. 397fast or be very important.
390 $EXT_CORO{$coro+0} = $coro; 457 $EXT_CORO{$coro+0} = $coro;
391 458
392 $coro 459 $coro
393} 460}
394 461
395sub write_runtime { 462=item fork_call { }, $args
396 my $runtime = "$LOCALDIR/runtime";
397 463
398 # first touch the runtime file to show we are still running: 464Executes the given code block with the given arguments in a seperate
399 # the fsync below can take a very very long time. 465process, returning the results. Everything must be serialisable with
466Coro::Storable. May, of course, block. Note that the executed sub may
467never block itself or use any form of Event handling.
400 468
401 IO::AIO::aio_utime $runtime, undef, undef; 469=cut
402 470
403 my $guard = cf::lock_acquire "write_runtime"; 471sub _store_scalar {
404 472 open my $fh, ">", \my $buf
405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 473 or die "fork_call: cannot open fh-to-buf in child : $!";
406 or return; 474 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 475 close $fh;
423 or return;
424 476
425 aio_rename "$runtime~", $runtime 477 $buf
426 and return; 478}
427 479
428 warn "runtime file written.\n"; 480sub fork_call(&@) {
481 my ($cb, @args) = @_;
429 482
483# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
484# or die "socketpair: $!";
485 pipe my $fh1, my $fh2
486 or die "pipe: $!";
487
488 if (my $pid = fork) {
489 close $fh2;
490
491 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
492 warn "pst<$res>" unless $res =~ /^pst/;
493 $res = Coro::Storable::thaw $res;
494
495 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
496
497 Carp::confess $$res unless "ARRAY" eq ref $res;
498
499 return wantarray ? @$res : $res->[-1];
500 } else {
501 reset_signals;
502 local $SIG{__WARN__};
503 local $SIG{__DIE__};
504 # just in case, this hack effectively disables event
505 # in the child. cleaner and slower would be canceling all watchers,
506 # but this works for the time being.
507 local $Coro::idle;
508 $Coro::current->prio (Coro::PRIO_MAX);
509
510 eval {
511 close $fh1;
512
513 my @res = eval { $cb->(@args) };
514
515 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
516 close $fh2;
517 };
518
519 warn $@ if $@;
520 _exit 0;
430 1 521 }
522}
523
524=item $value = cf::db_get $family => $key
525
526Returns a single value from the environment database.
527
528=item cf::db_put $family => $key => $value
529
530Stores the given C<$value> in the family. It can currently store binary
531data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
532
533=cut
534
535our $DB;
536
537sub db_init {
538 unless ($DB) {
539 $DB = BDB::db_create $DB_ENV;
540
541 cf::sync_job {
542 eval {
543 $DB->set_flags (BDB::CHKSUM);
544
545 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
546 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
547 cf::cleanup "db_open(db): $!" if $!;
548 };
549 cf::cleanup "db_open(db): $@" if $@;
550 };
551 }
552}
553
554sub db_get($$) {
555 my $key = "$_[0]/$_[1]";
556
557 cf::sync_job {
558 BDB::db_get $DB, undef, $key, my $data;
559
560 $! ? ()
561 : $data
562 }
563}
564
565sub db_put($$$) {
566 BDB::dbreq_pri 4;
567 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
568}
569
570=item cf::cache $id => [$paths...], $processversion => $process
571
572Generic caching function that returns the value of the resource $id,
573caching and regenerating as required.
574
575This function can block.
576
577=cut
578
579sub cache {
580 my ($id, $src, $processversion, $process) = @_;
581
582 my $meta =
583 join "\x00",
584 $processversion,
585 map {
586 aio_stat $_
587 and Carp::croak "$_: $!";
588
589 ($_, (stat _)[7,9])
590 } @$src;
591
592 my $dbmeta = db_get cache => "$id/meta";
593 if ($dbmeta ne $meta) {
594 # changed, we may need to process
595
596 my @data;
597 my $md5;
598
599 for (0 .. $#$src) {
600 0 <= aio_load $src->[$_], $data[$_]
601 or Carp::croak "$src->[$_]: $!";
602 }
603
604 # if processing is expensive, check
605 # checksum first
606 if (1) {
607 $md5 =
608 join "\x00",
609 $processversion,
610 map {
611 Coro::cede;
612 ($src->[$_], Digest::MD5::md5_hex $data[$_])
613 } 0.. $#$src;
614
615
616 my $dbmd5 = db_get cache => "$id/md5";
617 if ($dbmd5 eq $md5) {
618 db_put cache => "$id/meta", $meta;
619
620 return db_get cache => "$id/data";
621 }
622 }
623
624 my $t1 = Time::HiRes::time;
625 my $data = $process->(\@data);
626 my $t2 = Time::HiRes::time;
627
628 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
629
630 db_put cache => "$id/data", $data;
631 db_put cache => "$id/md5" , $md5;
632 db_put cache => "$id/meta", $meta;
633
634 return $data;
635 }
636
637 db_get cache => "$id/data"
431} 638}
432 639
433=item cf::datalog type => key => value, ... 640=item cf::datalog type => key => value, ...
434 641
435Log a datalog packet of the given type with the given key-value pairs. 642Log 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") 660attach callbacks/event handlers (a collection of which is called an "attachment")
454to it. All such attachable objects support the following methods. 661to it. All such attachable objects support the following methods.
455 662
456In the following description, CLASS can be any of C<global>, C<object> 663In 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 664C<player>, C<client> or C<map> (i.e. the attachable objects in
458crossfire+). 665Crossfire TRT).
459 666
460=over 4 667=over 4
461 668
462=item $attachable->attach ($attachment, key => $value...) 669=item $attachable->attach ($attachment, key => $value...)
463 670
665 _attach $registry, $klass, @attach; 872 _attach $registry, $klass, @attach;
666 } 873 }
667 874
668 $obj->{$name} = \%arg; 875 $obj->{$name} = \%arg;
669 } else { 876 } else {
670 warn "object uses attachment '$name' that is not available, postponing.\n"; 877 warn "object uses attachment '$name' which is not available, postponing.\n";
671 } 878 }
672 879
673 $obj->{_attachment}{$name} = undef; 880 $obj->{_attachment}{$name} = undef;
674} 881}
675 882
715 "; 922 ";
716 die if $@; 923 die if $@;
717} 924}
718 925
719our $override; 926our $override;
720our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 927our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
721 928
722sub override { 929sub override {
723 $override = 1; 930 $override = 1;
724 @invoke_results = (); 931 @INVOKE_RESULTS = (@_);
725} 932}
726 933
727sub do_invoke { 934sub do_invoke {
728 my $event = shift; 935 my $event = shift;
729 my $callbacks = shift; 936 my $callbacks = shift;
730 937
731 @invoke_results = (); 938 @INVOKE_RESULTS = ();
732 939
733 local $override; 940 local $override;
734 941
735 for (@$callbacks) { 942 for (@$callbacks) {
736 eval { &{$_->[1]} }; 943 eval { &{$_->[1]} };
753 960
754Generate an object-specific event with the given arguments. 961Generate an object-specific event with the given arguments.
755 962
756This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 963This 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 964removed in future versions), and there is no public API to access override
758results (if you must, access C<@cf::invoke_results> directly). 965results (if you must, access C<@cf::INVOKE_RESULTS> directly).
759 966
760=back 967=back
761 968
762=cut 969=cut
763 970
764############################################################################# 971#############################################################################
765# object support 972# object support
973#
974
975sub _can_merge {
976 my ($ob1, $ob2) = @_;
977
978 local $Storable::canonical = 1;
979 my $fob1 = Storable::freeze $ob1;
980 my $fob2 = Storable::freeze $ob2;
981
982 $fob1 eq $fob2
983}
766 984
767sub reattach { 985sub reattach {
768 # basically do the same as instantiate, without calling instantiate 986 # basically do the same as instantiate, without calling instantiate
769 my ($obj) = @_; 987 my ($obj) = @_;
770 988
877 warn sprintf "loading %s (%d)\n", 1095 warn sprintf "loading %s (%d)\n",
878 $filename, length $data, scalar @{$av || []}; 1096 $filename, length $data, scalar @{$av || []};
879 return ($data, $av); 1097 return ($data, $av);
880} 1098}
881 1099
1100=head2 COMMAND CALLBACKS
1101
1102=over 4
1103
1104=cut
1105
882############################################################################# 1106#############################################################################
883# command handling &c 1107# command handling &c
884 1108
885=item cf::register_command $name => \&callback($ob,$args); 1109=item cf::register_command $name => \&callback($ob,$args);
886 1110
898 push @{ $COMMAND{$name} }, [$caller, $cb]; 1122 push @{ $COMMAND{$name} }, [$caller, $cb];
899} 1123}
900 1124
901=item cf::register_extcmd $name => \&callback($pl,$packet); 1125=item cf::register_extcmd $name => \&callback($pl,$packet);
902 1126
903Register a callbackf ro execution when the client sends an extcmd packet. 1127Register a callback for execution when the client sends an (synchronous)
1128extcmd packet. Ext commands will be processed in the order they are
1129received by the server, like other user commands. The first argument is
1130the logged-in player. Ext commands can only be processed after a player
1131has logged in successfully.
904 1132
905If the callback returns something, it is sent back as if reply was being 1133If the callback returns something, it is sent back as if reply was being
906called. 1134called.
907 1135
1136=item cf::register_exticmd $name => \&callback($ns,$packet);
1137
1138Register a callback for execution when the client sends an (asynchronous)
1139exticmd packet. Exti commands are processed by the server as soon as they
1140are received, i.e. out of order w.r.t. other commands. The first argument
1141is a client socket. Exti commands can be received anytime, even before
1142log-in.
1143
1144If the callback returns something, it is sent back as if reply was being
1145called.
1146
908=cut 1147=cut
909 1148
910sub register_extcmd { 1149sub register_extcmd {
911 my ($name, $cb) = @_; 1150 my ($name, $cb) = @_;
912 1151
913 $EXTCMD{$name} = $cb; 1152 $EXTCMD{$name} = $cb;
1153}
1154
1155sub register_exticmd {
1156 my ($name, $cb) = @_;
1157
1158 $EXTICMD{$name} = $cb;
914} 1159}
915 1160
916cf::player->attach ( 1161cf::player->attach (
917 on_command => sub { 1162 on_command => sub {
918 my ($pl, $name, $params) = @_; 1163 my ($pl, $name, $params) = @_;
927 cf::override; 1172 cf::override;
928 }, 1173 },
929 on_extcmd => sub { 1174 on_extcmd => sub {
930 my ($pl, $buf) = @_; 1175 my ($pl, $buf) = @_;
931 1176
932 my $msg = eval { from_json $buf }; 1177 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
933 1178
934 if (ref $msg) { 1179 if (ref $msg) {
935 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1180 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
936 if (my %reply = $cb->($pl, $msg)) { 1181 if (my %reply = $cb->($pl, $msg)) {
937 $pl->ext_reply ($msg->{msgid}, %reply); 1182 $pl->ext_reply ($msg->{msgid}, %reply);
967 path => $path, 1212 path => $path,
968 base => $base, 1213 base => $base,
969 pkg => $pkg, 1214 pkg => $pkg,
970 ); 1215 );
971 1216
972 $ext{meta} = { map { split /=/, $_, 2 } split /\s+/, $1 } 1217 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
973 if $source =~ /^#!.*?perl.*?#\s*(.*)$/; 1218 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
974 1219
975 $ext{source} = 1220 $ext{source} =
976 "package $pkg; use strict; use utf8;\n" 1221 "package $pkg; use strict; use utf8;\n"
977 . "#line 1 \"$path\"\n{\n" 1222 . "#line 1 \"$path\"\n{\n"
978 . $source 1223 . $source
984 my %done; 1229 my %done;
985 while (%todo) { 1230 while (%todo) {
986 my $progress; 1231 my $progress;
987 1232
988 while (my ($k, $v) = each %todo) { 1233 while (my ($k, $v) = each %todo) {
989 for (split /,\s*/, $ext{meta}{depends}) { 1234 for (split /,\s*/, $v->{meta}{depends}) {
990 goto skip 1235 goto skip
991 unless exists $done{$_}; 1236 unless exists $done{$_};
992 } 1237 }
993 1238
994 warn "... loading '$k' into '$v->{pkg}'\n"; 1239 warn "... loading '$k' into '$v->{pkg}'\n";
995 1240
996 unless (eval $v->{source}) { 1241 unless (eval $v->{source}) {
997 my $msg = $@ ? "$v->{path}: $@\n" 1242 my $msg = $@ ? "$v->{path}: $@\n"
998 : "extension disabled.\n"; 1243 : "$v->{base}: extension inactive.\n";
999 1244
1000 if (exists $v->{meta}{mandatory}) { 1245 if (exists $v->{meta}{mandatory}) {
1001 warn $msg; 1246 warn $msg;
1002 warn "mandatory extension failed to load, exiting.\n"; 1247 warn "mandatory extension failed to load, exiting.\n";
1003 exit 1; 1248 exit 1;
1004 } 1249 }
1005 1250
1006 die $msg; 1251 warn $msg;
1007 } 1252 }
1008 1253
1009 $done{$k} = delete $todo{$k}; 1254 $done{$k} = delete $todo{$k};
1010 push @EXTS, $v->{pkg}; 1255 push @EXTS, $v->{pkg};
1256 $progress = 1;
1011 } 1257 }
1012 1258
1013 skip: 1259 skip:
1014 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1260 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1015 unless $progress; 1261 unless $progress;
1016 } 1262 }
1017 }; 1263 };
1018} 1264}
1019 1265
1020############################################################################# 1266#############################################################################
1267
1268=back
1021 1269
1022=head2 CORE EXTENSIONS 1270=head2 CORE EXTENSIONS
1023 1271
1024Functions and methods that extend core crossfire objects. 1272Functions and methods that extend core crossfire objects.
1025 1273
1213 } 1461 }
1214 1462
1215 \@paths 1463 \@paths
1216} 1464}
1217 1465
1466=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1467
1468Expand crossfire pod fragments into protocol xml.
1469
1470=cut
1471
1472sub expand_cfpod {
1473 ((my $self), (local $_)) = @_;
1474
1475 # escape & and <
1476 s/&/&amp;/g;
1477 s/(?<![BIUGH])</&lt;/g;
1478
1479 # this is buggy, it needs to properly take care of nested <'s
1480
1481 1 while
1482 # replace B<>, I<>, U<> etc.
1483 s/B<([^\>]*)>/<b>$1<\/b>/
1484 || s/I<([^\>]*)>/<i>$1<\/i>/
1485 || s/U<([^\>]*)>/<u>$1<\/u>/
1486 # replace G<male|female> tags
1487 || s{G<([^>|]*)\|([^>]*)>}{
1488 $self->gender ? $2 : $1
1489 }ge
1490 # replace H<hint text>
1491 || s{H<([^\>]*)>}
1492 {
1493 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1494 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1495 "")
1496 [$self->{hintmode}]
1497 }ge;
1498
1499 # create single paragraphs (very hackish)
1500 s/(?<=\S)\n(?=\w)/ /g;
1501
1502 # compress some whitespace
1503 s/\s+\n/\n/g; # ws line-ends
1504 s/\n\n+/\n/g; # double lines
1505 s/^\n+//; # beginning lines
1506 s/\n+$//; # ending lines
1507
1508 $_
1509}
1510
1511sub hintmode {
1512 $_[0]{hintmode} = $_[1] if @_ > 1;
1513 $_[0]{hintmode}
1514}
1515
1218=item $player->ext_reply ($msgid, %msg) 1516=item $player->ext_reply ($msgid, %msg)
1219 1517
1220Sends an ext reply to the player. 1518Sends an ext reply to the player.
1221 1519
1222=cut 1520=cut
1223 1521
1224sub ext_reply($$%) { 1522sub ext_reply($$%) {
1225 my ($self, $id, %msg) = @_; 1523 my ($self, $id, %msg) = @_;
1226 1524
1227 $msg{msgid} = $id; 1525 $msg{msgid} = $id;
1228 1526 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1229 $self->send ("ext " . cf::to_json \%msg);
1230} 1527}
1231 1528
1232=item $player->ext_event ($type, %msg) 1529=item $player->ext_event ($type, %msg)
1233 1530
1234Sends an ext event to the client. 1531Sends an ext event to the client.
1249 1546
1250package cf::region; 1547package cf::region;
1251 1548
1252=item cf::region::find_by_path $path 1549=item cf::region::find_by_path $path
1253 1550
1254Tries to decuce the probable region for a map knowing only its path. 1551Tries to decuce the likely region for a map knowing only its path.
1255 1552
1256=cut 1553=cut
1257 1554
1258sub find_by_path($) { 1555sub find_by_path($) {
1259 my ($path) = @_; 1556 my ($path) = @_;
1260 1557
1261 my ($match, $specificity); 1558 my ($match, $specificity);
1262 1559
1263 for my $region (list) { 1560 for my $region (list) {
1264 if ($region->match && $path =~ $region->match) { 1561 if ($region->{match} && $path =~ $region->{match}) {
1265 ($match, $specificity) = ($region, $region->specificity) 1562 ($match, $specificity) = ($region, $region->specificity)
1266 if $region->specificity > $specificity; 1563 if $region->specificity > $specificity;
1267 } 1564 }
1268 } 1565 }
1269 1566
1389 $self->init; # pass $1 etc. 1686 $self->init; # pass $1 etc.
1390 return $self; 1687 return $self;
1391 } 1688 }
1392 } 1689 }
1393 1690
1394 Carp::carp "unable to resolve path '$path' (base '$base')."; 1691 Carp::cluck "unable to resolve path '$path' (base '$base').";
1395 () 1692 ()
1396} 1693}
1397 1694
1398sub init { 1695sub init {
1399 my ($self) = @_; 1696 my ($self) = @_;
1677 1974
1678 undef $MAP_PREFETCH{$path}; 1975 undef $MAP_PREFETCH{$path};
1679 $MAP_PREFETCHER ||= cf::async { 1976 $MAP_PREFETCHER ||= cf::async {
1680 while (%MAP_PREFETCH) { 1977 while (%MAP_PREFETCH) {
1681 for my $path (keys %MAP_PREFETCH) { 1978 for my $path (keys %MAP_PREFETCH) {
1682 my $map = find $path 1979 if (my $map = find $path) {
1683 or next;
1684 $map->load; 1980 $map->load;
1981 }
1685 1982
1686 delete $MAP_PREFETCH{$path}; 1983 delete $MAP_PREFETCH{$path};
1687 } 1984 }
1688 } 1985 }
1689 undef $MAP_PREFETCHER; 1986 undef $MAP_PREFETCHER;
1911 2208
1912 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2209 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1913 2210
1914 if ($self->{record_replies}) { 2211 if ($self->{record_replies}) {
1915 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2212 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2213
1916 } else { 2214 } else {
2215 my $pl = $self->contr;
2216
2217 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2218 my $diag = $pl->{npc_dialog};
2219 $diag->{pl}->ext_reply (
2220 $diag->{id},
2221 msgtype => "reply",
2222 msg => $diag->{pl}->expand_cfpod ($msg),
2223 add_topics => []
2224 );
2225
2226 } else {
1917 $msg = $npc->name . " says: $msg" if $npc; 2227 $msg = $npc->name . " says: $msg" if $npc;
1918 $self->message ($msg, $flags); 2228 $self->message ($msg, $flags);
2229 }
1919 } 2230 }
1920} 2231}
1921 2232
1922=item $player_object->may ("access") 2233=item $player_object->may ("access")
1923 2234
2012 2323
2013 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2324 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2014 $self->enter_map ($map, $x, $y); 2325 $self->enter_map ($map, $x, $y);
2015} 2326}
2016 2327
2017=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2328=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2018 2329
2019Moves the player to the given map-path and coordinates by first freezing 2330Moves the player to the given map-path and coordinates by first freezing
2020her, loading and preparing them map, calling the provided $check callback 2331her, loading and preparing them map, calling the provided $check callback
2021that has to return the map if sucecssful, and then unfreezes the player on 2332that has to return the map if sucecssful, and then unfreezes the player on
2022the new (success) or old (failed) map position. 2333the new (success) or old (failed) map position. In either case, $done will
2334be called at the end of this process.
2023 2335
2024=cut 2336=cut
2025 2337
2026our $GOTOGEN; 2338our $GOTOGEN;
2027 2339
2028sub cf::object::player::goto { 2340sub cf::object::player::goto {
2029 my ($self, $path, $x, $y, $check) = @_; 2341 my ($self, $path, $x, $y, $check, $done) = @_;
2030 2342
2031 # do generation counting so two concurrent goto's will be executed in-order 2343 # do generation counting so two concurrent goto's will be executed in-order
2032 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2344 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2033 2345
2034 $self->enter_link; 2346 $self->enter_link;
2054 2366
2055 if ($gen == $self->{_goto_generation}) { 2367 if ($gen == $self->{_goto_generation}) {
2056 delete $self->{_goto_generation}; 2368 delete $self->{_goto_generation};
2057 $self->leave_link ($map, $x, $y); 2369 $self->leave_link ($map, $x, $y);
2058 } 2370 }
2371
2372 $done->() if $done;
2059 })->prio (1); 2373 })->prio (1);
2060} 2374}
2061 2375
2062=item $player_object->enter_exit ($exit_object) 2376=item $player_object->enter_exit ($exit_object)
2063 2377
2132 my $hp = $exit->stats->hp; 2446 my $hp = $exit->stats->hp;
2133 my $sp = $exit->stats->sp; 2447 my $sp = $exit->stats->sp;
2134 2448
2135 $self->enter_link; 2449 $self->enter_link;
2136 2450
2451 # if exit is damned, update players death & WoR home-position
2452 $self->contr->savebed ($slaying, $hp, $sp)
2453 if $exit->flag (FLAG_DAMNED);
2454
2137 (async { 2455 (async {
2138 $self->deactivate_recursive; # just to be sure 2456 $self->deactivate_recursive; # just to be sure
2139 unless (eval { 2457 unless (eval {
2140 $self->goto ($slaying, $hp, $sp); 2458 $self->goto ($slaying, $hp, $sp);
2141 2459
2168 2486
2169 utf8::encode $text; 2487 utf8::encode $text;
2170 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2488 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2171} 2489}
2172 2490
2491=item $client->send_msg ($channel, $msg, $color, [extra...])
2492
2493Send a drawinfo or msg packet to the client, formatting the msg for the
2494client if neccessary. C<$type> should be a string identifying the type of
2495the message, with C<log> being the default. If C<$color> is negative, suppress
2496the message unless the client supports the msg packet.
2497
2498=cut
2499
2500sub cf::client::send_msg {
2501 my ($self, $channel, $msg, $color, @extra) = @_;
2502
2503 $msg = $self->pl->expand_cfpod ($msg);
2504
2505 $color &= ~cf::NDI_UNIQUE; # just in case...
2506
2507 if (ref $channel) {
2508 # send meta info to client, if not yet sent
2509 unless (exists $self->{channel}{$channel->{id}}) {
2510 $self->{channel}{$channel->{id}} = $channel;
2511 $self->ext_event (channel_info => %$channel);
2512 }
2513
2514 $channel = $channel->{id};
2515 }
2516
2517 return unless @extra || length $msg;
2518
2519 if ($self->can_msg) {
2520 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra]));
2521 } else {
2522 # replace some tags by gcfclient-compatible ones
2523 for ($msg) {
2524 1 while
2525 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2526 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2527 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2528 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2529 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2530 }
2531
2532 if ($color >= 0) {
2533 if (0 && $msg =~ /\[/) {
2534 $self->send_packet ("drawextinfo $color 4 0 $msg")
2535 } else {
2536 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2537 $self->send_packet ("drawinfo $color $msg")
2538 }
2539 }
2540 }
2541}
2542
2173=item $client->ext_event ($type, %msg) 2543=item $client->ext_event ($type, %msg)
2174 2544
2175Sends an exti event to the client. 2545Sends an ext event to the client.
2176 2546
2177=cut 2547=cut
2178 2548
2179sub cf::client::ext_event($$%) { 2549sub cf::client::ext_event($$%) {
2180 my ($self, $type, %msg) = @_; 2550 my ($self, $type, %msg) = @_;
2181 2551
2552 return unless $self->extcmd;
2553
2182 $msg{msgtype} = "event_$type"; 2554 $msg{msgtype} = "event_$type";
2183 $self->send_packet ("ext " . cf::to_json \%msg); 2555 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2184} 2556}
2185 2557
2186=item $success = $client->query ($flags, "text", \&cb) 2558=item $success = $client->query ($flags, "text", \&cb)
2187 2559
2188Queues a query to the client, calling the given callback with 2560Queues a query to the client, calling the given callback with
2189the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2561the 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>. 2562C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2191 2563
2192Queries can fail, so check the return code. Or don't, as queries will become 2564Queries can fail, so check the return code. Or don't, as queries will
2193reliable at some point in the future. 2565become reliable at some point in the future.
2194 2566
2195=cut 2567=cut
2196 2568
2197sub cf::client::query { 2569sub cf::client::query {
2198 my ($self, $flags, $text, $cb) = @_; 2570 my ($self, $flags, $text, $cb) = @_;
2206 utf8::encode $text; 2578 utf8::encode $text;
2207 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2579 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2208 2580
2209 $self->send_packet ($self->{query_queue}[0][0]) 2581 $self->send_packet ($self->{query_queue}[0][0])
2210 if @{ $self->{query_queue} } == 1; 2582 if @{ $self->{query_queue} } == 1;
2583
2584 1
2211} 2585}
2212 2586
2213cf::client->attach ( 2587cf::client->attach (
2588 on_connect => sub {
2589 my ($ns) = @_;
2590
2591 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2592 },
2214 on_reply => sub { 2593 on_reply => sub {
2215 my ($ns, $msg) = @_; 2594 my ($ns, $msg) = @_;
2216 2595
2217 # this weird shuffling is so that direct followup queries 2596 # this weird shuffling is so that direct followup queries
2218 # get handled first 2597 # get handled first
2230 } else { 2609 } else {
2231 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2610 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2232 } 2611 }
2233 } 2612 }
2234 }, 2613 },
2614 on_exticmd => sub {
2615 my ($ns, $buf) = @_;
2616
2617 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2618
2619 if (ref $msg) {
2620 if (my $cb = $EXTICMD{$msg->{msgtype}}) {
2621 if (my %reply = $cb->($ns, $msg)) {
2622 $reply{msgid} = $msg->{msgid};
2623 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2624 }
2625 }
2626 } else {
2627 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2628 }
2629
2630 cf::override;
2631 },
2235); 2632);
2236 2633
2237=item $client->async (\&cb) 2634=item $client->async (\&cb)
2238 2635
2239Create a new coroutine, running the specified callback. The coroutine will 2636Create a new coroutine, running the specified callback. The coroutine will
2288 2685
2289=pod 2686=pod
2290 2687
2291The following functions and methods are available within a safe environment: 2688The following functions and methods are available within a safe environment:
2292 2689
2293 cf::object contr pay_amount pay_player map 2690 cf::object
2691 contr pay_amount pay_player map x y force_find force_add
2692 insert remove
2693
2294 cf::object::player player 2694 cf::object::player
2295 cf::player peaceful 2695 player
2296 cf::map trigger 2696
2697 cf::player
2698 peaceful
2699
2700 cf::map
2701 trigger
2297 2702
2298=cut 2703=cut
2299 2704
2300for ( 2705for (
2301 ["cf::object" => qw(contr pay_amount pay_player map)], 2706 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2707 insert remove)],
2302 ["cf::object::player" => qw(player)], 2708 ["cf::object::player" => qw(player)],
2303 ["cf::player" => qw(peaceful)], 2709 ["cf::player" => qw(peaceful)],
2304 ["cf::map" => qw(trigger)], 2710 ["cf::map" => qw(trigger)],
2305) { 2711) {
2306 no strict 'refs'; 2712 no strict 'refs';
2377=back 2783=back
2378 2784
2379=cut 2785=cut
2380 2786
2381############################################################################# 2787#############################################################################
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 2788# the server's init and main functions
2555 2789
2556sub load_facedata($) { 2790sub load_facedata($) {
2557 my ($path) = @_; 2791 my ($path) = @_;
2558 2792
2570 { 2804 {
2571 my $faces = $facedata->{faceinfo}; 2805 my $faces = $facedata->{faceinfo};
2572 2806
2573 while (my ($face, $info) = each %$faces) { 2807 while (my ($face, $info) = each %$faces) {
2574 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2808 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2575 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2809 cf::face::set_visibility $idx, $info->{visibility};
2810 cf::face::set_magicmap $idx, $info->{magicmap};
2576 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2811 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2577 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2812 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2578 Coro::cede; 2813
2814 cf::cede_to_tick;
2579 } 2815 }
2580 2816
2581 while (my ($face, $info) = each %$faces) { 2817 while (my ($face, $info) = each %$faces) {
2582 next unless $info->{smooth}; 2818 next unless $info->{smooth};
2583 my $idx = cf::face::find $face 2819 my $idx = cf::face::find $face
2584 or next; 2820 or next;
2585 if (my $smooth = cf::face::find $info->{smooth}) { 2821 if (my $smooth = cf::face::find $info->{smooth}) {
2822 cf::face::set_smooth $idx, $smooth;
2586 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2823 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2587 } else { 2824 } else {
2588 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2825 warn "smooth face '$info->{smooth}' not found for face '$face'";
2589 } 2826 }
2590 Coro::cede; 2827
2828 cf::cede_to_tick;
2591 } 2829 }
2592 } 2830 }
2593 2831
2594 { 2832 {
2595 my $anims = $facedata->{animinfo}; 2833 my $anims = $facedata->{animinfo};
2596 2834
2597 while (my ($anim, $info) = each %$anims) { 2835 while (my ($anim, $info) = each %$anims) {
2598 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2836 cf::anim::set $anim, $info->{frames}, $info->{facings};
2599 Coro::cede; 2837 cf::cede_to_tick;
2600 } 2838 }
2601 2839
2602 cf::anim::invalidate_all; # d'oh 2840 cf::anim::invalidate_all; # d'oh
2841 }
2842
2843 {
2844 # TODO: for gcfclient pleasure, we should give resources
2845 # that gcfclient doesn't grok a >10000 face index.
2846 my $res = $facedata->{resource};
2847 my $enc = JSON::XS->new->utf8->canonical;
2848
2849 while (my ($name, $info) = each %$res) {
2850 my $meta = $enc->encode ({
2851 name => $name,
2852 type => $info->{type},
2853 copyright => $info->{copyright}, #TODO#
2854 });
2855
2856 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2857
2858 if ($name =~ /\.jpg$/) {
2859 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack
2860 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack
2861 } else {
2862 my $data = pack "(w/a*)*", $meta, $info->{data};
2863 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2864
2865 cf::face::set_type $idx, 1;
2866 cf::face::set_data $idx, 0, $data, $chk;
2867 }
2868
2869 cf::cede_to_tick;
2870 }
2603 } 2871 }
2604 2872
2605 1 2873 1
2606} 2874}
2607 2875
2608sub reload_regions { 2876sub reload_regions {
2609 load_resource_file "$MAPDIR/regions" 2877 load_resource_file "$MAPDIR/regions"
2610 or die "unable to load regions file\n"; 2878 or die "unable to load regions file\n";
2879
2880 for (cf::region::list) {
2881 $_->{match} = qr/$_->{match}/
2882 if exists $_->{match};
2883 }
2611} 2884}
2612 2885
2613sub reload_facedata { 2886sub reload_facedata {
2614 load_facedata "$DATADIR/facedata" 2887 load_facedata "$DATADIR/facedata"
2615 or die "unable to load facedata\n"; 2888 or die "unable to load facedata\n";
2616} 2889}
2617 2890
2618sub reload_archetypes { 2891sub reload_archetypes {
2892 load_resource_file "$DATADIR/archetypes"
2893 or die "unable to load archetypes\n";
2894 #d# NEED to laod twice to resolve forward references
2895 # this really needs to be done in an extra post-pass
2896 # (which needs to be synchronous, so solve it differently)
2619 load_resource_file "$DATADIR/archetypes" 2897 load_resource_file "$DATADIR/archetypes"
2620 or die "unable to load archetypes\n"; 2898 or die "unable to load archetypes\n";
2621} 2899}
2622 2900
2623sub reload_treasures { 2901sub reload_treasures {
2695 }, 2973 },
2696 ); 2974 );
2697 } 2975 }
2698} 2976}
2699 2977
2978sub write_runtime {
2979 my $runtime = "$LOCALDIR/runtime";
2980
2981 # first touch the runtime file to show we are still running:
2982 # the fsync below can take a very very long time.
2983
2984 IO::AIO::aio_utime $runtime, undef, undef;
2985
2986 my $guard = cf::lock_acquire "write_runtime";
2987
2988 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
2989 or return;
2990
2991 my $value = $cf::RUNTIME + 90 + 10;
2992 # 10 is the runtime save interval, for a monotonic clock
2993 # 60 allows for the watchdog to kill the server.
2994
2995 (aio_write $fh, 0, (length $value), $value, 0) <= 0
2996 and return;
2997
2998 # always fsync - this file is important
2999 aio_fsync $fh
3000 and return;
3001
3002 # touch it again to show we are up-to-date
3003 aio_utime $fh, undef, undef;
3004
3005 close $fh
3006 or return;
3007
3008 aio_rename "$runtime~", $runtime
3009 and return;
3010
3011 warn "runtime file written.\n";
3012
3013 1
3014}
3015
2700sub emergency_save() { 3016sub emergency_save() {
2701 my $freeze_guard = cf::freeze_mainloop; 3017 my $freeze_guard = cf::freeze_mainloop;
2702 3018
2703 warn "enter emergency perl save\n"; 3019 warn "enter emergency perl save\n";
2704 3020
2779 %EXT_CORO = (); 3095 %EXT_CORO = ();
2780 3096
2781 warn "removing commands"; 3097 warn "removing commands";
2782 %COMMAND = (); 3098 %COMMAND = ();
2783 3099
2784 warn "removing ext commands"; 3100 warn "removing ext/exti commands";
2785 %EXTCMD = (); 3101 %EXTCMD = ();
3102 %EXTICMD = ();
2786 3103
2787 warn "unloading/nuking all extensions"; 3104 warn "unloading/nuking all extensions";
2788 for my $pkg (@EXTS) { 3105 for my $pkg (@EXTS) {
2789 warn "... unloading $pkg"; 3106 warn "... unloading $pkg";
2790 3107

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines