changeset 399f35ed5cca in /z/repo/gem5 details: http://repo.gem5.org/gem5?cmd=changeset;node=399f35ed5cca description: mem: Use shared_ptr for Ruby Message classes
This patch transitions the Ruby Message and its derived classes from the ad-hoc RefCountingPtr to the c++11 shared_ptr. There are no changes in behaviour, and the code modifications are mainly replacing "new" with "make_shared". The cloning of derived messages is slightly changed as they previously relied on overriding the base-class through covariant return types. diffstat: src/mem/ruby/slicc_interface/Message.hh | 8 ++++---- src/mem/ruby/slicc_interface/NetworkMessage.hh | 3 ++- src/mem/ruby/slicc_interface/RubyRequest.hh | 3 ++- src/mem/ruby/system/DMASequencer.cc | 8 ++++++-- src/mem/ruby/system/DMASequencer.hh | 1 + src/mem/ruby/system/Sequencer.cc | 11 ++++++----- src/mem/slicc/ast/EnqueueStatementAST.py | 4 ++-- src/mem/slicc/symbols/Type.py | 12 +++++++++++- 8 files changed, 34 insertions(+), 16 deletions(-) diffs (169 lines): diff -r 0433264984ce -r 399f35ed5cca src/mem/ruby/slicc_interface/Message.hh --- a/src/mem/ruby/slicc_interface/Message.hh Thu Oct 16 05:49:48 2014 -0400 +++ b/src/mem/ruby/slicc_interface/Message.hh Thu Oct 16 05:49:49 2014 -0400 @@ -30,14 +30,14 @@ #define __MEM_RUBY_SLICC_INTERFACE_MESSAGE_HH__ #include <iostream> +#include <memory> -#include "base/refcnt.hh" #include "mem/packet.hh" class Message; -typedef RefCountingPtr<Message> MsgPtr; +typedef std::shared_ptr<Message> MsgPtr; -class Message : public RefCounted +class Message { public: Message(Tick curTime) @@ -54,7 +54,7 @@ virtual ~Message() { } - virtual Message* clone() const = 0; + virtual MsgPtr clone() const = 0; virtual void print(std::ostream& out) const = 0; virtual void setIncomingLink(int) {} virtual void setVnet(int) {} diff -r 0433264984ce -r 399f35ed5cca src/mem/ruby/slicc_interface/NetworkMessage.hh --- a/src/mem/ruby/slicc_interface/NetworkMessage.hh Thu Oct 16 05:49:48 2014 -0400 +++ b/src/mem/ruby/slicc_interface/NetworkMessage.hh Thu Oct 16 05:49:49 2014 -0400 @@ -30,13 +30,14 @@ #define __MEM_RUBY_SLICC_INTERFACE_NETWORKMESSAGE_HH__ #include <iostream> +#include <memory> #include "mem/protocol/MessageSizeType.hh" #include "mem/ruby/common/NetDest.hh" #include "mem/ruby/slicc_interface/Message.hh" class NetworkMessage; -typedef RefCountingPtr<NetworkMessage> NetMsgPtr; +typedef std::shared_ptr<NetworkMessage> NetMsgPtr; class NetworkMessage : public Message { diff -r 0433264984ce -r 399f35ed5cca src/mem/ruby/slicc_interface/RubyRequest.hh --- a/src/mem/ruby/slicc_interface/RubyRequest.hh Thu Oct 16 05:49:48 2014 -0400 +++ b/src/mem/ruby/slicc_interface/RubyRequest.hh Thu Oct 16 05:49:49 2014 -0400 @@ -71,7 +71,8 @@ } RubyRequest(Tick curTime) : Message(curTime) {} - RubyRequest* clone() const { return new RubyRequest(*this); } + MsgPtr clone() const + { return std::shared_ptr<Message>(new RubyRequest(*this)); } const Address& getLineAddress() const { return m_LineAddress; } const Address& getPhysicalAddress() const { return m_PhysicalAddress; } diff -r 0433264984ce -r 399f35ed5cca src/mem/ruby/system/DMASequencer.cc --- a/src/mem/ruby/system/DMASequencer.cc Thu Oct 16 05:49:48 2014 -0400 +++ b/src/mem/ruby/system/DMASequencer.cc Thu Oct 16 05:49:49 2014 -0400 @@ -26,6 +26,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include <memory> + #include "debug/RubyDma.hh" #include "debug/RubyStats.hh" #include "mem/protocol/SequencerMsg.hh" @@ -69,7 +71,8 @@ active_request.bytes_issued = 0; active_request.pkt = pkt; - SequencerMsg *msg = new SequencerMsg(clockEdge()); + std::shared_ptr<SequencerMsg> msg = + std::make_shared<SequencerMsg>(clockEdge()); msg->getPhysicalAddress() = Address(paddr); msg->getLineAddress() = line_address(msg->getPhysicalAddress()); msg->getType() = write ? SequencerRequestType_ST : SequencerRequestType_LD; @@ -107,7 +110,8 @@ return; } - SequencerMsg *msg = new SequencerMsg(clockEdge()); + std::shared_ptr<SequencerMsg> msg = + std::make_shared<SequencerMsg>(clockEdge()); msg->getPhysicalAddress() = Address(active_request.start_paddr + active_request.bytes_completed); diff -r 0433264984ce -r 399f35ed5cca src/mem/ruby/system/DMASequencer.hh --- a/src/mem/ruby/system/DMASequencer.hh Thu Oct 16 05:49:48 2014 -0400 +++ b/src/mem/ruby/system/DMASequencer.hh Thu Oct 16 05:49:49 2014 -0400 @@ -30,6 +30,7 @@ #define __MEM_RUBY_SYSTEM_DMASEQUENCER_HH__ #include <ostream> +#include <memory> #include "mem/protocol/DMASequencerRequestType.hh" #include "mem/ruby/common/DataBlock.hh" diff -r 0433264984ce -r 399f35ed5cca src/mem/ruby/system/Sequencer.cc --- a/src/mem/ruby/system/Sequencer.cc Thu Oct 16 05:49:48 2014 -0400 +++ b/src/mem/ruby/system/Sequencer.cc Thu Oct 16 05:49:49 2014 -0400 @@ -679,11 +679,12 @@ pc = pkt->req->getPC(); } - RubyRequest *msg = new RubyRequest(clockEdge(), pkt->getAddr(), - pkt->getPtr<uint8_t>(true), - pkt->getSize(), pc, secondary_type, - RubyAccessMode_Supervisor, pkt, - PrefetchBit_No, proc_id); + std::shared_ptr<RubyRequest> msg = + std::make_shared<RubyRequest>(clockEdge(), pkt->getAddr(), + pkt->getPtr<uint8_t>(true), + pkt->getSize(), pc, secondary_type, + RubyAccessMode_Supervisor, pkt, + PrefetchBit_No, proc_id); DPRINTFR(ProtocolTrace, "%15s %3s %10s%20s %6s>%-6s %s %s\n", curTick(), m_version, "Seq", "Begin", "", "", diff -r 0433264984ce -r 399f35ed5cca src/mem/slicc/ast/EnqueueStatementAST.py --- a/src/mem/slicc/ast/EnqueueStatementAST.py Thu Oct 16 05:49:48 2014 -0400 +++ b/src/mem/slicc/ast/EnqueueStatementAST.py Thu Oct 16 05:49:49 2014 -0400 @@ -54,8 +54,8 @@ self.symtab.newSymbol(v) # Declare message - code("${{msg_type.ident}} *out_msg = "\ - "new ${{msg_type.ident}}(clockEdge());") + code("std::shared_ptr<${{msg_type.ident}}> out_msg = "\ + "std::make_shared<${{msg_type.ident}}>(clockEdge());") # The other statements t = self.statements.generate(code, None) diff -r 0433264984ce -r 399f35ed5cca src/mem/slicc/symbols/Type.py --- a/src/mem/slicc/symbols/Type.py Thu Oct 16 05:49:48 2014 -0400 +++ b/src/mem/slicc/symbols/Type.py Thu Oct 16 05:49:49 2014 -0400 @@ -283,7 +283,16 @@ code('}') # create a clone member - code(''' + if self.isMessage: + code(''' +MsgPtr +clone() const +{ + return std::shared_ptr<Message>(new ${{self.c_ident}}(*this)); +} +''') + else: + code(''' ${{self.c_ident}}* clone() const { @@ -391,6 +400,7 @@ */ #include <iostream> +#include <memory> #include "mem/protocol/${{self.c_ident}}.hh" #include "mem/ruby/common/Global.hh" _______________________________________________ gem5-dev mailing list gem5-dev@gem5.org http://m5sim.org/mailman/listinfo/gem5-dev