Bug #1011: add alignment to facilitate RTStorage, this is 1 by default,

so the inteface should not change.

RTCP/Interface/include/Interface/CorrelatedData.h

@@ -40,6 +40,7 @@ class CorrelatedData: public StreamableData
   private:
     const unsigned              itsNrBaselines;
     const unsigned              itsNrChannels;
+    unsigned                    itsAlignment;
 
     void			checkEndianness();
 
@@ -51,19 +52,19 @@ class CorrelatedData: public StreamableData
 
 inline size_t CorrelatedData::visibilitiesSize() const
 {
-  return align(sizeof(fcomplex) * itsNrBaselines * itsNrChannels * NR_POLARIZATIONS * NR_POLARIZATIONS, 32);
+  return align(sizeof(fcomplex) * itsNrBaselines * itsNrChannels * NR_POLARIZATIONS * NR_POLARIZATIONS, itsAlignment);
 }
 
 
 inline size_t CorrelatedData::nrValidSamplesSize() const
 {
-  return align(sizeof(unsigned short) * itsNrBaselines * itsNrChannels, 32);
+  return align(sizeof(unsigned short) * itsNrBaselines * itsNrChannels, itsAlignment);
 }
 
 
 inline size_t CorrelatedData::centroidSize() const
 {
-  return align(sizeof(float) * itsNrBaselines, 32);
+  return align(sizeof(float) * itsNrBaselines, itsAlignment);
 }
 
 
@@ -77,18 +78,23 @@ inline CorrelatedData::CorrelatedData(const unsigned nrBaselines, const unsigned
 :
   StreamableData(true),
   itsNrBaselines(nrBaselines),
-  itsNrChannels(nrChannels)
+  itsNrChannels(nrChannels),
+#ifdef HAVE_BGP
+  itsAlignment(32)
+#else 
+  itsAlignment(512)
+#endif
 {
 }
 
 inline void CorrelatedData::allocate( Allocator &allocator )
 {
-  visibilities.resize(boost::extents[itsNrBaselines][itsNrChannels][NR_POLARIZATIONS][NR_POLARIZATIONS], 32, allocator);
-  nrValidSamples.resize(boost::extents[itsNrBaselines][itsNrChannels], 32, allocator);
-  centroids.resize(itsNrBaselines, 32, allocator);
+  /// TODO Should this be aligned as well?? 
+  visibilities.resize(boost::extents[itsNrBaselines][itsNrChannels][NR_POLARIZATIONS][NR_POLARIZATIONS], itsAlignment, allocator);
+  nrValidSamples.resize(boost::extents[itsNrBaselines][itsNrChannels], itsAlignment, allocator);
+  centroids.resize(itsNrBaselines, itsAlignment, allocator);
 }
 
-
 inline void CorrelatedData::readData(Stream *str)
 {
   str->read(visibilities.origin(), visibilities.num_elements() * sizeof(fcomplex));
@@ -105,15 +111,15 @@ inline void CorrelatedData::writeData(Stream *str)
   THROW(AssertError, "not implemented: think about endianness");
 #endif
 
-  str->write(visibilities.origin(), visibilities.num_elements() * sizeof(fcomplex));
-  str->write(nrValidSamples.origin(), nrValidSamples.num_elements() * sizeof(unsigned short));
+  str->write(visibilities.origin(), align(visibilities.num_elements() * sizeof(fcomplex), itsAlignment));
+  str->write(nrValidSamples.origin(), align(nrValidSamples.num_elements() * sizeof(unsigned short), itsAlignment));
   //str->write(&centroids[0], centroids.size() * sizeof(float));
 }
 
 
 inline void CorrelatedData::checkEndianness()
 {
-#if !defined WORDS_BIGENDIAN
+#if !defined WORDS_BIGENDIAN && !defined WRITE_BIG_ON_LITTLE_ENDIAN
   dataConvert(LittleEndian, visibilities.origin(), visibilities.num_elements());
   dataConvert(LittleEndian, nrValidSamples.origin(), nrValidSamples.num_elements());
   // dataConvert(LittleEndian, &centroids[0], centroids.size());

RTCP/Interface/include/Interface/StreamableData.h

@@ -8,6 +8,7 @@
 #include <Interface/MultiDimArray.h>
 #include <Interface/SparseSet.h>
 #include <Interface/Allocator.h>
+#include <Interface/Align.h>
 #include <Common/DataConvert.h>
 
 #include <boost/noncopyable.hpp>
@@ -44,7 +45,7 @@ class StreamableData {
     virtual void allocate( Allocator &allocator = heapAllocator ) = 0;
 
     virtual void read(Stream*, const bool withSequenceNumber);
-    virtual void write(Stream*, const bool withSequenceNumber);
+    virtual void write(Stream*, const bool withSequenceNumber, const unsigned align = 0);
 
     bool isIntegratable() const
     { return integratable; }
@@ -71,7 +72,7 @@ template <typename T, unsigned DIM> class SampleData: public StreamableData, boo
     virtual ~SampleData();
 
     virtual size_t requiredSize() const;
-    virtual void allocate( Allocator &allocator = heapAllocator );
+    virtual void allocate( Allocator &allocator = heapAllocator);
 
     MultiDimArray<T,DIM> samples;
     SparseSet<unsigned>  *flags;
@@ -103,16 +104,37 @@ inline void StreamableData::read( Stream *str, const bool withSequenceNumber )
   readData( str );
 }
 
-inline void StreamableData::write( Stream *str, const bool withSequenceNumber )
+inline void StreamableData::write( Stream *str, const bool withSequenceNumber, const unsigned align )
 {
   if( withSequenceNumber ) {
 #if !defined WORDS_BIGENDIAN
-    uint32_t sn = sequenceNumber;
+    if (align > 1) {
+      void *sn_buf;
+      uint32_t sn = sequenceNumber;
 
-    dataConvert( LittleEndian, &sn, 1 );
-    str->write( &sn, sizeof sn );
+      posix_memalign(&sn_buf, align, align);
+
+      dataConvert( LittleEndian, &sn, 1 );
+      memcpy(sn_buf, &sn, sizeof(uint32_t));
+
+      str->write( sn_buf, align );
+    } else {
+      uint32_t sn = sequenceNumber;
+
+      dataConvert( LittleEndian, &sn, 1 );
+      str->write( &sn, sizeof sn );
+    }
 #else
-    str->write( &sequenceNumber, sizeof sequenceNumber );
+    if (align > 1) {
+      void *sn_buf;
+      posix_memalign(&sn_buf, align, align);
+      memcpy(sn_buf, &sequenceNumber, sizeof(sequenceNumber));
+
+      str->write( sn_buf, align );
+    } else {
+      str->write( &sequenceNumber, sizeof sequenceNumber );
+    }
+
 #endif
   }