SCRIPT: wpiformat

This commit is contained in:
PJ Reiniger
2025-11-07 20:01:58 -05:00
committed by Peter Johnson
parent ae6bdc9d25
commit 2109161534
749 changed files with 5504 additions and 3936 deletions

View File

@@ -509,7 +509,8 @@ void DataLog::AppendFloatArray(int entry, std::span<const float> arr,
while ((arr.size() * 4) > kBlockSize) {
buf = Reserve(kBlockSize);
for (auto val : arr.subspan(0, kBlockSize / 4)) {
wpi::util::support::endian::write32le(buf, std::bit_cast<uint32_t>(val));
wpi::util::support::endian::write32le(buf,
std::bit_cast<uint32_t>(val));
buf += 4;
}
arr = arr.subspan(kBlockSize / 4);
@@ -541,7 +542,8 @@ void DataLog::AppendDoubleArray(int entry, std::span<const double> arr,
while ((arr.size() * 8) > kBlockSize) {
buf = Reserve(kBlockSize);
for (auto val : arr.subspan(0, kBlockSize / 8)) {
wpi::util::support::endian::write64le(buf, std::bit_cast<uint64_t>(val));
wpi::util::support::endian::write64le(buf,
std::bit_cast<uint64_t>(val));
buf += 8;
}
arr = arr.subspan(kBlockSize / 8);

View File

@@ -469,8 +469,8 @@ struct WPI_DataLog* WPI_DataLog_CreateBackgroundWriter(
const struct WPI_String* dir, const struct WPI_String* filename,
double period, const struct WPI_String* extraHeader) {
return reinterpret_cast<WPI_DataLog*>(new DataLogBackgroundWriter{
wpi::util::to_string_view(dir), wpi::util::to_string_view(filename), period,
wpi::util::to_string_view(extraHeader)});
wpi::util::to_string_view(dir), wpi::util::to_string_view(filename),
period, wpi::util::to_string_view(extraHeader)});
}
struct WPI_DataLog* WPI_DataLog_CreateBackgroundWriter_Func(

View File

@@ -97,7 +97,8 @@ bool DataLogRecord::GetFloat(float* value) const {
if (m_data.size() != 4) {
return false;
}
*value = std::bit_cast<float>(wpi::util::support::endian::read32le(m_data.data()));
*value =
std::bit_cast<float>(wpi::util::support::endian::read32le(m_data.data()));
return true;
}
@@ -105,7 +106,8 @@ bool DataLogRecord::GetDouble(double* value) const {
if (m_data.size() != 8) {
return false;
}
*value = std::bit_cast<double>(wpi::util::support::endian::read64le(m_data.data()));
*value = std::bit_cast<double>(
wpi::util::support::endian::read64le(m_data.data()));
return true;
}
@@ -142,8 +144,8 @@ bool DataLogRecord::GetFloatArray(std::vector<float>* arr) const {
}
arr->reserve(m_data.size() / 4);
for (size_t pos = 0; pos < m_data.size(); pos += 4) {
arr->push_back(
std::bit_cast<float>(wpi::util::support::endian::read32le(&m_data[pos])));
arr->push_back(std::bit_cast<float>(
wpi::util::support::endian::read32le(&m_data[pos])));
}
return true;
}
@@ -155,8 +157,8 @@ bool DataLogRecord::GetDoubleArray(std::vector<double>* arr) const {
}
arr->reserve(m_data.size() / 8);
for (size_t pos = 0; pos < m_data.size(); pos += 8) {
arr->push_back(
std::bit_cast<double>(wpi::util::support::endian::read64le(&m_data[pos])));
arr->push_back(std::bit_cast<double>(
wpi::util::support::endian::read64le(&m_data[pos])));
}
return true;
}

View File

@@ -107,9 +107,10 @@ void DataLogReaderThread::ReadMain() {
auto desc = m_structDb.Add(*typeStr, schema, &err);
if (!desc) {
wpi::util::print("could not decode struct '{}' schema '{}': {}\n", name,
schema, err);
schema, err);
}
} else if (auto filename = wpi::util::remove_prefix(name, "/.schema/proto:")) {
} else if (auto filename =
wpi::util::remove_prefix(name, "/.schema/proto:")) {
// protobuf descriptor handling
upb_Status status;
status.ok = true;
@@ -120,7 +121,7 @@ void DataLogReaderThread::ReadMain() {
&status);
if (!status.ok) {
wpi::util::print("could not decode protobuf '{}' filename '{}'\n", name,
*filename);
*filename);
}
}
}

View File

