leonarski_fandClaude Opus 4.8
040cdeacf1
The base AcquisitionDevice no longer allocates or frees frame buffers; buffer_device is now just a non-owning view of addresses. Each subclass owns its backing memory and the matching lifecycle: - PCIExpressDevice mmap's the kernel DMA buffers and munmap's them in its own destructor (and on ctor failure), symmetric with MapKernelBuffer. - HLSSimulatedDevice owns plain zeroed heap buffers it points buffer_device into, declared before the HLSDevice so they outlive the action thread that writes them. The buffers are page-aligned to match the real device's kernel DMA buffers - the modelled AXI datamover and FPGAIntegrationTest require aligned output buffers. This drops the NUMA/mmap dance from the simulated path (not performance-critical) - removing libnuma from acquisition_device - and replaces the base-class cleanup that had to guess the allocation strategy with a single clear owner per device. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
122 lines
4.9 KiB
C++
122 lines
4.9 KiB
C++
// SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#pragma once
|
|
|
|
#include <map>
|
|
#include <mutex>
|
|
#include <future>
|
|
#include <unistd.h>
|
|
|
|
#include "../common/Definitions.h"
|
|
#include "../common/DiffractionExperiment.h"
|
|
#include "../common/Logger.h"
|
|
#include "../common/PixelMask.h"
|
|
|
|
#include "../common/ThreadSafeFIFO.h"
|
|
#include "../jungfrau/JFCalibration.h"
|
|
|
|
#include "AcquisitionCounters.h"
|
|
#include "Completion.h"
|
|
#include "../fpga/pcie_driver/jfjoch_fpga.h"
|
|
#include "../common/NetworkAddressConvert.h"
|
|
#include "../common/AzimuthalIntegrationMapping.h"
|
|
|
|
struct AcquisitionDeviceStatistics {
|
|
uint64_t good_packets;
|
|
uint64_t packets_expected;
|
|
float efficiency;
|
|
uint64_t bytes_received;
|
|
time_t start_timestamp;
|
|
time_t end_timestamp;
|
|
uint64_t nmodules;
|
|
std::vector<uint64_t> packets_received_per_module;
|
|
};
|
|
|
|
class AcquisitionDevice {
|
|
std::chrono::time_point<std::chrono::system_clock> start_time;
|
|
std::chrono::time_point<std::chrono::system_clock> end_time;
|
|
|
|
int64_t expected_frames;
|
|
|
|
virtual void Start(const DiffractionExperiment& experiment, uint32_t flags) = 0;
|
|
virtual void Finalize() {}; // do clean-up after action is done
|
|
virtual void StartSendingWorkRequests() {};
|
|
void SendWorkRequest(uint32_t handle);
|
|
protected:
|
|
AcquisitionCounters counters;
|
|
|
|
ThreadSafeFIFO<Completion> work_completion_queue;
|
|
ThreadSafeFIFO<WorkRequest> work_request_queue;
|
|
|
|
// Non-owning view of the per-buffer addresses. Each device subclass owns the backing memory
|
|
// and its lifecycle: PCIExpressDevice mmap's/munmap's kernel DMA buffers, HLSSimulatedDevice
|
|
// points these at plain heap buffers it owns.
|
|
std::vector<DeviceOutput *> buffer_device;
|
|
Logger *logger;
|
|
|
|
uint16_t data_stream;
|
|
uint32_t max_modules = 1;
|
|
uint64_t mac_addr;
|
|
uint32_t ipv4_addr;
|
|
explicit AcquisitionDevice(uint16_t data_stream);
|
|
|
|
const DeviceOutput *GetDeviceOutput(size_t handle) const;
|
|
DeviceOutput *GetDeviceOutput(size_t handle);
|
|
virtual void HW_RunInternalGenerator(const FrameGeneratorConfig& config) = 0;
|
|
virtual void HW_SetSpotFinderParameters(const SpotFinderParameters ¶ms) = 0;
|
|
public:
|
|
AcquisitionDevice(const AcquisitionDevice &other) = delete;
|
|
AcquisitionDevice &operator=(const AcquisitionDevice &other) = delete;
|
|
|
|
static constexpr const uint64_t HandleNotValid = UINT64_MAX;
|
|
|
|
virtual ~AcquisitionDevice() = default;
|
|
|
|
void StartAction(const DiffractionExperiment &experiment, uint32_t optional_flags = 0);
|
|
void PrepareAction(const DiffractionExperiment &experiment);
|
|
|
|
void WaitForActionComplete();
|
|
virtual void Cancel() = 0;
|
|
|
|
void EnableLogging(Logger *logger);
|
|
|
|
// Post measurement statistics - only guaranteed valid after WaitForActionComplete ends
|
|
uint64_t GetBytesReceived() const;
|
|
|
|
virtual DataCollectionStatus GetDataCollectionStatus() const;
|
|
virtual DeviceStatus GetDeviceStatus() const;
|
|
AcquisitionDeviceStatistics GetStatistics() const;
|
|
const DeviceOutput *GetDeviceOutput(size_t frame_number, uint16_t module_number) const;
|
|
void FrameBufferRelease(size_t frame_number, uint16_t module_number);
|
|
|
|
// Calibration
|
|
virtual void InitializeCalibration(const DiffractionExperiment &experiment, const JFCalibration &calib);
|
|
virtual void InitializeIntegrationMap(const DiffractionExperiment &experiment, const std::vector<uint16_t> &v,
|
|
const std::vector<float> &weights);
|
|
virtual void InitializeIntegrationMap(const uint16_t *map, const float *weights, size_t module_number);
|
|
virtual void InitializeSpotFinderResolutionMap(const float *data, size_t module_number);
|
|
virtual void InitializeROIMap(const uint16_t *map, size_t module_number);
|
|
void InitializeEmptyPixelMask(const DiffractionExperiment &experiment); // Empty Mask
|
|
void InitializePixelMask(const DiffractionExperiment &experiment, const PixelMask &mask_raw);
|
|
virtual void InitializePixelMask(const uint32_t *module_mask, size_t module_number);
|
|
void InitializeROIMap(const DiffractionExperiment& experiment, const std::vector<uint16_t>& raw_roi_map);
|
|
void InitializeDataProcessing(const DiffractionExperiment &experiment, const AzimuthalIntegrationMapping& azint);
|
|
|
|
const AcquisitionCounters& Counters() const;
|
|
|
|
void SetSpotFinderParameters(const SpotFindingSettings &settings);
|
|
virtual std::string GetIPv4Address() const;
|
|
virtual void SetIPv4Address(uint32_t ipv4_addr_network_order);
|
|
virtual std::string GetMACAddress() const;
|
|
virtual uint16_t GetUDPPort() const;
|
|
virtual int32_t GetNUMANode() const;
|
|
virtual void SetInternalGeneratorFrame(const uint16_t *input, size_t module_number) {}
|
|
|
|
AcquisitionDeviceNetConfig GetNetConfig() const;
|
|
|
|
virtual uint32_t GetExpectedDescriptorsPerModule() const = 0;
|
|
void RunInternalGenerator(const DiffractionExperiment& experiment);
|
|
};
|
|
|