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.326 by root, Tue Jul 31 17:33: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[, $name]]
328
329Allocate $time seconds of blocking CPU time at priority C<$priority>:
330This call blocks and returns only when you have at least C<$time> seconds
331of cpu time till the next tick. The slot is only valid till the next cede.
332
333The optional C<$name> can be used to identify the job to run. It might be
334used for statistical purposes and should identify the same time-class.
335
336Useful for short background jobs.
337
338=cut
339
340our @SLOT_QUEUE;
341our $SLOT_QUEUE;
342
343$SLOT_QUEUE->cancel if $SLOT_QUEUE;
344$SLOT_QUEUE = Coro::async {
345 my $signal = new Coro::Signal;
346
347 while () {
348 next_job:
349 my $avail = cf::till_tick;
350 if ($avail > 0.01) {
351 for (0 .. $#SLOT_QUEUE) {
352 if ($SLOT_QUEUE[$_][0] < $avail) {
353 my $job = splice @SLOT_QUEUE, $_, 1, ();
354 $job->[2]->send;
355 Coro::cede;
356 goto next_job;
357 }
358 }
359 }
360
361 if (@SLOT_QUEUE) {
362 # we do not use wait_For_tick() as it returns immediately when tick is inactive
363 push @cf::WAIT_FOR_TICK, $signal;
364 $signal->wait;
365 } else {
366 Coro::schedule;
367 }
368 }
369};
370
371sub get_slot($;$$) {
372 my ($time, $pri, $name) = @_;
373
374 $time = $TICK * .6 if $time > $TICK * .6;
375 my $sig = new Coro::Signal;
376
377 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
378 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
379 $SLOT_QUEUE->ready;
380 $sig->wait;
381}
382
296=item cf::async { BLOCK } 383=item cf::async { BLOCK }
297 384
298Currently the same as Coro::async_pool, meaning you cannot use 385Currently the same as Coro::async_pool, meaning you cannot use
299C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 386C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
300thing you are allowed to do is call C<prio> on it. 387thing you are allowed to do is call C<prio> on it.
303 390
304BEGIN { *async = \&Coro::async_pool } 391BEGIN { *async = \&Coro::async_pool }
305 392
306=item cf::sync_job { BLOCK } 393=item cf::sync_job { BLOCK }
307 394
308The design of crossfire+ requires that the main coro ($Coro::main) is 395The design of Crossfire TRT requires that the main coroutine ($Coro::main)
309always able to handle events or runnable, as crossfire+ is only partly 396is always able to handle events or runnable, as Crossfire TRT is only
310reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 397partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
398acceptable.
311 399
312If it must be done, put the blocking parts into C<sync_job>. This will run 400If it must be done, put the blocking parts into C<sync_job>. This will run
313the given BLOCK in another coroutine while waiting for the result. The 401the given BLOCK in another coroutine while waiting for the result. The
314server will be frozen during this time, so the block should either finish 402server will be frozen during this time, so the block should either finish
315fast or be very important. 403fast or be very important.
318 406
319sub sync_job(&) { 407sub sync_job(&) {
320 my ($job) = @_; 408 my ($job) = @_;
321 409
322 if ($Coro::current == $Coro::main) { 410 if ($Coro::current == $Coro::main) {
411 my $time = Event::time;
412
323 # this is the main coro, too bad, we have to block 413 # this is the main coro, too bad, we have to block
324 # till the operation succeeds, freezing the server :/ 414 # till the operation succeeds, freezing the server :/
325 415
326 # TODO: use suspend/resume instead 416 # TODO: use suspend/resume instead
327 # (but this is cancel-safe) 417 # (but this is cancel-safe)
338 428
339 while ($busy) { 429 while ($busy) {
340 Coro::cede or Event::one_event; 430 Coro::cede or Event::one_event;
341 } 431 }
342 432
433 $time = Event::time - $time;
434
435 LOG llevError | logBacktrace, Carp::longmess "long sync job"
436 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
437
438 $tick_start += $time; # do not account sync jobs to server load
439
343 wantarray ? @res : $res[0] 440 wantarray ? @res : $res[0]
344 } else { 441 } else {
345 # we are in another coroutine, how wonderful, everything just works 442 # we are in another coroutine, how wonderful, everything just works
346 443
347 $job->() 444 $job->()
366 $EXT_CORO{$coro+0} = $coro; 463 $EXT_CORO{$coro+0} = $coro;
367 464
368 $coro 465 $coro
369} 466}
370 467
371sub write_runtime { 468=item fork_call { }, $args
372 my $guard = cf::lock_acquire "write_runtime";
373 469
374 my $runtime = "$LOCALDIR/runtime"; 470Executes the given code block with the given arguments in a seperate
471process, returning the results. Everything must be serialisable with
472Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling.
375 474
376 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 475=cut
377 or return;
378 476
379 my $value = $cf::RUNTIME + 90 + 10; 477sub _store_scalar {
380 # 10 is the runtime save interval, for a monotonic clock 478 open my $fh, ">", \my $buf
381 # 60 allows for the watchdog to kill the server. 479 or die "fork_call: cannot open fh-to-buf in child : $!";
382 480 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 481 close $fh;
391 or return;
392 482
393 aio_rename "$runtime~", $runtime 483 $buf
394 and return; 484}
395 485
486sub fork_call(&@) {
487 my ($cb, @args) = @_;
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;
396 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"
397} 644}
398 645
399=item cf::datalog type => key => value, ... 646=item cf::datalog type => key => value, ...
400 647
401Log 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.
419attach callbacks/event handlers (a collection of which is called an "attachment") 666attach callbacks/event handlers (a collection of which is called an "attachment")
420to it. All such attachable objects support the following methods. 667to it. All such attachable objects support the following methods.
421 668
422In 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>
423C<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
424crossfire+). 671Crossfire TRT).
425 672
426=over 4 673=over 4
427 674
428=item $attachable->attach ($attachment, key => $value...) 675=item $attachable->attach ($attachment, key => $value...)
429 676
592 $registry = $CB_TYPE[$object_type] ||= []; 839 $registry = $CB_TYPE[$object_type] ||= [];
593 840
594 } elsif ($type eq "subtype") { 841 } elsif ($type eq "subtype") {
595 defined $object_type or Carp::croak "subtype specified without type"; 842 defined $object_type or Carp::croak "subtype specified without type";
596 my $object_subtype = shift @arg; 843 my $object_subtype = shift @arg;
597 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 844 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
598 845
599 } elsif ($type eq "package") { 846 } elsif ($type eq "package") {
600 my $pkg = shift @arg; 847 my $pkg = shift @arg;
601 848
602 while (my ($name, $id) = each %cb_id) { 849 while (my ($name, $id) = each %cb_id) {
631 _attach $registry, $klass, @attach; 878 _attach $registry, $klass, @attach;
632 } 879 }
633 880
634 $obj->{$name} = \%arg; 881 $obj->{$name} = \%arg;
635 } else { 882 } else {
636 warn "object uses attachment '$name' that is not available, postponing.\n"; 883 warn "object uses attachment '$name' which is not available, postponing.\n";
637 } 884 }
638 885
639 $obj->{_attachment}{$name} = undef; 886 $obj->{_attachment}{$name} = undef;
640} 887}
641 888
643 if (ref $_[0]) { 890 if (ref $_[0]) {
644 _object_attach @_; 891 _object_attach @_;
645 } else { 892 } else {
646 _attach shift->_attach_registry, @_; 893 _attach shift->_attach_registry, @_;
647 } 894 }
895 _recalc_want;
648}; 896};
649 897
650# all those should be optimised 898# all those should be optimised
651sub cf::attachable::detach { 899sub cf::attachable::detach {
652 my ($obj, $name) = @_; 900 my ($obj, $name) = @_;
655 delete $obj->{_attachment}{$name}; 903 delete $obj->{_attachment}{$name};
656 reattach ($obj); 904 reattach ($obj);
657 } else { 905 } else {
658 Carp::croak "cannot, currently, detach class attachments"; 906 Carp::croak "cannot, currently, detach class attachments";
659 } 907 }
908 _recalc_want;
660}; 909};
661 910
662sub cf::attachable::attached { 911sub cf::attachable::attached {
663 my ($obj, $name) = @_; 912 my ($obj, $name) = @_;
664 913
679 "; 928 ";
680 die if $@; 929 die if $@;
681} 930}
682 931
683our $override; 932our $override;
684our @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?
685 934
686sub override { 935sub override {
687 $override = 1; 936 $override = 1;
688 @invoke_results = (); 937 @INVOKE_RESULTS = (@_);
689} 938}
690 939
691sub do_invoke { 940sub do_invoke {
692 my $event = shift; 941 my $event = shift;
693 my $callbacks = shift; 942 my $callbacks = shift;
694 943
695 @invoke_results = (); 944 @INVOKE_RESULTS = ();
696 945
697 local $override; 946 local $override;
698 947
699 for (@$callbacks) { 948 for (@$callbacks) {
700 eval { &{$_->[1]} }; 949 eval { &{$_->[1]} };
717 966
718Generate an object-specific event with the given arguments. 967Generate an object-specific event with the given arguments.
719 968
720This 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
721removed 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
722results (if you must, access C<@cf::invoke_results> directly). 971results (if you must, access C<@cf::INVOKE_RESULTS> directly).
723 972
724=back 973=back
725 974
726=cut 975=cut
727 976
728############################################################################# 977#############################################################################
729# 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}
730 990
731sub reattach { 991sub reattach {
732 # basically do the same as instantiate, without calling instantiate 992 # basically do the same as instantiate, without calling instantiate
733 my ($obj) = @_; 993 my ($obj) = @_;
734 994
837 or return; 1097 or return;
838 $av = eval { (Storable::thaw $av)->{objs} }; 1098 $av = eval { (Storable::thaw $av)->{objs} };
839 } 1099 }
840 1100
841 warn sprintf "loading %s (%d)\n", 1101 warn sprintf "loading %s (%d)\n",
842 $filename, length $data, scalar @{$av || []};#d# 1102 $filename, length $data, scalar @{$av || []};
843 return ($data, $av); 1103 return ($data, $av);
844} 1104}
1105
1106=head2 COMMAND CALLBACKS
1107
1108=over 4
1109
1110=cut
845 1111
846############################################################################# 1112#############################################################################
847# command handling &c 1113# command handling &c
848 1114
849=item cf::register_command $name => \&callback($ob,$args); 1115=item cf::register_command $name => \&callback($ob,$args);
862 push @{ $COMMAND{$name} }, [$caller, $cb]; 1128 push @{ $COMMAND{$name} }, [$caller, $cb];
863} 1129}
864 1130
865=item cf::register_extcmd $name => \&callback($pl,$packet); 1131=item cf::register_extcmd $name => \&callback($pl,$packet);
866 1132
867Register 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.
868 1138
869If 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
870called. 1140called.
871 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
872=cut 1153=cut
873 1154
874sub register_extcmd { 1155sub register_extcmd {
875 my ($name, $cb) = @_; 1156 my ($name, $cb) = @_;
876 1157
877 $EXTCMD{$name} = $cb; 1158 $EXTCMD{$name} = $cb;
1159}
1160
1161sub register_exticmd {
1162 my ($name, $cb) = @_;
1163
1164 $EXTICMD{$name} = $cb;
878} 1165}
879 1166
880cf::player->attach ( 1167cf::player->attach (
881 on_command => sub { 1168 on_command => sub {
882 my ($pl, $name, $params) = @_; 1169 my ($pl, $name, $params) = @_;
891 cf::override; 1178 cf::override;
892 }, 1179 },
893 on_extcmd => sub { 1180 on_extcmd => sub {
894 my ($pl, $buf) = @_; 1181 my ($pl, $buf) = @_;
895 1182
896 my $msg = eval { from_json $buf }; 1183 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
897 1184
898 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
899 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1191 if (my $cb = $EXTCMD{$type}) {
900 if (my %reply = $cb->($pl, $msg)) { 1192 my @reply = $cb->($pl, @payload);
1193
901 $pl->ext_reply ($msg->{msgid}, %reply); 1194 $pl->ext_reply ($reply, @reply)
902 } 1195 if $reply;
903 } 1196 }
904 } else { 1197 } else {
905 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
906 } 1199 }
907 1200
908 cf::override; 1201 cf::override;
909 }, 1202 },
910); 1203);
911 1204
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 { 1205sub load_extensions {
1206 cf::sync_job {
1207 my %todo;
1208
947 for my $ext (<$LIBDIR/*.ext>) { 1209 for my $path (<$LIBDIR/*.ext>) {
948 next unless -r $ext; 1210 next unless -r $path;
949 eval { 1211
950 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;
951 1 1269 }
952 } or warn "$ext not loaded: $@"; 1270
1271 skip:
1272 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1273 unless $progress;
1274 }
953 } 1275 };
954} 1276}
955 1277
956############################################################################# 1278#############################################################################
1279
1280=back
957 1281
958=head2 CORE EXTENSIONS 1282=head2 CORE EXTENSIONS
959 1283
960Functions and methods that extend core crossfire objects. 1284Functions and methods that extend core crossfire objects.
961 1285
1149 } 1473 }
1150 1474
1151 \@paths 1475 \@paths
1152} 1476}
1153 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
1154=item $player->ext_reply ($msgid, %msg) 1528=item $player->ext_reply ($msgid, @msg)
1155 1529
1156Sends an ext reply to the player. 1530Sends an ext reply to the player.
1157 1531
1158=cut 1532=cut
1159 1533
1160sub ext_reply($$%) { 1534sub ext_reply($$@) {
1161 my ($self, $id, %msg) = @_; 1535 my ($self, $id, @msg) = @_;
1162 1536
1163 $msg{msgid} = $id; 1537 if ($self->ns->extcmd == 2) {
1164 1538 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1165 $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 }
1166} 1544}
1167 1545
1168=item $player->ext_event ($type, %msg) 1546=item $player->ext_msg ($type, @msg)
1169 1547
1170Sends an ext event to the client. 1548Sends an ext event to the client.
1171 1549
1172=cut 1550=cut
1173 1551
1174sub ext_event($$%) { 1552sub ext_msg($$@) {
1175 my ($self, $type, %msg) = @_; 1553 my ($self, $type, @msg) = @_;
1176 1554
1177 $self->ns->ext_event ($type, %msg); 1555 $self->ns->ext_msg ($type, @msg);
1178} 1556}
1179 1557
1180=head3 cf::region 1558=head3 cf::region
1181 1559
1182=over 4 1560=over 4
1185 1563
1186package cf::region; 1564package cf::region;
1187 1565
1188=item cf::region::find_by_path $path 1566=item cf::region::find_by_path $path
1189 1567
1190Tries 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.
1191 1569
1192=cut 1570=cut
1193 1571
1194sub find_by_path($) { 1572sub find_by_path($) {
1195 my ($path) = @_; 1573 my ($path) = @_;
1196 1574
1197 my ($match, $specificity); 1575 my ($match, $specificity);
1198 1576
1199 for my $region (list) { 1577 for my $region (list) {
1200 if ($region->match && $path =~ $region->match) { 1578 if ($region->{match} && $path =~ $region->{match}) {
1201 ($match, $specificity) = ($region, $region->specificity) 1579 ($match, $specificity) = ($region, $region->specificity)
1202 if $region->specificity > $specificity; 1580 if $region->specificity > $specificity;
1203 } 1581 }
1204 } 1582 }
1205 1583
1269 my ($self, $merge) = @_; 1647 my ($self, $merge) = @_;
1270 1648
1271 # we have to keep some variables in memory intact 1649 # we have to keep some variables in memory intact
1272 local $self->{path}; 1650 local $self->{path};
1273 local $self->{load_path}; 1651 local $self->{load_path};
1274 local $self->{deny_save};
1275 local $self->{deny_reset};
1276 1652
1277 $self->SUPER::thawer_merge ($merge); 1653 $self->SUPER::thawer_merge ($merge);
1278} 1654}
1279 1655
1280sub normalise { 1656sub normalise {
1327 $self->init; # pass $1 etc. 1703 $self->init; # pass $1 etc.
1328 return $self; 1704 return $self;
1329 } 1705 }
1330 } 1706 }
1331 1707
1332 Carp::carp "unable to resolve path '$path' (base '$base')."; 1708 Carp::cluck "unable to resolve path '$path' (base '$base').";
1333 () 1709 ()
1334} 1710}
1335 1711
1336sub init { 1712sub init {
1337 my ($self) = @_; 1713 my ($self) = @_;
1378sub change_all_map_light { 1754sub change_all_map_light {
1379 my ($change) = @_; 1755 my ($change) = @_;
1380 1756
1381 $_->change_map_light ($change) 1757 $_->change_map_light ($change)
1382 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;
1383} 1767}
1384 1768
1385sub unlink_save { 1769sub unlink_save {
1386 my ($self) = @_; 1770 my ($self) = @_;
1387 1771
1445 $self->load_header_orig 1829 $self->load_header_orig
1446 or return; 1830 or return;
1447 $self->prepare_orig; 1831 $self->prepare_orig;
1448 } 1832 }
1449 1833
1834 $self->{deny_reset} = 1
1835 if $self->no_reset;
1836
1450 $self->default_region (cf::region::find_by_path $self->{path}) 1837 $self->default_region (cf::region::find_by_path $self->{path})
1451 unless $self->default_region; 1838 unless $self->default_region;
1452 1839
1453 1 1840 1
1454} 1841}
1469 $map->{last_save} = $cf::RUNTIME; 1856 $map->{last_save} = $cf::RUNTIME;
1470 1857
1471 $map->load_header 1858 $map->load_header
1472 or return; 1859 or return;
1473 1860
1474 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1861 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1475 # doing this can freeze the server in a sync job, obviously 1862 # doing this can freeze the server in a sync job, obviously
1476 #$cf::WAIT_FOR_TICK->wait; 1863 #$cf::WAIT_FOR_TICK->wait;
1477 $map->reset; 1864 $map->reset;
1478 undef $guard; 1865 undef $guard;
1479 return find $path; 1866 return find $path;
1534 $self->set_darkness_map; 1921 $self->set_darkness_map;
1535 Coro::cede; 1922 Coro::cede;
1536 $self->activate; 1923 $self->activate;
1537 } 1924 }
1538 1925
1926 $self->{last_save} = $cf::RUNTIME;
1927 $self->last_access ($cf::RUNTIME);
1928
1539 $self->in_memory (cf::MAP_IN_MEMORY); 1929 $self->in_memory (cf::MAP_IN_MEMORY);
1540 } 1930 }
1541 1931
1542 $self->post_load; 1932 $self->post_load;
1543} 1933}
1545sub customise_for { 1935sub customise_for {
1546 my ($self, $ob) = @_; 1936 my ($self, $ob) = @_;
1547 1937
1548 return find "~" . $ob->name . "/" . $self->{path} 1938 return find "~" . $ob->name . "/" . $self->{path}
1549 if $self->per_player; 1939 if $self->per_player;
1940
1941# return find "?party/" . $ob->name . "/" . $self->{path}
1942# if $self->per_party;
1550 1943
1551 $self 1944 $self
1552} 1945}
1553 1946
1554# find and load all maps in the 3x3 area around a map 1947# find and load all maps in the 3x3 area around a map
1601 1994
1602 undef $MAP_PREFETCH{$path}; 1995 undef $MAP_PREFETCH{$path};
1603 $MAP_PREFETCHER ||= cf::async { 1996 $MAP_PREFETCHER ||= cf::async {
1604 while (%MAP_PREFETCH) { 1997 while (%MAP_PREFETCH) {
1605 for my $path (keys %MAP_PREFETCH) { 1998 for my $path (keys %MAP_PREFETCH) {
1606 my $map = find $path 1999 if (my $map = find $path) {
1607 or next;
1608 $map->load; 2000 $map->load;
2001 }
1609 2002
1610 delete $MAP_PREFETCH{$path}; 2003 delete $MAP_PREFETCH{$path};
1611 } 2004 }
1612 } 2005 }
1613 undef $MAP_PREFETCHER; 2006 undef $MAP_PREFETCHER;
1665 2058
1666sub reset_at { 2059sub reset_at {
1667 my ($self) = @_; 2060 my ($self) = @_;
1668 2061
1669 # TODO: safety, remove and allow resettable per-player maps 2062 # 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}; 2063 return 1e99 if $self->{deny_reset};
1672 2064
1673 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2065 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1674 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2066 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1675 2067
1686 my ($self) = @_; 2078 my ($self) = @_;
1687 2079
1688 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2080 my $lock = cf::lock_acquire "map_data:$self->{path}";
1689 2081
1690 return if $self->players; 2082 return if $self->players;
1691 return if $self->isa ("ext::map_per_player");#d#
1692 2083
1693 warn "resetting map ", $self->path;#d# 2084 warn "resetting map ", $self->path;
1694 2085
1695 $self->in_memory (cf::MAP_SWAPPED); 2086 $self->in_memory (cf::MAP_SWAPPED);
1696 2087
1697 # need to save uniques path 2088 # need to save uniques path
1698 unless ($self->{deny_save}) { 2089 unless ($self->{deny_save}) {
1730 $cf::MAP{$self->path} = $self; 2121 $cf::MAP{$self->path} = $self;
1731 2122
1732 $self->reset; # polite request, might not happen 2123 $self->reset; # polite request, might not happen
1733} 2124}
1734 2125
2126=item $maps = cf::map::tmp_maps
2127
2128Returns an arrayref with all map paths of currently instantiated and saved
2129maps. May block.
2130
2131=cut
2132
2133sub tmp_maps() {
2134 [
2135 map {
2136 utf8::decode $_;
2137 /\.map$/
2138 ? normalise $_
2139 : ()
2140 } @{ aio_readdir $TMPDIR or [] }
2141 ]
2142}
2143
2144=item $maps = cf::map::random_maps
2145
2146Returns an arrayref with all map paths of currently instantiated and saved
2147random maps. May block.
2148
2149=cut
2150
2151sub random_maps() {
2152 [
2153 map {
2154 utf8::decode $_;
2155 /\.map$/
2156 ? normalise "?random/$_"
2157 : ()
2158 } @{ aio_readdir $RANDOMDIR or [] }
2159 ]
2160}
2161
1735=item cf::map::unique_maps 2162=item cf::map::unique_maps
1736 2163
1737Returns an arrayref of paths of all shared maps that have 2164Returns an arrayref of paths of all shared maps that have
1738instantiated unique items. May block. 2165instantiated unique items. May block.
1739 2166
1740=cut 2167=cut
1741 2168
1742sub unique_maps() { 2169sub unique_maps() {
1743 my $files = aio_readdir $UNIQUEDIR 2170 [
1744 or return; 2171 map {
1745
1746 my @paths;
1747
1748 for (@$files) {
1749 utf8::decode $_; 2172 utf8::decode $_;
1750 next if /\.pst$/; 2173 /\.map$/
1751 next unless /^$PATH_SEP/o; 2174 ? normalise $_
1752 2175 : ()
1753 push @paths, cf::map::normalise $_; 2176 } @{ aio_readdir $UNIQUEDIR or [] }
1754 } 2177 ]
1755
1756 \@paths
1757} 2178}
1758 2179
1759package cf; 2180package cf;
1760 2181
1761=back 2182=back
1807 2228
1808 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2229 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1809 2230
1810 if ($self->{record_replies}) { 2231 if ($self->{record_replies}) {
1811 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2232 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2233
1812 } else { 2234 } else {
2235 my $pl = $self->contr;
2236
2237 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2238 my $dialog = $pl->{npc_dialog};
2239 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2240
2241 } else {
1813 $msg = $npc->name . " says: $msg" if $npc; 2242 $msg = $npc->name . " says: $msg" if $npc;
1814 $self->message ($msg, $flags); 2243 $self->message ($msg, $flags);
2244 }
1815 } 2245 }
1816} 2246}
1817 2247
1818=item $player_object->may ("access") 2248=item $player_object->may ("access")
1819 2249
1867 $self->deactivate_recursive; 2297 $self->deactivate_recursive;
1868 2298
1869 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2299 return if UNIVERSAL::isa $self->map, "ext::map_link";
1870 2300
1871 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2301 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1872 if $self->map; 2302 if $self->map && $self->map->{path} ne "{link}";
1873 2303
1874 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2304 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1875} 2305}
1876 2306
1877sub cf::object::player::leave_link { 2307sub cf::object::player::leave_link {
1878 my ($self, $map, $x, $y) = @_; 2308 my ($self, $map, $x, $y) = @_;
2309
2310 return unless $self->contr->active;
1879 2311
1880 my $link_pos = delete $self->{_link_pos}; 2312 my $link_pos = delete $self->{_link_pos};
1881 2313
1882 unless ($map) { 2314 unless ($map) {
1883 # restore original map position 2315 # restore original map position
1906 2338
1907 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2339 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1908 $self->enter_map ($map, $x, $y); 2340 $self->enter_map ($map, $x, $y);
1909} 2341}
1910 2342
1911cf::player->attach ( 2343=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1912 on_logout => sub {
1913 my ($pl) = @_;
1914 2344
1915 # abort map switching before logout 2345Moves the player to the given map-path and coordinates by first freezing
1916 if ($pl->ob->{_link_pos}) { 2346her, loading and preparing them map, calling the provided $check callback
1917 cf::sync_job { 2347that has to return the map if sucecssful, and then unfreezes the player on
1918 $pl->ob->leave_link 2348the new (success) or old (failed) map position. In either case, $done will
1919 }; 2349be called at the end of this process.
1920 }
1921 },
1922 on_login => sub {
1923 my ($pl) = @_;
1924 2350
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 2351=cut
2352
2353our $GOTOGEN;
1946 2354
1947sub cf::object::player::goto { 2355sub cf::object::player::goto {
1948 my ($self, $path, $x, $y) = @_; 2356 my ($self, $path, $x, $y, $check, $done) = @_;
2357
2358 # do generation counting so two concurrent goto's will be executed in-order
2359 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1949 2360
1950 $self->enter_link; 2361 $self->enter_link;
1951 2362
1952 (async { 2363 (async {
1953 my $map = eval { 2364 my $map = eval {
1954 my $map = cf::map::find $path; 2365 my $map = cf::map::find $path;
2366
2367 if ($map) {
1955 $map = $map->customise_for ($self) if $map; 2368 $map = $map->customise_for ($self);
2369 $map = $check->($map) if $check && $map;
2370 } else {
2371 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2372 }
2373
1956 $map 2374 $map
2375 };
2376
2377 if ($@) {
2378 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2379 LOG llevError | logBacktrace, Carp::longmess $@;
1957 } or 2380 }
1958 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1959 2381
2382 if ($gen == $self->{_goto_generation}) {
2383 delete $self->{_goto_generation};
1960 $self->leave_link ($map, $x, $y); 2384 $self->leave_link ($map, $x, $y);
2385 }
2386
2387 $done->() if $done;
1961 })->prio (1); 2388 })->prio (1);
1962} 2389}
1963 2390
1964=item $player_object->enter_exit ($exit_object) 2391=item $player_object->enter_exit ($exit_object)
1965 2392
2034 my $hp = $exit->stats->hp; 2461 my $hp = $exit->stats->hp;
2035 my $sp = $exit->stats->sp; 2462 my $sp = $exit->stats->sp;
2036 2463
2037 $self->enter_link; 2464 $self->enter_link;
2038 2465
2466 # if exit is damned, update players death & WoR home-position
2467 $self->contr->savebed ($slaying, $hp, $sp)
2468 if $exit->flag (FLAG_DAMNED);
2469
2039 (async { 2470 (async {
2040 $self->deactivate_recursive; # just to be sure 2471 $self->deactivate_recursive; # just to be sure
2041 unless (eval { 2472 unless (eval {
2042 $self->goto ($slaying, $hp, $sp); 2473 $self->goto ($slaying, $hp, $sp);
2043 2474
2070 2501
2071 utf8::encode $text; 2502 utf8::encode $text;
2072 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2503 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2073} 2504}
2074 2505
2506=item $client->send_msg ($channel, $msg, $color, [extra...])
2507
2508Send a drawinfo or msg packet to the client, formatting the msg for the
2509client if neccessary. C<$type> should be a string identifying the type of
2510the message, with C<log> being the default. If C<$color> is negative, suppress
2511the message unless the client supports the msg packet.
2512
2513=cut
2514
2515sub cf::client::send_msg {
2516 my ($self, $channel, $msg, $color, @extra) = @_;
2517
2518 $msg = $self->pl->expand_cfpod ($msg);
2519
2520 $color &= cf::NDI_CLIENT_MASK; # just in case...
2521
2522 if (ref $channel) {
2523 # send meta info to client, if not yet sent
2524 unless (exists $self->{channel}{$channel->{id}}) {
2525 $self->{channel}{$channel->{id}} = $channel;
2526 $self->ext_msg (channel_info => $channel);
2527 }
2528
2529 $channel = $channel->{id};
2530 }
2531
2532 return unless @extra || length $msg;
2533
2534 if ($self->can_msg) {
2535 # default colour, mask it out
2536 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2537 if $color & cf::NDI_DEF;
2538
2539 $self->send_packet ("msg " . $self->{json_coder}->encode (
2540 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2541 } else {
2542 if ($color >= 0) {
2543 # replace some tags by gcfclient-compatible ones
2544 for ($msg) {
2545 1 while
2546 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2547 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2548 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2549 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2550 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2551 }
2552
2553 $color &= cf::NDI_COLOR_MASK;
2554
2555 if (0 && $msg =~ /\[/) {
2556 $self->send_packet ("drawextinfo $color 4 0 $msg")
2557 } else {
2558 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2559 $self->send_packet ("drawinfo $color $msg")
2560 }
2561 }
2562 }
2563}
2564
2075=item $client->ext_event ($type, %msg) 2565=item $client->ext_msg ($type, @msg)
2076 2566
2077Sends an exti event to the client. 2567Sends an ext event to the client.
2078 2568
2079=cut 2569=cut
2080 2570
2081sub cf::client::ext_event($$%) { 2571sub cf::client::ext_msg($$@) {
2082 my ($self, $type, %msg) = @_; 2572 my ($self, $type, @msg) = @_;
2083 2573
2574 my $extcmd = $self->extcmd;
2575
2576 if ($extcmd == 2) {
2577 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2578 } elsif ($extcmd == 1) { # TODO: remove
2084 $msg{msgtype} = "event_$type"; 2579 push @msg, msgtype => "event_$type";
2085 $self->send_packet ("ext " . cf::to_json \%msg); 2580 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2581 }
2086} 2582}
2087 2583
2088=item $success = $client->query ($flags, "text", \&cb) 2584=item $success = $client->query ($flags, "text", \&cb)
2089 2585
2090Queues a query to the client, calling the given callback with 2586Queues a query to the client, calling the given callback with
2091the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2587the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2092C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2588C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2093 2589
2094Queries can fail, so check the return code. Or don't, as queries will become 2590Queries can fail, so check the return code. Or don't, as queries will
2095reliable at some point in the future. 2591become reliable at some point in the future.
2096 2592
2097=cut 2593=cut
2098 2594
2099sub cf::client::query { 2595sub cf::client::query {
2100 my ($self, $flags, $text, $cb) = @_; 2596 my ($self, $flags, $text, $cb) = @_;
2108 utf8::encode $text; 2604 utf8::encode $text;
2109 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2605 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2110 2606
2111 $self->send_packet ($self->{query_queue}[0][0]) 2607 $self->send_packet ($self->{query_queue}[0][0])
2112 if @{ $self->{query_queue} } == 1; 2608 if @{ $self->{query_queue} } == 1;
2609
2610 1
2113} 2611}
2114 2612
2115cf::client->attach ( 2613cf::client->attach (
2614 on_connect => sub {
2615 my ($ns) = @_;
2616
2617 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2618 },
2116 on_reply => sub { 2619 on_reply => sub {
2117 my ($ns, $msg) = @_; 2620 my ($ns, $msg) = @_;
2118 2621
2119 # this weird shuffling is so that direct followup queries 2622 # this weird shuffling is so that direct followup queries
2120 # get handled first 2623 # get handled first
2132 } else { 2635 } else {
2133 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2636 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2134 } 2637 }
2135 } 2638 }
2136 }, 2639 },
2640 on_exticmd => sub {
2641 my ($ns, $buf) = @_;
2642
2643 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2644
2645 if (ref $msg) {
2646 my ($type, $reply, @payload) =
2647 "ARRAY" eq ref $msg
2648 ? @$msg
2649 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2650
2651 if (my $cb = $EXTICMD{$type}) {
2652 my @reply = $cb->($ns, @payload);
2653
2654 $ns->ext_reply ($reply, @reply)
2655 if $reply;
2656 }
2657 } else {
2658 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2659 }
2660
2661 cf::override;
2662 },
2137); 2663);
2138 2664
2139=item $client->async (\&cb) 2665=item $client->async (\&cb)
2140 2666
2141Create a new coroutine, running the specified callback. The coroutine will 2667Create a new coroutine, running the specified callback. The coroutine will
2190 2716
2191=pod 2717=pod
2192 2718
2193The following functions and methods are available within a safe environment: 2719The following functions and methods are available within a safe environment:
2194 2720
2195 cf::object contr pay_amount pay_player map 2721 cf::object
2722 contr pay_amount pay_player map x y force_find force_add
2723 insert remove
2724
2196 cf::object::player player 2725 cf::object::player
2197 cf::player peaceful 2726 player
2198 cf::map trigger 2727
2728 cf::player
2729 peaceful
2730
2731 cf::map
2732 trigger
2199 2733
2200=cut 2734=cut
2201 2735
2202for ( 2736for (
2203 ["cf::object" => qw(contr pay_amount pay_player map)], 2737 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2738 insert remove)],
2204 ["cf::object::player" => qw(player)], 2739 ["cf::object::player" => qw(player)],
2205 ["cf::player" => qw(peaceful)], 2740 ["cf::player" => qw(peaceful)],
2206 ["cf::map" => qw(trigger)], 2741 ["cf::map" => qw(trigger)],
2207) { 2742) {
2208 no strict 'refs'; 2743 no strict 'refs';
2279=back 2814=back
2280 2815
2281=cut 2816=cut
2282 2817
2283############################################################################# 2818#############################################################################
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 2819# the server's init and main functions
2459 2820
2460sub load_facedata($) { 2821sub load_facedata($) {
2461 my ($path) = @_; 2822 my ($path) = @_;
2462 2823
2474 { 2835 {
2475 my $faces = $facedata->{faceinfo}; 2836 my $faces = $facedata->{faceinfo};
2476 2837
2477 while (my ($face, $info) = each %$faces) { 2838 while (my ($face, $info) = each %$faces) {
2478 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2839 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2479 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2840 cf::face::set_visibility $idx, $info->{visibility};
2841 cf::face::set_magicmap $idx, $info->{magicmap};
2480 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2842 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2481 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2843 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2482 Coro::cede; 2844
2845 cf::cede_to_tick;
2483 } 2846 }
2484 2847
2485 while (my ($face, $info) = each %$faces) { 2848 while (my ($face, $info) = each %$faces) {
2486 next unless $info->{smooth}; 2849 next unless $info->{smooth};
2487 my $idx = cf::face::find $face 2850 my $idx = cf::face::find $face
2488 or next; 2851 or next;
2489 if (my $smooth = cf::face::find $info->{smooth}) { 2852 if (my $smooth = cf::face::find $info->{smooth}) {
2853 cf::face::set_smooth $idx, $smooth;
2490 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2854 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2491 } else { 2855 } else {
2492 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2856 warn "smooth face '$info->{smooth}' not found for face '$face'";
2493 } 2857 }
2494 Coro::cede; 2858
2859 cf::cede_to_tick;
2495 } 2860 }
2496 } 2861 }
2497 2862
2498 { 2863 {
2499 my $anims = $facedata->{animinfo}; 2864 my $anims = $facedata->{animinfo};
2500 2865
2501 while (my ($anim, $info) = each %$anims) { 2866 while (my ($anim, $info) = each %$anims) {
2502 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2867 cf::anim::set $anim, $info->{frames}, $info->{facings};
2503 Coro::cede; 2868 cf::cede_to_tick;
2504 } 2869 }
2505 2870
2506 cf::anim::invalidate_all; # d'oh 2871 cf::anim::invalidate_all; # d'oh
2507 } 2872 }
2508 2873
2874 {
2875 # TODO: for gcfclient pleasure, we should give resources
2876 # that gcfclient doesn't grok a >10000 face index.
2877 my $res = $facedata->{resource};
2878 my $enc = JSON::XS->new->utf8->canonical;
2879
2880 my $soundconf = delete $res->{"res/sound.conf"};
2881
2882 while (my ($name, $info) = each %$res) {
2883 my $meta = $enc->encode ({
2884 name => $name,
2885 %{ $info->{meta} || {} },
2886 });
2887
2888 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2889
2890 if ($info->{type} & 1) {
2891 # prepend meta info
2892
2893 my $data = pack "(w/a*)*", $meta, $info->{data};
2894 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2895
2896 cf::face::set_data $idx, 0, $data, $chk;
2897 } else {
2898 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};
2899 }
2900
2901 cf::face::set_type $idx, $info->{type};
2902
2903 cf::cede_to_tick;
2904 }
2905
2906 if ($soundconf) {
2907 $soundconf = $enc->decode (delete $soundconf->{data});
2908
2909 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2910 my $sound = $soundconf->{compat}[$_]
2911 or next;
2912
2913 my $face = cf::face::find "sound/$sound->[1]";
2914 cf::sound::set $sound->[0] => $face;
2915 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2916 }
2917
2918 while (my ($k, $v) = each %{$soundconf->{event}}) {
2919 my $face = cf::face::find "sound/$v";
2920 cf::sound::set $k => $face;
2921 }
2922 }
2923 }
2924
2509 1 2925 1
2510} 2926}
2927
2928register_exticmd fx_want => sub {
2929 my ($ns, $want) = @_;
2930
2931 while (my ($k, $v) = each %$want) {
2932 $ns->fx_want ($k, $v);
2933 }
2934};
2511 2935
2512sub reload_regions { 2936sub reload_regions {
2513 load_resource_file "$MAPDIR/regions" 2937 load_resource_file "$MAPDIR/regions"
2514 or die "unable to load regions file\n"; 2938 or die "unable to load regions file\n";
2939
2940 for (cf::region::list) {
2941 $_->{match} = qr/$_->{match}/
2942 if exists $_->{match};
2943 }
2515} 2944}
2516 2945
2517sub reload_facedata { 2946sub reload_facedata {
2518 load_facedata "$DATADIR/facedata" 2947 load_facedata "$DATADIR/facedata"
2519 or die "unable to load facedata\n"; 2948 or die "unable to load facedata\n";
2520} 2949}
2521 2950
2522sub reload_archetypes { 2951sub reload_archetypes {
2523 load_resource_file "$DATADIR/archetypes" 2952 load_resource_file "$DATADIR/archetypes"
2524 or die "unable to load archetypes\n"; 2953 or die "unable to load archetypes\n";
2954 #d# NEED to laod twice to resolve forward references
2955 # this really needs to be done in an extra post-pass
2956 # (which needs to be synchronous, so solve it differently)
2957 load_resource_file "$DATADIR/archetypes"
2958 or die "unable to load archetypes\n";
2525} 2959}
2526 2960
2527sub reload_treasures { 2961sub reload_treasures {
2528 load_resource_file "$DATADIR/treasures" 2962 load_resource_file "$DATADIR/treasures"
2529 or die "unable to load treasurelists\n"; 2963 or die "unable to load treasurelists\n";
2532sub reload_resources { 2966sub reload_resources {
2533 warn "reloading resource files...\n"; 2967 warn "reloading resource files...\n";
2534 2968
2535 reload_regions; 2969 reload_regions;
2536 reload_facedata; 2970 reload_facedata;
2971 #reload_archetypes;#d#
2537 reload_archetypes; 2972 reload_archetypes;
2538 reload_treasures; 2973 reload_treasures;
2539 2974
2540 warn "finished reloading resource files\n"; 2975 warn "finished reloading resource files\n";
2541} 2976}
2598 }, 3033 },
2599 ); 3034 );
2600 } 3035 }
2601} 3036}
2602 3037
3038sub write_runtime {
3039 my $runtime = "$LOCALDIR/runtime";
3040
3041 # first touch the runtime file to show we are still running:
3042 # the fsync below can take a very very long time.
3043
3044 IO::AIO::aio_utime $runtime, undef, undef;
3045
3046 my $guard = cf::lock_acquire "write_runtime";
3047
3048 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3049 or return;
3050
3051 my $value = $cf::RUNTIME + 90 + 10;
3052 # 10 is the runtime save interval, for a monotonic clock
3053 # 60 allows for the watchdog to kill the server.
3054
3055 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3056 and return;
3057
3058 # always fsync - this file is important
3059 aio_fsync $fh
3060 and return;
3061
3062 # touch it again to show we are up-to-date
3063 aio_utime $fh, undef, undef;
3064
3065 close $fh
3066 or return;
3067
3068 aio_rename "$runtime~", $runtime
3069 and return;
3070
3071 warn "runtime file written.\n";
3072
3073 1
3074}
3075
2603sub emergency_save() { 3076sub emergency_save() {
2604 my $freeze_guard = cf::freeze_mainloop; 3077 my $freeze_guard = cf::freeze_mainloop;
2605 3078
2606 warn "enter emergency perl save\n"; 3079 warn "enter emergency perl save\n";
2607 3080
2682 %EXT_CORO = (); 3155 %EXT_CORO = ();
2683 3156
2684 warn "removing commands"; 3157 warn "removing commands";
2685 %COMMAND = (); 3158 %COMMAND = ();
2686 3159
2687 warn "removing ext commands"; 3160 warn "removing ext/exti commands";
2688 %EXTCMD = (); 3161 %EXTCMD = ();
3162 %EXTICMD = ();
2689 3163
2690 warn "unloading/nuking all extensions"; 3164 warn "unloading/nuking all extensions";
2691 for my $pkg (@EXTS) { 3165 for my $pkg (@EXTS) {
2692 warn "... unloading $pkg"; 3166 warn "... unloading $pkg";
2693 3167
2811 my $signal = new Coro::Signal; 3285 my $signal = new Coro::Signal;
2812 push @WAIT_FOR_TICK_BEGIN, $signal; 3286 push @WAIT_FOR_TICK_BEGIN, $signal;
2813 $signal->wait; 3287 $signal->wait;
2814} 3288}
2815 3289
3290 my $min = 1e6;#d#
3291 my $avg = 10;
2816$TICK_WATCHER = Event->timer ( 3292$TICK_WATCHER = Event->timer (
2817 reentrant => 0, 3293 reentrant => 0,
2818 parked => 1, 3294 parked => 1,
2819 prio => 0, 3295 prio => 0,
2820 at => $NEXT_TICK || $TICK, 3296 at => $NEXT_TICK || $TICK,
2824 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3300 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2825 unless ++$bug_warning > 10; 3301 unless ++$bug_warning > 10;
2826 return; 3302 return;
2827 } 3303 }
2828 3304
2829 $NOW = Event::time; 3305 $NOW = $tick_start = Event::time;
2830 3306
2831 cf::server_tick; # one server iteration 3307 cf::server_tick; # one server iteration
3308
3309 0 && sync_job {#d#
3310 for(1..10) {
3311 my $t = Event::time;
3312 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3313 or die;
3314
3315 $map->width (50);
3316 $map->height (50);
3317 $map->alloc;
3318 $map->_load_objects ("/tmp/x.map", 1);
3319 my $t = Event::time - $t;
3320
3321 #next unless $t < 0.0013;#d#
3322 if ($t < $min) {
3323 $min = $t;
3324 }
3325 $avg = $avg * 0.99 + $t * 0.01;
3326 }
3327 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3328 exit 0;
3329 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3330 };
2832 3331
2833 $RUNTIME += $TICK; 3332 $RUNTIME += $TICK;
2834 $NEXT_TICK += $TICK; 3333 $NEXT_TICK += $TICK;
2835 3334
2836 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3335 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2842 } 3341 }
2843 3342
2844# my $AFTER = Event::time; 3343# my $AFTER = Event::time;
2845# warn $AFTER - $NOW;#d# 3344# warn $AFTER - $NOW;#d#
2846 3345
3346 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3347 $sig->send;
3348 }
3349 while (my $sig = shift @WAIT_FOR_TICK) {
3350 $sig->send;
3351 }
3352
3353 $NOW = Event::time;
3354
2847 # if we are delayed by four ticks or more, skip them all 3355 # if we are delayed by four ticks or more, skip them all
2848 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3356 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2849 3357
2850 $TICK_WATCHER->at ($NEXT_TICK); 3358 $TICK_WATCHER->at ($NEXT_TICK);
2851 $TICK_WATCHER->start; 3359 $TICK_WATCHER->start;
2852 3360
2853 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3361 $LOAD = ($NOW - $tick_start) / $TICK;
2854 $sig->send; 3362 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2855 }
2856 while (my $sig = shift @WAIT_FOR_TICK) {
2857 $sig->send;
2858 }
2859 3363
2860 _post_tick; 3364 _post_tick;
3365
3366
2861 }, 3367 },
2862); 3368);
2863 3369
2864{ 3370{
2865 BDB::max_poll_time $TICK * 0.1; 3371 BDB::max_poll_time $TICK * 0.1;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines