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.264 by root, Sun May 6 05:44:48 2007 UTC vs.
Revision 1.318 by root, Tue Jul 24 04:55:34 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 $runtime = "$LOCALDIR/runtime";
373 469
374 # first touch the runtime file to show we are still running: 470Executes the given code block with the given arguments in a seperate
375 # the fsync below can take a very very long time. 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.
376 474
377 warn "touching runtime...\n";#d# 475=cut
378 if (my $fh = aio_open $runtime, O_WRONLY, 0) {
379 utime undef, undef, $fh;
380 }
381 476
382 my $guard = cf::lock_acquire "write_runtime"; 477sub _store_scalar {
383 478 open my $fh, ">", \my $buf
384 warn "starting to write runtime...\n";#d# 479 or die "fork_call: cannot open fh-to-buf in child : $!";
385 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 480 Storable::store_fd $_[0], $fh;
386 or return;
387
388 my $value = $cf::RUNTIME + 90 + 10;
389 # 10 is the runtime save interval, for a monotonic clock
390 # 60 allows for the watchdog to kill the server.
391
392 (aio_write $fh, 0, (length $value), $value, 0) <= 0
393 and return;
394
395 # always fsync - this file is important
396 aio_fsync $fh
397 and return;
398
399 # touch it again to show we are up-to-date
400 utime undef, undef, $fh;
401
402 close $fh 481 close $fh;
403 or return;
404 482
405 aio_rename "$runtime~", $runtime 483 $buf
406 and return; 484}
407 485
408 warn "... done writing runtime.\n";#d# 486sub fork_call(&@) {
487 my ($cb, @args) = @_;
409 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;
410 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"
411} 644}
412 645
413=item cf::datalog type => key => value, ... 646=item cf::datalog type => key => value, ...
414 647
415Log 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.
433attach callbacks/event handlers (a collection of which is called an "attachment") 666attach callbacks/event handlers (a collection of which is called an "attachment")
434to it. All such attachable objects support the following methods. 667to it. All such attachable objects support the following methods.
435 668
436In 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>
437C<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
438crossfire+). 671Crossfire TRT).
439 672
440=over 4 673=over 4
441 674
442=item $attachable->attach ($attachment, key => $value...) 675=item $attachable->attach ($attachment, key => $value...)
443 676
606 $registry = $CB_TYPE[$object_type] ||= []; 839 $registry = $CB_TYPE[$object_type] ||= [];
607 840
608 } elsif ($type eq "subtype") { 841 } elsif ($type eq "subtype") {
609 defined $object_type or Carp::croak "subtype specified without type"; 842 defined $object_type or Carp::croak "subtype specified without type";
610 my $object_subtype = shift @arg; 843 my $object_subtype = shift @arg;
611 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 844 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
612 845
613 } elsif ($type eq "package") { 846 } elsif ($type eq "package") {
614 my $pkg = shift @arg; 847 my $pkg = shift @arg;
615 848
616 while (my ($name, $id) = each %cb_id) { 849 while (my ($name, $id) = each %cb_id) {
645 _attach $registry, $klass, @attach; 878 _attach $registry, $klass, @attach;
646 } 879 }
647 880
648 $obj->{$name} = \%arg; 881 $obj->{$name} = \%arg;
649 } else { 882 } else {
650 warn "object uses attachment '$name' that is not available, postponing.\n"; 883 warn "object uses attachment '$name' which is not available, postponing.\n";
651 } 884 }
652 885
653 $obj->{_attachment}{$name} = undef; 886 $obj->{_attachment}{$name} = undef;
654} 887}
655 888
657 if (ref $_[0]) { 890 if (ref $_[0]) {
658 _object_attach @_; 891 _object_attach @_;
659 } else { 892 } else {
660 _attach shift->_attach_registry, @_; 893 _attach shift->_attach_registry, @_;
661 } 894 }
895 _recalc_want;
662}; 896};
663 897
664# all those should be optimised 898# all those should be optimised
665sub cf::attachable::detach { 899sub cf::attachable::detach {
666 my ($obj, $name) = @_; 900 my ($obj, $name) = @_;
669 delete $obj->{_attachment}{$name}; 903 delete $obj->{_attachment}{$name};
670 reattach ($obj); 904 reattach ($obj);
671 } else { 905 } else {
672 Carp::croak "cannot, currently, detach class attachments"; 906 Carp::croak "cannot, currently, detach class attachments";
673 } 907 }
908 _recalc_want;
674}; 909};
675 910
676sub cf::attachable::attached { 911sub cf::attachable::attached {
677 my ($obj, $name) = @_; 912 my ($obj, $name) = @_;
678 913
693 "; 928 ";
694 die if $@; 929 die if $@;
695} 930}
696 931
697our $override; 932our $override;
698our @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?
699 934
700sub override { 935sub override {
701 $override = 1; 936 $override = 1;
702 @invoke_results = (); 937 @INVOKE_RESULTS = (@_);
703} 938}
704 939
705sub do_invoke { 940sub do_invoke {
706 my $event = shift; 941 my $event = shift;
707 my $callbacks = shift; 942 my $callbacks = shift;
708 943
709 @invoke_results = (); 944 @INVOKE_RESULTS = ();
710 945
711 local $override; 946 local $override;
712 947
713 for (@$callbacks) { 948 for (@$callbacks) {
714 eval { &{$_->[1]} }; 949 eval { &{$_->[1]} };
731 966
732Generate an object-specific event with the given arguments. 967Generate an object-specific event with the given arguments.
733 968
734This 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
735removed 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
736results (if you must, access C<@cf::invoke_results> directly). 971results (if you must, access C<@cf::INVOKE_RESULTS> directly).
737 972
738=back 973=back
739 974
740=cut 975=cut
741 976
742############################################################################# 977#############################################################################
743# 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}
744 990
745sub reattach { 991sub reattach {
746 # basically do the same as instantiate, without calling instantiate 992 # basically do the same as instantiate, without calling instantiate
747 my ($obj) = @_; 993 my ($obj) = @_;
748 994
851 or return; 1097 or return;
852 $av = eval { (Storable::thaw $av)->{objs} }; 1098 $av = eval { (Storable::thaw $av)->{objs} };
853 } 1099 }
854 1100
855 warn sprintf "loading %s (%d)\n", 1101 warn sprintf "loading %s (%d)\n",
856 $filename, length $data, scalar @{$av || []};#d# 1102 $filename, length $data, scalar @{$av || []};
857 return ($data, $av); 1103 return ($data, $av);
858} 1104}
1105
1106=head2 COMMAND CALLBACKS
1107
1108=over 4
1109
1110=cut
859 1111
860############################################################################# 1112#############################################################################
861# command handling &c 1113# command handling &c
862 1114
863=item cf::register_command $name => \&callback($ob,$args); 1115=item cf::register_command $name => \&callback($ob,$args);
876 push @{ $COMMAND{$name} }, [$caller, $cb]; 1128 push @{ $COMMAND{$name} }, [$caller, $cb];
877} 1129}
878 1130
879=item cf::register_extcmd $name => \&callback($pl,$packet); 1131=item cf::register_extcmd $name => \&callback($pl,$packet);
880 1132
881Register 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.
882 1138
883If 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
884called. 1140called.
885 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
886=cut 1153=cut
887 1154
888sub register_extcmd { 1155sub register_extcmd {
889 my ($name, $cb) = @_; 1156 my ($name, $cb) = @_;
890 1157
891 $EXTCMD{$name} = $cb; 1158 $EXTCMD{$name} = $cb;
1159}
1160
1161sub register_exticmd {
1162 my ($name, $cb) = @_;
1163
1164 $EXTICMD{$name} = $cb;
892} 1165}
893 1166
894cf::player->attach ( 1167cf::player->attach (
895 on_command => sub { 1168 on_command => sub {
896 my ($pl, $name, $params) = @_; 1169 my ($pl, $name, $params) = @_;
905 cf::override; 1178 cf::override;
906 }, 1179 },
907 on_extcmd => sub { 1180 on_extcmd => sub {
908 my ($pl, $buf) = @_; 1181 my ($pl, $buf) = @_;
909 1182
910 my $msg = eval { from_json $buf }; 1183 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
911 1184
912 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
913 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1191 if (my $cb = $EXTCMD{$type}) {
914 if (my %reply = $cb->($pl, $msg)) { 1192 my @reply = $cb->($pl, @payload);
1193
915 $pl->ext_reply ($msg->{msgid}, %reply); 1194 $pl->ext_reply ($reply, @reply)
916 } 1195 if $reply;
917 } 1196 }
918 } else { 1197 } else {
919 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
920 } 1199 }
921 1200
922 cf::override; 1201 cf::override;
923 }, 1202 },
924); 1203);
925 1204
926sub load_extension {
927 my ($path) = @_;
928
929 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
930 my $base = $1;
931 my $pkg = $1;
932 $pkg =~ s/[^[:word:]]/_/g;
933 $pkg = "ext::$pkg";
934
935 warn "... loading '$path' into '$pkg'\n";
936
937 open my $fh, "<:utf8", $path
938 or die "$path: $!";
939
940 my $source =
941 "package $pkg; use strict; use utf8;\n"
942 . "#line 1 \"$path\"\n{\n"
943 . (do { local $/; <$fh> })
944 . "\n};\n1";
945
946 unless (eval $source) {
947 my $msg = $@ ? "$path: $@\n"
948 : "extension disabled.\n";
949 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
950 warn $@;
951 warn "mandatory extension failed to load, exiting.\n";
952 exit 1;
953 }
954 die $@;
955 }
956
957 push @EXTS, $pkg;
958}
959
960sub load_extensions { 1205sub load_extensions {
1206 cf::sync_job {
1207 my %todo;
1208
961 for my $ext (<$LIBDIR/*.ext>) { 1209 for my $path (<$LIBDIR/*.ext>) {
962 next unless -r $ext; 1210 next unless -r $path;
963 eval { 1211
964 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;
965 1 1269 }
966 } or warn "$ext not loaded: $@"; 1270
1271 skip:
1272 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1273 unless $progress;
1274 }
967 } 1275 };
968} 1276}
969 1277
970############################################################################# 1278#############################################################################
1279
1280=back
971 1281
972=head2 CORE EXTENSIONS 1282=head2 CORE EXTENSIONS
973 1283
974Functions and methods that extend core crossfire objects. 1284Functions and methods that extend core crossfire objects.
975 1285
1163 } 1473 }
1164 1474
1165 \@paths 1475 \@paths
1166} 1476}
1167 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
1168=item $player->ext_reply ($msgid, %msg) 1528=item $player->ext_reply ($msgid, @msg)
1169 1529
1170Sends an ext reply to the player. 1530Sends an ext reply to the player.
1171 1531
1172=cut 1532=cut
1173 1533
1174sub ext_reply($$%) { 1534sub ext_reply($$@) {
1175 my ($self, $id, %msg) = @_; 1535 my ($self, $id, @msg) = @_;
1176 1536
1177 $msg{msgid} = $id; 1537 if ($self->ns->extcmd == 2) {
1178 1538 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1179 $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 }
1180} 1544}
1181 1545
1182=item $player->ext_event ($type, %msg) 1546=item $player->ext_msg ($type, @msg)
1183 1547
1184Sends an ext event to the client. 1548Sends an ext event to the client.
1185 1549
1186=cut 1550=cut
1187 1551
1188sub ext_event($$%) { 1552sub ext_msg($$@) {
1189 my ($self, $type, %msg) = @_; 1553 my ($self, $type, @msg) = @_;
1190 1554
1191 $self->ns->ext_event ($type, %msg); 1555 $self->ns->ext_msg ($type, @msg);
1192} 1556}
1193 1557
1194=head3 cf::region 1558=head3 cf::region
1195 1559
1196=over 4 1560=over 4
1199 1563
1200package cf::region; 1564package cf::region;
1201 1565
1202=item cf::region::find_by_path $path 1566=item cf::region::find_by_path $path
1203 1567
1204Tries 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.
1205 1569
1206=cut 1570=cut
1207 1571
1208sub find_by_path($) { 1572sub find_by_path($) {
1209 my ($path) = @_; 1573 my ($path) = @_;
1210 1574
1211 my ($match, $specificity); 1575 my ($match, $specificity);
1212 1576
1213 for my $region (list) { 1577 for my $region (list) {
1214 if ($region->match && $path =~ $region->match) { 1578 if ($region->{match} && $path =~ $region->{match}) {
1215 ($match, $specificity) = ($region, $region->specificity) 1579 ($match, $specificity) = ($region, $region->specificity)
1216 if $region->specificity > $specificity; 1580 if $region->specificity > $specificity;
1217 } 1581 }
1218 } 1582 }
1219 1583
1283 my ($self, $merge) = @_; 1647 my ($self, $merge) = @_;
1284 1648
1285 # we have to keep some variables in memory intact 1649 # we have to keep some variables in memory intact
1286 local $self->{path}; 1650 local $self->{path};
1287 local $self->{load_path}; 1651 local $self->{load_path};
1288 local $self->{deny_save};
1289 local $self->{deny_reset};
1290 1652
1291 $self->SUPER::thawer_merge ($merge); 1653 $self->SUPER::thawer_merge ($merge);
1292} 1654}
1293 1655
1294sub normalise { 1656sub normalise {
1341 $self->init; # pass $1 etc. 1703 $self->init; # pass $1 etc.
1342 return $self; 1704 return $self;
1343 } 1705 }
1344 } 1706 }
1345 1707
1346 Carp::carp "unable to resolve path '$path' (base '$base')."; 1708 Carp::cluck "unable to resolve path '$path' (base '$base').";
1347 () 1709 ()
1348} 1710}
1349 1711
1350sub init { 1712sub init {
1351 my ($self) = @_; 1713 my ($self) = @_;
1392sub change_all_map_light { 1754sub change_all_map_light {
1393 my ($change) = @_; 1755 my ($change) = @_;
1394 1756
1395 $_->change_map_light ($change) 1757 $_->change_map_light ($change)
1396 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;
1397} 1767}
1398 1768
1399sub unlink_save { 1769sub unlink_save {
1400 my ($self) = @_; 1770 my ($self) = @_;
1401 1771
1459 $self->load_header_orig 1829 $self->load_header_orig
1460 or return; 1830 or return;
1461 $self->prepare_orig; 1831 $self->prepare_orig;
1462 } 1832 }
1463 1833
1834 $self->{deny_reset} = 1
1835 if $self->no_reset;
1836
1464 $self->default_region (cf::region::find_by_path $self->{path}) 1837 $self->default_region (cf::region::find_by_path $self->{path})
1465 unless $self->default_region; 1838 unless $self->default_region;
1466 1839
1467 1 1840 1
1468} 1841}
1483 $map->{last_save} = $cf::RUNTIME; 1856 $map->{last_save} = $cf::RUNTIME;
1484 1857
1485 $map->load_header 1858 $map->load_header
1486 or return; 1859 or return;
1487 1860
1488 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1861 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1489 # doing this can freeze the server in a sync job, obviously 1862 # doing this can freeze the server in a sync job, obviously
1490 #$cf::WAIT_FOR_TICK->wait; 1863 #$cf::WAIT_FOR_TICK->wait;
1491 $map->reset; 1864 $map->reset;
1492 undef $guard; 1865 undef $guard;
1493 return find $path; 1866 return find $path;
1560 my ($self, $ob) = @_; 1933 my ($self, $ob) = @_;
1561 1934
1562 return find "~" . $ob->name . "/" . $self->{path} 1935 return find "~" . $ob->name . "/" . $self->{path}
1563 if $self->per_player; 1936 if $self->per_player;
1564 1937
1938# return find "?party/" . $ob->name . "/" . $self->{path}
1939# if $self->per_party;
1940
1565 $self 1941 $self
1566} 1942}
1567 1943
1568# find and load all maps in the 3x3 area around a map 1944# find and load all maps in the 3x3 area around a map
1569sub load_diag { 1945sub load_diag {
1615 1991
1616 undef $MAP_PREFETCH{$path}; 1992 undef $MAP_PREFETCH{$path};
1617 $MAP_PREFETCHER ||= cf::async { 1993 $MAP_PREFETCHER ||= cf::async {
1618 while (%MAP_PREFETCH) { 1994 while (%MAP_PREFETCH) {
1619 for my $path (keys %MAP_PREFETCH) { 1995 for my $path (keys %MAP_PREFETCH) {
1620 my $map = find $path 1996 if (my $map = find $path) {
1621 or next;
1622 $map->load; 1997 $map->load;
1998 }
1623 1999
1624 delete $MAP_PREFETCH{$path}; 2000 delete $MAP_PREFETCH{$path};
1625 } 2001 }
1626 } 2002 }
1627 undef $MAP_PREFETCHER; 2003 undef $MAP_PREFETCHER;
1679 2055
1680sub reset_at { 2056sub reset_at {
1681 my ($self) = @_; 2057 my ($self) = @_;
1682 2058
1683 # TODO: safety, remove and allow resettable per-player maps 2059 # TODO: safety, remove and allow resettable per-player maps
1684 return 1e99 if $self->isa ("ext::map_per_player");#d#
1685 return 1e99 if $self->{deny_reset}; 2060 return 1e99 if $self->{deny_reset};
1686 2061
1687 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2062 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1688 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2063 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1689 2064
1700 my ($self) = @_; 2075 my ($self) = @_;
1701 2076
1702 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2077 my $lock = cf::lock_acquire "map_data:$self->{path}";
1703 2078
1704 return if $self->players; 2079 return if $self->players;
1705 return if $self->isa ("ext::map_per_player");#d#
1706 2080
1707 warn "resetting map ", $self->path;#d# 2081 warn "resetting map ", $self->path;
1708 2082
1709 $self->in_memory (cf::MAP_SWAPPED); 2083 $self->in_memory (cf::MAP_SWAPPED);
1710 2084
1711 # need to save uniques path 2085 # need to save uniques path
1712 unless ($self->{deny_save}) { 2086 unless ($self->{deny_save}) {
1744 $cf::MAP{$self->path} = $self; 2118 $cf::MAP{$self->path} = $self;
1745 2119
1746 $self->reset; # polite request, might not happen 2120 $self->reset; # polite request, might not happen
1747} 2121}
1748 2122
2123=item $maps = cf::map::tmp_maps
2124
2125Returns an arrayref with all map paths of currently instantiated and saved
2126maps. May block.
2127
2128=cut
2129
2130sub tmp_maps() {
2131 [
2132 map {
2133 utf8::decode $_;
2134 /\.map$/
2135 ? normalise $_
2136 : ()
2137 } @{ aio_readdir $TMPDIR or [] }
2138 ]
2139}
2140
2141=item $maps = cf::map::random_maps
2142
2143Returns an arrayref with all map paths of currently instantiated and saved
2144random maps. May block.
2145
2146=cut
2147
2148sub random_maps() {
2149 [
2150 map {
2151 utf8::decode $_;
2152 /\.map$/
2153 ? normalise "?random/$_"
2154 : ()
2155 } @{ aio_readdir $RANDOMDIR or [] }
2156 ]
2157}
2158
1749=item cf::map::unique_maps 2159=item cf::map::unique_maps
1750 2160
1751Returns an arrayref of paths of all shared maps that have 2161Returns an arrayref of paths of all shared maps that have
1752instantiated unique items. May block. 2162instantiated unique items. May block.
1753 2163
1754=cut 2164=cut
1755 2165
1756sub unique_maps() { 2166sub unique_maps() {
1757 my $files = aio_readdir $UNIQUEDIR 2167 [
1758 or return; 2168 map {
1759
1760 my @paths;
1761
1762 for (@$files) {
1763 utf8::decode $_; 2169 utf8::decode $_;
1764 next if /\.pst$/; 2170 /\.map$/
1765 next unless /^$PATH_SEP/o; 2171 ? normalise $_
1766 2172 : ()
1767 push @paths, cf::map::normalise $_; 2173 } @{ aio_readdir $UNIQUEDIR or [] }
1768 } 2174 ]
1769
1770 \@paths
1771} 2175}
1772 2176
1773package cf; 2177package cf;
1774 2178
1775=back 2179=back
1821 2225
1822 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2226 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1823 2227
1824 if ($self->{record_replies}) { 2228 if ($self->{record_replies}) {
1825 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2229 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2230
1826 } else { 2231 } else {
2232 my $pl = $self->contr;
2233
2234 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2235 my $dialog = $pl->{npc_dialog};
2236 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2237
2238 } else {
1827 $msg = $npc->name . " says: $msg" if $npc; 2239 $msg = $npc->name . " says: $msg" if $npc;
1828 $self->message ($msg, $flags); 2240 $self->message ($msg, $flags);
2241 }
1829 } 2242 }
1830} 2243}
1831 2244
1832=item $player_object->may ("access") 2245=item $player_object->may ("access")
1833 2246
1881 $self->deactivate_recursive; 2294 $self->deactivate_recursive;
1882 2295
1883 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2296 return if UNIVERSAL::isa $self->map, "ext::map_link";
1884 2297
1885 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2298 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1886 if $self->map; 2299 if $self->map && $self->map->{path} ne "{link}";
1887 2300
1888 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2301 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1889} 2302}
1890 2303
1891sub cf::object::player::leave_link { 2304sub cf::object::player::leave_link {
1892 my ($self, $map, $x, $y) = @_; 2305 my ($self, $map, $x, $y) = @_;
2306
2307 return unless $self->contr->active;
1893 2308
1894 my $link_pos = delete $self->{_link_pos}; 2309 my $link_pos = delete $self->{_link_pos};
1895 2310
1896 unless ($map) { 2311 unless ($map) {
1897 # restore original map position 2312 # restore original map position
1920 2335
1921 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2336 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1922 $self->enter_map ($map, $x, $y); 2337 $self->enter_map ($map, $x, $y);
1923} 2338}
1924 2339
1925cf::player->attach ( 2340=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1926 on_logout => sub {
1927 my ($pl) = @_;
1928 2341
1929 # abort map switching before logout 2342Moves the player to the given map-path and coordinates by first freezing
1930 if ($pl->ob->{_link_pos}) { 2343her, loading and preparing them map, calling the provided $check callback
1931 cf::sync_job { 2344that has to return the map if sucecssful, and then unfreezes the player on
1932 $pl->ob->leave_link 2345the new (success) or old (failed) map position. In either case, $done will
1933 }; 2346be called at the end of this process.
1934 }
1935 },
1936 on_login => sub {
1937 my ($pl) = @_;
1938 2347
1939 # try to abort aborted map switching on player login :)
1940 # should happen only on crashes
1941 if ($pl->ob->{_link_pos}) {
1942 $pl->ob->enter_link;
1943 (async {
1944 $pl->ob->reply (undef,
1945 "There was an internal problem at your last logout, "
1946 . "the server will try to bring you to your intended destination in a second.",
1947 cf::NDI_RED);
1948 # we need this sleep as the login has a concurrent enter_exit running
1949 # and this sleep increases chances of the player not ending up in scorn
1950 Coro::Timer::sleep 1;
1951 $pl->ob->leave_link;
1952 })->prio (2);
1953 }
1954 },
1955);
1956
1957=item $player_object->goto ($path, $x, $y)
1958
1959=cut 2348=cut
2349
2350our $GOTOGEN;
1960 2351
1961sub cf::object::player::goto { 2352sub cf::object::player::goto {
1962 my ($self, $path, $x, $y) = @_; 2353 my ($self, $path, $x, $y, $check, $done) = @_;
2354
2355 # do generation counting so two concurrent goto's will be executed in-order
2356 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1963 2357
1964 $self->enter_link; 2358 $self->enter_link;
1965 2359
1966 (async { 2360 (async {
1967 my $map = eval { 2361 my $map = eval {
1968 my $map = cf::map::find $path; 2362 my $map = cf::map::find $path;
2363
2364 if ($map) {
1969 $map = $map->customise_for ($self) if $map; 2365 $map = $map->customise_for ($self);
2366 $map = $check->($map) if $check && $map;
2367 } else {
2368 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2369 }
2370
1970 $map 2371 $map
2372 };
2373
2374 if ($@) {
2375 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2376 LOG llevError | logBacktrace, Carp::longmess $@;
1971 } or 2377 }
1972 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1973 2378
2379 if ($gen == $self->{_goto_generation}) {
2380 delete $self->{_goto_generation};
1974 $self->leave_link ($map, $x, $y); 2381 $self->leave_link ($map, $x, $y);
2382 }
2383
2384 $done->() if $done;
1975 })->prio (1); 2385 })->prio (1);
1976} 2386}
1977 2387
1978=item $player_object->enter_exit ($exit_object) 2388=item $player_object->enter_exit ($exit_object)
1979 2389
2048 my $hp = $exit->stats->hp; 2458 my $hp = $exit->stats->hp;
2049 my $sp = $exit->stats->sp; 2459 my $sp = $exit->stats->sp;
2050 2460
2051 $self->enter_link; 2461 $self->enter_link;
2052 2462
2463 # if exit is damned, update players death & WoR home-position
2464 $self->contr->savebed ($slaying, $hp, $sp)
2465 if $exit->flag (FLAG_DAMNED);
2466
2053 (async { 2467 (async {
2054 $self->deactivate_recursive; # just to be sure 2468 $self->deactivate_recursive; # just to be sure
2055 unless (eval { 2469 unless (eval {
2056 $self->goto ($slaying, $hp, $sp); 2470 $self->goto ($slaying, $hp, $sp);
2057 2471
2084 2498
2085 utf8::encode $text; 2499 utf8::encode $text;
2086 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2500 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2087} 2501}
2088 2502
2503=item $client->send_msg ($channel, $msg, $color, [extra...])
2504
2505Send a drawinfo or msg packet to the client, formatting the msg for the
2506client if neccessary. C<$type> should be a string identifying the type of
2507the message, with C<log> being the default. If C<$color> is negative, suppress
2508the message unless the client supports the msg packet.
2509
2510=cut
2511
2512sub cf::client::send_msg {
2513 my ($self, $channel, $msg, $color, @extra) = @_;
2514
2515 $msg = $self->pl->expand_cfpod ($msg);
2516
2517 $color &= ~cf::NDI_UNIQUE; # just in case...
2518
2519 if (ref $channel) {
2520 # send meta info to client, if not yet sent
2521 unless (exists $self->{channel}{$channel->{id}}) {
2522 $self->{channel}{$channel->{id}} = $channel;
2523 $self->ext_msg (channel_info => %$channel);
2524 }
2525
2526 $channel = $channel->{id};
2527 }
2528
2529 return unless @extra || length $msg;
2530
2531 if ($self->can_msg) {
2532 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra]));
2533 } else {
2534 # replace some tags by gcfclient-compatible ones
2535 for ($msg) {
2536 1 while
2537 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2538 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2539 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2540 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2541 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2542 }
2543
2544 if ($color >= 0) {
2545 if (0 && $msg =~ /\[/) {
2546 $self->send_packet ("drawextinfo $color 4 0 $msg")
2547 } else {
2548 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2549 $self->send_packet ("drawinfo $color $msg")
2550 }
2551 }
2552 }
2553}
2554
2089=item $client->ext_event ($type, %msg) 2555=item $client->ext_msg ($type, @msg)
2090 2556
2091Sends an exti event to the client. 2557Sends an ext event to the client.
2092 2558
2093=cut 2559=cut
2094 2560
2095sub cf::client::ext_event($$%) { 2561sub cf::client::ext_msg($$@) {
2096 my ($self, $type, %msg) = @_; 2562 my ($self, $type, @msg) = @_;
2097 2563
2564 my $extcmd = $self->extcmd;
2565
2566 if ($extcmd == 2) {
2567 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2568 } elsif ($extcmd == 1) { # TODO: remove
2098 $msg{msgtype} = "event_$type"; 2569 push @msg, msgtype => "event_$type";
2099 $self->send_packet ("ext " . cf::to_json \%msg); 2570 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2571 }
2100} 2572}
2101 2573
2102=item $success = $client->query ($flags, "text", \&cb) 2574=item $success = $client->query ($flags, "text", \&cb)
2103 2575
2104Queues a query to the client, calling the given callback with 2576Queues a query to the client, calling the given callback with
2105the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2577the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2106C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2578C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2107 2579
2108Queries can fail, so check the return code. Or don't, as queries will become 2580Queries can fail, so check the return code. Or don't, as queries will
2109reliable at some point in the future. 2581become reliable at some point in the future.
2110 2582
2111=cut 2583=cut
2112 2584
2113sub cf::client::query { 2585sub cf::client::query {
2114 my ($self, $flags, $text, $cb) = @_; 2586 my ($self, $flags, $text, $cb) = @_;
2122 utf8::encode $text; 2594 utf8::encode $text;
2123 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2595 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2124 2596
2125 $self->send_packet ($self->{query_queue}[0][0]) 2597 $self->send_packet ($self->{query_queue}[0][0])
2126 if @{ $self->{query_queue} } == 1; 2598 if @{ $self->{query_queue} } == 1;
2599
2600 1
2127} 2601}
2128 2602
2129cf::client->attach ( 2603cf::client->attach (
2604 on_connect => sub {
2605 my ($ns) = @_;
2606
2607 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2608 },
2130 on_reply => sub { 2609 on_reply => sub {
2131 my ($ns, $msg) = @_; 2610 my ($ns, $msg) = @_;
2132 2611
2133 # this weird shuffling is so that direct followup queries 2612 # this weird shuffling is so that direct followup queries
2134 # get handled first 2613 # get handled first
2146 } else { 2625 } else {
2147 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2626 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2148 } 2627 }
2149 } 2628 }
2150 }, 2629 },
2630 on_exticmd => sub {
2631 my ($ns, $buf) = @_;
2632
2633 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2634
2635 if (ref $msg) {
2636 my ($type, $reply, @payload) =
2637 "ARRAY" eq ref $msg
2638 ? @$msg
2639 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2640
2641 if (my $cb = $EXTICMD{$type}) {
2642 my @reply = $cb->($ns, @payload);
2643
2644 $ns->ext_reply ($reply, @reply)
2645 if $reply;
2646 }
2647 } else {
2648 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2649 }
2650
2651 cf::override;
2652 },
2151); 2653);
2152 2654
2153=item $client->async (\&cb) 2655=item $client->async (\&cb)
2154 2656
2155Create a new coroutine, running the specified callback. The coroutine will 2657Create a new coroutine, running the specified callback. The coroutine will
2204 2706
2205=pod 2707=pod
2206 2708
2207The following functions and methods are available within a safe environment: 2709The following functions and methods are available within a safe environment:
2208 2710
2209 cf::object contr pay_amount pay_player map 2711 cf::object
2712 contr pay_amount pay_player map x y force_find force_add
2713 insert remove
2714
2210 cf::object::player player 2715 cf::object::player
2211 cf::player peaceful 2716 player
2212 cf::map trigger 2717
2718 cf::player
2719 peaceful
2720
2721 cf::map
2722 trigger
2213 2723
2214=cut 2724=cut
2215 2725
2216for ( 2726for (
2217 ["cf::object" => qw(contr pay_amount pay_player map)], 2727 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2728 insert remove)],
2218 ["cf::object::player" => qw(player)], 2729 ["cf::object::player" => qw(player)],
2219 ["cf::player" => qw(peaceful)], 2730 ["cf::player" => qw(peaceful)],
2220 ["cf::map" => qw(trigger)], 2731 ["cf::map" => qw(trigger)],
2221) { 2732) {
2222 no strict 'refs'; 2733 no strict 'refs';
2293=back 2804=back
2294 2805
2295=cut 2806=cut
2296 2807
2297############################################################################# 2808#############################################################################
2298
2299=head2 EXTENSION DATABASE SUPPORT
2300
2301Crossfire maintains a very simple database for extension use. It can
2302currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2303convert to/from binary).
2304
2305The parameter C<$family> should best start with the name of the extension
2306using it, it should be unique.
2307
2308=over 4
2309
2310=item $value = cf::db_get $family => $key
2311
2312Returns a single value from the database.
2313
2314=item cf::db_put $family => $key => $value
2315
2316Stores the given C<$value> in the family.
2317
2318=cut
2319
2320our $DB;
2321
2322sub db_init {
2323 unless ($DB) {
2324 $DB = BDB::db_create $DB_ENV;
2325
2326 cf::sync_job {
2327 eval {
2328 $DB->set_flags (BDB::CHKSUM);
2329
2330 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2331 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2332 cf::cleanup "db_open(db): $!" if $!;
2333 };
2334 cf::cleanup "db_open(db): $@" if $@;
2335 };
2336 }
2337}
2338
2339sub db_get($$) {
2340 my $key = "$_[0]/$_[1]";
2341
2342 cf::sync_job {
2343 BDB::db_get $DB, undef, $key, my $data;
2344
2345 $! ? ()
2346 : $data
2347 }
2348}
2349
2350sub db_put($$$) {
2351 BDB::dbreq_pri 4;
2352 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2353}
2354
2355=item cf::cache $id => [$paths...], $processversion => $process
2356
2357Generic caching function that returns the value of the resource $id,
2358caching and regenerating as required.
2359
2360This function can block.
2361
2362=cut
2363
2364sub cache {
2365 my ($id, $src, $processversion, $process) = @_;
2366
2367 my $meta =
2368 join "\x00",
2369 $processversion,
2370 map {
2371 aio_stat $_
2372 and Carp::croak "$_: $!";
2373
2374 ($_, (stat _)[7,9])
2375 } @$src;
2376
2377 my $dbmeta = db_get cache => "$id/meta";
2378 if ($dbmeta ne $meta) {
2379 # changed, we may need to process
2380
2381 my @data;
2382 my $md5;
2383
2384 for (0 .. $#$src) {
2385 0 <= aio_load $src->[$_], $data[$_]
2386 or Carp::croak "$src->[$_]: $!";
2387 }
2388
2389 # if processing is expensive, check
2390 # checksum first
2391 if (1) {
2392 $md5 =
2393 join "\x00",
2394 $processversion,
2395 map {
2396 Coro::cede;
2397 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2398 } 0.. $#$src;
2399
2400
2401 my $dbmd5 = db_get cache => "$id/md5";
2402 if ($dbmd5 eq $md5) {
2403 db_put cache => "$id/meta", $meta;
2404
2405 return db_get cache => "$id/data";
2406 }
2407 }
2408
2409 my $t1 = Time::HiRes::time;
2410 my $data = $process->(\@data);
2411 my $t2 = Time::HiRes::time;
2412
2413 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2414
2415 db_put cache => "$id/data", $data;
2416 db_put cache => "$id/md5" , $md5;
2417 db_put cache => "$id/meta", $meta;
2418
2419 return $data;
2420 }
2421
2422 db_get cache => "$id/data"
2423}
2424
2425=item fork_call { }, $args
2426
2427Executes the given code block with the given arguments in a seperate
2428process, returning the results. Everything must be serialisable with
2429Coro::Storable. May, of course, block. Note that the executed sub may
2430never block itself or use any form of Event handling.
2431
2432=cut
2433
2434sub fork_call(&@) {
2435 my ($cb, @args) = @_;
2436
2437# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2438# or die "socketpair: $!";
2439 pipe my $fh1, my $fh2
2440 or die "pipe: $!";
2441
2442 if (my $pid = fork) {
2443 close $fh2;
2444
2445 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2446 $res = Coro::Storable::thaw $res;
2447
2448 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2449
2450 die $$res unless "ARRAY" eq ref $res;
2451
2452 return wantarray ? @$res : $res->[-1];
2453 } else {
2454 reset_signals;
2455 local $SIG{__WARN__};
2456 local $SIG{__DIE__};
2457 eval {
2458 close $fh1;
2459
2460 my @res = eval { $cb->(@args) };
2461 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2462 };
2463
2464 warn $@ if $@;
2465 _exit 0;
2466 }
2467}
2468
2469
2470
2471#############################################################################
2472# the server's init and main functions 2809# the server's init and main functions
2473 2810
2474sub load_facedata($) { 2811sub load_facedata($) {
2475 my ($path) = @_; 2812 my ($path) = @_;
2476 2813
2488 { 2825 {
2489 my $faces = $facedata->{faceinfo}; 2826 my $faces = $facedata->{faceinfo};
2490 2827
2491 while (my ($face, $info) = each %$faces) { 2828 while (my ($face, $info) = each %$faces) {
2492 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2829 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2493 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2830 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap};
2494 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2495 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2496 Coro::cede; 2834
2835 cf::cede_to_tick;
2497 } 2836 }
2498 2837
2499 while (my ($face, $info) = each %$faces) { 2838 while (my ($face, $info) = each %$faces) {
2500 next unless $info->{smooth}; 2839 next unless $info->{smooth};
2501 my $idx = cf::face::find $face 2840 my $idx = cf::face::find $face
2502 or next; 2841 or next;
2503 if (my $smooth = cf::face::find $info->{smooth}) { 2842 if (my $smooth = cf::face::find $info->{smooth}) {
2843 cf::face::set_smooth $idx, $smooth;
2504 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2844 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2505 } else { 2845 } else {
2506 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2846 warn "smooth face '$info->{smooth}' not found for face '$face'";
2507 } 2847 }
2508 Coro::cede; 2848
2849 cf::cede_to_tick;
2509 } 2850 }
2510 } 2851 }
2511 2852
2512 { 2853 {
2513 my $anims = $facedata->{animinfo}; 2854 my $anims = $facedata->{animinfo};
2514 2855
2515 while (my ($anim, $info) = each %$anims) { 2856 while (my ($anim, $info) = each %$anims) {
2516 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2857 cf::anim::set $anim, $info->{frames}, $info->{facings};
2517 Coro::cede; 2858 cf::cede_to_tick;
2518 } 2859 }
2519 2860
2520 cf::anim::invalidate_all; # d'oh 2861 cf::anim::invalidate_all; # d'oh
2521 } 2862 }
2522 2863
2864 {
2865 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical;
2869
2870 while (my ($name, $info) = each %$res) {
2871 my $meta = $enc->encode ({
2872 name => $name,
2873 copyright => $info->{copyright}, #TODO#
2874 });
2875
2876 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2877
2878 if ($info->{type} & 1) {
2879 # prepend meta info
2880
2881 my $data = pack "(w/a*)*", $meta, $info->{data};
2882 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2883
2884 cf::face::set_data $idx, 0, $data, $chk;
2885 } else {
2886 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};
2887 }
2888
2889 cf::face::set_type $idx, $info->{type};
2890
2891 cf::cede_to_tick;
2892 }
2893 }
2894
2523 1 2895 1
2524} 2896}
2897
2898register_exticmd fx_want => sub {
2899 my ($ns, $want) = @_;
2900
2901 while (my ($k, $v) = each %$want) {
2902 $ns->fx_want ($k, $v);
2903 }
2904};
2525 2905
2526sub reload_regions { 2906sub reload_regions {
2527 load_resource_file "$MAPDIR/regions" 2907 load_resource_file "$MAPDIR/regions"
2528 or die "unable to load regions file\n"; 2908 or die "unable to load regions file\n";
2909
2910 for (cf::region::list) {
2911 $_->{match} = qr/$_->{match}/
2912 if exists $_->{match};
2913 }
2529} 2914}
2530 2915
2531sub reload_facedata { 2916sub reload_facedata {
2532 load_facedata "$DATADIR/facedata" 2917 load_facedata "$DATADIR/facedata"
2533 or die "unable to load facedata\n"; 2918 or die "unable to load facedata\n";
2534} 2919}
2535 2920
2536sub reload_archetypes { 2921sub reload_archetypes {
2537 load_resource_file "$DATADIR/archetypes" 2922 load_resource_file "$DATADIR/archetypes"
2538 or die "unable to load archetypes\n"; 2923 or die "unable to load archetypes\n";
2924 #d# NEED to laod twice to resolve forward references
2925 # this really needs to be done in an extra post-pass
2926 # (which needs to be synchronous, so solve it differently)
2927 load_resource_file "$DATADIR/archetypes"
2928 or die "unable to load archetypes\n";
2539} 2929}
2540 2930
2541sub reload_treasures { 2931sub reload_treasures {
2542 load_resource_file "$DATADIR/treasures" 2932 load_resource_file "$DATADIR/treasures"
2543 or die "unable to load treasurelists\n"; 2933 or die "unable to load treasurelists\n";
2546sub reload_resources { 2936sub reload_resources {
2547 warn "reloading resource files...\n"; 2937 warn "reloading resource files...\n";
2548 2938
2549 reload_regions; 2939 reload_regions;
2550 reload_facedata; 2940 reload_facedata;
2941 #reload_archetypes;#d#
2551 reload_archetypes; 2942 reload_archetypes;
2552 reload_treasures; 2943 reload_treasures;
2553 2944
2554 warn "finished reloading resource files\n"; 2945 warn "finished reloading resource files\n";
2555} 2946}
2612 }, 3003 },
2613 ); 3004 );
2614 } 3005 }
2615} 3006}
2616 3007
3008sub write_runtime {
3009 my $runtime = "$LOCALDIR/runtime";
3010
3011 # first touch the runtime file to show we are still running:
3012 # the fsync below can take a very very long time.
3013
3014 IO::AIO::aio_utime $runtime, undef, undef;
3015
3016 my $guard = cf::lock_acquire "write_runtime";
3017
3018 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3019 or return;
3020
3021 my $value = $cf::RUNTIME + 90 + 10;
3022 # 10 is the runtime save interval, for a monotonic clock
3023 # 60 allows for the watchdog to kill the server.
3024
3025 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3026 and return;
3027
3028 # always fsync - this file is important
3029 aio_fsync $fh
3030 and return;
3031
3032 # touch it again to show we are up-to-date
3033 aio_utime $fh, undef, undef;
3034
3035 close $fh
3036 or return;
3037
3038 aio_rename "$runtime~", $runtime
3039 and return;
3040
3041 warn "runtime file written.\n";
3042
3043 1
3044}
3045
2617sub emergency_save() { 3046sub emergency_save() {
2618 my $freeze_guard = cf::freeze_mainloop; 3047 my $freeze_guard = cf::freeze_mainloop;
2619 3048
2620 warn "enter emergency perl save\n"; 3049 warn "enter emergency perl save\n";
2621 3050
2696 %EXT_CORO = (); 3125 %EXT_CORO = ();
2697 3126
2698 warn "removing commands"; 3127 warn "removing commands";
2699 %COMMAND = (); 3128 %COMMAND = ();
2700 3129
2701 warn "removing ext commands"; 3130 warn "removing ext/exti commands";
2702 %EXTCMD = (); 3131 %EXTCMD = ();
3132 %EXTICMD = ();
2703 3133
2704 warn "unloading/nuking all extensions"; 3134 warn "unloading/nuking all extensions";
2705 for my $pkg (@EXTS) { 3135 for my $pkg (@EXTS) {
2706 warn "... unloading $pkg"; 3136 warn "... unloading $pkg";
2707 3137
2825 my $signal = new Coro::Signal; 3255 my $signal = new Coro::Signal;
2826 push @WAIT_FOR_TICK_BEGIN, $signal; 3256 push @WAIT_FOR_TICK_BEGIN, $signal;
2827 $signal->wait; 3257 $signal->wait;
2828} 3258}
2829 3259
3260 my $min = 1e6;#d#
3261 my $avg = 10;
2830$TICK_WATCHER = Event->timer ( 3262$TICK_WATCHER = Event->timer (
2831 reentrant => 0, 3263 reentrant => 0,
2832 parked => 1, 3264 parked => 1,
2833 prio => 0, 3265 prio => 0,
2834 at => $NEXT_TICK || $TICK, 3266 at => $NEXT_TICK || $TICK,
2838 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3270 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2839 unless ++$bug_warning > 10; 3271 unless ++$bug_warning > 10;
2840 return; 3272 return;
2841 } 3273 }
2842 3274
2843 $NOW = Event::time; 3275 $NOW = $tick_start = Event::time;
2844 3276
2845 cf::server_tick; # one server iteration 3277 cf::server_tick; # one server iteration
3278
3279 0 && sync_job {#d#
3280 for(1..10) {
3281 my $t = Event::time;
3282 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3283 or die;
3284
3285 $map->width (50);
3286 $map->height (50);
3287 $map->alloc;
3288 $map->_load_objects ("/tmp/x.map", 1);
3289 my $t = Event::time - $t;
3290
3291 #next unless $t < 0.0013;#d#
3292 if ($t < $min) {
3293 $min = $t;
3294 }
3295 $avg = $avg * 0.99 + $t * 0.01;
3296 }
3297 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3298 exit 0;
3299 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3300 };
2846 3301
2847 $RUNTIME += $TICK; 3302 $RUNTIME += $TICK;
2848 $NEXT_TICK += $TICK; 3303 $NEXT_TICK += $TICK;
2849 3304
2850 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3305 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2856 } 3311 }
2857 3312
2858# my $AFTER = Event::time; 3313# my $AFTER = Event::time;
2859# warn $AFTER - $NOW;#d# 3314# warn $AFTER - $NOW;#d#
2860 3315
3316 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3317 $sig->send;
3318 }
3319 while (my $sig = shift @WAIT_FOR_TICK) {
3320 $sig->send;
3321 }
3322
3323 $NOW = Event::time;
3324
2861 # if we are delayed by four ticks or more, skip them all 3325 # if we are delayed by four ticks or more, skip them all
2862 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3326 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2863 3327
2864 $TICK_WATCHER->at ($NEXT_TICK); 3328 $TICK_WATCHER->at ($NEXT_TICK);
2865 $TICK_WATCHER->start; 3329 $TICK_WATCHER->start;
2866 3330
2867 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3331 $LOAD = ($NOW - $tick_start) / $TICK;
2868 $sig->send; 3332 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2869 }
2870 while (my $sig = shift @WAIT_FOR_TICK) {
2871 $sig->send;
2872 }
2873 3333
2874 _post_tick; 3334 _post_tick;
3335
3336
2875 }, 3337 },
2876); 3338);
2877 3339
2878{ 3340{
2879 BDB::max_poll_time $TICK * 0.1; 3341 BDB::max_poll_time $TICK * 0.1;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines