Skip to content

DPL: Adds Variant JSON helpers #5293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ktf merged 1 commit into from
Jan 26, 2021
Merged

DPL: Adds Variant JSON helpers #5293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions Framework/Core/include/Framework/Array2D.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,13 @@ template <typename T>
struct Array2D {
using element_t = T;

Array2D()
: data{nullptr},
rows{0},
cols{0}
{
}

Array2D(T const* data_, uint32_t r, uint32_t c)
: rows{r}, cols{c}
{
Expand Down Expand Up @@ -103,9 +110,9 @@ struct Array2D {
return data + y * cols;
}

T* data = nullptr;
uint32_t rows = 0;
uint32_t cols = 0;
T* data;
uint32_t rows;
uint32_t cols;
};
} // namespace o2::framework

Expand Down
6 changes: 3 additions & 3 deletions Framework/Core/include/Framework/ConfigParamsHelper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,9 @@ struct ConfigParamsHelper {
V == VariantType::ArrayDouble ||
V == VariantType::ArrayBool ||
V == VariantType::ArrayString ||
V == VariantType::MatrixInt ||
V == VariantType::MatrixFloat ||
V == VariantType::MatrixDouble) {
V == VariantType::Array2DInt ||
V == VariantType::Array2DFloat ||
V == VariantType::Array2DDouble) {
auto value = boost::program_options::value<std::string>();
value = value->default_value(spec.defaultValue.asString());
if constexpr (V != VariantType::String) {
Expand Down
114 changes: 90 additions & 24 deletions Framework/Core/include/Framework/Variant.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,24 @@ enum class VariantType : int { Int = 0,
ArrayDouble,
ArrayBool,
ArrayString,
MatrixInt,
MatrixFloat,
MatrixDouble,
Array2DInt,
Array2DFloat,
Array2DDouble,
Empty,
Unknown };

template <VariantType V>
constexpr auto isArray()
{
return (V == VariantType::ArrayBool || V == VariantType::ArrayDouble || V == VariantType::ArrayFloat || V == VariantType::ArrayInt || V == VariantType::ArrayString);
}

template <VariantType V>
constexpr auto isArray2D()
{
return (V == VariantType::Array2DInt || V == VariantType::Array2DFloat || V == VariantType::Array2DDouble);
}

template <typename T>
struct variant_trait : std::integral_constant<VariantType, VariantType::Unknown> {
};
Expand Down Expand Up @@ -77,9 +89,9 @@ DECLARE_VARIANT_TRAIT(std::vector<double>, ArrayDouble);
DECLARE_VARIANT_TRAIT(std::vector<bool>, ArrayBool);
DECLARE_VARIANT_TRAIT(std::vector<std::string>, ArrayString);

DECLARE_VARIANT_TRAIT(Array2D<int>, MatrixInt);
DECLARE_VARIANT_TRAIT(Array2D<float>, MatrixFloat);
DECLARE_VARIANT_TRAIT(Array2D<double>, MatrixDouble);
DECLARE_VARIANT_TRAIT(Array2D<int>, Array2DInt);
DECLARE_VARIANT_TRAIT(Array2D<float>, Array2DFloat);
DECLARE_VARIANT_TRAIT(Array2D<double>, Array2DDouble);

template <typename T>
struct variant_array_symbol {
Expand Down Expand Up @@ -137,13 +149,36 @@ DECLARE_VARIANT_TYPE(double*, ArrayDouble);
DECLARE_VARIANT_TYPE(bool*, ArrayBool);
DECLARE_VARIANT_TYPE(std::string*, ArrayString);

DECLARE_VARIANT_TYPE(Array2D<int>, MatrixInt);
DECLARE_VARIANT_TYPE(Array2D<float>, MatrixFloat);
DECLARE_VARIANT_TYPE(Array2D<double>, MatrixDouble);
DECLARE_VARIANT_TYPE(Array2D<int>, Array2DInt);
DECLARE_VARIANT_TYPE(Array2D<float>, Array2DFloat);
DECLARE_VARIANT_TYPE(Array2D<double>, Array2DDouble);

template <VariantType type>
struct variant_array_element_type {
};

#define DECLARE_VARIANT_ARRAY_ELEMENT_TYPE(_Type1_, _Type2_) \
template <> \
struct variant_array_element_type<VariantType::_Type2_> { \
using type = _Type1_; \
};

DECLARE_VARIANT_ARRAY_ELEMENT_TYPE(int, ArrayInt);
DECLARE_VARIANT_ARRAY_ELEMENT_TYPE(int, Array2DInt);
DECLARE_VARIANT_ARRAY_ELEMENT_TYPE(float, ArrayFloat);
DECLARE_VARIANT_ARRAY_ELEMENT_TYPE(float, Array2DFloat);
DECLARE_VARIANT_ARRAY_ELEMENT_TYPE(double, ArrayDouble);
DECLARE_VARIANT_ARRAY_ELEMENT_TYPE(double, Array2DDouble);
DECLARE_VARIANT_ARRAY_ELEMENT_TYPE(bool, ArrayBool);
DECLARE_VARIANT_ARRAY_ELEMENT_TYPE(std::string, ArrayString);

template <typename S, typename T>
struct variant_helper {
static void set(S* store, T value) { *(reinterpret_cast<T*>(store)) = value; }
static void set(S* store, T value)
{
new (reinterpret_cast<T*>(store)) T{};
*(reinterpret_cast<T*>(store)) = value;
}
static void set(S* store, T values, size_t size)
{
*reinterpret_cast<T*>(store) = reinterpret_cast<T>(std::memcpy(std::malloc(size * sizeof(std::remove_pointer_t<T>)), reinterpret_cast<void*>(values), size * sizeof(std::remove_pointer_t<T>)));
Expand Down Expand Up @@ -293,36 +328,67 @@ class Variant
}
}

void operator=(const Variant& other)
Variant& operator=(const Variant& other)
{
mSize = other.mSize;
mType = other.mType;
switch (mType) {
case variant_trait_v<const char*>:
mSize = other.mSize;
variant_helper<storage_t, const char*>::set(&mStore, other.get<const char*>());
return;
return *this;
case variant_trait_v<int*>:
mSize = other.mSize;
variant_helper<storage_t, int*>::set(&mStore, other.get<int*>(), mSize);
return;
return *this;
case variant_trait_v<float*>:
mSize = other.mSize;
variant_helper<storage_t, float*>::set(&mStore, other.get<float*>(), mSize);
return;
return *this;
case variant_trait_v<double*>:
mSize = other.mSize;
variant_helper<storage_t, double*>::set(&mStore, other.get<double*>(), mSize);
return;
return *this;
case variant_trait_v<bool*>:
mSize = other.mSize;
variant_helper<storage_t, bool*>::set(&mStore, other.get<bool*>(), mSize);
return;
return *this;
case variant_trait_v<std::string*>:
mSize = other.mSize;
variant_helper<storage_t, std::string*>::set(&mStore, other.get<std::string*>(), mSize);
return;
return *this;
default:
mStore = other.mStore;
mSize = other.mSize;
return *this;
}
}

Variant& operator=(Variant&& other)
{
mSize = other.mSize;
mType = other.mType;
switch (mType) {
case variant_trait_v<const char*>:
variant_helper<storage_t, const char*>::set(&mStore, other.get<const char*>());
*reinterpret_cast<char**>(&(other.mStore)) = nullptr;
return *this;
case variant_trait_v<int*>:
variant_helper<storage_t, int*>::set(&mStore, other.get<int*>(), mSize);
*reinterpret_cast<int**>(&(other.mStore)) = nullptr;
return *this;
case variant_trait_v<float*>:
variant_helper<storage_t, float*>::set(&mStore, other.get<float*>(), mSize);
*reinterpret_cast<float**>(&(other.mStore)) = nullptr;
return *this;
case variant_trait_v<double*>:
variant_helper<storage_t, double*>::set(&mStore, other.get<double*>(), mSize);
*reinterpret_cast<double**>(&(other.mStore)) = nullptr;
return *this;
case variant_trait_v<bool*>:
variant_helper<storage_t, bool*>::set(&mStore, other.get<bool*>(), mSize);
*reinterpret_cast<bool**>(&(other.mStore)) = nullptr;
return *this;
case variant_trait_v<std::string*>:
variant_helper<storage_t, std::string*>::set(&mStore, other.get<std::string*>(), mSize);
*reinterpret_cast<std::string**>(&(other.mStore)) = nullptr;
return *this;
default:
mStore = other.mStore;
return *this;
}
}

Expand Down
Loading