diff options
| author | Andreas Hansson <andreas.hansson@arm.com> | 2014-10-16 05:49:47 -0400 |
|---|---|---|
| committer | Andreas Hansson <andreas.hansson@arm.com> | 2014-10-16 05:49:47 -0400 |
| commit | 8b789ae451aa0b756b4e192629c78c3bcea34cdd (patch) | |
| tree | bfbc3e34377a8711c516662f6760852e9d25e055 /src/base | |
| parent | ad3f75dc81efc8818786c32d6190e3ed069b9fc6 (diff) | |
| download | gem5-8b789ae451aa0b756b4e192629c78c3bcea34cdd.tar.xz | |
base: Transition CP annotate to use shared_ptr
Diffstat (limited to 'src/base')
| -rw-r--r-- | src/base/cp_annotate.cc | 4 | ||||
| -rw-r--r-- | src/base/cp_annotate.hh | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/base/cp_annotate.cc b/src/base/cp_annotate.cc index 858ee0cb8..4904949b4 100644 --- a/src/base/cp_annotate.cc +++ b/src/base/cp_annotate.cc @@ -822,7 +822,7 @@ CPA::swSyscallLink(ThreadContext *tc) CPA::AnnDataPtr CPA::add(int t, int f, int c, int sm, int stq, int32_t d) { - AnnDataPtr an = new AnnotateData; + AnnDataPtr an = std::make_shared<AnnotateData>(); an->time = curTick(); an->data = d; an->orig_data = d; @@ -1373,7 +1373,7 @@ CPA::unserialize(Checkpoint *cp, const std::string §ion) if (!qSize[x]) continue; for (int y = 0; y < qSize[x]; y++) { - AnnDataPtr a = new AnnotateData; + AnnDataPtr a = std::make_shared<AnnotateData>(); a->unserialize(cp, csprintf("%s.Q%d_%d", section, x, y)); data.push_back(a); qData[x].push_back(a); diff --git a/src/base/cp_annotate.hh b/src/base/cp_annotate.hh index b5c968857..5d554aa73 100644 --- a/src/base/cp_annotate.hh +++ b/src/base/cp_annotate.hh @@ -45,6 +45,7 @@ #include <list> #include <map> +#include <memory> #include <string> #include <vector> @@ -189,7 +190,7 @@ class CPA : SimObject } /* struct that is written to the annotation output file */ - struct AnnotateData : public RefCounted { + struct AnnotateData { Tick time; uint32_t data; @@ -206,7 +207,7 @@ class CPA : SimObject }; - typedef RefCountingPtr<AnnotateData> AnnDataPtr; + typedef std::shared_ptr<AnnotateData> AnnDataPtr; /* header for the annotation file */ struct AnnotateHeader { |