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.268 by root, Tue May 22 10:50:00 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
… …
1938 })->prio (2); 1975 })->prio (2);
1939 } 1976 }
1940 }, 1977 },
1941); 1978);
1942 1979
1943=item $player_object->goto ($path, $x, $y) 1980=item $player_object->goto ($path, $x, $y[, $check->($map)])
1981
1982Moves the player to the given map-path and coordinates by first freezing
1983her, loading and preparing them map, calling the provided $check callback
1984that has to return the map if sucecssful, and then unfreezes the player on
1985the new (success) or old (failed) map position.
1944 1986
1945=cut 1987=cut
1946 1988
1947sub cf::object::player::goto { 1989sub cf::object::player::goto {
1948 my ($self, $path, $x, $y) = @_; 1990 my ($self, $path, $x, $y, $check) = @_;
1991
1992 #d# #TODO#
1993 if ($check && !ref $check) {
1994 warn Carp::longmess "goto called with non-ref check argument";#d#
1995 undef $check;
1996 }
1949 1997
1950 $self->enter_link; 1998 $self->enter_link;
1951 1999
1952 (async { 2000 (async {
1953 my $map = eval { 2001 my $map = eval {
1954 my $map = cf::map::find $path; 2002 my $map = cf::map::find $path;
2003
2004 if ($map) {
1955 $map = $map->customise_for ($self) if $map; 2005 $map = $map->customise_for ($self);
2006 $map = $check->($map) if $check && $map;
2007 } else {
2008 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2009 }
2010
1956 $map 2011 $map
2012 };
2013
2014 if ($@) {
2015 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2016 LOG llevError | logBacktrace, Carp::longmess $@;
1957 } or 2017 }
1958 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1959 2018
1960 $self->leave_link ($map, $x, $y); 2019 $self->leave_link ($map, $x, $y);
1961 })->prio (1); 2020 })->prio (1);
1962} 2021}
1963 2022
… …
2435 2494
2436 die $$res unless "ARRAY" eq ref $res; 2495 die $$res unless "ARRAY" eq ref $res;
2437 2496
2438 return wantarray ? @$res : $res->[-1]; 2497 return wantarray ? @$res : $res->[-1];
2439 } else { 2498 } else {
2499 reset_signals;
2440 local $SIG{__WARN__}; 2500 local $SIG{__WARN__};
2501 local $SIG{__DIE__};
2441 eval { 2502 eval {
2442 local $SIG{__DIE__};
2443 close $fh1; 2503 close $fh1;
2444 2504
2445 my @res = eval { $cb->(@args) }; 2505 my @res = eval { $cb->(@args) };
2446 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 2506 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2447 }; 2507 };
… …
2810 my $signal = new Coro::Signal; 2870 my $signal = new Coro::Signal;
2811 push @WAIT_FOR_TICK_BEGIN, $signal; 2871 push @WAIT_FOR_TICK_BEGIN, $signal;
2812 $signal->wait; 2872 $signal->wait;
2813} 2873}
2814 2874
2875 my $min = 1e6;#d#
2876 my $avg = 10;
2815$TICK_WATCHER = Event->timer ( 2877$TICK_WATCHER = Event->timer (
2816 reentrant => 0, 2878 reentrant => 0,
2817 parked => 1, 2879 parked => 1,
2818 prio => 0, 2880 prio => 0,
2819 at => $NEXT_TICK || $TICK, 2881 at => $NEXT_TICK || $TICK,
… …
2823 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 2885 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2824 unless ++$bug_warning > 10; 2886 unless ++$bug_warning > 10;
2825 return; 2887 return;
2826 } 2888 }
2827 2889
2828 $NOW = Event::time; 2890 $NOW = $tick_start = Event::time;
2829 2891
2830 cf::server_tick; # one server iteration 2892 cf::server_tick; # one server iteration
2893
2894 0 && sync_job {#d#
2895 for(1..10) {
2896 my $t = Event::time;
2897 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2898 or die;
2899
2900 $map->width (50);
2901 $map->height (50);
2902 $map->alloc;
2903 $map->_load_objects ("/tmp/x.map", 1);
2904 my $t = Event::time - $t;
2905
2906 #next unless $t < 0.0013;#d#
2907 if ($t < $min) {
2908 $min = $t;
2909 }
2910 $avg = $avg * 0.99 + $t * 0.01;
2911 }
2912 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2913 exit 0;
2914 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2915 };
2831 2916
2832 $RUNTIME += $TICK; 2917 $RUNTIME += $TICK;
2833 $NEXT_TICK += $TICK; 2918 $NEXT_TICK += $TICK;
2834 2919
2835 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2920 if ($NOW >= $NEXT_RUNTIME_WRITE) {
… …
2841 } 2926 }
2842 2927
2843# my $AFTER = Event::time; 2928# my $AFTER = Event::time;
2844# warn $AFTER - $NOW;#d# 2929# warn $AFTER - $NOW;#d#
2845 2930
2931 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2932 $sig->send;
2933 }
2934 while (my $sig = shift @WAIT_FOR_TICK) {
2935 $sig->send;
2936 }
2937
2938 $NOW = Event::time;
2939
2846 # if we are delayed by four ticks or more, skip them all 2940 # if we are delayed by four ticks or more, skip them all
2847 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2941 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2848 2942
2849 $TICK_WATCHER->at ($NEXT_TICK); 2943 $TICK_WATCHER->at ($NEXT_TICK);
2850 $TICK_WATCHER->start; 2944 $TICK_WATCHER->start;
2851 2945
2852 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 2946 $LOAD = ($NOW - $tick_start) / $TICK;
2853 $sig->send; 2947 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2854 }
2855 while (my $sig = shift @WAIT_FOR_TICK) {
2856 $sig->send;
2857 }
2858 2948
2859 _post_tick; 2949 _post_tick;
2950
2951
2860 }, 2952 },
2861); 2953);
2862 2954
2863{ 2955{
2864 BDB::max_poll_time $TICK * 0.1; 2956 BDB::max_poll_time $TICK * 0.1;
… …
2923 prio => 6, 3015 prio => 6,
2924 cb => \&IO::AIO::poll_cb, 3016 cb => \&IO::AIO::poll_cb,
2925 ); 3017 );
2926} 3018}
2927 3019
3020my $_log_backtrace;
3021
2928sub _log_backtrace { 3022sub _log_backtrace {
2929 my ($msg, @addr) = @_; 3023 my ($msg, @addr) = @_;
2930 3024
3025 $msg =~ s/\n//;
3026
3027 # limit the # of concurrent backtraces
3028 if ($_log_backtrace < 2) {
3029 ++$_log_backtrace;
2931 async { 3030 async {
2932 my @bt = fork_call { 3031 my @bt = fork_call {
2933 @addr = map { sprintf "%x", $_ } @addr; 3032 @addr = map { sprintf "%x", $_ } @addr;
2934 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3033 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
2935 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3034 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
2936 or die "addr2line: $!"; 3035 or die "addr2line: $!";
2937 3036
2938 my @funcs; 3037 my @funcs;
2939 my @res = <$fh>; 3038 my @res = <$fh>;
2940 chomp for @res; 3039 chomp for @res;
2941 while (@res) { 3040 while (@res) {
2942 my ($func, $line) = splice @res, 0, 2, (); 3041 my ($func, $line) = splice @res, 0, 2, ();
2943 push @funcs, "[$func] $line"; 3042 push @funcs, "[$func] $line";
3043 }
3044
3045 @funcs
2944 } 3046 };
2945 3047
2946 @funcs 3048 LOG llevInfo, "[ABT] $msg\n";
3049 LOG llevInfo, "[ABT] $_\n" for @bt;
3050 --$_log_backtrace;
2947 }; 3051 };
2948 3052 } else {
2949 $msg =~ s/\n//;
2950
2951 LOG llevInfo, "[ABT] $msg\n"; 3053 LOG llevInfo, "[ABT] $msg\n";
2952 LOG llevInfo, "[ABT] $_\n" for @bt; 3054 LOG llevInfo, "[ABT] [suppressed]\n";
2953 }; 3055 }
2954} 3056}
2955 3057
2956# load additional modules 3058# load additional modules
2957use cf::pod; 3059use cf::pod;
2958 3060

Diff Legend

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