ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/ext/map-scheduler.ext
(Generate patch)

Comparing deliantra/server/ext/map-scheduler.ext (file contents):
Revision 1.37 by root, Mon Jun 11 21:38:13 2007 UTC vs.
Revision 1.39 by root, Sat Jul 28 13:13:36 2007 UTC

… …
9our $SCHEDULE_INTERVAL = $cf::CFG{schedule_interval} || .8; # time the map scheduler sleeps between runs 9our $SCHEDULE_INTERVAL = $cf::CFG{schedule_interval} || .8; # time the map scheduler sleeps between runs
10our $SAVE_TIMEOUT = $cf::CFG{save_timeout} || 30; # save maps every n seconds 10our $SAVE_TIMEOUT = $cf::CFG{save_timeout} || 30; # save maps every n seconds
11our $SWAP_LOAD1 = $cf::CFG{swap_load1} || .1; # start aggressively swapping at this load 11our $SWAP_LOAD1 = $cf::CFG{swap_load1} || .1; # start aggressively swapping at this load
12our $SWAP_LOAD2 = $cf::CFG{swap_load2} || .4; # swap as fast as possible at this load 12our $SWAP_LOAD2 = $cf::CFG{swap_load2} || .4; # swap as fast as possible at this load
13 13
14warn "load1 ", $SWAP_LOAD1;#d#
15warn "load2 ", $SWAP_LOAD2;#d#
16
14cf::async_ext { 17cf::async_ext {
15 $Coro::current->prio (Coro::PRIO_MIN); 18 $Coro::current->prio (Coro::PRIO_MIN);
16 19
17 # load the header of swapped-out maps. 20 # load the header of swapped-out maps.
18 # this is not a correctness issue, it simply saves diskspace 21 # this is not a correctness issue, it simply saves diskspace
19 # because old files will get cleaned up on reset time 22 # because old files will get cleaned up on reset time
20 Coro::Timer::sleep 0.25; 23 Coro::Timer::sleep 0.25;
21 24
22 for my $path (@{ cf::map::tmp_maps or [] }, @{ cf::map::random_maps or [] }) { 25 for my $path (@{ cf::map::tmp_maps or [] }, @{ cf::map::random_maps or [] }) {
26 cf::cede_to_tick;
23 cf::map::find $path; 27 cf::map::find $path;
24 cf::wait_for_tick; Coro::cede;
25 } 28 }
26 29
27 # now hunt for resettable per-player maps 30 # now hunt for resettable per-player maps
28 for my $login (@{ cf::player::list_logins or [] }) { 31 for my $login (@{ cf::player::list_logins or [] }) {
29 for my $path (@{ cf::player::maps $login or [] }) { 32 for my $path (@{ cf::player::maps $login or [] }) {
30 Coro::cede; 33 cf::cede_to_tick;
31 34
32 $path =~ /^~[^\/]+(\/.*)$/ 35 $path =~ /^~[^\/]+(\/.*)$/
33 or next; # doh 36 or next; # doh
34 37
35 my $base = cf::map::find $1; 38 my $base = cf::map::find $1;
… …
40 43
41 # skip unresettable maps, for speed 44 # skip unresettable maps, for speed
42 next if $base->{deny_reset}; 45 next if $base->{deny_reset};
43 46
44 my $map = cf::map::find $path; 47 my $map = cf::map::find $path;
45 cf::wait_for_tick;
46 48
47 if ($map->{deny_reset}) { 49 if ($map->{deny_reset}) {
48 warn "found noreset map with resettable base map, resetting: $path\n"; 50 warn "found noreset map with resettable base map, resetting: $path\n";
49 delete $map->{deny_reset}; 51 delete $map->{deny_reset};
50 } 52 }
51 } 53 }
52 } 54 }
53}; 55};
54 56
55our $SCHEDULER = cf::async_ext { 57our $SCHEDULER = cf::async_ext {
58 my $timer = Coro::Event->timer (after => 1);
59
56 while () { 60 while () {
57 Coro::Event::do_timer (after => $SCHEDULE_INTERVAL) 61 $timer->interval ($SCHEDULE_INTERVAL);
58 unless $cf::LOADAVG > $SWAP_LOAD2; 62 $timer->next unless $cf::LOADAVG > $SWAP_LOAD2;
59 63
60 # this weird form of iteration over values is used because 64 # this weird form of iteration over values is used because
61 # the hash changes underneath us frequently, and for 65 # the hash changes underneath us frequently, and for
62 # keeps a direct reference to the value without (in 5.8 perls) 66 # keeps a direct reference to the value without (in 5.8 perls)
63 # keeping a reference, so this is prone to crashes or worse. 67 # keeping a reference, so this is prone to crashes or worse.
… …
79 } elsif ($map->in_memory == cf::MAP_IN_MEMORY) { 83 } elsif ($map->in_memory == cf::MAP_IN_MEMORY) {
80 my $max_idle = cf::clamp +(cf::lerp $cf::LOADAVG, $SWAP_LOAD1, $SWAP_LOAD2, $SWAP_TIMEOUT, 0), 0, $SWAP_TIMEOUT; 84 my $max_idle = cf::clamp +(cf::lerp $cf::LOADAVG, $SWAP_LOAD1, $SWAP_LOAD2, $SWAP_TIMEOUT, 0), 0, $SWAP_TIMEOUT;
81 85
82 if ($map->last_access + $max_idle <= $cf::RUNTIME && !$map->players) { 86 if ($map->last_access + $max_idle <= $cf::RUNTIME && !$map->players) {
83 $map->swap_out; 87 $map->swap_out;
84 cf::wait_for_tick unless $cf::LOADAVG > $SWAP_LOAD2;
85 } elsif ($map->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) { 88 } elsif ($map->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
86 $map->save; 89 $map->save;
87 cf::wait_for_tick unless $cf::LOADAVG > $SWAP_LOAD2; 90 $map->{last_save} -= rand; # randomise map save times a bit
88 } 91 }
89 } 92 }
90 }; 93 };
91 warn $@ if $@; 94 warn $@ if $@;
92 cf::cede_to_tick; 95 cf::cede_to_tick;

Diff Legend

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