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.53 by root, Tue May 4 21:45:42 2010 UTC vs.
Revision 1.57 by root, Sat Aug 13 20:20:30 2011 UTC

… …
9our $SCHEDULE_INTERVAL = $cf::CFG{schedule_interval} || 5; # time the map scheduler sleeps between runs 9our $SCHEDULE_INTERVAL = $cf::CFG{schedule_interval} || 5; # 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} || .6; # swap as fast as possible at this load 12our $SWAP_LOAD2 = $cf::CFG{swap_load2} || .6; # swap as fast as possible at this load
13 13
14cf::post_init { 14sub reload {
15 cf::async_ext {
16 $Coro::current->{desc} = "startup map scanner"; 15 local $Coro::current->{desc} = "startup map scanner";
17 $Coro::current->prio (Coro::PRIO_MIN); 16 $Coro::current->prio (Coro::PRIO_MIN);
18 17
19 # load the header of swapped-out maps. 18 # load the header of swapped-out maps.
20 # this is not a correctness issue, it simply saves diskspace 19 # this is not a correctness issue, it simply saves diskspace
21 # because old files will get cleaned up on reset time 20 # because old files will get cleaned up on reset time
22 Coro::Timer::sleep 0.25;
23 21
24 for my $path (@{ cf::map::tmp_maps or [] }, @{ cf::map::random_maps or [] }) { 22 for my $path (@{ cf::map::tmp_maps or [] }, @{ cf::map::random_maps or [] }) {
25 cf::cede_to_tick;
26 cf::map::find $path; 23 cf::map::find $path;
27 } 24 }
28 25
29 # now hunt for resettable per-player maps 26 # now hunt for resettable per-player maps
30 for my $login (@{ cf::player::list_logins or [] }) { 27 for my $login (@{ cf::player::list_logins or [] }) {
31 for my $path (@{ cf::player::maps $login or [] }) { 28 for my $path (@{ cf::player::maps $login or [] }) {
32 cf::cede_to_tick; 29 $path =~ /^~[^\/]+(\/.*)$/
30 or next; # doh
33 31
34 $path =~ /^~[^\/]+(\/.*)$/ 32 my $base = cf::map::find $1;
35 or next; # doh
36 33
37 my $base = cf::map::find $1; 34 # skip maps without base maps on the assumption
35 # that those are old, unresettable maps
36 next unless $base;
38 37
39 # skip maps without base maps on the assumption 38 # skip unresettable maps, for speed
40 # that those are old, unresettable maps 39 next if $base->{deny_reset};
41 next unless $base;
42 40
43 # skip unresettable maps, for speed 41 my $map = cf::map::find $path;
44 next if $base->{deny_reset};
45 42
46 my $map = cf::map::find $path;
47
48 if ($map->{deny_reset}) { 43 if ($map->{deny_reset}) {
49 warn "found noreset map with resettable base map, resetting: $path\n"; 44 warn "found noreset map with resettable base map, resetting: $path\n";
50 delete $map->{deny_reset}; 45 delete $map->{deny_reset};
51 }
52 } 46 }
53 } 47 }
54 }; 48 }
49}
50
51cf::post_init {
52 cf::async { reload };
55 53
56 our $SCHEDULER = cf::async_ext { 54 our $SCHEDULER = cf::async_ext {
57 $Coro::current->{desc} = "map scheduler"; 55 $Coro::current->{desc} = "map scheduler";
58 $Coro::current->prio (Coro::PRIO_MAX); 56 $Coro::current->prio (Coro::PRIO_MAX);
59 57
60 while () { 58 while () {
61 if ($cf::LOADAVG > $SWAP_LOAD2) { 59 if ($cf::LOADAVG > $SWAP_LOAD2) {
62 cf::wait_for_tick; 60 cf::wait_for_tick;
63 } else { 61 } else {
64 Coro::EV::timer_once $SCHEDULE_INTERVAL; 62 Coro::AnyEvent::sleep $SCHEDULE_INTERVAL;
65 } 63 }
66 64
67 # this weird form of iteration over values is used because 65 # this weird form of iteration over values is used because
68 # the hash changes underneath us frequently, and 'for' 66 # the hash changes underneath us frequently, and 'for'
69 # keeps a direct reference to the value without (in 5.8 perls) 67 # keeps a direct reference to the value without (in 5.8 perls)
… …
81# $map->deactivate; 79# $map->deactivate;
82# delete $map->{active}; 80# delete $map->{active};
83# } 81# }
84 if ($map->should_reset) { 82 if ($map->should_reset) {
85 $map->reset; 83 $map->reset;
86 } elsif ($map->in_memory == cf::MAP_ACTIVE) { 84 } elsif ($map->linkable) {
87 my $max_idle = cf::clamp +(cf::lerp $cf::LOADAVG, $SWAP_LOAD1, $SWAP_LOAD2, $SWAP_TIMEOUT, $cf::TICK * 1.5), 85 my $max_idle = cf::clamp +(cf::lerp $cf::LOADAVG, $SWAP_LOAD1, $SWAP_LOAD2, $SWAP_TIMEOUT, $cf::TICK * 1.5),
88 $cf::TICK * 1.5, $SWAP_TIMEOUT; 86 $cf::TICK * 1.5, $SWAP_TIMEOUT;
89 87
90 if ($map->last_access + $max_idle <= $cf::RUNTIME && !$map->players) { 88 if ($map->last_access + $max_idle <= $cf::RUNTIME && !$map->players) {
91 $map->swap_out; 89 $map->swap_out;

Diff Legend

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