Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/47300 )
Change subject: mem: Move QoS' MemSinkInterface into gem5::qos
......................................................................
mem: Move QoS' MemSinkInterface into gem5::qos
This class has been mistakenly added outside the
qos namespace.
Change-Id: I12c5dc7558a689c771761754e59d78a8010e422f
Signed-off-by: Daniel R. Carvalho <[email protected]>
---
M src/mem/qos/QoSMemSinkInterface.py
M src/mem/qos/mem_sink.cc
M src/mem/qos/mem_sink.hh
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/mem/qos/QoSMemSinkInterface.py
b/src/mem/qos/QoSMemSinkInterface.py
index 37ddf78..9b3b89e 100644
--- a/src/mem/qos/QoSMemSinkInterface.py
+++ b/src/mem/qos/QoSMemSinkInterface.py
@@ -38,6 +38,7 @@
class QoSMemSinkInterface(AbstractMemory):
type = 'QoSMemSinkInterface'
cxx_header = "mem/qos/mem_sink.hh"
+ cxx_class = 'qos::MemSinkInterface'
def controller(self):
"""
diff --git a/src/mem/qos/mem_sink.cc b/src/mem/qos/mem_sink.cc
index 98a5e3f..f9be06c 100644
--- a/src/mem/qos/mem_sink.cc
+++ b/src/mem/qos/mem_sink.cc
@@ -386,9 +386,9 @@
return mem.recvTimingReq(pkt);
}
-} // namespace qos
-
-QoSMemSinkInterface::QoSMemSinkInterface(const QoSMemSinkInterfaceParams
&_p)
+MemSinkInterface::MemSinkInterface(const QoSMemSinkInterfaceParams &_p)
: AbstractMemory(_p)
{
}
+
+} // namespace qos
diff --git a/src/mem/qos/mem_sink.hh b/src/mem/qos/mem_sink.hh
index 3c229ec..247db22 100644
--- a/src/mem/qos/mem_sink.hh
+++ b/src/mem/qos/mem_sink.hh
@@ -52,12 +52,13 @@
#include "sim/eventq.hh"
struct QoSMemSinkInterfaceParams;
-class QoSMemSinkInterface;
GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
+class MemSinkInterface;
+
/**
* QoS Memory Sink
*
@@ -177,7 +178,7 @@
/**
* Create pointer to interface of actual media
*/
- QoSMemSinkInterface* const interface;
+ MemSinkInterface* const interface;
/** Read request pending */
bool retryRdReq;
@@ -262,19 +263,18 @@
MemSinkCtrlStats stats;
};
-} // namespace qos
-
-class QoSMemSinkInterface : public AbstractMemory
+class MemSinkInterface : public AbstractMemory
{
public:
/** Setting a pointer to the interface */
- void setMemCtrl(qos::MemSinkCtrl* _ctrl) { ctrl = _ctrl; };
+ void setMemCtrl(MemSinkCtrl* _ctrl) { ctrl = _ctrl; };
/** Pointer to the controller */
- qos::MemSinkCtrl* ctrl;
+ MemSinkCtrl* ctrl;
- QoSMemSinkInterface(const QoSMemSinkInterfaceParams &_p);
+ MemSinkInterface(const QoSMemSinkInterfaceParams &_p);
};
+} // namespace qos
#endif /* __MEM_QOS_MEM_SINK_HH__ */
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/47300
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I12c5dc7558a689c771761754e59d78a8010e422f
Gerrit-Change-Number: 47300
Gerrit-PatchSet: 1
Gerrit-Owner: Daniel Carvalho <[email protected]>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
