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.263 by root, Sat May 5 05:40:27 2007 UTC vs.
Revision 1.345 by root, Tue Aug 28 19:30:11 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;
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
99our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing
101our $tick_start; # for load detecting purposes
102
95binmode STDOUT; 103binmode STDOUT;
96binmode STDERR; 104binmode STDERR;
97 105
98# read virtual server time, if available 106# read virtual server time, if available
99unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 107unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
139 147
140=item $cf::TICK 148=item $cf::TICK
141 149
142The interval between server ticks, in seconds. 150The interval between server ticks, in seconds.
143 151
152=item $cf::LOADAVG
153
154The current CPU load on the server (alpha-smoothed), as a value between 0
155(none) and 1 (overloaded), indicating how much time is spent on processing
156objects per tick. Healthy values are < 0.5.
157
158=item $cf::LOAD
159
160The raw value load value from the last tick.
161
144=item %cf::CFG 162=item %cf::CFG
145 163
146Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/crossfire/config>, or
147from wherever your confdir points to. 165from wherever your confdir points to.
148 166
149=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
150 168
151These 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
152returns 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
153per 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.
154 178
155=back 179=back
156 180
157=cut 181=cut
158 182
173@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
174@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
175@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
176@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
177@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';
178@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)
179 204
180# 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
181# within the Safe compartment. 206# within the Safe compartment.
182for my $pkg (qw( 207for my $pkg (qw(
183 cf::global cf::attachable 208 cf::global cf::attachable
191} 216}
192 217
193$Event::DIED = sub { 218$Event::DIED = sub {
194 warn "error in event callback: @_"; 219 warn "error in event callback: @_";
195}; 220};
221
222#############################################################################
196 223
197=head2 UTILITY FUNCTIONS 224=head2 UTILITY FUNCTIONS
198 225
199=over 4 226=over 4
200 227
219 $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;
220 $d 247 $d
221 } || "[unable to dump $_[0]: '$@']"; 248 } || "[unable to dump $_[0]: '$@']";
222} 249}
223 250
224use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
225
226=item $ref = cf::from_json $json 251=item $ref = cf::from_json $json
227 252
228Converts a JSON string into the corresponding perl data structure. 253Converts a JSON string into the corresponding perl data structure.
229 254
230=item $json = cf::to_json $ref 255=item $json = cf::to_json $ref
231 256
232Converts 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]) }
233 265
234=item cf::lock_wait $string 266=item cf::lock_wait $string
235 267
236Wait until the given lock is available. See cf::lock_acquire. 268Wait until the given lock is available. See cf::lock_acquire.
237 269
291 }; 323 };
292 $TICK_WATCHER->stop; 324 $TICK_WATCHER->stop;
293 $guard 325 $guard
294} 326}
295 327
328=item cf::get_slot $time[, $priority[, $name]]
329
330Allocate $time seconds of blocking CPU time at priority C<$priority>:
331This call blocks and returns only when you have at least C<$time> seconds
332of cpu time till the next tick. The slot is only valid till the next cede.
333
334The optional C<$name> can be used to identify the job to run. It might be
335used for statistical purposes and should identify the same time-class.
336
337Useful for short background jobs.
338
339=cut
340
341our @SLOT_QUEUE;
342our $SLOT_QUEUE;
343
344$SLOT_QUEUE->cancel if $SLOT_QUEUE;
345$SLOT_QUEUE = Coro::async {
346 my $signal = new Coro::Signal;
347
348 while () {
349 next_job:
350 my $avail = cf::till_tick;
351 if ($avail > 0.01) {
352 for (0 .. $#SLOT_QUEUE) {
353 if ($SLOT_QUEUE[$_][0] < $avail) {
354 my $job = splice @SLOT_QUEUE, $_, 1, ();
355 $job->[2]->send;
356 Coro::cede;
357 goto next_job;
358 }
359 }
360 }
361
362 if (@SLOT_QUEUE) {
363 # we do not use wait_For_tick() as it returns immediately when tick is inactive
364 push @cf::WAIT_FOR_TICK, $signal;
365 $signal->wait;
366 } else {
367 Coro::schedule;
368 }
369 }
370};
371
372sub get_slot($;$$) {
373 my ($time, $pri, $name) = @_;
374
375 $time = $TICK * .6 if $time > $TICK * .6;
376 my $sig = new Coro::Signal;
377
378 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
379 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
380 $SLOT_QUEUE->ready;
381 $sig->wait;
382}
383
296=item cf::async { BLOCK } 384=item cf::async { BLOCK }
297 385
298Currently the same as Coro::async_pool, meaning you cannot use 386Currently the same as Coro::async_pool, meaning you cannot use
299C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 387C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
300thing you are allowed to do is call C<prio> on it. 388thing you are allowed to do is call C<prio> on it.
303 391
304BEGIN { *async = \&Coro::async_pool } 392BEGIN { *async = \&Coro::async_pool }
305 393
306=item cf::sync_job { BLOCK } 394=item cf::sync_job { BLOCK }
307 395
308The design of crossfire+ requires that the main coro ($Coro::main) is 396The design of Crossfire TRT requires that the main coroutine ($Coro::main)
309always able to handle events or runnable, as crossfire+ is only partly 397is always able to handle events or runnable, as Crossfire TRT is only
310reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 398partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
399acceptable.
311 400
312If it must be done, put the blocking parts into C<sync_job>. This will run 401If it must be done, put the blocking parts into C<sync_job>. This will run
313the given BLOCK in another coroutine while waiting for the result. The 402the given BLOCK in another coroutine while waiting for the result. The
314server will be frozen during this time, so the block should either finish 403server will be frozen during this time, so the block should either finish
315fast or be very important. 404fast or be very important.
318 407
319sub sync_job(&) { 408sub sync_job(&) {
320 my ($job) = @_; 409 my ($job) = @_;
321 410
322 if ($Coro::current == $Coro::main) { 411 if ($Coro::current == $Coro::main) {
412 my $time = Event::time;
413
323 # this is the main coro, too bad, we have to block 414 # this is the main coro, too bad, we have to block
324 # till the operation succeeds, freezing the server :/ 415 # till the operation succeeds, freezing the server :/
325 416
326 # TODO: use suspend/resume instead 417 # TODO: use suspend/resume instead
327 # (but this is cancel-safe) 418 # (but this is cancel-safe)
338 429
339 while ($busy) { 430 while ($busy) {
340 Coro::cede or Event::one_event; 431 Coro::cede or Event::one_event;
341 } 432 }
342 433
434 $time = Event::time - $time;
435
436 LOG llevError | logBacktrace, Carp::longmess "long sync job"
437 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
438
439 $tick_start += $time; # do not account sync jobs to server load
440
343 wantarray ? @res : $res[0] 441 wantarray ? @res : $res[0]
344 } else { 442 } else {
345 # we are in another coroutine, how wonderful, everything just works 443 # we are in another coroutine, how wonderful, everything just works
346 444
347 $job->() 445 $job->()
366 $EXT_CORO{$coro+0} = $coro; 464 $EXT_CORO{$coro+0} = $coro;
367 465
368 $coro 466 $coro
369} 467}
370 468
371sub write_runtime { 469=item fork_call { }, $args
372 my $guard = cf::lock_acquire "write_runtime";
373 470
374 my $runtime = "$LOCALDIR/runtime"; 471Executes the given code block with the given arguments in a seperate
472process, returning the results. Everything must be serialisable with
473Coro::Storable. May, of course, block. Note that the executed sub may
474never block itself or use any form of Event handling.
375 475
376 warn "starting to write runtime...\n";#d# 476=cut
377 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
378 or return;
379 477
380 my $value = $cf::RUNTIME + 90 + 10; 478sub fork_call(&@) {
381 # 10 is the runtime save interval, for a monotonic clock 479 my ($cb, @args) = @_;
382 # 60 allows for the watchdog to kill the server.
383 480
384 (aio_write $fh, 0, (length $value), $value, 0) <= 0 481 # we seemingly have to make a local copy of the whole thing,
385 and return; 482 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious)
386 484
387 # always fsync - this file is important 485 my @res = Coro::Util::fork_eval {
388 aio_fsync $fh 486 reset_signals;
389 and return; 487 &$cb
488 }, @args;
390 489
391 close $fh 490 wantarray ? @res : $res[-1]
392 or return; 491}
393 492
394 aio_rename "$runtime~", $runtime 493=item $value = cf::db_get $family => $key
395 and return;
396 494
397 warn "... done writing runtime.\n";#d# 495Returns a single value from the environment database.
398 496
497=item cf::db_put $family => $key => $value
498
499Stores the given C<$value> in the family. It can currently store binary
500data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
501
502=cut
503
504our $DB;
505
506sub db_init {
507 unless ($DB) {
508 $DB = BDB::db_create $DB_ENV;
509
510 cf::sync_job {
511 eval {
512 $DB->set_flags (BDB::CHKSUM);
513
514 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
515 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
516 cf::cleanup "db_open(db): $!" if $!;
517 };
518 cf::cleanup "db_open(db): $@" if $@;
519 };
399 1 520 }
521}
522
523sub db_get($$) {
524 my $key = "$_[0]/$_[1]";
525
526 cf::sync_job {
527 BDB::db_get $DB, undef, $key, my $data;
528
529 $! ? ()
530 : $data
531 }
532}
533
534sub db_put($$$) {
535 BDB::dbreq_pri 4;
536 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
537}
538
539=item cf::cache $id => [$paths...], $processversion => $process
540
541Generic caching function that returns the value of the resource $id,
542caching and regenerating as required.
543
544This function can block.
545
546=cut
547
548sub cache {
549 my ($id, $src, $processversion, $process) = @_;
550
551 my $meta =
552 join "\x00",
553 $processversion,
554 map {
555 aio_stat $_
556 and Carp::croak "$_: $!";
557
558 ($_, (stat _)[7,9])
559 } @$src;
560
561 my $dbmeta = db_get cache => "$id/meta";
562 if ($dbmeta ne $meta) {
563 # changed, we may need to process
564
565 my @data;
566 my $md5;
567
568 for (0 .. $#$src) {
569 0 <= aio_load $src->[$_], $data[$_]
570 or Carp::croak "$src->[$_]: $!";
571 }
572
573 # if processing is expensive, check
574 # checksum first
575 if (1) {
576 $md5 =
577 join "\x00",
578 $processversion,
579 map {
580 Coro::cede;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src;
583
584
585 my $dbmd5 = db_get cache => "$id/md5";
586 if ($dbmd5 eq $md5) {
587 db_put cache => "$id/meta", $meta;
588
589 return db_get cache => "$id/data";
590 }
591 }
592
593 my $t1 = Time::HiRes::time;
594 my $data = $process->(\@data);
595 my $t2 = Time::HiRes::time;
596
597 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
598
599 db_put cache => "$id/data", $data;
600 db_put cache => "$id/md5" , $md5;
601 db_put cache => "$id/meta", $meta;
602
603 return $data;
604 }
605
606 db_get cache => "$id/data"
400} 607}
401 608
402=item cf::datalog type => key => value, ... 609=item cf::datalog type => key => value, ...
403 610
404Log a datalog packet of the given type with the given key-value pairs. 611Log a datalog packet of the given type with the given key-value pairs.
422attach callbacks/event handlers (a collection of which is called an "attachment") 629attach callbacks/event handlers (a collection of which is called an "attachment")
423to it. All such attachable objects support the following methods. 630to it. All such attachable objects support the following methods.
424 631
425In the following description, CLASS can be any of C<global>, C<object> 632In the following description, CLASS can be any of C<global>, C<object>
426C<player>, C<client> or C<map> (i.e. the attachable objects in 633C<player>, C<client> or C<map> (i.e. the attachable objects in
427crossfire+). 634Crossfire TRT).
428 635
429=over 4 636=over 4
430 637
431=item $attachable->attach ($attachment, key => $value...) 638=item $attachable->attach ($attachment, key => $value...)
432 639
595 $registry = $CB_TYPE[$object_type] ||= []; 802 $registry = $CB_TYPE[$object_type] ||= [];
596 803
597 } elsif ($type eq "subtype") { 804 } elsif ($type eq "subtype") {
598 defined $object_type or Carp::croak "subtype specified without type"; 805 defined $object_type or Carp::croak "subtype specified without type";
599 my $object_subtype = shift @arg; 806 my $object_subtype = shift @arg;
600 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 807 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
601 808
602 } elsif ($type eq "package") { 809 } elsif ($type eq "package") {
603 my $pkg = shift @arg; 810 my $pkg = shift @arg;
604 811
605 while (my ($name, $id) = each %cb_id) { 812 while (my ($name, $id) = each %cb_id) {
634 _attach $registry, $klass, @attach; 841 _attach $registry, $klass, @attach;
635 } 842 }
636 843
637 $obj->{$name} = \%arg; 844 $obj->{$name} = \%arg;
638 } else { 845 } else {
639 warn "object uses attachment '$name' that is not available, postponing.\n"; 846 warn "object uses attachment '$name' which is not available, postponing.\n";
640 } 847 }
641 848
642 $obj->{_attachment}{$name} = undef; 849 $obj->{_attachment}{$name} = undef;
643} 850}
644 851
646 if (ref $_[0]) { 853 if (ref $_[0]) {
647 _object_attach @_; 854 _object_attach @_;
648 } else { 855 } else {
649 _attach shift->_attach_registry, @_; 856 _attach shift->_attach_registry, @_;
650 } 857 }
858 _recalc_want;
651}; 859};
652 860
653# all those should be optimised 861# all those should be optimised
654sub cf::attachable::detach { 862sub cf::attachable::detach {
655 my ($obj, $name) = @_; 863 my ($obj, $name) = @_;
658 delete $obj->{_attachment}{$name}; 866 delete $obj->{_attachment}{$name};
659 reattach ($obj); 867 reattach ($obj);
660 } else { 868 } else {
661 Carp::croak "cannot, currently, detach class attachments"; 869 Carp::croak "cannot, currently, detach class attachments";
662 } 870 }
871 _recalc_want;
663}; 872};
664 873
665sub cf::attachable::attached { 874sub cf::attachable::attached {
666 my ($obj, $name) = @_; 875 my ($obj, $name) = @_;
667 876
682 "; 891 ";
683 die if $@; 892 die if $@;
684} 893}
685 894
686our $override; 895our $override;
687our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 896our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
688 897
689sub override { 898sub override {
690 $override = 1; 899 $override = 1;
691 @invoke_results = (); 900 @INVOKE_RESULTS = (@_);
692} 901}
693 902
694sub do_invoke { 903sub do_invoke {
695 my $event = shift; 904 my $event = shift;
696 my $callbacks = shift; 905 my $callbacks = shift;
697 906
698 @invoke_results = (); 907 @INVOKE_RESULTS = ();
699 908
700 local $override; 909 local $override;
701 910
702 for (@$callbacks) { 911 for (@$callbacks) {
703 eval { &{$_->[1]} }; 912 eval { &{$_->[1]} };
720 929
721Generate an object-specific event with the given arguments. 930Generate an object-specific event with the given arguments.
722 931
723This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 932This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
724removed in future versions), and there is no public API to access override 933removed in future versions), and there is no public API to access override
725results (if you must, access C<@cf::invoke_results> directly). 934results (if you must, access C<@cf::INVOKE_RESULTS> directly).
726 935
727=back 936=back
728 937
729=cut 938=cut
730 939
731############################################################################# 940#############################################################################
732# object support 941# object support
942#
943
944sub _can_merge {
945 my ($ob1, $ob2) = @_;
946
947 local $Storable::canonical = 1;
948 my $fob1 = Storable::freeze $ob1;
949 my $fob2 = Storable::freeze $ob2;
950
951 $fob1 eq $fob2
952}
733 953
734sub reattach { 954sub reattach {
735 # basically do the same as instantiate, without calling instantiate 955 # basically do the same as instantiate, without calling instantiate
736 my ($obj) = @_; 956 my ($obj) = @_;
737 957
840 or return; 1060 or return;
841 $av = eval { (Storable::thaw $av)->{objs} }; 1061 $av = eval { (Storable::thaw $av)->{objs} };
842 } 1062 }
843 1063
844 warn sprintf "loading %s (%d)\n", 1064 warn sprintf "loading %s (%d)\n",
845 $filename, length $data, scalar @{$av || []};#d# 1065 $filename, length $data, scalar @{$av || []};
846 return ($data, $av); 1066 return ($data, $av);
847} 1067}
1068
1069=head2 COMMAND CALLBACKS
1070
1071=over 4
1072
1073=cut
848 1074
849############################################################################# 1075#############################################################################
850# command handling &c 1076# command handling &c
851 1077
852=item cf::register_command $name => \&callback($ob,$args); 1078=item cf::register_command $name => \&callback($ob,$args);
865 push @{ $COMMAND{$name} }, [$caller, $cb]; 1091 push @{ $COMMAND{$name} }, [$caller, $cb];
866} 1092}
867 1093
868=item cf::register_extcmd $name => \&callback($pl,$packet); 1094=item cf::register_extcmd $name => \&callback($pl,$packet);
869 1095
870Register a callbackf ro execution when the client sends an extcmd packet. 1096Register a callback for execution when the client sends an (synchronous)
1097extcmd packet. Ext commands will be processed in the order they are
1098received by the server, like other user commands. The first argument is
1099the logged-in player. Ext commands can only be processed after a player
1100has logged in successfully.
871 1101
872If the callback returns something, it is sent back as if reply was being 1102If the callback returns something, it is sent back as if reply was being
873called. 1103called.
874 1104
1105=item cf::register_exticmd $name => \&callback($ns,$packet);
1106
1107Register a callback for execution when the client sends an (asynchronous)
1108exticmd packet. Exti commands are processed by the server as soon as they
1109are received, i.e. out of order w.r.t. other commands. The first argument
1110is a client socket. Exti commands can be received anytime, even before
1111log-in.
1112
1113If the callback returns something, it is sent back as if reply was being
1114called.
1115
875=cut 1116=cut
876 1117
877sub register_extcmd { 1118sub register_extcmd {
878 my ($name, $cb) = @_; 1119 my ($name, $cb) = @_;
879 1120
880 $EXTCMD{$name} = $cb; 1121 $EXTCMD{$name} = $cb;
1122}
1123
1124sub register_exticmd {
1125 my ($name, $cb) = @_;
1126
1127 $EXTICMD{$name} = $cb;
881} 1128}
882 1129
883cf::player->attach ( 1130cf::player->attach (
884 on_command => sub { 1131 on_command => sub {
885 my ($pl, $name, $params) = @_; 1132 my ($pl, $name, $params) = @_;
894 cf::override; 1141 cf::override;
895 }, 1142 },
896 on_extcmd => sub { 1143 on_extcmd => sub {
897 my ($pl, $buf) = @_; 1144 my ($pl, $buf) = @_;
898 1145
899 my $msg = eval { from_json $buf }; 1146 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
900 1147
901 if (ref $msg) { 1148 if (ref $msg) {
1149 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg
1151 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153
1154 my @reply;
1155
902 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1156 if (my $cb = $EXTCMD{$type}) {
903 if (my %reply = $cb->($pl, $msg)) { 1157 @reply = $cb->($pl, @payload);
904 $pl->ext_reply ($msg->{msgid}, %reply);
905 }
906 } 1158 }
1159
1160 $pl->ext_reply ($reply, @reply)
1161 if $reply;
1162
907 } else { 1163 } else {
908 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1164 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
909 } 1165 }
910 1166
911 cf::override; 1167 cf::override;
912 }, 1168 },
913); 1169);
914 1170
915sub load_extension {
916 my ($path) = @_;
917
918 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
919 my $base = $1;
920 my $pkg = $1;
921 $pkg =~ s/[^[:word:]]/_/g;
922 $pkg = "ext::$pkg";
923
924 warn "... loading '$path' into '$pkg'\n";
925
926 open my $fh, "<:utf8", $path
927 or die "$path: $!";
928
929 my $source =
930 "package $pkg; use strict; use utf8;\n"
931 . "#line 1 \"$path\"\n{\n"
932 . (do { local $/; <$fh> })
933 . "\n};\n1";
934
935 unless (eval $source) {
936 my $msg = $@ ? "$path: $@\n"
937 : "extension disabled.\n";
938 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
939 warn $@;
940 warn "mandatory extension failed to load, exiting.\n";
941 exit 1;
942 }
943 die $@;
944 }
945
946 push @EXTS, $pkg;
947}
948
949sub load_extensions { 1171sub load_extensions {
1172 cf::sync_job {
1173 my %todo;
1174
950 for my $ext (<$LIBDIR/*.ext>) { 1175 for my $path (<$LIBDIR/*.ext>) {
951 next unless -r $ext; 1176 next unless -r $path;
952 eval { 1177
953 load_extension $ext; 1178 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1179 my $base = $1;
1180 my $pkg = $1;
1181 $pkg =~ s/[^[:word:]]/_/g;
1182 $pkg = "ext::$pkg";
1183
1184 open my $fh, "<:utf8", $path
1185 or die "$path: $!";
1186
1187 my $source = do { local $/; <$fh> };
1188
1189 my %ext = (
1190 path => $path,
1191 base => $base,
1192 pkg => $pkg,
1193 );
1194
1195 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1196 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1197
1198 $ext{source} =
1199 "package $pkg; use strict; use utf8;\n"
1200 . "#line 1 \"$path\"\n{\n"
1201 . $source
1202 . "\n};\n1";
1203
1204 $todo{$base} = \%ext;
1205 }
1206
1207 my %done;
1208 while (%todo) {
1209 my $progress;
1210
1211 while (my ($k, $v) = each %todo) {
1212 for (split /,\s*/, $v->{meta}{depends}) {
1213 goto skip
1214 unless exists $done{$_};
1215 }
1216
1217 warn "... loading '$k' into '$v->{pkg}'\n";
1218
1219 unless (eval $v->{source}) {
1220 my $msg = $@ ? "$v->{path}: $@\n"
1221 : "$v->{base}: extension inactive.\n";
1222
1223 if (exists $v->{meta}{mandatory}) {
1224 warn $msg;
1225 warn "mandatory extension failed to load, exiting.\n";
1226 exit 1;
1227 }
1228
1229 warn $msg;
1230 }
1231
1232 $done{$k} = delete $todo{$k};
1233 push @EXTS, $v->{pkg};
1234 $progress = 1;
954 1 1235 }
955 } or warn "$ext not loaded: $@"; 1236
1237 skip:
1238 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1239 unless $progress;
1240 }
956 } 1241 };
957} 1242}
958 1243
959############################################################################# 1244#############################################################################
1245
1246=back
960 1247
961=head2 CORE EXTENSIONS 1248=head2 CORE EXTENSIONS
962 1249
963Functions and methods that extend core crossfire objects. 1250Functions and methods that extend core crossfire objects.
964 1251
1051 $cf::PLAYER{$login} = $self; 1338 $cf::PLAYER{$login} = $self;
1052 1339
1053 $self 1340 $self
1054} 1341}
1055 1342
1343=item $player->send_msg ($channel, $msg, $color, [extra...])
1344
1345=cut
1346
1347sub send_msg {
1348 my $ns = shift->ns
1349 or return;
1350 $ns->send_msg (@_);
1351}
1352
1056=item $pl->quit_character 1353=item $pl->quit_character
1057 1354
1058Nukes the player without looking back. If logged in, the connection will 1355Nukes the player without looking back. If logged in, the connection will
1059be destroyed. May block for a long time. 1356be destroyed. May block for a long time.
1060 1357
1152 } 1449 }
1153 1450
1154 \@paths 1451 \@paths
1155} 1452}
1156 1453
1454=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1455
1456Expand crossfire pod fragments into protocol xml.
1457
1458=cut
1459
1460sub expand_cfpod {
1461 ((my $self), (local $_)) = @_;
1462
1463 # escape & and <
1464 s/&/&amp;/g;
1465 s/(?<![BIUGH])</&lt;/g;
1466
1467 # this is buggy, it needs to properly take care of nested <'s
1468
1469 1 while
1470 # replace B<>, I<>, U<> etc.
1471 s/B<([^\>]*)>/<b>$1<\/b>/
1472 || s/I<([^\>]*)>/<i>$1<\/i>/
1473 || s/U<([^\>]*)>/<u>$1<\/u>/
1474 # replace G<male|female> tags
1475 || s{G<([^>|]*)\|([^>]*)>}{
1476 $self->gender ? $2 : $1
1477 }ge
1478 # replace H<hint text>
1479 || s{H<([^\>]*)>}
1480 {
1481 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1482 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1483 "")
1484 [$self->{hintmode}]
1485 }ge;
1486
1487 # create single paragraphs (very hackish)
1488 s/(?<=\S)\n(?=\w)/ /g;
1489
1490 # compress some whitespace
1491 s/\s+\n/\n/g; # ws line-ends
1492 s/\n\n+/\n/g; # double lines
1493 s/^\n+//; # beginning lines
1494 s/\n+$//; # ending lines
1495
1496 $_
1497}
1498
1499sub hintmode {
1500 $_[0]{hintmode} = $_[1] if @_ > 1;
1501 $_[0]{hintmode}
1502}
1503
1157=item $player->ext_reply ($msgid, %msg) 1504=item $player->ext_reply ($msgid, @msg)
1158 1505
1159Sends an ext reply to the player. 1506Sends an ext reply to the player.
1160 1507
1161=cut 1508=cut
1162 1509
1163sub ext_reply($$%) { 1510sub ext_reply($$@) {
1164 my ($self, $id, %msg) = @_; 1511 my ($self, $id, @msg) = @_;
1165 1512
1166 $msg{msgid} = $id; 1513 $self->ns->ext_reply ($id, @msg)
1167
1168 $self->send ("ext " . cf::to_json \%msg);
1169} 1514}
1170 1515
1171=item $player->ext_event ($type, %msg) 1516=item $player->ext_msg ($type, @msg)
1172 1517
1173Sends an ext event to the client. 1518Sends an ext event to the client.
1174 1519
1175=cut 1520=cut
1176 1521
1177sub ext_event($$%) { 1522sub ext_msg($$@) {
1178 my ($self, $type, %msg) = @_; 1523 my ($self, $type, @msg) = @_;
1179 1524
1180 $self->ns->ext_event ($type, %msg); 1525 $self->ns->ext_msg ($type, @msg);
1181} 1526}
1182 1527
1183=head3 cf::region 1528=head3 cf::region
1184 1529
1185=over 4 1530=over 4
1188 1533
1189package cf::region; 1534package cf::region;
1190 1535
1191=item cf::region::find_by_path $path 1536=item cf::region::find_by_path $path
1192 1537
1193Tries to decuce the probable region for a map knowing only its path. 1538Tries to decuce the likely region for a map knowing only its path.
1194 1539
1195=cut 1540=cut
1196 1541
1197sub find_by_path($) { 1542sub find_by_path($) {
1198 my ($path) = @_; 1543 my ($path) = @_;
1199 1544
1200 my ($match, $specificity); 1545 my ($match, $specificity);
1201 1546
1202 for my $region (list) { 1547 for my $region (list) {
1203 if ($region->match && $path =~ $region->match) { 1548 if ($region->{match} && $path =~ $region->{match}) {
1204 ($match, $specificity) = ($region, $region->specificity) 1549 ($match, $specificity) = ($region, $region->specificity)
1205 if $region->specificity > $specificity; 1550 if $region->specificity > $specificity;
1206 } 1551 }
1207 } 1552 }
1208 1553
1272 my ($self, $merge) = @_; 1617 my ($self, $merge) = @_;
1273 1618
1274 # we have to keep some variables in memory intact 1619 # we have to keep some variables in memory intact
1275 local $self->{path}; 1620 local $self->{path};
1276 local $self->{load_path}; 1621 local $self->{load_path};
1277 local $self->{deny_save};
1278 local $self->{deny_reset};
1279 1622
1280 $self->SUPER::thawer_merge ($merge); 1623 $self->SUPER::thawer_merge ($merge);
1281} 1624}
1282 1625
1283sub normalise { 1626sub normalise {
1330 $self->init; # pass $1 etc. 1673 $self->init; # pass $1 etc.
1331 return $self; 1674 return $self;
1332 } 1675 }
1333 } 1676 }
1334 1677
1335 Carp::carp "unable to resolve path '$path' (base '$base')."; 1678 Carp::cluck "unable to resolve path '$path' (base '$base').";
1336 () 1679 ()
1337} 1680}
1338 1681
1339sub init { 1682sub init {
1340 my ($self) = @_; 1683 my ($self) = @_;
1381sub change_all_map_light { 1724sub change_all_map_light {
1382 my ($change) = @_; 1725 my ($change) = @_;
1383 1726
1384 $_->change_map_light ($change) 1727 $_->change_map_light ($change)
1385 for grep $_->outdoor, values %cf::MAP; 1728 for grep $_->outdoor, values %cf::MAP;
1729}
1730
1731sub decay_objects {
1732 my ($self) = @_;
1733
1734 return if $self->{deny_reset};
1735
1736 $self->do_decay_objects;
1386} 1737}
1387 1738
1388sub unlink_save { 1739sub unlink_save {
1389 my ($self) = @_; 1740 my ($self) = @_;
1390 1741
1448 $self->load_header_orig 1799 $self->load_header_orig
1449 or return; 1800 or return;
1450 $self->prepare_orig; 1801 $self->prepare_orig;
1451 } 1802 }
1452 1803
1804 $self->{deny_reset} = 1
1805 if $self->no_reset;
1806
1453 $self->default_region (cf::region::find_by_path $self->{path}) 1807 $self->default_region (cf::region::find_by_path $self->{path})
1454 unless $self->default_region; 1808 unless $self->default_region;
1455 1809
1456 1 1810 1
1457} 1811}
1472 $map->{last_save} = $cf::RUNTIME; 1826 $map->{last_save} = $cf::RUNTIME;
1473 1827
1474 $map->load_header 1828 $map->load_header
1475 or return; 1829 or return;
1476 1830
1477 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1831 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1478 # doing this can freeze the server in a sync job, obviously 1832 # doing this can freeze the server in a sync job, obviously
1479 #$cf::WAIT_FOR_TICK->wait; 1833 #$cf::WAIT_FOR_TICK->wait;
1480 $map->reset; 1834 $map->reset;
1481 undef $guard; 1835 undef $guard;
1482 return find $path; 1836 return find $path;
1495 local $self->{deny_reset} = 1; # loading can take a long time 1849 local $self->{deny_reset} = 1; # loading can take a long time
1496 1850
1497 my $path = $self->{path}; 1851 my $path = $self->{path};
1498 1852
1499 { 1853 {
1854 my $guard1 = cf::lock_acquire "map_data:$path";
1500 my $guard = cf::lock_acquire "map_load:$path"; 1855 my $guard2 = cf::lock_acquire "map_load:$path";
1501 1856
1502 return if $self->in_memory != cf::MAP_SWAPPED; 1857 return if $self->in_memory != cf::MAP_SWAPPED;
1503 1858
1504 $self->in_memory (cf::MAP_LOADING); 1859 $self->in_memory (cf::MAP_LOADING);
1505 1860
1537 $self->set_darkness_map; 1892 $self->set_darkness_map;
1538 Coro::cede; 1893 Coro::cede;
1539 $self->activate; 1894 $self->activate;
1540 } 1895 }
1541 1896
1897 $self->{last_save} = $cf::RUNTIME;
1898 $self->last_access ($cf::RUNTIME);
1899
1542 $self->in_memory (cf::MAP_IN_MEMORY); 1900 $self->in_memory (cf::MAP_IN_MEMORY);
1543 } 1901 }
1544 1902
1545 $self->post_load; 1903 $self->post_load;
1546} 1904}
1549 my ($self, $ob) = @_; 1907 my ($self, $ob) = @_;
1550 1908
1551 return find "~" . $ob->name . "/" . $self->{path} 1909 return find "~" . $ob->name . "/" . $self->{path}
1552 if $self->per_player; 1910 if $self->per_player;
1553 1911
1912# return find "?party/" . $ob->name . "/" . $self->{path}
1913# if $self->per_party;
1914
1554 $self 1915 $self
1555} 1916}
1556 1917
1557# find and load all maps in the 3x3 area around a map 1918# find and load all maps in the 3x3 area around a map
1558sub load_diag { 1919sub load_neighbours {
1559 my ($map) = @_; 1920 my ($map) = @_;
1560 1921
1561 my @diag; # diagonal neighbours 1922 my @neigh; # diagonal neighbours
1562 1923
1563 for (0 .. 3) { 1924 for (0 .. 3) {
1564 my $neigh = $map->tile_path ($_) 1925 my $neigh = $map->tile_path ($_)
1565 or next; 1926 or next;
1566 $neigh = find $neigh, $map 1927 $neigh = find $neigh, $map
1567 or next; 1928 or next;
1568 $neigh->load; 1929 $neigh->load;
1569 1930
1931 push @neigh,
1570 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1932 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1571 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1933 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1572 } 1934 }
1573 1935
1574 for (@diag) { 1936 for (grep defined $_->[0], @neigh) {
1937 my ($path, $origin) = @$_;
1575 my $neigh = find @$_ 1938 my $neigh = find $path, $origin
1576 or next; 1939 or next;
1577 $neigh->load; 1940 $neigh->load;
1578 } 1941 }
1579} 1942}
1580 1943
1585} 1948}
1586 1949
1587sub do_load_sync { 1950sub do_load_sync {
1588 my ($map) = @_; 1951 my ($map) = @_;
1589 1952
1953 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1954 if $Coro::current == $Coro::main;
1955
1590 cf::sync_job { $map->load }; 1956 cf::sync_job { $map->load };
1591} 1957}
1592 1958
1593our %MAP_PREFETCH; 1959our %MAP_PREFETCH;
1594our $MAP_PREFETCHER = undef; 1960our $MAP_PREFETCHER = undef;
1595 1961
1596sub find_async { 1962sub find_async {
1597 my ($path, $origin) = @_; 1963 my ($path, $origin, $load) = @_;
1598 1964
1599 $path = normalise $path, $origin && $origin->{path}; 1965 $path = normalise $path, $origin && $origin->{path};
1600 1966
1601 if (my $map = $cf::MAP{$path}) { 1967 if (my $map = $cf::MAP{$path}) {
1602 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1968 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1603 } 1969 }
1604 1970
1605 undef $MAP_PREFETCH{$path}; 1971 $MAP_PREFETCH{$path} |= $load;
1972
1606 $MAP_PREFETCHER ||= cf::async { 1973 $MAP_PREFETCHER ||= cf::async {
1607 while (%MAP_PREFETCH) { 1974 while (%MAP_PREFETCH) {
1608 for my $path (keys %MAP_PREFETCH) { 1975 while (my ($k, $v) = each %MAP_PREFETCH) {
1609 my $map = find $path 1976 if (my $map = find $k) {
1610 or next;
1611 $map->load; 1977 $map->load if $v;
1978 }
1612 1979
1613 delete $MAP_PREFETCH{$path}; 1980 delete $MAP_PREFETCH{$k};
1614 } 1981 }
1615 } 1982 }
1616 undef $MAP_PREFETCHER; 1983 undef $MAP_PREFETCHER;
1617 }; 1984 };
1618 $MAP_PREFETCHER->prio (6); 1985 $MAP_PREFETCHER->prio (6);
1621} 1988}
1622 1989
1623sub save { 1990sub save {
1624 my ($self) = @_; 1991 my ($self) = @_;
1625 1992
1626 my $lock = cf::lock_acquire "map_data:" . $self->path; 1993 my $lock = cf::lock_acquire "map_data:$self->{path}";
1627 1994
1628 $self->{last_save} = $cf::RUNTIME; 1995 $self->{last_save} = $cf::RUNTIME;
1629 1996
1630 return unless $self->dirty; 1997 return unless $self->dirty;
1631 1998
1654 my ($self) = @_; 2021 my ($self) = @_;
1655 2022
1656 # save first because save cedes 2023 # save first because save cedes
1657 $self->save; 2024 $self->save;
1658 2025
1659 my $lock = cf::lock_acquire "map_data:" . $self->path; 2026 my $lock = cf::lock_acquire "map_data:$self->{path}";
1660 2027
1661 return if $self->players; 2028 return if $self->players;
1662 return if $self->in_memory != cf::MAP_IN_MEMORY; 2029 return if $self->in_memory != cf::MAP_IN_MEMORY;
1663 return if $self->{deny_save}; 2030 return if $self->{deny_save};
1664 2031
1668 2035
1669sub reset_at { 2036sub reset_at {
1670 my ($self) = @_; 2037 my ($self) = @_;
1671 2038
1672 # TODO: safety, remove and allow resettable per-player maps 2039 # TODO: safety, remove and allow resettable per-player maps
1673 return 1e99 if $self->isa ("ext::map_per_player");#d#
1674 return 1e99 if $self->{deny_reset}; 2040 return 1e99 if $self->{deny_reset};
1675 2041
1676 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2042 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1677 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2043 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1678 2044
1689 my ($self) = @_; 2055 my ($self) = @_;
1690 2056
1691 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2057 my $lock = cf::lock_acquire "map_data:$self->{path}";
1692 2058
1693 return if $self->players; 2059 return if $self->players;
1694 return if $self->isa ("ext::map_per_player");#d#
1695 2060
1696 warn "resetting map ", $self->path;#d# 2061 warn "resetting map ", $self->path;
1697 2062
1698 $self->in_memory (cf::MAP_SWAPPED); 2063 $self->in_memory (cf::MAP_SWAPPED);
1699 2064
1700 # need to save uniques path 2065 # need to save uniques path
1701 unless ($self->{deny_save}) { 2066 unless ($self->{deny_save}) {
1733 $cf::MAP{$self->path} = $self; 2098 $cf::MAP{$self->path} = $self;
1734 2099
1735 $self->reset; # polite request, might not happen 2100 $self->reset; # polite request, might not happen
1736} 2101}
1737 2102
2103=item $maps = cf::map::tmp_maps
2104
2105Returns an arrayref with all map paths of currently instantiated and saved
2106maps. May block.
2107
2108=cut
2109
2110sub tmp_maps() {
2111 [
2112 map {
2113 utf8::decode $_;
2114 /\.map$/
2115 ? normalise $_
2116 : ()
2117 } @{ aio_readdir $TMPDIR or [] }
2118 ]
2119}
2120
2121=item $maps = cf::map::random_maps
2122
2123Returns an arrayref with all map paths of currently instantiated and saved
2124random maps. May block.
2125
2126=cut
2127
2128sub random_maps() {
2129 [
2130 map {
2131 utf8::decode $_;
2132 /\.map$/
2133 ? normalise "?random/$_"
2134 : ()
2135 } @{ aio_readdir $RANDOMDIR or [] }
2136 ]
2137}
2138
1738=item cf::map::unique_maps 2139=item cf::map::unique_maps
1739 2140
1740Returns an arrayref of paths of all shared maps that have 2141Returns an arrayref of paths of all shared maps that have
1741instantiated unique items. May block. 2142instantiated unique items. May block.
1742 2143
1743=cut 2144=cut
1744 2145
1745sub unique_maps() { 2146sub unique_maps() {
1746 my $files = aio_readdir $UNIQUEDIR 2147 [
1747 or return; 2148 map {
1748
1749 my @paths;
1750
1751 for (@$files) {
1752 utf8::decode $_; 2149 utf8::decode $_;
1753 next if /\.pst$/; 2150 /\.map$/
1754 next unless /^$PATH_SEP/o; 2151 ? normalise $_
1755 2152 : ()
1756 push @paths, cf::map::normalise $_; 2153 } @{ aio_readdir $UNIQUEDIR or [] }
1757 } 2154 ]
1758
1759 \@paths
1760} 2155}
1761 2156
1762package cf; 2157package cf;
1763 2158
1764=back 2159=back
1810 2205
1811 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2206 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1812 2207
1813 if ($self->{record_replies}) { 2208 if ($self->{record_replies}) {
1814 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2209 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2210
1815 } else { 2211 } else {
2212 my $pl = $self->contr;
2213
2214 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2215 my $dialog = $pl->{npc_dialog};
2216 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2217
2218 } else {
1816 $msg = $npc->name . " says: $msg" if $npc; 2219 $msg = $npc->name . " says: $msg" if $npc;
1817 $self->message ($msg, $flags); 2220 $self->message ($msg, $flags);
2221 }
1818 } 2222 }
2223}
2224
2225=item $object->send_msg ($channel, $msg, $color, [extra...])
2226
2227=cut
2228
2229sub cf::object::send_msg {
2230 my $pl = shift->contr
2231 or return;
2232 $pl->send_msg (@_);
1819} 2233}
1820 2234
1821=item $player_object->may ("access") 2235=item $player_object->may ("access")
1822 2236
1823Returns wether the given player is authorized to access resource "access" 2237Returns wether the given player is authorized to access resource "access"
1870 $self->deactivate_recursive; 2284 $self->deactivate_recursive;
1871 2285
1872 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2286 return if UNIVERSAL::isa $self->map, "ext::map_link";
1873 2287
1874 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2288 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1875 if $self->map; 2289 if $self->map && $self->map->{path} ne "{link}";
1876 2290
1877 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2291 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1878} 2292}
1879 2293
1880sub cf::object::player::leave_link { 2294sub cf::object::player::leave_link {
1881 my ($self, $map, $x, $y) = @_; 2295 my ($self, $map, $x, $y) = @_;
2296
2297 return unless $self->contr->active;
1882 2298
1883 my $link_pos = delete $self->{_link_pos}; 2299 my $link_pos = delete $self->{_link_pos};
1884 2300
1885 unless ($map) { 2301 unless ($map) {
1886 # restore original map position 2302 # restore original map position
1900 # use -1 or undef as default coordinates, not 0, 0 2316 # use -1 or undef as default coordinates, not 0, 0
1901 ($x, $y) = ($map->enter_x, $map->enter_y) 2317 ($x, $y) = ($map->enter_x, $map->enter_y)
1902 if $x <=0 && $y <= 0; 2318 if $x <=0 && $y <= 0;
1903 2319
1904 $map->load; 2320 $map->load;
1905 $map->load_diag; 2321 $map->load_neighbours;
1906 2322
1907 return unless $self->contr->active; 2323 return unless $self->contr->active;
1908 $self->activate_recursive; 2324 $self->activate_recursive;
1909 2325
1910 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2326 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1911 $self->enter_map ($map, $x, $y); 2327 $self->enter_map ($map, $x, $y);
1912} 2328}
1913 2329
1914cf::player->attach ( 2330=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1915 on_logout => sub {
1916 my ($pl) = @_;
1917 2331
1918 # abort map switching before logout 2332Moves the player to the given map-path and coordinates by first freezing
1919 if ($pl->ob->{_link_pos}) { 2333her, loading and preparing them map, calling the provided $check callback
1920 cf::sync_job { 2334that has to return the map if sucecssful, and then unfreezes the player on
1921 $pl->ob->leave_link 2335the new (success) or old (failed) map position. In either case, $done will
1922 }; 2336be called at the end of this process.
1923 }
1924 },
1925 on_login => sub {
1926 my ($pl) = @_;
1927 2337
1928 # try to abort aborted map switching on player login :)
1929 # should happen only on crashes
1930 if ($pl->ob->{_link_pos}) {
1931 $pl->ob->enter_link;
1932 (async {
1933 $pl->ob->reply (undef,
1934 "There was an internal problem at your last logout, "
1935 . "the server will try to bring you to your intended destination in a second.",
1936 cf::NDI_RED);
1937 # we need this sleep as the login has a concurrent enter_exit running
1938 # and this sleep increases chances of the player not ending up in scorn
1939 Coro::Timer::sleep 1;
1940 $pl->ob->leave_link;
1941 })->prio (2);
1942 }
1943 },
1944);
1945
1946=item $player_object->goto ($path, $x, $y)
1947
1948=cut 2338=cut
2339
2340our $GOTOGEN;
1949 2341
1950sub cf::object::player::goto { 2342sub cf::object::player::goto {
1951 my ($self, $path, $x, $y) = @_; 2343 my ($self, $path, $x, $y, $check, $done) = @_;
2344
2345 # do generation counting so two concurrent goto's will be executed in-order
2346 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1952 2347
1953 $self->enter_link; 2348 $self->enter_link;
1954 2349
1955 (async { 2350 (async {
1956 my $map = eval { 2351 my $map = eval {
1957 my $map = cf::map::find $path; 2352 my $map = cf::map::find $path;
2353
2354 if ($map) {
1958 $map = $map->customise_for ($self) if $map; 2355 $map = $map->customise_for ($self);
2356 $map = $check->($map) if $check && $map;
2357 } else {
2358 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2359 }
2360
1959 $map 2361 $map
2362 };
2363
2364 if ($@) {
2365 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2366 LOG llevError | logBacktrace, Carp::longmess $@;
1960 } or 2367 }
1961 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1962 2368
2369 if ($gen == $self->{_goto_generation}) {
2370 delete $self->{_goto_generation};
1963 $self->leave_link ($map, $x, $y); 2371 $self->leave_link ($map, $x, $y);
2372 }
2373
2374 $done->() if $done;
1964 })->prio (1); 2375 })->prio (1);
1965} 2376}
1966 2377
1967=item $player_object->enter_exit ($exit_object) 2378=item $player_object->enter_exit ($exit_object)
1968 2379
2037 my $hp = $exit->stats->hp; 2448 my $hp = $exit->stats->hp;
2038 my $sp = $exit->stats->sp; 2449 my $sp = $exit->stats->sp;
2039 2450
2040 $self->enter_link; 2451 $self->enter_link;
2041 2452
2453 # if exit is damned, update players death & WoR home-position
2454 $self->contr->savebed ($slaying, $hp, $sp)
2455 if $exit->flag (FLAG_DAMNED);
2456
2042 (async { 2457 (async {
2043 $self->deactivate_recursive; # just to be sure 2458 $self->deactivate_recursive; # just to be sure
2044 unless (eval { 2459 unless (eval {
2045 $self->goto ($slaying, $hp, $sp); 2460 $self->goto ($slaying, $hp, $sp);
2046 2461
2073 2488
2074 utf8::encode $text; 2489 utf8::encode $text;
2075 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2490 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2076} 2491}
2077 2492
2493=item $client->send_msg ($channel, $msg, $color, [extra...])
2494
2495Send a drawinfo or msg packet to the client, formatting the msg for the
2496client if neccessary. C<$type> should be a string identifying the type of
2497the message, with C<log> being the default. If C<$color> is negative, suppress
2498the message unless the client supports the msg packet.
2499
2500=cut
2501
2502sub cf::client::send_msg {
2503 my ($self, $channel, $msg, $color, @extra) = @_;
2504
2505 $msg = $self->pl->expand_cfpod ($msg);
2506
2507 $color &= cf::NDI_CLIENT_MASK; # just in case...
2508
2509 if (ref $channel) {
2510 # send meta info to client, if not yet sent
2511 unless (exists $self->{channel}{$channel->{id}}) {
2512 $self->{channel}{$channel->{id}} = $channel;
2513 $self->ext_msg (channel_info => $channel);
2514 }
2515
2516 $channel = $channel->{id};
2517 }
2518
2519 return unless @extra || length $msg;
2520
2521 if ($self->can_msg) {
2522 # default colour, mask it out
2523 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2524 if $color & cf::NDI_DEF;
2525
2526 $self->send_packet ("msg " . $self->{json_coder}->encode (
2527 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2528 } else {
2529 if ($color >= 0) {
2530 # replace some tags by gcfclient-compatible ones
2531 for ($msg) {
2532 1 while
2533 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2534 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2535 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2536 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2537 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2538 }
2539
2540 $color &= cf::NDI_COLOR_MASK;
2541
2542 utf8::encode $msg;
2543
2544 if (0 && $msg =~ /\[/) {
2545 # COMMAND/INFO
2546 $self->send_packet ("drawextinfo $color 10 8 $msg")
2547 } else {
2548 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2549 $self->send_packet ("drawinfo $color $msg")
2550 }
2551 }
2552 }
2553}
2554
2078=item $client->ext_event ($type, %msg) 2555=item $client->ext_msg ($type, @msg)
2079 2556
2080Sends an exti event to the client. 2557Sends an ext event to the client.
2081 2558
2082=cut 2559=cut
2083 2560
2084sub cf::client::ext_event($$%) { 2561sub cf::client::ext_msg($$@) {
2085 my ($self, $type, %msg) = @_; 2562 my ($self, $type, @msg) = @_;
2086 2563
2564 if ($self->extcmd == 2) {
2565 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2566 } elsif ($self->extcmd == 1) { # TODO: remove
2087 $msg{msgtype} = "event_$type"; 2567 push @msg, msgtype => "event_$type";
2088 $self->send_packet ("ext " . cf::to_json \%msg); 2568 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2569 }
2570}
2571
2572=item $client->ext_reply ($msgid, @msg)
2573
2574Sends an ext reply to the client.
2575
2576=cut
2577
2578sub cf::client::ext_reply($$@) {
2579 my ($self, $id, @msg) = @_;
2580
2581 if ($self->extcmd == 2) {
2582 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2583 } elsif ($self->extcmd == 1) {
2584 #TODO: version 1, remove
2585 unshift @msg, msgtype => "reply", msgid => $id;
2586 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2587 }
2089} 2588}
2090 2589
2091=item $success = $client->query ($flags, "text", \&cb) 2590=item $success = $client->query ($flags, "text", \&cb)
2092 2591
2093Queues a query to the client, calling the given callback with 2592Queues a query to the client, calling the given callback with
2094the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2593the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2095C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2594C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2096 2595
2097Queries can fail, so check the return code. Or don't, as queries will become 2596Queries can fail, so check the return code. Or don't, as queries will
2098reliable at some point in the future. 2597become reliable at some point in the future.
2099 2598
2100=cut 2599=cut
2101 2600
2102sub cf::client::query { 2601sub cf::client::query {
2103 my ($self, $flags, $text, $cb) = @_; 2602 my ($self, $flags, $text, $cb) = @_;
2111 utf8::encode $text; 2610 utf8::encode $text;
2112 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2611 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2113 2612
2114 $self->send_packet ($self->{query_queue}[0][0]) 2613 $self->send_packet ($self->{query_queue}[0][0])
2115 if @{ $self->{query_queue} } == 1; 2614 if @{ $self->{query_queue} } == 1;
2615
2616 1
2116} 2617}
2117 2618
2118cf::client->attach ( 2619cf::client->attach (
2620 on_connect => sub {
2621 my ($ns) = @_;
2622
2623 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2624 },
2119 on_reply => sub { 2625 on_reply => sub {
2120 my ($ns, $msg) = @_; 2626 my ($ns, $msg) = @_;
2121 2627
2122 # this weird shuffling is so that direct followup queries 2628 # this weird shuffling is so that direct followup queries
2123 # get handled first 2629 # get handled first
2135 } else { 2641 } else {
2136 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2642 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2137 } 2643 }
2138 } 2644 }
2139 }, 2645 },
2646 on_exticmd => sub {
2647 my ($ns, $buf) = @_;
2648
2649 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2650
2651 if (ref $msg) {
2652 my ($type, $reply, @payload) =
2653 "ARRAY" eq ref $msg
2654 ? @$msg
2655 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2656
2657 my @reply;
2658
2659 if (my $cb = $EXTICMD{$type}) {
2660 @reply = $cb->($ns, @payload);
2661 }
2662
2663 $ns->ext_reply ($reply, @reply)
2664 if $reply;
2665
2666 } else {
2667 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2668 }
2669
2670 cf::override;
2671 },
2140); 2672);
2141 2673
2142=item $client->async (\&cb) 2674=item $client->async (\&cb)
2143 2675
2144Create a new coroutine, running the specified callback. The coroutine will 2676Create a new coroutine, running the specified callback. The coroutine will
2185our $safe = new Safe "safe"; 2717our $safe = new Safe "safe";
2186our $safe_hole = new Safe::Hole; 2718our $safe_hole = new Safe::Hole;
2187 2719
2188$SIG{FPE} = 'IGNORE'; 2720$SIG{FPE} = 'IGNORE';
2189 2721
2190$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2722$safe->permit_only (Opcode::opset qw(
2723 :base_core :base_mem :base_orig :base_math
2724 grepstart grepwhile mapstart mapwhile
2725 sort time
2726));
2191 2727
2192# here we export the classes and methods available to script code 2728# here we export the classes and methods available to script code
2193 2729
2194=pod 2730=pod
2195 2731
2196The following functions and methods are available within a safe environment: 2732The following functions and methods are available within a safe environment:
2197 2733
2198 cf::object contr pay_amount pay_player map 2734 cf::object
2735 contr pay_amount pay_player map x y force_find force_add
2736 insert remove name archname title slaying race decrease_ob_nr
2737
2199 cf::object::player player 2738 cf::object::player
2200 cf::player peaceful 2739 player
2201 cf::map trigger 2740
2741 cf::player
2742 peaceful
2743
2744 cf::map
2745 trigger
2202 2746
2203=cut 2747=cut
2204 2748
2205for ( 2749for (
2206 ["cf::object" => qw(contr pay_amount pay_player map)], 2750 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2751 insert remove inv name archname title slaying race
2752 decrease_ob_nr)],
2207 ["cf::object::player" => qw(player)], 2753 ["cf::object::player" => qw(player)],
2208 ["cf::player" => qw(peaceful)], 2754 ["cf::player" => qw(peaceful)],
2209 ["cf::map" => qw(trigger)], 2755 ["cf::map" => qw(trigger)],
2210) { 2756) {
2211 no strict 'refs'; 2757 no strict 'refs';
2282=back 2828=back
2283 2829
2284=cut 2830=cut
2285 2831
2286############################################################################# 2832#############################################################################
2287
2288=head2 EXTENSION DATABASE SUPPORT
2289
2290Crossfire maintains a very simple database for extension use. It can
2291currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2292convert to/from binary).
2293
2294The parameter C<$family> should best start with the name of the extension
2295using it, it should be unique.
2296
2297=over 4
2298
2299=item $value = cf::db_get $family => $key
2300
2301Returns a single value from the database.
2302
2303=item cf::db_put $family => $key => $value
2304
2305Stores the given C<$value> in the family.
2306
2307=cut
2308
2309our $DB;
2310
2311sub db_init {
2312 unless ($DB) {
2313 $DB = BDB::db_create $DB_ENV;
2314
2315 cf::sync_job {
2316 eval {
2317 $DB->set_flags (BDB::CHKSUM);
2318
2319 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2320 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2321 cf::cleanup "db_open(db): $!" if $!;
2322 };
2323 cf::cleanup "db_open(db): $@" if $@;
2324 };
2325 }
2326}
2327
2328sub db_get($$) {
2329 my $key = "$_[0]/$_[1]";
2330
2331 cf::sync_job {
2332 BDB::db_get $DB, undef, $key, my $data;
2333
2334 $! ? ()
2335 : $data
2336 }
2337}
2338
2339sub db_put($$$) {
2340 BDB::dbreq_pri 4;
2341 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2342}
2343
2344=item cf::cache $id => [$paths...], $processversion => $process
2345
2346Generic caching function that returns the value of the resource $id,
2347caching and regenerating as required.
2348
2349This function can block.
2350
2351=cut
2352
2353sub cache {
2354 my ($id, $src, $processversion, $process) = @_;
2355
2356 my $meta =
2357 join "\x00",
2358 $processversion,
2359 map {
2360 aio_stat $_
2361 and Carp::croak "$_: $!";
2362
2363 ($_, (stat _)[7,9])
2364 } @$src;
2365
2366 my $dbmeta = db_get cache => "$id/meta";
2367 if ($dbmeta ne $meta) {
2368 # changed, we may need to process
2369
2370 my @data;
2371 my $md5;
2372
2373 for (0 .. $#$src) {
2374 0 <= aio_load $src->[$_], $data[$_]
2375 or Carp::croak "$src->[$_]: $!";
2376 }
2377
2378 # if processing is expensive, check
2379 # checksum first
2380 if (1) {
2381 $md5 =
2382 join "\x00",
2383 $processversion,
2384 map {
2385 Coro::cede;
2386 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2387 } 0.. $#$src;
2388
2389
2390 my $dbmd5 = db_get cache => "$id/md5";
2391 if ($dbmd5 eq $md5) {
2392 db_put cache => "$id/meta", $meta;
2393
2394 return db_get cache => "$id/data";
2395 }
2396 }
2397
2398 my $t1 = Time::HiRes::time;
2399 my $data = $process->(\@data);
2400 my $t2 = Time::HiRes::time;
2401
2402 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2403
2404 db_put cache => "$id/data", $data;
2405 db_put cache => "$id/md5" , $md5;
2406 db_put cache => "$id/meta", $meta;
2407
2408 return $data;
2409 }
2410
2411 db_get cache => "$id/data"
2412}
2413
2414=item fork_call { }, $args
2415
2416Executes the given code block with the given arguments in a seperate
2417process, returning the results. Everything must be serialisable with
2418Coro::Storable. May, of course, block. Note that the executed sub may
2419never block itself or use any form of Event handling.
2420
2421=cut
2422
2423sub fork_call(&@) {
2424 my ($cb, @args) = @_;
2425
2426# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2427# or die "socketpair: $!";
2428 pipe my $fh1, my $fh2
2429 or die "pipe: $!";
2430
2431 if (my $pid = fork) {
2432 close $fh2;
2433
2434 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2435 $res = Coro::Storable::thaw $res;
2436
2437 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2438
2439 die $$res unless "ARRAY" eq ref $res;
2440
2441 return wantarray ? @$res : $res->[-1];
2442 } else {
2443 reset_signals;
2444 local $SIG{__WARN__};
2445 local $SIG{__DIE__};
2446 eval {
2447 close $fh1;
2448
2449 my @res = eval { $cb->(@args) };
2450 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2451 };
2452
2453 warn $@ if $@;
2454 _exit 0;
2455 }
2456}
2457
2458
2459
2460#############################################################################
2461# the server's init and main functions 2833# the server's init and main functions
2462 2834
2463sub load_facedata($) { 2835sub load_facedata($) {
2464 my ($path) = @_; 2836 my ($path) = @_;
2837
2838 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2465 2839
2466 warn "loading facedata from $path\n"; 2840 warn "loading facedata from $path\n";
2467 2841
2468 my $facedata; 2842 my $facedata;
2469 0 < aio_load $path, $facedata 2843 0 < aio_load $path, $facedata
2472 $facedata = Coro::Storable::thaw $facedata; 2846 $facedata = Coro::Storable::thaw $facedata;
2473 2847
2474 $facedata->{version} == 2 2848 $facedata->{version} == 2
2475 or cf::cleanup "$path: version mismatch, cannot proceed."; 2849 or cf::cleanup "$path: version mismatch, cannot proceed.";
2476 2850
2851 # patch in the exptable
2852 $facedata->{resource}{"res/exp_table"} = {
2853 type => FT_RSRC,
2854 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2855 };
2856 cf::cede_to_tick;
2857
2477 { 2858 {
2478 my $faces = $facedata->{faceinfo}; 2859 my $faces = $facedata->{faceinfo};
2479 2860
2480 while (my ($face, $info) = each %$faces) { 2861 while (my ($face, $info) = each %$faces) {
2481 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2862 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2482 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2863 cf::face::set_visibility $idx, $info->{visibility};
2864 cf::face::set_magicmap $idx, $info->{magicmap};
2483 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2865 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2484 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2866 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2485 Coro::cede; 2867
2868 cf::cede_to_tick;
2486 } 2869 }
2487 2870
2488 while (my ($face, $info) = each %$faces) { 2871 while (my ($face, $info) = each %$faces) {
2489 next unless $info->{smooth}; 2872 next unless $info->{smooth};
2490 my $idx = cf::face::find $face 2873 my $idx = cf::face::find $face
2491 or next; 2874 or next;
2492 if (my $smooth = cf::face::find $info->{smooth}) { 2875 if (my $smooth = cf::face::find $info->{smooth}) {
2876 cf::face::set_smooth $idx, $smooth;
2493 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2877 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2494 } else { 2878 } else {
2495 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2879 warn "smooth face '$info->{smooth}' not found for face '$face'";
2496 } 2880 }
2497 Coro::cede; 2881
2882 cf::cede_to_tick;
2498 } 2883 }
2499 } 2884 }
2500 2885
2501 { 2886 {
2502 my $anims = $facedata->{animinfo}; 2887 my $anims = $facedata->{animinfo};
2503 2888
2504 while (my ($anim, $info) = each %$anims) { 2889 while (my ($anim, $info) = each %$anims) {
2505 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2890 cf::anim::set $anim, $info->{frames}, $info->{facings};
2506 Coro::cede; 2891 cf::cede_to_tick;
2507 } 2892 }
2508 2893
2509 cf::anim::invalidate_all; # d'oh 2894 cf::anim::invalidate_all; # d'oh
2510 } 2895 }
2511 2896
2897 {
2898 # TODO: for gcfclient pleasure, we should give resources
2899 # that gcfclient doesn't grok a >10000 face index.
2900 my $res = $facedata->{resource};
2901
2902 my $soundconf = delete $res->{"res/sound.conf"};
2903
2904 while (my ($name, $info) = each %$res) {
2905 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2906 my $data;
2907
2908 if ($info->{type} & 1) {
2909 # prepend meta info
2910
2911 my $meta = $enc->encode ({
2912 name => $name,
2913 %{ $info->{meta} || {} },
2914 });
2915
2916 $data = pack "(w/a*)*", $meta, $info->{data};
2917 } else {
2918 $data = $info->{data};
2919 }
2920
2921 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2922 cf::face::set_type $idx, $info->{type};
2923
2924 cf::cede_to_tick;
2925 }
2926
2927 if ($soundconf) {
2928 $soundconf = $enc->decode (delete $soundconf->{data});
2929
2930 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2931 my $sound = $soundconf->{compat}[$_]
2932 or next;
2933
2934 my $face = cf::face::find "sound/$sound->[1]";
2935 cf::sound::set $sound->[0] => $face;
2936 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2937 }
2938
2939 while (my ($k, $v) = each %{$soundconf->{event}}) {
2940 my $face = cf::face::find "sound/$v";
2941 cf::sound::set $k => $face;
2942 }
2943 }
2944 }
2945
2512 1 2946 1
2513} 2947}
2948
2949register_exticmd fx_want => sub {
2950 my ($ns, $want) = @_;
2951
2952 while (my ($k, $v) = each %$want) {
2953 $ns->fx_want ($k, $v);
2954 }
2955};
2514 2956
2515sub reload_regions { 2957sub reload_regions {
2516 load_resource_file "$MAPDIR/regions" 2958 load_resource_file "$MAPDIR/regions"
2517 or die "unable to load regions file\n"; 2959 or die "unable to load regions file\n";
2960
2961 for (cf::region::list) {
2962 $_->{match} = qr/$_->{match}/
2963 if exists $_->{match};
2964 }
2518} 2965}
2519 2966
2520sub reload_facedata { 2967sub reload_facedata {
2521 load_facedata "$DATADIR/facedata" 2968 load_facedata "$DATADIR/facedata"
2522 or die "unable to load facedata\n"; 2969 or die "unable to load facedata\n";
2523} 2970}
2524 2971
2525sub reload_archetypes { 2972sub reload_archetypes {
2526 load_resource_file "$DATADIR/archetypes" 2973 load_resource_file "$DATADIR/archetypes"
2527 or die "unable to load archetypes\n"; 2974 or die "unable to load archetypes\n";
2975 #d# NEED to laod twice to resolve forward references
2976 # this really needs to be done in an extra post-pass
2977 # (which needs to be synchronous, so solve it differently)
2978 load_resource_file "$DATADIR/archetypes"
2979 or die "unable to load archetypes\n";
2528} 2980}
2529 2981
2530sub reload_treasures { 2982sub reload_treasures {
2531 load_resource_file "$DATADIR/treasures" 2983 load_resource_file "$DATADIR/treasures"
2532 or die "unable to load treasurelists\n"; 2984 or die "unable to load treasurelists\n";
2535sub reload_resources { 2987sub reload_resources {
2536 warn "reloading resource files...\n"; 2988 warn "reloading resource files...\n";
2537 2989
2538 reload_regions; 2990 reload_regions;
2539 reload_facedata; 2991 reload_facedata;
2992 #reload_archetypes;#d#
2540 reload_archetypes; 2993 reload_archetypes;
2541 reload_treasures; 2994 reload_treasures;
2542 2995
2543 warn "finished reloading resource files\n"; 2996 warn "finished reloading resource files\n";
2544} 2997}
2545 2998
2546sub init { 2999sub init {
2547 reload_resources; 3000 reload_resources;
2548} 3001}
2549 3002
2550sub cfg_load { 3003sub reload_config {
2551 open my $fh, "<:utf8", "$CONFDIR/config" 3004 open my $fh, "<:utf8", "$CONFDIR/config"
2552 or return; 3005 or return;
2553 3006
2554 local $/; 3007 local $/;
2555 *CFG = YAML::Syck::Load <$fh>; 3008 *CFG = YAML::Syck::Load <$fh>;
2575 (async { 3028 (async {
2576 Event::one_event; 3029 Event::one_event;
2577 })->prio (Coro::PRIO_MAX); 3030 })->prio (Coro::PRIO_MAX);
2578 }; 3031 };
2579 3032
2580 cfg_load; 3033 reload_config;
2581 db_init; 3034 db_init;
2582 load_extensions; 3035 load_extensions;
2583 3036
2584 $TICK_WATCHER->start; 3037 $TICK_WATCHER->start;
2585 Event::loop; 3038 Event::loop;
2601 }, 3054 },
2602 ); 3055 );
2603 } 3056 }
2604} 3057}
2605 3058
3059sub write_runtime {
3060 my $runtime = "$LOCALDIR/runtime";
3061
3062 # first touch the runtime file to show we are still running:
3063 # the fsync below can take a very very long time.
3064
3065 IO::AIO::aio_utime $runtime, undef, undef;
3066
3067 my $guard = cf::lock_acquire "write_runtime";
3068
3069 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3070 or return;
3071
3072 my $value = $cf::RUNTIME + 90 + 10;
3073 # 10 is the runtime save interval, for a monotonic clock
3074 # 60 allows for the watchdog to kill the server.
3075
3076 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3077 and return;
3078
3079 # always fsync - this file is important
3080 aio_fsync $fh
3081 and return;
3082
3083 # touch it again to show we are up-to-date
3084 aio_utime $fh, undef, undef;
3085
3086 close $fh
3087 or return;
3088
3089 aio_rename "$runtime~", $runtime
3090 and return;
3091
3092 warn "runtime file written.\n";
3093
3094 1
3095}
3096
2606sub emergency_save() { 3097sub emergency_save() {
2607 my $freeze_guard = cf::freeze_mainloop; 3098 my $freeze_guard = cf::freeze_mainloop;
2608 3099
2609 warn "enter emergency perl save\n"; 3100 warn "enter emergency perl save\n";
2610 3101
2685 %EXT_CORO = (); 3176 %EXT_CORO = ();
2686 3177
2687 warn "removing commands"; 3178 warn "removing commands";
2688 %COMMAND = (); 3179 %COMMAND = ();
2689 3180
2690 warn "removing ext commands"; 3181 warn "removing ext/exti commands";
2691 %EXTCMD = (); 3182 %EXTCMD = ();
3183 %EXTICMD = ();
2692 3184
2693 warn "unloading/nuking all extensions"; 3185 warn "unloading/nuking all extensions";
2694 for my $pkg (@EXTS) { 3186 for my $pkg (@EXTS) {
2695 warn "... unloading $pkg"; 3187 warn "... unloading $pkg";
2696 3188
2739 warn "reloading cf.pm"; 3231 warn "reloading cf.pm";
2740 require cf; 3232 require cf;
2741 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3233 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2742 3234
2743 warn "loading config and database again"; 3235 warn "loading config and database again";
2744 cf::cfg_load; 3236 cf::reload_config;
2745 3237
2746 warn "loading extensions"; 3238 warn "loading extensions";
2747 cf::load_extensions; 3239 cf::load_extensions;
2748 3240
2749 warn "reattaching attachments to objects/players"; 3241 warn "reattaching attachments to objects/players";
2814 my $signal = new Coro::Signal; 3306 my $signal = new Coro::Signal;
2815 push @WAIT_FOR_TICK_BEGIN, $signal; 3307 push @WAIT_FOR_TICK_BEGIN, $signal;
2816 $signal->wait; 3308 $signal->wait;
2817} 3309}
2818 3310
3311 my $min = 1e6;#d#
3312 my $avg = 10;
2819$TICK_WATCHER = Event->timer ( 3313$TICK_WATCHER = Event->timer (
2820 reentrant => 0, 3314 reentrant => 0,
2821 parked => 1, 3315 parked => 1,
2822 prio => 0, 3316 prio => 0,
2823 at => $NEXT_TICK || $TICK, 3317 at => $NEXT_TICK || $TICK,
2827 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3321 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2828 unless ++$bug_warning > 10; 3322 unless ++$bug_warning > 10;
2829 return; 3323 return;
2830 } 3324 }
2831 3325
2832 $NOW = Event::time; 3326 $NOW = $tick_start = Event::time;
2833 3327
2834 cf::server_tick; # one server iteration 3328 cf::server_tick; # one server iteration
3329
3330 0 && sync_job {#d#
3331 for(1..10) {
3332 my $t = Event::time;
3333 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3334 or die;
3335
3336 $map->width (50);
3337 $map->height (50);
3338 $map->alloc;
3339 $map->_load_objects ("/tmp/x.map", 1);
3340 my $t = Event::time - $t;
3341
3342 #next unless $t < 0.0013;#d#
3343 if ($t < $min) {
3344 $min = $t;
3345 }
3346 $avg = $avg * 0.99 + $t * 0.01;
3347 }
3348 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3349 exit 0;
3350 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3351 };
2835 3352
2836 $RUNTIME += $TICK; 3353 $RUNTIME += $TICK;
2837 $NEXT_TICK += $TICK; 3354 $NEXT_TICK += $TICK;
2838 3355
2839 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3356 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2845 } 3362 }
2846 3363
2847# my $AFTER = Event::time; 3364# my $AFTER = Event::time;
2848# warn $AFTER - $NOW;#d# 3365# warn $AFTER - $NOW;#d#
2849 3366
3367 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3368 $sig->send;
3369 }
3370 while (my $sig = shift @WAIT_FOR_TICK) {
3371 $sig->send;
3372 }
3373
3374 $NOW = Event::time;
3375
2850 # if we are delayed by four ticks or more, skip them all 3376 # if we are delayed by four ticks or more, skip them all
2851 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3377 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2852 3378
2853 $TICK_WATCHER->at ($NEXT_TICK); 3379 $TICK_WATCHER->at ($NEXT_TICK);
2854 $TICK_WATCHER->start; 3380 $TICK_WATCHER->start;
2855 3381
2856 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3382 $LOAD = ($NOW - $tick_start) / $TICK;
2857 $sig->send; 3383 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2858 }
2859 while (my $sig = shift @WAIT_FOR_TICK) {
2860 $sig->send;
2861 }
2862 3384
2863 _post_tick; 3385 _post_tick;
3386
3387
2864 }, 3388 },
2865); 3389);
2866 3390
2867{ 3391{
2868 BDB::max_poll_time $TICK * 0.1; 3392 BDB::max_poll_time $TICK * 0.1;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines