merged local changes

Author: Dale Wilson

.hgignore

@@ -12,3 +12,8 @@ testdata
 s\.cmd
 cle\.cmd
 commit\.cmd
+^.+\.o$
+^.+\.so$
+\/\.depend\..+
+\/Makefile.*
+^bin

ChangeLog

@@ -20,9 +20,59 @@ Mon Jan 21 21:50:25 UTC 2013 Dale Wilson <[email protected]>
         missing includes[Issue 112]
         Pass identity by reference not value in FieldSet
 
+Mon Jun  3 22:30:25 UTC 2013 schmitzj <[email protected]>
+        * setup.sh:
+          Don't overwrite environment variables
 
 Tue Jul 03 19:42:31 UTC 2012 Dale Wilson <[email protected]>
         Respond to messages on QuickFAST list.
+        * src/Messages/FieldSet.cpp:
+        * src/Messages/FieldSet.h:
+        * src/Tests/testReplaceField.cpp:
+          Allow replacement of a field.
+
+        * src/Messages/Sequence.h:
+          Make constrctor accpept const field ref.
+
+Thu May 30 22:30:25 UTC 2013 martinezm <[email protected]>
+        * QuickFAST.mwc:
+          Add Release and Debug configurations to makefiles.
+
+        * src/Examples/InterpretApplication/InterpretApplication.cpp:
+          Build clean(er) with gcc 4.5.
+
+        * src/QuickFAST.mpc:
+          Removed redundant include settings.
+
+Fri May  3 16:52:46 UTC 2013 Brian Johnson <[email protected]>
+
+        * src\Common\AtomicOps.h
+          Added CAS function for long longs.
+        * src\Communication\AsynchFileSender.cpp
+        * src\Communication\AsynchFileSender.h
+          Changed to maintain a long long offset in the file to be able to
+          write files greater than 4GB.
+
+Thu May  2  9:20:23 UTC 2013 Brian Johnson <[email protected]>
+
+        * src/QuickFAST.mpc
+          Reverted xerces changes.
+
+Wed May  1 13:31:05 UTC 2013 Brian Johnson <[email protected]>
+
+        * .hgignore
+          Added make and gcc build artifacts to ignore.
+        * src/QuickFAST.mpc
+          Changed to use xerces.mpb.
+
+Wed May  1 12:24:31 UTC 2013 Brian Johnson <[email protected]>
+
+        * src/Codecs/Context.h
+        * src/Messages/MessageFormatter.h
+        * src/Messages/ValueMessageBuilder.h
+          Added needed dependencies after files were moved.
+        * src/Tests/testErrorRecovery.cpp
+          Added needed dependency and fixed reinterpret_cast calls.
 
 Tue Mar 20 19:39:29 UTC 2012 Dale Wilson <[email protected]>
         * .hgignore:

QuickFAST.features

@@ -4,6 +4,10 @@
 // This file defines MPC features used to enable and disable portions of the build
 QuickFAST=1
 boost=1
+// for Xerces 3.x.x set xerces3=1 and xerces2=0
+// for Xerces 2.x.x set xerces2=1 and xerces3=0
+xerces3=1
+xerces2=0
 
 // Build .NET library
 //    To enable .NET build, change the following from '0' to '1'

QuickFAST.mwc

