birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6376 from nemerle/compiletime_filerequest_code2

Browse Source 
Compile time reduction - FileRequest & related changes
This commit is contained in:
Chris Galvan
2022-01-24 11:43:27 -06:00
committed by GitHub
parent 3fd7e79891 2e19b703ef
commit 71640c1c82
90 changed files with 913 additions and 641 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzCore/Tests/Asset/AssetDataStreamTests.cpp
+1
View File
@@ -6,6 +6,7 @@
*
*/
#include <AzCore/Asset/AssetDataStream.h>
#include <AzCore/IO/Streamer/FileRequest.h>
#include <AzCore/UnitTest/TestTypes.h>
#include <AZTestShared/Utils/Utils.h>
#include <Tests/Streamer/IStreamerMock.h>
Code/Framework/AzCore/Tests/Platform/Windows/Tests/IO/Streamer/StorageDriveTests_Windows.cpp
+13 -13
View File
@@ -406,7 +406,7 @@ namespace AZ::IO
request->CreateFileMetaDataRetrieval(path);
request->SetCompletionCallback([](const FileRequest& request)
{
auto& fileMetaData = AZStd::get<FileRequest::FileMetaDataRetrievalData>(request.GetCommand());
auto& fileMetaData = AZStd::get<Requests::FileMetaDataRetrievalData>(request.GetCommand());
EXPECT_FALSE(fileMetaData.m_found);
EXPECT_EQ(0, fileMetaData.m_fileSize);
});
@@ -424,7 +424,7 @@ namespace AZ::IO
request->SetCompletionCallback([](const FileRequest& request)
{
auto& fileMetaData = AZStd::get<FileRequest::FileMetaDataRetrievalData>(request.GetCommand());
auto& fileMetaData = AZStd::get<Requests::FileMetaDataRetrievalData>(request.GetCommand());
EXPECT_TRUE(fileMetaData.m_found);
EXPECT_EQ(4_kib, fileMetaData.m_fileSize);
});
@@ -442,7 +442,7 @@ namespace AZ::IO
request->CreateFileMetaDataRetrieval(path);
request->SetCompletionCallback([](const FileRequest& request)
{
auto& fileMetaData = AZStd::get<FileRequest::FileMetaDataRetrievalData>(request.GetCommand());
auto& fileMetaData = AZStd::get<Requests::FileMetaDataRetrievalData>(request.GetCommand());
EXPECT_FALSE(fileMetaData.m_found);
EXPECT_EQ(0, fileMetaData.m_fileSize);
});
@@ -460,7 +460,7 @@ namespace AZ::IO
request->SetCompletionCallback([](const FileRequest& request)
{
auto& fileMetaData = AZStd::get<FileRequest::FileMetaDataRetrievalData>(request.GetCommand());
auto& fileMetaData = AZStd::get<Requests::FileMetaDataRetrievalData>(request.GetCommand());
EXPECT_TRUE(fileMetaData.m_found);
EXPECT_EQ(16_kib, fileMetaData.m_fileSize);
});
@@ -484,7 +484,7 @@ namespace AZ::IO
request->SetCompletionCallback([](const FileRequest& request)
{
auto& fileMetaData = AZStd::get<FileRequest::FileMetaDataRetrievalData>(request.GetCommand());
auto& fileMetaData = AZStd::get<Requests::FileMetaDataRetrievalData>(request.GetCommand());
EXPECT_TRUE(fileMetaData.m_found);
EXPECT_EQ(4_kib, fileMetaData.m_fileSize);
});
@@ -502,7 +502,7 @@ namespace AZ::IO
request->CreateFileExistsCheck(invalidPath);
request->SetCompletionCallback([](const FileRequest& request)
{
auto& fileExistsCheck = AZStd::get<FileRequest::FileExistsCheckData>(request.GetCommand());
auto& fileExistsCheck = AZStd::get<Requests::FileExistsCheckData>(request.GetCommand());
EXPECT_EQ(AZ::IO::IStreamerTypes::RequestStatus::Completed, request.GetStatus());
EXPECT_FALSE(fileExistsCheck.m_found);
});
@@ -519,7 +519,7 @@ namespace AZ::IO
request->CreateFileExistsCheck(path);
request->SetCompletionCallback([](const FileRequest& request)
{
auto& fileExistsCheck = AZStd::get<FileRequest::FileExistsCheckData>(request.GetCommand());
auto& fileExistsCheck = AZStd::get<Requests::FileExistsCheckData>(request.GetCommand());
EXPECT_EQ(AZ::IO::IStreamerTypes::RequestStatus::Completed, request.GetStatus());
EXPECT_FALSE(fileExistsCheck.m_found);
});
@@ -535,7 +535,7 @@ namespace AZ::IO
request->CreateFileExistsCheck(m_dummyRequestPath);
request->SetCompletionCallback([](const FileRequest& request)
{
auto& fileExistsCheck = AZStd::get<FileRequest::FileExistsCheckData>(request.GetCommand());
auto& fileExistsCheck = AZStd::get<Requests::FileExistsCheckData>(request.GetCommand());
EXPECT_EQ(AZ::IO::IStreamerTypes::RequestStatus::Completed, request.GetStatus());
EXPECT_TRUE(fileExistsCheck.m_found);
});
@@ -551,7 +551,7 @@ namespace AZ::IO
request->CreateFileExistsCheck(m_dummyRequestPath);
request->SetCompletionCallback([](const FileRequest& request)
{
auto& fileExistsCheck = AZStd::get<FileRequest::FileExistsCheckData>(request.GetCommand());
auto& fileExistsCheck = AZStd::get<Requests::FileExistsCheckData>(request.GetCommand());
EXPECT_EQ(AZ::IO::IStreamerTypes::RequestStatus::Completed, request.GetStatus());
EXPECT_TRUE(fileExistsCheck.m_found);
});
@@ -573,7 +573,7 @@ namespace AZ::IO
request->CreateFileExistsCheck(m_dummyRequestPath);
request->SetCompletionCallback([](const FileRequest& request)
{
auto& fileExistsCheck = AZStd::get<FileRequest::FileExistsCheckData>(request.GetCommand());
auto& fileExistsCheck = AZStd::get<Requests::FileExistsCheckData>(request.GetCommand());
EXPECT_EQ(AZ::IO::IStreamerTypes::RequestStatus::Completed, request.GetStatus());
EXPECT_TRUE(fileExistsCheck.m_found);
});
@@ -603,7 +603,7 @@ namespace AZ::IO
AZ_POP_DISABLE_WARNING
{
EXPECT_EQ(request.GetStatus(), AZ::IO::IStreamerTypes::RequestStatus::Completed);
auto& readRequest = AZStd::get<AZ::IO::FileRequest::ReadData>(request.GetCommand());
auto& readRequest = AZStd::get<AZ::IO::Requests::ReadData>(request.GetCommand());
EXPECT_EQ(readRequest.m_size, fileSize);
EXPECT_STREQ(readRequest.m_path.GetAbsolutePath(), m_dummyFilepath.c_str());
};
@@ -648,7 +648,7 @@ namespace AZ::IO
AZ_POP_DISABLE_WARNING
{
EXPECT_EQ(request.GetStatus(), AZ::IO::IStreamerTypes::RequestStatus::Completed);
auto& readRequest = AZStd::get<AZ::IO::FileRequest::ReadData>(request.GetCommand());
auto& readRequest = AZStd::get<AZ::IO::Requests::ReadData>(request.GetCommand());
EXPECT_EQ(readRequest.m_size, unalignedSize);
EXPECT_EQ(readRequest.m_offset, unalignedOffset);
EXPECT_STREQ(readRequest.m_path.GetAbsolutePath(), m_dummyFilepath.c_str());
@@ -796,7 +796,7 @@ namespace AZ::IO
AZ_POP_DISABLE_WARNING
{
EXPECT_EQ(request.GetStatus(), AZ::IO::IStreamerTypes::RequestStatus::Completed);
auto& readRequest = AZStd::get<AZ::IO::FileRequest::ReadData>(request.GetCommand());
auto& readRequest = AZStd::get<AZ::IO::Requests::ReadData>(request.GetCommand());
EXPECT_EQ(readRequest.m_size, chunkSize);
EXPECT_EQ(readRequest.m_offset, i * chunkSize);
};
Code/Framework/AzCore/Tests/Streamer/BlockCacheTests.cpp
+8 -8
View File
@@ -100,7 +100,7 @@ namespace AZ::IO
void QueueReadRequest(FileRequest* request)
{
auto data = AZStd::get_if<FileRequest::ReadData>(&request->GetCommand());
auto data = AZStd::get_if<Requests::ReadData>(&request->GetCommand());
if (data)
{
if (m_fakeFileFound)
@@ -122,15 +122,15 @@ namespace AZ::IO
m_context->MarkRequestAsCompleted(request);
}
else if (
AZStd::holds_alternative<FileRequest::FlushData>(request->GetCommand()) ||
AZStd::holds_alternative<FileRequest::FlushAllData>(request->GetCommand()))
AZStd::holds_alternative<Requests::FlushData>(request->GetCommand()) ||
AZStd::holds_alternative<Requests::FlushAllData>(request->GetCommand()))
{
request->SetStatus(IStreamerTypes::RequestStatus::Completed);
m_context->MarkRequestAsCompleted(request);
}
else if (AZStd::holds_alternative<FileRequest::FileMetaDataRetrievalData>(request->GetCommand()))
else if (AZStd::holds_alternative<Requests::FileMetaDataRetrievalData>(request->GetCommand()))
{
auto& data2 = AZStd::get<FileRequest::FileMetaDataRetrievalData>(request->GetCommand());
auto& data2 = AZStd::get<Requests::FileMetaDataRetrievalData>(request->GetCommand());
data2.m_found = m_fakeFileFound;
data2.m_fileSize = m_fakeFileLength;
request->SetStatus(m_fakeFileFound ? IStreamerTypes::RequestStatus::Completed : IStreamerTypes::RequestStatus::Failed);
@@ -158,16 +158,16 @@ namespace AZ::IO
void QueueCanceledReadRequest(FileRequest* request)
{
auto data = AZStd::get_if<FileRequest::ReadData>(&request->GetCommand());
auto data = AZStd::get_if<Requests::ReadData>(&request->GetCommand());
if (data)
{
ReadFile(data->m_output, data->m_path, data->m_offset, data->m_size);
request->SetStatus(IStreamerTypes::RequestStatus::Canceled);
m_context->MarkRequestAsCompleted(request);
}
else if (AZStd::holds_alternative<FileRequest::FileMetaDataRetrievalData>(request->GetCommand()))
else if (AZStd::holds_alternative<Requests::FileMetaDataRetrievalData>(request->GetCommand()))
{
auto& data2 = AZStd::get<FileRequest::FileMetaDataRetrievalData>(request->GetCommand());
auto& data2 = AZStd::get<Requests::FileMetaDataRetrievalData>(request->GetCommand());
data2.m_found = true;
data2.m_fileSize = m_fakeFileLength;
request->SetStatus(IStreamerTypes::RequestStatus::Completed);
Code/Framework/AzCore/Tests/Streamer/FullDecompressorTests.cpp
+1 -1
View File
@@ -145,7 +145,7 @@ namespace AZ::IO
void PrepareReadRequest(FileRequest* request)
{
auto data = AZStd::get_if<FileRequest::ReadData>(&request->GetCommand());
auto data = AZStd::get_if<Requests::ReadData>(&request->GetCommand());
ASSERT_NE(nullptr, data);
u64 size = data->m_size >> 2;
Code/Framework/AzCore/Tests/Streamer/IStreamerMock.h
+1
View File
@@ -9,6 +9,7 @@
#include <gmock/gmock.h>
#include <AzCore/IO/IStreamer.h>
#include <AzCore/IO/Streamer/FileRequest.h>
using namespace AZ::IO;
Code/Framework/AzCore/Tests/Streamer/ReadSplitterTests.cpp
+5 -5
View File
@@ -155,7 +155,7 @@ namespace AZ::IO
{
EXPECT_EQ(subRequests[i]->GetParent(), readRequest);
FileRequest::ReadData* data = AZStd::get_if<FileRequest::ReadData>(&subRequests[i]->GetCommand());
Requests::ReadData* data = AZStd::get_if<Requests::ReadData>(&subRequests[i]->GetCommand());
ASSERT_NE(nullptr, data);
EXPECT_EQ(SplitSize, data->m_size);
EXPECT_EQ(SplitSize * i, data->m_offset);
@@ -210,7 +210,7 @@ namespace AZ::IO
{
EXPECT_EQ(subRequests[i]->GetParent(), readRequest);
FileRequest::ReadData* data = AZStd::get_if<FileRequest::ReadData>(&subRequests[i]->GetCommand());
Requests::ReadData* data = AZStd::get_if<Requests::ReadData>(&subRequests[i]->GetCommand());
ASSERT_NE(nullptr, data);
EXPECT_EQ(SplitSize, data->m_size);
EXPECT_EQ(SplitSize * i, data->m_offset);
@@ -230,7 +230,7 @@ namespace AZ::IO
{
EXPECT_EQ(subRequests[i]->GetParent(), readRequest);
FileRequest::ReadData* data = AZStd::get_if<FileRequest::ReadData>(&subRequests[i]->GetCommand());
Requests::ReadData* data = AZStd::get_if<Requests::ReadData>(&subRequests[i]->GetCommand());
ASSERT_NE(nullptr, data);
EXPECT_EQ(SplitSize, data->m_size);
EXPECT_EQ(SplitSize * (batchSize + i), data->m_offset);
@@ -265,7 +265,7 @@ namespace AZ::IO
m_readSplitter->QueueRequest(readRequest);
ASSERT_NE(nullptr, subRequest);
FileRequest::ReadData* data = AZStd::get_if<FileRequest::ReadData>(&subRequest->GetCommand());
Requests::ReadData* data = AZStd::get_if<Requests::ReadData>(&subRequest->GetCommand());
EXPECT_NE(buffer, data->m_output);
EXPECT_EQ(readSize, data->m_size);
EXPECT_EQ(0, data->m_offset);
@@ -311,7 +311,7 @@ namespace AZ::IO
m_readSplitter->QueueRequest(readRequest);
ASSERT_NE(nullptr, subRequest);
FileRequest::ReadData* data = AZStd::get_if<FileRequest::ReadData>(&subRequest->GetCommand());
Requests::ReadData* data = AZStd::get_if<Requests::ReadData>(&subRequest->GetCommand());
EXPECT_NE(buffer, data->m_output);
EXPECT_EQ(readSize + offsetAdjustment, data->m_size);
EXPECT_EQ(0, data->m_offset);
Code/Framework/AzCore/Tests/Streamer/SchedulerTests.cpp
+4 -3
View File
@@ -9,6 +9,7 @@
#include <AzCore/Casting/lossy_cast.h>
#include <AzCore/IO/Streamer/Streamer.h>
#include <AzCore/IO/Streamer/Scheduler.h>
#include <AzCore/IO/Streamer/FileRequest.h>
#include <AzCore/std/parallel/atomic.h>
#include <AzCore/std/parallel/binary_semaphore.h>
#include <AzCore/std/smart_ptr/make_shared.h>
@@ -86,7 +87,7 @@ namespace AZ::IO
.WillOnce([this](FileRequest* request)
{
AZ_Assert(m_streamerContext, "AZ::IO::Streamer is not ready to process requests.");
auto readData = AZStd::get_if<FileRequest::ReadRequestData>(&request->GetCommand());
auto readData = AZStd::get_if<Requests::ReadRequestData>(&request->GetCommand());
AZ_Assert(readData, "Test didn't pass in the correct request.");
FileRequest* read = m_streamerContext->GetNewInternalRequest();
read->CreateRead(request, readData->m_output, readData->m_outputSize, readData->m_path,
@@ -99,7 +100,7 @@ namespace AZ::IO
.WillOnce([this](FileRequest* request)
{
AZ_Assert(m_streamerContext, "AZ::IO::Streamer is not ready to process requests.");
auto readData = AZStd::get_if<FileRequest::ReadData>(&request->GetCommand());
auto readData = AZStd::get_if<Requests::ReadData>(&request->GetCommand());
AZ_Assert(readData, "Test didn't pass in the correct request.");
auto output = reinterpret_cast<uint8_t*>(readData->m_output);
AZ_Assert(output != nullptr, "Output buffer has not been set.");
@@ -304,7 +305,7 @@ namespace AZ::IO
EXPECT_CALL(*m_mock, QueueRequest(_)).Times(1)
.WillOnce(Invoke([this](FileRequest* request)
{
auto* read = request->GetCommandFromChain<FileRequest::ReadRequestData>();
auto* read = request->GetCommandFromChain<Requests::ReadRequestData>();
ASSERT_NE(nullptr, read);
EXPECT_LT(read->m_deadline, FileRequest::s_noDeadlineTime);
EXPECT_EQ(read->m_priority, IStreamerTypes::s_priorityHighest);
Code/Framework/AzCore/Tests/Streamer/StreamStackEntryConformityTests.h
+1
View File
@@ -10,6 +10,7 @@
#include <limits>
#include <AzCore/IO/IStreamerTypes.h>
#include <AzCore/IO/Streamer/FileRequest.h>
#include <AzCore/IO/Streamer/StreamerContext.h>
#include <AzCore/IO/Streamer/StreamStackEntry.h>
#include <AzCore/std/smart_ptr/unique_ptr.h>
Code/Framework/AzCore/Tests/StreamerTests.cpp
+1
View File
@@ -10,6 +10,7 @@
#include <FileIOBaseTestTypes.h>
#include <AzCore/IO/CompressionBus.h>
#include <AzCore/IO/FileIO.h>
#include <AzCore/IO/Streamer/FileRequest.h>
#include <AzCore/IO/Streamer/Streamer.h>
#include <AzCore/IO/Streamer/StreamerComponent.h>
#include <AzCore/IO/Streamer/StreamerConfiguration.h>
Code/Framework/AzCore/Tests/TestCatalog.h
+1
View File
@@ -11,6 +11,7 @@
#include <AzCore/Asset/AssetManager.h>
#include <AzCore/Serialization/Utils.h>
#include <AzCore/IO/FileIO.h>
#include <AzCore/std/parallel/condition_variable.h>
namespace UnitTest
{