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.256 by root, Sat Apr 21 16:56:32 2007 UTC vs.
Revision 1.267 by root, Sat May 19 00:08:11 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
… …
1535 Coro::cede; 1572 Coro::cede;
1536 $self->activate; 1573 $self->activate;
1537 } 1574 }
1538 1575
1539 $self->in_memory (cf::MAP_IN_MEMORY); 1576 $self->in_memory (cf::MAP_IN_MEMORY);
1540
1541 undef $guard;
1542 } 1577 }
1543 1578
1544 $self->post_load; 1579 $self->post_load;
1545} 1580}
1546 1581
… …
2437 2472
2438 die $$res unless "ARRAY" eq ref $res; 2473 die $$res unless "ARRAY" eq ref $res;
2439 2474
2440 return wantarray ? @$res : $res->[-1]; 2475 return wantarray ? @$res : $res->[-1];
2441 } else { 2476 } else {
2477 reset_signals;
2442 local $SIG{__WARN__}; 2478 local $SIG{__WARN__};
2479 local $SIG{__DIE__};
2443 eval { 2480 eval {
2444 local $SIG{__DIE__};
2445 close $fh1; 2481 close $fh1;
2446 2482
2447 my @res = eval { $cb->(@args) }; 2483 my @res = eval { $cb->(@args) };
2448 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 2484 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2449 }; 2485 };
… …
2825 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 2861 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2826 unless ++$bug_warning > 10; 2862 unless ++$bug_warning > 10;
2827 return; 2863 return;
2828 } 2864 }
2829 2865
2830 $NOW = Event::time; 2866 $NOW = $tick_start = Event::time;
2831 2867
2832 cf::server_tick; # one server iteration 2868 cf::server_tick; # one server iteration
2833 2869
2834 $RUNTIME += $TICK; 2870 $RUNTIME += $TICK;
2835 $NEXT_TICK += $TICK; 2871 $NEXT_TICK += $TICK;
… …
2843 } 2879 }
2844 2880
2845# my $AFTER = Event::time; 2881# my $AFTER = Event::time;
2846# warn $AFTER - $NOW;#d# 2882# warn $AFTER - $NOW;#d#
2847 2883
2884 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2885 $sig->send;
2886 }
2887 while (my $sig = shift @WAIT_FOR_TICK) {
2888 $sig->send;
2889 }
2890
2891 $NOW = Event::time;
2892
2848 # if we are delayed by four ticks or more, skip them all 2893 # if we are delayed by four ticks or more, skip them all
2849 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2894 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2850 2895
2851 $TICK_WATCHER->at ($NEXT_TICK); 2896 $TICK_WATCHER->at ($NEXT_TICK);
2852 $TICK_WATCHER->start; 2897 $TICK_WATCHER->start;
2853 2898
2854 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 2899 $LOAD = ($NOW - $tick_start) / $TICK;
2855 $sig->send; 2900 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2856 }
2857 while (my $sig = shift @WAIT_FOR_TICK) {
2858 $sig->send;
2859 }
2860 2901
2861 _post_tick; 2902 _post_tick;
2903
2904
2862 }, 2905 },
2863); 2906);
2864 2907
2865{ 2908{
2866 BDB::max_poll_time $TICK * 0.1; 2909 BDB::max_poll_time $TICK * 0.1;
… …
2925 prio => 6, 2968 prio => 6,
2926 cb => \&IO::AIO::poll_cb, 2969 cb => \&IO::AIO::poll_cb,
2927 ); 2970 );
2928} 2971}
2929 2972
2973my $_log_backtrace;
2974
2975sub _log_backtrace {
2976 my ($msg, @addr) = @_;
2977
2978 $msg =~ s/\n//;
2979
2980 # limit the # of concurrent backtraces
2981 if ($_log_backtrace < 2) {
2982 ++$_log_backtrace;
2983 async {
2984 my @bt = fork_call {
2985 @addr = map { sprintf "%x", $_ } @addr;
2986 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
2987 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
2988 or die "addr2line: $!";
2989
2990 my @funcs;
2991 my @res = <$fh>;
2992 chomp for @res;
2993 while (@res) {
2994 my ($func, $line) = splice @res, 0, 2, ();
2995 push @funcs, "[$func] $line";
2996 }
2997
2998 @funcs
2999 };
3000
3001 LOG llevInfo, "[ABT] $msg\n";
3002 LOG llevInfo, "[ABT] $_\n" for @bt;
3003 --$_log_backtrace;
3004 };
3005 } else {
3006 LOG llevInfo, "[ABT] $msg\n";
3007 LOG llevInfo, "[ABT] [suppressed]\n";
3008 }
3009}
3010
2930# load additional modules 3011# load additional modules
2931use cf::pod; 3012use cf::pod;
2932 3013
2933END { cf::emergency_save } 3014END { cf::emergency_save }
2934 3015

Diff Legend

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