Skip to content

Commit

Permalink
Updated DumpDebug
Browse files Browse the repository at this point in the history
  • Loading branch information
@guybrush77
guybrush77 committed Feb 27, 2024
1 parent 430ad3b commit b30384b
Show file tree
Hide file tree
Showing 2 changed files with 58 additions and 33 deletions.
1 change: 0 additions & 1 deletion .clang-format
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
AlignAfterOpenBracket: AlwaysBreak
AlignConsecutiveAssignments: true
AlignConsecutiveMacros: true
AlignConsecutiveAssignments: true
AlignConsecutiveDeclarations: true
AlignEscapedNewlines: DontAlign
AlignTrailingComments: true
Expand Down
90 changes: 58 additions & 32 deletions include/rapidobj/rapidobj.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ rapidobj - Fast Wavefront .obj file loader
Licensed under the MIT License <http://opensource.org/licenses/MIT>
SPDX-License-Identifier: MIT
Copyright (c) 2022 Slobodan Pavlic
Copyright (c) 2024 Slobodan Pavlic
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
Expand Down Expand Up @@ -4434,7 +4434,8 @@ struct SharedContext final {

struct Debug final {
struct IO final {
std::vector<int> n_requests{};
std::vector<int> num_requests{};
std::vector<size_t> num_bytes_read{};
std::vector<std::chrono::nanoseconds> submit_time;
std::vector<std::chrono::nanoseconds> wait_time;
} io;
Expand Down Expand Up @@ -4824,12 +4825,14 @@ struct Reader {
auto NumRequests() const noexcept { return m_num_requests; }
auto SubmitTime() const noexcept { return m_submit_time; }
auto WaitTime() const noexcept { return m_wait_time; }
auto BytesRead() const noexcept { return m_bytes_read; }
auto Error() const noexcept { return m_error; }

protected:
int m_num_requests{};
std::chrono::nanoseconds m_submit_time{};
std::chrono::nanoseconds m_wait_time{};
size_t m_bytes_read{};
std::error_code m_error{};
};

Expand Down Expand Up @@ -4916,13 +4919,21 @@ struct FileReader : Reader {
auto t1 = std::chrono::steady_clock::now();

auto result = pread64(m_fd, m_buffer, m_size, m_offset);
auto error = result >= 0 ? std::error_code() : std::error_code(errno, std::system_category());

auto t2 = std::chrono::steady_clock::now();

m_wait_time += t2 - t1;

return error ? ReadResult{ 0, error } : ReadResult{ static_cast<size_t>(result), error };
if (result < 0) {
auto error = std::error_code(errno, std::system_category());
return ReadResult{ 0, error };
}

auto bytes_read = static_cast<size_t>(result);

m_bytes_read += bytes_read;

return ReadResult{ bytes_read, std::error_code() };
}

private:
Expand Down Expand Up @@ -5053,21 +5064,22 @@ struct FileReader : Reader {
auto t1 = std::chrono::steady_clock::now();

auto bytes_read = DWORD{};
auto error = std::error_code();
bool success = GetOverlappedResult(m_handle, &m_overlapped, &bytes_read, TRUE);

auto t2 = std::chrono::steady_clock::now();

m_wait_time += t2 - t1;

if (!success) {
if (auto ec = GetLastError(); ec != ERROR_HANDLE_EOF) {
bytes_read = 0;
error = std::error_code(ec, std::system_category());
auto error = std::error_code(ec, std::system_category());
return ReadResult{ 0, error };
}
}

auto t2 = std::chrono::steady_clock::now();

m_wait_time += t2 - t1;
m_bytes_read += bytes_read;

return { bytes_read, error };
return { bytes_read, std::error_code() };
}

private:
Expand Down Expand Up @@ -5170,19 +5182,22 @@ struct FileReader : Reader {
{
auto t1 = std::chrono::steady_clock::now();

auto n_bytes_read = pread(m_fd, m_buffer, m_size, m_offset);
auto error = std::error_code();

if (n_bytes_read == -1) {
n_bytes_read = 0;
error = std::error_code(errno, std::system_category());
}
auto result = pread(m_fd, m_buffer, m_size, m_offset);

auto t2 = std::chrono::steady_clock::now();

m_wait_time += t2 - t1;

return { static_cast<size_t>(n_bytes_read), error };
if (result < 0) {
auto error = std::error_code(errno, std::system_category());
return ReadResult{ 0, error };
}

auto bytes_read = static_cast<size_t>(result);

m_bytes_read += bytes_read;

return ReadResult{ bytes_read, std::error_code() };
}

private:
Expand Down Expand Up @@ -5236,6 +5251,8 @@ struct StreamReader : Reader {

m_wait_time += t2 - t1;

m_bytes_read += result.bytes_read;

return result;
}

Expand Down Expand Up @@ -5361,14 +5378,16 @@ inline std::string ComputeDebugStats(const std::vector<std::chrono::nanoseconds>
return text;
}

inline std::string DumpDebug(const sys::File& file, const SharedContext& context)
inline std::string DumpDebug(const SharedContext& context)
{
auto text = std::string();

auto population = std::vector<std::chrono::nanoseconds>(context.debug.io.n_requests.size());
auto population = std::vector<std::chrono::nanoseconds>(context.debug.io.num_requests.size());

for (size_t i = 0; i != context.debug.io.n_requests.size(); ++i) {
auto n = context.debug.io.n_requests[i];
auto num_bytes_read = size_t{};

for (size_t i = 0; i != context.debug.io.num_requests.size(); ++i) {
auto n = context.debug.io.num_requests[i];
auto submit_ns = context.debug.io.submit_time[i];
auto wait_ns = context.debug.io.wait_time[i];
auto total_ns = submit_ns.count() + wait_ns.count();
Expand All @@ -5382,6 +5401,8 @@ inline std::string DumpDebug(const sys::File& file, const SharedContext& context

population[i] = std::chrono::nanoseconds{ total_ns };

num_bytes_read += context.debug.io.num_bytes_read[i];

text.append(thread);
text.append(": blk").append(requests);
text.append(" read").append(submit);
Expand All @@ -5395,7 +5416,7 @@ inline std::string DumpDebug(const sys::File& file, const SharedContext& context
text.append(ComputeDebugStats(population));
text.push_back('\n');

for (size_t i = 0; i != context.debug.io.n_requests.size(); ++i) {
for (size_t i = 0; i != context.debug.io.num_requests.size(); ++i) {
auto parse_ns = context.debug.parse.time[i];
auto io_ns = context.debug.io.submit_time[i] + context.debug.io.wait_time[i];
auto io_percentage = static_cast<int>(0.5f + 100.0f * io_ns.count() / parse_ns.count());
Expand All @@ -5417,7 +5438,7 @@ inline std::string DumpDebug(const sys::File& file, const SharedContext& context
auto total = parse_total + merge_total;
auto parse_percentage = static_cast<int>(0.5f + 100.0f * parse_total.count() / total.count());
auto merge_percentage = 100 - parse_percentage;
auto bytes_per_second = file.size() / (parse_total.count() / 1000'000'000.0);
auto bytes_per_second = num_bytes_read / (parse_total.count() / 1000'000'000.0);

text.append("Parse Time: ");
text.append(ToString(parse_total, 10));
Expand Down Expand Up @@ -6153,7 +6174,8 @@ inline void DispatchMergeTasks(const MergeTasks& tasks, std::shared_ptr<SharedCo

const auto& merge_task = tasks[fetched_index];

if (auto rc = std::visit([](const auto& task) { return task.Execute(); }, merge_task); rc != rapidobj_errc::Success) {
if (auto rc = std::visit([](const auto& task) { return task.Execute(); }, merge_task);
rc != rapidobj_errc::Success) {
std::lock_guard lock(context->merging.mutex);
if (context->merging.error == rapidobj_errc::Success) {
context->merging.error = rc;
Expand Down Expand Up @@ -7027,7 +7049,8 @@ inline void ProcessBlocks(

auto parse_time = t2 - t1;

context->debug.io.n_requests[thread_index] = reader->NumRequests();
context->debug.io.num_requests[thread_index] = reader->NumRequests();
context->debug.io.num_bytes_read[thread_index] = reader->BytesRead();
context->debug.io.submit_time[thread_index] = reader->SubmitTime();
context->debug.io.wait_time[thread_index] = reader->WaitTime();
context->debug.parse.time[thread_index] = parse_time;
Expand All @@ -7040,7 +7063,8 @@ inline void ParseFileSequential(sys::File* file, std::vector<Chunk>* chunks, std

chunks->resize(1);

context->debug.io.n_requests.resize(1);
context->debug.io.num_requests.resize(1);
context->debug.io.num_bytes_read.resize(1);
context->debug.io.submit_time.resize(1);
context->debug.io.wait_time.resize(1);
context->debug.parse.time.resize(1);
Expand Down Expand Up @@ -7088,7 +7112,8 @@ inline void ParseFileParallel(sys::File* file, std::vector<Chunk>* chunks, std::
context->thread.concurrency = num_threads;
context->parsing.thread_count = num_tasks;

context->debug.io.n_requests.resize(num_threads);
context->debug.io.num_requests.resize(num_threads);
context->debug.io.num_bytes_read.resize(num_threads);
context->debug.io.submit_time.resize(num_threads);
context->debug.io.wait_time.resize(num_threads);
context->debug.parse.time.resize(num_threads);
Expand Down Expand Up @@ -7179,7 +7204,7 @@ inline Result ParseFile(const std::filesystem::path& filepath, const MaterialLib

context->debug.merge.total_time = t2 - t1;

// std::cout << DumpDebug(file, *context);
// std::cout << DumpDebug(*context);

auto memory = size_t{ 0 };

Expand Down Expand Up @@ -7231,7 +7256,8 @@ inline Result ParseStream(std::istream& is, const MaterialLibrary& material_libr
context->thread.concurrency = 1;
context->parsing.thread_count = 1;

context->debug.io.n_requests.resize(1);
context->debug.io.num_requests.resize(1);
context->debug.io.num_bytes_read.resize(1);
context->debug.io.submit_time.resize(1);
context->debug.io.wait_time.resize(1);
context->debug.parse.time.resize(1);
Expand All @@ -7256,7 +7282,7 @@ inline Result ParseStream(std::istream& is, const MaterialLibrary& material_libr

context->debug.merge.total_time = t2 - t1;

// std::cout << DumpDebug(file, *context);
// std::cout << DumpDebug(*context);

// Free memory in a different thread
if (SizeInBytes(chunks.front()) > kMemoryRecyclingSize) {
Expand Down

0 comments on commit b30384b

Please sign in to comment.