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.267 by root, Sat May 19 00:08:11 2007 UTC vs.
Revision 1.313 by root, Sun Jul 22 14:17:58 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 {
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
191@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 200@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
201@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
192@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 202@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
193 203
194# we bless all objects into (empty) derived classes to force a method lookup 204# we bless all objects into (empty) derived classes to force a method lookup
195# within the Safe compartment. 205# within the Safe compartment.
196for my $pkg (qw( 206for my $pkg (qw(
197 cf::global cf::attachable 207 cf::global cf::attachable
205} 215}
206 216
207$Event::DIED = sub { 217$Event::DIED = sub {
208 warn "error in event callback: @_"; 218 warn "error in event callback: @_";
209}; 219};
220
221#############################################################################
210 222
211=head2 UTILITY FUNCTIONS 223=head2 UTILITY FUNCTIONS
212 224
213=over 4 225=over 4
214 226
233 $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;
234 $d 246 $d
235 } || "[unable to dump $_[0]: '$@']"; 247 } || "[unable to dump $_[0]: '$@']";
236} 248}
237 249
238use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
239
240=item $ref = cf::from_json $json 250=item $ref = cf::from_json $json
241 251
242Converts a JSON string into the corresponding perl data structure. 252Converts a JSON string into the corresponding perl data structure.
243 253
244=item $json = cf::to_json $ref 254=item $json = cf::to_json $ref
245 255
246Converts 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]) }
247 264
248=item cf::lock_wait $string 265=item cf::lock_wait $string
249 266
250Wait until the given lock is available. See cf::lock_acquire. 267Wait until the given lock is available. See cf::lock_acquire.
251 268
317 334
318BEGIN { *async = \&Coro::async_pool } 335BEGIN { *async = \&Coro::async_pool }
319 336
320=item cf::sync_job { BLOCK } 337=item cf::sync_job { BLOCK }
321 338
322The design of crossfire+ requires that the main coro ($Coro::main) is 339The design of Crossfire TRT requires that the main coroutine ($Coro::main)
323always able to handle events or runnable, as crossfire+ is only partly 340is always able to handle events or runnable, as Crossfire TRT is only
324reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 341partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
342acceptable.
325 343
326If it must be done, put the blocking parts into C<sync_job>. This will run 344If it must be done, put the blocking parts into C<sync_job>. This will run
327the given BLOCK in another coroutine while waiting for the result. The 345the given BLOCK in another coroutine while waiting for the result. The
328server will be frozen during this time, so the block should either finish 346server will be frozen during this time, so the block should either finish
329fast or be very important. 347fast or be very important.
389 $EXT_CORO{$coro+0} = $coro; 407 $EXT_CORO{$coro+0} = $coro;
390 408
391 $coro 409 $coro
392} 410}
393 411
394sub write_runtime { 412=item fork_call { }, $args
395 my $runtime = "$LOCALDIR/runtime";
396 413
397 # first touch the runtime file to show we are still running: 414Executes the given code block with the given arguments in a seperate
398 # the fsync below can take a very very long time. 415process, returning the results. Everything must be serialisable with
416Coro::Storable. May, of course, block. Note that the executed sub may
417never block itself or use any form of Event handling.
399 418
400 if (my $fh = aio_open $runtime, O_WRONLY, 0) { 419=cut
401 utime undef, undef, $fh;
402 }
403 420
404 my $guard = cf::lock_acquire "write_runtime"; 421sub _store_scalar {
405 422 open my $fh, ">", \my $buf
406 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 423 or die "fork_call: cannot open fh-to-buf in child : $!";
407 or return; 424 Storable::store_fd $_[0], $fh;
408
409 my $value = $cf::RUNTIME + 90 + 10;
410 # 10 is the runtime save interval, for a monotonic clock
411 # 60 allows for the watchdog to kill the server.
412
413 (aio_write $fh, 0, (length $value), $value, 0) <= 0
414 and return;
415
416 # always fsync - this file is important
417 aio_fsync $fh
418 and return;
419
420 # touch it again to show we are up-to-date
421 utime undef, undef, $fh;
422
423 close $fh 425 close $fh;
424 or return;
425 426
426 aio_rename "$runtime~", $runtime 427 $buf
427 and return; 428}
428 429
429 warn "runtime file written.\n";#d# 430sub fork_call(&@) {
431 my ($cb, @args) = @_;
430 432
433# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
434# or die "socketpair: $!";
435 pipe my $fh1, my $fh2
436 or die "pipe: $!";
437
438 if (my $pid = fork) {
439 close $fh2;
440
441 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
442 warn "pst<$res>" unless $res =~ /^pst/;
443 $res = Coro::Storable::thaw $res;
444
445 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
446
447 Carp::confess $$res unless "ARRAY" eq ref $res;
448
449 return wantarray ? @$res : $res->[-1];
450 } else {
451 reset_signals;
452 local $SIG{__WARN__};
453 local $SIG{__DIE__};
454 # just in case, this hack effectively disables event
455 # in the child. cleaner and slower would be canceling all watchers,
456 # but this works for the time being.
457 local $Coro::idle;
458 $Coro::current->prio (Coro::PRIO_MAX);
459
460 eval {
461 close $fh1;
462
463 my @res = eval { $cb->(@args) };
464
465 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
466 close $fh2;
467 };
468
469 warn $@ if $@;
470 _exit 0;
431 1 471 }
472}
473
474=item $value = cf::db_get $family => $key
475
476Returns a single value from the environment database.
477
478=item cf::db_put $family => $key => $value
479
480Stores the given C<$value> in the family. It can currently store binary
481data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
482
483=cut
484
485our $DB;
486
487sub db_init {
488 unless ($DB) {
489 $DB = BDB::db_create $DB_ENV;
490
491 cf::sync_job {
492 eval {
493 $DB->set_flags (BDB::CHKSUM);
494
495 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
496 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
497 cf::cleanup "db_open(db): $!" if $!;
498 };
499 cf::cleanup "db_open(db): $@" if $@;
500 };
501 }
502}
503
504sub db_get($$) {
505 my $key = "$_[0]/$_[1]";
506
507 cf::sync_job {
508 BDB::db_get $DB, undef, $key, my $data;
509
510 $! ? ()
511 : $data
512 }
513}
514
515sub db_put($$$) {
516 BDB::dbreq_pri 4;
517 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
518}
519
520=item cf::cache $id => [$paths...], $processversion => $process
521
522Generic caching function that returns the value of the resource $id,
523caching and regenerating as required.
524
525This function can block.
526
527=cut
528
529sub cache {
530 my ($id, $src, $processversion, $process) = @_;
531
532 my $meta =
533 join "\x00",
534 $processversion,
535 map {
536 aio_stat $_
537 and Carp::croak "$_: $!";
538
539 ($_, (stat _)[7,9])
540 } @$src;
541
542 my $dbmeta = db_get cache => "$id/meta";
543 if ($dbmeta ne $meta) {
544 # changed, we may need to process
545
546 my @data;
547 my $md5;
548
549 for (0 .. $#$src) {
550 0 <= aio_load $src->[$_], $data[$_]
551 or Carp::croak "$src->[$_]: $!";
552 }
553
554 # if processing is expensive, check
555 # checksum first
556 if (1) {
557 $md5 =
558 join "\x00",
559 $processversion,
560 map {
561 Coro::cede;
562 ($src->[$_], Digest::MD5::md5_hex $data[$_])
563 } 0.. $#$src;
564
565
566 my $dbmd5 = db_get cache => "$id/md5";
567 if ($dbmd5 eq $md5) {
568 db_put cache => "$id/meta", $meta;
569
570 return db_get cache => "$id/data";
571 }
572 }
573
574 my $t1 = Time::HiRes::time;
575 my $data = $process->(\@data);
576 my $t2 = Time::HiRes::time;
577
578 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
579
580 db_put cache => "$id/data", $data;
581 db_put cache => "$id/md5" , $md5;
582 db_put cache => "$id/meta", $meta;
583
584 return $data;
585 }
586
587 db_get cache => "$id/data"
432} 588}
433 589
434=item cf::datalog type => key => value, ... 590=item cf::datalog type => key => value, ...
435 591
436Log a datalog packet of the given type with the given key-value pairs. 592Log a datalog packet of the given type with the given key-value pairs.
454attach callbacks/event handlers (a collection of which is called an "attachment") 610attach callbacks/event handlers (a collection of which is called an "attachment")
455to it. All such attachable objects support the following methods. 611to it. All such attachable objects support the following methods.
456 612
457In the following description, CLASS can be any of C<global>, C<object> 613In the following description, CLASS can be any of C<global>, C<object>
458C<player>, C<client> or C<map> (i.e. the attachable objects in 614C<player>, C<client> or C<map> (i.e. the attachable objects in
459crossfire+). 615Crossfire TRT).
460 616
461=over 4 617=over 4
462 618
463=item $attachable->attach ($attachment, key => $value...) 619=item $attachable->attach ($attachment, key => $value...)
464 620
666 _attach $registry, $klass, @attach; 822 _attach $registry, $klass, @attach;
667 } 823 }
668 824
669 $obj->{$name} = \%arg; 825 $obj->{$name} = \%arg;
670 } else { 826 } else {
671 warn "object uses attachment '$name' that is not available, postponing.\n"; 827 warn "object uses attachment '$name' which is not available, postponing.\n";
672 } 828 }
673 829
674 $obj->{_attachment}{$name} = undef; 830 $obj->{_attachment}{$name} = undef;
675} 831}
676 832
716 "; 872 ";
717 die if $@; 873 die if $@;
718} 874}
719 875
720our $override; 876our $override;
721our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 877our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
722 878
723sub override { 879sub override {
724 $override = 1; 880 $override = 1;
725 @invoke_results = (); 881 @INVOKE_RESULTS = (@_);
726} 882}
727 883
728sub do_invoke { 884sub do_invoke {
729 my $event = shift; 885 my $event = shift;
730 my $callbacks = shift; 886 my $callbacks = shift;
731 887
732 @invoke_results = (); 888 @INVOKE_RESULTS = ();
733 889
734 local $override; 890 local $override;
735 891
736 for (@$callbacks) { 892 for (@$callbacks) {
737 eval { &{$_->[1]} }; 893 eval { &{$_->[1]} };
754 910
755Generate an object-specific event with the given arguments. 911Generate an object-specific event with the given arguments.
756 912
757This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 913This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
758removed in future versions), and there is no public API to access override 914removed in future versions), and there is no public API to access override
759results (if you must, access C<@cf::invoke_results> directly). 915results (if you must, access C<@cf::INVOKE_RESULTS> directly).
760 916
761=back 917=back
762 918
763=cut 919=cut
764 920
765############################################################################# 921#############################################################################
766# object support 922# object support
923#
924
925sub _can_merge {
926 my ($ob1, $ob2) = @_;
927
928 local $Storable::canonical = 1;
929 my $fob1 = Storable::freeze $ob1;
930 my $fob2 = Storable::freeze $ob2;
931
932 $fob1 eq $fob2
933}
767 934
768sub reattach { 935sub reattach {
769 # basically do the same as instantiate, without calling instantiate 936 # basically do the same as instantiate, without calling instantiate
770 my ($obj) = @_; 937 my ($obj) = @_;
771 938
874 or return; 1041 or return;
875 $av = eval { (Storable::thaw $av)->{objs} }; 1042 $av = eval { (Storable::thaw $av)->{objs} };
876 } 1043 }
877 1044
878 warn sprintf "loading %s (%d)\n", 1045 warn sprintf "loading %s (%d)\n",
879 $filename, length $data, scalar @{$av || []};#d# 1046 $filename, length $data, scalar @{$av || []};
880 return ($data, $av); 1047 return ($data, $av);
881} 1048}
1049
1050=head2 COMMAND CALLBACKS
1051
1052=over 4
1053
1054=cut
882 1055
883############################################################################# 1056#############################################################################
884# command handling &c 1057# command handling &c
885 1058
886=item cf::register_command $name => \&callback($ob,$args); 1059=item cf::register_command $name => \&callback($ob,$args);
899 push @{ $COMMAND{$name} }, [$caller, $cb]; 1072 push @{ $COMMAND{$name} }, [$caller, $cb];
900} 1073}
901 1074
902=item cf::register_extcmd $name => \&callback($pl,$packet); 1075=item cf::register_extcmd $name => \&callback($pl,$packet);
903 1076
904Register a callbackf ro execution when the client sends an extcmd packet. 1077Register a callback for execution when the client sends an (synchronous)
1078extcmd packet. Ext commands will be processed in the order they are
1079received by the server, like other user commands. The first argument is
1080the logged-in player. Ext commands can only be processed after a player
1081has logged in successfully.
905 1082
906If the callback returns something, it is sent back as if reply was being 1083If the callback returns something, it is sent back as if reply was being
907called. 1084called.
908 1085
1086=item cf::register_exticmd $name => \&callback($ns,$packet);
1087
1088Register a callback for execution when the client sends an (asynchronous)
1089exticmd packet. Exti commands are processed by the server as soon as they
1090are received, i.e. out of order w.r.t. other commands. The first argument
1091is a client socket. Exti commands can be received anytime, even before
1092log-in.
1093
1094If the callback returns something, it is sent back as if reply was being
1095called.
1096
909=cut 1097=cut
910 1098
911sub register_extcmd { 1099sub register_extcmd {
912 my ($name, $cb) = @_; 1100 my ($name, $cb) = @_;
913 1101
914 $EXTCMD{$name} = $cb; 1102 $EXTCMD{$name} = $cb;
1103}
1104
1105sub register_exticmd {
1106 my ($name, $cb) = @_;
1107
1108 $EXTICMD{$name} = $cb;
915} 1109}
916 1110
917cf::player->attach ( 1111cf::player->attach (
918 on_command => sub { 1112 on_command => sub {
919 my ($pl, $name, $params) = @_; 1113 my ($pl, $name, $params) = @_;
928 cf::override; 1122 cf::override;
929 }, 1123 },
930 on_extcmd => sub { 1124 on_extcmd => sub {
931 my ($pl, $buf) = @_; 1125 my ($pl, $buf) = @_;
932 1126
933 my $msg = eval { from_json $buf }; 1127 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
934 1128
935 if (ref $msg) { 1129 if (ref $msg) {
936 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1130 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
937 if (my %reply = $cb->($pl, $msg)) { 1131 if (my %reply = $cb->($pl, $msg)) {
938 $pl->ext_reply ($msg->{msgid}, %reply); 1132 $pl->ext_reply ($msg->{msgid}, %reply);
944 1138
945 cf::override; 1139 cf::override;
946 }, 1140 },
947); 1141);
948 1142
949sub load_extension {
950 my ($path) = @_;
951
952 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
953 my $base = $1;
954 my $pkg = $1;
955 $pkg =~ s/[^[:word:]]/_/g;
956 $pkg = "ext::$pkg";
957
958 warn "... loading '$path' into '$pkg'\n";
959
960 open my $fh, "<:utf8", $path
961 or die "$path: $!";
962
963 my $source =
964 "package $pkg; use strict; use utf8;\n"
965 . "#line 1 \"$path\"\n{\n"
966 . (do { local $/; <$fh> })
967 . "\n};\n1";
968
969 unless (eval $source) {
970 my $msg = $@ ? "$path: $@\n"
971 : "extension disabled.\n";
972 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
973 warn $@;
974 warn "mandatory extension failed to load, exiting.\n";
975 exit 1;
976 }
977 die $@;
978 }
979
980 push @EXTS, $pkg;
981}
982
983sub load_extensions { 1143sub load_extensions {
1144 cf::sync_job {
1145 my %todo;
1146
984 for my $ext (<$LIBDIR/*.ext>) { 1147 for my $path (<$LIBDIR/*.ext>) {
985 next unless -r $ext; 1148 next unless -r $path;
986 eval { 1149
987 load_extension $ext; 1150 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1151 my $base = $1;
1152 my $pkg = $1;
1153 $pkg =~ s/[^[:word:]]/_/g;
1154 $pkg = "ext::$pkg";
1155
1156 open my $fh, "<:utf8", $path
1157 or die "$path: $!";
1158
1159 my $source = do { local $/; <$fh> };
1160
1161 my %ext = (
1162 path => $path,
1163 base => $base,
1164 pkg => $pkg,
1165 );
1166
1167 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1168 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1169
1170 $ext{source} =
1171 "package $pkg; use strict; use utf8;\n"
1172 . "#line 1 \"$path\"\n{\n"
1173 . $source
1174 . "\n};\n1";
1175
1176 $todo{$base} = \%ext;
1177 }
1178
1179 my %done;
1180 while (%todo) {
1181 my $progress;
1182
1183 while (my ($k, $v) = each %todo) {
1184 for (split /,\s*/, $v->{meta}{depends}) {
1185 goto skip
1186 unless exists $done{$_};
1187 }
1188
1189 warn "... loading '$k' into '$v->{pkg}'\n";
1190
1191 unless (eval $v->{source}) {
1192 my $msg = $@ ? "$v->{path}: $@\n"
1193 : "$v->{base}: extension inactive.\n";
1194
1195 if (exists $v->{meta}{mandatory}) {
1196 warn $msg;
1197 warn "mandatory extension failed to load, exiting.\n";
1198 exit 1;
1199 }
1200
1201 warn $msg;
1202 }
1203
1204 $done{$k} = delete $todo{$k};
1205 push @EXTS, $v->{pkg};
1206 $progress = 1;
988 1 1207 }
989 } or warn "$ext not loaded: $@"; 1208
1209 skip:
1210 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1211 unless $progress;
1212 }
990 } 1213 };
991} 1214}
992 1215
993############################################################################# 1216#############################################################################
1217
1218=back
994 1219
995=head2 CORE EXTENSIONS 1220=head2 CORE EXTENSIONS
996 1221
997Functions and methods that extend core crossfire objects. 1222Functions and methods that extend core crossfire objects.
998 1223
1186 } 1411 }
1187 1412
1188 \@paths 1413 \@paths
1189} 1414}
1190 1415
1416=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1417
1418Expand crossfire pod fragments into protocol xml.
1419
1420=cut
1421
1422sub expand_cfpod {
1423 ((my $self), (local $_)) = @_;
1424
1425 # escape & and <
1426 s/&/&amp;/g;
1427 s/(?<![BIUGH])</&lt;/g;
1428
1429 # this is buggy, it needs to properly take care of nested <'s
1430
1431 1 while
1432 # replace B<>, I<>, U<> etc.
1433 s/B<([^\>]*)>/<b>$1<\/b>/
1434 || s/I<([^\>]*)>/<i>$1<\/i>/
1435 || s/U<([^\>]*)>/<u>$1<\/u>/
1436 # replace G<male|female> tags
1437 || s{G<([^>|]*)\|([^>]*)>}{
1438 $self->gender ? $2 : $1
1439 }ge
1440 # replace H<hint text>
1441 || s{H<([^\>]*)>}
1442 {
1443 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1444 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1445 "")
1446 [$self->{hintmode}]
1447 }ge;
1448
1449 # create single paragraphs (very hackish)
1450 s/(?<=\S)\n(?=\w)/ /g;
1451
1452 # compress some whitespace
1453 s/\s+\n/\n/g; # ws line-ends
1454 s/\n\n+/\n/g; # double lines
1455 s/^\n+//; # beginning lines
1456 s/\n+$//; # ending lines
1457
1458 $_
1459}
1460
1461sub hintmode {
1462 $_[0]{hintmode} = $_[1] if @_ > 1;
1463 $_[0]{hintmode}
1464}
1465
1191=item $player->ext_reply ($msgid, %msg) 1466=item $player->ext_reply ($msgid, %msg)
1192 1467
1193Sends an ext reply to the player. 1468Sends an ext reply to the player.
1194 1469
1195=cut 1470=cut
1196 1471
1197sub ext_reply($$%) { 1472sub ext_reply($$%) {
1198 my ($self, $id, %msg) = @_; 1473 my ($self, $id, %msg) = @_;
1199 1474
1200 $msg{msgid} = $id; 1475 $msg{msgid} = $id;
1201 1476 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1202 $self->send ("ext " . cf::to_json \%msg);
1203} 1477}
1204 1478
1205=item $player->ext_event ($type, %msg) 1479=item $player->ext_event ($type, %msg)
1206 1480
1207Sends an ext event to the client. 1481Sends an ext event to the client.
1222 1496
1223package cf::region; 1497package cf::region;
1224 1498
1225=item cf::region::find_by_path $path 1499=item cf::region::find_by_path $path
1226 1500
1227Tries to decuce the probable region for a map knowing only its path. 1501Tries to decuce the likely region for a map knowing only its path.
1228 1502
1229=cut 1503=cut
1230 1504
1231sub find_by_path($) { 1505sub find_by_path($) {
1232 my ($path) = @_; 1506 my ($path) = @_;
1233 1507
1234 my ($match, $specificity); 1508 my ($match, $specificity);
1235 1509
1236 for my $region (list) { 1510 for my $region (list) {
1237 if ($region->match && $path =~ $region->match) { 1511 if ($region->{match} && $path =~ $region->{match}) {
1238 ($match, $specificity) = ($region, $region->specificity) 1512 ($match, $specificity) = ($region, $region->specificity)
1239 if $region->specificity > $specificity; 1513 if $region->specificity > $specificity;
1240 } 1514 }
1241 } 1515 }
1242 1516
1306 my ($self, $merge) = @_; 1580 my ($self, $merge) = @_;
1307 1581
1308 # we have to keep some variables in memory intact 1582 # we have to keep some variables in memory intact
1309 local $self->{path}; 1583 local $self->{path};
1310 local $self->{load_path}; 1584 local $self->{load_path};
1311 local $self->{deny_save};
1312 local $self->{deny_reset};
1313 1585
1314 $self->SUPER::thawer_merge ($merge); 1586 $self->SUPER::thawer_merge ($merge);
1315} 1587}
1316 1588
1317sub normalise { 1589sub normalise {
1364 $self->init; # pass $1 etc. 1636 $self->init; # pass $1 etc.
1365 return $self; 1637 return $self;
1366 } 1638 }
1367 } 1639 }
1368 1640
1369 Carp::carp "unable to resolve path '$path' (base '$base')."; 1641 Carp::cluck "unable to resolve path '$path' (base '$base').";
1370 () 1642 ()
1371} 1643}
1372 1644
1373sub init { 1645sub init {
1374 my ($self) = @_; 1646 my ($self) = @_;
1415sub change_all_map_light { 1687sub change_all_map_light {
1416 my ($change) = @_; 1688 my ($change) = @_;
1417 1689
1418 $_->change_map_light ($change) 1690 $_->change_map_light ($change)
1419 for grep $_->outdoor, values %cf::MAP; 1691 for grep $_->outdoor, values %cf::MAP;
1692}
1693
1694sub decay_objects {
1695 my ($self) = @_;
1696
1697 return if $self->{deny_reset};
1698
1699 $self->do_decay_objects;
1420} 1700}
1421 1701
1422sub unlink_save { 1702sub unlink_save {
1423 my ($self) = @_; 1703 my ($self) = @_;
1424 1704
1482 $self->load_header_orig 1762 $self->load_header_orig
1483 or return; 1763 or return;
1484 $self->prepare_orig; 1764 $self->prepare_orig;
1485 } 1765 }
1486 1766
1767 $self->{deny_reset} = 1
1768 if $self->no_reset;
1769
1487 $self->default_region (cf::region::find_by_path $self->{path}) 1770 $self->default_region (cf::region::find_by_path $self->{path})
1488 unless $self->default_region; 1771 unless $self->default_region;
1489 1772
1490 1 1773 1
1491} 1774}
1506 $map->{last_save} = $cf::RUNTIME; 1789 $map->{last_save} = $cf::RUNTIME;
1507 1790
1508 $map->load_header 1791 $map->load_header
1509 or return; 1792 or return;
1510 1793
1511 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1794 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1512 # doing this can freeze the server in a sync job, obviously 1795 # doing this can freeze the server in a sync job, obviously
1513 #$cf::WAIT_FOR_TICK->wait; 1796 #$cf::WAIT_FOR_TICK->wait;
1514 $map->reset; 1797 $map->reset;
1515 undef $guard; 1798 undef $guard;
1516 return find $path; 1799 return find $path;
1583 my ($self, $ob) = @_; 1866 my ($self, $ob) = @_;
1584 1867
1585 return find "~" . $ob->name . "/" . $self->{path} 1868 return find "~" . $ob->name . "/" . $self->{path}
1586 if $self->per_player; 1869 if $self->per_player;
1587 1870
1871# return find "?party/" . $ob->name . "/" . $self->{path}
1872# if $self->per_party;
1873
1588 $self 1874 $self
1589} 1875}
1590 1876
1591# find and load all maps in the 3x3 area around a map 1877# find and load all maps in the 3x3 area around a map
1592sub load_diag { 1878sub load_diag {
1638 1924
1639 undef $MAP_PREFETCH{$path}; 1925 undef $MAP_PREFETCH{$path};
1640 $MAP_PREFETCHER ||= cf::async { 1926 $MAP_PREFETCHER ||= cf::async {
1641 while (%MAP_PREFETCH) { 1927 while (%MAP_PREFETCH) {
1642 for my $path (keys %MAP_PREFETCH) { 1928 for my $path (keys %MAP_PREFETCH) {
1643 my $map = find $path 1929 if (my $map = find $path) {
1644 or next;
1645 $map->load; 1930 $map->load;
1931 }
1646 1932
1647 delete $MAP_PREFETCH{$path}; 1933 delete $MAP_PREFETCH{$path};
1648 } 1934 }
1649 } 1935 }
1650 undef $MAP_PREFETCHER; 1936 undef $MAP_PREFETCHER;
1702 1988
1703sub reset_at { 1989sub reset_at {
1704 my ($self) = @_; 1990 my ($self) = @_;
1705 1991
1706 # TODO: safety, remove and allow resettable per-player maps 1992 # TODO: safety, remove and allow resettable per-player maps
1707 return 1e99 if $self->isa ("ext::map_per_player");#d#
1708 return 1e99 if $self->{deny_reset}; 1993 return 1e99 if $self->{deny_reset};
1709 1994
1710 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1995 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1711 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1996 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1712 1997
1723 my ($self) = @_; 2008 my ($self) = @_;
1724 2009
1725 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2010 my $lock = cf::lock_acquire "map_data:$self->{path}";
1726 2011
1727 return if $self->players; 2012 return if $self->players;
1728 return if $self->isa ("ext::map_per_player");#d#
1729 2013
1730 warn "resetting map ", $self->path;#d# 2014 warn "resetting map ", $self->path;
1731 2015
1732 $self->in_memory (cf::MAP_SWAPPED); 2016 $self->in_memory (cf::MAP_SWAPPED);
1733 2017
1734 # need to save uniques path 2018 # need to save uniques path
1735 unless ($self->{deny_save}) { 2019 unless ($self->{deny_save}) {
1767 $cf::MAP{$self->path} = $self; 2051 $cf::MAP{$self->path} = $self;
1768 2052
1769 $self->reset; # polite request, might not happen 2053 $self->reset; # polite request, might not happen
1770} 2054}
1771 2055
2056=item $maps = cf::map::tmp_maps
2057
2058Returns an arrayref with all map paths of currently instantiated and saved
2059maps. May block.
2060
2061=cut
2062
2063sub tmp_maps() {
2064 [
2065 map {
2066 utf8::decode $_;
2067 /\.map$/
2068 ? normalise $_
2069 : ()
2070 } @{ aio_readdir $TMPDIR or [] }
2071 ]
2072}
2073
2074=item $maps = cf::map::random_maps
2075
2076Returns an arrayref with all map paths of currently instantiated and saved
2077random maps. May block.
2078
2079=cut
2080
2081sub random_maps() {
2082 [
2083 map {
2084 utf8::decode $_;
2085 /\.map$/
2086 ? normalise "?random/$_"
2087 : ()
2088 } @{ aio_readdir $RANDOMDIR or [] }
2089 ]
2090}
2091
1772=item cf::map::unique_maps 2092=item cf::map::unique_maps
1773 2093
1774Returns an arrayref of paths of all shared maps that have 2094Returns an arrayref of paths of all shared maps that have
1775instantiated unique items. May block. 2095instantiated unique items. May block.
1776 2096
1777=cut 2097=cut
1778 2098
1779sub unique_maps() { 2099sub unique_maps() {
1780 my $files = aio_readdir $UNIQUEDIR 2100 [
1781 or return; 2101 map {
1782
1783 my @paths;
1784
1785 for (@$files) {
1786 utf8::decode $_; 2102 utf8::decode $_;
1787 next if /\.pst$/; 2103 /\.map$/
1788 next unless /^$PATH_SEP/o; 2104 ? normalise $_
1789 2105 : ()
1790 push @paths, cf::map::normalise $_; 2106 } @{ aio_readdir $UNIQUEDIR or [] }
1791 } 2107 ]
1792
1793 \@paths
1794} 2108}
1795 2109
1796package cf; 2110package cf;
1797 2111
1798=back 2112=back
1844 2158
1845 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2159 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1846 2160
1847 if ($self->{record_replies}) { 2161 if ($self->{record_replies}) {
1848 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2162 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2163
1849 } else { 2164 } else {
2165 my $pl = $self->contr;
2166
2167 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2168 my $diag = $pl->{npc_dialog};
2169 $diag->{pl}->ext_reply (
2170 $diag->{id},
2171 msgtype => "reply",
2172 msg => $diag->{pl}->expand_cfpod ($msg),
2173 add_topics => []
2174 );
2175
2176 } else {
1850 $msg = $npc->name . " says: $msg" if $npc; 2177 $msg = $npc->name . " says: $msg" if $npc;
1851 $self->message ($msg, $flags); 2178 $self->message ($msg, $flags);
2179 }
1852 } 2180 }
1853} 2181}
1854 2182
1855=item $player_object->may ("access") 2183=item $player_object->may ("access")
1856 2184
1904 $self->deactivate_recursive; 2232 $self->deactivate_recursive;
1905 2233
1906 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2234 return if UNIVERSAL::isa $self->map, "ext::map_link";
1907 2235
1908 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2236 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1909 if $self->map; 2237 if $self->map && $self->map->{path} ne "{link}";
1910 2238
1911 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2239 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1912} 2240}
1913 2241
1914sub cf::object::player::leave_link { 2242sub cf::object::player::leave_link {
1915 my ($self, $map, $x, $y) = @_; 2243 my ($self, $map, $x, $y) = @_;
2244
2245 return unless $self->contr->active;
1916 2246
1917 my $link_pos = delete $self->{_link_pos}; 2247 my $link_pos = delete $self->{_link_pos};
1918 2248
1919 unless ($map) { 2249 unless ($map) {
1920 # restore original map position 2250 # restore original map position
1943 2273
1944 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2274 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1945 $self->enter_map ($map, $x, $y); 2275 $self->enter_map ($map, $x, $y);
1946} 2276}
1947 2277
1948cf::player->attach ( 2278=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1949 on_logout => sub {
1950 my ($pl) = @_;
1951 2279
1952 # abort map switching before logout 2280Moves the player to the given map-path and coordinates by first freezing
1953 if ($pl->ob->{_link_pos}) { 2281her, loading and preparing them map, calling the provided $check callback
1954 cf::sync_job { 2282that has to return the map if sucecssful, and then unfreezes the player on
1955 $pl->ob->leave_link 2283the new (success) or old (failed) map position. In either case, $done will
1956 }; 2284be called at the end of this process.
1957 }
1958 },
1959 on_login => sub {
1960 my ($pl) = @_;
1961 2285
1962 # try to abort aborted map switching on player login :)
1963 # should happen only on crashes
1964 if ($pl->ob->{_link_pos}) {
1965 $pl->ob->enter_link;
1966 (async {
1967 $pl->ob->reply (undef,
1968 "There was an internal problem at your last logout, "
1969 . "the server will try to bring you to your intended destination in a second.",
1970 cf::NDI_RED);
1971 # we need this sleep as the login has a concurrent enter_exit running
1972 # and this sleep increases chances of the player not ending up in scorn
1973 Coro::Timer::sleep 1;
1974 $pl->ob->leave_link;
1975 })->prio (2);
1976 }
1977 },
1978);
1979
1980=item $player_object->goto ($path, $x, $y)
1981
1982=cut 2286=cut
2287
2288our $GOTOGEN;
1983 2289
1984sub cf::object::player::goto { 2290sub cf::object::player::goto {
1985 my ($self, $path, $x, $y) = @_; 2291 my ($self, $path, $x, $y, $check, $done) = @_;
2292
2293 # do generation counting so two concurrent goto's will be executed in-order
2294 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1986 2295
1987 $self->enter_link; 2296 $self->enter_link;
1988 2297
1989 (async { 2298 (async {
1990 my $map = eval { 2299 my $map = eval {
1991 my $map = cf::map::find $path; 2300 my $map = cf::map::find $path;
2301
2302 if ($map) {
1992 $map = $map->customise_for ($self) if $map; 2303 $map = $map->customise_for ($self);
2304 $map = $check->($map) if $check && $map;
2305 } else {
2306 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2307 }
2308
1993 $map 2309 $map
2310 };
2311
2312 if ($@) {
2313 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2314 LOG llevError | logBacktrace, Carp::longmess $@;
1994 } or 2315 }
1995 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1996 2316
2317 if ($gen == $self->{_goto_generation}) {
2318 delete $self->{_goto_generation};
1997 $self->leave_link ($map, $x, $y); 2319 $self->leave_link ($map, $x, $y);
2320 }
2321
2322 $done->() if $done;
1998 })->prio (1); 2323 })->prio (1);
1999} 2324}
2000 2325
2001=item $player_object->enter_exit ($exit_object) 2326=item $player_object->enter_exit ($exit_object)
2002 2327
2071 my $hp = $exit->stats->hp; 2396 my $hp = $exit->stats->hp;
2072 my $sp = $exit->stats->sp; 2397 my $sp = $exit->stats->sp;
2073 2398
2074 $self->enter_link; 2399 $self->enter_link;
2075 2400
2401 # if exit is damned, update players death & WoR home-position
2402 $self->contr->savebed ($slaying, $hp, $sp)
2403 if $exit->flag (FLAG_DAMNED);
2404
2076 (async { 2405 (async {
2077 $self->deactivate_recursive; # just to be sure 2406 $self->deactivate_recursive; # just to be sure
2078 unless (eval { 2407 unless (eval {
2079 $self->goto ($slaying, $hp, $sp); 2408 $self->goto ($slaying, $hp, $sp);
2080 2409
2107 2436
2108 utf8::encode $text; 2437 utf8::encode $text;
2109 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2438 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2110} 2439}
2111 2440
2441=item $client->send_msg ($channel, $msg, $color, [extra...])
2442
2443Send a drawinfo or msg packet to the client, formatting the msg for the
2444client if neccessary. C<$type> should be a string identifying the type of
2445the message, with C<log> being the default. If C<$color> is negative, suppress
2446the message unless the client supports the msg packet.
2447
2448=cut
2449
2450sub cf::client::send_msg {
2451 my ($self, $channel, $msg, $color, @extra) = @_;
2452
2453 $msg = $self->pl->expand_cfpod ($msg);
2454
2455 $color &= ~cf::NDI_UNIQUE; # just in case...
2456
2457 if (ref $channel) {
2458 # send meta info to client, if not yet sent
2459 unless (exists $self->{channel}{$channel->{id}}) {
2460 $self->{channel}{$channel->{id}} = $channel;
2461 $self->ext_event (channel_info => %$channel);
2462 }
2463
2464 $channel = $channel->{id};
2465 }
2466
2467 return unless @extra || length $msg;
2468
2469 if ($self->can_msg) {
2470 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra]));
2471 } else {
2472 # replace some tags by gcfclient-compatible ones
2473 for ($msg) {
2474 1 while
2475 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2476 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2477 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2478 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2479 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2480 }
2481
2482 if ($color >= 0) {
2483 if (0 && $msg =~ /\[/) {
2484 $self->send_packet ("drawextinfo $color 4 0 $msg")
2485 } else {
2486 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2487 $self->send_packet ("drawinfo $color $msg")
2488 }
2489 }
2490 }
2491}
2492
2112=item $client->ext_event ($type, %msg) 2493=item $client->ext_event ($type, %msg)
2113 2494
2114Sends an exti event to the client. 2495Sends an ext event to the client.
2115 2496
2116=cut 2497=cut
2117 2498
2118sub cf::client::ext_event($$%) { 2499sub cf::client::ext_event($$%) {
2119 my ($self, $type, %msg) = @_; 2500 my ($self, $type, %msg) = @_;
2120 2501
2502 return unless $self->extcmd;
2503
2121 $msg{msgtype} = "event_$type"; 2504 $msg{msgtype} = "event_$type";
2122 $self->send_packet ("ext " . cf::to_json \%msg); 2505 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2123} 2506}
2124 2507
2125=item $success = $client->query ($flags, "text", \&cb) 2508=item $success = $client->query ($flags, "text", \&cb)
2126 2509
2127Queues a query to the client, calling the given callback with 2510Queues a query to the client, calling the given callback with
2128the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2511the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2129C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2512C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2130 2513
2131Queries can fail, so check the return code. Or don't, as queries will become 2514Queries can fail, so check the return code. Or don't, as queries will
2132reliable at some point in the future. 2515become reliable at some point in the future.
2133 2516
2134=cut 2517=cut
2135 2518
2136sub cf::client::query { 2519sub cf::client::query {
2137 my ($self, $flags, $text, $cb) = @_; 2520 my ($self, $flags, $text, $cb) = @_;
2145 utf8::encode $text; 2528 utf8::encode $text;
2146 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2529 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2147 2530
2148 $self->send_packet ($self->{query_queue}[0][0]) 2531 $self->send_packet ($self->{query_queue}[0][0])
2149 if @{ $self->{query_queue} } == 1; 2532 if @{ $self->{query_queue} } == 1;
2533
2534 1
2150} 2535}
2151 2536
2152cf::client->attach ( 2537cf::client->attach (
2538 on_connect => sub {
2539 my ($ns) = @_;
2540
2541 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2542 },
2153 on_reply => sub { 2543 on_reply => sub {
2154 my ($ns, $msg) = @_; 2544 my ($ns, $msg) = @_;
2155 2545
2156 # this weird shuffling is so that direct followup queries 2546 # this weird shuffling is so that direct followup queries
2157 # get handled first 2547 # get handled first
2169 } else { 2559 } else {
2170 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2560 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2171 } 2561 }
2172 } 2562 }
2173 }, 2563 },
2564 on_exticmd => sub {
2565 my ($ns, $buf) = @_;
2566
2567 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2568
2569 if (ref $msg) {
2570 if (my $cb = $EXTICMD{$msg->{msgtype}}) {
2571 if (my %reply = $cb->($ns, $msg)) {
2572 $reply{msgid} = $msg->{msgid};
2573 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2574 }
2575 }
2576 } else {
2577 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2578 }
2579
2580 cf::override;
2581 },
2174); 2582);
2175 2583
2176=item $client->async (\&cb) 2584=item $client->async (\&cb)
2177 2585
2178Create a new coroutine, running the specified callback. The coroutine will 2586Create a new coroutine, running the specified callback. The coroutine will
2227 2635
2228=pod 2636=pod
2229 2637
2230The following functions and methods are available within a safe environment: 2638The following functions and methods are available within a safe environment:
2231 2639
2232 cf::object contr pay_amount pay_player map 2640 cf::object
2641 contr pay_amount pay_player map x y force_find force_add
2642 insert remove
2643
2233 cf::object::player player 2644 cf::object::player
2234 cf::player peaceful 2645 player
2235 cf::map trigger 2646
2647 cf::player
2648 peaceful
2649
2650 cf::map
2651 trigger
2236 2652
2237=cut 2653=cut
2238 2654
2239for ( 2655for (
2240 ["cf::object" => qw(contr pay_amount pay_player map)], 2656 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2657 insert remove)],
2241 ["cf::object::player" => qw(player)], 2658 ["cf::object::player" => qw(player)],
2242 ["cf::player" => qw(peaceful)], 2659 ["cf::player" => qw(peaceful)],
2243 ["cf::map" => qw(trigger)], 2660 ["cf::map" => qw(trigger)],
2244) { 2661) {
2245 no strict 'refs'; 2662 no strict 'refs';
2316=back 2733=back
2317 2734
2318=cut 2735=cut
2319 2736
2320############################################################################# 2737#############################################################################
2321
2322=head2 EXTENSION DATABASE SUPPORT
2323
2324Crossfire maintains a very simple database for extension use. It can
2325currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2326convert to/from binary).
2327
2328The parameter C<$family> should best start with the name of the extension
2329using it, it should be unique.
2330
2331=over 4
2332
2333=item $value = cf::db_get $family => $key
2334
2335Returns a single value from the database.
2336
2337=item cf::db_put $family => $key => $value
2338
2339Stores the given C<$value> in the family.
2340
2341=cut
2342
2343our $DB;
2344
2345sub db_init {
2346 unless ($DB) {
2347 $DB = BDB::db_create $DB_ENV;
2348
2349 cf::sync_job {
2350 eval {
2351 $DB->set_flags (BDB::CHKSUM);
2352
2353 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2354 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2355 cf::cleanup "db_open(db): $!" if $!;
2356 };
2357 cf::cleanup "db_open(db): $@" if $@;
2358 };
2359 }
2360}
2361
2362sub db_get($$) {
2363 my $key = "$_[0]/$_[1]";
2364
2365 cf::sync_job {
2366 BDB::db_get $DB, undef, $key, my $data;
2367
2368 $! ? ()
2369 : $data
2370 }
2371}
2372
2373sub db_put($$$) {
2374 BDB::dbreq_pri 4;
2375 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2376}
2377
2378=item cf::cache $id => [$paths...], $processversion => $process
2379
2380Generic caching function that returns the value of the resource $id,
2381caching and regenerating as required.
2382
2383This function can block.
2384
2385=cut
2386
2387sub cache {
2388 my ($id, $src, $processversion, $process) = @_;
2389
2390 my $meta =
2391 join "\x00",
2392 $processversion,
2393 map {
2394 aio_stat $_
2395 and Carp::croak "$_: $!";
2396
2397 ($_, (stat _)[7,9])
2398 } @$src;
2399
2400 my $dbmeta = db_get cache => "$id/meta";
2401 if ($dbmeta ne $meta) {
2402 # changed, we may need to process
2403
2404 my @data;
2405 my $md5;
2406
2407 for (0 .. $#$src) {
2408 0 <= aio_load $src->[$_], $data[$_]
2409 or Carp::croak "$src->[$_]: $!";
2410 }
2411
2412 # if processing is expensive, check
2413 # checksum first
2414 if (1) {
2415 $md5 =
2416 join "\x00",
2417 $processversion,
2418 map {
2419 Coro::cede;
2420 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2421 } 0.. $#$src;
2422
2423
2424 my $dbmd5 = db_get cache => "$id/md5";
2425 if ($dbmd5 eq $md5) {
2426 db_put cache => "$id/meta", $meta;
2427
2428 return db_get cache => "$id/data";
2429 }
2430 }
2431
2432 my $t1 = Time::HiRes::time;
2433 my $data = $process->(\@data);
2434 my $t2 = Time::HiRes::time;
2435
2436 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2437
2438 db_put cache => "$id/data", $data;
2439 db_put cache => "$id/md5" , $md5;
2440 db_put cache => "$id/meta", $meta;
2441
2442 return $data;
2443 }
2444
2445 db_get cache => "$id/data"
2446}
2447
2448=item fork_call { }, $args
2449
2450Executes the given code block with the given arguments in a seperate
2451process, returning the results. Everything must be serialisable with
2452Coro::Storable. May, of course, block. Note that the executed sub may
2453never block itself or use any form of Event handling.
2454
2455=cut
2456
2457sub fork_call(&@) {
2458 my ($cb, @args) = @_;
2459
2460# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2461# or die "socketpair: $!";
2462 pipe my $fh1, my $fh2
2463 or die "pipe: $!";
2464
2465 if (my $pid = fork) {
2466 close $fh2;
2467
2468 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2469 $res = Coro::Storable::thaw $res;
2470
2471 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2472
2473 die $$res unless "ARRAY" eq ref $res;
2474
2475 return wantarray ? @$res : $res->[-1];
2476 } else {
2477 reset_signals;
2478 local $SIG{__WARN__};
2479 local $SIG{__DIE__};
2480 eval {
2481 close $fh1;
2482
2483 my @res = eval { $cb->(@args) };
2484 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2485 };
2486
2487 warn $@ if $@;
2488 _exit 0;
2489 }
2490}
2491
2492
2493
2494#############################################################################
2495# the server's init and main functions 2738# the server's init and main functions
2496 2739
2497sub load_facedata($) { 2740sub load_facedata($) {
2498 my ($path) = @_; 2741 my ($path) = @_;
2499 2742
2511 { 2754 {
2512 my $faces = $facedata->{faceinfo}; 2755 my $faces = $facedata->{faceinfo};
2513 2756
2514 while (my ($face, $info) = each %$faces) { 2757 while (my ($face, $info) = each %$faces) {
2515 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2758 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2516 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2759 cf::face::set_visibility $idx, $info->{visibility};
2760 cf::face::set_magicmap $idx, $info->{magicmap};
2517 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2761 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2518 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2762 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2519 Coro::cede; 2763
2764 cf::cede_to_tick;
2520 } 2765 }
2521 2766
2522 while (my ($face, $info) = each %$faces) { 2767 while (my ($face, $info) = each %$faces) {
2523 next unless $info->{smooth}; 2768 next unless $info->{smooth};
2524 my $idx = cf::face::find $face 2769 my $idx = cf::face::find $face
2525 or next; 2770 or next;
2526 if (my $smooth = cf::face::find $info->{smooth}) { 2771 if (my $smooth = cf::face::find $info->{smooth}) {
2772 cf::face::set_smooth $idx, $smooth;
2527 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2773 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2528 } else { 2774 } else {
2529 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2775 warn "smooth face '$info->{smooth}' not found for face '$face'";
2530 } 2776 }
2531 Coro::cede; 2777
2778 cf::cede_to_tick;
2532 } 2779 }
2533 } 2780 }
2534 2781
2535 { 2782 {
2536 my $anims = $facedata->{animinfo}; 2783 my $anims = $facedata->{animinfo};
2537 2784
2538 while (my ($anim, $info) = each %$anims) { 2785 while (my ($anim, $info) = each %$anims) {
2539 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2786 cf::anim::set $anim, $info->{frames}, $info->{facings};
2540 Coro::cede; 2787 cf::cede_to_tick;
2541 } 2788 }
2542 2789
2543 cf::anim::invalidate_all; # d'oh 2790 cf::anim::invalidate_all; # d'oh
2791 }
2792
2793 {
2794 # TODO: for gcfclient pleasure, we should give resources
2795 # that gcfclient doesn't grok a >10000 face index.
2796 my $res = $facedata->{resource};
2797 my $enc = JSON::XS->new->utf8->canonical;
2798
2799 while (my ($name, $info) = each %$res) {
2800 my $meta = $enc->encode ({
2801 name => $name,
2802 type => $info->{type},
2803 copyright => $info->{copyright}, #TODO#
2804 });
2805
2806 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2807
2808 if ($name =~ /\.jpg$/) {
2809 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack
2810 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack
2811 } else {
2812 my $data = pack "(w/a*)*", $meta, $info->{data};
2813 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2814
2815 cf::face::set_type $idx, 1;
2816 cf::face::set_data $idx, 0, $data, $chk;
2817 }
2818
2819 cf::cede_to_tick;
2820 }
2544 } 2821 }
2545 2822
2546 1 2823 1
2547} 2824}
2548 2825
2549sub reload_regions { 2826sub reload_regions {
2550 load_resource_file "$MAPDIR/regions" 2827 load_resource_file "$MAPDIR/regions"
2551 or die "unable to load regions file\n"; 2828 or die "unable to load regions file\n";
2829
2830 for (cf::region::list) {
2831 $_->{match} = qr/$_->{match}/
2832 if exists $_->{match};
2833 }
2552} 2834}
2553 2835
2554sub reload_facedata { 2836sub reload_facedata {
2555 load_facedata "$DATADIR/facedata" 2837 load_facedata "$DATADIR/facedata"
2556 or die "unable to load facedata\n"; 2838 or die "unable to load facedata\n";
2557} 2839}
2558 2840
2559sub reload_archetypes { 2841sub reload_archetypes {
2560 load_resource_file "$DATADIR/archetypes" 2842 load_resource_file "$DATADIR/archetypes"
2561 or die "unable to load archetypes\n"; 2843 or die "unable to load archetypes\n";
2844 #d# NEED to laod twice to resolve forward references
2845 # this really needs to be done in an extra post-pass
2846 # (which needs to be synchronous, so solve it differently)
2847 load_resource_file "$DATADIR/archetypes"
2848 or die "unable to load archetypes\n";
2562} 2849}
2563 2850
2564sub reload_treasures { 2851sub reload_treasures {
2565 load_resource_file "$DATADIR/treasures" 2852 load_resource_file "$DATADIR/treasures"
2566 or die "unable to load treasurelists\n"; 2853 or die "unable to load treasurelists\n";
2569sub reload_resources { 2856sub reload_resources {
2570 warn "reloading resource files...\n"; 2857 warn "reloading resource files...\n";
2571 2858
2572 reload_regions; 2859 reload_regions;
2573 reload_facedata; 2860 reload_facedata;
2861 #reload_archetypes;#d#
2574 reload_archetypes; 2862 reload_archetypes;
2575 reload_treasures; 2863 reload_treasures;
2576 2864
2577 warn "finished reloading resource files\n"; 2865 warn "finished reloading resource files\n";
2578} 2866}
2635 }, 2923 },
2636 ); 2924 );
2637 } 2925 }
2638} 2926}
2639 2927
2928sub write_runtime {
2929 my $runtime = "$LOCALDIR/runtime";
2930
2931 # first touch the runtime file to show we are still running:
2932 # the fsync below can take a very very long time.
2933
2934 IO::AIO::aio_utime $runtime, undef, undef;
2935
2936 my $guard = cf::lock_acquire "write_runtime";
2937
2938 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
2939 or return;
2940
2941 my $value = $cf::RUNTIME + 90 + 10;
2942 # 10 is the runtime save interval, for a monotonic clock
2943 # 60 allows for the watchdog to kill the server.
2944
2945 (aio_write $fh, 0, (length $value), $value, 0) <= 0
2946 and return;
2947
2948 # always fsync - this file is important
2949 aio_fsync $fh
2950 and return;
2951
2952 # touch it again to show we are up-to-date
2953 aio_utime $fh, undef, undef;
2954
2955 close $fh
2956 or return;
2957
2958 aio_rename "$runtime~", $runtime
2959 and return;
2960
2961 warn "runtime file written.\n";
2962
2963 1
2964}
2965
2640sub emergency_save() { 2966sub emergency_save() {
2641 my $freeze_guard = cf::freeze_mainloop; 2967 my $freeze_guard = cf::freeze_mainloop;
2642 2968
2643 warn "enter emergency perl save\n"; 2969 warn "enter emergency perl save\n";
2644 2970
2719 %EXT_CORO = (); 3045 %EXT_CORO = ();
2720 3046
2721 warn "removing commands"; 3047 warn "removing commands";
2722 %COMMAND = (); 3048 %COMMAND = ();
2723 3049
2724 warn "removing ext commands"; 3050 warn "removing ext/exti commands";
2725 %EXTCMD = (); 3051 %EXTCMD = ();
3052 %EXTICMD = ();
2726 3053
2727 warn "unloading/nuking all extensions"; 3054 warn "unloading/nuking all extensions";
2728 for my $pkg (@EXTS) { 3055 for my $pkg (@EXTS) {
2729 warn "... unloading $pkg"; 3056 warn "... unloading $pkg";
2730 3057
2848 my $signal = new Coro::Signal; 3175 my $signal = new Coro::Signal;
2849 push @WAIT_FOR_TICK_BEGIN, $signal; 3176 push @WAIT_FOR_TICK_BEGIN, $signal;
2850 $signal->wait; 3177 $signal->wait;
2851} 3178}
2852 3179
3180 my $min = 1e6;#d#
3181 my $avg = 10;
2853$TICK_WATCHER = Event->timer ( 3182$TICK_WATCHER = Event->timer (
2854 reentrant => 0, 3183 reentrant => 0,
2855 parked => 1, 3184 parked => 1,
2856 prio => 0, 3185 prio => 0,
2857 at => $NEXT_TICK || $TICK, 3186 at => $NEXT_TICK || $TICK,
2864 } 3193 }
2865 3194
2866 $NOW = $tick_start = Event::time; 3195 $NOW = $tick_start = Event::time;
2867 3196
2868 cf::server_tick; # one server iteration 3197 cf::server_tick; # one server iteration
3198
3199 0 && sync_job {#d#
3200 for(1..10) {
3201 my $t = Event::time;
3202 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3203 or die;
3204
3205 $map->width (50);
3206 $map->height (50);
3207 $map->alloc;
3208 $map->_load_objects ("/tmp/x.map", 1);
3209 my $t = Event::time - $t;
3210
3211 #next unless $t < 0.0013;#d#
3212 if ($t < $min) {
3213 $min = $t;
3214 }
3215 $avg = $avg * 0.99 + $t * 0.01;
3216 }
3217 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3218 exit 0;
3219 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3220 };
2869 3221
2870 $RUNTIME += $TICK; 3222 $RUNTIME += $TICK;
2871 $NEXT_TICK += $TICK; 3223 $NEXT_TICK += $TICK;
2872 3224
2873 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3225 if ($NOW >= $NEXT_RUNTIME_WRITE) {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines