ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.278 by root, Mon Jun 11 21:38:14 2007 UTC vs.
Revision 1.358 by root, Fri Sep 7 18:10:52 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;
83our %CFG; 87our %CFG;
84 88
85our $UPTIME; $UPTIME ||= time; 89our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 90our $RUNTIME;
87 91
88our %PLAYER; # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 93our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
91 95
92# used to convert map paths into valid unix filenames by replacing / by ∕ 96# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 98
163=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
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.
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.
168 178
169=back 179=back
170 180
171=cut 181=cut
172 182
206} 216}
207 217
208$Event::DIED = sub { 218$Event::DIED = sub {
209 warn "error in event callback: @_"; 219 warn "error in event callback: @_";
210}; 220};
221
222#############################################################################
211 223
212=head2 UTILITY FUNCTIONS 224=head2 UTILITY FUNCTIONS
213 225
214=over 4 226=over 4
215 227
234 $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;
235 $d 247 $d
236 } || "[unable to dump $_[0]: '$@']"; 248 } || "[unable to dump $_[0]: '$@']";
237} 249}
238 250
239use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
240
241=item $ref = cf::from_json $json 251=item $ref = cf::from_json $json
242 252
243Converts a JSON string into the corresponding perl data structure. 253Converts a JSON string into the corresponding perl data structure.
244 254
245=item $json = cf::to_json $ref 255=item $json = cf::to_json $ref
246 256
247Converts 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]) }
248 265
249=item cf::lock_wait $string 266=item cf::lock_wait $string
250 267
251Wait until the given lock is available. See cf::lock_acquire. 268Wait until the given lock is available. See cf::lock_acquire.
252 269
255Wait 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
256a 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,
257for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
258returned. 275returned.
259 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
260Lock 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
261uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
262 282
263=item $locked = cf::lock_active $string 283=item $locked = cf::lock_active $string
264 284
265Return true if the lock is currently active, i.e. somebody has locked it. 285Return true if the lock is currently active, i.e. somebody has locked it.
266 286
267=cut 287=cut
268 288
269our %LOCK; 289our %LOCK;
290our %LOCKER;#d#
270 291
271sub lock_wait($) { 292sub lock_wait($) {
272 my ($key) = @_; 293 my ($key) = @_;
294
295 if ($LOCKER{$key} == $Coro::current) {#d#
296 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
297 return;#d#
298 }#d#
273 299
274 # wait for lock, if any 300 # wait for lock, if any
275 while ($LOCK{$key}) { 301 while ($LOCK{$key}) {
276 push @{ $LOCK{$key} }, $Coro::current; 302 push @{ $LOCK{$key} }, $Coro::current;
277 Coro::schedule; 303 Coro::schedule;
283 309
284 # wait, to be sure we are not locked 310 # wait, to be sure we are not locked
285 lock_wait $key; 311 lock_wait $key;
286 312
287 $LOCK{$key} = []; 313 $LOCK{$key} = [];
314 $LOCKER{$key} = $Coro::current;#d#
288 315
289 Coro::guard { 316 Coro::guard {
317 delete $LOCKER{$key};#d#
290 # wake up all waiters, to be on the safe side 318 # wake up all waiters, to be on the safe side
291 $_->ready for @{ delete $LOCK{$key} }; 319 $_->ready for @{ delete $LOCK{$key} };
292 } 320 }
293} 321}
294 322
306 }; 334 };
307 $TICK_WATCHER->stop; 335 $TICK_WATCHER->stop;
308 $guard 336 $guard
309} 337}
310 338
339=item cf::get_slot $time[, $priority[, $name]]
340
341Allocate $time seconds of blocking CPU time at priority C<$priority>:
342This call blocks and returns only when you have at least C<$time> seconds
343of cpu time till the next tick. The slot is only valid till the next cede.
344
345The optional C<$name> can be used to identify the job to run. It might be
346used for statistical purposes and should identify the same time-class.
347
348Useful for short background jobs.
349
350=cut
351
352our @SLOT_QUEUE;
353our $SLOT_QUEUE;
354
355$SLOT_QUEUE->cancel if $SLOT_QUEUE;
356$SLOT_QUEUE = Coro::async {
357 my $signal = new Coro::Signal;
358
359 while () {
360 next_job:
361 my $avail = cf::till_tick;
362 if ($avail > 0.01) {
363 for (0 .. $#SLOT_QUEUE) {
364 if ($SLOT_QUEUE[$_][0] < $avail) {
365 my $job = splice @SLOT_QUEUE, $_, 1, ();
366 $job->[2]->send;
367 Coro::cede;
368 goto next_job;
369 }
370 }
371 }
372
373 if (@SLOT_QUEUE) {
374 # we do not use wait_For_tick() as it returns immediately when tick is inactive
375 push @cf::WAIT_FOR_TICK, $signal;
376 $signal->wait;
377 } else {
378 Coro::schedule;
379 }
380 }
381};
382
383sub get_slot($;$$) {
384 my ($time, $pri, $name) = @_;
385
386 $time = $TICK * .6 if $time > $TICK * .6;
387 my $sig = new Coro::Signal;
388
389 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
390 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
391 $SLOT_QUEUE->ready;
392 $sig->wait;
393}
394
311=item cf::async { BLOCK } 395=item cf::async { BLOCK }
312 396
313Currently the same as Coro::async_pool, meaning you cannot use 397Currently the same as Coro::async_pool, meaning you cannot use
314C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 398C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
315thing you are allowed to do is call C<prio> on it. 399thing you are allowed to do is call C<prio> on it.
318 402
319BEGIN { *async = \&Coro::async_pool } 403BEGIN { *async = \&Coro::async_pool }
320 404
321=item cf::sync_job { BLOCK } 405=item cf::sync_job { BLOCK }
322 406
323The design of crossfire+ requires that the main coro ($Coro::main) is 407The design of Crossfire TRT requires that the main coroutine ($Coro::main)
324always able to handle events or runnable, as crossfire+ is only partly 408is always able to handle events or runnable, as Crossfire TRT is only
325reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 409partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
410acceptable.
326 411
327If it must be done, put the blocking parts into C<sync_job>. This will run 412If it must be done, put the blocking parts into C<sync_job>. This will run
328the given BLOCK in another coroutine while waiting for the result. The 413the given BLOCK in another coroutine while waiting for the result. The
329server will be frozen during this time, so the block should either finish 414server will be frozen during this time, so the block should either finish
330fast or be very important. 415fast or be very important.
390 $EXT_CORO{$coro+0} = $coro; 475 $EXT_CORO{$coro+0} = $coro;
391 476
392 $coro 477 $coro
393} 478}
394 479
395sub write_runtime { 480=item fork_call { }, $args
396 my $runtime = "$LOCALDIR/runtime";
397 481
398 # first touch the runtime file to show we are still running: 482Executes the given code block with the given arguments in a seperate
399 # the fsync below can take a very very long time. 483process, returning the results. Everything must be serialisable with
484Coro::Storable. May, of course, block. Note that the executed sub may
485never block itself or use any form of Event handling.
400 486
401 IO::AIO::aio_utime $runtime, undef, undef; 487=cut
402 488
403 my $guard = cf::lock_acquire "write_runtime"; 489sub fork_call(&@) {
490 my ($cb, @args) = @_;
404 491
405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 492 # we seemingly have to make a local copy of the whole thing,
406 or return; 493 # otherwise perl prematurely frees the stuff :/
494 # TODO: investigate and fix (likely this will be rather laborious)
407 495
408 my $value = $cf::RUNTIME + 90 + 10; 496 my @res = Coro::Util::fork_eval {
409 # 10 is the runtime save interval, for a monotonic clock 497 reset_signals;
410 # 60 allows for the watchdog to kill the server. 498 &$cb
499 }, @args;
411 500
412 (aio_write $fh, 0, (length $value), $value, 0) <= 0 501 wantarray ? @res : $res[-1]
413 and return; 502}
414 503
415 # always fsync - this file is important 504=item $value = cf::db_get $family => $key
416 aio_fsync $fh
417 and return;
418 505
419 # touch it again to show we are up-to-date 506Returns a single value from the environment database.
420 aio_utime $fh, undef, undef;
421 507
422 close $fh 508=item cf::db_put $family => $key => $value
423 or return;
424 509
425 aio_rename "$runtime~", $runtime 510Stores the given C<$value> in the family. It can currently store binary
426 and return; 511data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
427 512
428 warn "runtime file written.\n"; 513=cut
429 514
515our $DB;
516
517sub db_init {
518 unless ($DB) {
519 $DB = BDB::db_create $DB_ENV;
520
521 cf::sync_job {
522 eval {
523 $DB->set_flags (BDB::CHKSUM);
524
525 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
526 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
527 cf::cleanup "db_open(db): $!" if $!;
528 };
529 cf::cleanup "db_open(db): $@" if $@;
530 };
430 1 531 }
532}
533
534sub db_get($$) {
535 my $key = "$_[0]/$_[1]";
536
537 cf::sync_job {
538 BDB::db_get $DB, undef, $key, my $data;
539
540 $! ? ()
541 : $data
542 }
543}
544
545sub db_put($$$) {
546 BDB::dbreq_pri 4;
547 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
548}
549
550=item cf::cache $id => [$paths...], $processversion => $process
551
552Generic caching function that returns the value of the resource $id,
553caching and regenerating as required.
554
555This function can block.
556
557=cut
558
559sub cache {
560 my ($id, $src, $processversion, $process) = @_;
561
562 my $meta =
563 join "\x00",
564 $processversion,
565 map {
566 aio_stat $_
567 and Carp::croak "$_: $!";
568
569 ($_, (stat _)[7,9])
570 } @$src;
571
572 my $dbmeta = db_get cache => "$id/meta";
573 if ($dbmeta ne $meta) {
574 # changed, we may need to process
575
576 my @data;
577 my $md5;
578
579 for (0 .. $#$src) {
580 0 <= aio_load $src->[$_], $data[$_]
581 or Carp::croak "$src->[$_]: $!";
582 }
583
584 # if processing is expensive, check
585 # checksum first
586 if (1) {
587 $md5 =
588 join "\x00",
589 $processversion,
590 map {
591 cf::cede_to_tick;
592 ($src->[$_], Digest::MD5::md5_hex $data[$_])
593 } 0.. $#$src;
594
595
596 my $dbmd5 = db_get cache => "$id/md5";
597 if ($dbmd5 eq $md5) {
598 db_put cache => "$id/meta", $meta;
599
600 return db_get cache => "$id/data";
601 }
602 }
603
604 my $t1 = Time::HiRes::time;
605 my $data = $process->(\@data);
606 my $t2 = Time::HiRes::time;
607
608 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
609
610 db_put cache => "$id/data", $data;
611 db_put cache => "$id/md5" , $md5;
612 db_put cache => "$id/meta", $meta;
613
614 return $data;
615 }
616
617 db_get cache => "$id/data"
431} 618}
432 619
433=item cf::datalog type => key => value, ... 620=item cf::datalog type => key => value, ...
434 621
435Log a datalog packet of the given type with the given key-value pairs. 622Log a datalog packet of the given type with the given key-value pairs.
453attach callbacks/event handlers (a collection of which is called an "attachment") 640attach callbacks/event handlers (a collection of which is called an "attachment")
454to it. All such attachable objects support the following methods. 641to it. All such attachable objects support the following methods.
455 642
456In the following description, CLASS can be any of C<global>, C<object> 643In the following description, CLASS can be any of C<global>, C<object>
457C<player>, C<client> or C<map> (i.e. the attachable objects in 644C<player>, C<client> or C<map> (i.e. the attachable objects in
458crossfire+). 645Crossfire TRT).
459 646
460=over 4 647=over 4
461 648
462=item $attachable->attach ($attachment, key => $value...) 649=item $attachable->attach ($attachment, key => $value...)
463 650
665 _attach $registry, $klass, @attach; 852 _attach $registry, $klass, @attach;
666 } 853 }
667 854
668 $obj->{$name} = \%arg; 855 $obj->{$name} = \%arg;
669 } else { 856 } else {
670 warn "object uses attachment '$name' that is not available, postponing.\n"; 857 warn "object uses attachment '$name' which is not available, postponing.\n";
671 } 858 }
672 859
673 $obj->{_attachment}{$name} = undef; 860 $obj->{_attachment}{$name} = undef;
674} 861}
675 862
715 "; 902 ";
716 die if $@; 903 die if $@;
717} 904}
718 905
719our $override; 906our $override;
720our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 907our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
721 908
722sub override { 909sub override {
723 $override = 1; 910 $override = 1;
724 @invoke_results = (); 911 @INVOKE_RESULTS = (@_);
725} 912}
726 913
727sub do_invoke { 914sub do_invoke {
728 my $event = shift; 915 my $event = shift;
729 my $callbacks = shift; 916 my $callbacks = shift;
730 917
731 @invoke_results = (); 918 @INVOKE_RESULTS = ();
732 919
733 local $override; 920 local $override;
734 921
735 for (@$callbacks) { 922 for (@$callbacks) {
736 eval { &{$_->[1]} }; 923 eval { &{$_->[1]} };
753 940
754Generate an object-specific event with the given arguments. 941Generate an object-specific event with the given arguments.
755 942
756This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 943This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
757removed in future versions), and there is no public API to access override 944removed in future versions), and there is no public API to access override
758results (if you must, access C<@cf::invoke_results> directly). 945results (if you must, access C<@cf::INVOKE_RESULTS> directly).
759 946
760=back 947=back
761 948
762=cut 949=cut
763 950
764############################################################################# 951#############################################################################
765# object support 952# object support
953#
954
955sub _can_merge {
956 my ($ob1, $ob2) = @_;
957
958 local $Storable::canonical = 1;
959 my $fob1 = Storable::freeze $ob1;
960 my $fob2 = Storable::freeze $ob2;
961
962 $fob1 eq $fob2
963}
766 964
767sub reattach { 965sub reattach {
768 # basically do the same as instantiate, without calling instantiate 966 # basically do the same as instantiate, without calling instantiate
769 my ($obj) = @_; 967 my ($obj) = @_;
770 968
814 }, 1012 },
815); 1013);
816 1014
817sub object_freezer_save { 1015sub object_freezer_save {
818 my ($filename, $rdata, $objs) = @_; 1016 my ($filename, $rdata, $objs) = @_;
1017
1018 my $guard = cf::lock_acquire "io";
819 1019
820 sync_job { 1020 sync_job {
821 if (length $$rdata) { 1021 if (length $$rdata) {
822 warn sprintf "saving %s (%d,%d)\n", 1022 warn sprintf "saving %s (%d,%d)\n",
823 $filename, length $$rdata, scalar @$objs; 1023 $filename, length $$rdata, scalar @$objs;
847 } 1047 }
848 } else { 1048 } else {
849 aio_unlink $filename; 1049 aio_unlink $filename;
850 aio_unlink "$filename.pst"; 1050 aio_unlink "$filename.pst";
851 } 1051 }
852 } 1052 };
1053
1054 undef $guard;
853} 1055}
854 1056
855sub object_freezer_as_string { 1057sub object_freezer_as_string {
856 my ($rdata, $objs) = @_; 1058 my ($rdata, $objs) = @_;
857 1059
862 1064
863sub object_thawer_load { 1065sub object_thawer_load {
864 my ($filename) = @_; 1066 my ($filename) = @_;
865 1067
866 my ($data, $av); 1068 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
867 1071
868 (aio_load $filename, $data) >= 0 1072 (aio_load $filename, $data) >= 0
869 or return; 1073 or return;
870 1074
871 unless (aio_stat "$filename.pst") { 1075 unless (aio_stat "$filename.pst") {
872 (aio_load "$filename.pst", $av) >= 0 1076 (aio_load "$filename.pst", $av) >= 0
873 or return; 1077 or return;
1078
1079 undef $guard;
874 $av = eval { (Storable::thaw $av)->{objs} }; 1080 $av = eval { (Storable::thaw $av)->{objs} };
875 } 1081 }
876 1082
877 warn sprintf "loading %s (%d)\n", 1083 warn sprintf "loading %s (%d)\n",
878 $filename, length $data, scalar @{$av || []}; 1084 $filename, length $data, scalar @{$av || []};
1085
879 return ($data, $av); 1086 ($data, $av)
880} 1087}
1088
1089=head2 COMMAND CALLBACKS
1090
1091=over 4
1092
1093=cut
881 1094
882############################################################################# 1095#############################################################################
883# command handling &c 1096# command handling &c
884 1097
885=item cf::register_command $name => \&callback($ob,$args); 1098=item cf::register_command $name => \&callback($ob,$args);
898 push @{ $COMMAND{$name} }, [$caller, $cb]; 1111 push @{ $COMMAND{$name} }, [$caller, $cb];
899} 1112}
900 1113
901=item cf::register_extcmd $name => \&callback($pl,$packet); 1114=item cf::register_extcmd $name => \&callback($pl,$packet);
902 1115
903Register a callbackf ro execution when the client sends an extcmd packet. 1116Register a callback for execution when the client sends an (synchronous)
1117extcmd packet. Ext commands will be processed in the order they are
1118received by the server, like other user commands. The first argument is
1119the logged-in player. Ext commands can only be processed after a player
1120has logged in successfully.
904 1121
905If the callback returns something, it is sent back as if reply was being 1122If the callback returns something, it is sent back as if reply was being
906called. 1123called.
907 1124
1125=item cf::register_exticmd $name => \&callback($ns,$packet);
1126
1127Register a callback for execution when the client sends an (asynchronous)
1128exticmd packet. Exti commands are processed by the server as soon as they
1129are received, i.e. out of order w.r.t. other commands. The first argument
1130is a client socket. Exti commands can be received anytime, even before
1131log-in.
1132
1133If the callback returns something, it is sent back as if reply was being
1134called.
1135
908=cut 1136=cut
909 1137
910sub register_extcmd { 1138sub register_extcmd {
911 my ($name, $cb) = @_; 1139 my ($name, $cb) = @_;
912 1140
913 $EXTCMD{$name} = $cb; 1141 $EXTCMD{$name} = $cb;
1142}
1143
1144sub register_exticmd {
1145 my ($name, $cb) = @_;
1146
1147 $EXTICMD{$name} = $cb;
914} 1148}
915 1149
916cf::player->attach ( 1150cf::player->attach (
917 on_command => sub { 1151 on_command => sub {
918 my ($pl, $name, $params) = @_; 1152 my ($pl, $name, $params) = @_;
927 cf::override; 1161 cf::override;
928 }, 1162 },
929 on_extcmd => sub { 1163 on_extcmd => sub {
930 my ($pl, $buf) = @_; 1164 my ($pl, $buf) = @_;
931 1165
932 my $msg = eval { from_json $buf }; 1166 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
933 1167
934 if (ref $msg) { 1168 if (ref $msg) {
1169 my ($type, $reply, @payload) =
1170 "ARRAY" eq ref $msg
1171 ? @$msg
1172 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1173
1174 my @reply;
1175
935 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1176 if (my $cb = $EXTCMD{$type}) {
936 if (my %reply = $cb->($pl, $msg)) { 1177 @reply = $cb->($pl, @payload);
937 $pl->ext_reply ($msg->{msgid}, %reply);
938 }
939 } 1178 }
1179
1180 $pl->ext_reply ($reply, @reply)
1181 if $reply;
1182
940 } else { 1183 } else {
941 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1184 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
942 } 1185 }
943 1186
944 cf::override; 1187 cf::override;
967 path => $path, 1210 path => $path,
968 base => $base, 1211 base => $base,
969 pkg => $pkg, 1212 pkg => $pkg,
970 ); 1213 );
971 1214
972 $ext{meta} = { map { split /=/, $_, 2 } split /\s+/, $1 } 1215 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
973 if $source =~ /^#!.*?perl.*?#\s*(.*)$/; 1216 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
974 1217
975 $ext{source} = 1218 $ext{source} =
976 "package $pkg; use strict; use utf8;\n" 1219 "package $pkg; use strict; use utf8;\n"
977 . "#line 1 \"$path\"\n{\n" 1220 . "#line 1 \"$path\"\n{\n"
978 . $source 1221 . $source
984 my %done; 1227 my %done;
985 while (%todo) { 1228 while (%todo) {
986 my $progress; 1229 my $progress;
987 1230
988 while (my ($k, $v) = each %todo) { 1231 while (my ($k, $v) = each %todo) {
989 for (split /,\s*/, $ext{meta}{depends}) { 1232 for (split /,\s*/, $v->{meta}{depends}) {
990 goto skip 1233 goto skip
991 unless exists $done{$_}; 1234 unless exists $done{$_};
992 } 1235 }
993 1236
994 warn "... loading '$k' into '$v->{pkg}'\n"; 1237 warn "... loading '$k' into '$v->{pkg}'\n";
995 1238
996 unless (eval $v->{source}) { 1239 unless (eval $v->{source}) {
997 my $msg = $@ ? "$v->{path}: $@\n" 1240 my $msg = $@ ? "$v->{path}: $@\n"
998 : "extension disabled.\n"; 1241 : "$v->{base}: extension inactive.\n";
999 1242
1000 if (exists $v->{meta}{mandatory}) { 1243 if (exists $v->{meta}{mandatory}) {
1001 warn $msg; 1244 warn $msg;
1002 warn "mandatory extension failed to load, exiting.\n"; 1245 warn "mandatory extension failed to load, exiting.\n";
1003 exit 1; 1246 exit 1;
1004 } 1247 }
1005 1248
1006 die $msg; 1249 warn $msg;
1007 } 1250 }
1008 1251
1009 $done{$k} = delete $todo{$k}; 1252 $done{$k} = delete $todo{$k};
1010 push @EXTS, $v->{pkg}; 1253 push @EXTS, $v->{pkg};
1254 $progress = 1;
1011 } 1255 }
1012 1256
1013 skip: 1257 skip:
1014 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1258 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1015 unless $progress; 1259 unless $progress;
1016 } 1260 }
1017 }; 1261 };
1018} 1262}
1019 1263
1020############################################################################# 1264#############################################################################
1265
1266=back
1021 1267
1022=head2 CORE EXTENSIONS 1268=head2 CORE EXTENSIONS
1023 1269
1024Functions and methods that extend core crossfire objects. 1270Functions and methods that extend core crossfire objects.
1025 1271
1075 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1321 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1076 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1322 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1077 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1323 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1078 aio_unlink +(playerdir $login) . "/$login.pl"; 1324 aio_unlink +(playerdir $login) . "/$login.pl";
1079 1325
1080 my $pl = load_pl path $login 1326 my $f = new_from_file cf::object::thawer path $login
1081 or return; 1327 or return;
1328
1329 $f->next;
1330 my $pl = cf::player::load_pl $f
1331 or return;
1332 local $cf::PLAYER_LOADING{$login} = $pl;
1333 $f->resolve_delayed_derefs;
1082 $cf::PLAYER{$login} = $pl 1334 $cf::PLAYER{$login} = $pl
1083 } 1335 }
1084 } 1336 }
1085} 1337}
1086 1338
1096 1348
1097 aio_mkdir playerdir $pl, 0770; 1349 aio_mkdir playerdir $pl, 0770;
1098 $pl->{last_save} = $cf::RUNTIME; 1350 $pl->{last_save} = $cf::RUNTIME;
1099 1351
1100 $pl->save_pl ($path); 1352 $pl->save_pl ($path);
1101 Coro::cede; 1353 cf::cede_to_tick;
1102} 1354}
1103 1355
1104sub new($) { 1356sub new($) {
1105 my ($login) = @_; 1357 my ($login) = @_;
1106 1358
1110 $self->{deny_save} = 1; 1362 $self->{deny_save} = 1;
1111 1363
1112 $cf::PLAYER{$login} = $self; 1364 $cf::PLAYER{$login} = $self;
1113 1365
1114 $self 1366 $self
1367}
1368
1369=item $player->send_msg ($channel, $msg, $color, [extra...])
1370
1371=cut
1372
1373sub send_msg {
1374 my $ns = shift->ns
1375 or return;
1376 $ns->send_msg (@_);
1115} 1377}
1116 1378
1117=item $pl->quit_character 1379=item $pl->quit_character
1118 1380
1119Nukes the player without looking back. If logged in, the connection will 1381Nukes the player without looking back. If logged in, the connection will
1174 or return []; 1436 or return [];
1175 1437
1176 my @logins; 1438 my @logins;
1177 1439
1178 for my $login (@$dirs) { 1440 for my $login (@$dirs) {
1441 my $path = path $login;
1442
1443 # a .pst is a dead give-away for a valid player
1444 unless (-e "$path.pst") {
1179 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1445 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1180 aio_read $fh, 0, 512, my $buf, 0 or next; 1446 aio_read $fh, 0, 512, my $buf, 0 or next;
1181 $buf !~ /^password -------------$/m or next; # official not-valid tag 1447 $buf !~ /^password -------------$/m or next; # official not-valid tag
1448 }
1182 1449
1183 utf8::decode $login; 1450 utf8::decode $login;
1184 push @logins, $login; 1451 push @logins, $login;
1185 } 1452 }
1186 1453
1213 } 1480 }
1214 1481
1215 \@paths 1482 \@paths
1216} 1483}
1217 1484
1485=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1486
1487Expand crossfire pod fragments into protocol xml.
1488
1489=cut
1490
1491sub expand_cfpod {
1492 ((my $self), (local $_)) = @_;
1493
1494 # escape & and <
1495 s/&/&amp;/g;
1496 s/(?<![BIUGHT])</&lt;/g;
1497
1498 # this is buggy, it needs to properly take care of nested <'s
1499
1500 1 while
1501 # replace B<>, I<>, U<> etc.
1502 s/B<([^\>]*)>/<b>$1<\/b>/
1503 || s/I<([^\>]*)>/<i>$1<\/i>/
1504 || s/U<([^\>]*)>/<u>$1<\/u>/
1505 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1506 # replace G<male|female> tags
1507 || s{G<([^>|]*)\|([^>]*)>}{
1508 $self->gender ? $2 : $1
1509 }ge
1510 # replace H<hint text>
1511 || s{H<([^\>]*)>}
1512 {
1513 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1514 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1515 "")
1516 [$self->{hintmode}]
1517 }ge;
1518
1519 # create single paragraphs (very hackish)
1520 s/(?<=\S)\n(?=\w)/ /g;
1521
1522 # compress some whitespace
1523 s/\s+\n/\n/g; # ws line-ends
1524 s/\n\n+/\n/g; # double lines
1525 s/^\n+//; # beginning lines
1526 s/\n+$//; # ending lines
1527
1528 $_
1529}
1530
1531sub hintmode {
1532 $_[0]{hintmode} = $_[1] if @_ > 1;
1533 $_[0]{hintmode}
1534}
1535
1218=item $player->ext_reply ($msgid, %msg) 1536=item $player->ext_reply ($msgid, @msg)
1219 1537
1220Sends an ext reply to the player. 1538Sends an ext reply to the player.
1221 1539
1222=cut 1540=cut
1223 1541
1224sub ext_reply($$%) { 1542sub ext_reply($$@) {
1225 my ($self, $id, %msg) = @_; 1543 my ($self, $id, @msg) = @_;
1226 1544
1227 $msg{msgid} = $id; 1545 $self->ns->ext_reply ($id, @msg)
1228
1229 $self->send ("ext " . cf::to_json \%msg);
1230} 1546}
1231 1547
1232=item $player->ext_event ($type, %msg) 1548=item $player->ext_msg ($type, @msg)
1233 1549
1234Sends an ext event to the client. 1550Sends an ext event to the client.
1235 1551
1236=cut 1552=cut
1237 1553
1238sub ext_event($$%) { 1554sub ext_msg($$@) {
1239 my ($self, $type, %msg) = @_; 1555 my ($self, $type, @msg) = @_;
1240 1556
1241 $self->ns->ext_event ($type, %msg); 1557 $self->ns->ext_msg ($type, @msg);
1242} 1558}
1243 1559
1244=head3 cf::region 1560=head3 cf::region
1245 1561
1246=over 4 1562=over 4
1249 1565
1250package cf::region; 1566package cf::region;
1251 1567
1252=item cf::region::find_by_path $path 1568=item cf::region::find_by_path $path
1253 1569
1254Tries to decuce the probable region for a map knowing only its path. 1570Tries to decuce the likely region for a map knowing only its path.
1255 1571
1256=cut 1572=cut
1257 1573
1258sub find_by_path($) { 1574sub find_by_path($) {
1259 my ($path) = @_; 1575 my ($path) = @_;
1260 1576
1261 my ($match, $specificity); 1577 my ($match, $specificity);
1262 1578
1263 for my $region (list) { 1579 for my $region (list) {
1264 if ($region->match && $path =~ $region->match) { 1580 if ($region->{match} && $path =~ $region->{match}) {
1265 ($match, $specificity) = ($region, $region->specificity) 1581 ($match, $specificity) = ($region, $region->specificity)
1266 if $region->specificity > $specificity; 1582 if $region->specificity > $specificity;
1267 } 1583 }
1268 } 1584 }
1269 1585
1389 $self->init; # pass $1 etc. 1705 $self->init; # pass $1 etc.
1390 return $self; 1706 return $self;
1391 } 1707 }
1392 } 1708 }
1393 1709
1394 Carp::carp "unable to resolve path '$path' (base '$base')."; 1710 Carp::cluck "unable to resolve path '$path' (base '$base').";
1395 () 1711 ()
1396} 1712}
1397 1713
1398sub init { 1714sub init {
1399 my ($self) = @_; 1715 my ($self) = @_;
1462 1778
1463sub load_header_from($) { 1779sub load_header_from($) {
1464 my ($self, $path) = @_; 1780 my ($self, $path) = @_;
1465 1781
1466 utf8::encode $path; 1782 utf8::encode $path;
1467 #aio_open $path, O_RDONLY, 0 1783 my $f = new_from_file cf::object::thawer $path
1468 # or return;
1469
1470 $self->_load_header ($path)
1471 or return; 1784 or return;
1785
1786 $self->_load_header ($f)
1787 or return;
1788
1789 local $MAP_LOADING{$self->{path}} = $self;
1790 $f->resolve_delayed_derefs;
1472 1791
1473 $self->{load_path} = $path; 1792 $self->{load_path} = $path;
1474 1793
1475 1 1794 1
1476} 1795}
1530sub find { 1849sub find {
1531 my ($path, $origin) = @_; 1850 my ($path, $origin) = @_;
1532 1851
1533 $path = normalise $path, $origin && $origin->path; 1852 $path = normalise $path, $origin && $origin->path;
1534 1853
1854 cf::lock_wait "map_data:$path";#d#remove
1535 cf::lock_wait "map_find:$path"; 1855 cf::lock_wait "map_find:$path";
1536 1856
1537 $cf::MAP{$path} || do { 1857 $cf::MAP{$path} || do {
1538 my $guard = cf::lock_acquire "map_find:$path"; 1858 my $guard1 = cf::lock_acquire "map_find:$path";
1859 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1860
1539 my $map = new_from_path cf::map $path 1861 my $map = new_from_path cf::map $path
1540 or return; 1862 or return;
1541 1863
1542 $map->{last_save} = $cf::RUNTIME; 1864 $map->{last_save} = $cf::RUNTIME;
1543 1865
1545 or return; 1867 or return;
1546 1868
1547 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1869 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1548 # doing this can freeze the server in a sync job, obviously 1870 # doing this can freeze the server in a sync job, obviously
1549 #$cf::WAIT_FOR_TICK->wait; 1871 #$cf::WAIT_FOR_TICK->wait;
1872 undef $guard1;
1873 undef $guard2;
1550 $map->reset; 1874 $map->reset;
1551 undef $guard;
1552 return find $path; 1875 return find $path;
1553 } 1876 }
1554 1877
1555 $cf::MAP{$path} = $map 1878 $cf::MAP{$path} = $map
1556 } 1879 }
1565 local $self->{deny_reset} = 1; # loading can take a long time 1888 local $self->{deny_reset} = 1; # loading can take a long time
1566 1889
1567 my $path = $self->{path}; 1890 my $path = $self->{path};
1568 1891
1569 { 1892 {
1570 my $guard = cf::lock_acquire "map_load:$path"; 1893 my $guard = cf::lock_acquire "map_data:$path";
1571 1894
1895 return unless $self->valid;
1572 return if $self->in_memory != cf::MAP_SWAPPED; 1896 return if $self->in_memory != cf::MAP_SWAPPED;
1573 1897
1574 $self->in_memory (cf::MAP_LOADING); 1898 $self->in_memory (cf::MAP_LOADING);
1575 1899
1576 $self->alloc; 1900 $self->alloc;
1577 1901
1578 $self->pre_load; 1902 $self->pre_load;
1579 Coro::cede; 1903 cf::cede_to_tick;
1580 1904
1905 my $f = new_from_file cf::object::thawer $self->{load_path};
1906 $f->skip_block;
1581 $self->_load_objects ($self->{load_path}, 1) 1907 $self->_load_objects ($f)
1582 or return; 1908 or return;
1583 1909
1584 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1910 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1585 if delete $self->{load_original}; 1911 if delete $self->{load_original};
1586 1912
1587 if (my $uniq = $self->uniq_path) { 1913 if (my $uniq = $self->uniq_path) {
1588 utf8::encode $uniq; 1914 utf8::encode $uniq;
1589 if (aio_open $uniq, O_RDONLY, 0) { 1915 unless (aio_stat $uniq) {
1916 if (my $f = new_from_file cf::object::thawer $uniq) {
1590 $self->clear_unique_items; 1917 $self->clear_unique_items;
1591 $self->_load_objects ($uniq, 0); 1918 $self->_load_objects ($f);
1919 $f->resolve_delayed_derefs;
1920 }
1592 } 1921 }
1593 } 1922 }
1594 1923
1595 Coro::cede; 1924 $f->resolve_delayed_derefs;
1925
1926 cf::cede_to_tick;
1596 # now do the right thing for maps 1927 # now do the right thing for maps
1597 $self->link_multipart_objects; 1928 $self->link_multipart_objects;
1598 $self->difficulty ($self->estimate_difficulty) 1929 $self->difficulty ($self->estimate_difficulty)
1599 unless $self->difficulty; 1930 unless $self->difficulty;
1600 Coro::cede; 1931 cf::cede_to_tick;
1601 1932
1602 unless ($self->{deny_activate}) { 1933 unless ($self->{deny_activate}) {
1603 $self->decay_objects; 1934 $self->decay_objects;
1604 $self->fix_auto_apply; 1935 $self->fix_auto_apply;
1605 $self->update_buttons; 1936 $self->update_buttons;
1606 Coro::cede; 1937 cf::cede_to_tick;
1607 $self->set_darkness_map; 1938 $self->set_darkness_map;
1608 Coro::cede; 1939 cf::cede_to_tick;
1609 $self->activate; 1940 $self->activate;
1610 } 1941 }
1942
1943 $self->{last_save} = $cf::RUNTIME;
1944 $self->last_access ($cf::RUNTIME);
1611 1945
1612 $self->in_memory (cf::MAP_IN_MEMORY); 1946 $self->in_memory (cf::MAP_IN_MEMORY);
1613 } 1947 }
1614 1948
1615 $self->post_load; 1949 $self->post_load;
1626 1960
1627 $self 1961 $self
1628} 1962}
1629 1963
1630# find and load all maps in the 3x3 area around a map 1964# find and load all maps in the 3x3 area around a map
1631sub load_diag { 1965sub load_neighbours {
1632 my ($map) = @_; 1966 my ($map) = @_;
1633 1967
1634 my @diag; # diagonal neighbours 1968 my @neigh; # diagonal neighbours
1635 1969
1636 for (0 .. 3) { 1970 for (0 .. 3) {
1637 my $neigh = $map->tile_path ($_) 1971 my $neigh = $map->tile_path ($_)
1638 or next; 1972 or next;
1639 $neigh = find $neigh, $map 1973 $neigh = find $neigh, $map
1640 or next; 1974 or next;
1641 $neigh->load; 1975 $neigh->load;
1642 1976
1977 push @neigh,
1643 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1978 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1644 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1979 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1645 } 1980 }
1646 1981
1647 for (@diag) { 1982 for (grep defined $_->[0], @neigh) {
1983 my ($path, $origin) = @$_;
1648 my $neigh = find @$_ 1984 my $neigh = find $path, $origin
1649 or next; 1985 or next;
1650 $neigh->load; 1986 $neigh->load;
1651 } 1987 }
1652} 1988}
1653 1989
1658} 1994}
1659 1995
1660sub do_load_sync { 1996sub do_load_sync {
1661 my ($map) = @_; 1997 my ($map) = @_;
1662 1998
1999 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2000 if $Coro::current == $Coro::main;
2001
1663 cf::sync_job { $map->load }; 2002 cf::sync_job { $map->load };
1664} 2003}
1665 2004
1666our %MAP_PREFETCH; 2005our %MAP_PREFETCH;
1667our $MAP_PREFETCHER = undef; 2006our $MAP_PREFETCHER = undef;
1668 2007
1669sub find_async { 2008sub find_async {
1670 my ($path, $origin) = @_; 2009 my ($path, $origin, $load) = @_;
1671 2010
1672 $path = normalise $path, $origin && $origin->{path}; 2011 $path = normalise $path, $origin && $origin->{path};
1673 2012
1674 if (my $map = $cf::MAP{$path}) { 2013 if (my $map = $cf::MAP{$path}) {
1675 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2014 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1676 } 2015 }
1677 2016
1678 undef $MAP_PREFETCH{$path}; 2017 $MAP_PREFETCH{$path} |= $load;
2018
1679 $MAP_PREFETCHER ||= cf::async { 2019 $MAP_PREFETCHER ||= cf::async {
1680 while (%MAP_PREFETCH) { 2020 while (%MAP_PREFETCH) {
1681 for my $path (keys %MAP_PREFETCH) { 2021 while (my ($k, $v) = each %MAP_PREFETCH) {
1682 my $map = find $path 2022 if (my $map = find $k) {
1683 or next;
1684 $map->load; 2023 $map->load if $v;
2024 }
1685 2025
1686 delete $MAP_PREFETCH{$path}; 2026 delete $MAP_PREFETCH{$k};
1687 } 2027 }
1688 } 2028 }
1689 undef $MAP_PREFETCHER; 2029 undef $MAP_PREFETCHER;
1690 }; 2030 };
1691 $MAP_PREFETCHER->prio (6); 2031 $MAP_PREFETCHER->prio (6);
1694} 2034}
1695 2035
1696sub save { 2036sub save {
1697 my ($self) = @_; 2037 my ($self) = @_;
1698 2038
1699 my $lock = cf::lock_acquire "map_data:" . $self->path; 2039 my $lock = cf::lock_acquire "map_data:$self->{path}";
1700 2040
1701 $self->{last_save} = $cf::RUNTIME; 2041 $self->{last_save} = $cf::RUNTIME;
1702 2042
1703 return unless $self->dirty; 2043 return unless $self->dirty;
1704 2044
1727 my ($self) = @_; 2067 my ($self) = @_;
1728 2068
1729 # save first because save cedes 2069 # save first because save cedes
1730 $self->save; 2070 $self->save;
1731 2071
1732 my $lock = cf::lock_acquire "map_data:" . $self->path; 2072 my $lock = cf::lock_acquire "map_data:$self->{path}";
1733 2073
1734 return if $self->players; 2074 return if $self->players;
1735 return if $self->in_memory != cf::MAP_IN_MEMORY; 2075 return if $self->in_memory != cf::MAP_IN_MEMORY;
1736 return if $self->{deny_save}; 2076 return if $self->{deny_save};
1737 2077
2078 $self->deactivate;
1738 $self->clear; 2079 $self->clear;
1739 $self->in_memory (cf::MAP_SWAPPED); 2080 $self->in_memory (cf::MAP_SWAPPED);
1740} 2081}
1741 2082
1742sub reset_at { 2083sub reset_at {
1776 if $uniq; 2117 if $uniq;
1777 } 2118 }
1778 2119
1779 delete $cf::MAP{$self->path}; 2120 delete $cf::MAP{$self->path};
1780 2121
2122 $self->deactivate;
1781 $self->clear; 2123 $self->clear;
1782 2124
1783 $_->clear_links_to ($self) for values %cf::MAP; 2125 $_->clear_links_to ($self) for values %cf::MAP;
1784 2126
1785 $self->unlink_save; 2127 $self->unlink_save;
1789my $nuke_counter = "aaaa"; 2131my $nuke_counter = "aaaa";
1790 2132
1791sub nuke { 2133sub nuke {
1792 my ($self) = @_; 2134 my ($self) = @_;
1793 2135
2136 {
2137 my $lock = cf::lock_acquire "map_data:$self->{path}";
2138
1794 delete $cf::MAP{$self->path}; 2139 delete $cf::MAP{$self->path};
1795 2140
1796 $self->unlink_save; 2141 $self->unlink_save;
1797 2142
1798 bless $self, "cf::map"; 2143 bless $self, "cf::map";
1799 delete $self->{deny_reset}; 2144 delete $self->{deny_reset};
1800 $self->{deny_save} = 1; 2145 $self->{deny_save} = 1;
1801 $self->reset_timeout (1); 2146 $self->reset_timeout (1);
1802 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2147 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1803 2148
1804 $cf::MAP{$self->path} = $self; 2149 $cf::MAP{$self->path} = $self;
2150 }
1805 2151
1806 $self->reset; # polite request, might not happen 2152 $self->reset; # polite request, might not happen
1807} 2153}
1808 2154
1809=item $maps = cf::map::tmp_maps 2155=item $maps = cf::map::tmp_maps
1885 2231
1886sub inv_recursive { 2232sub inv_recursive {
1887 inv_recursive_ inv $_[0] 2233 inv_recursive_ inv $_[0]
1888} 2234}
1889 2235
2236=item $ref = $ob->ref
2237
2238creates and returns a persistent reference to an objetc that can be stored as a string.
2239
2240=item $ob = cf::object::deref ($refstring)
2241
2242returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2243even if the object actually exists. May block.
2244
2245=cut
2246
2247sub deref {
2248 my ($ref) = @_;
2249
2250 # temporary compatibility#TODO#remove
2251 $ref =~ s{^<}{player/<};
2252
2253 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2254 my ($uuid, $name) = ($1, $2);
2255 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2256 or return;
2257 $pl->ob->uuid eq $uuid
2258 or return;
2259
2260 $pl->ob
2261 } else {
2262 warn "$ref: cannot resolve object reference\n";
2263 undef
2264 }
2265}
2266
1890package cf; 2267package cf;
1891 2268
1892=back 2269=back
1893 2270
1894=head3 cf::object::player 2271=head3 cf::object::player
1911 2288
1912 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2289 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1913 2290
1914 if ($self->{record_replies}) { 2291 if ($self->{record_replies}) {
1915 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2292 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2293
1916 } else { 2294 } else {
2295 my $pl = $self->contr;
2296
2297 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2298 my $dialog = $pl->{npc_dialog};
2299 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2300
2301 } else {
1917 $msg = $npc->name . " says: $msg" if $npc; 2302 $msg = $npc->name . " says: $msg" if $npc;
1918 $self->message ($msg, $flags); 2303 $self->message ($msg, $flags);
2304 }
1919 } 2305 }
2306}
2307
2308=item $object->send_msg ($channel, $msg, $color, [extra...])
2309
2310=cut
2311
2312sub cf::object::send_msg {
2313 my $pl = shift->contr
2314 or return;
2315 $pl->send_msg (@_);
1920} 2316}
1921 2317
1922=item $player_object->may ("access") 2318=item $player_object->may ("access")
1923 2319
1924Returns wether the given player is authorized to access resource "access" 2320Returns wether the given player is authorized to access resource "access"
2003 # use -1 or undef as default coordinates, not 0, 0 2399 # use -1 or undef as default coordinates, not 0, 0
2004 ($x, $y) = ($map->enter_x, $map->enter_y) 2400 ($x, $y) = ($map->enter_x, $map->enter_y)
2005 if $x <=0 && $y <= 0; 2401 if $x <=0 && $y <= 0;
2006 2402
2007 $map->load; 2403 $map->load;
2008 $map->load_diag; 2404 $map->load_neighbours;
2009 2405
2010 return unless $self->contr->active; 2406 return unless $self->contr->active;
2011 $self->activate_recursive; 2407 $self->activate_recursive;
2012 2408
2013 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2409 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2014 $self->enter_map ($map, $x, $y); 2410 $self->enter_map ($map, $x, $y);
2015} 2411}
2016 2412
2017=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2413=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2018 2414
2019Moves the player to the given map-path and coordinates by first freezing 2415Moves the player to the given map-path and coordinates by first freezing
2020her, loading and preparing them map, calling the provided $check callback 2416her, loading and preparing them map, calling the provided $check callback
2021that has to return the map if sucecssful, and then unfreezes the player on 2417that has to return the map if sucecssful, and then unfreezes the player on
2022the new (success) or old (failed) map position. 2418the new (success) or old (failed) map position. In either case, $done will
2419be called at the end of this process.
2023 2420
2024=cut 2421=cut
2025 2422
2026our $GOTOGEN; 2423our $GOTOGEN;
2027 2424
2028sub cf::object::player::goto { 2425sub cf::object::player::goto {
2029 my ($self, $path, $x, $y, $check) = @_; 2426 my ($self, $path, $x, $y, $check, $done) = @_;
2030 2427
2031 # do generation counting so two concurrent goto's will be executed in-order 2428 # do generation counting so two concurrent goto's will be executed in-order
2032 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2429 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2033 2430
2034 $self->enter_link; 2431 $self->enter_link;
2054 2451
2055 if ($gen == $self->{_goto_generation}) { 2452 if ($gen == $self->{_goto_generation}) {
2056 delete $self->{_goto_generation}; 2453 delete $self->{_goto_generation};
2057 $self->leave_link ($map, $x, $y); 2454 $self->leave_link ($map, $x, $y);
2058 } 2455 }
2456
2457 $done->() if $done;
2059 })->prio (1); 2458 })->prio (1);
2060} 2459}
2061 2460
2062=item $player_object->enter_exit ($exit_object) 2461=item $player_object->enter_exit ($exit_object)
2063 2462
2132 my $hp = $exit->stats->hp; 2531 my $hp = $exit->stats->hp;
2133 my $sp = $exit->stats->sp; 2532 my $sp = $exit->stats->sp;
2134 2533
2135 $self->enter_link; 2534 $self->enter_link;
2136 2535
2536 # if exit is damned, update players death & WoR home-position
2537 $self->contr->savebed ($slaying, $hp, $sp)
2538 if $exit->flag (FLAG_DAMNED);
2539
2137 (async { 2540 (async {
2138 $self->deactivate_recursive; # just to be sure 2541 $self->deactivate_recursive; # just to be sure
2139 unless (eval { 2542 unless (eval {
2140 $self->goto ($slaying, $hp, $sp); 2543 $self->goto ($slaying, $hp, $sp);
2141 2544
2168 2571
2169 utf8::encode $text; 2572 utf8::encode $text;
2170 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2573 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2171} 2574}
2172 2575
2576=item $client->send_msg ($channel, $msg, $color, [extra...])
2577
2578Send a drawinfo or msg packet to the client, formatting the msg for the
2579client if neccessary. C<$type> should be a string identifying the type of
2580the message, with C<log> being the default. If C<$color> is negative, suppress
2581the message unless the client supports the msg packet.
2582
2583=cut
2584
2585our %CHANNEL = (
2586 "c/identify" => {
2587 id => "identify",
2588 title => "Identify",
2589 reply => undef,
2590 tooltip => "Items recently identified",
2591 },
2592 "c/examine" => {
2593 id => "examine",
2594 title => "Examine",
2595 reply => undef,
2596 tooltip => "Signs and other items you examined",
2597 },
2598);
2599
2600sub cf::client::send_msg {
2601 my ($self, $channel, $msg, $color, @extra) = @_;
2602
2603 $msg = $self->pl->expand_cfpod ($msg);
2604
2605 $color &= cf::NDI_CLIENT_MASK; # just in case...
2606
2607 # check predefined channels, for the benefit of C
2608 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2609
2610 if (ref $channel) {
2611 # send meta info to client, if not yet sent
2612 unless (exists $self->{channel}{$channel->{id}}) {
2613 $self->{channel}{$channel->{id}} = $channel;
2614 $self->ext_msg (channel_info => $channel)
2615 if $self->can_msg;
2616 }
2617
2618 $channel = $channel->{id};
2619 }
2620
2621 return unless @extra || length $msg;
2622
2623 if ($self->can_msg) {
2624 # default colour, mask it out
2625 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2626 if $color & cf::NDI_DEF;
2627
2628 $self->send_packet ("msg " . $self->{json_coder}->encode (
2629 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2630 } else {
2631 if ($color >= 0) {
2632 # replace some tags by gcfclient-compatible ones
2633 for ($msg) {
2634 1 while
2635 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2636 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2637 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2638 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2639 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2640 }
2641
2642 $color &= cf::NDI_COLOR_MASK;
2643
2644 utf8::encode $msg;
2645
2646 if (0 && $msg =~ /\[/) {
2647 # COMMAND/INFO
2648 $self->send_packet ("drawextinfo $color 10 8 $msg")
2649 } else {
2650 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2651 $self->send_packet ("drawinfo $color $msg")
2652 }
2653 }
2654 }
2655}
2656
2173=item $client->ext_event ($type, %msg) 2657=item $client->ext_msg ($type, @msg)
2174 2658
2175Sends an exti event to the client. 2659Sends an ext event to the client.
2176 2660
2177=cut 2661=cut
2178 2662
2179sub cf::client::ext_event($$%) { 2663sub cf::client::ext_msg($$@) {
2180 my ($self, $type, %msg) = @_; 2664 my ($self, $type, @msg) = @_;
2181 2665
2666 if ($self->extcmd == 2) {
2667 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2668 } elsif ($self->extcmd == 1) { # TODO: remove
2182 $msg{msgtype} = "event_$type"; 2669 push @msg, msgtype => "event_$type";
2183 $self->send_packet ("ext " . cf::to_json \%msg); 2670 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2671 }
2672}
2673
2674=item $client->ext_reply ($msgid, @msg)
2675
2676Sends an ext reply to the client.
2677
2678=cut
2679
2680sub cf::client::ext_reply($$@) {
2681 my ($self, $id, @msg) = @_;
2682
2683 if ($self->extcmd == 2) {
2684 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2685 } elsif ($self->extcmd == 1) {
2686 #TODO: version 1, remove
2687 unshift @msg, msgtype => "reply", msgid => $id;
2688 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2689 }
2184} 2690}
2185 2691
2186=item $success = $client->query ($flags, "text", \&cb) 2692=item $success = $client->query ($flags, "text", \&cb)
2187 2693
2188Queues a query to the client, calling the given callback with 2694Queues a query to the client, calling the given callback with
2189the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2695the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2190C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2696C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2191 2697
2192Queries can fail, so check the return code. Or don't, as queries will become 2698Queries can fail, so check the return code. Or don't, as queries will
2193reliable at some point in the future. 2699become reliable at some point in the future.
2194 2700
2195=cut 2701=cut
2196 2702
2197sub cf::client::query { 2703sub cf::client::query {
2198 my ($self, $flags, $text, $cb) = @_; 2704 my ($self, $flags, $text, $cb) = @_;
2206 utf8::encode $text; 2712 utf8::encode $text;
2207 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2713 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2208 2714
2209 $self->send_packet ($self->{query_queue}[0][0]) 2715 $self->send_packet ($self->{query_queue}[0][0])
2210 if @{ $self->{query_queue} } == 1; 2716 if @{ $self->{query_queue} } == 1;
2717
2718 1
2211} 2719}
2212 2720
2213cf::client->attach ( 2721cf::client->attach (
2722 on_connect => sub {
2723 my ($ns) = @_;
2724
2725 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2726 },
2214 on_reply => sub { 2727 on_reply => sub {
2215 my ($ns, $msg) = @_; 2728 my ($ns, $msg) = @_;
2216 2729
2217 # this weird shuffling is so that direct followup queries 2730 # this weird shuffling is so that direct followup queries
2218 # get handled first 2731 # get handled first
2230 } else { 2743 } else {
2231 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2744 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2232 } 2745 }
2233 } 2746 }
2234 }, 2747 },
2748 on_exticmd => sub {
2749 my ($ns, $buf) = @_;
2750
2751 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2752
2753 if (ref $msg) {
2754 my ($type, $reply, @payload) =
2755 "ARRAY" eq ref $msg
2756 ? @$msg
2757 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2758
2759 my @reply;
2760
2761 if (my $cb = $EXTICMD{$type}) {
2762 @reply = $cb->($ns, @payload);
2763 }
2764
2765 $ns->ext_reply ($reply, @reply)
2766 if $reply;
2767
2768 } else {
2769 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2770 }
2771
2772 cf::override;
2773 },
2235); 2774);
2236 2775
2237=item $client->async (\&cb) 2776=item $client->async (\&cb)
2238 2777
2239Create a new coroutine, running the specified callback. The coroutine will 2778Create a new coroutine, running the specified callback. The coroutine will
2280our $safe = new Safe "safe"; 2819our $safe = new Safe "safe";
2281our $safe_hole = new Safe::Hole; 2820our $safe_hole = new Safe::Hole;
2282 2821
2283$SIG{FPE} = 'IGNORE'; 2822$SIG{FPE} = 'IGNORE';
2284 2823
2285$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2824$safe->permit_only (Opcode::opset qw(
2825 :base_core :base_mem :base_orig :base_math
2826 grepstart grepwhile mapstart mapwhile
2827 sort time
2828));
2286 2829
2287# here we export the classes and methods available to script code 2830# here we export the classes and methods available to script code
2288 2831
2289=pod 2832=pod
2290 2833
2291The following functions and methods are available within a safe environment: 2834The following functions and methods are available within a safe environment:
2292 2835
2293 cf::object contr pay_amount pay_player map 2836 cf::object
2837 contr pay_amount pay_player map x y force_find force_add
2838 insert remove name archname title slaying race decrease_ob_nr
2839
2294 cf::object::player player 2840 cf::object::player
2295 cf::player peaceful 2841 player
2296 cf::map trigger 2842
2843 cf::player
2844 peaceful
2845
2846 cf::map
2847 trigger
2297 2848
2298=cut 2849=cut
2299 2850
2300for ( 2851for (
2301 ["cf::object" => qw(contr pay_amount pay_player map)], 2852 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2853 insert remove inv name archname title slaying race
2854 decrease_ob_nr)],
2302 ["cf::object::player" => qw(player)], 2855 ["cf::object::player" => qw(player)],
2303 ["cf::player" => qw(peaceful)], 2856 ["cf::player" => qw(peaceful)],
2304 ["cf::map" => qw(trigger)], 2857 ["cf::map" => qw(trigger)],
2305) { 2858) {
2306 no strict 'refs'; 2859 no strict 'refs';
2377=back 2930=back
2378 2931
2379=cut 2932=cut
2380 2933
2381############################################################################# 2934#############################################################################
2382
2383=head2 EXTENSION DATABASE SUPPORT
2384
2385Crossfire maintains a very simple database for extension use. It can
2386currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2387convert to/from binary).
2388
2389The parameter C<$family> should best start with the name of the extension
2390using it, it should be unique.
2391
2392=over 4
2393
2394=item $value = cf::db_get $family => $key
2395
2396Returns a single value from the database.
2397
2398=item cf::db_put $family => $key => $value
2399
2400Stores the given C<$value> in the family.
2401
2402=cut
2403
2404our $DB;
2405
2406sub db_init {
2407 unless ($DB) {
2408 $DB = BDB::db_create $DB_ENV;
2409
2410 cf::sync_job {
2411 eval {
2412 $DB->set_flags (BDB::CHKSUM);
2413
2414 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2415 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2416 cf::cleanup "db_open(db): $!" if $!;
2417 };
2418 cf::cleanup "db_open(db): $@" if $@;
2419 };
2420 }
2421}
2422
2423sub db_get($$) {
2424 my $key = "$_[0]/$_[1]";
2425
2426 cf::sync_job {
2427 BDB::db_get $DB, undef, $key, my $data;
2428
2429 $! ? ()
2430 : $data
2431 }
2432}
2433
2434sub db_put($$$) {
2435 BDB::dbreq_pri 4;
2436 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2437}
2438
2439=item cf::cache $id => [$paths...], $processversion => $process
2440
2441Generic caching function that returns the value of the resource $id,
2442caching and regenerating as required.
2443
2444This function can block.
2445
2446=cut
2447
2448sub cache {
2449 my ($id, $src, $processversion, $process) = @_;
2450
2451 my $meta =
2452 join "\x00",
2453 $processversion,
2454 map {
2455 aio_stat $_
2456 and Carp::croak "$_: $!";
2457
2458 ($_, (stat _)[7,9])
2459 } @$src;
2460
2461 my $dbmeta = db_get cache => "$id/meta";
2462 if ($dbmeta ne $meta) {
2463 # changed, we may need to process
2464
2465 my @data;
2466 my $md5;
2467
2468 for (0 .. $#$src) {
2469 0 <= aio_load $src->[$_], $data[$_]
2470 or Carp::croak "$src->[$_]: $!";
2471 }
2472
2473 # if processing is expensive, check
2474 # checksum first
2475 if (1) {
2476 $md5 =
2477 join "\x00",
2478 $processversion,
2479 map {
2480 Coro::cede;
2481 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2482 } 0.. $#$src;
2483
2484
2485 my $dbmd5 = db_get cache => "$id/md5";
2486 if ($dbmd5 eq $md5) {
2487 db_put cache => "$id/meta", $meta;
2488
2489 return db_get cache => "$id/data";
2490 }
2491 }
2492
2493 my $t1 = Time::HiRes::time;
2494 my $data = $process->(\@data);
2495 my $t2 = Time::HiRes::time;
2496
2497 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2498
2499 db_put cache => "$id/data", $data;
2500 db_put cache => "$id/md5" , $md5;
2501 db_put cache => "$id/meta", $meta;
2502
2503 return $data;
2504 }
2505
2506 db_get cache => "$id/data"
2507}
2508
2509=item fork_call { }, $args
2510
2511Executes the given code block with the given arguments in a seperate
2512process, returning the results. Everything must be serialisable with
2513Coro::Storable. May, of course, block. Note that the executed sub may
2514never block itself or use any form of Event handling.
2515
2516=cut
2517
2518sub fork_call(&@) {
2519 my ($cb, @args) = @_;
2520
2521# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2522# or die "socketpair: $!";
2523 pipe my $fh1, my $fh2
2524 or die "pipe: $!";
2525
2526 if (my $pid = fork) {
2527 close $fh2;
2528
2529 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2530 $res = Coro::Storable::thaw $res;
2531
2532 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2533
2534 die $$res unless "ARRAY" eq ref $res;
2535
2536 return wantarray ? @$res : $res->[-1];
2537 } else {
2538 reset_signals;
2539 local $SIG{__WARN__};
2540 local $SIG{__DIE__};
2541 eval {
2542 close $fh1;
2543
2544 my @res = eval { $cb->(@args) };
2545 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2546 };
2547
2548 warn $@ if $@;
2549 _exit 0;
2550 }
2551}
2552
2553#############################################################################
2554# the server's init and main functions 2935# the server's init and main functions
2555 2936
2556sub load_facedata($) { 2937sub load_facedata($) {
2557 my ($path) = @_; 2938 my ($path) = @_;
2939
2940 # HACK to clear player env face cache, we need some signal framework
2941 # for this (global event?)
2942 %ext::player_env::MUSIC_FACE_CACHE = ();
2943
2944 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2558 2945
2559 warn "loading facedata from $path\n"; 2946 warn "loading facedata from $path\n";
2560 2947
2561 my $facedata; 2948 my $facedata;
2562 0 < aio_load $path, $facedata 2949 0 < aio_load $path, $facedata
2565 $facedata = Coro::Storable::thaw $facedata; 2952 $facedata = Coro::Storable::thaw $facedata;
2566 2953
2567 $facedata->{version} == 2 2954 $facedata->{version} == 2
2568 or cf::cleanup "$path: version mismatch, cannot proceed."; 2955 or cf::cleanup "$path: version mismatch, cannot proceed.";
2569 2956
2957 # patch in the exptable
2958 $facedata->{resource}{"res/exp_table"} = {
2959 type => FT_RSRC,
2960 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2961 };
2962 cf::cede_to_tick;
2963
2570 { 2964 {
2571 my $faces = $facedata->{faceinfo}; 2965 my $faces = $facedata->{faceinfo};
2572 2966
2573 while (my ($face, $info) = each %$faces) { 2967 while (my ($face, $info) = each %$faces) {
2574 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2968 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2575 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2969 cf::face::set_visibility $idx, $info->{visibility};
2970 cf::face::set_magicmap $idx, $info->{magicmap};
2576 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2971 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2577 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2972 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2578 Coro::cede; 2973
2974 cf::cede_to_tick;
2579 } 2975 }
2580 2976
2581 while (my ($face, $info) = each %$faces) { 2977 while (my ($face, $info) = each %$faces) {
2582 next unless $info->{smooth}; 2978 next unless $info->{smooth};
2583 my $idx = cf::face::find $face 2979 my $idx = cf::face::find $face
2584 or next; 2980 or next;
2585 if (my $smooth = cf::face::find $info->{smooth}) { 2981 if (my $smooth = cf::face::find $info->{smooth}) {
2982 cf::face::set_smooth $idx, $smooth;
2586 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2983 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2587 } else { 2984 } else {
2588 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2985 warn "smooth face '$info->{smooth}' not found for face '$face'";
2589 } 2986 }
2590 Coro::cede; 2987
2988 cf::cede_to_tick;
2591 } 2989 }
2592 } 2990 }
2593 2991
2594 { 2992 {
2595 my $anims = $facedata->{animinfo}; 2993 my $anims = $facedata->{animinfo};
2596 2994
2597 while (my ($anim, $info) = each %$anims) { 2995 while (my ($anim, $info) = each %$anims) {
2598 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2996 cf::anim::set $anim, $info->{frames}, $info->{facings};
2599 Coro::cede; 2997 cf::cede_to_tick;
2600 } 2998 }
2601 2999
2602 cf::anim::invalidate_all; # d'oh 3000 cf::anim::invalidate_all; # d'oh
2603 } 3001 }
2604 3002
3003 {
3004 # TODO: for gcfclient pleasure, we should give resources
3005 # that gcfclient doesn't grok a >10000 face index.
3006 my $res = $facedata->{resource};
3007
3008 my $soundconf = delete $res->{"res/sound.conf"};
3009
3010 while (my ($name, $info) = each %$res) {
3011 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3012 my $data;
3013
3014 if ($info->{type} & 1) {
3015 # prepend meta info
3016
3017 my $meta = $enc->encode ({
3018 name => $name,
3019 %{ $info->{meta} || {} },
3020 });
3021
3022 $data = pack "(w/a*)*", $meta, $info->{data};
3023 } else {
3024 $data = $info->{data};
3025 }
3026
3027 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3028 cf::face::set_type $idx, $info->{type};
3029
3030 cf::cede_to_tick;
3031 }
3032
3033 if ($soundconf) {
3034 $soundconf = $enc->decode (delete $soundconf->{data});
3035
3036 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3037 my $sound = $soundconf->{compat}[$_]
3038 or next;
3039
3040 my $face = cf::face::find "sound/$sound->[1]";
3041 cf::sound::set $sound->[0] => $face;
3042 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3043 }
3044
3045 while (my ($k, $v) = each %{$soundconf->{event}}) {
3046 my $face = cf::face::find "sound/$v";
3047 cf::sound::set $k => $face;
3048 }
3049 }
3050 }
3051
2605 1 3052 1
2606} 3053}
2607 3054
3055register_exticmd fx_want => sub {
3056 my ($ns, $want) = @_;
3057
3058 while (my ($k, $v) = each %$want) {
3059 $ns->fx_want ($k, $v);
3060 }
3061};
3062
2608sub reload_regions { 3063sub reload_regions {
3064 # HACK to clear player env face cache, we need some signal framework
3065 # for this (global event?)
3066 %ext::player_env::MUSIC_FACE_CACHE = ();
3067
2609 load_resource_file "$MAPDIR/regions" 3068 load_resource_file "$MAPDIR/regions"
2610 or die "unable to load regions file\n"; 3069 or die "unable to load regions file\n";
3070
3071 for (cf::region::list) {
3072 $_->{match} = qr/$_->{match}/
3073 if exists $_->{match};
3074 }
2611} 3075}
2612 3076
2613sub reload_facedata { 3077sub reload_facedata {
2614 load_facedata "$DATADIR/facedata" 3078 load_facedata "$DATADIR/facedata"
2615 or die "unable to load facedata\n"; 3079 or die "unable to load facedata\n";
2616} 3080}
2617 3081
2618sub reload_archetypes { 3082sub reload_archetypes {
3083 load_resource_file "$DATADIR/archetypes"
3084 or die "unable to load archetypes\n";
3085 #d# NEED to laod twice to resolve forward references
3086 # this really needs to be done in an extra post-pass
3087 # (which needs to be synchronous, so solve it differently)
2619 load_resource_file "$DATADIR/archetypes" 3088 load_resource_file "$DATADIR/archetypes"
2620 or die "unable to load archetypes\n"; 3089 or die "unable to load archetypes\n";
2621} 3090}
2622 3091
2623sub reload_treasures { 3092sub reload_treasures {
2639 3108
2640sub init { 3109sub init {
2641 reload_resources; 3110 reload_resources;
2642} 3111}
2643 3112
2644sub cfg_load { 3113sub reload_config {
2645 open my $fh, "<:utf8", "$CONFDIR/config" 3114 open my $fh, "<:utf8", "$CONFDIR/config"
2646 or return; 3115 or return;
2647 3116
2648 local $/; 3117 local $/;
2649 *CFG = YAML::Syck::Load <$fh>; 3118 *CFG = YAML::Syck::Load <$fh>;
2669 (async { 3138 (async {
2670 Event::one_event; 3139 Event::one_event;
2671 })->prio (Coro::PRIO_MAX); 3140 })->prio (Coro::PRIO_MAX);
2672 }; 3141 };
2673 3142
2674 cfg_load; 3143 reload_config;
2675 db_init; 3144 db_init;
2676 load_extensions; 3145 load_extensions;
2677 3146
2678 $TICK_WATCHER->start; 3147 $TICK_WATCHER->start;
2679 Event::loop; 3148 Event::loop;
2695 }, 3164 },
2696 ); 3165 );
2697 } 3166 }
2698} 3167}
2699 3168
3169sub write_runtime {
3170 my $runtime = "$LOCALDIR/runtime";
3171
3172 # first touch the runtime file to show we are still running:
3173 # the fsync below can take a very very long time.
3174
3175 IO::AIO::aio_utime $runtime, undef, undef;
3176
3177 my $guard = cf::lock_acquire "write_runtime";
3178
3179 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3180 or return;
3181
3182 my $value = $cf::RUNTIME + 90 + 10;
3183 # 10 is the runtime save interval, for a monotonic clock
3184 # 60 allows for the watchdog to kill the server.
3185
3186 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3187 and return;
3188
3189 # always fsync - this file is important
3190 aio_fsync $fh
3191 and return;
3192
3193 # touch it again to show we are up-to-date
3194 aio_utime $fh, undef, undef;
3195
3196 close $fh
3197 or return;
3198
3199 aio_rename "$runtime~", $runtime
3200 and return;
3201
3202 warn "runtime file written.\n";
3203
3204 1
3205}
3206
2700sub emergency_save() { 3207sub emergency_save() {
2701 my $freeze_guard = cf::freeze_mainloop; 3208 my $freeze_guard = cf::freeze_mainloop;
2702 3209
2703 warn "enter emergency perl save\n"; 3210 warn "enter emergency perl save\n";
2704 3211
2779 %EXT_CORO = (); 3286 %EXT_CORO = ();
2780 3287
2781 warn "removing commands"; 3288 warn "removing commands";
2782 %COMMAND = (); 3289 %COMMAND = ();
2783 3290
2784 warn "removing ext commands"; 3291 warn "removing ext/exti commands";
2785 %EXTCMD = (); 3292 %EXTCMD = ();
3293 %EXTICMD = ();
2786 3294
2787 warn "unloading/nuking all extensions"; 3295 warn "unloading/nuking all extensions";
2788 for my $pkg (@EXTS) { 3296 for my $pkg (@EXTS) {
2789 warn "... unloading $pkg"; 3297 warn "... unloading $pkg";
2790 3298
2833 warn "reloading cf.pm"; 3341 warn "reloading cf.pm";
2834 require cf; 3342 require cf;
2835 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3343 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2836 3344
2837 warn "loading config and database again"; 3345 warn "loading config and database again";
2838 cf::cfg_load; 3346 cf::reload_config;
2839 3347
2840 warn "loading extensions"; 3348 warn "loading extensions";
2841 cf::load_extensions; 3349 cf::load_extensions;
2842 3350
2843 warn "reattaching attachments to objects/players"; 3351 warn "reattaching attachments to objects/players";
2936 or die; 3444 or die;
2937 3445
2938 $map->width (50); 3446 $map->width (50);
2939 $map->height (50); 3447 $map->height (50);
2940 $map->alloc; 3448 $map->alloc;
2941 $map->_load_objects ("/tmp/x.map", 1); 3449 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
2942 my $t = Event::time - $t; 3450 my $t = Event::time - $t;
2943 3451
2944 #next unless $t < 0.0013;#d# 3452 #next unless $t < 0.0013;#d#
2945 if ($t < $min) { 3453 if ($t < $min) {
2946 $min = $t; 3454 $min = $t;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines