1 files changed, 218 insertions, 45 deletions

diff --git a/cpp/src/Ice/Reference.h b/cpp/src/Ice/Reference.h
index ae81062013c..91a99a8b5f8 100644
--- a/cpp/src/Ice/Reference.h
+++ b/cpp/src/Ice/Reference.h
@@ -11,6 +11,7 @@
 #define ICE_REFERENCE_H
 
 #include <IceUtil/Shared.h>
+#include <IceUtil/Mutex.h>
 #include <Ice/ReferenceF.h>
 #include <Ice/ReferenceFactoryF.h>
 #include <Ice/EndpointF.h>
@@ -41,73 +42,245 @@ public:
 	ModeLast = ModeBatchDatagram
     };
 
-    bool operator==(const Reference&) const;
-    bool operator!=(const Reference&) const;
-    bool operator<(const Reference&) const;
+    Mode getMode() const { return mode; }
+    const ::Ice::Identity& getIdentity() const { return identity; }
+    const ::Ice::Context& getContext() const { return context; }
+    const ::std::string& getFacet() const { return facet; }
+    bool getSecure() const { return secure; }
+    bool getCollocationOptimization() const { return collocationOptimization; }
+    const InstancePtr& getInstance() const { return instance; }
 
-    //
-    // Marshal the reference.
-    //
-    void streamWrite(BasicStream*) const;
+    virtual ::std::vector<EndpointPtr> getEndpoints() const = 0;
 
     //
-    // Convert the reference to its string form.
+    // The change* methods (here and in derived classes) create
+    // a new reference based on the existing one, with the
+    // corresponding value changed.
     //
-    std::string toString() const;
+    ReferencePtr changeMode(Mode) const;
+    ReferencePtr changeIdentity(const ::Ice::Identity&) const;
+    ReferencePtr changeContext(const ::Ice::Context&) const;
+    ReferencePtr changeFacet(const ::std::string&) const;
+    ReferencePtr changeSecure(bool) const;
+    ReferencePtr changeCollocationOptimization(bool) const;
+
+    virtual ReferencePtr changeRouter(const ::Ice::RouterPrx&) const;
+    virtual ReferencePtr changeLocator(const ::Ice::LocatorPrx&) const;
+    virtual ReferencePtr changeDefault() const;
+    virtual ReferencePtr changeCompress(bool) const;
+    virtual ReferencePtr changeTimeout(int) const;
+
+    virtual int hash() const; // Conceptually const.
 
     //
-    // All  members are const, because References are immutable.
+    // Marshal the reference.
     //
-    const InstancePtr instance;
-    const Ice::Identity identity;
-    const Ice::Context context;
-    const std::string facet;
-    const Mode mode;
-    const bool secure;
-    const std::string adapterId;
-    const std::vector<EndpointPtr> endpoints;
-    const RouterInfoPtr routerInfo; // Null if no router is used.
-    const LocatorInfoPtr locatorInfo; // Null if no locator is used.
-    const std::vector<Ice::ConnectionIPtr> fixedConnections; // For using fixed connections, otherwise empty.
-    const bool collocationOptimization;
-    const Ice::Int hashValue;
+    virtual void streamWrite(BasicStream*) const = 0;
 
     //
-    // Get a new reference, based on the existing one, overwriting
-    // certain values.
+    // Convert the reference to its string form.
     //
-    ReferencePtr changeIdentity(const Ice::Identity&) const;
-    ReferencePtr changeContext(const Ice::Context&) const;
-    ReferencePtr changeFacet(const std::string&) const;
-    ReferencePtr changeTimeout(int) const;
-    ReferencePtr changeMode(Mode) const;
-    ReferencePtr changeSecure(bool) const;
-    ReferencePtr changeCompress(bool) const;
-    ReferencePtr changeAdapterId(const std::string&) const;
-    ReferencePtr changeEndpoints(const std::vector<EndpointPtr>&) const;
-    ReferencePtr changeRouter(const ::Ice::RouterPrx&) const;
-    ReferencePtr changeLocator(const ::Ice::LocatorPrx&) const;
-    ReferencePtr changeCollocationOptimization(bool) const;
-    ReferencePtr changeDefault() const;
- 
+    virtual ::std::string toString() const = 0;
+
     //
     // Get a suitable connection for this reference.
     //
