Improve performance of JSON rendering

.github/workflows/osrm-backend.yml

@@ -715,6 +715,7 @@ jobs:
  pushd ${OSRM_BUILD_DIR}
  make --jobs=${JOBS} benchmarks
  ./src/benchmarks/alias-bench 
+ ./src/benchmarks/json-render-bench ../src/benchmarks/portugal_to_korea.json
  ./src/benchmarks/match-bench ../test/data/ch/monaco.osrm
  ./src/benchmarks/packedvector-bench
  ./src/benchmarks/rtree-bench ../test/data/monaco.osrm.ramIndex ../test/data/monaco.osrm.fileIndex ../test/data/monaco.osrm.nbg_nodes

CHANGELOG.md

@@ -9,6 +9,7 @@
  - NodeJS:
  - FIXED: Support `skip_waypoints` in Node bindings [#6060](https://github.com/Project-OSRM/osrm-backend/pull/6060)
  - Misc:
+ - CHANGED: Improve performance of JSON rendering. Fix undefined behaviour in JSON numbers formatting. [#6380](https://github.com/Project-OSRM/osrm-backend/pull/6380)
  - ADDED: Add timestamps for logs. [#6375](https://github.com/Project-OSRM/osrm-backend/pull/6375)
  - CHANGED: Improve performance of map matching via getPathDistance optimization. [#6378](https://github.com/Project-OSRM/osrm-backend/pull/6378)
  - CHANGED: Optimize RestrictionParser performance. [#6344](https://github.com/Project-OSRM/osrm-backend/pull/6344)

features/testbot/annotations.feature

@@ -115,4 +115,4 @@ Feature: Annotations
 
  When I route I should get
  | from | to | route | a:speed | a:distance | a:duration | a:nodes |
- | a | c | abc,abc | 10:10 | 249.987619:299.962882 | 25:30 | 1:2:3 |
+ | a | c | abc,abc | 10:10 | 249.987618946:299.962882039 | 25:30 | 1:2:3 |

features/testbot/matching.feature

@@ -809,7 +809,7 @@ Feature: Basic Map Matching
 
  # These should have the same weights/duration in either direction
  When I match I should get
- | trace | geometry | a:distance | a:duration | a:weight | duration |
- | 2345 | 1.00018,1,1.000314,1 | 14.914666 | 1.4 | 1.4 | 1.4 |
- | 4321 | 1.00027,1,1.000135,1 | 15.02597  | 1.5 | 1.5 | 1.5 |
+ | trace | geometry | a:distance  | a:duration | a:weight | duration |
+ | 2345 | 1.00018,1,1.000314,1 | 14.914666491 | 1.4 | 1.4 | 1.4 |
+ | 4321 | 1.00027,1,1.000135,1 | 15.025969972 | 1.5 | 1.5 | 1.5 |
 

features/testbot/snap_intersection.feature

@@ -570,7 +570,7 @@ Feature: Snapping at intersections
  | a,f,k | ac,cf,cf,fj,kj,kj | 132.8s | 132.8 |
  | k,f | ik,fi,fi | 54.3s | 54.3 |
  | f,a | ef,ae,ae | 66.6s | 66.6 |
- | k,f,a | kj,fj,fj,ef,ae,ae | 141.4s | 141.4 |
+ | k,f,a | kj,fj,fj,ef,ae,ae | 141.399999999s | 141.399999999 |
 
  When I request a travel time matrix I should get
  | | a | f | k |
@@ -626,4 +626,4 @@ Feature: Snapping at intersections
  | a,f,k | ad,df,df,fj,kj,kj | 105.6s | 105.6 |
  | k,f | ik,fi,fi | 54.3s | 54.3 |
  | f,a | ef,ae,ae | 66.6s | 66.6 |
- | k,f,a | ik,fi,fi,ef,ae,ae | 120.9s | 120.9 |
+ | k,f,a | ik,fi,fi,ef,ae,ae | 120.899999999s | 120.899999999 |

features/testbot/weight.feature

@@ -52,11 +52,11 @@ Feature: Weight tests
  | abc |
 
  When I route I should get
- | waypoints | route | distances | weights | times | a:distance | a:duration | a:weight | a:speed |
- | s,t | abc,abc | 20m,0m | 2,0 | 2s,0s | 20.034627 | 2 | 2 | 10 |
- | t,s | abc,abc | 20m,0m | 2,0 | 2s,0s | 20.034627 | 2 | 2 | 10 |
- | s,e | abc,abc | 40m,0m | 3.9,0 | 3.9s,0s | 29.940636:10.017313 | 3:0.9 | 3:0.9 | 10:11.1 |
- | e,s | abc,abc | 40m,0m | 3.9,0 | 3.9s,0s | 10.017313:29.940636 | 0.9:3 | 0.9:3 | 11.1:10 |
+ | waypoints | route | distances | weights | times | a:distance  | a:duration | a:weight | a:speed |
+ | s,t | abc,abc | 20m,0m | 2,0 | 2s,0s | 20.034626629  | 2 | 2 | 10 |
+ | t,s | abc,abc | 20m,0m | 2,0 | 2s,0s | 20.034626629  | 2 | 2 | 10 |
+ | s,e | abc,abc | 40m,0m | 3.9,0 | 3.9s,0s | 29.940636463:10.017313314 | 3:0.9 | 3:0.9 | 10:11.1 |
+ | e,s | abc,abc | 40m,0m | 3.9,0 | 3.9s,0s | 10.017313314:29.940636463 | 0.9:3 | 0.9:3 | 11.1:10 |
 
 
  Scenario: Step weights -- way_function: fail if no weight or weight_per_meter property

fuzz/escape_json.cc

@@ -5,13 +5,14 @@
 #include <iterator>
 #include <string>
 
-using osrm::util::escape_JSON;
+using osrm::util::EscapeJSONString;
 
 extern "C" int LLVMFuzzerTestOneInput(const unsigned char *data, unsigned long size)
 {
  const std::string in(reinterpret_cast<const char *>(data), size);
 
- const auto escaped = escape_JSON(in);
+ std::string escaped;
+ EscapeJSONString(in, escaped);
  escape(escaped.data());
 
  return 0;

include/nodejs/json_v8_renderer.hpp

@@ -60,8 +60,8 @@ struct V8Renderer
 
 inline void renderToV8(v8::Local<v8::Value> &out, const osrm::json::Object &object)
 {
- osrm::json::Value value = object;
- mapbox::util::apply_visitor(V8Renderer(out), value);
+ V8Renderer renderer(out);
+ renderer(object);
 }
 } // namespace node_osrm