zeroc-ice 3.6b1 → 3.6.0

data/ext/ice/cpp/include/Slice/PHPUtil.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.

data/ext/ice/cpp/include/Slice/Parser.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.
@@ -23,11 +23,14 @@
 //
 // Automatically link Slice[D].lib with Visual C++
 //
-#if defined(_MSC_VER) && !defined(ICE_NO_PRAGMA_COMMENT)
-#   if defined(ICE_STATIC_LIBS)
-#      pragma comment(lib, "Slice.lib")
-#   elif !defined(SLICE_API_EXPORTS)
-#      if defined(_DEBUG)
+
+#if !defined(ICE_BUILDING_SLICE) && defined(SLICE_API_EXPORTS)
+#   define ICE_BUILDING_SLICE
+#endif
+
+#if defined(_MSC_VER)
+#   if !defined(ICE_BUILDING_SLICE)
+#      if defined(_DEBUG) && !defined(ICE_OS_WINRT)
 #          pragma comment(lib, "SliceD.lib")
 #      else
 #          pragma comment(lib, "Slice.lib")
@@ -38,6 +41,8 @@
 #ifndef SLICE_API
 #   ifdef SLICE_API_EXPORTS
 #       define SLICE_API ICE_DECLSPEC_EXPORT
+#   elif defined(ICE_STATIC_LIBS)
+#       define SLICE_API /**/
 #   else
 #       define SLICE_API ICE_DECLSPEC_IMPORT
 #   endif
