Added support for Glacier2 MX and fixed ICE-4880

10 files changed, 95 insertions, 88 deletions

diff --git a/java/src/IceBox/ServiceManagerI.java b/java/src/IceBox/ServiceManagerI.java
index 9d7b830bbb6..2676c5f389b 100644
--- a/java/src/IceBox/ServiceManagerI.java
+++ b/java/src/IceBox/ServiceManagerI.java
@@ -354,10 +354,10 @@ public class ServiceManagerI extends _ServiceManagerDisp
                 // shared communicator.
                 // 
                 IceInternal.MetricsAdminI metricsAdmin = null;
-                if(_communicator.getObserver() instanceof IceMX.CommunicatorObserverI)
+                if(_communicator.getObserver() instanceof IceInternal.CommunicatorObserverI)
                 {
                     metricsAdmin = new IceInternal.MetricsAdminI(initData.properties, Ice.Util.getProcessLogger());
-                    initData.observer = new IceMX.CommunicatorObserverI(metricsAdmin);
+                    initData.observer = new IceInternal.CommunicatorObserverI(metricsAdmin);
                 }
 
                 _sharedCommunicator = Ice.Util.initialize(initData);
@@ -565,9 +565,9 @@ public class ServiceManagerI extends _ServiceManagerDisp
         {
             assert(_sharedCommunicator != null);
             communicator = _sharedCommunicator;
-            if(communicator.getObserver() instanceof IceMX.CommunicatorObserverI)
+            if(communicator.getObserver() instanceof IceInternal.CommunicatorObserverI)
             {
-                IceMX.CommunicatorObserverI o = (IceMX.CommunicatorObserverI)communicator.getObserver();
+                IceInternal.CommunicatorObserverI o = (IceInternal.CommunicatorObserverI)communicator.getObserver();
                 metricsAdmin = o.getMetricsAdmin();
             }
         }
@@ -606,10 +606,10 @@ public class ServiceManagerI extends _ServiceManagerDisp
                 // If Ice metrics are enabled on the IceBox communicator, we also enable them on
                 // the service communicator.
                 // 
-                if(_communicator.getObserver() instanceof IceMX.CommunicatorObserverI)
+                if(_communicator.getObserver() instanceof IceInternal.CommunicatorObserverI)
                 {
                     metricsAdmin = new IceInternal.MetricsAdminI(initData.properties, initData.logger);
-                    initData.observer = new IceMX.CommunicatorObserverI(metricsAdmin);
+                    initData.observer = new IceInternal.CommunicatorObserverI(metricsAdmin);
                 }
                 
                 //
diff --git a/java/src/IceMX/CommunicatorObserverI.java b/java/src/IceInternal/CommunicatorObserverI.java
index c5f724fe5e0..c5dd83b79ae 100644
--- a/java/src/IceMX/CommunicatorObserverI.java
+++ b/java/src/IceInternal/CommunicatorObserverI.java
@@ -7,7 +7,9 @@
 //
 // **********************************************************************
 
-package IceMX;
+package IceInternal;
+
+import IceMX.*;
 
 public class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorObserver
 {
@@ -51,7 +53,7 @@ public class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorOb
         addEndpointAttributes(r, cl);
     }
 
-    static private class ConnectionHelper extends MetricsHelper<ConnectionMetrics>
+    static public class ConnectionHelper extends MetricsHelper<ConnectionMetrics>
     {
         static private AttributeResolver _attributes = new AttributeResolver()
             {
@@ -80,7 +82,7 @@ public class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorOb
             _state = state;
         }
 
-        String
+        public String
         getId()
         {
             if(_id == null)
@@ -106,7 +108,7 @@ public class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorOb
             return _id;
         }
 
-        String
+        public String
         getState()
         {
             switch(_state)
@@ -127,7 +129,7 @@ public class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorOb
             }
         }
     
-        String 
+        public String 
         getParent()
         {
             if(_connectionInfo.adapterName != null && !_connectionInfo.adapterName.isEmpty())
@@ -140,19 +142,19 @@ public class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorOb
             }
         }
     
-        Ice.ConnectionInfo
+        public Ice.ConnectionInfo
         getConnectionInfo()
         {
             return _connectionInfo;
         }
 
