Merge pull request aeron-io#222 from objectcomputing/master

Improve C++ code.

Author: tmontgomery

examples/cpp98/SbeExample.cpp

@@ -24,7 +24,7 @@
 using namespace std;
 using namespace baseline;
 
-#if defined(WIN32)
+#if defined(WIN32) || defined(_WIN32)
 # define snprintf _snprintf
 #endif /* WIN32 */
 

examples/cpp98/SbeOtfDecoder.cpp

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#if defined(WIN32)
+#if defined(WIN32) || defined(_WIN32)
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdio.h>
@@ -319,7 +319,7 @@ int main(int argc, char * const argv[])
  CarCallbacks carCbs(listener);
  char *buffer = NULL;
  int length = 0, ch, justHeader = 0;
-#if defined(WIN32)
+#if defined(WIN32) || defined(_WIN32)
  int optind = 1;
 
  if (strcmp(argv[optind], "-?") == 0)

main/cpp/otf_api/Ir.cpp

@@ -51,7 +51,7 @@ struct Ir::Impl
  ::uint32_t serializedTokenSize;
 };
 
-#if !defined(WIN32)
+#if !defined(WIN32) && !defined(_WIN32)
 const int Ir::INVALID_ID;
 const ::uint32_t Ir::VARIABLE_SIZE;
 #endif /* WIN32 */
@@ -180,7 +180,7 @@ ::uint64_t Ir::validValue() const
  break;
 
  default:
- throw "do not know validValue primitiveType";
+ throw std::runtime_error("do not know validValue primitiveType [E109]");
  break;
  }
 }
@@ -207,7 +207,7 @@ ::uint64_t Ir::choiceValue() const
  break;
 
  default:
- throw "do not know choice primitiveType";
+ throw std::runtime_error("do not know choice primitiveType [E110]");
  break;
  }
 }

main/cpp/otf_api/IrCollection.h

@@ -16,7 +16,7 @@
 #ifndef _IR_COLLECTION_H_
 #define _IR_COLLECTION_H_
 
-#if defined(WIN32)
+#if defined(WIN32) || defined(_WIN32)
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <io.h>

main/cpp/otf_api/Listener.cpp

@@ -24,16 +24,20 @@
  * builtins for GCC. MSVC has similar ones.
  */
 
-#if defined(WIN32)
+// Some GCC versions do not include __builtin_bswap16
+// The compiler optimizes the code below into a single ROL instruction so the intrinsic is not really needed
+#define BYTESWAP16(v) (((v) >> 8) | ((v) << 8))
+
+#if defined(WIN32) || defined(_WIN32)
  #define BSWAP16(b,v) ((b == Ir::SBE_LITTLE_ENDIAN) ? (v) : _byteswap_ushort((::uint16_t)v))
  #define BSWAP32(b,v) ((b == Ir::SBE_LITTLE_ENDIAN) ? (v) : _byteswap_ulong((::uint32_t)v))
  #define BSWAP64(b,v) ((b == Ir::SBE_LITTLE_ENDIAN) ? (v) : _byteswap_uint64((::uint64_t)v))
 #elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
- #define BSWAP16(b,v) ((b == Ir::SBE_LITTLE_ENDIAN) ? (v) : __builtin_bswap16((::uint16_t)v))
+ #define BSWAP16(b,v) ((b == Ir::SBE_LITTLE_ENDIAN) ? (v) : BYTESWAP16((::uint16_t)v))
  #define BSWAP32(b,v) ((b == Ir::SBE_LITTLE_ENDIAN) ? (v) : __builtin_bswap32((::uint32_t)v))
  #define BSWAP64(b,v) ((b == Ir::SBE_LITTLE_ENDIAN) ? (v) : __builtin_bswap64((::uint64_t)v))
 #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
- #define BSWAP16(b,v) ((b == Ir::SBE_BIG_ENDIAN) ? (v) : __builtin_bswap16((::uint16_t)v))
+ #define BSWAP16(b,v) ((b == Ir::SBE_BIG_ENDIAN) ? (v) : BYTESWAP16((::uint16_t)v))
  #define BSWAP32(b,v) ((b == Ir::SBE_BIG_ENDIAN) ? (v) : __builtin_bswap32((::uint32_t)v))
  #define BSWAP64(b,v) ((b == Ir::SBE_BIG_ENDIAN) ? (v) : __builtin_bswap64((::uint64_t)v))
 #else
@@ -44,11 +48,11 @@ using namespace sbe::on_the_fly;
 using ::std::cout;
 using ::std::endl;
 
-#if !defined(WIN32)
+#if defined(WIN32) || defined(_WIN32)
+#define snprintf _snprintf
+#else
 const ::int32_t Field::INVALID_ID;
 const int Field::FIELD_INDEX;
-#else
-#define snprintf _snprintf
 #endif /* WIN32 */
 
 Listener::Listener() : onNext_(NULL), onError_(NULL), onCompleted_(NULL),
