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.270 by root, Sat May 26 15:44:06 2007 UTC vs.
Revision 1.346 by root, Tue Aug 28 19:38:40 2007 UTC

10use Event; 10use Event;
11use Opcode; 11use Opcode;
12use Safe; 12use Safe;
13use Safe::Hole; 13use Safe::Hole;
14 14
15use Coro 3.61 (); 15use Coro 3.64 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
26use JSON::XS ();
25use BDB (); 27use BDB ();
26use Data::Dumper; 28use Data::Dumper;
27use Digest::MD5; 29use Digest::MD5;
28use Fcntl; 30use Fcntl;
29use YAML::Syck (); 31use YAML::Syck ();
30use IO::AIO 2.32 (); 32use IO::AIO 2.32 ();
31use Time::HiRes; 33use Time::HiRes;
32use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
33 36
34# configure various modules to our taste 37# configure various modules to our taste
35# 38#
36$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
49our %COMMAND = (); 52our %COMMAND = ();
50our %COMMAND_TIME = (); 53our %COMMAND_TIME = ();
51 54
52our @EXTS = (); # list of extension package names 55our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 56our %EXTCMD = ();
57our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 58our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 59our %EXT_MAP = (); # pluggable maps
56 60
57our $RELOAD; # number of reloads so far 61our $RELOAD; # number of reloads so far
58our @EVENT; 62our @EVENT;
164 168
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
166returns directly I<after> the tick processing (and consequently, can only wake one process 170returns directly I<after> the tick processing (and consequently, can only wake one process
167per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 171per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168 172
173=item @cf::INVOKE_RESULTS
174
175This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call.
178
169=back 179=back
170 180
171=cut 181=cut
172 182
173BEGIN { 183BEGIN {
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
191@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 201@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
202@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
192@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 203@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
193 204
194# we bless all objects into (empty) derived classes to force a method lookup 205# we bless all objects into (empty) derived classes to force a method lookup
195# within the Safe compartment. 206# within the Safe compartment.
196for my $pkg (qw( 207for my $pkg (qw(
197 cf::global cf::attachable 208 cf::global cf::attachable
205} 216}
206 217
207$Event::DIED = sub { 218$Event::DIED = sub {
208 warn "error in event callback: @_"; 219 warn "error in event callback: @_";
209}; 220};
221
222#############################################################################
210 223
211=head2 UTILITY FUNCTIONS 224=head2 UTILITY FUNCTIONS
212 225
213=over 4 226=over 4
214 227
233 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
234 $d 247 $d
235 } || "[unable to dump $_[0]: '$@']"; 248 } || "[unable to dump $_[0]: '$@']";
236} 249}
237 250
238use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
239
240=item $ref = cf::from_json $json 251=item $ref = cf::from_json $json
241 252
242Converts a JSON string into the corresponding perl data structure. 253Converts a JSON string into the corresponding perl data structure.
243 254
244=item $json = cf::to_json $ref 255=item $json = cf::to_json $ref
245 256
246Converts a perl data structure into its JSON representation. 257Converts a perl data structure into its JSON representation.
258
259=cut
260
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262
263sub to_json ($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) }
247 265
248=item cf::lock_wait $string 266=item cf::lock_wait $string
249 267
250Wait until the given lock is available. See cf::lock_acquire. 268Wait until the given lock is available. See cf::lock_acquire.
251 269
305 }; 323 };
306 $TICK_WATCHER->stop; 324 $TICK_WATCHER->stop;
307 $guard 325 $guard
308} 326}
309 327
328=item cf::get_slot $time[, $priority[, $name]]
329
330Allocate $time seconds of blocking CPU time at priority C<$priority>:
331This call blocks and returns only when you have at least C<$time> seconds
332of cpu time till the next tick. The slot is only valid till the next cede.
333
334The optional C<$name> can be used to identify the job to run. It might be
335used for statistical purposes and should identify the same time-class.
336
337Useful for short background jobs.
338
339=cut
340
341our @SLOT_QUEUE;
342our $SLOT_QUEUE;
343
344$SLOT_QUEUE->cancel if $SLOT_QUEUE;
345$SLOT_QUEUE = Coro::async {
346 my $signal = new Coro::Signal;
347
348 while () {
349 next_job:
350 my $avail = cf::till_tick;
351 if ($avail > 0.01) {
352 for (0 .. $#SLOT_QUEUE) {
353 if ($SLOT_QUEUE[$_][0] < $avail) {
354 my $job = splice @SLOT_QUEUE, $_, 1, ();
355 $job->[2]->send;
356 Coro::cede;
357 goto next_job;
358 }
359 }
360 }
361
362 if (@SLOT_QUEUE) {
363 # we do not use wait_For_tick() as it returns immediately when tick is inactive
364 push @cf::WAIT_FOR_TICK, $signal;
365 $signal->wait;
366 } else {
367 Coro::schedule;
368 }
369 }
370};
371
372sub get_slot($;$$) {
373 my ($time, $pri, $name) = @_;
374
375 $time = $TICK * .6 if $time > $TICK * .6;
376 my $sig = new Coro::Signal;
377
378 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
379 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
380 $SLOT_QUEUE->ready;
381 $sig->wait;
382}
383
310=item cf::async { BLOCK } 384=item cf::async { BLOCK }
311 385
312Currently the same as Coro::async_pool, meaning you cannot use 386Currently the same as Coro::async_pool, meaning you cannot use
313C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 387C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
314thing you are allowed to do is call C<prio> on it. 388thing you are allowed to do is call C<prio> on it.
317 391
318BEGIN { *async = \&Coro::async_pool } 392BEGIN { *async = \&Coro::async_pool }
319 393
320=item cf::sync_job { BLOCK } 394=item cf::sync_job { BLOCK }
321 395
322The design of crossfire+ requires that the main coro ($Coro::main) is 396The design of Crossfire TRT requires that the main coroutine ($Coro::main)
323always able to handle events or runnable, as crossfire+ is only partly 397is 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. 398partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
399acceptable.
325 400
326If it must be done, put the blocking parts into C<sync_job>. This will run 401If 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 402the given BLOCK in another coroutine while waiting for the result. The
328server will be frozen during this time, so the block should either finish 403server will be frozen during this time, so the block should either finish
329fast or be very important. 404fast or be very important.
389 $EXT_CORO{$coro+0} = $coro; 464 $EXT_CORO{$coro+0} = $coro;
390 465
391 $coro 466 $coro
392} 467}
393 468
394sub write_runtime { 469=item fork_call { }, $args
395 my $runtime = "$LOCALDIR/runtime";
396 470
397 # first touch the runtime file to show we are still running: 471Executes the given code block with the given arguments in a seperate
398 # the fsync below can take a very very long time. 472process, returning the results. Everything must be serialisable with
473Coro::Storable. May, of course, block. Note that the executed sub may
474never block itself or use any form of Event handling.
399 475
400 if (my $fh = aio_open $runtime, O_WRONLY, 0) { 476=cut
401 utime undef, undef, $fh;
402 }
403 477
404 my $guard = cf::lock_acquire "write_runtime"; 478sub fork_call(&@) {
479 my ($cb, @args) = @_;
405 480
406 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 481 # we seemingly have to make a local copy of the whole thing,
407 or return; 482 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious)
408 484
409 my $value = $cf::RUNTIME + 90 + 10; 485 my @res = Coro::Util::fork_eval {
410 # 10 is the runtime save interval, for a monotonic clock 486 reset_signals;
411 # 60 allows for the watchdog to kill the server. 487 &$cb
488 }, @args;
412 489
413 (aio_write $fh, 0, (length $value), $value, 0) <= 0 490 wantarray ? @res : $res[-1]
414 and return; 491}
415 492
416 # always fsync - this file is important 493=item $value = cf::db_get $family => $key
417 aio_fsync $fh
418 and return;
419 494
420 # touch it again to show we are up-to-date 495Returns a single value from the environment database.
421 utime undef, undef, $fh;
422 496
423 close $fh 497=item cf::db_put $family => $key => $value
424 or return;
425 498
426 aio_rename "$runtime~", $runtime 499Stores the given C<$value> in the family. It can currently store binary
427 and return; 500data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
428 501
429 warn "runtime file written.\n";#d# 502=cut
430 503
504our $DB;
505
506sub db_init {
507 unless ($DB) {
508 $DB = BDB::db_create $DB_ENV;
509
510 cf::sync_job {
511 eval {
512 $DB->set_flags (BDB::CHKSUM);
513
514 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
515 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
516 cf::cleanup "db_open(db): $!" if $!;
517 };
518 cf::cleanup "db_open(db): $@" if $@;
519 };
431 1 520 }
521}
522
523sub db_get($$) {
524 my $key = "$_[0]/$_[1]";
525
526 cf::sync_job {
527 BDB::db_get $DB, undef, $key, my $data;
528
529 $! ? ()
530 : $data
531 }
532}
533
534sub db_put($$$) {
535 BDB::dbreq_pri 4;
536 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
537}
538
539=item cf::cache $id => [$paths...], $processversion => $process
540
541Generic caching function that returns the value of the resource $id,
542caching and regenerating as required.
543
544This function can block.
545
546=cut
547
548sub cache {
549 my ($id, $src, $processversion, $process) = @_;
550
551 my $meta =
552 join "\x00",
553 $processversion,
554 map {
555 aio_stat $_
556 and Carp::croak "$_: $!";
557
558 ($_, (stat _)[7,9])
559 } @$src;
560
561 my $dbmeta = db_get cache => "$id/meta";
562 if ($dbmeta ne $meta) {
563 # changed, we may need to process
564
565 my @data;
566 my $md5;
567
568 for (0 .. $#$src) {
569 0 <= aio_load $src->[$_], $data[$_]
570 or Carp::croak "$src->[$_]: $!";
571 }
572
573 # if processing is expensive, check
574 # checksum first
575 if (1) {
576 $md5 =
577 join "\x00",
578 $processversion,
579 map {
580 cf::cede_to_tick;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src;
583
584
585 my $dbmd5 = db_get cache => "$id/md5";
586 if ($dbmd5 eq $md5) {
587 db_put cache => "$id/meta", $meta;
588
589 return db_get cache => "$id/data";
590 }
591 }
592
593 my $t1 = Time::HiRes::time;
594 my $data = $process->(\@data);
595 my $t2 = Time::HiRes::time;
596
597 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
598
599 db_put cache => "$id/data", $data;
600 db_put cache => "$id/md5" , $md5;
601 db_put cache => "$id/meta", $meta;
602
603 return $data;
604 }
605
606 db_get cache => "$id/data"
432} 607}
433 608
434=item cf::datalog type => key => value, ... 609=item cf::datalog type => key => value, ...
435 610
436Log a datalog packet of the given type with the given key-value pairs. 611Log 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") 629attach callbacks/event handlers (a collection of which is called an "attachment")
455to it. All such attachable objects support the following methods. 630to it. All such attachable objects support the following methods.
456 631
457In the following description, CLASS can be any of C<global>, C<object> 632In 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 633C<player>, C<client> or C<map> (i.e. the attachable objects in
459crossfire+). 634Crossfire TRT).
460 635
461=over 4 636=over 4
462 637
463=item $attachable->attach ($attachment, key => $value...) 638=item $attachable->attach ($attachment, key => $value...)
464 639
666 _attach $registry, $klass, @attach; 841 _attach $registry, $klass, @attach;
667 } 842 }
668 843
669 $obj->{$name} = \%arg; 844 $obj->{$name} = \%arg;
670 } else { 845 } else {
671 warn "object uses attachment '$name' that is not available, postponing.\n"; 846 warn "object uses attachment '$name' which is not available, postponing.\n";
672 } 847 }
673 848
674 $obj->{_attachment}{$name} = undef; 849 $obj->{_attachment}{$name} = undef;
675} 850}
676 851
716 "; 891 ";
717 die if $@; 892 die if $@;
718} 893}
719 894
720our $override; 895our $override;
721our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 896our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
722 897
723sub override { 898sub override {
724 $override = 1; 899 $override = 1;
725 @invoke_results = (); 900 @INVOKE_RESULTS = (@_);
726} 901}
727 902
728sub do_invoke { 903sub do_invoke {
729 my $event = shift; 904 my $event = shift;
730 my $callbacks = shift; 905 my $callbacks = shift;
731 906
732 @invoke_results = (); 907 @INVOKE_RESULTS = ();
733 908
734 local $override; 909 local $override;
735 910
736 for (@$callbacks) { 911 for (@$callbacks) {
737 eval { &{$_->[1]} }; 912 eval { &{$_->[1]} };
754 929
755Generate an object-specific event with the given arguments. 930Generate an object-specific event with the given arguments.
756 931
757This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 932This 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 933removed in future versions), and there is no public API to access override
759results (if you must, access C<@cf::invoke_results> directly). 934results (if you must, access C<@cf::INVOKE_RESULTS> directly).
760 935
761=back 936=back
762 937
763=cut 938=cut
764 939
765############################################################################# 940#############################################################################
766# object support 941# object support
942#
943
944sub _can_merge {
945 my ($ob1, $ob2) = @_;
946
947 local $Storable::canonical = 1;
948 my $fob1 = Storable::freeze $ob1;
949 my $fob2 = Storable::freeze $ob2;
950
951 $fob1 eq $fob2
952}
767 953
768sub reattach { 954sub reattach {
769 # basically do the same as instantiate, without calling instantiate 955 # basically do the same as instantiate, without calling instantiate
770 my ($obj) = @_; 956 my ($obj) = @_;
771 957
874 or return; 1060 or return;
875 $av = eval { (Storable::thaw $av)->{objs} }; 1061 $av = eval { (Storable::thaw $av)->{objs} };
876 } 1062 }
877 1063
878 warn sprintf "loading %s (%d)\n", 1064 warn sprintf "loading %s (%d)\n",
879 $filename, length $data, scalar @{$av || []};#d# 1065 $filename, length $data, scalar @{$av || []};
880 return ($data, $av); 1066 return ($data, $av);
881} 1067}
1068
1069=head2 COMMAND CALLBACKS
1070
1071=over 4
1072
1073=cut
882 1074
883############################################################################# 1075#############################################################################
884# command handling &c 1076# command handling &c
885 1077
886=item cf::register_command $name => \&callback($ob,$args); 1078=item cf::register_command $name => \&callback($ob,$args);
899 push @{ $COMMAND{$name} }, [$caller, $cb]; 1091 push @{ $COMMAND{$name} }, [$caller, $cb];
900} 1092}
901 1093
902=item cf::register_extcmd $name => \&callback($pl,$packet); 1094=item cf::register_extcmd $name => \&callback($pl,$packet);
903 1095
904Register a callbackf ro execution when the client sends an extcmd packet. 1096Register a callback for execution when the client sends an (synchronous)
1097extcmd packet. Ext commands will be processed in the order they are
1098received by the server, like other user commands. The first argument is
1099the logged-in player. Ext commands can only be processed after a player
1100has logged in successfully.
905 1101
906If the callback returns something, it is sent back as if reply was being 1102If the callback returns something, it is sent back as if reply was being
907called. 1103called.
908 1104
1105=item cf::register_exticmd $name => \&callback($ns,$packet);
1106
1107Register a callback for execution when the client sends an (asynchronous)
1108exticmd packet. Exti commands are processed by the server as soon as they
1109are received, i.e. out of order w.r.t. other commands. The first argument
1110is a client socket. Exti commands can be received anytime, even before
1111log-in.
1112
1113If the callback returns something, it is sent back as if reply was being
1114called.
1115
909=cut 1116=cut
910 1117
911sub register_extcmd { 1118sub register_extcmd {
912 my ($name, $cb) = @_; 1119 my ($name, $cb) = @_;
913 1120
914 $EXTCMD{$name} = $cb; 1121 $EXTCMD{$name} = $cb;
1122}
1123
1124sub register_exticmd {
1125 my ($name, $cb) = @_;
1126
1127 $EXTICMD{$name} = $cb;
915} 1128}
916 1129
917cf::player->attach ( 1130cf::player->attach (
918 on_command => sub { 1131 on_command => sub {
919 my ($pl, $name, $params) = @_; 1132 my ($pl, $name, $params) = @_;
928 cf::override; 1141 cf::override;
929 }, 1142 },
930 on_extcmd => sub { 1143 on_extcmd => sub {
931 my ($pl, $buf) = @_; 1144 my ($pl, $buf) = @_;
932 1145
933 my $msg = eval { from_json $buf }; 1146 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
934 1147
935 if (ref $msg) { 1148 if (ref $msg) {
1149 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg
1151 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153
1154 my @reply;
1155
936 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1156 if (my $cb = $EXTCMD{$type}) {
937 if (my %reply = $cb->($pl, $msg)) { 1157 @reply = $cb->($pl, @payload);
938 $pl->ext_reply ($msg->{msgid}, %reply);
939 }
940 } 1158 }
1159
1160 $pl->ext_reply ($reply, @reply)
1161 if $reply;
1162
941 } else { 1163 } else {
942 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1164 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
943 } 1165 }
944 1166
945 cf::override; 1167 cf::override;
946 }, 1168 },
947); 1169);
948 1170
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 { 1171sub load_extensions {
1172 cf::sync_job {
1173 my %todo;
1174
984 for my $ext (<$LIBDIR/*.ext>) { 1175 for my $path (<$LIBDIR/*.ext>) {
985 next unless -r $ext; 1176 next unless -r $path;
986 eval { 1177
987 load_extension $ext; 1178 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1179 my $base = $1;
1180 my $pkg = $1;
1181 $pkg =~ s/[^[:word:]]/_/g;
1182 $pkg = "ext::$pkg";
1183
1184 open my $fh, "<:utf8", $path
1185 or die "$path: $!";
1186
1187 my $source = do { local $/; <$fh> };
1188
1189 my %ext = (
1190 path => $path,
1191 base => $base,
1192 pkg => $pkg,
1193 );
1194
1195 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1196 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1197
1198 $ext{source} =
1199 "package $pkg; use strict; use utf8;\n"
1200 . "#line 1 \"$path\"\n{\n"
1201 . $source
1202 . "\n};\n1";
1203
1204 $todo{$base} = \%ext;
1205 }
1206
1207 my %done;
1208 while (%todo) {
1209 my $progress;
1210
1211 while (my ($k, $v) = each %todo) {
1212 for (split /,\s*/, $v->{meta}{depends}) {
1213 goto skip
1214 unless exists $done{$_};
1215 }
1216
1217 warn "... loading '$k' into '$v->{pkg}'\n";
1218
1219 unless (eval $v->{source}) {
1220 my $msg = $@ ? "$v->{path}: $@\n"
1221 : "$v->{base}: extension inactive.\n";
1222
1223 if (exists $v->{meta}{mandatory}) {
1224 warn $msg;
1225 warn "mandatory extension failed to load, exiting.\n";
1226 exit 1;
1227 }
1228
1229 warn $msg;
1230 }
1231
1232 $done{$k} = delete $todo{$k};
1233 push @EXTS, $v->{pkg};
1234 $progress = 1;
988 1 1235 }
989 } or warn "$ext not loaded: $@"; 1236
1237 skip:
1238 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1239 unless $progress;
1240 }
990 } 1241 };
991} 1242}
992 1243
993############################################################################# 1244#############################################################################
1245
1246=back
994 1247
995=head2 CORE EXTENSIONS 1248=head2 CORE EXTENSIONS
996 1249
997Functions and methods that extend core crossfire objects. 1250Functions and methods that extend core crossfire objects.
998 1251
1069 1322
1070 aio_mkdir playerdir $pl, 0770; 1323 aio_mkdir playerdir $pl, 0770;
1071 $pl->{last_save} = $cf::RUNTIME; 1324 $pl->{last_save} = $cf::RUNTIME;
1072 1325
1073 $pl->save_pl ($path); 1326 $pl->save_pl ($path);
1074 Coro::cede; 1327 cf::cede_to_tick;
1075} 1328}
1076 1329
1077sub new($) { 1330sub new($) {
1078 my ($login) = @_; 1331 my ($login) = @_;
1079 1332
1083 $self->{deny_save} = 1; 1336 $self->{deny_save} = 1;
1084 1337
1085 $cf::PLAYER{$login} = $self; 1338 $cf::PLAYER{$login} = $self;
1086 1339
1087 $self 1340 $self
1341}
1342
1343=item $player->send_msg ($channel, $msg, $color, [extra...])
1344
1345=cut
1346
1347sub send_msg {
1348 my $ns = shift->ns
1349 or return;
1350 $ns->send_msg (@_);
1088} 1351}
1089 1352
1090=item $pl->quit_character 1353=item $pl->quit_character
1091 1354
1092Nukes the player without looking back. If logged in, the connection will 1355Nukes the player without looking back. If logged in, the connection will
1186 } 1449 }
1187 1450
1188 \@paths 1451 \@paths
1189} 1452}
1190 1453
1454=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1455
1456Expand crossfire pod fragments into protocol xml.
1457
1458=cut
1459
1460sub expand_cfpod {
1461 ((my $self), (local $_)) = @_;
1462
1463 # escape & and <
1464 s/&/&amp;/g;
1465 s/(?<![BIUGH])</&lt;/g;
1466
1467 # this is buggy, it needs to properly take care of nested <'s
1468
1469 1 while
1470 # replace B<>, I<>, U<> etc.
1471 s/B<([^\>]*)>/<b>$1<\/b>/
1472 || s/I<([^\>]*)>/<i>$1<\/i>/
1473 || s/U<([^\>]*)>/<u>$1<\/u>/
1474 # replace G<male|female> tags
1475 || s{G<([^>|]*)\|([^>]*)>}{
1476 $self->gender ? $2 : $1
1477 }ge
1478 # replace H<hint text>
1479 || s{H<([^\>]*)>}
1480 {
1481 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1482 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1483 "")
1484 [$self->{hintmode}]
1485 }ge;
1486
1487 # create single paragraphs (very hackish)
1488 s/(?<=\S)\n(?=\w)/ /g;
1489
1490 # compress some whitespace
1491 s/\s+\n/\n/g; # ws line-ends
1492 s/\n\n+/\n/g; # double lines
1493 s/^\n+//; # beginning lines
1494 s/\n+$//; # ending lines
1495
1496 $_
1497}
1498
1499sub hintmode {
1500 $_[0]{hintmode} = $_[1] if @_ > 1;
1501 $_[0]{hintmode}
1502}
1503
1191=item $player->ext_reply ($msgid, %msg) 1504=item $player->ext_reply ($msgid, @msg)
1192 1505
1193Sends an ext reply to the player. 1506Sends an ext reply to the player.
1194 1507
1195=cut 1508=cut
1196 1509
1197sub ext_reply($$%) { 1510sub ext_reply($$@) {
1198 my ($self, $id, %msg) = @_; 1511 my ($self, $id, @msg) = @_;
1199 1512
1200 $msg{msgid} = $id; 1513 $self->ns->ext_reply ($id, @msg)
1201
1202 $self->send ("ext " . cf::to_json \%msg);
1203} 1514}
1204 1515
1205=item $player->ext_event ($type, %msg) 1516=item $player->ext_msg ($type, @msg)
1206 1517
1207Sends an ext event to the client. 1518Sends an ext event to the client.
1208 1519
1209=cut 1520=cut
1210 1521
1211sub ext_event($$%) { 1522sub ext_msg($$@) {
1212 my ($self, $type, %msg) = @_; 1523 my ($self, $type, @msg) = @_;
1213 1524
1214 $self->ns->ext_event ($type, %msg); 1525 $self->ns->ext_msg ($type, @msg);
1215} 1526}
1216 1527
1217=head3 cf::region 1528=head3 cf::region
1218 1529
1219=over 4 1530=over 4
1222 1533
1223package cf::region; 1534package cf::region;
1224 1535
1225=item cf::region::find_by_path $path 1536=item cf::region::find_by_path $path
1226 1537
1227Tries to decuce the probable region for a map knowing only its path. 1538Tries to decuce the likely region for a map knowing only its path.
1228 1539
1229=cut 1540=cut
1230 1541
1231sub find_by_path($) { 1542sub find_by_path($) {
1232 my ($path) = @_; 1543 my ($path) = @_;
1233 1544
1234 my ($match, $specificity); 1545 my ($match, $specificity);
1235 1546
1236 for my $region (list) { 1547 for my $region (list) {
1237 if ($region->match && $path =~ $region->match) { 1548 if ($region->{match} && $path =~ $region->{match}) {
1238 ($match, $specificity) = ($region, $region->specificity) 1549 ($match, $specificity) = ($region, $region->specificity)
1239 if $region->specificity > $specificity; 1550 if $region->specificity > $specificity;
1240 } 1551 }
1241 } 1552 }
1242 1553
1306 my ($self, $merge) = @_; 1617 my ($self, $merge) = @_;
1307 1618
1308 # we have to keep some variables in memory intact 1619 # we have to keep some variables in memory intact
1309 local $self->{path}; 1620 local $self->{path};
1310 local $self->{load_path}; 1621 local $self->{load_path};
1311 local $self->{deny_save};
1312 local $self->{deny_reset};
1313 1622
1314 $self->SUPER::thawer_merge ($merge); 1623 $self->SUPER::thawer_merge ($merge);
1315} 1624}
1316 1625
1317sub normalise { 1626sub normalise {
1364 $self->init; # pass $1 etc. 1673 $self->init; # pass $1 etc.
1365 return $self; 1674 return $self;
1366 } 1675 }
1367 } 1676 }
1368 1677
1369 Carp::carp "unable to resolve path '$path' (base '$base')."; 1678 Carp::cluck "unable to resolve path '$path' (base '$base').";
1370 () 1679 ()
1371} 1680}
1372 1681
1373sub init { 1682sub init {
1374 my ($self) = @_; 1683 my ($self) = @_;
1415sub change_all_map_light { 1724sub change_all_map_light {
1416 my ($change) = @_; 1725 my ($change) = @_;
1417 1726
1418 $_->change_map_light ($change) 1727 $_->change_map_light ($change)
1419 for grep $_->outdoor, values %cf::MAP; 1728 for grep $_->outdoor, values %cf::MAP;
1729}
1730
1731sub decay_objects {
1732 my ($self) = @_;
1733
1734 return if $self->{deny_reset};
1735
1736 $self->do_decay_objects;
1420} 1737}
1421 1738
1422sub unlink_save { 1739sub unlink_save {
1423 my ($self) = @_; 1740 my ($self) = @_;
1424 1741
1482 $self->load_header_orig 1799 $self->load_header_orig
1483 or return; 1800 or return;
1484 $self->prepare_orig; 1801 $self->prepare_orig;
1485 } 1802 }
1486 1803
1804 $self->{deny_reset} = 1
1805 if $self->no_reset;
1806
1487 $self->default_region (cf::region::find_by_path $self->{path}) 1807 $self->default_region (cf::region::find_by_path $self->{path})
1488 unless $self->default_region; 1808 unless $self->default_region;
1489 1809
1490 1 1810 1
1491} 1811}
1506 $map->{last_save} = $cf::RUNTIME; 1826 $map->{last_save} = $cf::RUNTIME;
1507 1827
1508 $map->load_header 1828 $map->load_header
1509 or return; 1829 or return;
1510 1830
1511 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1831 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1512 # doing this can freeze the server in a sync job, obviously 1832 # doing this can freeze the server in a sync job, obviously
1513 #$cf::WAIT_FOR_TICK->wait; 1833 #$cf::WAIT_FOR_TICK->wait;
1514 $map->reset; 1834 $map->reset;
1515 undef $guard; 1835 undef $guard;
1516 return find $path; 1836 return find $path;
1529 local $self->{deny_reset} = 1; # loading can take a long time 1849 local $self->{deny_reset} = 1; # loading can take a long time
1530 1850
1531 my $path = $self->{path}; 1851 my $path = $self->{path};
1532 1852
1533 { 1853 {
1854 my $guard1 = cf::lock_acquire "map_data:$path";
1534 my $guard = cf::lock_acquire "map_load:$path"; 1855 my $guard2 = cf::lock_acquire "map_load:$path";
1535 1856
1536 return if $self->in_memory != cf::MAP_SWAPPED; 1857 return if $self->in_memory != cf::MAP_SWAPPED;
1537 1858
1538 $self->in_memory (cf::MAP_LOADING); 1859 $self->in_memory (cf::MAP_LOADING);
1539 1860
1540 $self->alloc; 1861 $self->alloc;
1541 1862
1542 $self->pre_load; 1863 $self->pre_load;
1543 Coro::cede; 1864 cf::cede_to_tick;
1544 1865
1545 $self->_load_objects ($self->{load_path}, 1) 1866 $self->_load_objects ($self->{load_path}, 1)
1546 or return; 1867 or return;
1547 1868
1548 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1869 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1554 $self->clear_unique_items; 1875 $self->clear_unique_items;
1555 $self->_load_objects ($uniq, 0); 1876 $self->_load_objects ($uniq, 0);
1556 } 1877 }
1557 } 1878 }
1558 1879
1559 Coro::cede; 1880 cf::cede_to_tick;
1560 # now do the right thing for maps 1881 # now do the right thing for maps
1561 $self->link_multipart_objects; 1882 $self->link_multipart_objects;
1562 $self->difficulty ($self->estimate_difficulty) 1883 $self->difficulty ($self->estimate_difficulty)
1563 unless $self->difficulty; 1884 unless $self->difficulty;
1564 Coro::cede; 1885 cf::cede_to_tick;
1565 1886
1566 unless ($self->{deny_activate}) { 1887 unless ($self->{deny_activate}) {
1567 $self->decay_objects; 1888 $self->decay_objects;
1568 $self->fix_auto_apply; 1889 $self->fix_auto_apply;
1569 $self->update_buttons; 1890 $self->update_buttons;
1570 Coro::cede; 1891 cf::cede_to_tick;
1571 $self->set_darkness_map; 1892 $self->set_darkness_map;
1572 Coro::cede; 1893 cf::cede_to_tick;
1573 $self->activate; 1894 $self->activate;
1574 } 1895 }
1896
1897 $self->{last_save} = $cf::RUNTIME;
1898 $self->last_access ($cf::RUNTIME);
1575 1899
1576 $self->in_memory (cf::MAP_IN_MEMORY); 1900 $self->in_memory (cf::MAP_IN_MEMORY);
1577 } 1901 }
1578 1902
1579 $self->post_load; 1903 $self->post_load;
1583 my ($self, $ob) = @_; 1907 my ($self, $ob) = @_;
1584 1908
1585 return find "~" . $ob->name . "/" . $self->{path} 1909 return find "~" . $ob->name . "/" . $self->{path}
1586 if $self->per_player; 1910 if $self->per_player;
1587 1911
1912# return find "?party/" . $ob->name . "/" . $self->{path}
1913# if $self->per_party;
1914
1588 $self 1915 $self
1589} 1916}
1590 1917
1591# find and load all maps in the 3x3 area around a map 1918# find and load all maps in the 3x3 area around a map
1592sub load_diag { 1919sub load_neighbours {
1593 my ($map) = @_; 1920 my ($map) = @_;
1594 1921
1595 my @diag; # diagonal neighbours 1922 my @neigh; # diagonal neighbours
1596 1923
1597 for (0 .. 3) { 1924 for (0 .. 3) {
1598 my $neigh = $map->tile_path ($_) 1925 my $neigh = $map->tile_path ($_)
1599 or next; 1926 or next;
1600 $neigh = find $neigh, $map 1927 $neigh = find $neigh, $map
1601 or next; 1928 or next;
1602 $neigh->load; 1929 $neigh->load;
1603 1930
1931 push @neigh,
1604 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1932 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1605 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1933 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1606 } 1934 }
1607 1935
1608 for (@diag) { 1936 for (grep defined $_->[0], @neigh) {
1937 my ($path, $origin) = @$_;
1609 my $neigh = find @$_ 1938 my $neigh = find $path, $origin
1610 or next; 1939 or next;
1611 $neigh->load; 1940 $neigh->load;
1612 } 1941 }
1613} 1942}
1614 1943
1619} 1948}
1620 1949
1621sub do_load_sync { 1950sub do_load_sync {
1622 my ($map) = @_; 1951 my ($map) = @_;
1623 1952
1953 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1954 if $Coro::current == $Coro::main;
1955
1624 cf::sync_job { $map->load }; 1956 cf::sync_job { $map->load };
1625} 1957}
1626 1958
1627our %MAP_PREFETCH; 1959our %MAP_PREFETCH;
1628our $MAP_PREFETCHER = undef; 1960our $MAP_PREFETCHER = undef;
1629 1961
1630sub find_async { 1962sub find_async {
1631 my ($path, $origin) = @_; 1963 my ($path, $origin, $load) = @_;
1632 1964
1633 $path = normalise $path, $origin && $origin->{path}; 1965 $path = normalise $path, $origin && $origin->{path};
1634 1966
1635 if (my $map = $cf::MAP{$path}) { 1967 if (my $map = $cf::MAP{$path}) {
1636 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1968 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1637 } 1969 }
1638 1970
1639 undef $MAP_PREFETCH{$path}; 1971 $MAP_PREFETCH{$path} |= $load;
1972
1640 $MAP_PREFETCHER ||= cf::async { 1973 $MAP_PREFETCHER ||= cf::async {
1641 while (%MAP_PREFETCH) { 1974 while (%MAP_PREFETCH) {
1642 for my $path (keys %MAP_PREFETCH) { 1975 while (my ($k, $v) = each %MAP_PREFETCH) {
1643 my $map = find $path 1976 if (my $map = find $k) {
1644 or next;
1645 $map->load; 1977 $map->load if $v;
1978 }
1646 1979
1647 delete $MAP_PREFETCH{$path}; 1980 delete $MAP_PREFETCH{$k};
1648 } 1981 }
1649 } 1982 }
1650 undef $MAP_PREFETCHER; 1983 undef $MAP_PREFETCHER;
1651 }; 1984 };
1652 $MAP_PREFETCHER->prio (6); 1985 $MAP_PREFETCHER->prio (6);
1655} 1988}
1656 1989
1657sub save { 1990sub save {
1658 my ($self) = @_; 1991 my ($self) = @_;
1659 1992
1660 my $lock = cf::lock_acquire "map_data:" . $self->path; 1993 my $lock = cf::lock_acquire "map_data:$self->{path}";
1661 1994
1662 $self->{last_save} = $cf::RUNTIME; 1995 $self->{last_save} = $cf::RUNTIME;
1663 1996
1664 return unless $self->dirty; 1997 return unless $self->dirty;
1665 1998
1688 my ($self) = @_; 2021 my ($self) = @_;
1689 2022
1690 # save first because save cedes 2023 # save first because save cedes
1691 $self->save; 2024 $self->save;
1692 2025
1693 my $lock = cf::lock_acquire "map_data:" . $self->path; 2026 my $lock = cf::lock_acquire "map_data:$self->{path}";
1694 2027
1695 return if $self->players; 2028 return if $self->players;
1696 return if $self->in_memory != cf::MAP_IN_MEMORY; 2029 return if $self->in_memory != cf::MAP_IN_MEMORY;
1697 return if $self->{deny_save}; 2030 return if $self->{deny_save};
1698 2031
1702 2035
1703sub reset_at { 2036sub reset_at {
1704 my ($self) = @_; 2037 my ($self) = @_;
1705 2038
1706 # TODO: safety, remove and allow resettable per-player maps 2039 # 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}; 2040 return 1e99 if $self->{deny_reset};
1709 2041
1710 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2042 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1711 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2043 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1712 2044
1723 my ($self) = @_; 2055 my ($self) = @_;
1724 2056
1725 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2057 my $lock = cf::lock_acquire "map_data:$self->{path}";
1726 2058
1727 return if $self->players; 2059 return if $self->players;
1728 return if $self->isa ("ext::map_per_player");#d#
1729 2060
1730 warn "resetting map ", $self->path;#d# 2061 warn "resetting map ", $self->path;
1731 2062
1732 $self->in_memory (cf::MAP_SWAPPED); 2063 $self->in_memory (cf::MAP_SWAPPED);
1733 2064
1734 # need to save uniques path 2065 # need to save uniques path
1735 unless ($self->{deny_save}) { 2066 unless ($self->{deny_save}) {
1767 $cf::MAP{$self->path} = $self; 2098 $cf::MAP{$self->path} = $self;
1768 2099
1769 $self->reset; # polite request, might not happen 2100 $self->reset; # polite request, might not happen
1770} 2101}
1771 2102
2103=item $maps = cf::map::tmp_maps
2104
2105Returns an arrayref with all map paths of currently instantiated and saved
2106maps. May block.
2107
2108=cut
2109
2110sub tmp_maps() {
2111 [
2112 map {
2113 utf8::decode $_;
2114 /\.map$/
2115 ? normalise $_
2116 : ()
2117 } @{ aio_readdir $TMPDIR or [] }
2118 ]
2119}
2120
2121=item $maps = cf::map::random_maps
2122
2123Returns an arrayref with all map paths of currently instantiated and saved
2124random maps. May block.
2125
2126=cut
2127
2128sub random_maps() {
2129 [
2130 map {
2131 utf8::decode $_;
2132 /\.map$/
2133 ? normalise "?random/$_"
2134 : ()
2135 } @{ aio_readdir $RANDOMDIR or [] }
2136 ]
2137}
2138
1772=item cf::map::unique_maps 2139=item cf::map::unique_maps
1773 2140
1774Returns an arrayref of paths of all shared maps that have 2141Returns an arrayref of paths of all shared maps that have
1775instantiated unique items. May block. 2142instantiated unique items. May block.
1776 2143
1777=cut 2144=cut
1778 2145
1779sub unique_maps() { 2146sub unique_maps() {
1780 my $files = aio_readdir $UNIQUEDIR 2147 [
1781 or return; 2148 map {
1782
1783 my @paths;
1784
1785 for (@$files) {
1786 utf8::decode $_; 2149 utf8::decode $_;
1787 next if /\.pst$/; 2150 /\.map$/
1788 next unless /^$PATH_SEP/o; 2151 ? normalise $_
1789 2152 : ()
1790 push @paths, cf::map::normalise $_; 2153 } @{ aio_readdir $UNIQUEDIR or [] }
1791 } 2154 ]
1792
1793 \@paths
1794} 2155}
1795 2156
1796package cf; 2157package cf;
1797 2158
1798=back 2159=back
1844 2205
1845 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2206 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1846 2207
1847 if ($self->{record_replies}) { 2208 if ($self->{record_replies}) {
1848 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2209 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2210
1849 } else { 2211 } else {
2212 my $pl = $self->contr;
2213
2214 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2215 my $dialog = $pl->{npc_dialog};
2216 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2217
2218 } else {
1850 $msg = $npc->name . " says: $msg" if $npc; 2219 $msg = $npc->name . " says: $msg" if $npc;
1851 $self->message ($msg, $flags); 2220 $self->message ($msg, $flags);
2221 }
1852 } 2222 }
2223}
2224
2225=item $object->send_msg ($channel, $msg, $color, [extra...])
2226
2227=cut
2228
2229sub cf::object::send_msg {
2230 my $pl = shift->contr
2231 or return;
2232 $pl->send_msg (@_);
1853} 2233}
1854 2234
1855=item $player_object->may ("access") 2235=item $player_object->may ("access")
1856 2236
1857Returns wether the given player is authorized to access resource "access" 2237Returns wether the given player is authorized to access resource "access"
1936 # use -1 or undef as default coordinates, not 0, 0 2316 # use -1 or undef as default coordinates, not 0, 0
1937 ($x, $y) = ($map->enter_x, $map->enter_y) 2317 ($x, $y) = ($map->enter_x, $map->enter_y)
1938 if $x <=0 && $y <= 0; 2318 if $x <=0 && $y <= 0;
1939 2319
1940 $map->load; 2320 $map->load;
1941 $map->load_diag; 2321 $map->load_neighbours;
1942 2322
1943 return unless $self->contr->active; 2323 return unless $self->contr->active;
1944 $self->activate_recursive; 2324 $self->activate_recursive;
1945 2325
1946 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2326 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1947 $self->enter_map ($map, $x, $y); 2327 $self->enter_map ($map, $x, $y);
1948} 2328}
1949 2329
1950=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2330=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1951 2331
1952Moves the player to the given map-path and coordinates by first freezing 2332Moves the player to the given map-path and coordinates by first freezing
1953her, loading and preparing them map, calling the provided $check callback 2333her, loading and preparing them map, calling the provided $check callback
1954that has to return the map if sucecssful, and then unfreezes the player on 2334that has to return the map if sucecssful, and then unfreezes the player on
1955the new (success) or old (failed) map position. 2335the new (success) or old (failed) map position. In either case, $done will
2336be called at the end of this process.
1956 2337
1957=cut 2338=cut
1958 2339
1959our $GOTOGEN; 2340our $GOTOGEN;
1960 2341
1961sub cf::object::player::goto { 2342sub cf::object::player::goto {
1962 my ($self, $path, $x, $y, $check) = @_; 2343 my ($self, $path, $x, $y, $check, $done) = @_;
1963 2344
1964 # do generation counting so two concurrent goto's will be executed in-order 2345 # do generation counting so two concurrent goto's will be executed in-order
1965 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2346 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1966 2347
1967 $self->enter_link; 2348 $self->enter_link;
1987 2368
1988 if ($gen == $self->{_goto_generation}) { 2369 if ($gen == $self->{_goto_generation}) {
1989 delete $self->{_goto_generation}; 2370 delete $self->{_goto_generation};
1990 $self->leave_link ($map, $x, $y); 2371 $self->leave_link ($map, $x, $y);
1991 } 2372 }
2373
2374 $done->() if $done;
1992 })->prio (1); 2375 })->prio (1);
1993} 2376}
1994 2377
1995=item $player_object->enter_exit ($exit_object) 2378=item $player_object->enter_exit ($exit_object)
1996 2379
2065 my $hp = $exit->stats->hp; 2448 my $hp = $exit->stats->hp;
2066 my $sp = $exit->stats->sp; 2449 my $sp = $exit->stats->sp;
2067 2450
2068 $self->enter_link; 2451 $self->enter_link;
2069 2452
2453 # if exit is damned, update players death & WoR home-position
2454 $self->contr->savebed ($slaying, $hp, $sp)
2455 if $exit->flag (FLAG_DAMNED);
2456
2070 (async { 2457 (async {
2071 $self->deactivate_recursive; # just to be sure 2458 $self->deactivate_recursive; # just to be sure
2072 unless (eval { 2459 unless (eval {
2073 $self->goto ($slaying, $hp, $sp); 2460 $self->goto ($slaying, $hp, $sp);
2074 2461
2101 2488
2102 utf8::encode $text; 2489 utf8::encode $text;
2103 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2490 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2104} 2491}
2105 2492
2493=item $client->send_msg ($channel, $msg, $color, [extra...])
2494
2495Send a drawinfo or msg packet to the client, formatting the msg for the
2496client if neccessary. C<$type> should be a string identifying the type of
2497the message, with C<log> being the default. If C<$color> is negative, suppress
2498the message unless the client supports the msg packet.
2499
2500=cut
2501
2502sub cf::client::send_msg {
2503 my ($self, $channel, $msg, $color, @extra) = @_;
2504
2505 $msg = $self->pl->expand_cfpod ($msg);
2506
2507 $color &= cf::NDI_CLIENT_MASK; # just in case...
2508
2509 if (ref $channel) {
2510 # send meta info to client, if not yet sent
2511 unless (exists $self->{channel}{$channel->{id}}) {
2512 $self->{channel}{$channel->{id}} = $channel;
2513 $self->ext_msg (channel_info => $channel);
2514 }
2515
2516 $channel = $channel->{id};
2517 }
2518
2519 return unless @extra || length $msg;
2520
2521 if ($self->can_msg) {
2522 # default colour, mask it out
2523 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2524 if $color & cf::NDI_DEF;
2525
2526 $self->send_packet ("msg " . $self->{json_coder}->encode (
2527 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2528 } else {
2529 if ($color >= 0) {
2530 # replace some tags by gcfclient-compatible ones
2531 for ($msg) {
2532 1 while
2533 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2534 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2535 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2536 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2537 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2538 }
2539
2540 $color &= cf::NDI_COLOR_MASK;
2541
2542 utf8::encode $msg;
2543
2544 if (0 && $msg =~ /\[/) {
2545 # COMMAND/INFO
2546 $self->send_packet ("drawextinfo $color 10 8 $msg")
2547 } else {
2548 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2549 $self->send_packet ("drawinfo $color $msg")
2550 }
2551 }
2552 }
2553}
2554
2106=item $client->ext_event ($type, %msg) 2555=item $client->ext_msg ($type, @msg)
2107 2556
2108Sends an exti event to the client. 2557Sends an ext event to the client.
2109 2558
2110=cut 2559=cut
2111 2560
2112sub cf::client::ext_event($$%) { 2561sub cf::client::ext_msg($$@) {
2113 my ($self, $type, %msg) = @_; 2562 my ($self, $type, @msg) = @_;
2114 2563
2564 if ($self->extcmd == 2) {
2565 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2566 } elsif ($self->extcmd == 1) { # TODO: remove
2115 $msg{msgtype} = "event_$type"; 2567 push @msg, msgtype => "event_$type";
2116 $self->send_packet ("ext " . cf::to_json \%msg); 2568 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2569 }
2570}
2571
2572=item $client->ext_reply ($msgid, @msg)
2573
2574Sends an ext reply to the client.
2575
2576=cut
2577
2578sub cf::client::ext_reply($$@) {
2579 my ($self, $id, @msg) = @_;
2580
2581 if ($self->extcmd == 2) {
2582 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2583 } elsif ($self->extcmd == 1) {
2584 #TODO: version 1, remove
2585 unshift @msg, msgtype => "reply", msgid => $id;
2586 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2587 }
2117} 2588}
2118 2589
2119=item $success = $client->query ($flags, "text", \&cb) 2590=item $success = $client->query ($flags, "text", \&cb)
2120 2591
2121Queues a query to the client, calling the given callback with 2592Queues a query to the client, calling the given callback with
2122the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2593the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2123C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2594C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2124 2595
2125Queries can fail, so check the return code. Or don't, as queries will become 2596Queries can fail, so check the return code. Or don't, as queries will
2126reliable at some point in the future. 2597become reliable at some point in the future.
2127 2598
2128=cut 2599=cut
2129 2600
2130sub cf::client::query { 2601sub cf::client::query {
2131 my ($self, $flags, $text, $cb) = @_; 2602 my ($self, $flags, $text, $cb) = @_;
2139 utf8::encode $text; 2610 utf8::encode $text;
2140 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2611 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2141 2612
2142 $self->send_packet ($self->{query_queue}[0][0]) 2613 $self->send_packet ($self->{query_queue}[0][0])
2143 if @{ $self->{query_queue} } == 1; 2614 if @{ $self->{query_queue} } == 1;
2615
2616 1
2144} 2617}
2145 2618
2146cf::client->attach ( 2619cf::client->attach (
2620 on_connect => sub {
2621 my ($ns) = @_;
2622
2623 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2624 },
2147 on_reply => sub { 2625 on_reply => sub {
2148 my ($ns, $msg) = @_; 2626 my ($ns, $msg) = @_;
2149 2627
2150 # this weird shuffling is so that direct followup queries 2628 # this weird shuffling is so that direct followup queries
2151 # get handled first 2629 # get handled first
2163 } else { 2641 } else {
2164 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2642 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2165 } 2643 }
2166 } 2644 }
2167 }, 2645 },
2646 on_exticmd => sub {
2647 my ($ns, $buf) = @_;
2648
2649 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2650
2651 if (ref $msg) {
2652 my ($type, $reply, @payload) =
2653 "ARRAY" eq ref $msg
2654 ? @$msg
2655 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2656
2657 my @reply;
2658
2659 if (my $cb = $EXTICMD{$type}) {
2660 @reply = $cb->($ns, @payload);
2661 }
2662
2663 $ns->ext_reply ($reply, @reply)
2664 if $reply;
2665
2666 } else {
2667 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2668 }
2669
2670 cf::override;
2671 },
2168); 2672);
2169 2673
2170=item $client->async (\&cb) 2674=item $client->async (\&cb)
2171 2675
2172Create a new coroutine, running the specified callback. The coroutine will 2676Create a new coroutine, running the specified callback. The coroutine will
2213our $safe = new Safe "safe"; 2717our $safe = new Safe "safe";
2214our $safe_hole = new Safe::Hole; 2718our $safe_hole = new Safe::Hole;
2215 2719
2216$SIG{FPE} = 'IGNORE'; 2720$SIG{FPE} = 'IGNORE';
2217 2721
2218$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2722$safe->permit_only (Opcode::opset qw(
2723 :base_core :base_mem :base_orig :base_math
2724 grepstart grepwhile mapstart mapwhile
2725 sort time
2726));
2219 2727
2220# here we export the classes and methods available to script code 2728# here we export the classes and methods available to script code
2221 2729
2222=pod 2730=pod
2223 2731
2224The following functions and methods are available within a safe environment: 2732The following functions and methods are available within a safe environment:
2225 2733
2226 cf::object contr pay_amount pay_player map 2734 cf::object
2735 contr pay_amount pay_player map x y force_find force_add
2736 insert remove name archname title slaying race decrease_ob_nr
2737
2227 cf::object::player player 2738 cf::object::player
2228 cf::player peaceful 2739 player
2229 cf::map trigger 2740
2741 cf::player
2742 peaceful
2743
2744 cf::map
2745 trigger
2230 2746
2231=cut 2747=cut
2232 2748
2233for ( 2749for (
2234 ["cf::object" => qw(contr pay_amount pay_player map)], 2750 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2751 insert remove inv name archname title slaying race
2752 decrease_ob_nr)],
2235 ["cf::object::player" => qw(player)], 2753 ["cf::object::player" => qw(player)],
2236 ["cf::player" => qw(peaceful)], 2754 ["cf::player" => qw(peaceful)],
2237 ["cf::map" => qw(trigger)], 2755 ["cf::map" => qw(trigger)],
2238) { 2756) {
2239 no strict 'refs'; 2757 no strict 'refs';
2310=back 2828=back
2311 2829
2312=cut 2830=cut
2313 2831
2314############################################################################# 2832#############################################################################
2315
2316=head2 EXTENSION DATABASE SUPPORT
2317
2318Crossfire maintains a very simple database for extension use. It can
2319currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2320convert to/from binary).
2321
2322The parameter C<$family> should best start with the name of the extension
2323using it, it should be unique.
2324
2325=over 4
2326
2327=item $value = cf::db_get $family => $key
2328
2329Returns a single value from the database.
2330
2331=item cf::db_put $family => $key => $value
2332
2333Stores the given C<$value> in the family.
2334
2335=cut
2336
2337our $DB;
2338
2339sub db_init {
2340 unless ($DB) {
2341 $DB = BDB::db_create $DB_ENV;
2342
2343 cf::sync_job {
2344 eval {
2345 $DB->set_flags (BDB::CHKSUM);
2346
2347 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2348 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2349 cf::cleanup "db_open(db): $!" if $!;
2350 };
2351 cf::cleanup "db_open(db): $@" if $@;
2352 };
2353 }
2354}
2355
2356sub db_get($$) {
2357 my $key = "$_[0]/$_[1]";
2358
2359 cf::sync_job {
2360 BDB::db_get $DB, undef, $key, my $data;
2361
2362 $! ? ()
2363 : $data
2364 }
2365}
2366
2367sub db_put($$$) {
2368 BDB::dbreq_pri 4;
2369 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2370}
2371
2372=item cf::cache $id => [$paths...], $processversion => $process
2373
2374Generic caching function that returns the value of the resource $id,
2375caching and regenerating as required.
2376
2377This function can block.
2378
2379=cut
2380
2381sub cache {
2382 my ($id, $src, $processversion, $process) = @_;
2383
2384 my $meta =
2385 join "\x00",
2386 $processversion,
2387 map {
2388 aio_stat $_
2389 and Carp::croak "$_: $!";
2390
2391 ($_, (stat _)[7,9])
2392 } @$src;
2393
2394 my $dbmeta = db_get cache => "$id/meta";
2395 if ($dbmeta ne $meta) {
2396 # changed, we may need to process
2397
2398 my @data;
2399 my $md5;
2400
2401 for (0 .. $#$src) {
2402 0 <= aio_load $src->[$_], $data[$_]
2403 or Carp::croak "$src->[$_]: $!";
2404 }
2405
2406 # if processing is expensive, check
2407 # checksum first
2408 if (1) {
2409 $md5 =
2410 join "\x00",
2411 $processversion,
2412 map {
2413 Coro::cede;
2414 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2415 } 0.. $#$src;
2416
2417
2418 my $dbmd5 = db_get cache => "$id/md5";
2419 if ($dbmd5 eq $md5) {
2420 db_put cache => "$id/meta", $meta;
2421
2422 return db_get cache => "$id/data";
2423 }
2424 }
2425
2426 my $t1 = Time::HiRes::time;
2427 my $data = $process->(\@data);
2428 my $t2 = Time::HiRes::time;
2429
2430 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2431
2432 db_put cache => "$id/data", $data;
2433 db_put cache => "$id/md5" , $md5;
2434 db_put cache => "$id/meta", $meta;
2435
2436 return $data;
2437 }
2438
2439 db_get cache => "$id/data"
2440}
2441
2442=item fork_call { }, $args
2443
2444Executes the given code block with the given arguments in a seperate
2445process, returning the results. Everything must be serialisable with
2446Coro::Storable. May, of course, block. Note that the executed sub may
2447never block itself or use any form of Event handling.
2448
2449=cut
2450
2451sub fork_call(&@) {
2452 my ($cb, @args) = @_;
2453
2454# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2455# or die "socketpair: $!";
2456 pipe my $fh1, my $fh2
2457 or die "pipe: $!";
2458
2459 if (my $pid = fork) {
2460 close $fh2;
2461
2462 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2463 $res = Coro::Storable::thaw $res;
2464
2465 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2466
2467 die $$res unless "ARRAY" eq ref $res;
2468
2469 return wantarray ? @$res : $res->[-1];
2470 } else {
2471 reset_signals;
2472 local $SIG{__WARN__};
2473 local $SIG{__DIE__};
2474 eval {
2475 close $fh1;
2476
2477 my @res = eval { $cb->(@args) };
2478 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2479 };
2480
2481 warn $@ if $@;
2482 _exit 0;
2483 }
2484}
2485
2486
2487
2488#############################################################################
2489# the server's init and main functions 2833# the server's init and main functions
2490 2834
2491sub load_facedata($) { 2835sub load_facedata($) {
2492 my ($path) = @_; 2836 my ($path) = @_;
2837
2838 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2493 2839
2494 warn "loading facedata from $path\n"; 2840 warn "loading facedata from $path\n";
2495 2841
2496 my $facedata; 2842 my $facedata;
2497 0 < aio_load $path, $facedata 2843 0 < aio_load $path, $facedata
2500 $facedata = Coro::Storable::thaw $facedata; 2846 $facedata = Coro::Storable::thaw $facedata;
2501 2847
2502 $facedata->{version} == 2 2848 $facedata->{version} == 2
2503 or cf::cleanup "$path: version mismatch, cannot proceed."; 2849 or cf::cleanup "$path: version mismatch, cannot proceed.";
2504 2850
2851 # patch in the exptable
2852 $facedata->{resource}{"res/exp_table"} = {
2853 type => FT_RSRC,
2854 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2855 };
2856 cf::cede_to_tick;
2857
2505 { 2858 {
2506 my $faces = $facedata->{faceinfo}; 2859 my $faces = $facedata->{faceinfo};
2507 2860
2508 while (my ($face, $info) = each %$faces) { 2861 while (my ($face, $info) = each %$faces) {
2509 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2862 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2510 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2863 cf::face::set_visibility $idx, $info->{visibility};
2864 cf::face::set_magicmap $idx, $info->{magicmap};
2511 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2865 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2512 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2866 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2513 Coro::cede; 2867
2868 cf::cede_to_tick;
2514 } 2869 }
2515 2870
2516 while (my ($face, $info) = each %$faces) { 2871 while (my ($face, $info) = each %$faces) {
2517 next unless $info->{smooth}; 2872 next unless $info->{smooth};
2518 my $idx = cf::face::find $face 2873 my $idx = cf::face::find $face
2519 or next; 2874 or next;
2520 if (my $smooth = cf::face::find $info->{smooth}) { 2875 if (my $smooth = cf::face::find $info->{smooth}) {
2876 cf::face::set_smooth $idx, $smooth;
2521 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2877 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2522 } else { 2878 } else {
2523 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2879 warn "smooth face '$info->{smooth}' not found for face '$face'";
2524 } 2880 }
2525 Coro::cede; 2881
2882 cf::cede_to_tick;
2526 } 2883 }
2527 } 2884 }
2528 2885
2529 { 2886 {
2530 my $anims = $facedata->{animinfo}; 2887 my $anims = $facedata->{animinfo};
2531 2888
2532 while (my ($anim, $info) = each %$anims) { 2889 while (my ($anim, $info) = each %$anims) {
2533 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2890 cf::anim::set $anim, $info->{frames}, $info->{facings};
2534 Coro::cede; 2891 cf::cede_to_tick;
2535 } 2892 }
2536 2893
2537 cf::anim::invalidate_all; # d'oh 2894 cf::anim::invalidate_all; # d'oh
2538 } 2895 }
2539 2896
2897 {
2898 # TODO: for gcfclient pleasure, we should give resources
2899 # that gcfclient doesn't grok a >10000 face index.
2900 my $res = $facedata->{resource};
2901
2902 my $soundconf = delete $res->{"res/sound.conf"};
2903
2904 while (my ($name, $info) = each %$res) {
2905 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2906 my $data;
2907
2908 if ($info->{type} & 1) {
2909 # prepend meta info
2910
2911 my $meta = $enc->encode ({
2912 name => $name,
2913 %{ $info->{meta} || {} },
2914 });
2915
2916 $data = pack "(w/a*)*", $meta, $info->{data};
2917 } else {
2918 $data = $info->{data};
2919 }
2920
2921 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2922 cf::face::set_type $idx, $info->{type};
2923
2924 cf::cede_to_tick;
2925 }
2926
2927 if ($soundconf) {
2928 $soundconf = $enc->decode (delete $soundconf->{data});
2929
2930 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2931 my $sound = $soundconf->{compat}[$_]
2932 or next;
2933
2934 my $face = cf::face::find "sound/$sound->[1]";
2935 cf::sound::set $sound->[0] => $face;
2936 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2937 }
2938
2939 while (my ($k, $v) = each %{$soundconf->{event}}) {
2940 my $face = cf::face::find "sound/$v";
2941 cf::sound::set $k => $face;
2942 }
2943 }
2944 }
2945
2540 1 2946 1
2541} 2947}
2948
2949register_exticmd fx_want => sub {
2950 my ($ns, $want) = @_;
2951
2952 while (my ($k, $v) = each %$want) {
2953 $ns->fx_want ($k, $v);
2954 }
2955};
2542 2956
2543sub reload_regions { 2957sub reload_regions {
2544 load_resource_file "$MAPDIR/regions" 2958 load_resource_file "$MAPDIR/regions"
2545 or die "unable to load regions file\n"; 2959 or die "unable to load regions file\n";
2960
2961 for (cf::region::list) {
2962 $_->{match} = qr/$_->{match}/
2963 if exists $_->{match};
2964 }
2546} 2965}
2547 2966
2548sub reload_facedata { 2967sub reload_facedata {
2549 load_facedata "$DATADIR/facedata" 2968 load_facedata "$DATADIR/facedata"
2550 or die "unable to load facedata\n"; 2969 or die "unable to load facedata\n";
2551} 2970}
2552 2971
2553sub reload_archetypes { 2972sub reload_archetypes {
2554 load_resource_file "$DATADIR/archetypes" 2973 load_resource_file "$DATADIR/archetypes"
2555 or die "unable to load archetypes\n"; 2974 or die "unable to load archetypes\n";
2975 #d# NEED to laod twice to resolve forward references
2976 # this really needs to be done in an extra post-pass
2977 # (which needs to be synchronous, so solve it differently)
2978 load_resource_file "$DATADIR/archetypes"
2979 or die "unable to load archetypes\n";
2556} 2980}
2557 2981
2558sub reload_treasures { 2982sub reload_treasures {
2559 load_resource_file "$DATADIR/treasures" 2983 load_resource_file "$DATADIR/treasures"
2560 or die "unable to load treasurelists\n"; 2984 or die "unable to load treasurelists\n";
2563sub reload_resources { 2987sub reload_resources {
2564 warn "reloading resource files...\n"; 2988 warn "reloading resource files...\n";
2565 2989
2566 reload_regions; 2990 reload_regions;
2567 reload_facedata; 2991 reload_facedata;
2992 #reload_archetypes;#d#
2568 reload_archetypes; 2993 reload_archetypes;
2569 reload_treasures; 2994 reload_treasures;
2570 2995
2571 warn "finished reloading resource files\n"; 2996 warn "finished reloading resource files\n";
2572} 2997}
2573 2998
2574sub init { 2999sub init {
2575 reload_resources; 3000 reload_resources;
2576} 3001}
2577 3002
2578sub cfg_load { 3003sub reload_config {
2579 open my $fh, "<:utf8", "$CONFDIR/config" 3004 open my $fh, "<:utf8", "$CONFDIR/config"
2580 or return; 3005 or return;
2581 3006
2582 local $/; 3007 local $/;
2583 *CFG = YAML::Syck::Load <$fh>; 3008 *CFG = YAML::Syck::Load <$fh>;
2603 (async { 3028 (async {
2604 Event::one_event; 3029 Event::one_event;
2605 })->prio (Coro::PRIO_MAX); 3030 })->prio (Coro::PRIO_MAX);
2606 }; 3031 };
2607 3032
2608 cfg_load; 3033 reload_config;
2609 db_init; 3034 db_init;
2610 load_extensions; 3035 load_extensions;
2611 3036
2612 $TICK_WATCHER->start; 3037 $TICK_WATCHER->start;
2613 Event::loop; 3038 Event::loop;
2629 }, 3054 },
2630 ); 3055 );
2631 } 3056 }
2632} 3057}
2633 3058
3059sub write_runtime {
3060 my $runtime = "$LOCALDIR/runtime";
3061
3062 # first touch the runtime file to show we are still running:
3063 # the fsync below can take a very very long time.
3064
3065 IO::AIO::aio_utime $runtime, undef, undef;
3066
3067 my $guard = cf::lock_acquire "write_runtime";
3068
3069 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3070 or return;
3071
3072 my $value = $cf::RUNTIME + 90 + 10;
3073 # 10 is the runtime save interval, for a monotonic clock
3074 # 60 allows for the watchdog to kill the server.
3075
3076 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3077 and return;
3078
3079 # always fsync - this file is important
3080 aio_fsync $fh
3081 and return;
3082
3083 # touch it again to show we are up-to-date
3084 aio_utime $fh, undef, undef;
3085
3086 close $fh
3087 or return;
3088
3089 aio_rename "$runtime~", $runtime
3090 and return;
3091
3092 warn "runtime file written.\n";
3093
3094 1
3095}
3096
2634sub emergency_save() { 3097sub emergency_save() {
2635 my $freeze_guard = cf::freeze_mainloop; 3098 my $freeze_guard = cf::freeze_mainloop;
2636 3099
2637 warn "enter emergency perl save\n"; 3100 warn "enter emergency perl save\n";
2638 3101
2713 %EXT_CORO = (); 3176 %EXT_CORO = ();
2714 3177
2715 warn "removing commands"; 3178 warn "removing commands";
2716 %COMMAND = (); 3179 %COMMAND = ();
2717 3180
2718 warn "removing ext commands"; 3181 warn "removing ext/exti commands";
2719 %EXTCMD = (); 3182 %EXTCMD = ();
3183 %EXTICMD = ();
2720 3184
2721 warn "unloading/nuking all extensions"; 3185 warn "unloading/nuking all extensions";
2722 for my $pkg (@EXTS) { 3186 for my $pkg (@EXTS) {
2723 warn "... unloading $pkg"; 3187 warn "... unloading $pkg";
2724 3188
2767 warn "reloading cf.pm"; 3231 warn "reloading cf.pm";
2768 require cf; 3232 require cf;
2769 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3233 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2770 3234
2771 warn "loading config and database again"; 3235 warn "loading config and database again";
2772 cf::cfg_load; 3236 cf::reload_config;
2773 3237
2774 warn "loading extensions"; 3238 warn "loading extensions";
2775 cf::load_extensions; 3239 cf::load_extensions;
2776 3240
2777 warn "reattaching attachments to objects/players"; 3241 warn "reattaching attachments to objects/players";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines