zeroc-ice 3.7.2 → 3.7.3

data/slice/Ice/Connection.ice

@@ -114,7 +114,7 @@ local interface CloseCallback
      *
      * @param con The connection that closed.
      **/
-    void closed(Connection con);
+    ["swift:noexcept"] void closed(Connection con);
 }
 
 /**
@@ -135,7 +135,7 @@ local interface HeartbeatCallback
      *
      * @param con The connection on which a heartbeat was received.
      **/
-    void heartbeat(Connection con);
+    ["swift:noexcept"] void heartbeat(Connection con);
 }
 
 /**
@@ -217,6 +217,7 @@ local enum ConnectionClose
  * The user-level interface to a connection.
  *
  **/
+["swift:inherits:Swift.CustomStringConvertible"]
 local interface Connection
 {
     /**
@@ -245,7 +246,7 @@ local interface Connection
      *
      * @see #setAdapter
      **/
-    ["cpp:const"] Object* createProxy(Identity id);
+    ["cpp:const", "swift:nonnull"] Object* createProxy(Identity id);
 
     /**
      *
@@ -280,7 +281,7 @@ local interface Connection
      * @see #setAdapter
      *
      **/
-    ["cpp:const", "cpp:noexcept"] ObjectAdapter getAdapter();
+    ["cpp:const", "cpp:noexcept", "swift:noexcept"] ObjectAdapter getAdapter();
 
     /**
      *
@@ -289,7 +290,7 @@ local interface Connection
      * @return The endpoint from which the connection was created.
      *
      **/
-    ["cpp:const", "cpp:noexcept"] Endpoint getEndpoint();
+    ["cpp:const", "cpp:noexcept", "swift:noexcept", "swift:nonnull"] Endpoint getEndpoint();
 
     /**
      *
@@ -324,7 +325,7 @@ local interface Connection
      * @param callback The heartbeat callback object.
      *
      **/
-    void setHeartbeatCallback(HeartbeatCallback callback);
+    ["swift:noexcept"] void setHeartbeatCallback(HeartbeatCallback callback);
 
     /**
      *
@@ -337,15 +338,14 @@ local interface Connection
      *
      * Set the active connection management parameters.
      *
-     * @param timeout The timeout value in seconds. It must be positive or 0, if a negative
-     * value is given, an invalid argument exception will be raised.
+     * @param timeout The timeout value in seconds, must be >= 0.
      *
      * @param close The close condition
      *
      * @param heartbeat The hertbeat condition
      *
      **/
-    ["java:optional"]
+    ["swift:noexcept", "java:optional"]
     void setACM(optional(1) int timeout, optional(2) ACMClose close, optional(3) ACMHeartbeat heartbeat);
 
     /**
@@ -355,7 +355,7 @@ local interface Connection
      * @return The ACM parameters.
      *
      **/
-    ["cpp:noexcept"] ACM getACM();
+    ["cpp:noexcept", "swift:noexcept"] ACM getACM();
 
     /**
      *
@@ -365,7 +365,7 @@ local interface Connection
      * @return The type of the connection.
      *
      **/
-    ["cpp:const", "cpp:noexcept"] string type();
+    ["cpp:const", "cpp:noexcept", "swift:noexcept"] string type();
 
     /**
      *
@@ -374,7 +374,7 @@ local interface Connection
      * @return The connection's timeout.
      *
      **/
-    ["cpp:const", "cpp:noexcept"] int timeout();
+    ["cpp:const", "cpp:noexcept", "swift:noexcept"] int timeout();
 
     /**
      *
@@ -385,7 +385,7 @@ local interface Connection
      * text.
      *
      **/
-    ["cpp:const", "cpp:noexcept"] string toString();
+    ["cpp:const", "cpp:noexcept", "swift:noexcept"] string toString();
 
     /**
      *
@@ -394,7 +394,7 @@ local interface Connection
      * @return The connection information.
      *
      **/
-    ["cpp:const"] ConnectionInfo getInfo();
+    ["cpp:const", "swift:nonnull"] ConnectionInfo getInfo();
 
     /**
      *

data/slice/Ice/Current.ice

@@ -153,7 +153,7 @@ local struct Current
 
     /**
      *
-     * The request id unless oneway (0) or collocated (-1).
+     * The request id unless oneway (0).
      *
      **/
     int requestId;

data/slice/Ice/Endpoint.ice

@@ -131,7 +131,7 @@ local class EndpointInfo
      * @return The endpoint type.
      *
      **/
-    ["cpp:const", "cpp:noexcept"] short type();
+    ["cpp:const", "cpp:noexcept", "swift:noexcept"] short type();
 
     /**
      *
@@ -140,7 +140,7 @@ local class EndpointInfo
      * @return True for a datagram endpoint.
      *
      **/
-    ["cpp:const", "cpp:noexcept"] bool datagram();
+    ["cpp:const", "cpp:noexcept", "swift:noexcept"] bool datagram();
 
     /**
      *
@@ -149,7 +149,7 @@ local class EndpointInfo
      * @return True for a secure endpoint.
      *
      **/
-    ["cpp:const", "cpp:noexcept"] bool secure();
+    ["cpp:const", "cpp:noexcept", "swift:noexcept"] bool secure();
 }
 
 /**
@@ -157,7 +157,7 @@ local class EndpointInfo
  * The user-level interface to an endpoint.
  *
  **/
