Fix more places where multiple threads access the same data

Author: e-n-f

merge.cpp

@@ -5,6 +5,7 @@
 #include <queue>
 #include <iterator>
 #include <algorithm>
+#include <atomic>
 #include <pthread.h>
 #include <sys/mman.h>
 #include "merge.hpp"
@@ -22,7 +23,7 @@ struct merger {
 	}
 };
 
-unsigned char *do_merge1(std::vector<merger> &merges, size_t nmerges, unsigned char *f, int bytes, long long nrec, int zoom, bool quiet, volatile int *progress, size_t shard, size_t nshards, size_t also_todo, size_t also_did) {
+unsigned char *do_merge1(std::vector<merger> &merges, size_t nmerges, unsigned char *f, int bytes, long long nrec, int zoom, bool quiet, std::atomic<int> *progress, size_t shard, size_t nshards, size_t also_todo, size_t also_did) {
 	std::priority_queue<merger> q;
 
 	unsigned long long mask = 0;
@@ -106,7 +107,7 @@ struct merge_arg {
 	size_t also_todo;
 	size_t also_did;
 
-	int *progress;
+	std::atomic<int> *progress;
 	size_t shard;
 	size_t nshards;
 };
@@ -194,7 +195,7 @@ void do_merge(struct merge *merges, size_t nmerges, int f, int bytes, long long
 		}
 	}
 
-	int progress[cpus];
+	std::atomic<int> progress[cpus];
 	std::vector<merge_arg> args;
 
 	for (size_t i = 0; i < cpus; i++) {

tile.cpp

@@ -17,6 +17,7 @@
 #include <math.h>
 #include <time.h>
 #include <png.h>
+#include <atomic>
 #include "tippecanoe/projection.hpp"
 #include "protozero/varint.hpp"
 #include "protozero/pbf_reader.hpp"
@@ -86,7 +87,7 @@ struct tiler {
 	sqlite3 *outdb;
 	int maxzoom;
 
-	volatile int *progress;
+	std::atomic<int> *progress;
 	size_t shard;
 	size_t cpus;
 	std::string layername;
@@ -1322,6 +1323,7 @@ int main(int argc, char **argv) {
 			break;
 
 		default:
+			fprintf(stderr, "Unknown option -%c\n", i);
 			usage(argv);
 			exit(EXIT_FAILURE);
 		}
@@ -1383,13 +1385,13 @@ int main(int argc, char **argv) {
 	}
 
 	if (zooms == 0) {
-		if (optind + 1 != argc || (maxzoom < 0 && bin < 0) || outfile == NULL) {
-			usage(argv);
+		if (maxzoom < 0 && bin < 0) {
+			fprintf(stderr, "%s: Must specify either maxzoom (-z) or bin size (-s)\n", argv[0]);
 			exit(EXIT_FAILURE);
 		}
 
-		if (maxzoom < 0 && bin < 0) {
-			fprintf(stderr, "%s: Must specify either maxzoom (-z) or bin size (-s)\n", argv[0]);
+		if (optind + 1 != argc || (maxzoom < 0 && bin < 0) || outfile == NULL) {
+			usage(argv);
 			exit(EXIT_FAILURE);
 		}
 
@@ -1440,7 +1442,7 @@ int main(int argc, char **argv) {
 		}
 
 		for (size_t pass = 0; pass < 2; pass++) {
-			volatile int progress[cpus];
+			std::atomic<int> progress[cpus];
 			std::vector<tiler> tilers;
 			tilers.resize(cpus);
 

tippecanoe/projection.cpp

@@ -2,6 +2,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <math.h>
+#include <atomic>
 #include "projection.hpp"
 
 struct projection projections[] = {
@@ -107,11 +108,11 @@ unsigned long long encode(unsigned int wx, unsigned int wy) {
 	return out;
 }
 
-static unsigned char decodex[256];
-static unsigned char decodey[256];
+static std::atomic<unsigned char> decodex[256];
+static std::atomic<unsigned char> decodey[256];
 
 void decode(unsigned long long index, unsigned *wx, unsigned *wy) {
-	static int initialized = 0;
+	static std::atomic<int> initialized(0);
 	if (!initialized) {
 		for (size_t ix = 0; ix < 256; ix++) {
 			size_t xx = 0, yy = 0;