zeroc-ice 3.6.5 → 3.7.0

data/slice/Ice/CommunicatorF.ice

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -9,7 +9,11 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
 
 ["objc:prefix:ICE"]
 module Ice
@@ -17,5 +21,4 @@ module Ice
 
 local interface Communicator;
 
-};
-
+}

data/slice/Ice/Connection.ice

@@ -1,7 +1,6 @@
-
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -10,22 +9,59 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build", "python:pkgdir:Ice"]]
 
 #include <Ice/ObjectAdapterF.ice>
 #include <Ice/Identity.ice>
 #include <Ice/Endpoint.ice>
 
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
+
 ["objc:prefix:ICE"]
 module Ice
 {
 
+/**
+ * The batch compression option when flushing queued batch requests.
+ *
+ **/
+["cpp:scoped", "objc:scoped"]
+local enum CompressBatch
+{
+    /**
+     * Compress the batch requests.
+     **/
+    Yes,
+
+    /**
+     * Don't compress the batch requests.
+     **/
+    No,
+
+    /**
+     * Compress the batch requests if at least one request was
+     * made on a compressed proxy.
+     **/
+    BasedOnProxy
+}
+
 /**
  *
  * Base class providing access to the connection details. *
  **/
+["php:internal"]
 local class ConnectionInfo
 {
+    /**
+     *
+     * The information of the underyling transport or null if there's
+     * no underlying transport.
+     *
+     **/
+    ConnectionInfo underlying;
+
     /**
      *
      * Whether or not the connection is an incoming or outgoing
@@ -47,33 +83,42 @@ local class ConnectionInfo
      *
      **/
     string connectionId;
+}
 
-    /**
-     *
-     * The connection buffer receive size.
-     *
-     **/
-    int rcvSize;
+local interface Connection;
 
+/**
+ *
+ * An application can implement this interface to receive notifications when
+ * a connection closes.
+ *
+ * @see Connection#setCloseCallback
+ *
+ **/
+["delegate"]
+local interface CloseCallback
+{
     /**
      *
-     * The connection buffer send size.
+     * This method is called by the the connection when the connection
+     * is closed. If the callback needs more information about the closure,
+     * it can call {@link Connection#throwException}.
      *
+     * @param con The connection that closed.
      **/
-    int sndSize;
-};
-
-local interface Connection;
+    void closed(Connection con);
+}
 
 /**
  *
  * An application can implement this interface to receive notifications when
- * a connection closes or receives a heartbeat message.
+ * a connection receives a heartbeat message.
  *
- * @see Connection#setCallback
+ * @see Connection#setHeartbeatCallback
  *
  **/
-local interface ConnectionCallback
+["delegate"]
+local interface HeartbeatCallback
 {
     /**
      *
@@ -81,92 +126,73 @@ local interface ConnectionCallback
      * received from the peer.
      *
      * @param con The connection on which a heartbeat was received.
-     *
      **/
     void heartbeat(Connection con);
+}
 
-    /**
-     *
-     * This method is called by the the connection when the connection
-     * is closed.
-     *
-     * @param con The connection that closed.
-     *
-     **/
-    void closed(Connection con);
-};
-
-/**
- * Specifies the close semantics for Active Connection Management.
- */
 local enum ACMClose
 {
-    /** Disables automatic connection closure. */
     CloseOff,
-    /** Gracefully closes a connection that has been idle for the configured timeout period. */
     CloseOnIdle,
-    /**
-     * Forcefully closes a connection that has been idle for the configured timeout period,
-     * but only if the connection has pending invocations.
-     */
     CloseOnInvocation,
-    /** Combines the behaviors of CloseOnIdle and CloseOnInvocation. */
     CloseOnInvocationAndIdle,
-    /**
-     * Forcefully closes a connection that has been idle for the configured timeout period,
-     * regardless of whether the connection has pending invocations or dispatch.
-     */
     CloseOnIdleForceful
-};
+}
 
-/**
- * Specifies the heartbeat semantics for Active Connection Management.
- */
 local enum ACMHeartbeat
 {
-    /** Disables heartbeats. */
     HeartbeatOff,
-    /** Send a heartbeat at regular intervals if the connection is idle and only if there are pending dispatch. */
-    HeartbeatOnInvocation,
-    /** Send a heartbeat at regular intervals when the connection is idle. */
+    HeartbeatOnDispatch,
     HeartbeatOnIdle,
-    /** Send a heartbeat at regular intervals until the connection is closed. */
     HeartbeatAlways
-};
+}
 
-/**
- * A collection of Active Connection Management configuration settings.
- */
 local struct ACM
 {
-    /** A timeout value in seconds. */
     int timeout;
-    /** The close semantics. */
     ACMClose close;
-    /** The heartbeat semantics. */
     ACMHeartbeat heartbeat;
-};
+}
+
+/**
+ * Determines the behavior when manually closing a connection.
+ **/
+["cpp:scoped", "objc:scoped"]
+local enum ConnectionClose
+{
+    /**
+     * Close the connection immediately without sending a close connection protocol message to the peer
+     * and waiting for the peer to acknowledge it.
+     **/
+    Forcefully,
+    /**
+     * Close the connection by notifying the peer but do not wait for pending outgoing invocations to complete.
+     * On the server side, the connection will not be closed until all incoming invocations have completed.
+     **/
+    Gracefully,
+    /**
+     * Wait for all pending invocations to complete before closing the connection.
+     **/
+    GracefullyWithWait
+}
 
 /**
  *
  * The user-level interface to a connection.
  *
  **/
