From 21c1ba295bc813f35a638b3867234c63dac1816e Mon Sep 17 00:00:00 2001 From: Jose Date: Tue, 17 Feb 2015 17:08:54 +0100 Subject: Fixed (ICE-5740) - IcePatch2 has issues with 'large' files. --- cpp/demo/Freeze/library/.depend.mak | 16 +- cpp/demo/Freeze/phonebook/.depend.mak | 16 +- cpp/demo/IcePatch2/MFC/PatchClientDlg.cpp | 2 +- cpp/demo/Manual/evictor_filesystem/.depend.mak | 12 +- cpp/demo/Manual/lifecycle/.depend.mak | 12 +- cpp/demo/Manual/map_filesystem/.depend.mak | 12 +- cpp/include/IcePatch2/ClientUtil.h | 86 ++-- cpp/include/IcePatch2/IcePatch2.h | 13 + cpp/include/IcePatch2/Util.h | 192 --------- cpp/src/FreezeScript/.depend.mak | 358 +++++++-------- cpp/src/Ice/.depend.mak | 204 ++++++++- cpp/src/IceGrid/.depend.mak | 520 +++++++++++----------- cpp/src/IceGrid/Activator.cpp | 4 +- cpp/src/IceGrid/DescriptorParser.cpp | 6 +- cpp/src/IceGrid/IceGridNode.cpp | 8 +- cpp/src/IceGrid/NodeCache.cpp | 2 - cpp/src/IceGrid/NodeI.cpp | 9 +- cpp/src/IceGrid/PlatformInfo.cpp | 2 +- cpp/src/IceGrid/ServerI.cpp | 20 +- cpp/src/IceGrid/Util.cpp | 1 - cpp/src/IcePatch2/.depend.mak | 9 +- cpp/src/IcePatch2/Calc.cpp | 25 +- cpp/src/IcePatch2/Client.cpp | 5 +- cpp/src/IcePatch2/FileServerI.cpp | 128 ++++-- cpp/src/IcePatch2/FileServerI.h | 29 +- cpp/src/IcePatch2/Server.cpp | 6 +- cpp/src/IcePatch2Lib/.depend.mak | 5 +- cpp/src/IcePatch2Lib/ClientUtil.cpp | 575 ++++++++++++++----------- cpp/src/IcePatch2Lib/Makefile | 2 +- cpp/src/IcePatch2Lib/Makefile.mak | 2 +- cpp/src/IcePatch2Lib/Util.cpp | 212 ++++++--- cpp/src/IcePatch2Lib/Util.h | 207 +++++++++ cpp/src/IceSSL/.depend.mak | 5 +- cpp/src/IceStorm/.depend.mak | 18 +- cpp/src/Slice/.depend.mak | 44 +- cpp/test/Ice/background/.depend.mak | 13 +- cpp/test/IceUtil/thread/.depend.mak | 34 ++ 37 files changed, 1617 insertions(+), 1197 deletions(-) create mode 100644 cpp/include/IcePatch2/IcePatch2.h delete mode 100644 cpp/include/IcePatch2/Util.h create mode 100644 cpp/src/IcePatch2Lib/Util.h (limited to 'cpp') diff --git a/cpp/demo/Freeze/library/.depend.mak b/cpp/demo/Freeze/library/.depend.mak index 26cb39fdded..6325336de36 100755 --- a/cpp/demo/Freeze/library/.depend.mak +++ b/cpp/demo/Freeze/library/.depend.mak @@ -198,8 +198,8 @@ Client.obj: \ "Parser.h" \ "Library.h" \ -Grammar.obj: \ - Grammar.cpp \ +Parser.obj: \ + Parser.cpp \ "Parser.h" \ "$(includedir)\Ice\Ice.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ @@ -316,8 +316,8 @@ Grammar.obj: \ "$(includedir)\Ice\Service.h" \ "Library.h" \ -Parser.obj: \ - Parser.cpp \ +RunParser.obj: \ + RunParser.cpp \ "Parser.h" \ "$(includedir)\Ice\Ice.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ @@ -434,11 +434,11 @@ Parser.obj: \ "$(includedir)\Ice\Service.h" \ "Library.h" \ -RunParser.obj: \ - RunParser.cpp \ +Grammar.obj: \ + Grammar.cpp \ + "$(includedir)\IceUtil\PushDisableWarnings.h" \ "Parser.h" \ "$(includedir)\Ice\Ice.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ @@ -556,9 +556,9 @@ Scanner.obj: \ Scanner.cpp \ "$(includedir)\IceUtil\ScannerConfig.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\IceUtil\PushDisableWarnings.h" \ "Parser.h" \ "$(includedir)\Ice\Ice.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ diff --git a/cpp/demo/Freeze/phonebook/.depend.mak b/cpp/demo/Freeze/phonebook/.depend.mak index 811ec46b4a5..1071719e8f4 100755 --- a/cpp/demo/Freeze/phonebook/.depend.mak +++ b/cpp/demo/Freeze/phonebook/.depend.mak @@ -199,8 +199,8 @@ Client.obj: \ "$(includedir)\Ice\Service.h" \ "PhoneBook.h" \ -Grammar.obj: \ - Grammar.cpp \ +Parser.obj: \ + Parser.cpp \ "Parser.h" \ "$(includedir)\Ice\Ice.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ @@ -317,8 +317,8 @@ Grammar.obj: \ "$(includedir)\Ice\Service.h" \ "PhoneBook.h" \ -Parser.obj: \ - Parser.cpp \ +RunParser.obj: \ + RunParser.cpp \ "Parser.h" \ "$(includedir)\Ice\Ice.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ @@ -435,11 +435,11 @@ Parser.obj: \ "$(includedir)\Ice\Service.h" \ "PhoneBook.h" \ -RunParser.obj: \ - RunParser.cpp \ +Grammar.obj: \ + Grammar.cpp \ + "$(includedir)\IceUtil\PushDisableWarnings.h" \ "Parser.h" \ "$(includedir)\Ice\Ice.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ @@ -557,9 +557,9 @@ Scanner.obj: \ Scanner.cpp \ "$(includedir)\IceUtil\ScannerConfig.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\IceUtil\PushDisableWarnings.h" \ "Parser.h" \ "$(includedir)\Ice\Ice.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ diff --git a/cpp/demo/IcePatch2/MFC/PatchClientDlg.cpp b/cpp/demo/IcePatch2/MFC/PatchClientDlg.cpp index 8dafedc7dd1..a77bc4aafc5 100644 --- a/cpp/demo/IcePatch2/MFC/PatchClientDlg.cpp +++ b/cpp/demo/IcePatch2/MFC/PatchClientDlg.cpp @@ -414,7 +414,7 @@ CPatchDlg::OnStartPatch() properties->setProperty("IcePatch2Client.Remove", remove); DialogPatcherFeedbackPtr feedback = new DialogPatcherFeedback(this); - IcePatch2::PatcherPtr patcher = new IcePatch2::Patcher(_communicator, feedback); + IcePatch2::PatcherPtr patcher = IcePatch2::PatcherFactory::create(_communicator, feedback); // // Disable a few controls during the patch process. diff --git a/cpp/demo/Manual/evictor_filesystem/.depend.mak b/cpp/demo/Manual/evictor_filesystem/.depend.mak index 50006e9f5c3..510e63e9c84 100755 --- a/cpp/demo/Manual/evictor_filesystem/.depend.mak +++ b/cpp/demo/Manual/evictor_filesystem/.depend.mak @@ -202,8 +202,8 @@ Client.obj: \ "Filesystem.h" \ "Parser.h" \ -Grammar.obj: \ - Grammar.cpp \ +Parser.obj: \ + Parser.cpp \ "Parser.h" \ "$(includedir)\Ice\Ice.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ @@ -320,11 +320,11 @@ Grammar.obj: \ "$(includedir)\Ice\Service.h" \ "Filesystem.h" \ -Parser.obj: \ - Parser.cpp \ +Grammar.obj: \ + Grammar.cpp \ + "$(includedir)\IceUtil\PushDisableWarnings.h" \ "Parser.h" \ "$(includedir)\Ice\Ice.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ @@ -442,9 +442,9 @@ Scanner.obj: \ Scanner.cpp \ "$(includedir)\IceUtil\ScannerConfig.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\IceUtil\PushDisableWarnings.h" \ "Parser.h" \ "$(includedir)\Ice\Ice.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ diff --git a/cpp/demo/Manual/lifecycle/.depend.mak b/cpp/demo/Manual/lifecycle/.depend.mak index 8604cd43a93..be84dd78df8 100755 --- a/cpp/demo/Manual/lifecycle/.depend.mak +++ b/cpp/demo/Manual/lifecycle/.depend.mak @@ -198,8 +198,8 @@ Client.obj: \ "Filesystem.h" \ "Parser.h" \ -Grammar.obj: \ - Grammar.cpp \ +Parser.obj: \ + Parser.cpp \ "Parser.h" \ "$(includedir)\Ice\Ice.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ @@ -316,11 +316,11 @@ Grammar.obj: \ "$(includedir)\Ice\Service.h" \ "Filesystem.h" \ -Parser.obj: \ - Parser.cpp \ +Grammar.obj: \ + Grammar.cpp \ + "$(includedir)\IceUtil\PushDisableWarnings.h" \ "Parser.h" \ "$(includedir)\Ice\Ice.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ @@ -438,9 +438,9 @@ Scanner.obj: \ Scanner.cpp \ "$(includedir)\IceUtil\ScannerConfig.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\IceUtil\PushDisableWarnings.h" \ "Parser.h" \ "$(includedir)\Ice\Ice.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ diff --git a/cpp/demo/Manual/map_filesystem/.depend.mak b/cpp/demo/Manual/map_filesystem/.depend.mak index 05f84a90191..286ae9153f1 100755 --- a/cpp/demo/Manual/map_filesystem/.depend.mak +++ b/cpp/demo/Manual/map_filesystem/.depend.mak @@ -203,8 +203,8 @@ Client.obj: \ "Filesystem.h" \ "Parser.h" \ -Grammar.obj: \ - Grammar.cpp \ +Parser.obj: \ + Parser.cpp \ "Parser.h" \ "$(includedir)\Ice\Ice.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ @@ -321,11 +321,11 @@ Grammar.obj: \ "$(includedir)\Ice\Service.h" \ "Filesystem.h" \ -Parser.obj: \ - Parser.cpp \ +Grammar.obj: \ + Grammar.cpp \ + "$(includedir)\IceUtil\PushDisableWarnings.h" \ "Parser.h" \ "$(includedir)\Ice\Ice.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ @@ -443,9 +443,9 @@ Scanner.obj: \ Scanner.cpp \ "$(includedir)\IceUtil\ScannerConfig.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\IceUtil\PushDisableWarnings.h" \ "Parser.h" \ "$(includedir)\Ice\Ice.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ diff --git a/cpp/include/IcePatch2/ClientUtil.h b/cpp/include/IcePatch2/ClientUtil.h index 6026b489756..b8739aff9ff 100644 --- a/cpp/include/IcePatch2/ClientUtil.h +++ b/cpp/include/IcePatch2/ClientUtil.h @@ -68,12 +68,8 @@ public: virtual bool patchProgress(Ice::Long, Ice::Long, Ice::Long, Ice::Long) = 0; virtual bool patchEnd() = 0; }; - typedef IceUtil::Handle PatcherFeedbackPtr; -class Decompressor; -typedef IceUtil::Handle DecompressorPtr; - // // IcePatch2 clients instantiate the IcePatch2::Patcher class to patch // a given local data directory. @@ -81,30 +77,6 @@ typedef IceUtil::Handle DecompressorPtr; class ICE_PATCH2_API Patcher : public IceUtil::Shared { public: - - // - // Create a patcher using configuration properties. The following - // properties are used to configure the patcher: - // - // - IcePatch2.InstanceName - // - IcePatch2.Endpoints - // - IcePatch2.Directory - // - IcePatch2.Thorough - // - IcePatch2.ChunkSize - // - IcePatch2.Remove - // - // See the Ice manual for more information on these properties. - // - Patcher(const Ice::CommunicatorPtr&, const PatcherFeedbackPtr&); - - // - // Create a patcher with the given parameters. These parameters - // are equivalent to the configuration properties described above. - // - Patcher(const FileServerPrx&, const PatcherFeedbackPtr&, const std::string&, bool, Ice::Int, Ice::Int); - - virtual ~Patcher(); - // // Prepare the patching. This involves creating the local checksum // files if no summary file exists or if a thorough patch was @@ -116,7 +88,7 @@ public: // necessary, but the user chose not to patch thorough), or raises // std::string as an exception if there was an error. // - bool prepare(); + virtual bool prepare() = 0; // // Patch the files from the given path. @@ -125,41 +97,47 @@ public: // aborted by the user, or raises std::string as an exception if // there was an error. // - bool patch(const std::string&); + virtual bool patch(const std::string&) = 0; // // Finish the patching. This needs to be called once when the // patching is finished to write the local checksum files to the // disk. // - void finish(); - -private: - - void init(const FileServerPrx&); - bool removeFiles(const FileInfoSeq&); - bool updateFiles(const FileInfoSeq&); - bool updateFilesInternal(const FileInfoSeq&, const DecompressorPtr&); - bool updateFlags(const FileInfoSeq&); - - const PatcherFeedbackPtr _feedback; - const std::string _dataDir; - const bool _thorough; - const Ice::Int _chunkSize; - const Ice::Int _remove; - const FileServerPrx _serverCompress; - const FileServerPrx _serverNoCompress; + virtual void finish() = 0; +}; +typedef IceUtil::Handle PatcherPtr; - FileInfoSeq _localFiles; - FileInfoSeq _updateFiles; - FileInfoSeq _updateFlags; - FileInfoSeq _removeFiles; +// +// IcePatch2 clients instantiate the IcePatch2::Patcher class +// using the patcher factory. +// +class ICE_PATCH2_API PatcherFactory : public IceUtil::noncopyable +{ +public: + + // + // Create a patcher using configuration properties. The following + // properties are used to configure the patcher: + // + // - IcePatch2.InstanceName + // - IcePatch2.Endpoints + // - IcePatch2.Directory + // - IcePatch2.Thorough + // - IcePatch2.ChunkSize + // - IcePatch2.Remove + // + // See the Ice manual for more information on these properties. + // + static PatcherPtr create(const Ice::CommunicatorPtr&, const PatcherFeedbackPtr&); - FILE* _log; + // + // Create a patcher with the given parameters. These parameters + // are equivalent to the configuration properties described above. + // + static PatcherPtr create(const FileServerPrx&, const PatcherFeedbackPtr&, const std::string&, bool, Ice::Int, Ice::Int); }; -typedef IceUtil::Handle PatcherPtr; - } #endif diff --git a/cpp/include/IcePatch2/IcePatch2.h b/cpp/include/IcePatch2/IcePatch2.h new file mode 100644 index 00000000000..53826404ec4 --- /dev/null +++ b/cpp/include/IcePatch2/IcePatch2.h @@ -0,0 +1,13 @@ +// ********************************************************************** +// +// 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 +#include +#include +#include diff --git a/cpp/include/IcePatch2/Util.h b/cpp/include/IcePatch2/Util.h deleted file mode 100644 index 40cce738a5b..00000000000 --- a/cpp/include/IcePatch2/Util.h +++ /dev/null @@ -1,192 +0,0 @@ -// ********************************************************************** -// -// 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. -// -// ********************************************************************** - -#ifndef ICE_PATCH2_UTIL_H -#define ICE_PATCH2_UTIL_H - -#include -#include -#include - -namespace IcePatch2 -{ - -ICE_PATCH2_API extern const char* checksumFile; -ICE_PATCH2_API extern const char* logFile; - -ICE_PATCH2_API std::string lastError(); - -ICE_PATCH2_API std::string bytesToString(const Ice::ByteSeq&); -ICE_PATCH2_API Ice::ByteSeq stringToBytes(const std::string&); - -ICE_PATCH2_API std::string simplify(const std::string&); - -ICE_PATCH2_API bool isRoot(const std::string&); - -ICE_PATCH2_API std::string getSuffix(const std::string&); -ICE_PATCH2_API std::string getWithoutSuffix(const std::string&); -ICE_PATCH2_API bool ignoreSuffix(const std::string&); - -ICE_PATCH2_API std::string getBasename(const std::string&); -ICE_PATCH2_API std::string getDirname(const std::string&); - -ICE_PATCH2_API void rename(const std::string&, const std::string&); - -ICE_PATCH2_API void remove(const std::string&); -ICE_PATCH2_API void removeRecursive(const std::string&); - -ICE_PATCH2_API Ice::StringSeq readDirectory(const std::string&); - -ICE_PATCH2_API void createDirectory(const std::string&); -ICE_PATCH2_API void createDirectoryRecursive(const std::string&); - -ICE_PATCH2_API void compressBytesToFile(const std::string&, const Ice::ByteSeq&, Ice::Int); -ICE_PATCH2_API void decompressFile(const std::string&); -ICE_PATCH2_API void setFileFlags(const std::string&, const FileInfo&); - -struct FileInfoEqual: public std::binary_function -{ - bool - operator()(const FileInfo& lhs, const FileInfo& rhs) - { - if(lhs.path != rhs.path) - { - return false; - } - - // - // For the size portion of the comparison, we only distinquish - // between file (size >= 0) and directory (size == -1). We do - // not take the actual size into account, as it might be set - // to 0 if no compressed file is available. - // - Ice::Int lsz = lhs.size > 0 ? 0 : lhs.size; - Ice::Int rsz = rhs.size > 0 ? 0 : rhs.size; - if(lsz != rsz) - { - return false; - } - - if(lhs.executable != rhs.executable) - { - return false; - } - - return lhs.checksum == rhs.checksum; - } -}; - -struct FileInfoWithoutFlagsLess: public std::binary_function -{ - bool - operator()(const FileInfo& lhs, const FileInfo& rhs) - { - return compareWithoutFlags(lhs, rhs) < 0; - } - - int - compareWithoutFlags(const FileInfo& lhs, const FileInfo& rhs) - { - if(lhs.path < rhs.path) - { - return -1; - } - else if(rhs.path < lhs.path) - { - return 1; - } - - // - // For the size portion of the comparison, we only distinquish - // between file (size >= 0) and directory (size == -1). We do - // not take the actual size into account, as it might be set - // to 0 if no compressed file is available. - // - Ice::Int lsz = lhs.size > 0 ? 0 : lhs.size; - Ice::Int rsz = rhs.size > 0 ? 0 : rhs.size; - if(lsz < rsz) - { - return -1; - } - else if(rsz < lsz) - { - return 1; - } - - if(lhs.checksum < rhs.checksum) - { - return -1; - } - else if(rhs.checksum < lhs.checksum) - { - return 1; - } - - return 0; - } -}; - -struct FileInfoLess : public FileInfoWithoutFlagsLess -{ - bool - operator()(const FileInfo& lhs, const FileInfo& rhs) - { - int rc = compareWithoutFlags(lhs, rhs); - if(rc < 0) - { - return true; - } - else if(rc > 0) - { - return false; - } - - return lhs.executable < rhs.executable; - } -}; - -class ICE_PATCH2_API GetFileInfoSeqCB -{ -public: - - virtual ~GetFileInfoSeqCB() { } - - virtual bool remove(const std::string&) = 0; - virtual bool checksum(const std::string&) = 0; - virtual bool compress(const std::string&) = 0; -}; - -ICE_PATCH2_API bool getFileInfoSeq(const std::string&, int, GetFileInfoSeqCB*, FileInfoSeq&); -ICE_PATCH2_API bool getFileInfoSeqSubDir(const std::string&, const std::string&, int, GetFileInfoSeqCB*, FileInfoSeq&); - -ICE_PATCH2_API void saveFileInfoSeq(const std::string&, const FileInfoSeq&); -ICE_PATCH2_API void loadFileInfoSeq(const std::string&, FileInfoSeq&); - -ICE_PATCH2_API bool readFileInfo(FILE*, FileInfo&); -ICE_PATCH2_API bool writeFileInfo(FILE*, const FileInfo&); - -struct FileTree1 -{ - FileInfoSeq files; - Ice::ByteSeq checksum; -}; - -typedef std::vector FileTree1Seq; - -struct FileTree0 -{ - FileTree1Seq nodes; - Ice::ByteSeq checksum; -}; - -ICE_PATCH2_API void getFileTree0(const FileInfoSeq&, FileTree0&); - -} - -#endif diff --git a/cpp/src/FreezeScript/.depend.mak b/cpp/src/FreezeScript/.depend.mak index b62cbf693bb..ce220dc0f43 100755 --- a/cpp/src/FreezeScript/.depend.mak +++ b/cpp/src/FreezeScript/.depend.mak @@ -1,8 +1,7 @@ -Grammar.obj: \ - Grammar.cpp \ - "GrammarUtil.h" \ - "Parser.h" \ +AssignVisitor.obj: \ + AssignVisitor.cpp \ + "AssignVisitor.h" \ "Data.h" \ "$(includedir)\Ice\Ice.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ @@ -119,17 +118,17 @@ Grammar.obj: \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Slice\Parser.h" \ "Error.h" \ + "Util.h" \ + "$(includedir)\Freeze\CatalogData.h" \ -Scanner.obj: \ - Scanner.cpp \ - "$(includedir)\IceUtil\ScannerConfig.h" \ - "$(includedir)\IceUtil\Config.h" \ - "GrammarUtil.h" \ - "Parser.h" \ +Data.obj: \ + Data.cpp \ + "$(includedir)\IceUtil\DisableWarnings.h" \ "Data.h" \ "$(includedir)\Ice\Ice.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ + "$(includedir)\IceUtil\Config.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -241,12 +240,89 @@ Scanner.obj: \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Slice\Parser.h" \ "Error.h" \ - "Grammar.h" \ + "Util.h" \ + "$(includedir)\Freeze\CatalogData.h" \ + "Exception.h" \ "$(includedir)\IceUtil\InputUtil.h" \ -AssignVisitor.obj: \ - AssignVisitor.cpp \ - "AssignVisitor.h" \ +Error.obj: \ + Error.cpp \ + "Error.h" \ + "$(includedir)\Slice\Parser.h" \ + "$(includedir)\IceUtil\Shared.h" \ + "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Exception.h" \ + "Exception.h" \ + "Util.h" \ + "$(includedir)\Ice\Initialize.h" \ + "$(includedir)\IceUtil\Timer.h" \ + "$(includedir)\IceUtil\Thread.h" \ + "$(includedir)\IceUtil\Mutex.h" \ + "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\ThreadException.h" \ + "$(includedir)\IceUtil\Time.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ + "$(includedir)\IceUtil\PushDisableWarnings.h" \ + "$(includedir)\Ice\ProxyF.h" \ + "$(includedir)\Ice\Config.h" \ + "$(includedir)\Ice\ProxyHandle.h" \ + "$(includedir)\Ice\ObjectF.h" \ + "$(includedir)\Ice\Handle.h" \ + "$(includedir)\Ice\Exception.h" \ + "$(includedir)\Ice\Format.h" \ + "$(includedir)\Ice\StreamF.h" \ + "$(includedir)\Ice\LocalObject.h" \ + "$(includedir)\Ice\LocalObjectF.h" \ + "$(includedir)\Ice\StreamHelpers.h" \ + "$(includedir)\IceUtil\ScopedArray.h" \ + "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\IceUtil\Optional.h" \ + "$(includedir)\IceUtil\UndefSysMacros.h" \ + "$(includedir)\IceUtil\PopDisableWarnings.h" \ + "$(includedir)\Ice\PropertiesF.h" \ + "$(includedir)\Ice\Proxy.h" \ + "$(includedir)\Ice\ProxyFactoryF.h" \ + "$(includedir)\Ice\ConnectionIF.h" \ + "$(includedir)\Ice\RequestHandlerF.h" \ + "$(includedir)\Ice\EndpointF.h" \ + "$(includedir)\Ice\EndpointTypes.h" \ + "$(includedir)\Ice\ObjectAdapterF.h" \ + "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\AsyncResult.h" \ + "$(includedir)\IceUtil\UniquePtr.h" \ + "$(includedir)\Ice\ConnectionF.h" \ + "$(includedir)\Ice\InstanceF.h" \ + "$(includedir)\Ice\AsyncResultF.h" \ + "$(includedir)\Ice\ObserverHelper.h" \ + "$(includedir)\Ice\Instrumentation.h" \ + "$(includedir)\Ice\Current.h" \ + "$(includedir)\Ice\Identity.h" \ + "$(includedir)\Ice\Version.h" \ + "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\Object.h" \ + "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\Buffer.h" \ + "$(includedir)\Ice\Protocol.h" \ + "$(includedir)\Ice\SlicedDataF.h" \ + "$(includedir)\Ice\UserExceptionFactory.h" \ + "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LoggerF.h" \ + "$(includedir)\Ice\InstrumentationF.h" \ + "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Freeze\CatalogData.h" \ + +Functions.obj: \ + Functions.cpp \ + "Functions.h" \ "Data.h" \ "$(includedir)\Ice\Ice.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ @@ -365,10 +441,18 @@ AssignVisitor.obj: \ "Error.h" \ "Util.h" \ "$(includedir)\Freeze\CatalogData.h" \ + "$(includedir)\IceUtil\UUID.h" \ + "$(includedir)\IceUtil\StringUtil.h" \ -Data.obj: \ - Data.cpp \ - "$(includedir)\IceUtil\DisableWarnings.h" \ +Exception.obj: \ + Exception.cpp \ + "Exception.h" \ + "$(includedir)\IceUtil\Exception.h" \ + "$(includedir)\IceUtil\Config.h" \ + +Parser.obj: \ + Parser.cpp \ + "Parser.h" \ "Data.h" \ "$(includedir)\Ice\Ice.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ @@ -485,89 +569,11 @@ Data.obj: \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Slice\Parser.h" \ "Error.h" \ - "Util.h" \ - "$(includedir)\Freeze\CatalogData.h" \ - "Exception.h" \ - "$(includedir)\IceUtil\InputUtil.h" \ - -Error.obj: \ - Error.cpp \ - "Error.h" \ - "$(includedir)\Slice\Parser.h" \ - "$(includedir)\IceUtil\Shared.h" \ - "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Exception.h" \ - "Exception.h" \ - "Util.h" \ - "$(includedir)\Ice\Initialize.h" \ - "$(includedir)\IceUtil\Timer.h" \ - "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\Monitor.h" \ - "$(includedir)\IceUtil\Cond.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\Ice\ProxyF.h" \ - "$(includedir)\Ice\Config.h" \ - "$(includedir)\Ice\ProxyHandle.h" \ - "$(includedir)\Ice\ObjectF.h" \ - "$(includedir)\Ice\Handle.h" \ - "$(includedir)\Ice\Exception.h" \ - "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ - "$(includedir)\Ice\LocalObject.h" \ - "$(includedir)\Ice\LocalObjectF.h" \ - "$(includedir)\Ice\StreamHelpers.h" \ - "$(includedir)\IceUtil\ScopedArray.h" \ - "$(includedir)\IceUtil\Iterator.h" \ - "$(includedir)\IceUtil\Optional.h" \ - "$(includedir)\IceUtil\UndefSysMacros.h" \ - "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\Proxy.h" \ - "$(includedir)\Ice\ProxyFactoryF.h" \ - "$(includedir)\Ice\ConnectionIF.h" \ - "$(includedir)\Ice\RequestHandlerF.h" \ - "$(includedir)\Ice\EndpointF.h" \ - "$(includedir)\Ice\EndpointTypes.h" \ - "$(includedir)\Ice\ObjectAdapterF.h" \ - "$(includedir)\Ice\ReferenceF.h" \ - "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\IceUtil\UniquePtr.h" \ - "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\InstanceF.h" \ - "$(includedir)\Ice\AsyncResultF.h" \ - "$(includedir)\Ice\ObserverHelper.h" \ - "$(includedir)\Ice\Instrumentation.h" \ - "$(includedir)\Ice\Current.h" \ - "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\Ice\Object.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ - "$(includedir)\Ice\Buffer.h" \ - "$(includedir)\Ice\Protocol.h" \ - "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ - "$(includedir)\Ice\LoggerF.h" \ - "$(includedir)\Ice\InstrumentationF.h" \ - "$(includedir)\Ice\Dispatcher.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\Plugin.h" \ - "$(includedir)\Freeze\CatalogData.h" \ + "GrammarUtil.h" \ -Functions.obj: \ - Functions.cpp \ - "Functions.h" \ +Print.obj: \ + Print.cpp \ + "Print.h" \ "Data.h" \ "$(includedir)\Ice\Ice.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ @@ -686,30 +692,31 @@ Functions.obj: \ "Error.h" \ "Util.h" \ "$(includedir)\Freeze\CatalogData.h" \ - "$(includedir)\IceUtil\UUID.h" \ - "$(includedir)\IceUtil\StringUtil.h" \ - -Exception.obj: \ - Exception.cpp \ - "Exception.h" \ - "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\IceUtil\OutputUtil.h" \ -Parser.obj: \ - Parser.cpp \ - "Parser.h" \ - "Data.h" \ - "$(includedir)\Ice\Ice.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\Ice\Config.h" \ +Util.obj: \ + Util.cpp \ + "Util.h" \ + "$(includedir)\Slice\Parser.h" \ + "$(includedir)\IceUtil\Shared.h" \ "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\Ice\DeprecatedStringConverter.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Exception.h" \ + "$(includedir)\Ice\Initialize.h" \ + "$(includedir)\IceUtil\Timer.h" \ + "$(includedir)\IceUtil\Thread.h" \ + "$(includedir)\IceUtil\Mutex.h" \ + "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\ThreadException.h" \ + "$(includedir)\IceUtil\Time.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\Ice\CommunicatorF.h" \ + "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\ProxyF.h" \ - "$(includedir)\IceUtil\Shared.h" \ + "$(includedir)\Ice\Config.h" \ "$(includedir)\Ice\ProxyHandle.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Exception.h" \ "$(includedir)\Ice\ObjectF.h" \ "$(includedir)\Ice\Handle.h" \ "$(includedir)\Ice\Exception.h" \ @@ -723,20 +730,6 @@ Parser.obj: \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\Ice\Plugin.h" \ - "$(includedir)\Ice\LoggerF.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\Initialize.h" \ - "$(includedir)\IceUtil\Timer.h" \ - "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\Monitor.h" \ - "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\Ice\ProxyFactoryF.h" \ @@ -757,6 +750,7 @@ Parser.obj: \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ "$(includedir)\Ice\ObjectFactoryF.h" \ @@ -766,8 +760,17 @@ Parser.obj: \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Freeze\CatalogData.h" \ + "Exception.h" \ + "$(includedir)\Freeze\Catalog.h" \ + "$(includedir)\Freeze\Map.h" \ + "$(includedir)\Ice\Ice.h" \ + "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -812,13 +815,20 @@ Parser.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "$(includedir)\Slice\Parser.h" \ - "Error.h" \ - "GrammarUtil.h" \ + "$(includedir)\Freeze\DB.h" \ + "$(includedir)\Freeze\Exception.h" \ + "$(includedir)\Freeze\Connection.h" \ + "$(includedir)\Freeze\Transaction.h" \ + "$(includedir)\Freeze\Initialize.h" \ + "$(includedir)\Freeze\EvictorF.h" \ + "$(includedir)\Freeze\ConnectionF.h" \ + "$(includedir)\Freeze\Index.h" \ + "$(includedir)\Slice\Preprocessor.h" \ -Print.obj: \ - Print.cpp \ - "Print.h" \ +Grammar.obj: \ + Grammar.cpp \ + "GrammarUtil.h" \ + "Parser.h" \ "Data.h" \ "$(includedir)\Ice\Ice.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ @@ -935,33 +945,24 @@ Print.obj: \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Slice\Parser.h" \ "Error.h" \ - "Util.h" \ - "$(includedir)\Freeze\CatalogData.h" \ - "$(includedir)\IceUtil\OutputUtil.h" \ -Util.obj: \ - Util.cpp \ - "Util.h" \ - "$(includedir)\Slice\Parser.h" \ - "$(includedir)\IceUtil\Shared.h" \ +Scanner.obj: \ + Scanner.cpp \ + "$(includedir)\IceUtil\ScannerConfig.h" \ "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\Ice\Initialize.h" \ - "$(includedir)\IceUtil\Timer.h" \ - "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\Monitor.h" \ - "$(includedir)\IceUtil\Cond.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ + "GrammarUtil.h" \ + "Parser.h" \ + "Data.h" \ + "$(includedir)\Ice\Ice.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\Ice\ProxyF.h" \ "$(includedir)\Ice\Config.h" \ + "$(includedir)\Ice\DeprecatedStringConverter.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ + "$(includedir)\Ice\ProxyF.h" \ + "$(includedir)\IceUtil\Shared.h" \ "$(includedir)\Ice\ProxyHandle.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Exception.h" \ "$(includedir)\Ice\ObjectF.h" \ "$(includedir)\Ice\Handle.h" \ "$(includedir)\Ice\Exception.h" \ @@ -975,6 +976,20 @@ Util.obj: \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ + "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\LoggerF.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\Initialize.h" \ + "$(includedir)\IceUtil\Timer.h" \ + "$(includedir)\IceUtil\Thread.h" \ + "$(includedir)\IceUtil\Mutex.h" \ + "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\ThreadException.h" \ + "$(includedir)\IceUtil\Time.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\Ice\ProxyFactoryF.h" \ @@ -995,7 +1010,6 @@ Util.obj: \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ "$(includedir)\Ice\BasicStream.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ "$(includedir)\Ice\ObjectFactoryF.h" \ @@ -1005,17 +1019,8 @@ Util.obj: \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\Plugin.h" \ - "$(includedir)\Freeze\CatalogData.h" \ - "Exception.h" \ - "$(includedir)\Freeze\Catalog.h" \ - "$(includedir)\Freeze\Map.h" \ - "$(includedir)\Ice\Ice.h" \ - "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1060,15 +1065,10 @@ Util.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "$(includedir)\Freeze\DB.h" \ - "$(includedir)\Freeze\Exception.h" \ - "$(includedir)\Freeze\Connection.h" \ - "$(includedir)\Freeze\Transaction.h" \ - "$(includedir)\Freeze\Initialize.h" \ - "$(includedir)\Freeze\EvictorF.h" \ - "$(includedir)\Freeze\ConnectionF.h" \ - "$(includedir)\Freeze\Index.h" \ - "$(includedir)\Slice\Preprocessor.h" \ + "$(includedir)\Slice\Parser.h" \ + "Error.h" \ + "Grammar.h" \ + "$(includedir)\IceUtil\InputUtil.h" \ TransformAnalyzer.obj: \ TransformAnalyzer.cpp \ diff --git a/cpp/src/Ice/.depend.mak b/cpp/src/Ice/.depend.mak index a89b1a23e30..279afd0043c 100755 --- a/cpp/src/Ice/.depend.mak +++ b/cpp/src/Ice/.depend.mak @@ -1846,6 +1846,100 @@ EndpointFactory.obj: \ "$(includedir)\Ice\Config.h" \ "EndpointFactoryF.h" \ "ProtocolInstanceF.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ + "$(includedir)\IceUtil\PushDisableWarnings.h" \ + "$(includedir)\Ice\ProxyF.h" \ + "$(includedir)\Ice\ProxyHandle.h" \ + "$(includedir)\Ice\ObjectF.h" \ + "$(includedir)\Ice\Exception.h" \ + "$(includedir)\Ice\Format.h" \ + "$(includedir)\Ice\StreamF.h" \ + "$(includedir)\Ice\LocalObject.h" \ + "$(includedir)\Ice\LocalObjectF.h" \ + "$(includedir)\Ice\StreamHelpers.h" \ + "$(includedir)\IceUtil\ScopedArray.h" \ + "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\IceUtil\Optional.h" \ + "$(includedir)\IceUtil\UndefSysMacros.h" \ + "$(includedir)\IceUtil\PopDisableWarnings.h" \ + "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\LoggerF.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ + "Instance.h" \ + "$(includedir)\IceUtil\Mutex.h" \ + "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\ThreadException.h" \ + "$(includedir)\IceUtil\Time.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\RecMutex.h" \ + "$(includedir)\IceUtil\Timer.h" \ + "$(includedir)\IceUtil\Thread.h" \ + "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\InstanceF.h" \ + "$(includedir)\Ice\InstrumentationF.h" \ + "TraceLevelsF.h" \ + "DefaultsAndOverridesF.h" \ + "RouterInfoF.h" \ + "LocatorInfoF.h" \ + "ReferenceFactoryF.h" \ + "$(includedir)\Ice\ProxyFactoryF.h" \ + "$(includedir)\Ice\ThreadPoolF.h" \ + "$(includedir)\Ice\ConnectionFactoryF.h" \ + "ACM.h" \ + "$(includedir)\Ice\ACMF.h" \ + "$(includedir)\Ice\Connection.h" \ + "$(includedir)\Ice\Proxy.h" \ + "$(includedir)\Ice\ConnectionIF.h" \ + "$(includedir)\Ice\RequestHandlerF.h" \ + "$(includedir)\Ice\EndpointF.h" \ + "$(includedir)\Ice\EndpointTypes.h" \ + "$(includedir)\Ice\ObjectAdapterF.h" \ + "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\AsyncResult.h" \ + "$(includedir)\IceUtil\UniquePtr.h" \ + "$(includedir)\Ice\ConnectionF.h" \ + "$(includedir)\Ice\AsyncResultF.h" \ + "$(includedir)\Ice\ObserverHelper.h" \ + "$(includedir)\Ice\Instrumentation.h" \ + "$(includedir)\Ice\Current.h" \ + "$(includedir)\Ice\Identity.h" \ + "$(includedir)\Ice\Version.h" \ + "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\Object.h" \ + "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\Buffer.h" \ + "$(includedir)\Ice\Protocol.h" \ + "$(includedir)\Ice\SlicedDataF.h" \ + "$(includedir)\Ice\UserExceptionFactory.h" \ + "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\Endpoint.h" \ + "$(includedir)\Ice\PropertiesF.h" \ + "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ + "EndpointFactoryManagerF.h" \ + "IPEndpointIF.h" \ + "RetryQueueF.h" \ + "$(includedir)\Ice\DynamicLibraryF.h" \ + "$(includedir)\Ice\PluginF.h" \ + "NetworkF.h" \ + "NetworkProxyF.h" \ + "$(includedir)\Ice\Initialize.h" \ + "$(includedir)\Ice\Dispatcher.h" \ + "ImplicitContextI.h" \ + "$(includedir)\Ice\ImplicitContext.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\FacetMap.h" \ + "$(includedir)\Ice\Process.h" \ + "$(includedir)\Ice\GCObject.h" \ + "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Incoming.h" \ + "$(includedir)\Ice\ServantLocatorF.h" \ + "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\ResponseHandlerF.h" \ + "EndpointFactoryManager.h" \ EndpointFactoryManager.obj: \ EndpointFactoryManager.cpp \ @@ -1892,6 +1986,9 @@ EndpointFactoryManager.obj: \ "AcceptorF.h" \ "EndpointFactory.h" \ "ProtocolInstanceF.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ + "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ @@ -1914,7 +2011,6 @@ EndpointFactoryManager.obj: \ "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "TraceLevelsF.h" \ "DefaultsAndOverridesF.h" \ @@ -1937,7 +2033,6 @@ EndpointFactoryManager.obj: \ "$(includedir)\Ice\ObserverHelper.h" \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "IPEndpointIF.h" \ "RetryQueueF.h" \ @@ -1947,7 +2042,6 @@ EndpointFactoryManager.obj: \ "NetworkProxyF.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ - "$(includedir)\Ice\Plugin.h" \ "ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\FacetMap.h" \ @@ -2909,6 +3003,10 @@ Instance.obj: \ "NetworkProxy.h" \ "EndpointFactoryManager.h" \ "EndpointFactoryF.h" \ + "IPEndpointI.h" \ + "WSEndpoint.h" \ + "EndpointFactory.h" \ + "ProtocolInstance.h" \ "RequestHandlerFactory.h" \ "RetryQueue.h" \ "$(includedir)\Ice\DynamicLibrary.h" \ @@ -2921,14 +3019,9 @@ Instance.obj: \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\MetricsAdminI.h" \ "$(includedir)\Ice\MetricsFunctional.h" \ - "ProtocolInstance.h" \ "LoggerAdminI.h" \ + "RegisterPlugins.h" \ "$(includedir)\IceUtil\UUID.h" \ - "UdpEndpointI.h" \ - "IPEndpointI.h" \ - "EndpointFactory.h" \ - "TcpEndpointI.h" \ - "WSEndpoint.h" \ InstrumentationI.obj: \ InstrumentationI.cpp \ @@ -4405,6 +4498,9 @@ OpaqueEndpointI.obj: \ "EndpointFactory.h" \ "EndpointFactoryF.h" \ "ProtocolInstanceF.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ + "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -4438,14 +4534,12 @@ OpaqueEndpointI.obj: \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\AsyncResultF.h" \ "$(includedir)\Ice\ObserverHelper.h" \ "$(includedir)\Ice\Instrumentation.h" \ "Network.h" \ "NetworkF.h" \ "NetworkProxyF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "Base64.h" \ "HashUtil.h" \ "$(includedir)\Ice\LocalException.h" \ @@ -5794,6 +5888,77 @@ ReferenceFactory.obj: \ "PropertyNames.h" \ "$(includedir)\IceUtil\StringUtil.h" \ +RegisterPlugins.obj: \ + RegisterPlugins.cpp \ + "RegisterPlugins.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ + "$(includedir)\IceUtil\PushDisableWarnings.h" \ + "$(includedir)\Ice\ProxyF.h" \ + "$(includedir)\IceUtil\Shared.h" \ + "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Config.h" \ + "$(includedir)\Ice\ProxyHandle.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Exception.h" \ + "$(includedir)\Ice\ObjectF.h" \ + "$(includedir)\Ice\Handle.h" \ + "$(includedir)\Ice\Exception.h" \ + "$(includedir)\Ice\Format.h" \ + "$(includedir)\Ice\StreamF.h" \ + "$(includedir)\Ice\LocalObject.h" \ + "$(includedir)\Ice\LocalObjectF.h" \ + "$(includedir)\Ice\StreamHelpers.h" \ + "$(includedir)\IceUtil\ScopedArray.h" \ + "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\IceUtil\Optional.h" \ + "$(includedir)\IceUtil\UndefSysMacros.h" \ + "$(includedir)\IceUtil\PopDisableWarnings.h" \ + "$(includedir)\Ice\Initialize.h" \ + "$(includedir)\IceUtil\Timer.h" \ + "$(includedir)\IceUtil\Thread.h" \ + "$(includedir)\IceUtil\Mutex.h" \ + "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\ThreadException.h" \ + "$(includedir)\IceUtil\Time.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\Ice\PropertiesF.h" \ + "$(includedir)\Ice\Proxy.h" \ + "$(includedir)\Ice\ProxyFactoryF.h" \ + "$(includedir)\Ice\ConnectionIF.h" \ + "$(includedir)\Ice\RequestHandlerF.h" \ + "$(includedir)\Ice\EndpointF.h" \ + "$(includedir)\Ice\EndpointTypes.h" \ + "$(includedir)\Ice\ObjectAdapterF.h" \ + "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\AsyncResult.h" \ + "$(includedir)\IceUtil\UniquePtr.h" \ + "$(includedir)\Ice\ConnectionF.h" \ + "$(includedir)\Ice\InstanceF.h" \ + "$(includedir)\Ice\AsyncResultF.h" \ + "$(includedir)\Ice\ObserverHelper.h" \ + "$(includedir)\Ice\Instrumentation.h" \ + "$(includedir)\Ice\Current.h" \ + "$(includedir)\Ice\Identity.h" \ + "$(includedir)\Ice\Version.h" \ + "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\Object.h" \ + "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\Buffer.h" \ + "$(includedir)\Ice\Protocol.h" \ + "$(includedir)\Ice\SlicedDataF.h" \ + "$(includedir)\Ice\UserExceptionFactory.h" \ + "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LoggerF.h" \ + "$(includedir)\Ice\InstrumentationF.h" \ + "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\Plugin.h" \ + RequestHandler.obj: \ RequestHandler.cpp \ "RequestHandler.h" \ @@ -7117,6 +7282,7 @@ TcpAcceptor.obj: \ "ConnectorF.h" \ "EndpointFactory.h" \ "EndpointFactoryF.h" \ + "$(includedir)\Ice\Plugin.h" \ "ProtocolInstance.h" \ "Instance.h" \ "$(includedir)\IceUtil\RecMutex.h" \ @@ -7139,7 +7305,6 @@ TcpAcceptor.obj: \ "$(includedir)\Ice\PluginF.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ - "$(includedir)\Ice\Plugin.h" \ "ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\LocalException.h" \ @@ -7242,6 +7407,7 @@ TcpConnector.obj: \ "AcceptorF.h" \ "EndpointFactory.h" \ "EndpointFactoryF.h" \ + "$(includedir)\Ice\Plugin.h" \ "ProtocolInstance.h" \ "Instance.h" \ "$(includedir)\IceUtil\RecMutex.h" \ @@ -7264,7 +7430,6 @@ TcpConnector.obj: \ "$(includedir)\Ice\PluginF.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ - "$(includedir)\Ice\Plugin.h" \ "ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\LocalException.h" \ @@ -7359,6 +7524,7 @@ TcpEndpointI.obj: \ "ProtocolInstanceF.h" \ "EndpointFactory.h" \ "EndpointFactoryF.h" \ + "$(includedir)\Ice\Plugin.h" \ "TcpAcceptor.h" \ "Acceptor.h" \ "TcpConnector.h" \ @@ -7389,7 +7555,6 @@ TcpEndpointI.obj: \ "$(includedir)\Ice\PluginF.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ - "$(includedir)\Ice\Plugin.h" \ "ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\FacetMap.h" \ @@ -8086,6 +8251,7 @@ UdpEndpointI.obj: \ "ProtocolInstanceF.h" \ "EndpointFactory.h" \ "EndpointFactoryF.h" \ + "$(includedir)\Ice\Plugin.h" \ "UdpConnector.h" \ "Connector.h" \ "UdpTransceiver.h" \ @@ -8113,7 +8279,6 @@ UdpEndpointI.obj: \ "$(includedir)\Ice\PluginF.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ - "$(includedir)\Ice\Plugin.h" \ "ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\FacetMap.h" \ @@ -8208,6 +8373,7 @@ UdpTransceiver.obj: \ "AcceptorF.h" \ "EndpointFactory.h" \ "EndpointFactoryF.h" \ + "$(includedir)\Ice\Plugin.h" \ "$(includedir)\Ice\Connection.h" \ "ProtocolInstance.h" \ "Instance.h" \ @@ -8230,7 +8396,6 @@ UdpTransceiver.obj: \ "$(includedir)\Ice\PluginF.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ - "$(includedir)\Ice\Plugin.h" \ "ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\LocalException.h" \ @@ -8524,9 +8689,11 @@ WSEndpoint.obj: \ "EndpointFactory.h" \ "EndpointFactoryF.h" \ "ProtocolInstanceF.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ + "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstanceF.h" \ "ProtocolInstance.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ @@ -8560,7 +8727,6 @@ WSEndpoint.obj: \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ - "$(includedir)\Ice\LoggerF.h" \ "NetworkF.h" \ "Instance.h" \ "$(includedir)\IceUtil\RecMutex.h" \ @@ -8585,7 +8751,6 @@ WSEndpoint.obj: \ "NetworkProxyF.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ - "$(includedir)\Ice\Plugin.h" \ "ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\LocalException.h" \ @@ -8604,6 +8769,7 @@ WSEndpoint.obj: \ "Connector.h" \ "IPEndpointI.h" \ "HashUtil.h" \ + "EndpointFactoryManager.h" \ WSTransceiver.obj: \ WSTransceiver.cpp \ diff --git a/cpp/src/IceGrid/.depend.mak b/cpp/src/IceGrid/.depend.mak index f3352d53bc6..f3a66153016 100755 --- a/cpp/src/IceGrid/.depend.mak +++ b/cpp/src/IceGrid/.depend.mak @@ -513,7 +513,7 @@ DescriptorParser.obj: \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ "..\..\src\IceXML\Parser.h" \ - "$(includedir)\IcePatch2\Util.h" \ + "..\..\src\IcePatch2Lib\Util.h" \ "$(includedir)\IcePatch2\FileInfo.h" \ "$(includedir)\IcePatch2\Config.h" \ "$(includedir)\IceGrid\Admin.h" \ @@ -620,132 +620,6 @@ FileParserI.obj: \ "$(includedir)\Ice\FacetMap.h" \ "$(includedir)\Ice\Endpoint.h" \ -Grammar.obj: \ - Grammar.cpp \ - "$(includedir)\Ice\Ice.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\Ice\Config.h" \ - "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\Ice\DeprecatedStringConverter.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ - "$(includedir)\Ice\ProxyF.h" \ - "$(includedir)\IceUtil\Shared.h" \ - "$(includedir)\Ice\ProxyHandle.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\Ice\ObjectF.h" \ - "$(includedir)\Ice\Handle.h" \ - "$(includedir)\Ice\Exception.h" \ - "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ - "$(includedir)\Ice\LocalObject.h" \ - "$(includedir)\Ice\LocalObjectF.h" \ - "$(includedir)\Ice\StreamHelpers.h" \ - "$(includedir)\IceUtil\ScopedArray.h" \ - "$(includedir)\IceUtil\Iterator.h" \ - "$(includedir)\IceUtil\Optional.h" \ - "$(includedir)\IceUtil\UndefSysMacros.h" \ - "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\Ice\Plugin.h" \ - "$(includedir)\Ice\LoggerF.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\Initialize.h" \ - "$(includedir)\IceUtil\Timer.h" \ - "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\Monitor.h" \ - "$(includedir)\IceUtil\Cond.h" \ - "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\Proxy.h" \ - "$(includedir)\Ice\ProxyFactoryF.h" \ - "$(includedir)\Ice\ConnectionIF.h" \ - "$(includedir)\Ice\RequestHandlerF.h" \ - "$(includedir)\Ice\EndpointF.h" \ - "$(includedir)\Ice\EndpointTypes.h" \ - "$(includedir)\Ice\ObjectAdapterF.h" \ - "$(includedir)\Ice\ReferenceF.h" \ - "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\IceUtil\UniquePtr.h" \ - "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\InstanceF.h" \ - "$(includedir)\Ice\AsyncResultF.h" \ - "$(includedir)\Ice\ObserverHelper.h" \ - "$(includedir)\Ice\Instrumentation.h" \ - "$(includedir)\Ice\Current.h" \ - "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ - "$(includedir)\Ice\Object.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ - "$(includedir)\Ice\Buffer.h" \ - "$(includedir)\Ice\Protocol.h" \ - "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ - "$(includedir)\Ice\InstrumentationF.h" \ - "$(includedir)\Ice\Dispatcher.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\PropertiesAdmin.h" \ - "$(includedir)\Ice\GCObject.h" \ - "$(includedir)\IceUtil\MutexPtrLock.h" \ - "$(includedir)\Ice\Incoming.h" \ - "$(includedir)\Ice\ServantLocatorF.h" \ - "$(includedir)\Ice\ServantManagerF.h" \ - "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\IncomingAsync.h" \ - "$(includedir)\Ice\Properties.h" \ - "$(includedir)\Ice\Logger.h" \ - "$(includedir)\Ice\LoggerUtil.h" \ - "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\Communicator.h" \ - "$(includedir)\Ice\RouterF.h" \ - "$(includedir)\Ice\LocatorF.h" \ - "$(includedir)\Ice\PluginF.h" \ - "$(includedir)\Ice\ImplicitContextF.h" \ - "$(includedir)\Ice\FacetMap.h" \ - "$(includedir)\Ice\CommunicatorAsync.h" \ - "$(includedir)\Ice\ObjectAdapter.h" \ - "$(includedir)\Ice\Endpoint.h" \ - "$(includedir)\Ice\ServantLocator.h" \ - "$(includedir)\Ice\SlicedData.h" \ - "$(includedir)\Ice\OutgoingAsync.h" \ - "$(includedir)\Ice\OutgoingAsyncF.h" \ - "$(includedir)\Ice\Process.h" \ - "$(includedir)\Ice\Application.h" \ - "$(includedir)\Ice\Connection.h" \ - "$(includedir)\Ice\ConnectionAsync.h" \ - "$(includedir)\Ice\Functional.h" \ - "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ - "$(includedir)\Ice\ImplicitContext.h" \ - "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ - "$(includedir)\Ice\Router.h" \ - "$(includedir)\Ice\DispatchInterceptor.h" \ - "$(includedir)\Ice\NativePropertiesAdmin.h" \ - "$(includedir)\Ice\Metrics.h" \ - "$(includedir)\Ice\Service.h" \ - "Parser.h" \ - "$(includedir)\IceGrid\Admin.h" \ - "$(includedir)\Ice\SliceChecksumDict.h" \ - "$(includedir)\Glacier2\Session.h" \ - "$(includedir)\Glacier2\SSLInfo.h" \ - "$(includedir)\Glacier2\Config.h" \ - "$(includedir)\IceGrid\Exception.h" \ - "$(includedir)\IceGrid\Config.h" \ - "$(includedir)\IceGrid\Descriptor.h" \ - "$(includedir)\IceGrid\Query.h" \ - Parser.obj: \ Parser.cpp \ "$(includedir)\IceUtil\DisableWarnings.h" \ @@ -894,13 +768,12 @@ Parser.obj: \ "$(includedir)\IceBox\IceBox.h" \ "$(includedir)\IceBox\Config.h" \ -Scanner.obj: \ - Scanner.cpp \ - "$(includedir)\IceUtil\ScannerConfig.h" \ - "$(includedir)\IceUtil\Config.h" \ +Util.obj: \ + Util.cpp \ "$(includedir)\Ice\Ice.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ + "$(includedir)\IceUtil\Config.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -1010,28 +883,30 @@ Scanner.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "Parser.h" \ + "Util.h" \ + "$(includedir)\IceGrid\Descriptor.h" \ + "$(includedir)\IceGrid\Config.h" \ + "$(includedir)\IceUtil\StringUtil.h" \ + "$(includedir)\IceGrid\Exception.h" \ "$(includedir)\IceGrid\Admin.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Glacier2\Session.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ "$(includedir)\Glacier2\Config.h" \ - "$(includedir)\IceGrid\Exception.h" \ - "$(includedir)\IceGrid\Config.h" \ - "$(includedir)\IceGrid\Descriptor.h" \ - "$(includedir)\IceGrid\Query.h" \ - "Grammar.h" \ + "$(includedir)\IceUtil\Random.h" \ + "Internal.h" \ + "$(includedir)\IceGrid\Observer.h" \ + "$(includedir)\IceGrid\Registry.h" \ + "$(includedir)\IceGrid\Session.h" \ -Util.obj: \ - Util.cpp \ - "$(includedir)\Ice\Ice.h" \ +Internal.obj: \ + Internal.cpp \ + "Internal.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\Ice\Config.h" \ - "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\Ice\DeprecatedStringConverter.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ "$(includedir)\IceUtil\Shared.h" \ + "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Config.h" \ "$(includedir)\Ice\ProxyHandle.h" \ "$(includedir)\IceUtil\Handle.h" \ "$(includedir)\IceUtil\Exception.h" \ @@ -1045,34 +920,27 @@ Util.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ - "$(includedir)\IceUtil\Optional.h" \ - "$(includedir)\IceUtil\UndefSysMacros.h" \ - "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\Ice\Plugin.h" \ - "$(includedir)\Ice\LoggerF.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\Initialize.h" \ - "$(includedir)\IceUtil\Timer.h" \ - "$(includedir)\IceUtil\Thread.h" \ + "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ "$(includedir)\IceUtil\ThreadException.h" \ "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\Monitor.h" \ - "$(includedir)\IceUtil\Cond.h" \ - "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\Proxy.h" \ "$(includedir)\Ice\ProxyFactoryF.h" \ "$(includedir)\Ice\ConnectionIF.h" \ "$(includedir)\Ice\RequestHandlerF.h" \ "$(includedir)\Ice\EndpointF.h" \ + "$(includedir)\IceUtil\Optional.h" \ + "$(includedir)\IceUtil\UndefSysMacros.h" \ + "$(includedir)\IceUtil\PopDisableWarnings.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ "$(includedir)\Ice\AsyncResult.h" \ + "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\AsyncResultF.h" \ @@ -1082,6 +950,7 @@ Util.obj: \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ "$(includedir)\Ice\ObjectFactoryF.h" \ @@ -1091,10 +960,6 @@ Util.obj: \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ - "$(includedir)\Ice\InstrumentationF.h" \ - "$(includedir)\Ice\Dispatcher.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Incoming.h" \ @@ -1102,63 +967,37 @@ Util.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ - "$(includedir)\Ice\Properties.h" \ - "$(includedir)\Ice\Logger.h" \ - "$(includedir)\Ice\LoggerUtil.h" \ - "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\Communicator.h" \ - "$(includedir)\Ice\RouterF.h" \ - "$(includedir)\Ice\LocatorF.h" \ - "$(includedir)\Ice\PluginF.h" \ - "$(includedir)\Ice\ImplicitContextF.h" \ - "$(includedir)\Ice\FacetMap.h" \ - "$(includedir)\Ice\CommunicatorAsync.h" \ - "$(includedir)\Ice\ObjectAdapter.h" \ - "$(includedir)\Ice\Endpoint.h" \ - "$(includedir)\Ice\ServantLocator.h" \ - "$(includedir)\Ice\SlicedData.h" \ - "$(includedir)\Ice\OutgoingAsync.h" \ - "$(includedir)\Ice\OutgoingAsyncF.h" \ - "$(includedir)\Ice\Process.h" \ - "$(includedir)\Ice\Application.h" \ - "$(includedir)\Ice\Connection.h" \ - "$(includedir)\Ice\ConnectionAsync.h" \ - "$(includedir)\Ice\Functional.h" \ - "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ - "$(includedir)\Ice\ImplicitContext.h" \ - "$(includedir)\Ice\Locator.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\ProcessF.h" \ - "$(includedir)\Ice\Router.h" \ - "$(includedir)\Ice\DispatchInterceptor.h" \ - "$(includedir)\Ice\NativePropertiesAdmin.h" \ - "$(includedir)\Ice\Metrics.h" \ - "$(includedir)\Ice\Service.h" \ - "$(includedir)\IcePatch2\Util.h" \ - "$(includedir)\IcePatch2\FileInfo.h" \ - "$(includedir)\IcePatch2\Config.h" \ - "Util.h" \ - "$(includedir)\IceGrid\Descriptor.h" \ - "$(includedir)\IceGrid\Config.h" \ - "$(includedir)\IceUtil\StringUtil.h" \ - "$(includedir)\IceGrid\Exception.h" \ - "$(includedir)\IceGrid\Admin.h" \ - "$(includedir)\Ice\SliceChecksumDict.h" \ + "$(includedir)\Ice\Locator.h" \ + "$(includedir)\Ice\Properties.h" \ + "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Glacier2\Session.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ "$(includedir)\Glacier2\Config.h" \ - "$(includedir)\IceUtil\Random.h" \ - "Internal.h" \ + "$(includedir)\IceGrid\Admin.h" \ + "$(includedir)\Ice\SliceChecksumDict.h" \ + "$(includedir)\IceGrid\Exception.h" \ + "$(includedir)\IceGrid\Config.h" \ + "$(includedir)\IceGrid\Descriptor.h" \ "$(includedir)\IceGrid\Observer.h" \ "$(includedir)\IceGrid\Registry.h" \ "$(includedir)\IceGrid\Session.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\Outgoing.h" \ + "$(includedir)\Ice\OutgoingAsync.h" \ + "$(includedir)\IceUtil\Timer.h" \ + "$(includedir)\IceUtil\Thread.h" \ + "$(includedir)\Ice\OutgoingAsyncF.h" \ + "$(includedir)\Ice\SlicedData.h" \ + "$(includedir)\Ice\SliceChecksums.h" \ -Internal.obj: \ - Internal.cpp \ - "Internal.h" \ +IceLocatorDiscovery.obj: \ + IceLocatorDiscovery.cpp \ + "IceLocatorDiscovery.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\ProxyF.h" \ "$(includedir)\IceUtil\Shared.h" \ @@ -1227,39 +1066,28 @@ Internal.obj: \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\Properties.h" \ - "$(includedir)\Ice\PropertiesAdmin.h" \ - "$(includedir)\Glacier2\Session.h" \ - "$(includedir)\Glacier2\SSLInfo.h" \ - "$(includedir)\Glacier2\Config.h" \ - "$(includedir)\IceGrid\Admin.h" \ - "$(includedir)\Ice\SliceChecksumDict.h" \ - "$(includedir)\IceGrid\Exception.h" \ - "$(includedir)\IceGrid\Config.h" \ - "$(includedir)\IceGrid\Descriptor.h" \ - "$(includedir)\IceGrid\Observer.h" \ - "$(includedir)\IceGrid\Registry.h" \ - "$(includedir)\IceGrid\Session.h" \ + "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\Ice\OutgoingAsyncF.h" \ - "$(includedir)\Ice\SlicedData.h" \ "$(includedir)\Ice\SliceChecksums.h" \ + "$(includedir)\Ice\SliceChecksumDict.h" \ -IceLocatorDiscovery.obj: \ - IceLocatorDiscovery.cpp \ - "IceLocatorDiscovery.h" \ +Grammar.obj: \ + Grammar.cpp \ + "$(includedir)\Ice\Ice.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ + "$(includedir)\Ice\Config.h" \ + "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\DeprecatedStringConverter.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ "$(includedir)\IceUtil\Shared.h" \ - "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\Ice\Config.h" \ "$(includedir)\Ice\ProxyHandle.h" \ "$(includedir)\IceUtil\Handle.h" \ "$(includedir)\IceUtil\Exception.h" \ @@ -1273,27 +1101,34 @@ IceLocatorDiscovery.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ - "$(includedir)\Ice\Proxy.h" \ + "$(includedir)\IceUtil\Optional.h" \ + "$(includedir)\IceUtil\UndefSysMacros.h" \ + "$(includedir)\IceUtil\PopDisableWarnings.h" \ + "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\LoggerF.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\Initialize.h" \ + "$(includedir)\IceUtil\Timer.h" \ + "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ "$(includedir)\IceUtil\ThreadException.h" \ "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\Ice\PropertiesF.h" \ + "$(includedir)\Ice\Proxy.h" \ "$(includedir)\Ice\ProxyFactoryF.h" \ "$(includedir)\Ice\ConnectionIF.h" \ "$(includedir)\Ice\RequestHandlerF.h" \ "$(includedir)\Ice\EndpointF.h" \ - "$(includedir)\IceUtil\Optional.h" \ - "$(includedir)\IceUtil\UndefSysMacros.h" \ - "$(includedir)\IceUtil\PopDisableWarnings.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\IceUtil\Monitor.h" \ - "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\AsyncResultF.h" \ @@ -1303,7 +1138,6 @@ IceLocatorDiscovery.obj: \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ "$(includedir)\Ice\BasicStream.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ "$(includedir)\Ice\ObjectFactoryF.h" \ @@ -1313,6 +1147,10 @@ IceLocatorDiscovery.obj: \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\InstrumentationF.h" \ + "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Incoming.h" \ @@ -1320,20 +1158,179 @@ IceLocatorDiscovery.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\Properties.h" \ + "$(includedir)\Ice\Logger.h" \ + "$(includedir)\Ice\LoggerUtil.h" \ + "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\ObjectFactory.h" \ + "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\RouterF.h" \ + "$(includedir)\Ice\LocatorF.h" \ + "$(includedir)\Ice\PluginF.h" \ + "$(includedir)\Ice\ImplicitContextF.h" \ + "$(includedir)\Ice\FacetMap.h" \ + "$(includedir)\Ice\CommunicatorAsync.h" \ + "$(includedir)\Ice\ObjectAdapter.h" \ + "$(includedir)\Ice\Endpoint.h" \ + "$(includedir)\Ice\ServantLocator.h" \ + "$(includedir)\Ice\SlicedData.h" \ + "$(includedir)\Ice\OutgoingAsync.h" \ + "$(includedir)\Ice\OutgoingAsyncF.h" \ + "$(includedir)\Ice\Process.h" \ + "$(includedir)\Ice\Application.h" \ + "$(includedir)\Ice\Connection.h" \ + "$(includedir)\Ice\ConnectionAsync.h" \ + "$(includedir)\Ice\Functional.h" \ + "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\Ice\Stream.h" \ + "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\ProcessF.h" \ - "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\Router.h" \ + "$(includedir)\Ice\DispatchInterceptor.h" \ + "$(includedir)\Ice\NativePropertiesAdmin.h" \ + "$(includedir)\Ice\Metrics.h" \ + "$(includedir)\Ice\Service.h" \ + "Parser.h" \ + "$(includedir)\IceGrid\Admin.h" \ + "$(includedir)\Ice\SliceChecksumDict.h" \ + "$(includedir)\Glacier2\Session.h" \ + "$(includedir)\Glacier2\SSLInfo.h" \ + "$(includedir)\Glacier2\Config.h" \ + "$(includedir)\IceGrid\Exception.h" \ + "$(includedir)\IceGrid\Config.h" \ + "$(includedir)\IceGrid\Descriptor.h" \ + "$(includedir)\IceGrid\Query.h" \ + +Scanner.obj: \ + Scanner.cpp \ + "$(includedir)\IceUtil\ScannerConfig.h" \ + "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Ice.h" \ + "$(includedir)\IceUtil\PushDisableWarnings.h" \ + "$(includedir)\Ice\Config.h" \ + "$(includedir)\Ice\DeprecatedStringConverter.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ + "$(includedir)\Ice\ProxyF.h" \ + "$(includedir)\IceUtil\Shared.h" \ + "$(includedir)\Ice\ProxyHandle.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Exception.h" \ + "$(includedir)\Ice\ObjectF.h" \ + "$(includedir)\Ice\Handle.h" \ + "$(includedir)\Ice\Exception.h" \ + "$(includedir)\Ice\Format.h" \ + "$(includedir)\Ice\StreamF.h" \ + "$(includedir)\Ice\LocalObject.h" \ + "$(includedir)\Ice\LocalObjectF.h" \ + "$(includedir)\Ice\StreamHelpers.h" \ + "$(includedir)\IceUtil\ScopedArray.h" \ + "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\IceUtil\Optional.h" \ + "$(includedir)\IceUtil\UndefSysMacros.h" \ + "$(includedir)\IceUtil\PopDisableWarnings.h" \ + "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\Outgoing.h" \ - "$(includedir)\Ice\OutgoingAsync.h" \ + "$(includedir)\Ice\Initialize.h" \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ + "$(includedir)\IceUtil\Mutex.h" \ + "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\ThreadException.h" \ + "$(includedir)\IceUtil\Time.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\Ice\PropertiesF.h" \ + "$(includedir)\Ice\Proxy.h" \ + "$(includedir)\Ice\ProxyFactoryF.h" \ + "$(includedir)\Ice\ConnectionIF.h" \ + "$(includedir)\Ice\RequestHandlerF.h" \ + "$(includedir)\Ice\EndpointF.h" \ + "$(includedir)\Ice\EndpointTypes.h" \ + "$(includedir)\Ice\ObjectAdapterF.h" \ + "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\AsyncResult.h" \ + "$(includedir)\IceUtil\UniquePtr.h" \ + "$(includedir)\Ice\ConnectionF.h" \ + "$(includedir)\Ice\InstanceF.h" \ + "$(includedir)\Ice\AsyncResultF.h" \ + "$(includedir)\Ice\ObserverHelper.h" \ + "$(includedir)\Ice\Instrumentation.h" \ + "$(includedir)\Ice\Current.h" \ + "$(includedir)\Ice\Identity.h" \ + "$(includedir)\Ice\Version.h" \ + "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\Object.h" \ + "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\Buffer.h" \ + "$(includedir)\Ice\Protocol.h" \ + "$(includedir)\Ice\SlicedDataF.h" \ + "$(includedir)\Ice\UserExceptionFactory.h" \ + "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\InstrumentationF.h" \ + "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\PropertiesAdmin.h" \ + "$(includedir)\Ice\GCObject.h" \ + "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Incoming.h" \ + "$(includedir)\Ice\ServantLocatorF.h" \ + "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\ResponseHandlerF.h" \ + "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\Properties.h" \ + "$(includedir)\Ice\Logger.h" \ + "$(includedir)\Ice\LoggerUtil.h" \ + "$(includedir)\Ice\RemoteLogger.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultObjectFactory.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ + "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\RouterF.h" \ + "$(includedir)\Ice\LocatorF.h" \ + "$(includedir)\Ice\PluginF.h" \ + "$(includedir)\Ice\ImplicitContextF.h" \ + "$(includedir)\Ice\FacetMap.h" \ + "$(includedir)\Ice\CommunicatorAsync.h" \ + "$(includedir)\Ice\ObjectAdapter.h" \ + "$(includedir)\Ice\Endpoint.h" \ + "$(includedir)\Ice\ServantLocator.h" \ + "$(includedir)\Ice\SlicedData.h" \ + "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\Ice\OutgoingAsyncF.h" \ - "$(includedir)\Ice\SliceChecksums.h" \ + "$(includedir)\Ice\Process.h" \ + "$(includedir)\Ice\Application.h" \ + "$(includedir)\Ice\Connection.h" \ + "$(includedir)\Ice\ConnectionAsync.h" \ + "$(includedir)\Ice\Functional.h" \ + "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\Ice\Stream.h" \ + "$(includedir)\Ice\ImplicitContext.h" \ + "$(includedir)\Ice\Locator.h" \ + "$(includedir)\Ice\ProcessF.h" \ + "$(includedir)\Ice\Router.h" \ + "$(includedir)\Ice\DispatchInterceptor.h" \ + "$(includedir)\Ice\NativePropertiesAdmin.h" \ + "$(includedir)\Ice\Metrics.h" \ + "$(includedir)\Ice\Service.h" \ + "Parser.h" \ + "$(includedir)\IceGrid\Admin.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ + "$(includedir)\Glacier2\Session.h" \ + "$(includedir)\Glacier2\SSLInfo.h" \ + "$(includedir)\Glacier2\Config.h" \ + "$(includedir)\IceGrid\Exception.h" \ + "$(includedir)\IceGrid\Config.h" \ + "$(includedir)\IceGrid\Descriptor.h" \ + "$(includedir)\IceGrid\Query.h" \ + "Grammar.h" \ AdminRouter.obj: \ AdminRouter.cpp \ @@ -1642,36 +1639,6 @@ PlatformInfo.obj: \ "$(includedir)\IceGrid\Registry.h" \ "$(includedir)\IceGrid\Session.h" \ "TraceLevels.h" \ - "$(includedir)\IcePatch2\Util.h" \ - "$(includedir)\Ice\Ice.h" \ - "$(includedir)\Ice\DeprecatedStringConverter.h" \ - "$(includedir)\Ice\Initialize.h" \ - "$(includedir)\IceUtil\Timer.h" \ - "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\Dispatcher.h" \ - "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\CommunicatorAsync.h" \ - "$(includedir)\Ice\ObjectAdapter.h" \ - "$(includedir)\Ice\Endpoint.h" \ - "$(includedir)\Ice\ServantLocator.h" \ - "$(includedir)\Ice\SlicedData.h" \ - "$(includedir)\Ice\OutgoingAsync.h" \ - "$(includedir)\Ice\OutgoingAsyncF.h" \ - "$(includedir)\Ice\Process.h" \ - "$(includedir)\Ice\Application.h" \ - "$(includedir)\Ice\Connection.h" \ - "$(includedir)\Ice\ConnectionAsync.h" \ - "$(includedir)\Ice\Functional.h" \ - "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ - "$(includedir)\Ice\ImplicitContext.h" \ - "$(includedir)\Ice\Router.h" \ - "$(includedir)\Ice\DispatchInterceptor.h" \ - "$(includedir)\Ice\NativePropertiesAdmin.h" \ - "$(includedir)\Ice\Metrics.h" \ - "$(includedir)\Ice\Service.h" \ - "$(includedir)\IcePatch2\FileInfo.h" \ - "$(includedir)\IcePatch2\Config.h" \ SessionManager.obj: \ SessionManager.cpp \ @@ -2020,7 +1987,7 @@ Activator.obj: \ "$(includedir)\IceUtil\Random.h" \ "ServerI.h" \ "$(includedir)\Freeze\EvictorF.h" \ - "$(includedir)\IcePatch2\Util.h" \ + "..\..\src\IcePatch2Lib\Util.h" \ "$(includedir)\IcePatch2\FileInfo.h" \ "$(includedir)\IcePatch2\Config.h" \ @@ -2281,7 +2248,7 @@ NodeI.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "$(includedir)\IcePatch2\Util.h" \ + "..\..\src\IcePatch2Lib\Util.h" \ "$(includedir)\IcePatch2\FileInfo.h" \ "$(includedir)\IcePatch2\Config.h" \ "$(includedir)\IcePatch2\ClientUtil.h" \ @@ -2740,7 +2707,7 @@ ServerI.obj: \ "DescriptorHelper.h" \ "$(includedir)\IceUtil\OutputUtil.h" \ "..\..\src\IceXML\Parser.h" \ - "$(includedir)\IcePatch2\Util.h" \ + "..\..\src\IcePatch2Lib\Util.h" \ AdapterCache.obj: \ AdapterCache.cpp \ @@ -4765,9 +4732,6 @@ NodeCache.obj: \ "DescriptorHelper.h" \ "$(includedir)\IceUtil\OutputUtil.h" \ "..\..\src\IceXML\Parser.h" \ - "$(includedir)\IcePatch2\Util.h" \ - "$(includedir)\IcePatch2\FileInfo.h" \ - "$(includedir)\IcePatch2\Config.h" \ NodeSessionI.obj: \ NodeSessionI.cpp \ @@ -7704,7 +7668,7 @@ IceGridNode.obj: \ "DescriptorParser.h" \ "Util.h" \ "$(includedir)\IceUtil\Random.h" \ - "$(includedir)\IcePatch2\Util.h" \ + "..\..\src\IcePatch2Lib\Util.h" \ IceGridRegistry.obj: \ IceGridRegistry.cpp \ diff --git a/cpp/src/IceGrid/Activator.cpp b/cpp/src/IceGrid/Activator.cpp index c1356f98c91..a7969d6fad9 100644 --- a/cpp/src/IceGrid/Activator.cpp +++ b/cpp/src/IceGrid/Activator.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include @@ -365,7 +365,7 @@ Activator::activate(const string& name, throw string("The server executable path is empty."); } - string pwd = IcePatch2::simplify(pwdPath); + string pwd = IcePatch2Internal::simplify(pwdPath); #ifdef _WIN32 if(!IceUtilInternal::isAbsolutePath(path)) { diff --git a/cpp/src/IceGrid/DescriptorParser.cpp b/cpp/src/IceGrid/DescriptorParser.cpp index 0215ff266bd..d589b729ee8 100644 --- a/cpp/src/IceGrid/DescriptorParser.cpp +++ b/cpp/src/IceGrid/DescriptorParser.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include #include @@ -870,7 +870,7 @@ DescriptorParser::parseDescriptor(const string& descriptor, const Ice::CommunicatorPtr& communicator, const IceGrid::AdminPrx& admin) { - string filename = IcePatch2::simplify(descriptor); + string filename = IcePatch2Internal::simplify(descriptor); DescriptorHandler handler(filename, communicator); handler.setAdmin(admin); handler.setVariables(variables, targets); @@ -881,7 +881,7 @@ DescriptorParser::parseDescriptor(const string& descriptor, ApplicationDescriptor DescriptorParser::parseDescriptor(const string& descriptor, const Ice::CommunicatorPtr& communicator) { - string filename = IcePatch2::simplify(descriptor); + string filename = IcePatch2Internal::simplify(descriptor); DescriptorHandler handler(filename, communicator); IceXML::Parser::parse(filename, handler); return handler.getApplicationDescriptor(); diff --git a/cpp/src/IceGrid/IceGridNode.cpp b/cpp/src/IceGrid/IceGridNode.cpp index 918aef6a097..1fd8142a089 100644 --- a/cpp/src/IceGrid/IceGridNode.cpp +++ b/cpp/src/IceGrid/IceGridNode.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #ifdef _WIN32 # include @@ -363,9 +363,9 @@ NodeService::startImpl(int argc, char* argv[], int& status) dataPath += "/"; } - IcePatch2::createDirectory(dataPath + "servers"); - IcePatch2::createDirectory(dataPath + "tmp"); - IcePatch2::createDirectory(dataPath + "distrib"); + IcePatch2Internal::createDirectory(dataPath + "servers"); + IcePatch2Internal::createDirectory(dataPath + "tmp"); + IcePatch2Internal::createDirectory(dataPath + "distrib"); #ifdef _WIN32 // diff --git a/cpp/src/IceGrid/NodeCache.cpp b/cpp/src/IceGrid/NodeCache.cpp index 8c29af2aa43..e28468b36af 100644 --- a/cpp/src/IceGrid/NodeCache.cpp +++ b/cpp/src/IceGrid/NodeCache.cpp @@ -18,8 +18,6 @@ #include #include -#include - using namespace std; using namespace IceGrid; diff --git a/cpp/src/IceGrid/NodeI.cpp b/cpp/src/IceGrid/NodeI.cpp index 78497aacfc6..2f1281c9286 100644 --- a/cpp/src/IceGrid/NodeI.cpp +++ b/cpp/src/IceGrid/NodeI.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include @@ -22,6 +22,7 @@ using namespace std; using namespace IcePatch2; +using namespace IcePatch2Internal; using namespace IceGrid; namespace @@ -1075,7 +1076,7 @@ NodeI::removeServer(const ServerIPtr& server, const std::string& application) { try { - IcePatch2::removeRecursive(appDir); + IcePatch2Internal::removeRecursive(appDir); } catch(const string& msg) { @@ -1260,8 +1261,8 @@ void NodeI::patch(const FileServerPrx& icepatch, const string& dest, const vector& directories) { IcePatch2::PatcherFeedbackPtr feedback = new LogPatcherFeedback(_traceLevels, dest); - IcePatch2::createDirectory(_dataDir + "/" + dest); - PatcherPtr patcher = new Patcher(icepatch, feedback, _dataDir + "/" + dest, false, 100, 1); + IcePatch2Internal::createDirectory(_dataDir + "/" + dest); + PatcherPtr patcher = PatcherFactory::create(icepatch, feedback, _dataDir + "/" + dest, false, 100, 1); bool aborted = !patcher->prepare(); if(!aborted) { diff --git a/cpp/src/IceGrid/PlatformInfo.cpp b/cpp/src/IceGrid/PlatformInfo.cpp index bb36fdf8991..1835edaa991 100644 --- a/cpp/src/IceGrid/PlatformInfo.cpp +++ b/cpp/src/IceGrid/PlatformInfo.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include #if defined(_WIN32) diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp index 2fb917d9190..34f0030d790 100644 --- a/cpp/src/IceGrid/ServerI.cpp +++ b/cpp/src/IceGrid/ServerI.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include @@ -1889,7 +1889,7 @@ ServerI::destroy() { try { - IcePatch2::removeRecursive(_serverDir); + IcePatch2Internal::removeRecursive(_serverDir); } catch(const string& msg) { @@ -2049,7 +2049,7 @@ ServerI::update() // try { - IcePatch2::removeRecursive(_serverDir); + IcePatch2Internal::removeRecursive(_serverDir); } catch(const string&) { @@ -2270,7 +2270,7 @@ ServerI::updateImpl(const InternalServerDescriptorPtr& descriptor) // for(Ice::StringSeq::const_iterator p = _desc->logs.begin(); p != _desc->logs.end(); ++p) { - string path = IcePatch2::simplify(*p); + string path = IcePatch2Internal::simplify(*p); if(IceUtilInternal::isAbsolutePath(path)) { _logs.push_back(path); @@ -2348,7 +2348,7 @@ ServerI::updateImpl(const InternalServerDescriptorPtr& descriptor) // // Remove old configuration files. // - Ice::StringSeq files = IcePatch2::readDirectory(_serverDir + "/config"); + Ice::StringSeq files = IcePatch2Internal::readDirectory(_serverDir + "/config"); Ice::StringSeq toDel; set_difference(files.begin(), files.end(), knownFiles.begin(), knownFiles.end(), back_inserter(toDel)); for(Ice::StringSeq::const_iterator q = toDel.begin(); q != toDel.end(); ++q) @@ -2357,7 +2357,7 @@ ServerI::updateImpl(const InternalServerDescriptorPtr& descriptor) { try { - IcePatch2::remove(_serverDir + "/config/" + *q); + IcePatch2Internal::remove(_serverDir + "/config/" + *q); } catch(const string& msg) { @@ -2412,14 +2412,14 @@ ServerI::updateImpl(const InternalServerDescriptorPtr& descriptor) // // Remove old database environments. // - Ice::StringSeq dbEnvs = IcePatch2::readDirectory(_serverDir + "/dbs"); + Ice::StringSeq dbEnvs = IcePatch2Internal::readDirectory(_serverDir + "/dbs"); Ice::StringSeq toDel; set_difference(dbEnvs.begin(), dbEnvs.end(), knownDbEnvs.begin(), knownDbEnvs.end(), back_inserter(toDel)); for(Ice::StringSeq::const_iterator p = toDel.begin(); p != toDel.end(); ++p) { try { - IcePatch2::removeRecursive(_serverDir + "/dbs/" + *p); + IcePatch2Internal::removeRecursive(_serverDir + "/dbs/" + *p); } catch(const string& msg) { @@ -3047,7 +3047,7 @@ ServerI::createOrUpdateDirectory(const string& dir) { try { - IcePatch2::createDirectory(dir); + IcePatch2Internal::createDirectory(dir); } catch(const string&) { @@ -3148,7 +3148,7 @@ ServerI::getFilePath(const string& filename) const } else if(!filename.empty() && filename[0] == '#') { - string path = IcePatch2::simplify(filename.substr(1)); + string path = IcePatch2Internal::simplify(filename.substr(1)); if(!IceUtilInternal::isAbsolutePath(path)) { path = _node->getPlatformInfo().getCwd() + "/" + path; diff --git a/cpp/src/IceGrid/Util.cpp b/cpp/src/IceGrid/Util.cpp index 4ad7f08f0ca..8393edccbe4 100644 --- a/cpp/src/IceGrid/Util.cpp +++ b/cpp/src/IceGrid/Util.cpp @@ -8,7 +8,6 @@ // ********************************************************************** #include -#include #include #include #include diff --git a/cpp/src/IcePatch2/.depend.mak b/cpp/src/IcePatch2/.depend.mak index 3f54f21e89f..53f280e4dc9 100755 --- a/cpp/src/IcePatch2/.depend.mak +++ b/cpp/src/IcePatch2/.depend.mak @@ -7,9 +7,10 @@ FileServerI.obj: \ "$(includedir)\IceUtil\Shared.h" \ "$(includedir)\IceUtil\Handle.h" \ "$(includedir)\IceUtil\Exception.h" \ + "$(includedir)\IceUtil\StringUtil.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "FileServerI.h" \ - "$(includedir)\IcePatch2\Util.h" \ + "..\..\src\IcePatch2Lib\Util.h" \ "$(includedir)\Ice\Ice.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ @@ -242,7 +243,7 @@ Server.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "FileServerI.h" \ - "$(includedir)\IcePatch2\Util.h" \ + "..\..\src\IcePatch2Lib\Util.h" \ "$(includedir)\IcePatch2\FileInfo.h" \ "$(includedir)\IcePatch2\Config.h" \ "$(includedir)\IcePatch2\FileServer.h" \ @@ -365,7 +366,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "$(includedir)\IcePatch2\Util.h" \ + "..\..\src\IcePatch2Lib\Util.h" \ "$(includedir)\IcePatch2\FileInfo.h" \ "$(includedir)\IcePatch2\Config.h" \ "$(includedir)\IcePatch2\ClientUtil.h" \ @@ -385,7 +386,7 @@ Calc.obj: \ "$(includedir)\IceUtil\Handle.h" \ "$(includedir)\IceUtil\StringUtil.h" \ "..\..\src\IceUtil\FileUtil.h" \ - "$(includedir)\IcePatch2\Util.h" \ + "..\..\src\IcePatch2Lib\Util.h" \ "$(includedir)\Ice\Ice.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ diff --git a/cpp/src/IcePatch2/Calc.cpp b/cpp/src/IcePatch2/Calc.cpp index 81939702e79..e04f4825731 100644 --- a/cpp/src/IcePatch2/Calc.cpp +++ b/cpp/src/IcePatch2/Calc.cpp @@ -10,26 +10,27 @@ #include #include #include -#include +#include #include using namespace std; using namespace Ice; using namespace IcePatch2; +using namespace IcePatch2Internal; -struct FileInfoPathLess: public binary_function +struct FileInfoPathLess: public binary_function { bool - operator()(const FileInfo& lhs, const FileInfo& rhs) + operator()(const LargeFileInfo& lhs, const LargeFileInfo& rhs) { return lhs.path < rhs.path; } }; -struct IFileInfoPathEqual: public binary_function +struct IFileInfoPathEqual: public binary_function { bool - operator()(const FileInfo& lhs, const FileInfo& rhs) + operator()(const LargeFileInfo& lhs, const LargeFileInfo& rhs) { if(lhs.path.size() != rhs.path.size()) { @@ -48,10 +49,10 @@ struct IFileInfoPathEqual: public binary_function +struct IFileInfoPathLess: public binary_function { bool - operator()(const FileInfo& lhs, const FileInfo& rhs) + operator()(const LargeFileInfo& lhs, const LargeFileInfo& rhs) { for(string::size_type i = 0; i < lhs.path.size() && i < rhs.path.size(); ++i) { @@ -233,7 +234,7 @@ main(int argc, char* argv[]) p->erase(0, absDataDirWithSlash.size()); } - FileInfoSeq infoSeq; + LargeFileInfoSeq infoSeq; if(fileSeq.empty()) { @@ -249,7 +250,7 @@ main(int argc, char* argv[]) for(StringSeq::iterator p = fileSeq.begin(); p != fileSeq.end(); ++p) { - FileInfoSeq partialInfoSeq; + LargeFileInfoSeq partialInfoSeq; CalcCB calcCB; if(!getFileInfoSeqSubDir(absDataDir, *p, compress, verbose ? &calcCB : 0, partialInfoSeq)) @@ -257,7 +258,7 @@ main(int argc, char* argv[]) return EXIT_FAILURE; } - FileInfoSeq newInfoSeq; + LargeFileInfoSeq newInfoSeq; newInfoSeq.reserve(infoSeq.size()); set_difference(infoSeq.begin(), @@ -285,11 +286,11 @@ main(int argc, char* argv[]) if(caseInsensitive) { - FileInfoSeq newInfoSeq = infoSeq; + LargeFileInfoSeq newInfoSeq = infoSeq; sort(newInfoSeq.begin(), newInfoSeq.end(), IFileInfoPathLess()); string ex; - FileInfoSeq::iterator p = newInfoSeq.begin(); + LargeFileInfoSeq::iterator p = newInfoSeq.begin(); while((p = adjacent_find(p, newInfoSeq.end(), IFileInfoPathEqual())) != newInfoSeq.end()) { do diff --git a/cpp/src/IcePatch2/Client.cpp b/cpp/src/IcePatch2/Client.cpp index 347d1e1c8f6..8ef166ab0d0 100644 --- a/cpp/src/IcePatch2/Client.cpp +++ b/cpp/src/IcePatch2/Client.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #ifdef _WIN32 @@ -23,6 +23,7 @@ using namespace std; using namespace Ice; using namespace IcePatch2; +using namespace IcePatch2Internal; class TextPatcherFeedback : public PatcherFeedback { @@ -282,7 +283,7 @@ Client::run(int argc, char* argv[]) try { PatcherFeedbackPtr feedback = new TextPatcherFeedback; - PatcherPtr patcher = new Patcher(communicator(), feedback); + PatcherPtr patcher = PatcherFactory::create(communicator(), feedback); aborted = !patcher->prepare(); diff --git a/cpp/src/IcePatch2/FileServerI.cpp b/cpp/src/IcePatch2/FileServerI.cpp index a423f280871..822d621ccb2 100644 --- a/cpp/src/IcePatch2/FileServerI.cpp +++ b/cpp/src/IcePatch2/FileServerI.cpp @@ -9,6 +9,7 @@ #include #include +#include #include #include @@ -21,8 +22,9 @@ using namespace std; using namespace Ice; using namespace IcePatch2; +using namespace IcePatch2Internal; -IcePatch2::FileServerI::FileServerI(const std::string& dataDir, const FileInfoSeq& infoSeq) : +IcePatch2::FileServerI::FileServerI(const std::string& dataDir, const LargeFileInfoSeq& infoSeq) : _dataDir(dataDir), _tree0(FileTree0()) { FileTree0& tree0 = const_cast(_tree0); @@ -30,7 +32,17 @@ IcePatch2::FileServerI::FileServerI(const std::string& dataDir, const FileInfoSe } FileInfoSeq -IcePatch2::FileServerI::getFileInfoSeq(Int node0, const Current&) const +IcePatch2::FileServerI::getFileInfoSeq(Int node0, const Current& c) const +{ + LargeFileInfoSeq largeFiles = getLargeFileInfoSeq(node0, c); + FileInfoSeq files; + files.resize(largeFiles.size()); + transform(largeFiles.begin(), largeFiles.end(), files.begin(), toFileInfo); + return files; +} + +LargeFileInfoSeq +IcePatch2::FileServerI::getLargeFileInfoSeq(Int node0, const Current&) const { if(node0 < 0 || node0 > 255) { @@ -63,12 +75,56 @@ void IcePatch2::FileServerI::getFileCompressed_async(const AMD_FileServer_getFileCompressedPtr& cb, const string& pa, Int pos, Int num, const Current&) const { - if(IceUtilInternal::isAbsolutePath(pa)) + try + { + vector buffer; + getFileCompressedInternal(pa, pos, num, buffer, false); + if(buffer.empty()) + { + cb->ice_response(make_pair(0, 0)); + } + else + { + cb->ice_response(make_pair(&buffer[0], &buffer[0] + buffer.size())); + } + } + catch(const std::exception& ex) { - FileAccessException ex; - ex.reason = "illegal absolute path `" + pa + "'"; cb->ice_exception(ex); - return; + } +} + +void +IcePatch2::FileServerI::getLargeFileCompressed_async(const AMD_FileServer_getLargeFileCompressedPtr& cb, + const string& pa, Long pos, Int num, const Current&) const +{ + try + { + vector buffer; + getFileCompressedInternal(pa, pos, num, buffer, true); + if(buffer.empty()) + { + cb->ice_response(make_pair(0, 0)); + } + else + { + cb->ice_response(make_pair(&buffer[0], &buffer[0] + buffer.size())); + } + + } + catch(const std::exception& ex) + { + cb->ice_exception(ex); + } +} + +void +IcePatch2::FileServerI::getFileCompressedInternal(const std::string& pa, Ice::Long pos, Ice::Int num, + vector& buffer, bool largeFile) const +{ + if(IceUtilInternal::isAbsolutePath(pa)) + { + throw FileAccessException(string("illegal absolute path `") + pa + "'"); } string path = simplify(pa); @@ -77,31 +133,35 @@ IcePatch2::FileServerI::getFileCompressed_async(const AMD_FileServer_getFileComp path.find("/../") != string::npos || (path.size() >= 3 && (path.substr(0, 3) == "../" || path.substr(path.size() - 3, 3) == "/.."))) { - FileAccessException ex; - ex.reason = "illegal `..' component in path `" + path + "'"; - cb->ice_exception(ex); - return; + throw FileAccessException(string("illegal `..' component in path `") + path + "'"); } - -#if (defined(_MSC_VER) && (_MSC_VER >= 1600)) - pair ret(static_cast(nullptr), static_cast(nullptr)); -#else - pair ret(0, 0); -#endif if(num <= 0 || pos < 0) { - cb->ice_response(ret); return; } - - int fd = IceUtilInternal::open(_dataDir + '/' + path + ".bz2", O_RDONLY|O_BINARY); + + string absolutePath = _dataDir + '/' + path + ".bz2"; + int fd = IceUtilInternal::open(absolutePath, O_RDONLY|O_BINARY); if(fd == -1) { - FileAccessException ex; - ex.reason = "cannot open `" + path + "' for reading: " + strerror(errno); - cb->ice_exception(ex); - return; + throw FileAccessException(string("cannot open `") + path + "' for reading: " + strerror(errno)); + } + + if(!largeFile) + { + IceUtilInternal::structstat buf; + if(IceUtilInternal::stat(absolutePath, &buf) == -1) + { + throw FileAccessException(string("cannot stat `") + path + "':\n" + IceUtilInternal::lastErrorToString()); + } + + if(buf.st_size > 0x7FFFFFFF) + { + ostringstream os; + os << "cannot encode size `" << buf.st_size << "' for file `" << path << "' as Ice::Int" << endl; + throw FileAccessException(os.str()); + } } if( @@ -117,32 +177,22 @@ IcePatch2::FileServerI::getFileCompressed_async(const AMD_FileServer_getFileComp ostringstream posStr; posStr << pos; - FileAccessException ex; - ex.reason = "cannot seek position " + posStr.str() + " in file `" + path + "': " + strerror(errno); - cb->ice_exception(ex); - return; + throw FileAccessException("cannot seek position " + posStr.str() + " in file `" + path + "': " + + strerror(errno)); } - IceUtil::ScopedArray bytes(new Byte[num]); + buffer.resize(num); #ifdef _WIN32 int r; - if((r = _read(fd, bytes.get(), static_cast(num))) == -1) + if((r = _read(fd, &buffer[0], static_cast(num))) == -1) #else ssize_t r; - if((r = read(fd, bytes.get(), static_cast(num))) == -1) + if((r = read(fd, &buffer[0], static_cast(num))) == -1) #endif { IceUtilInternal::close(fd); - - FileAccessException ex; - ex.reason = "cannot read `" + path + "': " + strerror(errno); - cb->ice_exception(ex); - return; + throw FileAccessException("cannot read `" + path + "': " + strerror(errno)); } IceUtilInternal::close(fd); - - ret.first = bytes.get(); - ret.second = ret.first + r; - cb->ice_response(ret); } diff --git a/cpp/src/IcePatch2/FileServerI.h b/cpp/src/IcePatch2/FileServerI.h index ca78be38d34..df4c7cf7a45 100644 --- a/cpp/src/IcePatch2/FileServerI.h +++ b/cpp/src/IcePatch2/FileServerI.h @@ -10,7 +10,7 @@ #ifndef ICE_PATCH2_FILE_SERVER_I_H #define ICE_PATCH2_FILE_SERVER_I_H -#include +#include #include namespace IcePatch2 @@ -20,21 +20,40 @@ class FileServerI : public FileServer { public: - FileServerI(const std::string&, const FileInfoSeq&); + FileServerI(const std::string&, const LargeFileInfoSeq&); FileInfoSeq getFileInfoSeq(Ice::Int, const Ice::Current&) const; + + LargeFileInfoSeq + getLargeFileInfoSeq(Ice::Int, const Ice::Current&) const; ByteSeqSeq getChecksumSeq(const Ice::Current&) const; Ice::ByteSeq getChecksum(const Ice::Current&) const; - void getFileCompressed_async(const AMD_FileServer_getFileCompressedPtr&, const std::string&, Ice::Int pos, - Ice::Int num, const Ice::Current&) const; + void getFileCompressed_async(const AMD_FileServer_getFileCompressedPtr&, + const std::string&, + Ice::Int, + Ice::Int, + const Ice::Current&) const; + + void getLargeFileCompressed_async(const AMD_FileServer_getLargeFileCompressedPtr&, + const std::string&, + Ice::Long, + Ice::Int, + const Ice::Current&) const; private: + + void + getFileCompressedInternal(const std::string&, + Ice::Long, + Ice::Int, + std::vector&, + bool) const; const std::string _dataDir; - const FileTree0 _tree0; + const IcePatch2Internal::FileTree0 _tree0; }; } diff --git a/cpp/src/IcePatch2/Server.cpp b/cpp/src/IcePatch2/Server.cpp index e2ff5a61a6b..89f2f0454ef 100644 --- a/cpp/src/IcePatch2/Server.cpp +++ b/cpp/src/IcePatch2/Server.cpp @@ -10,13 +10,15 @@ #include #include #include +#include #include #include -#include +#include using namespace std; using namespace Ice; using namespace IcePatch2; +using namespace IcePatch2Internal; namespace IcePatch2 { @@ -96,7 +98,7 @@ IcePatch2::PatcherService::start(int argc, char* argv[], int& status) return false; } - FileInfoSeq infoSeq; + LargeFileInfoSeq infoSeq; try { diff --git a/cpp/src/IcePatch2Lib/.depend.mak b/cpp/src/IcePatch2Lib/.depend.mak index 3ac917cdeac..7593b4c14c3 100755 --- a/cpp/src/IcePatch2Lib/.depend.mak +++ b/cpp/src/IcePatch2Lib/.depend.mak @@ -129,7 +129,7 @@ ClientUtil.obj: \ "$(includedir)\IcePatch2\FileServer.h" \ "$(includedir)\IcePatch2\FileInfo.h" \ "$(includedir)\IcePatch2\Config.h" \ - "$(includedir)\IcePatch2\Util.h" \ + "Util.h" \ Util.obj: \ Util.cpp \ @@ -164,7 +164,7 @@ Util.obj: \ "$(includedir)\IceUtil\StringUtil.h" \ "..\..\src\IceUtil\FileUtil.h" \ "$(includedir)\IceUtil\SHA1.h" \ - "$(includedir)\IcePatch2\Util.h" \ + "Util.h" \ "$(includedir)\Ice\Ice.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ @@ -260,6 +260,7 @@ Util.obj: \ "$(includedir)\Ice\Service.h" \ "$(includedir)\IcePatch2\FileInfo.h" \ "$(includedir)\IcePatch2\Config.h" \ + "$(includedir)\IcePatch2\FileServer.h" \ FileInfo.obj: \ FileInfo.cpp \ diff --git a/cpp/src/IcePatch2Lib/ClientUtil.cpp b/cpp/src/IcePatch2Lib/ClientUtil.cpp index 89eda0a3c30..eaa381722ef 100644 --- a/cpp/src/IcePatch2Lib/ClientUtil.cpp +++ b/cpp/src/IcePatch2Lib/ClientUtil.cpp @@ -11,7 +11,7 @@ #include #define ICE_PATCH2_API_EXPORTS #include -#include +#include #include #include @@ -19,175 +19,194 @@ using namespace std; using namespace Ice; using namespace IceUtil; using namespace IcePatch2; +using namespace IcePatch2Internal; -namespace IcePatch2 +namespace { class Decompressor : public IceUtil::Thread, public IceUtil::Monitor { public: - Decompressor(const string& dataDir) : - _dataDir(dataDir), - _destroy(false) - { - } + Decompressor(const string&); + virtual ~Decompressor(); - virtual ~Decompressor() - { - assert(_destroy); - } + void destroy(); + void add(const LargeFileInfo&); + void exception() const; + void log(FILE* fp); + virtual void run(); - void - destroy() - { - IceUtil::Monitor::Lock sync(*this); - _destroy = true; - notify(); - } - - void - add(const FileInfo& info) - { - IceUtil::Monitor::Lock sync(*this); - if(!_exception.empty()) - { - throw _exception; - } - _files.push_back(info); - notify(); - } +private: - void - exception() const - { - IceUtil::Monitor::Lock sync(*this); - if(!_exception.empty()) - { - throw _exception; - } - } + const string _dataDir; - void - log(FILE* fp) - { - IceUtil::Monitor::Lock sync(*this); + string _exception; + list _files; + LargeFileInfoSeq _filesDone; + bool _destroy; +}; +typedef IceUtil::Handle DecompressorPtr; - for(FileInfoSeq::const_iterator p = _filesDone.begin(); p != _filesDone.end(); ++p) - { - if(fputc('+', fp) == EOF || !writeFileInfo(fp, *p)) - { - throw "error writing log file:\n" + IceUtilInternal::lastErrorToString(); - } - } +class PatcherI : public Patcher +{ +public: - _filesDone.clear(); - } + PatcherI(const Ice::CommunicatorPtr&, const PatcherFeedbackPtr&); + PatcherI(const FileServerPrx&, const PatcherFeedbackPtr&, const std::string&, bool, Ice::Int, Ice::Int); + virtual ~PatcherI(); - virtual void - run() - { - FileInfo info; - - while(true) - { - { - IceUtil::Monitor::Lock sync(*this); - - if(!info.path.empty()) - { - _filesDone.push_back(info); - } - - while(!_destroy && _files.empty()) - { - wait(); - } - - if(!_files.empty()) - { - info = _files.front(); - _files.pop_front(); - } - else - { - return; - } - } - - try - { - decompressFile(_dataDir + '/' + info.path); - setFileFlags(_dataDir + '/' + info.path, info); - remove(_dataDir + '/' + info.path + ".bz2"); - } - catch(const string& ex) - { - IceUtil::Monitor::Lock sync(*this); - _destroy = true; - _exception = ex; - return; - } - } - } + virtual bool prepare(); + virtual bool patch(const std::string&); + virtual void finish(); private: - const string _dataDir; - - string _exception; - list _files; - FileInfoSeq _filesDone; + void init(const FileServerPrx&); + bool removeFiles(const LargeFileInfoSeq&); + bool updateFiles(const LargeFileInfoSeq&); + bool updateFilesInternal(const LargeFileInfoSeq&, const DecompressorPtr&); + bool updateFlags(const LargeFileInfoSeq&); - bool _destroy; + const PatcherFeedbackPtr _feedback; + const std::string _dataDir; + const bool _thorough; + const Ice::Int _chunkSize; + const Ice::Int _remove; + const FileServerPrx _serverCompress; + const FileServerPrx _serverNoCompress; + + LargeFileInfoSeq _localFiles; + LargeFileInfoSeq _updateFiles; + LargeFileInfoSeq _updateFlags; + LargeFileInfoSeq _removeFiles; + + FILE* _log; + bool _useSmallFileAPI; }; +Decompressor::Decompressor(const string& dataDir) : + _dataDir(dataDir), + _destroy(false) +{ } -namespace +Decompressor::~Decompressor() { + assert(_destroy); +} -string -getDataDir(const CommunicatorPtr& communicator, const string& defaultValue) +void +Decompressor::destroy() { - return communicator->getProperties()->getPropertyWithDefault("IcePatch2Client.Directory", defaultValue); + IceUtil::Monitor::Lock sync(*this); + _destroy = true; + notify(); } -int -getThorough(const CommunicatorPtr& communicator, int defaultValue) +void +Decompressor::add(const LargeFileInfo& info) { - return communicator->getProperties()->getPropertyAsIntWithDefault("IcePatch2Client.Thorough", defaultValue); + IceUtil::Monitor::Lock sync(*this); + if(!_exception.empty()) + { + throw _exception; + } + _files.push_back(info); + notify(); } -int -getChunkSize(const CommunicatorPtr& communicator, int defaultValue) +void +Decompressor::exception() const { - return communicator->getProperties()->getPropertyAsIntWithDefault("IcePatch2Client.ChunkSize", defaultValue); + IceUtil::Monitor::Lock sync(*this); + if(!_exception.empty()) + { + throw _exception; + } } -int -getRemove(const CommunicatorPtr& communicator, int defaultValue) +void +Decompressor::log(FILE* fp) { - return communicator->getProperties()->getPropertyAsIntWithDefault("IcePatch2Client.Remove", defaultValue); + IceUtil::Monitor::Lock sync(*this); + + for(LargeFileInfoSeq::const_iterator p = _filesDone.begin(); p != _filesDone.end(); ++p) + { + if(fputc('+', fp) == EOF || !writeFileInfo(fp, *p)) + { + throw "error writing log file:\n" + IceUtilInternal::lastErrorToString(); + } + } + + _filesDone.clear(); } +void +Decompressor::run() +{ + LargeFileInfo info; + + while(true) + { + { + IceUtil::Monitor::Lock sync(*this); + + if(!info.path.empty()) + { + _filesDone.push_back(info); + } + + while(!_destroy && _files.empty()) + { + wait(); + } + + if(!_files.empty()) + { + info = _files.front(); + _files.pop_front(); + } + else + { + return; + } + } + + try + { + decompressFile(_dataDir + '/' + info.path); + setFileFlags(_dataDir + '/' + info.path, info); + remove(_dataDir + '/' + info.path + ".bz2"); + } + catch(const string& ex) + { + IceUtil::Monitor::Lock sync(*this); + _destroy = true; + _exception = ex; + return; + } + } } -IcePatch2::Patcher::Patcher(const CommunicatorPtr& communicator, const PatcherFeedbackPtr& feedback) : +PatcherI::PatcherI(const CommunicatorPtr& communicator, const PatcherFeedbackPtr& feedback) : _feedback(feedback), - _dataDir(getDataDir(communicator, ".")), - _thorough(getThorough(communicator, 0) > 0), - _chunkSize(getChunkSize(communicator, 100)), - _remove(getRemove(communicator, 1)), - _log(0) + _dataDir(communicator->getProperties()->getPropertyWithDefault("IcePatch2Client.Directory", ".")), + _thorough(communicator->getProperties()->getPropertyAsIntWithDefault("IcePatch2Client.Thorough", 0) > 0), + _chunkSize(communicator->getProperties()->getPropertyAsIntWithDefault("IcePatch2Client.ChunkSize", 100)), + _remove(communicator->getProperties()->getPropertyAsIntWithDefault("IcePatch2Client.Remove", 1)), + _log(0), + _useSmallFileAPI(false) { - const PropertiesPtr properties = communicator->getProperties(); const char* clientProxyProperty = "IcePatch2Client.Proxy"; - std::string clientProxy = properties->getProperty(clientProxyProperty); - ObjectPrx serverBase = communicator->stringToProxy(clientProxy); + string clientProxy = communicator->getProperties()->getProperty(clientProxyProperty); + if(clientProxy.empty()) + { + throw "property `IcePatch2Client.Proxy' is not set"; + } - FileServerPrx server = FileServerPrx::checkedCast(serverBase); + FileServerPrx server = FileServerPrx::checkedCast(communicator->stringToProxy(clientProxy)); if(!server) { throw "proxy `" + clientProxy + "' is not a file server."; @@ -196,22 +215,23 @@ IcePatch2::Patcher::Patcher(const CommunicatorPtr& communicator, const PatcherFe init(server); } -IcePatch2::Patcher::Patcher(const FileServerPrx& server, - const PatcherFeedbackPtr& feedback, - const string& dataDir, - bool thorough, - Ice::Int chunkSize, - Ice::Int remove) : +PatcherI::PatcherI(const FileServerPrx& server, + const PatcherFeedbackPtr& feedback, + const string& dataDir, + bool thorough, + Ice::Int chunkSize, + Ice::Int remove) : _feedback(feedback), _dataDir(dataDir), _thorough(thorough), _chunkSize(chunkSize), - _remove(remove) + _remove(remove), + _useSmallFileAPI(false) { init(server); } -IcePatch2::Patcher::~Patcher() +PatcherI::~PatcherI() { if(_log != 0) { @@ -220,9 +240,6 @@ IcePatch2::Patcher::~Patcher() } } -namespace -{ - class PatcherGetFileInfoSeqCB : public GetFileInfoSeqCB { public: @@ -255,10 +272,8 @@ private: const PatcherFeedbackPtr _feedback; }; -} - bool -IcePatch2::Patcher::prepare() +PatcherI::prepare() { _localFiles.clear(); @@ -316,95 +331,122 @@ IcePatch2::Patcher::prepare() { throw string("server returned illegal value"); } - - AsyncResultPtr curCB; - AsyncResultPtr nxtCB; - for(int node0 = 0; node0 < 256; ++node0) + while(true) { - if(tree0.nodes[node0].checksum != checksumSeq[node0]) + AsyncResultPtr curCB; + AsyncResultPtr nxtCB; + try { - if(!curCB) - { - assert(!nxtCB); - curCB = _serverCompress->begin_getFileInfoSeq(node0); - } - else - { - assert(nxtCB); - swap(nxtCB, curCB); - } - - int node0Nxt = node0; - - do + for(int node0 = 0; node0 < 256; ++node0) { - ++node0Nxt; - } - while(node0Nxt < 256 && tree0.nodes[node0Nxt].checksum == checksumSeq[node0Nxt]); + if(tree0.nodes[node0].checksum != checksumSeq[node0]) + { + if(!curCB) + { + assert(!nxtCB); + curCB = _useSmallFileAPI ? _serverCompress->begin_getFileInfoSeq(node0) : + _serverCompress->begin_getLargeFileInfoSeq(node0); + } + else + { + assert(nxtCB); + swap(nxtCB, curCB); + } + + int node0Nxt = node0; + + do + { + ++node0Nxt; + } + while(node0Nxt < 256 && tree0.nodes[node0Nxt].checksum == checksumSeq[node0Nxt]); - if(node0Nxt < 256) - { - nxtCB = _serverCompress->begin_getFileInfoSeq(node0Nxt); - } + if(node0Nxt < 256) + { + nxtCB = _useSmallFileAPI ? _serverCompress->begin_getFileInfoSeq(node0Nxt) : + _serverCompress->begin_getLargeFileInfoSeq(node0Nxt); + } - FileInfoSeq files = _serverCompress->end_getFileInfoSeq(curCB); - - sort(files.begin(), files.end(), FileInfoLess()); - files.erase(unique(files.begin(), files.end(), FileInfoEqual()), files.end()); - - // - // Compute the set of files which were removed. - // - set_difference(tree0.nodes[node0].files.begin(), - tree0.nodes[node0].files.end(), - files.begin(), - files.end(), - back_inserter(_removeFiles), - FileInfoWithoutFlagsLess()); // NOTE: We ignore the flags here. - - // - // Compute the set of files which were updated (either the file contents, flags or both). - // - FileInfoSeq updatedFiles; - updatedFiles.reserve(files.size()); - - set_difference(files.begin(), - files.end(), - tree0.nodes[node0].files.begin(), - tree0.nodes[node0].files.end(), - back_inserter(updatedFiles), - FileInfoLess()); - - // - // Compute the set of files whose contents was updated. - // - FileInfoSeq contentsUpdatedFiles; - contentsUpdatedFiles.reserve(files.size()); - - set_difference(files.begin(), - files.end(), - tree0.nodes[node0].files.begin(), - tree0.nodes[node0].files.end(), - back_inserter(contentsUpdatedFiles), - FileInfoWithoutFlagsLess()); // NOTE: We ignore the flags here. - copy(contentsUpdatedFiles.begin(), contentsUpdatedFiles.end(), back_inserter(_updateFiles)); - - // - // Compute the set of files whose flags were updated. - // - set_difference(updatedFiles.begin(), - updatedFiles.end(), - contentsUpdatedFiles.begin(), - contentsUpdatedFiles.end(), - back_inserter(_updateFlags), - FileInfoLess()); - } + LargeFileInfoSeq files; + if(_useSmallFileAPI) + { + FileInfoSeq smallFiles = _serverCompress->end_getFileInfoSeq(curCB); + files.resize(smallFiles.size()); + transform(smallFiles.begin(), smallFiles.end(), files.begin(), toLargeFileInfo); + } + else + { + files = _serverCompress->end_getLargeFileInfoSeq(curCB); + } + + sort(files.begin(), files.end(), FileInfoLess()); + files.erase(unique(files.begin(), files.end(), FileInfoEqual()), files.end()); + + // + // Compute the set of files which were removed. + // + set_difference(tree0.nodes[node0].files.begin(), + tree0.nodes[node0].files.end(), + files.begin(), + files.end(), + back_inserter(_removeFiles), + FileInfoWithoutFlagsLess()); // NOTE: We ignore the flags here. + + // + // Compute the set of files which were updated (either the file contents, flags or both). + // + LargeFileInfoSeq updatedFiles; + updatedFiles.reserve(files.size()); + + set_difference(files.begin(), + files.end(), + tree0.nodes[node0].files.begin(), + tree0.nodes[node0].files.end(), + back_inserter(updatedFiles), + FileInfoLess()); + + // + // Compute the set of files whose contents was updated. + // + LargeFileInfoSeq contentsUpdatedFiles; + contentsUpdatedFiles.reserve(files.size()); + + set_difference(files.begin(), + files.end(), + tree0.nodes[node0].files.begin(), + tree0.nodes[node0].files.end(), + back_inserter(contentsUpdatedFiles), + FileInfoWithoutFlagsLess()); // NOTE: We ignore the flags here. + copy(contentsUpdatedFiles.begin(), contentsUpdatedFiles.end(), back_inserter(_updateFiles)); + + // + // Compute the set of files whose flags were updated. + // + set_difference(updatedFiles.begin(), + updatedFiles.end(), + contentsUpdatedFiles.begin(), + contentsUpdatedFiles.end(), + back_inserter(_updateFlags), + FileInfoLess()); + } - if(!_feedback->fileListProgress((node0 + 1) * 100 / 256)) + if(!_feedback->fileListProgress((node0 + 1) * 100 / 256)) + { + return false; + } + } + } + catch(const Ice::OperationNotExistException&) { - return false; + if(!_useSmallFileAPI) + { + _useSmallFileAPI = true; + continue; + } + throw; } + break; } if(!_feedback->fileListEnd()) @@ -428,7 +470,7 @@ IcePatch2::Patcher::prepare() } bool -IcePatch2::Patcher::patch(const string& d) +PatcherI::patch(const string& d) { string dir = simplify(d); @@ -464,8 +506,8 @@ IcePatch2::Patcher::patch(const string& d) { string dirWithSlash = simplify(dir + '/'); - FileInfoSeq remove; - for(FileInfoSeq::const_iterator p = _removeFiles.begin(); p != _removeFiles.end(); ++p) + LargeFileInfoSeq remove; + for(LargeFileInfoSeq::const_iterator p = _removeFiles.begin(); p != _removeFiles.end(); ++p) { if(p->path == dir) { @@ -477,8 +519,8 @@ IcePatch2::Patcher::patch(const string& d) } } - FileInfoSeq update; - for(FileInfoSeq::const_iterator p = _updateFiles.begin(); p != _updateFiles.end(); ++p) + LargeFileInfoSeq update; + for(LargeFileInfoSeq::const_iterator p = _updateFiles.begin(); p != _updateFiles.end(); ++p) { if(p->path == dir) { @@ -490,8 +532,8 @@ IcePatch2::Patcher::patch(const string& d) } } - FileInfoSeq updateFlag; - for(FileInfoSeq::const_iterator p = _updateFlags.begin(); p != _updateFlags.end(); ++p) + LargeFileInfoSeq updateFlag; + for(LargeFileInfoSeq::const_iterator p = _updateFlags.begin(); p != _updateFlags.end(); ++p) { if(p->path == dir) { @@ -532,7 +574,7 @@ IcePatch2::Patcher::patch(const string& d) } void -IcePatch2::Patcher::finish() +PatcherI::finish() { if(_log != 0) { @@ -544,7 +586,7 @@ IcePatch2::Patcher::finish() } void -IcePatch2::Patcher::init(const FileServerPrx& server) +PatcherI::init(const FileServerPrx& server) { if(_dataDir.empty()) { @@ -592,14 +634,14 @@ IcePatch2::Patcher::init(const FileServerPrx& server) } bool -IcePatch2::Patcher::removeFiles(const FileInfoSeq& files) +PatcherI::removeFiles(const LargeFileInfoSeq& files) { if(_remove < 1) { return true; } - for(FileInfoSeq::const_reverse_iterator p = files.rbegin(); p != files.rend(); ++p) + for(LargeFileInfoSeq::const_reverse_iterator p = files.rbegin(); p != files.rend(); ++p) { try { @@ -618,7 +660,7 @@ IcePatch2::Patcher::removeFiles(const FileInfoSeq& files) } } - FileInfoSeq newLocalFiles; + LargeFileInfoSeq newLocalFiles; newLocalFiles.reserve(_localFiles.size()); set_difference(_localFiles.begin(), @@ -630,7 +672,7 @@ IcePatch2::Patcher::removeFiles(const FileInfoSeq& files) _localFiles.swap(newLocalFiles); - FileInfoSeq newRemoveFiles; + LargeFileInfoSeq newRemoveFiles; set_difference(_removeFiles.begin(), _removeFiles.end(), @@ -643,9 +685,9 @@ IcePatch2::Patcher::removeFiles(const FileInfoSeq& files) return true; } - + bool -IcePatch2::Patcher::updateFiles(const FileInfoSeq& files) +PatcherI::updateFiles(const LargeFileInfoSeq& files) { DecompressorPtr decompressor = new Decompressor(_dataDir); #if defined(__hppa) @@ -680,12 +722,12 @@ IcePatch2::Patcher::updateFiles(const FileInfoSeq& files) } bool -IcePatch2::Patcher::updateFilesInternal(const FileInfoSeq& files, const DecompressorPtr& decompressor) +PatcherI::updateFilesInternal(const LargeFileInfoSeq& files, const DecompressorPtr& decompressor) { Long total = 0; Long updated = 0; - for(FileInfoSeq::const_iterator p = files.begin(); p != files.end(); ++p) + for(LargeFileInfoSeq::const_iterator p = files.begin(); p != files.end(); ++p) { if(p->size > 0) // Regular, non-empty file? { @@ -696,7 +738,7 @@ IcePatch2::Patcher::updateFilesInternal(const FileInfoSeq& files, const Decompre AsyncResultPtr curCB; AsyncResultPtr nxtCB; - for(FileInfoSeq::const_iterator p = files.begin(); p != files.end(); ++p) + for(LargeFileInfoSeq::const_iterator p = files.begin(); p != files.end(); ++p) { if(p->size < 0) // Directory? { @@ -749,14 +791,16 @@ IcePatch2::Patcher::updateFilesInternal(const FileInfoSeq& files, const Decompre try { - Int pos = 0; + Ice::Long pos = 0; while(pos < p->size) { if(!curCB) { assert(!nxtCB); - curCB = _serverNoCompress->begin_getFileCompressed(p->path, pos, _chunkSize); + curCB = _useSmallFileAPI ? + _serverNoCompress->begin_getFileCompressed(p->path, static_cast(pos), _chunkSize) : + _serverNoCompress->begin_getLargeFileCompressed(p->path, pos, _chunkSize); } else { @@ -766,11 +810,13 @@ IcePatch2::Patcher::updateFilesInternal(const FileInfoSeq& files, const Decompre if(pos + _chunkSize < p->size) { - nxtCB = _serverNoCompress->begin_getFileCompressed(p->path, pos + _chunkSize, _chunkSize); + nxtCB = _useSmallFileAPI ? + _serverNoCompress->begin_getFileCompressed(p->path, static_cast(pos + _chunkSize), _chunkSize) : + _serverNoCompress->begin_getLargeFileCompressed(p->path, pos + _chunkSize, _chunkSize); } else { - FileInfoSeq::const_iterator q = p + 1; + LargeFileInfoSeq::const_iterator q = p + 1; while(q != files.end() && q->size <= 0) { @@ -779,7 +825,9 @@ IcePatch2::Patcher::updateFilesInternal(const FileInfoSeq& files, const Decompre if(q != files.end()) { - nxtCB = _serverNoCompress->begin_getFileCompressed(q->path, 0, _chunkSize); + nxtCB = _useSmallFileAPI ? + _serverNoCompress->begin_getFileCompressed(q->path, 0, _chunkSize) : + _serverNoCompress->begin_getLargeFileCompressed(q->path, 0, _chunkSize); } } @@ -787,7 +835,8 @@ IcePatch2::Patcher::updateFilesInternal(const FileInfoSeq& files, const Decompre try { - bytes = _serverNoCompress->end_getFileCompressed(curCB); + bytes = _useSmallFileAPI ? _serverNoCompress->end_getFileCompressed(curCB) : + _serverNoCompress->end_getLargeFileCompressed(curCB); } catch(const FileAccessException& ex) { @@ -804,7 +853,7 @@ IcePatch2::Patcher::updateFilesInternal(const FileInfoSeq& files, const Decompre throw ": cannot write `" + pathBZ2 + "':\n" + IceUtilInternal::lastErrorToString(); } - pos += static_cast(bytes.size()); + pos += bytes.size(); updated += bytes.size(); if(!_feedback->patchProgress(pos, p->size, updated, total)) @@ -833,7 +882,7 @@ IcePatch2::Patcher::updateFilesInternal(const FileInfoSeq& files, const Decompre } } - FileInfoSeq newLocalFiles; + LargeFileInfoSeq newLocalFiles; newLocalFiles.reserve(_localFiles.size()); set_union(_localFiles.begin(), @@ -845,7 +894,7 @@ IcePatch2::Patcher::updateFilesInternal(const FileInfoSeq& files, const Decompre _localFiles.swap(newLocalFiles); - FileInfoSeq newUpdateFiles; + LargeFileInfoSeq newUpdateFiles; set_difference(_updateFiles.begin(), _updateFiles.end(), @@ -860,9 +909,9 @@ IcePatch2::Patcher::updateFilesInternal(const FileInfoSeq& files, const Decompre } bool -IcePatch2::Patcher::updateFlags(const FileInfoSeq& files) +PatcherI::updateFlags(const LargeFileInfoSeq& files) { - for(FileInfoSeq::const_iterator p = files.begin(); p != files.end(); ++p) + for(LargeFileInfoSeq::const_iterator p = files.begin(); p != files.end(); ++p) { if(p->size >= 0) // Regular file? { @@ -874,7 +923,7 @@ IcePatch2::Patcher::updateFlags(const FileInfoSeq& files) // Remove the old files whose flags were updated from the set of // local files. // - FileInfoSeq localFiles; + LargeFileInfoSeq localFiles; localFiles.reserve(_localFiles.size()); set_difference(_localFiles.begin(), _localFiles.end(), @@ -894,7 +943,7 @@ IcePatch2::Patcher::updateFlags(const FileInfoSeq& files) back_inserter(_localFiles), FileInfoLess()); - FileInfoSeq newUpdateFlags; + LargeFileInfoSeq newUpdateFlags; set_difference(_updateFlags.begin(), _updateFlags.end(), @@ -908,3 +957,25 @@ IcePatch2::Patcher::updateFlags(const FileInfoSeq& files) return true; } +} + +PatcherPtr +PatcherFactory::create(const Ice::CommunicatorPtr& communicator, const PatcherFeedbackPtr& feedback) +{ + return new PatcherI(communicator, feedback); +} + +// +// Create a patcher with the given parameters. These parameters +// are equivalent to the configuration properties described above. +// +PatcherPtr +PatcherFactory::create(const FileServerPrx& server, + const PatcherFeedbackPtr& feedback, + const string& dataDir, + bool thorough, + Ice::Int chunkSize, + Ice::Int remove) +{ + return new PatcherI(server, feedback, dataDir, thorough, chunkSize, remove); +} diff --git a/cpp/src/IcePatch2Lib/Makefile b/cpp/src/IcePatch2Lib/Makefile index 871a9ed02e9..80a59f38bfb 100644 --- a/cpp/src/IcePatch2Lib/Makefile +++ b/cpp/src/IcePatch2Lib/Makefile @@ -27,7 +27,7 @@ SDIR = $(slicedir)/IcePatch2 include $(top_srcdir)/config/Make.rules -CPPFLAGS := -I. -I.. $(CPPFLAGS) $(OPENSSL_FLAGS) $(BZIP2_FLAGS) +CPPFLAGS := -I. -I.. $(CPPFLAGS) $(OPENSSL_FLAGS) $(BZIP2_FLAGS) -Wno-deprecated-declarations SLICE2CPPFLAGS := --ice --include-dir IcePatch2 --dll-export ICE_PATCH2_API $(SLICE2CPPFLAGS) LINKWITH := $(BZIP2_RPATH_LINK) -lIce -lIceUtil $(OPENSSL_LIBS) $(BZIP2_LIBS) diff --git a/cpp/src/IcePatch2Lib/Makefile.mak b/cpp/src/IcePatch2Lib/Makefile.mak index a2c29ccbf84..ec9456261d9 100755 --- a/cpp/src/IcePatch2Lib/Makefile.mak +++ b/cpp/src/IcePatch2Lib/Makefile.mak @@ -26,7 +26,7 @@ SDIR = $(slicedir)\IcePatch2 !include $(top_srcdir)\config\Make.rules.mak -CPPFLAGS = -I. -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN +CPPFLAGS = -I. -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -wd4996 SLICE2CPPFLAGS = --ice --include-dir IcePatch2 --dll-export ICE_PATCH2_API $(SLICE2CPPFLAGS) diff --git a/cpp/src/IcePatch2Lib/Util.cpp b/cpp/src/IcePatch2Lib/Util.cpp index ab27759d87a..948a3646d5c 100644 --- a/cpp/src/IcePatch2Lib/Util.cpp +++ b/cpp/src/IcePatch2Lib/Util.cpp @@ -20,9 +20,11 @@ #include #include #include +#include #define ICE_PATCH2_API_EXPORTS -#include +#include +#include #include #include @@ -40,17 +42,54 @@ #pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif -const char* IcePatch2::checksumFile = "IcePatch2.sum"; -const char* IcePatch2::logFile = "IcePatch2.log"; +const char* IcePatch2Internal::checksumFile = "IcePatch2.sum"; +const char* IcePatch2Internal::logFile = "IcePatch2.log"; using namespace std; using namespace Ice; using namespace IcePatch2; +using namespace IcePatch2Internal; + +FileInfo +IcePatch2Internal::toFileInfo(const LargeFileInfo& largeInfo) +{ + if(largeInfo.size > 0x7FFFFFFF) + { + ostringstream os; + os << "cannot encode size `" << largeInfo.size << "' for file `" << largeInfo.path << "' as Ice::Int" << endl; + throw FileSizeRangeException(os.str()); + } + + FileInfo info; + info.path = largeInfo.path; + info.checksum = largeInfo.checksum; + info.size = static_cast(largeInfo.size), + info.executable = largeInfo.executable; + + return info; +} + +LargeFileInfo +IcePatch2Internal::toLargeFileInfo(const FileInfo& info) +{ + LargeFileInfo largeInfo; + largeInfo.path = info.path; + largeInfo.checksum = info.checksum; + largeInfo.size = info.size; + largeInfo.executable = info.executable; + return largeInfo; +} + +bool +IcePatch2Internal::writeFileInfo(FILE* fp, const FileInfo& info) +{ + return writeFileInfo(fp, toLargeFileInfo(info)); +} bool -IcePatch2::writeFileInfo(FILE* fp, const FileInfo& info) +IcePatch2Internal::writeFileInfo(FILE* fp, const LargeFileInfo& info) { - int rc = fprintf(fp, "%s\t%s\t%d\t%d\n", + int rc = fprintf(fp, "%s\t%s\t%ld\t%d\n", IceUtilInternal::escapeString(info.path, "").c_str(), bytesToString(info.checksum).c_str(), info.size, @@ -59,7 +98,19 @@ IcePatch2::writeFileInfo(FILE* fp, const FileInfo& info) } bool -IcePatch2::readFileInfo(FILE* fp, FileInfo& info) +IcePatch2Internal::readFileInfo(FILE* fp, FileInfo& info) +{ + LargeFileInfo largeInfo; + bool retval = readFileInfo(fp, largeInfo); + if(retval) + { + info = toFileInfo(largeInfo); + } + return retval; +} + +bool +IcePatch2Internal::readFileInfo(FILE* fp, LargeFileInfo& info) { string data; char buf[BUFSIZ]; @@ -101,7 +152,7 @@ IcePatch2::readFileInfo(FILE* fp, FileInfo& info) } string -IcePatch2::bytesToString(const ByteSeq& bytes) +IcePatch2Internal::bytesToString(const ByteSeq& bytes) { /* ostringstream s; @@ -129,7 +180,7 @@ IcePatch2::bytesToString(const ByteSeq& bytes) } ByteSeq -IcePatch2::stringToBytes(const string& str) +IcePatch2Internal::stringToBytes(const string& str) { ByteSeq bytes; bytes.reserve((str.size() + 1) / 2); @@ -174,7 +225,7 @@ IcePatch2::stringToBytes(const string& str) } string -IcePatch2::simplify(const string& path) +IcePatch2Internal::simplify(const string& path) { string result = path; @@ -250,7 +301,7 @@ IcePatch2::simplify(const string& path) } bool -IcePatch2::isRoot(const string& pa) +IcePatch2Internal::isRoot(const string& pa) { string path = simplify(pa); #ifdef _WIN32 @@ -262,7 +313,7 @@ IcePatch2::isRoot(const string& pa) } string -IcePatch2::getSuffix(const string& pa) +IcePatch2Internal::getSuffix(const string& pa) { const string path = simplify(pa); @@ -278,7 +329,7 @@ IcePatch2::getSuffix(const string& pa) } string -IcePatch2::getWithoutSuffix(const string& pa) +IcePatch2Internal::getWithoutSuffix(const string& pa) { const string path = simplify(pa); @@ -294,7 +345,7 @@ IcePatch2::getWithoutSuffix(const string& pa) } bool -IcePatch2::ignoreSuffix(const string& path) +IcePatch2Internal::ignoreSuffix(const string& path) { string suffix = getSuffix(path); return suffix == "md5" // For legacy IcePatch. @@ -304,7 +355,7 @@ IcePatch2::ignoreSuffix(const string& path) } string -IcePatch2::getBasename(const string& pa) +IcePatch2Internal::getBasename(const string& pa) { const string path = simplify(pa); @@ -320,7 +371,7 @@ IcePatch2::getBasename(const string& pa) } string -IcePatch2::getDirname(const string& pa) +IcePatch2Internal::getDirname(const string& pa) { const string path = simplify(pa); @@ -336,7 +387,7 @@ IcePatch2::getDirname(const string& pa) } void -IcePatch2::rename(const string& fromPa, const string& toPa) +IcePatch2Internal::rename(const string& fromPa, const string& toPa) { const string fromPath = simplify(fromPa); @@ -350,7 +401,7 @@ IcePatch2::rename(const string& fromPa, const string& toPa) } void -IcePatch2::remove(const string& pa) +IcePatch2Internal::remove(const string& pa) { const string path = simplify(pa); @@ -381,7 +432,7 @@ IcePatch2::remove(const string& pa) } void -IcePatch2::removeRecursive(const string& pa) +IcePatch2Internal::removeRecursive(const string& pa) { const string path = simplify(pa); @@ -417,7 +468,7 @@ IcePatch2::removeRecursive(const string& pa) } StringSeq -IcePatch2::readDirectory(const string& pa) +IcePatch2Internal::readDirectory(const string& pa) { const string path = simplify(pa); @@ -498,7 +549,7 @@ IcePatch2::readDirectory(const string& pa) } void -IcePatch2::createDirectory(const string& pa) +IcePatch2Internal::createDirectory(const string& pa) { const string path = simplify(pa); @@ -512,7 +563,7 @@ IcePatch2::createDirectory(const string& pa) } void -IcePatch2::createDirectoryRecursive(const string& pa) +IcePatch2Internal::createDirectoryRecursive(const string& pa) { const string path = simplify(pa); @@ -544,7 +595,7 @@ IcePatch2::createDirectoryRecursive(const string& pa) } void -IcePatch2::compressBytesToFile(const string& pa, const ByteSeq& bytes, Int pos) +IcePatch2Internal::compressBytesToFile(const string& pa, const ByteSeq& bytes, Int pos) { const string path = simplify(pa); @@ -596,11 +647,11 @@ IcePatch2::compressBytesToFile(const string& pa, const ByteSeq& bytes, Int pos) } void -IcePatch2::decompressFile(const string& pa) +IcePatch2Internal::decompressFile(const string& pa) { const string path = simplify(pa); const string pathBZ2 = path + ".bz2"; - + FILE* fp = 0; FILE* stdioFileBZ2 = 0; int bzError; @@ -695,9 +746,15 @@ IcePatch2::decompressFile(const string& pa) fclose(fp); } +void +IcePatch2Internal::setFileFlags(const string& pa, const FileInfo& info) +{ + setFileFlags(pa, toLargeFileInfo(info)); +} + #ifndef _WIN32 void -IcePatch2::setFileFlags(const string& pa, const FileInfo& info) +IcePatch2Internal::setFileFlags(const string& pa, const LargeFileInfo& info) { const string path = simplify(pa); IceUtilInternal::structstat buf; @@ -709,14 +766,17 @@ IcePatch2::setFileFlags(const string& pa, const FileInfo& info) } #else // Windows doesn't support the executable flag void -IcePatch2::setFileFlags(const string&, const FileInfo&) +IcePatch2Internal::setFileFlags(const string&, const LargeFileInfo&) { } #endif +namespace +{ + static bool -getFileInfoSeqInt(const string& basePath, const string& relPath, int compress, GetFileInfoSeqCB* cb, - FileInfoSeq& infoSeq) +getFileInfoSeqInternal(const string& basePath, const string& relPath, int compress, GetFileInfoSeqCB* cb, + LargeFileInfoSeq& infoSeq) { if(relPath == checksumFile || relPath == logFile) { @@ -779,7 +839,7 @@ getFileInfoSeqInt(const string& basePath, const string& relPath, int compress, G if(S_ISDIR(buf.st_mode)) { - FileInfo info; + LargeFileInfo info; info.path = relPath; info.size = -1; info.executable = false; @@ -803,7 +863,7 @@ getFileInfoSeqInt(const string& basePath, const string& relPath, int compress, G StringSeq content = readDirectory(path); for(StringSeq::const_iterator p = content.begin(); p != content.end() ; ++p) { - if(!getFileInfoSeqInt(basePath, simplify(relPath + '/' + *p), compress, cb, infoSeq)) + if(!getFileInfoSeqInternal(basePath, simplify(relPath + '/' + *p), compress, cb, infoSeq)) { return false; } @@ -811,7 +871,7 @@ getFileInfoSeqInt(const string& basePath, const string& relPath, int compress, G } else if(S_ISREG(buf.st_mode)) { - FileInfo info; + LargeFileInfo info; info.path = relPath; info.size = 0; #ifdef _WIN32 @@ -841,7 +901,7 @@ getFileInfoSeqInt(const string& basePath, const string& relPath, int compress, G } else { - info.size = static_cast(bufBZ2.st_size); + info.size = bufBZ2.st_size; } } @@ -900,10 +960,10 @@ getFileInfoSeqInt(const string& basePath, const string& relPath, int compress, G } } - unsigned int bytesLeft = static_cast(buf.st_size); + long bytesLeft = buf.st_size; while(bytesLeft > 0) { - ByteSeq bytes(min(bytesLeft, 1024u*1024)); + ByteSeq bytes(min(bytesLeft, 1024l*1024)); if( #if defined(_MSC_VER) _read(fd, &bytes[0], static_cast(bytes.size())) @@ -921,7 +981,6 @@ getFileInfoSeqInt(const string& basePath, const string& relPath, int compress, G throw "cannot read from `" + path + "':\n" + IceUtilInternal::lastErrorToString(); } bytesLeft -= static_cast(bytes.size()); - if(doCompress) { BZ2_bzWrite(&bzError, bzFile, const_cast(&bytes[0]), static_cast(bytes.size())); @@ -967,7 +1026,7 @@ getFileInfoSeqInt(const string& basePath, const string& relPath, int compress, G throw "cannot stat `" + pathBZ2 + "':\n" + IceUtilInternal::lastErrorToString(); } - info.size = static_cast(bufBZ2.st_size); + info.size = bufBZ2.st_size; } } hasher.finalize(bytesSHA); @@ -982,21 +1041,44 @@ getFileInfoSeqInt(const string& basePath, const string& relPath, int compress, G return true; } +} + +bool +IcePatch2Internal::getFileInfoSeq(const string& basePath, int compress, GetFileInfoSeqCB* cb, FileInfoSeq& infoSeq) +{ + LargeFileInfoSeq largeInfoSeq; + bool retval = getFileInfoSeq(basePath, compress, cb, largeInfoSeq); + infoSeq.resize(largeInfoSeq.size()); + transform(largeInfoSeq.begin(), largeInfoSeq.end(), infoSeq.begin(), toFileInfo); + return retval; +} + bool -IcePatch2::getFileInfoSeq(const string& basePath, int compress, GetFileInfoSeqCB* cb, - FileInfoSeq& infoSeq) +IcePatch2Internal::getFileInfoSeq(const string& basePath, int compress, GetFileInfoSeqCB* cb, + LargeFileInfoSeq& infoSeq) { return getFileInfoSeqSubDir(basePath, ".", compress, cb, infoSeq); } bool -IcePatch2::getFileInfoSeqSubDir(const string& basePa, const string& relPa, int compress, GetFileInfoSeqCB* cb, - FileInfoSeq& infoSeq) +IcePatch2Internal::getFileInfoSeqSubDir(const string& basePa, const string& relPa, int compress, GetFileInfoSeqCB* cb, + FileInfoSeq& infoSeq) +{ + LargeFileInfoSeq largeInfoSeq; + bool retval = getFileInfoSeqSubDir(basePa, relPa, compress, cb, largeInfoSeq); + infoSeq.resize(largeInfoSeq.size()); + transform(largeInfoSeq.begin(), largeInfoSeq.end(), infoSeq.begin(), toFileInfo); + return retval; +} + +bool +IcePatch2Internal::getFileInfoSeqSubDir(const string& basePa, const string& relPa, int compress, GetFileInfoSeqCB* cb, + LargeFileInfoSeq& infoSeq) { const string basePath = simplify(basePa); const string relPath = simplify(relPa); - if(!getFileInfoSeqInt(basePath, relPath, compress, cb, infoSeq)) + if(!getFileInfoSeqInternal(basePath, relPath, compress, cb, infoSeq)) { return false; } @@ -1008,11 +1090,18 @@ IcePatch2::getFileInfoSeqSubDir(const string& basePa, const string& relPa, int c } void -IcePatch2::saveFileInfoSeq(const string& pa, const FileInfoSeq& infoSeq) +IcePatch2Internal::saveFileInfoSeq(const string& pa, const FileInfoSeq& infoSeq) +{ + LargeFileInfoSeq largeInfoSeq(infoSeq.size()); + transform(infoSeq.begin(), infoSeq.end(), largeInfoSeq.begin(), toLargeFileInfo); + saveFileInfoSeq(pa, largeInfoSeq); +} + +void +IcePatch2Internal::saveFileInfoSeq(const string& pa, const LargeFileInfoSeq& infoSeq) { { const string path = simplify(pa + '/' + checksumFile); - FILE* fp = IceUtilInternal::fopen(path, "w"); if(!fp) { @@ -1020,7 +1109,7 @@ IcePatch2::saveFileInfoSeq(const string& pa, const FileInfoSeq& infoSeq) } try { - for(FileInfoSeq::const_iterator p = infoSeq.begin(); p != infoSeq.end(); ++p) + for(LargeFileInfoSeq::const_iterator p = infoSeq.begin(); p != infoSeq.end(); ++p) { if(!writeFileInfo(fp, *p)) { @@ -1050,7 +1139,16 @@ IcePatch2::saveFileInfoSeq(const string& pa, const FileInfoSeq& infoSeq) } void -IcePatch2::loadFileInfoSeq(const string& pa, FileInfoSeq& infoSeq) +IcePatch2Internal::loadFileInfoSeq(const string& pa, FileInfoSeq& infoSeq) +{ + LargeFileInfoSeq largeInfoSeq; + loadFileInfoSeq(pa, largeInfoSeq); + infoSeq.resize(largeInfoSeq.size()); + transform(largeInfoSeq.begin(), largeInfoSeq.end(), infoSeq.begin(), toFileInfo); +} + +void +IcePatch2Internal::loadFileInfoSeq(const string& pa, LargeFileInfoSeq& infoSeq) { { const string path = simplify(pa + '/' + checksumFile); @@ -1063,7 +1161,7 @@ IcePatch2::loadFileInfoSeq(const string& pa, FileInfoSeq& infoSeq) while(true) { - FileInfo info; + LargeFileInfo info; if(readFileInfo(fp, info)) { infoSeq.push_back(info); @@ -1085,8 +1183,8 @@ IcePatch2::loadFileInfoSeq(const string& pa, FileInfoSeq& infoSeq) FILE* fp = IceUtilInternal::fopen(pathLog, "r"); if(fp != 0) { - FileInfoSeq remove; - FileInfoSeq update; + LargeFileInfoSeq remove; + LargeFileInfoSeq update; while(true) { @@ -1096,7 +1194,7 @@ IcePatch2::loadFileInfoSeq(const string& pa, FileInfoSeq& infoSeq) break; } - FileInfo info; + LargeFileInfo info; if(!readFileInfo(fp, info)) { break; @@ -1119,7 +1217,7 @@ IcePatch2::loadFileInfoSeq(const string& pa, FileInfoSeq& infoSeq) sort(update.begin(), update.end(), FileInfoLess()); update.erase(unique(update.begin(), update.end(), FileInfoEqual()), update.end()); - FileInfoSeq newInfoSeq; + LargeFileInfoSeq newInfoSeq; newInfoSeq.reserve(infoSeq.size()); set_difference(infoSeq.begin(), @@ -1149,7 +1247,15 @@ IcePatch2::loadFileInfoSeq(const string& pa, FileInfoSeq& infoSeq) } void -IcePatch2::getFileTree0(const FileInfoSeq& infoSeq, FileTree0& tree0) +IcePatch2Internal::getFileTree0(const FileInfoSeq& infoSeq, FileTree0& tree0) +{ + LargeFileInfoSeq largeInfoSeq(infoSeq.size()); + transform(infoSeq.begin(), infoSeq.end(), largeInfoSeq.begin(), toLargeFileInfo); + getFileTree0(largeInfoSeq, tree0); +} + +void +IcePatch2Internal::getFileTree0(const LargeFileInfoSeq& infoSeq, FileTree0& tree0) { tree0.nodes.resize(256); tree0.checksum.resize(20); @@ -1165,7 +1271,7 @@ IcePatch2::getFileTree0(const FileInfoSeq& infoSeq, FileTree0& tree0) tree1.files.clear(); tree1.checksum.resize(20); - for(FileInfoSeq::const_iterator p = infoSeq.begin(); p != infoSeq.end(); ++p) + for(LargeFileInfoSeq::const_iterator p = infoSeq.begin(); p != infoSeq.end(); ++p) { if(i == static_cast(p->checksum[0])) { @@ -1177,7 +1283,7 @@ IcePatch2::getFileTree0(const FileInfoSeq& infoSeq, FileTree0& tree0) allChecksums1.resize(tree1.files.size() * 21); // 20 bytes for the checksum + 1 byte for the flag ByteSeq::iterator c1 = allChecksums1.begin(); - for(FileInfoSeq::const_iterator p = tree1.files.begin(); p != tree1.files.end(); ++p, c1 += 21) + for(LargeFileInfoSeq::const_iterator p = tree1.files.begin(); p != tree1.files.end(); ++p, c1 += 21) { copy(p->checksum.begin(), p->checksum.end(), c1); *(c1 + 20) = p->executable; diff --git a/cpp/src/IcePatch2Lib/Util.h b/cpp/src/IcePatch2Lib/Util.h new file mode 100644 index 00000000000..4f243a5d640 --- /dev/null +++ b/cpp/src/IcePatch2Lib/Util.h @@ -0,0 +1,207 @@ +// ********************************************************************** +// +// 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. +// +// ********************************************************************** + +#ifndef ICE_PATCH2_UTIL_H +#define ICE_PATCH2_UTIL_H + +#include +#include +#include + +namespace IcePatch2Internal +{ + +ICE_PATCH2_API extern const char* checksumFile; +ICE_PATCH2_API extern const char* logFile; + +ICE_PATCH2_API std::string lastError(); + +ICE_PATCH2_API std::string bytesToString(const Ice::ByteSeq&); +ICE_PATCH2_API Ice::ByteSeq stringToBytes(const std::string&); + +ICE_PATCH2_API std::string simplify(const std::string&); + +ICE_PATCH2_API bool isRoot(const std::string&); + +ICE_PATCH2_API std::string getSuffix(const std::string&); +ICE_PATCH2_API std::string getWithoutSuffix(const std::string&); +ICE_PATCH2_API bool ignoreSuffix(const std::string&); + +ICE_PATCH2_API std::string getBasename(const std::string&); +ICE_PATCH2_API std::string getDirname(const std::string&); + +ICE_PATCH2_API void rename(const std::string&, const std::string&); + +ICE_PATCH2_API void remove(const std::string&); +ICE_PATCH2_API void removeRecursive(const std::string&); + +ICE_PATCH2_API Ice::StringSeq readDirectory(const std::string&); + +ICE_PATCH2_API void createDirectory(const std::string&); +ICE_PATCH2_API void createDirectoryRecursive(const std::string&); + +ICE_PATCH2_API void compressBytesToFile(const std::string&, const Ice::ByteSeq&, Ice::Int); +ICE_PATCH2_API void decompressFile(const std::string&); + +ICE_PATCH2_API void setFileFlags(const std::string&, const IcePatch2::FileInfo&); +ICE_PATCH2_API void setFileFlags(const std::string&, const IcePatch2::LargeFileInfo&); + +struct FileInfoEqual : public std::binary_function +{ + bool + operator()(const IcePatch2::LargeFileInfo& lhs, const IcePatch2::LargeFileInfo& rhs) + { + if(lhs.path != rhs.path) + { + return false; + } + + // + // For the size portion of the comparison, we only distinquish + // between file (size >= 0) and directory (size == -1). We do + // not take the actual size into account, as it might be set + // to 0 if no compressed file is available. + // + Ice::Long lsz = lhs.size > 0 ? 0 : lhs.size; + Ice::Long rsz = rhs.size > 0 ? 0 : rhs.size; + if(lsz != rsz) + { + return false; + } + + if(lhs.executable != rhs.executable) + { + return false; + } + + return lhs.checksum == rhs.checksum; + } +}; + +struct FileInfoWithoutFlagsLess : public std::binary_function +{ + bool + operator()(const IcePatch2::LargeFileInfo& lhs, const IcePatch2::LargeFileInfo& rhs) + { + return compareWithoutFlags(lhs, rhs) < 0; + } + + int + compareWithoutFlags(const IcePatch2::LargeFileInfo& lhs, const IcePatch2::LargeFileInfo& rhs) + { + if(lhs.path < rhs.path) + { + return -1; + } + else if(rhs.path < lhs.path) + { + return 1; + } + + // + // For the size portion of the comparison, we only distinquish + // between file (size >= 0) and directory (size == -1). We do + // not take the actual size into account, as it might be set + // to 0 if no compressed file is available. + // + Ice::Long lsz = lhs.size > 0 ? 0 : lhs.size; + Ice::Long rsz = rhs.size > 0 ? 0 : rhs.size; + if(lsz < rsz) + { + return -1; + } + else if(rsz < lsz) + { + return 1; + } + + if(lhs.checksum < rhs.checksum) + { + return -1; + } + else if(rhs.checksum < lhs.checksum) + { + return 1; + } + + return 0; + } +}; + +struct FileInfoLess : public FileInfoWithoutFlagsLess +{ + bool + operator()(const IcePatch2::LargeFileInfo& lhs, const IcePatch2::LargeFileInfo& rhs) + { + int rc = compareWithoutFlags(lhs, rhs); + if(rc < 0) + { + return true; + } + else if(rc > 0) + { + return false; + } + + return lhs.executable < rhs.executable; + } +}; + +class ICE_PATCH2_API GetFileInfoSeqCB +{ +public: + + virtual ~GetFileInfoSeqCB() { } + + virtual bool remove(const std::string&) = 0; + virtual bool checksum(const std::string&) = 0; + virtual bool compress(const std::string&) = 0; +}; + +ICE_PATCH2_API bool getFileInfoSeq(const std::string&, int, GetFileInfoSeqCB*, IcePatch2::FileInfoSeq&); +ICE_PATCH2_API bool getFileInfoSeq(const std::string&, int, GetFileInfoSeqCB*, IcePatch2::LargeFileInfoSeq&); + +ICE_PATCH2_API bool getFileInfoSeqSubDir(const std::string&, const std::string&, int, GetFileInfoSeqCB*, IcePatch2::FileInfoSeq&); +ICE_PATCH2_API bool getFileInfoSeqSubDir(const std::string&, const std::string&, int, GetFileInfoSeqCB*, IcePatch2::LargeFileInfoSeq&); + +ICE_PATCH2_API void saveFileInfoSeq(const std::string&, const IcePatch2::FileInfoSeq&); +ICE_PATCH2_API void saveFileInfoSeq(const std::string&, const IcePatch2::LargeFileInfoSeq&); + +ICE_PATCH2_API void loadFileInfoSeq(const std::string&, IcePatch2::FileInfoSeq&); +ICE_PATCH2_API void loadFileInfoSeq(const std::string&, IcePatch2::LargeFileInfoSeq&); + +ICE_PATCH2_API bool readFileInfo(FILE*, IcePatch2::FileInfo&); +ICE_PATCH2_API bool readFileInfo(FILE*, IcePatch2::LargeFileInfo&); + +ICE_PATCH2_API IcePatch2::FileInfo toFileInfo(const IcePatch2::LargeFileInfo&); +ICE_PATCH2_API IcePatch2::LargeFileInfo toLargeFileInfo(const IcePatch2::FileInfo&); + +ICE_PATCH2_API bool writeFileInfo(FILE*, const IcePatch2::FileInfo&); +ICE_PATCH2_API bool writeFileInfo(FILE*, const IcePatch2::LargeFileInfo&); + +struct FileTree1 +{ + IcePatch2::LargeFileInfoSeq files; + Ice::ByteSeq checksum; +}; + +typedef std::vector FileTree1Seq; + +struct FileTree0 +{ + FileTree1Seq nodes; + Ice::ByteSeq checksum; +}; + +ICE_PATCH2_API void getFileTree0(const IcePatch2::FileInfoSeq&, FileTree0&); +ICE_PATCH2_API void getFileTree0(const IcePatch2::LargeFileInfoSeq&, FileTree0&); + +} + +#endif diff --git a/cpp/src/IceSSL/.depend.mak b/cpp/src/IceSSL/.depend.mak index 8e8c5dd1c9d..1f12a1b7af5 100755 --- a/cpp/src/IceSSL/.depend.mak +++ b/cpp/src/IceSSL/.depend.mak @@ -217,6 +217,7 @@ AcceptorI.obj: \ "..\..\src\Ice\ConnectorF.h" \ "..\..\src\Ice\EndpointFactory.h" \ "..\..\src\Ice\EndpointFactoryF.h" \ + "$(includedir)\Ice\Plugin.h" \ "$(includedir)\IceSSL\EndpointInfo.h" \ "Instance.h" \ "..\..\src\Ice\ProtocolInstance.h" \ @@ -241,7 +242,6 @@ AcceptorI.obj: \ "$(includedir)\Ice\PluginF.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ - "$(includedir)\Ice\Plugin.h" \ "..\..\src\Ice\ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\LocalException.h" \ @@ -566,6 +566,7 @@ EndpointI.obj: \ "..\..\src\Ice\ProtocolInstanceF.h" \ "..\..\src\Ice\EndpointFactory.h" \ "..\..\src\Ice\EndpointFactoryF.h" \ + "$(includedir)\Ice\Plugin.h" \ "InstanceF.h" \ "$(includedir)\IceSSL\EndpointInfo.h" \ "AcceptorI.h" \ @@ -595,7 +596,6 @@ EndpointI.obj: \ "$(includedir)\Ice\PluginF.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ - "$(includedir)\Ice\Plugin.h" \ "..\..\src\Ice\ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\LocalException.h" \ @@ -857,7 +857,6 @@ PluginI.obj: \ "..\..\src\Ice\EndpointFactory.h" \ "..\..\src\Ice\EndpointFactoryF.h" \ "$(includedir)\IceSSL\EndpointInfo.h" \ - "..\..\src\Ice\WSEndpoint.h" \ "..\..\src\Ice\ProtocolPluginFacade.h" \ "..\..\src\Ice\ProtocolPluginFacadeF.h" \ diff --git a/cpp/src/IceStorm/.depend.mak b/cpp/src/IceStorm/.depend.mak index 3aa711db2f5..44532f8edc6 100755 --- a/cpp/src/IceStorm/.depend.mak +++ b/cpp/src/IceStorm/.depend.mak @@ -3030,8 +3030,9 @@ Admin.obj: \ "$(includedir)\IceStorm\Metrics.h" \ "$(includedir)\IceStorm\Config.h" \ -Grammar.obj: \ - Grammar.cpp \ +Parser.obj: \ + Parser.cpp \ + "$(includedir)\IceUtil\DisableWarnings.h" \ "$(includedir)\Ice\Ice.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ @@ -3150,10 +3151,13 @@ Grammar.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\IceStorm\Metrics.h" \ "$(includedir)\IceStorm\Config.h" \ + "IceStormInternal.h" \ + "Election.h" \ + "SubscriberRecord.h" \ + "LLURecord.h" \ -Parser.obj: \ - Parser.cpp \ - "$(includedir)\IceUtil\DisableWarnings.h" \ +Grammar.obj: \ + Grammar.cpp \ "$(includedir)\Ice\Ice.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ @@ -3272,10 +3276,6 @@ Parser.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\IceStorm\Metrics.h" \ "$(includedir)\IceStorm\Config.h" \ - "IceStormInternal.h" \ - "Election.h" \ - "SubscriberRecord.h" \ - "LLURecord.h" \ Scanner.obj: \ Scanner.cpp \ diff --git a/cpp/src/Slice/.depend.mak b/cpp/src/Slice/.depend.mak index 4776cbb60b4..ecb8bd1464a 100755 --- a/cpp/src/Slice/.depend.mak +++ b/cpp/src/Slice/.depend.mak @@ -47,17 +47,6 @@ FileTracker.obj: \ "$(includedir)\IceUtil\Handle.h" \ "$(includedir)\IceUtil\Exception.h" \ -Grammar.obj: \ - Grammar.cpp \ - "GrammarUtil.h" \ - "$(includedir)\Slice\Parser.h" \ - "$(includedir)\IceUtil\Shared.h" \ - "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\InputUtil.h" \ - "$(includedir)\IceUtil\UUID.h" \ - JavaUtil.obj: \ JavaUtil.cpp \ "$(includedir)\IceUtil\DisableWarnings.h" \ @@ -173,26 +162,37 @@ RubyUtil.obj: \ "$(includedir)\IceUtil\Functional.h" \ "$(includedir)\IceUtil\InputUtil.h" \ -Scanner.obj: \ - Scanner.cpp \ - "$(includedir)\IceUtil\ScannerConfig.h" \ +Util.obj: \ + Util.cpp \ + "$(includedir)\Slice\Util.h" \ + "$(includedir)\Slice\Parser.h" \ + "$(includedir)\IceUtil\Shared.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Exception.h" \ + "$(includedir)\IceUtil\OutputUtil.h" \ + "..\..\src\IceUtil\FileUtil.h" \ + "$(includedir)\IceUtil\StringUtil.h" \ + +Grammar.obj: \ + Grammar.cpp \ "GrammarUtil.h" \ "$(includedir)\Slice\Parser.h" \ "$(includedir)\IceUtil\Shared.h" \ + "$(includedir)\IceUtil\Config.h" \ "$(includedir)\IceUtil\Handle.h" \ "$(includedir)\IceUtil\Exception.h" \ - "Grammar.h" \ "$(includedir)\IceUtil\InputUtil.h" \ + "$(includedir)\IceUtil\UUID.h" \ -Util.obj: \ - Util.cpp \ - "$(includedir)\Slice\Util.h" \ +Scanner.obj: \ + Scanner.cpp \ + "$(includedir)\IceUtil\ScannerConfig.h" \ + "$(includedir)\IceUtil\Config.h" \ + "GrammarUtil.h" \ "$(includedir)\Slice\Parser.h" \ "$(includedir)\IceUtil\Shared.h" \ - "$(includedir)\IceUtil\Config.h" \ "$(includedir)\IceUtil\Handle.h" \ "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\OutputUtil.h" \ - "..\..\src\IceUtil\FileUtil.h" \ - "$(includedir)\IceUtil\StringUtil.h" \ + "Grammar.h" \ + "$(includedir)\IceUtil\InputUtil.h" \ diff --git a/cpp/test/Ice/background/.depend.mak b/cpp/test/Ice/background/.depend.mak index 13f1c257b39..a5d7ee9ccb2 100755 --- a/cpp/test/Ice/background/.depend.mak +++ b/cpp/test/Ice/background/.depend.mak @@ -581,9 +581,7 @@ EndpointFactory.obj: \ "EndpointFactory.h" \ "..\..\..\src\Ice\EndpointFactory.h" \ "..\..\..\src\Ice\ProtocolInstanceF.h" \ - "EndpointI.h" \ - "..\..\..\src\Ice\EndpointI.h" \ - "$(includedir)\Ice\Endpoint.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\ProxyF.h" \ "$(includedir)\Ice\ProxyHandle.h" \ @@ -597,10 +595,15 @@ EndpointFactory.obj: \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ "$(includedir)\IceUtil\Optional.h" \ - "$(includedir)\Ice\Version.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ + "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ + "EndpointI.h" \ + "..\..\..\src\Ice\EndpointI.h" \ + "$(includedir)\Ice\Endpoint.h" \ + "$(includedir)\Ice\Version.h" \ "$(includedir)\Ice\EndpointF.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "..\..\..\src\Ice\TransceiverF.h" \ @@ -617,7 +620,6 @@ EndpointFactory.obj: \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\AsyncResultF.h" \ "$(includedir)\Ice\ObserverHelper.h" \ @@ -659,7 +661,6 @@ EndpointFactory.obj: \ "..\..\..\src\Ice\NetworkF.h" \ "..\..\..\src\Ice\NetworkProxyF.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "..\..\..\src\Ice\EventHandlerF.h" \ PluginI.obj: \ diff --git a/cpp/test/IceUtil/thread/.depend.mak b/cpp/test/IceUtil/thread/.depend.mak index 6784c83d44e..f19ddd78615 100755 --- a/cpp/test/IceUtil/thread/.depend.mak +++ b/cpp/test/IceUtil/thread/.depend.mak @@ -130,6 +130,39 @@ StartTest.obj: \ "TestBase.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ +SleepTest.obj: \ + SleepTest.cpp \ + "$(includedir)\IceUtil\IceUtil.h" \ + "$(includedir)\IceUtil\PushDisableWarnings.h" \ + "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\IceUtil\AbstractMutex.h" \ + "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\ThreadException.h" \ + "$(includedir)\IceUtil\Exception.h" \ + "$(includedir)\IceUtil\Time.h" \ + "$(includedir)\IceUtil\Cache.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Mutex.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\CountDownLatch.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\CtrlCHandler.h" \ + "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\IceUtil\RecMutex.h" \ + "$(includedir)\IceUtil\ScopedArray.h" \ + "$(includedir)\IceUtil\Shared.h" \ + "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\IceUtil\Thread.h" \ + "$(includedir)\IceUtil\Timer.h" \ + "$(includedir)\IceUtil\UUID.h" \ + "$(includedir)\IceUtil\UniquePtr.h" \ + "$(includedir)\IceUtil\PopDisableWarnings.h" \ + "SleepTest.h" \ + "TestBase.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ + RecMutexTest.obj: \ RecMutexTest.cpp \ "$(includedir)\IceUtil\IceUtil.h" \ @@ -309,6 +342,7 @@ TestSuite.obj: \ "CreateTest.h" \ "AliveTest.h" \ "StartTest.h" \ + "SleepTest.h" \ "MonitorMutexTest.h" \ "MonitorRecMutexTest.h" \ -- cgit v1.2.3