ohla-devel Mailing List for Open HLA (Page 2)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Revision: 107
          http://svn.sourceforge.net/ohla/?rev=107&view=rev
Author:   mnewcomb
Date:     2007-02-12 09:22:14 -0800 (Mon, 12 Feb 2007)

Log Message:
-----------
- removed extra lock on the Time lock

Modified Paths:
--------------
    trunk/rti/src/java/net/sf/ohla/rti1516/federate/Federate.java

Modified: trunk/rti/src/java/net/sf/ohla/rti1516/federate/Federate.java
===================================================================

--- trunk/rti/src/java/net/sf/ohla/rti1516/federate/Federate.java	2007-02-09 17:08:56 UTC (rev 106)
+++ trunk/rti/src/java/net/sf/ohla/rti1516/federate/Federate.java	2007-02-12 17:22:14 UTC (rev 107)
@@ -467,156 +467,148 @@
     boolean processed = true;
     if (message instanceof Callback)
     {
-      timeManager.getTimeLock().readLock().lock();
-      try
+      if (message instanceof ReflectAttributeValues)
       {
-        if (message instanceof ReflectAttributeValues)
+        ReflectAttributeValues reflectAttributeValues =
+          (ReflectAttributeValues) message;
+
+        timeManager.getTimeLock().readLock().lock();
+        try
         {
-          ReflectAttributeValues reflectAttributeValues =
-            (ReflectAttributeValues) message;
+          OrderType receivedOrderType =
+            reflectAttributeValues.getSentOrderType() == OrderType.TIMESTAMP &&
+            timeManager.isTimeConstrained() ? OrderType.TIMESTAMP :
+              OrderType.RECEIVE;
+          reflectAttributeValues.setReceivedOrderType(receivedOrderType);
 
-          timeManager.getTimeLock().readLock().lock();
-          try
+          if (receivedOrderType == OrderType.RECEIVE)
           {
-            OrderType receivedOrderType =
-              reflectAttributeValues.getSentOrderType() == OrderType.TIMESTAMP &&
-              timeManager.isTimeConstrained() ? OrderType.TIMESTAMP :
-                OrderType.RECEIVE;
-            reflectAttributeValues.setReceivedOrderType(receivedOrderType);
+            // receive order callbacks need to be held until released if we
+            // are constrained and in the time granted state if asynchronous
+            // delivery is disabled
+            //
+            boolean hold = timeManager.isTimeConstrainedAndTimeGranted() &&
+                           !isAsynchronousDeliveryEnabled();
 
-            if (receivedOrderType == OrderType.RECEIVE)
-            {
-              // receive order callbacks need to be held until released if we
-              // are constrained and in the time granted state if asynchronous
-              // delivery is disabled
-              //
-              boolean hold = timeManager.isTimeConstrainedAndTimeGranted() &&
-                             !isAsynchronousDeliveryEnabled();
-
-              callbackManager.add(reflectAttributeValues, hold);
-            }
-            else
-            {
-              // schedule the callback for the appropriate time
-              //
-              Future future = schedule(
-                reflectAttributeValues.getUpdateTime(),
-                new AddCallback(reflectAttributeValues));
-
-              // register the message retraction handle
-              //
-              messageRetractionManager.add(
-                reflectAttributeValues.getUpdateTime(), future,
-                reflectAttributeValues.getMessageRetractionHandle());
-            }
+            callbackManager.add(reflectAttributeValues, hold);
           }
-          finally
+          else
           {
-            timeManager.getTimeLock().readLock().unlock();
+            // schedule the callback for the appropriate time
+            //
+            Future future = schedule(
+              reflectAttributeValues.getUpdateTime(),
+              new AddCallback(reflectAttributeValues));
+
+            // register the message retraction handle
+            //
+            messageRetractionManager.add(
+              reflectAttributeValues.getUpdateTime(), future,
+              reflectAttributeValues.getMessageRetractionHandle());
           }
         }
-        else if (message instanceof ReceiveInteraction)
+        finally
         {
-          ReceiveInteraction receiveInteraction = (ReceiveInteraction) message;
+          timeManager.getTimeLock().readLock().unlock();
+        }
+      }
+      else if (message instanceof ReceiveInteraction)
+      {
+        ReceiveInteraction receiveInteraction = (ReceiveInteraction) message;
 
-          timeManager.getTimeLock().readLock().lock();
-          try
-          {
-            OrderType receivedOrderType =
-              receiveInteraction.getSentOrderType() == OrderType.TIMESTAMP &&
-              timeManager.isTimeConstrained() ? OrderType.TIMESTAMP :
-                OrderType.RECEIVE;
+        timeManager.getTimeLock().readLock().lock();
+        try
+        {
+          OrderType receivedOrderType =
+            receiveInteraction.getSentOrderType() == OrderType.TIMESTAMP &&
+            timeManager.isTimeConstrained() ? OrderType.TIMESTAMP :
+              OrderType.RECEIVE;
 
-            receiveInteraction.setReceivedOrderType(receivedOrderType);
+          receiveInteraction.setReceivedOrderType(receivedOrderType);
 
-            if (receivedOrderType == OrderType.RECEIVE)
-            {
-              // receive order callbacks need to be held until released if we
-              // are constrained and in the time granted state, if asynchronous
-              // delivery is disabled
-              //
-              boolean hold = timeManager.isTimeConstrainedAndTimeGranted() &&
-                             !isAsynchronousDeliveryEnabled();
+          if (receivedOrderType == OrderType.RECEIVE)
+          {
+            // receive order callbacks need to be held until released if we
+            // are constrained and in the time granted state, if asynchronous
+            // delivery is disabled
+            //
+            boolean hold = timeManager.isTimeConstrainedAndTimeGranted() &&
+                           !isAsynchronousDeliveryEnabled();
 
-              callbackManager.add(receiveInteraction, hold);
-            }
-            else
-            {
-              // schedule the callback for the appropriate time
-              //
-              Future future = schedule(receiveInteraction.getSendTime(),
-                                       new AddCallback(receiveInteraction));
-
-              // register the message retraction handle
-              //
-              messageRetractionManager.add(
-                receiveInteraction.getSendTime(), future,
-                receiveInteraction.getMessageRetractionHandle());
-            }
+            callbackManager.add(receiveInteraction, hold);
           }
-          finally
+          else
           {
-            timeManager.getTimeLock().readLock().unlock();
+            // schedule the callback for the appropriate time
+            //
+            Future future = schedule(receiveInteraction.getSendTime(),
+                                     new AddCallback(receiveInteraction));
+
+            // register the message retraction handle
+            //
+            messageRetractionManager.add(
+              receiveInteraction.getSendTime(), future,
+              receiveInteraction.getMessageRetractionHandle());
           }
         }
-        else if (message instanceof RemoveObjectInstance)
+        finally
         {
-          RemoveObjectInstance removeObjectInstance =
-            (RemoveObjectInstance) message;
+          timeManager.getTimeLock().readLock().unlock();
+        }
+      }
+      else if (message instanceof RemoveObjectInstance)
+      {
+        RemoveObjectInstance removeObjectInstance =
+          (RemoveObjectInstance) message;
 
-          timeManager.getTimeLock().readLock().lock();
-          try
-          {
-            OrderType receivedOrderType =
-              removeObjectInstance.getSentOrderType() == OrderType.TIMESTAMP &&
-              timeManager.isTimeConstrained() ? OrderType.TIMESTAMP :
-                OrderType.RECEIVE;
+        timeManager.getTimeLock().readLock().lock();
+        try
+        {
+          OrderType receivedOrderType =
+            removeObjectInstance.getSentOrderType() == OrderType.TIMESTAMP &&
+            timeManager.isTimeConstrained() ? OrderType.TIMESTAMP :
+              OrderType.RECEIVE;
 
-            removeObjectInstance.setReceivedOrderType(receivedOrderType);
+          removeObjectInstance.setReceivedOrderType(receivedOrderType);
 
-            if (receivedOrderType == OrderType.RECEIVE)
-            {
-              // receive order callbacks need to be held until released if we
-              // are constrained and in the time granted state, if asynchronous
-              // delivery is disabled
-              //
-              boolean hold = timeManager.isTimeConstrainedAndTimeGranted() &&
-                             !isAsynchronousDeliveryEnabled();
+          if (receivedOrderType == OrderType.RECEIVE)
+          {
+            // receive order callbacks need to be held until released if we
+            // are constrained and in the time granted state, if asynchronous
+            // delivery is disabled
+            //
+            boolean hold = timeManager.isTimeConstrainedAndTimeGranted() &&
+                           !isAsynchronousDeliveryEnabled();
 
-              callbackManager.add(removeObjectInstance, hold);
-            }
-            else
-            {
-              // schedule the callback for the appropriate time
-              //
-              Future future = schedule(removeObjectInstance.getDeleteTime(),
-                                       new AddCallback(removeObjectInstance));
-
-              // register the message retraction handle
-              //
-              messageRetractionManager.add(
-                removeObjectInstance.getDeleteTime(), future,
-                removeObjectInstance.getMessageRetractionHandle());
-            }
+            callbackManager.add(removeObjectInstance, hold);
           }
-          finally
+          else
           {
-            timeManager.getTimeLock().readLock().unlock();
+            // schedule the callback for the appropriate time
+            //
+            Future future = schedule(removeObjectInstance.getDeleteTime(),
+                                     new AddCallback(removeObjectInstance));
+
+            // register the message retraction handle
+            //
+            messageRetractionManager.add(
+              removeObjectInstance.getDeleteTime(), future,
+              removeObjectInstance.getMessageRetractionHandle());
           }
         }
-        else
+        finally
         {
-          if (message instanceof TimeAdvanceGrant)
-          {
-            processFutureTasks(((TimeAdvanceGrant) message).getTime());
-          }
-
-          callbackManager.add((Callback) message);
+          timeManager.getTimeLock().readLock().unlock();
         }
       }
-      finally
+      else
       {
-        timeManager.getTimeLock().readLock().unlock();
+        if (message instanceof TimeAdvanceGrant)
+        {
+          processFutureTasks(((TimeAdvanceGrant) message).getTime());
+        }
+
+        callbackManager.add((Callback) message);
       }
     }
     else if (message instanceof GALTAdvanced)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2006	Jan	Feb	Mar (5)	Apr (8)	May	Jun (1)	Jul	Aug (3)	Sep (6)	Oct (7)	Nov (65)	Dec (21)
2007	Jan (13)	Feb (34)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2010	Jan	Feb	Mar	Apr	May	Jun (2)	Jul	Aug	Sep	Oct	Nov	Dec
2011	Jan	Feb	Mar (1)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2013	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (1)

ohla-devel Mailing List for Open HLA (Page 2)

ohla-devel — OHLA developers list. Used to discuss ongoing development of OHLA.