|
From: <ba...@us...> - 2008-03-10 20:31:44
|
Revision: 7
http://scstudio.svn.sourceforge.net/scstudio/?rev=7&view=rev
Author: babicaj
Date: 2008-03-10 13:31:26 -0700 (Mon, 10 Mar 2008)
Log Message:
-----------
Event contained reference to Instance. In case of lost/found message(m_matching_event=NULL) we weren't able to determine receiver/sender of Event. Instance reference moved to MscMessage.
Modified Paths:
--------------
trunk/src/data/msc.h
Modified: trunk/src/data/msc.h
===================================================================
--- trunk/src/data/msc.h 2008-03-09 13:32:22 UTC (rev 6)
+++ trunk/src/data/msc.h 2008-03-10 20:31:26 UTC (rev 7)
@@ -50,6 +50,8 @@
typedef counted_ptr<EventArea> EventAreaPtr;
typedef std::list<EventAreaPtr> EventAreaPtrList;
+typedef counted_ptr<Instance> InstancePtr;
+
/**
* Represents virtual base class for BMsc and HMsc.
*/
@@ -72,7 +74,7 @@
/**
* Processes' instances which are contained in Bmsc.
*/
- InstancePtrList m_processes;
+ InstancePtrList m_instances;
};
/**
@@ -113,11 +115,11 @@
string m_label;
/**
- * Events which occures at process.
+ * Events which occures at instance.
*
* Events are ordered in list, moreover they have order numbers, see Event.
*/
- EventPtrList m_events;
+ InstanceAreaPtr m_areas;
};
@@ -175,6 +177,22 @@
* Label of message.
*/
string m_label;
+
+ /**
+ * Sender of message.
+ *
+ * The counted_ptr shouldn't be used instead because of
+ * occurence of cyclic references.
+ */
+ Instance* m_sender;
+
+ /**
+ * Receiver of message.
+ *
+ * The counted_ptr shouldn't be used instead because of
+ * occurence of cyclic references.
+ */
+ Instance* m_receiver;
};
/**
@@ -191,16 +209,11 @@
/**
* Label of message whose this is send or receive event.
*/
- string m_message;
+ MscMessagePtr m_message;
/**
- * Instance that this event occures at.
+ * Opposite (send/receive) event of this event.
*/
- InstancePtr m_process;
-
- /**
- * Oposite (send/receive) event of this event.
- */
EventPtr m_matching_event;
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|