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.261 by root, Fri Apr 27 20:09:48 2007 UTC vs.
Revision 1.270 by root, Sat May 26 15:44:06 2007 UTC

… …
90our $LINK_MAP; # the special {link} map, which is always available 90our $LINK_MAP; # the special {link} map, which is always available
91 91
92# used to convert map paths into valid unix filenames by replacing / by ∕ 92# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 94
95our $LOAD; # a number between 0 (idle) and 1 (too many objects)
96our $LOADAVG; # same thing, but with alpha-smoothing
97our $tick_start; # for load detecting purposes
98
95binmode STDOUT; 99binmode STDOUT;
96binmode STDERR; 100binmode STDERR;
97 101
98# read virtual server time, if available 102# read virtual server time, if available
99unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 103unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
… …
138The time of the last (current) server tick. 142The time of the last (current) server tick.
139 143
140=item $cf::TICK 144=item $cf::TICK
141 145
142The interval between server ticks, in seconds. 146The interval between server ticks, in seconds.
147
148=item $cf::LOADAVG
149
150The current CPU load on the server (alpha-smoothed), as a value between 0
151(none) and 1 (overloaded), indicating how much time is spent on processing
152objects per tick. Healthy values are < 0.5.
153
154=item $cf::LOAD
155
156The raw value load value from the last tick.
143 157
144=item %cf::CFG 158=item %cf::CFG
145 159
146Configuration for the server, loaded from C</etc/crossfire/config>, or 160Configuration for the server, loaded from C</etc/crossfire/config>, or
147from wherever your confdir points to. 161from wherever your confdir points to.
… …
318 332
319sub sync_job(&) { 333sub sync_job(&) {
320 my ($job) = @_; 334 my ($job) = @_;
321 335
322 if ($Coro::current == $Coro::main) { 336 if ($Coro::current == $Coro::main) {
337 my $time = Event::time;
338
323 # this is the main coro, too bad, we have to block 339 # this is the main coro, too bad, we have to block
324 # till the operation succeeds, freezing the server :/ 340 # till the operation succeeds, freezing the server :/
325 341
326 # TODO: use suspend/resume instead 342 # TODO: use suspend/resume instead
327 # (but this is cancel-safe) 343 # (but this is cancel-safe)
… …
338 354
339 while ($busy) { 355 while ($busy) {
340 Coro::cede or Event::one_event; 356 Coro::cede or Event::one_event;
341 } 357 }
342 358
359 $time = Event::time - $time;
360
361 LOG llevError | logBacktrace, Carp::longmess "long sync job"
362 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
363
364 $tick_start += $time; # do not account sync jobs to server load
365
343 wantarray ? @res : $res[0] 366 wantarray ? @res : $res[0]
344 } else { 367 } else {
345 # we are in another coroutine, how wonderful, everything just works 368 # we are in another coroutine, how wonderful, everything just works
346 369
347 $job->() 370 $job->()
… …
367 390
368 $coro 391 $coro
369} 392}
370 393
371sub write_runtime { 394sub write_runtime {
395 my $runtime = "$LOCALDIR/runtime";
396
397 # first touch the runtime file to show we are still running:
398 # the fsync below can take a very very long time.
399
400 if (my $fh = aio_open $runtime, O_WRONLY, 0) {
401 utime undef, undef, $fh;
402 }
403
372 my $guard = cf::lock_acquire "write_runtime"; 404 my $guard = cf::lock_acquire "write_runtime";
373
374 my $runtime = "$LOCALDIR/runtime";
375 405
376 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 406 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
377 or return; 407 or return;
378 408
379 my $value = $cf::RUNTIME + 90 + 10; 409 my $value = $cf::RUNTIME + 90 + 10;
… …
385 415
386 # always fsync - this file is important 416 # always fsync - this file is important
387 aio_fsync $fh 417 aio_fsync $fh
388 and return; 418 and return;
389 419
420 # touch it again to show we are up-to-date
421 utime undef, undef, $fh;
422
390 close $fh 423 close $fh
391 or return; 424 or return;
392 425
393 aio_rename "$runtime~", $runtime 426 aio_rename "$runtime~", $runtime
394 and return; 427 and return;
428
429 warn "runtime file written.\n";#d#
395 430
396 1 431 1
397} 432}
398 433
399=item cf::datalog type => key => value, ... 434=item cf::datalog type => key => value, ...
… …
592 $registry = $CB_TYPE[$object_type] ||= []; 627 $registry = $CB_TYPE[$object_type] ||= [];
593 628
594 } elsif ($type eq "subtype") { 629 } elsif ($type eq "subtype") {
595 defined $object_type or Carp::croak "subtype specified without type"; 630 defined $object_type or Carp::croak "subtype specified without type";
596 my $object_subtype = shift @arg; 631 my $object_subtype = shift @arg;
597 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 632 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
598 633
599 } elsif ($type eq "package") { 634 } elsif ($type eq "package") {
600 my $pkg = shift @arg; 635 my $pkg = shift @arg;
601 636
602 while (my ($name, $id) = each %cb_id) { 637 while (my ($name, $id) = each %cb_id) {
… …
643 if (ref $_[0]) { 678 if (ref $_[0]) {
644 _object_attach @_; 679 _object_attach @_;
645 } else { 680 } else {
646 _attach shift->_attach_registry, @_; 681 _attach shift->_attach_registry, @_;
647 } 682 }
683 _recalc_want;
648}; 684};
649 685
650# all those should be optimised 686# all those should be optimised
651sub cf::attachable::detach { 687sub cf::attachable::detach {
652 my ($obj, $name) = @_; 688 my ($obj, $name) = @_;
… …
655 delete $obj->{_attachment}{$name}; 691 delete $obj->{_attachment}{$name};
656 reattach ($obj); 692 reattach ($obj);
657 } else { 693 } else {
658 Carp::croak "cannot, currently, detach class attachments"; 694 Carp::croak "cannot, currently, detach class attachments";
659 } 695 }
696 _recalc_want;
660}; 697};
661 698
662sub cf::attachable::attached { 699sub cf::attachable::attached {
663 my ($obj, $name) = @_; 700 my ($obj, $name) = @_;
664 701
… …
1867 $self->deactivate_recursive; 1904 $self->deactivate_recursive;
1868 1905
1869 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1906 return if UNIVERSAL::isa $self->map, "ext::map_link";
1870 1907
1871 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1908 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1872 if $self->map; 1909 if $self->map && $self->map->{path} ne "{link}";
1873 1910
1874 $self->enter_map ($LINK_MAP || link_map, 10, 10); 1911 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1875} 1912}
1876 1913
1877sub cf::object::player::leave_link { 1914sub cf::object::player::leave_link {
1878 my ($self, $map, $x, $y) = @_; 1915 my ($self, $map, $x, $y) = @_;
1916
1917 return unless $self->contr->active;
1879 1918
1880 my $link_pos = delete $self->{_link_pos}; 1919 my $link_pos = delete $self->{_link_pos};
1881 1920
1882 unless ($map) { 1921 unless ($map) {
1883 # restore original map position 1922 # restore original map position
… …
1906 1945
1907 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 1946 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1908 $self->enter_map ($map, $x, $y); 1947 $self->enter_map ($map, $x, $y);
1909} 1948}
1910 1949
1911cf::player->attach (
1912 on_logout => sub {
1913 my ($pl) = @_;
1914
1915 # abort map switching before logout
1916 if ($pl->ob->{_link_pos}) {
1917 cf::sync_job {
1918 $pl->ob->leave_link
1919 };
1920 }
1921 },
1922 on_login => sub {
1923 my ($pl) = @_;
1924
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) 1950=item $player_object->goto ($path, $x, $y[, $check->($map)])
1944 1951
1952Moves the player to the given map-path and coordinates by first freezing
1953her, loading and preparing them map, calling the provided $check callback
1954that has to return the map if sucecssful, and then unfreezes the player on
1955the new (success) or old (failed) map position.
1956
1945=cut 1957=cut
1958
1959our $GOTOGEN;
1946 1960
1947sub cf::object::player::goto { 1961sub cf::object::player::goto {
1948 my ($self, $path, $x, $y) = @_; 1962 my ($self, $path, $x, $y, $check) = @_;
1963
1964 # do generation counting so two concurrent goto's will be executed in-order
1965 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1949 1966
1950 $self->enter_link; 1967 $self->enter_link;
1951 1968
1952 (async { 1969 (async {
1953 my $map = eval { 1970 my $map = eval {
1954 my $map = cf::map::find $path; 1971 my $map = cf::map::find $path;
1972
1973 if ($map) {
1955 $map = $map->customise_for ($self) if $map; 1974 $map = $map->customise_for ($self);
1975 $map = $check->($map) if $check && $map;
1976 } else {
1977 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1978 }
1979
1956 $map 1980 $map
1981 };
1982
1983 if ($@) {
1984 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
1985 LOG llevError | logBacktrace, Carp::longmess $@;
1957 } or 1986 }
1958 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1959 1987
1988 if ($gen == $self->{_goto_generation}) {
1989 delete $self->{_goto_generation};
1960 $self->leave_link ($map, $x, $y); 1990 $self->leave_link ($map, $x, $y);
1991 }
1961 })->prio (1); 1992 })->prio (1);
1962} 1993}
1963 1994
1964=item $player_object->enter_exit ($exit_object) 1995=item $player_object->enter_exit ($exit_object)
1965 1996
… …
2435 2466
2436 die $$res unless "ARRAY" eq ref $res; 2467 die $$res unless "ARRAY" eq ref $res;
2437 2468
2438 return wantarray ? @$res : $res->[-1]; 2469 return wantarray ? @$res : $res->[-1];
2439 } else { 2470 } else {
2471 reset_signals;
2440 local $SIG{__WARN__}; 2472 local $SIG{__WARN__};
2473 local $SIG{__DIE__};
2441 eval { 2474 eval {
2442 local $SIG{__DIE__};
2443 close $fh1; 2475 close $fh1;
2444 2476
2445 my @res = eval { $cb->(@args) }; 2477 my @res = eval { $cb->(@args) };
2446 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 2478 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2447 }; 2479 };
… …
2810 my $signal = new Coro::Signal; 2842 my $signal = new Coro::Signal;
2811 push @WAIT_FOR_TICK_BEGIN, $signal; 2843 push @WAIT_FOR_TICK_BEGIN, $signal;
2812 $signal->wait; 2844 $signal->wait;
2813} 2845}
2814 2846
2847 my $min = 1e6;#d#
2848 my $avg = 10;
2815$TICK_WATCHER = Event->timer ( 2849$TICK_WATCHER = Event->timer (
2816 reentrant => 0, 2850 reentrant => 0,
2817 parked => 1, 2851 parked => 1,
2818 prio => 0, 2852 prio => 0,
2819 at => $NEXT_TICK || $TICK, 2853 at => $NEXT_TICK || $TICK,
… …
2823 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 2857 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2824 unless ++$bug_warning > 10; 2858 unless ++$bug_warning > 10;
2825 return; 2859 return;
2826 } 2860 }
2827 2861
2828 $NOW = Event::time; 2862 $NOW = $tick_start = Event::time;
2829 2863
2830 cf::server_tick; # one server iteration 2864 cf::server_tick; # one server iteration
2865
2866 0 && sync_job {#d#
2867 for(1..10) {
2868 my $t = Event::time;
2869 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2870 or die;
2871
2872 $map->width (50);
2873 $map->height (50);
2874 $map->alloc;
2875 $map->_load_objects ("/tmp/x.map", 1);
2876 my $t = Event::time - $t;
2877
2878 #next unless $t < 0.0013;#d#
2879 if ($t < $min) {
2880 $min = $t;
2881 }
2882 $avg = $avg * 0.99 + $t * 0.01;
2883 }
2884 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2885 exit 0;
2886 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2887 };
2831 2888
2832 $RUNTIME += $TICK; 2889 $RUNTIME += $TICK;
2833 $NEXT_TICK += $TICK; 2890 $NEXT_TICK += $TICK;
2834 2891
2835 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2892 if ($NOW >= $NEXT_RUNTIME_WRITE) {
… …
2841 } 2898 }
2842 2899
2843# my $AFTER = Event::time; 2900# my $AFTER = Event::time;
2844# warn $AFTER - $NOW;#d# 2901# warn $AFTER - $NOW;#d#
2845 2902
2903 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2904 $sig->send;
2905 }
2906 while (my $sig = shift @WAIT_FOR_TICK) {
2907 $sig->send;
2908 }
2909
2910 $NOW = Event::time;
2911
2846 # if we are delayed by four ticks or more, skip them all 2912 # if we are delayed by four ticks or more, skip them all
2847 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2913 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2848 2914
2849 $TICK_WATCHER->at ($NEXT_TICK); 2915 $TICK_WATCHER->at ($NEXT_TICK);
2850 $TICK_WATCHER->start; 2916 $TICK_WATCHER->start;
2851 2917
2852 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 2918 $LOAD = ($NOW - $tick_start) / $TICK;
2853 $sig->send; 2919 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2854 }
2855 while (my $sig = shift @WAIT_FOR_TICK) {
2856 $sig->send;
2857 }
2858 2920
2859 _post_tick; 2921 _post_tick;
2922
2923
2860 }, 2924 },
2861); 2925);
2862 2926
2863{ 2927{
2864 BDB::max_poll_time $TICK * 0.1; 2928 BDB::max_poll_time $TICK * 0.1;
… …
2923 prio => 6, 2987 prio => 6,
2924 cb => \&IO::AIO::poll_cb, 2988 cb => \&IO::AIO::poll_cb,
2925 ); 2989 );
2926} 2990}
2927 2991
2992my $_log_backtrace;
2993
2928sub _log_backtrace { 2994sub _log_backtrace {
2929 my ($msg, @addr) = @_; 2995 my ($msg, @addr) = @_;
2930 2996
2997 $msg =~ s/\n//;
2998
2999 # limit the # of concurrent backtraces
3000 if ($_log_backtrace < 2) {
3001 ++$_log_backtrace;
2931 async { 3002 async {
2932 my @bt = fork_call { 3003 my @bt = fork_call {
2933 @addr = map { sprintf "%x", $_ } @addr; 3004 @addr = map { sprintf "%x", $_ } @addr;
2934 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3005 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
2935 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3006 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
2936 or die "addr2line: $!"; 3007 or die "addr2line: $!";
2937 3008
2938 my @funcs; 3009 my @funcs;
2939 my @res = <$fh>; 3010 my @res = <$fh>;
2940 chomp for @res; 3011 chomp for @res;
2941 while (@res) { 3012 while (@res) {
2942 my ($func, $line) = splice @res, 0, 2, (); 3013 my ($func, $line) = splice @res, 0, 2, ();
2943 push @funcs, "[$func] $line"; 3014 push @funcs, "[$func] $line";
3015 }
3016
3017 @funcs
2944 } 3018 };
2945 3019
2946 @funcs 3020 LOG llevInfo, "[ABT] $msg\n";
3021 LOG llevInfo, "[ABT] $_\n" for @bt;
3022 --$_log_backtrace;
2947 }; 3023 };
2948 3024 } else {
2949 $msg =~ s/\n//;
2950
2951 LOG llevInfo, "[ABT] $msg\n"; 3025 LOG llevInfo, "[ABT] $msg\n";
2952 LOG llevInfo, "[ABT] $_\n" for @bt; 3026 LOG llevInfo, "[ABT] [suppressed]\n";
2953 }; 3027 }
2954} 3028}
2955 3029
2956# load additional modules 3030# load additional modules
2957use cf::pod; 3031use cf::pod;
2958 3032

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines