accept size parameter for polygonToCellsExperimental

uber · Nov 28, 2024 · c8f1f72 · c8f1f72
1 parent e45b999
commit c8f1f72
Show file tree

Hide file tree

Showing 8 changed files with 110 additions and 91 deletions.
diff --git a/src/apps/benchmarks/benchmarkPolygonToCellsExperimental.c b/src/apps/benchmarks/benchmarkPolygonToCellsExperimental.c
@@ -128,7 +128,7 @@ BENCHMARK(polygonToCellsSF_Center, 500, {
     (&sfGeoPolygon, 9, CONTAINMENT_CENTER, &numHexagons);
     hexagons = calloc(numHexagons, sizeof(H3Index));
     H3_EXPORT(polygonToCellsExperimental)
-    (&sfGeoPolygon, 9, CONTAINMENT_CENTER, hexagons);
+    (&sfGeoPolygon, 9, CONTAINMENT_CENTER, numHexagons, hexagons);
     free(hexagons);
 });
 
@@ -137,7 +137,7 @@ BENCHMARK(polygonToCellsSF_Full, 500, {
     (&sfGeoPolygon, 9, CONTAINMENT_FULL, &numHexagons);
     hexagons = calloc(numHexagons, sizeof(H3Index));
     H3_EXPORT(polygonToCellsExperimental)
-    (&sfGeoPolygon, 9, CONTAINMENT_FULL, hexagons);
+    (&sfGeoPolygon, 9, CONTAINMENT_FULL, numHexagons, hexagons);
     free(hexagons);
 });
 
@@ -146,7 +146,7 @@ BENCHMARK(polygonToCellsSF_Overlapping, 500, {
     (&sfGeoPolygon, 9, CONTAINMENT_OVERLAPPING, &numHexagons);
     hexagons = calloc(numHexagons, sizeof(H3Index));
     H3_EXPORT(polygonToCellsExperimental)
-    (&sfGeoPolygon, 9, CONTAINMENT_OVERLAPPING, hexagons);
+    (&sfGeoPolygon, 9, CONTAINMENT_OVERLAPPING, numHexagons, hexagons);
     free(hexagons);
 });
 
@@ -155,7 +155,7 @@ BENCHMARK(polygonToCellsAlameda_Center, 500, {
     (&alamedaGeoPolygon, 9, CONTAINMENT_CENTER, &numHexagons);
     hexagons = calloc(numHexagons, sizeof(H3Index));
     H3_EXPORT(polygonToCellsExperimental)
-    (&alamedaGeoPolygon, 9, CONTAINMENT_CENTER, hexagons);
+    (&alamedaGeoPolygon, 9, CONTAINMENT_CENTER, numHexagons, hexagons);
     free(hexagons);
 });
 
@@ -164,7 +164,7 @@ BENCHMARK(polygonToCellsAlameda_Full, 500, {
     (&alamedaGeoPolygon, 9, CONTAINMENT_FULL, &numHexagons);
     hexagons = calloc(numHexagons, sizeof(H3Index));
     H3_EXPORT(polygonToCellsExperimental)
-    (&alamedaGeoPolygon, 9, CONTAINMENT_FULL, hexagons);
+    (&alamedaGeoPolygon, 9, CONTAINMENT_FULL, numHexagons, hexagons);
     free(hexagons);
 });
 
@@ -173,7 +173,7 @@ BENCHMARK(polygonToCellsAlameda_Overlapping, 500, {
     (&alamedaGeoPolygon, 9, CONTAINMENT_OVERLAPPING, &numHexagons);
     hexagons = calloc(numHexagons, sizeof(H3Index));
     H3_EXPORT(polygonToCellsExperimental)
-    (&alamedaGeoPolygon, 9, CONTAINMENT_OVERLAPPING, hexagons);
+    (&alamedaGeoPolygon, 9, CONTAINMENT_OVERLAPPING, numHexagons, hexagons);
     free(hexagons);
 });
 
