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

Make the progress indicator more aware of progress in other threads

Browse Source
This commit is contained in:
Eric Fischer
2015-10-19 14:19:32 -07:00
parent 56910fd016
commit 965176f254
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tile.cc
+11 -8
View File
@@ -418,9 +418,8 @@ void rewrite(drawvec &geom, int z, int nextzoom, int file_maxzoom, long long *bb
} }
} }
long long write_tile(char **geoms, char *metabase, char *stringpool, int z, unsigned tx, unsigned ty, int detail, int min_detail, int basezoom, struct pool **file_keys, char **layernames, sqlite3 *outdb, double droprate, int buffer, const char *fname, FILE **geomfile, int file_minzoom, int file_maxzoom, double todo, char *geomstart, long long along, double gamma, int nlayers, char *prevent, char *additional, int child_shards) { long long write_tile(char **geoms, char *metabase, char *stringpool, int z, unsigned tx, unsigned ty, int detail, int min_detail, int basezoom, struct pool **file_keys, char **layernames, sqlite3 *outdb, double droprate, int buffer, const char *fname, FILE **geomfile, int file_minzoom, int file_maxzoom, double todo, char *geomstart, long long *along, double gamma, int nlayers, char *prevent, char *additional, int child_shards) {
int line_detail; int line_detail;
double oprogress = 0;
double fraction = 1; double fraction = 1;
char *og = *geoms; char *og = *geoms;
@@ -460,7 +459,6 @@ long long write_tile(char **geoms, char *metabase, char *stringpool, int z, unsi
} }
long long count = 0; long long count = 0;
// long long along = 0;
double accum_area = 0; double accum_area = 0;
double interval = 0; double interval = 0;
@@ -488,6 +486,8 @@ long long write_tile(char **geoms, char *metabase, char *stringpool, int z, unsi
memset(within, '\0', sizeof(within)); memset(within, '\0', sizeof(within));
memset(geompos, '\0', sizeof(geompos)); memset(geompos, '\0', sizeof(geompos));
double oprogress = 0;
*geoms = og; *geoms = og;
while (1) { while (1) {
@@ -521,7 +521,7 @@ long long write_tile(char **geoms, char *metabase, char *stringpool, int z, unsi
signed char feature_minzoom; signed char feature_minzoom;
deserialize_byte(geoms, &feature_minzoom); deserialize_byte(geoms, &feature_minzoom);
double progress = floor((((*geoms - geomstart + along) / (double) todo) + z) / (file_maxzoom + 1) * 1000) / 10; double progress = floor((((*geoms - geomstart + *along) / (double) todo) + z) / (file_maxzoom + 1) * 1000) / 10;
if (progress >= oprogress + 0.1) { if (progress >= oprogress + 0.1) {
if (!quiet) { if (!quiet) {
fprintf(stderr, " %3.1f%% %d/%u/%u \r", progress, z, tx, ty); fprintf(stderr, " %3.1f%% %d/%u/%u \r", progress, z, tx, ty);
@@ -873,6 +873,7 @@ void *run_thread(void *vargs) {
char *geomstart = geom; char *geomstart = geom;
char *end = geom + arg->geom_size[j]; char *end = geom + arg->geom_size[j];
char *prevgeom = geom;
while (geom < end) { while (geom < end) {
int z; int z;
@@ -884,7 +885,7 @@ void *run_thread(void *vargs) {
// fprintf(stderr, "%d/%u/%u\n", z, x, y); // fprintf(stderr, "%d/%u/%u\n", z, x, y);
long long len = write_tile(&geom, arg->metabase, arg->stringpool, z, x, y, z == arg->maxzoom ? arg->full_detail : arg->low_detail, arg->min_detail, arg->maxzoom, arg->file_keys, arg->layernames, arg->outdb, arg->droprate, arg->buffer, arg->fname, arg->geomfile, arg->minzoom, arg->maxzoom, arg->todo, geomstart, *arg->along, arg->gamma, arg->nlayers, arg->prevent, arg->additional, arg->child_shards); long long len = write_tile(&geom, arg->metabase, arg->stringpool, z, x, y, z == arg->maxzoom ? arg->full_detail : arg->low_detail, arg->min_detail, arg->maxzoom, arg->file_keys, arg->layernames, arg->outdb, arg->droprate, arg->buffer, arg->fname, arg->geomfile, arg->minzoom, arg->maxzoom, arg->todo, geomstart, arg->along, arg->gamma, arg->nlayers, arg->prevent, arg->additional, arg->child_shards);
if (len < 0) { if (len < 0) {
int *err = (int *) malloc(sizeof(int)); int *err = (int *) malloc(sizeof(int));
@@ -892,7 +893,7 @@ void *run_thread(void *vargs) {
return err; return err;
} }
if (pthread_mutex_lock(&db_lock) != 0) { if (pthread_mutex_lock(&var_lock) != 0) {
perror("pthread_mutex_lock"); perror("pthread_mutex_lock");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
@@ -903,7 +904,10 @@ void *run_thread(void *vargs) {
*arg->most = len; *arg->most = len;
} }
if (pthread_mutex_unlock(&db_lock) != 0) { *arg->along += geom - prevgeom;
prevgeom = geom;
if (pthread_mutex_unlock(&var_lock) != 0) {
perror("pthread_mutex_unlock"); perror("pthread_mutex_unlock");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
@@ -912,7 +916,6 @@ void *run_thread(void *vargs) {
if (munmap(geomstart, arg->geom_size[j]) != 0) { if (munmap(geomstart, arg->geom_size[j]) != 0) {
perror("munmap geom"); perror("munmap geom");
} }
*arg->along += arg->geom_size[j];
} }
return NULL; return NULL;