-["cpp:comparable", "js:comparable"]
+["cpp:comparable", "js:comparable", "swift:inherits:Swift.CustomStringConvertible"]
 local interface Endpoint
 {
     /**
@@ -167,7 +167,7 @@ local interface Endpoint
      * @return The string representation of the endpoint.
      *
      **/
-    ["cpp:const", "cpp:noexcept"] string toString();
+    ["cpp:const", "cpp:noexcept", "swift:noexcept"] string toString();
 
     /**
      *
@@ -176,7 +176,7 @@ local interface Endpoint
      * @return The endpoint information class.
      *
      **/
-    ["cpp:const", "cpp:noexcept"] EndpointInfo getInfo();
+    ["cpp:const", "cpp:noexcept", "swift:noexcept"] EndpointInfo getInfo();
 }
 
 /**

data/slice/Ice/EndpointF.ice

@@ -37,6 +37,6 @@ local interface Endpoint;
  * A sequence of endpoints.
  *
  **/
-local sequence<Endpoint> EndpointSeq;
+["swift:nonnull"] local sequence<Endpoint> EndpointSeq;
 
 }

data/slice/Ice/FacetMap.ice

@@ -30,6 +30,6 @@ module Ice
  * A mapping from facet name to servant.
  *
  **/
-local dictionary<string, Object> FacetMap;
+local dictionary<string, ["swift:nonnull"] Object> FacetMap;
 
 }

data/slice/Ice/ImplicitContext.ice

@@ -60,7 +60,7 @@ local interface ImplicitContext
      * @return A copy of the underlying context.
      *
      **/
-    ["cpp:const"] Context getContext();
+    ["cpp:const", "swift:noexcept"] Context getContext();
 
     /**
      * Set the underlying context.
@@ -68,7 +68,7 @@ local interface ImplicitContext
      * @param newContext The new context.
      *
      **/
-    void setContext(Context newContext);
+    ["swift:noexcept"] void setContext(Context newContext);
 
     /**
      * Check if this key has an associated value in the underlying context.
@@ -78,7 +78,7 @@ local interface ImplicitContext
      * @return True if the key has an associated value, False otherwise.
      *
      **/
-    ["cpp:const"] bool containsKey(string key);
+    ["cpp:const", "swift:noexcept"] bool containsKey(string key);
 
     /**
      * Get the value associated with the given key in the underlying context.
@@ -91,7 +91,7 @@ local interface ImplicitContext
      * @return The value associated with the key.
      *
      **/
-    ["cpp:const"] string get(string key);
+    ["cpp:const", "swift:noexcept"] string get(string key);
 
     /**
      * Create or update a key/value entry in the underlying context.
@@ -103,7 +103,7 @@ local interface ImplicitContext
      * @return The previous value associated with the key, if any.
      *
      **/
-    string put(string key, string \value);
+    ["swift:noexcept"] string put(string key, string \value);
 
     /**
      * Remove the entry for the given key in the underlying context.
@@ -113,6 +113,6 @@ local interface ImplicitContext
      * @return The value associated with the key, if any.
      *
      **/
-    string remove(string key);
+    ["swift:noexcept"] string remove(string key);
 }
 }

data/slice/Ice/Instrumentation.ice

@@ -330,14 +330,14 @@ local interface InvocationObserver extends Observer
  *
  * The observer updater interface. This interface is implemented by
  * the Ice run-time and an instance of this interface is provided by
