zeroc-ice 3.6.2 → 3.6.3

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

@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 //
-// Ice version 3.6.2
+// Ice version 3.6.3
 //
 // <auto-generated>
 //
@@ -33,7 +33,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -178,11 +178,18 @@ IceInternal::IncomingBase::__warning(const Exception& ex) const
 
     if(_current.con)
     {
-        Ice::ConnectionInfoPtr connInfo = _current.con->getInfo();
-        Ice::IPConnectionInfoPtr ipConnInfo = Ice::IPConnectionInfoPtr::dynamicCast(connInfo);
-        if(ipConnInfo)
+        try
         {
-            out << "\nremote host: " << ipConnInfo->remoteAddress << " remote port: " << ipConnInfo->remotePort;
+            Ice::ConnectionInfoPtr connInfo = _current.con->getInfo();
+            Ice::IPConnectionInfoPtr ipConnInfo = Ice::IPConnectionInfoPtr::dynamicCast(connInfo);
+            if(ipConnInfo)
+            {
+                out << "\nremote host: " << ipConnInfo->remoteAddress << " remote port: " << ipConnInfo->remotePort;
+            }
+        }
+        catch(const Ice::LocalException&)
+        {
+            // Ignore.
         }
     }
 }

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

@@ -61,7 +61,7 @@
 #   include <sys/types.h>
 #endif
 
-#if defined(__linux) || defined(__sun)
+#if defined(__linux) || defined(__sun) || defined(_AIX) || defined(__GLIBC__)
 #   include <grp.h> // for initgroups
 #endif
 
@@ -1230,7 +1230,9 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi
 #endif
             if(!logfile.empty())
             {
-                _initData.logger = new LoggerI(_initData.properties->getProperty("Ice.ProgramName"), logfile);
+                _initData.logger =
+                        new LoggerI(_initData.properties->getProperty("Ice.ProgramName"), logfile, true, 0,
+                                    _initData.properties->getPropertyAsIntWithDefault("Ice.LogFile.SizeMax", 0));
             }
             else
             {

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

@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 //
-// Ice version 3.6.2
+// Ice version 3.6.3
 //
 // <auto-generated>
 //
@@ -34,7 +34,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 //
-// Ice version 3.6.2
+// Ice version 3.6.3
 //
 // <auto-generated>
 //
@@ -33,7 +33,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -25,8 +25,6 @@ using namespace IceMX;
 namespace 
 {
 
-Context emptyCtx;
-
 int ThreadMetrics::*
 getThreadStateMetric(ThreadState s)
 {
@@ -354,7 +352,7 @@ public:
     };
     static Attributes attributes;
     
-    InvocationHelper(const ObjectPrx& proxy, const string& op, const Context& ctx = emptyCtx) :
+    InvocationHelper(const ObjectPrx& proxy, const string& op, const Context& ctx) :
         _proxy(proxy), _operation(op), _context(ctx)
     {
     }

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

@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 //
-// Ice version 3.6.2
+// Ice version 3.6.3
 //
 // <auto-generated>
 //
@@ -34,7 +34,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 //
-// Ice version 3.6.2
+// Ice version 3.6.3
 //
 // <auto-generated>
 //
@@ -38,7 +38,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 //
-// Ice version 3.6.2
+// Ice version 3.6.3
 //
 // <auto-generated>
 //
@@ -34,7 +34,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 //
-// Ice version 3.6.2
+// Ice version 3.6.3
 //
 // <auto-generated>
 //
@@ -33,7 +33,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 //
-// Ice version 3.6.2
+// Ice version 3.6.3
 //
 // <auto-generated>
 //
@@ -33,7 +33,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -9,11 +9,11 @@
 
 #include <IceUtil/Time.h>
 #include <Ice/LoggerI.h>
+#include <IceUtil/StringUtil.h>
 #include <IceUtil/Mutex.h>
 #include <IceUtil/MutexPtrLock.h>
 
 #ifdef _WIN32
-#  include <IceUtil/StringUtil.h>
 #  include <IceUtil/ScopedArray.h>
 #endif
 
@@ -46,17 +46,24 @@ public:
 
 Init init;
 
+//
+// Timeout in milliseconds after which rename will be attempted
+// in case of failures renaming files. That is set to 5 minutes.
+//
+const IceUtil::Time retryTimeout = IceUtil::Time::seconds(5 * 60);
+
 }
 
 Ice::LoggerI::LoggerI(const string& prefix, const string& file,
-                      bool convert, const IceUtil::StringConverterPtr& converter) :
+                      bool convert, const IceUtil::StringConverterPtr& converter,
+                      size_t sizeMax) :
     _prefix(prefix),
     _convert(convert),