-    Ice::ConnectionIPtr getConnection(bool&) const;
+    virtual ::Ice::ConnectionIPtr getConnection(bool&) const = 0;
+
+    ::std::vector< ::Ice::ConnectionIPtr> filterConnections(const ::std::vector< ::Ice::ConnectionIPtr>&) const;
+
+    virtual bool operator==(const Reference&) const = 0;
+    virtual bool operator!=(const Reference&) const = 0;
+    virtual bool operator<(const Reference&) const = 0;
+
+    virtual ReferencePtr clone() const = 0;
+
+protected:
+
+    Reference(const InstancePtr&, const ::Ice::Identity&, const ::Ice::Context&, const ::std::string&,
+              Mode, bool, bool);
+    Reference(const Reference&);
+    virtual ~Reference() {}
+
+private:
+
+    InstancePtr instance;
+
+    Mode mode;
+    ::Ice::Identity identity;
+    ::Ice::Context context;
+    ::std::string facet;
+    bool secure;
+    bool collocationOptimization;
+
+    ::IceUtil::Mutex hashMutex; // For lazy initialization of hash value.
+    mutable ::Ice::Int hashValue;
+    mutable bool hashInitialized;
+};
+
+class FixedReference : public Reference
+{
+public:
+
+    FixedReference(const InstancePtr&, const ::Ice::Identity&, const ::Ice::Context&, const ::std::string&, Mode, bool,
+	           bool, const ::std::vector< ::Ice::ConnectionIPtr>&);
+
+    const ::std::vector< ::Ice::ConnectionIPtr>& getFixedConnections() const { return fixedConnections; }
+
+    virtual ::std::vector<EndpointPtr> getEndpoints() const;
+
+    virtual void streamWrite(BasicStream*) const;
+    virtual ::std::string toString() const;
+    virtual ::Ice::ConnectionIPtr getConnection(bool&) const;
+
+    virtual bool operator==(const Reference&) const;
+    virtual bool operator!=(const Reference&) const;
+    virtual bool operator<(const Reference&) const;
+
+    virtual ReferencePtr clone() const;
+
+protected:
+
+    FixedReference(const FixedReference&);
+    virtual ~FixedReference() {}
+
+private:
+
+    ::std::vector< ::Ice::ConnectionIPtr> fixedConnections;
+};
+
+class RoutableReference : public Reference
+{
+public:
+
+    const RouterInfoPtr& getRouterInfo() const { return routerInfo; }
+    ::std::vector<EndpointPtr> getRoutedEndpoints() const;
+
+    virtual ReferencePtr changeRouter(const ::Ice::RouterPrx&) const;
+    virtual ReferencePtr changeDefault() const;
+    virtual ReferencePtr changeCompress(bool) const;
+    virtual ReferencePtr changeTimeout(int) const;
+
+    virtual void streamWrite(BasicStream*) const = 0;
+    virtual ::std::string toString() const = 0;
+    virtual ::Ice::ConnectionIPtr getConnection(bool&) const = 0;
+
+    virtual bool operator==(const Reference&) const = 0;
+    virtual bool operator!=(const Reference&) const = 0;
+    virtual bool operator<(const Reference&) const = 0;
+
+    virtual ReferencePtr clone() const = 0;
+
+protected:
+
+    RoutableReference(const InstancePtr&, const ::Ice::Identity&, const ::Ice::Context&, const ::std::string&,
+                      Mode, bool, const RouterInfoPtr&, bool);
+    RoutableReference(const RoutableReference&);
+    virtual ~RoutableReference() {}
+
+
+private:
+
+    RouterInfoPtr routerInfo; // Null if no router is used.
+};
+
+class DirectReference : public RoutableReference
+{
+public:
+
+    DirectReference(const InstancePtr&, const ::Ice::Identity&, const ::Ice::Context&, const ::std::string&, Mode, bool,
+	            const ::std::vector<EndpointPtr>&, const RouterInfoPtr&, bool);
+
+    virtual ::std::vector<EndpointPtr> getEndpoints() const;
+
+    DirectReferencePtr changeEndpoints(const ::std::vector<EndpointPtr>&) const;
+
+    virtual ReferencePtr changeCompress(bool) const;
+    virtual ReferencePtr changeTimeout(int) const;
+
+    virtual void streamWrite(BasicStream*) const;
+    virtual ::std::string toString() const;
+    virtual ::Ice::ConnectionIPtr getConnection(bool&) const;
+
+    virtual bool operator==(const Reference&) const;
+    virtual bool operator!=(const Reference&) const;
+    virtual bool operator<(const Reference&) const;
+
+    virtual ReferencePtr clone() const;
+
+protected:
+
+    DirectReference(const DirectReference&);
+    virtual ~DirectReference() {}
+
+private:
+
+    ::std::vector<EndpointPtr> endpoints;
+};
+
+class IndirectReference : public RoutableReference
+{
+public:
+
+    IndirectReference(const InstancePtr&, const ::Ice::Identity&, const ::Ice::Context&, const ::std::string&,
+                      Mode, bool, const ::std::string&, const RouterInfoPtr&, const LocatorInfoPtr&, bool);
+
+    const ::std::string& getAdapterId() const { return adapterId; }
+    const LocatorInfoPtr& getLocatorInfo() const { return locatorInfo; }
+
+    virtual ::std::vector<EndpointPtr> getEndpoints() const;
+
+    IndirectReferencePtr changeAdapterId(const ::std::string&) const;
+    virtual ReferencePtr changeLocator(const ::Ice::LocatorPrx&) const;
+    virtual ReferencePtr changeDefault() const;
+    virtual ReferencePtr changeCompress(bool) const;
+    virtual ReferencePtr changeTimeout(int) const;
+
+    virtual void streamWrite(BasicStream*) const;
+    virtual ::std::string toString() const;
+    virtual ::Ice::ConnectionIPtr getConnection(bool&) const;
+
+    virtual bool operator==(const Reference&) const;
+    virtual bool operator!=(const Reference&) const;
+    virtual bool operator<(const Reference&) const;
+
+    virtual ReferencePtr clone() const;
+
+protected:
+
+    IndirectReference(const IndirectReference&);
+    virtual ~IndirectReference() {}
+
+private:
+
+    ::std::string adapterId;
+    LocatorInfoPtr locatorInfo; // Null if no locator is used.
+};
+
+::std::vector<EndpointPtr> filterEndpoints(const ::std::vector<EndpointPtr>&, Reference::Mode, bool);
+
+#if 0 // TODO: move this
+class Reference : public ::IceUtil::Shared
+{
+public:
+
+
+
+
 
     //
     // Filter endpoints or connections based on criteria from this reference.
     //
-    std::vector<EndpointPtr> filterEndpoints(const std::vector<EndpointPtr>&) const;
-    std::vector<Ice::ConnectionIPtr> filterConnections(const std::vector<Ice::ConnectionIPtr>&) const;
+    ::std::vector<Ice::ConnectionIPtr> filterConnections(const ::std::vector<Ice::ConnectionIPtr>&) const;
 
 private:
 
-    Reference(const InstancePtr&, const Ice::Identity&, const Ice::Context&, const std::string&, Mode, bool,
-	      const std::string&, const std::vector<EndpointPtr>&,
-	      const RouterInfoPtr&, const LocatorInfoPtr&, const std::vector<Ice::ConnectionIPtr>&, bool);
+    Reference(const InstancePtr&, const Ice::Identity&, const Ice::Context&, const ::std::string&, Mode, bool,
+	      const ::std::string&, const ::std::vector<EndpointPtr>&,
+	      const RouterInfoPtr&, const LocatorInfoPtr&, const ::std::vector<Ice::ConnectionIPtr>&, bool);
     friend class ReferenceFactory;
 };
+#endif
 
 }