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.325 by root, Sat Jul 28 14:32:22 2007 UTC

20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24 24
25use JSON::XS 1.4 ();
25use BDB (); 26use BDB ();
26use Data::Dumper; 27use Data::Dumper;
27use Digest::MD5; 28use Digest::MD5;
28use Fcntl; 29use Fcntl;
29use YAML::Syck (); 30use YAML::Syck ();
30use IO::AIO 2.32 (); 31use IO::AIO 2.32 ();
31use Time::HiRes; 32use Time::HiRes;
32use Compress::LZF; 33use Compress::LZF;
34use Digest::MD5 ();
33 35
34# configure various modules to our taste 36# configure various modules to our taste
35# 37#
36$Storable::canonical = 1; # reduce rsync transfers 38$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 39Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
49our %COMMAND = (); 51our %COMMAND = ();
50our %COMMAND_TIME = (); 52our %COMMAND_TIME = ();
51 53
52our @EXTS = (); # list of extension package names 54our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 55our %EXTCMD = ();
56our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 57our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 58our %EXT_MAP = (); # pluggable maps
56 59
57our $RELOAD; # number of reloads so far 60our $RELOAD; # number of reloads so far
58our @EVENT; 61our @EVENT;
90our $LINK_MAP; # the special {link} map, which is always available 93our $LINK_MAP; # the special {link} map, which is always available
91 94
92# used to convert map paths into valid unix filenames by replacing / by ∕ 95# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 97
98our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing
100our $tick_start; # for load detecting purposes
101
95binmode STDOUT; 102binmode STDOUT;
96binmode STDERR; 103binmode STDERR;
97 104
98# read virtual server time, if available 105# read virtual server time, if available
99unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 106unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
139 146
140=item $cf::TICK 147=item $cf::TICK
141 148
142The interval between server ticks, in seconds. 149The interval between server ticks, in seconds.
143 150
151=item $cf::LOADAVG
152
153The current CPU load on the server (alpha-smoothed), as a value between 0
154(none) and 1 (overloaded), indicating how much time is spent on processing
155objects per tick. Healthy values are < 0.5.
156
157=item $cf::LOAD
158
159The raw value load value from the last tick.
160
144=item %cf::CFG 161=item %cf::CFG
145 162
146Configuration for the server, loaded from C</etc/crossfire/config>, or 163Configuration for the server, loaded from C</etc/crossfire/config>, or
147from wherever your confdir points to. 164from wherever your confdir points to.
148 165
149=item cf::wait_for_tick, cf::wait_for_tick_begin 166=item cf::wait_for_tick, cf::wait_for_tick_begin
150 167
151These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 168These 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 169returns 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. 170per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
171
172=item @cf::INVOKE_RESULTS
173
174This array contains the results of the last C<invoke ()> call. When
175C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
176that call.
154 177
155=back 178=back
156 179
157=cut 180=cut
158 181
173@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
174@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
175@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
176@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
177@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 200@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
201@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
178@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 202@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
179 203
180# we bless all objects into (empty) derived classes to force a method lookup 204# we bless all objects into (empty) derived classes to force a method lookup
181# within the Safe compartment. 205# within the Safe compartment.
182for my $pkg (qw( 206for my $pkg (qw(
183 cf::global cf::attachable 207 cf::global cf::attachable
191} 215}
192 216
193$Event::DIED = sub { 217$Event::DIED = sub {
194 warn "error in event callback: @_"; 218 warn "error in event callback: @_";
195}; 219};
220
221#############################################################################
196 222
197=head2 UTILITY FUNCTIONS 223=head2 UTILITY FUNCTIONS
198 224
199=over 4 225=over 4
200 226
219 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 245 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
220 $d 246 $d
221 } || "[unable to dump $_[0]: '$@']"; 247 } || "[unable to dump $_[0]: '$@']";
222} 248}
223 249
224use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
225
226=item $ref = cf::from_json $json 250=item $ref = cf::from_json $json
227 251
228Converts a JSON string into the corresponding perl data structure. 252Converts a JSON string into the corresponding perl data structure.
229 253
230=item $json = cf::to_json $ref 254=item $json = cf::to_json $ref
231 255
232Converts a perl data structure into its JSON representation. 256Converts a perl data structure into its JSON representation.
257
258=cut
259
260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261
262sub to_json ($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) }
233 264
234=item cf::lock_wait $string 265=item cf::lock_wait $string
235 266
236Wait until the given lock is available. See cf::lock_acquire. 267Wait until the given lock is available. See cf::lock_acquire.
237 268
291 }; 322 };
292 $TICK_WATCHER->stop; 323 $TICK_WATCHER->stop;
293 $guard 324 $guard
294} 325}
295 326
327=item cf::get_slot $time[, $priority[, $name]]
328
329Allocate $time seconds of blocking CPU time at priority C<$priority>:
330This call blocks and returns only when you have at least C<$time> seconds
331of cpu time till the next tick. The slot is only valid till the next cede.
332
333The optional C<$name> can be used to identify the job to run. It might be
334used for statistical purposes and should identify the same time-class.
335
336Useful for short background jobs.
337
338=cut
339
340our @SLOT_QUEUE;
341our $SLOT_QUEUE;
342
343$SLOT_QUEUE->cancel if $SLOT_QUEUE;
344$SLOT_QUEUE = Coro::async {
345 my $signal = new Coro::Signal;
346
347 while () {
348 next_job:
349 my $avail = cf::till_tick;
350 if ($avail > 0.01) {
351 for (0 .. $#SLOT_QUEUE) {
352 if ($SLOT_QUEUE[$_][0] < $avail) {
353 my $job = splice @SLOT_QUEUE, $_, 1, ();
354 $job->[2]->send;
355 Coro::cede;
356 goto next_job;
357 }
358 }
359 }
360
361 if (@SLOT_QUEUE) {
362 # we do not use wait_For_tick() as it returns immediately when tick is inactive
363 push @cf::WAIT_FOR_TICK, $signal;
364 $signal->wait;
365 } else {
366 Coro::schedule;
367 }
368 }
369};
370
371sub get_slot($;$$) {
372 my ($time, $pri, $name) = @_;
373
374 $time = $TICK * .6 if $time > $TICK * .6;
375 my $sig = new Coro::Signal;
376
377 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
378 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
379 $SLOT_QUEUE->ready;
380 $sig->wait;
381}
382
296=item cf::async { BLOCK } 383=item cf::async { BLOCK }
297 384
298Currently the same as Coro::async_pool, meaning you cannot use 385Currently the same as Coro::async_pool, meaning you cannot use
299C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 386C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
300thing you are allowed to do is call C<prio> on it. 387thing you are allowed to do is call C<prio> on it.
303 390
304BEGIN { *async = \&Coro::async_pool } 391BEGIN { *async = \&Coro::async_pool }
305 392
306=item cf::sync_job { BLOCK } 393=item cf::sync_job { BLOCK }
307 394
308The design of crossfire+ requires that the main coro ($Coro::main) is 395The design of Crossfire TRT requires that the main coroutine ($Coro::main)
309always able to handle events or runnable, as crossfire+ is only partly 396is 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. 397partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
398acceptable.
311 399
312If it must be done, put the blocking parts into C<sync_job>. This will run 400If 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 401the given BLOCK in another coroutine while waiting for the result. The
314server will be frozen during this time, so the block should either finish 402server will be frozen during this time, so the block should either finish
315fast or be very important. 403fast or be very important.
318 406
319sub sync_job(&) { 407sub sync_job(&) {
320 my ($job) = @_; 408 my ($job) = @_;
321 409
322 if ($Coro::current == $Coro::main) { 410 if ($Coro::current == $Coro::main) {
411 my $time = Event::time;
412
323 # this is the main coro, too bad, we have to block 413 # this is the main coro, too bad, we have to block
324 # till the operation succeeds, freezing the server :/ 414 # till the operation succeeds, freezing the server :/
325 415
326 # TODO: use suspend/resume instead 416 # TODO: use suspend/resume instead
327 # (but this is cancel-safe) 417 # (but this is cancel-safe)
338 428
339 while ($busy) { 429 while ($busy) {
340 Coro::cede or Event::one_event; 430 Coro::cede or Event::one_event;
341 } 431 }
342 432
433 $time = Event::time - $time;
434
435 LOG llevError | logBacktrace, Carp::longmess "long sync job"
436 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
437
438 $tick_start += $time; # do not account sync jobs to server load
439
343 wantarray ? @res : $res[0] 440 wantarray ? @res : $res[0]
344 } else { 441 } else {
345 # we are in another coroutine, how wonderful, everything just works 442 # we are in another coroutine, how wonderful, everything just works
346 443
347 $job->() 444 $job->()
366 $EXT_CORO{$coro+0} = $coro; 463 $EXT_CORO{$coro+0} = $coro;
367 464
368 $coro 465 $coro
369} 466}
370 467
371sub write_runtime { 468=item fork_call { }, $args
372 my $guard = cf::lock_acquire "write_runtime";
373 469
374 my $runtime = "$LOCALDIR/runtime"; 470Executes the given code block with the given arguments in a seperate
471process, returning the results. Everything must be serialisable with
472Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling.
375 474
376 warn "starting to write runtime...\n";#d# 475=cut
377 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
378 or return;
379 476
380 my $value = $cf::RUNTIME + 90 + 10; 477sub _store_scalar {
381 # 10 is the runtime save interval, for a monotonic clock 478 open my $fh, ">", \my $buf
382 # 60 allows for the watchdog to kill the server. 479 or die "fork_call: cannot open fh-to-buf in child : $!";
383 480 Storable::store_fd $_[0], $fh;
384 (aio_write $fh, 0, (length $value), $value, 0) <= 0
385 and return;
386
387 # always fsync - this file is important
388 aio_fsync $fh
389 and return;
390
391 close $fh 481 close $fh;
392 or return;
393 482
394 aio_rename "$runtime~", $runtime 483 $buf
395 and return; 484}
396 485
397 warn "... done writing runtime.\n";#d# 486sub fork_call(&@) {
487 my ($cb, @args) = @_;
398 488
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
490# or die "socketpair: $!";
491 pipe my $fh1, my $fh2
492 or die "pipe: $!";
493
494 if (my $pid = fork) {
495 close $fh2;
496
497 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498 warn "pst<$res>" unless $res =~ /^pst/;
499 $res = Coro::Storable::thaw $res;
500
501 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
502
503 Carp::confess $$res unless "ARRAY" eq ref $res;
504
505 return wantarray ? @$res : $res->[-1];
506 } else {
507 reset_signals;
508 local $SIG{__WARN__};
509 local $SIG{__DIE__};
510 # just in case, this hack effectively disables event
511 # in the child. cleaner and slower would be canceling all watchers,
512 # but this works for the time being.
513 local $Coro::idle;
514 $Coro::current->prio (Coro::PRIO_MAX);
515
516 eval {
517 close $fh1;
518
519 my @res = eval { $cb->(@args) };
520
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
522 close $fh2;
523 };
524
525 warn $@ if $@;
526 _exit 0;
399 1 527 }
528}
529
530=item $value = cf::db_get $family => $key
531
532Returns a single value from the environment database.
533
534=item cf::db_put $family => $key => $value
535
536Stores the given C<$value> in the family. It can currently store binary
537data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
538
539=cut
540
541our $DB;
542
543sub db_init {
544 unless ($DB) {
545 $DB = BDB::db_create $DB_ENV;
546
547 cf::sync_job {
548 eval {
549 $DB->set_flags (BDB::CHKSUM);
550
551 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
552 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
553 cf::cleanup "db_open(db): $!" if $!;
554 };
555 cf::cleanup "db_open(db): $@" if $@;
556 };
557 }
558}
559
560sub db_get($$) {
561 my $key = "$_[0]/$_[1]";
562
563 cf::sync_job {
564 BDB::db_get $DB, undef, $key, my $data;
565
566 $! ? ()
567 : $data
568 }
569}
570
571sub db_put($$$) {
572 BDB::dbreq_pri 4;
573 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
574}
575
576=item cf::cache $id => [$paths...], $processversion => $process
577
578Generic caching function that returns the value of the resource $id,
579caching and regenerating as required.
580
581This function can block.
582
583=cut
584
585sub cache {
586 my ($id, $src, $processversion, $process) = @_;
587
588 my $meta =
589 join "\x00",
590 $processversion,
591 map {
592 aio_stat $_
593 and Carp::croak "$_: $!";
594
595 ($_, (stat _)[7,9])
596 } @$src;
597
598 my $dbmeta = db_get cache => "$id/meta";
599 if ($dbmeta ne $meta) {
600 # changed, we may need to process
601
602 my @data;
603 my $md5;
604
605 for (0 .. $#$src) {
606 0 <= aio_load $src->[$_], $data[$_]
607 or Carp::croak "$src->[$_]: $!";
608 }
609
610 # if processing is expensive, check
611 # checksum first
612 if (1) {
613 $md5 =
614 join "\x00",
615 $processversion,
616 map {
617 Coro::cede;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src;
620
621
622 my $dbmd5 = db_get cache => "$id/md5";
623 if ($dbmd5 eq $md5) {
624 db_put cache => "$id/meta", $meta;
625
626 return db_get cache => "$id/data";
627 }
628 }
629
630 my $t1 = Time::HiRes::time;
631 my $data = $process->(\@data);
632 my $t2 = Time::HiRes::time;
633
634 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
635
636 db_put cache => "$id/data", $data;
637 db_put cache => "$id/md5" , $md5;
638 db_put cache => "$id/meta", $meta;
639
640 return $data;
641 }
642
643 db_get cache => "$id/data"
400} 644}
401 645
402=item cf::datalog type => key => value, ... 646=item cf::datalog type => key => value, ...
403 647
404Log a datalog packet of the given type with the given key-value pairs. 648Log 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") 666attach callbacks/event handlers (a collection of which is called an "attachment")
423to it. All such attachable objects support the following methods. 667to it. All such attachable objects support the following methods.
424 668
425In the following description, CLASS can be any of C<global>, C<object> 669In 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 670C<player>, C<client> or C<map> (i.e. the attachable objects in
427crossfire+). 671Crossfire TRT).
428 672
429=over 4 673=over 4
430 674
431=item $attachable->attach ($attachment, key => $value...) 675=item $attachable->attach ($attachment, key => $value...)
432 676
595 $registry = $CB_TYPE[$object_type] ||= []; 839 $registry = $CB_TYPE[$object_type] ||= [];
596 840
597 } elsif ($type eq "subtype") { 841 } elsif ($type eq "subtype") {
598 defined $object_type or Carp::croak "subtype specified without type"; 842 defined $object_type or Carp::croak "subtype specified without type";
599 my $object_subtype = shift @arg; 843 my $object_subtype = shift @arg;
600 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 844 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
601 845
602 } elsif ($type eq "package") { 846 } elsif ($type eq "package") {
603 my $pkg = shift @arg; 847 my $pkg = shift @arg;
604 848
605 while (my ($name, $id) = each %cb_id) { 849 while (my ($name, $id) = each %cb_id) {
634 _attach $registry, $klass, @attach; 878 _attach $registry, $klass, @attach;
635 } 879 }
636 880
637 $obj->{$name} = \%arg; 881 $obj->{$name} = \%arg;
638 } else { 882 } else {
639 warn "object uses attachment '$name' that is not available, postponing.\n"; 883 warn "object uses attachment '$name' which is not available, postponing.\n";
640 } 884 }
641 885
642 $obj->{_attachment}{$name} = undef; 886 $obj->{_attachment}{$name} = undef;
643} 887}
644 888
646 if (ref $_[0]) { 890 if (ref $_[0]) {
647 _object_attach @_; 891 _object_attach @_;
648 } else { 892 } else {
649 _attach shift->_attach_registry, @_; 893 _attach shift->_attach_registry, @_;
650 } 894 }
895 _recalc_want;
651}; 896};
652 897
653# all those should be optimised 898# all those should be optimised
654sub cf::attachable::detach { 899sub cf::attachable::detach {
655 my ($obj, $name) = @_; 900 my ($obj, $name) = @_;
658 delete $obj->{_attachment}{$name}; 903 delete $obj->{_attachment}{$name};
659 reattach ($obj); 904 reattach ($obj);
660 } else { 905 } else {
661 Carp::croak "cannot, currently, detach class attachments"; 906 Carp::croak "cannot, currently, detach class attachments";
662 } 907 }
908 _recalc_want;
663}; 909};
664 910
665sub cf::attachable::attached { 911sub cf::attachable::attached {
666 my ($obj, $name) = @_; 912 my ($obj, $name) = @_;
667 913
682 "; 928 ";
683 die if $@; 929 die if $@;
684} 930}
685 931
686our $override; 932our $override;
687our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 933our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
688 934
689sub override { 935sub override {
690 $override = 1; 936 $override = 1;
691 @invoke_results = (); 937 @INVOKE_RESULTS = (@_);
692} 938}
693 939
694sub do_invoke { 940sub do_invoke {
695 my $event = shift; 941 my $event = shift;
696 my $callbacks = shift; 942 my $callbacks = shift;
697 943
698 @invoke_results = (); 944 @INVOKE_RESULTS = ();
699 945
700 local $override; 946 local $override;
701 947
702 for (@$callbacks) { 948 for (@$callbacks) {
703 eval { &{$_->[1]} }; 949 eval { &{$_->[1]} };
720 966
721Generate an object-specific event with the given arguments. 967Generate an object-specific event with the given arguments.
722 968
723This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 969This 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 970removed in future versions), and there is no public API to access override
725results (if you must, access C<@cf::invoke_results> directly). 971results (if you must, access C<@cf::INVOKE_RESULTS> directly).
726 972
727=back 973=back
728 974
729=cut 975=cut
730 976
731############################################################################# 977#############################################################################
732# object support 978# object support
979#
980
981sub _can_merge {
982 my ($ob1, $ob2) = @_;
983
984 local $Storable::canonical = 1;
985 my $fob1 = Storable::freeze $ob1;
986 my $fob2 = Storable::freeze $ob2;
987
988 $fob1 eq $fob2
989}
733 990
734sub reattach { 991sub reattach {
735 # basically do the same as instantiate, without calling instantiate 992 # basically do the same as instantiate, without calling instantiate
736 my ($obj) = @_; 993 my ($obj) = @_;
737 994
840 or return; 1097 or return;
841 $av = eval { (Storable::thaw $av)->{objs} }; 1098 $av = eval { (Storable::thaw $av)->{objs} };
842 } 1099 }
843 1100
844 warn sprintf "loading %s (%d)\n", 1101 warn sprintf "loading %s (%d)\n",
845 $filename, length $data, scalar @{$av || []};#d# 1102 $filename, length $data, scalar @{$av || []};
846 return ($data, $av); 1103 return ($data, $av);
847} 1104}
1105
1106=head2 COMMAND CALLBACKS
1107
1108=over 4
1109
1110=cut
848 1111
849############################################################################# 1112#############################################################################
850# command handling &c 1113# command handling &c
851 1114
852=item cf::register_command $name => \&callback($ob,$args); 1115=item cf::register_command $name => \&callback($ob,$args);
865 push @{ $COMMAND{$name} }, [$caller, $cb]; 1128 push @{ $COMMAND{$name} }, [$caller, $cb];
866} 1129}
867 1130
868=item cf::register_extcmd $name => \&callback($pl,$packet); 1131=item cf::register_extcmd $name => \&callback($pl,$packet);
869 1132
870Register a callbackf ro execution when the client sends an extcmd packet. 1133Register a callback for execution when the client sends an (synchronous)
1134extcmd packet. Ext commands will be processed in the order they are
1135received by the server, like other user commands. The first argument is
1136the logged-in player. Ext commands can only be processed after a player
1137has logged in successfully.
871 1138
872If the callback returns something, it is sent back as if reply was being 1139If the callback returns something, it is sent back as if reply was being
873called. 1140called.
874 1141
1142=item cf::register_exticmd $name => \&callback($ns,$packet);
1143
1144Register a callback for execution when the client sends an (asynchronous)
1145exticmd packet. Exti commands are processed by the server as soon as they
1146are received, i.e. out of order w.r.t. other commands. The first argument
1147is a client socket. Exti commands can be received anytime, even before
1148log-in.
1149
1150If the callback returns something, it is sent back as if reply was being
1151called.
1152
875=cut 1153=cut
876 1154
877sub register_extcmd { 1155sub register_extcmd {
878 my ($name, $cb) = @_; 1156 my ($name, $cb) = @_;
879 1157
880 $EXTCMD{$name} = $cb; 1158 $EXTCMD{$name} = $cb;
1159}
1160
1161sub register_exticmd {
1162 my ($name, $cb) = @_;
1163
1164 $EXTICMD{$name} = $cb;
881} 1165}
882 1166
883cf::player->attach ( 1167cf::player->attach (
884 on_command => sub { 1168 on_command => sub {
885 my ($pl, $name, $params) = @_; 1169 my ($pl, $name, $params) = @_;
894 cf::override; 1178 cf::override;
895 }, 1179 },
896 on_extcmd => sub { 1180 on_extcmd => sub {
897 my ($pl, $buf) = @_; 1181 my ($pl, $buf) = @_;
898 1182
899 my $msg = eval { from_json $buf }; 1183 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
900 1184
901 if (ref $msg) { 1185 if (ref $msg) {
1186 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg
1188 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190
902 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1191 if (my $cb = $EXTCMD{$type}) {
903 if (my %reply = $cb->($pl, $msg)) { 1192 my @reply = $cb->($pl, @payload);
1193
904 $pl->ext_reply ($msg->{msgid}, %reply); 1194 $pl->ext_reply ($reply, @reply)
905 } 1195 if $reply;
906 } 1196 }
907 } else { 1197 } else {
908 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
909 } 1199 }
910 1200
911 cf::override; 1201 cf::override;
912 }, 1202 },
913); 1203);
914 1204
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 { 1205sub load_extensions {
1206 cf::sync_job {
1207 my %todo;
1208
950 for my $ext (<$LIBDIR/*.ext>) { 1209 for my $path (<$LIBDIR/*.ext>) {
951 next unless -r $ext; 1210 next unless -r $path;
952 eval { 1211
953 load_extension $ext; 1212 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1213 my $base = $1;
1214 my $pkg = $1;
1215 $pkg =~ s/[^[:word:]]/_/g;
1216 $pkg = "ext::$pkg";
1217
1218 open my $fh, "<:utf8", $path
1219 or die "$path: $!";
1220
1221 my $source = do { local $/; <$fh> };
1222
1223 my %ext = (
1224 path => $path,
1225 base => $base,
1226 pkg => $pkg,
1227 );
1228
1229 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1230 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1231
1232 $ext{source} =
1233 "package $pkg; use strict; use utf8;\n"
1234 . "#line 1 \"$path\"\n{\n"
1235 . $source
1236 . "\n};\n1";
1237
1238 $todo{$base} = \%ext;
1239 }
1240
1241 my %done;
1242 while (%todo) {
1243 my $progress;
1244
1245 while (my ($k, $v) = each %todo) {
1246 for (split /,\s*/, $v->{meta}{depends}) {
1247 goto skip
1248 unless exists $done{$_};
1249 }
1250
1251 warn "... loading '$k' into '$v->{pkg}'\n";
1252
1253 unless (eval $v->{source}) {
1254 my $msg = $@ ? "$v->{path}: $@\n"
1255 : "$v->{base}: extension inactive.\n";
1256
1257 if (exists $v->{meta}{mandatory}) {
1258 warn $msg;
1259 warn "mandatory extension failed to load, exiting.\n";
1260 exit 1;
1261 }
1262
1263 warn $msg;
1264 }
1265
1266 $done{$k} = delete $todo{$k};
1267 push @EXTS, $v->{pkg};
1268 $progress = 1;
954 1 1269 }
955 } or warn "$ext not loaded: $@"; 1270
1271 skip:
1272 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1273 unless $progress;
1274 }
956 } 1275 };
957} 1276}
958 1277
959############################################################################# 1278#############################################################################
1279
1280=back
960 1281
961=head2 CORE EXTENSIONS 1282=head2 CORE EXTENSIONS
962 1283
963Functions and methods that extend core crossfire objects. 1284Functions and methods that extend core crossfire objects.
964 1285
1152 } 1473 }
1153 1474
1154 \@paths 1475 \@paths
1155} 1476}
1156 1477
1478=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1479
1480Expand crossfire pod fragments into protocol xml.
1481
1482=cut
1483
1484sub expand_cfpod {
1485 ((my $self), (local $_)) = @_;
1486
1487 # escape & and <
1488 s/&/&amp;/g;
1489 s/(?<![BIUGH])</&lt;/g;
1490
1491 # this is buggy, it needs to properly take care of nested <'s
1492
1493 1 while
1494 # replace B<>, I<>, U<> etc.
1495 s/B<([^\>]*)>/<b>$1<\/b>/
1496 || s/I<([^\>]*)>/<i>$1<\/i>/
1497 || s/U<([^\>]*)>/<u>$1<\/u>/
1498 # replace G<male|female> tags
1499 || s{G<([^>|]*)\|([^>]*)>}{
1500 $self->gender ? $2 : $1
1501 }ge
1502 # replace H<hint text>
1503 || s{H<([^\>]*)>}
1504 {
1505 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1506 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1507 "")
1508 [$self->{hintmode}]
1509 }ge;
1510
1511 # create single paragraphs (very hackish)
1512 s/(?<=\S)\n(?=\w)/ /g;
1513
1514 # compress some whitespace
1515 s/\s+\n/\n/g; # ws line-ends
1516 s/\n\n+/\n/g; # double lines
1517 s/^\n+//; # beginning lines
1518 s/\n+$//; # ending lines
1519
1520 $_
1521}
1522
1523sub hintmode {
1524 $_[0]{hintmode} = $_[1] if @_ > 1;
1525 $_[0]{hintmode}
1526}
1527
1157=item $player->ext_reply ($msgid, %msg) 1528=item $player->ext_reply ($msgid, @msg)
1158 1529
1159Sends an ext reply to the player. 1530Sends an ext reply to the player.
1160 1531
1161=cut 1532=cut
1162 1533
1163sub ext_reply($$%) { 1534sub ext_reply($$@) {
1164 my ($self, $id, %msg) = @_; 1535 my ($self, $id, @msg) = @_;
1165 1536
1166 $msg{msgid} = $id; 1537 if ($self->ns->extcmd == 2) {
1167 1538 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1168 $self->send ("ext " . cf::to_json \%msg); 1539 } elsif ($self->ns->extcmd == 1) {
1540 #TODO: version 1, remove
1541 unshift @msg, msgtype => "reply", msgid => $id;
1542 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1543 }
1169} 1544}
1170 1545
1171=item $player->ext_event ($type, %msg) 1546=item $player->ext_msg ($type, @msg)
1172 1547
1173Sends an ext event to the client. 1548Sends an ext event to the client.
1174 1549
1175=cut 1550=cut
1176 1551
1177sub ext_event($$%) { 1552sub ext_msg($$@) {
1178 my ($self, $type, %msg) = @_; 1553 my ($self, $type, @msg) = @_;
1179 1554
1180 $self->ns->ext_event ($type, %msg); 1555 $self->ns->ext_msg ($type, @msg);
1181} 1556}
1182 1557
1183=head3 cf::region 1558=head3 cf::region
1184 1559
1185=over 4 1560=over 4
1188 1563
1189package cf::region; 1564package cf::region;
1190 1565
1191=item cf::region::find_by_path $path 1566=item cf::region::find_by_path $path
1192 1567
1193Tries to decuce the probable region for a map knowing only its path. 1568Tries to decuce the likely region for a map knowing only its path.
1194 1569
1195=cut 1570=cut
1196 1571
1197sub find_by_path($) { 1572sub find_by_path($) {
1198 my ($path) = @_; 1573 my ($path) = @_;
1199 1574
1200 my ($match, $specificity); 1575 my ($match, $specificity);
1201 1576
1202 for my $region (list) { 1577 for my $region (list) {
1203 if ($region->match && $path =~ $region->match) { 1578 if ($region->{match} && $path =~ $region->{match}) {
1204 ($match, $specificity) = ($region, $region->specificity) 1579 ($match, $specificity) = ($region, $region->specificity)
1205 if $region->specificity > $specificity; 1580 if $region->specificity > $specificity;
1206 } 1581 }
1207 } 1582 }
1208 1583
1272 my ($self, $merge) = @_; 1647 my ($self, $merge) = @_;
1273 1648
1274 # we have to keep some variables in memory intact 1649 # we have to keep some variables in memory intact
1275 local $self->{path}; 1650 local $self->{path};
1276 local $self->{load_path}; 1651 local $self->{load_path};
1277 local $self->{deny_save};
1278 local $self->{deny_reset};
1279 1652
1280 $self->SUPER::thawer_merge ($merge); 1653 $self->SUPER::thawer_merge ($merge);
1281} 1654}
1282 1655
1283sub normalise { 1656sub normalise {
1330 $self->init; # pass $1 etc. 1703 $self->init; # pass $1 etc.
1331 return $self; 1704 return $self;
1332 } 1705 }
1333 } 1706 }
1334 1707
1335 Carp::carp "unable to resolve path '$path' (base '$base')."; 1708 Carp::cluck "unable to resolve path '$path' (base '$base').";
1336 () 1709 ()
1337} 1710}
1338 1711
1339sub init { 1712sub init {
1340 my ($self) = @_; 1713 my ($self) = @_;
1381sub change_all_map_light { 1754sub change_all_map_light {
1382 my ($change) = @_; 1755 my ($change) = @_;
1383 1756
1384 $_->change_map_light ($change) 1757 $_->change_map_light ($change)
1385 for grep $_->outdoor, values %cf::MAP; 1758 for grep $_->outdoor, values %cf::MAP;
1759}
1760
1761sub decay_objects {
1762 my ($self) = @_;
1763
1764 return if $self->{deny_reset};
1765
1766 $self->do_decay_objects;
1386} 1767}
1387 1768
1388sub unlink_save { 1769sub unlink_save {
1389 my ($self) = @_; 1770 my ($self) = @_;
1390 1771
1448 $self->load_header_orig 1829 $self->load_header_orig
1449 or return; 1830 or return;
1450 $self->prepare_orig; 1831 $self->prepare_orig;
1451 } 1832 }
1452 1833
1834 $self->{deny_reset} = 1
1835 if $self->no_reset;
1836
1453 $self->default_region (cf::region::find_by_path $self->{path}) 1837 $self->default_region (cf::region::find_by_path $self->{path})
1454 unless $self->default_region; 1838 unless $self->default_region;
1455 1839
1456 1 1840 1
1457} 1841}
1472 $map->{last_save} = $cf::RUNTIME; 1856 $map->{last_save} = $cf::RUNTIME;
1473 1857
1474 $map->load_header 1858 $map->load_header
1475 or return; 1859 or return;
1476 1860
1477 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1861 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1478 # doing this can freeze the server in a sync job, obviously 1862 # doing this can freeze the server in a sync job, obviously
1479 #$cf::WAIT_FOR_TICK->wait; 1863 #$cf::WAIT_FOR_TICK->wait;
1480 $map->reset; 1864 $map->reset;
1481 undef $guard; 1865 undef $guard;
1482 return find $path; 1866 return find $path;
1537 $self->set_darkness_map; 1921 $self->set_darkness_map;
1538 Coro::cede; 1922 Coro::cede;
1539 $self->activate; 1923 $self->activate;
1540 } 1924 }
1541 1925
1926 $self->{last_save} = $cf::RUNTIME;
1927 $self->last_access ($cf::RUNTIME);
1928
1542 $self->in_memory (cf::MAP_IN_MEMORY); 1929 $self->in_memory (cf::MAP_IN_MEMORY);
1543 } 1930 }
1544 1931
1545 $self->post_load; 1932 $self->post_load;
1546} 1933}
1548sub customise_for { 1935sub customise_for {
1549 my ($self, $ob) = @_; 1936 my ($self, $ob) = @_;
1550 1937
1551 return find "~" . $ob->name . "/" . $self->{path} 1938 return find "~" . $ob->name . "/" . $self->{path}
1552 if $self->per_player; 1939 if $self->per_player;
1940
1941# return find "?party/" . $ob->name . "/" . $self->{path}
1942# if $self->per_party;
1553 1943
1554 $self 1944 $self
1555} 1945}
1556 1946
1557# find and load all maps in the 3x3 area around a map 1947# find and load all maps in the 3x3 area around a map
1604 1994
1605 undef $MAP_PREFETCH{$path}; 1995 undef $MAP_PREFETCH{$path};
1606 $MAP_PREFETCHER ||= cf::async { 1996 $MAP_PREFETCHER ||= cf::async {
1607 while (%MAP_PREFETCH) { 1997 while (%MAP_PREFETCH) {
1608 for my $path (keys %MAP_PREFETCH) { 1998 for my $path (keys %MAP_PREFETCH) {
1609 my $map = find $path 1999 if (my $map = find $path) {
1610 or next;
1611 $map->load; 2000 $map->load;
2001 }
1612 2002
1613 delete $MAP_PREFETCH{$path}; 2003 delete $MAP_PREFETCH{$path};
1614 } 2004 }
1615 } 2005 }
1616 undef $MAP_PREFETCHER; 2006 undef $MAP_PREFETCHER;
1668 2058
1669sub reset_at { 2059sub reset_at {
1670 my ($self) = @_; 2060 my ($self) = @_;
1671 2061
1672 # TODO: safety, remove and allow resettable per-player maps 2062 # 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}; 2063 return 1e99 if $self->{deny_reset};
1675 2064
1676 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2065 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1677 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2066 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1678 2067
1689 my ($self) = @_; 2078 my ($self) = @_;
1690 2079
1691 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2080 my $lock = cf::lock_acquire "map_data:$self->{path}";
1692 2081
1693 return if $self->players; 2082 return if $self->players;
1694 return if $self->isa ("ext::map_per_player");#d#
1695 2083
1696 warn "resetting map ", $self->path;#d# 2084 warn "resetting map ", $self->path;
1697 2085
1698 $self->in_memory (cf::MAP_SWAPPED); 2086 $self->in_memory (cf::MAP_SWAPPED);
1699 2087
1700 # need to save uniques path 2088 # need to save uniques path
1701 unless ($self->{deny_save}) { 2089 unless ($self->{deny_save}) {
1733 $cf::MAP{$self->path} = $self; 2121 $cf::MAP{$self->path} = $self;
1734 2122
1735 $self->reset; # polite request, might not happen 2123 $self->reset; # polite request, might not happen
1736} 2124}
1737 2125
2126=item $maps = cf::map::tmp_maps
2127
2128Returns an arrayref with all map paths of currently instantiated and saved
2129maps. May block.
2130
2131=cut
2132
2133sub tmp_maps() {
2134 [
2135 map {
2136 utf8::decode $_;
2137 /\.map$/
2138 ? normalise $_
2139 : ()
2140 } @{ aio_readdir $TMPDIR or [] }
2141 ]
2142}
2143
2144=item $maps = cf::map::random_maps
2145
2146Returns an arrayref with all map paths of currently instantiated and saved
2147random maps. May block.
2148
2149=cut
2150
2151sub random_maps() {
2152 [
2153 map {
2154 utf8::decode $_;
2155 /\.map$/
2156 ? normalise "?random/$_"
2157 : ()
2158 } @{ aio_readdir $RANDOMDIR or [] }
2159 ]
2160}
2161
1738=item cf::map::unique_maps 2162=item cf::map::unique_maps
1739 2163
1740Returns an arrayref of paths of all shared maps that have 2164Returns an arrayref of paths of all shared maps that have
1741instantiated unique items. May block. 2165instantiated unique items. May block.
1742 2166
1743=cut 2167=cut
1744 2168
1745sub unique_maps() { 2169sub unique_maps() {
1746 my $files = aio_readdir $UNIQUEDIR 2170 [
1747 or return; 2171 map {
1748
1749 my @paths;
1750
1751 for (@$files) {
1752 utf8::decode $_; 2172 utf8::decode $_;
1753 next if /\.pst$/; 2173 /\.map$/
1754 next unless /^$PATH_SEP/o; 2174 ? normalise $_
1755 2175 : ()
1756 push @paths, cf::map::normalise $_; 2176 } @{ aio_readdir $UNIQUEDIR or [] }
1757 } 2177 ]
1758
1759 \@paths
1760} 2178}
1761 2179
1762package cf; 2180package cf;
1763 2181
1764=back 2182=back
1810 2228
1811 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2229 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1812 2230
1813 if ($self->{record_replies}) { 2231 if ($self->{record_replies}) {
1814 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2232 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2233
1815 } else { 2234 } else {
2235 my $pl = $self->contr;
2236
2237 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2238 my $dialog = $pl->{npc_dialog};
2239 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2240
2241 } else {
1816 $msg = $npc->name . " says: $msg" if $npc; 2242 $msg = $npc->name . " says: $msg" if $npc;
1817 $self->message ($msg, $flags); 2243 $self->message ($msg, $flags);
2244 }
1818 } 2245 }
1819} 2246}
1820 2247
1821=item $player_object->may ("access") 2248=item $player_object->may ("access")
1822 2249
1870 $self->deactivate_recursive; 2297 $self->deactivate_recursive;
1871 2298
1872 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2299 return if UNIVERSAL::isa $self->map, "ext::map_link";
1873 2300
1874 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2301 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1875 if $self->map; 2302 if $self->map && $self->map->{path} ne "{link}";
1876 2303
1877 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2304 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1878} 2305}
1879 2306
1880sub cf::object::player::leave_link { 2307sub cf::object::player::leave_link {
1881 my ($self, $map, $x, $y) = @_; 2308 my ($self, $map, $x, $y) = @_;
2309
2310 return unless $self->contr->active;
1882 2311
1883 my $link_pos = delete $self->{_link_pos}; 2312 my $link_pos = delete $self->{_link_pos};
1884 2313
1885 unless ($map) { 2314 unless ($map) {
1886 # restore original map position 2315 # restore original map position
1909 2338
1910 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2339 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1911 $self->enter_map ($map, $x, $y); 2340 $self->enter_map ($map, $x, $y);
1912} 2341}
1913 2342
1914cf::player->attach ( 2343=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1915 on_logout => sub {
1916 my ($pl) = @_;
1917 2344
1918 # abort map switching before logout 2345Moves the player to the given map-path and coordinates by first freezing
1919 if ($pl->ob->{_link_pos}) { 2346her, loading and preparing them map, calling the provided $check callback
1920 cf::sync_job { 2347that has to return the map if sucecssful, and then unfreezes the player on
1921 $pl->ob->leave_link 2348the new (success) or old (failed) map position. In either case, $done will
1922 }; 2349be called at the end of this process.
1923 }
1924 },
1925 on_login => sub {
1926 my ($pl) = @_;
1927 2350
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 2351=cut
2352
2353our $GOTOGEN;
1949 2354
1950sub cf::object::player::goto { 2355sub cf::object::player::goto {
1951 my ($self, $path, $x, $y) = @_; 2356 my ($self, $path, $x, $y, $check, $done) = @_;
2357
2358 # do generation counting so two concurrent goto's will be executed in-order
2359 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1952 2360
1953 $self->enter_link; 2361 $self->enter_link;
1954 2362
1955 (async { 2363 (async {
1956 my $map = eval { 2364 my $map = eval {
1957 my $map = cf::map::find $path; 2365 my $map = cf::map::find $path;
2366
2367 if ($map) {
1958 $map = $map->customise_for ($self) if $map; 2368 $map = $map->customise_for ($self);
2369 $map = $check->($map) if $check && $map;
2370 } else {
2371 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2372 }
2373
1959 $map 2374 $map
2375 };
2376
2377 if ($@) {
2378 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2379 LOG llevError | logBacktrace, Carp::longmess $@;
1960 } or 2380 }
1961 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1962 2381
2382 if ($gen == $self->{_goto_generation}) {
2383 delete $self->{_goto_generation};
1963 $self->leave_link ($map, $x, $y); 2384 $self->leave_link ($map, $x, $y);
2385 }
2386
2387 $done->() if $done;
1964 })->prio (1); 2388 })->prio (1);
1965} 2389}
1966 2390
1967=item $player_object->enter_exit ($exit_object) 2391=item $player_object->enter_exit ($exit_object)
1968 2392
2037 my $hp = $exit->stats->hp; 2461 my $hp = $exit->stats->hp;
2038 my $sp = $exit->stats->sp; 2462 my $sp = $exit->stats->sp;
2039 2463
2040 $self->enter_link; 2464 $self->enter_link;
2041 2465
2466 # if exit is damned, update players death & WoR home-position
2467 $self->contr->savebed ($slaying, $hp, $sp)
2468 if $exit->flag (FLAG_DAMNED);
2469
2042 (async { 2470 (async {
2043 $self->deactivate_recursive; # just to be sure 2471 $self->deactivate_recursive; # just to be sure
2044 unless (eval { 2472 unless (eval {
2045 $self->goto ($slaying, $hp, $sp); 2473 $self->goto ($slaying, $hp, $sp);
2046 2474
2073 2501
2074 utf8::encode $text; 2502 utf8::encode $text;
2075 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2503 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2076} 2504}
2077 2505
2506=item $client->send_msg ($channel, $msg, $color, [extra...])
2507
2508Send a drawinfo or msg packet to the client, formatting the msg for the
2509client if neccessary. C<$type> should be a string identifying the type of
2510the message, with C<log> being the default. If C<$color> is negative, suppress
2511the message unless the client supports the msg packet.
2512
2513=cut
2514
2515sub cf::client::send_msg {
2516 my ($self, $channel, $msg, $color, @extra) = @_;
2517
2518 $msg = $self->pl->expand_cfpod ($msg);
2519
2520 $color &= cf::NDI_CLIENT_MASK; # just in case...
2521
2522 if (ref $channel) {
2523 # send meta info to client, if not yet sent
2524 unless (exists $self->{channel}{$channel->{id}}) {
2525 $self->{channel}{$channel->{id}} = $channel;
2526 $self->ext_msg (channel_info => $channel);
2527 }
2528
2529 $channel = $channel->{id};
2530 }
2531
2532 return unless @extra || length $msg;
2533
2534 if ($self->can_msg) {
2535 # default colour, mask it out
2536 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2537 if $color & cf::NDI_DEF;
2538
2539 $self->send_packet ("msg " . $self->{json_coder}->encode (
2540 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2541 } else {
2542 if ($color >= 0) {
2543 # replace some tags by gcfclient-compatible ones
2544 for ($msg) {
2545 1 while
2546 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2547 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2548 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2549 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2550 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2551 }
2552
2553 $color &= cf::NDI_COLOR_MASK;
2554
2555 if (0 && $msg =~ /\[/) {
2556 $self->send_packet ("drawextinfo $color 4 0 $msg")
2557 } else {
2558 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2559 $self->send_packet ("drawinfo $color $msg")
2560 }
2561 }
2562 }
2563}
2564
2078=item $client->ext_event ($type, %msg) 2565=item $client->ext_msg ($type, @msg)
2079 2566
2080Sends an exti event to the client. 2567Sends an ext event to the client.
2081 2568
2082=cut 2569=cut
2083 2570
2084sub cf::client::ext_event($$%) { 2571sub cf::client::ext_msg($$@) {
2085 my ($self, $type, %msg) = @_; 2572 my ($self, $type, @msg) = @_;
2086 2573
2574 my $extcmd = $self->extcmd;
2575
2576 if ($extcmd == 2) {
2577 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2578 } elsif ($extcmd == 1) { # TODO: remove
2087 $msg{msgtype} = "event_$type"; 2579 push @msg, msgtype => "event_$type";
2088 $self->send_packet ("ext " . cf::to_json \%msg); 2580 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2581 }
2089} 2582}
2090 2583
2091=item $success = $client->query ($flags, "text", \&cb) 2584=item $success = $client->query ($flags, "text", \&cb)
2092 2585
2093Queues a query to the client, calling the given callback with 2586Queues a query to the client, calling the given callback with
2094the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2587the 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>. 2588C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2096 2589
2097Queries can fail, so check the return code. Or don't, as queries will become 2590Queries can fail, so check the return code. Or don't, as queries will
2098reliable at some point in the future. 2591become reliable at some point in the future.
2099 2592
2100=cut 2593=cut
2101 2594
2102sub cf::client::query { 2595sub cf::client::query {
2103 my ($self, $flags, $text, $cb) = @_; 2596 my ($self, $flags, $text, $cb) = @_;
2111 utf8::encode $text; 2604 utf8::encode $text;
2112 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2605 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2113 2606
2114 $self->send_packet ($self->{query_queue}[0][0]) 2607 $self->send_packet ($self->{query_queue}[0][0])
2115 if @{ $self->{query_queue} } == 1; 2608 if @{ $self->{query_queue} } == 1;
2609
2610 1
2116} 2611}
2117 2612
2118cf::client->attach ( 2613cf::client->attach (
2614 on_connect => sub {
2615 my ($ns) = @_;
2616
2617 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2618 },
2119 on_reply => sub { 2619 on_reply => sub {
2120 my ($ns, $msg) = @_; 2620 my ($ns, $msg) = @_;
2121 2621
2122 # this weird shuffling is so that direct followup queries 2622 # this weird shuffling is so that direct followup queries
2123 # get handled first 2623 # get handled first
2135 } else { 2635 } else {
2136 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2636 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2137 } 2637 }
2138 } 2638 }
2139 }, 2639 },
2640 on_exticmd => sub {
2641 my ($ns, $buf) = @_;
2642
2643 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2644
2645 if (ref $msg) {
2646 my ($type, $reply, @payload) =
2647 "ARRAY" eq ref $msg
2648 ? @$msg
2649 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2650
2651 if (my $cb = $EXTICMD{$type}) {
2652 my @reply = $cb->($ns, @payload);
2653
2654 $ns->ext_reply ($reply, @reply)
2655 if $reply;
2656 }
2657 } else {
2658 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2659 }
2660
2661 cf::override;
2662 },
2140); 2663);
2141 2664
2142=item $client->async (\&cb) 2665=item $client->async (\&cb)
2143 2666
2144Create a new coroutine, running the specified callback. The coroutine will 2667Create a new coroutine, running the specified callback. The coroutine will
2193 2716
2194=pod 2717=pod
2195 2718
2196The following functions and methods are available within a safe environment: 2719The following functions and methods are available within a safe environment:
2197 2720
2198 cf::object contr pay_amount pay_player map 2721 cf::object
2722 contr pay_amount pay_player map x y force_find force_add
2723 insert remove
2724
2199 cf::object::player player 2725 cf::object::player
2200 cf::player peaceful 2726 player
2201 cf::map trigger 2727
2728 cf::player
2729 peaceful
2730
2731 cf::map
2732 trigger
2202 2733
2203=cut 2734=cut
2204 2735
2205for ( 2736for (
2206 ["cf::object" => qw(contr pay_amount pay_player map)], 2737 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2738 insert remove)],
2207 ["cf::object::player" => qw(player)], 2739 ["cf::object::player" => qw(player)],
2208 ["cf::player" => qw(peaceful)], 2740 ["cf::player" => qw(peaceful)],
2209 ["cf::map" => qw(trigger)], 2741 ["cf::map" => qw(trigger)],
2210) { 2742) {
2211 no strict 'refs'; 2743 no strict 'refs';
2282=back 2814=back
2283 2815
2284=cut 2816=cut
2285 2817
2286############################################################################# 2818#############################################################################
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 2819# the server's init and main functions
2462 2820
2463sub load_facedata($) { 2821sub load_facedata($) {
2464 my ($path) = @_; 2822 my ($path) = @_;
2465 2823
2477 { 2835 {
2478 my $faces = $facedata->{faceinfo}; 2836 my $faces = $facedata->{faceinfo};
2479 2837
2480 while (my ($face, $info) = each %$faces) { 2838 while (my ($face, $info) = each %$faces) {
2481 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2839 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2482 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2840 cf::face::set_visibility $idx, $info->{visibility};
2841 cf::face::set_magicmap $idx, $info->{magicmap};
2483 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2842 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2484 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2843 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2485 Coro::cede; 2844
2845 cf::cede_to_tick;
2486 } 2846 }
2487 2847
2488 while (my ($face, $info) = each %$faces) { 2848 while (my ($face, $info) = each %$faces) {
2489 next unless $info->{smooth}; 2849 next unless $info->{smooth};
2490 my $idx = cf::face::find $face 2850 my $idx = cf::face::find $face
2491 or next; 2851 or next;
2492 if (my $smooth = cf::face::find $info->{smooth}) { 2852 if (my $smooth = cf::face::find $info->{smooth}) {
2853 cf::face::set_smooth $idx, $smooth;
2493 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2854 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2494 } else { 2855 } else {
2495 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2856 warn "smooth face '$info->{smooth}' not found for face '$face'";
2496 } 2857 }
2497 Coro::cede; 2858
2859 cf::cede_to_tick;
2498 } 2860 }
2499 } 2861 }
2500 2862
2501 { 2863 {
2502 my $anims = $facedata->{animinfo}; 2864 my $anims = $facedata->{animinfo};
2503 2865
2504 while (my ($anim, $info) = each %$anims) { 2866 while (my ($anim, $info) = each %$anims) {
2505 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2867 cf::anim::set $anim, $info->{frames}, $info->{facings};
2506 Coro::cede; 2868 cf::cede_to_tick;
2507 } 2869 }
2508 2870
2509 cf::anim::invalidate_all; # d'oh 2871 cf::anim::invalidate_all; # d'oh
2510 } 2872 }
2511 2873
2874 {
2875 # TODO: for gcfclient pleasure, we should give resources
2876 # that gcfclient doesn't grok a >10000 face index.
2877 my $res = $facedata->{resource};
2878 my $enc = JSON::XS->new->utf8->canonical;
2879
2880 my $soundconf = delete $res->{"res/sound.conf"};
2881
2882 while (my ($name, $info) = each %$res) {
2883 my $meta = $enc->encode ({
2884 name => $name,
2885 %{ $info->{meta} || {} },
2886 });
2887
2888 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2889
2890 if ($info->{type} & 1) {
2891 # prepend meta info
2892
2893 my $data = pack "(w/a*)*", $meta, $info->{data};
2894 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2895
2896 cf::face::set_data $idx, 0, $data, $chk;
2897 } else {
2898 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};
2899 }
2900
2901 cf::face::set_type $idx, $info->{type};
2902
2903 cf::cede_to_tick;
2904 }
2905
2906 if ($soundconf) {
2907 $soundconf = $enc->decode (delete $soundconf->{data});
2908
2909 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2910 my $sound = $soundconf->{compat}[$_]
2911 or next;
2912
2913 my $face = cf::face::find "sound/$sound->[1]";
2914
2915 cf::sound::set $sound->[0] => $face;
2916 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2917 }
2918
2919 #TODO
2920 }
2921 }
2922
2512 1 2923 1
2513} 2924}
2925
2926register_exticmd fx_want => sub {
2927 my ($ns, $want) = @_;
2928
2929 while (my ($k, $v) = each %$want) {
2930 $ns->fx_want ($k, $v);
2931 }
2932};
2514 2933
2515sub reload_regions { 2934sub reload_regions {
2516 load_resource_file "$MAPDIR/regions" 2935 load_resource_file "$MAPDIR/regions"
2517 or die "unable to load regions file\n"; 2936 or die "unable to load regions file\n";
2937
2938 for (cf::region::list) {
2939 $_->{match} = qr/$_->{match}/
2940 if exists $_->{match};
2941 }
2518} 2942}
2519 2943
2520sub reload_facedata { 2944sub reload_facedata {
2521 load_facedata "$DATADIR/facedata" 2945 load_facedata "$DATADIR/facedata"
2522 or die "unable to load facedata\n"; 2946 or die "unable to load facedata\n";
2523} 2947}
2524 2948
2525sub reload_archetypes { 2949sub reload_archetypes {
2526 load_resource_file "$DATADIR/archetypes" 2950 load_resource_file "$DATADIR/archetypes"
2527 or die "unable to load archetypes\n"; 2951 or die "unable to load archetypes\n";
2952 #d# NEED to laod twice to resolve forward references
2953 # this really needs to be done in an extra post-pass
2954 # (which needs to be synchronous, so solve it differently)
2955 load_resource_file "$DATADIR/archetypes"
2956 or die "unable to load archetypes\n";
2528} 2957}
2529 2958
2530sub reload_treasures { 2959sub reload_treasures {
2531 load_resource_file "$DATADIR/treasures" 2960 load_resource_file "$DATADIR/treasures"
2532 or die "unable to load treasurelists\n"; 2961 or die "unable to load treasurelists\n";
2535sub reload_resources { 2964sub reload_resources {
2536 warn "reloading resource files...\n"; 2965 warn "reloading resource files...\n";
2537 2966
2538 reload_regions; 2967 reload_regions;
2539 reload_facedata; 2968 reload_facedata;
2969 #reload_archetypes;#d#
2540 reload_archetypes; 2970 reload_archetypes;
2541 reload_treasures; 2971 reload_treasures;
2542 2972
2543 warn "finished reloading resource files\n"; 2973 warn "finished reloading resource files\n";
2544} 2974}
2601 }, 3031 },
2602 ); 3032 );
2603 } 3033 }
2604} 3034}
2605 3035
3036sub write_runtime {
3037 my $runtime = "$LOCALDIR/runtime";
3038
3039 # first touch the runtime file to show we are still running:
3040 # the fsync below can take a very very long time.
3041
3042 IO::AIO::aio_utime $runtime, undef, undef;
3043
3044 my $guard = cf::lock_acquire "write_runtime";
3045
3046 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3047 or return;
3048
3049 my $value = $cf::RUNTIME + 90 + 10;
3050 # 10 is the runtime save interval, for a monotonic clock
3051 # 60 allows for the watchdog to kill the server.
3052
3053 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3054 and return;
3055
3056 # always fsync - this file is important
3057 aio_fsync $fh
3058 and return;
3059
3060 # touch it again to show we are up-to-date
3061 aio_utime $fh, undef, undef;
3062
3063 close $fh
3064 or return;
3065
3066 aio_rename "$runtime~", $runtime
3067 and return;
3068
3069 warn "runtime file written.\n";
3070
3071 1
3072}
3073
2606sub emergency_save() { 3074sub emergency_save() {
2607 my $freeze_guard = cf::freeze_mainloop; 3075 my $freeze_guard = cf::freeze_mainloop;
2608 3076
2609 warn "enter emergency perl save\n"; 3077 warn "enter emergency perl save\n";
2610 3078
2685 %EXT_CORO = (); 3153 %EXT_CORO = ();
2686 3154
2687 warn "removing commands"; 3155 warn "removing commands";
2688 %COMMAND = (); 3156 %COMMAND = ();
2689 3157
2690 warn "removing ext commands"; 3158 warn "removing ext/exti commands";
2691 %EXTCMD = (); 3159 %EXTCMD = ();
3160 %EXTICMD = ();
2692 3161
2693 warn "unloading/nuking all extensions"; 3162 warn "unloading/nuking all extensions";
2694 for my $pkg (@EXTS) { 3163 for my $pkg (@EXTS) {
2695 warn "... unloading $pkg"; 3164 warn "... unloading $pkg";
2696 3165
2814 my $signal = new Coro::Signal; 3283 my $signal = new Coro::Signal;
2815 push @WAIT_FOR_TICK_BEGIN, $signal; 3284 push @WAIT_FOR_TICK_BEGIN, $signal;
2816 $signal->wait; 3285 $signal->wait;
2817} 3286}
2818 3287
3288 my $min = 1e6;#d#
3289 my $avg = 10;
2819$TICK_WATCHER = Event->timer ( 3290$TICK_WATCHER = Event->timer (
2820 reentrant => 0, 3291 reentrant => 0,
2821 parked => 1, 3292 parked => 1,
2822 prio => 0, 3293 prio => 0,
2823 at => $NEXT_TICK || $TICK, 3294 at => $NEXT_TICK || $TICK,
2827 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3298 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2828 unless ++$bug_warning > 10; 3299 unless ++$bug_warning > 10;
2829 return; 3300 return;
2830 } 3301 }
2831 3302
2832 $NOW = Event::time; 3303 $NOW = $tick_start = Event::time;
2833 3304
2834 cf::server_tick; # one server iteration 3305 cf::server_tick; # one server iteration
3306
3307 0 && sync_job {#d#
3308 for(1..10) {
3309 my $t = Event::time;
3310 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3311 or die;
3312
3313 $map->width (50);
3314 $map->height (50);
3315 $map->alloc;
3316 $map->_load_objects ("/tmp/x.map", 1);
3317 my $t = Event::time - $t;
3318
3319 #next unless $t < 0.0013;#d#
3320 if ($t < $min) {
3321 $min = $t;
3322 }
3323 $avg = $avg * 0.99 + $t * 0.01;
3324 }
3325 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3326 exit 0;
3327 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3328 };
2835 3329
2836 $RUNTIME += $TICK; 3330 $RUNTIME += $TICK;
2837 $NEXT_TICK += $TICK; 3331 $NEXT_TICK += $TICK;
2838 3332
2839 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3333 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2845 } 3339 }
2846 3340
2847# my $AFTER = Event::time; 3341# my $AFTER = Event::time;
2848# warn $AFTER - $NOW;#d# 3342# warn $AFTER - $NOW;#d#
2849 3343
3344 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3345 $sig->send;
3346 }
3347 while (my $sig = shift @WAIT_FOR_TICK) {
3348 $sig->send;
3349 }
3350
3351 $NOW = Event::time;
3352
2850 # if we are delayed by four ticks or more, skip them all 3353 # if we are delayed by four ticks or more, skip them all
2851 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3354 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2852 3355
2853 $TICK_WATCHER->at ($NEXT_TICK); 3356 $TICK_WATCHER->at ($NEXT_TICK);
2854 $TICK_WATCHER->start; 3357 $TICK_WATCHER->start;
2855 3358
2856 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3359 $LOAD = ($NOW - $tick_start) / $TICK;
2857 $sig->send; 3360 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2858 }
2859 while (my $sig = shift @WAIT_FOR_TICK) {
2860 $sig->send;
2861 }
2862 3361
2863 _post_tick; 3362 _post_tick;
3363
3364
2864 }, 3365 },
2865); 3366);
2866 3367
2867{ 3368{
2868 BDB::max_poll_time $TICK * 0.1; 3369 BDB::max_poll_time $TICK * 0.1;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines