DaddyFrosty/yoga
1
0
Fork 0
Code Issues 96 Pull Requests 31 Actions Packages Projects Releases 33 Wiki Activity

Fix failing MVSC benchmark builds (#1573)

Browse Source 
Summary:
Pull Request resolved: https://github.com/facebook/yoga/pull/1573

Noticed a recent stack of commits cause the MVSC builds of benchmark to fail. This was due to forgetting to call `.string()` of a path and trying to escape a character that cannot be escaped.

Reviewed By: philIip

Differential Revision: D53461723

fbshipit-source-id: b6cc034d53b3a61929012965e257a3984c3bff47
This commit is contained in:
Joe Vilches
2024-02-06 11:16:21 -08:00
committed by Facebook GitHub Bot
parent 94960f123e
commit a37565f70d
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
benchmark/Benchmark.cpp
View File

@@ -5,6 +5,7 @@
* LICENSE file in the root directory of this source tree. * LICENSE file in the root directory of this source tree.
*/ */
#include <filesystem>
#include <fstream> #include <fstream>
#include <benchmark/Benchmark.h> #include <benchmark/Benchmark.h>
@@ -138,7 +139,7 @@ YGUnit unitFromJson(json& j) {
std::string unit = j["unit"]; std::string unit = j["unit"];
if (unit == "px") { if (unit == "px") {
return YGUnitPoint; return YGUnitPoint;
} else if (unit == "\%") { } else if (unit == "pct") {
return YGUnitPercent; return YGUnitPercent;
} else { } else {
throw std::invalid_argument(invalidArgumentMessage(unit, "YGUnit")); throw std::invalid_argument(invalidArgumentMessage(unit, "YGUnit"));
@@ -382,7 +383,7 @@ void benchmark(std::filesystem::path& capturesDir) {
totalDurations[i] = result.treeCreationDuration + result.layoutDuration; totalDurations[i] = result.treeCreationDuration + result.layoutDuration;
} }
std::string captureName = capture.path().stem(); std::string captureName = capture.path().stem().string();
printBenchmarkResult(captureName + " tree creation", treeCreationDurations); printBenchmarkResult(captureName + " tree creation", treeCreationDurations);
printBenchmarkResult(captureName + " layout", layoutDurations); printBenchmarkResult(captureName + " layout", layoutDurations);
printBenchmarkResult(captureName + " total", totalDurations); printBenchmarkResult(captureName + " total", totalDurations);

2
capture/NodeToString.cpp
View File

@@ -33,7 +33,7 @@ static void appendYGValueIfNotDefault(
} else if (value.unit == YGUnitUndefined) { } else if (value.unit == YGUnitUndefined) {
j["style"][key] = "undefined"; j["style"][key] = "undefined";
} else { } else {
std::string unit = value.unit == YGUnitPoint ? "px" : "%%"; std::string unit = value.unit == YGUnitPoint ? "px" : "pct";
j["style"][key]["value"] = value.value; j["style"][key]["value"] = value.value;
j["style"][key]["unit"] = unit; j["style"][key]["unit"] = unit;
} }