@@ -47,7 +52,7 @@ namespace Slice
 {
 
 #if defined(_WIN32) && !defined(__MINGW32__)
- 
+
 const IceUtil::Int64 Int32Max =  0x7fffffffi64;
 const IceUtil::Int64 Int32Min = -Int32Max - 1i64;
 
@@ -439,7 +444,7 @@ public:
     virtual void destroy();
     ModulePtr createModule(const std::string&);
     ClassDefPtr createClassDef(const std::string&, int, bool, const ClassList&, bool);
-    ClassDeclPtr createClassDecl(const std::string&, bool, bool);
+    ClassDeclPtr createClassDecl(const std::string&, bool, bool, bool = true);
     ExceptionPtr createException(const std::string&, const ExceptionPtr&, bool, NodeType = Real);
     StructPtr createStruct(const std::string&, bool, NodeType = Real);
     SequencePtr createSequence(const std::string&, const TypePtr&, const StringList&, bool, NodeType = Real);
@@ -594,7 +599,7 @@ private:
 class SLICE_API Operation : virtual public Contained, virtual public Container
 {
 public:
-    
+
     //
     // Note: The order of definitions here *must* match the order of
     // definitions of ::Ice::OperationMode in slice/Ice/Current.ice!
@@ -838,7 +843,7 @@ public:
 
 protected:
 
-    Dictionary(const ContainerPtr&, const std::string&, const TypePtr&, const StringList&, const TypePtr&, 
+    Dictionary(const ContainerPtr&, const std::string&, const TypePtr&, const StringList&, const TypePtr&,
                const StringList&, bool);
     friend class Container;
 
@@ -988,8 +993,9 @@ public:
     virtual std::string kindOf() const;
     virtual void visit(ParserVisitor*, bool);
 
+
 protected:
-    
+
     DataMember(const ContainerPtr&, const std::string&, const TypePtr&, bool, int, const SyntaxTreeBasePtr&,
                const std::string&, const std::string&);
     friend class ClassDef;
@@ -1078,7 +1084,7 @@ public:
     virtual void visit(ParserVisitor*, bool);
 
     BuiltinPtr builtin(Builtin::Kind); // Not const, as builtins are created on the fly. (Lazy initialization.)
-    
+
     void addTopLevelModule(const std::string&, const std::string&);
     std::set<std::string> getTopLevelModules(const std::string&) const;
 

data/ext/ice/cpp/include/Slice/Preprocessor.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.
@@ -17,6 +17,8 @@
 #ifndef SLICE_API
 #   ifdef SLICE_API_EXPORTS
 #       define SLICE_API ICE_DECLSPEC_EXPORT
+#   elif defined(ICE_STATIC_LIBS)
+#       define SLICE_API /**/
 #   else
 #       define SLICE_API ICE_DECLSPEC_IMPORT
 #   endif
@@ -39,10 +41,10 @@ public:
     FILE* preprocess(bool, const std::string& = "");
     bool close();
 
-    enum Language { CPlusPlus, Java, JavaXML, CSharp, Python, Ruby, PHP, JS };
+    enum Language { CPlusPlus, Java, CSharp, Python, Ruby, PHP, JavaScript, JavaScriptJSON, ObjC, SliceXML };
 
-    bool printMakefileDependencies(Language, const std::vector<std::string>&, const std::string& = "", const std::string& = "cpp",
-                                   const std::string& = "");
+    bool printMakefileDependencies(std::ostream&, Language, const std::vector<std::string>&, const std::string& = "",
+                                   const std::string& = "cpp", const std::string& = "");
 
     std::string getBaseName();
 

data/ext/ice/cpp/include/Slice/PythonUtil.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.

data/ext/ice/cpp/include/Slice/RubyUtil.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.

data/ext/ice/cpp/include/Slice/Util.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.
@@ -13,6 +13,9 @@
 #include <Slice/Parser.h>
 #include <IceUtil/OutputUtil.h>
 
+#include <ostream>
+#include <fstream>
+
 namespace Slice
 {
 
@@ -27,7 +30,22 @@ SLICE_API void emitWarning(const std::string&, const std::string&, const std::st
 SLICE_API void emitRaw(const char*);
 SLICE_API std::vector<std::string> filterMcppWarnings(const std::string&);
 SLICE_API void printGeneratedHeader(IceUtilInternal::Output& out, const std::string&, const std::string& commentStyle = "//");
-SLICE_API std::string normalizePath(const std::string&);
+
+class SLICE_API DependOutputUtil : IceUtil::noncopyable
+{
+public:
+
+    DependOutputUtil(std::string& file);
+    ~DependOutputUtil();
+    void cleanup();
+    std::ostream& os();
+
+private:
+
+    const std::string _file;
+    std::ofstream _os;
+};
+
 }
 
 #endif

data/ext/ice/cpp/src/Ice/ACM.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.

data/ext/ice/cpp/src/Ice/ACM.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.

data/ext/ice/cpp/src/Ice/Acceptor.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.

data/ext/ice/cpp/src/Ice/Acceptor.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.

data/ext/ice/cpp/src/Ice/AcceptorF.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.

data/ext/ice/cpp/src/Ice/AsyncResult.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.

data/ext/ice/cpp/src/Ice/Base64.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.

data/ext/ice/cpp/src/Ice/Base64.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.

data/ext/ice/cpp/src/Ice/BasicStream.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.
@@ -97,7 +97,8 @@ IceInternal::BasicStream::BasicStream(Instance* instance, const EncodingVersion&
     _sliceObjects(true),
     _stringConverter(instance->getStringConverter()),
     _wstringConverter(instance->getWstringConverter()),
-    _startSeq(-1)
+    _startSeq(-1),
+    _minSeqSize(0)
 {
     //
     // Initialize the encoding members of our pre-allocated encapsulations, in case
@@ -118,7 +119,8 @@ IceInternal::BasicStream::BasicStream(Instance* instance, const EncodingVersion&
     _sliceObjects(true),
     _stringConverter(instance->getStringConverter()),
     _wstringConverter(instance->getWstringConverter()),
-    _startSeq(-1)
+    _startSeq(-1),
+    _minSeqSize(0)
 {
     //
     // Initialize the encoding members of our pre-allocated encapsulations, in case
@@ -2662,8 +2664,8 @@ IceInternal::BasicStream::EncapsDecoder11::skipSlice()
     {
         if(_current->sliceType == ObjectSlice)
         {
-            throw NoObjectFactoryException(__FILE__, __LINE__, 
-                                           "no object factory found and compact format prevents "  
+            throw NoObjectFactoryException(__FILE__, __LINE__,
+                                           "no object factory found and compact format prevents "
                                            "slicing (the sender should use the sliced format instead)",
                                            _current->typeId);
         }

data/ext/ice/cpp/src/Ice/BatchRequestQueue.cpp

@@ -0,0 +1,227 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2015 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.
+//
+// **********************************************************************
+
+#include <Ice/BatchRequestQueue.h>
+#include <Ice/Instance.h>
+#include <Ice/Properties.h>
+
+using namespace std;
+using namespace IceInternal;
+
+IceUtil::Shared* IceInternal::upCast(BatchRequestQueue* p) { return p; }
+
+namespace
+{
+
+const int udpOverhead = 20 + 8;
+
+class BatchRequestI : public Ice::BatchRequest
+{
+public:
+
+    BatchRequestI(BatchRequestQueue& queue, const Ice::ObjectPrx& proxy, const string& operation, int size) :
+        _queue(queue), _proxy(proxy), _operation(operation), _size(size)
+    {
+    }
+
+    virtual void
+    enqueue() const
+    {
+        _queue.enqueueBatchRequest();
+    }
+
+    virtual int
+    getSize() const
+    {
+        return _size;
+    }
+
+    virtual const std::string&
+    getOperation() const
+    {
+        return _operation;
+    }
+
+    virtual const Ice::ObjectPrx&
+    getProxy() const
+    {
+        return _proxy;
+    }
+
+private:
+
+    BatchRequestQueue& _queue;
+    const Ice::ObjectPrx& _proxy;
+    const std::string& _operation;
+    const int _size;
+};
+
+}
+
+BatchRequestQueue::BatchRequestQueue(const InstancePtr& instance, bool datagram) :
+    _interceptor(instance->initializationData().batchRequestInterceptor),
+    _batchStream(instance.get(), Ice::currentProtocolEncoding),
+    _batchStreamInUse(false),
+    _batchStreamCanFlush(false),
+    _batchRequestNum(0)
+{
+    _batchStream.writeBlob(requestBatchHdr, sizeof(requestBatchHdr));
+    _batchMarker = _batchStream.b.size();
+
+    _maxSize = instance->batchAutoFlushSize();
+    if(_maxSize > 0 && datagram)
+    {
+        const Ice::InitializationData& initData = instance->initializationData();
+        size_t udpSndSize = initData.properties->getPropertyAsIntWithDefault("Ice.UDP.SndSize", 65535 - udpOverhead);
+        if(udpSndSize < _maxSize)
+        {
+            _maxSize = udpSndSize;
+        }
+    }
+}
+
+void
+BatchRequestQueue::prepareBatchRequest(BasicStream* os)
+{
+    Lock sync(*this);
+    if(_exception.get())
+    {
+        _exception->ice_throw();
+    }
+
+    waitStreamInUse(false);
+    _batchStreamInUse = true;
+    _batchStream.swap(*os);
+}
+
+void
+BatchRequestQueue::finishBatchRequest(BasicStream* os, const Ice::ObjectPrx& proxy, const std::string& operation)
+{
+    //
+    // No need for synchronization, no other threads are supposed
+    // to modify the queue since we set _batchStreamInUse to true.
+    //
+    assert(_batchStreamInUse);
+    _batchStream.swap(*os);
+
+    try
+    {
+        _batchStreamCanFlush = true; // Allow flush to proceed even if the stream is marked in use.
+
+        if(_maxSize > 0 && _batchStream.b.size() >= _maxSize)
+        {
+            proxy->begin_ice_flushBatchRequests();
+        }
+
+        assert(_batchMarker < _batchStream.b.size());
+        if(_interceptor)
+        {
+            BatchRequestI request(*this, proxy, operation, static_cast<int>(_batchStream.b.size() - _batchMarker));
+            _interceptor->enqueue(request, _batchRequestNum, static_cast<int>(_batchMarker));
+        }
+        else
+        {
+            _batchMarker = _batchStream.b.size();
+            ++_batchRequestNum;
+        }
+
+        Lock sync(*this);
+        _batchStream.resize(_batchMarker);
+        _batchStreamInUse = false;
+        _batchStreamCanFlush = false;
+        notifyAll();
+    }
+    catch(const std::exception&)
+    {
+        Lock sync(*this);
+        _batchStream.resize(_batchMarker);
+        _batchStreamInUse = false;
+        _batchStreamCanFlush = false;
+        notifyAll();
+        throw;
+    }
+}
+
+void
+BatchRequestQueue::abortBatchRequest(BasicStream* os)
+{
+    Lock sync(*this);
+    if(_batchStreamInUse)
+    {
+        _batchStream.swap(*os);
+        _batchStream.resize(_batchMarker);
+        _batchStreamInUse = false;
+        notifyAll();
+    }
+}
+
+int
+BatchRequestQueue::swap(BasicStream* os)
+{
+    Lock sync(*this);
+    if(_batchRequestNum == 0)
+    {
+        return 0;
+    }
+
+    waitStreamInUse(true);
+
+    vector<Ice::Byte> lastRequest;
+    if(_batchMarker < _batchStream.b.size())
+    {
+        vector<Ice::Byte>(_batchStream.b.begin() + _batchMarker, _batchStream.b.end()).swap(lastRequest);
+        _batchStream.b.resize(_batchMarker);
+    }
+
+    int requestNum = _batchRequestNum;
+    _batchStream.swap(*os);
+
+    //
+    // Reset the batch.
+    //
+    _batchRequestNum = 0;
+    _batchStream.writeBlob(requestBatchHdr, sizeof(requestBatchHdr));
+    _batchMarker = _batchStream.b.size();
+    if(!lastRequest.empty())
+    {
+        _batchStream.writeBlob(&lastRequest[0], lastRequest.size());
+    }
+    return requestNum;
+}
+
+void
+BatchRequestQueue::destroy(const Ice::LocalException& ex)
+{
+    Lock sync(*this);
+    _exception.reset(ex.ice_clone());
+}
+
+bool
+BatchRequestQueue::isEmpty()
+{
+    Lock sync(*this);
+    return _batchStream.b.size() == sizeof(requestBatchHdr);
+}
+
+void
+BatchRequestQueue::waitStreamInUse(bool flush)
+{
+    while(_batchStreamInUse && !(flush && _batchStreamCanFlush))
+    {
+        wait();
+    }
+}
+
+void
+BatchRequestQueue::enqueueBatchRequest()
+{
+    assert(_batchMarker < _batchStream.b.size());
+    _batchMarker = _batchStream.b.size();
+    ++_batchRequestNum;
+}