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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines