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.280 by root, Sat Jun 16 14:35:41 2007 UTC vs.
Revision 1.356 by root, Tue Sep 4 05:43:21 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
254 271
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.
276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
259 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
306 }; 326 };
307 $TICK_WATCHER->stop; 327 $TICK_WATCHER->stop;
308 $guard 328 $guard
309} 329}
310 330
331=item cf::get_slot $time[, $priority[, $name]]
332
333Allocate $time seconds of blocking CPU time at priority C<$priority>:
334This call blocks and returns only when you have at least C<$time> seconds
335of cpu time till the next tick. The slot is only valid till the next cede.
336
337The optional C<$name> can be used to identify the job to run. It might be
338used for statistical purposes and should identify the same time-class.
339
340Useful for short background jobs.
341
342=cut
343
344our @SLOT_QUEUE;
345our $SLOT_QUEUE;
346
347$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async {
349 my $signal = new Coro::Signal;
350
351 while () {
352 next_job:
353 my $avail = cf::till_tick;
354 if ($avail > 0.01) {
355 for (0 .. $#SLOT_QUEUE) {
356 if ($SLOT_QUEUE[$_][0] < $avail) {
357 my $job = splice @SLOT_QUEUE, $_, 1, ();
358 $job->[2]->send;
359 Coro::cede;
360 goto next_job;
361 }
362 }
363 }
364
365 if (@SLOT_QUEUE) {
366 # we do not use wait_For_tick() as it returns immediately when tick is inactive
367 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait;
369 } else {
370 Coro::schedule;
371 }
372 }
373};
374
375sub get_slot($;$$) {
376 my ($time, $pri, $name) = @_;
377
378 $time = $TICK * .6 if $time > $TICK * .6;
379 my $sig = new Coro::Signal;
380
381 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
382 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
383 $SLOT_QUEUE->ready;
384 $sig->wait;
385}
386
311=item cf::async { BLOCK } 387=item cf::async { BLOCK }
312 388
313Currently the same as Coro::async_pool, meaning you cannot use 389Currently the same as Coro::async_pool, meaning you cannot use
314C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 390C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
315thing you are allowed to do is call C<prio> on it. 391thing you are allowed to do is call C<prio> on it.
318 394
319BEGIN { *async = \&Coro::async_pool } 395BEGIN { *async = \&Coro::async_pool }
320 396
321=item cf::sync_job { BLOCK } 397=item cf::sync_job { BLOCK }
322 398
323The design of crossfire+ requires that the main coro ($Coro::main) is 399The design of Crossfire TRT requires that the main coroutine ($Coro::main)
324always able to handle events or runnable, as crossfire+ is only partly 400is 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. 401partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
402acceptable.
326 403
327If it must be done, put the blocking parts into C<sync_job>. This will run 404If it must be done, put the blocking parts into C<sync_job>. This will run
328the given BLOCK in another coroutine while waiting for the result. The 405the given BLOCK in another coroutine while waiting for the result. The
329server will be frozen during this time, so the block should either finish 406server will be frozen during this time, so the block should either finish
330fast or be very important. 407fast or be very important.
390 $EXT_CORO{$coro+0} = $coro; 467 $EXT_CORO{$coro+0} = $coro;
391 468
392 $coro 469 $coro
393} 470}
394 471
395sub write_runtime { 472=item fork_call { }, $args
396 my $runtime = "$LOCALDIR/runtime";
397 473
398 # first touch the runtime file to show we are still running: 474Executes the given code block with the given arguments in a seperate
399 # the fsync below can take a very very long time. 475process, returning the results. Everything must be serialisable with
476Coro::Storable. May, of course, block. Note that the executed sub may
477never block itself or use any form of Event handling.
400 478
401 IO::AIO::aio_utime $runtime, undef, undef; 479=cut
402 480
403 my $guard = cf::lock_acquire "write_runtime"; 481sub fork_call(&@) {
482 my ($cb, @args) = @_;
404 483
405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 484 # we seemingly have to make a local copy of the whole thing,
406 or return; 485 # otherwise perl prematurely frees the stuff :/
486 # TODO: investigate and fix (likely this will be rather laborious)
407 487
408 my $value = $cf::RUNTIME + 90 + 10; 488 my @res = Coro::Util::fork_eval {
409 # 10 is the runtime save interval, for a monotonic clock 489 reset_signals;
410 # 60 allows for the watchdog to kill the server. 490 &$cb
491 }, @args;
411 492
412 (aio_write $fh, 0, (length $value), $value, 0) <= 0 493 wantarray ? @res : $res[-1]
413 and return; 494}
414 495
415 # always fsync - this file is important 496=item $value = cf::db_get $family => $key
416 aio_fsync $fh
417 and return;
418 497
419 # touch it again to show we are up-to-date 498Returns a single value from the environment database.
420 aio_utime $fh, undef, undef;
421 499
422 close $fh 500=item cf::db_put $family => $key => $value
423 or return;
424 501
425 aio_rename "$runtime~", $runtime 502Stores the given C<$value> in the family. It can currently store binary
426 and return; 503data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
427 504
428 warn "runtime file written.\n"; 505=cut
429 506
507our $DB;
508
509sub db_init {
510 unless ($DB) {
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job {
514 eval {
515 $DB->set_flags (BDB::CHKSUM);
516
517 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
518 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
519 cf::cleanup "db_open(db): $!" if $!;
520 };
521 cf::cleanup "db_open(db): $@" if $@;
522 };
430 1 523 }
524}
525
526sub db_get($$) {
527 my $key = "$_[0]/$_[1]";
528
529 cf::sync_job {
530 BDB::db_get $DB, undef, $key, my $data;
531
532 $! ? ()
533 : $data
534 }
535}
536
537sub db_put($$$) {
538 BDB::dbreq_pri 4;
539 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
540}
541
542=item cf::cache $id => [$paths...], $processversion => $process
543
544Generic caching function that returns the value of the resource $id,
545caching and regenerating as required.
546
547This function can block.
548
549=cut
550
551sub cache {
552 my ($id, $src, $processversion, $process) = @_;
553
554 my $meta =
555 join "\x00",
556 $processversion,
557 map {
558 aio_stat $_
559 and Carp::croak "$_: $!";
560
561 ($_, (stat _)[7,9])
562 } @$src;
563
564 my $dbmeta = db_get cache => "$id/meta";
565 if ($dbmeta ne $meta) {
566 # changed, we may need to process
567
568 my @data;
569 my $md5;
570
571 for (0 .. $#$src) {
572 0 <= aio_load $src->[$_], $data[$_]
573 or Carp::croak "$src->[$_]: $!";
574 }
575
576 # if processing is expensive, check
577 # checksum first
578 if (1) {
579 $md5 =
580 join "\x00",
581 $processversion,
582 map {
583 cf::cede_to_tick;
584 ($src->[$_], Digest::MD5::md5_hex $data[$_])
585 } 0.. $#$src;
586
587
588 my $dbmd5 = db_get cache => "$id/md5";
589 if ($dbmd5 eq $md5) {
590 db_put cache => "$id/meta", $meta;
591
592 return db_get cache => "$id/data";
593 }
594 }
595
596 my $t1 = Time::HiRes::time;
597 my $data = $process->(\@data);
598 my $t2 = Time::HiRes::time;
599
600 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
601
602 db_put cache => "$id/data", $data;
603 db_put cache => "$id/md5" , $md5;
604 db_put cache => "$id/meta", $meta;
605
606 return $data;
607 }
608
609 db_get cache => "$id/data"
431} 610}
432 611
433=item cf::datalog type => key => value, ... 612=item cf::datalog type => key => value, ...
434 613
435Log a datalog packet of the given type with the given key-value pairs. 614Log a datalog packet of the given type with the given key-value pairs.
453attach callbacks/event handlers (a collection of which is called an "attachment") 632attach callbacks/event handlers (a collection of which is called an "attachment")
454to it. All such attachable objects support the following methods. 633to it. All such attachable objects support the following methods.
455 634
456In the following description, CLASS can be any of C<global>, C<object> 635In the following description, CLASS can be any of C<global>, C<object>
457C<player>, C<client> or C<map> (i.e. the attachable objects in 636C<player>, C<client> or C<map> (i.e. the attachable objects in
458crossfire+). 637Crossfire TRT).
459 638
460=over 4 639=over 4
461 640
462=item $attachable->attach ($attachment, key => $value...) 641=item $attachable->attach ($attachment, key => $value...)
463 642
715 "; 894 ";
716 die if $@; 895 die if $@;
717} 896}
718 897
719our $override; 898our $override;
720our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 899our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
721 900
722sub override { 901sub override {
723 $override = 1; 902 $override = 1;
724 @invoke_results = (); 903 @INVOKE_RESULTS = (@_);
725} 904}
726 905
727sub do_invoke { 906sub do_invoke {
728 my $event = shift; 907 my $event = shift;
729 my $callbacks = shift; 908 my $callbacks = shift;
730 909
731 @invoke_results = (); 910 @INVOKE_RESULTS = ();
732 911
733 local $override; 912 local $override;
734 913
735 for (@$callbacks) { 914 for (@$callbacks) {
736 eval { &{$_->[1]} }; 915 eval { &{$_->[1]} };
753 932
754Generate an object-specific event with the given arguments. 933Generate an object-specific event with the given arguments.
755 934
756This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 935This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
757removed in future versions), and there is no public API to access override 936removed in future versions), and there is no public API to access override
758results (if you must, access C<@cf::invoke_results> directly). 937results (if you must, access C<@cf::INVOKE_RESULTS> directly).
759 938
760=back 939=back
761 940
762=cut 941=cut
763 942
764############################################################################# 943#############################################################################
765# object support 944# object support
945#
946
947sub _can_merge {
948 my ($ob1, $ob2) = @_;
949
950 local $Storable::canonical = 1;
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953
954 $fob1 eq $fob2
955}
766 956
767sub reattach { 957sub reattach {
768 # basically do the same as instantiate, without calling instantiate 958 # basically do the same as instantiate, without calling instantiate
769 my ($obj) = @_; 959 my ($obj) = @_;
770 960
814 }, 1004 },
815); 1005);
816 1006
817sub object_freezer_save { 1007sub object_freezer_save {
818 my ($filename, $rdata, $objs) = @_; 1008 my ($filename, $rdata, $objs) = @_;
1009
1010 my $guard = cf::lock_acquire "io";
819 1011
820 sync_job { 1012 sync_job {
821 if (length $$rdata) { 1013 if (length $$rdata) {
822 warn sprintf "saving %s (%d,%d)\n", 1014 warn sprintf "saving %s (%d,%d)\n",
823 $filename, length $$rdata, scalar @$objs; 1015 $filename, length $$rdata, scalar @$objs;
847 } 1039 }
848 } else { 1040 } else {
849 aio_unlink $filename; 1041 aio_unlink $filename;
850 aio_unlink "$filename.pst"; 1042 aio_unlink "$filename.pst";
851 } 1043 }
852 } 1044 };
1045
1046 undef $guard;
853} 1047}
854 1048
855sub object_freezer_as_string { 1049sub object_freezer_as_string {
856 my ($rdata, $objs) = @_; 1050 my ($rdata, $objs) = @_;
857 1051
862 1056
863sub object_thawer_load { 1057sub object_thawer_load {
864 my ($filename) = @_; 1058 my ($filename) = @_;
865 1059
866 my ($data, $av); 1060 my ($data, $av);
1061
1062 my $guard = cf::lock_acquire "io";
867 1063
868 (aio_load $filename, $data) >= 0 1064 (aio_load $filename, $data) >= 0
869 or return; 1065 or return;
870 1066
871 unless (aio_stat "$filename.pst") { 1067 unless (aio_stat "$filename.pst") {
872 (aio_load "$filename.pst", $av) >= 0 1068 (aio_load "$filename.pst", $av) >= 0
873 or return; 1069 or return;
1070
1071 undef $guard;
874 $av = eval { (Storable::thaw $av)->{objs} }; 1072 $av = eval { (Storable::thaw $av)->{objs} };
875 } 1073 }
876 1074
877 warn sprintf "loading %s (%d)\n", 1075 warn sprintf "loading %s (%d)\n",
878 $filename, length $data, scalar @{$av || []}; 1076 $filename, length $data, scalar @{$av || []};
1077
879 return ($data, $av); 1078 ($data, $av)
880} 1079}
1080
1081=head2 COMMAND CALLBACKS
1082
1083=over 4
1084
1085=cut
881 1086
882############################################################################# 1087#############################################################################
883# command handling &c 1088# command handling &c
884 1089
885=item cf::register_command $name => \&callback($ob,$args); 1090=item cf::register_command $name => \&callback($ob,$args);
898 push @{ $COMMAND{$name} }, [$caller, $cb]; 1103 push @{ $COMMAND{$name} }, [$caller, $cb];
899} 1104}
900 1105
901=item cf::register_extcmd $name => \&callback($pl,$packet); 1106=item cf::register_extcmd $name => \&callback($pl,$packet);
902 1107
903Register a callbackf ro execution when the client sends an extcmd packet. 1108Register a callback for execution when the client sends an (synchronous)
1109extcmd packet. Ext commands will be processed in the order they are
1110received by the server, like other user commands. The first argument is
1111the logged-in player. Ext commands can only be processed after a player
1112has logged in successfully.
904 1113
905If the callback returns something, it is sent back as if reply was being 1114If the callback returns something, it is sent back as if reply was being
906called. 1115called.
907 1116
1117=item cf::register_exticmd $name => \&callback($ns,$packet);
1118
1119Register a callback for execution when the client sends an (asynchronous)
1120exticmd packet. Exti commands are processed by the server as soon as they
1121are received, i.e. out of order w.r.t. other commands. The first argument
1122is a client socket. Exti commands can be received anytime, even before
1123log-in.
1124
1125If the callback returns something, it is sent back as if reply was being
1126called.
1127
908=cut 1128=cut
909 1129
910sub register_extcmd { 1130sub register_extcmd {
911 my ($name, $cb) = @_; 1131 my ($name, $cb) = @_;
912 1132
913 $EXTCMD{$name} = $cb; 1133 $EXTCMD{$name} = $cb;
1134}
1135
1136sub register_exticmd {
1137 my ($name, $cb) = @_;
1138
1139 $EXTICMD{$name} = $cb;
914} 1140}
915 1141
916cf::player->attach ( 1142cf::player->attach (
917 on_command => sub { 1143 on_command => sub {
918 my ($pl, $name, $params) = @_; 1144 my ($pl, $name, $params) = @_;
927 cf::override; 1153 cf::override;
928 }, 1154 },
929 on_extcmd => sub { 1155 on_extcmd => sub {
930 my ($pl, $buf) = @_; 1156 my ($pl, $buf) = @_;
931 1157
932 my $msg = eval { from_json $buf }; 1158 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
933 1159
934 if (ref $msg) { 1160 if (ref $msg) {
1161 my ($type, $reply, @payload) =
1162 "ARRAY" eq ref $msg
1163 ? @$msg
1164 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1165
1166 my @reply;
1167
935 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1168 if (my $cb = $EXTCMD{$type}) {
936 if (my %reply = $cb->($pl, $msg)) { 1169 @reply = $cb->($pl, @payload);
937 $pl->ext_reply ($msg->{msgid}, %reply);
938 }
939 } 1170 }
1171
1172 $pl->ext_reply ($reply, @reply)
1173 if $reply;
1174
940 } else { 1175 } else {
941 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1176 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
942 } 1177 }
943 1178
944 cf::override; 1179 cf::override;
1018 }; 1253 };
1019} 1254}
1020 1255
1021############################################################################# 1256#############################################################################
1022 1257
1258=back
1259
1023=head2 CORE EXTENSIONS 1260=head2 CORE EXTENSIONS
1024 1261
1025Functions and methods that extend core crossfire objects. 1262Functions and methods that extend core crossfire objects.
1026 1263
1027=cut 1264=cut
1076 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1313 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1077 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1314 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1078 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1315 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1079 aio_unlink +(playerdir $login) . "/$login.pl"; 1316 aio_unlink +(playerdir $login) . "/$login.pl";
1080 1317
1081 my $pl = load_pl path $login 1318 my $f = new_from_file cf::object::thawer path $login
1082 or return; 1319 or return;
1320
1321 $f->next;
1322 my $pl = cf::player::load_pl $f
1323 or return;
1324 local $cf::PLAYER_LOADING{$login} = $pl;
1325 $f->resolve_delayed_derefs;
1083 $cf::PLAYER{$login} = $pl 1326 $cf::PLAYER{$login} = $pl
1084 } 1327 }
1085 } 1328 }
1086} 1329}
1087 1330
1097 1340
1098 aio_mkdir playerdir $pl, 0770; 1341 aio_mkdir playerdir $pl, 0770;
1099 $pl->{last_save} = $cf::RUNTIME; 1342 $pl->{last_save} = $cf::RUNTIME;
1100 1343
1101 $pl->save_pl ($path); 1344 $pl->save_pl ($path);
1102 Coro::cede; 1345 cf::cede_to_tick;
1103} 1346}
1104 1347
1105sub new($) { 1348sub new($) {
1106 my ($login) = @_; 1349 my ($login) = @_;
1107 1350
1111 $self->{deny_save} = 1; 1354 $self->{deny_save} = 1;
1112 1355
1113 $cf::PLAYER{$login} = $self; 1356 $cf::PLAYER{$login} = $self;
1114 1357
1115 $self 1358 $self
1359}
1360
1361=item $player->send_msg ($channel, $msg, $color, [extra...])
1362
1363=cut
1364
1365sub send_msg {
1366 my $ns = shift->ns
1367 or return;
1368 $ns->send_msg (@_);
1116} 1369}
1117 1370
1118=item $pl->quit_character 1371=item $pl->quit_character
1119 1372
1120Nukes the player without looking back. If logged in, the connection will 1373Nukes the player without looking back. If logged in, the connection will
1175 or return []; 1428 or return [];
1176 1429
1177 my @logins; 1430 my @logins;
1178 1431
1179 for my $login (@$dirs) { 1432 for my $login (@$dirs) {
1433 my $path = path $login;
1434
1435 # a .pst is a dead give-away for a valid player
1436 unless (-e "$path.pst") {
1180 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1437 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1181 aio_read $fh, 0, 512, my $buf, 0 or next; 1438 aio_read $fh, 0, 512, my $buf, 0 or next;
1182 $buf !~ /^password -------------$/m or next; # official not-valid tag 1439 $buf !~ /^password -------------$/m or next; # official not-valid tag
1440 }
1183 1441
1184 utf8::decode $login; 1442 utf8::decode $login;
1185 push @logins, $login; 1443 push @logins, $login;
1186 } 1444 }
1187 1445
1214 } 1472 }
1215 1473
1216 \@paths 1474 \@paths
1217} 1475}
1218 1476
1477=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1478
1479Expand crossfire pod fragments into protocol xml.
1480
1481=cut
1482
1483sub expand_cfpod {
1484 ((my $self), (local $_)) = @_;
1485
1486 # escape & and <
1487 s/&/&amp;/g;
1488 s/(?<![BIUGHT])</&lt;/g;
1489
1490 # this is buggy, it needs to properly take care of nested <'s
1491
1492 1 while
1493 # replace B<>, I<>, U<> etc.
1494 s/B<([^\>]*)>/<b>$1<\/b>/
1495 || s/I<([^\>]*)>/<i>$1<\/i>/
1496 || s/U<([^\>]*)>/<u>$1<\/u>/
1497 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1498 # replace G<male|female> tags
1499 || s{G<([^>|]*)\|([^>]*)>}{
1500 $self->gender ? $2 : $1
1501 }ge
1502 # replace H<hint text>
1503 || s{H<([^\>]*)>}
1504 {
1505 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1506 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1507 "")
1508 [$self->{hintmode}]
1509 }ge;
1510
1511 # create single paragraphs (very hackish)
1512 s/(?<=\S)\n(?=\w)/ /g;
1513
1514 # compress some whitespace
1515 s/\s+\n/\n/g; # ws line-ends
1516 s/\n\n+/\n/g; # double lines
1517 s/^\n+//; # beginning lines
1518 s/\n+$//; # ending lines
1519
1520 $_
1521}
1522
1523sub hintmode {
1524 $_[0]{hintmode} = $_[1] if @_ > 1;
1525 $_[0]{hintmode}
1526}
1527
1219=item $player->ext_reply ($msgid, %msg) 1528=item $player->ext_reply ($msgid, @msg)
1220 1529
1221Sends an ext reply to the player. 1530Sends an ext reply to the player.
1222 1531
1223=cut 1532=cut
1224 1533
1225sub ext_reply($$%) { 1534sub ext_reply($$@) {
1226 my ($self, $id, %msg) = @_; 1535 my ($self, $id, @msg) = @_;
1227 1536
1228 $msg{msgid} = $id; 1537 $self->ns->ext_reply ($id, @msg)
1229
1230 $self->send ("ext " . cf::to_json \%msg);
1231} 1538}
1232 1539
1233=item $player->ext_event ($type, %msg) 1540=item $player->ext_msg ($type, @msg)
1234 1541
1235Sends an ext event to the client. 1542Sends an ext event to the client.
1236 1543
1237=cut 1544=cut
1238 1545
1239sub ext_event($$%) { 1546sub ext_msg($$@) {
1240 my ($self, $type, %msg) = @_; 1547 my ($self, $type, @msg) = @_;
1241 1548
1242 $self->ns->ext_event ($type, %msg); 1549 $self->ns->ext_msg ($type, @msg);
1243} 1550}
1244 1551
1245=head3 cf::region 1552=head3 cf::region
1246 1553
1247=over 4 1554=over 4
1250 1557
1251package cf::region; 1558package cf::region;
1252 1559
1253=item cf::region::find_by_path $path 1560=item cf::region::find_by_path $path
1254 1561
1255Tries to decuce the probable region for a map knowing only its path. 1562Tries to decuce the likely region for a map knowing only its path.
1256 1563
1257=cut 1564=cut
1258 1565
1259sub find_by_path($) { 1566sub find_by_path($) {
1260 my ($path) = @_; 1567 my ($path) = @_;
1261 1568
1262 my ($match, $specificity); 1569 my ($match, $specificity);
1263 1570
1264 for my $region (list) { 1571 for my $region (list) {
1265 if ($region->match && $path =~ $region->match) { 1572 if ($region->{match} && $path =~ $region->{match}) {
1266 ($match, $specificity) = ($region, $region->specificity) 1573 ($match, $specificity) = ($region, $region->specificity)
1267 if $region->specificity > $specificity; 1574 if $region->specificity > $specificity;
1268 } 1575 }
1269 } 1576 }
1270 1577
1390 $self->init; # pass $1 etc. 1697 $self->init; # pass $1 etc.
1391 return $self; 1698 return $self;
1392 } 1699 }
1393 } 1700 }
1394 1701
1395 Carp::carp "unable to resolve path '$path' (base '$base')."; 1702 Carp::cluck "unable to resolve path '$path' (base '$base').";
1396 () 1703 ()
1397} 1704}
1398 1705
1399sub init { 1706sub init {
1400 my ($self) = @_; 1707 my ($self) = @_;
1463 1770
1464sub load_header_from($) { 1771sub load_header_from($) {
1465 my ($self, $path) = @_; 1772 my ($self, $path) = @_;
1466 1773
1467 utf8::encode $path; 1774 utf8::encode $path;
1468 #aio_open $path, O_RDONLY, 0 1775 my $f = new_from_file cf::object::thawer $path
1469 # or return;
1470
1471 $self->_load_header ($path)
1472 or return; 1776 or return;
1777
1778 $self->_load_header ($f)
1779 or return;
1780
1781 local $MAP_LOADING{$self->{path}} = $self;
1782 $f->resolve_delayed_derefs;
1473 1783
1474 $self->{load_path} = $path; 1784 $self->{load_path} = $path;
1475 1785
1476 1 1786 1
1477} 1787}
1566 local $self->{deny_reset} = 1; # loading can take a long time 1876 local $self->{deny_reset} = 1; # loading can take a long time
1567 1877
1568 my $path = $self->{path}; 1878 my $path = $self->{path};
1569 1879
1570 { 1880 {
1881 my $guard1 = cf::lock_acquire "map_data:$path";
1571 my $guard = cf::lock_acquire "map_load:$path"; 1882 my $guard2 = cf::lock_acquire "map_load:$path";
1572 1883
1573 return if $self->in_memory != cf::MAP_SWAPPED; 1884 return if $self->in_memory != cf::MAP_SWAPPED;
1574 1885
1575 $self->in_memory (cf::MAP_LOADING); 1886 $self->in_memory (cf::MAP_LOADING);
1576 1887
1577 $self->alloc; 1888 $self->alloc;
1578 1889
1579 $self->pre_load; 1890 $self->pre_load;
1580 Coro::cede; 1891 cf::cede_to_tick;
1581 1892
1893 my $f = new_from_file cf::object::thawer $self->{load_path};
1894 $f->skip_block;
1582 $self->_load_objects ($self->{load_path}, 1) 1895 $self->_load_objects ($f)
1583 or return; 1896 or return;
1584 1897
1585 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1586 if delete $self->{load_original}; 1899 if delete $self->{load_original};
1587 1900
1588 if (my $uniq = $self->uniq_path) { 1901 if (my $uniq = $self->uniq_path) {
1589 utf8::encode $uniq; 1902 utf8::encode $uniq;
1590 if (aio_open $uniq, O_RDONLY, 0) { 1903 unless (aio_stat $uniq) {
1904 if (my $f = new_from_file cf::object::thawer $uniq) {
1591 $self->clear_unique_items; 1905 $self->clear_unique_items;
1592 $self->_load_objects ($uniq, 0); 1906 $self->_load_objects ($f);
1907 $f->resolve_delayed_derefs;
1908 }
1593 } 1909 }
1594 } 1910 }
1595 1911
1596 Coro::cede; 1912 $f->resolve_delayed_derefs;
1913
1914 cf::cede_to_tick;
1597 # now do the right thing for maps 1915 # now do the right thing for maps
1598 $self->link_multipart_objects; 1916 $self->link_multipart_objects;
1599 $self->difficulty ($self->estimate_difficulty) 1917 $self->difficulty ($self->estimate_difficulty)
1600 unless $self->difficulty; 1918 unless $self->difficulty;
1601 Coro::cede; 1919 cf::cede_to_tick;
1602 1920
1603 unless ($self->{deny_activate}) { 1921 unless ($self->{deny_activate}) {
1604 $self->decay_objects; 1922 $self->decay_objects;
1605 $self->fix_auto_apply; 1923 $self->fix_auto_apply;
1606 $self->update_buttons; 1924 $self->update_buttons;
1607 Coro::cede; 1925 cf::cede_to_tick;
1608 $self->set_darkness_map; 1926 $self->set_darkness_map;
1609 Coro::cede; 1927 cf::cede_to_tick;
1610 $self->activate; 1928 $self->activate;
1611 } 1929 }
1930
1931 $self->{last_save} = $cf::RUNTIME;
1932 $self->last_access ($cf::RUNTIME);
1612 1933
1613 $self->in_memory (cf::MAP_IN_MEMORY); 1934 $self->in_memory (cf::MAP_IN_MEMORY);
1614 } 1935 }
1615 1936
1616 $self->post_load; 1937 $self->post_load;
1627 1948
1628 $self 1949 $self
1629} 1950}
1630 1951
1631# find and load all maps in the 3x3 area around a map 1952# find and load all maps in the 3x3 area around a map
1632sub load_diag { 1953sub load_neighbours {
1633 my ($map) = @_; 1954 my ($map) = @_;
1634 1955
1635 my @diag; # diagonal neighbours 1956 my @neigh; # diagonal neighbours
1636 1957
1637 for (0 .. 3) { 1958 for (0 .. 3) {
1638 my $neigh = $map->tile_path ($_) 1959 my $neigh = $map->tile_path ($_)
1639 or next; 1960 or next;
1640 $neigh = find $neigh, $map 1961 $neigh = find $neigh, $map
1641 or next; 1962 or next;
1642 $neigh->load; 1963 $neigh->load;
1643 1964
1965 push @neigh,
1644 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1966 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1645 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1967 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1646 } 1968 }
1647 1969
1648 for (@diag) { 1970 for (grep defined $_->[0], @neigh) {
1971 my ($path, $origin) = @$_;
1649 my $neigh = find @$_ 1972 my $neigh = find $path, $origin
1650 or next; 1973 or next;
1651 $neigh->load; 1974 $neigh->load;
1652 } 1975 }
1653} 1976}
1654 1977
1659} 1982}
1660 1983
1661sub do_load_sync { 1984sub do_load_sync {
1662 my ($map) = @_; 1985 my ($map) = @_;
1663 1986
1987 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1988 if $Coro::current == $Coro::main;
1989
1664 cf::sync_job { $map->load }; 1990 cf::sync_job { $map->load };
1665} 1991}
1666 1992
1667our %MAP_PREFETCH; 1993our %MAP_PREFETCH;
1668our $MAP_PREFETCHER = undef; 1994our $MAP_PREFETCHER = undef;
1669 1995
1670sub find_async { 1996sub find_async {
1671 my ($path, $origin) = @_; 1997 my ($path, $origin, $load) = @_;
1672 1998
1673 $path = normalise $path, $origin && $origin->{path}; 1999 $path = normalise $path, $origin && $origin->{path};
1674 2000
1675 if (my $map = $cf::MAP{$path}) { 2001 if (my $map = $cf::MAP{$path}) {
1676 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2002 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1677 } 2003 }
1678 2004
1679 undef $MAP_PREFETCH{$path}; 2005 $MAP_PREFETCH{$path} |= $load;
2006
1680 $MAP_PREFETCHER ||= cf::async { 2007 $MAP_PREFETCHER ||= cf::async {
1681 while (%MAP_PREFETCH) { 2008 while (%MAP_PREFETCH) {
1682 for my $path (keys %MAP_PREFETCH) { 2009 while (my ($k, $v) = each %MAP_PREFETCH) {
1683 my $map = find $path 2010 if (my $map = find $k) {
1684 or next;
1685 $map->load; 2011 $map->load if $v;
2012 }
1686 2013
1687 delete $MAP_PREFETCH{$path}; 2014 delete $MAP_PREFETCH{$k};
1688 } 2015 }
1689 } 2016 }
1690 undef $MAP_PREFETCHER; 2017 undef $MAP_PREFETCHER;
1691 }; 2018 };
1692 $MAP_PREFETCHER->prio (6); 2019 $MAP_PREFETCHER->prio (6);
1695} 2022}
1696 2023
1697sub save { 2024sub save {
1698 my ($self) = @_; 2025 my ($self) = @_;
1699 2026
1700 my $lock = cf::lock_acquire "map_data:" . $self->path; 2027 my $lock = cf::lock_acquire "map_data:$self->{path}";
1701 2028
1702 $self->{last_save} = $cf::RUNTIME; 2029 $self->{last_save} = $cf::RUNTIME;
1703 2030
1704 return unless $self->dirty; 2031 return unless $self->dirty;
1705 2032
1728 my ($self) = @_; 2055 my ($self) = @_;
1729 2056
1730 # save first because save cedes 2057 # save first because save cedes
1731 $self->save; 2058 $self->save;
1732 2059
1733 my $lock = cf::lock_acquire "map_data:" . $self->path; 2060 my $lock = cf::lock_acquire "map_data:$self->{path}";
1734 2061
1735 return if $self->players; 2062 return if $self->players;
1736 return if $self->in_memory != cf::MAP_IN_MEMORY; 2063 return if $self->in_memory != cf::MAP_IN_MEMORY;
1737 return if $self->{deny_save}; 2064 return if $self->{deny_save};
1738 2065
1790my $nuke_counter = "aaaa"; 2117my $nuke_counter = "aaaa";
1791 2118
1792sub nuke { 2119sub nuke {
1793 my ($self) = @_; 2120 my ($self) = @_;
1794 2121
2122 {
2123 my $lock = cf::lock_acquire "map_data:$self->{path}";
2124
1795 delete $cf::MAP{$self->path}; 2125 delete $cf::MAP{$self->path};
1796 2126
1797 $self->unlink_save; 2127 $self->unlink_save;
1798 2128
1799 bless $self, "cf::map"; 2129 bless $self, "cf::map";
1800 delete $self->{deny_reset}; 2130 delete $self->{deny_reset};
1801 $self->{deny_save} = 1; 2131 $self->{deny_save} = 1;
1802 $self->reset_timeout (1); 2132 $self->reset_timeout (1);
1803 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2133 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1804 2134
1805 $cf::MAP{$self->path} = $self; 2135 $cf::MAP{$self->path} = $self;
2136 }
1806 2137
1807 $self->reset; # polite request, might not happen 2138 $self->reset; # polite request, might not happen
1808} 2139}
1809 2140
1810=item $maps = cf::map::tmp_maps 2141=item $maps = cf::map::tmp_maps
1886 2217
1887sub inv_recursive { 2218sub inv_recursive {
1888 inv_recursive_ inv $_[0] 2219 inv_recursive_ inv $_[0]
1889} 2220}
1890 2221
2222=item $ref = $ob->ref
2223
2224creates and returns a persistent reference to an objetc that can be stored as a string.
2225
2226=item $ob = cf::object::deref ($refstring)
2227
2228returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2229even if the object actually exists. May block.
2230
2231=cut
2232
2233sub deref {
2234 my ($ref) = @_;
2235
2236 # temporary compatibility#TODO#remove
2237 $ref =~ s{^<}{player/<};
2238
2239 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2240 my ($uuid, $name) = ($1, $2);
2241 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2242 or return;
2243 $pl->ob->uuid eq $uuid
2244 or return;
2245
2246 $pl->ob
2247 } else {
2248 warn "$ref: cannot resolve object reference\n";
2249 undef
2250 }
2251}
2252
1891package cf; 2253package cf;
1892 2254
1893=back 2255=back
1894 2256
1895=head3 cf::object::player 2257=head3 cf::object::player
1912 2274
1913 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2275 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1914 2276
1915 if ($self->{record_replies}) { 2277 if ($self->{record_replies}) {
1916 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2278 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2279
1917 } else { 2280 } else {
2281 my $pl = $self->contr;
2282
2283 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2284 my $dialog = $pl->{npc_dialog};
2285 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2286
2287 } else {
1918 $msg = $npc->name . " says: $msg" if $npc; 2288 $msg = $npc->name . " says: $msg" if $npc;
1919 $self->message ($msg, $flags); 2289 $self->message ($msg, $flags);
2290 }
1920 } 2291 }
2292}
2293
2294=item $object->send_msg ($channel, $msg, $color, [extra...])
2295
2296=cut
2297
2298sub cf::object::send_msg {
2299 my $pl = shift->contr
2300 or return;
2301 $pl->send_msg (@_);
1921} 2302}
1922 2303
1923=item $player_object->may ("access") 2304=item $player_object->may ("access")
1924 2305
1925Returns wether the given player is authorized to access resource "access" 2306Returns wether the given player is authorized to access resource "access"
2004 # use -1 or undef as default coordinates, not 0, 0 2385 # use -1 or undef as default coordinates, not 0, 0
2005 ($x, $y) = ($map->enter_x, $map->enter_y) 2386 ($x, $y) = ($map->enter_x, $map->enter_y)
2006 if $x <=0 && $y <= 0; 2387 if $x <=0 && $y <= 0;
2007 2388
2008 $map->load; 2389 $map->load;
2009 $map->load_diag; 2390 $map->load_neighbours;
2010 2391
2011 return unless $self->contr->active; 2392 return unless $self->contr->active;
2012 $self->activate_recursive; 2393 $self->activate_recursive;
2013 2394
2014 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2395 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2015 $self->enter_map ($map, $x, $y); 2396 $self->enter_map ($map, $x, $y);
2016} 2397}
2017 2398
2018=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2399=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2019 2400
2020Moves the player to the given map-path and coordinates by first freezing 2401Moves the player to the given map-path and coordinates by first freezing
2021her, loading and preparing them map, calling the provided $check callback 2402her, loading and preparing them map, calling the provided $check callback
2022that has to return the map if sucecssful, and then unfreezes the player on 2403that has to return the map if sucecssful, and then unfreezes the player on
2023the new (success) or old (failed) map position. 2404the new (success) or old (failed) map position. In either case, $done will
2405be called at the end of this process.
2024 2406
2025=cut 2407=cut
2026 2408
2027our $GOTOGEN; 2409our $GOTOGEN;
2028 2410
2029sub cf::object::player::goto { 2411sub cf::object::player::goto {
2030 my ($self, $path, $x, $y, $check) = @_; 2412 my ($self, $path, $x, $y, $check, $done) = @_;
2031 2413
2032 # do generation counting so two concurrent goto's will be executed in-order 2414 # do generation counting so two concurrent goto's will be executed in-order
2033 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2415 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2034 2416
2035 $self->enter_link; 2417 $self->enter_link;
2055 2437
2056 if ($gen == $self->{_goto_generation}) { 2438 if ($gen == $self->{_goto_generation}) {
2057 delete $self->{_goto_generation}; 2439 delete $self->{_goto_generation};
2058 $self->leave_link ($map, $x, $y); 2440 $self->leave_link ($map, $x, $y);
2059 } 2441 }
2442
2443 $done->() if $done;
2060 })->prio (1); 2444 })->prio (1);
2061} 2445}
2062 2446
2063=item $player_object->enter_exit ($exit_object) 2447=item $player_object->enter_exit ($exit_object)
2064 2448
2133 my $hp = $exit->stats->hp; 2517 my $hp = $exit->stats->hp;
2134 my $sp = $exit->stats->sp; 2518 my $sp = $exit->stats->sp;
2135 2519
2136 $self->enter_link; 2520 $self->enter_link;
2137 2521
2522 # if exit is damned, update players death & WoR home-position
2523 $self->contr->savebed ($slaying, $hp, $sp)
2524 if $exit->flag (FLAG_DAMNED);
2525
2138 (async { 2526 (async {
2139 $self->deactivate_recursive; # just to be sure 2527 $self->deactivate_recursive; # just to be sure
2140 unless (eval { 2528 unless (eval {
2141 $self->goto ($slaying, $hp, $sp); 2529 $self->goto ($slaying, $hp, $sp);
2142 2530
2169 2557
2170 utf8::encode $text; 2558 utf8::encode $text;
2171 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2559 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2172} 2560}
2173 2561
2562=item $client->send_msg ($channel, $msg, $color, [extra...])
2563
2564Send a drawinfo or msg packet to the client, formatting the msg for the
2565client if neccessary. C<$type> should be a string identifying the type of
2566the message, with C<log> being the default. If C<$color> is negative, suppress
2567the message unless the client supports the msg packet.
2568
2569=cut
2570
2571our %CHANNEL = (
2572 "c/identify" => {
2573 id => "identify",
2574 title => "Identify",
2575 reply => undef,
2576 tooltip => "Items recently identified",
2577 },
2578 "c/examine" => {
2579 id => "examine",
2580 title => "Examine",
2581 reply => undef,
2582 tooltip => "Signs and other items you examined",
2583 },
2584);
2585
2586sub cf::client::send_msg {
2587 my ($self, $channel, $msg, $color, @extra) = @_;
2588
2589 $msg = $self->pl->expand_cfpod ($msg);
2590
2591 $color &= cf::NDI_CLIENT_MASK; # just in case...
2592
2593 # check predefined channels, for the benefit of C
2594 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2595
2596 if (ref $channel) {
2597 # send meta info to client, if not yet sent
2598 unless (exists $self->{channel}{$channel->{id}}) {
2599 $self->{channel}{$channel->{id}} = $channel;
2600 $self->ext_msg (channel_info => $channel)
2601 if $self->can_msg;
2602 }
2603
2604 $channel = $channel->{id};
2605 }
2606
2607 return unless @extra || length $msg;
2608
2609 if ($self->can_msg) {
2610 # default colour, mask it out
2611 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2612 if $color & cf::NDI_DEF;
2613
2614 $self->send_packet ("msg " . $self->{json_coder}->encode (
2615 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2616 } else {
2617 if ($color >= 0) {
2618 # replace some tags by gcfclient-compatible ones
2619 for ($msg) {
2620 1 while
2621 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2622 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2623 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2624 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2625 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2626 }
2627
2628 $color &= cf::NDI_COLOR_MASK;
2629
2630 utf8::encode $msg;
2631
2632 if (0 && $msg =~ /\[/) {
2633 # COMMAND/INFO
2634 $self->send_packet ("drawextinfo $color 10 8 $msg")
2635 } else {
2636 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2637 $self->send_packet ("drawinfo $color $msg")
2638 }
2639 }
2640 }
2641}
2642
2174=item $client->ext_event ($type, %msg) 2643=item $client->ext_msg ($type, @msg)
2175 2644
2176Sends an exti event to the client. 2645Sends an ext event to the client.
2177 2646
2178=cut 2647=cut
2179 2648
2180sub cf::client::ext_event($$%) { 2649sub cf::client::ext_msg($$@) {
2181 my ($self, $type, %msg) = @_; 2650 my ($self, $type, @msg) = @_;
2182 2651
2652 if ($self->extcmd == 2) {
2653 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2654 } elsif ($self->extcmd == 1) { # TODO: remove
2183 $msg{msgtype} = "event_$type"; 2655 push @msg, msgtype => "event_$type";
2184 $self->send_packet ("ext " . cf::to_json \%msg); 2656 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2657 }
2658}
2659
2660=item $client->ext_reply ($msgid, @msg)
2661
2662Sends an ext reply to the client.
2663
2664=cut
2665
2666sub cf::client::ext_reply($$@) {
2667 my ($self, $id, @msg) = @_;
2668
2669 if ($self->extcmd == 2) {
2670 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2671 } elsif ($self->extcmd == 1) {
2672 #TODO: version 1, remove
2673 unshift @msg, msgtype => "reply", msgid => $id;
2674 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2675 }
2185} 2676}
2186 2677
2187=item $success = $client->query ($flags, "text", \&cb) 2678=item $success = $client->query ($flags, "text", \&cb)
2188 2679
2189Queues a query to the client, calling the given callback with 2680Queues a query to the client, calling the given callback with
2190the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2681the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2191C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2682C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2192 2683
2193Queries can fail, so check the return code. Or don't, as queries will become 2684Queries can fail, so check the return code. Or don't, as queries will
2194reliable at some point in the future. 2685become reliable at some point in the future.
2195 2686
2196=cut 2687=cut
2197 2688
2198sub cf::client::query { 2689sub cf::client::query {
2199 my ($self, $flags, $text, $cb) = @_; 2690 my ($self, $flags, $text, $cb) = @_;
2207 utf8::encode $text; 2698 utf8::encode $text;
2208 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2699 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2209 2700
2210 $self->send_packet ($self->{query_queue}[0][0]) 2701 $self->send_packet ($self->{query_queue}[0][0])
2211 if @{ $self->{query_queue} } == 1; 2702 if @{ $self->{query_queue} } == 1;
2703
2704 1
2212} 2705}
2213 2706
2214cf::client->attach ( 2707cf::client->attach (
2708 on_connect => sub {
2709 my ($ns) = @_;
2710
2711 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2712 },
2215 on_reply => sub { 2713 on_reply => sub {
2216 my ($ns, $msg) = @_; 2714 my ($ns, $msg) = @_;
2217 2715
2218 # this weird shuffling is so that direct followup queries 2716 # this weird shuffling is so that direct followup queries
2219 # get handled first 2717 # get handled first
2231 } else { 2729 } else {
2232 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2730 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2233 } 2731 }
2234 } 2732 }
2235 }, 2733 },
2734 on_exticmd => sub {
2735 my ($ns, $buf) = @_;
2736
2737 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2738
2739 if (ref $msg) {
2740 my ($type, $reply, @payload) =
2741 "ARRAY" eq ref $msg
2742 ? @$msg
2743 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2744
2745 my @reply;
2746
2747 if (my $cb = $EXTICMD{$type}) {
2748 @reply = $cb->($ns, @payload);
2749 }
2750
2751 $ns->ext_reply ($reply, @reply)
2752 if $reply;
2753
2754 } else {
2755 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2756 }
2757
2758 cf::override;
2759 },
2236); 2760);
2237 2761
2238=item $client->async (\&cb) 2762=item $client->async (\&cb)
2239 2763
2240Create a new coroutine, running the specified callback. The coroutine will 2764Create a new coroutine, running the specified callback. The coroutine will
2281our $safe = new Safe "safe"; 2805our $safe = new Safe "safe";
2282our $safe_hole = new Safe::Hole; 2806our $safe_hole = new Safe::Hole;
2283 2807
2284$SIG{FPE} = 'IGNORE'; 2808$SIG{FPE} = 'IGNORE';
2285 2809
2286$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2810$safe->permit_only (Opcode::opset qw(
2811 :base_core :base_mem :base_orig :base_math
2812 grepstart grepwhile mapstart mapwhile
2813 sort time
2814));
2287 2815
2288# here we export the classes and methods available to script code 2816# here we export the classes and methods available to script code
2289 2817
2290=pod 2818=pod
2291 2819
2292The following functions and methods are available within a safe environment: 2820The following functions and methods are available within a safe environment:
2293 2821
2294 cf::object contr pay_amount pay_player map 2822 cf::object
2823 contr pay_amount pay_player map x y force_find force_add
2824 insert remove name archname title slaying race decrease_ob_nr
2825
2295 cf::object::player player 2826 cf::object::player
2296 cf::player peaceful 2827 player
2297 cf::map trigger 2828
2829 cf::player
2830 peaceful
2831
2832 cf::map
2833 trigger
2298 2834
2299=cut 2835=cut
2300 2836
2301for ( 2837for (
2302 ["cf::object" => qw(contr pay_amount pay_player map)], 2838 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2839 insert remove inv name archname title slaying race
2840 decrease_ob_nr)],
2303 ["cf::object::player" => qw(player)], 2841 ["cf::object::player" => qw(player)],
2304 ["cf::player" => qw(peaceful)], 2842 ["cf::player" => qw(peaceful)],
2305 ["cf::map" => qw(trigger)], 2843 ["cf::map" => qw(trigger)],
2306) { 2844) {
2307 no strict 'refs'; 2845 no strict 'refs';
2378=back 2916=back
2379 2917
2380=cut 2918=cut
2381 2919
2382############################################################################# 2920#############################################################################
2383
2384=head2 EXTENSION DATABASE SUPPORT
2385
2386Crossfire maintains a very simple database for extension use. It can
2387currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2388convert to/from binary).
2389
2390The parameter C<$family> should best start with the name of the extension
2391using it, it should be unique.
2392
2393=over 4
2394
2395=item $value = cf::db_get $family => $key
2396
2397Returns a single value from the database.
2398
2399=item cf::db_put $family => $key => $value
2400
2401Stores the given C<$value> in the family.
2402
2403=cut
2404
2405our $DB;
2406
2407sub db_init {
2408 unless ($DB) {
2409 $DB = BDB::db_create $DB_ENV;
2410
2411 cf::sync_job {
2412 eval {
2413 $DB->set_flags (BDB::CHKSUM);
2414
2415 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2416 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2417 cf::cleanup "db_open(db): $!" if $!;
2418 };
2419 cf::cleanup "db_open(db): $@" if $@;
2420 };
2421 }
2422}
2423
2424sub db_get($$) {
2425 my $key = "$_[0]/$_[1]";
2426
2427 cf::sync_job {
2428 BDB::db_get $DB, undef, $key, my $data;
2429
2430 $! ? ()
2431 : $data
2432 }
2433}
2434
2435sub db_put($$$) {
2436 BDB::dbreq_pri 4;
2437 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2438}
2439
2440=item cf::cache $id => [$paths...], $processversion => $process
2441
2442Generic caching function that returns the value of the resource $id,
2443caching and regenerating as required.
2444
2445This function can block.
2446
2447=cut
2448
2449sub cache {
2450 my ($id, $src, $processversion, $process) = @_;
2451
2452 my $meta =
2453 join "\x00",
2454 $processversion,
2455 map {
2456 aio_stat $_
2457 and Carp::croak "$_: $!";
2458
2459 ($_, (stat _)[7,9])
2460 } @$src;
2461
2462 my $dbmeta = db_get cache => "$id/meta";
2463 if ($dbmeta ne $meta) {
2464 # changed, we may need to process
2465
2466 my @data;
2467 my $md5;
2468
2469 for (0 .. $#$src) {
2470 0 <= aio_load $src->[$_], $data[$_]
2471 or Carp::croak "$src->[$_]: $!";
2472 }
2473
2474 # if processing is expensive, check
2475 # checksum first
2476 if (1) {
2477 $md5 =
2478 join "\x00",
2479 $processversion,
2480 map {
2481 Coro::cede;
2482 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2483 } 0.. $#$src;
2484
2485
2486 my $dbmd5 = db_get cache => "$id/md5";
2487 if ($dbmd5 eq $md5) {
2488 db_put cache => "$id/meta", $meta;
2489
2490 return db_get cache => "$id/data";
2491 }
2492 }
2493
2494 my $t1 = Time::HiRes::time;
2495 my $data = $process->(\@data);
2496 my $t2 = Time::HiRes::time;
2497
2498 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2499
2500 db_put cache => "$id/data", $data;
2501 db_put cache => "$id/md5" , $md5;
2502 db_put cache => "$id/meta", $meta;
2503
2504 return $data;
2505 }
2506
2507 db_get cache => "$id/data"
2508}
2509
2510=item fork_call { }, $args
2511
2512Executes the given code block with the given arguments in a seperate
2513process, returning the results. Everything must be serialisable with
2514Coro::Storable. May, of course, block. Note that the executed sub may
2515never block itself or use any form of Event handling.
2516
2517=cut
2518
2519sub fork_call(&@) {
2520 my ($cb, @args) = @_;
2521
2522# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2523# or die "socketpair: $!";
2524 pipe my $fh1, my $fh2
2525 or die "pipe: $!";
2526
2527 if (my $pid = fork) {
2528 close $fh2;
2529
2530 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2531 $res = Coro::Storable::thaw $res;
2532
2533 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2534
2535 die $$res unless "ARRAY" eq ref $res;
2536
2537 return wantarray ? @$res : $res->[-1];
2538 } else {
2539 reset_signals;
2540 local $SIG{__WARN__};
2541 local $SIG{__DIE__};
2542 eval {
2543 close $fh1;
2544
2545 my @res = eval { $cb->(@args) };
2546 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2547 };
2548
2549 warn $@ if $@;
2550 _exit 0;
2551 }
2552}
2553
2554#############################################################################
2555# the server's init and main functions 2921# the server's init and main functions
2556 2922
2557sub load_facedata($) { 2923sub load_facedata($) {
2558 my ($path) = @_; 2924 my ($path) = @_;
2925
2926 # HACK to clear player env face cache, we need some signal framework
2927 # for this (global event?)
2928 %ext::player_env::MUSIC_FACE_CACHE = ();
2929
2930 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2559 2931
2560 warn "loading facedata from $path\n"; 2932 warn "loading facedata from $path\n";
2561 2933
2562 my $facedata; 2934 my $facedata;
2563 0 < aio_load $path, $facedata 2935 0 < aio_load $path, $facedata
2566 $facedata = Coro::Storable::thaw $facedata; 2938 $facedata = Coro::Storable::thaw $facedata;
2567 2939
2568 $facedata->{version} == 2 2940 $facedata->{version} == 2
2569 or cf::cleanup "$path: version mismatch, cannot proceed."; 2941 or cf::cleanup "$path: version mismatch, cannot proceed.";
2570 2942
2943 # patch in the exptable
2944 $facedata->{resource}{"res/exp_table"} = {
2945 type => FT_RSRC,
2946 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2947 };
2948 cf::cede_to_tick;
2949
2571 { 2950 {
2572 my $faces = $facedata->{faceinfo}; 2951 my $faces = $facedata->{faceinfo};
2573 2952
2574 while (my ($face, $info) = each %$faces) { 2953 while (my ($face, $info) = each %$faces) {
2575 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2954 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2576 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2955 cf::face::set_visibility $idx, $info->{visibility};
2956 cf::face::set_magicmap $idx, $info->{magicmap};
2577 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2957 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2578 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2958 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2579 Coro::cede; 2959
2960 cf::cede_to_tick;
2580 } 2961 }
2581 2962
2582 while (my ($face, $info) = each %$faces) { 2963 while (my ($face, $info) = each %$faces) {
2583 next unless $info->{smooth}; 2964 next unless $info->{smooth};
2584 my $idx = cf::face::find $face 2965 my $idx = cf::face::find $face
2585 or next; 2966 or next;
2586 if (my $smooth = cf::face::find $info->{smooth}) { 2967 if (my $smooth = cf::face::find $info->{smooth}) {
2968 cf::face::set_smooth $idx, $smooth;
2587 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2969 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2588 } else { 2970 } else {
2589 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2971 warn "smooth face '$info->{smooth}' not found for face '$face'";
2590 } 2972 }
2591 Coro::cede; 2973
2974 cf::cede_to_tick;
2592 } 2975 }
2593 } 2976 }
2594 2977
2595 { 2978 {
2596 my $anims = $facedata->{animinfo}; 2979 my $anims = $facedata->{animinfo};
2597 2980
2598 while (my ($anim, $info) = each %$anims) { 2981 while (my ($anim, $info) = each %$anims) {
2599 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2982 cf::anim::set $anim, $info->{frames}, $info->{facings};
2600 Coro::cede; 2983 cf::cede_to_tick;
2601 } 2984 }
2602 2985
2603 cf::anim::invalidate_all; # d'oh 2986 cf::anim::invalidate_all; # d'oh
2604 } 2987 }
2605 2988
2989 {
2990 # TODO: for gcfclient pleasure, we should give resources
2991 # that gcfclient doesn't grok a >10000 face index.
2992 my $res = $facedata->{resource};
2993
2994 my $soundconf = delete $res->{"res/sound.conf"};
2995
2996 while (my ($name, $info) = each %$res) {
2997 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2998 my $data;
2999
3000 if ($info->{type} & 1) {
3001 # prepend meta info
3002
3003 my $meta = $enc->encode ({
3004 name => $name,
3005 %{ $info->{meta} || {} },
3006 });
3007
3008 $data = pack "(w/a*)*", $meta, $info->{data};
3009 } else {
3010 $data = $info->{data};
3011 }
3012
3013 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3014 cf::face::set_type $idx, $info->{type};
3015
3016 cf::cede_to_tick;
3017 }
3018
3019 if ($soundconf) {
3020 $soundconf = $enc->decode (delete $soundconf->{data});
3021
3022 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3023 my $sound = $soundconf->{compat}[$_]
3024 or next;
3025
3026 my $face = cf::face::find "sound/$sound->[1]";
3027 cf::sound::set $sound->[0] => $face;
3028 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3029 }
3030
3031 while (my ($k, $v) = each %{$soundconf->{event}}) {
3032 my $face = cf::face::find "sound/$v";
3033 cf::sound::set $k => $face;
3034 }
3035 }
3036 }
3037
2606 1 3038 1
2607} 3039}
2608 3040
3041register_exticmd fx_want => sub {
3042 my ($ns, $want) = @_;
3043
3044 while (my ($k, $v) = each %$want) {
3045 $ns->fx_want ($k, $v);
3046 }
3047};
3048
2609sub reload_regions { 3049sub reload_regions {
3050 # HACK to clear player env face cache, we need some signal framework
3051 # for this (global event?)
3052 %ext::player_env::MUSIC_FACE_CACHE = ();
3053
2610 load_resource_file "$MAPDIR/regions" 3054 load_resource_file "$MAPDIR/regions"
2611 or die "unable to load regions file\n"; 3055 or die "unable to load regions file\n";
3056
3057 for (cf::region::list) {
3058 $_->{match} = qr/$_->{match}/
3059 if exists $_->{match};
3060 }
2612} 3061}
2613 3062
2614sub reload_facedata { 3063sub reload_facedata {
2615 load_facedata "$DATADIR/facedata" 3064 load_facedata "$DATADIR/facedata"
2616 or die "unable to load facedata\n"; 3065 or die "unable to load facedata\n";
2617} 3066}
2618 3067
2619sub reload_archetypes { 3068sub reload_archetypes {
3069 load_resource_file "$DATADIR/archetypes"
3070 or die "unable to load archetypes\n";
3071 #d# NEED to laod twice to resolve forward references
3072 # this really needs to be done in an extra post-pass
3073 # (which needs to be synchronous, so solve it differently)
2620 load_resource_file "$DATADIR/archetypes" 3074 load_resource_file "$DATADIR/archetypes"
2621 or die "unable to load archetypes\n"; 3075 or die "unable to load archetypes\n";
2622} 3076}
2623 3077
2624sub reload_treasures { 3078sub reload_treasures {
2640 3094
2641sub init { 3095sub init {
2642 reload_resources; 3096 reload_resources;
2643} 3097}
2644 3098
2645sub cfg_load { 3099sub reload_config {
2646 open my $fh, "<:utf8", "$CONFDIR/config" 3100 open my $fh, "<:utf8", "$CONFDIR/config"
2647 or return; 3101 or return;
2648 3102
2649 local $/; 3103 local $/;
2650 *CFG = YAML::Syck::Load <$fh>; 3104 *CFG = YAML::Syck::Load <$fh>;
2670 (async { 3124 (async {
2671 Event::one_event; 3125 Event::one_event;
2672 })->prio (Coro::PRIO_MAX); 3126 })->prio (Coro::PRIO_MAX);
2673 }; 3127 };
2674 3128
2675 cfg_load; 3129 reload_config;
2676 db_init; 3130 db_init;
2677 load_extensions; 3131 load_extensions;
2678 3132
2679 $TICK_WATCHER->start; 3133 $TICK_WATCHER->start;
2680 Event::loop; 3134 Event::loop;
2696 }, 3150 },
2697 ); 3151 );
2698 } 3152 }
2699} 3153}
2700 3154
3155sub write_runtime {
3156 my $runtime = "$LOCALDIR/runtime";
3157
3158 # first touch the runtime file to show we are still running:
3159 # the fsync below can take a very very long time.
3160
3161 IO::AIO::aio_utime $runtime, undef, undef;
3162
3163 my $guard = cf::lock_acquire "write_runtime";
3164
3165 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3166 or return;
3167
3168 my $value = $cf::RUNTIME + 90 + 10;
3169 # 10 is the runtime save interval, for a monotonic clock
3170 # 60 allows for the watchdog to kill the server.
3171
3172 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3173 and return;
3174
3175 # always fsync - this file is important
3176 aio_fsync $fh
3177 and return;
3178
3179 # touch it again to show we are up-to-date
3180 aio_utime $fh, undef, undef;
3181
3182 close $fh
3183 or return;
3184
3185 aio_rename "$runtime~", $runtime
3186 and return;
3187
3188 warn "runtime file written.\n";
3189
3190 1
3191}
3192
2701sub emergency_save() { 3193sub emergency_save() {
2702 my $freeze_guard = cf::freeze_mainloop; 3194 my $freeze_guard = cf::freeze_mainloop;
2703 3195
2704 warn "enter emergency perl save\n"; 3196 warn "enter emergency perl save\n";
2705 3197
2780 %EXT_CORO = (); 3272 %EXT_CORO = ();
2781 3273
2782 warn "removing commands"; 3274 warn "removing commands";
2783 %COMMAND = (); 3275 %COMMAND = ();
2784 3276
2785 warn "removing ext commands"; 3277 warn "removing ext/exti commands";
2786 %EXTCMD = (); 3278 %EXTCMD = ();
3279 %EXTICMD = ();
2787 3280
2788 warn "unloading/nuking all extensions"; 3281 warn "unloading/nuking all extensions";
2789 for my $pkg (@EXTS) { 3282 for my $pkg (@EXTS) {
2790 warn "... unloading $pkg"; 3283 warn "... unloading $pkg";
2791 3284
2834 warn "reloading cf.pm"; 3327 warn "reloading cf.pm";
2835 require cf; 3328 require cf;
2836 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3329 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2837 3330
2838 warn "loading config and database again"; 3331 warn "loading config and database again";
2839 cf::cfg_load; 3332 cf::reload_config;
2840 3333
2841 warn "loading extensions"; 3334 warn "loading extensions";
2842 cf::load_extensions; 3335 cf::load_extensions;
2843 3336
2844 warn "reattaching attachments to objects/players"; 3337 warn "reattaching attachments to objects/players";
2937 or die; 3430 or die;
2938 3431
2939 $map->width (50); 3432 $map->width (50);
2940 $map->height (50); 3433 $map->height (50);
2941 $map->alloc; 3434 $map->alloc;
2942 $map->_load_objects ("/tmp/x.map", 1); 3435 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
2943 my $t = Event::time - $t; 3436 my $t = Event::time - $t;
2944 3437
2945 #next unless $t < 0.0013;#d# 3438 #next unless $t < 0.0013;#d#
2946 if ($t < $min) { 3439 if ($t < $min) {
2947 $min = $t; 3440 $min = $t;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines