Dhanya Thattil 8833ccf5cc
7.0.2.rc (#721)
* row and column for jungfrau mixed up

* multi module jungfrau sync must do slaves first then master for start acquisition and send software trigger, and master first and then slaves for stopacquisition

* non blocking to slaves first and only then blocking/nonblocking to the master for sending software trigger(jungfrau multi mod sync)

* fixed get/set timing jungfrau when sync enabled, getsync during blocking acquire (for trigger or stop) will get stuck as it should ask the stop server

* switching between 1 and 2 interfaces did not set gui/client zmq port properly. Resulted in dummy streaming forever. fixed

* formatting, refactoring: const & for positions, multi mod M3 stop first master first

* adding missing cstdint for gcc 13

* Refactoring handle sync out, handling synchronization also for softwaretrigger for m3, for start/sync/stop for g2/g1

---------

Co-authored-by: Erik Frojdh <erik.frojdh@gmail.com>
2023-05-08 12:11:19 +02:00

93 lines
2.9 KiB
C++

// SPDX-License-Identifier: LGPL-3.0-or-other
// Copyright (C) 2021 Contributors to the SLS Detector Package
#pragma once
#include <array>
#include <cstdint>
#include <iostream>
#include <string>
namespace sls {
class IpAddr {
private:
uint32_t addr_{0};
public:
constexpr IpAddr() noexcept = default;
explicit constexpr IpAddr(uint32_t address) noexcept : addr_{address} {}
explicit IpAddr(const std::string &address);
explicit IpAddr(const char *address);
std::string str() const;
std::string hex() const;
std::array<char, 16u> arr() const;
constexpr bool operator==(const IpAddr &other) const noexcept {
return addr_ == other.addr_;
}
constexpr bool operator!=(const IpAddr &other) const noexcept {
return addr_ != other.addr_;
}
constexpr bool operator==(const uint32_t other) const noexcept {
return addr_ == other;
}
constexpr bool operator!=(const uint32_t other) const noexcept {
return addr_ != other;
}
constexpr uint32_t uint32() const noexcept { return addr_; }
} __attribute__((packed));
class MacAddr {
private:
uint64_t addr_{0};
std::string to_hex(const char delimiter = 0) const;
public:
constexpr MacAddr() noexcept = default;
explicit constexpr MacAddr(uint64_t mac) noexcept : addr_{mac} {}
explicit MacAddr(std::string mac);
explicit MacAddr(const char *address);
std::string str() const;
std::string hex() const;
constexpr bool operator==(const MacAddr &other) const noexcept {
return addr_ == other.addr_;
}
constexpr bool operator!=(const MacAddr &other) const noexcept {
return addr_ != other.addr_;
}
constexpr bool operator==(const uint64_t other) const noexcept {
return addr_ == other;
}
constexpr bool operator!=(const uint64_t other) const noexcept {
return addr_ != other;
}
constexpr uint64_t uint64() const noexcept { return addr_; }
} __attribute__((packed));
struct UdpDestination {
uint32_t entry{};
uint32_t port{};
uint32_t port2{};
IpAddr ip;
IpAddr ip2;
MacAddr mac;
MacAddr mac2;
std::string str() const;
constexpr bool operator==(const UdpDestination &other) const {
return ((entry == other.entry) && (port == other.port) &&
(port2 == other.port2) && (ip == other.ip) &&
(ip2 == other.ip2) && (mac == other.mac) &&
(mac2 == other.mac2));
}
} __attribute__((packed));
std::ostream &operator<<(std::ostream &out, const IpAddr &addr);
std::ostream &operator<<(std::ostream &out, const MacAddr &addr);
std::ostream &operator<<(std::ostream &out, const UdpDestination &dest);
IpAddr HostnameToIp(const char *hostname);
std::string IpToInterfaceName(const std::string &ip);
MacAddr InterfaceNameToMac(const std::string &inf);
IpAddr InterfaceNameToIp(const std::string &ifn);
} // namespace sls