From 89a860d59f71e0c661f3cd351a139cfb39f8d50e Mon Sep 17 00:00:00 2001 From: bilal614 Date: Mon, 22 Jul 2024 15:50:53 +0200 Subject: [PATCH] Remove unused dtoa code --- CMakeLists.txt | 2 - bazel/core.bzl | 2 - benchmark/CMakeLists.txt | 1 - benchmark/util/dtoa.benchmark.cpp | 66 ------------------------------- src/mbgl/util/dtoa.cpp | 22 ----------- src/mbgl/util/dtoa.hpp | 16 -------- test/CMakeLists.txt | 1 - test/util/dtoa.test.cpp | 24 ----------- 8 files changed, 134 deletions(-) delete mode 100644 benchmark/util/dtoa.benchmark.cpp delete mode 100644 src/mbgl/util/dtoa.cpp delete mode 100644 src/mbgl/util/dtoa.hpp delete mode 100644 test/util/dtoa.test.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ffa1b9ff..7aea21d45 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -926,8 +926,6 @@ list(APPEND SRC_FILES ${PROJECT_SOURCE_DIR}/src/mbgl/util/color.cpp ${PROJECT_SOURCE_DIR}/src/mbgl/util/constants.cpp ${PROJECT_SOURCE_DIR}/src/mbgl/util/convert.cpp - ${PROJECT_SOURCE_DIR}/src/mbgl/util/dtoa.cpp - ${PROJECT_SOURCE_DIR}/src/mbgl/util/dtoa.hpp ${PROJECT_SOURCE_DIR}/src/mbgl/util/event.cpp ${PROJECT_SOURCE_DIR}/src/mbgl/util/filesystem.hpp ${PROJECT_SOURCE_DIR}/src/mbgl/util/font_stack.cpp diff --git a/bazel/core.bzl b/bazel/core.bzl index 9804513a7..d62f246be 100644 --- a/bazel/core.bzl +++ b/bazel/core.bzl @@ -582,8 +582,6 @@ MLN_CORE_SOURCE = [ "src/mbgl/util/color.cpp", "src/mbgl/util/constants.cpp", "src/mbgl/util/convert.cpp", - "src/mbgl/util/dtoa.cpp", - "src/mbgl/util/dtoa.hpp", "src/mbgl/util/event.cpp", "src/mbgl/util/filesystem.hpp", "src/mbgl/util/font_stack.cpp", diff --git a/benchmark/CMakeLists.txt b/benchmark/CMakeLists.txt index e74e31a7d..ed085650a 100644 --- a/benchmark/CMakeLists.txt +++ b/benchmark/CMakeLists.txt @@ -10,7 +10,6 @@ add_library( ${PROJECT_SOURCE_DIR}/benchmark/parse/vector_tile.benchmark.cpp ${PROJECT_SOURCE_DIR}/benchmark/src/mbgl/benchmark/benchmark.cpp ${PROJECT_SOURCE_DIR}/benchmark/storage/offline_database.benchmark.cpp - ${PROJECT_SOURCE_DIR}/benchmark/util/dtoa.benchmark.cpp ${PROJECT_SOURCE_DIR}/benchmark/util/tilecover.benchmark.cpp ) diff --git a/benchmark/util/dtoa.benchmark.cpp b/benchmark/util/dtoa.benchmark.cpp deleted file mode 100644 index 662ddd27c..000000000 --- a/benchmark/util/dtoa.benchmark.cpp +++ /dev/null @@ -1,66 +0,0 @@ -#include - -#include - -#include -#include - -using namespace mbgl; - -static void Util_dtoa(::benchmark::State& state) { - while (state.KeepRunning()) { - util::dtoa(0.); - util::dtoa(M_E); - util::dtoa(M_LOG2E); - util::dtoa(M_LOG10E); - util::dtoa(M_LN2); - util::dtoa(M_LN10); - util::dtoa(M_PI); - util::dtoa(M_PI_2); - util::dtoa(M_PI_4); - util::dtoa(M_1_PI); - util::dtoa(M_2_PI); - util::dtoa(M_2_SQRTPI); - util::dtoa(M_SQRT2); - util::dtoa(M_SQRT1_2); - } -} - -static void Util_standardDtoa(::benchmark::State& state) { - while (state.KeepRunning()) { - std::ignore = std::to_string(0.); - std::ignore = std::to_string(M_E); - std::ignore = std::to_string(M_LOG2E); - std::ignore = std::to_string(M_LOG10E); - std::ignore = std::to_string(M_LN2); - std::ignore = std::to_string(M_LN10); - std::ignore = std::to_string(M_PI); - std::ignore = std::to_string(M_PI_2); - std::ignore = std::to_string(M_PI_4); - std::ignore = std::to_string(M_1_PI); - std::ignore = std::to_string(M_2_PI); - std::ignore = std::to_string(M_2_SQRTPI); - std::ignore = std::to_string(M_SQRT2); - std::ignore = std::to_string(M_SQRT1_2); - } -} - -static void Util_dtoaLimits(::benchmark::State& state) { - while (state.KeepRunning()) { - util::dtoa(DBL_MIN); - util::dtoa(DBL_MAX); - } -} - -static void Util_standardDtoaLimits(::benchmark::State& state) { - while (state.KeepRunning()) { - std::ignore = std::to_string(DBL_MIN); - std::ignore = std::to_string(DBL_MAX); - } -} - -BENCHMARK(Util_dtoa); -BENCHMARK(Util_standardDtoa); - -BENCHMARK(Util_dtoaLimits); -BENCHMARK(Util_standardDtoaLimits); diff --git a/src/mbgl/util/dtoa.cpp b/src/mbgl/util/dtoa.cpp deleted file mode 100644 index 844d50b74..000000000 --- a/src/mbgl/util/dtoa.cpp +++ /dev/null @@ -1,22 +0,0 @@ -#include "dtoa.hpp" - -#include - -namespace mbgl { -namespace util { - -std::string dtoa(double value, bool decimal) { - std::string data; - data.resize(25); - auto end = rapidjson::internal::dtoa(value, const_cast(data.data())); - auto length = end - data.data(); - if (!decimal && length >= 3 && end[-1] == '0' && end[-2] == '.') { - // Remove trailing ".0" for integers - length -= 2; - } - data.resize(length); - return data; -} - -} // namespace util -} // namespace mbgl diff --git a/src/mbgl/util/dtoa.hpp b/src/mbgl/util/dtoa.hpp deleted file mode 100644 index 22aa92567..000000000 --- a/src/mbgl/util/dtoa.hpp +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once - -#include -#include - -namespace mbgl { -namespace util { - -std::string dtoa(double value, bool decimal = false); - -inline double stod(const std::string& str) { - return ::strtod(str.c_str(), nullptr); -} - -} // end namespace util -} // end namespace mbgl diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index a15efa01c..1adf20efa 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -86,7 +86,6 @@ add_library( ${PROJECT_SOURCE_DIR}/test/util/async_task.test.cpp ${PROJECT_SOURCE_DIR}/test/util/bounding_volumes.test.cpp ${PROJECT_SOURCE_DIR}/test/util/camera.test.cpp - ${PROJECT_SOURCE_DIR}/test/util/dtoa.test.cpp ${PROJECT_SOURCE_DIR}/test/util/geo.test.cpp ${PROJECT_SOURCE_DIR}/test/util/grid_index.test.cpp ${PROJECT_SOURCE_DIR}/test/util/hash.test.cpp diff --git a/test/util/dtoa.test.cpp b/test/util/dtoa.test.cpp deleted file mode 100644 index ca13a51c4..000000000 --- a/test/util/dtoa.test.cpp +++ /dev/null @@ -1,24 +0,0 @@ -#include - -#include - -#include -#include - -using namespace mbgl; - -TEST(Dtoa, Precision) { - EXPECT_EQ(M_E, util::stod(util::dtoa(M_E))); - EXPECT_EQ(M_LOG2E, util::stod(util::dtoa(M_LOG2E))); - EXPECT_EQ(M_LOG10E, util::stod(util::dtoa(M_LOG10E))); - EXPECT_EQ(M_LN2, util::stod(util::dtoa(M_LN2))); - EXPECT_EQ(M_LN10, util::stod(util::dtoa(M_LN10))); - EXPECT_EQ(M_PI, util::stod(util::dtoa(M_PI))); - EXPECT_EQ(M_PI_2, util::stod(util::dtoa(M_PI_2))); - EXPECT_EQ(M_PI_4, util::stod(util::dtoa(M_PI_4))); - EXPECT_EQ(M_1_PI, util::stod(util::dtoa(M_1_PI))); - EXPECT_EQ(M_2_PI, util::stod(util::dtoa(M_2_PI))); - EXPECT_EQ(M_2_SQRTPI, util::stod(util::dtoa(M_2_SQRTPI))); - EXPECT_EQ(M_SQRT2, util::stod(util::dtoa(M_SQRT2))); - EXPECT_EQ(M_SQRT1_2, util::stod(util::dtoa(M_SQRT1_2))); -}