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.260 by root, Fri Apr 27 19:53:05 2007 UTC vs.
Revision 1.271 by root, Fri Jun 1 06:04:08 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 IO::AIO::aio_utime $runtime, undef, undef;
401
372 my $guard = cf::lock_acquire "write_runtime"; 402 my $guard = cf::lock_acquire "write_runtime";
373
374 my $runtime = "$LOCALDIR/runtime";
375 403
376 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 404 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
377 or return; 405 or return;
378 406
379 my $value = $cf::RUNTIME + 90 + 10; 407 my $value = $cf::RUNTIME + 90 + 10;
… …
385 413
386 # always fsync - this file is important 414 # always fsync - this file is important
387 aio_fsync $fh 415 aio_fsync $fh
388 and return; 416 and return;
389 417
418 # touch it again to show we are up-to-date
419 aio_utime $fh, undef, undef;
420
390 close $fh 421 close $fh
391 or return; 422 or return;
392 423
393 aio_rename "$runtime~", $runtime 424 aio_rename "$runtime~", $runtime
394 and return; 425 and return;
426
427 warn "runtime file written.\n";#d#
395 428
396 1 429 1
397} 430}
398 431
399=item cf::datalog type => key => value, ... 432=item cf::datalog type => key => value, ...
… …
592 $registry = $CB_TYPE[$object_type] ||= []; 625 $registry = $CB_TYPE[$object_type] ||= [];
593 626
594 } elsif ($type eq "subtype") { 627 } elsif ($type eq "subtype") {
595 defined $object_type or Carp::croak "subtype specified without type"; 628 defined $object_type or Carp::croak "subtype specified without type";
596 my $object_subtype = shift @arg; 629 my $object_subtype = shift @arg;
597 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 630 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
598 631
599 } elsif ($type eq "package") { 632 } elsif ($type eq "package") {
600 my $pkg = shift @arg; 633 my $pkg = shift @arg;
601 634
602 while (my ($name, $id) = each %cb_id) { 635 while (my ($name, $id) = each %cb_id) {
… …
643 if (ref $_[0]) { 676 if (ref $_[0]) {
644 _object_attach @_; 677 _object_attach @_;
645 } else { 678 } else {
646 _attach shift->_attach_registry, @_; 679 _attach shift->_attach_registry, @_;
647 } 680 }
681 _recalc_want;
648}; 682};
649 683
650# all those should be optimised 684# all those should be optimised
651sub cf::attachable::detach { 685sub cf::attachable::detach {
652 my ($obj, $name) = @_; 686 my ($obj, $name) = @_;
… …
655 delete $obj->{_attachment}{$name}; 689 delete $obj->{_attachment}{$name};
656 reattach ($obj); 690 reattach ($obj);
657 } else { 691 } else {
658 Carp::croak "cannot, currently, detach class attachments"; 692 Carp::croak "cannot, currently, detach class attachments";
659 } 693 }
694 _recalc_want;
660}; 695};
661 696
662sub cf::attachable::attached { 697sub cf::attachable::attached {
663 my ($obj, $name) = @_; 698 my ($obj, $name) = @_;
664 699
… …
1867 $self->deactivate_recursive; 1902 $self->deactivate_recursive;
1868 1903
1869 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1904 return if UNIVERSAL::isa $self->map, "ext::map_link";
1870 1905
1871 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1906 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1872 if $self->map; 1907 if $self->map && $self->map->{path} ne "{link}";
1873 1908
1874 $self->enter_map ($LINK_MAP || link_map, 10, 10); 1909 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1875} 1910}
1876 1911
1877sub cf::object::player::leave_link { 1912sub cf::object::player::leave_link {
1878 my ($self, $map, $x, $y) = @_; 1913 my ($self, $map, $x, $y) = @_;
1914
1915 return unless $self->contr->active;
1879 1916
1880 my $link_pos = delete $self->{_link_pos}; 1917 my $link_pos = delete $self->{_link_pos};
1881 1918
1882 unless ($map) { 1919 unless ($map) {
1883 # restore original map position 1920 # restore original map position
… …
1906 1943
1907 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 1944 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1908 $self->enter_map ($map, $x, $y); 1945 $self->enter_map ($map, $x, $y);
1909} 1946}
1910 1947
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) 1948=item $player_object->goto ($path, $x, $y[, $check->($map)])
1944 1949
1950Moves the player to the given map-path and coordinates by first freezing
1951her, loading and preparing them map, calling the provided $check callback
1952that has to return the map if sucecssful, and then unfreezes the player on
1953the new (success) or old (failed) map position.
1954
1945=cut 1955=cut
1956
1957our $GOTOGEN;
1946 1958
1947sub cf::object::player::goto { 1959sub cf::object::player::goto {
1948 my ($self, $path, $x, $y) = @_; 1960 my ($self, $path, $x, $y, $check) = @_;
1961
1962 # do generation counting so two concurrent goto's will be executed in-order
1963 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1949 1964
1950 $self->enter_link; 1965 $self->enter_link;
1951 1966
1952 (async { 1967 (async {
1953 my $map = eval { 1968 my $map = eval {
1954 my $map = cf::map::find $path; 1969 my $map = cf::map::find $path;
1970
1971 if ($map) {
1955 $map = $map->customise_for ($self) if $map; 1972 $map = $map->customise_for ($self);
1973 $map = $check->($map) if $check && $map;
1974 } else {
1975 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1976 }
1977
1956 $map 1978 $map
1979 };
1980
1981 if ($@) {
1982 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
1983 LOG llevError | logBacktrace, Carp::longmess $@;
1957 } or 1984 }
1958 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1959 1985
1986 if ($gen == $self->{_goto_generation}) {
1987 delete $self->{_goto_generation};
1960 $self->leave_link ($map, $x, $y); 1988 $self->leave_link ($map, $x, $y);
1989 }
1961 })->prio (1); 1990 })->prio (1);
1962} 1991}
1963 1992
1964=item $player_object->enter_exit ($exit_object) 1993=item $player_object->enter_exit ($exit_object)
1965 1994
… …
2435 2464
2436 die $$res unless "ARRAY" eq ref $res; 2465 die $$res unless "ARRAY" eq ref $res;
2437 2466
2438 return wantarray ? @$res : $res->[-1]; 2467 return wantarray ? @$res : $res->[-1];
2439 } else { 2468 } else {
2469 reset_signals;
2440 local $SIG{__WARN__}; 2470 local $SIG{__WARN__};
2471 local $SIG{__DIE__};
2441 eval { 2472 eval {
2442 local $SIG{__DIE__};
2443 close $fh1; 2473 close $fh1;
2444 2474
2445 my @res = eval { $cb->(@args) }; 2475 my @res = eval { $cb->(@args) };
2446 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 2476 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2447 }; 2477 };
2448 2478
2449 warn $@ if $@; 2479 warn $@ if $@;
2450 _exit 0; 2480 _exit 0;
2451 } 2481 }
2452} 2482}
2453
2454
2455 2483
2456############################################################################# 2484#############################################################################
2457# the server's init and main functions 2485# the server's init and main functions
2458 2486
2459sub load_facedata($) { 2487sub load_facedata($) {
… …
2810 my $signal = new Coro::Signal; 2838 my $signal = new Coro::Signal;
2811 push @WAIT_FOR_TICK_BEGIN, $signal; 2839 push @WAIT_FOR_TICK_BEGIN, $signal;
2812 $signal->wait; 2840 $signal->wait;
2813} 2841}
2814 2842
2843 my $min = 1e6;#d#
2844 my $avg = 10;
2815$TICK_WATCHER = Event->timer ( 2845$TICK_WATCHER = Event->timer (
2816 reentrant => 0, 2846 reentrant => 0,
2817 parked => 1, 2847 parked => 1,
2818 prio => 0, 2848 prio => 0,
2819 at => $NEXT_TICK || $TICK, 2849 at => $NEXT_TICK || $TICK,
… …
2823 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 2853 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2824 unless ++$bug_warning > 10; 2854 unless ++$bug_warning > 10;
2825 return; 2855 return;
2826 } 2856 }
2827 2857
2828 $NOW = Event::time; 2858 $NOW = $tick_start = Event::time;
2829 2859
2830 cf::server_tick; # one server iteration 2860 cf::server_tick; # one server iteration
2861
2862 0 && sync_job {#d#
2863 for(1..10) {
2864 my $t = Event::time;
2865 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2866 or die;
2867
2868 $map->width (50);
2869 $map->height (50);
2870 $map->alloc;
2871 $map->_load_objects ("/tmp/x.map", 1);
2872 my $t = Event::time - $t;
2873
2874 #next unless $t < 0.0013;#d#
2875 if ($t < $min) {
2876 $min = $t;
2877 }
2878 $avg = $avg * 0.99 + $t * 0.01;
2879 }
2880 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2881 exit 0;
2882 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2883 };
2831 2884
2832 $RUNTIME += $TICK; 2885 $RUNTIME += $TICK;
2833 $NEXT_TICK += $TICK; 2886 $NEXT_TICK += $TICK;
2834 2887
2835 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2888 if ($NOW >= $NEXT_RUNTIME_WRITE) {
… …
2841 } 2894 }
2842 2895
2843# my $AFTER = Event::time; 2896# my $AFTER = Event::time;
2844# warn $AFTER - $NOW;#d# 2897# warn $AFTER - $NOW;#d#
2845 2898
2899 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2900 $sig->send;
2901 }
2902 while (my $sig = shift @WAIT_FOR_TICK) {
2903 $sig->send;
2904 }
2905
2906 $NOW = Event::time;
2907
2846 # if we are delayed by four ticks or more, skip them all 2908 # if we are delayed by four ticks or more, skip them all
2847 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2909 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2848 2910
2849 $TICK_WATCHER->at ($NEXT_TICK); 2911 $TICK_WATCHER->at ($NEXT_TICK);
2850 $TICK_WATCHER->start; 2912 $TICK_WATCHER->start;
2851 2913
2852 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 2914 $LOAD = ($NOW - $tick_start) / $TICK;
2853 $sig->send; 2915 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2854 }
2855 while (my $sig = shift @WAIT_FOR_TICK) {
2856 $sig->send;
2857 }
2858 2916
2859 _post_tick; 2917 _post_tick;
2918
2919
2860 }, 2920 },
2861); 2921);
2862 2922
2863{ 2923{
2864 BDB::max_poll_time $TICK * 0.1; 2924 BDB::max_poll_time $TICK * 0.1;
… …
2923 prio => 6, 2983 prio => 6,
2924 cb => \&IO::AIO::poll_cb, 2984 cb => \&IO::AIO::poll_cb,
2925 ); 2985 );
2926} 2986}
2927 2987
2988my $_log_backtrace;
2989
2928sub _log_backtrace { 2990sub _log_backtrace {
2929 my ($msg, @addr) = @_; 2991 my ($msg, @addr) = @_;
2930 2992
2993 $msg =~ s/\n//;
2994
2995 # limit the # of concurrent backtraces
2996 if ($_log_backtrace < 2) {
2997 ++$_log_backtrace;
2931 async { 2998 async {
2932 my @bt = fork_call { 2999 my @bt = fork_call {
2933 @addr = map { sprintf "%x", $_ } @addr; 3000 @addr = map { sprintf "%x", $_ } @addr;
3001 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
2934 open my $fh, "exec addr2line -C -f -i -e \Q$^X\E @addr 2>&1 |" 3002 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
2935 or die "addr2line: $!"; 3003 or die "addr2line: $!";
2936 3004
2937 my @funcs; 3005 my @funcs;
2938 my @res = <$fh>; 3006 my @res = <$fh>;
2939 chomp for @res; 3007 chomp for @res;
2940 while (@res) { 3008 while (@res) {
2941 my ($func, $line) = splice @res, 0, 2, (); 3009 my ($func, $line) = splice @res, 0, 2, ();
2942 push @funcs, "[$func] $line"; 3010 push @funcs, "[$func] $line";
3011 }
3012
3013 @funcs
2943 } 3014 };
2944 3015
2945 @funcs 3016 LOG llevInfo, "[ABT] $msg\n";
3017 LOG llevInfo, "[ABT] $_\n" for @bt;
3018 --$_log_backtrace;
2946 }; 3019 };
2947 3020 } else {
2948 $msg =~ s/\n//;
2949
2950 LOG llevInfo, "[ABT] $msg\n"; 3021 LOG llevInfo, "[ABT] $msg\n";
2951 LOG llevInfo, "[ABT] $_\n" for @bt; 3022 LOG llevInfo, "[ABT] [suppressed]\n";
2952 }; 3023 }
2953} 3024}
2954 3025
2955# load additional modules 3026# load additional modules
2956use cf::pod; 3027use cf::pod;
2957 3028

Diff Legend

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