From 271949bf140359dd97cbee9ef927ee9280c9f31f Mon Sep 17 00:00:00 2001
From: Paul Buetow <paul@buetow.org>
Date: Sat, 17 May 2008 14:55:16 +0000
Subject: Vectortimestamps work Better representation of Lamporttimestamps
 BerkelyTimeProtocol

M    trunk/ROADMAP
M    trunk/sources/prefs/VSPrefs.java
M    trunk/sources/prefs/VSDefaultPrefs.java
M    trunk/sources/simulator/VSMain.java
M    trunk/sources/simulator/VSSimulation.java
M    trunk/sources/simulator/VSSimulationPanel.java
M    trunk/sources/utils/VSFrame.java
M    trunk/sources/utils/VSClassLoader.java
M    trunk/sources/utils/VSInfoArea.java
M    trunk/sources/protocols/BroadcastSturmProtocol.java
M    trunk/sources/protocols/ExternalTimeSyncProtocol.java
M    trunk/sources/protocols/RegisteredProtocols.java
M    trunk/sources/protocols/PingPongProtocol.java
M    trunk/sources/protocols/InternalTimeSyncProtocol.java
M    trunk/sources/protocols/VSProtocol.java
M    trunk/sources/protocols/DummyProtocol.java
A    trunk/sources/protocols/BerkelyTimeProtocol.java
M    trunk/sources/core/VSLamport.java
M    trunk/sources/core/VSProcess.java
A    trunk/sources/core/VSTime.java
A    trunk/sources/core/VSVectorTime.java
M    trunk/sources/core/VSTask.java
M    trunk/sources/core/VSMessage.java
M    trunk/sources/editors/VSEditor.java
M    trunk/sources/editors/VSProtocolEditor.java
M    trunk/sources/editors/VSSimulationEditor.java
M    trunk/sources/editors/VSEditorFrame.java
M    trunk/sources/editors/VSProcessEditor.java
---
 sources/core/VSTask.java | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'sources/core/VSTask.java')

diff --git a/sources/core/VSTask.java b/sources/core/VSTask.java
index 43b0265..26b2485 100644
--- a/sources/core/VSTask.java
+++ b/sources/core/VSTask.java
@@ -84,13 +84,8 @@ public class VSTask implements Comparable {
         final String protocolName = message.getProtocolName();
         final String protocolClassname = message.getProtocolClassname();
 
-        final long recvLamportTime = message.getLamportTime() + 1;
-        final long lamportTime = process.getLamportTime() + 1;
-
-        if (recvLamportTime > lamportTime)
-            process.setLamportTime(recvLamportTime);
-        else
-            process.setLamportTime(lamportTime);
+        process.updateLamportTime(message.getLamportTime()+1);
+        process.updateVectorTime(message.getVectorTime());
 
         Object protocolObj;
 
@@ -120,10 +115,6 @@ public class VSTask implements Comparable {
     private void onProcessEventStart() {
         final VSProcessEvent processEvent = (VSProcessEvent) event;
         processEvent.onStart(process);
-        /*
-        if (process.isCrashed())
-        	process.setLamportTime(process.getLamportTime()-1);
-        */
     }
 
     public long getTaskTime() {
-- 
cgit v1.2.3