+["php:internal"]
 local interface Connection
 {
     /**
      *
-     * Close a connection, either gracefully or forcefully. If a
-     * connection is closed forcefully, it closes immediately, without
-     * sending the relevant close connection protocol messages to the
-     * peer and waiting for the peer to acknowledge these protocol
-     * messages.
+     * Manually close the connection using the specified closure mode.
      *
-     * @param force If true, close forcefully. Otherwise the
-     * connection is closed gracefully.
+     * @param mode Determines how the connection will be closed.
      *
+     * @see ConnectionClose
      **/
-    void close(bool force);
+    void close(ConnectionClose mode);
 
     /**
      *
@@ -202,7 +228,7 @@ local interface Connection
      * automatically removed from the connection.
      *
      * @see #createProxy
-     * @see #setAdapter
+     * @see #getAdapter
      *
      **/
     void setAdapter(ObjectAdapter adapter);
@@ -235,25 +261,47 @@ local interface Connection
      * This means all batch requests invoked on fixed proxies
      * associated with the connection.
      *
+     * @param compress Specifies whether or not the queued batch requests
+     * should be compressed before being sent over the wire.
+     *
      **/
-    ["async"] void flushBatchRequests();
+    ["async-oneway"] void flushBatchRequests(CompressBatch compress);
 
     /**
      *
-     * Set callback on the connection. The callback is called by the
+     * Set a close callback on the connection. The callback is called by the
      * connection when it's closed. The callback is called from the
-     * Ice thread pool associated with the connection.
+     * Ice thread pool associated with the connection. If the callback needs
+     * more information about the closure, it can call {@link Connection#throwException}.
+     *
+     * @param callback The close callback object.
+     *
+     **/
+    void setCloseCallback(CloseCallback callback);
+
+    /**
      *
-     * @param callback The connection callback object.
+     * Set a heartbeat callback on the connection. The callback is called by the
+     * connection when a heartbeat is received. The callback is called
+     * from the Ice thread pool associated with the connection.
+     *
+     * @param callback The heartbeat callback object.
      *
      **/
-    void setCallback(ConnectionCallback callback);
+    void setHeartbeatCallback(HeartbeatCallback callback);
+
+    /**
+     *
+     * Send a heartbeat message.
+     *
+     **/
+    ["async-oneway"] void heartbeat();
 
     /**
      *
      * Set the active connection management parameters.
      *
-     * @param timeout The timeout value in seconds.
+     * @param timeout The timeout value in milliseconds.
      *
      * @param close The close condition
      *
@@ -313,20 +361,32 @@ local interface Connection
 
     /**
      *
-     * Set the connectiion buffer receive/send size.
+     * Set the connection buffer receive/send size.
      *
      * @param rcvSize The connection receive buffer size.
      * @param sndSize The connection send buffer size.
      *
      **/
     void setBufferSize(int rcvSize, int sndSize);
-};
+
+    /**
+     *
+     * Throw an exception indicating the reason for connection closure. For example,
+     * {@link CloseConnectionException} is raised if the connection was closed gracefully,
+     * whereas {@link ConnectionManuallyClosedException} is raised if the connection was
+     * manually closed by the application. This operation does nothing if the connection is
+     * not yet closed.
+     *
+     **/
+    ["cpp:const"] void throwException();
+}
 
 /**
  *
  * Provides access to the connection details of an IP connection
  *
  **/
+["php:internal"]
 local class IPConnectionInfo extends ConnectionInfo
 {
     /** The local address. */
@@ -340,32 +400,68 @@ local class IPConnectionInfo extends ConnectionInfo
 
     /** The remote port. */
     int remotePort = -1;
-};
+}
 
 /**
  *
  * Provides access to the connection details of a TCP connection
  *
  **/
+["php:internal"]
 local class TCPConnectionInfo extends IPConnectionInfo
 {
-};
+    /**
+     *
+     * The connection buffer receive size.
+     *
+     **/
+    int rcvSize = 0;
+
+    /**
+     *
+     * The connection buffer send size.
+     *
+     **/
+    int sndSize = 0;
+}
 
 /**
  *
  * Provides access to the connection details of a UDP connection
  *
  **/
+["php:internal"]
 local class UDPConnectionInfo extends IPConnectionInfo
 {
-    /** The multicast address. */
+    /**
+     *
+     * The multicast address.
+     *
+     **/
     string mcastAddress;
 
-    /** The multicast port. */
+    /**
+     *
+     * The multicast port.
+     *
+     **/
     int mcastPort = -1;
-};
 
-/** A collection of HTTP headers. */
+    /**
+     *
+     * The connection buffer receive size.
+     *
+     **/
+    int rcvSize = 0;
+
+    /**
+     *
+     * The connection buffer send size.
+     *
+     **/
+    int sndSize = 0;
+}
+
 dictionary<string, string> HeaderDict;
 
 /**
@@ -373,10 +469,11 @@ dictionary<string, string> HeaderDict;
  * Provides access to the connection details of a WebSocket connection
  *
  **/
-local class WSConnectionInfo extends TCPConnectionInfo
+["php:internal"]
+local class WSConnectionInfo extends ConnectionInfo
 {
     /** The headers from the HTTP upgrade request. */
     HeaderDict headers;
-};
+}
 
-};
+}