slight updates

Author: plavin

src/sst/elements/miranda/mirandaCPU.h

@@ -148,11 +148,11 @@ class RequestGenCPU : public SST::Component {
         SST_SER(requestsInFlight);
         SST_SER(cache_link);
         SST_SER(srcLink);
-        SST_SER(srcReqEvent);
+        //SST_SER(srcReqEvent);
         SST_SER(stdMemHandlers);
 
         // TODO - fails as there is no serialize_impl for GeneratorRequest
-        //SST_SER(pendingRequests);
+        SST_SER(pendingRequests);
         SST_SER(memMgr);
 
         SST_SER(maxRequestsPending);

src/sst/elements/miranda/mirandaEvent.h

@@ -26,16 +26,16 @@ namespace Miranda {
 
 class MirandaReqEvent : public SST::Event {
 public:
+    /*
     struct Generator {
         std::string name;
         SST::Params params;
     };
+    */
 
 	std::deque< std::pair< std::string, SST::Params> > generators;
 	uint64_t 	key;
 
-private:
-
     void serialize_order(SST::Core::Serialization::serializer &ser)  override {
         SST::Event::serialize_order(ser);
 		SST_SER(generators);
@@ -50,7 +50,7 @@ class MirandaRspEvent : public SST::Event {
 	uint64_t 	key;
 private:
     void serialize_order(SST::Core::Serialization::serializer &ser)  override {
-        Event::serialize_order(ser);
+        SST::Event::serialize_order(ser);
 		SST_SER(key);
 	}
     ImplementSerializable(SST::Miranda::MirandaRspEvent);

src/sst/elements/miranda/mirandaGenerator.h

@@ -79,6 +79,7 @@ class GeneratorRequest : public SST::Core::Serialization::serializable {
 	}
 
 	virtual void serialize_order(SST::Core::Serialization::serializer& ser) override {
+		//SST::Core::Serialization::serializable::serialize_order(ser);
 		SST_SER(reqID);
 		SST_SER(issueTime);
 		SST_SER(dependsOn);
@@ -96,7 +97,7 @@ class GeneratorRequest : public SST::Core::Serialization::serializable {
 };
 
 template<typename QueueType>
-class MirandaRequestQueue : public SST::Core::Serialization::serializable {
+class MirandaRequestQueue {
 public:
 	MirandaRequestQueue() {
 		theQ = (QueueType*) malloc(sizeof(QueueType) * 16);
@@ -177,13 +178,12 @@ class MirandaRequestQueue : public SST::Core::Serialization::serializable {
 	}
 
     void serialize_order(SST::Core::Serialization::serializer& ser) {
-		SST_SER(theQ);
+		//int theQ_size = sizeof(QueueType) * curSize;
+		SST_SER(SST::Core::Serialization::array(theQ, curSize));
 		SST_SER(maxCapacity);
 		SST_SER(curSize);
 	}
 
-	ImplementSerializable(SST::Miranda::MirandaRequestQueue)
-
 private:
 	QueueType* theQ;
 	uint32_t maxCapacity;
@@ -209,7 +209,7 @@ class MemoryOpRequest : public GeneratorRequest {
 	uint64_t getAddress() const { return addr; }
 	uint64_t getLength() const { return length; }
 
-	virtual void serialize_order(SST::Core::Serialization::serializer& ser) override {
+	void serialize_order(SST::Core::Serialization::serializer& ser) override {
         SST::Miranda::GeneratorRequest::serialize_order(ser);
 		SST_SER(addr);
 		SST_SER(length);
@@ -234,7 +234,7 @@ class CustomOpRequest : public GeneratorRequest {
     ReqOperation getOperation() const { return CUSTOM; }
     Interfaces::StandardMem::CustomData* getPayload() { return data; }
 
-	virtual void serialize_order(SST::Core::Serialization::serializer& ser) override {
+	void serialize_order(SST::Core::Serialization::serializer& ser) override {
         SST::Miranda::GeneratorRequest::serialize_order(ser);
 		SST_SER(data);
     }
@@ -251,7 +251,7 @@ class FenceOpRequest : public GeneratorRequest {
 	~FenceOpRequest() {}
 	ReqOperation getOperation() const { return REQ_FENCE; }
 
-	virtual void serialize_order(SST::Core::Serialization::serializer& ser) override {
+	void serialize_order(SST::Core::Serialization::serializer& ser) override {
         SST::Miranda::GeneratorRequest::serialize_order(ser);
     }
 
@@ -275,7 +275,7 @@ class RequestGenerator : public SubComponent {
         SST::SubComponent::serialize_order(ser);
     }
 
-    ImplementSerializable(SST::Miranda::RequestGenerator)
+    ImplementVirtualSerializable(SST::Miranda::RequestGenerator)
 
 
 };