@@ -2,7 +2,11 @@ workspace(*) {
   cmdline += -feature_file QuickFAST.features
   src/QuickFAST.mpc
   src/Examples/Examples.mpc
-  
+
+  specific(make) {
+    cmdline += -value_template "configurations=Release Debug"
+  }
+
   // .NET support only for Visual Studio compilers
   //  exclude(!vc8,!vc9)  [was not working so instead...
   // .Net support only on windows

setup.cmd

@@ -18,8 +18,7 @@ REM Setting up QuickFAST environment
 REM =====================================================================================
 REM EDIT THE FOLLOWING LINES OR SET THESE VALUES IN YOUR ENVIRONMENT BEFORE RUNNING SETUP
 if "a" == "a%MPC_ROOT%" set MPC_ROOT=c:\MPC
-if "a" == "a%XERCES_ROOT%" set XERCES_ROOT=C:\Progs\xerces-c-3.0.1-x86-windows-vc-9.0
-if "a" == "a%XERCES_LIBNAME%" set XERCES_LIBNAME=xerces-c_3
+if "a" == "a%XERCESCROOT%" set XERCESCROOT=C:\Progs\xerces-c-3.0.1-x86-windows-vc-9.0
 if "a" == "a%BOOST_VERSION%" set BOOST_VERSION=boost_1_43_0
 if "a" == "a%BOOST_ROOT%" set BOOST_ROOT=c:\boost\%BOOST_VERSION%
 REM END OF VALUES TO BE SET
@@ -33,8 +32,8 @@ REM Verify setup by checking for expected files/directories
 set SETUP_CHECKING=MPC_ROOT=%MPC_ROOT%
 if not exist "%MPC_ROOT%\mpc.pl" goto setup_is_bad
 
-set SETUP_CHECKING=XERCES_ROOT=%XERCES_ROOT%
-if not exist "%XERCES_ROOT%\lib" goto setup_is_bad
+set SETUP_CHECKING=XERCESCROOT=%XERCESCROOT%
+if not exist "%XERCESCROOT%\lib" goto setup_is_bad
 
 set SETUP_CHECKING=BOOST_ROOT=%BOOST_ROOT%
 if not exist "%BOOST_ROOT%\boost" goto setup_is_bad
@@ -66,8 +65,7 @@ goto end
 :setup_is_ok
 set SETUP_CHECKING=
 
-set XERCES_LIBPATH=%XERCES_ROOT%\lib
-set XERCES_INCLUDE=%XERCES_ROOT%\include
+set XERCESLIB=%XERCESCROOT%\lib
 set QUICKFAST_ROOT=%CD%
 
 rem must be outside the if because of the parens in the directory name [what was microsoft thinking?]
@@ -94,10 +92,10 @@ REM: This avoids growing PATH and INCLUDE every time setup is run
 if "a" == "a%BASE_PATH%" set BASE_PATH=%PATH%
 if "a" == "a%BASE_INCLUDE%" set BASE_INCLUDE=%INCLUDE%
 
-set RELEASE_PATH=%QUICKFAST_ROOT%\bin;%QUICKFAST_ROOT%\Output\Release;%MPC_ROOT%;%BOOST_ROOT%\lib;%QUICKFAST_ROOT%\lib;%XERCES_ROOT%\bin;%BASE_PATH%
-set DEBUG_PATH=%QUICKFAST_ROOT%\bin;%QUICKFAST_ROOT%\Output\Debug;%MPC_ROOT%;%BOOST_ROOT%\lib;%QUICKFAST_ROOT%\lib;%XERCES_ROOT%\bin;%BASE_PATH%
+set RELEASE_PATH=%QUICKFAST_ROOT%\bin;%QUICKFAST_ROOT%\Output\Release;%MPC_ROOT%;%BOOST_ROOT%\lib;%QUICKFAST_ROOT%\lib;%XERCESCROOT%\bin;%BASE_PATH%
+set DEBUG_PATH=%QUICKFAST_ROOT%\bin;%QUICKFAST_ROOT%\Output\Debug;%MPC_ROOT%;%BOOST_ROOT%\lib;%QUICKFAST_ROOT%\lib;%XERCESCROOT%\bin;%BASE_PATH%
 set PATH=%DEBUG_PATH%
-set INCLUDE=%BOOST_ROOT%;%XERCES_ROOT%\include;%BASE_INCLUDE%
+set INCLUDE=%BOOST_ROOT%;%XERCESCROOT%\include;%BASE_INCLUDE%
 
 title QuickFAST
 :end

setup.sh

@@ -3,19 +3,55 @@
 # QuickFAST depends on BOOST V 1.36.0 or later. (http://www.boost.org/)
 # QuickFAST depends on Xerces V3.0 or later. (http://xerces.apache.org/xerces-c/)
 # Customize this file by setting variables to suit your environment
-export QUICKFAST_ROOT=`pwd`
+SOURCE="${BASH_SOURCE[0]}"
+SOURCE_DIR=`dirname $SOURCE`
+export QUICKFAST_ROOT=`readlink -f $SOURCE_DIR`
 
-export MPC_ROOT=~/MPC
+if test "$MPC_ROOT" = ""
+then
+  export MPC_ROOT=~/MPC
+fi
 
-export BOOST_ROOT=~/boost/boost_1_38_0
-export BOOST_ROOT_LIB=$BOOST_ROOT/lib
-export BOOST_CFG=-gcc41-mt
-export BOOST_VERSION=boost-1_38
-export XERCES_ROOT=~/xerces/xerces-c-3.0.1
-export XERCES_LIBPATH=$XERCES_ROOT/src/.libs
-export XERCES_LIBNAME=xerces-c-3.0
-export XERCES_INCLUDE=$XERCES_ROOT/src
+if test "$BOOST_ROOT" = ""
+then
+  export BOOST_ROOT=~/boost/boost_1_38_0
+fi
 
+if test "$BOOST_ROOT_LIB" = ""
+then
+  export BOOST_ROOT_LIB=$BOOST_ROOT/lib
+fi
+
+if test "$BOOST_CFG" = ""
+then
+  export BOOST_CFG=-gcc41-mt
+fi
+
+if test "$BOOST_VERSION" = ""
+then
+  export BOOST_VERSION=boost-1_38
+fi
+
+if test "$XERCES_ROOT" = ""
+then
+  export XERCES_ROOT=~/xerces/xerces-c-3.0.1
+fi
+
+if test "$XERCES_LIBPATH" = ""
+then
+  export XERCES_LIBPATH=$XERCES_ROOT/src/.libs
+fi
+
+if test "$XERCES_LIBNAME" = ""
+then
+  export XERCES_LIBNAME=xerces-c-3.0
+fi
+
+if test "$XERCES_INCLUDE" = ""
+then
+  export XERCES_INCLUDE=$XERCES_ROOT/src
+fi
 
 export PATH=$QUICKFAST_ROOT/bin:$MPC_ROOT:$PATH
-export LD_LIBRARY_PATH=$XERCES_LIBPATH:$QUICKFAST_ROOT/lib:$BOOST_ROOT_LIB:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=$XERCESLIB:$QUICKFAST_ROOT/lib:$BOOST_ROOT_LIB:$LD_LIBRARY_PATH
+

src/Codecs/Context.h

@@ -6,6 +6,7 @@
 #endif
 #ifndef CONTEXT_H
 #define CONTEXT_H
+#include <Common/QuickFASTPch.h>
 #include <Common/QuickFAST_Export.h>
 #include <Common/Types.h>
 #include <Common/Value.h>

src/Common/AtomicOps.h

@@ -1,19 +1,18 @@
-// Copyright (c) 2009, 2010, 2011 Object Computing, Inc.
+// Copyright (c) 2009, Object Computing, Inc.
 // All rights reserved.
 // See the file license.txt for licensing information.
 //
-#ifdef _MSC_VER
-# pragma once
-#endif
 #ifndef ATOMICOPS_H
 #define ATOMICOPS_H
 
 // This header defines functions to execute atomic operations inline
 
 #if defined(_WIN32)
 # include "windows.h"
+# include <intrin.h>
 # if defined(_MSC_VER)
 #   pragma intrinsic(_InterlockedCompareExchange)
+#   pragma intrinsic(_InterlockedCompareExchange64)
 // No intrinsic compare and swap pointer so we asm it below
 # endif
 #elif defined(__GNUC__)
@@ -157,5 +156,23 @@ namespace QuickFAST
 #endif
   }
 