@@ -112,14 +116,14 @@ int Listener::subscribe(OnNext *onNext,
  {
  char message[1024];
 
- ::snprintf(message, sizeof(message)-1, "no IR found for message with templateId=%ld and version=%ld", templateId_, templateVersion_);
+ ::snprintf(message, sizeof(message)-1, "no IR found for message with templateId=%ld and version=%ld [E117]", templateId_, templateVersion_);
  onError_->onError(Error(message));
  result = -1;
  }
  }
  else if (onError_ != NULL)
  {
- onError_->onError(Error("template ID and/or version not found in header"));
+ onError_->onError(Error("template ID and/or version not found in header [E118]"));
  result = -1;
  }
  }

main/cpp/sbe/sbe.hpp

@@ -18,6 +18,8 @@
 
 #include <string.h>
 #include <stdint.h>
+#include <limits.h>
+#include <stdexcept>
 
 /*
  * Types used by C++ codec. Might have to be platform specific at some stage.
@@ -39,7 +41,7 @@ namespace sbe {
 /*
  * Define some byte ordering macros
  */
-#if defined(WIN32)
+#if defined(WIN32) || defined(_WIN32)
  #define SBE_BIG_ENDIAN_ENCODE_16(v) _byteswap_ushort(v)
  #define SBE_BIG_ENDIAN_ENCODE_32(v) _byteswap_ulong(v)
  #define SBE_BIG_ENDIAN_ENCODE_64(v) _byteswap_uint64(v)
@@ -66,7 +68,7 @@ namespace sbe {
 
 #if defined(SBE_NO_BOUNDS_CHECK)
  #define SBE_BOUNDS_CHECK_EXPECT(exp,c) (false)
-#elif defined(WIN32)
+#elif defined(WIN32) || defined(_WIN32)
  #define SBE_BOUNDS_CHECK_EXPECT(exp,c) (exp)
 #else
  #define SBE_BOUNDS_CHECK_EXPECT(exp,c) (__builtin_expect(exp,c))

main/cpp/uk_co_real_logic_sbe_ir_generated/ByteOrderCodec.hpp

@@ -40,7 +40,7 @@ class ByteOrderCodec
  case 255: return NULL_VALUE;
  }
 
- throw "unknown value for enum ByteOrderCodec";
+ throw std::runtime_error("unknown value for enum ByteOrderCodec [E111]");
  }
 };
 }

main/cpp/uk_co_real_logic_sbe_ir_generated/FrameCodec.hpp

@@ -107,7 +107,7 @@ class FrameCodec
  {
  if (SBE_BOUNDS_CHECK_EXPECT((position > bufferLength_), 0))
  {
- throw "buffer too short";
+ throw std::runtime_error("buffer too short [E101]");
  }
  position_ = position;
  }
@@ -157,17 +157,17 @@ class FrameCodec
 
  static const sbe_int32_t irIdNullValue()
  {
- return -2147483648;
+ return  INT_MIN; // -2147483648;
  }
 
  static const sbe_int32_t irIdMinValue()
  {
- return -2147483647;
+ return  INT_MIN + 1; // -2147483647;
  }
 
  static const sbe_int32_t irIdMaxValue()
  {
- return 2147483647;
+ return INT_MAX; // 2147483647;
  }
 
  sbe_int32_t irId(void) const
@@ -211,17 +211,17 @@ class FrameCodec
 
  static const sbe_int32_t irVersionNullValue()
  {
- return -2147483648;
+ return  INT_MIN; // -2147483648;
  }
 
  static const sbe_int32_t irVersionMinValue()
  {
- return -2147483647;
+ return  INT_MIN + 1; // -2147483647;
  }
 
  static const sbe_int32_t irVersionMaxValue()
  {
- return 2147483647;
+ return INT_MAX; // 2147483647;
  }
 
  sbe_int32_t irVersion(void) const
@@ -265,17 +265,17 @@ class FrameCodec
 
  static const sbe_int32_t schemaVersionNullValue()
  {
- return -2147483648;
+ return  INT_MIN; // -2147483648;
  }
 
  static const sbe_int32_t schemaVersionMinValue()
  {
- return -2147483647;
+ return  INT_MIN + 1; // -2147483647;
  }
 
  static const sbe_int32_t schemaVersionMaxValue()
  {
- return 2147483647;
+ return INT_MAX; // 2147483647;
  }
 
  sbe_int32_t schemaVersion(void) const

main/cpp/uk_co_real_logic_sbe_ir_generated/MessageHeader.hpp

@@ -32,7 +32,7 @@ class MessageHeader
  {
  if (SBE_BOUNDS_CHECK_EXPECT((offset > (bufferLength - 8)), 0))
  {
- throw "buffer too short for flyweight";
+ throw std::runtime_error("buffer too short for flyweight [E112]");
  }
  buffer_ = buffer;
  offset_ = offset;

main/cpp/uk_co_real_logic_sbe_ir_generated/PresenceCodec.hpp

@@ -42,7 +42,7 @@ class PresenceCodec
  case 255: return NULL_VALUE;
  }
 
- throw "unknown value for enum PresenceCodec";
+ throw std::runtime_error("unknown value for enum PresenceCodec [E113]");
  }
 };
 }