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.32 by root, Mon Sep 22 05:42:41 2008 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}
… …
54 $self->activate; 54 $self->activate;
55 55
56 1 56 1
57} 57}
58 58
59sub clean_random_maps { 59sub select_random_map {
60 return;#d# 60 my ($maps, $difficulty) = @_;
61 my $files = Coro::AIO::aio_readdir $cf::RANDOMDIR
62 or return;
63 61
64 my $META_TIMEOUT = $cf::CFG{map_random_meta_timeout} || 86400 * 7; 62 # because I am lazy, I ignore the weighting
65 63
66 for my $file (@$files) { 64 my @maps = keys %$maps;
67 next unless $file =~ /\.meta$/;
68 65
69 Coro::AIO::aio_stat "$cf::RANDOMDIR/$file" 66 cf::map::find "/styles/$maps[cf::rmg_rndm scalar @maps]"
70 and next;
71
72 my $age = $cf::NOW - (stat _)[8];
73
74 if ($age > $META_TIMEOUT) {
75 warn "resetting random meta data for $file";
76 IO::AIO::aio_unlink "$cf::RANDOMDIR/$file";
77 }
78 }
79} 67}
80 68
81# called by the random map generator 69# called by the random map generator
82sub find_style_; 70sub find_style_;
83sub find_style_($$) { 71sub find_style_($$$) {
84 my ($path, $difficulty) = @_; 72 my ($path, $difficulty, $recurse) = @_;
85 73
86 my $map; 74 my $map;
75
76 # see if there is a metafile
77 if (0 < aio_load "$cf::MAPDIR/$path.rmg", my $meta) {
78 $meta = cf::decode_json $meta;
79
80 # only "maps" is supported
81 if ($meta->{maps}) {
82 $map = select_random_map $meta->{maps}, $difficulty;
83 }
84 }
87 85
88 $map = cf::map::find $path 86 $map = cf::map::find $path
89 unless aio_stat "$cf::MAPDIR/$path.map"; 87 unless aio_stat "$cf::MAPDIR/$path.map";
90 88
91 unless ($map) { 89 unless ($map) {
92 # search files and/or dirs 90 # search files and/or dirs
93 if (my ($dirs, $nondirs) = aio_scandir "$cf::MAPDIR/$path/", 1) { 91 if (my ($dirs, $nondirs) = aio_scandir "$cf::MAPDIR/$path/", 1) {
94 my @entries = sort grep s/\.map$//, @$nondirs; 92 my @entries = sort grep s/\.(?:map|rmg)$//, @$nondirs;
95 93
96 if ($difficulty < 0) { 94 if ($difficulty < 0) {
97 # pick a fully random map, but only a map, do not recurse 95 # pick a fully random map, but only a map, do not recurse
98 $map = cf::map::find "$path/$entries[cf::rmg_rndm scalar @entries]" 96 $map = cf::map::find "$path/$entries[cf::rmg_rndm scalar @entries]"
99 if @entries; 97 if @entries;
100 } else { 98 } else {
101 # pick a map with nearest difficulty value ("mapname_<difficulty>.map") 99 # pick a map with nearest difficulty value ("mapname_<difficulty>.map")
102 @entries = sort @$dirs 100 @entries = sort @$dirs
103 unless @entries; 101 unless @entries || !$recurse;
104 102
105 my $min_diff = 1e99; 103 my $min_diff = 1e99;
106 104
107 for my $name (@entries) { 105 for my $name (@entries) {
108 if ($name =~ /_(\d+)$/) { 106 if ($name =~ /_(\d+)$/) {
109 my $diff = abs $difficulty - $1 + 0.5; # prefer the more difficult version 107 my $diff = abs $difficulty - $1 + 0.25 + 0.25 * cf::rmg_rndm; # prefer the more difficult version
110 ($map, $min_diff) = ($name, $diff) if $diff < $min_diff; 108 ($map, $min_diff) = ($name, $diff) if $diff < $min_diff;
111 } 109 }
112 } 110 }
113 111
114 unless ($map) { 112 unless ($map) {
… …
123 } 121 }
124 122
125 $map 123 $map
126} 124}
127 125
128sub find_style($$$) { 126sub find_style($$$$) {
129 my ($dir, $name, $difficulty) = @_; 127 my ($dir, $name, $difficulty, $recurse) = @_;
128
129 cf::cede_to_tick;
130
131 my $map;
130 132
131 cf::cede_to_tick; 133 if ($name) {
132
133 my $map = find_style_ $name ? "$dir/$name" : $dir, $difficulty; 134 $map = find_style_ "$dir/$name", $difficulty, $recurse;
135 } else {
136 $map = (find_style_ "$dir/default", $difficulty, $recurse)
137 || (find_style_ $dir, $difficulty, $recurse);
138 }
134 139
135 if ($map) { 140 if ($map) {
136 $map->load; 141 $map->load;
137 $map->deactivate; 142 $map->deactivate;
138 } 143 }
139 144
140 #warn "return $dir,$name,$difficulty => $map\n" if $difficulty >= 0;#d# 145 #warn "return $dir,$name,$difficulty => $map\n" if $difficulty >= 0;#d#
141 $map 146 $map
142} 147}
143 148
144# clean up old temp maps regularly 149cf::async_ext {
145our $CLEAN_RANDOM_MAPS = cf::periodic 3600, Coro::unblock_sub { 150 local $Coro::current->{desc} = "random map meta file cleaner";
146 clean_random_maps; 151 $Coro::current->nice (1);
152
153 while () {
154 my $META_TIMEOUT = $cf::CFG{map_random_meta_timeout} || 86400 * 7;
155
156 Coro::AnyEvent::idle_upto $META_TIMEOUT / 10 * 2;
157
158 my ($files) = Coro::AIO::aio_readdirx $cf::RANDOMDIR, IO::AIO::READDIR_STAT_ORDER
159 or return;
160
161 for my $file (@$files) {
162 next unless $file =~ /\.meta$/;
163
164 Coro::AIO::aio_stat "$cf::RANDOMDIR/$file"
165 and next;
166
167 my $age = $cf::NOW - (stat _)[8];
168
169 if ($age > $META_TIMEOUT) {
170 cf::trace "resetting random meta data for $file";
171 IO::AIO::aio_unlink "$cf::RANDOMDIR/$file";
172 }
173 }
174
175 Coro::AnyEvent::sleep $META_TIMEOUT / 10;
176 }
147}; 177};
148 178
149# map generator stresstest, NEVER enable under normal circumstances 179# map generator stresstest, NEVER enable under normal circumstances
150if ($ENV{STRESSTEST}) { 180if ($ENV{STRESSTEST}) {
151 cf::async { 181 cf::async {
… …
153 while () { 183 while () {
154 my $map = cf::map::new; 184 my $map = cf::map::new;
155 $map->generate_random_map ({ 185 $map->generate_random_map ({
156 region => "scorn", 186 region => "scorn",
157 random_seed => $seed++, 187 random_seed => $seed++,
158 xsize => (int rand 100) + 1, 188 xsize => (cf::rndm 1, 100),
159 ysize => (int rand 100) + 1, 189 ysize => (cf::rndm 1, 100),
160 }); 190 });
161 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#
162 $map->destroy; 192 $map->destroy;
163 } 193 }
164 }; 194 };
… …
175 } 205 }
176 } 206 }
177 }; 207 };
178} 208}
179 209
1801 210# save test
211if (0) {
212 cf::async {
213 # 0.080
214 Coro::Timer::sleep 2;
215 my $map = cf::map::find "/mlab/citydeclouds2";
216 $map->load_header;
217 $map->load;
218 $map->post_load_original;
219 my $m=100;
220 for (1..50) {
221 my $t=AE::time;
222 $map->_save_objects ("/tmp/x", cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
223 $t = AE::time-$t;
224 $m=$t if $m>$t;
225 warn $m;
226 }
227 };
228}
181 229

Diff Legend

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