+  /// @brief compare and swap long longs
+  ///
+  /// @param target the long long to be updated
+  /// @param ifeq the expected value before updating
+  /// @param value the new value to be stored in target
+  inline
+  bool CASLongLong(long long volatile * target, long long ifeq, long long value)
+  {
+#if defined(_WIN32)
+    // Intel 486 and earlier not supported
+    return ifeq == _InterlockedCompareExchange64(target, value, ifeq);
+#elif defined(__GNUC__)
+    return __sync_bool_compare_and_swap(target, ifeq, value);
+#else
+    return ifeq == atomic_cas_ulong(target, ifeq, value);
+#endif
+  }
+
 }
 #endif // ATOMICOPS_H

src/Common/Version.h

@@ -12,13 +12,12 @@ namespace QuickFAST
 {
   /// @brief Product information about QuickFAST
   const char QuickFAST_Product[] = "QuickFAST Version "
-    "1.4.01"
-    " (prerelease)"
+    "1.5.0"
     "\n"
-    "Copyright (c) 2009, 2010, 2011 Object Computing, Inc.\n"
+    "Copyright (c) 2009, 2010, 2011, 2012, 2013 Object Computing, Inc.\n"
     "All Rights Reserved\n"
     "See the file license.txt for licensing information.\n";
   /// @brief version number
-  const long QuickFAST_Version = 0x00010401; // MMMM.mmpp {M=Major, m=minor, p=patch)
+  const long QuickFAST_Version = 0x00010500; // MMMM.mmpp {M=Major, m=minor, p=patch)
 }
 #endif // VERSION_H

src/Communication/AsynchFileSender.cpp

