mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2026-07-16 23:26:03 +02:00
Build on RHEL9 docker image / build (push) Successful in 4m15s
Build on RHEL8 docker image / build (push) Successful in 5m21s
Build and Deploy on local RHEL9 / build (push) Successful in 2m12s
Build and Deploy on local RHEL8 / build (push) Successful in 5m12s
Run Simulator Tests on local RHEL9 / build (push) Successful in 18m55s
Run Simulator Tests on local RHEL8 / build (push) Successful in 22m19s
* added fetch fmt server library * added first draft of matterhorn * added cpp TCP Interface to slsDetectorServer * bug: added std::signal for proper handling of ctr+c * added compile option to set log level * WIP * dont use c project settings when building matterhornserver * updated logger * WIP * WIP * linked fmt to slsProjectOptions * solved merge conflict * some refactoring * cleaned up logs * WIP * generated register defs from csv file * oops given in hex * properly added fmt as a dependency * some format changes * WIP * used CRTP for virtual detector * WIP * added udp functions to matterhornserver * fixed build * added Server class usable for all detectors * removed stopserver * added some more functions * wrong overload * porper cleanup of matterhorn app * PR Review * refactored directory structure * added shared memory for aqcuisition status * implemented bus read and write * added Matterhorn data class * modified memory model * added SPI communication * moved memory for Bus communication to BucCommunication class * WIP added HelperFunction for mask conversion * completed HelperFunctions * added tests for MatterHorn Helper Functions * removed shared memory in destructor * fixed SPI communication * moved SharedMemory to slsSupportLib * added toolchain file for cross compilation * fix constructor for HarwareSPICommunication is public * update receiver parameters function * updated mac address * uploaded matterhorn server binary tracked as lfs * small fixes from tests on board * automatically update matterhorn api version when cross compiling binaries * fix bug in SPI read * copy to server_directory/bin when cross compiling * fixed cmake list * update generate_registerdefs.py * fixed copy of server binary * always return error message * add error log when opening dev/mem * code review * fixed eiger, mythen tests for dynamic range * second Review * member function getDerived for better readability * split code into implementation class and actual class doing tcp communication * added slsWarnings and c++17 compiler option * added git lfs to workflow * fix gitea workflows * bug: add extra clock register * implement initial checks * bug: client excpetcs 4 bytes * refactoring directory structure and rename to .hpp * check if detector already set up * missed .h to .hpp * Code Review 3 * use temmplate value for stopserver * use internal CMAKE_CROSSCOMPILING variable * moved boolean stop server flag to DetectorImpl - moving template parameter up * missed a file * replace baseclass:: with this * add Matterhorn server in github workflow * whatever workflow bug- lets see * fixed receiving trim bits changed to int64_t
86 lines
2.4 KiB
C++
86 lines
2.4 KiB
C++
#pragma once
|
|
#include "sls/ServerSocket.h"
|
|
#include "sls/sls_detector_defs.h"
|
|
#include "sls/sls_detector_funcs.h"
|
|
|
|
#include <atomic>
|
|
#include <functional>
|
|
#include <thread>
|
|
#include <unordered_map>
|
|
|
|
namespace sls {
|
|
|
|
using ReturnCode = slsDetectorDefs::ReturnCode;
|
|
|
|
struct ProcessedResult {
|
|
/// @brief return code of the processed command
|
|
slsDetectorDefs::ReturnCode returnCode{};
|
|
/// @brief error message to be sent to client in case of failure
|
|
std::string error_message{};
|
|
};
|
|
|
|
// communication helpers
|
|
inline ProcessedResult return_fail(std::string_view error_message) {
|
|
return ProcessedResult{ReturnCode::FAIL,
|
|
static_cast<std::string>(error_message)};
|
|
}
|
|
|
|
inline ProcessedResult send_ok(ServerInterface &socket) {
|
|
return ProcessedResult{
|
|
static_cast<ReturnCode>(socket.Send(ReturnCode::OK))};
|
|
}
|
|
|
|
template <typename T>
|
|
inline ProcessedResult send_result(ServerInterface &socket, const T &value) {
|
|
return ProcessedResult{static_cast<ReturnCode>(socket.sendResult(value))};
|
|
}
|
|
|
|
/**
|
|
* @brief TCPInterface class handles communication and processing of commands
|
|
* from Client to Server.
|
|
*/
|
|
class TCPInterface {
|
|
|
|
public:
|
|
~TCPInterface();
|
|
|
|
TCPInterface(
|
|
std::function<ProcessedResult(const detFuncs &, ServerInterface &)>
|
|
&processFunction_,
|
|
const uint16_t portNumber = DEFAULT_TCP_CNTRL_PORTNO);
|
|
|
|
/// @brief creates tcp thread
|
|
void startTCPServer();
|
|
|
|
std::atomic<bool> killTcpThread{false};
|
|
|
|
private:
|
|
/**
|
|
* @brief starts the TCP/IP server to listen for client commands and process
|
|
* them
|
|
*/
|
|
void startTCPServerClientConnection();
|
|
|
|
/**
|
|
* @brief decodes the received command and calls the corresponding function
|
|
* @param function_id The ID of the function recived by the server and to
|
|
* be executed
|
|
*/
|
|
ProcessedResult processReceivedData(const detFuncs function_id,
|
|
ServerInterface &socket);
|
|
|
|
/// @brief map of function IDs and corresponding functions
|
|
std::function<ProcessedResult(const detFuncs &, ServerInterface &)>
|
|
processFunction;
|
|
|
|
/// @brief TCP/IP port number for the detector server
|
|
uint16_t portNumber{};
|
|
|
|
/// @brief socket for TCP/IP communication with the client
|
|
ServerSocket server;
|
|
|
|
/// @brief thread for running the TCP/IP server
|
|
std::unique_ptr<std::thread> tcpThread;
|
|
};
|
|
|
|
} // namespace sls
|