Clean up and fix JSONLoader code

- use unqiue_ptr to manage memory so as to not excercise the garbage collector as much Signed-off-by: Chris Dodd <cdodd@nvidia.com>
p4lang · Feb 25, 2025 · 57da1b0 · 57da1b0
1 parent d04dde0
commit 57da1b0
Show file tree

Hide file tree

Showing 18 changed files with 180 additions and 191 deletions.
diff --git a/backends/bmv2/pna_nic/main.cpp b/backends/bmv2/pna_nic/main.cpp
@@ -84,7 +84,7 @@ int main(int argc, char *const argv[]) {
         }
         std::istream inJson(&fb);
         JSONLoader jsonFileLoader(inJson);
-        if (jsonFileLoader.json == nullptr) {
+        if (!jsonFileLoader) {
             ::P4::error(ErrorType::ERR_IO, "%s: Not valid input file", options.file);
             return 1;
         }

diff --git a/backends/bmv2/psa_switch/main.cpp b/backends/bmv2/psa_switch/main.cpp
@@ -84,7 +84,7 @@ int main(int argc, char *const argv[]) {
         }
         std::istream inJson(&fb);
         JSONLoader jsonFileLoader(inJson);
-        if (jsonFileLoader.json == nullptr) {
+        if (!jsonFileLoader) {
             ::P4::error(ErrorType::ERR_IO, "%s: Not valid input file", options.file);
             return 1;
         }

diff --git a/backends/bmv2/simple_switch/main.cpp b/backends/bmv2/simple_switch/main.cpp
@@ -87,7 +87,7 @@ int main(int argc, char *const argv[]) {
         }
         std::istream inJson(&fb);
         JSONLoader jsonFileLoader(inJson);
-        if (jsonFileLoader.json == nullptr) {
+        if (!jsonFileLoader) {
             ::P4::error(ErrorType::ERR_IO, "%s: Not valid json input file", options.file);
             return 1;
         }

diff --git a/backends/dpdk/main.cpp b/backends/dpdk/main.cpp
@@ -105,7 +105,7 @@ int main(int argc, char *const argv[]) {
         }
         std::istream inJson(&fb);
         JSONLoader jsonFileLoader(inJson);
-        if (jsonFileLoader.json == nullptr) {
+        if (!jsonFileLoader) {
             ::P4::error(ErrorType::ERR_INVALID, "Not valid input file");
             return 1;
         }

diff --git a/backends/ebpf/p4c-ebpf.cpp b/backends/ebpf/p4c-ebpf.cpp
@@ -56,7 +56,7 @@ void compile(EbpfOptions &options) {
 
         std::istream inJson(&fb);
         JSONLoader jsonFileLoader(inJson);
-        if (jsonFileLoader.json == nullptr) {
+        if (!jsonFileLoader) {
             ::P4::error(ErrorType::ERR_IO, "%s: Not valid input file", options.file);
             return;
         }

diff --git a/backends/graphs/p4c-graphs.cpp b/backends/graphs/p4c-graphs.cpp
@@ -151,7 +151,7 @@ int main(int argc, char *const argv[]) {
 
         std::istream inJson(&fb);
         JSONLoader jsonFileLoader(inJson);
-        if (jsonFileLoader.json == nullptr) {
+        if (!jsonFileLoader) {
             ::P4::error(ErrorType::ERR_IO, "Not valid input file");
             return 1;
         }

diff --git a/backends/p4tools/common/core/z3_solver.cpp b/backends/p4tools/common/core/z3_solver.cpp
@@ -340,13 +340,13 @@ Z3Solver::Z3Solver(bool isIncremental, std::optional<std::istream *> inOpt)
     JSONLoader loader(*inOpt.value());
 
     JSONLoader solverCheckpoints(loader, "checkpoints");
-    BUG_CHECK(solverCheckpoints.json->is<JsonVector>(),
+    BUG_CHECK(solverCheckpoints.is<JsonVector>(),
               "Z3 solver loading: can't find list of checkpoint");
     solverCheckpoints >> checkpoints;
 
     // loading all assertions
     JSONLoader solverAssertions(loader, "assertions");
-    BUG_CHECK(solverAssertions.json->is<JsonVector>(),
+    BUG_CHECK(solverAssertions.is<JsonVector>(),
               "Z3 solver loading: can't find list of assertions");
     safe_vector<const Constraint *> assertions;
     solverAssertions >> assertions;

diff --git a/backends/tofino/bf-p4c/ir/unique_id.cpp b/backends/tofino/bf-p4c/ir/unique_id.cpp
@@ -36,9 +36,10 @@ void UniqueAttachedId::toJSON(P4::JSONGenerator &json) const {
 
 UniqueAttachedId UniqueAttachedId::fromJSON(P4::JSONLoader &json) {
     UniqueAttachedId uai;
-    if (!json.json) return uai;
-    json.load("name", uai.name);
-    json.load("type", uai.type);
+    if (json) {
+        json.load("name", uai.name);
+        json.load("type", uai.type);
+    }
     return uai;
 }
 

diff --git a/backends/tofino/bf-p4c/mau/hash_function.cpp b/backends/tofino/bf-p4c/mau/hash_function.cpp
@@ -580,7 +580,7 @@ void IR::MAU::HashFunction::build_algorithm_t(bfn_hash_algorithm_ *alg) const {
 }
 
 IR::MAU::HashFunction *IR::MAU::HashFunction::fromJSON(JSONLoader &json) {
-    if (!json.json) return nullptr;
+    if (!json) return nullptr;
     auto *rv = new HashFunction;
     int type = 0;
     json.load("type", type);

diff --git a/backends/tofino/bf-p4c/parde/match_register.cpp b/backends/tofino/bf-p4c/parde/match_register.cpp
@@ -47,7 +47,7 @@ void MatchRegister::toJSON(JSONGenerator &json) const { json.emit(toString()); }
 
 /* static */
 MatchRegister MatchRegister::fromJSON(JSONLoader &json) {
-    if (auto *v = json.json->to<JsonString>()) return MatchRegister(cstring(v->c_str()));
+    if (json.is<JsonString>()) return MatchRegister(json.as<JsonString>());
     BUG("Couldn't decode JSON value to parser match register");
     return MatchRegister();
 }
diff --git a/backends/tofino/bf-p4c/phv/phv.cpp b/backends/tofino/bf-p4c/phv/phv.cpp
@@ -162,7 +162,7 @@ cstring Container::toString() const {
 void Container::toJSON(P4::JSONGenerator &json) const { json.emit(toString()); }
 
 /* static */ Container Container::fromJSON(P4::JSONLoader &json) {
-    if (auto *v = json.json->to<JsonString>()) return Container(v->c_str());
+    if (json.is<JsonString>()) return Container(json.as<JsonString>().c_str());
     BUG("Couldn't decode JSON value to container");
     return Container();
 }