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.361 by root, Sun Sep 9 12:52:48 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;
1017 }; 1261 };
1018} 1262}
1019 1263
1020############################################################################# 1264#############################################################################
1021 1265
1266=back
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
1026=cut 1272=cut
1030use Coro::AIO; 1276use Coro::AIO;
1031 1277
1032=head3 cf::player 1278=head3 cf::player
1033 1279
1034=over 4 1280=over 4
1281
1282=item cf::player::num_playing
1283
1284Returns the official number of playing players, as per the Crossfire metaserver rules.
1285
1286=cut
1287
1288sub num_playing {
1289 scalar grep
1290 $_->ob->map
1291 && !$_->hidden
1292 && !$_->ob->flag (cf::FLAG_WIZ),
1293 cf::player::list
1294}
1035 1295
1036=item cf::player::find $login 1296=item cf::player::find $login
1037 1297
1038Returns the given player object, loading it if necessary (might block). 1298Returns the given player object, loading it if necessary (might block).
1039 1299
1075 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1076 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1077 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1337 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1078 aio_unlink +(playerdir $login) . "/$login.pl"; 1338 aio_unlink +(playerdir $login) . "/$login.pl";
1079 1339
1080 my $pl = load_pl path $login 1340 my $f = new_from_file cf::object::thawer path $login
1081 or return; 1341 or return;
1342
1343 $f->next;
1344 my $pl = cf::player::load_pl $f
1345 or return;
1346 local $cf::PLAYER_LOADING{$login} = $pl;
1347 $f->resolve_delayed_derefs;
1082 $cf::PLAYER{$login} = $pl 1348 $cf::PLAYER{$login} = $pl
1083 } 1349 }
1084 } 1350 }
1085} 1351}
1086 1352
1096 1362
1097 aio_mkdir playerdir $pl, 0770; 1363 aio_mkdir playerdir $pl, 0770;
1098 $pl->{last_save} = $cf::RUNTIME; 1364 $pl->{last_save} = $cf::RUNTIME;
1099 1365
1100 $pl->save_pl ($path); 1366 $pl->save_pl ($path);
1101 Coro::cede; 1367 cf::cede_to_tick;
1102} 1368}
1103 1369
1104sub new($) { 1370sub new($) {
1105 my ($login) = @_; 1371 my ($login) = @_;
1106 1372
1110 $self->{deny_save} = 1; 1376 $self->{deny_save} = 1;
1111 1377
1112 $cf::PLAYER{$login} = $self; 1378 $cf::PLAYER{$login} = $self;
1113 1379
1114 $self 1380 $self
1381}
1382
1383=item $player->send_msg ($channel, $msg, $color, [extra...])
1384
1385=cut
1386
1387sub send_msg {
1388 my $ns = shift->ns
1389 or return;
1390 $ns->send_msg (@_);
1115} 1391}
1116 1392
1117=item $pl->quit_character 1393=item $pl->quit_character
1118 1394
1119Nukes the player without looking back. If logged in, the connection will 1395Nukes the player without looking back. If logged in, the connection will
1174 or return []; 1450 or return [];
1175 1451
1176 my @logins; 1452 my @logins;
1177 1453
1178 for my $login (@$dirs) { 1454 for my $login (@$dirs) {
1455 my $path = path $login;
1456
1457 # a .pst is a dead give-away for a valid player
1458 unless (-e "$path.pst") {
1179 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1459 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1180 aio_read $fh, 0, 512, my $buf, 0 or next; 1460 aio_read $fh, 0, 512, my $buf, 0 or next;
1181 $buf !~ /^password -------------$/m or next; # official not-valid tag 1461 $buf !~ /^password -------------$/m or next; # official not-valid tag
1462 }
1182 1463
1183 utf8::decode $login; 1464 utf8::decode $login;
1184 push @logins, $login; 1465 push @logins, $login;
1185 } 1466 }
1186 1467
1213 } 1494 }
1214 1495
1215 \@paths 1496 \@paths
1216} 1497}
1217 1498
1499=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1500
1501Expand crossfire pod fragments into protocol xml.
1502
1503=cut
1504
1505sub expand_cfpod {
1506 ((my $self), (local $_)) = @_;
1507
1508 # escape & and <
1509 s/&/&amp;/g;
1510 s/(?<![BIUGHT])</&lt;/g;
1511
1512 # this is buggy, it needs to properly take care of nested <'s
1513
1514 1 while
1515 # replace B<>, I<>, U<> etc.
1516 s/B<([^\>]*)>/<b>$1<\/b>/
1517 || s/I<([^\>]*)>/<i>$1<\/i>/
1518 || s/U<([^\>]*)>/<u>$1<\/u>/
1519 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1520 # replace G<male|female> tags
1521 || s{G<([^>|]*)\|([^>]*)>}{
1522 $self->gender ? $2 : $1
1523 }ge
1524 # replace H<hint text>
1525 || s{H<([^\>]*)>}
1526 {
1527 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1528 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1529 "")
1530 [$self->{hintmode}]
1531 }ge;
1532
1533 # create single paragraphs (very hackish)
1534 s/(?<=\S)\n(?=\w)/ /g;
1535
1536 # compress some whitespace
1537 s/\s+\n/\n/g; # ws line-ends
1538 s/\n\n+/\n/g; # double lines
1539 s/^\n+//; # beginning lines
1540 s/\n+$//; # ending lines
1541
1542 $_
1543}
1544
1545sub hintmode {
1546 $_[0]{hintmode} = $_[1] if @_ > 1;
1547 $_[0]{hintmode}
1548}
1549
1218=item $player->ext_reply ($msgid, %msg) 1550=item $player->ext_reply ($msgid, @msg)
1219 1551
1220Sends an ext reply to the player. 1552Sends an ext reply to the player.
1221 1553
1222=cut 1554=cut
1223 1555
1224sub ext_reply($$%) { 1556sub ext_reply($$@) {
1225 my ($self, $id, %msg) = @_; 1557 my ($self, $id, @msg) = @_;
1226 1558
1227 $msg{msgid} = $id; 1559 $self->ns->ext_reply ($id, @msg)
1228
1229 $self->send ("ext " . cf::to_json \%msg);
1230} 1560}
1231 1561
1232=item $player->ext_event ($type, %msg) 1562=item $player->ext_msg ($type, @msg)
1233 1563
1234Sends an ext event to the client. 1564Sends an ext event to the client.
1235 1565
1236=cut 1566=cut
1237 1567
1238sub ext_event($$%) { 1568sub ext_msg($$@) {
1239 my ($self, $type, %msg) = @_; 1569 my ($self, $type, @msg) = @_;
1240 1570
1241 $self->ns->ext_event ($type, %msg); 1571 $self->ns->ext_msg ($type, @msg);
1242} 1572}
1243 1573
1244=head3 cf::region 1574=head3 cf::region
1245 1575
1246=over 4 1576=over 4
1249 1579
1250package cf::region; 1580package cf::region;
1251 1581
1252=item cf::region::find_by_path $path 1582=item cf::region::find_by_path $path
1253 1583
1254Tries to decuce the probable region for a map knowing only its path. 1584Tries to decuce the likely region for a map knowing only its path.
1255 1585
1256=cut 1586=cut
1257 1587
1258sub find_by_path($) { 1588sub find_by_path($) {
1259 my ($path) = @_; 1589 my ($path) = @_;
1260 1590
1261 my ($match, $specificity); 1591 my ($match, $specificity);
1262 1592
1263 for my $region (list) { 1593 for my $region (list) {
1264 if ($region->match && $path =~ $region->match) { 1594 if ($region->{match} && $path =~ $region->{match}) {
1265 ($match, $specificity) = ($region, $region->specificity) 1595 ($match, $specificity) = ($region, $region->specificity)
1266 if $region->specificity > $specificity; 1596 if $region->specificity > $specificity;
1267 } 1597 }
1268 } 1598 }
1269 1599
1389 $self->init; # pass $1 etc. 1719 $self->init; # pass $1 etc.
1390 return $self; 1720 return $self;
1391 } 1721 }
1392 } 1722 }
1393 1723
1394 Carp::carp "unable to resolve path '$path' (base '$base')."; 1724 Carp::cluck "unable to resolve path '$path' (base '$base').";
1395 () 1725 ()
1396} 1726}
1397 1727
1398sub init { 1728sub init {
1399 my ($self) = @_; 1729 my ($self) = @_;
1462 1792
1463sub load_header_from($) { 1793sub load_header_from($) {
1464 my ($self, $path) = @_; 1794 my ($self, $path) = @_;
1465 1795
1466 utf8::encode $path; 1796 utf8::encode $path;
1467 #aio_open $path, O_RDONLY, 0 1797 my $f = new_from_file cf::object::thawer $path
1468 # or return;
1469
1470 $self->_load_header ($path)
1471 or return; 1798 or return;
1799
1800 $self->_load_header ($f)
1801 or return;
1802
1803 local $MAP_LOADING{$self->{path}} = $self;
1804 $f->resolve_delayed_derefs;
1472 1805
1473 $self->{load_path} = $path; 1806 $self->{load_path} = $path;
1474 1807
1475 1 1808 1
1476} 1809}
1530sub find { 1863sub find {
1531 my ($path, $origin) = @_; 1864 my ($path, $origin) = @_;
1532 1865
1533 $path = normalise $path, $origin && $origin->path; 1866 $path = normalise $path, $origin && $origin->path;
1534 1867
1868 cf::lock_wait "map_data:$path";#d#remove
1535 cf::lock_wait "map_find:$path"; 1869 cf::lock_wait "map_find:$path";
1536 1870
1537 $cf::MAP{$path} || do { 1871 $cf::MAP{$path} || do {
1538 my $guard = cf::lock_acquire "map_find:$path"; 1872 my $guard1 = cf::lock_acquire "map_find:$path";
1873 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1874
1539 my $map = new_from_path cf::map $path 1875 my $map = new_from_path cf::map $path
1540 or return; 1876 or return;
1541 1877
1542 $map->{last_save} = $cf::RUNTIME; 1878 $map->{last_save} = $cf::RUNTIME;
1543 1879
1545 or return; 1881 or return;
1546 1882
1547 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1883 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1548 # doing this can freeze the server in a sync job, obviously 1884 # doing this can freeze the server in a sync job, obviously
1549 #$cf::WAIT_FOR_TICK->wait; 1885 #$cf::WAIT_FOR_TICK->wait;
1886 undef $guard1;
1887 undef $guard2;
1550 $map->reset; 1888 $map->reset;
1551 undef $guard;
1552 return find $path; 1889 return find $path;
1553 } 1890 }
1554 1891
1555 $cf::MAP{$path} = $map 1892 $cf::MAP{$path} = $map
1556 } 1893 }
1565 local $self->{deny_reset} = 1; # loading can take a long time 1902 local $self->{deny_reset} = 1; # loading can take a long time
1566 1903
1567 my $path = $self->{path}; 1904 my $path = $self->{path};
1568 1905
1569 { 1906 {
1570 my $guard = cf::lock_acquire "map_load:$path"; 1907 my $guard = cf::lock_acquire "map_data:$path";
1571 1908
1909 return unless $self->valid;
1572 return if $self->in_memory != cf::MAP_SWAPPED; 1910 return unless $self->in_memory == cf::MAP_SWAPPED;
1573 1911
1574 $self->in_memory (cf::MAP_LOADING); 1912 $self->in_memory (cf::MAP_LOADING);
1575 1913
1576 $self->alloc; 1914 $self->alloc;
1577 1915
1578 $self->pre_load; 1916 $self->pre_load;
1579 Coro::cede; 1917 cf::cede_to_tick;
1580 1918
1919 my $f = new_from_file cf::object::thawer $self->{load_path};
1920 $f->skip_block;
1581 $self->_load_objects ($self->{load_path}, 1) 1921 $self->_load_objects ($f)
1582 or return; 1922 or return;
1583 1923
1584 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1924 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1585 if delete $self->{load_original}; 1925 if delete $self->{load_original};
1586 1926
1587 if (my $uniq = $self->uniq_path) { 1927 if (my $uniq = $self->uniq_path) {
1588 utf8::encode $uniq; 1928 utf8::encode $uniq;
1589 if (aio_open $uniq, O_RDONLY, 0) { 1929 unless (aio_stat $uniq) {
1930 if (my $f = new_from_file cf::object::thawer $uniq) {
1590 $self->clear_unique_items; 1931 $self->clear_unique_items;
1591 $self->_load_objects ($uniq, 0); 1932 $self->_load_objects ($f);
1933 $f->resolve_delayed_derefs;
1934 }
1592 } 1935 }
1593 } 1936 }
1594 1937
1595 Coro::cede; 1938 $f->resolve_delayed_derefs;
1939
1940 cf::cede_to_tick;
1596 # now do the right thing for maps 1941 # now do the right thing for maps
1597 $self->link_multipart_objects; 1942 $self->link_multipart_objects;
1598 $self->difficulty ($self->estimate_difficulty) 1943 $self->difficulty ($self->estimate_difficulty)
1599 unless $self->difficulty; 1944 unless $self->difficulty;
1600 Coro::cede; 1945 cf::cede_to_tick;
1601 1946
1602 unless ($self->{deny_activate}) { 1947 unless ($self->{deny_activate}) {
1603 $self->decay_objects; 1948 $self->decay_objects;
1604 $self->fix_auto_apply; 1949 $self->fix_auto_apply;
1605 $self->update_buttons; 1950 $self->update_buttons;
1606 Coro::cede; 1951 cf::cede_to_tick;
1607 $self->set_darkness_map; 1952 $self->set_darkness_map;
1608 Coro::cede; 1953 cf::cede_to_tick;
1609 $self->activate; 1954 $self->activate;
1610 } 1955 }
1956
1957 $self->{last_save} = $cf::RUNTIME;
1958 $self->last_access ($cf::RUNTIME);
1611 1959
1612 $self->in_memory (cf::MAP_IN_MEMORY); 1960 $self->in_memory (cf::MAP_IN_MEMORY);
1613 } 1961 }
1614 1962
1615 $self->post_load; 1963 $self->post_load;
1626 1974
1627 $self 1975 $self
1628} 1976}
1629 1977
1630# find and load all maps in the 3x3 area around a map 1978# find and load all maps in the 3x3 area around a map
1631sub load_diag { 1979sub load_neighbours {
1632 my ($map) = @_; 1980 my ($map) = @_;
1633 1981
1634 my @diag; # diagonal neighbours 1982 my @neigh; # diagonal neighbours
1635 1983
1636 for (0 .. 3) { 1984 for (0 .. 3) {
1637 my $neigh = $map->tile_path ($_) 1985 my $neigh = $map->tile_path ($_)
1638 or next; 1986 or next;
1639 $neigh = find $neigh, $map 1987 $neigh = find $neigh, $map
1640 or next; 1988 or next;
1641 $neigh->load; 1989 $neigh->load;
1642 1990
1991 push @neigh,
1643 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1992 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1644 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1993 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1645 } 1994 }
1646 1995
1647 for (@diag) { 1996 for (grep defined $_->[0], @neigh) {
1997 my ($path, $origin) = @$_;
1648 my $neigh = find @$_ 1998 my $neigh = find $path, $origin
1649 or next; 1999 or next;
1650 $neigh->load; 2000 $neigh->load;
1651 } 2001 }
1652} 2002}
1653 2003
1658} 2008}
1659 2009
1660sub do_load_sync { 2010sub do_load_sync {
1661 my ($map) = @_; 2011 my ($map) = @_;
1662 2012
2013 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2014 if $Coro::current == $Coro::main;
2015
1663 cf::sync_job { $map->load }; 2016 cf::sync_job { $map->load };
1664} 2017}
1665 2018
1666our %MAP_PREFETCH; 2019our %MAP_PREFETCH;
1667our $MAP_PREFETCHER = undef; 2020our $MAP_PREFETCHER = undef;
1668 2021
1669sub find_async { 2022sub find_async {
1670 my ($path, $origin) = @_; 2023 my ($path, $origin, $load) = @_;
1671 2024
1672 $path = normalise $path, $origin && $origin->{path}; 2025 $path = normalise $path, $origin && $origin->{path};
1673 2026
1674 if (my $map = $cf::MAP{$path}) { 2027 if (my $map = $cf::MAP{$path}) {
1675 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2028 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1676 } 2029 }
1677 2030
1678 undef $MAP_PREFETCH{$path}; 2031 $MAP_PREFETCH{$path} |= $load;
2032
1679 $MAP_PREFETCHER ||= cf::async { 2033 $MAP_PREFETCHER ||= cf::async {
1680 while (%MAP_PREFETCH) { 2034 while (%MAP_PREFETCH) {
1681 for my $path (keys %MAP_PREFETCH) { 2035 while (my ($k, $v) = each %MAP_PREFETCH) {
1682 my $map = find $path 2036 if (my $map = find $k) {
1683 or next;
1684 $map->load; 2037 $map->load if $v;
2038 }
1685 2039
1686 delete $MAP_PREFETCH{$path}; 2040 delete $MAP_PREFETCH{$k};
1687 } 2041 }
1688 } 2042 }
1689 undef $MAP_PREFETCHER; 2043 undef $MAP_PREFETCHER;
1690 }; 2044 };
1691 $MAP_PREFETCHER->prio (6); 2045 $MAP_PREFETCHER->prio (6);
1694} 2048}
1695 2049
1696sub save { 2050sub save {
1697 my ($self) = @_; 2051 my ($self) = @_;
1698 2052
1699 my $lock = cf::lock_acquire "map_data:" . $self->path; 2053 my $lock = cf::lock_acquire "map_data:$self->{path}";
1700 2054
1701 $self->{last_save} = $cf::RUNTIME; 2055 $self->{last_save} = $cf::RUNTIME;
1702 2056
1703 return unless $self->dirty; 2057 return unless $self->dirty;
1704 2058
1727 my ($self) = @_; 2081 my ($self) = @_;
1728 2082
1729 # save first because save cedes 2083 # save first because save cedes
1730 $self->save; 2084 $self->save;
1731 2085
1732 my $lock = cf::lock_acquire "map_data:" . $self->path; 2086 my $lock = cf::lock_acquire "map_data:$self->{path}";
1733 2087
1734 return if $self->players; 2088 return if $self->players;
1735 return if $self->in_memory != cf::MAP_IN_MEMORY; 2089 return if $self->in_memory != cf::MAP_IN_MEMORY;
1736 return if $self->{deny_save}; 2090 return if $self->{deny_save};
1737 2091
2092 $self->in_memory (cf::MAP_SWAPPED);
2093
2094 $self->deactivate;
2095 $_->clear_links_to ($self) for values %cf::MAP;
1738 $self->clear; 2096 $self->clear;
1739 $self->in_memory (cf::MAP_SWAPPED);
1740} 2097}
1741 2098
1742sub reset_at { 2099sub reset_at {
1743 my ($self) = @_; 2100 my ($self) = @_;
1744 2101
1776 if $uniq; 2133 if $uniq;
1777 } 2134 }
1778 2135
1779 delete $cf::MAP{$self->path}; 2136 delete $cf::MAP{$self->path};
1780 2137
2138 $self->deactivate;
2139 $_->clear_links_to ($self) for values %cf::MAP;
1781 $self->clear; 2140 $self->clear;
1782
1783 $_->clear_links_to ($self) for values %cf::MAP;
1784 2141
1785 $self->unlink_save; 2142 $self->unlink_save;
1786 $self->destroy; 2143 $self->destroy;
1787} 2144}
1788 2145
1789my $nuke_counter = "aaaa"; 2146my $nuke_counter = "aaaa";
1790 2147
1791sub nuke { 2148sub nuke {
1792 my ($self) = @_; 2149 my ($self) = @_;
1793 2150
2151 {
2152 my $lock = cf::lock_acquire "map_data:$self->{path}";
2153
1794 delete $cf::MAP{$self->path}; 2154 delete $cf::MAP{$self->path};
1795 2155
1796 $self->unlink_save; 2156 $self->unlink_save;
1797 2157
1798 bless $self, "cf::map"; 2158 bless $self, "cf::map";
1799 delete $self->{deny_reset}; 2159 delete $self->{deny_reset};
1800 $self->{deny_save} = 1; 2160 $self->{deny_save} = 1;
1801 $self->reset_timeout (1); 2161 $self->reset_timeout (1);
1802 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2162 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1803 2163
1804 $cf::MAP{$self->path} = $self; 2164 $cf::MAP{$self->path} = $self;
2165 }
1805 2166
1806 $self->reset; # polite request, might not happen 2167 $self->reset; # polite request, might not happen
1807} 2168}
1808 2169
1809=item $maps = cf::map::tmp_maps 2170=item $maps = cf::map::tmp_maps
1885 2246
1886sub inv_recursive { 2247sub inv_recursive {
1887 inv_recursive_ inv $_[0] 2248 inv_recursive_ inv $_[0]
1888} 2249}
1889 2250
2251=item $ref = $ob->ref
2252
2253creates and returns a persistent reference to an objetc that can be stored as a string.
2254
2255=item $ob = cf::object::deref ($refstring)
2256
2257returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2258even if the object actually exists. May block.
2259
2260=cut
2261
2262sub deref {
2263 my ($ref) = @_;
2264
2265 # temporary compatibility#TODO#remove
2266 $ref =~ s{^<}{player/<};
2267
2268 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2269 my ($uuid, $name) = ($1, $2);
2270 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2271 or return;
2272 $pl->ob->uuid eq $uuid
2273 or return;
2274
2275 $pl->ob
2276 } else {
2277 warn "$ref: cannot resolve object reference\n";
2278 undef
2279 }
2280}
2281
1890package cf; 2282package cf;
1891 2283
1892=back 2284=back
1893 2285
1894=head3 cf::object::player 2286=head3 cf::object::player
1911 2303
1912 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2304 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1913 2305
1914 if ($self->{record_replies}) { 2306 if ($self->{record_replies}) {
1915 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2307 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2308
1916 } else { 2309 } else {
2310 my $pl = $self->contr;
2311
2312 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2313 my $dialog = $pl->{npc_dialog};
2314 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2315
2316 } else {
1917 $msg = $npc->name . " says: $msg" if $npc; 2317 $msg = $npc->name . " says: $msg" if $npc;
1918 $self->message ($msg, $flags); 2318 $self->message ($msg, $flags);
2319 }
1919 } 2320 }
2321}
2322
2323=item $object->send_msg ($channel, $msg, $color, [extra...])
2324
2325=cut
2326
2327sub cf::object::send_msg {
2328 my $pl = shift->contr
2329 or return;
2330 $pl->send_msg (@_);
1920} 2331}
1921 2332
1922=item $player_object->may ("access") 2333=item $player_object->may ("access")
1923 2334
1924Returns wether the given player is authorized to access resource "access" 2335Returns wether the given player is authorized to access resource "access"
2003 # use -1 or undef as default coordinates, not 0, 0 2414 # use -1 or undef as default coordinates, not 0, 0
2004 ($x, $y) = ($map->enter_x, $map->enter_y) 2415 ($x, $y) = ($map->enter_x, $map->enter_y)
2005 if $x <=0 && $y <= 0; 2416 if $x <=0 && $y <= 0;
2006 2417
2007 $map->load; 2418 $map->load;
2008 $map->load_diag; 2419 $map->load_neighbours;
2009 2420
2010 return unless $self->contr->active; 2421 return unless $self->contr->active;
2011 $self->activate_recursive; 2422 $self->activate_recursive;
2012 2423
2013 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2424 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2014 $self->enter_map ($map, $x, $y); 2425 $self->enter_map ($map, $x, $y);
2015} 2426}
2016 2427
2017=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2428=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2018 2429
2019Moves the player to the given map-path and coordinates by first freezing 2430Moves the player to the given map-path and coordinates by first freezing
2020her, loading and preparing them map, calling the provided $check callback 2431her, loading and preparing them map, calling the provided $check callback
2021that has to return the map if sucecssful, and then unfreezes the player on 2432that has to return the map if sucecssful, and then unfreezes the player on
2022the new (success) or old (failed) map position. 2433the new (success) or old (failed) map position. In either case, $done will
2434be called at the end of this process.
2023 2435
2024=cut 2436=cut
2025 2437
2026our $GOTOGEN; 2438our $GOTOGEN;
2027 2439
2028sub cf::object::player::goto { 2440sub cf::object::player::goto {
2029 my ($self, $path, $x, $y, $check) = @_; 2441 my ($self, $path, $x, $y, $check, $done) = @_;
2030 2442
2031 # do generation counting so two concurrent goto's will be executed in-order 2443 # do generation counting so two concurrent goto's will be executed in-order
2032 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2444 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2033 2445
2034 $self->enter_link; 2446 $self->enter_link;
2054 2466
2055 if ($gen == $self->{_goto_generation}) { 2467 if ($gen == $self->{_goto_generation}) {
2056 delete $self->{_goto_generation}; 2468 delete $self->{_goto_generation};
2057 $self->leave_link ($map, $x, $y); 2469 $self->leave_link ($map, $x, $y);
2058 } 2470 }
2471
2472 $done->() if $done;
2059 })->prio (1); 2473 })->prio (1);
2060} 2474}
2061 2475
2062=item $player_object->enter_exit ($exit_object) 2476=item $player_object->enter_exit ($exit_object)
2063 2477
2132 my $hp = $exit->stats->hp; 2546 my $hp = $exit->stats->hp;
2133 my $sp = $exit->stats->sp; 2547 my $sp = $exit->stats->sp;
2134 2548
2135 $self->enter_link; 2549 $self->enter_link;
2136 2550
2551 # if exit is damned, update players death & WoR home-position
2552 $self->contr->savebed ($slaying, $hp, $sp)
2553 if $exit->flag (FLAG_DAMNED);
2554
2137 (async { 2555 (async {
2138 $self->deactivate_recursive; # just to be sure 2556 $self->deactivate_recursive; # just to be sure
2139 unless (eval { 2557 unless (eval {
2140 $self->goto ($slaying, $hp, $sp); 2558 $self->goto ($slaying, $hp, $sp);
2141 2559
2168 2586
2169 utf8::encode $text; 2587 utf8::encode $text;
2170 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2588 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2171} 2589}
2172 2590
2591=item $client->send_msg ($channel, $msg, $color, [extra...])
2592
2593Send a drawinfo or msg packet to the client, formatting the msg for the
2594client if neccessary. C<$type> should be a string identifying the type of
2595the message, with C<log> being the default. If C<$color> is negative, suppress
2596the message unless the client supports the msg packet.
2597
2598=cut
2599
2600our %CHANNEL = (
2601 "c/identify" => {
2602 id => "identify",
2603 title => "Identify",
2604 reply => undef,
2605 tooltip => "Items recently identified",
2606 },
2607 "c/examine" => {
2608 id => "examine",
2609 title => "Examine",
2610 reply => undef,
2611 tooltip => "Signs and other items you examined",
2612 },
2613);
2614
2615sub cf::client::send_msg {
2616 my ($self, $channel, $msg, $color, @extra) = @_;
2617
2618 $msg = $self->pl->expand_cfpod ($msg);
2619
2620 $color &= cf::NDI_CLIENT_MASK; # just in case...
2621
2622 # check predefined channels, for the benefit of C
2623 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2624
2625 if (ref $channel) {
2626 # send meta info to client, if not yet sent
2627 unless (exists $self->{channel}{$channel->{id}}) {
2628 $self->{channel}{$channel->{id}} = $channel;
2629 $self->ext_msg (channel_info => $channel)
2630 if $self->can_msg;
2631 }
2632
2633 $channel = $channel->{id};
2634 }
2635
2636 return unless @extra || length $msg;
2637
2638 if ($self->can_msg) {
2639 # default colour, mask it out
2640 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2641 if $color & cf::NDI_DEF;
2642
2643 $self->send_packet ("msg " . $self->{json_coder}->encode (
2644 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2645 } else {
2646 if ($color >= 0) {
2647 # replace some tags by gcfclient-compatible ones
2648 for ($msg) {
2649 1 while
2650 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2651 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2652 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2653 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2654 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2655 }
2656
2657 $color &= cf::NDI_COLOR_MASK;
2658
2659 utf8::encode $msg;
2660
2661 if (0 && $msg =~ /\[/) {
2662 # COMMAND/INFO
2663 $self->send_packet ("drawextinfo $color 10 8 $msg")
2664 } else {
2665 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2666 $self->send_packet ("drawinfo $color $msg")
2667 }
2668 }
2669 }
2670}
2671
2173=item $client->ext_event ($type, %msg) 2672=item $client->ext_msg ($type, @msg)
2174 2673
2175Sends an exti event to the client. 2674Sends an ext event to the client.
2176 2675
2177=cut 2676=cut
2178 2677
2179sub cf::client::ext_event($$%) { 2678sub cf::client::ext_msg($$@) {
2180 my ($self, $type, %msg) = @_; 2679 my ($self, $type, @msg) = @_;
2181 2680
2681 if ($self->extcmd == 2) {
2682 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2683 } elsif ($self->extcmd == 1) { # TODO: remove
2182 $msg{msgtype} = "event_$type"; 2684 push @msg, msgtype => "event_$type";
2183 $self->send_packet ("ext " . cf::to_json \%msg); 2685 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2686 }
2687}
2688
2689=item $client->ext_reply ($msgid, @msg)
2690
2691Sends an ext reply to the client.
2692
2693=cut
2694
2695sub cf::client::ext_reply($$@) {
2696 my ($self, $id, @msg) = @_;
2697
2698 if ($self->extcmd == 2) {
2699 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2700 } elsif ($self->extcmd == 1) {
2701 #TODO: version 1, remove
2702 unshift @msg, msgtype => "reply", msgid => $id;
2703 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2704 }
2184} 2705}
2185 2706
2186=item $success = $client->query ($flags, "text", \&cb) 2707=item $success = $client->query ($flags, "text", \&cb)
2187 2708
2188Queues a query to the client, calling the given callback with 2709Queues a query to the client, calling the given callback with
2189the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2710the 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>. 2711C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2191 2712
2192Queries can fail, so check the return code. Or don't, as queries will become 2713Queries can fail, so check the return code. Or don't, as queries will
2193reliable at some point in the future. 2714become reliable at some point in the future.
2194 2715
2195=cut 2716=cut
2196 2717
2197sub cf::client::query { 2718sub cf::client::query {
2198 my ($self, $flags, $text, $cb) = @_; 2719 my ($self, $flags, $text, $cb) = @_;
2206 utf8::encode $text; 2727 utf8::encode $text;
2207 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2728 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2208 2729
2209 $self->send_packet ($self->{query_queue}[0][0]) 2730 $self->send_packet ($self->{query_queue}[0][0])
2210 if @{ $self->{query_queue} } == 1; 2731 if @{ $self->{query_queue} } == 1;
2732
2733 1
2211} 2734}
2212 2735
2213cf::client->attach ( 2736cf::client->attach (
2737 on_connect => sub {
2738 my ($ns) = @_;
2739
2740 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2741 },
2214 on_reply => sub { 2742 on_reply => sub {
2215 my ($ns, $msg) = @_; 2743 my ($ns, $msg) = @_;
2216 2744
2217 # this weird shuffling is so that direct followup queries 2745 # this weird shuffling is so that direct followup queries
2218 # get handled first 2746 # get handled first
2230 } else { 2758 } else {
2231 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2759 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2232 } 2760 }
2233 } 2761 }
2234 }, 2762 },
2763 on_exticmd => sub {
2764 my ($ns, $buf) = @_;
2765
2766 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2767
2768 if (ref $msg) {
2769 my ($type, $reply, @payload) =
2770 "ARRAY" eq ref $msg
2771 ? @$msg
2772 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2773
2774 my @reply;
2775
2776 if (my $cb = $EXTICMD{$type}) {
2777 @reply = $cb->($ns, @payload);
2778 }
2779
2780 $ns->ext_reply ($reply, @reply)
2781 if $reply;
2782
2783 } else {
2784 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2785 }
2786
2787 cf::override;
2788 },
2235); 2789);
2236 2790
2237=item $client->async (\&cb) 2791=item $client->async (\&cb)
2238 2792
2239Create a new coroutine, running the specified callback. The coroutine will 2793Create a new coroutine, running the specified callback. The coroutine will
2280our $safe = new Safe "safe"; 2834our $safe = new Safe "safe";
2281our $safe_hole = new Safe::Hole; 2835our $safe_hole = new Safe::Hole;
2282 2836
2283$SIG{FPE} = 'IGNORE'; 2837$SIG{FPE} = 'IGNORE';
2284 2838
2285$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2839$safe->permit_only (Opcode::opset qw(
2840 :base_core :base_mem :base_orig :base_math
2841 grepstart grepwhile mapstart mapwhile
2842 sort time
2843));
2286 2844
2287# here we export the classes and methods available to script code 2845# here we export the classes and methods available to script code
2288 2846
2289=pod 2847=pod
2290 2848
2291The following functions and methods are available within a safe environment: 2849The following functions and methods are available within a safe environment:
2292 2850
2293 cf::object contr pay_amount pay_player map 2851 cf::object
2852 contr pay_amount pay_player map x y force_find force_add
2853 insert remove name archname title slaying race decrease_ob_nr
2854
2294 cf::object::player player 2855 cf::object::player
2295 cf::player peaceful 2856 player
2296 cf::map trigger 2857
2858 cf::player
2859 peaceful
2860
2861 cf::map
2862 trigger
2297 2863
2298=cut 2864=cut
2299 2865
2300for ( 2866for (
2301 ["cf::object" => qw(contr pay_amount pay_player map)], 2867 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2868 insert remove inv name archname title slaying race
2869 decrease_ob_nr)],
2302 ["cf::object::player" => qw(player)], 2870 ["cf::object::player" => qw(player)],
2303 ["cf::player" => qw(peaceful)], 2871 ["cf::player" => qw(peaceful)],
2304 ["cf::map" => qw(trigger)], 2872 ["cf::map" => qw(trigger)],
2305) { 2873) {
2306 no strict 'refs'; 2874 no strict 'refs';
2377=back 2945=back
2378 2946
2379=cut 2947=cut
2380 2948
2381############################################################################# 2949#############################################################################
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 2950# the server's init and main functions
2555 2951
2556sub load_facedata($) { 2952sub load_facedata($) {
2557 my ($path) = @_; 2953 my ($path) = @_;
2954
2955 # HACK to clear player env face cache, we need some signal framework
2956 # for this (global event?)
2957 %ext::player_env::MUSIC_FACE_CACHE = ();
2958
2959 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2558 2960
2559 warn "loading facedata from $path\n"; 2961 warn "loading facedata from $path\n";
2560 2962
2561 my $facedata; 2963 my $facedata;
2562 0 < aio_load $path, $facedata 2964 0 < aio_load $path, $facedata
2565 $facedata = Coro::Storable::thaw $facedata; 2967 $facedata = Coro::Storable::thaw $facedata;
2566 2968
2567 $facedata->{version} == 2 2969 $facedata->{version} == 2
2568 or cf::cleanup "$path: version mismatch, cannot proceed."; 2970 or cf::cleanup "$path: version mismatch, cannot proceed.";
2569 2971
2972 # patch in the exptable
2973 $facedata->{resource}{"res/exp_table"} = {
2974 type => FT_RSRC,
2975 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2976 };
2977 cf::cede_to_tick;
2978
2570 { 2979 {
2571 my $faces = $facedata->{faceinfo}; 2980 my $faces = $facedata->{faceinfo};
2572 2981
2573 while (my ($face, $info) = each %$faces) { 2982 while (my ($face, $info) = each %$faces) {
2574 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2983 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2575 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2984 cf::face::set_visibility $idx, $info->{visibility};
2985 cf::face::set_magicmap $idx, $info->{magicmap};
2576 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2986 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2577 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2987 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2578 Coro::cede; 2988
2989 cf::cede_to_tick;
2579 } 2990 }
2580 2991
2581 while (my ($face, $info) = each %$faces) { 2992 while (my ($face, $info) = each %$faces) {
2582 next unless $info->{smooth}; 2993 next unless $info->{smooth};
2583 my $idx = cf::face::find $face 2994 my $idx = cf::face::find $face
2584 or next; 2995 or next;
2585 if (my $smooth = cf::face::find $info->{smooth}) { 2996 if (my $smooth = cf::face::find $info->{smooth}) {
2997 cf::face::set_smooth $idx, $smooth;
2586 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2998 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2587 } else { 2999 } else {
2588 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3000 warn "smooth face '$info->{smooth}' not found for face '$face'";
2589 } 3001 }
2590 Coro::cede; 3002
3003 cf::cede_to_tick;
2591 } 3004 }
2592 } 3005 }
2593 3006
2594 { 3007 {
2595 my $anims = $facedata->{animinfo}; 3008 my $anims = $facedata->{animinfo};
2596 3009
2597 while (my ($anim, $info) = each %$anims) { 3010 while (my ($anim, $info) = each %$anims) {
2598 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3011 cf::anim::set $anim, $info->{frames}, $info->{facings};
2599 Coro::cede; 3012 cf::cede_to_tick;
2600 } 3013 }
2601 3014
2602 cf::anim::invalidate_all; # d'oh 3015 cf::anim::invalidate_all; # d'oh
2603 } 3016 }
2604 3017
3018 {
3019 # TODO: for gcfclient pleasure, we should give resources
3020 # that gcfclient doesn't grok a >10000 face index.
3021 my $res = $facedata->{resource};
3022
3023 my $soundconf = delete $res->{"res/sound.conf"};
3024
3025 while (my ($name, $info) = each %$res) {
3026 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3027 my $data;
3028
3029 if ($info->{type} & 1) {
3030 # prepend meta info
3031
3032 my $meta = $enc->encode ({
3033 name => $name,
3034 %{ $info->{meta} || {} },
3035 });
3036
3037 $data = pack "(w/a*)*", $meta, $info->{data};
3038 } else {
3039 $data = $info->{data};
3040 }
3041
3042 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3043 cf::face::set_type $idx, $info->{type};
3044
3045 cf::cede_to_tick;
3046 }
3047
3048 if ($soundconf) {
3049 $soundconf = $enc->decode (delete $soundconf->{data});
3050
3051 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3052 my $sound = $soundconf->{compat}[$_]
3053 or next;
3054
3055 my $face = cf::face::find "sound/$sound->[1]";
3056 cf::sound::set $sound->[0] => $face;
3057 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3058 }
3059
3060 while (my ($k, $v) = each %{$soundconf->{event}}) {
3061 my $face = cf::face::find "sound/$v";
3062 cf::sound::set $k => $face;
3063 }
3064 }
3065 }
3066
2605 1 3067 1
2606} 3068}
2607 3069
3070register_exticmd fx_want => sub {
3071 my ($ns, $want) = @_;
3072
3073 while (my ($k, $v) = each %$want) {
3074 $ns->fx_want ($k, $v);
3075 }
3076};
3077
2608sub reload_regions { 3078sub reload_regions {
3079 # HACK to clear player env face cache, we need some signal framework
3080 # for this (global event?)
3081 %ext::player_env::MUSIC_FACE_CACHE = ();
3082
2609 load_resource_file "$MAPDIR/regions" 3083 load_resource_file "$MAPDIR/regions"
2610 or die "unable to load regions file\n"; 3084 or die "unable to load regions file\n";
3085
3086 for (cf::region::list) {
3087 $_->{match} = qr/$_->{match}/
3088 if exists $_->{match};
3089 }
2611} 3090}
2612 3091
2613sub reload_facedata { 3092sub reload_facedata {
2614 load_facedata "$DATADIR/facedata" 3093 load_facedata "$DATADIR/facedata"
2615 or die "unable to load facedata\n"; 3094 or die "unable to load facedata\n";
2616} 3095}
2617 3096
2618sub reload_archetypes { 3097sub reload_archetypes {
3098 load_resource_file "$DATADIR/archetypes"
3099 or die "unable to load archetypes\n";
3100 #d# NEED to laod twice to resolve forward references
3101 # this really needs to be done in an extra post-pass
3102 # (which needs to be synchronous, so solve it differently)
2619 load_resource_file "$DATADIR/archetypes" 3103 load_resource_file "$DATADIR/archetypes"
2620 or die "unable to load archetypes\n"; 3104 or die "unable to load archetypes\n";
2621} 3105}
2622 3106
2623sub reload_treasures { 3107sub reload_treasures {
2639 3123
2640sub init { 3124sub init {
2641 reload_resources; 3125 reload_resources;
2642} 3126}
2643 3127
2644sub cfg_load { 3128sub reload_config {
2645 open my $fh, "<:utf8", "$CONFDIR/config" 3129 open my $fh, "<:utf8", "$CONFDIR/config"
2646 or return; 3130 or return;
2647 3131
2648 local $/; 3132 local $/;
2649 *CFG = YAML::Syck::Load <$fh>; 3133 *CFG = YAML::Syck::Load <$fh>;
2669 (async { 3153 (async {
2670 Event::one_event; 3154 Event::one_event;
2671 })->prio (Coro::PRIO_MAX); 3155 })->prio (Coro::PRIO_MAX);
2672 }; 3156 };
2673 3157
2674 cfg_load; 3158 reload_config;
2675 db_init; 3159 db_init;
2676 load_extensions; 3160 load_extensions;
2677 3161
2678 $TICK_WATCHER->start; 3162 $TICK_WATCHER->start;
2679 Event::loop; 3163 Event::loop;
2695 }, 3179 },
2696 ); 3180 );
2697 } 3181 }
2698} 3182}
2699 3183
3184sub write_runtime {
3185 my $runtime = "$LOCALDIR/runtime";
3186
3187 # first touch the runtime file to show we are still running:
3188 # the fsync below can take a very very long time.
3189
3190 IO::AIO::aio_utime $runtime, undef, undef;
3191
3192 my $guard = cf::lock_acquire "write_runtime";
3193
3194 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3195 or return;
3196
3197 my $value = $cf::RUNTIME + 90 + 10;
3198 # 10 is the runtime save interval, for a monotonic clock
3199 # 60 allows for the watchdog to kill the server.
3200
3201 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3202 and return;
3203
3204 # always fsync - this file is important
3205 aio_fsync $fh
3206 and return;
3207
3208 # touch it again to show we are up-to-date
3209 aio_utime $fh, undef, undef;
3210
3211 close $fh
3212 or return;
3213
3214 aio_rename "$runtime~", $runtime
3215 and return;
3216
3217 warn "runtime file written.\n";
3218
3219 1
3220}
3221
2700sub emergency_save() { 3222sub emergency_save() {
2701 my $freeze_guard = cf::freeze_mainloop; 3223 my $freeze_guard = cf::freeze_mainloop;
2702 3224
2703 warn "enter emergency perl save\n"; 3225 warn "enter emergency perl save\n";
2704 3226
2779 %EXT_CORO = (); 3301 %EXT_CORO = ();
2780 3302
2781 warn "removing commands"; 3303 warn "removing commands";
2782 %COMMAND = (); 3304 %COMMAND = ();
2783 3305
2784 warn "removing ext commands"; 3306 warn "removing ext/exti commands";
2785 %EXTCMD = (); 3307 %EXTCMD = ();
3308 %EXTICMD = ();
2786 3309
2787 warn "unloading/nuking all extensions"; 3310 warn "unloading/nuking all extensions";
2788 for my $pkg (@EXTS) { 3311 for my $pkg (@EXTS) {
2789 warn "... unloading $pkg"; 3312 warn "... unloading $pkg";
2790 3313
2833 warn "reloading cf.pm"; 3356 warn "reloading cf.pm";
2834 require cf; 3357 require cf;
2835 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3358 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2836 3359
2837 warn "loading config and database again"; 3360 warn "loading config and database again";
2838 cf::cfg_load; 3361 cf::reload_config;
2839 3362
2840 warn "loading extensions"; 3363 warn "loading extensions";
2841 cf::load_extensions; 3364 cf::load_extensions;
2842 3365
2843 warn "reattaching attachments to objects/players"; 3366 warn "reattaching attachments to objects/players";
2936 or die; 3459 or die;
2937 3460
2938 $map->width (50); 3461 $map->width (50);
2939 $map->height (50); 3462 $map->height (50);
2940 $map->alloc; 3463 $map->alloc;
2941 $map->_load_objects ("/tmp/x.map", 1); 3464 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
2942 my $t = Event::time - $t; 3465 my $t = Event::time - $t;
2943 3466
2944 #next unless $t < 0.0013;#d# 3467 #next unless $t < 0.0013;#d#
2945 if ($t < $min) { 3468 if ($t < $min) {
2946 $min = $t; 3469 $min = $t;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines