Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-20 00:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ntcore] Compute Value memory size when creating value (#5657)

Browse Source 
This avoids a later switch-based computation in NetworkLoopQueue.
This commit is contained in:
Peter Johnson
2023-09-17 20:01:57 -07:00
committed by GitHub
parent 5383589f99
commit e93c233d60
3 changed files with 53 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
ntcore/src/main/native/cpp/Value.cpp
View File

@@ -4,7 +4,9 @@
#include <stdint.h>
#include <algorithm>
#include <cstring>
#include <numeric>
#include <span>
#include <wpi/MemAlloc.h>
@@ -27,6 +29,15 @@ struct StringArrayStorage {
InitNtStrings();
}
void InitNtStrings();
size_t EstimateSize() const {
return sizeof(StringArrayStorage) +
strings.capacity() * sizeof(std::string) +
ntStrings.capacity() * sizeof(NT_String) +
std::accumulate(strings.begin(), strings.end(), 0,
[](const auto& sum, const auto& val) {
return sum + val.capacity();
});
}
std::vector<std::string> strings;
std::vector<NT_String> ntStrings;
@@ -59,12 +70,13 @@ Value::Value() {
m_val.type = NT_UNASSIGNED;
m_val.last_change = 0;
m_val.server_time = 0;
m_size = 0;
}
Value::Value(NT_Type type, int64_t time, const private_init&)
: Value{type, time == 0 ? nt::Now() : time, 1, private_init{}} {}
Value::Value(NT_Type type, size_t size, int64_t time, const private_init&)
: Value{type, size, time == 0 ? nt::Now() : time, 1, private_init{}} {}
Value::Value(NT_Type type, int64_t time, int64_t serverTime,
Value::Value(NT_Type type, size_t size, int64_t time, int64_t serverTime,
const private_init&) {
m_val.type = type;
m_val.last_change = time;
@@ -80,10 +92,11 @@ Value::Value(NT_Type type, int64_t time, int64_t serverTime,
} else if (m_val.type == NT_STRING_ARRAY) {
m_val.data.arr_string.arr = nullptr;
}
m_size = size;
}
Value Value::MakeBooleanArray(std::span<const bool> value, int64_t time) {
Value val{NT_BOOLEAN_ARRAY, time, private_init{}};
Value val{NT_BOOLEAN_ARRAY, value.size() * sizeof(int), time, private_init{}};
auto data = AllocateArray<int>(value.size());
std::copy(value.begin(), value.end(), data.get());
val.m_val.data.arr_boolean.arr = data.get();
@@ -93,7 +106,7 @@ Value Value::MakeBooleanArray(std::span<const bool> value, int64_t time) {
}
Value Value::MakeBooleanArray(std::span<const int> value, int64_t time) {
Value val{NT_BOOLEAN_ARRAY, time, private_init{}};
Value val{NT_BOOLEAN_ARRAY, value.size() * sizeof(int), time, private_init{}};
auto data = AllocateArray<int>(value.size());
std::copy(value.begin(), value.end(), data.get());
val.m_val.data.arr_boolean.arr = data.get();
@@ -103,7 +116,7 @@ Value Value::MakeBooleanArray(std::span<const int> value, int64_t time) {
}
Value Value::MakeBooleanArray(std::vector<int>&& value, int64_t time) {
Value val{NT_BOOLEAN_ARRAY, time, private_init{}};
Value val{NT_BOOLEAN_ARRAY, value.size() * sizeof(int), time, private_init{}};
auto data = std::make_shared<std::vector<int>>(std::move(value));
val.m_val.data.arr_boolean.arr = data->data();
val.m_val.data.arr_boolean.size = data->size();
@@ -112,7 +125,8 @@ Value Value::MakeBooleanArray(std::vector<int>&& value, int64_t time) {
}
Value Value::MakeIntegerArray(std::span<const int64_t> value, int64_t time) {
Value val{NT_INTEGER_ARRAY, time, private_init{}};
Value val{NT_INTEGER_ARRAY, value.size() * sizeof(int64_t), time,
private_init{}};
auto data = AllocateArray<int64_t>(value.size());
std::copy(value.begin(), value.end(), data.get());
val.m_val.data.arr_int.arr = data.get();
@@ -122,7 +136,8 @@ Value Value::MakeIntegerArray(std::span<const int64_t> value, int64_t time) {
}
Value Value::MakeIntegerArray(std::vector<int64_t>&& value, int64_t time) {
Value val{NT_INTEGER_ARRAY, time, private_init{}};
Value val{NT_INTEGER_ARRAY, value.size() * sizeof(int64_t), time,
private_init{}};
auto data = std::make_shared<std::vector<int64_t>>(std::move(value));
val.m_val.data.arr_int.arr = data->data();
val.m_val.data.arr_int.size = data->size();
@@ -131,7 +146,7 @@ Value Value::MakeIntegerArray(std::vector<int64_t>&& value, int64_t time) {
}
Value Value::MakeFloatArray(std::span<const float> value, int64_t time) {
Value val{NT_FLOAT_ARRAY, time, private_init{}};
Value val{NT_FLOAT_ARRAY, value.size() * sizeof(float), time, private_init{}};
auto data = AllocateArray<float>(value.size());
std::copy(value.begin(), value.end(), data.get());
val.m_val.data.arr_float.arr = data.get();
@@ -141,7 +156,7 @@ Value Value::MakeFloatArray(std::span<const float> value, int64_t time) {
}
Value Value::MakeFloatArray(std::vector<float>&& value, int64_t time) {
Value val{NT_FLOAT_ARRAY, time, private_init{}};
Value val{NT_FLOAT_ARRAY, value.size() * sizeof(float), time, private_init{}};
auto data = std::make_shared<std::vector<float>>(std::move(value));
val.m_val.data.arr_float.arr = data->data();
val.m_val.data.arr_float.size = data->size();
@@ -150,7 +165,8 @@ Value Value::MakeFloatArray(std::vector<float>&& value, int64_t time) {
}
Value Value::MakeDoubleArray(std::span<const double> value, int64_t time) {
Value val{NT_DOUBLE_ARRAY, time, private_init{}};
Value val{NT_DOUBLE_ARRAY, value.size() * sizeof(double), time,
private_init{}};
auto data = AllocateArray<double>(value.size());
std::copy(value.begin(), value.end(), data.get());
val.m_val.data.arr_double.arr = data.get();
@@ -160,7 +176,8 @@ Value Value::MakeDoubleArray(std::span<const double> value, int64_t time) {
}
Value Value::MakeDoubleArray(std::vector<double>&& value, int64_t time) {
Value val{NT_DOUBLE_ARRAY, time, private_init{}};
Value val{NT_DOUBLE_ARRAY, value.size() * sizeof(double), time,
private_init{}};
auto data = std::make_shared<std::vector<double>>(std::move(value));
val.m_val.data.arr_double.arr = data->data();
val.m_val.data.arr_double.size = data->size();
@@ -169,8 +186,8 @@ Value Value::MakeDoubleArray(std::vector<double>&& value, int64_t time) {
}
Value Value::MakeStringArray(std::span<const std::string> value, int64_t time) {
Value val{NT_STRING_ARRAY, time, private_init{}};
auto data = std::make_shared<StringArrayStorage>(value);
Value val{NT_STRING_ARRAY, data->EstimateSize(), time, private_init{}};
val.m_val.data.arr_string.arr = data->ntStrings.data();
val.m_val.data.arr_string.size = data->ntStrings.size();
val.m_storage = std::move(data);
@@ -178,8 +195,8 @@ Value Value::MakeStringArray(std::span<const std::string> value, int64_t time) {
}
Value Value::MakeStringArray(std::vector<std::string>&& value, int64_t time) {
Value val{NT_STRING_ARRAY, time, private_init{}};
auto data = std::make_shared<StringArrayStorage>(std::move(value));
Value val{NT_STRING_ARRAY, data->EstimateSize(), time, private_init{}};
val.m_val.data.arr_string.arr = data->ntStrings.data();
val.m_val.data.arr_string.size = data->ntStrings.size();
val.m_storage = std::move(data);