- * the Ice communicator on initialization to the {@link
- * CommunicatorObserver} object set with the communicator
- * initialization data. The Ice communicator calls {@link
- * CommunicatorObserver#setObserverUpdater} to provide the observer
+ * the Ice communicator on initialization to the
+ * {@link CommunicatorObserver} object set with the communicator
+ * initialization data. The Ice communicator calls
+ * {@link CommunicatorObserver#setObserverUpdater} to provide the observer
  * updater.
  *
- * This interface can be used by add-ins implementing the {@link
- * CommunicatorObserver} interface to update the observers of
+ * This interface can be used by add-ins implementing the
+ * {@link CommunicatorObserver} interface to update the observers of
  * connections and threads.
  *
  **/

data/slice/Ice/Logger.ice

@@ -40,7 +40,7 @@ local interface Logger
      *
      * @param message The message to log.
      **/
-    void print(string message);
+    ["swift:noexcept"] void print(string message);
 
     /**
      *
@@ -51,7 +51,7 @@ local interface Logger
      * @param message The trace message to log.
      *
      **/
-    void trace(string category, string message);
+    ["swift:noexcept"] void trace(string category, string message);
 
     /**
      *
@@ -62,7 +62,7 @@ local interface Logger
      * @see #error
      *
      **/
-    void warning(string message);
+    ["swift:noexcept"] void warning(string message);
 
     /**
      *
@@ -73,7 +73,7 @@ local interface Logger
      * @see #warning
      *
      **/
-    void error(string message);
+    ["swift:noexcept"] void error(string message);
 
     /**
      *
@@ -82,7 +82,7 @@ local interface Logger
      * @return The prefix.
      *
      **/
-    string getPrefix();
+    ["swift:noexcept"] string getPrefix();
 
     /**
      *
@@ -92,7 +92,7 @@ local interface Logger
      * @return A logger instance.
      *
      */
-    Logger cloneWithPrefix(string prefix);
+    ["swift:noexcept", "swift:nonnull"] Logger cloneWithPrefix(string prefix);
 }
 
 }

data/slice/Ice/Metrics.ice

