Separate out processing from Run to improve profiling clarity

Increase counter threshold to 1000000 in FrameworkThread::operator()() to improve performance
DustParticle · Jan 12, 2020 · d3eb69a · d3eb69a
1 parent 80399be
commit d3eb69a
Show file tree

Hide file tree

Showing 7 changed files with 83 additions and 62 deletions.
diff --git a/Sim/HostComm/CustomProtocol/CustomProtocolHal.cpp b/Sim/HostComm/CustomProtocol/CustomProtocolHal.cpp
@@ -63,19 +63,24 @@ void CustomProtocolHal::Run()
 {
     while (_TransferCommandQueue->empty() == false)
     {
-        TransferCommandDesc& command = _TransferCommandQueue->front();
-        U8 *buffer = GetBuffer(command.Command, command.SectorIndex);
-        if (command.Direction == TransferCommandDesc::Direction::In)
-        {
-            _BufferHal->Memcpy(command.Buffer, buffer);
-        }
-        else
-        {
-            _BufferHal->Memcpy(buffer, command.Buffer);
-        }
+        ProcessTransferCommand();
+    }
+}
 
-        assert(command.Listener != nullptr);
-        command.Listener->HandleCommandCompleted(command);
-        _TransferCommandQueue->pop();
+void CustomProtocolHal::ProcessTransferCommand()
+{
+    TransferCommandDesc& command = _TransferCommandQueue->front();
+    U8 *buffer = GetBuffer(command.Command, command.SectorIndex);
+    if (command.Direction == TransferCommandDesc::Direction::In)
+    {
+        _BufferHal->Memcpy(command.Buffer, buffer);
     }
+    else
+    {
+        _BufferHal->Memcpy(buffer, command.Buffer);
+    }
+
+    assert(command.Listener != nullptr);
+    command.Listener->HandleCommandCompleted(command);
+    _TransferCommandQueue->pop();
 }
diff --git a/Sim/HostComm/CustomProtocol/CustomProtocolHal.h b/Sim/HostComm/CustomProtocol/CustomProtocolHal.h
@@ -55,6 +55,7 @@ class CustomProtocolHal : public FrameworkThread
 
 private:
     U8* GetBuffer(CustomProtocolCommand *command, const U32 &sectorIndex);
+    void ProcessTransferCommand();
 
 private:
     std::unique_ptr<MessageServer<CustomProtocolCommand>> _MessageServer;

diff --git a/Sim/Nand/Hal/NandHal.cpp b/Sim/Nand/Hal/NandHal.cpp
@@ -80,48 +80,53 @@ void NandHal::Run()
 {
 	if (_CommandQueue->empty() == false)
 	{
-		CommandDesc& command = _CommandQueue->front();
-        NandAddress& address = command.Address;
-
-		// Set defaut return status is Success
-		command.CommandStatus = CommandDesc::Status::Success;
-
-		switch (command.Operation)
-		{
-			case CommandDesc::Op::Read:
-			{
-				if (false == ReadPage(address.Channel, address.Device, address.Block, address.Page, command.Buffer))
-				{
-					command.CommandStatus = CommandDesc::Status::Uecc;
-				}
-			}break;
-			case CommandDesc::Op::Write:
-			{
-				// TODO: Update command status
-				WritePage(address.Channel, address.Device, address.Block, address.Page, command.Buffer);
-			}break;
-			case CommandDesc::Op::Erase:
-			{
-				// TODO: Update command status
-				EraseBlock(address.Channel, address.Device, address.Block);
-			}break;
-			case CommandDesc::Op::ReadPartial:
-			{
-				if (false == ReadPage(address.Channel, address.Device, address.Block, address.Page, address.Sector, address.SectorCount, command.Buffer))
-				{
-					command.CommandStatus = CommandDesc::Status::Uecc;
-				}
-			}break;
-			case CommandDesc::Op::WritePartial:
-			{
-				// TODO: Update command status
-				WritePage(address.Channel, address.Device, address.Block, address.Page, address.Sector, address.SectorCount, command.Buffer);
-			}break;
-		}
-
-        assert(command.Listener != nullptr);
-        command.Listener->HandleCommandCompleted(command);
-
-		_CommandQueue->pop();
+        ProcessNandOperation();
 	}
 }