@@ -182,7 +182,7 @@ BENCHMARK(polygonToCellsSouthernExpansion_Center, 10, {
     (&southernGeoPolygon, 9, CONTAINMENT_CENTER, &numHexagons);
     hexagons = calloc(numHexagons, sizeof(H3Index));
     H3_EXPORT(polygonToCellsExperimental)
-    (&southernGeoPolygon, 9, CONTAINMENT_CENTER, hexagons);
+    (&southernGeoPolygon, 9, CONTAINMENT_CENTER, numHexagons, hexagons);
     free(hexagons);
 });
 
@@ -191,7 +191,7 @@ BENCHMARK(polygonToCellsSouthernExpansion_Full, 10, {
     (&southernGeoPolygon, 9, CONTAINMENT_FULL, &numHexagons);
     hexagons = calloc(numHexagons, sizeof(H3Index));
     H3_EXPORT(polygonToCellsExperimental)
-    (&southernGeoPolygon, 9, CONTAINMENT_FULL, hexagons);
+    (&southernGeoPolygon, 9, CONTAINMENT_FULL, numHexagons, hexagons);
     free(hexagons);
 });
 
@@ -200,7 +200,7 @@ BENCHMARK(polygonToCellsSouthernExpansion_Overlapping, 10, {
     (&southernGeoPolygon, 9, CONTAINMENT_OVERLAPPING, &numHexagons);
     hexagons = calloc(numHexagons, sizeof(H3Index));
     H3_EXPORT(polygonToCellsExperimental)
-    (&southernGeoPolygon, 9, CONTAINMENT_OVERLAPPING, hexagons);
+    (&southernGeoPolygon, 9, CONTAINMENT_OVERLAPPING, numHexagons, hexagons);
     free(hexagons);
 });
 

diff --git a/src/apps/fuzzers/fuzzerPolygonToCellsExperimental.c b/src/apps/fuzzers/fuzzerPolygonToCellsExperimental.c
@@ -58,7 +58,7 @@ void run(GeoPolygon *geoPolygon, uint32_t flags, int res) {
                                                                flags, &sz);
     if (!err && sz < MAX_SZ) {
         H3Index *out = calloc(sz, sizeof(H3Index));
-        H3_EXPORT(polygonToCellsExperimental)(geoPolygon, res, flags, out);
+        H3_EXPORT(polygonToCellsExperimental)(geoPolygon, res, flags, sz, out);
         free(out);
     }
 }

diff --git a/src/apps/fuzzers/fuzzerPolygonToCellsExperimentalNoHoles.c b/src/apps/fuzzers/fuzzerPolygonToCellsExperimentalNoHoles.c
@@ -33,7 +33,7 @@ void run(GeoPolygon *geoPolygon, uint32_t flags, int res) {
                                                                flags, &sz);
     if (!err && sz < MAX_SZ) {
         H3Index *out = calloc(sz, sizeof(H3Index));
-        H3_EXPORT(polygonToCellsExperimental)(geoPolygon, res, flags, out);
+        H3_EXPORT(polygonToCellsExperimental)(geoPolygon, res, flags, sz, out);
         free(out);
     }
 }

diff --git a/src/apps/testapps/testH3Memory.c b/src/apps/testapps/testH3Memory.c
@@ -238,15 +238,15 @@ SUITE(h3Memory) {
         resetMemoryCounters(0);
         failAlloc = true;
         H3Error err = H3_EXPORT(polygonToCellsExperimental)(
-            &sfGeoPolygon, 9, CONTAINMENT_CENTER, hexagons);
+            &sfGeoPolygon, 9, CONTAINMENT_CENTER, numHexagons, hexagons);
         t_assert(err == E_MEMORY_ALLOC,
                  "polygonToCellsExperimental failed (1)");
         t_assert(actualAllocCalls == 1, "alloc called once");
         t_assert(actualFreeCalls == 0, "free not called");
 
         resetMemoryCounters(1);
         err = H3_EXPORT(polygonToCellsExperimental)(
-            &sfGeoPolygon, 9, CONTAINMENT_CENTER, hexagons);
+            &sfGeoPolygon, 9, CONTAINMENT_CENTER, numHexagons, hexagons);
         t_assert(err == E_SUCCESS, "polygonToCellsExperimental succeeded (1)");
         t_assert(actualAllocCalls == 1, "alloc called one time");
         t_assert(actualFreeCalls == 1, "free called one time");