From 267923604754a50064c04a925a841a6714253d72 Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Fri, 17 Jul 2020 14:15:06 +0200 Subject: Cleanup: avoid static initialization order issues when accessing CPPTypes Instead of depending on static initialization order of globals use static variables within functions. Those are initialized on first use. This is every so slighly less efficient, but avoids a full class of problems. --- tests/gtests/functions/FN_array_spans_test.cc | 7 +++---- tests/gtests/functions/FN_attributes_ref_test.cc | 1 - tests/gtests/functions/FN_cpp_type_test.cc | 5 +++-- tests/gtests/functions/FN_generic_vector_array_test.cc | 15 +++++++-------- .../gtests/functions/FN_multi_function_network_test.cc | 7 +++---- tests/gtests/functions/FN_multi_function_test.cc | 11 +++++------ tests/gtests/functions/FN_spans_test.cc | 17 ++++++++--------- 7 files changed, 29 insertions(+), 34 deletions(-) (limited to 'tests/gtests') diff --git a/tests/gtests/functions/FN_array_spans_test.cc b/tests/gtests/functions/FN_array_spans_test.cc index 988d48fa452..6912a62ff17 100644 --- a/tests/gtests/functions/FN_array_spans_test.cc +++ b/tests/gtests/functions/FN_array_spans_test.cc @@ -3,7 +3,6 @@ #include "testing/testing.h" #include "FN_array_spans.hh" -#include "FN_cpp_types.hh" #include "FN_generic_vector_array.hh" #include "BLI_array.hh" @@ -77,7 +76,7 @@ TEST(virtual_array_span, MultipleArrayConstructor) TEST(generic_virtual_array_span, TypeConstructor) { - GVArraySpan span{CPPType_int32}; + GVArraySpan span{CPPType::get()}; EXPECT_EQ(span.size(), 0); EXPECT_TRUE(span.is_empty()); @@ -88,7 +87,7 @@ TEST(generic_virtual_array_span, TypeConstructor) TEST(generic_virtual_array_span, GSpanConstructor) { std::array values = {"hello", "world", "test"}; - GVArraySpan span{GSpan(CPPType_string, values.data(), 3), 5}; + GVArraySpan span{GSpan(CPPType::get(), values.data(), 3), 5}; EXPECT_EQ(span.size(), 5); EXPECT_FALSE(span.is_empty()); EXPECT_EQ(span[0][0], values.data()); @@ -119,7 +118,7 @@ TEST(generic_virtual_array_span, IsSingleArray1) TEST(generic_virtual_array_span, IsSingleArray2) { - GVectorArray vectors{CPPType_int32, 3}; + GVectorArray vectors{CPPType::get(), 3}; GVectorArrayRef vectors_ref = vectors; vectors_ref.append(1, 4); diff --git a/tests/gtests/functions/FN_attributes_ref_test.cc b/tests/gtests/functions/FN_attributes_ref_test.cc index 1c05bb930db..0b0afdc210f 100644 --- a/tests/gtests/functions/FN_attributes_ref_test.cc +++ b/tests/gtests/functions/FN_attributes_ref_test.cc @@ -2,7 +2,6 @@ #include "BLI_float3.hh" #include "FN_attributes_ref.hh" -#include "FN_cpp_types.hh" #include "testing/testing.h" diff --git a/tests/gtests/functions/FN_cpp_type_test.cc b/tests/gtests/functions/FN_cpp_type_test.cc index da5ce3416ce..78731f9c987 100644 --- a/tests/gtests/functions/FN_cpp_type_test.cc +++ b/tests/gtests/functions/FN_cpp_type_test.cc @@ -3,7 +3,6 @@ #include "testing/testing.h" #include "FN_cpp_type.hh" -#include "FN_cpp_types.hh" namespace blender::fn { @@ -76,6 +75,8 @@ struct TestType { MAKE_CPP_TYPE(TestType, TestType) +const CPPType &CPPType_TestType = CPPType::get(); + TEST(cpp_type, Size) { EXPECT_EQ(CPPType_TestType.size(), sizeof(TestType)); @@ -312,7 +313,7 @@ TEST(cpp_type, DebugPrint) { int value = 42; std::stringstream ss; - CPPType_int32.debug_print((void *)&value, ss); + CPPType::get().debug_print((void *)&value, ss); std::string text = ss.str(); EXPECT_EQ(text, "42"); } diff --git a/tests/gtests/functions/FN_generic_vector_array_test.cc b/tests/gtests/functions/FN_generic_vector_array_test.cc index 7ce7b543218..cfca678ad27 100644 --- a/tests/gtests/functions/FN_generic_vector_array_test.cc +++ b/tests/gtests/functions/FN_generic_vector_array_test.cc @@ -1,6 +1,5 @@ /* Apache License, Version 2.0 */ -#include "FN_cpp_types.hh" #include "FN_generic_vector_array.hh" #include "testing/testing.h" @@ -9,19 +8,19 @@ namespace blender::fn { TEST(generic_vector_array, Constructor) { - GVectorArray vectors{CPPType_int32, 3}; + GVectorArray vectors{CPPType::get(), 3}; EXPECT_EQ(vectors.size(), 3); EXPECT_EQ(vectors.lengths().size(), 3); EXPECT_EQ(vectors.starts().size(), 3); EXPECT_EQ(vectors.lengths()[0], 0); EXPECT_EQ(vectors.lengths()[1], 0); EXPECT_EQ(vectors.lengths()[2], 0); - EXPECT_EQ(vectors.type(), CPPType_int32); + EXPECT_EQ(vectors.type(), CPPType::get()); } TEST(generic_vector_array, Append) { - GVectorArray vectors{CPPType_string, 3}; + GVectorArray vectors{CPPType::get(), 3}; std::string value = "hello"; vectors.append(0, &value); value = "world"; @@ -39,7 +38,7 @@ TEST(generic_vector_array, Append) TEST(generic_vector_array, AsArraySpan) { - GVectorArray vectors{CPPType_int32, 3}; + GVectorArray vectors{CPPType::get(), 3}; int value = 3; vectors.append(0, &value); vectors.append(0, &value); @@ -49,7 +48,7 @@ TEST(generic_vector_array, AsArraySpan) vectors.append(2, &value); GVArraySpan span = vectors; - EXPECT_EQ(span.type(), CPPType_int32); + EXPECT_EQ(span.type(), CPPType::get()); EXPECT_EQ(span.size(), 3); EXPECT_EQ(span[0].size(), 2); EXPECT_EQ(span[1].size(), 0); @@ -60,7 +59,7 @@ TEST(generic_vector_array, AsArraySpan) TEST(generic_vector_array, TypedRef) { - GVectorArray vectors{CPPType_int32, 4}; + GVectorArray vectors{CPPType::get(), 4}; GVectorArrayRef ref = vectors.typed(); ref.append(0, 2); ref.append(0, 6); @@ -84,7 +83,7 @@ TEST(generic_vector_array, TypedRef) TEST(generic_vector_array, Extend) { - GVectorArray vectors{CPPType_int32, 3}; + GVectorArray vectors{CPPType::get(), 3}; GVectorArrayRef ref = vectors; ref.extend(1, {5, 6, 7}); diff --git a/tests/gtests/functions/FN_multi_function_network_test.cc b/tests/gtests/functions/FN_multi_function_network_test.cc index 5507733c8be..35af8300cfa 100644 --- a/tests/gtests/functions/FN_multi_function_network_test.cc +++ b/tests/gtests/functions/FN_multi_function_network_test.cc @@ -2,7 +2,6 @@ #include "testing/testing.h" -#include "FN_cpp_types.hh" #include "FN_multi_function_builder.hh" #include "FN_multi_function_network.hh" #include "FN_multi_function_network_evaluation.hh" @@ -195,7 +194,7 @@ TEST(multi_function_network, Test2) Array input_value_1 = {3, 6}; int input_value_2 = 4; - GVectorArray output_value_1(CPPType_int32, 5); + GVectorArray output_value_1(CPPType::get(), 5); Array output_value_2(5, -1); MFParamsBuilder params(network_fn, 5); @@ -221,14 +220,14 @@ TEST(multi_function_network, Test2) EXPECT_EQ(output_value_2[4], 39); } { - GVectorArray input_value_1(CPPType_int32, 3); + GVectorArray input_value_1(CPPType::get(), 3); GVectorArrayRef input_value_ref_1 = input_value_1; input_value_ref_1.extend(0, {3, 4, 5}); input_value_ref_1.extend(1, {1, 2}); Array input_value_2 = {4, 2, 3}; - GVectorArray output_value_1(CPPType_int32, 3); + GVectorArray output_value_1(CPPType::get(), 3); Array output_value_2(3, -1); MFParamsBuilder params(network_fn, 3); diff --git a/tests/gtests/functions/FN_multi_function_test.cc b/tests/gtests/functions/FN_multi_function_test.cc index 8cc8f91a300..66039e463ed 100644 --- a/tests/gtests/functions/FN_multi_function_test.cc +++ b/tests/gtests/functions/FN_multi_function_test.cc @@ -2,7 +2,6 @@ #include "testing/testing.h" -#include "FN_cpp_types.hh" #include "FN_multi_function.hh" #include "FN_multi_function_builder.hh" @@ -126,7 +125,7 @@ TEST(multi_function, CreateRangeFunction) { CreateRangeFunction fn; - GVectorArray ranges(CPPType_uint32, 5); + GVectorArray ranges(CPPType::get(), 5); GVectorArrayRef ranges_ref(ranges); Array sizes = {3, 0, 6, 1, 4}; @@ -173,9 +172,9 @@ class GenericAppendFunction : public MultiFunction { TEST(multi_function, GenericAppendFunction) { - GenericAppendFunction fn(CPPType_int32); + GenericAppendFunction fn(CPPType::get()); - GVectorArray vectors(CPPType_int32, 4); + GVectorArray vectors(CPPType::get(), 4); GVectorArrayRef vectors_ref(vectors); vectors_ref.append(0, 1); vectors_ref.append(0, 2); @@ -318,7 +317,7 @@ TEST(multi_function, CustomMF_Constant) TEST(multi_function, CustomMF_GenericConstant) { int value = 42; - CustomMF_GenericConstant fn{CPPType_int32, (const void *)&value}; + CustomMF_GenericConstant fn{CPPType::get(), (const void *)&value}; EXPECT_EQ(fn.param_name(0), "42"); Array outputs(4, 0); @@ -342,7 +341,7 @@ TEST(multi_function, CustomMF_GenericConstantArray) CustomMF_GenericConstantArray fn{GSpan(Span(values))}; EXPECT_EQ(fn.param_name(0), "[3, 4, 5, 6, ]"); - GVectorArray g_vector_array{CPPType_int32, 4}; + GVectorArray g_vector_array{CPPType::get(), 4}; GVectorArrayRef vector_array = g_vector_array; MFParamsBuilder params(fn, g_vector_array.size()); diff --git a/tests/gtests/functions/FN_spans_test.cc b/tests/gtests/functions/FN_spans_test.cc index 8968d49c082..3172cdc7170 100644 --- a/tests/gtests/functions/FN_spans_test.cc +++ b/tests/gtests/functions/FN_spans_test.cc @@ -2,14 +2,13 @@ #include "testing/testing.h" -#include "FN_cpp_types.hh" #include "FN_spans.hh" namespace blender::fn { TEST(generic_span, TypeConstructor) { - GSpan span(CPPType_float); + GSpan span(CPPType::get()); EXPECT_EQ(span.size(), 0); EXPECT_EQ(span.typed().size(), 0); EXPECT_TRUE(span.is_empty()); @@ -19,7 +18,7 @@ TEST(generic_span, BufferAndSizeConstructor) { int values[4] = {6, 7, 3, 2}; void *buffer = (void *)values; - GSpan span(CPPType_int32, buffer, 4); + GSpan span(CPPType::get(), buffer, 4); EXPECT_EQ(span.size(), 4); EXPECT_FALSE(span.is_empty()); EXPECT_EQ(span.typed().size(), 4); @@ -31,7 +30,7 @@ TEST(generic_span, BufferAndSizeConstructor) TEST(generic_mutable_span, TypeConstructor) { - GMutableSpan span(CPPType_int32); + GMutableSpan span(CPPType::get()); EXPECT_EQ(span.size(), 0); EXPECT_TRUE(span.is_empty()); } @@ -40,7 +39,7 @@ TEST(generic_mutable_span, BufferAndSizeConstructor) { int values[4] = {4, 7, 3, 5}; void *buffer = (void *)values; - GMutableSpan span(CPPType_int32, buffer, 4); + GMutableSpan span(CPPType::get(), buffer, 4); EXPECT_EQ(span.size(), 4); EXPECT_FALSE(span.is_empty()); EXPECT_EQ(span.typed().size(), 4); @@ -127,7 +126,7 @@ TEST(virtual_span, SingleConstructor) TEST(generic_virtual_span, TypeConstructor) { - GVSpan span(CPPType_int32); + GVSpan span(CPPType::get()); EXPECT_EQ(span.size(), 0); EXPECT_TRUE(span.is_empty()); EXPECT_FALSE(span.is_single_element()); @@ -139,7 +138,7 @@ TEST(generic_virtual_span, TypeConstructor) TEST(generic_virtual_span, GenericSpanConstructor) { int values[4] = {3, 4, 5, 6}; - GVSpan span{GSpan(CPPType_int32, values, 4)}; + GVSpan span{GSpan(CPPType::get(), values, 4)}; EXPECT_EQ(span.size(), 4); EXPECT_FALSE(span.is_empty()); EXPECT_EQ(span[0], &values[0]); @@ -167,7 +166,7 @@ TEST(generic_virtual_span, SpanConstructor) { std::array values = {6, 7, 8}; GVSpan span{Span(values)}; - EXPECT_EQ(span.type(), CPPType_int32); + EXPECT_EQ(span.type(), CPPType::get()); EXPECT_EQ(span.size(), 3); EXPECT_EQ(span[0], &values[0]); EXPECT_EQ(span[1], &values[1]); @@ -190,7 +189,7 @@ TEST(generic_virtual_span, SpanConstructor) TEST(generic_virtual_span, SingleConstructor) { int value = 5; - GVSpan span = GVSpan::FromSingle(CPPType_int32, &value, 3); + GVSpan span = GVSpan::FromSingle(CPPType::get(), &value, 3); EXPECT_EQ(span.size(), 3); EXPECT_FALSE(span.is_empty()); EXPECT_EQ(span[0], &value); -- cgit v1.2.3