优化：
1. 通过内存池解决丢帧问题； 2. 解析惯导卫星个数，并通过socket发送给psdk； 3. 取消通过sbg卫星时间设置linux系统时间，此功能交给psdk做；
This commit is contained in:
tangchao0503
98
Header_Files/MemoryPool.h
Normal file
98
Header_Files/MemoryPool.h
Normal file
@ -0,0 +1,98 @@
|
||||
/*-
|
||||
* Copyright (c) 2013 Cosku Acay, http://www.coskuacay.com
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the "Software"),
|
||||
* to deal in the Software without restriction, including without limitation
|
||||
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
* and/or sell copies of the Software, and to permit persons to whom the
|
||||
* Software is furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
||||
* IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#ifndef MEMORY_POOL_H
|
||||
#define MEMORY_POOL_H
|
||||
|
||||
#include <climits>
|
||||
#include <cstddef>
|
||||
|
||||
template <typename T, size_t BlockSize = 16368000>
|
||||
class MemoryPool
|
||||
{
|
||||
public:
|
||||
/* Member types */
|
||||
typedef T value_type;
|
||||
typedef T* pointer;
|
||||
typedef T& reference;
|
||||
typedef const T* const_pointer;
|
||||
typedef const T& const_reference;
|
||||
typedef size_t size_type;
|
||||
typedef ptrdiff_t difference_type;
|
||||
typedef std::false_type propagate_on_container_copy_assignment;
|
||||
typedef std::true_type propagate_on_container_move_assignment;
|
||||
typedef std::true_type propagate_on_container_swap;
|
||||
|
||||
template <typename U> struct rebind {
|
||||
typedef MemoryPool<U> other;
|
||||
};
|
||||
|
||||
/* Member functions */
|
||||
MemoryPool() noexcept;
|
||||
MemoryPool(const MemoryPool& memoryPool) noexcept;
|
||||
MemoryPool(MemoryPool&& memoryPool) noexcept;
|
||||
template <class U> MemoryPool(const MemoryPool<U>& memoryPool) noexcept;
|
||||
|
||||
~MemoryPool() noexcept;
|
||||
|
||||
MemoryPool& operator=(const MemoryPool& memoryPool) = delete;
|
||||
MemoryPool& operator=(MemoryPool&& memoryPool) noexcept;
|
||||
|
||||
pointer address(reference x) const noexcept;
|
||||
const_pointer address(const_reference x) const noexcept;
|
||||
|
||||
// Can only allocate one object at a time. n and hint are ignored
|
||||
pointer allocate(size_type n = 1, const_pointer hint = 0);
|
||||
void deallocate(pointer p, size_type n = 1);
|
||||
|
||||
size_type max_size() const noexcept;
|
||||
|
||||
template <class U, class... Args> void construct(U* p, Args&&... args);
|
||||
template <class U> void destroy(U* p);
|
||||
|
||||
template <class... Args> pointer newElement(Args&&... args);
|
||||
void deleteElement(pointer p);
|
||||
|
||||
private:
|
||||
union Slot_ {
|
||||
value_type element;
|
||||
Slot_* next;
|
||||
};
|
||||
|
||||
typedef char* data_pointer_;
|
||||
typedef Slot_ slot_type_;
|
||||
typedef Slot_* slot_pointer_;
|
||||
|
||||
slot_pointer_ currentBlock_;
|
||||
slot_pointer_ currentSlot_;
|
||||
slot_pointer_ lastSlot_;
|
||||
slot_pointer_ freeSlots_;
|
||||
|
||||
size_type padPointer(data_pointer_ p, size_type align) const noexcept;
|
||||
void allocateBlock();
|
||||
|
||||
static_assert(BlockSize >= 2 * sizeof(slot_type_), "BlockSize too small.");
|
||||
};
|
||||
|
||||
#include "MemoryPool.tcc"
|
||||
|
||||
#endif // MEMORY_POOL_H
|
||||
235
Header_Files/MemoryPool.tcc
Normal file
235
Header_Files/MemoryPool.tcc
Normal file
@ -0,0 +1,235 @@
|
||||
/*-
|
||||
* Copyright (c) 2013 Cosku Acay, http://www.coskuacay.com
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the "Software"),
|
||||
* to deal in the Software without restriction, including without limitation
|
||||
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
* and/or sell copies of the Software, and to permit persons to whom the
|
||||
* Software is furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
||||
* IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#ifndef MEMORY_BLOCK_TCC
|
||||
#define MEMORY_BLOCK_TCC
|
||||
|
||||
|
||||
|
||||
template <typename T, size_t BlockSize>
|
||||
inline typename MemoryPool<T, BlockSize>::size_type
|
||||
MemoryPool<T, BlockSize>::padPointer(data_pointer_ p, size_type align)
|
||||
const noexcept
|
||||
{
|
||||
uintptr_t result = reinterpret_cast<uintptr_t>(p);
|
||||
return ((align - result) % align);
|
||||
}
|
||||
|
||||
|
||||
|
||||
template <typename T, size_t BlockSize>
|
||||
MemoryPool<T, BlockSize>::MemoryPool()
|
||||
noexcept
|
||||
{
|
||||
currentBlock_ = nullptr;
|
||||
currentSlot_ = nullptr;
|
||||
lastSlot_ = nullptr;
|
||||
freeSlots_ = nullptr;
|
||||
}
|
||||
|
||||
|
||||
|
||||
template <typename T, size_t BlockSize>
|
||||
MemoryPool<T, BlockSize>::MemoryPool(const MemoryPool& memoryPool)
|
||||
noexcept :
|
||||
MemoryPool()
|
||||
{}
|
||||
|
||||
|
||||
|
||||
template <typename T, size_t BlockSize>
|
||||
MemoryPool<T, BlockSize>::MemoryPool(MemoryPool&& memoryPool)
|
||||
noexcept
|
||||
{
|
||||
currentBlock_ = memoryPool.currentBlock_;
|
||||
memoryPool.currentBlock_ = nullptr;
|
||||
currentSlot_ = memoryPool.currentSlot_;
|
||||
lastSlot_ = memoryPool.lastSlot_;
|
||||
freeSlots_ = memoryPool.freeSlots;
|
||||
}
|
||||
|
||||
|
||||
template <typename T, size_t BlockSize>
|
||||
template<class U>
|
||||
MemoryPool<T, BlockSize>::MemoryPool(const MemoryPool<U>& memoryPool)
|
||||
noexcept :
|
||||
MemoryPool()
|
||||
{}
|
||||
|
||||
|
||||
|
||||
template <typename T, size_t BlockSize>
|
||||
MemoryPool<T, BlockSize>&
|
||||
MemoryPool<T, BlockSize>::operator=(MemoryPool&& memoryPool)
|
||||
noexcept
|
||||
{
|
||||
if (this != &memoryPool)
|
||||
{
|
||||
std::swap(currentBlock_, memoryPool.currentBlock_);
|
||||
currentSlot_ = memoryPool.currentSlot_;
|
||||
lastSlot_ = memoryPool.lastSlot_;
|
||||
freeSlots_ = memoryPool.freeSlots;
|
||||
}
|
||||
return *this;
|
||||
}
|
||||
|
||||
|
||||
|
||||
template <typename T, size_t BlockSize>
|
||||
MemoryPool<T, BlockSize>::~MemoryPool()
|
||||
noexcept
|
||||
{
|
||||
slot_pointer_ curr = currentBlock_;
|
||||
while (curr != nullptr) {
|
||||
slot_pointer_ prev = curr->next;
|
||||
operator delete(reinterpret_cast<void*>(curr));
|
||||
curr = prev;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
template <typename T, size_t BlockSize>
|
||||
inline typename MemoryPool<T, BlockSize>::pointer
|
||||
MemoryPool<T, BlockSize>::address(reference x)
|
||||
const noexcept
|
||||
{
|
||||
return &x;
|
||||
}
|
||||
|
||||
|
||||
|
||||
template <typename T, size_t BlockSize>
|
||||
inline typename MemoryPool<T, BlockSize>::const_pointer
|
||||
MemoryPool<T, BlockSize>::address(const_reference x)
|
||||
const noexcept
|
||||
{
|
||||
return &x;
|
||||
}
|
||||
|
||||
|
||||
|
||||
template <typename T, size_t BlockSize>
|
||||
void
|
||||
MemoryPool<T, BlockSize>::allocateBlock()
|
||||
{
|
||||
// Allocate space for the new block and store a pointer to the previous one
|
||||
data_pointer_ newBlock = reinterpret_cast<data_pointer_>
|
||||
(operator new(BlockSize));
|
||||
reinterpret_cast<slot_pointer_>(newBlock)->next = currentBlock_;
|
||||
currentBlock_ = reinterpret_cast<slot_pointer_>(newBlock);
|
||||
// Pad block body to staisfy the alignment requirements for elements
|
||||
data_pointer_ body = newBlock + sizeof(slot_pointer_);
|
||||
size_type bodyPadding = padPointer(body, alignof(slot_type_));
|
||||
currentSlot_ = reinterpret_cast<slot_pointer_>(body + bodyPadding);
|
||||
lastSlot_ = reinterpret_cast<slot_pointer_>
|
||||
(newBlock + BlockSize - sizeof(slot_type_) + 1);
|
||||
}
|
||||
|
||||
|
||||
|
||||
template <typename T, size_t BlockSize>
|
||||
inline typename MemoryPool<T, BlockSize>::pointer
|
||||
MemoryPool<T, BlockSize>::allocate(size_type n, const_pointer hint)
|
||||
{
|
||||
if (freeSlots_ != nullptr) {
|
||||
pointer result = reinterpret_cast<pointer>(freeSlots_);
|
||||
freeSlots_ = freeSlots_->next;
|
||||
return result;
|
||||
}
|
||||
else {
|
||||
if (currentSlot_ >= lastSlot_)
|
||||
allocateBlock();
|
||||
return reinterpret_cast<pointer>(currentSlot_++);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
template <typename T, size_t BlockSize>
|
||||
inline void
|
||||
MemoryPool<T, BlockSize>::deallocate(pointer p, size_type n)
|
||||
{
|
||||
if (p != nullptr) {
|
||||
reinterpret_cast<slot_pointer_>(p)->next = freeSlots_;
|
||||
freeSlots_ = reinterpret_cast<slot_pointer_>(p);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
template <typename T, size_t BlockSize>
|
||||
inline typename MemoryPool<T, BlockSize>::size_type
|
||||
MemoryPool<T, BlockSize>::max_size()
|
||||
const noexcept
|
||||
{
|
||||
size_type maxBlocks = -1 / BlockSize;
|
||||
return (BlockSize - sizeof(data_pointer_)) / sizeof(slot_type_) * maxBlocks;
|
||||
}
|
||||
|
||||
|
||||
|
||||
template <typename T, size_t BlockSize>
|
||||
template <class U, class... Args>
|
||||
inline void
|
||||
MemoryPool<T, BlockSize>::construct(U* p, Args&&... args)
|
||||
{
|
||||
new (p) U (std::forward<Args>(args)...);
|
||||
}
|
||||
|
||||
|
||||
|
||||
template <typename T, size_t BlockSize>
|
||||
template <class U>
|
||||
inline void
|
||||
MemoryPool<T, BlockSize>::destroy(U* p)
|
||||
{
|
||||
p->~U();
|
||||
}
|
||||
|
||||
|
||||
|
||||
template <typename T, size_t BlockSize>
|
||||
template <class... Args>
|
||||
inline typename MemoryPool<T, BlockSize>::pointer
|
||||
MemoryPool<T, BlockSize>::newElement(Args&&... args)
|
||||
{
|
||||
pointer result = allocate();
|
||||
construct<value_type>(result, std::forward<Args>(args)...);
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
|
||||
template <typename T, size_t BlockSize>
|
||||
inline void
|
||||
MemoryPool<T, BlockSize>::deleteElement(pointer p)
|
||||
{
|
||||
if (p != nullptr) {
|
||||
p->~value_type();
|
||||
deallocate(p);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
#endif // MEMORY_BLOCK_TCC
|
||||
@ -69,8 +69,7 @@ namespace sbgtc
|
||||
|
||||
void sbgSolutionModeSignal(int);
|
||||
|
||||
void sbgAccuracySignal(int);
|
||||
|
||||
void sbgAccuracySignal(int, int);
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -63,7 +63,7 @@ public slots:
|
||||
void sendSerialPortStatus(int serialPortStatus);
|
||||
|
||||
void sendSbgSolutionModeState(int SolutionMode);
|
||||
void sendSbgAccuracyState(int Accuracy);
|
||||
void sendSbgAccuracyState(int Accuracy,int SatelliteCounter);
|
||||
|
||||
void sendXimeaImageStatus(int ximeaImageStatus);
|
||||
void sendCopyFileStatus(int fileStatus);
|
||||
|
||||
@ -37,6 +37,11 @@
|
||||
#include "math.h"
|
||||
#include "utility_tc.h"
|
||||
|
||||
#include "MemoryPool.h"
|
||||
#include <queue>
|
||||
#include <QMutex>
|
||||
|
||||
|
||||
|
||||
//#ifdef WIN32
|
||||
//#include <xiApi.h> // Windows
|
||||
@ -44,6 +49,23 @@
|
||||
//#include <m3api/xiApi.h> // Linux, OSX
|
||||
//#endif
|
||||
|
||||
//struct DataBuffer
|
||||
//{
|
||||
// unsigned short data[409200/2];
|
||||
//};
|
||||
|
||||
class DataBuffer
|
||||
{
|
||||
public:
|
||||
DataBuffer();
|
||||
~DataBuffer();
|
||||
|
||||
unsigned short data[425600];//304*1400=425600，为了兼容所有设置spectral bin和spatial bin
|
||||
|
||||
private:
|
||||
|
||||
};
|
||||
|
||||
class RecordXimeaTemperature : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
@ -64,6 +86,30 @@ signals:
|
||||
|
||||
};
|
||||
|
||||
//queue<DataBuffer *> q;
|
||||
//static QMutex r_qtx{ QMutex::Recursive };
|
||||
static std::mutex r_qtx;
|
||||
|
||||
class WriteData2Disk : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
WriteData2Disk();
|
||||
void setParm(queue<DataBuffer *> * q, QString baseFileName, int frameSizeInByte, MemoryPool<DataBuffer> * pool);
|
||||
|
||||
private:
|
||||
queue<DataBuffer *> * m_q;
|
||||
QString m_QbaseFileName;
|
||||
int m_iFrameSizeInByte;
|
||||
MemoryPool<DataBuffer> * m_pool;
|
||||
|
||||
public slots:
|
||||
void write2Disk();
|
||||
|
||||
signals:
|
||||
};
|
||||
|
||||
class XimeaImager : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
@ -99,11 +145,17 @@ private:
|
||||
QThread * m_recordTempThread;
|
||||
RecordXimeaTemperature * m_ximeaTemperature;
|
||||
|
||||
QThread * writeData2DiskThread;
|
||||
WriteData2Disk * writeData2Disk;
|
||||
queue<DataBuffer *> * q;
|
||||
MemoryPool<DataBuffer> * m_pool;
|
||||
|
||||
QString m_baseFileName;
|
||||
QString m_ximeaTemperatureCSVPath;
|
||||
|
||||
Iris::IrisXimeaImager m_imager;
|
||||
unsigned short * m_buffer;
|
||||
// MemoryPool<unsigned short> m_pool;
|
||||
bool m_bRecordControl;
|
||||
int m_iFrameCounter;
|
||||
int m_iFrameSizeInByte;
|
||||
@ -132,6 +184,8 @@ private:
|
||||
|
||||
Configfile m_configfile;
|
||||
|
||||
|
||||
|
||||
public slots:
|
||||
void openImger();
|
||||
void closeImger();
|
||||
@ -143,5 +197,6 @@ signals:
|
||||
void ximeaImageStatus(int);
|
||||
|
||||
void recordXimeaTemperatureSignal(QString);
|
||||
void startWriteDiskSignal();
|
||||
};
|
||||
#endif // XIMEAIMAGER_H
|
||||
|
||||
Reference in New Issue
Block a user