@@ -12,8 +12,8 @@
using namespace wpi::log;
static std::unique_ptr<wpi::util::raw_ostream> CheckOpen(std::string_view filename,
std::error_code& ec) {
static std::unique_ptr<wpi::util::raw_ostream> CheckOpen(
std::string_view filename, std::error_code& ec) {
auto rv = std::make_unique<wpi::util::raw_fd_ostream>(filename, ec);
if (ec) {
return nullptr;
@@ -25,8 +25,9 @@ DataLogWriter::DataLogWriter(std::string_view filename, std::error_code& ec,
std::string_view extraHeader)
: DataLogWriter{s_defaultMessageLog, filename, ec, extraHeader} {}
DataLogWriter::DataLogWriter(wpi::util::Logger& msglog, std::string_view filename,
std::error_code& ec, std::string_view extraHeader)
DataLogWriter::DataLogWriter(wpi::util::Logger& msglog,
std::string_view filename, std::error_code& ec,
std::string_view extraHeader)
: DataLogWriter{msglog, CheckOpen(filename, ec), extraHeader} {
if (ec) {
Stop();
@@ -79,8 +80,9 @@ struct WPI_DataLog* WPI_DataLog_CreateWriter(
const struct WPI_String* filename, int* errorCode,
const struct WPI_String* extraHeader) {
std::error_code ec;
auto rv = reinterpret_cast<WPI_DataLog*>(new DataLogWriter{
wpi::util::to_string_view(filename), ec, wpi::util::to_string_view(extraHeader)});
auto rv = reinterpret_cast<WPI_DataLog*>(
new DataLogWriter{wpi::util::to_string_view(filename), ec,
wpi::util::to_string_view(extraHeader)});
*errorCode = ec.value();
return rv;
}

View File

@@ -87,8 +87,8 @@ FileLogger::~FileLogger() {
std::function<void(std::string_view)> FileLogger::Buffer(
std::function<void(std::string_view)> callback) {
return [callback,
buf = wpi::util::SmallVector<char, 64>{}](std::string_view data) mutable {
return [callback, buf = wpi::util::SmallVector<char, 64>{}](
std::string_view data) mutable {
buf.append(data.begin(), data.end());
if (!wpi::util::contains({data.data(), data.size()}, "\n")) {
return;

View File

@@ -31,7 +31,7 @@
namespace wpi::util {
class Logger;
} // namespace wpi
} // namespace wpi::util
namespace wpi::log {
@@ -159,7 +159,8 @@ class DataLog {
* @param timestamp Time stamp (0 to indicate now)
*/
template <wpi::util::ProtobufSerializable T>
void AddProtobufSchema(wpi::util::ProtobufMessage<T>& msg, int64_t timestamp = 0) {
void AddProtobufSchema(wpi::util::ProtobufMessage<T>& msg,
int64_t timestamp = 0) {
if (timestamp == 0) {
timestamp = wpi::util::Now();
}
@@ -1313,8 +1314,8 @@ class StructLogEntry : public DataLogEntry {
: m_info{std::move(info)...} {
m_log = &log;
log.AddStructSchema<T, I...>(info..., timestamp);
m_entry =
log.Start(name, wpi::util::GetStructTypeString<T>(info...), metadata, timestamp);
m_entry = log.Start(name, wpi::util::GetStructTypeString<T>(info...),
metadata, timestamp);
}
StructLogEntry(StructLogEntry&& rhs)
@@ -1443,7 +1444,8 @@ class StructArrayLogEntry : public DataLogEntry {
m_log = &log;
log.AddStructSchema<T, I...>(info..., timestamp);
m_entry = log.Start(
name, wpi::util::MakeStructArrayTypeString<T, std::dynamic_extent>(info...),
name,
wpi::util::MakeStructArrayTypeString<T, std::dynamic_extent>(info...),
metadata, timestamp);
}

View File

@@ -18,7 +18,7 @@
namespace wpi::util {
class Logger;
} // namespace wpi
} // namespace wpi::util
namespace wpi::log {

View File

@@ -85,7 +85,9 @@ class DataLogReaderThread {
return it->second;
}
wpi::util::StructDescriptorDatabase& GetStructDatabase() { return m_structDb; }
wpi::util::StructDescriptorDatabase& GetStructDatabase() {
return m_structDb;
}
upb_DefPool* GetProtobufDatabase() { return m_protoPool; }
upb_Arena* GetProtobufArena() { return m_arena; }

View File

@@ -13,7 +13,7 @@
namespace wpi::util {
class raw_ostream;
class Logger;
} // namespace wpi
} // namespace wpi::util
namespace wpi::log {
@@ -62,7 +62,8 @@ class DataLogWriter final : public DataLog {
* @param os output stream
* @param extraHeader extra header data
*/
DataLogWriter(wpi::util::Logger& msglog, std::unique_ptr<wpi::util::raw_ostream> os,
DataLogWriter(wpi::util::Logger& msglog,
std::unique_ptr<wpi::util::raw_ostream> os,
std::string_view extraHeader = "");
~DataLogWriter() final;