diff --git a/common/include/villas/kernel/devices/ip_device.hpp b/common/include/villas/kernel/devices/ip_device.hpp index 240f80d6d..6851b6845 100644 --- a/common/include/villas/kernel/devices/ip_device.hpp +++ b/common/include/villas/kernel/devices/ip_device.hpp @@ -22,7 +22,8 @@ public: private: IpDevice() = delete; - IpDevice(const std::filesystem::path valid_path) //! Dont allow unvalidated paths + IpDevice( + const std::filesystem::path valid_path) //! Dont allow unvalidated paths : PlatformDevice(valid_path){}; public: diff --git a/common/include/villas/kernel/devices/pci_device.hpp b/common/include/villas/kernel/devices/pci_device.hpp index 65794644b..49d9ea31d 100644 --- a/common/include/villas/kernel/devices/pci_device.hpp +++ b/common/include/villas/kernel/devices/pci_device.hpp @@ -20,7 +20,7 @@ namespace kernel { namespace devices { #define PCI_SLOT(devfn) (((devfn) >> 3) & 0x1f) -#define PCI_FUNC(devfn) ((devfn) & 0x07) +#define PCI_FUNC(devfn) ((devfn)&0x07) class Id { public: diff --git a/common/include/villas/task.hpp b/common/include/villas/task.hpp index bf88a0c3a..3ef65461e 100644 --- a/common/include/villas/task.hpp +++ b/common/include/villas/task.hpp @@ -45,7 +45,7 @@ struct Task { #if PERIODIC_TASK_IMPL == TIMERFD int fd; // The timerfd_create(2) file descriptior. #elif PERIODIC_TASK_IMPL == RDTSC - struct Tsc tsc; // Initialized by tsc_init(). + struct Tsc tsc; // Initialized by tsc_init(). #endif // Create a new task with the given rate. diff --git a/common/include/villas/utils.hpp b/common/include/villas/utils.hpp index afd6eebc0..ed6d9d3f6 100644 --- a/common/include/villas/utils.hpp +++ b/common/include/villas/utils.hpp @@ -8,10 +8,10 @@ #pragma once +#include #include #include #include -#include #include #include @@ -53,7 +53,7 @@ #ifdef ALIGN #undef ALIGN #endif -#define ALIGN(x, a) ALIGN_MASK(x, (uintptr_t)(a) - 1) +#define ALIGN(x, a) ALIGN_MASK(x, (uintptr_t)(a)-1) #define ALIGN_MASK(x, m) (((uintptr_t)(x) + (m)) & ~(m)) #define IS_ALIGNED(x, a) (ALIGN(x, a) == (uintptr_t)x) @@ -65,13 +65,13 @@ } while (0) // Round-up integer division -#define CEIL(x, y) (((x) + (y) - 1) / (y)) +#define CEIL(x, y) (((x) + (y)-1) / (y)) // Get nearest up-rounded power of 2 -#define LOG2_CEIL(x) (1 << (villas::utils::log2i((x) - 1) + 1)) +#define LOG2_CEIL(x) (1 << (villas::utils::log2i((x)-1) + 1)) // Check if the number is a power of 2 -#define IS_POW2(x) (((x) != 0) && !((x) & ((x) - 1))) +#define IS_POW2(x) (((x) != 0) && !((x) & ((x)-1))) // Calculate the number of elements in an array. #define ARRAY_LEN(a) (sizeof(a) / sizeof(a)[0]) @@ -213,7 +213,8 @@ template struct overloaded : Ts... { template overloaded(Ts...) -> overloaded; void write_to_file(std::string data, const std::filesystem::path file); -std::vector read_names_in_directory(const std::filesystem::path &directory); +std::vector +read_names_in_directory(const std::filesystem::path &directory); namespace base64 { diff --git a/common/lib/base64.cpp b/common/lib/base64.cpp index ac3c8536f..bcd3e58ec 100644 --- a/common/lib/base64.cpp +++ b/common/lib/base64.cpp @@ -110,7 +110,7 @@ std::vector decode(const std::string &input) { decoded.push_back((temp >> 16) & 0x000000FF); decoded.push_back((temp >> 8) & 0x000000FF); - decoded.push_back((temp) & 0x000000FF); + decoded.push_back((temp)&0x000000FF); } return decoded; diff --git a/common/lib/utils.cpp b/common/lib/utils.cpp index b137bf25e..62ae139e3 100644 --- a/common/lib/utils.cpp +++ b/common/lib/utils.cpp @@ -372,7 +372,7 @@ std::vector read_names_in_directory(const std::filesystem::path &directory) { std::vector names; for (auto const &dir_entry : std::filesystem::directory_iterator{directory}) { - names.push_back(dir_entry.path().filename()); + names.push_back(dir_entry.path().filename()); } return names; } diff --git a/fpga/include/villas/fpga/ips/i2c.hpp b/fpga/include/villas/fpga/ips/i2c.hpp index 3c3ce2cff..072a72157 100644 --- a/fpga/include/villas/fpga/ips/i2c.hpp +++ b/fpga/include/villas/fpga/ips/i2c.hpp @@ -19,7 +19,8 @@ namespace fpga { namespace ip { #define I2C_SWTICH_ADDR 0x70 -#define I2C_SWITCH_CHANNEL_MAP {0x20, 0x80, 0x02, 0x08, 0x10, 0x40, 0x01, 0x04} +#define I2C_SWITCH_CHANNEL_MAP \ + { 0x20, 0x80, 0x02, 0x08, 0x10, 0x40, 0x01, 0x04 } #define I2C_IOEXT_ADDR 0x20 #define I2C_IOEXT_REG_DIR 0x03 #define I2C_IOEXT_REG_OUT 0x01 @@ -46,7 +47,7 @@ public: public: Switch(I2c *i2c, uint8_t address, Logger logger = villas::Log::get("i2c")) : i2c(i2c), address(address), channel(0), readOnce(false), switchLock(), - logger(logger) {}; + logger(logger){}; Switch(const Switch &other) = delete; Switch &operator=(const Switch &other) = delete; void setChannel(uint8_t channel); diff --git a/fpga/include/villas/fpga/utils.hpp b/fpga/include/villas/fpga/utils.hpp index b078936fb..42f3afbb5 100644 --- a/fpga/include/villas/fpga/utils.hpp +++ b/fpga/include/villas/fpga/utils.hpp @@ -89,7 +89,7 @@ protected: BufferedSampleFormatter(const size_t bufSamples, const size_t bufSampleSize) : buf(bufSamples * bufSampleSize + 1), // Leave room for a final `\0' bufSamples(bufSamples), bufSampleSize(bufSampleSize), - currentBufLoc(0) {}; + currentBufLoc(0){}; BufferedSampleFormatter() = delete; BufferedSampleFormatter(const BufferedSampleFormatter &) = delete; virtual char *nextBufPos() { return &buf[(currentBufLoc++) * bufSampleSize]; } @@ -98,7 +98,7 @@ protected: class BufferedSampleFormatterShort : public BufferedSampleFormatter { public: BufferedSampleFormatterShort(size_t bufSizeInSamples) - : BufferedSampleFormatter(bufSizeInSamples, formatStringSize) {}; + : BufferedSampleFormatter(bufSizeInSamples, formatStringSize){}; virtual void format(float value) override { size_t chars; @@ -119,7 +119,7 @@ class BufferedSampleFormatterLong : public BufferedSampleFormatter { public: BufferedSampleFormatterLong(size_t bufSizeInSamples) : BufferedSampleFormatter(bufSizeInSamples, formatStringSize), - sampleCnt(0) {}; + sampleCnt(0){}; virtual void format(float value) override { if (std::snprintf(nextBufPos(), formatStringSize + 1, formatString, diff --git a/include/villas/nodes/iec61850.hpp b/include/villas/nodes/iec61850.hpp index 85c008c2f..bbb1afc0f 100644 --- a/include/villas/nodes/iec61850.hpp +++ b/include/villas/nodes/iec61850.hpp @@ -20,7 +20,8 @@ #include #ifndef CONFIG_GOOSE_DEFAULT_DST_ADDRESS -#define CONFIG_GOOSE_DEFAULT_DST_ADDRESS {0x01, 0x0c, 0xcd, 0x01, 0x00, 0x01} +#define CONFIG_GOOSE_DEFAULT_DST_ADDRESS \ + { 0x01, 0x0c, 0xcd, 0x01, 0x00, 0x01 } #endif namespace villas { diff --git a/include/villas/nodes/test_rtt.hpp b/include/villas/nodes/test_rtt.hpp index fd5c55d4d..c33db2d8c 100644 --- a/include/villas/nodes/test_rtt.hpp +++ b/include/villas/nodes/test_rtt.hpp @@ -58,7 +58,7 @@ protected: : node(n), id(id), rate(rate), warmup(warmup), cooldown(cooldown), values(values), count(count), sent(0), received(0), missed(0), count_warmup(count_warmup), sent_warmup(0), received_warmup(0), - missed_warmup(0), filename(filename) {}; + missed_warmup(0), filename(filename){}; int start(); int stop(); @@ -96,7 +96,7 @@ public: : Node(id, name), task(CLOCK_MONOTONIC), formatter(nullptr), stream(nullptr), shutdown(false) {} - virtual ~TestRTT() {}; + virtual ~TestRTT(){}; virtual int prepare(); diff --git a/lib/hook_list.cpp b/lib/hook_list.cpp index c0f31bb1c..2eadc93c9 100644 --- a/lib/hook_list.cpp +++ b/lib/hook_list.cpp @@ -134,7 +134,7 @@ int HookList::process(struct Sample *smps[], unsigned cnt) { stop: SWAP(smps[processed], smps[current]); processed++; - skip: {} + skip : {} } return processed; diff --git a/tests/unit/queue_signalled.cpp b/tests/unit/queue_signalled.cpp index ca831eb63..3f440e523 100644 --- a/tests/unit/queue_signalled.cpp +++ b/tests/unit/queue_signalled.cpp @@ -93,15 +93,15 @@ void *polled_consumer(void *ctx) { ParameterizedTestParameters(queue_signalled, simple) { static struct param params[] = { - {QueueSignalledMode::AUTO, 0, false}, - {QueueSignalledMode::PTHREAD, 0, false}, - {QueueSignalledMode::PTHREAD, 0, false}, - {QueueSignalledMode::PTHREAD, (int)QueueSignalledFlags::PROCESS_SHARED, - false}, - {QueueSignalledMode::POLLING, 0, false}, + {QueueSignalledMode::AUTO, 0, false}, + {QueueSignalledMode::PTHREAD, 0, false}, + {QueueSignalledMode::PTHREAD, 0, false}, + {QueueSignalledMode::PTHREAD, (int)QueueSignalledFlags::PROCESS_SHARED, + false}, + {QueueSignalledMode::POLLING, 0, false}, #if defined(__linux__) && defined(HAS_EVENTFD) - {QueueSignalledMode::EVENTFD, 0, false}, - {QueueSignalledMode::EVENTFD, 0, true} + {QueueSignalledMode::EVENTFD, 0, false}, + {QueueSignalledMode::EVENTFD, 0, true} #endif };