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.267 by root, Sat May 19 00:08:11 2007 UTC vs.
Revision 1.347 by root, Thu Aug 30 05:16:09 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines