Updated without Vector
This commit is contained in:
@@ -10,7 +10,6 @@
|
||||
#include "ObjectBuilder.h"
|
||||
#include "ObjectRegistryDatabase.h"
|
||||
#include "Threads.h"
|
||||
#include "Vec.h"
|
||||
|
||||
// Original broker headers
|
||||
#include "MemoryMapAsyncOutputBroker.h"
|
||||
@@ -105,10 +104,10 @@ public:
|
||||
|
||||
static void Process(DebugServiceI *service,
|
||||
DebugSignalInfo **signalInfoPointers,
|
||||
Vec<uint32> &activeIndices, Vec<uint32> &activeSizes,
|
||||
Vector<uint32> &activeIndices, Vector<uint32> &activeSizes,
|
||||
FastPollingMutexSem &activeMutex,
|
||||
volatile bool *anyBreakFlag,
|
||||
Vec<uint32> *breakIndices) {
|
||||
Vector<uint32> *breakIndices) {
|
||||
if (service == NULL_PTR(DebugServiceI *))
|
||||
return;
|
||||
|
||||
@@ -117,7 +116,7 @@ public:
|
||||
// because that prevents cross-thread EventSem posts from completing.
|
||||
|
||||
activeMutex.FastLock();
|
||||
uint32 n = activeIndices.Size();
|
||||
uint32 n = activeIndices.GetNumberOfElements();
|
||||
if (n > 0 && signalInfoPointers != NULL_PTR(DebugSignalInfo **)) {
|
||||
// Capture timestamp ONCE per broker cycle for lowest impact
|
||||
uint64 ts = (uint64)((float64)HighResolutionTimer::Counter() *
|
||||
@@ -139,13 +138,13 @@ public:
|
||||
// stall would block UpdateBrokersBreakStatus() in the Server thread and
|
||||
// cause unnecessary priority inversion on the RT path.
|
||||
bool shouldCheckBreak = (*anyBreakFlag && !service->IsPaused() &&
|
||||
breakIndices != NULL_PTR(Vec<uint32> *) &&
|
||||
breakIndices != NULL_PTR(Vector<uint32> *) &&
|
||||
signalInfoPointers != NULL_PTR(DebugSignalInfo **));
|
||||
static const uint32 MAX_BREAK_INDICES = 64u;
|
||||
uint32 localBreakIdx[MAX_BREAK_INDICES];
|
||||
uint32 nb = 0u;
|
||||
if (shouldCheckBreak) {
|
||||
nb = breakIndices->Size();
|
||||
nb = breakIndices->GetNumberOfElements();
|
||||
if (nb > MAX_BREAK_INDICES) nb = MAX_BREAK_INDICES;
|
||||
for (uint32 i = 0; i < nb; i++) {
|
||||
localBreakIdx[i] = (*breakIndices)[i];
|
||||
@@ -176,9 +175,9 @@ public:
|
||||
DebugServiceI *&service, DebugSignalInfo **&signalInfoPointers,
|
||||
uint32 numCopies, MemoryMapBrokerCopyTableEntry *copyTable,
|
||||
const char8 *functionName, SignalDirection direction,
|
||||
volatile bool *anyActiveFlag, Vec<uint32> *activeIndices,
|
||||
Vec<uint32> *activeSizes, FastPollingMutexSem *activeMutex,
|
||||
volatile bool *anyBreakFlag, Vec<uint32> *breakIndices) {
|
||||
volatile bool *anyActiveFlag, Vector<uint32> *activeIndices,
|
||||
Vector<uint32> *activeSizes, FastPollingMutexSem *activeMutex,
|
||||
volatile bool *anyBreakFlag, Vector<uint32> *breakIndices) {
|
||||
if (numCopies > 0) {
|
||||
signalInfoPointers = new DebugSignalInfo *[numCopies];
|
||||
for (uint32 i = 0; i < numCopies; i++)
|
||||
@@ -352,9 +351,9 @@ public:
|
||||
volatile bool anyBreakActive;
|
||||
bool isOutput;
|
||||
char8 gamName[256];
|
||||
Vec<uint32> activeIndices;
|
||||
Vec<uint32> activeSizes;
|
||||
Vec<uint32> breakIndices;
|
||||
Vector<uint32> activeIndices;
|
||||
Vector<uint32> activeSizes;
|
||||
Vector<uint32> breakIndices;
|
||||
FastPollingMutexSem activeMutex;
|
||||
};
|
||||
|
||||
@@ -412,9 +411,9 @@ public:
|
||||
volatile bool anyBreakActive;
|
||||
bool isOutput;
|
||||
char8 gamName[256];
|
||||
Vec<uint32> activeIndices;
|
||||
Vec<uint32> activeSizes;
|
||||
Vec<uint32> breakIndices;
|
||||
Vector<uint32> activeIndices;
|
||||
Vector<uint32> activeSizes;
|
||||
Vector<uint32> breakIndices;
|
||||
FastPollingMutexSem activeMutex;
|
||||
};
|
||||
|
||||
@@ -471,9 +470,9 @@ public:
|
||||
volatile bool anyActive;
|
||||
volatile bool anyBreakActive;
|
||||
char8 gamName[256];
|
||||
Vec<uint32> activeIndices;
|
||||
Vec<uint32> activeSizes;
|
||||
Vec<uint32> breakIndices;
|
||||
Vector<uint32> activeIndices;
|
||||
Vector<uint32> activeSizes;
|
||||
Vector<uint32> breakIndices;
|
||||
FastPollingMutexSem activeMutex;
|
||||
};
|
||||
|
||||
@@ -531,9 +530,9 @@ public:
|
||||
volatile bool anyActive;
|
||||
volatile bool anyBreakActive;
|
||||
char8 gamName[256];
|
||||
Vec<uint32> activeIndices;
|
||||
Vec<uint32> activeSizes;
|
||||
Vec<uint32> breakIndices;
|
||||
Vector<uint32> activeIndices;
|
||||
Vector<uint32> activeSizes;
|
||||
Vector<uint32> breakIndices;
|
||||
FastPollingMutexSem activeMutex;
|
||||
};
|
||||
|
||||
|
||||
@@ -24,6 +24,10 @@ const uint32 DebugService::CMD_RATE_LIMIT;
|
||||
const uint32 DebugService::CLIENT_IDLE_TIMEOUT_MS;
|
||||
const uint32 DebugService::INPUT_BUFFER_MAX;
|
||||
|
||||
// Maximum data bytes that fit in one sample entry inside a datagram:
|
||||
// STREAMER_BUFFER_SIZE(65535) - TraceHeader(20) - entry_header(16) = 65499
|
||||
static const uint32 MAX_SAMPLE_DATA_SIZE = 65499u;
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Constructor / Destructor
|
||||
// ---------------------------------------------------------------------------
|
||||
@@ -313,12 +317,21 @@ ErrorManagement::ErrorType DebugService::Server(ExecutionInfo &info) {
|
||||
uint32 cmdLen = len;
|
||||
command.Write(raw + lineStart, cmdLen);
|
||||
|
||||
// Dispatch via base HandleCommand, write response to socket
|
||||
// Dispatch via base HandleCommand, write response to socket.
|
||||
// Loop to handle partial writes for large responses.
|
||||
StreamString out;
|
||||
HandleCommand(command, out);
|
||||
if (out.Size() > 0u) {
|
||||
uint32 outSz = out.Size();
|
||||
(void)activeClient->Write(out.Buffer(), outSz);
|
||||
const char8 *wPtr = out.Buffer();
|
||||
uint32 remaining = (uint32)out.Size();
|
||||
while (remaining > 0u) {
|
||||
uint32 wrote = remaining;
|
||||
if (!activeClient->Write(wPtr, wrote) || wrote == 0u) {
|
||||
break;
|
||||
}
|
||||
wPtr += wrote;
|
||||
remaining -= wrote;
|
||||
}
|
||||
}
|
||||
}
|
||||
lineStart = pos + 1u;
|
||||
@@ -374,7 +387,7 @@ ErrorManagement::ErrorType DebugService::Streamer(ExecutionInfo &info) {
|
||||
uint64 currentTimeMs = (uint64)((float64)HighResolutionTimer::Counter() *
|
||||
HighResolutionTimer::Period() * 1000.0);
|
||||
mutex.FastLock();
|
||||
for (uint32 i = 0u; i < monitoredSignals.Size(); i++) {
|
||||
for (uint32 i = 0u; i < monitoredSignals.GetNumberOfElements(); i++) {
|
||||
if (currentTimeMs >= (monitoredSignals[i].lastPollTime +
|
||||
monitoredSignals[i].periodMs)) {
|
||||
monitoredSignals[i].lastPollTime = currentTimeMs;
|
||||
@@ -392,54 +405,62 @@ ErrorManagement::ErrorType DebugService::Streamer(ExecutionInfo &info) {
|
||||
}
|
||||
mutex.FastUnLock();
|
||||
|
||||
// Drain ring buffer into UDP packet(s)
|
||||
static const uint32 SAMPLE_BUF_SIZE = 1024u;
|
||||
typedef char StaticAssert_StreamerBufferTooSmall[
|
||||
(sizeof(TraceHeader) + 16u + SAMPLE_BUF_SIZE <= STREAMER_BUFFER_SIZE) ? 1 : -1];
|
||||
(void)sizeof(StaticAssert_StreamerBufferTooSmall);
|
||||
|
||||
// Drain ring buffer into UDP packet(s).
|
||||
//
|
||||
// Batching strategy:
|
||||
// - Normal samples (entry ≤ STREAMER_MTU): accumulate into a packet and
|
||||
// flush when the next sample would push it past STREAMER_MTU.
|
||||
// - Oversized samples (entry > STREAMER_MTU): flush any pending packet
|
||||
// first, then send the oversized sample as its own datagram (up to
|
||||
// STREAMER_BUFFER_SIZE bytes; handled transparently by IP fragmentation
|
||||
// on loopback / internal networks).
|
||||
// - MAX_SAMPLE_DATA_SIZE (65499 bytes) is the hard cap; larger entries
|
||||
// in the ring buffer are skipped by Pop() and discarded.
|
||||
bool hasData = false;
|
||||
uint32 id, size;
|
||||
uint64 ts;
|
||||
uint8 sampleData[SAMPLE_BUF_SIZE];
|
||||
bool hasData = false;
|
||||
|
||||
while (traceBuffer.Pop(id, ts, sampleData, size, SAMPLE_BUF_SIZE)) {
|
||||
while (traceBuffer.Pop(id, ts, streamerSampleBuffer, size, MAX_SAMPLE_DATA_SIZE)) {
|
||||
hasData = true;
|
||||
if (size > SAMPLE_BUF_SIZE ||
|
||||
streamerPacketOffset + 16u + size > STREAMER_BUFFER_SIZE) {
|
||||
REPORT_ERROR_STATIC(ErrorManagement::Warning,
|
||||
"Streamer: sample size %u would overflow assembly buffer "
|
||||
"(%u bytes used of %u) — sample dropped.",
|
||||
size, streamerPacketOffset, STREAMER_BUFFER_SIZE);
|
||||
continue;
|
||||
}
|
||||
if (streamerPacketOffset == 0u) {
|
||||
TraceHeader header;
|
||||
header.magic = 0xDA7A57ADu;
|
||||
header.seq = streamerSequenceNumber++;
|
||||
header.timestamp = HighResolutionTimer::Counter();
|
||||
header.count = 0u;
|
||||
memcpy(streamerPacketBuffer, &header, sizeof(TraceHeader));
|
||||
streamerPacketOffset = sizeof(TraceHeader);
|
||||
}
|
||||
if (streamerPacketOffset + 16u + size > STREAMER_MTU) {
|
||||
const uint32 entryBytes = 16u + size; // [id:4][ts:8][size:4][data:size]
|
||||
|
||||
// If this entry would push the current packet past the MTU target,
|
||||
// flush what we have before appending (unless the buffer is empty).
|
||||
if (streamerPacketOffset > 0u &&
|
||||
streamerPacketOffset + entryBytes > STREAMER_MTU) {
|
||||
uint32 toWrite = streamerPacketOffset;
|
||||
(void)udpSocket.Write((char8 *)streamerPacketBuffer, toWrite);
|
||||
TraceHeader header;
|
||||
header.magic = 0xDA7A57ADu;
|
||||
header.seq = streamerSequenceNumber++;
|
||||
header.timestamp = HighResolutionTimer::Counter();
|
||||
header.count = 0u;
|
||||
memcpy(streamerPacketBuffer, &header, sizeof(TraceHeader));
|
||||
streamerPacketOffset = sizeof(TraceHeader);
|
||||
streamerPacketOffset = 0u;
|
||||
}
|
||||
memcpy(&streamerPacketBuffer[streamerPacketOffset], &id, 4u);
|
||||
memcpy(&streamerPacketBuffer[streamerPacketOffset + 4u], &ts, 8u);
|
||||
|
||||
// Open a new packet header if the buffer is empty.
|
||||
if (streamerPacketOffset == 0u) {
|
||||
TraceHeader hdr;
|
||||
hdr.magic = 0xDA7A57ADu;
|
||||
hdr.seq = streamerSequenceNumber++;
|
||||
hdr.timestamp = HighResolutionTimer::Counter();
|
||||
hdr.count = 0u;
|
||||
memcpy(streamerPacketBuffer, &hdr, sizeof(TraceHeader));
|
||||
streamerPacketOffset = (uint32)sizeof(TraceHeader);
|
||||
}
|
||||
|
||||
// Append the sample entry.
|
||||
memcpy(&streamerPacketBuffer[streamerPacketOffset], &id, 4u);
|
||||
memcpy(&streamerPacketBuffer[streamerPacketOffset + 4u], &ts, 8u);
|
||||
memcpy(&streamerPacketBuffer[streamerPacketOffset + 12u], &size, 4u);
|
||||
memcpy(&streamerPacketBuffer[streamerPacketOffset + 16u], sampleData, size);
|
||||
streamerPacketOffset += (16u + size);
|
||||
memcpy(&streamerPacketBuffer[streamerPacketOffset + 16u], streamerSampleBuffer, size);
|
||||
streamerPacketOffset += entryBytes;
|
||||
((TraceHeader *)streamerPacketBuffer)->count++;
|
||||
|
||||
// Oversized single sample: send immediately rather than accumulating.
|
||||
if (streamerPacketOffset > STREAMER_MTU) {
|
||||
uint32 toWrite = streamerPacketOffset;
|
||||
(void)udpSocket.Write((char8 *)streamerPacketBuffer, toWrite);
|
||||
streamerPacketOffset = 0u;
|
||||
}
|
||||
}
|
||||
|
||||
// Flush any remaining partial packet.
|
||||
if (streamerPacketOffset > 0u) {
|
||||
uint32 toWrite = streamerPacketOffset;
|
||||
(void)udpSocket.Write((char8 *)streamerPacketBuffer, toWrite);
|
||||
|
||||
@@ -82,9 +82,13 @@ private:
|
||||
BasicTCPSocket *activeClient;
|
||||
|
||||
// Streamer assembly buffer
|
||||
// STREAMER_MTU: target packet size for batching small signals (network-friendly).
|
||||
// STREAMER_BUFFER_SIZE: maximum UDP datagram payload; large single-signal samples
|
||||
// can exceed STREAMER_MTU and are sent as their own datagram up to this limit.
|
||||
static const uint32 STREAMER_MTU = 1400u;
|
||||
static const uint32 STREAMER_BUFFER_SIZE = 4096u;
|
||||
uint8 streamerPacketBuffer[STREAMER_BUFFER_SIZE];
|
||||
static const uint32 STREAMER_BUFFER_SIZE = 65535u;
|
||||
uint8 streamerPacketBuffer[STREAMER_BUFFER_SIZE]; // assembled outgoing packet
|
||||
uint8 streamerSampleBuffer[STREAMER_BUFFER_SIZE]; // staging for one popped sample
|
||||
uint32 streamerPacketOffset;
|
||||
uint32 streamerSequenceNumber;
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -52,11 +52,11 @@ public:
|
||||
uint32 numSignals,
|
||||
MemoryMapBroker *broker,
|
||||
volatile bool *anyActiveFlag,
|
||||
Vec<uint32> *activeIndices,
|
||||
Vec<uint32> *activeSizes,
|
||||
Vector<uint32> *activeIndices,
|
||||
Vector<uint32> *activeSizes,
|
||||
FastPollingMutexSem *activeMutex,
|
||||
volatile bool *anyBreakFlag,
|
||||
Vec<uint32> *breakIndices,
|
||||
Vector<uint32> *breakIndices,
|
||||
const char8 *gamName = NULL_PTR(const char8 *),
|
||||
bool isOutput = false);
|
||||
|
||||
@@ -167,10 +167,10 @@ protected:
|
||||
// Shared data members
|
||||
// =========================================================================
|
||||
|
||||
Vec<DebugSignalInfo *> signals;
|
||||
Vec<SignalAlias> aliases;
|
||||
Vec<BrokerInfo> brokers;
|
||||
Vec<MonitoredSignal> monitoredSignals;
|
||||
Vector<DebugSignalInfo *> signals;
|
||||
Vector<SignalAlias> aliases;
|
||||
Vector<BrokerInfo> brokers;
|
||||
Vector<MonitoredSignal> monitoredSignals;
|
||||
|
||||
FastPollingMutexSem mutex;
|
||||
FastPollingMutexSem tracePushMutex;
|
||||
|
||||
@@ -32,7 +32,6 @@
|
||||
#include "Object.h"
|
||||
#include "StreamString.h"
|
||||
#include "TypeDescriptor.h"
|
||||
#include "Vec.h"
|
||||
|
||||
namespace MARTe {
|
||||
|
||||
@@ -49,11 +48,11 @@ struct BrokerInfo {
|
||||
uint32 numSignals;
|
||||
MemoryMapBroker *broker;
|
||||
volatile bool *anyActiveFlag;
|
||||
Vec<uint32> *activeIndices;
|
||||
Vec<uint32> *activeSizes;
|
||||
Vector<uint32> *activeIndices;
|
||||
Vector<uint32> *activeSizes;
|
||||
FastPollingMutexSem *activeMutex;
|
||||
volatile bool *anyBreakFlag;
|
||||
Vec<uint32> *breakIndices;
|
||||
Vector<uint32> *breakIndices;
|
||||
StreamString gamName;
|
||||
bool isOutput;
|
||||
};
|
||||
@@ -124,11 +123,11 @@ public:
|
||||
uint32 numSignals,
|
||||
MemoryMapBroker *broker,
|
||||
volatile bool *anyActiveFlag,
|
||||
Vec<uint32> *activeIndices,
|
||||
Vec<uint32> *activeSizes,
|
||||
Vector<uint32> *activeIndices,
|
||||
Vector<uint32> *activeSizes,
|
||||
FastPollingMutexSem *activeMutex,
|
||||
volatile bool *anyBreakFlag,
|
||||
Vec<uint32> *breakIndices,
|
||||
Vector<uint32> *breakIndices,
|
||||
const char8 *gamName = NULL_PTR(const char8 *),
|
||||
bool isOutput = false) = 0;
|
||||
|
||||
|
||||
@@ -6,8 +6,6 @@ ROOT_DIR=../../../../
|
||||
MAKEDEFAULTDIR=$(MARTe2_DIR)/MakeDefaults
|
||||
include $(MAKEDEFAULTDIR)/MakeStdLibDefs.$(TARGET)
|
||||
|
||||
INCLUDES += -I$(ROOT_DIR)/Source/Core/Types/Result
|
||||
INCLUDES += -I$(ROOT_DIR)/Source/Core/Types/Vec
|
||||
INCLUDES += -I$(ROOT_DIR)/Source/Components/Interfaces/TCPLogger
|
||||
INCLUDES += -I$(ROOT_DIR)/Source/Components/Interfaces/DebugService
|
||||
INCLUDES += -I$(MARTe2_DIR)/Source/Core/BareMetal/L0Types
|
||||
|
||||
@@ -451,7 +451,7 @@ ErrorManagement::ErrorType WebDebugService::Streamer(ExecutionInfo &info) {
|
||||
// Poll monitored signals → SSE monitor events
|
||||
// -----------------------------------------------------------------
|
||||
mutex.FastLock();
|
||||
for (uint32 i = 0u; i < monitoredSignals.Size(); i++) {
|
||||
for (uint32 i = 0u; i < monitoredSignals.GetNumberOfElements(); i++) {
|
||||
if (nowMs >= (monitoredSignals[i].lastPollTime +
|
||||
monitoredSignals[i].periodMs)) {
|
||||
monitoredSignals[i].lastPollTime = nowMs;
|
||||
@@ -468,7 +468,7 @@ ErrorManagement::ErrorType WebDebugService::Streamer(ExecutionInfo &info) {
|
||||
float64 val = WDS_ToFloat64(lb, td);
|
||||
|
||||
StreamString sigName;
|
||||
for (uint32 j = 0u; j < aliases.Size(); j++) {
|
||||
for (uint32 j = 0u; j < aliases.GetNumberOfElements(); j++) {
|
||||
if (signals[aliases[j].signalIndex]->internalID ==
|
||||
monitoredSignals[i].internalID) {
|
||||
sigName = aliases[j].name;
|
||||
@@ -499,24 +499,21 @@ ErrorManagement::ErrorType WebDebugService::Streamer(ExecutionInfo &info) {
|
||||
// -----------------------------------------------------------------
|
||||
// Drain ring buffer → SSE trace events
|
||||
// -----------------------------------------------------------------
|
||||
static const uint32 SAMPLE_BUF_SIZE = 1024u;
|
||||
static const uint32 MAX_TRACE_CYCLE = 50u;
|
||||
uint32 id, size;
|
||||
uint64 sampleTs;
|
||||
uint8 sampleData[SAMPLE_BUF_SIZE];
|
||||
bool hasData = false;
|
||||
uint32 traceCount = 0u;
|
||||
|
||||
while (traceCount < MAX_TRACE_CYCLE &&
|
||||
traceBuffer.Pop(id, sampleTs, sampleData, size, SAMPLE_BUF_SIZE)) {
|
||||
traceBuffer.Pop(id, sampleTs, traceSampleBuffer, size, TRACE_SAMPLE_MAX)) {
|
||||
hasData = true;
|
||||
traceCount++;
|
||||
if (size > SAMPLE_BUF_SIZE) continue;
|
||||
|
||||
StreamString sigName;
|
||||
TypeDescriptor sigType = UnsignedInteger32Bit;
|
||||
mutex.FastLock();
|
||||
for (uint32 i = 0u; i < signals.Size(); i++) {
|
||||
for (uint32 i = 0u; i < signals.GetNumberOfElements(); i++) {
|
||||
if (signals[i]->internalID == id) {
|
||||
sigName = signals[i]->name;
|
||||
sigType = signals[i]->type;
|
||||
@@ -527,7 +524,7 @@ ErrorManagement::ErrorType WebDebugService::Streamer(ExecutionInfo &info) {
|
||||
|
||||
uint32 tsMs = (sampleTs >= streamerT0Ns)
|
||||
? (uint32)((sampleTs - streamerT0Ns) / 1000000u) : 0u;
|
||||
float64 val = WDS_ToFloat64(sampleData, sigType);
|
||||
float64 val = WDS_ToFloat64(traceSampleBuffer, sigType);
|
||||
char8 valBuf[64] = { '\0' };
|
||||
{
|
||||
AnyType vdst(CharString, 0u, valBuf); vdst.SetNumberOfElements(0u, 63u);
|
||||
|
||||
@@ -97,6 +97,10 @@ private:
|
||||
uint32 logHistoryWriteIdx;
|
||||
uint32 logHistoryFill;
|
||||
FastPollingMutexSem logHistoryMutex;
|
||||
|
||||
// Staging buffer for trace ring-buffer pops (max UDP datagram payload).
|
||||
static const uint32 TRACE_SAMPLE_MAX = 65499u;
|
||||
uint8 traceSampleBuffer[TRACE_SAMPLE_MAX];
|
||||
};
|
||||
|
||||
} // namespace MARTe
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
include Makefile.inc
|
||||
@@ -1,46 +0,0 @@
|
||||
#############################################################
|
||||
#
|
||||
# Copyright 2015 F4E | European Joint Undertaking for ITER
|
||||
# and the Development of Fusion Energy ('Fusion for Energy')
|
||||
#
|
||||
# Licensed under the EUPL, Version 1.1 or - as soon they
|
||||
# will be approved by the European Commission - subsequent
|
||||
# versions of the EUPL (the "Licence");
|
||||
# You may not use this work except in compliance with the
|
||||
# Licence.
|
||||
# You may obtain a copy of the Licence at:
|
||||
#
|
||||
# http://ec.europa.eu/idabc/eupl
|
||||
#
|
||||
# Unless required by applicable law or agreed to in
|
||||
# writing, software distributed under the Licence is
|
||||
# distributed on an "AS IS" basis,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
|
||||
# express or implied.
|
||||
# See the Licence for the specific language governing
|
||||
# permissions and limitations under the Licence.
|
||||
#
|
||||
# $Id: Makefile.inc 3 2012-01-15 16:26:07Z aneto $
|
||||
#
|
||||
#############################################################
|
||||
|
||||
SPB =
|
||||
|
||||
|
||||
ROOT_DIR=../../..
|
||||
|
||||
|
||||
PACKAGE=Core
|
||||
ROOT_DIR=../../..
|
||||
ABS_ROOT_DIR=$(abspath $(ROOT_DIR))
|
||||
MAKEDEFAULTDIR=$(MARTe2_DIR)/MakeDefaults
|
||||
|
||||
include $(MAKEDEFAULTDIR)/MakeStdLibDefs.$(TARGET)
|
||||
|
||||
all: $(OBJS) $(SUBPROJ)
|
||||
echo $(OBJS)
|
||||
|
||||
include depends.$(TARGET)
|
||||
|
||||
include $(MAKEDEFAULTDIR)/MakeStdLibRules.$(TARGET)
|
||||
|
||||
@@ -1,75 +0,0 @@
|
||||
#ifndef __RESULT_H
|
||||
#define __RESULT_H
|
||||
|
||||
#include <cassert>
|
||||
|
||||
namespace MARTe {
|
||||
|
||||
/**
|
||||
* @brief Namespace for result error codes.
|
||||
*/
|
||||
namespace Errors {
|
||||
enum ErrorT {
|
||||
None = 0,
|
||||
Generic = 1,
|
||||
OutOfMemory = 2,
|
||||
IndexOutOfBounds = 3,
|
||||
ValueOutOfRange = 4,
|
||||
WrongType = 5,
|
||||
Empty = 6,
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief A simple Result type for error handling.
|
||||
* @details This implementation is header-only to ensure template linkage.
|
||||
* Requirement: T and E must have default constructors and be copyable.
|
||||
*/
|
||||
template <typename T, typename E = Errors::ErrorT>
|
||||
class Result {
|
||||
public:
|
||||
static Result Success(const T &t) {
|
||||
return Result(t, true);
|
||||
}
|
||||
|
||||
static Result Fail(const E &e) {
|
||||
return Result(e, false);
|
||||
}
|
||||
|
||||
Result() : state(false), val(T()), err(E()) {}
|
||||
Result(const Result &r) : state(r.state), val(r.val), err(r.err) {}
|
||||
|
||||
Result& operator=(const Result &r) {
|
||||
if (this != &r) {
|
||||
state = r.state;
|
||||
val = r.val;
|
||||
err = r.err;
|
||||
}
|
||||
return *this;
|
||||
}
|
||||
|
||||
bool Ok() const { return state; }
|
||||
bool IsOk() const { return state; }
|
||||
|
||||
// Const accessors
|
||||
const T &Val() const { assert(state); return val; }
|
||||
const E &Err() const { assert(!state); return err; }
|
||||
|
||||
// Non-const accessors
|
||||
T &Val() { assert(state); return val; }
|
||||
E &Err() { assert(!state); return err; }
|
||||
|
||||
operator bool() const { return state; }
|
||||
|
||||
private:
|
||||
Result(const T &v, bool s) : state(s), val(v), err(E()) {}
|
||||
Result(const E &e, bool s) : state(s), val(T()), err(e) {}
|
||||
|
||||
bool state;
|
||||
T val;
|
||||
E err;
|
||||
};
|
||||
|
||||
} // namespace MARTe
|
||||
|
||||
#endif
|
||||
@@ -1 +0,0 @@
|
||||
Result.o: Result.cpp Result.h
|
||||
@@ -1,158 +0,0 @@
|
||||
#ifndef __VEC_H
|
||||
#define __VEC_H
|
||||
|
||||
#include "Result.h"
|
||||
#include <stddef.h>
|
||||
#include <string.h>
|
||||
#include <cassert>
|
||||
#include <stdio.h>
|
||||
|
||||
namespace MARTe {
|
||||
|
||||
/**
|
||||
* @brief Simple dynamic array (vector) implementation with fixed growth.
|
||||
* @tparam T The type of elements.
|
||||
* @tparam GROWTH The number of elements to add when the buffer is full.
|
||||
*/
|
||||
template <typename T, size_t GROWTH = 16>
|
||||
class Vec {
|
||||
public:
|
||||
Vec() : size(0), mem_size(GROWTH), arr(NULL) {
|
||||
arr = new T[mem_size];
|
||||
}
|
||||
|
||||
Vec(const Vec<T, GROWTH> &other) : size(other.size), mem_size(other.mem_size), arr(NULL) {
|
||||
arr = new T[mem_size];
|
||||
for (size_t i = 0; i < size; ++i) {
|
||||
arr[i] = other.arr[i];
|
||||
}
|
||||
}
|
||||
|
||||
Vec(const T *data, const size_t count) : size(count), mem_size(count + GROWTH), arr(NULL) {
|
||||
arr = new T[mem_size];
|
||||
for (size_t i = 0; i < size; ++i) {
|
||||
arr[i] = data[i];
|
||||
}
|
||||
}
|
||||
|
||||
~Vec() {
|
||||
if (arr != NULL) {
|
||||
delete[] arr;
|
||||
arr = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
Vec& operator=(const Vec<T, GROWTH> &other) {
|
||||
if (this != &other) {
|
||||
T* new_arr = new T[other.mem_size];
|
||||
for (size_t i = 0; i < other.size; ++i) {
|
||||
new_arr[i] = other.arr[i];
|
||||
}
|
||||
if (arr != NULL) {
|
||||
delete[] arr;
|
||||
}
|
||||
arr = new_arr;
|
||||
size = other.size;
|
||||
mem_size = other.mem_size;
|
||||
}
|
||||
return *this;
|
||||
}
|
||||
|
||||
void Clear() {
|
||||
size = 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Exchange contents with another Vec in O(1) — no allocation, no element copies.
|
||||
*
|
||||
* Used by UpdateBrokersActiveStatus / UpdateBrokersBreakStatus to publish a
|
||||
* freshly built index list to the RT thread with the shortest possible lock
|
||||
* hold time: only three pointer/size swaps happen inside the mutex.
|
||||
* The old arrays end up in @p other and are freed when it leaves scope
|
||||
* AFTER the lock is released.
|
||||
*/
|
||||
void Swap(Vec<T, GROWTH> &other) {
|
||||
T *tmpArr = arr; arr = other.arr; other.arr = tmpArr;
|
||||
size_t tmpSz = size; size = other.size; other.size = tmpSz;
|
||||
size_t tmpMem = mem_size; mem_size = other.mem_size; other.mem_size = tmpMem;
|
||||
}
|
||||
|
||||
size_t Size() const {
|
||||
return size;
|
||||
}
|
||||
|
||||
T* GetInternalBuffer() { return arr; }
|
||||
|
||||
bool Remove(size_t index) {
|
||||
if (index >= size) return false;
|
||||
for (size_t i = index; i < size - 1; ++i) {
|
||||
arr[i] = arr[i + 1];
|
||||
}
|
||||
size--;
|
||||
return true;
|
||||
}
|
||||
|
||||
bool Insert(size_t index, const T& val) {
|
||||
if (index > size) return false;
|
||||
if (size == mem_size) extend();
|
||||
|
||||
for (size_t i = size; i > index; --i) {
|
||||
arr[i] = arr[i - 1];
|
||||
}
|
||||
arr[index] = val;
|
||||
size++;
|
||||
return true;
|
||||
}
|
||||
|
||||
Result<T> Get(size_t index) const {
|
||||
if (index >= size) return Result<T>::Fail(Errors::IndexOutOfBounds);
|
||||
return Result<T>::Success(arr[index]);
|
||||
}
|
||||
|
||||
void Push(const T &val) {
|
||||
if (size == mem_size) extend();
|
||||
arr[size++] = val;
|
||||
}
|
||||
|
||||
Result<T> Pop() {
|
||||
if (size == 0) return Result<T>::Fail(Errors::Empty);
|
||||
T last = arr[--size];
|
||||
return Result<T>::Success(last);
|
||||
}
|
||||
|
||||
const T &operator[](const size_t index) const {
|
||||
assert(index < size);
|
||||
return arr[index];
|
||||
}
|
||||
|
||||
T &operator[](const size_t index) {
|
||||
assert(index < size);
|
||||
return arr[index];
|
||||
}
|
||||
|
||||
protected:
|
||||
const T *mem() const { return arr; }
|
||||
size_t memSize() const { return mem_size; }
|
||||
|
||||
private:
|
||||
size_t size;
|
||||
size_t mem_size;
|
||||
T *arr;
|
||||
|
||||
void extend() {
|
||||
size_t new_mem_size = mem_size + GROWTH;
|
||||
T *new_arr = new T[new_mem_size];
|
||||
for (size_t i = 0; i < size; ++i) {
|
||||
new_arr[i] = arr[i];
|
||||
}
|
||||
if (arr != NULL) {
|
||||
delete[] arr;
|
||||
}
|
||||
arr = new_arr;
|
||||
mem_size = new_mem_size;
|
||||
}
|
||||
};
|
||||
|
||||
} // namespace MARTe
|
||||
|
||||
#endif
|
||||
@@ -1 +0,0 @@
|
||||
../../../..//Build/x86-linux/Core/Types/Vec/Vec.o: Vec.cpp
|
||||
@@ -1 +0,0 @@
|
||||
Vec.o: Vec.cpp
|
||||
Reference in New Issue
Block a user