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.262 by root, Sat Apr 28 05:55:55 2007 UTC vs.
Revision 1.314 by root, Mon Jul 23 16:53:15 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]
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
333Useful for short background jobs.
334
335=cut
336
337our @SLOT_QUEUE;
338our $SLOT_QUEUE;
339
340$SLOT_QUEUE->cancel if $SLOT_QUEUE;
341$SLOT_QUEUE = Coro::async {
342 my $signal = new Coro::Signal;
343
344 while () {
345 next_job:
346 my $avail = cf::till_tick;
347 if ($avail > 0.01) {
348 for (0 .. $#SLOT_QUEUE) {
349 if ($SLOT_QUEUE[$_][0] < $avail) {
350 my $job = splice @SLOT_QUEUE, $_, 1, ();
351 $job->[2]->send;
352 Coro::cede;
353 goto next_job;
354 }
355 }
356 }
357
358 if (@SLOT_QUEUE) {
359 # we do not use wait_For_tick() as it returns immediately when tick is inactive
360 push @cf::WAIT_FOR_TICK, $signal;
361 $signal->wait;
362 } else {
363 Coro::schedule;
364 }
365 }
366};
367
368sub get_slot($;$) {
369 my ($time, $pri) = @_;
370
371 push @SLOT_QUEUE, [$time, $pri, my $sig = new Coro::Signal];
372 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
373 $SLOT_QUEUE->ready;
374 $sig->wait;
375}
376
296=item cf::async { BLOCK } 377=item cf::async { BLOCK }
297 378
298Currently the same as Coro::async_pool, meaning you cannot use 379Currently the same as Coro::async_pool, meaning you cannot use
299C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 380C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
300thing you are allowed to do is call C<prio> on it. 381thing you are allowed to do is call C<prio> on it.
303 384
304BEGIN { *async = \&Coro::async_pool } 385BEGIN { *async = \&Coro::async_pool }
305 386
306=item cf::sync_job { BLOCK } 387=item cf::sync_job { BLOCK }
307 388
308The design of crossfire+ requires that the main coro ($Coro::main) is 389The design of Crossfire TRT requires that the main coroutine ($Coro::main)
309always able to handle events or runnable, as crossfire+ is only partly 390is 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. 391partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
392acceptable.
311 393
312If it must be done, put the blocking parts into C<sync_job>. This will run 394If 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 395the given BLOCK in another coroutine while waiting for the result. The
314server will be frozen during this time, so the block should either finish 396server will be frozen during this time, so the block should either finish
315fast or be very important. 397fast or be very important.
318 400
319sub sync_job(&) { 401sub sync_job(&) {
320 my ($job) = @_; 402 my ($job) = @_;
321 403
322 if ($Coro::current == $Coro::main) { 404 if ($Coro::current == $Coro::main) {
405 my $time = Event::time;
406
323 # this is the main coro, too bad, we have to block 407 # this is the main coro, too bad, we have to block
324 # till the operation succeeds, freezing the server :/ 408 # till the operation succeeds, freezing the server :/
325 409
326 # TODO: use suspend/resume instead 410 # TODO: use suspend/resume instead
327 # (but this is cancel-safe) 411 # (but this is cancel-safe)
338 422
339 while ($busy) { 423 while ($busy) {
340 Coro::cede or Event::one_event; 424 Coro::cede or Event::one_event;
341 } 425 }
342 426
427 $time = Event::time - $time;
428
429 LOG llevError | logBacktrace, Carp::longmess "long sync job"
430 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
431
432 $tick_start += $time; # do not account sync jobs to server load
433
343 wantarray ? @res : $res[0] 434 wantarray ? @res : $res[0]
344 } else { 435 } else {
345 # we are in another coroutine, how wonderful, everything just works 436 # we are in another coroutine, how wonderful, everything just works
346 437
347 $job->() 438 $job->()
366 $EXT_CORO{$coro+0} = $coro; 457 $EXT_CORO{$coro+0} = $coro;
367 458
368 $coro 459 $coro
369} 460}
370 461
371sub write_runtime { 462=item fork_call { }, $args
372 my $guard = cf::lock_acquire "write_runtime";
373 463
374 my $runtime = "$LOCALDIR/runtime"; 464Executes the given code block with the given arguments in a seperate
465process, returning the results. Everything must be serialisable with
466Coro::Storable. May, of course, block. Note that the executed sub may
467never block itself or use any form of Event handling.
375 468
376 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 469=cut
377 or return;
378 470
379 my $value = $cf::RUNTIME + 90 + 10; 471sub _store_scalar {
380 # 10 is the runtime save interval, for a monotonic clock 472 open my $fh, ">", \my $buf
381 # 60 allows for the watchdog to kill the server. 473 or die "fork_call: cannot open fh-to-buf in child : $!";
382 474 Storable::store_fd $_[0], $fh;
383 (aio_write $fh, 0, (length $value), $value, 0) <= 0
384 and return;
385
386 # always fsync - this file is important
387 aio_fsync $fh
388 and return;
389
390 close $fh 475 close $fh;
391 or return;
392 476
393 aio_rename "$runtime~", $runtime 477 $buf
394 and return; 478}
395 479
480sub fork_call(&@) {
481 my ($cb, @args) = @_;
482
483# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
484# or die "socketpair: $!";
485 pipe my $fh1, my $fh2
486 or die "pipe: $!";
487
488 if (my $pid = fork) {
489 close $fh2;
490
491 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
492 warn "pst<$res>" unless $res =~ /^pst/;
493 $res = Coro::Storable::thaw $res;
494
495 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
496
497 Carp::confess $$res unless "ARRAY" eq ref $res;
498
499 return wantarray ? @$res : $res->[-1];
500 } else {
501 reset_signals;
502 local $SIG{__WARN__};
503 local $SIG{__DIE__};
504 # just in case, this hack effectively disables event
505 # in the child. cleaner and slower would be canceling all watchers,
506 # but this works for the time being.
507 local $Coro::idle;
508 $Coro::current->prio (Coro::PRIO_MAX);
509
510 eval {
511 close $fh1;
512
513 my @res = eval { $cb->(@args) };
514
515 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
516 close $fh2;
517 };
518
519 warn $@ if $@;
520 _exit 0;
396 1 521 }
522}
523
524=item $value = cf::db_get $family => $key
525
526Returns a single value from the environment database.
527
528=item cf::db_put $family => $key => $value
529
530Stores the given C<$value> in the family. It can currently store binary
531data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
532
533=cut
534
535our $DB;
536
537sub db_init {
538 unless ($DB) {
539 $DB = BDB::db_create $DB_ENV;
540
541 cf::sync_job {
542 eval {
543 $DB->set_flags (BDB::CHKSUM);
544
545 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
546 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
547 cf::cleanup "db_open(db): $!" if $!;
548 };
549 cf::cleanup "db_open(db): $@" if $@;
550 };
551 }
552}
553
554sub db_get($$) {
555 my $key = "$_[0]/$_[1]";
556
557 cf::sync_job {
558 BDB::db_get $DB, undef, $key, my $data;
559
560 $! ? ()
561 : $data
562 }
563}
564
565sub db_put($$$) {
566 BDB::dbreq_pri 4;
567 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
568}
569
570=item cf::cache $id => [$paths...], $processversion => $process
571
572Generic caching function that returns the value of the resource $id,
573caching and regenerating as required.
574
575This function can block.
576
577=cut
578
579sub cache {
580 my ($id, $src, $processversion, $process) = @_;
581
582 my $meta =
583 join "\x00",
584 $processversion,
585 map {
586 aio_stat $_
587 and Carp::croak "$_: $!";
588
589 ($_, (stat _)[7,9])
590 } @$src;
591
592 my $dbmeta = db_get cache => "$id/meta";
593 if ($dbmeta ne $meta) {
594 # changed, we may need to process
595
596 my @data;
597 my $md5;
598
599 for (0 .. $#$src) {
600 0 <= aio_load $src->[$_], $data[$_]
601 or Carp::croak "$src->[$_]: $!";
602 }
603
604 # if processing is expensive, check
605 # checksum first
606 if (1) {
607 $md5 =
608 join "\x00",
609 $processversion,
610 map {
611 Coro::cede;
612 ($src->[$_], Digest::MD5::md5_hex $data[$_])
613 } 0.. $#$src;
614
615
616 my $dbmd5 = db_get cache => "$id/md5";
617 if ($dbmd5 eq $md5) {
618 db_put cache => "$id/meta", $meta;
619
620 return db_get cache => "$id/data";
621 }
622 }
623
624 my $t1 = Time::HiRes::time;
625 my $data = $process->(\@data);
626 my $t2 = Time::HiRes::time;
627
628 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
629
630 db_put cache => "$id/data", $data;
631 db_put cache => "$id/md5" , $md5;
632 db_put cache => "$id/meta", $meta;
633
634 return $data;
635 }
636
637 db_get cache => "$id/data"
397} 638}
398 639
399=item cf::datalog type => key => value, ... 640=item cf::datalog type => key => value, ...
400 641
401Log a datalog packet of the given type with the given key-value pairs. 642Log a datalog packet of the given type with the given key-value pairs.
419attach callbacks/event handlers (a collection of which is called an "attachment") 660attach callbacks/event handlers (a collection of which is called an "attachment")
420to it. All such attachable objects support the following methods. 661to it. All such attachable objects support the following methods.
421 662
422In the following description, CLASS can be any of C<global>, C<object> 663In the following description, CLASS can be any of C<global>, C<object>
423C<player>, C<client> or C<map> (i.e. the attachable objects in 664C<player>, C<client> or C<map> (i.e. the attachable objects in
424crossfire+). 665Crossfire TRT).
425 666
426=over 4 667=over 4
427 668
428=item $attachable->attach ($attachment, key => $value...) 669=item $attachable->attach ($attachment, key => $value...)
429 670
592 $registry = $CB_TYPE[$object_type] ||= []; 833 $registry = $CB_TYPE[$object_type] ||= [];
593 834
594 } elsif ($type eq "subtype") { 835 } elsif ($type eq "subtype") {
595 defined $object_type or Carp::croak "subtype specified without type"; 836 defined $object_type or Carp::croak "subtype specified without type";
596 my $object_subtype = shift @arg; 837 my $object_subtype = shift @arg;
597 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 838 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
598 839
599 } elsif ($type eq "package") { 840 } elsif ($type eq "package") {
600 my $pkg = shift @arg; 841 my $pkg = shift @arg;
601 842
602 while (my ($name, $id) = each %cb_id) { 843 while (my ($name, $id) = each %cb_id) {
631 _attach $registry, $klass, @attach; 872 _attach $registry, $klass, @attach;
632 } 873 }
633 874
634 $obj->{$name} = \%arg; 875 $obj->{$name} = \%arg;
635 } else { 876 } else {
636 warn "object uses attachment '$name' that is not available, postponing.\n"; 877 warn "object uses attachment '$name' which is not available, postponing.\n";
637 } 878 }
638 879
639 $obj->{_attachment}{$name} = undef; 880 $obj->{_attachment}{$name} = undef;
640} 881}
641 882
643 if (ref $_[0]) { 884 if (ref $_[0]) {
644 _object_attach @_; 885 _object_attach @_;
645 } else { 886 } else {
646 _attach shift->_attach_registry, @_; 887 _attach shift->_attach_registry, @_;
647 } 888 }
889 _recalc_want;
648}; 890};
649 891
650# all those should be optimised 892# all those should be optimised
651sub cf::attachable::detach { 893sub cf::attachable::detach {
652 my ($obj, $name) = @_; 894 my ($obj, $name) = @_;
655 delete $obj->{_attachment}{$name}; 897 delete $obj->{_attachment}{$name};
656 reattach ($obj); 898 reattach ($obj);
657 } else { 899 } else {
658 Carp::croak "cannot, currently, detach class attachments"; 900 Carp::croak "cannot, currently, detach class attachments";
659 } 901 }
902 _recalc_want;
660}; 903};
661 904
662sub cf::attachable::attached { 905sub cf::attachable::attached {
663 my ($obj, $name) = @_; 906 my ($obj, $name) = @_;
664 907
679 "; 922 ";
680 die if $@; 923 die if $@;
681} 924}
682 925
683our $override; 926our $override;
684our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 927our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
685 928
686sub override { 929sub override {
687 $override = 1; 930 $override = 1;
688 @invoke_results = (); 931 @INVOKE_RESULTS = (@_);
689} 932}
690 933
691sub do_invoke { 934sub do_invoke {
692 my $event = shift; 935 my $event = shift;
693 my $callbacks = shift; 936 my $callbacks = shift;
694 937
695 @invoke_results = (); 938 @INVOKE_RESULTS = ();
696 939
697 local $override; 940 local $override;
698 941
699 for (@$callbacks) { 942 for (@$callbacks) {
700 eval { &{$_->[1]} }; 943 eval { &{$_->[1]} };
717 960
718Generate an object-specific event with the given arguments. 961Generate an object-specific event with the given arguments.
719 962
720This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 963This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
721removed in future versions), and there is no public API to access override 964removed in future versions), and there is no public API to access override
722results (if you must, access C<@cf::invoke_results> directly). 965results (if you must, access C<@cf::INVOKE_RESULTS> directly).
723 966
724=back 967=back
725 968
726=cut 969=cut
727 970
728############################################################################# 971#############################################################################
729# object support 972# object support
973#
974
975sub _can_merge {
976 my ($ob1, $ob2) = @_;
977
978 local $Storable::canonical = 1;
979 my $fob1 = Storable::freeze $ob1;
980 my $fob2 = Storable::freeze $ob2;
981
982 $fob1 eq $fob2
983}
730 984
731sub reattach { 985sub reattach {
732 # basically do the same as instantiate, without calling instantiate 986 # basically do the same as instantiate, without calling instantiate
733 my ($obj) = @_; 987 my ($obj) = @_;
734 988
837 or return; 1091 or return;
838 $av = eval { (Storable::thaw $av)->{objs} }; 1092 $av = eval { (Storable::thaw $av)->{objs} };
839 } 1093 }
840 1094
841 warn sprintf "loading %s (%d)\n", 1095 warn sprintf "loading %s (%d)\n",
842 $filename, length $data, scalar @{$av || []};#d# 1096 $filename, length $data, scalar @{$av || []};
843 return ($data, $av); 1097 return ($data, $av);
844} 1098}
1099
1100=head2 COMMAND CALLBACKS
1101
1102=over 4
1103
1104=cut
845 1105
846############################################################################# 1106#############################################################################
847# command handling &c 1107# command handling &c
848 1108
849=item cf::register_command $name => \&callback($ob,$args); 1109=item cf::register_command $name => \&callback($ob,$args);
862 push @{ $COMMAND{$name} }, [$caller, $cb]; 1122 push @{ $COMMAND{$name} }, [$caller, $cb];
863} 1123}
864 1124
865=item cf::register_extcmd $name => \&callback($pl,$packet); 1125=item cf::register_extcmd $name => \&callback($pl,$packet);
866 1126
867Register a callbackf ro execution when the client sends an extcmd packet. 1127Register a callback for execution when the client sends an (synchronous)
1128extcmd packet. Ext commands will be processed in the order they are
1129received by the server, like other user commands. The first argument is
1130the logged-in player. Ext commands can only be processed after a player
1131has logged in successfully.
868 1132
869If the callback returns something, it is sent back as if reply was being 1133If the callback returns something, it is sent back as if reply was being
870called. 1134called.
871 1135
1136=item cf::register_exticmd $name => \&callback($ns,$packet);
1137
1138Register a callback for execution when the client sends an (asynchronous)
1139exticmd packet. Exti commands are processed by the server as soon as they
1140are received, i.e. out of order w.r.t. other commands. The first argument
1141is a client socket. Exti commands can be received anytime, even before
1142log-in.
1143
1144If the callback returns something, it is sent back as if reply was being
1145called.
1146
872=cut 1147=cut
873 1148
874sub register_extcmd { 1149sub register_extcmd {
875 my ($name, $cb) = @_; 1150 my ($name, $cb) = @_;
876 1151
877 $EXTCMD{$name} = $cb; 1152 $EXTCMD{$name} = $cb;
1153}
1154
1155sub register_exticmd {
1156 my ($name, $cb) = @_;
1157
1158 $EXTICMD{$name} = $cb;
878} 1159}
879 1160
880cf::player->attach ( 1161cf::player->attach (
881 on_command => sub { 1162 on_command => sub {
882 my ($pl, $name, $params) = @_; 1163 my ($pl, $name, $params) = @_;
891 cf::override; 1172 cf::override;
892 }, 1173 },
893 on_extcmd => sub { 1174 on_extcmd => sub {
894 my ($pl, $buf) = @_; 1175 my ($pl, $buf) = @_;
895 1176
896 my $msg = eval { from_json $buf }; 1177 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
897 1178
898 if (ref $msg) { 1179 if (ref $msg) {
899 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1180 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
900 if (my %reply = $cb->($pl, $msg)) { 1181 if (my %reply = $cb->($pl, $msg)) {
901 $pl->ext_reply ($msg->{msgid}, %reply); 1182 $pl->ext_reply ($msg->{msgid}, %reply);
907 1188
908 cf::override; 1189 cf::override;
909 }, 1190 },
910); 1191);
911 1192
912sub load_extension {
913 my ($path) = @_;
914
915 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
916 my $base = $1;
917 my $pkg = $1;
918 $pkg =~ s/[^[:word:]]/_/g;
919 $pkg = "ext::$pkg";
920
921 warn "... loading '$path' into '$pkg'\n";
922
923 open my $fh, "<:utf8", $path
924 or die "$path: $!";
925
926 my $source =
927 "package $pkg; use strict; use utf8;\n"
928 . "#line 1 \"$path\"\n{\n"
929 . (do { local $/; <$fh> })
930 . "\n};\n1";
931
932 unless (eval $source) {
933 my $msg = $@ ? "$path: $@\n"
934 : "extension disabled.\n";
935 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
936 warn $@;
937 warn "mandatory extension failed to load, exiting.\n";
938 exit 1;
939 }
940 die $@;
941 }
942
943 push @EXTS, $pkg;
944}
945
946sub load_extensions { 1193sub load_extensions {
1194 cf::sync_job {
1195 my %todo;
1196
947 for my $ext (<$LIBDIR/*.ext>) { 1197 for my $path (<$LIBDIR/*.ext>) {
948 next unless -r $ext; 1198 next unless -r $path;
949 eval { 1199
950 load_extension $ext; 1200 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1201 my $base = $1;
1202 my $pkg = $1;
1203 $pkg =~ s/[^[:word:]]/_/g;
1204 $pkg = "ext::$pkg";
1205
1206 open my $fh, "<:utf8", $path
1207 or die "$path: $!";
1208
1209 my $source = do { local $/; <$fh> };
1210
1211 my %ext = (
1212 path => $path,
1213 base => $base,
1214 pkg => $pkg,
1215 );
1216
1217 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1218 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1219
1220 $ext{source} =
1221 "package $pkg; use strict; use utf8;\n"
1222 . "#line 1 \"$path\"\n{\n"
1223 . $source
1224 . "\n};\n1";
1225
1226 $todo{$base} = \%ext;
1227 }
1228
1229 my %done;
1230 while (%todo) {
1231 my $progress;
1232
1233 while (my ($k, $v) = each %todo) {
1234 for (split /,\s*/, $v->{meta}{depends}) {
1235 goto skip
1236 unless exists $done{$_};
1237 }
1238
1239 warn "... loading '$k' into '$v->{pkg}'\n";
1240
1241 unless (eval $v->{source}) {
1242 my $msg = $@ ? "$v->{path}: $@\n"
1243 : "$v->{base}: extension inactive.\n";
1244
1245 if (exists $v->{meta}{mandatory}) {
1246 warn $msg;
1247 warn "mandatory extension failed to load, exiting.\n";
1248 exit 1;
1249 }
1250
1251 warn $msg;
1252 }
1253
1254 $done{$k} = delete $todo{$k};
1255 push @EXTS, $v->{pkg};
1256 $progress = 1;
951 1 1257 }
952 } or warn "$ext not loaded: $@"; 1258
1259 skip:
1260 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1261 unless $progress;
1262 }
953 } 1263 };
954} 1264}
955 1265
956############################################################################# 1266#############################################################################
1267
1268=back
957 1269
958=head2 CORE EXTENSIONS 1270=head2 CORE EXTENSIONS
959 1271
960Functions and methods that extend core crossfire objects. 1272Functions and methods that extend core crossfire objects.
961 1273
1149 } 1461 }
1150 1462
1151 \@paths 1463 \@paths
1152} 1464}
1153 1465
1466=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1467
1468Expand crossfire pod fragments into protocol xml.
1469
1470=cut
1471
1472sub expand_cfpod {
1473 ((my $self), (local $_)) = @_;
1474
1475 # escape & and <
1476 s/&/&amp;/g;
1477 s/(?<![BIUGH])</&lt;/g;
1478
1479 # this is buggy, it needs to properly take care of nested <'s
1480
1481 1 while
1482 # replace B<>, I<>, U<> etc.
1483 s/B<([^\>]*)>/<b>$1<\/b>/
1484 || s/I<([^\>]*)>/<i>$1<\/i>/
1485 || s/U<([^\>]*)>/<u>$1<\/u>/
1486 # replace G<male|female> tags
1487 || s{G<([^>|]*)\|([^>]*)>}{
1488 $self->gender ? $2 : $1
1489 }ge
1490 # replace H<hint text>
1491 || s{H<([^\>]*)>}
1492 {
1493 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1494 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1495 "")
1496 [$self->{hintmode}]
1497 }ge;
1498
1499 # create single paragraphs (very hackish)
1500 s/(?<=\S)\n(?=\w)/ /g;
1501
1502 # compress some whitespace
1503 s/\s+\n/\n/g; # ws line-ends
1504 s/\n\n+/\n/g; # double lines
1505 s/^\n+//; # beginning lines
1506 s/\n+$//; # ending lines
1507
1508 $_
1509}
1510
1511sub hintmode {
1512 $_[0]{hintmode} = $_[1] if @_ > 1;
1513 $_[0]{hintmode}
1514}
1515
1154=item $player->ext_reply ($msgid, %msg) 1516=item $player->ext_reply ($msgid, %msg)
1155 1517
1156Sends an ext reply to the player. 1518Sends an ext reply to the player.
1157 1519
1158=cut 1520=cut
1159 1521
1160sub ext_reply($$%) { 1522sub ext_reply($$%) {
1161 my ($self, $id, %msg) = @_; 1523 my ($self, $id, %msg) = @_;
1162 1524
1163 $msg{msgid} = $id; 1525 $msg{msgid} = $id;
1164 1526 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1165 $self->send ("ext " . cf::to_json \%msg);
1166} 1527}
1167 1528
1168=item $player->ext_event ($type, %msg) 1529=item $player->ext_event ($type, %msg)
1169 1530
1170Sends an ext event to the client. 1531Sends an ext event to the client.
1185 1546
1186package cf::region; 1547package cf::region;
1187 1548
1188=item cf::region::find_by_path $path 1549=item cf::region::find_by_path $path
1189 1550
1190Tries to decuce the probable region for a map knowing only its path. 1551Tries to decuce the likely region for a map knowing only its path.
1191 1552
1192=cut 1553=cut
1193 1554
1194sub find_by_path($) { 1555sub find_by_path($) {
1195 my ($path) = @_; 1556 my ($path) = @_;
1196 1557
1197 my ($match, $specificity); 1558 my ($match, $specificity);
1198 1559
1199 for my $region (list) { 1560 for my $region (list) {
1200 if ($region->match && $path =~ $region->match) { 1561 if ($region->{match} && $path =~ $region->{match}) {
1201 ($match, $specificity) = ($region, $region->specificity) 1562 ($match, $specificity) = ($region, $region->specificity)
1202 if $region->specificity > $specificity; 1563 if $region->specificity > $specificity;
1203 } 1564 }
1204 } 1565 }
1205 1566
1269 my ($self, $merge) = @_; 1630 my ($self, $merge) = @_;
1270 1631
1271 # we have to keep some variables in memory intact 1632 # we have to keep some variables in memory intact
1272 local $self->{path}; 1633 local $self->{path};
1273 local $self->{load_path}; 1634 local $self->{load_path};
1274 local $self->{deny_save};
1275 local $self->{deny_reset};
1276 1635
1277 $self->SUPER::thawer_merge ($merge); 1636 $self->SUPER::thawer_merge ($merge);
1278} 1637}
1279 1638
1280sub normalise { 1639sub normalise {
1327 $self->init; # pass $1 etc. 1686 $self->init; # pass $1 etc.
1328 return $self; 1687 return $self;
1329 } 1688 }
1330 } 1689 }
1331 1690
1332 Carp::carp "unable to resolve path '$path' (base '$base')."; 1691 Carp::cluck "unable to resolve path '$path' (base '$base').";
1333 () 1692 ()
1334} 1693}
1335 1694
1336sub init { 1695sub init {
1337 my ($self) = @_; 1696 my ($self) = @_;
1378sub change_all_map_light { 1737sub change_all_map_light {
1379 my ($change) = @_; 1738 my ($change) = @_;
1380 1739
1381 $_->change_map_light ($change) 1740 $_->change_map_light ($change)
1382 for grep $_->outdoor, values %cf::MAP; 1741 for grep $_->outdoor, values %cf::MAP;
1742}
1743
1744sub decay_objects {
1745 my ($self) = @_;
1746
1747 return if $self->{deny_reset};
1748
1749 $self->do_decay_objects;
1383} 1750}
1384 1751
1385sub unlink_save { 1752sub unlink_save {
1386 my ($self) = @_; 1753 my ($self) = @_;
1387 1754
1445 $self->load_header_orig 1812 $self->load_header_orig
1446 or return; 1813 or return;
1447 $self->prepare_orig; 1814 $self->prepare_orig;
1448 } 1815 }
1449 1816
1817 $self->{deny_reset} = 1
1818 if $self->no_reset;
1819
1450 $self->default_region (cf::region::find_by_path $self->{path}) 1820 $self->default_region (cf::region::find_by_path $self->{path})
1451 unless $self->default_region; 1821 unless $self->default_region;
1452 1822
1453 1 1823 1
1454} 1824}
1469 $map->{last_save} = $cf::RUNTIME; 1839 $map->{last_save} = $cf::RUNTIME;
1470 1840
1471 $map->load_header 1841 $map->load_header
1472 or return; 1842 or return;
1473 1843
1474 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1844 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1475 # doing this can freeze the server in a sync job, obviously 1845 # doing this can freeze the server in a sync job, obviously
1476 #$cf::WAIT_FOR_TICK->wait; 1846 #$cf::WAIT_FOR_TICK->wait;
1477 $map->reset; 1847 $map->reset;
1478 undef $guard; 1848 undef $guard;
1479 return find $path; 1849 return find $path;
1546 my ($self, $ob) = @_; 1916 my ($self, $ob) = @_;
1547 1917
1548 return find "~" . $ob->name . "/" . $self->{path} 1918 return find "~" . $ob->name . "/" . $self->{path}
1549 if $self->per_player; 1919 if $self->per_player;
1550 1920
1921# return find "?party/" . $ob->name . "/" . $self->{path}
1922# if $self->per_party;
1923
1551 $self 1924 $self
1552} 1925}
1553 1926
1554# find and load all maps in the 3x3 area around a map 1927# find and load all maps in the 3x3 area around a map
1555sub load_diag { 1928sub load_diag {
1601 1974
1602 undef $MAP_PREFETCH{$path}; 1975 undef $MAP_PREFETCH{$path};
1603 $MAP_PREFETCHER ||= cf::async { 1976 $MAP_PREFETCHER ||= cf::async {
1604 while (%MAP_PREFETCH) { 1977 while (%MAP_PREFETCH) {
1605 for my $path (keys %MAP_PREFETCH) { 1978 for my $path (keys %MAP_PREFETCH) {
1606 my $map = find $path 1979 if (my $map = find $path) {
1607 or next;
1608 $map->load; 1980 $map->load;
1981 }
1609 1982
1610 delete $MAP_PREFETCH{$path}; 1983 delete $MAP_PREFETCH{$path};
1611 } 1984 }
1612 } 1985 }
1613 undef $MAP_PREFETCHER; 1986 undef $MAP_PREFETCHER;
1665 2038
1666sub reset_at { 2039sub reset_at {
1667 my ($self) = @_; 2040 my ($self) = @_;
1668 2041
1669 # TODO: safety, remove and allow resettable per-player maps 2042 # TODO: safety, remove and allow resettable per-player maps
1670 return 1e99 if $self->isa ("ext::map_per_player");#d#
1671 return 1e99 if $self->{deny_reset}; 2043 return 1e99 if $self->{deny_reset};
1672 2044
1673 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2045 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1674 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2046 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1675 2047
1686 my ($self) = @_; 2058 my ($self) = @_;
1687 2059
1688 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2060 my $lock = cf::lock_acquire "map_data:$self->{path}";
1689 2061
1690 return if $self->players; 2062 return if $self->players;
1691 return if $self->isa ("ext::map_per_player");#d#
1692 2063
1693 warn "resetting map ", $self->path;#d# 2064 warn "resetting map ", $self->path;
1694 2065
1695 $self->in_memory (cf::MAP_SWAPPED); 2066 $self->in_memory (cf::MAP_SWAPPED);
1696 2067
1697 # need to save uniques path 2068 # need to save uniques path
1698 unless ($self->{deny_save}) { 2069 unless ($self->{deny_save}) {
1730 $cf::MAP{$self->path} = $self; 2101 $cf::MAP{$self->path} = $self;
1731 2102
1732 $self->reset; # polite request, might not happen 2103 $self->reset; # polite request, might not happen
1733} 2104}
1734 2105
2106=item $maps = cf::map::tmp_maps
2107
2108Returns an arrayref with all map paths of currently instantiated and saved
2109maps. May block.
2110
2111=cut
2112
2113sub tmp_maps() {
2114 [
2115 map {
2116 utf8::decode $_;
2117 /\.map$/
2118 ? normalise $_
2119 : ()
2120 } @{ aio_readdir $TMPDIR or [] }
2121 ]
2122}
2123
2124=item $maps = cf::map::random_maps
2125
2126Returns an arrayref with all map paths of currently instantiated and saved
2127random maps. May block.
2128
2129=cut
2130
2131sub random_maps() {
2132 [
2133 map {
2134 utf8::decode $_;
2135 /\.map$/
2136 ? normalise "?random/$_"
2137 : ()
2138 } @{ aio_readdir $RANDOMDIR or [] }
2139 ]
2140}
2141
1735=item cf::map::unique_maps 2142=item cf::map::unique_maps
1736 2143
1737Returns an arrayref of paths of all shared maps that have 2144Returns an arrayref of paths of all shared maps that have
1738instantiated unique items. May block. 2145instantiated unique items. May block.
1739 2146
1740=cut 2147=cut
1741 2148
1742sub unique_maps() { 2149sub unique_maps() {
1743 my $files = aio_readdir $UNIQUEDIR 2150 [
1744 or return; 2151 map {
1745
1746 my @paths;
1747
1748 for (@$files) {
1749 utf8::decode $_; 2152 utf8::decode $_;
1750 next if /\.pst$/; 2153 /\.map$/
1751 next unless /^$PATH_SEP/o; 2154 ? normalise $_
1752 2155 : ()
1753 push @paths, cf::map::normalise $_; 2156 } @{ aio_readdir $UNIQUEDIR or [] }
1754 } 2157 ]
1755
1756 \@paths
1757} 2158}
1758 2159
1759package cf; 2160package cf;
1760 2161
1761=back 2162=back
1807 2208
1808 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2209 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1809 2210
1810 if ($self->{record_replies}) { 2211 if ($self->{record_replies}) {
1811 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2212 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2213
1812 } else { 2214 } else {
2215 my $pl = $self->contr;
2216
2217 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2218 my $diag = $pl->{npc_dialog};
2219 $diag->{pl}->ext_reply (
2220 $diag->{id},
2221 msgtype => "reply",
2222 msg => $diag->{pl}->expand_cfpod ($msg),
2223 add_topics => []
2224 );
2225
2226 } else {
1813 $msg = $npc->name . " says: $msg" if $npc; 2227 $msg = $npc->name . " says: $msg" if $npc;
1814 $self->message ($msg, $flags); 2228 $self->message ($msg, $flags);
2229 }
1815 } 2230 }
1816} 2231}
1817 2232
1818=item $player_object->may ("access") 2233=item $player_object->may ("access")
1819 2234
1867 $self->deactivate_recursive; 2282 $self->deactivate_recursive;
1868 2283
1869 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2284 return if UNIVERSAL::isa $self->map, "ext::map_link";
1870 2285
1871 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2286 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1872 if $self->map; 2287 if $self->map && $self->map->{path} ne "{link}";
1873 2288
1874 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2289 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1875} 2290}
1876 2291
1877sub cf::object::player::leave_link { 2292sub cf::object::player::leave_link {
1878 my ($self, $map, $x, $y) = @_; 2293 my ($self, $map, $x, $y) = @_;
2294
2295 return unless $self->contr->active;
1879 2296
1880 my $link_pos = delete $self->{_link_pos}; 2297 my $link_pos = delete $self->{_link_pos};
1881 2298
1882 unless ($map) { 2299 unless ($map) {
1883 # restore original map position 2300 # restore original map position
1906 2323
1907 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2324 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1908 $self->enter_map ($map, $x, $y); 2325 $self->enter_map ($map, $x, $y);
1909} 2326}
1910 2327
1911cf::player->attach ( 2328=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1912 on_logout => sub {
1913 my ($pl) = @_;
1914 2329
1915 # abort map switching before logout 2330Moves the player to the given map-path and coordinates by first freezing
1916 if ($pl->ob->{_link_pos}) { 2331her, loading and preparing them map, calling the provided $check callback
1917 cf::sync_job { 2332that has to return the map if sucecssful, and then unfreezes the player on
1918 $pl->ob->leave_link 2333the new (success) or old (failed) map position. In either case, $done will
1919 }; 2334be called at the end of this process.
1920 }
1921 },
1922 on_login => sub {
1923 my ($pl) = @_;
1924 2335
1925 # try to abort aborted map switching on player login :)
1926 # should happen only on crashes
1927 if ($pl->ob->{_link_pos}) {
1928 $pl->ob->enter_link;
1929 (async {
1930 $pl->ob->reply (undef,
1931 "There was an internal problem at your last logout, "
1932 . "the server will try to bring you to your intended destination in a second.",
1933 cf::NDI_RED);
1934 # we need this sleep as the login has a concurrent enter_exit running
1935 # and this sleep increases chances of the player not ending up in scorn
1936 Coro::Timer::sleep 1;
1937 $pl->ob->leave_link;
1938 })->prio (2);
1939 }
1940 },
1941);
1942
1943=item $player_object->goto ($path, $x, $y)
1944
1945=cut 2336=cut
2337
2338our $GOTOGEN;
1946 2339
1947sub cf::object::player::goto { 2340sub cf::object::player::goto {
1948 my ($self, $path, $x, $y) = @_; 2341 my ($self, $path, $x, $y, $check, $done) = @_;
2342
2343 # do generation counting so two concurrent goto's will be executed in-order
2344 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1949 2345
1950 $self->enter_link; 2346 $self->enter_link;
1951 2347
1952 (async { 2348 (async {
1953 my $map = eval { 2349 my $map = eval {
1954 my $map = cf::map::find $path; 2350 my $map = cf::map::find $path;
2351
2352 if ($map) {
1955 $map = $map->customise_for ($self) if $map; 2353 $map = $map->customise_for ($self);
2354 $map = $check->($map) if $check && $map;
2355 } else {
2356 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2357 }
2358
1956 $map 2359 $map
2360 };
2361
2362 if ($@) {
2363 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2364 LOG llevError | logBacktrace, Carp::longmess $@;
1957 } or 2365 }
1958 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1959 2366
2367 if ($gen == $self->{_goto_generation}) {
2368 delete $self->{_goto_generation};
1960 $self->leave_link ($map, $x, $y); 2369 $self->leave_link ($map, $x, $y);
2370 }
2371
2372 $done->() if $done;
1961 })->prio (1); 2373 })->prio (1);
1962} 2374}
1963 2375
1964=item $player_object->enter_exit ($exit_object) 2376=item $player_object->enter_exit ($exit_object)
1965 2377
2034 my $hp = $exit->stats->hp; 2446 my $hp = $exit->stats->hp;
2035 my $sp = $exit->stats->sp; 2447 my $sp = $exit->stats->sp;
2036 2448
2037 $self->enter_link; 2449 $self->enter_link;
2038 2450
2451 # if exit is damned, update players death & WoR home-position
2452 $self->contr->savebed ($slaying, $hp, $sp)
2453 if $exit->flag (FLAG_DAMNED);
2454
2039 (async { 2455 (async {
2040 $self->deactivate_recursive; # just to be sure 2456 $self->deactivate_recursive; # just to be sure
2041 unless (eval { 2457 unless (eval {
2042 $self->goto ($slaying, $hp, $sp); 2458 $self->goto ($slaying, $hp, $sp);
2043 2459
2070 2486
2071 utf8::encode $text; 2487 utf8::encode $text;
2072 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2488 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2073} 2489}
2074 2490
2491=item $client->send_msg ($channel, $msg, $color, [extra...])
2492
2493Send a drawinfo or msg packet to the client, formatting the msg for the
2494client if neccessary. C<$type> should be a string identifying the type of
2495the message, with C<log> being the default. If C<$color> is negative, suppress
2496the message unless the client supports the msg packet.
2497
2498=cut
2499
2500sub cf::client::send_msg {
2501 my ($self, $channel, $msg, $color, @extra) = @_;
2502
2503 $msg = $self->pl->expand_cfpod ($msg);
2504
2505 $color &= ~cf::NDI_UNIQUE; # just in case...
2506
2507 if (ref $channel) {
2508 # send meta info to client, if not yet sent
2509 unless (exists $self->{channel}{$channel->{id}}) {
2510 $self->{channel}{$channel->{id}} = $channel;
2511 $self->ext_event (channel_info => %$channel);
2512 }
2513
2514 $channel = $channel->{id};
2515 }
2516
2517 return unless @extra || length $msg;
2518
2519 if ($self->can_msg) {
2520 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra]));
2521 } else {
2522 # replace some tags by gcfclient-compatible ones
2523 for ($msg) {
2524 1 while
2525 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2526 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2527 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2528 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2529 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2530 }
2531
2532 if ($color >= 0) {
2533 if (0 && $msg =~ /\[/) {
2534 $self->send_packet ("drawextinfo $color 4 0 $msg")
2535 } else {
2536 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2537 $self->send_packet ("drawinfo $color $msg")
2538 }
2539 }
2540 }
2541}
2542
2075=item $client->ext_event ($type, %msg) 2543=item $client->ext_event ($type, %msg)
2076 2544
2077Sends an exti event to the client. 2545Sends an ext event to the client.
2078 2546
2079=cut 2547=cut
2080 2548
2081sub cf::client::ext_event($$%) { 2549sub cf::client::ext_event($$%) {
2082 my ($self, $type, %msg) = @_; 2550 my ($self, $type, %msg) = @_;
2083 2551
2552 return unless $self->extcmd;
2553
2084 $msg{msgtype} = "event_$type"; 2554 $msg{msgtype} = "event_$type";
2085 $self->send_packet ("ext " . cf::to_json \%msg); 2555 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2086} 2556}
2087 2557
2088=item $success = $client->query ($flags, "text", \&cb) 2558=item $success = $client->query ($flags, "text", \&cb)
2089 2559
2090Queues a query to the client, calling the given callback with 2560Queues a query to the client, calling the given callback with
2091the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2561the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2092C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2562C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2093 2563
2094Queries can fail, so check the return code. Or don't, as queries will become 2564Queries can fail, so check the return code. Or don't, as queries will
2095reliable at some point in the future. 2565become reliable at some point in the future.
2096 2566
2097=cut 2567=cut
2098 2568
2099sub cf::client::query { 2569sub cf::client::query {
2100 my ($self, $flags, $text, $cb) = @_; 2570 my ($self, $flags, $text, $cb) = @_;
2108 utf8::encode $text; 2578 utf8::encode $text;
2109 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2579 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2110 2580
2111 $self->send_packet ($self->{query_queue}[0][0]) 2581 $self->send_packet ($self->{query_queue}[0][0])
2112 if @{ $self->{query_queue} } == 1; 2582 if @{ $self->{query_queue} } == 1;
2583
2584 1
2113} 2585}
2114 2586
2115cf::client->attach ( 2587cf::client->attach (
2588 on_connect => sub {
2589 my ($ns) = @_;
2590
2591 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2592 },
2116 on_reply => sub { 2593 on_reply => sub {
2117 my ($ns, $msg) = @_; 2594 my ($ns, $msg) = @_;
2118 2595
2119 # this weird shuffling is so that direct followup queries 2596 # this weird shuffling is so that direct followup queries
2120 # get handled first 2597 # get handled first
2132 } else { 2609 } else {
2133 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2610 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2134 } 2611 }
2135 } 2612 }
2136 }, 2613 },
2614 on_exticmd => sub {
2615 my ($ns, $buf) = @_;
2616
2617 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2618
2619 if (ref $msg) {
2620 if (my $cb = $EXTICMD{$msg->{msgtype}}) {
2621 if (my %reply = $cb->($ns, $msg)) {
2622 $reply{msgid} = $msg->{msgid};
2623 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2624 }
2625 }
2626 } else {
2627 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2628 }
2629
2630 cf::override;
2631 },
2137); 2632);
2138 2633
2139=item $client->async (\&cb) 2634=item $client->async (\&cb)
2140 2635
2141Create a new coroutine, running the specified callback. The coroutine will 2636Create a new coroutine, running the specified callback. The coroutine will
2190 2685
2191=pod 2686=pod
2192 2687
2193The following functions and methods are available within a safe environment: 2688The following functions and methods are available within a safe environment:
2194 2689
2195 cf::object contr pay_amount pay_player map 2690 cf::object
2691 contr pay_amount pay_player map x y force_find force_add
2692 insert remove
2693
2196 cf::object::player player 2694 cf::object::player
2197 cf::player peaceful 2695 player
2198 cf::map trigger 2696
2697 cf::player
2698 peaceful
2699
2700 cf::map
2701 trigger
2199 2702
2200=cut 2703=cut
2201 2704
2202for ( 2705for (
2203 ["cf::object" => qw(contr pay_amount pay_player map)], 2706 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2707 insert remove)],
2204 ["cf::object::player" => qw(player)], 2708 ["cf::object::player" => qw(player)],
2205 ["cf::player" => qw(peaceful)], 2709 ["cf::player" => qw(peaceful)],
2206 ["cf::map" => qw(trigger)], 2710 ["cf::map" => qw(trigger)],
2207) { 2711) {
2208 no strict 'refs'; 2712 no strict 'refs';
2279=back 2783=back
2280 2784
2281=cut 2785=cut
2282 2786
2283############################################################################# 2787#############################################################################
2284
2285=head2 EXTENSION DATABASE SUPPORT
2286
2287Crossfire maintains a very simple database for extension use. It can
2288currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2289convert to/from binary).
2290
2291The parameter C<$family> should best start with the name of the extension
2292using it, it should be unique.
2293
2294=over 4
2295
2296=item $value = cf::db_get $family => $key
2297
2298Returns a single value from the database.
2299
2300=item cf::db_put $family => $key => $value
2301
2302Stores the given C<$value> in the family.
2303
2304=cut
2305
2306our $DB;
2307
2308sub db_init {
2309 unless ($DB) {
2310 $DB = BDB::db_create $DB_ENV;
2311
2312 cf::sync_job {
2313 eval {
2314 $DB->set_flags (BDB::CHKSUM);
2315
2316 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2317 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2318 cf::cleanup "db_open(db): $!" if $!;
2319 };
2320 cf::cleanup "db_open(db): $@" if $@;
2321 };
2322 }
2323}
2324
2325sub db_get($$) {
2326 my $key = "$_[0]/$_[1]";
2327
2328 cf::sync_job {
2329 BDB::db_get $DB, undef, $key, my $data;
2330
2331 $! ? ()
2332 : $data
2333 }
2334}
2335
2336sub db_put($$$) {
2337 BDB::dbreq_pri 4;
2338 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2339}
2340
2341=item cf::cache $id => [$paths...], $processversion => $process
2342
2343Generic caching function that returns the value of the resource $id,
2344caching and regenerating as required.
2345
2346This function can block.
2347
2348=cut
2349
2350sub cache {
2351 my ($id, $src, $processversion, $process) = @_;
2352
2353 my $meta =
2354 join "\x00",
2355 $processversion,
2356 map {
2357 aio_stat $_
2358 and Carp::croak "$_: $!";
2359
2360 ($_, (stat _)[7,9])
2361 } @$src;
2362
2363 my $dbmeta = db_get cache => "$id/meta";
2364 if ($dbmeta ne $meta) {
2365 # changed, we may need to process
2366
2367 my @data;
2368 my $md5;
2369
2370 for (0 .. $#$src) {
2371 0 <= aio_load $src->[$_], $data[$_]
2372 or Carp::croak "$src->[$_]: $!";
2373 }
2374
2375 # if processing is expensive, check
2376 # checksum first
2377 if (1) {
2378 $md5 =
2379 join "\x00",
2380 $processversion,
2381 map {
2382 Coro::cede;
2383 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2384 } 0.. $#$src;
2385
2386
2387 my $dbmd5 = db_get cache => "$id/md5";
2388 if ($dbmd5 eq $md5) {
2389 db_put cache => "$id/meta", $meta;
2390
2391 return db_get cache => "$id/data";
2392 }
2393 }
2394
2395 my $t1 = Time::HiRes::time;
2396 my $data = $process->(\@data);
2397 my $t2 = Time::HiRes::time;
2398
2399 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2400
2401 db_put cache => "$id/data", $data;
2402 db_put cache => "$id/md5" , $md5;
2403 db_put cache => "$id/meta", $meta;
2404
2405 return $data;
2406 }
2407
2408 db_get cache => "$id/data"
2409}
2410
2411=item fork_call { }, $args
2412
2413Executes the given code block with the given arguments in a seperate
2414process, returning the results. Everything must be serialisable with
2415Coro::Storable. May, of course, block. Note that the executed sub may
2416never block itself or use any form of Event handling.
2417
2418=cut
2419
2420sub fork_call(&@) {
2421 my ($cb, @args) = @_;
2422
2423# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2424# or die "socketpair: $!";
2425 pipe my $fh1, my $fh2
2426 or die "pipe: $!";
2427
2428 if (my $pid = fork) {
2429 close $fh2;
2430
2431 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2432 $res = Coro::Storable::thaw $res;
2433
2434 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2435
2436 die $$res unless "ARRAY" eq ref $res;
2437
2438 return wantarray ? @$res : $res->[-1];
2439 } else {
2440 reset_signals;
2441 local $SIG{__WARN__};
2442 local $SIG{__DIE__};
2443 eval {
2444 close $fh1;
2445
2446 my @res = eval { $cb->(@args) };
2447 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2448 };
2449
2450 warn $@ if $@;
2451 _exit 0;
2452 }
2453}
2454
2455
2456
2457#############################################################################
2458# the server's init and main functions 2788# the server's init and main functions
2459 2789
2460sub load_facedata($) { 2790sub load_facedata($) {
2461 my ($path) = @_; 2791 my ($path) = @_;
2462 2792
2474 { 2804 {
2475 my $faces = $facedata->{faceinfo}; 2805 my $faces = $facedata->{faceinfo};
2476 2806
2477 while (my ($face, $info) = each %$faces) { 2807 while (my ($face, $info) = each %$faces) {
2478 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2808 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2479 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2809 cf::face::set_visibility $idx, $info->{visibility};
2810 cf::face::set_magicmap $idx, $info->{magicmap};
2480 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2811 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2481 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2812 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2482 Coro::cede; 2813
2814 cf::cede_to_tick;
2483 } 2815 }
2484 2816
2485 while (my ($face, $info) = each %$faces) { 2817 while (my ($face, $info) = each %$faces) {
2486 next unless $info->{smooth}; 2818 next unless $info->{smooth};
2487 my $idx = cf::face::find $face 2819 my $idx = cf::face::find $face
2488 or next; 2820 or next;
2489 if (my $smooth = cf::face::find $info->{smooth}) { 2821 if (my $smooth = cf::face::find $info->{smooth}) {
2822 cf::face::set_smooth $idx, $smooth;
2490 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2823 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2491 } else { 2824 } else {
2492 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2825 warn "smooth face '$info->{smooth}' not found for face '$face'";
2493 } 2826 }
2494 Coro::cede; 2827
2828 cf::cede_to_tick;
2495 } 2829 }
2496 } 2830 }
2497 2831
2498 { 2832 {
2499 my $anims = $facedata->{animinfo}; 2833 my $anims = $facedata->{animinfo};
2500 2834
2501 while (my ($anim, $info) = each %$anims) { 2835 while (my ($anim, $info) = each %$anims) {
2502 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2836 cf::anim::set $anim, $info->{frames}, $info->{facings};
2503 Coro::cede; 2837 cf::cede_to_tick;
2504 } 2838 }
2505 2839
2506 cf::anim::invalidate_all; # d'oh 2840 cf::anim::invalidate_all; # d'oh
2841 }
2842
2843 {
2844 # TODO: for gcfclient pleasure, we should give resources
2845 # that gcfclient doesn't grok a >10000 face index.
2846 my $res = $facedata->{resource};
2847 my $enc = JSON::XS->new->utf8->canonical;
2848
2849 while (my ($name, $info) = each %$res) {
2850 my $meta = $enc->encode ({
2851 name => $name,
2852 type => $info->{type},
2853 copyright => $info->{copyright}, #TODO#
2854 });
2855
2856 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2857
2858 if ($name =~ /\.jpg$/) {
2859 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack
2860 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack
2861 } else {
2862 my $data = pack "(w/a*)*", $meta, $info->{data};
2863 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2864
2865 cf::face::set_type $idx, 1;
2866 cf::face::set_data $idx, 0, $data, $chk;
2867 }
2868
2869 cf::cede_to_tick;
2870 }
2507 } 2871 }
2508 2872
2509 1 2873 1
2510} 2874}
2511 2875
2512sub reload_regions { 2876sub reload_regions {
2513 load_resource_file "$MAPDIR/regions" 2877 load_resource_file "$MAPDIR/regions"
2514 or die "unable to load regions file\n"; 2878 or die "unable to load regions file\n";
2879
2880 for (cf::region::list) {
2881 $_->{match} = qr/$_->{match}/
2882 if exists $_->{match};
2883 }
2515} 2884}
2516 2885
2517sub reload_facedata { 2886sub reload_facedata {
2518 load_facedata "$DATADIR/facedata" 2887 load_facedata "$DATADIR/facedata"
2519 or die "unable to load facedata\n"; 2888 or die "unable to load facedata\n";
2520} 2889}
2521 2890
2522sub reload_archetypes { 2891sub reload_archetypes {
2523 load_resource_file "$DATADIR/archetypes" 2892 load_resource_file "$DATADIR/archetypes"
2524 or die "unable to load archetypes\n"; 2893 or die "unable to load archetypes\n";
2894 #d# NEED to laod twice to resolve forward references
2895 # this really needs to be done in an extra post-pass
2896 # (which needs to be synchronous, so solve it differently)
2897 load_resource_file "$DATADIR/archetypes"
2898 or die "unable to load archetypes\n";
2525} 2899}
2526 2900
2527sub reload_treasures { 2901sub reload_treasures {
2528 load_resource_file "$DATADIR/treasures" 2902 load_resource_file "$DATADIR/treasures"
2529 or die "unable to load treasurelists\n"; 2903 or die "unable to load treasurelists\n";
2532sub reload_resources { 2906sub reload_resources {
2533 warn "reloading resource files...\n"; 2907 warn "reloading resource files...\n";
2534 2908
2535 reload_regions; 2909 reload_regions;
2536 reload_facedata; 2910 reload_facedata;
2911 #reload_archetypes;#d#
2537 reload_archetypes; 2912 reload_archetypes;
2538 reload_treasures; 2913 reload_treasures;
2539 2914
2540 warn "finished reloading resource files\n"; 2915 warn "finished reloading resource files\n";
2541} 2916}
2598 }, 2973 },
2599 ); 2974 );
2600 } 2975 }
2601} 2976}
2602 2977
2978sub write_runtime {
2979 my $runtime = "$LOCALDIR/runtime";
2980
2981 # first touch the runtime file to show we are still running:
2982 # the fsync below can take a very very long time.
2983
2984 IO::AIO::aio_utime $runtime, undef, undef;
2985
2986 my $guard = cf::lock_acquire "write_runtime";
2987
2988 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
2989 or return;
2990
2991 my $value = $cf::RUNTIME + 90 + 10;
2992 # 10 is the runtime save interval, for a monotonic clock
2993 # 60 allows for the watchdog to kill the server.
2994
2995 (aio_write $fh, 0, (length $value), $value, 0) <= 0
2996 and return;
2997
2998 # always fsync - this file is important
2999 aio_fsync $fh
3000 and return;
3001
3002 # touch it again to show we are up-to-date
3003 aio_utime $fh, undef, undef;
3004
3005 close $fh
3006 or return;
3007
3008 aio_rename "$runtime~", $runtime
3009 and return;
3010
3011 warn "runtime file written.\n";
3012
3013 1
3014}
3015
2603sub emergency_save() { 3016sub emergency_save() {
2604 my $freeze_guard = cf::freeze_mainloop; 3017 my $freeze_guard = cf::freeze_mainloop;
2605 3018
2606 warn "enter emergency perl save\n"; 3019 warn "enter emergency perl save\n";
2607 3020
2682 %EXT_CORO = (); 3095 %EXT_CORO = ();
2683 3096
2684 warn "removing commands"; 3097 warn "removing commands";
2685 %COMMAND = (); 3098 %COMMAND = ();
2686 3099
2687 warn "removing ext commands"; 3100 warn "removing ext/exti commands";
2688 %EXTCMD = (); 3101 %EXTCMD = ();
3102 %EXTICMD = ();
2689 3103
2690 warn "unloading/nuking all extensions"; 3104 warn "unloading/nuking all extensions";
2691 for my $pkg (@EXTS) { 3105 for my $pkg (@EXTS) {
2692 warn "... unloading $pkg"; 3106 warn "... unloading $pkg";
2693 3107
2811 my $signal = new Coro::Signal; 3225 my $signal = new Coro::Signal;
2812 push @WAIT_FOR_TICK_BEGIN, $signal; 3226 push @WAIT_FOR_TICK_BEGIN, $signal;
2813 $signal->wait; 3227 $signal->wait;
2814} 3228}
2815 3229
3230 my $min = 1e6;#d#
3231 my $avg = 10;
2816$TICK_WATCHER = Event->timer ( 3232$TICK_WATCHER = Event->timer (
2817 reentrant => 0, 3233 reentrant => 0,
2818 parked => 1, 3234 parked => 1,
2819 prio => 0, 3235 prio => 0,
2820 at => $NEXT_TICK || $TICK, 3236 at => $NEXT_TICK || $TICK,
2824 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3240 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2825 unless ++$bug_warning > 10; 3241 unless ++$bug_warning > 10;
2826 return; 3242 return;
2827 } 3243 }
2828 3244
2829 $NOW = Event::time; 3245 $NOW = $tick_start = Event::time;
2830 3246
2831 cf::server_tick; # one server iteration 3247 cf::server_tick; # one server iteration
3248
3249 0 && sync_job {#d#
3250 for(1..10) {
3251 my $t = Event::time;
3252 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3253 or die;
3254
3255 $map->width (50);
3256 $map->height (50);
3257 $map->alloc;
3258 $map->_load_objects ("/tmp/x.map", 1);
3259 my $t = Event::time - $t;
3260
3261 #next unless $t < 0.0013;#d#
3262 if ($t < $min) {
3263 $min = $t;
3264 }
3265 $avg = $avg * 0.99 + $t * 0.01;
3266 }
3267 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3268 exit 0;
3269 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3270 };
2832 3271
2833 $RUNTIME += $TICK; 3272 $RUNTIME += $TICK;
2834 $NEXT_TICK += $TICK; 3273 $NEXT_TICK += $TICK;
2835 3274
2836 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3275 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2842 } 3281 }
2843 3282
2844# my $AFTER = Event::time; 3283# my $AFTER = Event::time;
2845# warn $AFTER - $NOW;#d# 3284# warn $AFTER - $NOW;#d#
2846 3285
3286 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3287 $sig->send;
3288 }
3289 while (my $sig = shift @WAIT_FOR_TICK) {
3290 $sig->send;
3291 }
3292
3293 $NOW = Event::time;
3294
2847 # if we are delayed by four ticks or more, skip them all 3295 # if we are delayed by four ticks or more, skip them all
2848 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3296 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2849 3297
2850 $TICK_WATCHER->at ($NEXT_TICK); 3298 $TICK_WATCHER->at ($NEXT_TICK);
2851 $TICK_WATCHER->start; 3299 $TICK_WATCHER->start;
2852 3300
2853 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3301 $LOAD = ($NOW - $tick_start) / $TICK;
2854 $sig->send; 3302 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2855 }
2856 while (my $sig = shift @WAIT_FOR_TICK) {
2857 $sig->send;
2858 }
2859 3303
2860 _post_tick; 3304 _post_tick;
3305
3306
2861 }, 3307 },
2862); 3308);
2863 3309
2864{ 3310{
2865 BDB::max_poll_time $TICK * 0.1; 3311 BDB::max_poll_time $TICK * 0.1;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines