diegoripley/tippecanoe
1
0
Fork 0
mirror of https://github.com/felt/tippecanoe.git synced 2026-10-05 18:05:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Run through the thread task queues, although still sequentially

Browse Source
This commit is contained in:
Eric Fischer
2015-07-09 16:14:24 -07:00
parent 2957f16b4b
commit d55af3b3a6
1 changed files with 48 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tile.cc
+48 -52
View File
@@ -899,66 +899,62 @@ int traverse_zooms(int *geomfd, off_t *geom_size, char *metabase, char *stringpo
here->next = *d; here->next = *d;
*d = here; *d = here;
printf("to do: ");
dispatch *a;
for (a = dispatch_head; a != NULL; a = a->next) {
printf("%lld ", a->todo);
}
printf("\n");
} }
int thread = 0; int thread;
for (thread = 0; thread < threads; thread++) {
struct task *task;
for (j = 0; j < TEMP_FILES; j++) { for (task = dispatches[thread].tasks; task != NULL; task = task->next) {
if (geomfd[j] < 0) { int j = task->fileno;
// only one source file for zoom level 0
continue;
}
if (geom_size[j] == 0) {
continue;
}
// printf("%lld of geom_size\n", (long long) geom_size[j]); if (geomfd[j] < 0) {
// only one source file for zoom level 0
char *geom = (char *) mmap(NULL, geom_size[j], PROT_READ, MAP_PRIVATE, geomfd[j], 0); continue;
if (geom == MAP_FAILED) { }
perror("mmap geom"); if (geom_size[j] == 0) {
exit(EXIT_FAILURE); continue;
}
char *geomstart = geom;
char *end = geom + geom_size[j];
while (geom < end) {
int z;
unsigned x, y;
deserialize_int(&geom, &z);
deserialize_uint(&geom, &x);
deserialize_uint(&geom, &y);
// fprintf(stderr, "%d/%u/%u\n", z, x, y);
long long len = write_tile(&geom, metabase, stringpool, file_bbox, z, x, y, z == maxzoom ? full_detail : low_detail, min_detail, maxzoom, file_keys, layernames, outdb, droprate, buffer, fname, sub + thread * (TEMP_FILES / threads), minzoom, maxzoom, todo, geomstart, along, gamma, nlayers, prevent, TEMP_FILES / threads);
if (len < 0) {
return z - 1;
} }
if (z == maxzoom && len > most) { // printf("%lld of geom_size\n", (long long) geom_size[j]);
*midx = x;
*midy = y;
most = len;
}
}
if (munmap(geomstart, geom_size[j]) != 0) { char *geom = (char *) mmap(NULL, geom_size[j], PROT_READ, MAP_PRIVATE, geomfd[j], 0);
perror("munmap geom"); if (geom == MAP_FAILED) {
perror("mmap geom");
exit(EXIT_FAILURE);
}
char *geomstart = geom;
char *end = geom + geom_size[j];
while (geom < end) {
int z;
unsigned x, y;
deserialize_int(&geom, &z);
deserialize_uint(&geom, &x);
deserialize_uint(&geom, &y);
// fprintf(stderr, "%d/%u/%u\n", z, x, y);
long long len = write_tile(&geom, metabase, stringpool, file_bbox, z, x, y, z == maxzoom ? full_detail : low_detail, min_detail, maxzoom, file_keys, layernames, outdb, droprate, buffer, fname, sub + thread * (TEMP_FILES / threads), minzoom, maxzoom, todo, geomstart, along, gamma, nlayers, prevent, TEMP_FILES / threads);
if (len < 0) {
return z - 1;
}
if (z == maxzoom && len > most) {
*midx = x;
*midy = y;
most = len;
}
}
if (munmap(geomstart, geom_size[j]) != 0) {
perror("munmap geom");
}
along += geom_size[j];
} }
along += geom_size[j];
} }
for (j = 0; j < TEMP_FILES; j++) { for (j = 0; j < TEMP_FILES; j++) {