@@ -21,16 +21,16 @@
 
 /**
  *
- * The Ice Management eXtension facility. It provides the {@link
- * IceMX#MetricsAdmin} interface for management clients to retrieve
- * metrics from Ice applications.
+ * The Ice Management eXtension facility. It provides the
+ * {@link IceMX#MetricsAdmin} interface for management clients to
+ * retrieve metrics from Ice applications.
  *
  **/
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICEMX"]
+["objc:prefix:ICEMX", "swift:module:Ice:MX"]
 module IceMX
 {
 
@@ -58,14 +58,16 @@ class Metrics
 
     /**
      *
-     * The total number of objects that were observed by this metrics.
+     * The total number of objects observed by this metrics. This includes
+     * the number of currently observed objects and the number of objects
+     * observed in the past.
      *
      **/
     long total = 0;
 
     /**
      *
-     * The current number of objects observed by this metrics.
+     * The number of objects currently observed by this metrics.
      *
      **/
     int current = 0;
@@ -73,7 +75,8 @@ class Metrics
     /**
      *
      * The sum of the lifetime of each observed objects. This does not
-     * include the lifetime of objects which are currently observed.
+     * include the lifetime of objects which are currently observed,
+     * only the objects observed in the past.
      *
      **/
     long totalLifetime = 0;
@@ -322,8 +325,8 @@ class DispatchMetrics extends Metrics
  * Provides information on child invocations. A child invocation is
  * either remote (sent over an Ice connection) or collocated. An
  * invocation can have multiple child invocation if it is
- * retried. Child invocation metrics are embedded within {@link
- * InvocationMetrics}.
+ * retried. Child invocation metrics are embedded within
+ * {@link InvocationMetrics}.
  *
  **/
 class ChildInvocationMetrics extends Metrics

data/slice/Ice/ObjectAdapter.ice

@@ -54,7 +54,7 @@ local interface ObjectAdapter
      * @return This object adapter's name.
      *
      **/
-    ["cpp:const", "cpp:noexcept"] string getName();
+    ["cpp:const", "cpp:noexcept", "swift:noexcept"] string getName();
 
     /**
      *
@@ -65,7 +65,7 @@ local interface ObjectAdapter
      * @see Communicator
      *
      **/
-    ["cpp:const", "cpp:noexcept"] Communicator getCommunicator();
+    ["cpp:const", "cpp:noexcept", "swift:noexcept", "swift:nonnull"] Communicator getCommunicator();
 
     /**
      *
@@ -94,7 +94,7 @@ local interface ObjectAdapter
      * @see #waitForHold
      *
      **/
-    void hold();
+    ["swift:noexcept"] void hold();
 
     /**
      *
@@ -107,7 +107,7 @@ local interface ObjectAdapter
      * @see Communicator#waitForShutdown
      *
      **/
-    ["js:async"] void waitForHold();
+    ["swift:noexcept", "js:async"] void waitForHold();
 
     /**
      *
@@ -134,7 +134,7 @@ local interface ObjectAdapter
      * @see Communicator#shutdown
      *
      **/
-    ["cpp:noexcept", "js:async"] void deactivate();
+    ["cpp:noexcept", "swift:noexcept", "js:async"] void deactivate();
 
     /**
      *
@@ -148,7 +148,7 @@ local interface ObjectAdapter
      * @see Communicator#waitForShutdown
      *
      **/
-    ["cpp:noexcept", "js:async"] void waitForDeactivate();
+    ["cpp:noexcept", "swift:noexcept", "js:async"] void waitForDeactivate();
 
     /**
      *
@@ -159,7 +159,7 @@ local interface ObjectAdapter
      * @see Communicator#shutdown
      *
      **/
-    ["cpp:const", "cpp:noexcept"] bool isDeactivated();
+    ["cpp:const", "cpp:noexcept", "swift:noexcept"] bool isDeactivated();
 
     /**
      *
@@ -175,7 +175,7 @@ local interface ObjectAdapter
      * @see Communicator#destroy
      *
      **/
-    ["cpp:noexcept", "js:async"] void destroy();
+    ["cpp:noexcept", "swift:noexcept", "js:async"] void destroy();
 
     /**
      *
@@ -199,7 +199,8 @@ local interface ObjectAdapter
      * @see #find
      *
      **/
-    Object* add(Object servant, ["objc:param:identity"] Identity id);
+    ["swift:nonnull", "swift:attribute:@discardableResult"]
+    Object* add(["swift:nonnull"] Object servant, ["objc:param:identity"] Identity id);
 
     /**
      *
@@ -223,7 +224,8 @@ local interface ObjectAdapter
      * @see #findFacet
      *
      **/
-    Object* addFacet(Object servant, ["objc:param:identity"] Identity id, string facet);
+    ["swift:nonnull", "swift:attribute:@discardableResult"]
+    Object* addFacet(["swift:nonnull"] Object servant, ["objc:param:identity"] Identity id, string facet);
 
     /**
      *
@@ -244,7 +246,7 @@ local interface ObjectAdapter
      * @see #find
      *
      **/
-    Object* addWithUUID(Object servant);
+    ["swift:nonnull", "swift:attribute:@discardableResult"] Object* addWithUUID(["swift:nonnull"] Object servant);
 
     /**
      *
@@ -267,7 +269,7 @@ local interface ObjectAdapter
      * @see #findFacet
      *
      **/
-    Object* addFacetWithUUID(Object servant, string facet);
+    ["swift:nonnull", "swift:attribute:@discardableResult"] Object* addFacetWithUUID(["swift:nonnull"] Object servant, string facet);
 
     /**
      *
@@ -307,7 +309,7 @@ local interface ObjectAdapter
      * @see #findDefaultServant
      *
      **/
-    void addDefaultServant(Object servant, string category);
+    void addDefaultServant(["swift:nonnull"] Object servant, string category);
 
     /**
      *
@@ -327,7 +329,7 @@ local interface ObjectAdapter
      * @see #addWithUUID
      *
      **/
-    Object remove(Identity id);
+    ["swift:nonnull", "swift:attribute:@discardableResult"] Object remove(Identity id);
 
     /**
      *
@@ -346,7 +348,7 @@ local interface ObjectAdapter
      * @see #addFacetWithUUID
      *
      **/
-    Object removeFacet(Identity id, string facet);
+    ["swift:nonnull", "swift:attribute:@discardableResult"] Object removeFacet(Identity id, string facet);
 
     /**
      *
@@ -364,7 +366,7 @@ local interface ObjectAdapter
      * @see #removeFacet
      *
      **/
-    FacetMap removeAllFacets(Identity id);
+    ["swift:attribute:@discardableResult"] FacetMap removeAllFacets(Identity id);
 
     /**
      *
@@ -380,7 +382,7 @@ local interface ObjectAdapter
      * @see #findDefaultServant
      *
      **/
-    Object removeDefaultServant(string category);
+    ["swift:nonnull", "swift:attribute:@discardableResult"] Object removeDefaultServant(string category);
 
     /**
      *
@@ -402,7 +404,7 @@ local interface ObjectAdapter
      * @see #findByProxy
      *
      **/
-    ["cpp:const"] Object find(Identity id);
+    ["swift:noexcept", "cpp:const"] Object find(Identity id);
 
     /**
      *
@@ -425,7 +427,7 @@ local interface ObjectAdapter
      * @see #findByProxy
      *
      **/
-    ["cpp:const"] Object findFacet(Identity id, string facet);
+    ["swift:noexcept", "cpp:const"] Object findFacet(Identity id, string facet);
 
     /**
      *
@@ -443,7 +445,7 @@ local interface ObjectAdapter
      * @see #findFacet
      *
      **/
-    ["cpp:const"] FacetMap findAllFacets(Identity id);
+    ["swift:noexcept", "cpp:const"] FacetMap findAllFacets(Identity id);
 
     /**
      *
@@ -463,7 +465,7 @@ local interface ObjectAdapter
      * @see #findFacet
      *
      **/
-    ["cpp:const"] Object findByProxy(Object* proxy);
+    ["swift:noexcept", "cpp:const"] Object findByProxy(["swift:nonnull"] Object* proxy);
 
     /**
      *
@@ -511,7 +513,7 @@ local interface ObjectAdapter
      * @see ServantLocator
      *
      **/
-    void addServantLocator(ServantLocator locator, string category);
+    void addServantLocator(["swift:nonnull"] ServantLocator locator, string category);
 
     /**
      *
@@ -530,7 +532,7 @@ local interface ObjectAdapter
      * @see ServantLocator
      *
      **/
-    ServantLocator removeServantLocator(string category);
+    ["swift:nonnull", "swift:attribute:@discardableResult"] ServantLocator removeServantLocator(string category);
 
     /**
      *
@@ -549,7 +551,7 @@ local interface ObjectAdapter
      * @see ServantLocator
      *
      **/
-    ["cpp:const"] ServantLocator findServantLocator(string category);
+    ["swift:noexcept", "cpp:const"] ServantLocator findServantLocator(string category);
 
     /**
      *
@@ -564,7 +566,7 @@ local interface ObjectAdapter
      * @see #removeDefaultServant
      *
      **/
-    ["cpp:const"] Object findDefaultServant(string category);
+    ["swift:noexcept", "cpp:const"] Object findDefaultServant(string category);
 
     /**
      *
@@ -583,7 +585,7 @@ local interface ObjectAdapter
      * @see Identity
      *
      **/
-    ["cpp:const"] Object* createProxy(Identity id);
+    ["cpp:const", "swift:nonnull"] Object* createProxy(Identity id);
 
     /**
      *
@@ -598,7 +600,7 @@ local interface ObjectAdapter
      * @see Identity
      *
      **/
-    ["cpp:const"] Object* createDirectProxy(Identity id);
+    ["cpp:const", "swift:nonnull"] Object* createDirectProxy(Identity id);
 
     /**
      *
@@ -614,7 +616,7 @@ local interface ObjectAdapter
      * @see Identity
      *
      **/
-    ["cpp:const"] Object* createIndirectProxy(Identity id);
+    ["cpp:const", "swift:nonnull"] Object* createIndirectProxy(Identity id);
 
     /**
      * Set an Ice locator for this object adapter. By doing so, the
@@ -643,7 +645,7 @@ local interface ObjectAdapter
      * @see #setLocator
      *
      **/
-    ["cpp:const", "cpp:noexcept"] Locator* getLocator();
+    ["cpp:const", "cpp:noexcept", "swift:noexcept"] Locator* getLocator();
 
     /**
      *
@@ -654,7 +656,7 @@ local interface ObjectAdapter
      * @see Endpoint
      *
      **/
-    ["cpp:const", "cpp:noexcept"] EndpointSeq getEndpoints();
+    ["cpp:const", "cpp:noexcept", "swift:noexcept"] EndpointSeq getEndpoints();
 
     /**
      * Refresh the set of published endpoints. The run time re-reads
@@ -678,7 +680,7 @@ local interface ObjectAdapter
      * @see Endpoint
      *
      **/
-    ["cpp:const", "cpp:noexcept"] EndpointSeq getPublishedEndpoints();
+    ["cpp:const", "cpp:noexcept", "swift:noexcept"] EndpointSeq getPublishedEndpoints();
 
     /**
      *
@@ -692,6 +694,16 @@ local interface ObjectAdapter
      *
      **/
     void setPublishedEndpoints(EndpointSeq newEndpoints);
+
+#if defined(__SLICE2SWIFT__) || defined(ICE_SWIFT)
+    /*
+     * Returns the dispatch queue.
+     *
+     * @return The dispatch queue associated wih this Object Adapter.
+     **/
+    ["cpp:const", "swift:nonnull", "cpp:type:dispatch_queue_t", "swift:type:Dispatch.DispatchQueue"]
+    LocalObject getDispatchQueue();
+#endif
 }
 
 }