-        Ice.Endpoint
+        public Ice.Endpoint
         getEndpoint()
         {
             return _endpoint;
         }
 
-        Ice.EndpointInfo
+        public Ice.EndpointInfo
         getEndpointInfo()
         {
             if(_endpointInfo == null)
@@ -162,13 +164,13 @@ public class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorOb
             return _endpointInfo;
         }
 
-        String
+        public String
         getEndpointEncodingVersion()
         {
             return Ice.Util.encodingVersionToString(getEndpointInfo().encoding);
         }
     
-        String
+        public String
         getEndpointProtocolVersion()
         {
             return Ice.Util.protocolVersionToString(getEndpointInfo().protocol);
@@ -181,7 +183,7 @@ public class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorOb
         private Ice.EndpointInfo _endpointInfo;
     };
 
-    static private final class DispatchHelper extends MetricsHelper<DispatchMetrics>
+    static public final class DispatchHelper extends MetricsHelper<DispatchMetrics>
     {
         static private final AttributeResolver _attributes = new AttributeResolver()
             {
@@ -230,13 +232,13 @@ public class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorOb
             throw new IllegalArgumentException(attribute);
         }
         
-        String
+        public String
         getMode()
         {
             return _current.requestId == 0 ? "oneway" : "twoway";
         }
         
-        String
+        public String
         getId()
         {
             if(_id == null)
@@ -252,31 +254,31 @@ public class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorOb
             return _id;
         }
 
-        String 
+        public String 
         getParent()
         {
             return _current.adapter.getName();
         }
         
-        Ice.ConnectionInfo
+        public Ice.ConnectionInfo
         getConnectionInfo()
         {
             return _current.con.getInfo();
-            }
+        }
         
-        Ice.Endpoint
+        public Ice.Endpoint
         getEndpoint()
         {
             return _current.con.getEndpoint();
         }
 
-        Ice.Connection
+        public Ice.Connection
         getConnection()
         {
             return _current.con;
         }
         
-        Ice.EndpointInfo
+        public Ice.EndpointInfo
         getEndpointInfo()
         {
             if(_endpointInfo == null)
@@ -286,25 +288,25 @@ public class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorOb
             return _endpointInfo;
         }
 
-        String
+        public String
         getEndpointEncodingVersion()
         {
             return Ice.Util.encodingVersionToString(getEndpointInfo().encoding);
         }
 
-        String
+        public String
         getEndpointProtocolVersion()
         {
             return Ice.Util.protocolVersionToString(getEndpointInfo().protocol);
         }
     
-        Ice.Current
+        public Ice.Current
         getCurrent()
         {
             return _current;
         }
         
-        String
+        public String
         getIdentity()
         {
             return _current.adapter.getCommunicator().identityToString(_current.id);
@@ -315,7 +317,7 @@ public class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorOb
         private Ice.EndpointInfo _endpointInfo;
     };
 
-    static private final class InvocationHelper extends MetricsHelper<InvocationMetrics>
+    static public final class InvocationHelper extends MetricsHelper<InvocationMetrics>
     {
         static private final AttributeResolver _attributes = new AttributeResolver()
             { 
@@ -365,7 +367,7 @@ public class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorOb
             throw new IllegalArgumentException(attribute);
         }
         
-        String
+        public String
         getMode()
         {
             if(_proxy == null)
@@ -399,7 +401,7 @@ public class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorOb
             }
         }
 
-        String
+        public String
         getId()
         {
             if(_id == null)
@@ -426,19 +428,19 @@ public class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorOb
             return _id;
         }
         
-        String 
+        public String 
         getParent()
         {
             return "Communicator";
         }
         
-        Ice.ObjectPrx
+        public Ice.ObjectPrx
         getProxy()
         {
             return _proxy;
         }
 
-        String
+        public String
         getIdentity()
         {
             if(_proxy != null)
@@ -451,13 +453,13 @@ public class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorOb
             }
         }
 
-        String
+        public String
         getOperation()
         {
             return _operation;
         }
 
-        String 
+        public String 
         getEncodingVersion()
         {
             return Ice.Util.encodingVersionToString(_proxy.ice_getEncodingVersion());
@@ -469,7 +471,7 @@ public class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorOb
         private String _id;
     };
     