@@ -70,19 +70,19 @@ AsynchFileSender::open()
 void
 AsynchFileSender::send(LinkedBuffer * buffer)
 {
-  size_t bytesToWrite = buffer->used();
-  long pos = offset_;
-  while(!CASLong(&offset_, pos, pos + bytesToWrite))
+  const size_t bytesToWrite = buffer->used();
+  long long pos = offset_;
+  while(!CASLongLong(&offset_, pos, pos + bytesToWrite))
   {
     pos = offset_;
   }
-  sendAt(buffer, (size_t)pos);
+  sendAt(buffer, pos);
 }
 
 void
-AsynchFileSender::sendAt(LinkedBuffer * buffer, size_t offset)
+AsynchFileSender::sendAt(LinkedBuffer * buffer, long long offset)
 {
-  size_t bytesToWrite = buffer->used();
+  const size_t bytesToWrite = buffer->used();
   if(bytesToWrite > 0)
   {
 #if 0

src/Communication/AsynchFileSender.h

@@ -2,9 +2,6 @@
 // All rights reserved.
 // See the file license.txt for licensing information.
 //
-#ifdef _MSC_VER
-# pragma once
-#endif
 #ifndef ASYNCHFILESENDER_H
 #define ASYNCHFILESENDER_H
 #include <Common/QuickFAST_Export.h>
@@ -58,7 +55,7 @@ namespace QuickFAST
       /// started in a multithreaded environment.  By allowing the caller to
       /// specify an offset, this method give the caller control over the order
       /// of data in the file.
-      void sendAt(LinkedBuffer * buffer, size_t offset);
+      void sendAt(LinkedBuffer * buffer, long long offset);
 
       // Override Sender method
       virtual void close();
@@ -67,7 +64,7 @@ namespace QuickFAST
     private:
       uint32 additionalAttributes_; // consider: FILE_FLAG_NO_BUFFERING
       boost::asio::windows::random_access_handle handle_;
-      long volatile offset_;
+      long long volatile offset_;
     };
 #endif // _WIN32
   }

src/Communication/BufferedRawFileReceiver.h

@@ -33,10 +33,10 @@ namespace QuickFAST
         std::streamoff startPosition = stream.tellg();
         stream.seekg(0, std::ios_base::end);
         std::streamoff endPosition = stream.tellg();
-        size_ = endPosition - startPosition;
+        size_ = (size_t)(endPosition - startPosition);
         if(size_ > 0)
         {
-          buffer_.reset(new unsigned char[endPosition - startPosition]);
+          buffer_.reset(new unsigned char[(unsigned int)(endPosition - startPosition)]);
           stream.seekg(startPosition);
           stream.read(reinterpret_cast<char *>(buffer_.get()), size_);
           size_t read = (size_t) stream.gcount();

src/Doxyfile

@@ -31,7 +31,7 @@ PROJECT_NAME           = QuickFAST
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         = 1.4
+PROJECT_NUMBER         = 1.5
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer

src/Examples/InterpretApplication/InterpretApplication.cpp

@@ -12,6 +12,11 @@
 #include <Examples/MessageInterpreter.h>
 #include <Examples/ValueToFix.h>
 
+namespace {
+  template< typename T>
+  void ignore_returnvalue(const T&) { }
+}
+
 using namespace QuickFAST;
 using namespace Examples;
 
@@ -256,7 +261,7 @@ InterpretApplication::run()
       size_t fileSize = std::ftell(bufferFile);
       std::fseek(bufferFile, 0, SEEK_SET);
       boost::scoped_array<unsigned char> buffer(new unsigned char[fileSize]);
-      std::fread(buffer.get(), 1, fileSize, bufferFile);
+      ignore_returnvalue( std::fread(buffer.get(), 1, fileSize, bufferFile));
       pConnection->receiver().receiveBuffer(buffer.get(), fileSize);
     }
     else

src/Messages/FieldSet.cpp

@@ -102,6 +102,24 @@ FieldSet::addField(const FieldIdentity & identity, const FieldCPtr & value)
   ++used_;
 }
 
+bool
+FieldSet::replaceField(const FieldIdentityCPtr & identity,
+                       const FieldCPtr & value)
+{
+  for(size_t index = 0; index < used_; ++index)
+  {
+    if(identity == fields_[index].getIdentity())
+    {
+      if(fields_[index].getField()->isDefined()) {
+        (fields_ + index)->~MessageField();  // Explicit destroy
+        new (fields_ + index) MessageField(identity, value);
+        return true;
+      }
+    }
+  }
+  return false;
+}
+
 bool
 FieldSet::getField(const Messages::FieldIdentity & identity, FieldCPtr & value) const
 {