+
+void NandHal::ProcessNandOperation()
+{
+    CommandDesc& command = _CommandQueue->front();
+    NandAddress& address = command.Address;
+
+    // Set defaut return status is Success
+    command.CommandStatus = CommandDesc::Status::Success;
+
+    switch (command.Operation)
+    {
+    case CommandDesc::Op::Read:
+    {
+        if (false == ReadPage(address.Channel, address.Device, address.Block, address.Page, command.Buffer))
+        {
+            command.CommandStatus = CommandDesc::Status::Uecc;
+        }
+    }break;
+    case CommandDesc::Op::Write:
+    {
+        // TODO: Update command status
+        WritePage(address.Channel, address.Device, address.Block, address.Page, command.Buffer);
+    }break;
+    case CommandDesc::Op::Erase:
+    {
+        // TODO: Update command status
+        EraseBlock(address.Channel, address.Device, address.Block);
+    }break;
+    case CommandDesc::Op::ReadPartial:
+    {
+        if (false == ReadPage(address.Channel, address.Device, address.Block, address.Page, address.Sector, address.SectorCount, command.Buffer))
+        {
+            command.CommandStatus = CommandDesc::Status::Uecc;
+        }
+    }break;
+    case CommandDesc::Op::WritePartial:
+    {
+        // TODO: Update command status
+        WritePage(address.Channel, address.Device, address.Block, address.Page, address.Sector, address.SectorCount, command.Buffer);
+    }break;
+    }
+
+    assert(command.Listener != nullptr);
+    command.Listener->HandleCommandCompleted(command);
+
+    _CommandQueue->pop();
+}
diff --git a/Sim/Nand/Hal/NandHal.h b/Sim/Nand/Hal/NandHal.h
@@ -112,6 +112,9 @@ class NandHal : public FrameworkThread
 protected:
 	virtual void Run() override;
 
+private:
+    void ProcessNandOperation();
+
 private:
     std::shared_ptr<BufferHal> _BufferHal;
 

diff --git a/Sim/SimFrameworkBase/FrameworkThread.cpp b/Sim/SimFrameworkBase/FrameworkThread.cpp
@@ -15,11 +15,12 @@ void FrameworkThread::operator()()
 	while (false == quit)
 	{
         ++counter;
-        if (counter == 1000)
+        if (counter == 1000000)
         {
             quit = IsStopRequested();
             counter = 0;
         }
+
 		Run();
 	}
 }

diff --git a/Sim/SimpleFtl/SimpleFtl.cpp b/Sim/SimpleFtl/SimpleFtl.cpp
@@ -43,10 +43,16 @@ void SimpleFtl::operator()()
 {
     while (_EventQueue->empty() == false)
     {
-        Event event;
-        _EventQueue->pop(event);
-        switch (event.EventType)
-        {
+        ProcessEvent();
+    }
+}
+
+void SimpleFtl::ProcessEvent()
+{
+    Event event;
+    _EventQueue->pop(event);
+    switch (event.EventType)
+    {
         case Event::Type::CustomProtocolCommand:
         {
             OnNewCustomProtocolCommand(event.EventParams.CustomProtocolCommand);
@@ -66,7 +72,6 @@ void SimpleFtl::operator()()
         {
             assert(0);
         }
-        }
     }
 }
 

diff --git a/Sim/SimpleFtl/SimpleFtl.h b/Sim/SimpleFtl/SimpleFtl.h
@@ -63,6 +63,7 @@ class SimpleFtl : public CustomProtocolHal::TransferCommandListener, public Nand
 	};
 
 private:
+    void ProcessEvent();
     void ReadNextLbas();
     void TransferOut(const Buffer &buffer, const NandHal::NandAddress &nandAddress, const U32 &sectorIndex);
     void ReadPage(const NandHal::NandAddress &nandAddress, const Buffer &outBuffer, const U32 &descSectorIndex);