-    static private final class ThreadHelper extends MetricsHelper<ThreadMetrics>
+    static public final class ThreadHelper extends MetricsHelper<ThreadMetrics>
     {
         static private final AttributeResolver _attributes = new AttributeResolver()
             { 
@@ -513,12 +515,12 @@ public class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorOb
             }
         }
         
-        final String _parent;
-        final String _id;
+        final public String _parent;
+        final public String _id;
         final private Ice.Instrumentation.ThreadState _state;
     };
 
-    static private final class EndpointHelper extends MetricsHelper<Metrics>
+    static public final class EndpointHelper extends MetricsHelper<Metrics>
     {
         static private final AttributeResolver _attributes = new AttributeResolver()
             { 
@@ -551,7 +553,7 @@ public class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorOb
             _endpoint = endpt;
         }
         
-        Ice.EndpointInfo
+        public Ice.EndpointInfo
         getEndpointInfo()
         {
             if(_endpointInfo == null)
@@ -561,25 +563,25 @@ public class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorOb
             return _endpointInfo;
         }
 
-        String
+        public String
         getEndpointEncodingVersion()
         {
             return Ice.Util.encodingVersionToString(getEndpointInfo().encoding);
         }
 
-        String
+        public String
         getEndpointProtocolVersion()
         {
             return Ice.Util.protocolVersionToString(getEndpointInfo().protocol);
         }
         
-        String
+        public String
         getParent()
         {
             return "Communicator";
         }
         
-        String
+        public String
         getId()
         {
             if(_id == null)
@@ -589,7 +591,7 @@ public class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorOb
             return _id;
         }
         
-        String
+        public String
         getEndpoint()
         {
             return _endpoint.toString();
diff --git a/java/src/IceMX/ConnectionObserverI.java b/java/src/IceInternal/ConnectionObserverI.java
index 6371c06c2ba..4cb0edad9aa 100644
--- a/java/src/IceMX/ConnectionObserverI.java
+++ b/java/src/IceInternal/ConnectionObserverI.java
@@ -7,9 +7,10 @@
 //
 // **********************************************************************
 
-package IceMX;
+package IceInternal;
 
-public class ConnectionObserverI extends Observer<ConnectionMetrics> implements Ice.Instrumentation.ConnectionObserver
+public class ConnectionObserverI extends IceMX.Observer<IceMX.ConnectionMetrics> 
+    implements Ice.Instrumentation.ConnectionObserver
 {
     public void 
     sentBytes(final int num)
@@ -25,19 +26,19 @@ public class ConnectionObserverI extends Observer<ConnectionMetrics> implements
         forEach(_receivedBytesUpdate);
     }
 
-    private MetricsUpdate<ConnectionMetrics> _sentBytesUpdate = new MetricsUpdate<ConnectionMetrics>()
+    private MetricsUpdate<IceMX.ConnectionMetrics> _sentBytesUpdate = new MetricsUpdate<IceMX.ConnectionMetrics>()
         {
             public void
-            update(ConnectionMetrics v)
+            update(IceMX.ConnectionMetrics v)
             {
                 v.sentBytes += _sentBytes;
             }
         };
 
-    private MetricsUpdate<ConnectionMetrics> _receivedBytesUpdate = new MetricsUpdate<ConnectionMetrics>()
+    private MetricsUpdate<IceMX.ConnectionMetrics> _receivedBytesUpdate = new MetricsUpdate<IceMX.ConnectionMetrics>()
         {
             public void
-            update(ConnectionMetrics v)
+            update(IceMX.ConnectionMetrics v)
             {
                 v.receivedBytes += _receivedBytes;
             }
diff --git a/java/src/IceMX/DispatchObserverI.java b/java/src/IceInternal/DispatchObserverI.java
index bb41ea3a102..40527387f19 100644
--- a/java/src/IceMX/DispatchObserverI.java
+++ b/java/src/IceInternal/DispatchObserverI.java
@@ -7,9 +7,10 @@
 //
 // **********************************************************************
 
-package IceMX;
+package IceInternal;
 
-public class DispatchObserverI extends Observer<DispatchMetrics> implements Ice.Instrumentation.DispatchObserver
+public class DispatchObserverI extends IceMX.Observer<IceMX.DispatchMetrics> 
+    implements Ice.Instrumentation.DispatchObserver
 {
     public void
     userException()
@@ -17,10 +18,10 @@ public class DispatchObserverI extends Observer<DispatchMetrics> implements Ice.
         forEach(_userException);
     }
 
-    final MetricsUpdate<DispatchMetrics> _userException = new MetricsUpdate<DispatchMetrics>()
+    final MetricsUpdate<IceMX.DispatchMetrics> _userException = new MetricsUpdate<IceMX.DispatchMetrics>()
         {
             public void
-            update(DispatchMetrics v)
+            update(IceMX.DispatchMetrics v)
             {
                 ++v.userException;
             }
diff --git a/java/src/IceInternal/Instance.java b/java/src/IceInternal/Instance.java
index 55119014184..b285a643822 100644
--- a/java/src/IceInternal/Instance.java
+++ b/java/src/IceInternal/Instance.java
@@ -772,7 +772,7 @@ public final class Instance
                (_adminFacetFilter.isEmpty() || _adminFacetFilter.contains("MetricsAdmin")) &&
                _initData.properties.getProperty("Ice.Admin.Endpoints").length() > 0)
             {
-                IceMX.CommunicatorObserverI observer = new IceMX.CommunicatorObserverI(admin);
+                CommunicatorObserverI observer = new CommunicatorObserverI(admin);
                 _initData.observer = observer;
 
                 //
diff --git a/java/src/IceMX/InvocationObserverI.java b/java/src/IceInternal/InvocationObserverI.java
index 8c2d6cf1d32..9069fd47d0d 100644
--- a/java/src/IceMX/InvocationObserverI.java
+++ b/java/src/IceInternal/InvocationObserverI.java
@@ -7,11 +7,14 @@
 //
 // **********************************************************************
 
-package IceMX;
+package IceInternal;
 
-public class InvocationObserverI extends Observer<InvocationMetrics> implements Ice.Instrumentation.InvocationObserver
+import IceMX.*;
+
+public class InvocationObserverI extends IceMX.Observer<IceMX.InvocationMetrics> 
+    implements Ice.Instrumentation.InvocationObserver
 {
-    static private final class RemoteInvocationHelper extends MetricsHelper<Metrics>
+    static public final class RemoteInvocationHelper extends MetricsHelper<Metrics>
     {
         static private final AttributeResolver _attributes = new AttributeResolver()
             { 
@@ -39,7 +42,7 @@ public class InvocationObserverI extends Observer<InvocationMetrics> implements
             _endpoint = endpt;
         }
 
-        String
+        public String
         getId()
         {
             if(_id == null)
@@ -53,7 +56,7 @@ public class InvocationObserverI extends Observer<InvocationMetrics> implements
             return _id;
         }
     
-        String 
+        public String 
         getParent()
         {
             if(_connectionInfo.adapterName != null && !_connectionInfo.adapterName.isEmpty())
@@ -66,19 +69,19 @@ public class InvocationObserverI extends Observer<InvocationMetrics> implements
             }
         }
         
-        Ice.ConnectionInfo
+        public Ice.ConnectionInfo
         getConnectionInfo()
         {
             return _connectionInfo;
         }
         
-        Ice.Endpoint
+        public Ice.Endpoint
         getEndpoint()
         {
             return _endpoint;
         }
 
-        Ice.EndpointInfo
+        public Ice.EndpointInfo
         getEndpointInfo()
         {
             if(_endpointInfo == null)
@@ -88,13 +91,13 @@ public class InvocationObserverI extends Observer<InvocationMetrics> implements
             return _endpointInfo;
         }
 
-        String
+        public String
         getEndpointEncodingVersion()
         {
             return Ice.Util.encodingVersionToString(getEndpointInfo().encoding);
         }
     
-        String
+        public String
         getEndpointProtocolVersion()
         {
             return Ice.Util.protocolVersionToString(getEndpointInfo().protocol);
diff --git a/java/src/IceMX/ThreadObserverI.java b/java/src/IceInternal/ThreadObserverI.java
index 79209c879e2..b0a8248bbdc 100644
--- a/java/src/IceMX/ThreadObserverI.java
+++ b/java/src/IceInternal/ThreadObserverI.java
@@ -7,9 +7,9 @@
 //
 // **********************************************************************
 
-package IceMX;
+package IceInternal;
 
-public class ThreadObserverI extends Observer<ThreadMetrics> implements Ice.Instrumentation.ThreadObserver
+public class ThreadObserverI extends IceMX.Observer<IceMX.ThreadMetrics> implements Ice.Instrumentation.ThreadObserver
 {
     public void
     stateChanged(final Ice.Instrumentation.ThreadState oldState, final Ice.Instrumentation.ThreadState newState)
@@ -19,10 +19,10 @@ public class ThreadObserverI extends Observer<ThreadMetrics> implements Ice.Inst
         forEach(_threadStateUpdate);
     }
 
-    private MetricsUpdate<ThreadMetrics> _threadStateUpdate = new MetricsUpdate<ThreadMetrics>()
+    private MetricsUpdate<IceMX.ThreadMetrics> _threadStateUpdate = new MetricsUpdate<IceMX.ThreadMetrics>()
         {
             public void
-            update(ThreadMetrics v)
+            update(IceMX.ThreadMetrics v)
             {
                 switch(_oldState)
                 {
diff --git a/java/src/IceMX/MetricsHelper.java b/java/src/IceMX/MetricsHelper.java
index 32f820ae4fb..2a2c567ac08 100644
--- a/java/src/IceMX/MetricsHelper.java
+++ b/java/src/IceMX/MetricsHelper.java
@@ -11,7 +11,7 @@ package IceMX;
 
 public class MetricsHelper<T>
 {
-    static class AttributeResolver
+    public static class AttributeResolver
     {
         private abstract class Resolver
         {
diff --git a/java/src/IceMX/Observer.java b/java/src/IceMX/Observer.java
index 4e29fdb255d..105b093cce0 100644
--- a/java/src/IceMX/Observer.java
+++ b/java/src/IceMX/Observer.java
@@ -65,8 +65,9 @@ public class Observer<T extends Metrics> extends IceUtilInternal.StopWatch imple
     }
 
     public void
-    update(MetricsHelper<T> helper, java.util.List<MetricsMap<T>.Entry> objects)
+    init(MetricsHelper<T> helper, java.util.List<MetricsMap<T>.Entry> objects, Observer<T> previous)
     {
+        _objects = new java.util.LinkedList<MetricsMap<T>.Entry>(previous._objects);
         java.util.Collections.sort(objects);
         java.util.ListIterator<MetricsMap<T>.Entry> p = objects.listIterator();
         java.util.ListIterator<MetricsMap<T>.Entry> q = _objects.listIterator();
diff --git a/java/src/IceMX/ObserverFactory.java b/java/src/IceMX/ObserverFactory.java
index c1bf521985d..1082e0e134f 100644
--- a/java/src/IceMX/ObserverFactory.java
+++ b/java/src/IceMX/ObserverFactory.java
@@ -46,14 +46,14 @@ public class ObserverFactory<T extends Metrics, O extends Observer<T>>
         }
     }
 
-    synchronized O
+    public synchronized O
     getObserver(MetricsHelper<T> helper, Class<O> cl)
     {
         return getObserver(helper, null, cl);
     }
 
     @SuppressWarnings("unchecked")
-    synchronized O
+    public synchronized O
     getObserver(MetricsHelper<T> helper, Object observer, Class<O> cl)
     {
 
@@ -73,23 +73,22 @@ public class ObserverFactory<T extends Metrics, O extends Observer<T>>
         }
 
         O obsv;
+        try
+        {
+            obsv = cl.newInstance();
+        }
+        catch(Exception ex)
+        {
+            assert(false);
+            return null;
+        }
         if(observer == null)
         {
-            try
-            {
-                obsv = cl.newInstance();
-            }
-            catch(Exception ex)
-            {
-                assert(false);
-                return null;
-            }
             obsv.init(helper, metricsObjects);
         }
         else
         {
-            obsv = (O)observer;
-            obsv.update(helper, metricsObjects);
+            obsv.init(helper, metricsObjects, (O)observer);
         }
         return obsv;
     }
@@ -127,7 +126,7 @@ public class ObserverFactory<T extends Metrics, O extends Observer<T>>
         }
     }
 
-    synchronized void
+    public synchronized void
     setUpdater(Runnable updater)
     {
         _updater = updater;