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

Comparing deliantra/server/ext/map-random.ext (file contents):
Revision 1.41 by root, Tue Apr 13 02:39:52 2010 UTC vs.
Revision 1.46 by root, Tue May 4 21:45:42 2010 UTC

… …
11 11
12 if (0 < Coro::AIO::aio_load "$cf::RANDOMDIR/$self->{random_id}.meta", my $data) { 12 if (0 < Coro::AIO::aio_load "$cf::RANDOMDIR/$self->{random_id}.meta", my $data) {
13 $self->{random} = cf::decode_json $data; 13 $self->{random} = cf::decode_json $data;
14 $self->{random}{custom} ||= "$self->{random}{origin_map}+$self->{random}{origin_x}+$self->{random}{origin_y}"; 14 $self->{random}{custom} ||= "$self->{random}{origin_map}+$self->{random}{origin_x}+$self->{random}{origin_y}";
15 } else { 15 } else {
16 warn "unable to read meta file for $self->{random_id}\n"; 16 cf::info "unable to read meta file for $self->{random_id}\n";
17 return 0; 17 return 0;
18 } 18 }
19 19
20 1 20 1
21} 21}
… …
123 $map 123 $map
124} 124}
125 125
126sub find_style($$$$) { 126sub find_style($$$$) {
127 my ($dir, $name, $difficulty, $recurse) = @_; 127 my ($dir, $name, $difficulty, $recurse) = @_;
128 128
129 cf::cede_to_tick; 129 cf::cede_to_tick;
130 130
131 my $map; 131 my $map;
132 132
133 if ($name) { 133 if ($name) {
… …
145 #warn "return $dir,$name,$difficulty => $map\n" if $difficulty >= 0;#d# 145 #warn "return $dir,$name,$difficulty => $map\n" if $difficulty >= 0;#d#
146 $map 146 $map
147} 147}
148 148
149cf::async_ext { 149cf::async_ext {
150 eCoro::current->{desc} = "random map meta file cleaner"; 150 local $Coro::current->{desc} = "random map meta file cleaner";
151 $Coro::current->nice (1); 151 $Coro::current->nice (1);
152 152
153 while () { 153 while () {
154 my $META_TIMEOUT = $cf::CFG{map_random_meta_timeout} || 86400 * 7; 154 my $META_TIMEOUT = $cf::CFG{map_random_meta_timeout} || 86400 * 7;
155 155
… …
165 and next; 165 and next;
166 166
167 my $age = $cf::NOW - (stat _)[8]; 167 my $age = $cf::NOW - (stat _)[8];
168 168
169 if ($age > $META_TIMEOUT) { 169 if ($age > $META_TIMEOUT) {
170 warn "resetting random meta data for $file"; 170 cf::trace "resetting random meta data for $file";
171 IO::AIO::aio_unlink "$cf::RANDOMDIR/$file"; 171 IO::AIO::aio_unlink "$cf::RANDOMDIR/$file";
172 } 172 }
173 } 173 }
174 174
175 Coro::AnyEvent::sleep $META_TIMEOUT / 10; 175 Coro::AnyEvent::sleep $META_TIMEOUT / 10;
… …
183 while () { 183 while () {
184 my $map = cf::map::new; 184 my $map = cf::map::new;
185 $map->generate_random_map ({ 185 $map->generate_random_map ({
186 region => "scorn", 186 region => "scorn",
187 random_seed => $seed++, 187 random_seed => $seed++,
188 xsize => (int rand 100) + 1, 188 xsize => (cf::rndm 1, 100),
189 ysize => (int rand 100) + 1, 189 ysize => (cf::rndm 1, 100),
190 }); 190 });
191 warn sprintf "%d: %dx%d o# %d\n", $seed, $map->width, $map->height, &cf::object::objects_size;#d# 191 warn sprintf "%d: %dx%d o# %d\n", $seed, $map->width, $map->height, &cf::object::objects_size;#d#
192 $map->destroy; 192 $map->destroy;
193 } 193 }
194 }; 194 };
… …
225 warn $m; 225 warn $m;
226 } 226 }
227 }; 227 };
228} 228}
229 229
2301
231

Diff Legend

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