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

Remove debug spew

Browse Source
This commit is contained in:
Erica Fischer
2023-02-01 14:09:21 -08:00
parent 40a1022cc3
commit 40075c843a
1 changed files with 8 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tile.cpp
+8 -31
View File
@@ -67,7 +67,6 @@ struct decompressor {
void begin() { void begin() {
within = true; within = true;
// printf("------- BEGIN\n");
zs.zalloc = NULL; zs.zalloc = NULL;
zs.zfree = NULL; zs.zfree = NULL;
@@ -100,23 +99,15 @@ struct decompressor {
zs.avail_in = n; zs.avail_in = n;
} }
// printf("to read %d, to write %d, %s\n", zs.avail_in, zs.avail_out, within ? "within": "not");
// for (size_t i = 0; i < 50 && i < zs.avail_in; i++) {
// printf("%d ", zs.next_in[i]);
// }
// printf("\n");
size_t avail_before = zs.avail_in; size_t avail_before = zs.avail_in;
if (within) { if (within) {
int d = inflate(&zs, Z_NO_FLUSH); int d = inflate(&zs, Z_NO_FLUSH);
*geompos += avail_before - zs.avail_in; *geompos += avail_before - zs.avail_in;
// printf("consumed %zu from compression\n", avail_before - zs.avail_in);
if (d == Z_OK) { if (d == Z_OK) {
// it made some progress // it made some progress
} else if (d == Z_STREAM_END) { } else if (d == Z_STREAM_END) {
// printf("-------------- EOS got stream end\n");
// it may have made some progress and now we are done // it may have made some progress and now we are done
within = false; within = false;
break; break;
@@ -128,7 +119,6 @@ struct decompressor {
size_t n = std::min(zs.avail_in, zs.avail_out); size_t n = std::min(zs.avail_in, zs.avail_out);
memcpy(zs.next_out, zs.next_in, n); memcpy(zs.next_out, zs.next_in, n);
*geompos += n; *geompos += n;
// printf("consumed %zu\n", n);
zs.avail_out -= n; zs.avail_out -= n;
zs.avail_in -= n; zs.avail_in -= n;
@@ -137,27 +127,14 @@ struct decompressor {
} }
} }
// printf("returning %zu\n", size * nmemb - zs.avail_out);
return (size * nmemb - zs.avail_out) / size; return (size * nmemb - zs.avail_out) / size;
} }
void end(std::atomic<long long> *geompos) { void end(std::atomic<long long> *) {
// printf("----- left in the buffer:\n");
// for (size_t i = 0; i < 50 && i < zs.avail_in; i++) {
// printf("%d ", zs.next_in[i] & 0xFF);
// }
// printf("\n");
if (zs.avail_in == 0) { if (zs.avail_in == 0) {
size_t n = ::fread((Bytef *) buf.c_str(), sizeof(char), buf.size(), fp); size_t n = ::fread((Bytef *) buf.c_str(), sizeof(char), buf.size(), fp);
zs.next_in = (Bytef *) buf.c_str(); zs.next_in = (Bytef *) buf.c_str();
zs.avail_in = n; zs.avail_in = n;
// printf("----- now in the buffer:\n");
// for (size_t i = 0; i < 50 && i < zs.avail_in; i++) {
// printf("%d ", zs.next_in[i] & 0xFF);
// }
// printf("\n");
} }
if (within) { if (within) {
@@ -170,7 +147,6 @@ struct decompressor {
} }
within = false; within = false;
// printf("------- END\n");
int d = inflateEnd(&zs); int d = inflateEnd(&zs);
if (d != Z_OK) { if (d != Z_OK) {
@@ -1740,7 +1716,6 @@ serial_feature next_feature(decompressor *geoms, std::atomic<long long> *geompos
long long len; long long len;
if (geoms->deserialize_long_long(&len, geompos_in) == 0) { if (geoms->deserialize_long_long(&len, geompos_in) == 0) {
printf("------ <<<<<< deserialization failure, end of tile\n");
if (compressed) { if (compressed) {
geoms->end(geompos_in); geoms->end(geompos_in);
} }
@@ -1749,7 +1724,6 @@ serial_feature next_feature(decompressor *geoms, std::atomic<long long> *geompos
return sf; return sf;
} }
if (len == 0) { if (len == 0) {
printf("------ <<<<<< feature len 0, end of tile\n");
if (compressed) { if (compressed) {
geoms->end(geompos_in); geoms->end(geompos_in);
} }
@@ -2254,8 +2228,6 @@ long long write_tile(decompressor *geoms, std::atomic<long long> *geompos_in, ch
if (*geompos_in != og) { if (*geompos_in != og) {
if (compressed_input) { if (compressed_input) {
long long n = *geompos_in;
printf("-------- seek: end %lld to %lld\n", n, og);
if (geoms->within) { if (geoms->within) {
geoms->end(geompos_in); geoms->end(geompos_in);
} }
@@ -2267,6 +2239,7 @@ long long write_tile(decompressor *geoms, std::atomic<long long> *geompos_in, ch
perror("fseek geom"); perror("fseek geom");
exit(EXIT_SEEK); exit(EXIT_SEEK);
} }
*geompos_in = og; *geompos_in = og;
geoms->zs.avail_in = 0; geoms->zs.avail_in = 0;
geoms->zs.avail_out = 0; geoms->zs.avail_out = 0;
@@ -3175,7 +3148,6 @@ void *run_thread(void *vargs) {
} }
decompressor dc(geom); decompressor dc(geom);
printf("-------------------------- new file\n");
std::atomic<long long> geompos(0); std::atomic<long long> geompos(0);
long long prevgeom = 0; long long prevgeom = 0;
@@ -3192,8 +3164,8 @@ void *run_thread(void *vargs) {
} }
dc.deserialize_uint(&x, &geompos); dc.deserialize_uint(&x, &geompos);
dc.deserialize_uint(&y, &geompos); dc.deserialize_uint(&y, &geompos);
printf("------- %d/%d/%d\n", z, x, y);
#if 0 #if 0
// currently broken because also requires tracking nextzoom when skipping zooms
if (z != arg->zoom) { if (z != arg->zoom) {
fprintf(stderr, "Expected zoom %d, found zoom %d\n", arg->zoom, z); fprintf(stderr, "Expected zoom %d, found zoom %d\n", arg->zoom, z);
exit(EXIT_IMPOSSIBLE); exit(EXIT_IMPOSSIBLE);
@@ -3331,6 +3303,11 @@ int traverse_zooms(int *geomfd, off_t *geom_size, char *stringpool, std::atomic<
useful_threads++; useful_threads++;
} }
} }
if (z == iz + 1) {
if (!quiet) {
fprintf(stderr, "(compressed geometry size %lld for zoom level %d)\n", todo, z);
}
}
size_t threads = CPUS; size_t threads = CPUS;
if (threads > TEMP_FILES / 4) { if (threads > TEMP_FILES / 4) {