-    _converter(converter)
+    _converter(converter),
+    _sizeMax(sizeMax)
 #if defined(_WIN32) && !defined(ICE_OS_WINRT)
-    , _consoleConverter(new IceUtil::WindowsStringConverter(GetConsoleOutputCP()))
+    ,_consoleConverter(new IceUtil::WindowsStringConverter(GetConsoleOutputCP()))
 #endif
-
 {
     if(!prefix.empty())
     {
@@ -71,6 +78,11 @@ Ice::LoggerI::LoggerI(const string& prefix, const string& file,
         {
             throw InitializationException(__FILE__, __LINE__, "FileLogger: cannot open " + _file);
         }
+
+        if(_sizeMax > 0)
+        {
+            _out.seekp(0, _out.end);
+        }
     }
 }
 
@@ -144,6 +156,83 @@ Ice::LoggerI::write(const string& message, bool indent)
 
     if(_out.is_open())
     {
+        if(_sizeMax > 0)
+        {
+            //
+            // If file size + message size exceeds max size we archive the log file,
+            // but we do not archive empty files or truncate messages.
+            //
+            size_t sz = static_cast<size_t>(_out.tellp());
+            if(sz > 0 && sz + message.size() >= _sizeMax && _nextRetry <= IceUtil::Time::now())
+            {
+                string basename = _file;
+                string ext;
+
+                size_t i = basename.rfind(".");
+                if(i != string::npos && i + 1 < basename.size())
+                {
+                    ext = basename.substr(i + 1);
+                    basename = basename.substr(0, i);
+                }
+                _out.close();
+
+                int id = 0;
+                string archive;
+                string date = IceUtil::Time::now().toString("%Y%m%d-%H%M%S");
+                while(true)
+                {
+                    ostringstream s;
+                    s << basename << "-" << date;
+                    if(id > 0)
+                    {
+                        s << "-" << id;
+                    }
+                    if(!ext.empty())
+                    {
+                        s << "." << ext;
+                    }
+                    if(IceUtilInternal::fileExists(s.str()))
+                    {
+                        id++;
+                        continue;
+                    }
+                    archive = s.str();
+                    break;
+                }
+
+                int err = IceUtilInternal::rename(_file, archive);
+
+                _out.open(_file, fstream::out | fstream::app);
+
+                if(err)
+                {
+                    _nextRetry = IceUtil::Time::now() + retryTimeout;
+
+                    //
+                    // We temporarily set the maximum size to 0 to ensure there isn't more rename attempts
+                    // in the nested error call.
+                    //
+                    size_t sizeMax = _sizeMax;
+                    _sizeMax = 0;
+                    sync.release();
+                    error("FileLogger: cannot rename `" + _file + "'\n" + IceUtilInternal::lastErrorToString());
+                    sync.acquire();
+                    _sizeMax = sizeMax;
+                }
+                else
+                {
+                    _nextRetry = IceUtil::Time();
+                }
+
+                if(!_out.is_open())
+                {
+                    sync.release();
+                    error("FileLogger: cannot open `" + _file + "':\nlog messages will be sent to stderr");
+                    write(message, indent);
+                    return;
+                }
+            }
+        }
         _out << s << endl;
     }
     else

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

@@ -22,7 +22,7 @@ class LoggerI : public Logger
 public:
 
     LoggerI(const std::string&, const std::string&, bool convert = true,
-            const IceUtil::StringConverterPtr& converter = 0);
+            const IceUtil::StringConverterPtr& converter = 0, std::size_t sizeMax = 0);
     ~LoggerI();
 
     virtual void print(const std::string&);
