From 2159d464d093a22f762b4aa6d7768d56599202d0 Mon Sep 17 00:00:00 2001
From: Eric Fischer <enf@pobox.com>
Date: Fri, 18 Dec 2015 15:59:07 -0800
Subject: [PATCH] Segment the file into input chunks. Allow commas at the top
 level.

---
 geojson.c  | 26 ++++++++++++++++++++++----
 jsonpull.c | 23 ++++++++++-------------
 2 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/geojson.c b/geojson.c
index 8d11af6..07c4d45 100644
--- a/geojson.c
+++ b/geojson.c
@@ -903,10 +903,28 @@ int read_json(int argc, char **argv, char *fname, const char *layername, int max
 		}
 
 		if (map != NULL && map != MAP_FAILED) {
-			jp = json_begin_map(map, st.st_size - off);
-			parse_json(jp, reading, &seq, &metapos, &geompos, &indexpos, exclude, include, exclude_all, metafile, geomfile, indexfile, poolfile, treefile, fname, maxzoom, basezoom, source, droprate, file_bbox);
-			free(jp->source);
-			json_end(jp);
+#define THREADS 10
+			long long segs[THREADS + 1];
+			segs[0] = 0;
+			segs[THREADS] = st.st_size - off;
+
+			int i;
+			for (i = 1; i < THREADS; i++) {
+				segs[i] = off + (st.st_size - off) * i / THREADS;
+
+				while (segs[i] < st.st_size && map[segs[i]] != '\n') {
+					segs[i]++;
+				}
+
+				printf("%d %lld\n", i, segs[i]);
+			}
+
+			for (i = 0; i < THREADS; i++) {
+				jp = json_begin_map(map + segs[i], segs[i + 1] - segs[i]);
+				parse_json(jp, reading, &seq, &metapos, &geompos, &indexpos, exclude, include, exclude_all, metafile, geomfile, indexfile, poolfile, treefile, fname, maxzoom, basezoom, source, droprate, file_bbox);
+				free(jp->source);
+				json_end(jp);
+			}
 		} else {
 			FILE *fp = fdopen(fd, "r");
 			if (fp == NULL) {
diff --git a/jsonpull.c b/jsonpull.c
index 212ca2c..de2eaae 100644
--- a/jsonpull.c
+++ b/jsonpull.c
@@ -332,20 +332,17 @@ again:
 	/////////////////////////// Comma
 
 	if (c == ',') {
-		if (j->container == NULL) {
-			j->error = "Found comma at top level";
-			return NULL;
-		}
+		if (j->container != NULL) {
+			if (j->container->expect != JSON_COMMA) {
+				j->error = "Found unexpected comma";
+				return NULL;
+			}
 
-		if (j->container->expect != JSON_COMMA) {
-			j->error = "Found unexpected comma";
-			return NULL;
-		}
-
-		if (j->container->type == JSON_HASH) {
-			j->container->expect = JSON_KEY;
-		} else {
-			j->container->expect = JSON_ITEM;
+			if (j->container->type == JSON_HASH) {
+				j->container->expect = JSON_KEY;
+			} else {
+				j->container->expect = JSON_ITEM;
+			}
 		}
 
 		if (cb != NULL) {