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.47 by root, Tue Apr 15 14:21:04 2008 UTC vs.
Revision 1.54 by root, Wed May 5 23:23:29 2010 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 {
14cf::async_ext { 15 cf::async_ext {
15 $Coro::current->{desc} = "startup map scanner"; 16 $Coro::current->{desc} = "startup map scanner";
16 $Coro::current->prio (Coro::PRIO_MIN); 17 $Coro::current->prio (Coro::PRIO_MIN);
17 18
18 # load the header of swapped-out maps. 19 # load the header of swapped-out maps.
19 # this is not a correctness issue, it simply saves diskspace 20 # this is not a correctness issue, it simply saves diskspace
20 # because old files will get cleaned up on reset time 21 # because old files will get cleaned up on reset time
21 Coro::Timer::sleep 0.25; 22 Coro::Timer::sleep 0.25;
22 23
23 for my $path (@{ cf::map::tmp_maps or [] }, @{ cf::map::random_maps or [] }) { 24 for my $path (@{ cf::map::tmp_maps or [] }, @{ cf::map::random_maps or [] }) {
24 cf::cede_to_tick;
25 cf::map::find $path; 25 cf::map::find $path;
26 } 26 }
27 27
28 # now hunt for resettable per-player maps 28 # now hunt for resettable per-player maps
29 for my $login (@{ cf::player::list_logins or [] }) { 29 for my $login (@{ cf::player::list_logins or [] }) {
30 for my $path (@{ cf::player::maps $login or [] }) { 30 for my $path (@{ cf::player::maps $login or [] }) {
31 cf::cede_to_tick; 31 $path =~ /^~[^\/]+(\/.*)$/
32 or next; # doh
32 33
33 $path =~ /^~[^\/]+(\/.*)$/ 34 my $base = cf::map::find $1;
34 or next; # doh
35 35
36 my $base = cf::map::find $1; 36 # skip maps without base maps on the assumption
37 # that those are old, unresettable maps
38 next unless $base;
37 39
38 # skip maps without base maps on the assumption 40 # skip unresettable maps, for speed
39 # that those are old, unresettable maps 41 next if $base->{deny_reset};
40 next unless $base;
41 42
42 # skip unresettable maps, for speed 43 my $map = cf::map::find $path;
43 next if $base->{deny_reset};
44 44
45 my $map = cf::map::find $path;
46
47 if ($map->{deny_reset}) { 45 if ($map->{deny_reset}) {
48 warn "found noreset map with resettable base map, resetting: $path\n"; 46 warn "found noreset map with resettable base map, resetting: $path\n";
49 delete $map->{deny_reset}; 47 delete $map->{deny_reset};
48 }
50 } 49 }
51 } 50 }
52 } 51 };
53};
54 52
55our $SCHEDULER = cf::async_ext { 53 our $SCHEDULER = cf::async_ext {
56 $Coro::current->{desc} = "map scheduler"; 54 $Coro::current->{desc} = "map scheduler";
57 $Coro::current->prio (Coro::PRIO_MAX); 55 $Coro::current->prio (Coro::PRIO_MAX);
58 56
59 while () { 57 while () {
60 if ($cf::LOADAVG > $SWAP_LOAD2) { 58 if ($cf::LOADAVG > $SWAP_LOAD2) {
61 cf::wait_for_tick; 59 cf::wait_for_tick;
62 } else { 60 } else {
63 Coro::EV::timer_once $SCHEDULE_INTERVAL; 61 Coro::EV::timer_once $SCHEDULE_INTERVAL;
64 } 62 }
65 63
66 # this weird form of iteration over values is used because 64 # this weird form of iteration over values is used because
67 # the hash changes underneath us frequently, and for 65 # the hash changes underneath us frequently, and 'for'
68 # 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)
69 # keeping a reference, so this is prone to crashes or worse. 67 # keeping a reference, so this is prone to crashes or worse.
70 my @maps = keys %cf::MAP; 68 my @maps = keys %cf::MAP;
71 for (@maps) { 69 for (@maps) {
72 my $map = $cf::MAP{$_} 70 my $map = $cf::MAP{$_}
73 or next; 71 or next;
74 $map->valid or next; 72 $map->valid or next;
75 73
76 eval { 74 eval {
77 # not yet, because maps might become visible to players nearby 75 # not yet, because maps might become visible to players nearby
78 # we need to remove the map from %cf::MAP and all tiled map links 76 # we need to remove the map from %cf::MAP and all tiled map links
79# if ($last_access + $DEACTIVATE_TIMEOUT <= $cf::RUNTIME) { 77# if ($last_access + $DEACTIVATE_TIMEOUT <= $cf::RUNTIME) {
80# $map->deactivate; 78# $map->deactivate;
81# delete $map->{active}; 79# delete $map->{active};
82# } 80# }
83 if ($map->should_reset) { 81 if ($map->should_reset) {
84 $map->reset; 82 $map->reset;
85 } elsif ($map->in_memory == cf::MAP_ACTIVE) { 83 } elsif ($map->in_memory == cf::MAP_ACTIVE) {
86 my $max_idle = cf::clamp +(cf::lerp $cf::LOADAVG, $SWAP_LOAD1, $SWAP_LOAD2, $SWAP_TIMEOUT, $cf::TICK * 1.5), 84 my $max_idle = cf::clamp +(cf::lerp $cf::LOADAVG, $SWAP_LOAD1, $SWAP_LOAD2, $SWAP_TIMEOUT, $cf::TICK * 1.5),
87 $cf::TICK * 1.5, $SWAP_TIMEOUT; 85 $cf::TICK * 1.5, $SWAP_TIMEOUT;
88 86
89 if ($map->last_access + $max_idle <= $cf::RUNTIME && !$map->players) { 87 if ($map->last_access + $max_idle <= $cf::RUNTIME && !$map->players) {
90 $map->swap_out; 88 $map->swap_out;
91 } elsif ($map->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) { 89 } elsif ($map->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
92 $map->save; 90 $map->save;
93 $map->{last_save} -= rand; # randomise map save times a bit 91 $map->{last_save} -= cf::rndm; # randomise map save times a bit
92 }
94 } 93 }
95 } 94 };
95 warn $@ if $@;
96 cf::cede_to_tick;
96 }; 97 };
97 warn $@ if $@;
98 cf::cede_to_tick;
99 }; 98 }
100 } 99 };
100
101 $SCHEDULER->prio (-2);
101}; 102};
102 103
103$SCHEDULER->prio (-2); 104# purely for debugging, will load ALL maps
105sub loadall {
106 my $maps = cf::map::static_maps;
104 107
108 for my $path (@$maps) {
109 my $map = cf::map::find $path
110 or warn "ERROR: unable to find map $path\n";
111 $map->load;
112 }
113}
114

Diff Legend

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