@@ -43,7 +43,13 @@ private:
     IceUtilInternal::ofstream _out;
 
     std::string _file;
+    std::size_t _sizeMax;
 
+    //
+    // In case of a log file rename failure is set to the time in milliseconds
+    // after which rename could be attempted again. Otherwise is set to zero.
+    //
+    IceUtil::Time _nextRetry;
 #if defined(_WIN32) && !defined(ICE_OS_WINRT)
     const IceUtil::StringConverterPtr _consoleConverter;
 #endif

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

@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 //
-// Ice version 3.6.2
+// Ice version 3.6.3
 //
 // <auto-generated>
 //
@@ -38,7 +38,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -1238,7 +1238,17 @@ IceInternal::closeSocket(SOCKET fd)
     WSASetLastError(error);
 #else
     int error = errno;
+    
+#  if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+    //
+    // FreeBSD returns ECONNRESET if the underlying object was 
+    // a stream socket that was shut down by the peer before all
+    // pending data was delivered.
+    //
+    if(close(fd) == SOCKET_ERROR && getSocketErrno() != ECONNRESET)
+#  else
     if(close(fd) == SOCKET_ERROR)
+#  endif
     {
         SocketException ex(__FILE__, __LINE__);
         ex.error = getSocketErrno();
@@ -1263,7 +1273,6 @@ IceInternal::fdToLocalAddress(SOCKET fd, Address& addr)
     socklen_t len = static_cast<socklen_t>(sizeof(sockaddr_storage));
     if(getsockname(fd, &addr.sa, &len) == SOCKET_ERROR)
     {
-        closeSocketNoThrow(fd);
         SocketException ex(__FILE__, __LINE__);
         ex.error = getSocketErrno();
         throw ex;
@@ -1297,7 +1306,6 @@ IceInternal::fdToRemoteAddress(SOCKET fd, Address& addr)
         }
         else
         {
-            closeSocketNoThrow(fd);
             SocketException ex(__FILE__, __LINE__);
             ex.error = getSocketErrno();
             throw ex;
@@ -2316,12 +2324,20 @@ repeatConnect:
     // port as the server).
     //
     Address localAddr;
-    fdToLocalAddress(fd, localAddr);
-    if(compareAddress(addr, localAddr) == 0)
+    try
     {
-        ConnectionRefusedException ex(__FILE__, __LINE__);
-        ex.error = 0; // No appropriate errno
-        throw ex;
+        fdToLocalAddress(fd, localAddr);
+        if(compareAddress(addr, localAddr) == 0)
+        {
+            ConnectionRefusedException ex(__FILE__, __LINE__);
+            ex.error = 0; // No appropriate errno
+            throw ex;
+        }
+    }
+    catch(const LocalException&)
+    {
+        closeSocketNoThrow(fd);
+        throw;
     }
 #endif
     return true;

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

@@ -45,7 +45,7 @@ typedef int ssize_t;
 
 #if defined(__linux) && !defined(ICE_NO_EPOLL)
 #   define ICE_USE_EPOLL 1
-#elif (defined(__APPLE__) || defined(__FreeBSD__)) && TARGET_OS_IPHONE == 0 && !defined(ICE_NO_KQUEUE)
+#elif (defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && TARGET_OS_IPHONE == 0 && !defined(ICE_NO_KQUEUE)
 #   define ICE_USE_KQUEUE 1
 #elif defined(__APPLE__) && !defined(ICE_NO_CFSTREAM)
 #   define ICE_USE_CFSTREAM 1