diff --git a/common/include/villas/boxes.hpp b/common/include/villas/boxes.hpp index 7f2ede401..535973738 100644 --- a/common/include/villas/boxes.hpp +++ b/common/include/villas/boxes.hpp @@ -1,10 +1,10 @@ -/** Various helper functions. +/* Various helper functions. * * @file * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #pragma once diff --git a/common/include/villas/buffer.hpp b/common/include/villas/buffer.hpp index c530565e9..30220de2f 100644 --- a/common/include/villas/buffer.hpp +++ b/common/include/villas/buffer.hpp @@ -1,10 +1,10 @@ -/** A simple buffer for encoding streamed JSON messages. +/* A simple buffer for encoding streamed JSON messages. * * @file * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #pragma once diff --git a/common/include/villas/colors.hpp b/common/include/villas/colors.hpp index 75315faec..7d6f20778 100644 --- a/common/include/villas/colors.hpp +++ b/common/include/villas/colors.hpp @@ -1,10 +1,10 @@ -/** Various helper functions. +/* Various helper functions. * * @file * @author Steffen Vogel * @copyright 2017, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #pragma once diff --git a/common/include/villas/common.hpp b/common/include/villas/common.hpp index 7210468b6..abd82c284 100644 --- a/common/include/villas/common.hpp +++ b/common/include/villas/common.hpp @@ -1,10 +1,10 @@ -/** Some common defines, enums and datastructures. +/* Some common defines, enums and datastructures. * * @file * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #pragma once diff --git a/common/include/villas/compat.hpp b/common/include/villas/compat.hpp index 4fee84202..a224d4520 100644 --- a/common/include/villas/compat.hpp +++ b/common/include/villas/compat.hpp @@ -1,9 +1,9 @@ -/** Compatability for different library versions. +/* Compatability for different library versions. * * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #pragma once diff --git a/common/include/villas/cpuset.hpp b/common/include/villas/cpuset.hpp index 7d1f68f16..765511895 100644 --- a/common/include/villas/cpuset.hpp +++ b/common/include/villas/cpuset.hpp @@ -1,10 +1,10 @@ -/** Human readable cpusets. +/* Human readable cpusets. * * @file * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #pragma once diff --git a/common/include/villas/dsp/exponential_window.hpp b/common/include/villas/dsp/exponential_window.hpp index 3b1802b82..31e001ea0 100644 --- a/common/include/villas/dsp/exponential_window.hpp +++ b/common/include/villas/dsp/exponential_window.hpp @@ -1,10 +1,10 @@ -/** An exponential window. +/* An exponential window. * * @file * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #pragma once diff --git a/common/include/villas/dsp/moving_average_window.hpp b/common/include/villas/dsp/moving_average_window.hpp index 0342c8a47..6c4999adc 100644 --- a/common/include/villas/dsp/moving_average_window.hpp +++ b/common/include/villas/dsp/moving_average_window.hpp @@ -1,10 +1,10 @@ -/** A moving average window. +/* A moving average window. * * @file * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #pragma once diff --git a/common/include/villas/dsp/pid.hpp b/common/include/villas/dsp/pid.hpp index f427a1844..7eb104ff2 100644 --- a/common/include/villas/dsp/pid.hpp +++ b/common/include/villas/dsp/pid.hpp @@ -1,10 +1,10 @@ -/** A PID controller. +/* A PID controller. * * @file * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #pragma once diff --git a/common/include/villas/dsp/window.hpp b/common/include/villas/dsp/window.hpp index 86ba44053..931bf14f0 100644 --- a/common/include/villas/dsp/window.hpp +++ b/common/include/villas/dsp/window.hpp @@ -1,10 +1,10 @@ -/** A sliding/moving window. +/* A sliding/moving window. * * @file * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #pragma once diff --git a/common/include/villas/dsp/window_cosine.hpp b/common/include/villas/dsp/window_cosine.hpp index c6ecff2e1..0a8b18e5b 100644 --- a/common/include/villas/dsp/window_cosine.hpp +++ b/common/include/villas/dsp/window_cosine.hpp @@ -1,10 +1,10 @@ -/** A sliding/moving window. +/* A sliding/moving window. * * @file * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #pragma once @@ -17,7 +17,6 @@ namespace villas { namespace dsp { - template// a0 = 1.0, double a1 = 0.0, double a2 = 0.0, double a3 = 0.0, double a4 = 0.0> class CosineWindow : public Window { @@ -54,7 +53,6 @@ public: correctionFactor /= len; } - virtual T getCorrectionFactor() const { diff --git a/common/include/villas/exceptions.hpp b/common/include/villas/exceptions.hpp index 7c9191aef..d63d9ff31 100644 --- a/common/include/villas/exceptions.hpp +++ b/common/include/villas/exceptions.hpp @@ -1,10 +1,10 @@ -/** Common exceptions. +/* Common exceptions. * * @file * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #pragma once diff --git a/common/include/villas/graph/directed.hpp b/common/include/villas/graph/directed.hpp index 8ae840cd3..0e5c06832 100644 --- a/common/include/villas/graph/directed.hpp +++ b/common/include/villas/graph/directed.hpp @@ -1,10 +1,10 @@ -/** A directed graph. +/* A directed graph. * * @file * @author Daniel Krebs * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #pragma once @@ -21,11 +21,9 @@ #include #include - namespace villas { namespace graph { - template class DirectedGraph { public: @@ -114,7 +112,6 @@ public: return edge->id; } - EdgeIdentifier addDefaultEdge(VertexIdentifier fromVertexId, VertexIdentifier toVertexId) { diff --git a/common/include/villas/graph/edge.hpp b/common/include/villas/graph/edge.hpp index 8c2800365..f2acc9969 100644 --- a/common/include/villas/graph/edge.hpp +++ b/common/include/villas/graph/edge.hpp @@ -1,10 +1,10 @@ -/** A graph edge. +/* A graph edge. * * @file * @author Daniel Krebs * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #pragma once diff --git a/common/include/villas/graph/vertex.hpp b/common/include/villas/graph/vertex.hpp index 4183833f6..048d9f6cc 100644 --- a/common/include/villas/graph/vertex.hpp +++ b/common/include/villas/graph/vertex.hpp @@ -1,10 +1,10 @@ -/** A graph vertex. +/* A graph vertex. * * @file * @author Daniel Krebs * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #pragma once diff --git a/common/include/villas/hist.hpp b/common/include/villas/hist.hpp index 4d5550974..0d05b6bff 100644 --- a/common/include/villas/hist.hpp +++ b/common/include/villas/hist.hpp @@ -1,10 +1,10 @@ -/** Histogram class. +/* Histogram class. * * @file * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #pragma once @@ -110,7 +110,6 @@ protected: cnt_t higher; // The number of values which are higher than #high. cnt_t lower; // The number of values which are lower than #low. - std::vector data; // Bucket counters. double _m[2], _s[2]; // Private variables for online variance calculation. diff --git a/common/include/villas/kernel/kernel.hpp b/common/include/villas/kernel/kernel.hpp index ee8fc2652..2f72a6e32 100644 --- a/common/include/villas/kernel/kernel.hpp +++ b/common/include/villas/kernel/kernel.hpp @@ -1,10 +1,10 @@ -/** Linux kernel related functions. +/* Linux kernel related functions. * * @file * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #pragma once @@ -15,21 +15,21 @@ namespace villas { namespace kernel { -// Get the version of the kernel. +// Get the version of the kernel utils::Version getVersion(); -// Get number of reserved hugepages. +// Get number of reserved hugepages int getNrHugepages(); -// Set number of reserved hugepages. +// Set number of reserved hugepages int setNrHugepages(int nr); // Get kernel cmdline parameter // // See https://www.kernel.org/doc/Documentation/kernel-parameters.txt // -// @param param The cmdline parameter to look for. -// @param buf The string buffer to which the parameter value will be copied to. +// @param param The cmdline parameter to look for +// @param buf The string buffer to which the parameter value will be copied to // @param len The length of the buffer \p value // @retval 0 Parameter \p key was found and value was copied to \p value // @reval <>0 Kernel was not booted with parameter \p key @@ -38,8 +38,8 @@ int getCmdlineParam(const char *param, char *buf, size_t len); // Checks if a kernel module is loaded // // @param module the name of the module -// @retval 0 Module is loaded. -// @reval <>0 Module is not loaded. +// @retval 0 Module is loaded +// @reval <>0 Module is not loaded int isModuleLoaded(const char *module); // Load kernel module via modprobe @@ -51,10 +51,10 @@ int setModuleParam(const char *module, const char *param, const char *value); // Get cacheline size in bytes int getCachelineSize(); -// Get the size of a standard page in bytes. +// Get the size of a standard page in bytes int getPageSize(); -// Get the size of a huge page in bytes. +// Get the size of a huge page in bytes int getHugePageSize(); // Get CPU base frequency diff --git a/common/include/villas/kernel/pci.hpp b/common/include/villas/kernel/pci.hpp index d22466cc2..6371cb8d2 100644 --- a/common/include/villas/kernel/pci.hpp +++ b/common/include/villas/kernel/pci.hpp @@ -1,10 +1,10 @@ -/** Linux PCI helpers +/* Linux PCI helpers * * @file * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #pragma once @@ -87,13 +87,13 @@ public: bool operator==(const Device &other); - // Get currently loaded driver for device. + // Get currently loaded driver for device std::string getDriver() const; - // Bind a new LKM to the PCI device. + // Bind a new LKM to the PCI device bool attachDriver(const std::string &driver) const; - // Return the IOMMU group of this PCI device or -1 if the device is not in a group. + // Return the IOMMU group of this PCI device or -1 if the device is not in a group int getIommuGroup() const; std::list getRegions() const; @@ -102,14 +102,14 @@ public: void writeBar(uint32_t addr, unsigned bar = 0); // If BAR values in config space and in the kernel do not match, rewrite - // the BAR value of the kernel to PCIe config space. + // the BAR value of the kernel to PCIe config space void rewriteBar(unsigned bar = 0); - // Read 32-bit BAR value from the PCI configuration space. + // Read 32-bit BAR value from the PCI configuration space uint32_t readBar(unsigned bar = 0) const; - // Read 32-bit BAR value from the devices resource file. This is what the kernel - // thinks the BAR should be. + // Read 32-bit BAR value from the devices resource file. + // This is what the kernel thinks the BAR should be. uint32_t readHostBar(unsigned bar = 0) const; Id id; diff --git a/common/include/villas/kernel/rt.hpp b/common/include/villas/kernel/rt.hpp index efd1ca9dd..4aac73517 100644 --- a/common/include/villas/kernel/rt.hpp +++ b/common/include/villas/kernel/rt.hpp @@ -1,11 +1,11 @@ -/** Linux specific real-time optimizations +/* Linux specific real-time optimizations * * @see: https://wiki.linuxfoundation.org/realtime/documentation/howto/applications/application_base * @file * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #pragma once diff --git a/common/include/villas/kernel/vfio_container.hpp b/common/include/villas/kernel/vfio_container.hpp index 4e87d353a..c4cbaf780 100644 --- a/common/include/villas/kernel/vfio_container.hpp +++ b/common/include/villas/kernel/vfio_container.hpp @@ -1,4 +1,4 @@ -/** Virtual Function IO wrapper around kernel API +/* Virtual Function IO wrapper around kernel API * * @file * @author Niklas Eiling @@ -7,7 +7,7 @@ * @copyright 2022, Niklas Eiling * @copyright 2014-2021, Steffen Vogel * @copyright 2018, Daniel Krebs - *********************************************************************************/ + */ #pragma once @@ -26,18 +26,20 @@ namespace vfio { // Backwards compatability with older kernels #ifdef VFIO_UPDATE_VADDR -static constexpr size_t EXTENSION_SIZE = VFIO_UPDATE_VADDR+1; +static constexpr +size_t EXTENSION_SIZE = VFIO_UPDATE_VADDR+1; #elif defined(VFIO_UNMAP_ALL) -static constexpr size_t EXTENSION_SIZE = VFIO_UNMAP_ALL+1; +static constexpr +size_t EXTENSION_SIZE = VFIO_UNMAP_ALL+1; #else -static constexpr size_t EXTENSION_SIZE = VFIO_NOIOMMU_IOMMU+1; +static constexpr +size_t EXTENSION_SIZE = VFIO_NOIOMMU_IOMMU+1; #endif class Container { public: Container(); - // No copying allowed because we manage the vfio state in constructor and destructors Container(Container const&) = delete; void operator=(Container const&) = delete; diff --git a/common/include/villas/kernel/vfio_device.hpp b/common/include/villas/kernel/vfio_device.hpp index be2bf7898..0196684f7 100644 --- a/common/include/villas/kernel/vfio_device.hpp +++ b/common/include/villas/kernel/vfio_device.hpp @@ -1,4 +1,4 @@ -/** Virtual Function IO wrapper around kernel API +/* Virtual Function IO wrapper around kernel API * * @file * @author Niklas Eiling @@ -7,7 +7,7 @@ * @copyright 2022, Niklas Eiling * @copyright 2014-2021, Steffen Vogel * @copyright 2018, Daniel Krebs - *********************************************************************************/ + */ #pragma once diff --git a/common/include/villas/kernel/vfio_group.hpp b/common/include/villas/kernel/vfio_group.hpp index 8bbfa4791..ccc9337c6 100644 --- a/common/include/villas/kernel/vfio_group.hpp +++ b/common/include/villas/kernel/vfio_group.hpp @@ -1,4 +1,4 @@ -/** Virtual Function IO wrapper around kernel API +/* Virtual Function IO wrapper around kernel API * * @file * @author Niklas Eiling @@ -7,7 +7,7 @@ * @copyright 2022, Niklas Eiling * @copyright 2014-2021, Steffen Vogel * @copyright 2018, Daniel Krebs - *********************************************************************************/ + */ #pragma once diff --git a/common/include/villas/list.hpp b/common/include/villas/list.hpp index 432098c4f..49f7f5745 100644 --- a/common/include/villas/list.hpp +++ b/common/include/villas/list.hpp @@ -1,4 +1,4 @@ -/** A generic list implementation. +/* A generic list implementation. * * This is a generic implementation of a list which can store void pointers to * arbitrary data. The data itself is not stored or managed by the list. @@ -9,9 +9,9 @@ * @file * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC -* + * * VILLAScommon - * *********************************************************************************/ + * */ #pragma once @@ -25,14 +25,16 @@ #define LIST_CHUNKSIZE 16 // Static list initialization -#define LIST_INIT_STATIC(l) \ -__attribute__((constructor(105))) static void UNIQUE(__ctor)() {\ - int ret __attribute__((unused)); \ - ret = list_init(l); \ -} \ -__attribute__((destructor(105))) static void UNIQUE(__dtor)() { \ - int ret __attribute__((unused)); \ - ret = list_destroy(l, nullptr, false); \ +#define LIST_INIT_STATIC(l) \ +__attribute__((constructor(105))) static \ +void UNIQUE(__ctor)() { \ + int ret __attribute__((unused)); \ + ret = list_init(l); \ +} \ +__attribute__((destructor(105))) static \ +void UNIQUE(__dtor)() { \ + int ret __attribute__((unused)); \ + ret = list_destroy(l, nullptr, false); \ } #define list_length(list) ((list)->length) diff --git a/common/include/villas/log.hpp b/common/include/villas/log.hpp index 41f212aea..dd79bf6d8 100644 --- a/common/include/villas/log.hpp +++ b/common/include/villas/log.hpp @@ -1,11 +1,11 @@ -/** Logging. +/* Logging. * * @file * @author Daniel Krebs * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #pragma once @@ -26,7 +26,8 @@ class Log; using Logger = std::shared_ptr; -extern Log logging; +extern +Log logging; class Log { diff --git a/common/include/villas/memory.hpp b/common/include/villas/memory.hpp index 7de607b31..19388940f 100644 --- a/common/include/villas/memory.hpp +++ b/common/include/villas/memory.hpp @@ -1,10 +1,10 @@ -/** Memory management. +/* Memory management. * * @file * @author Daniel Krebs * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #pragma once @@ -254,8 +254,10 @@ public: allocateBlock(size_t size); private: - static constexpr size_t alignBytes = sizeof(uintptr_t); - static constexpr size_t alignMask = alignBytes - 1; + static constexpr + size_t alignBytes = sizeof(uintptr_t); + static constexpr + size_t alignMask = alignBytes - 1; size_t getAlignmentPadding(uintptr_t addr) const { @@ -268,7 +270,6 @@ private: size_t allocationCount; // Number of individual allocations present }; - // Wrapper around mmap() to create villas memory blocks // // This class simply wraps around mmap() and munmap() to allocate memory in the @@ -288,17 +289,17 @@ public: allocateBlock(size_t size); }; - static HostRamAllocator& - getAllocator() + static + HostRamAllocator& getAllocator() { return allocator; } private: - static HostRamAllocator allocator; + static + HostRamAllocator allocator; }; - class HostDmaRam { public: class HostDmaRamAllocator : public LinearAllocator { @@ -317,23 +318,28 @@ public: int num; }; - static HostDmaRamAllocator& + static + HostDmaRamAllocator& getAllocator(int num = 0); private: static std::map> allocators; - static std::string + static + std::string getUdmaBufName(int num); - static std::string + static + std::string getUdmaBufBasePath(int num); - static size_t + static + size_t getUdmaBufBufSize(int num); - static uintptr_t + static + uintptr_t getUdmaBufPhysAddr(int num); }; diff --git a/common/include/villas/memory_manager.hpp b/common/include/villas/memory_manager.hpp index 33d98242e..7913f283d 100644 --- a/common/include/villas/memory_manager.hpp +++ b/common/include/villas/memory_manager.hpp @@ -1,10 +1,10 @@ -/** Memory manager. +/* Memory manager. * * @file * @author Daniel Krebs * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #pragma once @@ -65,7 +65,6 @@ private: size_t size; // Size of "memory window" }; - // Global memory manager to resolve addresses across address spaces // // Every entity in the system has to register its (master) address space and @@ -124,7 +123,6 @@ private: } }; - // Custom vertex in memory graph representing an address space // // Since most information in the memory graph is stored in the edges (memory @@ -196,7 +194,6 @@ public: AddressSpaceId fromAddrSpace, AddressSpaceId toAddrSpace); - AddressSpaceId findAddressSpace(const std::string &name); std::list findPath(const AddressSpaceId &fromAddrSpaceId, const AddressSpaceId &toAddrSpaceId); @@ -243,7 +240,8 @@ private: MemoryGraph::check_path_fn pathCheckFunc; // Static pointer to global instance, because this is a singleton - static MemoryManager* instance; + static + MemoryManager* instance; }; } // namespace villas diff --git a/common/include/villas/plugin.hpp b/common/include/villas/plugin.hpp index f579ac5a9..b265db045 100644 --- a/common/include/villas/plugin.hpp +++ b/common/include/villas/plugin.hpp @@ -1,11 +1,11 @@ -/** Loadable / plugin support. +/* Loadable / plugin support. * * @file * @author Steffen Vogel * @author Daniel Krebs * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #pragma once @@ -25,7 +25,8 @@ namespace plugin { class Plugin; class Registry; -extern Registry *registry; +extern +Registry *registry; template using List = std::list; diff --git a/common/include/villas/popen.hpp b/common/include/villas/popen.hpp index 732aa922f..93079b5ad 100644 --- a/common/include/villas/popen.hpp +++ b/common/include/villas/popen.hpp @@ -1,10 +1,10 @@ -/** Bi-directional popen +/* Bi-directional popen * * @file * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #pragma once diff --git a/common/include/villas/table.hpp b/common/include/villas/table.hpp index 2fded11de..e1f1cb222 100644 --- a/common/include/villas/table.hpp +++ b/common/include/villas/table.hpp @@ -1,10 +1,10 @@ -/** Print fancy tables +/* Print fancy tables * * @file * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #pragma once diff --git a/common/include/villas/task.hpp b/common/include/villas/task.hpp index 5d6faaded..960493d29 100644 --- a/common/include/villas/task.hpp +++ b/common/include/villas/task.hpp @@ -1,10 +1,10 @@ -/** Run tasks periodically. +/* Run tasks periodically. * * @file * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #pragma once diff --git a/common/include/villas/terminal.hpp b/common/include/villas/terminal.hpp index 20f37677f..af7f2d45d 100644 --- a/common/include/villas/terminal.hpp +++ b/common/include/villas/terminal.hpp @@ -1,10 +1,10 @@ -/** Terminal handling. +/* Terminal handling. * * @file * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #pragma once @@ -22,7 +22,8 @@ protected: bool isTty; - static class Terminal *current; + static + class Terminal *current; public: Terminal(); diff --git a/common/include/villas/timing.hpp b/common/include/villas/timing.hpp index 11ac44ca8..19a84ad1d 100644 --- a/common/include/villas/timing.hpp +++ b/common/include/villas/timing.hpp @@ -1,10 +1,10 @@ -/** Time related functions. +/* Time related functions. * * @file * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #pragma once diff --git a/common/include/villas/tool.hpp b/common/include/villas/tool.hpp index 04e82ee4f..3e7b291c8 100644 --- a/common/include/villas/tool.hpp +++ b/common/include/villas/tool.hpp @@ -1,10 +1,10 @@ -/** Common entry point for all villas command line tools. +/* Common entry point for all villas command line tools. * * @file * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #pragma once diff --git a/common/include/villas/tsc.hpp b/common/include/villas/tsc.hpp index b2eaa186b..bef1bec07 100644 --- a/common/include/villas/tsc.hpp +++ b/common/include/villas/tsc.hpp @@ -1,10 +1,10 @@ -/** Measure time and sleep with IA-32 time-stamp counter. +/* Measure time and sleep with IA-32 time-stamp counter. * * @file * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #pragma once diff --git a/common/include/villas/utils.hpp b/common/include/villas/utils.hpp index 6736f60b7..00afb2f05 100644 --- a/common/include/villas/utils.hpp +++ b/common/include/villas/utils.hpp @@ -1,11 +1,11 @@ -/** Utilities. +/* Utilities. * * @file * @author Steffen Vogel * @author Daniel Krebs * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #pragma once diff --git a/common/include/villas/uuid.hpp b/common/include/villas/uuid.hpp index 25ccbc225..2444d0a87 100644 --- a/common/include/villas/uuid.hpp +++ b/common/include/villas/uuid.hpp @@ -1,10 +1,10 @@ -/** UUID helpers. +/* UUID helpers. * * @file * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #pragma once diff --git a/common/include/villas/version.hpp b/common/include/villas/version.hpp index c7c77c462..96f09560b 100644 --- a/common/include/villas/version.hpp +++ b/common/include/villas/version.hpp @@ -1,10 +1,10 @@ -/** Version. +/* Version. * * @file * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #pragma once diff --git a/common/lib/base64.cpp b/common/lib/base64.cpp index 8db10a8ec..79acb754d 100644 --- a/common/lib/base64.cpp +++ b/common/lib/base64.cpp @@ -1,9 +1,9 @@ -/** Base64 encoding/decoding +/* Base64 encoding/decoding * * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #include #include @@ -16,8 +16,10 @@ namespace villas { namespace utils { namespace base64 { -static const char kEncodeLookup[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; -static const char kPadCharacter = '='; +static +const char kEncodeLookup[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; +static +const char kPadCharacter = '='; std::string encode(const std::vector& input) { diff --git a/common/lib/buffer.cpp b/common/lib/buffer.cpp index 450864584..69a34b7d0 100644 --- a/common/lib/buffer.cpp +++ b/common/lib/buffer.cpp @@ -1,9 +1,9 @@ -/** A simple buffer for encoding streamed JSON messages. +/* A simple buffer for encoding streamed JSON messages. * * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #include #include diff --git a/common/lib/common.cpp b/common/lib/common.cpp index cffb06689..0faa6c4d8 100644 --- a/common/lib/common.cpp +++ b/common/lib/common.cpp @@ -1,9 +1,9 @@ -/** Common code. +/* Common code. * * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #include diff --git a/common/lib/compat.cpp b/common/lib/compat.cpp index 243cc2ebf..eac6d2fba 100644 --- a/common/lib/compat.cpp +++ b/common/lib/compat.cpp @@ -1,9 +1,9 @@ -/** Compatability for different library versions. +/* Compatability for different library versions. * * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #include #include @@ -43,7 +43,6 @@ json_t *json_loadfd(int input, size_t flags, json_error_t *error) return json_load_callback(json_loadfd_callback, (void *) &input, flags, error); } - static int json_dumpfd_callback(const char *buffer, size_t size, void *data) { diff --git a/common/lib/cpuset.cpp b/common/lib/cpuset.cpp index 644af1ab8..7faa806e2 100644 --- a/common/lib/cpuset.cpp +++ b/common/lib/cpuset.cpp @@ -1,10 +1,10 @@ -/** Human readable cpusets. +/* Human readable cpusets. * * @file * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #include #include diff --git a/common/lib/dsp/pid.cpp b/common/lib/dsp/pid.cpp index 066a2645a..ea9262d56 100644 --- a/common/lib/dsp/pid.cpp +++ b/common/lib/dsp/pid.cpp @@ -1,9 +1,9 @@ -/** A PID controller. +/* A PID controller. * * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #include #include diff --git a/common/lib/hist.cpp b/common/lib/hist.cpp index 6ab944dae..98ac46d40 100644 --- a/common/lib/hist.cpp +++ b/common/lib/hist.cpp @@ -1,9 +1,9 @@ -/** Histogram class. +/* Histogram class. * * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #include #include diff --git a/common/lib/kernel/kernel.cpp b/common/lib/kernel/kernel.cpp index a6911102c..03c822986 100644 --- a/common/lib/kernel/kernel.cpp +++ b/common/lib/kernel/kernel.cpp @@ -1,9 +1,9 @@ -/** Linux kernel related functions. +/* Linux kernel related functions. * * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #include #include diff --git a/common/lib/kernel/pci.cpp b/common/lib/kernel/pci.cpp index 42db0bd19..fa2eb9fa9 100644 --- a/common/lib/kernel/pci.cpp +++ b/common/lib/kernel/pci.cpp @@ -1,9 +1,9 @@ -/** Linux PCI helpers +/* Linux PCI helpers * * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #include #include diff --git a/common/lib/kernel/rt.cpp b/common/lib/kernel/rt.cpp index 5569ac9e3..1e5016ec5 100644 --- a/common/lib/kernel/rt.cpp +++ b/common/lib/kernel/rt.cpp @@ -1,9 +1,9 @@ -/** Linux specific real-time optimizations +/* Linux specific real-time optimizations * * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #include #include diff --git a/common/lib/kernel/vfio_container.cpp b/common/lib/kernel/vfio_container.cpp index 03f1af557..6d22231f6 100644 --- a/common/lib/kernel/vfio_container.cpp +++ b/common/lib/kernel/vfio_container.cpp @@ -1,11 +1,11 @@ -/** Virtual Function IO wrapper around kernel API +/* Virtual Function IO wrapper around kernel API * * @author Steffen Vogel * @author Daniel Krebs * @copyright 2014-2021, Steffen Vogel * @copyright 2018, Daniel Krebs * @license Apache License 2.0 - *********************************************************************************/ + */ #define _DEFAULT_SOURCE @@ -41,8 +41,8 @@ using namespace villas::kernel::vfio; #define VFIO_NOIOMMU_IOMMU 8 #endif - -static std::array construct_vfio_extension_str() { +static +std::array construct_vfio_extension_str() { std::array ret; ret[VFIO_TYPE1_IOMMU] = "Type 1"; ret[VFIO_SPAPR_TCE_IOMMU] = "SPAPR TCE"; @@ -62,8 +62,8 @@ static std::array construct_vfio_extension_str() { return ret; } -static std::array VFIO_EXTENSION_STR = construct_vfio_extension_str(); - +static +std::array VFIO_EXTENSION_STR = construct_vfio_extension_str(); Container::Container() : fd(-1), @@ -74,7 +74,8 @@ Container::Container() : groups(), log(logging.get("kernel:vfio::Container")) { - static constexpr const char* requiredKernelModules[] = { + static constexpr + const char* requiredKernelModules[] = { "vfio", "vfio_pci", "vfio_iommu_type1" }; @@ -196,7 +197,8 @@ std::shared_ptr Container::attachDevice(pci::Device &pdev) { int ret; char name[32], iommu_state[4]; - static constexpr const char* kernelDriver = "vfio-pci"; + static constexpr + const char* kernelDriver = "vfio-pci"; // Load PCI bus driver for VFIO if (kernel::loadModule("vfio_pci")) diff --git a/common/lib/kernel/vfio_device.cpp b/common/lib/kernel/vfio_device.cpp index 1e1c0e21b..7047551c0 100644 --- a/common/lib/kernel/vfio_device.cpp +++ b/common/lib/kernel/vfio_device.cpp @@ -1,4 +1,4 @@ -/** Virtual Function IO wrapper around kernel API +/* Virtual Function IO wrapper around kernel API * * @author Niklas Eiling * @author Steffen Vogel @@ -7,7 +7,7 @@ * @copyright 2014-2021, Steffen Vogel * @copyright 2018, Daniel Krebs * @license Apache License 2.0 - *********************************************************************************/ + */ #define _DEFAULT_SOURCE @@ -32,7 +32,8 @@ using namespace villas::kernel::vfio; -static const char *vfio_pci_region_names[] = { +static +const char *vfio_pci_region_names[] = { "PCI_BAR0", // VFIO_PCI_BAR0_REGION_INDEX "PCI_BAR1", // VFIO_PCI_BAR1_REGION_INDEX "PCI_BAR2", // VFIO_PCI_BAR2_REGION_INDEX @@ -44,7 +45,8 @@ static const char *vfio_pci_region_names[] = { "PCI_VGA" // VFIO_PCI_INTX_IRQ_INDEX }; -static const char *vfio_pci_irq_names[] = { +static +const char *vfio_pci_irq_names[] = { "PCI_INTX", // VFIO_PCI_INTX_IRQ_INDEX "PCI_MSI", // VFIO_PCI_MSI_IRQ_INDEX "PCI_MSIX", // VFIO_PCI_MSIX_IRQ_INDEX @@ -122,11 +124,9 @@ Device::Device(const std::string &name, int groupFileDescriptor, const kernel::p if (ret < 0) throw RuntimeError("Failed to get IRQ {} of VFIO device: {}", i, name); - log->debug("irq {} info: flags: 0x{:x}, count: {}", irq.index, irq.flags, irq.count); - irqs[i] = irq; } @@ -384,7 +384,6 @@ bool Device::pciMsiFind(int nos[]) last = col; } while ((col = strtok(nullptr, " "))); - ret = sscanf(last, "vfio-msi[%d](%12[0-9:])", &idx, name); if (ret == 2) { if (strstr(this->name.c_str(), name) == this->name.c_str()) diff --git a/common/lib/kernel/vfio_group.cpp b/common/lib/kernel/vfio_group.cpp index ade6b2484..4039dc7cc 100644 --- a/common/lib/kernel/vfio_group.cpp +++ b/common/lib/kernel/vfio_group.cpp @@ -1,11 +1,11 @@ -/** Virtual Function IO wrapper around kernel API +/* Virtual Function IO wrapper around kernel API * * @author Steffen Vogel * @author Daniel Krebs * @copyright 2014-2021, Steffen Vogel * @copyright 2018, Daniel Krebs * @license Apache License 2.0 - *********************************************************************************/ + */ #define _DEFAULT_SOURCE diff --git a/common/lib/list.cpp b/common/lib/list.cpp index a4ae3843b..e75dd7cec 100644 --- a/common/lib/list.cpp +++ b/common/lib/list.cpp @@ -1,11 +1,11 @@ -/** A generic linked list +/* A generic linked list * * Linked lists a used for several data structures in the code. * * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #include #include diff --git a/common/lib/log.cpp b/common/lib/log.cpp index d53c0a1c6..c8dfea802 100644 --- a/common/lib/log.cpp +++ b/common/lib/log.cpp @@ -1,9 +1,9 @@ -/** Logging and debugging routines +/* Logging and debugging routines * * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #include #include @@ -23,7 +23,8 @@ using namespace villas; // The global log instance Log villas::logging; -static std::map levelNames = { +static +std::map levelNames = { { spdlog::level::trace, "trc" }, { spdlog::level::debug, "dbg" }, { spdlog::level::info, "info" }, diff --git a/common/lib/memory.cpp b/common/lib/memory.cpp index 2ffad705e..c9564b9e2 100644 --- a/common/lib/memory.cpp +++ b/common/lib/memory.cpp @@ -1,9 +1,9 @@ -/** Memory managment. +/* Memory managment. * * @author Daniel Krebs * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #include @@ -92,7 +92,6 @@ LinearAllocator::LinearAllocator(MemoryManager::AddressSpaceId memoryAddrSpaceId }; } - std::string LinearAllocator::getName() const { @@ -105,7 +104,6 @@ LinearAllocator::getName() const return name.str(); } - std::unique_ptr LinearAllocator::allocateBlock(size_t size) { @@ -127,7 +125,6 @@ LinearAllocator::allocateBlock(size_t size) nextFreeAddress = std::min(nextFreeAddress, memorySize); } - auto &mm = MemoryManager::get(); // Assemble name for this block @@ -153,7 +150,6 @@ LinearAllocator::allocateBlock(size_t size) return mem; } - HostRam::HostRamAllocator HostRam::allocator; @@ -170,7 +166,6 @@ HostRam::HostRamAllocator::HostRamAllocator() : }; } - std::map> HostDmaRam::allocators; diff --git a/common/lib/memory_manager.cpp b/common/lib/memory_manager.cpp index c55538dd4..4dd445fac 100644 --- a/common/lib/memory_manager.cpp +++ b/common/lib/memory_manager.cpp @@ -1,9 +1,9 @@ -/** Memory managment. +/* Memory managment. * * @author Daniel Krebs * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #include #include diff --git a/common/lib/plugin.cpp b/common/lib/plugin.cpp index 8da297abc..f97f928d4 100644 --- a/common/lib/plugin.cpp +++ b/common/lib/plugin.cpp @@ -1,9 +1,9 @@ -/** Loadable / plugin support. +/* Loadable / plugin support. * * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #include #include diff --git a/common/lib/popen.cpp b/common/lib/popen.cpp index 46f0ad4a9..557ed0faa 100644 --- a/common/lib/popen.cpp +++ b/common/lib/popen.cpp @@ -1,9 +1,9 @@ -/** Bi-directional popen +/* Bi-directional popen * * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #include #include @@ -165,7 +165,6 @@ int Popen::close() return pid == -1 ? -1 : pstat; } - PopenStream::PopenStream(const std::string &cmd, const arg_list &args, const env_map &env, diff --git a/common/lib/table.cpp b/common/lib/table.cpp index 26ad0b755..a9a1ebc03 100644 --- a/common/lib/table.cpp +++ b/common/lib/table.cpp @@ -1,9 +1,9 @@ -/** Print fancy tables. +/* Print fancy tables. * * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #include #include diff --git a/common/lib/task.cpp b/common/lib/task.cpp index 98948a968..83070782b 100644 --- a/common/lib/task.cpp +++ b/common/lib/task.cpp @@ -1,9 +1,9 @@ -/** Run tasks periodically. +/* Run tasks periodically. * * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #include #include @@ -153,7 +153,6 @@ uint64_t Task::wait() now = tsc_now(&tsc); } while (now < next); - for (runs = 0; next < now; runs++) next += period; #else diff --git a/common/lib/terminal.cpp b/common/lib/terminal.cpp index df29d008c..ec4b052f3 100644 --- a/common/lib/terminal.cpp +++ b/common/lib/terminal.cpp @@ -1,9 +1,9 @@ -/** Terminal handling. +/* Terminal handling. * * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #include diff --git a/common/lib/timing.cpp b/common/lib/timing.cpp index ad55612d2..a1e99540d 100644 --- a/common/lib/timing.cpp +++ b/common/lib/timing.cpp @@ -1,9 +1,9 @@ -/** Time related functions. +/* Time related functions. * * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #include diff --git a/common/lib/tool.cpp b/common/lib/tool.cpp index 63b4078c2..db689039c 100644 --- a/common/lib/tool.cpp +++ b/common/lib/tool.cpp @@ -1,9 +1,9 @@ -/** Common entry point for all villas command line tools. +/* Common entry point for all villas command line tools. * * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #include diff --git a/common/lib/tsc.cpp b/common/lib/tsc.cpp index 860b0acca..ac78e6c6a 100644 --- a/common/lib/tsc.cpp +++ b/common/lib/tsc.cpp @@ -1,10 +1,10 @@ -/** Measure time and sleep with IA-32 time-stamp counter. +/* Measure time and sleep with IA-32 time-stamp counter. * * @file * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #include diff --git a/common/lib/utils.cpp b/common/lib/utils.cpp index e4fc34931..516b24e34 100644 --- a/common/lib/utils.cpp +++ b/common/lib/utils.cpp @@ -1,10 +1,10 @@ -/** Utilities. +/* Utilities. * * @author Daniel Krebs * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #include #include @@ -32,7 +32,8 @@ #include #include -static pthread_t main_thread; +static +pthread_t main_thread; namespace villas { namespace utils { @@ -170,8 +171,10 @@ void killme(int sig) double boxMuller(float m, float s) { double x1, x2, y1; - static double y2; - static int use_last = 0; + static + double y2; + static + int use_last = 0; if (use_last) { // Use value from previous call y1 = y2; diff --git a/common/lib/uuid.cpp b/common/lib/uuid.cpp index e8c57627b..e125b713e 100644 --- a/common/lib/uuid.cpp +++ b/common/lib/uuid.cpp @@ -1,9 +1,9 @@ -/** UUID helpers. +/* UUID helpers. * * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #include diff --git a/common/lib/version.cpp b/common/lib/version.cpp index 20cb2f0c2..b0c8745e3 100644 --- a/common/lib/version.cpp +++ b/common/lib/version.cpp @@ -1,9 +1,9 @@ -/** Version. +/* Version. * * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #include #include diff --git a/common/tests/unit/base64.cpp b/common/tests/unit/base64.cpp index a5ac47a11..2d836448f 100644 --- a/common/tests/unit/base64.cpp +++ b/common/tests/unit/base64.cpp @@ -1,9 +1,9 @@ -/** Unit tests for base64 encoding/decoding +/* Unit tests for base64 encoding/decoding * * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #include @@ -16,7 +16,8 @@ using namespace villas::utils::base64; // cppcheck-suppress unknownMacro TestSuite(base64, .description = "Base64 En/decoder"); -static std::vector vec(const char *str) +static +std::vector vec(const char *str) { return std::vector((byte *) str, (byte *) str + strlen(str)); } diff --git a/common/tests/unit/buffer.cpp b/common/tests/unit/buffer.cpp index 037cd7171..418f450c6 100644 --- a/common/tests/unit/buffer.cpp +++ b/common/tests/unit/buffer.cpp @@ -1,9 +1,9 @@ -/** Unit tests for buffer +/* Unit tests for buffer * * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #include #include diff --git a/common/tests/unit/graph.cpp b/common/tests/unit/graph.cpp index 9f30d48b0..ec44cbfc6 100644 --- a/common/tests/unit/graph.cpp +++ b/common/tests/unit/graph.cpp @@ -1,9 +1,9 @@ -/** Graph unit test. +/* Graph unit test. * * @author Steffen Vogel * @copyright 2014-2021, Steffen Vogel * @license Apache License 2.0 - *********************************************************************************/ + */ #include @@ -95,13 +95,11 @@ Test(graph, path, .description = "Find path") cr_assert(not g.getPath(v1id, v4id, path2)); logger->info(" no path found -> ok"); - logger->info("Find non-existing path in circular sub-graph"); std::list path3; cr_assert(not g.getPath(v4id, v2id, path3)); logger->info(" no path found -> ok"); - logger->info("Find path in circular graph"); std::list path4; cr_assert(g.getPath(v4id, v6id, path4)); diff --git a/common/tests/unit/hist.cpp b/common/tests/unit/hist.cpp index e878514eb..49ea032b5 100644 --- a/common/tests/unit/hist.cpp +++ b/common/tests/unit/hist.cpp @@ -1,9 +1,9 @@ -/** Unit tests for histogram +/* Unit tests for histogram * * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #include diff --git a/common/tests/unit/kernel.cpp b/common/tests/unit/kernel.cpp index 05e7c99f8..026fbf2da 100644 --- a/common/tests/unit/kernel.cpp +++ b/common/tests/unit/kernel.cpp @@ -1,9 +1,9 @@ -/** Unit tests for kernel functions. +/* Unit tests for kernel functions. * * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #include diff --git a/common/tests/unit/list.cpp b/common/tests/unit/list.cpp index afcb8a4e1..595926d13 100644 --- a/common/tests/unit/list.cpp +++ b/common/tests/unit/list.cpp @@ -1,9 +1,9 @@ -/** Unit tests for array-based list +/* Unit tests for array-based list * * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #include #include @@ -15,7 +15,8 @@ using namespace villas; -static const char *nouns[] = { "time", "person", "year", "way", "day", "thing", "man", "world", "life", "hand", "part", "child", "eye", "woman", "place", "work", "week", "case", "point", "government", "company", "number", "group", "problem", "fact" }; +static +const char *nouns[] = { "time", "person", "year", "way", "day", "thing", "man", "world", "life", "hand", "part", "child", "eye", "woman", "place", "work", "week", "case", "point", "government", "company", "number", "group", "problem", "fact" }; struct data { const char *name; diff --git a/common/tests/unit/popen.cpp b/common/tests/unit/popen.cpp index 277feb010..73e530ae6 100644 --- a/common/tests/unit/popen.cpp +++ b/common/tests/unit/popen.cpp @@ -1,9 +1,9 @@ -/** Unit tests for bi-directional popen +/* Unit tests for bi-directional popen * * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #include #include diff --git a/common/tests/unit/task.cpp b/common/tests/unit/task.cpp index 03bbce293..387296d1e 100644 --- a/common/tests/unit/task.cpp +++ b/common/tests/unit/task.cpp @@ -1,9 +1,9 @@ -/** Unit tests for periodic tasks +/* Unit tests for periodic tasks * * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #include diff --git a/common/tests/unit/timing.cpp b/common/tests/unit/timing.cpp index 2459d44e2..2c7ce9168 100644 --- a/common/tests/unit/timing.cpp +++ b/common/tests/unit/timing.cpp @@ -1,9 +1,9 @@ -/** Unit tests for time related utlities +/* Unit tests for time related utlities * * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #include #include diff --git a/common/tests/unit/tsc.cpp b/common/tests/unit/tsc.cpp index 11414719d..8c5baa92a 100644 --- a/common/tests/unit/tsc.cpp +++ b/common/tests/unit/tsc.cpp @@ -1,9 +1,9 @@ -/** Unit tests for rdtsc +/* Unit tests for rdtsc * * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #include diff --git a/common/tests/unit/utils.cpp b/common/tests/unit/utils.cpp index fbf77e5a9..5a70768c0 100644 --- a/common/tests/unit/utils.cpp +++ b/common/tests/unit/utils.cpp @@ -1,9 +1,9 @@ -/** Unit tests for utilities +/* Unit tests for utilities * * @author Steffen Vogel * @copyright 2014-2022, Institute for Automation of Complex Power Systems, EONERC * @license Apache License 2.0 - *********************************************************************************/ + */ #include