ExternalVendorCode/tippecanoe
1
0
Fork 0
mirror of https://github.com/mapbox/tippecanoe.git synced 2025-02-02 01:08:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Locking for map center

Browse Source
This commit is contained in:
Eric Fischer 2015-10-19 13:32:02 -07:00
parent ef5fdf4036
commit 3bb87227ec
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tile.cc
View File

@ -891,11 +891,21 @@ void *run_thread(void *vargs) {
// return z - 1; // return z - 1;
} }
if (pthread_mutex_lock(&db_lock) != 0) {
perror("pthread_mutex_lock");
exit(EXIT_FAILURE);
}
if (z == arg->maxzoom && len > *arg->most) { if (z == arg->maxzoom && len > *arg->most) {
*arg->midx = x; *arg->midx = x;
*arg->midy = y; *arg->midy = y;
*arg->most = len; *arg->most = len;
} }
if (pthread_mutex_unlock(&db_lock) != 0) {
perror("pthread_mutex_unlock");
exit(EXIT_FAILURE);
}
} }
if (munmap(geomstart, arg->geom_size[j]) != 0) { if (munmap(geomstart, arg->geom_size[j]) != 0) {
@ -1010,9 +1020,9 @@ int traverse_zooms(int *geomfd, off_t *geom_size, char *metabase, char *stringpo
args[thread].stringpool = stringpool; args[thread].stringpool = stringpool;
args[thread].min_detail = min_detail; args[thread].min_detail = min_detail;
args[thread].basezoom = maxzoom; // XXX rename? args[thread].basezoom = maxzoom; // XXX rename?
args[thread].file_keys = file_keys; // XXX locking args[thread].file_keys = file_keys; // locked with var_lock
args[thread].layernames = layernames; args[thread].layernames = layernames;
args[thread].outdb = outdb; // XXX locking args[thread].outdb = outdb; // locked with db_lock
args[thread].droprate = droprate; args[thread].droprate = droprate;
args[thread].buffer = buffer; args[thread].buffer = buffer;
args[thread].fname = fname; args[thread].fname = fname;
@ -1029,13 +1039,13 @@ int traverse_zooms(int *geomfd, off_t *geom_size, char *metabase, char *stringpo
args[thread].geomfd = geomfd; args[thread].geomfd = geomfd;
args[thread].geom_size = geom_size; args[thread].geom_size = geom_size;
args[thread].midx = midx; // XXX locking args[thread].midx = midx; // locked with var_lock
args[thread].midy = midy; // XXX locking args[thread].midy = midy; // locked with var_lock
args[thread].maxzoom = maxzoom; args[thread].maxzoom = maxzoom;
args[thread].minzoom = minzoom; args[thread].minzoom = minzoom;
args[thread].full_detail = full_detail; args[thread].full_detail = full_detail;
args[thread].low_detail = low_detail; args[thread].low_detail = low_detail;
args[thread].most = &most; // XXX locking args[thread].most = &most; // locked with var_lock
args[thread].tasks = dispatches[thread].tasks; args[thread].tasks = dispatches[thread].tasks;