0

increased max result queue size back to brownan/master normal

This commit is contained in:
Aaron Griffith
2011-03-18 16:22:48 -04:00
parent 383e8197af
commit b92dcd96ee

View File

@@ -361,10 +361,10 @@ class QuadtreeGen(object):
logging.info("The others will go faster") logging.info("The others will go faster")
for result in self._apply_render_worldtiles(pool): for result in self._apply_render_worldtiles(pool):
results.append(result) results.append(result)
if len(results) > 10 + 2*procs: if len(results) > 10000:
# Empty the queue before adding any more, so that memory # Empty the queue before adding any more, so that memory
# required has an upper bound # required has an upper bound
while len(results) > 10: while len(results) > 500:
results.popleft().get() results.popleft().get()
complete += 1 complete += 1
self.print_statusline(complete, total, 1) self.print_statusline(complete, total, 1)
@@ -386,8 +386,8 @@ class QuadtreeGen(object):
logging.info("Starting level {0}".format(level)) logging.info("Starting level {0}".format(level))
for result in self._apply_render_inntertile(pool, zoom): for result in self._apply_render_inntertile(pool, zoom):
results.append(result) results.append(result)
if len(results) > 10 + 2*procs: if len(results) > 10000:
while len(results) > 10: while len(results) > 500:
results.popleft().get() results.popleft().get()
complete += 1 complete += 1
self.print_statusline(complete, total, level) self.print_statusline(complete, total, level)