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.264 by root, Sun May 6 05:44:48 2007 UTC vs.
Revision 1.265 by root, Fri May 11 08:00: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, "long sync job\n"
362 if $time > $TICK * 0.5;
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->()
… …
372 my $runtime = "$LOCALDIR/runtime"; 395 my $runtime = "$LOCALDIR/runtime";
373 396
374 # first touch the runtime file to show we are still running: 397 # first touch the runtime file to show we are still running:
375 # the fsync below can take a very very long time. 398 # the fsync below can take a very very long time.
376 399
377 warn "touching runtime...\n";#d#
378 if (my $fh = aio_open $runtime, O_WRONLY, 0) { 400 if (my $fh = aio_open $runtime, O_WRONLY, 0) {
379 utime undef, undef, $fh; 401 utime undef, undef, $fh;
380 } 402 }
381 403
382 my $guard = cf::lock_acquire "write_runtime"; 404 my $guard = cf::lock_acquire "write_runtime";
383 405
384 warn "starting to write runtime...\n";#d#
385 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 406 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
386 or return; 407 or return;
387 408
388 my $value = $cf::RUNTIME + 90 + 10; 409 my $value = $cf::RUNTIME + 90 + 10;
389 # 10 is the runtime save interval, for a monotonic clock 410 # 10 is the runtime save interval, for a monotonic clock
… …
403 or return; 424 or return;
404 425
405 aio_rename "$runtime~", $runtime 426 aio_rename "$runtime~", $runtime
406 and return; 427 and return;
407 428
408 warn "... done writing runtime.\n";#d# 429 warn "runtime file written.\n";#d#
409 430
410 1 431 1
411} 432}
412 433
413=item cf::datalog type => key => value, ... 434=item cf::datalog type => key => value, ...
… …
2838 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 2859 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2839 unless ++$bug_warning > 10; 2860 unless ++$bug_warning > 10;
2840 return; 2861 return;
2841 } 2862 }
2842 2863
2843 $NOW = Event::time; 2864 $NOW = $tick_start = Event::time;
2844 2865
2845 cf::server_tick; # one server iteration 2866 cf::server_tick; # one server iteration
2846 2867
2847 $RUNTIME += $TICK; 2868 $RUNTIME += $TICK;
2848 $NEXT_TICK += $TICK; 2869 $NEXT_TICK += $TICK;
… …
2856 } 2877 }
2857 2878
2858# my $AFTER = Event::time; 2879# my $AFTER = Event::time;
2859# warn $AFTER - $NOW;#d# 2880# warn $AFTER - $NOW;#d#
2860 2881
2882 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2883 $sig->send;
2884 }
2885 while (my $sig = shift @WAIT_FOR_TICK) {
2886 $sig->send;
2887 }
2888
2889 $NOW = Event::time;
2890
2861 # if we are delayed by four ticks or more, skip them all 2891 # if we are delayed by four ticks or more, skip them all
2862 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2892 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2863 2893
2864 $TICK_WATCHER->at ($NEXT_TICK); 2894 $TICK_WATCHER->at ($NEXT_TICK);
2865 $TICK_WATCHER->start; 2895 $TICK_WATCHER->start;
2866 2896
2867 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 2897 $LOAD = ($NOW - $tick_start) / $TICK;
2868 $sig->send; 2898 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2869 }
2870 while (my $sig = shift @WAIT_FOR_TICK) {
2871 $sig->send;
2872 }
2873 2899
2874 _post_tick; 2900 _post_tick;
2901
2902
2875 }, 2903 },
2876); 2904);
2877 2905
2878{ 2906{
2879 BDB::max_poll_time $TICK * 0.1; 2907 BDB::max_poll_time $TICK * 0.1;

Diff Legend

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